From 110924543b9a1d79a7f49a8e1a059ecad4c5baf9 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期一, 13 二月 2023 10:28:21 +0800
Subject: [PATCH] 提交基础框架
---
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/UserCouponRecord.java | 215
management/guns-admin/src/main/java/com/stylefeng/guns/config/properties/GunsProperties.java | 129
management/guns-generator/src/main/java/com/stylefeng/guns/generator/engine/config/ControllerConfig.java | 70
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITComplaintService.java | 34
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TUserServiceImpl.java | 38
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TSystemPriceMapper.java | 28
management/guns-admin/src/main/java/com/stylefeng/guns/core/common/constant/dictmap/base/AbstractDictMap.java | 53
management/guns-admin/src/main/webapp/static/js/ueditor/1.4.3/lang/en/images/alldeletebtnupskin.png | 0
management/guns-admin/src/main/webapp/static/js/ueditor/jsp/ueditor/jsp/upload/image/20161220/1482229845707005523.png | 0
management/guns-admin/src/main/webapp/static/js/ueditor/jsp/dialogs/attachment/images/progress.png | 0
management/guns-admin/src/main/webapp/static/modular/system/tCar/tCar.js | 385
management/guns-core/src/main/resources/default-config.properties | 36
management/guns-admin/src/main/webapp/static/layui/css/layui.mobile.css | 2
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/task/base/AbstractJob.java | 36
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/MenuServiceImpl.java | 92
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TOrderPrivateCarMapper.java | 46
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/DriverActivityHistoryController.java | 113
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TLineCompanyServiceImpl.java | 20
management/guns-admin/src/main/webapp/static/js/plugins/layer/layim/loading.gif | 0
management/guns-generator/pom.xml | 35
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITSystemNoticeService.java | 16
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TAgreementServiceImpl.java | 20
management/guns-admin/src/main/webapp/static/js/ueditor/1.4.3/ueditor.all.min.js | 709
management/guns-admin/src/main/webapp/static/js/ueditor/jsp/dialogs/webapp/webapp.html | 53
management/guns-core/src/main/java/com/stylefeng/guns/core/util/PingYinUtil.java | 206
management/guns-admin/src/main/webapp/static/js/common/web-upload-object.js | 126
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TLineMapper.java | 46
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IDriverOnlineService.java | 24
management/guns-admin/src/main/webapp/static/layui/images/face/32.gif | 0
management/guns-core/src/main/java/com/stylefeng/guns/core/util/DateUtil.java | 353
management/guns-admin/src/main/webapp/static/js/ueditor/jsp/dialogs/background/images/success.png | 0
management/guns-admin/src/main/webapp/static/js/ueditor/jsp/dialogs/template/images/pre4.png | 0
management/guns-admin/src/main/webapp/static/layui/images/face/16.gif | 0
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/DriverTrainMapper.xml | 33
management/guns-admin/src/main/webapp/static/js/ueditor/jsp/dialogs/charts/charts.js | 519
management/guns-admin/src/main/webapp/WEB-INF/view/code/code.html | 101
management/guns-admin/src/main/webapp/static/js/ueditor/jsp/themes/default/images/toolbar_bg.png | 0
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TReassignMapper.java | 107
management/guns-admin/src/main/webapp/static/js/ueditor/jsp/dialogs/attachment/images/alignicon.gif | 0
management/guns-admin/src/main/webapp/static/js/plugins/layer/skin/default/xubox_loading2.gif | 0
management/guns-admin/src/main/webapp/static/js/plugins/layer/skin/moon/style.css | 141
management/guns-admin/src/main/webapp/static/js/plugins/highcharts/modules/no-data-to-display.js | 12
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITOrderTaxiService.java | 81
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TDriverServiceMapper.xml | 17
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/LoginLogServiceImpl.java | 29
management/guns-admin/src/main/webapp/static/js/ueditor/1.4.3/third-party/highcharts/modules/exporting.src.js | 709
management/guns-admin/src/main/webapp/static/js/plugins/chartJs/Chart.min.js | 11
management/guns-admin/src/main/webapp/static/netCarInfo.js | 69
management/guns-admin/src/main/webapp/WEB-INF/view/system/tAgreement/tAgreement.html | 105
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/SysCouponActivityMapper.xml | 28
management/guns-admin/src/main/webapp/static/crypto-js/hmac.js | 143
management/guns-admin/src/main/webapp/static/js/plugins/layer/layim/data/groups.json | 56
management/guns-admin/src/main/webapp/static/js/jquery.sparkline 2.1.2.js | 5
management/guns-admin/src/main/webapp/static/css/plugins/ztree/img/line_conn.gif | 0
management/guns-admin/src/main/webapp/WEB-INF/view/system/tVerified/tVerified_immediately.html | 35
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TAdvertisementMapper.xml | 46
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TCarController.java | 1045
management/guns-admin/src/main/webapp/static/layui/images/face/41.gif | 0
management/guns-admin/src/main/webapp/static/js/ueditor/1.4.3/third-party/video-js/font/vjs.ttf | 0
management/guns-admin/src/main/webapp/static/js/ueditor/1.4.3/lang/zh-cn/zh-cn.js | 669
management/guns-admin/src/main/webapp/static/js/ueditor/1.4.3/ueditor.parse.min.js | 28
management/guns-admin/src/main/webapp/static/js/ueditor/jsp/third-party/webuploader/webuploader.flashonly.js | 4176
management/guns-admin/src/main/webapp/static/layui/images/face/25.gif | 0
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/DriverTrain.java | 120
management/guns-admin/src/main/webapp/static/js/ueditor/jsp/third-party/highcharts/modules/drilldown.js | 11
management/guns-core/src/main/java/com/stylefeng/guns/core/config/DefaultWebConfig.java | 65
management/guns-admin/src/main/webapp/static/js/ueditor/jsp/dialogs/help/help.html | 82
management/guns-admin/src/main/webapp/static/js/ueditor/jsp/dialogs/scrawl/images/redo.png | 0
management/guns-admin/src/main/webapp/static/js/ueditor/1.4.3/dialogs/video/video.html | 86
management/guns-admin/src/main/java/com/stylefeng/guns/core/common/constant/DatasourceEnum.java | 15
management/guns-admin/src/main/java/com/stylefeng/guns/modular/api/ApiController.java | 80
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITIntegralOrderService.java | 33
management/guns-admin/src/main/webapp/static/js/ueditor/jsp/dialogs/charts/images/charts2.png | 0
management/guns-admin/src/main/webapp/static/js/ueditor/1.4.3/dialogs/template/images/pre2.png | 0
management/guns-admin/src/main/webapp/static/js/plugins/umeditor/themes/default/css/umeditor.min.css | 8
management/guns-admin/src/main/webapp/static/js/ueditor/jsp/third-party/snapscreen/UEditorSnapscreen.exe | 0
management/guns-admin/src/main/webapp/static/js/plugins/highcharts/themes/dark-green.js | 255
management/guns-admin/src/main/webapp/static/modular/system/tDispatch/tDispatch.js | 226
management/guns-admin/src/main/webapp/static/js/ueditor/1.4.3/dialogs/scrawl/images/eraser.png | 0
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TOrderCharterMapper.xml | 52
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/DateUtil.java | 1130
management/guns-admin/src/main/webapp/static/crypto-js/format-openssl.js | 18
management/guns-admin/src/main/webapp/static/crypto-js/pad-ansix923.js | 49
management/guns-admin/src/main/webapp/static/js/ueditor/jsp/dialogs/image/images/success.png | 0
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITCarBrandService.java | 29
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITCarService.java | 47
management/guns-admin/src/main/webapp/WEB-INF/view/system/dict/dict_edit.html | 86
management/guns-admin/src/main/webapp/static/js/ueditor/jsp/dialogs/attachment/images/success.png | 0
management/guns-admin/src/main/webapp/static/layui/lay/modules/code.js | 2
management/guns-admin/src/main/webapp/static/js/ueditor/1.4.3/third-party/highcharts/modules/map.src.js | 1002
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/UserActivityBalance.java | 313
management/guns-admin/src/main/webapp/static/js/plugins/highcharts/adapters/mootools-adapter.js | 13
management/guns-admin/src/main/webapp/static/js/common/tree-table-object.js | 136
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TVersionManagementController.java | 208
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TLineSiteMapper.java | 16
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TPhone.java | 94
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/INoticeService.java | 23
management/guns-admin/src/main/webapp/static/js/ueditor/jsp/dialogs/preview/preview.html | 40
management/guns-core/src/main/java/com/stylefeng/guns/core/support/exception/ToolBoxException.java | 45
management/guns-admin/src/main/java/com/stylefeng/guns/core/shiro/factory/ShiroFactroy.java | 98
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TOrderCrossCityMapper.xml | 240
management/guns-admin/src/main/webapp/static/js/ueditor/1.4.3/lang/en/images/alldeletebtnhoverskin.png | 0
management/guns-admin/src/main/webapp/static/js/ueditor/1.4.3/third-party/highcharts/modules/data.js | 17
management/guns-admin/src/main/webapp/static/js/ueditor/jsp/themes/default/images/word.gif | 0
management/guns-admin/src/main/webapp/WEB-INF/view/system/tDispatch/tDispatch_edit.html | 51
management/guns-admin/src/main/webapp/static/js/plugins/umeditor/lang/zh-cn/images/imglabel.png | 0
management/guns-admin/src/main/webapp/static/fonts/fontawesome-webfont.ttf | 0
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/DeptMapper.xml | 37
management/guns-admin/src/main/webapp/static/js/ueditor/jsp/dialogs/video/video.css | 635
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/DriverActivityMapper.xml | 81
management/guns-admin/src/main/webapp/WEB-INF/view/system/tCompany/franchisee.html | 70
management/guns-admin/src/main/webapp/static/js/plugins/umeditor/third-party/mathquill/font/stixgeneral-bundle/stixgeneral-webfont.woff | 0
management/guns-admin/src/main/webapp/static/js/ueditor/1.4.3/dialogs/attachment/images/progress.png | 0
management/guns-admin/src/main/webapp/WEB-INF/view/system/userActivity/userActivity_detail.html | 496
management/guns-admin/src/main/webapp/static/crypto-js/rabbit.js | 192
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TransactionDetailsServiceImpl.java | 48
management/guns-admin/src/main/webapp/static/js/ueditor/1.4.3/third-party/webuploader/webuploader.js | 6733
management/guns-admin/src/main/webapp/static/modular/system/sysCouponActivity/sysCouponActivity_info.js | 291
management/guns-admin/src/main/webapp/static/img/account.png | 0
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/UserActivityRedenvelopeServiceImpl.java | 20
management/guns-admin/src/main/webapp/static/js/plugins/umeditor/lang/en/images/background.png | 0
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/PaymentRecordMapper.xml | 55
management/guns-admin/src/main/webapp/static/js/ueditor/jsp/third-party/highcharts/adapters/standalone-framework.js | 17
management/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderCharter/tOrderCharter.html | 61
management/guns-admin/src/main/webapp/static/css/bootstrap.min.css | 6
management/guns-admin/src/main/webapp/static/js/plugins/umeditor/umeditor.min.js | 264
management/guns-core/src/main/java/com/stylefeng/guns/core/exception/ServiceExceptionEnum.java | 20
management/guns-admin/src/main/webapp/static/js/plugins/layer/theme/default/icon.png | 0
management/guns-admin/src/main/webapp/static/js/ueditor/1.4.3/dialogs/attachment/attachment.js | 754
management/guns-admin/src/main/webapp/static/js/ueditor/1.4.3/ueditor.parse.js | 1022
management/guns-admin/src/main/webapp/static/layui/images/face/50.gif | 0
management/guns-core/src/main/java/com/stylefeng/guns/core/util/ExcelExportUtil.java | 271
management/guns-admin/src/main/webapp/WEB-INF/view/system/tNotices/system_add.html | 55
management/guns-admin/src/main/webapp/static/js/ueditor/1.4.3/net/App_Code/Handler.cs | 44
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/UserActivityDiscount1ServiceImpl.java | 268
management/guns-admin/src/main/webapp/static/js/ueditor/1.4.3/third-party/codemirror/codemirror.js | 3581
management/guns-admin/src/main/webapp/WEB-INF/view/system/tReassign/tReassign_reassignmentCross.html | 34
management/guns-admin/src/main/webapp/WEB-INF/view/system/tSysSensitiveWords/tSysSensitiveWords_edit.html | 28
management/guns-admin/src/main/webapp/static/js/ueditor/1.4.3/net/README.md | 141
management/guns-admin/src/main/webapp/static/layui/images/face/18.gif | 0
management/guns-admin/src/main/webapp/static/js/ueditor/jsp/dialogs/attachment/attachment.css | 681
management/guns-admin/src/main/webapp/static/img/20210511-092352.JPG | 0
management/guns-admin/src/main/webapp/static/modular/system/tNotices/tNotices_info.js | 150
management/guns-admin/src/main/webapp/static/modular/system/tVersionManagement/tVersionManagement.js | 222
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TOrderCrossCityMapper.java | 51
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TLineServiceImpl.java | 38
management/guns-admin/src/main/webapp/static/js/ueditor/1.4.3/jsp/src/com/baidu/ueditor/ActionEnter.java | 127
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/IncomeServiceImpl.java | 37
management/guns-admin/src/main/webapp/static/js/plugins/webuploader/webuploader.css | 28
management/guns-admin/src/main/webapp/WEB-INF/view/home.html | 264
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TCompanyCityServiceImpl.java | 20
management/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderTaxi/tOrderTaxi.html | 97
management/guns-admin/src/main/java/com/stylefeng/guns/core/common/constant/dictmap/Dict/UserAuthenticationDict.java | 24
management/guns-admin/src/main/webapp/WEB-INF/view/common/tags/input.tag | 54
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TServerCarmodel.java | 125
management/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderCharteredCar/tOrderCharteredCar_add.html | 40
management/guns-admin/src/main/webapp/static/js/plugins/umeditor/third-party/mathquill/font/stixgeneral-bundle/stixgeneral-webfont.ttf | 0
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/LineShiftDriverMapper.xml | 61
management/guns-admin/src/main/webapp/WEB-INF/view/system/tVerified/tVerified_add.html | 33
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/GDInterfaceMapper.java | 12
management/guns-admin/src/main/webapp/static/js/ueditor/jsp/dialogs/scrawl/images/eraser.png | 0
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ISysCouponRecordService.java | 16
management/guns-admin/src/main/webapp/static/modular/system/tProblem/tProblem_info.js | 111
management/guns-admin/src/main/webapp/static/css/plugins/chosen/chosen-sprite@2x.png | 0
management/guns-admin/src/main/webapp/static/js/ueditor/1.4.3/dialogs/table/edittable.html | 64
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TSysFaceDistinguishServiceImpl.java | 20
management/guns-admin/src/main/webapp/static/js/plugins/umeditor/dialogs/emotion/images/cface.gif | 0
management/guns-admin/src/main/webapp/static/js/ueditor/jsp/ueditor.config.js | 512
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TOrderLogisticsMapper.java | 46
management/guns-admin/src/main/webapp/static/js/ueditor/1.4.3/themes/default/images/cursor_v.gif | 0
management/guns-admin/src/main/webapp/static/js/ueditor/jsp/third-party/zeroclipboard/ZeroClipboard.min.js | 9
management/guns-admin/src/main/webapp/WEB-INF/view/common/tags/tag_tips | 22
management/guns-admin/src/main/webapp/static/modular/system/tReassign/selectPrivateCarDriver.js | 156
management/guns-admin/src/main/webapp/static/modular/system/tVersionManagement/tVersionManagement_info.js | 175
management/guns-admin/src/main/webapp/WEB-INF/view/system/dict/dict.html | 38
management/guns-admin/src/main/webapp/WEB-INF/view/system/report/couponStatisticsInfo.html | 46
management/guns-admin/src/main/webapp/static/js/ueditor/1.4.3/php/action_upload.php | 66
management/guns-admin/src/main/java/com/stylefeng/guns/modular/code/service/TableService.java | 29
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/DeptWarpper.java | 33
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TProblemServiceImpl.java | 28
management/guns-core/src/main/java/com/stylefeng/guns/core/base/controller/GlobalController.java | 37
management/guns-admin/src/main/webapp/static/modular/system/tOrderEvaluate/tOrderEvaluate_info.js | 100
management/guns-admin/pom.xml | 306
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/UserMapper.xml | 111
management/guns-admin/src/main/webapp/static/js/ueditor/jsp/third-party/webuploader/webuploader.html5only.min.js | 2
management/guns-admin/src/main/webapp/static/layui/images/face/30.gif | 0
management/guns-admin/src/main/webapp/static/css/plugins/bootstrap-table/bootstrap-table.min.css | 1
management/guns-admin/src/main/webapp/static/crypto-js/pad-pkcs7.js | 18
management/guns-admin/src/main/webapp/static/js/ueditor/1.4.3/third-party/highcharts/adapters/prototype-adapter.js | 15
management/guns-admin/src/main/webapp/static/js/ueditor/1.4.3/dialogs/table/edittable.css | 84
management/guns-admin/src/main/webapp/static/js/ueditor/jsp/dialogs/attachment/attachment.js | 754
management/guns-admin/src/main/webapp/static/modular/system/tSite/tSite_info.js | 376
management/guns-admin/src/main/webapp/WEB-INF/view/system/role/role_assign.html | 78
management/guns-admin/src/main/webapp/static/js/plugins/highcharts/adapters/standalone-framework.src.js | 590
management/guns-admin/src/main/webapp/WEB-INF/view/system/tFeedback/tFeedback_add.html | 36
management/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderTaxi/tOrderTaxi_add.html | 76
management/guns-admin/src/main/webapp/static/js/ueditor/1.4.3/themes/default/css/ueditor.css | 1903
management/guns-admin/src/main/webapp/static/js/ueditor/jsp/lang/en/images/localimage.png | 0
management/guns-admin/src/main/webapp/WEB-INF/view/system/userActivity/sysCouponRecord2.html | 38
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/NoticeMapper.xml | 23
management/guns-admin/src/main/webapp/static/js/ueditor/1.4.3/jsp/src/com/baidu/ueditor/ConfigManager.java | 222
management/guns-admin/src/main/webapp/static/js/ueditor/1.4.3/themes/default/images/pagebreak.gif | 0
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/UserCouponRecordMapper.xml | 1291
management/guns-admin/src/main/webapp/static/js/plugins/layer/skin/default/icon.png | 0
management/guns-admin/src/main/webapp/static/js/ueditor/1.4.3/dialogs/emotion/emotion.js | 186
management/guns-admin/src/main/webapp/static/modular/system/report/operationalData.js | 87
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TSysSensitiveWordsMapper.java | 29
management/guns-admin/src/main/webapp/static/modular/system/tVerified/tVerified_info.js | 118
management/guns-admin/src/main/webapp/WEB-INF/view/system/tCompany/tCompany.html | 73
management/guns-admin/src/main/webapp/static/bitbug_favicon.ico | 0
management/guns-admin/src/main/webapp/static/crypto-js/pbkdf2.js | 145
management/guns-admin/src/main/webapp/static/js/ueditor/jsp/third-party/video-js/font/vjs.svg | 65
management/guns-admin/src/main/webapp/static/js/plugins/umeditor/third-party/mathquill/font/Symbola.ttf | 0
management/guns-admin/src/main/webapp/WEB-INF/view/system/tVersionManagement/tVersionManagement_add.html | 72
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/three/PlatformUtil.java | 374
management/guns-admin/src/main/webapp/static/js/ueditor/1.4.3/dialogs/scrawl/images/redo.png | 0
management/guns-generator/src/main/java/com/stylefeng/guns/generator/engine/config/Menu.java | 203
management/guns-admin/src/main/webapp/WEB-INF/view/system/driverActivity/driverActivity_detail.html | 132
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TAdvertisementController.java | 151
management/guns-admin/src/main/java/com/stylefeng/guns/core/common/constant/state/Order.java | 26
management/guns-admin/src/main/webapp/static/css/plugins/ztree/zTreeStyle.css | 97
management/guns-admin/src/main/webapp/static/js/ueditor/jsp/third-party/codemirror/codemirror.js | 3581
management/guns-admin/src/main/webapp/static/js/plugins/pace/pace.min.js | 2
management/guns-admin/src/main/webapp/static/js/ueditor/jsp/lang/zh-cn/images/music.png | 0
management/guns-admin/src/main/webapp/static/js/ueditor/jsp/dialogs/help/help.js | 56
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/DriverActivityOnlineController.java | 104
management/guns-admin/src/main/webapp/static/modular/system/tDriver/yesDriver_selectCar.js | 155
management/guns-admin/src/main/java/com/stylefeng/guns/core/common/constant/dictmap/UserDict.java | 36
management/guns-admin/src/main/webapp/static/js/plugins/highcharts/adapters/standalone-framework.js | 18
management/guns-admin/src/main/webapp/static/js/ueditor/1.4.3/php/controller.php | 59
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TPubTransactionDetailsMapper.xml | 24
management/guns-admin/src/main/webapp/static/js/ueditor/1.4.3/dialogs/template/images/pre4.png | 0
management/guns-admin/src/main/webapp/static/crypto-js/rabbit-legacy.js | 190
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TAgreementMapper.java | 16
management/guns-admin/src/main/webapp/static/modular/system/notice/notice_info.js | 127
management/guns-admin/src/main/webapp/WEB-INF/view/system/tIntegralOrder/tIntegralOrder.html | 61
management/guns-admin/src/main/webapp/static/js/ueditor/1.4.3/third-party/webuploader/webuploader.css | 28
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/OperationLogMapper.xml | 48
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/UserRedPacketRecordMapper.xml | 218
management/guns-admin/src/main/webapp/static/js/ueditor/jsp/dialogs/template/images/pre2.png | 0
management/guns-admin/src/main/webapp/static/js/ueditor/jsp/lang/en/images/music.png | 0
management/guns-admin/src/main/webapp/WEB-INF/view/system/tCompany/tCompany_add.html | 307
management/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderCharteredCar/tOrderCharteredCar.html | 61
management/guns-admin/src/main/webapp/static/layui/font/iconfont.woff2 | 0
management/guns-admin/src/main/webapp/WEB-INF/view/index.html | 47
management/guns-admin/src/main/webapp/static/js/plugins/layer/layim/data/group.json | 57
management/guns-core/src/main/java/com/stylefeng/guns/core/datascope/DataScope.java | 50
management/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderLogistics/tOrderLogistics.html | 94
management/guns-admin/src/main/webapp/static/favicon1.ico | 0
management/guns-admin/src/main/webapp/static/js/ueditor/1.4.3/net/App_Code/PathFormater.cs | 50
management/guns-admin/src/main/webapp/static/modular/system/driverActivity/driverActivity.js | 208
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/DriverActivityOnlineMapper.java | 16
management/guns-admin/src/main/webapp/WEB-INF/view/system/tAgreement/commonProblem.html | 65
management/guns-admin/src/main/webapp/static/js/ueditor/jsp/themes/default/images/wordpaste.png | 0
management/guns-admin/src/main/webapp/static/crypto-js/format-hex.js | 66
management/guns-admin/src/main/webapp/static/js/plugins/umeditor/lang/en/images/localimage.png | 0
management/guns-admin/src/main/webapp/static/js/plugins/umeditor/dialogs/video/video.js | 282
management/guns-admin/src/main/webapp/static/modular/system/userActivity/sysRedPacketRecord.js | 104
management/guns-admin/src/main/webapp/static/js/plugins/highcharts/themes/dark-unica.js | 213
management/guns-admin/src/main/java/com/stylefeng/guns/core/aop/PermissionAop.java | 70
management/guns-admin/src/main/webapp/static/layui/lay/modules/form.js | 2
management/guns-admin/src/main/webapp/static/js/plugins/umeditor/dialogs/image/images/upload1.png | 0
management/guns-admin/src/main/java/com/stylefeng/guns/core/common/constant/dictmap/NoticeMap.java | 22
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITFeedbackService.java | 32
management/guns-admin/src/main/webapp/static/layui/images/face/23.gif | 0
management/guns-admin/src/main/java/com/stylefeng/guns/core/util/KaptchaUtil.java | 16
management/guns-admin/src/main/webapp/static/js/ueditor/jsp/themes/default/images/cursor_v.png | 0
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TLineSiteServiceImpl.java | 20
management/guns-admin/src/main/webapp/static/js/plugins/bootstrap-table/bootstrap-table-mobile.min.js | 7
management/guns-admin/src/main/webapp/WEB-INF/view/system/tUserRedPacketRecord/tUserRedPacketRecord_edit.html | 35
management/guns-admin/src/main/webapp/static/js/ueditor/1.4.3/themes/default/images/toolbar_bg.png | 0
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/transfer/UserDto.java | 153
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverActivityServiceImpl.java | 241
management/guns-admin/src/main/java/com/stylefeng/guns/core/common/constant/cache/CacheKey.java | 31
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/RoleServiceImpl.java | 75
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITOrderPrivateCarService.java | 46
management/guns-admin/src/main/webapp/WEB-INF/view/system/tOpenCity/tOpenCity_add.html | 79
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/DictMapper.xml | 42
management/guns-admin/src/main/webapp/static/modular/system/tDriver/yesDriver_info.js | 714
management/guns-admin/src/main/webapp/WEB-INF/view/system/user/user_view.html | 75
management/guns-admin/src/main/webapp/static/js/ueditor/jsp/dialogs/scrawl/images/emptyH.png | 0
management/guns-admin/src/main/webapp/static/layui/css/modules/laydate/default/laydate.css | 2
management/guns-admin/src/main/java/com/stylefeng/guns/core/common/constant/state/ExpenseState.java | 52
management/guns-admin/src/main/webapp/static/layui/font/iconfont.woff | 0
management/guns-admin/src/main/webapp/static/js/ueditor/jsp/dialogs/music/music.css | 30
management/guns-admin/src/main/webapp/static/layui/images/face/52.gif | 0
management/guns-core/src/main/java/com/stylefeng/guns/core/exception/GunsException.java | 36
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/Dict.java | 116
management/guns-admin/src/main/webapp/static/js/ueditor/1.4.3/dialogs/internal.js | 81
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/DeptMapper.java | 32
management/guns-admin/src/main/webapp/WEB-INF/view/system/tOpenCity/tOpenCity.html | 48
management/guns-admin/src/main/webapp/static/modular/system/tIntegralGoods/tIntegralGoods_info.js | 151
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TLinePriceMapper.xml | 22
management/guns-admin/src/main/webapp/static/js/ueditor/1.4.3/asp/ASPJson.class.asp | 271
management/guns-admin/src/main/webapp/WEB-INF/view/system/sysRedPacketRecord/sysRedPacketRecord.html | 45
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/PaymentRecordMapper.java | 23
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/GDInterfaceServiceImpl.java | 39
management/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderCharteredCar/tOrderCharteredCar_immediately.html | 28
management/guns-core/src/main/java/com/stylefeng/guns/core/qr/ImgQrTool.java | 294
management/guns-admin/src/main/webapp/static/layui/images/face/59.gif | 0
management/guns-admin/src/main/webapp/static/js/ueditor/1.4.3/dialogs/emotion/images/neweditor-tab-bg.png | 0
management/guns-admin/src/main/webapp/static/js/ueditor/1.4.3/dialogs/background/images/success.png | 0
management/guns-generator/src/main/java/com/stylefeng/guns/generator/engine/config/ContextConfig.java | 214
management/guns-admin/src/main/webapp/static/layui/images/face/7.gif | 0
management/guns-admin/src/main/webapp/static/crypto-js/sha3.js | 326
management/guns-admin/src/main/webapp/static/js/ueditor/jsp/dialogs/attachment/fileTypeImages/icon_txt.gif | 0
management/guns-admin/src/main/webapp/static/js/ueditor/jsp/dialogs/attachment/fileTypeImages/icon_pdf.gif | 0
management/guns-admin/src/main/webapp/static/js/ueditor/1.4.3/dialogs/charts/images/charts5.png | 0
management/guns-admin/src/main/webapp/static/layui/css/modules/layer/default/loading-2.gif | 0
management/guns-admin/src/main/webapp/static/js/plugins/webuploader/webuploader.withoutimage.js | 4993
management/guns-admin/src/main/webapp/static/img/index4.png | 0
management/guns-admin/src/main/webapp/static/modular/system/tIntegralGoods/tIntegralGoods.js | 202
management/guns-admin/src/main/webapp/static/modular/system/tNotices/system.js | 200
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TServerCarmodelMapper.xml | 35
management/guns-admin/src/main/webapp/static/js/ueditor/jsp/dialogs/emotion/emotion.css | 43
management/guns-admin/src/main/webapp/static/crypto-js/hmac-sha1.js | 18
management/guns-admin/src/main/webapp/WEB-INF/view/system/tAgreement/instructions.html | 65
management/guns-admin/src/main/webapp/static/modular/system/tReassign/smallPieceLogistics.js | 325
management/guns-admin/src/main/webapp/static/crypto-js/sha384.js | 83
management/guns-generator/src/main/java/com/stylefeng/guns/generator/action/model/GenQo.java | 297
management/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderPrivateCar/tOrderPrivateCar_trajectory.html | 52
management/guns-admin/src/main/webapp/WEB-INF/view/system/tSmsrecord/tSmsrecord_edit.html | 31
management/guns-admin/src/main/webapp/static/js/ueditor/jsp/third-party/highcharts/highcharts.js | 283
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/UserActivityDiscount2ServiceImpl.java | 20
management/guns-admin/src/main/webapp/WEB-INF/view/system/tAgreement/corssHtml.html | 65
management/guns-admin/src/main/webapp/static/js/ueditor/1.4.3/net/Bin/Newtonsoft.Json.pdb | 0
management/guns-admin/src/main/webapp/static/js/ueditor/jsp/dialogs/charts/images/charts0.png | 0
management/guns-admin/src/main/webapp/static/modular/system/role/role_info.js | 202
management/guns-admin/src/main/webapp/static/js/ueditor/jsp/dialogs/image/images/icons.png | 0
management/guns-admin/src/main/webapp/static/js/plugins/umeditor/dialogs/video/images/left_focus.jpg | 0
management/guns-admin/src/main/webapp/static/js/ueditor/1.4.3/themes/default/images/neweditor-tab-bg.png | 0
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TFeedbackMapper.xml | 67
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TOrderEvaluateMapper.xml | 60
management/guns-admin/src/main/webapp/static/js/ueditor/jsp/third-party/video-js/video.dev.js | 7108
management/guns-admin/src/main/webapp/static/js/plugins/webuploader/webuploader.flashonly.js | 4622
management/guns-admin/src/main/webapp/static/js/ueditor/jsp/dialogs/emotion/images/0.gif | 0
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITProblemService.java | 30
management/guns-admin/src/main/webapp/static/js/ueditor/1.4.3/third-party/highcharts/highcharts-more.js | 50
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TDriverServiceImpl.java | 64
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TOrderCharterController.java | 109
management/guns-admin/src/main/webapp/static/img/index.png | 0
management/guns-admin/src/main/webapp/static/layui/images/face/68.gif | 0
management/guns-admin/src/main/webapp/static/modular/system/tOrderTaxi/tOrderTaxi_info.js | 236
management/guns-admin/src/main/webapp/static/js/plugins/umeditor/lang/zh-cn/images/upload.png | 0
management/guns-admin/src/main/webapp/static/js/plugins/umeditor/third-party/mathquill/font/Symbola.woff | 0
management/guns-generator/src/main/resources/gunsTemplate/advanced/page_add.html.btl | 41
management/guns-admin/src/main/webapp/static/modular/system/sysRedPacketRecord/sysRedPacketRecord.js | 122
management/guns-admin/src/main/webapp/static/js/ueditor/1.4.3/jsp/src/com/baidu/ueditor/define/FileType.java | 31
management/guns-admin/src/main/webapp/static/layui/images/face/43.gif | 0
management/guns-core/src/main/java/com/stylefeng/guns/core/support/PageKit.java | 57
management/guns-admin/src/main/java/com/stylefeng/guns/core/util/WoUtil.java | 31
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/RegionMapper.java | 16
management/guns-admin/src/main/webapp/static/modular/system/tOrderPrivateCar/tOrderPrivateCar.js | 379
management/guns-admin/src/main/webapp/static/js/plugins/umeditor/third-party/mathquill/font/stixgeneral-bundle/stixgeneralbolita-webfont.ttf | 0
management/guns-admin/src/main/webapp/static/js/plugins/highcharts/highcharts-all.js | 462
management/guns-admin/src/main/webapp/static/js/ueditor/1.4.3/dialogs/scrawl/images/empty.png | 0
management/guns-admin/src/main/webapp/static/crypto-js/mode-ctr.js | 58
management/guns-admin/src/main/webapp/static/js/ueditor/jsp/third-party/highcharts/modules/heatmap.js | 1
management/guns-admin/src/main/webapp/static/js/ueditor/jsp/lang/en/images/rotaterightenable.png | 0
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TPubWithdrawalMapper.java | 30
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TLineShift.java | 138
management/guns-admin/src/main/webapp/WEB-INF/view/system/user/user_roleassign.html | 79
management/guns-admin/src/main/webapp/static/js/plugins/layer/theme/default/icon-ext.png | 0
management/guns-admin/src/main/webapp/static/modular/system/tSite/tSite.js | 231
management/guns-core/src/main/java/com/stylefeng/guns/core/support/HexKit.java | 254
management/guns-admin/src/main/webapp/static/js/ueditor/jsp/dialogs/table/edittable.js | 237
management/guns-admin/src/main/webapp/static/crypto-js/tripledes.js | 779
management/guns-admin/src/main/webapp/static/js/ueditor/1.4.3/dialogs/image/images/image.png | 0
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TSystemNoticeServiceImpl.java | 20
management/guns-admin/src/main/java/com/stylefeng/guns/core/intercept/GunsUserFilter.java | 105
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITSmsrecordService.java | 29
management/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/tDriver_optDriver.html | 29
management/guns-admin/src/main/webapp/static/layui/images/face/29.gif | 0
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TDriverLineMapper.java | 26
management/guns-admin/src/main/webapp/static/js/ueditor/1.4.3/jsp/src/com/baidu/ueditor/PathFormat.java | 157
management/guns-admin/src/main/webapp/static/js/ueditor/jsp/dialogs/link/link.html | 126
management/guns-admin/src/main/java/com/stylefeng/guns/core/common/constant/dictmap/Dict/ObjectDict.java | 28
management/guns-admin/src/main/webapp/WEB-INF/view/system/sysCouponRecord/sysCouponRecord_edit.html | 34
management/guns-admin/src/main/webapp/static/js/ueditor/jsp/dialogs/background/images/bg.png | 0
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITPubWithdrawalService.java | 30
management/guns-admin/src/main/webapp/static/modular/system/tIntegralOrder/tIntegralOrder.js | 240
management/guns-admin/src/main/webapp/WEB-INF/view/system/tAdvertisement/tAdvertisement_edit.html | 79
management/guns-admin/src/main/webapp/static/js/plugins/umeditor/themes/default/images/spacer.gif | 0
management/guns-admin/src/main/webapp/static/js/plugins/webuploader/webuploader.min.js | 3
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IOperationLogService.java | 24
management/guns-admin/src/main/webapp/static/layui/font/iconfont.ttf | 0
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/UserCouponRecordServiceImpl.java | 483
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TSystemNoticeMapper.java | 16
management/guns-admin/src/main/webapp/static/js/plugins/webuploader/webuploader.js | 8106
management/guns-admin/src/main/webapp/static/js/plugins/layer/skin/default/xubox_ico0.png | 0
management/guns-admin/src/main/webapp/static/js/ueditor/1.4.3/lang/en/images/listbackground.png | 0
management/guns-admin/src/main/webapp/WEB-INF/view/system/role/role.html | 41
management/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderCharter/tOrderCharter_add.html | 35
management/guns-admin/src/main/webapp/static/modular/system/tOrderCharteredCar/tOrderCharteredCar_info.js | 107
management/guns-admin/src/main/webapp/WEB-INF/view/system/tFeedback/tFeedback_edit.html | 36
management/guns-admin/src/main/webapp/static/js/plugins/umeditor/lang/en/images/alldeletebtnhoverskin.png | 0
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TIntegralGoodsServiceImpl.java | 28
management/guns-admin/src/main/resources/application.yml | 104
management/guns-core/src/main/java/com/stylefeng/guns/core/support/BasicType.java | 38
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITLineShiftService.java | 16
management/guns-admin/src/main/webapp/static/js/ueditor/1.4.3/dialogs/emotion/emotion.html | 54
management/guns-admin/src/main/webapp/static/js/ueditor/jsp/dialogs/background/background.js | 376
management/guns-admin/src/main/webapp/static/modular/system/tReassign/tReassign_info.js | 108
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TSiteMapper.java | 36
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TUserRedPacketRecordServiceImpl.java | 20
management/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderTaxi/tOrderTaxi_trajectory.html | 52
management/guns-admin/src/main/webapp/WEB-INF/view/system/role/role_edit.html | 47
management/guns-admin/src/main/webapp/static/js/ueditor/1.4.3/themes/default/images/tangram-colorpicker.png | 0
management/guns-admin/src/main/webapp/static/js/plugins/layer/theme/default/loading-1.gif | 0
management/guns-admin/src/main/webapp/static/js/ueditor/1.4.3/dialogs/searchreplace/searchreplace.html | 102
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/task/base/QuartzManager.java | 141
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/UserActivityMapper.java | 32
management/guns-admin/src/main/webapp/static/js/plugins/umeditor/lang/zh-cn/images/copy.png | 0
management/guns-admin/src/main/webapp/static/js/jquery.min.js | 4
management/guns-admin/src/main/webapp/static/layui/lay/modules/colorpicker.js | 2
management/guns-admin/src/main/webapp/static/car.png | 0
management/guns-admin/src/main/webapp/static/js/ueditor/1.4.3/net/App_Code/NotSupportedHandler.cs | 23
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/UserActivityServiceImpl.java | 293
management/guns-admin/src/main/webapp/static/css/plugins/iCheck/green.png | 0
management/guns-admin/src/main/webapp/static/js/plugins/layer/skin/moon/default.png | 0
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/OssUploadUtil.java | 39
management/guns-admin/src/main/webapp/static/js/ueditor/jsp/jsp/controller.jsp | 14
management/guns-admin/src/main/webapp/static/js/ueditor/jsp/lang/en/images/addimage.png | 0
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TSysCancleOrderMapper.xml | 20
management/guns-admin/src/main/webapp/static/js/ueditor/jsp/dialogs/attachment/images/success.gif | 0
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITDispatchService.java | 35
management/guns-admin/src/main/webapp/static/js/ueditor/jsp/dialogs/image/image.js | 1143
management/guns-admin/src/main/webapp/static/js/ueditor/1.4.3/dialogs/image/images/success.png | 0
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/util/UploadUtil.java | 170
management/guns-admin/src/main/webapp/WEB-INF/view/system/tVersionManagement/tVersionManagement_edit.html | 32
management/guns-admin/src/main/webapp/static/js/ueditor/jsp/dialogs/template/template.html | 26
management/guns-admin/src/main/webapp/static/layui/images/face/9.gif | 0
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TDispatchController.java | 233
management/guns-admin/src/main/webapp/static/js/ueditor/1.4.3/dialogs/map/map.html | 135
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/UserActivityRedenvelopeController.java | 104
management/guns-admin/src/main/webapp/static/layui/images/face/14.gif | 0
management/guns-admin/src/main/webapp/static/layui/images/face/57.gif | 0
management/guns-admin/src/main/webapp/static/js/plugins/highcharts/modules/exporting.src.js | 775
management/guns-admin/src/main/webapp/static/js/ueditor/jsp/lang/en/images/button.png | 0
management/guns-admin/src/main/webapp/static/modular/system/sysCouponActivity/sysCouponActivity.js | 184
management/guns-admin/src/main/webapp/static/modular/system/tDriver/tDriver_info.js | 172
management/guns-admin/src/main/webapp/static/js/plugins/layer/skin/default/xubox_loading0.gif | 0
management/guns-core/src/main/java/com/stylefeng/guns/core/cache/ILoader.java | 23
management/guns-admin/src/main/webapp/static/js/ueditor/1.4.3/net/Web.config | 9
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TLineShiftMapper.java | 16
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/OrderCancel.java | 178
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IIncomeService.java | 19
management/guns-admin/src/main/webapp/WEB-INF/view/system/sysRedPacketRecord/sysRedPacketRecord_edit.html | 34
management/guns-admin/src/main/webapp/static/js/ueditor/1.4.3/dialogs/attachment/images/image.png | 0
management/guns-core/src/main/java/com/stylefeng/guns/core/mutidatasource/aop/MultiSourceExAop.java | 77
management/guns-admin/src/main/webapp/static/js/plugins/umeditor/lang/en/images/button.png | 0
management/guns-admin/src/main/webapp/WEB-INF/view/system/tInvoice/tInvoice_edit.html | 39
management/guns-admin/src/main/java/com/stylefeng/guns/core/common/annotion/Permission.java | 22
management/guns-admin/src/main/webapp/static/js/ueditor/jsp/dialogs/spechars/spechars.js | 57
management/guns-admin/src/main/webapp/static/css/plugins/chosen/chosen-sprite.png | 0
management/guns-admin/src/main/webapp/static/js/ueditor/1.4.3/lang/en/images/button.png | 0
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/OperationLogServiceImpl.java | 29
management/guns-admin/src/main/webapp/static/js/ueditor/1.4.3/dialogs/video/images/file-icons.png | 0
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TOrderCharteredCar.java | 225
management/guns-admin/src/main/webapp/static/js/ueditor/jsp/lang/en/images/rotaterightdisable.png | 0
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TCarBrandController.java | 116
management/guns-admin/src/main/webapp/static/js/ueditor/1.4.3/dialogs/table/edittable.js | 237
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TOrderCharteredCarServiceImpl.java | 28
management/guns-admin/src/main/webapp/static/js/plugins/layer/laydate/skins/default/laydate.css | 59
management/guns-admin/src/main/webapp/static/js/ueditor/1.4.3/third-party/highcharts/modules/data.src.js | 582
management/guns-admin/src/main/webapp/static/modular/system/tUser/tUser_info.js | 218
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/SysRedPacketRecordMapper.xml | 26
management/guns-admin/src/main/webapp/static/js/common/bootstrap-table-object.js | 146
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TProblem.java | 137
management/guns-admin/src/main/webapp/static/js/ueditor/1.4.3/net/Bin/Newtonsoft.Json.xml | 8472
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TOrderPrivateCarServiceImpl.java | 33
management/guns-admin/src/main/webapp/static/crypto-js/mode-cfb.js | 80
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITReassignService.java | 108
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IDriverActivityOnlineService.java | 16
management/guns-admin/src/main/webapp/static/layui/lay/modules/laypage.js | 2
management/guns-admin/src/main/webapp/static/crypto-js/sha512.js | 326
management/guns-admin/src/main/webapp/static/modular/system/driverActivity/driverActivity_info.js | 277
management/guns-admin/src/main/webapp/static/crypto-js/mode-ctr-gladman.js | 116
management/guns-admin/src/main/webapp/static/js/plugins/highcharts/modules/drilldown.src.js | 586
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TCompanyCityMapper.java | 16
management/guns-admin/src/main/webapp/static/js/plugins/umeditor/themes/default/images/caret.png | 0
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TLinePriceMapper.java | 16
management/guns-admin/src/main/webapp/static/fonts/glyphicons-halflings-regular.woff2 | 0
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IDriverActivityRegisteredService.java | 16
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TProblemMapper.java | 30
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TLocationMapper.java | 16
management/guns-admin/src/main/webapp/static/js/ueditor/jsp/lang/en/images/copy.png | 0
management/guns-admin/src/main/webapp/WEB-INF/view/system/user/user_edit.html | 58
management/guns-admin/src/main/webapp/static/js/ueditor/1.4.3/lang/en/images/rotaterightdisable.png | 0
management/guns-admin/src/main/webapp/static/layui/css/modules/layer/default/loading-0.gif | 0
management/guns-admin/src/main/webapp/WEB-INF/view/common/tags/uploadImg.tag | 26
management/guns-admin/src/main/webapp/static/js/ueditor/jsp/dialogs/template/template.css | 18
management/guns-admin/src/main/webapp/static/modular/system/tServerCarmodel/tServerCarmodel_info.js | 131
management/guns-admin/src/main/webapp/static/js/ueditor/1.4.3/third-party/highcharts/adapters/standalone-framework.js | 17
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TInvoiceServiceImpl.java | 28
management/guns-admin/src/main/webapp/static/js/ueditor/1.4.3/dialogs/attachment/fileTypeImages/icon_doc.gif | 0
management/guns-admin/src/main/webapp/static/js/ueditor/1.4.3/dialogs/background/background.js | 376
management/guns-admin/src/main/java/com/stylefeng/guns/core/tag/DictSelectorTag.java | 201
management/guns-admin/src/main/webapp/WEB-INF/view/system/tSystemPrice/tSystemPrice_edit.html | 182
management/guns-admin/src/main/webapp/static/js/ueditor/1.4.3/asp/README.md | 115
management/guns-admin/src/main/webapp/static/layui/images/face/54.gif | 0
management/guns-admin/src/main/webapp/WEB-INF/view/system/sysCouponActivity/sysCouponActivity_immediately.html | 41
management/guns-admin/src/main/webapp/static/js/ueditor/jsp/dialogs/emotion/images/bface.gif | 0
management/guns-admin/src/main/webapp/static/js/ueditor/jsp/themes/default/images/loading.gif | 0
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/three/Base64Coder.java | 125
management/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/tDriver_edit.html | 283
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TOrderLogisticsServiceImpl.java | 33
management/guns-admin/src/main/webapp/static/img/bg.png | 0
management/guns-admin/src/main/webapp/static/js/ueditor/1.4.3/dialogs/attachment/fileTypeImages/icon_mv.gif | 0
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/system/BlackboardController.java | 96
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/LoginLogMapper.xml | 43
management/guns-admin/src/main/webapp/static/js/ueditor/1.4.3/dialogs/emotion/images/bface.gif | 0
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TLineCompanyMapper.xml | 19
management/guns-admin/src/main/webapp/static/js/ueditor/1.4.3/dialogs/video/images/success.gif | 0
management/guns-admin/src/main/webapp/static/js/ueditor/1.4.3/themes/default/images/cursor_v.png | 0
management/guns-core/src/main/java/com/stylefeng/guns/core/mutidatasource/DataSourceContextHolder.java | 35
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IUserActivityBalanceService.java | 16
management/guns-core/src/main/java/com/stylefeng/guns/core/page/PageBT.java | 65
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TOrderCharterMapper.java | 33
management/guns-admin/src/main/webapp/static/js/ueditor/1.4.3/themes/default/images/button-bg.gif | 0
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/UserActivityBalanceMapper.java | 16
management/guns-admin/src/main/webapp/static/js/ueditor/jsp/lang/zh-cn/images/upload.png | 0
management/guns-admin/src/main/webapp/static/modular/system/tLine/tLine.js | 244
management/guns-admin/src/main/webapp/static/layui/images/face/27.gif | 0
management/guns-admin/src/main/webapp/WEB-INF/view/system/tInvoice/tInvoice.html | 63
management/guns-admin/src/main/webapp/static/js/ueditor/1.4.3/themes/default/images/word.gif | 0
management/guns-core/src/main/java/com/stylefeng/guns/core/exception/GunsExceptionEnum.java | 59
management/guns-admin/src/main/webapp/static/js/ueditor/jsp/dialogs/wordimage/wordimage.js | 157
management/guns-admin/src/main/webapp/static/modular/system/tNotices/tNotices.js | 171
management/guns-admin/src/main/java/com/stylefeng/guns/core/common/constant/dictmap/MenuDict.java | 34
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TSysReformist.java | 98
management/guns-admin/src/main/webapp/static/js/ueditor/jsp/dialogs/charts/images/charts4.png | 0
management/guns-admin/src/main/java/com/stylefeng/guns/core/log/factory/LogFactory.java | 47
management/guns-admin/src/main/webapp/WEB-INF/view/system/userActivity/userActivity_edit.html | 509
management/guns-admin/src/main/webapp/static/modular/system/tSite/electricFence.js | 329
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/MenuMapper.java | 80
management/guns-admin/src/main/webapp/static/layui/lay/modules/laydate.js | 2
management/guns-admin/src/main/webapp/static/layui/images/face/12.gif | 0
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TOrderPrivateCarController.java | 227
management/guns-admin/src/main/webapp/static/layui/lay/modules/flow.js | 2
management/guns-admin/src/main/webapp/static/js/ueditor/1.4.3/third-party/highcharts/highcharts.src.js | 16974 +
management/guns-admin/src/main/webapp/static/modular/system/report/couponStatisticsInfo.js | 135
management/guns-admin/src/main/webapp/static/modular/system/dept/dept.js | 110
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITOpenCityService.java | 40
management/guns-admin/src/main/webapp/WEB-INF/view/system/tComplaint/lookDetail.html | 29
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TSysReformistMapper.java | 16
management/guns-admin/src/main/webapp/WEB-INF/view/system/sysCouponActivity/sysCouponActivity_add.html | 65
management/guns-admin/src/main/webapp/static/js/plugins/highcharts/modules/funnel.src.js | 310
management/guns-admin/src/main/webapp/static/layui/lay/modules/jquery.js | 5
management/guns-admin/src/main/webapp/WEB-INF/view/system/tNotices/system_update.html | 40
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TOrderTaxiServiceImpl.java | 56
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/SpringContextsUtil.java | 37
management/guns-admin/src/main/webapp/static/js/plugins/webuploader/Uploader.swf | 0
management/guns-generator/src/main/java/com/stylefeng/guns/generator/action/GunsCodeGenerator.java | 30
management/guns-admin/src/main/webapp/static/js/ueditor/jsp/themes/default/images/videologo.gif | 0
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TLineController.java | 378
management/guns-admin/src/main/webapp/static/js/plugins/chosen/chosen.jquery.js | 1211
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TCarModelServiceImpl.java | 28
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/task/ThreadTes.java | 25
management/guns-admin/src/main/webapp/WEB-INF/view/common/tags/table.tag | 12
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/UserServiceImpl.java | 61
management/guns-admin/src/main/resources/META-INF/spring-devtools.properties | 1
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TCarModelMapper.xml | 38
management/guns-admin/src/main/webapp/static/js/ueditor/1.4.3/third-party/webuploader/webuploader.flashonly.min.js | 2
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TServerCarmodelMapper.java | 28
management/guns-admin/src/main/webapp/static/js/ueditor/1.4.3/dialogs/video/images/bg.png | 0
management/guns-admin/src/main/webapp/static/js/ueditor/1.4.3/lang/en/en.js | 684
management/guns-admin/src/main/webapp/static/modular/flowable/expense/expense.js | 93
management/guns-admin/src/main/webapp/static/css/plugins/sweetalert/sweetalert.css | 715
management/guns-admin/src/main/webapp/static/js/ueditor/1.4.3/jsp/src/com/baidu/ueditor/define/ActionState.java | 5
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITDriverService.java | 94
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITCompanyCityService.java | 16
management/guns-admin/src/main/webapp/static/js/ueditor/jsp/themes/default/images/sortable.png | 0
management/guns-admin/src/main/webapp/static/js/ueditor/jsp/dialogs/video/images/left_focus.jpg | 0
management/guns-admin/src/main/webapp/WEB-INF/view/system/dict/dict_add.html | 64
management/guns-admin/src/main/java/com/stylefeng/guns/core/log/LogObjectHolder.java | 34
management/guns-admin/src/main/webapp/WEB-INF/view/system/dept/dept_add.html | 42
management/guns-admin/src/main/webapp/static/js/ueditor/1.4.3/third-party/highcharts/modules/no-data-to-display.src.js | 128
management/guns-admin/src/main/webapp/static/js/plugins/webuploader/webuploader.custom.js | 6502
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TPubWithdrawalMapper.xml | 51
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TCarServiceImpl.java | 33
management/guns-admin/src/main/webapp/WEB-INF/view/system/userActivity/receiveRecord.html | 296
management/guns-admin/src/main/webapp/static/css/plugins/ztree/img/diy/4.png | 0
management/guns-admin/src/main/webapp/static/img/index1.png | 0
management/guns-admin/src/main/webapp/static/js/plugins/layer/layim/layim.js | 630
management/guns-admin/src/main/webapp/static/js/ueditor/1.4.3/net/config.json | 94
management/guns-admin/src/main/webapp/static/js/ueditor/jsp/dialogs/attachment/fileTypeImages/icon_default.png | 0
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/UserActivityRedenvelope.java | 163
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITServerCarmodelService.java | 28
management/guns-admin/src/main/webapp/static/modular/flowable/expense/expense_info.js | 96
management/guns-admin/src/main/webapp/static/modular/system/tCompany/tCompany.js | 293
management/guns-admin/src/main/webapp/static/js/ueditor/1.4.3/dialogs/template/template.html | 26
management/guns-admin/src/main/java/com/stylefeng/guns/core/shiro/check/ICheck.java | 32
management/guns-admin/src/main/webapp/static/modular/system/report/couponStatistics.js | 399
management/guns-admin/src/main/webapp/static/js/plugins/laydate/theme/default/font/iconfont.eot | 0
management/guns-admin/src/main/webapp/static/js/ueditor/1.4.3/themes/default/images/upload.png | 0
management/guns-admin/src/main/webapp/static/js/plugins/ztree/jquery.ztree.all.min.js | 165
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITDriverServiceService.java | 16
management/guns-admin/src/main/webapp/static/js/ueditor/1.4.3/third-party/webuploader/webuploader.min.js | 2
management/guns-admin/src/main/webapp/static/js/ueditor/jsp/themes/default/images/cancelbutton.gif | 0
management/guns-admin/src/main/java/com/stylefeng/guns/config/web/BeetlConfig.java | 46
management/guns-admin/src/main/webapp/static/js/ueditor/jsp/dialogs/charts/chart.config.js | 65
management/guns-admin/src/main/java/com/stylefeng/guns/core/common/constant/dictmap/Dict/LabelDict.java | 25
management/guns-admin/src/main/webapp/static/css/login.css | 93
management/guns-admin/src/main/webapp/static/js/ueditor/jsp/third-party/video-js/font/vjs.eot | 0
management/guns-admin/src/main/webapp/static/layui/images/face/71.gif | 0
management/guns-admin/src/main/webapp/WEB-INF/view/common/_container.html | 194
management/guns-admin/src/main/webapp/static/js/ueditor/1.4.3/themes/default/images/arrow_up.png | 0
management/guns-admin/src/main/webapp/static/crypto-js/lib-typedarrays.js | 76
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/Income.java | 134
management/guns-admin/src/main/webapp/static/js/ueditor/1.4.3/lang/en/images/rotateleftdisable.png | 0
management/guns-admin/src/main/webapp/static/layui/images/face/56.gif | 0
management/guns-admin/src/main/webapp/static/js/ueditor/1.4.3/asp/Uploader.Class.asp | 219
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/Role.java | 127
management/guns-admin/src/main/resources/logback-spring.xml | 132
management/guns-admin/src/main/webapp/static/js/ueditor/1.4.3/third-party/highcharts/modules/drilldown.src.js | 447
management/guns-admin/src/main/webapp/static/js/ueditor/1.4.3/dialogs/scrawl/images/emptyH.png | 0
management/guns-admin/src/main/webapp/static/js/ueditor/jsp/third-party/video-js/video-js.min.css | 5
management/guns-admin/src/main/webapp/static/modular/system/driverActivityHistory/driverActivityHistory.js | 104
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/AESUtils.java | 104
management/guns-admin/src/main/webapp/WEB-INF/view/system/tCompany/tCompany_updateFranchisee.html | 278
management/guns-admin/src/main/webapp/static/js/ueditor/1.4.3/net/App_Code/UploadHandler.cs | 182
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/three/TokenUtil.java | 95
management/guns-admin/src/main/webapp/static/crypto-js/hmac-md5.js | 18
management/guns-admin/src/main/webapp/static/js/ueditor/jsp/third-party/highcharts/modules/exporting.src.js | 709
management/guns-admin/src/main/webapp/static/modular/flowable/process/process.js | 77
management/guns-admin/src/main/webapp/WEB-INF/view/system/tInvoice/tInvoice_add.html | 39
management/guns-admin/src/main/webapp/static/fonts/glyphicons-halflings-regular.ttf | 0
management/guns-admin/src/main/webapp/static/js/ueditor/1.4.3/dialogs/scrawl/images/delimg.png | 0
management/guns-admin/src/main/webapp/static/js/ueditor/jsp/dialogs/video/images/file-icons.png | 0
management/guns-admin/src/main/webapp/static/modular/system/tUser/tUser.js | 386
management/guns-admin/src/main/webapp/static/js/plugins/highcharts/adapters/prototype-adapter.js | 16
management/guns-admin/src/main/webapp/static/js/ueditor/1.4.3/dialogs/attachment/fileTypeImages/icon_default.png | 0
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TPubWithdrawalController.java | 168
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/UserCouponRecordController.java | 121
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TUser.java | 402
management/guns-admin/src/main/webapp/WEB-INF/view/system/tProblem/tProblem_edit.html | 33
management/guns-admin/src/main/webapp/WEB-INF/view/system/tPubWithdrawal/tPubWithdrawal.html | 49
management/guns-admin/src/main/webapp/WEB-INF/view/system/tUser/tUser_add.html | 54
management/guns-admin/src/main/webapp/WEB-INF/view/system/tComplaint/tComplaint_immediately.html | 28
management/guns-admin/src/main/webapp/static/js/ueditor/1.4.3/lang/en/images/background.png | 0
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITOrderLogisticsService.java | 47
management/guns-admin/src/main/webapp/WEB-INF/view/system/tOpenCity/tOpenCity_edit.html | 95
management/guns-admin/src/main/webapp/static/modular/system/tProblem/tProblem.js | 182
management/guns-admin/src/main/webapp/WEB-INF/view/system/user/user.html | 80
management/guns-admin/src/main/webapp/static/js/plugins/umeditor/lang/en/images/music.png | 0
management/guns-admin/src/main/webapp/static/js/ueditor/1.4.3/dialogs/charts/images/charts0.png | 0
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TSmsrecordController.java | 84
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/HttpRequestUtil.java | 182
management/guns-admin/src/main/webapp/static/js/plugins/umeditor/themes/default/images/close.png | 0
management/guns-admin/src/main/webapp/static/js/ueditor/jsp/dialogs/emotion/emotion.html | 54
management/guns-admin/src/main/webapp/WEB-INF/view/system/userCouponRecord/userCouponRecord.html | 61
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TLineMapper.xml | 66
management/guns-admin/src/main/webapp/static/css/patterns/shattered.png | 0
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TCarModel.java | 127
management/guns-admin/src/main/webapp/static/js/ueditor/1.4.3/dialogs/emotion/images/fface.gif | 0
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/CarInsurance.java | 134
management/guns-core/src/main/java/com/stylefeng/guns/core/support/ObjectKit.java | 22
management/guns-admin/src/main/webapp/static/js/contabs.js | 339
management/guns-admin/src/main/webapp/static/js/plugins/switchery/switchery.js | 1
management/guns-admin/src/main/webapp/static/crypto-js/pad-iso97971.js | 40
management/guns-admin/src/main/webapp/static/js/plugins/umeditor/third-party/mathquill/font/stixgeneral-bundle/stixgeneralitalic-webfont.ttf | 0
management/guns-admin/src/main/webapp/WEB-INF/view/system/tUser/tUser_updateBalance.html | 28
management/guns-admin/src/main/webapp/static/js/ueditor/jsp/ueditor/jsp/upload/image/20161220/1482229766809036054.jpg | 0
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITLineCompanyService.java | 16
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITSysIntegralService.java | 16
management/guns-admin/src/main/webapp/static/css/patterns/header-profile-skin-3.png | 0
management/guns-admin/src/main/webapp/static/js/plugins/umeditor/themes/default/images/pop-bg.png | 0
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TRegionMapper.java | 16
management/guns-admin/src/main/webapp/static/js/ueditor/jsp/themes/default/images/arrow_down.png | 0
management/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderCharter/tOrderCharter_immediately.html | 28
management/guns-admin/src/main/webapp/WEB-INF/view/system/tLine/tLine_addCompany.html | 65
management/guns-admin/src/main/webapp/static/fonts/FontAwesome.otf | 0
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TCarMapper.xml | 144
management/guns-admin/src/main/webapp/static/layui/images/face/64.gif | 0
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IUserActivityInviteService.java | 16
management/guns-admin/src/main/webapp/static/layui/images/face/47.gif | 0
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/task/QuartzTest.java | 19
management/guns-admin/src/main/webapp/static/css/plugins/webuploader/webuploader.css | 30
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TSysSensitiveWordsController.java | 97
management/guns-admin/src/main/webapp/static/js/ueditor/1.4.3/themes/default/images/cancelbutton.gif | 0
management/guns-admin/src/main/webapp/static/modular/system/dict/dict.js | 104
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TDriverMapper.xml | 302
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/factory/UserFactory.java | 54
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/Dept.java | 140
management/guns-admin/src/main/webapp/static/js/ueditor/jsp/dialogs/video/images/icons.png | 0
management/guns-admin/src/main/webapp/static/css/plugins/ztree/img/diy/1_close.png | 0
management/guns-admin/src/main/webapp/static/js/ueditor/1.4.3/dialogs/scrawl/scrawl.js | 671
management/guns-admin/src/main/webapp/static/js/plugins/umeditor/third-party/mathquill/font/stixgeneral-bundle/stixgeneralbol-webfont.ttf | 0
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TDispatchMapper.java | 35
management/guns-admin/src/main/webapp/static/js/ueditor/jsp/index.html | 175
management/guns-admin/src/main/webapp/static/layui/images/face/10.gif | 0
management/guns-admin/src/main/webapp/static/modular/system/tIntegralOrder/tIntegralOrder_info.js | 106
management/guns-admin/src/main/webapp/WEB-INF/view/system/sysCouponActivity/sysCouponActivity_edit.html | 81
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/LogWarpper.java | 40
management/guns-admin/src/main/webapp/WEB-INF/view/system/tCarBrand/tCarBrand_add.html | 30
management/guns-admin/src/main/webapp/static/js/ueditor/1.4.3/jsp/src/com/baidu/ueditor/upload/BinaryUploader.java | 98
management/guns-admin/src/main/java/com/stylefeng/guns/core/common/constant/factory/PageFactory.java | 38
management/guns-admin/src/main/webapp/static/js/ueditor/1.4.3/dialogs/image/images/success.gif | 0
management/guns-admin/src/main/webapp/static/js/ueditor/1.4.3/third-party/video-js/font/vjs.svg | 65
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/DriverActivityOrderController.java | 104
management/guns-admin/src/main/webapp/static/js/ueditor/1.4.3/jsp/src/com/baidu/ueditor/upload/StorageManager.java | 155
management/guns-admin/src/main/webapp/WEB-INF/view/common/tags/label.tag | 31
management/guns-admin/src/main/webapp/static/js/plugins/layer/laydate/skins/default/icon.png | 0
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/Region.java | 109
management/guns-admin/src/main/webapp/WEB-INF/view/system/tFeedback/userFeedback.html | 52
management/guns-admin/src/main/webapp/WEB-INF/view/system/tUserRedPacketRecord/tUserRedPacketRecord_add.html | 35
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TReassignServiceImpl.java | 55
management/guns-admin/src/main/webapp/static/js/ueditor/jsp/dialogs/image/image.html | 120
management/guns-admin/src/main/webapp/static/modular/system/tCarBrand/tCarBrand_info.js | 134
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/DriverActivityHistory.java | 151
management/guns-admin/src/main/webapp/static/modular/system/sysCouponActivity/tUser.js | 238
management/guns-admin/src/main/java/com/stylefeng/guns/core/util/ObsUploadUtil.java | 76
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/DriverOnlineMapper.java | 27
management/guns-admin/src/main/webapp/static/layui/images/face/5.gif | 0
management/guns-admin/src/main/webapp/static/modular/system/tOrderLogistics/tOrderLogistics_info.js | 149
management/guns-core/src/main/java/com/stylefeng/guns/core/config/properties/DruidProperties.java | 217
management/guns-admin/src/main/java/com/stylefeng/guns/core/common/constant/dictmap/RoleDict.java | 31
management/guns-admin/src/main/webapp/static/js/ueditor/1.4.3/third-party/video-js/video.dev.js | 7108
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TDriverMapper.java | 94
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TUserMapper.java | 58
management/guns-admin/src/main/webapp/static/js/ueditor/1.4.3/ueditor.config.js | 413
management/guns-admin/src/main/webapp/static/js/ueditor/1.4.3/third-party/zeroclipboard/ZeroClipboard.js | 1256
management/guns-admin/src/main/webapp/static/js/ueditor/jsp/third-party/webuploader/webuploader.custom.js | 5670
management/guns-admin/src/main/webapp/WEB-INF/view/system/tSystemPrice/small.html | 397
management/guns-admin/src/main/webapp/static/layui/css/modules/layer/default/layer.css | 2
management/guns-admin/src/main/webapp/static/modular/system/tDriver/punish.js | 157
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TReassignMapper.xml | 264
management/guns-admin/src/main/webapp/static/js/ueditor/jsp/dialogs/attachment/fileTypeImages/icon_rar.gif | 0
management/guns-admin/src/main/webapp/WEB-INF/view/system/tCompany/tCompany_detail.html | 346
management/guns-admin/src/main/webapp/static/js/ueditor/1.4.3/dialogs/charts/chart.config.js | 65
management/guns-admin/src/main/webapp/static/js/ueditor/jsp/themes/default/images/neweditor-tab-bg.png | 0
management/guns-admin/src/main/webapp/static/crypto-js/index.js | 18
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/UserActivityInvite.java | 174
management/guns-admin/src/main/webapp/static/js/ueditor/1.4.3/jsp/src/com/baidu/ueditor/hunter/FileManager.java | 112
management/guns-admin/src/main/webapp/static/js/ueditor/jsp/dialogs/scrawl/images/brush.png | 0
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TSysIntegralMapper.java | 16
management/guns-admin/src/main/webapp/static/js/plugins/umeditor/lang/en/images/rotaterightdisable.png | 0
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/DriverActivityOnlineMapper.xml | 23
management/guns-admin/src/main/webapp/static/js/plugins/highcharts/modules/exporting.js | 17
management/guns-admin/src/main/webapp/static/js/ueditor/1.4.3/asp/MultiformProcessor.class.asp | 138
management/guns-admin/src/main/webapp/static/crypto-js/hmac-ripemd160.js | 18
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TUserRedPacketRecordMapper.java | 16
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TPubWithdrawal.java | 206
management/guns-admin/src/main/webapp/static/js/ueditor/jsp/themes/default/images/anchor.gif | 0
management/guns-admin/src/main/webapp/static/modular/flowable/process/process_info.js | 96
management/guns-admin/src/main/webapp/static/js/hplus.js | 294
management/guns-admin/src/main/webapp/static/crypto-js/mode-ecb.js | 40
management/guns-admin/src/main/webapp/WEB-INF/view/system/tSysSensitiveWords/tSysSensitiveWords_add.html | 22
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITCarServiceService.java | 16
management/guns-admin/src/main/webapp/static/fonts/fontawesome-webfont.svg | 640
management/guns-admin/src/main/webapp/static/js/ueditor/jsp/third-party/highcharts/modules/canvas-tools.js | 133
management/guns-core/src/main/java/com/stylefeng/guns/core/qr/QrImage.java | 170
management/guns-admin/src/main/webapp/static/js/ueditor/1.4.3/dialogs/wordimage/tangram.js | 1495
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/LineShiftDriver.java | 134
management/guns-admin/src/main/webapp/static/js/ueditor/1.4.3/dialogs/attachment/fileTypeImages/icon_mp3.gif | 0
management/guns-admin/src/main/webapp/static/modular/system/tServerCarmodel/charter_info.js | 173
management/guns-admin/src/main/webapp/static/js/plugins/highcharts/themes/dark-blue.js | 254
management/guns-admin/src/main/webapp/static/js/ueditor/1.4.3/dialogs/attachment/images/success.gif | 0
management/guns-admin/src/main/webapp/WEB-INF/view/system/tServerCarmodel/charter_add.html | 47
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/SysCouponRecordMapper.java | 16
management/guns-admin/src/main/webapp/static/crypto-js/crypto-js.js | 6191
management/guns-admin/src/main/webapp/static/js/plugins/umeditor/themes/default/images/icons.png | 0
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IUserActivityDiscount1Service.java | 65
management/guns-admin/src/main/webapp/static/js/ueditor/jsp/dialogs/attachment/fileTypeImages/icon_psd.gif | 0
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITRegionService.java | 16
management/guns-admin/src/main/webapp/WEB-INF/view/system/tUserRedPacketRecord/tUserRedPacketRecord.html | 61
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TServerCarmodelController.java | 285
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/CarInsuranceMapper.xml | 37
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITLocationService.java | 22
management/guns-admin/src/main/webapp/static/css/plugins/ztree/demo.css | 33
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IUserActivityDiscount2Service.java | 16
management/guns-admin/src/main/webapp/static/js/plugins/layer/layim/data/chatlog.json | 30
management/guns-generator/src/main/java/com/stylefeng/guns/generator/action/config/GunsGeneratorConfig.java | 81
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TSysIntegralServiceImpl.java | 20
management/guns-admin/src/main/webapp/static/modular/system/tSysSensitiveWords/tSysSensitiveWords_info.js | 105
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/DriverTrainMapper.java | 15
management/guns-admin/src/main/webapp/static/js/ueditor/1.4.3/dialogs/background/images/bg.png | 0
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITNoticesService.java | 30
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TLocationServiceImpl.java | 58
management/guns-admin/src/main/webapp/static/js/plugins/highcharts/adapters/prototype-adapter.src.js | 381
management/guns-admin/src/main/webapp/WEB-INF/view/system/tCompany/tCompany_edit.html | 372
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/GaoDeMapUtil.java | 85
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TOpenCityMapper.xml | 65
management/guns-admin/src/main/webapp/WEB-INF/view/system/tSystemPrice/tSystemPrice.html | 52
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/DriverActivityRegisteredMapper.xml | 22
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/IncomeMapper.xml | 16
management/guns-admin/src/main/webapp/static/js/ueditor/jsp/ueditor.parse.js | 1022
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TDispatchMapper.xml | 60
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TOrderCharterServiceImpl.java | 28
management/guns-admin/src/main/webapp/static/layui/lay/modules/element.js | 2
management/guns-generator/src/main/java/com/stylefeng/guns/generator/engine/SimpleTemplateEngine.java | 70
management/guns-admin/src/main/webapp/static/js/plugins/highcharts/modules/solid-gauge.js | 13
management/guns-admin/src/main/webapp/static/js/ueditor/1.4.3/dialogs/charts/images/charts2.png | 0
management/guns-admin/src/main/webapp/static/layui/images/face/45.gif | 0
management/guns-admin/src/main/webapp/static/js/ueditor/jsp/dialogs/music/music.js | 192
management/guns-admin/src/main/webapp/static/js/ueditor/1.4.3/jsp/controller.jsp | 14
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/UserActivityBalanceController.java | 104
management/guns-admin/src/main/webapp/WEB-INF/view/system/tAgreement/tAgreementSmallPieceLogistics.html | 65
management/guns-admin/src/main/webapp/static/modular/system/user/user.js | 265
management/guns-admin/src/main/webapp/static/crypto-js/evpkdf.js | 134
management/guns-admin/src/main/webapp/static/js/ueditor/1.4.3/dialogs/video/images/image.png | 0
management/guns-admin/src/main/webapp/static/layui/lay/modules/laytpl.js | 2
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TSysFaceDistinguishMapper.xml | 18
management/guns-admin/src/main/webapp/static/crypto-js/md5.js | 268
management/guns-admin/src/main/webapp/WEB-INF/view/system/tCar/carInsuranceInfo.html | 35
management/guns-admin/src/main/java/com/stylefeng/guns/core/beetl/BeetlConfiguration.java | 71
management/guns-admin/src/main/webapp/static/js/ueditor/1.4.3/jsp/src/com/baidu/ueditor/Encoder.java | 24
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TSiteMapper.xml | 91
management/guns-admin/src/main/webapp/static/js/plugins/layer/skin/default/icon_ext.png | 0
management/guns-admin/src/main/webapp/static/js/plugins/highcharts/modules/data.src.js | 622
management/guns-admin/src/main/webapp/static/js/ueditor/1.4.3/third-party/highcharts/highcharts.js | 283
management/guns-admin/src/main/webapp/static/layui/images/face/38.gif | 0
management/guns-admin/src/main/webapp/WEB-INF/view/system/tIntegralOrder/tIntegralOrder_edit.html | 35
management/guns-admin/src/main/webapp/static/modular/system/userActivity/userActivity.js | 209
management/guns-admin/src/main/webapp/static/js/ueditor/1.4.3/dialogs/help/help.js | 56
management/guns-admin/src/main/webapp/WEB-INF/view/system/tUser/tUser_optUser.html | 29
management/guns-admin/src/main/webapp/static/modular/system/tComplaint/tComplaint_info.js | 111
management/guns-admin/src/main/webapp/static/css/plugins/switchery/switchery.css | 32
management/guns-admin/src/main/webapp/static/js/ueditor/jsp/dialogs/scrawl/images/empty.png | 0
management/guns-admin/src/main/webapp/static/js/ueditor/jsp/lang/en/images/rotateleftdisable.png | 0
management/guns-admin/src/main/webapp/static/js/ueditor/jsp/lang/en/images/listbackground.png | 0
management/guns-admin/src/main/webapp/static/js/ueditor/jsp/third-party/highcharts/adapters/standalone-framework.src.js | 583
management/guns-admin/src/main/webapp/static/layui/images/face/66.gif | 0
management/guns-admin/src/main/java/com/stylefeng/guns/core/common/constant/JwtConstants.java | 19
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TLineCompanyMapper.java | 16
management/guns-core/src/main/java/com/stylefeng/guns/core/node/MenuNode.java | 239
management/guns-admin/src/main/webapp/WEB-INF/view/system/tSite/tSite_add.html | 170
management/guns-admin/src/main/webapp/static/js/ueditor/1.4.3/themes/default/images/lock.gif | 0
management/guns-admin/src/main/webapp/static/layui/font/iconfont.eot | 0
management/guns-admin/src/main/webapp/static/js/plugins/slimscroll/jquery.slimscroll.min.js | 15
management/guns-admin/src/main/java/com/stylefeng/guns/config/SpringSessionConfig.java | 15
management/guns-admin/src/main/java/com/stylefeng/guns/core/common/constant/factory/MutiStrFactory.java | 96
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/UserActivityDiscount1Controller.java | 104
management/guns-admin/src/main/webapp/static/js/ueditor/1.4.3/dialogs/image/images/icons.png | 0
management/guns-admin/src/main/webapp/static/modular/system/tAgreement/tAgreement_info.js | 101
management/guns-admin/src/main/webapp/static/layui/images/face/3.gif | 0
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/DriverActivityHistoryMapper.xml | 30
management/guns-admin/src/main/webapp/static/js/plugins/umeditor/dialogs/video/images/center_focus.jpg | 0
management/guns-admin/src/main/webapp/static/js/plugins/umeditor/third-party/mathquill/font/stixgeneral-bundle/stixgeneralitalic-webfont.woff | 0
management/guns-admin/src/main/webapp/WEB-INF/view/system/tServerCarmodel/charter.html | 49
management/guns-admin/src/main/webapp/static/js/ueditor/1.4.3/dialogs/background/background.html | 56
management/guns-admin/src/main/webapp/static/js/ueditor/1.4.3/third-party/webuploader/webuploader.withoutimage.js | 4593
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TransactionDetails.java | 164
management/guns-admin/src/main/webapp/static/js/ueditor/jsp/dialogs/attachment/attachment.html | 60
management/guns-admin/src/main/webapp/static/js/plugins/layer/skin/default/xubox_title0.png | 0
management/guns-core/src/main/java/com/stylefeng/guns/core/datascope/DataScopeInterceptor.java | 82
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TProblemMapper.xml | 42
management/guns-admin/src/main/webapp/static/js/plugins/wangEditor/wangEditor.js | 3967
management/guns-admin/src/main/webapp/static/layui/lay/modules/layedit.js | 2
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TServerCarmodelServiceImpl.java | 28
management/guns-admin/src/main/webapp/WEB-INF/view/system/tSmsrecord/tSmsrecord_add.html | 31
management/guns-admin/src/main/webapp/static/modular/system/sysCouponRecord/sysCouponRecord_info.js | 143
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/SysRedPacketRecordMapper.java | 16
management/guns-admin/src/main/webapp/static/js/plugins/iCheck/icheck.min.js | 11
management/guns-admin/src/main/webapp/static/js/ueditor/jsp/dialogs/emotion/images/cface.gif | 0
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/ConstellationUtil.java | 68
management/guns-admin/src/main/webapp/static/js/ueditor/1.4.3/third-party/highcharts/themes/dark-blue.js | 254
management/guns-admin/src/main/webapp/static/js/ueditor/1.4.3/dialogs/attachment/fileTypeImages/icon_psd.gif | 0
management/guns-admin/src/main/webapp/WEB-INF/view/system/tAgreement/tAgreementDriver.html | 105
management/guns-admin/src/main/webapp/static/js/ueditor/1.4.3/dialogs/video/images/success.png | 0
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TVersionManagementMapper.xml | 36
management/guns-admin/src/main/webapp/WEB-INF/view/driverOnline.html | 33
management/guns-admin/src/main/webapp/static/layui/css/layui.css | 2
management/guns-admin/src/main/webapp/WEB-INF/view/system/tComplaint/tComplaint_edit.html | 34
management/guns-admin/src/main/webapp/static/js/plugins/umeditor/lang/en/images/deletedisable.png | 0
management/guns-admin/src/main/webapp/static/js/plugins/umeditor/dialogs/image/images/close.png | 0
management/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderPrivateCar/tOrderPrivateCar_orderDetail.html | 115
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/SysCouponActivityMapper.java | 16
management/guns-admin/src/main/webapp/WEB-INF/view/blackboard.html | 634
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TFeedbackMapper.java | 32
management/guns-admin/src/main/webapp/static/js/ueditor/jsp/themes/default/images/button-bg.gif | 0
management/guns-admin/src/main/webapp/static/js/ueditor/1.4.3/dialogs/map/show.html | 118
management/guns-admin/src/main/webapp/static/crypto-js/mode-ofb.js | 54
management/guns-admin/src/main/webapp/static/js/ueditor/jsp/lang/en/images/alldeletebtnhoverskin.png | 0
management/guns-admin/src/main/webapp/static/js/ueditor/1.4.3/themes/default/images/wordpaste.png | 0
management/guns-admin/src/main/webapp/static/css/plugins/ztree/img/diy/8.png | 0
management/guns-admin/src/test/sql/test.sql | 35
management/guns-admin/src/main/webapp/static/js/plugins/highcharts/modules/data.js | 17
management/guns-admin/src/main/webapp/static/js/ueditor/1.4.3/lang/en/images/rotaterightenable.png | 0
management/guns-core/src/main/java/com/stylefeng/guns/core/db/Db.java | 108
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/task/base/TimeJobType.java | 30
management/guns-admin/src/main/webapp/WEB-INF/view/system/tAgreement/tAgreementLaw.html | 65
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TOrderLogistics.java | 789
management/guns-admin/src/main/webapp/static/js/ueditor/1.4.3/dialogs/template/template.js | 53
management/guns-admin/src/main/webapp/static/js/ueditor/jsp/third-party/highcharts/modules/data.js | 17
management/guns-admin/src/main/webapp/static/layui/images/face/60.gif | 0
management/guns-admin/src/main/webapp/static/js/plugins/highcharts/highcharts-more.js | 53
management/guns-admin/src/main/webapp/static/js/ueditor/jsp/third-party/webuploader/webuploader.custom.min.js | 2
management/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderCrossCity/tOrderCrossCity_detail.html | 107
management/guns-admin/src/main/webapp/static/js/ueditor/jsp/dialogs/template/images/pre1.png | 0
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TRegionMapper.xml | 20
management/guns-admin/src/main/webapp/static/js/ueditor/jsp/lang/en/images/rotateleftenable.png | 0
management/guns-admin/src/main/webapp/WEB-INF/view/system/tReassign/tReassign_reassignmentSmall.html | 34
management/guns-admin/src/main/webapp/static/js/plugins/umeditor/third-party/mathquill/mathquill.js | 3888
management/guns-admin/src/main/webapp/static/js/plugins/umeditor/third-party/mathquill/font/stixgeneral-bundle/stixgeneral-webfont.eot | 0
management/guns-admin/src/main/webapp/static/js/ueditor/jsp/themes/default/images/icons.png | 0
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TCarServiceMapper.java | 16
management/guns-admin/src/main/webapp/static/js/ueditor/1.4.3/third-party/highcharts/modules/canvas-tools.js | 133
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TOrderTaxiMapper.java | 79
management/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/tDriver_immediately.html | 87
management/guns-admin/src/main/webapp/static/js/ueditor/1.4.3/net/App_Code/CrawlerHandler.cs | 103
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TOrderLogisticsMapper.xml | 146
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/util/VenueLatVo.java | 25
management/guns-admin/src/main/webapp/static/js/ueditor/jsp/dialogs/video/images/progress.png | 0
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TSystemPriceMapper.xml | 37
management/guns-admin/src/main/webapp/static/js/ueditor/1.4.3/third-party/SyntaxHighlighter/shCore.js | 3655
management/guns-admin/src/main/webapp/static/js/plugins/layer/extend/layer.ext.js | 2
management/guns-admin/src/main/webapp/WEB-INF/view/system/tReassign/smallPieceLogistics.html | 86
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/GDMapGeocodingUtil.java | 138
management/guns-admin/src/main/webapp/static/modular/system/tReassign/selectSmallDriver.js | 156
management/guns-core/src/main/java/com/stylefeng/guns/core/cache/EhcacheFactory.java | 86
management/guns-admin/src/main/webapp/static/js/ueditor/jsp/themes/default/images/pagebreak.gif | 0
management/guns-admin/src/main/webapp/WEB-INF/view/system/tIntegralGoods/tIntegralGoods_add.html | 31
management/guns-admin/src/main/webapp/static/js/plugins/umeditor/lang/en/images/listbackground.png | 0
management/guns-admin/src/main/webapp/static/js/ueditor/jsp/third-party/highcharts/themes/dark-green.js | 255
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TOrderPositionMapper.xml | 21
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITUserRedPacketRecordService.java | 16
management/guns-admin/src/main/webapp/static/js/ueditor/1.4.3/third-party/highcharts/modules/canvas-tools.src.js | 3113
management/guns-admin/src/main/webapp/static/js/ueditor/jsp/dialogs/scrawl/images/scaleH.png | 0
management/guns-admin/src/main/webapp/WEB-INF/view/system/tSmsrecord/tSmsrecord.html | 48
management/guns-admin/src/main/webapp/static/modular/system/sysRedPacketRecord/sysRedPacketRecord_info.js | 199
management/guns-admin/src/main/webapp/static/js/ueditor/1.4.3/dialogs/attachment/images/alignicon.gif | 0
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/DriverActivityOrderMapper.xml | 24
management/guns-admin/src/main/webapp/static/home.js | 500
management/guns-admin/src/main/webapp/static/layui/lay/modules/layer.js | 2
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/UserActivityMapper.xml | 75
management/guns-admin/src/main/webapp/WEB-INF/view/system/dept/dept.html | 38
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/DictMapper.java | 34
management/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderCrossCity/tOrderCrossCity_track.html | 52
management/guns-admin/src/main/java/com/stylefeng/guns/core/common/constant/state/LogSucceed.java | 27
management/guns-admin/src/main/java/com/stylefeng/guns/core/log/LogManager.java | 33
management/guns-admin/src/main/webapp/static/js/plugins/umeditor/third-party/mathquill/font/Symbola.eot | 0
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/UserActivityDiscount2.java | 124
management/guns-admin/src/main/webapp/static/layui/images/face/21.gif | 0
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITVerifiedService.java | 32
management/guns-admin/src/main/webapp/static/js/ueditor/jsp/dialogs/video/images/bg.png | 0
management/guns-admin/src/main/webapp/static/layui/images/face/1.gif | 0
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/PushURL.java | 22
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TLine.java | 125
management/guns-admin/src/main/webapp/static/js/common/web-upload-image.js | 124
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TOpenCity.java | 219
management/guns-admin/src/main/webapp/static/js/plugins/webuploader/webuploader.custom.min.js | 2
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/RoleMapper.xml | 78
management/guns-admin/src/main/webapp/WEB-INF/view/blackboardBlank.html | 59
management/guns-admin/src/main/webapp/static/layui/images/face/19.gif | 0
management/guns-admin/src/main/webapp/static/css/plugins/ztree/img/diy/2.png | 0
management/guns-admin/src/main/java/com/stylefeng/guns/GunsServletInitializer.java | 18
management/guns-core/src/main/java/com/stylefeng/guns/core/base/controller/BaseController.java | 127
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITransactionDetailsService.java | 23
management/guns-admin/src/main/webapp/static/layui/images/face/36.gif | 0
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/LoginLogMapper.java | 27
management/guns-admin/src/main/webapp/static/js/ueditor/jsp/lang/zh-cn/images/copy.png | 0
management/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderCharter/tOrderCharter_edit.html | 35
management/guns-admin/src/main/webapp/static/js/ueditor/jsp/dialogs/attachment/fileTypeImages/icon_chm.gif | 0
management/guns-admin/src/main/webapp/static/js/ueditor/1.4.3/dialogs/emotion/images/tface.gif | 0
management/guns-generator/src/main/java/com/stylefeng/guns/generator/action/config/WebGeneratorConfig.java | 97
management/guns-admin/src/main/webapp/static/js/ueditor/jsp/third-party/highcharts/modules/canvas-tools.src.js | 3113
management/guns-admin/src/main/webapp/static/js/ueditor/1.4.3/dialogs/image/image.html | 120
management/guns-admin/src/main/webapp/static/modular/system/tOrderTaxi/tOrderTaxi.js | 405
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/RongCloudUtil.java | 148
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/task/start/TimerServerStartJob.java | 39
management/guns-admin/src/main/webapp/static/layui/images/face/34.gif | 0
management/guns-admin/src/main/webapp/static/js/ueditor/1.4.3/third-party/highcharts/themes/dark-green.js | 255
management/guns-admin/src/main/webapp/static/js/ueditor/jsp/dialogs/scrawl/images/scale.png | 0
management/guns-admin/src/main/java/com/stylefeng/guns/core/aop/GlobalExceptionHandler.java | 123
management/guns-admin/src/main/webapp/static/js/ueditor/1.4.3/dialogs/scrawl/images/delimgH.png | 0
management/guns-generator/src/main/resources/gunsTemplate/advanced/Controller.java.btl | 96
management/guns-admin/src/main/webapp/static/js/ueditor/jsp/dialogs/video/images/none_focus.jpg | 0
management/guns-admin/src/main/webapp/static/js/ueditor/1.4.3/themes/default/images/unhighlighted.gif | 0
management/guns-core/src/main/java/com/stylefeng/guns/core/config/DefaultFastjsonConfig.java | 81
management/guns-admin/src/main/webapp/static/js/ueditor/jsp/lang/en/images/background.png | 0
management/guns-admin/src/main/webapp/static/js/common/web-upload-file.js | 40
management/guns-admin/src/main/webapp/static/js/ueditor/1.4.3/themes/default/images/loaderror.png | 0
management/guns-admin/src/main/webapp/static/js/ueditor/1.4.3/third-party/webuploader/webuploader.html5only.min.js | 2
management/guns-admin/src/main/webapp/static/js/ueditor/1.4.3/jsp/config.json | 94
management/guns-admin/src/main/webapp/static/js/ueditor/1.4.3/net/App_Code/ConfigHandler.cs | 17
management/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderLogistics/tOrderLogistics_detail.html | 63
management/guns-admin/src/main/webapp/static/js/plugins/umeditor/third-party/mathquill/font/stixgeneral-bundle/stixgeneralitalic-webfont.svg | 1089
management/guns-admin/src/main/webapp/static/layui/images/face/62.gif | 0
management/guns-admin/src/main/webapp/static/js/ueditor/1.4.3/asp/controller.asp | 44
management/guns-admin/src/main/webapp/static/js/ueditor/jsp/themes/default/dialogbase.css | 100
management/guns-admin/src/main/webapp/WEB-INF/view/system/menu/menu_add.html | 40
management/guns-admin/src/main/webapp/static/css/plugins/ztree/img/diy/6.png | 0
management/guns-generator/src/main/java/com/stylefeng/guns/generator/engine/config/SqlConfig.java | 194
management/guns-admin/src/main/webapp/static/js/ueditor/1.4.3/third-party/jquery-1.10.2.js | 9789 +
management/guns-admin/src/main/webapp/WEB-INF/view/system/tAgreement/tAgreementCharterCar.html | 65
management/guns-admin/src/main/webapp/static/modular/system/tSmsrecord/tSmsrecord.js | 158
management/guns-admin/src/main/webapp/WEB-INF/view/system/tNotices/tNotices_add.html | 29
management/guns-admin/src/main/webapp/static/js/ueditor/jsp/third-party/highcharts/highcharts.src.js | 16974 +
management/guns-admin/src/main/webapp/WEB-INF/view/system/tCarModel/tCarModel.html | 48
management/guns-admin/src/main/webapp/static/js/plugins/umeditor/dialogs/map/map.js | 263
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TLineSite.java | 87
management/guns-admin/src/main/webapp/static/js/ueditor/1.4.3/dialogs/attachment/fileTypeImages/icon_rar.gif | 0
management/guns-admin/src/main/webapp/static/img/locked.png | 0
management/guns-admin/src/main/webapp/static/modular/system/tComplaint/tComplaint.js | 239
management/guns-admin/src/main/java/com/stylefeng/guns/core/util/SinataUtil.java | 385
management/guns-admin/src/main/webapp/WEB-INF/view/system/driverActivityHistory/driverActivityHistory.html | 25
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/User.java | 268
management/guns-admin/src/main/webapp/static/js/ueditor/1.4.3/dialogs/help/help.css | 7
management/guns-admin/src/main/webapp/static/js/plugins/validate/zh_CN.js | 370
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TCompanyServiceImpl.java | 237
management/guns-admin/src/main/webapp/static/js/ueditor/1.4.3/third-party/highcharts/modules/no-data-to-display.js | 12
management/guns-admin/src/main/java/com/stylefeng/guns/core/common/constant/dictmap/factory/DictFieldWarpperFactory.java | 33
management/guns-admin/src/main/webapp/static/js/ueditor/1.4.3/dialogs/template/images/pre0.png | 0
management/guns-admin/src/main/webapp/static/modular/system/tAgreement/tAgreement.js | 105
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TCarBrandServiceImpl.java | 28
management/guns-admin/src/main/webapp/static/js/ueditor/1.4.3/dialogs/image/images/icons.gif | 0
management/guns-admin/src/main/webapp/static/js/ueditor/jsp/third-party/webuploader/webuploader.css | 28
management/guns-admin/src/main/webapp/static/js/ueditor/1.4.3/third-party/webuploader/webuploader.custom.min.js | 2
management/guns-admin/src/main/webapp/static/js/ueditor/1.4.3/dialogs/emotion/emotion.css | 43
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/UserRedPacketRecordServiceImpl.java | 294
management/guns-core/src/main/java/com/stylefeng/guns/core/util/SimpleContrast.java | 58
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TCarServiceMapper.xml | 17
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/system/LoginController.java | 207
management/guns-admin/src/main/java/com/stylefeng/guns/core/common/constant/dictmap/DeleteDict.java | 31
management/guns-admin/src/main/webapp/static/js/plugins/layer/skin/default/loading-1.gif | 0
management/guns-admin/src/main/java/com/stylefeng/guns/core/common/constant/cache/Cache.java | 15
management/guns-admin/src/main/webapp/WEB-INF/web.xml | 12
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ISysCouponActivityService.java | 16
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/UserRedPacketRecordMapper.java | 39
management/guns-admin/src/main/webapp/WEB-INF/view/common/_theme.html | 84
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TLineShiftMapper.xml | 21
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TLinePrice.java | 151
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/HomeController.java | 525
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/LoginLog.java | 128
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TAgreementController.java | 283
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/UserActivityInviteMapper.xml | 24
management/guns-core/src/main/java/com/stylefeng/guns/core/support/HttpKit.java | 195
management/guns-admin/src/main/webapp/static/js/ueditor/jsp/themes/default/images/scale.png | 0
management/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderEvaluate/tOrderEvaluate_add.html | 33
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TInvoiceController.java | 125
management/guns-admin/src/main/webapp/static/js/ueditor/1.4.3/dialogs/attachment/fileTypeImages/icon_chm.gif | 0
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TCarBrand.java | 114
management/guns-core/src/main/java/com/stylefeng/guns/core/support/DateTime.java | 67
management/guns-admin/src/main/webapp/static/js/ueditor/jsp/themes/default/images/cursor_h.png | 0
management/guns-core/src/main/java/com/stylefeng/guns/core/qr/MatrixToImageWriter.java | 122
management/guns-core/src/main/java/com/stylefeng/guns/core/mutidatasource/DynamicDataSource.java | 18
management/guns-admin/src/main/webapp/static/modular/system/tVerified/tVerified.js | 217
management/guns-admin/src/main/webapp/static/js/ueditor/1.4.3/dialogs/video/video.css | 635
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TDispatchServiceImpl.java | 28
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/TFeedbackWarpper.java | 28
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/TaskUtil.java | 79
management/guns-admin/src/main/webapp/static/js/ueditor/1.4.3/dialogs/emotion/images/jxface2.gif | 0
management/guns-admin/src/main/webapp/static/js/ueditor/jsp/dialogs/emotion/images/wface.gif | 0
management/guns-admin/src/main/java/com/stylefeng/guns/core/common/constant/dictmap/Dict/VersionDict.java | 28
management/guns-admin/src/main/webapp/static/modular/system/tDriver/tDriver.js | 307
management/guns-admin/src/main/webapp/static/js/ueditor/1.4.3/index.html | 175
management/guns-admin/src/main/webapp/static/modular/system/sysCouponActivity/sysCouponRecord.js | 110
management/guns-generator/src/main/java/com/stylefeng/guns/generator/action/config/AbstractGeneratorConfig.java | 109
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TRegion.java | 109
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IDeptService.java | 33
management/guns-admin/src/main/webapp/static/js/ueditor/jsp/dialogs/video/video.html | 86
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TSysIntegralMapper.xml | 17
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/transfer/ManagerUser.java | 97
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITSysReformistService.java | 16
management/guns-admin/src/main/webapp/WEB-INF/view/system/userActivity/userActivity.html | 68
management/guns-admin/src/main/webapp/static/js/ueditor/1.4.3/dialogs/attachment/images/success.png | 0
management/guns-admin/src/main/webapp/static/js/ueditor/1.4.3/third-party/jquery-1.10.2.min.js | 6
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/PushMinistryOfTransportUtil.java | 609
management/guns-admin/src/main/webapp/WEB-INF/view/system/user/user_chpwd.html | 34
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/transfer/ReqEditManager.java | 60
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/NoticeWrapper.java | 26
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TCompany.java | 736
management/guns-admin/src/main/webapp/WEB-INF/view/system/sysCouponRecord/sysCouponRecord_add.html | 57
management/guns-admin/src/main/webapp/static/js/ueditor/jsp/third-party/webuploader/webuploader.js | 6733
management/guns-admin/src/main/webapp/static/modular/system/tCompany/franchisee.js | 270
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IGDInterfaceService.java | 10
management/guns-admin/src/main/webapp/static/js/ueditor/jsp/dialogs/wordimage/imageUploader.swf | 0
management/guns-admin/src/main/webapp/WEB-INF/view/common/tags/NameCon.tag | 14
management/guns-admin/src/main/java/com/stylefeng/guns/config/SwaggerConfig.java | 47
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/GDInterface.java | 91
management/guns-admin/src/main/webapp/static/modular/system/tInvoice/tInvoice_info.js | 106
management/guns-admin/src/main/webapp/static/modular/system/userActivity/addRegist.js | 110
management/guns-admin/src/main/webapp/static/js/ueditor/1.4.3/third-party/highcharts/adapters/mootools-adapter.src.js | 313
management/guns-admin/src/main/webapp/WEB-INF/view/system/tUser/tUser_updatePassword.html | 24
management/guns-admin/src/main/webapp/static/js/ueditor/1.4.3/dialogs/image/images/bg.png | 0
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TIntegralGoodsController.java | 131
management/guns-admin/src/main/webapp/static/js/ueditor/1.4.3/third-party/jquery-1.10.2.min.map | 1
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/NoticeMapper.java | 25
management/guns-admin/src/main/webapp/static/js/ueditor/1.4.3/third-party/video-js/video-js.swf | 0
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TSysPushOrderServiceImpl.java | 20
management/guns-admin/src/main/webapp/static/js/plugins/umeditor/lang/en/en.js | 150
management/guns-admin/src/main/webapp/static/layui/images/face/49.gif | 0
management/guns-admin/src/main/webapp/static/js/ueditor/jsp/themes/default/css/ueditor.min.css | 8
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TOrderTaxiMapper.xml | 263
management/guns-admin/src/main/webapp/static/js/plugins/highcharts/modules/funnel.js | 13
management/guns-admin/src/main/webapp/static/js/ueditor/jsp/themes/default/images/filescan.png | 0
management/guns-admin/src/main/webapp/static/js/plugins/umeditor/dialogs/video/video.css | 59
management/guns-admin/src/main/webapp/static/js/ueditor/jsp/dialogs/map/map.html | 135
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITInvoiceService.java | 32
management/guns-admin/src/main/webapp/static/js/ueditor/jsp/dialogs/charts/images/charts3.png | 0
management/guns-admin/src/main/webapp/static/modular/system/tCarModel/tCarModel_info.js | 139
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IUserActivityService.java | 35
management/guns-admin/src/main/webapp/WEB-INF/view/system/tUser/tUser_userDetail.html | 108
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TOpenCityBusinessMapper.xml | 24
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TOrderEvaluateMapper.java | 36
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TSysCancleOrderMapper.java | 16
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/DriverActivityOrder.java | 163
management/guns-admin/src/main/webapp/static/js/ueditor/1.4.3/lang/zh-cn/images/copy.png | 0
management/guns-admin/src/main/webapp/static/js/ueditor/jsp/third-party/codemirror/codemirror.css | 104
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/RoleMapper.java | 53
management/guns-admin/src/main/webapp/static/js/ueditor/1.4.3/third-party/webuploader/webuploader.withoutimage.min.js | 2
management/guns-admin/src/main/webapp/static/js/ueditor/jsp/dialogs/scrawl/scrawl.js | 671
management/guns-generator/src/main/resources/gunsTemplate/advanced/page.html.btl | 38
management/guns-admin/src/main/webapp/WEB-INF/view/system/driverActivity/receiveRecord.html | 226
management/guns-admin/src/main/java/com/stylefeng/guns/core/common/constant/state/LogType.java | 30
management/guns-admin/src/main/webapp/static/img/login-background.jpg | 0
management/guns-admin/src/main/webapp/static/js/plugins/webuploader/webuploader.withoutimage.min.js | 2
management/guns-admin/src/main/webapp/static/js/ueditor/1.4.3/lang/en/images/deleteenable.png | 0
management/guns-admin/src/main/webapp/static/js/plugins/umeditor/lang/zh-cn/images/music.png | 0
management/guns-admin/src/main/webapp/static/js/ueditor/jsp/themes/default/images/sparator_v.png | 0
management/guns-admin/src/main/webapp/static/js/ueditor/jsp/third-party/highcharts/highcharts-more.js | 50
management/guns-admin/src/main/webapp/static/js/ueditor/1.4.3/lang/en/images/upload.png | 0
management/guns-admin/src/main/webapp/WEB-INF/view/system/tCarModel/tCarModel_add.html | 38
management/guns-admin/src/main/webapp/static/js/plugins/umeditor/lang/en/images/copy.png | 0
management/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderLogistics/tOrderLogistics_edit.html | 82
management/guns-admin/src/main/webapp/static/js/ueditor/jsp/third-party/SyntaxHighlighter/shCore.js | 3655
management/guns-core/src/main/java/com/stylefeng/guns/core/cache/CacheKit.java | 59
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TLocationMapper.xml | 29
management/guns-admin/src/main/webapp/static/js/plugins/laydate/theme/default/font/iconfont.woff | 0
management/guns-admin/src/main/webapp/static/modular/system/tOrderPrivateCar/tOrderPrivateCar_info.js | 248
management/guns-admin/src/main/webapp/static/css/plugins/bootstrap-treetable/bootstrap-treetable.css | 10
management/guns-admin/src/main/webapp/static/js/ueditor/1.4.3/themes/default/images/filescan.png | 0
management/guns-admin/src/main/webapp/static/js/ueditor/1.4.3/third-party/highcharts/modules/annotations.src.js | 401
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TOrderCharteredCarMapper.xml | 72
management/guns-admin/src/main/webapp/WEB-INF/view/system/log/log.html | 48
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TComplaintServiceImpl.java | 28
management/guns-admin/src/main/webapp/static/js/ueditor/1.4.3/dialogs/video/images/progress.png | 0
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/UserActivityRedenvelopeMapper.xml | 24
management/guns-admin/src/main/webapp/static/js/ueditor/jsp/dialogs/image/images/progress.png | 0
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TPubTransactionDetails.java | 167
management/guns-admin/src/main/webapp/static/js/ueditor/1.4.3/jsp/src/com/baidu/ueditor/hunter/ImageHunter.java | 133
management/guns-admin/src/main/webapp/static/layui/css/modules/layer/default/icon.png | 0
management/guns-admin/src/main/webapp/static/js/plugins/umeditor/lang/en/images/upload.png | 0
management/guns-admin/src/main/webapp/WEB-INF/view/common/tags/uploadFile.tag | 13
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TOrderEvaluateController.java | 140
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TCarBrandMapper.xml | 37
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TSystemNoticeMapper.xml | 22
management/guns-admin/src/main/webapp/WEB-INF/view/system/tLine/tLine.html | 70
management/guns-admin/src/main/webapp/static/js/plugins/webuploader/webuploader.nolog.min.js | 3
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TransactionDetailsMapper.xml | 18
management/guns-admin/src/main/webapp/static/js/plugins/bootstrap-table/locale/bootstrap-table-zh-CN.min.js | 7
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/RegionMapper.xml | 20
management/guns-admin/src/main/webapp/static/js/ueditor/jsp/third-party/highcharts/adapters/mootools-adapter.src.js | 313
management/guns-admin/src/main/webapp/static/js/plugins/highcharts/modules/solid-gauge.src.js | 234
management/guns-admin/src/main/webapp/static/js/ueditor/1.4.3/dialogs/attachment/images/file-icons.gif | 0
management/guns-admin/src/main/webapp/static/js/ueditor/jsp/third-party/highcharts/modules/annotations.js | 7
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IUserRedPacketRecordService.java | 59
management/guns-admin/src/main/webapp/WEB-INF/view/system/driverActivity/driverActivity.html | 57
management/guns-admin/src/main/webapp/static/js/plugins/umeditor/dialogs/formula/formula.css | 32
management/guns-admin/src/main/webapp/static/js/plugins/webuploader/webuploader.html5only.js | 6030
management/guns-admin/src/main/webapp/static/js/ueditor/1.4.3/dialogs/image/image.css | 894
management/guns-admin/src/main/webapp/static/js/ueditor/jsp/dialogs/table/edittable.css | 84
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TDriverServiceServiceImpl.java | 20
management/guns-admin/src/main/webapp/WEB-INF/view/system/tCarBrand/tCarBrand_edit.html | 30
management/guns-admin/src/main/webapp/static/css/bootstrap-rtl.css | 1468
management/guns-admin/src/main/webapp/static/layui/images/face/24.gif | 0
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/MenuWarpper.java | 28
management/guns-admin/src/main/webapp/static/js/ueditor/jsp/dialogs/map/show.html | 118
management/guns-admin/src/main/webapp/static/js/plugins/sweetalert/sweetalert.min.js | 1
management/guns-admin/src/main/webapp/static/js/ueditor/jsp/themes/default/images/charts.png | 0
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/DriverPunish.java | 92
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/DriverActivityMapper.java | 27
management/guns-admin/src/main/webapp/static/js/ueditor/jsp/dialogs/wordimage/fClipboard_ueditor.swf | 0
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/DriverActivityController.java | 359
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/DriverActivityRegisteredController.java | 104
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/UserActivityBalanceServiceImpl.java | 20
management/guns-admin/src/main/webapp/static/js/ueditor/1.4.3/third-party/zeroclipboard/ZeroClipboard.min.js | 9
management/guns-admin/src/main/webapp/WEB-INF/view/system/tCarModel/tCarModel_edit.html | 39
management/guns-admin/src/main/webapp/static/js/ueditor/1.4.3/lang/en/images/addimage.png | 0
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITCarModelService.java | 29
management/guns-admin/src/main/webapp/static/js/plugins/highcharts/themes/grid-light.js | 74
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TOrderCrossCityController.java | 301
management/guns-admin/src/main/webapp/static/js/plugins/umeditor/dialogs/emotion/images/wface.gif | 0
management/guns-admin/src/main/webapp/static/modular/system/tCar/carInsurance.js | 117
management/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderCrossCity/tOrderCrossCity.html | 109
management/guns-admin/src/main/webapp/static/js/ueditor/1.4.3/themes/default/images/videologo.gif | 0
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TCarModelMapper.java | 29
management/guns-admin/src/main/webapp/static/modular/system/tOpenCity/tOpenCity.js | 182
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/SysCouponRecord.java | 162
management/guns-admin/src/main/webapp/static/js/md5.js | 256
management/guns-admin/src/main/webapp/static/js/ueditor/jsp/third-party/video-js/video-js.swf | 0
management/guns-admin/src/main/webapp/static/css/_fstyle.css | 65
management/guns-admin/src/main/webapp/static/js/ueditor/1.4.3/dialogs/emotion/images/yface.gif | 0
management/guns-admin/src/main/webapp/static/layui/images/face/31.gif | 0
management/guns-admin/src/main/webapp/static/modular/system/tOrderCharteredCar/tOrderCharteredCar.js | 216
management/guns-admin/src/main/webapp/WEB-INF/view/system/notice/notice_edit.html | 39
management/guns-admin/src/main/webapp/static/js/plugins/umeditor/dialogs/emotion/images/tface.gif | 0
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/UserRedPacketRecord.java | 175
management/guns-admin/src/main/webapp/static/js/ueditor/1.4.3/themes/default/images/loading.gif | 0
management/guns-admin/src/main/webapp/static/js/ueditor/jsp/third-party/webuploader/webuploader.min.js | 2
management/guns-admin/src/main/webapp/static/js/common/laydateChoose.js | 30
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TSysPushOrderMapper.xml | 21
management/guns-admin/src/main/webapp/static/js/plugins/highcharts/themes/skies.js | 89
management/guns-admin/src/main/webapp/WEB-INF/view/system/tCompany/tCompany_detailFranchisee.html | 246
management/guns-admin/src/main/webapp/static/js/ueditor/jsp/lang/en/images/deleteenable.png | 0
management/guns-admin/src/main/webapp/static/js/ueditor/jsp/third-party/highcharts/modules/drilldown.src.js | 447
management/guns-admin/src/main/webapp/static/layui/images/face/15.gif | 0
management/guns-admin/src/main/webapp/static/crypto-js/pad-nopadding.js | 30
management/guns-admin/src/main/webapp/static/js/plugins/layer/skin/default/xubox_loading1.gif | 0
management/guns-admin/src/main/webapp/static/js/ueditor/jsp/themes/default/images/icons.gif | 0
management/guns-admin/src/main/webapp/WEB-INF/view/system/tServerCarmodel/tServerCarmodel_edit.html | 24
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TSysSensitiveWordsMapper.xml | 32
management/guns-admin/src/main/webapp/static/css/plugins/iCheck/custom.css | 59
management/guns-admin/src/main/webapp/static/js/plugins/webuploader/webuploader.nolog.js | 8012
management/guns-admin/src/main/webapp/static/img/loading-upload.gif | 0
management/guns-admin/src/main/webapp/static/js/ueditor/jsp/dialogs/image/images/alignicon.jpg | 0
management/guns-admin/src/main/webapp/static/js/ueditor/1.4.3/net/controller.ashx | 80
management/guns-admin/src/main/webapp/WEB-INF/view/system/tComplaint/tComplaint.html | 58
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TDriverServiceMapper.java | 16
management/guns-admin/src/main/webapp/static/js/ueditor/jsp/third-party/highcharts/modules/map.js | 27
management/guns-admin/src/main/webapp/static/js/ueditor/jsp/third-party/highcharts/adapters/mootools-adapter.js | 13
management/guns-admin/src/main/webapp/static/layui/lay/modules/slider.js | 2
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TLocation.java | 243
management/guns-admin/src/main/webapp/static/js/ueditor/1.4.3/dialogs/spechars/spechars.js | 57
management/guns-admin/src/main/webapp/static/js/ueditor/jsp/dialogs/video/images/right_focus.jpg | 0
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/taxi/TOrderTaxiController.java | 278
management/guns-admin/src/main/webapp/static/js/ueditor/jsp/dialogs/scrawl/images/undoH.png | 0
management/guns-admin/src/main/webapp/static/js/ueditor/1.4.3/dialogs/image/images/alignicon.jpg | 0
management/guns-admin/src/main/webapp/static/js/ueditor/jsp/dialogs/background/background.css | 94
management/guns-core/src/main/java/com/stylefeng/guns/core/support/DateTimeKit.java | 665
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/UserActivityDiscount2Mapper.java | 16
management/guns-admin/src/main/webapp/static/js/ueditor/1.4.3/dialogs/spechars/spechars.html | 21
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IUserActivityRedenvelopeService.java | 16
management/guns-admin/src/main/webapp/static/js/common/ajax-object.js | 66
management/guns-admin/src/main/webapp/static/js/ueditor/1.4.3/dialogs/template/images/pre1.png | 0
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/transfer/ReqAddManager.java | 76
management/guns-admin/src/main/webapp/static/js/ueditor/1.4.3/third-party/SyntaxHighlighter/shCoreDefault.css | 1
management/guns-admin/src/main/webapp/static/js/plugins/umeditor/dialogs/map/map.html | 148
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TOpenCityController.java | 293
management/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderEvaluate/tOrderEvaluate_edit.html | 33
management/guns-admin/src/main/webapp/static/js/ueditor/jsp/dialogs/video/images/center_focus.jpg | 0
management/guns-admin/src/main/webapp/static/js/plugins/highcharts/modules/heatmap.src.js | 675
management/guns-admin/src/main/webapp/static/crypto-js/enc-base64url.js | 140
management/guns-admin/src/main/webapp/static/fonts/glyphicons-halflings-regular.svg | 288
management/guns-admin/src/main/java/com/stylefeng/guns/core/common/constant/dictmap/Dict/DriverDict.java | 34
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/util/WoUtil.java | 31
management/guns-admin/src/main/webapp/static/js/ueditor/1.4.3/dialogs/template/images/pre3.png | 0
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TOrderLogisticsController.java | 211
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IUserActivityRegisteredService.java | 16
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/NoticeServiceImpl.java | 28
management/guns-generator/src/main/java/com/stylefeng/guns/generator/engine/base/GunsTemplateEngine.java | 126
management/guns-admin/src/main/webapp/static/js/ueditor/1.4.3/dialogs/table/edittd.html | 61
management/guns-admin/src/main/webapp/static/js/ueditor/1.4.3/third-party/video-js/video.js | 129
management/guns-core/src/main/java/com/stylefeng/guns/core/aop/BaseControllerExceptionHandler.java | 45
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IDictService.java | 48
management/guns-admin/src/main/webapp/static/js/ueditor/jsp/third-party/webuploader/webuploader.withoutimage.min.js | 2
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TCompanyMapper.xml | 635
management/guns-admin/src/main/webapp/static/js/ueditor/jsp/themes/default/images/arrow.png | 0
management/guns-admin/src/main/webapp/static/js/ueditor/1.4.3/third-party/highcharts/adapters/mootools-adapter.js | 13
management/guns-admin/src/main/webapp/static/js/ueditor/1.4.3/third-party/video-js/font/vjs.eot | 0
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/Notice.java | 115
management/guns-admin/src/main/webapp/static/js/ueditor/1.4.3/third-party/highcharts/modules/drilldown.js | 11
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TFeedback.java | 176
management/guns-admin/src/main/webapp/WEB-INF/view/system/driverActivity/driverActivity_immediately.html | 41
management/guns-admin/src/main/webapp/static/js/ueditor/1.4.3/dialogs/video/images/right_focus.jpg | 0
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITOrderPositionService.java | 16
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TSysPushOrderMapper.java | 16
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/DriverActivityRegistered.java | 137
management/guns-admin/src/main/webapp/static/js/ueditor/jsp/lang/en/images/deletedisable.png | 0
management/guns-admin/src/main/webapp/static/js/ueditor/jsp/dialogs/video/images/icons.gif | 0
management/guns-core/src/main/java/com/stylefeng/guns/core/support/StrKit.java | 1370
management/guns-admin/src/main/webapp/static/js/ueditor/jsp/dialogs/attachment/images/bg.png | 0
management/guns-admin/src/main/webapp/static/js/ueditor/jsp/themes/default/images/cursor_h.gif | 0
management/guns-admin/src/main/webapp/static/layui/lay/modules/carousel.js | 2
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TSysFaceDistinguish.java | 87
management/guns-admin/src/main/webapp/WEB-INF/view/system/tAdvertisement/tAdvertisement.html | 61
management/guns-admin/src/main/java/com/stylefeng/guns/core/shiro/check/PermissionCheckManager.java | 50
management/guns-admin/src/main/webapp/static/modular/system/tSystemPrice/tSystemPrice_info.js | 477
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITOrderCrossCityService.java | 54
management/guns-admin/src/main/webapp/static/js/ueditor/jsp/dialogs/template/images/pre3.png | 0
management/guns-admin/src/main/webapp/static/crypto-js/pad-iso10126.js | 44
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TSysPushOrder.java | 126
management/guns-admin/src/main/webapp/static/js/plugins/umeditor/dialogs/emotion/emotion.js | 272
management/guns-admin/src/main/webapp/static/js/ueditor/1.4.3/net/App_Code/ListFileHandler.cs | 106
management/guns-admin/src/main/webapp/static/modular/system/userCouponRecord/userCouponRecord.js | 146
management/guns-admin/src/main/webapp/WEB-INF/view/system/driverActivity/driverActivity_edit.html | 138
management/guns-admin/src/main/java/com/stylefeng/guns/core/common/constant/dictmap/Dict/NoticeDict.java | 28
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TCompanyCityMapper.xml | 20
management/guns-admin/src/main/webapp/static/js/ueditor/jsp/themes/iframe.css | 19
management/guns-admin/src/main/webapp/static/layui/images/face/22.gif | 0
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/system/UediterController.java | 125
management/guns-core/src/main/java/com/stylefeng/guns/core/support/BeanKit.java | 508
management/guns-admin/src/main/webapp/WEB-INF/view/system/tAdvertisement/tAdvertisement_add.html | 58
management/guns-admin/src/main/webapp/static/js/plugins/highcharts/adapters/mootools-adapter.src.js | 321
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/ResultUtil.java | 195
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TOrderCharter.java | 166
management/guns-admin/src/main/webapp/WEB-INF/view/system/sysRedPacketRecord/sysRedPacketRecord_add.html | 82
management/guns-admin/src/main/webapp/static/js/plugins/layer/theme/default/loading-0.gif | 0
management/guns-core/src/main/java/com/stylefeng/guns/core/util/Convert.java | 1060
management/guns-admin/src/main/webapp/static/js/ueditor/1.4.3/dialogs/scrawl/images/redoH.png | 0
management/guns-admin/src/main/webapp/static/js/ueditor/jsp/dialogs/table/edittd.html | 61
management/guns-admin/src/main/webapp/static/layui/lay/modules/transfer.js | 2
management/guns-admin/src/main/webapp/static/modular/system/tServerCarmodel/acrossCity.js | 209
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TAdvertisementServiceImpl.java | 28
management/guns-admin/src/main/webapp/static/js/ueditor/jsp/dialogs/wordimage/tangram.js | 1495
management/guns-admin/src/main/webapp/static/js/ueditor/jsp/dialogs/video/images/success.png | 0
management/guns-admin/src/main/webapp/static/layui/images/face/17.gif | 0
management/guns-admin/src/main/webapp/static/js/plugins/validate/bootstrapValidator.min.js | 14
management/guns-admin/src/main/webapp/static/layui/images/face/51.gif | 0
management/guns-admin/src/main/java/com/stylefeng/guns/core/common/constant/dictmap/Dict/BrandDict.java | 29
management/guns-admin/src/main/webapp/static/js/ueditor/jsp/lang/zh-cn/images/localimage.png | 0
management/guns-admin/src/main/java/com/stylefeng/guns/core/util/ApiMenuFilter.java | 36
management/guns-admin/src/main/webapp/static/js/ueditor/jsp/dialogs/wordimage/wordimage.html | 111
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TCompanyController.java | 476
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TComplaintController.java | 186
management/guns-admin/src/main/webapp/static/crypto-js/hmac-sha3.js | 18
management/guns-admin/src/main/webapp/static/js/ueditor/1.4.3/dialogs/scrawl/images/undoH.png | 0
management/guns-admin/src/main/webapp/static/layui/lay/modules/tree.js | 2
management/guns-admin/src/main/webapp/static/modular/system/dept/dept_info.js | 195
management/guns-admin/src/main/webapp/static/img/boy.gif | 0
management/guns-admin/src/main/webapp/static/js/plugins/umeditor/lang/zh-cn/zh-cn.js | 150
management/guns-admin/src/main/webapp/static/js/ueditor/1.4.3/dialogs/video/images/left_focus.jpg | 0
management/guns-core/src/main/java/com/stylefeng/guns/core/constant/IsMenu.java | 50
management/guns-admin/src/main/java/com/stylefeng/guns/config/web/ShiroConfig.java | 205
management/guns-admin/src/main/webapp/static/crypto-js/pad-zeropadding.js | 47
management/guns-core/src/main/java/com/stylefeng/guns/core/support/CollectionKit.java | 801
management/guns-admin/src/main/webapp/static/js/ueditor/1.4.3/dialogs/snapscreen/snapscreen.html | 58
management/guns-admin/src/main/webapp/WEB-INF/view/common/tags/inputRequired.tag | 51
management/guns-admin/src/main/webapp/static/js/plugins/webuploader/webuploader.noimage.min.js | 2
management/guns-admin/src/main/webapp/static/js/plugins/laydate/laydate.js | 2
management/guns-admin/src/main/webapp/static/js/ueditor/jsp/third-party/highcharts/themes/skies.js | 89
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITAdvertisementService.java | 35
management/guns-admin/src/main/webapp/static/js/ueditor/jsp/dialogs/emotion/images/neweditor-tab-bg.png | 0
management/guns-admin/src/main/webapp/static/modular/system/tNotices/system_info.js | 179
management/guns-admin/src/main/webapp/static/js/ueditor/1.4.3/dialogs/scrawl/images/undo.png | 0
management/guns-admin/src/main/webapp/static/js/ueditor/1.4.3/themes/default/images/sparator_v.png | 0
management/guns-admin/src/main/java/com/stylefeng/guns/core/shiro/ShiroDbRealm.java | 78
management/guns-admin/src/main/webapp/WEB-INF/view/system/code/code.html | 47
management/guns-admin/src/main/webapp/static/js/plugins/highcharts/modules/no-data-to-display.src.js | 130
management/guns-admin/src/main/webapp/static/js/ueditor/jsp/third-party/highcharts/modules/heatmap.src.js | 53
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/ReportController.java | 434
management/guns-admin/src/main/webapp/static/js/ueditor/1.4.3/themes/default/images/cursor_h.png | 0
management/guns-admin/src/main/webapp/static/js/ueditor/1.4.3/dialogs/table/edittip.html | 33
management/guns-admin/src/main/webapp/static/css/plugins/ztree/img/diy/9.png | 0
management/guns-admin/src/main/webapp/static/layui/lay/modules/mobile.js | 2
management/guns-admin/src/main/webapp/static/js/ueditor/1.4.3/jsp/src/com/baidu/ueditor/define/BaseState.java | 90
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/UserActivityDiscount1Mapper.xml | 310
management/guns-admin/src/main/webapp/static/js/ueditor/jsp/dialogs/attachment/images/icons.gif | 0
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/UserActivityDiscount2Mapper.xml | 21
management/guns-admin/src/main/webapp/WEB-INF/view/system/role/role_add.html | 47
management/guns-admin/src/main/webapp/static/layui/layui.js | 2
management/guns-admin/src/main/webapp/static/js/ueditor/1.4.3/dialogs/table/dragicon.png | 0
management/guns-admin/src/main/webapp/static/js/ueditor/1.4.3/dialogs/image/image.js | 1139
management/guns-admin/src/main/webapp/static/js/ueditor/jsp/third-party/webuploader/webuploader.flashonly.min.js | 2
management/guns-admin/src/main/webapp/static/js/plugins/umeditor/dialogs/image/image.js | 445
management/guns-admin/src/main/webapp/static/js/ueditor/jsp/third-party/video-js/font/vjs.woff | 0
management/guns-admin/src/main/webapp/static/js/ueditor/jsp/ueditor.all.js | 29568 +++
management/guns-admin/src/main/webapp/WEB-INF/view/system/sysCouponRecord/sysCouponRecord.html | 61
management/guns-admin/src/main/webapp/static/js/plugins/layer/skin/default/xubox_loading3.gif | 0
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITSysPushOrderService.java | 16
management/guns-admin/src/main/webapp/static/js/ueditor/jsp/themes/default/images/icons-all.gif | 0
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TAdvertisementMapper.java | 35
management/guns-core/pom.xml | 156
management/guns-admin/src/main/webapp/static/js/common/Feng.js | 233
management/guns-admin/src/main/webapp/static/js/ueditor/jsp/dialogs/emotion/images/jxface2.gif | 0
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITPhoneService.java | 16
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TSmsrecord.java | 114
management/guns-core/src/main/java/com/stylefeng/guns/core/mutidatasource/annotion/DataSource.java | 18
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITSysFaceDistinguishService.java | 16
management/guns-admin/src/main/webapp/static/modular/system/code/code.js | 18
management/guns-admin/src/main/java/com/stylefeng/guns/core/aop/LogAop.java | 105
management/guns-admin/src/main/webapp/static/css/plugins/images/sprite-skin-flat.png | 0
management/guns-admin/src/main/webapp/static/js/plugins/webuploader/webuploader.html5only.min.js | 2
management/guns-admin/src/main/webapp/static/js/ueditor/jsp/dialogs/template/images/bg.gif | 0
management/guns-generator/src/main/java/com/stylefeng/guns/generator/engine/config/DaoConfig.java | 55
management/guns-admin/src/main/webapp/static/js/ueditor/jsp/dialogs/scrawl/images/redoH.png | 0
management/guns-admin/src/main/webapp/static/js/ueditor/1.4.3/dialogs/preview/preview.html | 40
management/guns-admin/src/main/webapp/static/js/ueditor/1.4.3/dialogs/video/images/center_focus.jpg | 0
management/guns-admin/src/main/webapp/static/modular/system/log/log.js | 105
management/guns-admin/src/main/webapp/static/fonts/fontawesome-webfont.woff2 | 0
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/DriverActivityRegisteredMapper.java | 16
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TFeedbackServiceImpl.java | 28
management/guns-admin/src/main/webapp/WEB-INF/view/system/tVerified/tVerified.html | 59
management/guns-admin/src/main/webapp/static/js/plugins/umeditor/dialogs/emotion/emotion.css | 87
management/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderCharteredCar/tOrderCharteredCar_edit.html | 40
management/guns-admin/src/main/webapp/WEB-INF/view/system/tComplaint/tComplaint_add.html | 34
management/guns-admin/src/main/webapp/static/js/ueditor/1.4.3/dialogs/music/music.js | 192
management/guns-admin/src/main/webapp/static/layui/lay/modules/rate.js | 2
management/guns-admin/src/main/webapp/static/img/NoPIC.png | 0
management/guns-admin/src/main/webapp/static/js/ueditor/jsp/third-party/highcharts/adapters/prototype-adapter.src.js | 316
management/guns-admin/src/main/webapp/static/modular/system/tOrderCrossCity/tOrderCrossCity_info.js | 244
management/guns-admin/src/main/webapp/static/layui/css/modules/layer/default/icon-ext.png | 0
management/guns-admin/src/main/webapp/static/layui/images/face/28.gif | 0
management/guns-admin/src/main/webapp/static/layui/images/face/44.gif | 0
management/guns-admin/src/main/java/com/stylefeng/guns/core/common/constant/Const.java | 36
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/RedisUtil.java | 129
management/guns-admin/src/main/webapp/WEB-INF/view/system/tServerCarmodel/acrossCity_edit.html | 24
management/guns-admin/src/main/webapp/WEB-INF/view/system/tProblem/tProblem_immediately.html | 28
management/guns-admin/src/main/webapp/static/js/plugins/highcharts/highcharts.src.js | 17696 +
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/UserActivityRegisteredController.java | 104
management/guns-admin/src/main/webapp/WEB-INF/view/system/tCompany/platformEdit.html | 371
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/system/RoleController.java | 237
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/util/MD5.java | 119
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITLineService.java | 46
management/guns-admin/src/main/webapp/static/js/ueditor/jsp/dialogs/attachment/images/icons.png | 0
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/JpushUtil.java | 256
management/guns-admin/src/main/webapp/WEB-INF/view/system/userActivity/userActivity_add.html | 309
management/guns-admin/src/main/webapp/static/js/ueditor/jsp/dialogs/attachment/fileTypeImages/icon_jpg.gif | 0
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TSysCancleOrderServiceImpl.java | 20
management/guns-admin/src/main/webapp/WEB-INF/view/system/tLine/tLine_edit.html | 257
management/guns-admin/src/main/webapp/static/modular/system/notice/notice.js | 106
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/UserActivityDiscount2Controller.java | 104
management/guns-admin/src/main/webapp/static/js/ueditor/jsp/themes/default/images/lock.gif | 0
management/guns-admin/src/main/webapp/static/js/ueditor/1.4.3/php/Uploader.class.php | 349
management/guns-admin/src/main/webapp/static/js/ueditor/jsp/dialogs/attachment/fileTypeImages/icon_mp3.gif | 0
management/guns-admin/src/main/webapp/static/js/plugins/umeditor/lang/en/images/imglabel.png | 0
management/guns-admin/src/main/webapp/static/crypto-js/sha256.js | 199
management/guns-admin/src/main/webapp/static/layui/images/face/13.gif | 0
management/guns-admin/src/main/webapp/static/js/ueditor/jsp/third-party/webuploader/webuploader.withoutimage.js | 4593
management/guns-admin/src/main/webapp/static/js/ueditor/1.4.3/themes/default/images/arrow.png | 0
management/guns-admin/src/main/java/com/stylefeng/guns/core/common/constant/factory/ConstantFactory.java | 356
management/guns-admin/src/main/webapp/static/js/ueditor/1.4.3/dialogs/gmap/gmap.html | 89
management/guns-admin/src/main/webapp/static/css/plugins/iCheck/green@2x.png | 0
management/guns-admin/src/main/webapp/static/js/plugins/umeditor/dialogs/image/images/upload2.png | 0
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/DriverPunishMapper.java | 13
management/guns-admin/src/main/webapp/static/js/ueditor/1.4.3/third-party/video-js/video-js.css | 766
management/guns-admin/src/main/webapp/static/modular/system/tPubWithdrawal/tPubWithdrawal.js | 197
management/guns-admin/src/main/webapp/static/js/plugins/chartJs/echarts.simple.min.js | 1
management/guns-admin/src/main/webapp/static/js/plugins/umeditor/dialogs/emotion/images/bface.gif | 0
management/guns-admin/src/main/webapp/static/js/ueditor/jsp/third-party/highcharts/modules/funnel.js | 12
management/guns-admin/src/main/webapp/static/layui/images/face/67.gif | 0
management/guns-admin/src/main/webapp/static/js/plugins/umeditor/umeditor.config.js | 323
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/task/jobs/AddSensitiveWord.java | 50
management/guns-admin/src/main/java/com/stylefeng/guns/core/common/constant/state/ManagerStatus.java | 49
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TCarBrandMapper.java | 29
management/guns-admin/src/main/webapp/static/css/plugins/ztree/img/loading.gif | 0
management/guns-admin/src/main/webapp/WEB-INF/view/system/tServerCarmodel/acrossCity_add.html | 24
management/guns-admin/src/main/java/com/stylefeng/guns/core/shiro/ShiroUser.java | 98
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TSysReformistController.java | 413
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TVerifiedMapper.xml | 47
management/guns-admin/src/main/webapp/static/modular/system/tSystemPrice/tSystemPrice.js | 229
management/guns-admin/src/main/java/com/stylefeng/guns/core/common/annotion/BussinessLog.java | 33
management/guns-admin/src/main/webapp/static/js/ueditor/1.4.3/third-party/highcharts/themes/skies.js | 89
management/guns-admin/src/main/webapp/static/js/ueditor/jsp/dialogs/searchreplace/searchreplace.js | 164
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITOrderCharteredCarService.java | 35
management/guns-admin/src/main/webapp/static/js/ueditor/1.4.3/third-party/video-js/video-js.min.css | 5
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TPubTransactionDetailsServiceImpl.java | 20
management/guns-admin/src/main/webapp/static/js/ueditor/1.4.3/dialogs/scrawl/images/size.png | 0
management/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/tDriver_look.html | 70
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TVersionManagement.java | 127
management/guns-admin/src/main/webapp/static/js/plugins/layer/theme/default/loading-2.gif | 0
management/guns-admin/src/main/webapp/static/layui/images/face/6.gif | 0
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/DriverOnlineMapper.xml | 55
management/guns-admin/src/main/webapp/static/js/ueditor/1.4.3/dialogs/video/images/none_focus.jpg | 0
management/guns-admin/src/main/webapp/static/js/ueditor/1.4.3/third-party/webuploader/webuploader.custom.js | 5670
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TVerifiedMapper.java | 33
management/guns-admin/src/main/webapp/static/modular/system/userActivity/userActivity_info.js | 466
management/guns-admin/src/main/webapp/static/js/common/DateUtils.js | 173
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/task/jobs/SendSms.java | 33
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/GDMapElectricFenceUtil.java | 405
management/guns-admin/src/main/webapp/static/layui/images/face/58.gif | 0
management/guns-admin/src/main/webapp/WEB-INF/view/system/tUser/tUser_edit.html | 54
management/guns-admin/src/main/webapp/static/modular/system/tSmsrecord/tSmsrecord_info.js | 98
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/task/jobs/AddMachine.java | 185
management/guns-admin/src/main/webapp/static/js/ueditor/jsp/dialogs/image/image.css | 894
management/guns-admin/src/main/webapp/static/js/plugins/webuploader/webuploader.fis.js | 8083
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/UserActivityRedenvelopeMapper.java | 16
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TSystemNotice.java | 137
management/guns-admin/src/main/webapp/static/js/ueditor/1.4.3/dialogs/music/music.html | 32
management/guns-admin/src/main/webapp/static/js/ueditor/1.4.3/dialogs/attachment/attachment.html | 60
management/guns-admin/src/main/webapp/static/js/ueditor/1.4.3/third-party/webuploader/Uploader.swf | 0
management/guns-admin/src/main/webapp/static/js/ueditor/1.4.3/dialogs/charts/images/charts4.png | 0
management/guns-generator/src/main/java/com/stylefeng/guns/generator/engine/config/PageConfig.java | 74
management/guns-admin/src/main/webapp/static/js/ueditor/1.4.3/asp/action_upload.asp | 29
management/guns-admin/src/main/webapp/static/js/ueditor/jsp/third-party/video-js/video.js | 129
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TNoticesServiceImpl.java | 28
management/guns-admin/src/main/webapp/static/js/plugins/layer/mobile/layer.js | 2
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/three/HMACSHA1Util.java | 31
management/guns-admin/src/main/webapp/static/js/plugins/layer/theme/default/layer.css | 1
management/guns-admin/src/main/webapp/WEB-INF/view/system/tAgreement/tAgreementUser.html | 65
management/guns-admin/src/main/webapp/static/js/ueditor/jsp/lang/en/en.js | 684
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TIntegralGoodsMapper.java | 30
management/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderEvaluate/tOrderEvaluate.html | 71
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TPhoneServiceImpl.java | 20
management/guns-admin/src/main/webapp/static/modular/system/tOrderCrossCity/tOrderCrossCity.js | 383
management/guns-core/src/main/java/com/stylefeng/guns/core/base/controller/GunsErrorView.java | 26
management/guns-core/src/main/java/com/stylefeng/guns/core/util/RenderUtil.java | 32
management/guns-admin/src/main/webapp/WEB-INF/view/system/tCar/tCar.html | 90
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/task/exceptions/TimeException.java | 37
management/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/training.html | 75
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DeptServiceImpl.java | 49
management/guns-admin/src/main/webapp/static/js/ueditor/jsp/dialogs/charts/images/charts1.png | 0
management/guns-admin/src/main/webapp/static/layui/images/face/53.gif | 0
management/guns-admin/src/main/webapp/static/js/plugins/highcharts/modules/canvas-tools.src.js | 3113
management/guns-admin/src/main/webapp/static/js/ueditor/jsp/dialogs/template/config.js | 42
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TSmsrecordMapper.java | 29
management/guns-admin/src/main/java/com/stylefeng/guns/config/properties/BeetlProperties.java | 103
management/guns-admin/src/main/webapp/WEB-INF/view/system/tUser/tUser.html | 84
management/guns-admin/src/main/webapp/static/js/ueditor/jsp/dialogs/scrawl/images/delimg.png | 0
management/guns-admin/src/main/webapp/static/js/ueditor/1.4.3/themes/default/images/charts.png | 0
management/guns-admin/src/main/webapp/static/js/ueditor/jsp/third-party/highcharts/modules/map.src.js | 1002
management/guns-admin/src/main/webapp/static/layui/lay/modules/upload.js | 2
management/guns-core/src/main/java/com/stylefeng/guns/core/base/tips/Tip.java | 29
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TIntegralOrder.java | 166
management/guns-admin/src/main/webapp/static/layui/css/modules/layer/default/loading-1.gif | 0
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TNoticesController.java | 241
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TNoticesMapper.java | 30
management/guns-admin/src/main/webapp/static/js/ueditor/1.4.3/themes/default/images/table-cell-align.png | 0
management/guns-admin/src/main/webapp/static/js/ueditor/1.4.3/lang/zh-cn/images/localimage.png | 0
management/guns-admin/src/main/webapp/static/js/plugins/highcharts/highcharts-3d.js | 44
management/guns-admin/src/main/webapp/static/js/plugins/umeditor/dialogs/emotion/images/0.gif | 0
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/UserActivityRegisteredMapper.xml | 24
management/guns-admin/src/main/webapp/static/crypto-js/sha1.js | 150
management/guns-admin/src/main/webapp/static/layui/images/face/42.gif | 0
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IDriverActivityOrderService.java | 16
management/guns-admin/src/main/webapp/static/crypto-js/hmac-sha256.js | 18
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/UserActivityRegistered.java | 174
management/guns-admin/src/main/webapp/static/js/ueditor/1.4.3/dialogs/wordimage/imageUploader.swf | 0
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TCompanyCity.java | 110
management/guns-admin/src/main/webapp/WEB-INF/view/system/tVerified/tVerified_edit.html | 33
management/guns-admin/src/main/java/com/stylefeng/guns/core/common/constant/dictmap/LogDict.java | 22
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/OperationLogMapper.java | 26
management/guns-admin/src/main/webapp/static/js/plugins/umeditor/lang/en/images/rotaterightenable.png | 0
management/guns-admin/src/main/webapp/static/js/ueditor/1.4.3/dialogs/template/images/bg.gif | 0
management/guns-admin/src/main/webapp/static/layui/images/face/69.gif | 0
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/system/LoginLogController.java | 69
management/guns-core/src/main/resources/META-INF/spring.factories | 6
management/guns-admin/src/main/webapp/static/js/jquery.min.map | 1
management/guns-admin/src/main/webapp/static/js/plugins/umeditor/dialogs/formula/formula.html | 212
management/guns-admin/src/main/java/com/stylefeng/guns/modular/code/factory/DefaultTemplateFactory.java | 61
management/guns-admin/src/main/webapp/static/layui/images/face/26.gif | 0
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TSysReformistMapper.xml | 17
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/system/KaptchaController.java | 114
management/guns-admin/src/main/webapp/static/js/ueditor/jsp/dialogs/internal.js | 81
management/guns-admin/src/main/webapp/static/modular/system/tDriver/yesDriver.js | 567
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TAgreementMapper.xml | 23
management/guns-admin/src/main/webapp/static/js/ueditor/jsp/dialogs/video/images/success.gif | 0
management/guns-admin/src/main/webapp/static/js/ueditor/jsp/dialogs/image/images/bg.png | 0
management/guns-admin/src/main/webapp/static/modular/system/tOrderLogistics/tOrderLogistics.js | 366
management/guns-admin/src/main/webapp/static/js/ueditor/1.4.3/dialogs/attachment/images/alignicon.png | 0
management/guns-core/src/main/java/com/stylefeng/guns/core/qr/MatrixToImageConfig.java | 62
management/guns-core/src/main/java/com/stylefeng/guns/core/xss/XssFilter.java | 42
management/guns-admin/src/main/webapp/static/js/ueditor/jsp/dialogs/charts/images/charts5.png | 0
management/guns-admin/src/main/webapp/static/modular/system/tServerCarmodel/tServerCarmodel.js | 205
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TProblemController.java | 127
management/guns-admin/src/main/webapp/static/js/ueditor/jsp/dialogs/background/background.html | 56
management/guns-admin/src/main/webapp/static/js/ueditor/1.4.3/lang/en/images/rotateleftenable.png | 0
management/guns-admin/src/main/webapp/static/layui/lay/modules/table.js | 2
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TDriverLine.java | 93
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITSiteService.java | 37
management/guns-admin/src/main/webapp/static/js/ueditor/1.4.3/lang/zh-cn/images/music.png | 0
management/guns-admin/src/main/webapp/static/js/ueditor/1.4.3/themes/default/dialogbase.css | 100
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TUserRedPacketRecordMapper.xml | 24
management/guns-admin/src/main/webapp/static/js/ueditor/jsp/dialogs/snapscreen/snapscreen.html | 58
management/guns-admin/src/main/webapp/WEB-INF/view/system/userActivity/userActivity_immediately.html | 41
management/guns-admin/src/main/webapp/WEB-INF/view/system/tNotices/tNotices.html | 48
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/UserActivityController.java | 447
management/guns-admin/src/main/webapp/WEB-INF/view/system/tIntegralGoods/tIntegralGoods.html | 61
management/guns-admin/src/main/webapp/static/modular/system/tCarModel/tCarModel.js | 189
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITLinePriceService.java | 16
management/guns-admin/src/main/webapp/static/crypto-js/enc-hex.js | 18
management/guns-admin/src/main/webapp/static/js/ueditor/1.4.3/lang/zh-cn/images/upload.png | 0
management/guns-admin/src/main/webapp/static/js/ueditor/1.4.3/third-party/highcharts/adapters/standalone-framework.src.js | 583
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/WoUtil.java | 31
management/guns-admin/src/main/webapp/WEB-INF/view/system/tAgreement/tAgreementOrder.html | 65
management/guns-admin/src/main/webapp/static/js/ueditor/1.4.3/dialogs/template/config.js | 42
management/guns-admin/src/main/webapp/static/js/plugins/umeditor/third-party/mathquill/font/stixgeneral-bundle/stixgeneralbol-webfont.svg | 1738
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TOrderCrossCity.java | 818
management/guns-admin/src/main/webapp/static/js/ueditor/1.4.3/jsp/src/com/baidu/ueditor/define/MIMEType.java | 20
management/guns-admin/src/main/webapp/static/crypto-js/aes.js | 234
management/guns-admin/src/main/webapp/static/js/ueditor/1.4.3/dialogs/attachment/fileTypeImages/icon_txt.gif | 0
management/guns-admin/src/main/webapp/static/crypto-js/enc-utf16.js | 149
management/guns-admin/src/main/webapp/static/js/plugins/umeditor/lang/en/images/addimage.png | 0
management/guns-admin/src/main/webapp/static/js/ueditor/1.4.3/dialogs/attachment/fileTypeImages/icon_pdf.gif | 0
management/guns-admin/src/main/webapp/static/js/ueditor/1.4.3/themes/default/images/spacer.gif | 0
management/guns-admin/src/main/webapp/static/js/plugins/highcharts/modules/drilldown.js | 14
management/guns-admin/src/main/webapp/static/js/ueditor/jsp/themes/default/images/tangram-colorpicker.png | 0
management/guns-admin/src/main/webapp/static/js/plugins/layer/laydate/need/laydate.css | 75
management/guns-admin/src/main/webapp/WEB-INF/view/system/tServerCarmodel/charter_edit.html | 47
management/guns-admin/src/main/webapp/static/js/ueditor/jsp/dialogs/attachment/fileTypeImages/icon_mv.gif | 0
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/DriverActivityOrderMapper.java | 16
management/guns-admin/src/main/webapp/static/js/ueditor/1.4.3/third-party/highcharts/adapters/prototype-adapter.src.js | 316
management/guns-admin/src/main/webapp/static/layui/images/face/11.gif | 0
management/guns-generator/src/main/resources/gunsTemplate/advanced/page.js.btl | 102
management/guns-admin/src/main/webapp/static/layui/lay/modules/util.js | 2
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverActivityOnlineServiceImpl.java | 20
management/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderPrivateCar/tOrderPrivateCar_add.html | 89
management/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/yesDriver.html | 95
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TIntegralOrderController.java | 109
management/guns-admin/src/main/webapp/static/modular/system/tInvoice/tInvoice.js | 244
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TVerified.java | 137
management/guns-admin/src/main/webapp/static/js/ueditor/1.4.3/dialogs/searchreplace/searchreplace.js | 164
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TOrderPositionServiceImpl.java | 20
management/guns-admin/src/main/webapp/static/crypto-js/hmac-sha384.js | 18
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITIntegralGoodsService.java | 30
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/Menu.java | 208
management/guns-admin/src/main/webapp/static/layui/images/face/8.gif | 0
management/guns-admin/src/main/webapp/static/js/plugins/umeditor/dialogs/formula/images/formula.png | 0
management/guns-admin/src/main/webapp/static/js/ueditor/jsp/themes/default/images/upload.png | 0
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TIntegralGoods.java | 153
management/guns-admin/src/main/webapp/static/js/bootstrap.min.js | 7
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IPaymentRecordService.java | 35
management/guns-admin/src/main/webapp/static/js/ueditor/jsp/dialogs/video/video.js | 791
management/guns-admin/src/main/webapp/static/js/ueditor/jsp/dialogs/video/images/image.png | 0
management/guns-admin/src/main/webapp/WEB-INF/view/common/_right.html | 59
management/guns-generator/src/main/resources/gunsTemplate/advanced/menu_sql.sql.btl | 3
management/guns-admin/src/main/webapp/WEB-INF/view/system/tIntegralOrder/tIntegralOrder_immediately.html | 28
management/guns-admin/src/main/webapp/static/js/ueditor/jsp/dialogs/table/edittip.html | 33
management/guns-admin/src/main/webapp/static/js/ueditor/jsp/dialogs/spechars/spechars.html | 21
management/guns-admin/src/main/webapp/static/crypto-js/cipher-core.js | 890
management/guns-admin/src/main/webapp/static/js/common/ztree-object.js | 94
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/OperationLog.java | 154
management/guns-admin/src/main/webapp/static/js/plugins/umeditor/themes/default/images/ok.gif | 0
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TOrderCrossCityServiceImpl.java | 58
management/guns-admin/src/main/webapp/WEB-INF/view/system/tSite/tSite_edit.html | 193
management/guns-admin/src/main/webapp/static/crypto-js/enc-latin1.js | 18
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/DriverOnline.java | 104
management/guns-admin/src/main/webapp/static/js/ueditor/jsp/dialogs/music/music.html | 32
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DictServiceImpl.java | 106
management/guns-admin/src/main/webapp/WEB-INF/view/system/tServerCarmodel/tServerCarmodel_add.html | 24
management/guns-admin/src/main/webapp/static/layui/images/face/55.gif | 0
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TLineShiftServiceImpl.java | 20
management/guns-admin/src/main/webapp/static/js/ueditor/jsp/jsp/config.json | 94
management/guns-admin/src/main/webapp/static/css/patterns/header-profile-skin-1.png | 0
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/SysCouponActivityServiceImpl.java | 20
management/guns-admin/src/main/webapp/static/js/ueditor/jsp/dialogs/attachment/fileTypeImages/icon_doc.gif | 0
management/guns-admin/src/main/webapp/static/js/ueditor/jsp/themes/default/images/loaderror.png | 0
management/guns-admin/src/main/webapp/WEB-INF/view/system/notice/notice_add.html | 39
management/guns-admin/src/main/webapp/static/js/ueditor/1.4.3/third-party/highcharts/modules/map.js | 27
management/guns-admin/src/main/webapp/static/js/ueditor/jsp/dialogs/table/dragicon.png | 0
management/guns-admin/src/main/webapp/static/css/font-awesome.css | 2026
management/guns-admin/src/main/webapp/static/js/ueditor/1.4.3/themes/default/images/icons.gif | 0
management/guns-admin/src/main/webapp/static/js/ueditor/1.4.3/dialogs/emotion/images/0.gif | 0
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TPhoneMapper.java | 16
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/PaymentRecordServiceImpl.java | 64
management/guns-admin/src/main/webapp/static/crypto-js/hmac-sha224.js | 18
management/guns-admin/src/main/webapp/static/js/ueditor/1.4.3/dialogs/video/images/icons.gif | 0
management/guns-admin/src/main/webapp/WEB-INF/view/system/sysCouponActivity/sysCouponActivity.html | 68
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TCarModelController.java | 128
management/guns-admin/src/main/webapp/static/js/plugins/layer/layim/layim.css | 158
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TOpenCityBusiness.java | 141
management/guns-admin/src/main/webapp/static/layui/images/face/40.gif | 0
management/guns-admin/src/main/webapp/static/js/ueditor/jsp/dialogs/video/images/file-icons.gif | 0
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITOpenCityBusinessService.java | 16
management/guns-admin/src/main/java/com/stylefeng/guns/core/shiro/ShiroKit.java | 290
management/guns-admin/src/main/java/com/stylefeng/guns/modular/code/controller/CodeController.java | 61
management/guns-admin/src/main/webapp/static/modular/system/tCompany/tCompany_info.js | 716
management/guns-admin/src/main/webapp/static/js/ueditor/1.4.3/net/App_Code/Config.cs | 55
management/guns-admin/src/main/webapp/static/js/plugins/umeditor/themes/default/images/icons.gif | 0
management/guns-admin/src/main/webapp/static/js/ueditor/1.4.3/dialogs/scrawl/images/addimg.png | 0
management/guns-admin/src/main/webapp/static/js/ueditor/jsp/themes/default/images/spacer.gif | 0
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TSystemPriceController.java | 274
management/guns-admin/src/main/webapp/static/js/plugins/umeditor/third-party/mathquill/font/stixgeneral-bundle/stixgeneralbolita-webfont.eot | 0
management/guns-admin/src/main/webapp/static/js/plugins/laydate/theme/default/laydate.css | 2
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IUserCouponRecordService.java | 175
management/guns-admin/src/main/webapp/static/layui/css/modules/code.css | 2
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/system/LogController.java | 84
management/guns-admin/src/main/webapp/static/js/ueditor/1.4.3/third-party/highcharts/modules/annotations.js | 7
management/guns-admin/src/main/webapp/static/js/plugins/umeditor/third-party/mathquill/font/stixgeneral-bundle/stixgeneralbol-webfont.eot | 0
management/guns-core/src/main/java/com/stylefeng/guns/core/page/PageInfoBT.java | 41
management/guns-admin/src/main/java/com/stylefeng/guns/config/datasource/SingleDataSourceConfig.java | 61
management/guns-admin/src/main/webapp/WEB-INF/view/system/tPubWithdrawal/tPubWithdrawal_add.html | 38
management/guns-admin/src/main/webapp/static/js/ueditor/1.4.3/jsp/src/com/baidu/ueditor/upload/Base64Uploader.java | 52
management/guns-admin/src/main/webapp/static/js/ueditor/1.4.3/dialogs/charts/images/charts1.png | 0
management/guns-admin/src/main/webapp/static/js/plugins/bootstrap-table/bootstrap-table.min.js | 8
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/Relation.java | 75
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TCarServiceServiceImpl.java | 20
management/guns-admin/src/main/webapp/static/js/ueditor/1.4.3/php/action_list.php | 92
management/guns-admin/src/main/webapp/WEB-INF/view/system/tDispatch/tDispatch_add.html | 47
management/guns-admin/src/main/webapp/WEB-INF/view/system/tSysReformist/tSysReformist.html | 554
management/guns-admin/src/main/webapp/static/js/ueditor/jsp/third-party/highcharts/modules/data.src.js | 582
management/guns-admin/src/main/webapp/static/js/ueditor/1.4.3/themes/default/images/arrow_down.png | 0
management/guns-admin/src/main/webapp/static/js/ueditor/jsp/dialogs/emotion/emotion.js | 186
management/guns-admin/src/main/webapp/static/modular/system/tCar/tCar_info.js | 550
management/guns-admin/src/main/webapp/WEB-INF/view/system/tProblem/tProblem_add.html | 33
management/guns-admin/src/main/webapp/static/js/ueditor/1.4.3/dialogs/charts/charts.js | 519
management/guns-admin/src/main/webapp/static/js/ueditor/1.4.3/jsp/src/com/baidu/ueditor/define/ActionMap.java | 42
management/guns-admin/src/main/webapp/WEB-INF/view/system/tServerCarmodel/acrossCity.html | 49
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TLinePriceServiceImpl.java | 20
management/guns-admin/src/main/webapp/static/js/ueditor/jsp/dialogs/charts/charts.html | 89
management/guns-admin/src/main/webapp/static/js/plugins/umeditor/third-party/mathquill/font/Symbola.otf | 0
management/guns-admin/src/main/webapp/static/js/ueditor/jsp/ueditor.parse.min.js | 7
management/guns-admin/src/main/webapp/static/css/plugins/awesome-bootstrap-checkbox/awesome-bootstrap-checkbox.css | 251
management/guns-admin/src/main/webapp/static/js/ueditor/1.4.3/asp/PathFormatter.class.asp | 81
management/guns-admin/src/main/webapp/static/js/ueditor/1.4.3/dialogs/insertframe/insertframe.html | 98
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/UserActivityBalanceMapper.xml | 31
management/guns-admin/src/main/webapp/static/js/ueditor/jsp/dialogs/scrawl/images/addimg.png | 0
management/guns-admin/src/main/webapp/static/js/plugins/umeditor/lang/en/images/rotateleftenable.png | 0
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TLineCompany.java | 101
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TOrderPrivateCar.java | 869
management/guns-admin/src/main/webapp/static/js/ueditor/1.4.3/dialogs/attachment/attachment.css | 681
management/guns-admin/src/main/webapp/static/js/ueditor/jsp/ueditor.all.min.js | 18
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IRelationService.java | 16
management/guns-admin/src/main/java/com/stylefeng/guns/config/EhCacheConfig.java | 38
management/guns-admin/src/main/webapp/static/js/plugins/layer/skin/default/icon-ext.png | 0
management/guns-admin/src/main/webapp/static/modular/system/tCompany/franchisee_info.js | 606
management/guns-admin/src/main/webapp/static/layui/images/face/48.gif | 0
management/guns-admin/src/main/webapp/WEB-INF/view/system/tSite/tSite.html | 67
management/guns-admin/src/main/webapp/static/js/ueditor/1.4.3/dialogs/emotion/images/cface.gif | 0
management/guns-admin/src/main/webapp/static/js/plugins/umeditor/third-party/mathquill/font/stixgeneral-bundle/stixgeneralitalic-webfont.eot | 0
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverActivityOrderServiceImpl.java | 20
management/guns-admin/src/main/webapp/static/layui/images/face/39.gif | 0
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITSysCancleOrderService.java | 16
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TOpenCityBusinessServiceImpl.java | 20
management/guns-admin/src/main/java/com/stylefeng/guns/core/common/constant/factory/IConstantFactory.java | 120
management/guns-admin/src/main/webapp/static/crypto-js/ripemd160.js | 267
management/guns-admin/src/main/webapp/static/js/ueditor/1.4.3/dialogs/attachment/images/icons.gif | 0
management/guns-admin/src/main/webapp/static/modular/system/userActivity/sysCouponRecord.js | 162
management/guns-admin/src/main/java/com/stylefeng/guns/core/common/constant/dictmap/DictMap.java | 24
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverActivityHistoryServiceImpl.java | 27
management/guns-admin/src/main/webapp/static/js/ueditor/1.4.3/asp/config_loader.asp | 21
management/guns-admin/src/main/webapp/WEB-INF/view/system/menu/menu.html | 41
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TIntegralGoodsMapper.xml | 41
management/guns-core/src/main/java/com/stylefeng/guns/core/util/ToolUtil.java | 582
management/guns-admin/src/main/webapp/static/js/ueditor/1.4.3/dialogs/attachment/fileTypeImages/icon_xls.gif | 0
management/guns-admin/src/main/webapp/static/layui/images/face/4.gif | 0
management/guns-admin/src/main/webapp/static/modular/system/tReassign/selectCrossDriver.js | 156
management/guns-admin/src/main/webapp/static/js/ueditor/jsp/third-party/highcharts/modules/exporting.js | 22
management/guns-admin/src/main/webapp/static/crypto-js/hmac-sha512.js | 18
management/guns-admin/src/main/webapp/static/modular/system/tReassign/tReassign.js | 325
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/UserActivityDiscount1.java | 137
management/guns-admin/src/main/resources/ehcache.xml | 57
management/guns-admin/src/main/webapp/WEB-INF/view/system/sysCouponActivity/tUser.html | 63
management/guns-admin/src/main/webapp/static/js/ueditor/1.4.3/php/config.json | 94
management/guns-admin/src/main/java/com/stylefeng/guns/core/intercept/RestApiInteceptor.java | 62
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TVersionManagementMapper.java | 29
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/SysCouponRecordMapper.xml | 23
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IMenuService.java | 94
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TSystemPriceServiceImpl.java | 28
management/guns-admin/src/main/webapp/static/js/plugins/umeditor/dialogs/emotion/images/jxface2.gif | 0
management/guns-admin/src/main/webapp/static/js/plugins/metisMenu/jquery.metisMenu.js | 120
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/RelationServiceImpl.java | 21
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/UserActivityInviteServiceImpl.java | 20
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TCompanyMapper.java | 77
management/guns-admin/src/main/webapp/static/js/plugins/umeditor/lang/zh-cn/images/localimage.png | 0
management/guns-admin/src/main/webapp/WEB-INF/view/system/log/login_log.html | 47
management/guns-admin/src/main/webapp/static/js/ueditor/jsp/third-party/highcharts/themes/grid.js | 103
management/guns-admin/src/main/webapp/static/js/plugins/validate/additional-methods.min.js | 4
management/guns-admin/src/main/webapp/static/js/ueditor/jsp/themes/default/images/arrow_up.png | 0
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TVerifiedController.java | 136
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITSysSensitiveWordsService.java | 29
management/guns-admin/src/main/webapp/static/css/plugins/ztree/img/zTreeStandard.png | 0
management/guns-admin/src/main/webapp/static/js/ueditor/1.4.3/net/net.sln | 38
management/guns-admin/src/main/webapp/static/img/index2.png | 0
management/guns-admin/src/main/webapp/static/js/ueditor/1.4.3/dialogs/attachment/fileTypeImages/icon_ppt.gif | 0
management/guns-admin/src/main/webapp/static/js/plugins/bootstrap-treetable/bootstrap-treetable.js | 353
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/util/WrapperUtil.java | 30
management/guns-admin/src/main/webapp/WEB-INF/view/system/tSystemPrice/tSystemPrice_add.html | 182
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TOpenCityServiceImpl.java | 33
management/guns-admin/src/main/webapp/static/js/ueditor/1.4.3/dialogs/scrawl/images/brush.png | 0
management/guns-admin/src/main/webapp/static/modular/system/tFeedback/tFeedback_info.js | 123
management/guns-admin/src/main/webapp/static/layui/images/face/63.gif | 0
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TOpenCityMapper.java | 40
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITCompanyService.java | 92
management/guns-admin/src/main/webapp/WEB-INF/view/system/tCar/tCar_add.html | 198
management/guns-admin/src/main/webapp/static/modular/system/menu/menu_info.js | 175
management/guns-admin/src/main/java/com/stylefeng/guns/core/common/constant/dictmap/Dict/OrderDict.java | 33
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/system/UserMgrController.java | 451
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/SysRedPacketRecordController.java | 132
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/UserActivityRegisteredMapper.java | 16
management/guns-admin/src/main/webapp/static/js/ueditor/jsp/dialogs/attachment/fileTypeImages/icon_xls.gif | 0
management/guns-admin/src/main/webapp/static/js/ueditor/jsp/dialogs/insertframe/insertframe.html | 98
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/util/SendSms.java | 263
management/guns-admin/src/main/webapp/WEB-INF/view/system/tCompany/tCompany_addFranchisee.html | 221
management/guns-admin/src/main/webapp/WEB-INF/view/system/userActivity/addRegist.html | 78
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/DriverActivityOnline.java | 150
management/guns-admin/src/main/webapp/WEB-INF/view/login.html | 234
management/guns-admin/src/main/webapp/static/js/ueditor/jsp/third-party/SyntaxHighlighter/shCoreDefault.css | 1
management/guns-admin/src/main/webapp/static/modular/system/tLine/tLine_info.js | 441
management/guns-admin/src/main/webapp/static/modular/system/tServerCarmodel/acrossCity_info.js | 141
management/guns-admin/src/main/webapp/static/js/ueditor/jsp/third-party/jquery-1.10.2.js | 9789 +
management/guns-admin/src/main/webapp/static/layui/images/face/70.gif | 0
management/guns-admin/src/main/webapp/static/layui/layui.all.js | 5
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/PaymentRecord.java | 176
management/guns-admin/src/main/webapp/static/js/ueditor/1.4.3/themes/default/images/sortable.png | 0
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/system/DictController.java | 142
management/guns-admin/src/main/webapp/WEB-INF/view/system/tVersionManagement/tVersionManagement.html | 49
management/guns-admin/src/main/webapp/static/js/ueditor/1.4.3/jsp/src/com/baidu/ueditor/define/AppInfo.java | 77
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TSysReformistServiceImpl.java | 20
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TOrderCharteredCarMapper.java | 35
management/guns-admin/src/main/webapp/WEB-INF/view/system/sysCouponActivity/sysCouponRecord.html | 37
management/guns-admin/src/main/webapp/static/fonts/glyphicons-halflings-regular.woff | 0
management/guns-admin/src/main/webapp/static/js/ueditor/jsp/dialogs/template/template.js | 53
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/SysCouponRecordController.java | 140
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITOrderCharterService.java | 33
management/guns-admin/src/main/webapp/WEB-INF/view/system/tReassign/tReassign_reassignment.html | 34
management/guns-admin/src/main/webapp/static/css/patterns/header-profile.png | 0
management/guns-admin/src/main/webapp/static/js/content.js | 98
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TUserRedPacketRecord.java | 164
management/guns-admin/src/main/webapp/static/js/ueditor/1.4.3/asp/action_config.asp | 9
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TVerifiedServiceImpl.java | 28
management/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/tDriver_add.html | 257
management/guns-admin/src/main/webapp/static/js/ueditor/1.4.3/themes/default/images/anchor.gif | 0
management/guns-admin/src/main/webapp/static/modular/system/tSysSensitiveWords/tSysSensitiveWords.js | 122
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TSysFaceDistinguishMapper.java | 16
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TDriverController.java | 1904
management/guns-admin/src/main/webapp/static/js/plugins/umeditor/dialogs/emotion/images/yface.gif | 0
management/guns-admin/src/main/webapp/static/fonts/fontawesome-webfont.woff | 0
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TSysSensitiveWordsServiceImpl.java | 28
management/guns-admin/src/main/webapp/static/js/plugins/umeditor/third-party/mathquill/font/Symbola.svg | 5102
management/guns-admin/src/main/webapp/static/js/ueditor/1.4.3/dialogs/image/images/progress.png | 0
management/guns-admin/src/main/webapp/static/js/plugins/laydate/theme/default/font/iconfont.ttf | 0
management/guns-admin/src/main/webapp/static/js/ueditor/jsp/third-party/video-js/font/vjs.ttf | 0
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverOnlineServiceImpl.java | 47
management/guns-admin/src/main/java/com/stylefeng/guns/core/log/factory/LogTaskFactory.java | 102
management/guns-admin/src/main/webapp/static/js/plugins/umeditor/dialogs/formula/formula.js | 124
management/guns-admin/src/main/webapp/WEB-INF/view/system/driverActivity/driverActivity_add.html | 85
management/guns-admin/src/main/webapp/WEB-INF/view/system/report/operationalData.html | 53
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TOrderPosition.java | 124
management/guns-admin/src/main/webapp/static/js/plugins/umeditor/third-party/mathquill/font/stixgeneral-bundle/stixgeneralbolita-webfont.woff | 0
management/guns-admin/src/main/webapp/WEB-INF/view/system/tAgreement/driverRegister.html | 65
management/guns-admin/src/main/webapp/static/js/ueditor/jsp/third-party/video-js/video-js.css | 766
management/guns-admin/src/main/webapp/static/js/plugins/umeditor/third-party/mathquill/font/stixgeneral-bundle/stixgeneralbolita-webfont.svg | 1137
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IDriverActivityHistoryService.java | 28
management/guns-admin/src/main/webapp/static/js/ueditor/1.4.3/lang/en/images/music.png | 0
management/guns-admin/src/main/webapp/static/js/ueditor/jsp/dialogs/anchor/anchor.html | 40
management/guns-admin/src/main/webapp/static/modular/system/tCar/carInsuranceInfo.js | 100
management/guns-admin/src/main/webapp/static/js/plugins/layer/skin/default/textbg.png | 0
management/guns-admin/src/main/webapp/static/css/plugins/chosen/chosen.css | 423
management/guns-admin/src/main/webapp/static/js/ueditor/1.4.3/lang/en/images/deletedisable.png | 0
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/OrderCancelMapper.java | 22
management/guns-admin/src/main/webapp/static/js/ueditor/1.4.3/dialogs/link/link.html | 126
management/guns-core/src/main/java/com/stylefeng/guns/core/config/DefaultProperties.java | 25
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TInvoiceMapper.xml | 52
management/guns-admin/src/main/webapp/static/js/plugins/umeditor/lang/en/images/rotateleftdisable.png | 0
management/guns-admin/src/main/webapp/static/js/ueditor/1.4.3/jsp/src/com/baidu/ueditor/define/State.java | 18
management/guns-core/src/main/java/com/stylefeng/guns/core/support/WafRequestWrapper.java | 149
management/guns-admin/src/main/webapp/WEB-INF/view/common/tags/avatar.tag | 29
management/guns-admin/src/main/webapp/static/js/ueditor/1.4.3/dialogs/charts/images/charts3.png | 0
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/system/DeptController.java | 169
management/guns-admin/src/main/webapp/static/js/ueditor/1.4.3/themes/default/css/ueditor.min.css | 8
management/guns-admin/src/main/webapp/static/js/ueditor/1.4.3/third-party/webuploader/webuploader.html5only.js | 5559
management/guns-admin/src/main/webapp/WEB-INF/view/system/tIntegralOrder/tIntegralOrder_add.html | 35
management/guns-admin/src/main/webapp/static/js/plugins/webuploader/webuploader.noimage.js | 5026
management/guns-admin/src/main/webapp/static/js/ueditor/1.4.3/dialogs/scrawl/scrawl.css | 72
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TComplaintMapper.java | 34
management/guns-admin/src/main/webapp/static/layui/images/face/46.gif | 0
management/guns-admin/src/main/webapp/static/js/plugins/highcharts/themes/sand-signika.js | 104
management/guns-admin/src/main/webapp/static/layui/images/face/2.gif | 0
management/guns-admin/src/main/webapp/static/crypto-js/enc-utf8.js | 18
management/guns-admin/src/main/webapp/static/js/ueditor/1.4.3/php/action_crawler.php | 44
management/guns-admin/src/main/webapp/static/js/ueditor/1.4.3/dialogs/music/music.css | 30
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TInvoiceMapper.java | 32
management/guns-admin/src/main/webapp/WEB-INF/view/system/tIntegralGoods/tIntegralGoods_edit.html | 31
management/guns-admin/src/main/webapp/static/js/plugins/umeditor/third-party/mathquill/mathquill.css | 357
management/guns-admin/src/main/webapp/WEB-INF/view/system/report/couponStatistics.html | 184
management/guns-admin/src/main/webapp/WEB-INF/view/system/tPubWithdrawal/tPubWithdrawal_immediately.html | 41
management/guns-admin/src/main/java/com/stylefeng/guns/core/shiro/factory/IShiro.java | 50
management/guns-admin/src/main/webapp/static/js/ueditor/1.4.3/themes/default/images/icons-all.gif | 0
management/guns-admin/src/main/webapp/WEB-INF/view/system/tAgreement/pricingRules.html | 65
management/guns-admin/src/main/webapp/static/favicon.ico | 0
management/guns-admin/src/main/webapp/WEB-INF/view/system/tSysSensitiveWords/tSysSensitiveWords.html | 48
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TSystemPrice.java | 127
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITPubTransactionDetailsService.java | 16
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITSystemPriceService.java | 28
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/task/TestJob.java | 23
management/guns-admin/src/main/webapp/static/js/ueditor/1.4.3/dialogs/wordimage/fClipboard_ueditor.swf | 0
management/guns-admin/src/main/webapp/static/layui/images/face/65.gif | 0
management/guns-admin/src/main/webapp/static/js/ueditor/1.4.3/dialogs/help/help.html | 82
management/guns-admin/src/main/webapp/static/js/ueditor/jsp/dialogs/table/edittable.html | 64
management/guns-core/src/main/java/com/stylefeng/guns/core/config/properties/MutiDataSourceProperties.java | 80
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/LineShiftDriverMapper.java | 31
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/HuaWeiSMSUtil.java | 171
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TSmsrecordMapper.xml | 35
management/guns-admin/src/main/webapp/static/js/ueditor/jsp/third-party/highcharts/modules/no-data-to-display.js | 12
management/guns-admin/src/main/webapp/static/js/ueditor/1.4.3/third-party/highcharts/modules/heatmap.js | 1
management/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/punish.html | 62
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITVersionManagementService.java | 29
management/guns-admin/src/main/webapp/static/modular/system/dict/dict_info.js | 118
management/guns-admin/src/main/webapp/WEB-INF/view/404.html | 41
management/guns-admin/src/main/webapp/WEB-INF/view/system/tReassign/tReassign.html | 87
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ISysRedPacketRecordService.java | 16
management/guns-admin/src/main/webapp/WEB-INF/view/system/userActivity/sysCouponRecord.html | 37
management/guns-admin/src/main/webapp/static/js/ueditor/1.4.3/third-party/highcharts/themes/gray.js | 257
management/guns-admin/src/main/webapp/static/layui/images/face/37.gif | 0
management/guns-admin/src/main/webapp/static/js/ueditor/1.4.3/asp/config.json | 94
management/guns-admin/src/main/webapp/static/crypto-js/rc4.js | 139
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/AddAdminLogUtil.java | 26
management/guns-admin/src/main/webapp/static/js/plugins/umeditor/dialogs/video/images/none_focus.jpg | 0
management/guns-generator/src/main/java/com/stylefeng/guns/generator/engine/base/AbstractTemplateEngine.java | 115
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/OrderUtil.java | 57
management/guns-admin/src/main/webapp/static/js/ueditor/1.4.3/dialogs/background/background.css | 94
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/DictWarpper.java | 36
management/guns-admin/src/main/webapp/WEB-INF/view/system/notice/notice.html | 38
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TIntegralOrderMapper.java | 33
management/guns-admin/src/main/webapp/static/js/ueditor/jsp/dialogs/scrawl/images/size.png | 0
management/guns-admin/src/main/webapp/static/modular/system/log/login_log.js | 123
management/guns-admin/src/main/webapp/static/modular/system/tOrderCharter/tOrderCharter_info.js | 106
management/pom.xml | 253
management/guns-admin/src/main/webapp/static/js/ueditor/1.4.3/dialogs/webapp/webapp.html | 53
management/guns-admin/src/main/webapp/static/js/plugins/umeditor/themes/default/images/videologo.gif | 0
management/guns-admin/src/main/webapp/static/js/ueditor/jsp/dialogs/emotion/images/tface.gif | 0
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TPubWithdrawalServiceImpl.java | 28
management/guns-admin/src/main/webapp/static/img/icon100.png | 0
management/guns-admin/src/main/webapp/static/js/ueditor/1.4.3/third-party/highcharts/themes/grid.js | 103
management/guns-admin/src/main/webapp/static/modular/system/user/user_info.js | 341
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TRegionServiceImpl.java | 20
management/guns-admin/src/main/webapp/static/js/ueditor/1.4.3/dialogs/attachment/images/bg.png | 0
management/guns-admin/src/main/webapp/static/js/plugins/umeditor/third-party/mathquill/font/stixgeneral-bundle/stixgeneral-webfont.svg | 3318
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TSysSensitiveWords.java | 75
management/guns-admin/src/main/java/com/stylefeng/guns/GunsApplication.java | 51
management/guns-admin/src/main/webapp/static/js/ueditor/jsp/dialogs/scrawl/scrawl.html | 95
management/guns-admin/src/main/webapp/static/css/style.css | 7897
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TPubTransactionDetailsMapper.java | 16
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/UserActivity.java | 146
management/guns-admin/src/main/webapp/static/modular/system/tFeedback/tFeedback.js | 199
management/guns-admin/src/main/webapp/static/crypto-js/core.js | 807
management/guns-admin/src/main/webapp/static/js/ueditor/1.4.3/third-party/highcharts/modules/heatmap.src.js | 53
management/guns-admin/src/main/webapp/static/js/ueditor/jsp/dialogs/scrawl/scrawl.css | 72
management/guns-admin/src/main/webapp/static/img/user.png | 0
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITDriverLineService.java | 26
management/guns-admin/src/main/webapp/static/js/ueditor/jsp/themes/default/images/table-cell-align.png | 0
management/guns-admin/src/main/webapp/WEB-INF/view/system/tAgreement/tAgreementRecharge.html | 65
management/guns-admin/src/main/webapp/static/modular/system/role/role.js | 134
management/guns-admin/src/main/webapp/static/js/ueditor/1.4.3/ueditor.all.js | 29429 +++
management/guns-admin/src/main/webapp/static/modular/code/gen.js | 93
management/guns-admin/src/main/webapp/static/js/ueditor/jsp/dialogs/attachment/images/file-icons.png | 0
management/guns-admin/src/main/webapp/static/js/ueditor/jsp/dialogs/image/images/icons.gif | 0
management/guns-admin/src/main/webapp/WEB-INF/view/system/tFeedback/tFeedback.html | 52
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TReassign.java | 268
management/guns-admin/src/main/webapp/static/js/ueditor/1.4.3/asp/action_list.asp | 81
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITAgreementService.java | 16
management/guns-admin/src/main/webapp/static/js/ueditor/1.4.3/lang/en/images/localimage.png | 0
management/guns-admin/src/main/webapp/static/modular/system/sysCouponRecord/sysCouponRecord.js | 133
management/guns-admin/src/main/java/com/stylefeng/guns/core/common/constant/dictmap/base/SystemDict.java | 20
management/guns-admin/src/main/webapp/WEB-INF/view/system/tFeedback/tFeedback_immediately.html | 29
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TIntegralOrderServiceImpl.java | 28
management/guns-generator/src/main/resources/gunsTemplate/advanced/page_edit.html.btl | 41
management/guns-admin/src/main/webapp/WEB-INF/view/system/tProblem/tProblem.html | 49
management/guns-admin/src/main/webapp/static/js/plugins/umeditor/third-party/mathquill/mathquill.min.js | 2
management/guns-admin/src/main/webapp/static/js/ueditor/1.4.3/dialogs/video/video.js | 789
management/guns-admin/src/main/webapp/static/js/ueditor/1.4.3/dialogs/wordimage/wordimage.html | 111
management/guns-core/src/main/java/com/stylefeng/guns/core/util/ResKit.java | 38
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/UserWarpper.java | 29
management/guns-core/src/main/java/com/stylefeng/guns/core/util/IdGenerator.java | 20
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TOrderEvaluate.java | 137
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/UserActivityDiscount1Mapper.java | 48
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TSmsrecordServiceImpl.java | 28
management/guns-admin/src/main/webapp/static/modular/system/tFeedback/userFeedback.js | 199
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TCarMapper.java | 47
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TDriverLineMapper.xml | 25
management/guns-admin/src/main/webapp/static/js/ueditor/1.4.3/dialogs/attachment/images/file-icons.png | 0
management/guns-admin/src/main/webapp/static/crypto-js/sha224.js | 80
management/guns-admin/src/main/webapp/static/js/ueditor/jsp/dialogs/attachment/images/alignicon.png | 0
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/SysCouponActivityController.java | 276
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITOrderEvaluateService.java | 36
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TComplaint.java | 166
management/guns-admin/src/main/webapp/static/js/ueditor/1.4.3/dialogs/attachment/fileTypeImages/icon_jpg.gif | 0
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/DriverPunishMapper.xml | 24
management/guns-admin/src/main/webapp/WEB-INF/view/common/tags/select.tag | 26
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TComplaintMapper.xml | 60
management/guns-admin/src/main/webapp/static/js/plugins/umeditor/umeditor.js | 10923 +
management/guns-admin/src/main/java/com/stylefeng/guns/core/intercept/SessionHolderInterceptor.java | 34
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TNoticesMapper.xml | 42
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TInvoice.java | 212
management/guns-core/src/main/java/com/stylefeng/guns/core/util/MD5Util.java | 39
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/OrderCancelMapper.xml | 51
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/RoleWarpper.java | 27
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/RelationMapper.xml | 12
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TSysCancleOrder.java | 114
management/guns-admin/src/main/java/com/stylefeng/guns/core/common/exception/BizExceptionEnum.java | 100
management/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderTaxi/tOrderTaxi_changeOrder.html | 35
management/guns-admin/src/main/webapp/static/js/ueditor/jsp/dialogs/emotion/images/fface.gif | 0
management/guns-admin/src/main/webapp/static/js/ueditor/1.4.3/third-party/codemirror/codemirror.css | 104
management/guns-core/src/main/java/com/stylefeng/guns/core/support/WafKit.java | 114
management/guns-admin/src/main/webapp/static/js/ueditor/jsp/lang/en/images/alldeletebtnupskin.png | 0
management/guns-admin/src/main/webapp/WEB-INF/view/system/tCar/carInsurance.html | 31
management/guns-generator/src/main/resources/gunsTemplate/advanced/page_info.js.btl | 98
management/guns-admin/src/main/webapp/static/js/ueditor/jsp/third-party/webuploader/Uploader.swf | 0
management/guns-admin/src/main/webapp/static/modular/system/tOrderEvaluate/tOrderEvaluate.js | 224
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TOrderPositionMapper.java | 16
management/guns-admin/src/main/webapp/static/layui/images/face/0.gif | 0
management/guns-admin/src/main/webapp/static/css/font-awesome.min.css | 4
management/guns-admin/src/main/java/com/stylefeng/guns/core/common/constant/dictmap/Dict/CarDict.java | 34
management/guns-core/src/main/java/com/stylefeng/guns/core/cache/BaseCacheFactory.java | 49
management/guns-core/src/main/java/com/stylefeng/guns/core/cache/ICache.java | 40
management/guns-admin/src/main/webapp/WEB-INF/view/system/tServerCarmodel/tServerCarmodel.html | 49
management/guns-admin/src/main/webapp/static/modular/system/tAdvertisement/tAdvertisement_info.js | 210
management/guns-admin/src/main/webapp/static/js/ueditor/jsp/third-party/webuploader/webuploader.html5only.js | 5559
management/guns-admin/src/main/webapp/static/js/ueditor/jsp/dialogs/emotion/images/yface.gif | 0
management/guns-admin/src/main/java/com/stylefeng/guns/core/common/constant/state/MenuOpenStatus.java | 50
management/guns-admin/src/main/webapp/static/js/ueditor/jsp/dialogs/scrawl/images/delimgH.png | 0
management/guns-admin/src/main/webapp/static/crypto-js/x64-core.js | 304
management/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/tDriver.html | 70
management/guns-admin/src/main/webapp/WEB-INF/view/system/tAgreement/tAgreementMe.html | 65
management/guns-admin/src/main/webapp/static/js/ueditor/jsp/dialogs/image/images/success.gif | 0
management/guns-admin/src/main/webapp/static/js/ueditor/jsp/ueditor/jsp/upload/image/20161220/1482229845748008398.jpg | 0
management/guns-core/src/main/java/com/stylefeng/guns/core/base/tips/SuccessTip.java | 15
management/guns-admin/src/main/webapp/WEB-INF/view/system/user/user_add.html | 62
management/guns-admin/src/main/java/com/stylefeng/guns/core/util/OssUploadUtil.java | 59
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TUserRedPacketRecordController.java | 123
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IUserService.java | 62
management/guns-admin/src/main/webapp/static/css/plugins/ztree/img/zTreeStandard.gif | 0
management/guns-admin/src/main/webapp/static/js/ueditor/jsp/themes/default/images/unhighlighted.gif | 0
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/CarInsuranceMapper.java | 24
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TUserMapper.xml | 120
management/guns-admin/src/main/webapp/WEB-INF/view/common/_tab.html | 74
management/guns-core/src/main/java/com/stylefeng/guns/core/node/ZTreeNode.java | 79
management/guns-admin/src/main/webapp/static/js/plugins/layer/layer.min.js | 2
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TSysIntegral.java | 74
management/guns-admin/src/main/webapp/static/js/ueditor/1.4.3/third-party/highcharts/modules/exporting.js | 22
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/UserMapper.java | 61
management/guns-admin/src/main/webapp/static/js/ueditor/1.4.3/third-party/snapscreen/UEditorSnapscreen.exe | 0
management/guns-core/src/main/java/com/stylefeng/guns/core/xss/XssHttpServletRequestWrapper.java | 87
management/guns-admin/src/main/webapp/static/js/plugins/umeditor/dialogs/emotion/images/neweditor-tab-bg.png | 0
management/guns-core/src/main/java/com/stylefeng/guns/core/util/SqlUtil.java | 35
management/guns-admin/src/main/java/com/stylefeng/guns/core/common/constant/dictmap/DeptDict.java | 28
management/guns-core/src/main/java/com/stylefeng/guns/core/support/ClassKit.java | 206
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/IncomeMapper.java | 7
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/SysRedPacketRecord.java | 190
management/guns-admin/src/main/webapp/static/js/ueditor/1.4.3/themes/default/images/scale.png | 0
management/guns-admin/src/main/webapp/WEB-INF/view/common/tags/SelectCon.tag | 16
management/guns-admin/src/main/java/com/stylefeng/guns/core/beetl/ShiroExt.java | 186
management/guns-admin/src/main/webapp/static/js/ueditor/1.4.3/themes/default/images/icons.png | 0
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverActivityRegisteredServiceImpl.java | 20
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/GDInterfaceMapper.xml | 18
management/guns-admin/src/main/webapp/static/js/plugins/layer/mobile/need/layer.css | 1
management/guns-admin/src/main/webapp/static/js/ueditor/jsp/dialogs/attachment/images/image.png | 0
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TAdvertisement.java | 216
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TAgreement.java | 141
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TOrderEvaluateServiceImpl.java | 28
management/guns-admin/src/main/webapp/static/js/ueditor/1.4.3/net/Bin/Newtonsoft.Json.dll | 0
management/guns-admin/src/main/webapp/WEB-INF/view/system/dept/dept_edit.html | 44
management/guns-admin/src/main/webapp/static/js/plugins/highcharts/themes/grid.js | 103
management/guns-admin/src/main/webapp/static/js/ueditor/1.4.3/dialogs/video/images/icons.png | 0
management/guns-admin/src/main/webapp/static/js/plugins/umeditor/themes/default/css/umeditor.css | 777
management/guns-admin/src/main/webapp/static/js/plugins/highcharts/themes/gray.js | 257
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TOrderPrivateCarMapper.xml | 168
management/guns-admin/src/main/webapp/static/js/ueditor/jsp/dialogs/gmap/gmap.html | 89
management/guns-admin/src/main/webapp/static/js/ueditor/1.4.3/dialogs/anchor/anchor.html | 40
management/guns-core/src/main/java/com/stylefeng/guns/core/util/NumUtil.java | 89
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TDriverLineServiceImpl.java | 27
management/guns-admin/src/main/webapp/static/js/plugins/highcharts/highcharts-more.src.js | 2576
management/guns-admin/src/main/webapp/static/js/ueditor/1.4.3/dialogs/video/images/file-icons.gif | 0
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TSite.java | 179
management/guns-admin/src/main/webapp/static/js/ueditor/1.4.3/dialogs/wordimage/wordimage.js | 157
management/guns-admin/src/main/webapp/static/js/plugins/laydate/theme/default/font/iconfont.svg | 45
management/guns-admin/src/main/webapp/static/img/icons.png | 0
management/guns-admin/src/main/webapp/static/js/ueditor/jsp/third-party/jquery-1.10.2.min.map | 1
management/guns-admin/src/main/webapp/static/layui/images/face/35.gif | 0
management/guns-admin/src/main/webapp/WEB-INF/view/system/tLine/tLine_add.html | 243
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ILoginLogService.java | 24
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TransactionDetailsMapper.java | 7
management/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/tDriver_changeCar.html | 46
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/UserActivityInviteController.java | 104
management/guns-admin/src/main/webapp/static/js/plugins/highcharts/highcharts-3d.src.js | 1352
management/guns-generator/src/main/java/com/stylefeng/guns/generator/engine/config/ServiceConfig.java | 91
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TOrderCharteredCarController.java | 108
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TPhoneMapper.xml | 19
management/guns-admin/src/main/webapp/static/js/ueditor/1.4.3/third-party/webuploader/webuploader.flashonly.js | 4176
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TCar.java | 566
management/guns-admin/src/main/webapp/static/css/plugins/ztree/img/diy/7.png | 0
management/guns-admin/src/main/webapp/static/js/ueditor/1.4.3/third-party/highcharts/modules/funnel.js | 12
management/guns-admin/src/main/webapp/static/js/plugins/highcharts/highcharts.js | 307
management/guns-admin/src/main/webapp/static/img/shangchuanpic.png | 0
management/guns-admin/src/main/webapp/static/modular/system/tDispatch/tDispatch_info.js | 251
management/guns-admin/src/main/webapp/static/js/ueditor/1.4.3/dialogs/attachment/fileTypeImages/icon_exe.gif | 0
management/guns-admin/src/main/webapp/static/js/ueditor/1.4.3/themes/iframe.css | 1
management/guns-admin/src/main/webapp/static/js/ueditor/jsp/dialogs/help/help.css | 7
management/guns-admin/src/main/webapp/static/modular/system/tReassign/tCross.js | 325
management/guns-admin/src/main/webapp/static/layui/images/face/20.gif | 0
management/guns-admin/src/main/java/com/stylefeng/guns/core/shiro/check/PermissionCheckFactory.java | 73
management/guns-admin/src/main/webapp/static/modular/system/tOpenCity/tOpenCity_info.js | 309
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TNotices.java | 228
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITLineSiteService.java | 16
management/guns-admin/src/main/java/com/stylefeng/guns/config/web/WebConfig.java | 175
management/guns-core/src/main/java/com/stylefeng/guns/core/util/FileUtil.java | 73
management/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderTaxi/tOrderTaxi_edit.html | 108
management/guns-admin/src/main/webapp/static/modular/system/tServerCarmodel/charter.js | 214
management/guns-admin/src/main/java/com/stylefeng/guns/core/util/Contrast.java | 214
management/guns-admin/src/main/webapp/static/js/plugins/umeditor/dialogs/link/link.js | 73
management/guns-admin/src/main/webapp/static/img/logo.png | 0
management/guns-admin/src/main/webapp/static/js/ueditor/jsp/lang/en/images/upload.png | 0
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/SysCouponActivity.java | 249
management/guns-admin/src/main/webapp/static/js/ueditor/jsp/dialogs/template/images/pre0.png | 0
management/guns-admin/src/main/webapp/static/js/ueditor/jsp/themes/default/css/ueditor.css | 1903
management/guns-admin/src/main/webapp/static/modular/system/tOrderCharter/tOrderCharter.js | 222
management/guns-admin/src/main/webapp/static/js/ueditor/1.4.3/dialogs/scrawl/images/scale.png | 0
management/guns-admin/src/main/webapp/static/js/plugins/layer/layim/data/friend.json | 107
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/UserCouponRecordMapper.java | 93
management/guns-admin/src/main/webapp/static/js/ueditor/1.4.3/third-party/zeroclipboard/ZeroClipboard.swf | 0
management/guns-admin/src/main/webapp/static/js/ueditor/jsp/third-party/highcharts/themes/dark-blue.js | 254
management/guns-admin/src/main/webapp/static/js/plugins/layer/skin/default/loading-2.gif | 0
management/guns-admin/src/main/webapp/static/js/ueditor/jsp/third-party/highcharts/modules/funnel.src.js | 289
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TIntegralOrderMapper.xml | 53
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/UserActivityRegisteredServiceImpl.java | 20
management/guns-admin/src/main/webapp/static/js/ueditor/jsp/third-party/xss.min.js | 1
management/guns-admin/src/main/webapp/static/js/ueditor/1.4.3/dialogs/attachment/images/icons.png | 0
management/guns-core/src/main/java/com/stylefeng/guns/core/util/SpringContextHolder.java | 46
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TOrderTaxi.java | 723
management/guns-admin/src/main/webapp/WEB-INF/view/common/tags/TimeCon.tag | 15
management/guns-admin/src/main/webapp/static/js/ueditor/jsp/dialogs/attachment/fileTypeImages/icon_ppt.gif | 0
management/guns-admin/src/main/webapp/static/js/ueditor/jsp/third-party/highcharts/modules/no-data-to-display.src.js | 128
management/guns-admin/src/main/webapp/static/js/plugins/layer/skin/layer.css | 7
management/guns-admin/src/main/webapp/static/js/ueditor/jsp/third-party/zeroclipboard/ZeroClipboard.swf | 0
management/guns-admin/src/main/webapp/WEB-INF/view/system/tPubWithdrawal/tPubWithdrawal_edit.html | 38
management/guns-admin/src/main/webapp/static/js/ueditor/jsp/dialogs/searchreplace/searchreplace.html | 102
management/guns-admin/src/main/webapp/static/js/ueditor/1.4.3/dialogs/charts/charts.css | 165
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TSiteController.java | 285
management/guns-core/src/main/java/com/stylefeng/guns/core/base/warpper/BaseControllerWarpper.java | 38
management/guns-admin/src/main/webapp/WEB-INF/view/system/userActivity/sysRedPacketRecord.html | 36
management/guns-admin/src/main/webapp/static/modular/system/tPubWithdrawal/tPubWithdrawal_info.js | 119
management/guns-admin/src/main/webapp/static/js/plugins/layer/laydate/laydate.js | 11
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IDriverActivityService.java | 45
management/guns-admin/src/main/webapp/static/js/ueditor/1.4.3/third-party/highcharts/highcharts-more.src.js | 2430
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TUserController.java | 588
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TVersionManagementServiceImpl.java | 28
management/guns-admin/src/main/webapp/static/js/ueditor/1.4.3/jsp/src/com/baidu/ueditor/define/MultiState.java | 112
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/DriverActivityHistoryMapper.java | 28
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITUserService.java | 57
management/guns-admin/src/main/webapp/static/js/plugins/umeditor/third-party/mathquill/font/stixgeneral-bundle/stixgeneralbol-webfont.woff | 0
management/guns-admin/src/main/webapp/static/crypto-js/enc-base64.js | 136
management/guns-admin/src/main/webapp/static/js/ueditor/jsp/dialogs/charts/charts.css | 165
management/guns-admin/src/main/webapp/WEB-INF/view/system/tCar/tCar_edit.html | 216
management/guns-admin/src/main/webapp/static/js/plugins/umeditor/lang/en/images/deleteenable.png | 0
management/guns-admin/src/main/java/com/stylefeng/guns/core/common/constant/state/BizLogType.java | 51
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/CustomWarpper.java | 6
management/guns-admin/src/main/webapp/static/js/ueditor/jsp/themes/default/images/dialog-title-bg.png | 0
management/guns-admin/src/main/webapp/static/js/plugins/umeditor/third-party/jquery.min.js | 6
management/guns-admin/src/main/webapp/static/js/plugins/bootstrap-table/locale/bootstrap-table-zh-CN.js | 46
management/guns-admin/src/main/webapp/static/js/plugins/layer/skin/layer.ext.css | 8
management/guns-admin/src/main/webapp/static/js/ueditor/1.4.3/dialogs/emotion/images/wface.gif | 0
management/guns-admin/src/main/webapp/static/js/ueditor/jsp/dialogs/attachment/images/file-icons.gif | 0
management/guns-admin/src/main/webapp/static/img/girl.gif | 0
management/guns-core/src/main/java/com/stylefeng/guns/core/util/HttpSessionHolder.java | 26
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TDispatch.java | 176
management/guns-admin/src/main/webapp/static/modular/system/tAdvertisement/tAdvertisement.js | 296
management/guns-admin/src/main/webapp/static/css/plugins/validate/bootstrapValidator.min.css | 12
management/guns-admin/src/main/webapp/static/fonts/glyphicons-halflings-regular.eot | 0
management/guns-admin/src/main/webapp/WEB-INF/view/system/tNotices/system.html | 51
management/guns-admin/src/main/webapp/static/js/ueditor/1.4.3/dialogs/scrawl/images/scaleH.png | 0
management/guns-admin/src/main/webapp/static/js/ueditor/1.4.3/themes/default/images/highlighted.gif | 0
management/guns-admin/src/main/webapp/static/layui/font/iconfont.svg | 554
management/guns-admin/src/main/java/com/stylefeng/guns/core/common/constant/dictmap/Dict/UserDict.java | 36
management/guns-admin/src/main/webapp/WEB-INF/view/system/tDispatch/tDispatch.html | 70
management/guns-admin/src/main/webapp/static/js/ueditor/1.4.3/asp/action_crawler.asp | 32
management/guns-admin/src/main/webapp/static/js/ueditor/jsp/third-party/highcharts/highcharts-more.src.js | 2430
management/guns-admin/src/main/webapp/static/modular/system/tUserRedPacketRecord/tUserRedPacketRecord.js | 130
management/guns-core/src/main/java/com/stylefeng/guns/core/base/tips/ErrorTip.java | 16
management/guns-admin/src/main/webapp/static/js/plugins/chartJs/echarts.min.js | 1
management/guns-admin/src/main/java/com/stylefeng/guns/core/listener/ConfigListener.java | 54
management/guns-admin/src/main/webapp/WEB-INF/view/common/tags/button.tag | 30
management/guns-admin/src/main/webapp/static/js/ueditor/jsp/themes/default/images/highlighted.gif | 0
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TOpenCityBusinessMapper.java | 16
management/guns-admin/src/main/webapp/static/js/plugins/highcharts/modules/heatmap.js | 23
management/guns-admin/src/main/webapp/static/css/plugins/ztree/img/diy/3.png | 0
management/guns-admin/src/main/webapp/static/js/ueditor/1.4.3/lang/en/images/copy.png | 0
management/guns-admin/src/main/webapp/static/js/ueditor/1.4.3/themes/default/images/cursor_h.gif | 0
management/guns-admin/src/main/webapp/static/modular/system/menu/menu.js | 119
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TCarService.java | 85
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/SysCouponRecordServiceImpl.java | 20
management/guns-admin/src/main/java/com/stylefeng/guns/core/util/JwtTokenUtil.java | 127
management/guns-admin/src/main/webapp/static/js/plugins/umeditor/dialogs/emotion/images/fface.gif | 0
management/guns-admin/src/main/webapp/static/js/common/select-list-object.js | 36
management/guns-admin/src/main/webapp/static/js/ueditor/1.4.3/third-party/highcharts/modules/funnel.src.js | 289
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TDriver.java | 870
management/guns-admin/src/main/webapp/static/js/plugins/umeditor/third-party/mathquill/font/stixgeneral-bundle/STIXFontLicense2010.txt | 103
management/guns-admin/src/main/webapp/static/js/ueditor/jsp/third-party/highcharts/themes/gray.js | 257
management/guns-admin/src/main/webapp/static/modular/system/tDriver/training.js | 211
management/guns-core/src/main/java/com/stylefeng/guns/core/CoreFlag.java | 11
management/guns-admin/src/main/webapp/static/js/ueditor/jsp/themes/default/images/cursor_v.gif | 0
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/RelationMapper.java | 16
management/guns-admin/src/main/webapp/static/css/plugins/ztree/img/diy/5.png | 0
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TSiteServiceImpl.java | 37
management/guns-admin/src/main/webapp/static/js/ueditor/jsp/third-party/jquery-1.10.2.min.js | 6
management/guns-admin/src/main/webapp/static/js/ueditor/jsp/third-party/zeroclipboard/ZeroClipboard.js | 1256
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/util/SignUtil.java | 119
management/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderPrivateCar/tOrderPrivateCar.html | 101
management/guns-admin/src/main/webapp/WEB-INF/view/system/tReassign/cross.html | 87
management/guns-admin/src/main/webapp/static/js/plugins/umeditor/index.html | 277
management/guns-admin/src/main/webapp/static/js/ueditor/1.4.3/dialogs/charts/charts.html | 89
management/guns-admin/src/main/webapp/static/modular/system/tUserRedPacketRecord/tUserRedPacketRecord_info.js | 102
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TLineSiteMapper.xml | 18
management/guns-admin/src/main/webapp/static/img/password.png | 0
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TDriverService.java | 74
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IRoleService.java | 68
management/guns-admin/src/main/webapp/static/js/ueditor/jsp/dialogs/image/images/image.png | 0
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/system/MenuController.java | 251
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TFeedbackController.java | 169
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/task/jobs/AddNotice.java | 91
management/guns-admin/src/main/webapp/static/js/ueditor/jsp/dialogs/scrawl/images/undo.png | 0
management/guns-admin/src/main/webapp/static/js/plugins/umeditor/dialogs/image/image.css | 42
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/UserActivityInviteMapper.java | 16
management/guns-admin/src/main/webapp/static/modular/system/tOrderTaxi/selectDriver.js | 150
management/guns-admin/src/main/webapp/static/js/plugins/highcharts/modules/canvas-tools.js | 133
management/guns-admin/src/main/webapp/static/js/plugins/umeditor/lang/en/images/alldeletebtnupskin.png | 0
management/guns-admin/src/main/webapp/WEB-INF/view/system/menu/menu_edit.html | 42
management/guns-core/src/main/java/com/stylefeng/guns/core/config/DefaultMultiConfig.java | 22
management/guns-admin/src/main/java/com/stylefeng/guns/core/common/constant/state/MenuStatus.java | 50
management/guns-admin/src/main/webapp/static/layui/images/face/33.gif | 0
management/guns-admin/src/main/java/com/stylefeng/guns/config/datasource/MultiDataSourceConfig.java | 125
management/guns-admin/src/main/webapp/static/js/ueditor/jsp/third-party/highcharts/adapters/prototype-adapter.js | 15
management/guns-admin/src/main/webapp/static/css/plugins/ztree/img/diy/1_open.png | 0
management/guns-admin/src/main/webapp/static/js/plugins/layer/layer.js | 2
management/guns-admin/src/main/webapp/WEB-INF/view/system/tNotices/tNotices_edit.html | 29
management/guns-admin/src/main/webapp/WEB-INF/view/system/userActivity/sysCouponRecord1.html | 37
management/guns-admin/src/main/webapp/static/js/ueditor/jsp/third-party/highcharts/modules/annotations.src.js | 401
management/guns-admin/src/main/webapp/static/js/ueditor/1.4.3/jsp/src/com/baidu/ueditor/upload/Uploader.java | 29
management/guns-admin/src/main/webapp/static/js/ueditor/1.4.3/third-party/video-js/font/vjs.woff | 0
management/guns-admin/src/main/webapp/static/js/ueditor/jsp/lang/zh-cn/zh-cn.js | 669
management/guns-admin/src/main/webapp/static/modular/system/tCarBrand/tCarBrand.js | 190
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/DriverActivity.java | 146
management/guns-admin/src/main/webapp/WEB-INF/view/netCarInfo.html | 25
management/guns-admin/src/main/webapp/WEB-INF/view/system/tCarBrand/tCarBrand.html | 48
management/guns-admin/src/main/webapp/static/js/ueditor/1.4.3/dialogs/scrawl/scrawl.html | 95
management/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderLogistics/tOrderLogistics_add.html | 82
management/guns-admin/src/main/java/com/stylefeng/guns/core/common/exception/InvalidKaptchaException.java | 10
management/guns-admin/src/main/webapp/static/layui/images/face/61.gif | 0
management/guns-admin/src/main/webapp/static/js/plugins/umeditor/dialogs/video/images/right_focus.jpg | 0
management/guns-admin/src/main/webapp/static/js/plugins/webuploader/webuploader.flashonly.min.js | 2
management/guns-admin/src/main/webapp/static/js/plugins/layer/skin/default/loading-0.gif | 0
management/guns-admin/src/main/webapp/static/js/ueditor/jsp/dialogs/attachment/fileTypeImages/icon_exe.gif | 0
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/SysRedPacketRecordServiceImpl.java | 20
management/guns-admin/src/main/webapp/static/js/ueditor/1.4.3/themes/default/images/dialog-title-bg.png | 0
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TReassignController.java | 798
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/MenuMapper.xml | 179
management/guns-admin/src/main/webapp/static/fonts/fontawesome-webfont.eot | 0
management/guns-admin/src/main/webapp/static/js/ueditor/1.4.3/dialogs/template/template.css | 18
2,210 files changed, 550,029 insertions(+), 0 deletions(-)
diff --git a/management/guns-admin/pom.xml b/management/guns-admin/pom.xml
new file mode 100644
index 0000000..d05d5a9
--- /dev/null
+++ b/management/guns-admin/pom.xml
@@ -0,0 +1,306 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+
+ <artifactId>guns-admin</artifactId>
+ <name>guns-admin</name>
+ <description>guns 的spring boot版本</description>
+ <parent>
+ <groupId>com.stylefeng</groupId>
+ <artifactId>guns-parent</artifactId>
+ <version>1.0.0</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+ <packaging>war</packaging>
+
+ <dependencies>
+ <!--<dependency>
+ <groupId>org.springframework.cloud</groupId>
+ <artifactId>spring-cloud-starter-netflix-eureka-client</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework.cloud</groupId>
+ <artifactId>spring-cloud-starter-netflix-hystrix</artifactId>
+ </dependency>-->
+
+ <dependency>
+ <groupId>com.stylefeng</groupId>
+ <artifactId>guns-core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.stylefeng</groupId>
+ <artifactId>guns-generator</artifactId>
+ </dependency>
+
+ <!--spring boot依赖-->
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-aop</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-web</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-cache</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-validation</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-test</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-devtools</artifactId>
+ <optional>true</optional>
+ </dependency>
+
+ <dependency>
+ <groupId>redis.clients</groupId>
+ <artifactId>jedis</artifactId>
+ <version>2.9.0</version>
+ </dependency>
+
+ <!-- 导入Excel数据依赖 start -->
+ <dependency>
+ <groupId>org.apache.poi</groupId>
+ <artifactId>poi</artifactId>
+ <version>RELEASE</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.poi</groupId>
+ <artifactId>poi-ooxml</artifactId>
+ <version>RELEASE</version>
+ </dependency>
+
+ <!--shiro依赖-->
+ <dependency>
+ <groupId>org.apache.shiro</groupId>
+ <artifactId>shiro-core</artifactId>
+ <exclusions>
+ <exclusion>
+ <artifactId>slf4j-api</artifactId>
+ <groupId>org.slf4j</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.shiro</groupId>
+ <artifactId>shiro-spring</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.shiro</groupId>
+ <artifactId>shiro-ehcache</artifactId>
+ <exclusions>
+ <exclusion>
+ <artifactId>slf4j-api</artifactId>
+ <groupId>org.slf4j</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.ehcache</groupId>
+ <artifactId>ehcache</artifactId>
+ </dependency>
+
+ <!--极光推送-->
+ <dependency>
+ <groupId>cn.jpush.api</groupId>
+ <artifactId>jpush-client</artifactId>
+ <version>3.2.17</version>
+ </dependency>
+ <dependency>
+ <groupId>cn.jpush.api</groupId>
+ <artifactId>jiguang-common</artifactId>
+ <version>1.1.1</version>
+ </dependency>
+
+ <!--需要分布式session的话需要放开注释-->
+ <!--<dependency>-->
+ <!--<groupId>org.springframework.session</groupId>-->
+ <!--<artifactId>spring-session-data-redis</artifactId>-->
+ <!--</dependency>-->
+ <!--<dependency>-->
+ <!--<groupId>org.springframework.boot</groupId>-->
+ <!--<artifactId>spring-boot-starter-data-redis</artifactId>-->
+ <!--</dependency>-->
+
+ <dependency>
+ <groupId>com.github.penggle</groupId>
+ <artifactId>kaptcha</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.google.zxing</groupId>
+ <artifactId>core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.ibeetl</groupId>
+ <artifactId>beetl</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>io.springfox</groupId>
+ <artifactId>springfox-swagger2</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>io.springfox</groupId>
+ <artifactId>springfox-swagger-ui</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>io.jsonwebtoken</groupId>
+ <artifactId>jjwt</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ <version>2.6</version>
+ </dependency>
+
+ <dependency>
+ <groupId>com.aliyun.oss</groupId>
+ <artifactId>aliyun-sdk-oss</artifactId>
+ <version>2.5.0</version>
+ </dependency>
+ <dependency>
+ <groupId>com.google.code.gson</groupId>
+ <artifactId>gson</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.quartz-scheduler</groupId>
+ <artifactId>quartz</artifactId>
+ <version>2.2.1</version>
+ </dependency>
+ <dependency>
+ <groupId>cn.rongcloud.im</groupId>
+ <artifactId>server-sdk-java</artifactId>
+ <version>3.0.4</version>
+ </dependency>
+
+
+ <dependency>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpclient</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>commons-httpclient</groupId>
+ <artifactId>commons-httpclient</artifactId>
+ <version>3.1</version>
+ </dependency>
+
+ <!--引入本地工行支付jar start-->
+ <dependency>
+ <groupId>com.icbc</groupId>
+ <artifactId>icbc</artifactId>
+ <version>v2</version>
+ <scope>system</scope>
+ <systemPath>${project.basedir}/lib/icbc-api-sdk-cop.jar</systemPath>
+ </dependency>
+ <dependency>
+ <groupId>com.icbc.api</groupId>
+ <artifactId>icbc</artifactId>
+ <version>v2</version>
+ <scope>system</scope>
+ <systemPath>${project.basedir}/lib/icbc-api-sdk-cop-io.jar</systemPath>
+ </dependency>
+ <dependency>
+ <groupId>cn.com.infosec</groupId>
+ <artifactId>icbc</artifactId>
+ <version>v2</version>
+ <scope>system</scope>
+ <systemPath>${project.basedir}/lib/icbc-ca.jar</systemPath>
+ </dependency>
+ <dependency>
+ <groupId>cn.com.infosecCrypto</groupId>
+ <artifactId>icbc</artifactId>
+ <version>v2</version>
+ <scope>system</scope>
+ <systemPath>${project.basedir}/lib/InfosecCrypto_Java1_02_JDK14+.jar</systemPath>
+ </dependency>
+ <dependency>
+ <groupId>proguard</groupId>
+ <artifactId>icbc</artifactId>
+ <version>v2</version>
+ <scope>system</scope>
+ <systemPath>${project.basedir}/lib/proguard.jar</systemPath>
+ </dependency>
+ <!--引入本地工行支付jar end-->
+ </dependencies>
+
+
+
+
+ <build>
+ <!--<plugins>-->
+ <!--<plugin>-->
+ <!--<groupId>org.springframework.boot</groupId>-->
+ <!--<artifactId>spring-boot-maven-plugin</artifactId>-->
+ <!--<configuration>-->
+ <!--<fork>true</fork><!– 如果没有该项配置，肯呢个devtools不会起作用，即应用不会restart –>-->
+ <!--</configuration>-->
+ <!--</plugin>-->
+ <!--<plugin>-->
+ <!--<groupId>org.apache.maven.plugins</groupId>-->
+ <!--<artifactId>maven-surefire-plugin</artifactId>-->
+ <!--<configuration>-->
+ <!--<skip>true</skip>-->
+ <!--</configuration>-->
+ <!--</plugin>-->
+ <!--</plugins>-->
+
+ <!--打包war包引入本地jar的打包方式-->
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-war-plugin</artifactId>
+ <configuration>
+ <!-- 设置成false，否则检查web.xml是否存在。因为springboot是没有web.xml的 -->
+ <failOnMissingWebXml>false</failOnMissingWebXml>
+ <!--打包后的项目名-->
+ <!--<warName>example</warName>-->
+ <webResources>
+ <resource>
+ <!--把本地lib里面的jar复制到lib-->
+ <directory>${project.basedir}/lib</directory>
+ <targetPath>WEB-INF/lib/</targetPath>
+ <includes>
+ <include>**/*.jar</include>
+ </includes>
+ </resource>
+ </webResources>
+ </configuration>
+ </plugin>
+ </plugins>
+
+ <resources>
+ <resource>
+ <directory>lib</directory>
+ <targetPath>/BOOT-INF/lib/</targetPath>
+ <includes>
+ <include>**/*.jar</include>
+ </includes>
+ </resource>
+ <resource>
+ <directory>src/main/webapp</directory>
+ </resource>
+ <resource>
+ <directory>src/main/resources</directory>
+ <filtering>true</filtering>
+ </resource>
+ <resource>
+ <directory>src/main/java</directory>
+ <includes>
+ <include>**/*.xml</include>
+ </includes>
+ </resource>
+ </resources>
+ </build>
+
+</project>
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/GunsApplication.java b/management/guns-admin/src/main/java/com/stylefeng/guns/GunsApplication.java
new file mode 100644
index 0000000..e3b45f4
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/GunsApplication.java
@@ -0,0 +1,51 @@
+package com.stylefeng.guns;
+
+import org.apache.http.client.HttpClient;
+import org.apache.http.config.SocketConfig;
+import org.apache.http.impl.client.HttpClientBuilder;
+import org.apache.http.impl.conn.PoolingHttpClientConnectionManager;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.context.annotation.Bean;
+import org.springframework.http.client.HttpComponentsClientHttpRequestFactory;
+import org.springframework.http.converter.StringHttpMessageConverter;
+import org.springframework.scheduling.annotation.EnableScheduling;
+import org.springframework.web.client.RestTemplate;
+
+import java.nio.charset.StandardCharsets;
+
+/**
+ * SpringBoot方式启动类
+ *
+ * @author stylefeng
+ * @Date 2017/5/21 12:06
+ */
+@EnableScheduling//开启定时任务
+@SpringBootApplication
+public class GunsApplication {
+
+ private final static Logger logger = LoggerFactory.getLogger(GunsApplication.class);
+
+ public static void main(String[] args) {
+ SpringApplication.run(GunsApplication.class, args);
+ logger.info("GunsApplication is success!");
+ }
+
+ @Bean //通过ip地址调用
+ public RestTemplate restTemplate() {
+ PoolingHttpClientConnectionManager connectionManager = new PoolingHttpClientConnectionManager();
+ connectionManager.setDefaultSocketConfig(SocketConfig.custom().setTcpNoDelay(true).build());
+ connectionManager.setDefaultMaxPerRoute(100);//最大并发连接
+ connectionManager.setMaxTotal(200); // 总的最大连接数
+ HttpClient httpClient = HttpClientBuilder.create().setConnectionManager(connectionManager).build();
+ HttpComponentsClientHttpRequestFactory httpRequestFactory = new HttpComponentsClientHttpRequestFactory(httpClient);
+ httpRequestFactory.setConnectionRequestTimeout(30 * 1000);
+ httpRequestFactory.setConnectTimeout(30 * 3000);
+ httpRequestFactory.setReadTimeout(30 * 3000);
+ RestTemplate restTemplate = new RestTemplate(httpRequestFactory);
+ restTemplate.getMessageConverters().set(1, new StringHttpMessageConverter(StandardCharsets.UTF_8));
+ return restTemplate;
+ }
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/GunsServletInitializer.java b/management/guns-admin/src/main/java/com/stylefeng/guns/GunsServletInitializer.java
new file mode 100644
index 0000000..18e63c5
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/GunsServletInitializer.java
@@ -0,0 +1,18 @@
+package com.stylefeng.guns;
+
+import org.springframework.boot.builder.SpringApplicationBuilder;
+import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
+
+/**
+ * Guns Web程序启动类
+ *
+ * @author fengshuonan
+ * @date 2017-05-21 9:43
+ */
+public class GunsServletInitializer extends SpringBootServletInitializer {
+
+ @Override
+ protected SpringApplicationBuilder configure(SpringApplicationBuilder builder) {
+ return builder.sources(GunsApplication.class);
+ }
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/config/EhCacheConfig.java b/management/guns-admin/src/main/java/com/stylefeng/guns/config/EhCacheConfig.java
new file mode 100644
index 0000000..34616c6
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/config/EhCacheConfig.java
@@ -0,0 +1,38 @@
+package com.stylefeng.guns.config;
+
+import net.sf.ehcache.CacheManager;
+import org.springframework.cache.annotation.EnableCaching;
+import org.springframework.cache.ehcache.EhCacheCacheManager;
+import org.springframework.cache.ehcache.EhCacheManagerFactoryBean;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.core.io.ClassPathResource;
+
+/**
+ * ehcache配置
+ *
+ * @author fengshuonan
+ * @date 2017-05-20 23:11
+ */
+@Configuration
+@EnableCaching
+public class EhCacheConfig {
+
+ /**
+ * EhCache的配置
+ */
+ @Bean
+ public EhCacheCacheManager cacheManager(CacheManager cacheManager) {
+ return new EhCacheCacheManager(cacheManager);
+ }
+
+ /**
+ * EhCache的配置
+ */
+ @Bean
+ public EhCacheManagerFactoryBean ehcache() {
+ EhCacheManagerFactoryBean ehCacheManagerFactoryBean = new EhCacheManagerFactoryBean();
+ ehCacheManagerFactoryBean.setConfigLocation(new ClassPathResource("ehcache.xml"));
+ return ehCacheManagerFactoryBean;
+ }
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/config/SpringSessionConfig.java b/management/guns-admin/src/main/java/com/stylefeng/guns/config/SpringSessionConfig.java
new file mode 100644
index 0000000..ef9a5bc
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/config/SpringSessionConfig.java
@@ -0,0 +1,15 @@
+package com.stylefeng.guns.config;
+
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+
+/**
+ * spring session配置
+ *
+ * @author fengshuonan
+ * @date 2017-07-13 21:05
+ */
+//@EnableRedisHttpSession(maxInactiveIntervalInSeconds = 1800) //session过期时间 如果部署多机环境,需要打开注释
+@ConditionalOnProperty(prefix = "guns", name = "spring-session-open", havingValue = "true")
+public class SpringSessionConfig {
+
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/config/SwaggerConfig.java b/management/guns-admin/src/main/java/com/stylefeng/guns/config/SwaggerConfig.java
new file mode 100644
index 0000000..e02e7aa
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/config/SwaggerConfig.java
@@ -0,0 +1,47 @@
+package com.stylefeng.guns.config;
+
+import io.swagger.annotations.ApiOperation;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import springfox.documentation.builders.ApiInfoBuilder;
+import springfox.documentation.builders.PathSelectors;
+import springfox.documentation.builders.RequestHandlerSelectors;
+import springfox.documentation.service.ApiInfo;
+import springfox.documentation.spi.DocumentationType;
+import springfox.documentation.spring.web.plugins.Docket;
+import springfox.documentation.swagger2.annotations.EnableSwagger2;
+
+/**
+ * swagger配置类
+ *
+ * @author fengshuonan
+ * @date 2017年6月1日19:42:59
+ */
+@Configuration
+@EnableSwagger2
+@ConditionalOnProperty(prefix = "guns", name = "swagger-open", havingValue = "true")
+public class SwaggerConfig{
+
+ @Bean
+ public Docket createRestApi() {
+ return new Docket(DocumentationType.SWAGGER_2)
+ .apiInfo(apiInfo())
+ .select()
+ .apis(RequestHandlerSelectors.withMethodAnnotation(ApiOperation.class)) //这里采用包含注解的方式来确定要显示的接口
+ //.apis(RequestHandlerSelectors.basePackage("com.stylefeng.guns.controller.system.controller")) //这里采用包扫描的方式来确定要显示的接口
+ .paths(PathSelectors.any())
+ .build();
+ }
+
+ private ApiInfo apiInfo() {
+ return new ApiInfoBuilder()
+ .title("Guns Doc")
+ .description("Guns Api文档")
+ .termsOfServiceUrl("http://git.oschina.net/naan1993/guns")
+ .contact("stylefeng")
+ .version("2.0")
+ .build();
+ }
+
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/config/datasource/MultiDataSourceConfig.java b/management/guns-admin/src/main/java/com/stylefeng/guns/config/datasource/MultiDataSourceConfig.java
new file mode 100644
index 0000000..8c50753
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/config/datasource/MultiDataSourceConfig.java
@@ -0,0 +1,125 @@
+package com.stylefeng.guns.config.datasource;
+
+import com.alibaba.druid.pool.DruidDataSource;
+import com.baomidou.mybatisplus.plugins.OptimisticLockerInterceptor;
+import com.baomidou.mybatisplus.plugins.PaginationInterceptor;
+import com.stylefeng.guns.core.config.properties.DruidProperties;
+import com.stylefeng.guns.core.config.properties.MutiDataSourceProperties;
+import com.stylefeng.guns.core.datascope.DataScopeInterceptor;
+import com.stylefeng.guns.core.mutidatasource.DynamicDataSource;
+import com.stylefeng.guns.core.mutidatasource.aop.MultiSourceExAop;
+import org.mybatis.spring.annotation.MapperScan;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.jdbc.datasource.DataSourceTransactionManager;
+import org.springframework.transaction.annotation.EnableTransactionManagement;
+
+import java.sql.SQLException;
+import java.util.HashMap;
+
+/**
+ * 多数据源配置<br/>
+ * <p>
+ * 注：由于引入多数据源，所以让spring事务的aop要在多数据源切换aop的后面
+ *
+ * @author stylefeng
+ * @Date 2017/5/20 21:58
+ */
+@Configuration
+@ConditionalOnProperty(prefix = "guns.muti-datasource", name = "open", havingValue = "true")
+@EnableTransactionManagement(order = 2)
+@MapperScan(basePackages = {"com.stylefeng.guns.modular.system.dao"})
+public class MultiDataSourceConfig {
+
+ @Bean
+ @ConfigurationProperties(prefix = "guns.muti-datasource")
+ public MutiDataSourceProperties mutiDataSourceProperties() {
+ return new MutiDataSourceProperties();
+ }
+
+ @Bean
+ public MultiSourceExAop multiSourceExAop() {
+ return new MultiSourceExAop();
+ }
+
+ /**
+ * guns的数据源
+ */
+ private DruidDataSource dataSource(DruidProperties druidProperties) {
+ DruidDataSource dataSource = new DruidDataSource();
+ druidProperties.config(dataSource);
+ return dataSource;
+ }
+
+ /**
+ * 多数据源，第二个数据源
+ */
+ private DruidDataSource bizDataSource(DruidProperties druidProperties, MutiDataSourceProperties mutiDataSourceProperties) {
+ DruidDataSource dataSource = new DruidDataSource();
+ druidProperties.config(dataSource);
+ mutiDataSourceProperties.config(dataSource);
+ return dataSource;
+ }
+
+ /**
+ * 多数据源连接池配置
+ */
+ @Bean
+ public DynamicDataSource mutiDataSource(DruidProperties druidProperties, MutiDataSourceProperties mutiDataSourceProperties) {
+
+ DruidDataSource dataSourceGuns = dataSource(druidProperties);
+ DruidDataSource bizDataSource = bizDataSource(druidProperties, mutiDataSourceProperties);
+
+ try {
+ dataSourceGuns.init();
+ bizDataSource.init();
+ } catch (SQLException sql) {
+ sql.printStackTrace();
+ }
+
+ DynamicDataSource dynamicDataSource = new DynamicDataSource();
+ HashMap<Object, Object> hashMap = new HashMap<>();
+ hashMap.put(mutiDataSourceProperties.getDataSourceNames()[0], dataSourceGuns);
+ hashMap.put(mutiDataSourceProperties.getDataSourceNames()[1], bizDataSource);
+ dynamicDataSource.setTargetDataSources(hashMap);
+ dynamicDataSource.setDefaultTargetDataSource(dataSourceGuns);
+ return dynamicDataSource;
+ }
+
+ /**
+ * mybatis-plus分页插件
+ */
+ @Bean
+ public PaginationInterceptor paginationInterceptor() {
+ return new PaginationInterceptor();
+ }
+
+ /**
+ * 数据范围mybatis插件
+ */
+ @Bean
+ public DataScopeInterceptor dataScopeInterceptor() {
+ return new DataScopeInterceptor();
+ }
+
+ /**
+ * 乐观锁mybatis插件
+ */
+ @Bean
+ public OptimisticLockerInterceptor optimisticLockerInterceptor() {
+ return new OptimisticLockerInterceptor();
+ }
+
+ /**
+ * 事务配置
+ *
+ * @author stylefeng
+ * @Date 2018/6/27 23:11
+ */
+ @Bean
+ public DataSourceTransactionManager dataSourceTransactionManager(DynamicDataSource mutiDataSource) {
+ return new DataSourceTransactionManager(mutiDataSource);
+ }
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/config/datasource/SingleDataSourceConfig.java b/management/guns-admin/src/main/java/com/stylefeng/guns/config/datasource/SingleDataSourceConfig.java
new file mode 100644
index 0000000..b09ddbf
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/config/datasource/SingleDataSourceConfig.java
@@ -0,0 +1,61 @@
+package com.stylefeng.guns.config.datasource;
+
+import com.alibaba.druid.pool.DruidDataSource;
+import com.baomidou.mybatisplus.plugins.OptimisticLockerInterceptor;
+import com.baomidou.mybatisplus.plugins.PaginationInterceptor;
+import com.stylefeng.guns.core.config.properties.DruidProperties;
+import com.stylefeng.guns.core.datascope.DataScopeInterceptor;
+import org.mybatis.spring.annotation.MapperScan;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.transaction.annotation.EnableTransactionManagement;
+
+/**
+ * 多数据源配置
+ *
+ * @author stylefeng
+ * @Date 2017/5/20 21:58
+ */
+@Configuration
+@ConditionalOnProperty(prefix = "guns.muti-datasource", name = "open", havingValue = "false", matchIfMissing = true)
+@EnableTransactionManagement
+@MapperScan(basePackages = {"com.stylefeng.guns.modular.system.dao"})
+public class SingleDataSourceConfig {
+
+ /**
+ * 单数据源连接池配置
+ */
+ @Bean
+ public DruidDataSource dataSource(DruidProperties druidProperties) {
+ DruidDataSource dataSource = new DruidDataSource();
+ druidProperties.config(dataSource);
+ return dataSource;
+ }
+
+ /**
+ * mybatis-plus分页插件
+ */
+ @Bean
+ public PaginationInterceptor paginationInterceptor() {
+ return new PaginationInterceptor();
+ }
+
+ /**
+ * 数据范围mybatis插件
+ */
+ @Bean
+ public DataScopeInterceptor dataScopeInterceptor() {
+ return new DataScopeInterceptor();
+ }
+
+ /**
+ * 乐观锁mybatis插件
+ */
+ @Bean
+ public OptimisticLockerInterceptor optimisticLockerInterceptor() {
+ return new OptimisticLockerInterceptor();
+ }
+
+}
+
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/config/properties/BeetlProperties.java b/management/guns-admin/src/main/java/com/stylefeng/guns/config/properties/BeetlProperties.java
new file mode 100644
index 0000000..e1dc4cb
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/config/properties/BeetlProperties.java
@@ -0,0 +1,103 @@
+package com.stylefeng.guns.config.properties;
+
+import com.stylefeng.guns.core.util.ToolUtil;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.context.annotation.Configuration;
+
+import java.util.Properties;
+
+/**
+ * beetl配置(如果需要配置别的配置可参照这个形式自己添加)
+ *
+ * @author fengshuonan
+ * @date 2017-05-24 20:37
+ */
+@Configuration
+@ConfigurationProperties(prefix = BeetlProperties.BEETLCONF_PREFIX)
+public class BeetlProperties {
+
+ public static final String BEETLCONF_PREFIX = "beetl";
+
+ private String delimiterStatementStart;
+
+ private String delimiterStatementEnd;
+
+ private String resourceTagroot;
+
+ private String resourceTagsuffix;
+
+ private String resourceAutoCheck;
+
+ @Value("${spring.mvc.view.prefix}")
+ private String prefix;
+
+ public Properties getProperties(){
+ Properties properties = new Properties();
+ if(ToolUtil.isNotEmpty(delimiterStatementStart)){
+ if(delimiterStatementStart.startsWith("\\")){
+ delimiterStatementStart = delimiterStatementStart.substring(1);
+ }
+ properties.setProperty("DELIMITER_STATEMENT_START",delimiterStatementStart);
+ }
+ if(ToolUtil.isNotEmpty(delimiterStatementEnd)){
+ properties.setProperty("DELIMITER_STATEMENT_END",delimiterStatementEnd);
+ }else{
+ properties.setProperty("DELIMITER_STATEMENT_END","null");
+ }
+ if(ToolUtil.isNotEmpty(resourceTagroot)){
+ properties.setProperty("RESOURCE.tagRoot",resourceTagroot);
+ }
+ if(ToolUtil.isNotEmpty(resourceTagsuffix)){
+ properties.setProperty("RESOURCE.tagSuffix",resourceTagsuffix);
+ }
+ if(ToolUtil.isNotEmpty(resourceAutoCheck)){
+ properties.setProperty("RESOURCE.autoCheck",resourceAutoCheck);
+ }
+ return properties;
+ }
+
+ public String getPrefix() {
+ return prefix;
+ }
+
+ public String getDelimiterStatementStart() {
+ return delimiterStatementStart;
+ }
+
+ public void setDelimiterStatementStart(String delimiterStatementStart) {
+ this.delimiterStatementStart = delimiterStatementStart;
+ }
+
+ public String getDelimiterStatementEnd() {
+ return delimiterStatementEnd;
+ }
+
+ public void setDelimiterStatementEnd(String delimiterStatementEnd) {
+ this.delimiterStatementEnd = delimiterStatementEnd;
+ }
+
+ public String getResourceTagroot() {
+ return resourceTagroot;
+ }
+
+ public void setResourceTagroot(String resourceTagroot) {
+ this.resourceTagroot = resourceTagroot;
+ }
+
+ public String getResourceTagsuffix() {
+ return resourceTagsuffix;
+ }
+
+ public void setResourceTagsuffix(String resourceTagsuffix) {
+ this.resourceTagsuffix = resourceTagsuffix;
+ }
+
+ public String getResourceAutoCheck() {
+ return resourceAutoCheck;
+ }
+
+ public void setResourceAutoCheck(String resourceAutoCheck) {
+ this.resourceAutoCheck = resourceAutoCheck;
+ }
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/config/properties/GunsProperties.java b/management/guns-admin/src/main/java/com/stylefeng/guns/config/properties/GunsProperties.java
new file mode 100644
index 0000000..df80c8a
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/config/properties/GunsProperties.java
@@ -0,0 +1,129 @@
+package com.stylefeng.guns.config.properties;
+
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.stereotype.Component;
+
+import java.io.File;
+
+import static com.stylefeng.guns.core.util.ToolUtil.getTempPath;
+import static com.stylefeng.guns.core.util.ToolUtil.isEmpty;
+
+/**
+ * guns项目配置
+ *
+ * @author stylefeng
+ * @Date 2017/5/23 22:31
+ */
+@Component
+@ConfigurationProperties(prefix = GunsProperties.PREFIX)
+public class GunsProperties {
+
+ public static final String PREFIX = "guns";
+
+ private Boolean kaptchaOpen = false;
+
+ private Boolean swaggerOpen = false;
+
+ // 文件上传位置配置
+ private String fileUploadPath;
+
+ // 文件服务器访问地址
+ private String pictureServerAddress;
+
+ private Boolean haveCreatePath = false;
+
+ private Boolean springSessionOpen = false;
+
+ /**
+ * session 失效时间（默认为30分钟 单位：秒）
+ */
+ private Integer sessionInvalidateTime = 30 * 60;
+
+ /**
+ * session 验证失效时间（默认为15分钟 单位：秒）
+ */
+ private Integer sessionValidationInterval = 15 * 60;
+ /**
+ *前端接口调用基础路径
+ */
+ private String restUrl;
+
+ public String getFileUploadPath() {
+ //如果没有写文件上传路径,保存到临时目录
+ if (isEmpty(fileUploadPath)) {
+ return getTempPath();
+ } else {
+ //判断有没有结尾符,没有得加上
+ if (!fileUploadPath.endsWith(File.separator)) {
+ fileUploadPath = fileUploadPath + File.separator;
+ }
+ //判断目录存不存在,不存在得加上
+ if (!haveCreatePath) {
+ File file = new File(fileUploadPath);
+ file.mkdirs();
+ haveCreatePath = true;
+ }
+ return fileUploadPath;
+ }
+ }
+
+ public void setFileUploadPath(String fileUploadPath) {
+ this.fileUploadPath = fileUploadPath;
+ }
+
+ public String getPictureServerAddress() {
+ return pictureServerAddress;
+ }
+
+ public void setPictureServerAddress(String pictureServerAddress) {
+ this.pictureServerAddress = pictureServerAddress;
+ }
+
+ public Boolean getKaptchaOpen() {
+ return kaptchaOpen;
+ }
+
+ public void setKaptchaOpen(Boolean kaptchaOpen) {
+ this.kaptchaOpen = kaptchaOpen;
+ }
+
+ public Boolean getSwaggerOpen() {
+ return swaggerOpen;
+ }
+
+ public void setSwaggerOpen(Boolean swaggerOpen) {
+ this.swaggerOpen = swaggerOpen;
+ }
+
+ public Boolean getSpringSessionOpen() {
+ return springSessionOpen;
+ }
+
+ public void setSpringSessionOpen(Boolean springSessionOpen) {
+ this.springSessionOpen = springSessionOpen;
+ }
+
+ public Integer getSessionInvalidateTime() {
+ return sessionInvalidateTime;
+ }
+
+ public void setSessionInvalidateTime(Integer sessionInvalidateTime) {
+ this.sessionInvalidateTime = sessionInvalidateTime;
+ }
+
+ public Integer getSessionValidationInterval() {
+ return sessionValidationInterval;
+ }
+
+ public void setSessionValidationInterval(Integer sessionValidationInterval) {
+ this.sessionValidationInterval = sessionValidationInterval;
+ }
+
+ public String getRestUrl() {
+ return restUrl;
+ }
+
+ public void setRestUrl(String restUrl) {
+ this.restUrl = restUrl;
+ }
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/config/web/BeetlConfig.java b/management/guns-admin/src/main/java/com/stylefeng/guns/config/web/BeetlConfig.java
new file mode 100644
index 0000000..748ed06
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/config/web/BeetlConfig.java
@@ -0,0 +1,46 @@
+package com.stylefeng.guns.config.web;
+
+import com.stylefeng.guns.config.properties.BeetlProperties;
+import com.stylefeng.guns.core.beetl.BeetlConfiguration;
+import org.beetl.core.resource.ClasspathResourceLoader;
+import org.beetl.ext.spring.BeetlSpringViewResolver;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+/**
+ * web 配置类
+ *
+ * @author fengshuonan
+ * @date 2016年11月12日 下午5:03:32
+ */
+@Configuration
+public class BeetlConfig {
+
+ @Autowired
+ BeetlProperties beetlProperties;
+
+ /**
+ * beetl的配置
+ */
+ @Bean(initMethod = "init")
+ public BeetlConfiguration beetlConfiguration() {
+ BeetlConfiguration beetlConfiguration = new BeetlConfiguration();
+ beetlConfiguration.setResourceLoader(new ClasspathResourceLoader(BeetlConfig.class.getClassLoader(), beetlProperties.getPrefix()));
+ beetlConfiguration.setConfigProperties(beetlProperties.getProperties());
+ return beetlConfiguration;
+ }
+
+ /**
+ * beetl的视图解析器
+ */
+ @Bean
+ public BeetlSpringViewResolver beetlViewResolver() {
+ BeetlSpringViewResolver beetlSpringViewResolver = new BeetlSpringViewResolver();
+ beetlSpringViewResolver.setConfig(beetlConfiguration());
+ beetlSpringViewResolver.setContentType("text/html;charset=UTF-8");
+ beetlSpringViewResolver.setOrder(0);
+ return beetlSpringViewResolver;
+ }
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/config/web/ShiroConfig.java b/management/guns-admin/src/main/java/com/stylefeng/guns/config/web/ShiroConfig.java
new file mode 100644
index 0000000..ad068ae
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/config/web/ShiroConfig.java
@@ -0,0 +1,205 @@
+package com.stylefeng.guns.config.web;
+
+import com.stylefeng.guns.config.properties.GunsProperties;
+import com.stylefeng.guns.core.intercept.GunsUserFilter;
+import com.stylefeng.guns.core.shiro.ShiroDbRealm;
+import org.apache.shiro.cache.CacheManager;
+import org.apache.shiro.cache.ehcache.EhCacheManager;
+import org.apache.shiro.codec.Base64;
+import org.apache.shiro.session.mgt.SessionManager;
+import org.apache.shiro.spring.LifecycleBeanPostProcessor;
+import org.apache.shiro.spring.security.interceptor.AuthorizationAttributeSourceAdvisor;
+import org.apache.shiro.spring.web.ShiroFilterFactoryBean;
+import org.apache.shiro.web.mgt.CookieRememberMeManager;
+import org.apache.shiro.web.mgt.DefaultWebSecurityManager;
+import org.apache.shiro.web.servlet.Cookie;
+import org.apache.shiro.web.servlet.ShiroHttpSession;
+import org.apache.shiro.web.servlet.SimpleCookie;
+import org.apache.shiro.web.session.mgt.DefaultWebSessionManager;
+import org.apache.shiro.web.session.mgt.ServletContainerSessionManager;
+import org.springframework.beans.factory.config.MethodInvokingFactoryBean;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.cache.ehcache.EhCacheManagerFactoryBean;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+import javax.servlet.Filter;
+import java.util.HashMap;
+import java.util.LinkedHashMap;
+import java.util.Map;
+
+/**
+ * shiro权限管理的配置
+ *
+ * @author fengshuonan
+ * @date 2016年11月14日 下午3:03:44
+ */
+@Configuration
+public class ShiroConfig {
+
+ /**
+ * 安全管理器
+ */
+ @Bean
+ public DefaultWebSecurityManager securityManager(CookieRememberMeManager rememberMeManager, CacheManager cacheShiroManager, SessionManager sessionManager) {
+ DefaultWebSecurityManager securityManager = new DefaultWebSecurityManager();
+ securityManager.setRealm(this.shiroDbRealm());
+ securityManager.setCacheManager(cacheShiroManager);
+ securityManager.setRememberMeManager(rememberMeManager);
+ securityManager.setSessionManager(sessionManager);
+ return securityManager;
+ }
+
+ /**
+ * spring session管理器（多机环境）
+ */
+ @Bean
+ @ConditionalOnProperty(prefix = "guns", name = "spring-session-open", havingValue = "true")
+ public ServletContainerSessionManager servletContainerSessionManager() {
+ return new ServletContainerSessionManager();
+ }
+
+ /**
+ * session管理器(单机环境)
+ */
+ @Bean
+ @ConditionalOnProperty(prefix = "guns", name = "spring-session-open", havingValue = "false")
+ public DefaultWebSessionManager defaultWebSessionManager(CacheManager cacheShiroManager, GunsProperties gunsProperties) {
+ DefaultWebSessionManager sessionManager = new DefaultWebSessionManager();
+ sessionManager.setCacheManager(cacheShiroManager);
+ sessionManager.setSessionValidationInterval(gunsProperties.getSessionValidationInterval() * 1000);
+ sessionManager.setGlobalSessionTimeout(gunsProperties.getSessionInvalidateTime() * 1000);
+ sessionManager.setDeleteInvalidSessions(true);
+ sessionManager.setSessionValidationSchedulerEnabled(true);
+ Cookie cookie = new SimpleCookie(ShiroHttpSession.DEFAULT_SESSION_ID_NAME);
+ cookie.setName("shiroCookie");
+ cookie.setHttpOnly(true);
+ sessionManager.setSessionIdCookie(cookie);
+ return sessionManager;
+ }
+
+ /**
+ * 缓存管理器 使用Ehcache实现
+ */
+ @Bean
+ public CacheManager getCacheShiroManager(EhCacheManagerFactoryBean ehcache) {
+ EhCacheManager ehCacheManager = new EhCacheManager();
+ ehCacheManager.setCacheManager(ehcache.getObject());
+ return ehCacheManager;
+ }
+
+ /**
+ * 项目自定义的Realm
+ */
+ @Bean
+ public ShiroDbRealm shiroDbRealm() {
+ return new ShiroDbRealm();
+ }
+
+ /**
+ * rememberMe管理器, cipherKey生成见{@code Base64Test.java}
+ */
+ @Bean
+ public CookieRememberMeManager rememberMeManager(SimpleCookie rememberMeCookie) {
+ CookieRememberMeManager manager = new CookieRememberMeManager();
+ manager.setCipherKey(Base64.decode("Z3VucwAAAAAAAAAAAAAAAA=="));
+ manager.setCookie(rememberMeCookie);
+ return manager;
+ }
+
+ /**
+ * 记住密码Cookie
+ */
+ @Bean
+ public SimpleCookie rememberMeCookie() {
+ SimpleCookie simpleCookie = new SimpleCookie("rememberMe");
+ simpleCookie.setHttpOnly(true);
+ simpleCookie.setMaxAge(7 * 24 * 60 * 60);//7天
+ return simpleCookie;
+ }
+
+ /**
+ * Shiro的过滤器链
+ */
+ @Bean
+ public ShiroFilterFactoryBean shiroFilter(DefaultWebSecurityManager securityManager) {
+ ShiroFilterFactoryBean shiroFilter = new ShiroFilterFactoryBean();
+ shiroFilter.setSecurityManager(securityManager);
+ /**
+ * 默认的登陆访问url
+ */
+ shiroFilter.setLoginUrl("/login");
+ /**
+ * 登陆成功后跳转的url
+ */
+ shiroFilter.setSuccessUrl("/");
+ /**
+ * 没有权限跳转的url
+ */
+ shiroFilter.setUnauthorizedUrl("/global/error");
+
+ /**
+ * 覆盖默认的user拦截器(默认拦截器解决不了ajax请求 session超时的问题,若有更好的办法请及时反馈作者)
+ */
+ HashMap<String, Filter> myFilters = new HashMap<>();
+ myFilters.put("user", new GunsUserFilter());
+ shiroFilter.setFilters(myFilters);
+
+ /**
+ * 配置shiro拦截器链
+ *
+ * anon 不需要认证
+ * authc 需要认证
+ * user 验证通过或RememberMe登录的都可以
+ *
+ * 当应用开启了rememberMe时,用户下次访问时可以是一个user,但不会是authc,因为authc是需要重新认证的
+ *
+ * 顺序从上到下,优先级依次降低
+ *
+ * api开头的接口，走rest api鉴权，不走shiro鉴权
+ *
+ */
+ Map<String, String> hashMap = new LinkedHashMap<>();
+ hashMap.put("/static/**", "anon");
+ hashMap.put("/gunsApi/**", "anon");
+ hashMap.put("/login", "anon");
+ hashMap.put("/global/sessionError", "anon");
+ hashMap.put("/kaptcha", "anon");
+ hashMap.put("/**", "user");
+ shiroFilter.setFilterChainDefinitionMap(hashMap);
+ return shiroFilter;
+ }
+
+ /**
+ * 在方法中 注入 securityManager,进行代理控制
+ */
+ @Bean
+ public MethodInvokingFactoryBean methodInvokingFactoryBean(DefaultWebSecurityManager securityManager) {
+ MethodInvokingFactoryBean bean = new MethodInvokingFactoryBean();
+ bean.setStaticMethod("org.apache.shiro.SecurityUtils.setSecurityManager");
+ bean.setArguments(new Object[]{securityManager});
+ return bean;
+ }
+
+ /**
+ * Shiro生命周期处理器:
+ * 用于在实现了Initializable接口的Shiro bean初始化时调用Initializable接口回调(例如:UserRealm)
+ * 在实现了Destroyable接口的Shiro bean销毁时调用 Destroyable接口回调(例如:DefaultSecurityManager)
+ */
+ @Bean
+ public LifecycleBeanPostProcessor lifecycleBeanPostProcessor() {
+ return new LifecycleBeanPostProcessor();
+ }
+
+ /**
+ * 启用shrio授权注解拦截方式，AOP式方法级权限检查
+ */
+ @Bean
+ public AuthorizationAttributeSourceAdvisor authorizationAttributeSourceAdvisor(DefaultWebSecurityManager securityManager) {
+ AuthorizationAttributeSourceAdvisor authorizationAttributeSourceAdvisor =
+ new AuthorizationAttributeSourceAdvisor();
+ authorizationAttributeSourceAdvisor.setSecurityManager(securityManager);
+ return authorizationAttributeSourceAdvisor;
+ }
+
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/config/web/WebConfig.java b/management/guns-admin/src/main/java/com/stylefeng/guns/config/web/WebConfig.java
new file mode 100644
index 0000000..e66c6d5
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/config/web/WebConfig.java
@@ -0,0 +1,175 @@
+package com.stylefeng.guns.config.web;
+
+import com.alibaba.druid.pool.DruidDataSource;
+import com.alibaba.druid.support.http.StatViewServlet;
+import com.alibaba.druid.support.http.WebStatFilter;
+import com.alibaba.druid.support.spring.stat.BeanTypeAutoProxyCreator;
+import com.alibaba.druid.support.spring.stat.DruidStatInterceptor;
+import com.google.code.kaptcha.impl.DefaultKaptcha;
+import com.google.code.kaptcha.util.Config;
+import com.stylefeng.guns.config.properties.GunsProperties;
+import com.stylefeng.guns.core.intercept.RestApiInteceptor;
+import com.stylefeng.guns.core.listener.ConfigListener;
+import com.stylefeng.guns.core.xss.XssFilter;
+import org.springframework.aop.Advisor;
+import org.springframework.aop.support.DefaultPointcutAdvisor;
+import org.springframework.aop.support.JdkRegexpMethodPointcut;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.web.servlet.FilterRegistrationBean;
+import org.springframework.boot.web.servlet.ServletListenerRegistrationBean;
+import org.springframework.boot.web.servlet.ServletRegistrationBean;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.context.request.RequestContextListener;
+import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
+import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter;
+
+import java.util.Arrays;
+import java.util.Properties;
+
+/**
+ * web 配置类
+ *
+ * @author fengshuonan
+ * @date 2016年11月12日 下午5:03:32
+ */
+@Configuration
+public class WebConfig extends WebMvcConfigurerAdapter {
+
+ @Autowired
+ private GunsProperties gunsProperties;
+
+ /**
+ * 增加swagger的支持
+ */
+ @Override
+ public void addResourceHandlers(ResourceHandlerRegistry registry) {
+ if (gunsProperties.getSwaggerOpen()) {
+ registry.addResourceHandler("swagger-ui.html").addResourceLocations("classpath:/META-INF/resources/");
+ registry.addResourceHandler("/webjars/**").addResourceLocations("classpath:/META-INF/resources/webjars/");
+ }
+ }
+
+ /**
+ * 增加对rest api鉴权的spring mvc拦截器
+ */
+ @Override
+ public void addInterceptors(InterceptorRegistry registry) {
+ registry.addInterceptor(new RestApiInteceptor()).addPathPatterns("/gunsApi/**");
+ }
+
+ /**
+ * druidServlet注册
+ */
+ @Bean
+ public ServletRegistrationBean druidServletRegistration() {
+ ServletRegistrationBean registration = new ServletRegistrationBean(new StatViewServlet());
+ registration.addUrlMappings("/druid/*");
+ return registration;
+ }
+
+ /**
+ * druid监控 配置URI拦截策略
+ */
+ @Bean
+ public FilterRegistrationBean druidStatFilter() {
+ FilterRegistrationBean filterRegistrationBean = new FilterRegistrationBean(new WebStatFilter());
+ //添加过滤规则.
+ filterRegistrationBean.addUrlPatterns("/*");
+ //添加不需要忽略的格式信息.
+ filterRegistrationBean.addInitParameter(
+ "exclusions", "/static/*,*.js,*.gif,*.jpg,*.png,*.css,*.ico,/druid,/druid/*");
+ //用于session监控页面的用户名显示 需要登录后主动将username注入到session里
+ filterRegistrationBean.addInitParameter("principalSessionName", "username");
+ return filterRegistrationBean;
+ }
+
+ /**
+ * druid数据库连接池监控
+ */
+ @Bean
+ public DruidStatInterceptor druidStatInterceptor() {
+ return new DruidStatInterceptor();
+ }
+
+ @Bean
+ public JdkRegexpMethodPointcut druidStatPointcut() {
+ JdkRegexpMethodPointcut druidStatPointcut = new JdkRegexpMethodPointcut();
+ String patterns = "com.stylefeng.guns.controller.*.service.*";
+ //可以set多个
+ druidStatPointcut.setPatterns(patterns);
+ return druidStatPointcut;
+ }
+
+ /**
+ * druid数据库连接池监控
+ */
+ @Bean
+ public BeanTypeAutoProxyCreator beanTypeAutoProxyCreator() {
+ BeanTypeAutoProxyCreator beanTypeAutoProxyCreator = new BeanTypeAutoProxyCreator();
+ beanTypeAutoProxyCreator.setTargetBeanType(DruidDataSource.class);
+ beanTypeAutoProxyCreator.setInterceptorNames("druidStatInterceptor");
+ return beanTypeAutoProxyCreator;
+ }
+
+ /**
+ * druid 为druidStatPointcut添加拦截
+ *
+ * @return
+ */
+ @Bean
+ public Advisor druidStatAdvisor() {
+ return new DefaultPointcutAdvisor(druidStatPointcut(), druidStatInterceptor());
+ }
+
+ /**
+ * xssFilter注册
+ */
+ @Bean
+ public FilterRegistrationBean xssFilterRegistration() {
+ XssFilter xssFilter = new XssFilter();
+ xssFilter.setUrlExclusion(Arrays.asList("/tAgreement/updateAppParam","/tAdvertisement/add","/tAdvertisement/update","/tNotices/addSystem","/tNotices/updateSystem"
+ ,"/tIntegralGoods/add","/tIntegralGoods/update"));
+ FilterRegistrationBean registration = new FilterRegistrationBean(xssFilter);
+ registration.addUrlPatterns("/*");
+ return registration;
+ }
+
+ /**
+ * RequestContextListener注册
+ */
+ @Bean
+ public ServletListenerRegistrationBean<RequestContextListener> requestContextListenerRegistration() {
+ return new ServletListenerRegistrationBean<>(new RequestContextListener());
+ }
+
+ /**
+ * ConfigListener注册
+ */
+ @Bean
+ public ServletListenerRegistrationBean<ConfigListener> configListenerRegistration() {
+ return new ServletListenerRegistrationBean<>(new ConfigListener());
+ }
+
+ /**
+ * 验证码生成相关
+ */
+ @Bean
+ public DefaultKaptcha kaptcha() {
+ Properties properties = new Properties();
+ properties.put("kaptcha.border", "no");
+ properties.put("kaptcha.border.color", "105,179,90");
+ properties.put("kaptcha.textproducer.font.color", "blue");
+ properties.put("kaptcha.image.width", "125");
+ properties.put("kaptcha.image.height", "45");
+ properties.put("kaptcha.textproducer.font.size", "45");
+ properties.put("kaptcha.session.key", "code");
+ properties.put("kaptcha.textproducer.char.length", "4");
+ properties.put("kaptcha.textproducer.font.names", "宋体,楷体,微软雅黑");
+ Config config = new Config(properties);
+ DefaultKaptcha defaultKaptcha = new DefaultKaptcha();
+ defaultKaptcha.setConfig(config);
+ return defaultKaptcha;
+ }
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/core/aop/GlobalExceptionHandler.java b/management/guns-admin/src/main/java/com/stylefeng/guns/core/aop/GlobalExceptionHandler.java
new file mode 100644
index 0000000..5f4f745
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/core/aop/GlobalExceptionHandler.java
@@ -0,0 +1,123 @@
+package com.stylefeng.guns.core.aop;
+
+import com.stylefeng.guns.core.common.exception.BizExceptionEnum;
+import com.stylefeng.guns.core.common.exception.InvalidKaptchaException;
+import com.stylefeng.guns.core.base.tips.ErrorTip;
+import com.stylefeng.guns.core.exception.GunsException;
+import com.stylefeng.guns.core.log.LogManager;
+import com.stylefeng.guns.core.log.factory.LogTaskFactory;
+import com.stylefeng.guns.core.shiro.ShiroKit;
+import org.apache.shiro.authc.AuthenticationException;
+import org.apache.shiro.authc.CredentialsException;
+import org.apache.shiro.authc.DisabledAccountException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.core.annotation.Order;
+import org.springframework.http.HttpStatus;
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.ControllerAdvice;
+import org.springframework.web.bind.annotation.ExceptionHandler;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.ResponseStatus;
+
+import java.lang.reflect.UndeclaredThrowableException;
+
+import static com.stylefeng.guns.core.support.HttpKit.getIp;
+import static com.stylefeng.guns.core.support.HttpKit.getRequest;
+
+/**
+ * 全局的的异常拦截器（拦截所有的控制器）（带有@RequestMapping注解的方法上都会拦截）
+ *
+ * @author fengshuonan
+ * @date 2016年11月12日 下午3:19:56
+ */
+@ControllerAdvice
+@Order(-1)
+public class GlobalExceptionHandler {
+
+ private Logger log = LoggerFactory.getLogger(this.getClass());
+
+ /**
+ * 拦截业务异常
+ */
+ @ExceptionHandler(GunsException.class)
+ @ResponseStatus(HttpStatus.INTERNAL_SERVER_ERROR)
+ @ResponseBody
+ public ErrorTip notFount(GunsException e) {
+ LogManager.me().executeLog(LogTaskFactory.exceptionLog(ShiroKit.getUser().getId(), e));
+ getRequest().setAttribute("tip", e.getMessage());
+ log.error("业务异常:", e);
+ return new ErrorTip(e.getCode(), e.getMessage());
+ }
+
+ /**
+ * 用户未登录异常
+ */
+ @ExceptionHandler(AuthenticationException.class)
+ @ResponseStatus(HttpStatus.UNAUTHORIZED)
+ public String unAuth(AuthenticationException e) {
+ log.error("用户未登陆：", e);
+ return "/login.html";
+ }
+
+ /**
+ * 账号被冻结异常
+ */
+ @ExceptionHandler(DisabledAccountException.class)
+ @ResponseStatus(HttpStatus.UNAUTHORIZED)
+ public String accountLocked(DisabledAccountException e, Model model) {
+ String username = getRequest().getParameter("username");
+ LogManager.me().executeLog(LogTaskFactory.loginLog(username, "账号被冻结", getIp()));
+ model.addAttribute("tips", "账号被冻结");
+ return "/login.html";
+ }
+
+ /**
+ * 账号密码错误异常
+ */
+ @ExceptionHandler(CredentialsException.class)
+ @ResponseStatus(HttpStatus.UNAUTHORIZED)
+ public String credentials(CredentialsException e, Model model) {
+ String username = getRequest().getParameter("username");
+ LogManager.me().executeLog(LogTaskFactory.loginLog(username, "账号密码错误", getIp()));
+ model.addAttribute("tips", "账号密码错误");
+ return "/login.html";
+ }
+
+ /**
+ * 验证码错误异常
+ */
+ @ExceptionHandler(InvalidKaptchaException.class)
+ @ResponseStatus(HttpStatus.BAD_REQUEST)
+ public String credentials(InvalidKaptchaException e, Model model) {
+ String username = getRequest().getParameter("username");
+ LogManager.me().executeLog(LogTaskFactory.loginLog(username, "验证码错误", getIp()));
+ model.addAttribute("tips", "验证码错误");
+ return "/login.html";
+ }
+
+ /**
+ * 无权访问该资源异常
+ */
+ @ExceptionHandler(UndeclaredThrowableException.class)
+ @ResponseStatus(HttpStatus.UNAUTHORIZED)
+ @ResponseBody
+ public ErrorTip credentials(UndeclaredThrowableException e) {
+ getRequest().setAttribute("tip", "权限异常");
+ log.error("权限异常!", e);
+ return new ErrorTip(BizExceptionEnum.NO_PERMITION.getCode(), BizExceptionEnum.NO_PERMITION.getMessage());
+ }
+
+ /**
+ * 拦截未知的运行时异常
+ */
+ @ExceptionHandler(RuntimeException.class)
+ @ResponseStatus(HttpStatus.INTERNAL_SERVER_ERROR)
+ @ResponseBody
+ public ErrorTip notFount(RuntimeException e) {
+ LogManager.me().executeLog(LogTaskFactory.exceptionLog(ShiroKit.getUser().getId(), e));
+ getRequest().setAttribute("tip", "服务器未知运行时异常");
+ log.error("运行时异常:", e);
+ return new ErrorTip(BizExceptionEnum.SERVER_ERROR.getCode(), BizExceptionEnum.SERVER_ERROR.getMessage());
+ }
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/core/aop/LogAop.java b/management/guns-admin/src/main/java/com/stylefeng/guns/core/aop/LogAop.java
new file mode 100644
index 0000000..d5123f4
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/core/aop/LogAop.java
@@ -0,0 +1,105 @@
+package com.stylefeng.guns.core.aop;
+
+import com.stylefeng.guns.core.common.annotion.BussinessLog;
+import com.stylefeng.guns.core.common.constant.dictmap.base.AbstractDictMap;
+import com.stylefeng.guns.core.log.LogManager;
+import com.stylefeng.guns.core.log.LogObjectHolder;
+import com.stylefeng.guns.core.log.factory.LogTaskFactory;
+import com.stylefeng.guns.core.shiro.ShiroKit;
+import com.stylefeng.guns.core.shiro.ShiroUser;
+import com.stylefeng.guns.core.support.HttpKit;
+import com.stylefeng.guns.core.util.Contrast;
+import org.aspectj.lang.ProceedingJoinPoint;
+import org.aspectj.lang.Signature;
+import org.aspectj.lang.annotation.Around;
+import org.aspectj.lang.annotation.Aspect;
+import org.aspectj.lang.annotation.Pointcut;
+import org.aspectj.lang.reflect.MethodSignature;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.stereotype.Component;
+
+import java.lang.reflect.Method;
+import java.util.Map;
+
+/**
+ * 日志记录
+ *
+ * @author fengshuonan
+ * @date 2016年12月6日 下午8:48:30
+ */
+@Aspect
+@Component
+public class LogAop {
+
+ private Logger log = LoggerFactory.getLogger(this.getClass());
+
+ @Pointcut(value = "@annotation(com.stylefeng.guns.core.common.annotion.BussinessLog)")
+ public void cutService() {
+ }
+
+ @Around("cutService()")
+ public Object recordSysLog(ProceedingJoinPoint point) throws Throwable {
+
+ //先执行业务
+ Object result = point.proceed();
+
+ try {
+ handle(point);
+ } catch (Exception e) {
+ log.error("日志记录出错!", e);
+ }
+
+ return result;
+ }
+
+ private void handle(ProceedingJoinPoint point) throws Exception {
+
+ //获取拦截的方法名
+ Signature sig = point.getSignature();
+ MethodSignature msig = null;
+ if (!(sig instanceof MethodSignature)) {
+ throw new IllegalArgumentException("该注解只能用于方法");
+ }
+ msig = (MethodSignature) sig;
+ Object target = point.getTarget();
+ Method currentMethod = target.getClass().getMethod(msig.getName(), msig.getParameterTypes());
+ String methodName = currentMethod.getName();
+
+ //如果当前用户未登录，不做日志
+ ShiroUser user = ShiroKit.getUser();
+ if (null == user) {
+ return;
+ }
+
+ //获取拦截方法的参数
+ String className = point.getTarget().getClass().getName();
+ Object[] params = point.getArgs();
+
+ //获取操作名称
+ BussinessLog annotation = currentMethod.getAnnotation(BussinessLog.class);
+ String bussinessName = annotation.value();
+ String key = annotation.key();
+ Class dictClass = annotation.dict();
+
+ StringBuilder sb = new StringBuilder();
+ for (Object param : params) {
+ sb.append(param);
+ sb.append(" & ");
+ }
+
+ //如果涉及到修改,比对变化
+ String msg;
+ if (bussinessName.indexOf("修改") != -1 || bussinessName.indexOf("编辑") != -1) {
+ Object obj1 = LogObjectHolder.me().get();
+ Map<String, String> obj2 = HttpKit.getRequestParameters();
+ msg = Contrast.contrastObj(dictClass, key, obj1, obj2);
+ } else {
+ Map<String, String> parameters = HttpKit.getRequestParameters();
+ AbstractDictMap dictMap = (AbstractDictMap) dictClass.newInstance();
+ msg = Contrast.parseMutiKey(dictMap,key,parameters);
+ }
+
+ LogManager.me().executeLog(LogTaskFactory.bussinessLog(user.getId(), bussinessName, className, methodName, msg));
+ }
+}
\ No newline at end of file
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/core/aop/PermissionAop.java b/management/guns-admin/src/main/java/com/stylefeng/guns/core/aop/PermissionAop.java
new file mode 100644
index 0000000..13e9d6c
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/core/aop/PermissionAop.java
@@ -0,0 +1,70 @@
+/**
+ * Copyright (c) 2015-2017, Chill Zhuang 庄骞 (smallchill@163.com).
+ * <p>
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * <p>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.stylefeng.guns.core.aop;
+
+import com.stylefeng.guns.core.common.annotion.Permission;
+import com.stylefeng.guns.core.shiro.check.PermissionCheckManager;
+import org.aspectj.lang.ProceedingJoinPoint;
+import org.aspectj.lang.annotation.Around;
+import org.aspectj.lang.annotation.Aspect;
+import org.aspectj.lang.annotation.Pointcut;
+import org.aspectj.lang.reflect.MethodSignature;
+import org.springframework.core.annotation.Order;
+import org.springframework.stereotype.Component;
+
+import javax.naming.NoPermissionException;
+import java.lang.reflect.Method;
+
+/**
+ * AOP 权限自定义检查
+ */
+@Aspect
+@Component
+@Order(200)
+public class PermissionAop {
+
+ @Pointcut(value = "@annotation(com.stylefeng.guns.core.common.annotion.Permission)")
+ private void cutPermission() {
+
+ }
+
+ @Around("cutPermission()")
+ public Object doPermission(ProceedingJoinPoint point) throws Throwable {
+ MethodSignature ms = (MethodSignature) point.getSignature();
+ Method method = ms.getMethod();
+ Permission permission = method.getAnnotation(Permission.class);
+ Object[] permissions = permission.value();
+ if (permissions == null || permissions.length == 0) {
+ //检查全体角色
+ boolean result = PermissionCheckManager.checkAll();
+ if (result) {
+ return point.proceed();
+ } else {
+ throw new NoPermissionException();
+ }
+ } else {
+ //检查指定角色
+ boolean result = PermissionCheckManager.check(permissions);
+ if (result) {
+ return point.proceed();
+ } else {
+ throw new NoPermissionException();
+ }
+ }
+
+ }
+
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/core/beetl/BeetlConfiguration.java b/management/guns-admin/src/main/java/com/stylefeng/guns/core/beetl/BeetlConfiguration.java
new file mode 100644
index 0000000..fa53e22
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/core/beetl/BeetlConfiguration.java
@@ -0,0 +1,71 @@
+package com.stylefeng.guns.core.beetl;
+
+import com.stylefeng.guns.core.tag.DictSelectorTag;
+import com.stylefeng.guns.core.util.KaptchaUtil;
+import com.stylefeng.guns.core.util.ToolUtil;
+import org.beetl.core.Context;
+import org.beetl.core.Function;
+import org.beetl.core.Tag;
+import org.beetl.core.TagFactory;
+import org.beetl.ext.spring.BeetlGroupUtilConfiguration;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.ApplicationContext;
+import org.springframework.core.env.Environment;
+
+import java.io.UnsupportedEncodingException;
+
+/**
+ * beetl拓展配置,绑定一些工具类,方便在模板中直接调用
+ *
+ * @author stylefeng
+ * @Date 2018/2/22 21:03
+ */
+public class BeetlConfiguration extends BeetlGroupUtilConfiguration {
+
+ @Autowired
+ Environment env;
+
+ @Autowired
+ ApplicationContext applicationContext;
+
+ @Autowired
+ DictSelectorTag dictSelectorTag;
+
+
+
+ @Override
+ public void initOther() {
+ groupTemplate.registerFunctionPackage("shiro", new ShiroExt());
+ groupTemplate.registerFunctionPackage("tool", new ToolUtil());
+ groupTemplate.registerFunctionPackage("kaptcha", new KaptchaUtil());
+ groupTemplate.registerTagFactory("dictSelector", new TagFactory() {
+ @Override
+ public Tag createTag() {
+ return dictSelectorTag;
+ }
+ });
+
+ groupTemplate.registerFunction("env", new Function() {
+ @Override
+ public String call(Object[] paras, Context ctx) {
+ String key = (String)paras[0];
+ String value = env.getProperty(key);
+ if(value!=null) {
+ return getStr(value);
+ }
+ if(paras.length==2) {
+ return (String)paras[1];
+ }
+ return null;
+ }
+
+ protected String getStr(String str) {
+ try {
+ return new String(str.getBytes("iso8859-1"),"UTF-8");
+ } catch (UnsupportedEncodingException e) {
+ throw new RuntimeException(e);
+ }
+ }
+ });
+ }
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/core/beetl/ShiroExt.java b/management/guns-admin/src/main/java/com/stylefeng/guns/core/beetl/ShiroExt.java
new file mode 100644
index 0000000..55e7234
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/core/beetl/ShiroExt.java
@@ -0,0 +1,186 @@
+/**
+ * Copyright (c) 2015-2017, Chill Zhuang 庄骞 (smallchill@163.com).
+ * <p>
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * <p>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.stylefeng.guns.core.beetl;
+
+import org.apache.shiro.SecurityUtils;
+import org.apache.shiro.subject.Subject;
+import org.beetl.core.GroupTemplate;
+
+import com.stylefeng.guns.core.shiro.ShiroUser;
+
+public class ShiroExt {
+ private static final String NAMES_DELIMETER = ",";
+
+ /**
+ * 获取当前 Subject
+ *
+ * @return Subject
+ */
+ protected static Subject getSubject() {
+ return SecurityUtils.getSubject();
+ }
+
+ /**
+ * 获取封装的 ShiroUser
+ *
+ * @return ShiroUser
+ */
+ public ShiroUser getUser() {
+ if (isGuest()) {
+ return null;
+ } else {
+ return (ShiroUser) getSubject().getPrincipals().getPrimaryPrincipal();
+ }
+ }
+
+ /**
+ * 验证当前用户是否属于该角色？,使用时与lacksRole 搭配使用
+ *
+ * @param roleName 角色名
+ * @return 属于该角色：true，否则false
+ */
+ public boolean hasRole(String roleName) {
+ return getSubject() != null && roleName != null
+ && roleName.length() > 0 && getSubject().hasRole(roleName);
+ }
+
+ /**
+ * 与hasRole标签逻辑相反，当用户不属于该角色时验证通过。
+ *
+ * @param roleName 角色名
+ * @return 不属于该角色：true，否则false
+ */
+ public boolean lacksRole(String roleName) {
+ return !hasRole(roleName);
+ }
+
+ /**
+ * 验证当前用户是否属于以下任意一个角色。
+ *
+ * @param roleNames 角色列表
+ * @return 属于:true,否则false
+ */
+ public boolean hasAnyRoles(String roleNames) {
+ boolean hasAnyRole = false;
+ Subject subject = getSubject();
+ if (subject != null && roleNames != null && roleNames.length() > 0) {
+ for (String role : roleNames.split(NAMES_DELIMETER)) {
+ if (subject.hasRole(role.trim())) {
+ hasAnyRole = true;
+ break;
+ }
+ }
+ }
+ return hasAnyRole;
+ }
+
+ /**
+ * 验证当前用户是否属于以下所有角色。
+ *
+ * @param roleNames 角色列表
+ * @return 属于:true,否则false
+ */
+ public boolean hasAllRoles(String roleNames) {
+ boolean hasAllRole = true;
+ Subject subject = getSubject();
+ if (subject != null && roleNames != null && roleNames.length() > 0) {
+ for (String role : roleNames.split(NAMES_DELIMETER)) {
+ if (!subject.hasRole(role.trim())) {
+ hasAllRole = false;
+ break;
+ }
+ }
+ }
+ return hasAllRole;
+ }
+
+ /**
+ * 验证当前用户是否拥有指定权限,使用时与lacksPermission 搭配使用
+ *
+ * @param permission 权限名
+ * @return 拥有权限：true，否则false
+ */
+ public boolean hasPermission(String permission) {
+ return getSubject() != null && permission != null
+ && permission.length() > 0
+ && getSubject().isPermitted(permission);
+ }
+
+ /**
+ * 与hasPermission标签逻辑相反，当前用户没有制定权限时，验证通过。
+ *
+ * @param permission 权限名
+ * @return 拥有权限：true，否则false
+ */
+ public boolean lacksPermission(String permission) {
+ return !hasPermission(permission);
+ }
+
+ /**
+ * 已认证通过的用户。不包含已记住的用户，这是与user标签的区别所在。与notAuthenticated搭配使用
+ *
+ * @return 通过身份验证：true，否则false
+ */
+ public boolean authenticated() {
+ return getSubject() != null && getSubject().isAuthenticated();
+ }
+
+ /**
+ * 未认证通过用户，与authenticated标签相对应。与guest标签的区别是，该标签包含已记住用户。。
+ *
+ * @return 没有通过身份验证：true，否则false
+ */
+ public boolean notAuthenticated() {
+ return !authenticated();
+ }
+
+ /**
+ * 认证通过或已记住的用户。与guset搭配使用。
+ *
+ * @return 用户：true，否则 false
+ */
+ public boolean isUser() {
+ return getSubject() != null && getSubject().getPrincipal() != null;
+ }
+
+ /**
+ * 验证当前用户是否为“访客”，即未认证（包含未记住）的用户。用user搭配使用
+ *
+ * @return 访客：true，否则false
+ */
+ public boolean isGuest() {
+ return !isUser();
+ }
+
+ /**
+ * 输出当前用户信息，通常为登录帐号信息。
+ *
+ * @return 当前用户信息
+ */
+ public String principal() {
+ if (getSubject() != null) {
+ Object principal = getSubject().getPrincipal();
+ return principal.toString();
+ }
+ return "";
+ }
+
+ public static void main(String[] args) {
+ GroupTemplate gt = new GroupTemplate();
+ gt.registerFunctionPackage("shiro", new ShiroExt());
+
+ }
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/core/common/annotion/BussinessLog.java b/management/guns-admin/src/main/java/com/stylefeng/guns/core/common/annotion/BussinessLog.java
new file mode 100644
index 0000000..369be8b
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/core/common/annotion/BussinessLog.java
@@ -0,0 +1,33 @@
+package com.stylefeng.guns.core.common.annotion;
+
+import com.stylefeng.guns.core.common.constant.dictmap.base.AbstractDictMap;
+import com.stylefeng.guns.core.common.constant.dictmap.base.SystemDict;
+
+import java.lang.annotation.*;
+
+/**
+ * 标记需要做业务日志的方法
+ *
+ * @author fengshuonan
+ * @date 2017-03-31 12:46
+ */
+@Inherited
+@Retention(RetentionPolicy.RUNTIME)
+@Target({ElementType.METHOD})
+public @interface BussinessLog {
+
+ /**
+ * 业务的名称,例如:"修改菜单"
+ */
+ String value() default "";
+
+ /**
+ * 被修改的实体的唯一标识,例如:菜单实体的唯一标识为"id"
+ */
+ String key() default "id";
+
+ /**
+ * 字典(用于查找key的中文名称和字段的中文名称)
+ */
+ Class<? extends AbstractDictMap> dict() default SystemDict.class;
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/core/common/annotion/Permission.java b/management/guns-admin/src/main/java/com/stylefeng/guns/core/common/annotion/Permission.java
new file mode 100644
index 0000000..bfb1500
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/core/common/annotion/Permission.java
@@ -0,0 +1,22 @@
+package com.stylefeng.guns.core.common.annotion;
+
+import java.lang.annotation.*;
+
+/**
+ * 权限注解 用于检查权限 规定访问权限
+ *
+ * @example @Permission({role1,role2})
+ * @example @Permission
+ */
+@Inherited
+@Retention(RetentionPolicy.RUNTIME)
+@Target({ElementType.METHOD})
+public @interface Permission {
+
+ /**
+ * <p>角色英文名称</p>
+ * <p>使用注解时加上这个值表示限制只有某个角色的才可以访问对应的资源</p>
+ * <p>常用在某些资源限制只有超级管理员角色才可访问</p>
+ */
+ String[] value() default {};
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/core/common/constant/Const.java b/management/guns-admin/src/main/java/com/stylefeng/guns/core/common/constant/Const.java
new file mode 100644
index 0000000..1b2b5d8
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/core/common/constant/Const.java
@@ -0,0 +1,36 @@
+package com.stylefeng.guns.core.common.constant;
+
+/**
+ * 系统常量
+ *
+ * @author fengshuonan
+ * @date 2017年2月12日 下午9:42:53
+ */
+public interface Const {
+
+ /**
+ * 系统默认的管理员密码
+ */
+ String DEFAULT_PWD = "111111";
+
+ /**
+ * 管理员角色的名字
+ */
+ String ADMIN_NAME = "administrator";
+
+ /**
+ * 管理员id
+ */
+ Integer ADMIN_ID = 1;
+
+ /**
+ * 超级管理员角色id
+ */
+ Integer ADMIN_ROLE_ID = 1;
+
+ /**
+ * 接口文档的菜单名
+ */
+ String API_MENU_NAME = "接口文档";
+
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/core/common/constant/DatasourceEnum.java b/management/guns-admin/src/main/java/com/stylefeng/guns/core/common/constant/DatasourceEnum.java
new file mode 100644
index 0000000..b2b534f
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/core/common/constant/DatasourceEnum.java
@@ -0,0 +1,15 @@
+package com.stylefeng.guns.core.common.constant;
+
+/**
+ *
+ * 多数据源的枚举
+ *
+ * @author fengshuonan
+ * @date 2017年3月5日 上午10:15:02
+ */
+public interface DatasourceEnum {
+
+ String DATA_SOURCE_GUNS = "dataSourceGuns"; //guns数据源
+
+ String DATA_SOURCE_BIZ = "dataSourceBiz"; //其他业务的数据源
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/core/common/constant/JwtConstants.java b/management/guns-admin/src/main/java/com/stylefeng/guns/core/common/constant/JwtConstants.java
new file mode 100644
index 0000000..75472c8
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/core/common/constant/JwtConstants.java
@@ -0,0 +1,19 @@
+package com.stylefeng.guns.core.common.constant;
+
+/**
+ * jwt相关配置
+ *
+ * @author fengshuonan
+ * @date 2017-08-23 9:23
+ */
+public interface JwtConstants {
+
+ String AUTH_HEADER = "Authorization";
+
+ String SECRET = "defaultSecret";
+
+ Long EXPIRATION = 604800L;
+
+ String AUTH_PATH = "/gunsApi/auth";
+
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/core/common/constant/cache/Cache.java b/management/guns-admin/src/main/java/com/stylefeng/guns/core/common/constant/cache/Cache.java
new file mode 100644
index 0000000..a24800f
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/core/common/constant/cache/Cache.java
@@ -0,0 +1,15 @@
+package com.stylefeng.guns.core.common.constant.cache;
+
+/**
+ * 所有缓存名称的集合
+ *
+ * @author fengshuonan
+ * @date 2017-04-24 21:56
+ */
+public interface Cache {
+
+ /**
+ * 常量缓存
+ */
+ String CONSTANT = "CONSTANT";
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/core/common/constant/cache/CacheKey.java b/management/guns-admin/src/main/java/com/stylefeng/guns/core/common/constant/cache/CacheKey.java
new file mode 100644
index 0000000..a7a93cd
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/core/common/constant/cache/CacheKey.java
@@ -0,0 +1,31 @@
+package com.stylefeng.guns.core.common.constant.cache;
+
+/**
+ * 缓存标识前缀集合,常用在ConstantFactory类中
+ *
+ * @author fengshuonan
+ * @date 2017-04-25 9:37
+ */
+public interface CacheKey {
+
+ /**
+ * 角色名称(多个)
+ */
+ String ROLES_NAME = "roles_name_";
+
+ /**
+ * 角色名称(单个)
+ */
+ String SINGLE_ROLE_NAME = "single_role_name_";
+
+ /**
+ * 角色英文名称
+ */
+ String SINGLE_ROLE_TIP = "single_role_tip_";
+
+ /**
+ * 部门名称
+ */
+ String DEPT_NAME = "dept_name_";
+
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/core/common/constant/dictmap/DeleteDict.java b/management/guns-admin/src/main/java/com/stylefeng/guns/core/common/constant/dictmap/DeleteDict.java
new file mode 100644
index 0000000..0436003
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/core/common/constant/dictmap/DeleteDict.java
@@ -0,0 +1,31 @@
+package com.stylefeng.guns.core.common.constant.dictmap;
+
+import com.stylefeng.guns.core.common.constant.dictmap.base.AbstractDictMap;
+
+/**
+ * 用于删除业务的字典
+ *
+ * @author fengshuonan
+ * @date 2017-05-06 15:01
+ */
+public class DeleteDict extends AbstractDictMap {
+
+ @Override
+ public void init() {
+ put("roleId","角色名称");
+ put("deptId", "部门名称");
+ put("menuId", "菜单名称");
+ put("dictId", "字典名称");
+ put("noticeId", "标题");
+ }
+
+ @Override
+ protected void initBeWrapped() {
+ putFieldWrapperMethodName("roleId","getCacheObject");
+ putFieldWrapperMethodName("deptId","getCacheObject");
+ putFieldWrapperMethodName("menuId","getCacheObject");
+ putFieldWrapperMethodName("dictId","getCacheObject");
+ putFieldWrapperMethodName("noticeId","getCacheObject");
+
+ }
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/core/common/constant/dictmap/DeptDict.java b/management/guns-admin/src/main/java/com/stylefeng/guns/core/common/constant/dictmap/DeptDict.java
new file mode 100644
index 0000000..eb44e1c
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/core/common/constant/dictmap/DeptDict.java
@@ -0,0 +1,28 @@
+package com.stylefeng.guns.core.common.constant.dictmap;
+
+import com.stylefeng.guns.core.common.constant.dictmap.base.AbstractDictMap;
+
+/**
+ * 部门的映射
+ *
+ * @author fengshuonan
+ * @date 2017-05-06 15:01
+ */
+public class DeptDict extends AbstractDictMap {
+
+ @Override
+ public void init() {
+ put("deptId", "部门名称");
+ put("num", "部门排序");
+ put("pid", "上级名称");
+ put("simplename", "部门简称");
+ put("fullname", "部门全称");
+ put("tips", "备注");
+ }
+
+ @Override
+ protected void initBeWrapped() {
+ putFieldWrapperMethodName("deptId", "getDeptName");
+ putFieldWrapperMethodName("pid", "getDeptName");
+ }
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/core/common/constant/dictmap/Dict/BrandDict.java b/management/guns-admin/src/main/java/com/stylefeng/guns/core/common/constant/dictmap/Dict/BrandDict.java
new file mode 100644
index 0000000..ce72aeb
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/core/common/constant/dictmap/Dict/BrandDict.java
@@ -0,0 +1,29 @@
+package com.stylefeng.guns.core.common.constant.dictmap.Dict;
+
+import com.stylefeng.guns.core.common.constant.dictmap.base.AbstractDictMap;
+
+/**
+ * 车牌品牌日志记录
+ *
+ * @author fengshuonan
+ * @date 2017-05-06 15:01
+ */
+public class BrandDict extends AbstractDictMap {
+
+ @Override
+ public void init() {
+ put("id","车辆品牌id");
+ put("addTime","添加时间");
+ put("name","品牌名称");
+ put("brandImg","品牌图片（多个用逗号隔开）");
+ put("state","状态（1正常，2停用）");
+ put("specialMode","专车计费");
+ put("charteredMode","包车计费");
+ put("seatNum","座位数");
+ }
+
+ @Override
+ protected void initBeWrapped() {
+
+ }
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/core/common/constant/dictmap/Dict/CarDict.java b/management/guns-admin/src/main/java/com/stylefeng/guns/core/common/constant/dictmap/Dict/CarDict.java
new file mode 100644
index 0000000..dee5deb
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/core/common/constant/dictmap/Dict/CarDict.java
@@ -0,0 +1,34 @@
+package com.stylefeng.guns.core.common.constant.dictmap.Dict;
+
+import com.stylefeng.guns.core.common.constant.dictmap.base.AbstractDictMap;
+
+/**
+ * 车辆日志记录
+ *
+ * @author fengshuonan
+ * @date 2017-05-06 15:01
+ */
+public class CarDict extends AbstractDictMap {
+
+ @Override
+ public void init() {
+ put("id","车辆id");
+ put("addTime","添加时间");
+ put("carImg","车辆图片");
+ put("plateNumber","车牌号");
+ put("licenseNumber","行驶证编号");
+ put("licenseImg","行驶证照片");
+ put("brandId","关联品牌id");
+ put("color","车辆颜色");
+ put("serviceMode","服务模式（1专车，2包车）");
+ put("state","状态（1正常，2停用）");
+ put("insuranceNumber","保险编号");
+ put("insuranceImg","保险图片");
+ put("insuranceDate","保险到期时间");
+ }
+
+ @Override
+ protected void initBeWrapped() {
+
+ }
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/core/common/constant/dictmap/Dict/DriverDict.java b/management/guns-admin/src/main/java/com/stylefeng/guns/core/common/constant/dictmap/Dict/DriverDict.java
new file mode 100644
index 0000000..02e35eb
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/core/common/constant/dictmap/Dict/DriverDict.java
@@ -0,0 +1,34 @@
+package com.stylefeng.guns.core.common.constant.dictmap.Dict;
+
+import com.stylefeng.guns.core.common.constant.dictmap.base.AbstractDictMap;
+
+/**
+ * 司机日志记录
+ *
+ * @author fengshuonan
+ * @date 2017-05-06 15:01
+ */
+public class DriverDict extends AbstractDictMap {
+
+ @Override
+ public void init() {
+ put("id","司机id");
+ put("addTime","添加时间");
+ put("name","司机姓名");
+ put("headImg","头像");
+ put("phone","电话");
+ put("sex","性别");
+ put("password","登录密码");
+ put("state","状态（1正常，2停用）");
+ put("serviceMode","服务模式（1专车，2包车）");
+ put("driveNumber","驾驶证编号");
+ put("driveImg","驾驶证照片");
+ put("carId","车辆id");
+ put("driverId","司机id");
+ }
+
+ @Override
+ protected void initBeWrapped() {
+
+ }
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/core/common/constant/dictmap/Dict/LabelDict.java b/management/guns-admin/src/main/java/com/stylefeng/guns/core/common/constant/dictmap/Dict/LabelDict.java
new file mode 100644
index 0000000..4be7cf1
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/core/common/constant/dictmap/Dict/LabelDict.java
@@ -0,0 +1,25 @@
+package com.stylefeng.guns.core.common.constant.dictmap.Dict;
+
+import com.stylefeng.guns.core.common.constant.dictmap.base.AbstractDictMap;
+
+/**
+ * 评价标签日志记录
+ *
+ * @author fengshuonan
+ * @date 2017-05-06 15:01
+ */
+public class LabelDict extends AbstractDictMap {
+
+ @Override
+ public void init() {
+ put("id","标签id");
+ put("appLabelId","标签id");
+ put("addTime","添加时间");
+ put("name","标签名称");
+ }
+
+ @Override
+ protected void initBeWrapped() {
+
+ }
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/core/common/constant/dictmap/Dict/NoticeDict.java b/management/guns-admin/src/main/java/com/stylefeng/guns/core/common/constant/dictmap/Dict/NoticeDict.java
new file mode 100644
index 0000000..b8e8c38
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/core/common/constant/dictmap/Dict/NoticeDict.java
@@ -0,0 +1,28 @@
+package com.stylefeng.guns.core.common.constant.dictmap.Dict;
+
+import com.stylefeng.guns.core.common.constant.dictmap.base.AbstractDictMap;
+
+/**
+ * 系统通知日志记录
+ *
+ * @author fengshuonan
+ * @date 2017-05-06 15:01
+ */
+public class NoticeDict extends AbstractDictMap {
+
+ @Override
+ public void init() {
+ put("id","通知id");
+ put("addTime","添加时间");
+ put("title","标题");
+ put("issue","是否发布（1未发布，2已发布）");
+ put("content","内容");
+ put("sendType","发送对象（1用户，2司机 ,3用户和司机）");
+ put("sendTime","发送时间");
+ }
+
+ @Override
+ protected void initBeWrapped() {
+
+ }
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/core/common/constant/dictmap/Dict/ObjectDict.java b/management/guns-admin/src/main/java/com/stylefeng/guns/core/common/constant/dictmap/Dict/ObjectDict.java
new file mode 100644
index 0000000..cdc1ab4
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/core/common/constant/dictmap/Dict/ObjectDict.java
@@ -0,0 +1,28 @@
+package com.stylefeng.guns.core.common.constant.dictmap.Dict;
+
+import com.stylefeng.guns.core.common.constant.dictmap.base.AbstractDictMap;
+
+/**
+ * 日志记录
+ *
+ * @author fengshuonan
+ * @date 2017-05-06 15:01
+ */
+public class ObjectDict extends AbstractDictMap {
+
+ @Override
+ public void init() {
+ put("appOrderTopupId","充值订单id");
+ put("id","提现记录id");
+ put("appInvoiceId","发票记录id");
+ put("appOrderEvaluateId","订单评价id");
+ put("appComplaintId","投诉id");
+ put("appFeedbackId","意见反馈id");
+ put("appDriverRecruitId","司机招募id");
+ }
+
+ @Override
+ protected void initBeWrapped() {
+
+ }
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/core/common/constant/dictmap/Dict/OrderDict.java b/management/guns-admin/src/main/java/com/stylefeng/guns/core/common/constant/dictmap/Dict/OrderDict.java
new file mode 100644
index 0000000..1c584ac
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/core/common/constant/dictmap/Dict/OrderDict.java
@@ -0,0 +1,33 @@
+package com.stylefeng.guns.core.common.constant.dictmap.Dict;
+
+import com.stylefeng.guns.core.common.constant.dictmap.base.AbstractDictMap;
+
+/**
+ * 订单日志记录
+ *
+ * @author fengshuonan
+ * @date 2017-05-06 15:01
+ */
+public class OrderDict extends AbstractDictMap {
+
+ @Override
+ public void init() {
+ put("id","订单id");
+ put("appOrderId","订单id");
+ put("addTime","添加时间");
+ put("orderNum","订单编号");
+ put("userName","乘车人名称");
+ put("userPhone","乘车人手机");
+ put("number","乘车人数");
+ put("chargeMode","计费方式（1时间，2里程）");
+ put("rideTime","乘车时间");
+ put("startName","起点名称");
+ put("endName","终点名称");
+ put("driverId","接单司机id");
+ }
+
+ @Override
+ protected void initBeWrapped() {
+
+ }
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/core/common/constant/dictmap/Dict/UserAuthenticationDict.java b/management/guns-admin/src/main/java/com/stylefeng/guns/core/common/constant/dictmap/Dict/UserAuthenticationDict.java
new file mode 100644
index 0000000..82642df
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/core/common/constant/dictmap/Dict/UserAuthenticationDict.java
@@ -0,0 +1,24 @@
+package com.stylefeng.guns.core.common.constant.dictmap.Dict;
+
+import com.stylefeng.guns.core.common.constant.dictmap.base.AbstractDictMap;
+
+/**
+ * 用户日志记录
+ *
+ * @author fengshuonan
+ * @date 2017-05-06 15:01
+ */
+public class UserAuthenticationDict extends AbstractDictMap {
+
+ @Override
+ public void init() {
+ put("id","实名认证id");
+ put("state","审核状态（1待审核，2审核成功，3审核失败）");
+ put("isDelete","是否删除（1正常，2删除）");
+ }
+
+ @Override
+ protected void initBeWrapped() {
+
+ }
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/core/common/constant/dictmap/Dict/UserDict.java b/management/guns-admin/src/main/java/com/stylefeng/guns/core/common/constant/dictmap/Dict/UserDict.java
new file mode 100644
index 0000000..2948292
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/core/common/constant/dictmap/Dict/UserDict.java
@@ -0,0 +1,36 @@
+package com.stylefeng.guns.core.common.constant.dictmap.Dict;
+
+import com.stylefeng.guns.core.common.constant.dictmap.base.AbstractDictMap;
+
+/**
+ * 用户日志记录
+ *
+ * @author fengshuonan
+ * @date 2017-05-06 15:01
+ */
+public class UserDict extends AbstractDictMap {
+
+ @Override
+ public void init() {
+ put("id","用户id");
+ put("state","用户状态（1正常，2冻结）");
+ put("gold","用户金币数");
+ put("balance","用户余额数");
+ put("nickName","用户昵称");
+ put("phone","用户手机号");
+ put("level","等级（1普通用户，2白银会员，3黄金会员，4白金会员）");
+ put("sex","性别");
+ put("birthday","生日");
+ put("industry","行业");
+ put("job","职业");
+ put("company","公司");
+ put("education","学历");
+ put("signature","个性签名");
+ put("addTime","添加时间");
+ }
+
+ @Override
+ protected void initBeWrapped() {
+
+ }
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/core/common/constant/dictmap/Dict/VersionDict.java b/management/guns-admin/src/main/java/com/stylefeng/guns/core/common/constant/dictmap/Dict/VersionDict.java
new file mode 100644
index 0000000..2e08363
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/core/common/constant/dictmap/Dict/VersionDict.java
@@ -0,0 +1,28 @@
+package com.stylefeng.guns.core.common.constant.dictmap.Dict;
+
+import com.stylefeng.guns.core.common.constant.dictmap.base.AbstractDictMap;
+
+/**
+ * 版本控制日志记录
+ *
+ * @author fengshuonan
+ * @date 2017-05-06 15:01
+ */
+public class VersionDict extends AbstractDictMap {
+
+ @Override
+ public void init() {
+ put("id","版本id");
+ put("createDate","添加时间");
+ put("type","类型（1用户端，2司机端）");
+ put("versions","版本号");
+ put("mark","版本描述");
+ put("state","是否强制更新 1否，2 是");
+ put("url","版本链接");
+ }
+
+ @Override
+ protected void initBeWrapped() {
+
+ }
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/core/common/constant/dictmap/DictMap.java b/management/guns-admin/src/main/java/com/stylefeng/guns/core/common/constant/dictmap/DictMap.java
new file mode 100644
index 0000000..a04927f
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/core/common/constant/dictmap/DictMap.java
@@ -0,0 +1,24 @@
+package com.stylefeng.guns.core.common.constant.dictmap;
+
+import com.stylefeng.guns.core.common.constant.dictmap.base.AbstractDictMap;
+
+/**
+ * 字典map
+ *
+ * @author fengshuonan
+ * @date 2017-05-06 15:43
+ */
+public class DictMap extends AbstractDictMap {
+
+ @Override
+ public void init() {
+ put("dictId","字典名称");
+ put("dictName","字典名称");
+ put("dictValues","字典内容");
+ }
+
+ @Override
+ protected void initBeWrapped() {
+
+ }
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/core/common/constant/dictmap/LogDict.java b/management/guns-admin/src/main/java/com/stylefeng/guns/core/common/constant/dictmap/LogDict.java
new file mode 100644
index 0000000..f7b7bf9
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/core/common/constant/dictmap/LogDict.java
@@ -0,0 +1,22 @@
+package com.stylefeng.guns.core.common.constant.dictmap;
+
+import com.stylefeng.guns.core.common.constant.dictmap.base.AbstractDictMap;
+
+/**
+ * 日志的字典
+ *
+ * @author fengshuonan
+ * @date 2017-05-06 15:01
+ */
+public class LogDict extends AbstractDictMap {
+
+ @Override
+ public void init() {
+ put("tips","备注");
+ }
+
+ @Override
+ protected void initBeWrapped() {
+
+ }
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/core/common/constant/dictmap/MenuDict.java b/management/guns-admin/src/main/java/com/stylefeng/guns/core/common/constant/dictmap/MenuDict.java
new file mode 100644
index 0000000..4b60184
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/core/common/constant/dictmap/MenuDict.java
@@ -0,0 +1,34 @@
+package com.stylefeng.guns.core.common.constant.dictmap;
+
+import com.stylefeng.guns.core.common.constant.dictmap.base.AbstractDictMap;
+
+/**
+ * 菜单的字典
+ *
+ * @author fengshuonan
+ * @date 2017-05-06 15:01
+ */
+public class MenuDict extends AbstractDictMap {
+
+ @Override
+ public void init() {
+ put("menuId","菜单id");
+ put("id","菜单id");
+ put("code","菜单编号");
+ put("pcode","菜单父编号");
+ put("name","菜单名称");
+ put("icon","菜单图标");
+ put("url","url地址");
+ put("num","菜单排序号");
+ put("levels","菜单层级");
+ put("tips","备注");
+ put("status","菜单状态");
+ put("isopen","是否打开");
+ put("","");
+ }
+
+ @Override
+ protected void initBeWrapped() {
+
+ }
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/core/common/constant/dictmap/NoticeMap.java b/management/guns-admin/src/main/java/com/stylefeng/guns/core/common/constant/dictmap/NoticeMap.java
new file mode 100644
index 0000000..a0a13c9
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/core/common/constant/dictmap/NoticeMap.java
@@ -0,0 +1,22 @@
+package com.stylefeng.guns.core.common.constant.dictmap;
+
+import com.stylefeng.guns.core.common.constant.dictmap.base.AbstractDictMap;
+
+/**
+ * 通知的映射
+ *
+ * @author fengshuonan
+ * @date 2017-05-06 15:01
+ */
+public class NoticeMap extends AbstractDictMap {
+
+ @Override
+ public void init() {
+ put("title", "标题");
+ put("content", "内容");
+ }
+
+ @Override
+ protected void initBeWrapped() {
+ }
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/core/common/constant/dictmap/RoleDict.java b/management/guns-admin/src/main/java/com/stylefeng/guns/core/common/constant/dictmap/RoleDict.java
new file mode 100644
index 0000000..08389af
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/core/common/constant/dictmap/RoleDict.java
@@ -0,0 +1,31 @@
+package com.stylefeng.guns.core.common.constant.dictmap;
+
+import com.stylefeng.guns.core.common.constant.dictmap.base.AbstractDictMap;
+
+/**
+ * 角色的字典
+ *
+ * @author fengshuonan
+ * @date 2017-05-06 15:01
+ */
+public class RoleDict extends AbstractDictMap {
+
+ @Override
+ public void init() {
+ put("roleId","角色名称");
+ put("num","角色排序");
+ put("pid","角色的父级");
+ put("name","角色名称");
+ put("deptid","部门名称");
+ put("tips","备注");
+ put("ids","资源名称");
+ }
+
+ @Override
+ protected void initBeWrapped() {
+ putFieldWrapperMethodName("pid","getSingleRoleName");
+ putFieldWrapperMethodName("deptid","getDeptName");
+ putFieldWrapperMethodName("roleId","getSingleRoleName");
+ putFieldWrapperMethodName("ids","getMenuNames");
+ }
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/core/common/constant/dictmap/UserDict.java b/management/guns-admin/src/main/java/com/stylefeng/guns/core/common/constant/dictmap/UserDict.java
new file mode 100644
index 0000000..cc34eb5
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/core/common/constant/dictmap/UserDict.java
@@ -0,0 +1,36 @@
+package com.stylefeng.guns.core.common.constant.dictmap;
+
+import com.stylefeng.guns.core.common.constant.dictmap.base.AbstractDictMap;
+
+/**
+ * 用户的字典
+ *
+ * @author fengshuonan
+ * @date 2017-05-06 15:01
+ */
+public class UserDict extends AbstractDictMap {
+
+ @Override
+ public void init() {
+ put("userId","账号");
+ put("avatar","头像");
+ put("account","账号");
+ put("name","名字");
+ put("birthday","生日");
+ put("sex","性别");
+ put("email","电子邮件");
+ put("phone","电话");
+ put("roleid","角色名称");
+ put("deptid","部门名称");
+ put("roleIds","角色名称集合");
+ }
+
+ @Override
+ protected void initBeWrapped() {
+ putFieldWrapperMethodName("sex","getSexName");
+ putFieldWrapperMethodName("deptid","getDeptName");
+ putFieldWrapperMethodName("roleid","getSingleRoleName");
+ putFieldWrapperMethodName("userId","getUserAccountById");
+ putFieldWrapperMethodName("roleIds","getRoleName");
+ }
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/core/common/constant/dictmap/base/AbstractDictMap.java b/management/guns-admin/src/main/java/com/stylefeng/guns/core/common/constant/dictmap/base/AbstractDictMap.java
new file mode 100644
index 0000000..9f091a3
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/core/common/constant/dictmap/base/AbstractDictMap.java
@@ -0,0 +1,53 @@
+package com.stylefeng.guns.core.common.constant.dictmap.base;
+
+import java.util.HashMap;
+
+/**
+ * 字典映射抽象类
+ *
+ * @author fengshuonan
+ * @date 2017-05-06 14:58
+ */
+public abstract class AbstractDictMap {
+
+ protected HashMap<String, String> dictory = new HashMap<>();
+ protected HashMap<String, String> fieldWarpperDictory = new HashMap<>();
+
+ public AbstractDictMap(){
+ put("id","主键id");
+ init();
+ initBeWrapped();
+ }
+
+ /**
+ * 初始化字段英文名称和中文名称对应的字典
+ *
+ * @author stylefeng
+ * @Date 2017/5/9 19:39
+ */
+ public abstract void init();
+
+ /**
+ * 初始化需要被包装的字段(例如:性别为1:男,2:女,需要被包装为汉字)
+ *
+ * @author stylefeng
+ * @Date 2017/5/9 19:35
+ */
+ protected abstract void initBeWrapped();
+
+ public String get(String key) {
+ return this.dictory.get(key);
+ }
+
+ public void put(String key, String value) {
+ this.dictory.put(key, value);
+ }
+
+ public String getFieldWarpperMethodName(String key){
+ return this.fieldWarpperDictory.get(key);
+ }
+
+ public void putFieldWrapperMethodName(String key,String methodName){
+ this.fieldWarpperDictory.put(key,methodName);
+ }
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/core/common/constant/dictmap/base/SystemDict.java b/management/guns-admin/src/main/java/com/stylefeng/guns/core/common/constant/dictmap/base/SystemDict.java
new file mode 100644
index 0000000..110633e
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/core/common/constant/dictmap/base/SystemDict.java
@@ -0,0 +1,20 @@
+package com.stylefeng.guns.core.common.constant.dictmap.base;
+
+/**
+ * 系统相关的字典
+ *
+ * @author fengshuonan
+ * @date 2017-05-06 15:48
+ */
+public class SystemDict extends AbstractDictMap {
+
+ @Override
+ public void init() {
+
+ }
+
+ @Override
+ protected void initBeWrapped() {
+
+ }
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/core/common/constant/dictmap/factory/DictFieldWarpperFactory.java b/management/guns-admin/src/main/java/com/stylefeng/guns/core/common/constant/dictmap/factory/DictFieldWarpperFactory.java
new file mode 100644
index 0000000..9d86da3
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/core/common/constant/dictmap/factory/DictFieldWarpperFactory.java
@@ -0,0 +1,33 @@
+package com.stylefeng.guns.core.common.constant.dictmap.factory;
+
+import com.stylefeng.guns.core.common.constant.factory.ConstantFactory;
+import com.stylefeng.guns.core.common.constant.factory.IConstantFactory;
+import com.stylefeng.guns.core.common.exception.BizExceptionEnum;
+import com.stylefeng.guns.core.exception.GunsException;
+
+import java.lang.reflect.Method;
+
+/**
+ * 字典字段的包装器(从ConstantFactory中获取包装值)
+ *
+ * @author fengshuonan
+ * @date 2017-05-06 15:12
+ */
+public class DictFieldWarpperFactory {
+
+ public static Object createFieldWarpper(Object parameter, String methodName) {
+ IConstantFactory constantFactory = ConstantFactory.me();
+ try {
+ Method method = IConstantFactory.class.getMethod(methodName, parameter.getClass());
+ return method.invoke(constantFactory, parameter);
+ } catch (Exception e) {
+ try {
+ Method method = IConstantFactory.class.getMethod(methodName, Integer.class);
+ return method.invoke(constantFactory, Integer.parseInt(parameter.toString()));
+ } catch (Exception e1) {
+ throw new GunsException(BizExceptionEnum.ERROR_WRAPPER_FIELD);
+ }
+ }
+ }
+
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/core/common/constant/factory/ConstantFactory.java b/management/guns-admin/src/main/java/com/stylefeng/guns/core/common/constant/factory/ConstantFactory.java
new file mode 100644
index 0000000..6437075
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/core/common/constant/factory/ConstantFactory.java
@@ -0,0 +1,356 @@
+package com.stylefeng.guns.core.common.constant.factory;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.springframework.cache.annotation.Cacheable;
+import org.springframework.context.annotation.DependsOn;
+import org.springframework.stereotype.Component;
+
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.baomidou.mybatisplus.mapper.Wrapper;
+import com.stylefeng.guns.core.common.constant.cache.Cache;
+import com.stylefeng.guns.core.common.constant.cache.CacheKey;
+import com.stylefeng.guns.core.common.constant.state.ManagerStatus;
+import com.stylefeng.guns.core.common.constant.state.MenuStatus;
+import com.stylefeng.guns.core.log.LogObjectHolder;
+import com.stylefeng.guns.core.support.StrKit;
+import com.stylefeng.guns.core.util.Convert;
+import com.stylefeng.guns.core.util.SpringContextHolder;
+import com.stylefeng.guns.core.util.ToolUtil;
+import com.stylefeng.guns.modular.system.dao.DeptMapper;
+import com.stylefeng.guns.modular.system.dao.DictMapper;
+import com.stylefeng.guns.modular.system.dao.MenuMapper;
+import com.stylefeng.guns.modular.system.dao.NoticeMapper;
+import com.stylefeng.guns.modular.system.dao.RoleMapper;
+import com.stylefeng.guns.modular.system.dao.UserMapper;
+import com.stylefeng.guns.modular.system.model.Dept;
+import com.stylefeng.guns.modular.system.model.Dict;
+import com.stylefeng.guns.modular.system.model.Menu;
+import com.stylefeng.guns.modular.system.model.Notice;
+import com.stylefeng.guns.modular.system.model.Role;
+import com.stylefeng.guns.modular.system.model.User;
+
+/**
+ * 常量的生产工厂
+ *
+ * @author fengshuonan
+ * @date 2017年2月13日 下午10:55:21
+ */
+@Component
+@DependsOn("springContextHolder")
+public class ConstantFactory implements IConstantFactory {
+
+ private RoleMapper roleMapper = SpringContextHolder.getBean(RoleMapper.class);
+ private DeptMapper deptMapper = SpringContextHolder.getBean(DeptMapper.class);
+ private DictMapper dictMapper = SpringContextHolder.getBean(DictMapper.class);
+ private UserMapper userMapper = SpringContextHolder.getBean(UserMapper.class);
+ private MenuMapper menuMapper = SpringContextHolder.getBean(MenuMapper.class);
+ private NoticeMapper noticeMapper = SpringContextHolder.getBean(NoticeMapper.class);
+
+ public static IConstantFactory me() {
+ return SpringContextHolder.getBean("constantFactory");
+ }
+
+ /**
+ * 根据用户id获取用户名称
+ *
+ * @author stylefeng
+ * @Date 2017/5/9 23:41
+ */
+ @Override
+ public String getUserNameById(Integer userId) {
+ User user = userMapper.selectById(userId);
+ if (user != null) {
+ return user.getName();
+ } else {
+ return "--";
+ }
+ }
+
+ /**
+ * 根据用户id获取用户账号
+ *
+ * @author stylefeng
+ * @date 2017年5月16日21:55:371
+ */
+ @Override
+ public String getUserAccountById(Integer userId) {
+ User user = userMapper.selectById(userId);
+ if (user != null) {
+ return user.getAccount();
+ } else {
+ return "--";
+ }
+ }
+
+ /**
+ * 通过角色ids获取角色名称
+ */
+ @Override
+ @Cacheable(value = Cache.CONSTANT, key = "'" + CacheKey.ROLES_NAME + "'+#roleIds")
+ public String getRoleName(String roleIds) {
+ Integer[] roles = Convert.toIntArray(roleIds);
+ StringBuilder sb = new StringBuilder();
+ for (int role : roles) {
+ Role roleObj = roleMapper.selectById(role);
+ if (ToolUtil.isNotEmpty(roleObj) && ToolUtil.isNotEmpty(roleObj.getName())) {
+ sb.append(roleObj.getName()).append(",");
+ }
+ }
+ return StrKit.removeSuffix(sb.toString(), ",");
+ }
+
+ /**
+ * 通过角色id获取角色名称
+ */
+ @Override
+ @Cacheable(value = Cache.CONSTANT, key = "'" + CacheKey.SINGLE_ROLE_NAME + "'+#roleId")
+ public String getSingleRoleName(Integer roleId) {
+ if (0 == roleId) {
+ return "--";
+ }
+ Role roleObj = roleMapper.selectById(roleId);
+ if (ToolUtil.isNotEmpty(roleObj) && ToolUtil.isNotEmpty(roleObj.getName())) {
+ return roleObj.getName();
+ }
+ return "";
+ }
+
+ /**
+ * 通过角色id获取角色英文名称
+ */
+ @Override
+ @Cacheable(value = Cache.CONSTANT, key = "'" + CacheKey.SINGLE_ROLE_TIP + "'+#roleId")
+ public String getSingleRoleTip(Integer roleId) {
+ if (0 == roleId) {
+ return "--";
+ }
+ Role roleObj = roleMapper.selectById(roleId);
+ if (ToolUtil.isNotEmpty(roleObj) && ToolUtil.isNotEmpty(roleObj.getName())) {
+ return roleObj.getTips();
+ }
+ return "";
+ }
+
+ /**
+ * 获取部门名称
+ */
+ @Override
+ @Cacheable(value = Cache.CONSTANT, key = "'" + CacheKey.DEPT_NAME + "'+#deptId")
+ public String getDeptName(Integer deptId) {
+ Dept dept = deptMapper.selectById(deptId);
+ if (ToolUtil.isNotEmpty(dept) && ToolUtil.isNotEmpty(dept.getFullname())) {
+ return dept.getFullname();
+ }
+ return "";
+ }
+
+ /**
+ * 获取菜单的名称们(多个)
+ */
+ @Override
+ public String getMenuNames(String menuIds) {
+ Integer[] menus = Convert.toIntArray(menuIds);
+ StringBuilder sb = new StringBuilder();
+ for (int menu : menus) {
+ Menu menuObj = menuMapper.selectById(menu);
+ if (ToolUtil.isNotEmpty(menuObj) && ToolUtil.isNotEmpty(menuObj.getName())) {
+ sb.append(menuObj.getName()).append(",");
+ }
+ }
+ return StrKit.removeSuffix(sb.toString(), ",");
+ }
+
+ /**
+ * 获取菜单名称
+ */
+ @Override
+ public String getMenuName(Long menuId) {
+ if (ToolUtil.isEmpty(menuId)) {
+ return "";
+ } else {
+ Menu menu = menuMapper.selectById(menuId);
+ if (menu == null) {
+ return "";
+ } else {
+ return menu.getName();
+ }
+ }
+ }
+
+ /**
+ * 获取菜单名称通过编号
+ */
+ @Override
+ public String getMenuNameByCode(String code) {
+ if (ToolUtil.isEmpty(code)) {
+ return "";
+ } else {
+ Menu param = new Menu();
+ param.setCode(code);
+ Menu menu = menuMapper.selectOne(param);
+ if (menu == null) {
+ return "";
+ } else {
+ return menu.getName();
+ }
+ }
+ }
+
+ /**
+ * 获取字典名称
+ */
+ @Override
+ public String getDictName(Integer dictId) {
+ if (ToolUtil.isEmpty(dictId)) {
+ return "";
+ } else {
+ Dict dict = dictMapper.selectById(dictId);
+ if (dict == null) {
+ return "";
+ } else {
+ return dict.getName();
+ }
+ }
+ }
+
+ /**
+ * 获取通知标题
+ */
+ @Override
+ public String getNoticeTitle(Integer dictId) {
+ if (ToolUtil.isEmpty(dictId)) {
+ return "";
+ } else {
+ Notice notice = noticeMapper.selectById(dictId);
+ if (notice == null) {
+ return "";
+ } else {
+ return notice.getTitle();
+ }
+ }
+ }
+
+ /**
+ * 根据字典名称和字典中的值获取对应的名称
+ */
+ @Override
+ public String getDictsByName(String name, Integer val) {
+ Dict temp = new Dict();
+ temp.setName(name);
+ Dict dict = dictMapper.selectOne(temp);
+ if (dict == null) {
+ return "";
+ } else {
+ Wrapper<Dict> wrapper = new EntityWrapper<>();
+ wrapper = wrapper.eq("pid", dict.getId());
+ List<Dict> dicts = dictMapper.selectList(wrapper);
+ for (Dict item : dicts) {
+ if (item.getNum() != null && item.getNum().equals(val)) {
+ return item.getName();
+ }
+ }
+ return "";
+ }
+ }
+
+ /**
+ * 获取性别名称
+ */
+ @Override
+ public String getSexName(Integer sex) {
+ return getDictsByName("性别", sex);
+ }
+
+ /**
+ * 获取用户登录状态
+ */
+ @Override
+ public String getStatusName(Integer status) {
+ return ManagerStatus.valueOf(status);
+ }
+
+ /**
+ * 获取菜单状态
+ */
+ @Override
+ public String getMenuStatusName(Integer status) {
+ return MenuStatus.valueOf(status);
+ }
+
+ /**
+ * 查询字典
+ */
+ @Override
+ public List<Dict> findInDict(Integer id) {
+ if (ToolUtil.isEmpty(id)) {
+ return null;
+ } else {
+ EntityWrapper<Dict> wrapper = new EntityWrapper<>();
+ List<Dict> dicts = dictMapper.selectList(wrapper.eq("pid", id));
+ if (dicts == null || dicts.size() == 0) {
+ return null;
+ } else {
+ return dicts;
+ }
+ }
+ }
+
+ /**
+ * 获取被缓存的对象(用户删除业务)
+ */
+ @Override
+ public String getCacheObject(String para) {
+ return LogObjectHolder.me().get().toString();
+ }
+
+ /**
+ * 获取子部门id
+ */
+ @Override
+ public List<Integer> getSubDeptId(Integer deptid) {
+ Wrapper<Dept> wrapper = new EntityWrapper<>();
+ wrapper = wrapper.like("pids", "%[" + deptid + "]%");
+ List<Dept> depts = this.deptMapper.selectList(wrapper);
+
+ ArrayList<Integer> deptids = new ArrayList<>();
+
+ if(depts != null && depts.size() > 0){
+ for (Dept dept : depts) {
+ deptids.add(dept.getId());
+ }
+ }
+
+ return deptids;
+ }
+
+ /**
+ * 获取所有父部门id
+ */
+ @Override
+ public List<Integer> getParentDeptIds(Integer deptid) {
+ Dept dept = deptMapper.selectById(deptid);
+ String pids = dept.getPids();
+ String[] split = pids.split(",");
+ ArrayList<Integer> parentDeptIds = new ArrayList<>();
+ for (String s : split) {
+ parentDeptIds.add(Integer.valueOf(StrKit.removeSuffix(StrKit.removePrefix(s, "["), "]")));
+ }
+ return parentDeptIds;
+ }
+
+ /**
+ * 根据用户Id获取用户昵称
+ */
+ @Override
+ public String getTUserNickNameById(Integer userId) {
+ /* TUser user = tUserMapper.selectById(userId);
+ if (user != null) {
+ return user.getNickName();
+ } else {
+ return "--";
+ }*/
+ return "--";
+ }
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/core/common/constant/factory/IConstantFactory.java b/management/guns-admin/src/main/java/com/stylefeng/guns/core/common/constant/factory/IConstantFactory.java
new file mode 100644
index 0000000..e227a8d
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/core/common/constant/factory/IConstantFactory.java
@@ -0,0 +1,120 @@
+package com.stylefeng.guns.core.common.constant.factory;
+
+import com.stylefeng.guns.modular.system.model.Dict;
+
+import java.util.List;
+
+/**
+ * 常量生产工厂的接口
+ *
+ * @author fengshuonan
+ * @date 2017-06-14 21:12
+ */
+public interface IConstantFactory {
+
+ /**
+ * 根据用户id获取用户名称
+ *
+ * @author stylefeng
+ * @Date 2017/5/9 23:41
+ */
+ String getUserNameById(Integer userId);
+
+ /**
+ * 根据用户id获取用户账号
+ *
+ * @author stylefeng
+ * @date 2017年5月16日21:55:371
+ */
+ String getUserAccountById(Integer userId);
+
+ /**
+ * 通过角色ids获取角色名称
+ */
+ String getRoleName(String roleIds);
+
+ /**
+ * 通过角色id获取角色名称
+ */
+ String getSingleRoleName(Integer roleId);
+
+ /**
+ * 通过角色id获取角色英文名称
+ */
+ String getSingleRoleTip(Integer roleId);
+
+ /**
+ * 获取部门名称
+ */
+ String getDeptName(Integer deptId);
+
+ /**
+ * 获取菜单的名称们(多个)
+ */
+ String getMenuNames(String menuIds);
+
+ /**
+ * 获取菜单名称
+ */
+ String getMenuName(Long menuId);
+
+ /**
+ * 获取菜单名称通过编号
+ */
+ String getMenuNameByCode(String code);
+
+ /**
+ * 获取字典名称
+ */
+ String getDictName(Integer dictId);
+
+ /**
+ * 获取通知标题
+ */
+ String getNoticeTitle(Integer dictId);
+
+ /**
+ * 根据字典名称和字典中的值获取对应的名称
+ */
+ String getDictsByName(String name, Integer val);
+
+ /**
+ * 获取性别名称
+ */
+ String getSexName(Integer sex);
+
+ /**
+ * 获取用户登录状态
+ */
+ String getStatusName(Integer status);
+
+ /**
+ * 获取菜单状态
+ */
+ String getMenuStatusName(Integer status);
+
+ /**
+ * 查询字典
+ */
+ List<Dict> findInDict(Integer id);
+
+ /**
+ * 获取被缓存的对象(用户删除业务)
+ */
+ String getCacheObject(String para);
+
+ /**
+ * 获取子部门id
+ */
+ List<Integer> getSubDeptId(Integer deptid);
+
+ /**
+ * 获取所有父部门id
+ */
+ List<Integer> getParentDeptIds(Integer deptid);
+
+ /**
+ * 根据用户Id获取用户昵称
+ */
+ String getTUserNickNameById(Integer userId);
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/core/common/constant/factory/MutiStrFactory.java b/management/guns-admin/src/main/java/com/stylefeng/guns/core/common/constant/factory/MutiStrFactory.java
new file mode 100644
index 0000000..ae01578
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/core/common/constant/factory/MutiStrFactory.java
@@ -0,0 +1,96 @@
+package com.stylefeng.guns.core.common.constant.factory;
+
+import com.stylefeng.guns.core.support.StrKit;
+import com.stylefeng.guns.core.util.ToolUtil;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 组合字符串生产者
+ *
+ * @author fengshuonan
+ * @date 2017-04-27 16:42
+ */
+public class MutiStrFactory {
+
+ /**
+ * 每个条目之间的分隔符
+ */
+ public static final String ITEM_SPLIT = ";";
+
+ /**
+ * 属性之间的分隔符
+ */
+ public static final String ATTR_SPLIT = ":";
+
+ /**
+ * 拼接字符串的id
+ */
+ public static final String MUTI_STR_ID = "ID";
+
+ /**
+ * 拼接字符串的CODE
+ */
+ public static final String MUTI_STR_CODE = "CODE";
+
+ /**
+ * 拼接字符串的NAME
+ */
+ public static final String MUTI_STR_NAME = "NAME";
+
+ /**
+ * 拼接字符串的NUM
+ */
+ public static final String MUTI_STR_NUM = "NUM";
+
+ /**
+ * 解析一个组合字符串(例如: "1:启用;2:禁用;3:冻结" 这样的字符串)
+ *
+ * @author fengshuonan
+ * @Date 2017/4/27 16:44
+ */
+ public static List<Map<String,String>> parseKeyValue(String mutiString){
+ if(ToolUtil.isEmpty(mutiString)){
+ return new ArrayList<>();
+ }else{
+ ArrayList<Map<String,String>> results = new ArrayList<>();
+ String[] items = StrKit.split(StrKit.removeSuffix(mutiString, ITEM_SPLIT), ITEM_SPLIT);
+ for (String item : items) {
+ String[] attrs = item.split(ATTR_SPLIT);
+ HashMap<String, String> itemMap = new HashMap<>();
+ itemMap.put(MUTI_STR_CODE,attrs[0]);
+ itemMap.put(MUTI_STR_NAME,attrs[1]);
+ itemMap.put(MUTI_STR_NUM,attrs[2]);
+ results.add(itemMap);
+ }
+ return results;
+ }
+ }
+
+ /**
+ * 解析id:key:value这样类型的字符串
+ *
+ * @author fengshuonan
+ * @Date 2017/4/28 11:06
+ */
+ public static List<Map<String,String>> parseIdKeyValue(String mutiString){
+ if(ToolUtil.isEmpty(mutiString)){
+ return new ArrayList<>();
+ }else{
+ ArrayList<Map<String,String>> results = new ArrayList<>();
+ String[] items = StrKit.split(StrKit.removeSuffix(mutiString, ITEM_SPLIT), ITEM_SPLIT);
+ for (String item : items) {
+ String[] attrs = item.split(ATTR_SPLIT);
+ HashMap<String, String> itemMap = new HashMap<>();
+ itemMap.put(MUTI_STR_CODE,attrs[0]);
+ itemMap.put(MUTI_STR_NAME,attrs[1]);
+ itemMap.put(MUTI_STR_NUM,attrs[2]);
+ results.add(itemMap);
+ }
+ return results;
+ }
+ }
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/core/common/constant/factory/PageFactory.java b/management/guns-admin/src/main/java/com/stylefeng/guns/core/common/constant/factory/PageFactory.java
new file mode 100644
index 0000000..9fd65e0
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/core/common/constant/factory/PageFactory.java
@@ -0,0 +1,38 @@
+package com.stylefeng.guns.core.common.constant.factory;
+
+import com.baomidou.mybatisplus.plugins.Page;
+import com.stylefeng.guns.core.common.constant.state.Order;
+import com.stylefeng.guns.core.support.HttpKit;
+import com.stylefeng.guns.core.util.ToolUtil;
+
+import javax.servlet.http.HttpServletRequest;
+
+/**
+ * BootStrap Table默认的分页参数创建
+ *
+ * @author fengshuonan
+ * @date 2017-04-05 22:25
+ */
+public class PageFactory<T> {
+
+ public Page<T> defaultPage() {
+ HttpServletRequest request = HttpKit.getRequest();
+ int limit = Integer.valueOf(request.getParameter("limit")); //每页多少条数据
+ int offset = Integer.valueOf(request.getParameter("offset")); //每页的偏移量(本页当前有多少条)
+ String sort = request.getParameter("sort"); //排序字段名称
+ String order = request.getParameter("order"); //asc或desc(升序或降序)
+ if (ToolUtil.isEmpty(sort)) {
+ Page<T> page = new Page<>((offset / limit + 1), limit);
+ page.setOpenSort(false);
+ return page;
+ } else {
+ Page<T> page = new Page<>((offset / limit + 1), limit, sort);
+ if (Order.ASC.getDes().equals(order)) {
+ page.setAsc(true);
+ } else {
+ page.setAsc(false);
+ }
+ return page;
+ }
+ }
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/core/common/constant/state/BizLogType.java b/management/guns-admin/src/main/java/com/stylefeng/guns/core/common/constant/state/BizLogType.java
new file mode 100644
index 0000000..18c15a7
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/core/common/constant/state/BizLogType.java
@@ -0,0 +1,51 @@
+package com.stylefeng.guns.core.common.constant.state;
+
+/**
+ * 业务日志类型
+ *
+ * @author fengshuonan
+ * @Date 2017年1月22日 下午12:14:59
+ */
+public enum BizLogType {
+
+ ALL(0, null),//全部日志
+ BUSSINESS(1, "业务日志"),
+ EXCEPTION(2, "异常日志");
+
+ Integer val;
+ String message;
+
+ BizLogType(Integer val, String message) {
+ this.val = val;
+ this.message = message;
+ }
+
+ public String getMessage() {
+ return message;
+ }
+
+ public void setMessage(String message) {
+ this.message = message;
+ }
+
+ public Integer getVal() {
+ return val;
+ }
+
+ public void setVal(Integer val) {
+ this.val = val;
+ }
+
+ public static String valueOf(Integer value) {
+ if (value == null) {
+ return null;
+ } else {
+ for (BizLogType bizLogType : BizLogType.values()) {
+ if (bizLogType.getVal().equals(value)) {
+ return bizLogType.getMessage();
+ }
+ }
+ return null;
+ }
+ }
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/core/common/constant/state/ExpenseState.java b/management/guns-admin/src/main/java/com/stylefeng/guns/core/common/constant/state/ExpenseState.java
new file mode 100644
index 0000000..d4cffc3
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/core/common/constant/state/ExpenseState.java
@@ -0,0 +1,52 @@
+package com.stylefeng.guns.core.common.constant.state;
+
+/**
+ * 是否是菜单的枚举
+ *
+ * @author fengshuonan
+ * @date 2017年6月1日22:50:11
+ */
+public enum ExpenseState {
+
+ SUBMITING(1, "待提交"),
+ CHECKING(2, "待审核"),
+ PASS(3, "审核通过"),
+ UN_PASS(4, "未通过");
+
+ int code;
+ String message;
+
+ ExpenseState(int code, String message) {
+ this.code = code;
+ this.message = message;
+ }
+
+ public int getCode() {
+ return code;
+ }
+
+ public void setCode(int code) {
+ this.code = code;
+ }
+
+ public String getMessage() {
+ return message;
+ }
+
+ public void setMessage(String message) {
+ this.message = message;
+ }
+
+ public static String valueOf(Integer status) {
+ if (status == null) {
+ return "";
+ } else {
+ for (ExpenseState s : ExpenseState.values()) {
+ if (s.getCode() == status) {
+ return s.getMessage();
+ }
+ }
+ return "";
+ }
+ }
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/core/common/constant/state/LogSucceed.java b/management/guns-admin/src/main/java/com/stylefeng/guns/core/common/constant/state/LogSucceed.java
new file mode 100644
index 0000000..2c2a823
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/core/common/constant/state/LogSucceed.java
@@ -0,0 +1,27 @@
+package com.stylefeng.guns.core.common.constant.state;
+
+/**
+ * 业务是否成功的日志记录
+ *
+ * @author fengshuonan
+ * @Date 2017年1月22日 下午12:14:59
+ */
+public enum LogSucceed {
+
+ SUCCESS("成功"),
+ FAIL("失败");
+
+ String message;
+
+ LogSucceed(String message) {
+ this.message = message;
+ }
+
+ public String getMessage() {
+ return message;
+ }
+
+ public void setMessage(String message) {
+ this.message = message;
+ }
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/core/common/constant/state/LogType.java b/management/guns-admin/src/main/java/com/stylefeng/guns/core/common/constant/state/LogType.java
new file mode 100644
index 0000000..1c44232
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/core/common/constant/state/LogType.java
@@ -0,0 +1,30 @@
+package com.stylefeng.guns.core.common.constant.state;
+
+/**
+ * 日志类型
+ *
+ * @author fengshuonan
+ * @Date 2017年1月22日 下午12:14:59
+ */
+public enum LogType {
+
+ LOGIN("登录日志"),
+ LOGIN_FAIL("登录失败日志"),
+ EXIT("退出日志"),
+ EXCEPTION("异常日志"),
+ BUSSINESS("业务日志");
+
+ String message;
+
+ LogType(String message) {
+ this.message = message;
+ }
+
+ public String getMessage() {
+ return message;
+ }
+
+ public void setMessage(String message) {
+ this.message = message;
+ }
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/core/common/constant/state/ManagerStatus.java b/management/guns-admin/src/main/java/com/stylefeng/guns/core/common/constant/state/ManagerStatus.java
new file mode 100644
index 0000000..0de9d4f
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/core/common/constant/state/ManagerStatus.java
@@ -0,0 +1,49 @@
+package com.stylefeng.guns.core.common.constant.state;
+
+/**
+ * 管理员的状态
+ *
+ * @author fengshuonan
+ * @Date 2017年1月10日 下午9:54:13
+ */
+public enum ManagerStatus {
+
+ OK(1, "启用"), FREEZED(2, "冻结"), DELETED(3, "被删除");
+
+ int code;
+ String message;
+
+ ManagerStatus(int code, String message) {
+ this.code = code;
+ this.message = message;
+ }
+
+ public int getCode() {
+ return code;
+ }
+
+ public void setCode(int code) {
+ this.code = code;
+ }
+
+ public String getMessage() {
+ return message;
+ }
+
+ public void setMessage(String message) {
+ this.message = message;
+ }
+
+ public static String valueOf(Integer value) {
+ if (value == null) {
+ return "";
+ } else {
+ for (ManagerStatus ms : ManagerStatus.values()) {
+ if (ms.getCode() == value) {
+ return ms.getMessage();
+ }
+ }
+ return "";
+ }
+ }
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/core/common/constant/state/MenuOpenStatus.java b/management/guns-admin/src/main/java/com/stylefeng/guns/core/common/constant/state/MenuOpenStatus.java
new file mode 100644
index 0000000..f0c5841
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/core/common/constant/state/MenuOpenStatus.java
@@ -0,0 +1,50 @@
+package com.stylefeng.guns.core.common.constant.state;
+
+/**
+ * 菜单是否打开的状态
+ *
+ * @author fengshuonan
+ * @Date 2017年4月8日10:12:15
+ */
+public enum MenuOpenStatus {
+
+ OPEN(1, "打开"),
+ CLOSE(0, "关闭");
+
+ int code;
+ String message;
+
+ MenuOpenStatus(int code, String message) {
+ this.code = code;
+ this.message = message;
+ }
+
+ public int getCode() {
+ return code;
+ }
+
+ public void setCode(int code) {
+ this.code = code;
+ }
+
+ public String getMessage() {
+ return message;
+ }
+
+ public void setMessage(String message) {
+ this.message = message;
+ }
+
+ public static String valueOf(Integer status) {
+ if (status == null) {
+ return "";
+ } else {
+ for (MenuOpenStatus s : MenuOpenStatus.values()) {
+ if (s.getCode() == status) {
+ return s.getMessage();
+ }
+ }
+ return "";
+ }
+ }
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/core/common/constant/state/MenuStatus.java b/management/guns-admin/src/main/java/com/stylefeng/guns/core/common/constant/state/MenuStatus.java
new file mode 100644
index 0000000..940fe84
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/core/common/constant/state/MenuStatus.java
@@ -0,0 +1,50 @@
+package com.stylefeng.guns.core.common.constant.state;
+
+/**
+ * 菜单的状态
+ *
+ * @author fengshuonan
+ * @Date 2017年1月22日 下午12:14:59
+ */
+public enum MenuStatus {
+
+ ENABLE(1, "启用"),
+ DISABLE(0, "禁用");
+
+ int code;
+ String message;
+
+ MenuStatus(int code, String message) {
+ this.code = code;
+ this.message = message;
+ }
+
+ public int getCode() {
+ return code;
+ }
+
+ public void setCode(int code) {
+ this.code = code;
+ }
+
+ public String getMessage() {
+ return message;
+ }
+
+ public void setMessage(String message) {
+ this.message = message;
+ }
+
+ public static String valueOf(Integer status) {
+ if (status == null) {
+ return "";
+ } else {
+ for (MenuStatus s : MenuStatus.values()) {
+ if (s.getCode() == status) {
+ return s.getMessage();
+ }
+ }
+ return "";
+ }
+ }
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/core/common/constant/state/Order.java b/management/guns-admin/src/main/java/com/stylefeng/guns/core/common/constant/state/Order.java
new file mode 100644
index 0000000..5856284
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/core/common/constant/state/Order.java
@@ -0,0 +1,26 @@
+package com.stylefeng.guns.core.common.constant.state;
+
+/**
+ * 数据库排序
+ *
+ * @author fengshuonan
+ * @Date 2017年5月31日20:48:41
+ */
+public enum Order {
+
+ ASC("asc"), DESC("desc");
+
+ private String des;
+
+ Order(String des) {
+ this.des = des;
+ }
+
+ public String getDes() {
+ return des;
+ }
+
+ public void setDes(String des) {
+ this.des = des;
+ }
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/core/common/exception/BizExceptionEnum.java b/management/guns-admin/src/main/java/com/stylefeng/guns/core/common/exception/BizExceptionEnum.java
new file mode 100644
index 0000000..2f1812b
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/core/common/exception/BizExceptionEnum.java
@@ -0,0 +1,100 @@
+package com.stylefeng.guns.core.common.exception;
+
+import com.stylefeng.guns.core.exception.ServiceExceptionEnum;
+
+/**
+ * @author fengshuonan
+ * @Description 所有业务异常的枚举
+ * @date 2016年11月12日 下午5:04:51
+ */
+public enum BizExceptionEnum implements ServiceExceptionEnum {
+
+ /**
+ * 字典
+ */
+ DICT_EXISTED(400, "字典已经存在"),
+ ERROR_CREATE_DICT(500, "创建字典失败"),
+ ERROR_WRAPPER_FIELD(500, "包装字典属性失败"),
+ ERROR_CODE_EMPTY(500, "字典类型不能为空"),
+
+ /**
+ * 文件上传
+ */
+ FILE_READING_ERROR(400, "FILE_READING_ERROR!"),
+ FILE_NOT_FOUND(400, "FILE_NOT_FOUND!"),
+ UPLOAD_ERROR(500, "上传图片出错"),
+
+ /**
+ * 权限和数据问题
+ */
+ DB_RESOURCE_NULL(400, "数据库中没有该资源"),
+ NO_PERMITION(405, "权限异常"),
+ REQUEST_INVALIDATE(400, "请求数据格式不正确"),
+ INVALID_KAPTCHA(400, "验证码不正确"),
+ CANT_DELETE_ADMIN(600, "不能删除超级管理员"),
+ CANT_FREEZE_ADMIN(600, "不能冻结超级管理员"),
+ CANT_CHANGE_ADMIN(600, "不能修改超级管理员角色"),
+
+ /**
+ * 账户问题
+ */
+ USER_ALREADY_REG(401, "该用户已经注册"),
+ NO_THIS_USER(400, "没有此用户"),
+ USER_NOT_EXISTED(400, "没有此用户"),
+ ACCOUNT_FREEZED(401, "账号被冻结"),
+ OLD_PWD_NOT_RIGHT(402, "原密码不正确"),
+ TWO_PWD_NOT_MATCH(405, "两次输入密码不一致"),
+
+ /**
+ * 错误的请求
+ */
+ MENU_PCODE_COINCIDENCE(400, "菜单编号和副编号不能一致"),
+ EXISTED_THE_MENU(400, "菜单编号重复，不能添加"),
+ DICT_MUST_BE_NUMBER(400, "字典的值必须为数字"),
+ REQUEST_NULL(400, "请求有错误"),
+ SESSION_TIMEOUT(400, "会话超时"),
+ SERVER_ERROR(500, "服务器异常"),
+
+ /**
+ * token异常
+ */
+ TOKEN_EXPIRED(700, "token过期"),
+ TOKEN_ERROR(700, "token验证失败"),
+
+ /**
+ * 签名异常
+ */
+ SIGN_ERROR(700, "签名验证失败"),
+
+ /**
+ * 其他
+ */
+ AUTH_REQUEST_ERROR(400, "账号密码错误");
+
+ BizExceptionEnum(int code, String message) {
+ this.code = code;
+ this.message = message;
+ }
+
+ private Integer code;
+
+ private String message;
+
+ @Override
+ public Integer getCode() {
+ return code;
+ }
+
+ public void setCode(Integer code) {
+ this.code = code;
+ }
+
+ @Override
+ public String getMessage() {
+ return message;
+ }
+
+ public void setMessage(String message) {
+ this.message = message;
+ }
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/core/common/exception/InvalidKaptchaException.java b/management/guns-admin/src/main/java/com/stylefeng/guns/core/common/exception/InvalidKaptchaException.java
new file mode 100644
index 0000000..78581cd
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/core/common/exception/InvalidKaptchaException.java
@@ -0,0 +1,10 @@
+package com.stylefeng.guns.core.common.exception;
+
+/**
+ * 验证码错误异常
+ *
+ * @author fengshuonan
+ * @date 2017-05-05 23:52
+ */
+public class InvalidKaptchaException extends RuntimeException {
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/core/intercept/GunsUserFilter.java b/management/guns-admin/src/main/java/com/stylefeng/guns/core/intercept/GunsUserFilter.java
new file mode 100644
index 0000000..3e98298
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/core/intercept/GunsUserFilter.java
@@ -0,0 +1,105 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package com.stylefeng.guns.core.intercept;
+
+import com.stylefeng.guns.core.shiro.ShiroKit;
+import org.apache.shiro.subject.Subject;
+import org.apache.shiro.web.filter.AccessControlFilter;
+import org.apache.shiro.web.util.WebUtils;
+
+import javax.servlet.ServletRequest;
+import javax.servlet.ServletResponse;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+/**
+ * Filter that allows access to resources if the accessor is a known user, which is defined as
+ * having a known principal. This means that any user who is authenticated or remembered via a
+ * 'remember me' feature will be allowed access from this filter.
+ * <p/>
+ * If the accessor is not a known user, then they will be redirected to the {@link #setLoginUrl(String) loginUrl}</p>
+ *
+ * @since 0.9
+ */
+public class GunsUserFilter extends AccessControlFilter {
+
+ /**
+ * Returns <code>true</code> if the request is a
+ * {@link #isLoginRequest(javax.servlet.ServletRequest, javax.servlet.ServletResponse) loginRequest} or
+ * if the current {@link #getSubject(javax.servlet.ServletRequest, javax.servlet.ServletResponse) subject}
+ * is not <code>null</code>, <code>false</code> otherwise.
+ *
+ * @return <code>true</code> if the request is a
+ * {@link #isLoginRequest(javax.servlet.ServletRequest, javax.servlet.ServletResponse) loginRequest} or
+ * if the current {@link #getSubject(javax.servlet.ServletRequest, javax.servlet.ServletResponse) subject}
+ * is not <code>null</code>, <code>false</code> otherwise.
+ */
+ protected boolean isAccessAllowed(ServletRequest request, ServletResponse response, Object mappedValue) {
+ if (isLoginRequest(request, response)) {
+ return true;
+ } else {
+ Subject subject = getSubject(request, response);
+ // If principal is not null, then the user is known and should be allowed access.
+ return subject.getPrincipal() != null;
+ }
+ }
+
+ /**
+ * This default implementation simply calls
+ * {@link #saveRequestAndRedirectToLogin(javax.servlet.ServletRequest, javax.servlet.ServletResponse) saveRequestAndRedirectToLogin}
+ * and then immediately returns <code>false</code>, thereby preventing the chain from continuing so the redirect may
+ * execute.
+ */
+ protected boolean onAccessDenied(ServletRequest request, ServletResponse response) throws Exception {
+ HttpServletRequest httpServletRequest = WebUtils.toHttp(request);
+ HttpServletResponse httpServletResponse = WebUtils.toHttp(response);
+
+ /**
+ * 如果是ajax请求则不进行跳转
+ */
+ if (httpServletRequest.getHeader("x-requested-with") != null
+ && httpServletRequest.getHeader("x-requested-with").equalsIgnoreCase("XMLHttpRequest")) {
+ httpServletResponse.setHeader("sessionstatus", "timeout");
+ return false;
+ } else {
+
+ /**
+ * 第一次点击页面
+ */
+ String referer = httpServletRequest.getHeader("Referer");
+ if (referer == null) {
+ saveRequestAndRedirectToLogin(request, response);
+ return false;
+ } else {
+
+ /**
+ * 从别的页面跳转过来的
+ */
+ if (ShiroKit.getSession().getAttribute("sessionFlag") == null) {
+ httpServletRequest.setAttribute("tips", "请重新登录");
+ httpServletRequest.getRequestDispatcher("/login").forward(request, response);
+ return false;
+ } else {
+ saveRequestAndRedirectToLogin(request, response);
+ return false;
+ }
+ }
+ }
+ }
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/core/intercept/RestApiInteceptor.java b/management/guns-admin/src/main/java/com/stylefeng/guns/core/intercept/RestApiInteceptor.java
new file mode 100644
index 0000000..1415e13
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/core/intercept/RestApiInteceptor.java
@@ -0,0 +1,62 @@
+package com.stylefeng.guns.core.intercept;
+
+import com.stylefeng.guns.core.base.tips.ErrorTip;
+import com.stylefeng.guns.core.common.constant.JwtConstants;
+import com.stylefeng.guns.core.common.exception.BizExceptionEnum;
+import com.stylefeng.guns.core.util.JwtTokenUtil;
+import com.stylefeng.guns.core.util.RenderUtil;
+import io.jsonwebtoken.JwtException;
+import org.springframework.web.method.HandlerMethod;
+import org.springframework.web.servlet.handler.HandlerInterceptorAdapter;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+
+/**
+ * Rest Api接口鉴权
+ *
+ * @author stylefeng
+ * @Date 2018/7/20 23:11
+ */
+public class RestApiInteceptor extends HandlerInterceptorAdapter {
+
+ @Override
+ public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception {
+ if (handler instanceof org.springframework.web.servlet.resource.ResourceHttpRequestHandler) {
+ return true;
+ }
+ HandlerMethod handlerMethod = (HandlerMethod) handler;
+ return check(request, response, handlerMethod);
+ }
+
+ private boolean check(HttpServletRequest request, HttpServletResponse response, HandlerMethod handlerMethod) {
+ if (request.getServletPath().equals(JwtConstants.AUTH_PATH)) {
+ return true;
+ }
+ final String requestHeader = request.getHeader(JwtConstants.AUTH_HEADER);
+ String authToken;
+ if (requestHeader != null && requestHeader.startsWith("Bearer ")) {
+ authToken = requestHeader.substring(7);
+
+ //验证token是否过期,包含了验证jwt是否正确
+ try {
+ boolean flag = JwtTokenUtil.isTokenExpired(authToken);
+ if (flag) {
+ RenderUtil.renderJson(response, new ErrorTip(BizExceptionEnum.TOKEN_EXPIRED.getCode(), BizExceptionEnum.TOKEN_EXPIRED.getMessage()));
+ return false;
+ }
+ } catch (JwtException e) {
+ //有异常就是token解析失败
+ RenderUtil.renderJson(response, new ErrorTip(BizExceptionEnum.TOKEN_ERROR.getCode(), BizExceptionEnum.TOKEN_ERROR.getMessage()));
+ return false;
+ }
+ } else {
+ //header没有带Bearer字段
+ RenderUtil.renderJson(response, new ErrorTip(BizExceptionEnum.TOKEN_ERROR.getCode(), BizExceptionEnum.TOKEN_ERROR.getMessage()));
+ return false;
+ }
+ return true;
+ }
+
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/core/intercept/SessionHolderInterceptor.java b/management/guns-admin/src/main/java/com/stylefeng/guns/core/intercept/SessionHolderInterceptor.java
new file mode 100644
index 0000000..acafeaf
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/core/intercept/SessionHolderInterceptor.java
@@ -0,0 +1,34 @@
+package com.stylefeng.guns.core.intercept;
+
+import com.stylefeng.guns.core.base.controller.BaseController;
+import com.stylefeng.guns.core.util.HttpSessionHolder;
+import org.aspectj.lang.ProceedingJoinPoint;
+import org.aspectj.lang.annotation.Around;
+import org.aspectj.lang.annotation.Aspect;
+import org.aspectj.lang.annotation.Pointcut;
+import org.springframework.stereotype.Component;
+
+/**
+ * 静态调用session的拦截器
+ *
+ * @author fengshuonan
+ * @date 2016年11月13日 下午10:15:42
+ */
+@Aspect
+@Component
+public class SessionHolderInterceptor extends BaseController {
+
+ @Pointcut("execution(* com.stylefeng.guns.*..controller.*.*(..))")
+ public void cutService() {
+ }
+
+ @Around("cutService()")
+ public Object sessionKit(ProceedingJoinPoint point) throws Throwable {
+ HttpSessionHolder.put(super.getHttpServletRequest().getSession());
+ try {
+ return point.proceed();
+ } finally {
+ HttpSessionHolder.remove();
+ }
+ }
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/core/listener/ConfigListener.java b/management/guns-admin/src/main/java/com/stylefeng/guns/core/listener/ConfigListener.java
new file mode 100644
index 0000000..18089f5
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/core/listener/ConfigListener.java
@@ -0,0 +1,54 @@
+/**
+ * Copyright (c) 2015-2017, Chill Zhuang 庄骞 (smallchill@163.com).
+ * <p>
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * <p>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.stylefeng.guns.core.listener;
+
+import javax.servlet.ServletContext;
+import javax.servlet.ServletContextEvent;
+import javax.servlet.ServletContextListener;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * ServletContext监听器
+ *
+ * @author stylefeng
+ * @Date 2018/2/22 21:07
+ */
+public class ConfigListener implements ServletContextListener {
+
+ private static Map<String, String> conf = new HashMap<>();
+
+ public static Map<String, String> getConf() {
+ return conf;
+ }
+
+ @Override
+ public void contextDestroyed(ServletContextEvent arg0) {
+ conf.clear();
+ }
+
+ @Override
+ public void contextInitialized(ServletContextEvent evt) {
+ ServletContext sc = evt.getServletContext();
+
+ //项目发布,当前运行环境的绝对路径
+ conf.put("realPath", sc.getRealPath("/").replaceFirst("/", ""));
+
+ //servletContextPath,默认""
+ conf.put("contextPath", sc.getContextPath());
+ }
+
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/core/log/LogManager.java b/management/guns-admin/src/main/java/com/stylefeng/guns/core/log/LogManager.java
new file mode 100644
index 0000000..8d5e20e
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/core/log/LogManager.java
@@ -0,0 +1,33 @@
+package com.stylefeng.guns.core.log;
+
+import java.util.TimerTask;
+import java.util.concurrent.ScheduledThreadPoolExecutor;
+import java.util.concurrent.TimeUnit;
+
+/**
+ * 日志管理器
+ *
+ * @author fengshuonan
+ * @date 2017-03-30 16:29
+ */
+public class LogManager {
+
+ //日志记录操作延时
+ private final int OPERATE_DELAY_TIME = 10;
+
+ //异步操作记录日志的线程池
+ private ScheduledThreadPoolExecutor executor = new ScheduledThreadPoolExecutor(10);
+
+ private LogManager() {
+ }
+
+ public static LogManager logManager = new LogManager();
+
+ public static LogManager me() {
+ return logManager;
+ }
+
+ public void executeLog(TimerTask task) {
+ executor.schedule(task, OPERATE_DELAY_TIME, TimeUnit.MILLISECONDS);
+ }
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/core/log/LogObjectHolder.java b/management/guns-admin/src/main/java/com/stylefeng/guns/core/log/LogObjectHolder.java
new file mode 100644
index 0000000..f43d81b
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/core/log/LogObjectHolder.java
@@ -0,0 +1,34 @@
+package com.stylefeng.guns.core.log;
+
+import com.stylefeng.guns.core.util.SpringContextHolder;
+import org.springframework.context.annotation.Scope;
+import org.springframework.stereotype.Component;
+import org.springframework.web.context.WebApplicationContext;
+
+import java.io.Serializable;
+
+/**
+ * 被修改的bean临时存放的地方
+ *
+ * @author fengshuonan
+ * @date 2017-03-31 11:19
+ */
+@Component
+@Scope(scopeName = WebApplicationContext.SCOPE_SESSION)
+public class LogObjectHolder implements Serializable{
+
+ private Object object = null;
+
+ public void set(Object obj) {
+ this.object = obj;
+ }
+
+ public Object get() {
+ return object;
+ }
+
+ public static LogObjectHolder me(){
+ LogObjectHolder bean = SpringContextHolder.getBean(LogObjectHolder.class);
+ return bean;
+ }
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/core/log/factory/LogFactory.java b/management/guns-admin/src/main/java/com/stylefeng/guns/core/log/factory/LogFactory.java
new file mode 100644
index 0000000..3094dd9
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/core/log/factory/LogFactory.java
@@ -0,0 +1,47 @@
+package com.stylefeng.guns.core.log.factory;
+
+import com.stylefeng.guns.core.common.constant.state.LogSucceed;
+import com.stylefeng.guns.core.common.constant.state.LogType;
+import com.stylefeng.guns.modular.system.model.LoginLog;
+import com.stylefeng.guns.modular.system.model.OperationLog;
+
+import java.util.Date;
+
+/**
+ * 日志对象创建工厂
+ *
+ * @author fengshuonan
+ * @date 2016年12月6日 下午9:18:27
+ */
+public class LogFactory {
+
+ /**
+ * 创建操作日志
+ */
+ public static OperationLog createOperationLog(LogType logType, Integer userId, String bussinessName, String clazzName, String methodName, String msg, LogSucceed succeed) {
+ OperationLog operationLog = new OperationLog();
+ operationLog.setLogtype(logType.getMessage());
+ operationLog.setLogname(bussinessName);
+ operationLog.setUserid(userId);
+ operationLog.setClassname(clazzName);
+ operationLog.setMethod(methodName);
+ operationLog.setCreatetime(new Date());
+ operationLog.setSucceed(succeed.getMessage());
+ operationLog.setMessage(msg);
+ return operationLog;
+ }
+
+ /**
+ * 创建登录日志
+ */
+ public static LoginLog createLoginLog(LogType logType, Integer userId, String msg, String ip) {
+ LoginLog loginLog = new LoginLog();
+ loginLog.setLogname(logType.getMessage());
+ loginLog.setUserid(userId);
+ loginLog.setCreatetime(new Date());
+ loginLog.setSucceed(LogSucceed.SUCCESS.getMessage());
+ loginLog.setIp(ip);
+ loginLog.setMessage(msg);
+ return loginLog;
+ }
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/core/log/factory/LogTaskFactory.java b/management/guns-admin/src/main/java/com/stylefeng/guns/core/log/factory/LogTaskFactory.java
new file mode 100644
index 0000000..2c29451
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/core/log/factory/LogTaskFactory.java
@@ -0,0 +1,102 @@
+package com.stylefeng.guns.core.log.factory;
+
+import com.stylefeng.guns.core.common.constant.state.LogSucceed;
+import com.stylefeng.guns.core.common.constant.state.LogType;
+import com.stylefeng.guns.modular.system.dao.LoginLogMapper;
+import com.stylefeng.guns.modular.system.dao.OperationLogMapper;
+import com.stylefeng.guns.modular.system.model.LoginLog;
+import com.stylefeng.guns.modular.system.model.OperationLog;
+import com.stylefeng.guns.core.db.Db;
+import com.stylefeng.guns.core.log.LogManager;
+import com.stylefeng.guns.core.util.ToolUtil;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.TimerTask;
+
+/**
+ * 日志操作任务创建工厂
+ *
+ * @author fengshuonan
+ * @date 2016年12月6日 下午9:18:27
+ */
+public class LogTaskFactory {
+
+ private static Logger logger = LoggerFactory.getLogger(LogManager.class);
+ private static LoginLogMapper loginLogMapper = Db.getMapper(LoginLogMapper.class);
+ private static OperationLogMapper operationLogMapper = Db.getMapper(OperationLogMapper.class);
+
+ public static TimerTask loginLog(final Integer userId, final String ip) {
+ return new TimerTask() {
+ @Override
+ public void run() {
+ try {
+ LoginLog loginLog = LogFactory.createLoginLog(LogType.LOGIN, userId, null, ip);
+ loginLogMapper.insert(loginLog);
+ } catch (Exception e) {
+ logger.error("创建登录日志异常!", e);
+ }
+ }
+ };
+ }
+
+ public static TimerTask loginLog(final String username, final String msg, final String ip) {
+ return new TimerTask() {
+ @Override
+ public void run() {
+ LoginLog loginLog = LogFactory.createLoginLog(
+ LogType.LOGIN_FAIL, null, "账号:" + username + "," + msg, ip);
+ try {
+ loginLogMapper.insert(loginLog);
+ } catch (Exception e) {
+ logger.error("创建登录失败异常!", e);
+ }
+ }
+ };
+ }
+
+ public static TimerTask exitLog(final Integer userId, final String ip) {
+ return new TimerTask() {
+ @Override
+ public void run() {
+ LoginLog loginLog = LogFactory.createLoginLog(LogType.EXIT, userId, null,ip);
+ try {
+ loginLogMapper.insert(loginLog);
+ } catch (Exception e) {
+ logger.error("创建退出日志异常!", e);
+ }
+ }
+ };
+ }
+
+ public static TimerTask bussinessLog(final Integer userId, final String bussinessName, final String clazzName, final String methodName, final String msg) {
+ return new TimerTask() {
+ @Override
+ public void run() {
+ OperationLog operationLog = LogFactory.createOperationLog(
+ LogType.BUSSINESS, userId, bussinessName, clazzName, methodName, msg, LogSucceed.SUCCESS);
+ try {
+ operationLogMapper.insert(operationLog);
+ } catch (Exception e) {
+ logger.error("创建业务日志异常!", e);
+ }
+ }
+ };
+ }
+
+ public static TimerTask exceptionLog(final Integer userId, final Exception exception) {
+ return new TimerTask() {
+ @Override
+ public void run() {
+ String msg = ToolUtil.getExceptionMsg(exception);
+ OperationLog operationLog = LogFactory.createOperationLog(
+ LogType.EXCEPTION, userId, "", null, null, msg, LogSucceed.FAIL);
+ try {
+ operationLogMapper.insert(operationLog);
+ } catch (Exception e) {
+ logger.error("创建异常日志异常!", e);
+ }
+ }
+ };
+ }
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/core/shiro/ShiroDbRealm.java b/management/guns-admin/src/main/java/com/stylefeng/guns/core/shiro/ShiroDbRealm.java
new file mode 100644
index 0000000..2a95558
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/core/shiro/ShiroDbRealm.java
@@ -0,0 +1,78 @@
+package com.stylefeng.guns.core.shiro;
+
+import com.stylefeng.guns.core.shiro.factory.IShiro;
+import com.stylefeng.guns.core.shiro.factory.ShiroFactroy;
+import com.stylefeng.guns.core.util.ToolUtil;
+import com.stylefeng.guns.modular.system.model.User;
+import org.apache.shiro.authc.AuthenticationException;
+import org.apache.shiro.authc.AuthenticationInfo;
+import org.apache.shiro.authc.AuthenticationToken;
+import org.apache.shiro.authc.UsernamePasswordToken;
+import org.apache.shiro.authc.credential.CredentialsMatcher;
+import org.apache.shiro.authc.credential.HashedCredentialsMatcher;
+import org.apache.shiro.authz.AuthorizationInfo;
+import org.apache.shiro.authz.SimpleAuthorizationInfo;
+import org.apache.shiro.realm.AuthorizingRealm;
+import org.apache.shiro.subject.PrincipalCollection;
+
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+public class ShiroDbRealm extends AuthorizingRealm {
+
+ /**
+ * 登录认证
+ */
+ @Override
+ protected AuthenticationInfo doGetAuthenticationInfo(AuthenticationToken authcToken)
+ throws AuthenticationException {
+ IShiro shiroFactory = ShiroFactroy.me();
+ UsernamePasswordToken token = (UsernamePasswordToken) authcToken;
+ User user = shiroFactory.user(token.getUsername());
+ ShiroUser shiroUser = shiroFactory.shiroUser(user);
+ return shiroFactory.info(shiroUser, user, super.getName());
+ }
+
+ /**
+ * 权限认证
+ */
+ @Override
+ protected AuthorizationInfo doGetAuthorizationInfo(PrincipalCollection principals) {
+ IShiro shiroFactory = ShiroFactroy.me();
+ ShiroUser shiroUser = (ShiroUser) principals.getPrimaryPrincipal();
+ List<Integer> roleList = shiroUser.getRoleList();
+
+ Set<String> permissionSet = new HashSet<>();
+ Set<String> roleNameSet = new HashSet<>();
+
+ for (Integer roleId : roleList) {
+ List<String> permissions = shiroFactory.findPermissionsByRoleId(roleId);
+ if (permissions != null) {
+ for (String permission : permissions) {
+ if (ToolUtil.isNotEmpty(permission)) {
+ permissionSet.add(permission);
+ }
+ }
+ }
+ String roleName = shiroFactory.findRoleNameByRoleId(roleId);
+ roleNameSet.add(roleName);
+ }
+
+ SimpleAuthorizationInfo info = new SimpleAuthorizationInfo();
+ info.addStringPermissions(permissionSet);
+ info.addRoles(roleNameSet);
+ return info;
+ }
+
+ /**
+ * 设置认证加密方式
+ */
+ @Override
+ public void setCredentialsMatcher(CredentialsMatcher credentialsMatcher) {
+ HashedCredentialsMatcher md5CredentialsMatcher = new HashedCredentialsMatcher();
+ md5CredentialsMatcher.setHashAlgorithmName(ShiroKit.hashAlgorithmName);
+ md5CredentialsMatcher.setHashIterations(ShiroKit.hashIterations);
+ super.setCredentialsMatcher(md5CredentialsMatcher);
+ }
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/core/shiro/ShiroKit.java b/management/guns-admin/src/main/java/com/stylefeng/guns/core/shiro/ShiroKit.java
new file mode 100644
index 0000000..eedfe1c
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/core/shiro/ShiroKit.java
@@ -0,0 +1,290 @@
+/**
+ * Copyright (c) 2015-2017, Chill Zhuang 庄骞 (smallchill@163.com).
+ * <p>
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * <p>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.stylefeng.guns.core.shiro;
+
+import com.stylefeng.guns.core.common.constant.Const;
+import com.stylefeng.guns.core.common.constant.factory.ConstantFactory;
+import com.stylefeng.guns.core.util.ToolUtil;
+import org.apache.shiro.SecurityUtils;
+import org.apache.shiro.crypto.hash.Md5Hash;
+import org.apache.shiro.crypto.hash.SimpleHash;
+import org.apache.shiro.session.Session;
+import org.apache.shiro.subject.Subject;
+import org.apache.shiro.util.ByteSource;
+
+import java.util.List;
+
+/**
+ * shiro工具类
+ *
+ * @author dafei, Chill Zhuang
+ */
+public class ShiroKit {
+
+ private static final String NAMES_DELIMETER = ",";
+
+ /**
+ * 加盐参数
+ */
+ public final static String hashAlgorithmName = "MD5";
+
+ /**
+ * 循环次数
+ */
+ public final static int hashIterations = 1024;
+
+ /**
+ * shiro密码加密工具类
+ *
+ * @param credentials 密码
+ * @param saltSource 密码盐
+ * @return
+ */
+ public static String md5(String credentials, String saltSource) {
+ ByteSource salt = new Md5Hash(saltSource);
+ return new SimpleHash(hashAlgorithmName, credentials, salt, hashIterations).toString();
+ }
+
+ /**
+ * 获取随机盐值
+ * @param length
+ * @return
+ */
+ public static String getRandomSalt(int length) {
+ return ToolUtil.getRandomString(length);
+ }
+
+ /**
+ * 获取当前 Subject
+ *
+ * @return Subject
+ */
+ public static Subject getSubject() {
+ return SecurityUtils.getSubject();
+ }
+
+ /**
+ * 获取封装的 ShiroUser
+ *
+ * @return ShiroUser
+ */
+ public static ShiroUser getUser() {
+ if (isGuest()) {
+ return null;
+ } else {
+ return (ShiroUser) getSubject().getPrincipals().getPrimaryPrincipal();
+ }
+ }
+
+ /**
+ * 从shiro获取session
+ *
+ */
+ public static Session getSession() {
+ return getSubject().getSession();
+ }
+
+ /**
+ * 获取shiro指定的sessionKey
+ *
+ */
+ @SuppressWarnings("unchecked")
+ public static <T> T getSessionAttr(String key) {
+ Session session = getSession();
+ return session != null ? (T) session.getAttribute(key) : null;
+ }
+
+ /**
+ * 设置shiro指定的sessionKey
+ *
+ */
+ public static void setSessionAttr(String key, Object value) {
+ Session session = getSession();
+ session.setAttribute(key, value);
+ }
+
+ /**
+ * 移除shiro指定的sessionKey
+ */
+ public static void removeSessionAttr(String key) {
+ Session session = getSession();
+ if (session != null)
+ session.removeAttribute(key);
+ }
+
+ /**
+ * 验证当前用户是否属于该角色？,使用时与lacksRole 搭配使用
+ *
+ * @param roleName
+ * 角色名
+ * @return 属于该角色：true，否则false
+ */
+ public static boolean hasRole(String roleName) {
+ return getSubject() != null && roleName != null
+ && roleName.length() > 0 && getSubject().hasRole(roleName);
+ }
+
+ /**
+ * 与hasRole标签逻辑相反，当用户不属于该角色时验证通过。
+ *
+ * @param roleName
+ * 角色名
+ * @return 不属于该角色：true，否则false
+ */
+ public static boolean lacksRole(String roleName) {
+ return !hasRole(roleName);
+ }
+
+ /**
+ * 验证当前用户是否属于以下任意一个角色。
+ *
+ * @param roleNames
+ * 角色列表
+ * @return 属于:true,否则false
+ */
+ public static boolean hasAnyRoles(String roleNames) {
+ boolean hasAnyRole = false;
+ Subject subject = getSubject();
+ if (subject != null && roleNames != null && roleNames.length() > 0) {
+ for (String role : roleNames.split(NAMES_DELIMETER)) {
+ if (subject.hasRole(role.trim())) {
+ hasAnyRole = true;
+ break;
+ }
+ }
+ }
+ return hasAnyRole;
+ }
+
+ /**
+ * 验证当前用户是否属于以下所有角色。
+ *
+ * @param roleNames
+ * 角色列表
+ * @return 属于:true,否则false
+ */
+ public static boolean hasAllRoles(String roleNames) {
+ boolean hasAllRole = true;
+ Subject subject = getSubject();
+ if (subject != null && roleNames != null && roleNames.length() > 0) {
+ for (String role : roleNames.split(NAMES_DELIMETER)) {
+ if (!subject.hasRole(role.trim())) {
+ hasAllRole = false;
+ break;
+ }
+ }
+ }
+ return hasAllRole;
+ }
+
+ /**
+ * 验证当前用户是否拥有指定权限,使用时与lacksPermission 搭配使用
+ *
+ * @param permission
+ * 权限名
+ * @return 拥有权限：true，否则false
+ */
+ public static boolean hasPermission(String permission) {
+ return getSubject() != null && permission != null
+ && permission.length() > 0
+ && getSubject().isPermitted(permission);
+ }
+
+ /**
+ * 与hasPermission标签逻辑相反，当前用户没有制定权限时，验证通过。
+ *
+ * @param permission
+ * 权限名
+ * @return 拥有权限：true，否则false
+ */
+ public static boolean lacksPermission(String permission) {
+ return !hasPermission(permission);
+ }
+
+ /**
+ * 已认证通过的用户。不包含已记住的用户，这是与user标签的区别所在。与notAuthenticated搭配使用
+ *
+ * @return 通过身份验证：true，否则false
+ */
+ public static boolean isAuthenticated() {
+ return getSubject() != null && getSubject().isAuthenticated();
+ }
+
+ /**
+ * 未认证通过用户，与authenticated标签相对应。与guest标签的区别是，该标签包含已记住用户。。
+ *
+ * @return 没有通过身份验证：true，否则false
+ */
+ public static boolean notAuthenticated() {
+ return !isAuthenticated();
+ }
+
+ /**
+ * 认证通过或已记住的用户。与guset搭配使用。
+ *
+ * @return 用户：true，否则 false
+ */
+ public static boolean isUser() {
+ return getSubject() != null && getSubject().getPrincipal() != null;
+ }
+
+ /**
+ * 验证当前用户是否为“访客”，即未认证（包含未记住）的用户。用user搭配使用
+ *
+ * @return 访客：true，否则false
+ */
+ public static boolean isGuest() {
+ return !isUser();
+ }
+
+ /**
+ * 输出当前用户信息，通常为登录帐号信息。
+ *
+ * @return 当前用户信息
+ */
+ public static String principal() {
+ if (getSubject() != null) {
+ Object principal = getSubject().getPrincipal();
+ return principal.toString();
+ }
+ return "";
+ }
+
+ /**
+ * 获取当前用户的部门数据范围的集合
+ */
+ public static List<Integer> getDeptDataScope() {
+ Integer deptId = getUser().getDeptId();
+ List<Integer> subDeptIds = ConstantFactory.me().getSubDeptId(deptId);
+ subDeptIds.add(deptId);
+ return subDeptIds;
+ }
+
+ /**
+ * 判断当前用户是否是超级管理员
+ */
+ public static boolean isAdmin() {
+ List<Integer> roleList = ShiroKit.getUser().getRoleList();
+ for (Integer integer : roleList) {
+ String singleRoleTip = ConstantFactory.me().getSingleRoleTip(integer);
+ if (singleRoleTip.equals(Const.ADMIN_NAME)) {
+ return true;
+ }
+ }
+ return false;
+ }
+
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/core/shiro/ShiroUser.java b/management/guns-admin/src/main/java/com/stylefeng/guns/core/shiro/ShiroUser.java
new file mode 100644
index 0000000..defcc45
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/core/shiro/ShiroUser.java
@@ -0,0 +1,98 @@
+package com.stylefeng.guns.core.shiro;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * 自定义Authentication对象，使得Subject除了携带用户的登录名外还可以携带更多信息
+ *
+ * @author fengshuonan
+ * @date 2016年12月5日 上午10:26:43
+ */
+public class ShiroUser implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ public Integer id; // 主键ID
+ public String account; // 账号
+ public String name; // 姓名
+ public Integer deptId; // 部门id
+ public List<Integer> roleList; // 角色集
+ public String deptName; // 部门名称
+ public List<String> roleNames; // 角色名称集
+ public Integer roleType; // 角色类型 1=平台 2=分公司 3=加盟商
+ public Integer objectId; // 对象ID
+
+
+ public Integer getId() {
+ return id;
+ }
+
+ public void setId(Integer id) {
+ this.id = id;
+ }
+
+ public String getAccount() {
+ return account;
+ }
+
+ public void setAccount(String account) {
+ this.account = account;
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ public Integer getDeptId() {
+ return deptId;
+ }
+
+ public void setDeptId(Integer deptId) {
+ this.deptId = deptId;
+ }
+
+ public List<Integer> getRoleList() {
+ return roleList;
+ }
+
+ public void setRoleList(List<Integer> roleList) {
+ this.roleList = roleList;
+ }
+
+ public String getDeptName() {
+ return deptName;
+ }
+
+ public void setDeptName(String deptName) {
+ this.deptName = deptName;
+ }
+
+ public List<String> getRoleNames() {
+ return roleNames;
+ }
+
+ public void setRoleNames(List<String> roleNames) {
+ this.roleNames = roleNames;
+ }
+
+ public Integer getRoleType() {
+ return roleType;
+ }
+
+ public void setRoleType(Integer roleType) {
+ this.roleType = roleType;
+ }
+
+ public Integer getObjectId() {
+ return objectId;
+ }
+
+ public void setObjectId(Integer objectId) {
+ this.objectId = objectId;
+ }
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/core/shiro/check/ICheck.java b/management/guns-admin/src/main/java/com/stylefeng/guns/core/shiro/check/ICheck.java
new file mode 100644
index 0000000..b93a834
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/core/shiro/check/ICheck.java
@@ -0,0 +1,32 @@
+/**
+ * Copyright (c) 2015-2017, Chill Zhuang 庄骞 (smallchill@163.com).
+ * <p>
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * <p>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.stylefeng.guns.core.shiro.check;
+
+/**
+ * 检查用接口
+ */
+public interface ICheck {
+
+ /**
+ * 检查当前登录用户是否拥有指定的角色访问当
+ */
+ boolean check(Object[] permissions);
+
+ /**
+ * 检查当前登录用户是否拥有当前请求的servlet的权限
+ */
+ boolean checkAll();
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/core/shiro/check/PermissionCheckFactory.java b/management/guns-admin/src/main/java/com/stylefeng/guns/core/shiro/check/PermissionCheckFactory.java
new file mode 100644
index 0000000..89f602f
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/core/shiro/check/PermissionCheckFactory.java
@@ -0,0 +1,73 @@
+/**
+ * Copyright (c) 2015-2017, Chill Zhuang 庄骞 (smallchill@163.com).
+ * <p>
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * <p>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.stylefeng.guns.core.shiro.check;
+
+import com.stylefeng.guns.core.listener.ConfigListener;
+import com.stylefeng.guns.core.shiro.ShiroKit;
+import com.stylefeng.guns.core.shiro.ShiroUser;
+import com.stylefeng.guns.core.support.CollectionKit;
+import com.stylefeng.guns.core.support.HttpKit;
+import com.stylefeng.guns.core.util.SpringContextHolder;
+import org.springframework.context.annotation.DependsOn;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import javax.servlet.http.HttpServletRequest;
+
+/**
+ * 权限自定义检查
+ */
+@Service
+@DependsOn("springContextHolder")
+@Transactional(readOnly = true)
+public class PermissionCheckFactory implements ICheck {
+
+ public static ICheck me() {
+ return SpringContextHolder.getBean(ICheck.class);
+ }
+
+ @Override
+ public boolean check(Object[] permissions) {
+ ShiroUser user = ShiroKit.getUser();
+ if (null == user) {
+ return false;
+ }
+ String join = CollectionKit.join(permissions, ",");
+ if (ShiroKit.hasAnyRoles(join)) {
+ return true;
+ }
+ return false;
+ }
+
+ @Override
+ public boolean checkAll() {
+ HttpServletRequest request = HttpKit.getRequest();
+ ShiroUser user = ShiroKit.getUser();
+ if (null == user) {
+ return false;
+ }
+ String requestURI = request.getRequestURI().replaceFirst(ConfigListener.getConf().get("contextPath"), "");
+ String[] str = requestURI.split("/");
+ if (str.length > 3) {
+ requestURI = "/" + str[1] + "/" + str[2];
+ }
+ if (ShiroKit.hasPermission(requestURI)) {
+ return true;
+ }
+ return false;
+ }
+
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/core/shiro/check/PermissionCheckManager.java b/management/guns-admin/src/main/java/com/stylefeng/guns/core/shiro/check/PermissionCheckManager.java
new file mode 100644
index 0000000..690f728
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/core/shiro/check/PermissionCheckManager.java
@@ -0,0 +1,50 @@
+/**
+ * Copyright (c) 2015-2017, Chill Zhuang 庄骞 (smallchill@163.com).
+ * <p>
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * <p>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.stylefeng.guns.core.shiro.check;
+
+import com.stylefeng.guns.core.util.SpringContextHolder;
+
+/**
+ * 权限检查管理器(入口)
+ */
+public class PermissionCheckManager {
+ private final static PermissionCheckManager me = new PermissionCheckManager();
+
+ private ICheck defaultCheckFactory = SpringContextHolder.getBean(ICheck.class);
+
+ public static PermissionCheckManager me() {
+ return me;
+ }
+
+ private PermissionCheckManager() {
+ }
+
+ public PermissionCheckManager(ICheck checkFactory) {
+ this.defaultCheckFactory = checkFactory;
+ }
+
+ public void setDefaultCheckFactory(ICheck defaultCheckFactory) {
+ this.defaultCheckFactory = defaultCheckFactory;
+ }
+
+ public static boolean check(Object[] permissions) {
+ return me.defaultCheckFactory.check(permissions);
+ }
+
+ public static boolean checkAll() {
+ return me.defaultCheckFactory.checkAll();
+ }
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/core/shiro/factory/IShiro.java b/management/guns-admin/src/main/java/com/stylefeng/guns/core/shiro/factory/IShiro.java
new file mode 100644
index 0000000..c701170
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/core/shiro/factory/IShiro.java
@@ -0,0 +1,50 @@
+package com.stylefeng.guns.core.shiro.factory;
+
+import com.stylefeng.guns.core.shiro.ShiroUser;
+import com.stylefeng.guns.modular.system.model.User;
+import org.apache.shiro.authc.SimpleAuthenticationInfo;
+
+import java.util.List;
+
+/**
+ * 定义shirorealm所需数据的接口
+ *
+ * @author fengshuonan
+ * @date 2016年12月5日 上午10:23:34
+ */
+public interface IShiro {
+
+ /**
+ * 根据账号获取登录用户
+ *
+ * @param account 账号
+ */
+ User user(String account);
+
+ /**
+ * 根据系统用户获取Shiro的用户
+ *
+ * @param user 系统用户
+ */
+ ShiroUser shiroUser(User user);
+
+ /**
+ * 获取权限列表通过角色id
+ *
+ * @param roleId 角色id
+ */
+ List<String> findPermissionsByRoleId(Integer roleId);
+
+ /**
+ * 根据角色id获取角色名称
+ *
+ * @param roleId 角色id
+ */
+ String findRoleNameByRoleId(Integer roleId);
+
+ /**
+ * 获取shiro的认证信息
+ */
+ SimpleAuthenticationInfo info(ShiroUser shiroUser, User user, String realmName);
+
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/core/shiro/factory/ShiroFactroy.java b/management/guns-admin/src/main/java/com/stylefeng/guns/core/shiro/factory/ShiroFactroy.java
new file mode 100644
index 0000000..970a268
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/core/shiro/factory/ShiroFactroy.java
@@ -0,0 +1,98 @@
+package com.stylefeng.guns.core.shiro.factory;
+
+import com.stylefeng.guns.core.common.constant.factory.ConstantFactory;
+import com.stylefeng.guns.core.common.constant.state.ManagerStatus;
+import com.stylefeng.guns.core.shiro.ShiroUser;
+import com.stylefeng.guns.core.util.Convert;
+import com.stylefeng.guns.core.util.SpringContextHolder;
+import com.stylefeng.guns.modular.system.dao.MenuMapper;
+import com.stylefeng.guns.modular.system.dao.UserMapper;
+import com.stylefeng.guns.modular.system.model.User;
+import org.apache.shiro.authc.CredentialsException;
+import org.apache.shiro.authc.LockedAccountException;
+import org.apache.shiro.authc.SimpleAuthenticationInfo;
+import org.apache.shiro.crypto.hash.Md5Hash;
+import org.apache.shiro.util.ByteSource;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.DependsOn;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@Service
+@DependsOn("springContextHolder")
+@Transactional(readOnly = true)
+public class ShiroFactroy implements IShiro {
+
+ @Autowired
+ private UserMapper userMapper;
+
+ @Autowired
+ private MenuMapper menuMapper;
+
+ public static IShiro me() {
+ return SpringContextHolder.getBean(IShiro.class);
+ }
+
+ @Override
+ public User user(String account) {
+
+ User user = userMapper.getByAccount(account);
+
+ // 账号不存在
+ if (null == user) {
+ throw new CredentialsException();
+ }
+ // 账号被冻结
+ if (user.getStatus() != ManagerStatus.OK.getCode()) {
+ throw new LockedAccountException();
+ }
+ return user;
+ }
+
+ @Override
+ public ShiroUser shiroUser(User user) {
+ ShiroUser shiroUser = new ShiroUser();
+
+ shiroUser.setId(user.getId());
+ shiroUser.setAccount(user.getAccount());
+ shiroUser.setDeptId(user.getDeptid());
+ shiroUser.setDeptName(ConstantFactory.me().getDeptName(user.getDeptid()));
+ shiroUser.setName(user.getName());
+
+ Integer[] roleArray = Convert.toIntArray(user.getRoleid());
+ List<Integer> roleList = new ArrayList<Integer>();
+ List<String> roleNameList = new ArrayList<String>();
+ for (int roleId : roleArray) {
+ roleList.add(roleId);
+ roleNameList.add(ConstantFactory.me().getSingleRoleName(roleId));
+ }
+ shiroUser.setRoleList(roleList);
+ shiroUser.setRoleNames(roleNameList);
+
+ return shiroUser;
+ }
+
+ @Override
+ public List<String> findPermissionsByRoleId(Integer roleId) {
+ return menuMapper.getResUrlsByRoleId(roleId);
+ }
+
+ @Override
+ public String findRoleNameByRoleId(Integer roleId) {
+ return ConstantFactory.me().getSingleRoleTip(roleId);
+ }
+
+ @Override
+ public SimpleAuthenticationInfo info(ShiroUser shiroUser, User user, String realmName) {
+ String credentials = user.getPassword();
+
+ // 密码加盐处理
+ String source = user.getSalt();
+ ByteSource credentialsSalt = new Md5Hash(source);
+ return new SimpleAuthenticationInfo(shiroUser, credentials, credentialsSalt, realmName);
+ }
+
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/core/tag/DictSelectorTag.java b/management/guns-admin/src/main/java/com/stylefeng/guns/core/tag/DictSelectorTag.java
new file mode 100644
index 0000000..a07afe1
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/core/tag/DictSelectorTag.java
@@ -0,0 +1,201 @@
+package com.stylefeng.guns.core.tag;
+
+import com.stylefeng.guns.core.common.exception.BizExceptionEnum;
+import com.stylefeng.guns.core.exception.GunsException;
+import com.stylefeng.guns.core.util.ToolUtil;
+import com.stylefeng.guns.modular.system.model.Dict;
+import com.stylefeng.guns.modular.system.service.IDictService;
+import org.beetl.core.Tag;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Scope;
+import org.springframework.stereotype.Component;
+import java.io.IOException;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 字典标签渲染
+ *
+ * @author zhangjiajia
+ * @Date 2018年6月4日17:33:32
+ */
+@Component
+@Scope("prototype")
+public class DictSelectorTag extends Tag {
+
+ @Autowired
+ IDictService iDictService;
+
+ @Override
+ public void render(){
+ //String tagName = (String) this.args[0];
+ Map attrs = (Map) args[1];
+ if(ToolUtil.isEmpty(attrs.get("code"))){
+ throw new GunsException(BizExceptionEnum.ERROR_CODE_EMPTY);
+ }
+
+ //字典类型编码
+ String code = attrs.get("code").toString();
+ //控件显示类型select 选择框,radio 单选按钮,checkbox 多选按钮
+ String type = ToolUtil.isNotEmpty(attrs.get("type"))?attrs.get("type").toString():"select";
+ //开启多选
+ String multiple = ToolUtil.isNotEmpty(attrs.get("multiple"))?attrs.get("multiple").toString():"";
+ //字典名称
+ String label = ToolUtil.isNotEmpty(attrs.get("label"))?attrs.get("label").toString():"";
+ //提示
+ String placeholder = (ToolUtil.isNotEmpty(attrs.get("placeholder"))?attrs.get("placeholder").toString():"");
+ //宽度
+ String width = ToolUtil.isNotEmpty(attrs.get("width"))?attrs.get("width").toString():"248";
+ //默认值
+ String value = ToolUtil.isNotEmpty(attrs.get("value"))?attrs.get("value").toString():"";
+ //id
+ String id = ToolUtil.isNotEmpty(attrs.get("id"))?attrs.get("id").toString():"";
+ //name
+ String name = ToolUtil.isNotEmpty(attrs.get("name"))?attrs.get("name").toString():"";
+ //分割线
+ String underline = ToolUtil.isNotEmpty(attrs.get("underline"))?attrs.get("underline").toString():"";
+ //onchange事件
+ String onchange = ToolUtil.isNotEmpty(attrs.get("onchange"))?attrs.get("onchange").toString():"";
+ //readonly属性
+ String readonly = ToolUtil.isNotEmpty(attrs.get("readonly"))?attrs.get("readonly").toString():"";
+ //disabled属性
+ String disabled = ToolUtil.isNotEmpty(attrs.get("disabled"))?attrs.get("disabled").toString():"";
+ //searchnum 下拉选项数量达到多少启用搜索,默认10
+ int searchnum = ToolUtil.isNum(attrs.get("searchnum"))?Integer.parseInt(attrs.get("searchnum").toString()):10;
+ //根据code查询字典数据
+ List<Dict> list = iDictService.selectByParentCode(code);
+
+ StringBuffer html = new StringBuffer();
+ html.append("<div class=\"form-group\">\r\n");
+ html.append("<label class=\"col-sm-3 control-label\">"+label+"</label>\r\n");
+ html.append("<div class=\"col-sm-9\">\r\n");
+
+ //单选按钮
+ if("radio".equals(type)) {
+
+ list.forEach(obj->{
+ html.append("<label class=\"radio-inline i-checks\">\r\n<input type=\"radio\" ");
+ //判断控件是否禁用
+ if("true".equals(disabled)||"disabled".equals(disabled)) {
+ html.append("disabled ");
+ }else{
+ if(ToolUtil.isNotEmpty(name)){
+ html.append("name=\""+name+"\" ");
+ }
+ }
+ if("true".equals(readonly)||"disabled".equals(readonly)) {
+ html.append("disabled ");
+ }
+ if(ToolUtil.isNotEmpty(value)&&value.equals(obj.getCode())){
+ html.append("checked ");
+ }
+
+ html.append("value=\""+obj.getCode()+"\" >"+obj.getName()+"</label>\r\n");
+ });
+
+ //多选按钮
+ }else if("checkbox".equals(type)){
+ list.forEach(obj->{
+ html.append("<label class=\"checkbox-inline i-checks\">\r\n<input type=\"checkbox\" ");
+ //判断控件是否禁用
+ if("true".equals(disabled)||"disabled".equals(disabled)) {
+ html.append("disabled ");
+ }else{
+ if(ToolUtil.isNotEmpty(name)){
+ html.append("name=\""+name+"\" ");
+ }
+ }
+ if("true".equals(readonly)||"disabled".equals(readonly)) {
+ html.append("disabled ");
+ }
+ if(ToolUtil.isNotEmpty(value)&&value.equals(obj.getCode())){
+ html.append("checked ");
+ }
+
+ html.append("value=\""+obj.getCode()+"\" >"+obj.getName()+"</label>\r\n");
+ });
+
+ //默认select
+ }else{
+ //开启多选
+ if("true".equals(multiple)){
+ if(list.size()>=searchnum) {
+ html.append("<select multiple ");
+ }else{
+ html.append("<select multiple=\"multiple\" size=\"10\" ");
+ }
+ }else{
+ html.append("<select ");
+ }
+
+ //判断控件是否启用提示
+ if(ToolUtil.isNotEmpty(placeholder)){
+ html.append(" data-placeholder=\""+placeholder+"\" ");
+ }
+
+ //判断控件是否禁用
+ if("true".equals(disabled)||"disabled".equals(disabled)) {
+ html.append("disabled=\"disabled\" ");
+ }else{
+ //启用
+ if(ToolUtil.isNotEmpty(id)){
+ html.append("id=\""+id+"\" ");
+ }
+
+ if(ToolUtil.isNotEmpty(name)){
+ html.append("name=\""+name+"\" ");
+ }
+ }
+
+ //判断是否启用搜索框
+ //判断下拉数据,如果查询出来的条数达到启用搜索的数量就启用
+
+
+ if(list.size()>=searchnum){
+ html.append("class=\"form-control chosen-select\" style=\"width:"+width+"px\" tabindex=\"1\" \r\n");
+ } else{
+ html.append("class=\"form-control\" style=\"width:"+width+"px\" \r\n");
+ }
+
+ //判断控件是否只读
+ if("true".equals(readonly)||"readonly".equals(readonly)) {
+ if(list.size()>=searchnum) {
+ html.append("disabled=\"disabled\" ");
+ }else{
+ html.append("onfocus=\"this.defaultIndex=this.selectedIndex;\" onchange=\"this.selectedIndex=this.defaultIndex;\" ");
+ }
+ }
+
+ //判断是否绑定onchange事件
+ if(ToolUtil.isNotEmpty(onchange)){
+ html.append("onchange=\""+onchange+"($(this).children('option:selected').val())\" ");
+ }
+
+ html.append(">");
+ if(ToolUtil.isNotEmpty(placeholder)){
+ html.append("<option value=\"\">"+placeholder+"</option>\r\n");
+ }
+ //将查询出来的数据添加到select中
+ list.forEach(obj->{
+ if(ToolUtil.isNotEmpty(value)&&value.equals(obj.getCode())){
+ html.append("<option selected value=\""+obj.getCode()+"\">"+obj.getName()+"</option>\r\n");
+ }else{
+ html.append("<option value=\""+obj.getCode()+"\">"+obj.getName()+"</option>\r\n");
+ }
+ });
+ html.append("</select>\r\n");
+ }
+
+ html.append("</div>\r\n</div>\r\n");
+ //判断是否添加分割线
+ if(ToolUtil.isNotEmpty(underline) && "true".equals(underline)) {
+ html.append("<div class=\"hr-line-dashed\" ></div >\r\n");
+ }
+
+ try{
+ this.ctx.byteWriter.writeString(html.toString());
+ }catch (IOException e){
+ throw new RuntimeException("输出字典标签错误");
+ }
+ }
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/core/util/ApiMenuFilter.java b/management/guns-admin/src/main/java/com/stylefeng/guns/core/util/ApiMenuFilter.java
new file mode 100644
index 0000000..ffba2f2
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/core/util/ApiMenuFilter.java
@@ -0,0 +1,36 @@
+package com.stylefeng.guns.core.util;
+
+import com.stylefeng.guns.core.common.constant.Const;
+import com.stylefeng.guns.config.properties.GunsProperties;
+import com.stylefeng.guns.core.node.MenuNode;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * api接口文档显示过滤
+ *
+ * @author fengshuonan
+ * @date 2017-08-17 16:55
+ */
+public class ApiMenuFilter extends MenuNode {
+
+ public static List<MenuNode> build(List<MenuNode> nodes) {
+
+ //如果关闭了接口文档,则不显示接口文档菜单
+ GunsProperties gunsProperties = SpringContextHolder.getBean(GunsProperties.class);
+ if (!gunsProperties.getSwaggerOpen()) {
+ List<MenuNode> menuNodesCopy = new ArrayList<>();
+ for (MenuNode menuNode : nodes) {
+ if (Const.API_MENU_NAME.equals(menuNode.getName())) {
+ continue;
+ } else {
+ menuNodesCopy.add(menuNode);
+ }
+ }
+ nodes = menuNodesCopy;
+ }
+
+ return nodes;
+ }
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/core/util/Contrast.java b/management/guns-admin/src/main/java/com/stylefeng/guns/core/util/Contrast.java
new file mode 100644
index 0000000..980f947
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/core/util/Contrast.java
@@ -0,0 +1,214 @@
+package com.stylefeng.guns.core.util;
+
+import com.stylefeng.guns.core.common.constant.dictmap.base.AbstractDictMap;
+import com.stylefeng.guns.core.common.constant.dictmap.factory.DictFieldWarpperFactory;
+import com.stylefeng.guns.core.support.StrKit;
+
+import java.beans.PropertyDescriptor;
+import java.lang.reflect.Field;
+import java.lang.reflect.Method;
+import java.util.Date;
+import java.util.Map;
+
+/**
+ * 对比两个对象的变化的工具类
+ *
+ * @author fengshuonan
+ * @Date 2017/3/31 10:36
+ */
+public class Contrast {
+
+ //记录每个修改字段的分隔符
+ public static final String separator = ";;;";
+
+ /**
+ * 比较两个对象,并返回不一致的信息
+ *
+ * @author stylefeng
+ * @Date 2017/5/9 19:34
+ */
+ public static String contrastObj(Object pojo1, Object pojo2) {
+ String str = "";
+ try {
+ Class clazz = pojo1.getClass();
+ Field[] fields = pojo1.getClass().getDeclaredFields();
+ int i = 1;
+ for (Field field : fields) {
+ if ("serialVersionUID".equals(field.getName())) {
+ continue;
+ }
+ PropertyDescriptor pd = new PropertyDescriptor(field.getName(), clazz);
+ Method getMethod = pd.getReadMethod();
+ Object o1 = getMethod.invoke(pojo1);
+ Object o2 = getMethod.invoke(pojo2);
+ if (o1 == null || o2 == null) {
+ continue;
+ }
+ if (o1 instanceof Date) {
+ o1 = DateUtil.getDay((Date) o1);
+ }
+ if (!o1.toString().equals(o2.toString())) {
+ if (i != 1) {
+ str += separator;
+ }
+ str += "字段名称" + field.getName() + ",旧值:" + o1 + ",新值:" + o2;
+ i++;
+ }
+ }
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ return str;
+ }
+
+ /**
+ * 比较两个对象pojo1和pojo2,并输出不一致信息
+ *
+ * @author stylefeng
+ * @Date 2017/5/9 19:34
+ */
+ public static String contrastObj(Class dictClass, String key, Object pojo1, Map<String, String> pojo2) throws IllegalAccessException, InstantiationException {
+ AbstractDictMap dictMap = (AbstractDictMap) dictClass.newInstance();
+ String str = parseMutiKey(dictMap, key, pojo2) + separator;
+ try {
+ Class clazz = pojo1.getClass();
+ Field[] fields = pojo1.getClass().getDeclaredFields();
+ int i = 1;
+ for (Field field : fields) {
+ if ("serialVersionUID".equals(field.getName())) {
+ continue;
+ }
+ PropertyDescriptor pd = new PropertyDescriptor(field.getName(), clazz);
+ Method getMethod = pd.getReadMethod();
+ Object o1 = getMethod.invoke(pojo1);
+ Object o2 = pojo2.get(StrKit.firstCharToLowerCase(getMethod.getName().substring(3)));
+ if (o1 == null || o2 == null) {
+ continue;
+ }
+ if (o1 instanceof Date) {
+ o1 = DateUtil.getDay((Date) o1);
+ } else if (o1 instanceof Integer) {
+ o2 = Integer.parseInt(o2.toString());
+ }
+ if (!o1.toString().equals(o2.toString())) {
+ if (i != 1) {
+ str += separator;
+ }
+ String fieldName = dictMap.get(field.getName());
+ String fieldWarpperMethodName = dictMap.getFieldWarpperMethodName(field.getName());
+ if (fieldWarpperMethodName != null) {
+ Object o1Warpper = DictFieldWarpperFactory.createFieldWarpper(o1, fieldWarpperMethodName);
+ Object o2Warpper = DictFieldWarpperFactory.createFieldWarpper(o2, fieldWarpperMethodName);
+ str += "字段名称:" + fieldName + ",旧值:" + o1Warpper + ",新值:" + o2Warpper;
+ } else {
+ str += "字段名称:" + fieldName + ",旧值:" + o1 + ",新值:" + o2;
+ }
+ i++;
+ }
+ }
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ return str;
+ }
+
+ /**
+ * 比较两个对象pojo1和pojo2,并输出不一致信息
+ *
+ * @author stylefeng
+ * @Date 2017/5/9 19:34
+ */
+ public static String contrastObjByName(Class dictClass, String key, Object pojo1, Map<String, String> pojo2) throws IllegalAccessException, InstantiationException {
+ AbstractDictMap dictMap = (AbstractDictMap) dictClass.newInstance();
+ String str = parseMutiKey(dictMap, key, pojo2) + separator;
+ try {
+ Class clazz = pojo1.getClass();
+ Field[] fields = pojo1.getClass().getDeclaredFields();
+ int i = 1;
+ for (Field field : fields) {
+ if ("serialVersionUID".equals(field.getName())) {
+ continue;
+ }
+ String prefix = "get";
+ int prefixLength = 3;
+ if (field.getType().getName().equals("java.lang.Boolean")) {
+ prefix = "is";
+ prefixLength = 2;
+ }
+ Method getMethod = null;
+ try {
+ getMethod = clazz.getDeclaredMethod(prefix + StrKit.firstCharToUpperCase(field.getName()));
+ } catch (java.lang.NoSuchMethodException e) {
+ System.err.println("this className:" + clazz.getName() + " is not methodName: " + e.getMessage());
+ continue;
+ }
+ Object o1 = getMethod.invoke(pojo1);
+ Object o2 = pojo2.get(StrKit.firstCharToLowerCase(getMethod.getName().substring(prefixLength)));
+ if (o1 == null || o2 == null) {
+ continue;
+ }
+ if (o1 instanceof Date) {
+ o1 = DateUtil.getDay((Date) o1);
+ } else if (o1 instanceof Integer) {
+ o2 = Integer.parseInt(o2.toString());
+ }
+ if (!o1.toString().equals(o2.toString())) {
+ if (i != 1) {
+ str += separator;
+ }
+ String fieldName = dictMap.get(field.getName());
+ String fieldWarpperMethodName = dictMap.getFieldWarpperMethodName(field.getName());
+ if (fieldWarpperMethodName != null) {
+ Object o1Warpper = DictFieldWarpperFactory.createFieldWarpper(o1, fieldWarpperMethodName);
+ Object o2Warpper = DictFieldWarpperFactory.createFieldWarpper(o2, fieldWarpperMethodName);
+ str += "字段名称:" + fieldName + ",旧值:" + o1Warpper + ",新值:" + o2Warpper;
+ } else {
+ str += "字段名称:" + fieldName + ",旧值:" + o1 + ",新值:" + o2;
+ }
+ i++;
+ }
+ }
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ return str;
+ }
+
+ /**
+ * 解析多个key(逗号隔开的)
+ *
+ * @author stylefeng
+ * @Date 2017/5/16 22:19
+ */
+ public static String parseMutiKey(AbstractDictMap dictMap, String key, Map<String, String> requests) {
+ StringBuilder sb = new StringBuilder();
+ if (key.indexOf(",") != -1) {
+ String[] keys = key.split(",");
+ for (String item : keys) {
+ String fieldWarpperMethodName = dictMap.getFieldWarpperMethodName(item);
+ String value = requests.get(item);
+ if (fieldWarpperMethodName != null) {
+ Object valueWarpper = DictFieldWarpperFactory.createFieldWarpper(value, fieldWarpperMethodName);
+ sb.append(dictMap.get(item) + "=" + valueWarpper + ",");
+ } else {
+ if(item.equals("addTime") || item.equals("createDate")){
+ value= com.stylefeng.guns.modular.system.util.DateUtil.todayStr("yyyy-MM-dd HH:mm");
+ }
+ sb.append(dictMap.get(item) + "=" + value + ",");
+ }
+ }
+ return StrKit.removeSuffix(sb.toString(), ",");
+ } else {
+ String fieldWarpperMethodName = dictMap.getFieldWarpperMethodName(key);
+ String value = requests.get(key);
+ if (fieldWarpperMethodName != null) {
+ Object valueWarpper = DictFieldWarpperFactory.createFieldWarpper(value, fieldWarpperMethodName);
+ sb.append(dictMap.get(key) + "=" + valueWarpper);
+ } else {
+ sb.append(dictMap.get(key) + "=" + value);
+ }
+ return sb.toString();
+ }
+ }
+
+}
\ No newline at end of file
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/core/util/JwtTokenUtil.java b/management/guns-admin/src/main/java/com/stylefeng/guns/core/util/JwtTokenUtil.java
new file mode 100644
index 0000000..0b2eb41
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/core/util/JwtTokenUtil.java
@@ -0,0 +1,127 @@
+package com.stylefeng.guns.core.util;
+
+import com.stylefeng.guns.core.common.constant.JwtConstants;
+import io.jsonwebtoken.*;
+import org.springframework.stereotype.Component;
+
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * <p>jwt token工具类</p>
+ * <pre>
+ * jwt的claim里一般包含以下几种数据:
+ * 1. iss -- token的发行者
+ * 2. sub -- 该JWT所面向的用户
+ * 3. aud -- 接收该JWT的一方
+ * 4. exp -- token的失效时间
+ * 5. nbf -- 在此时间段之前,不会被处理
+ * 6. iat -- jwt发布时间
+ * 7. jti -- jwt唯一标识,防止重复使用
+ * </pre>
+ *
+ * @author fengshuonan
+ * @Date 2017/8/25 10:59
+ */
+@Component
+public class JwtTokenUtil {
+
+ /**
+ * 获取用户名从token中
+ */
+ public static String getUsernameFromToken(String token) {
+ return getClaimFromToken(token).getSubject();
+ }
+
+ /**
+ * 获取jwt发布时间
+ */
+ public static Date getIssuedAtDateFromToken(String token) {
+ return getClaimFromToken(token).getIssuedAt();
+ }
+
+ /**
+ * 获取jwt失效时间
+ */
+ public static Date getExpirationDateFromToken(String token) {
+ return getClaimFromToken(token).getExpiration();
+ }
+
+ /**
+ * 获取jwt接收者
+ */
+ public static String getAudienceFromToken(String token) {
+ return getClaimFromToken(token).getAudience();
+ }
+
+ /**
+ * 获取私有的jwt claim
+ */
+ public static String getPrivateClaimFromToken(String token, String key) {
+ return getClaimFromToken(token).get(key).toString();
+ }
+
+ /**
+ * 获取jwt的payload部分
+ */
+ public static Claims getClaimFromToken(String token) {
+ return Jwts.parser()
+ .setSigningKey(JwtConstants.SECRET)
+ .parseClaimsJws(token)
+ .getBody();
+ }
+
+ /**
+ * 解析token是否正确,不正确会报异常<br>
+ */
+ public static void parseToken(String token) throws JwtException {
+ Jwts.parser().setSigningKey(JwtConstants.SECRET).parseClaimsJws(token).getBody();
+ }
+
+ /**
+ * <pre>
+ * 验证token是否失效
+ * true:过期 false:没过期
+ * </pre>
+ */
+ public static Boolean isTokenExpired(String token) {
+ try {
+ final Date expiration = getExpirationDateFromToken(token);
+ return expiration.before(new Date());
+ } catch (ExpiredJwtException expiredJwtException) {
+ return true;
+ }
+ }
+
+ /**
+ * 生成token(通过用户名和签名时候用的随机数)
+ */
+ public static String generateToken(String userId) {
+ Map<String, Object> claims = new HashMap<>();
+ return doGenerateToken(claims, userId);
+ }
+
+ /**
+ * 生成token
+ */
+ private static String doGenerateToken(Map<String, Object> claims, String subject) {
+ final Date createdDate = new Date();
+ final Date expirationDate = new Date(createdDate.getTime() + JwtConstants.EXPIRATION * 1000);
+
+ return Jwts.builder()
+ .setClaims(claims)
+ .setSubject(subject)
+ .setIssuedAt(createdDate)
+ .setExpiration(expirationDate)
+ .signWith(SignatureAlgorithm.HS512, JwtConstants.SECRET)
+ .compact();
+ }
+
+ /**
+ * 获取混淆MD5签名用的随机字符串
+ */
+ public static String getRandomKey() {
+ return ToolUtil.getRandomString(6);
+ }
+}
\ No newline at end of file
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/core/util/KaptchaUtil.java b/management/guns-admin/src/main/java/com/stylefeng/guns/core/util/KaptchaUtil.java
new file mode 100644
index 0000000..719de81
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/core/util/KaptchaUtil.java
@@ -0,0 +1,16 @@
+package com.stylefeng.guns.core.util;
+
+import com.stylefeng.guns.config.properties.GunsProperties;
+
+/**
+ * 验证码工具类
+ */
+public class KaptchaUtil {
+
+ /**
+ * 获取验证码开关
+ */
+ public static Boolean getKaptchaOnOff() {
+ return SpringContextHolder.getBean(GunsProperties.class).getKaptchaOpen();
+ }
+}
\ No newline at end of file
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/core/util/ObsUploadUtil.java b/management/guns-admin/src/main/java/com/stylefeng/guns/core/util/ObsUploadUtil.java
new file mode 100644
index 0000000..07a5d51
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/core/util/ObsUploadUtil.java
@@ -0,0 +1,76 @@
+package com.stylefeng.guns.core.util;
+
+import com.obs.services.ObsClient;
+import com.obs.services.model.ObjectMetadata;
+import org.springframework.web.multipart.MultipartFile;
+
+import javax.servlet.http.HttpServletRequest;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.UUID;
+
+public class ObsUploadUtil {
+ //OBS图片访问域名
+ public static String endPoint = "obs.cn-east-3.myhuaweicloud.com";
+ public static String accessKeyId = "HB7DOVELEVWYYUS7QHYX";
+ public static String accessKeySecret = "nEwDoSdLRkA1BRfW17pMZL9RlnrVywuTeHSkMn7y";
+ public static String bucketName = "mian-ju-mi-liao";
+ public static String oss_domain = "https://mian-ju-mi-liao.obs.cn-east-3.myhuaweicloud.com/";
+
+
+ // 创建ObsClient实例
+ public static ObsClient obsClient = new ObsClient(accessKeyId, accessKeySecret, endPoint);
+
+ public static String obsUpload(HttpServletRequest request, MultipartFile file) throws IOException{
+ //CommonsMultipartFile file = (CommonsMultipartFile)multipartFile;
+ String fileName = "";
+ if(file!=null && !"".equals(file.getOriginalFilename()) && file.getOriginalFilename()!=null){
+ InputStream content = file.getInputStream();//获得指定文件的输入流
+ ObjectMetadata meta = new ObjectMetadata();// 创建上传Object的Metadata
+ meta.setContentLength(file.getSize()); // 必须设置ContentLength
+ String originalFilename = file.getOriginalFilename();
+ fileName = UUID.randomUUID().toString().replaceAll("-","") + originalFilename.subSequence(originalFilename.lastIndexOf("."), originalFilename.length());
+ obsClient.putObject(bucketName,"admin/"+fileName,content,meta);// 上传Object.
+ if(fileName != null && !"".equals(fileName)){
+ System.out.println(fileName);
+ fileName = oss_domain+"admin/"+fileName;
+ }
+ }
+ return fileName;
+ }
+
+ /**
+ * 删除某个Object
+ *
+ * @param bucketUrl
+ * @return
+ */
+ public static boolean deleteObject(String bucketUrl) {
+ try {
+ bucketUrl=bucketUrl.replace(oss_domain+"web","");
+ // 删除Object.
+ obsClient.deleteObject(bucketName, bucketUrl);
+ } catch (Exception e) {
+ e.printStackTrace();
+ return false;
+ } finally {
+ //ossClient.shutdown();
+ }
+ return true;
+ }
+
+// public static void createBucket(String bucketName)
+// {
+// //初始化 OSSClient
+//// ossClient = new OssClient(endPoint, accessKeyId, accessKeySecret);
+//
+// // 新建一个Bucket
+// Bucket bucket = ossClient.createBucket(bucketName);
+// System.out.println(bucket.getName());
+// System.out.println(bucket.getCreationDate());
+// }
+//
+// public static void main(String[] args) {
+// OssUploadUtil.createBucket("ssfdfsd");
+// }
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/core/util/OssUploadUtil.java b/management/guns-admin/src/main/java/com/stylefeng/guns/core/util/OssUploadUtil.java
new file mode 100644
index 0000000..07a5d46
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/core/util/OssUploadUtil.java
@@ -0,0 +1,59 @@
+package com.stylefeng.guns.core.util;
+
+import com.obs.services.ObsClient;
+import org.springframework.web.multipart.MultipartFile;
+
+import javax.servlet.http.HttpServletRequest;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.UUID;
+
+public class OssUploadUtil {
+ public static String endPoint = "obs.cn-south-1.myhuaweicloud.com";
+ public static String accessKeyId = "MLJEFPYY0LJKAVA5C4YI";
+ public static String accessKeySecret = "C8PmdLHAW7OOKR1fbEGYrqIiTh4yaLrRzA0uVZ89";
+ public static String bucketName = "qinqinzhuanche";
+ public static String oss_domain = "https://qinqinzhuanche.obs.cn-south-1.myhuaweicloud.com/";
+ // 创建ObsClient实例
+ public static ObsClient obsClient = new ObsClient(accessKeyId, accessKeySecret, endPoint);
+
+ public static String ossUpload(HttpServletRequest request,MultipartFile file) throws IOException{
+ //CommonsMultipartFile file = (CommonsMultipartFile)multipartFile;
+ String fileName = "";
+ if(file!=null && !"".equals(file.getOriginalFilename()) && file.getOriginalFilename()!=null){
+ InputStream content = file.getInputStream();//获得指定文件的输入流
+ com.obs.services.model.ObjectMetadata meta = new com.obs.services.model.ObjectMetadata();// 创建上传Object的Metadata
+ meta.setContentLength(file.getSize()); // 必须设置ContentLength
+ String originalFilename = file.getOriginalFilename();
+ fileName = UUID.randomUUID().toString().replaceAll("-","") + originalFilename.subSequence(originalFilename.lastIndexOf("."), originalFilename.length());
+ obsClient.putObject(bucketName,fileName,content,meta);// 上传Object.
+ if(fileName != null && !"".equals(fileName)){
+ System.out.println(fileName);
+ fileName = oss_domain+fileName;
+ }
+ }
+ return fileName;
+ }
+
+ /**
+ * 删除某个Object
+ *
+ * @param bucketUrl
+ * @return
+ */
+ public static boolean deleteObject(String bucketUrl) {
+ try {
+ bucketUrl=bucketUrl.replace(oss_domain+"web","");
+ // 删除Object.
+ obsClient.deleteObject(bucketName, bucketUrl);
+ } catch (Exception e) {
+ e.printStackTrace();
+ return false;
+ } finally {
+ //ossClient.shutdown();
+ }
+ return true;
+ }
+
+
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/core/util/SinataUtil.java b/management/guns-admin/src/main/java/com/stylefeng/guns/core/util/SinataUtil.java
new file mode 100644
index 0000000..6043e3f
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/core/util/SinataUtil.java
@@ -0,0 +1,385 @@
+package com.stylefeng.guns.core.util;
+
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
+import java.net.URLEncoder;
+import java.text.DecimalFormat;
+import java.text.NumberFormat;
+import java.text.ParseException;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+
+/**
+ * 基本数据处理工具类
+ */
+public class SinataUtil {
+
+
+ /**
+ * List集合分页<br/>
+ * 创建人：Mryang<br/>
+ * 时间：2016年7月28日-下午2:58:14 <br/>
+ * @param <T>
+ * @param pageNo
+ * @param pageSize
+ * @param list
+ * @throws Exception List<UserOrderList> <br/>
+ */
+ public static <T> List<T> listpage(int pageNo, int pageSize, List<T> list) throws Exception {
+ List<T> result = new ArrayList<T>();
+ if (list != null && list.size() > 0) {
+ int allCount = list.size();
+ if(pageNo > 1 && allCount < pageSize) {
+ return new ArrayList<>();
+ }
+ int pageCount = (allCount + pageSize - 1) / pageSize;
+ if (pageNo >= pageCount) {
+ pageNo = pageCount;
+ }
+ int start = (pageNo - 1) * pageSize;
+ int end = pageNo * pageSize;
+ if (end >= allCount) {
+ end = allCount;
+ }
+ for (int i = start; i < end; i++) {
+ result.add(list.get(i));
+ }
+ }
+ return (result != null && result.size() > 0) ? result : new ArrayList<T>();
+ }
+
+ /**
+ * Double类型取整
+ * @param num
+ * @return
+ */
+ public static String doubleTrans(double num) {
+ return String.valueOf((long) num);
+ }
+
+ /**
+ * Double类型保留1位小数
+ *
+ * @param num
+ * @return
+ */
+ public static String doubleRetainOne(double num) {
+ DecimalFormat dfs = new DecimalFormat("0.0");
+ return dfs.format(num);
+ }
+
+ /**
+ * 5位随机数
+ * @return
+ */
+ public static synchronized String getFive() {
+ int i=(int)((Math.random()*9+1)*10000);
+ return i+"";
+ }
+ /**
+ * Double类型保留2位小数
+ *
+ * @param num
+ * @return
+ */
+ public static String doubleRetainTwo(double num) {
+ DecimalFormat dfs = new DecimalFormat("0.00");
+ String.format("%.2f", num);
+ return dfs.format(num);
+ }
+
+ /**
+ * Double类型保留1位小数（四舍五入）
+ *
+ * @param num
+ * @return
+ */
+ public static String doubleForwardOne(double num) {
+ return String.format("%.1f", num);
+ }
+
+ /**
+ * Double类型保留2位小数（四舍五入）
+ *
+ * @param num
+ * @return
+ */
+ public static String doubleForwardTwo(double num) {
+ return String.format("%.2f", num);
+ }
+
+ /**
+ * 字符串转换成Ascii
+ *
+ * @param value
+ * @return
+ */
+ public static String stringToAscii(String value) {
+ StringBuffer sbu = new StringBuffer();
+ char[] chars = value.toCharArray();
+ for (int i = 0; i < chars.length; i++) {
+ if (i != chars.length - 1) {
+ sbu.append((int) chars[i]);
+ } else {
+ sbu.append((int) chars[i]);
+ }
+ }
+ return sbu.toString();
+ }
+
+ /**
+ * 小数转换为百分比
+ *
+ * @param decimal
+ * @return
+ * @author TaoNingBo
+ */
+ public static String decTurnPercent(double decimal) {
+ NumberFormat num = NumberFormat.getPercentInstance();
+ num.setMaximumIntegerDigits(3);
+ num.setMaximumFractionDigits(2);
+ return num.format(decimal);
+ }
+
+ /**
+ * Ascii转换成字符串
+ *
+ * @param value
+ * @return
+ */
+ public static String asciiToString(String value) {
+ String[] chars = value.split(",");
+ StringBuffer sbu = new StringBuffer();
+ for (int i = 0; i < chars.length; i++) {
+ sbu.append((char) Integer.parseInt(chars[i]));
+ }
+ return sbu.toString();
+ }
+
+ /**
+ * 字符串转换unicode
+ *
+ * @param string
+ * @return
+ * @author TaoNingBo
+ */
+ public static String string2Unicode(String string) {
+ StringBuffer unicode = new StringBuffer();
+ for (int i = 0; i < string.length(); i++) {
+ // 取出每一个字符
+ char c = string.charAt(i);
+ // 转换为unicode
+ unicode.append("\\u" + Integer.toHexString(c));
+ }
+ return unicode.toString();
+ }
+
+ /**
+ * unicode 转字符串
+ *
+ * @param unicode
+ * @return
+ * @author TaoNingBo
+ */
+ public static String unicode2String(String unicode) {
+ StringBuffer string = new StringBuffer();
+ String[] hex = unicode.split("\\\\u");
+ for (int i = 1; i < hex.length; i++) {
+ // 转换出每一个代码点
+ int data = Integer.parseInt(hex[i], 16);
+ // 追加成string
+ string.append((char) data);
+ }
+ return string.toString();
+ }
+
+ /**
+ * 字符串编码转换的实现方法
+ *
+ * @param str
+ * 待转换编码的字符串
+ * @param newCharset
+ * 目标编码
+ * @return
+ * @throws UnsupportedEncodingException
+ */
+ public static String changeCharset(String str, String newCharset) throws UnsupportedEncodingException {
+ if (str != null) {
+ // 用默认字符编码解码字符串。
+ byte[] bs = str.getBytes();
+ // 用新的字符编码生成字符串
+ return new String(bs, newCharset);
+ }
+ return null;
+ }
+
+ /**
+ * 注： \n 回车( ) \t 水平制表符( ) \s 空格(\u0008) \r 换行( )
+ *
+ * @param str
+ * @return
+ */
+ public static String replaceBlank(String str) {
+ String dest = "";
+ if (str != null) {
+ Pattern p = Pattern.compile("\\s*|\t|\r|\n");
+ Matcher m = p.matcher(str);
+ dest = m.replaceAll("");
+ }
+ return dest;
+ }
+
+ /**
+ * 判断该字符串不能为空
+ *
+ * @param str
+ * @return
+ * @author TaoNingBo
+ */
+ public static boolean isNotEmpty(Object str) {
+ return !isEmpty(str);
+ }
+
+
+ public static boolean isNotEmptyUndefined(Object str) {
+ return !isEmpty(str) && !str.toString().equals("undefined");
+ }
+
+ /**
+ * 字符串编码转换的实现方法
+ *
+ * @param str
+ * 待转换编码的字符串
+ * @param oldCharset
+ * 原编码
+ * @param newCharset
+ * 目标编码
+ * @return
+ * @throws UnsupportedEncodingException
+ */
+ public static String changeCharset(String str, String oldCharset, String newCharset) throws UnsupportedEncodingException {
+ if (str != null) {
+ // 用旧的字符编码解码字符串。解码可能会出现异常。
+ byte[] bs = str.getBytes(oldCharset);
+ // 用新的字符编码生成字符串
+ return new String(bs, newCharset);
+ }
+ return null;
+ }
+
+ /**
+ * 给手机号码加分割符
+ *
+ * @param phone
+ * @return
+ * @author TaoNingBo
+ */
+ public static String splitPhone(String phone) {
+ if (isNotEmpty(phone)) {
+ String strone = phone.substring(0, 3);
+ String strtwo = phone.substring(strone.length(), 7);
+ String strthree = phone.substring(strtwo.length() + strone.length(), phone.length());
+ return strone + "-" + strtwo + "-" + strthree;
+ }
+ return "";
+ }
+
+ /**
+ * 非空判断
+ *
+ * @param str
+ * @return
+ * @author TaoNingBo
+ */
+ public static boolean isEmpty(Object str) {
+ return str == null || str.toString().length() == 0 || str.equals("") || str.toString().matches("\\s*");
+ }
+
+
+
+ /**
+ * 将List<{@link Object}>转换成List<{@link T}>
+ *
+ * @param list
+ * 将要转换的对象
+ * @param clazs
+ * 需要转换的泛型对象
+ * @return
+ * @author TaoNingBo
+ */
+ @SuppressWarnings("unchecked")
+ public static <T> List<T> fromToObject(List<?> list, Class<T> clazs) {
+ List<T> t = new ArrayList<T>();
+ for (Object object : list) {
+ t.add((T) object);
+ }
+ return t;
+ }
+
+ /**
+ * 生成 uuid， 即用来标识一笔单，也用做 nonce_str
+ * @return
+ */
+ public static String generateUUID() {
+ return UUID.randomUUID().toString().replaceAll("-", "").substring(0, 32);
+ }
+
+ /**
+ * 将List<{@link Object}>转换成List<{@link Map<String, Object>}>
+ *
+ * @param list
+ * @return
+ * @author TaoNingBo
+ */
+ @SuppressWarnings("unchecked")
+ public static List<Map<String, Object>> fromToObject_M(List<?> list) {
+ List<Map<String, Object>> t = new ArrayList<Map<String, Object>>();
+ for (Object object : list) {
+ t.add((Map<String, Object>) object);
+ }
+ return t;
+ }
+
+ /**
+ * URL编码
+ *
+ * @param url
+ * @return
+ */
+ @SuppressWarnings("deprecation")
+ public static String URLEncode(String url) {
+ try {
+ return URLEncoder.encode(url, "UTF-8");
+ } catch (UnsupportedEncodingException e) {
+ e.printStackTrace();
+ }
+ return URLEncoder.encode(url);
+ }
+
+ /**
+ * URL解码
+ *
+ * @param url
+ * @return
+ */
+ @SuppressWarnings("deprecation")
+ public static String URLDecode(String url) {
+ try {
+ return URLDecoder.decode(url, "UTF-8");
+ } catch (UnsupportedEncodingException e) {
+ e.printStackTrace();
+ }
+ return URLDecoder.decode(url);
+ }
+ public static void main(String[] args) throws ParseException {
+
+ System.out.println(doubleRetainTwo(0.0));
+
+ }
+
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/core/util/WoUtil.java b/management/guns-admin/src/main/java/com/stylefeng/guns/core/util/WoUtil.java
new file mode 100644
index 0000000..62f437f
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/core/util/WoUtil.java
@@ -0,0 +1,31 @@
+package com.stylefeng.guns.core.util;
+
+import org.apache.poi.hssf.usermodel.HSSFWorkbook;
+import org.apache.poi.ss.usermodel.Workbook;
+import org.apache.poi.xssf.usermodel.XSSFWorkbook;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.io.IOException;
+
+public class WoUtil {
+ public static Workbook ImportFile(MultipartFile importFile) {
+ Workbook book = null;
+ if(importFile == null)
+ {
+ //throw new WoException(SysConstant.ERR_EXCEL_NULL);
+ }
+ String fileName = importFile.getOriginalFilename();
+ try {
+ if(fileName.endsWith(".xlsx")) //当表格的后缀是".xlsx时"
+ {
+ book = new XSSFWorkbook(importFile.getInputStream());
+ }else
+ {
+ book = new HSSFWorkbook(importFile.getInputStream());
+ }
+ } catch (IOException e) {
+ //throw new WoException(e,SysConstant.ERR_EXCEL_NO);
+ }
+ return book;
+ }
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/api/ApiController.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/api/ApiController.java
new file mode 100644
index 0000000..c60adfa
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/api/ApiController.java
@@ -0,0 +1,80 @@
+package com.stylefeng.guns.modular.api;
+
+import com.stylefeng.guns.core.base.controller.BaseController;
+import com.stylefeng.guns.core.base.tips.ErrorTip;
+import com.stylefeng.guns.core.shiro.ShiroKit;
+import com.stylefeng.guns.core.shiro.ShiroUser;
+import com.stylefeng.guns.core.util.JwtTokenUtil;
+import com.stylefeng.guns.modular.system.dao.UserMapper;
+import com.stylefeng.guns.modular.system.model.User;
+import org.apache.shiro.authc.SimpleAuthenticationInfo;
+import org.apache.shiro.authc.UsernamePasswordToken;
+import org.apache.shiro.authc.credential.HashedCredentialsMatcher;
+import org.apache.shiro.crypto.hash.Md5Hash;
+import org.apache.shiro.util.ByteSource;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.HashMap;
+
+/**
+ * 接口控制器提供
+ *
+ * @author stylefeng
+ * @Date 2018/7/20 23:39
+ */
+@RestController
+@RequestMapping("/gunsApi")
+public class ApiController extends BaseController {
+
+ @Autowired
+ private UserMapper userMapper;
+
+ /**
+ * api登录接口，通过账号密码获取token
+ */
+ @RequestMapping("/auth")
+ public Object auth(@RequestParam("username") String username,
+ @RequestParam("password") String password) {
+
+ //封装请求账号密码为shiro可验证的token
+ UsernamePasswordToken usernamePasswordToken = new UsernamePasswordToken(username, password.toCharArray());
+
+ //获取数据库中的账号密码，准备比对
+ User user = userMapper.getByAccount(username);
+
+ String credentials = user.getPassword();
+ String salt = user.getSalt();
+ ByteSource credentialsSalt = new Md5Hash(salt);
+ SimpleAuthenticationInfo simpleAuthenticationInfo = new SimpleAuthenticationInfo(
+ new ShiroUser(), credentials, credentialsSalt, "");
+
+ //校验用户账号密码
+ HashedCredentialsMatcher md5CredentialsMatcher = new HashedCredentialsMatcher();
+ md5CredentialsMatcher.setHashAlgorithmName(ShiroKit.hashAlgorithmName);
+ md5CredentialsMatcher.setHashIterations(ShiroKit.hashIterations);
+ boolean passwordTrueFlag = md5CredentialsMatcher.doCredentialsMatch(
+ usernamePasswordToken, simpleAuthenticationInfo);
+
+ if (passwordTrueFlag) {
+ HashMap<String, Object> result = new HashMap<>();
+ result.put("token", JwtTokenUtil.generateToken(String.valueOf(user.getId())));
+ return result;
+ } else {
+ return new ErrorTip(500, "账号密码错误！");
+ }
+ }
+
+ /**
+ * 测试接口是否走鉴权
+ */
+ @RequestMapping(value = "/test", method = RequestMethod.POST)
+ public Object test() {
+ return SUCCESS_TIP;
+ }
+
+}
+
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/code/controller/CodeController.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/code/controller/CodeController.java
new file mode 100644
index 0000000..725029b
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/code/controller/CodeController.java
@@ -0,0 +1,61 @@
+package com.stylefeng.guns.modular.code.controller;
+
+import com.stylefeng.guns.core.base.controller.BaseController;
+import com.stylefeng.guns.core.config.properties.DruidProperties;
+import com.stylefeng.guns.generator.action.config.WebGeneratorConfig;
+import com.stylefeng.guns.generator.action.model.GenQo;
+import com.stylefeng.guns.modular.code.factory.DefaultTemplateFactory;
+import com.stylefeng.guns.modular.code.service.TableService;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+/**
+ * 代码生成控制器
+ *
+ * @author fengshuonan
+ * @Date 2017年11月30日16:39:19
+ */
+@Controller
+@RequestMapping("/code")
+public class CodeController extends BaseController {
+
+ private static String PREFIX = "/code";
+
+ @Autowired
+ private TableService tableService;
+
+ @Autowired
+ private DruidProperties druidProperties;
+
+ /**
+ * 跳转到代码生成主页
+ */
+ @RequestMapping("")
+ public String blackboard(Model model) {
+ model.addAttribute("tables", tableService.getAllTables());
+ model.addAttribute("params", DefaultTemplateFactory.getDefaultParams());
+ model.addAttribute("templates", DefaultTemplateFactory.getDefaultTemplates());
+ return PREFIX + "/code.html";
+ }
+
+ /**
+ * 生成代码
+ */
+ @ApiOperation("生成代码")
+ @RequestMapping(value = "/generate", method = RequestMethod.POST)
+ @ResponseBody
+ public Object generate(GenQo genQo) {
+ genQo.setUrl(druidProperties.getUrl());
+ genQo.setUserName(druidProperties.getUsername());
+ genQo.setPassword(druidProperties.getPassword());
+ WebGeneratorConfig webGeneratorConfig = new WebGeneratorConfig(genQo);
+ webGeneratorConfig.doMpGeneration();
+ webGeneratorConfig.doGunsGeneration();
+ return SUCCESS_TIP;
+ }
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/code/factory/DefaultTemplateFactory.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/code/factory/DefaultTemplateFactory.java
new file mode 100644
index 0000000..1cebee4
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/code/factory/DefaultTemplateFactory.java
@@ -0,0 +1,61 @@
+package com.stylefeng.guns.modular.code.factory;
+
+
+import com.stylefeng.guns.GunsApplication;
+import com.stylefeng.guns.core.CoreFlag;
+import com.stylefeng.guns.core.util.ToolUtil;
+import com.stylefeng.guns.generator.action.model.GenQo;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 模板种类构建器
+ *
+ * @author fengshuonan
+ * @date 2017-12-04-下午2:59
+ */
+public class DefaultTemplateFactory {
+
+ /**
+ * 获取所有的模板种类
+ */
+ public static List<Map<String,Object>> getDefaultTemplates(){
+ ArrayList<Map<String, Object>> templates = new ArrayList<>();
+ templates.add(create("controllerSwitch","controller-控制器模板"));
+ templates.add(create("entitySwitch","entity-实体模板"));
+ templates.add(create("serviceSwitch","service-service模板"));
+ templates.add(create("daoSwitch","dao-dao模板"));
+ templates.add(create("indexPageSwitch","indexPage-首页模板"));
+ templates.add(create("addPageSwitch","addPage-添加页面模板"));
+ templates.add(create("editPageSwitch","editPage-编辑页面模板"));
+ templates.add(create("jsSwitch","indexJs-主页js模板"));
+ templates.add(create("infoJsSwitch","infoJs-详情页js模板"));
+ templates.add(create("sqlSwitch","sql-sql语句模板"));
+ return templates;
+ }
+
+ /**
+ * 获取默认的参数
+ */
+ public static GenQo getDefaultParams(){
+ GenQo genQo = new GenQo();
+ genQo.setProjectPath(ToolUtil.getWebRootPath(null));
+ genQo.setAuthor("stylefeng");
+ genQo.setProjectPackage(GunsApplication.class.getPackage().getName());
+ genQo.setCorePackage(CoreFlag.class.getPackage().getName());
+ genQo.setIgnoreTabelPrefix("sys_");
+ genQo.setModuleName("system");
+ genQo.setParentMenuName("系统管理");
+ return genQo;
+ }
+
+ private static Map<String,Object> create(String key,String desc){
+ HashMap<String, Object> template = new HashMap<>();
+ template.put("key",key);
+ template.put("desc",desc);
+ return template;
+ }
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/code/service/TableService.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/code/service/TableService.java
new file mode 100644
index 0000000..f8f9478
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/code/service/TableService.java
@@ -0,0 +1,29 @@
+package com.stylefeng.guns.modular.code.service;
+
+import com.baomidou.mybatisplus.mapper.SqlRunner;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 获取数据库所有的表
+ *
+ * @author fengshuonan
+ * @date 2017-12-04-下午1:37
+ */
+@Service
+public class TableService {
+
+ @Value("${spring.datasource.db-name}")
+ private String dbName;
+
+ /**
+ * 获取当前数据库所有的表信息
+ */
+ public List<Map<String, Object>> getAllTables() {
+ String sql = "select TABLE_NAME as tableName,TABLE_COMMENT as tableComment from information_schema.`TABLES` where TABLE_SCHEMA = '" + dbName + "'";
+ return SqlRunner.db().selectList(sql);
+ }
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/DriverActivityController.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/DriverActivityController.java
new file mode 100644
index 0000000..43e8c5d
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/DriverActivityController.java
@@ -0,0 +1,359 @@
+package com.stylefeng.guns.modular.system.controller.general;
+
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.baomidou.mybatisplus.plugins.Page;
+import com.stylefeng.guns.core.base.controller.BaseController;
+import com.stylefeng.guns.core.common.constant.factory.PageFactory;
+import com.stylefeng.guns.core.shiro.ShiroKit;
+import com.stylefeng.guns.core.shiro.ShiroUser;
+import com.stylefeng.guns.core.util.DateUtil;
+import com.stylefeng.guns.core.util.SinataUtil;
+import com.stylefeng.guns.modular.system.model.*;
+import com.stylefeng.guns.modular.system.service.*;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.beans.factory.annotation.Autowired;
+import com.stylefeng.guns.core.log.LogObjectHolder;
+import org.springframework.web.bind.annotation.RequestParam;
+
+import java.math.BigDecimal;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 控制器
+ *
+ * @author fengshuonan
+ * @Date 2020-06-17 20:51:18
+ */
+@Controller
+@RequestMapping("/driverActivity")
+public class DriverActivityController extends BaseController {
+
+ private String PREFIX = "/system/driverActivity/";
+
+ @Autowired
+ private IDriverActivityService driverActivityService;
+
+ @Autowired
+ private IDriverActivityOnlineService driverActivityOnlineService;
+
+ @Autowired
+ private IDriverActivityOrderService driverActivityOrderService;
+
+ @Autowired
+ private IDriverActivityRegisteredService driverActivityRegisteredService;
+
+ @Autowired
+ private IDriverActivityHistoryService driverActivityHistoryService;
+
+ /**
+ * 跳转到首页
+ */
+ @RequestMapping("")
+ public String index() {
+ return PREFIX + "driverActivity.html";
+ }
+
+ /**
+ * 跳转到添加
+ */
+ @RequestMapping("/driverActivity_add")
+ public String driverActivityAdd() {
+ return PREFIX + "driverActivity_add.html";
+ }
+
+ /**
+ * 跳转领取统计
+ * @return
+ */
+ @RequestMapping("/receiveRecord")
+ public String receiveRecord(Model model,Integer activityId){
+ model.addAttribute("activityId",activityId);
+ DriverActivity driverActivity = driverActivityService.selectById(activityId);
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+ model.addAttribute("startTime", sdf.format(driverActivity.getStartTime()));
+ model.addAttribute("endTime", sdf.format(driverActivity.getEndTime()));
+ DriverActivityRegistered driverActivityRegistered = driverActivityRegisteredService.selectOne(new EntityWrapper<DriverActivityRegistered>().eq("driverActivityId",activityId).eq("type",1));
+ model.addAttribute("id1",driverActivityRegistered.getId());
+ driverActivityRegistered = driverActivityRegisteredService.selectOne(new EntityWrapper<DriverActivityRegistered>().eq("driverActivityId",activityId).eq("type",2));
+ model.addAttribute("id2",driverActivityRegistered.getId());
+ DriverActivityOnline driverActivityOnline = driverActivityOnlineService.selectOne(new EntityWrapper<DriverActivityOnline>().eq("driverActivityId",activityId).eq("type",1));
+ model.addAttribute("id3",driverActivityOnline.getId());
+ //统计专车在线
+ driverActivityOnline = driverActivityOnlineService.selectOne(new EntityWrapper<DriverActivityOnline>().eq("driverActivityId",activityId).eq("type",2));
+ model.addAttribute("id4",driverActivityOnline.getId());
+ driverActivityOnline = driverActivityOnlineService.selectOne(new EntityWrapper<DriverActivityOnline>().eq("driverActivityId",activityId).eq("type",3));
+ model.addAttribute("id5",driverActivityOnline.getId());
+ DriverActivityOrder driverActivityOrder = driverActivityOrderService.selectOne(new EntityWrapper<DriverActivityOrder>().eq("driverActivityId",activityId));
+ model.addAttribute("id6",driverActivityOrder.getId());
+ return PREFIX + "receiveRecord.html";
+ }
+
+ @RequestMapping(value = "/receiveRecordDetail")
+ @ResponseBody
+ public Object receiveRecordDetail(String createTime,Integer activityId) {
+ Date startTimes = null;
+ Date endTimes = null;
+ if (SinataUtil.isNotEmpty(createTime)){
+ String[] timeArray = createTime.split(" - ");
+ startTimes = DateUtil.getDate_str3(timeArray[0]+" 00:00:00");
+ endTimes = DateUtil.getDate_str3(timeArray[1]+" 23:59:59");
+ }else{
+ DriverActivity driverActivity = driverActivityService.selectById(activityId);
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+ startTimes=driverActivity.getStartTime();
+ endTimes=driverActivity.getEndTime();
+ }
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+ Map<String,Object> map = new HashMap<>();
+ DriverActivityRegistered driverActivityRegistered = driverActivityRegisteredService.selectOne(new EntityWrapper<DriverActivityRegistered>().eq("driverActivityId",activityId)
+ .eq("type",1).where("startTime >= '" + sdf.format(startTimes) + "' and endTime < '" + sdf.format(endTimes) + "'").orderBy("insertTime desc limit 0, 1"));
+ //统计邀请司机注册
+ List<DriverActivityHistory> historyList = driverActivityHistoryService.selectList(new EntityWrapper<DriverActivityHistory>()
+ .between("insertTime",startTimes,endTimes).eq("type",1).eq("activityId",driverActivityRegistered.getId()).eq("carryOut",2));
+ Double totalMOney=0d;
+ Double money=0d;
+ Integer number=0;
+ for(DriverActivityHistory history:historyList){
+ totalMOney+=history.getMoney();
+ money+=history.getMoney();
+ number+=1;
+ }
+ map.put("money1",money);
+ map.put("number1",number);
+ driverActivityRegistered = driverActivityRegisteredService.selectOne(new EntityWrapper<DriverActivityRegistered>().eq("driverActivityId",activityId)
+ .eq("type",2).where("startTime >= '" + sdf.format(startTimes) + "' and endTime < '" + sdf.format(endTimes) + "'").orderBy("insertTime desc limit 0, 1"));
+ //统计邀请用户注册
+ historyList = driverActivityHistoryService.selectList(new EntityWrapper<DriverActivityHistory>().between("insertTime",startTimes,endTimes).eq("type",2).eq("activityId",driverActivityRegistered.getId()).eq("carryOut",2));
+ money=0d;
+ number=0;
+ for(DriverActivityHistory history:historyList){
+ totalMOney+=history.getMoney();
+ money+=history.getMoney();
+ number+=1;
+ }
+ map.put("money2",money);
+ map.put("number2",number);
+ DriverActivityOnline driverActivityOnline = driverActivityOnlineService.selectOne(new EntityWrapper<DriverActivityOnline>().eq("driverActivityId",activityId)
+ .eq("type",1).where("startTime >= '" + sdf.format(startTimes) + "' and endTime < '" + sdf.format(endTimes) + "'").orderBy("insertTime desc limit 0, 1"));
+ //统计专车在线
+ historyList = driverActivityHistoryService.selectList(new EntityWrapper<DriverActivityHistory>().between("insertTime",startTimes,endTimes).eq("type",3).eq("activityId",driverActivityOnline.getId()).eq("carryOut",2));
+ money=0d;
+ number=0;
+ for(DriverActivityHistory history:historyList){
+ totalMOney+=history.getMoney();
+ money+=history.getMoney();
+ number+=1;
+ }
+ map.put("money3",money);
+ map.put("number3",number);
+ driverActivityOnline = driverActivityOnlineService.selectOne(new EntityWrapper<DriverActivityOnline>().eq("driverActivityId",activityId)
+ .eq("type",2).where("startTime >= '" + sdf.format(startTimes) + "' and endTime < '" + sdf.format(endTimes) + "'").orderBy("insertTime desc limit 0, 1"));
+ //统计出租车在线
+ historyList = driverActivityHistoryService.selectList(new EntityWrapper<DriverActivityHistory>().between("insertTime",startTimes,endTimes).eq("type",3).eq("activityId",driverActivityOnline.getId()).eq("carryOut",2));
+ money=0d;
+ number=0;
+ for(DriverActivityHistory history:historyList){
+ totalMOney+=history.getMoney();
+ money+=history.getMoney();
+ number+=1;
+ }
+ map.put("money4",money);
+ map.put("number4",number);
+ driverActivityOnline = driverActivityOnlineService.selectOne(new EntityWrapper<DriverActivityOnline>().eq("driverActivityId",activityId)
+ .eq("type",3).where("startTime >= '" + sdf.format(startTimes) + "' and endTime < '" + sdf.format(endTimes) + "'").orderBy("insertTime desc limit 0, 1"));
+ //统计城际在线
+ historyList = driverActivityHistoryService.selectList(new EntityWrapper<DriverActivityHistory>().between("insertTime",startTimes,endTimes).eq("type",3).eq("activityId",driverActivityOnline.getId()).eq("carryOut",2));
+ money=0d;
+ number=0;
+ for(DriverActivityHistory history:historyList){
+ totalMOney+=history.getMoney();
+ money+=history.getMoney();
+ number+=1;
+ }
+ map.put("money5",money);
+ map.put("number5",number);
+ DriverActivityOrder driverActivityOrder = driverActivityOrderService.selectOne(new EntityWrapper<DriverActivityOrder>()
+ .eq("driverActivityId",activityId).where("startTime >= '" + sdf.format(startTimes) + "' and endTime < '" + sdf.format(endTimes) + "'").orderBy("insertTime desc limit 0, 1"));
+ //统计订单数
+ historyList = driverActivityHistoryService.selectList(new EntityWrapper<DriverActivityHistory>().between("insertTime",startTimes,endTimes).eq("type",4).eq("activityId",driverActivityOrder.getId()).eq("carryOut",2));
+ money=0d;
+ number=0;
+ for(DriverActivityHistory history:historyList){
+ totalMOney+=history.getMoney();
+ money+=history.getMoney();
+ number+=1;
+ }
+ map.put("money6",money);
+ map.put("number6",number);
+ map.put("totalMOney",totalMOney);
+ return map;
+ }
+ /**
+ * 跳转到修改
+ */
+ @RequestMapping("/driverActivity_update/{driverActivityId}")
+ public String driverActivityUpdate(@PathVariable Integer driverActivityId, Model model) {
+ DriverActivity driverActivity = driverActivityService.selectById(driverActivityId);
+ model.addAttribute("item",driverActivity);
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+ model.addAttribute("startTime", sdf.format(driverActivity.getStartTime()));
+ model.addAttribute("endTime", sdf.format(driverActivity.getEndTime()));
+ model.addAttribute("online1",driverActivityOnlineService.selectOne(new EntityWrapper<DriverActivityOnline>().eq("driverActivityId",driverActivityId).eq("type",1)));
+ model.addAttribute("online2",driverActivityOnlineService.selectOne(new EntityWrapper<DriverActivityOnline>().eq("driverActivityId",driverActivityId).eq("type",2)));
+ model.addAttribute("online3",driverActivityOnlineService.selectOne(new EntityWrapper<DriverActivityOnline>().eq("driverActivityId",driverActivityId).eq("type",3)));
+ DriverActivityOrder driverActivityOrder = driverActivityOrderService.selectOne(new EntityWrapper<DriverActivityOrder>().eq("driverActivityId",driverActivityId));
+ if(driverActivityOrder!=null){
+ model.addAttribute("startTime1", driverActivityOrder.getStart()+" - "+driverActivityOrder.getEnd());
+ }else{
+ model.addAttribute("startTime1", "");
+ }
+ model.addAttribute("order",driverActivityOrder);
+ model.addAttribute("regist1",driverActivityRegisteredService.selectOne(new EntityWrapper<DriverActivityRegistered>().eq("driverActivityId",driverActivityId).eq("type",1)));
+ model.addAttribute("regist2",driverActivityRegisteredService.selectOne(new EntityWrapper<DriverActivityRegistered>().eq("driverActivityId",driverActivityId).eq("type",2)));
+
+ LogObjectHolder.me().set(driverActivity);
+ return PREFIX + "driverActivity_edit.html";
+ }
+
+ /**
+ * 获取列表
+ */
+ @RequestMapping(value = "/list")
+ @ResponseBody
+ public Object list(String createTime,String name) {
+ ShiroUser user = ShiroKit.getUser();
+ String beginTime = null;
+ String endTime = null;
+ if (SinataUtil.isNotEmpty(createTime)){
+ String[] timeArray = createTime.split(" - ");
+ beginTime = timeArray[0];
+ endTime = timeArray[1];
+ }
+ Page<Map<String, Object>> page = new PageFactory<Map<String, Object>>().defaultPage();
+ page.setRecords(driverActivityService.getList(page,beginTime,endTime,name,user.getRoleType(),user.getObjectId()));
+ return super.packForBT(page);
+ }
+
+ /**
+ * 新增
+ */
+ @RequestMapping(value = "/add")
+ @ResponseBody
+ public Object add(String staTime, String startTime, String num1, Double num2
+ , Double num3
+ , Integer num4
+ , Double num5
+ , Integer num6
+ , Double num7
+ , Integer num8
+ , Double num9
+ , Integer num10
+ , Double num11) {
+
+ driverActivityService.insertOrUpdate(null,staTime,startTime, num1, num2
+ , num3
+ , num4
+ , num5
+ , num6
+ , num7
+ , num8
+ , num9
+ , num10
+ , num11);
+ return SUCCESS_TIP;
+ }
+
+ /**
+ * 删除
+ */
+ @RequestMapping(value = "/delete")
+ @ResponseBody
+ public Object delete(@RequestParam Integer driverActivityId) {
+ driverActivityService.deleteById(driverActivityId);
+ return SUCCESS_TIP;
+ }
+
+ /**
+ * 修改
+ */
+ @RequestMapping(value = "/update")
+ @ResponseBody
+ public Object update(Integer id,String staTime, String startTime, String num1, Double num2
+ , Double num3
+ , Integer num4
+ , Double num5
+ , Integer num6
+ , Double num7
+ , Integer num8
+ , Double num9
+ , Integer num10
+ , Double num11) {
+ driverActivityService.insertOrUpdate(id,staTime,startTime, num1, num2
+ , num3
+ , num4
+ , num5
+ , num6
+ , num7
+ , num8
+ , num9
+ , num10
+ , num11);
+ return SUCCESS_TIP;
+ }
+ @RequestMapping(value = "/updateStatus")
+ @ResponseBody
+ public Object updateStatus(DriverActivity driverActivity) {
+ driverActivityService.updateById(driverActivity);
+ return SUCCESS_TIP;
+ }
+
+ @RequestMapping("/driverActivity_detail/{driverActivityId}")
+ public String driverActivityDetail(@PathVariable Integer driverActivityId, Model model) {
+ DriverActivity driverActivity = driverActivityService.selectById(driverActivityId);
+ model.addAttribute("item",driverActivity);
+
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+ model.addAttribute("startTime", sdf.format(driverActivity.getStartTime()));
+ model.addAttribute("endTime", sdf.format(driverActivity.getEndTime()));
+
+ model.addAttribute("online1",driverActivityOnlineService.selectOne(new EntityWrapper<DriverActivityOnline>().eq("driverActivityId",driverActivityId).eq("type",1)));
+ model.addAttribute("online2",driverActivityOnlineService.selectOne(new EntityWrapper<DriverActivityOnline>().eq("driverActivityId",driverActivityId).eq("type",2)));
+ model.addAttribute("online3",driverActivityOnlineService.selectOne(new EntityWrapper<DriverActivityOnline>().eq("driverActivityId",driverActivityId).eq("type",3)));
+ model.addAttribute("order",driverActivityOrderService.selectOne(new EntityWrapper<DriverActivityOrder>().eq("driverActivityId",driverActivityId)));
+ model.addAttribute("regist1",driverActivityRegisteredService.selectOne(new EntityWrapper<DriverActivityRegistered>().eq("driverActivityId",driverActivityId).eq("type",1)));
+ model.addAttribute("regist2",driverActivityRegisteredService.selectOne(new EntityWrapper<DriverActivityRegistered>().eq("driverActivityId",driverActivityId).eq("type",2)));
+ LogObjectHolder.me().set(driverActivity);
+ return PREFIX + "driverActivity_detail.html";
+ }
+
+ /**
+ * 跳转到立即处理页面
+ */
+ @RequestMapping("/driverActivity_immediately/{id}")
+ public String driverActivityImmediately(@PathVariable Integer id, Model model) {
+ model.addAttribute("id",id);
+ return PREFIX + "driverActivity_immediately.html";
+ }
+ /**
+ * 立即处理操作
+ */
+ @RequestMapping(value = "/immediately")
+ @ResponseBody
+ public Object immediately(@RequestParam Integer id,@RequestParam Integer state,@RequestParam String remark) {
+ DriverActivity driverActivity = driverActivityService.selectById(id);
+ if (SinataUtil.isNotEmpty(driverActivity)){
+ driverActivity.setStatus(state);
+ driverActivity.setRemark(remark);
+ driverActivityService.updateById(driverActivity);
+ }
+ return SUCCESS_TIP;
+ }
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/DriverActivityHistoryController.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/DriverActivityHistoryController.java
new file mode 100644
index 0000000..9491413
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/DriverActivityHistoryController.java
@@ -0,0 +1,113 @@
+package com.stylefeng.guns.modular.system.controller.general;
+
+import com.baomidou.mybatisplus.plugins.Page;
+import com.stylefeng.guns.core.base.controller.BaseController;
+import com.stylefeng.guns.core.common.constant.factory.PageFactory;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.beans.factory.annotation.Autowired;
+import com.stylefeng.guns.core.log.LogObjectHolder;
+import org.springframework.web.bind.annotation.RequestParam;
+import com.stylefeng.guns.modular.system.model.DriverActivityHistory;
+import com.stylefeng.guns.modular.system.service.IDriverActivityHistoryService;
+
+import java.util.Map;
+
+/**
+ * 控制器
+ *
+ * @author fengshuonan
+ * @Date 2020-06-17 20:51:26
+ */
+@Controller
+@RequestMapping("/driverActivityHistory")
+public class DriverActivityHistoryController extends BaseController {
+
+ private String PREFIX = "/system/driverActivityHistory/";
+
+ @Autowired
+ private IDriverActivityHistoryService driverActivityHistoryService;
+
+ /**
+ * 跳转到首页
+ */
+ @RequestMapping("")
+ public String index(Model model,Integer type,Integer activityId) {
+ model.addAttribute("type",type);
+ model.addAttribute("activityId",activityId);
+ return PREFIX + "driverActivityHistory.html";
+ }
+
+ /**
+ * 跳转到添加
+ */
+ @RequestMapping("/driverActivityHistory_add")
+ public String driverActivityHistoryAdd() {
+ return PREFIX + "driverActivityHistory_add.html";
+ }
+
+ /**
+ * 跳转到修改
+ */
+ @RequestMapping("/driverActivityHistory_update/{driverActivityHistoryId}")
+ public String driverActivityHistoryUpdate(@PathVariable Integer driverActivityHistoryId, Model model) {
+ DriverActivityHistory driverActivityHistory = driverActivityHistoryService.selectById(driverActivityHistoryId);
+ model.addAttribute("item",driverActivityHistory);
+ LogObjectHolder.me().set(driverActivityHistory);
+ return PREFIX + "driverActivityHistory_edit.html";
+ }
+
+ /**
+ * 获取列表
+ */
+ @RequestMapping(value = "/list")
+ @ResponseBody
+ public Object list(Integer type,Integer activityId) {
+
+ Page<Map<String, Object>> page = new PageFactory<Map<String, Object>>().defaultPage();
+ page.setRecords(driverActivityHistoryService.getList(page,activityId,type));
+ return super.packForBT(page);
+ }
+
+ /**
+ * 新增
+ */
+ @RequestMapping(value = "/add")
+ @ResponseBody
+ public Object add(DriverActivityHistory driverActivityHistory) {
+ driverActivityHistoryService.insert(driverActivityHistory);
+ return SUCCESS_TIP;
+ }
+
+ /**
+ * 删除
+ */
+ @RequestMapping(value = "/delete")
+ @ResponseBody
+ public Object delete(@RequestParam Integer driverActivityHistoryId) {
+ driverActivityHistoryService.deleteById(driverActivityHistoryId);
+ return SUCCESS_TIP;
+ }
+
+ /**
+ * 修改
+ */
+ @RequestMapping(value = "/update")
+ @ResponseBody
+ public Object update(DriverActivityHistory driverActivityHistory) {
+ driverActivityHistoryService.updateById(driverActivityHistory);
+ return SUCCESS_TIP;
+ }
+
+ /**
+ * 详情
+ */
+ @RequestMapping(value = "/detail/{driverActivityHistoryId}")
+ @ResponseBody
+ public Object detail(@PathVariable("driverActivityHistoryId") Integer driverActivityHistoryId) {
+ return driverActivityHistoryService.selectById(driverActivityHistoryId);
+ }
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/DriverActivityOnlineController.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/DriverActivityOnlineController.java
new file mode 100644
index 0000000..181b816
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/DriverActivityOnlineController.java
@@ -0,0 +1,104 @@
+package com.stylefeng.guns.modular.system.controller.general;
+
+import com.stylefeng.guns.core.base.controller.BaseController;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.beans.factory.annotation.Autowired;
+import com.stylefeng.guns.core.log.LogObjectHolder;
+import org.springframework.web.bind.annotation.RequestParam;
+import com.stylefeng.guns.modular.system.model.DriverActivityOnline;
+import com.stylefeng.guns.modular.system.service.IDriverActivityOnlineService;
+
+/**
+ * 控制器
+ *
+ * @author fengshuonan
+ * @Date 2020-06-17 20:51:31
+ */
+@Controller
+@RequestMapping("/driverActivityOnline")
+public class DriverActivityOnlineController extends BaseController {
+
+ private String PREFIX = "/system/driverActivityOnline/";
+
+ @Autowired
+ private IDriverActivityOnlineService driverActivityOnlineService;
+
+ /**
+ * 跳转到首页
+ */
+ @RequestMapping("")
+ public String index() {
+ return PREFIX + "driverActivityOnline.html";
+ }
+
+ /**
+ * 跳转到添加
+ */
+ @RequestMapping("/driverActivityOnline_add")
+ public String driverActivityOnlineAdd() {
+ return PREFIX + "driverActivityOnline_add.html";
+ }
+
+ /**
+ * 跳转到修改
+ */
+ @RequestMapping("/driverActivityOnline_update/{driverActivityOnlineId}")
+ public String driverActivityOnlineUpdate(@PathVariable Integer driverActivityOnlineId, Model model) {
+ DriverActivityOnline driverActivityOnline = driverActivityOnlineService.selectById(driverActivityOnlineId);
+ model.addAttribute("item",driverActivityOnline);
+ LogObjectHolder.me().set(driverActivityOnline);
+ return PREFIX + "driverActivityOnline_edit.html";
+ }
+
+ /**
+ * 获取列表
+ */
+ @RequestMapping(value = "/list")
+ @ResponseBody
+ public Object list(String condition) {
+ return driverActivityOnlineService.selectList(null);
+ }
+
+ /**
+ * 新增
+ */
+ @RequestMapping(value = "/add")
+ @ResponseBody
+ public Object add(DriverActivityOnline driverActivityOnline) {
+ driverActivityOnlineService.insert(driverActivityOnline);
+ return SUCCESS_TIP;
+ }
+
+ /**
+ * 删除
+ */
+ @RequestMapping(value = "/delete")
+ @ResponseBody
+ public Object delete(@RequestParam Integer driverActivityOnlineId) {
+ driverActivityOnlineService.deleteById(driverActivityOnlineId);
+ return SUCCESS_TIP;
+ }
+
+ /**
+ * 修改
+ */
+ @RequestMapping(value = "/update")
+ @ResponseBody
+ public Object update(DriverActivityOnline driverActivityOnline) {
+ driverActivityOnlineService.updateById(driverActivityOnline);
+ return SUCCESS_TIP;
+ }
+
+ /**
+ * 详情
+ */
+ @RequestMapping(value = "/detail/{driverActivityOnlineId}")
+ @ResponseBody
+ public Object detail(@PathVariable("driverActivityOnlineId") Integer driverActivityOnlineId) {
+ return driverActivityOnlineService.selectById(driverActivityOnlineId);
+ }
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/DriverActivityOrderController.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/DriverActivityOrderController.java
new file mode 100644
index 0000000..f527036
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/DriverActivityOrderController.java
@@ -0,0 +1,104 @@
+package com.stylefeng.guns.modular.system.controller.general;
+
+import com.stylefeng.guns.core.base.controller.BaseController;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.beans.factory.annotation.Autowired;
+import com.stylefeng.guns.core.log.LogObjectHolder;
+import org.springframework.web.bind.annotation.RequestParam;
+import com.stylefeng.guns.modular.system.model.DriverActivityOrder;
+import com.stylefeng.guns.modular.system.service.IDriverActivityOrderService;
+
+/**
+ * 控制器
+ *
+ * @author fengshuonan
+ * @Date 2020-06-17 20:51:36
+ */
+@Controller
+@RequestMapping("/driverActivityOrder")
+public class DriverActivityOrderController extends BaseController {
+
+ private String PREFIX = "/system/driverActivityOrder/";
+
+ @Autowired
+ private IDriverActivityOrderService driverActivityOrderService;
+
+ /**
+ * 跳转到首页
+ */
+ @RequestMapping("")
+ public String index() {
+ return PREFIX + "driverActivityOrder.html";
+ }
+
+ /**
+ * 跳转到添加
+ */
+ @RequestMapping("/driverActivityOrder_add")
+ public String driverActivityOrderAdd() {
+ return PREFIX + "driverActivityOrder_add.html";
+ }
+
+ /**
+ * 跳转到修改
+ */
+ @RequestMapping("/driverActivityOrder_update/{driverActivityOrderId}")
+ public String driverActivityOrderUpdate(@PathVariable Integer driverActivityOrderId, Model model) {
+ DriverActivityOrder driverActivityOrder = driverActivityOrderService.selectById(driverActivityOrderId);
+ model.addAttribute("item",driverActivityOrder);
+ LogObjectHolder.me().set(driverActivityOrder);
+ return PREFIX + "driverActivityOrder_edit.html";
+ }
+
+ /**
+ * 获取列表
+ */
+ @RequestMapping(value = "/list")
+ @ResponseBody
+ public Object list(String condition) {
+ return driverActivityOrderService.selectList(null);
+ }
+
+ /**
+ * 新增
+ */
+ @RequestMapping(value = "/add")
+ @ResponseBody
+ public Object add(DriverActivityOrder driverActivityOrder) {
+ driverActivityOrderService.insert(driverActivityOrder);
+ return SUCCESS_TIP;
+ }
+
+ /**
+ * 删除
+ */
+ @RequestMapping(value = "/delete")
+ @ResponseBody
+ public Object delete(@RequestParam Integer driverActivityOrderId) {
+ driverActivityOrderService.deleteById(driverActivityOrderId);
+ return SUCCESS_TIP;
+ }
+
+ /**
+ * 修改
+ */
+ @RequestMapping(value = "/update")
+ @ResponseBody
+ public Object update(DriverActivityOrder driverActivityOrder) {
+ driverActivityOrderService.updateById(driverActivityOrder);
+ return SUCCESS_TIP;
+ }
+
+ /**
+ * 详情
+ */
+ @RequestMapping(value = "/detail/{driverActivityOrderId}")
+ @ResponseBody
+ public Object detail(@PathVariable("driverActivityOrderId") Integer driverActivityOrderId) {
+ return driverActivityOrderService.selectById(driverActivityOrderId);
+ }
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/DriverActivityRegisteredController.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/DriverActivityRegisteredController.java
new file mode 100644
index 0000000..4def063
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/DriverActivityRegisteredController.java
@@ -0,0 +1,104 @@
+package com.stylefeng.guns.modular.system.controller.general;
+
+import com.stylefeng.guns.core.base.controller.BaseController;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.beans.factory.annotation.Autowired;
+import com.stylefeng.guns.core.log.LogObjectHolder;
+import org.springframework.web.bind.annotation.RequestParam;
+import com.stylefeng.guns.modular.system.model.DriverActivityRegistered;
+import com.stylefeng.guns.modular.system.service.IDriverActivityRegisteredService;
+
+/**
+ * 控制器
+ *
+ * @author fengshuonan
+ * @Date 2020-06-17 20:51:43
+ */
+@Controller
+@RequestMapping("/driverActivityRegistered")
+public class DriverActivityRegisteredController extends BaseController {
+
+ private String PREFIX = "/system/driverActivityRegistered/";
+
+ @Autowired
+ private IDriverActivityRegisteredService driverActivityRegisteredService;
+
+ /**
+ * 跳转到首页
+ */
+ @RequestMapping("")
+ public String index() {
+ return PREFIX + "driverActivityRegistered.html";
+ }
+
+ /**
+ * 跳转到添加
+ */
+ @RequestMapping("/driverActivityRegistered_add")
+ public String driverActivityRegisteredAdd() {
+ return PREFIX + "driverActivityRegistered_add.html";
+ }
+
+ /**
+ * 跳转到修改
+ */
+ @RequestMapping("/driverActivityRegistered_update/{driverActivityRegisteredId}")
+ public String driverActivityRegisteredUpdate(@PathVariable Integer driverActivityRegisteredId, Model model) {
+ DriverActivityRegistered driverActivityRegistered = driverActivityRegisteredService.selectById(driverActivityRegisteredId);
+ model.addAttribute("item",driverActivityRegistered);
+ LogObjectHolder.me().set(driverActivityRegistered);
+ return PREFIX + "driverActivityRegistered_edit.html";
+ }
+
+ /**
+ * 获取列表
+ */
+ @RequestMapping(value = "/list")
+ @ResponseBody
+ public Object list(String condition) {
+ return driverActivityRegisteredService.selectList(null);
+ }
+
+ /**
+ * 新增
+ */
+ @RequestMapping(value = "/add")
+ @ResponseBody
+ public Object add(DriverActivityRegistered driverActivityRegistered) {
+ driverActivityRegisteredService.insert(driverActivityRegistered);
+ return SUCCESS_TIP;
+ }
+
+ /**
+ * 删除
+ */
+ @RequestMapping(value = "/delete")
+ @ResponseBody
+ public Object delete(@RequestParam Integer driverActivityRegisteredId) {
+ driverActivityRegisteredService.deleteById(driverActivityRegisteredId);
+ return SUCCESS_TIP;
+ }
+
+ /**
+ * 修改
+ */
+ @RequestMapping(value = "/update")
+ @ResponseBody
+ public Object update(DriverActivityRegistered driverActivityRegistered) {
+ driverActivityRegisteredService.updateById(driverActivityRegistered);
+ return SUCCESS_TIP;
+ }
+
+ /**
+ * 详情
+ */
+ @RequestMapping(value = "/detail/{driverActivityRegisteredId}")
+ @ResponseBody
+ public Object detail(@PathVariable("driverActivityRegisteredId") Integer driverActivityRegisteredId) {
+ return driverActivityRegisteredService.selectById(driverActivityRegisteredId);
+ }
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/HomeController.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/HomeController.java
new file mode 100644
index 0000000..3ebfebd
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/HomeController.java
@@ -0,0 +1,525 @@
+package com.stylefeng.guns.modular.system.controller.general;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.baomidou.mybatisplus.mapper.Wrapper;
+import com.stylefeng.guns.core.shiro.ShiroKit;
+import com.stylefeng.guns.core.util.SinataUtil;
+import com.stylefeng.guns.core.util.ToolUtil;
+import com.stylefeng.guns.modular.system.model.*;
+import com.stylefeng.guns.modular.system.service.*;
+import com.stylefeng.guns.modular.system.util.DateUtil;
+import com.stylefeng.guns.modular.system.util.RedisUtil;
+import com.stylefeng.guns.modular.system.util.ResultUtil;
+import com.sun.org.apache.regexp.internal.RE;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import java.math.BigDecimal;
+import java.util.*;
+
+/**
+ * 首页统计
+ */
+@Controller
+@RequestMapping("/home")
+public class HomeController {
+
+ @Autowired
+ private ITUserService tUserService;
+
+ @Autowired
+ private ITDriverService tDriverService;
+
+ @Autowired
+ private ITOrderTaxiService tOrderTaxiService;
+
+ @Autowired
+ private ITCarService tCarService;
+
+ @Autowired
+ private RedisUtil redisUtil;
+
+ @Autowired
+ private IUserService userService;
+
+ @Autowired
+ private ITCompanyService tCompanyService;
+
+ @Autowired
+ private ITCarBrandService carBrandService;
+
+ @Autowired
+ private ITCarModelService carModelService;
+
+ private List<TCompany> companys = null;
+
+
+ @Autowired
+ private ITOrderPrivateCarService itOrderPrivateCarService;
+
+ @Autowired
+ private ITOrderCrossCityService itOrderCrossCityService;
+
+ @Autowired
+ private ITOrderLogisticsService itOrderLogisticsService;
+
+ @Autowired
+ private IDriverOnlineService driverOnlineService;
+
+
+ @RequestMapping("/openNetCarInfo")
+ public Object openNetCarInfo(Integer id, Model model){
+ model.addAttribute("id", id);
+ return "/netCarInfo.html";
+ }
+
+ @RequestMapping("/showDriverOnline")
+ public String showDriverOnline(){
+ return "/driverOnline.html";
+ }
+
+
+
+
+ @ResponseBody
+ @PostMapping("/getSumData")
+ public Object getSumData(Integer companyId, Date addDate, Date start, Date end){
+ Integer id = ShiroKit.getUser().getId();
+ User user = userService.selectById(id);
+ if(companyId == null && user.getRoleType() != 1){
+ companyId = user.getObjectId();
+ }
+ Map<String, Object> map = new HashMap<>();
+ Date date = new Date();
+ Calendar calendar1 = Calendar.getInstance();
+ Calendar calendar2 = Calendar.getInstance();
+ Calendar calendar3 = Calendar.getInstance();
+ Calendar calendar4 = Calendar.getInstance();
+ if(addDate == null){
+ calendar1.setTime(date);
+ calendar2.setTime(date);
+ }else{
+ calendar1.setTime(addDate);
+ calendar2.setTime(addDate);
+ }
+ if(start == null || end == null){
+ calendar3.setTime(date);
+ calendar4.setTime(date);
+ }else{
+ calendar3.setTime(start);
+ calendar4.setTime(end);
+ }
+ calendar1.set(Calendar.HOUR_OF_DAY, 00);
+ calendar1.set(Calendar.MINUTE, 00);
+ calendar1.set(Calendar.SECOND, 00);
+ calendar2.set(Calendar.HOUR_OF_DAY, 23);
+ calendar2.set(Calendar.MINUTE, 59);
+ calendar2.set(Calendar.SECOND, 59);
+ calendar3.set(Calendar.HOUR_OF_DAY, 00);
+ calendar3.set(Calendar.MINUTE, 00);
+ calendar3.set(Calendar.SECOND, 00);
+ calendar4.set(Calendar.HOUR_OF_DAY, 23);
+ calendar4.set(Calendar.MINUTE, 59);
+ calendar4.set(Calendar.SECOND, 59);
+
+ //【今日运行情况】
+ Map<String, Object> map1 = new HashMap<>();
+ Wrapper<TUser> ne = new EntityWrapper<TUser>().between("insertTime", calendar1.getTime(), calendar2.getTime()).ne("flag", 3);
+ if(companyId != null){
+ ne.eq("companyId", companyId);
+ }
+ int i = tUserService.selectCount(ne);
+ map1.put("passengerInfo", i); //新增用户
+
+ Wrapper<TDriver> ne1 = new EntityWrapper<TDriver>().ne("state", 1).eq("authState", 2).ne("flag", 3);
+ if(companyId != null){
+ ne1.eq("companyId", companyId).or().eq("franchiseeId", companyId);
+ }
+ List<TDriver> tDrivers = tDriverService.selectList(ne1);
+ String keys = "";
+ for(TDriver driver : tDrivers){
+ keys += "DRIVER" + driver.getId() + ",";
+ }
+ String value = redisUtil.getValues(keys.substring(0, keys.length() - 1));
+ JSONArray jsonArray = JSON.parseArray(value);
+ int size = driverOnlineService.queryOnlineDriverCount(null, null);
+ map1.put("netcardriver", size); //在线司机
+
+ Wrapper<TOrderTaxi> travelTime1 = new EntityWrapper<TOrderTaxi>().between("travelTime", calendar1.getTime(), calendar2.getTime());
+ if(companyId != null){
+ travelTime1.eq("companyId", companyId);
+ }
+ int i1 = tOrderTaxiService.selectCount(travelTime1);
+ map1.put("orderDetail2", i1); //出租车订单
+
+ Wrapper<TOrderPrivateCar> zcTodayTme = new EntityWrapper<TOrderPrivateCar>().between("travelTime", calendar1.getTime(), calendar2.getTime());
+ if(companyId != null){
+ zcTodayTme.eq("companyId", companyId);
+ }
+ int zcTodayNum = itOrderPrivateCarService.selectCount(zcTodayTme);
+ map1.put("orderDetail1", zcTodayNum); //专车订单
+
+ Wrapper<TOrderCrossCity> kcTodayTme = new EntityWrapper<TOrderCrossCity>().between("travelTime", calendar1.getTime(), calendar2.getTime());
+ if(companyId != null){
+ kcTodayTme.eq("companyId", companyId);
+ }
+ int kcTodayNum = itOrderCrossCityService.selectCount(kcTodayTme);
+ map1.put("orderDetail3", kcTodayNum); //跨城订单
+
+ Wrapper<TOrderLogistics> tcxTodayTme = new EntityWrapper<TOrderLogistics>().between("travelTime", calendar1.getTime(), calendar2.getTime());
+ if(companyId != null){
+ tcxTodayTme.eq("companyId", companyId);
+ }
+ tcxTodayTme.eq("type",4);
+ int tcxTodayNum = itOrderLogisticsService.selectCount(tcxTodayTme);
+ map1.put("orderDetail4", tcxTodayNum); //同城物流订单
+
+ Wrapper<TOrderLogistics> kcxTodayTme = new EntityWrapper<TOrderLogistics>().between("travelTime", calendar1.getTime(), calendar2.getTime());
+ if(companyId != null){
+ kcxTodayTme.eq("companyId", companyId);
+ }
+ tcxTodayTme.eq("type",5);
+ int kcxTodayNum = itOrderLogisticsService.selectCount(kcxTodayTme);
+ map1.put("orderDetail5", kcxTodayNum); //跨城物流订单
+
+ map.put("operationStatus", map1);
+
+ //【全部运营总数据】
+ map1 = new HashMap<>();
+ Wrapper<TUser> flag1 = new EntityWrapper<TUser>().ne("flag", 3);
+ if(companyId != null){
+ flag1.eq("companyId", companyId);
+ }
+ int flag = tUserService.selectCount(flag1);
+ map1.put("passengerInfoSum", flag); //总用户
+
+ Wrapper<TDriver> ne4 = new EntityWrapper<TDriver>().eq("authState", 2).ne("flag", 3);
+ if(companyId != null){
+ ne4.eq("companyId", companyId).or().eq("franchiseeId", companyId);
+ }
+ int i2 = tDriverService.selectCount(ne4);
+ map1.put("netcarDriverSum", i2); //总司机
+
+ Wrapper<TCar> state3 = new EntityWrapper<TCar>().eq("state", 1);
+ if(companyId != null){
+ state3.eq("companyId", companyId).or().eq("franchiseeId", companyId);
+ }
+ int state1 = tCarService.selectCount(state3);
+ map1.put("netCarSum", state1); //总车辆
+
+ Integer i3 = tOrderTaxiService.getAllOrderNum(companyId,null,null);
+ map1.put("orderDetailSum", i3); //总订单
+
+ Double allTradeMoney = tOrderTaxiService.getAllTradeMoney(companyId, null, null);
+ Double allIncomeMoney = tOrderTaxiService.getAllIncomeMoney(companyId, null, null);
+ map1.put("paiceSum", allTradeMoney); //交易总金额
+ map1.put("paySum", allIncomeMoney); //总收益
+ map.put("operationSum", map1);
+
+ //【运营数据增长查询】
+ map1 = new HashMap<>();
+ Wrapper<TUser> ne2 = new EntityWrapper<TUser>().between("insertTime", calendar3.getTime(), calendar4.getTime()).ne("flag", 3);
+ if(companyId != null){
+ ne2.eq("companyId", companyId);
+ }
+ int i4 = tUserService.selectCount(ne2);
+ map1.put("passengerInfoSum", i4);
+
+ Wrapper<TDriver> ne3 = new EntityWrapper<TDriver>().between("insertTime", calendar3.getTime(), calendar4.getTime()).eq("authState", 2).ne("flag", 3);
+ if(companyId != null){
+ ne3.eq("companyId", companyId).or().eq("franchiseeId", companyId);
+ }
+ int i5 = tDriverService.selectCount(ne3);
+ map1.put("netcarDriverSum", i5);
+
+ Wrapper<TOrderPrivateCar> zcTodayTmeByConditions = new EntityWrapper<TOrderPrivateCar>().between("travelTime", calendar3.getTime(), calendar4.getTime());
+ if(companyId != null){
+ zcTodayTmeByConditions.eq("companyId", companyId);
+ }
+ int zcTodayNum1 = itOrderPrivateCarService.selectCount(zcTodayTmeByConditions);
+ map1.put("orderDetail1", zcTodayNum1); //专车订单
+
+ Wrapper<TOrderTaxi> travelTime2 = new EntityWrapper<TOrderTaxi>().between("travelTime", calendar3.getTime(), calendar4.getTime());
+ if(companyId != null){
+ travelTime2.eq("companyId", companyId);
+ }
+ int travelTime = tOrderTaxiService.selectCount(travelTime2);
+ map1.put("orderDetail2", travelTime); //出租车订单
+
+ Wrapper<TOrderCrossCity> kcTodayTmeByConditions = new EntityWrapper<TOrderCrossCity>().between("travelTime", calendar3.getTime(), calendar4.getTime());
+ if(companyId != null){
+ kcTodayTmeByConditions.eq("companyId", companyId);
+ }
+ int kcTodayNum1 = itOrderCrossCityService.selectCount(kcTodayTmeByConditions);
+ map1.put("orderDetail3", kcTodayNum1); //跨城订单
+
+ Wrapper<TOrderLogistics> tcxTodayTmeByConditions = new EntityWrapper<TOrderLogistics>().between("travelTime", calendar3.getTime(), calendar4.getTime());
+ if(companyId != null){
+ tcxTodayTmeByConditions.eq("companyId", companyId);
+ }
+ tcxTodayTmeByConditions.eq("type",4);
+ int tcxTodayNum1 = itOrderLogisticsService.selectCount(tcxTodayTmeByConditions);
+ map1.put("orderDetail4", tcxTodayNum1); //同城物流订单
+
+ Wrapper<TOrderLogistics> kcxTodayTmeByConditions = new EntityWrapper<TOrderLogistics>().between("travelTime", calendar3.getTime(), calendar4.getTime());
+ if(companyId != null){
+ kcxTodayTmeByConditions.eq("companyId", companyId);
+ }
+ kcxTodayTmeByConditions.eq("type",5);
+ int kcxTodayNum1 = itOrderLogisticsService.selectCount(kcxTodayTmeByConditions);
+ map1.put("orderDetail5", kcxTodayNum1); //跨城物流订单
+
+ String startTime = null;
+ if (SinataUtil.isNotEmpty(start)){
+ startTime = DateUtil.format(start, "yyyy-MM-dd");
+ }
+ String endTime = null;
+ if (SinataUtil.isNotEmpty(end)){
+ endTime = DateUtil.format(end, "yyyy-MM-dd");
+ }
+ Double allTradeMoneyByTime = tOrderTaxiService.getAllTradeMoney(companyId, startTime, endTime);
+ Double allIncomeMoneyByTime = tOrderTaxiService.getAllIncomeMoney(companyId, startTime, endTime);
+ map1.put("paiceSum", allTradeMoneyByTime); //交易总金额
+ map1.put("paySum", allIncomeMoneyByTime); //总收益
+ map.put("operationGrow", map1);
+
+
+ //【运营总趋势】
+ Integer[] states = new Integer[]{8, 9};
+ map1 = new HashMap<>();
+ List<Integer> m1 = new ArrayList<>();
+ List<Integer> m2 = new ArrayList<>();
+ List<Integer> m3 = new ArrayList<>();
+ List<Integer> m4 = new ArrayList<>();
+ List<Integer> m5 = new ArrayList<>();
+ List<Integer> m6 = new ArrayList<>();
+ List<Integer> m7 = new ArrayList<>();
+ for(int j = 30; j > 0; j--){
+ Calendar s1 = Calendar.getInstance();
+ s1.setTime(date);
+ s1.set(s1.get(Calendar.YEAR), s1.get(Calendar.MONTH), s1.get(Calendar.DAY_OF_MONTH) - j, 0, 0, 1);
+ Calendar e1 = Calendar.getInstance();
+ e1.setTime(date);
+ e1.set(e1.get(Calendar.YEAR), e1.get(Calendar.MONTH), e1.get(Calendar.DAY_OF_MONTH) - j, 23, 59, 59);
+
+ //出租车订单趋势图
+ Wrapper<TOrderTaxi> in = new EntityWrapper<TOrderTaxi>().between("travelTime", s1.getTime(), e1.getTime()).in("state", states);
+ if(companyId != null){
+ in.eq("companyId", companyId);
+ }
+ int i6 = tOrderTaxiService.selectCount(in);
+ m1.add(i6);
+
+ //用户注册趋势图
+ Wrapper<TUser> ne5 = new EntityWrapper<TUser>().between("insertTime", s1.getTime(), e1.getTime()).ne("flag", 3);
+ if(companyId != null){
+ ne5.eq("companyId", companyId);
+ }
+ int i7 = tUserService.selectCount(ne5);
+ m2.add(i7);
+
+ //订单数趋势图
+ String startTime1 = DateUtil.format(s1.getTime(), "yyyy-MM-dd");
+ String endTime1 = DateUtil.format(e1.getTime(), "yyyy-MM-dd");
+ Integer allOrderNum = tOrderTaxiService.getAllOrderNum(companyId, startTime1, endTime1);
+ m3.add(allOrderNum);
+
+ //专车订单趋势图
+ Wrapper<TOrderPrivateCar> inZC = new EntityWrapper<TOrderPrivateCar>().between("travelTime", s1.getTime(), e1.getTime()).in("state", states);
+ if(companyId != null){
+ inZC.eq("companyId", companyId);
+ }
+ int zc = itOrderPrivateCarService.selectCount(inZC);
+ m4.add(zc);
+
+ //跨城订单趋势图
+ Wrapper<TOrderCrossCity> inKC = new EntityWrapper<TOrderCrossCity>().between("travelTime", s1.getTime(), e1.getTime()).in("state", states);
+ if(companyId != null){
+ inKC.eq("companyId", companyId);
+ }
+ int kc = itOrderCrossCityService.selectCount(inKC);
+ m5.add(kc);
+
+ //同城物流订单趋势图
+ Wrapper<TOrderLogistics> inTCX = new EntityWrapper<TOrderLogistics>().between("travelTime", s1.getTime(), e1.getTime()).in("state", states);
+ if(companyId != null){
+ inTCX.eq("companyId", companyId);
+ }
+ inTCX.eq("type",4);
+ int tcx = itOrderLogisticsService.selectCount(inTCX);
+ m6.add(tcx);
+
+ //跨城物流订单趋势图
+ Wrapper<TOrderLogistics> inKCX = new EntityWrapper<TOrderLogistics>().between("travelTime", s1.getTime(), e1.getTime()).in("state", states);
+ if(companyId != null){
+ inKCX.eq("companyId", companyId);
+ }
+ inKCX.eq("type",5);
+ int kcx = itOrderLogisticsService.selectCount(inKCX);
+ m7.add(kcx);
+
+ }
+ map1.put("orderDetail5", m7); //跨城物流订单数趋势图
+ map1.put("orderDetail4", m6); //同城物流订单数趋势图
+ map1.put("orderDetail3", m5); //跨城订单数趋势图
+ map1.put("orderDetail1", m4); //专车订单数趋势图
+ map1.put("orderDetailSum", m3); //全部订单数趋势图
+ map1.put("passengerInfoSum", m2); //用户注册趋势图
+ map1.put("orderDetail2", m1); //出租车订单趋势图
+ map.put("operationTrend", map1);
+
+ return map;
+ }
+
+
+
+ @ResponseBody
+ @PostMapping("/getDriverPosition")
+ public Object getDriverPosition(Integer companyId){
+ Integer id = ShiroKit.getUser().getId();
+ User user = userService.selectById(id);
+ if(companyId == null && user.getRoleType() != 1){
+ companyId = user.getObjectId();
+ }
+ Wrapper<TDriver> ne = new EntityWrapper<TDriver>().eq("authState", 2).eq("state", 2).ne("flag", 3);
+ if(companyId != null){
+ ne.eq("companyId", companyId).or().eq("franchiseeId", companyId);
+ }
+ List<TDriver> tDrivers = tDriverService.selectList(ne);
+ Map<String, Object> map = new HashMap<>();
+ List<Object> list = new ArrayList<>();
+ for(TDriver tDriver : tDrivers){
+ Map<String, Object> d = new HashMap<>();
+ String value = redisUtil.getValue("DRIVER" + tDriver.getId());
+ if(ToolUtil.isEmpty(value)){
+ continue;
+ }
+ d.put("driver", tDriver);
+ d.put("lon", value.split(",")[0]);
+ d.put("lat", value.split(",")[1]);
+ list.add(d);
+ }
+ map.put("driver", list);
+
+ Map<String, Object> map2 = new HashMap<>();
+ Wrapper<TOrderTaxi> eq = new EntityWrapper<TOrderTaxi>().eq("state", 1).eq("isDelete", 1);
+ if(companyId != null){
+ eq.eq("companyId", companyId);
+ }
+ List<TOrderTaxi> tOrderTaxis = tOrderTaxiService.selectList(eq);
+ list = new ArrayList<>();
+ for(TOrderTaxi t : tOrderTaxis){
+ Map<String, Object> map1 = new HashMap<>();
+ map1.put("start", t.getStartAddress());
+ map1.put("end", t.getEndAddress());
+ map1.put("travelTime", t.getTravelTime());
+ map1.put("carModel", "");
+ map1.put("num", 1);
+ list.add(map1);
+ }
+ map2.put("chuzu", list);
+ map.put("order", map2);
+
+ return map;
+ }
+
+
+ @ResponseBody
+ @PostMapping("/getAllOrder")
+ public Object getAllOrder(){
+ List<TOrderTaxi> tOrderTaxis = tOrderTaxiService.selectList(new EntityWrapper<TOrderTaxi>().eq("isDelete", 1));
+ List list = new ArrayList<>();
+ for(TOrderTaxi t : tOrderTaxis){
+ Map<String, Object> map = new HashMap<>();
+ map.put("lon", t.getStartLon());
+ map.put("lat", t.getStartLat());
+ list.add(map);
+ }
+ return list;
+ }
+
+
+ @ResponseBody
+ @PostMapping("/getCompanyInfoByUserId")
+ public Object getCompanyInfoByUserId(){
+ Integer id = ShiroKit.getUser().getId();
+ User user = userService.selectById(id);
+ companys = new ArrayList<>();
+ List<TCompany> ids = new ArrayList<>();
+ TCompany tCompany = null;
+ if(user.getRoleType() == 1 && user.getObjectId() == null){
+ tCompany = tCompanyService.selectById(1);
+ }else{
+ tCompany = tCompanyService.selectById(user.getObjectId());
+ }
+ ids.add(tCompany);
+ companys.addAll(ids);
+ this.getCompanyIds(ids);
+ return companys;
+ }
+
+
+ @ResponseBody
+ @RequestMapping(value = "/getDriverInfo", method = RequestMethod.POST)
+ public Object getDriverInfo(Integer driverId){
+ Map<String, Object> map = new HashMap<>();
+ TDriver tDriver = tDriverService.selectById(driverId);
+ TCar tCar = tCarService.selectById(tDriver.getCarId());
+ TCarBrand tCarBrand = null;
+ TCarModel tCarModel = null;
+ if(null != tCar){
+ tCarBrand = carBrandService.selectById(tCar.getCarBrandId());
+ tCarModel = carModelService.selectById(tCar.getCarModelId());
+ }
+ Integer[] states = new Integer[]{2, 3, 4, 5, 6, 11};
+ Wrapper<TOrderTaxi> state4 = new EntityWrapper<TOrderTaxi>().in("state", states).eq("driverId", driverId).eq("isDelete", 1);
+ List<TOrderTaxi> tOrderTaxis = tOrderTaxiService.selectList(state4);
+ map.put("netcarDriver", tDriver);
+ map.put("netcar", tCar);
+ map.put("carBrand", null != tCarBrand ? tCarBrand.getName() : "");
+ map.put("carModel", null != tCarModel ? tCarModel.getName() : "");
+ map.put("order", tOrderTaxis);
+ return map;
+ }
+
+
+
+ public void getCompanyIds(List<TCompany> ids){
+ List<TCompany> ids_ = new ArrayList<>();
+ for(TCompany id : ids){
+ if(id.getId() == 1){
+ List<TCompany> tCompanies = tCompanyService.selectList(new EntityWrapper<TCompany>().eq("superiorId", id.getId()).or().isNull("superiorId").eq("state", 0).ne("flag", 3).ne("type", 1));
+ ids_.addAll(tCompanies);
+ companys.addAll(tCompanies);
+ }else{
+ List<TCompany> tCompanies = tCompanyService.selectList(new EntityWrapper<TCompany>().eq("superiorId", id.getId()).eq("state", 0).ne("flag", 3));
+ ids_.addAll(tCompanies);
+ companys.addAll(tCompanies);
+ }
+ }
+ if(ids_.size() == 0){
+ return;
+ }
+ this.getCompanyIds(ids_);
+ }
+
+
+
+ @ResponseBody
+ @RequestMapping(value = "/queryOnlineDriver", method = RequestMethod.POST)
+ public Object queryOnlineDriver(String name, String phone, Integer offset, Integer limit){
+ try {
+ return driverOnlineService.queryOnlineDriver(name, phone, offset, limit);
+ }catch (Exception e){
+ e.printStackTrace();
+ return ResultUtil.runErr();
+ }
+ }
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/ReportController.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/ReportController.java
new file mode 100644
index 0000000..52fbfa1
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/ReportController.java
@@ -0,0 +1,434 @@
+package com.stylefeng.guns.modular.system.controller.general;
+
+
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.stylefeng.guns.core.util.ToolUtil;
+import com.stylefeng.guns.modular.system.model.TCompany;
+import com.stylefeng.guns.modular.system.service.ITCompanyService;
+import com.stylefeng.guns.modular.system.service.IUserActivityDiscount1Service;
+import com.stylefeng.guns.modular.system.service.IUserCouponRecordService;
+import com.stylefeng.guns.modular.system.service.IUserRedPacketRecordService;
+import com.stylefeng.guns.modular.system.util.ResultUtil;
+import org.apache.poi.hssf.usermodel.HSSFWorkbook;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import javax.servlet.ServletOutputStream;
+import javax.servlet.http.HttpServletResponse;
+import java.net.URLEncoder;
+import java.util.List;
+
+/**
+ * 报表控制器
+ */
+@Controller
+@RequestMapping("/report")
+public class ReportController {
+
+ private String PREFIX = "/system/report/";
+
+ @Autowired
+ private ITCompanyService companyService;
+
+ @Autowired
+ private IUserCouponRecordService userCouponRecordService;
+
+ @Autowired
+ private IUserRedPacketRecordService redPacketRecordService;
+
+ @Autowired
+ private IUserActivityDiscount1Service userActivityDiscount1Service;
+
+
+
+
+ /**
+ * 跳转到日常运营数据汇总页
+ * @return
+ */
+ @RequestMapping("/showOperationalData")
+ public String showOperationalData(Model model){
+ List<TCompany> tCompanies = companyService.selectList(new EntityWrapper<TCompany>().eq("state", 0).ne("flag", 3));
+ model.addAttribute("company", tCompanies);
+ return PREFIX + "operationalData.html";
+ }
+
+ /**
+ * 跳转到优惠券统计页
+ * @param model
+ * @return
+ */
+ @RequestMapping("/showCouponStatistics")
+ public String showCouponStatistics(Model model){
+ List<TCompany> tCompanies = companyService.selectList(new EntityWrapper<TCompany>().eq("state", 0).ne("flag", 3));
+ model.addAttribute("company", tCompanies);
+ return PREFIX + "couponStatistics.html";
+ }
+
+ /**
+ * 跳转到优惠券统计详情页
+ * @param type
+ * @param model
+ * @return
+ */
+ @RequestMapping("/showCouponStatisticsInfo")
+ public String showCouponStatisticsInfo(Integer type, Model model){
+ List<TCompany> tCompanies = companyService.selectList(new EntityWrapper<TCompany>().eq("state", 0).ne("flag", 3));
+ model.addAttribute("company", tCompanies);
+ model.addAttribute("type", type);
+ return PREFIX + "couponStatisticsInfo.html";
+ }
+
+
+
+
+
+
+ /**
+ * 获取日常运营数据
+ * @param type
+ * @param time
+ * @param companyId
+ * @param offset
+ * @param limit
+ * @return
+ */
+ @ResponseBody
+ @RequestMapping(value = "/queryOperationalData", method = RequestMethod.POST)
+ public Object queryOperationalData(Integer type, String time, Integer companyId, Integer offset, Integer limit){
+ try {
+ String start = null;
+ String end = null;
+ if(ToolUtil.isNotEmpty(time)){
+ start = time.split(" - ")[0];
+ end = time.split(" - ")[1];
+ }
+ return companyService.queryOperationalData(type, start, end, companyId, offset, limit);
+ }catch (Exception e){
+ e.printStackTrace();
+ return ResultUtil.runErr();
+ }
+ }
+
+ /**
+ * 下载日常运营数据汇总表
+ * @param type
+ * @param time
+ * @param companyId
+ * @param response
+ */
+ @ResponseBody
+ @RequestMapping(value = "/downloadOperationalData", method = RequestMethod.GET)
+ public void downloadOperationalData(Integer type, String time, Integer companyId, HttpServletResponse response){
+ try {
+ String start = null;
+ String end = null;
+ if(ToolUtil.isNotEmpty(time)){
+ start = time.split(" - ")[0];
+ end = time.split(" - ")[1];
+ }
+ HSSFWorkbook hssfWorkbook = companyService.downloadOperationalData(type, start, end, companyId);
+ response.setHeader("Content-Disposition", "attachment; filename=" + URLEncoder.encode("日常运营数据汇总表.xls", "utf-8"));
+ response.setContentType("application/vnd.ms-excel");
+ ServletOutputStream out = response.getOutputStream();
+ hssfWorkbook.write(out);
+ out.flush();
+ out.close();
+ }catch (Exception e){
+ e.printStackTrace();
+ }
+ }
+
+
+ /**
+ * 获取优惠券统计
+ * @param type
+ * @param name
+ * @param time
+ * @param companyId
+ * @param offset
+ * @param limit
+ * @return
+ */
+ @ResponseBody
+ @RequestMapping(value = "/queryCouponRegister", method = RequestMethod.POST)
+ public Object queryCouponRegister(Integer type, String name, String time, Integer companyId, Integer offset, Integer limit){
+ try {
+ return userCouponRecordService.queryCouponRegister(type, name, time, companyId, offset, limit);
+ }catch (Exception e){
+ e.printStackTrace();
+ return ResultUtil.runErr();
+ }
+ }
+
+ /**
+ * 下载优惠券领取数据
+ * @param type
+ * @param name
+ * @param time
+ * @param companyId
+ * @param response
+ */
+ @ResponseBody
+ @RequestMapping(value = "/downloadCouponRegister", method = RequestMethod.GET)
+ public void downloadCouponRegister(Integer type, String name, String time, Integer companyId, HttpServletResponse response){
+ try {
+ String na = "";
+ if(type == 2){
+ na = "注册优惠券奖励";
+ }
+ if(type == 3){
+ na = "邀请优惠券奖励";
+ }
+ if(type == 4){
+ na = "充值优惠券奖励";
+ }
+ HSSFWorkbook hssfWorkbook = userCouponRecordService.downloadCouponRegister(type, name, time, companyId);
+ response.setHeader("Content-Disposition", "attachment; filename=" + URLEncoder.encode(na + ".xls", "utf-8"));
+ response.setContentType("application/vnd.ms-excel");
+ ServletOutputStream out = response.getOutputStream();
+ hssfWorkbook.write(out);
+ out.flush();
+ out.close();
+ }catch (Exception e){
+ e.printStackTrace();
+ }
+ }
+
+
+ /**
+ * 获取红包统计数据
+ * @param name
+ * @param time
+ * @param companyId
+ * @param offset
+ * @param limit
+ * @return
+ */
+ @ResponseBody
+ @RequestMapping(value = "/queryRedEnvelopes", method = RequestMethod.POST)
+ public Object queryRedEnvelopes(String name, String time, Integer companyId, Integer offset, Integer limit){
+ try {
+ return redPacketRecordService.queryRedEnvelopes(name, time, companyId, offset, limit);
+ }catch (Exception e){
+ e.printStackTrace();
+ return ResultUtil.runErr();
+ }
+ }
+
+
+ /**
+ * 下载红包奖励
+ * @param name
+ * @param time
+ * @param companyId
+ * @param response
+ */
+ @ResponseBody
+ @RequestMapping(value = "/downloadRedEnvelopes", method = RequestMethod.GET)
+ public void downloadRedEnvelopes(String name, String time, Integer companyId, HttpServletResponse response){
+ try {
+ HSSFWorkbook hssfWorkbook = redPacketRecordService.downloadRedEnvelopes(name, time, companyId);
+ response.setHeader("Content-Disposition", "attachment; filename=" + URLEncoder.encode("红包奖励.xls", "utf-8"));
+ response.setContentType("application/vnd.ms-excel");
+ ServletOutputStream out = response.getOutputStream();
+ hssfWorkbook.write(out);
+ out.flush();
+ out.close();
+ }catch (Exception e){
+ e.printStackTrace();
+ }
+ }
+
+
+
+ /**
+ * 获取折扣统计
+ * @param name
+ * @param time
+ * @param companyId
+ * @param offset
+ * @param limit
+ * @return
+ */
+ @ResponseBody
+ @RequestMapping(value = "/queryDiscount1", method = RequestMethod.POST)
+ public Object queryDiscount1(String name, String time, Integer companyId, Integer offset, Integer limit){
+ try {
+ return userActivityDiscount1Service.queryDiscount1(name, time, companyId, offset, limit);
+ }catch (Exception e){
+ e.printStackTrace();
+ return ResultUtil.runErr();
+ }
+ }
+
+ /**
+ * 下载折扣优惠活动
+ * @param name
+ * @param time
+ * @param companyId
+ * @param response
+ */
+ @ResponseBody
+ @RequestMapping(value = "/downloadDiscount1", method = RequestMethod.GET)
+ public void downloadDiscount1(String name, String time, Integer companyId, HttpServletResponse response){
+ try {
+ HSSFWorkbook hssfWorkbook = userActivityDiscount1Service.downloadDiscount1(name, time, companyId);
+ response.setHeader("Content-Disposition", "attachment; filename=" + URLEncoder.encode("折扣优惠活动.xls", "utf-8"));
+ response.setContentType("application/vnd.ms-excel");
+ ServletOutputStream out = response.getOutputStream();
+ hssfWorkbook.write(out);
+ out.flush();
+ out.close();
+ }catch (Exception e){
+ e.printStackTrace();
+ }
+ }
+
+ /**
+ * 获取优惠券统计明细
+ * @param type
+ * @param name
+ * @param time
+ * @param companyId
+ * @param offset
+ * @param limit
+ * @return
+ */
+ @ResponseBody
+ @RequestMapping(value = "/queryCouponRegisterInfo", method = RequestMethod.POST)
+ public Object queryCouponRegisterInfo(Integer type, String name, String time, Integer companyId, Integer offset, Integer limit){
+ try {
+ type += 1;
+ return userCouponRecordService.queryCouponRegisterInfo(type, name, time, companyId, offset, limit);
+ }catch (Exception e){
+ e.printStackTrace();
+ return ResultUtil.runErr();
+ }
+ }
+
+
+
+
+ /**
+ * 获取充值赠送优惠券明细
+ * @param name
+ * @param time
+ * @param companyId
+ * @param offset
+ * @param limit
+ * @return
+ */
+ @ResponseBody
+ @RequestMapping(value = "/queryCouponRegisterInfo1", method = RequestMethod.POST)
+ public Object queryCouponRegisterInfo1(String name, String time, Integer companyId, Integer offset, Integer limit){
+ try {
+ return userCouponRecordService.queryCouponRegisterInfo1( name, time, companyId, offset, limit);
+ }catch (Exception e){
+ e.printStackTrace();
+ return ResultUtil.runErr();
+ }
+ }
+
+
+ /**
+ * 获取折扣优惠详情
+ * @param time
+ * @param companyId
+ * @param offset
+ * @param limit
+ * @return
+ */
+ @ResponseBody
+ @RequestMapping(value = "/queryDiscountInfo", method = RequestMethod.POST)
+ public Object queryDiscountInfo(String name, String time, Integer companyId, Integer offset, Integer limit){
+ try {
+ return userActivityDiscount1Service.queryDiscountInfo(name, time, companyId, offset, limit);
+ }catch (Exception e){
+ e.printStackTrace();
+ return ResultUtil.runErr();
+ }
+ }
+
+
+
+
+ /**
+ * 获取红包领取详情
+ * @param name
+ * @param time
+ * @param companyId
+ * @param offset
+ * @param limit
+ * @return
+ */
+ @ResponseBody
+ @RequestMapping(value = "/queryRedEnvelopesInfo", method = RequestMethod.POST)
+ public Object queryRedEnvelopesInfo(String name, String time, Integer companyId, Integer offset, Integer limit){
+ try {
+ return redPacketRecordService.queryRedEnvelopesInfo(name, time, companyId, offset, limit);
+ }catch (Exception e){
+ e.printStackTrace();
+ return ResultUtil.runErr();
+ }
+ }
+
+
+ /**
+ * 优惠明细下载
+ * @param type
+ * @param name
+ * @param time
+ * @param companyId
+ * @param response
+ */
+ @ResponseBody
+ @RequestMapping(value = "/downloadCouponStatisticsInfo", method = RequestMethod.GET)
+ public void downloadCouponStatisticsInfo(Integer type, String name, String time, Integer companyId, HttpServletResponse response){
+ try {
+ if(type == 1 || type == 2){
+ type += 1;
+ HSSFWorkbook hssfWorkbook = userCouponRecordService.downloadCouponRegisterInfo(type, name, time, companyId);
+ response.setHeader("Content-Disposition", "attachment; filename=" + URLEncoder.encode((type == 2 ? "注册奖励明细" : "邀请奖励明细") + ".xls", "utf-8"));
+ response.setContentType("application/vnd.ms-excel");
+ ServletOutputStream out = response.getOutputStream();
+ hssfWorkbook.write(out);
+ out.flush();
+ out.close();
+ }
+ if(type == 3){
+ HSSFWorkbook hssfWorkbook = userCouponRecordService.downloadCouponRegisterInfo1(name, time, companyId);
+ response.setHeader("Content-Disposition", "attachment; filename=" + URLEncoder.encode("充值奖励明细.xls", "utf-8"));
+ response.setContentType("application/vnd.ms-excel");
+ ServletOutputStream out = response.getOutputStream();
+ hssfWorkbook.write(out);
+ out.flush();
+ out.close();
+ }
+ if(type == 4){
+ HSSFWorkbook hssfWorkbook = userActivityDiscount1Service.downloadDiscountInfo(name, time, companyId);
+ response.setHeader("Content-Disposition", "attachment; filename=" + URLEncoder.encode("折扣优惠明细.xls", "utf-8"));
+ response.setContentType("application/vnd.ms-excel");
+ ServletOutputStream out = response.getOutputStream();
+ hssfWorkbook.write(out);
+ out.flush();
+ out.close();
+ }
+ if(type == 5){
+ HSSFWorkbook hssfWorkbook = redPacketRecordService.downloadRedEnvelopesInfo(name, time, companyId);
+ response.setHeader("Content-Disposition", "attachment; filename=" + URLEncoder.encode("红包优惠明细.xls", "utf-8"));
+ response.setContentType("application/vnd.ms-excel");
+ ServletOutputStream out = response.getOutputStream();
+ hssfWorkbook.write(out);
+ out.flush();
+ out.close();
+ }
+ }catch (Exception e){
+ e.printStackTrace();
+ }
+ }
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/SysCouponActivityController.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/SysCouponActivityController.java
new file mode 100644
index 0000000..06d0d5f
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/SysCouponActivityController.java
@@ -0,0 +1,276 @@
+package com.stylefeng.guns.modular.system.controller.general;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.baomidou.mybatisplus.mapper.Wrapper;
+import com.baomidou.mybatisplus.plugins.Page;
+import com.stylefeng.guns.core.base.controller.BaseController;
+import com.stylefeng.guns.core.common.constant.factory.PageFactory;
+import com.stylefeng.guns.core.shiro.ShiroKit;
+import com.stylefeng.guns.core.shiro.ShiroUser;
+import com.stylefeng.guns.core.util.DateUtil;
+import com.stylefeng.guns.core.util.SinataUtil;
+import com.stylefeng.guns.modular.system.model.SysCouponRecord;
+import com.stylefeng.guns.modular.system.model.TUser;
+import com.stylefeng.guns.modular.system.model.UserCouponRecord;
+import com.stylefeng.guns.modular.system.service.ISysCouponRecordService;
+import com.stylefeng.guns.modular.system.service.ITUserService;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.beans.factory.annotation.Autowired;
+import com.stylefeng.guns.core.log.LogObjectHolder;
+import org.springframework.web.bind.annotation.RequestParam;
+import com.stylefeng.guns.modular.system.model.SysCouponActivity;
+import com.stylefeng.guns.modular.system.service.ISysCouponActivityService;
+
+import java.util.*;
+
+/**
+ * 控制器
+ *
+ * @author fengshuonan
+ * @Date 2020-06-17 09:14:59
+ */
+@Controller
+@RequestMapping("/sysCouponActivity")
+public class SysCouponActivityController extends BaseController {
+
+ private String PREFIX = "/system/sysCouponActivity/";
+
+ @Autowired
+ private ISysCouponActivityService sysCouponActivityService;
+
+ @Autowired
+ private ITUserService userService;
+
+ @Autowired
+ private ISysCouponRecordService couponRecordService;
+
+ /**
+ * 跳转到首页
+ */
+ @RequestMapping("")
+ public String index() {
+ return PREFIX + "sysCouponActivity.html";
+ }
+
+ /**
+ * 跳转到选择优惠券页面
+ * @return
+ */
+ @RequestMapping("/sysCouponRecord")
+ public String sysCouponRecord() {
+ return PREFIX + "sysCouponRecord.html";
+ }
+
+ /**
+ * 跳转到选择用户页面
+ * @return
+ */
+ @RequestMapping("user")
+ public String user() {
+ return PREFIX + "tUser.html";
+ }
+ /**
+ * 跳转到添加
+ */
+ @RequestMapping("/sysCouponActivity_add")
+ public String sysCouponActivityAdd() {
+ return PREFIX + "sysCouponActivity_add.html";
+ }
+
+ /**
+ * 跳转到修改
+ */
+ @RequestMapping("/sysCouponActivity_update/{sysCouponActivityId}")
+ public String sysCouponActivityUpdate(@PathVariable Integer sysCouponActivityId, Model model) {
+ SysCouponActivity sysCouponActivity = sysCouponActivityService.selectById(sysCouponActivityId);
+ model.addAttribute("item",sysCouponActivity);
+ if(sysCouponActivity.getSendType()==2){
+ model.addAttribute("sendUserInfoList",JSON.parseArray(sysCouponActivity.getSendUserId()));
+ }else{
+ model.addAttribute("sendUserInfoList",new ArrayList<>());
+ }
+ LogObjectHolder.me().set(sysCouponActivity);
+ return PREFIX + "sysCouponActivity_edit.html";
+ }
+
+ /**
+ * 获取列表
+ */
+ @RequestMapping(value = "/list")
+ @ResponseBody
+ public Object list(String createTime,Integer couponUseType,Integer status) {
+ Date startTimes = null;
+ Date endTimes = null;
+ if (SinataUtil.isNotEmpty(createTime)){
+ String[] timeArray = createTime.split(" - ");
+ startTimes = DateUtil.getDate_str3(timeArray[0]+" 00:00:00");
+ endTimes = DateUtil.getDate_str3(timeArray[1]+" 23:59:59");
+ }
+ Page<SysCouponActivity> page = new PageFactory<SysCouponActivity>().defaultPage();
+ Wrapper wrapper = new EntityWrapper<SysCouponActivity>();
+ if(SinataUtil.isNotEmpty(createTime)){
+ wrapper.between("insertTime",startTimes,endTimes);
+ }
+ if(SinataUtil.isNotEmpty(couponUseType)){wrapper.eq("couponUseType",couponUseType);}
+ if(SinataUtil.isNotEmpty(status)){wrapper.eq("status",status);}
+ ShiroUser user = ShiroKit.getUser();
+ if(user.getRoleType()!=1){
+ wrapper.eq("companyId",user.getObjectId());
+ wrapper.eq("companyType",user.getRoleType());
+ }
+ wrapper.ne("status",4);
+ wrapper.orderBy("id",false);
+ return super.packForBT(sysCouponActivityService.selectPage(page,wrapper));
+ }
+
+ /**
+ * 新增
+ */
+ @RequestMapping(value = "/add")
+ @ResponseBody
+ public Object add(SysCouponActivity sysCouponActivity,Integer activityId) {
+ SysCouponRecord sysCouponRecord = couponRecordService.selectById(activityId);
+ sysCouponActivity.setCouponType(sysCouponRecord.getCouponType());
+ sysCouponActivity.setCouponUseType(sysCouponRecord.getCouponUseType());
+ sysCouponActivity.setMoney(sysCouponRecord.getMoney());
+ sysCouponActivity.setFullMoney(sysCouponRecord.getFullMoney());
+ sysCouponActivity.setInsertTime(new Date());
+ sysCouponActivity.setCouponId(activityId);
+ sysCouponActivity.setCompanyId(ShiroKit.getUser().getObjectId());
+ sysCouponActivity.setCompanyType(ShiroKit.getUser().getRoleType());
+ sysCouponActivity.setStatus(sysCouponActivity.getCompanyType()==1?3:1);
+ sysCouponActivityService.insert(sysCouponActivity);
+ if(sysCouponActivity.getCompanyType()==1){
+ //定时发送优惠券
+ Timer timer = new Timer();
+ timer.schedule(new timerTaskTest(sysCouponActivity.getId()),30*1000);//timer.schedule(执行的方法，延迟多久执行(ms))
+ }
+ return SUCCESS_TIP;
+ }
+ /**
+ * 跳转到立即处理页面
+ */
+ @RequestMapping("/sysCouponActivity_immediately/{id}")
+ public String sysCouponActivityImmediately(@PathVariable Integer id, Model model) {
+ model.addAttribute("id",id);
+ return PREFIX + "sysCouponActivity_immediately.html";
+ }
+ /**
+ * 立即处理操作
+ */
+ @RequestMapping(value = "/immediately")
+ @ResponseBody
+ public Object immediately(@RequestParam Integer id,@RequestParam Integer state,@RequestParam String remark) {
+ SysCouponActivity sysCouponActivity = sysCouponActivityService.selectById(id);
+ if (SinataUtil.isNotEmpty(sysCouponActivity)){
+ sysCouponActivity.setStatus(state);
+ sysCouponActivity.setRemark(remark);
+ sysCouponActivityService.updateById(sysCouponActivity);
+ if(state==3){
+ //定时发送优惠券
+ Timer timer = new Timer();
+ timer.schedule(new timerTaskTest(id),30*1000);//timer.schedule(执行的方法，延迟多久执行(ms))
+ }
+ }
+ return SUCCESS_TIP;
+ }
+ class timerTaskTest extends TimerTask {
+ private Integer id;
+
+ public timerTaskTest(Integer id) {
+ this.id = id;
+ }
+ @Override
+ public void run() {
+ SysCouponActivity sysCouponActivity = sysCouponActivityService.selectById(id);
+ UserCouponRecord userCouponRecord = new UserCouponRecord();
+ userCouponRecord.setMoney(sysCouponActivity.getMoney());
+ userCouponRecord.setFullMoney(sysCouponActivity.getFullMoney());
+ Date nowDay = new Date();
+ userCouponRecord.setInsertTime(nowDay);
+ userCouponRecord.setExpirationTime(new Date(nowDay.getTime()+sysCouponActivity.getEffective()*24*3600*1000L));
+ userCouponRecord.setCompanyId(sysCouponActivity.getCompanyId());
+ userCouponRecord.setState(1);
+ userCouponRecord.setCouponType(sysCouponActivity.getCouponType());
+ userCouponRecord.setCouponUseType(sysCouponActivity.getCouponUseType());
+ userCouponRecord.setCouponActivityId(sysCouponActivity.getId());
+ userCouponRecord.setActivityType(1);
+ //判断发送类型1=全部用户，2=选择用户
+ if(sysCouponActivity.getSendType()==1){
+ Wrapper wrapper = new EntityWrapper<TUser>();
+ if(sysCouponActivity.getCompanyType()!=1){
+ wrapper.eq("companyId",sysCouponActivity.getCompanyId());
+ }
+ List<TUser> list = userService.selectList(wrapper);
+ for(TUser user:list){
+ userCouponRecord.setUserId(user.getId());
+ for (int i=0;i<sysCouponActivity.getNumber();i++){
+ userCouponRecord.insert();
+ }
+ }
+ sysCouponActivity.setSendUserNum(list.size());
+ sysCouponActivity.updateById();
+ }else{
+ JSONArray userId = JSON.parseArray(sysCouponActivity.getSendUserId());
+ for(int j=0;j<userId.size();j++){
+ userCouponRecord.setUserId(userId.getJSONObject(j).getInteger("userId"));
+ for (int i=0;i<sysCouponActivity.getNumber();i++){
+ userCouponRecord.insert();
+ }
+ }
+ sysCouponActivity.setSendUserNum(userId.size());
+ sysCouponActivity.updateById();
+
+ }
+
+ }
+ }
+ /**
+ * 删除
+ */
+ @RequestMapping(value = "/delete")
+ @ResponseBody
+ public Object delete(@RequestParam Integer sysCouponActivityId) {
+ SysCouponActivity sysCouponActivity = new SysCouponActivity();
+ sysCouponActivity.setId(sysCouponActivityId);
+ sysCouponActivity.setStatus(4);
+ sysCouponActivityService.updateById(sysCouponActivity);
+ return SUCCESS_TIP;
+ }
+
+ /**
+ * 修改
+ */
+ @RequestMapping(value = "/update")
+ @ResponseBody
+ public Object update(SysCouponActivity sysCouponActivity,Integer activityId) {
+ SysCouponRecord sysCouponRecord = couponRecordService.selectById(activityId);
+ sysCouponActivity.setCouponType(sysCouponRecord.getCouponType());
+ sysCouponActivity.setCouponUseType(sysCouponRecord.getCouponUseType());
+ sysCouponActivity.setMoney(sysCouponRecord.getMoney());
+ sysCouponActivity.setFullMoney(sysCouponRecord.getFullMoney());
+ sysCouponActivity.setInsertTime(new Date());
+ sysCouponActivity.setCouponId(activityId);
+ sysCouponActivity.setCompanyId(ShiroKit.getUser().getObjectId());
+ sysCouponActivity.setCompanyType(ShiroKit.getUser().getRoleType());
+ sysCouponActivity.setStatus(sysCouponActivity.getCompanyType()==1?3:1);
+ sysCouponActivityService.updateById(sysCouponActivity);
+ return SUCCESS_TIP;
+ }
+
+ /**
+ * 详情
+ */
+ @RequestMapping(value = "/detail/{sysCouponActivityId}")
+ @ResponseBody
+ public Object detail(@PathVariable("sysCouponActivityId") Integer sysCouponActivityId) {
+ return sysCouponActivityService.selectById(sysCouponActivityId);
+ }
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/SysCouponRecordController.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/SysCouponRecordController.java
new file mode 100644
index 0000000..fa1e918
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/SysCouponRecordController.java
@@ -0,0 +1,140 @@
+package com.stylefeng.guns.modular.system.controller.general;
+
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.baomidou.mybatisplus.mapper.Wrapper;
+import com.baomidou.mybatisplus.plugins.Page;
+import com.stylefeng.guns.core.base.controller.BaseController;
+import com.stylefeng.guns.core.common.constant.factory.PageFactory;
+import com.stylefeng.guns.core.shiro.ShiroKit;
+import com.stylefeng.guns.core.util.DateUtil;
+import com.stylefeng.guns.core.util.SinataUtil;
+import com.stylefeng.guns.modular.system.model.SysRedPacketRecord;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.beans.factory.annotation.Autowired;
+import com.stylefeng.guns.core.log.LogObjectHolder;
+import org.springframework.web.bind.annotation.RequestParam;
+import com.stylefeng.guns.modular.system.model.SysCouponRecord;
+import com.stylefeng.guns.modular.system.service.ISysCouponRecordService;
+
+import java.util.Date;
+import java.util.Map;
+
+/**
+ * 控制器
+ *
+ * @author fengshuonan
+ * @Date 2020-06-15 17:42:16
+ */
+@Controller
+@RequestMapping("/sysCouponRecord")
+public class SysCouponRecordController extends BaseController {
+
+ private String PREFIX = "/system/sysCouponRecord/";
+
+ @Autowired
+ private ISysCouponRecordService sysCouponRecordService;
+
+ /**
+ * 跳转到首页
+ */
+ @RequestMapping("")
+ public String index() {
+ return PREFIX + "sysCouponRecord.html";
+ }
+
+ /**
+ * 跳转到添加
+ */
+ @RequestMapping("/sysCouponRecord_add")
+ public String sysCouponRecordAdd() {
+ return PREFIX + "sysCouponRecord_add.html";
+ }
+
+ /**
+ * 跳转到修改
+ */
+ @RequestMapping("/sysCouponRecord_update/{sysCouponRecordId}")
+ public String sysCouponRecordUpdate(@PathVariable Integer sysCouponRecordId, Model model) {
+ SysCouponRecord sysCouponRecord = sysCouponRecordService.selectById(sysCouponRecordId);
+ model.addAttribute("item",sysCouponRecord);
+ LogObjectHolder.me().set(sysCouponRecord);
+ return PREFIX + "sysCouponRecord_edit.html";
+ }
+
+ /**
+ * 获取列表
+ */
+ @RequestMapping(value = "/list")
+ @ResponseBody
+ public Object list(String createTime,Integer couponUseType,Integer couponType) {
+
+ Date startTimes = null;
+ Date endTimes = null;
+ if (SinataUtil.isNotEmpty(createTime)){
+ String[] timeArray = createTime.split(" - ");
+ startTimes = DateUtil.getDate_str3(timeArray[0]+" 00:00:00");
+ endTimes = DateUtil.getDate_str3(timeArray[1]+" 23:59:59");
+ }
+ Page<SysCouponRecord> page = new PageFactory<SysCouponRecord>().defaultPage();
+ Wrapper wrapper = new EntityWrapper<SysCouponRecord>();
+ if(SinataUtil.isNotEmpty(createTime)){
+ wrapper.between("insertTime",startTimes,endTimes);
+ }
+ if(SinataUtil.isNotEmpty(couponUseType)){
+ wrapper.eq("couponUseType",couponUseType);
+ }
+ if(SinataUtil.isNotEmpty(couponType)){
+ wrapper.eq("couponType",couponType);
+ }
+ wrapper.eq("companyId",ShiroKit.getUser().getObjectId());
+ wrapper.eq("companyType",ShiroKit.getUser().getRoleType());
+ wrapper.orderBy("id",false);
+ return super.packForBT(sysCouponRecordService.selectPage(page,wrapper));
+ }
+
+ /**
+ * 新增
+ */
+ @RequestMapping(value = "/add")
+ @ResponseBody
+ public Object add(SysCouponRecord sysCouponRecord) {
+ sysCouponRecord.setInsertTime(new Date());
+ sysCouponRecord.setCompanyId(ShiroKit.getUser().getObjectId());
+ sysCouponRecord.setCompanyType(ShiroKit.getUser().getRoleType());
+ sysCouponRecordService.insert(sysCouponRecord);
+ return SUCCESS_TIP;
+ }
+
+ /**
+ * 删除
+ */
+ @RequestMapping(value = "/delete")
+ @ResponseBody
+ public Object delete(@RequestParam Integer sysCouponRecordId) {
+ sysCouponRecordService.deleteById(sysCouponRecordId);
+ return SUCCESS_TIP;
+ }
+
+ /**
+ * 修改
+ */
+ @RequestMapping(value = "/update")
+ @ResponseBody
+ public Object update(SysCouponRecord sysCouponRecord) {
+ sysCouponRecordService.updateById(sysCouponRecord);
+ return SUCCESS_TIP;
+ }
+
+ /**
+ * 详情
+ */
+ @RequestMapping(value = "/detail/{sysCouponRecordId}")
+ @ResponseBody
+ public Object detail(@PathVariable("sysCouponRecordId") Integer sysCouponRecordId) {
+ return sysCouponRecordService.selectById(sysCouponRecordId);
+ }
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/SysRedPacketRecordController.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/SysRedPacketRecordController.java
new file mode 100644
index 0000000..fd0f70a
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/SysRedPacketRecordController.java
@@ -0,0 +1,132 @@
+package com.stylefeng.guns.modular.system.controller.general;
+
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.baomidou.mybatisplus.mapper.Wrapper;
+import com.baomidou.mybatisplus.plugins.Page;
+import com.stylefeng.guns.core.base.controller.BaseController;
+import com.stylefeng.guns.core.common.constant.factory.PageFactory;
+import com.stylefeng.guns.core.shiro.ShiroKit;
+import com.stylefeng.guns.core.util.DateUtil;
+import com.stylefeng.guns.core.util.SinataUtil;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.beans.factory.annotation.Autowired;
+import com.stylefeng.guns.core.log.LogObjectHolder;
+import org.springframework.web.bind.annotation.RequestParam;
+import com.stylefeng.guns.modular.system.model.SysRedPacketRecord;
+import com.stylefeng.guns.modular.system.service.ISysRedPacketRecordService;
+
+import java.util.Date;
+import java.util.Map;
+
+/**
+ * 控制器
+ *
+ * @author fengshuonan
+ * @Date 2020-06-13 10:50:42
+ */
+@Controller
+@RequestMapping("/sysRedPacketRecord")
+public class SysRedPacketRecordController extends BaseController {
+
+ private String PREFIX = "/system/sysRedPacketRecord/";
+
+ @Autowired
+ private ISysRedPacketRecordService sysRedPacketRecordService;
+
+ /**
+ * 跳转到首页
+ */
+ @RequestMapping("")
+ public String index() {
+ return PREFIX + "sysRedPacketRecord.html";
+ }
+
+ /**
+ * 跳转到添加
+ */
+ @RequestMapping("/sysRedPacketRecord_add")
+ public String sysRedPacketRecordAdd() {
+ return PREFIX + "sysRedPacketRecord_add.html";
+ }
+
+ /**
+ * 跳转到修改
+ */
+ @RequestMapping("/sysRedPacketRecord_update/{sysRedPacketRecordId}")
+ public String sysRedPacketRecordUpdate(@PathVariable Integer sysRedPacketRecordId, Model model) {
+ SysRedPacketRecord sysRedPacketRecord = sysRedPacketRecordService.selectById(sysRedPacketRecordId);
+ model.addAttribute("item",sysRedPacketRecord);
+ LogObjectHolder.me().set(sysRedPacketRecord);
+ return PREFIX + "sysRedPacketRecord_edit.html";
+ }
+
+ /**
+ * 获取列表
+ */
+ @RequestMapping(value = "/list")
+ @ResponseBody
+ public Object list(String createTime) {
+ Date startTimes = null;
+ Date endTimes = null;
+ if (SinataUtil.isNotEmpty(createTime)){
+ String[] timeArray = createTime.split(" - ");
+ startTimes = DateUtil.getDate_str3(timeArray[0]+" 00:00:00");
+ endTimes = DateUtil.getDate_str3(timeArray[1]+" 23:59:59");
+ }
+ Page<SysRedPacketRecord> page = new PageFactory<SysRedPacketRecord>().defaultPage();
+ Wrapper wrapper = new EntityWrapper<SysRedPacketRecord>();
+ if(SinataUtil.isNotEmpty(createTime)){
+ wrapper.between("insertTime",startTimes,endTimes);
+ }
+ wrapper.eq("companyId",ShiroKit.getUser().getObjectId());
+ wrapper.eq("companyType",ShiroKit.getUser().getRoleType());
+ wrapper.orderBy("id",false);
+ return super.packForBT(sysRedPacketRecordService.selectPage(page,wrapper));
+ }
+
+ /**
+ * 新增
+ */
+ @RequestMapping(value = "/add")
+ @ResponseBody
+ public Object add(SysRedPacketRecord sysRedPacketRecord) {
+ sysRedPacketRecord.setInsertTime(new Date());
+ sysRedPacketRecord.setCompanyId(ShiroKit.getUser().getObjectId());
+ sysRedPacketRecord.setCompanyType(ShiroKit.getUser().getRoleType());
+ sysRedPacketRecordService.insert(sysRedPacketRecord);
+ return SUCCESS_TIP;
+ }
+
+ /**
+ * 删除
+ */
+ @RequestMapping(value = "/delete")
+ @ResponseBody
+ public Object delete(@RequestParam Integer sysRedPacketRecordId) {
+ sysRedPacketRecordService.deleteById(sysRedPacketRecordId);
+ return SUCCESS_TIP;
+ }
+
+ /**
+ * 修改
+ */
+ @RequestMapping(value = "/update")
+ @ResponseBody
+ public Object update(SysRedPacketRecord sysRedPacketRecord) {
+ sysRedPacketRecordService.updateById(sysRedPacketRecord);
+ return SUCCESS_TIP;
+ }
+
+ /**
+ * 详情
+ */
+ @RequestMapping(value = "/detail/{sysRedPacketRecordId}")
+ @ResponseBody
+ public Object detail(@PathVariable("sysRedPacketRecordId") Integer sysRedPacketRecordId) {
+ return sysRedPacketRecordService.selectById(sysRedPacketRecordId);
+ }
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TAdvertisementController.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TAdvertisementController.java
new file mode 100644
index 0000000..91003a0
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TAdvertisementController.java
@@ -0,0 +1,151 @@
+package com.stylefeng.guns.modular.system.controller.general;
+
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.baomidou.mybatisplus.mapper.Wrapper;
+import com.baomidou.mybatisplus.plugins.Page;
+import com.stylefeng.guns.core.base.controller.BaseController;
+import com.stylefeng.guns.core.common.constant.factory.PageFactory;
+import com.stylefeng.guns.core.shiro.ShiroKit;
+import com.stylefeng.guns.core.util.DateUtil;
+import com.stylefeng.guns.core.util.SinataUtil;
+import com.stylefeng.guns.modular.system.model.TRegion;
+import com.stylefeng.guns.modular.system.service.ITRegionService;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.beans.factory.annotation.Autowired;
+import com.stylefeng.guns.core.log.LogObjectHolder;
+import org.springframework.web.bind.annotation.RequestParam;
+import com.stylefeng.guns.modular.system.model.TAdvertisement;
+import com.stylefeng.guns.modular.system.service.ITAdvertisementService;
+
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 广告设置控制器
+ *
+ * @author fengshuonan
+ * @Date 2020-06-02 09:36:03
+ */
+@Controller
+@RequestMapping("/tAdvertisement")
+public class TAdvertisementController extends BaseController {
+
+ private String PREFIX = "/system/tAdvertisement/";
+
+ @Autowired
+ private ITAdvertisementService tAdvertisementService;
+
+ @Autowired
+ private ITRegionService tRegionService;
+
+ /**
+ * 跳转到广告设置首页
+ */
+ @RequestMapping("")
+ public String index() {
+ return PREFIX + "tAdvertisement.html";
+ }
+
+ /**
+ * 跳转到添加广告设置
+ */
+ @RequestMapping("/tAdvertisement_add")
+ public String tAdvertisementAdd(Model model) {
+ List<TRegion> list = tRegionService.selectList(new EntityWrapper<TRegion>().eq("parent_id", 0));
+ model.addAttribute("list",list);
+ return PREFIX + "tAdvertisement_add.html";
+ }
+
+ /**
+ * 跳转到修改广告设置
+ */
+ @RequestMapping("/tAdvertisement_update/{tAdvertisementId}")
+ public String tAdvertisementUpdate(@PathVariable Integer tAdvertisementId, Model model) {
+ TAdvertisement tAdvertisement = tAdvertisementService.selectById(tAdvertisementId);
+ model.addAttribute("item",tAdvertisement);
+ LogObjectHolder.me().set(tAdvertisement);
+
+ List<TRegion> list = tRegionService.selectList(new EntityWrapper<TRegion>().eq("parent_id", 0));
+ model.addAttribute("list",list);
+ return PREFIX + "tAdvertisement_edit.html";
+ }
+
+ /**
+ * 获取广告设置列表
+ */
+ @RequestMapping(value = "/list")
+ @ResponseBody
+ public Object list(String insertTime,
+ String name,
+ Integer type) {
+ String beginTime = null;
+ String endTime = null;
+ if (SinataUtil.isNotEmpty(insertTime)){
+ String[] timeArray = insertTime.split(" - ");
+ beginTime = timeArray[0];
+ endTime = timeArray[1];
+ }
+ Page<Map<String, Object>> page = new PageFactory<Map<String, Object>>().defaultPage();
+ page.setRecords(tAdvertisementService.getAdvertisementList(page,beginTime,endTime,type,name));
+ return super.packForBT(page);
+ }
+
+ /**
+ * 新增广告设置
+ */
+ @RequestMapping(value = "/add")
+ @ResponseBody
+ public Object add(TAdvertisement tAdvertisement) {
+ tAdvertisement.setInsertTime(new Date());
+ tAdvertisement.setInsertUser(ShiroKit.getUser().getId());
+ tAdvertisementService.insert(tAdvertisement);
+ return SUCCESS_TIP;
+ }
+
+ /**
+ * 删除广告设置
+ */
+ @RequestMapping(value = "/delete")
+ @ResponseBody
+ public Object delete(@RequestParam Integer tAdvertisementId) {
+ tAdvertisementService.deleteById(tAdvertisementId);
+ return SUCCESS_TIP;
+ }
+
+ /**
+ * 操作广告设置
+ */
+ @RequestMapping(value = "/opt")
+ @ResponseBody
+ public Object opt(@RequestParam Integer tAdvertisementId,@RequestParam Integer optType) {
+ TAdvertisement tAdvertisement = tAdvertisementService.selectById(tAdvertisementId);
+ if (SinataUtil.isNotEmpty(tAdvertisement)){
+ if (1 == optType.intValue()){ //上线
+ tAdvertisement.setState(1);
+ }else if (2 == optType.intValue()){ //下线
+ tAdvertisement.setState(2);
+ }
+ tAdvertisement.setUpdateTime(new Date());
+ tAdvertisement.setUpdateUser(ShiroKit.getUser().getId());
+ tAdvertisementService.updateById(tAdvertisement);
+ }
+ return SUCCESS_TIP;
+ }
+
+ /**
+ * 修改广告设置
+ */
+ @RequestMapping(value = "/update")
+ @ResponseBody
+ public Object update(TAdvertisement tAdvertisement) {
+ tAdvertisement.setUpdateTime(new Date());
+ tAdvertisement.setUpdateUser(ShiroKit.getUser().getId());
+ tAdvertisementService.updateById(tAdvertisement);
+ return SUCCESS_TIP;
+ }
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TAgreementController.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TAgreementController.java
new file mode 100644
index 0000000..e1e332e
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TAgreementController.java
@@ -0,0 +1,283 @@
+package com.stylefeng.guns.modular.system.controller.general;
+
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.stylefeng.guns.core.base.controller.BaseController;
+import com.stylefeng.guns.core.shiro.ShiroKit;
+import com.stylefeng.guns.modular.system.util.AddAdminLogUtil;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.beans.factory.annotation.Autowired;
+import com.stylefeng.guns.core.log.LogObjectHolder;
+import org.springframework.web.bind.annotation.RequestParam;
+import com.stylefeng.guns.modular.system.model.TAgreement;
+import com.stylefeng.guns.modular.system.service.ITAgreementService;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 用户端协议管理控制器
+ *
+ * @author fengshuonan
+ * @Date 2020-06-01 17:42:20
+ */
+@Controller
+@RequestMapping("/tAgreement")
+public class TAgreementController extends BaseController {
+
+ private String PREFIX = "/system/tAgreement/";
+
+ @Autowired
+ private ITAgreementService tAgreementService;
+
+ /**
+ * 跳转到用户端协议管理首页
+ */
+ @RequestMapping("")
+ public String index(Model model) {
+ //注册协议
+ TAgreement one = tAgreementService.selectOne(new EntityWrapper<TAgreement>().eq("useType", 1).eq("type", 6));
+ //用户协议
+ TAgreement two = tAgreementService.selectOne(new EntityWrapper<TAgreement>().eq("useType", 1).eq("type", 2));
+ //隐私协议
+ TAgreement three = tAgreementService.selectOne(new EntityWrapper<TAgreement>().eq("useType", 1).eq("type", 1));
+ model.addAttribute("one",one);
+ model.addAttribute("two",two);
+ model.addAttribute("three",three);
+ return PREFIX + "tAgreement.html";
+ }
+
+ /**
+ * 跳转到司机端协议管理首页
+ */
+ @RequestMapping("/driver")
+ public String driverIndex(Model model) {
+ //注册协议
+ TAgreement one = tAgreementService.selectOne(new EntityWrapper<TAgreement>().eq("useType", 2).eq("type", 6));
+ //用户协议
+ TAgreement two = tAgreementService.selectOne(new EntityWrapper<TAgreement>().eq("useType", 2).eq("type", 2));
+ //隐私协议
+ TAgreement three = tAgreementService.selectOne(new EntityWrapper<TAgreement>().eq("useType", 2).eq("type", 1));
+ model.addAttribute("one",one);
+ model.addAttribute("two",two);
+ model.addAttribute("three",three);
+ return PREFIX + "tAgreementDriver.html";
+ }
+
+ /**
+ * 跳转到取消订单说明协议管理首页
+ */
+ @RequestMapping("/order")
+ public String orderIndex(Model model) {
+ TAgreement one = tAgreementService.selectOne(new EntityWrapper<TAgreement>().eq("type", 7));
+ model.addAttribute("one",one);
+ return PREFIX + "tAgreementOrder.html";
+ }
+
+ /**
+ * 跳转到用户指南设置协议管理首页
+ */
+ @RequestMapping("/user")
+ public String userIndex(Model model) {
+ TAgreement one = tAgreementService.selectOne(new EntityWrapper<TAgreement>().eq("type", 3));
+ model.addAttribute("one",one);
+ return PREFIX + "tAgreementUser.html";
+ }
+
+ /**
+ * 跳转到法律法规设置协议管理首页
+ */
+ @RequestMapping("/law")
+ public String lawIndex(Model model) {
+ TAgreement one = tAgreementService.selectOne(new EntityWrapper<TAgreement>().eq("type", 4));
+ model.addAttribute("one",one);
+ return PREFIX + "tAgreementLaw.html";
+ }
+
+ /**
+ * 跳转到关于我们设置协议管理首页
+ */
+ @RequestMapping("/me")
+ public String meIndex(Model model) {
+ TAgreement one = tAgreementService.selectOne(new EntityWrapper<TAgreement>().eq("type", 5));
+ model.addAttribute("one",one);
+ return PREFIX + "tAgreementMe.html";
+ }
+
+ /**
+ * 跳转到充值领券规则设置协议管理首页
+ */
+ @RequestMapping("/recharge")
+ public String rechargeIndex(Model model) {
+ TAgreement one = tAgreementService.selectOne(new EntityWrapper<TAgreement>().eq("type", 8));
+ model.addAttribute("one",one);
+ return PREFIX + "tAgreementRecharge.html";
+ }
+
+ /**
+ * 跳转到司机注册协议设置管理首页
+ */
+ @RequestMapping("/driverRegister")
+ public String driverRegister(Model model) {
+ TAgreement one = tAgreementService.selectOne(new EntityWrapper<TAgreement>().eq("type", 9));
+ model.addAttribute("one",one);
+ return PREFIX + "driverRegister.html";
+ }
+
+ /**
+ * 跳转到改派说明设置管理首页
+ */
+ @RequestMapping("/instructions")
+ public String instructions(Model model) {
+ TAgreement one = tAgreementService.selectOne(new EntityWrapper<TAgreement>().eq("type", 10));
+ model.addAttribute("one",one);
+ return PREFIX + "instructions.html";
+ }
+
+ /**
+ * 跳转到跨城出行乘车须知
+ */
+ @RequestMapping("/corssHtml")
+ public String corssHtml(Model model) {
+ TAgreement one = tAgreementService.selectOne(new EntityWrapper<TAgreement>().eq("type", 11));
+ model.addAttribute("one",one);
+ return PREFIX + "corssHtml.html";
+ }
+
+
+ /**
+ * 跳转到常见问题
+ * @param model
+ * @return
+ */
+ @RequestMapping("/showCommonProblem")
+ public String showCommonProblem(Model model) {
+ TAgreement one = tAgreementService.selectOne(new EntityWrapper<TAgreement>().eq("type", 12));
+ model.addAttribute("one",one);
+ return PREFIX + "commonProblem.html";
+ }
+
+
+ /**
+ * 跳转到计价规则
+ * @param model
+ * @return
+ */
+ @RequestMapping("/showPricingRules")
+ public String showPricingRules(Model model) {
+ TAgreement one = tAgreementService.selectOne(new EntityWrapper<TAgreement>().eq("type", 13));
+ model.addAttribute("one",one);
+ return PREFIX + "pricingRules.html";
+ }
+
+
+ /**
+ * 跳转到包车协议
+ * @param model
+ * @return
+ */
+ @RequestMapping("/showCharterCar")
+ public String showCharterCar(Model model) {
+ TAgreement one = tAgreementService.selectOne(new EntityWrapper<TAgreement>().eq("type", 14));
+ model.addAttribute("one",one);
+ return PREFIX + "tAgreementCharterCar.html";
+ }
+
+
+ /**
+ * 跳转到小件物流协议
+ * @param model
+ * @return
+ */
+ @RequestMapping("/showSmallPieceLogistics")
+ public String showSmallPieceLogistics(Model model) {
+ TAgreement one = tAgreementService.selectOne(new EntityWrapper<TAgreement>().eq("type", 15));
+ model.addAttribute("one",one);
+ return PREFIX + "tAgreementSmallPieceLogistics.html";
+ }
+
+
+ /**
+ * 修改协议
+ */
+ @RequestMapping(value = "/updateAppParam")
+ @ResponseBody
+ public Object updateAppParam(@RequestParam Integer id,@RequestParam String context) {
+ TAgreement agreement = tAgreementService.selectById(id);
+ agreement.setContent(context);
+ agreement.setUpdateTime(new Date());
+ agreement.setUpdateUser(ShiroKit.getUser().getId());
+ tAgreementService.updateById(agreement);
+ return SUCCESS_TIP;
+ }
+
+ /**
+ * 跳转到添加用户端协议管理
+ */
+ @RequestMapping("/tAgreement_add")
+ public String tAgreementAdd() {
+ return PREFIX + "tAgreement_add.html";
+ }
+
+ /**
+ * 跳转到修改用户端协议管理
+ */
+ @RequestMapping("/tAgreement_update/{tAgreementId}")
+ public String tAgreementUpdate(@PathVariable Integer tAgreementId, Model model) {
+ TAgreement tAgreement = tAgreementService.selectById(tAgreementId);
+ model.addAttribute("item",tAgreement);
+ LogObjectHolder.me().set(tAgreement);
+ return PREFIX + "tAgreement_edit.html";
+ }
+
+ /**
+ * 获取用户端协议管理列表
+ */
+ @RequestMapping(value = "/list")
+ @ResponseBody
+ public Object list(String condition) {
+ return tAgreementService.selectList(null);
+ }
+
+ /**
+ * 新增用户端协议管理
+ */
+ @RequestMapping(value = "/add")
+ @ResponseBody
+ public Object add(TAgreement tAgreement) {
+ tAgreementService.insert(tAgreement);
+ return SUCCESS_TIP;
+ }
+
+ /**
+ * 删除用户端协议管理
+ */
+ @RequestMapping(value = "/delete")
+ @ResponseBody
+ public Object delete(@RequestParam Integer tAgreementId) {
+ tAgreementService.deleteById(tAgreementId);
+ return SUCCESS_TIP;
+ }
+
+ /**
+ * 修改用户端协议管理
+ */
+ @RequestMapping(value = "/update")
+ @ResponseBody
+ public Object update(TAgreement tAgreement) {
+ tAgreementService.updateById(tAgreement);
+ return SUCCESS_TIP;
+ }
+
+ /**
+ * 用户端协议管理详情
+ */
+ @RequestMapping(value = "/detail/{tAgreementId}")
+ @ResponseBody
+ public Object detail(@PathVariable("tAgreementId") Integer tAgreementId) {
+ return tAgreementService.selectById(tAgreementId);
+ }
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TCarBrandController.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TCarBrandController.java
new file mode 100644
index 0000000..bd0a98f
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TCarBrandController.java
@@ -0,0 +1,116 @@
+package com.stylefeng.guns.modular.system.controller.general;
+
+import com.baomidou.mybatisplus.plugins.Page;
+import com.stylefeng.guns.core.base.controller.BaseController;
+import com.stylefeng.guns.core.common.constant.factory.PageFactory;
+import com.stylefeng.guns.core.util.SinataUtil;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.beans.factory.annotation.Autowired;
+import com.stylefeng.guns.core.log.LogObjectHolder;
+import org.springframework.web.bind.annotation.RequestParam;
+import com.stylefeng.guns.modular.system.model.TCarBrand;
+import com.stylefeng.guns.modular.system.service.ITCarBrandService;
+
+import java.util.Date;
+import java.util.Map;
+
+/**
+ * 车辆品牌管理控制器
+ *
+ * @author fengshuonan
+ * @Date 2020-06-05 13:52:25
+ */
+@Controller
+@RequestMapping("/tCarBrand")
+public class TCarBrandController extends BaseController {
+
+ private String PREFIX = "/system/tCarBrand/";
+
+ @Autowired
+ private ITCarBrandService tCarBrandService;
+
+ /**
+ * 跳转到车辆品牌管理首页
+ */
+ @RequestMapping("")
+ public String index() {
+ return PREFIX + "tCarBrand.html";
+ }
+
+ /**
+ * 跳转到添加车辆品牌管理
+ */
+ @RequestMapping("/tCarBrand_add")
+ public String tCarBrandAdd() {
+ return PREFIX + "tCarBrand_add.html";
+ }
+
+ /**
+ * 跳转到修改车辆品牌管理
+ */
+ @RequestMapping("/tCarBrand_update/{tCarBrandId}")
+ public String tCarBrandUpdate(@PathVariable Integer tCarBrandId, Model model) {
+ TCarBrand tCarBrand = tCarBrandService.selectById(tCarBrandId);
+ model.addAttribute("item",tCarBrand);
+ LogObjectHolder.me().set(tCarBrand);
+ return PREFIX + "tCarBrand_edit.html";
+ }
+
+ /**
+ * 获取车辆品牌管理列表
+ */
+ @RequestMapping(value = "/list")
+ @ResponseBody
+ public Object list(String createTime,
+ String name) {
+ String beginTime = null;
+ String endTime = null;
+ if (SinataUtil.isNotEmpty(createTime)){
+ String[] timeArray = createTime.split(" - ");
+ beginTime = timeArray[0];
+ endTime = timeArray[1];
+ }
+ Page<Map<String, Object>> page = new PageFactory<Map<String, Object>>().defaultPage();
+ page.setRecords(tCarBrandService.getCarBrandList(page,beginTime,endTime,name));
+ return super.packForBT(page);
+ }
+
+ /**
+ * 新增车辆品牌管理
+ */
+ @RequestMapping(value = "/add")
+ @ResponseBody
+ public Object add(TCarBrand tCarBrand) {
+ tCarBrand.setInsertTime(new Date());
+ tCarBrand.setState(1);
+ tCarBrandService.insert(tCarBrand);
+ return SUCCESS_TIP;
+ }
+
+ /**
+ * 删除车辆品牌管理
+ */
+ @RequestMapping(value = "/delete")
+ @ResponseBody
+ public Object delete(@RequestParam Integer tCarBrandId) {
+ TCarBrand tCarBrand = tCarBrandService.selectById(tCarBrandId);
+ tCarBrand.setState(2);
+ tCarBrandService.updateById(tCarBrand);
+ return SUCCESS_TIP;
+ }
+
+ /**
+ * 修改车辆品牌管理
+ */
+ @RequestMapping(value = "/update")
+ @ResponseBody
+ public Object update(TCarBrand tCarBrand) {
+ tCarBrandService.updateById(tCarBrand);
+ return SUCCESS_TIP;
+ }
+
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TCarController.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TCarController.java
new file mode 100644
index 0000000..cf3a42c
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TCarController.java
@@ -0,0 +1,1045 @@
+package com.stylefeng.guns.modular.system.controller.general;
+
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.baomidou.mybatisplus.plugins.Page;
+import com.stylefeng.guns.core.base.controller.BaseController;
+import com.stylefeng.guns.core.base.tips.ErrorTip;
+import com.stylefeng.guns.core.common.constant.factory.PageFactory;
+import com.stylefeng.guns.core.shiro.ShiroKit;
+import com.stylefeng.guns.core.util.DateUtil;
+import com.stylefeng.guns.core.util.ExcelExportUtil;
+import com.stylefeng.guns.core.util.SinataUtil;
+import com.stylefeng.guns.core.util.WoUtil;
+import com.stylefeng.guns.modular.system.dao.CarInsuranceMapper;
+import com.stylefeng.guns.modular.system.model.*;
+import com.stylefeng.guns.modular.system.service.*;
+import com.stylefeng.guns.modular.system.util.PushMinistryOfTransportUtil;
+import com.stylefeng.guns.modular.system.util.ResultUtil;
+import org.apache.commons.lang.time.DateUtils;
+import org.apache.poi.hdf.extractor.TC;
+import org.apache.poi.ss.usermodel.Cell;
+import org.apache.poi.ss.usermodel.Row;
+import org.apache.poi.ss.usermodel.Sheet;
+import org.apache.poi.ss.usermodel.Workbook;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.ui.Model;
+import org.springframework.beans.factory.annotation.Autowired;
+import com.stylefeng.guns.core.log.LogObjectHolder;
+import org.springframework.web.multipart.MultipartFile;
+import org.springframework.web.multipart.MultipartHttpServletRequest;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
+import java.util.*;
+
+/**
+ * 车辆管理控制器
+ *
+ * @author fengshuonan
+ * @Date 2020-06-05 17:25:12
+ */
+@Controller
+@RequestMapping("/tCar")
+public class TCarController extends BaseController {
+
+ private String PREFIX = "/system/tCar/";
+
+ @Autowired
+ private ITCarService tCarService;
+
+ @Autowired
+ private ITCompanyService tCompanyService;
+
+ @Autowired
+ private ITCarServiceService tCarServiceService;
+
+ @Autowired
+ private ITDriverLineService tDriverLineService;
+
+ @Autowired
+ private ITCarBrandService tCarBrandService;
+
+ @Autowired
+ private ITCarModelService tCarModelService;
+
+ @Autowired
+ private ITDriverService tDriverService;
+
+ @Autowired
+ private ITCompanyService itCompanyService;
+
+ @Autowired
+ private ITCarServiceService itCarServiceService;
+
+ @Autowired
+ private ITServerCarmodelService itServerCarmodelService;
+
+ @Autowired
+ private PushMinistryOfTransportUtil pushMinistryOfTransportUtil;
+
+ @Resource
+ private CarInsuranceMapper carInsuranceMapper;
+
+ @Value("${pushMinistryOfTransport}")
+ private boolean pushMinistryOfTransport;
+
+ /**
+ * 跳转到车辆管理首页
+ */
+ @RequestMapping("")
+ public String index() {
+ return PREFIX + "tCar.html";
+ }
+
+ /**
+ * 跳转到添加车辆管理
+ */
+ @RequestMapping("/tCar_add")
+ public String tCarAdd(Model model) {
+ List<TCompany> companyList = tCompanyService.selectList(new EntityWrapper<TCompany>().eq("type", 2));
+ model.addAttribute("companyList",companyList);
+
+ Integer roleType = ShiroKit.getUser().getRoleType();
+ model.addAttribute("roleType",roleType);
+ if (2 == roleType){
+ List<TCompany> franchiseeList = tCompanyService.selectList(new EntityWrapper<TCompany>().eq("type", 3).eq("superiorId",ShiroKit.getUser().getObjectId()));
+ model.addAttribute("franchiseeList",franchiseeList);
+ }else{
+ model.addAttribute("franchiseeList",null);
+ }
+ //查询当前用户所属分公司/加盟商
+ model.addAttribute("objectName",tCompanyService.selectById(ShiroKit.getUser().getObjectId()).getName());
+
+ //车辆品牌
+ List<TCarBrand> brandList = tCarBrandService.selectList(new EntityWrapper<TCarBrand>().eq("state", 1));
+ model.addAttribute("brandList",brandList);
+ //车辆类型
+ /*List<TCarModel> modelList = tCarModelService.selectList(new EntityWrapper<TCarModel>().eq("state", 1));
+ model.addAttribute("modelList",modelList);*/
+
+ List<TServerCarmodel> zcModelList = itServerCarmodelService.selectList(new EntityWrapper<TServerCarmodel>().eq("type", 1).eq("state", 1));
+ model.addAttribute("zcModelList",zcModelList);
+ List<TServerCarmodel> kcModelList = itServerCarmodelService.selectList(new EntityWrapper<TServerCarmodel>().eq("type", 2).eq("state", 1));
+ model.addAttribute("kcModelList",kcModelList);
+ return PREFIX + "tCar_add.html";
+ }
+
+ /**
+ * 查询车辆类型
+ * @param carBrandId
+ * @return
+ */
+ @RequestMapping(value = "/brandChange")
+ @ResponseBody
+ public Object brandChange(@RequestParam Integer carBrandId) {
+ List<TCarModel> list = new ArrayList<>();
+ if (SinataUtil.isNotEmpty(carBrandId)){
+ list = tCarModelService.selectList(new EntityWrapper<TCarModel>().eq("state",1).eq("brandId", carBrandId));
+ }
+ return list;
+ }
+
+ /**
+ * 跳转到修改车辆管理
+ */
+ @RequestMapping("/tCar_update/{tCarId}")
+ public String tCarUpdate(@PathVariable Integer tCarId, Model model) {
+ TCar tCar = tCarService.selectById(tCarId);
+ model.addAttribute("item",tCar);
+ LogObjectHolder.me().set(tCar);
+
+ Integer roleType = ShiroKit.getUser().getRoleType();
+ model.addAttribute("roleType",roleType);
+ model.addAttribute("objectName",tCompanyService.selectById(ShiroKit.getUser().getObjectId()).getName());
+
+ if (1 == roleType){
+ List<TCompany> companyList = tCompanyService.selectList(new EntityWrapper<TCompany>().eq("type", 2));
+ model.addAttribute("companyList",companyList);
+ List<TCompany> franchiseeList = tCompanyService.selectList(new EntityWrapper<TCompany>().eq("type", 3).eq("superiorId",tCar.getCompanyId()));
+ model.addAttribute("franchiseeList",franchiseeList);
+ }else if (2 == roleType){
+ List<TCompany> franchiseeList = tCompanyService.selectList(new EntityWrapper<TCompany>().eq("type", 3).eq("superiorId",ShiroKit.getUser().getObjectId()));
+ model.addAttribute("franchiseeList",franchiseeList);
+ }
+
+ //查询平台ID
+ TCompany company = tCompanyService.selectOne(new EntityWrapper<TCompany>().eq("type", 1));
+ //判断是平台司机还是加盟司机
+ if ((SinataUtil.isEmpty(tCar.getCompanyId()) || tCar.getCompanyId() == 0 || tCar.getCompanyId() == company.getId()) && (SinataUtil.isEmpty(tCar.getFranchiseeId()) || tCar.getFranchiseeId() == 0)){
+ model.addAttribute("companyType",1);
+ }else{
+ model.addAttribute("companyType",2);
+ }
+
+ //获取经营业务
+ List<TCarService> serviceList = tCarServiceService.selectList(new EntityWrapper<TCarService>().eq("carId", tCar.getId()));
+ Integer one = 1;
+ Integer two = 1;
+ Integer three = 1;
+ Integer four = 1;
+ Integer five = 1;
+ Integer six = 1;
+ Integer zcModel = 0;
+ Integer kcModel = 0;
+ for (TCarService obj : serviceList){
+ if (obj.getType() == 1){
+ one = 2;
+ zcModel = obj.getServerCarModelId();
+ }
+ if (obj.getType() == 2){
+ two = 2;
+ }
+ if (obj.getType() == 3){
+ three = 2;
+ kcModel = obj.getServerCarModelId();
+ }
+ if (obj.getType() == 4){
+ four = 2;
+ }
+ if (obj.getType() == 5){
+ five = 2;
+ }
+ if (obj.getType() == 6){
+ six = 2;
+ }
+ }
+ model.addAttribute("one",one);
+ model.addAttribute("two",two);
+ model.addAttribute("three",three);
+ model.addAttribute("four",four);
+ model.addAttribute("five",five);
+ model.addAttribute("six",six);
+ model.addAttribute("zcModel",zcModel);
+ model.addAttribute("kcModel",kcModel);
+
+ List<TServerCarmodel> zcModelList = itServerCarmodelService.selectList(new EntityWrapper<TServerCarmodel>().eq("type", 1).eq("state", 1));
+ model.addAttribute("zcModelList",zcModelList);
+ List<TServerCarmodel> kcModelList = itServerCarmodelService.selectList(new EntityWrapper<TServerCarmodel>().eq("type", 2).eq("state", 1));
+ model.addAttribute("kcModelList",kcModelList);
+
+ //车辆品牌
+ List<TCarBrand> brandList = tCarBrandService.selectList(new EntityWrapper<TCarBrand>().eq("state", 1));
+ model.addAttribute("brandList",brandList);
+ //车辆类型
+ List<TCarModel> modelList = tCarModelService.selectList(new EntityWrapper<TCarModel>().eq("brandId",tCar.getCarBrandId()).eq("state", 1));
+ model.addAttribute("modelList",modelList);
+ return PREFIX + "tCar_edit.html";
+ }
+
+
+ /**
+ * 跳转到保险列表页
+ * @param carId
+ * @param model
+ * @return
+ */
+ @RequestMapping("/carInsurance")
+ public String carInsurance(Integer carId, Model model){
+ model.addAttribute("carId", carId);
+ return PREFIX + "carInsurance.html";
+ }
+
+ /**
+ * 跳转到添加页面
+ * @param carId
+ * @param model
+ * @return
+ */
+ @RequestMapping("/showAddCarInsurance")
+ public String showAddCarInsurance(Integer carId, Model model){
+ model.addAttribute("carId", carId);
+ model.addAttribute("id", "");
+ return PREFIX + "carInsuranceInfo.html";
+ }
+
+ /**
+ * 跳转到编辑页
+ * @param id
+ * @param carId
+ * @param model
+ * @return
+ */
+ @RequestMapping("/showEditCarInsurance")
+ public String showEditCarInsurance(Integer id, Integer carId, Model model){
+ model.addAttribute("carId", carId);
+ model.addAttribute("id", id);
+ return PREFIX + "carInsuranceInfo.html";
+ }
+
+ /**
+ * 添加保险数据
+ * @param carInsurance
+ * @return
+ */
+ @ResponseBody
+ @RequestMapping(value = "/saveCarInsurance", method = RequestMethod.POST)
+ public ResultUtil saveCarInsurance(CarInsurance carInsurance){
+ if(carInsurance.getId() == null){
+ carInsuranceMapper.insert(carInsurance);
+ new Thread(new Runnable() {
+ @Override
+ public void run() {
+ if(pushMinistryOfTransport){//上传数据
+ pushMinistryOfTransportUtil.baseInfoVehicleInsurance(carInsurance.getId(), 1);
+ }
+ }
+ }).start();
+ }else{
+ carInsuranceMapper.updateById(carInsurance);
+ new Thread(new Runnable() {
+ @Override
+ public void run() {
+ if(pushMinistryOfTransport){//上传数据
+ pushMinistryOfTransportUtil.baseInfoVehicleInsurance(carInsurance.getId(), 2);
+ }
+ }
+ }).start();
+ }
+
+ return ResultUtil.success();
+ }
+
+ /**
+ * 获取保险详情
+ * @param id
+ * @return
+ */
+ @ResponseBody
+ @RequestMapping(value = "/queryCarInsurance", method = RequestMethod.POST)
+ public ResultUtil queryCarInsurance(Integer id){
+ CarInsurance carInsurance = carInsuranceMapper.selectById(id);
+ return ResultUtil.success(carInsurance);
+ }
+
+
+ /**
+ * 获取保险列表
+ * @param carId
+ * @param offset
+ * @param limit
+ * @return
+ */
+ @ResponseBody
+ @RequestMapping(value = "/queryInsuranceList", method = RequestMethod.POST)
+ public Object queryInsuranceList(Integer carId, Integer offset,Integer limit){
+ try {
+ Map<String, Object> map = new HashMap<>();
+ List<Map<String, Object>> list = carInsuranceMapper.queryInsuranceList(carId, offset, limit);
+ int i = carInsuranceMapper.queryInsuranceListCount(carId);
+ map.put("rows", list);
+ map.put("total", i);
+ return map;
+ }catch (Exception e){
+ e.printStackTrace();
+ return ResultUtil.runErr();
+ }
+ }
+
+ /**
+ * 删除保险
+ * @param id
+ * @return
+ */
+ @ResponseBody
+ @RequestMapping(value = "/delCarInsurance", method = RequestMethod.POST)
+ public ResultUtil delCarInsurance(Integer id){
+ carInsuranceMapper.deleteById(id);
+ new Thread(new Runnable() {
+ @Override
+ public void run() {
+ if(pushMinistryOfTransport){//上传数据
+ pushMinistryOfTransportUtil.baseInfoVehicleInsurance(id, 3);
+ }
+ }
+ }).start();
+ return ResultUtil.success();
+ }
+
+
+ /**
+ * 获取车辆管理列表
+ */
+ @RequestMapping(value = "/list")
+ @ResponseBody
+ public Object list(String createTime,
+ String id,
+ String brandName,
+ String modelName,
+ String carColor,
+ String serverStr,
+ String carLicensePlate,
+ String driverName,
+ String companyName,
+ String franchiseeName) {
+ String beginTime = null;
+ String endTime = null;
+ if (SinataUtil.isNotEmpty(createTime)){
+ String[] timeArray = createTime.split(" - ");
+ beginTime = timeArray[0];
+ endTime = timeArray[1];
+ }
+ Page<Map<String, Object>> page = new PageFactory<Map<String, Object>>().defaultPage();
+ page.setRecords(tCarService.getCarList(page,ShiroKit.getUser().getRoleType(),ShiroKit.getUser().getObjectId(),beginTime,endTime,id,brandName,modelName,carColor,serverStr,carLicensePlate,driverName,companyName,franchiseeName));
+ return super.packForBT(page);
+ }
+
+ /**
+ * 新增车辆管理
+ */
+ @RequestMapping(value = "/add")
+ @ResponseBody
+ public Object add(TCar tCar,@RequestParam String serverBox,Integer roleType,Integer companyType,Integer oneId,Integer twoId,Integer franchiseeId,String zcModel,String kcModel) {
+ if (1 == roleType){ //平台
+ if (2 == companyType.intValue()){
+ if (SinataUtil.isNotEmpty(oneId)){
+ tCar.setCompanyId(oneId);
+ }
+ if (SinataUtil.isNotEmpty(twoId)){
+ tCar.setFranchiseeId(twoId);
+ }
+ }else if (1 == companyType.intValue()){
+ TCompany company = tCompanyService.selectOne(new EntityWrapper<TCompany>().eq("type", 1));
+ tCar.setCompanyId(company.getId());
+ tCar.setFranchiseeId(0);
+ }
+ tCar.setAddType(2);
+ tCar.setIsPlatCar(1);
+ }else if (2 == roleType){ //分公司
+ if (SinataUtil.isNotEmpty(ShiroKit.getUser().getObjectId())){
+ tCar.setCompanyId(ShiroKit.getUser().getObjectId());
+ }
+ if (SinataUtil.isNotEmpty(franchiseeId)){
+ tCar.setFranchiseeId(franchiseeId);
+ }
+ tCar.setIsPlatCar(2);
+ tCar.setAddType(3);
+ tCar.setAddObjectId(ShiroKit.getUser().getObjectId());
+ }else if (3 == roleType){ //加盟商
+ TCompany tCompany = tCompanyService.selectById(ShiroKit.getUser().getObjectId());
+ if (SinataUtil.isNotEmpty(tCompany)){
+ tCar.setCompanyId(tCompany.getSuperiorId());
+ }
+ if (SinataUtil.isNotEmpty(ShiroKit.getUser().getObjectId())){
+ tCar.setFranchiseeId(ShiroKit.getUser().getObjectId());
+ }
+ tCar.setIsPlatCar(2);
+ tCar.setAddType(4);
+ tCar.setAddObjectId(ShiroKit.getUser().getObjectId());
+ }
+ tCar.setInsertTime(new Date());
+ tCar.setState(1);
+ tCarService.insert(tCar);
+
+ //添加经营业务
+ String[] serverArray = serverBox.split(",");
+ for (int i=0;i<serverArray.length;i++){
+ TCarService service = new TCarService();
+ service.setCarId(tCar.getId());
+ service.setType(Integer.valueOf(serverArray[i]));
+ if (1 == service.getType()){
+ service.setServerCarModelId(Integer.valueOf(zcModel));
+ }else if (3 == service.getType()){
+ service.setServerCarModelId(Integer.valueOf(kcModel));
+ }
+ tCarServiceService.insert(service);
+ }
+
+ new Thread(new Runnable() {
+ @Override
+ public void run() {
+ if(pushMinistryOfTransport){//上传数据
+ pushMinistryOfTransportUtil.baseInfoCompanyStat();
+ pushMinistryOfTransportUtil.baseInfoVehicle(tCar.getId());
+ }
+ }
+ }).start();
+ return SUCCESS_TIP;
+ }
+
+ /**
+ * 删除车辆管理
+ */
+ @RequestMapping(value = "/delete")
+ @ResponseBody
+ public Object delete(@RequestParam Integer tCarId) {
+ TCar tCar = tCarService.selectById(tCarId);
+ tCar.setState(2);
+ tCarService.updateById(tCar);
+
+ //清除相对应的司机关联车辆ID
+ List<TDriver> list = tDriverService.selectList(new EntityWrapper<TDriver>().eq("carId", tCarId));
+ for (TDriver obj : list){
+ obj.setCarId(null);
+ tDriverService.updateById(obj);
+ }
+
+ new Thread(new Runnable() {
+ @Override
+ public void run() {
+ if(pushMinistryOfTransport){//上传数据
+ pushMinistryOfTransportUtil.baseInfoCompanyStat();
+ pushMinistryOfTransportUtil.baseInfoVehicle(tCar.getId());
+ }
+ }
+ }).start();
+ return SUCCESS_TIP;
+ }
+
+ /**
+ * 修改车辆管理
+ */
+ @RequestMapping(value = "/update")
+ @ResponseBody
+ public Object update(TCar tCar,@RequestParam String serverBox,Integer roleType,Integer companyType,Integer oneId,Integer twoId,Integer franchiseeId,String zcModel,String kcModel) {
+ if (1 == roleType){ //平台
+ if (2 == companyType.intValue()){
+ if (SinataUtil.isNotEmpty(oneId)){
+ tCar.setCompanyId(oneId);
+ }
+ if (SinataUtil.isNotEmpty(twoId)){
+ tCar.setFranchiseeId(twoId);
+ }
+ }else if (1 == companyType.intValue()){
+ TCompany company = tCompanyService.selectOne(new EntityWrapper<TCompany>().eq("type", 1));
+ tCar.setCompanyId(company.getId());
+ tCar.setFranchiseeId(0);
+ }
+ }else if (2 == roleType){ //分公司
+ if (SinataUtil.isNotEmpty(ShiroKit.getUser().getObjectId())){
+ tCar.setCompanyId(ShiroKit.getUser().getObjectId());
+ }
+ if (SinataUtil.isNotEmpty(franchiseeId)){
+ tCar.setFranchiseeId(franchiseeId);
+ }
+ }else if (3 == roleType){ //加盟商
+ TCompany tCompany = tCompanyService.selectById(ShiroKit.getUser().getObjectId());
+ if (SinataUtil.isNotEmpty(tCompany)){
+ tCar.setCompanyId(tCompany.getSuperiorId());
+ }
+ if (SinataUtil.isNotEmpty(ShiroKit.getUser().getObjectId())){
+ tCar.setFranchiseeId(ShiroKit.getUser().getObjectId());
+ }
+ }
+
+ //删除业务
+ tCarServiceService.delete(new EntityWrapper<TCarService>().eq("carId",tCar.getId()));
+
+ //添加经营业务
+ String[] serverArray = serverBox.split(",");
+ for (int i=0;i<serverArray.length;i++){
+ TCarService service = new TCarService();
+ service.setCarId(tCar.getId());
+ service.setType(Integer.valueOf(serverArray[i]));
+ if (1 == service.getType()){
+ service.setServerCarModelId(Integer.valueOf(zcModel));
+ }else if (3 == service.getType()){
+ service.setServerCarModelId(Integer.valueOf(kcModel));
+ }
+ tCarServiceService.insert(service);
+ }
+
+ tCarService.updateById(tCar);
+ new Thread(new Runnable() {
+ @Override
+ public void run() {
+ if(pushMinistryOfTransport){
+ pushMinistryOfTransportUtil.baseInfoVehicle(tCar.getId());
+ }
+ }
+ }).start();
+ return SUCCESS_TIP;
+ }
+
+ /**
+ * 车辆管理详情
+ */
+ @RequestMapping(value = "/detail/{tCarId}")
+ @ResponseBody
+ public Object detail(@PathVariable("tCarId") Integer tCarId) {
+ return tCarService.selectById(tCarId);
+ }
+
+ /**
+ * 下载模板
+ * @param request
+ * @param response
+ */
+ @RequestMapping(value = "/uploadCarModel")
+ public void uploadCarModel(HttpServletRequest request, HttpServletResponse response) {
+ // 表格数据【封装】
+ List<List<String>> dataList = new ArrayList<List<String>>();
+
+ // 首行【封装】
+ List<String> shellList = new ArrayList<String>();
+ shellList.add("所属机构[平台车辆/加盟车辆]");
+ shellList.add("所属分公司[提示:加盟车辆选填]");
+ shellList.add("所属加盟商[提示:加盟车辆选填]");
+ shellList.add("服务模式:专车[是/否]");
+ shellList.add("服务模式:出租车[是/否]");
+ shellList.add("服务模式:跨城出行[是/否]");
+ shellList.add("服务模式:小件同城物流[是/否]");
+ shellList.add("服务模式:小件跨城物流[是/否]");
+ shellList.add("服务模式:包车[是/否]");
+ shellList.add("车辆品牌");
+ shellList.add("车辆类型");
+ shellList.add("车辆颜色[黑色/银色/白色/红色/黄色/橙色/蓝色]");
+ shellList.add("车牌号");
+ shellList.add("行驶证编号");
+ shellList.add("年检到期时间[例如 2020-02-02]");
+ shellList.add("商业保险到期时间[例如 2020-02-02]");
+ dataList.add(shellList);
+
+ try {
+ // 调用工具类进行导出
+ ExcelExportUtil.easySheet("平台导入车辆模板"+DateUtil.formatDate(new Date(), "YYYYMMddHHmmss"), "平台导入车辆模板", dataList, request, response);
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ }
+
+
+ /**
+ * 导入操作
+ * @param request
+ * @return
+ */
+ @RequestMapping(value="/exportCar",method = RequestMethod.POST)
+ @ResponseBody
+ public Object exportCar(HttpServletRequest request){
+ MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request;
+ MultipartFile file = (MultipartFile) multipartRequest.getFile("myfile");
+ try {
+ //定时五秒后执行
+ /*Map<String,Object> maps=new HashMap<>();
+ Workbook book = WoUtil.ImportFile(file);
+ maps.put("book",book);
+ QuartzManager.addJob(AddContract.class, (AddContract.name+new Date().getTime()).toUpperCase(), TimeJobType.ADMIN,DateUtil.getDate_strYMdHms(new Date().getTime() + 1*1000) , maps);*/
+
+ Workbook book = WoUtil.ImportFile(file);
+ Sheet sh = book.getSheetAt(0); //获取到第一个表
+ for (int i = 1; i <= sh.getLastRowNum(); i++) {
+ Row row = sh.getRow(i);
+
+ Cell cell0 = row.getCell(0); //所属机构[平台车辆/加盟车辆]
+ String zero = null;
+ if (SinataUtil.isNotEmpty(cell0)){
+ zero = String.valueOf(cell0.getStringCellValue()).trim();
+ }
+
+ Cell cell1 = row.getCell(1); //所属分公司[提示:加盟车辆选填]
+ String one = null;
+ if (SinataUtil.isNotEmpty(cell1)){
+ one = String.valueOf(cell1.getStringCellValue()).trim();
+ }
+
+ Cell cell2 = row.getCell(2); //所属加盟商[提示:加盟车辆选填]
+ String two = null;
+ if (SinataUtil.isNotEmpty(cell2)){
+ two = String.valueOf(cell2.getStringCellValue()).trim();
+ }
+
+ Cell cell3 = row.getCell(3); //服务模式:专车[是/否]
+ String three = null;
+ if (SinataUtil.isNotEmpty(cell3)){
+ three = String.valueOf(cell3.getStringCellValue()).trim();
+ }
+
+ Cell cell4 = row.getCell(4); //服务模式:出租车[是/否]
+ String four = null;
+ if (SinataUtil.isNotEmpty(cell4)){
+ four = String.valueOf(cell4.getStringCellValue()).trim();
+ }
+
+ Cell cell5 = row.getCell(5); //服务模式:跨城出行[是/否]
+ String five = null;
+ if (SinataUtil.isNotEmpty(cell5)){
+ five = String.valueOf(cell5.getStringCellValue()).trim();
+ }
+
+ Cell cell6 = row.getCell(6); //服务模式:小件跨城物流[是/否]
+ String six = null;
+ if (SinataUtil.isNotEmpty(cell6)){
+ six = String.valueOf(cell6.getStringCellValue()).trim();
+ }
+
+ Cell cell7 = row.getCell(7); //服务模式:小件跨城物流[是/否]
+ String seven = null;
+ if (SinataUtil.isNotEmpty(cell7)){
+ seven = String.valueOf(cell7.getStringCellValue()).trim();
+ }
+
+ Cell cell8 = row.getCell(8); //服务模式:包车[是/否]
+ String eight = null;
+ if (SinataUtil.isNotEmpty(cell8)){
+ eight = String.valueOf(cell8.getStringCellValue()).trim();
+ }
+
+ Cell cell9 = row.getCell(9); //车辆品牌
+ String nine = null;
+ if (SinataUtil.isNotEmpty(cell9)){
+ nine = String.valueOf(cell9.getStringCellValue()).trim();
+ }
+
+ Cell cell10 = row.getCell(10); //车辆类型
+ String ten = null;
+ if (SinataUtil.isNotEmpty(cell10)){
+ ten = String.valueOf(cell10.getStringCellValue()).trim();
+ }
+
+ Cell cell11 = row.getCell(11); //车辆颜色[黑色/银色/白色/红色/黄色/橙色/蓝色]
+ String eleven = null;
+ if (SinataUtil.isNotEmpty(cell11)){
+ eleven = String.valueOf(cell11.getStringCellValue()).trim();
+ }
+
+ Cell cell12 = row.getCell(12); //车牌号
+ String twelve = null;
+ if (SinataUtil.isNotEmpty(cell12)){
+ twelve = String.valueOf(cell12.getStringCellValue()).trim();
+ }
+
+ Cell cell13 = row.getCell(13); //行驶证编号
+ String thirteen = null;
+ if (SinataUtil.isNotEmpty(cell13)){
+ thirteen = String.valueOf(cell13.getStringCellValue()).trim();
+ }
+
+ Cell cell14 = row.getCell(14); //年检到期时间
+ String fourteen = null;
+ if (SinataUtil.isNotEmpty(cell14)){
+ fourteen = String.valueOf(cell14.getStringCellValue()).trim();
+ }
+
+ Cell cell15 = row.getCell(15); //商业保险到期时间
+ String fifteen = null;
+ if (SinataUtil.isNotEmpty(cell15)){
+ fifteen = String.valueOf(cell15.getStringCellValue()).trim();
+ }
+
+ if (SinataUtil.isEmpty(zero) || SinataUtil.isEmpty(three) || SinataUtil.isEmpty(four)
+ || SinataUtil.isEmpty(five) || SinataUtil.isEmpty(six) || SinataUtil.isEmpty(seven)
+ || SinataUtil.isEmpty(eight) || SinataUtil.isEmpty(nine) || SinataUtil.isEmpty(ten)
+ || SinataUtil.isEmpty(eleven) || SinataUtil.isEmpty(twelve) || SinataUtil.isEmpty(thirteen)
+ || SinataUtil.isEmpty(fourteen) || SinataUtil.isEmpty(fifteen)){
+ return new ErrorTip(500, "单元格不能为空");
+ }else{
+ //判断所属机构
+ if (!zero.equals("平台车辆") && !zero.equals("加盟车辆")){
+ return new ErrorTip(500, "所属机构内容不正确");
+ }
+ //判断服务模式【专车】
+ if (!three.equals("是") && !three.equals("否")){
+ return new ErrorTip(500, "服务模式【专车】内容不正确");
+ }
+ //判断服务模式【出租车】
+ if (!four.equals("是") && !four.equals("否")){
+ return new ErrorTip(500, "服务模式【出租车】内容不正确");
+ }
+ //判断服务模式【跨城出行】
+ if (!five.equals("是") && !five.equals("否")){
+ return new ErrorTip(500, "服务模式【跨城出行】内容不正确");
+ }
+ //判断服务模式【小件同城物流】
+ if (!six.equals("是") && !six.equals("否")){
+ return new ErrorTip(500, "服务模式【小件同城物流】内容不正确");
+ }
+ //判断服务模式【小件跨城物流】
+ if (!seven.equals("是") && !seven.equals("否")){
+ return new ErrorTip(500, "服务模式【小件跨城物流】内容不正确");
+ }
+ //判断服务模式【包车】
+ if (!eight.equals("是") && !eight.equals("否")){
+ return new ErrorTip(500, "服务模式【包车】内容不正确");
+ }
+ //判断车辆颜色
+ if (!eleven.equals("黑色") && !eleven.equals("银色") && !eleven.equals("白色") && !eleven.equals("红色") && !eleven.equals("黄色") && !eleven.equals("橙色") && !eleven.equals("蓝色")){
+ return new ErrorTip(500, "车辆颜色内容不正确");
+ }
+ //判断年检到期时间格式是否正确
+ try {
+ if (!isValidDate(fourteen)) {
+ fourteen = importByExcelForDate(fourteen);
+ }
+ }catch (Exception e){
+ return new ErrorTip(500, "年检到期时间格式不正确");
+ }
+ //判断商业保险到期时间格式是否正确
+ try {
+ if (!isValidDate(fifteen)) {
+ fifteen = importByExcelForDate(fifteen);
+ }
+ }catch (Exception e){
+ return new ErrorTip(500, "商业保险到期时间格式不正确");
+ }
+
+ //查找平台公司
+ TCompany platCompany = itCompanyService.selectOne(new EntityWrapper<TCompany>().eq("type", 1).notIn("flag", "3").last(" limit 1"));
+ Integer companyId = platCompany.getId();
+ Integer franchiseeId = 0;
+ if ("加盟车辆".equals(zero)){
+ //判断所属分公司是否存在
+ if (SinataUtil.isNotEmpty(one)){
+ TCompany company = itCompanyService.selectOne(new EntityWrapper<TCompany>().eq("name", one).eq("type", 2).notIn("flag", "3").last(" limit 1"));
+ if (SinataUtil.isNotEmpty(company)){
+ companyId = company.getId();
+ //判断加盟商是否存在
+ if (SinataUtil.isNotEmpty(two)){
+ TCompany franchisee = itCompanyService.selectOne(new EntityWrapper<TCompany>().eq("superiorId",company.getId()).eq("name", two).eq("type", 3).notIn("flag", "3").last(" limit 1"));
+ if (SinataUtil.isNotEmpty(franchisee)){
+ franchiseeId = franchisee.getId();
+ }
+ }
+ }
+ }
+ }
+
+ Integer carBrandId = null;
+ Integer carModelId = null;
+ //查找品牌
+ if (SinataUtil.isNotEmpty(nine)){
+ TCarBrand carBrand = tCarBrandService.selectOne(new EntityWrapper<TCarBrand>().eq("name", nine).eq("state", 1).last(" limit 1"));
+ if (SinataUtil.isNotEmpty(carBrand)){
+ carBrandId = carBrand.getId();
+ if (SinataUtil.isNotEmpty(ten)){
+ //查找类型
+ TCarModel carModel = tCarModelService.selectOne(new EntityWrapper<TCarModel>().eq("brandId", carBrand.getId()).eq("name", ten).eq("state", 1).last(" limit 1"));
+ if (SinataUtil.isNotEmpty(carModel)){
+ carModelId = carModel.getId();
+ }
+ }
+ }
+ }
+
+ //添加车辆对象
+ TCar car = new TCar();
+ if ("平台车辆".equals(zero)){
+ car.setIsPlatCar(1);
+ }else if ("加盟车辆".equals(zero)){
+ car.setIsPlatCar(2);
+ }
+ car.setCompanyId(companyId);
+ car.setFranchiseeId(franchiseeId);
+ car.setCarColor(eleven);
+ car.setCarBrandId(carBrandId);
+ car.setCarModelId(carModelId);
+ car.setCarLicensePlate(twelve);
+ car.setDrivingLicenseNumber(thirteen);
+ car.setAnnualInspectionTime(DateUtil.parseDate(fourteen));
+ car.setCommercialInsuranceTime(DateUtil.parseDate(fifteen));
+ car.setInsertTime(new Date());
+ car.setState(1);
+ if (ShiroKit.getUser().getRoleType() == 1){
+ car.setAddType(2);
+ }else if (ShiroKit.getUser().getRoleType() == 2){
+ car.setAddType(3);
+ car.setAddObjectId(ShiroKit.getUser().getObjectId());
+ }else if (ShiroKit.getUser().getRoleType() == 3){
+ car.setAddType(4);
+ car.setAddObjectId(ShiroKit.getUser().getObjectId());
+ }
+ tCarService.insert(car);
+
+ //添加专车服务模式
+ if ("是".equals(three)){
+ TCarService service = new TCarService();
+ service.setCarId(car.getId());
+ service.setType(1);
+ tCarServiceService.insert(service);
+ }
+ //添加出租车服务模式
+ if ("是".equals(four)){
+ TCarService service = new TCarService();
+ service.setCarId(car.getId());
+ service.setType(2);
+ tCarServiceService.insert(service);
+ }
+ //添加跨城出行服务模式
+ if ("是".equals(five)){
+ TCarService service = new TCarService();
+ service.setCarId(car.getId());
+ service.setType(3);
+ tCarServiceService.insert(service);
+ }
+ //添加小件同城物流服务模式
+ if ("是".equals(six)){
+ TCarService service = new TCarService();
+ service.setCarId(car.getId());
+ service.setType(4);
+ tCarServiceService.insert(service);
+ }
+ //添加小件跨城物流服务模式
+ if ("是".equals(seven)){
+ TCarService service = new TCarService();
+ service.setCarId(car.getId());
+ service.setType(5);
+ tCarServiceService.insert(service);
+ }
+ //添加包车服务模式
+ if ("是".equals(eight)){
+ TCarService service = new TCarService();
+ service.setCarId(car.getId());
+ service.setType(6);
+ tCarServiceService.insert(service);
+ }
+ }
+ }
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ return SUCCESS_TIP;
+ }
+
+ /**
+ * 判断日期是否满足yyyy-MM-dd格式
+ * @param str
+ * @return
+ */
+ public static boolean isValidDate(String str) {
+ boolean convertSuccess=true;
+ SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
+ try {
+ format.setLenient(false);
+ format.parse(str);
+ } catch (Exception e) {
+ convertSuccess=false;
+ }
+ return convertSuccess;
+ }
+
+
+ /**
+ * 转换日期
+ * @return
+ */
+ public static String importByExcelForDate(String value) {//value就是它的天数
+ String currentCellValue = "";
+ if(value != null && !value.equals("")){
+ Calendar calendar = new GregorianCalendar(1900,0,-1);
+ Date d = calendar.getTime();
+ Date dd = DateUtils.addDays(d,Integer.valueOf(value));
+ DateFormat formater = new SimpleDateFormat("yyyy-MM-dd");
+ currentCellValue = formater.format(dd);
+ }
+ return currentCellValue;
+ }
+
+ /**
+ * 导出车辆信息
+ */
+ @RequestMapping(value = "/outCar")
+ public void outCar(HttpServletRequest request, HttpServletResponse response) {
+ List<Map<String,Object>> listMap = tCarService.getCarListNoPage(ShiroKit.getUser().getRoleType(),ShiroKit.getUser().getObjectId());
+
+ // 表格数据【封装】
+ List<List<String>> dataList = new ArrayList<>();
+
+ //第一行显示【封装】
+ List<String> twoList = new ArrayList<String>();
+ twoList.add("总计:");
+ twoList.add(String.valueOf(listMap.size())+"条");
+ dataList.add(twoList);
+
+ // 列【封装】
+ List<String> shellList = new ArrayList<String>();
+ shellList.add("添加时间");
+ shellList.add("车辆ID");
+ shellList.add("所属分公司");
+ shellList.add("所属加盟商");
+ shellList.add("车辆品牌");
+ shellList.add("车辆类型");
+ shellList.add("颜色");
+ shellList.add("服务模式");
+ shellList.add("车牌号");
+ shellList.add("行驶证号码");
+ shellList.add("座位数");
+ shellList.add("关联司机");
+ shellList.add("年检到期时间");
+ shellList.add("商业保险到期时间");
+ dataList.add(shellList);
+
+ for (Map<String,Object> object : listMap){
+ // 详细数据列【封装】
+ shellList = new ArrayList<String>();
+ if(SinataUtil.isNotEmpty(object.get("insertTime"))){
+ shellList.add(DateUtil.formatDate(DateUtil.parse(object.get("insertTime").toString(),"YYYY-MM-dd HH:mm:ss.S"), "YYYY-MM-dd HH:mm:ss"));
+ }else{
+ shellList.add("-");
+ }
+ shellList.add(String.valueOf(object.get("id")));
+ if(SinataUtil.isNotEmpty(object.get("companyName"))){
+ shellList.add(object.get("companyName").toString());
+ }else{
+ shellList.add("-");
+ }
+ if(SinataUtil.isNotEmpty(object.get("franchiseeName"))){
+ shellList.add(object.get("franchiseeName").toString());
+ }else{
+ shellList.add("-");
+ }
+ if(SinataUtil.isNotEmpty(object.get("brandName"))){
+ shellList.add(object.get("brandName").toString());
+ }else{
+ shellList.add("-");
+ }
+ if(SinataUtil.isNotEmpty(object.get("modelName"))){
+ shellList.add(object.get("modelName").toString());
+ }else{
+ shellList.add("-");
+ }
+ if(SinataUtil.isNotEmpty(object.get("carColor"))){
+ shellList.add(object.get("carColor").toString());
+ }else{
+ shellList.add("-");
+ }
+ if(SinataUtil.isNotEmpty(object.get("serverStr"))){
+ shellList.add(object.get("serverStr").toString());
+ }else{
+ shellList.add("-");
+ }
+ if(SinataUtil.isNotEmpty(object.get("carLicensePlate"))){
+ shellList.add(object.get("carLicensePlate").toString());
+ }else{
+ shellList.add("-");
+ }
+ if(SinataUtil.isNotEmpty(object.get("drivingLicenseNumber"))){
+ shellList.add(object.get("drivingLicenseNumber").toString());
+ }else{
+ shellList.add("-");
+ }
+ if(SinataUtil.isNotEmpty(object.get("seat"))){
+ shellList.add(object.get("seat").toString());
+ }else{
+ shellList.add("-");
+ }
+ if(SinataUtil.isNotEmpty(object.get("driverName"))){
+ shellList.add(object.get("driverName").toString());
+ }else{
+ shellList.add("-");
+ }
+ if(SinataUtil.isNotEmpty(object.get("annualInspectionTime"))){
+ shellList.add(DateUtil.formatDate(DateUtil.parse(object.get("annualInspectionTime").toString(),"YYYY-MM-dd HH:mm:ss.S"), "YYYY-MM-dd HH:mm:ss"));
+ }else{
+ shellList.add("-");
+ }
+ if(SinataUtil.isNotEmpty(object.get("commercialInsuranceTime"))){
+ shellList.add(DateUtil.formatDate(DateUtil.parse(object.get("commercialInsuranceTime").toString(),"YYYY-MM-dd HH:mm:ss.S"), "YYYY-MM-dd HH:mm:ss"));
+ }else{
+ shellList.add("-");
+ }
+ dataList.add(shellList);
+ }
+ try {
+ // 调用工具类进行导出
+ ExcelExportUtil.easySheet("车辆信息导出记录"+DateUtil.formatDate(new Date(), "YYYYMMddHHmmss"), "车辆信息导出记录", dataList,request, response);
+
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ }
+
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TCarModelController.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TCarModelController.java
new file mode 100644
index 0000000..549c3f2
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TCarModelController.java
@@ -0,0 +1,128 @@
+package com.stylefeng.guns.modular.system.controller.general;
+
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.baomidou.mybatisplus.plugins.Page;
+import com.stylefeng.guns.core.base.controller.BaseController;
+import com.stylefeng.guns.core.common.constant.factory.PageFactory;
+import com.stylefeng.guns.core.util.SinataUtil;
+import com.stylefeng.guns.modular.system.model.TCarBrand;
+import com.stylefeng.guns.modular.system.service.ITCarBrandService;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.beans.factory.annotation.Autowired;
+import com.stylefeng.guns.core.log.LogObjectHolder;
+import org.springframework.web.bind.annotation.RequestParam;
+import com.stylefeng.guns.modular.system.model.TCarModel;
+import com.stylefeng.guns.modular.system.service.ITCarModelService;
+
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 车辆类型管理控制器
+ *
+ * @author fengshuonan
+ * @Date 2020-06-05 14:31:28
+ */
+@Controller
+@RequestMapping("/tCarModel")
+public class TCarModelController extends BaseController {
+
+ private String PREFIX = "/system/tCarModel/";
+
+ @Autowired
+ private ITCarModelService tCarModelService;
+
+ @Autowired
+ private ITCarBrandService tCarBrandService;
+
+ /**
+ * 跳转到车辆类型管理首页
+ */
+ @RequestMapping("")
+ public String index() {
+ return PREFIX + "tCarModel.html";
+ }
+
+ /**
+ * 跳转到添加车辆类型管理
+ */
+ @RequestMapping("/tCarModel_add")
+ public String tCarModelAdd(Model model) {
+ List<TCarBrand> brandList = tCarBrandService.selectList(new EntityWrapper<TCarBrand>().eq("state", 1).orderBy("insertTime", false));
+ model.addAttribute("brandList",brandList);
+ return PREFIX + "tCarModel_add.html";
+ }
+
+ /**
+ * 跳转到修改车辆类型管理
+ */
+ @RequestMapping("/tCarModel_update/{tCarModelId}")
+ public String tCarModelUpdate(@PathVariable Integer tCarModelId, Model model) {
+ TCarModel tCarModel = tCarModelService.selectById(tCarModelId);
+ model.addAttribute("item",tCarModel);
+ LogObjectHolder.me().set(tCarModel);
+
+ List<TCarBrand> brandList = tCarBrandService.selectList(new EntityWrapper<TCarBrand>().eq("state", 1).orderBy("insertTime", false));
+ model.addAttribute("brandList",brandList);
+ return PREFIX + "tCarModel_edit.html";
+ }
+
+ /**
+ * 获取车辆类型管理列表
+ */
+ @RequestMapping(value = "/list")
+ @ResponseBody
+ public Object list(String createTime,
+ String name) {
+ String beginTime = null;
+ String endTime = null;
+ if (SinataUtil.isNotEmpty(createTime)){
+ String[] timeArray = createTime.split(" - ");
+ beginTime = timeArray[0];
+ endTime = timeArray[1];
+ }
+ Page<Map<String, Object>> page = new PageFactory<Map<String, Object>>().defaultPage();
+ page.setRecords(tCarModelService.getCarModelList(page,beginTime,endTime,name));
+ return super.packForBT(page);
+ }
+
+ /**
+ * 新增车辆类型管理
+ */
+ @RequestMapping(value = "/add")
+ @ResponseBody
+ public Object add(TCarModel tCarModel) {
+ tCarModel.setInsertTime(new Date());
+ tCarModel.setState(1);
+ tCarModelService.insert(tCarModel);
+ return SUCCESS_TIP;
+ }
+
+ /**
+ * 删除车辆类型管理
+ */
+ @RequestMapping(value = "/delete")
+ @ResponseBody
+ public Object delete(@RequestParam Integer tCarModelId) {
+ TCarModel tCarModel = tCarModelService.selectById(tCarModelId);
+ tCarModel.setState(2);
+ tCarModelService.updateById(tCarModel);
+ return SUCCESS_TIP;
+ }
+
+ /**
+ * 修改车辆类型管理
+ */
+ @RequestMapping(value = "/update")
+ @ResponseBody
+ public Object update(TCarModel tCarModel) {
+ tCarModelService.updateById(tCarModel);
+ return SUCCESS_TIP;
+ }
+
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TCompanyController.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TCompanyController.java
new file mode 100644
index 0000000..d1251e9
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TCompanyController.java
@@ -0,0 +1,476 @@
+package com.stylefeng.guns.modular.system.controller.general;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.baomidou.mybatisplus.plugins.Page;
+import com.stylefeng.guns.core.base.controller.BaseController;
+import com.stylefeng.guns.core.common.constant.factory.PageFactory;
+import com.stylefeng.guns.core.shiro.ShiroKit;
+import com.stylefeng.guns.core.util.DateUtil;
+import com.stylefeng.guns.core.util.SinataUtil;
+import com.stylefeng.guns.modular.system.model.*;
+import com.stylefeng.guns.modular.system.service.ITCompanyCityService;
+import com.stylefeng.guns.modular.system.service.ITRegionService;
+import com.stylefeng.guns.modular.system.service.IUserService;
+import com.stylefeng.guns.modular.system.util.PushMinistryOfTransportUtil;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.beans.factory.annotation.Autowired;
+import com.stylefeng.guns.core.log.LogObjectHolder;
+import org.springframework.web.bind.annotation.RequestParam;
+import com.stylefeng.guns.modular.system.service.ITCompanyService;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 分公司管理控制器
+ *
+ * @author fengshuonan
+ * @Date 2020-06-06 09:15:48
+ */
+@Controller
+@RequestMapping("/tCompany")
+public class TCompanyController extends BaseController {
+
+ private String PREFIX = "/system/tCompany/";
+
+ @Autowired
+ private ITCompanyService tCompanyService;
+
+ @Autowired
+ private ITRegionService tRegionService;
+
+ @Autowired
+ private IUserService userService;
+
+ @Autowired
+ private ITCompanyCityService tCompanyCityService;
+
+ @Autowired
+ private PushMinistryOfTransportUtil pushMinistryOfTransportUtil;
+
+ @Value("${pushMinistryOfTransport}")
+ private boolean pushMinistryOfTransport;
+
+ /**
+ * 跳转到修改平台信息
+ */
+ @RequestMapping("/admin_update")
+ public String tCompanyUpdate(Model model) {
+ TCompany tCompany = tCompanyService.selectOne(new EntityWrapper<TCompany>().eq("type",1).notIn("flag",3));
+ model.addAttribute("item",tCompany);
+ LogObjectHolder.me().set(tCompany);
+
+ //省
+ List<TRegion> provinceList = tRegionService.selectList(new EntityWrapper<TRegion>().eq("parent_id", 0));
+ model.addAttribute("provinceList",provinceList);
+
+ //系统用户对象
+ User user = userService.selectOne(new EntityWrapper<User>().eq("roleType", 1).eq("objectId", tCompany.getId()));
+ model.addAttribute("user",user);
+
+ //经营区域
+ List<Map<String, Object>> scopeList = tCompanyService.getCompanyScopeById(tCompany.getId());
+ model.addAttribute("scopeList",scopeList);
+ return PREFIX + "platformEdit.html";
+ }
+
+ /**
+ * 跳转到分公司管理首页
+ */
+ @RequestMapping("")
+ public String index() {
+ return PREFIX + "tCompany.html";
+ }
+
+ /**
+ * 跳转到加盟商管理首页
+ */
+ @RequestMapping("/franchisee")
+ public String franchisee() {
+ return PREFIX + "franchisee.html";
+ }
+
+ /**
+ * 跳转到添加分公司管理
+ */
+ @RequestMapping("/tCompany_add")
+ public String tCompanyAdd(Model model) {
+ List<TRegion> provinceList = tRegionService.selectList(new EntityWrapper<TRegion>().eq("parent_id", 0));
+ model.addAttribute("provinceList",provinceList);
+ return PREFIX + "tCompany_add.html";
+ }
+
+ /**
+ * 跳转到添加加盟商司管理
+ */
+ @RequestMapping("/tCompany_addFranchisee")
+ public String tCompany_addFranchisee(Model model) {
+ Integer roleType = ShiroKit.getUser().getRoleType();
+ if (1 == roleType){
+ //查询分公司
+ List<TCompany> companyList = tCompanyService.selectList(new EntityWrapper<TCompany>().eq("type", 2));
+ model.addAttribute("companyList",companyList);
+ }else if (2 == roleType){
+ TCompany tCompany = tCompanyService.selectById(ShiroKit.getUser().getObjectId());
+ model.addAttribute("company",tCompany);
+ }
+ model.addAttribute("roleType",roleType);
+ return PREFIX + "tCompany_addFranchisee.html";
+ }
+
+ /**
+ * 跳转到查看分公司详情
+ */
+ @RequestMapping("/tCompany_detail/{tCompanyId}")
+ public String tCompany_detail(@PathVariable Integer tCompanyId, Model model) {
+ TCompany tCompany = tCompanyService.selectById(tCompanyId);
+ model.addAttribute("item",tCompany);
+ LogObjectHolder.me().set(tCompany);
+
+ //省
+ List<TRegion> provinceList = tRegionService.selectList(new EntityWrapper<TRegion>().eq("parent_id", 0));
+ model.addAttribute("provinceList",provinceList);
+
+ //系统用户对象
+ User user = userService.selectOne(new EntityWrapper<User>().eq("roleType", 2).eq("objectId", tCompanyId));
+ model.addAttribute("user",user);
+
+ //经营区域
+ List<Map<String, Object>> scopeList = tCompanyService.getCompanyScopeById(tCompanyId);
+ model.addAttribute("scopeList",scopeList);
+
+ return PREFIX + "tCompany_detail.html";
+ }
+
+ /**
+ * 跳转到修改分公司管理
+ */
+ @RequestMapping("/tCompany_update/{tCompanyId}")
+ public String tCompanyUpdate(@PathVariable Integer tCompanyId, Model model) {
+ TCompany tCompany = tCompanyService.selectById(tCompanyId);
+ model.addAttribute("item",tCompany);
+ LogObjectHolder.me().set(tCompany);
+
+ //省
+ List<TRegion> provinceList = tRegionService.selectList(new EntityWrapper<TRegion>().eq("parent_id", 0));
+ model.addAttribute("provinceList",provinceList);
+
+ //系统用户对象
+ User user = userService.selectOne(new EntityWrapper<User>().eq("roleType", 2).eq("objectId", tCompanyId));
+ model.addAttribute("user",user);
+
+ //经营区域
+ List<Map<String, Object>> scopeList = tCompanyService.getCompanyScopeById(tCompanyId);
+ model.addAttribute("scopeList",scopeList);
+ return PREFIX + "tCompany_edit.html";
+ }
+
+ /**
+ * 跳转到查看加盟商
+ */
+ @RequestMapping("/tCompany_detailFranchisee/{tCompanyId}")
+ public String tCompany_detailFranchisee(@PathVariable Integer tCompanyId, Model model) {
+ TCompany tCompany = tCompanyService.selectById(tCompanyId);
+ model.addAttribute("item",tCompany);
+ LogObjectHolder.me().set(tCompany);
+
+ Integer roleType = ShiroKit.getUser().getRoleType();
+ model.addAttribute("roleType",roleType);
+
+ TCompany obj = tCompanyService.selectById(tCompany.getSuperiorId());
+ if (SinataUtil.isNotEmpty(obj)){
+ model.addAttribute("companyName",obj.getName());
+ }else {
+ model.addAttribute("companyName","平台");
+ }
+
+
+ //系统用户对象
+ User user = userService.selectOne(new EntityWrapper<User>().eq("roleType", 3).eq("objectId", tCompanyId));
+ model.addAttribute("user",user);
+ return PREFIX + "tCompany_detailFranchisee.html";
+ }
+
+ /**
+ * 跳转到修改分公司管理
+ */
+ @RequestMapping("/tCompany_updateFranchisee/{tCompanyId}")
+ public String tCompany_updateFranchisee(@PathVariable Integer tCompanyId, Model model) {
+ TCompany tCompany = tCompanyService.selectById(tCompanyId);
+ model.addAttribute("item",tCompany);
+ LogObjectHolder.me().set(tCompany);
+
+ Integer roleType = ShiroKit.getUser().getRoleType();
+ if (1 == roleType){
+ //查询分公司
+ List<TCompany> companyList = tCompanyService.selectList(new EntityWrapper<TCompany>().eq("type", 2));
+ model.addAttribute("companyList",companyList);
+ }else if (2 == roleType){
+ TCompany obj = tCompanyService.selectById(ShiroKit.getUser().getObjectId());
+ model.addAttribute("company",obj);
+ }
+ model.addAttribute("roleType",roleType);
+
+ //系统用户对象
+ User user = userService.selectOne(new EntityWrapper<User>().eq("roleType", 3).eq("objectId", tCompanyId));
+ model.addAttribute("user",user);
+
+ return PREFIX + "tCompany_updateFranchisee.html";
+ }
+
+ @RequestMapping(value = "/change")
+ @ResponseBody
+ public Object change(@RequestParam Integer code) {
+ List<TRegion> list = new ArrayList<>();
+ if (SinataUtil.isNotEmpty(code)){
+ TRegion region = tRegionService.selectOne(new EntityWrapper<TRegion>().eq("code", code));
+ list = tRegionService.selectList(new EntityWrapper<TRegion>().eq("parent_id", region.getId()));
+ }
+ return list;
+ }
+
+ /**
+ * 获取分公司管理列表
+ */
+ @RequestMapping(value = "/list")
+ @ResponseBody
+ public Object list(String insertTime,
+ String name,
+ String principalName,
+ String principalPhone,
+ String adminName,
+ String adminPhone,
+ String serviceStr,
+ Integer state) {
+ String beginTime = null;
+ String endTime = null;
+ if (SinataUtil.isNotEmpty(insertTime)){
+ String[] timeArray = insertTime.split(" - ");
+ beginTime = timeArray[0];
+ endTime = timeArray[1];
+ }
+ Page<Map<String, Object>> page = new PageFactory<Map<String, Object>>().defaultPage();
+ page.setRecords(tCompanyService.getCompanyList(page,beginTime,endTime,name,principalName,principalPhone,adminName,adminPhone,serviceStr,state));
+ return super.packForBT(page);
+ }
+
+ /**
+ * 获取分公司管理列表
+ */
+ @RequestMapping(value = "/listFranchisee")
+ @ResponseBody
+ public Object listFranchisee(String insertTime,
+ String name,
+ String account,
+ String principalName,
+ String principalPhone,
+ String serviceStr,
+ Integer state) {
+ String beginTime = null;
+ String endTime = null;
+ if (SinataUtil.isNotEmpty(insertTime)){
+ String[] timeArray = insertTime.split(" - ");
+ beginTime = timeArray[0];
+ endTime = timeArray[1];
+ }
+ Page<Map<String, Object>> page = new PageFactory<Map<String, Object>>().defaultPage();
+ if (ShiroKit.getUser().getRoleType() == 3){
+ page.setRecords(null);
+ }else{
+ page.setRecords(tCompanyService.getFranchiseeList(page,beginTime,endTime,name,account,principalName,principalPhone,serviceStr,state,ShiroKit.getUser().getRoleType(),ShiroKit.getUser().getObjectId()));
+ }
+ return super.packForBT(page);
+ }
+
+ /**
+ * 新增分公司管理
+ */
+ @RequestMapping(value = "/add")
+ @ResponseBody
+ public Object add(TCompany tCompany,@RequestParam String subArr,String account,String password) {
+ //判断账号是否已存在
+ int count = userService.selectCount(new EntityWrapper<User>().eq("account", account));
+ if (count > 0){
+ return "error";
+ }
+ tCompany.setType(2); //2：分公司
+ tCompany.setState(0); //0：正常
+ tCompany.setInsertTime(new Date());
+ tCompanyService.insert(tCompany);
+
+ //添加User对象
+ User user = new User();
+ user.setAccount(account);
+ user.setSalt(ShiroKit.getRandomSalt(5));
+ user.setPassword(ShiroKit.md5(password, user.getSalt()));
+ user.setRoleid("2");
+ user.setDeptid(25);
+ user.setStatus(1);
+ user.setCreatetime(new Date());
+ user.setRoleType(2);
+ user.setObjectId(tCompany.getId());
+ user.setName(tCompany.getName());
+ user.setSex(1);
+ userService.insert(user);
+
+ //添加经营区域
+ addSocpe(subArr,tCompany.getId());
+ return SUCCESS_TIP;
+ }
+ //添加经营区域
+ public void addSocpe(String subArr,Integer id){
+ JSONArray jsonArray = JSON.parseArray(subArr);
+ tCompanyCityService.delete(new EntityWrapper<TCompanyCity>().eq("companyId", id));
+ int size = jsonArray.size();
+ for (int i = 0; i < size; i++){
+ JSONObject jsonObject = jsonArray.getJSONObject(i);
+ TCompanyCity tCompanyCity = tCompanyCityService.selectOne(new EntityWrapper<TCompanyCity>().eq("id", jsonObject.getInteger("recordId")).eq("companyId", id));
+ if (SinataUtil.isEmpty(tCompanyCity)){
+ tCompanyCity = new TCompanyCity();
+ tCompanyCity.setProvinceCode(jsonObject.getInteger("provinceCode"));
+ tCompanyCity.setCityCode(jsonObject.getInteger("cityCode"));
+ tCompanyCity.setAreaCode(jsonObject.getInteger("areaCode"));
+ tCompanyCity.setCompanyId(id);
+ tCompanyCity.setState(1);
+ tCompanyCityService.insert(tCompanyCity);
+ }else{
+ tCompanyCity.setProvinceCode(jsonObject.getInteger("provinceCode"));
+ tCompanyCity.setCityCode(jsonObject.getInteger("cityCode"));
+ tCompanyCity.setAreaCode(jsonObject.getInteger("areaCode"));
+ tCompanyCityService.updateById(tCompanyCity);
+ }
+ }
+ }
+
+ /**
+ * 新增加盟商管理
+ */
+ @RequestMapping(value = "/addFranchisee")
+ @ResponseBody
+ public Object addFranchisee(TCompany tCompany,String account,String password) {
+ //判断账号是否已存在
+ int count = userService.selectCount(new EntityWrapper<User>().eq("account", account));
+ if (count > 0){
+ return "error";
+ }
+ tCompany.setType(3); //2：分公司
+ if (ShiroKit.getUser().getRoleType() == 2){
+ tCompany.setSuperiorId(ShiroKit.getUser().getObjectId());
+ }
+ tCompany.setState(0); //0：正常
+ tCompany.setInsertTime(new Date());
+ tCompanyService.insert(tCompany);
+
+ //添加User对象
+ User user = new User();
+ user.setAccount(account);
+ user.setSalt(ShiroKit.getRandomSalt(5));
+ user.setPassword(ShiroKit.md5(password, user.getSalt()));
+ user.setRoleid("3");
+ user.setDeptid(26);
+ user.setStatus(1);
+ user.setCreatetime(new Date());
+ user.setRoleType(3);
+ user.setObjectId(tCompany.getId());
+ user.setName(tCompany.getName());
+ user.setSex(1);
+ userService.insert(user);
+
+ return SUCCESS_TIP;
+ }
+
+ /**
+ * 删除分公司管理
+ */
+ @RequestMapping(value = "/delete")
+ @ResponseBody
+ public Object delete(@RequestParam Integer tCompanyId) {
+ TCompany tCompany = tCompanyService.selectById(tCompanyId);
+ tCompany.setFlag("3");
+ tCompanyService.updateById(tCompany);
+ return SUCCESS_TIP;
+ }
+
+ /**
+ * 修改分公司管理
+ */
+ @RequestMapping(value = "/update")
+ @ResponseBody
+ public Object update(TCompany tCompany,@RequestParam String subArr,String account,String password,Integer userId) {
+ //判断账号
+ User user = userService.selectById(userId);
+ if (SinataUtil.isNotEmpty(account) && SinataUtil.isNotEmpty(password)){
+ if (!user.getAccount().equals(account)){
+ //判断账号是否已存在
+ int count = userService.selectCount(new EntityWrapper<User>().eq("account", account));
+ if (count > 0){
+ return "error";
+ }
+ }
+ //修改账号密码
+ user.setAccount(account);
+ user.setSalt(ShiroKit.getRandomSalt(5));
+ user.setPassword(ShiroKit.md5(password, user.getSalt()));
+ }
+ tCompanyService.updateById(tCompany);
+ user.setName(tCompany.getName());
+ userService.updateById(user);
+
+ //添加经营区域
+ addSocpe(subArr,tCompany.getId());
+
+ TCompany tCompany1 = tCompanyService.selectById(tCompany.getId());
+ if(tCompany1.getType() == 1){
+ new Thread(new Runnable() {
+ @Override
+ public void run() {
+ if(pushMinistryOfTransport){//上传平台数据
+ pushMinistryOfTransportUtil.baseInfoCompanyPay();//上传网约车平台公司支付信息
+ pushMinistryOfTransportUtil.baseInfoCompany(tCompany.getId());
+ pushMinistryOfTransportUtil.baseInfoCompanyService();
+ pushMinistryOfTransportUtil.baseInfoCompanyPermit(tCompany.getId());
+ }
+ }
+ }).start();
+ }
+ return SUCCESS_TIP;
+ }
+
+ /**
+ * 修改加盟商管理
+ */
+ @RequestMapping(value = "/updateFranchisee")
+ @ResponseBody
+ public Object updateFranchisee(TCompany tCompany,String account,String password,Integer userId) {
+ //判断账号
+ User user = userService.selectById(userId);
+ if (!user.getAccount().equals(account)){
+ //判断账号是否已存在
+ int count = userService.selectCount(new EntityWrapper<User>().eq("account", account));
+ if (count > 0){
+ return "error";
+ }
+ }
+ tCompanyService.updateById(tCompany);
+
+ //修改账号密码
+ user.setAccount(account);
+ user.setSalt(ShiroKit.getRandomSalt(5));
+ user.setPassword(ShiroKit.md5(password, user.getSalt()));
+ user.setName(tCompany.getName());
+ userService.updateById(user);
+
+ return SUCCESS_TIP;
+ }
+
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TComplaintController.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TComplaintController.java
new file mode 100644
index 0000000..b5589db
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TComplaintController.java
@@ -0,0 +1,186 @@
+package com.stylefeng.guns.modular.system.controller.general;
+
+import com.baomidou.mybatisplus.plugins.Page;
+import com.stylefeng.guns.core.base.controller.BaseController;
+import com.stylefeng.guns.core.common.constant.factory.PageFactory;
+import com.stylefeng.guns.core.shiro.ShiroKit;
+import com.stylefeng.guns.core.util.SinataUtil;
+import com.stylefeng.guns.modular.system.model.TProblem;
+import com.stylefeng.guns.modular.system.model.TSystemNotice;
+import com.stylefeng.guns.modular.system.service.ITSystemNoticeService;
+import com.stylefeng.guns.modular.system.util.PushMinistryOfTransportUtil;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.beans.factory.annotation.Autowired;
+import com.stylefeng.guns.core.log.LogObjectHolder;
+import org.springframework.web.bind.annotation.RequestParam;
+import com.stylefeng.guns.modular.system.model.TComplaint;
+import com.stylefeng.guns.modular.system.service.ITComplaintService;
+
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
+import java.util.Date;
+import java.util.Map;
+
+/**
+ * 投诉列表控制器
+ *
+ * @author fengshuonan
+ * @Date 2020-06-09 17:31:24
+ */
+@Controller
+@RequestMapping("/tComplaint")
+public class TComplaintController extends BaseController {
+
+ private String PREFIX = "/system/tComplaint/";
+
+ @Autowired
+ private ITComplaintService tComplaintService;
+
+ @Autowired
+ private ITSystemNoticeService tSystemNoticeService;
+
+ @Autowired
+ private PushMinistryOfTransportUtil pushMinistryOfTransportUtil;
+
+ @Value("${pushMinistryOfTransport}")
+ private boolean pushMinistryOfTransport;
+
+
+
+ /**
+ * 跳转到投诉列表首页
+ */
+ @RequestMapping("")
+ public String index() {
+ return PREFIX + "tComplaint.html";
+ }
+
+ /**
+ * 跳转到查看详情
+ */
+ @RequestMapping("/lookDetail/{id}/{type}")
+ public String lookDetail(@PathVariable Integer id, @PathVariable Integer type, Model model) {
+ TComplaint tComplaint = tComplaintService.selectById(id);
+ String str = "";
+ if (1 == type){
+ str = tComplaint.getReason();
+ }else if (2 == type){
+ str = tComplaint.getDescription();
+ }else if (3 == type){
+ str = tComplaint.getHandleResult();
+ }
+ model.addAttribute("str",str);
+ return "/system/tComplaint/lookDetail.html";
+ }
+
+ /**
+ * 跳转到立即处理页面
+ */
+ @RequestMapping("/tComplaint_immediately/{tComplaintId}")
+ public String tComplaintUpdate(@PathVariable Integer tComplaintId, Model model) {
+ model.addAttribute("tComplaintId",tComplaintId);
+ return PREFIX + "tComplaint_immediately.html";
+ }
+
+ /**
+ * 跳转到查看详情
+ */
+ @RequestMapping("/lookDetail/{str}")
+ public String lookDetail(@PathVariable String str, Model model) {
+ System.out.println(str);
+ model.addAttribute("str",str);
+ return PREFIX + "lookDetail.html";
+ }
+
+ /**
+ * 获取投诉列表列表
+ */
+ @RequestMapping(value = "/list")
+ @ResponseBody
+ public Object list(String insertTime,
+ String userName,
+ String userPhone,
+ String driverPhone,
+ Integer isHandle) {
+ String beginTime = null;
+ String endTime = null;
+ if (SinataUtil.isNotEmpty(insertTime)){
+ String[] timeArray = insertTime.split(" - ");
+ beginTime = timeArray[0];
+ endTime = timeArray[1];
+ }
+ Page<Map<String, Object>> page = new PageFactory<Map<String, Object>>().defaultPage();
+ page.setRecords(tComplaintService.getComplaintList(page,ShiroKit.getUser().getRoleType(),ShiroKit.getUser().getObjectId(),beginTime,endTime,userName,userPhone,driverPhone,isHandle));
+ return super.packForBT(page);
+ }
+
+ /**
+ * 删除投诉列表
+ */
+ @RequestMapping(value = "/immediately")
+ @ResponseBody
+ public Object immediately(@RequestParam Integer id,@RequestParam String handleResult) {
+ TComplaint tComplaint = tComplaintService.selectById(id);
+ if(SinataUtil.isNotEmpty(tComplaint)){
+ tComplaint.setHandleResult(handleResult);
+ tComplaint.setHandleUserId(ShiroKit.getUser().getId());
+ tComplaint.setIsHandle(1);
+ tComplaint.setHandleTime(new Date());
+ tComplaintService.updateById(tComplaint);
+
+ //增加系统消息
+ TSystemNotice notice = new TSystemNotice();
+ notice.setType(2);
+ notice.setUserType(1);
+ notice.setContent("投诉处理结果:【"+handleResult+"】。");
+ notice.setUserId(tComplaint.getUserId());
+ notice.setInsertTime(new Date());
+ notice.setRead(1);
+ tSystemNoticeService.insert(notice);
+
+ new Thread(new Runnable() {
+ @Override
+ public void run() {
+ if(pushMinistryOfTransport){//上传数据
+ pushMinistryOfTransportUtil.ratedPassengerComplaint(tComplaint.getId());
+ }
+ }
+ }).start();
+ }
+ return SUCCESS_TIP;
+ }
+
+ /**
+ * 删除投诉
+ */
+ @RequestMapping(value = "/delete")
+ @ResponseBody
+ public Object delete(Integer tComplaintId) {
+ tComplaintService.deleteById(tComplaintId);
+ return SUCCESS_TIP;
+ }
+
+ /**
+ * 修改投诉列表
+ */
+ @RequestMapping(value = "/update")
+ @ResponseBody
+ public Object update(TComplaint tComplaint) {
+ tComplaintService.updateById(tComplaint);
+ return SUCCESS_TIP;
+ }
+
+ /**
+ * 投诉列表详情
+ */
+ @RequestMapping(value = "/detail/{tComplaintId}")
+ @ResponseBody
+ public Object detail(@PathVariable("tComplaintId") Integer tComplaintId) {
+ return tComplaintService.selectById(tComplaintId);
+ }
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TDriverController.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TDriverController.java
new file mode 100644
index 0000000..55adaa4
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TDriverController.java
@@ -0,0 +1,1904 @@
+package com.stylefeng.guns.modular.system.controller.general;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.baomidou.mybatisplus.plugins.Page;
+import com.stylefeng.guns.core.base.controller.BaseController;
+import com.stylefeng.guns.core.base.tips.ErrorTip;
+import com.stylefeng.guns.core.common.constant.factory.PageFactory;
+import com.stylefeng.guns.core.shiro.ShiroKit;
+import com.stylefeng.guns.core.util.*;
+import com.stylefeng.guns.modular.system.dao.DriverPunishMapper;
+import com.stylefeng.guns.modular.system.dao.DriverTrainMapper;
+import com.stylefeng.guns.modular.system.model.*;
+import com.stylefeng.guns.modular.system.service.*;
+import com.stylefeng.guns.modular.system.util.HttpRequestUtil;
+import com.stylefeng.guns.modular.system.util.PushMinistryOfTransportUtil;
+import com.stylefeng.guns.modular.system.util.PushURL;
+import com.stylefeng.guns.modular.system.util.ResultUtil;
+import org.apache.commons.lang.time.DateUtils;
+import org.apache.poi.hdf.extractor.TC;
+import org.apache.poi.ss.usermodel.Cell;
+import org.apache.poi.ss.usermodel.Row;
+import org.apache.poi.ss.usermodel.Sheet;
+import org.apache.poi.ss.usermodel.Workbook;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.ui.Model;
+import org.springframework.beans.factory.annotation.Autowired;
+import com.stylefeng.guns.core.log.LogObjectHolder;
+import org.springframework.web.multipart.MultipartFile;
+import org.springframework.web.multipart.MultipartHttpServletRequest;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
+import java.util.*;
+
+/**
+ * 司机审核列表控制器
+ *
+ * @author fengshuonan
+ * @Date 2020-06-04 17:35:28
+ */
+@Controller
+@RequestMapping("/tDriver")
+public class TDriverController extends BaseController {
+
+ private String PREFIX = "/system/tDriver/";
+
+ @Autowired
+ private ITDriverService tDriverService;
+
+ @Autowired
+ private ITCompanyService tCompanyService;
+
+ @Autowired
+ private ITDriverServiceService tDriverServiceService;
+
+ @Autowired
+ private ITDriverLineService tDriverLineService;
+
+ @Autowired
+ private ITLineService itLineService;
+
+ @Autowired
+ private PushMinistryOfTransportUtil pushMinistryOfTransportUtil;
+
+ @Resource
+ private DriverTrainMapper driverTrainMapper;
+
+ @Resource
+ private DriverPunishMapper driverPunishMapper;
+
+ @Value("${pushMinistryOfTransport}")
+ private boolean pushMinistryOfTransport;
+
+
+
+ /**
+ * 跳转到司机审核列表首页
+ */
+ @RequestMapping("")
+ public String index() {
+ return PREFIX + "tDriver.html";
+ }
+
+ /**
+ * 跳转到审核通过司机首页
+ */
+ @RequestMapping("/yesDriver")
+ public String yesDriver() {
+ return PREFIX + "yesDriver.html";
+ }
+
+ /**
+ * 跳转到添加司机
+ */
+ @RequestMapping("/tDriver_add")
+ public String tDriverAdd(Model model) {
+ List<TCompany> companyList = tCompanyService.selectList(new EntityWrapper<TCompany>().eq("type", 2));
+ model.addAttribute("companyList",companyList);
+
+ Integer roleType = ShiroKit.getUser().getRoleType();
+ model.addAttribute("roleType",roleType);
+ if (2 == roleType){
+ List<TCompany> franchiseeList = tCompanyService.selectList(new EntityWrapper<TCompany>()
+ .eq("type", 3)
+ .eq("superiorId",ShiroKit.getUser().getObjectId())
+ .notIn("state",1)
+ .notIn("flag",3));
+ model.addAttribute("franchiseeList",franchiseeList);
+ }else{
+ model.addAttribute("franchiseeList",null);
+ }
+ //查询当前用户所属分公司/加盟商
+ model.addAttribute("objectName",tCompanyService.selectById(ShiroKit.getUser().getObjectId()).getName());
+
+ //查询线路列表
+ List<TLine> lineList = itLineService.selectList(new EntityWrapper<TLine>().eq("state", 1));
+ model.addAttribute("lineList",lineList);
+ return PREFIX + "tDriver_add.html";
+ }
+
+ /**
+ * 跳转到修改审核司机
+ */
+ @RequestMapping("/tDriver_immediately/{tDriverId}")
+ public String tDriver_immediately(@PathVariable Integer tDriverId, Model model) {
+ Map<String, Object> tDriver = tDriverService.getDriverById(tDriverId);
+ model.addAttribute("item",tDriver);
+ LogObjectHolder.me().set(tDriver);
+ return PREFIX + "tDriver_immediately.html";
+ }
+
+ /**
+ * 跳转到选择车辆页面
+ */
+ @RequestMapping("/tDriver_changeCar/{tDriverId}")
+ public String tDriver_changeCar(@PathVariable Integer tDriverId, Model model) {
+ model.addAttribute("tDriverId",tDriverId);
+ return PREFIX + "tDriver_changeCar.html";
+ }
+
+ /**
+ * 跳转到冻结/解冻司机页面
+ */
+ @RequestMapping("/tDriver_optDriver/{tDriverId}/{optType}")
+ public String tDriver_optDriver(@PathVariable Integer tDriverId,@PathVariable Integer optType, Model model) {
+ model.addAttribute("tDriverId",tDriverId);
+ model.addAttribute("optType",optType);
+ return PREFIX + "tDriver_optDriver.html";
+ }
+
+ /**
+ * 跳转到查看司机详情
+ */
+ @RequestMapping("/tDriver_look/{tDriverId}")
+ public String tDriver_look(@PathVariable Integer tDriverId, Model model) {
+ Map<String, Object> tDriver = tDriverService.getDriverById(tDriverId);
+ model.addAttribute("item",tDriver);
+ LogObjectHolder.me().set(tDriver);
+ return PREFIX + "tDriver_look.html";
+ }
+
+ /**
+ * 跳转到修改司机
+ */
+ @RequestMapping("/tDriver_update/{tDriverId}")
+ public String tDriverUpdate(@PathVariable Integer tDriverId, Model model) {
+ TDriver tDriver = tDriverService.selectById(tDriverId);
+ model.addAttribute("item",tDriver);
+ LogObjectHolder.me().set(tDriver);
+
+ Integer roleType = ShiroKit.getUser().getRoleType();
+ model.addAttribute("roleType",roleType);
+ model.addAttribute("objectName",tCompanyService.selectById(ShiroKit.getUser().getObjectId()).getName());
+
+ if (1 == roleType){
+ List<TCompany> companyList = tCompanyService.selectList(new EntityWrapper<TCompany>().eq("type", 2));
+ model.addAttribute("companyList",companyList);
+ List<TCompany> franchiseeList = tCompanyService.selectList(new EntityWrapper<TCompany>().eq("type", 3).eq("superiorId",tDriver.getCompanyId()));
+ model.addAttribute("franchiseeList",franchiseeList);
+ }else if (2 == roleType){
+ List<TCompany> franchiseeList = tCompanyService.selectList(new EntityWrapper<TCompany>().eq("type", 3).eq("superiorId",ShiroKit.getUser().getObjectId()));
+ model.addAttribute("franchiseeList",franchiseeList);
+ }
+
+ //查询平台ID
+ TCompany company = tCompanyService.selectOne(new EntityWrapper<TCompany>().eq("type", 1));
+ //判断是平台司机还是加盟司机
+ if ((SinataUtil.isEmpty(tDriver.getCompanyId()) || tDriver.getCompanyId() == 0 || tDriver.getCompanyId() == company.getId()) && (SinataUtil.isEmpty(tDriver.getFranchiseeId()) || tDriver.getFranchiseeId() == 0)){
+ model.addAttribute("companyType",1);
+ }else{
+ model.addAttribute("companyType",2);
+ }
+
+ //获取经营业务
+ List<TDriverService> serviceList = tDriverServiceService.selectList(new EntityWrapper<TDriverService>().eq("driverId", tDriverId));
+ Integer one = 1;
+ Integer two = 1;
+ Integer three = 1;
+ Integer four = 1;
+ Integer five = 1;
+ Integer six = 1;
+ for (TDriverService obj : serviceList){
+ if (obj.getType() == 1){
+ one = 2;
+ }
+ if (obj.getType() == 2){
+ two = 2;
+ }
+ if (obj.getType() == 3){
+ three = 2;
+ }
+ if (obj.getType() == 4){
+ four = 2;
+ }
+ if (obj.getType() == 5){
+ five = 2;
+ }
+ if (obj.getType() == 6){
+ six = 2;
+ }
+ }
+ model.addAttribute("one",one);
+ model.addAttribute("two",two);
+ model.addAttribute("three",three);
+ model.addAttribute("four",four);
+ model.addAttribute("five",five);
+ model.addAttribute("six",six);
+
+ //查询线路列表
+ List<TLine> lineList = itLineService.selectList(new EntityWrapper<TLine>().eq("state", 1));
+ model.addAttribute("lineList",lineList);
+ //查询驾驶员已添加的线路列表
+ List<Map<String, Object>> driverLineList = tDriverLineService.getDriverLineListByDriverId(tDriverId);
+ model.addAttribute("driverLineList",driverLineList);
+ return PREFIX + "tDriver_edit.html";
+ }
+
+ /**
+ * 跳转到添加培训页
+ * @param id
+ * @param model
+ * @return
+ */
+ @RequestMapping("/showTraining")
+ public String showTraining(Integer id, Model model){
+ model.addAttribute("id", id);
+ return PREFIX + "training.html";
+ }
+
+
+ /**
+ * 保存培训数据
+ * @param train
+ * @param driverId
+ * @return
+ */
+ @ResponseBody
+ @RequestMapping(value = "/saveTrain", method = RequestMethod.POST)
+ public ResultUtil saveTrain(String train, Integer driverId){
+ if(ToolUtil.isEmpty(train)){
+ return ResultUtil.error("请添加有效的培训记录");
+ }
+ String[] split = train.split(",");
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+ try {
+ List<DriverTrain> update = new ArrayList<>();
+ List<DriverTrain> add = new ArrayList<>();
+ for(String s : split){
+ String[] s1 = s.split("_");
+ if(ToolUtil.isNotEmpty(s1[0])){//修改
+ DriverTrain driverTrain = driverTrainMapper.selectById(s1[0]);
+ driverTrain.setDriverId(driverId);
+ driverTrain.setCourseName(s1[1]);
+ driverTrain.setCourseDate(sdf.parse(s1[2]));
+ driverTrain.setStartTime(s1[3]);
+ driverTrain.setStopTime(s1[4]);
+ driverTrain.setDuration(Integer.valueOf(s1[5]));
+ update.add(driverTrain);
+ }else{//添加
+ DriverTrain driverTrain = new DriverTrain();
+ driverTrain.setDriverId(driverId);
+ driverTrain.setCourseName(s1[1]);
+ driverTrain.setCourseDate(sdf.parse(s1[2]));
+ driverTrain.setStartTime(s1[3]);
+ driverTrain.setStopTime(s1[4]);
+ driverTrain.setDuration(Integer.valueOf(s1[5]));
+ add.add(driverTrain);
+ }
+ }
+ List<DriverTrain> driverTrains = driverTrainMapper.queryAllTrain(driverId);
+ for(DriverTrain driverTrain : driverTrains){
+ boolean b = true;
+ for(String s : split){
+ String[] s1 = s.split("_");
+ if(ToolUtil.isNotEmpty(s1[0]) && driverTrain.getId() == Integer.valueOf(s1[0])){
+ b = false;
+ break;
+ }
+ }
+ if(b){
+ driverTrainMapper.deleteById(driverTrain.getId());
+ new Thread(new Runnable() {
+ @Override
+ public void run() {
+ if(pushMinistryOfTransport){//上传数据
+ pushMinistryOfTransportUtil.baseInfoDriverEducate(driverTrain.getId(), 3);
+ }
+ }
+ }).start();
+ }
+ }
+ if(update.size() > 0){
+ for(DriverTrain driverTrain : update){
+ driverTrainMapper.updateById(driverTrain);
+ new Thread(new Runnable() {
+ @Override
+ public void run() {
+ if(pushMinistryOfTransport){//上传数据
+ pushMinistryOfTransportUtil.baseInfoDriverEducate(driverTrain.getId(), 2);
+ }
+ }
+ }).start();
+ }
+ }
+ if(add.size() > 0){
+ for(DriverTrain driverTrain : add){
+ driverTrainMapper.insert(driverTrain);
+ new Thread(new Runnable() {
+ @Override
+ public void run() {
+ if(pushMinistryOfTransport){//上传数据
+ pushMinistryOfTransportUtil.baseInfoDriverEducate(driverTrain.getId(), 1);
+ }
+ }
+ }).start();
+ }
+ }
+
+ }catch (Exception e){
+ e.printStackTrace();
+ return ResultUtil.runErr();
+ }
+ return ResultUtil.success();
+ }
+
+ /**
+ * 获取司机的所有培训数据
+ * @param driverId
+ * @return
+ */
+ @ResponseBody
+ @RequestMapping(value = "/queryAllTrain", method = RequestMethod.POST)
+ public ResultUtil queryAllTrain(Integer driverId){
+ List<DriverTrain> driverTrains = driverTrainMapper.queryAllTrain(driverId);
+ return ResultUtil.success(driverTrains);
+ }
+
+
+ /**
+ * 跳转到处罚页
+ * @param id
+ * @param model
+ * @return
+ */
+ @RequestMapping("/showPunish")
+ public String showPunish(Integer id, Model model){
+ model.addAttribute("id", id);
+ return PREFIX + "punish.html";
+ }
+
+
+ /**
+ * 保存处罚数据
+ * @param punish
+ * @param driverId
+ * @return
+ */
+ @ResponseBody
+ @RequestMapping(value = "/savePunish", method = RequestMethod.POST)
+ public ResultUtil savePunish(String punish, Integer driverId){
+ if(ToolUtil.isEmpty(punish)){
+ return ResultUtil.error("请添加有效的培训记录");
+ }
+ String[] split = punish.split(",");
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+ try {
+ List<DriverPunish> update = new ArrayList<>();
+ List<DriverPunish> add = new ArrayList<>();
+ for(String s : split){
+ String[] s1 = s.split("_");
+ if(ToolUtil.isNotEmpty(s1[0])){//修改
+ DriverPunish driverPunish = driverPunishMapper.selectById(s1[0]);
+ driverPunish.setDriverId(driverId);
+ driverPunish.setPunishTime(sdf.parse(s1[1]));
+ driverPunish.setPunishReason(s1[2]);
+ driverPunish.setPunishReault(s1[3]);
+ update.add(driverPunish);
+ }else{//添加
+ DriverPunish driverPunish = new DriverPunish();
+ driverPunish.setDriverId(driverId);
+ driverPunish.setPunishTime(sdf.parse(s1[1]));
+ driverPunish.setPunishReason(s1[2]);
+ driverPunish.setPunishReault(s1[3]);
+ add.add(driverPunish);
+ }
+ }
+ List<DriverPunish> driverPunishes = driverPunishMapper.queryAllPunish(driverId);
+ for(DriverPunish driverTrain : driverPunishes){
+ boolean b = true;
+ for(String s : split){
+ String[] s1 = s.split("_");
+ if(ToolUtil.isNotEmpty(s1[0]) && driverTrain.getId() == Integer.valueOf(s1[0])){
+ b = false;
+ break;
+ }
+ }
+ if(b){
+ driverTrainMapper.deleteById(driverTrain.getId());
+ }
+ }
+ if(update.size() > 0){
+ for(DriverPunish driverTrain : update){
+ driverPunishMapper.updateById(driverTrain);
+ }
+ }
+ if(add.size() > 0){
+ for(DriverPunish driverTrain : add){
+ driverPunishMapper.insert(driverTrain);
+ new Thread(new Runnable() {
+ @Override
+ public void run() {
+ if(pushMinistryOfTransport){//上传数据
+ pushMinistryOfTransportUtil.ratedDriverPunish(driverTrain.getId());
+ }
+ }
+ }).start();
+ }
+ }
+
+ }catch (Exception e){
+ e.printStackTrace();
+ return ResultUtil.runErr();
+ }
+ return ResultUtil.success();
+ }
+
+
+ /**
+ * 获取所有处罚数据
+ * @param driverId
+ * @return
+ */
+ @ResponseBody
+ @RequestMapping(value = "/queryAllPunish", method = RequestMethod.POST)
+ public ResultUtil queryAllPunish(Integer driverId){
+ List<DriverPunish> driverPunishes = driverPunishMapper.queryAllPunish(driverId);
+ return ResultUtil.success(driverPunishes);
+ }
+
+
+ /**
+ * 根据分公司ID获取加盟商
+ * @param oneId
+ * @return
+ */
+ @RequestMapping(value = "/oneChange")
+ @ResponseBody
+ public Object oneChange(@RequestParam Integer oneId) {
+ List<TCompany> list = new ArrayList<>();
+ if (SinataUtil.isNotEmpty(oneId)){
+ list = tCompanyService.selectList(new EntityWrapper<TCompany>()
+ .eq("type", 3)
+ .eq("superiorId", oneId)
+ .notIn("flag",3)
+ .notIn("state",1));
+ }
+ return list;
+ }
+
+ /**
+ * 获取司机审核列表列表
+ */
+ @RequestMapping(value = "/list")
+ @ResponseBody
+ public Object list(String insertTime,
+ String companyName,
+ String phone,
+ String account,
+ Integer addType,
+ Integer authState) {
+ String beginTime = null;
+ String endTime = null;
+ if (SinataUtil.isNotEmpty(insertTime)){
+ String[] timeArray = insertTime.split(" - ");
+ beginTime = timeArray[0];
+ endTime = timeArray[1];
+ }
+ Page<Map<String, Object>> page = new PageFactory<Map<String, Object>>().defaultPage();
+ if (ShiroKit.getUser().getRoleType() != 1){
+ page.setRecords(null);
+ }else{
+ page.setRecords(tDriverService.getAuthDriverList(page,beginTime,endTime,companyName,phone,account,addType,authState));
+ }
+ return super.packForBT(page);
+ }
+
+ /**
+ * 获取审核通过的司机列表
+ */
+ @RequestMapping(value = "/listYesDriver")
+ @ResponseBody
+ public Object listYesDriver(String insertTime,
+ String companyName,
+ String phone,
+ String name,
+ Integer addType,
+ Integer authState) {
+ String beginTime = null;
+ String endTime = null;
+ if (SinataUtil.isNotEmpty(insertTime)){
+ String[] timeArray = insertTime.split(" - ");
+ beginTime = timeArray[0];
+ endTime = timeArray[1];
+ }
+ Page<Map<String, Object>> page = new PageFactory<Map<String, Object>>().defaultPage();
+ page.setRecords(tDriverService.getDriverList(page,ShiroKit.getUser().getRoleType(),ShiroKit.getUser().getObjectId(),beginTime,endTime,companyName,phone,name,addType,authState));
+ return super.packForBT(page);
+ }
+
+ /**
+ * 获取可被选择的车辆列表
+ */
+ @RequestMapping(value = "/selectCarList/{tDriverId}")
+ @ResponseBody
+ public Object selectCarList(@PathVariable Integer tDriverId,
+ String carLicensePlate,
+ String brandName,
+ String modelName,
+ String color,
+ String serverStr) {
+ TDriver driver = tDriverService.selectById(tDriverId);
+ /*String useCarIdStr = null;
+ //查询已被使用的车辆ID
+ if (SinataUtil.isNotEmpty(driver.getCarId())){
+ useCarIdStr = tDriverService.getUseCarIdStr(driver.getCarId());
+ }else{
+ useCarIdStr = tDriverService.getUseCarIdStr(null);
+ }*/
+ //2020-08-21:新需求,已被绑定的车辆可以被继续绑定
+ Page<Map<String, Object>> page = new PageFactory<Map<String, Object>>().defaultPage();
+ page.setRecords(tDriverService.getCanSelectCarList(page,ShiroKit.getUser().getRoleType(),ShiroKit.getUser().getObjectId(),null,carLicensePlate,brandName,modelName,color,serverStr));
+ return super.packForBT(page);
+
+ }
+
+ /**
+ * 审核操作 1=通过 2=不通过
+ */
+ @RequestMapping(value = "/authOpt")
+ @ResponseBody
+ public Object authOpt(Integer id,Integer authState) {
+ if (SinataUtil.isNotEmpty(id) && SinataUtil.isNotEmpty(authState)){
+ TDriver tDriver = tDriverService.selectById(id);
+ Integer type = 0;
+ if (1 == authState){
+ type = 5;
+ tDriver.setAuthState(2);
+
+ new Thread(new Runnable() {
+ @Override
+ public void run() {
+ if(pushMinistryOfTransport){//上传数据
+ pushMinistryOfTransportUtil.baseInfoCompanyStat();
+ pushMinistryOfTransportUtil.baseInfoDriver(id);
+ pushMinistryOfTransportUtil.baseInfoDriverApp(id);
+ }
+ }
+ }).start();
+ }else{
+ type = 6;
+ tDriver.setAuthState(4);
+ }
+
+ Map<String,String> map = new HashMap<>();
+ map.put("uid", String.valueOf(tDriver.getId()));
+ map.put("type", String.valueOf(type));
+ String result = HttpRequestUtil.postRequest(PushURL.driver_auth_url, map);
+ System.out.println("司机注册审核发送短信 :【driverId="+tDriver.getId().toString()+"】,调用接口:"+result);
+
+ tDriverService.updateById(tDriver);
+ }
+ return SUCCESS_TIP;
+ }
+
+ /**
+ * 更换车辆操作
+ */
+ @RequestMapping(value = "/selectCarOpt")
+ @ResponseBody
+ public Object selectCarOpt(Integer tDriverId,Integer carId) {
+ if (SinataUtil.isNotEmpty(tDriverId) && SinataUtil.isNotEmpty(carId)){
+ TDriver tDriver = tDriverService.selectById(tDriverId);
+ tDriver.setCarId(carId);
+ tDriverService.updateById(tDriver);
+ }
+ return SUCCESS_TIP;
+ }
+
+ /**
+ * 新增司机审核列表
+ */
+ @RequestMapping(value = "/add")
+ @ResponseBody
+ public Object add(TDriver tDriver,@RequestParam String serverBox,@RequestParam String lineStr,Integer roleType,Integer companyType,Integer oneId,Integer twoId,Integer franchiseeId) {
+ //判断登录账户是否重复
+ int count = tDriverService.selectCount(new EntityWrapper<TDriver>().eq("phone", tDriver.getPhone()).in("authState", "1,2,3").ne("flag", 3));
+ if (count > 0){
+ return "error";
+ }
+ if (1 == roleType){ //平台
+ if (2 == companyType.intValue()){
+ if (SinataUtil.isNotEmpty(oneId)){
+ tDriver.setCompanyId(oneId);
+ }
+ if (SinataUtil.isNotEmpty(twoId)){
+ tDriver.setFranchiseeId(twoId);
+ }
+ }else if (1 == companyType.intValue()){
+ TCompany company = tCompanyService.selectOne(new EntityWrapper<TCompany>().eq("type", 1));
+ tDriver.setCompanyId(company.getId());
+ tDriver.setFranchiseeId(franchiseeId);
+ }
+ tDriver.setAddType(2);
+ tDriver.setIsPlatCar(1);
+ tDriver.setAuthState(2);
+ }else if (2 == roleType){ //分公司
+ if (SinataUtil.isNotEmpty(ShiroKit.getUser().getObjectId())){
+ tDriver.setCompanyId(ShiroKit.getUser().getObjectId());
+ }
+ if (SinataUtil.isNotEmpty(franchiseeId)){
+ tDriver.setFranchiseeId(franchiseeId);
+ }
+ tDriver.setAddType(3);
+ tDriver.setIsPlatCar(2);
+ tDriver.setAuthState(1);
+ tDriver.setAddObjectId(ShiroKit.getUser().getObjectId());
+ }else if (3 == roleType){ //加盟商
+ TCompany tCompany = tCompanyService.selectById(ShiroKit.getUser().getObjectId());
+ if (SinataUtil.isNotEmpty(tCompany)){
+ tDriver.setCompanyId(tCompany.getSuperiorId());
+ }
+ if (SinataUtil.isNotEmpty(ShiroKit.getUser().getObjectId())){
+ tDriver.setFranchiseeId(ShiroKit.getUser().getObjectId());
+ }
+ tDriver.setAddType(4);
+ tDriver.setIsPlatCar(2);
+ tDriver.setAuthState(1);
+ tDriver.setAddObjectId(ShiroKit.getUser().getObjectId());
+ }
+ tDriver.setInsertTime(new Date());
+ tDriver.setInsertUser(ShiroKit.getUser().getId());
+// tDriver.setPassword(MD5Util.encrypt(tDriver.getPassword()));
+
+ tDriver.setPassword(ShiroKit.md5(tDriver.getPassword(), "SA;d5#"));
+
+ tDriverService.insert(tDriver);
+
+ //添加经营业务
+ String[] serverArray = serverBox.split(",");
+ for (int i=0;i<serverArray.length;i++){
+ TDriverService service = new TDriverService();
+ service.setDriverId(tDriver.getId());
+ service.setType(Integer.valueOf(serverArray[i]));
+ tDriverServiceService.insert(service);
+
+ if (3 == Integer.valueOf(serverArray[i])){
+ //添加线路
+ if (SinataUtil.isNotEmpty(lineStr)){
+ addLine(lineStr,tDriver.getId());
+ }
+ }
+ }
+
+ return SUCCESS_TIP;
+ }
+
+ /**
+ * 添加线路
+ * @param subArr
+ * @param id
+ */
+ public void addLine(String subArr,Integer id){
+ JSONArray jsonArray = JSON.parseArray(subArr);
+ int size = jsonArray.size();
+ for (int i = 0; i < size; i++){
+ JSONObject jsonObject = jsonArray.getJSONObject(i);
+ TDriverLine line = new TDriverLine();
+ line.setCreateTime(new Date());
+ line.setAddTime(jsonObject.getString("time"));
+ line.setLineId(jsonObject.getInteger("lineId"));
+ line.setDriverId(id);
+ tDriverLineService.insert(line);
+ }
+ }
+
+
+ /**
+ * 删除司机审核列表
+ */
+ @RequestMapping(value = "/delete")
+ @ResponseBody
+ public Object delete(@RequestParam Integer tDriverId) {
+ TDriver driver = tDriverService.selectById(tDriverId);
+ driver.setFlag("3");
+ tDriverService.updateById(driver);
+ return SUCCESS_TIP;
+ }
+ /**
+ * 操作司机状态
+ */
+ @RequestMapping(value = "/optDriver")
+ @ResponseBody
+ public Object optDriver(@RequestParam Integer driverId,@RequestParam String remark,@RequestParam Integer optType) {
+ if (SinataUtil.isNotEmpty(driverId) && SinataUtil.isNotEmpty(optType)){
+ TDriver tDriver = tDriverService.selectById(driverId);
+ if (1 == optType){ //解冻
+ tDriver.setAuthState(2);
+ new Thread(new Runnable() {
+ @Override
+ public void run() {
+ if(pushMinistryOfTransport){//上传数据
+ pushMinistryOfTransportUtil.baseInfoCompanyStat();
+ pushMinistryOfTransportUtil.baseInfoDriver(driverId);
+ }
+ }
+ }).start();
+ }else if (2 == optType){ //冻结
+ tDriver.setAuthState(3);
+ new Thread(new Runnable() {
+ @Override
+ public void run() {
+ if(pushMinistryOfTransport){//上传数据
+ pushMinistryOfTransportUtil.baseInfoCompanyStat();
+ pushMinistryOfTransportUtil.baseInfoDriver(driverId);
+ }
+ }
+ }).start();
+ }
+ tDriver.setRemark(remark);
+ tDriverService.updateById(tDriver);
+ }
+ return SUCCESS_TIP;
+ }
+
+ /**
+ * 修改司机审核列表
+ */
+ @RequestMapping(value = "/update")
+ @ResponseBody
+ public Object update(TDriver tDriver,@RequestParam String serverBox,@RequestParam String lineStr,Integer roleType,Integer companyType,Integer oneId,Integer twoId,Integer franchiseeId) {
+ TDriver obj = tDriverService.selectById(tDriver.getId());
+ if (!obj.getPhone().equals(tDriver.getPhone())){
+ //判断登录账户是否重复
+ int count = tDriverService.selectCount(new EntityWrapper<TDriver>().eq("phone", tDriver.getPhone()).in("authState", "1,2,3"));
+ if (count > 0){
+ return "error";
+ }
+ }
+ if (1 == roleType){ //平台
+ if (2 == companyType.intValue()){
+ if (SinataUtil.isNotEmpty(oneId)){
+ tDriver.setCompanyId(oneId);
+ }
+ if (SinataUtil.isNotEmpty(twoId)){
+ tDriver.setFranchiseeId(twoId);
+ }
+ }else if (1 == companyType.intValue()){
+ TCompany company = tCompanyService.selectOne(new EntityWrapper<TCompany>().eq("type", 1));
+ tDriver.setCompanyId(company.getId());
+ tDriver.setFranchiseeId(franchiseeId);
+ }
+ }else if (2 == roleType){ //分公司
+ if (SinataUtil.isNotEmpty(ShiroKit.getUser().getObjectId())){
+ tDriver.setCompanyId(ShiroKit.getUser().getObjectId());
+ }
+ if (SinataUtil.isNotEmpty(franchiseeId)){
+ tDriver.setFranchiseeId(franchiseeId);
+ }
+ }else if (3 == roleType){ //加盟商
+ TCompany tCompany = tCompanyService.selectById(ShiroKit.getUser().getObjectId());
+ if (SinataUtil.isNotEmpty(tCompany)){
+ tDriver.setCompanyId(tCompany.getSuperiorId());
+ }
+ if (SinataUtil.isNotEmpty(ShiroKit.getUser().getObjectId())){
+ tDriver.setFranchiseeId(ShiroKit.getUser().getObjectId());
+ }
+ }
+ tDriver.setUpdateTime(new Date());
+ tDriver.setUpdateUser(ShiroKit.getUser().getId());
+// tDriver.setPassword(MD5Util.encrypt(tDriver.getPassword()));
+ tDriver.setPassword(ShiroKit.md5(tDriver.getPassword(), "SA;d5#"));
+ tDriverService.updateById(tDriver);
+
+ //删除业务
+ tDriverServiceService.delete(new EntityWrapper<TDriverService>().eq("driverId",tDriver.getId()));
+
+ //删除线路
+ tDriverLineService.delete(new EntityWrapper<TDriverLine>().eq("driverId",tDriver.getId()));
+
+ //添加经营业务
+ String[] serverArray = serverBox.split(",");
+ for (int i=0;i<serverArray.length;i++){
+ TDriverService service = new TDriverService();
+ service.setDriverId(tDriver.getId());
+ service.setType(Integer.valueOf(serverArray[i]));
+ tDriverServiceService.insert(service);
+
+ if (3 == Integer.valueOf(serverArray[i])){
+ //添加线路
+ if (SinataUtil.isNotEmpty(lineStr)){
+ addLine(lineStr,tDriver.getId());
+ }
+ }
+ }
+
+ new Thread(new Runnable() {
+ @Override
+ public void run() {
+ if(pushMinistryOfTransport){//上传数据
+ pushMinistryOfTransportUtil.baseInfoDriver(tDriver.getId());
+ }
+ }
+ }).start();
+
+ return SUCCESS_TIP;
+ }
+
+ /**
+ * 下载模板
+ * @param request
+ * @param response
+ */
+ @RequestMapping(value = "/uploadDriverModel")
+ public void uploadDriverModel(HttpServletRequest request, HttpServletResponse response) {
+ // 表格数据【封装】
+ List<List<String>> dataList = new ArrayList<List<String>>();
+
+ String title = "";
+
+ // 首行【封装】
+ List<String> shellList = new ArrayList<String>();
+ if (ShiroKit.getUser().getRoleType() == 1){
+ title = "平台导入司机模板";
+
+ shellList.add("司机名称");
+ shellList.add("所属机构[平台司机/加盟司机]");
+ shellList.add("所属分公司[提示:加盟司机选填]");
+ shellList.add("所属加盟商[提示:加盟司机选填]");
+ shellList.add("性别[男/女]");
+ shellList.add("驾驶证号码");
+ shellList.add("驾龄");
+ shellList.add("身份证号");
+ shellList.add("居住地址");
+ shellList.add("出租车资格证号");
+ shellList.add("工号[选填]");
+ shellList.add("经营业务:专车[是/否]");
+ shellList.add("经营业务:出租车[是/否]");
+ shellList.add("经营业务:跨城出行[是/否]");
+ shellList.add("经营业务:小件同城物流[是/否]");
+ shellList.add("经营业务:小件跨城物流[是/否]");
+ shellList.add("经营业务:包车[是/否]");
+ shellList.add("登录账号[手机号]");
+ shellList.add("登录密码[密码长度为6-18]");
+ }else if (ShiroKit.getUser().getRoleType() == 2){
+ title = "分公司导入司机模板";
+
+ shellList.add("司机名称");
+ shellList.add("所属加盟商[选填]");
+ shellList.add("性别[男/女]");
+ shellList.add("驾驶证号码");
+ shellList.add("驾龄");
+ shellList.add("身份证号");
+ shellList.add("居住地址");
+ shellList.add("出租车资格证号");
+ shellList.add("工号[选填]");
+ shellList.add("经营业务:专车[是/否]");
+ shellList.add("经营业务:出租车[是/否]");
+ shellList.add("经营业务:跨城出行[是/否]");
+ shellList.add("经营业务:小件同城物流[是/否]");
+ shellList.add("经营业务:小件跨城物流[是/否]");
+ shellList.add("经营业务:包车[是/否]");
+ shellList.add("登录账号[手机号]");
+ shellList.add("登录密码[密码长度为6-18]");
+ }else if (ShiroKit.getUser().getRoleType() == 3){
+ title = "加盟商导入司机模板";
+
+ shellList.add("司机名称");
+ shellList.add("性别[男/女]");
+ shellList.add("驾驶证号码");
+ shellList.add("驾龄");
+ shellList.add("身份证号");
+ shellList.add("居住地址");
+ shellList.add("出租车资格证号");
+ shellList.add("工号[选填]");
+ shellList.add("经营业务:专车[是/否]");
+ shellList.add("经营业务:出租车[是/否]");
+ shellList.add("经营业务:跨城出行[是/否]");
+ shellList.add("经营业务:小件同城物流[是/否]");
+ shellList.add("经营业务:小件跨城物流[是/否]");
+ shellList.add("经营业务:包车[是/否]");
+ shellList.add("登录账号[手机号]");
+ shellList.add("登录密码[密码长度为6-18]");
+ }
+ dataList.add(shellList);
+
+ try {
+ // 调用工具类进行导出
+ ExcelExportUtil.easySheet(title+DateUtil.formatDate(new Date(), "YYYYMMddHHmmss"), title, dataList, request, response);
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ }
+
+ /**
+ * 导入操作
+ * @param request
+ * @return
+ */
+ @RequestMapping(value="/exportDriver",method = RequestMethod.POST)
+ @ResponseBody
+ public Object exportDriver(HttpServletRequest request){
+ MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request;
+ MultipartFile file = (MultipartFile) multipartRequest.getFile("myfile");
+ try {
+ if (ShiroKit.getUser().getRoleType() == 1){
+ Workbook book = WoUtil.ImportFile(file);
+ Sheet sh = book.getSheetAt(0); //获取到第一个表
+ for (int i = 1; i <= sh.getLastRowNum(); i++) {
+ Row row = sh.getRow(i);
+
+ Cell cell0 = row.getCell(0); //司机名称
+ String zero = null;
+ if (SinataUtil.isNotEmpty(cell0)){
+ zero = String.valueOf(cell0.getStringCellValue()).trim();
+ }
+
+ Cell cell1 = row.getCell(1); //所属机构[平台司机/加盟司机]
+ String one = null;
+ if (SinataUtil.isNotEmpty(cell1)){
+ one = String.valueOf(cell1.getStringCellValue()).trim();
+ }
+
+ Cell cell2 = row.getCell(2); //所属分公司[提示:加盟司机选填]
+ String two = null;
+ if (SinataUtil.isNotEmpty(cell2)){
+ two = String.valueOf(cell2.getStringCellValue()).trim();
+ }
+
+ Cell cell3 = row.getCell(3); //所属加盟商[提示:加盟司机选填]
+ String three = null;
+ if (SinataUtil.isNotEmpty(cell3)){
+ three = String.valueOf(cell3.getStringCellValue()).trim();
+ }
+
+ Cell cell4 = row.getCell(4); //性别[男/女]
+ String four = null;
+ if (SinataUtil.isNotEmpty(cell4)){
+ four = String.valueOf(cell4.getStringCellValue()).trim();
+ }
+
+ Cell cell5 = row.getCell(5); //驾驶证号码
+ String five = null;
+ if (SinataUtil.isNotEmpty(cell5)){
+ five = String.valueOf(cell5.getStringCellValue()).trim();
+ }
+
+ Cell cell6 = row.getCell(6); //驾龄
+ String six = null;
+ if (SinataUtil.isNotEmpty(cell6)){
+ six = String.valueOf(cell6.getStringCellValue()).trim();
+ }
+
+ Cell cell7 = row.getCell(7); //身份证号
+ String seven = null;
+ if (SinataUtil.isNotEmpty(cell7)){
+ seven = String.valueOf(cell7.getStringCellValue()).trim();
+ }
+
+ Cell cell8 = row.getCell(8); //居住地址
+ String eight = null;
+ if (SinataUtil.isNotEmpty(cell8)){
+ eight = String.valueOf(cell8.getStringCellValue()).trim();
+ }
+
+ Cell cell9 = row.getCell(9); //出租车资格证号
+ String nine = null;
+ if (SinataUtil.isNotEmpty(cell9)){
+ nine = String.valueOf(cell9.getStringCellValue()).trim();
+ }
+
+ Cell cell10 = row.getCell(10); //工号[选填]
+ String ten = null;
+ if (SinataUtil.isNotEmpty(cell10)){
+ ten = String.valueOf(cell10.getStringCellValue()).trim();
+ }
+
+ Cell cell11 = row.getCell(11); //经营业务:专车[是/否]
+ String eleven = null;
+ if (SinataUtil.isNotEmpty(cell11)){
+ eleven = String.valueOf(cell11.getStringCellValue()).trim();
+ }
+
+ Cell cell12 = row.getCell(12); //经营业务:专车[是/否]
+ String twelve = null;
+ if (SinataUtil.isNotEmpty(cell12)){
+ twelve = String.valueOf(cell12.getStringCellValue()).trim();
+ }
+
+ Cell cell13 = row.getCell(13); //经营业务:跨城出行[是/否]
+ String thirteen = null;
+ if (SinataUtil.isNotEmpty(cell13)){
+ thirteen = String.valueOf(cell13.getStringCellValue()).trim();
+ }
+
+ Cell cell14 = row.getCell(14); //经营业务:小件同城物流[是/否]
+ String fourteen = null;
+ if (SinataUtil.isNotEmpty(cell14)){
+ fourteen = String.valueOf(cell14.getStringCellValue()).trim();
+ }
+
+ Cell cell15 = row.getCell(15); //经营业务:小件跨城物流[是/否]
+ String fifteen = null;
+ if (SinataUtil.isNotEmpty(cell15)){
+ fifteen = String.valueOf(cell15.getStringCellValue()).trim();
+ }
+
+ Cell cell16 = row.getCell(16); //经营业务:包车[是/否]
+ String sixteen = null;
+ if (SinataUtil.isNotEmpty(cell16)){
+ sixteen = String.valueOf(cell16.getStringCellValue()).trim();
+ }
+
+ Cell cell17 = row.getCell(17); //登录账号[手机号]
+ String seventeen = null;
+ if (SinataUtil.isNotEmpty(cell17)){
+ seventeen = String.valueOf(cell17.getStringCellValue()).trim();
+ }
+
+ Cell cell18 = row.getCell(18); //登录密码[密码长度为6-18]
+ String eighteen = null;
+ if (SinataUtil.isNotEmpty(cell18)){
+ eighteen = String.valueOf(cell18.getStringCellValue()).trim();
+ }
+
+ if (SinataUtil.isEmpty(zero) || SinataUtil.isEmpty(one) || SinataUtil.isEmpty(four)
+ || SinataUtil.isEmpty(five) || SinataUtil.isEmpty(six) || SinataUtil.isEmpty(nine)
+ || SinataUtil.isEmpty(eleven) || SinataUtil.isEmpty(twelve) || SinataUtil.isEmpty(thirteen)
+ || SinataUtil.isEmpty(fourteen) || SinataUtil.isEmpty(fifteen) || SinataUtil.isEmpty(sixteen)
+ || SinataUtil.isEmpty(seventeen)|| SinataUtil.isEmpty(eighteen)){
+ return new ErrorTip(500, "单元格不能为空");
+ }else{
+ //判断账号是否存在
+ int count = tDriverService.selectCount(new EntityWrapper<TDriver>().eq("phone", seventeen).in("authState", "1,2,3").ne("flag", 3));
+ if (count > 0){
+ continue;
+ }
+
+ //判断所属机构
+ if (!one.equals("平台司机") && !one.equals("加盟司机")){
+ return new ErrorTip(500, "所属机构内容不正确");
+ }
+ //判断性别
+ if (!four.equals("男") && !four.equals("女")){
+ return new ErrorTip(500, "性别内容不正确");
+ }
+ //判断经营业务【专车】
+ if (!eleven.equals("是") && !eleven.equals("否")){
+ return new ErrorTip(500, "经营业务【专车】内容不正确");
+ }
+ //判断经营业务【出租车】
+ if (!twelve.equals("是") && !twelve.equals("否")){
+ return new ErrorTip(500, "经营业务【出租车】内容不正确");
+ }
+ //判断经营业务【跨城出行】
+ if (!thirteen.equals("是") && !thirteen.equals("否")){
+ return new ErrorTip(500, "经营业务【跨城出行】内容不正确");
+ }
+ //判断经营业务【小件同城物流】
+ if (!fourteen.equals("是") && !fourteen.equals("否")){
+ return new ErrorTip(500, "经营业务【小件同城物流】内容不正确");
+ }
+ //判断经营业务【小件跨城物流】
+ if (!fifteen.equals("是") && !fifteen.equals("否")){
+ return new ErrorTip(500, "经营业务【小件跨城物流】内容不正确");
+ }
+ //判断经营业务【包车】
+ if (!sixteen.equals("是") && !sixteen.equals("否")){
+ return new ErrorTip(500, "经营业务【包车】内容不正确");
+ }
+ //判断驾龄
+ if (!isInteger(six)){
+ return new ErrorTip(500, "驾龄格式不正确");
+ }
+ //判断手机号
+ if (!isPhone(seventeen)){
+ return new ErrorTip(500, "登录账号[手机号]格式不正确");
+ }
+ //判断登录密码
+ if (!isPassword(eighteen)){
+ return new ErrorTip(500, "登录密码格式不正确");
+ }
+
+ //查找平台公司
+ TCompany platCompany = itCompanyService.selectOne(new EntityWrapper<TCompany>().eq("type", 1).notIn("flag", "3").last(" limit 1"));
+ Integer companyId = platCompany.getId();
+ Integer franchiseeId = 0;
+ if ("加盟司机".equals(one)){
+ //判断所属分公司是否存在
+ if (SinataUtil.isNotEmpty(two)){
+ TCompany company = itCompanyService.selectOne(new EntityWrapper<TCompany>().eq("name", two).eq("type", 2).notIn("flag", "3").last(" limit 1"));
+ if (SinataUtil.isNotEmpty(company)){
+ companyId = company.getId();
+ //判断加盟商是否存在
+ if (SinataUtil.isNotEmpty(three)){
+ TCompany franchisee = itCompanyService.selectOne(new EntityWrapper<TCompany>().eq("superiorId",company.getId()).eq("name", three).eq("type", 3).notIn("flag", "3").last(" limit 1"));
+ if (SinataUtil.isNotEmpty(franchisee)){
+ franchiseeId = franchisee.getId();
+ }
+ }
+ }
+ }
+ }
+ TDriver driver = new TDriver();
+ driver.setAccount(seventeen);
+ driver.setJobNumber(ten);
+ driver.setPhone(seventeen);
+ driver.setPassword(ShiroKit.md5(eighteen, "SA;d5#"));
+ driver.setName(zero);
+ if ("男".equals(four)){
+ driver.setSex(1);
+ }else if ("女".equals(four)){
+ driver.setSex(2);
+ }
+ driver.setIdCard(seven);
+ driver.setDriverAge(Integer.valueOf(six));
+ driver.setDriveCard(five);
+ driver.setTaxiAptitudeCard(nine);
+ if ("平台司机".equals(one)){
+ driver.setIsPlatCar(1);
+ }else if ("加盟司机".equals(one)){
+ driver.setIsPlatCar(2);
+ }
+ driver.setCompanyId(companyId);
+ driver.setFranchiseeId(franchiseeId);
+ driver.setState(2);
+ driver.setAuthState(2);
+ driver.setFlag("1");
+ driver.setInsertUser(ShiroKit.getUser().getId());
+ driver.setInsertTime(new Date());
+ driver.setAddType(2);
+ driver.setAddObjectId(ShiroKit.getUser().getObjectId());
+ if(SinataUtil.isNotEmpty(eight)){
+ driver.setDriverAddress(eight);
+ }
+ tDriverService.insert(driver);
+
+
+ //添加专车服务模式
+ if ("是".equals(eleven)){
+ TDriverService service = new TDriverService();
+ service.setDriverId(driver.getId());
+ service.setType(1);
+ itDriverServiceService.insert(service);
+ }
+ //添加出租车服务模式
+ if ("是".equals(twelve)){
+ TDriverService service = new TDriverService();
+ service.setDriverId(driver.getId());
+ service.setType(2);
+ itDriverServiceService.insert(service);
+ }
+ //添加跨城出行服务模式
+ if ("是".equals(thirteen)){
+ TDriverService service = new TDriverService();
+ service.setDriverId(driver.getId());
+ service.setType(3);
+ itDriverServiceService.insert(service);
+ }
+ //添加小件同城物流服务模式
+ if ("是".equals(fourteen)){
+ TDriverService service = new TDriverService();
+ service.setDriverId(driver.getId());
+ service.setType(4);
+ itDriverServiceService.insert(service);
+ }
+ //添加小件跨城物流服务模式
+ if ("是".equals(fifteen)){
+ TDriverService service = new TDriverService();
+ service.setDriverId(driver.getId());
+ service.setType(5);
+ itDriverServiceService.insert(service);
+ }
+ //添加包车服务模式
+ if ("是".equals(sixteen)){
+ TDriverService service = new TDriverService();
+ service.setDriverId(driver.getId());
+ service.setType(6);
+ itDriverServiceService.insert(service);
+ }
+ }
+ }
+ }else if (ShiroKit.getUser().getRoleType() == 2){
+ Workbook book = WoUtil.ImportFile(file);
+ Sheet sh = book.getSheetAt(0); //获取到第一个表
+ for (int i = 1; i <= sh.getLastRowNum(); i++) {
+ Row row = sh.getRow(i);
+
+ Cell cell0 = row.getCell(0); //司机名称
+ String zero = null;
+ if (SinataUtil.isNotEmpty(cell0)){
+ zero = String.valueOf(cell0.getStringCellValue()).trim();
+ }
+
+ Cell cell1 = row.getCell(1); //所属加盟商[选填]
+ String one = null;
+ if (SinataUtil.isNotEmpty(cell1)){
+ one = String.valueOf(cell1.getStringCellValue()).trim();
+ }
+
+ Cell cell2 = row.getCell(2); //性别[男/女]
+ String two = null;
+ if (SinataUtil.isNotEmpty(cell2)){
+ two = String.valueOf(cell2.getStringCellValue()).trim();
+ }
+
+ Cell cell3 = row.getCell(3); //驾驶证号码
+ String three = null;
+ if (SinataUtil.isNotEmpty(cell3)){
+ three = String.valueOf(cell3.getStringCellValue()).trim();
+ }
+
+ Cell cell4 = row.getCell(4); //驾龄
+ String four = null;
+ if (SinataUtil.isNotEmpty(cell4)){
+ four = String.valueOf(cell4.getStringCellValue()).trim();
+ }
+
+ Cell cell5 = row.getCell(5); //身份证号
+ String five = null;
+ if (SinataUtil.isNotEmpty(cell5)){
+ five = String.valueOf(cell5.getStringCellValue()).trim();
+ }
+
+ Cell cell6 = row.getCell(6); //居住地址
+ String six = null;
+ if (SinataUtil.isNotEmpty(cell6)){
+ six = String.valueOf(cell6.getStringCellValue()).trim();
+ }
+
+ Cell cell7 = row.getCell(7); //出租车资格证号
+ String seven = null;
+ if (SinataUtil.isNotEmpty(cell7)){
+ seven = String.valueOf(cell7.getStringCellValue()).trim();
+ }
+
+ Cell cell8 = row.getCell(8); //工号[选填]
+ String eight = null;
+ if (SinataUtil.isNotEmpty(cell8)){
+ eight = String.valueOf(cell8.getStringCellValue()).trim();
+ }
+
+ Cell cell9 = row.getCell(9); //经营业务:专车[是/否]
+ String nine = null;
+ if (SinataUtil.isNotEmpty(cell9)){
+ nine = String.valueOf(cell9.getStringCellValue()).trim();
+ }
+
+ Cell cell10 = row.getCell(10); //经营业务:出租车[是/否]
+ String ten = null;
+ if (SinataUtil.isNotEmpty(cell10)){
+ ten = String.valueOf(cell10.getStringCellValue()).trim();
+ }
+
+ Cell cell11 = row.getCell(11); //经营业务:跨城出行[是/否]
+ String eleven = null;
+ if (SinataUtil.isNotEmpty(cell11)){
+ eleven = String.valueOf(cell11.getStringCellValue()).trim();
+ }
+
+ Cell cell12 = row.getCell(12); //经营业务:小件同城物流[是/否]
+ String twelve = null;
+ if (SinataUtil.isNotEmpty(cell12)){
+ twelve = String.valueOf(cell12.getStringCellValue()).trim();
+ }
+
+ Cell cell13 = row.getCell(13); //经营业务:小件跨城物流[是/否]
+ String thirteen = null;
+ if (SinataUtil.isNotEmpty(cell13)){
+ thirteen = String.valueOf(cell13.getStringCellValue()).trim();
+ }
+
+ Cell cell14 = row.getCell(14); //经营业务:包车[是/否]
+ String fourteen = null;
+ if (SinataUtil.isNotEmpty(cell14)){
+ fourteen = String.valueOf(cell14.getStringCellValue()).trim();
+ }
+
+ Cell cell15 = row.getCell(15); //登录账号[手机号]
+ String fifteen = null;
+ if (SinataUtil.isNotEmpty(cell15)){
+ fifteen = String.valueOf(cell15.getStringCellValue()).trim();
+ }
+
+ Cell cell16 = row.getCell(16); //登录密码[密码长度为6-18]
+ String sixteen = null;
+ if (SinataUtil.isNotEmpty(cell16)){
+ sixteen = String.valueOf(cell16.getStringCellValue()).trim();
+ }
+ if (SinataUtil.isEmpty(zero) || SinataUtil.isEmpty(two) || SinataUtil.isEmpty(three) || SinataUtil.isEmpty(four)
+ || SinataUtil.isEmpty(five) || SinataUtil.isEmpty(seven)
+ || SinataUtil.isEmpty(nine) || SinataUtil.isEmpty(ten)
+ || SinataUtil.isEmpty(eleven) || SinataUtil.isEmpty(twelve) || SinataUtil.isEmpty(thirteen)
+ || SinataUtil.isEmpty(fourteen) || SinataUtil.isEmpty(fifteen) || SinataUtil.isEmpty(sixteen)){
+ return new ErrorTip(500, "单元格不能为空");
+ }else{
+ //判断账号是否存在
+ int count = tDriverService.selectCount(new EntityWrapper<TDriver>().eq("phone", fifteen).in("authState", "1,2,3").ne("flag", 3));
+ if (count > 0){
+ continue;
+ }
+ //判断性别
+ if (!two.equals("男") && !two.equals("女")){
+ return new ErrorTip(500, "性别内容不正确");
+ }
+ //判断经营业务【专车】
+ if (!nine.equals("是") && !nine.equals("否")){
+ return new ErrorTip(500, "经营业务【专车】内容不正确");
+ }
+ //判断经营业务【出租车】
+ if (!ten.equals("是") && !ten.equals("否")){
+ return new ErrorTip(500, "经营业务【出租车】内容不正确");
+ }
+ //判断经营业务【跨城出行】
+ if (!eleven.equals("是") && !eleven.equals("否")){
+ return new ErrorTip(500, "经营业务【跨城出行】内容不正确");
+ }
+ //判断经营业务【小件同城物流】
+ if (!twelve.equals("是") && !twelve.equals("否")){
+ return new ErrorTip(500, "经营业务【小件同城物流】内容不正确");
+ }
+ //判断经营业务【小件跨城物流】
+ if (!thirteen.equals("是") && !thirteen.equals("否")){
+ return new ErrorTip(500, "经营业务【小件跨城物流】内容不正确");
+ }
+ //判断经营业务【包车】
+ if (!fourteen.equals("是") && !fourteen.equals("否")){
+ return new ErrorTip(500, "经营业务【包车】内容不正确");
+ }
+ //判断驾龄
+ if (!isInteger(four)){
+ return new ErrorTip(500, "驾龄格式不正确");
+ }
+ //判断手机号
+ if (!isPhone(fifteen)){
+ return new ErrorTip(500, "登录账号[手机号]格式不正确");
+ }
+ //判断登录密码
+ if (!isPassword(sixteen)){
+ return new ErrorTip(500, "登录密码格式不正确");
+ }
+ //查找平台公司
+ Integer companyId = ShiroKit.getUser().getObjectId();
+ Integer franchiseeId = 0;
+ //判断所属分公司是否存在
+ if (SinataUtil.isNotEmpty(one)){
+ TCompany franchisee = itCompanyService.selectOne(new EntityWrapper<TCompany>().eq("superiorId",companyId).eq("name", one).eq("type", 3).notIn("flag", "3").last(" limit 1"));
+ if (SinataUtil.isNotEmpty(franchisee)){
+ franchiseeId = franchisee.getId();
+ }
+ }
+
+ TDriver driver = new TDriver();
+ driver.setAccount(fifteen);
+ driver.setJobNumber(eight);
+ driver.setPhone(fifteen);
+ driver.setPassword(ShiroKit.md5(sixteen, "SA;d5#"));
+ driver.setName(zero);
+ if ("男".equals(two)){
+ driver.setSex(1);
+ }else if ("女".equals(two)){
+ driver.setSex(2);
+ }
+ driver.setIdCard(five);
+ driver.setDriverAge(Integer.valueOf(four));
+ driver.setDriveCard(three);
+ driver.setTaxiAptitudeCard(seven);
+ driver.setIsPlatCar(2);
+ driver.setCompanyId(companyId);
+ driver.setFranchiseeId(franchiseeId);
+ driver.setState(1);
+ driver.setAuthState(1);
+ driver.setFlag("1");
+ driver.setInsertUser(ShiroKit.getUser().getId());
+ driver.setInsertTime(new Date());
+ driver.setAddType(3);
+ driver.setAddObjectId(ShiroKit.getUser().getObjectId());
+ if (SinataUtil.isNotEmpty(six)){
+ driver.setDriverAddress(six);
+ }
+ tDriverService.insert(driver);
+
+ //添加专车服务模式
+ if ("是".equals(nine)){
+ TDriverService service = new TDriverService();
+ service.setDriverId(driver.getId());
+ service.setType(1);
+ itDriverServiceService.insert(service);
+ }
+ //添加出租车服务模式
+ if ("是".equals(ten)){
+ TDriverService service = new TDriverService();
+ service.setDriverId(driver.getId());
+ service.setType(2);
+ itDriverServiceService.insert(service);
+ }
+ //添加跨城出行服务模式
+ if ("是".equals(eleven)){
+ TDriverService service = new TDriverService();
+ service.setDriverId(driver.getId());
+ service.setType(3);
+ itDriverServiceService.insert(service);
+ }
+ //添加小件同城物流服务模式
+ if ("是".equals(twelve)){
+ TDriverService service = new TDriverService();
+ service.setDriverId(driver.getId());
+ service.setType(4);
+ itDriverServiceService.insert(service);
+ }
+ //添加小件跨城物流服务模式
+ if ("是".equals(thirteen)){
+ TDriverService service = new TDriverService();
+ service.setDriverId(driver.getId());
+ service.setType(5);
+ itDriverServiceService.insert(service);
+ }
+ //添加包车服务模式
+ if ("是".equals(fourteen)){
+ TDriverService service = new TDriverService();
+ service.setDriverId(driver.getId());
+ service.setType(6);
+ itDriverServiceService.insert(service);
+ }
+
+ }
+ }
+ }else if (ShiroKit.getUser().getRoleType() == 3){
+ Workbook book = WoUtil.ImportFile(file);
+ Sheet sh = book.getSheetAt(0); //获取到第一个表
+ for (int i = 1; i <= sh.getLastRowNum(); i++) {
+ Row row = sh.getRow(i);
+
+ Cell cell0 = row.getCell(0); //司机名称
+ String zero = null;
+ if (SinataUtil.isNotEmpty(cell0)){
+ zero = String.valueOf(cell0.getStringCellValue()).trim();
+ }
+
+ Cell cell2 = row.getCell(1); //性别[男/女]
+ String one = null;
+ if (SinataUtil.isNotEmpty(cell2)){
+ one = String.valueOf(cell2.getStringCellValue()).trim();
+ }
+
+ Cell cell3 = row.getCell(2); //驾驶证号码
+ String two = null;
+ if (SinataUtil.isNotEmpty(cell3)){
+ two = String.valueOf(cell3.getStringCellValue()).trim();
+ }
+
+ Cell cell4 = row.getCell(3); //驾龄
+ String three = null;
+ if (SinataUtil.isNotEmpty(cell4)){
+ three = String.valueOf(cell4.getStringCellValue()).trim();
+ }
+
+ Cell cell5 = row.getCell(4); //身份证号
+ String four = null;
+ if (SinataUtil.isNotEmpty(cell5)){
+ four = String.valueOf(cell5.getStringCellValue()).trim();
+ }
+
+ Cell cell6 = row.getCell(5); //居住地址
+ String five = null;
+ if (SinataUtil.isNotEmpty(cell6)){
+ five = String.valueOf(cell6.getStringCellValue()).trim();
+ }
+
+ Cell cell7 = row.getCell(6); //出租车资格证号
+ String six = null;
+ if (SinataUtil.isNotEmpty(cell7)){
+ six = String.valueOf(cell7.getStringCellValue()).trim();
+ }
+
+ Cell cell8 = row.getCell(7); //工号[选填]
+ String seven = null;
+ if (SinataUtil.isNotEmpty(cell8)){
+ seven = String.valueOf(cell8.getStringCellValue()).trim();
+ }
+
+ Cell cell9 = row.getCell(8); //经营业务:专车[是/否]
+ String eight = null;
+ if (SinataUtil.isNotEmpty(cell9)){
+ eight = String.valueOf(cell9.getStringCellValue()).trim();
+ }
+
+ Cell cell10 = row.getCell(9); //经营业务:出租车[是/否]
+ String nine = null;
+ if (SinataUtil.isNotEmpty(cell10)){
+ nine = String.valueOf(cell10.getStringCellValue()).trim();
+ }
+
+ Cell cell11 = row.getCell(10); //经营业务:跨城出行[是/否]
+ String ten = null;
+ if (SinataUtil.isNotEmpty(cell11)){
+ ten = String.valueOf(cell11.getStringCellValue()).trim();
+ }
+
+ Cell cell12 = row.getCell(11); //经营业务:小件同城物流[是/否]
+ String eleven = null;
+ if (SinataUtil.isNotEmpty(cell12)){
+ eleven = String.valueOf(cell12.getStringCellValue()).trim();
+ }
+
+ Cell cell13 = row.getCell(12); //经营业务:小件跨城物流[是/否]
+ String twelve = null;
+ if (SinataUtil.isNotEmpty(cell13)){
+ twelve = String.valueOf(cell13.getStringCellValue()).trim();
+ }
+
+ Cell cell14 = row.getCell(13); //经营业务:包车[是/否]
+ String thirteen = null;
+ if (SinataUtil.isNotEmpty(cell14)){
+ thirteen = String.valueOf(cell14.getStringCellValue()).trim();
+ }
+
+ Cell cell15 = row.getCell(14); //登录账号[手机号]
+ String fourteen = null;
+ if (SinataUtil.isNotEmpty(cell15)){
+ fourteen = String.valueOf(cell15.getStringCellValue()).trim();
+ }
+
+ Cell cell16 = row.getCell(15); //登录密码[密码长度为6-18]
+ String fifteen = null;
+ if (SinataUtil.isNotEmpty(cell16)){
+ fifteen = String.valueOf(cell16.getStringCellValue()).trim();
+ }
+ if (SinataUtil.isEmpty(zero) || SinataUtil.isEmpty(one) || SinataUtil.isEmpty(two) || SinataUtil.isEmpty(three) || SinataUtil.isEmpty(four)
+ || SinataUtil.isEmpty(six) || SinataUtil.isEmpty(eight)
+ || SinataUtil.isEmpty(nine) || SinataUtil.isEmpty(ten)
+ || SinataUtil.isEmpty(eleven) || SinataUtil.isEmpty(twelve) || SinataUtil.isEmpty(thirteen)
+ || SinataUtil.isEmpty(fourteen) || SinataUtil.isEmpty(fifteen) ){
+ return new ErrorTip(500, "单元格不能为空");
+ }else{
+ //判断账号是否存在
+ int count = tDriverService.selectCount(new EntityWrapper<TDriver>().eq("phone", fourteen).in("authState", "1,2,3").ne("flag", 3));
+ if (count > 0){
+ continue;
+ }
+ //判断性别
+ if (!one.equals("男") && !one.equals("女")){
+ return new ErrorTip(500, "性别内容不正确");
+ }
+ //判断经营业务【专车】
+ if (!eight.equals("是") && !eight.equals("否")){
+ return new ErrorTip(500, "经营业务【专车】内容不正确");
+ }
+ //判断经营业务【出租车】
+ if (!nine.equals("是") && !nine.equals("否")){
+ return new ErrorTip(500, "经营业务【出租车】内容不正确");
+ }
+ //判断经营业务【跨城出行】
+ if (!ten.equals("是") && !ten.equals("否")){
+ return new ErrorTip(500, "经营业务【跨城出行】内容不正确");
+ }
+ //判断经营业务【小件同城物流】
+ if (!eleven.equals("是") && !eleven.equals("否")){
+ return new ErrorTip(500, "经营业务【小件同城物流】内容不正确");
+ }
+ //判断经营业务【小件跨城物流】
+ if (!twelve.equals("是") && !twelve.equals("否")){
+ return new ErrorTip(500, "经营业务【小件跨城物流】内容不正确");
+ }
+ //判断经营业务【包车】
+ if (!thirteen.equals("是") && !thirteen.equals("否")){
+ return new ErrorTip(500, "经营业务【包车】内容不正确");
+ }
+ //判断驾龄
+ if (!isInteger(three)){
+ return new ErrorTip(500, "驾龄格式不正确");
+ }
+ //判断手机号
+ if (!isPhone(fourteen)){
+ return new ErrorTip(500, "登录账号[手机号]格式不正确");
+ }
+ //判断登录密码
+ if (!isPassword(fifteen)){
+ return new ErrorTip(500, "登录密码格式不正确");
+ }
+ //查找平台公司
+ Integer companyId = 0;
+ Integer franchiseeId = 0;
+ TCompany franchisee = itCompanyService.selectById(ShiroKit.getUser().getObjectId());
+ if (SinataUtil.isNotEmpty(franchisee)){
+ companyId = franchisee.getSuperiorId();
+ franchiseeId = franchisee.getId();
+ }
+ if (companyId == 0 && franchiseeId == 0){
+ return new ErrorTip(500, "当前登录账户上级分公司不能为空");
+ }
+
+ TDriver driver = new TDriver();
+ driver.setAccount(fourteen);
+ driver.setJobNumber(seven);
+ driver.setPhone(fourteen);
+ driver.setPassword(ShiroKit.md5(fifteen, "SA;d5#"));
+ driver.setName(zero);
+ if ("男".equals(one)){
+ driver.setSex(1);
+ }else if ("女".equals(one)){
+ driver.setSex(2);
+ }
+ driver.setIdCard(four);
+ driver.setDriverAge(Integer.valueOf(three));
+ driver.setDriveCard(two);
+ driver.setTaxiAptitudeCard(six);
+ driver.setIsPlatCar(2);
+ driver.setCompanyId(companyId);
+ driver.setFranchiseeId(franchiseeId);
+ driver.setState(1);
+ driver.setAuthState(1);
+ driver.setFlag("1");
+ driver.setInsertUser(ShiroKit.getUser().getId());
+ driver.setInsertTime(new Date());
+ driver.setAddType(4);
+ driver.setAddObjectId(ShiroKit.getUser().getObjectId());
+ if (SinataUtil.isNotEmpty(five)){
+ driver.setDriverAddress(five);
+ }
+ tDriverService.insert(driver);
+
+ //添加专车服务模式
+ if ("是".equals(eight)){
+ TDriverService service = new TDriverService();
+ service.setDriverId(driver.getId());
+ service.setType(1);
+ itDriverServiceService.insert(service);
+ }
+ //添加出租车服务模式
+ if ("是".equals(nine)){
+ TDriverService service = new TDriverService();
+ service.setDriverId(driver.getId());
+ service.setType(2);
+ itDriverServiceService.insert(service);
+ }
+ //添加跨城出行服务模式
+ if ("是".equals(ten)){
+ TDriverService service = new TDriverService();
+ service.setDriverId(driver.getId());
+ service.setType(3);
+ itDriverServiceService.insert(service);
+ }
+ //添加小件同城物流服务模式
+ if ("是".equals(eleven)){
+ TDriverService service = new TDriverService();
+ service.setDriverId(driver.getId());
+ service.setType(4);
+ itDriverServiceService.insert(service);
+ }
+ //添加小件跨城物流服务模式
+ if ("是".equals(twelve)){
+ TDriverService service = new TDriverService();
+ service.setDriverId(driver.getId());
+ service.setType(5);
+ itDriverServiceService.insert(service);
+ }
+ //添加包车服务模式
+ if ("是".equals(thirteen)){
+ TDriverService service = new TDriverService();
+ service.setDriverId(driver.getId());
+ service.setType(6);
+ itDriverServiceService.insert(service);
+ }
+ }
+ }
+ }
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ return SUCCESS_TIP;
+ }
+
+
+
+
+ @Autowired
+ private ITCompanyService itCompanyService;
+
+ @Autowired
+ private ITDriverServiceService itDriverServiceService;
+
+ /**
+ * 验证是否可以字符转为整数
+ * @param str
+ * @return
+ */
+ public static boolean isInteger(String str) {
+ try{
+ String reg = "^[0-9]\\d*$";
+ boolean flag = str.matches(reg);
+ return flag;
+ }catch(NumberFormatException e) {
+ System.out.println("异常：\"" + str + "\"...");
+ return false;
+ }
+ }
+ /**
+ * 验证手机号格式是否正确
+ * @param str
+ * @return
+ */
+ public static boolean isPhone(String str) {
+ try{
+ String reg = "^1\\d{10}$";
+ boolean flag = str.matches(reg);
+ return flag;
+ }catch(NumberFormatException e) {
+ System.out.println("异常：\"" + str + "\"...");
+ return false;
+ }
+ }
+ /**
+ * 验证密码长度是否正确
+ * @param str
+ * @return
+ */
+ public static boolean isPassword(String str) {
+ try{
+ String reg = "^.{6,18}$";
+ boolean flag = str.matches(reg);
+ return flag;
+ }catch(NumberFormatException e) {
+ System.out.println("异常：\"" + str + "\"...");
+ return false;
+ }
+ }
+
+ /**
+ * 导出司机信息
+ */
+ @RequestMapping(value = "/outDriver")
+ public void outDriver(HttpServletRequest request, HttpServletResponse response) {
+ List<Map<String,Object>> listMap = tDriverService.getDriverListNoPage(ShiroKit.getUser().getRoleType(),ShiroKit.getUser().getObjectId());
+
+ // 表格数据【封装】
+ List<List<String>> dataList = new ArrayList<>();
+
+ //第一行显示【封装】
+ List<String> twoList = new ArrayList<String>();
+ twoList.add("总计:");
+ twoList.add(String.valueOf(listMap.size())+"条");
+ dataList.add(twoList);
+
+ // 列【封装】
+ List<String> shellList = new ArrayList<String>();
+ shellList.add("添加时间");
+ shellList.add("姓名");
+ shellList.add("登录账号【手机号】");
+ shellList.add("性别");
+ shellList.add("司机来源");
+ shellList.add("所属分公司");
+ shellList.add("所属加盟商");
+ shellList.add("当前车辆");
+ shellList.add("服务模式");
+ shellList.add("关联线路");
+ shellList.add("评分");
+ shellList.add("历史接单数");
+ shellList.add("历史订单总金额");
+ shellList.add("当前钱包余额");
+ shellList.add("钱包活动余额");
+ shellList.add("钱包收入余额");
+ shellList.add("状态");
+ dataList.add(shellList);
+
+ for (Map<String,Object> object : listMap){
+ // 详细数据列【封装】
+ shellList = new ArrayList<String>();
+ if(SinataUtil.isNotEmpty(object.get("insertTime"))){
+ shellList.add(DateUtil.formatDate(DateUtil.parse(object.get("insertTime").toString(),"YYYY-MM-dd HH:mm:ss.S"), "YYYY-MM-dd HH:mm:ss"));
+ }else{
+ shellList.add("-");
+ }
+ if(SinataUtil.isNotEmpty(object.get("name"))){
+ shellList.add(object.get("name").toString());
+ }else{
+ shellList.add("-");
+ }
+ if(SinataUtil.isNotEmpty(object.get("phone"))){
+ shellList.add(object.get("phone").toString());
+ }else{
+ shellList.add("-");
+ }
+ if(SinataUtil.isNotEmpty(object.get("sex"))){
+ shellList.add(object.get("sex").toString() == "1"?"男":"女");
+ }else{
+ shellList.add("-");
+ }
+ if(SinataUtil.isNotEmpty(object.get("addType"))){
+
+ shellList.add(object.get("addType").toString().equals("1")?"司机注册":(object.get("addType").toString().equals("2")?"平台添加":(object.get("addType").toString().equals("3")?"分公司添加":(object.get("addType").toString().equals("4")?"加盟商添加":""))));
+ }else{
+ shellList.add("-");
+ }
+ if(SinataUtil.isNotEmpty(object.get("companyName"))){
+ shellList.add(object.get("companyName").toString());
+ }else{
+ shellList.add("-");
+ }
+ if(SinataUtil.isNotEmpty(object.get("franchiseeName"))){
+ shellList.add(object.get("franchiseeName").toString());
+ }else{
+ shellList.add("-");
+ }
+ if(SinataUtil.isNotEmpty(object.get("carLicensePlate"))){
+ shellList.add(object.get("carLicensePlate").toString());
+ }else{
+ shellList.add("-");
+ }
+ if(SinataUtil.isNotEmpty(object.get("serverStr"))){
+ shellList.add(object.get("serverStr").toString());
+ }else{
+ shellList.add("-");
+ }
+ if(SinataUtil.isNotEmpty(object.get("lineStr"))){
+ shellList.add(object.get("lineStr").toString());
+ }else{
+ shellList.add("-");
+ }
+ if(SinataUtil.isNotEmpty(object.get("evaluateNum"))){
+ shellList.add(object.get("evaluateNum").toString());
+ }else{
+ shellList.add("0");
+ }
+ if(SinataUtil.isNotEmpty(object.get("historyNum"))){
+ shellList.add(object.get("historyNum").toString());
+ }else{
+ shellList.add("0");
+ }
+ if(SinataUtil.isNotEmpty(object.get("historyMoney"))){
+ shellList.add(object.get("historyMoney").toString());
+ }else{
+ shellList.add("0");
+ }
+ if(SinataUtil.isNotEmpty(object.get("balance"))){
+ shellList.add(object.get("balance").toString());
+ }else{
+ shellList.add("0");
+ }
+ if(SinataUtil.isNotEmpty(object.get("laveActivityMoney"))){
+ shellList.add(object.get("laveActivityMoney").toString());
+ }else{
+ shellList.add("0");
+ }
+ if(SinataUtil.isNotEmpty(object.get("laveBusinessMoney"))){
+ shellList.add(object.get("laveBusinessMoney").toString());
+ }else{
+ shellList.add("0");
+ }
+ if(SinataUtil.isNotEmpty(object.get("authState"))){
+ shellList.add(object.get("authState").toString().equals("1")?"待审核":(object.get("authState").toString().equals("2")?"正常":(object.get("authState").toString().equals("3")?"冻结":(object.get("authState").toString().equals("4")?"已拒绝":""))));
+
+ shellList.add(object.get("authState").toString());
+ }else{
+ shellList.add("-");
+ }
+ dataList.add(shellList);
+ }
+ try {
+ // 调用工具类进行导出
+ ExcelExportUtil.easySheet("司机信息导出记录"+DateUtil.formatDate(new Date(), "YYYYMMddHHmmss"), "司机信息导出记录", dataList,request, response);
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ }
+
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TFeedbackController.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TFeedbackController.java
new file mode 100644
index 0000000..d92249a
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TFeedbackController.java
@@ -0,0 +1,169 @@
+package com.stylefeng.guns.modular.system.controller.general;
+
+import com.baomidou.mybatisplus.plugins.Page;
+import com.stylefeng.guns.core.base.controller.BaseController;
+import com.stylefeng.guns.core.common.constant.factory.PageFactory;
+import com.stylefeng.guns.core.shiro.ShiroKit;
+import com.stylefeng.guns.core.util.SinataUtil;
+import com.stylefeng.guns.modular.system.model.TSystemNotice;
+import com.stylefeng.guns.modular.system.service.ITSystemNoticeService;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.beans.factory.annotation.Autowired;
+import com.stylefeng.guns.core.log.LogObjectHolder;
+import org.springframework.web.bind.annotation.RequestParam;
+import com.stylefeng.guns.modular.system.model.TFeedback;
+import com.stylefeng.guns.modular.system.service.ITFeedbackService;
+
+import java.util.Date;
+import java.util.Map;
+
+/**
+ * 反馈管理控制器
+ *
+ * @author fengshuonan
+ * @Date 2020-06-10 10:24:59
+ */
+@Controller
+@RequestMapping("/tFeedback")
+public class TFeedbackController extends BaseController {
+
+ private String PREFIX = "/system/tFeedback/";
+
+ @Autowired
+ private ITFeedbackService tFeedbackService;
+
+ @Autowired
+ private ITSystemNoticeService tSystemNoticeService;
+
+ /**
+ * 跳转到司机反馈管理首页
+ */
+ @RequestMapping("")
+ public String index() {
+ return PREFIX + "tFeedback.html";
+ }
+
+ /**
+ * 跳转到用户反馈管理首页
+ */
+ @RequestMapping("/userFeedback")
+ public String userFeedback() {
+ return PREFIX + "userFeedback.html";
+ }
+
+ /**
+ * 跳转到添加反馈管理
+ */
+ @RequestMapping("/tFeedback_add")
+ public String tFeedbackAdd() {
+ return PREFIX + "tFeedback_add.html";
+ }
+
+ /**
+ * 跳转到修改反馈管理
+ */
+ @RequestMapping("/tFeedback_immediately/{tFeedbackId}/{type}")
+ public String tFeedbackUpdate(@PathVariable Integer tFeedbackId, @PathVariable Integer type, Model model) {
+ model.addAttribute("tFeedbackId",tFeedbackId);
+ model.addAttribute("type",type);
+ return PREFIX + "tFeedback_immediately.html";
+ }
+
+ /**
+ * 跳转到查看详情
+ */
+ @RequestMapping("/lookDetail/{id}/{type}")
+ public String lookDetail(@PathVariable Integer id, @PathVariable Integer type, Model model) {
+ TFeedback tFeedback = tFeedbackService.selectById(id);
+ String str = "";
+ if (1 == type){
+ str = tFeedback.getContent();
+ }else if (2 == type){
+ str = tFeedback.getRemark();
+ }
+ model.addAttribute("str",str);
+ return "/system/tComplaint/lookDetail.html";
+ }
+
+ /**
+ * 获取司机反馈管理列表
+ */
+ @RequestMapping(value = "/list")
+ @ResponseBody
+ public Object list(String insertTime,
+ String driverName,
+ String driverPhone,
+ Integer state) {
+ String beginTime = null;
+ String endTime = null;
+ if (SinataUtil.isNotEmpty(insertTime)){
+ String[] timeArray = insertTime.split(" - ");
+ beginTime = timeArray[0];
+ endTime = timeArray[1];
+ }
+ Page<Map<String, Object>> page = new PageFactory<Map<String, Object>>().defaultPage();
+ if (ShiroKit.getUser().getRoleType() != 1){
+ page.setRecords(null);
+ }else{
+ page.setRecords(tFeedbackService.getFeedbackList(page,beginTime,endTime,2,driverName,driverPhone,state));
+ }
+ return super.packForBT(page);
+ }
+
+ /**
+ * 获取用户反馈管理列表
+ */
+ @RequestMapping(value = "/listUser")
+ @ResponseBody
+ public Object listUser(String insertTime,
+ String userName,
+ String userPhone,
+ Integer state) {
+ String beginTime = null;
+ String endTime = null;
+ if (SinataUtil.isNotEmpty(insertTime)){
+ String[] timeArray = insertTime.split(" - ");
+ beginTime = timeArray[0];
+ endTime = timeArray[1];
+ }
+ Page<Map<String, Object>> page = new PageFactory<Map<String, Object>>().defaultPage();
+ if (ShiroKit.getUser().getRoleType() != 1){
+ page.setRecords(null);
+ }else{
+ page.setRecords(tFeedbackService.getFeedbackList(page,beginTime,endTime,1,userName,userPhone,state));
+ }
+ return super.packForBT(page);
+ }
+
+ /**
+ * 立即处理操作
+ */
+ @RequestMapping(value = "/immediately")
+ @ResponseBody
+ public Object immediately(@RequestParam Integer id,@RequestParam String remark) {
+ TFeedback tFeedback = tFeedbackService.selectById(id);
+ if (SinataUtil.isNotEmpty(tFeedback)){
+ tFeedback.setCldate(new Date());
+ tFeedback.setRemark(remark);
+ tFeedback.setHandleUserId(ShiroKit.getUser().getId());
+ tFeedback.setState(2);
+ tFeedbackService.updateById(tFeedback);
+
+ //增加系统消息
+ TSystemNotice notice = new TSystemNotice();
+ notice.setType(2);
+ notice.setUserType(tFeedback.getType());
+ notice.setContent("反馈处理结果:【"+remark+"】。");
+ notice.setUserId(tFeedback.getUserId());
+ notice.setInsertTime(new Date());
+ notice.setRead(1);
+ tSystemNoticeService.insert(notice);
+ }
+ return SUCCESS_TIP;
+ }
+
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TInvoiceController.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TInvoiceController.java
new file mode 100644
index 0000000..5a32eb0
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TInvoiceController.java
@@ -0,0 +1,125 @@
+package com.stylefeng.guns.modular.system.controller.general;
+
+import com.baomidou.mybatisplus.plugins.Page;
+import com.stylefeng.guns.core.base.controller.BaseController;
+import com.stylefeng.guns.core.common.constant.factory.PageFactory;
+import com.stylefeng.guns.core.shiro.ShiroKit;
+import com.stylefeng.guns.core.util.SinataUtil;
+import com.stylefeng.guns.modular.system.model.TComplaint;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.beans.factory.annotation.Autowired;
+import com.stylefeng.guns.core.log.LogObjectHolder;
+import org.springframework.web.bind.annotation.RequestParam;
+import com.stylefeng.guns.modular.system.model.TInvoice;
+import com.stylefeng.guns.modular.system.service.ITInvoiceService;
+
+import java.util.Map;
+
+/**
+ * 开发票列表控制器
+ *
+ * @author fengshuonan
+ * @Date 2020-06-09 10:55:26
+ */
+@Controller
+@RequestMapping("/tInvoice")
+public class TInvoiceController extends BaseController {
+
+ private String PREFIX = "/system/tInvoice/";
+
+ @Autowired
+ private ITInvoiceService tInvoiceService;
+
+ /**
+ * 跳转到开发票列表首页
+ */
+ @RequestMapping("")
+ public String index() {
+ return PREFIX + "tInvoice.html";
+ }
+
+ /**
+ * 跳转到查看详情
+ */
+ @RequestMapping("/lookDetail/{id}/{type}")
+ public String lookDetail(@PathVariable Integer id, @PathVariable Integer type, Model model) {
+ TInvoice tInvoice = tInvoiceService.selectById(id);
+ String str = "";
+ if (1 == type){
+ str = tInvoice.getContent();
+ }
+ model.addAttribute("str",str);
+ return "/system/tComplaint/lookDetail.html";
+ }
+
+ /**
+ * 跳转到添加开发票列表
+ */
+ @RequestMapping("/tInvoice_add")
+ public String tInvoiceAdd() {
+ return PREFIX + "tInvoice_add.html";
+ }
+
+ /**
+ * 跳转到修改开发票列表
+ */
+ @RequestMapping("/tInvoice_update/{tInvoiceId}")
+ public String tInvoiceUpdate(@PathVariable Integer tInvoiceId, Model model) {
+ TInvoice tInvoice = tInvoiceService.selectById(tInvoiceId);
+ model.addAttribute("item",tInvoice);
+ LogObjectHolder.me().set(tInvoice);
+ return PREFIX + "tInvoice_edit.html";
+ }
+
+ /**
+ * 获取开发票列表列表
+ */
+ @RequestMapping(value = "/list")
+ @ResponseBody
+ public Object list(String insertTime,
+ String email,
+ String name,
+ Integer type,
+ Integer state) {
+ String beginTime = null;
+ String endTime = null;
+ if (SinataUtil.isNotEmpty(insertTime)){
+ String[] timeArray = insertTime.split(" - ");
+ beginTime = timeArray[0];
+ endTime = timeArray[1];
+ }
+ Page<Map<String, Object>> page = new PageFactory<Map<String, Object>>().defaultPage();
+ if (ShiroKit.getUser().getRoleType() != 1){
+ page.setRecords(null);
+ }else{
+ page.setRecords(tInvoiceService.getInvoiceList(page,beginTime,endTime,email,name,type,state));
+ }
+ return super.packForBT(page);
+ }
+
+ /**
+ * 重新开发票
+ */
+ @RequestMapping(value = "/again")
+ @ResponseBody
+ public Object again(@RequestParam Integer tInvoiceId) {
+ TInvoice tInvoice = tInvoiceService.selectById(tInvoiceId);
+
+ return SUCCESS_TIP;
+ }
+
+ /**
+ * 删除开发票列表
+ */
+ @RequestMapping(value = "/delete")
+ @ResponseBody
+ public Object delete(@RequestParam Integer tInvoiceId) {
+ tInvoiceService.deleteById(tInvoiceId);
+ return SUCCESS_TIP;
+ }
+
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TNoticesController.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TNoticesController.java
new file mode 100644
index 0000000..89f1547
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TNoticesController.java
@@ -0,0 +1,241 @@
+package com.stylefeng.guns.modular.system.controller.general;
+
+import com.baomidou.mybatisplus.plugins.Page;
+import com.stylefeng.guns.core.base.controller.BaseController;
+import com.stylefeng.guns.core.common.constant.factory.PageFactory;
+import com.stylefeng.guns.core.shiro.ShiroKit;
+import com.stylefeng.guns.core.util.DateUtil;
+import com.stylefeng.guns.core.util.SinataUtil;
+import com.stylefeng.guns.modular.system.util.task.base.QuartzManager;
+import com.stylefeng.guns.modular.system.util.task.base.TimeJobType;
+import com.stylefeng.guns.modular.system.util.task.jobs.AddNotice;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.beans.factory.annotation.Autowired;
+import com.stylefeng.guns.core.log.LogObjectHolder;
+import org.springframework.web.bind.annotation.RequestParam;
+import com.stylefeng.guns.modular.system.model.TNotices;
+import com.stylefeng.guns.modular.system.service.ITNoticesService;
+
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * 滚动消息设置控制器
+ *
+ * @author fengshuonan
+ * @Date 2020-06-10 15:21:25
+ */
+@Controller
+@RequestMapping("/tNotices")
+public class TNoticesController extends BaseController {
+
+ private String PREFIX = "/system/tNotices/";
+
+ @Autowired
+ private ITNoticesService tNoticesService;
+
+ /**
+ * 跳转到滚动消息设置首页
+ */
+ @RequestMapping("")
+ public String index() {
+ return PREFIX + "tNotices.html";
+ }
+
+ /**
+ * 跳转到系统公告设置首页
+ */
+ @RequestMapping("/system")
+ public String system() {
+ return PREFIX + "system.html";
+ }
+
+ /**
+ * 跳转到添加滚动消息设置
+ */
+ @RequestMapping("/tNotices_add")
+ public String tNoticesAdd() {
+ return PREFIX + "tNotices_add.html";
+ }
+
+ /**
+ * 跳转到添加系统公告
+ */
+ @RequestMapping("/system_add")
+ public String system_add() {
+ return PREFIX + "system_add.html";
+ }
+
+ /**
+ * 跳转到修改滚动消息设置
+ */
+ @RequestMapping("/tNotices_update/{tNoticesId}")
+ public String tNoticesUpdate(@PathVariable Integer tNoticesId, Model model) {
+ TNotices tNotices = tNoticesService.selectById(tNoticesId);
+ model.addAttribute("item",tNotices);
+ LogObjectHolder.me().set(tNotices);
+ return PREFIX + "tNotices_edit.html";
+ }
+
+ /**
+ * 跳转到修改系统公告
+ */
+ @RequestMapping("/system_update/{tNoticesId}")
+ public String system_update(@PathVariable Integer tNoticesId, Model model) {
+ TNotices tNotices = tNoticesService.selectById(tNoticesId);
+ model.addAttribute("item",tNotices);
+ LogObjectHolder.me().set(tNotices);
+ return PREFIX + "system_update.html";
+ }
+
+ /**
+ * 获取滚动消息设置列表
+ */
+ @RequestMapping(value = "/list")
+ @ResponseBody
+ public Object list(String insertTime,String content) {
+ String beginTime = null;
+ String endTime = null;
+ if (SinataUtil.isNotEmpty(insertTime)){
+ String[] timeArray = insertTime.split(" - ");
+ beginTime = timeArray[0];
+ endTime = timeArray[1];
+ }
+ Page<Map<String, Object>> page = new PageFactory<Map<String, Object>>().defaultPage();
+ if (ShiroKit.getUser().getRoleType() != 1){
+ page.setRecords(null);
+ }else{
+ page.setRecords(tNoticesService.getRollingNoticeList(page,beginTime,endTime,1,content));
+ }
+ return super.packForBT(page);
+ }
+
+ /**
+ * 获取系统公告设置列表
+ */
+ @RequestMapping(value = "/listSystem")
+ @ResponseBody
+ public Object listSystem(String insertTime,String content) {
+ String beginTime = null;
+ String endTime = null;
+ if (SinataUtil.isNotEmpty(insertTime)){
+ String[] timeArray = insertTime.split(" - ");
+ beginTime = timeArray[0];
+ endTime = timeArray[1];
+ }
+ Page<Map<String, Object>> page = new PageFactory<Map<String, Object>>().defaultPage();
+ if (ShiroKit.getUser().getRoleType() != 1){
+ page.setRecords(null);
+ }else{
+ page.setRecords(tNoticesService.getRollingNoticeList(page,beginTime,endTime,2,content));
+ }
+ return super.packForBT(page);
+ }
+
+ /**
+ * 新增滚动消息设置
+ */
+ @RequestMapping(value = "/add")
+ @ResponseBody
+ public Object add(TNotices tNotices) {
+ tNotices.setIsDelete(1);
+ tNotices.setInsertTime(new Date());
+ tNotices.setInsertUser(ShiroKit.getUser().getId());
+ tNotices.setType(1);
+ tNoticesService.insert(tNotices);
+ return SUCCESS_TIP;
+ }
+
+ /**
+ * 新增系统公告
+ */
+ @RequestMapping(value = "/addSystem")
+ @ResponseBody
+ public Object addSystem(TNotices tNotices) {
+ tNotices.setIsDelete(1);
+ tNotices.setInsertTime(new Date());
+ tNotices.setInsertUser(ShiroKit.getUser().getId());
+ tNotices.setType(2);
+ tNoticesService.insert(tNotices);
+
+ if (tNotices.getIsShow() == 1){ //发布
+ //定时1秒后执行
+ Map<String,Object> maps=new HashMap<>();
+ maps.put("noticeId",tNotices.getId());
+ QuartzManager.addJob(AddNotice.class, (AddNotice.name+tNotices.getId()).toUpperCase(), TimeJobType.UNLOCK,DateUtil.getDate_strYMdHms(new Date().getTime() + 1*1000) , maps);
+ }
+ return SUCCESS_TIP;
+ }
+
+ /**
+ * 发布系统公告
+ */
+ @RequestMapping(value = "/sendSystem")
+ @ResponseBody
+ public Object sendSystem(@RequestParam Integer tNoticesId) {
+ TNotices tNotices = tNoticesService.selectById(tNoticesId);
+ if (tNotices.getIsShow() == 2){
+ //定时1秒后执行
+ Map<String,Object> maps=new HashMap<>();
+ maps.put("noticeId",tNotices.getId());
+ QuartzManager.addJob(AddNotice.class, (AddNotice.name+tNotices.getId()).toUpperCase(), TimeJobType.UNLOCK,DateUtil.getDate_strYMdHms(new Date().getTime() + 1*1000) , maps);
+ }
+ tNotices.setIsShow(1);
+ tNotices.setUpdateTime(new Date());
+ tNotices.setUpdateUser(ShiroKit.getUser().getId());
+ tNoticesService.updateById(tNotices);
+ return SUCCESS_TIP;
+ }
+
+ /**
+ * 删除
+ */
+ @RequestMapping(value = "/delete")
+ @ResponseBody
+ public Object delete(@RequestParam Integer tNoticesId) {
+ TNotices tNotices = tNoticesService.selectById(tNoticesId);
+ tNotices.setIsDelete(2);
+ tNotices.setFlag("3");
+ tNotices.setUpdateTime(new Date());
+ tNotices.setUpdateUser(ShiroKit.getUser().getId());
+ tNoticesService.updateById(tNotices);
+ return SUCCESS_TIP;
+ }
+
+ /**
+ * 修改滚动消息设置
+ */
+ @RequestMapping(value = "/update")
+ @ResponseBody
+ public Object update(TNotices tNotices) {
+ tNotices.setUpdateUser(ShiroKit.getUser().getId());
+ tNotices.setUpdateTime(new Date());
+ tNoticesService.updateById(tNotices);
+ return SUCCESS_TIP;
+ }
+
+ /**
+ * 修改系统公告
+ */
+ @RequestMapping(value = "/updateSystem")
+ @ResponseBody
+ public Object updateSystem(TNotices tNotices) {
+ tNotices.setUpdateUser(ShiroKit.getUser().getId());
+ tNotices.setUpdateTime(new Date());
+ tNoticesService.updateById(tNotices);
+
+ if (tNotices.getIsShow() == 1){ //发布
+ //定时1秒后执行
+ Map<String,Object> maps=new HashMap<>();
+ maps.put("noticeId",tNotices.getId());
+ QuartzManager.addJob(AddNotice.class, (AddNotice.name+tNotices.getId()).toUpperCase(), TimeJobType.UNLOCK,DateUtil.getDate_strYMdHms(new Date().getTime() + 1*1000) , maps);
+ }
+ return SUCCESS_TIP;
+ }
+
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TOpenCityController.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TOpenCityController.java
new file mode 100644
index 0000000..f61070e
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TOpenCityController.java
@@ -0,0 +1,293 @@
+package com.stylefeng.guns.modular.system.controller.general;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.baomidou.mybatisplus.plugins.Page;
+import com.stylefeng.guns.core.base.controller.BaseController;
+import com.stylefeng.guns.core.common.constant.factory.PageFactory;
+import com.stylefeng.guns.core.shiro.ShiroKit;
+import com.stylefeng.guns.core.util.DateUtil;
+import com.stylefeng.guns.core.util.SinataUtil;
+import com.stylefeng.guns.modular.system.model.TOpenCityBusiness;
+import com.stylefeng.guns.modular.system.model.TRegion;
+import com.stylefeng.guns.modular.system.service.ITOpenCityBusinessService;
+import com.stylefeng.guns.modular.system.service.ITRegionService;
+import com.stylefeng.guns.modular.system.util.GaoDeMapUtil;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.beans.factory.annotation.Autowired;
+import com.stylefeng.guns.core.log.LogObjectHolder;
+import org.springframework.web.bind.annotation.RequestParam;
+import com.stylefeng.guns.modular.system.model.TOpenCity;
+import com.stylefeng.guns.modular.system.service.ITOpenCityService;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 城市管理控制器
+ *
+ * @author fengshuonan
+ * @Date 2020-06-02 11:40:31
+ */
+@Controller
+@RequestMapping("/tOpenCity")
+public class TOpenCityController extends BaseController {
+
+ private String PREFIX = "/system/tOpenCity/";
+
+ @Autowired
+ private ITOpenCityService tOpenCityService;
+
+ @Autowired
+ private ITRegionService tRegionService;
+
+ @Autowired
+ private ITOpenCityBusinessService tOpenCityBusinessService;
+
+ /**
+ * 跳转到城市管理首页
+ */
+ @RequestMapping("")
+ public String index() {
+ return PREFIX + "tOpenCity.html";
+ }
+
+ /**
+ * 跳转到添加城市管理
+ */
+ @RequestMapping("/tOpenCity_add")
+ public String tOpenCityAdd(Model model) {
+ List<TRegion> provinceList = tRegionService.selectList(new EntityWrapper<TRegion>().eq("parent_id", 0));
+ model.addAttribute("provinceList",provinceList);
+ return PREFIX + "tOpenCity_add.html";
+ }
+
+ /**
+ * 跳转到修改城市管理
+ */
+ @RequestMapping("/tOpenCity_update/{tOpenCityId}")
+ public String tOpenCityUpdate(@PathVariable Integer tOpenCityId, Model model) {
+ TOpenCity tOpenCity = tOpenCityService.selectById(tOpenCityId);
+ model.addAttribute("item",tOpenCity);
+ LogObjectHolder.me().set(tOpenCity);
+
+ //省
+ List<TRegion> provinceList = tRegionService.selectList(new EntityWrapper<TRegion>().eq("parent_id", 0));
+ model.addAttribute("provinceList",provinceList);
+ //市
+ List<TRegion> cityList = tRegionService.selectList(new EntityWrapper<TRegion>().eq("parent_id", tOpenCity.getAreaId()));
+ model.addAttribute("cityList",cityList);
+ //区
+ List<TRegion> areaList = tRegionService.selectList(new EntityWrapper<TRegion>().eq("parent_id", tOpenCity.getCityId()));
+ model.addAttribute("areaList",areaList);
+ //经营业务
+ List<Map<String,Object>> businessList = tOpenCityService.getBusinessByCityId(tOpenCityId);
+ model.addAttribute("businessList",businessList);
+ return PREFIX + "tOpenCity_edit.html";
+ }
+
+ @RequestMapping(value = "/change")
+ @ResponseBody
+ public Object change(@RequestParam Integer id) {
+ List<TRegion> list = new ArrayList<>();
+ if (SinataUtil.isNotEmpty(id)){
+ list = tRegionService.selectList(new EntityWrapper<TRegion>().eq("parent_id", id));
+ }
+ return list;
+ }
+
+ /**
+ * 获取城市管理列表
+ */
+ @RequestMapping(value = "/list")
+ @ResponseBody
+ public Object list(String insertTime,String condition) {
+ String beginTime = null;
+ String endTime = null;
+ if (SinataUtil.isNotEmpty(insertTime)){
+ String[] timeArray = insertTime.split(" - ");
+ beginTime = timeArray[0];
+ endTime = timeArray[1];
+ }
+ Page<Map<String, Object>> page = new PageFactory<Map<String, Object>>().defaultPage();
+ page.setRecords(tOpenCityService.getOpenCityList(page,beginTime,endTime,condition));
+ return super.packForBT(page);
+ }
+
+ /**
+ * 新增城市管理
+ */
+ @RequestMapping(value = "/add")
+ @ResponseBody
+ public Object add(TOpenCity tOpenCity,@RequestParam String businessTypeStr,Integer areaId,Integer cityId,Integer provinceId) {
+ //获取code
+ if (SinataUtil.isNotEmpty(areaId)){
+ TRegion area = tRegionService.selectById(areaId);
+ tOpenCity.setCode(area.getCode());
+ }
+ if (SinataUtil.isNotEmpty(cityId)){
+ TRegion city = tRegionService.selectById(cityId);
+ tOpenCity.setCode(city.getCode());
+ }
+ if (SinataUtil.isNotEmpty(provinceId)){
+ TRegion province = tRegionService.selectById(provinceId);
+ tOpenCity.setCode(province.getCode());
+ }
+ tOpenCity.setAreaId(areaId);
+ tOpenCity.setCityId(cityId);
+ tOpenCity.setProvinceId(provinceId);
+ //获取经纬度
+ String address = tOpenCity.getAreaName();
+ if (SinataUtil.isNotEmpty(tOpenCity.getCityName())){
+ address+=tOpenCity.getCityName();
+ }
+ if (SinataUtil.isNotEmpty(tOpenCity.getProvinceName())){
+ address+=tOpenCity.getProvinceName();
+ }
+ JSONObject positionObj = GaoDeMapUtil.getLngAndLat(address);
+ String longitude = positionObj.getString("longitude");
+ String latitude = positionObj.getString("latitude");
+ tOpenCity.setLon(Double.valueOf(longitude));
+ tOpenCity.setLat(Double.valueOf(latitude));
+ tOpenCity.setInsertTime(new Date());
+ tOpenCity.setInsertUser(ShiroKit.getUser().getId());
+ tOpenCityService.insert(tOpenCity);
+
+ //添加经营业务
+ testJSONStrToJSONArray(businessTypeStr,tOpenCity.getId());
+ return SUCCESS_TIP;
+ }
+
+ public void testJSONStrToJSONArray(String subArr,Integer tOpenCityId){
+ JSONArray jsonArray = JSON.parseArray(subArr);
+ int size = jsonArray.size();
+ for (int i = 0; i < size; i++){
+ JSONObject jsonObject = jsonArray.getJSONObject(i);
+ TOpenCityBusiness business = new TOpenCityBusiness();
+ if (SinataUtil.isNotEmpty(jsonObject.getInteger("busId")) && jsonObject.getInteger("busId") != 0){
+ business = tOpenCityBusinessService.selectById(jsonObject.getInteger("busId"));
+ business.setUpdateTime(new Date());
+ business.setUpdateUser(ShiroKit.getUser().getId());
+ business.setFlag("2");
+ }else{
+ business.setInsertTime(DateUtil.parse(jsonObject.getString("time")+" 00:00:00","yyyy-MM-dd HH:mm:ss"));
+ business.setInsertUser(ShiroKit.getUser().getId());
+ }
+ business.setOpenCityId(tOpenCityId);
+ String type = jsonObject.getString("type");
+ Integer businessType = 0;
+ if ("专车".equals(type)){
+ businessType = 1;
+ }else if ("出租车".equals(type)){
+ businessType = 2;
+ }else if ("跨城出行".equals(type)){
+ businessType = 3;
+ }else if ("跨城小件物流".equals(type)){
+ businessType = 4;
+ }else if ("同城小件物流".equals(type)){
+ businessType = 5;
+ }else if ("包车".equals(type)){
+ businessType = 6;
+ }
+ business.setBusinessType(businessType);
+ business.setSort(jsonObject.getInteger("sort"));
+ if (SinataUtil.isNotEmpty(jsonObject.getInteger("busId")) && jsonObject.getInteger("busId") != 0){
+ tOpenCityBusinessService.updateById(business);
+ }else{
+ tOpenCityBusinessService.insert(business);
+ }
+ }
+ }
+
+ /**
+ * 删除城市管理
+ */
+ @RequestMapping(value = "/delete")
+ @ResponseBody
+ public Object delete(@RequestParam Integer tOpenCityId) {
+ TOpenCity tOpenCity = tOpenCityService.selectById(tOpenCityId);
+ tOpenCity.setFlag("3");
+ tOpenCityService.updateById(tOpenCity);
+ return SUCCESS_TIP;
+ }
+
+ /**
+ * 修改城市管理
+ */
+ @RequestMapping(value = "/update")
+ @ResponseBody
+ public Object update(TOpenCity tOpenCity,@RequestParam String businessTypeStr,Integer areaId,Integer cityId,Integer provinceId) {
+ if (SinataUtil.isNotEmpty(areaId)){
+ TRegion area = tRegionService.selectById(areaId);
+ tOpenCity.setCode(area.getCode());
+ }
+ if (SinataUtil.isNotEmpty(cityId)){
+ TRegion city = tRegionService.selectById(cityId);
+ tOpenCity.setCode(city.getCode());
+ }
+ if (SinataUtil.isNotEmpty(provinceId)){
+ TRegion province = tRegionService.selectById(provinceId);
+ tOpenCity.setCode(province.getCode());
+ }
+ if (SinataUtil.isEmpty(areaId)){
+ tOpenCity.setAreaId(0);
+ tOpenCity.setAreaName("");
+ }else{
+ tOpenCity.setAreaId(areaId);
+ }
+ if (SinataUtil.isEmpty(cityId)){
+ tOpenCity.setCityId(0);
+ tOpenCity.setCityName("");
+ }else{
+ tOpenCity.setCityId(cityId);
+ }
+ if (SinataUtil.isEmpty(provinceId)){
+ tOpenCity.setProvinceId(0);
+ tOpenCity.setProvinceName("");
+ }else{
+ tOpenCity.setProvinceId(provinceId);
+ }
+
+ //获取经纬度
+ String address = tOpenCity.getAreaName();
+ if (SinataUtil.isNotEmpty(tOpenCity.getCityName())){
+ address+=tOpenCity.getCityName();
+ }
+ if (SinataUtil.isNotEmpty(tOpenCity.getProvinceName())){
+ address+=tOpenCity.getProvinceName();
+ }
+ JSONObject positionObj = GaoDeMapUtil.getLngAndLat(address);
+ String longitude = positionObj.getString("longitude");
+ String latitude = positionObj.getString("latitude");
+ tOpenCity.setLon(Double.valueOf(longitude));
+ tOpenCity.setLat(Double.valueOf(latitude));
+ tOpenCity.setUpdateTime(new Date());
+ tOpenCity.setUpdateUser(ShiroKit.getUser().getId());
+ tOpenCityService.updateById(tOpenCity);
+
+ //删除经营业务
+ TOpenCityBusiness business = new TOpenCityBusiness();
+ business.setFlag("3");
+ tOpenCityBusinessService.update(business,new EntityWrapper<TOpenCityBusiness>().eq("openCityId",tOpenCity.getId()));
+ //添加经营业务
+ testJSONStrToJSONArray(businessTypeStr,tOpenCity.getId());
+ return SUCCESS_TIP;
+ }
+
+ /**
+ * 城市管理详情
+ */
+ @RequestMapping(value = "/detail/{tOpenCityId}")
+ @ResponseBody
+ public Object detail(@PathVariable("tOpenCityId") Integer tOpenCityId) {
+ return tOpenCityService.selectById(tOpenCityId);
+ }
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TOrderEvaluateController.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TOrderEvaluateController.java
new file mode 100644
index 0000000..1a57ba1
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TOrderEvaluateController.java
@@ -0,0 +1,140 @@
+package com.stylefeng.guns.modular.system.controller.general;
+
+import com.baomidou.mybatisplus.plugins.Page;
+import com.stylefeng.guns.core.base.controller.BaseController;
+import com.stylefeng.guns.core.common.constant.factory.PageFactory;
+import com.stylefeng.guns.core.shiro.ShiroKit;
+import com.stylefeng.guns.core.util.SinataUtil;
+import com.stylefeng.guns.modular.system.model.TComplaint;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.beans.factory.annotation.Autowired;
+import com.stylefeng.guns.core.log.LogObjectHolder;
+import org.springframework.web.bind.annotation.RequestParam;
+import com.stylefeng.guns.modular.system.model.TOrderEvaluate;
+import com.stylefeng.guns.modular.system.service.ITOrderEvaluateService;
+
+import java.util.Map;
+
+/**
+ * 评价列表控制器
+ *
+ * @author fengshuonan
+ * @Date 2020-06-09 11:44:36
+ */
+@Controller
+@RequestMapping("/tOrderEvaluate")
+public class TOrderEvaluateController extends BaseController {
+
+ private String PREFIX = "/system/tOrderEvaluate/";
+
+ @Autowired
+ private ITOrderEvaluateService tOrderEvaluateService;
+
+ /**
+ * 跳转到评价列表首页
+ */
+ @RequestMapping("")
+ public String index() {
+ return PREFIX + "tOrderEvaluate.html";
+ }
+
+ /**
+ * 跳转到查看详情
+ */
+ @RequestMapping("/lookDetail/{id}/{type}")
+ public String lookDetail(@PathVariable Integer id, @PathVariable Integer type, Model model) {
+ TOrderEvaluate tOrderEvaluate = tOrderEvaluateService.selectById(id);
+ String str = "";
+ if (1 == type){
+ str = tOrderEvaluate.getContent();
+ }
+ model.addAttribute("str",str);
+ return "/system/tComplaint/lookDetail.html";
+ }
+
+ /**
+ * 跳转到添加评价列表
+ */
+ @RequestMapping("/tOrderEvaluate_add")
+ public String tOrderEvaluateAdd() {
+ return PREFIX + "tOrderEvaluate_add.html";
+ }
+
+ /**
+ * 跳转到修改评价列表
+ */
+ @RequestMapping("/tOrderEvaluate_update/{tOrderEvaluateId}")
+ public String tOrderEvaluateUpdate(@PathVariable Integer tOrderEvaluateId, Model model) {
+ TOrderEvaluate tOrderEvaluate = tOrderEvaluateService.selectById(tOrderEvaluateId);
+ model.addAttribute("item",tOrderEvaluate);
+ LogObjectHolder.me().set(tOrderEvaluate);
+ return PREFIX + "tOrderEvaluate_edit.html";
+ }
+
+ /**
+ * 获取评价列表列表
+ */
+ @RequestMapping(value = "/list")
+ @ResponseBody
+ public Object list(String insertTime,
+ String userName,
+ String userPhone,
+ String driverName,
+ String driverPhone,
+ String fraction,
+ Integer orderType) {
+ String beginTime = null;
+ String endTime = null;
+ if (SinataUtil.isNotEmpty(insertTime)){
+ String[] timeArray = insertTime.split(" - ");
+ beginTime = timeArray[0];
+ endTime = timeArray[1];
+ }
+ Page<Map<String, Object>> page = new PageFactory<Map<String, Object>>().defaultPage();
+ page.setRecords(tOrderEvaluateService.getOrderEvaluateList(page,ShiroKit.getUser().getRoleType(),ShiroKit.getUser().getObjectId(),beginTime,endTime,userName,userPhone,driverName,driverPhone,fraction,orderType));
+ return super.packForBT(page);
+ }
+
+ /**
+ * 新增评价列表
+ */
+ @RequestMapping(value = "/add")
+ @ResponseBody
+ public Object add(TOrderEvaluate tOrderEvaluate) {
+ tOrderEvaluateService.insert(tOrderEvaluate);
+ return SUCCESS_TIP;
+ }
+
+ /**
+ * 删除评价列表
+ */
+ @RequestMapping(value = "/delete")
+ @ResponseBody
+ public Object delete(@RequestParam Integer tOrderEvaluateId) {
+ tOrderEvaluateService.deleteById(tOrderEvaluateId);
+ return SUCCESS_TIP;
+ }
+
+ /**
+ * 修改评价列表
+ */
+ @RequestMapping(value = "/update")
+ @ResponseBody
+ public Object update(TOrderEvaluate tOrderEvaluate) {
+ tOrderEvaluateService.updateById(tOrderEvaluate);
+ return SUCCESS_TIP;
+ }
+
+ /**
+ * 评价列表详情
+ */
+ @RequestMapping(value = "/detail/{tOrderEvaluateId}")
+ @ResponseBody
+ public Object detail(@PathVariable("tOrderEvaluateId") Integer tOrderEvaluateId) {
+ return tOrderEvaluateService.selectById(tOrderEvaluateId);
+ }
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TProblemController.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TProblemController.java
new file mode 100644
index 0000000..399da27
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TProblemController.java
@@ -0,0 +1,127 @@
+package com.stylefeng.guns.modular.system.controller.general;
+
+import com.baomidou.mybatisplus.plugins.Page;
+import com.stylefeng.guns.core.base.controller.BaseController;
+import com.stylefeng.guns.core.common.constant.factory.PageFactory;
+import com.stylefeng.guns.core.shiro.ShiroKit;
+import com.stylefeng.guns.core.util.SinataUtil;
+import com.stylefeng.guns.modular.system.model.TFeedback;
+import com.stylefeng.guns.modular.system.model.TSystemNotice;
+import com.stylefeng.guns.modular.system.service.ITSystemNoticeService;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.beans.factory.annotation.Autowired;
+import com.stylefeng.guns.core.log.LogObjectHolder;
+import org.springframework.web.bind.annotation.RequestParam;
+import com.stylefeng.guns.modular.system.model.TProblem;
+import com.stylefeng.guns.modular.system.service.ITProblemService;
+
+import java.util.Date;
+import java.util.Map;
+
+/**
+ * 用户留言管理控制器
+ *
+ * @author fengshuonan
+ * @Date 2020-06-24 11:20:23
+ */
+@Controller
+@RequestMapping("/tProblem")
+public class TProblemController extends BaseController {
+
+ private String PREFIX = "/system/tProblem/";
+
+ @Autowired
+ private ITProblemService tProblemService;
+
+ @Autowired
+ private ITSystemNoticeService itSystemNoticeService;
+
+ /**
+ * 跳转到用户留言管理首页
+ */
+ @RequestMapping("")
+ public String index() {
+ return PREFIX + "tProblem.html";
+ }
+
+ /**
+ * 跳转到查看详情
+ */
+ @RequestMapping("/lookDetail/{id}/{type}")
+ public String lookDetail(@PathVariable Integer id, @PathVariable Integer type, Model model) {
+ TProblem tProblem = tProblemService.selectById(id);
+ String str = "";
+ if (1 == type){
+ str = tProblem.getContent();
+ }else if (2 == type){
+ str = tProblem.getAnswer();
+ }
+ model.addAttribute("str",str);
+ return "/system/tComplaint/lookDetail.html";
+ }
+
+ /**
+ * 跳转到立即处理页面
+ */
+ @RequestMapping("/tProblem_immediately/{tProblemId}")
+ public String tProblemUpdate(@PathVariable Integer tProblemId, Model model) {
+ model.addAttribute("tProblemId",tProblemId);
+ return PREFIX + "tProblem_immediately.html";
+ }
+
+ /**
+ * 获取用户留言管理列表
+ */
+ @RequestMapping(value = "/list")
+ @ResponseBody
+ public Object list(String insertTime,
+ String userName,
+ Integer state) {
+ String beginTime = null;
+ String endTime = null;
+ if (SinataUtil.isNotEmpty(insertTime)){
+ String[] timeArray = insertTime.split(" - ");
+ beginTime = timeArray[0];
+ endTime = timeArray[1];
+ }
+ Page<Map<String, Object>> page = new PageFactory<Map<String, Object>>().defaultPage();
+ if (ShiroKit.getUser().getRoleType() != 1){
+ page.setRecords(null);
+ }else{
+ page.setRecords(tProblemService.getProblemList(page,beginTime,endTime,userName,state));
+ }
+ return super.packForBT(page);
+ }
+
+ /**
+ * 立即处理
+ */
+ @RequestMapping(value = "/immediately")
+ @ResponseBody
+ public Object immediately(@RequestParam Integer tProblemId,@RequestParam String answer) {
+ TProblem tProblem = tProblemService.selectById(tProblemId);
+ if (SinataUtil.isNotEmpty(tProblem)){
+ tProblem.setAnswer(answer);
+ tProblem.setHandleTime(new Date());
+ tProblem.setHandleUserId(ShiroKit.getUser().getId());
+ tProblem.setState(2);
+ tProblemService.updateById(tProblem);
+
+ //增加系统消息
+ TSystemNotice notice = new TSystemNotice();
+ notice.setType(2);
+ notice.setUserType(1);
+ notice.setContent("您的留言被回复啦:【"+answer+"】");
+ notice.setUserId(tProblem.getUserId());
+ notice.setInsertTime(new Date());
+ notice.setRead(1);
+ itSystemNoticeService.insert(notice);
+ }
+ return SUCCESS_TIP;
+ }
+
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TPubWithdrawalController.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TPubWithdrawalController.java
new file mode 100644
index 0000000..49b1d4b
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TPubWithdrawalController.java
@@ -0,0 +1,168 @@
+package com.stylefeng.guns.modular.system.controller.general;
+
+import com.baomidou.mybatisplus.plugins.Page;
+import com.stylefeng.guns.core.base.controller.BaseController;
+import com.stylefeng.guns.core.common.constant.factory.PageFactory;
+import com.stylefeng.guns.core.shiro.ShiroKit;
+import com.stylefeng.guns.core.util.SinataUtil;
+import com.stylefeng.guns.modular.system.model.TComplaint;
+import com.stylefeng.guns.modular.system.model.TSystemNotice;
+import com.stylefeng.guns.modular.system.service.ITSystemNoticeService;
+import com.stylefeng.guns.modular.system.util.HttpRequestUtil;
+import com.stylefeng.guns.modular.system.util.PushURL;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.beans.factory.annotation.Autowired;
+import com.stylefeng.guns.core.log.LogObjectHolder;
+import org.springframework.web.bind.annotation.RequestParam;
+import com.stylefeng.guns.modular.system.model.TPubWithdrawal;
+import com.stylefeng.guns.modular.system.service.ITPubWithdrawalService;
+
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * 提现列表控制器
+ *
+ * @author fengshuonan
+ * @Date 2020-06-09 09:30:59
+ */
+@Controller
+@RequestMapping("/tPubWithdrawal")
+public class TPubWithdrawalController extends BaseController {
+
+ private String PREFIX = "/system/tPubWithdrawal/";
+
+ @Autowired
+ private ITPubWithdrawalService tPubWithdrawalService;
+
+ @Autowired
+ private ITSystemNoticeService tSystemNoticeService;
+
+ /**
+ * 跳转到提现列表首页
+ */
+ @RequestMapping("")
+ public String index() {
+ return PREFIX + "tPubWithdrawal.html";
+ }
+
+ /**
+ * 跳转到查看详情
+ */
+ @RequestMapping("/lookDetail/{id}/{type}")
+ public String lookDetail(@PathVariable Integer id, @PathVariable Integer type, Model model) {
+ TPubWithdrawal tPubWithdrawal = tPubWithdrawalService.selectById(id);
+ String str = "";
+ if (1 == type){
+ str = tPubWithdrawal.getRemark();
+ }
+ model.addAttribute("str",str);
+ return "/system/tComplaint/lookDetail.html";
+ }
+
+ /**
+ * 跳转到立即处理页面
+ */
+ @RequestMapping("/tPubWithdrawal_immediately/{tPubWithdrawalId}")
+ public String tPubWithdrawalUpdate(@PathVariable Integer tPubWithdrawalId, Model model) {
+ model.addAttribute("tPubWithdrawalId",tPubWithdrawalId);
+ return PREFIX + "tPubWithdrawal_immediately.html";
+ }
+
+ /**
+ * 获取提现列表列表
+ */
+ @RequestMapping(value = "/list")
+ @ResponseBody
+ public Object list(String insertTime,
+ String name,
+ Integer withdrawalType) {
+ String beginTime = null;
+ String endTime = null;
+ if (SinataUtil.isNotEmpty(insertTime)){
+ String[] timeArray = insertTime.split(" - ");
+ beginTime = timeArray[0];
+ endTime = timeArray[1];
+ }
+ Page<Map<String, Object>> page = new PageFactory<Map<String, Object>>().defaultPage();
+ if (ShiroKit.getUser().getRoleType() != 1){
+ page.setRecords(null);
+ }else{
+ page.setRecords(tPubWithdrawalService.getWithdrawalList(page,beginTime,endTime,name,withdrawalType));
+ }
+ return super.packForBT(page);
+ }
+
+ /**
+ * 新增提现列表
+ */
+ @RequestMapping(value = "/add")
+ @ResponseBody
+ public Object add(TPubWithdrawal tPubWithdrawal) {
+ tPubWithdrawalService.insert(tPubWithdrawal);
+ return SUCCESS_TIP;
+ }
+
+ /**
+ * 立即处理操作
+ */
+ @RequestMapping(value = "/immediately")
+ @ResponseBody
+ public Object immediately(@RequestParam Integer id,@RequestParam Integer state,@RequestParam String remark) {
+ TPubWithdrawal tPubWithdrawal = tPubWithdrawalService.selectById(id);
+ if (SinataUtil.isNotEmpty(tPubWithdrawal)){
+// tPubWithdrawal.setState(state); //调用接口修改状态
+ tPubWithdrawal.setRemark(remark);
+ tPubWithdrawal.setHandleTime(new Date());
+
+ Integer stateObj = 1;
+ if (2 == state){ //同意提现
+ stateObj = 1;
+ }else if (3 == state){ //拒绝提现
+ stateObj = 2;
+ }
+ tPubWithdrawalService.updateById(tPubWithdrawal);
+
+ Map<String,String> map = new HashMap<>();
+ map.put("id", String.valueOf(tPubWithdrawal.getId()));
+ map.put("state", String.valueOf(stateObj));
+ String result = HttpRequestUtil.postRequest(PushURL.withdraw_auth_url, map);
+ System.out.println("提现审核接口 :【recordId="+tPubWithdrawal.getId().toString()+"】,调用接口:"+result);
+
+ //增加系统消息
+ TSystemNotice notice = new TSystemNotice();
+ notice.setType(2);
+ notice.setUserType(tPubWithdrawal.getUserType());
+ notice.setContent("提现处理结果:【"+remark+"】。");
+ notice.setUserId(tPubWithdrawal.getUserId());
+ notice.setInsertTime(new Date());
+ notice.setRead(1);
+ tSystemNoticeService.insert(notice);
+ }
+ return SUCCESS_TIP;
+ }
+
+ /**
+ * 修改提现列表
+ */
+ @RequestMapping(value = "/update")
+ @ResponseBody
+ public Object update(TPubWithdrawal tPubWithdrawal) {
+ tPubWithdrawalService.updateById(tPubWithdrawal);
+ return SUCCESS_TIP;
+ }
+
+ /**
+ * 提现列表详情
+ */
+ @RequestMapping(value = "/detail/{tPubWithdrawalId}")
+ @ResponseBody
+ public Object detail(@PathVariable("tPubWithdrawalId") Integer tPubWithdrawalId) {
+ return tPubWithdrawalService.selectById(tPubWithdrawalId);
+ }
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TSmsrecordController.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TSmsrecordController.java
new file mode 100644
index 0000000..63d659c
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TSmsrecordController.java
@@ -0,0 +1,84 @@
+package com.stylefeng.guns.modular.system.controller.general;
+
+import com.baomidou.mybatisplus.plugins.Page;
+import com.stylefeng.guns.core.base.controller.BaseController;
+import com.stylefeng.guns.core.common.constant.factory.PageFactory;
+import com.stylefeng.guns.core.shiro.ShiroKit;
+import com.stylefeng.guns.core.util.SinataUtil;
+import com.stylefeng.guns.modular.system.model.TComplaint;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.beans.factory.annotation.Autowired;
+import com.stylefeng.guns.core.log.LogObjectHolder;
+import org.springframework.web.bind.annotation.RequestParam;
+import com.stylefeng.guns.modular.system.model.TSmsrecord;
+import com.stylefeng.guns.modular.system.service.ITSmsrecordService;
+
+import java.util.Map;
+
+/**
+ * 短信记录控制器
+ *
+ * @author fengshuonan
+ * @Date 2020-06-10 19:43:13
+ */
+@Controller
+@RequestMapping("/tSmsrecord")
+public class TSmsrecordController extends BaseController {
+
+ private String PREFIX = "/system/tSmsrecord/";
+
+ @Autowired
+ private ITSmsrecordService tSmsrecordService;
+
+ /**
+ * 跳转到短信记录首页
+ */
+ @RequestMapping("")
+ public String index() {
+ return PREFIX + "tSmsrecord.html";
+ }
+
+ /**
+ * 跳转到查看详情
+ */
+ @RequestMapping("/lookDetail/{id}/{type}")
+ public String lookDetail(@PathVariable Integer id, @PathVariable Integer type, Model model) {
+ TSmsrecord tSmsrecord = tSmsrecordService.selectById(id);
+ String str = "";
+ if (1 == type){
+ str = tSmsrecord.getContent();
+ }
+ model.addAttribute("str",str);
+ return "/system/tComplaint/lookDetail.html";
+ }
+
+ /**
+ * 获取短信记录列表
+ */
+ @RequestMapping(value = "/list")
+ @ResponseBody
+ public Object list(String insertTime,
+ String phone) {
+ String beginTime = null;
+ String endTime = null;
+ if (SinataUtil.isNotEmpty(insertTime)){
+ String[] timeArray = insertTime.split(" - ");
+ beginTime = timeArray[0];
+ endTime = timeArray[1];
+ }
+ Page<Map<String, Object>> page = new PageFactory<Map<String, Object>>().defaultPage();
+ if (ShiroKit.getUser().getRoleType() != 1){
+ page.setRecords(null);
+ }else{
+ page.setRecords(tSmsrecordService.getSmsCodeList(page,beginTime,endTime,phone));
+ }
+ return super.packForBT(page);
+ }
+
+
+
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TSysReformistController.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TSysReformistController.java
new file mode 100644
index 0000000..e9fe3e2
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TSysReformistController.java
@@ -0,0 +1,413 @@
+package com.stylefeng.guns.modular.system.controller.general;
+
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.stylefeng.guns.core.base.controller.BaseController;
+import com.stylefeng.guns.core.shiro.ShiroKit;
+import com.stylefeng.guns.core.util.SinataUtil;
+import com.stylefeng.guns.modular.system.model.*;
+import com.stylefeng.guns.modular.system.service.*;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.beans.factory.annotation.Autowired;
+import com.stylefeng.guns.core.log.LogObjectHolder;
+import org.springframework.web.bind.annotation.RequestParam;
+
+import java.math.BigDecimal;
+
+/**
+ * 系统设置控制器
+ *
+ * @author fengshuonan
+ * @Date 2020-06-09 13:43:44
+ */
+@Controller
+@RequestMapping("/tSysReformist")
+public class TSysReformistController extends BaseController {
+
+ private String PREFIX = "/system/tSysReformist/";
+
+ @Autowired
+ private ITSysReformistService tSysReformistService;
+
+ @Autowired
+ private ITSysIntegralService tSysIntegralService;
+
+ @Autowired
+ private ITSysFaceDistinguishService tSysFaceDistinguishService;
+
+ @Autowired
+ private ITSysPushOrderService tSysPushOrderService;
+
+ @Autowired
+ private ITSysCancleOrderService tSysCancleOrderService;
+
+ @Autowired
+ private ITPhoneService tPhoneService;
+
+
+ /**
+ * 跳转到系统设置首页
+ */
+ @RequestMapping("")
+ public String index(Model model) {
+ //改派设置
+ TSysReformist reformist = tSysReformistService.selectOne(new EntityWrapper<TSysReformist>().eq("companyId", ShiroKit.getUser().getObjectId()));
+ model.addAttribute("reformist",reformist);
+ //积分设置
+ TSysIntegral integral = tSysIntegralService.selectOne(new EntityWrapper<TSysIntegral>().eq("companyId", ShiroKit.getUser().getObjectId()));
+ model.addAttribute("integral",integral);
+ //人脸识别
+ TSysFaceDistinguish faceDistinguish = tSysFaceDistinguishService.selectOne(new EntityWrapper<TSysFaceDistinguish>().eq("companyId", ShiroKit.getUser().getObjectId()));
+ model.addAttribute("faceDistinguish",faceDistinguish);
+
+ //专车推单(第一轮)
+ TSysPushOrder zcOne = tSysPushOrderService.selectOne(new EntityWrapper<TSysPushOrder>().eq("companyId", ShiroKit.getUser().getObjectId()).eq("pushType", 1).eq("type", 1));
+ model.addAttribute("zcOne",zcOne);
+ //专车推单(第二轮)
+ TSysPushOrder zcTwo = tSysPushOrderService.selectOne(new EntityWrapper<TSysPushOrder>().eq("companyId", ShiroKit.getUser().getObjectId()).eq("pushType", 1).eq("type", 2));
+ model.addAttribute("zcTwo",zcTwo);
+ //专车推单(第三轮)
+ TSysPushOrder zcThree = tSysPushOrderService.selectOne(new EntityWrapper<TSysPushOrder>().eq("companyId", ShiroKit.getUser().getObjectId()).eq("pushType", 1).eq("type", 3));
+ model.addAttribute("zcThree",zcThree);
+
+ //出租车推单(第一轮)
+ TSysPushOrder czcOne = tSysPushOrderService.selectOne(new EntityWrapper<TSysPushOrder>().eq("companyId", ShiroKit.getUser().getObjectId()).eq("pushType", 2).eq("type", 1));
+ model.addAttribute("czcOne",czcOne);
+ //出租车推单(第二轮)
+ TSysPushOrder czcTwo = tSysPushOrderService.selectOne(new EntityWrapper<TSysPushOrder>().eq("companyId", ShiroKit.getUser().getObjectId()).eq("pushType", 2).eq("type", 2));
+ model.addAttribute("czcTwo",czcTwo);
+ //出租车推单(第三轮)
+ TSysPushOrder czcThree = tSysPushOrderService.selectOne(new EntityWrapper<TSysPushOrder>().eq("companyId", ShiroKit.getUser().getObjectId()).eq("pushType", 2).eq("type", 3));
+ model.addAttribute("czcThree",czcThree);
+
+ //普通取消设置(专车)
+ TSysCancleOrder ptCancel1 = tSysCancleOrderService.selectOne(new EntityWrapper<TSysCancleOrder>().eq("companyId", ShiroKit.getUser().getObjectId()).eq("type", 1).eq("orderType", 1));
+ model.addAttribute("ptCancel1",ptCancel1);
+ //普通取消设置(出租车)
+ TSysCancleOrder ptCancel2 = tSysCancleOrderService.selectOne(new EntityWrapper<TSysCancleOrder>().eq("companyId", ShiroKit.getUser().getObjectId()).eq("type", 1).eq("orderType", 2));
+ model.addAttribute("ptCancel2",ptCancel2);
+ //普通取消设置(跨城出行)
+ TSysCancleOrder ptCancel3 = tSysCancleOrderService.selectOne(new EntityWrapper<TSysCancleOrder>().eq("companyId", ShiroKit.getUser().getObjectId()).eq("type", 1).eq("orderType", 3));
+ model.addAttribute("ptCancel3",ptCancel3);
+
+ //预约取消设置(专车)
+ TSysCancleOrder yyCancel1 = tSysCancleOrderService.selectOne(new EntityWrapper<TSysCancleOrder>().eq("companyId", ShiroKit.getUser().getObjectId()).eq("type", 2).eq("orderType", 1));
+ model.addAttribute("yyCancel1",yyCancel1);
+ //预约取消设置(出租车)
+ TSysCancleOrder yyCancel2 = tSysCancleOrderService.selectOne(new EntityWrapper<TSysCancleOrder>().eq("companyId", ShiroKit.getUser().getObjectId()).eq("type", 2).eq("orderType", 2));
+ model.addAttribute("yyCancel2",yyCancel2);
+
+ //报警电话
+ TPhone phone1 = tPhoneService.selectOne(new EntityWrapper<TPhone>().eq("companyId", ShiroKit.getUser().getObjectId()).eq("type", 1));
+ model.addAttribute("phone1",phone1);
+ //客服电话
+ TPhone phone2 = tPhoneService.selectOne(new EntityWrapper<TPhone>().eq("companyId", ShiroKit.getUser().getObjectId()).eq("type", 2));
+ model.addAttribute("phone2",phone2);
+ //客服电话
+ TPhone phone3 = tPhoneService.selectOne(new EntityWrapper<TPhone>().eq("companyId", ShiroKit.getUser().getObjectId()).eq("type", 3));
+ model.addAttribute("phone3",phone3);
+ return PREFIX + "tSysReformist.html";
+ }
+
+
+ /**
+ * 删除系统设置
+ */
+ @RequestMapping(value = "/setUp")
+ @ResponseBody
+ public Object setUp(@RequestParam BigDecimal one, @RequestParam Integer two, @RequestParam Integer three, @RequestParam Integer openValue,
+ @RequestParam Integer isSpecialCar,@RequestParam Integer isTaxiCar,
+ @RequestParam Double zc1,@RequestParam Integer zc2,@RequestParam Double zc3,
+ @RequestParam Double zc4,@RequestParam Integer zc5,@RequestParam Double zc6,
+ @RequestParam Double zc7,@RequestParam Integer zc8,@RequestParam Double zc9,
+ @RequestParam Double czc1,@RequestParam Integer czc2,@RequestParam Double czc3,
+ @RequestParam Double czc4,@RequestParam Integer czc5,@RequestParam Double czc6,
+ @RequestParam Double czc7,@RequestParam Integer czc8,@RequestParam Double czc9,
+ @RequestParam Integer ptCancel1,@RequestParam BigDecimal ptCancel2,@RequestParam Integer ptCancel3,@RequestParam BigDecimal ptCancel4,@RequestParam Integer ptCancel5,@RequestParam BigDecimal ptCancel6,
+ @RequestParam Integer yyCancel1,@RequestParam BigDecimal yyCancel2,@RequestParam Integer yyCancel3,@RequestParam BigDecimal yyCancel4,
+ @RequestParam String phone1,@RequestParam String phone2,@RequestParam String phone3) {
+ //改派设置
+ TSysReformist reformist = tSysReformistService.selectOne(new EntityWrapper<TSysReformist>().eq("companyId", ShiroKit.getUser().getObjectId()));
+ if (SinataUtil.isNotEmpty(reformist)){
+ reformist.setMoney(one);
+ reformist.setIsSpecialCar(isSpecialCar);
+ reformist.setIsTaxiCar(isTaxiCar);
+ tSysReformistService.updateById(reformist);
+ }else{
+ reformist = new TSysReformist();
+ reformist.setCompanyId(ShiroKit.getUser().getObjectId());
+ reformist.setMoney(one);
+ reformist.setIsSpecialCar(isSpecialCar);
+ reformist.setIsTaxiCar(isTaxiCar);
+ tSysReformistService.insert(reformist);
+ }
+
+ //积分设置
+ TSysIntegral integral = tSysIntegralService.selectOne(new EntityWrapper<TSysIntegral>().eq("companyId", ShiroKit.getUser().getObjectId()));
+ if (SinataUtil.isNotEmpty(integral)){
+ integral.setIntegral(two);
+ tSysIntegralService.updateById(integral);
+ }else{
+ integral = new TSysIntegral();
+ integral.setCompanyId(ShiroKit.getUser().getObjectId());
+ integral.setIntegral(two);
+ tSysIntegralService.insert(integral);
+ }
+
+ //人脸识别
+ TSysFaceDistinguish faceDistinguish = tSysFaceDistinguishService.selectOne(new EntityWrapper<TSysFaceDistinguish>().eq("companyId", ShiroKit.getUser().getObjectId()));
+ if (SinataUtil.isNotEmpty(faceDistinguish)){
+ faceDistinguish.setIsOpen(three);
+ faceDistinguish.setMinuteNum(openValue);
+ tSysFaceDistinguishService.updateById(faceDistinguish);
+ }else{
+ faceDistinguish = new TSysFaceDistinguish();
+ faceDistinguish.setIsOpen(three);
+ faceDistinguish.setMinuteNum(openValue);
+ faceDistinguish.setCompanyId(ShiroKit.getUser().getObjectId());
+ tSysFaceDistinguishService.insert(faceDistinguish);
+ }
+
+ //专车推单(第一轮)
+ TSysPushOrder zcOne = tSysPushOrderService.selectOne(new EntityWrapper<TSysPushOrder>().eq("companyId", ShiroKit.getUser().getObjectId()).eq("pushType", 1).eq("type", 1));
+ if (SinataUtil.isNotEmpty(zcOne)){
+ zcOne.setPushDistance(zc1);
+ zcOne.setPushTime(zc2);
+ zcOne.setDriverProportion(zc3);
+ tSysPushOrderService.updateById(zcOne);
+ }else{
+ zcOne = new TSysPushOrder();
+ zcOne.setPushDistance(zc1);
+ zcOne.setPushTime(zc2);
+ zcOne.setDriverProportion(zc3);
+ zcOne.setCompanyId(ShiroKit.getUser().getObjectId());
+ zcOne.setPushType(1);
+ zcOne.setType(1);
+ tSysPushOrderService.insert(zcOne);
+ }
+ //专车推单(第二轮)
+ TSysPushOrder zcTwo = tSysPushOrderService.selectOne(new EntityWrapper<TSysPushOrder>().eq("companyId", ShiroKit.getUser().getObjectId()).eq("pushType", 1).eq("type", 2));
+ if (SinataUtil.isNotEmpty(zcTwo)){
+ zcTwo.setPushDistance(zc4);
+ zcTwo.setPushTime(zc5);
+ zcTwo.setDriverProportion(zc6);
+ tSysPushOrderService.updateById(zcTwo);
+ }else{
+ zcTwo = new TSysPushOrder();
+ zcTwo.setPushDistance(zc4);
+ zcTwo.setPushTime(zc5);
+ zcTwo.setDriverProportion(zc6);
+ zcTwo.setCompanyId(ShiroKit.getUser().getObjectId());
+ zcTwo.setPushType(1);
+ zcTwo.setType(2);
+ tSysPushOrderService.insert(zcTwo);
+ }
+ //专车推单(第三轮)
+ TSysPushOrder zcThree = tSysPushOrderService.selectOne(new EntityWrapper<TSysPushOrder>().eq("companyId", ShiroKit.getUser().getObjectId()).eq("pushType", 1).eq("type", 3));
+ if (SinataUtil.isNotEmpty(zcThree)){
+ zcThree.setPushDistance(zc7);
+ zcThree.setPushTime(zc8);
+ zcThree.setDriverProportion(zc9);
+ tSysPushOrderService.updateById(zcThree);
+ }else{
+ zcThree = new TSysPushOrder();
+ zcThree.setPushDistance(zc7);
+ zcThree.setPushTime(zc8);
+ zcThree.setDriverProportion(zc9);
+ zcThree.setCompanyId(ShiroKit.getUser().getObjectId());
+ zcThree.setPushType(1);
+ zcThree.setType(3);
+ tSysPushOrderService.insert(zcThree);
+ }
+
+ //出租车推单(第一轮)
+ TSysPushOrder czcOne = tSysPushOrderService.selectOne(new EntityWrapper<TSysPushOrder>().eq("companyId", ShiroKit.getUser().getObjectId()).eq("pushType", 2).eq("type", 1));
+ if (SinataUtil.isNotEmpty(czcOne)){
+ czcOne.setPushDistance(czc1);
+ czcOne.setPushTime(czc2);
+ czcOne.setDriverProportion(czc3);
+ tSysPushOrderService.updateById(czcOne);
+ }else{
+ czcOne = new TSysPushOrder();
+ czcOne.setPushDistance(czc1);
+ czcOne.setPushTime(czc2);
+ czcOne.setDriverProportion(czc3);
+ czcOne.setCompanyId(ShiroKit.getUser().getObjectId());
+ czcOne.setPushType(2);
+ czcOne.setType(1);
+ tSysPushOrderService.insert(czcOne);
+ }
+ //出租车推单(第二轮)
+ TSysPushOrder czcTwo = tSysPushOrderService.selectOne(new EntityWrapper<TSysPushOrder>().eq("companyId", ShiroKit.getUser().getObjectId()).eq("pushType", 2).eq("type", 2));
+ if (SinataUtil.isNotEmpty(czcTwo)){
+ czcTwo.setPushDistance(czc4);
+ czcTwo.setPushTime(czc5);
+ czcTwo.setDriverProportion(czc6);
+ tSysPushOrderService.updateById(czcTwo);
+ }else{
+ czcTwo = new TSysPushOrder();
+ czcTwo.setPushDistance(czc4);
+ czcTwo.setPushTime(czc5);
+ czcTwo.setDriverProportion(czc6);
+ czcTwo.setCompanyId(ShiroKit.getUser().getObjectId());
+ czcTwo.setPushType(2);
+ czcTwo.setType(2);
+ tSysPushOrderService.insert(czcTwo);
+ }
+ //出租车推单(第三轮)
+ TSysPushOrder czcThree = tSysPushOrderService.selectOne(new EntityWrapper<TSysPushOrder>().eq("companyId", ShiroKit.getUser().getObjectId()).eq("pushType", 2).eq("type", 3));
+ if (SinataUtil.isNotEmpty(czcThree)){
+ czcThree.setPushDistance(czc7);
+ czcThree.setPushTime(czc8);
+ czcThree.setDriverProportion(czc9);
+ tSysPushOrderService.updateById(czcThree);
+ }else{
+ czcThree = new TSysPushOrder();
+ czcThree.setPushDistance(czc7);
+ czcThree.setPushTime(czc8);
+ czcThree.setDriverProportion(czc9);
+ czcThree.setCompanyId(ShiroKit.getUser().getObjectId());
+ czcThree.setPushType(2);
+ czcThree.setType(3);
+ tSysPushOrderService.insert(czcThree);
+ }
+
+ //普通取消设置(专车)
+ TSysCancleOrder ptCancelOne = tSysCancleOrderService.selectOne(new EntityWrapper<TSysCancleOrder>().eq("companyId", ShiroKit.getUser().getObjectId()).eq("type", 1).eq("orderType", 1));
+ if (SinataUtil.isNotEmpty(ptCancelOne)){
+ ptCancelOne.setMinuteNum(ptCancel1);
+ ptCancelOne.setMoney(ptCancel2);
+ tSysCancleOrderService.updateById(ptCancelOne);
+ }else{
+ ptCancelOne = new TSysCancleOrder();
+ ptCancelOne.setMinuteNum(ptCancel1);
+ ptCancelOne.setMoney(ptCancel2);
+ ptCancelOne.setCompanyId(ShiroKit.getUser().getObjectId());
+ ptCancelOne.setType(1);
+ ptCancelOne.setOrderType(1);
+ tSysCancleOrderService.insert(ptCancelOne);
+ }
+
+ //普通取消设置(出租车)
+ TSysCancleOrder ptCancelTwo = tSysCancleOrderService.selectOne(new EntityWrapper<TSysCancleOrder>().eq("companyId", ShiroKit.getUser().getObjectId()).eq("type", 1).eq("orderType", 2));
+ if (SinataUtil.isNotEmpty(ptCancelTwo)){
+ ptCancelTwo.setMinuteNum(ptCancel3);
+ ptCancelTwo.setMoney(ptCancel4);
+ tSysCancleOrderService.updateById(ptCancelTwo);
+ }else{
+ ptCancelTwo = new TSysCancleOrder();
+ ptCancelTwo.setMinuteNum(ptCancel3);
+ ptCancelTwo.setMoney(ptCancel4);
+ ptCancelTwo.setCompanyId(ShiroKit.getUser().getObjectId());
+ ptCancelTwo.setType(1);
+ ptCancelTwo.setOrderType(2);
+ tSysCancleOrderService.insert(ptCancelTwo);
+ }
+
+ //普通取消设置(跨城出行)
+ TSysCancleOrder ptCancelThree = tSysCancleOrderService.selectOne(new EntityWrapper<TSysCancleOrder>().eq("companyId", ShiroKit.getUser().getObjectId()).eq("type", 1).eq("orderType", 3));
+ if (SinataUtil.isNotEmpty(ptCancelThree)){
+ ptCancelThree.setMinuteNum(ptCancel5);
+ ptCancelThree.setMoney(ptCancel6);
+ tSysCancleOrderService.updateById(ptCancelThree);
+ }else{
+ ptCancelThree = new TSysCancleOrder();
+ ptCancelThree.setMinuteNum(ptCancel5);
+ ptCancelThree.setMoney(ptCancel6);
+ ptCancelThree.setCompanyId(ShiroKit.getUser().getObjectId());
+ ptCancelThree.setType(1);
+ ptCancelThree.setOrderType(3);
+ tSysCancleOrderService.insert(ptCancelThree);
+ }
+
+ //预约取消设置(专车)
+ TSysCancleOrder yyCancelOne = tSysCancleOrderService.selectOne(new EntityWrapper<TSysCancleOrder>().eq("companyId", ShiroKit.getUser().getObjectId()).eq("type", 2).eq("orderType", 1));
+ if (SinataUtil.isNotEmpty(yyCancelOne)){
+ yyCancelOne.setMinuteNum(yyCancel1);
+ yyCancelOne.setMoney(yyCancel2);
+ tSysCancleOrderService.updateById(yyCancelOne);
+ }else{
+ yyCancelOne = new TSysCancleOrder();
+ yyCancelOne.setMinuteNum(yyCancel1);
+ yyCancelOne.setMoney(yyCancel2);
+ yyCancelOne.setCompanyId(ShiroKit.getUser().getObjectId());
+ yyCancelOne.setType(2);
+ yyCancelOne.setOrderType(1);
+ tSysCancleOrderService.insert(yyCancelOne);
+ }
+ //预约取消设置(出租车)
+ TSysCancleOrder yyCancelTwo = tSysCancleOrderService.selectOne(new EntityWrapper<TSysCancleOrder>().eq("companyId", ShiroKit.getUser().getObjectId()).eq("type", 2).eq("orderType", 2));
+ if (SinataUtil.isNotEmpty(yyCancelTwo)){
+ yyCancelTwo.setMinuteNum(yyCancel3);
+ yyCancelTwo.setMoney(yyCancel4);
+ tSysCancleOrderService.updateById(yyCancelTwo);
+ }else{
+ yyCancelTwo = new TSysCancleOrder();
+ yyCancelTwo.setMinuteNum(yyCancel3);
+ yyCancelTwo.setMoney(yyCancel4);
+ yyCancelTwo.setCompanyId(ShiroKit.getUser().getObjectId());
+ yyCancelTwo.setType(2);
+ yyCancelTwo.setOrderType(2);
+ tSysCancleOrderService.insert(yyCancelTwo);
+ }
+
+ //报警电话
+ TPhone phoneOne = tPhoneService.selectOne(new EntityWrapper<TPhone>().eq("companyId", ShiroKit.getUser().getObjectId()).eq("type", 1));
+ if (SinataUtil.isNotEmpty(phoneOne)){
+ phoneOne.setPhone(phone1);
+ tPhoneService.updateById(phoneOne);
+ }else{
+ phoneOne = new TPhone();
+ phoneOne.setPhone(phone1);
+ phoneOne.setCompanyId(ShiroKit.getUser().getObjectId());
+ phoneOne.setType(1);
+ if (ShiroKit.getUser().getRoleType() == 1){
+ phoneOne.setPlatform(1);
+ }else{
+ phoneOne.setPlatform(2);
+ }
+ tPhoneService.insert(phoneOne);
+ }
+ //客服电话
+ TPhone phoneTwo = tPhoneService.selectOne(new EntityWrapper<TPhone>().eq("companyId", ShiroKit.getUser().getObjectId()).eq("type", 2));
+ if (SinataUtil.isNotEmpty(phoneTwo)){
+ phoneTwo.setPhone(phone2);
+ tPhoneService.updateById(phoneTwo);
+ }else{
+ phoneTwo = new TPhone();
+ phoneTwo.setPhone(phone2);
+ phoneTwo.setCompanyId(ShiroKit.getUser().getObjectId());
+ phoneTwo.setType(2);
+ if (ShiroKit.getUser().getRoleType() == 1){
+ phoneTwo.setPlatform(1);
+ }else{
+ phoneTwo.setPlatform(2);
+ }
+ tPhoneService.insert(phoneTwo);
+ }
+
+ //客服电话
+ TPhone phone = tPhoneService.selectOne(new EntityWrapper<TPhone>().eq("companyId", ShiroKit.getUser().getObjectId()).eq("type", 3));
+ if (SinataUtil.isNotEmpty(phone)){
+ phone.setPhone(phone3);
+ tPhoneService.updateById(phone);
+ }else{
+ phone = new TPhone();
+ phone.setPhone(phone3);
+ phone.setCompanyId(ShiroKit.getUser().getObjectId());
+ phone.setType(3);
+ if (ShiroKit.getUser().getRoleType() == 1){
+ phone.setPlatform(1);
+ }else{
+ phone.setPlatform(2);
+ }
+ tPhoneService.insert(phone);
+ }
+ return SUCCESS_TIP;
+ }
+
+
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TSysSensitiveWordsController.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TSysSensitiveWordsController.java
new file mode 100644
index 0000000..e5b3281
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TSysSensitiveWordsController.java
@@ -0,0 +1,97 @@
+package com.stylefeng.guns.modular.system.controller.general;
+
+import com.baomidou.mybatisplus.plugins.Page;
+import com.stylefeng.guns.core.base.controller.BaseController;
+import com.stylefeng.guns.core.common.constant.factory.PageFactory;
+import com.stylefeng.guns.core.shiro.ShiroKit;
+import com.stylefeng.guns.core.util.SinataUtil;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.beans.factory.annotation.Autowired;
+import com.stylefeng.guns.core.log.LogObjectHolder;
+import org.springframework.web.bind.annotation.RequestParam;
+import com.stylefeng.guns.modular.system.model.TSysSensitiveWords;
+import com.stylefeng.guns.modular.system.service.ITSysSensitiveWordsService;
+
+import java.util.Date;
+import java.util.Map;
+
+/**
+ * 敏感词管理控制器
+ *
+ * @author fengshuonan
+ * @Date 2020-06-09 19:45:29
+ */
+@Controller
+@RequestMapping("/tSysSensitiveWords")
+public class TSysSensitiveWordsController extends BaseController {
+
+ private String PREFIX = "/system/tSysSensitiveWords/";
+
+ @Autowired
+ private ITSysSensitiveWordsService tSysSensitiveWordsService;
+
+ /**
+ * 跳转到敏感词管理首页
+ */
+ @RequestMapping("")
+ public String index() {
+ return PREFIX + "tSysSensitiveWords.html";
+ }
+
+ /**
+ * 跳转到添加敏感词管理
+ */
+ @RequestMapping("/tSysSensitiveWords_add")
+ public String tSysSensitiveWordsAdd() {
+ return PREFIX + "tSysSensitiveWords_add.html";
+ }
+
+ /**
+ * 获取敏感词管理列表
+ */
+ @RequestMapping(value = "/list")
+ @ResponseBody
+ public Object list(String createTime,
+ String content) {
+ String beginTime = null;
+ String endTime = null;
+ if (SinataUtil.isNotEmpty(createTime)){
+ String[] timeArray = createTime.split(" - ");
+ beginTime = timeArray[0];
+ endTime = timeArray[1];
+ }
+ Page<Map<String, Object>> page = new PageFactory<Map<String, Object>>().defaultPage();
+ if (ShiroKit.getUser().getRoleType() != 1){
+ page.setRecords(null);
+ }else{
+ page.setRecords(tSysSensitiveWordsService.getSensitiveWordList(page,beginTime,endTime,content));
+ }
+ return super.packForBT(page);
+ }
+
+ /**
+ * 新增敏感词管理
+ */
+ @RequestMapping(value = "/add")
+ @ResponseBody
+ public Object add(TSysSensitiveWords tSysSensitiveWords) {
+ tSysSensitiveWords.setCreateTime(new Date());
+ tSysSensitiveWordsService.insert(tSysSensitiveWords);
+ return SUCCESS_TIP;
+ }
+
+ /**
+ * 删除敏感词管理
+ */
+ @RequestMapping(value = "/delete")
+ @ResponseBody
+ public Object delete(@RequestParam Integer tSysSensitiveWordsId) {
+ tSysSensitiveWordsService.deleteById(tSysSensitiveWordsId);
+ return SUCCESS_TIP;
+ }
+
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TUserController.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TUserController.java
new file mode 100644
index 0000000..43b860b
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TUserController.java
@@ -0,0 +1,588 @@
+package com.stylefeng.guns.modular.system.controller.general;
+
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.baomidou.mybatisplus.plugins.Page;
+import com.stylefeng.guns.core.base.controller.BaseController;
+import com.stylefeng.guns.core.base.tips.ErrorTip;
+import com.stylefeng.guns.core.common.constant.factory.PageFactory;
+import com.stylefeng.guns.core.shiro.ShiroKit;
+import com.stylefeng.guns.core.util.*;
+import com.stylefeng.guns.modular.system.model.*;
+import com.stylefeng.guns.modular.system.service.ITCompanyService;
+import com.stylefeng.guns.modular.system.util.HttpRequestUtil;
+import com.stylefeng.guns.modular.system.util.PushURL;
+import org.apache.commons.lang.time.DateUtils;
+import org.apache.poi.ss.usermodel.Cell;
+import org.apache.poi.ss.usermodel.Row;
+import org.apache.poi.ss.usermodel.Sheet;
+import org.apache.poi.ss.usermodel.Workbook;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.ui.Model;
+import org.springframework.beans.factory.annotation.Autowired;
+import com.stylefeng.guns.core.log.LogObjectHolder;
+import com.stylefeng.guns.modular.system.service.ITUserService;
+import org.springframework.web.multipart.MultipartFile;
+import org.springframework.web.multipart.MultipartHttpServletRequest;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.math.BigDecimal;
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
+import java.util.*;
+
+/**
+ * 用户管理控制器
+ *
+ * @author fengshuonan
+ * @Date 2020-06-01 15:47:58
+ */
+@Controller
+@RequestMapping("/tUser")
+public class TUserController extends BaseController {
+
+ private String PREFIX = "/system/tUser/";
+
+ @Autowired
+ private ITUserService tUserService;
+
+ /**
+ * 跳转到用户管理首页
+ */
+ @RequestMapping("")
+ public String index() {
+ return PREFIX + "tUser.html";
+ }
+
+ /**
+ * 跳转到修改用户管理
+ */
+ @RequestMapping("/tUser_userDetail/{tUserId}")
+ public String tUser_userDetail(@PathVariable Integer tUserId, Model model) {
+ Map<String,Object> tUser = tUserService.getUserDetailById(tUserId);
+ model.addAttribute("item",tUser);
+ return PREFIX + "tUser_userDetail.html";
+ }
+
+ /**
+ * 跳转到修改用户余额页面
+ */
+ @RequestMapping("/tUser_updateBalance/{tUserId}")
+ public String tUser_updateBalance(@PathVariable Integer tUserId, Model model) {
+ model.addAttribute("tUserId",tUserId);
+ return PREFIX + "tUser_updateBalance.html";
+ }
+
+ /**
+ * 跳转到修改用户密码页面
+ */
+ @RequestMapping("/tUser_updatePassword/{tUserId}")
+ public String tUser_updatePassword(@PathVariable Integer tUserId, Model model) {
+ model.addAttribute("tUserId",tUserId);
+ return PREFIX + "tUser_updatePassword.html";
+ }
+
+ /**
+ * 跳转到修改用户状态页面
+ */
+ @RequestMapping("/tUser_optUser/{tUserId}/{optType}")
+ public String tUser_optUser(@PathVariable Integer tUserId,@PathVariable Integer optType, Model model) {
+ model.addAttribute("tUserId",tUserId);
+ model.addAttribute("optType",optType);
+ return PREFIX + "tUser_optUser.html";
+ }
+
+ /**
+ * 获取用户管理列表
+ */
+ @RequestMapping(value = "/list")
+ @ResponseBody
+ public Object list(String insertTime,
+ String id,
+ String nickName,
+ String phone,
+ Integer isAuth,
+ Integer state,String companyName) {
+ String beginTime = null;
+ String endTime = null;
+ if (SinataUtil.isNotEmpty(insertTime)){
+ String[] timeArray = insertTime.split(" - ");
+ beginTime = timeArray[0];
+ endTime = timeArray[1];
+ }
+ Page<Map<String, Object>> page = new PageFactory<Map<String, Object>>().defaultPage();
+ page.setRecords(tUserService.getUserList(page,beginTime,endTime,ShiroKit.getUser().getRoleType(),ShiroKit.getUser().getObjectId(),isAuth,state,id,nickName,phone,companyName));
+ return super.packForBT(page);
+ }
+
+ /**
+ * 修改余额操作
+ */
+ @RequestMapping(value = "/updateBalance")
+ @ResponseBody
+ public Object updateBalance(@RequestParam Integer tUserId,
+ @RequestParam Integer updateType,
+ @RequestParam BigDecimal money) {
+ TUser tUser = tUserService.selectById(tUserId);
+ if (SinataUtil.isNotEmpty(tUser)){
+ if (1 == updateType.intValue()){ //增加
+ tUser.setBalance(tUser.getBalance().add(money));
+ }else if (2 == updateType.intValue()){ //减少
+ if((tUser.getBalance().subtract(money)).compareTo(new BigDecimal(0)) == -1){
+ tUser.setBalance(new BigDecimal(0));
+ }else{
+ tUser.setBalance(tUser.getBalance().subtract(money));
+ }
+ }
+ tUser.setUpdateTime(new Date());
+ tUser.setUpdateUser(ShiroKit.getUser().getId());
+ tUserService.updateById(tUser);
+ }
+ return SUCCESS_TIP;
+ }
+
+ /**
+ * 修改密码操作
+ */
+ @RequestMapping(value = "/updatePassword")
+ @ResponseBody
+ public Object updatePassword(@RequestParam Integer tUserId,
+ @RequestParam String password) {
+ TUser tUser = tUserService.selectById(tUserId);
+ if (SinataUtil.isNotEmpty(tUser)){
+// tUser.setPassWord(MD5Util.encrypt(password));
+ tUser.setPassWord(ShiroKit.md5(password, "&a.s"));
+ tUser.setUpdateTime(new Date());
+ tUser.setUpdateUser(ShiroKit.getUser().getId());
+ tUserService.updateById(tUser);
+ }
+ return SUCCESS_TIP;
+ }
+
+ /**
+ * 操作用户
+ */
+ @RequestMapping(value = "/optUser")
+ @ResponseBody
+ public Object optUser(@RequestParam Integer tUserId,@RequestParam Integer optType,@RequestParam String remark) {
+ TUser tUser = tUserService.selectById(tUserId);
+ if (SinataUtil.isNotEmpty(tUser)){
+ if (1 == optType.intValue()){ //冻结
+ tUser.setState(2);
+ tUser.setRemark(remark);
+
+ //增加推送
+ Map<String,String> map = new HashMap<>();
+ map.put("uid", tUser.getId().toString());
+ String result = HttpRequestUtil.postRequest(PushURL.freeze_user_url, map);
+ System.out.println("冻结用户:【userId="+tUser.getId().toString()+"】,调用接口:"+result);
+
+ }else if (2 == optType.intValue()){ //解冻
+ tUser.setState(1);
+ tUser.setRemark(remark);
+ }
+ tUser.setUpdateTime(new Date());
+ tUser.setUpdateUser(ShiroKit.getUser().getId());
+ tUserService.updateById(tUser);
+ }
+ return SUCCESS_TIP;
+ }
+
+ /**
+ * 下载模板
+ * @param request
+ * @param response
+ */
+ @RequestMapping(value = "/uploadUserModel")
+ public void uploadUserModel(HttpServletRequest request, HttpServletResponse response) {
+ // 表格数据【封装】
+ List<List<String>> dataList = new ArrayList<List<String>>();
+
+ // 首行【封装】
+ List<String> shellList = new ArrayList<String>();
+ shellList.add("昵称");
+ shellList.add("手机号");
+ shellList.add("生日[例如:1995-09-09]");
+ shellList.add("性别[男/女]");
+ shellList.add("紧急联系人[选填]");
+ shellList.add("紧急联系电话[选填]");
+ shellList.add("是否实名认证[是/否]");
+ shellList.add("真实姓名");
+ shellList.add("身份证号");
+ shellList.add("余额");
+ shellList.add("密码[6-18个长度]");
+ dataList.add(shellList);
+
+ try {
+ // 调用工具类进行导出
+ ExcelExportUtil.easySheet("平台导入用户模板"+DateUtil.formatDate(new Date(), "YYYYMMddHHmmss"), "平台导入用户模板", dataList, request, response);
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ }
+
+ /**
+ * 导入操作
+ * @param request
+ * @return
+ */
+ @RequestMapping(value="/exportUser",method = RequestMethod.POST)
+ @ResponseBody
+ public Object exportUser(HttpServletRequest request){
+ MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request;
+ MultipartFile file = (MultipartFile) multipartRequest.getFile("myfile");
+ try {
+ //定时五秒后执行
+ /*Map<String,Object> maps=new HashMap<>();
+ Workbook book = WoUtil.ImportFile(file);
+ maps.put("book",book);
+ QuartzManager.addJob(AddContract.class, (AddContract.name+new Date().getTime()).toUpperCase(), TimeJobType.ADMIN,DateUtil.getDate_strYMdHms(new Date().getTime() + 1*1000) , maps);*/
+
+ Workbook book = WoUtil.ImportFile(file);
+ Sheet sh = book.getSheetAt(0); //获取到第一个表
+ for (int i = 1; i <= sh.getLastRowNum(); i++) {
+ Row row = sh.getRow(i);
+
+ Cell cell0 = row.getCell(0); //昵称
+ String nickName = null;
+ if (SinataUtil.isNotEmpty(cell0)){
+ nickName = String.valueOf(cell0.getStringCellValue()).trim();
+ }
+
+ Cell cell1 = row.getCell(1); //手机号
+ String phone = null;
+ if (SinataUtil.isNotEmpty(cell1)){
+ phone = String.valueOf(cell1.getStringCellValue()).trim();
+ }
+
+ Cell cell2 = row.getCell(2); //生日[例如:1995-09-09]
+ String birthday = null;
+ if (SinataUtil.isNotEmpty(cell2)){
+ birthday = String.valueOf(cell2.getStringCellValue()).trim();
+ }
+
+ Cell cell3 = row.getCell(3); //性别[男/女]
+ String sex = null;
+ if (SinataUtil.isNotEmpty(cell3)){
+ sex = String.valueOf(cell3.getStringCellValue()).trim();
+ }
+
+ Cell cell4 = row.getCell(4); //紧急联系人[选填]
+ String emergencyContact = null;
+ if (SinataUtil.isNotEmpty(cell4)){
+ emergencyContact = String.valueOf(cell4.getStringCellValue()).trim();
+ }
+
+ Cell cell5 = row.getCell(5); //紧急联系电话[选填]
+ String emergencyContactNumber = null;
+ if (SinataUtil.isNotEmpty(cell5)){
+ emergencyContactNumber = String.valueOf(cell5.getStringCellValue()).trim();
+ }
+
+ Cell cell6 = row.getCell(6); //是否实名认证[是/否]
+ String isAuth = null;
+ if (SinataUtil.isNotEmpty(cell6)){
+ isAuth = String.valueOf(cell6.getStringCellValue()).trim();
+ }
+
+ Cell cell7 = row.getCell(7); //真实姓名
+ String name = null;
+ if (SinataUtil.isNotEmpty(cell7)){
+ name = String.valueOf(cell7.getStringCellValue()).trim();
+ }
+
+ Cell cell8 = row.getCell(8); //身份证号
+ String idCard = null;
+ if (SinataUtil.isNotEmpty(cell8)){
+ idCard = String.valueOf(cell8.getStringCellValue()).trim();
+ }
+
+ Cell cell9 = row.getCell(9); //余额
+ String balance = null;
+ if (SinataUtil.isNotEmpty(cell9)){
+ balance = String.valueOf(cell9.getStringCellValue()).trim();
+ }
+
+ Cell cell10 = row.getCell(10); //密码
+ String passWord = null;
+ if (SinataUtil.isNotEmpty(cell10)){
+ passWord = String.valueOf(cell10.getStringCellValue()).trim();
+ }
+
+ if (SinataUtil.isEmpty(nickName) || SinataUtil.isEmpty(phone) || SinataUtil.isEmpty(birthday)
+ || SinataUtil.isEmpty(sex) || SinataUtil.isEmpty(isAuth) || SinataUtil.isEmpty(balance)
+ || SinataUtil.isEmpty(passWord) ){
+ return new ErrorTip(500, "单元格不能为空");
+ }else{
+ int count = tUserService.selectCount(new EntityWrapper<TUser>().eq("phone", phone).notIn("flag", 3));
+ if (count > 0){
+ return new ErrorTip(500, "手机号已存在,请重新填写");
+ }
+ //判断性别
+ if (!sex.equals("男") && !sex.equals("女")){
+ return new ErrorTip(500, "性别内容不正确");
+ }
+ //判断是否实名认证
+ if (!isAuth.equals("是") && !isAuth.equals("否")){
+ return new ErrorTip(500, "是否实名认证内容不正确");
+ }
+ if ("是".equals(isAuth)){
+ //判断紧急联系电话
+ if (SinataUtil.isNotEmpty(emergencyContactNumber)){
+ if (!isPhone(emergencyContactNumber)){
+ return new ErrorTip(500, "紧急联系电话格式不正确");
+ }
+ }
+ }
+ //判断生日格式
+ try {
+ if (!isValidDate(birthday)) {
+ birthday = importByExcelForDate(birthday);
+ }
+ }catch (Exception e){
+ return new ErrorTip(500, "年检到期时间格式不正确");
+ }
+ //判断手机号
+ if (!isPhone(phone)){
+ return new ErrorTip(500, "手机号格式不正确");
+ }
+ //判断余额
+ if (!isDouble(balance)){
+ return new ErrorTip(500, "余额格式不正确");
+ }
+ //判断登录密码
+ if (!isPassword(passWord)){
+ return new ErrorTip(500, "登录密码格式不正确");
+ }
+ TUser user = new TUser();
+ TCompany company = itCompanyService.selectOne(new EntityWrapper<TCompany>().eq("type", 1).notIn("flag", 3).last(" limit 1"));
+ user.setCompanyId(company.getId());
+ user.setPhone(phone);
+ user.setNickName(nickName);
+ user.setBirthday(DateUtil.parseDate(birthday));
+ if (sex.equals("男")){
+ user.setSex(1);
+ }else if (sex.equals("女")){
+ user.setSex(2);
+ }
+ user.setEmergencyContact(emergencyContact);
+ user.setEmergencyContactNumber(emergencyContactNumber);
+ if ("是".equals(isAuth)){
+ user.setIsAuth(2);
+ }else if ("否".equals(isAuth)){
+ user.setIsAuth(1);
+ }
+ user.setName(name);
+ user.setIdCard(idCard);
+ user.setBalance(new BigDecimal(balance));
+ user.setPassWord(ShiroKit.md5(passWord, "&a.s"));
+ user.setState(1);
+ user.setFlag("1");
+ user.setInsertTime(new Date());
+ user.setInsertUser(ShiroKit.getUser().getId());
+ tUserService.insert(user);
+ }
+ }
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ return SUCCESS_TIP;
+ }
+
+ @Autowired
+ private ITCompanyService itCompanyService;
+
+ /**
+ * 判断日期是否满足yyyy-MM-dd格式
+ * @param str
+ * @return
+ */
+ public static boolean isValidDate(String str) {
+ boolean convertSuccess=true;
+ SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
+ try {
+ format.setLenient(false);
+ format.parse(str);
+ } catch (Exception e) {
+ convertSuccess=false;
+ }
+ return convertSuccess;
+ }
+
+
+ /**
+ * 转换日期
+ * @return
+ */
+ public static String importByExcelForDate(String value) {//value就是它的天数
+ String currentCellValue = "";
+ if(value != null && !value.equals("")){
+ Calendar calendar = new GregorianCalendar(1900,0,-1);
+ Date d = calendar.getTime();
+ Date dd = DateUtils.addDays(d,Integer.valueOf(value));
+ DateFormat formater = new SimpleDateFormat("yyyy-MM-dd");
+ currentCellValue = formater.format(dd);
+ }
+ return currentCellValue;
+ }
+
+ /**
+ * 验证手机号格式是否正确
+ * @param str
+ * @return
+ */
+ public static boolean isPhone(String str) {
+ try{
+ String reg = "^1\\d{10}$";
+ boolean flag = str.matches(reg);
+ return flag;
+ }catch(NumberFormatException e) {
+ System.out.println("异常：\"" + str + "\"...");
+ return false;
+ }
+ }
+
+ /**
+ * 验证密码长度是否正确
+ * @param str
+ * @return
+ */
+ public static boolean isPassword(String str) {
+ try{
+ String reg = "^.{6,18}$";
+ boolean flag = str.matches(reg);
+ return flag;
+ }catch(NumberFormatException e) {
+ System.out.println("异常：\"" + str + "\"...");
+ return false;
+ }
+ }
+
+ /**
+ * 验证是否可以字符转为金额值
+ * @param str
+ * @return
+ */
+ public static boolean isDouble(String str) {
+ try{
+ Double.parseDouble(str);
+ return true;
+ }catch(NumberFormatException e) {
+ System.out.println("异常：\"" + str + "\"不是数字/整数/小数...");
+ return false;
+ }
+ }
+
+ /**
+ * 导出用户信息
+ */
+ @RequestMapping(value = "/outUser")
+ public void outUser(HttpServletRequest request, HttpServletResponse response) {
+ List<Map<String,Object>> listMap = tUserService.getUserListNoPage(ShiroKit.getUser().getRoleType(),ShiroKit.getUser().getObjectId());
+
+ // 表格数据【封装】
+ List<List<String>> dataList = new ArrayList<>();
+
+ //第一行显示【封装】
+ List<String> twoList = new ArrayList<String>();
+ twoList.add("总计:");
+ twoList.add(String.valueOf(listMap.size())+"条");
+ dataList.add(twoList);
+
+ // 列【封装】
+ List<String> shellList = new ArrayList<String>();
+ shellList.add("注册时间");
+ shellList.add("用户ID");
+ shellList.add("注册地所属分公司");
+ shellList.add("昵称");
+ shellList.add("手机号");
+ shellList.add("紧急联系人姓名");
+ shellList.add("紧急联系人电话");
+ shellList.add("是否实名认证");
+ shellList.add("历史出行次数");
+ shellList.add("历史消费");
+ shellList.add("积分");
+ shellList.add("备注");
+ shellList.add("状态");
+ dataList.add(shellList);
+
+ for (Map<String,Object> object : listMap){
+ // 详细数据列【封装】
+ shellList = new ArrayList<String>();
+ if(SinataUtil.isNotEmpty(object.get("insertTime"))){
+ shellList.add(DateUtil.formatDate(DateUtil.parse(object.get("insertTime").toString(),"YYYY-MM-dd HH:mm:ss.S"), "YYYY-MM-dd HH:mm:ss"));
+ }else{
+ shellList.add("-");
+ }
+ shellList.add(String.valueOf(object.get("id")));
+ if(SinataUtil.isNotEmpty(object.get("companyName"))){
+ shellList.add(object.get("companyName").toString());
+ }else{
+ shellList.add("-");
+ }
+ if(SinataUtil.isNotEmpty(object.get("nickName"))){
+ shellList.add(object.get("nickName").toString());
+ }else{
+ shellList.add("-");
+ }
+ if(SinataUtil.isNotEmpty(object.get("phone"))){
+ shellList.add(object.get("phone").toString());
+ }else{
+ shellList.add("-");
+ }
+ if(SinataUtil.isNotEmpty(object.get("emergencyContact"))){
+ shellList.add(object.get("emergencyContact").toString());
+ }else{
+ shellList.add("-");
+ }
+ if(SinataUtil.isNotEmpty(object.get("emergencyContactNumber"))){
+ shellList.add(object.get("emergencyContactNumber").toString());
+ }else{
+ shellList.add("-");
+ }
+ if(SinataUtil.isNotEmpty(object.get("isAuth"))){
+ shellList.add(object.get("isAuth").toString().equals("是")?"是":"否");
+ }else{
+ shellList.add("-");
+ }
+ if(SinataUtil.isNotEmpty(object.get("historyNum"))){
+ shellList.add(object.get("historyNum").toString());
+ }else{
+ shellList.add("-");
+ }
+ if(SinataUtil.isNotEmpty(object.get("consumptionNum"))){
+ shellList.add(object.get("consumptionNum").toString());
+ }else{
+ shellList.add("-");
+ }
+ if(SinataUtil.isNotEmpty(object.get("integral"))){
+ shellList.add(object.get("integral").toString());
+ }else{
+ shellList.add("-");
+ }
+ if(SinataUtil.isNotEmpty(object.get("remark"))){
+ shellList.add(object.get("remark").toString());
+ }else{
+ shellList.add("-");
+ }
+ if(SinataUtil.isNotEmpty(object.get("state"))){
+ shellList.add(Integer.valueOf(object.get("state").toString()) == 1?"正常":"冻结");
+ }else{
+ shellList.add("-");
+ }
+ dataList.add(shellList);
+ }
+ try {
+ // 调用工具类进行导出
+ ExcelExportUtil.easySheet("用户信息导出记录"+DateUtil.formatDate(new Date(), "YYYYMMddHHmmss"), "用户信息导出记录", dataList,request, response);
+
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ }
+
+
+
+
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TUserRedPacketRecordController.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TUserRedPacketRecordController.java
new file mode 100644
index 0000000..b23ca3a
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TUserRedPacketRecordController.java
@@ -0,0 +1,123 @@
+package com.stylefeng.guns.modular.system.controller.general;
+
+import com.baomidou.mybatisplus.plugins.Page;
+import com.stylefeng.guns.core.base.controller.BaseController;
+import com.stylefeng.guns.core.common.constant.factory.PageFactory;
+import com.stylefeng.guns.core.util.SinataUtil;
+import com.stylefeng.guns.modular.system.service.IUserCouponRecordService;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.beans.factory.annotation.Autowired;
+import com.stylefeng.guns.core.log.LogObjectHolder;
+import org.springframework.web.bind.annotation.RequestParam;
+import com.stylefeng.guns.modular.system.model.TUserRedPacketRecord;
+import com.stylefeng.guns.modular.system.service.ITUserRedPacketRecordService;
+
+import java.util.Map;
+
+/**
+ * 控制器
+ *
+ * @author fengshuonan
+ * @Date 2020-07-10 15:33:49
+ */
+@Controller
+@RequestMapping("/tUserRedPacketRecord")
+public class TUserRedPacketRecordController extends BaseController {
+
+ private String PREFIX = "/system/tUserRedPacketRecord/";
+
+ @Autowired
+ private ITUserRedPacketRecordService tUserRedPacketRecordService;
+
+ @Autowired
+ private IUserCouponRecordService userCouponRecordService;
+
+
+ /**
+ * 跳转到首页
+ */
+ @RequestMapping("")
+ public String index(Model model,Integer couponActivityId) {
+ model.addAttribute("couponActivityId",couponActivityId);
+ return PREFIX + "tUserRedPacketRecord.html";
+ }
+
+ /**
+ * 跳转到添加
+ */
+ @RequestMapping("/tUserRedPacketRecord_add")
+ public String tUserRedPacketRecordAdd() {
+ return PREFIX + "tUserRedPacketRecord_add.html";
+ }
+
+ /**
+ * 跳转到修改
+ */
+ @RequestMapping("/tUserRedPacketRecord_update/{tUserRedPacketRecordId}")
+ public String tUserRedPacketRecordUpdate(@PathVariable Integer tUserRedPacketRecordId, Model model) {
+ TUserRedPacketRecord tUserRedPacketRecord = tUserRedPacketRecordService.selectById(tUserRedPacketRecordId);
+ model.addAttribute("item",tUserRedPacketRecord);
+ LogObjectHolder.me().set(tUserRedPacketRecord);
+ return PREFIX + "tUserRedPacketRecord_edit.html";
+ }
+
+ /**
+ * 获取列表
+ */
+ @RequestMapping(value = "/list")
+ @ResponseBody
+ public Object list(String createTime,String userName,String userPhone,Integer couponActivityId,Integer state) {
+ String beginTime = null;
+ String endTime = null;
+ if (SinataUtil.isNotEmpty(createTime)){
+ String[] timeArray = createTime.split(" - ");
+ beginTime = timeArray[0];
+ endTime = timeArray[1];
+ }
+ Page<Map<String, Object>> page = new PageFactory<Map<String, Object>>().defaultPage();
+ page.setRecords(userCouponRecordService.getRedList(page,beginTime,endTime,userName,userPhone,couponActivityId,state));
+ return super.packForBT(page);
+ }
+ /**
+ * 新增
+ */
+ @RequestMapping(value = "/add")
+ @ResponseBody
+ public Object add(TUserRedPacketRecord tUserRedPacketRecord) {
+ tUserRedPacketRecordService.insert(tUserRedPacketRecord);
+ return SUCCESS_TIP;
+ }
+
+ /**
+ * 删除
+ */
+ @RequestMapping(value = "/delete")
+ @ResponseBody
+ public Object delete(@RequestParam Integer tUserRedPacketRecordId) {
+ tUserRedPacketRecordService.deleteById(tUserRedPacketRecordId);
+ return SUCCESS_TIP;
+ }
+
+ /**
+ * 修改
+ */
+ @RequestMapping(value = "/update")
+ @ResponseBody
+ public Object update(TUserRedPacketRecord tUserRedPacketRecord) {
+ tUserRedPacketRecordService.updateById(tUserRedPacketRecord);
+ return SUCCESS_TIP;
+ }
+
+ /**
+ * 详情
+ */
+ @RequestMapping(value = "/detail/{tUserRedPacketRecordId}")
+ @ResponseBody
+ public Object detail(@PathVariable("tUserRedPacketRecordId") Integer tUserRedPacketRecordId) {
+ return tUserRedPacketRecordService.selectById(tUserRedPacketRecordId);
+ }
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TVerifiedController.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TVerifiedController.java
new file mode 100644
index 0000000..ba0088b
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TVerifiedController.java
@@ -0,0 +1,136 @@
+package com.stylefeng.guns.modular.system.controller.general;
+
+import com.baomidou.mybatisplus.plugins.Page;
+import com.stylefeng.guns.core.base.controller.BaseController;
+import com.stylefeng.guns.core.common.constant.factory.PageFactory;
+import com.stylefeng.guns.core.shiro.ShiroKit;
+import com.stylefeng.guns.core.util.SinataUtil;
+import com.stylefeng.guns.modular.system.model.TSystemNotice;
+import com.stylefeng.guns.modular.system.model.TUser;
+import com.stylefeng.guns.modular.system.service.ITSystemNoticeService;
+import com.stylefeng.guns.modular.system.service.ITUserService;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.beans.factory.annotation.Autowired;
+import com.stylefeng.guns.core.log.LogObjectHolder;
+import org.springframework.web.bind.annotation.RequestParam;
+import com.stylefeng.guns.modular.system.model.TVerified;
+import com.stylefeng.guns.modular.system.service.ITVerifiedService;
+
+import java.util.Date;
+import java.util.Map;
+
+/**
+ * 实名认证列表控制器
+ *
+ * @author fengshuonan
+ * @Date 2020-06-09 08:46:44
+ */
+@Controller
+@RequestMapping("/tVerified")
+public class TVerifiedController extends BaseController {
+
+ private String PREFIX = "/system/tVerified/";
+
+ @Autowired
+ private ITVerifiedService tVerifiedService;
+
+ @Autowired
+ private ITSystemNoticeService tSystemNoticeService;
+
+ @Autowired
+ private ITUserService tUserService;
+
+ /**
+ * 跳转到实名认证列表首页
+ */
+ @RequestMapping("")
+ public String index() {
+ return PREFIX + "tVerified.html";
+ }
+
+ /**
+ * 跳转到添加实名认证列表
+ */
+ @RequestMapping("/tVerified_add")
+ public String tVerifiedAdd() {
+ return PREFIX + "tVerified_add.html";
+ }
+
+ /**
+ * 跳转到修改实名认证列表
+ */
+ @RequestMapping("/tVerified_immediately/{tVerifiedId}")
+ public String tVerifiedUpdate(@PathVariable Integer tVerifiedId, Model model) {
+ model.addAttribute("tVerifiedId",tVerifiedId);
+ return PREFIX + "tVerified_immediately.html";
+ }
+
+ /**
+ * 获取实名认证列表列表
+ */
+ @RequestMapping(value = "/list")
+ @ResponseBody
+ public Object list(String insertTime,
+ String userName,
+ String userPhone,
+ String name,
+ Integer state) {
+ String beginTime = null;
+ String endTime = null;
+ if (SinataUtil.isNotEmpty(insertTime)){
+ String[] timeArray = insertTime.split(" - ");
+ beginTime = timeArray[0];
+ endTime = timeArray[1];
+ }
+ Page<Map<String, Object>> page = new PageFactory<Map<String, Object>>().defaultPage();
+ if (ShiroKit.getUser().getRoleType() != 1){
+ page.setRecords(null);
+ }else{
+ page.setRecords(tVerifiedService.getVerifiedList(page,beginTime,endTime,userName,userPhone,name,state));
+ }
+ return super.packForBT(page);
+ }
+
+ /**
+ * 立即审核操作
+ */
+ @RequestMapping(value = "/immediately")
+ @ResponseBody
+ public Object immediately(@RequestParam Integer id,@RequestParam Integer state) {
+ if (SinataUtil.isNotEmpty(id) && SinataUtil.isNotEmpty(state)){
+ TVerified tVerified = tVerifiedService.selectById(id);
+ tVerified.setState(state);
+ tVerifiedService.updateById(tVerified);
+
+ //增加系统消息
+ /*TSystemNotice notice = new TSystemNotice();
+ notice.setType(2);
+ notice.setUserType(2); //todo
+ if (2 == state){
+ notice.setContent("实名认证处理结果:【您的实名认证申请已通过审核】。");
+ }else if (3 == state){
+ notice.setContent("实名认证处理结果:【您的实名认证申请未通过审核】。");
+ }
+ notice.setUserId(tVerified.getUserId());
+ notice.setInsertTime(new Date());
+ notice.setRead(1);
+ tSystemNoticeService.insert(notice);*/
+ }
+ return SUCCESS_TIP;
+ }
+
+ /**
+ * 删除实名认证列表
+ */
+ @RequestMapping(value = "/delete")
+ @ResponseBody
+ public Object delete(@RequestParam Integer tVerifiedId) {
+ tVerifiedService.deleteById(tVerifiedId);
+ return SUCCESS_TIP;
+ }
+
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TVersionManagementController.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TVersionManagementController.java
new file mode 100644
index 0000000..f687a33
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TVersionManagementController.java
@@ -0,0 +1,208 @@
+package com.stylefeng.guns.modular.system.controller.general;
+
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.baomidou.mybatisplus.plugins.Page;
+import com.stylefeng.guns.config.properties.GunsProperties;
+import com.stylefeng.guns.core.base.controller.BaseController;
+import com.stylefeng.guns.core.common.constant.factory.PageFactory;
+import com.stylefeng.guns.core.shiro.ShiroKit;
+import com.stylefeng.guns.core.util.SinataUtil;
+import com.stylefeng.guns.core.util.ToolUtil;
+import com.stylefeng.guns.modular.system.model.TPubWithdrawal;
+import com.stylefeng.guns.modular.system.util.OssUploadUtil;
+import com.stylefeng.guns.modular.system.util.PushMinistryOfTransportUtil;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.ui.Model;
+import org.springframework.beans.factory.annotation.Autowired;
+import com.stylefeng.guns.core.log.LogObjectHolder;
+import com.stylefeng.guns.modular.system.model.TVersionManagement;
+import com.stylefeng.guns.modular.system.service.ITVersionManagementService;
+import org.springframework.web.multipart.MultipartFile;
+import org.springframework.web.multipart.MultipartHttpServletRequest;
+
+import javax.servlet.http.HttpServletRequest;
+import java.io.File;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.UUID;
+
+/**
+ * 版本管理控制器
+ *
+ * @author fengshuonan
+ * @Date 2020-06-10 18:43:26
+ */
+@Controller
+@RequestMapping("/tVersionManagement")
+public class TVersionManagementController extends BaseController {
+
+ private String PREFIX = "/system/tVersionManagement/";
+
+ @Autowired
+ private ITVersionManagementService tVersionManagementService;
+
+ @Autowired
+ private PushMinistryOfTransportUtil pushMinistryOfTransportUtil;
+
+ @Value("${pushMinistryOfTransport}")
+ private boolean pushMinistryOfTransport;
+
+ /**
+ * 跳转到版本管理首页
+ */
+ @RequestMapping("")
+ public String index() {
+ return PREFIX + "tVersionManagement.html";
+ }
+
+ /**
+ * 跳转到查看详情
+ */
+ @RequestMapping("/lookDetail/{id}/{type}")
+ public String lookDetail(@PathVariable Integer id, @PathVariable Integer type, Model model) {
+ TVersionManagement tVersionManagement = tVersionManagementService.selectById(id);
+ String str = "";
+ if (1 == type){
+ str = tVersionManagement.getContent();
+ }
+ model.addAttribute("str",str);
+ return "/system/tComplaint/lookDetail.html";
+ }
+
+ /**
+ * 跳转到添加版本管理
+ */
+ @RequestMapping("/tVersionManagement_add")
+ public String tVersionManagementAdd() {
+ return PREFIX + "tVersionManagement_add.html";
+ }
+
+ /**
+ * 跳转到修改版本管理
+ */
+ @RequestMapping("/tVersionManagement_update/{tVersionManagementId}")
+ public String tVersionManagementUpdate(@PathVariable Integer tVersionManagementId, Model model) {
+ TVersionManagement tVersionManagement = tVersionManagementService.selectById(tVersionManagementId);
+ model.addAttribute("item",tVersionManagement);
+ LogObjectHolder.me().set(tVersionManagement);
+ return PREFIX + "tVersionManagement_edit.html";
+ }
+
+ /**
+ * 获取版本管理列表
+ */
+ @RequestMapping(value = "/list")
+ @ResponseBody
+ public Object list(String insertTime,
+ String version) {
+ String beginTime = null;
+ String endTime = null;
+ if (SinataUtil.isNotEmpty(insertTime)){
+ String[] timeArray = insertTime.split(" - ");
+ beginTime = timeArray[0];
+ endTime = timeArray[1];
+ }
+ Page<Map<String, Object>> page = new PageFactory<Map<String, Object>>().defaultPage();
+ if (ShiroKit.getUser().getRoleType() != 1){
+ page.setRecords(null);
+ }else{
+ page.setRecords(tVersionManagementService.getVersionList(page,beginTime,endTime,version));
+ }
+ return super.packForBT(page);
+ }
+
+ @Autowired
+ private GunsProperties gunsProperties;
+
+ /**
+ * 异步上传包
+ * @param myfile
+ * @return
+ */
+ @ResponseBody
+ @RequestMapping("/saveApk")
+ public Map<String, Object> saveApk(@RequestPart("myfile") MultipartFile myfile, HttpServletRequest request){
+ Map<String, Object> m = new HashMap<>();
+ /*try {
+ String pictureName = UUID.randomUUID().toString() + "." + ToolUtil.getFileSuffix(file.getOriginalFilename());
+ try {
+ String fileSavePath = gunsProperties.getFileUploadPath()+"apk\\";
+ file.transferTo(new File(fileSavePath + pictureName));
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ m.put("imgUrl", gunsProperties.getPictureServerAddress()+"apk/"+pictureName);
+ } catch (Exception e) {
+ e.printStackTrace();
+ }*/
+ try {
+ MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request;
+ MultipartFile file = (MultipartFile) myfile;
+
+ String pictureName = OssUploadUtil.ossUpload(request, file);
+ m.put("imgUrl", pictureName);
+ }catch (Exception e){
+ e.printStackTrace();
+ }
+ return m;
+ }
+
+ /**
+ * 新增版本管理
+ */
+ @RequestMapping(value = "/add")
+ @ResponseBody
+ public Object add(TVersionManagement tVersionManagement) {
+ //判断版本号是否相同
+ int count = tVersionManagementService.selectCount(
+ new EntityWrapper<TVersionManagement>()
+ .eq("version", tVersionManagement.getVersion())
+ .eq("type", tVersionManagement.getType()));
+ if (count > 0){
+ return "error";
+ }
+
+ tVersionManagement.setInsertTime(new Date());
+ tVersionManagementService.insert(tVersionManagement);
+ return SUCCESS_TIP;
+ }
+
+ /**
+ * 删除版本管理
+ */
+ @RequestMapping(value = "/delete")
+ @ResponseBody
+ public Object delete(@RequestParam Integer tVersionManagementId) {
+ tVersionManagementService.deleteById(tVersionManagementId);
+ return SUCCESS_TIP;
+ }
+
+ /**
+ * 修改版本管理
+ */
+ @RequestMapping(value = "/update")
+ @ResponseBody
+ public Object update(TVersionManagement tVersionManagement) {
+ int count = tVersionManagementService.selectCount(
+ new EntityWrapper<TVersionManagement>()
+ .eq("version", tVersionManagement.getVersion())
+ .eq("type", tVersionManagement.getType()));
+ if (count > 0){
+ return "error";
+ }
+ tVersionManagementService.updateById(tVersionManagement);
+ return SUCCESS_TIP;
+ }
+
+ /**
+ * 版本管理详情
+ */
+ @RequestMapping(value = "/detail/{tVersionManagementId}")
+ @ResponseBody
+ public Object detail(@PathVariable("tVersionManagementId") Integer tVersionManagementId) {
+ return tVersionManagementService.selectById(tVersionManagementId);
+ }
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/UserActivityBalanceController.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/UserActivityBalanceController.java
new file mode 100644
index 0000000..61e66f9
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/UserActivityBalanceController.java
@@ -0,0 +1,104 @@
+package com.stylefeng.guns.modular.system.controller.general;
+
+import com.stylefeng.guns.core.base.controller.BaseController;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.beans.factory.annotation.Autowired;
+import com.stylefeng.guns.core.log.LogObjectHolder;
+import org.springframework.web.bind.annotation.RequestParam;
+import com.stylefeng.guns.modular.system.model.UserActivityBalance;
+import com.stylefeng.guns.modular.system.service.IUserActivityBalanceService;
+
+/**
+ * 控制器
+ *
+ * @author fengshuonan
+ * @Date 2020-06-19 14:32:36
+ */
+@Controller
+@RequestMapping("/userActivityBalance")
+public class UserActivityBalanceController extends BaseController {
+
+ private String PREFIX = "/system/userActivityBalance/";
+
+ @Autowired
+ private IUserActivityBalanceService userActivityBalanceService;
+
+ /**
+ * 跳转到首页
+ */
+ @RequestMapping("")
+ public String index() {
+ return PREFIX + "userActivityBalance.html";
+ }
+
+ /**
+ * 跳转到添加
+ */
+ @RequestMapping("/userActivityBalance_add")
+ public String userActivityBalanceAdd() {
+ return PREFIX + "userActivityBalance_add.html";
+ }
+
+ /**
+ * 跳转到修改
+ */
+ @RequestMapping("/userActivityBalance_update/{userActivityBalanceId}")
+ public String userActivityBalanceUpdate(@PathVariable Integer userActivityBalanceId, Model model) {
+ UserActivityBalance userActivityBalance = userActivityBalanceService.selectById(userActivityBalanceId);
+ model.addAttribute("item",userActivityBalance);
+ LogObjectHolder.me().set(userActivityBalance);
+ return PREFIX + "userActivityBalance_edit.html";
+ }
+
+ /**
+ * 获取列表
+ */
+ @RequestMapping(value = "/list")
+ @ResponseBody
+ public Object list(String condition) {
+ return userActivityBalanceService.selectList(null);
+ }
+
+ /**
+ * 新增
+ */
+ @RequestMapping(value = "/add")
+ @ResponseBody
+ public Object add(UserActivityBalance userActivityBalance) {
+ userActivityBalanceService.insert(userActivityBalance);
+ return SUCCESS_TIP;
+ }
+
+ /**
+ * 删除
+ */
+ @RequestMapping(value = "/delete")
+ @ResponseBody
+ public Object delete(@RequestParam Integer userActivityBalanceId) {
+ userActivityBalanceService.deleteById(userActivityBalanceId);
+ return SUCCESS_TIP;
+ }
+
+ /**
+ * 修改
+ */
+ @RequestMapping(value = "/update")
+ @ResponseBody
+ public Object update(UserActivityBalance userActivityBalance) {
+ userActivityBalanceService.updateById(userActivityBalance);
+ return SUCCESS_TIP;
+ }
+
+ /**
+ * 详情
+ */
+ @RequestMapping(value = "/detail/{userActivityBalanceId}")
+ @ResponseBody
+ public Object detail(@PathVariable("userActivityBalanceId") Integer userActivityBalanceId) {
+ return userActivityBalanceService.selectById(userActivityBalanceId);
+ }
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/UserActivityController.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/UserActivityController.java
new file mode 100644
index 0000000..51d1c3e
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/UserActivityController.java
@@ -0,0 +1,447 @@
+package com.stylefeng.guns.modular.system.controller.general;
+
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.baomidou.mybatisplus.mapper.Wrapper;
+import com.baomidou.mybatisplus.plugins.Page;
+import com.stylefeng.guns.core.base.controller.BaseController;
+import com.stylefeng.guns.core.common.constant.factory.PageFactory;
+import com.stylefeng.guns.core.page.PageInfoBT;
+import com.stylefeng.guns.core.shiro.ShiroKit;
+import com.stylefeng.guns.core.shiro.ShiroUser;
+import com.stylefeng.guns.core.util.DateUtil;
+import com.stylefeng.guns.core.util.SinataUtil;
+import com.stylefeng.guns.modular.system.model.*;
+import com.stylefeng.guns.modular.system.service.*;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.beans.factory.annotation.Autowired;
+import com.stylefeng.guns.core.log.LogObjectHolder;
+import org.springframework.web.bind.annotation.RequestParam;
+
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 控制器
+ *
+ * @author fengshuonan
+ * @Date 2020-06-19 14:32:29
+ */
+@Controller
+@RequestMapping("/userActivity")
+public class UserActivityController extends BaseController {
+
+ private String PREFIX = "/system/userActivity/";
+
+ @Autowired
+ private IUserActivityService userActivityService;
+
+ @Autowired
+ private IUserActivityBalanceService userActivityBalanceService;
+
+ @Autowired
+ private IUserActivityDiscount1Service userActivityDiscount1Service;
+
+ @Autowired
+ private IUserActivityInviteService userActivityInviteService;
+
+ @Autowired
+ private IUserActivityRedenvelopeService userActivityRedenvelopeService;
+
+ @Autowired
+ private IUserActivityRegisteredService userActivityRegisteredService;
+
+ @Autowired
+ private ISysCouponRecordService sysCouponRecordService;
+
+ @Autowired
+ private ISysRedPacketRecordService sysRedPacketRecordService;
+
+ @Autowired
+ private IUserCouponRecordService userCouponRecordService;
+
+ @Autowired
+ private ITUserRedPacketRecordService redPacketRecordService;
+
+ /**
+ * 跳转领取统计
+ * @return
+ */
+ @RequestMapping("/receiveRecord")
+ public String receiveRecord(Model model,Integer activityId){
+ model.addAttribute("activityId",activityId);
+ UserActivity userActivity = userActivityService.selectById(activityId);
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+ model.addAttribute("startTime", sdf.format(userActivity.getStartTime()));
+ model.addAttribute("endTime", sdf.format(userActivity.getEndTime()));
+ UserActivityRegistered userActivityRegistered = userActivityRegisteredService.selectOne(new EntityWrapper<UserActivityRegistered>().eq("userActivityId",activityId));
+ UserActivityInvite userActivityInvite = userActivityInviteService.selectOne(new EntityWrapper<UserActivityInvite>().eq("userActivityId",activityId));
+ UserActivityDiscount1 userActivityDiscount1 = userActivityDiscount1Service.selectOne(new EntityWrapper<UserActivityDiscount1>().eq("userActivityId",activityId));
+ UserActivityRedenvelope userActivityRedenvelope = userActivityRedenvelopeService.selectOne(new EntityWrapper<UserActivityRedenvelope>().eq("userActivityId",activityId));
+ if(SinataUtil.isNotEmpty(userActivityRegistered)){
+ model.addAttribute("userActivityRegisteredId",userActivityRegistered.getId());
+ }else{
+ model.addAttribute("userActivityRegisteredId",0);
+ }
+ if(SinataUtil.isNotEmpty(userActivityInvite)){
+ model.addAttribute("userActivityInviteId",userActivityInvite.getId());
+ }else{
+ model.addAttribute("userActivityInviteId",0);
+ }
+ if(SinataUtil.isNotEmpty(userActivityDiscount1)){
+ model.addAttribute("userActivityDiscount1Id",userActivityDiscount1.getId());
+ }else{
+ model.addAttribute("userActivityDiscount1Id",0);
+ }
+ if(SinataUtil.isNotEmpty(userActivityRedenvelope)){
+ model.addAttribute("userActivityRedenvelopeId",userActivityRedenvelope.getId());
+ }else{
+ model.addAttribute("userActivityRedenvelopeId",0);
+ }
+ return PREFIX + "receiveRecord.html";
+ }
+
+ @RequestMapping(value = "/receiveRecordDetail")
+ @ResponseBody
+ public Object receiveRecordDetail(String createTime,Integer activityId) {
+ String startTimes = null;
+ String endTimes = null;
+ if (SinataUtil.isNotEmpty(createTime)){
+ String[] timeArray = createTime.split(" - ");
+ startTimes = timeArray[0];
+ endTimes = timeArray[1];
+ }else{
+ UserActivity userActivity = userActivityService.selectById(activityId);
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+ startTimes=sdf.format(userActivity.getStartTime());
+ endTimes=sdf.format(userActivity.getEndTime());
+ }
+ Map<String,Object> map = new HashMap<>();
+ Double totalMOney=0d;
+ UserActivityRegistered userActivityRegistered = userActivityRegisteredService.selectOne(new EntityWrapper<UserActivityRegistered>().eq("userActivityId",activityId));
+ UserActivityInvite userActivityInvite = userActivityInviteService.selectOne(new EntityWrapper<UserActivityInvite>().eq("userActivityId",activityId));
+ UserActivityDiscount1 userActivityDiscount1 = userActivityDiscount1Service.selectOne(new EntityWrapper<UserActivityDiscount1>().eq("userActivityId",activityId));
+ UserActivityRedenvelope userActivityRedenvelope = userActivityRedenvelopeService.selectOne(new EntityWrapper<UserActivityRedenvelope>().eq("userActivityId",activityId));
+ if(SinataUtil.isNotEmpty(userActivityRegistered)){
+ Map<String,Object> resultMap = userCouponRecordService.getCouponStatic(startTimes,endTimes,userActivityRegistered.getId(),2);
+ totalMOney+=Double.parseDouble(resultMap.get("money").toString());
+ map.put("userActivityRegisteredMoney",resultMap.get("money"));
+ map.put("userActivityRegisteredNumber",resultMap.get("number"));
+ map.put("userActivityRegisteredUseMoney",resultMap.get("useMoney"));
+ }else{
+ map.put("userActivityRegisteredMoney",0);
+ map.put("userActivityRegisteredNumber",0);
+ map.put("userActivityRegisteredUseMoney",0);
+ }
+ if(SinataUtil.isNotEmpty(userActivityInvite)){
+ Map<String,Object> resultMap = userCouponRecordService.getCouponStatic(startTimes,endTimes,userActivityInvite.getId(),3);
+ totalMOney+=Double.parseDouble(resultMap.get("money").toString());
+ map.put("userActivityInviteMoney",resultMap.get("money"));
+ map.put("userActivityInviteNumber",resultMap.get("number"));
+ map.put("userActivityInviteUseMoney",resultMap.get("useMoney"));
+ }else{
+ map.put("userActivityInviteMoney",0);
+ map.put("userActivityInviteNumber",0);
+ map.put("userActivityInviteUseMoney",0);
+ }
+ if(SinataUtil.isNotEmpty(userActivityDiscount1)){
+ Map<String,Object> resultMap = userCouponRecordService.getDiscountStatic(startTimes,endTimes,userActivityDiscount1.getId());
+ map.put("userActivityDiscount1Money",resultMap.get("money"));
+ map.put("userActivityDiscount1Number",resultMap.get("number"));
+ }else{
+ map.put("userActivityDiscount1Money",0);
+ map.put("userActivityDiscount1Number",0);
+ }
+ if(SinataUtil.isNotEmpty(userActivityRedenvelope)){
+ Map<String,Object> resultMap = userCouponRecordService.getRedStatic(startTimes,endTimes,userActivityRedenvelope.getId());
+ totalMOney+=Double.parseDouble(resultMap.get("money").toString());
+ map.put("userActivityRedenvelopeMoney",resultMap.get("money"));
+ map.put("userActivityRedenvelopeNumber",resultMap.get("number"));
+ map.put("userActivityRedenvelopeUseMoney",resultMap.get("useMoney"));
+ }else{
+ map.put("userActivityRedenvelopeMoney",0);
+ map.put("userActivityRedenvelopeNumber",0);
+ map.put("userActivityRedenvelopeUseMoney",0);
+ }
+ Map<String,Object> resultMap = userCouponRecordService.getRegStatic(startTimes,endTimes,activityId);
+
+ totalMOney+=Double.parseDouble(resultMap.get("money").toString());
+ map.put("totalMOney",totalMOney);
+ return map;
+ }
+
+ /**
+ * 跳转到首页
+ */
+ @RequestMapping("")
+ public String index() {
+ return PREFIX + "userActivity.html";
+ }
+ /**
+ * 跳转添加注册送优惠券页面
+ * @return
+ */
+ @RequestMapping("addRegist")
+ public String addRegist() {
+ return PREFIX + "addRegist.html";
+ }
+ /**
+ * 跳转红包选择页面
+ * @return
+ */
+ @RequestMapping("/sysRedPacketRecord")
+ public String sysRedPacketRecord() {
+ return PREFIX + "sysRedPacketRecord.html";
+ }
+ /**
+ * 跳转到选择优惠券页面
+ * @return
+ */
+ @RequestMapping("/sysCouponRecord")
+ public String sysCouponRecord() {
+ return PREFIX + "sysCouponRecord.html";
+ }
+
+ @RequestMapping("/sysCouponRecord1")
+ public String sysCouponRecord1() {
+ return PREFIX + "sysCouponRecord1.html";
+ }
+ @RequestMapping("/sysCouponRecord2")
+ public String sysCouponRecord2(Model model,Integer type) {
+ model.addAttribute("type",type);
+ return PREFIX + "sysCouponRecord2.html";
+ }
+ /**
+ * 跳转到添加
+ */
+ @RequestMapping("/userActivity_add")
+ public String userActivityAdd() {
+ return PREFIX + "userActivity_add.html";
+ }
+
+ /**
+ * 跳转到修改
+ */
+ @RequestMapping("/userActivity_update/{userActivityId}")
+ public String userActivityUpdate(@PathVariable Integer userActivityId, Model model) {
+ UserActivity userActivity = userActivityService.selectById(userActivityId);
+ model.addAttribute("item",userActivity);
+
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+ model.addAttribute("startTime", sdf.format(userActivity.getStartTime()));
+ model.addAttribute("endTime", sdf.format(userActivity.getEndTime()));
+ UserActivityRegistered userActivityRegistered = userActivityRegisteredService.selectOne(new EntityWrapper<UserActivityRegistered>().eq("userActivityId",userActivity.getId()));
+ model.addAttribute("item1",userActivityRegistered);
+ if(userActivityRegistered!=null){
+ model.addAttribute("item1Coupon",sysCouponRecordService.selectById(userActivityRegistered.getCouponId()));
+ }
+ UserActivityInvite userActivityInvite = userActivityInviteService.selectOne(new EntityWrapper<UserActivityInvite>().eq("userActivityId",userActivity.getId()));
+ model.addAttribute("item2",userActivityInvite);
+ if(userActivityInvite!=null){
+ model.addAttribute("item2Coupon",sysCouponRecordService.selectById(userActivityInvite.getCouponId()));
+ }
+ List<UserActivityBalance> balanceInfoList = userActivityBalanceService.selectList(new EntityWrapper<UserActivityBalance>().eq("userActivityId",userActivity.getId()));
+ model.addAttribute("balanceInfoList",balanceInfoList);
+ model.addAttribute("item4",userActivityDiscount1Service.selectOne(new EntityWrapper<UserActivityDiscount1>().eq("userActivityId",userActivity.getId())));
+ UserActivityRedenvelope userActivityRedenvelope = userActivityRedenvelopeService.selectOne(new EntityWrapper<UserActivityRedenvelope>().eq("userActivityId",userActivity.getId()));
+ model.addAttribute("item5",userActivityRedenvelope);
+ if(userActivityRedenvelope!=null){
+ model.addAttribute("item5Red",sysRedPacketRecordService.selectById(userActivityRedenvelope.getRedEnvelopeId()));
+ }
+ LogObjectHolder.me().set(userActivity);
+ return PREFIX + "userActivity_edit.html";
+ }
+ /**
+ * 获取列表
+ */
+ @RequestMapping(value = "/blanceList")
+ @ResponseBody
+ public Object blanceList(String createTime,Integer activityId) {
+ ShiroUser user = ShiroKit.getUser();
+ String beginTime = null;
+ String endTime = null;
+ if (SinataUtil.isNotEmpty(createTime)){
+ String[] timeArray = createTime.split(" - ");
+ beginTime = timeArray[0];
+ endTime = timeArray[1];
+ }
+ Page<Map<String, Object>> page = new PageFactory<Map<String, Object>>().defaultPage();
+ page.setRecords(userCouponRecordService.getBlanceList(page,beginTime,endTime,activityId));
+ return super.packForBT(page);
+ }
+ /**
+ * 获取列表
+ */
+ @RequestMapping(value = "/list")
+ @ResponseBody
+ public Object list(String createTime,String name,Integer status, Integer offset, Integer limit) {
+ Date startTimes = null;
+ Date endTimes = null;
+ if (SinataUtil.isNotEmpty(createTime)){
+ String[] timeArray = createTime.split(" - ");
+ startTimes = DateUtil.getDate_str3(timeArray[0]+" 00:00:00");
+ endTimes = DateUtil.getDate_str3(timeArray[1]+" 23:59:59");
+ }
+ Integer uid = ShiroKit.getUser().getId();
+ return userActivityService.queryUserActivityList(uid, startTimes, endTimes, name, status, offset, limit);
+ }
+
+ /**
+ *
+ * @param name 活动时间
+ * @param startTime 时间区间
+ * @param registCouponId 注册活动-优惠券id
+ * @param registEnable 注册活动-是否启动(1=不启动，2=启动)
+ * @param registNumber 注册活动-优惠券数量
+ * @param registEffective 注册活动-优惠券有效期
+ * @param inviteCouponId 邀请活动-优惠券id
+ * @param inviteEnable 邀请活动-是否启动(1=不启动，2=启动)
+ * @param inviteNumber 邀请活动-优惠券数量
+ * @param inviteEffective 邀请活动-优惠券有效期
+ * @param balanceEnable 充值活动-是否启动(1=不启动，2=启动)
+ * @param balanceInfo 充值活动-详情
+ * @param discountEnable 折扣活动-是否启动(1=不启动，2=启动)
+ * @param discountSpecial 折扣活动-专车
+ * @param discountTaxi 折扣活动-出租车
+ * @param discountLogistics 折扣活动-小件物流
+ * @param redenvelopeId -红包活动-红包id
+ * @param redenvelopeEnable 红包活动-是否启动(1=不启动，2=启动)
+ * @return
+ */
+ @RequestMapping(value = "/add")
+ @ResponseBody
+ public Object add(String name,String startTime,Integer registCouponId,
+ Integer registEnable,Integer registNumber,Integer registEffective,
+ Integer inviteCouponId,Integer inviteEnable,Integer inviteNumber,Integer inviteEffective,
+ Integer balanceEnable,String balanceInfo,
+ Integer discountEnable,Double discountSpecial,Double discountTaxi,Double discountLogistics,
+ Integer redenvelopeId,Integer redenvelopeEnable, Double registerPrice, Double invitationPrice, Double redPrice) {
+ userActivityService.insertOrUpdate(null,name,startTime, registCouponId,
+ registEnable, registNumber, registEffective,
+ inviteCouponId, inviteEnable, inviteNumber, inviteEffective,
+ balanceEnable, balanceInfo,
+ discountEnable, discountSpecial, discountTaxi, discountLogistics,
+ redenvelopeId, redenvelopeEnable, registerPrice, invitationPrice, redPrice);
+ return SUCCESS_TIP;
+ }
+
+ /**
+ * 删除
+ */
+ @RequestMapping(value = "/delete")
+ @ResponseBody
+ public Object delete(@RequestParam Integer userActivityId) {
+ userActivityService.deleteById(userActivityId);
+ return SUCCESS_TIP;
+ }
+
+ /**
+ *
+ * @param name 活动时间
+ * @param startTime 时间区间
+ * @param registCouponId 注册活动-优惠券id
+ * @param registEnable 注册活动-是否启动(1=不启动，2=启动)
+ * @param registNumber 注册活动-优惠券数量
+ * @param registEffective 注册活动-优惠券有效期
+ * @param inviteCouponId 邀请活动-优惠券id
+ * @param inviteEnable 邀请活动-是否启动(1=不启动，2=启动)
+ * @param inviteNumber 邀请活动-优惠券数量
+ * @param inviteEffective 邀请活动-优惠券有效期
+ * @param balanceEnable 充值活动-是否启动(1=不启动，2=启动)
+ * @param balanceInfo 充值活动-详情
+ * @param discountEnable 折扣活动-是否启动(1=不启动，2=启动)
+ * @param discountSpecial 折扣活动-专车
+ * @param discountTaxi 折扣活动-出租车
+ * @param discountLogistics 折扣活动-小件物流
+ * @param redenvelopeId -红包活动-红包id
+ * @param redenvelopeEnable 红包活动-是否启动(1=不启动，2=启动)
+ * @return
+ */
+ @RequestMapping(value = "/update")
+ @ResponseBody
+ public Object update(Integer id,String name,String startTime,Integer registCouponId,
+ Integer registEnable,Integer registNumber,Integer registEffective,
+ Integer inviteCouponId,Integer inviteEnable,Integer inviteNumber,Integer inviteEffective,
+ Integer balanceEnable,String balanceInfo,
+ Integer discountEnable,Double discountSpecial,Double discountTaxi,Double discountLogistics,
+ Integer redenvelopeId,Integer redenvelopeEnable, Double registerPrice, Double invitationPrice, Double redPrice) {
+ userActivityService.insertOrUpdate(id,name,startTime, registCouponId,
+ registEnable, registNumber, registEffective,
+ inviteCouponId, inviteEnable, inviteNumber, inviteEffective,
+ balanceEnable, balanceInfo,
+ discountEnable, discountSpecial, discountTaxi, discountLogistics,
+ redenvelopeId, redenvelopeEnable, registerPrice, invitationPrice, redPrice);
+ return SUCCESS_TIP;
+ }
+ /**
+ * 修改状态
+ * @param driverActivity
+ * @return
+ */
+ @RequestMapping(value = "/updateStatus")
+ @ResponseBody
+ public Object updateStatus(UserActivity driverActivity) {
+ userActivityService.updateById(driverActivity);
+ return SUCCESS_TIP;
+ }
+ /**
+ * 详情
+ */
+ @RequestMapping(value = "/userActivity_detail/{userActivityId}")
+ public Object detail(@PathVariable("userActivityId") Integer userActivityId,Model model) {
+ UserActivity userActivity = userActivityService.selectById(userActivityId);
+ model.addAttribute("item",userActivity);
+
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+ model.addAttribute("startTime", sdf.format(userActivity.getStartTime()));
+ model.addAttribute("endTime", sdf.format(userActivity.getEndTime()));
+ UserActivityRegistered userActivityRegistered = userActivityRegisteredService.selectOne(new EntityWrapper<UserActivityRegistered>().eq("userActivityId",userActivity.getId()));
+ model.addAttribute("item1",userActivityRegistered);
+ if(userActivityRegistered!=null){
+ model.addAttribute("item1Coupon",sysCouponRecordService.selectById(userActivityRegistered.getCouponId()));
+ }
+ UserActivityInvite userActivityInvite = userActivityInviteService.selectOne(new EntityWrapper<UserActivityInvite>().eq("userActivityId",userActivity.getId()));
+ model.addAttribute("item2",userActivityInvite);
+ if(userActivityInvite!=null){
+ model.addAttribute("item2Coupon",sysCouponRecordService.selectById(userActivityInvite.getCouponId()));
+ }
+ List<UserActivityBalance> balanceInfoList = userActivityBalanceService.selectList(new EntityWrapper<UserActivityBalance>().eq("userActivityId",userActivity.getId()));
+ model.addAttribute("balanceInfoList",balanceInfoList);
+ model.addAttribute("item4",userActivityDiscount1Service.selectOne(new EntityWrapper<UserActivityDiscount1>().eq("userActivityId",userActivity.getId())));
+ UserActivityRedenvelope userActivityRedenvelope = userActivityRedenvelopeService.selectOne(new EntityWrapper<UserActivityRedenvelope>().eq("userActivityId",userActivity.getId()));
+ model.addAttribute("item5",userActivityRedenvelope);
+ if(userActivityRedenvelope!=null){
+ model.addAttribute("item5Red",sysRedPacketRecordService.selectById(userActivityRedenvelope.getRedEnvelopeId()));
+ }
+ return PREFIX + "userActivity_detail.html";
+ }
+
+ /**
+ * 跳转到立即处理页面
+ */
+ @RequestMapping("/userActivity_immediately/{id}")
+ public String userActivityImmediately(@PathVariable Integer id, Model model) {
+ model.addAttribute("id",id);
+ return PREFIX + "userActivity_immediately.html";
+ }
+ /**
+ * 立即处理操作
+ */
+ @RequestMapping(value = "/immediately")
+ @ResponseBody
+ public Object immediately(@RequestParam Integer id,@RequestParam Integer state,@RequestParam String remark) {
+ UserActivity userActivity = userActivityService.selectById(id);
+ if (SinataUtil.isNotEmpty(userActivity)){
+ userActivity.setStatus(state);
+ userActivity.setRemark(remark);
+ userActivityService.updateById(userActivity);
+ }
+ return SUCCESS_TIP;
+ }
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/UserActivityDiscount1Controller.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/UserActivityDiscount1Controller.java
new file mode 100644
index 0000000..de92f23
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/UserActivityDiscount1Controller.java
@@ -0,0 +1,104 @@
+package com.stylefeng.guns.modular.system.controller.general;
+
+import com.stylefeng.guns.core.base.controller.BaseController;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.beans.factory.annotation.Autowired;
+import com.stylefeng.guns.core.log.LogObjectHolder;
+import org.springframework.web.bind.annotation.RequestParam;
+import com.stylefeng.guns.modular.system.model.UserActivityDiscount1;
+import com.stylefeng.guns.modular.system.service.IUserActivityDiscount1Service;
+
+/**
+ * 控制器
+ *
+ * @author fengshuonan
+ * @Date 2020-06-19 14:32:41
+ */
+@Controller
+@RequestMapping("/userActivityDiscount1")
+public class UserActivityDiscount1Controller extends BaseController {
+
+ private String PREFIX = "/system/userActivityDiscount1/";
+
+ @Autowired
+ private IUserActivityDiscount1Service userActivityDiscount1Service;
+
+ /**
+ * 跳转到首页
+ */
+ @RequestMapping("")
+ public String index() {
+ return PREFIX + "userActivityDiscount1.html";
+ }
+
+ /**
+ * 跳转到添加
+ */
+ @RequestMapping("/userActivityDiscount1_add")
+ public String userActivityDiscount1Add() {
+ return PREFIX + "userActivityDiscount1_add.html";
+ }
+
+ /**
+ * 跳转到修改
+ */
+ @RequestMapping("/userActivityDiscount1_update/{userActivityDiscount1Id}")
+ public String userActivityDiscount1Update(@PathVariable Integer userActivityDiscount1Id, Model model) {
+ UserActivityDiscount1 userActivityDiscount1 = userActivityDiscount1Service.selectById(userActivityDiscount1Id);
+ model.addAttribute("item",userActivityDiscount1);
+ LogObjectHolder.me().set(userActivityDiscount1);
+ return PREFIX + "userActivityDiscount1_edit.html";
+ }
+
+ /**
+ * 获取列表
+ */
+ @RequestMapping(value = "/list")
+ @ResponseBody
+ public Object list(String condition) {
+ return userActivityDiscount1Service.selectList(null);
+ }
+
+ /**
+ * 新增
+ */
+ @RequestMapping(value = "/add")
+ @ResponseBody
+ public Object add(UserActivityDiscount1 userActivityDiscount1) {
+ userActivityDiscount1Service.insert(userActivityDiscount1);
+ return SUCCESS_TIP;
+ }
+
+ /**
+ * 删除
+ */
+ @RequestMapping(value = "/delete")
+ @ResponseBody
+ public Object delete(@RequestParam Integer userActivityDiscount1Id) {
+ userActivityDiscount1Service.deleteById(userActivityDiscount1Id);
+ return SUCCESS_TIP;
+ }
+
+ /**
+ * 修改
+ */
+ @RequestMapping(value = "/update")
+ @ResponseBody
+ public Object update(UserActivityDiscount1 userActivityDiscount1) {
+ userActivityDiscount1Service.updateById(userActivityDiscount1);
+ return SUCCESS_TIP;
+ }
+
+ /**
+ * 详情
+ */
+ @RequestMapping(value = "/detail/{userActivityDiscount1Id}")
+ @ResponseBody
+ public Object detail(@PathVariable("userActivityDiscount1Id") Integer userActivityDiscount1Id) {
+ return userActivityDiscount1Service.selectById(userActivityDiscount1Id);
+ }
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/UserActivityDiscount2Controller.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/UserActivityDiscount2Controller.java
new file mode 100644
index 0000000..440bdf1
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/UserActivityDiscount2Controller.java
@@ -0,0 +1,104 @@
+package com.stylefeng.guns.modular.system.controller.general;
+
+import com.stylefeng.guns.core.base.controller.BaseController;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.beans.factory.annotation.Autowired;
+import com.stylefeng.guns.core.log.LogObjectHolder;
+import org.springframework.web.bind.annotation.RequestParam;
+import com.stylefeng.guns.modular.system.model.UserActivityDiscount2;
+import com.stylefeng.guns.modular.system.service.IUserActivityDiscount2Service;
+
+/**
+ * 控制器
+ *
+ * @author fengshuonan
+ * @Date 2020-06-19 14:32:46
+ */
+@Controller
+@RequestMapping("/userActivityDiscount2")
+public class UserActivityDiscount2Controller extends BaseController {
+
+ private String PREFIX = "/system/userActivityDiscount2/";
+
+ @Autowired
+ private IUserActivityDiscount2Service userActivityDiscount2Service;
+
+ /**
+ * 跳转到首页
+ */
+ @RequestMapping("")
+ public String index() {
+ return PREFIX + "userActivityDiscount2.html";
+ }
+
+ /**
+ * 跳转到添加
+ */
+ @RequestMapping("/userActivityDiscount2_add")
+ public String userActivityDiscount2Add() {
+ return PREFIX + "userActivityDiscount2_add.html";
+ }
+
+ /**
+ * 跳转到修改
+ */
+ @RequestMapping("/userActivityDiscount2_update/{userActivityDiscount2Id}")
+ public String userActivityDiscount2Update(@PathVariable Integer userActivityDiscount2Id, Model model) {
+ UserActivityDiscount2 userActivityDiscount2 = userActivityDiscount2Service.selectById(userActivityDiscount2Id);
+ model.addAttribute("item",userActivityDiscount2);
+ LogObjectHolder.me().set(userActivityDiscount2);
+ return PREFIX + "userActivityDiscount2_edit.html";
+ }
+
+ /**
+ * 获取列表
+ */
+ @RequestMapping(value = "/list")
+ @ResponseBody
+ public Object list(String condition) {
+ return userActivityDiscount2Service.selectList(null);
+ }
+
+ /**
+ * 新增
+ */
+ @RequestMapping(value = "/add")
+ @ResponseBody
+ public Object add(UserActivityDiscount2 userActivityDiscount2) {
+ userActivityDiscount2Service.insert(userActivityDiscount2);
+ return SUCCESS_TIP;
+ }
+
+ /**
+ * 删除
+ */
+ @RequestMapping(value = "/delete")
+ @ResponseBody
+ public Object delete(@RequestParam Integer userActivityDiscount2Id) {
+ userActivityDiscount2Service.deleteById(userActivityDiscount2Id);
+ return SUCCESS_TIP;
+ }
+
+ /**
+ * 修改
+ */
+ @RequestMapping(value = "/update")
+ @ResponseBody
+ public Object update(UserActivityDiscount2 userActivityDiscount2) {
+ userActivityDiscount2Service.updateById(userActivityDiscount2);
+ return SUCCESS_TIP;
+ }
+
+ /**
+ * 详情
+ */
+ @RequestMapping(value = "/detail/{userActivityDiscount2Id}")
+ @ResponseBody
+ public Object detail(@PathVariable("userActivityDiscount2Id") Integer userActivityDiscount2Id) {
+ return userActivityDiscount2Service.selectById(userActivityDiscount2Id);
+ }
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/UserActivityInviteController.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/UserActivityInviteController.java
new file mode 100644
index 0000000..337d8d2
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/UserActivityInviteController.java
@@ -0,0 +1,104 @@
+package com.stylefeng.guns.modular.system.controller.general;
+
+import com.stylefeng.guns.core.base.controller.BaseController;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.beans.factory.annotation.Autowired;
+import com.stylefeng.guns.core.log.LogObjectHolder;
+import org.springframework.web.bind.annotation.RequestParam;
+import com.stylefeng.guns.modular.system.model.UserActivityInvite;
+import com.stylefeng.guns.modular.system.service.IUserActivityInviteService;
+
+/**
+ * 控制器
+ *
+ * @author fengshuonan
+ * @Date 2020-06-19 14:32:57
+ */
+@Controller
+@RequestMapping("/userActivityInvite")
+public class UserActivityInviteController extends BaseController {
+
+ private String PREFIX = "/system/userActivityInvite/";
+
+ @Autowired
+ private IUserActivityInviteService userActivityInviteService;
+
+ /**
+ * 跳转到首页
+ */
+ @RequestMapping("")
+ public String index() {
+ return PREFIX + "userActivityInvite.html";
+ }
+
+ /**
+ * 跳转到添加
+ */
+ @RequestMapping("/userActivityInvite_add")
+ public String userActivityInviteAdd() {
+ return PREFIX + "userActivityInvite_add.html";
+ }
+
+ /**
+ * 跳转到修改
+ */
+ @RequestMapping("/userActivityInvite_update/{userActivityInviteId}")
+ public String userActivityInviteUpdate(@PathVariable Integer userActivityInviteId, Model model) {
+ UserActivityInvite userActivityInvite = userActivityInviteService.selectById(userActivityInviteId);
+ model.addAttribute("item",userActivityInvite);
+ LogObjectHolder.me().set(userActivityInvite);
+ return PREFIX + "userActivityInvite_edit.html";
+ }
+
+ /**
+ * 获取列表
+ */
+ @RequestMapping(value = "/list")
+ @ResponseBody
+ public Object list(String condition) {
+ return userActivityInviteService.selectList(null);
+ }
+
+ /**
+ * 新增
+ */
+ @RequestMapping(value = "/add")
+ @ResponseBody
+ public Object add(UserActivityInvite userActivityInvite) {
+ userActivityInviteService.insert(userActivityInvite);
+ return SUCCESS_TIP;
+ }
+
+ /**
+ * 删除
+ */
+ @RequestMapping(value = "/delete")
+ @ResponseBody
+ public Object delete(@RequestParam Integer userActivityInviteId) {
+ userActivityInviteService.deleteById(userActivityInviteId);
+ return SUCCESS_TIP;
+ }
+
+ /**
+ * 修改
+ */
+ @RequestMapping(value = "/update")
+ @ResponseBody
+ public Object update(UserActivityInvite userActivityInvite) {
+ userActivityInviteService.updateById(userActivityInvite);
+ return SUCCESS_TIP;
+ }
+
+ /**
+ * 详情
+ */
+ @RequestMapping(value = "/detail/{userActivityInviteId}")
+ @ResponseBody
+ public Object detail(@PathVariable("userActivityInviteId") Integer userActivityInviteId) {
+ return userActivityInviteService.selectById(userActivityInviteId);
+ }
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/UserActivityRedenvelopeController.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/UserActivityRedenvelopeController.java
new file mode 100644
index 0000000..b7b65ff
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/UserActivityRedenvelopeController.java
@@ -0,0 +1,104 @@
+package com.stylefeng.guns.modular.system.controller.general;
+
+import com.stylefeng.guns.core.base.controller.BaseController;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.beans.factory.annotation.Autowired;
+import com.stylefeng.guns.core.log.LogObjectHolder;
+import org.springframework.web.bind.annotation.RequestParam;
+import com.stylefeng.guns.modular.system.model.UserActivityRedenvelope;
+import com.stylefeng.guns.modular.system.service.IUserActivityRedenvelopeService;
+
+/**
+ * 控制器
+ *
+ * @author fengshuonan
+ * @Date 2020-06-19 14:33:03
+ */
+@Controller
+@RequestMapping("/userActivityRedenvelope")
+public class UserActivityRedenvelopeController extends BaseController {
+
+ private String PREFIX = "/system/userActivityRedenvelope/";
+
+ @Autowired
+ private IUserActivityRedenvelopeService userActivityRedenvelopeService;
+
+ /**
+ * 跳转到首页
+ */
+ @RequestMapping("")
+ public String index() {
+ return PREFIX + "userActivityRedenvelope.html";
+ }
+
+ /**
+ * 跳转到添加
+ */
+ @RequestMapping("/userActivityRedenvelope_add")
+ public String userActivityRedenvelopeAdd() {
+ return PREFIX + "userActivityRedenvelope_add.html";
+ }
+
+ /**
+ * 跳转到修改
+ */
+ @RequestMapping("/userActivityRedenvelope_update/{userActivityRedenvelopeId}")
+ public String userActivityRedenvelopeUpdate(@PathVariable Integer userActivityRedenvelopeId, Model model) {
+ UserActivityRedenvelope userActivityRedenvelope = userActivityRedenvelopeService.selectById(userActivityRedenvelopeId);
+ model.addAttribute("item",userActivityRedenvelope);
+ LogObjectHolder.me().set(userActivityRedenvelope);
+ return PREFIX + "userActivityRedenvelope_edit.html";
+ }
+
+ /**
+ * 获取列表
+ */
+ @RequestMapping(value = "/list")
+ @ResponseBody
+ public Object list(String condition) {
+ return userActivityRedenvelopeService.selectList(null);
+ }
+
+ /**
+ * 新增
+ */
+ @RequestMapping(value = "/add")
+ @ResponseBody
+ public Object add(UserActivityRedenvelope userActivityRedenvelope) {
+ userActivityRedenvelopeService.insert(userActivityRedenvelope);
+ return SUCCESS_TIP;
+ }
+
+ /**
+ * 删除
+ */
+ @RequestMapping(value = "/delete")
+ @ResponseBody
+ public Object delete(@RequestParam Integer userActivityRedenvelopeId) {
+ userActivityRedenvelopeService.deleteById(userActivityRedenvelopeId);
+ return SUCCESS_TIP;
+ }
+
+ /**
+ * 修改
+ */
+ @RequestMapping(value = "/update")
+ @ResponseBody
+ public Object update(UserActivityRedenvelope userActivityRedenvelope) {
+ userActivityRedenvelopeService.updateById(userActivityRedenvelope);
+ return SUCCESS_TIP;
+ }
+
+ /**
+ * 详情
+ */
+ @RequestMapping(value = "/detail/{userActivityRedenvelopeId}")
+ @ResponseBody
+ public Object detail(@PathVariable("userActivityRedenvelopeId") Integer userActivityRedenvelopeId) {
+ return userActivityRedenvelopeService.selectById(userActivityRedenvelopeId);
+ }
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/UserActivityRegisteredController.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/UserActivityRegisteredController.java
new file mode 100644
index 0000000..763d642
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/UserActivityRegisteredController.java
@@ -0,0 +1,104 @@
+package com.stylefeng.guns.modular.system.controller.general;
+
+import com.stylefeng.guns.core.base.controller.BaseController;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.beans.factory.annotation.Autowired;
+import com.stylefeng.guns.core.log.LogObjectHolder;
+import org.springframework.web.bind.annotation.RequestParam;
+import com.stylefeng.guns.modular.system.model.UserActivityRegistered;
+import com.stylefeng.guns.modular.system.service.IUserActivityRegisteredService;
+
+/**
+ * 控制器
+ *
+ * @author fengshuonan
+ * @Date 2020-06-19 14:33:09
+ */
+@Controller
+@RequestMapping("/userActivityRegistered")
+public class UserActivityRegisteredController extends BaseController {
+
+ private String PREFIX = "/system/userActivityRegistered/";
+
+ @Autowired
+ private IUserActivityRegisteredService userActivityRegisteredService;
+
+ /**
+ * 跳转到首页
+ */
+ @RequestMapping("")
+ public String index() {
+ return PREFIX + "userActivityRegistered.html";
+ }
+
+ /**
+ * 跳转到添加
+ */
+ @RequestMapping("/userActivityRegistered_add")
+ public String userActivityRegisteredAdd() {
+ return PREFIX + "userActivityRegistered_add.html";
+ }
+
+ /**
+ * 跳转到修改
+ */
+ @RequestMapping("/userActivityRegistered_update/{userActivityRegisteredId}")
+ public String userActivityRegisteredUpdate(@PathVariable Integer userActivityRegisteredId, Model model) {
+ UserActivityRegistered userActivityRegistered = userActivityRegisteredService.selectById(userActivityRegisteredId);
+ model.addAttribute("item",userActivityRegistered);
+ LogObjectHolder.me().set(userActivityRegistered);
+ return PREFIX + "userActivityRegistered_edit.html";
+ }
+
+ /**
+ * 获取列表
+ */
+ @RequestMapping(value = "/list")
+ @ResponseBody
+ public Object list(String condition) {
+ return userActivityRegisteredService.selectList(null);
+ }
+
+ /**
+ * 新增
+ */
+ @RequestMapping(value = "/add")
+ @ResponseBody
+ public Object add(UserActivityRegistered userActivityRegistered) {
+ userActivityRegisteredService.insert(userActivityRegistered);
+ return SUCCESS_TIP;
+ }
+
+ /**
+ * 删除
+ */
+ @RequestMapping(value = "/delete")
+ @ResponseBody
+ public Object delete(@RequestParam Integer userActivityRegisteredId) {
+ userActivityRegisteredService.deleteById(userActivityRegisteredId);
+ return SUCCESS_TIP;
+ }
+
+ /**
+ * 修改
+ */
+ @RequestMapping(value = "/update")
+ @ResponseBody
+ public Object update(UserActivityRegistered userActivityRegistered) {
+ userActivityRegisteredService.updateById(userActivityRegistered);
+ return SUCCESS_TIP;
+ }
+
+ /**
+ * 详情
+ */
+ @RequestMapping(value = "/detail/{userActivityRegisteredId}")
+ @ResponseBody
+ public Object detail(@PathVariable("userActivityRegisteredId") Integer userActivityRegisteredId) {
+ return userActivityRegisteredService.selectById(userActivityRegisteredId);
+ }
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/UserCouponRecordController.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/UserCouponRecordController.java
new file mode 100644
index 0000000..f1087c3
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/UserCouponRecordController.java
@@ -0,0 +1,121 @@
+package com.stylefeng.guns.modular.system.controller.general;
+
+import com.baomidou.mybatisplus.plugins.Page;
+import com.stylefeng.guns.core.base.controller.BaseController;
+import com.stylefeng.guns.core.common.constant.factory.PageFactory;
+import com.stylefeng.guns.core.shiro.ShiroKit;
+import com.stylefeng.guns.core.util.SinataUtil;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.beans.factory.annotation.Autowired;
+import com.stylefeng.guns.core.log.LogObjectHolder;
+import org.springframework.web.bind.annotation.RequestParam;
+import com.stylefeng.guns.modular.system.model.UserCouponRecord;
+import com.stylefeng.guns.modular.system.service.IUserCouponRecordService;
+
+import java.util.Map;
+
+/**
+ * 控制器
+ *
+ * @author fengshuonan
+ * @Date 2020-06-17 09:15:18
+ */
+@Controller
+@RequestMapping("/userCouponRecord")
+public class UserCouponRecordController extends BaseController {
+
+ private String PREFIX = "/system/userCouponRecord/";
+
+ @Autowired
+ private IUserCouponRecordService userCouponRecordService;
+
+ /**
+ * 跳转到首页
+ */
+ @RequestMapping("")
+ public String index( Model model,Integer couponActivityId,Integer activityType) {
+ model.addAttribute("activityType",activityType);
+ model.addAttribute("couponActivityId",couponActivityId);
+ return PREFIX + "userCouponRecord.html";
+ }
+
+ /**
+ * 跳转到添加
+ */
+ @RequestMapping("/userCouponRecord_add")
+ public String userCouponRecordAdd() {
+ return PREFIX + "userCouponRecord_add.html";
+ }
+
+ /**
+ * 跳转到修改
+ */
+ @RequestMapping("/userCouponRecord_update/{userCouponRecordId}")
+ public String userCouponRecordUpdate(@PathVariable Integer userCouponRecordId, Model model) {
+ UserCouponRecord userCouponRecord = userCouponRecordService.selectById(userCouponRecordId);
+ model.addAttribute("item",userCouponRecord);
+ LogObjectHolder.me().set(userCouponRecord);
+ return PREFIX + "userCouponRecord_edit.html";
+ }
+
+ /**
+ * 获取列表
+ */
+ @RequestMapping(value = "/list")
+ @ResponseBody
+ public Object list(String createTime,String userName,String userPhone,Integer couponActivityId,Integer activityType,Integer state) {
+ String beginTime = null;
+ String endTime = null;
+ if (SinataUtil.isNotEmpty(createTime)){
+ String[] timeArray = createTime.split(" - ");
+ beginTime = timeArray[0];
+ endTime = timeArray[1];
+ }
+ Page<Map<String, Object>> page = new PageFactory<Map<String, Object>>().defaultPage();
+ page.setRecords(userCouponRecordService.getList(page,beginTime,endTime,userName,userPhone,couponActivityId,activityType,state));
+ return super.packForBT(page);
+ }
+
+ /**
+ * 新增
+ */
+ @RequestMapping(value = "/add")
+ @ResponseBody
+ public Object add(UserCouponRecord userCouponRecord) {
+ userCouponRecordService.insert(userCouponRecord);
+ return SUCCESS_TIP;
+ }
+
+ /**
+ * 删除
+ */
+ @RequestMapping(value = "/delete")
+ @ResponseBody
+ public Object delete(@RequestParam Integer userCouponRecordId) {
+ userCouponRecordService.deleteById(userCouponRecordId);
+ return SUCCESS_TIP;
+ }
+
+ /**
+ * 修改
+ */
+ @RequestMapping(value = "/update")
+ @ResponseBody
+ public Object update(UserCouponRecord userCouponRecord) {
+ userCouponRecordService.updateById(userCouponRecord);
+ return SUCCESS_TIP;
+ }
+
+ /**
+ * 详情
+ */
+ @RequestMapping(value = "/detail/{userCouponRecordId}")
+ @ResponseBody
+ public Object detail(@PathVariable("userCouponRecordId") Integer userCouponRecordId) {
+ return userCouponRecordService.selectById(userCouponRecordId);
+ }
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TDispatchController.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TDispatchController.java
new file mode 100644
index 0000000..9d79d0d
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TDispatchController.java
@@ -0,0 +1,233 @@
+package com.stylefeng.guns.modular.system.controller.specialTrain;
+
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.baomidou.mybatisplus.plugins.Page;
+import com.stylefeng.guns.core.base.controller.BaseController;
+import com.stylefeng.guns.core.base.tips.ErrorTip;
+import com.stylefeng.guns.core.common.constant.factory.PageFactory;
+import com.stylefeng.guns.core.shiro.ShiroKit;
+import com.stylefeng.guns.core.util.SinataUtil;
+import com.stylefeng.guns.modular.system.model.TCompany;
+import com.stylefeng.guns.modular.system.service.ITCompanyService;
+import com.stylefeng.guns.modular.system.service.IUserService;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.beans.factory.annotation.Autowired;
+import com.stylefeng.guns.core.log.LogObjectHolder;
+import org.springframework.web.bind.annotation.RequestParam;
+import com.stylefeng.guns.modular.system.model.TDispatch;
+import com.stylefeng.guns.modular.system.service.ITDispatchService;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 调度管理控制器
+ *
+ * @author fengshuonan
+ * @Date 2020-09-01 16:00:16
+ */
+@Controller
+@RequestMapping("/tDispatch")
+public class TDispatchController extends BaseController {
+
+ private String PREFIX = "/system/tDispatch/";
+
+ @Autowired
+ private ITDispatchService tDispatchService;
+
+ @Autowired
+ private ITCompanyService tCompanyService;
+
+ @Autowired
+ private IUserService userService;
+
+ /**
+ * 跳转到调度管理首页
+ */
+ @RequestMapping("")
+ public String index() {
+ return PREFIX + "tDispatch.html";
+ }
+
+ /**
+ * 跳转到添加调度管理
+ */
+ @RequestMapping("/tDispatch_add")
+ public String tDispatchAdd(Model model) {
+ model.addAttribute("roleType",ShiroKit.getUser().getRoleType());
+
+ List<TCompany> companyList = tCompanyService.selectList(new EntityWrapper<TCompany>().eq("type", 2)
+ .eq("isCross", 1)
+ .last(" and state != 1 and FIND_IN_SET(flag,'1,2')"));
+ model.addAttribute("companyList",companyList);
+
+ if (2 == ShiroKit.getUser().getRoleType()){
+ List<TCompany> franchiseeList = tCompanyService.selectList(new EntityWrapper<TCompany>().eq("type", 3)
+ .eq("superiorId",ShiroKit.getUser().getObjectId()));
+ model.addAttribute("franchiseeList",franchiseeList);
+ }else{
+ model.addAttribute("franchiseeList",null);
+ }
+ return PREFIX + "tDispatch_add.html";
+ }
+
+ /**
+ * 根据分公司ID获取加盟商
+ * @param oneId
+ * @return
+ */
+ @RequestMapping(value = "/companyChange")
+ @ResponseBody
+ public Object companyChange(@RequestParam Integer oneId) {
+ List<TCompany> list = new ArrayList<>();
+ if (SinataUtil.isNotEmpty(oneId)){
+ list = tCompanyService.selectList(new EntityWrapper<TCompany>()
+ .eq("type", 3)
+ .eq("isCross", 1)
+ .eq("superiorId", oneId)
+ .last(" and state != 1 and FIND_IN_SET(flag,'1,2')"));
+ }
+ return list;
+ }
+
+ /**
+ * 跳转到修改调度管理
+ */
+ @RequestMapping("/tDispatch_update/{tDispatchId}")
+ public String tDispatchUpdate(@PathVariable Integer tDispatchId, Model model) {
+ TDispatch tDispatch = tDispatchService.selectById(tDispatchId);
+ model.addAttribute("item",tDispatch);
+ LogObjectHolder.me().set(tDispatch);
+
+ Integer roleType = ShiroKit.getUser().getRoleType();
+ model.addAttribute("roleType",roleType);
+ if (1 == roleType){
+ List<TCompany> companyList = tCompanyService.selectList(new EntityWrapper<TCompany>().eq("type", 2)
+ .eq("isCross", 1)
+ .last(" and state != 1 and FIND_IN_SET(flag,'1,2')"));
+ model.addAttribute("companyList",companyList);
+
+ List<TCompany> franchiseeList = tCompanyService.selectList(new EntityWrapper<TCompany>().eq("type", 3)
+ .eq("superiorId",tDispatch.getCompanyId())
+ .eq("isCross", 1)
+ .last(" and state != 1 and FIND_IN_SET(flag,'1,2')"));
+ model.addAttribute("franchiseeList",franchiseeList);
+ }else if (2 == roleType){
+ List<TCompany> franchiseeList = tCompanyService.selectList(new EntityWrapper<TCompany>().eq("type", 3)
+ .eq("superiorId",ShiroKit.getUser().getObjectId())
+ .eq("isCross", 1)
+ .last(" and state != 1 and FIND_IN_SET(flag,'1,2')"));
+ model.addAttribute("franchiseeList",franchiseeList);
+ }
+ return PREFIX + "tDispatch_edit.html";
+ }
+
+ /**
+ * 获取调度管理列表
+ */
+ @RequestMapping(value = "/list")
+ @ResponseBody
+ public Object list(String insertTime,String name,String companyName,String franchiseeName,String account,Integer state) {
+ String beginTime = null;
+ String endTime = null;
+ if (SinataUtil.isNotEmpty(insertTime)){
+ String[] timeArray = insertTime.split(" - ");
+ beginTime = timeArray[0];
+ endTime = timeArray[1];
+ }
+ Page<Map<String, Object>> page = new PageFactory<Map<String, Object>>().defaultPage();
+ page.setRecords(tDispatchService.getDispatchList(page,ShiroKit.getUser().getRoleType(),ShiroKit.getUser().getObjectId(),beginTime,endTime,name,companyName,franchiseeName,account,state));
+ return super.packForBT(page);
+ }
+
+ /**
+ * 新增调度管理
+ */
+ @RequestMapping(value = "/add")
+ @ResponseBody
+ public Object add(TDispatch tDispatch) {
+ //判断账号是否存在
+ int count = tDispatchService.selectCount(new EntityWrapper<TDispatch>().eq("account",tDispatch.getAccount()).last(" and FIND_IN_SET(state,'1,2')"));
+ if (count > 0){
+ return new ErrorTip(500,"账号已存在,请重新输入");
+ }
+ Integer roleType = ShiroKit.getUser().getRoleType();
+ Integer objectId = ShiroKit.getUser().getObjectId();
+ if (2 == roleType){
+ tDispatch.setCompanyId(objectId);
+ }else if (3 == roleType){
+ TCompany company = tCompanyService.selectById(objectId);
+ tDispatch.setCompanyId(company.getSuperiorId());
+ tDispatch.setFranchiseeId(objectId);
+ }
+ tDispatch.setInsertTime(new Date());
+ tDispatch.setInsertUserId(ShiroKit.getUser().getId());
+ tDispatch.setInsertUserRole(roleType);
+ tDispatch.setState(1);
+ if(tDispatch.getCompanyId() == null){
+ Integer objectId1 = userService.selectById(ShiroKit.getUser().getId()).getObjectId();
+ tDispatch.setCompanyId(objectId1);
+ }
+ tDispatch.setPassword(ShiroKit.md5(tDispatch.getPassword(), "WL:x9#"));
+ tDispatchService.insert(tDispatch);
+ return SUCCESS_TIP;
+ }
+
+ /**
+ * 删除调度管理
+ * @param tDispatchId
+ * @param optType 1=删除 2=冻结 3=解冻
+ * @return
+ */
+ @RequestMapping(value = "/opt")
+ @ResponseBody
+ public Object delete(@RequestParam Integer tDispatchId,@RequestParam Integer optType) {
+ TDispatch dispatch = tDispatchService.selectById(tDispatchId);
+ if (1 == optType){
+ dispatch.setState(3);
+ }else if (2 == optType){
+ dispatch.setState(2);
+ }else if (3 == optType){
+ dispatch.setState(1);
+ }
+ tDispatchService.updateById(dispatch);
+ return SUCCESS_TIP;
+ }
+
+ /**
+ * 修改调度管理
+ */
+ @RequestMapping(value = "/update")
+ @ResponseBody
+ public Object update(TDispatch tDispatch) {
+ TDispatch obj = tDispatchService.selectById(tDispatch.getId());
+ if (!obj.getAccount().equals(tDispatch.getAccount())){
+ //判断账号是否存在
+ int count = tDispatchService.selectCount(new EntityWrapper<TDispatch>().eq("account",tDispatch.getAccount()).last(" and FIND_IN_SET(state,'1,2')"));
+ if (count > 0){
+ return new ErrorTip(500,"账号已存在,请重新输入");
+ }
+ }
+ Integer roleType = ShiroKit.getUser().getRoleType();
+ Integer objectId = ShiroKit.getUser().getObjectId();
+ if (2 == roleType){
+ tDispatch.setCompanyId(objectId);
+ }else if (3 == roleType){
+ TCompany company = tCompanyService.selectById(objectId);
+ tDispatch.setCompanyId(company.getSuperiorId());
+ tDispatch.setFranchiseeId(objectId);
+ }
+ if (SinataUtil.isNotEmpty(tDispatch.getPassword())){
+ tDispatch.setPassword(ShiroKit.md5(tDispatch.getPassword(), "WL:x9#"));
+ }
+ tDispatchService.updateById(tDispatch);
+ return SUCCESS_TIP;
+ }
+
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TIntegralGoodsController.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TIntegralGoodsController.java
new file mode 100644
index 0000000..707aebc
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TIntegralGoodsController.java
@@ -0,0 +1,131 @@
+package com.stylefeng.guns.modular.system.controller.specialTrain;
+
+import com.baomidou.mybatisplus.plugins.Page;
+import com.stylefeng.guns.core.base.controller.BaseController;
+import com.stylefeng.guns.core.common.constant.factory.PageFactory;
+import com.stylefeng.guns.core.shiro.ShiroKit;
+import com.stylefeng.guns.core.util.SinataUtil;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.beans.factory.annotation.Autowired;
+import com.stylefeng.guns.core.log.LogObjectHolder;
+import org.springframework.web.bind.annotation.RequestParam;
+import com.stylefeng.guns.modular.system.model.TIntegralGoods;
+import com.stylefeng.guns.modular.system.service.ITIntegralGoodsService;
+
+import java.util.Date;
+import java.util.Map;
+
+/**
+ * 商品管理控制器
+ *
+ * @author fengshuonan
+ * @Date 2020-09-02 11:28:36
+ */
+@Controller
+@RequestMapping("/tIntegralGoods")
+public class TIntegralGoodsController extends BaseController {
+
+ private String PREFIX = "/system/tIntegralGoods/";
+
+ @Autowired
+ private ITIntegralGoodsService tIntegralGoodsService;
+
+ /**
+ * 跳转到商品管理首页
+ */
+ @RequestMapping("")
+ public String index() {
+ return PREFIX + "tIntegralGoods.html";
+ }
+
+ /**
+ * 跳转到添加商品管理
+ */
+ @RequestMapping("/tIntegralGoods_add")
+ public String tIntegralGoodsAdd() {
+ return PREFIX + "tIntegralGoods_add.html";
+ }
+
+ /**
+ * 跳转到修改商品管理
+ */
+ @RequestMapping("/tIntegralGoods_update/{tIntegralGoodsId}")
+ public String tIntegralGoodsUpdate(@PathVariable Integer tIntegralGoodsId, Model model) {
+ TIntegralGoods tIntegralGoods = tIntegralGoodsService.selectById(tIntegralGoodsId);
+ model.addAttribute("item",tIntegralGoods);
+ LogObjectHolder.me().set(tIntegralGoods);
+ return PREFIX + "tIntegralGoods_edit.html";
+ }
+
+ /**
+ * 获取商品管理列表
+ */
+ @RequestMapping(value = "/list")
+ @ResponseBody
+ public Object list(String insertTime,String name,Integer state) {
+ String beginTime = null;
+ String endTime = null;
+ if (SinataUtil.isNotEmpty(insertTime)){
+ String[] timeArray = insertTime.split(" - ");
+ beginTime = timeArray[0];
+ endTime = timeArray[1];
+ }
+ Page<Map<String, Object>> page = new PageFactory<Map<String, Object>>().defaultPage();
+ if (ShiroKit.getUser().getRoleType() != 1){
+ page.setRecords(null);
+ }else{
+ page.setRecords(tIntegralGoodsService.getIntegralGoodsList(page,beginTime,endTime,name,state));
+ }
+ return super.packForBT(page);
+ }
+
+ /**
+ * 新增商品管理
+ */
+ @RequestMapping(value = "/add")
+ @ResponseBody
+ public Object add(TIntegralGoods tIntegralGoods) {
+ tIntegralGoods.setInsertTime(new Date());
+ tIntegralGoods.setInsertUserId(ShiroKit.getUser().getId());
+ tIntegralGoods.setInsertUserRole(ShiroKit.getUser().getRoleType());
+ tIntegralGoods.setState(1);
+ tIntegralGoodsService.insert(tIntegralGoods);
+ return SUCCESS_TIP;
+ }
+
+ /**
+ * c操作商品
+ * @param tIntegralGoodsId
+ * @param optType 1=上架 2=下架 3=删除
+ * @return
+ */
+ @RequestMapping(value = "/opt")
+ @ResponseBody
+ public Object delete(@RequestParam Integer tIntegralGoodsId,@RequestParam Integer optType) {
+ TIntegralGoods tIntegralGoods = tIntegralGoodsService.selectById(tIntegralGoodsId);
+ if (1 == optType){
+ tIntegralGoods.setState(1);
+ }else if (2 == optType){
+ tIntegralGoods.setState(2);
+ }else if (3 == optType){
+ tIntegralGoods.setState(3);
+ }
+ tIntegralGoodsService.updateById(tIntegralGoods);
+ return SUCCESS_TIP;
+ }
+
+ /**
+ * 修改商品管理
+ */
+ @RequestMapping(value = "/update")
+ @ResponseBody
+ public Object update(TIntegralGoods tIntegralGoods) {
+ tIntegralGoodsService.updateById(tIntegralGoods);
+ return SUCCESS_TIP;
+ }
+
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TIntegralOrderController.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TIntegralOrderController.java
new file mode 100644
index 0000000..6259cfc
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TIntegralOrderController.java
@@ -0,0 +1,109 @@
+package com.stylefeng.guns.modular.system.controller.specialTrain;
+
+import com.baomidou.mybatisplus.plugins.Page;
+import com.stylefeng.guns.core.base.controller.BaseController;
+import com.stylefeng.guns.core.common.constant.factory.PageFactory;
+import com.stylefeng.guns.core.shiro.ShiroKit;
+import com.stylefeng.guns.core.util.SinataUtil;
+import com.stylefeng.guns.modular.system.model.TOrderCharter;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.beans.factory.annotation.Autowired;
+import com.stylefeng.guns.core.log.LogObjectHolder;
+import org.springframework.web.bind.annotation.RequestParam;
+import com.stylefeng.guns.modular.system.model.TIntegralOrder;
+import com.stylefeng.guns.modular.system.service.ITIntegralOrderService;
+
+import java.util.Map;
+
+/**
+ * 积分兑换订单控制器
+ *
+ * @author fengshuonan
+ * @Date 2020-09-02 15:22:24
+ */
+@Controller
+@RequestMapping("/tIntegralOrder")
+public class TIntegralOrderController extends BaseController {
+
+ private String PREFIX = "/system/tIntegralOrder/";
+
+ @Autowired
+ private ITIntegralOrderService tIntegralOrderService;
+
+ /**
+ * 跳转到积分兑换订单首页
+ */
+ @RequestMapping("")
+ public String index() {
+ return PREFIX + "tIntegralOrder.html";
+ }
+
+ /**
+ * 跳转到查看详情
+ */
+ @RequestMapping("/lookDetail/{id}")
+ public String lookDetail(@PathVariable Integer id, Model model) {
+ TIntegralOrder tIntegralOrder = tIntegralOrderService.selectById(id);
+ model.addAttribute("str",tIntegralOrder.getRemark());
+ return "/system/tComplaint/lookDetail.html";
+ }
+
+ /**
+ * 跳转至立即处理页面
+ */
+ @RequestMapping("/tIntegralOrder_immediately/{tIntegralOrderId}")
+ public String tIntegralOrder_immediately(@PathVariable Integer tIntegralOrderId, Model model) {
+ model.addAttribute("id",tIntegralOrderId);
+ return PREFIX + "tIntegralOrder_immediately.html";
+ }
+
+ /**
+ * 获取积分兑换订单列表
+ */
+ @RequestMapping(value = "/list")
+ @ResponseBody
+ public Object list(String insertTime,String userName,String goodsName,String consigneeName,String consigneePhone,Integer state) {
+ String beginTime = null;
+ String endTime = null;
+ if (SinataUtil.isNotEmpty(insertTime)){
+ String[] timeArray = insertTime.split(" - ");
+ beginTime = timeArray[0];
+ endTime = timeArray[1];
+ }
+ Page<Map<String, Object>> page = new PageFactory<Map<String, Object>>().defaultPage();
+ if (ShiroKit.getUser().getRoleType() != 1){
+ page.setRecords(null);
+ }else{
+ page.setRecords(tIntegralOrderService.getIntegralOrderList(page,beginTime,endTime,userName,goodsName,consigneeName,consigneePhone,state));
+ }
+ return super.packForBT(page);
+ }
+
+ /**
+ * 立即处理
+ */
+ @RequestMapping(value = "/immediately")
+ @ResponseBody
+ public Object immediately(TIntegralOrder tIntegralOrder) {
+ tIntegralOrder.setState(2);
+ tIntegralOrderService.updateById(tIntegralOrder);
+ return SUCCESS_TIP;
+ }
+
+ /**
+ * 删除积分兑换订单
+ */
+ @RequestMapping(value = "/delete")
+ @ResponseBody
+ public Object delete(@RequestParam Integer tIntegralOrderId) {
+ TIntegralOrder tIntegralOrder = tIntegralOrderService.selectById(tIntegralOrderId);
+ tIntegralOrder.setState(3);
+ tIntegralOrderService.updateById(tIntegralOrder);
+ return SUCCESS_TIP;
+ }
+
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TLineController.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TLineController.java
new file mode 100644
index 0000000..335e4bd
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TLineController.java
@@ -0,0 +1,378 @@
+package com.stylefeng.guns.modular.system.controller.specialTrain;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.baomidou.mybatisplus.plugins.Page;
+import com.stylefeng.guns.core.base.controller.BaseController;
+import com.stylefeng.guns.core.common.constant.factory.PageFactory;
+import com.stylefeng.guns.core.shiro.ShiroKit;
+import com.stylefeng.guns.core.util.SinataUtil;
+import com.stylefeng.guns.modular.system.model.*;
+import com.stylefeng.guns.modular.system.service.*;
+import com.stylefeng.guns.modular.system.util.ResultUtil;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.beans.factory.annotation.Autowired;
+import com.stylefeng.guns.core.log.LogObjectHolder;
+import org.springframework.web.bind.annotation.RequestParam;
+
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 跨城线路管理控制器
+ *
+ * @author fengshuonan
+ * @Date 2020-09-15 16:17:29
+ */
+@Controller
+@RequestMapping("/tLine")
+public class TLineController extends BaseController {
+
+ private String PREFIX = "/system/tLine/";
+
+ @Autowired
+ private ITLineService tLineService;
+
+ @Autowired
+ private ITSiteService itSiteService;
+
+ @Autowired
+ private ITServerCarmodelService itServerCarmodelService;
+
+ @Autowired
+ private ITLineSiteService itLineSiteService;
+
+ @Autowired
+ private ITLinePriceService itLinePriceService;
+
+ @Autowired
+ private ITLineShiftService itLineShiftService;
+
+ @Autowired
+ private ITCompanyService itCompanyService;
+
+ @Autowired
+ private ITLineCompanyService itLineCompanyService;
+
+ /**
+ * 跳转到跨城站点管理首页
+ */
+ @RequestMapping("")
+ public String index() {
+ return PREFIX + "tLine.html";
+ }
+
+ /**
+ * 跳转到添加跨城站点管理
+ */
+ @RequestMapping("/tLine_add")
+ public String tLineAdd(Model model) {
+ //站点
+ List<TSite> siteList = itSiteService.selectList(new EntityWrapper<TSite>().eq("state", 1));
+ model.addAttribute("siteList",siteList);
+ //跨城车型
+ List<TServerCarmodel> carmodelList = itServerCarmodelService.selectList(new EntityWrapper<TServerCarmodel>().eq("type", 2).eq("state", 1));
+ model.addAttribute("carmodelList",carmodelList);
+ return PREFIX + "tLine_add.html";
+ }
+
+ /**
+ * 分配企业页面
+ */
+ @RequestMapping("/tLine_addCompany/{tLineId}")
+ public String tLine_addCompany(@PathVariable Integer tLineId,Model model) {
+ TLine tLine = tLineService.selectById(tLineId);
+ model.addAttribute("tLine",tLine);
+ //查询所有企业
+ List<TCompany> companyList = itCompanyService.selectList(new EntityWrapper<TCompany>().last(" where not FIND_IN_SET(state,'1') and not FIND_IN_SET(flag,'3')"));
+ model.addAttribute("companyList",companyList);
+ //查询已分配企业
+ List<Map<String, Object>> lineCompanyList = tLineService.getLineCompanyList(tLineId);
+ model.addAttribute("lineCompanyList",lineCompanyList);
+ return PREFIX + "tLine_addCompany.html";
+ }
+
+ /**
+ * 跳转到修改跨城站点管理
+ */
+ @RequestMapping("/tLine_update/{tLineId}")
+ public String tLineUpdate(@PathVariable Integer tLineId, Model model) {
+ TLine tLine = tLineService.selectById(tLineId);
+ model.addAttribute("item",tLine);
+ LogObjectHolder.me().set(tLine);
+
+ //查找站点起点+终点
+ TLineSite start = itLineSiteService.selectOne(new EntityWrapper<TLineSite>().eq("lineId", tLineId).eq("type", 1));
+ model.addAttribute("start",start);
+ TLineSite end = itLineSiteService.selectOne(new EntityWrapper<TLineSite>().eq("lineId", tLineId).eq("type", 2));
+ model.addAttribute("end",end);
+ //站点
+ List<TSite> siteList = itSiteService.selectList(new EntityWrapper<TSite>().eq("state", 1));
+ model.addAttribute("siteList",siteList);
+ //跨城车型
+ List<TServerCarmodel> carmodelList = itServerCarmodelService.selectList(new EntityWrapper<TServerCarmodel>().eq("type", 2).eq("state", 1));
+ model.addAttribute("carmodelList",carmodelList);
+ //查询所有站点
+ List<Map<String, Object>> linePriceList = tLineService.getLinePriceList(tLineId);
+ model.addAttribute("linePriceList",linePriceList);
+ //查询所有班次
+ List<TLineShift> lineShiftList = itLineShiftService.selectList(new EntityWrapper<TLineShift>().eq("lineId", tLineId).last(" and not FIND_IN_SET(state,'3')"));
+ model.addAttribute("lineShiftList",lineShiftList);
+ return PREFIX + "tLine_edit.html";
+ }
+
+ /**
+ * 获取跨城站点管理列表
+ */
+ @RequestMapping(value = "/list")
+ @ResponseBody
+ public Object list(String insertTime,String name,String insertUser,String modelStr,Integer state) {
+ String beginTime = null;
+ String endTime = null;
+ if (SinataUtil.isNotEmpty(insertTime)){
+ String[] timeArray = insertTime.split(" - ");
+ beginTime = timeArray[0];
+ endTime = timeArray[1];
+ }
+ Page<Map<String, Object>> page = new PageFactory<Map<String, Object>>().defaultPage();
+ if (ShiroKit.getUser().getRoleType() != 1){
+ page.setRecords(null);
+ }else{
+ page.setRecords(tLineService.getLineList(page,beginTime,endTime,name,insertUser,modelStr,state));
+ }
+ return super.packForBT(page);
+ }
+
+ /**
+ * 新增跨城站点管理
+ */
+ @RequestMapping(value = "/add")
+ @ResponseBody
+ public ResultUtil add(TLine tLine,Integer startSiteId,Integer endSiteId,@RequestParam String subArr,@RequestParam String shuArr) {
+ String name = tLine.getName();
+ name = name.replaceAll("& lt;", "<");
+ name = name.replaceAll("& gt;", ">");
+ name = name.replaceAll("& #40;", "(");
+ name = name.replaceAll("& #41;", ")");
+ tLine.setName(name);
+ tLine.setState(1);
+ tLine.setInsertTime(new Date());
+ tLine.setInsertUserId(ShiroKit.getUser().getId());
+ tLineService.insert(tLine);
+
+ //添加线路站点起点+终点
+ TLineSite start = new TLineSite();
+ start.setLineId(tLine.getId());
+ start.setSiteId(startSiteId);
+ start.setType(1);
+ itLineSiteService.insert(start);
+ TLineSite end = new TLineSite();
+ end.setLineId(tLine.getId());
+ end.setSiteId(endSiteId);
+ end.setType(2);
+ itLineSiteService.insert(end);
+
+ //添加价格设置
+ addPrice(tLine.getId(), subArr);
+
+ //添加班次设置
+ return addShift(tLine.getId(), shuArr);
+ }
+
+ /**
+ * 添加线路班次
+ * @param lineId
+ * @param shuArr
+ */
+ private ResultUtil addShift(Integer lineId, @RequestParam String shuArr) {
+ try {
+ JSONArray jsonArray1 = JSON.parseArray(shuArr);
+ int size1 = jsonArray1.size();
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+ List<String> list = new ArrayList<>();
+ for (int i = 0; i < size1; i++) {
+ List<TLineShift> tLineShifts = itLineShiftService.selectList(new EntityWrapper<TLineShift>().eq("lineId", lineId).ne("state", 3).orderBy("startTime"));
+ JSONObject jsonObject = jsonArray1.getJSONObject(i);
+ TLineShift shift = new TLineShift();
+ shift.setLineId(lineId);
+ String shiftTime = jsonObject.getString("shiftTime");
+ String startTime = null;
+ String endTime = null;
+ if (SinataUtil.isNotEmpty(shiftTime)){
+ String[] timeArray = shiftTime.split(" - ");
+ startTime = timeArray[0];
+ endTime = timeArray[1];
+ }
+ Date s1 = sdf.parse("2020-11-11 " + startTime + ":00");
+ Date e1 = sdf.parse("2020-11-11 " + endTime + ":00");
+ boolean b = false;
+ for(TLineShift lineShift : tLineShifts){
+ Date s2 = sdf.parse("2020-11-11 " + lineShift.getStartTime() + ":00");
+ Date e2 = sdf.parse("2020-11-11 " + lineShift.getEndTime() + ":00");
+ if(s2.getTime() <= s1.getTime() && e1.getTime() <= e2.getTime()){
+ list.add(startTime + " - " + endTime);
+ b = true;
+ break;
+ }
+ if(s1.getTime() <= s2.getTime() && s1.getTime() <= e2.getTime() && e1.getTime() >= s2.getTime()){
+ list.add(startTime + " - " + endTime);
+ b = true;
+ break;
+ }
+ if(s1.getTime() >= s2.getTime() && s1.getTime() <= e2.getTime() && e1.getTime() >= e2.getTime()){
+ list.add(startTime + " - " + endTime);
+ b = true;
+ break;
+ }
+ }
+ if(b){
+ continue;
+ }
+ shift.setStartTime(startTime);
+ shift.setEndTime(endTime);
+ shift.setCarNum(jsonObject.getInteger("carNum"));
+ shift.setInsertTime(new Date());
+ shift.setAddTime(jsonObject.getString("time2"));
+ shift.setState(1);
+ itLineShiftService.insert(shift);
+ }
+ if(list.size() > 0){
+ return ResultUtil.error("【" + JSON.toJSONString(list) + "】时间段与现存时间段重合，添加失败！");
+ }
+ return ResultUtil.success();
+ }catch (Exception e){
+ e.printStackTrace();
+ return ResultUtil.runErr();
+ }
+ }
+
+ /**
+ * 添加线路价格
+ * @param lineId
+ * @param subArr
+ */
+ private void addPrice(Integer lineId, @RequestParam String subArr) {
+ JSONArray jsonArray = JSON.parseArray(subArr);
+ int size = jsonArray.size();
+ for (int i = 0; i < size; i++) {
+ JSONObject jsonObject = jsonArray.getJSONObject(i);
+ TLinePrice price = new TLinePrice();
+ price.setLineId(lineId);
+ price.setServerCarModelId(jsonObject.getInteger("serverModelId"));
+ price.setType(jsonObject.getInteger("type"));
+ price.setContent(jsonObject.getString("content"));
+ price.setContentStr(jsonObject.getString("contentStr"));
+ price.setState(1);
+ price.setInsertTime(new Date());
+ price.setAddTime(jsonObject.getString("time"));
+ itLinePriceService.insert(price);
+ }
+ }
+
+ /**
+ * 操作跨城站点管理
+ * optType 1=删除 2=冻结 3=解冻
+ */
+ @RequestMapping(value = "/opt")
+ @ResponseBody
+ public Object opt(@RequestParam Integer tLineId,@RequestParam Integer optType) {
+ TLine tLine = tLineService.selectById(tLineId);
+ if (1 == optType){
+ tLine.setState(3);
+ }else if (2 == optType){
+ tLine.setState(2);
+ }else if (3 == optType){
+ tLine.setState(1);
+ }
+ tLineService.updateById(tLine);
+ return SUCCESS_TIP;
+ }
+
+ /**
+ * 分配企业操作
+ */
+ @RequestMapping(value = "/addCompany")
+ @ResponseBody
+ public Object addCompany(Integer lineId,@RequestParam String comArr) {
+ //删除分配企业
+ itLineCompanyService.delete(new EntityWrapper<TLineCompany>().eq("lineId",lineId));
+ //添加企业
+ if (SinataUtil.isNotEmpty(comArr)){
+ JSONArray jsonArray = JSON.parseArray(comArr);
+ int size = jsonArray.size();
+ for (int i = 0; i < size; i++) {
+ JSONObject jsonObject = jsonArray.getJSONObject(i);
+ TLineCompany lineCompany = new TLineCompany();
+ lineCompany.setLineId(lineId);
+ lineCompany.setCompanyId(jsonObject.getInteger("companyId"));
+ lineCompany.setInsertTime(new Date());
+ lineCompany.setInsertUserId(ShiroKit.getUser().getId());
+ itLineCompanyService.insert(lineCompany);
+ }
+ }
+ return SUCCESS_TIP;
+ }
+ /**
+ * 修改跨城站点管理
+ */
+ @RequestMapping(value = "/update")
+ @ResponseBody
+ public ResultUtil update(TLine tLine,Integer startSiteId,Integer endSiteId,@RequestParam String subArr,@RequestParam String shuArr) {
+ String name = tLine.getName();
+ name = name.replaceAll("& lt;", "<");
+ name = name.replaceAll("& gt;", ">");
+ name = name.replaceAll("& #40;", "(");
+ name = name.replaceAll("& #41;", ")");
+ tLine.setName(name);
+ tLineService.updateById(tLine);
+
+ //修改站点起点
+ TLineSite start = itLineSiteService.selectOne(new EntityWrapper<TLineSite>().eq("lineId", tLine.getId()).eq("type", 1));
+ if (SinataUtil.isNotEmpty(start)){
+ if (start.getSiteId().intValue() != startSiteId.intValue()){
+ start.setSiteId(startSiteId);
+ itLineSiteService.updateById(start);
+ }
+ }else{
+ start = new TLineSite();
+ start.setLineId(tLine.getId());
+ start.setSiteId(startSiteId);
+ start.setType(1);
+ itLineSiteService.insert(start);
+ }
+ //修改站点终点
+ TLineSite end = itLineSiteService.selectOne(new EntityWrapper<TLineSite>().eq("lineId", tLine.getId()).eq("type", 2));
+ if (SinataUtil.isNotEmpty(end)){
+ if (end.getSiteId().intValue() != endSiteId.intValue()){
+ end.setSiteId(endSiteId);
+ itLineSiteService.updateById(end);
+ }
+ }else{
+ end = new TLineSite();
+ end.setLineId(tLine.getId());
+ end.setSiteId(endSiteId);
+ end.setType(2);
+ itLineSiteService.insert(end);
+ }
+
+ //删除线路价格
+ itLinePriceService.delete(new EntityWrapper<TLinePrice>().eq("lineId",tLine.getId()));
+ //添加价格设置
+ addPrice(tLine.getId(), subArr);
+ //删除线路班次
+ itLineShiftService.delete(new EntityWrapper<TLineShift>().eq("lineId",tLine.getId()));
+ //添加班次设置
+ return addShift(tLine.getId(), shuArr);
+
+ }
+
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TOrderCharterController.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TOrderCharterController.java
new file mode 100644
index 0000000..84e5fb9
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TOrderCharterController.java
@@ -0,0 +1,109 @@
+package com.stylefeng.guns.modular.system.controller.specialTrain;
+
+import com.baomidou.mybatisplus.plugins.Page;
+import com.stylefeng.guns.core.base.controller.BaseController;
+import com.stylefeng.guns.core.common.constant.factory.PageFactory;
+import com.stylefeng.guns.core.shiro.ShiroKit;
+import com.stylefeng.guns.core.util.SinataUtil;
+import com.stylefeng.guns.modular.system.model.TOrderEvaluate;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.beans.factory.annotation.Autowired;
+import com.stylefeng.guns.core.log.LogObjectHolder;
+import org.springframework.web.bind.annotation.RequestParam;
+import com.stylefeng.guns.modular.system.model.TOrderCharter;
+import com.stylefeng.guns.modular.system.service.ITOrderCharterService;
+
+import java.util.Map;
+
+/**
+ * 旅游包车订单控制器
+ *
+ * @author fengshuonan
+ * @Date 2020-09-02 10:39:00
+ */
+@Controller
+@RequestMapping("/tOrderCharter")
+public class TOrderCharterController extends BaseController {
+
+ private String PREFIX = "/system/tOrderCharter/";
+
+ @Autowired
+ private ITOrderCharterService tOrderCharterService;
+
+ /**
+ * 跳转到旅游包车订单首页
+ */
+ @RequestMapping("")
+ public String index() {
+ return PREFIX + "tOrderCharter.html";
+ }
+
+ /**
+ * 跳转到查看详情
+ */
+ @RequestMapping("/lookDetail/{id}")
+ public String lookDetail(@PathVariable Integer id, Model model) {
+ TOrderCharter tOrderCharter = tOrderCharterService.selectById(id);
+ model.addAttribute("str",tOrderCharter.getRemark());
+ return "/system/tComplaint/lookDetail.html";
+ }
+
+ /**
+ * 跳转到修改旅游包车订单
+ */
+ @RequestMapping("/tOrderCharter_immediately/{tOrderCharterId}")
+ public String tOrderCharterUpdate(@PathVariable Integer tOrderCharterId, Model model) {
+ model.addAttribute("id",tOrderCharterId);
+ return PREFIX + "tOrderCharter_immediately.html";
+ }
+
+ /**
+ * 获取旅游包车订单列表
+ */
+ @RequestMapping(value = "/list")
+ @ResponseBody
+ public Object list(String insertTime,String userName,String contactName,String contactPhone,String useDemand,Integer state) {
+ String beginTime = null;
+ String endTime = null;
+ if (SinataUtil.isNotEmpty(insertTime)){
+ String[] timeArray = insertTime.split(" - ");
+ beginTime = timeArray[0];
+ endTime = timeArray[1];
+ }
+ Page<Map<String, Object>> page = new PageFactory<Map<String, Object>>().defaultPage();
+ if (ShiroKit.getUser().getRoleType() != 1){
+ page.setRecords(null);
+ }else{
+ page.setRecords(tOrderCharterService.getCharterOrderList(page,beginTime,endTime,userName,contactName,contactPhone,useDemand,state));
+ }
+ return super.packForBT(page);
+ }
+
+ /**
+ * 立即处理
+ */
+ @RequestMapping(value = "/immediately")
+ @ResponseBody
+ public Object immediately(TOrderCharter tOrderCharter) {
+ tOrderCharter.setState(2);
+ tOrderCharterService.updateById(tOrderCharter);
+ return SUCCESS_TIP;
+ }
+
+ /**
+ * 删除旅游包车订单
+ */
+ @RequestMapping(value = "/delete")
+ @ResponseBody
+ public Object delete(@RequestParam Integer tOrderCharterId) {
+ TOrderCharter tOrderCharter = tOrderCharterService.selectById(tOrderCharterId);
+ tOrderCharter.setState(3);
+ tOrderCharterService.updateById(tOrderCharter);
+ return SUCCESS_TIP;
+ }
+
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TOrderCharteredCarController.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TOrderCharteredCarController.java
new file mode 100644
index 0000000..24e50fd
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TOrderCharteredCarController.java
@@ -0,0 +1,108 @@
+package com.stylefeng.guns.modular.system.controller.specialTrain;
+
+import com.baomidou.mybatisplus.plugins.Page;
+import com.stylefeng.guns.core.base.controller.BaseController;
+import com.stylefeng.guns.core.common.constant.factory.PageFactory;
+import com.stylefeng.guns.core.shiro.ShiroKit;
+import com.stylefeng.guns.core.util.SinataUtil;
+import com.stylefeng.guns.modular.system.model.TOrderCharter;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.beans.factory.annotation.Autowired;
+import com.stylefeng.guns.core.log.LogObjectHolder;
+import org.springframework.web.bind.annotation.RequestParam;
+import com.stylefeng.guns.modular.system.model.TOrderCharteredCar;
+import com.stylefeng.guns.modular.system.service.ITOrderCharteredCarService;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 旅游包车订单控制器
+ *
+ * @author fengshuonan
+ * @Date 2020-09-24 11:08:23
+ */
+@Controller
+@RequestMapping("/tOrderCharteredCar")
+public class TOrderCharteredCarController extends BaseController {
+
+ private String PREFIX = "/system/tOrderCharteredCar/";
+
+ @Autowired
+ private ITOrderCharteredCarService tOrderCharteredCarService;
+
+ /**
+ * 跳转到旅游包车订单首页
+ */
+ @RequestMapping("")
+ public String index() {
+ return PREFIX + "tOrderCharteredCar.html";
+ }
+
+ /**
+ * 跳转到修改旅游包车订单
+ */
+ @RequestMapping("/tOrderCharteredCar_immediately/{tOrderCharteredCarId}")
+ public String tOrderCharteredCarUpdate(@PathVariable Integer tOrderCharteredCarId, Model model) {
+ model.addAttribute("id",tOrderCharteredCarId);
+ return PREFIX + "tOrderCharteredCar_immediately.html";
+ }
+
+ /**
+ * 获取旅游包车订单列表
+ */
+ @RequestMapping(value = "/list")
+ @ResponseBody
+ public Object list(String insertTime,String userName,String contactPerson,String contactPhone,String modelUse,Integer state) {
+ String beginTime = null;
+ String endTime = null;
+ if (SinataUtil.isNotEmpty(insertTime)){
+ String[] timeArray = insertTime.split(" - ");
+ beginTime = timeArray[0];
+ endTime = timeArray[1];
+ }
+ Page<Map<String, Object>> page = new PageFactory<Map<String, Object>>().defaultPage();
+ if (ShiroKit.getUser().getRoleType() != 1){
+ page.setRecords(null);
+ }else{
+ List<Map<String, Object>> charterCarOrderList = tOrderCharteredCarService.getCharterCarOrderList(page, beginTime, endTime, userName, contactPerson, contactPhone, modelUse, state, ShiroKit.getUser().getRoleType(), ShiroKit.getUser().getObjectId());
+ for(Map<String, Object> map : charterCarOrderList){
+ String[] prices = map.get("price").toString().split("-");
+ String p = Double.valueOf(prices[0]) * Integer.valueOf(map.get("peopleNumber").toString()) + "-" + Double.valueOf(prices[1]) * Integer.valueOf(map.get("peopleNumber").toString());
+ map.put("price", p);
+
+ }
+ page.setRecords(charterCarOrderList);
+ }
+ return super.packForBT(page);
+ }
+
+ /**
+ * 立即处理
+ */
+ @RequestMapping(value = "/immediately")
+ @ResponseBody
+ public Object immediately(Integer id, String remark) {
+ TOrderCharteredCar tOrderCharteredCar = tOrderCharteredCarService.selectById(id);
+ tOrderCharteredCar.setState(2);
+ tOrderCharteredCar.setRemark(remark);
+ tOrderCharteredCarService.updateById(tOrderCharteredCar);
+ return SUCCESS_TIP;
+ }
+
+ /**
+ * 删除旅游包车订单
+ */
+ @RequestMapping(value = "/delete")
+ @ResponseBody
+ public Object delete(@RequestParam Integer tOrderCharterId) {
+ TOrderCharteredCar tOrderCharter = tOrderCharteredCarService.selectById(tOrderCharterId);
+ tOrderCharter.setIsDelete(2);
+ tOrderCharteredCarService.updateById(tOrderCharter);
+ return SUCCESS_TIP;
+ }
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TOrderCrossCityController.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TOrderCrossCityController.java
new file mode 100644
index 0000000..882c620
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TOrderCrossCityController.java
@@ -0,0 +1,301 @@
+package com.stylefeng.guns.modular.system.controller.specialTrain;
+
+import com.alibaba.fastjson.JSONArray;
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.baomidou.mybatisplus.plugins.Page;
+import com.stylefeng.guns.core.base.controller.BaseController;
+import com.stylefeng.guns.core.common.constant.factory.PageFactory;
+import com.stylefeng.guns.core.shiro.ShiroKit;
+import com.stylefeng.guns.core.shiro.ShiroUser;
+import com.stylefeng.guns.core.util.SinataUtil;
+import com.stylefeng.guns.core.util.ToolUtil;
+import com.stylefeng.guns.modular.system.dao.LineShiftDriverMapper;
+import com.stylefeng.guns.modular.system.dao.OrderCancelMapper;
+import com.stylefeng.guns.modular.system.model.*;
+import com.stylefeng.guns.modular.system.service.*;
+import com.stylefeng.guns.modular.system.util.HttpRequestUtil;
+import com.stylefeng.guns.modular.system.util.PushURL;
+import com.stylefeng.guns.modular.system.util.ResultUtil;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.ui.Model;
+import org.springframework.beans.factory.annotation.Autowired;
+import com.stylefeng.guns.core.log.LogObjectHolder;
+
+import javax.annotation.Resource;
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.InputStreamReader;
+import java.math.BigDecimal;
+import java.util.*;
+
+/**
+ * 跨城出行订单控制器
+ *
+ * @author fengshuonan
+ * @Date 2020-09-16 14:56:46
+ */
+@Controller
+@RequestMapping("/tOrderCrossCity")
+public class TOrderCrossCityController extends BaseController {
+
+ private String PREFIX = "/system/tOrderCrossCity/";
+
+ @Autowired
+ private ITOrderCrossCityService tOrderCrossCityService;
+
+ @Autowired
+ private ITServerCarmodelService tServerCarmodelService;
+
+ @Autowired
+ private ITLineService itLineService;
+
+ @Autowired
+ private ITOrderPositionService tOrderPositionService;
+
+ private ResultUtil resultUtil;
+
+ @Value("${filePath}")
+ private String filePath;
+
+ /**
+ * 跳转到跨城出行订单首页
+ */
+ @RequestMapping("")
+ public String index(Model model) {
+ //服务专车车型
+ List<TServerCarmodel> carmodelList = tServerCarmodelService.selectList(new EntityWrapper<TServerCarmodel>().eq("type", 2).eq("state", 1));
+ model.addAttribute("carmodelList",carmodelList);
+ //线路
+ List<TLine> lineList = itLineService.selectList(new EntityWrapper<TLine>().last(" where not FIND_IN_SET(state,'3')"));
+ model.addAttribute("lineList",lineList);
+ return PREFIX + "tOrderCrossCity.html";
+ }
+
+ /**
+ * 跳转到查看跨城出行订单详情页面
+ */
+ @RequestMapping("/tOrderCrossCity_detail/{tOrderCrossCityId}")
+ public String tOrderCrossCityUpdate(@PathVariable Integer tOrderCrossCityId, Model model) {
+ Map<String, Object> item = tOrderCrossCityService.getCrossCityOrderDetailById(tOrderCrossCityId);
+ model.addAttribute("item",item);
+ return PREFIX + "tOrderCrossCity_detail.html";
+ }
+
+ /**
+ * 跳转到跨城出行订单轨迹页面
+ */
+ @RequestMapping("/tOrderCrossCity_track/{tOrderCrossCityId}")
+ public String tOrderCrossCity_track(@PathVariable Integer tOrderCrossCityId, Model model) {
+ model.addAttribute("tOrderCrossCityId",tOrderCrossCityId);
+ return PREFIX + "tOrderCrossCity_track.html";
+ }
+
+ /**
+ * 获取订单轨迹
+ * @param orderDetailId
+ * @return
+ */
+ @ResponseBody
+ @RequestMapping(value = "/getOrderTrack", method = RequestMethod.POST)
+ public ResultUtil getOrderTrack(String orderDetailId){
+ if(ToolUtil.isNotEmpty(orderDetailId)){
+ try {
+ //将数据存储到文件中
+ File file = new File(filePath + orderDetailId + "_3.txt");
+ if(!file.exists()){
+ return ResultUtil.success(new ArrayList<>());
+ }
+ //读取文件(字符流)
+ BufferedReader in = new BufferedReader(new InputStreamReader(new FileInputStream(file),"UTF-8"));
+ //循环取出数据
+ String str = null;
+ StringBuffer sb = new StringBuffer();
+ while ((str = in.readLine()) != null) {
+ sb.append(str);
+ }
+ List<TOrderPosition> list = JSONArray.parseArray(sb.toString(), TOrderPosition.class);
+// List<TOrderPosition> list = tOrderPositionService.selectList(new EntityWrapper<TOrderPosition>().eq("orderType", 3).eq("orderId", orderDetailId).orderBy("insertTime"));
+ /*if(list.size() == 0){
+ return ResultUtil.error("该订单没有运行轨迹");
+ }*/
+ resultUtil = ResultUtil.success(list);
+ }catch (Exception e){
+ e.printStackTrace();
+ resultUtil = ResultUtil.runErr();
+ }
+ }else {
+ resultUtil = ResultUtil.paranErr();
+ }
+ return resultUtil;
+ }
+
+ /**
+ * 获取跨城出行订单列表
+ */
+ @RequestMapping(value = "/list")
+ @ResponseBody
+ public Object list(String insertTime,
+ String orderNum,
+ Integer orderSource,
+ String userName,
+ String userPhone,
+ String passengers,
+ String passengersPhone,
+ Integer serverCarModelId,
+ String driver,
+ Integer lineId,
+ Integer state) {
+ String beginTime = null;
+ String endTime = null;
+ if (SinataUtil.isNotEmpty(insertTime)){
+ String[] timeArray = insertTime.split(" - ");
+ beginTime = timeArray[0];
+ endTime = timeArray[1];
+ }
+ Page<Map<String, Object>> page = new PageFactory<Map<String, Object>>().defaultPage();
+ page.setRecords(tOrderCrossCityService.getCrossCityOrderList(page,beginTime,endTime,ShiroKit.getUser().getRoleType(),ShiroKit.getUser().getObjectId(),orderNum,orderSource,userName,userPhone,passengers,passengersPhone,serverCarModelId,driver,lineId,state));
+ return super.packForBT(page);
+ }
+
+ @Autowired
+ private ITDriverService tDriverService;
+
+ @Resource
+ private LineShiftDriverMapper lineShiftDriverMapper;
+
+ @Autowired
+ private ITUserService userService;
+
+ @Autowired
+ private ITransactionDetailsService transactionDetailsService;
+
+ @Autowired
+ private IPaymentRecordService paymentRecordService;
+
+ @Resource
+ private OrderCancelMapper orderCancelMapper;
+
+ @Autowired
+ private IIncomeService incomeService;
+
+
+
+
+ /**
+ * 取消跨城出行订单
+ */
+ @RequestMapping(value = "/cancel")
+ @ResponseBody
+ public Object cancel(@RequestParam Integer tOrderCrossCityId) throws Exception {
+ TOrderCrossCity tOrderCrossCity = tOrderCrossCityService.selectById(tOrderCrossCityId);
+ ShiroUser user = ShiroKit.getUser();
+
+ TOrderCrossCity orderCrossCity = tOrderCrossCityService.selectById(tOrderCrossCityId);
+ if(orderCrossCity.getState() > 5 && orderCrossCity.getState() != 11 && orderCrossCity.getState() != 7){
+ return ResultUtil.error("订单状态不在可取消范围内");
+ }
+ orderCrossCity.setState(10);
+ tOrderCrossCityService.updateById(orderCrossCity);
+
+ if(orderCrossCity.getDriverId() != null){
+ //修改司机信息
+ LineShiftDriver lineShiftDriver = lineShiftDriverMapper.selectById(orderCrossCity.getLineShiftDriverId());
+ lineShiftDriver.setLaveSeat(lineShiftDriver.getLaveSeat() + orderCrossCity.getPeopleNumber() > lineShiftDriver.getTotalSeat() ?
+ lineShiftDriver.getTotalSeat() : lineShiftDriver.getLaveSeat() + orderCrossCity.getPeopleNumber());
+ String seat = "";
+ String[] split = orderCrossCity.getSeatNumber().split(",");
+ for(String s : split){
+ seat += s + ",";
+ }
+ seat = lineShiftDriver.getLaveSeatNumber() + "," + seat.substring(0, seat.length() - 1);
+
+ //总和大于总座位数的情况
+ if(lineShiftDriver.getLaveSeat() + orderCrossCity.getPeopleNumber() > lineShiftDriver.getTotalSeat()){
+ seat = "";
+ for(int i = 1; i <= lineShiftDriver.getTotalSeat(); i++){
+ seat += i + ",";
+ }
+ seat = seat.substring(0, seat.length() - 1);
+ }
+ lineShiftDriver.setLaveSeatNumber(seat);
+ lineShiftDriverMapper.updateById(lineShiftDriver);
+ if(lineShiftDriver.getLaveSeat() >= lineShiftDriver.getTotalSeat()){
+ TDriver driver = tDriverService.selectById(orderCrossCity.getDriverId());
+ driver.setState(2);
+ tDriverService.updateById(driver);
+ }
+ }
+
+
+ //已支付的情况下进行退款操作
+ if(null != orderCrossCity.getPayType() && null != orderCrossCity.getPayMoney()) {
+ if (orderCrossCity.getPayType() == 3) {//余额支付
+ TUser tUser = userService.selectById(orderCrossCity.getUserId());
+ tUser.setBalance(tUser.getBalance().add(orderCrossCity.getPayMoney()));
+ userService.updateById(tUser);
+ //添加交易明细
+ transactionDetailsService.saveData(orderCrossCity.getUserId(), "跨城订单取消退款", orderCrossCity.getPayMoney().doubleValue(), 1, 1, 1, 3, tOrderCrossCityId);
+ } else {
+ PaymentRecord query = paymentRecordService.query(1, null, null, tOrderCrossCityId, 3, null, 2).get(0);
+ if (null == query) {
+ return ResultUtil.error("订单还未进行支付");
+ }
+ }
+
+ //添加负的收入明细
+ List<Income> incomes = incomeService.selectList(new EntityWrapper<Income>().eq("type", 2).eq("incomeId", tOrderCrossCityId).eq("orderType", 3));
+ for(Income income : incomes){
+ if(income.getUserType() == 2){//处理司机的收入
+ TDriver driver = tDriverService.selectById(income.getObjectId());
+ driver.setBalance(driver.getBalance().subtract(new BigDecimal(income.getMoney())));
+ driver.setLaveBusinessMoney(new BigDecimal(driver.getLaveBusinessMoney()).subtract(new BigDecimal(income.getMoney())).doubleValue());
+ driver.setBusinessMoney(new BigDecimal(driver.getBusinessMoney()).subtract(new BigDecimal(income.getMoney())).doubleValue());
+ tDriverService.updateById(driver);
+ }
+ Income income1 = new Income();
+ BeanUtils.copyProperties(income, income1);
+ income1.setMoney(income.getMoney() * -1);
+ income1.setId(null);
+ income1.setInsertTime(new Date());
+ incomeService.insert(income1);
+ }
+ }
+ //添加取消记录
+ OrderCancel orderCancel = new OrderCancel();
+ orderCancel.setOrderId(tOrderCrossCityId);
+ orderCancel.setOrderType(3);
+ orderCancel.setReason("调度端取消订单");
+ orderCancel.setRemark("调度“" + user.getName() + "-" + user.getId() + "”执行取消操作");
+ orderCancel.setState(2);
+ orderCancel.setInsertTime(new Date());
+ orderCancel.setUserType(3);
+ orderCancel.setUserId(user.getId());
+ orderCancelMapper.insert(orderCancel);
+
+
+ //增加推送
+ Map<String,String> map1 = new HashMap<>();
+ map1.put("id", tOrderCrossCity.getId().toString());
+ map1.put("orderType", "3");
+ String result1 = HttpRequestUtil.postRequest(PushURL.cancel_order_url, map1);
+ System.out.println("跨城出行取消:【orderId="+tOrderCrossCity.getId().toString()+"】,调用接口:"+result1);
+
+ return SUCCESS_TIP;
+ }
+
+ /**
+ * 删除跨城出行订单
+ */
+ @RequestMapping(value = "/delete")
+ @ResponseBody
+ public Object delete(@RequestParam Integer tOrderCrossCityId) {
+ TOrderCrossCity tOrderCrossCity = tOrderCrossCityService.selectById(tOrderCrossCityId);
+ tOrderCrossCity.setIsDelete(2);
+ tOrderCrossCityService.updateById(tOrderCrossCity);
+ return SUCCESS_TIP;
+ }
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TOrderLogisticsController.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TOrderLogisticsController.java
new file mode 100644
index 0000000..5c006b4
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TOrderLogisticsController.java
@@ -0,0 +1,211 @@
+package com.stylefeng.guns.modular.system.controller.specialTrain;
+
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.baomidou.mybatisplus.plugins.Page;
+import com.stylefeng.guns.core.base.controller.BaseController;
+import com.stylefeng.guns.core.common.constant.factory.PageFactory;
+import com.stylefeng.guns.core.shiro.ShiroKit;
+import com.stylefeng.guns.core.shiro.ShiroUser;
+import com.stylefeng.guns.core.util.SinataUtil;
+import com.stylefeng.guns.modular.system.dao.OrderCancelMapper;
+import com.stylefeng.guns.modular.system.model.*;
+import com.stylefeng.guns.modular.system.service.*;
+import com.stylefeng.guns.modular.system.util.HttpRequestUtil;
+import com.stylefeng.guns.modular.system.util.PushURL;
+import com.stylefeng.guns.modular.system.util.ResultUtil;
+import org.springframework.beans.BeanUtils;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.beans.factory.annotation.Autowired;
+import com.stylefeng.guns.core.log.LogObjectHolder;
+import org.springframework.web.bind.annotation.RequestParam;
+
+import javax.annotation.Resource;
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 小件物流订单控制器
+ *
+ * @author fengshuonan
+ * @Date 2020-09-24 14:20:41
+ */
+@Controller
+@RequestMapping("/tOrderLogistics")
+public class TOrderLogisticsController extends BaseController {
+
+ private String PREFIX = "/system/tOrderLogistics/";
+
+ @Autowired
+ private ITOrderLogisticsService tOrderLogisticsService;
+
+ @Resource
+ private OrderCancelMapper orderCancelMapper;
+
+ @Autowired
+ private ITUserService userService;
+
+ @Autowired
+ private ITransactionDetailsService transactionDetailsService;
+
+ @Autowired
+ private IPaymentRecordService paymentRecordService;
+
+ @Autowired
+ private IIncomeService incomeService;
+
+ @Autowired
+ private ITDriverService tDriverService;
+
+
+
+
+ /**
+ * 跳转到小件物流订单首页
+ */
+ @RequestMapping("")
+ public String index() {
+ return PREFIX + "tOrderLogistics.html";
+ }
+
+ /**
+ * 跳转到添加小件物流订单
+ */
+ @RequestMapping("/tOrderLogistics_add")
+ public String tOrderLogisticsAdd() {
+ return PREFIX + "tOrderLogistics_add.html";
+ }
+
+ /**
+ * 跳转到查看小件物流订单
+ */
+ @RequestMapping("/tOrderLogistics_detail/{tOrderLogisticsId}")
+ public String tOrderLogistics_detail(@PathVariable Integer tOrderLogisticsId, Model model) {
+ Map<String,Object> tOrderLogistics = tOrderLogisticsService.getLogisticsOrderDetailById(tOrderLogisticsId);
+ model.addAttribute("item",tOrderLogistics);
+ return PREFIX + "tOrderLogistics_detail.html";
+ }
+
+ /**
+ * 获取小件物流订单列表
+ */
+ @RequestMapping(value = "/list")
+ @ResponseBody
+ public Object list(String insertTime,
+ String orderNum,
+ Integer type,
+ Integer orderSource,
+ String userName,
+ String userPhone,
+ String recipient,
+ String recipientPhone,
+ String driver,
+ Integer state) {
+ String beginTime = null;
+ String endTime = null;
+ if (SinataUtil.isNotEmpty(insertTime)){
+ String[] timeArray = insertTime.split(" - ");
+ beginTime = timeArray[0];
+ endTime = timeArray[1];
+ }
+ Page<Map<String, Object>> page = new PageFactory<Map<String, Object>>().defaultPage();
+ page.setRecords(tOrderLogisticsService.getLogisticsOrderList(page,beginTime,endTime,ShiroKit.getUser().getRoleType(),ShiroKit.getUser().getObjectId(),
+ orderNum,orderSource,type,userName,userPhone,recipient,recipientPhone,driver,state));
+ return super.packForBT(page);
+ }
+
+ @Autowired
+ private ITDriverService itDriverService;
+
+ /**
+ * 取消小件物流订单
+ */
+ @RequestMapping(value = "/cancel")
+ @ResponseBody
+ public Object cancel(@RequestParam Integer tOrderLogisticsId) {
+ try{
+ ShiroUser user = ShiroKit.getUser();
+ TOrderLogistics tOrderLogistics = tOrderLogisticsService.selectById(tOrderLogisticsId);
+ tOrderLogistics.setState(10);
+
+ //已支付的情况下进行退款操作
+ if(null != tOrderLogistics.getPayType() && null != tOrderLogistics.getPayMoney()) {
+ if (tOrderLogistics.getPayType() == 3) {//余额支付
+ TUser tUser = userService.selectById(tOrderLogistics.getUserId());
+ tUser.setBalance(tUser.getBalance().add(tOrderLogistics.getPayMoney()));
+ userService.updateById(tUser);
+ } else {
+ List<PaymentRecord> paymentRecords = paymentRecordService.query(1, null, null, tOrderLogisticsId, tOrderLogistics.getType(), null, 2);
+ if (paymentRecords.size() == 0) {
+ return ResultUtil.error("订单还未进行支付");
+ }
+ boolean b = false;
+
+ }
+
+ transactionDetailsService.saveData(tOrderLogistics.getUserId(), "小件订单取消退款", tOrderLogistics.getPayMoney().doubleValue(), 1, 1, 1, 4, tOrderLogistics.getId());
+
+ //添加负的收入明细
+ List<Income> incomes = incomeService.selectList(new EntityWrapper<Income>().eq("type", 2).eq("incomeId", tOrderLogistics.getId()).eq("orderType", tOrderLogistics.getType()));
+ for(Income income : incomes){
+ if(income.getUserType() == 2){//处理司机的收入
+ TDriver driver = tDriverService.selectById(income.getObjectId());
+ driver.setBalance(driver.getBalance().subtract(new BigDecimal(income.getMoney())));
+ driver.setLaveBusinessMoney(new BigDecimal(driver.getLaveBusinessMoney()).subtract(new BigDecimal(income.getMoney())).doubleValue());
+ driver.setBusinessMoney(new BigDecimal(driver.getBusinessMoney()).subtract(new BigDecimal(income.getMoney())).doubleValue());
+ tDriverService.updateById(driver);
+ }
+ Income income1 = new Income();
+ BeanUtils.copyProperties(income, income1);
+ income1.setMoney(income.getMoney() * -1);
+ income1.setId(null);
+ income1.setInsertTime(new Date());
+ incomeService.insert(income1);
+ }
+ }
+ tOrderLogisticsService.updateById(tOrderLogistics);
+
+ //添加取消记录
+ OrderCancel orderCancel = new OrderCancel();
+ orderCancel.setOrderId(tOrderLogistics.getId());
+ orderCancel.setOrderType(tOrderLogistics.getType());
+ orderCancel.setReason("调度端取消订单");
+ orderCancel.setRemark("调度“" + user.getName() + "-" + user.getId() + "”执行取消操作");
+ orderCancel.setState(2);
+ orderCancel.setInsertTime(new Date());
+ orderCancel.setUserType(3);
+ orderCancel.setUserId(user.getId());
+ orderCancelMapper.insert(orderCancel);
+
+ //增加推送
+ Map<String,String> map = new HashMap<>();
+ map.put("id", tOrderLogistics.getId().toString());
+ map.put("orderType", tOrderLogistics.getType().toString());
+ String result = HttpRequestUtil.postRequest(PushURL.cancel_order_url, map);
+ System.out.println("小件物流取消:【orderId="+tOrderLogistics.getId().toString()+"】,调用接口:"+result);
+ }catch (Exception e){
+ e.printStackTrace();
+ }
+
+ return SUCCESS_TIP;
+ }
+
+ /**
+ * 删除小件物流订单
+ */
+ @RequestMapping(value = "/delete")
+ @ResponseBody
+ public Object delete(@RequestParam Integer tOrderLogisticsId) {
+ TOrderLogistics tOrderLogistics = tOrderLogisticsService.selectById(tOrderLogisticsId);
+ tOrderLogistics.setIsDelete(2);
+ tOrderLogisticsService.updateById(tOrderLogistics);
+ return SUCCESS_TIP;
+ }
+
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TOrderPrivateCarController.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TOrderPrivateCarController.java
new file mode 100644
index 0000000..c01ce17
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TOrderPrivateCarController.java
@@ -0,0 +1,227 @@
+package com.stylefeng.guns.modular.system.controller.specialTrain;
+
+import com.alibaba.fastjson.JSONArray;
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.baomidou.mybatisplus.plugins.Page;
+import com.stylefeng.guns.core.base.controller.BaseController;
+import com.stylefeng.guns.core.common.constant.factory.PageFactory;
+import com.stylefeng.guns.core.shiro.ShiroKit;
+import com.stylefeng.guns.core.util.SinataUtil;
+import com.stylefeng.guns.core.util.ToolUtil;
+import com.stylefeng.guns.modular.system.dao.OrderCancelMapper;
+import com.stylefeng.guns.modular.system.model.*;
+import com.stylefeng.guns.modular.system.service.*;
+import com.stylefeng.guns.modular.system.util.HttpRequestUtil;
+import com.stylefeng.guns.modular.system.util.PushMinistryOfTransportUtil;
+import com.stylefeng.guns.modular.system.util.PushURL;
+import com.stylefeng.guns.modular.system.util.ResultUtil;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.ui.Model;
+import org.springframework.beans.factory.annotation.Autowired;
+import com.stylefeng.guns.core.log.LogObjectHolder;
+
+import javax.annotation.Resource;
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.InputStreamReader;
+import java.util.*;
+
+/**
+ * 专车订单控制器
+ *
+ * @author fengshuonan
+ * @Date 2020-09-02 17:28:59
+ */
+@Controller
+@RequestMapping("/tOrderPrivateCar")
+public class TOrderPrivateCarController extends BaseController {
+
+ private String PREFIX = "/system/tOrderPrivateCar/";
+
+ @Autowired
+ private ITOrderPrivateCarService tOrderPrivateCarService;
+
+ @Autowired
+ private ITServerCarmodelService tServerCarmodelService;
+
+ @Autowired
+ private ITOrderPositionService tOrderPositionService;
+
+ @Autowired
+ private ITDriverService tDriverService;
+
+ @Autowired
+ private PushMinistryOfTransportUtil pushMinistryOfTransportUtil;
+
+ @Resource
+ private OrderCancelMapper orderCancelMapper;
+
+ @Value("${pushMinistryOfTransport}")
+ private boolean pushMinistryOfTransport;
+
+ @Value("${filePath}")
+ private String filePath;
+
+
+
+
+ /**
+ * 跳转到专车订单首页
+ */
+ @RequestMapping("")
+ public String index(Model model) {
+ //服务专车车型
+ List<TServerCarmodel> carmodelList = tServerCarmodelService.selectList(new EntityWrapper<TServerCarmodel>().eq("type", 1).eq("state", 1));
+ model.addAttribute("carmodelList",carmodelList);
+ return PREFIX + "tOrderPrivateCar.html";
+ }
+
+ /**
+ * 跳转到修改专车订单
+ */
+ @RequestMapping("/tOrderPrivateCar_orderDetail/{tOrderPrivateCarId}")
+ public String tOrderPrivateCarUpdate(@PathVariable Integer tOrderPrivateCarId, Model model) {
+ Map<String, Object> item = tOrderPrivateCarService.getPrivateCarOrderDetailById(tOrderPrivateCarId);
+ model.addAttribute("item",item);
+ return PREFIX + "tOrderPrivateCar_orderDetail.html";
+ }
+
+ /**
+ * 跳转到出租车订单轨迹页面
+ */
+ @RequestMapping("/tOrderPrivateCar_trajectory/{tOrderPrivateCarId}")
+ public String tOrderTaxi_trajectory(@PathVariable Integer tOrderPrivateCarId, Model model) {
+ model.addAttribute("tOrderPrivateCarId",tOrderPrivateCarId);
+ return PREFIX + "tOrderPrivateCar_trajectory.html";
+ }
+
+ /**
+ * 获取专车订单列表
+ */
+ @RequestMapping(value = "/list")
+ @ResponseBody
+ public Object list(String insertTime,
+ String orderNum,
+ Integer orderSource,
+ String userName,
+ String userPhone,
+ String passengers,
+ String passengersPhone,
+ Integer serverCarModelId,
+ String driver,
+ Integer state) {
+ String beginTime = null;
+ String endTime = null;
+ if (SinataUtil.isNotEmpty(insertTime)){
+ String[] timeArray = insertTime.split(" - ");
+ beginTime = timeArray[0];
+ endTime = timeArray[1];
+ }
+ Page<Map<String, Object>> page = new PageFactory<Map<String, Object>>().defaultPage();
+ page.setRecords(tOrderPrivateCarService.getPrivateCarOrderList(page,beginTime,endTime,ShiroKit.getUser().getRoleType(),ShiroKit.getUser().getObjectId(),orderNum,orderSource,userName,userPhone,passengers,passengersPhone,serverCarModelId,driver,state));
+ return super.packForBT(page);
+ }
+
+ private ResultUtil resultUtil;
+
+ /**
+ * 获取订单轨迹
+ * @param orderDetailId
+ * @return
+ */
+ @ResponseBody
+ @RequestMapping(value = "/getOrderTrack", method = RequestMethod.POST)
+ public ResultUtil getOrderTrack(String orderDetailId){
+ if(ToolUtil.isNotEmpty(orderDetailId)){
+ try {
+// List<TOrderPosition> list = tOrderPositionService.selectList(new EntityWrapper<TOrderPosition>().eq("orderType", 1).eq("orderId", orderDetailId).orderBy("insertTime"));
+ /*if(list.size() == 0){
+ return ResultUtil.error("该订单没有运行轨迹");
+ }*/
+ //将数据存储到文件中
+ File file = new File(filePath + orderDetailId + "_1.txt");
+ if(!file.exists()){
+ return ResultUtil.success(new ArrayList<>());
+ }
+ //读取文件(字符流)
+ BufferedReader in = new BufferedReader(new InputStreamReader(new FileInputStream(file),"UTF-8"));
+ //循环取出数据
+ String str = null;
+ StringBuffer sb = new StringBuffer();
+ while ((str = in.readLine()) != null) {
+ sb.append(str);
+ }
+ List<TOrderPosition> list = JSONArray.parseArray(sb.toString(), TOrderPosition.class);
+ resultUtil = ResultUtil.success(list);
+ }catch (Exception e){
+ e.printStackTrace();
+ resultUtil = ResultUtil.runErr();
+ }
+ }else {
+ resultUtil = ResultUtil.paranErr();
+ }
+ return resultUtil;
+ }
+
+ /**
+ * 取消专车订单
+ */
+ @RequestMapping(value = "/cancel")
+ @ResponseBody
+ public Object cancel(@RequestParam Integer tOrderPrivateCarId) {
+ TOrderPrivateCar tOrderPrivateCar = tOrderPrivateCarService.selectById(tOrderPrivateCarId);
+
+ //修改之前司机状态 -- 空闲
+ if(null != tOrderPrivateCar.getDriverId()){
+ TDriver driver = tDriverService.selectById(tOrderPrivateCar.getDriverId());
+ driver.setState(2);
+ tDriverService.updateById(driver);
+ }
+
+ tOrderPrivateCar.setState(10);
+ tOrderPrivateCarService.updateById(tOrderPrivateCar);
+
+ OrderCancel orderCancel = new OrderCancel();
+ orderCancel.setOrderId(tOrderPrivateCarId);
+ orderCancel.setOrderType(1);
+ orderCancel.setReason("平台取消订单");
+ orderCancel.setRemark("平台取消订单");
+ orderCancel.setUserType(2);
+ orderCancel.setState(2);
+ orderCancel.setInsertTime(new Date());
+ orderCancelMapper.insert(orderCancel);
+
+ //增加推送
+ Map<String,String> map = new HashMap<>();
+ map.put("id", tOrderPrivateCar.getId().toString());
+ map.put("orderType", "1");
+ String result = HttpRequestUtil.postRequest(PushURL.cancel_order_url, map);
+ System.out.println("专车取消:【orderId="+tOrderPrivateCar.getId().toString()+"】,调用接口:"+result);
+
+ new Thread(new Runnable() {
+ @Override
+ public void run() {
+ if(pushMinistryOfTransport){//上传数据
+ pushMinistryOfTransportUtil.orderCancel(tOrderPrivateCarId);
+ }
+ }
+ }).start();
+
+ return SUCCESS_TIP;
+ }
+
+ /**
+ * 删除专车订单
+ */
+ @RequestMapping(value = "/delete")
+ @ResponseBody
+ public Object delete(@RequestParam Integer tOrderPrivateCarId) {
+ TOrderPrivateCar tOrderPrivateCar = tOrderPrivateCarService.selectById(tOrderPrivateCarId);
+ tOrderPrivateCar.setIsDelete(2);
+ tOrderPrivateCarService.updateById(tOrderPrivateCar);
+ return SUCCESS_TIP;
+ }
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TReassignController.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TReassignController.java
new file mode 100644
index 0000000..f21ab1b
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TReassignController.java
@@ -0,0 +1,798 @@
+package com.stylefeng.guns.modular.system.controller.specialTrain;
+
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.baomidou.mybatisplus.plugins.Page;
+import com.stylefeng.guns.core.base.controller.BaseController;
+import com.stylefeng.guns.core.common.constant.factory.PageFactory;
+import com.stylefeng.guns.core.shiro.ShiroKit;
+import com.stylefeng.guns.core.shiro.ShiroUser;
+import com.stylefeng.guns.core.util.SinataUtil;
+import com.stylefeng.guns.modular.system.dao.LineShiftDriverMapper;
+import com.stylefeng.guns.modular.system.dao.OrderCancelMapper;
+import com.stylefeng.guns.modular.system.model.*;
+import com.stylefeng.guns.modular.system.service.*;
+import com.stylefeng.guns.modular.system.util.HttpRequestUtil;
+import com.stylefeng.guns.modular.system.util.PushURL;
+import com.stylefeng.guns.modular.system.util.ResultUtil;
+import org.springframework.beans.BeanUtils;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.beans.factory.annotation.Autowired;
+import com.stylefeng.guns.core.log.LogObjectHolder;
+import org.springframework.web.bind.annotation.RequestParam;
+
+import javax.annotation.Resource;
+import java.math.BigDecimal;
+import java.util.*;
+
+/**
+ * 专车改派管理控制器
+ *
+ * @author fengshuonan
+ * @Date 2020-09-03 14:20:27
+ */
+@Controller
+@RequestMapping("/tReassign")
+public class TReassignController extends BaseController {
+
+ private String PREFIX = "/system/tReassign/";
+
+ @Autowired
+ private ITReassignService tReassignService;
+
+ @Autowired
+ private ITOrderPrivateCarService itOrderPrivateCarService;
+
+ @Autowired
+ private ITOrderCrossCityService itOrderCrossCityService;
+
+ @Autowired
+ private ITDriverService itDriverService;
+
+ @Resource
+ private LineShiftDriverMapper lineShiftDriverMapper;
+
+ @Autowired
+ private ITDispatchService dispatchService;
+
+ @Resource
+ private OrderCancelMapper orderCancelMapper;
+
+ @Autowired
+ private ITUserService userService;
+
+ @Autowired
+ private ITransactionDetailsService transactionDetailsService;
+
+ @Autowired
+ private IPaymentRecordService paymentRecordService;
+
+ @Autowired
+ private IIncomeService incomeService;
+
+ @Autowired
+ private ITOrderLogisticsService orderLogisticsService;
+
+
+
+ /**
+ * 跳转到专车改派管理首页
+ */
+ @RequestMapping("")
+ public String index() {
+ return PREFIX + "tReassign.html";
+ }
+
+ /**
+ * 跳转到跨城出行改派管理首页
+ */
+ @RequestMapping("/cross")
+ public String corse() {
+ return PREFIX + "cross.html";
+ }
+
+
+ /**
+ * 跳转到小件物流改派管理首页
+ */
+ @RequestMapping("/smallPieceLogistics")
+ public String smallPieceLogistics() {
+ return PREFIX + "smallPieceLogistics.html";
+ }
+
+
+ /**
+ * 跳转到添加专车改派管理
+ */
+ @RequestMapping("/tReassign_add")
+ public String tReassignAdd() {
+ return PREFIX + "tReassign_add.html";
+ }
+
+ /**
+ * 跳转到修改专车改派管理
+ */
+ @RequestMapping("/tReassign_update/{tReassignId}")
+ public String tReassignUpdate(@PathVariable Integer tReassignId, Model model) {
+ TReassign tReassign = tReassignService.selectById(tReassignId);
+ model.addAttribute("item",tReassign);
+ LogObjectHolder.me().set(tReassign);
+ return PREFIX + "tReassign_edit.html";
+ }
+
+ /**
+ * 跳转到修改专车改派管理
+ */
+ @RequestMapping("/tReassign_reassignment/{tReassignId}")
+ public String tReassign_reassignment(@PathVariable Integer tReassignId, Model model) {
+ model.addAttribute("tReassignId",tReassignId);
+ return PREFIX + "tReassign_reassignment.html";
+ }
+
+ /**
+ * 跳转到修改跨城改派管理
+ */
+ @RequestMapping("/tReassign_reassignmentCross/{tReassignId}")
+ public String tReassign_reassignmentCross(@PathVariable Integer tReassignId, Model model) {
+ model.addAttribute("tReassignId",tReassignId);
+ return PREFIX + "tReassign_reassignmentCross.html";
+ }
+
+ /**
+ * 跳转到修改跨城改派管理
+ */
+ @RequestMapping("/tReassign_reassignmentSmall/{tReassignId}")
+ public String tReassign_reassignmentSmall(@PathVariable Integer tReassignId, Model model) {
+ model.addAttribute("tReassignId",tReassignId);
+ return PREFIX + "tReassign_reassignmentSmall.html";
+ }
+
+ /**
+ * 获取专车改派管理列表
+ */
+ @RequestMapping(value = "/list")
+ @ResponseBody
+ public Object list(String insertTime,
+ String originalDriverName,
+ String originalDriverPhone,
+ String orderNum,
+ String nowDriverName,
+ String nowDriverPhone,
+ Integer orderState,
+ Integer state) {
+ String beginTime = null;
+ String endTime = null;
+ if (SinataUtil.isNotEmpty(insertTime)){
+ String[] timeArray = insertTime.split(" - ");
+ beginTime = timeArray[0];
+ endTime = timeArray[1];
+ }
+ Page<Map<String, Object>> page = new PageFactory<Map<String, Object>>().defaultPage();
+ page.setRecords(tReassignService.getPrivateCarReassignOrderList(page,ShiroKit.getUser().getRoleType(),ShiroKit.getUser().getObjectId(),beginTime,endTime,originalDriverName,originalDriverPhone,orderNum,nowDriverName,nowDriverPhone,orderState,state));
+ return super.packForBT(page);
+ }
+
+ /**
+ * 获取跨城改派管理列表
+ */
+ @RequestMapping(value = "/listCross")
+ @ResponseBody
+ public Object listCross(String insertTime,
+ String originalDriverName,
+ String originalDriverPhone,
+ String orderNum,
+ String nowDriverName,
+ String nowDriverPhone,
+ Integer orderState,
+ Integer state) {
+ String beginTime = null;
+ String endTime = null;
+ if (SinataUtil.isNotEmpty(insertTime)){
+ String[] timeArray = insertTime.split(" - ");
+ beginTime = timeArray[0];
+ endTime = timeArray[1];
+ }
+ Page<Map<String, Object>> page = new PageFactory<Map<String, Object>>().defaultPage();
+ page.setRecords(tReassignService.getCrossReassignOrderList(page,ShiroKit.getUser().getRoleType(),ShiroKit.getUser().getObjectId(),beginTime,endTime,originalDriverName,originalDriverPhone,orderNum,nowDriverName,nowDriverPhone,orderState,state));
+ return super.packForBT(page);
+ }
+
+
+ /**
+ * 获取跨城改派管理列表
+ */
+ @RequestMapping(value = "/listSmallPieceLogistics")
+ @ResponseBody
+ public Object listSmallPieceLogistics(String insertTime,
+ String originalDriverName,
+ String originalDriverPhone,
+ String orderNum,
+ String nowDriverName,
+ String nowDriverPhone,
+ Integer orderState,
+ Integer state) {
+ String beginTime = null;
+ String endTime = null;
+ if (SinataUtil.isNotEmpty(insertTime)){
+ String[] timeArray = insertTime.split(" - ");
+ beginTime = timeArray[0];
+ endTime = timeArray[1];
+ }
+ Page<Map<String, Object>> page = new PageFactory<Map<String, Object>>().defaultPage();
+ page.setRecords(tReassignService.getSmallPieceLogisticsList(page,ShiroKit.getUser().getRoleType(),ShiroKit.getUser().getObjectId(),beginTime,endTime,originalDriverName,originalDriverPhone,orderNum,nowDriverName,nowDriverPhone,orderState,state));
+ return super.packForBT(page);
+ }
+
+
+ /**
+ * 选择司机列表
+ */
+ @RequestMapping(value = "/selectDriver/{orderId}")
+ @ResponseBody
+ public Object selectDriver(@PathVariable Integer orderId,
+ String name,
+ String phone) {
+ TReassign reassign = tReassignService.selectById(orderId);
+ TOrderPrivateCar privateCar = itOrderPrivateCarService.selectById(reassign.getOrderId());
+ Page<Map<String, Object>> page = new PageFactory<Map<String, Object>>().defaultPage();
+ page.setRecords(tReassignService.getCanSelectPrivateCarDriverList(page,privateCar.getCompanyId(),name,phone));
+ return super.packForBT(page);
+ }
+
+ /**
+ * 选择司机列表
+ */
+ @RequestMapping(value = "/selectCrossDriver/{orderId}")
+ @ResponseBody
+ public Object selectCrossDriver(@PathVariable Integer orderId,
+ String name,
+ String phone) {
+ TReassign reassign = tReassignService.selectById(orderId);
+ TOrderCrossCity tOrderCrossCity = itOrderCrossCityService.selectById(reassign.getOrderId());
+ LineShiftDriver lineShiftDriver = lineShiftDriverMapper.selectById(tOrderCrossCity.getLineShiftDriverId());
+ Page<Map<String, Object>> page = new PageFactory<Map<String, Object>>().defaultPage();
+ page.setRecords(tReassignService.getCanSelectCrossDriverList(page, tOrderCrossCity.getCompanyId(), tOrderCrossCity.getServerCarModelId(),
+ tOrderCrossCity.getLineId(), lineShiftDriver.getLineShiftId(), tOrderCrossCity.getTravelTime(), tOrderCrossCity.getPeopleNumber(), name, phone, tOrderCrossCity.getDriverId()));
+ return super.packForBT(page);
+ }
+
+
+ /**
+ * 选择司机列表
+ */
+ @RequestMapping(value = "/selectSmallDriver/{orderId}")
+ @ResponseBody
+ public Object selectSmallDriver(@PathVariable Integer orderId,
+ String name,
+ String phone) {
+ TReassign reassign = tReassignService.selectById(orderId);
+ TOrderLogistics tOrderLogistics = orderLogisticsService.selectById(reassign.getOrderId());
+ Page<Map<String, Object>> page = new PageFactory<Map<String, Object>>().defaultPage();
+ page.setRecords(tReassignService.getCanSelectSmallDriverList(page,tOrderLogistics.getCompanyId(), tOrderLogistics.getType(),name,phone));
+ return super.packForBT(page);
+ }
+
+
+ /**
+ * 操作专车改派管理
+ * optType 1=拒绝 2=取消
+ */
+ @RequestMapping(value = "/opt")
+ @ResponseBody
+ public Object opt(@RequestParam Integer tReassignId,@RequestParam Integer optType) {
+ ShiroUser user = ShiroKit.getUser();
+ TReassign tReassign = tReassignService.selectById(tReassignId);
+ if (1 == optType){
+ tReassign.setState(5);
+ tReassignService.updateById(tReassign);
+
+ //还原订单状态
+ TOrderPrivateCar tOrderPrivateCar = itOrderPrivateCarService.selectById(tReassign.getOrderId());
+ tOrderPrivateCar.setState(tOrderPrivateCar.getOldState());
+ itOrderPrivateCarService.updateById(tOrderPrivateCar);
+ }else if (2 == optType){
+ tReassign.setState(4);
+ tReassignService.updateById(tReassign);
+
+ //修改订单状态"已取消"
+ TOrderPrivateCar tOrderPrivateCar = itOrderPrivateCarService.selectById(tReassign.getOrderId());
+ tOrderPrivateCar.setState(10);
+ itOrderPrivateCarService.updateById(tOrderPrivateCar);
+
+ //修改司机状态"空闲"
+ TDriver driver = itDriverService.selectById(tReassign.getOriginalDriverId());
+ driver.setState(2);
+ itDriverService.updateById(driver);
+
+ //添加取消记录
+ OrderCancel orderCancel = new OrderCancel();
+ orderCancel.setOrderId(tReassign.getOrderId());
+ orderCancel.setOrderType(tReassign.getOrderType());
+ orderCancel.setReason("调度端取消订单");
+ orderCancel.setRemark("调度“" + user.getName() + "-" + user.getId() + "”执行取消操作");
+ orderCancel.setState(2);
+ orderCancel.setInsertTime(new Date());
+ orderCancel.setUserType(3);
+ orderCancel.setUserId(user.getId());
+ orderCancelMapper.insert(orderCancel);
+
+ //调用推送
+ Map<String,String> map = new HashMap<>();
+ map.put("id", tOrderPrivateCar.getId().toString());
+ map.put("orderType", "1");
+ String result = HttpRequestUtil.postRequest(PushURL.cancel_order_url, map);
+ System.out.println("专车取消:【orderId="+tOrderPrivateCar.getId().toString()+"】,调用接口:"+result);
+ }
+
+ //返回驾驶员处罚金
+ TDriver originalDriver = itDriverService.selectById(tReassign.getOriginalDriverId());
+
+ //增加交易明细
+ TPubTransactionDetails details = new TPubTransactionDetails();
+ details.setUserId(originalDriver.getId());
+ details.setInsertTime(new Date());
+ details.setRemark("【专车改派】:改派失败或订单取消");
+ details.setMoney(new BigDecimal(tReassign.getMoney()));
+ details.setState(1);
+ details.setType(1);
+ details.setUserType(2);
+ details.setOrderType(3);
+ details.setOrderId(tReassign.getOrderId());
+ itPubTransactionDetailsService.insert(details);
+ return SUCCESS_TIP;
+ }
+
+ @Autowired
+ private ITPubTransactionDetailsService itPubTransactionDetailsService;
+
+ /**
+ * 操作跨城改派管理
+ * optType 1=拒绝 2=取消
+ */
+ @RequestMapping(value = "/optCross")
+ @ResponseBody
+ public Object optCross(@RequestParam Integer tReassignId,@RequestParam Integer optType) {
+ try {
+ TReassign tReassign = tReassignService.selectById(tReassignId);
+ ShiroUser user = ShiroKit.getUser();
+ if (1 == optType){
+ tReassign.setState(5);
+ tReassign.setReviewer(user.getId());
+ tReassign.setReviewerType(2);
+ tReassignService.updateById(tReassign);
+
+ //还原订单状态
+ TOrderCrossCity tOrderCrossCity = itOrderCrossCityService.selectById(tReassign.getOrderId());
+ tOrderCrossCity.setState(tOrderCrossCity.getOldState());
+ itOrderCrossCityService.updateById(tOrderCrossCity);
+ }else if (2 == optType){
+ tReassign.setState(4);
+ tReassign.setReviewer(user.getId());
+ tReassign.setReviewerType(2);
+ tReassignService.updateById(tReassign);
+
+ TOrderCrossCity orderCrossCity = itOrderCrossCityService.selectById(tReassign.getOrderId());
+ if(orderCrossCity.getState() > 5 && orderCrossCity.getState() != 11){
+ return ResultUtil.error("订单状态不在可取消范围内");
+ }
+ orderCrossCity.setState(10);
+ itOrderCrossCityService.updateById(orderCrossCity);
+
+ //修改司机信息
+ LineShiftDriver lineShiftDriver = lineShiftDriverMapper.selectById(orderCrossCity.getLineShiftDriverId());
+ lineShiftDriver.setLaveSeat(lineShiftDriver.getLaveSeat() + orderCrossCity.getPeopleNumber() > lineShiftDriver.getTotalSeat() ?
+ lineShiftDriver.getTotalSeat() : lineShiftDriver.getLaveSeat() + orderCrossCity.getPeopleNumber());
+ String seat = "";
+ String[] split = orderCrossCity.getSeatNumber().split(",");
+ for(String s : split){
+ seat += s + ",";
+ }
+ seat = lineShiftDriver.getLaveSeatNumber() + "," + seat.substring(0, seat.length() - 1);
+
+ //总和大于总座位数的情况
+ if(lineShiftDriver.getLaveSeat() + orderCrossCity.getPeopleNumber() > lineShiftDriver.getTotalSeat()){
+ seat = "";
+ for(int i = 1; i <= lineShiftDriver.getTotalSeat(); i++){
+ seat += i + ",";
+ }
+ seat = seat.substring(0, seat.length() - 1);
+ }
+ lineShiftDriver.setLaveSeatNumber(seat);
+ lineShiftDriverMapper.updateById(lineShiftDriver);
+ if(lineShiftDriver.getLaveSeat() >= lineShiftDriver.getTotalSeat()){
+ TDriver driver = itDriverService.selectById(tReassign.getOriginalDriverId());
+ driver.setState(2);
+ itDriverService.updateById(driver);
+ }
+
+ //调用推送
+ Map<String,String> map = new HashMap<>();
+ map.put("id", orderCrossCity.getId().toString());
+ map.put("orderType", "3");
+ String result = HttpRequestUtil.postRequest(PushURL.cancel_order_url, map);
+ System.out.println("跨城出行取消:【orderId="+orderCrossCity.getId().toString()+"】,调用接口:"+result);
+
+
+ //已支付的情况下进行退款操作
+ if(null != orderCrossCity.getPayType() && null != orderCrossCity.getPayMoney()){
+ if(orderCrossCity.getPayType() == 3){//余额支付
+ TUser tUser = userService.selectById(orderCrossCity.getUserId());
+ tUser.setBalance(tUser.getBalance().add(orderCrossCity.getPayMoney()));
+ userService.updateById(tUser);
+ //添加交易明细
+ transactionDetailsService.saveData(orderCrossCity.getUserId(), "跨城订单取消退款", orderCrossCity.getPayMoney().doubleValue(), 1, 1, 1, 3, tReassign.getOrderId());
+ }else{
+ PaymentRecord query = paymentRecordService.query(1, null, null, tReassign.getOrderId(), 3, null, 2).get(0);
+ if(null == query){
+ return ResultUtil.error("订单还未进行支付");
+ }
+ }
+
+ //添加负的收入明细
+ List<Income> incomes = incomeService.selectList(new EntityWrapper<Income>().eq("type", 2).eq("incomeId", tReassign.getOrderId()).eq("orderType", 3));
+ for(Income income : incomes){
+ if(income.getUserType() == 2){//处理司机的收入
+ TDriver driver = itDriverService.selectById(income.getObjectId());
+ driver.setBalance(driver.getBalance().subtract(new BigDecimal(income.getMoney())));
+ driver.setLaveBusinessMoney(new BigDecimal(driver.getLaveBusinessMoney()).subtract(new BigDecimal(income.getMoney())).doubleValue());
+ driver.setBusinessMoney(new BigDecimal(driver.getBusinessMoney()).subtract(new BigDecimal(income.getMoney())).doubleValue());
+ itDriverService.updateById(driver);
+ }
+ Income income1 = new Income();
+ BeanUtils.copyProperties(income, income1);
+ income1.setMoney(income.getMoney() * -1);
+ income1.setId(null);
+ income1.setInsertTime(new Date());
+ incomeService.insert(income1);
+ }
+ }
+
+ //添加取消记录
+ OrderCancel orderCancel = new OrderCancel();
+ orderCancel.setOrderId(tReassign.getOrderId());
+ orderCancel.setOrderType(tReassign.getOrderType());
+ orderCancel.setReason("调度端取消订单");
+ orderCancel.setRemark("调度“" + user.getName() + "-" + user.getId() + "”执行取消操作");
+ orderCancel.setState(2);
+ orderCancel.setInsertTime(new Date());
+ orderCancel.setUserType(3);
+ orderCancel.setUserId(user.getId());
+ orderCancelMapper.insert(orderCancel);
+ }
+
+ //返回驾驶员处罚金
+ TDriver originalDriver = itDriverService.selectById(tReassign.getOriginalDriverId());
+
+ //增加交易明细
+ TPubTransactionDetails details = new TPubTransactionDetails();
+ details.setUserId(originalDriver.getId());
+ details.setInsertTime(new Date());
+ details.setRemark("【跨城改派】:改派失败或订单取消");
+ details.setMoney(new BigDecimal(tReassign.getMoney()));
+ details.setState(1);
+ details.setType(1);
+ details.setUserType(2);
+ details.setOrderType(3);
+ details.setOrderId(tReassign.getOrderId());
+ itPubTransactionDetailsService.insert(details);
+ }catch (Exception e){
+ e.printStackTrace();
+ }
+ return SUCCESS_TIP;
+ }
+
+
+
+ /**
+ * 操作专车改派管理
+ * optType 1=拒绝 2=取消
+ */
+ @RequestMapping(value = "/optSmall")
+ @ResponseBody
+ public Object optSmall(@RequestParam Integer tReassignId,@RequestParam Integer optType) {
+ try {
+ ShiroUser user = ShiroKit.getUser();
+ TReassign tReassign = tReassignService.selectById(tReassignId);
+ if (1 == optType){
+ tReassign.setState(5);
+ tReassignService.updateById(tReassign);
+
+ //还原订单状态
+ TOrderLogistics tOrderLogistics = orderLogisticsService.selectById(tReassign.getOrderId());
+ tOrderLogistics.setState(tOrderLogistics.getOldState());
+ orderLogisticsService.updateById(tOrderLogistics);
+ }else if (2 == optType){
+ tReassign.setState(4);
+ tReassignService.updateById(tReassign);
+
+ //修改订单状态"已取消"
+ TOrderLogistics tOrderLogistics = orderLogisticsService.selectById(tReassign.getOrderId());
+ tOrderLogistics.setState(10);
+ orderLogisticsService.updateById(tOrderLogistics);
+
+ //添加取消记录
+ OrderCancel orderCancel = new OrderCancel();
+ orderCancel.setOrderId(tReassign.getOrderId());
+ orderCancel.setOrderType(tReassign.getOrderType());
+ orderCancel.setReason("调度端取消订单");
+ orderCancel.setRemark("调度“" + user.getName() + "-" + user.getId() + "”执行取消操作");
+ orderCancel.setState(2);
+ orderCancel.setInsertTime(new Date());
+ orderCancel.setUserType(3);
+ orderCancel.setUserId(user.getId());
+ orderCancelMapper.insert(orderCancel);
+
+ //调用推送
+ Map<String,String> map = new HashMap<>();
+ map.put("id", tOrderLogistics.getId().toString());
+ map.put("orderType", tOrderLogistics.getType().toString());
+ String result = HttpRequestUtil.postRequest(PushURL.cancel_order_url, map);
+ System.out.println("小件物流取消:【orderId="+tOrderLogistics.getId().toString()+"】,调用接口:"+result);
+
+ //已支付的情况下进行退款操作
+ if(null != tOrderLogistics.getPayType() && null != tOrderLogistics.getPayMoney()) {
+ if (tOrderLogistics.getPayType() == 3) {//余额支付
+ TUser tUser = userService.selectById(tOrderLogistics.getUserId());
+ tUser.setBalance(tUser.getBalance().add(tOrderLogistics.getPayMoney()));
+ userService.updateById(tUser);
+ } else {
+ List<PaymentRecord> paymentRecords = paymentRecordService.query(1, null, null, tOrderLogistics.getId(), tOrderLogistics.getType(), null, 2);
+ if (paymentRecords.size() == 0) {
+ return ResultUtil.error("订单还未进行支付");
+ }
+
+ }
+
+ transactionDetailsService.saveData(tOrderLogistics.getUserId(), "小件订单取消退款", tOrderLogistics.getPayMoney().doubleValue(), 1, 1, 1, 4, tOrderLogistics.getId());
+
+ //添加负的收入明细
+ List<Income> incomes = incomeService.selectList(new EntityWrapper<Income>().eq("type", 2).eq("incomeId", tOrderLogistics.getId()).eq("orderType", tOrderLogistics.getType()));
+ for(Income income : incomes){
+ if(income.getUserType() == 2){//处理司机的收入
+ TDriver driver = itDriverService.selectById(income.getObjectId());
+ driver.setBalance(driver.getBalance().subtract(new BigDecimal(income.getMoney())));
+ driver.setLaveBusinessMoney(new BigDecimal(driver.getLaveBusinessMoney()).subtract(new BigDecimal(income.getMoney())).doubleValue());
+ driver.setBusinessMoney(new BigDecimal(driver.getBusinessMoney()).subtract(new BigDecimal(income.getMoney())).doubleValue());
+ itDriverService.updateById(driver);
+ }
+ Income income1 = new Income();
+ BeanUtils.copyProperties(income, income1);
+ income1.setMoney(income.getMoney() * -1);
+ income1.setId(null);
+ income1.setInsertTime(new Date());
+ incomeService.insert(income1);
+ }
+ }
+ }
+ //返回驾驶员处罚金
+ TDriver originalDriver = itDriverService.selectById(tReassign.getOriginalDriverId());
+
+ //增加交易明细
+ TPubTransactionDetails details = new TPubTransactionDetails();
+ details.setUserId(originalDriver.getId());
+ details.setInsertTime(new Date());
+ details.setRemark("【小件物流】:改派失败或订单取消");
+ details.setMoney(new BigDecimal(tReassign.getMoney()));
+ details.setState(1);
+ details.setType(1);
+ details.setUserType(2);
+ details.setOrderType(tReassign.getOrderType());
+ details.setOrderId(tReassign.getOrderId());
+ itPubTransactionDetailsService.insert(details);
+ }catch (Exception e){
+ e.printStackTrace();
+ }
+ return SUCCESS_TIP;
+ }
+
+
+ /**
+ * 专车订单改派司机
+ */
+ @RequestMapping(value = "/selectDriver")
+ @ResponseBody
+ public Object selectDriver(@RequestParam Integer orderId,@RequestParam Integer driverId) {
+ //修改订单
+ TReassign tReassign = tReassignService.selectById(orderId);
+ TOrderPrivateCar tOrderPrivateCar = itOrderPrivateCarService.selectById(tReassign.getOrderId());
+
+ //修改之前司机状态 -- 空闲
+ TDriver oldDriver = itDriverService.selectById(tReassign.getOriginalDriverId());
+ oldDriver.setState(2);
+ itDriverService.updateById(oldDriver);
+
+ //查找司机对象
+ TDriver nowDriver = itDriverService.selectById(driverId);
+ nowDriver.setState(3);
+ itDriverService.updateById(nowDriver);
+
+ //修改专车订单
+ tOrderPrivateCar.setState(tOrderPrivateCar.getOldState());
+ tOrderPrivateCar.setDriverId(driverId);
+ tOrderPrivateCar.setCarId(nowDriver.getCarId());
+ itOrderPrivateCarService.updateById(tOrderPrivateCar);
+
+ //修改专车改派订单
+ tReassign.setNowDriverId(driverId);
+ tReassign.setNowCarId(nowDriver.getCarId());
+ tReassign.setState(3);
+ tReassign.setCompleteTime(new Date());
+ tReassignService.updateById(tReassign);
+
+ //增加推送
+ Map<String,String> map = new HashMap<>();
+ map.put("orderId", tOrderPrivateCar.getId().toString());
+ map.put("orderType", "1");
+ String result = HttpRequestUtil.postRequest(PushURL.order_push_url, map);
+ System.out.println("专车改派:【orderId="+tOrderPrivateCar.getId().toString()+"】,调用接口:"+result);
+ return SUCCESS_TIP;
+ }
+
+ /**
+ * 跨城出行订单改派司机
+ */
+ @RequestMapping(value = "/selectCrossDriver")
+ @ResponseBody
+ public Object selectCrossDriver(@RequestParam Integer orderId,@RequestParam Integer driverId) {
+ //修改原司机信息
+ //修改订单
+ TReassign tReassign = tReassignService.selectById(orderId);
+ TOrderCrossCity tOrderCrossCity = itOrderCrossCityService.selectById(tReassign.getOrderId());
+ TDriver oldDriver = itDriverService.selectById(tReassign.getOriginalDriverId());
+ LineShiftDriver lineShiftDriver = lineShiftDriverMapper.selectById(tOrderCrossCity.getLineShiftDriverId());
+ lineShiftDriver.setLaveSeat(lineShiftDriver.getLaveSeat() + tOrderCrossCity.getPeopleNumber() > lineShiftDriver.getTotalSeat() ?
+ lineShiftDriver.getTotalSeat() : lineShiftDriver.getLaveSeat() + tOrderCrossCity.getPeopleNumber());
+ String seat = "";
+ String[] split = tOrderCrossCity.getSeatNumber().split(",");
+ for(String s : split){
+ seat += s + ",";
+ }
+ seat = lineShiftDriver.getLaveSeatNumber() + "," + seat.substring(0, seat.length() - 1);
+
+ //总和大于总座位数的情况
+ if(lineShiftDriver.getLaveSeat() + tOrderCrossCity.getPeopleNumber() > lineShiftDriver.getTotalSeat()){
+ seat = "";
+ for(int i = 1; i <= lineShiftDriver.getTotalSeat(); i++){
+ seat += i + ",";
+ }
+ seat = seat.substring(0, seat.length() - 1);
+ }
+ lineShiftDriver.setLaveSeatNumber(seat);
+ lineShiftDriverMapper.updateById(lineShiftDriver);
+ if(lineShiftDriver.getLaveSeat() >= lineShiftDriver.getTotalSeat()){
+ oldDriver.setState(2);
+ itDriverService.updateById(oldDriver);
+ }
+
+ //修改新司机数据
+ List<LineShiftDriver> query = lineShiftDriverMapper.query(lineShiftDriver.getLineShiftId(), driverId, tOrderCrossCity.getTravelTime());
+ if(query.size() == 0){
+ return ResultUtil.error("司机没有预约班次");
+ }
+ LineShiftDriver lineShiftDriver1 = query.get(0);
+ if(lineShiftDriver1.getLaveSeat() < tOrderCrossCity.getPeopleNumber()){
+ return ResultUtil.runErr("司机车辆剩余座位数不足");
+ }
+ lineShiftDriver1.setLaveSeat(lineShiftDriver1.getLaveSeat() - tOrderCrossCity.getPeopleNumber());
+ String[] split1 = lineShiftDriver1.getLaveSeatNumber().split(",");
+ String seat1 = "";//使用
+ String seat2 = "";//未使用
+ for(int i = 0; i < tOrderCrossCity.getPeopleNumber(); i++){
+ seat1 += split1[i] + ",";
+ }
+ for(int i = tOrderCrossCity.getPeopleNumber(); i < split.length; i++){
+ seat2 += split1[i] + ",";
+ }
+ lineShiftDriver1.setLaveSeatNumber(seat2);
+ lineShiftDriverMapper.updateById(lineShiftDriver1);
+ TDriver driver = itDriverService.selectById(driverId);
+ if(driver.getState() == 1){
+ return ResultUtil.error("司机还未上班呢");
+ }
+ if(driver.getState() == 2){
+ driver.setState(3);
+ }
+
+ //修改订单数据
+ tOrderCrossCity.setDriverId(driverId);
+ tOrderCrossCity.setCarId(driver.getCarId());
+ tOrderCrossCity.setSeatNumber(seat1);
+ tOrderCrossCity.setState(tOrderCrossCity.getOldState());
+ tOrderCrossCity.setLineShiftDriverId(lineShiftDriver1.getId());
+ tOrderCrossCity.setOldState(null);
+ tOrderCrossCity.setIsReassign(2);
+ try {
+ tOrderCrossCity.setOrderNum(itOrderCrossCityService.getOrderNum(driverId, tOrderCrossCity.getLineShiftDriverId()));
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ itOrderCrossCityService.updateAllColumnById(tOrderCrossCity);
+
+ //修改专车改派订单
+ tReassign.setNowDriverId(driverId);
+ tReassign.setNowCarId(driver.getCarId());
+ tReassign.setState(3);
+ tReassign.setCompleteTime(new Date());
+ tReassignService.updateById(tReassign);
+
+ //修改收入明细，转给新司机（因为是先支付金额）
+ List<Income> incomes = incomeService.selectList(new EntityWrapper<Income>().eq("userType", 2).eq("objectId", oldDriver.getId()).eq("type", 2).eq("incomeId", tReassign.getOrderId()).eq("orderType", 3));
+ if(incomes.size() > 0){
+ Income income = incomes.get(0);
+ income.setObjectId(driverId);
+ incomeService.updateById(income);
+
+ oldDriver.setBusinessMoney(oldDriver.getBusinessMoney() - income.getMoney());
+ oldDriver.setLaveBusinessMoney(oldDriver.getLaveBusinessMoney() - income.getMoney());
+ oldDriver.setBalance(oldDriver.getBalance().subtract(new BigDecimal(income.getMoney())));
+
+ driver.setBusinessMoney(driver.getBusinessMoney() + income.getMoney());
+ driver.setLaveBusinessMoney(driver.getLaveBusinessMoney() + income.getMoney());
+ driver.setBalance(driver.getBalance().add(new BigDecimal(income.getMoney())));
+
+ }
+ itDriverService.updateById(oldDriver);
+ itDriverService.updateById(driver);
+ //增加推送
+ Map<String,String> map = new HashMap<>();
+ map.put("orderId", tOrderCrossCity.getId().toString());
+ map.put("orderType", "3");
+ String result = HttpRequestUtil.postRequest(PushURL.order_push_url, map);
+ System.out.println("跨城出行改派:【orderId="+tOrderCrossCity.getId().toString()+"】,调用接口:"+result);
+ return SUCCESS_TIP;
+ }
+
+
+ /**
+ * 专车订单改派司机
+ */
+ @RequestMapping(value = "/selectSmallDriver")
+ @ResponseBody
+ public Object selectSmallDriver(@RequestParam Integer orderId,@RequestParam Integer driverId) {
+ //修改订单
+ TReassign tReassign = tReassignService.selectById(orderId);
+ TOrderLogistics tOrderLogistics = orderLogisticsService.selectById(tReassign.getOrderId());
+
+ TDriver nowDriver = itDriverService.selectById(driverId);
+ //修改专车订单
+ tOrderLogistics.setState(tOrderLogistics.getOldState());
+ tOrderLogistics.setDriverId(driverId);
+ tOrderLogistics.setCarId(nowDriver.getCarId());
+ orderLogisticsService.updateById(tOrderLogistics);
+
+ tReassign.setNowDriverId(driverId);
+ tReassign.setNowCarId(nowDriver.getCarId());
+ tReassign.setState(3);
+ tReassign.setCompleteTime(new Date());
+ tReassignService.updateById(tReassign);
+
+ List<Income> incomes = incomeService.selectList(new EntityWrapper<Income>().eq("userType", 2).eq("type", 2).eq("incomeId", tOrderLogistics.getId()).eq("orderType", tOrderLogistics.getType()));
+ for(Income income : incomes){
+ income.setObjectId(driverId);
+ incomeService.updateById(income);
+
+ TDriver driver = itDriverService.selectById(tReassign.getOriginalDriverId());
+ driver.setBalance(driver.getBalance().subtract(new BigDecimal(income.getMoney())));
+ driver.setBusinessMoney(driver.getBusinessMoney() - income.getMoney());
+ driver.setLaveBusinessMoney(driver.getLaveBusinessMoney() - income.getMoney());
+ itDriverService.updateById(driver);
+
+ driver = itDriverService.selectById(driverId);
+ driver.setBalance(driver.getBalance().add(new BigDecimal(income.getMoney())));
+ driver.setBusinessMoney(driver.getBusinessMoney() + income.getMoney());
+ driver.setLaveBusinessMoney(driver.getLaveBusinessMoney() + income.getMoney());
+ itDriverService.updateById(driver);
+ }
+
+ //增加推送
+ Map<String,String> map = new HashMap<>();
+ map.put("orderId", tOrderLogistics.getId().toString());
+ map.put("orderType", tOrderLogistics.getType().toString());
+ String result = HttpRequestUtil.postRequest(PushURL.order_push_url, map);
+ System.out.println("小件物流改派:【orderId="+tOrderLogistics.getId().toString()+"】,调用接口:"+result);
+ return SUCCESS_TIP;
+ }
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TServerCarmodelController.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TServerCarmodelController.java
new file mode 100644
index 0000000..4844438
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TServerCarmodelController.java
@@ -0,0 +1,285 @@
+package com.stylefeng.guns.modular.system.controller.specialTrain;
+
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.baomidou.mybatisplus.plugins.Page;
+import com.stylefeng.guns.core.base.controller.BaseController;
+import com.stylefeng.guns.core.base.tips.ErrorTip;
+import com.stylefeng.guns.core.common.constant.factory.PageFactory;
+import com.stylefeng.guns.core.shiro.ShiroKit;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.beans.factory.annotation.Autowired;
+import com.stylefeng.guns.core.log.LogObjectHolder;
+import org.springframework.web.bind.annotation.RequestParam;
+import com.stylefeng.guns.modular.system.model.TServerCarmodel;
+import com.stylefeng.guns.modular.system.service.ITServerCarmodelService;
+
+import java.util.Date;
+import java.util.Map;
+
+/**
+ * 专车车型设置控制器
+ *
+ * @author fengshuonan
+ * @Date 2020-08-29 09:06:02
+ */
+@Controller
+@RequestMapping("/tServerCarmodel")
+public class TServerCarmodelController extends BaseController {
+
+ private String PREFIX = "/system/tServerCarmodel/";
+
+ @Autowired
+ private ITServerCarmodelService tServerCarmodelService;
+
+ /**
+ * 跳转到专车车型设置首页
+ */
+ @RequestMapping("")
+ public String index() {
+ return PREFIX + "tServerCarmodel.html";
+ }
+
+ /**
+ * 跳转到跨城车型设置首页
+ */
+ @RequestMapping("/acrossCity")
+ public String acrossCity() {
+ return PREFIX + "acrossCity.html";
+ }
+
+ /**
+ * 跳转到包车车型设置首页
+ */
+ @RequestMapping("/charter")
+ public String charter() {
+ return PREFIX + "charter.html";
+ }
+
+ /**
+ * 跳转到添加专车车型设置
+ */
+ @RequestMapping("/tServerCarmodel_add")
+ public String tServerCarmodelAdd() {
+ return PREFIX + "tServerCarmodel_add.html";
+ }
+
+
+ /**
+ * 跳转到添加专车车型设置
+ */
+ @RequestMapping("/tServerCarmodel_edit")
+ public String tServerCarmodelAddEdit(Integer id, Model model) {
+ TServerCarmodel tServerCarmodel = tServerCarmodelService.selectById(id);
+ model.addAttribute("data", tServerCarmodel);
+ return PREFIX + "tServerCarmodel_edit.html";
+ }
+
+ /**
+ * 跳转到添加跨城车型设置
+ */
+ @RequestMapping("/acrossCity_add")
+ public String acrossCity_add() {
+ return PREFIX + "acrossCity_add.html";
+ }
+
+
+ /**
+ * 跳转到添加跨城车型设置
+ */
+ @RequestMapping("/acrossCity_edit")
+ public String acrossCity_update(Integer id, Model model) {
+ TServerCarmodel tServerCarmodel = tServerCarmodelService.selectById(id);
+ model.addAttribute("data", tServerCarmodel);
+ return PREFIX + "acrossCity_edit.html";
+ }
+
+
+ /**
+ * 跳转到添加包车车型设置
+ */
+ @RequestMapping("/charter_add")
+ public String charter_add() {
+ return PREFIX + "charter_add.html";
+ }
+
+
+ /**
+ * 跳转到添加包车车型设置
+ */
+ @RequestMapping("/charter_edit")
+ public String charter_edit(Integer id, Model model) {
+ TServerCarmodel tServerCarmodel = tServerCarmodelService.selectById(id);
+ model.addAttribute("data", tServerCarmodel);
+ model.addAttribute("price1", tServerCarmodel.getPrice().split("-")[0]);
+ model.addAttribute("price2", tServerCarmodel.getPrice().split("-")[1]);
+ return PREFIX + "charter_edit.html";
+ }
+
+
+ /**
+ * 获取专车车型设置列表
+ */
+ @RequestMapping(value = "/list")
+ @ResponseBody
+ public Object list(String name,Integer state) {
+ Page<Map<String, Object>> page = new PageFactory<Map<String, Object>>().defaultPage();
+ if (ShiroKit.getUser().getRoleType() != 1){
+ page.setRecords(null);
+ }else{
+ page.setRecords(tServerCarmodelService.getServerCarModelList(page,1,name,state));
+ }
+ return super.packForBT(page);
+ }
+
+ /**
+ * 获取跨城车型设置列表
+ */
+ @RequestMapping(value = "/listAcrossCity")
+ @ResponseBody
+ public Object listAcrossCity(String name,Integer state) {
+ Page<Map<String, Object>> page = new PageFactory<Map<String, Object>>().defaultPage();
+ if (ShiroKit.getUser().getRoleType() != 1){
+ page.setRecords(null);
+ }else{
+ page.setRecords(tServerCarmodelService.getServerCarModelList(page,2,name,state));
+ }
+ return super.packForBT(page);
+ }
+
+ /**
+ * 获取包车车型设置列表
+ */
+ @RequestMapping(value = "/listCharter")
+ @ResponseBody
+ public Object listCharter(String name,Integer state) {
+ Page<Map<String, Object>> page = new PageFactory<Map<String, Object>>().defaultPage();
+ if (ShiroKit.getUser().getRoleType() != 1){
+ page.setRecords(null);
+ }else{
+ page.setRecords(tServerCarmodelService.getServerCarModelList(page,3,name,state));
+ }
+ return super.packForBT(page);
+ }
+
+ /**
+ * 新增专车车型设置
+ */
+ @RequestMapping(value = "/add")
+ @ResponseBody
+ public Object add(TServerCarmodel tServerCarmodel) {
+ int count = tServerCarmodelService.selectCount(new EntityWrapper<TServerCarmodel>().eq("type", 1)
+ .eq("name", tServerCarmodel.getName()).last(" and not FIND_IN_SET(state,'3')"));
+ if (count > 0){
+ return new ErrorTip(500, "【"+tServerCarmodel.getName()+"】已存在,请重新输入");
+ }
+ tServerCarmodel.setInsertTime(new Date());
+ tServerCarmodel.setState(1);
+ tServerCarmodel.setType(1);
+ tServerCarmodelService.insert(tServerCarmodel);
+ return SUCCESS_TIP;
+ }
+
+ /**
+ * 修改专车型设置
+ */
+ @RequestMapping(value = "/update")
+ @ResponseBody
+ public Object update(TServerCarmodel tServerCarmodel) {
+ tServerCarmodel.setInsertTime(new Date());
+ tServerCarmodel.setState(1);
+ tServerCarmodel.setType(1);
+ tServerCarmodelService.updateById(tServerCarmodel);
+ return SUCCESS_TIP;
+ }
+
+
+
+ /**
+ * 新增跨城车型设置
+ */
+ @RequestMapping(value = "/addAcrossCity")
+ @ResponseBody
+ public Object addAcrossCity(TServerCarmodel tServerCarmodel) {
+ int count = tServerCarmodelService.selectCount(new EntityWrapper<TServerCarmodel>().eq("type", 2)
+ .eq("name", tServerCarmodel.getName()).last(" and not FIND_IN_SET(state,'3')"));
+ if (count > 0){
+ return new ErrorTip(500, "【"+tServerCarmodel.getName()+"】已存在,请重新输入");
+ }
+ tServerCarmodel.setInsertTime(new Date());
+ tServerCarmodel.setState(1);
+ tServerCarmodel.setType(2);
+ tServerCarmodelService.insert(tServerCarmodel);
+ return SUCCESS_TIP;
+ }
+
+
+ /**
+ * 修改跨城车型设置
+ */
+ @RequestMapping(value = "/editAcrossCity")
+ @ResponseBody
+ public Object editAcrossCity(TServerCarmodel tServerCarmodel) {
+ tServerCarmodel.setInsertTime(new Date());
+ tServerCarmodel.setState(1);
+ tServerCarmodel.setType(2);
+ tServerCarmodelService.updateById(tServerCarmodel);
+ return SUCCESS_TIP;
+ }
+
+
+
+ /**
+ * 新增包车车型设置
+ */
+ @RequestMapping(value = "/addCharter")
+ @ResponseBody
+ public Object addCharter(TServerCarmodel tServerCarmodel) {
+ int count = tServerCarmodelService.selectCount(new EntityWrapper<TServerCarmodel>().eq("type", 3)
+ .eq("name", tServerCarmodel.getName()).last(" and not FIND_IN_SET(state,'3')"));
+ if (count > 0){
+ return new ErrorTip(500, "【"+tServerCarmodel.getName()+"】已存在,请重新输入");
+ }
+ tServerCarmodel.setInsertTime(new Date());
+ tServerCarmodel.setState(1);
+ tServerCarmodel.setType(3);
+ tServerCarmodelService.insert(tServerCarmodel);
+ return SUCCESS_TIP;
+ }
+
+ /**
+ * 新增包车车型设置
+ */
+ @RequestMapping(value = "/editCharter")
+ @ResponseBody
+ public Object editCharter(TServerCarmodel tServerCarmodel) {
+ tServerCarmodel.setInsertTime(new Date());
+ tServerCarmodel.setState(1);
+ tServerCarmodel.setType(3);
+ tServerCarmodelService.updateById(tServerCarmodel);
+ return SUCCESS_TIP;
+ }
+
+
+
+ /**
+ * 禁用/启用
+ */
+ @RequestMapping(value = "/opt")
+ @ResponseBody
+ public Object opt(@RequestParam Integer optType,@RequestParam Integer tServerCarmodelId) {
+ TServerCarmodel one = tServerCarmodelService.selectById(tServerCarmodelId);
+ if (1 == optType){ //禁用
+ one.setState(2);
+ }else if (2 == optType){ //启用
+ one.setState(1);
+ }
+ tServerCarmodelService.updateById(one);
+ return SUCCESS_TIP;
+ }
+
+
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TSiteController.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TSiteController.java
new file mode 100644
index 0000000..a44d3f5
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TSiteController.java
@@ -0,0 +1,285 @@
+package com.stylefeng.guns.modular.system.controller.specialTrain;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.baomidou.mybatisplus.plugins.Page;
+import com.stylefeng.guns.core.base.controller.BaseController;
+import com.stylefeng.guns.core.common.constant.factory.PageFactory;
+import com.stylefeng.guns.core.shiro.ShiroKit;
+import com.stylefeng.guns.core.util.DateUtil;
+import com.stylefeng.guns.core.util.SinataUtil;
+import com.stylefeng.guns.core.util.ToolUtil;
+import com.stylefeng.guns.modular.system.model.TDriverLine;
+import com.stylefeng.guns.modular.system.model.TLocation;
+import com.stylefeng.guns.modular.system.model.TRegion;
+import com.stylefeng.guns.modular.system.service.ITLocationService;
+import com.stylefeng.guns.modular.system.service.ITRegionService;
+import com.stylefeng.guns.modular.system.util.GDMapElectricFenceUtil;
+import com.stylefeng.guns.modular.system.util.ResultUtil;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.beans.factory.annotation.Autowired;
+import com.stylefeng.guns.core.log.LogObjectHolder;
+import org.springframework.web.bind.annotation.RequestParam;
+import com.stylefeng.guns.modular.system.model.TSite;
+import com.stylefeng.guns.modular.system.service.ITSiteService;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 跨城站点管理控制器
+ *
+ * @author fengshuonan
+ * @Date 2020-09-04 10:35:51
+ */
+@Controller
+@RequestMapping("/tSite")
+public class TSiteController extends BaseController {
+
+ private String PREFIX = "/system/tSite/";
+
+ @Autowired
+ private ITSiteService tSiteService;
+
+ @Autowired
+ private ITRegionService tRegionService;
+
+ @Autowired
+ private ITLocationService itLocationService;
+
+ @Autowired
+ private GDMapElectricFenceUtil gdMapElectricFenceUtil;
+
+
+
+ /**
+ * 跳转到跨城站点管理首页
+ */
+ @RequestMapping("")
+ public String index() {
+ return PREFIX + "tSite.html";
+ }
+
+ /**
+ * 跳转到添加跨城站点管理
+ */
+ @RequestMapping("/tSite_add")
+ public String tSiteAdd(Model model) {
+ //省
+ List<TRegion> provinceList = tRegionService.selectList(new EntityWrapper<TRegion>().eq("parent_id", 0));
+ model.addAttribute("provinceList",provinceList);
+ return PREFIX + "tSite_add.html";
+ }
+
+ /**
+ * 跳转到修改跨城站点管理
+ */
+ @RequestMapping("/tSite_update/{tSiteId}")
+ public String tSiteUpdate(@PathVariable Integer tSiteId, Model model) {
+ TSite tSite = tSiteService.selectById(tSiteId);
+ model.addAttribute("item",tSite);
+ LogObjectHolder.me().set(tSite);
+
+ //省
+ List<TRegion> provinceList = tRegionService.selectList(new EntityWrapper<TRegion>().eq("parent_id", 0));
+ model.addAttribute("provinceList",provinceList);
+
+ TRegion province = tRegionService.selectOne(new EntityWrapper<TRegion>().eq("code", tSite.getProvinceCode()));
+ //市
+ List<TRegion> cityList = tRegionService.selectList(new EntityWrapper<TRegion>().eq("parent_id", province.getId()));
+ model.addAttribute("cityList",cityList);
+
+ if (SinataUtil.isNotEmpty(tSite.getCityCode())){
+ TRegion city = tRegionService.selectOne(new EntityWrapper<TRegion>().eq("code", tSite.getCityCode()));
+ //区
+ List<TRegion> areaList = tRegionService.selectList(new EntityWrapper<TRegion>().eq("parent_id", city.getId()));
+ model.addAttribute("areaList",areaList);
+ }else{
+ model.addAttribute("areaList",null);
+ }
+
+ //查询所有的站点区域
+ List<TLocation> locationList = itLocationService.selectList(new EntityWrapper<TLocation>().eq("siteId", tSite.getId()).ne("state", 3));
+ model.addAttribute("locationList",locationList);
+ model.addAttribute("disabled","disabled");
+
+ Integer type = itLocationService.selectList(new EntityWrapper<TLocation>().eq("siteId", tSite.getId())).get(0).getType();
+ model.addAttribute("type1", type == 1 ? "block" : "none");
+ model.addAttribute("type2", type == 1 ? "none" : "block");
+ model.addAttribute("checked1", type == 1 ? "checked" : "");
+ model.addAttribute("checked2", type == 1 ? "" : "checked");
+ return PREFIX + "tSite_edit.html";
+ }
+
+ /**
+ * 获取跨城站点管理列表
+ */
+ @RequestMapping(value = "/list")
+ @ResponseBody
+ public Object list(String insertTime,String name,String insertUser,String city,Integer state) {
+ String beginTime = null;
+ String endTime = null;
+ if (SinataUtil.isNotEmpty(insertTime)){
+ String[] timeArray = insertTime.split(" - ");
+ beginTime = timeArray[0];
+ endTime = timeArray[1];
+ }
+ Page<Map<String, Object>> page = new PageFactory<Map<String, Object>>().defaultPage();
+ if (ShiroKit.getUser().getRoleType() != 1){
+ page.setRecords(null);
+ }else{
+ page.setRecords(tSiteService.getSiteList(page,beginTime,endTime,name,insertUser,city,state));
+ }
+ return super.packForBT(page);
+ }
+
+ /**
+ * 新增跨城站点管理
+ */
+ @RequestMapping(value = "/add")
+ @ResponseBody
+ public Object add(TSite tSite,@RequestParam String subArr) {
+ tSite.setInsertTime(new Date());
+ tSite.setInsertUserId(ShiroKit.getUser().getId());
+ tSite.setState(1);
+ tSiteService.insert(tSite);
+
+ //添加站点区域
+ addLocation(subArr,tSite.getId());
+ return ResultUtil.success();
+ }
+
+ /**
+ * 添加站点区域
+ * @param subArr
+ * @param id
+ */
+ public void addLocation(String subArr,Integer id){
+ JSONArray jsonArray = JSON.parseArray(subArr);
+ int size = jsonArray.size();
+ for (int i = 0; i < size; i++){
+ JSONObject jsonObject = jsonArray.getJSONObject(i);
+ TLocation location = new TLocation();
+ location.setSiteId(id);
+ location.setName(jsonObject.getString("name"));
+ location.setInsertTime(new Date());
+ location.setAddTime(jsonObject.getString("time"));
+ location.setState(1);
+ location.setUpdateTime(new Date());
+ Integer type = jsonObject.getInteger("areaType");
+ location.setType(type);
+ if (1 == type){
+ if (SinataUtil.isNotEmpty(jsonObject.getString("provinceCode"))){
+ location.setProvince(jsonObject.getString("province"));
+ location.setProvinceCode(jsonObject.getString("provinceCode"));
+ }
+ if (SinataUtil.isNotEmpty(jsonObject.getString("cityCode"))){
+ location.setCity(jsonObject.getString("city"));
+ location.setCityCode(jsonObject.getString("cityCode"));
+ }
+ if (SinataUtil.isNotEmpty(jsonObject.getString("districtCode"))){
+ location.setDistrict(jsonObject.getString("district"));
+ location.setDistrictCode(jsonObject.getString("districtCode"));
+ }
+ }else if (2 == type){
+ String coordinate = jsonObject.getString("coordinate");
+ coordinate = coordinate.substring(0, coordinate.length() - 1);
+ location.setCoordinate(coordinate);
+ }
+ itLocationService.insert(location);
+
+ if(type == 2){
+ List<String> fence = gdMapElectricFenceUtil.createFence(location.getId().toString(), location.getCoordinate());
+ TLocation location1 = itLocationService.selectById(location.getId());
+ String s = "";
+ for(String gid : fence){
+ s += gid + "_";
+ }
+ location1.setGid(s.substring(0, s.length() - 1));
+ location1.setUpdateTime(new Date());
+ itLocationService.updateById(location1);
+ }
+ }
+ }
+
+ /**
+ * 操作跨城站点管理
+ * optType 1=删除 2=冻结 3=解冻
+ */
+ @RequestMapping(value = "/opt")
+ @ResponseBody
+ public Object opt(@RequestParam Integer tSiteId,@RequestParam Integer optType) {
+ TSite tSite = tSiteService.selectById(tSiteId);
+ if (1 == optType){
+ tSite.setState(3);
+ }else if (2 == optType){
+ tSite.setState(2);
+ }else if (3 == optType){
+ tSite.setState(1);
+ }
+ tSiteService.updateById(tSite);
+ return SUCCESS_TIP;
+ }
+
+ /**
+ * 修改跨城站点管理
+ */
+ @RequestMapping(value = "/update")
+ @ResponseBody
+ public Object update(TSite tSite,@RequestParam String subArr) {
+ tSiteService.updateById(tSite);
+
+ //删除站点区域
+ JSONArray jsonArray = JSON.parseArray(subArr);
+ List<TLocation> siteId = itLocationService.selectList(new EntityWrapper<TLocation>().eq("siteId", tSite.getId()));
+ List<TLocation> del = new ArrayList<>();
+ List<Object> add = new ArrayList<>();
+ for(TLocation location : siteId){
+ boolean b = true;
+ for(int i = 0; i < jsonArray.size(); i++){
+ if(jsonArray.getJSONObject(i).getIntValue("id") == location.getId()){
+ b = false;
+ }
+ }
+ if(b){
+ del.add(location);
+ continue;
+ }
+ }
+ for(int i = 0; i < jsonArray.size(); i++){
+ if(jsonArray.getJSONObject(i).getInteger("id") == null){
+ add.add(jsonArray.get(i));
+ }
+ }
+ for(TLocation location : del){
+ if(location.getType() == 2){
+ String[] s = location.getGid().split("_");
+ for(String gid : s){
+ gdMapElectricFenceUtil.deleteElectricFenc(gid);
+ }
+ }
+ itLocationService.deleteById(location.getId());
+ }
+
+ //添加站点区域
+ addLocation(JSON.toJSONString(add),tSite.getId());
+ return SUCCESS_TIP;
+ }
+
+ /**
+ * 跨城站点管理详情
+ */
+ @RequestMapping(value = "/detail/{tSiteId}")
+ @ResponseBody
+ public Object detail(@PathVariable("tSiteId") Integer tSiteId) {
+ return tSiteService.selectById(tSiteId);
+ }
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TSystemPriceController.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TSystemPriceController.java
new file mode 100644
index 0000000..454b087
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TSystemPriceController.java
@@ -0,0 +1,274 @@
+package com.stylefeng.guns.modular.system.controller.specialTrain;
+
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.baomidou.mybatisplus.plugins.Page;
+import com.stylefeng.guns.core.base.controller.BaseController;
+import com.stylefeng.guns.core.base.tips.ErrorTip;
+import com.stylefeng.guns.core.common.constant.factory.PageFactory;
+import com.stylefeng.guns.core.shiro.ShiroKit;
+import com.stylefeng.guns.core.util.SinataUtil;
+import com.stylefeng.guns.modular.system.model.TServerCarmodel;
+import com.stylefeng.guns.modular.system.model.User;
+import com.stylefeng.guns.modular.system.service.ITServerCarmodelService;
+import com.stylefeng.guns.modular.system.service.IUserService;
+import com.stylefeng.guns.modular.system.util.PushMinistryOfTransportUtil;
+import net.sf.json.JSONObject;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.beans.factory.annotation.Autowired;
+import com.stylefeng.guns.core.log.LogObjectHolder;
+import org.springframework.web.bind.annotation.RequestParam;
+import com.stylefeng.guns.modular.system.model.TSystemPrice;
+import com.stylefeng.guns.modular.system.service.ITSystemPriceService;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 专车价格设置控制器
+ *
+ * @author fengshuonan
+ * @Date 2020-08-29 10:50:13
+ */
+@Controller
+@RequestMapping("/tSystemPrice")
+public class TSystemPriceController extends BaseController {
+
+ private String PREFIX = "/system/tSystemPrice/";
+
+ @Autowired
+ private ITSystemPriceService tSystemPriceService;
+
+ @Autowired
+ private ITServerCarmodelService tServerCarmodelService;
+
+ @Autowired
+ private PushMinistryOfTransportUtil pushMinistryOfTransportUtil;
+
+ @Autowired
+ private IUserService userService;
+
+ @Value("${pushMinistryOfTransport}")
+ private boolean pushMinistryOfTransport;
+
+
+
+
+ /**
+ * 跳转到专车价格设置首页
+ */
+ @RequestMapping("/special")
+ public String index() {
+ return PREFIX + "tSystemPrice.html";
+ }
+
+ /**
+ * 跳转到小件物流价格设置首页
+ */
+ @RequestMapping("/small")
+ public String small(Model model) {
+ //跨城小件物流
+ TSystemPrice one = tSystemPriceService.selectOne(new EntityWrapper<TSystemPrice>().eq("type", 5).eq("companyId", ShiroKit.getUser().getObjectId()));
+ if (SinataUtil.isNotEmpty(one)){
+ JSONObject json1 = JSONObject.fromObject(one.getContent());
+ model.addAttribute("json1",json1);
+ }
+ //同城小件物流
+ TSystemPrice two = tSystemPriceService.selectOne(new EntityWrapper<TSystemPrice>().eq("type", 4).eq("companyId", ShiroKit.getUser().getObjectId()));
+ if (SinataUtil.isNotEmpty(two)){
+ JSONObject json2 = JSONObject.fromObject(two.getContent());
+ model.addAttribute("json2",json2);
+ }
+ return PREFIX + "small.html";
+ }
+
+ /**
+ * 跳转到添加专车价格设置
+ */
+ @RequestMapping("/tSystemPrice_add")
+ public String tSystemPriceAdd(Model model) {
+ //查询所有专车车型
+ List<TSystemPrice> tSystemPrices = tSystemPriceService.selectList(new EntityWrapper<TSystemPrice>().eq("type", 1).eq("companyId", ShiroKit.getUser().getObjectId()).ne("state", 3));
+ List<TServerCarmodel> modelList = tServerCarmodelService.selectList(new EntityWrapper<TServerCarmodel>().eq("type", 1).eq("state", 1));
+ List<TServerCarmodel> serverCarmodels = new ArrayList<>();
+ for(TServerCarmodel tsc : modelList){
+ boolean b = true;
+ for(TSystemPrice tsp : tSystemPrices){
+ if(tsc.getId() == tsp.getServerCarModelId()){
+ b = false;
+ break;
+ }
+ }
+ if(b){
+ serverCarmodels.add(tsc);
+ }
+ }
+ model.addAttribute("modelList",serverCarmodels);
+ return PREFIX + "tSystemPrice_add.html";
+ }
+
+ /**
+ * 跳转到修改专车价格设置
+ */
+ @RequestMapping("/tSystemPrice_update/{tSystemPriceId}")
+ public String tSystemPriceUpdate(@PathVariable Integer tSystemPriceId, Model model) {
+ TSystemPrice tSystemPrice = tSystemPriceService.selectById(tSystemPriceId);
+ model.addAttribute("item",tSystemPrice);
+ LogObjectHolder.me().set(tSystemPrice);
+
+ JSONObject json = JSONObject.fromObject(tSystemPrice.getContent());
+ model.addAttribute("json",json);
+
+ //查询所有专车车型
+ List<TSystemPrice> tSystemPrices = tSystemPriceService.selectList(new EntityWrapper<TSystemPrice>().eq("type", 1).ne("state", 3));
+ List<TServerCarmodel> modelList = tServerCarmodelService.selectList(new EntityWrapper<TServerCarmodel>().eq("type", 1).eq("state", 1));
+ List<TServerCarmodel> serverCarmodels = new ArrayList<>();
+ for(TServerCarmodel tsc : modelList){
+ boolean b = true;
+ for(TSystemPrice tsp : tSystemPrices){
+ if(tsc.getId() == tsp.getServerCarModelId() && tsc.getId() != tSystemPriceId){
+ b = false;
+ break;
+ }
+ }
+ if(b){
+ serverCarmodels.add(tsc);
+ }
+ }
+ model.addAttribute("modelList",serverCarmodels);
+
+ return PREFIX + "tSystemPrice_edit.html";
+ }
+
+ /**
+ * 获取专车价格设置列表
+ */
+ @RequestMapping(value = "/listSpecial")
+ @ResponseBody
+ public Object list(String name,Integer state) {
+ Page<Map<String, Object>> page = new PageFactory<Map<String, Object>>().defaultPage();
+ page.setRecords(tSystemPriceService.getSpecialPriceList(page,ShiroKit.getUser().getObjectId(),name,state));
+ return super.packForBT(page);
+ }
+
+ /**
+ * 新增专车价格设置
+ */
+ @RequestMapping(value = "/add")
+ @ResponseBody
+ public Object add(TSystemPrice tSystemPrice) {
+ //判断当前公司是否添加过该专车车型价格配置
+ int count = tSystemPriceService.selectCount(new EntityWrapper<TSystemPrice>()
+ .eq("type", 1)
+ .eq("serverCarModelId", tSystemPrice.getServerCarModelId())
+ .eq("companyId",ShiroKit.getUser().getObjectId())
+ .last(" and not FIND_IN_SET(state,'3')"));
+ if (count > 0){
+ TServerCarmodel one = tServerCarmodelService.selectById(tSystemPrice.getServerCarModelId());
+ return new ErrorTip(500, "【"+one.getName()+"】已存在,请重新选择");
+ }
+ tSystemPrice.setCompanyId(ShiroKit.getUser().getObjectId());
+ tSystemPrice.setType(1);
+ tSystemPrice.setState(1);
+ tSystemPriceService.insert(tSystemPrice);
+ new Thread(new Runnable() {
+ @Override
+ public void run() {
+ if(pushMinistryOfTransport){//上传数据
+ pushMinistryOfTransportUtil.baseInfoCompanyFare(tSystemPrice.getId());
+ }
+ }
+ }).start();
+ return SUCCESS_TIP;
+ }
+
+ /**
+ * 修改专车价格设置
+ */
+ @RequestMapping(value = "/update")
+ @ResponseBody
+ public Object update(TSystemPrice tSystemPrice) {
+ TSystemPrice obj = tSystemPriceService.selectById(tSystemPrice.getId());
+ if (obj.getServerCarModelId() != tSystemPrice.getServerCarModelId()){
+ //判断当前公司是否添加过该专车车型价格配置
+ int count = tSystemPriceService.selectCount(new EntityWrapper<TSystemPrice>()
+ .eq("type", 1)
+ .eq("serverCarModelId", tSystemPrice.getServerCarModelId())
+ .eq("companyId",ShiroKit.getUser().getObjectId())
+ .last(" and not FIND_IN_SET(state,'3')"));
+ if (count > 0){
+ TServerCarmodel one = tServerCarmodelService.selectById(tSystemPrice.getServerCarModelId());
+ return new ErrorTip(500, "【"+one.getName()+"】已存在,请重新选择");
+ }
+ }
+ tSystemPriceService.updateById(tSystemPrice);
+ new Thread(new Runnable() {
+ @Override
+ public void run() {
+ if(pushMinistryOfTransport) {//上传数据
+ pushMinistryOfTransportUtil.baseInfoCompanyFare(tSystemPrice.getId());
+ }
+ }
+ }).start();
+ return SUCCESS_TIP;
+ }
+
+ /**
+ * 修改状态
+ */
+ @RequestMapping(value = "/opt")
+ @ResponseBody
+ public Object opt(Integer optType,Integer tSystemPriceId) {
+ TSystemPrice systemPrice = new TSystemPrice();
+ if (1 == optType){ //冻结
+ systemPrice.setState(2);
+ }else if (2 == optType){ //解冻
+ systemPrice.setState(1);
+ }else if (3 == optType){ //删除
+ systemPrice.setState(3);
+ }
+ tSystemPriceService.update(systemPrice,new EntityWrapper<TSystemPrice>().eq("id",tSystemPriceId));
+ return SUCCESS_TIP;
+ }
+
+ /**
+ * 小件物流价格设置
+ */
+ @RequestMapping(value = "/smallSubmit")
+ @ResponseBody
+ public Object smallSubmit(String json1,String json2) {
+ //跨城小件物流
+ TSystemPrice one = tSystemPriceService.selectOne(new EntityWrapper<TSystemPrice>().eq("type", 5).eq("companyId", ShiroKit.getUser().getObjectId()));
+ if (SinataUtil.isNotEmpty(one)){
+ one.setContent(json1);
+ tSystemPriceService.updateById(one);
+ }else{
+ one = new TSystemPrice();
+ one.setState(1);
+ one.setType(5);
+ one.setCompanyId(ShiroKit.getUser().getObjectId());
+ one.setContent(json1);
+ tSystemPriceService.insert(one);
+ }
+ //同城小件物流
+ TSystemPrice two = tSystemPriceService.selectOne(new EntityWrapper<TSystemPrice>().eq("type", 4).eq("companyId", ShiroKit.getUser().getObjectId()));
+ if (SinataUtil.isNotEmpty(two)){
+ two.setContent(json2);
+ tSystemPriceService.updateById(two);
+ }else{
+ two = new TSystemPrice();
+ two.setState(1);
+ two.setType(4);
+ two.setCompanyId(ShiroKit.getUser().getObjectId());
+ two.setContent(json2);
+ tSystemPriceService.insert(two);
+ }
+ return SUCCESS_TIP;
+ }
+
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/system/BlackboardController.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/system/BlackboardController.java
new file mode 100644
index 0000000..4e8a24a
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/system/BlackboardController.java
@@ -0,0 +1,96 @@
+package com.stylefeng.guns.modular.system.controller.system;
+
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.stylefeng.guns.core.base.controller.BaseController;
+import com.stylefeng.guns.core.shiro.ShiroKit;
+import com.stylefeng.guns.core.util.DateUtil;
+import com.stylefeng.guns.core.util.SinataUtil;
+import com.stylefeng.guns.modular.system.model.*;
+import com.stylefeng.guns.modular.system.service.*;
+import com.stylefeng.guns.modular.system.util.ResultUtil;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import java.math.BigDecimal;
+import java.util.*;
+
+/**
+ * 总览信息
+ *
+ * @author fengshuonan
+ * @Date 2017年3月4日23:05:54
+ */
+@Controller
+@RequestMapping("/blackboard")
+public class BlackboardController extends BaseController {
+
+ @Autowired
+ private ILoginLogService loginLogService;
+
+ @Autowired
+ private IUserService userService;
+
+ @Autowired
+ private IRoleService roleService;
+
+ @Autowired
+ private IDeptService deptService;
+
+ @Autowired
+ private ITCompanyService companyService;
+
+ private ResultUtil resultUtil;
+
+ /**
+ * 跳转到黑板
+ */
+ @RequestMapping("")
+ public String blackboard(Model model,Integer type) {
+ //查询当前用户是否有"首页"菜单的权限
+ Integer id = ShiroKit.getUser().getId();
+ User user = userService.selectById(id);
+ Integer menuNum = userService.getMenuNumByRole(user.getRoleid());
+ if (menuNum > 0){
+ return "/home.html";
+ } else {
+ //查询登录次数
+ int count = loginLogService.selectCount(new EntityWrapper<LoginLog>().eq("userid", ShiroKit.getUser().getId()));
+ model.addAttribute("loginNum", count);
+
+ Role role = roleService.selectById(user.getRoleid());
+ Dept dept = deptService.selectById(user.getDeptid());
+
+ model.addAttribute("deptName",dept==null?"顶级":dept.getFullname());
+ model.addAttribute("roleName", role.getName());
+ model.addAttribute("userName", user.getName());
+ model.addAttribute("date", DateUtil.getTime(new Date()));
+ model.addAttribute("user", user);
+ return "/blackboardBlank.html";
+ }
+ }
+
+ /**
+ * 根据当前登录账户id获取对应公司详细信息
+ * @param uid
+ * @return
+ */
+ @RequestMapping(value = "/getCompanyInfoByUserId", method = RequestMethod.POST)
+ @ResponseBody
+ public ResultUtil getCompanyInfoByUserId(String uid){
+ try {
+ User user = userService.selectById(uid);
+// resultUtil = companyService.selectCompanyInfoById(user.getObjectId().toString());
+ }catch (Exception e){
+ e.printStackTrace();
+ resultUtil = ResultUtil.runErr();
+ }
+ return resultUtil;
+ }
+
+
+}
\ No newline at end of file
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/system/DeptController.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/system/DeptController.java
new file mode 100644
index 0000000..ff10f07
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/system/DeptController.java
@@ -0,0 +1,169 @@
+package com.stylefeng.guns.modular.system.controller.system;
+
+import com.stylefeng.guns.core.base.controller.BaseController;
+import com.stylefeng.guns.core.common.annotion.BussinessLog;
+import com.stylefeng.guns.core.common.annotion.Permission;
+import com.stylefeng.guns.core.common.constant.dictmap.DeptDict;
+import com.stylefeng.guns.core.common.constant.factory.ConstantFactory;
+import com.stylefeng.guns.core.common.exception.BizExceptionEnum;
+import com.stylefeng.guns.core.exception.GunsException;
+import com.stylefeng.guns.core.log.LogObjectHolder;
+import com.stylefeng.guns.core.node.ZTreeNode;
+import com.stylefeng.guns.core.util.ToolUtil;
+import com.stylefeng.guns.modular.system.model.Dept;
+import com.stylefeng.guns.modular.system.service.IDeptService;
+import com.stylefeng.guns.modular.system.warpper.DeptWarpper;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 部门控制器
+ *
+ * @author fengshuonan
+ * @Date 2017年2月17日20:27:22
+ */
+@Controller
+@RequestMapping("/dept")
+public class DeptController extends BaseController {
+
+ private String PREFIX = "/system/dept/";
+
+ @Autowired
+ private IDeptService deptService;
+
+
+ /**
+ * 跳转到部门管理首页
+ */
+ @RequestMapping("")
+ public String index() {
+ return PREFIX + "dept.html";
+ }
+
+ /**
+ * 跳转到添加部门
+ */
+ @RequestMapping("/dept_add")
+ public String deptAdd() {
+ return PREFIX + "dept_add.html";
+ }
+
+ /**
+ * 跳转到修改部门
+ */
+ @Permission
+ @RequestMapping("/dept_update/{deptId}")
+ public String deptUpdate(@PathVariable Integer deptId, Model model) {
+ Dept dept = deptService.selectById(deptId);
+ model.addAttribute(dept);
+ model.addAttribute("pName", ConstantFactory.me().getDeptName(dept.getPid()));
+ LogObjectHolder.me().set(dept);
+ return PREFIX + "dept_edit.html";
+ }
+
+ /**
+ * 获取部门的tree列表
+ */
+ @RequestMapping(value = "/tree")
+ @ResponseBody
+ public List<ZTreeNode> tree() {
+ List<ZTreeNode> tree = this.deptService.tree();
+ tree.add(ZTreeNode.createParent());
+ return tree;
+ }
+
+ /**
+ * 新增部门
+ */
+ @BussinessLog(value = "添加部门", key = "simplename", dict = DeptDict.class)
+ @RequestMapping(value = "/add")
+ @Permission
+ @ResponseBody
+ public Object add(Dept dept) {
+ if (ToolUtil.isOneEmpty(dept, dept.getSimplename())) {
+ throw new GunsException(BizExceptionEnum.REQUEST_NULL);
+ }
+ //完善pids,根据pid拿到pid的pids
+ deptSetPids(dept);
+
+
+ return this.deptService.insert(dept);
+ }
+
+ /**
+ * 获取所有部门列表
+ */
+ @RequestMapping(value = "/list")
+ @Permission
+ @ResponseBody
+ public Object list(String condition) {
+ List<Map<String, Object>> list = this.deptService.list(condition);
+ return super.warpObject(new DeptWarpper(list));
+ }
+
+ /**
+ * 部门详情
+ */
+ @RequestMapping(value = "/detail/{deptId}")
+ @Permission
+ @ResponseBody
+ public Object detail(@PathVariable("deptId") Integer deptId) {
+ return deptService.selectById(deptId);
+ }
+
+ /**
+ * 修改部门
+ */
+ @BussinessLog(value = "修改部门", key = "simplename", dict = DeptDict.class)
+ @RequestMapping(value = "/update")
+ @Permission
+ @ResponseBody
+ public Object update(Dept dept) {
+ if (ToolUtil.isEmpty(dept) || dept.getId() == null) {
+ throw new GunsException(BizExceptionEnum.REQUEST_NULL);
+ }
+ deptSetPids(dept);
+ deptService.updateById(dept);
+
+ return SUCCESS_TIP;
+ }
+
+ /**
+ * 删除部门
+ */
+ @BussinessLog(value = "删除部门", key = "deptId", dict = DeptDict.class)
+ @RequestMapping(value = "/delete")
+ @Permission
+ @ResponseBody
+ public Object delete(@RequestParam Integer deptId) {
+
+
+ //缓存被删除的部门名称
+ LogObjectHolder.me().set(ConstantFactory.me().getDeptName(deptId));
+
+ deptService.deleteDept(deptId);
+
+ return SUCCESS_TIP;
+ }
+
+ private void deptSetPids(Dept dept) {
+ if (ToolUtil.isEmpty(dept.getPid()) || dept.getPid().equals(0)) {
+ dept.setPid(0);
+ dept.setPids("[0],");
+ } else {
+ int pid = dept.getPid();
+ Dept temp = deptService.selectById(pid);
+ String pids = temp.getPids();
+ dept.setPid(pid);
+ dept.setPids(pids + "[" + pid + "],");
+ }
+ }
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/system/DictController.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/system/DictController.java
new file mode 100644
index 0000000..5eb8fac
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/system/DictController.java
@@ -0,0 +1,142 @@
+package com.stylefeng.guns.modular.system.controller.system;
+
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.stylefeng.guns.core.base.controller.BaseController;
+import com.stylefeng.guns.core.common.annotion.BussinessLog;
+import com.stylefeng.guns.core.common.annotion.Permission;
+import com.stylefeng.guns.core.common.constant.Const;
+import com.stylefeng.guns.core.common.constant.dictmap.DictMap;
+import com.stylefeng.guns.core.common.constant.factory.ConstantFactory;
+import com.stylefeng.guns.core.common.exception.BizExceptionEnum;
+import com.stylefeng.guns.core.exception.GunsException;
+import com.stylefeng.guns.core.log.LogObjectHolder;
+import com.stylefeng.guns.core.util.ToolUtil;
+import com.stylefeng.guns.modular.system.model.Dict;
+import com.stylefeng.guns.modular.system.service.IDictService;
+import com.stylefeng.guns.modular.system.warpper.DictWarpper;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 字典控制器
+ *
+ * @author fengshuonan
+ * @Date 2017年4月26日 12:55:31
+ */
+@Controller
+@RequestMapping("/dict")
+public class DictController extends BaseController {
+
+ private String PREFIX = "/system/dict/";
+
+ @Autowired
+ private IDictService dictService;
+
+ /**
+ * 跳转到字典管理首页
+ */
+ @RequestMapping("")
+ public String index() {
+ return PREFIX + "dict.html";
+ }
+
+ /**
+ * 跳转到添加字典
+ */
+ @RequestMapping("/dict_add")
+ public String deptAdd() {
+ return PREFIX + "dict_add.html";
+ }
+
+ /**
+ * 跳转到修改字典
+ */
+ @Permission(Const.ADMIN_NAME)
+ @RequestMapping("/dict_edit/{dictId}")
+ public String deptUpdate(@PathVariable Integer dictId, Model model) {
+ Dict dict = dictService.selectById(dictId);
+ model.addAttribute("dict", dict);
+ List<Dict> subDicts = dictService.selectList(new EntityWrapper<Dict>().eq("pid", dictId));
+ model.addAttribute("subDicts", subDicts);
+ LogObjectHolder.me().set(dict);
+ return PREFIX + "dict_edit.html";
+ }
+
+ /**
+ * 新增字典
+ *
+ * @param dictValues 格式例如 "1:启用;2:禁用;3:冻结"
+ */
+ @BussinessLog(value = "添加字典记录", key = "dictName,dictValues", dict = DictMap.class)
+ @RequestMapping(value = "/add")
+ @Permission(Const.ADMIN_NAME)
+ @ResponseBody
+ public Object add(String dictCode,String dictTips,String dictName, String dictValues) {
+ if (ToolUtil.isOneEmpty(dictCode,dictName, dictValues)) {
+ throw new GunsException(BizExceptionEnum.REQUEST_NULL);
+ }
+ this.dictService.addDict(dictCode,dictName,dictTips,dictValues);
+ return SUCCESS_TIP;
+ }
+
+ /**
+ * 获取所有字典列表
+ */
+ @RequestMapping(value = "/list")
+ @Permission(Const.ADMIN_NAME)
+ @ResponseBody
+ public Object list(String condition) {
+ List<Map<String, Object>> list = this.dictService.list(condition);
+ return super.warpObject(new DictWarpper(list));
+ }
+
+ /**
+ * 字典详情
+ */
+ @RequestMapping(value = "/detail/{dictId}")
+ @Permission(Const.ADMIN_NAME)
+ @ResponseBody
+ public Object detail(@PathVariable("dictId") Integer dictId) {
+ return dictService.selectById(dictId);
+ }
+
+ /**
+ * 修改字典
+ */
+ @BussinessLog(value = "修改字典", key = "dictName,dictValues", dict = DictMap.class)
+ @RequestMapping(value = "/update")
+ @Permission(Const.ADMIN_NAME)
+ @ResponseBody
+ public Object update(Integer dictId,String dictCode,String dictName, String dictTips,String dictValues) {
+ if (ToolUtil.isOneEmpty(dictId, dictCode, dictName, dictValues)) {
+ throw new GunsException(BizExceptionEnum.REQUEST_NULL);
+ }
+ dictService.editDict(dictId, dictCode,dictName, dictTips,dictValues);
+ return SUCCESS_TIP;
+ }
+
+ /**
+ * 删除字典记录
+ */
+ @BussinessLog(value = "删除字典记录", key = "dictId", dict = DictMap.class)
+ @RequestMapping(value = "/delete")
+ @Permission(Const.ADMIN_NAME)
+ @ResponseBody
+ public Object delete(@RequestParam Integer dictId) {
+
+ //缓存被删除的名称
+ LogObjectHolder.me().set(ConstantFactory.me().getDictName(dictId));
+
+ this.dictService.delteDict(dictId);
+ return SUCCESS_TIP;
+ }
+
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/system/KaptchaController.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/system/KaptchaController.java
new file mode 100644
index 0000000..ee1cfac
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/system/KaptchaController.java
@@ -0,0 +1,114 @@
+package com.stylefeng.guns.modular.system.controller.system;
+
+import com.google.code.kaptcha.Constants;
+import com.google.code.kaptcha.Producer;
+import com.stylefeng.guns.config.properties.GunsProperties;
+import com.stylefeng.guns.core.util.FileUtil;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import javax.imageio.ImageIO;
+import javax.servlet.ServletOutputStream;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpSession;
+import java.awt.image.BufferedImage;
+import java.io.IOException;
+
+/**
+ * 验证码生成
+ *
+ * @author fengshuonan
+ * @date 2017-05-05 23:10
+ */
+@Controller
+@RequestMapping("/kaptcha")
+public class KaptchaController {
+
+ @Autowired
+ private GunsProperties gunsProperties;
+
+ @Autowired
+ private Producer producer;
+
+ /**
+ * 生成验证码
+ */
+ @RequestMapping("")
+ public void index(HttpServletRequest request, HttpServletResponse response) {
+ HttpSession session = request.getSession();
+
+ response.setDateHeader("Expires", 0);
+
+ // Set standard HTTP/1.1 no-cache headers.
+ response.setHeader("Cache-Control", "no-store, no-cache, must-revalidate");
+
+ // Set IE extended HTTP/1.1 no-cache headers (use addHeader).
+ response.addHeader("Cache-Control", "post-check=0, pre-check=0");
+
+ // Set standard HTTP/1.0 no-cache header.
+ response.setHeader("Pragma", "no-cache");
+
+ // return a jpeg
+ response.setContentType("image/jpeg");
+
+ // create the text for the image
+ String capText = producer.createText();
+
+ // store the text in the session
+ session.setAttribute(Constants.KAPTCHA_SESSION_KEY, capText);
+
+ // create the image with the text
+ BufferedImage bi = producer.createImage(capText);
+ ServletOutputStream out = null;
+ try {
+ out = response.getOutputStream();
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
+
+ // write the data out
+ try {
+ ImageIO.write(bi, "jpg", out);
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
+ try {
+ try {
+ out.flush();
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
+ } finally {
+ try {
+ out.close();
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
+ }
+ }
+
+ /**
+ * 返回图片
+ *
+ * @author stylefeng
+ * @Date 2017/5/24 23:00
+ */
+ @RequestMapping("/{pictureId}")
+ public void renderPicture(@PathVariable("pictureId") String pictureId, HttpServletResponse response) {
+ String path = gunsProperties.getFileUploadPath() + pictureId;
+ try {
+ byte[] bytes = FileUtil.toByteArray(path);
+ response.getOutputStream().write(bytes);
+ } catch (Exception e) {
+ //如果找不到图片就返回一个默认图片
+ try {
+ response.sendRedirect("/static/img/NoPIC.png");
+ } catch (IOException e1) {
+ e1.printStackTrace();
+ }
+ }
+ }
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/system/LogController.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/system/LogController.java
new file mode 100644
index 0000000..ef4d1c8
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/system/LogController.java
@@ -0,0 +1,84 @@
+package com.stylefeng.guns.modular.system.controller.system;
+
+import com.baomidou.mybatisplus.mapper.SqlRunner;
+import com.baomidou.mybatisplus.plugins.Page;
+import com.stylefeng.guns.core.base.controller.BaseController;
+import com.stylefeng.guns.core.common.annotion.BussinessLog;
+import com.stylefeng.guns.core.common.annotion.Permission;
+import com.stylefeng.guns.core.common.constant.Const;
+import com.stylefeng.guns.core.common.constant.factory.PageFactory;
+import com.stylefeng.guns.core.common.constant.state.BizLogType;
+import com.stylefeng.guns.core.support.BeanKit;
+import com.stylefeng.guns.modular.system.model.OperationLog;
+import com.stylefeng.guns.modular.system.service.IOperationLogService;
+import com.stylefeng.guns.modular.system.warpper.LogWarpper;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 日志管理的控制器
+ *
+ * @author fengshuonan
+ * @Date 2017年4月5日 19:45:36
+ */
+@Controller
+@RequestMapping("/log")
+public class LogController extends BaseController {
+
+ private static String PREFIX = "/system/log/";
+
+ @Autowired
+ private IOperationLogService operationLogService;
+
+ /**
+ * 跳转到日志管理的首页
+ */
+ @RequestMapping("")
+ public String index() {
+ return PREFIX + "log.html";
+ }
+
+ /**
+ * 查询操作日志列表
+ */
+ @RequestMapping("/list")
+ @Permission(Const.ADMIN_NAME)
+ @ResponseBody
+ public Object list(@RequestParam(required = false) String beginTime, @RequestParam(required = false) String endTime, @RequestParam(required = false) String logName, @RequestParam(required = false) Integer logType) {
+ Page<OperationLog> page = new PageFactory<OperationLog>().defaultPage();
+ List<Map<String, Object>> result = operationLogService.getOperationLogs(page, beginTime, endTime, logName, BizLogType.valueOf(logType), page.getOrderByField(), page.isAsc());
+ page.setRecords((List<OperationLog>) new LogWarpper(result).warp());
+ return super.packForBT(page);
+ }
+
+ /**
+ * 查询操作日志详情
+ */
+ @RequestMapping("/detail/{id}")
+ @Permission(Const.ADMIN_NAME)
+ @ResponseBody
+ public Object detail(@PathVariable Integer id) {
+ OperationLog operationLog = operationLogService.selectById(id);
+ Map<String, Object> stringObjectMap = BeanKit.beanToMap(operationLog);
+ return super.warpObject(new LogWarpper(stringObjectMap));
+ }
+
+ /**
+ * 清空日志
+ */
+ @BussinessLog(value = "清空业务日志")
+ @RequestMapping("/delLog")
+ @Permission(Const.ADMIN_NAME)
+ @ResponseBody
+ public Object delLog() {
+ SqlRunner.db().delete("delete from sys_operation_log");
+ return SUCCESS_TIP;
+ }
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/system/LoginController.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/system/LoginController.java
new file mode 100644
index 0000000..3965c83
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/system/LoginController.java
@@ -0,0 +1,207 @@
+package com.stylefeng.guns.modular.system.controller.system;
+
+import com.google.code.kaptcha.Constants;
+import com.stylefeng.guns.core.base.controller.BaseController;
+import com.stylefeng.guns.core.common.exception.InvalidKaptchaException;
+import com.stylefeng.guns.core.log.LogManager;
+import com.stylefeng.guns.core.log.factory.LogTaskFactory;
+import com.stylefeng.guns.core.node.MenuNode;
+import com.stylefeng.guns.core.shiro.ShiroKit;
+import com.stylefeng.guns.core.shiro.ShiroUser;
+import com.stylefeng.guns.core.util.ApiMenuFilter;
+import com.stylefeng.guns.core.util.KaptchaUtil;
+import com.stylefeng.guns.core.util.SinataUtil;
+import com.stylefeng.guns.core.util.ToolUtil;
+import com.stylefeng.guns.modular.system.model.User;
+import com.stylefeng.guns.modular.system.service.IMenuService;
+import com.stylefeng.guns.modular.system.service.IUserService;
+import com.stylefeng.guns.modular.system.util.AESUtils;
+import org.apache.shiro.authc.UsernamePasswordToken;
+import org.apache.shiro.subject.Subject;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.server.ServerHttpRequest;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.*;
+
+import static com.stylefeng.guns.core.support.HttpKit.getIp;
+
+/**
+ * 登录控制器
+ *
+ * @author fengshuonan
+ * @Date 2017年1月10日 下午8:25:24
+ */
+@Controller
+public class LoginController extends BaseController {
+
+ @Autowired
+ private IMenuService menuService;
+
+ @Autowired
+ private IUserService userService;
+
+ private Map<String, Long> loginTime = new HashMap<>();
+
+ private Map<String, Integer> loginFailures = new HashMap<>();
+
+ private List<String> ips = Arrays.asList("127.0.0.1");
+
+
+
+ /**
+ * 跳转到主页
+ */
+ @RequestMapping(value = "/", method = RequestMethod.GET)
+ public String index(Model model) {
+ //获取菜单列表
+ List<Integer> roleList = ShiroKit.getUser().getRoleList();
+ if (roleList == null || roleList.size() == 0) {
+ ShiroKit.getSubject().logout();
+ model.addAttribute("tips", "该用户没有角色，无法登陆");
+ return "/login.html";
+ }
+ List<MenuNode> menus = menuService.getMenusByRoleIds(roleList);
+ List<MenuNode> titles = MenuNode.buildTitle(menus);
+ titles = ApiMenuFilter.build(titles);
+
+
+ Integer id = ShiroKit.getUser().getId();
+ User user = userService.selectById(id);
+ if (SinataUtil.isEmpty(user)){
+ ShiroKit.getSubject().logout();
+ model.addAttribute("tips", "请重新登录");
+ return "/login.html";
+ }
+ //设置上级ID
+ if (SinataUtil.isNotEmpty(user.getObjectId())){
+ ShiroKit.getUser().setObjectId(user.getObjectId());
+ }
+ //设置角色
+ ShiroKit.getUser().setRoleType(user.getRoleType());
+
+ model.addAttribute("titles", titles);
+
+ //获取用户头像
+ String avatar = user.getAvatar();
+ model.addAttribute("avatar", avatar);
+ model.addAttribute("userName", user.getName());
+ model.addAttribute("type", 0);
+ model.addAttribute("passwordHint",
+ null == user.getPassWordUpdate()
+ || user.getPassWordUpdate().getTime() + 7776000000L <= System.currentTimeMillis()
+ ? "您的密码已经90天未更换了，请及时更换密码！！！" : "");
+ return "/index.html";
+ }
+
+ /**
+ * 跳转到登录页面
+ */
+ @RequestMapping(value = "/login", method = RequestMethod.GET)
+ public String login() {
+ if (ShiroKit.isAuthenticated() || ShiroKit.getUser() != null) {
+ return REDIRECT + "/";
+ } else {
+ return "/login.html";
+ }
+ }
+
+ /**
+ * 点击登录执行的动作
+ */
+ @RequestMapping(value = "/login", method = RequestMethod.POST)
+ public String loginVali(String username, String password, String remember, Model model, HttpServletRequest request) {
+ String ip = request.getHeader("x-forwarded-for");
+ if (ip != null && ip.length() != 0 && !"unknown".equalsIgnoreCase(ip)) {
+ // 多次反向代理后会有多个ip值，第一个ip才是真实ip
+ if (ip.indexOf(",") != -1) {
+ ip = ip.split(",")[0];
+ }
+ }
+ if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) {
+ ip = request.getHeader("Proxy-Client-IP");
+ }
+ if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) {
+ ip = request.getHeader("WL-Proxy-Client-IP");
+ }
+ if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) {
+ ip = request.getHeader("HTTP_CLIENT_IP");
+ }
+ if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) {
+ ip = request.getHeader("HTTP_X_FORWARDED_FOR");
+ }
+ if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) {
+ ip = request.getHeader("X-Real-IP");
+ }
+ if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) {
+ ip = request.getRemoteAddr();
+ }
+ if(!ips.contains(ip)){
+ model.addAttribute("tips", "请在特定的网络下使用系统");
+ return "/login.html";
+ }
+
+ Integer f = loginFailures.get(username);
+ f = f == null ? 0 : f;
+ Long t = loginTime.get(username);
+ t = null == t ? 0 : t;
+ if(System.currentTimeMillis() - t > (30 * 60 * 1000)){
+ loginFailures.put(username, f = 1);
+ loginTime.put(username, System.currentTimeMillis());
+ }else{
+ f++;
+ loginFailures.put(username, f);
+ }
+
+ if(f > 5 && (System.currentTimeMillis() - t) <= (30 * 60 * 1000)){
+ model.addAttribute("tips", "登录次数过多，请等30分钟再试！");
+ return "/login.html";
+ }
+ //验证验证码是否正确
+ if (KaptchaUtil.getKaptchaOnOff()) {
+ String kaptcha = super.getPara("kaptcha").trim();
+ String code = (String) super.getSession().getAttribute(Constants.KAPTCHA_SESSION_KEY);
+ if (ToolUtil.isEmpty(kaptcha) || !kaptcha.equalsIgnoreCase(code)) {
+ throw new InvalidKaptchaException();
+ }
+ }
+ password = AESUtils.decrypt(password);
+ Subject currentUser = ShiroKit.getSubject();
+ UsernamePasswordToken token = new UsernamePasswordToken(username, password.toCharArray());
+
+// if ("on".equals(remember)) {
+// token.setRememberMe(true);
+// } else {
+// token.setRememberMe(false);
+// }
+
+ token.setRememberMe(false);//关闭记住我功能
+
+ currentUser.login(token);
+
+ ShiroUser shiroUser = ShiroKit.getUser();
+ super.getSession().setAttribute("shiroUser", shiroUser);
+ super.getSession().setAttribute("username", shiroUser.getAccount());
+
+ LogManager.me().executeLog(LogTaskFactory.loginLog(shiroUser.getId(), getIp()));
+
+ ShiroKit.getSession().setAttribute("sessionFlag", true);
+ return REDIRECT + "/";
+ }
+
+ /**
+ * 退出登录
+ */
+ @RequestMapping(value = "/logout", method = RequestMethod.GET)
+ public String logOut() {
+ LogManager.me().executeLog(LogTaskFactory.exitLog(ShiroKit.getUser().getId(), getIp()));
+ ShiroKit.getSubject().logout();
+ deleteAllCookie();
+ return REDIRECT + "/login";
+ }
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/system/LoginLogController.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/system/LoginLogController.java
new file mode 100644
index 0000000..6cb2ee7
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/system/LoginLogController.java
@@ -0,0 +1,69 @@
+package com.stylefeng.guns.modular.system.controller.system;
+
+import com.baomidou.mybatisplus.mapper.SqlRunner;
+import com.baomidou.mybatisplus.plugins.Page;
+import com.stylefeng.guns.core.base.controller.BaseController;
+import com.stylefeng.guns.core.common.annotion.BussinessLog;
+import com.stylefeng.guns.core.common.annotion.Permission;
+import com.stylefeng.guns.core.common.constant.Const;
+import com.stylefeng.guns.core.common.constant.factory.PageFactory;
+import com.stylefeng.guns.modular.system.model.LoginLog;
+import com.stylefeng.guns.modular.system.service.ILoginLogService;
+import com.stylefeng.guns.modular.system.warpper.LogWarpper;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 日志管理的控制器
+ *
+ * @author fengshuonan
+ * @Date 2017年4月5日 19:45:36
+ */
+@Controller
+@RequestMapping("/loginLog")
+public class LoginLogController extends BaseController {
+
+ private static String PREFIX = "/system/log/";
+
+ @Autowired
+ private ILoginLogService loginLogService;
+
+ /**
+ * 跳转到日志管理的首页
+ */
+ @RequestMapping("")
+ public String index() {
+ return PREFIX + "login_log.html";
+ }
+
+ /**
+ * 查询登录日志列表
+ */
+ @RequestMapping("/list")
+ @Permission(Const.ADMIN_NAME)
+ @ResponseBody
+ public Object list(@RequestParam(required = false) String beginTime, @RequestParam(required = false) String endTime, @RequestParam(required = false) String logName) {
+ Page<LoginLog> page = new PageFactory<LoginLog>().defaultPage();
+ List<Map<String, Object>> result = loginLogService.getLoginLogs(page, beginTime, endTime, logName, page.getOrderByField(), page.isAsc());
+ page.setRecords((List<LoginLog>) new LogWarpper(result).warp());
+ return super.packForBT(page);
+ }
+
+ /**
+ * 清空日志
+ */
+ @BussinessLog("清空登录日志")
+ @RequestMapping("/delLoginLog")
+ @Permission(Const.ADMIN_NAME)
+ @ResponseBody
+ public Object delLog() {
+ SqlRunner.db().delete("delete from sys_login_log");
+ return SUCCESS_TIP;
+ }
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/system/MenuController.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/system/MenuController.java
new file mode 100644
index 0000000..9857aae
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/system/MenuController.java
@@ -0,0 +1,251 @@
+package com.stylefeng.guns.modular.system.controller.system;
+
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.stylefeng.guns.core.base.controller.BaseController;
+import com.stylefeng.guns.core.base.tips.Tip;
+import com.stylefeng.guns.core.common.annotion.BussinessLog;
+import com.stylefeng.guns.core.common.annotion.Permission;
+import com.stylefeng.guns.core.common.constant.Const;
+import com.stylefeng.guns.core.common.constant.dictmap.MenuDict;
+import com.stylefeng.guns.core.common.constant.factory.ConstantFactory;
+import com.stylefeng.guns.core.common.constant.state.MenuStatus;
+import com.stylefeng.guns.core.common.exception.BizExceptionEnum;
+import com.stylefeng.guns.core.exception.GunsException;
+import com.stylefeng.guns.core.log.LogObjectHolder;
+import com.stylefeng.guns.core.node.ZTreeNode;
+import com.stylefeng.guns.core.support.BeanKit;
+import com.stylefeng.guns.core.util.ToolUtil;
+import com.stylefeng.guns.modular.system.model.Menu;
+import com.stylefeng.guns.modular.system.service.IMenuService;
+import com.stylefeng.guns.modular.system.warpper.MenuWarpper;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import javax.validation.Valid;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 菜单控制器
+ *
+ * @author fengshuonan
+ * @Date 2017年2月12日21:59:14
+ */
+@Controller
+@RequestMapping("/menu")
+public class MenuController extends BaseController {
+
+ private static String PREFIX = "/system/menu/";
+
+ @Autowired
+ private IMenuService menuService;
+
+
+ /**
+ * 跳转到菜单列表列表页面
+ */
+ @RequestMapping("")
+ public String index() {
+ return PREFIX + "menu.html";
+ }
+
+ /**
+ * 跳转到菜单列表列表页面
+ */
+ @RequestMapping(value = "/menu_add")
+ public String menuAdd() {
+ return PREFIX + "menu_add.html";
+ }
+
+ /**
+ * 跳转到菜单详情列表页面
+ */
+ @Permission(Const.ADMIN_NAME)
+ @RequestMapping(value = "/menu_edit/{menuId}")
+ public String menuEdit(@PathVariable Long menuId, Model model) {
+ if (ToolUtil.isEmpty(menuId)) {
+ throw new GunsException(BizExceptionEnum.REQUEST_NULL);
+ }
+ Menu menu = this.menuService.selectById(menuId);
+
+ //获取父级菜单的id
+ Menu temp = new Menu();
+ temp.setCode(menu.getPcode());
+ Menu pMenu = this.menuService.selectOne(new EntityWrapper<>(temp));
+
+ //如果父级是顶级菜单
+ if (pMenu == null) {
+ menu.setPcode("0");
+ } else {
+ //设置父级菜单的code为父级菜单的id
+ menu.setPcode(String.valueOf(pMenu.getId()));
+ }
+
+ Map<String, Object> menuMap = BeanKit.beanToMap(menu);
+ menuMap.put("pcodeName", ConstantFactory.me().getMenuNameByCode(temp.getCode()));
+ model.addAttribute("menu", menuMap);
+ LogObjectHolder.me().set(menu);
+ return PREFIX + "menu_edit.html";
+ }
+
+ /**
+ * 修该菜单
+ */
+ @Permission(Const.ADMIN_NAME)
+ @RequestMapping(value = "/edit")
+ @BussinessLog(value = "修改菜单", key = "name", dict = MenuDict.class)
+ @ResponseBody
+ public Tip edit(@Valid Menu menu, BindingResult result) {
+ if (result.hasErrors()) {
+ throw new GunsException(BizExceptionEnum.REQUEST_NULL);
+ }
+ //设置父级菜单编号
+ menuSetPcode(menu);
+
+ this.menuService.updateById(menu);
+
+
+ return SUCCESS_TIP;
+ }
+
+ /**
+ * 获取菜单列表
+ */
+ @Permission(Const.ADMIN_NAME)
+ @RequestMapping(value = "/list")
+ @ResponseBody
+ public Object list(@RequestParam(required = false) String menuName, @RequestParam(required = false) String level) {
+ List<Map<String, Object>> menus = this.menuService.selectMenus(menuName, level);
+ return super.warpObject(new MenuWarpper(menus));
+ }
+
+ /**
+ * 新增菜单
+ */
+ @Permission(Const.ADMIN_NAME)
+ @RequestMapping(value = "/add")
+ @BussinessLog(value = "菜单新增", key = "name", dict = MenuDict.class)
+ @ResponseBody
+ public Tip add(@Valid Menu menu, BindingResult result) {
+ if (result.hasErrors()) {
+ throw new GunsException(BizExceptionEnum.REQUEST_NULL);
+ }
+
+ //判断是否存在该编号
+ String existedMenuName = ConstantFactory.me().getMenuNameByCode(menu.getCode());
+ if (ToolUtil.isNotEmpty(existedMenuName)) {
+ throw new GunsException(BizExceptionEnum.EXISTED_THE_MENU);
+ }
+
+ //设置父级菜单编号
+ menuSetPcode(menu);
+
+ menu.setStatus(MenuStatus.ENABLE.getCode());
+ this.menuService.insert(menu);
+
+
+ return SUCCESS_TIP;
+ }
+
+ /**
+ * 删除菜单
+ */
+ @Permission(Const.ADMIN_NAME)
+ @RequestMapping(value = "/remove")
+ @BussinessLog(value = "删除菜单", key = "menuId", dict = MenuDict.class)
+ @ResponseBody
+ public Tip remove(@RequestParam Long menuId) {
+ if (ToolUtil.isEmpty(menuId)) {
+ throw new GunsException(BizExceptionEnum.REQUEST_NULL);
+ }
+
+
+ //缓存菜单的名称
+ LogObjectHolder.me().set(ConstantFactory.me().getMenuName(menuId));
+
+ this.menuService.delMenuContainSubMenus(menuId);
+
+ return SUCCESS_TIP;
+ }
+
+ /**
+ * 查看菜单
+ */
+ @RequestMapping(value = "/view/{menuId}")
+ @ResponseBody
+ public Tip view(@PathVariable Long menuId) {
+ if (ToolUtil.isEmpty(menuId)) {
+ throw new GunsException(BizExceptionEnum.REQUEST_NULL);
+ }
+ this.menuService.selectById(menuId);
+ return SUCCESS_TIP;
+ }
+
+ /**
+ * 获取菜单列表(首页用)
+ */
+ @RequestMapping(value = "/menuTreeList")
+ @ResponseBody
+ public List<ZTreeNode> menuTreeList() {
+ List<ZTreeNode> roleTreeList = this.menuService.menuTreeList();
+ return roleTreeList;
+ }
+
+ /**
+ * 获取菜单列表(选择父级菜单用)
+ */
+ @RequestMapping(value = "/selectMenuTreeList")
+ @ResponseBody
+ public List<ZTreeNode> selectMenuTreeList() {
+ List<ZTreeNode> roleTreeList = this.menuService.menuTreeList();
+ roleTreeList.add(ZTreeNode.createParent());
+ return roleTreeList;
+ }
+
+ /**
+ * 获取角色列表
+ */
+ @RequestMapping(value = "/menuTreeListByRoleId/{roleId}")
+ @ResponseBody
+ public List<ZTreeNode> menuTreeListByRoleId(@PathVariable Integer roleId) {
+ List<Long> menuIds = this.menuService.getMenuIdsByRoleId(roleId);
+ if (ToolUtil.isEmpty(menuIds)) {
+ List<ZTreeNode> roleTreeList = this.menuService.menuTreeList();
+ return roleTreeList;
+ } else {
+ List<ZTreeNode> roleTreeListByUserId = this.menuService.menuTreeListByMenuIds(menuIds);
+ return roleTreeListByUserId;
+ }
+ }
+
+ /**
+ * 根据请求的父级菜单编号设置pcode和层级
+ */
+ private void menuSetPcode(@Valid Menu menu) {
+ if (ToolUtil.isEmpty(menu.getPcode()) || menu.getPcode().equals("0")) {
+ menu.setPcode("0");
+ menu.setPcodes("[0],");
+ menu.setLevels(1);
+ } else {
+ long code = Long.parseLong(menu.getPcode());
+ Menu pMenu = menuService.selectById(code);
+ Integer pLevels = pMenu.getLevels();
+ menu.setPcode(pMenu.getCode());
+
+ //如果编号和父编号一致会导致无限递归
+ if (menu.getCode().equals(menu.getPcode())) {
+ throw new GunsException(BizExceptionEnum.MENU_PCODE_COINCIDENCE);
+ }
+
+ menu.setLevels(pLevels + 1);
+ menu.setPcodes(pMenu.getPcodes() + "[" + pMenu.getCode() + "],");
+ }
+ }
+
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/system/RoleController.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/system/RoleController.java
new file mode 100644
index 0000000..287755f
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/system/RoleController.java
@@ -0,0 +1,237 @@
+package com.stylefeng.guns.modular.system.controller.system;
+
+import com.stylefeng.guns.core.base.controller.BaseController;
+import com.stylefeng.guns.core.base.tips.Tip;
+import com.stylefeng.guns.core.cache.CacheKit;
+import com.stylefeng.guns.core.common.annotion.BussinessLog;
+import com.stylefeng.guns.core.common.annotion.Permission;
+import com.stylefeng.guns.core.common.constant.Const;
+import com.stylefeng.guns.core.common.constant.cache.Cache;
+import com.stylefeng.guns.core.common.constant.dictmap.RoleDict;
+import com.stylefeng.guns.core.common.constant.factory.ConstantFactory;
+import com.stylefeng.guns.core.common.exception.BizExceptionEnum;
+import com.stylefeng.guns.core.exception.GunsException;
+import com.stylefeng.guns.core.log.LogObjectHolder;
+import com.stylefeng.guns.core.node.ZTreeNode;
+import com.stylefeng.guns.core.util.Convert;
+import com.stylefeng.guns.core.util.ToolUtil;
+import com.stylefeng.guns.modular.system.model.Role;
+import com.stylefeng.guns.modular.system.model.User;
+import com.stylefeng.guns.modular.system.service.IRoleService;
+import com.stylefeng.guns.modular.system.service.IUserService;
+import com.stylefeng.guns.modular.system.warpper.RoleWarpper;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import javax.validation.Valid;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 角色控制器
+ *
+ * @author fengshuonan
+ * @Date 2017年2月12日21:59:14
+ */
+@Controller
+@RequestMapping("/role")
+public class RoleController extends BaseController {
+
+ private static String PREFIX = "/system/role";
+
+ @Autowired
+ private IUserService userService;
+
+ @Autowired
+ private IRoleService roleService;
+
+
+ /**
+ * 跳转到角色列表页面
+ */
+ @RequestMapping("")
+ public String index() {
+ return PREFIX + "/role.html";
+ }
+
+ /**
+ * 跳转到添加角色
+ */
+ @RequestMapping(value = "/role_add")
+ public String roleAdd() {
+ return PREFIX + "/role_add.html";
+ }
+
+ /**
+ * 跳转到修改角色
+ */
+ @Permission
+ @RequestMapping(value = "/role_edit/{roleId}")
+ public String roleEdit(@PathVariable Integer roleId, Model model) {
+ if (ToolUtil.isEmpty(roleId)) {
+ throw new GunsException(BizExceptionEnum.REQUEST_NULL);
+ }
+ Role role = this.roleService.selectById(roleId);
+ model.addAttribute(role);
+ model.addAttribute("pName", ConstantFactory.me().getSingleRoleName(role.getPid()));
+ model.addAttribute("deptName", ConstantFactory.me().getDeptName(role.getDeptid()));
+ LogObjectHolder.me().set(role);
+ return PREFIX + "/role_edit.html";
+ }
+
+ /**
+ * 跳转到角色分配
+ */
+ @Permission
+ @RequestMapping(value = "/role_assign/{roleId}")
+ public String roleAssign(@PathVariable("roleId") Integer roleId, Model model) {
+ if (ToolUtil.isEmpty(roleId)) {
+ throw new GunsException(BizExceptionEnum.REQUEST_NULL);
+ }
+ model.addAttribute("roleId", roleId);
+ model.addAttribute("roleName", ConstantFactory.me().getSingleRoleName(roleId));
+ return PREFIX + "/role_assign.html";
+ }
+
+ /**
+ * 获取角色列表
+ */
+ @Permission
+ @RequestMapping(value = "/list")
+ @ResponseBody
+ public Object list(@RequestParam(required = false) String roleName) {
+ List<Map<String, Object>> roles = this.roleService.selectRoles(super.getPara("roleName"));
+ return super.warpObject(new RoleWarpper(roles));
+ }
+
+ /**
+ * 角色新增
+ */
+ @RequestMapping(value = "/add")
+ @BussinessLog(value = "添加角色", key = "name", dict = RoleDict.class)
+ @Permission(Const.ADMIN_NAME)
+ @ResponseBody
+ public Tip add(@Valid Role role, BindingResult result) {
+ if (result.hasErrors()) {
+ throw new GunsException(BizExceptionEnum.REQUEST_NULL);
+ }
+ role.setId(null);
+ this.roleService.insert(role);
+
+
+ return SUCCESS_TIP;
+ }
+
+ /**
+ * 角色修改
+ */
+ @RequestMapping(value = "/edit")
+ @BussinessLog(value = "修改角色", key = "name", dict = RoleDict.class)
+ @Permission(Const.ADMIN_NAME)
+ @ResponseBody
+ public Tip edit(@Valid Role role, BindingResult result) {
+ if (result.hasErrors()) {
+ throw new GunsException(BizExceptionEnum.REQUEST_NULL);
+ }
+ this.roleService.updateById(role);
+
+ //删除缓存
+ CacheKit.removeAll(Cache.CONSTANT);
+
+ return SUCCESS_TIP;
+ }
+
+ /**
+ * 删除角色
+ */
+ @RequestMapping(value = "/remove")
+ @BussinessLog(value = "删除角色", key = "roleId", dict = RoleDict.class)
+ @Permission(Const.ADMIN_NAME)
+ @ResponseBody
+ public Tip remove(@RequestParam Integer roleId) {
+ if (ToolUtil.isEmpty(roleId)) {
+ throw new GunsException(BizExceptionEnum.REQUEST_NULL);
+ }
+
+ Role role = this.roleService.selectById(roleId);
+
+ //不能删除超级管理员角色
+ if (roleId.equals(Const.ADMIN_ROLE_ID)) {
+ throw new GunsException(BizExceptionEnum.CANT_DELETE_ADMIN);
+ }
+
+ //缓存被删除的角色名称
+ LogObjectHolder.me().set(ConstantFactory.me().getSingleRoleName(roleId));
+
+ this.roleService.delRoleById(roleId);
+
+ //删除缓存
+ CacheKit.removeAll(Cache.CONSTANT);
+ return SUCCESS_TIP;
+ }
+
+ /**
+ * 查看角色
+ */
+ @RequestMapping(value = "/view/{roleId}")
+ @ResponseBody
+ public Tip view(@PathVariable Integer roleId) {
+ if (ToolUtil.isEmpty(roleId)) {
+ throw new GunsException(BizExceptionEnum.REQUEST_NULL);
+ }
+ this.roleService.selectById(roleId);
+ return SUCCESS_TIP;
+ }
+
+ /**
+ * 配置权限
+ */
+ @RequestMapping("/setAuthority")
+ @BussinessLog(value = "配置权限", key = "roleId,ids", dict = RoleDict.class)
+ @Permission(Const.ADMIN_NAME)
+ @ResponseBody
+ public Tip setAuthority(@RequestParam("roleId") Integer roleId, @RequestParam("ids") String ids) {
+ if (ToolUtil.isOneEmpty(roleId)) {
+ throw new GunsException(BizExceptionEnum.REQUEST_NULL);
+ }
+ this.roleService.setAuthority(roleId, ids);
+
+ return SUCCESS_TIP;
+ }
+
+ /**
+ * 获取角色列表
+ */
+ @RequestMapping(value = "/roleTreeList")
+ @ResponseBody
+ public List<ZTreeNode> roleTreeList() {
+ List<ZTreeNode> roleTreeList = this.roleService.roleTreeList();
+ roleTreeList.add(ZTreeNode.createParent());
+ return roleTreeList;
+ }
+
+ /**
+ * 获取角色列表
+ */
+ @RequestMapping(value = "/roleTreeListByUserId/{userId}")
+ @ResponseBody
+ public List<ZTreeNode> roleTreeListByUserId(@PathVariable Integer userId) {
+ User theUser = this.userService.selectById(userId);
+ String roleid = theUser.getRoleid();
+ if (ToolUtil.isEmpty(roleid)) {
+ List<ZTreeNode> roleTreeList = this.roleService.roleTreeList();
+ return roleTreeList;
+ } else {
+ String[] strArray = Convert.toStrArray(",", roleid);
+ List<ZTreeNode> roleTreeListByUserId = this.roleService.roleTreeListByRoleId(strArray);
+ return roleTreeListByUserId;
+ }
+ }
+
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/system/UediterController.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/system/UediterController.java
new file mode 100644
index 0000000..ea492a3
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/system/UediterController.java
@@ -0,0 +1,125 @@
+package com.stylefeng.guns.modular.system.controller.system;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import com.stylefeng.guns.modular.system.util.OssUploadUtil ;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.multipart.MultipartFile;
+import org.springframework.web.multipart.MultipartHttpServletRequest;
+
+import com.alibaba.fastjson.JSON;
+
+@Controller
+public class UediterController {
+ /*@RequestMapping("/config")
+ public String getConfigInfo(HttpServletRequest request,HttpServletResponse response){
+ return "redirect:/static/js/ueditor/jsp/jsp/config.json";
+ }*/
+ public final static String UEDITOR_CONFIG = "{\n" +
+ " \"imageActionName\": \"uploadimage\",\n" +
+ " \"imageFieldName\": \"upfile\",\n" +
+ " \"imageMaxSize\": 2048000,\n" +
+ " \"imageAllowFiles\": [\".png\", \".jpg\", \".jpeg\", \".gif\", \".bmp\"],\n" +
+ " \"imageCompressEnable\": true,\n" +
+ " \"imageCompressBorder\": 1600,\n" +
+ " \"imageInsertAlign\": \"none\",\n" +
+ " \"imageUrlPrefix\": \"\",\n" +
+ " \"imagePathFormat\": \"/ueditor/jsp/upload/image/{yyyy}{mm}{dd}/{time}{rand:6}\",\n" +
+ "\n" +
+ " \"scrawlActionName\": \"uploadscrawl\",\n" +
+ " \"scrawlFieldName\": \"upfile\",\n" +
+ " \"scrawlPathFormat\": \"/ueditor/jsp/upload/image/{yyyy}{mm}{dd}/{time}{rand:6}\",\n" +
+ " \"scrawlMaxSize\": 2048000,\n" +
+ " \"scrawlUrlPrefix\": \"\",\n" +
+ " \"scrawlInsertAlign\": \"none\",\n" +
+ "\n" +
+ " \"snapscreenActionName\": \"uploadimage\",\n" +
+ " \"snapscreenPathFormat\": \"/ueditor/jsp/upload/image/{yyyy}{mm}{dd}/{time}{rand:6}\",\n" +
+ " \"snapscreenUrlPrefix\": \"\",\n" +
+ " \"snapscreenInsertAlign\": \"none\",\n" +
+ "\n" +
+ " \"catcherLocalDomain\": [\"127.0.0.1\", \"localhost\", \"img.baidu.com\"],\n" +
+ " \"catcherActionName\": \"catchimage\",\n" +
+ " \"catcherFieldName\": \"source\",\n" +
+ " \"catcherPathFormat\": \"/ueditor/jsp/upload/image/{yyyy}{mm}{dd}/{time}{rand:6}\",\n" +
+ " \"catcherUrlPrefix\": \"\",\n" +
+ " \"catcherMaxSize\": 2048000,\n" +
+ " \"catcherAllowFiles\": [\".png\", \".jpg\", \".jpeg\", \".gif\", \".bmp\"],\n" +
+ "\n" +
+ " \"videoActionName\": \"uploadvideo\",\n" +
+ " \"videoFieldName\": \"upfile\",\n" +
+ " \"videoPathFormat\": \"/ueditor/jsp/upload/video/{yyyy}{mm}{dd}/{time}{rand:6}\",\n" +
+ " \"videoUrlPrefix\": \"\",\n" +
+ " \"videoMaxSize\": 102400000,\n" +
+ " \"videoAllowFiles\": [\n" +
+ " \".flv\", \".swf\", \".mkv\", \".avi\", \".rm\", \".rmvb\", \".mpeg\", \".mpg\",\n" +
+ " \".ogg\", \".ogv\", \".mov\", \".wmv\", \".mp4\", \".webm\", \".mp3\", \".wav\", \".mid\"],\n" +
+ "\n" +
+ " \"fileActionName\": \"uploadfile\",\n" +
+ " \"fileFieldName\": \"upfile\",\n" +
+ " \"filePathFormat\": \"/ueditor/jsp/upload/file/{yyyy}{mm}{dd}/{time}{rand:6}\",\n" +
+ " \"fileUrlPrefix\": \"\",\n" +
+ " \"fileMaxSize\": 51200000,\n" +
+ " \"fileAllowFiles\": [\n" +
+ " \".png\", \".jpg\", \".jpeg\", \".gif\", \".bmp\",\n" +
+ " \".flv\", \".swf\", \".mkv\", \".avi\", \".rm\", \".rmvb\", \".mpeg\", \".mpg\",\n" +
+ " \".ogg\", \".ogv\", \".mov\", \".wmv\", \".mp4\", \".webm\", \".mp3\", \".wav\", \".mid\",\n" +
+ " \".rar\", \".zip\", \".tar\", \".gz\", \".7z\", \".bz2\", \".cab\", \".iso\",\n" +
+ " \".doc\", \".docx\", \".xls\", \".xlsx\", \".ppt\", \".pptx\", \".pdf\", \".txt\", \".md\", \".xml\"\n" +
+ " ],\n" +
+ "\n" +
+ " \"imageManagerActionName\": \"listimage\",\n" +
+ " \"imageManagerListPath\": \"/ueditor/jsp/upload/image/\",\n" +
+ " \"imageManagerListSize\": 20,\n" +
+ " \"imageManagerUrlPrefix\": \"\",\n" +
+ " \"imageManagerInsertAlign\": \"none\",\n" +
+ " \"imageManagerAllowFiles\": [\".png\", \".jpg\", \".jpeg\", \".gif\", \".bmp\"],\n" +
+ "\n" +
+ " \"fileManagerActionName\": \"listfile\",\n" +
+ " \"fileManagerListPath\": \"/ueditor/jsp/upload/file/\",\n" +
+ " \"fileManagerUrlPrefix\": \"\",\n" +
+ " \"fileManagerListSize\": 20,\n" +
+ " \"fileManagerAllowFiles\": [\n" +
+ " \".png\", \".jpg\", \".jpeg\", \".gif\", \".bmp\",\n" +
+ " \".flv\", \".swf\", \".mkv\", \".avi\", \".rm\", \".rmvb\", \".mpeg\", \".mpg\",\n" +
+ " \".ogg\", \".ogv\", \".mov\", \".wmv\", \".mp4\", \".webm\", \".mp3\", \".wav\", \".mid\",\n" +
+ " \".rar\", \".zip\", \".tar\", \".gz\", \".7z\", \".bz2\", \".cab\", \".iso\",\n" +
+ " \".doc\", \".docx\", \".xls\", \".xlsx\", \".ppt\", \".pptx\", \".pdf\", \".txt\", \".md\", \".xml\"\n" +
+ " ] \n" +
+ "\n" +
+ "}";
+ @RequestMapping(value = "/config")
+ @ResponseBody
+ public JSON config(String action, HttpServletRequest request, HttpServletResponse response) {
+ if(action.equals("config")){
+ return JSON.parseObject(UEDITOR_CONFIG);
+ }else{
+ MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request;
+ MultipartFile picture = multipartRequest.getFile("upfile");
+ String callback = request.getParameter("callback");
+ String pictureName = "";
+ try {
+ //文件上传，具体根据实际替换
+ pictureName = OssUploadUtil.ossUpload(request, picture);
+
+ String result = "{'original': '" + picture.getOriginalFilename() + "', 'state': 'SUCCESS', 'url': '" + pictureName + "'}";
+ if (callback == null) {
+ return JSON.parseObject(result);
+ } else {
+ return JSON.parseObject("<script>" + callback + "(" + result + ")</script>");
+ }
+ } catch (Exception e) {
+ String result = "{'original': '', 'state': '文件上传失败','url': ''}";
+ if (callback == null) {
+ return JSON.parseObject(result);
+ } else {
+ return JSON.parseObject("<script>" + callback + "(" + result + ")</script>");
+ }
+ }
+ }
+
+ }
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/system/UserMgrController.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/system/UserMgrController.java
new file mode 100644
index 0000000..1fa9b8b
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/system/UserMgrController.java
@@ -0,0 +1,451 @@
+package com.stylefeng.guns.modular.system.controller.system;
+
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.baomidou.mybatisplus.plugins.Page;
+import com.stylefeng.guns.config.properties.GunsProperties;
+import com.stylefeng.guns.core.base.controller.BaseController;
+import com.stylefeng.guns.core.base.tips.Tip;
+import com.stylefeng.guns.core.common.annotion.BussinessLog;
+import com.stylefeng.guns.core.common.annotion.Permission;
+import com.stylefeng.guns.core.common.constant.Const;
+import com.stylefeng.guns.core.common.constant.dictmap.UserDict;
+import com.stylefeng.guns.core.common.constant.factory.ConstantFactory;
+import com.stylefeng.guns.core.common.constant.factory.PageFactory;
+import com.stylefeng.guns.core.common.constant.state.ManagerStatus;
+import com.stylefeng.guns.core.common.exception.BizExceptionEnum;
+import com.stylefeng.guns.core.datascope.DataScope;
+import com.stylefeng.guns.core.db.Db;
+import com.stylefeng.guns.core.exception.GunsException;
+import com.stylefeng.guns.core.log.LogObjectHolder;
+import com.stylefeng.guns.core.shiro.ShiroKit;
+import com.stylefeng.guns.core.shiro.ShiroUser;
+import com.stylefeng.guns.core.util.SinataUtil;
+import com.stylefeng.guns.core.util.ToolUtil;
+import com.stylefeng.guns.modular.system.dao.UserMapper;
+import com.stylefeng.guns.modular.system.factory.UserFactory;
+import com.stylefeng.guns.modular.system.model.TCompany;
+import com.stylefeng.guns.modular.system.model.User;
+import com.stylefeng.guns.modular.system.service.ITCompanyService;
+import com.stylefeng.guns.modular.system.service.ITDriverService;
+import com.stylefeng.guns.modular.system.service.IUserService;
+import com.stylefeng.guns.modular.system.transfer.UserDto;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+import javax.naming.NoPermissionException;
+import javax.validation.Valid;
+import java.io.File;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
+
+/**
+ * 系统管理员控制器
+ *
+ * @author fengshuonan
+ * @Date 2017年1月11日 下午1:08:17
+ */
+@Controller
+@RequestMapping("/mgr")
+public class UserMgrController extends BaseController {
+
+ private static String PREFIX = "/system/user/";
+
+ @Autowired
+ private GunsProperties gunsProperties;
+
+ @Autowired
+ private IUserService userService;
+
+ @Autowired
+ private ITDriverService itDriverService;
+
+
+ /**
+ * 跳转到查看管理员列表的页面
+ */
+ @RequestMapping("")
+ public String index() {
+ return PREFIX + "user.html";
+ }
+
+ /**
+ * 跳转到查看管理员列表的页面
+ */
+ @RequestMapping("/user_add")
+ public String addView() {
+ return PREFIX + "user_add.html";
+ }
+
+ /**
+ * 跳转到角色分配页面
+ */
+ //@RequiresPermissions("/mgr/role_assign") //利用shiro自带的权限检查
+ @Permission
+ @RequestMapping("/role_assign/{userId}")
+ public String roleAssign(@PathVariable Integer userId, Model model) {
+ if (ToolUtil.isEmpty(userId)) {
+ throw new GunsException(BizExceptionEnum.REQUEST_NULL);
+ }
+ User user = (User) Db.create(UserMapper.class).selectOneByCon("id", userId);
+ model.addAttribute("userId", userId);
+ model.addAttribute("userAccount", user.getAccount());
+ return PREFIX + "user_roleassign.html";
+ }
+
+ /**
+ * 跳转到编辑管理员页面
+ */
+ @Permission
+ @RequestMapping("/user_edit/{userId}")
+ public String userEdit(@PathVariable Integer userId, Model model) {
+ if (ToolUtil.isEmpty(userId)) {
+ throw new GunsException(BizExceptionEnum.REQUEST_NULL);
+ }
+ assertAuth(userId);
+ User user = this.userService.selectById(userId);
+ model.addAttribute(user);
+ model.addAttribute("roleName", ConstantFactory.me().getRoleName(user.getRoleid()));
+ model.addAttribute("deptName", ConstantFactory.me().getDeptName(user.getDeptid()));
+ LogObjectHolder.me().set(user);
+ return PREFIX + "user_edit.html";
+ }
+
+ /**
+ * 跳转到查看用户详情页面
+ */
+ @RequestMapping("/user_info")
+ public String userInfo(Model model) {
+ Integer userId = ShiroKit.getUser().getId();
+ if (ToolUtil.isEmpty(userId)) {
+ throw new GunsException(BizExceptionEnum.REQUEST_NULL);
+ }
+ User user = this.userService.selectById(userId);
+ model.addAttribute(user);
+ model.addAttribute("roleName", ConstantFactory.me().getRoleName(user.getRoleid()));
+ model.addAttribute("deptName", user.getDeptid()==0?"顶级":ConstantFactory.me().getDeptName(user.getDeptid()));
+ LogObjectHolder.me().set(user);
+ return PREFIX + "user_view.html";
+ }
+
+ /**
+ * 跳转到修改密码界面
+ */
+ @RequestMapping("/user_chpwd")
+ public String chPwd() {
+ return PREFIX + "user_chpwd.html";
+ }
+
+ /**
+ * 修改当前用户的密码
+ */
+ @RequestMapping("/changePwd")
+ @ResponseBody
+ public Object changePwd(@RequestParam String oldPwd, @RequestParam String newPwd, @RequestParam String rePwd) {
+ if (!newPwd.equals(rePwd)) {
+ throw new GunsException(BizExceptionEnum.TWO_PWD_NOT_MATCH);
+ }
+ Integer userId = ShiroKit.getUser().getId();
+ User user = userService.selectById(userId);
+ String oldMd5 = ShiroKit.md5(oldPwd, user.getSalt());
+ if (user.getPassword().equals(oldMd5)) {
+ String newMd5 = ShiroKit.md5(newPwd, user.getSalt());
+ user.setPassword(newMd5);
+ user.setPassWordUpdate(new Date());
+ user.updateById();
+ return SUCCESS_TIP;
+ } else {
+ throw new GunsException(BizExceptionEnum.OLD_PWD_NOT_RIGHT);
+ }
+ }
+
+ /**
+ * 查询管理员列表
+ */
+ @RequestMapping("/list")
+ @Permission
+ @ResponseBody
+ public Object list(@RequestParam(required = false) String name, @RequestParam(required = false) String createTime, @RequestParam(required = false) Integer deptid) {
+ //创建日期
+ String beginTime = null;
+ String endTime = null;
+ if (SinataUtil.isNotEmpty(createTime)){
+ String[] timeArray = createTime.split(" - ");
+ beginTime = timeArray[0];
+ endTime = timeArray[1];
+ }
+ if (ShiroKit.isAdmin()) {
+ Page<Map<String, Object>> page = new PageFactory<Map<String, Object>>().defaultPage();
+ page.setRecords(userService.getUserListPage(page,null, name, beginTime, endTime, deptid));
+ return super.packForBT(page);
+ } else {
+ DataScope dataScope = new DataScope(ShiroKit.getDeptDataScope());
+ Page<Map<String, Object>> page = new PageFactory<Map<String, Object>>().defaultPage();
+ page.setRecords(userService.getUserListPage(page,dataScope, name, beginTime, endTime, deptid));
+ return super.packForBT(page);
+ }
+ }
+
+ /**
+ * 添加管理员
+ */
+ @RequestMapping("/add")
+ @BussinessLog(value = "添加管理员", key = "account", dict = UserDict.class)
+ @Permission(Const.ADMIN_NAME)
+ @ResponseBody
+ public Tip add(@Valid UserDto user, BindingResult result) {
+ if (result.hasErrors()) {
+ throw new GunsException(BizExceptionEnum.REQUEST_NULL);
+ }
+
+ // 判断账号是否重复
+ User theUser = userService.getByAccount(user.getAccount());
+ if (theUser != null) {
+ throw new GunsException(BizExceptionEnum.USER_ALREADY_REG);
+ }
+
+ // 完善账号信息
+ user.setSalt(ShiroKit.getRandomSalt(5));
+ user.setPassword(ShiroKit.md5(user.getPassword(), user.getSalt()));
+ user.setStatus(ManagerStatus.OK.getCode());
+ user.setCreatetime(new Date());
+
+ User objectUser = UserFactory.createUser(user);
+ //查找平台所属公司
+ TCompany company = itCompanyService.selectOne(new EntityWrapper<TCompany>().eq("type", 1).orderBy("id", true).last(" limit 1"));
+ if (SinataUtil.isNotEmpty(company)){
+ objectUser.setObjectId(company.getId());
+ }
+ objectUser.setPassWordUpdate(new Date());
+ this.userService.insert(objectUser);
+
+ return SUCCESS_TIP;
+ }
+
+ /**
+ * 修改管理员
+ *
+ * @throws NoPermissionException
+ */
+ @RequestMapping("/edit")
+ @BussinessLog(value = "修改管理员", key = "account", dict = UserDict.class)
+ @ResponseBody
+ public Tip edit(@Valid UserDto user, BindingResult result) throws NoPermissionException {
+ if (result.hasErrors()) {
+ throw new GunsException(BizExceptionEnum.REQUEST_NULL);
+ }
+
+
+ User oldUser = userService.selectById(user.getId());
+
+ if (ShiroKit.hasRole(Const.ADMIN_NAME)) {
+ this.userService.updateById(UserFactory.editUser(user, oldUser));
+ return SUCCESS_TIP;
+ } else {
+ assertAuth(user.getId());
+ ShiroUser shiroUser = ShiroKit.getUser();
+ if (shiroUser.getId().equals(user.getId())) {
+ this.userService.updateById(UserFactory.editUser(user, oldUser));
+ return SUCCESS_TIP;
+ } else {
+ throw new GunsException(BizExceptionEnum.NO_PERMITION);
+ }
+ }
+ }
+
+ /**
+ * 删除管理员（逻辑删除）
+ */
+ @RequestMapping("/delete")
+ @BussinessLog(value = "删除管理员", key = "userId", dict = UserDict.class)
+ @Permission
+ @ResponseBody
+ public Tip delete(@RequestParam Integer userId) {
+ if (ToolUtil.isEmpty(userId)) {
+ throw new GunsException(BizExceptionEnum.REQUEST_NULL);
+ }
+ //不能删除超级管理员
+ if (userId.equals(Const.ADMIN_ID)) {
+ throw new GunsException(BizExceptionEnum.CANT_DELETE_ADMIN);
+ }
+
+
+ assertAuth(userId);
+ this.userService.setStatus(userId, ManagerStatus.DELETED.getCode());
+ return SUCCESS_TIP;
+ }
+
+ /**
+ * 查看管理员详情
+ */
+ @RequestMapping("/view/{userId}")
+ @ResponseBody
+ public User view(@PathVariable Integer userId) {
+ if (ToolUtil.isEmpty(userId)) {
+ throw new GunsException(BizExceptionEnum.REQUEST_NULL);
+ }
+ assertAuth(userId);
+ return this.userService.selectById(userId);
+ }
+
+ /**
+ * 重置管理员的密码
+ */
+ @RequestMapping("/reset")
+ @BussinessLog(value = "重置管理员密码", key = "userId", dict = UserDict.class)
+ @Permission(Const.ADMIN_NAME)
+ @ResponseBody
+ public Tip reset(@RequestParam Integer userId) {
+ if (ToolUtil.isEmpty(userId)) {
+ throw new GunsException(BizExceptionEnum.REQUEST_NULL);
+ }
+ assertAuth(userId);
+ User user = this.userService.selectById(userId);
+ user.setSalt(ShiroKit.getRandomSalt(5));
+ user.setPassword(ShiroKit.md5(Const.DEFAULT_PWD, user.getSalt()));
+ this.userService.updateById(user);
+
+ return SUCCESS_TIP;
+ }
+
+ @Autowired
+ private ITCompanyService itCompanyService;
+
+ /**
+ * 冻结用户
+ */
+ @RequestMapping("/freeze")
+ @BussinessLog(value = "冻结用户", key = "userId", dict = UserDict.class)
+ @Permission(Const.ADMIN_NAME)
+ @ResponseBody
+ public Tip freeze(@RequestParam Integer userId) {
+ if (ToolUtil.isEmpty(userId)) {
+ throw new GunsException(BizExceptionEnum.REQUEST_NULL);
+ }
+ //不能冻结超级管理员
+ if (userId.equals(Const.ADMIN_ID)) {
+ throw new GunsException(BizExceptionEnum.CANT_FREEZE_ADMIN);
+ }
+ assertAuth(userId);
+ this.userService.setStatus(userId, ManagerStatus.FREEZED.getCode());
+
+ User user = userService.selectById(userId);
+ if (user.getRoleType() == 2){
+ //查询分公司
+ TCompany company = itCompanyService.selectById(user.getObjectId());
+ company.setState(1);
+ itCompanyService.updateById(company);
+
+ //设置该分公司下的所有司机状态
+ itDriverService.updateCompanyDriverState(3,company.getId());
+
+ }else if (user.getRoleType() == 3){
+ //查询加盟商
+ TCompany franchisee = itCompanyService.selectById(user.getObjectId());
+ franchisee.setState(1);
+ itCompanyService.updateById(franchisee);
+
+ //设置该加盟商下的所有司机状态
+ itDriverService.updateFranchiseeDriverState(3,franchisee.getId());
+ }
+ return SUCCESS_TIP;
+ }
+
+ /**
+ * 解除冻结用户
+ */
+ @RequestMapping("/unfreeze")
+ @BussinessLog(value = "解除冻结用户", key = "userId", dict = UserDict.class)
+ @Permission(Const.ADMIN_NAME)
+ @ResponseBody
+ public Tip unfreeze(@RequestParam Integer userId) {
+ if (ToolUtil.isEmpty(userId)) {
+ throw new GunsException(BizExceptionEnum.REQUEST_NULL);
+ }
+ assertAuth(userId);
+ this.userService.setStatus(userId, ManagerStatus.OK.getCode());
+
+ User user = userService.selectById(userId);
+ if (user.getRoleType() == 2){
+ //查询分公司
+ TCompany company = itCompanyService.selectById(user.getObjectId());
+ company.setState(0);
+ itCompanyService.updateById(company);
+
+ //设置该分公司下的所有司机状态
+ itDriverService.updateCompanyDriverState(2,company.getId());
+
+ }else if (user.getRoleType() == 3){
+ //查询加盟商
+ TCompany franchisee = itCompanyService.selectById(user.getObjectId());
+ franchisee.setState(0);
+ itCompanyService.updateById(franchisee);
+
+ //设置该加盟商下的所有司机状态
+ itDriverService.updateFranchiseeDriverState(2,franchisee.getId());
+ }
+ return SUCCESS_TIP;
+ }
+
+ /**
+ * 分配角色
+ */
+ @RequestMapping("/setRole")
+ @BussinessLog(value = "分配角色", key = "userId,roleIds", dict = UserDict.class)
+ @Permission(Const.ADMIN_NAME)
+ @ResponseBody
+ public Tip setRole(@RequestParam("userId") Integer userId, @RequestParam("roleIds") String roleIds) {
+ if (ToolUtil.isOneEmpty(userId, roleIds)) {
+ throw new GunsException(BizExceptionEnum.REQUEST_NULL);
+ }
+ //不能修改超级管理员
+ if (userId.equals(Const.ADMIN_ID)) {
+ throw new GunsException(BizExceptionEnum.CANT_CHANGE_ADMIN);
+ }
+ assertAuth(userId);
+ this.userService.setRoles(userId, roleIds);
+
+
+ return SUCCESS_TIP;
+ }
+
+ /**
+ * 上传图片
+ */
+ @RequestMapping(method = RequestMethod.POST, path = "/upload")
+ @ResponseBody
+ public String upload(@RequestPart("file") MultipartFile picture) {
+
+ String pictureName = UUID.randomUUID().toString() + "." + ToolUtil.getFileSuffix(picture.getOriginalFilename());
+ try {
+ String fileSavePath = gunsProperties.getFileUploadPath();
+ picture.transferTo(new File(fileSavePath + pictureName));
+ } catch (Exception e) {
+ throw new GunsException(BizExceptionEnum.UPLOAD_ERROR);
+ }
+ return pictureName;
+ }
+
+ /**
+ * 判断当前登录的用户是否有操作这个用户的权限
+ */
+ private void assertAuth(Integer userId) {
+ if (ShiroKit.isAdmin()) {
+ return;
+ }
+ List<Integer> deptDataScope = ShiroKit.getDeptDataScope();
+ User user = this.userService.selectById(userId);
+ Integer deptid = user.getDeptid();
+ if (deptDataScope.contains(deptid)) {
+ return;
+ } else {
+ throw new GunsException(BizExceptionEnum.NO_PERMITION);
+ }
+
+ }
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/taxi/TOrderTaxiController.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/taxi/TOrderTaxiController.java
new file mode 100644
index 0000000..c721350
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/taxi/TOrderTaxiController.java
@@ -0,0 +1,278 @@
+package com.stylefeng.guns.modular.system.controller.taxi;
+
+import com.alibaba.fastjson.JSONArray;
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.baomidou.mybatisplus.plugins.Page;
+import com.stylefeng.guns.core.base.controller.BaseController;
+import com.stylefeng.guns.core.common.constant.factory.PageFactory;
+import com.stylefeng.guns.core.shiro.ShiroKit;
+import com.stylefeng.guns.core.util.SinataUtil;
+import com.stylefeng.guns.core.util.ToolUtil;
+import com.stylefeng.guns.modular.system.model.TDriver;
+import com.stylefeng.guns.modular.system.model.TOrderPosition;
+import com.stylefeng.guns.modular.system.service.ITDriverService;
+import com.stylefeng.guns.modular.system.service.ITOrderPositionService;
+import com.stylefeng.guns.modular.system.util.HttpRequestUtil;
+import com.stylefeng.guns.modular.system.util.PushURL;
+import com.stylefeng.guns.modular.system.util.ResultUtil;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.ui.Model;
+import org.springframework.beans.factory.annotation.Autowired;
+import com.stylefeng.guns.core.log.LogObjectHolder;
+import com.stylefeng.guns.modular.system.model.TOrderTaxi;
+import com.stylefeng.guns.modular.system.service.ITOrderTaxiService;
+
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.InputStreamReader;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 出租车订单控制器
+ *
+ * @author fengshuonan
+ * @Date 2020-06-08 10:25:55
+ */
+@Controller
+@RequestMapping("/tOrderTaxi")
+public class TOrderTaxiController extends BaseController {
+
+ private String PREFIX = "/system/tOrderTaxi/";
+
+ @Autowired
+ private ITOrderTaxiService tOrderTaxiService;
+
+ @Autowired
+ private ITOrderPositionService tOrderPositionService;
+
+ @Autowired
+ private ITDriverService tDriverService;
+
+ @Value("${filePath}")
+ private String filePath;
+
+ /**
+ * 跳转到出租车订单首页
+ */
+ @RequestMapping("")
+ public String index() {
+ return PREFIX + "tOrderTaxi.html";
+ }
+
+ /**
+ * 跳转到添加出租车订单
+ */
+ @RequestMapping("/tOrderTaxi_add")
+ public String tOrderTaxiAdd() {
+ return PREFIX + "tOrderTaxi_add.html";
+ }
+
+ /**
+ * 跳转到修改出租车订单
+ */
+ @RequestMapping("/tOrderTaxi_update/{tOrderTaxiId}")
+ public String tOrderTaxiUpdate(@PathVariable Integer tOrderTaxiId, Model model) {
+ Map<String, Object> tOrderTaxi = tOrderTaxiService.getTaxiOrderDetailById(tOrderTaxiId);
+ model.addAttribute("item",tOrderTaxi);
+ LogObjectHolder.me().set(tOrderTaxi);
+ return PREFIX + "tOrderTaxi_edit.html";
+ }
+
+ /**
+ * 跳转到改派出租车订单
+ */
+ @RequestMapping("/tOrderTaxi_changeOrder/{tOrderTaxiId}")
+ public String tOrderTaxi_changeOrder(@PathVariable Integer tOrderTaxiId, Model model) {
+ TOrderTaxi tOrderTaxi = tOrderTaxiService.selectById(tOrderTaxiId);
+ model.addAttribute("item",tOrderTaxi);
+ LogObjectHolder.me().set(tOrderTaxi);
+ return PREFIX + "tOrderTaxi_changeOrder.html";
+ }
+
+ /**
+ * 跳转到出租车订单轨迹页面
+ */
+ @RequestMapping("/tOrderTaxi_trajectory/{tOrderTaxiId}")
+ public String tOrderTaxi_trajectory(@PathVariable Integer tOrderTaxiId, Model model) {
+ model.addAttribute("tOrderTaxiId",tOrderTaxiId);
+ return PREFIX + "tOrderTaxi_trajectory.html";
+ }
+
+ /**
+ * 获取出租车订单列表
+ */
+ @RequestMapping(value = "/list")
+ @ResponseBody
+ public Object list(String insertTime,
+ String orderNum,
+ Integer orderSource,
+ String userName,
+ String userPhone,
+ String passengers,
+ String passengersPhone,
+ String driver,
+ Integer state) {
+ String beginTime = null;
+ String endTime = null;
+ if (SinataUtil.isNotEmpty(insertTime)){
+ String[] timeArray = insertTime.split(" - ");
+ beginTime = timeArray[0];
+ endTime = timeArray[1];
+ }
+ Page<Map<String, Object>> page = new PageFactory<Map<String, Object>>().defaultPage();
+ page.setRecords(tOrderTaxiService.getTaxiOrderList(page,beginTime,endTime,ShiroKit.getUser().getRoleType(),ShiroKit.getUser().getObjectId(),orderNum,orderSource,userName,userPhone,passengers,passengersPhone,driver,state));
+ return super.packForBT(page);
+ }
+
+ /**
+ * 选择司机列表
+ */
+ @RequestMapping(value = "/selectDriver/{orderId}")
+ @ResponseBody
+ public Object selectDriver(@PathVariable Integer orderId,
+ String name,
+ String phone) {
+ TOrderTaxi tOrderTaxi = tOrderTaxiService.selectById(orderId);
+ Page<Map<String, Object>> page = new PageFactory<Map<String, Object>>().defaultPage();
+ page.setRecords(tOrderTaxiService.getCanSelectTaxiDriverList(page,tOrderTaxi.getCompanyId(),name,phone));
+ return super.packForBT(page);
+ }
+
+ private ResultUtil resultUtil;
+
+ /**
+ * 获取订单轨迹
+ * @param orderDetailId
+ * @return
+ */
+ @ResponseBody
+ @RequestMapping(value = "/getOrderTrack", method = RequestMethod.POST)
+ public ResultUtil getOrderTrack(String orderDetailId){
+ if(ToolUtil.isNotEmpty(orderDetailId)){
+ try {
+// List<TOrderPosition> list = tOrderPositionService.selectList(new EntityWrapper<TOrderPosition>().eq("orderType", 2).eq("orderId", orderDetailId).orderBy("insertTime"));
+ /*if(list.size() == 0){
+ return ResultUtil.error("该订单没有运行轨迹");
+ }*/
+ //将数据存储到文件中
+ File file = new File(filePath + orderDetailId + "_2.txt");
+ if(!file.exists()){
+ return ResultUtil.success(new ArrayList<>());
+ }
+ //读取文件(字符流)
+ BufferedReader in = new BufferedReader(new InputStreamReader(new FileInputStream(file),"UTF-8"));
+ //循环取出数据
+ String str = null;
+ StringBuffer sb = new StringBuffer();
+ while ((str = in.readLine()) != null) {
+ sb.append(str);
+ }
+ List<TOrderPosition> list = JSONArray.parseArray(sb.toString(), TOrderPosition.class);
+ resultUtil = ResultUtil.success(list);
+ }catch (Exception e){
+ e.printStackTrace();
+ resultUtil = ResultUtil.runErr();
+ }
+ }else {
+ resultUtil = ResultUtil.paranErr();
+ }
+ return resultUtil;
+ }
+
+ /**
+ * 删除出租车订单
+ */
+ @RequestMapping(value = "/delete")
+ @ResponseBody
+ public Object delete(@RequestParam Integer tOrderTaxiId) {
+ TOrderTaxi tOrderTaxi = tOrderTaxiService.selectById(tOrderTaxiId);
+ tOrderTaxi.setIsDelete(2);
+ tOrderTaxiService.updateById(tOrderTaxi);
+ return SUCCESS_TIP;
+ }
+
+ /**
+ * 出租车订单改派司机
+ */
+ @RequestMapping(value = "/selectDriver")
+ @ResponseBody
+ public Object selectDriver(@RequestParam Integer orderId,@RequestParam Integer driverId) {
+ //修改订单
+ TOrderTaxi tOrderTaxi = tOrderTaxiService.selectById(orderId);
+
+ //修改之前司机状态 -- 空闲
+ TDriver oldDriver = tDriverService.selectById(tOrderTaxi.getDriverId());
+ oldDriver.setState(2);
+ tDriverService.updateById(oldDriver);
+
+ //查找司机对象
+ TDriver nowDriver = tDriverService.selectById(driverId);
+ nowDriver.setState(3);
+ tDriverService.updateById(nowDriver);
+
+ //修改出租车订单
+ tOrderTaxi.setState(tOrderTaxi.getOldState());
+ tOrderTaxi.setDriverId(driverId);
+ tOrderTaxi.setCarId(nowDriver.getCarId());
+ tOrderTaxiService.updateById(tOrderTaxi);
+
+ //增加推送
+ Map<String,String> map = new HashMap<>();
+ map.put("orderId", tOrderTaxi.getId().toString());
+ map.put("orderType", "2");
+ String result = HttpRequestUtil.postRequest(PushURL.order_push_url, map);
+ System.out.println("出租车改派:【orderId="+tOrderTaxi.getId().toString()+"】,调用接口:"+result);
+ return SUCCESS_TIP;
+ }
+
+ /**
+ * 取消出租车订单
+ */
+ @RequestMapping(value = "/cancel")
+ @ResponseBody
+ public Object cancel(@RequestParam Integer tOrderTaxiId) {
+ TOrderTaxi tOrderTaxi = tOrderTaxiService.selectById(tOrderTaxiId);
+
+ //修改之前司机状态 -- 空闲
+ TDriver driver = tDriverService.selectById(tOrderTaxi.getDriverId());
+ driver.setState(2);
+ tDriverService.updateById(driver);
+
+ tOrderTaxi.setState(10);
+ tOrderTaxiService.updateById(tOrderTaxi);
+
+ //增加推送
+ Map<String,String> map = new HashMap<>();
+ map.put("id", tOrderTaxi.getId().toString());
+ map.put("orderType", "2");
+ String result = HttpRequestUtil.postRequest(PushURL.cancel_order_url, map);
+ System.out.println("出租车取消:【orderId="+tOrderTaxi.getId().toString()+"】,调用接口:"+result);
+
+ return SUCCESS_TIP;
+ }
+
+ /**
+ * 修改出租车订单
+ */
+ @RequestMapping(value = "/update")
+ @ResponseBody
+ public Object update(TOrderTaxi tOrderTaxi) {
+ tOrderTaxiService.updateById(tOrderTaxi);
+ return SUCCESS_TIP;
+ }
+
+ /**
+ * 出租车订单详情
+ */
+ @RequestMapping(value = "/detail/{tOrderTaxiId}")
+ @ResponseBody
+ public Object detail(@PathVariable("tOrderTaxiId") Integer tOrderTaxiId) {
+ return tOrderTaxiService.selectById(tOrderTaxiId);
+ }
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/util/MD5.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/util/MD5.java
new file mode 100644
index 0000000..c320048
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/util/MD5.java
@@ -0,0 +1,119 @@
+package com.stylefeng.guns.modular.system.controller.util;
+
+import java.io.*;
+import java.security.MessageDigest;
+import java.security.NoSuchAlgorithmException;
+
+/**
+ * MD5编码相关的类
+ *
+ * @author wangjingtao
+ *
+ */
+public class MD5 {
+ // 首先初始化一个字符数组，用来存放每个16进制字符
+ private static final char[] hexDigits = { '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'a', 'b', 'c', 'd', 'e',
+ 'f' };
+
+ /**
+ * 获得一个字符串的MD5值
+ *
+ * @param input
+ * 输入的字符串
+ * @return 输入字符串的MD5值
+ * @throws UnsupportedEncodingException
+ *
+ */
+ public static String md5(String input) throws UnsupportedEncodingException {
+ if (input == null)
+ return null;
+
+ try {
+ // 拿到一个MD5转换器（如果想要SHA1参数换成”SHA1”）
+ MessageDigest messageDigest = MessageDigest.getInstance("MD5");
+ // 输入的字符串转换成字节数组
+ byte[] inputByteArray = input.getBytes("utf-8");
+ // inputByteArray是输入字符串转换得到的字节数组
+ messageDigest.update(inputByteArray);
+ // 转换并返回结果，也是字节数组，包含16个元素
+ byte[] resultByteArray = messageDigest.digest();
+ // 字符数组转换成字符串返回
+ return byteArrayToHex(resultByteArray);
+ } catch (NoSuchAlgorithmException e) {
+ return null;
+ }
+ }
+
+ /**
+ * 获取文件的MD5值
+ *
+ * @param file
+ * @return
+ */
+ public static String md5(File file) {
+ try {
+ if (!file.isFile()) {
+ System.err.println("文件" + file.getAbsolutePath() + "不存在或者不是文件");
+ return null;
+ }
+
+ FileInputStream in = new FileInputStream(file);
+
+ String result = md5(in);
+
+ in.close();
+
+ return result;
+
+ } catch (FileNotFoundException e) {
+ e.printStackTrace();
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
+
+ return null;
+ }
+
+ public static String md5(InputStream in) {
+
+ try {
+ MessageDigest messagedigest = MessageDigest.getInstance("MD5");
+
+ byte[] buffer = new byte[1024];
+ int read = 0;
+ while ((read = in.read(buffer)) != -1) {
+ messagedigest.update(buffer, 0, read);
+ }
+
+ in.close();
+
+ String result = byteArrayToHex(messagedigest.digest());
+
+ return result;
+ } catch (NoSuchAlgorithmException e) {
+ e.printStackTrace();
+ } catch (FileNotFoundException e) {
+ e.printStackTrace();
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
+
+ return null;
+ }
+
+ private static String byteArrayToHex(byte[] byteArray) {
+ // new一个字符数组，这个就是用来组成结果字符串的（解释一下：一个byte是八位二进制，也就是2位十六进制字符（2的8次方等于16的2次方））
+ char[] resultCharArray = new char[byteArray.length * 2];
+ // 遍历字节数组，通过位运算（位运算效率高），转换成字符放到字符数组中去
+ int index = 0;
+ for (byte b : byteArray) {
+ resultCharArray[index++] = hexDigits[b >>> 4 & 0xf];
+ resultCharArray[index++] = hexDigits[b & 0xf];
+ }
+
+ // 字符数组组合成字符串返回
+ return new String(resultCharArray);
+
+ }
+
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/util/SendSms.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/util/SendSms.java
new file mode 100644
index 0000000..9b85834
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/util/SendSms.java
@@ -0,0 +1,263 @@
+package com.stylefeng.guns.modular.system.controller.util;
+
+
+import javax.net.ssl.*;
+import java.io.*;
+import java.net.URL;
+import java.net.URLEncoder;
+import java.security.MessageDigest;
+import java.security.NoSuchAlgorithmException;
+import java.security.cert.CertificateException;
+import java.security.cert.X509Certificate;
+import java.text.SimpleDateFormat;
+import java.util.*;
+
+//如果JDK版本是1.8,可使用原生Base64类
+
+//如果JDK版本低于1.8,请使用三方库提供Base64类
+//import org.apache.commons.codec.binary.Base64;
+
+public class SendSms {
+
+ //无需修改,用于格式化鉴权头域,给"X-WSSE"参数赋值
+ private static final String WSSE_HEADER_FORMAT = "UsernameToken Username=\"%s\",PasswordDigest=\"%s\",Nonce=\"%s\",Created=\"%s\"";
+ //无需修改,用于格式化鉴权头域,给"Authorization"参数赋值
+ private static final String AUTH_HEADER_VALUE = "WSSE realm=\"SDP\",profile=\"UsernameToken\",type=\"Appkey\"";
+ //必填,请参考"开发准备"获取如下数据,替换为实际值
+ private static String url = "https://api.rtc.huaweicloud.com:10443/sms/batchSendSms/v1"; //APP接入地址+接口访问URI//https://api.rtc.huaweicloud.com:10443
+ private static String appKey = "77lVYXy28011Ia6r43L6180kvdTv"; //APP_Key
+ private static String appSecret = "8heBt1YBCL71AF1G9UkxZpoUFqIY"; //APP_Secret
+ private static String sender1 = "881907307922"; //国内短信签名通道号或国际/港澳台短信通道号 (验证码类)
+ private static String sender2 = "8819073039050"; //国内短信签名通道号或国际/港澳台短信通道号(通知类)
+ private static String templateId1 = "6090edbdbd7e4550aae87bea35454d61"; //模板ID(验证码类)
+ private static String templateId2 = "18134ace828144f4bec31fa326e4de86"; //模板ID（通知类）
+ //条件必填,国内短信关注,当templateId指定的模板类型为通用模板时生效且必填,必须是已审核通过的,与模板类型一致的签名名称
+ //国际/港澳台短信不用关注该参数
+ private static String signature = "全客通"; //签名名称
+
+ //必填,全局号码格式(包含国家码),示例:+8615123456789,多个号码之间用英文逗号分隔
+ String receiver = "+8615123456789,+8615234567890"; //短信接收人号码
+
+ //选填,短信状态报告接收地址,推荐使用域名,为空或者不填表示不接收状态报告
+ private static String statusCallBack = "";
+
+ /** 发送短信成功之后的回调信息
+ * {"result":[{"originTo":"13981969442","createTime":"2019-08-01T01:13:21Z","from":"8819073039050","smsMsgId":"f69b2293-9285-4f48-933e-6bcba1ea5710_579546688","status":"000000"}],"code":"000000","description":"Success"}
+ */
+
+ /**
+ * 选填,使用无变量模板时请赋空值 String templateParas = "";
+ * 单变量模板示例:模板内容为"您的验证码是${NUM_6}"时,templateParas可填写为"[\"369751\"]"
+ * 双变量模板示例:模板内容为"您有${NUM_2}件快递请到${TXT_32}领取"时,templateParas可填写为"[\"3\",\"人民公园正门\"]"
+ * 查看更多模板格式规范:常见问题>业务规则>短信模板内容审核标准
+ */
+ String templateParas = "[\"369751\"]"; //模板变量
+
+ public static String send (String receiver,String templateParas,Integer type) throws Exception {
+
+ //请求Body,不携带签名名称时,signature请填null
+
+ String body="";
+
+ if(type==1){
+ //验证码类
+ body =buildRequestBody(sender1, receiver, templateId1,templateParas , statusCallBack, signature);
+ }else if(type==2){
+ //通知类
+ body =buildRequestBody(sender2, receiver, templateId2,templateParas , statusCallBack, signature);
+ }
+
+ if (null == body || body.isEmpty()) {
+ System.out.println("body is null.");
+ return null;
+ }
+
+ //请求Headers中的X-WSSE参数值
+ String wsseHeader = buildWsseHeader(appKey, appSecret);
+ if (null == wsseHeader || wsseHeader.isEmpty()) {
+ System.out.println("wsse header is null.");
+ return null;
+ }
+
+ DataOutputStream out = null;
+ BufferedReader in = null;
+ StringBuffer result = new StringBuffer();
+ HttpsURLConnection connection = null;
+ InputStream is = null;
+
+ //为防止因HTTPS证书认证失败造成API调用失败,需要先忽略证书信任问题
+ HostnameVerifier hv = new HostnameVerifier() {
+
+ @Override
+ public boolean verify(String hostname, SSLSession session) {
+ return true;
+ }
+ };
+ trustAllHttpsCertificates();
+
+ try {
+ URL realUrl = new URL(url);
+ connection = (HttpsURLConnection) realUrl.openConnection();
+
+ connection.setHostnameVerifier(hv);
+ connection.setDoOutput(true);
+ connection.setDoInput(true);
+ connection.setUseCaches(true);
+ //请求方法
+ connection.setRequestMethod("POST");
+ //请求Headers参数
+ connection.setRequestProperty("Content-Type", "application/x-www-form-urlencoded");
+ connection.setRequestProperty("Authorization", AUTH_HEADER_VALUE);
+ connection.setRequestProperty("X-WSSE", wsseHeader);
+
+ connection.connect();
+ out = new DataOutputStream(connection.getOutputStream());
+ out.writeBytes(body); //发送请求Body参数
+ out.flush();
+ out.close();
+
+ int status = connection.getResponseCode();
+ if (200 == status) { //200
+ is = connection.getInputStream();
+ } else { //400/401
+ is = connection.getErrorStream();
+ }
+ in = new BufferedReader(new InputStreamReader(is, "UTF-8"));
+ String line = "";
+ while ((line = in.readLine()) != null) {
+ result.append(line);
+ }
+ System.out.println(result.toString()); //打印响应消息实体
+ } catch (Exception e) {
+ e.printStackTrace();
+ } finally {
+ try {
+ if (null != out) {
+ out.close();
+ }
+ if (null != is) {
+ is.close();
+ }
+ if (null != in) {
+ in.close();
+ }
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ }
+ return result.toString();
+ }
+
+ /**
+ * 构造请求Body体
+ * @param sender
+ * @param receiver
+ * @param templateId
+ * @param templateParas
+ * @param statusCallBack
+ * @param signature | 签名名称,使用国内短信通用模板时填写
+ * @return
+ */
+ static String buildRequestBody(String sender, String receiver, String templateId, String templateParas,
+ String statusCallBack, String signature) {
+ if (null == sender || null == receiver || null == templateId || sender.isEmpty() || receiver.isEmpty()
+ || templateId.isEmpty()) {
+ System.out.println("buildRequestBody(): sender, receiver or templateId is null.");
+ return null;
+ }
+ Map<String, String> map = new HashMap<String, String>();
+
+ map.put("from", sender);
+ map.put("to", receiver);
+ map.put("templateId", templateId);
+ if (null != templateParas && !templateParas.isEmpty()) {
+ map.put("templateParas", templateParas);
+ }
+ if (null != statusCallBack && !statusCallBack.isEmpty()) {
+ map.put("statusCallback", statusCallBack);
+ }
+ if (null != signature && !signature.isEmpty()) {
+ map.put("signature", signature);
+ }
+
+ StringBuilder sb = new StringBuilder();
+ String temp = "";
+
+ for (String s : map.keySet()) {
+ try {
+ temp = URLEncoder.encode(map.get(s), "UTF-8");
+ } catch (UnsupportedEncodingException e) {
+ e.printStackTrace();
+ }
+ sb.append(s).append("=").append(temp).append("&");
+ }
+
+ return sb.deleteCharAt(sb.length()-1).toString();
+ }
+
+ /**
+ * 构造X-WSSE参数值
+ * @param appKey
+ * @param appSecret
+ * @return
+ */
+ static String buildWsseHeader(String appKey, String appSecret) {
+ if (null == appKey || null == appSecret || appKey.isEmpty() || appSecret.isEmpty()) {
+ System.out.println("buildWsseHeader(): appKey or appSecret is null.");
+ return null;
+ }
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss'Z'");
+ String time = sdf.format(new Date()); //Created
+ String nonce = UUID.randomUUID().toString().replace("-", ""); //Nonce
+
+ MessageDigest md;
+ byte[] passwordDigest = null;
+
+ try {
+ md = MessageDigest.getInstance("SHA-256");
+ md.update((nonce + time + appSecret).getBytes());
+ passwordDigest = md.digest();
+ } catch (NoSuchAlgorithmException e) {
+ e.printStackTrace();
+ }
+
+ //如果JDK版本是1.8,请加载原生Base64类,并使用如下代码
+ String passwordDigestBase64Str = Base64.getEncoder().encodeToString(passwordDigest); //PasswordDigest
+ //如果JDK版本低于1.8,请加载三方库提供Base64类,并使用如下代码
+ //String passwordDigestBase64Str = Base64.encodeBase64String(passwordDigest); //PasswordDigest
+ //若passwordDigestBase64Str中包含换行符,请执行如下代码进行修正
+ //passwordDigestBase64Str = passwordDigestBase64Str.replaceAll("[\\s*\t\n\r]", "");
+ return String.format(WSSE_HEADER_FORMAT, appKey, passwordDigestBase64Str, nonce, time);
+ }
+
+ /**
+ * 忽略证书信任问题
+ * @throws Exception
+ */
+ static void trustAllHttpsCertificates() throws Exception {
+ TrustManager[] trustAllCerts = new TrustManager[] {
+ new X509TrustManager() {
+ public void checkClientTrusted(X509Certificate[] chain, String authType) throws CertificateException {
+ return;
+ }
+ public void checkServerTrusted(X509Certificate[] chain, String authType) throws CertificateException {
+ return;
+ }
+ public X509Certificate[] getAcceptedIssuers() {
+ return null;
+ }
+ }
+ };
+ SSLContext sc = SSLContext.getInstance("SSL");
+ sc.init(null, trustAllCerts, null);
+ HttpsURLConnection.setDefaultSSLSocketFactory(sc.getSocketFactory());
+ }
+ /*测试发送短信*/
+ public static void main(String[] args) throws Exception{
+/*
+ //String res = send("13981969442","[\"123456\"]",1);//验证码测试
+ JSONObject object = new JSONObject("{\"result\":[{\"originTo\":\"13981969442\",\"createTime\":\"2019-08-01T11:23:52Z\",\"from\":\"881907307922\",\"smsMsgId\":\"f9a397a3-8e36-479a-834c-a20a7a466d8c_606422718\",\"status\":\"000000\"}],\"code\":\"000000\",\"description\":\"Success\"}");
+ String code=object.getString("code");
+ //String res1 = send("13981969442","[\"2017/07/16\",\"成都北\",\"14:30\",\"3\"]",2);//通知类测试 日期格式只能是2017/07/16这种的*/
+ }
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/util/SignUtil.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/util/SignUtil.java
new file mode 100644
index 0000000..a1078a6
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/util/SignUtil.java
@@ -0,0 +1,119 @@
+package com.stylefeng.guns.modular.system.controller.util;
+
+import java.io.UnsupportedEncodingException;
+import java.security.MessageDigest;
+import java.security.NoSuchAlgorithmException;
+import java.util.*;
+
+/**
+ * 曹操接口请求签名工具包
+ * @author 吕雪
+ * @createDate 2020年01月15日
+ * client_id:f168c651bf86f2c1
+ * sign_key:6d2c6566598949478bef1b5d91451e9f
+ */
+public class SignUtil {
+
+ /**
+ * 获取签名
+ * @param params
+ * @return
+ */
+ public static String sign(Map<String, Object> params){
+ params.put("sign_key", "6d2c6566598949478bef1b5d91451e9f");
+ Map<String, String> needVerify = new HashMap<>();
+ for (Map.Entry<String, Object> entry : params.entrySet()) {
+ needVerify.put(entry.getKey(), String.valueOf(entry.getValue()));
+ }
+ List<Map.Entry<String, String>> entryList = new ArrayList<>(needVerify.entrySet());
+ //排序
+ Collections.sort(entryList, (o1, o2) -> o1.getKey().compareTo(o2.getKey()));
+ StringBuilder buffer = new StringBuilder();
+ for (Map.Entry<String, String> entry : entryList) {
+ buffer.append(entry.getKey()).append(entry.getValue());
+ }
+ System.out.println("sha1 签名参数:"+buffer.toString());
+ try {
+ return encodeBySHA(buffer.toString(),"utf-8");
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ return null;
+ }
+
+ /**
+ * 使用SHA算法加密
+ * @param str
+ * @param charset
+ * @return
+ * @throws Exception
+ */
+ public static String encodeBySHA(String str,String charset) throws Exception {
+ MessageDigest messageDigest = null;
+ try {
+ messageDigest = MessageDigest.getInstance("SHA");
+ messageDigest.reset();
+ messageDigest.update(str.getBytes(charset));
+
+ } catch (NoSuchAlgorithmException e) {
+ e.printStackTrace();
+ throw new Exception("不能调用指定的加密算法。");
+ } catch (UnsupportedEncodingException e) {
+ e.printStackTrace();
+ throw new Exception("字符串不支持"+ charset +"的转换。");
+ }
+ return byteArrayToString(messageDigest.digest());
+ }
+
+ /**
+ * 将byte数组转化为16进制字符串
+ * @param byteArray
+ * @return
+ */
+ private static String byteArrayToString(byte[] byteArray){
+ StringBuilder strBuilder = new StringBuilder();
+ for (int i = 0; i < byteArray.length; i++) {
+ if (Integer.toHexString(0xFF & byteArray[i]).length() == 1)
+ strBuilder.append("0").append(Integer.toHexString(0xFF & byteArray[i]));
+ else
+ strBuilder.append(Integer.toHexString(0xFF & byteArray[i]));
+ }
+ return strBuilder.toString();
+ }
+
+ public static void main(String[] args) {
+ //Get
+ /*Long time = new Date().getTime();
+ Map<String, Object> map = new HashMap<>();
+ map.put("client_id","f168c651bf86f2c1");
+ map.put("timestamp",time);
+ map.put("longitude","120.10");
+ map.put("latitude","30.19");
+ String url = "https://sandbox-cop.caocaokeji.cn/v2/common/queryCity";
+ String response = PlatformUtil.doGet(url,"client_id=f168c651bf86f2c1×tamp="+time+"&sign="+SignUtil.sign(map)+"&longitude=120.10&latitude=30.19",null,100000);
+ com.alibaba.fastjson.JSONObject jsonObject = com.alibaba.fastjson.JSONObject.parseObject(response);
+ System.out.println(jsonObject.toJSONString());*/
+ //Post
+ /* Map<String,Object> map = new HashMap<>();
+ map.put("client_id","f168c651bf86f2c1");
+ map.put("timestamp",new Date().getTime());
+ map.put("order_id",1);
+ map.put("score","3");
+ map.put("content","测试数据");
+ map.put("sign",SignUtil.sign(map));
+ String jsonMsg =JSONObject.toJSONString(map);
+ String url = "/v2/common/evaluateOrder";
+ TokenUtil.RequestEntity req = new TokenUtil.RequestEntity();
+ req.setReqMethod(TokenUtil.REQ_METHOD_POST);
+ req.setUri(url);
+ req.setContent(jsonMsg);
+ DateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+ req.setReqTime(dateFormat.format(new Date()));
+ String response = PlatformUtil.doPostJson1("https://sandbox-cop.caocaokeji.cn"+url,req.getContent(),null);
+ System.out.println(JSONObject.parseObject(response));*/
+
+ System.out.println(new Date().getTime());
+
+ }
+
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/util/UploadUtil.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/util/UploadUtil.java
new file mode 100644
index 0000000..467992f
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/util/UploadUtil.java
@@ -0,0 +1,170 @@
+package com.stylefeng.guns.modular.system.controller.util;
+
+import com.stylefeng.guns.config.properties.GunsProperties;
+import com.stylefeng.guns.core.base.controller.BaseController;
+import com.stylefeng.guns.core.common.exception.BizExceptionEnum;
+import com.stylefeng.guns.core.exception.GunsException;
+import com.stylefeng.guns.core.util.ObsUploadUtil;
+import com.stylefeng.guns.modular.system.util.OssUploadUtil;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestPart;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.multipart.MultipartFile;
+import org.springframework.web.multipart.MultipartHttpServletRequest;
+
+import javax.servlet.http.HttpServletRequest;
+import java.io.File;
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.UUID;
+
+/**
+ * 上传文件
+ */
+@RestController
+@RequestMapping("/upload")
+public class UploadUtil extends BaseController {
+ private final static Logger log = LoggerFactory.getLogger(UploadUtil.class);
+
+ @Autowired
+ private GunsProperties gunsProperties;
+
+ /**
+ * 上传图片(上传到项目的webapp/static/img)
+ */
+ /* @RequestMapping("/image")
+ public String image(@RequestPart("file") MultipartFile picture) {
+ String pictureName = UUID.randomUUID().toString() + ".jpg";
+ try {
+ // 文件目录路径
+ String fileSavePath = gunsProperties.getFileUploadPath();
+ picture.transferTo(new File(fileSavePath + pictureName));
+ } catch (Exception e) {
+ log.error(e.getMessage(), e);
+ throw new GunsException(BizExceptionEnum.UPLOAD_ERROR);
+ }
+ return pictureName;
+ }*/
+
+ /**
+ * 多图片上传使用
+ * @param request
+ * @return
+ */
+ @RequestMapping( "/uploadPhoto")
+ @ResponseBody
+ public Map<String, Object> saveimg(HttpServletRequest request) {
+ Map<String, Object> m = new HashMap<>();
+ try {
+
+ String ossUpload = null;
+ MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request;
+ MultipartFile file = (MultipartFile) multipartRequest.getFile("myfile");
+ if (file.getSize() != 0) {
+ ossUpload = OssUploadUtil.ossUpload(request, file);
+// ossUpload = ObsUploadUtil.obsUpload(super.getHttpServletRequest(), file);
+ m.put("imgUrl", ossUpload);
+ }
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ return m;
+ }
+
+ @RequestMapping("/image")
+ @ResponseBody
+ public String image(@RequestPart("file") MultipartFile picture, HttpServletRequest request) {
+ try {
+ MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request;
+ MultipartFile file = (MultipartFile) picture;
+ String name = file.getOriginalFilename();
+ String s = name.substring(name.lastIndexOf(".") + 1).toLowerCase();
+ if(!s.equals("jpg") && !s.equals("png") && !s.equals("jpeg")){
+ return null;
+ }
+ long size = file.getSize();
+ if(size > 524288000L){//500M限制
+ return "请上传500M以内的文件";
+ }
+ String pictureName = OssUploadUtil.ossUpload(request, file);
+// String pictureName = ObsUploadUtil.obsUpload(super.getHttpServletRequest(), picture);
+ return pictureName;
+ } catch (IOException e1) {
+ return null;
+ }
+ }
+
+ /**
+ * 上传文件
+ */
+ @RequestMapping("/file")
+ public String file(@RequestPart("file") MultipartFile picture) {
+ long size = picture.getSize();
+ if(size > 524288000L){//500M限制
+ return "请上传500M以内的文件";
+ }
+ //获取文件名后缀
+ String suffix = picture.getOriginalFilename().substring(picture.getOriginalFilename().lastIndexOf("."));
+ String pictureName = UUID.randomUUID().toString() + suffix;
+ try {
+ // 文件目录路径
+ String fileSavePath = gunsProperties.getFileUploadPath();
+ File file = new File(fileSavePath + pictureName);
+ picture.transferTo(file);
+ } catch (Exception e) {
+ log.error(e.getMessage(), e);
+ throw new GunsException(BizExceptionEnum.UPLOAD_ERROR);
+ }
+ return pictureName;
+ }
+
+ /**
+ * UEditor编辑器上传图片
+ */
+ @RequestMapping("/imageUp")
+ public String imageUp(@RequestPart("upfile") MultipartFile picture, HttpServletRequest request) {
+ long size = picture.getSize();
+ if(size > 524288000L){//500M限制
+ return "请上传500M以内的文件";
+ }
+ String callback = request.getParameter("callback");
+ String pictureName = UUID.randomUUID().toString() + ".jpg";
+ try {
+ // 上传文件目录
+ //String fileSavePath = gunsProperties.getFileUploadPath();
+ //picture.transferTo(new File(fileSavePath + pictureName));
+ // 文件全路径
+ //pictureName = gunsProperties.getPictureServerAddress() + pictureName;
+// pictureName = ObsUploadUtil.obsUpload(super.getHttpServletRequest(), picture);
+
+ String name = picture.getOriginalFilename();
+ String s = name.substring(name.lastIndexOf(".") + 1).toLowerCase();
+ if(!s.equals("jpg") && !s.equals("png") && !s.equals("jpeg")){
+ return null;
+ }
+
+ pictureName = OssUploadUtil.ossUpload(super.getHttpServletRequest(), picture);
+
+ String result = "{'original': '" + picture.getOriginalFilename() + "', 'state': 'SUCCESS', 'url': '" + pictureName + "'}";
+ if (callback == null) {
+ return result;
+ } else {
+ return "<script>" + callback + "(" + result + ")</script>";
+ }
+ } catch (Exception e) {
+ log.error(e.getMessage(), e);
+ String result = "{'original': '', 'state': '文件上传失败','url': ''}";
+ if (callback == null) {
+ return result;
+ } else {
+ return "<script>" + callback + "(" + result + ")</script>";
+ }
+ }
+ }
+
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/util/VenueLatVo.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/util/VenueLatVo.java
new file mode 100644
index 0000000..a7e4d65
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/util/VenueLatVo.java
@@ -0,0 +1,25 @@
+package com.stylefeng.guns.modular.system.controller.util;
+public class VenueLatVo {
+ private String lat;
+ private String lon;
+ private String sort;
+ public String getLat() {
+ return lat;
+ }
+ public void setLat(String lat) {
+ this.lat = lat;
+ }
+ public String getLon() {
+ return lon;
+ }
+ public void setLon(String lon) {
+ this.lon = lon;
+ }
+ public String getSort() {
+ return sort;
+ }
+ public void setSort(String sort) {
+ this.sort = sort;
+ }
+
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/util/WoUtil.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/util/WoUtil.java
new file mode 100644
index 0000000..452b4e5
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/util/WoUtil.java
@@ -0,0 +1,31 @@
+package com.stylefeng.guns.modular.system.controller.util;
+
+import org.apache.poi.hssf.usermodel.HSSFWorkbook;
+import org.apache.poi.ss.usermodel.Workbook;
+import org.apache.poi.xssf.usermodel.XSSFWorkbook;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.io.IOException;
+
+public class WoUtil {
+ public static Workbook ImportFile(MultipartFile importFile) {
+ Workbook book = null;
+ if(importFile == null)
+ {
+ //throw new WoException(SysConstant.ERR_EXCEL_NULL);
+ }
+ String fileName = importFile.getOriginalFilename();
+ try {
+ if(fileName.endsWith(".xlsx")) //当表格的后缀是".xlsx时"
+ {
+ book = new XSSFWorkbook(importFile.getInputStream());
+ }else
+ {
+ book = new HSSFWorkbook(importFile.getInputStream());
+ }
+ } catch (IOException e) {
+ //throw new WoException(e,SysConstant.ERR_EXCEL_NO);
+ }
+ return book;
+ }
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/util/WrapperUtil.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/util/WrapperUtil.java
new file mode 100644
index 0000000..a9955b6
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/util/WrapperUtil.java
@@ -0,0 +1,30 @@
+package com.stylefeng.guns.modular.system.controller.util;
+
+import java.util.List;
+
+import org.springframework.stereotype.Controller;
+
+import com.baomidou.mybatisplus.mapper.Wrapper;
+import com.stylefeng.guns.core.base.controller.BaseController;
+import com.stylefeng.guns.modular.system.model.User;
+
+/**
+ * 条件查询封装工具类
+ */
+@Controller
+public class WrapperUtil extends BaseController {
+ /**
+ * 封装查询用户ID组
+ */
+ public static Wrapper getWrapperAndInUserId(List<User> list, Wrapper wrapper) {
+ Integer[] ids = new Integer[]{0};
+ if (ids != null && list.size() > 0) {
+ ids = new Integer[list.size()];
+ for (int i = 0; i < list.size(); i++) {
+ ids[i] = list.get(i).getId();
+ }
+ }
+ return wrapper.and().in("userId", ids);
+ }
+
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/CarInsuranceMapper.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/CarInsuranceMapper.java
new file mode 100644
index 0000000..df37eea
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/CarInsuranceMapper.java
@@ -0,0 +1,24 @@
+package com.stylefeng.guns.modular.system.dao;
+
+import com.baomidou.mybatisplus.mapper.BaseMapper;
+import com.stylefeng.guns.modular.system.model.CarInsurance;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+import java.util.Map;
+
+public interface CarInsuranceMapper extends BaseMapper<CarInsurance> {
+
+
+ /**
+ * 获取列表数据
+ * @param carId
+ * @param offset
+ * @param limit
+ * @return
+ */
+ List<Map<String, Object>> queryInsuranceList(@Param("carId") Integer carId, @Param("offset") Integer offset,
+ @Param("limit") Integer limit);
+
+ int queryInsuranceListCount(@Param("carId") Integer carId);
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/DeptMapper.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/DeptMapper.java
new file mode 100644
index 0000000..c2e34bb
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/DeptMapper.java
@@ -0,0 +1,32 @@
+package com.stylefeng.guns.modular.system.dao;
+
+
+import com.baomidou.mybatisplus.mapper.BaseMapper;
+import com.stylefeng.guns.core.node.ZTreeNode;
+import com.stylefeng.guns.modular.system.model.Dept;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * 部门表 Mapper 接口
+ * </p>
+ *
+ * @author stylefeng
+ * @since 2017-07-11
+ */
+public interface DeptMapper extends BaseMapper<Dept> {
+
+ /**
+ * 获取ztree的节点列表
+ */
+ List<ZTreeNode> tree();
+
+ /**
+ * 获取所有部门列表
+ */
+ List<Map<String, Object>> list(@Param("condition") String condition);
+
+}
\ No newline at end of file
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/DictMapper.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/DictMapper.java
new file mode 100644
index 0000000..55677f1
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/DictMapper.java
@@ -0,0 +1,34 @@
+package com.stylefeng.guns.modular.system.dao;
+
+import com.baomidou.mybatisplus.mapper.BaseMapper;
+import com.stylefeng.guns.modular.system.model.Dict;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * 字典表 Mapper 接口
+ * </p>
+ *
+ * @author stylefeng
+ * @since 2017-07-11
+ */
+public interface DictMapper extends BaseMapper<Dict> {
+
+ /**
+ * 根据编码获取词典列表
+ */
+ List<Dict> selectByCode(@Param("code") String code);
+
+ /**
+ * 查询字典列表
+ */
+ List<Map<String, Object>> list(@Param("condition") String conditiion);
+
+ /**
+ * 根据父类编码获取词典列表
+ */
+ List<Dict> selectByParentCode(@Param("code") String code);
+}
\ No newline at end of file
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/DriverActivityHistoryMapper.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/DriverActivityHistoryMapper.java
new file mode 100644
index 0000000..1048e8c
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/DriverActivityHistoryMapper.java
@@ -0,0 +1,28 @@
+package com.stylefeng.guns.modular.system.dao;
+
+import com.baomidou.mybatisplus.plugins.Page;
+import com.stylefeng.guns.modular.system.model.DriverActivityHistory;
+import com.baomidou.mybatisplus.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * 司机完成活动记录 Mapper 接口
+ * </p>
+ *
+ * @author stylefeng
+ * @since 2020-06-17
+ */
+public interface DriverActivityHistoryMapper extends BaseMapper<DriverActivityHistory> {
+ /**
+ * 获取领取记录列表
+ * @param page
+ * @param activityId
+ * @param type
+ * @return
+ */
+ List<Map<String,Object>> getList(@Param("page") Page<Map<String, Object>> page,@Param("activityId")Integer activityId,@Param("type")Integer type);
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/DriverActivityMapper.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/DriverActivityMapper.java
new file mode 100644
index 0000000..18ef074
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/DriverActivityMapper.java
@@ -0,0 +1,27 @@
+package com.stylefeng.guns.modular.system.dao;
+
+import com.baomidou.mybatisplus.plugins.Page;
+import com.stylefeng.guns.modular.system.model.DriverActivity;
+import com.baomidou.mybatisplus.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * 司机活动主表 Mapper 接口
+ * </p>
+ *
+ * @author stylefeng
+ * @since 2020-06-17
+ */
+public interface DriverActivityMapper extends BaseMapper<DriverActivity> {
+ List<Map<String,Object>> getList(@Param("page") Page<Map<String, Object>> page,
+ @Param("beginTime") String beginTime,
+ @Param("endTime") String endTime,
+ @Param("name") String name,
+ @Param("companyType") Integer companyType,
+ @Param("companyId") Integer companyId);
+
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/DriverActivityOnlineMapper.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/DriverActivityOnlineMapper.java
new file mode 100644
index 0000000..12c03f1
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/DriverActivityOnlineMapper.java
@@ -0,0 +1,16 @@
+package com.stylefeng.guns.modular.system.dao;
+
+import com.stylefeng.guns.modular.system.model.DriverActivityOnline;
+import com.baomidou.mybatisplus.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 司机活动-在线 Mapper 接口
+ * </p>
+ *
+ * @author stylefeng
+ * @since 2020-06-17
+ */
+public interface DriverActivityOnlineMapper extends BaseMapper<DriverActivityOnline> {
+
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/DriverActivityOrderMapper.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/DriverActivityOrderMapper.java
new file mode 100644
index 0000000..4b0b270
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/DriverActivityOrderMapper.java
@@ -0,0 +1,16 @@
+package com.stylefeng.guns.modular.system.dao;
+
+import com.stylefeng.guns.modular.system.model.DriverActivityOrder;
+import com.baomidou.mybatisplus.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 司机活动-订单 Mapper 接口
+ * </p>
+ *
+ * @author stylefeng
+ * @since 2020-06-17
+ */
+public interface DriverActivityOrderMapper extends BaseMapper<DriverActivityOrder> {
+
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/DriverActivityRegisteredMapper.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/DriverActivityRegisteredMapper.java
new file mode 100644
index 0000000..bb2c8e2
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/DriverActivityRegisteredMapper.java
@@ -0,0 +1,16 @@
+package com.stylefeng.guns.modular.system.dao;
+
+import com.stylefeng.guns.modular.system.model.DriverActivityRegistered;
+import com.baomidou.mybatisplus.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 司机活动-注册 Mapper 接口
+ * </p>
+ *
+ * @author stylefeng
+ * @since 2020-06-17
+ */
+public interface DriverActivityRegisteredMapper extends BaseMapper<DriverActivityRegistered> {
+
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/DriverOnlineMapper.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/DriverOnlineMapper.java
new file mode 100644
index 0000000..e099d20
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/DriverOnlineMapper.java
@@ -0,0 +1,27 @@
+package com.stylefeng.guns.modular.system.dao;
+
+import com.baomidou.mybatisplus.mapper.BaseMapper;
+import com.stylefeng.guns.modular.system.model.DriverOnline;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+import java.util.Map;
+
+public interface DriverOnlineMapper extends BaseMapper<DriverOnline> {
+
+
+ /**
+ * 获取列表数据
+ * @param name
+ * @param phone
+ * @param offset
+ * @param limit
+ * @return
+ */
+ List<Map<String, Object>> queryOnlineDriver(@Param("name") String name, @Param("phone") String phone,
+ @Param("offset") Integer offset, @Param("limit") Integer limit);
+
+
+ int queryOnlineDriverCount(@Param("name") String name, @Param("phone") String phone);
+
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/DriverPunishMapper.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/DriverPunishMapper.java
new file mode 100644
index 0000000..722ba62
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/DriverPunishMapper.java
@@ -0,0 +1,13 @@
+package com.stylefeng.guns.modular.system.dao;
+
+import com.baomidou.mybatisplus.mapper.BaseMapper;
+import com.stylefeng.guns.modular.system.model.DriverPunish;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+public interface DriverPunishMapper extends BaseMapper<DriverPunish> {
+
+
+ List<DriverPunish> queryAllPunish(@Param("driverId") Integer driverId);
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/DriverTrainMapper.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/DriverTrainMapper.java
new file mode 100644
index 0000000..3a31cda
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/DriverTrainMapper.java
@@ -0,0 +1,15 @@
+package com.stylefeng.guns.modular.system.dao;
+
+import com.baomidou.mybatisplus.mapper.BaseMapper;
+import com.stylefeng.guns.modular.system.model.DriverTrain;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+public interface DriverTrainMapper extends BaseMapper<DriverTrain> {
+
+ void deleteByDriverId(@Param("driverId") Integer driverId);
+
+
+ List<DriverTrain> queryAllTrain(@Param("driverId") Integer driverId);
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/GDInterfaceMapper.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/GDInterfaceMapper.java
new file mode 100644
index 0000000..67bfb34
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/GDInterfaceMapper.java
@@ -0,0 +1,12 @@
+package com.stylefeng.guns.modular.system.dao;
+
+import com.baomidou.mybatisplus.mapper.BaseMapper;
+import com.stylefeng.guns.modular.system.model.GDInterface;
+import org.apache.ibatis.annotations.Param;
+
+public interface GDInterfaceMapper extends BaseMapper<GDInterface> {
+
+
+ GDInterface query(@Param("name") String name, @Param("explanation") String explanation,
+ @Param("time") String time);
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/IncomeMapper.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/IncomeMapper.java
new file mode 100644
index 0000000..e8b8cfa
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/IncomeMapper.java
@@ -0,0 +1,7 @@
+package com.stylefeng.guns.modular.system.dao;
+
+import com.baomidou.mybatisplus.mapper.BaseMapper;
+import com.stylefeng.guns.modular.system.model.Income;
+
+public interface IncomeMapper extends BaseMapper<Income> {
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/LineShiftDriverMapper.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/LineShiftDriverMapper.java
new file mode 100644
index 0000000..ccd953c
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/LineShiftDriverMapper.java
@@ -0,0 +1,31 @@
+package com.stylefeng.guns.modular.system.dao;
+
+import com.baomidou.mybatisplus.mapper.BaseMapper;
+import com.stylefeng.guns.modular.system.model.LineShiftDriver;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
+public interface LineShiftDriverMapper extends BaseMapper<LineShiftDriver> {
+
+ /**
+ * 获取预约数据
+ * @param lineShiftId
+ * @param driverId
+ * @param time
+ * @return
+ */
+ List<LineShiftDriver> query(@Param("lineShiftId") Integer lineShiftId, @Param("driverId") Integer driverId,
+ @Param("time") Date time) ;
+
+
+ /**
+ * 获取没有预约给定日期班次的司机
+ * @param lineShiftId
+ * @param time
+ * @return
+ */
+ List<Map<String, Object>> queryNotInLineShiftDriver(@Param("lineShiftId") Integer lineShiftId, @Param("time") Date time);
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/LoginLogMapper.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/LoginLogMapper.java
new file mode 100644
index 0000000..2e55025
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/LoginLogMapper.java
@@ -0,0 +1,27 @@
+package com.stylefeng.guns.modular.system.dao;
+
+import com.baomidou.mybatisplus.mapper.BaseMapper;
+import com.baomidou.mybatisplus.plugins.Page;
+import com.stylefeng.guns.modular.system.model.LoginLog;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * 登录记录 Mapper 接口
+ * </p>
+ *
+ * @author stylefeng
+ * @since 2017-07-11
+ */
+public interface LoginLogMapper extends BaseMapper<LoginLog> {
+
+ /**
+ * 获取登录日志
+ */
+ List<Map<String, Object>> getLoginLogs(@Param("page") Page<LoginLog> page, @Param("beginTime") String beginTime,
+ @Param("endTime") String endTime, @Param("logName") String logName, @Param("orderByField") String orderByField, @Param("isAsc") boolean isAsc);
+
+}
\ No newline at end of file
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/MenuMapper.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/MenuMapper.java
new file mode 100644
index 0000000..ea0232d
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/MenuMapper.java
@@ -0,0 +1,80 @@
+package com.stylefeng.guns.modular.system.dao;
+
+import com.baomidou.mybatisplus.mapper.BaseMapper;
+import com.stylefeng.guns.core.node.MenuNode;
+import com.stylefeng.guns.core.node.ZTreeNode;
+import com.stylefeng.guns.modular.system.model.Menu;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * 菜单表 Mapper 接口
+ * </p>
+ *
+ * @author stylefeng
+ * @since 2017-07-11
+ */
+public interface MenuMapper extends BaseMapper<Menu> {
+
+ /**
+ * 根据条件查询菜单
+ *
+ * @return
+ * @date 2017年2月12日 下午9:14:34
+ */
+ List<Map<String, Object>> selectMenus(@Param("condition") String condition, @Param("level") String level);
+
+ /**
+ * 根据条件查询菜单
+ *
+ * @return
+ * @date 2017年2月12日 下午9:14:34
+ */
+ List<Long> getMenuIdsByRoleId(@Param("roleId") Integer roleId);
+
+ /**
+ * 获取菜单列表树
+ *
+ * @return
+ * @date 2017年2月19日 下午1:33:51
+ */
+ List<ZTreeNode> menuTreeList();
+
+ /**
+ * 获取菜单列表树
+ *
+ * @return
+ * @date 2017年2月19日 下午1:33:51
+ */
+ List<ZTreeNode> menuTreeListByMenuIds(List<Long> menuIds);
+
+ /**
+ * 删除menu关联的relation
+ *
+ * @param menuId
+ * @return
+ * @date 2017年2月19日 下午4:10:59
+ */
+ int deleteRelationByMenu(Long menuId);
+
+ /**
+ * 获取资源url通过角色id
+ *
+ * @param roleId
+ * @return
+ * @date 2017年2月19日 下午7:12:38
+ */
+ List<String> getResUrlsByRoleId(Integer roleId);
+
+ /**
+ * 根据角色获取菜单
+ *
+ * @param roleIds
+ * @return
+ * @date 2017年2月19日 下午10:35:40
+ */
+ List<MenuNode> getMenusByRoleIds(List<Integer> roleIds);
+}
\ No newline at end of file
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/NoticeMapper.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/NoticeMapper.java
new file mode 100644
index 0000000..5638129
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/NoticeMapper.java
@@ -0,0 +1,25 @@
+package com.stylefeng.guns.modular.system.dao;
+
+import com.baomidou.mybatisplus.mapper.BaseMapper;
+import com.stylefeng.guns.modular.system.model.Notice;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * 通知表 Mapper 接口
+ * </p>
+ *
+ * @author stylefeng
+ * @since 2017-07-11
+ */
+public interface NoticeMapper extends BaseMapper<Notice> {
+
+ /**
+ * 获取通知列表
+ */
+ List<Map<String, Object>> list(@Param("condition") String condition);
+
+}
\ No newline at end of file
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/OperationLogMapper.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/OperationLogMapper.java
new file mode 100644
index 0000000..eaf5760
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/OperationLogMapper.java
@@ -0,0 +1,26 @@
+package com.stylefeng.guns.modular.system.dao;
+
+import com.baomidou.mybatisplus.mapper.BaseMapper;
+import com.baomidou.mybatisplus.plugins.Page;
+import com.stylefeng.guns.modular.system.model.OperationLog;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * 操作日志 Mapper 接口
+ * </p>
+ *
+ * @author stylefeng
+ * @since 2017-07-11
+ */
+public interface OperationLogMapper extends BaseMapper<OperationLog> {
+
+ /**
+ * 获取操作日志
+ */
+ List<Map<String, Object>> getOperationLogs(@Param("page") Page<OperationLog> page, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("logName") String logName, @Param("logType") String logType, @Param("orderByField") String orderByField, @Param("isAsc") boolean isAsc);
+
+}
\ No newline at end of file
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/OrderCancelMapper.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/OrderCancelMapper.java
new file mode 100644
index 0000000..eead6f5
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/OrderCancelMapper.java
@@ -0,0 +1,22 @@
+package com.stylefeng.guns.modular.system.dao;
+
+import com.baomidou.mybatisplus.mapper.BaseMapper;
+import com.stylefeng.guns.modular.system.model.OrderCancel;
+import org.apache.ibatis.annotations.Param;
+
+public interface OrderCancelMapper extends BaseMapper<OrderCancel> {
+
+
+ /**
+ * 获取数据
+ * @param orderId
+ * @param orderType
+ * @param money
+ * @param payType
+ * @param state
+ * @return
+ */
+ OrderCancel query(@Param("orderId") Integer orderId, @Param("orderType") Integer orderType,
+ @Param("money") Double money, @Param("payType") Integer payType,
+ @Param("state") Integer state);
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/PaymentRecordMapper.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/PaymentRecordMapper.java
new file mode 100644
index 0000000..4271c79
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/PaymentRecordMapper.java
@@ -0,0 +1,23 @@
+package com.stylefeng.guns.modular.system.dao;
+
+import com.baomidou.mybatisplus.mapper.BaseMapper;
+import com.stylefeng.guns.modular.system.model.PaymentRecord;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+public interface PaymentRecordMapper extends BaseMapper<PaymentRecord> {
+
+
+ /**
+ * 获取数据
+ * @param orderId
+ * @param payType
+ * @param state
+ * @return
+ */
+ List<PaymentRecord> query(@Param("category") Integer category, @Param("userId") Integer userId,
+ @Param("type") Integer type, @Param("orderId") Integer orderId,
+ @Param("orderType") Integer orderType, @Param("payType") Integer payType,
+ @Param("state") Integer state);
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/RegionMapper.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/RegionMapper.java
new file mode 100644
index 0000000..4150d63
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/RegionMapper.java
@@ -0,0 +1,16 @@
+package com.stylefeng.guns.modular.system.dao;
+
+import com.stylefeng.guns.modular.system.model.Region;
+import com.baomidou.mybatisplus.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 省市区三级联动 Mapper 接口
+ * </p>
+ *
+ * @author 吕雪
+ * @since 2019-12-30
+ */
+public interface RegionMapper extends BaseMapper<Region> {
+
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/RelationMapper.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/RelationMapper.java
new file mode 100644
index 0000000..828a596
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/RelationMapper.java
@@ -0,0 +1,16 @@
+package com.stylefeng.guns.modular.system.dao;
+
+import com.baomidou.mybatisplus.mapper.BaseMapper;
+import com.stylefeng.guns.modular.system.model.Relation;
+
+/**
+ * <p>
+ * 角色和菜单关联表 Mapper 接口
+ * </p>
+ *
+ * @author stylefeng
+ * @since 2017-07-11
+ */
+public interface RelationMapper extends BaseMapper<Relation> {
+
+}
\ No newline at end of file
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/RoleMapper.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/RoleMapper.java
new file mode 100644
index 0000000..d95d87f
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/RoleMapper.java
@@ -0,0 +1,53 @@
+package com.stylefeng.guns.modular.system.dao;
+
+import com.baomidou.mybatisplus.mapper.BaseMapper;
+import com.stylefeng.guns.core.node.ZTreeNode;
+import com.stylefeng.guns.modular.system.model.Role;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * 角色表 Mapper 接口
+ * </p>
+ *
+ * @author stylefeng
+ * @since 2017-07-11
+ */
+public interface RoleMapper extends BaseMapper<Role> {
+
+ /**
+ * 根据条件查询角色列表
+ *
+ * @return
+ * @date 2017年2月12日 下午9:14:34
+ */
+ List<Map<String, Object>> selectRoles(@Param("condition") String condition);
+
+ /**
+ * 删除某个角色的所有权限
+ *
+ * @param roleId 角色id
+ * @return
+ * @date 2017年2月13日 下午7:57:51
+ */
+ int deleteRolesById(@Param("roleId") Integer roleId);
+
+ /**
+ * 获取角色列表树
+ *
+ * @return
+ * @date 2017年2月18日 上午10:32:04
+ */
+ List<ZTreeNode> roleTreeList();
+
+ /**
+ * 获取角色列表树
+ *
+ * @return
+ * @date 2017年2月18日 上午10:32:04
+ */
+ List<ZTreeNode> roleTreeListByRoleId(String[] roleId);
+}
\ No newline at end of file
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/SysCouponActivityMapper.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/SysCouponActivityMapper.java
new file mode 100644
index 0000000..6f9f61e
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/SysCouponActivityMapper.java
@@ -0,0 +1,16 @@
+package com.stylefeng.guns.modular.system.dao;
+
+import com.stylefeng.guns.modular.system.model.SysCouponActivity;
+import com.baomidou.mybatisplus.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 系统设置-优惠券活动 Mapper 接口
+ * </p>
+ *
+ * @author stylefeng
+ * @since 2020-06-17
+ */
+public interface SysCouponActivityMapper extends BaseMapper<SysCouponActivity> {
+
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/SysCouponRecordMapper.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/SysCouponRecordMapper.java
new file mode 100644
index 0000000..9f88de1
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/SysCouponRecordMapper.java
@@ -0,0 +1,16 @@
+package com.stylefeng.guns.modular.system.dao;
+
+import com.stylefeng.guns.modular.system.model.SysCouponRecord;
+import com.baomidou.mybatisplus.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 系统设置-优惠券记录 Mapper 接口
+ * </p>
+ *
+ * @author stylefeng
+ * @since 2020-06-15
+ */
+public interface SysCouponRecordMapper extends BaseMapper<SysCouponRecord> {
+
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/SysRedPacketRecordMapper.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/SysRedPacketRecordMapper.java
new file mode 100644
index 0000000..6178336
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/SysRedPacketRecordMapper.java
@@ -0,0 +1,16 @@
+package com.stylefeng.guns.modular.system.dao;
+
+import com.stylefeng.guns.modular.system.model.SysRedPacketRecord;
+import com.baomidou.mybatisplus.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 系统设置-红包记录 Mapper 接口
+ * </p>
+ *
+ * @author stylefeng
+ * @since 2020-06-13
+ */
+public interface SysRedPacketRecordMapper extends BaseMapper<SysRedPacketRecord> {
+
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TAdvertisementMapper.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TAdvertisementMapper.java
new file mode 100644
index 0000000..cafb7b3
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TAdvertisementMapper.java
@@ -0,0 +1,35 @@
+package com.stylefeng.guns.modular.system.dao;
+
+import com.baomidou.mybatisplus.plugins.Page;
+import com.stylefeng.guns.modular.system.model.TAdvertisement;
+import com.baomidou.mybatisplus.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * 广告 Mapper 接口
+ * </p>
+ *
+ * @author 吕雪
+ * @since 2020-06-02
+ */
+public interface TAdvertisementMapper extends BaseMapper<TAdvertisement> {
+
+ /**
+ * 根据条件查询广告列表
+ * @param page 分页
+ * @param beginTime 开始时间
+ * @param endTime 结束时间
+ * @param type 类型
+ * @param name 名称
+ * @return
+ */
+ List<Map<String,Object>> getAdvertisementList(@Param("page") Page<Map<String, Object>> page,
+ @Param("beginTime") String beginTime,
+ @Param("endTime") String endTime,
+ @Param("type") Integer type,
+ @Param("name") String name);
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TAgreementMapper.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TAgreementMapper.java
new file mode 100644
index 0000000..4c0260d
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TAgreementMapper.java
@@ -0,0 +1,16 @@
+package com.stylefeng.guns.modular.system.dao;
+
+import com.stylefeng.guns.modular.system.model.TAgreement;
+import com.baomidou.mybatisplus.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 平台协议 Mapper 接口
+ * </p>
+ *
+ * @author 吕雪
+ * @since 2020-06-01
+ */
+public interface TAgreementMapper extends BaseMapper<TAgreement> {
+
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TCarBrandMapper.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TCarBrandMapper.java
new file mode 100644
index 0000000..32f56ea
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TCarBrandMapper.java
@@ -0,0 +1,29 @@
+package com.stylefeng.guns.modular.system.dao;
+
+import com.baomidou.mybatisplus.plugins.Page;
+import com.stylefeng.guns.modular.system.model.TCarBrand;
+import com.baomidou.mybatisplus.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * 车辆品牌 Mapper 接口
+ * </p>
+ *
+ * @author 吕雪
+ * @since 2020-06-05
+ */
+public interface TCarBrandMapper extends BaseMapper<TCarBrand> {
+
+ /**
+ * 根据条件查询车辆品牌列表
+ * @return
+ */
+ List<Map<String,Object>> getCarBrandList(@Param("page") Page<Map<String, Object>> page,
+ @Param("beginTime") String beginTime,
+ @Param("endTime") String endTime,
+ @Param("name") String name);
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TCarMapper.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TCarMapper.java
new file mode 100644
index 0000000..c584ed2
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TCarMapper.java
@@ -0,0 +1,47 @@
+package com.stylefeng.guns.modular.system.dao;
+
+import com.baomidou.mybatisplus.plugins.Page;
+import com.stylefeng.guns.modular.system.model.TCar;
+import com.baomidou.mybatisplus.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * 车辆 Mapper 接口
+ * </p>
+ *
+ * @author 吕雪
+ * @since 2020-06-05
+ */
+public interface TCarMapper extends BaseMapper<TCar> {
+
+ /**
+ * 根据条件查询车辆列表
+ * @param page
+ * @return
+ */
+ List<Map<String,Object>> getCarList(@Param("page") Page<Map<String, Object>> page,
+ @Param("roleType") Integer roleType,
+ @Param("nowUserId") Integer nowUserId,
+ @Param("beginTime") String beginTime,
+ @Param("endTime") String endTime,
+ @Param("id") String id,
+ @Param("brandName") String brandName,
+ @Param("modelName") String modelName,
+ @Param("carColor") String carColor,
+ @Param("serverStr") String serverStr,
+ @Param("carLicensePlate") String carLicensePlate,
+ @Param("driverName") String driverName,
+ @Param("companyName") String companyName,
+ @Param("franchiseeName") String franchiseeName);
+
+ /**
+ * 根据条件查询车辆列表不分页
+ * @return
+ */
+ List<Map<String,Object>> getCarListNoPage(@Param("roleType") Integer roleType,
+ @Param("nowUserId") Integer nowUserId);
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TCarModelMapper.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TCarModelMapper.java
new file mode 100644
index 0000000..a226df6
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TCarModelMapper.java
@@ -0,0 +1,29 @@
+package com.stylefeng.guns.modular.system.dao;
+
+import com.baomidou.mybatisplus.plugins.Page;
+import com.stylefeng.guns.modular.system.model.TCarModel;
+import com.baomidou.mybatisplus.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * 车辆车型 Mapper 接口
+ * </p>
+ *
+ * @author 吕雪
+ * @since 2020-06-05
+ */
+public interface TCarModelMapper extends BaseMapper<TCarModel> {
+
+ /**
+ * 根据条件查询车辆车型列表
+ * @return
+ */
+ List<Map<String,Object>> getCarModelList(@Param("page") Page<Map<String, Object>> page,
+ @Param("beginTime") String beginTime,
+ @Param("endTime") String endTime,
+ @Param("name") String name);
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TCarServiceMapper.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TCarServiceMapper.java
new file mode 100644
index 0000000..79cc9e8
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TCarServiceMapper.java
@@ -0,0 +1,16 @@
+package com.stylefeng.guns.modular.system.dao;
+
+import com.stylefeng.guns.modular.system.model.TCarService;
+import com.baomidou.mybatisplus.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 车辆经营业务 Mapper 接口
+ * </p>
+ *
+ * @author 吕雪
+ * @since 2020-06-05
+ */
+public interface TCarServiceMapper extends BaseMapper<TCarService> {
+
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TCompanyCityMapper.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TCompanyCityMapper.java
new file mode 100644
index 0000000..ef7d90b
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TCompanyCityMapper.java
@@ -0,0 +1,16 @@
+package com.stylefeng.guns.modular.system.dao;
+
+import com.stylefeng.guns.modular.system.model.TCompanyCity;
+import com.baomidou.mybatisplus.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 公司经营地区 Mapper 接口
+ * </p>
+ *
+ * @author 吕雪
+ * @since 2020-06-06
+ */
+public interface TCompanyCityMapper extends BaseMapper<TCompanyCity> {
+
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TCompanyMapper.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TCompanyMapper.java
new file mode 100644
index 0000000..335d3bf
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TCompanyMapper.java
@@ -0,0 +1,77 @@
+package com.stylefeng.guns.modular.system.dao;
+
+import com.baomidou.mybatisplus.plugins.Page;
+import com.stylefeng.guns.modular.system.model.TCompany;
+import com.baomidou.mybatisplus.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * 公司信息表 Mapper 接口
+ * </p>
+ *
+ * @author 吕雪
+ * @since 2020-06-06
+ */
+public interface TCompanyMapper extends BaseMapper<TCompany> {
+
+ /**
+ * 根据条件查询分公司列表
+ * @return
+ */
+ List<Map<String,Object>> getCompanyList(@Param("page") Page<Map<String, Object>> page,
+ @Param("beginTime") String beginTime,
+ @Param("endTime") String endTime,
+ @Param("name") String name,
+ @Param("principalName") String principalName,
+ @Param("principalPhone") String principalPhone,
+ @Param("adminName") String adminName,
+ @Param("adminPhone") String adminPhone,
+ @Param("serviceStr") String serviceStr,
+ @Param("state") Integer state);
+
+ /**
+ * 根据公司ID获取公司经营区域
+ * @param id
+ * @return
+ */
+ List<Map<String,Object>> getCompanyScopeById(@Param("id") Integer id);
+
+ /**
+ * 根据条件查询加盟商列表
+ * @return
+ */
+ List<Map<String,Object>> getFranchiseeList(@Param("page") Page<Map<String, Object>> page,
+ @Param("beginTime") String beginTime,
+ @Param("endTime") String endTime,
+ @Param("name") String name,
+ @Param("account") String account,
+ @Param("principalName") String principalName,
+ @Param("principalPhone") String principalPhone,
+ @Param("serviceStr") String serviceStr,
+ @Param("state") Integer state,
+ @Param("roleType") Integer roleType,
+ @Param("nowUserId") Integer nowUserId);
+
+
+ /**
+ * 获取运营汇总数据
+ * @param type
+ * @param start
+ * @param end
+ * @param companyId
+ * @param offset
+ * @param limit
+ * @return
+ */
+ List<Map<String, Object>> queryOperationalData(@Param("type") Integer type, @Param("start") String start,
+ @Param("end") String end, @Param("companyId") Integer companyId,
+ @Param("offset") Integer offset, @Param("limit") Integer limit);
+
+
+ int queryOperationalDataCount(@Param("type") Integer type, @Param("start") String start,
+ @Param("end") String end, @Param("companyId") Integer companyId);
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TComplaintMapper.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TComplaintMapper.java
new file mode 100644
index 0000000..bca3029
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TComplaintMapper.java
@@ -0,0 +1,34 @@
+package com.stylefeng.guns.modular.system.dao;
+
+import com.baomidou.mybatisplus.plugins.Page;
+import com.stylefeng.guns.modular.system.model.TComplaint;
+import com.baomidou.mybatisplus.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * 投诉管理 Mapper 接口
+ * </p>
+ *
+ * @author 吕雪
+ * @since 2020-06-09
+ */
+public interface TComplaintMapper extends BaseMapper<TComplaint> {
+
+ /**
+ * 根据条件查询投诉列表
+ * @return
+ */
+ List<Map<String,Object>> getComplaintList(@Param("page") Page<Map<String, Object>> page,
+ @Param("roleType") Integer roleType,
+ @Param("nowUserId") Integer nowUserId,
+ @Param("beginTime") String beginTime,
+ @Param("endTime") String endTime,
+ @Param("userName") String userName,
+ @Param("userPhone") String userPhone,
+ @Param("driverPhone") String driverPhone,
+ @Param("isHandle") Integer isHandle);
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TDispatchMapper.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TDispatchMapper.java
new file mode 100644
index 0000000..9b89fdd
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TDispatchMapper.java
@@ -0,0 +1,35 @@
+package com.stylefeng.guns.modular.system.dao;
+
+import com.baomidou.mybatisplus.plugins.Page;
+import com.stylefeng.guns.modular.system.model.TDispatch;
+import com.baomidou.mybatisplus.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * 调度管理 Mapper 接口
+ * </p>
+ *
+ * @author 吕雪
+ * @since 2020-09-01
+ */
+public interface TDispatchMapper extends BaseMapper<TDispatch> {
+
+ /**
+ * 根据条件查询调度列表
+ * @return
+ */
+ List<Map<String,Object>> getDispatchList(@Param("page") Page<Map<String, Object>> page,
+ @Param("roleType") Integer roleType,
+ @Param("nowUserId") Integer nowUserId,
+ @Param("beginTime") String beginTime,
+ @Param("endTime") String endTime,
+ @Param("name") String name,
+ @Param("companyName") String companyName,
+ @Param("franchiseeName") String franchiseeName,
+ @Param("account") String account,
+ @Param("state") Integer state);
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TDriverLineMapper.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TDriverLineMapper.java
new file mode 100644
index 0000000..0811c05
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TDriverLineMapper.java
@@ -0,0 +1,26 @@
+package com.stylefeng.guns.modular.system.dao;
+
+import com.stylefeng.guns.modular.system.model.TDriverLine;
+import com.baomidou.mybatisplus.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * 司机关联线路 Mapper 接口
+ * </p>
+ *
+ * @author 吕雪
+ * @since 2020-06-05
+ */
+public interface TDriverLineMapper extends BaseMapper<TDriverLine> {
+
+ /**
+ * 根据司机ID查询司机关联线路列表
+ * @param driverId
+ * @return
+ */
+ List<Map<String,Object>> getDriverLineListByDriverId(@Param("driverId") Integer driverId);
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TDriverMapper.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TDriverMapper.java
new file mode 100644
index 0000000..792fb27
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TDriverMapper.java
@@ -0,0 +1,94 @@
+package com.stylefeng.guns.modular.system.dao;
+
+import com.baomidou.mybatisplus.plugins.Page;
+import com.stylefeng.guns.modular.system.model.TDriver;
+import com.baomidou.mybatisplus.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * 司机表 Mapper 接口
+ * </p>
+ *
+ * @author 吕雪
+ * @since 2020-06-04
+ */
+public interface TDriverMapper extends BaseMapper<TDriver> {
+
+ /**
+ * 根据条件查询待审核司机列表
+ * @return
+ */
+ List<Map<String,Object>> getAuthDriverList(@Param("page") Page<Map<String, Object>> page,
+ @Param("beginTime") String beginTime,
+ @Param("endTime") String endTime,
+ @Param("companyName") String companyName,
+ @Param("phone") String phone,
+ @Param("account") String account,
+ @Param("addType") Integer addType,
+ @Param("authState") Integer authState);
+
+ /**
+ * 根据用户ID获取用户详情
+ * @param driverId
+ * @return
+ */
+ Map<String,Object> getDriverById(@Param("driverId") Integer driverId);
+
+ /**
+ * 根据审核通过的司机列表
+ * @return
+ */
+ List<Map<String,Object>> getDriverList(@Param("page") Page<Map<String, Object>> page,
+ @Param("roleType") Integer roleType,
+ @Param("nowUserId") Integer nowUserId,
+ @Param("beginTime") String beginTime,
+ @Param("endTime") String endTime,
+ @Param("companyName") String companyName,
+ @Param("phone") String phone,
+ @Param("name") String name,
+ @Param("addType") Integer addType,
+ @Param("authState") Integer authState);
+
+ /**
+ * 查询已被使用的车辆ID
+ * @return
+ */
+ String getUseCarIdStr(@Param("carId") Integer carId);
+
+ /**
+ * 查询当前可被选择的车辆列表
+ * @return
+ */
+ List<Map<String,Object>> getCanSelectCarList(@Param("page") Page<Map<String, Object>> page,
+ @Param("roleType") Integer roleType,
+ @Param("nowUserId") Integer nowUserId,
+ @Param("carIdStr") String carIdStr,
+ @Param("carLicensePlate") String carLicensePlate,
+ @Param("brandName") String brandName,
+ @Param("modelName") String modelName,
+ @Param("color") String color,
+ @Param("serverStr") String serverStr);
+
+ /**
+ * 修改分公司司机的状态
+ */
+ void updateCompanyDriverState( @Param("authState") Integer authState, @Param("companyId") Integer companyId);
+
+ /**
+ * 修改加盟商司机的状态
+ */
+ void updateFranchiseeDriverState( @Param("authState") Integer authState, @Param("franchiseeId") Integer franchiseeId);
+
+ /**
+ * 根据审核通过的司机列表无分页
+ * @return
+ * @return
+ */
+ List<Map<String,Object>> getDriverListNoPage(@Param("roleType") Integer roleType,
+ @Param("nowUserId") Integer nowUserId);
+
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TDriverServiceMapper.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TDriverServiceMapper.java
new file mode 100644
index 0000000..59b21b5
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TDriverServiceMapper.java
@@ -0,0 +1,16 @@
+package com.stylefeng.guns.modular.system.dao;
+
+import com.stylefeng.guns.modular.system.model.TDriverService;
+import com.baomidou.mybatisplus.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 司机经营业务 Mapper 接口
+ * </p>
+ *
+ * @author 吕雪
+ * @since 2020-06-05
+ */
+public interface TDriverServiceMapper extends BaseMapper<TDriverService> {
+
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TFeedbackMapper.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TFeedbackMapper.java
new file mode 100644
index 0000000..6b62168
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TFeedbackMapper.java
@@ -0,0 +1,32 @@
+package com.stylefeng.guns.modular.system.dao;
+
+import com.baomidou.mybatisplus.plugins.Page;
+import com.stylefeng.guns.modular.system.model.TFeedback;
+import com.baomidou.mybatisplus.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * 反馈管理 Mapper 接口
+ * </p>
+ *
+ * @author 吕雪
+ * @since 2020-06-10
+ */
+public interface TFeedbackMapper extends BaseMapper<TFeedback> {
+
+ /**
+ * 根据条件查询用反馈记录列表
+ * @return
+ */
+ List<Map<String,Object>> getFeedbackList(@Param("page") Page<Map<String, Object>> page,
+ @Param("beginTime") String beginTime,
+ @Param("endTime") String endTime,
+ @Param("type") Integer type,
+ @Param("name") String name,
+ @Param("phone") String phone,
+ @Param("state") Integer state);
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TIntegralGoodsMapper.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TIntegralGoodsMapper.java
new file mode 100644
index 0000000..4c2bdff
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TIntegralGoodsMapper.java
@@ -0,0 +1,30 @@
+package com.stylefeng.guns.modular.system.dao;
+
+import com.baomidou.mybatisplus.plugins.Page;
+import com.stylefeng.guns.modular.system.model.TIntegralGoods;
+import com.baomidou.mybatisplus.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * 积分商品管理 Mapper 接口
+ * </p>
+ *
+ * @author 吕雪
+ * @since 2020-09-02
+ */
+public interface TIntegralGoodsMapper extends BaseMapper<TIntegralGoods> {
+
+ /**
+ * 根据条件查询积分商品列表
+ * @return
+ */
+ List<Map<String,Object>> getIntegralGoodsList(@Param("page") Page<Map<String, Object>> page,
+ @Param("beginTime") String beginTime,
+ @Param("endTime") String endTime,
+ @Param("name") String name,
+ @Param("state") Integer state);
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TIntegralOrderMapper.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TIntegralOrderMapper.java
new file mode 100644
index 0000000..3f53c5d
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TIntegralOrderMapper.java
@@ -0,0 +1,33 @@
+package com.stylefeng.guns.modular.system.dao;
+
+import com.baomidou.mybatisplus.plugins.Page;
+import com.stylefeng.guns.modular.system.model.TIntegralOrder;
+import com.baomidou.mybatisplus.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * 积分订单管理 Mapper 接口
+ * </p>
+ *
+ * @author 吕雪
+ * @since 2020-09-02
+ */
+public interface TIntegralOrderMapper extends BaseMapper<TIntegralOrder> {
+
+ /**
+ * 根据条件查询兑换订单列表
+ * @return
+ */
+ List<Map<String,Object>> getIntegralOrderList(@Param("page") Page<Map<String, Object>> page,
+ @Param("beginTime") String beginTime,
+ @Param("endTime") String endTime,
+ @Param("userName") String userName,
+ @Param("goodsName") String goodsName,
+ @Param("consigneeName") String consigneeName,
+ @Param("consigneePhone") String consigneePhone,
+ @Param("state") Integer state);
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TInvoiceMapper.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TInvoiceMapper.java
new file mode 100644
index 0000000..56d2a37
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TInvoiceMapper.java
@@ -0,0 +1,32 @@
+package com.stylefeng.guns.modular.system.dao;
+
+import com.baomidou.mybatisplus.plugins.Page;
+import com.stylefeng.guns.modular.system.model.TInvoice;
+import com.baomidou.mybatisplus.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * 发票 Mapper 接口
+ * </p>
+ *
+ * @author 吕雪
+ * @since 2020-06-09
+ */
+public interface TInvoiceMapper extends BaseMapper<TInvoice> {
+
+ /**
+ * 根据条件查询用开发票记录列表
+ * @return
+ */
+ List<Map<String,Object>> getInvoiceList(@Param("page") Page<Map<String, Object>> page,
+ @Param("beginTime") String beginTime,
+ @Param("endTime") String endTime,
+ @Param("email") String email,
+ @Param("name") String name,
+ @Param("type") Integer type,
+ @Param("state") Integer state);
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TLineCompanyMapper.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TLineCompanyMapper.java
new file mode 100644
index 0000000..d0c1379
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TLineCompanyMapper.java
@@ -0,0 +1,16 @@
+package com.stylefeng.guns.modular.system.dao;
+
+import com.stylefeng.guns.modular.system.model.TLineCompany;
+import com.baomidou.mybatisplus.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 企业-线路关系表 Mapper 接口
+ * </p>
+ *
+ * @author 吕雪
+ * @since 2020-09-16
+ */
+public interface TLineCompanyMapper extends BaseMapper<TLineCompany> {
+
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TLineMapper.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TLineMapper.java
new file mode 100644
index 0000000..8108a00
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TLineMapper.java
@@ -0,0 +1,46 @@
+package com.stylefeng.guns.modular.system.dao;
+
+import com.baomidou.mybatisplus.plugins.Page;
+import com.stylefeng.guns.modular.system.model.TLine;
+import com.baomidou.mybatisplus.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * 跨城线路 Mapper 接口
+ * </p>
+ *
+ * @author 吕雪
+ * @since 2020-09-15
+ */
+public interface TLineMapper extends BaseMapper<TLine> {
+
+ /**
+ * 根据条件查询线路列表
+ * @return
+ */
+ List<Map<String,Object>> getLineList(@Param("page") Page<Map<String, Object>> page,
+ @Param("beginTime") String beginTime,
+ @Param("endTime") String endTime,
+ @Param("name") String name,
+ @Param("insertUser") String insertUser,
+ @Param("modelStr") String modelStr,
+ @Param("state") Integer state);
+
+ /**
+ * 根据线路ID查询线路价格
+ * @param lineId
+ * @return
+ */
+ List<Map<String,Object>> getLinePriceList(@Param("lineId") Integer lineId);
+
+ /**
+ * 根据线路ID查询线路已分配公司
+ * @param lineId
+ * @return
+ */
+ List<Map<String,Object>> getLineCompanyList(@Param("lineId") Integer lineId);
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TLinePriceMapper.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TLinePriceMapper.java
new file mode 100644
index 0000000..9843888
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TLinePriceMapper.java
@@ -0,0 +1,16 @@
+package com.stylefeng.guns.modular.system.dao;
+
+import com.stylefeng.guns.modular.system.model.TLinePrice;
+import com.baomidou.mybatisplus.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 跨城线路价格规则 Mapper 接口
+ * </p>
+ *
+ * @author 吕雪
+ * @since 2020-09-16
+ */
+public interface TLinePriceMapper extends BaseMapper<TLinePrice> {
+
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TLineShiftMapper.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TLineShiftMapper.java
new file mode 100644
index 0000000..9f70007
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TLineShiftMapper.java
@@ -0,0 +1,16 @@
+package com.stylefeng.guns.modular.system.dao;
+
+import com.stylefeng.guns.modular.system.model.TLineShift;
+import com.baomidou.mybatisplus.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 线路班次 Mapper 接口
+ * </p>
+ *
+ * @author 吕雪
+ * @since 2020-09-16
+ */
+public interface TLineShiftMapper extends BaseMapper<TLineShift> {
+
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TLineSiteMapper.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TLineSiteMapper.java
new file mode 100644
index 0000000..03ab4f0
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TLineSiteMapper.java
@@ -0,0 +1,16 @@
+package com.stylefeng.guns.modular.system.dao;
+
+import com.stylefeng.guns.modular.system.model.TLineSite;
+import com.baomidou.mybatisplus.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 线路-站点关系表 Mapper 接口
+ * </p>
+ *
+ * @author 吕雪
+ * @since 2020-09-16
+ */
+public interface TLineSiteMapper extends BaseMapper<TLineSite> {
+
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TLocationMapper.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TLocationMapper.java
new file mode 100644
index 0000000..646dc48
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TLocationMapper.java
@@ -0,0 +1,16 @@
+package com.stylefeng.guns.modular.system.dao;
+
+import com.stylefeng.guns.modular.system.model.TLocation;
+import com.baomidou.mybatisplus.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 地点 Mapper 接口
+ * </p>
+ *
+ * @author 吕雪
+ * @since 2020-09-04
+ */
+public interface TLocationMapper extends BaseMapper<TLocation> {
+
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TNoticesMapper.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TNoticesMapper.java
new file mode 100644
index 0000000..eaadfa2
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TNoticesMapper.java
@@ -0,0 +1,30 @@
+package com.stylefeng.guns.modular.system.dao;
+
+import com.baomidou.mybatisplus.plugins.Page;
+import com.stylefeng.guns.modular.system.model.TNotices;
+import com.baomidou.mybatisplus.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * 发布公告和滚动消息 Mapper 接口
+ * </p>
+ *
+ * @author 吕雪
+ * @since 2020-06-10
+ */
+public interface TNoticesMapper extends BaseMapper<TNotices> {
+
+ /**
+ * 根据条件查询滚动消息列表
+ * @return
+ */
+ List<Map<String,Object>> getRollingNoticeList(@Param("page") Page<Map<String, Object>> page,
+ @Param("beginTime") String beginTime,
+ @Param("endTime") String endTime,
+ @Param("typeValue") Integer typeValue,
+ @Param("content") String content);
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TOpenCityBusinessMapper.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TOpenCityBusinessMapper.java
new file mode 100644
index 0000000..21f3cac
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TOpenCityBusinessMapper.java
@@ -0,0 +1,16 @@
+package com.stylefeng.guns.modular.system.dao;
+
+import com.stylefeng.guns.modular.system.model.TOpenCityBusiness;
+import com.baomidou.mybatisplus.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 开通城市经营业务 Mapper 接口
+ * </p>
+ *
+ * @author 吕雪
+ * @since 2020-06-02
+ */
+public interface TOpenCityBusinessMapper extends BaseMapper<TOpenCityBusiness> {
+
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TOpenCityMapper.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TOpenCityMapper.java
new file mode 100644
index 0000000..f61ed6a
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TOpenCityMapper.java
@@ -0,0 +1,40 @@
+package com.stylefeng.guns.modular.system.dao;
+
+import com.baomidou.mybatisplus.plugins.Page;
+import com.stylefeng.guns.modular.system.model.TOpenCity;
+import com.baomidou.mybatisplus.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * 开通城市表 Mapper 接口
+ * </p>
+ *
+ * @author 吕雪
+ * @since 2020-06-02
+ */
+public interface TOpenCityMapper extends BaseMapper<TOpenCity> {
+
+ /**
+ * 根据条件查询开通城市列表
+ * @param page 分页
+ * @param beginTime 开始时间
+ * @param endTime 结束时间
+ * @param condition 省/市/区
+ * @return
+ */
+ List<Map<String,Object>> getOpenCityList(@Param("page") Page<Map<String, Object>> page,
+ @Param("beginTime") String beginTime,
+ @Param("endTime") String endTime,
+ @Param("condition") String condition);
+
+ /**
+ * 根据城市ID获取经营业务
+ * @param openCityId
+ * @return
+ */
+ List<Map<String,Object>> getBusinessByCityId(@Param("openCityId") Integer openCityId);
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TOrderCharterMapper.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TOrderCharterMapper.java
new file mode 100644
index 0000000..7d6b8f9
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TOrderCharterMapper.java
@@ -0,0 +1,33 @@
+package com.stylefeng.guns.modular.system.dao;
+
+import com.baomidou.mybatisplus.plugins.Page;
+import com.stylefeng.guns.modular.system.model.TOrderCharter;
+import com.baomidou.mybatisplus.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * 包车订单 Mapper 接口
+ * </p>
+ *
+ * @author 吕雪
+ * @since 2020-09-02
+ */
+public interface TOrderCharterMapper extends BaseMapper<TOrderCharter> {
+
+ /**
+ * 根据条件查询包车订单列表
+ * @return
+ */
+ List<Map<String,Object>> getCharterOrderList(@Param("page") Page<Map<String, Object>> page,
+ @Param("beginTime") String beginTime,
+ @Param("endTime") String endTime,
+ @Param("userName") String userName,
+ @Param("contactName") String contactName,
+ @Param("contactPhone") String contactPhone,
+ @Param("useDemand") String useDemand,
+ @Param("state") Integer state);
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TOrderCharteredCarMapper.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TOrderCharteredCarMapper.java
new file mode 100644
index 0000000..98e9162
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TOrderCharteredCarMapper.java
@@ -0,0 +1,35 @@
+package com.stylefeng.guns.modular.system.dao;
+
+import com.baomidou.mybatisplus.plugins.Page;
+import com.stylefeng.guns.modular.system.model.TOrderCharteredCar;
+import com.baomidou.mybatisplus.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * 订单-包车 Mapper 接口
+ * </p>
+ *
+ * @author 吕雪
+ * @since 2020-09-24
+ */
+public interface TOrderCharteredCarMapper extends BaseMapper<TOrderCharteredCar> {
+
+ /**
+ * 根据条件查询包车订单列表
+ * @return
+ */
+ List<Map<String,Object>> getCharterCarOrderList(@Param("page") Page<Map<String, Object>> page,
+ @Param("beginTime") String beginTime,
+ @Param("endTime") String endTime,
+ @Param("userName") String userName,
+ @Param("contactPerson") String contactPerson,
+ @Param("contactPhone") String contactPhone,
+ @Param("modelUse") String modelUse,
+ @Param("state") Integer state,
+ @Param("roleType") Integer roleType,
+ @Param("nowUserId") Integer nowUserId);
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TOrderCrossCityMapper.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TOrderCrossCityMapper.java
new file mode 100644
index 0000000..ab327bb
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TOrderCrossCityMapper.java
@@ -0,0 +1,51 @@
+package com.stylefeng.guns.modular.system.dao;
+
+import com.baomidou.mybatisplus.plugins.Page;
+import com.stylefeng.guns.modular.system.model.TOrderCrossCity;
+import com.baomidou.mybatisplus.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * 订单-跨城 Mapper 接口
+ * </p>
+ *
+ * @author 吕雪
+ * @since 2020-09-16
+ */
+public interface TOrderCrossCityMapper extends BaseMapper<TOrderCrossCity> {
+
+ /**
+ * 根据条件查询跨城出行订单列表
+ * @return
+ */
+ List<Map<String,Object>> getCrossCityOrderList(@Param("page") Page<Map<String, Object>> page,
+ @Param("beginTime") String beginTime,
+ @Param("endTime") String endTime,
+ @Param("roleType") Integer roleType,
+ @Param("nowUserId") Integer nowUserId,
+ @Param("orderNum") String orderNum,
+ @Param("orderSource") Integer orderSource,
+ @Param("userName") String userName,
+ @Param("userPhone") String userPhone,
+ @Param("passengers") String passengers,
+ @Param("passengersPhone") String passengersPhone,
+ @Param("serverCarModelId") Integer serverCarModelId,
+ @Param("driver") String driver,
+ @Param("lineId") Integer lineId,
+ @Param("state") Integer state);
+
+ /**
+ * 根据跨城出行订单ID获取跨城出行订单详情
+ * @param orderId
+ * @return
+ */
+ Map<String,Object> getCrossCityOrderDetailById(@Param("orderId") Integer orderId);
+
+
+ List<TOrderCrossCity> queryOrders(@Param("driverId") Integer driverId, @Param("lineShiftDriverId") Integer lineShiftDriverId,
+ @Param("state") List<Integer> state);
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TOrderEvaluateMapper.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TOrderEvaluateMapper.java
new file mode 100644
index 0000000..a620ca4
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TOrderEvaluateMapper.java
@@ -0,0 +1,36 @@
+package com.stylefeng.guns.modular.system.dao;
+
+import com.baomidou.mybatisplus.plugins.Page;
+import com.stylefeng.guns.modular.system.model.TOrderEvaluate;
+import com.baomidou.mybatisplus.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * 订单评价 Mapper 接口
+ * </p>
+ *
+ * @author 吕雪
+ * @since 2020-06-09
+ */
+public interface TOrderEvaluateMapper extends BaseMapper<TOrderEvaluate> {
+
+ /**
+ * 根据条件查询评价列表
+ * @return
+ */
+ List<Map<String,Object>> getOrderEvaluateList(@Param("page") Page<Map<String, Object>> page,
+ @Param("roleType") Integer roleType,
+ @Param("nowUserId") Integer nowUserId,
+ @Param("beginTime") String beginTime,
+ @Param("endTime") String endTime,
+ @Param("userName") String userName,
+ @Param("userPhone") String userPhone,
+ @Param("driverName") String driverName,
+ @Param("driverPhone") String driverPhone,
+ @Param("fraction") String fraction,
+ @Param("orderType") Integer orderType);
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TOrderLogisticsMapper.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TOrderLogisticsMapper.java
new file mode 100644
index 0000000..87b3e7d
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TOrderLogisticsMapper.java
@@ -0,0 +1,46 @@
+package com.stylefeng.guns.modular.system.dao;
+
+import com.baomidou.mybatisplus.plugins.Page;
+import com.stylefeng.guns.modular.system.model.TOrderLogistics;
+import com.baomidou.mybatisplus.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * 订单-小件物流 Mapper 接口
+ * </p>
+ *
+ * @author 吕雪
+ * @since 2020-09-24
+ */
+public interface TOrderLogisticsMapper extends BaseMapper<TOrderLogistics> {
+
+ /**
+ * 根据条件查询小件物流订单列表
+ * @return
+ */
+ List<Map<String,Object>> getLogisticsOrderList(@Param("page") Page<Map<String, Object>> page,
+ @Param("beginTime") String beginTime,
+ @Param("endTime") String endTime,
+ @Param("roleType") Integer roleType,
+ @Param("nowUserId") Integer nowUserId,
+ @Param("orderNum") String orderNum,
+ @Param("orderSource") Integer orderSource,
+ @Param("type") Integer type,
+ @Param("userName") String userName,
+ @Param("userPhone") String userPhone,
+ @Param("recipient") String recipient,
+ @Param("recipientPhone") String recipientPhone,
+ @Param("driver") String driver,
+ @Param("state") Integer state);
+
+ /**
+ * 根据专车订单ID获取小件物流订单详情
+ * @param orderId
+ * @return
+ */
+ Map<String,Object> getLogisticsOrderDetailById(@Param("orderId") Integer orderId);
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TOrderPositionMapper.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TOrderPositionMapper.java
new file mode 100644
index 0000000..9cfe41c
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TOrderPositionMapper.java
@@ -0,0 +1,16 @@
+package com.stylefeng.guns.modular.system.dao;
+
+import com.stylefeng.guns.modular.system.model.TOrderPosition;
+import com.baomidou.mybatisplus.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 订单坐标信息表 Mapper 接口
+ * </p>
+ *
+ * @author 吕雪
+ * @since 2020-06-08
+ */
+public interface TOrderPositionMapper extends BaseMapper<TOrderPosition> {
+
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TOrderPrivateCarMapper.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TOrderPrivateCarMapper.java
new file mode 100644
index 0000000..96b324d
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TOrderPrivateCarMapper.java
@@ -0,0 +1,46 @@
+package com.stylefeng.guns.modular.system.dao;
+
+import com.baomidou.mybatisplus.plugins.Page;
+import com.stylefeng.guns.modular.system.model.TOrderPrivateCar;
+import com.baomidou.mybatisplus.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * 订单-专车 Mapper 接口
+ * </p>
+ *
+ * @author 吕雪
+ * @since 2020-09-02
+ */
+public interface TOrderPrivateCarMapper extends BaseMapper<TOrderPrivateCar> {
+
+ /**
+ * 根据条件查询专车订单列表
+ * @return
+ */
+ List<Map<String,Object>> getPrivateCarOrderList(@Param("page") Page<Map<String, Object>> page,
+ @Param("beginTime") String beginTime,
+ @Param("endTime") String endTime,
+ @Param("roleType") Integer roleType,
+ @Param("nowUserId") Integer nowUserId,
+ @Param("orderNum") String orderNum,
+ @Param("orderSource") Integer orderSource,
+ @Param("userName") String userName,
+ @Param("userPhone") String userPhone,
+ @Param("passengers") String passengers,
+ @Param("passengersPhone") String passengersPhone,
+ @Param("serverCarModelId") Integer serverCarModelId,
+ @Param("driver") String driver,
+ @Param("state") Integer state);
+
+ /**
+ * 根据专车订单ID获取专车订单详情
+ * @param orderId
+ * @return
+ */
+ Map<String,Object> getPrivateCarOrderDetailById(@Param("orderId") Integer orderId);
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TOrderTaxiMapper.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TOrderTaxiMapper.java
new file mode 100644
index 0000000..41c9a48
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TOrderTaxiMapper.java
@@ -0,0 +1,79 @@
+package com.stylefeng.guns.modular.system.dao;
+
+import com.baomidou.mybatisplus.plugins.Page;
+import com.stylefeng.guns.modular.system.model.TOrderTaxi;
+import com.baomidou.mybatisplus.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * 订单-出租车 Mapper 接口
+ * </p>
+ *
+ * @author 吕雪
+ * @since 2020-06-08
+ */
+public interface TOrderTaxiMapper extends BaseMapper<TOrderTaxi> {
+
+ /**
+ * 根据条件查询出租车订单列表
+ * @return
+ */
+ List<Map<String,Object>> getTaxiOrderList(@Param("page") Page<Map<String, Object>> page,
+ @Param("beginTime") String beginTime,
+ @Param("endTime") String endTime,
+ @Param("roleType") Integer roleType,
+ @Param("nowUserId") Integer nowUserId,
+ @Param("orderNum") String orderNum,
+ @Param("orderSource") Integer orderSource,
+ @Param("userName") String userName,
+ @Param("userPhone") String userPhone,
+ @Param("passengers") String passengers,
+ @Param("passengersPhone") String passengersPhone,
+ @Param("driver") String driver,
+ @Param("state") Integer state);
+
+ /**
+ * 根据出租车订单ID获取出租车订单详情
+ * @param orderId
+ * @return
+ */
+ Map<String,Object> getTaxiOrderDetailById(@Param("orderId") Integer orderId);
+
+ /**
+ * 根据条件查询可被选择的出租车司机列表
+ * @return
+ */
+ List<Map<String,Object>> getCanSelectTaxiDriverList(@Param("page") Page<Map<String, Object>> page,
+ @Param("companyId") Integer companyId,
+ @Param("name") String name,
+ @Param("phone") String phone);
+
+ /**
+ * 查询所有订单条数
+ * @param companyId
+ * @return
+ */
+ Integer getAllOrderNum(@Param("companyId") Integer companyId,@Param("beginTime") String beginTime,@Param("endTime") String endTime);
+
+ /**
+ * 查询所有总交易金额
+ * @param companyId
+ * @param beginTime
+ * @param endTime
+ * @return
+ */
+ Double getAllTradeMoney(@Param("companyId") Integer companyId,@Param("beginTime") String beginTime,@Param("endTime") String endTime);
+
+ /**
+ * 查询所有总收益
+ * @param companyId
+ * @param beginTime
+ * @param endTime
+ * @return
+ */
+ Double getAllIncomeMoney(@Param("companyId") Integer companyId,@Param("beginTime") String beginTime,@Param("endTime") String endTime);
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TPhoneMapper.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TPhoneMapper.java
new file mode 100644
index 0000000..ac62edf
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TPhoneMapper.java
@@ -0,0 +1,16 @@
+package com.stylefeng.guns.modular.system.dao;
+
+import com.stylefeng.guns.modular.system.model.TPhone;
+import com.baomidou.mybatisplus.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 系统电话设置 Mapper 接口
+ * </p>
+ *
+ * @author 吕雪
+ * @since 2020-06-09
+ */
+public interface TPhoneMapper extends BaseMapper<TPhone> {
+
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TProblemMapper.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TProblemMapper.java
new file mode 100644
index 0000000..25e5818
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TProblemMapper.java
@@ -0,0 +1,30 @@
+package com.stylefeng.guns.modular.system.dao;
+
+import com.baomidou.mybatisplus.plugins.Page;
+import com.stylefeng.guns.modular.system.model.TProblem;
+import com.baomidou.mybatisplus.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * 在线客服 Mapper 接口
+ * </p>
+ *
+ * @author 吕雪
+ * @since 2020-06-24
+ */
+public interface TProblemMapper extends BaseMapper<TProblem> {
+
+ /**
+ * 根据条件查询用户留言列表
+ * @return
+ */
+ List<Map<String,Object>> getProblemList(@Param("page") Page<Map<String, Object>> page,
+ @Param("beginTime") String beginTime,
+ @Param("endTime") String endTime,
+ @Param("userName") String userName,
+ @Param("state") Integer state);
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TPubTransactionDetailsMapper.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TPubTransactionDetailsMapper.java
new file mode 100644
index 0000000..ff941ff
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TPubTransactionDetailsMapper.java
@@ -0,0 +1,16 @@
+package com.stylefeng.guns.modular.system.dao;
+
+import com.stylefeng.guns.modular.system.model.TPubTransactionDetails;
+import com.baomidou.mybatisplus.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 交易明细(司机/用户) Mapper 接口
+ * </p>
+ *
+ * @author 吕雪
+ * @since 2020-09-16
+ */
+public interface TPubTransactionDetailsMapper extends BaseMapper<TPubTransactionDetails> {
+
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TPubWithdrawalMapper.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TPubWithdrawalMapper.java
new file mode 100644
index 0000000..d9a1f4d
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TPubWithdrawalMapper.java
@@ -0,0 +1,30 @@
+package com.stylefeng.guns.modular.system.dao;
+
+import com.baomidou.mybatisplus.plugins.Page;
+import com.stylefeng.guns.modular.system.model.TPubWithdrawal;
+import com.baomidou.mybatisplus.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * 提现记录表(司机/用户) Mapper 接口
+ * </p>
+ *
+ * @author 吕雪
+ * @since 2020-06-09
+ */
+public interface TPubWithdrawalMapper extends BaseMapper<TPubWithdrawal> {
+
+ /**
+ * 根据条件查询提现列表
+ * @return
+ */
+ List<Map<String,Object>> getWithdrawalList(@Param("page") Page<Map<String, Object>> page,
+ @Param("beginTime") String beginTime,
+ @Param("endTime") String endTime,
+ @Param("name") String name,
+ @Param("withdrawalType") Integer withdrawalType);
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TReassignMapper.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TReassignMapper.java
new file mode 100644
index 0000000..658c15a
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TReassignMapper.java
@@ -0,0 +1,107 @@
+package com.stylefeng.guns.modular.system.dao;
+
+import com.baomidou.mybatisplus.plugins.Page;
+import com.stylefeng.guns.modular.system.model.TReassign;
+import com.baomidou.mybatisplus.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * 订单改派 Mapper 接口
+ * </p>
+ *
+ * @author 吕雪
+ * @since 2020-09-03
+ */
+public interface TReassignMapper extends BaseMapper<TReassign> {
+
+ /**
+ * 根据条件查询专车改派订单列表
+ */
+ List<Map<String,Object>> getPrivateCarReassignOrderList(@Param("page") Page<Map<String, Object>> page,
+ @Param("roleType") Integer roleType,
+ @Param("nowUserId") Integer nowUserId,
+ @Param("beginTime") String beginTime,
+ @Param("endTime") String endTime,
+ @Param("originalDriverName") String originalDriverName,
+ @Param("originalDriverPhone") String originalDriverPhone,
+ @Param("orderNum") String orderNum,
+ @Param("nowDriverName") String nowDriverName,
+ @Param("nowDriverPhone") String nowDriverPhone,
+ @Param("orderState") Integer orderState,
+ @Param("state") Integer state);
+
+
+ /**
+ * 根据条件查询可被选择的专车司机列表
+ * @return
+ */
+ List<Map<String,Object>> getCanSelectPrivateCarDriverList(@Param("page") Page<Map<String, Object>> page,
+ @Param("companyId") Integer companyId,
+ @Param("name") String name,
+ @Param("phone") String phone);
+
+
+
+ /**
+ * 根据条件查询可被选择的专车司机列表
+ * @return
+ */
+ List<Map<String,Object>> getCanSelectSmallDriverList(@Param("page") Page<Map<String, Object>> page,
+ @Param("companyId") Integer companyId,
+ @Param("type") Integer type,
+ @Param("name") String name,
+ @Param("phone") String phone);
+
+ /**
+ * 根据条件查询跨城改派订单列表
+ */
+ List<Map<String,Object>> getCrossReassignOrderList(@Param("page") Page<Map<String, Object>> page,
+ @Param("roleType") Integer roleType,
+ @Param("nowUserId") Integer nowUserId,
+ @Param("beginTime") String beginTime,
+ @Param("endTime") String endTime,
+ @Param("originalDriverName") String originalDriverName,
+ @Param("originalDriverPhone") String originalDriverPhone,
+ @Param("orderNum") String orderNum,
+ @Param("nowDriverName") String nowDriverName,
+ @Param("nowDriverPhone") String nowDriverPhone,
+ @Param("orderState") Integer orderState,
+ @Param("state") Integer state);
+
+
+ /**
+ * 根据条件查询跨城改派订单列表
+ */
+ List<Map<String,Object>> getSmallPieceLogisticsList(@Param("page") Page<Map<String, Object>> page,
+ @Param("roleType") Integer roleType,
+ @Param("nowUserId") Integer nowUserId,
+ @Param("beginTime") String beginTime,
+ @Param("endTime") String endTime,
+ @Param("originalDriverName") String originalDriverName,
+ @Param("originalDriverPhone") String originalDriverPhone,
+ @Param("orderNum") String orderNum,
+ @Param("nowDriverName") String nowDriverName,
+ @Param("nowDriverPhone") String nowDriverPhone,
+ @Param("orderState") Integer orderState,
+ @Param("state") Integer state);
+
+ /**
+ * 根据条件查询可被选择的跨城司机列表
+ * @return
+ */
+ List<Map<String,Object>> getCanSelectCrossDriverList(@Param("page") Page<Map<String, Object>> page,
+ @Param("companyId") Integer companyId,
+ @Param("serverCarModelId") Integer serverCarModelId,
+ @Param("lineId") Integer lineId,
+ @Param("lineShiftId") Integer lineShiftId,
+ @Param("time") Date time,
+ @Param("num") Integer num,
+ @Param("name") String name,
+ @Param("phone") String phone,
+ @Param("driverId") Integer driverId);
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TRegionMapper.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TRegionMapper.java
new file mode 100644
index 0000000..358db98
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TRegionMapper.java
@@ -0,0 +1,16 @@
+package com.stylefeng.guns.modular.system.dao;
+
+import com.stylefeng.guns.modular.system.model.TRegion;
+import com.baomidou.mybatisplus.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 省市区三级联动 Mapper 接口
+ * </p>
+ *
+ * @author 吕雪
+ * @since 2020-06-02
+ */
+public interface TRegionMapper extends BaseMapper<TRegion> {
+
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TServerCarmodelMapper.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TServerCarmodelMapper.java
new file mode 100644
index 0000000..7553801
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TServerCarmodelMapper.java
@@ -0,0 +1,28 @@
+package com.stylefeng.guns.modular.system.dao;
+
+import com.baomidou.mybatisplus.plugins.Page;
+import com.stylefeng.guns.modular.system.model.TServerCarmodel;
+import com.baomidou.mybatisplus.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * 服务车型设置 Mapper 接口
+ * </p>
+ *
+ * @author 吕雪
+ * @since 2020-08-29
+ */
+public interface TServerCarmodelMapper extends BaseMapper<TServerCarmodel> {
+
+ /**
+ * 根据条件查询服务车型列表
+ */
+ List<Map<String,Object>> getServerCarModelList(@Param("page") Page<Map<String, Object>> page,
+ @Param("type") Integer type,
+ @Param("name") String name,
+ @Param("state") Integer state);
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TSiteMapper.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TSiteMapper.java
new file mode 100644
index 0000000..6469de0
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TSiteMapper.java
@@ -0,0 +1,36 @@
+package com.stylefeng.guns.modular.system.dao;
+
+import com.baomidou.mybatisplus.plugins.Page;
+import com.stylefeng.guns.modular.system.model.TSite;
+import com.baomidou.mybatisplus.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * 线路站点 Mapper 接口
+ * </p>
+ *
+ * @author 吕雪
+ * @since 2020-09-04
+ */
+public interface TSiteMapper extends BaseMapper<TSite> {
+
+ /**
+ * 根据条件查询站点列表
+ * @return
+ */
+ List<Map<String,Object>> getSiteList(@Param("page") Page<Map<String, Object>> page,
+ @Param("beginTime") String beginTime,
+ @Param("endTime") String endTime,
+ @Param("name") String name,
+ @Param("insertUser") String insertUser,
+ @Param("city") String city,
+ @Param("state") Integer state);
+
+
+ List<TSite> query(@Param("provinceCode") String provinceCode, @Param("cityCode")String cityCode,
+ @Param("districtCode")String districtCode);
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TSmsrecordMapper.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TSmsrecordMapper.java
new file mode 100644
index 0000000..888b53b
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TSmsrecordMapper.java
@@ -0,0 +1,29 @@
+package com.stylefeng.guns.modular.system.dao;
+
+import com.baomidou.mybatisplus.plugins.Page;
+import com.stylefeng.guns.modular.system.model.TSmsrecord;
+import com.baomidou.mybatisplus.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * 验证码 Mapper 接口
+ * </p>
+ *
+ * @author 吕雪
+ * @since 2020-06-10
+ */
+public interface TSmsrecordMapper extends BaseMapper<TSmsrecord> {
+
+ /**
+ * 根据条件查询验证码记录列表
+ * @return
+ */
+ List<Map<String,Object>> getSmsCodeList(@Param("page") Page<Map<String, Object>> page,
+ @Param("beginTime") String beginTime,
+ @Param("endTime") String endTime,
+ @Param("phone") String phone);
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TSysCancleOrderMapper.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TSysCancleOrderMapper.java
new file mode 100644
index 0000000..5f5f51b
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TSysCancleOrderMapper.java
@@ -0,0 +1,16 @@
+package com.stylefeng.guns.modular.system.dao;
+
+import com.stylefeng.guns.modular.system.model.TSysCancleOrder;
+import com.baomidou.mybatisplus.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 系统设置-取消订单 Mapper 接口
+ * </p>
+ *
+ * @author 吕雪
+ * @since 2020-06-09
+ */
+public interface TSysCancleOrderMapper extends BaseMapper<TSysCancleOrder> {
+
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TSysFaceDistinguishMapper.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TSysFaceDistinguishMapper.java
new file mode 100644
index 0000000..abcbda9
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TSysFaceDistinguishMapper.java
@@ -0,0 +1,16 @@
+package com.stylefeng.guns.modular.system.dao;
+
+import com.stylefeng.guns.modular.system.model.TSysFaceDistinguish;
+import com.baomidou.mybatisplus.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 系统设置-人脸识别 Mapper 接口
+ * </p>
+ *
+ * @author 吕雪
+ * @since 2020-06-09
+ */
+public interface TSysFaceDistinguishMapper extends BaseMapper<TSysFaceDistinguish> {
+
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TSysIntegralMapper.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TSysIntegralMapper.java
new file mode 100644
index 0000000..3356379
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TSysIntegralMapper.java
@@ -0,0 +1,16 @@
+package com.stylefeng.guns.modular.system.dao;
+
+import com.stylefeng.guns.modular.system.model.TSysIntegral;
+import com.baomidou.mybatisplus.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 系统设置-积分 Mapper 接口
+ * </p>
+ *
+ * @author 吕雪
+ * @since 2020-06-09
+ */
+public interface TSysIntegralMapper extends BaseMapper<TSysIntegral> {
+
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TSysPushOrderMapper.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TSysPushOrderMapper.java
new file mode 100644
index 0000000..979fef9
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TSysPushOrderMapper.java
@@ -0,0 +1,16 @@
+package com.stylefeng.guns.modular.system.dao;
+
+import com.stylefeng.guns.modular.system.model.TSysPushOrder;
+import com.baomidou.mybatisplus.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 系统设置-推单 Mapper 接口
+ * </p>
+ *
+ * @author 吕雪
+ * @since 2020-06-09
+ */
+public interface TSysPushOrderMapper extends BaseMapper<TSysPushOrder> {
+
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TSysReformistMapper.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TSysReformistMapper.java
new file mode 100644
index 0000000..a870747
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TSysReformistMapper.java
@@ -0,0 +1,16 @@
+package com.stylefeng.guns.modular.system.dao;
+
+import com.stylefeng.guns.modular.system.model.TSysReformist;
+import com.baomidou.mybatisplus.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 系统设置-改派 Mapper 接口
+ * </p>
+ *
+ * @author 吕雪
+ * @since 2020-06-09
+ */
+public interface TSysReformistMapper extends BaseMapper<TSysReformist> {
+
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TSysSensitiveWordsMapper.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TSysSensitiveWordsMapper.java
new file mode 100644
index 0000000..fd20f56
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TSysSensitiveWordsMapper.java
@@ -0,0 +1,29 @@
+package com.stylefeng.guns.modular.system.dao;
+
+import com.baomidou.mybatisplus.plugins.Page;
+import com.stylefeng.guns.modular.system.model.TSysSensitiveWords;
+import com.baomidou.mybatisplus.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * 系统设置-敏感词 Mapper 接口
+ * </p>
+ *
+ * @author 吕雪
+ * @since 2020-06-09
+ */
+public interface TSysSensitiveWordsMapper extends BaseMapper<TSysSensitiveWords> {
+
+ /**
+ * 根据条件查询敏感词列表
+ * @return
+ */
+ List<Map<String,Object>> getSensitiveWordList(@Param("page") Page<Map<String, Object>> page,
+ @Param("beginTime") String beginTime,
+ @Param("endTime") String endTime,
+ @Param("content") String content);
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TSystemNoticeMapper.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TSystemNoticeMapper.java
new file mode 100644
index 0000000..9f2f60a
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TSystemNoticeMapper.java
@@ -0,0 +1,16 @@
+package com.stylefeng.guns.modular.system.dao;
+
+import com.stylefeng.guns.modular.system.model.TSystemNotice;
+import com.baomidou.mybatisplus.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 系统通知 Mapper 接口
+ * </p>
+ *
+ * @author 吕雪
+ * @since 2020-06-10
+ */
+public interface TSystemNoticeMapper extends BaseMapper<TSystemNotice> {
+
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TSystemPriceMapper.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TSystemPriceMapper.java
new file mode 100644
index 0000000..af7ac0e
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TSystemPriceMapper.java
@@ -0,0 +1,28 @@
+package com.stylefeng.guns.modular.system.dao;
+
+import com.baomidou.mybatisplus.plugins.Page;
+import com.stylefeng.guns.modular.system.model.TSystemPrice;
+import com.baomidou.mybatisplus.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * 服务价格规则 Mapper 接口
+ * </p>
+ *
+ * @author 吕雪
+ * @since 2020-08-29
+ */
+public interface TSystemPriceMapper extends BaseMapper<TSystemPrice> {
+
+ /**
+ * 查询专车价格设置
+ */
+ List<Map<String,Object>> getSpecialPriceList(@Param("page") Page<Map<String, Object>> page,
+ @Param("companyId") Integer companyId,
+ @Param("name") String name,
+ @Param("state") Integer state);
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TUserMapper.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TUserMapper.java
new file mode 100644
index 0000000..bb8547d
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TUserMapper.java
@@ -0,0 +1,58 @@
+package com.stylefeng.guns.modular.system.dao;
+
+import com.baomidou.mybatisplus.plugins.Page;
+import com.stylefeng.guns.modular.system.model.TUser;
+import com.baomidou.mybatisplus.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * 用户信息 Mapper 接口
+ * </p>
+ *
+ * @author 吕雪
+ * @since 2020-06-01
+ */
+public interface TUserMapper extends BaseMapper<TUser> {
+
+ /**
+ * 根据条件查询用户列表
+ * @param page 分页
+ * @param beginTime 开始时间
+ * @param endTime 结束时间
+ * @param isAuth 是否实名认证
+ * @param state 状态
+ * @param id 用户ID
+ * @param nickName 用户昵称
+ * @return
+ */
+ List<Map<String,Object>> getUserList(@Param("page") Page<Map<String, Object>> page,
+ @Param("beginTime") String beginTime,
+ @Param("endTime") String endTime,
+ @Param("roleType") Integer roleType,
+ @Param("nowUserId") Integer nowUserId,
+ @Param("isAuth") Integer isAuth,
+ @Param("state") Integer state,
+ @Param("id") String id,
+ @Param("nickName") String nickName,
+ @Param("phone") String phone,
+ @Param("companyName") String companyName);
+
+ /**
+ * 根据用户ID获取用户详情
+ * @param userId
+ * @return
+ */
+ Map<String,Object> getUserDetailById(@Param("userId") Integer userId);
+
+ /**
+ * 根据条件查询用户列表-无分页
+ * @return
+ */
+ List<Map<String,Object>> getUserListNoPage(@Param("roleType") Integer roleType,
+ @Param("nowUserId") Integer nowUserId);
+
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TUserRedPacketRecordMapper.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TUserRedPacketRecordMapper.java
new file mode 100644
index 0000000..0025d75
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TUserRedPacketRecordMapper.java
@@ -0,0 +1,16 @@
+package com.stylefeng.guns.modular.system.dao;
+
+import com.stylefeng.guns.modular.system.model.TUserRedPacketRecord;
+import com.baomidou.mybatisplus.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 用户红包记录 Mapper 接口
+ * </p>
+ *
+ * @author stylefeng
+ * @since 2020-07-10
+ */
+public interface TUserRedPacketRecordMapper extends BaseMapper<TUserRedPacketRecord> {
+
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TVerifiedMapper.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TVerifiedMapper.java
new file mode 100644
index 0000000..8b3129f
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TVerifiedMapper.java
@@ -0,0 +1,33 @@
+package com.stylefeng.guns.modular.system.dao;
+
+import com.baomidou.mybatisplus.plugins.Page;
+import com.stylefeng.guns.modular.system.model.TVerified;
+import com.baomidou.mybatisplus.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * 实名认证 Mapper 接口
+ * </p>
+ *
+ * @author 吕雪
+ * @since 2020-06-09
+ */
+public interface TVerifiedMapper extends BaseMapper<TVerified> {
+
+ /**
+ * 根据条件查询用户实名认证列表
+ * @return
+ */
+ List<Map<String,Object>> getVerifiedList(@Param("page") Page<Map<String, Object>> page,
+ @Param("beginTime") String beginTime,
+ @Param("endTime") String endTime,
+ @Param("userName") String userName,
+ @Param("userPhone") String userPhone,
+ @Param("name") String name,
+ @Param("state") Integer state);
+
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TVersionManagementMapper.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TVersionManagementMapper.java
new file mode 100644
index 0000000..0d4df71
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TVersionManagementMapper.java
@@ -0,0 +1,29 @@
+package com.stylefeng.guns.modular.system.dao;
+
+import com.baomidou.mybatisplus.plugins.Page;
+import com.stylefeng.guns.modular.system.model.TVersionManagement;
+import com.baomidou.mybatisplus.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * 版本管理 Mapper 接口
+ * </p>
+ *
+ * @author 吕雪
+ * @since 2020-06-10
+ */
+public interface TVersionManagementMapper extends BaseMapper<TVersionManagement> {
+
+ /**
+ * 根据条件查询版本列表
+ * @return
+ */
+ List<Map<String,Object>> getVersionList(@Param("page") Page<Map<String, Object>> page,
+ @Param("beginTime") String beginTime,
+ @Param("endTime") String endTime,
+ @Param("version") String version);
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TransactionDetailsMapper.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TransactionDetailsMapper.java
new file mode 100644
index 0000000..47dabfe
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TransactionDetailsMapper.java
@@ -0,0 +1,7 @@
+package com.stylefeng.guns.modular.system.dao;
+
+import com.baomidou.mybatisplus.mapper.BaseMapper;
+import com.stylefeng.guns.modular.system.model.TransactionDetails;
+
+public interface TransactionDetailsMapper extends BaseMapper<TransactionDetails> {
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/UserActivityBalanceMapper.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/UserActivityBalanceMapper.java
new file mode 100644
index 0000000..c72cf06
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/UserActivityBalanceMapper.java
@@ -0,0 +1,16 @@
+package com.stylefeng.guns.modular.system.dao;
+
+import com.stylefeng.guns.modular.system.model.UserActivityBalance;
+import com.baomidou.mybatisplus.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 用户活动-充值 Mapper 接口
+ * </p>
+ *
+ * @author stylefeng
+ * @since 2020-06-19
+ */
+public interface UserActivityBalanceMapper extends BaseMapper<UserActivityBalance> {
+
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/UserActivityDiscount1Mapper.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/UserActivityDiscount1Mapper.java
new file mode 100644
index 0000000..261d717
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/UserActivityDiscount1Mapper.java
@@ -0,0 +1,48 @@
+package com.stylefeng.guns.modular.system.dao;
+
+import com.stylefeng.guns.modular.system.model.UserActivityDiscount1;
+import com.baomidou.mybatisplus.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * 用户活动-折扣1 Mapper 接口
+ * </p>
+ *
+ * @author stylefeng
+ * @since 2020-06-19
+ */
+public interface UserActivityDiscount1Mapper extends BaseMapper<UserActivityDiscount1> {
+
+
+ /**
+ * 获取折扣统计
+ * @param name
+ * @param start
+ * @param end
+ * @param companyId
+ * @param offset
+ * @param limit
+ * @return
+ */
+ List<Map<String, Object>> queryDiscount1(@Param("name") String name, @Param("start") String start,
+ @Param("end") String end, @Param("companyId") Integer companyId,
+ @Param("offset") Integer offset, @Param("limit") Integer limit);
+
+
+ int queryDiscount1Count(@Param("name") String name, @Param("start") String start,
+ @Param("end") String end, @Param("companyId") Integer companyId);
+
+
+ List<Map<String, Object>> queryDiscountInfo(@Param("name") String name, @Param("start") String start,
+ @Param("end") String end, @Param("companyId") Integer companyId,
+ @Param("offset") Integer offset, @Param("limit") Integer limit);
+
+ int queryDiscountInfoCount(@Param("name") String name, @Param("start") String start,
+ @Param("end") String end, @Param("companyId") Integer companyId);
+
+
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/UserActivityDiscount2Mapper.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/UserActivityDiscount2Mapper.java
new file mode 100644
index 0000000..cfb8a30
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/UserActivityDiscount2Mapper.java
@@ -0,0 +1,16 @@
+package com.stylefeng.guns.modular.system.dao;
+
+import com.stylefeng.guns.modular.system.model.UserActivityDiscount2;
+import com.baomidou.mybatisplus.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 用户活动-折扣2（跨城） Mapper 接口
+ * </p>
+ *
+ * @author stylefeng
+ * @since 2020-06-19
+ */
+public interface UserActivityDiscount2Mapper extends BaseMapper<UserActivityDiscount2> {
+
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/UserActivityInviteMapper.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/UserActivityInviteMapper.java
new file mode 100644
index 0000000..ed97a7f
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/UserActivityInviteMapper.java
@@ -0,0 +1,16 @@
+package com.stylefeng.guns.modular.system.dao;
+
+import com.stylefeng.guns.modular.system.model.UserActivityInvite;
+import com.baomidou.mybatisplus.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 用户活动-邀请 Mapper 接口
+ * </p>
+ *
+ * @author stylefeng
+ * @since 2020-06-19
+ */
+public interface UserActivityInviteMapper extends BaseMapper<UserActivityInvite> {
+
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/UserActivityMapper.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/UserActivityMapper.java
new file mode 100644
index 0000000..ceb6758
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/UserActivityMapper.java
@@ -0,0 +1,32 @@
+package com.stylefeng.guns.modular.system.dao;
+
+import com.stylefeng.guns.modular.system.model.UserActivity;
+import com.baomidou.mybatisplus.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * 用户活动主表 Mapper 接口
+ * </p>
+ *
+ * @author stylefeng
+ * @since 2020-06-19
+ */
+public interface UserActivityMapper extends BaseMapper<UserActivity> {
+
+
+
+ List<Map<String, Object>> queryUserActivityList(@Param("companyId") Integer companyId, @Param("start") Date start,
+ @Param("end") Date end, @Param("name") String name,
+ @Param("status") Integer status, @Param("offset") Integer offset,
+ @Param("limit") Integer limit);
+
+
+ int queryUserActivityListCount(@Param("companyId") Integer companyId, @Param("start") Date start,
+ @Param("end") Date end, @Param("name") String name,
+ @Param("status") Integer status);
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/UserActivityRedenvelopeMapper.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/UserActivityRedenvelopeMapper.java
new file mode 100644
index 0000000..a3d8b04
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/UserActivityRedenvelopeMapper.java
@@ -0,0 +1,16 @@
+package com.stylefeng.guns.modular.system.dao;
+
+import com.stylefeng.guns.modular.system.model.UserActivityRedenvelope;
+import com.baomidou.mybatisplus.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 用户活动-红包 Mapper 接口
+ * </p>
+ *
+ * @author stylefeng
+ * @since 2020-06-19
+ */
+public interface UserActivityRedenvelopeMapper extends BaseMapper<UserActivityRedenvelope> {
+
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/UserActivityRegisteredMapper.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/UserActivityRegisteredMapper.java
new file mode 100644
index 0000000..72ba7c8
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/UserActivityRegisteredMapper.java
@@ -0,0 +1,16 @@
+package com.stylefeng.guns.modular.system.dao;
+
+import com.stylefeng.guns.modular.system.model.UserActivityRegistered;
+import com.baomidou.mybatisplus.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 用户活动-注册 Mapper 接口
+ * </p>
+ *
+ * @author stylefeng
+ * @since 2020-06-19
+ */
+public interface UserActivityRegisteredMapper extends BaseMapper<UserActivityRegistered> {
+
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/UserCouponRecordMapper.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/UserCouponRecordMapper.java
new file mode 100644
index 0000000..80b3ba2
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/UserCouponRecordMapper.java
@@ -0,0 +1,93 @@
+package com.stylefeng.guns.modular.system.dao;
+
+import com.baomidou.mybatisplus.plugins.Page;
+import com.stylefeng.guns.modular.system.model.UserCouponRecord;
+import com.baomidou.mybatisplus.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * 用户优惠券记录 Mapper 接口
+ * </p>
+ *
+ * @author stylefeng
+ * @since 2020-06-17
+ */
+public interface UserCouponRecordMapper extends BaseMapper<UserCouponRecord> {
+ List<Map<String,Object>> getList(@Param("page") Page<Map<String, Object>> page,
+ @Param("beginTime") String beginTime,
+ @Param("endTime") String endTime,
+ @Param("userName") String userName,
+ @Param("userPhone") String userPhone,
+ @Param("couponActivityId") Integer couponActivityId,
+ @Param("activityType") Integer activityType,
+ @Param("state") Integer state);
+
+ List<Map<String,Object>> getRedList(@Param("page") Page<Map<String, Object>> page,
+ @Param("beginTime") String beginTime,
+ @Param("endTime") String endTime,
+ @Param("userName") String userName,
+ @Param("userPhone") String userPhone,
+ @Param("couponActivityId") Integer couponActivityId,
+ @Param("state") Integer state);
+
+ Map<String,Object> getCouponStatic(
+ @Param("beginTime") String beginTime,
+ @Param("endTime") String endTime,
+ @Param("activityId") Integer activityId,
+ @Param("activityType") Integer activityType);
+
+ Map<String,Object> getRedStatic(
+ @Param("beginTime") String beginTime,
+ @Param("endTime") String endTime,
+ @Param("activityId") Integer activityId);
+
+ Map<String,Object> getRegStatic(
+ @Param("beginTime") String beginTime,
+ @Param("endTime") String endTime,
+ @Param("activityId") Integer activityId);
+
+ Map<String,Object> getDiscountStatic(
+ @Param("beginTime") String beginTime,
+ @Param("endTime") String endTime,
+ @Param("activityId") Integer activityId);
+
+ List<Map<String,Object>> getBlanceList(@Param("page") Page<Map<String, Object>> page,
+ @Param("beginTime") String beginTime,
+ @Param("endTime") String endTime,
+ @Param("activityId") Integer activityId);
+
+
+ List<Map<String, Object>> queryCouponRegister(@Param("type") Integer type, @Param("name") String name,
+ @Param("start") String start, @Param("end") String end,
+ @Param("companyId") Integer companyId, @Param("offset") Integer offset,
+ @Param("limit") Integer limit);
+
+ int queryCouponRegisterCount(@Param("type") Integer type, @Param("name") String name,
+ @Param("start") String start, @Param("end") String end,
+ @Param("companyId") Integer companyId);
+
+
+
+ List<Map<String, Object>> queryCouponRegisterInfo(@Param("type") Integer type, @Param("name") String name,
+ @Param("start") String start, @Param("end") String end,
+ @Param("companyId") Integer companyId, @Param("offset") Integer offset,
+ @Param("limit") Integer limit);
+
+ int queryCouponRegisterInfoCount(@Param("type") Integer type, @Param("name") String name,
+ @Param("start") String start, @Param("end") String end,
+ @Param("companyId") Integer companyId);
+
+
+ List<Map<String, Object>> queryCouponRegisterInfo1(@Param("name") String name, @Param("start") String start,
+ @Param("end") String end, @Param("companyId") Integer companyId,
+ @Param("offset") Integer offset, @Param("limit") Integer limit);
+
+ int queryCouponRegisterInfo1Count(@Param("name") String name, @Param("start") String start,
+ @Param("end") String end, @Param("companyId") Integer companyId);
+
+
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/UserMapper.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/UserMapper.java
new file mode 100644
index 0000000..338a8b3
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/UserMapper.java
@@ -0,0 +1,61 @@
+package com.stylefeng.guns.modular.system.dao;
+
+import com.baomidou.mybatisplus.mapper.BaseMapper;
+
+import com.baomidou.mybatisplus.plugins.Page;
+import com.stylefeng.guns.core.datascope.DataScope;
+import com.stylefeng.guns.modular.system.model.User;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * 管理员表 Mapper 接口
+ * </p>
+ *
+ * @author stylefeng
+ * @since 2017-07-11
+ */
+public interface UserMapper extends BaseMapper<User> {
+
+ /**
+ * 修改用户状态
+ */
+ int setStatus(@Param("userId") Integer userId, @Param("status") int status);
+
+ /**
+ * 修改密码
+ */
+ int changePwd(@Param("userId") Integer userId, @Param("pwd") String pwd);
+
+ /**
+ * 根据条件查询用户列表
+ */
+ List<Map<String, Object>> selectUsers(@Param("dataScope") DataScope dataScope, @Param("name") String name, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("deptid") Integer deptid);
+
+ /**
+ * 设置用户的角色
+ */
+ int setRoles(@Param("userId") Integer userId, @Param("roleIds") String roleIds);
+
+ /**
+ * 通过账号获取用户
+ */
+ User getByAccount(@Param("account") String account);
+
+ /**
+ * 根据角色判断菜单有"首页"的数量
+ * @param roleStr
+ * @return
+ */
+ Integer getMenuNumByRole(@Param("roleStr") String roleStr);
+
+ List<Map<String,Object>> getUserListPage(@Param("page") Page<Map<String, Object>> page,
+ @Param("dataScope") DataScope dataScope,
+ @Param("name") String name,
+ @Param("beginTime") String beginTime,
+ @Param("endTime") String endTime,
+ @Param("deptid") Integer deptid);
+}
\ No newline at end of file
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/UserRedPacketRecordMapper.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/UserRedPacketRecordMapper.java
new file mode 100644
index 0000000..a661e54
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/UserRedPacketRecordMapper.java
@@ -0,0 +1,39 @@
+package com.stylefeng.guns.modular.system.dao;
+
+import com.baomidou.mybatisplus.mapper.BaseMapper;
+import com.stylefeng.guns.modular.system.model.UserRedPacketRecord;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+import java.util.Map;
+
+public interface UserRedPacketRecordMapper extends BaseMapper<UserRedPacketRecord> {
+
+
+ /**
+ * 获取红包统计
+ * @param name
+ * @param start
+ * @param end
+ * @param companyId
+ * @param offset
+ * @param limit
+ * @return
+ */
+ List<Map<String, Object>> queryRedEnvelopes(@Param("name") String name, @Param("start") String start,
+ @Param("end") String end, @Param("companyId") Integer companyId,
+ @Param("offset") Integer offset, @Param("limit") Integer limit);
+
+ int queryRedEnvelopesCount(@Param("name") String name, @Param("start") String start,
+ @Param("end") String end, @Param("companyId") Integer companyId);
+
+
+
+ List<Map<String, Object>> queryRedEnvelopesInfo(@Param("name") String name, @Param("start") String start,
+ @Param("end") String end, @Param("companyId") Integer companyId,
+ @Param("offset") Integer offset, @Param("limit") Integer limit);
+
+ int queryRedEnvelopesInfoCount(@Param("name") String name, @Param("start") String start,
+ @Param("end") String end, @Param("companyId") Integer companyId);
+
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/CarInsuranceMapper.xml b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/CarInsuranceMapper.xml
new file mode 100644
index 0000000..4ff65b5
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/CarInsuranceMapper.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.stylefeng.guns.modular.system.dao.CarInsuranceMapper">
+
+ <!-- 通用查询映射结果 -->
+ <resultMap id="BaseResultMap" type="com.stylefeng.guns.modular.system.model.CarInsurance">
+ <id column="id" property="id"/>
+ <result column="carId" property="carId"/>
+ <result column="insurCom" property="insurCom"/>
+ <result column="insurNum" property="insurNum"/>
+ <result column="insurType" property="insurType"/>
+ <result column="insurCount" property="insurCount"/>
+ <result column="insurEff" property="insurEff"/>
+ <result column="insurExp" property="insurExp"/>
+ </resultMap>
+
+
+ <select id="queryInsuranceList" resultType="map">
+ select
+ id as id,
+ insurCom as insurCom,
+ insurNum as insurNum,
+ insurType as insurType,
+ insurCount as insurCount,
+ DATE_FORMAT(insurEff, '%Y-%m-%d') as insurEff,
+ DATE_FORMAT(insurExp, '%Y-%m-%d') as insurExp
+ from t_car_insurance where carId = #{carId} order by insurEff desc limit #{offset}, #{limit}
+ </select>
+
+
+
+ <select id="queryInsuranceListCount" resultType="int">
+ select
+ count(id)
+ from t_car_insurance where carId = #{carId}
+ </select>
+</mapper>
\ No newline at end of file
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/DeptMapper.xml b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/DeptMapper.xml
new file mode 100644
index 0000000..c89d952
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/DeptMapper.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.stylefeng.guns.modular.system.dao.DeptMapper">
+
+ <!-- 通用查询映射结果 -->
+ <resultMap id="BaseResultMap" type="com.stylefeng.guns.modular.system.model.Dept">
+ <id column="id" property="id"/>
+ <result column="num" property="num"/>
+ <result column="pid" property="pid"/>
+ <result column="pids" property="pids"/>
+ <result column="simplename" property="simplename"/>
+ <result column="fullname" property="fullname"/>
+ <result column="tips" property="tips"/>
+ <result column="version" property="version"/>
+ </resultMap>
+
+ <select id="tree" resultType="com.stylefeng.guns.core.node.ZTreeNode">
+ select id,pid as pId,simplename as name,
+ (
+ CASE
+ WHEN (pId = 0 OR pId IS NULL) THEN
+ 'true'
+ ELSE
+ 'false'
+ END
+ ) as isOpen from sys_dept
+ </select>
+
+ <select id="list" resultType="map">
+ select * from sys_dept
+ <if test="condition != null and condition != ''">
+ where simplename like CONCAT('%',#{condition},'%') or fullname like CONCAT('%',#{condition},'%')
+ </if>
+ order by num ASC
+ </select>
+
+</mapper>
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/DictMapper.xml b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/DictMapper.xml
new file mode 100644
index 0000000..54742bd
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/DictMapper.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.stylefeng.guns.modular.system.dao.DictMapper">
+
+ <!-- 通用查询映射结果 -->
+ <resultMap id="BaseResultMap" type="com.stylefeng.guns.modular.system.model.Dict">
+ <id column="id" property="id"/>
+ <result column="num" property="num"/>
+ <result column="pid" property="pid"/>
+ <result column="name" property="name"/>
+ <result column="code" property="code"/>
+ <result column="tips" property="tips"/>
+ </resultMap>
+
+ <sql id="Base_Column_List">
+ id, num, pid, name,code,tips
+ </sql>
+
+ <select id="selectByCode" resultType="dict">
+ select
+ <include refid="Base_Column_List"/>
+ from sys_dict
+ where code = #{code}
+ </select>
+
+ <select id="selectByParentCode" resultType="dict">
+ select
+ <include refid="Base_Column_List"/>
+ from sys_dict
+ where pid in(select id from sys_dict where code = #{code}) order by num asc
+ </select>
+
+ <select id="list" resultType="map">
+ select * from sys_dict
+ where pid = 0
+ <if test="condition != null and condition != ''">
+ AND name like CONCAT('%',#{condition},'%')
+ </if>
+ order by id ASC
+ </select>
+
+</mapper>
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/DriverActivityHistoryMapper.xml b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/DriverActivityHistoryMapper.xml
new file mode 100644
index 0000000..9b7bb3a
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/DriverActivityHistoryMapper.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.stylefeng.guns.modular.system.dao.DriverActivityHistoryMapper">
+
+ <!-- 通用查询映射结果 -->
+ <resultMap id="BaseResultMap" type="com.stylefeng.guns.modular.system.model.DriverActivityHistory">
+ <id column="id" property="id" />
+ <result column="day" property="day" />
+ <result column="driverId" property="driverId" />
+ <result column="type" property="type" />
+ <result column="activityId" property="activityId" />
+ <result column="carryOut" property="carryOut" />
+ <result column="money" property="money" />
+ <result column="collectionTime" property="collectionTime"/>
+ <result column="insertTime" property="insertTime" />
+ </resultMap>
+
+ <!-- 通用查询结果列 -->
+ <sql id="Base_Column_List">
+ id, day, driverId, type, activityId, carryOut, money, insertTime
+ </sql>
+ <select id="getList" resultType="map" parameterType="com.baomidou.mybatisplus.plugins.Page">
+ SELECT
+ d.`name`,d.phone,h.insertTime,h.money,h.collectionTime
+ FROM
+ t_driver_activity_history h
+ LEFT JOIN t_driver d ON h.driverId = d.id
+ WHERE h.type=#{type} AND h.activityId=#{activityId} and carryOut=2
+ </select>
+</mapper>
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/DriverActivityMapper.xml b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/DriverActivityMapper.xml
new file mode 100644
index 0000000..d20a264
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/DriverActivityMapper.xml
@@ -0,0 +1,81 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.stylefeng.guns.modular.system.dao.DriverActivityMapper">
+
+ <!-- 通用查询映射结果 -->
+ <resultMap id="BaseResultMap" type="com.stylefeng.guns.modular.system.model.DriverActivity">
+ <id column="id" property="id" />
+ <result column="name" property="name" />
+ <result column="companyId" property="companyId" />
+ <result column="insertTime" property="insertTime" />
+ <result column="status" property="status" />
+ <result column="remark" property="remark" />
+ <result column="startTime" property="startTime" />
+ <result column="endTime" property="endTime" />
+ </resultMap>
+
+ <!-- 通用查询结果列 -->
+ <sql id="Base_Column_List">
+ id, name, companyId, insertTime, status, remark, startTime, endTime
+ </sql>
+ <select id="getList" resultType="map" parameterType="com.baomidou.mybatisplus.plugins.Page">
+ SELECT
+ a.*, IFNULL(o1.number, 0) + IFNULL(o2.number, 0) + IFNULL(o3.number, 0) number
+ FROM
+ t_driver_activity a
+ LEFT JOIN (
+ SELECT
+ COUNT(h.id) number,
+ o.driverActivityId
+ FROM
+ t_driver_activity_history h
+ LEFT JOIN t_driver_activity_online o ON h.activityId = o.id
+ WHERE
+ h.type = 3
+ AND h.carryOut=2
+ GROUP BY
+ o.driverActivityId
+ ) o1 ON o1.driverActivityId = a.id
+ LEFT JOIN (
+ SELECT
+ COUNT(h.id) number,
+ o.driverActivityId
+ FROM
+ t_driver_activity_history h
+ LEFT JOIN t_driver_activity_order o ON h.activityId = o.id
+ WHERE
+ h.type = 4
+ AND h.carryOut=2
+ GROUP BY
+ o.driverActivityId
+ ) o2 ON o2.driverActivityId = a.id
+ LEFT JOIN (
+ SELECT
+ COUNT(h.id) number,
+ o.driverActivityId
+ FROM
+ t_driver_activity_history h
+ LEFT JOIN t_driver_activity_registered o ON h.activityId = o.id
+ WHERE
+ h.type != 3
+ AND h.type != 4
+ AND h.carryOut=2
+ GROUP BY
+ o.driverActivityId
+ ) o3 ON o3.driverActivityId = a.id
+ WHERE 1=1
+ <if test="beginTime != null and beginTime !='' and endTime != null and endTime != ''">
+ and (a.insertTime between CONCAT(#{beginTime},' 00:00:00') and CONCAT(#{endTime},' 23:59:59'))
+ </if>
+ <if test="name != null and name !=''">
+ and a.name like CONCAT('%',#{name},'%')
+ </if>
+ <if test="companyType != null and companyType !='' and companyType!=1">
+ and a.companyType=#{companyType}
+ </if>
+ <if test="companyId != null and companyId !='' and companyType!=1">
+ and a.companyId=#{companyId}
+ </if>
+ order by a.id desc
+ </select>
+</mapper>
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/DriverActivityOnlineMapper.xml b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/DriverActivityOnlineMapper.xml
new file mode 100644
index 0000000..1cc8e21
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/DriverActivityOnlineMapper.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.stylefeng.guns.modular.system.dao.DriverActivityOnlineMapper">
+
+ <!-- 通用查询映射结果 -->
+ <resultMap id="BaseResultMap" type="com.stylefeng.guns.modular.system.model.DriverActivityOnline">
+ <id column="id" property="id" />
+ <result column="companyId" property="companyId" />
+ <result column="driverActivityId" property="driverActivityId" />
+ <result column="type" property="type" />
+ <result column="online" property="online" />
+ <result column="money" property="money" />
+ <result column="startTime" property="startTime" />
+ <result column="endTime" property="endTime" />
+ <result column="insertTime" property="insertTime" />
+ </resultMap>
+
+ <!-- 通用查询结果列 -->
+ <sql id="Base_Column_List">
+ id, companyId, driverActivityId, type, online, money, startTime, endTime, insertTime
+ </sql>
+
+</mapper>
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/DriverActivityOrderMapper.xml b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/DriverActivityOrderMapper.xml
new file mode 100644
index 0000000..ad8823d
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/DriverActivityOrderMapper.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.stylefeng.guns.modular.system.dao.DriverActivityOrderMapper">
+
+ <!-- 通用查询映射结果 -->
+ <resultMap id="BaseResultMap" type="com.stylefeng.guns.modular.system.model.DriverActivityOrder">
+ <id column="id" property="id" />
+ <result column="companyId" property="companyId" />
+ <result column="driverActivityId" property="driverActivityId" />
+ <result column="start" property="start" />
+ <result column="end" property="end" />
+ <result column="orderNum" property="orderNum" />
+ <result column="money" property="money" />
+ <result column="startTime" property="startTime" />
+ <result column="endTime" property="endTime" />
+ <result column="insertTime" property="insertTime" />
+ </resultMap>
+
+ <!-- 通用查询结果列 -->
+ <sql id="Base_Column_List">
+ id, companyId, driverActivityId, start, end, orderNum, money, startTime, endTime, insertTime
+ </sql>
+
+</mapper>
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/DriverActivityRegisteredMapper.xml b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/DriverActivityRegisteredMapper.xml
new file mode 100644
index 0000000..dcad653
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/DriverActivityRegisteredMapper.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.stylefeng.guns.modular.system.dao.DriverActivityRegisteredMapper">
+
+ <!-- 通用查询映射结果 -->
+ <resultMap id="BaseResultMap" type="com.stylefeng.guns.modular.system.model.DriverActivityRegistered">
+ <id column="id" property="id" />
+ <result column="companyId" property="companyId" />
+ <result column="driverActivityId" property="driverActivityId" />
+ <result column="type" property="type" />
+ <result column="money" property="money" />
+ <result column="startTime" property="startTime" />
+ <result column="endTime" property="endTime" />
+ <result column="insertTime" property="insertTime" />
+ </resultMap>
+
+ <!-- 通用查询结果列 -->
+ <sql id="Base_Column_List">
+ id, companyId, driverActivityId, type, money, startTime, endTime, insertTime
+ </sql>
+
+</mapper>
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/DriverOnlineMapper.xml b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/DriverOnlineMapper.xml
new file mode 100644
index 0000000..8350e61
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/DriverOnlineMapper.xml
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.stylefeng.guns.modular.system.dao.DriverOnlineMapper">
+
+ <!-- 通用查询映射结果 -->
+ <resultMap id="BaseResultMap" type="com.stylefeng.guns.modular.system.model.DriverOnline">
+ <id column="id" property="id" />
+ <result column="driverId" property="driverId" />
+ <result column="device" property="device" />
+ <result column="version" property="version"/>
+ <result column="insertTime" property="insertTime" />
+ <result column="lastTime" property="lastTime"/>
+ </resultMap>
+
+
+
+ <select id="queryOnlineDriver" resultType="map">
+ select
+ b.id as id,
+ b.headImgUrl as headImgUrl,
+ b.`name` as `name`,
+ b.phone as phone,
+ if(a.device = 1, '手机端', '车载端') as device,
+ a.version as version,
+ DATE_FORMAT(a.lastTime, '%Y-%m-%d %H:%i:%s') as insertTime
+ from t_driver_online a
+ left join t_driver b on (a.driverId = b.id)
+ where UNIX_TIMESTAMP(a.lastTime) > (UNIX_TIMESTAMP(now()) - 30)
+ <if test="null != name and '' != name">
+ and b.`name` like CONCAT('%', #{name}, '%')
+ </if>
+ <if test="null != phone and '' != phone">
+ and b.phone like CONCAT('%', #{phone}, '%')
+ </if>
+ order by a.insertTime desc
+ <if test="null != offset and null != limit">
+ limit #{offset}, #{limit}
+ </if>
+ </select>
+
+
+ <select id="queryOnlineDriverCount" resultType="int">
+ select
+ COUNT(a.id)
+ from t_driver_online a
+ left join t_driver b on (a.driverId = b.id)
+ where UNIX_TIMESTAMP(a.lastTime) > (UNIX_TIMESTAMP(now()) - 30)
+ <if test="null != name and '' != name">
+ and b.`name` like CONCAT('%', #{name}, '%')
+ </if>
+ <if test="null != phone and '' != phone">
+ and b.phone like CONCAT('%', #{phone}, '%')
+ </if>
+ </select>
+</mapper>
\ No newline at end of file
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/DriverPunishMapper.xml b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/DriverPunishMapper.xml
new file mode 100644
index 0000000..2a26c3f
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/DriverPunishMapper.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.stylefeng.guns.modular.system.dao.DriverPunishMapper">
+
+ <!-- 通用查询映射结果 -->
+ <resultMap id="BaseResultMap" type="com.stylefeng.guns.modular.system.model.DriverPunish">
+ <id column="id" property="id"/>
+ <result column="driverId" property="driverId"/>
+ <result column="punishTime" property="punishTime"/>
+ <result column="punishReason" property="punishReason"/>
+ <result column="punishReault" property="punishReault"/>
+ </resultMap>
+
+
+ <select id="queryAllPunish" resultType="DriverPunish">
+ select
+ id as id,
+ driverId as driverId,
+ punishTime as punishTime,
+ punishReason as punishReason,
+ punishReault as punishReault
+ from t_driver_punish where driverId = #{driverId}
+ </select>
+</mapper>
\ No newline at end of file
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/DriverTrainMapper.xml b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/DriverTrainMapper.xml
new file mode 100644
index 0000000..1c61dfb
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/DriverTrainMapper.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.stylefeng.guns.modular.system.dao.DriverTrainMapper">
+
+ <!-- 通用查询映射结果 -->
+ <resultMap id="BaseResultMap" type="com.stylefeng.guns.modular.system.model.DriverTrain">
+ <id column="id" property="id"/>
+ <result column="driverId" property="driverId"/>
+ <result column="courseName" property="courseName"/>
+ <result column="courseDate" property="courseDate"/>
+ <result column="startTime" property="startTime"/>
+ <result column="stopTime" property="stopTime"/>
+ <result column="duration" property="duration"/>
+ </resultMap>
+
+
+ <delete id="deleteByDriverId">
+ delete from t_driver_train where driverId = #{driverId}
+ </delete>
+
+
+ <select id="queryAllTrain" resultType="DriverTrain">
+ select
+ id as id,
+ driverId as driverId,
+ courseName as courseName,
+ courseDate as courseDate,
+ startTime as startTime,
+ stopTime as stopTime,
+ duration as duration
+ from t_driver_train where driverId = #{driverId}
+ </select>
+</mapper>
\ No newline at end of file
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/GDInterfaceMapper.xml b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/GDInterfaceMapper.xml
new file mode 100644
index 0000000..9f9cf25
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/GDInterfaceMapper.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.stylefeng.guns.modular.system.dao.GDInterfaceMapper">
+
+ <!-- 通用查询映射结果 -->
+ <resultMap id="BaseResultMap" type="com.stylefeng.guns.modular.system.model.GDInterface">
+ <id column="id" property="id"/>
+ <result column="name" property="name"/>
+ <result column="explanation" property="explanation"/>
+ <result column="num" property="num"/>
+ <result column="time" property="time"/>
+ </resultMap>
+
+
+ <select id="query" resultType="GDInterface">
+ select * from t_gdinterface where `name` like #{name} and explanation like #{explanation} and `time` = #{time}
+ </select>
+</mapper>
\ No newline at end of file
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/IncomeMapper.xml b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/IncomeMapper.xml
new file mode 100644
index 0000000..c672369
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/IncomeMapper.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.stylefeng.guns.modular.system.dao.IncomeMapper">
+
+ <!-- 通用查询映射结果 -->
+ <resultMap id="BaseResultMap" type="com.stylefeng.guns.modular.system.model.Income">
+ <id column="id" property="id"/>
+ <result column="userType" property="userType"/>
+ <result column="objectId" property="objectId"/>
+ <result column="type" property="type"/>
+ <result column="incomeId" property="incomeId"/>
+ <result column="orderType" property="orderType"/>
+ <result column="money" property="money"/>
+ <result column="insertTime" property="insertTime"/>
+ </resultMap>
+</mapper>
\ No newline at end of file
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/LineShiftDriverMapper.xml b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/LineShiftDriverMapper.xml
new file mode 100644
index 0000000..7bf58a9
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/LineShiftDriverMapper.xml
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.stylefeng.guns.modular.system.dao.LineShiftDriverMapper">
+
+ <!-- 通用查询映射结果 -->
+ <resultMap id="BaseResultMap" type="com.stylefeng.guns.modular.system.model.LineShiftDriver">
+ <id column="id" property="id"/>
+ <result column="lineShiftId" property="lineShiftId"/>
+ <result column="driverId" property="driverId"/>
+ <result column="day" property="day"/>
+ <result column="laveSeat" property="laveSeat"/>
+ <result column="laveSeatNumber" property="laveSeatNumber"/>
+ <result column="totalSeat" property="totalSeat"/>
+ <result column="inserTime" property="inserTime"/>
+ </resultMap>
+
+
+
+ <select id="query" resultType="LineShiftDriver">
+ select
+ id as id,
+ lineShiftId as lineShiftId,
+ driverId as driverId,
+ `day` as `day`,
+ laveSeat as laveSeat,
+ laveSeatNumber as laveSeatNumber,
+ totalSeat as totalSeat,
+ inserTime as inserTime
+ from t_line_shift_driver where 1 = 1
+ <if test="null != lineShiftId">
+ and lineShiftId = #{lineShiftId}
+ </if>
+ <if test="null != driverId">
+ and driverId = #{driverId}
+ </if>
+ <if test="null != time">
+ and DATE_FORMAT(`day`, '%Y-%m-%d') = DATE_FORMAT(#{time}, '%Y-%m-%d')
+ </if>
+ order by `day`
+ </select>
+
+
+ <select id="queryNotInLineShiftDriver" resultType="map">
+ select
+ d.id as id,
+ CONCAT(d.`name`, '-', d.phone) as `name`
+ from t_driver d
+ left join t_driver_line dl on (d.id = dl.driverId)
+ where d.authState = 2 and d.flag != 3 and dl.lineId in
+ (
+ select lineId from t_line_shift where id = #{lineShiftId}
+ )
+ and d.id not in
+ (
+ select lsd.driverId
+ from t_line_shift_driver lsd
+ left join t_line_shift ls on (lsd.lineShiftId = ls.id)
+ where ls.id = #{lineShiftId} and DATE_FORMAT(lsd.`day`, '%Y-%m-%d') = DATE_FORMAT(#{time}, '%Y-%m-%d')
+ )
+ </select>
+</mapper>
\ No newline at end of file
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/LoginLogMapper.xml b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/LoginLogMapper.xml
new file mode 100644
index 0000000..8c2e99d
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/LoginLogMapper.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.stylefeng.guns.modular.system.dao.LoginLogMapper">
+
+ <!-- 通用查询映射结果 -->
+ <resultMap id="BaseResultMap" type="com.stylefeng.guns.modular.system.model.LoginLog">
+ <id column="id" property="id" />
+ <result column="logname" property="logname" />
+ <result column="userid" property="userid" />
+ <result column="createtime" property="createtime" />
+ <result column="succeed" property="succeed" />
+ <result column="message" property="message" />
+ <result column="ip" property="ip" />
+ </resultMap>
+
+ <select id="getLoginLogs" resultType="map" parameterType="com.baomidou.mybatisplus.plugins.Page">
+ select l.*,u.`name` as userName from sys_login_log l
+ left join sys_user u on l.userid=u.id
+ where 1 = 1
+ <if test="beginTime != null and beginTime !='' and endTime != null and endTime != ''">
+ and (l.createTime between CONCAT(#{beginTime},' 00:00:00') and CONCAT(#{endTime},' 23:59:59'))
+ </if>
+ <if test="logName != null and logName !=''">
+ and u.`name` like CONCAT('%',#{logName},'%')
+ </if>
+ <choose>
+ <when test="orderByField != null and orderByField !=''">
+ <choose>
+ <when test="isAsc == true">
+ order by ${orderByField} ASC
+ </when>
+ <otherwise>
+ order by ${orderByField} DESC
+ </otherwise>
+ </choose>
+ </when>
+ <otherwise>
+ order by createtime DESC
+ </otherwise>
+ </choose>
+ </select>
+
+</mapper>
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/MenuMapper.xml b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/MenuMapper.xml
new file mode 100644
index 0000000..77e9729
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/MenuMapper.xml
@@ -0,0 +1,179 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.stylefeng.guns.modular.system.dao.MenuMapper">
+
+ <!-- 通用查询映射结果 -->
+ <resultMap id="BaseResultMap" type="com.stylefeng.guns.modular.system.model.Menu">
+ <id column="id" property="id" />
+ <result column="code" property="code" />
+ <result column="pcode" property="pcode" />
+ <result column="pcodes" property="pcodes" />
+ <result column="name" property="name" />
+ <result column="icon" property="icon" />
+ <result column="url" property="url" />
+ <result column="num" property="num" />
+ <result column="levels" property="levels" />
+ <result column="ismenu" property="ismenu" />
+ <result column="tips" property="tips" />
+ <result column="status" property="status" />
+ <result column="isopen" property="isopen" />
+ </resultMap>
+
+ <sql id="Base_Column_List">
+ id, code, pcode, name, icon, url, num, levels,pcodes,
+ tips, status,isopen,ismenu
+ </sql>
+
+ <select id="selectMenus" resultType="map">
+ select
+ <include refid="Base_Column_List" />
+ from sys_menu
+ where status = 1
+ <if test="condition != null and condition != ''">
+ and (name like CONCAT('%',#{condition},'%') or code like CONCAT('%',#{condition},'%'))
+ </if>
+ <if test="level != null and level != ''">
+ and levels = #{level}
+ </if>
+ </select>
+
+ <select id="getMenuIdsByRoleId" resultType="long">
+ select menuid from
+ sys_relation where roleid = #{roleId}
+ </select>
+
+ <select id="menuTreeList" resultType="com.stylefeng.guns.core.node.ZTreeNode">
+ SELECT
+ m1.id AS id,
+ (
+ CASE
+ WHEN (m2.id = 0 OR m2.id IS NULL) THEN
+ 0
+ ELSE
+ m2.id
+ END
+ ) AS pId,
+ m1. NAME
+ AS NAME,
+ (
+ CASE
+ WHEN (m2.id = 0 OR m2.id IS NULL) THEN
+ 'true'
+ ELSE
+ 'false'
+ END
+ ) as isOpen
+ FROM
+ sys_menu m1
+ LEFT join sys_menu m2 ON m1.pcode = m2. CODE
+ where m1.`status` = 1
+ ORDER BY
+ m1.id ASC
+ </select>
+
+ <select id="menuTreeListByMenuIds" resultType="com.stylefeng.guns.core.node.ZTreeNode">
+ SELECT
+ m1.id AS id,
+ (
+ CASE
+ WHEN (m2.id = 0 OR m2.id IS NULL) THEN
+ 0
+ ELSE
+ m2.id
+ END
+ ) AS pId,
+ m1. NAME AS NAME,
+ (
+ CASE
+ WHEN (m2.id = 0 OR m2.id IS
+ NULL) THEN
+ 'true'
+ ELSE
+ 'false'
+ END
+ ) as isOpen,
+ (
+ CASE
+ WHEN (m3.ID = 0 OR m3.ID
+ IS NULL) THEN
+ 'false'
+ ELSE
+ 'true'
+ END
+ ) "checked"
+ FROM
+ sys_menu m1
+ LEFT JOIN
+ sys_menu m2
+ ON m1.pcode = m2. CODE
+ left join (
+ SELECT
+ ID
+ FROM
+ sys_menu
+ WHERE
+ ID IN
+ <foreach collection="list" index="index" item="i" open="("
+ separator="," close=")">
+ #{i}
+ </foreach>
+ ) m3 on m1.id = m3.id
+ where m1.`status` = 1
+ ORDER BY
+ m1.id ASC
+ </select>
+
+ <delete id="deleteRelationByMenu">
+ delete from sys_relation where menuid = #{menuId}
+ </delete>
+
+ <select id="getResUrlsByRoleId" resultType="string">
+ select url from
+ sys_relation rel
+ inner join sys_menu m on rel.menuid = m.id
+ where rel.roleid = #{roleId}
+ </select>
+
+ <select id="getMenusByRoleIds" resultType="com.stylefeng.guns.core.node.MenuNode">
+ SELECT
+ m1.id AS id,
+ m1.icon AS icon,
+ (
+ CASE
+ WHEN (m2.id = 0 OR m2.id IS NULL) THEN
+ 0
+ ELSE
+ m2.id
+ END
+ ) AS parentId,
+ m1.NAME as name,
+ m1.url as url,
+ m1.levels as levels,
+ m1.ismenu as ismenu,
+ m1.num as num
+ FROM
+ sys_menu m1
+ LEFT join sys_menu m2 ON m1.pcode = m2. CODE
+ INNER JOIN (
+ SELECT
+ ID
+ FROM
+ sys_menu
+ WHERE
+ ID IN (
+ SELECT
+ menuid
+ FROM
+ sys_relation rela
+ WHERE
+ rela.roleid IN
+ <foreach collection="list" index="index" item="i" open="(" separator="," close=")">
+ #{i}
+ </foreach>
+ )
+ ) m3 ON m1.id = m3.id
+ where m1.ismenu = 1
+ order by levels,num asc
+ </select>
+
+</mapper>
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/NoticeMapper.xml b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/NoticeMapper.xml
new file mode 100644
index 0000000..6d4ba33
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/NoticeMapper.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.stylefeng.guns.modular.system.dao.NoticeMapper">
+
+ <!-- 通用查询映射结果 -->
+ <resultMap id="BaseResultMap" type="com.stylefeng.guns.modular.system.model.Notice">
+ <id column="id" property="id"/>
+ <result column="title" property="title"/>
+ <result column="type" property="type"/>
+ <result column="content" property="content"/>
+ <result column="createtime" property="createtime"/>
+ <result column="creater" property="creater"/>
+ </resultMap>
+
+ <select id="list" resultType="map">
+ select * from sys_notice
+ <if test="condition != null and condition != ''">
+ where title like CONCAT('%',#{condition},'%') or content like CONCAT('%',#{condition},'%')
+ </if>
+ order by createtime DESC
+ </select>
+
+</mapper>
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/OperationLogMapper.xml b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/OperationLogMapper.xml
new file mode 100644
index 0000000..23613ed
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/OperationLogMapper.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.stylefeng.guns.modular.system.dao.OperationLogMapper">
+
+ <!-- 通用查询映射结果 -->
+ <resultMap id="BaseResultMap" type="com.stylefeng.guns.modular.system.model.OperationLog">
+ <id column="id" property="id" />
+ <result column="logtype" property="logtype" />
+ <result column="logname" property="logname" />
+ <result column="userid" property="userid" />
+ <result column="classname" property="classname" />
+ <result column="method" property="method" />
+ <result column="createtime" property="createtime" />
+ <result column="succeed" property="succeed" />
+ <result column="message" property="message" />
+ </resultMap>
+
+ <select id="getOperationLogs" resultType="map">
+ select l.*,u.`name` as userName from sys_operation_log l
+ left join sys_user u on l.userid=u.id
+ where l.logtype = '业务日志'
+ <if test="beginTime != null and beginTime !='' and endTime != null and endTime != ''">
+ and (l.createTime between CONCAT(#{beginTime},' 00:00:00') and CONCAT(#{endTime},' 23:59:59'))
+ </if>
+ <if test="logName != null and logName !=''">
+ and u.name like CONCAT('%',#{logName},'%')
+ </if>
+ <if test="logType != null and logType !=''">
+ and logtype like CONCAT('%',#{logType},'%')
+ </if>
+ <choose>
+ <when test="orderByField != null and orderByField !=''">
+ <choose>
+ <when test="isAsc == true">
+ order by ${orderByField} ASC
+ </when>
+ <otherwise>
+ order by ${orderByField} DESC
+ </otherwise>
+ </choose>
+ </when>
+ <otherwise>
+ order by createtime DESC
+ </otherwise>
+ </choose>
+ </select>
+
+</mapper>
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/OrderCancelMapper.xml b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/OrderCancelMapper.xml
new file mode 100644
index 0000000..0d69378
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/OrderCancelMapper.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.stylefeng.guns.modular.system.dao.OrderCancelMapper">
+
+ <!-- 通用查询映射结果 -->
+ <resultMap id="BaseResultMap" type="com.stylefeng.guns.modular.system.model.OrderCancel">
+ <id column="id" property="id"/>
+ <result column="orderId" property="orderId"/>
+ <result column="orderType" property="orderType"/>
+ <result column="reason" property="reason"/>
+ <result column="remark" property="remark"/>
+ <result column="payType" property="payType"/>
+ <result column="money" property="money"/>
+ <result column="state" property="state"/>
+ <result column="insertTime" property="insertTime"/>
+ <result column="userType" property="userType"/>
+ <result column="userId" property="userId"/>
+ </resultMap>
+
+
+ <select id="query" resultType="OrderCancel">
+ select
+ id as id,
+ orderId as orderId,
+ orderType as orderType,
+ reason as reason,
+ remark as remark,
+ payType as payType,
+ money as money,
+ state as state,
+ insertTime as insertTime,
+ userType as userType
+ from t_order_cancel where 1 = 1
+ <if test="null != orderId">
+ and orderId = #{orderId}
+ </if>
+ <if test="null != orderType">
+ and orderType = #{orderType}
+ </if>
+ <if test="null != money">
+ and money = #{money}
+ </if>
+ <if test="null != payType">
+ and payType = #{payType}
+ </if>
+ <if test="null != state">
+ and state = #{state}
+ </if>
+ order by insertTime desc limit 0,1
+ </select>
+</mapper>
\ No newline at end of file
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/PaymentRecordMapper.xml b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/PaymentRecordMapper.xml
new file mode 100644
index 0000000..7a3b0f1
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/PaymentRecordMapper.xml
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.stylefeng.guns.modular.system.dao.PaymentRecordMapper">
+
+ <!-- 通用查询映射结果 -->
+ <resultMap id="BaseResultMap" type="com.stylefeng.guns.modular.system.model.PaymentRecord">
+ <id column="id" property="id"/>
+ <result column="category" property="category"/>
+ <result column="userId" property="userId"/>
+ <result column="type" property="type"/>
+ <result column="orderId" property="orderId"/>
+ <result column="orderType" property="orderType"/>
+ <result column="payType" property="payType"/>
+ <result column="amount" property="amount"/>
+ <result column="code" property="code"/>
+ <result column="state" property="state"/>
+ <result column="insertTime" property="insertTime"/>
+ </resultMap>
+
+
+ <select id="query" resultType="PaymentRecord">
+ select
+ id as id,
+ category as category,
+ userId as userId,
+ `type` as `type`,
+ orderId as orderId,
+ orderType as orderType,
+ payType as payType,
+ amount as amount,
+ code as code,
+ state as state,
+ insertTime as insertTime
+ from t_payment_record where category = #{category}
+ <if test="null != userId">
+ and userId = #{userId}
+ </if>
+ <if test="null != type">
+ and type = #{type}
+ </if>
+ <if test="null != orderId">
+ and orderId = #{orderId}
+ </if>
+ <if test="null != orderType">
+ and orderType = #{orderType}
+ </if>
+ <if test="null != payType">
+ and payType = #{payType}
+ </if>
+ <if test="null != state">
+ and state = #{state}
+ </if>
+ order by insertTime desc limit 0,1
+ </select>
+</mapper>
\ No newline at end of file
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/RegionMapper.xml b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/RegionMapper.xml
new file mode 100644
index 0000000..ddbc626
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/RegionMapper.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.stylefeng.guns.modular.system.dao.RegionMapper">
+
+ <!-- 通用查询映射结果 -->
+ <resultMap id="BaseResultMap" type="com.stylefeng.guns.modular.system.model.Region">
+ <id column="id" property="id" />
+ <result column="name" property="name" />
+ <result column="code" property="code" />
+ <result column="citycode" property="citycode" />
+ <result column="parent_id" property="parentId" />
+ <result column="english" property="english" />
+ </resultMap>
+
+ <!-- 通用查询结果列 -->
+ <sql id="Base_Column_List">
+ id, name, code, citycode, parent_id, english
+ </sql>
+
+</mapper>
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/RelationMapper.xml b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/RelationMapper.xml
new file mode 100644
index 0000000..2f4be0a
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/RelationMapper.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.stylefeng.guns.modular.system.dao.RelationMapper">
+
+ <!-- 通用查询映射结果 -->
+ <resultMap id="BaseResultMap" type="com.stylefeng.guns.modular.system.model.Relation">
+ <id column="id" property="id" />
+ <result column="menuid" property="menuid" />
+ <result column="roleid" property="roleid" />
+ </resultMap>
+
+</mapper>
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/RoleMapper.xml b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/RoleMapper.xml
new file mode 100644
index 0000000..c0afcd5
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/RoleMapper.xml
@@ -0,0 +1,78 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.stylefeng.guns.modular.system.dao.RoleMapper">
+
+ <!-- 通用查询映射结果 -->
+ <resultMap id="BaseResultMap" type="com.stylefeng.guns.modular.system.model.Role">
+ <id column="id" property="id" />
+ <result column="num" property="num" />
+ <result column="pid" property="pid" />
+ <result column="name" property="name" />
+ <result column="deptid" property="deptid" />
+ <result column="tips" property="tips" />
+ <result column="version" property="version" />
+ </resultMap>
+
+ <sql id="Base_Column_List">
+ id, num, pid, name, deptid, tips, version
+ </sql>
+
+ <select id="selectRoles" resultType="map">
+ select rr.*,(SELECT COUNT(id) from sys_user where FIND_IN_SET(rr.id,roleid)) as userCount
+ from sys_role as rr
+ <if test="condition != null">
+ where rr.name like CONCAT('%',#{condition},'%')
+ </if>
+ </select>
+
+ <delete id="deleteRolesById">
+ delete from sys_relation where roleid = #{roleId}
+ </delete>
+
+ <select id="roleTreeList" resultType="com.stylefeng.guns.core.node.ZTreeNode">
+ select id "id",pId
+ "pId",name as "name",(case when (pId=0 or pId is null) then 'true'
+ else 'false' end) "open" from sys_role
+ </select>
+
+ <select id="roleTreeListByRoleId" resultType="com.stylefeng.guns.core.node.ZTreeNode">
+ SELECT
+ r.id "id",
+ pId "pId",
+ NAME AS "name",
+ (
+ CASE
+ WHEN (pId = 0 OR pId IS NULL) THEN
+ 'true'
+ ELSE
+ 'false'
+ END
+ ) "open",
+ (
+ CASE
+ WHEN (r1.ID = 0 OR r1.ID IS NULL) THEN
+ 'false'
+ ELSE
+ 'true'
+ END
+ ) "checked"
+ FROM
+ sys_role r
+ LEFT JOIN (
+ SELECT
+ ID
+ FROM
+ sys_role
+ WHERE
+ ID IN
+
+ <foreach collection="array" index="index" item="i" open="(" separator="," close=")">
+ #{i}
+ </foreach>
+
+ ) r1 ON r.ID = r1.ID
+ ORDER BY
+ pId,
+ num ASC
+ </select>
+</mapper>
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/SysCouponActivityMapper.xml b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/SysCouponActivityMapper.xml
new file mode 100644
index 0000000..ffe0652
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/SysCouponActivityMapper.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.stylefeng.guns.modular.system.dao.SysCouponActivityMapper">
+
+ <!-- 通用查询映射结果 -->
+ <resultMap id="BaseResultMap" type="com.stylefeng.guns.modular.system.model.SysCouponActivity">
+ <id column="id" property="id" />
+ <result column="money" property="money" />
+ <result column="fullMoney" property="fullMoney" />
+ <result column="insertTime" property="insertTime" />
+ <result column="companyId" property="companyId" />
+ <result column="couponUseType" property="couponUseType" />
+ <result column="couponType" property="couponType" />
+ <result column="name" property="name" />
+ <result column="effective" property="effective" />
+ <result column="companyType" property="companyType" />
+ <result column="status" property="status" />
+ <result column="remark" property="remark" />
+ <result column="sendType" property="sendType" />
+ <result column="sendUserId" property="sendUserId" />
+ </resultMap>
+
+ <!-- 通用查询结果列 -->
+ <sql id="Base_Column_List">
+ id, money, fullMoney, insertTime, companyId, couponUseType, couponType, name, effective, companyType, status, remark, sendType, sendUserId
+ </sql>
+
+</mapper>
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/SysCouponRecordMapper.xml b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/SysCouponRecordMapper.xml
new file mode 100644
index 0000000..5308c5a
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/SysCouponRecordMapper.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.stylefeng.guns.modular.system.dao.SysCouponRecordMapper">
+
+ <!-- 通用查询映射结果 -->
+ <resultMap id="BaseResultMap" type="com.stylefeng.guns.modular.system.model.SysCouponRecord">
+ <id column="id" property="id" />
+ <result column="money" property="money" />
+ <result column="fullMoney" property="fullMoney" />
+ <result column="insertTime" property="insertTime" />
+ <result column="companyId" property="companyId" />
+ <result column="couponUseType" property="couponUseType" />
+ <result column="couponType" property="couponType" />
+ <result column="name" property="name" />
+ <result column="effective" property="effective" />
+ </resultMap>
+
+ <!-- 通用查询结果列 -->
+ <sql id="Base_Column_List">
+ id, money, fullMoney, insertTime, companyId, couponUseType, couponType, name, effective
+ </sql>
+
+</mapper>
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/SysRedPacketRecordMapper.xml b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/SysRedPacketRecordMapper.xml
new file mode 100644
index 0000000..4376c9d
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/SysRedPacketRecordMapper.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.stylefeng.guns.modular.system.dao.SysRedPacketRecordMapper">
+
+ <!-- 通用查询映射结果 -->
+ <resultMap id="BaseResultMap" type="com.stylefeng.guns.modular.system.model.SysRedPacketRecord">
+ <id column="id" property="id" />
+ <result column="money" property="money" />
+ <result column="insertTime" property="insertTime" />
+ <result column="companyId" property="companyId" />
+ <result column="name" property="name" />
+ <result column="type" property="type" />
+ <result column="totalMoney" property="totalMoney" />
+ <result column="laveMoney" property="laveMoney" />
+ <result column="startMoney" property="startMoney" />
+ <result column="endMoney" property="endMoney" />
+ <result column="effective" property="effective" />
+ <result column="companyType" property="companyType" />
+ </resultMap>
+
+ <!-- 通用查询结果列 -->
+ <sql id="Base_Column_List">
+ id, money, insertTime, companyId, name, type, totalMoney, laveMoney, startMoney, endMoney, effective, companyType
+ </sql>
+
+</mapper>
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TAdvertisementMapper.xml b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TAdvertisementMapper.xml
new file mode 100644
index 0000000..49d8dc5
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TAdvertisementMapper.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.stylefeng.guns.modular.system.dao.TAdvertisementMapper">
+
+ <!-- 通用查询映射结果 -->
+ <resultMap id="BaseResultMap" type="com.stylefeng.guns.modular.system.model.TAdvertisement">
+ <id column="id" property="id" />
+ <result column="name" property="name" />
+ <result column="imgUrl" property="imgUrl" />
+ <result column="type" property="type" />
+ <result column="isJump" property="isJump" />
+ <result column="jumpType" property="jumpType" />
+ <result column="jumpUrl" property="jumpUrl" />
+ <result column="content" property="content" />
+ <result column="flag" property="flag" />
+ <result column="insertTime" property="insertTime" />
+ <result column="insertUser" property="insertUser" />
+ <result column="updateTime" property="updateTime" />
+ <result column="updateUser" property="updateUser" />
+ </resultMap>
+
+ <!-- 通用查询结果列 -->
+ <sql id="Base_Column_List">
+ id, name, imgUrl, type, isJump, jumpType, jumpUrl, content, flag, insertTime, insertUser, updateTime, updateUser
+ </sql>
+
+ <!--根据条件查询广告列表-->
+ <select id="getAdvertisementList" resultType="map" parameterType="com.baomidou.mybatisplus.plugins.Page">
+ SELECT * FROM (SELECT rr.`name` as provinceName,aa.* FROM t_advertisement as aa
+ LEFT JOIN t_region as rr on rr.id = aa.provinceId) as o
+ <where>
+ 1=1
+ <if test="beginTime != null and beginTime != '' and endTime != null and endTime != ''">
+ AND (o.insertTime between CONCAT(#{beginTime},' 00:00:00') and CONCAT(#{endTime},' 23:59:59'))
+ </if>
+ <if test="type != null and type != ''">
+ and o.type = #{type}
+ </if>
+ <if test="name != null and name != ''">
+ and o.name LIKE CONCAT('%',#{name},'%')
+ </if>
+ </where>
+ order by o.id desc
+ </select>
+
+</mapper>
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TAgreementMapper.xml b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TAgreementMapper.xml
new file mode 100644
index 0000000..a7420de
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TAgreementMapper.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.stylefeng.guns.modular.system.dao.TAgreementMapper">
+
+ <!-- 通用查询映射结果 -->
+ <resultMap id="BaseResultMap" type="com.stylefeng.guns.modular.system.model.TAgreement">
+ <id column="id" property="id" />
+ <result column="useType" property="useType" />
+ <result column="content" property="content" />
+ <result column="type" property="type" />
+ <result column="flag" property="flag" />
+ <result column="insertTime" property="insertTime" />
+ <result column="insertUser" property="insertUser" />
+ <result column="updateTime" property="updateTime" />
+ <result column="updateUser" property="updateUser" />
+ </resultMap>
+
+ <!-- 通用查询结果列 -->
+ <sql id="Base_Column_List">
+ id, useType, content, type, flag, insertTime, insertUser, updateTime, updateUser
+ </sql>
+
+</mapper>
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TCarBrandMapper.xml b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TCarBrandMapper.xml
new file mode 100644
index 0000000..5b536bf
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TCarBrandMapper.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.stylefeng.guns.modular.system.dao.TCarBrandMapper">
+
+ <!-- 通用查询映射结果 -->
+ <resultMap id="BaseResultMap" type="com.stylefeng.guns.modular.system.model.TCarBrand">
+ <id column="id" property="id" />
+ <result column="name" property="name" />
+ <result column="imgUrl" property="imgUrl" />
+ <result column="remark" property="remark" />
+ <result column="createTime" property="createTime" />
+ <result column="state" property="state" />
+ </resultMap>
+
+ <!-- 通用查询结果列 -->
+ <sql id="Base_Column_List">
+ id, name, imgUrl, remark, insertTime, state
+ </sql>
+
+ <!--根据条件查询车辆品牌列表-->
+ <select id="getCarBrandList" resultType="map" parameterType="com.baomidou.mybatisplus.plugins.Page">
+ SELECT * FROM (SELECT IFNULL(cm.num,0) as modelNum,IFNULL(cc.num,0) as carNum,cb.* FROM t_car_brand as cb
+ LEFT JOIN (SELECT COUNT(id) as num,brandId FROM t_car_model WHERE state = 1 GROUP BY brandId) as cm on cm.brandId = cb.id
+ LEFT JOIN (SELECT COUNT(id) as num,carBrandId FROM t_car WHERE state = 1 GROUP BY carBrandId) as cc on cc.carBrandId = cb.id) as o
+ <where>
+ o.state = 1
+ <if test="beginTime != null and beginTime != '' and endTime != null and endTime != ''">
+ AND (o.insertTime between CONCAT(#{beginTime},' 00:00:00') and CONCAT(#{endTime},' 23:59:59'))
+ </if>
+ <if test="name != null and name != ''">
+ and o.name LIKE CONCAT('%',#{name},'%')
+ </if>
+ </where>
+ order by o.id desc
+ </select>
+
+</mapper>
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TCarMapper.xml b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TCarMapper.xml
new file mode 100644
index 0000000..dfe5234
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TCarMapper.xml
@@ -0,0 +1,144 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.stylefeng.guns.modular.system.dao.TCarMapper">
+
+ <!-- 通用查询映射结果 -->
+ <resultMap id="BaseResultMap" type="com.stylefeng.guns.modular.system.model.TCar">
+ <id column="id" property="id" />
+ <result column="isPlatCar" property="isPlatCar" />
+ <result column="companyId" property="companyId" />
+ <result column="franchiseeId" property="franchiseeId" />
+ <result column="carColor" property="carColor" />
+ <result column="carModelId" property="carModelId" />
+ <result column="carBrandId" property="carBrandId" />
+ <result column="carLicensePlate" property="carLicensePlate" />
+ <result column="carPhoto" property="carPhoto" />
+ <result column="drivingLicenseNumber" property="drivingLicenseNumber" />
+ <result column="drivingLicensePhoto" property="drivingLicensePhoto" />
+ <result column="annualInspectionTime" property="annualInspectionTime" />
+ <result column="commercialInsuranceTime" property="commercialInsuranceTime" />
+ <result column="createTime" property="createTime" />
+ <result column="state" property="state" />
+ <result column="addType" property="addType" />
+ <result column="addObjectId" property="addObjectId" />
+ <result column="plateColor" property="plateColor"/>
+ <result column="vehicleType" property="vehicleType"/>
+ <result column="ownerName" property="ownerName"/>
+ <result column="engineId" property="engineId"/>
+ <result column="VIN" property="VIN"/>
+ <result column="certifyDateA" property="certifyDateA"/>
+ <result column="fuelType" property="fuelType"/>
+ <result column="engineDisplace" property="engineDisplace"/>
+ <result column="certificate" property="certificate"/>
+ <result column="transAgency" property="transAgency"/>
+ <result column="transArea" property="transArea"/>
+ <result column="transDateStart" property="transDateStart"/>
+ <result column="transDateStop" property="transDateStop"/>
+ <result column="certifyDateB" property="certifyDateB"/>
+ <result column="fixState" property="fixState"/>
+ <result column="nextFixDate" property="nextFixDate"/>
+ <result column="checkState" property="checkState"/>
+ <result column="feePrintId" property="feePrintId"/>
+ <result column="GPSBrand" property="GPSBrand"/>
+ <result column="GPSModel" property="GPSModel"/>
+ <result column="GPSIMEI" property="GPSIMEI"/>
+ <result column="GPSInstallDate" property="GPSInstallDate"/>
+ <result column="registerDate" property="registerDate"/>
+ <result column="commercialType" property="commercialType"/>
+ </resultMap>
+
+ <!-- 通用查询结果列 -->
+ <sql id="Base_Column_List">
+ id, isPlatCar, companyId, franchiseeId, carColor, carModelId, carBrandId, carLicensePlate, carPhoto, drivingLicenseNumber, drivingLicensePhoto, annualInspectionTime, commercialInsuranceTime, createTime, state, addType, addObjectId
+ </sql>
+
+ <!--根据条件查询车辆列表-->
+ <select id="getCarList" resultType="map" parameterType="com.baomidou.mybatisplus.plugins.Page">
+ SELECT * FROM (SELECT ds.serverStr,cb.`name` as brandName,cm.`name` as modelName,c1.`name` as companyName,c2.`name` as franchiseeName,cm.seat,dd.`name` as driverName,cc.* from t_car as cc
+ LEFT JOIN (select * from t_car_brand where state = 1) as cb on cb.id = cc.carBrandId
+ LEFT JOIN (select * from t_car_model where state = 1) as cm on cm.id = cc.carModelId
+ LEFT JOIN (select * from t_company where type = 2 and flag != 3) as c1 on c1.id = cc.companyId
+ LEFT JOIN (select * from t_company where type = 3 and flag != 3) as c2 on c2.id = cc.franchiseeId
+ LEFT JOIN (
+ SELECT
+ GROUP_CONCAT(case when type = 1 then '专车'
+ when type = 2 then '出租车'
+ when type = 3 then '跨城出行'
+ when type = 4 then '小件物流-同城'
+ when type = 5 then '小件物流-跨城'
+ when type = 6 then '包车'
+ else '' end ) as serverStr,carId from t_car_service GROUP BY carId) as ds on ds.carId = cc.id
+ LEFT JOIN (select * from t_driver where flag != 3) AS dd on dd.carId = cc.id) as o
+ <where>
+ o.state = 1
+ <if test="beginTime != null and beginTime != '' and endTime != null and endTime != ''">
+ AND (o.insertTime between CONCAT(#{beginTime},' 00:00:00') and CONCAT(#{endTime},' 23:59:59'))
+ </if>
+ <if test="id != null and id != ''">
+ and o.id LIKE CONCAT('%',#{id},'%')
+ </if>
+ <if test="brandName != null and brandName != ''">
+ and o.brandName LIKE CONCAT('%',#{brandName},'%')
+ </if>
+ <if test="modelName != null and modelName != ''">
+ and o.modelName LIKE CONCAT('%',#{modelName},'%')
+ </if>
+ <if test="carColor != null and carColor != ''">
+ and o.carColor LIKE CONCAT('%',#{carColor},'%')
+ </if>
+ <if test="serverStr != null and serverStr != ''">
+ and o.serverStr LIKE CONCAT('%',#{serverStr},'%')
+ </if>
+ <if test="carLicensePlate != null and carLicensePlate != ''">
+ and o.carLicensePlate LIKE CONCAT('%',#{carLicensePlate},'%')
+ </if>
+ <if test="driverName != null and driverName != ''">
+ and o.driverName LIKE CONCAT('%',#{driverName},'%')
+ </if>
+ <if test="companyName != null and companyName != ''">
+ and o.companyName LIKE CONCAT('%',#{companyName},'%')
+ </if>
+ <if test="franchiseeName != null and franchiseeName != ''">
+ and o.franchiseeName LIKE CONCAT('%',#{franchiseeName},'%')
+ </if>
+ <if test="roleType != null and roleType != '' and roleType == 2">
+ and (o.companyId = #{nowUserId} or FIND_IN_SET(o.franchiseeId,(SELECT GROUP_CONCAT(id) as ids FROM t_company where superiorId = #{nowUserId} GROUP BY superiorId)))
+ </if>
+ <if test="roleType != null and roleType != '' and roleType == 3">
+ and o.franchiseeId = #{nowUserId}
+ </if>
+ </where>
+ order by o.id desc
+ </select>
+
+
+ <!--根据条件查询车辆列表不分页-->
+ <select id="getCarListNoPage" resultType="map">
+ SELECT * FROM (SELECT ds.serverStr,cb.`name` as brandName,cm.`name` as modelName,c1.`name` as companyName,c2.`name` as franchiseeName,cm.seat,dd.`name` as driverName,cc.* from t_car as cc
+ LEFT JOIN (select * from t_car_brand where state = 1) as cb on cb.id = cc.carBrandId
+ LEFT JOIN (select * from t_car_model where state = 1) as cm on cm.id = cc.carModelId
+ LEFT JOIN (select * from t_company where type = 2 and flag != 3) as c1 on c1.id = cc.companyId
+ LEFT JOIN (select * from t_company where type = 3 and flag != 3) as c2 on c2.id = cc.franchiseeId
+ LEFT JOIN (
+ SELECT
+ GROUP_CONCAT(case when type = 1 then '专车'
+ when type = 2 then '出租车'
+ when type = 3 then '跨城出行'
+ when type = 4 then '小件物流-同城'
+ when type = 5 then '小件物流-跨城'
+ when type = 6 then '包车'
+ else '' end ) as serverStr,carId from t_car_service GROUP BY carId) as ds on ds.carId = cc.id
+ LEFT JOIN (select * from t_driver where flag != 3) AS dd on dd.carId = cc.id) as o
+ <where>
+ o.state = 1
+ <if test="roleType != null and roleType != '' and roleType == 2">
+ and (o.companyId = #{nowUserId} or FIND_IN_SET(o.franchiseeId,(SELECT GROUP_CONCAT(id) as ids FROM t_company where superiorId = #{nowUserId} GROUP BY superiorId)))
+ </if>
+ <if test="roleType != null and roleType != '' and roleType == 3">
+ and o.franchiseeId = #{nowUserId}
+ </if>
+ </where>
+ order by o.id desc
+ </select>
+
+</mapper>
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TCarModelMapper.xml b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TCarModelMapper.xml
new file mode 100644
index 0000000..1923f05
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TCarModelMapper.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.stylefeng.guns.modular.system.dao.TCarModelMapper">
+
+ <!-- 通用查询映射结果 -->
+ <resultMap id="BaseResultMap" type="com.stylefeng.guns.modular.system.model.TCarModel">
+ <id column="id" property="id" />
+ <result column="name" property="name" />
+ <result column="remark" property="remark" />
+ <result column="insertTime" property="insertTime" />
+ <result column="state" property="state" />
+ <result column="seat" property="seat" />
+ <result column="brandId" property="brandId" />
+ </resultMap>
+
+ <!-- 通用查询结果列 -->
+ <sql id="Base_Column_List">
+ id, name, remark, insertTime, state, seat, brandId
+ </sql>
+
+ <!--根据条件查询车辆车型列表-->
+ <select id="getCarModelList" resultType="map" parameterType="com.baomidou.mybatisplus.plugins.Page">
+ SELECT * FROM (SELECT cb.`name` as brandName,IFNULL(cc.num,0) as carNum,cm.* FROM t_car_model as cm
+ LEFT JOIN (select * from t_car_brand where state = 1) as cb on cb.id = cm.brandId
+ LEFT JOIN (SELECT COUNT(id) as num,carModelId from t_car where state = 1 GROUP BY carModelId) as cc on cc.carModelId = cm.id) as o
+ <where>
+ o.state = 1
+ <if test="beginTime != null and beginTime != '' and endTime != null and endTime != ''">
+ AND (o.insertTime between CONCAT(#{beginTime},' 00:00:00') and CONCAT(#{endTime},' 23:59:59'))
+ </if>
+ <if test="name != null and name != ''">
+ and o.name LIKE CONCAT('%',#{name},'%')
+ </if>
+ </where>
+ order by o.id desc
+ </select>
+
+</mapper>
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TCarServiceMapper.xml b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TCarServiceMapper.xml
new file mode 100644
index 0000000..45b3d0e
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TCarServiceMapper.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.stylefeng.guns.modular.system.dao.TCarServiceMapper">
+
+ <!-- 通用查询映射结果 -->
+ <resultMap id="BaseResultMap" type="com.stylefeng.guns.modular.system.model.TCarService">
+ <id column="id" property="id" />
+ <result column="carId" property="carId" />
+ <result column="type" property="type" />
+ </resultMap>
+
+ <!-- 通用查询结果列 -->
+ <sql id="Base_Column_List">
+ id, carId, type
+ </sql>
+
+</mapper>
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TCompanyCityMapper.xml b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TCompanyCityMapper.xml
new file mode 100644
index 0000000..85309e5
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TCompanyCityMapper.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.stylefeng.guns.modular.system.dao.TCompanyCityMapper">
+
+ <!-- 通用查询映射结果 -->
+ <resultMap id="BaseResultMap" type="com.stylefeng.guns.modular.system.model.TCompanyCity">
+ <id column="id" property="id" />
+ <result column="companyId" property="companyId" />
+ <result column="provinceCode" property="provinceCode" />
+ <result column="cityCode" property="cityCode" />
+ <result column="areaCode" property="areaCode" />
+ <result column="state" property="state" />
+ </resultMap>
+
+ <!-- 通用查询结果列 -->
+ <sql id="Base_Column_List">
+ id, companyId, provinceCode, cityCode, areaCode, state
+ </sql>
+
+</mapper>
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TCompanyMapper.xml b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TCompanyMapper.xml
new file mode 100644
index 0000000..974bde6
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TCompanyMapper.xml
@@ -0,0 +1,635 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.stylefeng.guns.modular.system.dao.TCompanyMapper">
+
+ <!-- 通用查询映射结果 -->
+ <resultMap id="BaseResultMap" type="com.stylefeng.guns.modular.system.model.TCompany">
+ <id column="id" property="id" />
+ <result column="isSpe" property="isSpe" />
+ <result column="isTaxi" property="isTaxi" />
+ <result column="isCross" property="isCross" />
+ <result column="isCrossLogistics" property="isCrossLogistics" />
+ <result column="isSameLogistics" property="isSameLogistics" />
+ <result column="isCharter" property="isCharter" />
+ <result column="isSpeFixedOrProportional" property="isSpeFixedOrProportional" />
+ <result column="isTaxiFixedOrProportional" property="isTaxiFixedOrProportional" />
+ <result column="isCrossLogisticsFixedOrProportional" property="isCrossLogisticsFixedOrProportional" />
+ <result column="isSameLogisticsFixedOrProportional" property="isSameLogisticsFixedOrProportional" />
+ <result column="speMoney" property="speMoney" />
+ <result column="taxiMoney" property="taxiMoney" />
+ <result column="crossLogisticsMoney" property="crossLogisticsMoney" />
+ <result column="sameLogisticsMoney" property="sameLogisticsMoney" />
+ <result column="isNeedFerry" property="isNeedFerry" />
+ <result column="name" property="name" />
+ <result column="type" property="type" />
+ <result column="superiorId" property="superiorId" />
+ <result column="principalName" property="principalName" />
+ <result column="principalPhone" property="principalPhone" />
+ <result column="adminName" property="adminName" />
+ <result column="adminPhone" property="adminPhone" />
+ <result column="urgentPhoen" property="urgentPhoen" />
+ <result column="setupTime" property="setupTime" />
+ <result column="identifier" property="identifier" />
+ <result column="addressCode" property="addressCode" />
+ <result column="businessScope" property="businessScope" />
+ <result column="contactAddress" property="contactAddress" />
+ <result column="documentAddress" property="documentAddress" />
+ <result column="economicType" property="economicType" />
+ <result column="regCapital" property="regCapital" />
+ <result column="legalName" property="legalName" />
+ <result column="legalId" property="legalId" />
+ <result column="legalPhone" property="legalPhone" />
+ <result column="legalPhotoUrl" property="legalPhotoUrl" />
+ <result column="licensingAgency" property="licensingAgency" />
+ <result column="licenseTime" property="licenseTime" />
+ <result column="licenseStartTime" property="licenseStartTime" />
+ <result column="licenseEndTime" property="licenseEndTime" />
+ <result column="licenseNumber" property="licenseNumber" />
+ <result column="carNum" property="carNum" />
+ <result column="driverNum" property="driverNum" />
+ <result column="mac" property="mac" />
+ <result column="state" property="state" />
+ <result column="flag" property="flag" />
+ <result column="upload" property="upload" />
+ <result column="insertTime" property="insertTime" />
+ <result column="detailAddress" property="detailAddress" />
+ </resultMap>
+
+ <!-- 通用查询结果列 -->
+ <sql id="Base_Column_List">
+ id, isSpe, isTaxi, isCross, isCrossLogistics, isSameLogistics, isCharter, isSpeFixedOrProportional, isTaxiFixedOrProportional, isCrossLogisticsFixedOrProportional, isSameLogisticsFixedOrProportional, speMoney, taxiMoney, crossLogisticsMoney, sameLogisticsMoney, isNeedFerry, name, type, superiorId, principalName, principalPhone, adminName, adminPhone, urgentPhoen, setupTime, identifier, addressCode, businessScope, contactAddress, documentAddress, economicType, regCapital, legalName, legalId, legalPhone, legalPhotoUrl, licensingAgency, licenseTime, licenseStartTime, licenseEndTime, licenseNumber, carNum, driverNum, mac, state, flag, upload, insertTime, detailAddress
+ </sql>
+
+
+ <!--根据条件查询分公司列表-->
+ <select id="getCompanyList" resultType="map" parameterType="com.baomidou.mybatisplus.plugins.Page">
+ SELECT * FROM (SELECT ui.account,IFNULL(ci.num,0) as franchiseeNum,IFNULL(ca.num,0) as carNumber,IFNULL(di.num,0) as driverNumber,
+ CONCAT(case when cc.isSpe = 1 then '专车,' else '' end,
+ case when cc.isTaxi = 1 then '出租车,' else '' end,
+ case when cc.isCross = 1 then '跨城出行,' else '' end,
+ case when cc.isCrossLogistics = 1 then '跨城小件物流,' else '' end,
+ case when cc.isSameLogistics = 1 then '同城小件物流,' else '' end,
+ case when cc.isCharter = 1 then '包车,' else '' end) as serverStr,
+ cc.* FROM t_company as cc
+ LEFT JOIN (SELECT * FROM sys_user where roleType = 2) as ui on ui.objectId = cc.id
+ LEFT JOIN (SELECT COUNT(id) as num,superiorId FROM t_company where type = 3 and flag != 3 GROUP BY superiorId) as ci on ci.superiorId = cc.id
+ LEFT JOIN (SELECT COUNT(id) as num,companyId FROM t_car where state = 1 GROUP BY companyId) as ca on ca.companyId = cc.id
+ LEFT JOIN (SELECT COUNT(id) as num,companyId FROM t_driver where flag != 3 GROUP BY companyId) as di on di.companyId = cc.id
+ ) as o
+ <where>
+ o.type = 2 and o.flag != 3
+ <if test="beginTime != null and beginTime != '' and endTime != null and endTime != ''">
+ AND (o.insertTime between CONCAT(#{beginTime},' 00:00:00') and CONCAT(#{endTime},' 23:59:59'))
+ </if>
+ <if test="name != null and name != ''">
+ and o.name LIKE CONCAT('%',#{name},'%')
+ </if>
+ <if test="principalName != null and principalName != ''">
+ and o.principalName LIKE CONCAT('%',#{principalName},'%')
+ </if>
+ <if test="principalPhone != null and principalPhone != ''">
+ and o.principalPhone LIKE CONCAT('%',#{principalPhone},'%')
+ </if>
+ <if test="adminName != null and adminName != ''">
+ and o.adminName LIKE CONCAT('%',#{adminName},'%')
+ </if>
+ <if test="adminPhone != null and adminPhone != ''">
+ and o.adminPhone LIKE CONCAT('%',#{adminPhone},'%')
+ </if>
+ <if test="serviceStr != null and serviceStr != ''">
+ and o.serverStr LIKE CONCAT('%',#{serviceStr},'%')
+ </if>
+ <if test="state != null and state != '' and state == 1">
+ and o.state = 1
+ </if>
+ <if test="state != null and state != '' and state == 2">
+ and o.state = 0
+ </if>
+ </where>
+ order by o.id desc
+ </select>
+
+ <!--根据公司ID获取公司经营区域-->
+ <select id="getCompanyScopeById" resultType="map">
+ SELECT CONCAT(case when r1.`name` is not null then r1.`name` else '' end,
+ case when r2.`name` is not null then r2.`name` else '' end,
+ case when r3.`name` is not null then r3.`name` else '' end) as value,cc.* FROM t_company_city as cc
+ LEFT JOIN t_region as r1 on r1.code = cc.provinceCode
+ LEFT JOIN t_region as r2 on r2.code = cc.cityCode
+ LEFT JOIN t_region as r3 on r3.code = cc.areaCode
+ where cc.companyId = #{id} and cc.state = 1 order by id asc
+ </select>
+
+ <!--根据条件查询加盟商列表-->
+ <select id="getFranchiseeList" resultType="map" parameterType="com.baomidou.mybatisplus.plugins.Page">
+ SELECT * FROM (SELECT ui.account,ci.`name` as companyName,IFNULL(ca.num,0) as carNumber,IFNULL(di.num,0) as driverNumber,
+ CONCAT(case when cc.isSpe = 1 then '专车,' else '' end,
+ case when cc.isTaxi = 1 then '出租车,' else '' end,
+ case when cc.isCross = 1 then '跨城出行,' else '' end,
+ case when cc.isCrossLogistics = 1 then '跨城小件物流,' else '' end,
+ case when cc.isSameLogistics = 1 then '同城小件物流,' else '' end,
+ case when cc.isCharter = 1 then '包车,' else '' end) as serverStr,
+ cc.* FROM t_company as cc
+ LEFT JOIN (SELECT * FROM sys_user where roleType = 3) as ui on ui.objectId = cc.id
+ LEFT JOIN (select * from t_company where type = 2 and flag != 3) as ci on ci.id = cc.superiorId
+ LEFT JOIN (SELECT COUNT(id) as num,franchiseeId FROM t_car where state = 1 GROUP BY franchiseeId) as ca on ca.franchiseeId = cc.id
+ LEFT JOIN (SELECT COUNT(id) as num,franchiseeId FROM t_driver where flag != 3 GROUP BY franchiseeId) as di on di.franchiseeId = cc.id) as o
+ <where>
+ o.type = 3 and o.flag != 3
+ <if test="beginTime != null and beginTime != '' and endTime != null and endTime != ''">
+ AND (o.insertTime between CONCAT(#{beginTime},' 00:00:00') and CONCAT(#{endTime},' 23:59:59'))
+ </if>
+ <if test="name != null and name != ''">
+ and o.name LIKE CONCAT('%',#{name},'%')
+ </if>
+ <if test="account != null and account != ''">
+ and o.account LIKE CONCAT('%',#{account},'%')
+ </if>
+ <if test="principalName != null and principalName != ''">
+ and o.principalName LIKE CONCAT('%',#{principalName},'%')
+ </if>
+ <if test="principalPhone != null and principalPhone != ''">
+ and o.principalPhone LIKE CONCAT('%',#{principalPhone},'%')
+ </if>
+ <if test="serviceStr != null and serviceStr != ''">
+ and o.serverStr LIKE CONCAT('%',#{serviceStr},'%')
+ </if>
+ <if test="state != null and state != '' and state == 1">
+ and o.state = 1
+ </if>
+ <if test="state != null and state != '' and state == 2">
+ and o.state = 0
+ </if>
+ <if test="roleType != null and roleType != '' and roleType == 2">
+ and o.superiorId = #{nowUserId}
+ </if>
+ </where>
+ order by o.id desc
+ </select>
+
+
+ <select id="queryOperationalData" resultType="map">
+
+ select
+ *,
+ ROUND(if(orderNum != 0, cancelNum / orderNum, 0) * 100, 2) as cancelProportion,
+ (onlinePay + offlinePay) as total,
+ ROUND((onlinePay / (onlinePay + offlinePay)) * 100, 2) as payProportion
+ from (
+ select
+ aa.time,
+ sum(aa.register) as register,
+ sum(aa.`online`) as `online`,
+ sum(aa.orderNum) as orderNum,
+ sum(aa.cancelNum) as cancelNum,
+ sum(aa.onlinePay) as onlinePay,
+ sum(aa.offlinePay) as offlinePay,
+ sum(aa.money) as money,
+ sum(aa.complaint) as complaint
+ from (
+ select DATE_FORMAT(insertTime, '%Y-%m-%d') as time, count(id) as register, 0 as `online`, 0 as orderNum, 0 as cancelNum, 0 as onlinePay, 0 as offlinePay, 0 as money, 0 as complaint
+ from t_user
+ where flag != 3 and state = 1
+ <if test="null != companyId">
+ and companyId = #{companyId}
+ </if>
+ <if test="null != start and '' != start and null != end and '' != end">
+ and DATE_FORMAT(insertTime, '%Y-%m-%d') between #{start} and #{end}
+ </if>
+ group by DATE_FORMAT(insertTime, '%Y-%m-%d')
+ union all
+ select DATE_FORMAT(a.insertTime, '%Y-%m-%d') as time, 0, count(a.id) as `online`, 0 as orderNum, 0 as cancelNum, 0 as onlinePay, 0 as offlinePay, 0 as money, 0 as complaint
+ from t_driver_online a
+ left join t_driver b on (a.driverId = b.id)
+ where 1 = 1
+ <if test="null != companyId">
+ and if(b.franchiseeId is null or b.franchiseeId = 0, b.companyId = #{companyId}, b.franchiseeId = #{companyId})
+ </if>
+ <if test="null != start and '' != start and null != end and '' != end">
+ and DATE_FORMAT(a.insertTime, '%Y-%m-%d') between #{start} and #{end}
+ </if>
+ group by DATE_FORMAT(a.insertTime, '%Y-%m-%d')
+ union all
+ <if test="1 == type">
+ select DATE_FORMAT(travelTime, '%Y-%m-%d'), 0, 0, count(id), 0, 0, 0, 0, 0 from t_order_private_car where isDelete = 1
+ <if test="null != companyId">
+ and companyId = #{companyId}
+ </if>
+ <if test="null != start and '' != start and null != end and '' != end">
+ and DATE_FORMAT(travelTime, '%Y-%m-%d') between #{start} and #{end}
+ </if>
+ group by DATE_FORMAT(travelTime, '%Y-%m-%d')
+ union all
+ </if>
+ <if test="2 == type">
+ select DATE_FORMAT(travelTime, '%Y-%m-%d'), 0, 0, count(id), 0, 0, 0, 0, 0 from t_order_taxi where isDelete = 1
+ <if test="null != companyId">
+ and companyId = #{companyId}
+ </if>
+ <if test="null != start and '' != start and null != end and '' != end">
+ and DATE_FORMAT(travelTime, '%Y-%m-%d') between #{start} and #{end}
+ </if>
+ group by DATE_FORMAT(travelTime, '%Y-%m-%d')
+ union all
+ </if>
+ <if test="3 == type">
+ select DATE_FORMAT(travelTime, '%Y-%m-%d'), 0, 0, count(id), 0, 0, 0, 0, 0 from t_order_cross_city where isDelete = 1
+ <if test="null != companyId">
+ and companyId = #{companyId}
+ </if>
+ <if test="null != start and '' != start and null != end and '' != end">
+ and DATE_FORMAT(travelTime, '%Y-%m-%d') between #{start} and #{end}
+ </if>
+ group by DATE_FORMAT(travelTime, '%Y-%m-%d')
+ union all
+ </if>
+ <if test="4 == type">
+ select DATE_FORMAT(travelTime, '%Y-%m-%d'), 0, 0, count(id), 0, 0, 0, 0, 0 from t_order_logistics where isDelete = 1
+ <if test="null != companyId">
+ and companyId = #{companyId}
+ </if>
+ <if test="null != start and '' != start and null != end and '' != end">
+ and DATE_FORMAT(travelTime, '%Y-%m-%d') between #{start} and #{end}
+ </if>
+ group by DATE_FORMAT(travelTime, '%Y-%m-%d')
+ union all
+ </if>
+ <if test="type == 1">
+ select DATE_FORMAT(travelTime, '%Y-%m-%d'), 0, 0, 0, count(id), 0, 0, 0, 0 from t_order_private_car where isDelete = 1 and state in (10, 12)
+ <if test="null != companyId">
+ and companyId = #{companyId}
+ </if>
+ <if test="null != start and '' != start and null != end and '' != end">
+ and DATE_FORMAT(travelTime, '%Y-%m-%d') between #{start} and #{end}
+ </if>
+ group by DATE_FORMAT(travelTime, '%Y-%m-%d')
+ union all
+ </if>
+ <if test="type == 2">
+ select DATE_FORMAT(travelTime, '%Y-%m-%d'), 0, 0, 0, count(id), 0, 0, 0, 0 from t_order_taxi where isDelete = 1 and state in (10, 12)
+ <if test="null != companyId">
+ and companyId = #{companyId}
+ </if>
+ <if test="null != start and '' != start and null != end and '' != end">
+ and DATE_FORMAT(travelTime, '%Y-%m-%d') between #{start} and #{end}
+ </if>
+ group by DATE_FORMAT(travelTime, '%Y-%m-%d')
+ union all
+ </if>
+ <if test="type == 3">
+ select DATE_FORMAT(travelTime, '%Y-%m-%d'), 0, 0, 0, count(id), 0, 0, 0, 0 from t_order_cross_city where isDelete = 1 and state in (10, 12)
+ <if test="null != companyId">
+ and companyId = #{companyId}
+ </if>
+ <if test="null != start and '' != start and null != end and '' != end">
+ and DATE_FORMAT(travelTime, '%Y-%m-%d') between #{start} and #{end}
+ </if>
+ group by DATE_FORMAT(travelTime, '%Y-%m-%d')
+ union all
+ </if>
+ <if test="type == 4">
+ select DATE_FORMAT(travelTime, '%Y-%m-%d'), 0, 0, 0, count(id), 0, 0, 0, 0 from t_order_logistics where isDelete = 1 and state in (10, 12)
+ <if test="null != companyId">
+ and companyId = #{companyId}
+ </if>
+ <if test="null != start and '' != start and null != end and '' != end">
+ and DATE_FORMAT(travelTime, '%Y-%m-%d') between #{start} and #{end}
+ </if>
+ group by DATE_FORMAT(travelTime, '%Y-%m-%d')
+ union all
+ </if>
+ <if test="type == 1">
+ select DATE_FORMAT(travelTime, '%Y-%m-%d'), 0, 0, 0, 0, count(id), 0, sum(payMoney), 0 from t_order_private_car where isDelete = 1 and payManner = 1
+ <if test="null != companyId">
+ and companyId = #{companyId}
+ </if>
+ <if test="null != start and '' != start and null != end and '' != end">
+ and DATE_FORMAT(travelTime, '%Y-%m-%d') between #{start} and #{end}
+ </if>
+ group by DATE_FORMAT(travelTime, '%Y-%m-%d')
+ union all
+ </if>
+ <if test="type == 2">
+ select DATE_FORMAT(travelTime, '%Y-%m-%d'), 0, 0, 0, 0, count(id), 0, sum(payMoney), 0 from t_order_taxi where isDelete = 1 and payManner = 1
+ <if test="null != companyId">
+ and companyId = #{companyId}
+ </if>
+ <if test="null != start and '' != start and null != end and '' != end">
+ and DATE_FORMAT(travelTime, '%Y-%m-%d') between #{start} and #{end}
+ </if>
+ group by DATE_FORMAT(travelTime, '%Y-%m-%d')
+ union all
+ </if>
+ <if test="type == 3">
+ select DATE_FORMAT(travelTime, '%Y-%m-%d'), 0, 0, 0, 0, count(id), 0, sum(payMoney), 0 from t_order_cross_city where isDelete = 1 and payManner = 1
+ <if test="null != companyId">
+ and companyId = #{companyId}
+ </if>
+ <if test="null != start and '' != start and null != end and '' != end">
+ and DATE_FORMAT(travelTime, '%Y-%m-%d') between #{start} and #{end}
+ </if>
+ group by DATE_FORMAT(travelTime, '%Y-%m-%d')
+ union all
+ </if>
+ <if test="type == 4">
+ select DATE_FORMAT(travelTime, '%Y-%m-%d'), 0, 0, 0, 0, count(id), 0, sum(payMoney), 0 from t_order_logistics where isDelete = 1 and payManner = 1
+ <if test="null != companyId">
+ and companyId = #{companyId}
+ </if>
+ <if test="null != start and '' != start and null != end and '' != end">
+ and DATE_FORMAT(travelTime, '%Y-%m-%d') between #{start} and #{end}
+ </if>
+ group by DATE_FORMAT(travelTime, '%Y-%m-%d')
+ union all
+ </if>
+ <if test="type == 1">
+ select DATE_FORMAT(travelTime, '%Y-%m-%d'), 0, 0, 0, 0, 0, count(id), 0, 0 from t_order_private_car where isDelete = 1 and payManner = 2
+ <if test="null != companyId">
+ and companyId = #{companyId}
+ </if>
+ <if test="null != start and '' != start and null != end and '' != end">
+ and DATE_FORMAT(travelTime, '%Y-%m-%d') between #{start} and #{end}
+ </if>
+ group by DATE_FORMAT(travelTime, '%Y-%m-%d')
+ union all
+ </if>
+ <if test="type == 2">
+ select DATE_FORMAT(travelTime, '%Y-%m-%d'), 0, 0, 0, 0, 0, count(id), 0, 0 from t_order_taxi where isDelete = 1 and payManner = 2
+ <if test="null != companyId">
+ and companyId = #{companyId}
+ </if>
+ <if test="null != start and '' != start and null != end and '' != end">
+ and DATE_FORMAT(travelTime, '%Y-%m-%d') between #{start} and #{end}
+ </if>
+ group by DATE_FORMAT(travelTime, '%Y-%m-%d')
+ union all
+ </if>
+ <if test="type == 3">
+ select DATE_FORMAT(travelTime, '%Y-%m-%d'), 0, 0, 0, 0, 0, count(id), 0, 0 from t_order_cross_city where isDelete = 1 and payManner = 2
+ <if test="null != companyId">
+ and companyId = #{companyId}
+ </if>
+ <if test="null != start and '' != start and null != end and '' != end">
+ and DATE_FORMAT(travelTime, '%Y-%m-%d') between #{start} and #{end}
+ </if>
+ group by DATE_FORMAT(travelTime, '%Y-%m-%d')
+ union all
+ </if>
+ <if test="type == 4">
+ select DATE_FORMAT(travelTime, '%Y-%m-%d'), 0, 0, 0, 0, 0, count(id), 0, 0 from t_order_logistics where isDelete = 1 and payManner = 2
+ <if test="null != companyId">
+ and companyId = #{companyId}
+ </if>
+ <if test="null != start and '' != start and null != end and '' != end">
+ and DATE_FORMAT(travelTime, '%Y-%m-%d') between #{start} and #{end}
+ </if>
+ group by DATE_FORMAT(travelTime, '%Y-%m-%d')
+ union all
+ </if>
+ select DATE_FORMAT(a.insert_time, '%Y-%m-%d'), 0, 0, 0, 0, 0, 0, 0, count(a.id) from t_complaint a
+ left join t_driver b on (a.driverId = b.id)
+ where 1 = 1
+ <if test="null != companyId">
+ and if(b.franchiseeId is null or b.franchiseeId = 0, b.companyId = #{companyId}, b.franchiseeId = #{companyId})
+ </if>
+ <if test="null != start and '' != start and null != end and '' != end">
+ and DATE_FORMAT(a.insert_time, '%Y-%m-%d') between #{start} and #{end}
+ </if>
+ group by DATE_FORMAT(a.insert_time, '%Y-%m-%d')
+ ) as aa group by aa.time
+ ) as da order by `time` desc
+ <if test="null != offset and null != limit">
+ limit #{offset}, #{limit}
+ </if>
+ </select>
+
+
+
+ <select id="queryOperationalDataCount" resultType="int">
+
+ select
+ count(`time`)
+ from (
+ select
+ aa.time,
+ sum(aa.register) as register,
+ sum(aa.`online`) as `online`,
+ sum(aa.orderNum) as orderNum,
+ sum(aa.cancelNum) as cancelNum,
+ sum(aa.onlinePay) as onlinePay,
+ sum(aa.offlinePay) as offlinePay,
+ sum(aa.money) as money,
+ sum(aa.complaint) as complaint
+ from (
+ select DATE_FORMAT(insertTime, '%Y-%m-%d') as time, count(id) as register, 0 as `online`, 0 as orderNum, 0 as cancelNum, 0 as onlinePay, 0 as offlinePay, 0 as money, 0 as complaint
+ from t_user
+ where flag != 3 and state = 1
+ <if test="null != companyId">
+ and companyId = #{companyId}
+ </if>
+ <if test="null != start and '' != start and null != end and '' != end">
+ and DATE_FORMAT(insertTime, '%Y-%m-%d') between #{start} and #{end}
+ </if>
+ group by DATE_FORMAT(insertTime, '%Y-%m-%d')
+ union all
+ select DATE_FORMAT(a.insertTime, '%Y-%m-%d') as time, 0, count(a.id) as `online`, 0 as orderNum, 0 as cancelNum, 0 as onlinePay, 0 as offlinePay, 0 as money, 0 as complaint from t_driver_online a
+ left join t_driver b on (a.driverId = b.id)
+ where 1 = 1
+ <if test="null != companyId">
+ and if(b.franchiseeId is null or b.franchiseeId = 0, b.companyId = #{companyId}, b.franchiseeId = #{companyId})
+ </if>
+ <if test="null != start and '' != start and null != end and '' != end">
+ and DATE_FORMAT(a.insertTime, '%Y-%m-%d') between #{start} and #{end}
+ </if>
+ group by DATE_FORMAT(a.insertTime, '%Y-%m-%d')
+ union all
+ <if test="1 == type">
+ select DATE_FORMAT(travelTime, '%Y-%m-%d'), 0, 0, count(id), 0, 0, 0, 0, 0 from t_order_private_car where isDelete = 1
+ <if test="null != companyId">
+ and companyId = #{companyId}
+ </if>
+ <if test="null != start and '' != start and null != end and '' != end">
+ and DATE_FORMAT(travelTime, '%Y-%m-%d') between #{start} and #{end}
+ </if>
+ group by DATE_FORMAT(travelTime, '%Y-%m-%d')
+ union all
+ </if>
+ <if test="2 == type">
+ select DATE_FORMAT(travelTime, '%Y-%m-%d'), 0, 0, count(id), 0, 0, 0, 0, 0 from t_order_taxi where isDelete = 1
+ <if test="null != companyId">
+ and companyId = #{companyId}
+ </if>
+ <if test="null != start and '' != start and null != end and '' != end">
+ and DATE_FORMAT(travelTime, '%Y-%m-%d') between #{start} and #{end}
+ </if>
+ group by DATE_FORMAT(travelTime, '%Y-%m-%d')
+ union all
+ </if>
+ <if test="3 == type">
+ select DATE_FORMAT(travelTime, '%Y-%m-%d'), 0, 0, count(id), 0, 0, 0, 0, 0 from t_order_cross_city where isDelete = 1
+ <if test="null != companyId">
+ and companyId = #{companyId}
+ </if>
+ <if test="null != start and '' != start and null != end and '' != end">
+ and DATE_FORMAT(travelTime, '%Y-%m-%d') between #{start} and #{end}
+ </if>
+ group by DATE_FORMAT(travelTime, '%Y-%m-%d')
+ union all
+ </if>
+ <if test="4 == type">
+ select DATE_FORMAT(travelTime, '%Y-%m-%d'), 0, 0, count(id), 0, 0, 0, 0, 0 from t_order_logistics where isDelete = 1
+ <if test="null != companyId">
+ and companyId = #{companyId}
+ </if>
+ <if test="null != start and '' != start and null != end and '' != end">
+ and DATE_FORMAT(travelTime, '%Y-%m-%d') between #{start} and #{end}
+ </if>
+ group by DATE_FORMAT(travelTime, '%Y-%m-%d')
+ union all
+ </if>
+ <if test="type == 1">
+ select DATE_FORMAT(travelTime, '%Y-%m-%d'), 0, 0, 0, count(id), 0, 0, 0, 0 from t_order_private_car where isDelete = 1 and state in (10, 12)
+ <if test="null != companyId">
+ and companyId = #{companyId}
+ </if>
+ <if test="null != start and '' != start and null != end and '' != end">
+ and DATE_FORMAT(travelTime, '%Y-%m-%d') between #{start} and #{end}
+ </if>
+ group by DATE_FORMAT(travelTime, '%Y-%m-%d')
+ union all
+ </if>
+ <if test="type == 2">
+ select DATE_FORMAT(travelTime, '%Y-%m-%d'), 0, 0, 0, count(id), 0, 0, 0, 0 from t_order_taxi where isDelete = 1 and state in (10, 12)
+ <if test="null != companyId">
+ and companyId = #{companyId}
+ </if>
+ <if test="null != start and '' != start and null != end and '' != end">
+ and DATE_FORMAT(travelTime, '%Y-%m-%d') between #{start} and #{end}
+ </if>
+ group by DATE_FORMAT(travelTime, '%Y-%m-%d')
+ union all
+ </if>
+ <if test="type == 3">
+ select DATE_FORMAT(travelTime, '%Y-%m-%d'), 0, 0, 0, count(id), 0, 0, 0, 0 from t_order_cross_city where isDelete = 1 and state in (10, 12)
+ <if test="null != companyId">
+ and companyId = #{companyId}
+ </if>
+ <if test="null != start and '' != start and null != end and '' != end">
+ and DATE_FORMAT(travelTime, '%Y-%m-%d') between #{start} and #{end}
+ </if>
+ group by DATE_FORMAT(travelTime, '%Y-%m-%d')
+ union all
+ </if>
+ <if test="type == 4">
+ select DATE_FORMAT(travelTime, '%Y-%m-%d'), 0, 0, 0, count(id), 0, 0, 0, 0 from t_order_logistics where isDelete = 1 and state in (10, 12)
+ <if test="null != companyId">
+ and companyId = #{companyId}
+ </if>
+ <if test="null != start and '' != start and null != end and '' != end">
+ and DATE_FORMAT(travelTime, '%Y-%m-%d') between #{start} and #{end}
+ </if>
+ group by DATE_FORMAT(travelTime, '%Y-%m-%d')
+ union all
+ </if>
+ <if test="type == 1">
+ select DATE_FORMAT(travelTime, '%Y-%m-%d'), 0, 0, 0, 0, count(id), 0, sum(payMoney), 0 from t_order_private_car where isDelete = 1 and payManner = 1
+ <if test="null != companyId">
+ and companyId = #{companyId}
+ </if>
+ <if test="null != start and '' != start and null != end and '' != end">
+ and DATE_FORMAT(travelTime, '%Y-%m-%d') between #{start} and #{end}
+ </if>
+ group by DATE_FORMAT(travelTime, '%Y-%m-%d')
+ union all
+ </if>
+ <if test="type == 2">
+ select DATE_FORMAT(travelTime, '%Y-%m-%d'), 0, 0, 0, 0, count(id), 0, sum(payMoney), 0 from t_order_taxi where isDelete = 1 and payManner = 1
+ <if test="null != companyId">
+ and companyId = #{companyId}
+ </if>
+ <if test="null != start and '' != start and null != end and '' != end">
+ and DATE_FORMAT(travelTime, '%Y-%m-%d') between #{start} and #{end}
+ </if>
+ group by DATE_FORMAT(travelTime, '%Y-%m-%d')
+ union all
+ </if>
+ <if test="type == 3">
+ select DATE_FORMAT(travelTime, '%Y-%m-%d'), 0, 0, 0, 0, count(id), 0, sum(payMoney), 0 from t_order_cross_city where isDelete = 1 and payManner = 1
+ <if test="null != companyId">
+ and companyId = #{companyId}
+ </if>
+ <if test="null != start and '' != start and null != end and '' != end">
+ and DATE_FORMAT(travelTime, '%Y-%m-%d') between #{start} and #{end}
+ </if>
+ group by DATE_FORMAT(travelTime, '%Y-%m-%d')
+ union all
+ </if>
+ <if test="type == 4">
+ select DATE_FORMAT(travelTime, '%Y-%m-%d'), 0, 0, 0, 0, count(id), 0, sum(payMoney), 0 from t_order_logistics where isDelete = 1 and payManner = 1
+ <if test="null != companyId">
+ and companyId = #{companyId}
+ </if>
+ <if test="null != start and '' != start and null != end and '' != end">
+ and DATE_FORMAT(travelTime, '%Y-%m-%d') between #{start} and #{end}
+ </if>
+ group by DATE_FORMAT(travelTime, '%Y-%m-%d')
+ union all
+ </if>
+ <if test="type == 1">
+ select DATE_FORMAT(travelTime, '%Y-%m-%d'), 0, 0, 0, 0, 0, count(id), 0, 0 from t_order_private_car where isDelete = 1 and payManner = 2
+ <if test="null != companyId">
+ and companyId = #{companyId}
+ </if>
+ <if test="null != start and '' != start and null != end and '' != end">
+ and DATE_FORMAT(travelTime, '%Y-%m-%d') between #{start} and #{end}
+ </if>
+ group by DATE_FORMAT(travelTime, '%Y-%m-%d')
+ union all
+ </if>
+ <if test="type == 2">
+ select DATE_FORMAT(travelTime, '%Y-%m-%d'), 0, 0, 0, 0, 0, count(id), 0, 0 from t_order_taxi where isDelete = 1 and payManner = 2
+ <if test="null != companyId">
+ and companyId = #{companyId}
+ </if>
+ <if test="null != start and '' != start and null != end and '' != end">
+ and DATE_FORMAT(travelTime, '%Y-%m-%d') between #{start} and #{end}
+ </if>
+ group by DATE_FORMAT(travelTime, '%Y-%m-%d')
+ union all
+ </if>
+ <if test="type == 3">
+ select DATE_FORMAT(travelTime, '%Y-%m-%d'), 0, 0, 0, 0, 0, count(id), 0, 0 from t_order_cross_city where isDelete = 1 and payManner = 2
+ <if test="null != companyId">
+ and companyId = #{companyId}
+ </if>
+ <if test="null != start and '' != start and null != end and '' != end">
+ and DATE_FORMAT(travelTime, '%Y-%m-%d') between #{start} and #{end}
+ </if>
+ group by DATE_FORMAT(travelTime, '%Y-%m-%d')
+ union all
+ </if>
+ <if test="type == 4">
+ select DATE_FORMAT(travelTime, '%Y-%m-%d'), 0, 0, 0, 0, 0, count(id), 0, 0 from t_order_logistics where isDelete = 1 and payManner = 2
+ <if test="null != companyId">
+ and companyId = #{companyId}
+ </if>
+ <if test="null != start and '' != start and null != end and '' != end">
+ and DATE_FORMAT(travelTime, '%Y-%m-%d') between #{start} and #{end}
+ </if>
+ group by DATE_FORMAT(travelTime, '%Y-%m-%d')
+ union all
+ </if>
+ select DATE_FORMAT(a.insert_time, '%Y-%m-%d'), 0, 0, 0, 0, 0, 0, 0, count(a.id) from t_complaint a
+ left join t_driver b on (a.driverId = b.id)
+ where 1 = 1
+ <if test="null != companyId">
+ and if(b.franchiseeId is null or b.franchiseeId = 0, b.companyId = #{companyId}, b.franchiseeId = #{companyId})
+ </if>
+ <if test="null != start and '' != start and null != end and '' != end">
+ and DATE_FORMAT(a.insert_time, '%Y-%m-%d') between #{start} and #{end}
+ </if>
+ group by DATE_FORMAT(a.insert_time, '%Y-%m-%d')
+ ) as aa group by aa.time
+ ) as da order by `time` desc
+ </select>
+</mapper>
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TComplaintMapper.xml b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TComplaintMapper.xml
new file mode 100644
index 0000000..2c882fe
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TComplaintMapper.xml
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.stylefeng.guns.modular.system.dao.TComplaintMapper">
+
+ <!-- 通用查询映射结果 -->
+ <resultMap id="BaseResultMap" type="com.stylefeng.guns.modular.system.model.TComplaint">
+ <id column="id" property="id" />
+ <result column="userId" property="userId" />
+ <result column="reason" property="reason" />
+ <result column="driverId" property="driverId" />
+ <result column="description" property="description" />
+ <result column="isHandle" property="isHandle" />
+ <result column="insert_time" property="insertTime" />
+ <result column="handleResult" property="handleResult" />
+ <result column="handleUserId" property="handleUserId" />
+ </resultMap>
+
+ <!-- 通用查询结果列 -->
+ <sql id="Base_Column_List">
+ id, userId, reason, driverId, description, isHandle, insert_time, handleResult, handleUserId
+ </sql>
+
+ <!--根据条件查询投诉列表-->
+ <select id="getComplaintList" resultType="map" parameterType="com.baomidou.mybatisplus.plugins.Page">
+ SELECT * FROM (SELECT di.companyId,di.franchiseeId,ui.nickName as userName,ui.phone as userPhone,di.`name` as driverName,di.phone as driverPhone,si.`name` as handleUserName,cc.* FROM t_complaint as cc
+ LEFT JOIN (select * from t_user where flag != 3) as ui on ui.id = cc.userId
+ LEFT JOIN (select * from t_driver where flag != 3) as di on di.id = cc.driverId
+ LEFT JOIN sys_user as si on si.id = cc.handleUserId
+ ) as o
+ <where>
+ 1 = 1
+ <if test="beginTime != null and beginTime != '' and endTime != null and endTime != ''">
+ AND (o.insert_time between CONCAT(#{beginTime},' 00:00:00') and CONCAT(#{endTime},' 23:59:59'))
+ </if>
+ <if test="userName != null and userName != ''">
+ and o.userName LIKE CONCAT('%',#{userName},'%')
+ </if>
+ <if test="userPhone != null and userPhone != ''">
+ and o.userPhone LIKE CONCAT('%',#{userPhone},'%')
+ </if>
+ <if test="driverPhone != null and driverPhone != ''">
+ and o.driverPhone LIKE CONCAT('%',#{driverPhone},'%')
+ </if>
+ <if test="isHandle != null and isHandle != '' and isHandle == 2">
+ and o.isHandle = 0
+ </if>
+ <if test="isHandle != null and isHandle != '' and isHandle == 1">
+ and o.isHandle = 1
+ </if>
+ <if test="roleType != null and roleType != '' and roleType == 2">
+ and o.companyId = #{nowUserId} and (o.franchiseeId = 0 or o.franchiseeId is null)
+ </if>
+ <if test="roleType != null and roleType != '' and roleType == 3">
+ and o.franchiseeId = #{nowUserId}
+ </if>
+ </where>
+ order by o.id desc
+ </select>
+
+</mapper>
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TDispatchMapper.xml b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TDispatchMapper.xml
new file mode 100644
index 0000000..fd5433c
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TDispatchMapper.xml
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.stylefeng.guns.modular.system.dao.TDispatchMapper">
+
+ <!-- 通用查询映射结果 -->
+ <resultMap id="BaseResultMap" type="com.stylefeng.guns.modular.system.model.TDispatch">
+ <id column="id" property="id" />
+ <result column="insertTime" property="insertTime" />
+ <result column="name" property="name" />
+ <result column="companyId" property="companyId" />
+ <result column="franchiseeId" property="franchiseeId" />
+ <result column="phone" property="phone" />
+ <result column="account" property="account" />
+ <result column="password" property="password" />
+ <result column="insertUserId" property="insertUserId" />
+ <result column="insertUserRole" property="insertUserRole" />
+ <result column="state" property="state" />
+ </resultMap>
+
+ <!-- 通用查询结果列 -->
+ <sql id="Base_Column_List">
+ id, insertTime, name, companyId, franchiseeId, phone, account, password, insertUserId, insertUserRole, state
+ </sql>
+
+ <!--根据条件查询调度列表-->
+ <select id="getDispatchList" resultType="map" parameterType="com.baomidou.mybatisplus.plugins.Page">
+ SELECT * FROM (SELECT c1.name as companyName,c2.name as franchiseeName,dd.* FROM t_dispatch as dd
+ LEFT JOIN (select * from t_company where type = 2 and flag != 3) as c1 on c1.id = dd.companyId
+ LEFT JOIN (select * from t_company where type = 3 and flag != 3) as c2 on c2.id = dd.franchiseeId) as o
+ <where>
+ o.state != 3
+ <if test="beginTime != null and beginTime != '' and endTime != null and endTime != ''">
+ AND (o.insertTime between CONCAT(#{beginTime},' 00:00:00') and CONCAT(#{endTime},' 23:59:59'))
+ </if>
+ <if test="name != null and name != ''">
+ and o.name LIKE CONCAT('%',#{name},'%')
+ </if>
+ <if test="companyName != null and companyName != ''">
+ and o.companyName LIKE CONCAT('%',#{companyName},'%')
+ </if>
+ <if test="franchiseeName != null and franchiseeName != ''">
+ and o.franchiseeName LIKE CONCAT('%',#{franchiseeName},'%')
+ </if>
+ <if test="account != null and account != ''">
+ and o.account LIKE CONCAT('%',#{account},'%')
+ </if>
+ <if test="state != null and state != ''">
+ and o.state = #{state}
+ </if>
+ <if test="roleType != null and roleType != '' and roleType == 2">
+ and (o.companyId = #{nowUserId} or FIND_IN_SET(o.franchiseeId,(SELECT GROUP_CONCAT(id) as ids FROM t_company where superiorId = #{nowUserId} GROUP BY superiorId)))
+ </if>
+ <if test="roleType != null and roleType != '' and roleType == 3">
+ and o.franchiseeId = #{nowUserId}
+ </if>
+ </where>
+ order by o.id desc
+ </select>
+
+</mapper>
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TDriverLineMapper.xml b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TDriverLineMapper.xml
new file mode 100644
index 0000000..058240a
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TDriverLineMapper.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.stylefeng.guns.modular.system.dao.TDriverLineMapper">
+
+ <!-- 通用查询映射结果 -->
+ <resultMap id="BaseResultMap" type="com.stylefeng.guns.modular.system.model.TDriverLine">
+ <id column="id" property="id" />
+ <result column="driverId" property="driverId" />
+ <result column="lineId" property="lineId" />
+ <result column="createTime" property="createTime" />
+ </resultMap>
+
+ <!-- 通用查询结果列 -->
+ <sql id="Base_Column_List">
+ id, driverId, lineId, createTime
+ </sql>
+
+ <!--根据司机ID查询司机关联线路列表-->
+ <select id="getDriverLineListByDriverId" resultType="java.util.Map">
+ SELECT ll.`name` as lineName,dl.* FROM t_driver_line as dl
+ LEFT JOIN t_line as ll on ll.id = dl.lineId
+ where dl.driverId = #{driverId}
+ </select>
+
+</mapper>
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TDriverMapper.xml b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TDriverMapper.xml
new file mode 100644
index 0000000..de77126
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TDriverMapper.xml
@@ -0,0 +1,302 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.stylefeng.guns.modular.system.dao.TDriverMapper">
+
+ <!-- 通用查询映射结果 -->
+ <resultMap id="BaseResultMap" type="com.stylefeng.guns.modular.system.model.TDriver">
+ <id column="id" property="id" />
+ <result column="account" property="account" />
+ <result column="jobNumber" property="jobNumber" />
+ <result column="phone" property="phone" />
+ <result column="password" property="password" />
+ <result column="name" property="name" />
+ <result column="sex" property="sex" />
+ <result column="idCard" property="idCard" />
+ <result column="companyId" property="companyId" />
+ <result column="headImgUrl" property="headImgUrl" />
+ <result column="faceImgUrl" property="faceImgUrl" />
+ <result column="idCardImgUrl1" property="idCardImgUrl1" />
+ <result column="idCardImgUrl2" property="idCardImgUrl2" />
+ <result column="placeOfEmployment" property="placeOfEmployment" />
+ <result column="birthday" property="birthday" />
+ <result column="bankCardNumber" property="bankCardNumber" />
+ <result column="driverNationality" property="driverNationality" />
+ <result column="driverNation" property="driverNation" />
+ <result column="driverMaritalStatus" property="driverMaritalStatus" />
+ <result column="driverLanguageLevel" property="driverLanguageLevel" />
+ <result column="driverEducation" property="driverEducation" />
+ <result column="driverCensus" property="driverCensus" />
+ <result column="driverAddress" property="driverAddress" />
+ <result column="driverContactAddress" property="driverContactAddress" />
+ <result column="driverAge" property="driverAge" />
+ <result column="driveCard" property="driveCard" />
+ <result column="driveCardImgUrl" property="driveCardImgUrl" />
+ <result column="driverType" property="driverType" />
+ <result column="getDriverLicenseDate" property="getDriverLicenseDate" />
+ <result column="driverLicenseOn" property="driverLicenseOn" />
+ <result column="driverLicenseOff" property="driverLicenseOff" />
+ <result column="taxiDriver" property="taxiDriver" />
+ <result column="taxiAptitudeCard" property="taxiAptitudeCard" />
+ <result column="networkCarlssueImg" property="networkCarlssueImg" />
+ <result column="networkCarlssueOrganization" property="networkCarlssueOrganization" />
+ <result column="networkCarlssueDate" property="networkCarlssueDate" />
+ <result column="getNetworkCarProofDate" property="getNetworkCarProofDate" />
+ <result column="networkCarProofOn" property="networkCarProofOn" />
+ <result column="networkCarProofOff" property="networkCarProofOff" />
+ <result column="registerDate" property="registerDate" />
+ <result column="fullTimeDriver" property="fullTimeDriver" />
+ <result column="inDriverBlacklist" property="inDriverBlacklist" />
+ <result column="commercialType" property="commercialType" />
+ <result column="contractCompany" property="contractCompany" />
+ <result column="contractOn" property="contractOn" />
+ <result column="contractOff" property="contractOff" />
+ <result column="emergencyContact" property="emergencyContact" />
+ <result column="emergencyContactPhone" property="emergencyContactPhone" />
+ <result column="emergencyContactAddress" property="emergencyContactAddress" />
+ <result column="remark" property="remark" />
+ <result column="isPlatCar" property="isPlatCar" />
+ <result column="carId" property="carId" />
+ <result column="authState" property="authState" />
+ <result column="state" property="state" />
+ <result column="flag" property="flag" />
+ <result column="insertTime" property="insertTime" />
+ <result column="insertUser" property="insertUser" />
+ <result column="updateTime" property="updateTime" />
+ <result column="updateUser" property="updateUser" />
+ <result column="addType" property="addType" />
+ <result column="laveBusinessMoney" property="laveBusinessMoney"/>
+ <result column="businessMoney" property="businessMoney"/>
+ </resultMap>
+
+ <!-- 通用查询结果列 -->
+ <sql id="Base_Column_List">
+ id, account, jobNumber, phone, password, name, sex, idCard, companyId, headImgUrl, faceImgUrl, idCardImgUrl1, idCardImgUrl2, placeOfEmployment, birthday, bankCardNumber, driverNationality, driverNation, driverMaritalStatus, driverLanguageLevel, driverEducation, driverCensus, driverAddress, driverContactAddress, licenseCode, licenselImgUrl, driverAge, driveCard, driveCardImgUrl, driverType, getDriverLicenseDate, driverLicenseOn, driverLicenseOff, taxiDriver, taxiAptitudeCard, networkCarlssueImg, networkCarlssueOrganization, networkCarlssueDate, getNetworkCarProofDate, networkCarProofOn, networkCarProofOff, registerDate, fullTimeDriver, inDriverBlacklist, commercialType, contractCompany, contractOn, contractOff, emergencyContact, emergencyContactPhone, emergencyContactAddress, remark, isPlatCar, carId, authState, state, flag, insertTime, insertUser, updateTime, updateUser, addType
+ </sql>
+
+ <!--根据条件查询待审核司机列表-->
+ <select id="getAuthDriverList" resultType="map" parameterType="com.baomidou.mybatisplus.plugins.Page">
+ SELECT * FROM (SELECT cc1.`name` as companyName,cc2.`name` as franchiseeName,ds.serverStr,dd.* from t_driver as dd
+ LEFT JOIN (select * from t_company where type = 2 and flag != 3) as cc1 on cc1.id = dd.companyId
+ LEFT JOIN (select * from t_company where type = 3 and flag != 3) as cc2 on cc2.id = dd.franchiseeId
+ LEFT JOIN (
+ SELECT
+ GROUP_CONCAT(case when type = 1 then '专车'
+ when type = 2 then '出租车'
+ when type = 3 then '跨城出行'
+ when type = 4 then '小件物流-同城'
+ when type = 5 then '小件物流-跨城'
+ when type = 6 then '包车'
+ else '' end ) as serverStr,driverId from t_driver_service GROUP BY driverId) as ds on ds.driverId = dd.id
+ ) as o
+ <where>
+ FIND_IN_SET(o.authState,'1,4') and o.flag != 3
+ <if test="beginTime != null and beginTime != '' and endTime != null and endTime != ''">
+ AND (o.insertTime between CONCAT(#{beginTime},' 00:00:00') and CONCAT(#{endTime},' 23:59:59'))
+ </if>
+ <if test="companyName != null and companyName != ''">
+ and (o.companyName LIKE CONCAT('%',#{companyName},'%') or o.franchiseeName LIKE CONCAT('%',#{companyName},'%'))
+ </if>
+ <if test="phone != null and phone != ''">
+ and o.phone LIKE CONCAT('%',#{phone},'%')
+ </if>
+ <if test="account != null and account != ''">
+ and o.account LIKE CONCAT('%',#{account},'%')
+ </if>
+ <if test="addType != null and addType != ''">
+ and o.addType = #{addType}
+ </if>
+ <if test="authState != null and authState != ''">
+ and o.authState = #{authState}
+ </if>
+ </where>
+ order by o.id desc
+ </select>
+
+ <!--根据用户ID获取用户详情-->
+ <select id="getDriverById" resultType="map">
+ SELECT cc.`name` as companyName,ds.serverStr,
+ case when dd.addType = 1 then '司机注册' when dd.addType = 2 then '平台添加' when dd.addType = 3 then '分公司添加' when dd.addType = 4 then '加盟商添加' else '' end as addTypeStr,
+ case when dd.sex = 1 then '男' when dd.sex = 2 then '女' else '' end as sexStr,
+ case when dd.authState = 1 then '待审核' when dd.authState = 2 then '正常' when dd.authState = 3 then '冻结' when dd.authState = 4 then '已拒绝' end as authStateStr,
+ dd.* from t_driver as dd
+ LEFT JOIN (select * from t_company where flag != 3) as cc on cc.id = dd.companyId
+ LEFT JOIN (
+ SELECT
+ GROUP_CONCAT(case when type = 1 then '专车'
+ when type = 2 then '出租车'
+ when type = 3 then '跨城出行'
+ when type = 4 then '小件物流-同城'
+ when type = 5 then '小件物流-跨城'
+ when type = 6 then '包车'
+ else '' end SEPARATOR '、') as serverStr,driverId from t_driver_service GROUP BY driverId) as ds on ds.driverId = dd.id
+ where dd.id = #{driverId}
+ </select>
+
+ <!--根据审核通过的司机列表-->
+ <select id="getDriverList" resultType="map" parameterType="com.baomidou.mybatisplus.plugins.Page">
+ SELECT * FROM (SELECT cc1.`name` as companyName,cc2.`name` as franchiseeName,ci.carLicensePlate,ds.serverStr,IFNULL(oe.evaluateNum,0) as evaluateNum,
+ (IFNULL(ot1.taxiNum, 0) + IFNULL(ot3.num, 0) + IFNULL(ot5.num, 0) + IFNULL(ot7.num, 0)) as historyNum,(IFNULL(ot2.taxiMoney, 0)+ IFNULL(ot4.money, 0) + IFNULL(ot6.money, 0) + IFNULL(ot8.money, 0)) as historyMoney,dd.* from t_driver as dd
+ LEFT JOIN (select * from t_company where type = 2 and flag != 3) as cc1 on cc1.id = dd.companyId
+ LEFT JOIN (select * from t_company where type = 3 and flag != 3) as cc2 on cc2.id = dd.franchiseeId
+ LEFT JOIN (select * from t_car where state = 1) as ci on ci.id = dd.carId
+ LEFT JOIN (
+ SELECT
+ GROUP_CONCAT(case when type = 1 then '专车'
+ when type = 2 then '出租车'
+ when type = 3 then '跨城出行'
+ when type = 4 then '小件物流-同城'
+ when type = 5 then '小件物流-跨城'
+ when type = 6 then '包车'
+ else '' end ) as serverStr,driverId from t_driver_service GROUP BY driverId) as ds on ds.driverId = dd.id
+ LEFT JOIN (SELECT IFNULL(SUM(fraction)/COUNT(id),0) as evaluateNum,driverId FROM t_order_evaluate GROUP BY driverId) as oe on oe.driverId = dd.id
+ LEFT JOIN (SELECT COUNT(id) as taxiNum,driverId FROM t_order_taxi where FIND_IN_SET(state,'7,8,9') GROUP BY driverId) as ot1 on ot1.driverId = dd.id
+ LEFT JOIN (SELECT SUM(orderMoney) as taxiMoney,driverId FROM t_order_taxi where FIND_IN_SET(state,'7,8,9') GROUP BY driverId) as ot2 on ot2.driverId = dd.id
+ LEFT JOIN (SELECT COUNT(id) as num,driverId FROM t_order_private_car where FIND_IN_SET(state,'7,8,9') GROUP BY driverId) as ot3 on ot3.driverId = dd.id
+ LEFT JOIN (SELECT SUM(orderMoney) as money,driverId FROM t_order_private_car where FIND_IN_SET(state,'7,8,9') GROUP BY driverId) as ot4 on ot4.driverId = dd.id
+ LEFT JOIN (SELECT COUNT(id) as num,driverId FROM t_order_cross_city where FIND_IN_SET(state,'6,8,9') GROUP BY driverId) as ot5 on ot5.driverId = dd.id
+ LEFT JOIN (SELECT SUM(orderMoney) as money,driverId FROM t_order_cross_city where FIND_IN_SET(state,'6,8,9') GROUP BY driverId) as ot6 on ot6.driverId = dd.id
+ LEFT JOIN (SELECT COUNT(id) as num,driverId FROM t_order_logistics where FIND_IN_SET(state,'6,9') GROUP BY driverId) as ot7 on ot7.driverId = dd.id
+ LEFT JOIN (SELECT SUM(orderMoney) as money,driverId FROM t_order_logistics where FIND_IN_SET(state,'6,9') GROUP BY driverId) as ot8 on ot8.driverId = dd.id) as o
+ <where>
+ o.flag != 3
+ <if test="roleType != null and roleType != '' and roleType == 1">
+ and FIND_IN_SET(o.authState,'2,3')
+ </if>
+ <if test="beginTime != null and beginTime != '' and endTime != null and endTime != ''">
+ AND (o.insertTime between CONCAT(#{beginTime},' 00:00:00') and CONCAT(#{endTime},' 23:59:59'))
+ </if>
+ <if test="companyName != null and companyName != ''">
+ and (o.companyName LIKE CONCAT('%',#{companyName},'%') or o.franchiseeName LIKE CONCAT('%',#{companyName},'%'))
+ </if>
+ <if test="phone != null and phone != ''">
+ and o.phone LIKE CONCAT('%',#{phone},'%')
+ </if>
+ <if test="name != null and name != ''">
+ and o.name LIKE CONCAT('%',#{name},'%')
+ </if>
+ <if test="addType != null and addType != ''">
+ and o.addType = #{addType}
+ </if>
+ <if test="authState != null and authState != ''">
+ and o.authState = #{authState}
+ </if>
+ <if test="roleType != null and roleType != '' and roleType == 2">
+ and (o.companyId = #{nowUserId} or FIND_IN_SET(o.franchiseeId,(SELECT GROUP_CONCAT(id) as ids FROM t_company where superiorId = #{nowUserId} GROUP BY superiorId)))
+ </if>
+ <if test="roleType != null and roleType != '' and roleType == 3">
+ and o.franchiseeId = #{nowUserId}
+ </if>
+ </where>
+ order by o.id desc
+ </select>
+
+ <!--查询已被使用的车辆ID-->
+ <select id="getUseCarIdStr" resultType="java.lang.String">
+ SELECT GROUP_CONCAT(dd.carId) as carIdStr from t_driver as dd where dd.authState = 2 and dd.flag != 3
+ <if test="carId != null and carId != '' and carId != 0">
+ and dd.carId != #{carId}
+ </if>
+ </select>
+
+ <!--查询当前可被选择的车辆列表-->
+ <select id="getCanSelectCarList" resultType="map" parameterType="com.baomidou.mybatisplus.plugins.Page">
+ SELECT * FROM (SELECT cm.`name` as modelName,cb.`name` as brandName,ds.serverStr,ci.* from t_car as ci
+ LEFT JOIN (select * from t_car_model where state = 1) as cm on cm.id = ci.carModelId
+ LEFT JOIN (select * from t_car_brand where state = 1) as cb on cb.id = ci.carBrandId
+ LEFT JOIN (
+ SELECT
+ GROUP_CONCAT(case when type = 1 then '专车'
+ when type = 2 then '出租车'
+ when type = 3 then '跨城出行'
+ when type = 4 then '小件物流-同城'
+ when type = 5 then '小件物流-跨城'
+ when type = 6 then '包车'
+ else '' end ) as serverStr,carId from t_car_service GROUP BY carId) as ds on ds.carId = ci.id) as o
+ <where>
+ o.state = 1
+ <if test="carIdStr != null and carIdStr != ''">
+ and not FIND_IN_SET(o.id,#{carIdStr})
+ </if>
+ <if test="carLicensePlate != null and carLicensePlate != ''">
+ and o.carLicensePlate LIKE CONCAT('%',#{carLicensePlate},'%')
+ </if>
+ <if test="brandName != null and brandName != ''">
+ and o.brandName LIKE CONCAT('%',#{brandName},'%')
+ </if>
+ <if test="modelName != null and modelName != ''">
+ and o.modelName LIKE CONCAT('%',#{modelName},'%')
+ </if>
+ <if test="color != null and color != ''">
+ and o.carColor LIKE CONCAT('%',#{color},'%')
+ </if>
+ <if test="serverStr != null and serverStr != ''">
+ and o.serverStr LIKE CONCAT('%',#{serverStr},'%')
+ </if>
+ <if test="roleType != null and roleType != '' and roleType == 2">
+ and (o.companyId = #{nowUserId} or FIND_IN_SET(o.franchiseeId,(SELECT GROUP_CONCAT(id) as ids FROM t_company where type = 3 and superiorId = #{nowUserId} GROUP BY superiorId)))
+ </if>
+ <if test="roleType != null and roleType != '' and roleType == 3">
+ and o.franchiseeId = #{nowUserId}
+ </if>
+ </where>
+ order by o.id desc
+ </select>
+
+ <!--修改分公司司机的状态-->
+ <update id="updateCompanyDriverState" parameterType="java.lang.Integer">
+ update t_driver
+ <set>
+ <if test="authState != null"> authState = #{authState} </if>
+ </set>
+ where companyId = #{companyId} and (franchiseeId = 0 or franchiseeId is null)
+ </update>
+
+ <!--修改加盟商司机的状态-->
+ <update id="updateFranchiseeDriverState" parameterType="java.lang.Integer">
+ update t_driver
+ <set>
+ <if test="authState != null"> authState = #{authState} </if>
+ </set>
+ where franchiseeId = #{franchiseeId}
+ </update>
+
+ <!--根据审核通过的司机列表无分页-->
+ <select id="getDriverListNoPage" resultType="map">
+ SELECT * FROM (SELECT cc1.`name` as companyName,cc2.`name` as franchiseeName,ci.carLicensePlate,ds.serverStr,IFNULL(oe.evaluateNum,0) as evaluateNum,
+ (IFNULL(ot1.taxiNum, 0) + IFNULL(ot3.num, 0) + IFNULL(ot5.num, 0)) as historyNum,(IFNULL(ot2.taxiMoney, 0)+ IFNULL(ot4.money, 0) + IFNULL(ot6.money, 0)) as historyMoney,dd.* from t_driver as dd
+ LEFT JOIN (select * from t_company where type = 2 and flag != 3) as cc1 on cc1.id = dd.companyId
+ LEFT JOIN (select * from t_company where type = 3 and flag != 3) as cc2 on cc2.id = dd.franchiseeId
+ LEFT JOIN (select * from t_car where state = 1) as ci on ci.id = dd.carId
+ LEFT JOIN (
+ SELECT
+ GROUP_CONCAT(case when type = 1 then '专车'
+ when type = 2 then '出租车'
+ when type = 3 then '跨城出行'
+ when type = 4 then '小件物流-同城'
+ when type = 5 then '小件物流-跨城'
+ when type = 6 then '包车'
+ else '' end ) as serverStr,driverId from t_driver_service GROUP BY driverId) as ds on ds.driverId = dd.id
+ LEFT JOIN (SELECT IFNULL(SUM(fraction)/COUNT(id),0) as evaluateNum,driverId FROM t_order_evaluate GROUP BY driverId) as oe on oe.driverId = dd.id
+ LEFT JOIN (SELECT COUNT(id) as taxiNum,driverId FROM t_order_taxi where FIND_IN_SET(state,'7,8,9') GROUP BY driverId) as ot1 on ot1.driverId = dd.id
+ LEFT JOIN (SELECT SUM(orderMoney) as taxiMoney,driverId FROM t_order_taxi where FIND_IN_SET(state,'8,9') GROUP BY driverId) as ot2 on ot2.driverId = dd.id
+ LEFT JOIN (SELECT COUNT(id) as num,driverId FROM t_order_private_car where FIND_IN_SET(state,'7,8,9') GROUP BY driverId) as ot3 on ot3.driverId = dd.id
+ LEFT JOIN (SELECT SUM(orderMoney) as money,driverId FROM t_order_private_car where FIND_IN_SET(state,'7,8,9') GROUP BY driverId) as ot4 on ot4.driverId = dd.id
+ LEFT JOIN (SELECT COUNT(id) as num,driverId FROM t_order_cross_city where FIND_IN_SET(state,'6,7,8') GROUP BY driverId) as ot5 on ot5.driverId = dd.id
+ LEFT JOIN (SELECT SUM(orderMoney) as money,driverId FROM t_order_cross_city where FIND_IN_SET(state,'6,7,8') GROUP BY driverId) as ot6 on ot6.driverId = dd.id
+ ) as o
+ <where>
+ o.flag != 3
+ <if test="roleType != null and roleType != '' and roleType == 1">
+ and FIND_IN_SET(o.authState,'2,3')
+ </if>
+ <if test="roleType != null and roleType != '' and roleType == 2">
+ and (o.companyId = #{nowUserId} or FIND_IN_SET(o.franchiseeId,(SELECT GROUP_CONCAT(id) as ids FROM t_company where superiorId = #{nowUserId} GROUP BY superiorId)))
+ </if>
+ <if test="roleType != null and roleType != '' and roleType == 3">
+ and o.franchiseeId = #{nowUserId}
+ </if>
+ </where>
+ order by o.id desc
+ </select>
+
+</mapper>
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TDriverServiceMapper.xml b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TDriverServiceMapper.xml
new file mode 100644
index 0000000..65793d6
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TDriverServiceMapper.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.stylefeng.guns.modular.system.dao.TDriverServiceMapper">
+
+ <!-- 通用查询映射结果 -->
+ <resultMap id="BaseResultMap" type="com.stylefeng.guns.modular.system.model.TDriverService">
+ <id column="id" property="id" />
+ <result column="driverId" property="driverId" />
+ <result column="type" property="type" />
+ </resultMap>
+
+ <!-- 通用查询结果列 -->
+ <sql id="Base_Column_List">
+ id, driverId, type
+ </sql>
+
+</mapper>
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TFeedbackMapper.xml b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TFeedbackMapper.xml
new file mode 100644
index 0000000..a7474d4
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TFeedbackMapper.xml
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.stylefeng.guns.modular.system.dao.TFeedbackMapper">
+
+ <!-- 通用查询映射结果 -->
+ <resultMap id="BaseResultMap" type="com.stylefeng.guns.modular.system.model.TFeedback">
+ <id column="id" property="id" />
+ <result column="userId" property="userId" />
+ <result column="handleUserId" property="handleUserId" />
+ <result column="content" property="content" />
+ <result column="insertTime" property="insertTime" />
+ <result column="imgUrl" property="imgUrl" />
+ <result column="flag" property="flag" />
+ <result column="state" property="state" />
+ <result column="cldate" property="cldate" />
+ <result column="remark" property="remark" />
+ <result column="type" property="type" />
+ </resultMap>
+
+ <!-- 通用查询结果列 -->
+ <sql id="Base_Column_List">
+ id, userId, handleUserId, content, insertTime, imgUrl, flag, state, cldate, remark, type
+ </sql>
+
+ <!--根据条件查询用反馈记录列表-->
+ <select id="getFeedbackList" resultType="map" parameterType="com.baomidou.mybatisplus.plugins.Page">
+ SELECT * FROM (SELECT dd.`name` as driverName,dd.phone as driverPhone,uu.`name` as userName,uu.phone as userPhone,su.`name` as handleUserName,
+ fb.* FROM t_feedback as fb
+ LEFT JOIN t_driver as dd on dd.id = fb.userId
+ LEFT JOIN t_user as uu on uu.id = fb.userId
+ LEFT JOIN sys_user as su on su.id = fb.handleUserId
+ ) as o
+ <where>
+ o.flag = 1
+ <if test="type != null and type != '' and type == 1">
+ and o.type = 1
+ </if>
+ <if test="type != null and type != '' and type == 2">
+ and o.type = 2
+ </if>
+ <if test="beginTime != null and beginTime != '' and endTime != null and endTime != ''">
+ AND (o.insertTime between CONCAT(#{beginTime},' 00:00:00') and CONCAT(#{endTime},' 23:59:59'))
+ </if>
+ <if test="type != null and type != '' and type == 1">
+ <if test="name != null and name != ''">
+ and o.userName LIKE CONCAT('%',#{name},'%')
+ </if>
+ <if test="phone != null and phone != ''">
+ and o.userPhone LIKE CONCAT('%',#{phone},'%')
+ </if>
+ </if>
+ <if test="type != null and type != '' and type == 2">
+ <if test="name != null and name != ''">
+ and o.driverName LIKE CONCAT('%',#{name},'%')
+ </if>
+ <if test="phone != null and phone != ''">
+ and o.driverPhone LIKE CONCAT('%',#{phone},'%')
+ </if>
+ </if>
+ <if test="state != null and state != ''">
+ and o.state = #{state}
+ </if>
+ </where>
+ order by o.id desc
+ </select>
+
+</mapper>
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TIntegralGoodsMapper.xml b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TIntegralGoodsMapper.xml
new file mode 100644
index 0000000..bfac1ed
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TIntegralGoodsMapper.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.stylefeng.guns.modular.system.dao.TIntegralGoodsMapper">
+
+ <!-- 通用查询映射结果 -->
+ <resultMap id="BaseResultMap" type="com.stylefeng.guns.modular.system.model.TIntegralGoods">
+ <id column="id" property="id" />
+ <result column="insertTime" property="insertTime" />
+ <result column="name" property="name" />
+ <result column="imgUrl" property="imgUrl" />
+ <result column="integral" property="integral" />
+ <result column="instructions" property="instructions" />
+ <result column="state" property="state" />
+ <result column="insertUserId" property="insertUserId" />
+ <result column="insertUserRole" property="insertUserRole" />
+ </resultMap>
+
+ <!-- 通用查询结果列 -->
+ <sql id="Base_Column_List">
+ id, insertTime, name, imgUrl, integral, instructions, state, insertUserId, insertUserRole
+ </sql>
+
+ <!--根据条件查询积分商品列表-->
+ <select id="getIntegralGoodsList" resultType="map" parameterType="com.baomidou.mybatisplus.plugins.Page">
+ SELECT * FROM t_integral_goods as o
+ <where>
+ o.state != 3
+ <if test="beginTime != null and beginTime != '' and endTime != null and endTime != ''">
+ AND (o.insertTime between CONCAT(#{beginTime},' 00:00:00') and CONCAT(#{endTime},' 23:59:59'))
+ </if>
+ <if test="name != null and name != ''">
+ and o.name LIKE CONCAT('%',#{name},'%')
+ </if>
+ <if test="state != null and state != ''">
+ and o.state = #{state}
+ </if>
+ </where>
+ order by o.id desc
+ </select>
+
+</mapper>
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TIntegralOrderMapper.xml b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TIntegralOrderMapper.xml
new file mode 100644
index 0000000..f276866
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TIntegralOrderMapper.xml
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.stylefeng.guns.modular.system.dao.TIntegralOrderMapper">
+
+ <!-- 通用查询映射结果 -->
+ <resultMap id="BaseResultMap" type="com.stylefeng.guns.modular.system.model.TIntegralOrder">
+ <id column="id" property="id" />
+ <result column="insertTime" property="insertTime" />
+ <result column="userId" property="userId" />
+ <result column="goodsId" property="goodsId" />
+ <result column="num" property="num" />
+ <result column="consigneeName" property="consigneeName" />
+ <result column="consigneePhone" property="consigneePhone" />
+ <result column="consigneeAddress" property="consigneeAddress" />
+ <result column="remark" property="remark" />
+ <result column="state" property="state" />
+ </resultMap>
+
+ <!-- 通用查询结果列 -->
+ <sql id="Base_Column_List">
+ id, insertTime, userId, goodsId, num, consigneeName, consigneePhone, consigneeAddress, remark, state
+ </sql>
+
+ <!--根据条件查询兑换订单列表-->
+ <select id="getIntegralOrderList" resultType="map" parameterType="com.baomidou.mybatisplus.plugins.Page">
+ SELECT * FROM (SELECT ui.nickName as userName,ig.`name` as goodsName,io.* FROM t_integral_order as io
+ LEFT JOIN t_user as ui on ui.id = io.userId
+ LEFT JOIN t_integral_goods as ig on ig.id = io.goodsId) as o
+ <where>
+ o.state != 3
+ <if test="beginTime != null and beginTime != '' and endTime != null and endTime != ''">
+ AND (o.insertTime between CONCAT(#{beginTime},' 00:00:00') and CONCAT(#{endTime},' 23:59:59'))
+ </if>
+ <if test="userName != null and userName != ''">
+ and o.userName LIKE CONCAT('%',#{userName},'%')
+ </if>
+ <if test="goodsName != null and goodsName != ''">
+ and o.goodsName LIKE CONCAT('%',#{goodsName},'%')
+ </if>
+ <if test="consigneeName != null and consigneeName != ''">
+ and o.consigneeName LIKE CONCAT('%',#{consigneeName},'%')
+ </if>
+ <if test="consigneePhone != null and consigneePhone != ''">
+ and o.consigneePhone LIKE CONCAT('%',#{consigneePhone},'%')
+ </if>
+ <if test="state != null and state != ''">
+ and o.state = #{state}
+ </if>
+ </where>
+ order by o.id desc
+ </select>
+
+</mapper>
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TInvoiceMapper.xml b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TInvoiceMapper.xml
new file mode 100644
index 0000000..dbf4efd
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TInvoiceMapper.xml
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.stylefeng.guns.modular.system.dao.TInvoiceMapper">
+
+ <!-- 通用查询映射结果 -->
+ <resultMap id="BaseResultMap" type="com.stylefeng.guns.modular.system.model.TInvoice">
+ <id column="id" property="id" />
+ <result column="money" property="money" />
+ <result column="orderNum" property="orderNum" />
+ <result column="type" property="type" />
+ <result column="name" property="name" />
+ <result column="code" property="code" />
+ <result column="content" property="content" />
+ <result column="remark" property="remark" />
+ <result column="address" property="address" />
+ <result column="bank" property="bank" />
+ <result column="email" property="email" />
+ <result column="userId" property="userId" />
+ <result column="state" property="state" />
+ <result column="insertTime" property="insertTime" />
+ </resultMap>
+
+ <!-- 通用查询结果列 -->
+ <sql id="Base_Column_List">
+ id, money, orderNum, type, name, code, content, remark, address, bank, email, userId, state, insertTime
+ </sql>
+
+ <!--根据条件查询用开发票记录列表-->
+ <select id="getInvoiceList" resultType="map" parameterType="com.baomidou.mybatisplus.plugins.Page">
+ SELECT * FROM t_invoice as o
+ <where>
+ 1 = 1
+ <if test="beginTime != null and beginTime != '' and endTime != null and endTime != ''">
+ AND (o.insertTime between CONCAT(#{beginTime},' 00:00:00') and CONCAT(#{endTime},' 23:59:59'))
+ </if>
+ <if test="email != null and email != ''">
+ and o.email LIKE CONCAT('%',#{email},'%')
+ </if>
+ <if test="name != null and name != ''">
+ and o.name LIKE CONCAT('%',#{name},'%')
+ </if>
+ <if test="type != null and type != ''">
+ and o.type = #{type}
+ </if>
+ <if test="state != null and state != ''">
+ and o.state = #{state}
+ </if>
+ </where>
+ order by o.id desc
+ </select>
+
+</mapper>
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TLineCompanyMapper.xml b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TLineCompanyMapper.xml
new file mode 100644
index 0000000..44edba5
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TLineCompanyMapper.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.stylefeng.guns.modular.system.dao.TLineCompanyMapper">
+
+ <!-- 通用查询映射结果 -->
+ <resultMap id="BaseResultMap" type="com.stylefeng.guns.modular.system.model.TLineCompany">
+ <id column="id" property="id" />
+ <result column="lineId" property="lineId" />
+ <result column="companyId" property="companyId" />
+ <result column="insertTime" property="insertTime" />
+ <result column="insertUserId" property="insertUserId" />
+ </resultMap>
+
+ <!-- 通用查询结果列 -->
+ <sql id="Base_Column_List">
+ id, lineId, companyId, insertTime, insertUserId
+ </sql>
+
+</mapper>
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TLineMapper.xml b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TLineMapper.xml
new file mode 100644
index 0000000..52db9f7
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TLineMapper.xml
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.stylefeng.guns.modular.system.dao.TLineMapper">
+
+ <!-- 通用查询映射结果 -->
+ <resultMap id="BaseResultMap" type="com.stylefeng.guns.modular.system.model.TLine">
+ <id column="id" property="id" />
+ <result column="name" property="name" />
+ <result column="shiftInterval" property="shiftInterval" />
+ <result column="rakeRate" property="rakeRate" />
+ <result column="state" property="state" />
+ <result column="insertTime" property="insertTime" />
+ </resultMap>
+
+ <!-- 通用查询结果列 -->
+ <sql id="Base_Column_List">
+ id, name, shiftInterval, rakeRate, state, insertTime
+ </sql>
+
+ <!--根据条件查询线路列表-->
+ <select id="getLineList" resultType="map" parameterType="com.baomidou.mybatisplus.plugins.Page">
+ SELECT * FROM (SELECT model.modelStr,IFNULL(ls.num,0) as shiftNum,su.`name` as insertUser,IFNULL(lc.num,0) as companyNum,ll.* FROM t_line as ll
+ LEFT JOIN (
+ SELECT GROUP_CONCAT(sc.`name` SEPARATOR '、') as modelStr,lp.lineId FROM t_line_price as lp
+ LEFT JOIN t_server_carmodel as sc on sc.id = lp.serverCarModelId
+ where sc.type = 2 and lp.state != 3 GROUP BY lp.lineId) as model on model.lineId = ll.id
+ LEFT JOIN (SELECT COUNT(id) as num,lineId FROM t_line_shift where state != 3 GROUP BY lineId) as ls on ls.lineId = ll.id
+ LEFT JOIN sys_user as su on su.id = ll.insertUserId
+ LEFT JOIN (SELECT COUNT(id) as num,lineId FROM t_line_company GROUP BY lineId) as lc on lc.lineId = ll.id
+ ) as o
+ <where>
+ o.state != 3
+ <if test="beginTime != null and beginTime != '' and endTime != null and endTime != ''">
+ AND (o.insertTime between CONCAT(#{beginTime},' 00:00:00') and CONCAT(#{endTime},' 23:59:59'))
+ </if>
+ <if test="name != null and name != ''">
+ and o.name LIKE CONCAT('%',#{name},'%')
+ </if>
+ <if test="insertUser != null and insertUser != ''">
+ and o.insertUser LIKE CONCAT('%',#{insertUser},'%')
+ </if>
+ <if test="modelStr != null and modelStr != ''">
+ and o.modelStr LIKE CONCAT('%',#{modelStr},'%')
+ </if>
+ <if test="state != null and state != ''">
+ and o.state = #{state}
+ </if>
+ </where>
+ order by o.id desc
+ </select>
+
+ <!--根据线路ID查询线路价格-->
+ <select id="getLinePriceList" resultType="java.util.Map">
+ SELECT sc.`name`,lp.* FROM t_line_price as lp
+ LEFT JOIN t_server_carmodel as sc on sc.id = lp.serverCarModelId
+ where lp.lineId = #{lineId} and lp.state != 3
+ </select>
+
+ <!--根据线路ID查询线路已分配公司-->
+ <select id="getLineCompanyList" resultType="java.util.Map">
+ SELECT cc.`name` as companyName,lc.* FROM t_line_company as lc
+ LEFT JOIN t_company as cc on cc.id = lc.companyId
+ where lc.lineId = #{lineId}
+ </select>
+
+</mapper>
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TLinePriceMapper.xml b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TLinePriceMapper.xml
new file mode 100644
index 0000000..951c819
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TLinePriceMapper.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.stylefeng.guns.modular.system.dao.TLinePriceMapper">
+
+ <!-- 通用查询映射结果 -->
+ <resultMap id="BaseResultMap" type="com.stylefeng.guns.modular.system.model.TLinePrice">
+ <id column="id" property="id" />
+ <result column="lineId" property="lineId" />
+ <result column="serverCarModelId" property="serverCarModelId" />
+ <result column="type" property="type" />
+ <result column="content" property="content" />
+ <result column="contentStr" property="contentStr" />
+ <result column="state" property="state" />
+ <result column="insertTime" property="insertTime" />
+ </resultMap>
+
+ <!-- 通用查询结果列 -->
+ <sql id="Base_Column_List">
+ id, lineId, serverCarModelId, type, content, contentStr, state, insertTime
+ </sql>
+
+</mapper>
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TLineShiftMapper.xml b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TLineShiftMapper.xml
new file mode 100644
index 0000000..e8ccd39
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TLineShiftMapper.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.stylefeng.guns.modular.system.dao.TLineShiftMapper">
+
+ <!-- 通用查询映射结果 -->
+ <resultMap id="BaseResultMap" type="com.stylefeng.guns.modular.system.model.TLineShift">
+ <id column="id" property="id" />
+ <result column="lineId" property="lineId" />
+ <result column="startTime" property="startTime" />
+ <result column="endTime" property="endTime" />
+ <result column="carNum" property="carNum" />
+ <result column="state" property="state" />
+ <result column="insertTime" property="insertTime" />
+ </resultMap>
+
+ <!-- 通用查询结果列 -->
+ <sql id="Base_Column_List">
+ id, lineId, startTime, endTime, carNum, state, insertTime
+ </sql>
+
+</mapper>
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TLineSiteMapper.xml b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TLineSiteMapper.xml
new file mode 100644
index 0000000..54778cb
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TLineSiteMapper.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.stylefeng.guns.modular.system.dao.TLineSiteMapper">
+
+ <!-- 通用查询映射结果 -->
+ <resultMap id="BaseResultMap" type="com.stylefeng.guns.modular.system.model.TLineSite">
+ <id column="id" property="id" />
+ <result column="lineId" property="lineId" />
+ <result column="siteId" property="siteId" />
+ <result column="type" property="type" />
+ </resultMap>
+
+ <!-- 通用查询结果列 -->
+ <sql id="Base_Column_List">
+ id, lineId, siteId, type
+ </sql>
+
+</mapper>
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TLocationMapper.xml b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TLocationMapper.xml
new file mode 100644
index 0000000..b750328
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TLocationMapper.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.stylefeng.guns.modular.system.dao.TLocationMapper">
+
+ <!-- 通用查询映射结果 -->
+ <resultMap id="BaseResultMap" type="com.stylefeng.guns.modular.system.model.TLocation">
+ <id column="id" property="id" />
+ <result column="siteId" property="siteId" />
+ <result column="name" property="name" />
+ <result column="type" property="type" />
+ <result column="province" property="province" />
+ <result column="provinceCode" property="provinceCode" />
+ <result column="city" property="city" />
+ <result column="cityCode" property="cityCode" />
+ <result column="district" property="district" />
+ <result column="districtCode" property="districtCode" />
+ <result column="coordinate" property="coordinate" />
+ <result column="gid" property="gid"/>
+ <result column="updateTime" property="updateTime"/>
+ <result column="state" property="state" />
+ <result column="insertTime" property="insertTime" />
+ </resultMap>
+
+ <!-- 通用查询结果列 -->
+ <sql id="Base_Column_List">
+ id, siteId, name, type, province, provinceCode, city, cityCode, district, districtCode, coordinate, state, insertTime
+ </sql>
+
+</mapper>
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TNoticesMapper.xml b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TNoticesMapper.xml
new file mode 100644
index 0000000..04bda1e
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TNoticesMapper.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.stylefeng.guns.modular.system.dao.TNoticesMapper">
+
+ <!-- 通用查询映射结果 -->
+ <resultMap id="BaseResultMap" type="com.stylefeng.guns.modular.system.model.TNotices">
+ <id column="id" property="id" />
+ <result column="title" property="title" />
+ <result column="content" property="content" />
+ <result column="sort" property="sort" />
+ <result column="isShow" property="isShow" />
+ <result column="isBroadcast" property="isBroadcast" />
+ <result column="type" property="type" />
+ <result column="imgUrl" property="imgUrl" />
+ <result column="flag" property="flag" />
+ <result column="insertTime" property="insertTime" />
+ <result column="insertUser" property="insertUser" />
+ <result column="updateTime" property="updateTime" />
+ <result column="updateUser" property="updateUser" />
+ </resultMap>
+
+ <!-- 通用查询结果列 -->
+ <sql id="Base_Column_List">
+ id, title, content, sort, isShow, isBroadcast, type, imgUrl, flag, insertTime, insertUser, updateTime, updateUser
+ </sql>
+
+ <!--根据条件查询滚动消息列表-->
+ <select id="getRollingNoticeList" resultType="map" parameterType="com.baomidou.mybatisplus.plugins.Page">
+ SELECT * FROM t_notices as o
+ <where>
+ o.type = #{typeValue} and o.isDelete = 1
+ <if test="beginTime != null and beginTime != '' and endTime != null and endTime != ''">
+ AND (o.insertTime between CONCAT(#{beginTime},' 00:00:00') and CONCAT(#{endTime},' 23:59:59'))
+ </if>
+ <if test="content != null and content != ''">
+ and o.content LIKE CONCAT('%',#{content},'%')
+ </if>
+ </where>
+ order by o.sort asc,o.insertTime desc
+ </select>
+
+</mapper>
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TOpenCityBusinessMapper.xml b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TOpenCityBusinessMapper.xml
new file mode 100644
index 0000000..fff7e83
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TOpenCityBusinessMapper.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.stylefeng.guns.modular.system.dao.TOpenCityBusinessMapper">
+
+ <!-- 通用查询映射结果 -->
+ <resultMap id="BaseResultMap" type="com.stylefeng.guns.modular.system.model.TOpenCityBusiness">
+ <id column="id" property="id" />
+ <result column="openCityId" property="openCityId" />
+ <result column="businessType" property="businessType" />
+ <result column="sort" property="sort" />
+ <result column="flag" property="flag" />
+ <result column="insertTime" property="insertTime" />
+ <result column="insertUser" property="insertUser" />
+ <result column="updateTime" property="updateTime" />
+ <result column="updateUser" property="updateUser" />
+ </resultMap>
+
+ <!-- 通用查询结果列 -->
+ <sql id="Base_Column_List">
+ id, openCityId, businessType, sort, flag, insertTime, insertUser, updateTime, updateUser
+ </sql>
+
+
+</mapper>
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TOpenCityMapper.xml b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TOpenCityMapper.xml
new file mode 100644
index 0000000..d435fbb
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TOpenCityMapper.xml
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.stylefeng.guns.modular.system.dao.TOpenCityMapper">
+
+ <!-- 通用查询映射结果 -->
+ <resultMap id="BaseResultMap" type="com.stylefeng.guns.modular.system.model.TOpenCity">
+ <id column="id" property="id" />
+ <result column="code" property="code" />
+ <result column="lon" property="lon" />
+ <result column="lat" property="lat" />
+ <result column="isQualifications" property="isQualifications" />
+ <result column="areaName" property="areaName" />
+ <result column="cityName" property="cityName" />
+ <result column="provinceName" property="provinceName" />
+ <result column="flag" property="flag" />
+ <result column="insertTime" property="insertTime" />
+ <result column="insertUser" property="insertUser" />
+ <result column="updateTime" property="updateTime" />
+ <result column="updateUser" property="updateUser" />
+ </resultMap>
+
+ <!-- 通用查询结果列 -->
+ <sql id="Base_Column_List">
+ id, code, lon, lat, isQualifications, areaName, cityName, provinceName, flag, insertTime, insertUser, updateTime, updateUser
+ </sql>
+
+ <!--根据条件查询开通城市列表-->
+ <select id="getOpenCityList" resultType="map" parameterType="com.baomidou.mybatisplus.plugins.Page">
+ SELECT * FROM (SELECT ocb.str as business,oc.* FROM t_open_city as oc
+ LEFT JOIN (
+ SELECT GROUP_CONCAT(
+ CONCAT((case when businessType = 1 then '专车'
+ when businessType = 2 then '出租车'
+ when businessType = 3 then '跨城出行'
+ when businessType = 4 then '同城小件物流'
+ when businessType = 5 then '跨城小件物流'
+ when businessType = 6 then '包车'
+ else '' end),' ：',sort)) as str,openCityId from t_open_city_business where flag != 3 GROUP BY openCityId
+ ) as ocb on ocb.openCityId = oc.id) as o
+ <where>
+ o.flag != 3
+ <if test="beginTime != null and beginTime != '' and endTime != null and endTime != ''">
+ AND (o.insertTime between CONCAT(#{beginTime},' 00:00:00') and CONCAT(#{endTime},' 23:59:59'))
+ </if>
+ <if test="condition != null and condition != ''">
+ and (o.areaName LIKE CONCAT('%',#{condition},'%') or o.cityName LIKE CONCAT('%',#{condition},'%') or o.provinceName LIKE CONCAT('%',#{condition},'%'))
+ </if>
+ </where>
+ order by o.id desc
+ </select>
+
+ <!--根据城市ID获取经营业务-->
+ <select id="getBusinessByCityId" resultType="map">
+ SELECT DATE_FORMAT(bb.insertTime,'%Y-%m-%d') as insertTimeStr,
+ case when bb.businessType = 1 then '专车'
+ when bb.businessType = 2 then '出租车'
+ when bb.businessType = 3 then '跨城出行'
+ when bb.businessType = 4 then '同城小件物流'
+ when bb.businessType = 5 then '跨城小件物流'
+ when bb.businessType = 6 then '包车'
+ else '' end as businessTypeStr,bb.*
+ FROM t_open_city_business as bb where bb.openCityId = #{openCityId} and bb.flag != 3
+ </select>
+
+</mapper>
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TOrderCharterMapper.xml b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TOrderCharterMapper.xml
new file mode 100644
index 0000000..df330fd
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TOrderCharterMapper.xml
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.stylefeng.guns.modular.system.dao.TOrderCharterMapper">
+
+ <!-- 通用查询映射结果 -->
+ <resultMap id="BaseResultMap" type="com.stylefeng.guns.modular.system.model.TOrderCharter">
+ <id column="id" property="id" />
+ <result column="insertTime" property="insertTime" />
+ <result column="userId" property="userId" />
+ <result column="useTime" property="useTime" />
+ <result column="useDuration" property="useDuration" />
+ <result column="useDemand" property="useDemand" />
+ <result column="contactName" property="contactName" />
+ <result column="contactPhone" property="contactPhone" />
+ <result column="remark" property="remark" />
+ <result column="state" property="state" />
+ </resultMap>
+
+ <!-- 通用查询结果列 -->
+ <sql id="Base_Column_List">
+ id, insertTime, userId, useTime, useDuration, useDemand, contactName, contactPhone, remark, state
+ </sql>
+
+ <!--根据条件查询包车订单列表-->
+ <select id="getCharterOrderList" resultType="map" parameterType="com.baomidou.mybatisplus.plugins.Page">
+ SELECT * FROM (SELECT ui.nickName as userName,ui.phone as userPhone,oc.* FROM t_order_charter as oc
+ LEFT JOIN t_user as ui on ui.id = oc.userId) as o
+ <where>
+ o.state != 3
+ <if test="beginTime != null and beginTime != '' and endTime != null and endTime != ''">
+ AND (o.insertTime between CONCAT(#{beginTime},' 00:00:00') and CONCAT(#{endTime},' 23:59:59'))
+ </if>
+ <if test="userName != null and userName != ''">
+ and o.userName LIKE CONCAT('%',#{userName},'%')
+ </if>
+ <if test="contactName != null and contactName != ''">
+ and o.contactName LIKE CONCAT('%',#{contactName},'%')
+ </if>
+ <if test="contactPhone != null and contactPhone != ''">
+ and o.contactPhone LIKE CONCAT('%',#{contactPhone},'%')
+ </if>
+ <if test="useDemand != null and useDemand != ''">
+ and o.useDemand LIKE CONCAT('%',#{useDemand},'%')
+ </if>
+ <if test="state != null and state != ''">
+ and o.state = #{state}
+ </if>
+ </where>
+ order by o.id desc
+ </select>
+
+</mapper>
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TOrderCharteredCarMapper.xml b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TOrderCharteredCarMapper.xml
new file mode 100644
index 0000000..13208e0
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TOrderCharteredCarMapper.xml
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.stylefeng.guns.modular.system.dao.TOrderCharteredCarMapper">
+
+ <!-- 通用查询映射结果 -->
+ <resultMap id="BaseResultMap" type="com.stylefeng.guns.modular.system.model.TOrderCharteredCar">
+ <id column="id" property="id" />
+ <result column="userId" property="userId" />
+ <result column="companyId" property="companyId" />
+ <result column="orderNumber" property="orderNumber" />
+ <result column="traveltime" property="traveltime" />
+ <result column="carTime" property="carTime" />
+ <result column="serverCarModelId" property="serverCarModelId" />
+ <result column="modelUse" property="modelUse" />
+ <result column="peopleNumber" property="peopleNumber" />
+ <result column="contactPerson" property="contactPerson" />
+ <result column="contactPhone" property="contactPhone" />
+ <result column="state" property="state" />
+ <result column="remark" property="remark" />
+ <result column="isDelete" property="isDelete" />
+ <result column="insertTime" property="insertTime" />
+ </resultMap>
+
+ <!-- 通用查询结果列 -->
+ <sql id="Base_Column_List">
+ id, userId, companyId, orderNumber, traveltime, carTime, serverCarModelId, modelUse, peopleNumber, contactPerson, contactPhone, state, remark, isDelete, insertTime
+ </sql>
+
+ <!--根据条件查询包车订单列表-->
+ <select id="getCharterCarOrderList" resultType="map" parameterType="com.baomidou.mybatisplus.plugins.Page">
+ SELECT * FROM (
+ SELECT
+ ui.nickName as userName,
+ ui.phone as userPhone,
+ oc.* ,
+ sc.`name` as serverCarModel,
+ sc.price as price
+ FROM t_order_chartered_car as oc
+ LEFT JOIN t_user as ui on ui.id = oc.userId
+ LEFT JOIN t_server_carmodel as sc on (oc.serverCarModelId = sc.id)
+ ) as o
+ <where>
+ o.isDelete = 1
+ <if test="beginTime != null and beginTime != '' and endTime != null and endTime != ''">
+ AND (o.insertTime between CONCAT(#{beginTime},' 00:00:00') and CONCAT(#{endTime},' 23:59:59'))
+ </if>
+ <if test="userName != null and userName != ''">
+ and o.userName LIKE CONCAT('%',#{userName},'%')
+ </if>
+ <if test="contactPerson != null and contactPerson != ''">
+ and o.contactPerson LIKE CONCAT('%',#{contactPerson},'%')
+ </if>
+ <if test="contactPhone != null and contactPhone != ''">
+ and o.contactPhone LIKE CONCAT('%',#{contactPhone},'%')
+ </if>
+ <if test="modelUse != null and modelUse != ''">
+ and o.modelUse LIKE CONCAT('%',#{modelUse},'%')
+ </if>
+ <if test="state != null and state != ''">
+ and o.state = #{state}
+ </if>
+ <if test="roleType != null and roleType != '' and roleType == 2">
+ and (o.companyId = #{nowUserId} or FIND_IN_SET(o.companyId,(SELECT GROUP_CONCAT(id) as ids FROM t_company where superiorId = #{nowUserId} GROUP BY superiorId)))
+ </if>
+ <if test="roleType != null and roleType != '' and roleType == 3">
+ and o.companyId = #{nowUserId}
+ </if>
+ </where>
+ order by o.id desc
+ </select>
+
+</mapper>
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TOrderCrossCityMapper.xml b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TOrderCrossCityMapper.xml
new file mode 100644
index 0000000..74d2fe5
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TOrderCrossCityMapper.xml
@@ -0,0 +1,240 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.stylefeng.guns.modular.system.dao.TOrderCrossCityMapper">
+
+ <!-- 通用查询映射结果 -->
+ <resultMap id="BaseResultMap" type="com.stylefeng.guns.modular.system.model.TOrderCrossCity">
+ <id column="id" property="id" />
+ <result column="userId" property="userId" />
+ <result column="driverId" property="driverId" />
+ <result column="lineId" property="lineId" />
+ <result column="lineShiftDriverId" property="lineShiftDriverId"/>
+ <result column="carId" property="carId" />
+ <result column="serverCarModelId" property="serverCarModelId" />
+ <result column="orderNum" property="orderNum" />
+ <result column="placementLon" property="placementLon" />
+ <result column="placementLat" property="placementLat" />
+ <result column="placementAddress" property="placementAddress" />
+ <result column="startLon" property="startLon" />
+ <result column="startLat" property="startLat" />
+ <result column="endLon" property="endLon" />
+ <result column="startAddress" property="startAddress" />
+ <result column="endLat" property="endLat" />
+ <result column="endAddress" property="endAddress" />
+ <result column="boardingLon" property="boardingLon" />
+ <result column="boardingLat" property="boardingLat" />
+ <result column="boardingAddress" property="boardingAddress" />
+ <result column="boardingTime" property="boardingTime" />
+ <result column="getoffLon" property="getoffLon" />
+ <result column="getoffLat" property="getoffLat" />
+ <result column="getoffAddress" property="getoffAddress" />
+ <result column="getoffTime" property="getoffTime" />
+ <result column="mileage" property="mileage" />
+ <result column="payManner" property="payManner" />
+ <result column="payType" property="payType" />
+ <result column="orderMoney" property="orderMoney" />
+ <result column="redPacketMoney" property="redPacketMoney" />
+ <result column="couponMoney" property="couponMoney" />
+ <result column="redPacketId" property="redPacketId" />
+ <result column="couponId" property="couponId" />
+ <result column="discount" property="discount" />
+ <result column="discountMoney" property="discountMoney" />
+ <result column="activityId" property="activityId" />
+ <result column="companyId" property="companyId" />
+ <result column="payMoney" property="payMoney" />
+ <result column="passengers" property="passengers" />
+ <result column="passengersPhone" property="passengersPhone" />
+ <result column="sort" property="sort" />
+ <result column="insertTime" property="insertTime" />
+ <result column="travelTime" property="travelTime" />
+ <result column="snatchOrderTime" property="snatchOrderTime" />
+ <result column="setOutTime" property="setOutTime" />
+ <result column="arriveTime" property="arriveTime" />
+ <result column="startServiceTime" property="startServiceTime" />
+ <result column="endServiceTime" property="endServiceTime" />
+ <result column="travelMode" property="travelMode" />
+ <result column="orderSource" property="orderSource" />
+ <result column="invoiceId" property="invoiceId" />
+ <result column="trackId" property="trackId" />
+ <result column="state" property="state" />
+ <result column="isReassign" property="isReassign"/>
+ <result column="isDelete" property="isDelete" />
+ <result column="telX" property="telX" />
+ <result column="bindId" property="bindId" />
+ <result column="peopleNumber" property="peopleNumber"/>
+ <result column="seatNumber" property="seatNumber"/>
+ </resultMap>
+
+ <!-- 通用查询结果列 -->
+ <sql id="Base_Column_List">
+ id, userId, driverId, lineId, carId, serverCarModelId, orderNum, placementLon, placementLat, placementAddress, startLon, startLat, endLon, startAddress, endLat, endAddress, boardingLon, boardingLat, boardingAddress, boardingTime, getoffLon, getoffLat, getoffAddress, getoffTime, mileage, payManner, payType, orderMoney, redPacketMoney, couponMoney, redPacketId, couponId, discount, discountMoney, activityId, companyId, payMoney, passengers, passengersPhone, sort, insertTime, travelTime, snatchOrderTime, setOutTime, arriveTime, startServiceTime, endServiceTime, travelMode, orderSource, invoiceId, trackId, state, isDelete, telX, bindId
+ </sql>
+
+ <!--根据条件查询跨城出行订单列表-->
+ <select id="getCrossCityOrderList" resultType="map" parameterType="com.baomidou.mybatisplus.plugins.Page">
+ SELECT * FROM (
+ SELECT ui.nickName as userName,ui.phone as userPhone,CONCAT(di.`name`,'-',di.phone) as driver,CONCAT(cb.`name`,'-',ci.carLicensePlate) as car,
+ sc.`name` as serverCarModel,ll.`name` as lineName,ot.* FROM t_order_cross_city as ot
+ LEFT JOIN t_user as ui on ui.id = ot.userId
+ LEFT JOIN t_driver as di on di.id = ot.driverId
+ LEFT JOIN t_car as ci on ci.id= ot.carId
+ LEFT JOIN t_car_brand as cb on cb.id = ci.carBrandId
+ LEFT JOIN t_server_carmodel as sc on sc.id = ot.serverCarModelId
+ LEFT JOIN t_line as ll on ll.id = ot.lineId
+ ) as o
+ <where>
+ o.isDelete = 1
+ <if test="beginTime != null and beginTime != '' and endTime != null and endTime != ''">
+ AND (o.insertTime between CONCAT(#{beginTime},' 00:00:00') and CONCAT(#{endTime},' 23:59:59'))
+ </if>
+ <if test="orderNum != null and orderNum != ''">
+ and o.orderNum LIKE CONCAT('%',#{orderNum},'%')
+ </if>
+ <if test="orderSource != null and orderSource != ''">
+ and o.orderSource = #{orderSource}
+ </if>
+ <if test="userName != null and userName != ''">
+ and o.userName LIKE CONCAT('%',#{userName},'%')
+ </if>
+ <if test="userPhone != null and userPhone != ''">
+ and o.userPhone LIKE CONCAT('%',#{userPhone},'%')
+ </if>
+ <if test="passengers != null and passengers != ''">
+ and o.passengers LIKE CONCAT('%',#{passengers},'%')
+ </if>
+ <if test="passengersPhone != null and passengersPhone != ''">
+ and o.passengersPhone LIKE CONCAT('%',#{passengersPhone},'%')
+ </if>
+ <if test="serverCarModelId != null and serverCarModelId != ''">
+ and o.serverCarModelId = #{serverCarModelId}
+ </if>
+ <if test="driver != null and driver != ''">
+ and o.driver LIKE CONCAT('%',#{driver},'%')
+ </if>
+ <if test="lineId != null and lineId != ''">
+ and o.lineId = #{lineId}
+ </if>
+ <if test="state != null and state != ''">
+ and o.state = #{state}
+ </if>
+ <if test="roleType != null and roleType != '' and roleType == 2">
+ and (o.companyId = #{nowUserId} or FIND_IN_SET(o.companyId,(SELECT GROUP_CONCAT(id) as ids FROM t_company where superiorId = #{nowUserId} GROUP BY superiorId)))
+ </if>
+ <if test="roleType != null and roleType != '' and roleType == 3">
+ and o.companyId = #{nowUserId}
+ </if>
+ </where>
+ order by o.id desc
+ </select>
+
+ <!--根据跨城出行订单ID获取跨城出行订单详情-->
+ <select id="getCrossCityOrderDetailById" resultType="map">
+ SELECT
+ DATE_FORMAT(ot.insertTime,'%Y-%m-%d %H:%i') as insertTimeStr,
+ DATE_FORMAT(ot.travelTime,'%Y-%m-%d %H:%i') as travelTimeStr,
+ DATE_FORMAT(ot.boardingTime,'%Y-%m-%d %H:%i') as boardingTimeStr,
+ DATE_FORMAT(ot.getoffTime,'%Y-%m-%d %H:%i') as getoffTimeStr,
+ case when ot.orderSource = 1 then 'APP下单'
+ when ot.orderSource = 2 then '扫码下单'
+ when ot.orderSource = 3 then '小程序下单'
+ when ot.orderSource = 4 then '司机下单'
+ when ot.orderSource = 5 then '调度下单' else '' end orderSourceStr,
+ ui.nickName as userName,ui.phone as userPhone,
+ case when ot.payType = 1 then '微信'
+ when ot.payType = 2 then '支付宝'
+ when ot.payType = 3 then '余额' else '' end as payTypeStr,
+ sc.`name` as serverCarModel,
+ CONCAT(di.`name`,'-',di.phone) as driver,
+ CONCAT(cb.`name`,'-',ci.carLicensePlate) as car,
+ ll.`name` as lineName,
+ cc.`name` as companyName,ot.*
+ FROM t_order_cross_city as ot
+ LEFT JOIN t_user as ui on ui.id = ot.userId
+ LEFT JOIN t_driver as di on di.id = ot.driverId
+ LEFT JOIN t_car as ci on ci.id= ot.carId
+ LEFT JOIN t_car_brand as cb on cb.id = ci.carBrandId
+ LEFT JOIN t_company as cc on cc.id = ot.companyId
+ LEFT JOIN t_server_carmodel as sc on sc.id = ot.serverCarModelId
+ LEFT JOIN t_line as ll on ll.id = ot.lineId
+ where ot.id = #{orderId}
+ </select>
+
+
+ <select id="queryOrders" resultType="TOrderCrossCity">
+ select
+ id as id,
+ userId as userId,
+ serverCarModelId as serverCarModelId,
+ driverId as driverId,
+ lineId as lineId,
+ lineShiftDriverId as lineShiftDriverId,
+ carId as carId,
+ orderNum as orderNum,
+ placementLon as placementLon,
+ placementLat as placementLat,
+ placementAddress as placementAddress,
+ startLon as startLon,
+ startLat as startLat,
+ startAddress as startAddress,
+ endLon as endLon,
+ endLat as endLat,
+ endAddress as endAddress,
+ boardingLon as boardingLon,
+ boardingLat as boardingLat,
+ boardingAddress as boardingAddress,
+ boardingTime as boardingTime,
+ getoffLon as getoffLon,
+ getoffLat as getoffLat,
+ getoffAddress as getoffAddress,
+ getoffTime as getoffTime,
+ mileage as mileage,
+ payManner as payManner,
+ payType as payType,
+ orderMoney as orderMoney,
+ redPacketMoney as redPacketMoney,
+ couponMoney as couponMoney,
+ redPacketId as redPacketId,
+ couponId as couponId,
+ discount as discount,
+ discountMoney as discountMoney,
+ activityId as activityId,
+ companyId as companyId,
+ payMoney as payMoney,
+ passengers as passengers,
+ passengersPhone as passengersPhone,
+ peopleNumber as peopleNumber,
+ seatNumber as seatNumber,
+ sort as sort,
+ state as state,
+ insertTime as insertTime,
+ travelTime as travelTime,
+ snatchOrderTime as snatchOrderTime,
+ setOutTime as setOutTime,
+ arriveTime as arriveTime,
+ startServiceTime as startServiceTime,
+ endServiceTime as endServiceTime,
+ travelMode as travelMode,
+ orderSource as orderSource,
+ isReassign as isReassign,
+ reassignNotice as reassignNotice,
+ invoiceId as invoiceId,
+ trackId as trackId,
+ isDelete as isDelete,
+ oldState as oldState,
+ telX as telX,
+ bindId as bindId
+ from t_order_cross_city where isDelete = 1
+ <if test="null != driverId">
+ and driverId = #{driverId}
+ </if>
+ <if test="null != lineShiftDriverId">
+ and lineShiftDriverId = #{lineShiftDriverId}
+ </if>
+ <if test="null != state">
+ and state in
+ <foreach collection="state" item="item" index="index" open="(" separator="," close=")">
+ #{item}
+ </foreach>
+ </if>
+ </select>
+</mapper>
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TOrderEvaluateMapper.xml b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TOrderEvaluateMapper.xml
new file mode 100644
index 0000000..982c99b
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TOrderEvaluateMapper.xml
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.stylefeng.guns.modular.system.dao.TOrderEvaluateMapper">
+
+ <!-- 通用查询映射结果 -->
+ <resultMap id="BaseResultMap" type="com.stylefeng.guns.modular.system.model.TOrderEvaluate">
+ <id column="id" property="id" />
+ <result column="orderId" property="orderId" />
+ <result column="driverId" property="driverId" />
+ <result column="orderType" property="orderType" />
+ <result column="fraction" property="fraction" />
+ <result column="content" property="content" />
+ <result column="insertTime" property="insertTime" />
+ <result column="userId" property="userId" />
+ </resultMap>
+
+ <!-- 通用查询结果列 -->
+ <sql id="Base_Column_List">
+ id, orderId, driverId, orderType, fraction, content, insertTime, userId
+ </sql>
+
+ <!--根据条件查询评价列表-->
+ <select id="getOrderEvaluateList" resultType="map" parameterType="com.baomidou.mybatisplus.plugins.Page">
+ SELECT * FROM (SELECT di.companyId,di.franchiseeId,ui.nickName as userName,ui.phone as userPhone,di.`name` as driverName,di.phone as driverPhone,oe.* FROM t_order_evaluate as oe
+ LEFT JOIN t_user as ui on ui.id = oe.userId
+ LEFT JOIN t_driver as di on di.id = oe.driverId) as o
+ <where>
+ 1 = 1
+ <if test="beginTime != null and beginTime != '' and endTime != null and endTime != ''">
+ AND (o.insertTime between CONCAT(#{beginTime},' 00:00:00') and CONCAT(#{endTime},' 23:59:59'))
+ </if>
+ <if test="userName != null and userName != ''">
+ and o.userName LIKE CONCAT('%',#{userName},'%')
+ </if>
+ <if test="userPhone != null and userPhone != ''">
+ and o.userPhone LIKE CONCAT('%',#{userPhone},'%')
+ </if>
+ <if test="driverName != null and driverName != ''">
+ and o.driverName LIKE CONCAT('%',#{driverName},'%')
+ </if>
+ <if test="driverPhone != null and driverPhone != ''">
+ and o.driverPhone LIKE CONCAT('%',#{driverPhone},'%')
+ </if>
+ <if test="fraction != null and fraction != ''">
+ and o.fraction LIKE CONCAT('%',#{fraction},'%')
+ </if>
+ <if test="orderType != null and orderType != ''">
+ and o.orderType = #{orderType}
+ </if>
+ <if test="roleType != null and roleType != '' and roleType == 2">
+ and o.companyId = #{nowUserId} and (o.franchiseeId = 0 or o.franchiseeId is null)
+ </if>
+ <if test="roleType != null and roleType != '' and roleType == 3">
+ and o.franchiseeId = #{nowUserId}
+ </if>
+ </where>
+ order by o.id desc
+ </select>
+
+</mapper>
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TOrderLogisticsMapper.xml b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TOrderLogisticsMapper.xml
new file mode 100644
index 0000000..26c25ae
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TOrderLogisticsMapper.xml
@@ -0,0 +1,146 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.stylefeng.guns.modular.system.dao.TOrderLogisticsMapper">
+
+ <!-- 通用查询映射结果 -->
+ <resultMap id="BaseResultMap" type="com.stylefeng.guns.modular.system.model.TOrderLogistics">
+ <id column="id" property="id" />
+ <result column="type" property="type" />
+ <result column="userId" property="userId" />
+ <result column="driverId" property="driverId" />
+ <result column="carId" property="carId" />
+ <result column="orderNum" property="orderNum" />
+ <result column="cargoType" property="cargoType" />
+ <result column="cargoNumber" property="cargoNumber" />
+ <result column="remark" property="remark" />
+ <result column="placementLon" property="placementLon" />
+ <result column="placementLat" property="placementLat" />
+ <result column="placementAddress" property="placementAddress" />
+ <result column="startLon" property="startLon" />
+ <result column="startLat" property="startLat" />
+ <result column="startAddress" property="startAddress" />
+ <result column="endLon" property="endLon" />
+ <result column="endLat" property="endLat" />
+ <result column="endAddress" property="endAddress" />
+ <result column="recipient" property="recipient" />
+ <result column="recipientPhone" property="recipientPhone" />
+ <result column="boardingLon" property="boardingLon" />
+ <result column="boardingLat" property="boardingLat" />
+ <result column="boardingAddress" property="boardingAddress" />
+ <result column="boardingTime" property="boardingTime" />
+ <result column="getoffLon" property="getoffLon" />
+ <result column="getoffLat" property="getoffLat" />
+ <result column="getoffAddress" property="getoffAddress" />
+ <result column="getoffTime" property="getoffTime" />
+ <result column="mileage" property="mileage" />
+ <result column="payManner" property="payManner" />
+ <result column="payType" property="payType" />
+ <result column="orderMoney" property="orderMoney" />
+ <result column="travelMoney" property="travelMoney" />
+ <result column="tipMoney" property="tipMoney" />
+ <result column="redPacketMoney" property="redPacketMoney" />
+ <result column="couponMoney" property="couponMoney" />
+ <result column="redPacketId" property="redPacketId" />
+ <result column="couponId" property="couponId" />
+ <result column="discount" property="discount" />
+ <result column="discountMoney" property="discountMoney" />
+ <result column="activityId" property="activityId" />
+ <result column="companyId" property="companyId" />
+ <result column="payMoney" property="payMoney" />
+ <result column="state" property="state" />
+ <result column="insertTime" property="insertTime" />
+ <result column="travelTime" property="travelTime" />
+ <result column="snatchOrderTime" property="snatchOrderTime" />
+ <result column="setOutTime" property="setOutTime" />
+ <result column="arriveTime" property="arriveTime" />
+ <result column="startServiceTime" property="startServiceTime" />
+ <result column="endServiceTime" property="endServiceTime" />
+ <result column="orderSource" property="orderSource" />
+ <result column="invoiceId" property="invoiceId" />
+ <result column="trackId" property="trackId" />
+ <result column="isDelete" property="isDelete" />
+ <result column="oldState" property="oldState"/>
+ <result column="telX" property="telX" />
+ <result column="bindId" property="bindId" />
+ </resultMap>
+
+ <!-- 通用查询结果列 -->
+ <sql id="Base_Column_List">
+ id, type, userId, driverId, carId, orderNum, cargoType, cargoNumber, remark, placementLon, placementLat, placementAddress, startLon, startLat, startAddress, endLon, endLat, endAddress, recipient, recipientPhone, boardingLon, boardingLat, boardingAddress, boardingTime, getoffLon, getoffLat, getoffAddress, getoffTime, mileage, payManner, payType, orderMoney, travelMoney, tipMoney, redPacketMoney, couponMoney, redPacketId, couponId, discount, discountMoney, activityId, companyId, payMoney, state, insertTime, travelTime, snatchOrderTime, setOutTime, arriveTime, startServiceTime, endServiceTime, orderSource, invoiceId, trackId, isDelete, telX, bindId
+ </sql>
+
+ <!--根据条件查询小件物流订单列表-->
+ <select id="getLogisticsOrderList" resultType="map" parameterType="com.baomidou.mybatisplus.plugins.Page">
+ SELECT * FROM (SELECT ui.nickName as userName,ui.phone as userPhone,CONCAT(di.`name`,'-',di.phone) as driver,CONCAT(cb.`name`,'-',ci.carLicensePlate) as car,
+ ot.* FROM t_order_logistics as ot
+ LEFT JOIN t_user as ui on ui.id = ot.userId
+ LEFT JOIN t_driver as di on di.id = ot.driverId
+ LEFT JOIN t_car as ci on ci.id= ot.carId
+ LEFT JOIN t_car_brand as cb on cb.id = ci.carBrandId) as o
+ <where>
+ o.isDelete = 1
+ <if test="beginTime != null and beginTime != '' and endTime != null and endTime != ''">
+ AND (o.insertTime between CONCAT(#{beginTime},' 00:00:00') and CONCAT(#{endTime},' 23:59:59'))
+ </if>
+ <if test="orderNum != null and orderNum != ''">
+ and o.orderNum LIKE CONCAT('%',#{orderNum},'%')
+ </if>
+ <if test="orderSource != null and orderSource != ''">
+ and o.orderSource = #{orderSource}
+ </if>
+ <if test="type != null and type != ''">
+ and o.type = #{type}
+ </if>
+ <if test="userName != null and userName != ''">
+ and o.userName LIKE CONCAT('%',#{userName},'%')
+ </if>
+ <if test="userPhone != null and userPhone != ''">
+ and o.userPhone LIKE CONCAT('%',#{userPhone},'%')
+ </if>
+ <if test="recipient != null and recipient != ''">
+ and o.recipient LIKE CONCAT('%',#{recipient},'%')
+ </if>
+ <if test="recipientPhone != null and recipientPhone != ''">
+ and o.recipientPhone LIKE CONCAT('%',#{recipientPhone},'%')
+ </if>
+ <if test="driver != null and driver != ''">
+ and o.driver LIKE CONCAT('%',#{driver},'%')
+ </if>
+ <if test="state != null and state != ''">
+ and o.state = #{state}
+ </if>
+ <if test="roleType != null and roleType != '' and roleType == 2">
+ and (o.companyId = #{nowUserId} or FIND_IN_SET(o.companyId,(SELECT GROUP_CONCAT(id) as ids FROM t_company where superiorId = #{nowUserId} GROUP BY superiorId)))
+ </if>
+ <if test="roleType != null and roleType != '' and roleType == 3">
+ and o.companyId = #{nowUserId}
+ </if>
+ </where>
+ order by o.id desc
+ </select>
+
+ <!--根据专车订单ID获取小件物流订单详情-->
+ <select id="getLogisticsOrderDetailById" resultType="map">
+ SELECT
+ DATE_FORMAT(ot.insertTime,'%Y-%m-%d %H:%i') as insertTimeStr,
+ DATE_FORMAT(ot.travelTime,'%Y-%m-%d %H:%i') as travelTimeStr,
+ case when ot.orderSource = 1 then 'APP下单'
+ when ot.orderSource = 2 then '扫码下单'
+ when ot.orderSource = 3 then '小程序下单'
+ when ot.orderSource = 4 then '司机下单'
+ when ot.orderSource = 5 then '调度下单' else '' end orderSourceStr,
+ case when ot.payType = 1 then '微信'
+ when ot.payType = 2 then '支付宝'
+ when ot.payType = 3 then '余额' else '' end as payTypeStr,
+ ui.nickName as userName,ui.phone as userPhone,
+ CONCAT(di.`name`,'-',di.phone) as driver,CONCAT(cb.`name`,'-',ci.carLicensePlate) as car,
+ ot.* FROM t_order_logistics as ot
+ LEFT JOIN t_user as ui on ui.id = ot.userId
+ LEFT JOIN t_driver as di on di.id = ot.driverId
+ LEFT JOIN t_car as ci on ci.id= ot.carId
+ LEFT JOIN t_car_brand as cb on cb.id = ci.carBrandId
+ LEFT JOIN t_company as cc on cc.id = ot.companyId
+ where ot.id = #{orderId}
+ </select>
+
+</mapper>
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TOrderPositionMapper.xml b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TOrderPositionMapper.xml
new file mode 100644
index 0000000..7a48175
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TOrderPositionMapper.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.stylefeng.guns.modular.system.dao.TOrderPositionMapper">
+
+ <!-- 通用查询映射结果 -->
+ <resultMap id="BaseResultMap" type="com.stylefeng.guns.modular.system.model.TOrderPosition">
+ <id column="id" property="id" />
+ <result column="orderType" property="orderType" />
+ <result column="orderId" property="orderId" />
+ <result column="driverId" property="driverId" />
+ <result column="lon" property="lon" />
+ <result column="lat" property="lat" />
+ <result column="insertTime" property="insertTime" />
+ </resultMap>
+
+ <!-- 通用查询结果列 -->
+ <sql id="Base_Column_List">
+ id, orderType, orderId, driverId, lon, lat, insertTime
+ </sql>
+
+</mapper>
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TOrderPrivateCarMapper.xml b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TOrderPrivateCarMapper.xml
new file mode 100644
index 0000000..ac20118
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TOrderPrivateCarMapper.xml
@@ -0,0 +1,168 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.stylefeng.guns.modular.system.dao.TOrderPrivateCarMapper">
+
+ <!-- 通用查询映射结果 -->
+ <resultMap id="BaseResultMap" type="com.stylefeng.guns.modular.system.model.TOrderPrivateCar">
+ <id column="id" property="id" />
+ <result column="type" property="type" />
+ <result column="userId" property="userId" />
+ <result column="driverId" property="driverId" />
+ <result column="carId" property="carId" />
+ <result column="orderNum" property="orderNum" />
+ <result column="placementLon" property="placementLon" />
+ <result column="placementLat" property="placementLat" />
+ <result column="placementAddress" property="placementAddress" />
+ <result column="startLon" property="startLon" />
+ <result column="startLat" property="startLat" />
+ <result column="endLon" property="endLon" />
+ <result column="startAddress" property="startAddress" />
+ <result column="endLat" property="endLat" />
+ <result column="endAddress" property="endAddress" />
+ <result column="boardingLon" property="boardingLon" />
+ <result column="boardingLat" property="boardingLat" />
+ <result column="boardingAddress" property="boardingAddress" />
+ <result column="boardingTime" property="boardingTime" />
+ <result column="getoffLon" property="getoffLon" />
+ <result column="getoffLat" property="getoffLat" />
+ <result column="getoffAddress" property="getoffAddress" />
+ <result column="getoffTime" property="getoffTime" />
+ <result column="mileage" property="mileage" />
+ <result column="payManner" property="payManner" />
+ <result column="payType" property="payType" />
+ <result column="orderMoney" property="orderMoney" />
+ <result column="startMoney" property="startMoney" />
+ <result column="mileageMoney" property="mileageMoney" />
+ <result column="durationMoney" property="durationMoney" />
+ <result column="longDistanceMoney" property="longDistanceMoney" />
+ <result column="parkMoney" property="parkMoney" />
+ <result column="roadTollMoney" property="roadTollMoney" />
+ <result column="redPacketMoney" property="redPacketMoney" />
+ <result column="couponMoney" property="couponMoney" />
+ <result column="redPacketId" property="redPacketId" />
+ <result column="couponId" property="couponId" />
+ <result column="discount" property="discount" />
+ <result column="discountMoney" property="discountMoney" />
+ <result column="activityId" property="activityId" />
+ <result column="companyId" property="companyId" />
+ <result column="payMoney" property="payMoney" />
+ <result column="substitute" property="substitute" />
+ <result column="passengers" property="passengers" />
+ <result column="passengersPhone" property="passengersPhone" />
+ <result column="state" property="state" />
+ <result column="insertTime" property="insertTime" />
+ <result column="travelTime" property="travelTime" />
+ <result column="snatchOrderTime" property="snatchOrderTime" />
+ <result column="setOutTime" property="setOutTime" />
+ <result column="arriveTime" property="arriveTime" />
+ <result column="startServiceTime" property="startServiceTime" />
+ <result column="endServiceTime" property="endServiceTime" />
+ <result column="orderType" property="orderType" />
+ <result column="orderSource" property="orderSource" />
+ <result column="invoiceId" property="invoiceId" />
+ <result column="isReassign" property="isReassign" />
+ <result column="reassignNotice" property="reassignNotice" />
+ <result column="trackId" property="trackId" />
+ <result column="isDelete" property="isDelete" />
+ <result column="oldState" property="oldState" />
+ <result column="telX" property="telX" />
+ <result column="bindId" property="bindId" />
+ <result column="serverCarModelId" property="serverCarModelId" />
+ </resultMap>
+
+ <!-- 通用查询结果列 -->
+ <sql id="Base_Column_List">
+ id, type, userId, driverId, carId, orderNum, placementLon, placementLat, placementAddress, startLon, startLat, endLon, startAddress, endLat, endAddress, boardingLon, boardingLat, boardingAddress, boardingTime, getoffLon, getoffLat, getoffAddress, getoffTime, mileage, payManner, payType, orderMoney, startMoney, mileageMoney, durationMoney, longDistanceMoney, parkMoney, roadTollMoney, redPacketMoney, couponMoney, redPacketId, couponId, discount, discountMoney, activityId, companyId, payMoney, substitute, passengers, passengersPhone, state, insertTime, travelTime, snatchOrderTime, setOutTime, arriveTime, startServiceTime, endServiceTime, orderType, orderSource, invoiceId, isReassign, reassignNotice, trackId, isDelete, oldState, telX, bindId, serverCarModelId
+ </sql>
+
+ <!--根据条件查询专车订单列表-->
+ <select id="getPrivateCarOrderList" resultType="map" parameterType="com.baomidou.mybatisplus.plugins.Page">
+ SELECT * FROM (SELECT ui.nickName as userName,ui.phone as userPhone,CONCAT(di.`name`,'-',di.phone) as driver,CONCAT(cb.`name`,'-',ci.carLicensePlate) as car,
+ sc.`name` as serverCarModel,ot.* FROM t_order_private_car as ot
+ LEFT JOIN t_user as ui on ui.id = ot.userId
+ LEFT JOIN t_driver as di on di.id = ot.driverId
+ LEFT JOIN t_car as ci on ci.id= ot.carId
+ LEFT JOIN t_car_brand as cb on cb.id = ci.carBrandId
+ LEFT JOIN t_server_carmodel as sc on sc.id = ot.serverCarModelId
+ ) as o
+ <where>
+ o.isDelete = 1 and o.type = 1
+ <if test="beginTime != null and beginTime != '' and endTime != null and endTime != ''">
+ AND (o.insertTime between CONCAT(#{beginTime},' 00:00:00') and CONCAT(#{endTime},' 23:59:59'))
+ </if>
+ <if test="orderNum != null and orderNum != ''">
+ and o.orderNum LIKE CONCAT('%',#{orderNum},'%')
+ </if>
+ <if test="orderSource != null and orderSource != ''">
+ and o.orderSource = #{orderSource}
+ </if>
+ <if test="userName != null and userName != ''">
+ and o.userName LIKE CONCAT('%',#{userName},'%')
+ </if>
+ <if test="userPhone != null and userPhone != ''">
+ and o.userPhone LIKE CONCAT('%',#{userPhone},'%')
+ </if>
+ <if test="passengers != null and passengers != ''">
+ and o.passengers LIKE CONCAT('%',#{passengers},'%')
+ </if>
+ <if test="passengersPhone != null and passengersPhone != ''">
+ and o.passengersPhone LIKE CONCAT('%',#{passengersPhone},'%')
+ </if>
+ <if test="serverCarModelId != null and serverCarModelId != ''">
+ and o.serverCarModelId = #{serverCarModelId}
+ </if>
+ <if test="driver != null and driver != ''">
+ and o.driver LIKE CONCAT('%',#{driver},'%')
+ </if>
+ <if test="state != null and state != ''">
+ and o.state = #{state}
+ </if>
+ <if test="roleType != null and roleType != '' and roleType == 2">
+ and (o.companyId = #{nowUserId} or FIND_IN_SET(o.companyId,(SELECT GROUP_CONCAT(id) as ids FROM t_company where superiorId = #{nowUserId} GROUP BY superiorId)))
+ </if>
+ <if test="roleType != null and roleType != '' and roleType == 3">
+ and o.companyId = #{nowUserId}
+ </if>
+ </where>
+ order by o.id desc
+ </select>
+
+ <!--根据专车订单ID获取专车订单详情-->
+ <select id="getPrivateCarOrderDetailById" resultType="map">
+ SELECT
+ DATE_FORMAT(ot.insertTime,'%Y-%m-%d %H:%i') as insertTimeStr,
+ DATE_FORMAT(ot.travelTime,'%Y-%m-%d %H:%i') as travelTimeStr,
+ DATE_FORMAT(ot.boardingTime,'%Y-%m-%d %H:%i') as boardingTimeStr,
+ DATE_FORMAT(ot.getoffTime,'%Y-%m-%d %H:%i') as getoffTimeStr,
+ case when ot.orderSource = 1 then 'APP下单'
+ when ot.orderSource = 2 then '扫码下单'
+ when ot.orderSource = 3 then '小程序下单'
+ when ot.orderSource = 4 then '司机下单'
+ when ot.orderSource = 5 then '调度下单' else '' end orderSourceStr,
+ ui.nickName as userName,ui.phone as userPhone,
+ case when ot.payType = 1 then '微信'
+ when ot.payType = 2 then '支付宝'
+ when ot.payType = 3 then '余额' else '' end as payTypeStr,
+ sc.`name` as serverCarModel,
+ case when income1.type = 1 then income1.money else 0 end as platIncome,
+ case when income1.type = 2 then income1.money else 0 end as companyIncome,
+ case when income1.type = 3 then income1.money else 0 end as franchiseeIncome,
+ IFNULL(income2.money,0) as driverIncome,
+ CONCAT(di.`name`,'-',di.phone) as driver,
+ CONCAT(cb.`name`,'-',ci.carLicensePlate) as car,
+ cc.`name` as companyName,ot.*
+ FROM t_order_private_car as ot
+ LEFT JOIN t_user as ui on ui.id = ot.userId
+ LEFT JOIN t_driver as di on di.id = ot.driverId
+ LEFT JOIN t_car as ci on ci.id= ot.carId
+ LEFT JOIN t_car_brand as cb on cb.id = ci.carBrandId
+ LEFT JOIN t_company as cc on cc.id = ot.companyId
+ LEFT JOIN t_server_carmodel as sc on sc.id = ot.serverCarModelId
+ LEFT JOIN (SELECT ii.money,ii.incomeId,cc.type FROM t_income as ii
+ LEFT JOIN t_company as cc on ii.objectId = cc.id
+ where ii.userType = 1 and ii.type = 2 and ii.orderType = 1 GROUP BY ii.incomeId) as income1 on income1.incomeId = ot.id
+ LEFT JOIN (SELECT * FROM t_income where userType = 2 and type = 2 and orderType = 1 GROUP BY incomeId) as income2 on income2.incomeId = ot.id
+ where ot.id = #{orderId}
+ </select>
+
+</mapper>
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TOrderTaxiMapper.xml b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TOrderTaxiMapper.xml
new file mode 100644
index 0000000..47a81a8
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TOrderTaxiMapper.xml
@@ -0,0 +1,263 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.stylefeng.guns.modular.system.dao.TOrderTaxiMapper">
+
+ <!-- 通用查询映射结果 -->
+ <resultMap id="BaseResultMap" type="com.stylefeng.guns.modular.system.model.TOrderTaxi">
+ <id column="id" property="id" />
+ <result column="userId" property="userId" />
+ <result column="driverId" property="driverId" />
+ <result column="carId" property="carId" />
+ <result column="orderNum" property="orderNum" />
+ <result column="placementLon" property="placementLon" />
+ <result column="placementLat" property="placementLat" />
+ <result column="placementAddress" property="placementAddress" />
+ <result column="startLon" property="startLon" />
+ <result column="startLat" property="startLat" />
+ <result column="endLon" property="endLon" />
+ <result column="startAddress" property="startAddress" />
+ <result column="endLat" property="endLat" />
+ <result column="endAddress" property="endAddress" />
+ <result column="boardingLon" property="boardingLon" />
+ <result column="boardingLat" property="boardingLat" />
+ <result column="boardingAddress" property="boardingAddress" />
+ <result column="boardingTime" property="boardingTime" />
+ <result column="getoffLon" property="getoffLon" />
+ <result column="getoffLat" property="getoffLat" />
+ <result column="getoffAddress" property="getoffAddress" />
+ <result column="getoffTime" property="getoffTime" />
+ <result column="mileage" property="mileage" />
+ <result column="payManner" property="payManner" />
+ <result column="payType" property="payType" />
+ <result column="orderMoney" property="orderMoney" />
+ <result column="travelMoney" property="travelMoney" />
+ <result column="parkMoney" property="parkMoney" />
+ <result column="roadTollMoney" property="roadTollMoney" />
+ <result column="tipMoney" property="tipMoney" />
+ <result column="redPacketMoney" property="redPacketMoney" />
+ <result column="couponMoney" property="couponMoney" />
+ <result column="redPacketId" property="redPacketId" />
+ <result column="couponId" property="couponId" />
+ <result column="companyId" property="companyId" />
+ <result column="payMoney" property="payMoney" />
+ <result column="substitute" property="substitute" />
+ <result column="passengers" property="passengers" />
+ <result column="passengersPhone" property="passengersPhone" />
+ <result column="state" property="state" />
+ <result column="insertTime" property="insertTime" />
+ <result column="travelTime" property="travelTime" />
+ <result column="snatchOrderTime" property="snatchOrderTime" />
+ <result column="setOutTime" property="setOutTime" />
+ <result column="arriveTime" property="arriveTime" />
+ <result column="startServiceTime" property="startServiceTime" />
+ <result column="endServiceTime" property="endServiceTime" />
+ <result column="orderType" property="orderType" />
+ <result column="orderSource" property="orderSource" />
+ <result column="invoiceId" property="invoiceId" />
+ <result column="isReassign" property="isReassign" />
+ </resultMap>
+
+ <!-- 通用查询结果列 -->
+ <sql id="Base_Column_List">
+ id, userId, driverId, carId, orderNum, placementLon, placementLat, placementAddress, startLon, startLat, endLon, startAddress, endLat, endAddress, boardingLon, boardingLat, boardingAddress, boardingTime, getoffLon, getoffLat, getoffAddress, getoffTime, mileage, payManner, payType, orderMoney, travelMoney, parkMoney, roadTollMoney, tipMoney, redPacketMoney, couponMoney, redPacketId, couponId, companyId, payMoney, substitute, passengers, passengersPhone, state, insertTime, travelTime, snatchOrderTime, setOutTime, arriveTime, startServiceTime, endServiceTime, orderType, orderSource, invoiceId, isReassign
+ </sql>
+
+ <!--根据条件查询出租车订单列表-->
+ <select id="getTaxiOrderList" resultType="map" parameterType="com.baomidou.mybatisplus.plugins.Page">
+ SELECT * FROM (SELECT ui.nickName as userName,ui.phone as userPhone,CONCAT(di.`name`,'-',di.phone) as driver,CONCAT(cb.`name`,'-',ci.carLicensePlate) as car,
+ ot.* FROM t_order_taxi as ot
+ LEFT JOIN t_user as ui on ui.id = ot.userId
+ LEFT JOIN t_driver as di on di.id = ot.driverId
+ LEFT JOIN t_car as ci on ci.id= ot.carId
+ LEFT JOIN t_car_brand as cb on cb.id = ci.carBrandId) as o
+ <where>
+ o.isDelete = 1 and o.type = 1
+ <if test="beginTime != null and beginTime != '' and endTime != null and endTime != ''">
+ AND (o.insertTime between CONCAT(#{beginTime},' 00:00:00') and CONCAT(#{endTime},' 23:59:59'))
+ </if>
+ <if test="orderNum != null and orderNum != ''">
+ and o.orderNum LIKE CONCAT('%',#{orderNum},'%')
+ </if>
+ <if test="orderSource != null and orderSource != ''">
+ and o.orderSource = #{orderSource}
+ </if>
+ <if test="userName != null and userName != ''">
+ and o.userName LIKE CONCAT('%',#{userName},'%')
+ </if>
+ <if test="userPhone != null and userPhone != ''">
+ and o.userPhone LIKE CONCAT('%',#{userPhone},'%')
+ </if>
+ <if test="passengers != null and passengers != ''">
+ and o.passengers LIKE CONCAT('%',#{passengers},'%')
+ </if>
+ <if test="passengersPhone != null and passengersPhone != ''">
+ and o.passengersPhone LIKE CONCAT('%',#{passengersPhone},'%')
+ </if>
+ <if test="driver != null and driver != ''">
+ and o.driver LIKE CONCAT('%',#{driver},'%')
+ </if>
+ <if test="state != null and state != ''">
+ and o.state = #{state}
+ </if>
+ <if test="roleType != null and roleType != '' and roleType == 2">
+ and (o.companyId = #{nowUserId} or FIND_IN_SET(o.companyId,(SELECT GROUP_CONCAT(id) as ids FROM t_company where superiorId = #{nowUserId} GROUP BY superiorId)))
+ </if>
+ <if test="roleType != null and roleType != '' and roleType == 3">
+ and o.companyId = #{nowUserId}
+ </if>
+ </where>
+ order by o.id desc
+ </select>
+
+ <!--根据出租车订单ID获取出租车订单详情-->
+ <select id="getTaxiOrderDetailById" resultType="map">
+ SELECT
+ DATE_FORMAT(ot.insertTime,'%Y-%m-%d %H:%i') as insertTimeStr,
+ DATE_FORMAT(ot.travelTime,'%Y-%m-%d %H:%i') as travelTimeStr,
+ DATE_FORMAT(ot.boardingTime,'%Y-%m-%d %H:%i') as boardingTimeStr,
+ DATE_FORMAT(ot.getoffTime,'%Y-%m-%d %H:%i') as getoffTimeStr,
+ case when ot.orderSource = 1 then 'APP下单'
+ when ot.orderSource = 2 then '扫码下单'
+ when ot.orderSource = 3 then '小程序下单'
+ when ot.orderSource = 4 then '司机下单'
+ when ot.orderSource = 5 then '调度下单'
+ when ot.orderSource = 6 then '道行龙城下单' else '' end orderSourceStr,
+ ui.nickName as userName,ui.phone as userPhone,
+ case when ot.payType = 1 then '微信'
+ when ot.payType = 2 then '支付宝'
+ when ot.payType = 3 then '余额' else '' end as payTypeStr,
+ CONCAT(di.`name`,'-',di.phone) as driver,
+ CONCAT(cb.`name`,'-',ci.carLicensePlate) as car,
+ cc.`name` as companyName,ot.*
+ FROM t_order_taxi as ot
+ LEFT JOIN t_user as ui on ui.id = ot.userId
+ LEFT JOIN t_driver as di on di.id = ot.driverId
+ LEFT JOIN t_car as ci on ci.id= ot.carId
+ LEFT JOIN t_car_brand as cb on cb.id = ci.carBrandId
+ LEFT JOIN t_company as cc on cc.id = ot.companyId
+ where ot.id = #{orderId}
+ </select>
+
+ <!--根据条件查询可被选择的出租车司机列表-->
+ <select id="getCanSelectTaxiDriverList" resultType="map" parameterType="com.baomidou.mybatisplus.plugins.Page">
+ SELECT dd.*,c1.name as companyName,c2.name as franchiseeName from t_driver AS dd
+ LEFT JOIN t_company as c1 on c1.id = dd.companyId
+ LEFT JOIN t_company as c2 on c2.id = dd.franchiseeId
+ LEFT JOIN (SELECT * from t_driver_service where type = 2) as ds on ds.driverId = dd.id
+ <where>
+ (dd.companyId = #{companyId} or dd.franchiseeId = #{companyId}) and dd.authState = 2 and dd.state = 2 and (ds.id is not null ) and (dd.carId is not null)
+ <if test="name != null and name != ''">
+ and dd.name LIKE CONCAT('%',#{name},'%')
+ </if>
+ <if test="phone != null and phone != ''">
+ and dd.phone LIKE CONCAT('%',#{phone},'%')
+ </if>
+ </where>
+ order by dd.id desc
+ </select>
+
+ <!--查询所有订单条数-->
+ <select id="getAllOrderNum" resultType="java.lang.Integer">
+ SELECT IFNULL(SUM(num),0) as value FROM (
+ (SELECT IFNULL(COUNT(id),0) as num FROM t_order_taxi where FIND_IN_SET(state,'8,9')
+ <if test="companyId != null and companyId != ''">
+ and companyId = #{companyId}
+ </if>
+ <if test="beginTime != null and beginTime != '' and endTime != null and endTime != ''">
+ AND (insertTime between CONCAT(#{beginTime},' 00:00:00') and CONCAT(#{endTime},' 23:59:59'))
+ </if>
+ )
+ union all
+ (SELECT IFNULL(COUNT(id),0) as num FROM t_order_chartered_car where FIND_IN_SET(state,'2')
+ <if test="companyId != null and companyId != ''">
+ and companyId = #{companyId}
+ </if>
+ <if test="beginTime != null and beginTime != '' and endTime != null and endTime != ''">
+ AND (insertTime between CONCAT(#{beginTime},' 00:00:00') and CONCAT(#{endTime},' 23:59:59'))
+ </if>
+ )
+ union all
+ (SELECT IFNULL(COUNT(id),0) as num FROM t_order_cross_city where FIND_IN_SET(state,'8,9')
+ <if test="companyId != null and companyId != ''">
+ and companyId = #{companyId}
+ </if>
+ <if test="beginTime != null and beginTime != '' and endTime != null and endTime != ''">
+ AND (insertTime between CONCAT(#{beginTime},' 00:00:00') and CONCAT(#{endTime},' 23:59:59'))
+ </if>
+ )
+ union all
+ (SELECT IFNULL(COUNT(id),0) as num FROM t_order_logistics where FIND_IN_SET(state,'8,9')
+ <if test="companyId != null and companyId != ''">
+ and companyId = #{companyId}
+ </if>
+ <if test="beginTime != null and beginTime != '' and endTime != null and endTime != ''">
+ AND (insertTime between CONCAT(#{beginTime},' 00:00:00') and CONCAT(#{endTime},' 23:59:59'))
+ </if>
+ )
+ union all
+ (SELECT IFNULL(COUNT(id),0) as num FROM t_order_private_car where FIND_IN_SET(state,'8,9')
+ <if test="companyId != null and companyId != ''">
+ and companyId = #{companyId}
+ </if>
+ <if test="beginTime != null and beginTime != '' and endTime != null and endTime != ''">
+ AND (insertTime between CONCAT(#{beginTime},' 00:00:00') and CONCAT(#{endTime},' 23:59:59'))
+ </if>
+ )
+ ) as o
+ </select>
+
+ <!--查询所有总交易金额-->
+ <select id="getAllTradeMoney" resultType="java.lang.Double">
+ SELECT IFNULL(SUM(num),0) as value FROM (
+ (SELECT IFNULL(SUM(payMoney),0) as num FROM t_order_taxi where FIND_IN_SET(state,'8,9')
+ <if test="companyId != null and companyId != ''">
+ and companyId = #{companyId}
+ </if>
+ <if test="beginTime != null and beginTime != '' and endTime != null and endTime != ''">
+ AND (insertTime between CONCAT(#{beginTime},' 00:00:00') and CONCAT(#{endTime},' 23:59:59'))
+ </if>
+ )
+ union all
+ (SELECT IFNULL(SUM(payMoney),0) as num FROM t_order_cross_city where FIND_IN_SET(state,'8,9')
+ <if test="companyId != null and companyId != ''">
+ and companyId = #{companyId}
+ </if>
+ <if test="beginTime != null and beginTime != '' and endTime != null and endTime != ''">
+ AND (insertTime between CONCAT(#{beginTime},' 00:00:00') and CONCAT(#{endTime},' 23:59:59'))
+ </if>
+ )
+ union all
+ (SELECT IFNULL(SUM(payMoney),0) as num FROM t_order_logistics where FIND_IN_SET(state,'8,9')
+ <if test="companyId != null and companyId != ''">
+ and companyId = #{companyId}
+ </if>
+ <if test="beginTime != null and beginTime != '' and endTime != null and endTime != ''">
+ AND (insertTime between CONCAT(#{beginTime},' 00:00:00') and CONCAT(#{endTime},' 23:59:59'))
+ </if>
+ )
+ union all
+ (SELECT IFNULL(SUM(payMoney),0) as num FROM t_order_private_car where FIND_IN_SET(state,'8,9')
+ <if test="companyId != null and companyId != ''">
+ and companyId = #{companyId}
+ </if>
+ <if test="beginTime != null and beginTime != '' and endTime != null and endTime != ''">
+ AND (insertTime between CONCAT(#{beginTime},' 00:00:00') and CONCAT(#{endTime},' 23:59:59'))
+ </if>
+ )
+ ) as o
+ </select>
+
+ <!--查询所有总收益-->
+ <select id="getAllIncomeMoney" resultType="java.lang.Double">
+ SELECT IFNULL(SUM(money),0) as value FROM t_income where userType = 1
+ <if test="companyId != null and companyId != ''">
+ and objectId = #{companyId}
+ </if>
+ <if test="beginTime != null and beginTime != '' and endTime != null and endTime != ''">
+ AND (insertTime between CONCAT(#{beginTime},' 00:00:00') and CONCAT(#{endTime},' 23:59:59'))
+ </if>
+ </select>
+
+
+
+</mapper>
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TPhoneMapper.xml b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TPhoneMapper.xml
new file mode 100644
index 0000000..6dc300f
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TPhoneMapper.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.stylefeng.guns.modular.system.dao.TPhoneMapper">
+
+ <!-- 通用查询映射结果 -->
+ <resultMap id="BaseResultMap" type="com.stylefeng.guns.modular.system.model.TPhone">
+ <id column="id" property="id" />
+ <result column="type" property="type" />
+ <result column="platform" property="platform" />
+ <result column="phone" property="phone" />
+ <result column="companyId" property="companyId" />
+ </resultMap>
+
+ <!-- 通用查询结果列 -->
+ <sql id="Base_Column_List">
+ id, type, platform, phone, companyId
+ </sql>
+
+</mapper>
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TProblemMapper.xml b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TProblemMapper.xml
new file mode 100644
index 0000000..0b7c6a6
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TProblemMapper.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.stylefeng.guns.modular.system.dao.TProblemMapper">
+
+ <!-- 通用查询映射结果 -->
+ <resultMap id="BaseResultMap" type="com.stylefeng.guns.modular.system.model.TProblem">
+ <id column="id" property="id" />
+ <result column="userId" property="userId" />
+ <result column="content" property="content" />
+ <result column="answer" property="answer" />
+ <result column="handleUserId" property="handleUserId" />
+ <result column="handleTime" property="handleTime" />
+ <result column="insertTime" property="insertTime" />
+ <result column="state" property="state" />
+ </resultMap>
+
+ <!-- 通用查询结果列 -->
+ <sql id="Base_Column_List">
+ id, userId, content, answer, handleUserId, handleTime, insertTime, state
+ </sql>
+
+ <!--根据条件查询用户留言列表-->
+ <select id="getProblemList" resultType="map" parameterType="com.baomidou.mybatisplus.plugins.Page">
+ SELECT * FROM (SELECT ui.nickName as userName,ui.phone as userPhone,su.`name` as handleUserName,pp.* FROM t_problem as pp
+ LEFT JOIN t_user as ui on ui.id = pp.userId
+ LEFT JOIN sys_user as su on su.id = pp.handleUserId) as o
+ <where>
+ 1=1
+ <if test="beginTime != null and beginTime != '' and endTime != null and endTime != ''">
+ AND (o.insertTime between CONCAT(#{beginTime},' 00:00:00') and CONCAT(#{endTime},' 23:59:59'))
+ </if>
+ <if test="userName != null and userName != ''">
+ and o.userName LIKE CONCAT('%',#{userName},'%')
+ </if>
+ <if test="state != null and state != ''">
+ and o.state = #{state}
+ </if>
+ </where>
+ order by o.id desc
+ </select>
+
+</mapper>
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TPubTransactionDetailsMapper.xml b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TPubTransactionDetailsMapper.xml
new file mode 100644
index 0000000..e41a1d7
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TPubTransactionDetailsMapper.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.stylefeng.guns.modular.system.dao.TPubTransactionDetailsMapper">
+
+ <!-- 通用查询映射结果 -->
+ <resultMap id="BaseResultMap" type="com.stylefeng.guns.modular.system.model.TPubTransactionDetails">
+ <id column="id" property="id" />
+ <result column="userId" property="userId" />
+ <result column="insertTime" property="insertTime" />
+ <result column="remark" property="remark" />
+ <result column="money" property="money" />
+ <result column="state" property="state" />
+ <result column="type" property="type" />
+ <result column="userType" property="userType" />
+ <result column="orderType" property="orderType" />
+ <result column="orderId" property="orderId" />
+ </resultMap>
+
+ <!-- 通用查询结果列 -->
+ <sql id="Base_Column_List">
+ id, userId, insertTime, remark, money, state, type, userType, orderType, orderId
+ </sql>
+
+</mapper>
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TPubWithdrawalMapper.xml b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TPubWithdrawalMapper.xml
new file mode 100644
index 0000000..e6327c8
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TPubWithdrawalMapper.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.stylefeng.guns.modular.system.dao.TPubWithdrawalMapper">
+
+ <!-- 通用查询映射结果 -->
+ <resultMap id="BaseResultMap" type="com.stylefeng.guns.modular.system.model.TPubWithdrawal">
+ <id column="id" property="id" />
+ <result column="userId" property="userId" />
+ <result column="handleTime" property="handleTime" />
+ <result column="balance" property="balance" />
+ <result column="money" property="money" />
+ <result column="state" property="state" />
+ <result column="remark" property="remark" />
+ <result column="code" property="code" />
+ <result column="name" property="name" />
+ <result column="userType" property="userType" />
+ <result column="insertTime" property="insertTime" />
+ <result column="flag" property="flag" />
+ <result column="withdrawalType" property="withdrawalType" />
+ </resultMap>
+
+ <!-- 通用查询结果列 -->
+ <sql id="Base_Column_List">
+ id, userId, handleTime, balance, money, state, remark, code, name, userType, insertTime, flag, withdrawalType
+ </sql>
+
+ <!--根据条件查询提现列表-->
+ <select id="getWithdrawalList" resultType="map" parameterType="com.baomidou.mybatisplus.plugins.Page">
+ SELECT * FROM (SELECT
+ case when pw.userType = 1 then uu.nickName when pw.userType = 2 then dd.`name` else '' end as userName,
+ case when pw.userType = 1 then uu.phone when pw.userType = 2 then dd.phone else '' end as userPhone,
+ pw.*
+ FROM t_pub_withdrawal as pw
+ LEFT JOIN t_user as uu on uu.id = pw.userId
+ LEFT JOIN t_driver as dd on dd.id = pw.userId) as o
+ <where>
+ o.flag != 3
+ <if test="beginTime != null and beginTime != '' and endTime != null and endTime != ''">
+ AND (o.insertTime between CONCAT(#{beginTime},' 00:00:00') and CONCAT(#{endTime},' 23:59:59'))
+ </if>
+ <if test="name != null and name != ''">
+ and o.name LIKE CONCAT('%',#{name},'%')
+ </if>
+ <if test="withdrawalType != null and withdrawalType != ''">
+ and o.withdrawalType = #{withdrawalType}
+ </if>
+ </where>
+ order by o.id desc
+ </select>
+
+</mapper>
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TReassignMapper.xml b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TReassignMapper.xml
new file mode 100644
index 0000000..3d5137c
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TReassignMapper.xml
@@ -0,0 +1,264 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.stylefeng.guns.modular.system.dao.TReassignMapper">
+
+ <!-- 通用查询映射结果 -->
+ <resultMap id="BaseResultMap" type="com.stylefeng.guns.modular.system.model.TReassign">
+ <id column="id" property="id" />
+ <result column="orderType" property="orderType" />
+ <result column="orderId" property="orderId" />
+ <result column="originalDriverId" property="originalDriverId" />
+ <result column="originalCarId" property="originalCarId" />
+ <result column="insertTime" property="insertTime" />
+ <result column="nowDriverId" property="nowDriverId" />
+ <result column="nowCarId" property="nowCarId" />
+ <result column="money" property="money" />
+ <result column="payType" property="payType" />
+ <result column="payTime" property="payTime" />
+ <result column="payOrder" property="payOrder" />
+ <result column="state" property="state" />
+ <result column="reason" property="reason" />
+ <result column="remark" property="remark" />
+ <result column="reviewer" property="reviewer"/>
+ <result column="reviewerType" property="reviewerType"/>
+ <result column="completeTime" property="completeTime" />
+ </resultMap>
+
+ <!-- 通用查询结果列 -->
+ <sql id="Base_Column_List">
+ id, orderType, orderId, originalDriverId, originalCarId, insertTime, nowDriverId, nowCarId, money, payType, payTime, payOrder, state, reason, remark, completeTime
+ </sql>
+
+ <!--根据条件查询专车改派订单列表-->
+ <select id="getPrivateCarReassignOrderList" resultType="map" parameterType="com.baomidou.mybatisplus.plugins.Page">
+ SELECT * FROM (SELECT rr.id,rr.insertTime,
+ dd1.name as originalDriverName,dd1.phone as originalDriverPhone,
+ CONCAT(dd1.name,'-',dd1.phone) as originalDriver,rr.reason,opc.orderNum,
+ CONCAT(uu1.nickName,'-',uu1.phone) as addOrderUser,opc.travelTime,opc.startAddress,opc.endAddress,
+ CONCAT(cb1.`name`,'-',cc1.carLicensePlate) as originalCar,rr.money,opc.state as orderState,
+ dd2.name as nowDriverName,dd2.phone as nowDriverPhone,
+ CONCAT(dd2.name,'-',dd2.phone) as nowDriver,CONCAT(cb2.`name`,'-',cc2.carLicensePlate) as nowCar,
+ opc.companyId,rr.state,rr.orderType FROM t_reassign as rr
+ LEFT JOIN t_driver as dd1 on dd1.id = rr.originalDriverId
+ LEFT JOIN t_order_private_car as opc on opc.id = rr.orderId
+ LEFT JOIN t_user as uu1 on uu1.id = opc.userId
+ LEFT JOIN t_car as cc1 on cc1.id= rr.originalCarId
+ LEFT JOIN t_car_brand as cb1 on cb1.id = cc1.carBrandId
+ LEFT JOIN t_driver as dd2 on dd2.id = rr.nowDriverId
+ LEFT JOIN t_car as cc2 on cc2.id= rr.nowCarId
+ LEFT JOIN t_car_brand as cb2 on cb2.id = cc2.carBrandId) as o
+ <where>
+ o.orderType = 1 and o.state != 6
+ <if test="beginTime != null and beginTime != '' and endTime != null and endTime != ''">
+ AND (o.insertTime between CONCAT(#{beginTime},' 00:00:00') and CONCAT(#{endTime},' 23:59:59'))
+ </if>
+ <if test="originalDriverName != null and originalDriverName != ''">
+ and o.originalDriverName LIKE CONCAT('%',#{originalDriverName},'%')
+ </if>
+ <if test="originalDriverPhone != null and originalDriverPhone != ''">
+ and o.originalDriverPhone LIKE CONCAT('%',#{originalDriverPhone},'%')
+ </if>
+ <if test="orderNum != null and orderNum != ''">
+ and o.orderNum LIKE CONCAT('%',#{orderNum},'%')
+ </if>
+ <if test="nowDriverName != null and nowDriverName != ''">
+ and o.nowDriverName = #{nowDriverName}
+ </if>
+ <if test="nowDriverPhone != null and nowDriverPhone != ''">
+ and o.nowDriverPhone LIKE CONCAT('%',#{nowDriverPhone},'%')
+ </if>
+ <if test="orderState != null and orderState != ''">
+ and o.orderState = #{orderState}
+ </if>
+ <if test="state != null and state != ''">
+ and o.state = #{state}
+ </if>
+ <if test="roleType != null and roleType != '' and roleType == 2">
+ and (o.companyId = #{nowUserId} or FIND_IN_SET(o.companyId,(SELECT GROUP_CONCAT(id) as ids FROM t_company where superiorId = #{nowUserId} GROUP BY superiorId)))
+ </if>
+ <if test="roleType != null and roleType != '' and roleType == 3">
+ and o.companyId = #{nowUserId}
+ </if>
+ </where>
+ order by o.id desc
+ </select>
+
+ <!--根据条件查询可被选择的专车司机列表-->
+ <select id="getCanSelectPrivateCarDriverList" resultType="map" parameterType="com.baomidou.mybatisplus.plugins.Page">
+ SELECT dd.*,c1.name as companyName,c2.name as franchiseeName from t_driver AS dd
+ LEFT JOIN t_company as c1 on c1.id = dd.companyId
+ LEFT JOIN t_company as c2 on c2.id = dd.franchiseeId
+ LEFT JOIN (SELECT * from t_driver_service where type = 1) as ds on ds.driverId = dd.id
+ <where>
+ (dd.companyId = #{companyId} or dd.franchiseeId = #{companyId}) and dd.authState = 2 and dd.state = 2 and (ds.id is not null ) and (dd.carId is not null)
+ <if test="name != null and name != ''">
+ and dd.name LIKE CONCAT('%',#{name},'%')
+ </if>
+ <if test="phone != null and phone != ''">
+ and dd.phone LIKE CONCAT('%',#{phone},'%')
+ </if>
+ </where>
+ order by dd.id desc
+ </select>
+
+
+ <!--根据条件查询可被选择的专车司机列表-->
+ <select id="getCanSelectSmallDriverList" resultType="map" parameterType="com.baomidou.mybatisplus.plugins.Page">
+ SELECT dd.*,c1.name as companyName,c2.name as franchiseeName from t_driver AS dd
+ LEFT JOIN t_company as c1 on c1.id = dd.companyId
+ LEFT JOIN t_company as c2 on c2.id = dd.franchiseeId
+ LEFT JOIN (SELECT * from t_driver_service where type = #{type}) as ds on ds.driverId = dd.id
+ <where>
+ (dd.companyId = #{companyId} or dd.franchiseeId = #{companyId}) and dd.authState = 2 and dd.state = 2 and (ds.id is not null ) and (dd.carId is not null)
+ <if test="name != null and name != ''">
+ and dd.name LIKE CONCAT('%',#{name},'%')
+ </if>
+ <if test="phone != null and phone != ''">
+ and dd.phone LIKE CONCAT('%',#{phone},'%')
+ </if>
+ </where>
+ order by dd.id desc
+ </select>
+
+
+ <!--根据条件查询跨城改派订单列表-->
+ <select id="getCrossReassignOrderList" resultType="map" parameterType="com.baomidou.mybatisplus.plugins.Page">
+ SELECT * FROM (SELECT rr.id,rr.insertTime,
+ dd1.name as originalDriverName,dd1.phone as originalDriverPhone,
+ CONCAT(dd1.name,'-',dd1.phone) as originalDriver,rr.reason,opc.orderNum,
+ CONCAT(uu1.nickName,'-',uu1.phone) as addOrderUser,opc.travelTime,opc.startAddress,opc.endAddress,
+ CONCAT(cb1.`name`,'-',cc1.carLicensePlate) as originalCar,rr.money,opc.state as orderState,
+ dd2.name as nowDriverName,dd2.phone as nowDriverPhone,
+ CONCAT(dd2.name,'-',dd2.phone) as nowDriver,CONCAT(cb2.`name`,'-',cc2.carLicensePlate) as nowCar,
+ opc.companyId,rr.state,rr.orderType FROM t_reassign as rr
+ LEFT JOIN t_driver as dd1 on dd1.id = rr.originalDriverId
+ LEFT JOIN t_order_cross_city as opc on opc.id = rr.orderId
+ LEFT JOIN t_user as uu1 on uu1.id = opc.userId
+ LEFT JOIN t_car as cc1 on cc1.id= rr.originalCarId
+ LEFT JOIN t_car_brand as cb1 on cb1.id = cc1.carBrandId
+ LEFT JOIN t_driver as dd2 on dd2.id = rr.nowDriverId
+ LEFT JOIN t_car as cc2 on cc2.id= rr.nowCarId
+ LEFT JOIN t_car_brand as cb2 on cb2.id = cc2.carBrandId) as o
+ <where>
+ o.orderType = 3 and o.state != 6
+ <if test="beginTime != null and beginTime != '' and endTime != null and endTime != ''">
+ AND (o.insertTime between CONCAT(#{beginTime},' 00:00:00') and CONCAT(#{endTime},' 23:59:59'))
+ </if>
+ <if test="originalDriverName != null and originalDriverName != ''">
+ and o.originalDriverName LIKE CONCAT('%',#{originalDriverName},'%')
+ </if>
+ <if test="originalDriverPhone != null and originalDriverPhone != ''">
+ and o.originalDriverPhone LIKE CONCAT('%',#{originalDriverPhone},'%')
+ </if>
+ <if test="orderNum != null and orderNum != ''">
+ and o.orderNum LIKE CONCAT('%',#{orderNum},'%')
+ </if>
+ <if test="nowDriverName != null and nowDriverName != ''">
+ and o.nowDriverName = #{nowDriverName}
+ </if>
+ <if test="nowDriverPhone != null and nowDriverPhone != ''">
+ and o.nowDriverPhone LIKE CONCAT('%',#{nowDriverPhone},'%')
+ </if>
+ <if test="orderState != null and orderState != ''">
+ and o.orderState = #{orderState}
+ </if>
+ <if test="state != null and state != ''">
+ and o.state = #{state}
+ </if>
+ <if test="roleType != null and roleType != '' and roleType == 2">
+ and (o.companyId = #{nowUserId} or FIND_IN_SET(o.companyId,(SELECT GROUP_CONCAT(id) as ids FROM t_company where superiorId = #{nowUserId} GROUP BY superiorId)))
+ </if>
+ <if test="roleType != null and roleType != '' and roleType == 3">
+ and o.companyId = #{nowUserId}
+ </if>
+ </where>
+ order by o.id desc
+ </select>
+
+
+
+ <!--根据条件查询跨城改派订单列表-->
+ <select id="getSmallPieceLogisticsList" resultType="map" parameterType="com.baomidou.mybatisplus.plugins.Page">
+ SELECT * FROM (SELECT rr.id,rr.insertTime,
+ dd1.name as originalDriverName,dd1.phone as originalDriverPhone,
+ CONCAT(dd1.name,'-',dd1.phone) as originalDriver,rr.reason,opc.orderNum,
+ CONCAT(uu1.nickName,'-',uu1.phone) as addOrderUser,opc.travelTime,opc.startAddress,opc.endAddress,
+ CONCAT(cb1.`name`,'-',cc1.carLicensePlate) as originalCar,rr.money,opc.state as orderState,
+ dd2.name as nowDriverName,dd2.phone as nowDriverPhone,
+ CONCAT(dd2.name,'-',dd2.phone) as nowDriver,CONCAT(cb2.`name`,'-',cc2.carLicensePlate) as nowCar,
+ opc.companyId,rr.state,rr.orderType FROM t_reassign as rr
+ LEFT JOIN t_driver as dd1 on dd1.id = rr.originalDriverId
+ LEFT JOIN t_order_logistics as opc on opc.id = rr.orderId
+ LEFT JOIN t_user as uu1 on uu1.id = opc.userId
+ LEFT JOIN t_car as cc1 on cc1.id= rr.originalCarId
+ LEFT JOIN t_car_brand as cb1 on cb1.id = cc1.carBrandId
+ LEFT JOIN t_driver as dd2 on dd2.id = rr.nowDriverId
+ LEFT JOIN t_car as cc2 on cc2.id= rr.nowCarId
+ LEFT JOIN t_car_brand as cb2 on cb2.id = cc2.carBrandId) as o
+ <where>
+ o.orderType in (4, 5) and o.state != 6
+ <if test="beginTime != null and beginTime != '' and endTime != null and endTime != ''">
+ AND (o.insertTime between CONCAT(#{beginTime},' 00:00:00') and CONCAT(#{endTime},' 23:59:59'))
+ </if>
+ <if test="originalDriverName != null and originalDriverName != ''">
+ and o.originalDriverName LIKE CONCAT('%',#{originalDriverName},'%')
+ </if>
+ <if test="originalDriverPhone != null and originalDriverPhone != ''">
+ and o.originalDriverPhone LIKE CONCAT('%',#{originalDriverPhone},'%')
+ </if>
+ <if test="orderNum != null and orderNum != ''">
+ and o.orderNum LIKE CONCAT('%',#{orderNum},'%')
+ </if>
+ <if test="nowDriverName != null and nowDriverName != ''">
+ and o.nowDriverName = #{nowDriverName}
+ </if>
+ <if test="nowDriverPhone != null and nowDriverPhone != ''">
+ and o.nowDriverPhone LIKE CONCAT('%',#{nowDriverPhone},'%')
+ </if>
+ <if test="orderState != null and orderState != ''">
+ and o.orderState = #{orderState}
+ </if>
+ <if test="state != null and state != ''">
+ and o.state = #{state}
+ </if>
+ <if test="roleType != null and roleType != '' and roleType == 2">
+ and (o.companyId = #{nowUserId} or FIND_IN_SET(o.companyId,(SELECT GROUP_CONCAT(id) as ids FROM t_company where superiorId = #{nowUserId} GROUP BY superiorId)))
+ </if>
+ <if test="roleType != null and roleType != '' and roleType == 3">
+ and o.companyId = #{nowUserId}
+ </if>
+ </where>
+ order by o.id desc
+ </select>
+
+
+ <!--根据条件查询可被选择的跨城司机列表-->
+ <select id="getCanSelectCrossDriverList" resultType="map" parameterType="com.baomidou.mybatisplus.plugins.Page">
+ select
+ a.*,
+ h.name as companyName,
+ i.name as franchiseeName
+ from t_driver a
+ left join t_driver_service b on (a.id = b.driverId)
+ left join t_driver_orders c on (a.id = c.driverId)
+ left join t_car d on (a.carId = d.id)
+ left join t_car_service e on (d.id = e.carId)
+ left join t_driver_line f on (a.id = f.driverId)
+ left join t_line_shift g on (f.lineId = g.lineId)
+ left join t_company as h on (h.id = a.companyId)
+ left join t_company as i on (i.id = a.franchiseeId)
+ where a.authState = 2 and a.state != 1 and a.flag != 3 and if(a.franchiseeId is null or a.franchiseeId = 0, a.companyId = #{companyId}, a.franchiseeId = #{companyId})
+ and a.id in (select driverId from t_driver_work where state = 1 and type like '%3%')
+ and b.type = 3 and c.type = 3 and e.type = 3 and e.serverCarModelId = #{serverCarModelId} and f.lineId = #{lineId} and g.id = #{lineShiftId}
+ and a.id in (select driverId from t_line_shift_driver where lineShiftId = #{lineShiftId} and DATE_FORMAT(`day`, '%Y-%m-%d') = DATE_FORMAT(#{time}, '%Y-%m-%d') and laveSeat >= #{num})
+ and a.id != #{driverId}
+ <if test="name != null and name != ''">
+ and a.name LIKE CONCAT('%',#{name},'%')
+ </if>
+ <if test="phone != null and phone != ''">
+ and a.phone LIKE CONCAT('%',#{phone},'%')
+ </if>
+ order by a.id desc
+ </select>
+
+</mapper>
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TRegionMapper.xml b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TRegionMapper.xml
new file mode 100644
index 0000000..2436774
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TRegionMapper.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.stylefeng.guns.modular.system.dao.TRegionMapper">
+
+ <!-- 通用查询映射结果 -->
+ <resultMap id="BaseResultMap" type="com.stylefeng.guns.modular.system.model.TRegion">
+ <id column="id" property="id" />
+ <result column="name" property="name" />
+ <result column="code" property="code" />
+ <result column="citycode" property="citycode" />
+ <result column="parent_id" property="parentId" />
+ <result column="english" property="english" />
+ </resultMap>
+
+ <!-- 通用查询结果列 -->
+ <sql id="Base_Column_List">
+ id, name, code, citycode, parent_id, english
+ </sql>
+
+</mapper>
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TServerCarmodelMapper.xml b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TServerCarmodelMapper.xml
new file mode 100644
index 0000000..7e07b10
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TServerCarmodelMapper.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.stylefeng.guns.modular.system.dao.TServerCarmodelMapper">
+
+ <!-- 通用查询映射结果 -->
+ <resultMap id="BaseResultMap" type="com.stylefeng.guns.modular.system.model.TServerCarmodel">
+ <id column="id" property="id" />
+ <result column="type" property="type" />
+ <result column="name" property="name" />
+ <result column="img" property="img" />
+ <result column="state" property="state" />
+ <result column="insertTime" property="insertTime" />
+ </resultMap>
+
+ <!-- 通用查询结果列 -->
+ <sql id="Base_Column_List">
+ id, type, name, img, state, insertTime
+ </sql>
+
+ <!--根据条件查询服务车型列表-->
+ <select id="getServerCarModelList" resultType="map" parameterType="com.baomidou.mybatisplus.plugins.Page">
+ SELECT * FROM t_server_carmodel as o
+ <where>
+ o.type = #{type} and not FIND_IN_SET(o.state,'3')
+ <if test="name != null and name != ''">
+ and o.name LIKE CONCAT('%',#{name},'%')
+ </if>
+ <if test="state != null and state != ''">
+ and o.state = #{state}
+ </if>
+ </where>
+ order by o.id desc
+ </select>
+
+</mapper>
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TSiteMapper.xml b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TSiteMapper.xml
new file mode 100644
index 0000000..8749905
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TSiteMapper.xml
@@ -0,0 +1,91 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.stylefeng.guns.modular.system.dao.TSiteMapper">
+
+ <!-- 通用查询映射结果 -->
+ <resultMap id="BaseResultMap" type="com.stylefeng.guns.modular.system.model.TSite">
+ <id column="id" property="id" />
+ <result column="name" property="name" />
+ <result column="province" property="province" />
+ <result column="provinceCode" property="provinceCode" />
+ <result column="city" property="city" />
+ <result column="cityCode" property="cityCode" />
+ <result column="district" property="district" />
+ <result column="districtCode" property="districtCode" />
+ <result column="state" property="state" />
+ <result column="insertTime" property="insertTime" />
+ <result column="insertUserId" property="insertUserId" />
+ </resultMap>
+
+ <!-- 通用查询结果列 -->
+ <sql id="Base_Column_List">
+ id, name, province, provinceCode, city, cityCode, district, districtCode, state, insertTime, insertUserId
+ </sql>
+
+ <!--根据条件查询站点列表-->
+ <select id="getSiteList" resultType="map" parameterType="com.baomidou.mybatisplus.plugins.Page">
+ SELECT * FROM (SELECT uu.`name` as insertUser,IFNULL(ls.num,0) as lineNum,ss.* FROM t_site as ss
+ LEFT JOIN sys_user as uu on uu.id = ss.insertUserId
+ LEFT JOIN (SELECT COUNT(a.id) as num,siteId FROM t_line_site a left join t_line b on (a.lineId = b.id) where b.state != 3 GROUP BY a.siteId) as ls on ls.siteId = ss.id) as o
+ <where>
+ o.state != 3
+ <if test="beginTime != null and beginTime != '' and endTime != null and endTime != ''">
+ AND (o.insertTime between CONCAT(#{beginTime},' 00:00:00') and CONCAT(#{endTime},' 23:59:59'))
+ </if>
+ <if test="name != null and name != ''">
+ and o.name LIKE CONCAT('%',#{name},'%')
+ </if>
+ <if test="insertUser != null and insertUser != ''">
+ and o.insertUser LIKE CONCAT('%',#{insertUser},'%')
+ </if>
+ <if test="city != null and city != ''">
+ and (o.province LIKE CONCAT('%',#{city},'%') or o.city LIKE CONCAT('%',#{city},'%') or o.district LIKE CONCAT('%',#{city},'%'))
+ </if>
+ <if test="state != null and state != ''">
+ and o.state = #{state}
+ </if>
+ </where>
+ order by o.id desc
+ </select>
+
+
+ <select id="query" resultType="TSite">
+ select
+ id as id,
+ name as name,
+ province as province,
+ provinceCode as provinceCode,
+ city as city,
+ cityCode as cityCode,
+ district as district,
+ districtCode as districtCode,
+ state as state,
+ insertTime as insertTime,
+ insertUserId as insertUserId
+ from t_site where state != 3
+ <choose>
+ <when test="null != provinceCode">
+ and provinceCode = #{provinceCode}
+ </when>
+ <otherwise>
+ and provinceCode is null
+ </otherwise>
+ </choose>
+ <choose>
+ <when test="null != cityCode">
+ and cityCode = #{cityCode}
+ </when>
+ <otherwise>
+ and cityCode is null
+ </otherwise>
+ </choose>
+ <choose>
+ <when test="null != districtCode">
+ and districtCode = #{districtCode}
+ </when>
+ <otherwise>
+ and districtCode is null
+ </otherwise>
+ </choose>
+ </select>
+</mapper>
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TSmsrecordMapper.xml b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TSmsrecordMapper.xml
new file mode 100644
index 0000000..aaef62d
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TSmsrecordMapper.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.stylefeng.guns.modular.system.dao.TSmsrecordMapper">
+
+ <!-- 通用查询映射结果 -->
+ <resultMap id="BaseResultMap" type="com.stylefeng.guns.modular.system.model.TSmsrecord">
+ <id column="id" property="id" />
+ <result column="type" property="type" />
+ <result column="phone" property="phone" />
+ <result column="code" property="code" />
+ <result column="content" property="content" />
+ <result column="createTime" property="createTime" />
+ </resultMap>
+
+ <!-- 通用查询结果列 -->
+ <sql id="Base_Column_List">
+ id, type, phone, code, content, insertTime
+ </sql>
+
+ <!--根据条件查询验证码记录列表-->
+ <select id="getSmsCodeList" resultType="map" parameterType="com.baomidou.mybatisplus.plugins.Page">
+ SELECT * FROM t_smsrecord as o
+ <where>
+ 1 = 1
+ <if test="beginTime != null and beginTime != '' and endTime != null and endTime != ''">
+ AND (o.insertTime between CONCAT(#{beginTime},' 00:00:00') and CONCAT(#{endTime},' 23:59:59'))
+ </if>
+ <if test="phone != null and phone != ''">
+ and o.phone LIKE CONCAT('%',#{phone},'%')
+ </if>
+ </where>
+ order by o.id desc
+ </select>
+
+</mapper>
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TSysCancleOrderMapper.xml b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TSysCancleOrderMapper.xml
new file mode 100644
index 0000000..06a4e8c
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TSysCancleOrderMapper.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.stylefeng.guns.modular.system.dao.TSysCancleOrderMapper">
+
+ <!-- 通用查询映射结果 -->
+ <resultMap id="BaseResultMap" type="com.stylefeng.guns.modular.system.model.TSysCancleOrder">
+ <id column="id" property="id" />
+ <result column="companyId" property="companyId" />
+ <result column="minuteNum" property="minuteNum" />
+ <result column="money" property="money" />
+ <result column="type" property="type" />
+ <result column="orderType" property="orderType" />
+ </resultMap>
+
+ <!-- 通用查询结果列 -->
+ <sql id="Base_Column_List">
+ id, companyId, minuteNum, money, type, orderType
+ </sql>
+
+</mapper>
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TSysFaceDistinguishMapper.xml b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TSysFaceDistinguishMapper.xml
new file mode 100644
index 0000000..dd2b4ae
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TSysFaceDistinguishMapper.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.stylefeng.guns.modular.system.dao.TSysFaceDistinguishMapper">
+
+ <!-- 通用查询映射结果 -->
+ <resultMap id="BaseResultMap" type="com.stylefeng.guns.modular.system.model.TSysFaceDistinguish">
+ <id column="id" property="id" />
+ <result column="company" property="company" />
+ <result column="isOpen" property="isOpen" />
+ <result column="minuteNum" property="minuteNum" />
+ </resultMap>
+
+ <!-- 通用查询结果列 -->
+ <sql id="Base_Column_List">
+ id, company, isOpen, minuteNum
+ </sql>
+
+</mapper>
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TSysIntegralMapper.xml b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TSysIntegralMapper.xml
new file mode 100644
index 0000000..d8d035c
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TSysIntegralMapper.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.stylefeng.guns.modular.system.dao.TSysIntegralMapper">
+
+ <!-- 通用查询映射结果 -->
+ <resultMap id="BaseResultMap" type="com.stylefeng.guns.modular.system.model.TSysIntegral">
+ <id column="id" property="id" />
+ <result column="company" property="company" />
+ <result column="integral" property="integral" />
+ </resultMap>
+
+ <!-- 通用查询结果列 -->
+ <sql id="Base_Column_List">
+ id, company, integral
+ </sql>
+
+</mapper>
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TSysPushOrderMapper.xml b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TSysPushOrderMapper.xml
new file mode 100644
index 0000000..4988ff2
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TSysPushOrderMapper.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.stylefeng.guns.modular.system.dao.TSysPushOrderMapper">
+
+ <!-- 通用查询映射结果 -->
+ <resultMap id="BaseResultMap" type="com.stylefeng.guns.modular.system.model.TSysPushOrder">
+ <id column="id" property="id" />
+ <result column="companyId" property="companyId" />
+ <result column="pushDistance" property="pushDistance" />
+ <result column="pushTime" property="pushTime" />
+ <result column="driverProportion" property="driverProportion" />
+ <result column="type" property="type" />
+ <result column="pushType" property="pushType" />
+ </resultMap>
+
+ <!-- 通用查询结果列 -->
+ <sql id="Base_Column_List">
+ id, companyId, pushDistance, pushTime, driverProportion, type, pushType
+ </sql>
+
+</mapper>
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TSysReformistMapper.xml b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TSysReformistMapper.xml
new file mode 100644
index 0000000..2cd81c3
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TSysReformistMapper.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.stylefeng.guns.modular.system.dao.TSysReformistMapper">
+
+ <!-- 通用查询映射结果 -->
+ <resultMap id="BaseResultMap" type="com.stylefeng.guns.modular.system.model.TSysReformist">
+ <id column="id" property="id" />
+ <result column="companyId" property="companyId" />
+ <result column="money" property="money" />
+ </resultMap>
+
+ <!-- 通用查询结果列 -->
+ <sql id="Base_Column_List">
+ id, companyId, money
+ </sql>
+
+</mapper>
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TSysSensitiveWordsMapper.xml b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TSysSensitiveWordsMapper.xml
new file mode 100644
index 0000000..f2edc76
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TSysSensitiveWordsMapper.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.stylefeng.guns.modular.system.dao.TSysSensitiveWordsMapper">
+
+ <!-- 通用查询映射结果 -->
+ <resultMap id="BaseResultMap" type="com.stylefeng.guns.modular.system.model.TSysSensitiveWords">
+ <id column="id" property="id" />
+ <result column="createTime" property="createTime" />
+ <result column="content" property="content" />
+ </resultMap>
+
+ <!-- 通用查询结果列 -->
+ <sql id="Base_Column_List">
+ id, createTime, content
+ </sql>
+
+ <!--根据条件查询敏感词列表-->
+ <select id="getSensitiveWordList" resultType="map" parameterType="com.baomidou.mybatisplus.plugins.Page">
+ SELECT * FROM t_sys_sensitive_words as o
+ <where>
+ 1 = 1
+ <if test="beginTime != null and beginTime != '' and endTime != null and endTime != ''">
+ AND (o.createTime between CONCAT(#{beginTime},' 00:00:00') and CONCAT(#{endTime},' 23:59:59'))
+ </if>
+ <if test="content != null and content != ''">
+ and o.content LIKE CONCAT('%',#{content},'%')
+ </if>
+ </where>
+ order by o.id desc
+ </select>
+
+</mapper>
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TSystemNoticeMapper.xml b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TSystemNoticeMapper.xml
new file mode 100644
index 0000000..beecb11
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TSystemNoticeMapper.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.stylefeng.guns.modular.system.dao.TSystemNoticeMapper">
+
+ <!-- 通用查询映射结果 -->
+ <resultMap id="BaseResultMap" type="com.stylefeng.guns.modular.system.model.TSystemNotice">
+ <id column="id" property="id" />
+ <result column="type" property="type" />
+ <result column="userType" property="userType" />
+ <result column="noticesId" property="noticesId" />
+ <result column="content" property="content" />
+ <result column="userId" property="userId" />
+ <result column="insertTime" property="insertTime" />
+ <result column="read" property="read" />
+ </resultMap>
+
+ <!-- 通用查询结果列 -->
+ <sql id="Base_Column_List">
+ id, type, userType, noticesId, content, userId, insertTime, read
+ </sql>
+
+</mapper>
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TSystemPriceMapper.xml b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TSystemPriceMapper.xml
new file mode 100644
index 0000000..08d30cb
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TSystemPriceMapper.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.stylefeng.guns.modular.system.dao.TSystemPriceMapper">
+
+ <!-- 通用查询映射结果 -->
+ <resultMap id="BaseResultMap" type="com.stylefeng.guns.modular.system.model.TSystemPrice">
+ <id column="id" property="id" />
+ <result column="type" property="type" />
+ <result column="companyId" property="companyId" />
+ <result column="serverCarModelId" property="serverCarModelId" />
+ <result column="content" property="content" />
+ <result column="fareTypeNote" property="fareTypeNote"/>
+ <result column="state" property="state"/>
+ </resultMap>
+
+ <!-- 通用查询结果列 -->
+ <sql id="Base_Column_List">
+ id, type, companyId, serverCarModelId, content
+ </sql>
+
+ <!--查询专车价格设置-->
+ <select id="getSpecialPriceList" resultType="map" parameterType="com.baomidou.mybatisplus.plugins.Page">
+ SELECT * FROM (SELECT sp.id,sp.type,sp.companyId,sc.`name`,sc.img,sp.state from t_system_price as sp
+ LEFT JOIN t_server_carmodel as sc on sc.id = sp.serverCarModelId) as o
+ <where>
+ o.type = 1 and o.state != 3 and o.companyId = #{companyId}
+ <if test="name != null and name != ''">
+ and o.name LIKE CONCAT('%',#{name},'%')
+ </if>
+ <if test="state != null and state != ''">
+ and o.state = #{state}
+ </if>
+ </where>
+ order by o.id desc
+ </select>
+
+</mapper>
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TUserMapper.xml b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TUserMapper.xml
new file mode 100644
index 0000000..4f2ae88
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TUserMapper.xml
@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.stylefeng.guns.modular.system.dao.TUserMapper">
+
+ <!-- 通用查询映射结果 -->
+ <resultMap id="BaseResultMap" type="com.stylefeng.guns.modular.system.model.TUser">
+ <id column="id" property="id" />
+ <result column="companyId" property="companyId" />
+ <result column="registIp" property="registIp" />
+ <result column="registAreaCode" property="registAreaCode" />
+ <result column="phone" property="phone" />
+ <result column="nickName" property="nickName" />
+ <result column="avatar" property="avatar" />
+ <result column="birthday" property="birthday" />
+ <result column="sex" property="sex" />
+ <result column="emergencyContact" property="emergencyContact" />
+ <result column="emergencyContactNumber" property="emergencyContactNumber" />
+ <result column="isAuth" property="isAuth" />
+ <result column="name" property="name" />
+ <result column="idCard" property="idCard" />
+ <result column="idCardFront" property="idCardFront" />
+ <result column="idCardReverse" property="idCardReverse" />
+ <result column="consumption" property="consumption" />
+ <result column="balance" property="balance" />
+ <result column="integral" property="integral" />
+ <result column="passWord" property="passWord" />
+ <result column="openId" property="openId" />
+ <result column="unionid" property="unionid" />
+ <result column="remark" property="remark" />
+ <result column="state" property="state" />
+ <result column="flag" property="flag" />
+ <result column="insertTime" property="insertTime" />
+ <result column="insertUser" property="insertUser" />
+ <result column="updateTime" property="updateTime" />
+ <result column="updateUser" property="updateUser" />
+ </resultMap>
+
+ <!-- 通用查询结果列 -->
+ <sql id="Base_Column_List">
+ id, companyId, registIp, registAreaCode, phone, nickName, avatar, birthday, sex, emergencyContact, emergencyContactNumber, isAuth, name, idCard, idCardFront, idCardReverse, consumption, balance, integral, passWord, openId, unionid, remark, state, flag, insertTime, insertUser, updateTime, updateUser
+ </sql>
+
+ <!--根据条件查询用户列表-->
+ <select id="getUserList" resultType="map" parameterType="com.baomidou.mybatisplus.plugins.Page">
+ SELECT * FROM (SELECT ci.`name` as companyName,IFNULL(ot.num,0) as historyNum,IFNULL(td.num,0) as consumptionNum,ui.* from t_user as ui
+ LEFT JOIN (select * from t_company where flag != 3) as ci on ci.id = ui.companyId
+ LEFT JOIN (SELECT COUNT(id) as num,userId from t_order_taxi where FIND_IN_SET(state,'8,9') GROUP BY userId) as ot on ot.userId = ui.id
+ LEFT JOIN (SELECT sum(money) as num,userId from t_pub_transaction_details where userType = 1 and type = 1 and state = 2 GROUP BY userId) as td on td.userId = ui.id
+ ) as o
+ <where>
+ o.flag != 3
+ <if test="beginTime != null and beginTime != '' and endTime != null and endTime != ''">
+ AND (o.insertTime between CONCAT(#{beginTime},' 00:00:00') and CONCAT(#{endTime},' 23:59:59'))
+ </if>
+ <if test="isAuth != null and isAuth != ''">
+ and o.isAuth = #{isAuth}
+ </if>
+ <if test="state != null and state != ''">
+ and o.state = #{state}
+ </if>
+ <if test="id != null and id != ''">
+ and o.id LIKE CONCAT('%',#{id},'%')
+ </if>
+ <if test="nickName != null and nickName != ''">
+ and o.nickName LIKE CONCAT('%',#{nickName},'%')
+ </if>
+ <if test="phone != null and phone != ''">
+ and o.phone LIKE CONCAT('%',#{phone},'%')
+ </if>
+ <if test="companyName != null and companyName != ''">
+ and o.companyName LIKE CONCAT('%',#{companyName},'%')
+ </if>
+ <if test="roleType != null and roleType != '' and roleType == 2">
+ and (o.companyId = #{nowUserId} or FIND_IN_SET(o.companyId,(SELECT GROUP_CONCAT(id) as ids FROM t_company where superiorId = #{nowUserId} GROUP BY superiorId)))
+ </if>
+ <if test="roleType != null and roleType != '' and roleType == 3">
+ and o.companyId = #{nowUserId}
+ </if>
+ </where>
+ order by o.id desc
+ </select>
+
+ <!--根据用户ID获取用户详情-->
+ <select id="getUserDetailById" resultType="java.util.Map">
+ SELECT DATE_FORMAT(ui.insertTime,'%Y-%m-%d %H:%i') as insertTimeStr,ci.`name` as companyName,
+ case when ui.isAuth = 1 then '否' else '是' end as isAuthStr,
+ IFNULL(0,0) as zcNum,
+ IFNULL(ot.num,0) as czNum,
+ IFNULL(0,0) as kcNum,
+ IFNULL(0,0) as wlNum,
+ IFNULL(td.num,0) as consumptionNum,
+ IFNULL(ui.balance,0) as balanceStr,
+ ui.* from t_user as ui
+ LEFT JOIN (select * from t_company where flag != 3) as ci on ci.id = ui.companyId
+ LEFT JOIN (SELECT sum(money) as num,userId from t_pub_transaction_details where userType = 1 and type = 1 and state = 2 GROUP BY userId) as td on td.userId = ui.id
+ LEFT JOIN (SELECT COUNT(id) as num,userId from t_order_taxi where FIND_IN_SET(state,'8,9') GROUP BY userId) as ot on ot.userId = ui.id
+ where ui.id = #{userId}
+ </select>
+
+ <!--根据条件查询用户列表-无分页-->
+ <select id="getUserListNoPage" resultType="map" >
+ SELECT * FROM (SELECT ci.`name` as companyName,IFNULL(ot.num,0) as historyNum,IFNULL(td.num,0) as consumptionNum,ui.* from t_user as ui
+ LEFT JOIN (select * from t_company where flag != 3) as ci on ci.id = ui.companyId
+ LEFT JOIN (SELECT COUNT(id) as num,userId from t_order_taxi where FIND_IN_SET(state,'8,9') GROUP BY userId) as ot on ot.userId = ui.id
+ LEFT JOIN (SELECT sum(money) as num,userId from t_pub_transaction_details where userType = 1 and type = 1 and state = 2 GROUP BY userId) as td on td.userId = ui.id
+ ) as o
+ <where>
+ o.flag != 3
+ <if test="roleType != null and roleType != '' and roleType == 2">
+ and (o.companyId = #{nowUserId} or FIND_IN_SET(o.companyId,(SELECT GROUP_CONCAT(id) as ids FROM t_company where superiorId = #{nowUserId} GROUP BY superiorId)))
+ </if>
+ <if test="roleType != null and roleType != '' and roleType == 3">
+ and o.companyId = #{nowUserId}
+ </if>
+ </where>
+ order by o.id desc
+ </select>
+
+
+</mapper>
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TUserRedPacketRecordMapper.xml b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TUserRedPacketRecordMapper.xml
new file mode 100644
index 0000000..84a93b3
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TUserRedPacketRecordMapper.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.stylefeng.guns.modular.system.dao.TUserRedPacketRecordMapper">
+
+ <!-- 通用查询映射结果 -->
+ <resultMap id="BaseResultMap" type="com.stylefeng.guns.modular.system.model.TUserRedPacketRecord">
+ <id column="id" property="id" />
+ <result column="money" property="money" />
+ <result column="expirationTime" property="expirationTime" />
+ <result column="insertTime" property="insertTime" />
+ <result column="companyId" property="companyId" />
+ <result column="state" property="state" />
+ <result column="orderId" property="orderId" />
+ <result column="orderType" property="orderType" />
+ <result column="userId" property="userId" />
+ <result column="redPacketActivityId" property="redPacketActivityId" />
+ </resultMap>
+
+ <!-- 通用查询结果列 -->
+ <sql id="Base_Column_List">
+ id, money, expirationTime, insertTime, companyId, state, orderId, orderType, userId, redPacketActivityId
+ </sql>
+
+</mapper>
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TVerifiedMapper.xml b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TVerifiedMapper.xml
new file mode 100644
index 0000000..d675cfa
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TVerifiedMapper.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.stylefeng.guns.modular.system.dao.TVerifiedMapper">
+
+ <!-- 通用查询映射结果 -->
+ <resultMap id="BaseResultMap" type="com.stylefeng.guns.modular.system.model.TVerified">
+ <id column="id" property="id" />
+ <result column="userId" property="userId" />
+ <result column="name" property="name" />
+ <result column="idcode" property="idcode" />
+ <result column="img1" property="img1" />
+ <result column="img2" property="img2" />
+ <result column="state" property="state" />
+ <result column="insertTime" property="insertTime" />
+ </resultMap>
+
+ <!-- 通用查询结果列 -->
+ <sql id="Base_Column_List">
+ id, userId, name, idcode, img1, img2, state, insertTime
+ </sql>
+
+ <!--根据条件查询用户实名认证列表-->
+ <select id="getVerifiedList" resultType="map" parameterType="com.baomidou.mybatisplus.plugins.Page">
+ SELECT * FROM (SELECT uu.nickName as userName,uu.phone as userPhone,vv.* FROM t_verified as vv
+ LEFT JOIN t_user as uu on uu.id = vv.userId) as o
+ <where>
+ 1 = 1
+ <if test="beginTime != null and beginTime != '' and endTime != null and endTime != ''">
+ AND (o.insertTime between CONCAT(#{beginTime},' 00:00:00') and CONCAT(#{endTime},' 23:59:59'))
+ </if>
+ <if test="userName != null and userName != ''">
+ and o.userName LIKE CONCAT('%',#{userName},'%')
+ </if>
+ <if test="userPhone != null and userPhone != ''">
+ and o.userPhone LIKE CONCAT('%',#{userPhone},'%')
+ </if>
+ <if test="name != null and name != ''">
+ and o.name LIKE CONCAT('%',#{name},'%')
+ </if>
+ <if test="state != null and state != ''">
+ and o.state = #{state}
+ </if>
+ </where>
+ order by o.id desc
+ </select>
+
+</mapper>
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TVersionManagementMapper.xml b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TVersionManagementMapper.xml
new file mode 100644
index 0000000..40f7807
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TVersionManagementMapper.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.stylefeng.guns.modular.system.dao.TVersionManagementMapper">
+
+ <!-- 通用查询映射结果 -->
+ <resultMap id="BaseResultMap" type="com.stylefeng.guns.modular.system.model.TVersionManagement">
+ <id column="id" property="id" />
+ <result column="url" property="url" />
+ <result column="version" property="version" />
+ <result column="content" property="content" />
+ <result column="mandatory" property="mandatory" />
+ <result column="insertTime" property="insertTime" />
+ <result column="type" property="type" />
+ </resultMap>
+
+ <!-- 通用查询结果列 -->
+ <sql id="Base_Column_List">
+ id, url, version, content, mandatory, insertTime, type
+ </sql>
+
+ <!--根据条件查询版本列表-->
+ <select id="getVersionList" resultType="map" parameterType="com.baomidou.mybatisplus.plugins.Page">
+ SELECT * FROM t_version_management as o
+ <where>
+ 1 = 1
+ <if test="beginTime != null and beginTime != '' and endTime != null and endTime != ''">
+ AND (o.insertTime between CONCAT(#{beginTime},' 00:00:00') and CONCAT(#{endTime},' 23:59:59'))
+ </if>
+ <if test="version != null and version != ''">
+ and o.version LIKE CONCAT('%',#{version},'%')
+ </if>
+ </where>
+ order by o.id desc
+ </select>
+
+</mapper>
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TransactionDetailsMapper.xml b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TransactionDetailsMapper.xml
new file mode 100644
index 0000000..391ca70
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TransactionDetailsMapper.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.stylefeng.guns.modular.system.dao.TransactionDetailsMapper">
+
+ <!-- 通用查询映射结果 -->
+ <resultMap id="BaseResultMap" type="com.stylefeng.guns.modular.system.model.TransactionDetails">
+ <id column="id" property="id"/>
+ <result column="userId" property="userId"/>
+ <result column="insertTime" property="insertTime"/>
+ <result column="remark" property="remark"/>
+ <result column="money" property="money"/>
+ <result column="state" property="state"/>
+ <result column="type" property="type"/>
+ <result column="userType" property="userType"/>
+ <result column="orderType" property="orderType"/>
+ <result column="orderId" property="orderId"/>
+ </resultMap>
+</mapper>
\ No newline at end of file
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/UserActivityBalanceMapper.xml b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/UserActivityBalanceMapper.xml
new file mode 100644
index 0000000..61d5663
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/UserActivityBalanceMapper.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.stylefeng.guns.modular.system.dao.UserActivityBalanceMapper">
+
+ <!-- 通用查询映射结果 -->
+ <resultMap id="BaseResultMap" type="com.stylefeng.guns.modular.system.model.UserActivityBalance">
+ <id column="id" property="id" />
+ <result column="enable" property="enable" />
+ <result column="userActivityId" property="userActivityId" />
+ <result column="money" property="money" />
+ <result column="generalNum" property="generalNum" />
+ <result column="generalCouponId" property="generalCouponId" />
+ <result column="specialNum" property="specialNum" />
+ <result column="specialCouponId" property="specialCouponId" />
+ <result column="taxiNum" property="taxiNum" />
+ <result column="taxiCouponId" property="taxiCouponId" />
+ <result column="intercityNum" property="intercityNum" />
+ <result column="intercityCouponId" property="intercityCouponId" />
+ <result column="insertTime" property="insertTime" />
+ <result column="startTime" property="startTime" />
+ <result column="endTime" property="endTime" />
+ <result column="totalPrice" property="totalPrice" />
+ <result column="lavePrice" property="lavePrice" />
+ </resultMap>
+
+ <!-- 通用查询结果列 -->
+ <sql id="Base_Column_List">
+ id, enable, userActivityId, money, generalNum, generalCouponId, specialNum, specialCouponId, taxiNum, taxiCouponId, intercityNum, intercityCouponId, insertTime, startTime, endTime
+ </sql>
+
+</mapper>
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/UserActivityDiscount1Mapper.xml b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/UserActivityDiscount1Mapper.xml
new file mode 100644
index 0000000..835617b
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/UserActivityDiscount1Mapper.xml
@@ -0,0 +1,310 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.stylefeng.guns.modular.system.dao.UserActivityDiscount1Mapper">
+
+ <!-- 通用查询映射结果 -->
+ <resultMap id="BaseResultMap" type="com.stylefeng.guns.modular.system.model.UserActivityDiscount1">
+ <id column="id" property="id" />
+ <result column="userActivityId" property="userActivityId" />
+ <result column="special" property="special" />
+ <result column="taxi" property="taxi" />
+ <result column="logistics" property="logistics" />
+ <result column="startTime" property="startTime" />
+ <result column="endTime" property="endTime" />
+ <result column="enable" property="enable" />
+ </resultMap>
+
+ <!-- 通用查询结果列 -->
+ <sql id="Base_Column_List">
+ id, userActivityId, special, taxi, logistics, startTime, endTime, enable
+ </sql>
+
+
+ <select id="queryDiscount1" resultType="map">
+ select
+ qa.time,
+ count(qa.userId) as userNum,
+ sum(qa.discountMoney) as discountMoney
+ from (
+ select
+ aa.time,
+ aa.userId as userId,
+ sum(aa.discountMoney) as discountMoney
+ from (
+ select DATE_FORMAT(a.travelTime, '%Y-%m-%d') as time, a.userId,a.discountMoney
+ from t_order_private_car a
+ left join t_user_activity_discount1 b on (a.activityId = b.id)
+ left join t_user_activity c on (b.userActivityId = c.id)
+ where a.activityId is not null
+ <if test="null != name and '' != name">
+ and c.`name` like CONCAT('%', #{name}, '%')
+ </if>
+ <if test="null != start and '' != start and null != end and '' != end">
+ and DATE_FORMAT(a.insertTime, '%Y-%m-%d') between #{start} and #{end}
+ </if>
+ <if test="null != companyId">
+ and c.companyId = #{companyId}
+ </if>
+
+ union all
+
+ select DATE_FORMAT(a.travelTime, '%Y-%m-%d') as time,a.userId,a.discountMoney
+ from t_order_taxi a
+ left join t_user_activity_discount1 b on (a.activityId = b.id)
+ left join t_user_activity c on (b.userActivityId = c.id)
+ where a.activityId is not null
+ <if test="null != name and '' != name">
+ and c.`name` like CONCAT('%', #{name}, '%')
+ </if>
+ <if test="null != start and '' != start and null != end and '' != end">
+ and DATE_FORMAT(a.insertTime, '%Y-%m-%d') between #{start} and #{end}
+ </if>
+ <if test="null != companyId">
+ and c.companyId = #{companyId}
+ </if>
+
+ union all
+
+ select DATE_FORMAT(a.travelTime, '%Y-%m-%d') as time,a.userId,a.discountMoney
+ from t_order_logistics a
+ left join t_user_activity_discount1 b on (a.activityId = b.id)
+ left join t_user_activity c on (b.userActivityId = c.id)
+ where a.activityId is not null
+ <if test="null != name and '' != name">
+ and c.`name` like CONCAT('%', #{name}, '%')
+ </if>
+ <if test="null != start and '' != start and null != end and '' != end">
+ and DATE_FORMAT(a.insertTime, '%Y-%m-%d') between #{start} and #{end}
+ </if>
+ <if test="null != companyId">
+ and c.companyId = #{companyId}
+ </if>
+ ) as aa GROUP BY aa.time, aa.userId
+ ) as qa GROUP BY qa.time order by qa.time desc
+ <if test="null != offset and null != limit">
+ limit #{offset}, #{limit}
+ </if>
+ </select>
+
+
+
+ <select id="queryDiscount1Count" resultType="int">
+ select count(time) from (
+ select
+ qa.time as time
+ from (
+ select
+ aa.time,
+ aa.userId as userId,
+ sum(aa.discountMoney) as discountMoney
+ from (
+ select DATE_FORMAT(a.travelTime, '%Y-%m-%d') as time, a.userId,a.discountMoney
+ from t_order_private_car a
+ left join t_user_activity_discount1 b on (a.activityId = b.id)
+ left join t_user_activity c on (b.userActivityId = c.id)
+ where a.activityId is not null
+ <if test="null != name and '' != name">
+ and c.`name` like CONCAT('%', #{name}, '%')
+ </if>
+ <if test="null != start and '' != start and null != end and '' != end">
+ and DATE_FORMAT(a.insertTime, '%Y-%m-%d') between #{start} and #{end}
+ </if>
+ <if test="null != companyId">
+ and c.companyId = #{companyId}
+ </if>
+
+ union all
+
+ select DATE_FORMAT(a.travelTime, '%Y-%m-%d') as time,a.userId,a.discountMoney
+ from t_order_taxi a
+ left join t_user_activity_discount1 b on (a.activityId = b.id)
+ left join t_user_activity c on (b.userActivityId = c.id)
+ where a.activityId is not null
+ <if test="null != name and '' != name">
+ and c.`name` like CONCAT('%', #{name}, '%')
+ </if>
+ <if test="null != start and '' != start and null != end and '' != end">
+ and DATE_FORMAT(a.insertTime, '%Y-%m-%d') between #{start} and #{end}
+ </if>
+ <if test="null != companyId">
+ and c.companyId = #{companyId}
+ </if>
+
+ union all
+
+ select DATE_FORMAT(a.travelTime, '%Y-%m-%d') as time,a.userId,a.discountMoney
+ from t_order_logistics a
+ left join t_user_activity_discount1 b on (a.activityId = b.id)
+ left join t_user_activity c on (b.userActivityId = c.id)
+ where a.activityId is not null
+ <if test="null != name and '' != name">
+ and c.`name` like CONCAT('%', #{name}, '%')
+ </if>
+ <if test="null != start and '' != start and null != end and '' != end">
+ and DATE_FORMAT(a.insertTime, '%Y-%m-%d') between #{start} and #{end}
+ </if>
+ <if test="null != companyId">
+ and c.companyId = #{companyId}
+ </if>
+ ) as aa GROUP BY aa.time, aa.userId
+ ) as qa GROUP BY qa.time
+ ) as da
+ </select>
+
+
+ <select id="queryDiscountInfo" resultType="map">
+ select
+ aa.time,
+ aa.`name`,
+ aa.phone,
+ sum(aa.discountMoney) as discountMoney
+ from (
+ select
+ DATE_FORMAT(a.endServiceTime, '%Y-%m-%d %H:%i:%s') as time,
+ a.userId as userId,
+ b.nickName as `name`,
+ b.phone as phone,
+ a.discountMoney as discountMoney
+ from t_order_private_car a
+ left join t_user b on (a.userId = b.id)
+ left join t_user_activity_discount1 c on (a.activityId = c.id)
+ left join t_user_activity d on (c.userActivityId = d.id)
+ where a.state in (8, 9) and activityId is not null
+ <if test="null != name and '' != name">
+ and d.`name` like CONCAT('%', #{name}, '%')
+ </if>
+ <if test="null != start and '' != start and null != end and '' != end">
+ and DATE_FORMAT(a.endServiceTime, '%Y-%m-%d') between #{start} and #{end}
+ </if>
+ <if test="null != companyId">
+ and a.companyId = #{companyId}
+ </if>
+
+ union all
+
+ select
+ DATE_FORMAT(a.endServiceTime, '%Y-%m-%d %H:%i:%s') as time,
+ a.userId as userId,
+ b.nickName as `name`,
+ b.phone as phone,
+ a.discountMoney as discountMoney
+ from t_order_taxi a
+ left join t_user b on (a.userId = b.id)
+ left join t_user_activity_discount1 c on (a.activityId = c.id)
+ left join t_user_activity d on (c.userActivityId = d.id)
+ where a.state in (8, 9) and activityId is not null
+ <if test="null != name and '' != name">
+ and d.`name` like CONCAT('%', #{name}, '%')
+ </if>
+ <if test="null != start and '' != start and null != end and '' != end">
+ and DATE_FORMAT(a.endServiceTime, '%Y-%m-%d') between #{start} and #{end}
+ </if>
+ <if test="null != companyId">
+ and a.companyId = #{companyId}
+ </if>
+
+ union all
+
+ select
+ DATE_FORMAT(a.endServiceTime, '%Y-%m-%d %H:%i:%s') as time,
+ a.userId as userId,
+ b.nickName as `name`,
+ b.phone as phone,
+ a.discountMoney as discountMoney
+ from t_order_logistics a
+ left join t_user b on (a.userId = b.id)
+ left join t_user_activity_discount1 c on (a.activityId = c.id)
+ left join t_user_activity d on (c.userActivityId = d.id)
+ where a.state in (9) and activityId is not null
+ <if test="null != name and '' != name">
+ and d.`name` like CONCAT('%', #{name}, '%')
+ </if>
+ <if test="null != start and '' != start and null != end and '' != end">
+ and DATE_FORMAT(a.endServiceTime, '%Y-%m-%d') between #{start} and #{end}
+ </if>
+ <if test="null != companyId">
+ and a.companyId = #{companyId}
+ </if>
+ ) as aa group by aa.time, userId order by aa.time desc
+ <if test="null != offset and null != limit">
+ limit #{offset}, #{limit}
+ </if>
+ </select>
+
+
+ <select id="queryDiscountInfoCount" resultType="int">
+ select count(w.time) from (
+ select
+ aa.time as time
+ from (
+ select
+ DATE_FORMAT(a.endServiceTime, '%Y-%m-%d %H:%i:%s') as time,
+ a.userId as userId,
+ b.nickName as `name`,
+ b.phone as phone,
+ a.discountMoney as discountMoney
+ from t_order_private_car a
+ left join t_user b on (a.userId = b.id)
+ left join t_user_activity_discount1 c on (a.activityId = c.id)
+ left join t_user_activity d on (c.userActivityId = d.id)
+ where a.state in (8, 9) and activityId is not null
+ <if test="null != name and '' != name">
+ and d.`name` like CONCAT('%', #{name}, '%')
+ </if>
+ <if test="null != start and '' != start and null != end and '' != end">
+ and DATE_FORMAT(a.endServiceTime, '%Y-%m-%d') between #{start} and #{end}
+ </if>
+ <if test="null != companyId">
+ and a.companyId = #{companyId}
+ </if>
+
+ union all
+
+ select
+ DATE_FORMAT(a.endServiceTime, '%Y-%m-%d %H:%i:%s') as time,
+ a.userId as userId,
+ b.nickName as `name`,
+ b.phone as phone,
+ a.discountMoney as discountMoney
+ from t_order_taxi a
+ left join t_user b on (a.userId = b.id)
+ left join t_user_activity_discount1 c on (a.activityId = c.id)
+ left join t_user_activity d on (c.userActivityId = d.id)
+ where a.state in (8, 9) and activityId is not null
+ <if test="null != name and '' != name">
+ and d.`name` like CONCAT('%', #{name}, '%')
+ </if>
+ <if test="null != start and '' != start and null != end and '' != end">
+ and DATE_FORMAT(a.endServiceTime, '%Y-%m-%d') between #{start} and #{end}
+ </if>
+ <if test="null != companyId">
+ and a.companyId = #{companyId}
+ </if>
+
+ union all
+
+ select
+ DATE_FORMAT(a.endServiceTime, '%Y-%m-%d %H:%i:%s') as time,
+ a.userId as userId,
+ b.nickName as `name`,
+ b.phone as phone,
+ a.discountMoney as discountMoney
+ from t_order_logistics a
+ left join t_user b on (a.userId = b.id)
+ left join t_user_activity_discount1 c on (a.activityId = c.id)
+ left join t_user_activity d on (c.userActivityId = d.id)
+ where a.state in (9) and activityId is not null
+ <if test="null != name and '' != name">
+ and d.`name` like CONCAT('%', #{name}, '%')
+ </if>
+ <if test="null != start and '' != start and null != end and '' != end">
+ and DATE_FORMAT(a.endServiceTime, '%Y-%m-%d') between #{start} and #{end}
+ </if>
+ <if test="null != companyId">
+ and a.companyId = #{companyId}
+ </if>
+ ) as aa group by aa.time, userId
+
+ ) as w
+ </select>
+</mapper>
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/UserActivityDiscount2Mapper.xml b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/UserActivityDiscount2Mapper.xml
new file mode 100644
index 0000000..4cd802b
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/UserActivityDiscount2Mapper.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.stylefeng.guns.modular.system.dao.UserActivityDiscount2Mapper">
+
+ <!-- 通用查询映射结果 -->
+ <resultMap id="BaseResultMap" type="com.stylefeng.guns.modular.system.model.UserActivityDiscount2">
+ <id column="id" property="id" />
+ <result column="userActivityId" property="userActivityId" />
+ <result column="lineId" property="lineId" />
+ <result column="discount" property="discount" />
+ <result column="startTime" property="startTime" />
+ <result column="endTime" property="endTime" />
+ <result column="enable" property="enable" />
+ </resultMap>
+
+ <!-- 通用查询结果列 -->
+ <sql id="Base_Column_List">
+ id, userActivityId, lineId, discount, startTime, endTime, enable
+ </sql>
+
+</mapper>
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/UserActivityInviteMapper.xml b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/UserActivityInviteMapper.xml
new file mode 100644
index 0000000..27cdc69
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/UserActivityInviteMapper.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.stylefeng.guns.modular.system.dao.UserActivityInviteMapper">
+
+ <!-- 通用查询映射结果 -->
+ <resultMap id="BaseResultMap" type="com.stylefeng.guns.modular.system.model.UserActivityInvite">
+ <id column="id" property="id" />
+ <result column="userActivityId" property="userActivityId" />
+ <result column="couponId" property="couponId" />
+ <result column="totalNum" property="totalNum" />
+ <result column="laveNum" property="laveNum" />
+ <result column="startTime" property="startTime" />
+ <result column="endTime" property="endTime" />
+ <result column="enable" property="enable" />
+ <result column="totalPrice" property="totalPrice" />
+ <result column="lavePrice" property="lavePrice" />
+ </resultMap>
+
+ <!-- 通用查询结果列 -->
+ <sql id="Base_Column_List">
+ id, userActivityId, couponId, totalNum, laveNum, startTime, endTime, enable
+ </sql>
+
+</mapper>
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/UserActivityMapper.xml b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/UserActivityMapper.xml
new file mode 100644
index 0000000..b3a966d
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/UserActivityMapper.xml
@@ -0,0 +1,75 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.stylefeng.guns.modular.system.dao.UserActivityMapper">
+
+ <!-- 通用查询映射结果 -->
+ <resultMap id="BaseResultMap" type="com.stylefeng.guns.modular.system.model.UserActivity">
+ <id column="id" property="id" />
+ <result column="name" property="name" />
+ <result column="startTime" property="startTime" />
+ <result column="endTime" property="endTime" />
+ <result column="insertTime" property="insertTime" />
+ <result column="status" property="status" />
+ <result column="remark" property="remark" />
+ <result column="companyType" property="companyType" />
+ </resultMap>
+
+ <!-- 通用查询结果列 -->
+ <sql id="Base_Column_List">
+ id, name, startTime, endTime, insertTime, status, remark, companyType
+ </sql>
+
+
+
+ <select id="queryUserActivityList" resultType="map">
+ select
+ a.id as id,
+ a.insertTime as insertTime,
+ a.`name` as `name`,
+ a.startTime as startTime,
+ a.endTime as endTime,
+ a.remark as remark,
+ a.`status` as `status`,
+ (
+ (select count(aa.id) from t_user_red_packet_record aa left join t_user_activity_redenvelope bb on (aa.redPacketActivityId = bb.id) where aa.state = 2 and bb.userActivityId = a.id) +
+ (select count(aa.id) from t_user_coupon_record aa left join t_user_activity_registered bb on (aa.couponActivityId = bb.id and aa.activityType = 2) where aa.state = 2 and bb.userActivityId = a.id) +
+ (select count(aa.id) from t_user_coupon_record aa left join t_user_activity_invite bb on (aa.couponActivityId = bb.id and aa.activityType = 3) where aa.state = 2 and bb.userActivityId = a.id) +
+ (select count(aa.id) from t_user_coupon_record aa left join t_user_activity_balance bb on (aa.couponActivityId = bb.id and aa.activityType = 4) where aa.state = 2 and bb.userActivityId = a.id) +
+ (select count(id) from t_order_private_car where state in (7,8,9) and activityId = a.id) +
+ (select count(id) from t_order_taxi where state in (7,8,9) and activityId = a.id) +
+ (select count(id) from t_order_cross_city where state in (6,8,9) and activityId = a.id)
+ ) as number
+ from t_user_activity a
+ where a.companyId = #{companyId}
+ <if test="null != start and null != end">
+ and a.insertTime between #{start} and #{end}
+ </if>
+ <if test="null != name and '' != name">
+ and a.`name` like CONCAT('%', #{name}, '%')
+ </if>
+ <if test="null != status">
+ and a.`status` = #{status}
+ </if>
+ order by a.insertTime desc
+ <if test="null != offset and null != limit">
+ limit #{offset}, #{limit}
+ </if>
+ </select>
+
+
+ <select id="queryUserActivityListCount" resultType="int">
+ select
+ count(a.id)
+ from t_user_activity a
+ where a.companyId = #{companyId}
+ <if test="null != start and null != end">
+ and a.insertTime between #{start} and #{end}
+ </if>
+ <if test="null != name and '' != name">
+ and a.`name` like CONCAT('%', #{name}, '%')
+ </if>
+ <if test="null != status">
+ and a.`status` = #{status}
+ </if>
+ </select>
+</mapper>
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/UserActivityRedenvelopeMapper.xml b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/UserActivityRedenvelopeMapper.xml
new file mode 100644
index 0000000..cdc0278
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/UserActivityRedenvelopeMapper.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.stylefeng.guns.modular.system.dao.UserActivityRedenvelopeMapper">
+
+ <!-- 通用查询映射结果 -->
+ <resultMap id="BaseResultMap" type="com.stylefeng.guns.modular.system.model.UserActivityRedenvelope">
+ <id column="id" property="id" />
+ <result column="userActivityId" property="userActivityId" />
+ <result column="redEnvelopeId" property="redEnvelopeId" />
+ <result column="totalMoney" property="totalMoney" />
+ <result column="laveMoney" property="laveMoney" />
+ <result column="startTime" property="startTime" />
+ <result column="endTime" property="endTime" />
+ <result column="enable" property="enable" />
+ <result column="totalPrice" property="totalPrice" />
+ <result column="lavePrice" property="lavePrice" />
+ </resultMap>
+
+ <!-- 通用查询结果列 -->
+ <sql id="Base_Column_List">
+ id, userActivityId, redEnvelopeId, totalMoney, laveMoney, startTime, endTime, enable
+ </sql>
+
+</mapper>
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/UserActivityRegisteredMapper.xml b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/UserActivityRegisteredMapper.xml
new file mode 100644
index 0000000..6ca3782
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/UserActivityRegisteredMapper.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.stylefeng.guns.modular.system.dao.UserActivityRegisteredMapper">
+
+ <!-- 通用查询映射结果 -->
+ <resultMap id="BaseResultMap" type="com.stylefeng.guns.modular.system.model.UserActivityRegistered">
+ <id column="id" property="id" />
+ <result column="userActivityId" property="userActivityId" />
+ <result column="couponId" property="couponId" />
+ <result column="totalNum" property="totalNum" />
+ <result column="laveNum" property="laveNum" />
+ <result column="startTime" property="startTime" />
+ <result column="endTime" property="endTime" />
+ <result column="enable" property="enable" />
+ <result column="totalPrice" property="totalPrice" />
+ <result column="lavePrice" property="lavePrice" />
+ </resultMap>
+
+ <!-- 通用查询结果列 -->
+ <sql id="Base_Column_List">
+ id, userActivityId, couponId, totalNum, laveNum, startTime, endTime, enable
+ </sql>
+
+</mapper>
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/UserCouponRecordMapper.xml b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/UserCouponRecordMapper.xml
new file mode 100644
index 0000000..87b5a1c
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/UserCouponRecordMapper.xml
@@ -0,0 +1,1291 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.stylefeng.guns.modular.system.dao.UserCouponRecordMapper">
+
+ <!-- 通用查询映射结果 -->
+ <resultMap id="BaseResultMap" type="com.stylefeng.guns.modular.system.model.UserCouponRecord">
+ <id column="id" property="id" />
+ <result column="money" property="money" />
+ <result column="fullMoney" property="fullMoney" />
+ <result column="expirationTime" property="expirationTime" />
+ <result column="insertTime" property="insertTime" />
+ <result column="companyId" property="companyId" />
+ <result column="state" property="state" />
+ <result column="endTime" property="endTime"/>
+ <result column="couponUseType" property="couponUseType" />
+ <result column="couponType" property="couponType" />
+ <result column="userId" property="userId" />
+ <result column="couponId" property="couponId" />
+ <result column="couponActivityId" property="couponActivityId" />
+ <result column="activityType" property="activityType" />
+ </resultMap>
+
+ <!-- 通用查询结果列 -->
+ <sql id="Base_Column_List">
+ id, money, fullMoney, expirationTime, insertTime, companyId, state, couponUseType, couponType, userId, couponId, couponActivityId, activityType
+ </sql>
+
+ <select id="getList" resultType="map" parameterType="com.baomidou.mybatisplus.plugins.Page">
+ SELECT
+ c.id,
+ c.money,
+ c.fullMoney,
+ c.expirationTime,
+ c.insertTime,
+ c.companyId,
+ c.state,
+ c.couponUseType,
+ c.couponType,
+ c.userId,
+ c.couponId,
+ c.couponActivityId,
+ c.activityType,
+ u.nickName,
+ u.phone,
+ if(a.id is null, if(b.id is null, if(d.id is null, if(e.id is null, '', e.endServiceTime), d.endServiceTime), b.endServiceTime), a.endServiceTime) as useTime
+ FROM
+ t_user_coupon_record c
+ LEFT JOIN t_user u ON c.userId = u.id
+ left join t_order_private_car a on (a.couponId = c.id)
+ left join t_order_taxi b on (b.couponId = c.id)
+ left join t_order_cross_city d on (d.couponId = c.id)
+ left join t_order_logistics e on (e.couponId = c.id)
+ WHERE 1=1
+ <if test="beginTime != null and beginTime !='' and endTime != null and endTime != ''">
+ and (c.insertTime between CONCAT(#{beginTime},' 00:00:00') and CONCAT(#{endTime},' 23:59:59'))
+ </if>
+ <if test="userName != null and userName !=''">
+ and u.nickName like CONCAT('%',#{userName},'%')
+ </if>
+ <if test="activityType != null and activityType !=''">
+ and c.activityType=#{activityType}
+ </if>
+ <if test="userPhone != null and userPhone !=''">
+ and u.phone like CONCAT('%',#{userPhone},'%')
+ </if>
+ <if test="couponActivityId != null and couponActivityId !=''">
+ and c.couponActivityId=#{couponActivityId}
+ </if>
+ <if test="state != null and state !=''">
+ and c.state=#{state}
+ </if>
+ </select>
+ <select id="getRedList" resultType="map" parameterType="com.baomidou.mybatisplus.plugins.Page">
+ SELECT
+ c.id,
+ c.money,
+ c.expirationTime,
+ c.insertTime,
+ c.companyId,
+ c.state,
+ c.userId,
+ c.redPacketActivityId,
+ u.nickName,
+ u.phone,
+ if(a.id is null, if(b.id is null, if(d.id is null, if(e.id is null, '', e.endServiceTime), d.endServiceTime), b.endServiceTime), a.endServiceTime) as useTime
+ FROM
+ t_user_red_packet_record c
+ LEFT JOIN t_user u ON c.userId = u.id
+ left join t_order_private_car a on (a.redPacketId = c.id)
+ left join t_order_taxi b on (b.redPacketId = c.id)
+ left join t_order_cross_city d on (d.redPacketId = c.id)
+ left join t_order_logistics e on (e.redPacketId = c.id)
+ WHERE 1=1
+ <if test="beginTime != null and beginTime !='' and endTime != null and endTime != ''">
+ and (c.insertTime between CONCAT(#{beginTime},' 00:00:00') and CONCAT(#{endTime},' 23:59:59'))
+ </if>
+ <if test="userName != null and userName !=''">
+ and u.nickName like CONCAT('%',#{userName},'%')
+ </if>
+ <if test="userPhone != null and userPhone !=''">
+ and u.phone like CONCAT('%',#{userPhone},'%')
+ </if>
+ <if test="couponActivityId != null and couponActivityId !=''">
+ and c.redPacketActivityId=#{couponActivityId}
+ </if>
+ <if test="state != null and state !=''">
+ and c.state=#{state}
+ </if>
+ </select>
+ <select id="getCouponStatic" resultType="map">
+ SELECT
+ IFNULL(SUM(money), 0) money,
+ IFNULL(
+ SUM(
+ CASE
+ WHEN state = 2 THEN
+ money
+ ELSE
+ 0
+ END
+ ),
+ 0
+ ) useMoney,
+ (
+ select count(c.userId) from (select userId from t_user_coupon_record where activityType = #{activityType} and couponActivityId = #{activityId}
+ <if test="beginTime != null and beginTime !='' and endTime != null and endTime != ''">
+ and (insertTime between CONCAT(#{beginTime},' 00:00:00') and CONCAT(#{endTime},' 23:59:59'))
+ </if>
+ group by userId) as c
+ ) number
+ FROM
+ t_user_coupon_record
+ WHERE
+ activityType = #{activityType}
+ AND couponActivityId = #{activityId}
+ <if test="beginTime != null and beginTime !='' and endTime != null and endTime != ''">
+ and (insertTime between CONCAT(#{beginTime},' 00:00:00') and CONCAT(#{endTime},' 23:59:59'))
+ </if>
+ </select>
+ <select id="getRedStatic" resultType="map">
+ SELECT
+ IFNULL(SUM(money), 0) money,
+ IFNULL(
+ SUM(
+ CASE
+ WHEN state = 2 THEN
+ money
+ ELSE
+ 0
+ END
+ ),
+ 0
+ ) useMoney,
+ COUNT(id) number
+ FROM
+ t_user_red_packet_record
+ WHERE
+ redPacketActivityId = #{activityId}
+ <if test="beginTime != null and beginTime !='' and endTime != null and endTime != ''">
+ and (insertTime between CONCAT(#{beginTime},' 00:00:00') and CONCAT(#{endTime},' 23:59:59'))
+ </if>
+ </select>
+ <select id="getDiscountStatic" resultType="map">
+ SELECT IFNULL(SUM(discountMoney),0) money,COUNT(id) number FROM t_order_taxi WHERE activityId=#{activityId}
+ </select>
+ <select id="getRegStatic" resultType="map">
+ SELECT
+ IFNULL(SUM(r.money), 0) money,
+ IFNULL(
+ SUM(
+ CASE
+ WHEN r.state = 2 THEN
+ r.money
+ ELSE
+ 0
+ END
+ ),
+ 0
+ ) useMoney,
+ COUNT(r.id) number
+ FROM
+ t_user_coupon_record r
+ LEFT JOIN t_user_activity_balance u ON u.id = r.couponActivityId
+ WHERE
+ u.userActivityId = #{activityId} and r.activityType =4
+ <if test="beginTime != null and beginTime !='' and endTime != null and endTime != ''">
+ and (r.insertTime between CONCAT(#{beginTime},' 00:00:00') and CONCAT(#{endTime},' 23:59:59'))
+ </if>
+ </select>
+ <select id="getBlanceList" resultType="map" parameterType="com.baomidou.mybatisplus.plugins.Page">
+ SELECT
+ b.id,
+ b.money,
+ c1.number,c1.useMoney,c1.useNumber,
+ c2.number speNumber,c2.useMoney speUserMoney,c2.useNumber speUseNumber,
+ c3.number taxiNumber,c3.useMoney taxiUserMoney,c3.useNumber taxiUseNumber,
+ c4.number intercityNumber,c4.useMoney intercityUserMoney,c4.useNumber intercityUseNumber
+ FROM
+ t_user_activity_balance b
+ LEFT JOIN (
+ SELECT
+ couponActivityId,
+ IFNULL(
+ SUM(
+ CASE
+ WHEN r.state = 2 THEN
+ r.money
+ ELSE
+ 0
+ END
+ ),
+ 0
+ ) useMoney,
+ IFNULL(
+ SUM(
+ CASE
+ WHEN r.state = 2 THEN
+ 1
+ ELSE
+ 0
+ END
+ ),
+ 0
+ ) useNumber,
+ COUNT(r.id) number
+ FROM
+ t_user_coupon_record r
+ WHERE
+ r.activityType = 4 AND r.couponUseType=0
+ <if test="beginTime != null and beginTime !='' and endTime != null and endTime != ''">
+ and (r.insertTime between CONCAT(#{beginTime},' 00:00:00') and CONCAT(#{endTime},' 23:59:59'))
+ </if>
+ GROUP BY couponActivityId
+ ) c1 ON c1.couponActivityId=b.id
+ LEFT JOIN (
+ SELECT
+ couponActivityId,
+ IFNULL(
+ SUM(
+ CASE
+ WHEN r.state = 2 THEN
+ r.money
+ ELSE
+ 0
+ END
+ ),
+ 0
+ ) useMoney,
+ IFNULL(
+ SUM(
+ CASE
+ WHEN r.state = 2 THEN
+ 1
+ ELSE
+ 0
+ END
+ ),
+ 0
+ ) useNumber,
+ COUNT(r.id) number
+ FROM
+ t_user_coupon_record r
+ WHERE
+ r.activityType = 4 AND r.couponUseType=1
+ <if test="beginTime != null and beginTime !='' and endTime != null and endTime != ''">
+ and (r.insertTime between CONCAT(#{beginTime},' 00:00:00') and CONCAT(#{endTime},' 23:59:59'))
+ </if>
+ GROUP BY couponActivityId
+ ) c2 ON c2.couponActivityId=b.id
+ LEFT JOIN (
+ SELECT
+ couponActivityId,
+ IFNULL(
+ SUM(
+ CASE
+ WHEN r.state = 2 THEN
+ r.money
+ ELSE
+ 0
+ END
+ ),
+ 0
+ ) useMoney,
+ IFNULL(
+ SUM(
+ CASE
+ WHEN r.state = 2 THEN
+ 1
+ ELSE
+ 0
+ END
+ ),
+ 0
+ ) useNumber,
+ COUNT(r.id) number
+ FROM
+ t_user_coupon_record r
+ WHERE
+ r.activityType = 4 AND r.couponUseType=2
+ <if test="beginTime != null and beginTime !='' and endTime != null and endTime != ''">
+ and (r.insertTime between CONCAT(#{beginTime},' 00:00:00') and CONCAT(#{endTime},' 23:59:59'))
+ </if>
+ GROUP BY couponActivityId
+ ) c3 ON c3.couponActivityId=b.id
+ LEFT JOIN (
+ SELECT
+ couponActivityId,
+ IFNULL(
+ SUM(
+ CASE
+ WHEN r.state = 2 THEN
+ r.money
+ ELSE
+ 0
+ END
+ ),
+ 0
+ ) useMoney,
+ IFNULL(
+ SUM(
+ CASE
+ WHEN r.state = 2 THEN
+ 1
+ ELSE
+ 0
+ END
+ ),
+ 0
+ ) useNumber,
+ COUNT(r.id) number
+ FROM
+ t_user_coupon_record r
+ WHERE
+ r.activityType = 4 AND r.couponUseType=3
+ <if test="beginTime != null and beginTime !='' and endTime != null and endTime != ''">
+ and (r.insertTime between CONCAT(#{beginTime},' 00:00:00') and CONCAT(#{endTime},' 23:59:59'))
+ </if>
+ GROUP BY couponActivityId
+ ) c4 ON c4.couponActivityId=b.id
+ WHERE
+ b.userActivityId = #{activityId}
+ </select>
+
+
+ <select id="queryCouponRegister" resultType="map">
+ select
+ da.time,
+ sum(da.receivePeople) as receivePeople,
+ sum(da.giving) as giving,
+ (sum(da.receivePeople) + sum(da.giving)) as receive,
+ sum(da.receiveMoney) as receiveMoney,
+ sum(da.usePeople) as usePeople,
+ sum(da.`use`) as `use`,
+ sum(da.useMoney) as useMoney
+ from (
+ select
+ aa.time,
+ count(aa.userId) as receivePeople,
+ 0 as giving,
+ sum(aa.receiveMoney) as receiveMoney,
+ 0 as usePeople,
+ 0 as `use`,
+ 0 as useMoney
+ from (
+ select
+ DATE_FORMAT(a.insertTime, '%Y-%m-%d') as time,
+ a.userId,
+ count(a.id) as receive,
+ sum(a.money) as receiveMoney
+ from t_user_coupon_record a
+ <if test="2 == type">
+ left join t_user_activity_registered b on (a.couponActivityId = b.id and a.activityType = 2)
+ left join t_user_activity c on (b.userActivityId = c.id)
+ </if>
+ <if test="3 == type">
+ left join t_user_activity_invite b on (a.couponActivityId = b.id and a.activityType = 3)
+ left join t_user_activity c on (b.userActivityId = c.id)
+ </if>
+ <if test="4 == type">
+ left join t_user_activity_balance b on (a.couponActivityId = b.id and a.activityType = 4)
+ left join t_user_activity c on (b.userActivityId = c.id)
+ </if>
+ where activityType = #{type}
+ <if test="null != name and '' != name">
+ and c.`name` like CONCAT('%', #{name}, '%')
+ </if>
+ <if test="null != start and '' != start and null != end and '' != end">
+ and DATE_FORMAT(a.insertTime, '%Y-%m-%d') between #{start} and #{end}
+ </if>
+ <if test="null != companyId">
+ and c.companyId = #{companyId}
+ </if>
+ GROUP BY DATE_FORMAT(insertTime, '%Y-%m-%d'),userId
+ ) as aa GROUP BY aa.time
+
+ union all
+
+ select
+ aa.time,
+ 0,
+ 0,
+ 0,
+ count(aa.userId) as usePeople,
+ sum(aa.receive) as `use`,
+ sum(aa.receiveMoney) as useMoney
+ from (
+ select
+ DATE_FORMAT(a.insertTime, '%Y-%m-%d') as time,
+ a.userId,
+ count(a.id) as receive,
+ sum(a.money) as receiveMoney
+ from t_user_coupon_record a
+ <if test="2 == type">
+ left join t_user_activity_registered b on (a.couponActivityId = b.id and a.activityType = 2)
+ left join t_user_activity c on (b.userActivityId = c.id)
+ </if>
+ <if test="3 == type">
+ left join t_user_activity_invite b on (a.couponActivityId = b.id and a.activityType = 3)
+ left join t_user_activity c on (b.userActivityId = c.id)
+ </if>
+ <if test="4 == type">
+ left join t_user_activity_balance b on (a.couponActivityId = b.id and a.activityType = 4)
+ left join t_user_activity c on (b.userActivityId = c.id)
+ </if>
+ where a.activityType = #{type} and a.state = 2
+ <if test="null != name and '' != name">
+ and c.`name` like CONCAT('%', #{name}, '%')
+ </if>
+ <if test="null != start and '' != start and null != end and '' != end">
+ and DATE_FORMAT(a.insertTime, '%Y-%m-%d') between #{start} and #{end}
+ </if>
+ <if test="null != companyId">
+ and c.companyId = #{companyId}
+ </if>
+ GROUP BY DATE_FORMAT(insertTime, '%Y-%m-%d'),userId
+ ) as aa GROUP BY aa.time
+
+ <if test="2 == type">
+ union all
+
+ select
+ aa.time,
+ 0,
+ count(aa.userId) as giving,
+ sum(aa.receiveMoney) as receiveMoney,
+ 0 as usePeople,
+ 0 as `use`,
+ 0 as useMoney
+ from (
+ select
+ DATE_FORMAT(a.insertTime, '%Y-%m-%d') as time,
+ a.userId,
+ count(a.id) as receive,
+ sum(a.money) as receiveMoney
+ from t_user_coupon_record a
+ left join t_sys_coupon_record b on (a.couponActivityId = b.id and a.activityType = 1)
+ where a.activityType = 1
+ <if test="null != name and '' != name">
+ and b.`name` like CONCAT('%', #{name}, '%')
+ </if>
+ <if test="null != start and '' != start and null != end and '' != end">
+ and DATE_FORMAT(a.insertTime, '%Y-%m-%d') between #{start} and #{end}
+ </if>
+ <if test="null != companyId">
+ and b.companyId = #{companyId}
+ </if>
+ GROUP BY DATE_FORMAT(a.insertTime, '%Y-%m-%d'),userId
+ ) as aa GROUP BY aa.time
+ </if>
+ ) as da GROUP BY da.time order by da.time desc
+ <if test="null != offset and null != limit">
+ limit #{offset}, #{limit}
+ </if>
+ </select>
+
+
+ <select id="queryCouponRegisterCount" resultType="int">
+ select count(time) from (
+ select
+ count(da.time) as time
+ from (
+ select
+ aa.time,
+ count(aa.userId) as receivePeople,
+ 0 as giving,
+ sum(aa.receiveMoney) as receiveMoney,
+ 0 as usePeople,
+ 0 as `use`,
+ 0 as useMoney
+ from (
+ select
+ DATE_FORMAT(a.insertTime, '%Y-%m-%d') as time,
+ a.userId,
+ count(a.id) as receive,
+ sum(a.money) as receiveMoney
+ from t_user_coupon_record a
+ <if test="2 == type">
+ left join t_user_activity_registered b on (a.couponActivityId = b.id and a.activityType = 2)
+ left join t_user_activity c on (b.userActivityId = c.id)
+ </if>
+ <if test="3 == type">
+ left join t_user_activity_invite b on (a.couponActivityId = b.id and a.activityType = 3)
+ left join t_user_activity c on (b.userActivityId = c.id)
+ </if>
+ <if test="4 == type">
+ left join t_user_activity_balance b on (a.couponActivityId = b.id and a.activityType = 4)
+ left join t_user_activity c on (b.userActivityId = c.id)
+ </if>
+ where activityType = #{type}
+ <if test="null != name and '' != name">
+ and c.`name` like CONCAT('%', #{name}, '%')
+ </if>
+ <if test="null != start and '' != start and null != end and '' != end">
+ and DATE_FORMAT(a.insertTime, '%Y-%m-%d') between #{start} and #{end}
+ </if>
+ <if test="null != companyId">
+ and c.companyId = #{companyId}
+ </if>
+ GROUP BY DATE_FORMAT(insertTime, '%Y-%m-%d'),userId
+ ) as aa GROUP BY aa.time
+
+ union all
+
+ select
+ aa.time,
+ 0,
+ 0,
+ 0,
+ count(aa.userId) as usePeople,
+ sum(aa.receive) as `use`,
+ sum(aa.receiveMoney) as useMoney
+ from (
+ select
+ DATE_FORMAT(a.insertTime, '%Y-%m-%d') as time,
+ a.userId,
+ count(a.id) as receive,
+ sum(a.money) as receiveMoney
+ from t_user_coupon_record a
+ <if test="2 == type">
+ left join t_user_activity_registered b on (a.couponActivityId = b.id and a.activityType = 2)
+ left join t_user_activity c on (b.userActivityId = c.id)
+ </if>
+ <if test="3 == type">
+ left join t_user_activity_invite b on (a.couponActivityId = b.id and a.activityType = 3)
+ left join t_user_activity c on (b.userActivityId = c.id)
+ </if>
+ <if test="4 == type">
+ left join t_user_activity_balance b on (a.couponActivityId = b.id and a.activityType = 4)
+ left join t_user_activity c on (b.userActivityId = c.id)
+ </if>
+ where a.activityType = #{type} and a.state = 2
+ <if test="null != name and '' != name">
+ and c.`name` like CONCAT('%', #{name}, '%')
+ </if>
+ <if test="null != start and '' != start and null != end and '' != end">
+ and DATE_FORMAT(a.insertTime, '%Y-%m-%d') between #{start} and #{end}
+ </if>
+ <if test="null != companyId">
+ and c.companyId = #{companyId}
+ </if>
+ GROUP BY DATE_FORMAT(insertTime, '%Y-%m-%d'),userId
+ ) as aa GROUP BY aa.time
+
+ <if test="2 == type">
+ union all
+
+ select
+ aa.time,
+ 0,
+ count(aa.userId) as giving,
+ sum(aa.receiveMoney) as receiveMoney,
+ 0 as usePeople,
+ 0 as `use`,
+ 0 as useMoney
+ from (
+ select
+ DATE_FORMAT(a.insertTime, '%Y-%m-%d') as time,
+ a.userId,
+ count(a.id) as receive,
+ sum(a.money) as receiveMoney
+ from t_user_coupon_record a
+ left join t_sys_coupon_record b on (a.couponActivityId = b.id and a.activityType = 1)
+ where a.activityType = 1
+ <if test="null != name and '' != name">
+ and b.`name` like CONCAT('%', #{name}, '%')
+ </if>
+ <if test="null != start and '' != start and null != end and '' != end">
+ and DATE_FORMAT(a.insertTime, '%Y-%m-%d') between #{start} and #{end}
+ </if>
+ <if test="null != companyId">
+ and b.companyId = #{companyId}
+ </if>
+ GROUP BY DATE_FORMAT(a.insertTime, '%Y-%m-%d'),userId
+ ) as aa GROUP BY aa.time
+ </if>
+ ) as da GROUP BY da.time
+ ) as w
+ </select>
+
+
+ <select id="queryCouponRegisterInfo" resultType="map">
+ select
+ a.id as id,
+ DATE_FORMAT(a.insertTime, '%Y-%m-%d %H:%i:%s') as time,
+ d.nickName as userName,
+ d.phone as phone,
+ a.money as money,
+ DATE_FORMAT(a.expirationTime, '%Y-%m-%d %H:%i:%s') as expirationTime,
+ if(a.couponType = 1, '抵扣券', '满减券') as couponType,
+ if(a.state = 1, '未使用', if(a.state = 2, '已使用', '已过期')) as state,
+ DATE_FORMAT(a.endTime, '%Y-%m-%d %H:%i:%s') as endTime
+ from t_user_coupon_record a
+ <if test="2 == type">
+ left join t_user_activity_registered b on (a.couponActivityId = b.id and a.activityType = 2)
+ left join t_user_activity c on (b.userActivityId = c.id)
+ </if>
+ <if test="3 == type">
+ left join t_user_activity_invite b on (a.couponActivityId = b.id and a.activityType = 3)
+ left join t_user_activity c on (b.userActivityId = c.id)
+ </if>
+ left join t_user d on (a.userId = d.id)
+ where a.activityType = #{type}
+ <if test="null != name and '' != name">
+ and c.`name` like CONCAT('%', #{name}, '%')
+ </if>
+ <if test="null != start and '' != start and null != end and '' != end">
+ and DATE_FORMAT(a.insertTime, '%Y-%m-%d') between #{start} and #{end}
+ </if>
+ <if test="null != companyId">
+ and c.companyId = #{companyId}
+ </if>
+ order by a.insertTime desc
+ <if test="null != offset and null != limit">
+ limit #{offset}, #{limit}
+ </if>
+ </select>
+
+
+ <select id="queryCouponRegisterInfoCount" resultType="int">
+ select
+ count(a.id)
+ from t_user_coupon_record a
+ <if test="2 == type">
+ left join t_user_activity_registered b on (a.couponActivityId = b.id and a.activityType = 2)
+ left join t_user_activity c on (b.userActivityId = c.id)
+ </if>
+ <if test="3 == type">
+ left join t_user_activity_invite b on (a.couponActivityId = b.id and a.activityType = 3)
+ left join t_user_activity c on (b.userActivityId = c.id)
+ </if>
+ left join t_user d on (a.userId = d.id)
+ where a.activityType = #{type}
+ <if test="null != name and '' != name">
+ and c.`name` like CONCAT('%', #{name}, '%')
+ </if>
+ <if test="null != start and '' != start and null != end and '' != end">
+ and DATE_FORMAT(a.insertTime, '%Y-%m-%d') between #{start} and #{end}
+ </if>
+ <if test="null != companyId">
+ and c.companyId = #{companyId}
+ </if>
+ </select>
+
+
+
+ <select id="queryCouponRegisterInfo1" resultType="map">
+ select
+ aa.time,
+ aa.userId,
+ aa.userName,
+ aa.phone,
+ sum(aa.amount) as amount,
+ sum(aa.tyNum) as tyNum,
+ sum(aa.tyUseNum) as tyUseNum,
+ sum(aa.tyUseMoney) as tyUseMoney,
+ sum(aa.zcNum) as zcNum,
+ sum(aa.zcUseNum) as zcUseNum,
+ sum(aa.zcUseMoney) as zcUseMoney,
+ sum(aa.czcNum) as czcNum,
+ sum(aa.czcUseNum) as czcUseNum,
+ sum(aa.czcUseMoney) as czcUseMoney,
+ sum(aa.kcNum) as kcNum,
+ sum(aa.kcUseNum) as kcUseNum,
+ sum(aa.kcUseMoney) as kcUseMoney
+ from (
+ select
+ DATE_FORMAT(a.insertTime, '%Y-%m-%d %H:%i:%s') as time,
+ a.userId as userId,
+ d.nickName as userName,
+ d.phone as phone,
+ sum(e.amount) as amount,
+ count(a.id) as tyNum,
+ 0 as tyUseNum,
+ 0 as tyUseMoney,
+ 0 as zcNum,
+ 0 as zcUseNum,
+ 0 as zcUseMoney,
+ 0 as czcNum,
+ 0 as czcUseNum,
+ 0 as czcUseMoney,
+ 0 as kcNum,
+ 0 as kcUseNum,
+ 0 as kcUseMoney
+ from t_user_coupon_record a
+ left join t_user_activity_balance b on (a.couponActivityId = b.id and a.activityType = 4)
+ left join t_user_activity c on (b.userActivityId = c.id)
+ left join t_user d on (a.userId = d.id)
+ left join t_payment_record e on (a.paymentRecordId = e.id)
+ where a.activityType = 4 and a.couponUseType = 0
+ <if test="null != name and '' != name">
+ and c.`name` like CONCAT('%', #{name}, '%')
+ </if>
+ <if test="null != start and '' != start and null != end and '' != end">
+ and DATE_FORMAT(a.insertTime, '%Y-%m-%d') between #{start} and #{end}
+ </if>
+ <if test="null != companyId">
+ and c.companyId = #{companyId}
+ </if>
+ GROUP BY DATE_FORMAT(a.insertTime, '%Y-%m-%d %H:%i:%s'),a.userId
+
+ union all
+
+ select
+ DATE_FORMAT(a.insertTime, '%Y-%m-%d %H:%i:%s') as time,
+ a.userId as userId,
+ d.nickName as userName,
+ d.phone as phone,
+ 0 as amount,
+ 0 as tyNum,
+ count(a.id) as tyUseNum,
+ sum(a.money) as tyUseMoney,
+ 0 as zcNum,
+ 0 as zcUseNum,
+ 0 as zcUseMoney,
+ 0 as czcNum,
+ 0 as czcUseNum,
+ 0 as czcUseMoney,
+ 0 as kcNum,
+ 0 as kcUseNum,
+ 0 as kcUseMoney
+ from t_user_coupon_record a
+ left join t_user_activity_balance b on (a.couponActivityId = b.id and a.activityType = 4)
+ left join t_user_activity c on (b.userActivityId = c.id)
+ left join t_user d on (a.userId = d.id)
+ left join t_payment_record e on (a.paymentRecordId = e.id)
+ where a.activityType = 4 and a.couponUseType = 0 and a.state = 2
+ <if test="null != name and '' != name">
+ and c.`name` like CONCAT('%', #{name}, '%')
+ </if>
+ <if test="null != start and '' != start and null != end and '' != end">
+ and DATE_FORMAT(a.insertTime, '%Y-%m-%d') between #{start} and #{end}
+ </if>
+ <if test="null != companyId">
+ and c.companyId = #{companyId}
+ </if>
+ GROUP BY DATE_FORMAT(a.insertTime, '%Y-%m-%d %H:%i:%s'),a.userId
+
+
+ union all
+
+ select
+ DATE_FORMAT(a.insertTime, '%Y-%m-%d %H:%i:%s') as time,
+ a.userId as userId,
+ d.nickName as userName,
+ d.phone as phone,
+ 0 as amount,
+ 0 as tyNum,
+ 0 as tyUseNum,
+ 0 as tyUseMoney,
+ count(a.id) as zcNum,
+ 0 as zcUseNum,
+ 0 as zcUseMoney,
+ 0 as czcNum,
+ 0 as czcUseNum,
+ 0 as czcUseMoney,
+ 0 as kcNum,
+ 0 as kcUseNum,
+ 0 as kcUseMoney
+ from t_user_coupon_record a
+ left join t_user_activity_balance b on (a.couponActivityId = b.id and a.activityType = 4)
+ left join t_user_activity c on (b.userActivityId = c.id)
+ left join t_user d on (a.userId = d.id)
+ left join t_payment_record e on (a.paymentRecordId = e.id)
+ where a.activityType = 4 and a.couponUseType = 1
+ <if test="null != name and '' != name">
+ and c.`name` like CONCAT('%', #{name}, '%')
+ </if>
+ <if test="null != start and '' != start and null != end and '' != end">
+ and DATE_FORMAT(a.insertTime, '%Y-%m-%d') between #{start} and #{end}
+ </if>
+ <if test="null != companyId">
+ and c.companyId = #{companyId}
+ </if>
+ GROUP BY DATE_FORMAT(a.insertTime, '%Y-%m-%d %H:%i:%s'),a.userId
+
+ union all
+
+ select
+ DATE_FORMAT(a.insertTime, '%Y-%m-%d %H:%i:%s') as time,
+ a.userId as userId,
+ d.nickName as userName,
+ d.phone as phone,
+ 0 as amount,
+ 0 as tyNum,
+ 0 as tyUseNum,
+ 0 as tyUseMoney,
+ 0 as zcNum,
+ count(a.id) as zcUseNum,
+ sum(a.money) as zcUseMoney,
+ 0 as czcNum,
+ 0 as czcUseNum,
+ 0 as czcUseMoney,
+ 0 as kcNum,
+ 0 as kcUseNum,
+ 0 as kcUseMoney
+ from t_user_coupon_record a
+ left join t_user_activity_balance b on (a.couponActivityId = b.id and a.activityType = 4)
+ left join t_user_activity c on (b.userActivityId = c.id)
+ left join t_user d on (a.userId = d.id)
+ left join t_payment_record e on (a.paymentRecordId = e.id)
+ where a.activityType = 4 and a.couponUseType = 1 and a.state = 2
+ <if test="null != name and '' != name">
+ and c.`name` like CONCAT('%', #{name}, '%')
+ </if>
+ <if test="null != start and '' != start and null != end and '' != end">
+ and DATE_FORMAT(a.insertTime, '%Y-%m-%d') between #{start} and #{end}
+ </if>
+ <if test="null != companyId">
+ and c.companyId = #{companyId}
+ </if>
+ GROUP BY DATE_FORMAT(a.insertTime, '%Y-%m-%d %H:%i:%s'),a.userId
+
+ union all
+
+ select
+ DATE_FORMAT(a.insertTime, '%Y-%m-%d %H:%i:%s') as time,
+ a.userId as userId,
+ d.nickName as userName,
+ d.phone as phone,
+ 0 as amount,
+ 0 as tyNum,
+ 0 as tyUseNum,
+ 0 as tyUseMoney,
+ 0 as zcNum,
+ 0 as zcUseNum,
+ 0 as zcUseMoney,
+ count(a.id) as czcNum,
+ 0 as czcUseNum,
+ 0 as czcUseMoney,
+ 0 as kcNum,
+ 0 as kcUseNum,
+ 0 as kcUseMoney
+ from t_user_coupon_record a
+ left join t_user_activity_balance b on (a.couponActivityId = b.id and a.activityType = 4)
+ left join t_user_activity c on (b.userActivityId = c.id)
+ left join t_user d on (a.userId = d.id)
+ left join t_payment_record e on (a.paymentRecordId = e.id)
+ where a.activityType = 4 and a.couponUseType = 2
+ <if test="null != name and '' != name">
+ and c.`name` like CONCAT('%', #{name}, '%')
+ </if>
+ <if test="null != start and '' != start and null != end and '' != end">
+ and DATE_FORMAT(a.insertTime, '%Y-%m-%d') between #{start} and #{end}
+ </if>
+ <if test="null != companyId">
+ and c.companyId = #{companyId}
+ </if>
+ GROUP BY DATE_FORMAT(a.insertTime, '%Y-%m-%d %H:%i:%s'),a.userId
+
+ union all
+
+ select
+ DATE_FORMAT(a.insertTime, '%Y-%m-%d %H:%i:%s') as time,
+ a.userId as userId,
+ d.nickName as userName,
+ d.phone as phone,
+ 0 as amount,
+ 0 as tyNum,
+ 0 as tyUseNum,
+ 0 as tyUseMoney,
+ 0 as zcNum,
+ 0 as zcUseNum,
+ 0 as zcUseMoney,
+ 0 as czcNum,
+ count(a.id) as czcUseNum,
+ sum(a.money) as czcUseMoney,
+ 0 as kcNum,
+ 0 as kcUseNum,
+ 0 as kcUseMoney
+ from t_user_coupon_record a
+ left join t_user_activity_balance b on (a.couponActivityId = b.id and a.activityType = 4)
+ left join t_user_activity c on (b.userActivityId = c.id)
+ left join t_user d on (a.userId = d.id)
+ left join t_payment_record e on (a.paymentRecordId = e.id)
+ where a.activityType = 4 and a.couponUseType = 2 and a.state = 2
+ <if test="null != name and '' != name">
+ and c.`name` like CONCAT('%', #{name}, '%')
+ </if>
+ <if test="null != start and '' != start and null != end and '' != end">
+ and DATE_FORMAT(a.insertTime, '%Y-%m-%d') between #{start} and #{end}
+ </if>
+ <if test="null != companyId">
+ and c.companyId = #{companyId}
+ </if>
+ GROUP BY DATE_FORMAT(a.insertTime, '%Y-%m-%d %H:%i:%s'),a.userId
+
+ union all
+
+ select
+ DATE_FORMAT(a.insertTime, '%Y-%m-%d %H:%i:%s') as time,
+ a.userId as userId,
+ d.nickName as userName,
+ d.phone as phone,
+ 0 as amount,
+ 0 as tyNum,
+ 0 as tyUseNum,
+ 0 as tyUseMoney,
+ 0 as zcNum,
+ 0 as zcUseNum,
+ 0 as zcUseMoney,
+ 0 as czcNum,
+ 0 as czcUseNum,
+ 0 as czcUseMoney,
+ count(a.id) as kcNum,
+ 0 as kcUseNum,
+ 0 as kcUseMoney
+ from t_user_coupon_record a
+ left join t_user_activity_balance b on (a.couponActivityId = b.id and a.activityType = 4)
+ left join t_user_activity c on (b.userActivityId = c.id)
+ left join t_user d on (a.userId = d.id)
+ left join t_payment_record e on (a.paymentRecordId = e.id)
+ where a.activityType = 4 and a.couponUseType = 3
+ <if test="null != name and '' != name">
+ and c.`name` like CONCAT('%', #{name}, '%')
+ </if>
+ <if test="null != start and '' != start and null != end and '' != end">
+ and DATE_FORMAT(a.insertTime, '%Y-%m-%d') between #{start} and #{end}
+ </if>
+ <if test="null != companyId">
+ and c.companyId = #{companyId}
+ </if>
+ GROUP BY DATE_FORMAT(a.insertTime, '%Y-%m-%d %H:%i:%s'),a.userId
+
+ union all
+
+ select
+ DATE_FORMAT(a.insertTime, '%Y-%m-%d %H:%i:%s') as time,
+ a.userId as userId,
+ d.nickName as userName,
+ d.phone as phone,
+ 0 as amount,
+ 0 as tyNum,
+ 0 as tyUseNum,
+ 0 as tyUseMoney,
+ 0 as zcNum,
+ 0 as zcUseNum,
+ 0 as zcUseMoney,
+ 0 as czcNum,
+ 0 as czcUseNum,
+ 0 as czcUseMoney,
+ 0 as kcNum,
+ count(a.id) as kcUseNum,
+ sum(a.money) as kcUseMoney
+ from t_user_coupon_record a
+ left join t_user_activity_balance b on (a.couponActivityId = b.id and a.activityType = 4)
+ left join t_user_activity c on (b.userActivityId = c.id)
+ left join t_user d on (a.userId = d.id)
+ left join t_payment_record e on (a.paymentRecordId = e.id)
+ where a.activityType = 4 and a.couponUseType = 3 and a.state = 2
+ <if test="null != name and '' != name">
+ and c.`name` like CONCAT('%', #{name}, '%')
+ </if>
+ <if test="null != start and '' != start and null != end and '' != end">
+ and DATE_FORMAT(a.insertTime, '%Y-%m-%d') between #{start} and #{end}
+ </if>
+ <if test="null != companyId">
+ and c.companyId = #{companyId}
+ </if>
+ GROUP BY DATE_FORMAT(a.insertTime, '%Y-%m-%d %H:%i:%s'),a.userId
+ ) as aa GROUP BY aa.time,aa.userId order by aa.time desc
+ <if test="null != offset and null != limit">
+ limit #{offset}, #{limit}
+ </if>
+ </select>
+
+
+ <select id="queryCouponRegisterInfo1Count" resultType="int">
+ select
+ count(w.time)
+ from (
+ select
+ aa.time as time
+ from (
+ select
+ DATE_FORMAT(a.insertTime, '%Y-%m-%d %H:%i:%s') as time,
+ a.userId as userId,
+ d.nickName as userName,
+ d.phone as phone,
+ sum(e.amount) as amount,
+ count(a.id) as tyNum,
+ 0 as tyUseNum,
+ 0 as tyUseMoney,
+ 0 as zcNum,
+ 0 as zcUseNum,
+ 0 as zcUseMoney,
+ 0 as czcNum,
+ 0 as czcUseNum,
+ 0 as czcUseMoney,
+ 0 as kcNum,
+ 0 as kcUseNum,
+ 0 as kcUseMoney
+ from t_user_coupon_record a
+ left join t_user_activity_balance b on (a.couponActivityId = b.id and a.activityType = 4)
+ left join t_user_activity c on (b.userActivityId = c.id)
+ left join t_user d on (a.userId = d.id)
+ left join t_payment_record e on (a.paymentRecordId = e.id)
+ where a.activityType = 4 and a.couponUseType = 0
+ <if test="null != name and '' != name">
+ and c.`name` like CONCAT('%', #{name}, '%')
+ </if>
+ <if test="null != start and '' != start and null != end and '' != end">
+ and DATE_FORMAT(a.insertTime, '%Y-%m-%d') between #{start} and #{end}
+ </if>
+ <if test="null != companyId">
+ and c.companyId = #{companyId}
+ </if>
+ GROUP BY DATE_FORMAT(a.insertTime, '%Y-%m-%d %H:%i:%s'),a.userId
+
+ union all
+
+ select
+ DATE_FORMAT(a.insertTime, '%Y-%m-%d %H:%i:%s') as time,
+ a.userId as userId,
+ d.nickName as userName,
+ d.phone as phone,
+ 0 as amount,
+ 0 as tyNum,
+ count(a.id) as tyUseNum,
+ sum(a.money) as tyUseMoney,
+ 0 as zcNum,
+ 0 as zcUseNum,
+ 0 as zcUseMoney,
+ 0 as czcNum,
+ 0 as czcUseNum,
+ 0 as czcUseMoney,
+ 0 as kcNum,
+ 0 as kcUseNum,
+ 0 as kcUseMoney
+ from t_user_coupon_record a
+ left join t_user_activity_balance b on (a.couponActivityId = b.id and a.activityType = 4)
+ left join t_user_activity c on (b.userActivityId = c.id)
+ left join t_user d on (a.userId = d.id)
+ left join t_payment_record e on (a.paymentRecordId = e.id)
+ where a.activityType = 4 and a.couponUseType = 0 and a.state = 2
+ <if test="null != name and '' != name">
+ and c.`name` like CONCAT('%', #{name}, '%')
+ </if>
+ <if test="null != start and '' != start and null != end and '' != end">
+ and DATE_FORMAT(a.insertTime, '%Y-%m-%d') between #{start} and #{end}
+ </if>
+ <if test="null != companyId">
+ and c.companyId = #{companyId}
+ </if>
+ GROUP BY DATE_FORMAT(a.insertTime, '%Y-%m-%d %H:%i:%s'),a.userId
+
+
+ union all
+
+ select
+ DATE_FORMAT(a.insertTime, '%Y-%m-%d %H:%i:%s') as time,
+ a.userId as userId,
+ d.nickName as userName,
+ d.phone as phone,
+ 0 as amount,
+ 0 as tyNum,
+ 0 as tyUseNum,
+ 0 as tyUseMoney,
+ count(a.id) as zcNum,
+ 0 as zcUseNum,
+ 0 as zcUseMoney,
+ 0 as czcNum,
+ 0 as czcUseNum,
+ 0 as czcUseMoney,
+ 0 as kcNum,
+ 0 as kcUseNum,
+ 0 as kcUseMoney
+ from t_user_coupon_record a
+ left join t_user_activity_balance b on (a.couponActivityId = b.id and a.activityType = 4)
+ left join t_user_activity c on (b.userActivityId = c.id)
+ left join t_user d on (a.userId = d.id)
+ left join t_payment_record e on (a.paymentRecordId = e.id)
+ where a.activityType = 4 and a.couponUseType = 1
+ <if test="null != name and '' != name">
+ and c.`name` like CONCAT('%', #{name}, '%')
+ </if>
+ <if test="null != start and '' != start and null != end and '' != end">
+ and DATE_FORMAT(a.insertTime, '%Y-%m-%d') between #{start} and #{end}
+ </if>
+ <if test="null != companyId">
+ and c.companyId = #{companyId}
+ </if>
+ GROUP BY DATE_FORMAT(a.insertTime, '%Y-%m-%d %H:%i:%s'),a.userId
+
+ union all
+
+ select
+ DATE_FORMAT(a.insertTime, '%Y-%m-%d %H:%i:%s') as time,
+ a.userId as userId,
+ d.nickName as userName,
+ d.phone as phone,
+ 0 as amount,
+ 0 as tyNum,
+ 0 as tyUseNum,
+ 0 as tyUseMoney,
+ 0 as zcNum,
+ count(a.id) as zcUseNum,
+ sum(a.money) as zcUseMoney,
+ 0 as czcNum,
+ 0 as czcUseNum,
+ 0 as czcUseMoney,
+ 0 as kcNum,
+ 0 as kcUseNum,
+ 0 as kcUseMoney
+ from t_user_coupon_record a
+ left join t_user_activity_balance b on (a.couponActivityId = b.id and a.activityType = 4)
+ left join t_user_activity c on (b.userActivityId = c.id)
+ left join t_user d on (a.userId = d.id)
+ left join t_payment_record e on (a.paymentRecordId = e.id)
+ where a.activityType = 4 and a.couponUseType = 1 and a.state = 2
+ <if test="null != name and '' != name">
+ and c.`name` like CONCAT('%', #{name}, '%')
+ </if>
+ <if test="null != start and '' != start and null != end and '' != end">
+ and DATE_FORMAT(a.insertTime, '%Y-%m-%d') between #{start} and #{end}
+ </if>
+ <if test="null != companyId">
+ and c.companyId = #{companyId}
+ </if>
+ GROUP BY DATE_FORMAT(a.insertTime, '%Y-%m-%d %H:%i:%s'),a.userId
+
+ union all
+
+ select
+ DATE_FORMAT(a.insertTime, '%Y-%m-%d %H:%i:%s') as time,
+ a.userId as userId,
+ d.nickName as userName,
+ d.phone as phone,
+ 0 as amount,
+ 0 as tyNum,
+ 0 as tyUseNum,
+ 0 as tyUseMoney,
+ 0 as zcNum,
+ 0 as zcUseNum,
+ 0 as zcUseMoney,
+ count(a.id) as czcNum,
+ 0 as czcUseNum,
+ 0 as czcUseMoney,
+ 0 as kcNum,
+ 0 as kcUseNum,
+ 0 as kcUseMoney
+ from t_user_coupon_record a
+ left join t_user_activity_balance b on (a.couponActivityId = b.id and a.activityType = 4)
+ left join t_user_activity c on (b.userActivityId = c.id)
+ left join t_user d on (a.userId = d.id)
+ left join t_payment_record e on (a.paymentRecordId = e.id)
+ where a.activityType = 4 and a.couponUseType = 2
+ <if test="null != name and '' != name">
+ and c.`name` like CONCAT('%', #{name}, '%')
+ </if>
+ <if test="null != start and '' != start and null != end and '' != end">
+ and DATE_FORMAT(a.insertTime, '%Y-%m-%d') between #{start} and #{end}
+ </if>
+ <if test="null != companyId">
+ and c.companyId = #{companyId}
+ </if>
+ GROUP BY DATE_FORMAT(a.insertTime, '%Y-%m-%d %H:%i:%s'),a.userId
+
+ union all
+
+ select
+ DATE_FORMAT(a.insertTime, '%Y-%m-%d %H:%i:%s') as time,
+ a.userId as userId,
+ d.nickName as userName,
+ d.phone as phone,
+ 0 as amount,
+ 0 as tyNum,
+ 0 as tyUseNum,
+ 0 as tyUseMoney,
+ 0 as zcNum,
+ 0 as zcUseNum,
+ 0 as zcUseMoney,
+ 0 as czcNum,
+ count(a.id) as czcUseNum,
+ sum(a.money) as czcUseMoney,
+ 0 as kcNum,
+ 0 as kcUseNum,
+ 0 as kcUseMoney
+ from t_user_coupon_record a
+ left join t_user_activity_balance b on (a.couponActivityId = b.id and a.activityType = 4)
+ left join t_user_activity c on (b.userActivityId = c.id)
+ left join t_user d on (a.userId = d.id)
+ left join t_payment_record e on (a.paymentRecordId = e.id)
+ where a.activityType = 4 and a.couponUseType = 2 and a.state = 2
+ <if test="null != name and '' != name">
+ and c.`name` like CONCAT('%', #{name}, '%')
+ </if>
+ <if test="null != start and '' != start and null != end and '' != end">
+ and DATE_FORMAT(a.insertTime, '%Y-%m-%d') between #{start} and #{end}
+ </if>
+ <if test="null != companyId">
+ and c.companyId = #{companyId}
+ </if>
+ GROUP BY DATE_FORMAT(a.insertTime, '%Y-%m-%d %H:%i:%s'),a.userId
+
+ union all
+
+ select
+ DATE_FORMAT(a.insertTime, '%Y-%m-%d %H:%i:%s') as time,
+ a.userId as userId,
+ d.nickName as userName,
+ d.phone as phone,
+ 0 as amount,
+ 0 as tyNum,
+ 0 as tyUseNum,
+ 0 as tyUseMoney,
+ 0 as zcNum,
+ 0 as zcUseNum,
+ 0 as zcUseMoney,
+ 0 as czcNum,
+ 0 as czcUseNum,
+ 0 as czcUseMoney,
+ count(a.id) as kcNum,
+ 0 as kcUseNum,
+ 0 as kcUseMoney
+ from t_user_coupon_record a
+ left join t_user_activity_balance b on (a.couponActivityId = b.id and a.activityType = 4)
+ left join t_user_activity c on (b.userActivityId = c.id)
+ left join t_user d on (a.userId = d.id)
+ left join t_payment_record e on (a.paymentRecordId = e.id)
+ where a.activityType = 4 and a.couponUseType = 3
+ <if test="null != name and '' != name">
+ and c.`name` like CONCAT('%', #{name}, '%')
+ </if>
+ <if test="null != start and '' != start and null != end and '' != end">
+ and DATE_FORMAT(a.insertTime, '%Y-%m-%d') between #{start} and #{end}
+ </if>
+ <if test="null != companyId">
+ and c.companyId = #{companyId}
+ </if>
+ GROUP BY DATE_FORMAT(a.insertTime, '%Y-%m-%d %H:%i:%s'),a.userId
+
+ union all
+
+ select
+ DATE_FORMAT(a.insertTime, '%Y-%m-%d %H:%i:%s') as time,
+ a.userId as userId,
+ d.nickName as userName,
+ d.phone as phone,
+ 0 as amount,
+ 0 as tyNum,
+ 0 as tyUseNum,
+ 0 as tyUseMoney,
+ 0 as zcNum,
+ 0 as zcUseNum,
+ 0 as zcUseMoney,
+ 0 as czcNum,
+ 0 as czcUseNum,
+ 0 as czcUseMoney,
+ 0 as kcNum,
+ count(a.id) as kcUseNum,
+ sum(a.money) as kcUseMoney
+ from t_user_coupon_record a
+ left join t_user_activity_balance b on (a.couponActivityId = b.id and a.activityType = 4)
+ left join t_user_activity c on (b.userActivityId = c.id)
+ left join t_user d on (a.userId = d.id)
+ left join t_payment_record e on (a.paymentRecordId = e.id)
+ where a.activityType = 4 and a.couponUseType = 3 and a.state = 2
+ <if test="null != name and '' != name">
+ and c.`name` like CONCAT('%', #{name}, '%')
+ </if>
+ <if test="null != start and '' != start and null != end and '' != end">
+ and DATE_FORMAT(a.insertTime, '%Y-%m-%d') between #{start} and #{end}
+ </if>
+ <if test="null != companyId">
+ and c.companyId = #{companyId}
+ </if>
+ GROUP BY DATE_FORMAT(a.insertTime, '%Y-%m-%d %H:%i:%s'),a.userId
+ ) as aa GROUP BY aa.time,aa.userId
+ ) w
+ </select>
+</mapper>
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/UserMapper.xml b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/UserMapper.xml
new file mode 100644
index 0000000..39c0cf3
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/UserMapper.xml
@@ -0,0 +1,111 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.stylefeng.guns.modular.system.dao.UserMapper">
+
+ <!-- 通用查询映射结果 -->
+ <resultMap id="BaseResultMap" type="com.stylefeng.guns.modular.system.model.User">
+ <id column="id" property="id" />
+ <result column="avatar" property="avatar" />
+ <result column="account" property="account" />
+ <result column="password" property="password" />
+ <result column="passWordUpdate" property="passWordUpdate"/>
+ <result column="salt" property="salt" />
+ <result column="name" property="name" />
+ <result column="birthday" property="birthday" />
+ <result column="sex" property="sex" />
+ <result column="email" property="email" />
+ <result column="phone" property="phone" />
+ <result column="roleid" property="roleid" />
+ <result column="deptid" property="deptid" />
+ <result column="status" property="status" />
+ <result column="createtime" property="createtime" />
+ <result column="version" property="version" />
+ </resultMap>
+
+ <sql id="Base_Column_List">
+ id, account, name, birthday, sex, email, avatar,
+ phone, roleid,
+ deptid, status,
+ createtime, version
+ </sql>
+
+ <sql id="Base_Column_List_With_Pwd">
+ id, account, name, birthday,password, sex, email, avatar,
+ phone, roleid,salt,
+ deptid, status,
+ createtime, version
+ </sql>
+
+ <select id="selectUsers" resultType="map">
+ select
+ <include refid="Base_Column_List" />
+ from sys_user
+ where status != 3
+ <if test="name != null and name != ''">
+ and (phone like CONCAT('%',#{name},'%')
+ or account like CONCAT('%',#{name},'%')
+ or name like CONCAT('%',#{name},'%'))
+ </if>
+ <if test="deptid != null and deptid != 0">
+ and (deptid = #{deptid} or deptid in ( select id from sys_dept where pids like CONCAT('%[', #{deptid}, ']%') ))
+ </if>
+ <if test="beginTime != null and beginTime != '' and endTime != null and endTime != ''">
+ and (createTime between CONCAT(#{beginTime},' 00:00:00') and CONCAT(#{endTime},' 23:59:59'))
+ </if>
+ </select>
+
+ <update id="setStatus">
+ update sys_user set status = #{status} where id =
+ #{userId}
+ </update>
+
+ <update id="changePwd">
+ update sys_user set password = #{pwd} where id =
+ #{userId}
+ </update>
+
+ <update id="setRoles">
+ update sys_user set roleid = #{roleIds} where id =
+ #{userId}
+ </update>
+
+ <select id="getByAccount" resultType="user">
+ select
+ <include refid="Base_Column_List_With_Pwd" />
+ from sys_user where account = #{account} and status != 3
+ </select>
+
+ <!--根据角色判断菜单有"首页"的数量-->
+ <select id="getMenuNumByRole" resultType="java.lang.Integer">
+ SELECT IFNULL(COUNT(menuid),0) as num from sys_relation where roleid in (#{roleStr}) and menuid = 2
+ </select>
+
+ <select id="getUserListPage" resultType="map" parameterType="com.baomidou.mybatisplus.plugins.Page">
+ SELECT * FROM (select CASE when d2.simplename is null then d1.simplename else d2.simplename end as parentName,
+ case when uu.sex = 1 then '男' when uu.sex = 2 then '女' else '' end as sexName,
+ d1.simplename as deptName,case when uu.status = 1 then '启用' when uu.status = 2 then '冻结' when uu.status = 3 then '删除' else '' end as statusName,
+ rr.roleName,
+ uu.* from sys_user as uu
+ LEFT JOIN sys_dept as d1 on d1.id = uu.deptid
+ LEFT JOIN sys_dept as d2 on d2.id = d1.pid
+ LEFT JOIN (select s.id,s.name,GROUP_CONCAT(r.name) as roleName from sys_user s
+ left join sys_role r on find_in_set(r.id,s.roleid) group by s.id) as rr on rr.id = uu.id
+ ) as o
+ <where>
+ o.status != 3
+ <if test="name != null and name != ''">
+ and (o.phone like CONCAT('%',#{name},'%')
+ or o.account like CONCAT('%',#{name},'%')
+ or o.name like CONCAT('%',#{name},'%'))
+ </if>
+ <if test="deptid != null and deptid != 0">
+ and (o.deptid = #{deptid} or o.deptid in ( select id from sys_dept where pids like CONCAT('%[', #{deptid}, ']%') ))
+ </if>
+ <if test="beginTime != null and beginTime != '' and endTime != null and endTime != ''">
+ and (o.createTime between CONCAT(#{beginTime},' 00:00:00') and CONCAT(#{endTime},' 23:59:59'))
+ </if>
+ </where>
+ order by o.id desc
+ </select>
+
+</mapper>
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/UserRedPacketRecordMapper.xml b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/UserRedPacketRecordMapper.xml
new file mode 100644
index 0000000..39cd2c7
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/UserRedPacketRecordMapper.xml
@@ -0,0 +1,218 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.stylefeng.guns.modular.system.dao.UserRedPacketRecordMapper">
+
+ <!-- 通用查询映射结果 -->
+ <resultMap id="BaseResultMap" type="com.stylefeng.guns.modular.system.model.UserRedPacketRecord">
+ <id column="id" property="id"/>
+ <result column="money" property="money"/>
+ <result column="expirationTime" property="expirationTime"/>
+ <result column="insertTime" property="insertTime"/>
+ <result column="companyId" property="companyId"/>
+ <result column="state" property="state"/>
+ <result column="endTime" property="endTime"/>
+ <result column="orderId" property="orderId"/>
+ <result column="orderType" property="orderType"/>
+ <result column="userId" property="userId"/>
+ <result column="redPacketActivityId" property="redPacketActivityId"/>
+ </resultMap>
+
+
+
+ <select id="queryRedEnvelopes" resultType="map">
+ select
+ da.time,
+ sum(da.receivePeople) as receivePeople,
+ sum(da.receive) as receive,
+ sum(da.receiveMoney) as receiveMoney,
+ sum(da.usePeople) as usePeople,
+ sum(da.`use`) as `use`,
+ sum(da.useMoney) as useMoney
+ from (
+ select
+ aa.time,
+ count(aa.userId) as receivePeople,
+ sum(aa.receive) as receive,
+ sum(aa.receiveMoney) as receiveMoney,
+ 0 as usePeople,
+ 0 as `use`,
+ 0 as useMoney
+ from (
+ select
+ DATE_FORMAT(a.insertTime, '%Y-%m-%d') as time,
+ a.userId,
+ count(a.id) as receive,
+ sum(a.money) as receiveMoney
+ from t_user_red_packet_record a
+ left join t_user_activity_redenvelope b on (a.redPacketActivityId = b.id)
+ left join t_user_activity c on (b.userActivityId = c.id)
+ where 1 = 1
+ <if test="null != name and '' != name">
+ and c.`name` like CONCAT('%', #{name}, '%')
+ </if>
+ <if test="null != start and '' != start and null != end and '' != end">
+ and DATE_FORMAT(a.insertTime, '%Y-%m-%d') between #{start} and #{end}
+ </if>
+ <if test="null != companyId">
+ and c.companyId = #{companyId}
+ </if>
+ GROUP BY DATE_FORMAT(a.insertTime, '%Y-%m-%d'), a.userId
+ ) as aa GROUP BY aa.time
+
+ union all
+
+ select
+ aa.time,
+ 0,
+ 0,
+ 0,
+ count(aa.userId) as usePeople,
+ sum(aa.`use`) as `use`,
+ sum(aa.useMoney) as useMoney
+ from (
+ select
+ DATE_FORMAT(a.insertTime, '%Y-%m-%d') as time,
+ a.userId,
+ count(a.id) as `use`,
+ sum(a.money) as useMoney
+ from t_user_red_packet_record a
+ left join t_user_activity_redenvelope b on (a.redPacketActivityId = b.id)
+ left join t_user_activity c on (b.userActivityId = c.id)
+ where a.state= 2
+ <if test="null != name and '' != name">
+ and c.`name` like CONCAT('%', #{name}, '%')
+ </if>
+ <if test="null != start and '' != start and null != end and '' != end">
+ and DATE_FORMAT(a.insertTime, '%Y-%m-%d') between #{start} and #{end}
+ </if>
+ <if test="null != companyId">
+ and c.companyId = #{companyId}
+ </if>
+ GROUP BY DATE_FORMAT(a.insertTime, '%Y-%m-%d'), a.userId
+ ) as aa GROUP BY aa.time
+ ) as da GROUP BY da.time order by da.time desc
+ <if test="null != offset and null != limit">
+ limit #{offset}, #{limit}
+ </if>
+ </select>
+
+
+
+ <select id="queryRedEnvelopesCount" resultType="int">
+ select count(time) from (
+ select
+ count(da.time) as time
+ from (
+ select
+ aa.time,
+ sum(aa.userId) as receivePeople,
+ sum(aa.receive) as receive,
+ sum(aa.receiveMoney) as receiveMoney,
+ 0 as usePeople,
+ 0 as `use`,
+ 0 as useMoney
+ from (
+ select
+ DATE_FORMAT(a.insertTime, '%Y-%m-%d') as time,
+ a.userId,
+ count(a.id) as receive,
+ sum(a.money) as receiveMoney
+ from t_user_red_packet_record a
+ left join t_user_activity_redenvelope b on (a.redPacketActivityId = b.id)
+ left join t_user_activity c on (b.userActivityId = c.id)
+ where 1 = 1
+ <if test="null != name and '' != name">
+ and c.`name` like CONCAT('%', #{name}, '%')
+ </if>
+ <if test="null != start and '' != start and null != end and '' != end">
+ and DATE_FORMAT(a.insertTime, '%Y-%m-%d') between #{start} and #{end}
+ </if>
+ <if test="null != companyId">
+ and c.companyId = #{companyId}
+ </if>
+ GROUP BY DATE_FORMAT(a.insertTime, '%Y-%m-%d'), a.userId
+ ) as aa GROUP BY aa.time
+
+ union all
+
+ select
+ aa.time,
+ 0,
+ 0,
+ 0,
+ count(aa.userId) as usePeople,
+ sum(aa.`use`) as `use`,
+ sum(aa.useMoney) as useMoney
+ from (
+ select
+ DATE_FORMAT(a.insertTime, '%Y-%m-%d') as time,
+ a.userId,
+ count(a.id) as `use`,
+ sum(a.money) as useMoney
+ from t_user_red_packet_record a
+ left join t_user_activity_redenvelope b on (a.redPacketActivityId = b.id)
+ left join t_user_activity c on (b.userActivityId = c.id)
+ where a.state= 2
+ <if test="null != name and '' != name">
+ and c.`name` like CONCAT('%', #{name}, '%')
+ </if>
+ <if test="null != start and '' != start and null != end and '' != end">
+ and DATE_FORMAT(a.insertTime, '%Y-%m-%d') between #{start} and #{end}
+ </if>
+ <if test="null != companyId">
+ and c.companyId = #{companyId}
+ </if>
+ GROUP BY DATE_FORMAT(a.insertTime, '%Y-%m-%d'), a.userId
+ ) as aa GROUP BY aa.time
+ ) as da GROUP BY da.time
+ ) as w
+ </select>
+
+
+ <select id="queryRedEnvelopesInfo" resultType="map">
+ select
+ DATE_FORMAT(a.insertTime, '%Y-%m-%d %H:%i:%s') as time,
+ a.userId as userId,
+ d.nickName as `name`,
+ d.phone as phone,
+ a.money as money,
+ DATE_FORMAT(a.expirationTime, '%Y-%m-%d %H:%i:%s') as expirationTime,
+ if(a.state = 1, '未使用', if(a.state = 2, '已使用', '已过期')) as state,
+ DATE_FORMAT(a.endTime, '%Y-%m-%d %H:%i:%s') as endTime
+ from t_user_red_packet_record a
+ left join t_user_activity_redenvelope b on (a.redPacketActivityId = b.id)
+ left join t_user_activity c on (b.userActivityId = c.id)
+ left join t_user d on (a.userId = d.id)
+ <if test="null != name and '' != name">
+ and c.`name` like CONCAT('%', #{name}, '%')
+ </if>
+ <if test="null != start and '' != start and null != end and '' != end">
+ and DATE_FORMAT(a.insertTime, '%Y-%m-%d') between #{start} and #{end}
+ </if>
+ <if test="null != companyId">
+ and c.companyId = #{companyId}
+ </if>
+ order by a.insertTime desc
+ <if test="null != offset and null != limit">
+ limit #{offset}, #{limit}
+ </if>
+ </select>
+
+ <select id="queryRedEnvelopesInfoCount" resultType="int">
+ select
+ count(a.id)
+ from t_user_red_packet_record a
+ left join t_user_activity_redenvelope b on (a.redPacketActivityId = b.id)
+ left join t_user_activity c on (b.userActivityId = c.id)
+ left join t_user d on (a.userId = d.id)
+ <if test="null != name and '' != name">
+ and c.`name` like CONCAT('%', #{name}, '%')
+ </if>
+ <if test="null != start and '' != start and null != end and '' != end">
+ and DATE_FORMAT(a.insertTime, '%Y-%m-%d') between #{start} and #{end}
+ </if>
+ <if test="null != companyId">
+ and c.companyId = #{companyId}
+ </if>
+ </select>
+</mapper>
\ No newline at end of file
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/factory/UserFactory.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/factory/UserFactory.java
new file mode 100644
index 0000000..508b65d
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/factory/UserFactory.java
@@ -0,0 +1,54 @@
+package com.stylefeng.guns.modular.system.factory;
+
+import com.stylefeng.guns.core.util.ToolUtil;
+import com.stylefeng.guns.modular.system.model.User;
+import com.stylefeng.guns.modular.system.transfer.UserDto;
+import org.springframework.beans.BeanUtils;
+
+/**
+ * 用户创建工厂
+ *
+ * @author fengshuonan
+ * @date 2017-05-05 22:43
+ */
+public class UserFactory {
+
+ public static User createUser(UserDto userDto) {
+ if (userDto == null) {
+ return null;
+ } else {
+ User user = new User();
+ BeanUtils.copyProperties(userDto, user);
+ return user;
+ }
+ }
+
+ public static User editUser(UserDto newUser, User oldUser) {
+ if (newUser == null || oldUser == null) {
+ return oldUser;
+ } else {
+ if (ToolUtil.isNotEmpty(newUser.getAvatar())) {
+ oldUser.setAvatar(newUser.getAvatar());
+ }
+ if (ToolUtil.isNotEmpty(newUser.getName())) {
+ oldUser.setName(newUser.getName());
+ }
+ if (ToolUtil.isNotEmpty(newUser.getBirthday())) {
+ oldUser.setBirthday(newUser.getBirthday());
+ }
+ if (ToolUtil.isNotEmpty(newUser.getDeptid())) {
+ oldUser.setDeptid(newUser.getDeptid());
+ }
+ if (ToolUtil.isNotEmpty(newUser.getSex())) {
+ oldUser.setSex(newUser.getSex());
+ }
+ if (ToolUtil.isNotEmpty(newUser.getEmail())) {
+ oldUser.setEmail(newUser.getEmail());
+ }
+ if (ToolUtil.isNotEmpty(newUser.getPhone())) {
+ oldUser.setPhone(newUser.getPhone());
+ }
+ return oldUser;
+ }
+ }
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/CarInsurance.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/CarInsurance.java
new file mode 100644
index 0000000..86c27a9
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/CarInsurance.java
@@ -0,0 +1,134 @@
+package com.stylefeng.guns.modular.system.model;
+
+import com.baomidou.mybatisplus.annotations.TableField;
+import com.baomidou.mybatisplus.annotations.TableId;
+import com.baomidou.mybatisplus.annotations.TableName;
+import com.baomidou.mybatisplus.enums.IdType;
+
+import java.util.Date;
+
+/**
+ * 车辆保险
+ */
+@TableName("t_car_insurance")
+public class CarInsurance {
+ /**
+ * 主键
+ */
+ @TableId(value = "id", type = IdType.AUTO)
+ @TableField("id")
+ private Integer id;
+ /**
+ * 车辆id
+ */
+ @TableField("carId")
+ private Integer carId;
+ /**
+ * 保险公司名称
+ */
+ @TableField("insurCom")
+ private String insurCom;
+ /**
+ * 保险号
+ */
+ @TableField("insurNum")
+ private String insurNum;
+ /**
+ * 保险类型
+ */
+ @TableField("insurType")
+ private String insurType;
+ /**
+ * 保险金额
+ */
+ @TableField("insurCount")
+ private Double insurCount;
+ /**
+ * 保险生效日期
+ */
+ @TableField("insurEff")
+ private Date insurEff;
+ /**
+ * 保险到期日期
+ */
+ @TableField("insurExp")
+ private Date insurExp;
+
+ public Integer getId() {
+ return id;
+ }
+
+ public void setId(Integer id) {
+ this.id = id;
+ }
+
+ public Integer getCarId() {
+ return carId;
+ }
+
+ public void setCarId(Integer carId) {
+ this.carId = carId;
+ }
+
+ public String getInsurCom() {
+ return insurCom;
+ }
+
+ public void setInsurCom(String insurCom) {
+ this.insurCom = insurCom;
+ }
+
+ public String getInsurNum() {
+ return insurNum;
+ }
+
+ public void setInsurNum(String insurNum) {
+ this.insurNum = insurNum;
+ }
+
+ public String getInsurType() {
+ return insurType;
+ }
+
+ public void setInsurType(String insurType) {
+ this.insurType = insurType;
+ }
+
+ public Double getInsurCount() {
+ return insurCount;
+ }
+
+ public void setInsurCount(Double insurCount) {
+ this.insurCount = insurCount;
+ }
+
+ public Date getInsurEff() {
+ return insurEff;
+ }
+
+ public void setInsurEff(Date insurEff) {
+ this.insurEff = insurEff;
+ }
+
+ public Date getInsurExp() {
+ return insurExp;
+ }
+
+ public void setInsurExp(Date insurExp) {
+ this.insurExp = insurExp;
+ }
+
+ @Override
+ public String toString() {
+ return "CarInsurance{" +
+ "id=" + id +
+ ", carId=" + carId +
+ ", insurCom='" + insurCom + '\'' +
+ ", insurNum='" + insurNum + '\'' +
+ ", insurType='" + insurType + '\'' +
+ ", insurCount=" + insurCount +
+ ", insurEff=" + insurEff +
+ ", insurExp=" + insurExp +
+ '}';
+ }
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/Dept.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/Dept.java
new file mode 100644
index 0000000..0790865
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/Dept.java
@@ -0,0 +1,140 @@
+package com.stylefeng.guns.modular.system.model;
+
+import com.baomidou.mybatisplus.activerecord.Model;
+import com.baomidou.mybatisplus.annotations.TableId;
+import com.baomidou.mybatisplus.annotations.TableName;
+import com.baomidou.mybatisplus.enums.IdType;
+
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 部门表
+ * </p>
+ *
+ * @author stylefeng
+ * @since 2017-07-11
+ */
+@TableName("sys_dept")
+public class Dept extends Model<Dept> {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 主键id
+ */
+ @TableId(value="id", type= IdType.AUTO)
+ private Integer id;
+ /**
+ * 排序
+ */
+ private Integer num;
+ /**
+ * 父部门id
+ */
+ private Integer pid;
+ /**
+ * 父级ids
+ */
+ private String pids;
+ /**
+ * 简称
+ */
+ private String simplename;
+ /**
+ * 全称
+ */
+ private String fullname;
+ /**
+ * 提示
+ */
+ private String tips;
+ /**
+ * 版本（乐观锁保留字段）
+ */
+ private Integer version;
+
+
+ public Integer getId() {
+ return id;
+ }
+
+ public void setId(Integer id) {
+ this.id = id;
+ }
+
+ public Integer getNum() {
+ return num;
+ }
+
+ public void setNum(Integer num) {
+ this.num = num;
+ }
+
+ public Integer getPid() {
+ return pid;
+ }
+
+ public void setPid(Integer pid) {
+ this.pid = pid;
+ }
+
+ public String getPids() {
+ return pids;
+ }
+
+ public void setPids(String pids) {
+ this.pids = pids;
+ }
+
+ public String getSimplename() {
+ return simplename;
+ }
+
+ public void setSimplename(String simplename) {
+ this.simplename = simplename;
+ }
+
+ public String getFullname() {
+ return fullname;
+ }
+
+ public void setFullname(String fullname) {
+ this.fullname = fullname;
+ }
+
+ public String getTips() {
+ return tips;
+ }
+
+ public void setTips(String tips) {
+ this.tips = tips;
+ }
+
+ public Integer getVersion() {
+ return version;
+ }
+
+ public void setVersion(Integer version) {
+ this.version = version;
+ }
+
+ @Override
+ protected Serializable pkVal() {
+ return this.id;
+ }
+
+ @Override
+ public String toString() {
+ return "Dept{" +
+ "id=" + id +
+ ", num=" + num +
+ ", pid=" + pid +
+ ", pids=" + pids +
+ ", simplename=" + simplename +
+ ", fullname=" + fullname +
+ ", tips=" + tips +
+ ", version=" + version +
+ "}";
+ }
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/Dict.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/Dict.java
new file mode 100644
index 0000000..b021b4b
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/Dict.java
@@ -0,0 +1,116 @@
+package com.stylefeng.guns.modular.system.model;
+
+import com.baomidou.mybatisplus.activerecord.Model;
+import com.baomidou.mybatisplus.annotations.TableId;
+import com.baomidou.mybatisplus.annotations.TableName;
+import com.baomidou.mybatisplus.enums.IdType;
+
+
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 字典表
+ * </p>
+ *
+ * @author stylefeng
+ * @since 2017-07-11
+ */
+@TableName("sys_dict")
+public class Dict extends Model<Dict> {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 主键id
+ */
+ @TableId(value="id", type= IdType.AUTO)
+ private Integer id;
+ /**
+ * 排序
+ */
+ private Integer num;
+ /**
+ * 父级字典
+ */
+ private Integer pid;
+ /**
+ * 名称
+ */
+ private String name;
+
+ /**
+ * 编码
+ */
+ private String code;
+ /**
+ * 提示
+ */
+ private String tips;
+
+
+ public Integer getId() {
+ return id;
+ }
+
+ public void setId(Integer id) {
+ this.id = id;
+ }
+
+ public Integer getNum() {
+ return num;
+ }
+
+ public void setNum(Integer num) {
+ this.num = num;
+ }
+
+ public Integer getPid() {
+ return pid;
+ }
+
+ public void setPid(Integer pid) {
+ this.pid = pid;
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ public String getTips() {
+ return tips;
+ }
+
+ public void setTips(String tips) {
+ this.tips = tips;
+ }
+
+ @Override
+ protected Serializable pkVal() {
+ return this.id;
+ }
+
+ public String getCode() {
+ return code;
+ }
+
+ public void setCode(String code) {
+ this.code = code;
+ }
+
+ @Override
+ public String toString() {
+ return "Dict{" +
+ "id=" + id +
+ ", num=" + num +
+ ", pid=" + pid +
+ ", name='" + name + '\'' +
+ ", code='" + code + '\'' +
+ ", tips='" + tips + '\'' +
+ '}';
+ }
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/DriverActivity.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/DriverActivity.java
new file mode 100644
index 0000000..d959fa8
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/DriverActivity.java
@@ -0,0 +1,146 @@
+package com.stylefeng.guns.modular.system.model;
+
+import com.baomidou.mybatisplus.enums.IdType;
+import java.util.Date;
+import com.baomidou.mybatisplus.annotations.TableId;
+import com.baomidou.mybatisplus.activerecord.Model;
+import com.baomidou.mybatisplus.annotations.TableName;
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 司机活动主表
+ * </p>
+ *
+ * @author stylefeng
+ * @since 2020-06-17
+ */
+@TableName("t_driver_activity")
+public class DriverActivity extends Model<DriverActivity> {
+
+ private static final long serialVersionUID = 1L;
+
+ @TableId(value = "id", type = IdType.AUTO)
+ private Integer id;
+ /**
+ * 活动名称
+ */
+ private String name;
+ /**
+ * 公司id
+ */
+ private Integer companyId;
+ /**
+ * 添加时间
+ */
+ private Date insertTime;
+ /**
+ * 状态(1=待审核，2=驳回，3=通过)
+ */
+ private Integer status;
+ /**
+ * 备注
+ */
+ private String remark;
+ /**
+ * 有效期开始时间
+ */
+ private Date startTime;
+ /**
+ * 有效期结束时间
+ */
+ private Date endTime;
+
+ private Integer companyType;
+
+ public Integer getCompanyType() {
+ return companyType;
+ }
+
+ public void setCompanyType(Integer companyType) {
+ this.companyType = companyType;
+ }
+
+ public Integer getId() {
+ return id;
+ }
+
+ public void setId(Integer id) {
+ this.id = id;
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ public Integer getCompanyId() {
+ return companyId;
+ }
+
+ public void setCompanyId(Integer companyId) {
+ this.companyId = companyId;
+ }
+
+ public Date getInsertTime() {
+ return insertTime;
+ }
+
+ public void setInsertTime(Date insertTime) {
+ this.insertTime = insertTime;
+ }
+
+ public Integer getStatus() {
+ return status;
+ }
+
+ public void setStatus(Integer status) {
+ this.status = status;
+ }
+
+ public String getRemark() {
+ return remark;
+ }
+
+ public void setRemark(String remark) {
+ this.remark = remark;
+ }
+
+ public Date getStartTime() {
+ return startTime;
+ }
+
+ public void setStartTime(Date startTime) {
+ this.startTime = startTime;
+ }
+
+ public Date getEndTime() {
+ return endTime;
+ }
+
+ public void setEndTime(Date endTime) {
+ this.endTime = endTime;
+ }
+
+ @Override
+ protected Serializable pkVal() {
+ return this.id;
+ }
+
+ @Override
+ public String toString() {
+ return "DriverActivity{" +
+ "id=" + id +
+ ", name=" + name +
+ ", companyId=" + companyId +
+ ", insertTime=" + insertTime +
+ ", status=" + status +
+ ", remark=" + remark +
+ ", startTime=" + startTime +
+ ", endTime=" + endTime +
+ "}";
+ }
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/DriverActivityHistory.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/DriverActivityHistory.java
new file mode 100644
index 0000000..374d76f
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/DriverActivityHistory.java
@@ -0,0 +1,151 @@
+package com.stylefeng.guns.modular.system.model;
+
+import com.baomidou.mybatisplus.annotations.TableField;
+import com.baomidou.mybatisplus.enums.IdType;
+import java.util.Date;
+import com.baomidou.mybatisplus.annotations.TableId;
+import com.baomidou.mybatisplus.activerecord.Model;
+import com.baomidou.mybatisplus.annotations.TableName;
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 司机完成活动记录
+ * </p>
+ *
+ * @author stylefeng
+ * @since 2020-06-17
+ */
+@TableName("t_driver_activity_history")
+public class DriverActivityHistory extends Model<DriverActivityHistory> {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 主键
+ */
+ @TableId(value = "id", type = IdType.AUTO)
+ private Integer id;
+ /**
+ * 活动日期
+ */
+ private Date day;
+ /**
+ * 司机id
+ */
+ private Integer driverId;
+ /**
+ * 活动类型（1=邀请司机注册，2=邀请用户注册，3=累计在线，4=订单量）
+ */
+ private Integer type;
+ /**
+ * 活动id
+ */
+ private Integer activityId;
+ /**
+ * 是否完成（1=未完成，2=已完成）
+ */
+ private Integer carryOut;
+ /**
+ * 奖励金额
+ */
+ private Double money;
+ //领取时间
+ private Date collectionTime;
+ /**
+ * 添加时间
+ */
+ private Date insertTime;
+
+
+ public Integer getId() {
+ return id;
+ }
+
+ public void setId(Integer id) {
+ this.id = id;
+ }
+
+ public Date getDay() {
+ return day;
+ }
+
+ public void setDay(Date day) {
+ this.day = day;
+ }
+
+ public Integer getDriverId() {
+ return driverId;
+ }
+
+ public void setDriverId(Integer driverId) {
+ this.driverId = driverId;
+ }
+
+ public Integer getType() {
+ return type;
+ }
+
+ public void setType(Integer type) {
+ this.type = type;
+ }
+
+ public Integer getActivityId() {
+ return activityId;
+ }
+
+ public void setActivityId(Integer activityId) {
+ this.activityId = activityId;
+ }
+
+ public Integer getCarryOut() {
+ return carryOut;
+ }
+
+ public void setCarryOut(Integer carryOut) {
+ this.carryOut = carryOut;
+ }
+
+ public Double getMoney() {
+ return money;
+ }
+
+ public void setMoney(Double money) {
+ this.money = money;
+ }
+
+ public Date getCollectionTime() {
+ return collectionTime;
+ }
+
+ public void setCollectionTime(Date collectionTime) {
+ this.collectionTime = collectionTime;
+ }
+
+ public Date getInsertTime() {
+ return insertTime;
+ }
+
+ public void setInsertTime(Date insertTime) {
+ this.insertTime = insertTime;
+ }
+
+ @Override
+ protected Serializable pkVal() {
+ return this.id;
+ }
+
+ @Override
+ public String toString() {
+ return "DriverActivityHistory{" +
+ "id=" + id +
+ ", day=" + day +
+ ", driverId=" + driverId +
+ ", type=" + type +
+ ", activityId=" + activityId +
+ ", carryOut=" + carryOut +
+ ", money=" + money +
+ ", insertTime=" + insertTime +
+ "}";
+ }
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/DriverActivityOnline.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/DriverActivityOnline.java
new file mode 100644
index 0000000..cbcadac
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/DriverActivityOnline.java
@@ -0,0 +1,150 @@
+package com.stylefeng.guns.modular.system.model;
+
+import com.baomidou.mybatisplus.enums.IdType;
+import java.util.Date;
+import com.baomidou.mybatisplus.annotations.TableId;
+import com.baomidou.mybatisplus.activerecord.Model;
+import com.baomidou.mybatisplus.annotations.TableName;
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 司机活动-在线
+ * </p>
+ *
+ * @author stylefeng
+ * @since 2020-06-17
+ */
+@TableName("t_driver_activity_online")
+public class DriverActivityOnline extends Model<DriverActivityOnline> {
+
+ private static final long serialVersionUID = 1L;
+
+ @TableId(value = "id", type = IdType.AUTO)
+ private Integer id;
+ /**
+ * 公司id
+ */
+ private Integer companyId;
+ /**
+ * 司机活动id
+ */
+ private Integer driverActivityId;
+ /**
+ * 1=专车，2=出租车，3=城际
+ */
+ private Integer type;
+ /**
+ * 在线小时
+ */
+ private Integer online;
+ /**
+ * 奖励金额
+ */
+ private Double money;
+ /**
+ * 有效期开始时间
+ */
+ private Date startTime;
+ /**
+ * 有效期结束时间
+ */
+ private Date endTime;
+ /**
+ * 添加时间
+ */
+ private Date insertTime;
+
+
+ public Integer getId() {
+ return id;
+ }
+
+ public void setId(Integer id) {
+ this.id = id;
+ }
+
+ public Integer getCompanyId() {
+ return companyId;
+ }
+
+ public void setCompanyId(Integer companyId) {
+ this.companyId = companyId;
+ }
+
+ public Integer getDriverActivityId() {
+ return driverActivityId;
+ }
+
+ public void setDriverActivityId(Integer driverActivityId) {
+ this.driverActivityId = driverActivityId;
+ }
+
+ public Integer getType() {
+ return type;
+ }
+
+ public void setType(Integer type) {
+ this.type = type;
+ }
+
+ public Integer getOnline() {
+ return online;
+ }
+
+ public void setOnline(Integer online) {
+ this.online = online;
+ }
+
+ public Double getMoney() {
+ return money;
+ }
+
+ public void setMoney(Double money) {
+ this.money = money;
+ }
+
+ public Date getStartTime() {
+ return startTime;
+ }
+
+ public void setStartTime(Date startTime) {
+ this.startTime = startTime;
+ }
+
+ public Date getEndTime() {
+ return endTime;
+ }
+
+ public void setEndTime(Date endTime) {
+ this.endTime = endTime;
+ }
+
+ public Date getInsertTime() {
+ return insertTime;
+ }
+
+ public void setInsertTime(Date insertTime) {
+ this.insertTime = insertTime;
+ }
+
+ @Override
+ protected Serializable pkVal() {
+ return this.id;
+ }
+
+ @Override
+ public String toString() {
+ return "DriverActivityOnline{" +
+ "id=" + id +
+ ", companyId=" + companyId +
+ ", driverActivityId=" + driverActivityId +
+ ", type=" + type +
+ ", online=" + online +
+ ", money=" + money +
+ ", startTime=" + startTime +
+ ", endTime=" + endTime +
+ ", insertTime=" + insertTime +
+ "}";
+ }
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/DriverActivityOrder.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/DriverActivityOrder.java
new file mode 100644
index 0000000..e7125d0
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/DriverActivityOrder.java
@@ -0,0 +1,163 @@
+package com.stylefeng.guns.modular.system.model;
+
+import com.baomidou.mybatisplus.enums.IdType;
+import java.util.Date;
+import com.baomidou.mybatisplus.annotations.TableId;
+import com.baomidou.mybatisplus.activerecord.Model;
+import com.baomidou.mybatisplus.annotations.TableName;
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 司机活动-订单
+ * </p>
+ *
+ * @author stylefeng
+ * @since 2020-06-17
+ */
+@TableName("t_driver_activity_order")
+public class DriverActivityOrder extends Model<DriverActivityOrder> {
+
+ private static final long serialVersionUID = 1L;
+
+ @TableId(value = "id", type = IdType.AUTO)
+ private Integer id;
+ /**
+ * 公司id
+ */
+ private Integer companyId;
+ /**
+ * 司机活动id
+ */
+ private Integer driverActivityId;
+ /**
+ * 每天开始时间（08:00）
+ */
+ private String start;
+ /**
+ * 每天结束时间（17:00）
+ */
+ private String end;
+ /**
+ * 订单数量
+ */
+ private Integer orderNum;
+ /**
+ * 奖励金额
+ */
+ private Double money;
+ /**
+ * 有效期开始时间
+ */
+ private Date startTime;
+ /**
+ * 有效期结束时间
+ */
+ private Date endTime;
+ /**
+ * 添加时间
+ */
+ private Date insertTime;
+
+
+ public Integer getId() {
+ return id;
+ }
+
+ public void setId(Integer id) {
+ this.id = id;
+ }
+
+ public Integer getCompanyId() {
+ return companyId;
+ }
+
+ public void setCompanyId(Integer companyId) {
+ this.companyId = companyId;
+ }
+
+ public Integer getDriverActivityId() {
+ return driverActivityId;
+ }
+
+ public void setDriverActivityId(Integer driverActivityId) {
+ this.driverActivityId = driverActivityId;
+ }
+
+ public String getStart() {
+ return start;
+ }
+
+ public void setStart(String start) {
+ this.start = start;
+ }
+
+ public String getEnd() {
+ return end;
+ }
+
+ public void setEnd(String end) {
+ this.end = end;
+ }
+
+ public Integer getOrderNum() {
+ return orderNum;
+ }
+
+ public void setOrderNum(Integer orderNum) {
+ this.orderNum = orderNum;
+ }
+
+ public Double getMoney() {
+ return money;
+ }
+
+ public void setMoney(Double money) {
+ this.money = money;
+ }
+
+ public Date getStartTime() {
+ return startTime;
+ }
+
+ public void setStartTime(Date startTime) {
+ this.startTime = startTime;
+ }
+
+ public Date getEndTime() {
+ return endTime;
+ }
+
+ public void setEndTime(Date endTime) {
+ this.endTime = endTime;
+ }
+
+ public Date getInsertTime() {
+ return insertTime;
+ }
+
+ public void setInsertTime(Date insertTime) {
+ this.insertTime = insertTime;
+ }
+
+ @Override
+ protected Serializable pkVal() {
+ return this.id;
+ }
+
+ @Override
+ public String toString() {
+ return "DriverActivityOrder{" +
+ "id=" + id +
+ ", companyId=" + companyId +
+ ", driverActivityId=" + driverActivityId +
+ ", start=" + start +
+ ", end=" + end +
+ ", orderNum=" + orderNum +
+ ", money=" + money +
+ ", startTime=" + startTime +
+ ", endTime=" + endTime +
+ ", insertTime=" + insertTime +
+ "}";
+ }
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/DriverActivityRegistered.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/DriverActivityRegistered.java
new file mode 100644
index 0000000..e3d8fbb
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/DriverActivityRegistered.java
@@ -0,0 +1,137 @@
+package com.stylefeng.guns.modular.system.model;
+
+import com.baomidou.mybatisplus.enums.IdType;
+import java.util.Date;
+import com.baomidou.mybatisplus.annotations.TableId;
+import com.baomidou.mybatisplus.activerecord.Model;
+import com.baomidou.mybatisplus.annotations.TableName;
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 司机活动-注册
+ * </p>
+ *
+ * @author stylefeng
+ * @since 2020-06-17
+ */
+@TableName("t_driver_activity_registered")
+public class DriverActivityRegistered extends Model<DriverActivityRegistered> {
+
+ private static final long serialVersionUID = 1L;
+
+ @TableId(value = "id", type = IdType.AUTO)
+ private Integer id;
+ /**
+ * 公司id
+ */
+ private Integer companyId;
+ /**
+ * 司机活动主表id
+ */
+ private Integer driverActivityId;
+ /**
+ * 1=邀请司机注册奖励，2=邀请用户注册奖励
+ */
+ private Integer type;
+ /**
+ * 奖励金额
+ */
+ private Double money;
+ /**
+ * 有效期开始时间
+ */
+ private Date startTime;
+ /**
+ * 有效期结束时间
+ */
+ private Date endTime;
+ /**
+ * 添加时间
+ */
+ private Date insertTime;
+
+
+ public Integer getId() {
+ return id;
+ }
+
+ public void setId(Integer id) {
+ this.id = id;
+ }
+
+ public Integer getCompanyId() {
+ return companyId;
+ }
+
+ public void setCompanyId(Integer companyId) {
+ this.companyId = companyId;
+ }
+
+ public Integer getDriverActivityId() {
+ return driverActivityId;
+ }
+
+ public void setDriverActivityId(Integer driverActivityId) {
+ this.driverActivityId = driverActivityId;
+ }
+
+ public Integer getType() {
+ return type;
+ }
+
+ public void setType(Integer type) {
+ this.type = type;
+ }
+
+ public Double getMoney() {
+ return money;
+ }
+
+ public void setMoney(Double money) {
+ this.money = money;
+ }
+
+ public Date getStartTime() {
+ return startTime;
+ }
+
+ public void setStartTime(Date startTime) {
+ this.startTime = startTime;
+ }
+
+ public Date getEndTime() {
+ return endTime;
+ }
+
+ public void setEndTime(Date endTime) {
+ this.endTime = endTime;
+ }
+
+ public Date getInsertTime() {
+ return insertTime;
+ }
+
+ public void setInsertTime(Date insertTime) {
+ this.insertTime = insertTime;
+ }
+
+ @Override
+ protected Serializable pkVal() {
+ return this.id;
+ }
+
+ @Override
+ public String toString() {
+ return "DriverActivityRegistered{" +
+ "id=" + id +
+ ", companyId=" + companyId +
+ ", driverActivityId=" + driverActivityId +
+ ", type=" + type +
+ ", money=" + money +
+ ", startTime=" + startTime +
+ ", endTime=" + endTime +
+ ", insertTime=" + insertTime +
+ "}";
+ }
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/DriverOnline.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/DriverOnline.java
new file mode 100644
index 0000000..14e363e
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/DriverOnline.java
@@ -0,0 +1,104 @@
+package com.stylefeng.guns.modular.system.model;
+
+import com.baomidou.mybatisplus.annotations.TableField;
+import com.baomidou.mybatisplus.annotations.TableId;
+import com.baomidou.mybatisplus.annotations.TableName;
+import com.baomidou.mybatisplus.enums.IdType;
+
+import java.util.Date;
+
+/**
+ * 司机在线记录
+ */
+@TableName("t_driver_online")
+public class DriverOnline {
+ /**
+ * 主键
+ */
+ @TableId(value = "id", type = IdType.AUTO)
+ @TableField("id")
+ private Integer id;
+ /**
+ * 司机id
+ */
+ @TableField("driverId")
+ private Integer driverId;
+ /**
+ * 设备（1=APP,2=车载端）
+ */
+ @TableField("device")
+ private Integer device;
+ /**
+ * 版本号
+ */
+ @TableField("version")
+ private String version;
+ /**
+ * 添加时间
+ */
+ @TableField("insertTime")
+ private Date insertTime;
+ /**
+ * 最后在线时间
+ */
+ @TableField("lastTime")
+ private Date lastTime;
+
+ public Integer getId() {
+ return id;
+ }
+
+ public void setId(Integer id) {
+ this.id = id;
+ }
+
+ public Integer getDriverId() {
+ return driverId;
+ }
+
+ public void setDriverId(Integer driverId) {
+ this.driverId = driverId;
+ }
+
+ public Integer getDevice() {
+ return device;
+ }
+
+ public void setDevice(Integer device) {
+ this.device = device;
+ }
+
+ public String getVersion() {
+ return version;
+ }
+
+ public void setVersion(String version) {
+ this.version = version;
+ }
+
+ public Date getInsertTime() {
+ return insertTime;
+ }
+
+ public void setInsertTime(Date insertTime) {
+ this.insertTime = insertTime;
+ }
+
+ public Date getLastTime() {
+ return lastTime;
+ }
+
+ public void setLastTime(Date lastTime) {
+ this.lastTime = lastTime;
+ }
+
+ @Override
+ public String toString() {
+ return "DriverOnline{" +
+ "id=" + id +
+ ", driverId=" + driverId +
+ ", device=" + device +
+ ", insertTime=" + insertTime +
+ '}';
+ }
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/DriverPunish.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/DriverPunish.java
new file mode 100644
index 0000000..284f29e
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/DriverPunish.java
@@ -0,0 +1,92 @@
+package com.stylefeng.guns.modular.system.model;
+
+import com.baomidou.mybatisplus.annotations.TableField;
+import com.baomidou.mybatisplus.annotations.TableId;
+import com.baomidou.mybatisplus.annotations.TableName;
+import com.baomidou.mybatisplus.enums.IdType;
+
+import java.util.Date;
+
+/**
+ * 司机处罚
+ */
+@TableName("t_driver_punish")
+public class DriverPunish {
+ /**
+ * 主键
+ */
+ @TableId(value = "id", type = IdType.AUTO)
+ @TableField("id")
+ private Integer id;
+ /**
+ * 司机id
+ */
+ @TableField("driverId")
+ private Integer driverId;
+ /**
+ * 处罚时间
+ */
+ @TableField("punishTime")
+ private Date punishTime;
+ /**
+ * 处罚原因
+ */
+ @TableField("punishReason")
+ private String punishReason;
+ /**
+ * 处罚结果
+ */
+ @TableField("punishReault")
+ private String punishReault;
+
+ public Integer getId() {
+ return id;
+ }
+
+ public void setId(Integer id) {
+ this.id = id;
+ }
+
+ public Integer getDriverId() {
+ return driverId;
+ }
+
+ public void setDriverId(Integer driverId) {
+ this.driverId = driverId;
+ }
+
+ public Date getPunishTime() {
+ return punishTime;
+ }
+
+ public void setPunishTime(Date punishTime) {
+ this.punishTime = punishTime;
+ }
+
+ public String getPunishReason() {
+ return punishReason;
+ }
+
+ public void setPunishReason(String punishReason) {
+ this.punishReason = punishReason;
+ }
+
+ public String getPunishReault() {
+ return punishReault;
+ }
+
+ public void setPunishReault(String punishReault) {
+ this.punishReault = punishReault;
+ }
+
+ @Override
+ public String toString() {
+ return "DriverPunish{" +
+ "id=" + id +
+ ", driverId=" + driverId +
+ ", punishTime=" + punishTime +
+ ", punishReason='" + punishReason + '\'' +
+ ", punishReault='" + punishReault + '\'' +
+ '}';
+ }
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/DriverTrain.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/DriverTrain.java
new file mode 100644
index 0000000..cf4e865
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/DriverTrain.java
@@ -0,0 +1,120 @@
+package com.stylefeng.guns.modular.system.model;
+
+import com.baomidou.mybatisplus.annotations.TableField;
+import com.baomidou.mybatisplus.annotations.TableId;
+import com.baomidou.mybatisplus.annotations.TableName;
+import com.baomidou.mybatisplus.enums.IdType;
+
+import java.util.Date;
+
+/**
+ * 司机培训
+ */
+@TableName("t_driver_train")
+public class DriverTrain {
+ /**
+ * 主键
+ */
+ @TableId(value = "id", type = IdType.AUTO)
+ @TableField("id")
+ private Integer id;
+ /**
+ * 司机id
+ */
+ @TableField("driverId")
+ private Integer driverId;
+ /**
+ * 课程名称
+ */
+ @TableField("courseName")
+ private String courseName;
+ /**
+ * 培训时间
+ */
+ @TableField("courseDate")
+ private Date courseDate;
+ /**
+ * 开始时间
+ */
+ @TableField("startTime")
+ private String startTime;
+ /**
+ * 结束时间
+ */
+ @TableField("stopTime")
+ private String stopTime;
+ /**
+ * 培训时长
+ */
+ @TableField("duration")
+ private Integer duration;
+
+ public Integer getId() {
+ return id;
+ }
+
+ public void setId(Integer id) {
+ this.id = id;
+ }
+
+ public Integer getDriverId() {
+ return driverId;
+ }
+
+ public void setDriverId(Integer driverId) {
+ this.driverId = driverId;
+ }
+
+ public String getCourseName() {
+ return courseName;
+ }
+
+ public void setCourseName(String courseName) {
+ this.courseName = courseName;
+ }
+
+ public Date getCourseDate() {
+ return courseDate;
+ }
+
+ public void setCourseDate(Date courseDate) {
+ this.courseDate = courseDate;
+ }
+
+ public String getStartTime() {
+ return startTime;
+ }
+
+ public void setStartTime(String startTime) {
+ this.startTime = startTime;
+ }
+
+ public String getStopTime() {
+ return stopTime;
+ }
+
+ public void setStopTime(String stopTime) {
+ this.stopTime = stopTime;
+ }
+
+ public Integer getDuration() {
+ return duration;
+ }
+
+ public void setDuration(Integer duration) {
+ this.duration = duration;
+ }
+
+ @Override
+ public String toString() {
+ return "DriverTrain{" +
+ "id=" + id +
+ ", driverId=" + driverId +
+ ", courseName='" + courseName + '\'' +
+ ", courseDate=" + courseDate +
+ ", startTime='" + startTime + '\'' +
+ ", stopTime='" + stopTime + '\'' +
+ ", duration=" + duration +
+ '}';
+ }
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/GDInterface.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/GDInterface.java
new file mode 100644
index 0000000..80dffbc
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/GDInterface.java
@@ -0,0 +1,91 @@
+package com.stylefeng.guns.modular.system.model;
+
+
+import com.baomidou.mybatisplus.annotations.TableField;
+import com.baomidou.mybatisplus.annotations.TableId;
+import com.baomidou.mybatisplus.annotations.TableName;
+import com.baomidou.mybatisplus.enums.IdType;
+
+/**
+ * 高德接口统计
+ */
+@TableName("t_gdinterface")
+public class GDInterface {
+ /**
+ * 主键
+ */
+ @TableId(value = "id", type = IdType.AUTO)
+ @TableField("id")
+ private Integer id;
+ /**
+ * 接口名称
+ */
+ @TableField("name")
+ private String name;
+ /**
+ * 接口说明
+ */
+ @TableField("explanation")
+ private String explanation;
+ /**
+ * 调用次数
+ */
+ @TableField("num")
+ private Integer num;
+ /**
+ * 调用日期
+ */
+ @TableField("time")
+ private String time;
+
+ public Integer getId() {
+ return id;
+ }
+
+ public void setId(Integer id) {
+ this.id = id;
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ public String getExplanation() {
+ return explanation;
+ }
+
+ public void setExplanation(String explanation) {
+ this.explanation = explanation;
+ }
+
+ public Integer getNum() {
+ return num;
+ }
+
+ public void setNum(Integer num) {
+ this.num = num;
+ }
+
+ public String getTime() {
+ return time;
+ }
+
+ public void setTime(String time) {
+ this.time = time;
+ }
+
+ @Override
+ public String toString() {
+ return "GDInterface{" +
+ "id=" + id +
+ ", name='" + name + '\'' +
+ ", explanation='" + explanation + '\'' +
+ ", num=" + num +
+ ", time=" + time +
+ '}';
+ }
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/Income.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/Income.java
new file mode 100644
index 0000000..cae5522
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/Income.java
@@ -0,0 +1,134 @@
+package com.stylefeng.guns.modular.system.model;
+
+import com.baomidou.mybatisplus.annotations.TableField;
+import com.baomidou.mybatisplus.annotations.TableId;
+import com.baomidou.mybatisplus.annotations.TableName;
+import com.baomidou.mybatisplus.enums.IdType;
+
+import java.util.Date;
+
+/**
+ * 收入明细
+ */
+@TableName("t_income")
+public class Income {
+ /**
+ * 主键
+ */
+ @TableId(value = "id", type = IdType.AUTO)
+ @TableField("id")
+ private Integer id;
+ /**
+ * 收入方类型（1=公司，2=司机）
+ */
+ @TableField("userType")
+ private Integer userType;
+ /**
+ * 收入对象id
+ */
+ @TableField("objectId")
+ private Integer objectId;
+ /**
+ * 收入类型（1=活动，2=业务）
+ */
+ @TableField("type")
+ private Integer type;
+ /**
+ * 收入类型id
+ */
+ @TableField("incomeId")
+ private Integer incomeId;
+ /**
+ * 订单类型
+ */
+ @TableField("orderType")
+ private Integer orderType;
+ /**
+ * 收入金额
+ */
+ @TableField("money")
+ private Double money;
+ /**
+ * 添加时间
+ */
+ @TableField("insertTime")
+ private Date insertTime;
+
+ public Integer getId() {
+ return id;
+ }
+
+ public void setId(Integer id) {
+ this.id = id;
+ }
+
+ public Integer getUserType() {
+ return userType;
+ }
+
+ public void setUserType(Integer userType) {
+ this.userType = userType;
+ }
+
+ public Integer getObjectId() {
+ return objectId;
+ }
+
+ public void setObjectId(Integer objectId) {
+ this.objectId = objectId;
+ }
+
+ public Integer getType() {
+ return type;
+ }
+
+ public void setType(Integer type) {
+ this.type = type;
+ }
+
+ public Integer getIncomeId() {
+ return incomeId;
+ }
+
+ public void setIncomeId(Integer incomeId) {
+ this.incomeId = incomeId;
+ }
+
+ public Double getMoney() {
+ return money;
+ }
+
+ public void setMoney(Double money) {
+ this.money = money;
+ }
+
+ public Date getInsertTime() {
+ return insertTime;
+ }
+
+ public void setInsertTime(Date insertTime) {
+ this.insertTime = insertTime;
+ }
+
+ public Integer getOrderType() {
+ return orderType;
+ }
+
+ public void setOrderType(Integer orderType) {
+ this.orderType = orderType;
+ }
+
+ @Override
+ public String toString() {
+ return "Income{" +
+ "id=" + id +
+ ", userType=" + userType +
+ ", objectId=" + objectId +
+ ", type=" + type +
+ ", incomeId=" + incomeId +
+ ", orderType=" + orderType +
+ ", money=" + money +
+ ", insertTime=" + insertTime +
+ '}';
+ }
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/LineShiftDriver.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/LineShiftDriver.java
new file mode 100644
index 0000000..1d89b94
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/LineShiftDriver.java
@@ -0,0 +1,134 @@
+package com.stylefeng.guns.modular.system.model;
+
+import com.baomidou.mybatisplus.annotations.TableField;
+import com.baomidou.mybatisplus.annotations.TableId;
+import com.baomidou.mybatisplus.annotations.TableName;
+import com.baomidou.mybatisplus.enums.IdType;
+
+import java.util.Date;
+
+/**
+ * 司机预约排班记录
+ */
+@TableName("t_line_shift_driver")
+public class LineShiftDriver {
+ /**
+ * 主键
+ */
+ @TableId(value = "id", type = IdType.AUTO)
+ @TableField("id")
+ private Integer id;
+ /**
+ * 线路班次id
+ */
+ @TableField("lineShiftId")
+ private Integer lineShiftId;
+ /**
+ * 司机id
+ */
+ @TableField("driverId")
+ private Integer driverId;
+ /**
+ * 预约日期
+ */
+ @TableField("day")
+ private Date day;
+ /**
+ * 剩余座位数
+ */
+ @TableField("laveSeat")
+ private Integer laveSeat;
+ /**
+ * 剩余座位号(多个以逗号分隔)
+ */
+ @TableField("laveSeatNumber")
+ private String laveSeatNumber;
+ /**
+ * 总座位数
+ */
+ @TableField("totalSeat")
+ private Integer totalSeat;
+ /**
+ * 添加时间
+ */
+ @TableField("inserTime")
+ private Date inserTime;
+
+ public Integer getId() {
+ return id;
+ }
+
+ public void setId(Integer id) {
+ this.id = id;
+ }
+
+ public Integer getLineShiftId() {
+ return lineShiftId;
+ }
+
+ public void setLineShiftId(Integer lineShiftId) {
+ this.lineShiftId = lineShiftId;
+ }
+
+ public Integer getDriverId() {
+ return driverId;
+ }
+
+ public void setDriverId(Integer driverId) {
+ this.driverId = driverId;
+ }
+
+ public Date getDay() {
+ return day;
+ }
+
+ public void setDay(Date day) {
+ this.day = day;
+ }
+
+ public Integer getLaveSeat() {
+ return laveSeat;
+ }
+
+ public void setLaveSeat(Integer laveSeat) {
+ this.laveSeat = laveSeat;
+ }
+
+ public String getLaveSeatNumber() {
+ return laveSeatNumber;
+ }
+
+ public void setLaveSeatNumber(String laveSeatNumber) {
+ this.laveSeatNumber = laveSeatNumber;
+ }
+
+ public Integer getTotalSeat() {
+ return totalSeat;
+ }
+
+ public void setTotalSeat(Integer totalSeat) {
+ this.totalSeat = totalSeat;
+ }
+
+ public Date getInserTime() {
+ return inserTime;
+ }
+
+ public void setInserTime(Date inserTime) {
+ this.inserTime = inserTime;
+ }
+
+ @Override
+ public String toString() {
+ return "LineShiftDriver{" +
+ "id=" + id +
+ ", lineShiftId=" + lineShiftId +
+ ", driverId=" + driverId +
+ ", day=" + day +
+ ", laveSeat=" + laveSeat +
+ ", laveSeatNumber='" + laveSeatNumber + '\'' +
+ ", totalSeat=" + totalSeat +
+ ", inserTime=" + inserTime +
+ '}';
+ }
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/LoginLog.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/LoginLog.java
new file mode 100644
index 0000000..10135f8
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/LoginLog.java
@@ -0,0 +1,128 @@
+package com.stylefeng.guns.modular.system.model;
+
+import com.baomidou.mybatisplus.activerecord.Model;
+import com.baomidou.mybatisplus.annotations.TableId;
+import com.baomidou.mybatisplus.annotations.TableName;
+import com.baomidou.mybatisplus.enums.IdType;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 登录记录
+ * </p>
+ *
+ * @author stylefeng
+ * @since 2017-07-11
+ */
+@TableName("sys_login_log")
+public class LoginLog extends Model<LoginLog> {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 主键
+ */
+ @TableId(value="id", type= IdType.AUTO)
+ private Integer id;
+ /**
+ * 日志名称
+ */
+ private String logname;
+ /**
+ * 管理员id
+ */
+ private Integer userid;
+ /**
+ * 创建时间
+ */
+ private Date createtime;
+ /**
+ * 是否执行成功
+ */
+ private String succeed;
+ /**
+ * 具体消息
+ */
+ private String message;
+ /**
+ * 登录ip
+ */
+ private String ip;
+
+
+ public Integer getId() {
+ return id;
+ }
+
+ public void setId(Integer id) {
+ this.id = id;
+ }
+
+ public String getLogname() {
+ return logname;
+ }
+
+ public void setLogname(String logname) {
+ this.logname = logname;
+ }
+
+ public Integer getUserid() {
+ return userid;
+ }
+
+ public void setUserid(Integer userid) {
+ this.userid = userid;
+ }
+
+ public Date getCreatetime() {
+ return createtime;
+ }
+
+ public void setCreatetime(Date createtime) {
+ this.createtime = createtime;
+ }
+
+ public String getSucceed() {
+ return succeed;
+ }
+
+ public void setSucceed(String succeed) {
+ this.succeed = succeed;
+ }
+
+ public String getMessage() {
+ return message;
+ }
+
+ public void setMessage(String message) {
+ this.message = message;
+ }
+
+ public String getIp() {
+ return ip;
+ }
+
+ public void setIp(String ip) {
+ this.ip = ip;
+ }
+
+ @Override
+ protected Serializable pkVal() {
+ return this.id;
+ }
+
+ @Override
+ public String toString() {
+ return "LoginLog{" +
+ "id=" + id +
+ ", logname=" + logname +
+ ", userid=" + userid +
+ ", createtime=" + createtime +
+ ", succeed=" + succeed +
+ ", message=" + message +
+ ", ip=" + ip +
+ "}";
+ }
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/Menu.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/Menu.java
new file mode 100644
index 0000000..6df6215
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/Menu.java
@@ -0,0 +1,208 @@
+package com.stylefeng.guns.modular.system.model;
+
+import com.baomidou.mybatisplus.activerecord.Model;
+import com.baomidou.mybatisplus.annotations.TableId;
+import com.baomidou.mybatisplus.annotations.TableName;
+import com.baomidou.mybatisplus.enums.IdType;
+import org.hibernate.validator.constraints.NotBlank;
+
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 菜单表
+ * </p>
+ *
+ * @author stylefeng
+ * @since 2017-07-11
+ */
+@TableName("sys_menu")
+public class Menu extends Model<Menu> {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 主键id
+ */
+ @TableId(value = "id", type = IdType.AUTO)
+ private Long id;
+ /**
+ * 菜单编号
+ */
+ private String code;
+ /**
+ * 菜单父编号
+ */
+ private String pcode;
+ /**
+ * 当前菜单的所有父菜单编号
+ */
+ private String pcodes;
+ /**
+ * 菜单名称
+ */
+ @NotBlank
+ private String name;
+ /**
+ * 菜单图标
+ */
+ private String icon;
+ /**
+ * url地址
+ */
+ @NotBlank
+ private String url;
+ /**
+ * 菜单排序号
+ */
+ private Integer num;
+ /**
+ * 菜单层级
+ */
+ private Integer levels;
+ /**
+ * 是否是菜单（1：是 0：不是）
+ */
+ private Integer ismenu;
+ /**
+ * 备注
+ */
+ private String tips;
+ /**
+ * 菜单状态 : 1:启用 0:不启用
+ */
+ private Integer status;
+ /**
+ * 是否打开: 1:打开 0:不打开
+ */
+ private Integer isopen;
+
+
+ public Long getId() {
+ return id;
+ }
+
+ public void setId(Long id) {
+ this.id = id;
+ }
+
+ public String getCode() {
+ return code;
+ }
+
+ public void setCode(String code) {
+ this.code = code;
+ }
+
+ public String getPcode() {
+ return pcode;
+ }
+
+ public void setPcode(String pcode) {
+ this.pcode = pcode;
+ }
+
+ public String getPcodes() {
+ return pcodes;
+ }
+
+ public void setPcodes(String pcodes) {
+ this.pcodes = pcodes;
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ public String getIcon() {
+ return icon;
+ }
+
+ public void setIcon(String icon) {
+ this.icon = icon;
+ }
+
+ public String getUrl() {
+ return url;
+ }
+
+ public void setUrl(String url) {
+ this.url = url;
+ }
+
+ public Integer getNum() {
+ return num;
+ }
+
+ public void setNum(Integer num) {
+ this.num = num;
+ }
+
+ public Integer getLevels() {
+ return levels;
+ }
+
+ public void setLevels(Integer levels) {
+ this.levels = levels;
+ }
+
+ public Integer getIsmenu() {
+ return ismenu;
+ }
+
+ public void setIsmenu(Integer ismenu) {
+ this.ismenu = ismenu;
+ }
+
+ public String getTips() {
+ return tips;
+ }
+
+ public void setTips(String tips) {
+ this.tips = tips;
+ }
+
+ public Integer getStatus() {
+ return status;
+ }
+
+ public void setStatus(Integer status) {
+ this.status = status;
+ }
+
+ public Integer getIsopen() {
+ return isopen;
+ }
+
+ public void setIsopen(Integer isopen) {
+ this.isopen = isopen;
+ }
+
+ @Override
+ protected Serializable pkVal() {
+ return this.id;
+ }
+
+ @Override
+ public String toString() {
+ return "Menu{" +
+ "id=" + id +
+ ", code=" + code +
+ ", pcode=" + pcode +
+ ", pcodes=" + pcodes +
+ ", name=" + name +
+ ", icon=" + icon +
+ ", url=" + url +
+ ", num=" + num +
+ ", levels=" + levels +
+ ", ismenu=" + ismenu +
+ ", tips=" + tips +
+ ", status=" + status +
+ ", isopen=" + isopen +
+ "}";
+ }
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/Notice.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/Notice.java
new file mode 100644
index 0000000..6967223
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/Notice.java
@@ -0,0 +1,115 @@
+package com.stylefeng.guns.modular.system.model;
+
+import com.baomidou.mybatisplus.activerecord.Model;
+import com.baomidou.mybatisplus.annotations.TableId;
+import com.baomidou.mybatisplus.annotations.TableName;
+import com.baomidou.mybatisplus.enums.IdType;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 通知表
+ * </p>
+ *
+ * @author stylefeng
+ * @since 2017-07-11
+ */
+@TableName("sys_notice")
+public class Notice extends Model<Notice> {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 主键
+ */
+ @TableId(value="id", type= IdType.AUTO)
+ private Integer id;
+ /**
+ * 标题
+ */
+ private String title;
+ /**
+ * 类型
+ */
+ private Integer type;
+ /**
+ * 内容
+ */
+ private String content;
+ /**
+ * 创建时间
+ */
+ private Date createtime;
+ /**
+ * 创建人
+ */
+ private Integer creater;
+
+
+ public Integer getId() {
+ return id;
+ }
+
+ public void setId(Integer id) {
+ this.id = id;
+ }
+
+ public String getTitle() {
+ return title;
+ }
+
+ public void setTitle(String title) {
+ this.title = title;
+ }
+
+ public Integer getType() {
+ return type;
+ }
+
+ public void setType(Integer type) {
+ this.type = type;
+ }
+
+ public String getContent() {
+ return content;
+ }
+
+ public void setContent(String content) {
+ this.content = content;
+ }
+
+ public Date getCreatetime() {
+ return createtime;
+ }
+
+ public void setCreatetime(Date createtime) {
+ this.createtime = createtime;
+ }
+
+ public Integer getCreater() {
+ return creater;
+ }
+
+ public void setCreater(Integer creater) {
+ this.creater = creater;
+ }
+
+ @Override
+ protected Serializable pkVal() {
+ return this.id;
+ }
+
+ @Override
+ public String toString() {
+ return "Notice{" +
+ "id=" + id +
+ ", title=" + title +
+ ", type=" + type +
+ ", content=" + content +
+ ", createtime=" + createtime +
+ ", creater=" + creater +
+ "}";
+ }
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/OperationLog.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/OperationLog.java
new file mode 100644
index 0000000..7851475
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/OperationLog.java
@@ -0,0 +1,154 @@
+package com.stylefeng.guns.modular.system.model;
+
+import com.baomidou.mybatisplus.activerecord.Model;
+import com.baomidou.mybatisplus.annotations.TableId;
+import com.baomidou.mybatisplus.annotations.TableName;
+import com.baomidou.mybatisplus.enums.IdType;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 操作日志
+ * </p>
+ *
+ * @author stylefeng
+ * @since 2017-07-11
+ */
+@TableName("sys_operation_log")
+public class OperationLog extends Model<OperationLog> {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 主键
+ */
+ @TableId(value="id", type= IdType.AUTO)
+ private Integer id;
+ /**
+ * 日志类型
+ */
+ private String logtype;
+ /**
+ * 日志名称
+ */
+ private String logname;
+ /**
+ * 用户id
+ */
+ private Integer userid;
+ /**
+ * 类名称
+ */
+ private String classname;
+ /**
+ * 方法名称
+ */
+ private String method;
+ /**
+ * 创建时间
+ */
+ private Date createtime;
+ /**
+ * 是否成功
+ */
+ private String succeed;
+ /**
+ * 备注
+ */
+ private String message;
+
+
+ public Integer getId() {
+ return id;
+ }
+
+ public void setId(Integer id) {
+ this.id = id;
+ }
+
+ public String getLogtype() {
+ return logtype;
+ }
+
+ public void setLogtype(String logtype) {
+ this.logtype = logtype;
+ }
+
+ public String getLogname() {
+ return logname;
+ }
+
+ public void setLogname(String logname) {
+ this.logname = logname;
+ }
+
+ public Integer getUserid() {
+ return userid;
+ }
+
+ public void setUserid(Integer userid) {
+ this.userid = userid;
+ }
+
+ public String getClassname() {
+ return classname;
+ }
+
+ public void setClassname(String classname) {
+ this.classname = classname;
+ }
+
+ public String getMethod() {
+ return method;
+ }
+
+ public void setMethod(String method) {
+ this.method = method;
+ }
+
+ public Date getCreatetime() {
+ return createtime;
+ }
+
+ public void setCreatetime(Date createtime) {
+ this.createtime = createtime;
+ }
+
+ public String getSucceed() {
+ return succeed;
+ }
+
+ public void setSucceed(String succeed) {
+ this.succeed = succeed;
+ }
+
+ public String getMessage() {
+ return message;
+ }
+
+ public void setMessage(String message) {
+ this.message = message;
+ }
+
+ @Override
+ protected Serializable pkVal() {
+ return this.id;
+ }
+
+ @Override
+ public String toString() {
+ return "OperationLog{" +
+ "id=" + id +
+ ", logtype=" + logtype +
+ ", logname=" + logname +
+ ", userid=" + userid +
+ ", classname=" + classname +
+ ", method=" + method +
+ ", createtime=" + createtime +
+ ", succeed=" + succeed +
+ ", message=" + message +
+ "}";
+ }
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/OrderCancel.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/OrderCancel.java
new file mode 100644
index 0000000..e47d4e5
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/OrderCancel.java
@@ -0,0 +1,178 @@
+package com.stylefeng.guns.modular.system.model;
+
+import com.baomidou.mybatisplus.annotations.TableField;
+import com.baomidou.mybatisplus.annotations.TableId;
+import com.baomidou.mybatisplus.annotations.TableName;
+import com.baomidou.mybatisplus.enums.IdType;
+
+import java.util.Date;
+
+/**
+ * 取消订单
+ */
+@TableName("t_order_cancel")
+public class OrderCancel {
+ /**
+ * 主键
+ */
+ @TableId(value = "id", type = IdType.AUTO)
+ @TableField("id")
+ private Integer id;
+ /**
+ * 订单id
+ */
+ @TableField("orderId")
+ private Integer orderId;
+ /**
+ * 订单类型（1=专车，2=出租车，3=城际，4=小件物流-同城，5=小件物流-跨城，6=包车）
+ */
+ @TableField("orderType")
+ private Integer orderType;
+ /**
+ * 取消原因
+ */
+ @TableField("reason")
+ private String reason;
+ /**
+ * 备注
+ */
+ @TableField("remark")
+ private String remark;
+ /**
+ * 支付方式(1=微信，2=支付宝，3=余额)
+ */
+ @TableField("payType")
+ private Integer payType;
+ /**
+ * 支付金额
+ */
+ @TableField("money")
+ private Double money;
+ /**
+ * 状态(1=临时，2=正式)
+ */
+ @TableField("state")
+ private Integer state;
+ /**
+ * 添加时间
+ * @return
+ */
+ @TableField("insertTime")
+ private Date insertTime;
+ /**
+ * 取消人员类型（1=用户，2=后台）
+ * @return
+ */
+ @TableField("userType")
+ private Integer userType;
+ /**
+ * 操作人员id
+ * @return
+ */
+ @TableField("userId")
+ private Integer userId;
+
+ public Integer getId() {
+ return id;
+ }
+
+ public void setId(Integer id) {
+ this.id = id;
+ }
+
+ public Integer getOrderId() {
+ return orderId;
+ }
+
+ public void setOrderId(Integer orderId) {
+ this.orderId = orderId;
+ }
+
+ public Integer getOrderType() {
+ return orderType;
+ }
+
+ public void setOrderType(Integer orderType) {
+ this.orderType = orderType;
+ }
+
+ public String getReason() {
+ return reason;
+ }
+
+ public void setReason(String reason) {
+ this.reason = reason;
+ }
+
+ public String getRemark() {
+ return remark;
+ }
+
+ public void setRemark(String remark) {
+ this.remark = remark;
+ }
+
+ public Integer getPayType() {
+ return payType;
+ }
+
+ public void setPayType(Integer payType) {
+ this.payType = payType;
+ }
+
+ public Double getMoney() {
+ return money;
+ }
+
+ public void setMoney(Double money) {
+ this.money = money;
+ }
+
+ public Integer getState() {
+ return state;
+ }
+
+ public void setState(Integer state) {
+ this.state = state;
+ }
+
+ public Date getInsertTime() {
+ return insertTime;
+ }
+
+ public void setInsertTime(Date insertTime) {
+ this.insertTime = insertTime;
+ }
+
+ public Integer getUserType() {
+ return userType;
+ }
+
+ public void setUserType(Integer userType) {
+ this.userType = userType;
+ }
+
+ public Integer getUserId() {
+ return userId;
+ }
+
+ public void setUserId(Integer userId) {
+ this.userId = userId;
+ }
+
+ @Override
+ public String toString() {
+ return "OrderCancel{" +
+ "id=" + id +
+ ", orderId=" + orderId +
+ ", orderType=" + orderType +
+ ", reason='" + reason + '\'' +
+ ", remark='" + remark + '\'' +
+ ", payType=" + payType +
+ ", money=" + money +
+ ", state=" + state +
+ ", insertTime=" + insertTime +
+ ", userType=" + userType +
+ '}';
+ }
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/PaymentRecord.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/PaymentRecord.java
new file mode 100644
index 0000000..e2bab92
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/PaymentRecord.java
@@ -0,0 +1,176 @@
+package com.stylefeng.guns.modular.system.model;
+
+import com.baomidou.mybatisplus.annotations.TableField;
+import com.baomidou.mybatisplus.annotations.TableId;
+import com.baomidou.mybatisplus.annotations.TableName;
+import com.baomidou.mybatisplus.enums.IdType;
+
+import java.util.Date;
+
+/**
+ * 第三方支付记录
+ */
+@TableName("t_payment_record")
+public class PaymentRecord {
+ /**
+ * 主键
+ */
+ @TableId(value = "id", type = IdType.AUTO)
+ @TableField("id")
+ private Integer id;
+ /**
+ * 支付类别（1=订单相关支付，2=其他支付）
+ */
+ @TableField("category")
+ private Integer category;
+ /**
+ * 用户id
+ */
+ @TableField("userId")
+ private Integer userId;
+ /**
+ * 用户类型（1=用户，2=司机）
+ */
+ @TableField("type")
+ private Integer type;
+ /**
+ * 订单id
+ */
+ @TableField("orderId")
+ private Integer orderId;
+ /**
+ * 订单类型
+ */
+ @TableField("orderType")
+ private Integer orderType;
+ /**
+ * 支付方式（1=微信，2=支付宝）
+ */
+ @TableField("payType")
+ private Integer payType;
+ /**
+ * 支付金额
+ */
+ @TableField("amount")
+ private Double amount;
+ /**
+ * 第三方支付订单号
+ */
+ @TableField("code")
+ private String code;
+ /**
+ * 支付状态（1=未支付，2=已支付）
+ */
+ @TableField("state")
+ private Integer state;
+ /**
+ * 添加时间
+ */
+ @TableField("insertTime")
+ private Date insertTime;
+
+ public Integer getId() {
+ return id;
+ }
+
+ public void setId(Integer id) {
+ this.id = id;
+ }
+
+ public Integer getCategory() {
+ return category;
+ }
+
+ public void setCategory(Integer category) {
+ this.category = category;
+ }
+
+ public Integer getUserId() {
+ return userId;
+ }
+
+ public void setUserId(Integer userId) {
+ this.userId = userId;
+ }
+
+ public Integer getType() {
+ return type;
+ }
+
+ public void setType(Integer type) {
+ this.type = type;
+ }
+
+ public Integer getOrderId() {
+ return orderId;
+ }
+
+ public void setOrderId(Integer orderId) {
+ this.orderId = orderId;
+ }
+
+ public Integer getOrderType() {
+ return orderType;
+ }
+
+ public void setOrderType(Integer orderType) {
+ this.orderType = orderType;
+ }
+
+ public Integer getPayType() {
+ return payType;
+ }
+
+ public void setPayType(Integer payType) {
+ this.payType = payType;
+ }
+
+ public Double getAmount() {
+ return amount;
+ }
+
+ public void setAmount(Double amount) {
+ this.amount = amount;
+ }
+
+ public String getCode() {
+ return code;
+ }
+
+ public void setCode(String code) {
+ this.code = code;
+ }
+
+ public Integer getState() {
+ return state;
+ }
+
+ public void setState(Integer state) {
+ this.state = state;
+ }
+
+ public Date getInsertTime() {
+ return insertTime;
+ }
+
+ public void setInsertTime(Date insertTime) {
+ this.insertTime = insertTime;
+ }
+
+ @Override
+ public String toString() {
+ return "PaymentRecord{" +
+ "id=" + id +
+ ", category=" + category +
+ ", userId=" + userId +
+ ", type=" + type +
+ ", orderId=" + orderId +
+ ", orderType=" + orderType +
+ ", payType=" + payType +
+ ", amount=" + amount +
+ ", code='" + code + '\'' +
+ ", state=" + state +
+ ", insertTime=" + insertTime +
+ '}';
+ }
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/Region.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/Region.java
new file mode 100644
index 0000000..4680a6a
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/Region.java
@@ -0,0 +1,109 @@
+package com.stylefeng.guns.modular.system.model;
+
+import com.baomidou.mybatisplus.enums.IdType;
+import com.baomidou.mybatisplus.annotations.TableId;
+import com.baomidou.mybatisplus.annotations.TableField;
+import com.baomidou.mybatisplus.activerecord.Model;
+import com.baomidou.mybatisplus.annotations.TableName;
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 省市区三级联动
+ * </p>
+ *
+ * @author 吕雪
+ * @since 2019-12-30
+ */
+@TableName("region")
+public class Region extends Model<Region> {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 主键ID
+ */
+ @TableId(value = "id", type = IdType.AUTO)
+ private Integer id;
+ /**
+ * 城市名称
+ */
+ private String name;
+ private String code;
+ private String citycode;
+ /**
+ * 父级ID
+ */
+ @TableField("parent_id")
+ private Integer parentId;
+ /**
+ * 英文名称
+ */
+ private String english;
+
+
+ public Integer getId() {
+ return id;
+ }
+
+ public void setId(Integer id) {
+ this.id = id;
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ public String getCode() {
+ return code;
+ }
+
+ public void setCode(String code) {
+ this.code = code;
+ }
+
+ public String getCitycode() {
+ return citycode;
+ }
+
+ public void setCitycode(String citycode) {
+ this.citycode = citycode;
+ }
+
+ public Integer getParentId() {
+ return parentId;
+ }
+
+ public void setParentId(Integer parentId) {
+ this.parentId = parentId;
+ }
+
+ public String getEnglish() {
+ return english;
+ }
+
+ public void setEnglish(String english) {
+ this.english = english;
+ }
+
+ @Override
+ protected Serializable pkVal() {
+ return this.id;
+ }
+
+ @Override
+ public String toString() {
+ return "Region{" +
+ "id=" + id +
+ ", name=" + name +
+ ", code=" + code +
+ ", citycode=" + citycode +
+ ", parentId=" + parentId +
+ ", english=" + english +
+ "}";
+ }
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/Relation.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/Relation.java
new file mode 100644
index 0000000..48c2df6
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/Relation.java
@@ -0,0 +1,75 @@
+package com.stylefeng.guns.modular.system.model;
+
+import com.baomidou.mybatisplus.activerecord.Model;
+import com.baomidou.mybatisplus.annotations.TableId;
+import com.baomidou.mybatisplus.annotations.TableName;
+import com.baomidou.mybatisplus.enums.IdType;
+
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 角色和菜单关联表
+ * </p>
+ *
+ * @author stylefeng
+ * @since 2017-07-11
+ */
+@TableName("sys_relation")
+public class Relation extends Model<Relation> {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 主键
+ */
+ @TableId(value = "id", type = IdType.AUTO)
+ private Integer id;
+ /**
+ * 菜单id
+ */
+ private Long menuid;
+ /**
+ * 角色id
+ */
+ private Integer roleid;
+
+
+ public Integer getId() {
+ return id;
+ }
+
+ public void setId(Integer id) {
+ this.id = id;
+ }
+
+ public Long getMenuid() {
+ return menuid;
+ }
+
+ public void setMenuid(Long menuid) {
+ this.menuid = menuid;
+ }
+
+ public Integer getRoleid() {
+ return roleid;
+ }
+
+ public void setRoleid(Integer roleid) {
+ this.roleid = roleid;
+ }
+
+ @Override
+ protected Serializable pkVal() {
+ return this.id;
+ }
+
+ @Override
+ public String toString() {
+ return "Relation{" +
+ "id=" + id +
+ ", menuid=" + menuid +
+ ", roleid=" + roleid +
+ "}";
+ }
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/Role.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/Role.java
new file mode 100644
index 0000000..70ae563
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/Role.java
@@ -0,0 +1,127 @@
+package com.stylefeng.guns.modular.system.model;
+
+import com.baomidou.mybatisplus.activerecord.Model;
+import com.baomidou.mybatisplus.annotations.TableId;
+import com.baomidou.mybatisplus.annotations.TableName;
+import com.baomidou.mybatisplus.enums.IdType;
+
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 角色表
+ * </p>
+ *
+ * @author stylefeng
+ * @since 2017-07-11
+ */
+@TableName("sys_role")
+public class Role extends Model<Role> {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 主键id
+ */
+ @TableId(value="id", type= IdType.AUTO)
+ private Integer id;
+ /**
+ * 序号
+ */
+ private Integer num;
+ /**
+ * 父角色id
+ */
+ private Integer pid;
+ /**
+ * 角色名称
+ */
+ private String name;
+ /**
+ * 部门名称
+ */
+ private Integer deptid;
+ /**
+ * 提示
+ */
+ private String tips;
+ /**
+ * 保留字段(暂时没用）
+ */
+ private Integer version;
+
+
+ public Integer getId() {
+ return id;
+ }
+
+ public void setId(Integer id) {
+ this.id = id;
+ }
+
+ public Integer getNum() {
+ return num;
+ }
+
+ public void setNum(Integer num) {
+ this.num = num;
+ }
+
+ public Integer getPid() {
+ return pid;
+ }
+
+ public void setPid(Integer pid) {
+ this.pid = pid;
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ public Integer getDeptid() {
+ return deptid;
+ }
+
+ public void setDeptid(Integer deptid) {
+ this.deptid = deptid;
+ }
+
+ public String getTips() {
+ return tips;
+ }
+
+ public void setTips(String tips) {
+ this.tips = tips;
+ }
+
+ public Integer getVersion() {
+ return version;
+ }
+
+ public void setVersion(Integer version) {
+ this.version = version;
+ }
+
+ @Override
+ protected Serializable pkVal() {
+ return this.id;
+ }
+
+ @Override
+ public String toString() {
+ return "Role{" +
+ "id=" + id +
+ ", num=" + num +
+ ", pid=" + pid +
+ ", name=" + name +
+ ", deptid=" + deptid +
+ ", tips=" + tips +
+ ", version=" + version +
+ "}";
+ }
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/SysCouponActivity.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/SysCouponActivity.java
new file mode 100644
index 0000000..a9966f7
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/SysCouponActivity.java
@@ -0,0 +1,249 @@
+package com.stylefeng.guns.modular.system.model;
+
+import com.baomidou.mybatisplus.enums.IdType;
+import java.math.BigDecimal;
+import java.util.Date;
+import com.baomidou.mybatisplus.annotations.TableId;
+import com.baomidou.mybatisplus.activerecord.Model;
+import com.baomidou.mybatisplus.annotations.TableName;
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 系统设置-优惠券活动
+ * </p>
+ *
+ * @author stylefeng
+ * @since 2020-06-17
+ */
+@TableName("t_sys_coupon_activity")
+public class SysCouponActivity extends Model<SysCouponActivity> {
+
+ private static final long serialVersionUID = 1L;
+
+ @TableId(value = "id", type = IdType.AUTO)
+ private Integer id;
+ /**
+ * 金额
+ */
+ private BigDecimal money;
+ /**
+ * 满减金额
+ */
+ private BigDecimal fullMoney;
+ /**
+ * 添加时间
+ */
+ private Date insertTime;
+ /**
+ * 公司id
+ */
+ private Integer companyId;
+ /**
+ * 优惠券使用类型(0=通用，1=专车，2=出租车，3=城际，4=小件物流)
+ */
+ private Integer couponUseType;
+ /**
+ * 优惠券类型(1=抵扣，2=满减)
+ */
+ private Integer couponType;
+ /**
+ * 活动名称
+ */
+ private String name;
+ /**
+ * 有效天数
+ */
+ private Integer effective;
+ /**
+ * 1=平台 2=分公司 3=加盟商
+ */
+ private Integer companyType;
+ /**
+ * 状态(1=待审核，2=驳回，3=通过)
+ */
+ private Integer status;
+ /**
+ * 备注
+ */
+ private String remark;
+ /**
+ * 发送类型(1=全部用户，2=部分)
+ */
+ private Integer sendType;
+ /**
+ * 发送用户id
+ */
+ private String sendUserId;
+ /**
+ * 张数
+ */
+ private Integer number;
+ /**
+ * 领取人数
+ */
+ private Integer sendUserNum;
+
+ private Integer couponId;
+
+ public Integer getCouponId() {
+ return couponId;
+ }
+
+ public void setCouponId(Integer couponId) {
+ this.couponId = couponId;
+ }
+
+ public Integer getSendUserNum() {
+ return sendUserNum;
+ }
+
+ public void setSendUserNum(Integer sendUserNum) {
+ this.sendUserNum = sendUserNum;
+ }
+
+ public Integer getNumber() {
+ return number;
+ }
+
+ public void setNumber(Integer number) {
+ this.number = number;
+ }
+
+ public Integer getId() {
+ return id;
+ }
+
+ public void setId(Integer id) {
+ this.id = id;
+ }
+
+ public BigDecimal getMoney() {
+ return money;
+ }
+
+ public void setMoney(BigDecimal money) {
+ this.money = money;
+ }
+
+ public BigDecimal getFullMoney() {
+ return fullMoney;
+ }
+
+ public void setFullMoney(BigDecimal fullMoney) {
+ this.fullMoney = fullMoney;
+ }
+
+ public Date getInsertTime() {
+ return insertTime;
+ }
+
+ public void setInsertTime(Date insertTime) {
+ this.insertTime = insertTime;
+ }
+
+ public Integer getCompanyId() {
+ return companyId;
+ }
+
+ public void setCompanyId(Integer companyId) {
+ this.companyId = companyId;
+ }
+
+ public Integer getCouponUseType() {
+ return couponUseType;
+ }
+
+ public void setCouponUseType(Integer couponUseType) {
+ this.couponUseType = couponUseType;
+ }
+
+ public Integer getCouponType() {
+ return couponType;
+ }
+
+ public void setCouponType(Integer couponType) {
+ this.couponType = couponType;
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ public Integer getEffective() {
+ return effective;
+ }
+
+ public void setEffective(Integer effective) {
+ this.effective = effective;
+ }
+
+ public Integer getCompanyType() {
+ return companyType;
+ }
+
+ public void setCompanyType(Integer companyType) {
+ this.companyType = companyType;
+ }
+
+ public Integer getStatus() {
+ return status;
+ }
+
+ public void setStatus(Integer status) {
+ this.status = status;
+ }
+
+ public String getRemark() {
+ return remark;
+ }
+
+ public void setRemark(String remark) {
+ this.remark = remark;
+ }
+
+ public Integer getSendType() {
+ return sendType;
+ }
+
+ public void setSendType(Integer sendType) {
+ this.sendType = sendType;
+ }
+
+ public String getSendUserId() {
+ return sendUserId;
+ }
+
+ public void setSendUserId(String sendUserId) {
+ this.sendUserId = sendUserId;
+ }
+
+ @Override
+ protected Serializable pkVal() {
+ return this.id;
+ }
+
+ @Override
+ public String toString() {
+ return "SysCouponActivity{" +
+ "id=" + id +
+ ", money=" + money +
+ ", fullMoney=" + fullMoney +
+ ", insertTime=" + insertTime +
+ ", companyId=" + companyId +
+ ", couponUseType=" + couponUseType +
+ ", couponType=" + couponType +
+ ", name=" + name +
+ ", effective=" + effective +
+ ", companyType=" + companyType +
+ ", status=" + status +
+ ", remark=" + remark +
+ ", sendType=" + sendType +
+ ", sendUserId=" + sendUserId +
+ "}";
+ }
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/SysCouponRecord.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/SysCouponRecord.java
new file mode 100644
index 0000000..d88df58
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/SysCouponRecord.java
@@ -0,0 +1,162 @@
+package com.stylefeng.guns.modular.system.model;
+
+import com.baomidou.mybatisplus.enums.IdType;
+import java.math.BigDecimal;
+import java.util.Date;
+import com.baomidou.mybatisplus.annotations.TableId;
+import com.baomidou.mybatisplus.activerecord.Model;
+import com.baomidou.mybatisplus.annotations.TableName;
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 系统设置-优惠券记录
+ * </p>
+ *
+ * @author stylefeng
+ * @since 2020-06-15
+ */
+@TableName("t_sys_coupon_record")
+public class SysCouponRecord extends Model<SysCouponRecord> {
+
+ private static final long serialVersionUID = 1L;
+
+ @TableId(value = "id", type = IdType.AUTO)
+ private Integer id;
+ /**
+ * 金额
+ */
+ private BigDecimal money;
+ /**
+ * 满减金额
+ */
+ private BigDecimal fullMoney;
+ /**
+ * 添加时间
+ */
+ private Date insertTime;
+ /**
+ * 公司id
+ */
+ private Integer companyId;
+ /**
+ * 优惠券使用类型(0=通用，1=专车，2=出租车，3=城际，4=小件物流)
+ */
+ private Integer couponUseType;
+ /**
+ * 优惠券类型(1=抵扣，2=满减)
+ */
+ private Integer couponType;
+ /**
+ * 优惠券名称
+ */
+ private String name;
+ /**
+ * 有效天数
+ */
+ private Integer effective;
+ /**
+ * 1=平台 2=分公司 3=加盟商
+ */
+ private Integer companyType;
+
+ public Integer getCompanyType() {
+ return companyType;
+ }
+
+ public void setCompanyType(Integer companyType) {
+ this.companyType = companyType;
+ }
+
+ public Integer getId() {
+ return id;
+ }
+
+ public void setId(Integer id) {
+ this.id = id;
+ }
+
+ public BigDecimal getMoney() {
+ return money;
+ }
+
+ public void setMoney(BigDecimal money) {
+ this.money = money;
+ }
+
+ public BigDecimal getFullMoney() {
+ return fullMoney;
+ }
+
+ public void setFullMoney(BigDecimal fullMoney) {
+ this.fullMoney = fullMoney;
+ }
+
+ public Date getInsertTime() {
+ return insertTime;
+ }
+
+ public void setInsertTime(Date insertTime) {
+ this.insertTime = insertTime;
+ }
+
+ public Integer getCompanyId() {
+ return companyId;
+ }
+
+ public void setCompanyId(Integer companyId) {
+ this.companyId = companyId;
+ }
+
+ public Integer getCouponUseType() {
+ return couponUseType;
+ }
+
+ public void setCouponUseType(Integer couponUseType) {
+ this.couponUseType = couponUseType;
+ }
+
+ public Integer getCouponType() {
+ return couponType;
+ }
+
+ public void setCouponType(Integer couponType) {
+ this.couponType = couponType;
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ public Integer getEffective() {
+ return effective;
+ }
+
+ public void setEffective(Integer effective) {
+ this.effective = effective;
+ }
+
+ @Override
+ protected Serializable pkVal() {
+ return this.id;
+ }
+
+ @Override
+ public String toString() {
+ return "SysCouponRecord{" +
+ "id=" + id +
+ ", money=" + money +
+ ", fullMoney=" + fullMoney +
+ ", insertTime=" + insertTime +
+ ", companyId=" + companyId +
+ ", couponUseType=" + couponUseType +
+ ", couponType=" + couponType +
+ ", name=" + name +
+ ", effective=" + effective +
+ "}";
+ }
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/SysRedPacketRecord.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/SysRedPacketRecord.java
new file mode 100644
index 0000000..452a992
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/SysRedPacketRecord.java
@@ -0,0 +1,190 @@
+package com.stylefeng.guns.modular.system.model;
+
+import com.baomidou.mybatisplus.enums.IdType;
+import java.math.BigDecimal;
+import java.util.Date;
+import com.baomidou.mybatisplus.annotations.TableId;
+import com.baomidou.mybatisplus.activerecord.Model;
+import com.baomidou.mybatisplus.annotations.TableName;
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 系统设置-红包记录
+ * </p>
+ *
+ * @author stylefeng
+ * @since 2020-06-13
+ */
+@TableName("t_sys_red_packet_record")
+public class SysRedPacketRecord extends Model<SysRedPacketRecord> {
+
+ private static final long serialVersionUID = 1L;
+
+ @TableId(value = "id", type = IdType.AUTO)
+ private Integer id;
+ /**
+ * 金额
+ */
+ private BigDecimal money;
+ /**
+ * 添加时间
+ */
+ private Date insertTime;
+ /**
+ * 公司id
+ */
+ private Integer companyId;
+ /**
+ * 红包名称
+ */
+ private String name;
+ /**
+ * 类型(1=固定金额，2=随机金额)
+ */
+ private Integer type;
+ /**
+ * 总金额
+ */
+ private BigDecimal totalMoney;
+ /**
+ * 剩余金额
+ */
+ private Double laveMoney;
+ /**
+ * 开始金额
+ */
+ private BigDecimal startMoney;
+ /**
+ * 结束金额
+ */
+ private BigDecimal endMoney;
+ /**
+ * 有效天数
+ */
+ private Integer effective;
+ /**
+ * 1=平台 2=分公司 3=加盟商
+ */
+ private Integer companyType;
+
+
+ public Integer getId() {
+ return id;
+ }
+
+ public void setId(Integer id) {
+ this.id = id;
+ }
+
+ public BigDecimal getMoney() {
+ return money;
+ }
+
+ public void setMoney(BigDecimal money) {
+ this.money = money;
+ }
+
+ public Date getInsertTime() {
+ return insertTime;
+ }
+
+ public void setInsertTime(Date insertTime) {
+ this.insertTime = insertTime;
+ }
+
+ public Integer getCompanyId() {
+ return companyId;
+ }
+
+ public void setCompanyId(Integer companyId) {
+ this.companyId = companyId;
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ public Integer getType() {
+ return type;
+ }
+
+ public void setType(Integer type) {
+ this.type = type;
+ }
+
+ public BigDecimal getTotalMoney() {
+ return totalMoney;
+ }
+
+ public void setTotalMoney(BigDecimal totalMoney) {
+ this.totalMoney = totalMoney;
+ }
+
+ public Double getLaveMoney() {
+ return laveMoney;
+ }
+
+ public void setLaveMoney(Double laveMoney) {
+ this.laveMoney = laveMoney;
+ }
+
+ public BigDecimal getStartMoney() {
+ return startMoney;
+ }
+
+ public void setStartMoney(BigDecimal startMoney) {
+ this.startMoney = startMoney;
+ }
+
+ public BigDecimal getEndMoney() {
+ return endMoney;
+ }
+
+ public void setEndMoney(BigDecimal endMoney) {
+ this.endMoney = endMoney;
+ }
+
+ public Integer getEffective() {
+ return effective;
+ }
+
+ public void setEffective(Integer effective) {
+ this.effective = effective;
+ }
+
+ public Integer getCompanyType() {
+ return companyType;
+ }
+
+ public void setCompanyType(Integer companyType) {
+ this.companyType = companyType;
+ }
+
+ @Override
+ protected Serializable pkVal() {
+ return this.id;
+ }
+
+ @Override
+ public String toString() {
+ return "SysRedPacketRecord{" +
+ "id=" + id +
+ ", money=" + money +
+ ", insertTime=" + insertTime +
+ ", companyId=" + companyId +
+ ", name=" + name +
+ ", type=" + type +
+ ", totalMoney=" + totalMoney +
+ ", laveMoney=" + laveMoney +
+ ", startMoney=" + startMoney +
+ ", endMoney=" + endMoney +
+ ", effective=" + effective +
+ ", companyType=" + companyType +
+ "}";
+ }
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TAdvertisement.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TAdvertisement.java
new file mode 100644
index 0000000..d158a2e
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TAdvertisement.java
@@ -0,0 +1,216 @@
+package com.stylefeng.guns.modular.system.model;
+
+import com.baomidou.mybatisplus.enums.IdType;
+import java.util.Date;
+import com.baomidou.mybatisplus.annotations.TableId;
+import com.baomidou.mybatisplus.activerecord.Model;
+import com.baomidou.mybatisplus.annotations.TableName;
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 广告
+ * </p>
+ *
+ * @author 吕雪
+ * @since 2020-06-02
+ */
+@TableName("t_advertisement")
+public class TAdvertisement extends Model<TAdvertisement> {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 主键id
+ */
+ @TableId(value = "id", type = IdType.AUTO)
+ private Integer id;
+ /**
+ * 名称
+ */
+ private String name;
+ /**
+ * 图片路径
+ */
+ private String imgUrl;
+ /**
+ * 类型(1=弹窗，2=首页底部)
+ */
+ private Integer type;
+ /**
+ * 是否跳转(1=是，2=否)
+ */
+ private Integer isJump;
+ /**
+ * 跳转类型(1=外部，2=内部)
+ */
+ private Integer jumpType;
+ /**
+ * 跳转路径
+ */
+ private String jumpUrl;
+ /**
+ * 文本编辑器内容
+ */
+ private String content;
+ /**
+ * 1：创建，2：修改，3：删除
+ */
+ private Integer flag;
+ private Date insertTime;
+ private Integer insertUser;
+ private Date updateTime;
+ private Integer updateUser;
+ /**
+ * 状态 1=已上线 2=已下线
+ */
+ private Integer state;
+ /**
+ * 所属省Id
+ */
+ private Integer provinceId;
+
+ public Integer getProvinceId() {
+ return provinceId;
+ }
+
+ public void setProvinceId(Integer provinceId) {
+ this.provinceId = provinceId;
+ }
+
+ public Integer getState() {
+ return state;
+ }
+
+ public void setState(Integer state) {
+ this.state = state;
+ }
+
+ public Integer getId() {
+ return id;
+ }
+
+ public void setId(Integer id) {
+ this.id = id;
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ public String getImgUrl() {
+ return imgUrl;
+ }
+
+ public void setImgUrl(String imgUrl) {
+ this.imgUrl = imgUrl;
+ }
+
+ public Integer getType() {
+ return type;
+ }
+
+ public void setType(Integer type) {
+ this.type = type;
+ }
+
+ public Integer getIsJump() {
+ return isJump;
+ }
+
+ public void setIsJump(Integer isJump) {
+ this.isJump = isJump;
+ }
+
+ public Integer getJumpType() {
+ return jumpType;
+ }
+
+ public void setJumpType(Integer jumpType) {
+ this.jumpType = jumpType;
+ }
+
+ public String getJumpUrl() {
+ return jumpUrl;
+ }
+
+ public void setJumpUrl(String jumpUrl) {
+ this.jumpUrl = jumpUrl;
+ }
+
+ public String getContent() {
+ return content;
+ }
+
+ public void setContent(String content) {
+ this.content = content;
+ }
+
+ public Integer getFlag() {
+ return flag;
+ }
+
+ public void setFlag(Integer flag) {
+ this.flag = flag;
+ }
+
+ public Date getInsertTime() {
+ return insertTime;
+ }
+
+ public void setInsertTime(Date insertTime) {
+ this.insertTime = insertTime;
+ }
+
+ public Integer getInsertUser() {
+ return insertUser;
+ }
+
+ public void setInsertUser(Integer insertUser) {
+ this.insertUser = insertUser;
+ }
+
+ public Date getUpdateTime() {
+ return updateTime;
+ }
+
+ public void setUpdateTime(Date updateTime) {
+ this.updateTime = updateTime;
+ }
+
+ public Integer getUpdateUser() {
+ return updateUser;
+ }
+
+ public void setUpdateUser(Integer updateUser) {
+ this.updateUser = updateUser;
+ }
+
+ @Override
+ protected Serializable pkVal() {
+ return this.id;
+ }
+
+ @Override
+ public String toString() {
+ return "TAdvertisement{" +
+ "id=" + id +
+ ", name=" + name +
+ ", imgUrl=" + imgUrl +
+ ", type=" + type +
+ ", isJump=" + isJump +
+ ", jumpType=" + jumpType +
+ ", jumpUrl=" + jumpUrl +
+ ", content=" + content +
+ ", flag=" + flag +
+ ", insertTime=" + insertTime +
+ ", insertUser=" + insertUser +
+ ", updateTime=" + updateTime +
+ ", updateUser=" + updateUser +
+ "}";
+ }
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TAgreement.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TAgreement.java
new file mode 100644
index 0000000..a7cb139
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TAgreement.java
@@ -0,0 +1,141 @@
+package com.stylefeng.guns.modular.system.model;
+
+import com.baomidou.mybatisplus.enums.IdType;
+import java.util.Date;
+import com.baomidou.mybatisplus.annotations.TableId;
+import com.baomidou.mybatisplus.activerecord.Model;
+import com.baomidou.mybatisplus.annotations.TableName;
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 平台协议
+ * </p>
+ *
+ * @author 吕雪
+ * @since 2020-06-01
+ */
+@TableName("t_agreement")
+public class TAgreement extends Model<TAgreement> {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 主键id
+ */
+ @TableId(value = "id", type = IdType.AUTO)
+ private Integer id;
+ /**
+ * 1=用户，2=司机
+ */
+ private Integer useType;
+ /**
+ * 协议内容
+ */
+ private String content;
+ /**
+ * 类型（1：隐私协议，2：用户协议，3：用户指南，4：法律条款，5：关于我们，6=注册协议）
+ */
+ private Integer type;
+ /**
+ * 1：创建，2：修改，3：删除
+ */
+ private String flag;
+ private Date insertTime;
+ private String insertUser;
+ private Date updateTime;
+ private Integer updateUser;
+
+
+ public Integer getId() {
+ return id;
+ }
+
+ public void setId(Integer id) {
+ this.id = id;
+ }
+
+ public Integer getUseType() {
+ return useType;
+ }
+
+ public void setUseType(Integer useType) {
+ this.useType = useType;
+ }
+
+ public String getContent() {
+ return content;
+ }
+
+ public void setContent(String content) {
+ this.content = content;
+ }
+
+ public Integer getType() {
+ return type;
+ }
+
+ public void setType(Integer type) {
+ this.type = type;
+ }
+
+ public String getFlag() {
+ return flag;
+ }
+
+ public void setFlag(String flag) {
+ this.flag = flag;
+ }
+
+ public Date getInsertTime() {
+ return insertTime;
+ }
+
+ public void setInsertTime(Date insertTime) {
+ this.insertTime = insertTime;
+ }
+
+ public String getInsertUser() {
+ return insertUser;
+ }
+
+ public void setInsertUser(String insertUser) {
+ this.insertUser = insertUser;
+ }
+
+ public Date getUpdateTime() {
+ return updateTime;
+ }
+
+ public void setUpdateTime(Date updateTime) {
+ this.updateTime = updateTime;
+ }
+
+ public Integer getUpdateUser() {
+ return updateUser;
+ }
+
+ public void setUpdateUser(Integer updateUser) {
+ this.updateUser = updateUser;
+ }
+
+ @Override
+ protected Serializable pkVal() {
+ return this.id;
+ }
+
+ @Override
+ public String toString() {
+ return "TAgreement{" +
+ "id=" + id +
+ ", useType=" + useType +
+ ", content=" + content +
+ ", type=" + type +
+ ", flag=" + flag +
+ ", insertTime=" + insertTime +
+ ", insertUser=" + insertUser +
+ ", updateTime=" + updateTime +
+ ", updateUser=" + updateUser +
+ "}";
+ }
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TCar.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TCar.java
new file mode 100644
index 0000000..9f1f783
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TCar.java
@@ -0,0 +1,566 @@
+package com.stylefeng.guns.modular.system.model;
+
+import com.baomidou.mybatisplus.enums.IdType;
+import java.util.Date;
+import com.baomidou.mybatisplus.annotations.TableId;
+import com.baomidou.mybatisplus.activerecord.Model;
+import com.baomidou.mybatisplus.annotations.TableName;
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 车辆
+ * </p>
+ *
+ * @author 吕雪
+ * @since 2020-06-05
+ */
+@TableName("t_car")
+public class TCar extends Model<TCar> {
+
+ private static final long serialVersionUID = 1L;
+
+ @TableId(value = "id", type = IdType.AUTO)
+ private Integer id;
+ /**
+ * 是否是平台车辆(1=是，2=否)
+ */
+ private Integer isPlatCar;
+ /**
+ * 公司id
+ */
+ private Integer companyId;
+ /**
+ * 加盟商id
+ */
+ private Integer franchiseeId;
+ /**
+ * 车辆颜色
+ */
+ private String carColor;
+ /**
+ * 车型id
+ */
+ private Integer carModelId;
+ /**
+ * 车辆品牌ID
+ */
+ private Integer carBrandId;
+ /**
+ * 车牌号
+ */
+ private String carLicensePlate;
+ /**
+ * 车牌颜色
+ */
+ private String plateColor;
+ /**
+ * 车辆照片
+ */
+ private String carPhoto;
+ /**
+ * 车辆类型
+ */
+ private String vehicleType;
+ /**
+ * 车辆所有人
+ */
+ private String ownerName;
+ /**
+ * 发送机号
+ */
+ private String engineId;
+ /**
+ * 车辆VIN码
+ */
+ private String VIN;
+ /**
+ * 车辆注册日期
+ */
+ private Date certifyDateA;
+ /**
+ * 车辆燃料类型
+ */
+ private String fuelType;
+ /**
+ * 发动机排量
+ */
+ private String engineDisplace;
+ /**
+ * 运输证字号
+ */
+ private String certificate;
+ /**
+ * 车辆运输证发证机构
+ */
+ private String transAgency;
+ /**
+ * 车辆经营区域
+ */
+ private String transArea;
+ /**
+ * 车辆运输证有效期起
+ */
+ private Date transDateStart;
+ /**
+ * 车辆运输证有效期止
+ */
+ private Date transDateStop;
+ /**
+ * 车辆初次登记日期
+ */
+ private Date certifyDateB;
+ /**
+ * 车辆维修状态（0：未检修，1：已检修，2：未知）
+ */
+ private Integer fixState;
+ /**
+ * 车辆下次年检时间
+ */
+ private Date nextFixDate;
+ /**
+ * 车辆年度审核状态
+ */
+ private String checkState;
+ /**
+ * 发票打印设备序列号
+ */
+ private String feePrintId;
+ /**
+ * 卫星定位装置品牌
+ */
+ private String GPSBrand;
+ /**
+ * 卫星定位装置型号
+ */
+ private String GPSModel;
+ /**
+ * 卫星定位装置IMEI号
+ */
+ private String GPSIMEI;
+ /**
+ * 卫星定位装置安装时间
+ */
+ private Date GPSInstallDate;
+ /**
+ * 车辆报备日期
+ */
+ private Date registerDate;
+ /**
+ * 服务类型（1：网络预约出租车，2：巡游出租汽车，3：私人小客车合乘）
+ */
+ private Integer commercialType;
+ /**
+ * 行驶证号
+ */
+ private String drivingLicenseNumber;
+ /**
+ * 行驶证照片
+ */
+ private String drivingLicensePhoto;
+ /**
+ * 年检到期时间
+ */
+ private Date annualInspectionTime;
+ /**
+ * 商业保险到期时间
+ */
+ private Date commercialInsuranceTime;
+ /**
+ * 添加时间
+ */
+ private Date insertTime;
+ /**
+ * 状态(1=正常，2=删除)
+ */
+ private Integer state;
+ /**
+ * 司机来源方式 1=司机注册 2=平台添加 3=分公司添加 4=加盟商添加
+ */
+ private Integer addType;
+ /**
+ * 添加司机的分公司/加盟商ID
+ */
+ private Integer addObjectId;
+
+
+ public Integer getId() {
+ return id;
+ }
+
+ public void setId(Integer id) {
+ this.id = id;
+ }
+
+ public Integer getIsPlatCar() {
+ return isPlatCar;
+ }
+
+ public void setIsPlatCar(Integer isPlatCar) {
+ this.isPlatCar = isPlatCar;
+ }
+
+ public Integer getCompanyId() {
+ return companyId;
+ }
+
+ public void setCompanyId(Integer companyId) {
+ this.companyId = companyId;
+ }
+
+ public Integer getFranchiseeId() {
+ return franchiseeId;
+ }
+
+ public void setFranchiseeId(Integer franchiseeId) {
+ this.franchiseeId = franchiseeId;
+ }
+
+ public String getCarColor() {
+ return carColor;
+ }
+
+ public void setCarColor(String carColor) {
+ this.carColor = carColor;
+ }
+
+ public Integer getCarModelId() {
+ return carModelId;
+ }
+
+ public void setCarModelId(Integer carModelId) {
+ this.carModelId = carModelId;
+ }
+
+ public Integer getCarBrandId() {
+ return carBrandId;
+ }
+
+ public void setCarBrandId(Integer carBrandId) {
+ this.carBrandId = carBrandId;
+ }
+
+ public String getCarLicensePlate() {
+ return carLicensePlate;
+ }
+
+ public void setCarLicensePlate(String carLicensePlate) {
+ this.carLicensePlate = carLicensePlate;
+ }
+
+ public String getCarPhoto() {
+ return carPhoto;
+ }
+
+ public void setCarPhoto(String carPhoto) {
+ this.carPhoto = carPhoto;
+ }
+
+ public String getDrivingLicenseNumber() {
+ return drivingLicenseNumber;
+ }
+
+ public void setDrivingLicenseNumber(String drivingLicenseNumber) {
+ this.drivingLicenseNumber = drivingLicenseNumber;
+ }
+
+ public String getDrivingLicensePhoto() {
+ return drivingLicensePhoto;
+ }
+
+ public void setDrivingLicensePhoto(String drivingLicensePhoto) {
+ this.drivingLicensePhoto = drivingLicensePhoto;
+ }
+
+ public Date getAnnualInspectionTime() {
+ return annualInspectionTime;
+ }
+
+ public void setAnnualInspectionTime(Date annualInspectionTime) {
+ this.annualInspectionTime = annualInspectionTime;
+ }
+
+ public Date getCommercialInsuranceTime() {
+ return commercialInsuranceTime;
+ }
+
+ public void setCommercialInsuranceTime(Date commercialInsuranceTime) {
+ this.commercialInsuranceTime = commercialInsuranceTime;
+ }
+
+ public Date getInsertTime() {
+ return insertTime;
+ }
+
+ public void setInsertTime(Date insertTime) {
+ this.insertTime = insertTime;
+ }
+
+ public Integer getState() {
+ return state;
+ }
+
+ public void setState(Integer state) {
+ this.state = state;
+ }
+
+ public Integer getAddType() {
+ return addType;
+ }
+
+ public void setAddType(Integer addType) {
+ this.addType = addType;
+ }
+
+ public Integer getAddObjectId() {
+ return addObjectId;
+ }
+
+ public void setAddObjectId(Integer addObjectId) {
+ this.addObjectId = addObjectId;
+ }
+
+ public String getPlateColor() {
+ return plateColor;
+ }
+
+ public void setPlateColor(String plateColor) {
+ this.plateColor = plateColor;
+ }
+
+ public String getVehicleType() {
+ return vehicleType;
+ }
+
+ public void setVehicleType(String vehicleType) {
+ this.vehicleType = vehicleType;
+ }
+
+ public String getOwnerName() {
+ return ownerName;
+ }
+
+ public void setOwnerName(String ownerName) {
+ this.ownerName = ownerName;
+ }
+
+ public String getEngineId() {
+ return engineId;
+ }
+
+ public void setEngineId(String engineId) {
+ this.engineId = engineId;
+ }
+
+ public String getVIN() {
+ return VIN;
+ }
+
+ public void setVIN(String VIN) {
+ this.VIN = VIN;
+ }
+
+ public Date getCertifyDateA() {
+ return certifyDateA;
+ }
+
+ public void setCertifyDateA(Date certifyDateA) {
+ this.certifyDateA = certifyDateA;
+ }
+
+ public String getFuelType() {
+ return fuelType;
+ }
+
+ public void setFuelType(String fuelType) {
+ this.fuelType = fuelType;
+ }
+
+ public String getEngineDisplace() {
+ return engineDisplace;
+ }
+
+ public void setEngineDisplace(String engineDisplace) {
+ this.engineDisplace = engineDisplace;
+ }
+
+ public String getCertificate() {
+ return certificate;
+ }
+
+ public void setCertificate(String certificate) {
+ this.certificate = certificate;
+ }
+
+ public String getTransAgency() {
+ return transAgency;
+ }
+
+ public void setTransAgency(String transAgency) {
+ this.transAgency = transAgency;
+ }
+
+ public String getTransArea() {
+ return transArea;
+ }
+
+ public void setTransArea(String transArea) {
+ this.transArea = transArea;
+ }
+
+ public Date getTransDateStart() {
+ return transDateStart;
+ }
+
+ public void setTransDateStart(Date transDateStart) {
+ this.transDateStart = transDateStart;
+ }
+
+ public Date getTransDateStop() {
+ return transDateStop;
+ }
+
+ public void setTransDateStop(Date transDateStop) {
+ this.transDateStop = transDateStop;
+ }
+
+ public Date getCertifyDateB() {
+ return certifyDateB;
+ }
+
+ public void setCertifyDateB(Date certifyDateB) {
+ this.certifyDateB = certifyDateB;
+ }
+
+ public Integer getFixState() {
+ return fixState;
+ }
+
+ public void setFixState(Integer fixState) {
+ this.fixState = fixState;
+ }
+
+ public Date getNextFixDate() {
+ return nextFixDate;
+ }
+
+ public void setNextFixDate(Date nextFixDate) {
+ this.nextFixDate = nextFixDate;
+ }
+
+ public String getCheckState() {
+ return checkState;
+ }
+
+ public void setCheckState(String checkState) {
+ this.checkState = checkState;
+ }
+
+ public String getFeePrintId() {
+ return feePrintId;
+ }
+
+ public void setFeePrintId(String feePrintId) {
+ this.feePrintId = feePrintId;
+ }
+
+ public String getGPSBrand() {
+ return GPSBrand;
+ }
+
+ public void setGPSBrand(String GPSBrand) {
+ this.GPSBrand = GPSBrand;
+ }
+
+ public String getGPSModel() {
+ return GPSModel;
+ }
+
+ public void setGPSModel(String GPSModel) {
+ this.GPSModel = GPSModel;
+ }
+
+ public String getGPSIMEI() {
+ return GPSIMEI;
+ }
+
+ public void setGPSIMEI(String GPSIMEI) {
+ this.GPSIMEI = GPSIMEI;
+ }
+
+ public Date getGPSInstallDate() {
+ return GPSInstallDate;
+ }
+
+ public void setGPSInstallDate(Date GPSInstallDate) {
+ this.GPSInstallDate = GPSInstallDate;
+ }
+
+ public Date getRegisterDate() {
+ return registerDate;
+ }
+
+ public void setRegisterDate(Date registerDate) {
+ this.registerDate = registerDate;
+ }
+
+ public Integer getCommercialType() {
+ return commercialType;
+ }
+
+ public void setCommercialType(Integer commercialType) {
+ this.commercialType = commercialType;
+ }
+
+ @Override
+ protected Serializable pkVal() {
+ return this.id;
+ }
+
+ @Override
+ public String toString() {
+ return "TCar{" +
+ "id=" + id +
+ ", isPlatCar=" + isPlatCar +
+ ", companyId=" + companyId +
+ ", franchiseeId=" + franchiseeId +
+ ", carColor='" + carColor + '\'' +
+ ", carModelId=" + carModelId +
+ ", carBrandId=" + carBrandId +
+ ", carLicensePlate='" + carLicensePlate + '\'' +
+ ", plateColor='" + plateColor + '\'' +
+ ", carPhoto='" + carPhoto + '\'' +
+ ", vehicleType='" + vehicleType + '\'' +
+ ", ownerName='" + ownerName + '\'' +
+ ", engineId='" + engineId + '\'' +
+ ", VIN='" + VIN + '\'' +
+ ", certifyDateA=" + certifyDateA +
+ ", fuelType='" + fuelType + '\'' +
+ ", engineDisplace='" + engineDisplace + '\'' +
+ ", certificate='" + certificate + '\'' +
+ ", transAgency='" + transAgency + '\'' +
+ ", transArea='" + transArea + '\'' +
+ ", transDateStart=" + transDateStart +
+ ", transDateStop=" + transDateStop +
+ ", certifyDateB=" + certifyDateB +
+ ", fixState=" + fixState +
+ ", nextFixDate=" + nextFixDate +
+ ", checkState='" + checkState + '\'' +
+ ", feePrintId='" + feePrintId + '\'' +
+ ", GPSBrand='" + GPSBrand + '\'' +
+ ", GPSModel='" + GPSModel + '\'' +
+ ", GPSIMEI='" + GPSIMEI + '\'' +
+ ", GPSInstallDate=" + GPSInstallDate +
+ ", registerDate=" + registerDate +
+ ", commercialType=" + commercialType +
+ ", drivingLicenseNumber='" + drivingLicenseNumber + '\'' +
+ ", drivingLicensePhoto='" + drivingLicensePhoto + '\'' +
+ ", annualInspectionTime=" + annualInspectionTime +
+ ", commercialInsuranceTime=" + commercialInsuranceTime +
+ ", insertTime=" + insertTime +
+ ", state=" + state +
+ ", addType=" + addType +
+ ", addObjectId=" + addObjectId +
+ '}';
+ }
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TCarBrand.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TCarBrand.java
new file mode 100644
index 0000000..b05af36
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TCarBrand.java
@@ -0,0 +1,114 @@
+package com.stylefeng.guns.modular.system.model;
+
+import com.baomidou.mybatisplus.enums.IdType;
+import java.util.Date;
+import com.baomidou.mybatisplus.annotations.TableId;
+import com.baomidou.mybatisplus.activerecord.Model;
+import com.baomidou.mybatisplus.annotations.TableName;
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 车辆品牌
+ * </p>
+ *
+ * @author 吕雪
+ * @since 2020-06-05
+ */
+@TableName("t_car_brand")
+public class TCarBrand extends Model<TCarBrand> {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 主键id
+ */
+ @TableId(value = "id", type = IdType.AUTO)
+ private Integer id;
+ /**
+ * 名称
+ */
+ private String name;
+ /**
+ * 图片
+ */
+ private String imgUrl;
+ /**
+ * 备注
+ */
+ private String remark;
+ /**
+ * 创建时间
+ */
+ private Date insertTime;
+ /**
+ * 状态(1=正常，2=删除)
+ */
+ private Integer state;
+
+
+ public Integer getId() {
+ return id;
+ }
+
+ public void setId(Integer id) {
+ this.id = id;
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ public String getImgUrl() {
+ return imgUrl;
+ }
+
+ public void setImgUrl(String imgUrl) {
+ this.imgUrl = imgUrl;
+ }
+
+ public String getRemark() {
+ return remark;
+ }
+
+ public void setRemark(String remark) {
+ this.remark = remark;
+ }
+
+ public Date getInsertTime() {
+ return insertTime;
+ }
+
+ public void setInsertTime(Date insertTime) {
+ this.insertTime = insertTime;
+ }
+
+ public Integer getState() {
+ return state;
+ }
+
+ public void setState(Integer state) {
+ this.state = state;
+ }
+
+ @Override
+ protected Serializable pkVal() {
+ return this.id;
+ }
+
+ @Override
+ public String toString() {
+ return "TCarBrand{" +
+ "id=" + id +
+ ", name=" + name +
+ ", imgUrl=" + imgUrl +
+ ", remark=" + remark +
+ ", insertTime=" + insertTime +
+ ", state=" + state +
+ "}";
+ }
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TCarModel.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TCarModel.java
new file mode 100644
index 0000000..f0a4501
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TCarModel.java
@@ -0,0 +1,127 @@
+package com.stylefeng.guns.modular.system.model;
+
+import com.baomidou.mybatisplus.enums.IdType;
+import java.util.Date;
+import com.baomidou.mybatisplus.annotations.TableId;
+import com.baomidou.mybatisplus.activerecord.Model;
+import com.baomidou.mybatisplus.annotations.TableName;
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 车辆车型
+ * </p>
+ *
+ * @author 吕雪
+ * @since 2020-06-05
+ */
+@TableName("t_car_model")
+public class TCarModel extends Model<TCarModel> {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 主键id
+ */
+ @TableId(value = "id", type = IdType.AUTO)
+ private Integer id;
+ /**
+ * 名称
+ */
+ private String name;
+ /**
+ * 备注
+ */
+ private String remark;
+ /**
+ * 创建时间
+ */
+ private Date insertTime;
+ /**
+ * 状态(1=正常，2=删除)
+ */
+ private Integer state;
+ /**
+ * 座位数
+ */
+ private Integer seat;
+ /**
+ * 品牌id
+ */
+ private Integer brandId;
+
+
+ public Integer getId() {
+ return id;
+ }
+
+ public void setId(Integer id) {
+ this.id = id;
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ public String getRemark() {
+ return remark;
+ }
+
+ public void setRemark(String remark) {
+ this.remark = remark;
+ }
+
+ public Date getInsertTime() {
+ return insertTime;
+ }
+
+ public void setInsertTime(Date insertTime) {
+ this.insertTime = insertTime;
+ }
+
+ public Integer getState() {
+ return state;
+ }
+
+ public void setState(Integer state) {
+ this.state = state;
+ }
+
+ public Integer getSeat() {
+ return seat;
+ }
+
+ public void setSeat(Integer seat) {
+ this.seat = seat;
+ }
+
+ public Integer getBrandId() {
+ return brandId;
+ }
+
+ public void setBrandId(Integer brandId) {
+ this.brandId = brandId;
+ }
+
+ @Override
+ protected Serializable pkVal() {
+ return this.id;
+ }
+
+ @Override
+ public String toString() {
+ return "TCarModel{" +
+ "id=" + id +
+ ", name=" + name +
+ ", remark=" + remark +
+ ", insertTime=" + insertTime +
+ ", state=" + state +
+ ", seat=" + seat +
+ ", brandId=" + brandId +
+ "}";
+ }
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TCarService.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TCarService.java
new file mode 100644
index 0000000..c7fce8b
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TCarService.java
@@ -0,0 +1,85 @@
+package com.stylefeng.guns.modular.system.model;
+
+import com.baomidou.mybatisplus.enums.IdType;
+import com.baomidou.mybatisplus.annotations.TableId;
+import com.baomidou.mybatisplus.activerecord.Model;
+import com.baomidou.mybatisplus.annotations.TableName;
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 车辆经营业务
+ * </p>
+ *
+ * @author 吕雪
+ * @since 2020-06-05
+ */
+@TableName("t_car_service")
+public class TCarService extends Model<TCarService> {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 主键id
+ */
+ @TableId(value = "id", type = IdType.AUTO)
+ private Integer id;
+ /**
+ * 车辆id
+ */
+ private Integer carId;
+ /**
+ * 类型(1=专车，2=出租车，3=城际(跨城出行)，4=小件物流-同城，5=小件物流-跨城，6=包车)
+ */
+ private Integer type;
+ /**
+ * 服务车型id
+ */
+ private Integer serverCarModelId;
+
+ public Integer getServerCarModelId() {
+ return serverCarModelId;
+ }
+
+ public void setServerCarModelId(Integer serverCarModelId) {
+ this.serverCarModelId = serverCarModelId;
+ }
+
+ public Integer getId() {
+ return id;
+ }
+
+ public void setId(Integer id) {
+ this.id = id;
+ }
+
+ public Integer getCarId() {
+ return carId;
+ }
+
+ public void setCarId(Integer carId) {
+ this.carId = carId;
+ }
+
+ public Integer getType() {
+ return type;
+ }
+
+ public void setType(Integer type) {
+ this.type = type;
+ }
+
+ @Override
+ protected Serializable pkVal() {
+ return this.id;
+ }
+
+ @Override
+ public String toString() {
+ return "TCarService{" +
+ "id=" + id +
+ ", carId=" + carId +
+ ", type=" + type +
+ "}";
+ }
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TCompany.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TCompany.java
new file mode 100644
index 0000000..fb97a7c
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TCompany.java
@@ -0,0 +1,736 @@
+package com.stylefeng.guns.modular.system.model;
+
+import com.baomidou.mybatisplus.enums.IdType;
+import java.math.BigDecimal;
+import java.util.Date;
+import com.baomidou.mybatisplus.annotations.TableId;
+import com.baomidou.mybatisplus.activerecord.Model;
+import com.baomidou.mybatisplus.annotations.TableName;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 公司信息表
+ * </p>
+ *
+ * @author 吕雪
+ * @since 2020-06-06
+ */
+@TableName("t_company")
+public class TCompany extends Model<TCompany> {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 主键id
+ */
+ @TableId(value = "id", type = IdType.AUTO)
+ private Integer id;
+ /**
+ * 是否经营专车(1=是，2=否)
+ */
+ private Integer isSpe;
+ /**
+ * 是否经营出租车(1=是，2=否)
+ */
+ private Integer isTaxi;
+ /**
+ * 是否经营跨城(1=是，2=否)
+ */
+ private Integer isCross;
+ /**
+ * 是否经营跨城物流(1=是，2=否)
+ */
+ private Integer isCrossLogistics;
+ /**
+ * 是否经营同城物流(1=是，2=否)
+ */
+ private Integer isSameLogistics;
+ /**
+ * 是否经营包车(1=是，2=否)
+ */
+ private Integer isCharter;
+ /**
+ * 专车提成方式(1=比例，2=固定)
+ */
+ private Integer isSpeFixedOrProportional;
+ /**
+ * 出租车提成方式(1=比例，2=固定)
+ */
+ private Integer isTaxiFixedOrProportional;
+ /**
+ * 跨城物流提成方式(1=比例，2=固定)
+ */
+ private Integer isCrossLogisticsFixedOrProportional;
+ /**
+ * 同城物流提成方式(1=比例，2=固定)
+ */
+ private Integer isSameLogisticsFixedOrProportional;
+ /**
+ * 专车提成数值
+ */
+ private BigDecimal speMoney;
+ /**
+ * 出租车提成数值
+ */
+ private BigDecimal taxiMoney;
+ /**
+ * 跨城物流提成数值
+ */
+ private BigDecimal crossLogisticsMoney;
+ /**
+ * 同城物流
+ */
+ private BigDecimal sameLogisticsMoney;
+ /**
+ * 是否需要摆渡车(1=是，2=否)
+ */
+ private Integer isNeedFerry;
+ /**
+ * 企业名称
+ */
+ private String name;
+ /**
+ * 企业类型（1：平台，2：分公司，3：加盟商）
+ */
+ private Integer type;
+ /**
+ * 上级企业id
+ */
+ private Integer superiorId;
+ /**
+ * 负责人姓名
+ */
+ private String principalName;
+ /**
+ * 负责人电话
+ */
+ private String principalPhone;
+ /**
+ * 管理员姓名
+ */
+ private String adminName;
+ /**
+ * 管理员电话
+ */
+ private String adminPhone;
+ /**
+ * 紧急联系电话
+ */
+ private String urgentPhoen;
+ /**
+ * 服务机构设立日期
+ */
+ @DateTimeFormat
+ private Date setupTime;
+ /**
+ * 统一社会信用代码
+ */
+ private String identifier;
+ /**
+ * 注册地行政区划分代码
+ */
+ private String addressCode;
+ /**
+ * 经营范围
+ */
+ private String businessScope;
+ /**
+ * 通信地址
+ */
+ private String contactAddress;
+ /**
+ * 行政文书送达地址
+ */
+ private String documentAddress;
+ /**
+ * 经营业户经济类型
+ */
+ private String economicType;
+ /**
+ * 注册资本
+ */
+ private String regCapital;
+ /**
+ * 法人代表姓名
+ */
+ private String legalName;
+ /**
+ * 法人代表身份证号
+ */
+ private String legalId;
+ /**
+ * 法人代表电话
+ */
+ private String legalPhone;
+ /**
+ * 法人代表身份证扫描件文件地址
+ */
+ private String legalPhotoUrl;
+ /**
+ * 经营许可证发证机构
+ */
+ private String licensingAgency;
+ /**
+ * 经营许可证初次发证日期
+ */
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date licenseTime;
+ /**
+ * 经营许可证有效期起
+ */
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date licenseStartTime;
+ /**
+ * 经营许可证有效期止
+ */
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date licenseEndTime;
+ /**
+ * 网络预约车经营许可证号
+ */
+ private String licenseNumber;
+ /**
+ * 注册网络预约车辆数
+ */
+ private Integer carNum;
+ /**
+ * 注册网络预约车驾驶员数量
+ */
+ private Integer driverNum;
+ /**
+ * 登录MAC地址（多个以逗号分隔）
+ */
+ private String mac;
+ /**
+ * 当前状态（0：正常，1：禁用）
+ */
+ private Integer state;
+ /**
+ * 操作标识（1：新增，2：修改，3：删除）
+ */
+ private String flag;
+ /**
+ * 上传标识（1：未上传，2：已上传）
+ */
+ private String upload;
+ /**
+ * 创建时间
+ */
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date insertTime;
+ /**
+ * 具体地址
+ */
+ private String detailAddress;
+ /**
+ * 分公司代码
+ */
+ private String code;
+ /**
+ * 分公司区划代码
+ */
+ private String scopeCode;
+ /**
+ * 经营区域
+ */
+ private String serviceScope;
+ //身份证正面
+ private String idCardPositive;
+ //身份证反面
+ private String idCardReverse;
+
+ public String getIdCardPositive() {
+ return idCardPositive;
+ }
+
+ public void setIdCardPositive(String idCardPositive) {
+ this.idCardPositive = idCardPositive;
+ }
+
+ public String getIdCardReverse() {
+ return idCardReverse;
+ }
+
+ public void setIdCardReverse(String idCardReverse) {
+ this.idCardReverse = idCardReverse;
+ }
+
+ public String getCode() {
+ return code;
+ }
+
+ public void setCode(String code) {
+ this.code = code;
+ }
+
+ public String getScopeCode() {
+ return scopeCode;
+ }
+
+ public void setScopeCode(String scopeCode) {
+ this.scopeCode = scopeCode;
+ }
+
+ public String getServiceScope() {
+ return serviceScope;
+ }
+
+ public void setServiceScope(String serviceScope) {
+ this.serviceScope = serviceScope;
+ }
+
+ public Integer getId() {
+ return id;
+ }
+
+ public void setId(Integer id) {
+ this.id = id;
+ }
+
+ public Integer getIsSpe() {
+ return isSpe;
+ }
+
+ public void setIsSpe(Integer isSpe) {
+ this.isSpe = isSpe;
+ }
+
+ public Integer getIsTaxi() {
+ return isTaxi;
+ }
+
+ public void setIsTaxi(Integer isTaxi) {
+ this.isTaxi = isTaxi;
+ }
+
+ public Integer getIsCross() {
+ return isCross;
+ }
+
+ public void setIsCross(Integer isCross) {
+ this.isCross = isCross;
+ }
+
+ public Integer getIsCrossLogistics() {
+ return isCrossLogistics;
+ }
+
+ public void setIsCrossLogistics(Integer isCrossLogistics) {
+ this.isCrossLogistics = isCrossLogistics;
+ }
+
+ public Integer getIsSameLogistics() {
+ return isSameLogistics;
+ }
+
+ public void setIsSameLogistics(Integer isSameLogistics) {
+ this.isSameLogistics = isSameLogistics;
+ }
+
+ public Integer getIsCharter() {
+ return isCharter;
+ }
+
+ public void setIsCharter(Integer isCharter) {
+ this.isCharter = isCharter;
+ }
+
+ public Integer getIsSpeFixedOrProportional() {
+ return isSpeFixedOrProportional;
+ }
+
+ public void setIsSpeFixedOrProportional(Integer isSpeFixedOrProportional) {
+ this.isSpeFixedOrProportional = isSpeFixedOrProportional;
+ }
+
+ public Integer getIsTaxiFixedOrProportional() {
+ return isTaxiFixedOrProportional;
+ }
+
+ public void setIsTaxiFixedOrProportional(Integer isTaxiFixedOrProportional) {
+ this.isTaxiFixedOrProportional = isTaxiFixedOrProportional;
+ }
+
+ public Integer getIsCrossLogisticsFixedOrProportional() {
+ return isCrossLogisticsFixedOrProportional;
+ }
+
+ public void setIsCrossLogisticsFixedOrProportional(Integer isCrossLogisticsFixedOrProportional) {
+ this.isCrossLogisticsFixedOrProportional = isCrossLogisticsFixedOrProportional;
+ }
+
+ public Integer getIsSameLogisticsFixedOrProportional() {
+ return isSameLogisticsFixedOrProportional;
+ }
+
+ public void setIsSameLogisticsFixedOrProportional(Integer isSameLogisticsFixedOrProportional) {
+ this.isSameLogisticsFixedOrProportional = isSameLogisticsFixedOrProportional;
+ }
+
+ public BigDecimal getSpeMoney() {
+ return speMoney;
+ }
+
+ public void setSpeMoney(BigDecimal speMoney) {
+ this.speMoney = speMoney;
+ }
+
+ public BigDecimal getTaxiMoney() {
+ return taxiMoney;
+ }
+
+ public void setTaxiMoney(BigDecimal taxiMoney) {
+ this.taxiMoney = taxiMoney;
+ }
+
+ public BigDecimal getCrossLogisticsMoney() {
+ return crossLogisticsMoney;
+ }
+
+ public void setCrossLogisticsMoney(BigDecimal crossLogisticsMoney) {
+ this.crossLogisticsMoney = crossLogisticsMoney;
+ }
+
+ public BigDecimal getSameLogisticsMoney() {
+ return sameLogisticsMoney;
+ }
+
+ public void setSameLogisticsMoney(BigDecimal sameLogisticsMoney) {
+ this.sameLogisticsMoney = sameLogisticsMoney;
+ }
+
+ public Integer getIsNeedFerry() {
+ return isNeedFerry;
+ }
+
+ public void setIsNeedFerry(Integer isNeedFerry) {
+ this.isNeedFerry = isNeedFerry;
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ public Integer getType() {
+ return type;
+ }
+
+ public void setType(Integer type) {
+ this.type = type;
+ }
+
+ public Integer getSuperiorId() {
+ return superiorId;
+ }
+
+ public void setSuperiorId(Integer superiorId) {
+ this.superiorId = superiorId;
+ }
+
+ public String getPrincipalName() {
+ return principalName;
+ }
+
+ public void setPrincipalName(String principalName) {
+ this.principalName = principalName;
+ }
+
+ public String getPrincipalPhone() {
+ return principalPhone;
+ }
+
+ public void setPrincipalPhone(String principalPhone) {
+ this.principalPhone = principalPhone;
+ }
+
+ public String getAdminName() {
+ return adminName;
+ }
+
+ public void setAdminName(String adminName) {
+ this.adminName = adminName;
+ }
+
+ public String getAdminPhone() {
+ return adminPhone;
+ }
+
+ public void setAdminPhone(String adminPhone) {
+ this.adminPhone = adminPhone;
+ }
+
+ public String getUrgentPhoen() {
+ return urgentPhoen;
+ }
+
+ public void setUrgentPhoen(String urgentPhoen) {
+ this.urgentPhoen = urgentPhoen;
+ }
+
+ public Date getSetupTime() {
+ return setupTime;
+ }
+
+ public void setSetupTime(Date setupTime) {
+ this.setupTime = setupTime;
+ }
+
+ public String getIdentifier() {
+ return identifier;
+ }
+
+ public void setIdentifier(String identifier) {
+ this.identifier = identifier;
+ }
+
+ public String getAddressCode() {
+ return addressCode;
+ }
+
+ public void setAddressCode(String addressCode) {
+ this.addressCode = addressCode;
+ }
+
+ public String getBusinessScope() {
+ return businessScope;
+ }
+
+ public void setBusinessScope(String businessScope) {
+ this.businessScope = businessScope;
+ }
+
+ public String getContactAddress() {
+ return contactAddress;
+ }
+
+ public void setContactAddress(String contactAddress) {
+ this.contactAddress = contactAddress;
+ }
+
+ public String getDocumentAddress() {
+ return documentAddress;
+ }
+
+ public void setDocumentAddress(String documentAddress) {
+ this.documentAddress = documentAddress;
+ }
+
+ public String getEconomicType() {
+ return economicType;
+ }
+
+ public void setEconomicType(String economicType) {
+ this.economicType = economicType;
+ }
+
+ public String getRegCapital() {
+ return regCapital;
+ }
+
+ public void setRegCapital(String regCapital) {
+ this.regCapital = regCapital;
+ }
+
+ public String getLegalName() {
+ return legalName;
+ }
+
+ public void setLegalName(String legalName) {
+ this.legalName = legalName;
+ }
+
+ public String getLegalId() {
+ return legalId;
+ }
+
+ public void setLegalId(String legalId) {
+ this.legalId = legalId;
+ }
+
+ public String getLegalPhone() {
+ return legalPhone;
+ }
+
+ public void setLegalPhone(String legalPhone) {
+ this.legalPhone = legalPhone;
+ }
+
+ public String getLegalPhotoUrl() {
+ return legalPhotoUrl;
+ }
+
+ public void setLegalPhotoUrl(String legalPhotoUrl) {
+ this.legalPhotoUrl = legalPhotoUrl;
+ }
+
+ public String getLicensingAgency() {
+ return licensingAgency;
+ }
+
+ public void setLicensingAgency(String licensingAgency) {
+ this.licensingAgency = licensingAgency;
+ }
+
+ public Date getLicenseTime() {
+ return licenseTime;
+ }
+
+ public void setLicenseTime(Date licenseTime) {
+ this.licenseTime = licenseTime;
+ }
+
+ public Date getLicenseStartTime() {
+ return licenseStartTime;
+ }
+
+ public void setLicenseStartTime(Date licenseStartTime) {
+ this.licenseStartTime = licenseStartTime;
+ }
+
+ public Date getLicenseEndTime() {
+ return licenseEndTime;
+ }
+
+ public void setLicenseEndTime(Date licenseEndTime) {
+ this.licenseEndTime = licenseEndTime;
+ }
+
+ public String getLicenseNumber() {
+ return licenseNumber;
+ }
+
+ public void setLicenseNumber(String licenseNumber) {
+ this.licenseNumber = licenseNumber;
+ }
+
+ public Integer getCarNum() {
+ return carNum;
+ }
+
+ public void setCarNum(Integer carNum) {
+ this.carNum = carNum;
+ }
+
+ public Integer getDriverNum() {
+ return driverNum;
+ }
+
+ public void setDriverNum(Integer driverNum) {
+ this.driverNum = driverNum;
+ }
+
+ public String getMac() {
+ return mac;
+ }
+
+ public void setMac(String mac) {
+ this.mac = mac;
+ }
+
+ public Integer getState() {
+ return state;
+ }
+
+ public void setState(Integer state) {
+ this.state = state;
+ }
+
+ public String getFlag() {
+ return flag;
+ }
+
+ public void setFlag(String flag) {
+ this.flag = flag;
+ }
+
+ public String getUpload() {
+ return upload;
+ }
+
+ public void setUpload(String upload) {
+ this.upload = upload;
+ }
+
+ public Date getInsertTime() {
+ return insertTime;
+ }
+
+ public void setInsertTime(Date insertTime) {
+ this.insertTime = insertTime;
+ }
+
+ public String getDetailAddress() {
+ return detailAddress;
+ }
+
+ public void setDetailAddress(String detailAddress) {
+ this.detailAddress = detailAddress;
+ }
+
+ @Override
+ protected Serializable pkVal() {
+ return this.id;
+ }
+
+ @Override
+ public String toString() {
+ return "TCompany{" +
+ "id=" + id +
+ ", isSpe=" + isSpe +
+ ", isTaxi=" + isTaxi +
+ ", isCross=" + isCross +
+ ", isCrossLogistics=" + isCrossLogistics +
+ ", isSameLogistics=" + isSameLogistics +
+ ", isCharter=" + isCharter +
+ ", isSpeFixedOrProportional=" + isSpeFixedOrProportional +
+ ", isTaxiFixedOrProportional=" + isTaxiFixedOrProportional +
+ ", isCrossLogisticsFixedOrProportional=" + isCrossLogisticsFixedOrProportional +
+ ", isSameLogisticsFixedOrProportional=" + isSameLogisticsFixedOrProportional +
+ ", speMoney=" + speMoney +
+ ", taxiMoney=" + taxiMoney +
+ ", crossLogisticsMoney=" + crossLogisticsMoney +
+ ", sameLogisticsMoney=" + sameLogisticsMoney +
+ ", isNeedFerry=" + isNeedFerry +
+ ", name=" + name +
+ ", type=" + type +
+ ", superiorId=" + superiorId +
+ ", principalName=" + principalName +
+ ", principalPhone=" + principalPhone +
+ ", adminName=" + adminName +
+ ", adminPhone=" + adminPhone +
+ ", urgentPhoen=" + urgentPhoen +
+ ", setupTime=" + setupTime +
+ ", identifier=" + identifier +
+ ", addressCode=" + addressCode +
+ ", businessScope=" + businessScope +
+ ", contactAddress=" + contactAddress +
+ ", documentAddress=" + documentAddress +
+ ", economicType=" + economicType +
+ ", regCapital=" + regCapital +
+ ", legalName=" + legalName +
+ ", legalId=" + legalId +
+ ", legalPhone=" + legalPhone +
+ ", legalPhotoUrl=" + legalPhotoUrl +
+ ", licensingAgency=" + licensingAgency +
+ ", licenseTime=" + licenseTime +
+ ", licenseStartTime=" + licenseStartTime +
+ ", licenseEndTime=" + licenseEndTime +
+ ", licenseNumber=" + licenseNumber +
+ ", carNum=" + carNum +
+ ", driverNum=" + driverNum +
+ ", mac=" + mac +
+ ", state=" + state +
+ ", flag=" + flag +
+ ", upload=" + upload +
+ ", insertTime=" + insertTime +
+ ", detailAddress=" + detailAddress +
+ "}";
+ }
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TCompanyCity.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TCompanyCity.java
new file mode 100644
index 0000000..d1cce29
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TCompanyCity.java
@@ -0,0 +1,110 @@
+package com.stylefeng.guns.modular.system.model;
+
+import com.baomidou.mybatisplus.enums.IdType;
+import com.baomidou.mybatisplus.annotations.TableId;
+import com.baomidou.mybatisplus.activerecord.Model;
+import com.baomidou.mybatisplus.annotations.TableName;
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 公司经营地区
+ * </p>
+ *
+ * @author 吕雪
+ * @since 2020-06-06
+ */
+@TableName("t_company_city")
+public class TCompanyCity extends Model<TCompanyCity> {
+
+ private static final long serialVersionUID = 1L;
+
+ @TableId(value = "id", type = IdType.AUTO)
+ private Integer id;
+ /**
+ * 公司id
+ */
+ private Integer companyId;
+ /**
+ * 省Code
+ */
+ private Integer provinceCode;
+ /**
+ * 市Code
+ */
+ private Integer cityCode;
+ /**
+ * 区Code
+ */
+ private Integer areaCode;
+ /**
+ * 1=正常，2=删除
+ */
+ private Integer state;
+
+
+ public Integer getId() {
+ return id;
+ }
+
+ public void setId(Integer id) {
+ this.id = id;
+ }
+
+ public Integer getCompanyId() {
+ return companyId;
+ }
+
+ public void setCompanyId(Integer companyId) {
+ this.companyId = companyId;
+ }
+
+ public Integer getProvinceCode() {
+ return provinceCode;
+ }
+
+ public void setProvinceCode(Integer provinceCode) {
+ this.provinceCode = provinceCode;
+ }
+
+ public Integer getCityCode() {
+ return cityCode;
+ }
+
+ public void setCityCode(Integer cityCode) {
+ this.cityCode = cityCode;
+ }
+
+ public Integer getAreaCode() {
+ return areaCode;
+ }
+
+ public void setAreaCode(Integer areaCode) {
+ this.areaCode = areaCode;
+ }
+
+ public Integer getState() {
+ return state;
+ }
+
+ public void setState(Integer state) {
+ this.state = state;
+ }
+
+ @Override
+ protected Serializable pkVal() {
+ return this.id;
+ }
+
+ @Override
+ public String toString() {
+ return "TCompanyCity{" +
+ "id=" + id +
+ ", companyId=" + companyId +
+ ", provinceCode=" + provinceCode +
+ ", cityCode=" + cityCode +
+ ", areaCode=" + areaCode +
+ ", state=" + state +
+ "}";
+ }
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TComplaint.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TComplaint.java
new file mode 100644
index 0000000..12c78ec
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TComplaint.java
@@ -0,0 +1,166 @@
+package com.stylefeng.guns.modular.system.model;
+
+import com.baomidou.mybatisplus.enums.IdType;
+import java.util.Date;
+import com.baomidou.mybatisplus.annotations.TableId;
+import com.baomidou.mybatisplus.annotations.TableField;
+import com.baomidou.mybatisplus.activerecord.Model;
+import com.baomidou.mybatisplus.annotations.TableName;
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 投诉管理
+ * </p>
+ *
+ * @author 吕雪
+ * @since 2020-06-09
+ */
+@TableName("t_complaint")
+public class TComplaint extends Model<TComplaint> {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 主键
+ */
+ @TableId(value = "id", type = IdType.AUTO)
+ private Integer id;
+ /**
+ * 用户Id
+ */
+ private Integer userId;
+ /**
+ * 投诉原因
+ */
+ private String reason;
+ /**
+ * 被投诉人Id
+ */
+ private Long driverId;
+ /**
+ * 描述
+ */
+ private String description;
+ /**
+ * 是否处理（0：未处理，1：已处理）
+ */
+ private Integer isHandle;
+ /**
+ * 投诉时间
+ */
+ @TableField("insert_time")
+ private Date insertTime;
+ /**
+ * 处理结果
+ */
+ private String handleResult;
+ /**
+ * 处理人id
+ */
+ private Integer handleUserId;
+ /**
+ * 处理时间
+ */
+ private Date handleTime;
+
+ public Date getHandleTime() {
+ return handleTime;
+ }
+
+ public void setHandleTime(Date handleTime) {
+ this.handleTime = handleTime;
+ }
+
+ public Integer getId() {
+ return id;
+ }
+
+ public void setId(Integer id) {
+ this.id = id;
+ }
+
+ public Integer getUserId() {
+ return userId;
+ }
+
+ public void setUserId(Integer userId) {
+ this.userId = userId;
+ }
+
+ public String getReason() {
+ return reason;
+ }
+
+ public void setReason(String reason) {
+ this.reason = reason;
+ }
+
+ public Long getDriverId() {
+ return driverId;
+ }
+
+ public void setDriverId(Long driverId) {
+ this.driverId = driverId;
+ }
+
+ public String getDescription() {
+ return description;
+ }
+
+ public void setDescription(String description) {
+ this.description = description;
+ }
+
+ public Integer getIsHandle() {
+ return isHandle;
+ }
+
+ public void setIsHandle(Integer isHandle) {
+ this.isHandle = isHandle;
+ }
+
+ public Date getInsertTime() {
+ return insertTime;
+ }
+
+ public void setInsertTime(Date insertTime) {
+ this.insertTime = insertTime;
+ }
+
+ public String getHandleResult() {
+ return handleResult;
+ }
+
+ public void setHandleResult(String handleResult) {
+ this.handleResult = handleResult;
+ }
+
+ public Integer getHandleUserId() {
+ return handleUserId;
+ }
+
+ public void setHandleUserId(Integer handleUserId) {
+ this.handleUserId = handleUserId;
+ }
+
+ @Override
+ protected Serializable pkVal() {
+ return this.id;
+ }
+
+ @Override
+ public String toString() {
+ return "TComplaint{" +
+ "id=" + id +
+ ", userId=" + userId +
+ ", reason=" + reason +
+ ", driverId=" + driverId +
+ ", description=" + description +
+ ", isHandle=" + isHandle +
+ ", insertTime=" + insertTime +
+ ", handleResult=" + handleResult +
+ ", handleUserId=" + handleUserId +
+ "}";
+ }
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TDispatch.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TDispatch.java
new file mode 100644
index 0000000..f765df7
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TDispatch.java
@@ -0,0 +1,176 @@
+package com.stylefeng.guns.modular.system.model;
+
+import java.util.Date;
+import com.baomidou.mybatisplus.activerecord.Model;
+import com.baomidou.mybatisplus.annotations.TableName;
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 调度管理
+ * </p>
+ *
+ * @author 吕雪
+ * @since 2020-09-01
+ */
+@TableName("t_dispatch")
+public class TDispatch extends Model<TDispatch> {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 主键ID
+ */
+ private Integer id;
+ /**
+ * 添加时间
+ */
+ private Date insertTime;
+ /**
+ * 调度名称
+ */
+ private String name;
+ /**
+ * 所属分公司ID
+ */
+ private Integer companyId;
+ /**
+ * 加盟商ID
+ */
+ private Integer franchiseeId;
+ /**
+ * 联系电话
+ */
+ private String phone;
+ /**
+ * 登录账号
+ */
+ private String account;
+ /**
+ * 登录密码 加密方式:MD5 加盐:WL:x9#
+ */
+ private String password;
+ /**
+ * 添加用户ID
+ */
+ private Integer insertUserId;
+ /**
+ * 添加用户角色
+ */
+ private Integer insertUserRole;
+ /**
+ * 状态 1=正常 2=冻结 3=删除
+ */
+ private Integer state;
+
+
+ public Integer getId() {
+ return id;
+ }
+
+ public void setId(Integer id) {
+ this.id = id;
+ }
+
+ public Date getInsertTime() {
+ return insertTime;
+ }
+
+ public void setInsertTime(Date insertTime) {
+ this.insertTime = insertTime;
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ public Integer getCompanyId() {
+ return companyId;
+ }
+
+ public void setCompanyId(Integer companyId) {
+ this.companyId = companyId;
+ }
+
+ public Integer getFranchiseeId() {
+ return franchiseeId;
+ }
+
+ public void setFranchiseeId(Integer franchiseeId) {
+ this.franchiseeId = franchiseeId;
+ }
+
+ public String getPhone() {
+ return phone;
+ }
+
+ public void setPhone(String phone) {
+ this.phone = phone;
+ }
+
+ public String getAccount() {
+ return account;
+ }
+
+ public void setAccount(String account) {
+ this.account = account;
+ }
+
+ public String getPassword() {
+ return password;
+ }
+
+ public void setPassword(String password) {
+ this.password = password;
+ }
+
+ public Integer getInsertUserId() {
+ return insertUserId;
+ }
+
+ public void setInsertUserId(Integer insertUserId) {
+ this.insertUserId = insertUserId;
+ }
+
+ public Integer getInsertUserRole() {
+ return insertUserRole;
+ }
+
+ public void setInsertUserRole(Integer insertUserRole) {
+ this.insertUserRole = insertUserRole;
+ }
+
+ public Integer getState() {
+ return state;
+ }
+
+ public void setState(Integer state) {
+ this.state = state;
+ }
+
+ @Override
+ protected Serializable pkVal() {
+ return this.id;
+ }
+
+ @Override
+ public String toString() {
+ return "TDispatch{" +
+ "id=" + id +
+ ", insertTime=" + insertTime +
+ ", name=" + name +
+ ", companyId=" + companyId +
+ ", franchiseeId=" + franchiseeId +
+ ", phone=" + phone +
+ ", account=" + account +
+ ", password=" + password +
+ ", insertUserId=" + insertUserId +
+ ", insertUserRole=" + insertUserRole +
+ ", state=" + state +
+ "}";
+ }
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TDriver.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TDriver.java
new file mode 100644
index 0000000..211bdef
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TDriver.java
@@ -0,0 +1,870 @@
+package com.stylefeng.guns.modular.system.model;
+
+import com.baomidou.mybatisplus.annotations.TableField;
+import com.baomidou.mybatisplus.enums.IdType;
+
+import java.math.BigDecimal;
+import java.util.Date;
+import com.baomidou.mybatisplus.annotations.TableId;
+import com.baomidou.mybatisplus.activerecord.Model;
+import com.baomidou.mybatisplus.annotations.TableName;
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 司机表
+ * </p>
+ *
+ * @author 吕雪
+ * @since 2020-06-04
+ */
+@TableName("t_driver")
+public class TDriver extends Model<TDriver> {
+
+ private static final long serialVersionUID = 1L;
+
+ @TableId(value = "id", type = IdType.AUTO)
+ private Integer id;
+ /**
+ * 登录账号
+ */
+ private String account;
+ /**
+ * 工号
+ */
+ private String jobNumber;
+ /**
+ * 手机号
+ */
+ private String phone;
+ /**
+ * 密码
+ */
+ private String password;
+ /**
+ * 姓名
+ */
+ private String name;
+ /**
+ * 性别(1=男，2=女)
+ */
+ private Integer sex;
+ /**
+ * 身份证号
+ */
+ private String idCard;
+ /**
+ * 公司id
+ */
+ private Integer companyId;
+ /**
+ * 加盟商ID
+ */
+ private Integer franchiseeId;
+ /**
+ * 头像照片
+ */
+ private String headImgUrl;
+ /**
+ * 人脸识别照片
+ */
+ private String faceImgUrl;
+ /**
+ * 身份证正面照片
+ */
+ private String idCardImgUrl1;
+ /**
+ * 身份证背面照片
+ */
+ private String idCardImgUrl2;
+ /**
+ * 网约车司机注册地行政区域
+ */
+ private String placeOfEmployment;
+ /**
+ * 生日
+ */
+ private Date birthday;
+ /**
+ * 银行卡号
+ */
+ private String bankCardNumber;
+ /**
+ * 国籍
+ */
+ private String driverNationality;
+ /**
+ * 民族
+ */
+ private String driverNation;
+ /**
+ * 婚姻状况（1：未婚，2：已婚，3：离异）
+ */
+ private Integer driverMaritalStatus;
+ /**
+ * 外语能力
+ */
+ private String driverLanguageLevel;
+ /**
+ * 学历
+ */
+ private String driverEducation;
+ /**
+ * 户口登记机关名称
+ */
+ private String driverCensus;
+ /**
+ * 户口地址或常住地址
+ */
+ private String driverAddress;
+ /**
+ * 通信地址
+ */
+ private String driverContactAddress;
+ /**
+ * 驾龄
+ */
+ private Integer driverAge;
+ /**
+ * 驾驶证号
+ */
+ private String driveCard;
+ /**
+ * 驾驶证照片
+ */
+ private String driveCardImgUrl;
+ /**
+ * 准驾车型
+ */
+ private String driverType;
+ /**
+ * 初次领取驾驶证日期
+ */
+ private Date getDriverLicenseDate;
+ /**
+ * 驾驶证有效期限起
+ */
+ private Date driverLicenseOn;
+ /**
+ * 驾驶证有效期限止
+ */
+ private Date driverLicenseOff;
+ /**
+ * 是否巡游出租车驾驶员（0：否，1：是）
+ */
+ private Integer taxiDriver;
+ /**
+ * 出租车资格证号
+ */
+ private String taxiAptitudeCard;
+ /**
+ * 网约车资格证照片
+ */
+ private String networkCarlssueImg;
+ /**
+ * 网络预约出租车驾驶员证发证机构
+ */
+ private String networkCarlssueOrganization;
+ /**
+ * 资格证发证日期
+ */
+ private Date networkCarlssueDate;
+ /**
+ * 初次认领资格证日期
+ */
+ private Date getNetworkCarProofDate;
+ /**
+ * 资格证有效起始日期
+ */
+ private Date networkCarProofOn;
+ /**
+ * 资格证有效截至日期
+ */
+ private Date networkCarProofOff;
+ /**
+ * 报备日期
+ */
+ private Date registerDate;
+ /**
+ * 是否专职驾驶员（0：否，1：是）
+ */
+ private Integer fullTimeDriver;
+ /**
+ * 是否在驾驶员黑名单内（0：否，1：是）
+ */
+ private Integer inDriverBlacklist;
+ /**
+ * 服务类型（1：网络预约出租汽车，2：巡游出租汽车，3：私人小客车合乘）
+ */
+ private Integer commercialType;
+ /**
+ * 驾驶员合同签署公司
+ */
+ private String contractCompany;
+ /**
+ * 合同有效期起
+ */
+ private Date contractOn;
+ /**
+ * 合同有效期止
+ */
+ private Date contractOff;
+ /**
+ * 紧急联系人
+ */
+ private String emergencyContact;
+ /**
+ * 紧急联系电话
+ */
+ private String emergencyContactPhone;
+ /**
+ * 紧急联系地址
+ */
+ private String emergencyContactAddress;
+ /**
+ * 备注
+ */
+ private String remark;
+ /**
+ * 是否是平台车辆(1=是，2=否)
+ */
+ private Integer isPlatCar;
+ /**
+ * 司机管理车辆id
+ */
+ private Integer carId;
+ /**
+ * 状态(1=待审核，2=正常，3=冻结，4=拒绝)
+ */
+ private Integer authState;
+ /**
+ * 司机状态(1=离线，2=空闲，3=服务中)
+ */
+ private Integer state;
+ /**
+ * 1：创建，2：修改，3：删除
+ */
+ private String flag;
+ /**
+ * 添加时间
+ */
+ private Date insertTime;
+ private Integer insertUser;
+ private Date updateTime;
+ private Integer updateUser;
+ /**
+ * 司机来源方式 1=司机注册 2=平台添加 3=分公司添加 4=加盟商添加
+ */
+ private Integer addType;
+ /**
+ * 余额
+ */
+ private BigDecimal balance;
+ /**
+ * 业务总收入
+ * @return
+ */
+ @TableField("businessMoney")
+ private Double businessMoney;
+ /**
+ * 剩余未提现业务总收入
+ * @return
+ */
+ @TableField("laveBusinessMoney")
+ private Double laveBusinessMoney;
+ /**
+ * 添加司机的分公司/加盟商ID
+ */
+ private Integer addObjectId;
+
+ public BigDecimal getBalance() {
+ return balance;
+ }
+
+ public void setBalance(BigDecimal balance) {
+ this.balance = balance;
+ }
+
+ public Integer getAddObjectId() {
+ return addObjectId;
+ }
+
+ public void setAddObjectId(Integer addObjectId) {
+ this.addObjectId = addObjectId;
+ }
+
+ public Integer getFranchiseeId() {
+ return franchiseeId;
+ }
+
+ public void setFranchiseeId(Integer franchiseeId) {
+ this.franchiseeId = franchiseeId;
+ }
+
+ public Integer getId() {
+ return id;
+ }
+
+ public void setId(Integer id) {
+ this.id = id;
+ }
+
+ public String getAccount() {
+ return account;
+ }
+
+ public void setAccount(String account) {
+ this.account = account;
+ }
+
+ public String getJobNumber() {
+ return jobNumber;
+ }
+
+ public void setJobNumber(String jobNumber) {
+ this.jobNumber = jobNumber;
+ }
+
+ public String getPhone() {
+ return phone;
+ }
+
+ public void setPhone(String phone) {
+ this.phone = phone;
+ }
+
+ public String getPassword() {
+ return password;
+ }
+
+ public void setPassword(String password) {
+ this.password = password;
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ public Integer getSex() {
+ return sex;
+ }
+
+ public void setSex(Integer sex) {
+ this.sex = sex;
+ }
+
+ public String getIdCard() {
+ return idCard;
+ }
+
+ public void setIdCard(String idCard) {
+ this.idCard = idCard;
+ }
+
+ public Integer getCompanyId() {
+ return companyId;
+ }
+
+ public void setCompanyId(Integer companyId) {
+ this.companyId = companyId;
+ }
+
+ public String getHeadImgUrl() {
+ return headImgUrl;
+ }
+
+ public void setHeadImgUrl(String headImgUrl) {
+ this.headImgUrl = headImgUrl;
+ }
+
+ public String getFaceImgUrl() {
+ return faceImgUrl;
+ }
+
+ public void setFaceImgUrl(String faceImgUrl) {
+ this.faceImgUrl = faceImgUrl;
+ }
+
+ public String getIdCardImgUrl1() {
+ return idCardImgUrl1;
+ }
+
+ public void setIdCardImgUrl1(String idCardImgUrl1) {
+ this.idCardImgUrl1 = idCardImgUrl1;
+ }
+
+ public String getIdCardImgUrl2() {
+ return idCardImgUrl2;
+ }
+
+ public void setIdCardImgUrl2(String idCardImgUrl2) {
+ this.idCardImgUrl2 = idCardImgUrl2;
+ }
+
+ public String getPlaceOfEmployment() {
+ return placeOfEmployment;
+ }
+
+ public void setPlaceOfEmployment(String placeOfEmployment) {
+ this.placeOfEmployment = placeOfEmployment;
+ }
+
+ public Date getBirthday() {
+ return birthday;
+ }
+
+ public void setBirthday(Date birthday) {
+ this.birthday = birthday;
+ }
+
+ public String getBankCardNumber() {
+ return bankCardNumber;
+ }
+
+ public void setBankCardNumber(String bankCardNumber) {
+ this.bankCardNumber = bankCardNumber;
+ }
+
+ public String getDriverNationality() {
+ return driverNationality;
+ }
+
+ public void setDriverNationality(String driverNationality) {
+ this.driverNationality = driverNationality;
+ }
+
+ public String getDriverNation() {
+ return driverNation;
+ }
+
+ public void setDriverNation(String driverNation) {
+ this.driverNation = driverNation;
+ }
+
+ public Integer getDriverMaritalStatus() {
+ return driverMaritalStatus;
+ }
+
+ public void setDriverMaritalStatus(Integer driverMaritalStatus) {
+ this.driverMaritalStatus = driverMaritalStatus;
+ }
+
+ public String getDriverLanguageLevel() {
+ return driverLanguageLevel;
+ }
+
+ public void setDriverLanguageLevel(String driverLanguageLevel) {
+ this.driverLanguageLevel = driverLanguageLevel;
+ }
+
+ public String getDriverEducation() {
+ return driverEducation;
+ }
+
+ public void setDriverEducation(String driverEducation) {
+ this.driverEducation = driverEducation;
+ }
+
+ public String getDriverCensus() {
+ return driverCensus;
+ }
+
+ public void setDriverCensus(String driverCensus) {
+ this.driverCensus = driverCensus;
+ }
+
+ public String getDriverAddress() {
+ return driverAddress;
+ }
+
+ public void setDriverAddress(String driverAddress) {
+ this.driverAddress = driverAddress;
+ }
+
+ public String getDriverContactAddress() {
+ return driverContactAddress;
+ }
+
+ public void setDriverContactAddress(String driverContactAddress) {
+ this.driverContactAddress = driverContactAddress;
+ }
+
+ public Integer getDriverAge() {
+ return driverAge;
+ }
+
+ public void setDriverAge(Integer driverAge) {
+ this.driverAge = driverAge;
+ }
+
+ public String getDriveCard() {
+ return driveCard;
+ }
+
+ public void setDriveCard(String driveCard) {
+ this.driveCard = driveCard;
+ }
+
+ public String getDriveCardImgUrl() {
+ return driveCardImgUrl;
+ }
+
+ public void setDriveCardImgUrl(String driveCardImgUrl) {
+ this.driveCardImgUrl = driveCardImgUrl;
+ }
+
+ public String getDriverType() {
+ return driverType;
+ }
+
+ public void setDriverType(String driverType) {
+ this.driverType = driverType;
+ }
+
+ public Date getGetDriverLicenseDate() {
+ return getDriverLicenseDate;
+ }
+
+ public void setGetDriverLicenseDate(Date getDriverLicenseDate) {
+ this.getDriverLicenseDate = getDriverLicenseDate;
+ }
+
+ public Date getDriverLicenseOn() {
+ return driverLicenseOn;
+ }
+
+ public void setDriverLicenseOn(Date driverLicenseOn) {
+ this.driverLicenseOn = driverLicenseOn;
+ }
+
+ public Date getDriverLicenseOff() {
+ return driverLicenseOff;
+ }
+
+ public void setDriverLicenseOff(Date driverLicenseOff) {
+ this.driverLicenseOff = driverLicenseOff;
+ }
+
+ public Integer getTaxiDriver() {
+ return taxiDriver;
+ }
+
+ public void setTaxiDriver(Integer taxiDriver) {
+ this.taxiDriver = taxiDriver;
+ }
+
+ public String getTaxiAptitudeCard() {
+ return taxiAptitudeCard;
+ }
+
+ public void setTaxiAptitudeCard(String taxiAptitudeCard) {
+ this.taxiAptitudeCard = taxiAptitudeCard;
+ }
+
+ public String getNetworkCarlssueImg() {
+ return networkCarlssueImg;
+ }
+
+ public void setNetworkCarlssueImg(String networkCarlssueImg) {
+ this.networkCarlssueImg = networkCarlssueImg;
+ }
+
+ public String getNetworkCarlssueOrganization() {
+ return networkCarlssueOrganization;
+ }
+
+ public void setNetworkCarlssueOrganization(String networkCarlssueOrganization) {
+ this.networkCarlssueOrganization = networkCarlssueOrganization;
+ }
+
+ public Date getNetworkCarlssueDate() {
+ return networkCarlssueDate;
+ }
+
+ public void setNetworkCarlssueDate(Date networkCarlssueDate) {
+ this.networkCarlssueDate = networkCarlssueDate;
+ }
+
+ public Date getGetNetworkCarProofDate() {
+ return getNetworkCarProofDate;
+ }
+
+ public void setGetNetworkCarProofDate(Date getNetworkCarProofDate) {
+ this.getNetworkCarProofDate = getNetworkCarProofDate;
+ }
+
+ public Date getNetworkCarProofOn() {
+ return networkCarProofOn;
+ }
+
+ public void setNetworkCarProofOn(Date networkCarProofOn) {
+ this.networkCarProofOn = networkCarProofOn;
+ }
+
+ public Date getNetworkCarProofOff() {
+ return networkCarProofOff;
+ }
+
+ public void setNetworkCarProofOff(Date networkCarProofOff) {
+ this.networkCarProofOff = networkCarProofOff;
+ }
+
+ public Date getRegisterDate() {
+ return registerDate;
+ }
+
+ public void setRegisterDate(Date registerDate) {
+ this.registerDate = registerDate;
+ }
+
+ public Integer getFullTimeDriver() {
+ return fullTimeDriver;
+ }
+
+ public void setFullTimeDriver(Integer fullTimeDriver) {
+ this.fullTimeDriver = fullTimeDriver;
+ }
+
+ public Integer getInDriverBlacklist() {
+ return inDriverBlacklist;
+ }
+
+ public void setInDriverBlacklist(Integer inDriverBlacklist) {
+ this.inDriverBlacklist = inDriverBlacklist;
+ }
+
+ public Integer getCommercialType() {
+ return commercialType;
+ }
+
+ public void setCommercialType(Integer commercialType) {
+ this.commercialType = commercialType;
+ }
+
+ public String getContractCompany() {
+ return contractCompany;
+ }
+
+ public void setContractCompany(String contractCompany) {
+ this.contractCompany = contractCompany;
+ }
+
+ public Date getContractOn() {
+ return contractOn;
+ }
+
+ public void setContractOn(Date contractOn) {
+ this.contractOn = contractOn;
+ }
+
+ public Date getContractOff() {
+ return contractOff;
+ }
+
+ public void setContractOff(Date contractOff) {
+ this.contractOff = contractOff;
+ }
+
+ public String getEmergencyContact() {
+ return emergencyContact;
+ }
+
+ public void setEmergencyContact(String emergencyContact) {
+ this.emergencyContact = emergencyContact;
+ }
+
+ public String getEmergencyContactPhone() {
+ return emergencyContactPhone;
+ }
+
+ public void setEmergencyContactPhone(String emergencyContactPhone) {
+ this.emergencyContactPhone = emergencyContactPhone;
+ }
+
+ public String getEmergencyContactAddress() {
+ return emergencyContactAddress;
+ }
+
+ public void setEmergencyContactAddress(String emergencyContactAddress) {
+ this.emergencyContactAddress = emergencyContactAddress;
+ }
+
+ public String getRemark() {
+ return remark;
+ }
+
+ public void setRemark(String remark) {
+ this.remark = remark;
+ }
+
+ public Integer getIsPlatCar() {
+ return isPlatCar;
+ }
+
+ public void setIsPlatCar(Integer isPlatCar) {
+ this.isPlatCar = isPlatCar;
+ }
+
+ public Integer getCarId() {
+ return carId;
+ }
+
+ public void setCarId(Integer carId) {
+ this.carId = carId;
+ }
+
+ public Integer getAuthState() {
+ return authState;
+ }
+
+ public void setAuthState(Integer authState) {
+ this.authState = authState;
+ }
+
+ public Integer getState() {
+ return state;
+ }
+
+ public void setState(Integer state) {
+ this.state = state;
+ }
+
+ public String getFlag() {
+ return flag;
+ }
+
+ public void setFlag(String flag) {
+ this.flag = flag;
+ }
+
+ public Date getInsertTime() {
+ return insertTime;
+ }
+
+ public void setInsertTime(Date insertTime) {
+ this.insertTime = insertTime;
+ }
+
+ public Integer getInsertUser() {
+ return insertUser;
+ }
+
+ public void setInsertUser(Integer insertUser) {
+ this.insertUser = insertUser;
+ }
+
+ public Date getUpdateTime() {
+ return updateTime;
+ }
+
+ public void setUpdateTime(Date updateTime) {
+ this.updateTime = updateTime;
+ }
+
+ public Integer getUpdateUser() {
+ return updateUser;
+ }
+
+ public void setUpdateUser(Integer updateUser) {
+ this.updateUser = updateUser;
+ }
+
+ public Integer getAddType() {
+ return addType;
+ }
+
+ public void setAddType(Integer addType) {
+ this.addType = addType;
+ }
+
+ public Double getLaveBusinessMoney() {
+ return laveBusinessMoney;
+ }
+
+ public void setLaveBusinessMoney(Double laveBusinessMoney) {
+ this.laveBusinessMoney = laveBusinessMoney;
+ }
+
+ public Double getBusinessMoney() {
+ return businessMoney;
+ }
+
+ public void setBusinessMoney(Double businessMoney) {
+ this.businessMoney = businessMoney;
+ }
+
+ @Override
+ protected Serializable pkVal() {
+ return this.id;
+ }
+
+ @Override
+ public String toString() {
+ return "TDriver{" +
+ "id=" + id +
+ ", account=" + account +
+ ", jobNumber=" + jobNumber +
+ ", phone=" + phone +
+ ", password=" + password +
+ ", name=" + name +
+ ", sex=" + sex +
+ ", idCard=" + idCard +
+ ", companyId=" + companyId +
+ ", headImgUrl=" + headImgUrl +
+ ", faceImgUrl=" + faceImgUrl +
+ ", idCardImgUrl1=" + idCardImgUrl1 +
+ ", idCardImgUrl2=" + idCardImgUrl2 +
+ ", placeOfEmployment=" + placeOfEmployment +
+ ", birthday=" + birthday +
+ ", bankCardNumber=" + bankCardNumber +
+ ", driverNationality=" + driverNationality +
+ ", driverNation=" + driverNation +
+ ", driverMaritalStatus=" + driverMaritalStatus +
+ ", driverLanguageLevel=" + driverLanguageLevel +
+ ", driverEducation=" + driverEducation +
+ ", driverCensus=" + driverCensus +
+ ", driverAddress=" + driverAddress +
+ ", driverContactAddress=" + driverContactAddress +
+ ", driverAge=" + driverAge +
+ ", driveCard=" + driveCard +
+ ", driveCardImgUrl=" + driveCardImgUrl +
+ ", driverType=" + driverType +
+ ", getDriverLicenseDate=" + getDriverLicenseDate +
+ ", driverLicenseOn=" + driverLicenseOn +
+ ", driverLicenseOff=" + driverLicenseOff +
+ ", taxiDriver=" + taxiDriver +
+ ", taxiAptitudeCard=" + taxiAptitudeCard +
+ ", networkCarlssueImg=" + networkCarlssueImg +
+ ", networkCarlssueOrganization=" + networkCarlssueOrganization +
+ ", networkCarlssueDate=" + networkCarlssueDate +
+ ", getNetworkCarProofDate=" + getNetworkCarProofDate +
+ ", networkCarProofOn=" + networkCarProofOn +
+ ", networkCarProofOff=" + networkCarProofOff +
+ ", registerDate=" + registerDate +
+ ", fullTimeDriver=" + fullTimeDriver +
+ ", inDriverBlacklist=" + inDriverBlacklist +
+ ", commercialType=" + commercialType +
+ ", contractCompany=" + contractCompany +
+ ", contractOn=" + contractOn +
+ ", contractOff=" + contractOff +
+ ", emergencyContact=" + emergencyContact +
+ ", emergencyContactPhone=" + emergencyContactPhone +
+ ", emergencyContactAddress=" + emergencyContactAddress +
+ ", remark=" + remark +
+ ", isPlatCar=" + isPlatCar +
+ ", carId=" + carId +
+ ", authState=" + authState +
+ ", state=" + state +
+ ", flag=" + flag +
+ ", insertTime=" + insertTime +
+ ", insertUser=" + insertUser +
+ ", updateTime=" + updateTime +
+ ", updateUser=" + updateUser +
+ ", addType=" + addType +
+ "}";
+ }
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TDriverLine.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TDriverLine.java
new file mode 100644
index 0000000..51ac9d4
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TDriverLine.java
@@ -0,0 +1,93 @@
+package com.stylefeng.guns.modular.system.model;
+
+import java.util.Date;
+import com.baomidou.mybatisplus.activerecord.Model;
+import com.baomidou.mybatisplus.annotations.TableName;
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 司机关联线路
+ * </p>
+ *
+ * @author 吕雪
+ * @since 2020-06-05
+ */
+@TableName("t_driver_line")
+public class TDriverLine extends Model<TDriverLine> {
+
+ private static final long serialVersionUID = 1L;
+
+ private Integer id;
+ /**
+ * 司机id
+ */
+ private Integer driverId;
+ /**
+ * 线路id
+ */
+ private Integer lineId;
+ /**
+ * 创建时间
+ */
+ private Date createTime;
+ /**
+ * 添加时间【后台使用】
+ */
+ private String addTime;
+
+ public String getAddTime() {
+ return addTime;
+ }
+
+ public void setAddTime(String addTime) {
+ this.addTime = addTime;
+ }
+
+ public Integer getId() {
+ return id;
+ }
+
+ public void setId(Integer id) {
+ this.id = id;
+ }
+
+ public Integer getDriverId() {
+ return driverId;
+ }
+
+ public void setDriverId(Integer driverId) {
+ this.driverId = driverId;
+ }
+
+ public Integer getLineId() {
+ return lineId;
+ }
+
+ public void setLineId(Integer lineId) {
+ this.lineId = lineId;
+ }
+
+ public Date getCreateTime() {
+ return createTime;
+ }
+
+ public void setCreateTime(Date createTime) {
+ this.createTime = createTime;
+ }
+
+ @Override
+ protected Serializable pkVal() {
+ return this.id;
+ }
+
+ @Override
+ public String toString() {
+ return "TDriverLine{" +
+ "id=" + id +
+ ", driverId=" + driverId +
+ ", lineId=" + lineId +
+ ", createTime=" + createTime +
+ "}";
+ }
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TDriverService.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TDriverService.java
new file mode 100644
index 0000000..04a6423
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TDriverService.java
@@ -0,0 +1,74 @@
+package com.stylefeng.guns.modular.system.model;
+
+import com.baomidou.mybatisplus.enums.IdType;
+import com.baomidou.mybatisplus.annotations.TableId;
+import com.baomidou.mybatisplus.activerecord.Model;
+import com.baomidou.mybatisplus.annotations.TableName;
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 司机经营业务
+ * </p>
+ *
+ * @author 吕雪
+ * @since 2020-06-05
+ */
+@TableName("t_driver_service")
+public class TDriverService extends Model<TDriverService> {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 主键id
+ */
+ @TableId(value = "id", type = IdType.AUTO)
+ private Integer id;
+ /**
+ * 司机id
+ */
+ private Integer driverId;
+ /**
+ * 类型(1=专车，2=出租车，3=城际，4=小件物流-同城，5=小件物流-跨城，6=包车)
+ */
+ private Integer type;
+
+
+ public Integer getId() {
+ return id;
+ }
+
+ public void setId(Integer id) {
+ this.id = id;
+ }
+
+ public Integer getDriverId() {
+ return driverId;
+ }
+
+ public void setDriverId(Integer driverId) {
+ this.driverId = driverId;
+ }
+
+ public Integer getType() {
+ return type;
+ }
+
+ public void setType(Integer type) {
+ this.type = type;
+ }
+
+ @Override
+ protected Serializable pkVal() {
+ return this.id;
+ }
+
+ @Override
+ public String toString() {
+ return "TDriverService{" +
+ "id=" + id +
+ ", driverId=" + driverId +
+ ", type=" + type +
+ "}";
+ }
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TFeedback.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TFeedback.java
new file mode 100644
index 0000000..e0a1b2d
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TFeedback.java
@@ -0,0 +1,176 @@
+package com.stylefeng.guns.modular.system.model;
+
+import com.baomidou.mybatisplus.enums.IdType;
+import java.util.Date;
+import com.baomidou.mybatisplus.annotations.TableId;
+import com.baomidou.mybatisplus.activerecord.Model;
+import com.baomidou.mybatisplus.annotations.TableName;
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 反馈管理
+ * </p>
+ *
+ * @author 吕雪
+ * @since 2020-06-10
+ */
+@TableName("t_feedback")
+public class TFeedback extends Model<TFeedback> {
+
+ private static final long serialVersionUID = 1L;
+
+ @TableId(value = "id", type = IdType.AUTO)
+ private Integer id;
+ /**
+ * 反馈人ID
+ */
+ private Integer userId;
+ /**
+ * 处理人Id
+ */
+ private Integer handleUserId;
+ /**
+ * 反馈内容
+ */
+ private String content;
+ /**
+ * 反馈时间
+ */
+ private Date insertTime;
+ /**
+ * 图片
+ */
+ private String imgUrl;
+ /**
+ * 状态(1=正常,2=删除)
+ */
+ private Integer flag;
+ /**
+ * 处理状态 1=未处理 2=已处理
+ */
+ private Integer state;
+ /**
+ * 处理时间
+ */
+ private Date cldate;
+ /**
+ * 处理备注
+ */
+ private String remark;
+ /**
+ * 1=用户，2=司机
+ */
+ private Integer type;
+
+
+ public Integer getId() {
+ return id;
+ }
+
+ public void setId(Integer id) {
+ this.id = id;
+ }
+
+ public Integer getUserId() {
+ return userId;
+ }
+
+ public void setUserId(Integer userId) {
+ this.userId = userId;
+ }
+
+ public Integer getHandleUserId() {
+ return handleUserId;
+ }
+
+ public void setHandleUserId(Integer handleUserId) {
+ this.handleUserId = handleUserId;
+ }
+
+ public String getContent() {
+ return content;
+ }
+
+ public void setContent(String content) {
+ this.content = content;
+ }
+
+ public Date getInsertTime() {
+ return insertTime;
+ }
+
+ public void setInsertTime(Date insertTime) {
+ this.insertTime = insertTime;
+ }
+
+ public String getImgUrl() {
+ return imgUrl;
+ }
+
+ public void setImgUrl(String imgUrl) {
+ this.imgUrl = imgUrl;
+ }
+
+ public Integer getFlag() {
+ return flag;
+ }
+
+ public void setFlag(Integer flag) {
+ this.flag = flag;
+ }
+
+ public Integer getState() {
+ return state;
+ }
+
+ public void setState(Integer state) {
+ this.state = state;
+ }
+
+ public Date getCldate() {
+ return cldate;
+ }
+
+ public void setCldate(Date cldate) {
+ this.cldate = cldate;
+ }
+
+ public String getRemark() {
+ return remark;
+ }
+
+ public void setRemark(String remark) {
+ this.remark = remark;
+ }
+
+ public Integer getType() {
+ return type;
+ }
+
+ public void setType(Integer type) {
+ this.type = type;
+ }
+
+ @Override
+ protected Serializable pkVal() {
+ return this.id;
+ }
+
+ @Override
+ public String toString() {
+ return "TFeedback{" +
+ "id=" + id +
+ ", userId=" + userId +
+ ", handleUserId=" + handleUserId +
+ ", content=" + content +
+ ", insertTime=" + insertTime +
+ ", imgUrl=" + imgUrl +
+ ", flag=" + flag +
+ ", state=" + state +
+ ", cldate=" + cldate +
+ ", remark=" + remark +
+ ", type=" + type +
+ "}";
+ }
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TIntegralGoods.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TIntegralGoods.java
new file mode 100644
index 0000000..055b19d
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TIntegralGoods.java
@@ -0,0 +1,153 @@
+package com.stylefeng.guns.modular.system.model;
+
+import com.baomidou.mybatisplus.enums.IdType;
+import java.util.Date;
+import com.baomidou.mybatisplus.annotations.TableId;
+import com.baomidou.mybatisplus.activerecord.Model;
+import com.baomidou.mybatisplus.annotations.TableName;
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 积分商品管理
+ * </p>
+ *
+ * @author 吕雪
+ * @since 2020-09-02
+ */
+@TableName("t_integral_goods")
+public class TIntegralGoods extends Model<TIntegralGoods> {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 主键ID
+ */
+ @TableId(value = "id", type = IdType.AUTO)
+ private Integer id;
+ /**
+ * 添加时间
+ */
+ private Date insertTime;
+ /**
+ * 商品名称
+ */
+ private String name;
+ /**
+ * 商品图片
+ */
+ private String imgUrl;
+ /**
+ * 兑换积分
+ */
+ private Integer integral;
+ /**
+ * 商品说明
+ */
+ private String instructions;
+ /**
+ * 状态 1=正常 2=已下架 3=删除
+ */
+ private Integer state;
+ /**
+ * 添加用户ID
+ */
+ private Integer insertUserId;
+ /**
+ * 添加用户角色
+ */
+ private Integer insertUserRole;
+
+
+ public Integer getId() {
+ return id;
+ }
+
+ public void setId(Integer id) {
+ this.id = id;
+ }
+
+ public Date getInsertTime() {
+ return insertTime;
+ }
+
+ public void setInsertTime(Date insertTime) {
+ this.insertTime = insertTime;
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ public String getImgUrl() {
+ return imgUrl;
+ }
+
+ public void setImgUrl(String imgUrl) {
+ this.imgUrl = imgUrl;
+ }
+
+ public Integer getIntegral() {
+ return integral;
+ }
+
+ public void setIntegral(Integer integral) {
+ this.integral = integral;
+ }
+
+ public String getInstructions() {
+ return instructions;
+ }
+
+ public void setInstructions(String instructions) {
+ this.instructions = instructions;
+ }
+
+ public Integer getState() {
+ return state;
+ }
+
+ public void setState(Integer state) {
+ this.state = state;
+ }
+
+ public Integer getInsertUserId() {
+ return insertUserId;
+ }
+
+ public void setInsertUserId(Integer insertUserId) {
+ this.insertUserId = insertUserId;
+ }
+
+ public Integer getInsertUserRole() {
+ return insertUserRole;
+ }
+
+ public void setInsertUserRole(Integer insertUserRole) {
+ this.insertUserRole = insertUserRole;
+ }
+
+ @Override
+ protected Serializable pkVal() {
+ return this.id;
+ }
+
+ @Override
+ public String toString() {
+ return "TIntegralGoods{" +
+ "id=" + id +
+ ", insertTime=" + insertTime +
+ ", name=" + name +
+ ", imgUrl=" + imgUrl +
+ ", integral=" + integral +
+ ", instructions=" + instructions +
+ ", state=" + state +
+ ", insertUserId=" + insertUserId +
+ ", insertUserRole=" + insertUserRole +
+ "}";
+ }
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TIntegralOrder.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TIntegralOrder.java
new file mode 100644
index 0000000..04d9472
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TIntegralOrder.java
@@ -0,0 +1,166 @@
+package com.stylefeng.guns.modular.system.model;
+
+import com.baomidou.mybatisplus.enums.IdType;
+import java.util.Date;
+import com.baomidou.mybatisplus.annotations.TableId;
+import com.baomidou.mybatisplus.activerecord.Model;
+import com.baomidou.mybatisplus.annotations.TableName;
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 积分订单管理
+ * </p>
+ *
+ * @author 吕雪
+ * @since 2020-09-02
+ */
+@TableName("t_integral_order")
+public class TIntegralOrder extends Model<TIntegralOrder> {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 主键ID
+ */
+ @TableId(value = "id", type = IdType.AUTO)
+ private Integer id;
+ /**
+ * 兑换时间
+ */
+ private Date insertTime;
+ /**
+ * 兑换用户ID
+ */
+ private Integer userId;
+ /**
+ * 兑换商品ID
+ */
+ private Integer goodsId;
+ /**
+ * 兑换数量
+ */
+ private Integer num;
+ /**
+ * 收货人
+ */
+ private String consigneeName;
+ /**
+ * 收货人联系电话
+ */
+ private String consigneePhone;
+ /**
+ * 收货人收货地址
+ */
+ private String consigneeAddress;
+ /**
+ * 备注
+ */
+ private String remark;
+ /**
+ * 状态 1=未处理 2=已处理 3=已删除
+ */
+ private Integer state;
+
+
+ public Integer getId() {
+ return id;
+ }
+
+ public void setId(Integer id) {
+ this.id = id;
+ }
+
+ public Date getInsertTime() {
+ return insertTime;
+ }
+
+ public void setInsertTime(Date insertTime) {
+ this.insertTime = insertTime;
+ }
+
+ public Integer getUserId() {
+ return userId;
+ }
+
+ public void setUserId(Integer userId) {
+ this.userId = userId;
+ }
+
+ public Integer getGoodsId() {
+ return goodsId;
+ }
+
+ public void setGoodsId(Integer goodsId) {
+ this.goodsId = goodsId;
+ }
+
+ public Integer getNum() {
+ return num;
+ }
+
+ public void setNum(Integer num) {
+ this.num = num;
+ }
+
+ public String getConsigneeName() {
+ return consigneeName;
+ }
+
+ public void setConsigneeName(String consigneeName) {
+ this.consigneeName = consigneeName;
+ }
+
+ public String getConsigneePhone() {
+ return consigneePhone;
+ }
+
+ public void setConsigneePhone(String consigneePhone) {
+ this.consigneePhone = consigneePhone;
+ }
+
+ public String getConsigneeAddress() {
+ return consigneeAddress;
+ }
+
+ public void setConsigneeAddress(String consigneeAddress) {
+ this.consigneeAddress = consigneeAddress;
+ }
+
+ public String getRemark() {
+ return remark;
+ }
+
+ public void setRemark(String remark) {
+ this.remark = remark;
+ }
+
+ public Integer getState() {
+ return state;
+ }
+
+ public void setState(Integer state) {
+ this.state = state;
+ }
+
+ @Override
+ protected Serializable pkVal() {
+ return this.id;
+ }
+
+ @Override
+ public String toString() {
+ return "TIntegralOrder{" +
+ "id=" + id +
+ ", insertTime=" + insertTime +
+ ", userId=" + userId +
+ ", goodsId=" + goodsId +
+ ", num=" + num +
+ ", consigneeName=" + consigneeName +
+ ", consigneePhone=" + consigneePhone +
+ ", consigneeAddress=" + consigneeAddress +
+ ", remark=" + remark +
+ ", state=" + state +
+ "}";
+ }
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TInvoice.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TInvoice.java
new file mode 100644
index 0000000..89ec877
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TInvoice.java
@@ -0,0 +1,212 @@
+package com.stylefeng.guns.modular.system.model;
+
+import java.util.Date;
+import com.baomidou.mybatisplus.activerecord.Model;
+import com.baomidou.mybatisplus.annotations.TableName;
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 发票
+ * </p>
+ *
+ * @author 吕雪
+ * @since 2020-06-09
+ */
+@TableName("t_invoice")
+public class TInvoice extends Model<TInvoice> {
+
+ private static final long serialVersionUID = 1L;
+
+ private Integer id;
+ /**
+ * 开票金额
+ */
+ private Double money;
+ /**
+ * 开票订单数量
+ */
+ private Integer orderNum;
+ /**
+ * 开票类型（1=个人发票，2=单位发票）
+ */
+ private Integer type;
+ /**
+ * 抬头名称（公司名称/个人姓名）
+ */
+ private String name;
+ /**
+ * 税号
+ */
+ private String code;
+ /**
+ * 发票内容
+ */
+ private String content;
+ /**
+ * 备注
+ */
+ private String remark;
+ /**
+ * 地址+电话
+ */
+ private String address;
+ /**
+ * 开户行+账号
+ */
+ private String bank;
+ /**
+ * 邮箱
+ */
+ private String email;
+ /**
+ * 开票用户id
+ */
+ private Integer userId;
+ /**
+ * 状态（1=待开票，2=成功，3=失败）
+ */
+ private Integer state;
+ /**
+ * 申请时间
+ */
+ private Date insertTime;
+
+
+ public Integer getId() {
+ return id;
+ }
+
+ public void setId(Integer id) {
+ this.id = id;
+ }
+
+ public Double getMoney() {
+ return money;
+ }
+
+ public void setMoney(Double money) {
+ this.money = money;
+ }
+
+ public Integer getOrderNum() {
+ return orderNum;
+ }
+
+ public void setOrderNum(Integer orderNum) {
+ this.orderNum = orderNum;
+ }
+
+ public Integer getType() {
+ return type;
+ }
+
+ public void setType(Integer type) {
+ this.type = type;
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ public String getCode() {
+ return code;
+ }
+
+ public void setCode(String code) {
+ this.code = code;
+ }
+
+ public String getContent() {
+ return content;
+ }
+
+ public void setContent(String content) {
+ this.content = content;
+ }
+
+ public String getRemark() {
+ return remark;
+ }
+
+ public void setRemark(String remark) {
+ this.remark = remark;
+ }
+
+ public String getAddress() {
+ return address;
+ }
+
+ public void setAddress(String address) {
+ this.address = address;
+ }
+
+ public String getBank() {
+ return bank;
+ }
+
+ public void setBank(String bank) {
+ this.bank = bank;
+ }
+
+ public String getEmail() {
+ return email;
+ }
+
+ public void setEmail(String email) {
+ this.email = email;
+ }
+
+ public Integer getUserId() {
+ return userId;
+ }
+
+ public void setUserId(Integer userId) {
+ this.userId = userId;
+ }
+
+ public Integer getState() {
+ return state;
+ }
+
+ public void setState(Integer state) {
+ this.state = state;
+ }
+
+ public Date getInsertTime() {
+ return insertTime;
+ }
+
+ public void setInsertTime(Date insertTime) {
+ this.insertTime = insertTime;
+ }
+
+ @Override
+ protected Serializable pkVal() {
+ return this.id;
+ }
+
+ @Override
+ public String toString() {
+ return "TInvoice{" +
+ "id=" + id +
+ ", money=" + money +
+ ", orderNum=" + orderNum +
+ ", type=" + type +
+ ", name=" + name +
+ ", code=" + code +
+ ", content=" + content +
+ ", remark=" + remark +
+ ", address=" + address +
+ ", bank=" + bank +
+ ", email=" + email +
+ ", userId=" + userId +
+ ", state=" + state +
+ ", insertTime=" + insertTime +
+ "}";
+ }
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TLine.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TLine.java
new file mode 100644
index 0000000..f443a19
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TLine.java
@@ -0,0 +1,125 @@
+package com.stylefeng.guns.modular.system.model;
+
+import com.baomidou.mybatisplus.enums.IdType;
+import java.util.Date;
+import com.baomidou.mybatisplus.annotations.TableId;
+import com.baomidou.mybatisplus.activerecord.Model;
+import com.baomidou.mybatisplus.annotations.TableName;
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 跨城线路
+ * </p>
+ *
+ * @author 吕雪
+ * @since 2020-09-15
+ */
+@TableName("t_line")
+public class TLine extends Model<TLine> {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 主键
+ */
+ @TableId(value = "id", type = IdType.AUTO)
+ private Integer id;
+ /**
+ * 线路名称
+ */
+ private String name;
+ /**
+ * 排班申请间隔（分钟）
+ */
+ private Integer shiftInterval;
+ /**
+ * 抽成比例（80）
+ */
+ private Integer rakeRate;
+ /**
+ * 状态（1=正常，2=冻结，3=删除）
+ */
+ private Integer state;
+ /**
+ * 添加时间
+ */
+ private Date insertTime;
+ /**
+ * 创建者ID
+ */
+ private Integer insertUserId;
+
+ public Integer getInsertUserId() {
+ return insertUserId;
+ }
+
+ public void setInsertUserId(Integer insertUserId) {
+ this.insertUserId = insertUserId;
+ }
+
+ public Integer getId() {
+ return id;
+ }
+
+ public void setId(Integer id) {
+ this.id = id;
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ public Integer getShiftInterval() {
+ return shiftInterval;
+ }
+
+ public void setShiftInterval(Integer shiftInterval) {
+ this.shiftInterval = shiftInterval;
+ }
+
+ public Integer getRakeRate() {
+ return rakeRate;
+ }
+
+ public void setRakeRate(Integer rakeRate) {
+ this.rakeRate = rakeRate;
+ }
+
+ public Integer getState() {
+ return state;
+ }
+
+ public void setState(Integer state) {
+ this.state = state;
+ }
+
+ public Date getInsertTime() {
+ return insertTime;
+ }
+
+ public void setInsertTime(Date insertTime) {
+ this.insertTime = insertTime;
+ }
+
+ @Override
+ protected Serializable pkVal() {
+ return this.id;
+ }
+
+ @Override
+ public String toString() {
+ return "TLine{" +
+ "id=" + id +
+ ", name=" + name +
+ ", shiftInterval=" + shiftInterval +
+ ", rakeRate=" + rakeRate +
+ ", state=" + state +
+ ", insertTime=" + insertTime +
+ "}";
+ }
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TLineCompany.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TLineCompany.java
new file mode 100644
index 0000000..414cb76
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TLineCompany.java
@@ -0,0 +1,101 @@
+package com.stylefeng.guns.modular.system.model;
+
+import com.baomidou.mybatisplus.enums.IdType;
+import java.util.Date;
+import com.baomidou.mybatisplus.annotations.TableId;
+import com.baomidou.mybatisplus.activerecord.Model;
+import com.baomidou.mybatisplus.annotations.TableName;
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 企业-线路关系表
+ * </p>
+ *
+ * @author 吕雪
+ * @since 2020-09-16
+ */
+@TableName("t_line_company")
+public class TLineCompany extends Model<TLineCompany> {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 主键ID
+ */
+ @TableId(value = "id", type = IdType.AUTO)
+ private Integer id;
+ /**
+ * 线路ID
+ */
+ private Integer lineId;
+ /**
+ * 企业ID
+ */
+ private Integer companyId;
+ /**
+ * 添加时间
+ */
+ private Date insertTime;
+ /**
+ * 添加用户ID
+ */
+ private Integer insertUserId;
+
+
+ public Integer getId() {
+ return id;
+ }
+
+ public void setId(Integer id) {
+ this.id = id;
+ }
+
+ public Integer getLineId() {
+ return lineId;
+ }
+
+ public void setLineId(Integer lineId) {
+ this.lineId = lineId;
+ }
+
+ public Integer getCompanyId() {
+ return companyId;
+ }
+
+ public void setCompanyId(Integer companyId) {
+ this.companyId = companyId;
+ }
+
+ public Date getInsertTime() {
+ return insertTime;
+ }
+
+ public void setInsertTime(Date insertTime) {
+ this.insertTime = insertTime;
+ }
+
+ public Integer getInsertUserId() {
+ return insertUserId;
+ }
+
+ public void setInsertUserId(Integer insertUserId) {
+ this.insertUserId = insertUserId;
+ }
+
+ @Override
+ protected Serializable pkVal() {
+ return this.id;
+ }
+
+ @Override
+ public String toString() {
+ return "TLineCompany{" +
+ "id=" + id +
+ ", lineId=" + lineId +
+ ", companyId=" + companyId +
+ ", insertTime=" + insertTime +
+ ", insertUserId=" + insertUserId +
+ "}";
+ }
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TLinePrice.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TLinePrice.java
new file mode 100644
index 0000000..50d6bc9
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TLinePrice.java
@@ -0,0 +1,151 @@
+package com.stylefeng.guns.modular.system.model;
+
+import com.baomidou.mybatisplus.enums.IdType;
+import java.util.Date;
+import com.baomidou.mybatisplus.annotations.TableId;
+import com.baomidou.mybatisplus.activerecord.Model;
+import com.baomidou.mybatisplus.annotations.TableName;
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 跨城线路价格规则
+ * </p>
+ *
+ * @author 吕雪
+ * @since 2020-09-16
+ */
+@TableName("t_line_price")
+public class TLinePrice extends Model<TLinePrice> {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 主键
+ */
+ @TableId(value = "id", type = IdType.AUTO)
+ private Integer id;
+ /**
+ * 线路id
+ */
+ private Integer lineId;
+ /**
+ * 服务车型id
+ */
+ private Integer serverCarModelId;
+ /**
+ * 价格类型（1=固定金额，2=浮动金额）
+ */
+ private Integer type;
+ /**
+ * 价格规则json对象字符串{“num1”:1,"num2":1.3}
+ */
+ private String content;
+ /**
+ * 封装内容【后台使用】
+ */
+ private String contentStr;
+ /**
+ * 状态（1=正常，2=冻结，3=删除）
+ */
+ private Integer state;
+ /**
+ * 添加时间
+ */
+ private Date insertTime;
+ /**
+ * 添加时间【后端使用】
+ */
+ private String addTime;
+
+ public String getAddTime() {
+ return addTime;
+ }
+
+ public void setAddTime(String addTime) {
+ this.addTime = addTime;
+ }
+
+ public Integer getId() {
+ return id;
+ }
+
+ public void setId(Integer id) {
+ this.id = id;
+ }
+
+ public Integer getLineId() {
+ return lineId;
+ }
+
+ public void setLineId(Integer lineId) {
+ this.lineId = lineId;
+ }
+
+ public Integer getServerCarModelId() {
+ return serverCarModelId;
+ }
+
+ public void setServerCarModelId(Integer serverCarModelId) {
+ this.serverCarModelId = serverCarModelId;
+ }
+
+ public Integer getType() {
+ return type;
+ }
+
+ public void setType(Integer type) {
+ this.type = type;
+ }
+
+ public String getContent() {
+ return content;
+ }
+
+ public void setContent(String content) {
+ this.content = content;
+ }
+
+ public String getContentStr() {
+ return contentStr;
+ }
+
+ public void setContentStr(String contentStr) {
+ this.contentStr = contentStr;
+ }
+
+ public Integer getState() {
+ return state;
+ }
+
+ public void setState(Integer state) {
+ this.state = state;
+ }
+
+ public Date getInsertTime() {
+ return insertTime;
+ }
+
+ public void setInsertTime(Date insertTime) {
+ this.insertTime = insertTime;
+ }
+
+ @Override
+ protected Serializable pkVal() {
+ return this.id;
+ }
+
+ @Override
+ public String toString() {
+ return "TLinePrice{" +
+ "id=" + id +
+ ", lineId=" + lineId +
+ ", serverCarModelId=" + serverCarModelId +
+ ", type=" + type +
+ ", content=" + content +
+ ", contentStr=" + contentStr +
+ ", state=" + state +
+ ", insertTime=" + insertTime +
+ "}";
+ }
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TLineShift.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TLineShift.java
new file mode 100644
index 0000000..f0e9da4
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TLineShift.java
@@ -0,0 +1,138 @@
+package com.stylefeng.guns.modular.system.model;
+
+import com.baomidou.mybatisplus.enums.IdType;
+import java.util.Date;
+import com.baomidou.mybatisplus.annotations.TableId;
+import com.baomidou.mybatisplus.activerecord.Model;
+import com.baomidou.mybatisplus.annotations.TableName;
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 线路班次
+ * </p>
+ *
+ * @author 吕雪
+ * @since 2020-09-16
+ */
+@TableName("t_line_shift")
+public class TLineShift extends Model<TLineShift> {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 主键
+ */
+ @TableId(value = "id", type = IdType.AUTO)
+ private Integer id;
+ /**
+ * 线路id
+ */
+ private Integer lineId;
+ /**
+ * 开始时间段（12:00）
+ */
+ private String startTime;
+ /**
+ * 结束时间段（14:00）
+ */
+ private String endTime;
+ /**
+ * 车次数
+ */
+ private Integer carNum;
+ /**
+ * 状态（1=正常，2=冻结，3=删除）
+ */
+ private Integer state;
+ /**
+ * 添加时间
+ */
+ private Date insertTime;
+ /**
+ * 添加时间【后端使用】
+ */
+ private String addTime;
+
+ public String getAddTime() {
+ return addTime;
+ }
+
+ public void setAddTime(String addTime) {
+ this.addTime = addTime;
+ }
+
+ public Integer getId() {
+ return id;
+ }
+
+ public void setId(Integer id) {
+ this.id = id;
+ }
+
+ public Integer getLineId() {
+ return lineId;
+ }
+
+ public void setLineId(Integer lineId) {
+ this.lineId = lineId;
+ }
+
+ public String getStartTime() {
+ return startTime;
+ }
+
+ public void setStartTime(String startTime) {
+ this.startTime = startTime;
+ }
+
+ public String getEndTime() {
+ return endTime;
+ }
+
+ public void setEndTime(String endTime) {
+ this.endTime = endTime;
+ }
+
+ public Integer getCarNum() {
+ return carNum;
+ }
+
+ public void setCarNum(Integer carNum) {
+ this.carNum = carNum;
+ }
+
+ public Integer getState() {
+ return state;
+ }
+
+ public void setState(Integer state) {
+ this.state = state;
+ }
+
+ public Date getInsertTime() {
+ return insertTime;
+ }
+
+ public void setInsertTime(Date insertTime) {
+ this.insertTime = insertTime;
+ }
+
+ @Override
+ protected Serializable pkVal() {
+ return this.id;
+ }
+
+ @Override
+ public String toString() {
+ return "TLineShift{" +
+ "id=" + id +
+ ", lineId=" + lineId +
+ ", startTime=" + startTime +
+ ", endTime=" + endTime +
+ ", carNum=" + carNum +
+ ", state=" + state +
+ ", insertTime=" + insertTime +
+ "}";
+ }
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TLineSite.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TLineSite.java
new file mode 100644
index 0000000..7ee09d5
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TLineSite.java
@@ -0,0 +1,87 @@
+package com.stylefeng.guns.modular.system.model;
+
+import com.baomidou.mybatisplus.enums.IdType;
+import com.baomidou.mybatisplus.annotations.TableId;
+import com.baomidou.mybatisplus.activerecord.Model;
+import com.baomidou.mybatisplus.annotations.TableName;
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 线路-站点关系表
+ * </p>
+ *
+ * @author 吕雪
+ * @since 2020-09-16
+ */
+@TableName("t_line_site")
+public class TLineSite extends Model<TLineSite> {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 主键
+ */
+ @TableId(value = "id", type = IdType.AUTO)
+ private Integer id;
+ /**
+ * 线路id
+ */
+ private Integer lineId;
+ /**
+ * 站点id
+ */
+ private Integer siteId;
+ /**
+ * 类型（1=起点，2=终点）
+ */
+ private Integer type;
+
+
+ public Integer getId() {
+ return id;
+ }
+
+ public void setId(Integer id) {
+ this.id = id;
+ }
+
+ public Integer getLineId() {
+ return lineId;
+ }
+
+ public void setLineId(Integer lineId) {
+ this.lineId = lineId;
+ }
+
+ public Integer getSiteId() {
+ return siteId;
+ }
+
+ public void setSiteId(Integer siteId) {
+ this.siteId = siteId;
+ }
+
+ public Integer getType() {
+ return type;
+ }
+
+ public void setType(Integer type) {
+ this.type = type;
+ }
+
+ @Override
+ protected Serializable pkVal() {
+ return this.id;
+ }
+
+ @Override
+ public String toString() {
+ return "TLineSite{" +
+ "id=" + id +
+ ", lineId=" + lineId +
+ ", siteId=" + siteId +
+ ", type=" + type +
+ "}";
+ }
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TLocation.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TLocation.java
new file mode 100644
index 0000000..26498b7
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TLocation.java
@@ -0,0 +1,243 @@
+package com.stylefeng.guns.modular.system.model;
+
+import com.baomidou.mybatisplus.enums.IdType;
+import java.util.Date;
+import com.baomidou.mybatisplus.annotations.TableId;
+import com.baomidou.mybatisplus.activerecord.Model;
+import com.baomidou.mybatisplus.annotations.TableName;
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 地点
+ * </p>
+ *
+ * @author 吕雪
+ * @since 2020-09-04
+ */
+@TableName("t_location")
+public class TLocation extends Model<TLocation> {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 主键
+ */
+ @TableId(value = "id", type = IdType.AUTO)
+ private Integer id;
+ /**
+ * 站点id
+ */
+ private Integer siteId;
+ /**
+ * 区域名称
+ */
+ private String name;
+ /**
+ * 地点类型（1=行政区域，2=电子围栏）
+ */
+ private Integer type;
+ /**
+ * 省名称
+ */
+ private String province;
+ /**
+ * 省编号
+ */
+ private String provinceCode;
+ /**
+ * 市名称
+ */
+ private String city;
+ /**
+ * 市编号
+ */
+ private String cityCode;
+ /**
+ * 区县名称
+ */
+ private String district;
+ /**
+ * 区县编号
+ */
+ private String districtCode;
+ /**
+ * 电子围栏坐标，多组以下划线分隔;
+ */
+ private String coordinate;
+ /**
+ * 电子围栏gid，多组以下划线分隔
+ */
+ private String gid;
+ /**
+ * 电子围栏更新时间
+ */
+ private Date updateTime;
+ /**
+ * 状态（1=正常，2=冻结，3=删除）
+ */
+ private Integer state;
+ /**
+ * 添加时间
+ */
+ private Date insertTime;
+ /**
+ * 添加时间【后端使用】
+ */
+ private String addTime;
+
+ public String getAddTime() {
+ return addTime;
+ }
+
+ public void setAddTime(String addTime) {
+ this.addTime = addTime;
+ }
+
+ public Integer getId() {
+ return id;
+ }
+
+ public void setId(Integer id) {
+ this.id = id;
+ }
+
+ public Integer getSiteId() {
+ return siteId;
+ }
+
+ public void setSiteId(Integer siteId) {
+ this.siteId = siteId;
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ public Integer getType() {
+ return type;
+ }
+
+ public void setType(Integer type) {
+ this.type = type;
+ }
+
+ public String getProvince() {
+ return province;
+ }
+
+ public void setProvince(String province) {
+ this.province = province;
+ }
+
+ public String getProvinceCode() {
+ return provinceCode;
+ }
+
+ public void setProvinceCode(String provinceCode) {
+ this.provinceCode = provinceCode;
+ }
+
+ public String getCity() {
+ return city;
+ }
+
+ public void setCity(String city) {
+ this.city = city;
+ }
+
+ public String getCityCode() {
+ return cityCode;
+ }
+
+ public void setCityCode(String cityCode) {
+ this.cityCode = cityCode;
+ }
+
+ public String getDistrict() {
+ return district;
+ }
+
+ public void setDistrict(String district) {
+ this.district = district;
+ }
+
+ public String getDistrictCode() {
+ return districtCode;
+ }
+
+ public void setDistrictCode(String districtCode) {
+ this.districtCode = districtCode;
+ }
+
+ public String getCoordinate() {
+ return coordinate;
+ }
+
+ public void setCoordinate(String coordinate) {
+ this.coordinate = coordinate;
+ }
+
+ public String getGid() {
+ return gid;
+ }
+
+ public void setGid(String gid) {
+ this.gid = gid;
+ }
+
+ public Date getUpdateTime() {
+ return updateTime;
+ }
+
+ public void setUpdateTime(Date updateTime) {
+ this.updateTime = updateTime;
+ }
+
+ public Integer getState() {
+ return state;
+ }
+
+ public void setState(Integer state) {
+ this.state = state;
+ }
+
+ public Date getInsertTime() {
+ return insertTime;
+ }
+
+ public void setInsertTime(Date insertTime) {
+ this.insertTime = insertTime;
+ }
+
+ @Override
+ protected Serializable pkVal() {
+ return this.id;
+ }
+
+ @Override
+ public String toString() {
+ return "TLocation{" +
+ "id=" + id +
+ ", siteId=" + siteId +
+ ", name='" + name + '\'' +
+ ", type=" + type +
+ ", province='" + province + '\'' +
+ ", provinceCode='" + provinceCode + '\'' +
+ ", city='" + city + '\'' +
+ ", cityCode='" + cityCode + '\'' +
+ ", district='" + district + '\'' +
+ ", districtCode='" + districtCode + '\'' +
+ ", coordinate='" + coordinate + '\'' +
+ ", gid='" + gid + '\'' +
+ ", updateTime=" + updateTime +
+ ", state=" + state +
+ ", insertTime=" + insertTime +
+ ", addTime='" + addTime + '\'' +
+ '}';
+ }
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TNotices.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TNotices.java
new file mode 100644
index 0000000..2efcc96
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TNotices.java
@@ -0,0 +1,228 @@
+package com.stylefeng.guns.modular.system.model;
+
+import com.baomidou.mybatisplus.enums.IdType;
+import java.util.Date;
+import com.baomidou.mybatisplus.annotations.TableId;
+import com.baomidou.mybatisplus.activerecord.Model;
+import com.baomidou.mybatisplus.annotations.TableName;
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 发布公告和滚动消息
+ * </p>
+ *
+ * @author 吕雪
+ * @since 2020-06-10
+ */
+@TableName("t_notices")
+public class TNotices extends Model<TNotices> {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 主键id
+ */
+ @TableId(value = "id", type = IdType.AUTO)
+ private Integer id;
+ /**
+ * 标题
+ */
+ private String title;
+ /**
+ * 内容
+ */
+ private String content;
+ /**
+ * 排序
+ */
+ private Integer sort;
+ /**
+ * 是否显示/发布(1=是，2=否)
+ */
+ private Integer isShow;
+ /**
+ * 是否播报(1=是，2=否）
+ */
+ private Integer isBroadcast;
+ /**
+ * 公告类型(1=滚动消息，2=公告)
+ */
+ private Integer type;
+ /**
+ * 图片路径
+ */
+ private String imgUrl;
+ /**
+ * 1：创建，2：修改，3：删除
+ */
+ private String flag;
+ private Date insertTime;
+ private Integer insertUser;
+ private Date updateTime;
+ private Integer updateUser;
+ /**
+ * 是否删除 1=否 2=是
+ */
+ private Integer isDelete;
+ /**
+ * 是否发布用户 1=否 2=是
+ */
+ private Integer isUser;
+ /**
+ * 是否发布司机 1=否 2=是
+ */
+ private Integer isDriver;
+
+ public Integer getIsUser() {
+ return isUser;
+ }
+
+ public void setIsUser(Integer isUser) {
+ this.isUser = isUser;
+ }
+
+ public Integer getIsDriver() {
+ return isDriver;
+ }
+
+ public void setIsDriver(Integer isDriver) {
+ this.isDriver = isDriver;
+ }
+
+ public Integer getIsDelete() {
+ return isDelete;
+ }
+
+ public void setIsDelete(Integer isDelete) {
+ this.isDelete = isDelete;
+ }
+
+ public Integer getId() {
+ return id;
+ }
+
+ public void setId(Integer id) {
+ this.id = id;
+ }
+
+ public String getTitle() {
+ return title;
+ }
+
+ public void setTitle(String title) {
+ this.title = title;
+ }
+
+ public String getContent() {
+ return content;
+ }
+
+ public void setContent(String content) {
+ this.content = content;
+ }
+
+ public Integer getSort() {
+ return sort;
+ }
+
+ public void setSort(Integer sort) {
+ this.sort = sort;
+ }
+
+ public Integer getIsShow() {
+ return isShow;
+ }
+
+ public void setIsShow(Integer isShow) {
+ this.isShow = isShow;
+ }
+
+ public Integer getIsBroadcast() {
+ return isBroadcast;
+ }
+
+ public void setIsBroadcast(Integer isBroadcast) {
+ this.isBroadcast = isBroadcast;
+ }
+
+ public Integer getType() {
+ return type;
+ }
+
+ public void setType(Integer type) {
+ this.type = type;
+ }
+
+ public String getImgUrl() {
+ return imgUrl;
+ }
+
+ public void setImgUrl(String imgUrl) {
+ this.imgUrl = imgUrl;
+ }
+
+ public String getFlag() {
+ return flag;
+ }
+
+ public void setFlag(String flag) {
+ this.flag = flag;
+ }
+
+ public Date getInsertTime() {
+ return insertTime;
+ }
+
+ public void setInsertTime(Date insertTime) {
+ this.insertTime = insertTime;
+ }
+
+ public Integer getInsertUser() {
+ return insertUser;
+ }
+
+ public void setInsertUser(Integer insertUser) {
+ this.insertUser = insertUser;
+ }
+
+ public Date getUpdateTime() {
+ return updateTime;
+ }
+
+ public void setUpdateTime(Date updateTime) {
+ this.updateTime = updateTime;
+ }
+
+ public Integer getUpdateUser() {
+ return updateUser;
+ }
+
+ public void setUpdateUser(Integer updateUser) {
+ this.updateUser = updateUser;
+ }
+
+ @Override
+ protected Serializable pkVal() {
+ return this.id;
+ }
+
+ @Override
+ public String toString() {
+ return "TNotices{" +
+ "id=" + id +
+ ", title=" + title +
+ ", content=" + content +
+ ", sort=" + sort +
+ ", isShow=" + isShow +
+ ", isBroadcast=" + isBroadcast +
+ ", type=" + type +
+ ", imgUrl=" + imgUrl +
+ ", flag=" + flag +
+ ", insertTime=" + insertTime +
+ ", insertUser=" + insertUser +
+ ", updateTime=" + updateTime +
+ ", updateUser=" + updateUser +
+ "}";
+ }
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TOpenCity.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TOpenCity.java
new file mode 100644
index 0000000..674f3fe
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TOpenCity.java
@@ -0,0 +1,219 @@
+package com.stylefeng.guns.modular.system.model;
+
+import com.baomidou.mybatisplus.enums.IdType;
+import java.util.Date;
+import com.baomidou.mybatisplus.annotations.TableId;
+import com.baomidou.mybatisplus.activerecord.Model;
+import com.baomidou.mybatisplus.annotations.TableName;
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 开通城市表
+ * </p>
+ *
+ * @author 吕雪
+ * @since 2020-06-02
+ */
+@TableName("t_open_city")
+public class TOpenCity extends Model<TOpenCity> {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 主键id
+ */
+ @TableId(value = "id", type = IdType.AUTO)
+ private Integer id;
+ /**
+ * 城市code(6位)
+ */
+ private String code;
+ /**
+ * 经度
+ */
+ private Double lon;
+ /**
+ * 纬度
+ */
+ private Double lat;
+ /**
+ * 是否需要网约车资格(1=是，2=否)
+ */
+ private Integer isQualifications;
+ /**
+ * 省份名称
+ */
+ private Integer areaId;
+ private String areaName;
+ /**
+ * 市名称
+ */
+ private Integer cityId;
+ private String cityName;
+ /**
+ * 区县名称
+ */
+ private Integer provinceId;
+ private String provinceName;
+ /**
+ * 1：创建，2：修改，3：删除
+ */
+ private String flag;
+ private Date insertTime;
+ private Integer insertUser;
+ private Date updateTime;
+ private Integer updateUser;
+
+ public Integer getAreaId() {
+ return areaId;
+ }
+
+ public void setAreaId(Integer areaId) {
+ this.areaId = areaId;
+ }
+
+ public Integer getCityId() {
+ return cityId;
+ }
+
+ public void setCityId(Integer cityId) {
+ this.cityId = cityId;
+ }
+
+ public Integer getProvinceId() {
+ return provinceId;
+ }
+
+ public void setProvinceId(Integer provinceId) {
+ this.provinceId = provinceId;
+ }
+
+ public Integer getId() {
+ return id;
+ }
+
+ public void setId(Integer id) {
+ this.id = id;
+ }
+
+ public String getCode() {
+ return code;
+ }
+
+ public void setCode(String code) {
+ this.code = code;
+ }
+
+ public Double getLon() {
+ return lon;
+ }
+
+ public void setLon(Double lon) {
+ this.lon = lon;
+ }
+
+ public Double getLat() {
+ return lat;
+ }
+
+ public void setLat(Double lat) {
+ this.lat = lat;
+ }
+
+ public Integer getIsQualifications() {
+ return isQualifications;
+ }
+
+ public void setIsQualifications(Integer isQualifications) {
+ this.isQualifications = isQualifications;
+ }
+
+ public String getAreaName() {
+ return areaName;
+ }
+
+ public void setAreaName(String areaName) {
+ this.areaName = areaName;
+ }
+
+ public String getCityName() {
+ return cityName;
+ }
+
+ public void setCityName(String cityName) {
+ this.cityName = cityName;
+ }
+
+ public String getProvinceName() {
+ return provinceName;
+ }
+
+ public void setProvinceName(String provinceName) {
+ this.provinceName = provinceName;
+ }
+
+ public String getFlag() {
+ return flag;
+ }
+
+ public void setFlag(String flag) {
+ this.flag = flag;
+ }
+
+ public Date getInsertTime() {
+ return insertTime;
+ }
+
+ public void setInsertTime(Date insertTime) {
+ this.insertTime = insertTime;
+ }
+
+ public Integer getInsertUser() {
+ return insertUser;
+ }
+
+ public void setInsertUser(Integer insertUser) {
+ this.insertUser = insertUser;
+ }
+
+ public Date getUpdateTime() {
+ return updateTime;
+ }
+
+ public void setUpdateTime(Date updateTime) {
+ this.updateTime = updateTime;
+ }
+
+ public Integer getUpdateUser() {
+ return updateUser;
+ }
+
+ public void setUpdateUser(Integer updateUser) {
+ this.updateUser = updateUser;
+ }
+
+ @Override
+ protected Serializable pkVal() {
+ return this.id;
+ }
+
+ @Override
+ public String toString() {
+ return "TOpenCity{" +
+ "id=" + id +
+ ", code=" + code +
+ ", lon=" + lon +
+ ", lat=" + lat +
+ ", isQualifications=" + isQualifications +
+ ", areaName=" + areaName +
+ ", cityName=" + cityName +
+ ", provinceName=" + provinceName +
+ ", flag=" + flag +
+ ", insertTime=" + insertTime +
+ ", insertUser=" + insertUser +
+ ", updateTime=" + updateTime +
+ ", updateUser=" + updateUser +
+ "}";
+ }
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TOpenCityBusiness.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TOpenCityBusiness.java
new file mode 100644
index 0000000..ca775f8
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TOpenCityBusiness.java
@@ -0,0 +1,141 @@
+package com.stylefeng.guns.modular.system.model;
+
+import com.baomidou.mybatisplus.enums.IdType;
+import java.util.Date;
+import com.baomidou.mybatisplus.annotations.TableId;
+import com.baomidou.mybatisplus.activerecord.Model;
+import com.baomidou.mybatisplus.annotations.TableName;
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 开通城市经营业务
+ * </p>
+ *
+ * @author 吕雪
+ * @since 2020-06-02
+ */
+@TableName("t_open_city_business")
+public class TOpenCityBusiness extends Model<TOpenCityBusiness> {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 主键id
+ */
+ @TableId(value = "id", type = IdType.AUTO)
+ private Integer id;
+ /**
+ * 开通城市id
+ */
+ private Integer openCityId;
+ /**
+ * 业务类型(1=专车，2=出租车，3=跨城出行，4=同城小件物流，5=跨城小件物流，6=包车)
+ */
+ private Integer businessType;
+ /**
+ * 排序
+ */
+ private Integer sort;
+ /**
+ * 1：创建，2：修改，3：删除
+ */
+ private String flag;
+ private Date insertTime;
+ private Integer insertUser;
+ private Date updateTime;
+ private Integer updateUser;
+
+
+ public Integer getId() {
+ return id;
+ }
+
+ public void setId(Integer id) {
+ this.id = id;
+ }
+
+ public Integer getOpenCityId() {
+ return openCityId;
+ }
+
+ public void setOpenCityId(Integer openCityId) {
+ this.openCityId = openCityId;
+ }
+
+ public Integer getBusinessType() {
+ return businessType;
+ }
+
+ public void setBusinessType(Integer businessType) {
+ this.businessType = businessType;
+ }
+
+ public Integer getSort() {
+ return sort;
+ }
+
+ public void setSort(Integer sort) {
+ this.sort = sort;
+ }
+
+ public String getFlag() {
+ return flag;
+ }
+
+ public void setFlag(String flag) {
+ this.flag = flag;
+ }
+
+ public Date getInsertTime() {
+ return insertTime;
+ }
+
+ public void setInsertTime(Date insertTime) {
+ this.insertTime = insertTime;
+ }
+
+ public Integer getInsertUser() {
+ return insertUser;
+ }
+
+ public void setInsertUser(Integer insertUser) {
+ this.insertUser = insertUser;
+ }
+
+ public Date getUpdateTime() {
+ return updateTime;
+ }
+
+ public void setUpdateTime(Date updateTime) {
+ this.updateTime = updateTime;
+ }
+
+ public Integer getUpdateUser() {
+ return updateUser;
+ }
+
+ public void setUpdateUser(Integer updateUser) {
+ this.updateUser = updateUser;
+ }
+
+ @Override
+ protected Serializable pkVal() {
+ return this.id;
+ }
+
+ @Override
+ public String toString() {
+ return "TOpenCityBusiness{" +
+ "id=" + id +
+ ", openCityId=" + openCityId +
+ ", businessType=" + businessType +
+ ", sort=" + sort +
+ ", flag=" + flag +
+ ", insertTime=" + insertTime +
+ ", insertUser=" + insertUser +
+ ", updateTime=" + updateTime +
+ ", updateUser=" + updateUser +
+ "}";
+ }
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TOrderCharter.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TOrderCharter.java
new file mode 100644
index 0000000..f6fdf74
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TOrderCharter.java
@@ -0,0 +1,166 @@
+package com.stylefeng.guns.modular.system.model;
+
+import com.baomidou.mybatisplus.enums.IdType;
+import java.util.Date;
+import com.baomidou.mybatisplus.annotations.TableId;
+import com.baomidou.mybatisplus.activerecord.Model;
+import com.baomidou.mybatisplus.annotations.TableName;
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 包车订单
+ * </p>
+ *
+ * @author 吕雪
+ * @since 2020-09-02
+ */
+@TableName("t_order_charter")
+public class TOrderCharter extends Model<TOrderCharter> {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 主键ID
+ */
+ @TableId(value = "id", type = IdType.AUTO)
+ private Integer id;
+ /**
+ * 提交时间
+ */
+ private Date insertTime;
+ /**
+ * 用户ID
+ */
+ private Integer userId;
+ /**
+ * 用车时间
+ */
+ private Date useTime;
+ /**
+ * 用车时长
+ */
+ private String useDuration;
+ /**
+ * 用车需求
+ */
+ private String useDemand;
+ /**
+ * 联系人
+ */
+ private String contactName;
+ /**
+ * 联系电话
+ */
+ private String contactPhone;
+ /**
+ * 处理备注
+ */
+ private String remark;
+ /**
+ * 状态 1=未处理 2=已处理 3=已删除
+ */
+ private Integer state;
+
+
+ public Integer getId() {
+ return id;
+ }
+
+ public void setId(Integer id) {
+ this.id = id;
+ }
+
+ public Date getInsertTime() {
+ return insertTime;
+ }
+
+ public void setInsertTime(Date insertTime) {
+ this.insertTime = insertTime;
+ }
+
+ public Integer getUserId() {
+ return userId;
+ }
+
+ public void setUserId(Integer userId) {
+ this.userId = userId;
+ }
+
+ public Date getUseTime() {
+ return useTime;
+ }
+
+ public void setUseTime(Date useTime) {
+ this.useTime = useTime;
+ }
+
+ public String getUseDuration() {
+ return useDuration;
+ }
+
+ public void setUseDuration(String useDuration) {
+ this.useDuration = useDuration;
+ }
+
+ public String getUseDemand() {
+ return useDemand;
+ }
+
+ public void setUseDemand(String useDemand) {
+ this.useDemand = useDemand;
+ }
+
+ public String getContactName() {
+ return contactName;
+ }
+
+ public void setContactName(String contactName) {
+ this.contactName = contactName;
+ }
+
+ public String getContactPhone() {
+ return contactPhone;
+ }
+
+ public void setContactPhone(String contactPhone) {
+ this.contactPhone = contactPhone;
+ }
+
+ public String getRemark() {
+ return remark;
+ }
+
+ public void setRemark(String remark) {
+ this.remark = remark;
+ }
+
+ public Integer getState() {
+ return state;
+ }
+
+ public void setState(Integer state) {
+ this.state = state;
+ }
+
+ @Override
+ protected Serializable pkVal() {
+ return this.id;
+ }
+
+ @Override
+ public String toString() {
+ return "TOrderCharter{" +
+ "id=" + id +
+ ", insertTime=" + insertTime +
+ ", userId=" + userId +
+ ", useTime=" + useTime +
+ ", useDuration=" + useDuration +
+ ", useDemand=" + useDemand +
+ ", contactName=" + contactName +
+ ", contactPhone=" + contactPhone +
+ ", remark=" + remark +
+ ", state=" + state +
+ "}";
+ }
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TOrderCharteredCar.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TOrderCharteredCar.java
new file mode 100644
index 0000000..2ff78a0
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TOrderCharteredCar.java
@@ -0,0 +1,225 @@
+package com.stylefeng.guns.modular.system.model;
+
+import java.util.Date;
+import com.baomidou.mybatisplus.activerecord.Model;
+import com.baomidou.mybatisplus.annotations.TableName;
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 订单-包车
+ * </p>
+ *
+ * @author 吕雪
+ * @since 2020-09-24
+ */
+@TableName("t_order_chartered_car")
+public class TOrderCharteredCar extends Model<TOrderCharteredCar> {
+
+ private static final long serialVersionUID = 1L;
+
+ private Integer id;
+ /**
+ * 用户id
+ */
+ private Integer userId;
+ /**
+ * 企业id
+ */
+ private Integer companyId;
+ /**
+ * 订单编号
+ */
+ private String orderNumber;
+ /**
+ * 出行时间
+ */
+ private Date traveltime;
+ /**
+ * 用车时长（天）
+ */
+ private Integer carTime;
+ /**
+ * 服务车型id
+ */
+ private Integer serverCarModelId;
+ /**
+ * 车型用途
+ */
+ private String modelUse;
+ /**
+ * 乘车人数
+ */
+ private Integer peopleNumber;
+ /**
+ * 联系人
+ */
+ private String contactPerson;
+ /**
+ * 联系电话
+ */
+ private String contactPhone;
+ /**
+ * 订单状态（1=待处理，2=已处理）
+ */
+ private Integer state;
+ /**
+ * 处理备注
+ */
+ private String remark;
+ /**
+ * 删除状态（1=否，2=是）
+ */
+ private Integer isDelete;
+ /**
+ * 添加时间
+ */
+ private Date insertTime;
+
+
+ public Integer getId() {
+ return id;
+ }
+
+ public void setId(Integer id) {
+ this.id = id;
+ }
+
+ public Integer getUserId() {
+ return userId;
+ }
+
+ public void setUserId(Integer userId) {
+ this.userId = userId;
+ }
+
+ public Integer getCompanyId() {
+ return companyId;
+ }
+
+ public void setCompanyId(Integer companyId) {
+ this.companyId = companyId;
+ }
+
+ public String getOrderNumber() {
+ return orderNumber;
+ }
+
+ public void setOrderNumber(String orderNumber) {
+ this.orderNumber = orderNumber;
+ }
+
+ public Date getTraveltime() {
+ return traveltime;
+ }
+
+ public void setTraveltime(Date traveltime) {
+ this.traveltime = traveltime;
+ }
+
+ public Integer getCarTime() {
+ return carTime;
+ }
+
+ public void setCarTime(Integer carTime) {
+ this.carTime = carTime;
+ }
+
+ public Integer getServerCarModelId() {
+ return serverCarModelId;
+ }
+
+ public void setServerCarModelId(Integer serverCarModelId) {
+ this.serverCarModelId = serverCarModelId;
+ }
+
+ public String getModelUse() {
+ return modelUse;
+ }
+
+ public void setModelUse(String modelUse) {
+ this.modelUse = modelUse;
+ }
+
+ public Integer getPeopleNumber() {
+ return peopleNumber;
+ }
+
+ public void setPeopleNumber(Integer peopleNumber) {
+ this.peopleNumber = peopleNumber;
+ }
+
+ public String getContactPerson() {
+ return contactPerson;
+ }
+
+ public void setContactPerson(String contactPerson) {
+ this.contactPerson = contactPerson;
+ }
+
+ public String getContactPhone() {
+ return contactPhone;
+ }
+
+ public void setContactPhone(String contactPhone) {
+ this.contactPhone = contactPhone;
+ }
+
+ public Integer getState() {
+ return state;
+ }
+
+ public void setState(Integer state) {
+ this.state = state;
+ }
+
+ public String getRemark() {
+ return remark;
+ }
+
+ public void setRemark(String remark) {
+ this.remark = remark;
+ }
+
+ public Integer getIsDelete() {
+ return isDelete;
+ }
+
+ public void setIsDelete(Integer isDelete) {
+ this.isDelete = isDelete;
+ }
+
+ public Date getInsertTime() {
+ return insertTime;
+ }
+
+ public void setInsertTime(Date insertTime) {
+ this.insertTime = insertTime;
+ }
+
+ @Override
+ protected Serializable pkVal() {
+ return this.id;
+ }
+
+ @Override
+ public String toString() {
+ return "TOrderCharteredCar{" +
+ "id=" + id +
+ ", userId=" + userId +
+ ", companyId=" + companyId +
+ ", orderNumber=" + orderNumber +
+ ", traveltime=" + traveltime +
+ ", carTime=" + carTime +
+ ", serverCarModelId=" + serverCarModelId +
+ ", modelUse=" + modelUse +
+ ", peopleNumber=" + peopleNumber +
+ ", contactPerson=" + contactPerson +
+ ", contactPhone=" + contactPhone +
+ ", state=" + state +
+ ", remark=" + remark +
+ ", isDelete=" + isDelete +
+ ", insertTime=" + insertTime +
+ "}";
+ }
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TOrderCrossCity.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TOrderCrossCity.java
new file mode 100644
index 0000000..6780793
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TOrderCrossCity.java
@@ -0,0 +1,818 @@
+package com.stylefeng.guns.modular.system.model;
+
+import com.baomidou.mybatisplus.annotations.TableField;
+import com.baomidou.mybatisplus.enums.IdType;
+import java.math.BigDecimal;
+import java.util.Date;
+import com.baomidou.mybatisplus.annotations.TableId;
+import com.baomidou.mybatisplus.activerecord.Model;
+import com.baomidou.mybatisplus.annotations.TableName;
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 订单-跨城
+ * </p>
+ *
+ * @author 吕雪
+ * @since 2020-09-16
+ */
+@TableName("t_order_cross_city")
+public class TOrderCrossCity extends Model<TOrderCrossCity> {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 主键id
+ */
+ @TableId(value = "id", type = IdType.AUTO)
+ private Integer id;
+ /**
+ * 用户id
+ */
+ private Integer userId;
+ /**
+ * 接单司机ID
+ */
+ private Integer driverId;
+ /**
+ * 线路id
+ */
+ private Integer lineId;
+ /**
+ * 预约班次的id
+ */
+ @TableField("lineShiftDriverId")
+ private Integer lineShiftDriverId;
+ /**
+ * 车辆id
+ */
+ private Integer carId;
+ /**
+ * 服务车型id关联t_server_carmodel表
+ */
+ private Integer serverCarModelId;
+ /**
+ * 订单号
+ */
+ private String orderNum;
+ /**
+ * 下单地点经度
+ */
+ private Double placementLon;
+ /**
+ * 下单地点纬度
+ */
+ private Double placementLat;
+ /**
+ * 下单地点
+ */
+ private String placementAddress;
+ /**
+ * 出发地经度值
+ */
+ private Double startLon;
+ /**
+ * 出发地纬度值
+ */
+ private Double startLat;
+ /**
+ * 目的地经度
+ */
+ private Double endLon;
+ /**
+ * 出发地地点
+ */
+ private String startAddress;
+ /**
+ * 目的地纬度
+ */
+ private Double endLat;
+ /**
+ * 目的地地点
+ */
+ private String endAddress;
+ /**
+ * 上车点经度
+ */
+ private Double boardingLon;
+ /**
+ * 上车点纬度
+ */
+ private Double boardingLat;
+ /**
+ * 上车点
+ */
+ private String boardingAddress;
+ /**
+ * 上车时间
+ */
+ private Date boardingTime;
+ /**
+ * 下车点经度
+ */
+ private Double getoffLon;
+ /**
+ * 下车点纬度
+ */
+ private Double getoffLat;
+ /**
+ * 下车地点
+ */
+ private String getoffAddress;
+ /**
+ * 下车时间
+ */
+ private Date getoffTime;
+ /**
+ * 行驶里程数（米）
+ */
+ private Double mileage;
+ /**
+ * 支付方式（1=OK平台支付，2=其他方式支付）
+ */
+ private Integer payManner;
+ /**
+ * 支付方式(1=微信，2=支付宝，3=其他)
+ */
+ private Integer payType;
+ /**
+ * 订单金额
+ */
+ private BigDecimal orderMoney;
+ /**
+ * 红包抵扣金额
+ */
+ private BigDecimal redPacketMoney;
+ /**
+ * 优惠券抵扣金额
+ */
+ private BigDecimal couponMoney;
+ /**
+ * 红包记录id
+ */
+ private Integer redPacketId;
+ /**
+ * 优惠券id
+ */
+ private Integer couponId;
+ /**
+ * 折扣
+ */
+ private Double discount;
+ /**
+ * 折扣优惠金额
+ */
+ private Double discountMoney;
+ /**
+ * 折扣活动id
+ */
+ private Integer activityId;
+ /**
+ * 公司id
+ */
+ private Integer companyId;
+ /**
+ * 支付金额
+ */
+ private BigDecimal payMoney;
+ /**
+ * 出行人数
+ */
+ @TableField("peopleNumber")
+ private Integer peopleNumber;
+ /**
+ * 座位编号
+ */
+ @TableField("seatNumber")
+ private String seatNumber;
+ /**
+ * 乘车人
+ */
+ private String passengers;
+ /**
+ * 乘车人电话
+ */
+ private String passengersPhone;
+ /**
+ * 排序
+ */
+ private Integer sort;
+ /**
+ * 下单时间
+ */
+ private Date insertTime;
+ /**
+ * 出行时间
+ */
+ private Date travelTime;
+ /**
+ * 抢单时间
+ */
+ private Date snatchOrderTime;
+ /**
+ * 司机点出发时间
+ */
+ private Date setOutTime;
+ /**
+ * 司机到达预约地点时间
+ */
+ private Date arriveTime;
+ /**
+ * 开始服务时间
+ */
+ private Date startServiceTime;
+ /**
+ * 结束服务时间
+ */
+ private Date endServiceTime;
+ /**
+ * 出行方式（1=拼车，2=包车）
+ */
+ private Integer travelMode;
+ /**
+ * 下单方式（1：APP下单，2：扫码下单，3：小程序下单，4：司机下单，5：调度下单）
+ */
+ private Integer orderSource;
+ /**
+ * 发票id
+ */
+ private Integer invoiceId;
+ /**
+ * 高德猎鹰上的轨迹id
+ */
+ private String trackId;
+ /**
+ * 状态(1=待接单，2=待出发，3=待到达预约地点，4=待乘客上车，5=服务中，6=完成服务，7=待支付，8=待评价，9=已完成，10=已取消，11=改派中，12=取消待支付)
+ */
+ private Integer state;
+ /**
+ * 是否是改派订单（1=否，2=是）
+ */
+ private Integer isReassign;
+ /**
+ * 是否删除 1=否 2=是
+ */
+ private Integer isDelete;
+ /**
+ * 状态(改派前订单状态)
+ */
+ private Integer oldState;
+ /**
+ * 移动小号
+ */
+ private String telX;
+ /**
+ * 移动小号绑定关系id
+ */
+ private String bindId;
+
+ public Integer getOldState() {
+ return oldState;
+ }
+
+ public void setOldState(Integer oldState) {
+ this.oldState = oldState;
+ }
+
+ public Integer getId() {
+ return id;
+ }
+
+ public void setId(Integer id) {
+ this.id = id;
+ }
+
+ public Integer getUserId() {
+ return userId;
+ }
+
+ public void setUserId(Integer userId) {
+ this.userId = userId;
+ }
+
+ public Integer getDriverId() {
+ return driverId;
+ }
+
+ public void setDriverId(Integer driverId) {
+ this.driverId = driverId;
+ }
+
+ public Integer getLineId() {
+ return lineId;
+ }
+
+ public void setLineId(Integer lineId) {
+ this.lineId = lineId;
+ }
+
+ public Integer getLineShiftDriverId() {
+ return lineShiftDriverId;
+ }
+
+ public void setLineShiftDriverId(Integer lineShiftDriverId) {
+ this.lineShiftDriverId = lineShiftDriverId;
+ }
+
+ public Integer getCarId() {
+ return carId;
+ }
+
+ public void setCarId(Integer carId) {
+ this.carId = carId;
+ }
+
+ public Integer getServerCarModelId() {
+ return serverCarModelId;
+ }
+
+ public void setServerCarModelId(Integer serverCarModelId) {
+ this.serverCarModelId = serverCarModelId;
+ }
+
+ public String getOrderNum() {
+ return orderNum;
+ }
+
+ public void setOrderNum(String orderNum) {
+ this.orderNum = orderNum;
+ }
+
+ public Double getPlacementLon() {
+ return placementLon;
+ }
+
+ public void setPlacementLon(Double placementLon) {
+ this.placementLon = placementLon;
+ }
+
+ public Double getPlacementLat() {
+ return placementLat;
+ }
+
+ public void setPlacementLat(Double placementLat) {
+ this.placementLat = placementLat;
+ }
+
+ public String getPlacementAddress() {
+ return placementAddress;
+ }
+
+ public void setPlacementAddress(String placementAddress) {
+ this.placementAddress = placementAddress;
+ }
+
+ public Double getStartLon() {
+ return startLon;
+ }
+
+ public void setStartLon(Double startLon) {
+ this.startLon = startLon;
+ }
+
+ public Double getStartLat() {
+ return startLat;
+ }
+
+ public void setStartLat(Double startLat) {
+ this.startLat = startLat;
+ }
+
+ public Double getEndLon() {
+ return endLon;
+ }
+
+ public void setEndLon(Double endLon) {
+ this.endLon = endLon;
+ }
+
+ public String getStartAddress() {
+ return startAddress;
+ }
+
+ public void setStartAddress(String startAddress) {
+ this.startAddress = startAddress;
+ }
+
+ public Double getEndLat() {
+ return endLat;
+ }
+
+ public void setEndLat(Double endLat) {
+ this.endLat = endLat;
+ }
+
+ public String getEndAddress() {
+ return endAddress;
+ }
+
+ public void setEndAddress(String endAddress) {
+ this.endAddress = endAddress;
+ }
+
+ public Double getBoardingLon() {
+ return boardingLon;
+ }
+
+ public void setBoardingLon(Double boardingLon) {
+ this.boardingLon = boardingLon;
+ }
+
+ public Double getBoardingLat() {
+ return boardingLat;
+ }
+
+ public void setBoardingLat(Double boardingLat) {
+ this.boardingLat = boardingLat;
+ }
+
+ public String getBoardingAddress() {
+ return boardingAddress;
+ }
+
+ public void setBoardingAddress(String boardingAddress) {
+ this.boardingAddress = boardingAddress;
+ }
+
+ public Date getBoardingTime() {
+ return boardingTime;
+ }
+
+ public void setBoardingTime(Date boardingTime) {
+ this.boardingTime = boardingTime;
+ }
+
+ public Double getGetoffLon() {
+ return getoffLon;
+ }
+
+ public void setGetoffLon(Double getoffLon) {
+ this.getoffLon = getoffLon;
+ }
+
+ public Double getGetoffLat() {
+ return getoffLat;
+ }
+
+ public void setGetoffLat(Double getoffLat) {
+ this.getoffLat = getoffLat;
+ }
+
+ public String getGetoffAddress() {
+ return getoffAddress;
+ }
+
+ public void setGetoffAddress(String getoffAddress) {
+ this.getoffAddress = getoffAddress;
+ }
+
+ public Date getGetoffTime() {
+ return getoffTime;
+ }
+
+ public void setGetoffTime(Date getoffTime) {
+ this.getoffTime = getoffTime;
+ }
+
+ public Double getMileage() {
+ return mileage;
+ }
+
+ public void setMileage(Double mileage) {
+ this.mileage = mileage;
+ }
+
+ public Integer getPayManner() {
+ return payManner;
+ }
+
+ public void setPayManner(Integer payManner) {
+ this.payManner = payManner;
+ }
+
+ public Integer getPayType() {
+ return payType;
+ }
+
+ public void setPayType(Integer payType) {
+ this.payType = payType;
+ }
+
+ public BigDecimal getOrderMoney() {
+ return orderMoney;
+ }
+
+ public void setOrderMoney(BigDecimal orderMoney) {
+ this.orderMoney = orderMoney;
+ }
+
+ public BigDecimal getRedPacketMoney() {
+ return redPacketMoney;
+ }
+
+ public void setRedPacketMoney(BigDecimal redPacketMoney) {
+ this.redPacketMoney = redPacketMoney;
+ }
+
+ public BigDecimal getCouponMoney() {
+ return couponMoney;
+ }
+
+ public void setCouponMoney(BigDecimal couponMoney) {
+ this.couponMoney = couponMoney;
+ }
+
+ public Integer getRedPacketId() {
+ return redPacketId;
+ }
+
+ public void setRedPacketId(Integer redPacketId) {
+ this.redPacketId = redPacketId;
+ }
+
+ public Integer getCouponId() {
+ return couponId;
+ }
+
+ public void setCouponId(Integer couponId) {
+ this.couponId = couponId;
+ }
+
+ public Double getDiscount() {
+ return discount;
+ }
+
+ public void setDiscount(Double discount) {
+ this.discount = discount;
+ }
+
+ public Double getDiscountMoney() {
+ return discountMoney;
+ }
+
+ public void setDiscountMoney(Double discountMoney) {
+ this.discountMoney = discountMoney;
+ }
+
+ public Integer getActivityId() {
+ return activityId;
+ }
+
+ public void setActivityId(Integer activityId) {
+ this.activityId = activityId;
+ }
+
+ public Integer getCompanyId() {
+ return companyId;
+ }
+
+ public void setCompanyId(Integer companyId) {
+ this.companyId = companyId;
+ }
+
+ public BigDecimal getPayMoney() {
+ return payMoney;
+ }
+
+ public void setPayMoney(BigDecimal payMoney) {
+ this.payMoney = payMoney;
+ }
+
+ public String getPassengers() {
+ return passengers;
+ }
+
+ public void setPassengers(String passengers) {
+ this.passengers = passengers;
+ }
+
+ public String getPassengersPhone() {
+ return passengersPhone;
+ }
+
+ public void setPassengersPhone(String passengersPhone) {
+ this.passengersPhone = passengersPhone;
+ }
+
+ public Integer getSort() {
+ return sort;
+ }
+
+ public void setSort(Integer sort) {
+ this.sort = sort;
+ }
+
+ public Date getInsertTime() {
+ return insertTime;
+ }
+
+ public void setInsertTime(Date insertTime) {
+ this.insertTime = insertTime;
+ }
+
+ public Date getTravelTime() {
+ return travelTime;
+ }
+
+ public void setTravelTime(Date travelTime) {
+ this.travelTime = travelTime;
+ }
+
+ public Date getSnatchOrderTime() {
+ return snatchOrderTime;
+ }
+
+ public void setSnatchOrderTime(Date snatchOrderTime) {
+ this.snatchOrderTime = snatchOrderTime;
+ }
+
+ public Date getSetOutTime() {
+ return setOutTime;
+ }
+
+ public void setSetOutTime(Date setOutTime) {
+ this.setOutTime = setOutTime;
+ }
+
+ public Date getArriveTime() {
+ return arriveTime;
+ }
+
+ public void setArriveTime(Date arriveTime) {
+ this.arriveTime = arriveTime;
+ }
+
+ public Date getStartServiceTime() {
+ return startServiceTime;
+ }
+
+ public void setStartServiceTime(Date startServiceTime) {
+ this.startServiceTime = startServiceTime;
+ }
+
+ public Date getEndServiceTime() {
+ return endServiceTime;
+ }
+
+ public void setEndServiceTime(Date endServiceTime) {
+ this.endServiceTime = endServiceTime;
+ }
+
+ public Integer getTravelMode() {
+ return travelMode;
+ }
+
+ public void setTravelMode(Integer travelMode) {
+ this.travelMode = travelMode;
+ }
+
+ public Integer getOrderSource() {
+ return orderSource;
+ }
+
+ public void setOrderSource(Integer orderSource) {
+ this.orderSource = orderSource;
+ }
+
+ public Integer getInvoiceId() {
+ return invoiceId;
+ }
+
+ public void setInvoiceId(Integer invoiceId) {
+ this.invoiceId = invoiceId;
+ }
+
+ public String getTrackId() {
+ return trackId;
+ }
+
+ public void setTrackId(String trackId) {
+ this.trackId = trackId;
+ }
+
+ public Integer getState() {
+ return state;
+ }
+
+ public void setState(Integer state) {
+ this.state = state;
+ }
+
+ public Integer getIsDelete() {
+ return isDelete;
+ }
+
+ public void setIsDelete(Integer isDelete) {
+ this.isDelete = isDelete;
+ }
+
+ public String getTelX() {
+ return telX;
+ }
+
+ public void setTelX(String telX) {
+ this.telX = telX;
+ }
+
+ public String getBindId() {
+ return bindId;
+ }
+
+ public void setBindId(String bindId) {
+ this.bindId = bindId;
+ }
+
+ public Integer getIsReassign() {
+ return isReassign;
+ }
+
+ public void setIsReassign(Integer isReassign) {
+ this.isReassign = isReassign;
+ }
+
+ public Integer getPeopleNumber() {
+ return peopleNumber;
+ }
+
+ public void setPeopleNumber(Integer peopleNumber) {
+ this.peopleNumber = peopleNumber;
+ }
+
+ public String getSeatNumber() {
+ return seatNumber;
+ }
+
+ public void setSeatNumber(String seatNumber) {
+ this.seatNumber = seatNumber;
+ }
+
+ @Override
+ protected Serializable pkVal() {
+ return this.id;
+ }
+
+ @Override
+ public String toString() {
+ return "TOrderCrossCity{" +
+ "id=" + id +
+ ", userId=" + userId +
+ ", driverId=" + driverId +
+ ", lineId=" + lineId +
+ ", lineShiftDriverId=" + lineShiftDriverId +
+ ", carId=" + carId +
+ ", serverCarModelId=" + serverCarModelId +
+ ", orderNum='" + orderNum + '\'' +
+ ", placementLon=" + placementLon +
+ ", placementLat=" + placementLat +
+ ", placementAddress='" + placementAddress + '\'' +
+ ", startLon=" + startLon +
+ ", startLat=" + startLat +
+ ", endLon=" + endLon +
+ ", startAddress='" + startAddress + '\'' +
+ ", endLat=" + endLat +
+ ", endAddress='" + endAddress + '\'' +
+ ", boardingLon=" + boardingLon +
+ ", boardingLat=" + boardingLat +
+ ", boardingAddress='" + boardingAddress + '\'' +
+ ", boardingTime=" + boardingTime +
+ ", getoffLon=" + getoffLon +
+ ", getoffLat=" + getoffLat +
+ ", getoffAddress='" + getoffAddress + '\'' +
+ ", getoffTime=" + getoffTime +
+ ", mileage=" + mileage +
+ ", payManner=" + payManner +
+ ", payType=" + payType +
+ ", orderMoney=" + orderMoney +
+ ", redPacketMoney=" + redPacketMoney +
+ ", couponMoney=" + couponMoney +
+ ", redPacketId=" + redPacketId +
+ ", couponId=" + couponId +
+ ", discount=" + discount +
+ ", discountMoney=" + discountMoney +
+ ", activityId=" + activityId +
+ ", companyId=" + companyId +
+ ", payMoney=" + payMoney +
+ ", passengers='" + passengers + '\'' +
+ ", passengersPhone='" + passengersPhone + '\'' +
+ ", sort=" + sort +
+ ", insertTime=" + insertTime +
+ ", travelTime=" + travelTime +
+ ", snatchOrderTime=" + snatchOrderTime +
+ ", setOutTime=" + setOutTime +
+ ", arriveTime=" + arriveTime +
+ ", startServiceTime=" + startServiceTime +
+ ", endServiceTime=" + endServiceTime +
+ ", travelMode=" + travelMode +
+ ", orderSource=" + orderSource +
+ ", invoiceId=" + invoiceId +
+ ", trackId='" + trackId + '\'' +
+ ", state=" + state +
+ ", isReassign=" + isReassign +
+ ", isDelete=" + isDelete +
+ ", oldState=" + oldState +
+ ", telX='" + telX + '\'' +
+ ", bindId='" + bindId + '\'' +
+ '}';
+ }
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TOrderEvaluate.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TOrderEvaluate.java
new file mode 100644
index 0000000..e243760
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TOrderEvaluate.java
@@ -0,0 +1,137 @@
+package com.stylefeng.guns.modular.system.model;
+
+import com.baomidou.mybatisplus.enums.IdType;
+import java.util.Date;
+import com.baomidou.mybatisplus.annotations.TableId;
+import com.baomidou.mybatisplus.activerecord.Model;
+import com.baomidou.mybatisplus.annotations.TableName;
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 订单评价
+ * </p>
+ *
+ * @author 吕雪
+ * @since 2020-06-09
+ */
+@TableName("t_order_evaluate")
+public class TOrderEvaluate extends Model<TOrderEvaluate> {
+
+ private static final long serialVersionUID = 1L;
+
+ @TableId(value = "id", type = IdType.AUTO)
+ private Integer id;
+ /**
+ * 订单id
+ */
+ private Integer orderId;
+ /**
+ * 司机id
+ */
+ private Integer driverId;
+ /**
+ * 1=专车，2=出租车，3=跨城出行，4=同城小件物流，5=跨城小件物流，6=包车
+ */
+ private Integer orderType;
+ /**
+ * 评分 0-5
+ */
+ private Double fraction;
+ /**
+ * 评价内容
+ */
+ private String content;
+ /**
+ * 评价时间
+ */
+ private Date insertTime;
+ /**
+ * 评价用户ID
+ */
+ private Integer userId;
+
+
+ public Integer getId() {
+ return id;
+ }
+
+ public void setId(Integer id) {
+ this.id = id;
+ }
+
+ public Integer getOrderId() {
+ return orderId;
+ }
+
+ public void setOrderId(Integer orderId) {
+ this.orderId = orderId;
+ }
+
+ public Integer getDriverId() {
+ return driverId;
+ }
+
+ public void setDriverId(Integer driverId) {
+ this.driverId = driverId;
+ }
+
+ public Integer getOrderType() {
+ return orderType;
+ }
+
+ public void setOrderType(Integer orderType) {
+ this.orderType = orderType;
+ }
+
+ public Double getFraction() {
+ return fraction;
+ }
+
+ public void setFraction(Double fraction) {
+ this.fraction = fraction;
+ }
+
+ public String getContent() {
+ return content;
+ }
+
+ public void setContent(String content) {
+ this.content = content;
+ }
+
+ public Date getInsertTime() {
+ return insertTime;
+ }
+
+ public void setInsertTime(Date insertTime) {
+ this.insertTime = insertTime;
+ }
+
+ public Integer getUserId() {
+ return userId;
+ }
+
+ public void setUserId(Integer userId) {
+ this.userId = userId;
+ }
+
+ @Override
+ protected Serializable pkVal() {
+ return this.id;
+ }
+
+ @Override
+ public String toString() {
+ return "TOrderEvaluate{" +
+ "id=" + id +
+ ", orderId=" + orderId +
+ ", driverId=" + driverId +
+ ", orderType=" + orderType +
+ ", fraction=" + fraction +
+ ", content=" + content +
+ ", insertTime=" + insertTime +
+ ", userId=" + userId +
+ "}";
+ }
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TOrderLogistics.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TOrderLogistics.java
new file mode 100644
index 0000000..27b0be7
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TOrderLogistics.java
@@ -0,0 +1,789 @@
+package com.stylefeng.guns.modular.system.model;
+
+import com.baomidou.mybatisplus.enums.IdType;
+import java.math.BigDecimal;
+import java.util.Date;
+import com.baomidou.mybatisplus.annotations.TableId;
+import com.baomidou.mybatisplus.activerecord.Model;
+import com.baomidou.mybatisplus.annotations.TableName;
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 订单-小件物流
+ * </p>
+ *
+ * @author 吕雪
+ * @since 2020-09-24
+ */
+@TableName("t_order_logistics")
+public class TOrderLogistics extends Model<TOrderLogistics> {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 主键id
+ */
+ @TableId(value = "id", type = IdType.AUTO)
+ private Integer id;
+ /**
+ * 订单类型（4=同城物流，5=跨城物流）
+ */
+ private Integer type;
+ /**
+ * 用户id
+ */
+ private Integer userId;
+ /**
+ * 接单司机ID
+ */
+ private Integer driverId;
+ /**
+ * 车辆id
+ */
+ private Integer carId;
+ /**
+ * 订单号
+ */
+ private String orderNum;
+ /**
+ * 货物类型（1=普通货物，2=贵重货物）
+ */
+ private Integer cargoType;
+ /**
+ * 货物数量
+ */
+ private Integer cargoNumber;
+ /**
+ * 备注
+ */
+ private String remark;
+ /**
+ * 下单地点经度
+ */
+ private Double placementLon;
+ /**
+ * 下单地点纬度
+ */
+ private Double placementLat;
+ /**
+ * 下单地点
+ */
+ private String placementAddress;
+ /**
+ * 出发地经度值
+ */
+ private Double startLon;
+ /**
+ * 出发地纬度值
+ */
+ private Double startLat;
+ /**
+ * 出发地地点
+ */
+ private String startAddress;
+ /**
+ * 目的地经度
+ */
+ private Double endLon;
+ /**
+ * 目的地纬度
+ */
+ private Double endLat;
+ /**
+ * 目的地地点
+ */
+ private String endAddress;
+ /**
+ * 收件人姓名
+ */
+ private String recipient;
+ /**
+ * 收件人电话
+ */
+ private String recipientPhone;
+ /**
+ * 上车点经度
+ */
+ private Double boardingLon;
+ /**
+ * 上车点纬度
+ */
+ private Double boardingLat;
+ /**
+ * 上车点
+ */
+ private String boardingAddress;
+ /**
+ * 上车时间
+ */
+ private Date boardingTime;
+ /**
+ * 下车点经度
+ */
+ private Double getoffLon;
+ /**
+ * 下车点纬度
+ */
+ private Double getoffLat;
+ /**
+ * 下车地点
+ */
+ private String getoffAddress;
+ /**
+ * 下车时间
+ */
+ private Date getoffTime;
+ /**
+ * 行驶里程数（米）
+ */
+ private Double mileage;
+ /**
+ * 支付方式（1=OK平台支付，2=其他方式支付）
+ */
+ private Integer payManner;
+ /**
+ * 支付方式(1=微信，2=支付宝，3=其他)
+ */
+ private Integer payType;
+ /**
+ * 订单金额
+ */
+ private BigDecimal orderMoney;
+ /**
+ * 行程费
+ */
+ private BigDecimal travelMoney;
+ /**
+ * 小费
+ */
+ private BigDecimal tipMoney;
+ /**
+ * 红包抵扣金额
+ */
+ private BigDecimal redPacketMoney;
+ /**
+ * 优惠券抵扣金额
+ */
+ private BigDecimal couponMoney;
+ /**
+ * 红包记录id
+ */
+ private Integer redPacketId;
+ /**
+ * 优惠券id
+ */
+ private Integer couponId;
+ /**
+ * 折扣
+ */
+ private Double discount;
+ /**
+ * 折扣优惠金额
+ */
+ private Double discountMoney;
+ /**
+ * 折扣活动id
+ */
+ private Integer activityId;
+ /**
+ * 公司id
+ */
+ private Integer companyId;
+ /**
+ * 支付金额
+ */
+ private BigDecimal payMoney;
+ /**
+ * 状态(1=待接单，2=待出发，3=待到达预约地点，4=待取货，5=服务中，6=完成服务，7=待支付，9=已完成，10=已取消)
+ */
+ private Integer state;
+ /**
+ * 下单时间
+ */
+ private Date insertTime;
+ /**
+ * 出行时间
+ */
+ private Date travelTime;
+ /**
+ * 抢单时间
+ */
+ private Date snatchOrderTime;
+ /**
+ * 司机点出发时间
+ */
+ private Date setOutTime;
+ /**
+ * 司机到达预约地点时间
+ */
+ private Date arriveTime;
+ /**
+ * 开始服务时间
+ */
+ private Date startServiceTime;
+ /**
+ * 结束服务时间
+ */
+ private Date endServiceTime;
+ /**
+ * 下单方式（1：APP下单，2：扫码下单，3：小程序下单，4：司机下单，5：调度下单）
+ */
+ private Integer orderSource;
+ /**
+ * 发票id
+ */
+ private Integer invoiceId;
+ /**
+ * 高德猎鹰上的轨迹id
+ */
+ private String trackId;
+ /**
+ * 是否删除 1=否 2=是
+ */
+ private Integer isDelete;
+ /**
+ * 改派之前的订单状态
+ */
+ private Integer oldState;
+ /**
+ * 移动小号
+ */
+ private String telX;
+ /**
+ * 移动小号绑定关系id
+ */
+ private String bindId;
+
+ public Integer getOldState() {
+ return oldState;
+ }
+
+ public void setOldState(Integer oldState) {
+ this.oldState = oldState;
+ }
+
+ public Integer getId() {
+ return id;
+ }
+
+ public void setId(Integer id) {
+ this.id = id;
+ }
+
+ public Integer getType() {
+ return type;
+ }
+
+ public void setType(Integer type) {
+ this.type = type;
+ }
+
+ public Integer getUserId() {
+ return userId;
+ }
+
+ public void setUserId(Integer userId) {
+ this.userId = userId;
+ }
+
+ public Integer getDriverId() {
+ return driverId;
+ }
+
+ public void setDriverId(Integer driverId) {
+ this.driverId = driverId;
+ }
+
+ public Integer getCarId() {
+ return carId;
+ }
+
+ public void setCarId(Integer carId) {
+ this.carId = carId;
+ }
+
+ public String getOrderNum() {
+ return orderNum;
+ }
+
+ public void setOrderNum(String orderNum) {
+ this.orderNum = orderNum;
+ }
+
+ public Integer getCargoType() {
+ return cargoType;
+ }
+
+ public void setCargoType(Integer cargoType) {
+ this.cargoType = cargoType;
+ }
+
+ public Integer getCargoNumber() {
+ return cargoNumber;
+ }
+
+ public void setCargoNumber(Integer cargoNumber) {
+ this.cargoNumber = cargoNumber;
+ }
+
+ public String getRemark() {
+ return remark;
+ }
+
+ public void setRemark(String remark) {
+ this.remark = remark;
+ }
+
+ public Double getPlacementLon() {
+ return placementLon;
+ }
+
+ public void setPlacementLon(Double placementLon) {
+ this.placementLon = placementLon;
+ }
+
+ public Double getPlacementLat() {
+ return placementLat;
+ }
+
+ public void setPlacementLat(Double placementLat) {
+ this.placementLat = placementLat;
+ }
+
+ public String getPlacementAddress() {
+ return placementAddress;
+ }
+
+ public void setPlacementAddress(String placementAddress) {
+ this.placementAddress = placementAddress;
+ }
+
+ public Double getStartLon() {
+ return startLon;
+ }
+
+ public void setStartLon(Double startLon) {
+ this.startLon = startLon;
+ }
+
+ public Double getStartLat() {
+ return startLat;
+ }
+
+ public void setStartLat(Double startLat) {
+ this.startLat = startLat;
+ }
+
+ public String getStartAddress() {
+ return startAddress;
+ }
+
+ public void setStartAddress(String startAddress) {
+ this.startAddress = startAddress;
+ }
+
+ public Double getEndLon() {
+ return endLon;
+ }
+
+ public void setEndLon(Double endLon) {
+ this.endLon = endLon;
+ }
+
+ public Double getEndLat() {
+ return endLat;
+ }
+
+ public void setEndLat(Double endLat) {
+ this.endLat = endLat;
+ }
+
+ public String getEndAddress() {
+ return endAddress;
+ }
+
+ public void setEndAddress(String endAddress) {
+ this.endAddress = endAddress;
+ }
+
+ public String getRecipient() {
+ return recipient;
+ }
+
+ public void setRecipient(String recipient) {
+ this.recipient = recipient;
+ }
+
+ public String getRecipientPhone() {
+ return recipientPhone;
+ }
+
+ public void setRecipientPhone(String recipientPhone) {
+ this.recipientPhone = recipientPhone;
+ }
+
+ public Double getBoardingLon() {
+ return boardingLon;
+ }
+
+ public void setBoardingLon(Double boardingLon) {
+ this.boardingLon = boardingLon;
+ }
+
+ public Double getBoardingLat() {
+ return boardingLat;
+ }
+
+ public void setBoardingLat(Double boardingLat) {
+ this.boardingLat = boardingLat;
+ }
+
+ public String getBoardingAddress() {
+ return boardingAddress;
+ }
+
+ public void setBoardingAddress(String boardingAddress) {
+ this.boardingAddress = boardingAddress;
+ }
+
+ public Date getBoardingTime() {
+ return boardingTime;
+ }
+
+ public void setBoardingTime(Date boardingTime) {
+ this.boardingTime = boardingTime;
+ }
+
+ public Double getGetoffLon() {
+ return getoffLon;
+ }
+
+ public void setGetoffLon(Double getoffLon) {
+ this.getoffLon = getoffLon;
+ }
+
+ public Double getGetoffLat() {
+ return getoffLat;
+ }
+
+ public void setGetoffLat(Double getoffLat) {
+ this.getoffLat = getoffLat;
+ }
+
+ public String getGetoffAddress() {
+ return getoffAddress;
+ }
+
+ public void setGetoffAddress(String getoffAddress) {
+ this.getoffAddress = getoffAddress;
+ }
+
+ public Date getGetoffTime() {
+ return getoffTime;
+ }
+
+ public void setGetoffTime(Date getoffTime) {
+ this.getoffTime = getoffTime;
+ }
+
+ public Double getMileage() {
+ return mileage;
+ }
+
+ public void setMileage(Double mileage) {
+ this.mileage = mileage;
+ }
+
+ public Integer getPayManner() {
+ return payManner;
+ }
+
+ public void setPayManner(Integer payManner) {
+ this.payManner = payManner;
+ }
+
+ public Integer getPayType() {
+ return payType;
+ }
+
+ public void setPayType(Integer payType) {
+ this.payType = payType;
+ }
+
+ public BigDecimal getOrderMoney() {
+ return orderMoney;
+ }
+
+ public void setOrderMoney(BigDecimal orderMoney) {
+ this.orderMoney = orderMoney;
+ }
+
+ public BigDecimal getTravelMoney() {
+ return travelMoney;
+ }
+
+ public void setTravelMoney(BigDecimal travelMoney) {
+ this.travelMoney = travelMoney;
+ }
+
+ public BigDecimal getTipMoney() {
+ return tipMoney;
+ }
+
+ public void setTipMoney(BigDecimal tipMoney) {
+ this.tipMoney = tipMoney;
+ }
+
+ public BigDecimal getRedPacketMoney() {
+ return redPacketMoney;
+ }
+
+ public void setRedPacketMoney(BigDecimal redPacketMoney) {
+ this.redPacketMoney = redPacketMoney;
+ }
+
+ public BigDecimal getCouponMoney() {
+ return couponMoney;
+ }
+
+ public void setCouponMoney(BigDecimal couponMoney) {
+ this.couponMoney = couponMoney;
+ }
+
+ public Integer getRedPacketId() {
+ return redPacketId;
+ }
+
+ public void setRedPacketId(Integer redPacketId) {
+ this.redPacketId = redPacketId;
+ }
+
+ public Integer getCouponId() {
+ return couponId;
+ }
+
+ public void setCouponId(Integer couponId) {
+ this.couponId = couponId;
+ }
+
+ public Double getDiscount() {
+ return discount;
+ }
+
+ public void setDiscount(Double discount) {
+ this.discount = discount;
+ }
+
+ public Double getDiscountMoney() {
+ return discountMoney;
+ }
+
+ public void setDiscountMoney(Double discountMoney) {
+ this.discountMoney = discountMoney;
+ }
+
+ public Integer getActivityId() {
+ return activityId;
+ }
+
+ public void setActivityId(Integer activityId) {
+ this.activityId = activityId;
+ }
+
+ public Integer getCompanyId() {
+ return companyId;
+ }
+
+ public void setCompanyId(Integer companyId) {
+ this.companyId = companyId;
+ }
+
+ public BigDecimal getPayMoney() {
+ return payMoney;
+ }
+
+ public void setPayMoney(BigDecimal payMoney) {
+ this.payMoney = payMoney;
+ }
+
+ public Integer getState() {
+ return state;
+ }
+
+ public void setState(Integer state) {
+ this.state = state;
+ }
+
+ public Date getInsertTime() {
+ return insertTime;
+ }
+
+ public void setInsertTime(Date insertTime) {
+ this.insertTime = insertTime;
+ }
+
+ public Date getTravelTime() {
+ return travelTime;
+ }
+
+ public void setTravelTime(Date travelTime) {
+ this.travelTime = travelTime;
+ }
+
+ public Date getSnatchOrderTime() {
+ return snatchOrderTime;
+ }
+
+ public void setSnatchOrderTime(Date snatchOrderTime) {
+ this.snatchOrderTime = snatchOrderTime;
+ }
+
+ public Date getSetOutTime() {
+ return setOutTime;
+ }
+
+ public void setSetOutTime(Date setOutTime) {
+ this.setOutTime = setOutTime;
+ }
+
+ public Date getArriveTime() {
+ return arriveTime;
+ }
+
+ public void setArriveTime(Date arriveTime) {
+ this.arriveTime = arriveTime;
+ }
+
+ public Date getStartServiceTime() {
+ return startServiceTime;
+ }
+
+ public void setStartServiceTime(Date startServiceTime) {
+ this.startServiceTime = startServiceTime;
+ }
+
+ public Date getEndServiceTime() {
+ return endServiceTime;
+ }
+
+ public void setEndServiceTime(Date endServiceTime) {
+ this.endServiceTime = endServiceTime;
+ }
+
+ public Integer getOrderSource() {
+ return orderSource;
+ }
+
+ public void setOrderSource(Integer orderSource) {
+ this.orderSource = orderSource;
+ }
+
+ public Integer getInvoiceId() {
+ return invoiceId;
+ }
+
+ public void setInvoiceId(Integer invoiceId) {
+ this.invoiceId = invoiceId;
+ }
+
+ public String getTrackId() {
+ return trackId;
+ }
+
+ public void setTrackId(String trackId) {
+ this.trackId = trackId;
+ }
+
+ public Integer getIsDelete() {
+ return isDelete;
+ }
+
+ public void setIsDelete(Integer isDelete) {
+ this.isDelete = isDelete;
+ }
+
+ public String getTelX() {
+ return telX;
+ }
+
+ public void setTelX(String telX) {
+ this.telX = telX;
+ }
+
+ public String getBindId() {
+ return bindId;
+ }
+
+ public void setBindId(String bindId) {
+ this.bindId = bindId;
+ }
+
+ @Override
+ protected Serializable pkVal() {
+ return this.id;
+ }
+
+ @Override
+ public String toString() {
+ return "TOrderLogistics{" +
+ "id=" + id +
+ ", type=" + type +
+ ", userId=" + userId +
+ ", driverId=" + driverId +
+ ", carId=" + carId +
+ ", orderNum=" + orderNum +
+ ", cargoType=" + cargoType +
+ ", cargoNumber=" + cargoNumber +
+ ", remark=" + remark +
+ ", placementLon=" + placementLon +
+ ", placementLat=" + placementLat +
+ ", placementAddress=" + placementAddress +
+ ", startLon=" + startLon +
+ ", startLat=" + startLat +
+ ", startAddress=" + startAddress +
+ ", endLon=" + endLon +
+ ", endLat=" + endLat +
+ ", endAddress=" + endAddress +
+ ", recipient=" + recipient +
+ ", recipientPhone=" + recipientPhone +
+ ", boardingLon=" + boardingLon +
+ ", boardingLat=" + boardingLat +
+ ", boardingAddress=" + boardingAddress +
+ ", boardingTime=" + boardingTime +
+ ", getoffLon=" + getoffLon +
+ ", getoffLat=" + getoffLat +
+ ", getoffAddress=" + getoffAddress +
+ ", getoffTime=" + getoffTime +
+ ", mileage=" + mileage +
+ ", payManner=" + payManner +
+ ", payType=" + payType +
+ ", orderMoney=" + orderMoney +
+ ", travelMoney=" + travelMoney +
+ ", tipMoney=" + tipMoney +
+ ", redPacketMoney=" + redPacketMoney +
+ ", couponMoney=" + couponMoney +
+ ", redPacketId=" + redPacketId +
+ ", couponId=" + couponId +
+ ", discount=" + discount +
+ ", discountMoney=" + discountMoney +
+ ", activityId=" + activityId +
+ ", companyId=" + companyId +
+ ", payMoney=" + payMoney +
+ ", state=" + state +
+ ", insertTime=" + insertTime +
+ ", travelTime=" + travelTime +
+ ", snatchOrderTime=" + snatchOrderTime +
+ ", setOutTime=" + setOutTime +
+ ", arriveTime=" + arriveTime +
+ ", startServiceTime=" + startServiceTime +
+ ", endServiceTime=" + endServiceTime +
+ ", orderSource=" + orderSource +
+ ", invoiceId=" + invoiceId +
+ ", trackId=" + trackId +
+ ", isDelete=" + isDelete +
+ ", telX=" + telX +
+ ", bindId=" + bindId +
+ "}";
+ }
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TOrderPosition.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TOrderPosition.java
new file mode 100644
index 0000000..40bc1ba
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TOrderPosition.java
@@ -0,0 +1,124 @@
+package com.stylefeng.guns.modular.system.model;
+
+import com.baomidou.mybatisplus.enums.IdType;
+import java.util.Date;
+import com.baomidou.mybatisplus.annotations.TableId;
+import com.baomidou.mybatisplus.activerecord.Model;
+import com.baomidou.mybatisplus.annotations.TableName;
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 订单坐标信息表
+ * </p>
+ *
+ * @author 吕雪
+ * @since 2020-06-08
+ */
+@TableName("t_order_position")
+public class TOrderPosition extends Model<TOrderPosition> {
+
+ private static final long serialVersionUID = 1L;
+
+ @TableId(value = "id", type = IdType.AUTO)
+ private Integer id;
+ /**
+ * 订单类型（1=专车，2=出租车，3=城际，4=小件物流-同城，5=小件物流-跨城，6=包车）
+ */
+ private Integer orderType;
+ /**
+ * 订单id
+ */
+ private Integer orderId;
+ /**
+ * 司机id
+ */
+ private Integer driverId;
+ /**
+ * 经度
+ */
+ private String lon;
+ /**
+ * 纬度
+ */
+ private String lat;
+ /**
+ * 添加时间
+ */
+ private Date insertTime;
+
+
+ public Integer getId() {
+ return id;
+ }
+
+ public void setId(Integer id) {
+ this.id = id;
+ }
+
+ public Integer getOrderType() {
+ return orderType;
+ }
+
+ public void setOrderType(Integer orderType) {
+ this.orderType = orderType;
+ }
+
+ public Integer getOrderId() {
+ return orderId;
+ }
+
+ public void setOrderId(Integer orderId) {
+ this.orderId = orderId;
+ }
+
+ public Integer getDriverId() {
+ return driverId;
+ }
+
+ public void setDriverId(Integer driverId) {
+ this.driverId = driverId;
+ }
+
+ public String getLon() {
+ return lon;
+ }
+
+ public void setLon(String lon) {
+ this.lon = lon;
+ }
+
+ public String getLat() {
+ return lat;
+ }
+
+ public void setLat(String lat) {
+ this.lat = lat;
+ }
+
+ public Date getInsertTime() {
+ return insertTime;
+ }
+
+ public void setInsertTime(Date insertTime) {
+ this.insertTime = insertTime;
+ }
+
+ @Override
+ protected Serializable pkVal() {
+ return this.id;
+ }
+
+ @Override
+ public String toString() {
+ return "TOrderPosition{" +
+ "id=" + id +
+ ", orderType=" + orderType +
+ ", orderId=" + orderId +
+ ", driverId=" + driverId +
+ ", lon=" + lon +
+ ", lat=" + lat +
+ ", insertTime=" + insertTime +
+ "}";
+ }
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TOrderPrivateCar.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TOrderPrivateCar.java
new file mode 100644
index 0000000..205edda
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TOrderPrivateCar.java
@@ -0,0 +1,869 @@
+package com.stylefeng.guns.modular.system.model;
+
+import com.baomidou.mybatisplus.enums.IdType;
+import java.math.BigDecimal;
+import java.util.Date;
+import com.baomidou.mybatisplus.annotations.TableId;
+import com.baomidou.mybatisplus.activerecord.Model;
+import com.baomidou.mybatisplus.annotations.TableName;
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 订单-专车
+ * </p>
+ *
+ * @author 吕雪
+ * @since 2020-09-02
+ */
+@TableName("t_order_private_car")
+public class TOrderPrivateCar extends Model<TOrderPrivateCar> {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 主键id
+ */
+ @TableId(value = "id", type = IdType.AUTO)
+ private Integer id;
+ /**
+ * 类型（1=普通订单，2=摆渡订单）
+ */
+ private Integer type;
+ /**
+ * 用户id
+ */
+ private Integer userId;
+ /**
+ * 接单司机ID
+ */
+ private Integer driverId;
+ /**
+ * 车辆id
+ */
+ private Integer carId;
+ /**
+ * 订单号
+ */
+ private String orderNum;
+ /**
+ * 下单地点经度
+ */
+ private Double placementLon;
+ /**
+ * 下单地点纬度
+ */
+ private Double placementLat;
+ /**
+ * 下单地点
+ */
+ private String placementAddress;
+ /**
+ * 出发地经度值
+ */
+ private Double startLon;
+ /**
+ * 出发地纬度值
+ */
+ private Double startLat;
+ /**
+ * 目的地经度
+ */
+ private Double endLon;
+ /**
+ * 出发地地点
+ */
+ private String startAddress;
+ /**
+ * 目的地纬度
+ */
+ private Double endLat;
+ /**
+ * 目的地地点
+ */
+ private String endAddress;
+ /**
+ * 上车点经度
+ */
+ private Double boardingLon;
+ /**
+ * 上车点纬度
+ */
+ private Double boardingLat;
+ /**
+ * 上车点
+ */
+ private String boardingAddress;
+ /**
+ * 上车时间
+ */
+ private Date boardingTime;
+ /**
+ * 下车点经度
+ */
+ private Double getoffLon;
+ /**
+ * 下车点纬度
+ */
+ private Double getoffLat;
+ /**
+ * 下车地点
+ */
+ private String getoffAddress;
+ /**
+ * 下车时间
+ */
+ private Date getoffTime;
+ /**
+ * 行驶里程数（米）
+ */
+ private Double mileage;
+ /**
+ * 支付方式（1=OK平台支付，2=其他方式支付）
+ */
+ private Integer payManner;
+ /**
+ * 支付方式(1=微信，2=支付宝，3=其他)
+ */
+ private Integer payType;
+ /**
+ * 订单金额
+ */
+ private BigDecimal orderMoney;
+ /**
+ * 起步价
+ */
+ private BigDecimal startMoney;
+ /**
+ * 里程费
+ */
+ private BigDecimal mileageMoney;
+ /**
+ * 时长费
+ */
+ private BigDecimal durationMoney;
+ /**
+ * 远途费
+ */
+ private BigDecimal longDistanceMoney;
+ /**
+ * 停车费
+ */
+ private BigDecimal parkMoney;
+ /**
+ * 过路费
+ */
+ private BigDecimal roadTollMoney;
+ /**
+ * 红包抵扣金额
+ */
+ private BigDecimal redPacketMoney;
+ /**
+ * 优惠券抵扣金额
+ */
+ private BigDecimal couponMoney;
+ /**
+ * 红包记录id
+ */
+ private Integer redPacketId;
+ /**
+ * 优惠券id
+ */
+ private Integer couponId;
+ /**
+ * 折扣
+ */
+ private Double discount;
+ /**
+ * 折扣优惠金额
+ */
+ private Double discountMoney;
+ /**
+ * 折扣活动id
+ */
+ private Integer activityId;
+ /**
+ * 公司id
+ */
+ private Integer companyId;
+ /**
+ * 支付金额
+ */
+ private BigDecimal payMoney;
+ /**
+ * 是否是代下单（0：否，1：是）
+ */
+ private Integer substitute;
+ /**
+ * 乘车人
+ */
+ private String passengers;
+ /**
+ * 乘车人电话
+ */
+ private String passengersPhone;
+ /**
+ * 状态(1=待接单，2=待出发，3=待到达预约地点，4=待乘客上车，5=服务中，6=完成服务，7=待支付，8=待评价，9=已完成，10=已取消，11=改派中，12=取消待支付)
+ */
+ private Integer state;
+ /**
+ * 下单时间
+ */
+ private Date insertTime;
+ /**
+ * 出行时间
+ */
+ private Date travelTime;
+ /**
+ * 抢单时间
+ */
+ private Date snatchOrderTime;
+ /**
+ * 司机点出发时间
+ */
+ private Date setOutTime;
+ /**
+ * 司机到达预约地点时间
+ */
+ private Date arriveTime;
+ /**
+ * 开始服务时间
+ */
+ private Date startServiceTime;
+ /**
+ * 结束服务时间
+ */
+ private Date endServiceTime;
+ /**
+ * 订单类型(1=普通，2=预约)
+ */
+ private Integer orderType;
+ /**
+ * 下单方式（1：APP下单，2：扫码下单，3：小程序下单，4：司机下单，5：调度下单）
+ */
+ private Integer orderSource;
+ /**
+ * 发票id
+ */
+ private Integer invoiceId;
+ /**
+ * 是否是改派单（1=否，2=是）
+ */
+ private Integer isReassign;
+ /**
+ * 改派通知（0=没有改派，1=改派中，2=已改派）
+ */
+ private Integer reassignNotice;
+ /**
+ * 高德猎鹰上的轨迹id
+ */
+ private String trackId;
+ /**
+ * 是否删除 1=否 2=是
+ */
+ private Integer isDelete;
+ /**
+ * 状态(改派前订单状态)
+ */
+ private Integer oldState;
+ /**
+ * 移动小号
+ */
+ private String telX;
+ /**
+ * 移动小号绑定关系id
+ */
+ private String bindId;
+ /**
+ * 专车车型ID 关联t_server_carmodel表
+ */
+ private Integer serverCarModelId;
+
+
+ public Integer getId() {
+ return id;
+ }
+
+ public void setId(Integer id) {
+ this.id = id;
+ }
+
+ public Integer getType() {
+ return type;
+ }
+
+ public void setType(Integer type) {
+ this.type = type;
+ }
+
+ public Integer getUserId() {
+ return userId;
+ }
+
+ public void setUserId(Integer userId) {
+ this.userId = userId;
+ }
+
+ public Integer getDriverId() {
+ return driverId;
+ }
+
+ public void setDriverId(Integer driverId) {
+ this.driverId = driverId;
+ }
+
+ public Integer getCarId() {
+ return carId;
+ }
+
+ public void setCarId(Integer carId) {
+ this.carId = carId;
+ }
+
+ public String getOrderNum() {
+ return orderNum;
+ }
+
+ public void setOrderNum(String orderNum) {
+ this.orderNum = orderNum;
+ }
+
+ public Double getPlacementLon() {
+ return placementLon;
+ }
+
+ public void setPlacementLon(Double placementLon) {
+ this.placementLon = placementLon;
+ }
+
+ public Double getPlacementLat() {
+ return placementLat;
+ }
+
+ public void setPlacementLat(Double placementLat) {
+ this.placementLat = placementLat;
+ }
+
+ public String getPlacementAddress() {
+ return placementAddress;
+ }
+
+ public void setPlacementAddress(String placementAddress) {
+ this.placementAddress = placementAddress;
+ }
+
+ public Double getStartLon() {
+ return startLon;
+ }
+
+ public void setStartLon(Double startLon) {
+ this.startLon = startLon;
+ }
+
+ public Double getStartLat() {
+ return startLat;
+ }
+
+ public void setStartLat(Double startLat) {
+ this.startLat = startLat;
+ }
+
+ public Double getEndLon() {
+ return endLon;
+ }
+
+ public void setEndLon(Double endLon) {
+ this.endLon = endLon;
+ }
+
+ public String getStartAddress() {
+ return startAddress;
+ }
+
+ public void setStartAddress(String startAddress) {
+ this.startAddress = startAddress;
+ }
+
+ public Double getEndLat() {
+ return endLat;
+ }
+
+ public void setEndLat(Double endLat) {
+ this.endLat = endLat;
+ }
+
+ public String getEndAddress() {
+ return endAddress;
+ }
+
+ public void setEndAddress(String endAddress) {
+ this.endAddress = endAddress;
+ }
+
+ public Double getBoardingLon() {
+ return boardingLon;
+ }
+
+ public void setBoardingLon(Double boardingLon) {
+ this.boardingLon = boardingLon;
+ }
+
+ public Double getBoardingLat() {
+ return boardingLat;
+ }
+
+ public void setBoardingLat(Double boardingLat) {
+ this.boardingLat = boardingLat;
+ }
+
+ public String getBoardingAddress() {
+ return boardingAddress;
+ }
+
+ public void setBoardingAddress(String boardingAddress) {
+ this.boardingAddress = boardingAddress;
+ }
+
+ public Date getBoardingTime() {
+ return boardingTime;
+ }
+
+ public void setBoardingTime(Date boardingTime) {
+ this.boardingTime = boardingTime;
+ }
+
+ public Double getGetoffLon() {
+ return getoffLon;
+ }
+
+ public void setGetoffLon(Double getoffLon) {
+ this.getoffLon = getoffLon;
+ }
+
+ public Double getGetoffLat() {
+ return getoffLat;
+ }
+
+ public void setGetoffLat(Double getoffLat) {
+ this.getoffLat = getoffLat;
+ }
+
+ public String getGetoffAddress() {
+ return getoffAddress;
+ }
+
+ public void setGetoffAddress(String getoffAddress) {
+ this.getoffAddress = getoffAddress;
+ }
+
+ public Date getGetoffTime() {
+ return getoffTime;
+ }
+
+ public void setGetoffTime(Date getoffTime) {
+ this.getoffTime = getoffTime;
+ }
+
+ public Double getMileage() {
+ return mileage;
+ }
+
+ public void setMileage(Double mileage) {
+ this.mileage = mileage;
+ }
+
+ public Integer getPayManner() {
+ return payManner;
+ }
+
+ public void setPayManner(Integer payManner) {
+ this.payManner = payManner;
+ }
+
+ public Integer getPayType() {
+ return payType;
+ }
+
+ public void setPayType(Integer payType) {
+ this.payType = payType;
+ }
+
+ public BigDecimal getOrderMoney() {
+ return orderMoney;
+ }
+
+ public void setOrderMoney(BigDecimal orderMoney) {
+ this.orderMoney = orderMoney;
+ }
+
+ public BigDecimal getStartMoney() {
+ return startMoney;
+ }
+
+ public void setStartMoney(BigDecimal startMoney) {
+ this.startMoney = startMoney;
+ }
+
+ public BigDecimal getMileageMoney() {
+ return mileageMoney;
+ }
+
+ public void setMileageMoney(BigDecimal mileageMoney) {
+ this.mileageMoney = mileageMoney;
+ }
+
+ public BigDecimal getDurationMoney() {
+ return durationMoney;
+ }
+
+ public void setDurationMoney(BigDecimal durationMoney) {
+ this.durationMoney = durationMoney;
+ }
+
+ public BigDecimal getLongDistanceMoney() {
+ return longDistanceMoney;
+ }
+
+ public void setLongDistanceMoney(BigDecimal longDistanceMoney) {
+ this.longDistanceMoney = longDistanceMoney;
+ }
+
+ public BigDecimal getParkMoney() {
+ return parkMoney;
+ }
+
+ public void setParkMoney(BigDecimal parkMoney) {
+ this.parkMoney = parkMoney;
+ }
+
+ public BigDecimal getRoadTollMoney() {
+ return roadTollMoney;
+ }
+
+ public void setRoadTollMoney(BigDecimal roadTollMoney) {
+ this.roadTollMoney = roadTollMoney;
+ }
+
+ public BigDecimal getRedPacketMoney() {
+ return redPacketMoney;
+ }
+
+ public void setRedPacketMoney(BigDecimal redPacketMoney) {
+ this.redPacketMoney = redPacketMoney;
+ }
+
+ public BigDecimal getCouponMoney() {
+ return couponMoney;
+ }
+
+ public void setCouponMoney(BigDecimal couponMoney) {
+ this.couponMoney = couponMoney;
+ }
+
+ public Integer getRedPacketId() {
+ return redPacketId;
+ }
+
+ public void setRedPacketId(Integer redPacketId) {
+ this.redPacketId = redPacketId;
+ }
+
+ public Integer getCouponId() {
+ return couponId;
+ }
+
+ public void setCouponId(Integer couponId) {
+ this.couponId = couponId;
+ }
+
+ public Double getDiscount() {
+ return discount;
+ }
+
+ public void setDiscount(Double discount) {
+ this.discount = discount;
+ }
+
+ public Double getDiscountMoney() {
+ return discountMoney;
+ }
+
+ public void setDiscountMoney(Double discountMoney) {
+ this.discountMoney = discountMoney;
+ }
+
+ public Integer getActivityId() {
+ return activityId;
+ }
+
+ public void setActivityId(Integer activityId) {
+ this.activityId = activityId;
+ }
+
+ public Integer getCompanyId() {
+ return companyId;
+ }
+
+ public void setCompanyId(Integer companyId) {
+ this.companyId = companyId;
+ }
+
+ public BigDecimal getPayMoney() {
+ return payMoney;
+ }
+
+ public void setPayMoney(BigDecimal payMoney) {
+ this.payMoney = payMoney;
+ }
+
+ public Integer getSubstitute() {
+ return substitute;
+ }
+
+ public void setSubstitute(Integer substitute) {
+ this.substitute = substitute;
+ }
+
+ public String getPassengers() {
+ return passengers;
+ }
+
+ public void setPassengers(String passengers) {
+ this.passengers = passengers;
+ }
+
+ public String getPassengersPhone() {
+ return passengersPhone;
+ }
+
+ public void setPassengersPhone(String passengersPhone) {
+ this.passengersPhone = passengersPhone;
+ }
+
+ public Integer getState() {
+ return state;
+ }
+
+ public void setState(Integer state) {
+ this.state = state;
+ }
+
+ public Date getInsertTime() {
+ return insertTime;
+ }
+
+ public void setInsertTime(Date insertTime) {
+ this.insertTime = insertTime;
+ }
+
+ public Date getTravelTime() {
+ return travelTime;
+ }
+
+ public void setTravelTime(Date travelTime) {
+ this.travelTime = travelTime;
+ }
+
+ public Date getSnatchOrderTime() {
+ return snatchOrderTime;
+ }
+
+ public void setSnatchOrderTime(Date snatchOrderTime) {
+ this.snatchOrderTime = snatchOrderTime;
+ }
+
+ public Date getSetOutTime() {
+ return setOutTime;
+ }
+
+ public void setSetOutTime(Date setOutTime) {
+ this.setOutTime = setOutTime;
+ }
+
+ public Date getArriveTime() {
+ return arriveTime;
+ }
+
+ public void setArriveTime(Date arriveTime) {
+ this.arriveTime = arriveTime;
+ }
+
+ public Date getStartServiceTime() {
+ return startServiceTime;
+ }
+
+ public void setStartServiceTime(Date startServiceTime) {
+ this.startServiceTime = startServiceTime;
+ }
+
+ public Date getEndServiceTime() {
+ return endServiceTime;
+ }
+
+ public void setEndServiceTime(Date endServiceTime) {
+ this.endServiceTime = endServiceTime;
+ }
+
+ public Integer getOrderType() {
+ return orderType;
+ }
+
+ public void setOrderType(Integer orderType) {
+ this.orderType = orderType;
+ }
+
+ public Integer getOrderSource() {
+ return orderSource;
+ }
+
+ public void setOrderSource(Integer orderSource) {
+ this.orderSource = orderSource;
+ }
+
+ public Integer getInvoiceId() {
+ return invoiceId;
+ }
+
+ public void setInvoiceId(Integer invoiceId) {
+ this.invoiceId = invoiceId;
+ }
+
+ public Integer getIsReassign() {
+ return isReassign;
+ }
+
+ public void setIsReassign(Integer isReassign) {
+ this.isReassign = isReassign;
+ }
+
+ public Integer getReassignNotice() {
+ return reassignNotice;
+ }
+
+ public void setReassignNotice(Integer reassignNotice) {
+ this.reassignNotice = reassignNotice;
+ }
+
+ public String getTrackId() {
+ return trackId;
+ }
+
+ public void setTrackId(String trackId) {
+ this.trackId = trackId;
+ }
+
+ public Integer getIsDelete() {
+ return isDelete;
+ }
+
+ public void setIsDelete(Integer isDelete) {
+ this.isDelete = isDelete;
+ }
+
+ public Integer getOldState() {
+ return oldState;
+ }
+
+ public void setOldState(Integer oldState) {
+ this.oldState = oldState;
+ }
+
+ public String getTelX() {
+ return telX;
+ }
+
+ public void setTelX(String telX) {
+ this.telX = telX;
+ }
+
+ public String getBindId() {
+ return bindId;
+ }
+
+ public void setBindId(String bindId) {
+ this.bindId = bindId;
+ }
+
+ public Integer getServerCarModelId() {
+ return serverCarModelId;
+ }
+
+ public void setServerCarModelId(Integer serverCarModelId) {
+ this.serverCarModelId = serverCarModelId;
+ }
+
+ @Override
+ protected Serializable pkVal() {
+ return this.id;
+ }
+
+ @Override
+ public String toString() {
+ return "TOrderPrivateCar{" +
+ "id=" + id +
+ ", type=" + type +
+ ", userId=" + userId +
+ ", driverId=" + driverId +
+ ", carId=" + carId +
+ ", orderNum=" + orderNum +
+ ", placementLon=" + placementLon +
+ ", placementLat=" + placementLat +
+ ", placementAddress=" + placementAddress +
+ ", startLon=" + startLon +
+ ", startLat=" + startLat +
+ ", endLon=" + endLon +
+ ", startAddress=" + startAddress +
+ ", endLat=" + endLat +
+ ", endAddress=" + endAddress +
+ ", boardingLon=" + boardingLon +
+ ", boardingLat=" + boardingLat +
+ ", boardingAddress=" + boardingAddress +
+ ", boardingTime=" + boardingTime +
+ ", getoffLon=" + getoffLon +
+ ", getoffLat=" + getoffLat +
+ ", getoffAddress=" + getoffAddress +
+ ", getoffTime=" + getoffTime +
+ ", mileage=" + mileage +
+ ", payManner=" + payManner +
+ ", payType=" + payType +
+ ", orderMoney=" + orderMoney +
+ ", startMoney=" + startMoney +
+ ", mileageMoney=" + mileageMoney +
+ ", durationMoney=" + durationMoney +
+ ", longDistanceMoney=" + longDistanceMoney +
+ ", parkMoney=" + parkMoney +
+ ", roadTollMoney=" + roadTollMoney +
+ ", redPacketMoney=" + redPacketMoney +
+ ", couponMoney=" + couponMoney +
+ ", redPacketId=" + redPacketId +
+ ", couponId=" + couponId +
+ ", discount=" + discount +
+ ", discountMoney=" + discountMoney +
+ ", activityId=" + activityId +
+ ", companyId=" + companyId +
+ ", payMoney=" + payMoney +
+ ", substitute=" + substitute +
+ ", passengers=" + passengers +
+ ", passengersPhone=" + passengersPhone +
+ ", state=" + state +
+ ", insertTime=" + insertTime +
+ ", travelTime=" + travelTime +
+ ", snatchOrderTime=" + snatchOrderTime +
+ ", setOutTime=" + setOutTime +
+ ", arriveTime=" + arriveTime +
+ ", startServiceTime=" + startServiceTime +
+ ", endServiceTime=" + endServiceTime +
+ ", orderType=" + orderType +
+ ", orderSource=" + orderSource +
+ ", invoiceId=" + invoiceId +
+ ", isReassign=" + isReassign +
+ ", reassignNotice=" + reassignNotice +
+ ", trackId=" + trackId +
+ ", isDelete=" + isDelete +
+ ", oldState=" + oldState +
+ ", telX=" + telX +
+ ", bindId=" + bindId +
+ ", serverCarModelId=" + serverCarModelId +
+ "}";
+ }
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TOrderTaxi.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TOrderTaxi.java
new file mode 100644
index 0000000..402391b
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TOrderTaxi.java
@@ -0,0 +1,723 @@
+package com.stylefeng.guns.modular.system.model;
+
+import com.baomidou.mybatisplus.enums.IdType;
+import java.math.BigDecimal;
+import java.util.Date;
+import com.baomidou.mybatisplus.annotations.TableId;
+import com.baomidou.mybatisplus.activerecord.Model;
+import com.baomidou.mybatisplus.annotations.TableName;
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 订单-出租车
+ * </p>
+ *
+ * @author 吕雪
+ * @since 2020-06-08
+ */
+@TableName("t_order_taxi")
+public class TOrderTaxi extends Model<TOrderTaxi> {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 主键id
+ */
+ @TableId(value = "id", type = IdType.AUTO)
+ private Integer id;
+ /**
+ * 用户id
+ */
+ private Integer userId;
+ /**
+ * 接单司机ID
+ */
+ private Integer driverId;
+ /**
+ * 车辆id
+ */
+ private Integer carId;
+ /**
+ * 订单号
+ */
+ private String orderNum;
+ /**
+ * 下单地点经度
+ */
+ private Double placementLon;
+ /**
+ * 下单地点纬度
+ */
+ private Double placementLat;
+ /**
+ * 下单地点
+ */
+ private String placementAddress;
+ /**
+ * 出发地经度值
+ */
+ private Double startLon;
+ /**
+ * 出发地纬度值
+ */
+ private Double startLat;
+ /**
+ * 目的地经度
+ */
+ private Double endLon;
+ /**
+ * 出发地地点
+ */
+ private String startAddress;
+ /**
+ * 目的地纬度
+ */
+ private Double endLat;
+ /**
+ * 目的地地点
+ */
+ private String endAddress;
+ /**
+ * 上车点经度
+ */
+ private Double boardingLon;
+ /**
+ * 上车点纬度
+ */
+ private Double boardingLat;
+ /**
+ * 上车点
+ */
+ private String boardingAddress;
+ /**
+ * 上车时间
+ */
+ private Date boardingTime;
+ /**
+ * 下车点经度
+ */
+ private Double getoffLon;
+ /**
+ * 下车点纬度
+ */
+ private Double getoffLat;
+ /**
+ * 下车地点
+ */
+ private String getoffAddress;
+ /**
+ * 下车时间
+ */
+ private Date getoffTime;
+ /**
+ * 行驶里程数（米）
+ */
+ private Double mileage;
+ /**
+ * 支付方式（1=OK平台支付，2=其他方式支付）
+ */
+ private Integer payManner;
+ /**
+ * 支付方式(1=微信，2=支付宝，3=其他)
+ */
+ private Integer payType;
+ /**
+ * 订单金额
+ */
+ private BigDecimal orderMoney;
+ /**
+ * 行程费
+ */
+ private BigDecimal travelMoney;
+ /**
+ * 停车费
+ */
+ private BigDecimal parkMoney;
+ /**
+ * 过路费
+ */
+ private BigDecimal roadTollMoney;
+ /**
+ * 小费
+ */
+ private BigDecimal tipMoney;
+ /**
+ * 红包抵扣金额
+ */
+ private BigDecimal redPacketMoney;
+ /**
+ * 优惠券抵扣金额
+ */
+ private BigDecimal couponMoney;
+ /**
+ * 红包记录id
+ */
+ private Integer redPacketId;
+ /**
+ * 优惠券id
+ */
+ private Integer couponId;
+ /**
+ * 公司id
+ */
+ private Integer companyId;
+ /**
+ * 支付金额
+ */
+ private BigDecimal payMoney;
+ /**
+ * 是否是代下单（0：否，1：是）
+ */
+ private Integer substitute;
+ /**
+ * 乘车人
+ */
+ private String passengers;
+ /**
+ * 乘车人电话
+ */
+ private String passengersPhone;
+ /**
+ * 状态(1=待接单，2=待出发，3=待到达预约地点，4=待乘客上车，5=服务中，6=完成服务，7=待支付，8=待评价，9=已完成，10=已取消，11=改派中)
+ */
+ private Integer state;
+ /**
+ * 状态(改派前订单状态)
+ */
+ private Integer oldState;
+ /**
+ * 下单时间
+ */
+ private Date insertTime;
+ /**
+ * 出行时间
+ */
+ private Date travelTime;
+ /**
+ * 抢单时间
+ */
+ private Date snatchOrderTime;
+ /**
+ * 司机点出发时间
+ */
+ private Date setOutTime;
+ /**
+ * 司机到达预约地点时间
+ */
+ private Date arriveTime;
+ /**
+ * 开始服务时间
+ */
+ private Date startServiceTime;
+ /**
+ * 结束服务时间
+ */
+ private Date endServiceTime;
+ /**
+ * 订单类型(1=普通，2=预约)
+ */
+ private Integer orderType;
+ /**
+ * 下单方式（1：APP下单，2：扫码下单，3：小程序下单，4：司机下单，5：调度下单）
+ */
+ private Integer orderSource;
+ /**
+ * 发票id
+ */
+ private Integer invoiceId;
+ /**
+ * 是否是改派单（1=否，2=是）
+ */
+ private Integer isReassign;
+ /**
+ * 是否删除 1=否 2=是
+ */
+ private Integer isDelete;
+
+ public Integer getOldState() {
+ return oldState;
+ }
+
+ public void setOldState(Integer oldState) {
+ this.oldState = oldState;
+ }
+
+ public Integer getIsDelete() {
+ return isDelete;
+ }
+
+ public void setIsDelete(Integer isDelete) {
+ this.isDelete = isDelete;
+ }
+
+ public Integer getId() {
+ return id;
+ }
+
+ public void setId(Integer id) {
+ this.id = id;
+ }
+
+ public Integer getUserId() {
+ return userId;
+ }
+
+ public void setUserId(Integer userId) {
+ this.userId = userId;
+ }
+
+ public Integer getDriverId() {
+ return driverId;
+ }
+
+ public void setDriverId(Integer driverId) {
+ this.driverId = driverId;
+ }
+
+ public Integer getCarId() {
+ return carId;
+ }
+
+ public void setCarId(Integer carId) {
+ this.carId = carId;
+ }
+
+ public String getOrderNum() {
+ return orderNum;
+ }
+
+ public void setOrderNum(String orderNum) {
+ this.orderNum = orderNum;
+ }
+
+ public Double getPlacementLon() {
+ return placementLon;
+ }
+
+ public void setPlacementLon(Double placementLon) {
+ this.placementLon = placementLon;
+ }
+
+ public Double getPlacementLat() {
+ return placementLat;
+ }
+
+ public void setPlacementLat(Double placementLat) {
+ this.placementLat = placementLat;
+ }
+
+ public String getPlacementAddress() {
+ return placementAddress;
+ }
+
+ public void setPlacementAddress(String placementAddress) {
+ this.placementAddress = placementAddress;
+ }
+
+ public Double getStartLon() {
+ return startLon;
+ }
+
+ public void setStartLon(Double startLon) {
+ this.startLon = startLon;
+ }
+
+ public Double getStartLat() {
+ return startLat;
+ }
+
+ public void setStartLat(Double startLat) {
+ this.startLat = startLat;
+ }
+
+ public Double getEndLon() {
+ return endLon;
+ }
+
+ public void setEndLon(Double endLon) {
+ this.endLon = endLon;
+ }
+
+ public String getStartAddress() {
+ return startAddress;
+ }
+
+ public void setStartAddress(String startAddress) {
+ this.startAddress = startAddress;
+ }
+
+ public Double getEndLat() {
+ return endLat;
+ }
+
+ public void setEndLat(Double endLat) {
+ this.endLat = endLat;
+ }
+
+ public String getEndAddress() {
+ return endAddress;
+ }
+
+ public void setEndAddress(String endAddress) {
+ this.endAddress = endAddress;
+ }
+
+ public Double getBoardingLon() {
+ return boardingLon;
+ }
+
+ public void setBoardingLon(Double boardingLon) {
+ this.boardingLon = boardingLon;
+ }
+
+ public Double getBoardingLat() {
+ return boardingLat;
+ }
+
+ public void setBoardingLat(Double boardingLat) {
+ this.boardingLat = boardingLat;
+ }
+
+ public String getBoardingAddress() {
+ return boardingAddress;
+ }
+
+ public void setBoardingAddress(String boardingAddress) {
+ this.boardingAddress = boardingAddress;
+ }
+
+ public Date getBoardingTime() {
+ return boardingTime;
+ }
+
+ public void setBoardingTime(Date boardingTime) {
+ this.boardingTime = boardingTime;
+ }
+
+ public Double getGetoffLon() {
+ return getoffLon;
+ }
+
+ public void setGetoffLon(Double getoffLon) {
+ this.getoffLon = getoffLon;
+ }
+
+ public Double getGetoffLat() {
+ return getoffLat;
+ }
+
+ public void setGetoffLat(Double getoffLat) {
+ this.getoffLat = getoffLat;
+ }
+
+ public String getGetoffAddress() {
+ return getoffAddress;
+ }
+
+ public void setGetoffAddress(String getoffAddress) {
+ this.getoffAddress = getoffAddress;
+ }
+
+ public Date getGetoffTime() {
+ return getoffTime;
+ }
+
+ public void setGetoffTime(Date getoffTime) {
+ this.getoffTime = getoffTime;
+ }
+
+ public Double getMileage() {
+ return mileage;
+ }
+
+ public void setMileage(Double mileage) {
+ this.mileage = mileage;
+ }
+
+ public Integer getPayManner() {
+ return payManner;
+ }
+
+ public void setPayManner(Integer payManner) {
+ this.payManner = payManner;
+ }
+
+ public Integer getPayType() {
+ return payType;
+ }
+
+ public void setPayType(Integer payType) {
+ this.payType = payType;
+ }
+
+ public BigDecimal getOrderMoney() {
+ return orderMoney;
+ }
+
+ public void setOrderMoney(BigDecimal orderMoney) {
+ this.orderMoney = orderMoney;
+ }
+
+ public BigDecimal getTravelMoney() {
+ return travelMoney;
+ }
+
+ public void setTravelMoney(BigDecimal travelMoney) {
+ this.travelMoney = travelMoney;
+ }
+
+ public BigDecimal getParkMoney() {
+ return parkMoney;
+ }
+
+ public void setParkMoney(BigDecimal parkMoney) {
+ this.parkMoney = parkMoney;
+ }
+
+ public BigDecimal getRoadTollMoney() {
+ return roadTollMoney;
+ }
+
+ public void setRoadTollMoney(BigDecimal roadTollMoney) {
+ this.roadTollMoney = roadTollMoney;
+ }
+
+ public BigDecimal getTipMoney() {
+ return tipMoney;
+ }
+
+ public void setTipMoney(BigDecimal tipMoney) {
+ this.tipMoney = tipMoney;
+ }
+
+ public BigDecimal getRedPacketMoney() {
+ return redPacketMoney;
+ }
+
+ public void setRedPacketMoney(BigDecimal redPacketMoney) {
+ this.redPacketMoney = redPacketMoney;
+ }
+
+ public BigDecimal getCouponMoney() {
+ return couponMoney;
+ }
+
+ public void setCouponMoney(BigDecimal couponMoney) {
+ this.couponMoney = couponMoney;
+ }
+
+ public Integer getRedPacketId() {
+ return redPacketId;
+ }
+
+ public void setRedPacketId(Integer redPacketId) {
+ this.redPacketId = redPacketId;
+ }
+
+ public Integer getCouponId() {
+ return couponId;
+ }
+
+ public void setCouponId(Integer couponId) {
+ this.couponId = couponId;
+ }
+
+ public Integer getCompanyId() {
+ return companyId;
+ }
+
+ public void setCompanyId(Integer companyId) {
+ this.companyId = companyId;
+ }
+
+ public BigDecimal getPayMoney() {
+ return payMoney;
+ }
+
+ public void setPayMoney(BigDecimal payMoney) {
+ this.payMoney = payMoney;
+ }
+
+ public Integer getSubstitute() {
+ return substitute;
+ }
+
+ public void setSubstitute(Integer substitute) {
+ this.substitute = substitute;
+ }
+
+ public String getPassengers() {
+ return passengers;
+ }
+
+ public void setPassengers(String passengers) {
+ this.passengers = passengers;
+ }
+
+ public String getPassengersPhone() {
+ return passengersPhone;
+ }
+
+ public void setPassengersPhone(String passengersPhone) {
+ this.passengersPhone = passengersPhone;
+ }
+
+ public Integer getState() {
+ return state;
+ }
+
+ public void setState(Integer state) {
+ this.state = state;
+ }
+
+ public Date getInsertTime() {
+ return insertTime;
+ }
+
+ public void setInsertTime(Date insertTime) {
+ this.insertTime = insertTime;
+ }
+
+ public Date getTravelTime() {
+ return travelTime;
+ }
+
+ public void setTravelTime(Date travelTime) {
+ this.travelTime = travelTime;
+ }
+
+ public Date getSnatchOrderTime() {
+ return snatchOrderTime;
+ }
+
+ public void setSnatchOrderTime(Date snatchOrderTime) {
+ this.snatchOrderTime = snatchOrderTime;
+ }
+
+ public Date getSetOutTime() {
+ return setOutTime;
+ }
+
+ public void setSetOutTime(Date setOutTime) {
+ this.setOutTime = setOutTime;
+ }
+
+ public Date getArriveTime() {
+ return arriveTime;
+ }
+
+ public void setArriveTime(Date arriveTime) {
+ this.arriveTime = arriveTime;
+ }
+
+ public Date getStartServiceTime() {
+ return startServiceTime;
+ }
+
+ public void setStartServiceTime(Date startServiceTime) {
+ this.startServiceTime = startServiceTime;
+ }
+
+ public Date getEndServiceTime() {
+ return endServiceTime;
+ }
+
+ public void setEndServiceTime(Date endServiceTime) {
+ this.endServiceTime = endServiceTime;
+ }
+
+ public Integer getOrderType() {
+ return orderType;
+ }
+
+ public void setOrderType(Integer orderType) {
+ this.orderType = orderType;
+ }
+
+ public Integer getOrderSource() {
+ return orderSource;
+ }
+
+ public void setOrderSource(Integer orderSource) {
+ this.orderSource = orderSource;
+ }
+
+ public Integer getInvoiceId() {
+ return invoiceId;
+ }
+
+ public void setInvoiceId(Integer invoiceId) {
+ this.invoiceId = invoiceId;
+ }
+
+ public Integer getIsReassign() {
+ return isReassign;
+ }
+
+ public void setIsReassign(Integer isReassign) {
+ this.isReassign = isReassign;
+ }
+
+ @Override
+ protected Serializable pkVal() {
+ return this.id;
+ }
+
+ @Override
+ public String toString() {
+ return "TOrderTaxi{" +
+ "id=" + id +
+ ", userId=" + userId +
+ ", driverId=" + driverId +
+ ", carId=" + carId +
+ ", orderNum=" + orderNum +
+ ", placementLon=" + placementLon +
+ ", placementLat=" + placementLat +
+ ", placementAddress=" + placementAddress +
+ ", startLon=" + startLon +
+ ", startLat=" + startLat +
+ ", endLon=" + endLon +
+ ", startAddress=" + startAddress +
+ ", endLat=" + endLat +
+ ", endAddress=" + endAddress +
+ ", boardingLon=" + boardingLon +
+ ", boardingLat=" + boardingLat +
+ ", boardingAddress=" + boardingAddress +
+ ", boardingTime=" + boardingTime +
+ ", getoffLon=" + getoffLon +
+ ", getoffLat=" + getoffLat +
+ ", getoffAddress=" + getoffAddress +
+ ", getoffTime=" + getoffTime +
+ ", mileage=" + mileage +
+ ", payManner=" + payManner +
+ ", payType=" + payType +
+ ", orderMoney=" + orderMoney +
+ ", travelMoney=" + travelMoney +
+ ", parkMoney=" + parkMoney +
+ ", roadTollMoney=" + roadTollMoney +
+ ", tipMoney=" + tipMoney +
+ ", redPacketMoney=" + redPacketMoney +
+ ", couponMoney=" + couponMoney +
+ ", redPacketId=" + redPacketId +
+ ", couponId=" + couponId +
+ ", companyId=" + companyId +
+ ", payMoney=" + payMoney +
+ ", substitute=" + substitute +
+ ", passengers=" + passengers +
+ ", passengersPhone=" + passengersPhone +
+ ", state=" + state +
+ ", insertTime=" + insertTime +
+ ", travelTime=" + travelTime +
+ ", snatchOrderTime=" + snatchOrderTime +
+ ", setOutTime=" + setOutTime +
+ ", arriveTime=" + arriveTime +
+ ", startServiceTime=" + startServiceTime +
+ ", endServiceTime=" + endServiceTime +
+ ", orderType=" + orderType +
+ ", orderSource=" + orderSource +
+ ", invoiceId=" + invoiceId +
+ ", isReassign=" + isReassign +
+ "}";
+ }
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TPhone.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TPhone.java
new file mode 100644
index 0000000..2a7786f
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TPhone.java
@@ -0,0 +1,94 @@
+package com.stylefeng.guns.modular.system.model;
+
+import com.baomidou.mybatisplus.activerecord.Model;
+import com.baomidou.mybatisplus.annotations.TableName;
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 系统电话设置
+ * </p>
+ *
+ * @author 吕雪
+ * @since 2020-06-09
+ */
+@TableName("t_phone")
+public class TPhone extends Model<TPhone> {
+
+ private static final long serialVersionUID = 1L;
+
+ private Integer id;
+ /**
+ * 数据类型（1：报警电话，2：客服电话）
+ */
+ private Integer type;
+ /**
+ * 是否是平台（1=是，2=否）
+ */
+ private Integer platform;
+ /**
+ * 电话号码
+ */
+ private String phone;
+ /**
+ * 企业id
+ */
+ private Integer companyId;
+
+
+ public Integer getId() {
+ return id;
+ }
+
+ public void setId(Integer id) {
+ this.id = id;
+ }
+
+ public Integer getType() {
+ return type;
+ }
+
+ public void setType(Integer type) {
+ this.type = type;
+ }
+
+ public Integer getPlatform() {
+ return platform;
+ }
+
+ public void setPlatform(Integer platform) {
+ this.platform = platform;
+ }
+
+ public String getPhone() {
+ return phone;
+ }
+
+ public void setPhone(String phone) {
+ this.phone = phone;
+ }
+
+ public Integer getCompanyId() {
+ return companyId;
+ }
+
+ public void setCompanyId(Integer companyId) {
+ this.companyId = companyId;
+ }
+
+ @Override
+ protected Serializable pkVal() {
+ return this.id;
+ }
+
+ @Override
+ public String toString() {
+ return "TPhone{" +
+ "id=" + id +
+ ", type=" + type +
+ ", platform=" + platform +
+ ", phone=" + phone +
+ ", companyId=" + companyId +
+ "}";
+ }
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TProblem.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TProblem.java
new file mode 100644
index 0000000..1e607bb
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TProblem.java
@@ -0,0 +1,137 @@
+package com.stylefeng.guns.modular.system.model;
+
+import com.baomidou.mybatisplus.enums.IdType;
+import java.util.Date;
+import com.baomidou.mybatisplus.annotations.TableId;
+import com.baomidou.mybatisplus.activerecord.Model;
+import com.baomidou.mybatisplus.annotations.TableName;
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 在线客服
+ * </p>
+ *
+ * @author 吕雪
+ * @since 2020-06-24
+ */
+@TableName("t_problem")
+public class TProblem extends Model<TProblem> {
+
+ private static final long serialVersionUID = 1L;
+
+ @TableId(value = "id", type = IdType.AUTO)
+ private Integer id;
+ /**
+ * 用户id
+ */
+ private Integer userId;
+ /**
+ * 提问内容
+ */
+ private String content;
+ /**
+ * 回答内容
+ */
+ private String answer;
+ /**
+ * 处理人id
+ */
+ private Integer handleUserId;
+ /**
+ * 处理时间
+ */
+ private Date handleTime;
+ /**
+ * 提问时间
+ */
+ private Date insertTime;
+ /**
+ * 状态（1=待处理，2=已处理）
+ */
+ private Integer state;
+
+
+ public Integer getId() {
+ return id;
+ }
+
+ public void setId(Integer id) {
+ this.id = id;
+ }
+
+ public Integer getUserId() {
+ return userId;
+ }
+
+ public void setUserId(Integer userId) {
+ this.userId = userId;
+ }
+
+ public String getContent() {
+ return content;
+ }
+
+ public void setContent(String content) {
+ this.content = content;
+ }
+
+ public String getAnswer() {
+ return answer;
+ }
+
+ public void setAnswer(String answer) {
+ this.answer = answer;
+ }
+
+ public Integer getHandleUserId() {
+ return handleUserId;
+ }
+
+ public void setHandleUserId(Integer handleUserId) {
+ this.handleUserId = handleUserId;
+ }
+
+ public Date getHandleTime() {
+ return handleTime;
+ }
+
+ public void setHandleTime(Date handleTime) {
+ this.handleTime = handleTime;
+ }
+
+ public Date getInsertTime() {
+ return insertTime;
+ }
+
+ public void setInsertTime(Date insertTime) {
+ this.insertTime = insertTime;
+ }
+
+ public Integer getState() {
+ return state;
+ }
+
+ public void setState(Integer state) {
+ this.state = state;
+ }
+
+ @Override
+ protected Serializable pkVal() {
+ return this.id;
+ }
+
+ @Override
+ public String toString() {
+ return "TProblem{" +
+ "id=" + id +
+ ", userId=" + userId +
+ ", content=" + content +
+ ", answer=" + answer +
+ ", handleUserId=" + handleUserId +
+ ", handleTime=" + handleTime +
+ ", insertTime=" + insertTime +
+ ", state=" + state +
+ "}";
+ }
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TPubTransactionDetails.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TPubTransactionDetails.java
new file mode 100644
index 0000000..90b830b
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TPubTransactionDetails.java
@@ -0,0 +1,167 @@
+package com.stylefeng.guns.modular.system.model;
+
+import com.baomidou.mybatisplus.enums.IdType;
+import java.math.BigDecimal;
+import java.util.Date;
+import com.baomidou.mybatisplus.annotations.TableId;
+import com.baomidou.mybatisplus.activerecord.Model;
+import com.baomidou.mybatisplus.annotations.TableName;
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 交易明细(司机/用户)
+ * </p>
+ *
+ * @author 吕雪
+ * @since 2020-09-16
+ */
+@TableName("t_pub_transaction_details")
+public class TPubTransactionDetails extends Model<TPubTransactionDetails> {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 主键id
+ */
+ @TableId(value = "id", type = IdType.AUTO)
+ private Integer id;
+ /**
+ * 用户id
+ */
+ private Integer userId;
+ /**
+ * 创建时间
+ */
+ private Date insertTime;
+ /**
+ * 备注
+ */
+ private String remark;
+ /**
+ * 金额/积分
+ */
+ private BigDecimal money;
+ /**
+ * 状态(1=增加，2=减少)
+ */
+ private Integer state;
+ /**
+ * 类型(1=金额，2=积分)
+ */
+ private Integer type;
+ /**
+ * 类型(1=用户，2=司机)
+ */
+ private Integer userType;
+ /**
+ * 订单类型(1=专车，2=出租车，3=城际，4=小件物流，5=余额充值)
+ */
+ private Integer orderType;
+ /**
+ * 订单id
+ */
+ private Integer orderId;
+
+
+ public Integer getId() {
+ return id;
+ }
+
+ public void setId(Integer id) {
+ this.id = id;
+ }
+
+ public Integer getUserId() {
+ return userId;
+ }
+
+ public void setUserId(Integer userId) {
+ this.userId = userId;
+ }
+
+ public Date getInsertTime() {
+ return insertTime;
+ }
+
+ public void setInsertTime(Date insertTime) {
+ this.insertTime = insertTime;
+ }
+
+ public String getRemark() {
+ return remark;
+ }
+
+ public void setRemark(String remark) {
+ this.remark = remark;
+ }
+
+ public BigDecimal getMoney() {
+ return money;
+ }
+
+ public void setMoney(BigDecimal money) {
+ this.money = money;
+ }
+
+ public Integer getState() {
+ return state;
+ }
+
+ public void setState(Integer state) {
+ this.state = state;
+ }
+
+ public Integer getType() {
+ return type;
+ }
+
+ public void setType(Integer type) {
+ this.type = type;
+ }
+
+ public Integer getUserType() {
+ return userType;
+ }
+
+ public void setUserType(Integer userType) {
+ this.userType = userType;
+ }
+
+ public Integer getOrderType() {
+ return orderType;
+ }
+
+ public void setOrderType(Integer orderType) {
+ this.orderType = orderType;
+ }
+
+ public Integer getOrderId() {
+ return orderId;
+ }
+
+ public void setOrderId(Integer orderId) {
+ this.orderId = orderId;
+ }
+
+ @Override
+ protected Serializable pkVal() {
+ return this.id;
+ }
+
+ @Override
+ public String toString() {
+ return "TPubTransactionDetails{" +
+ "id=" + id +
+ ", userId=" + userId +
+ ", insertTime=" + insertTime +
+ ", remark=" + remark +
+ ", money=" + money +
+ ", state=" + state +
+ ", type=" + type +
+ ", userType=" + userType +
+ ", orderType=" + orderType +
+ ", orderId=" + orderId +
+ "}";
+ }
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TPubWithdrawal.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TPubWithdrawal.java
new file mode 100644
index 0000000..4f469e7
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TPubWithdrawal.java
@@ -0,0 +1,206 @@
+package com.stylefeng.guns.modular.system.model;
+
+import com.baomidou.mybatisplus.enums.IdType;
+import java.math.BigDecimal;
+import java.util.Date;
+import com.baomidou.mybatisplus.annotations.TableId;
+import com.baomidou.mybatisplus.activerecord.Model;
+import com.baomidou.mybatisplus.annotations.TableName;
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 提现记录表(司机/用户)
+ * </p>
+ *
+ * @author 吕雪
+ * @since 2020-06-09
+ */
+@TableName("t_pub_withdrawal")
+public class TPubWithdrawal extends Model<TPubWithdrawal> {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 主键id
+ */
+ @TableId(value = "id", type = IdType.AUTO)
+ private Integer id;
+ /**
+ * 用户id
+ */
+ private Integer userId;
+ /**
+ * 处理时间
+ */
+ private Date handleTime;
+ /**
+ * 原钱包余额
+ */
+ private BigDecimal balance;
+ /**
+ * 提现金额
+ */
+ private BigDecimal money;
+ /**
+ * 状态(1=待处理，2=成功，3=失败)
+ */
+ private Integer state;
+ /**
+ * 备注
+ */
+ private String remark;
+ /**
+ * 银行账号
+ */
+ private String code;
+ /**
+ * 账户持有人姓名
+ */
+ private String name;
+ /**
+ * 用户类型(1=用户，2=司机)
+ */
+ private Integer userType;
+ /**
+ * 申请时间
+ */
+ private Date insertTime;
+ /**
+ * 1：创建，2：修改，3：删除
+ */
+ private Integer flag;
+ /**
+ * 提现方式 1=银行卡 2=线下
+ */
+ private Integer withdrawalType;
+
+
+ public Integer getId() {
+ return id;
+ }
+
+ public void setId(Integer id) {
+ this.id = id;
+ }
+
+ public Integer getUserId() {
+ return userId;
+ }
+
+ public void setUserId(Integer userId) {
+ this.userId = userId;
+ }
+
+ public Date getHandleTime() {
+ return handleTime;
+ }
+
+ public void setHandleTime(Date handleTime) {
+ this.handleTime = handleTime;
+ }
+
+ public BigDecimal getBalance() {
+ return balance;
+ }
+
+ public void setBalance(BigDecimal balance) {
+ this.balance = balance;
+ }
+
+ public BigDecimal getMoney() {
+ return money;
+ }
+
+ public void setMoney(BigDecimal money) {
+ this.money = money;
+ }
+
+ public Integer getState() {
+ return state;
+ }
+
+ public void setState(Integer state) {
+ this.state = state;
+ }
+
+ public String getRemark() {
+ return remark;
+ }
+
+ public void setRemark(String remark) {
+ this.remark = remark;
+ }
+
+ public String getCode() {
+ return code;
+ }
+
+ public void setCode(String code) {
+ this.code = code;
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ public Integer getUserType() {
+ return userType;
+ }
+
+ public void setUserType(Integer userType) {
+ this.userType = userType;
+ }
+
+ public Date getInsertTime() {
+ return insertTime;
+ }
+
+ public void setInsertTime(Date insertTime) {
+ this.insertTime = insertTime;
+ }
+
+ public Integer getFlag() {
+ return flag;
+ }
+
+ public void setFlag(Integer flag) {
+ this.flag = flag;
+ }
+
+ public Integer getWithdrawalType() {
+ return withdrawalType;
+ }
+
+ public void setWithdrawalType(Integer withdrawalType) {
+ this.withdrawalType = withdrawalType;
+ }
+
+ @Override
+ protected Serializable pkVal() {
+ return this.id;
+ }
+
+ @Override
+ public String toString() {
+ return "TPubWithdrawal{" +
+ "id=" + id +
+ ", userId=" + userId +
+ ", handleTime=" + handleTime +
+ ", balance=" + balance +
+ ", money=" + money +
+ ", state=" + state +
+ ", remark=" + remark +
+ ", code=" + code +
+ ", name=" + name +
+ ", userType=" + userType +
+ ", insertTime=" + insertTime +
+ ", flag=" + flag +
+ ", withdrawalType=" + withdrawalType +
+ "}";
+ }
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TReassign.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TReassign.java
new file mode 100644
index 0000000..e71ba0b
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TReassign.java
@@ -0,0 +1,268 @@
+package com.stylefeng.guns.modular.system.model;
+
+import com.baomidou.mybatisplus.annotations.TableField;
+import com.baomidou.mybatisplus.enums.IdType;
+import java.util.Date;
+import com.baomidou.mybatisplus.annotations.TableId;
+import com.baomidou.mybatisplus.activerecord.Model;
+import com.baomidou.mybatisplus.annotations.TableName;
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 订单改派
+ * </p>
+ *
+ * @author 吕雪
+ * @since 2020-09-03
+ */
+@TableName("t_reassign")
+public class TReassign extends Model<TReassign> {
+
+ private static final long serialVersionUID = 1L;
+
+ @TableId(value = "id", type = IdType.AUTO)
+ private Integer id;
+ /**
+ * 订单类型（1=专车，2=出租车，3=城际，4=小件物流-同城，5=小件物流-跨城，6=包车）
+ */
+ private Integer orderType;
+ /**
+ * 订单id
+ */
+ private Integer orderId;
+ /**
+ * 申请司机id
+ */
+ private Integer originalDriverId;
+ /**
+ * 原始车辆id
+ */
+ private Integer originalCarId;
+ /**
+ * 申请时间
+ */
+ private Date insertTime;
+ /**
+ * 改派后的司机id
+ */
+ private Integer nowDriverId;
+ /**
+ * 改派后的车辆id
+ */
+ private Integer nowCarId;
+ /**
+ * 改派支付金额
+ */
+ private Double money;
+ /**
+ * 改派支付方式（1=微信，2=支付宝，3=余额）
+ */
+ private Integer payType;
+ /**
+ * 支付完成时间
+ */
+ private Date payTime;
+ /**
+ * 第三方支付订单号
+ */
+ private String payOrder;
+ /**
+ * 1=提交申请，2=已支付，3=已改派，4=已取消，5=已拒绝
+ */
+ private Integer state;
+ /**
+ * 改派原因
+ */
+ private String reason;
+ /**
+ * 备注
+ */
+ private String remark;
+ /**
+ * 处理人
+ */
+ @TableField("reviewer")
+ private Integer reviewer;
+ /**
+ * 处理人类型（1=调度，2=后台管理员）
+ */
+ @TableField("reviewerType")
+ private Integer reviewerType;
+ /**
+ * 改派完成时间
+ */
+ private Date completeTime;
+
+
+ public Integer getId() {
+ return id;
+ }
+
+ public void setId(Integer id) {
+ this.id = id;
+ }
+
+ public Integer getOrderType() {
+ return orderType;
+ }
+
+ public void setOrderType(Integer orderType) {
+ this.orderType = orderType;
+ }
+
+ public Integer getOrderId() {
+ return orderId;
+ }
+
+ public void setOrderId(Integer orderId) {
+ this.orderId = orderId;
+ }
+
+ public Integer getOriginalDriverId() {
+ return originalDriverId;
+ }
+
+ public void setOriginalDriverId(Integer originalDriverId) {
+ this.originalDriverId = originalDriverId;
+ }
+
+ public Integer getOriginalCarId() {
+ return originalCarId;
+ }
+
+ public void setOriginalCarId(Integer originalCarId) {
+ this.originalCarId = originalCarId;
+ }
+
+ public Date getInsertTime() {
+ return insertTime;
+ }
+
+ public void setInsertTime(Date insertTime) {
+ this.insertTime = insertTime;
+ }
+
+ public Integer getNowDriverId() {
+ return nowDriverId;
+ }
+
+ public void setNowDriverId(Integer nowDriverId) {
+ this.nowDriverId = nowDriverId;
+ }
+
+ public Integer getNowCarId() {
+ return nowCarId;
+ }
+
+ public void setNowCarId(Integer nowCarId) {
+ this.nowCarId = nowCarId;
+ }
+
+ public Double getMoney() {
+ return money;
+ }
+
+ public void setMoney(Double money) {
+ this.money = money;
+ }
+
+ public Integer getPayType() {
+ return payType;
+ }
+
+ public void setPayType(Integer payType) {
+ this.payType = payType;
+ }
+
+ public Date getPayTime() {
+ return payTime;
+ }
+
+ public void setPayTime(Date payTime) {
+ this.payTime = payTime;
+ }
+
+ public String getPayOrder() {
+ return payOrder;
+ }
+
+ public void setPayOrder(String payOrder) {
+ this.payOrder = payOrder;
+ }
+
+ public Integer getState() {
+ return state;
+ }
+
+ public void setState(Integer state) {
+ this.state = state;
+ }
+
+ public String getReason() {
+ return reason;
+ }
+
+ public void setReason(String reason) {
+ this.reason = reason;
+ }
+
+ public String getRemark() {
+ return remark;
+ }
+
+ public void setRemark(String remark) {
+ this.remark = remark;
+ }
+
+ public Date getCompleteTime() {
+ return completeTime;
+ }
+
+ public void setCompleteTime(Date completeTime) {
+ this.completeTime = completeTime;
+ }
+
+ @Override
+ protected Serializable pkVal() {
+ return this.id;
+ }
+
+ public Integer getReviewer() {
+ return reviewer;
+ }
+
+ public void setReviewer(Integer reviewer) {
+ this.reviewer = reviewer;
+ }
+
+ public Integer getReviewerType() {
+ return reviewerType;
+ }
+
+ public void setReviewerType(Integer reviewerType) {
+ this.reviewerType = reviewerType;
+ }
+
+ @Override
+ public String toString() {
+ return "TReassign{" +
+ "id=" + id +
+ ", orderType=" + orderType +
+ ", orderId=" + orderId +
+ ", originalDriverId=" + originalDriverId +
+ ", originalCarId=" + originalCarId +
+ ", insertTime=" + insertTime +
+ ", nowDriverId=" + nowDriverId +
+ ", nowCarId=" + nowCarId +
+ ", money=" + money +
+ ", payType=" + payType +
+ ", payTime=" + payTime +
+ ", payOrder=" + payOrder +
+ ", state=" + state +
+ ", reason=" + reason +
+ ", remark=" + remark +
+ ", completeTime=" + completeTime +
+ "}";
+ }
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TRegion.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TRegion.java
new file mode 100644
index 0000000..6ff4628
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TRegion.java
@@ -0,0 +1,109 @@
+package com.stylefeng.guns.modular.system.model;
+
+import com.baomidou.mybatisplus.enums.IdType;
+import com.baomidou.mybatisplus.annotations.TableId;
+import com.baomidou.mybatisplus.annotations.TableField;
+import com.baomidou.mybatisplus.activerecord.Model;
+import com.baomidou.mybatisplus.annotations.TableName;
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 省市区三级联动
+ * </p>
+ *
+ * @author 吕雪
+ * @since 2020-06-02
+ */
+@TableName("t_region")
+public class TRegion extends Model<TRegion> {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 主键ID
+ */
+ @TableId(value = "id", type = IdType.AUTO)
+ private Integer id;
+ /**
+ * 城市名称
+ */
+ private String name;
+ private String code;
+ private String citycode;
+ /**
+ * 父级ID
+ */
+ @TableField("parent_id")
+ private Integer parentId;
+ /**
+ * 英文名称
+ */
+ private String english;
+
+
+ public Integer getId() {
+ return id;
+ }
+
+ public void setId(Integer id) {
+ this.id = id;
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ public String getCode() {
+ return code;
+ }
+
+ public void setCode(String code) {
+ this.code = code;
+ }
+
+ public String getCitycode() {
+ return citycode;
+ }
+
+ public void setCitycode(String citycode) {
+ this.citycode = citycode;
+ }
+
+ public Integer getParentId() {
+ return parentId;
+ }
+
+ public void setParentId(Integer parentId) {
+ this.parentId = parentId;
+ }
+
+ public String getEnglish() {
+ return english;
+ }
+
+ public void setEnglish(String english) {
+ this.english = english;
+ }
+
+ @Override
+ protected Serializable pkVal() {
+ return this.id;
+ }
+
+ @Override
+ public String toString() {
+ return "TRegion{" +
+ "id=" + id +
+ ", name=" + name +
+ ", code=" + code +
+ ", citycode=" + citycode +
+ ", parentId=" + parentId +
+ ", english=" + english +
+ "}";
+ }
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TServerCarmodel.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TServerCarmodel.java
new file mode 100644
index 0000000..61f6770
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TServerCarmodel.java
@@ -0,0 +1,125 @@
+package com.stylefeng.guns.modular.system.model;
+
+import com.baomidou.mybatisplus.enums.IdType;
+import java.util.Date;
+import com.baomidou.mybatisplus.annotations.TableId;
+import com.baomidou.mybatisplus.activerecord.Model;
+import com.baomidou.mybatisplus.annotations.TableName;
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 服务车型设置
+ * </p>
+ *
+ * @author 吕雪
+ * @since 2020-08-29
+ */
+@TableName("t_server_carmodel")
+public class TServerCarmodel extends Model<TServerCarmodel> {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 主键
+ */
+ @TableId(value = "id", type = IdType.AUTO)
+ private Integer id;
+ /**
+ * 业务类型（1=专车，2=城际，3=包车）
+ */
+ private Integer type;
+ /**
+ * 车型名称
+ */
+ private String name;
+ /**
+ * 车型图片
+ */
+ private String img;
+ /**
+ * 包车价格（100-300）
+ */
+ private String price;
+ /**
+ * 状态（1=正常，2=冻结，3=删除）
+ */
+ private Integer state;
+ /**
+ * 添加时间
+ */
+ private Date insertTime;
+
+ public String getPrice() {
+ return price;
+ }
+
+ public void setPrice(String price) {
+ this.price = price;
+ }
+
+ public Integer getId() {
+ return id;
+ }
+
+ public void setId(Integer id) {
+ this.id = id;
+ }
+
+ public Integer getType() {
+ return type;
+ }
+
+ public void setType(Integer type) {
+ this.type = type;
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ public String getImg() {
+ return img;
+ }
+
+ public void setImg(String img) {
+ this.img = img;
+ }
+
+ public Integer getState() {
+ return state;
+ }
+
+ public void setState(Integer state) {
+ this.state = state;
+ }
+
+ public Date getInsertTime() {
+ return insertTime;
+ }
+
+ public void setInsertTime(Date insertTime) {
+ this.insertTime = insertTime;
+ }
+
+ @Override
+ protected Serializable pkVal() {
+ return this.id;
+ }
+
+ @Override
+ public String toString() {
+ return "TServerCarmodel{" +
+ "id=" + id +
+ ", type=" + type +
+ ", name=" + name +
+ ", img=" + img +
+ ", state=" + state +
+ ", insertTime=" + insertTime +
+ "}";
+ }
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TSite.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TSite.java
new file mode 100644
index 0000000..6427c01
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TSite.java
@@ -0,0 +1,179 @@
+package com.stylefeng.guns.modular.system.model;
+
+import com.baomidou.mybatisplus.enums.IdType;
+import java.util.Date;
+import com.baomidou.mybatisplus.annotations.TableId;
+import com.baomidou.mybatisplus.activerecord.Model;
+import com.baomidou.mybatisplus.annotations.TableName;
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 线路站点
+ * </p>
+ *
+ * @author 吕雪
+ * @since 2020-09-04
+ */
+@TableName("t_site")
+public class TSite extends Model<TSite> {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 主键
+ */
+ @TableId(value = "id", type = IdType.AUTO)
+ private Integer id;
+ /**
+ * 站点名称
+ */
+ private String name;
+ /**
+ * 省名称
+ */
+ private String province;
+ /**
+ * 省编号
+ */
+ private String provinceCode;
+ /**
+ * 市名称
+ */
+ private String city;
+ /**
+ * 市编号
+ */
+ private String cityCode;
+ /**
+ * 区县名称
+ */
+ private String district;
+ /**
+ * 区县编号
+ */
+ private String districtCode;
+ /**
+ * 状态（1=正常，2=冻结，3=删除）
+ */
+ private Integer state;
+ /**
+ * 添加时间
+ */
+ private Date insertTime;
+ /**
+ * 添加人id
+ */
+ private Integer insertUserId;
+
+
+ public Integer getId() {
+ return id;
+ }
+
+ public void setId(Integer id) {
+ this.id = id;
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ public String getProvince() {
+ return province;
+ }
+
+ public void setProvince(String province) {
+ this.province = province;
+ }
+
+ public String getProvinceCode() {
+ return provinceCode;
+ }
+
+ public void setProvinceCode(String provinceCode) {
+ this.provinceCode = provinceCode;
+ }
+
+ public String getCity() {
+ return city;
+ }
+
+ public void setCity(String city) {
+ this.city = city;
+ }
+
+ public String getCityCode() {
+ return cityCode;
+ }
+
+ public void setCityCode(String cityCode) {
+ this.cityCode = cityCode;
+ }
+
+ public String getDistrict() {
+ return district;
+ }
+
+ public void setDistrict(String district) {
+ this.district = district;
+ }
+
+ public String getDistrictCode() {
+ return districtCode;
+ }
+
+ public void setDistrictCode(String districtCode) {
+ this.districtCode = districtCode;
+ }
+
+ public Integer getState() {
+ return state;
+ }
+
+ public void setState(Integer state) {
+ this.state = state;
+ }
+
+ public Date getInsertTime() {
+ return insertTime;
+ }
+
+ public void setInsertTime(Date insertTime) {
+ this.insertTime = insertTime;
+ }
+
+ public Integer getInsertUserId() {
+ return insertUserId;
+ }
+
+ public void setInsertUserId(Integer insertUserId) {
+ this.insertUserId = insertUserId;
+ }
+
+ @Override
+ protected Serializable pkVal() {
+ return this.id;
+ }
+
+ @Override
+ public String toString() {
+ return "TSite{" +
+ "id=" + id +
+ ", name=" + name +
+ ", province=" + province +
+ ", provinceCode=" + provinceCode +
+ ", city=" + city +
+ ", cityCode=" + cityCode +
+ ", district=" + district +
+ ", districtCode=" + districtCode +
+ ", state=" + state +
+ ", insertTime=" + insertTime +
+ ", insertUserId=" + insertUserId +
+ "}";
+ }
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TSmsrecord.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TSmsrecord.java
new file mode 100644
index 0000000..1f84b40
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TSmsrecord.java
@@ -0,0 +1,114 @@
+package com.stylefeng.guns.modular.system.model;
+
+import com.baomidou.mybatisplus.enums.IdType;
+import java.util.Date;
+import com.baomidou.mybatisplus.annotations.TableId;
+import com.baomidou.mybatisplus.activerecord.Model;
+import com.baomidou.mybatisplus.annotations.TableName;
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 验证码
+ * </p>
+ *
+ * @author 吕雪
+ * @since 2020-06-10
+ */
+@TableName("t_smsrecord")
+public class TSmsrecord extends Model<TSmsrecord> {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 主键ID
+ */
+ @TableId(value = "id", type = IdType.AUTO)
+ private Integer id;
+ /**
+ * 类型：1=用户端注册/登录，2=用户端更换手机,3=用户端忘记密码，4=用户修改密码，5=司机注册，6=司机忘记密码，7=司机修改手机号，8=司机修改密码
+ */
+ private Integer type;
+ /**
+ * 电话
+ */
+ private String phone;
+ /**
+ * 验证码
+ */
+ private String code;
+ /**
+ * 短信内容
+ */
+ private String content;
+ /**
+ * 添加时间
+ */
+ private Date createTime;
+
+
+ public Integer getId() {
+ return id;
+ }
+
+ public void setId(Integer id) {
+ this.id = id;
+ }
+
+ public Integer getType() {
+ return type;
+ }
+
+ public void setType(Integer type) {
+ this.type = type;
+ }
+
+ public String getPhone() {
+ return phone;
+ }
+
+ public void setPhone(String phone) {
+ this.phone = phone;
+ }
+
+ public String getCode() {
+ return code;
+ }
+
+ public void setCode(String code) {
+ this.code = code;
+ }
+
+ public String getContent() {
+ return content;
+ }
+
+ public void setContent(String content) {
+ this.content = content;
+ }
+
+ public Date getCreateTime() {
+ return createTime;
+ }
+
+ public void setCreateTime(Date createTime) {
+ this.createTime = createTime;
+ }
+
+ @Override
+ protected Serializable pkVal() {
+ return this.id;
+ }
+
+ @Override
+ public String toString() {
+ return "TSmsrecord{" +
+ "id=" + id +
+ ", type=" + type +
+ ", phone=" + phone +
+ ", code=" + code +
+ ", content=" + content +
+ ", createTime=" + createTime +
+ "}";
+ }
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TSysCancleOrder.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TSysCancleOrder.java
new file mode 100644
index 0000000..ddf12d4
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TSysCancleOrder.java
@@ -0,0 +1,114 @@
+package com.stylefeng.guns.modular.system.model;
+
+import com.baomidou.mybatisplus.enums.IdType;
+import java.math.BigDecimal;
+import com.baomidou.mybatisplus.annotations.TableId;
+import com.baomidou.mybatisplus.activerecord.Model;
+import com.baomidou.mybatisplus.annotations.TableName;
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 系统设置-取消订单
+ * </p>
+ *
+ * @author 吕雪
+ * @since 2020-06-09
+ */
+@TableName("t_sys_cancle_order")
+public class TSysCancleOrder extends Model<TSysCancleOrder> {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 主键id
+ */
+ @TableId(value = "id", type = IdType.AUTO)
+ private Integer id;
+ /**
+ * 企业id
+ */
+ private Integer companyId;
+ /**
+ * 时间(分钟)
+ */
+ private Integer minuteNum;
+ /**
+ * 金额
+ */
+ private BigDecimal money;
+ /**
+ * 1=普通单取消，2=预约单取消
+ */
+ private Integer type;
+ /**
+ * 1=专车，2=出租车,3=跨城出行
+ */
+ private Integer orderType;
+
+
+ public Integer getId() {
+ return id;
+ }
+
+ public void setId(Integer id) {
+ this.id = id;
+ }
+
+ public Integer getCompanyId() {
+ return companyId;
+ }
+
+ public void setCompanyId(Integer companyId) {
+ this.companyId = companyId;
+ }
+
+ public Integer getMinuteNum() {
+ return minuteNum;
+ }
+
+ public void setMinuteNum(Integer minuteNum) {
+ this.minuteNum = minuteNum;
+ }
+
+ public BigDecimal getMoney() {
+ return money;
+ }
+
+ public void setMoney(BigDecimal money) {
+ this.money = money;
+ }
+
+ public Integer getType() {
+ return type;
+ }
+
+ public void setType(Integer type) {
+ this.type = type;
+ }
+
+ public Integer getOrderType() {
+ return orderType;
+ }
+
+ public void setOrderType(Integer orderType) {
+ this.orderType = orderType;
+ }
+
+ @Override
+ protected Serializable pkVal() {
+ return this.id;
+ }
+
+ @Override
+ public String toString() {
+ return "TSysCancleOrder{" +
+ "id=" + id +
+ ", companyId=" + companyId +
+ ", minuteNum=" + minuteNum +
+ ", money=" + money +
+ ", type=" + type +
+ ", orderType=" + orderType +
+ "}";
+ }
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TSysFaceDistinguish.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TSysFaceDistinguish.java
new file mode 100644
index 0000000..4da14ac
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TSysFaceDistinguish.java
@@ -0,0 +1,87 @@
+package com.stylefeng.guns.modular.system.model;
+
+import com.baomidou.mybatisplus.enums.IdType;
+import com.baomidou.mybatisplus.annotations.TableId;
+import com.baomidou.mybatisplus.activerecord.Model;
+import com.baomidou.mybatisplus.annotations.TableName;
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 系统设置-人脸识别
+ * </p>
+ *
+ * @author 吕雪
+ * @since 2020-06-09
+ */
+@TableName("t_sys_face_distinguish")
+public class TSysFaceDistinguish extends Model<TSysFaceDistinguish> {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 主键id
+ */
+ @TableId(value = "id", type = IdType.AUTO)
+ private Integer id;
+ /**
+ * 企业id
+ */
+ private Integer companyId;
+ /**
+ * 是否打开(1=是，2=否)
+ */
+ private Integer isOpen;
+ /**
+ * 间隔分钟数
+ */
+ private Integer minuteNum;
+
+
+ public Integer getId() {
+ return id;
+ }
+
+ public void setId(Integer id) {
+ this.id = id;
+ }
+
+ public Integer getCompanyId() {
+ return companyId;
+ }
+
+ public void setCompanyId(Integer companyId) {
+ this.companyId = companyId;
+ }
+
+ public Integer getIsOpen() {
+ return isOpen;
+ }
+
+ public void setIsOpen(Integer isOpen) {
+ this.isOpen = isOpen;
+ }
+
+ public Integer getMinuteNum() {
+ return minuteNum;
+ }
+
+ public void setMinuteNum(Integer minuteNum) {
+ this.minuteNum = minuteNum;
+ }
+
+ @Override
+ protected Serializable pkVal() {
+ return this.id;
+ }
+
+ @Override
+ public String toString() {
+ return "TSysFaceDistinguish{" +
+ "id=" + id +
+ ", companyId=" + companyId +
+ ", isOpen=" + isOpen +
+ ", minuteNum=" + minuteNum +
+ "}";
+ }
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TSysIntegral.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TSysIntegral.java
new file mode 100644
index 0000000..58f3298
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TSysIntegral.java
@@ -0,0 +1,74 @@
+package com.stylefeng.guns.modular.system.model;
+
+import com.baomidou.mybatisplus.enums.IdType;
+import com.baomidou.mybatisplus.annotations.TableId;
+import com.baomidou.mybatisplus.activerecord.Model;
+import com.baomidou.mybatisplus.annotations.TableName;
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 系统设置-积分
+ * </p>
+ *
+ * @author 吕雪
+ * @since 2020-06-09
+ */
+@TableName("t_sys_integral")
+public class TSysIntegral extends Model<TSysIntegral> {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 主键id
+ */
+ @TableId(value = "id", type = IdType.AUTO)
+ private Integer id;
+ /**
+ * 企业id
+ */
+ private Integer companyId;
+ /**
+ * 积分
+ */
+ private Integer integral;
+
+
+ public Integer getId() {
+ return id;
+ }
+
+ public void setId(Integer id) {
+ this.id = id;
+ }
+
+ public Integer getCompanyId() {
+ return companyId;
+ }
+
+ public void setCompanyId(Integer companyId) {
+ this.companyId = companyId;
+ }
+
+ public Integer getIntegral() {
+ return integral;
+ }
+
+ public void setIntegral(Integer integral) {
+ this.integral = integral;
+ }
+
+ @Override
+ protected Serializable pkVal() {
+ return this.id;
+ }
+
+ @Override
+ public String toString() {
+ return "TSysIntegral{" +
+ "id=" + id +
+ ", companyId=" + companyId +
+ ", integral=" + integral +
+ "}";
+ }
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TSysPushOrder.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TSysPushOrder.java
new file mode 100644
index 0000000..dc4c94f
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TSysPushOrder.java
@@ -0,0 +1,126 @@
+package com.stylefeng.guns.modular.system.model;
+
+import com.baomidou.mybatisplus.enums.IdType;
+import com.baomidou.mybatisplus.annotations.TableId;
+import com.baomidou.mybatisplus.activerecord.Model;
+import com.baomidou.mybatisplus.annotations.TableName;
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 系统设置-推单
+ * </p>
+ *
+ * @author 吕雪
+ * @since 2020-06-09
+ */
+@TableName("t_sys_push_order")
+public class TSysPushOrder extends Model<TSysPushOrder> {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 主键id
+ */
+ @TableId(value = "id", type = IdType.AUTO)
+ private Integer id;
+ /**
+ * 企业id
+ */
+ private Integer companyId;
+ /**
+ * 推单距离(公里)
+ */
+ private Double pushDistance;
+ /**
+ * 推单时间(秒)
+ */
+ private Integer pushTime;
+ /**
+ * 推单占所有司机百分比
+ */
+ private Double driverProportion;
+ /**
+ * 1=第一轮，2=第二轮，3=第三轮
+ */
+ private Integer type;
+ /**
+ * 1=专车，2=出租车
+ */
+ private Integer pushType;
+
+
+ public Integer getId() {
+ return id;
+ }
+
+ public void setId(Integer id) {
+ this.id = id;
+ }
+
+ public Integer getCompanyId() {
+ return companyId;
+ }
+
+ public void setCompanyId(Integer companyId) {
+ this.companyId = companyId;
+ }
+
+ public Double getPushDistance() {
+ return pushDistance;
+ }
+
+ public void setPushDistance(Double pushDistance) {
+ this.pushDistance = pushDistance;
+ }
+
+ public Integer getPushTime() {
+ return pushTime;
+ }
+
+ public void setPushTime(Integer pushTime) {
+ this.pushTime = pushTime;
+ }
+
+ public Double getDriverProportion() {
+ return driverProportion;
+ }
+
+ public void setDriverProportion(Double driverProportion) {
+ this.driverProportion = driverProportion;
+ }
+
+ public Integer getType() {
+ return type;
+ }
+
+ public void setType(Integer type) {
+ this.type = type;
+ }
+
+ public Integer getPushType() {
+ return pushType;
+ }
+
+ public void setPushType(Integer pushType) {
+ this.pushType = pushType;
+ }
+
+ @Override
+ protected Serializable pkVal() {
+ return this.id;
+ }
+
+ @Override
+ public String toString() {
+ return "TSysPushOrder{" +
+ "id=" + id +
+ ", companyId=" + companyId +
+ ", pushDistance=" + pushDistance +
+ ", pushTime=" + pushTime +
+ ", driverProportion=" + driverProportion +
+ ", type=" + type +
+ ", pushType=" + pushType +
+ "}";
+ }
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TSysReformist.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TSysReformist.java
new file mode 100644
index 0000000..22b47d4
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TSysReformist.java
@@ -0,0 +1,98 @@
+package com.stylefeng.guns.modular.system.model;
+
+import com.baomidou.mybatisplus.enums.IdType;
+import java.math.BigDecimal;
+import com.baomidou.mybatisplus.annotations.TableId;
+import com.baomidou.mybatisplus.activerecord.Model;
+import com.baomidou.mybatisplus.annotations.TableName;
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 系统设置-改派
+ * </p>
+ *
+ * @author 吕雪
+ * @since 2020-06-09
+ */
+@TableName("t_sys_reformist")
+public class TSysReformist extends Model<TSysReformist> {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 主键id
+ */
+ @TableId(value = "id", type = IdType.AUTO)
+ private Integer id;
+ /**
+ * 企业id
+ */
+ private Integer companyId;
+ /**
+ * 金额
+ */
+ private BigDecimal money;
+ /**
+ * 专车改派 1=否 2=是
+ */
+ private Integer isSpecialCar;
+ /**
+ * 出租车改派 1=否 2=是
+ */
+ private Integer isTaxiCar;
+
+ public Integer getIsSpecialCar() {
+ return isSpecialCar;
+ }
+
+ public void setIsSpecialCar(Integer isSpecialCar) {
+ this.isSpecialCar = isSpecialCar;
+ }
+
+ public Integer getIsTaxiCar() {
+ return isTaxiCar;
+ }
+
+ public void setIsTaxiCar(Integer isTaxiCar) {
+ this.isTaxiCar = isTaxiCar;
+ }
+
+ public Integer getId() {
+ return id;
+ }
+
+ public void setId(Integer id) {
+ this.id = id;
+ }
+
+ public Integer getCompanyId() {
+ return companyId;
+ }
+
+ public void setCompanyId(Integer companyId) {
+ this.companyId = companyId;
+ }
+
+ public BigDecimal getMoney() {
+ return money;
+ }
+
+ public void setMoney(BigDecimal money) {
+ this.money = money;
+ }
+
+ @Override
+ protected Serializable pkVal() {
+ return this.id;
+ }
+
+ @Override
+ public String toString() {
+ return "TSysReformist{" +
+ "id=" + id +
+ ", companyId=" + companyId +
+ ", money=" + money +
+ "}";
+ }
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TSysSensitiveWords.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TSysSensitiveWords.java
new file mode 100644
index 0000000..4ab3436
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TSysSensitiveWords.java
@@ -0,0 +1,75 @@
+package com.stylefeng.guns.modular.system.model;
+
+import com.baomidou.mybatisplus.enums.IdType;
+import java.util.Date;
+import com.baomidou.mybatisplus.annotations.TableId;
+import com.baomidou.mybatisplus.activerecord.Model;
+import com.baomidou.mybatisplus.annotations.TableName;
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 系统设置-敏感词
+ * </p>
+ *
+ * @author 吕雪
+ * @since 2020-06-09
+ */
+@TableName("t_sys_sensitive_words")
+public class TSysSensitiveWords extends Model<TSysSensitiveWords> {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 主键id
+ */
+ @TableId(value = "id", type = IdType.AUTO)
+ private Integer id;
+ /**
+ * 创建时间
+ */
+ private Date createTime;
+ /**
+ * 敏感词
+ */
+ private String content;
+
+
+ public Integer getId() {
+ return id;
+ }
+
+ public void setId(Integer id) {
+ this.id = id;
+ }
+
+ public Date getCreateTime() {
+ return createTime;
+ }
+
+ public void setCreateTime(Date createTime) {
+ this.createTime = createTime;
+ }
+
+ public String getContent() {
+ return content;
+ }
+
+ public void setContent(String content) {
+ this.content = content;
+ }
+
+ @Override
+ protected Serializable pkVal() {
+ return this.id;
+ }
+
+ @Override
+ public String toString() {
+ return "TSysSensitiveWords{" +
+ "id=" + id +
+ ", createTime=" + createTime +
+ ", content=" + content +
+ "}";
+ }
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TSystemNotice.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TSystemNotice.java
new file mode 100644
index 0000000..f9db3d9
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TSystemNotice.java
@@ -0,0 +1,137 @@
+package com.stylefeng.guns.modular.system.model;
+
+import com.baomidou.mybatisplus.enums.IdType;
+import java.util.Date;
+import com.baomidou.mybatisplus.annotations.TableId;
+import com.baomidou.mybatisplus.activerecord.Model;
+import com.baomidou.mybatisplus.annotations.TableName;
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 系统通知
+ * </p>
+ *
+ * @author 吕雪
+ * @since 2020-06-10
+ */
+@TableName("t_system_notice")
+public class TSystemNotice extends Model<TSystemNotice> {
+
+ private static final long serialVersionUID = 1L;
+
+ @TableId(value = "id", type = IdType.AUTO)
+ private Integer id;
+ /**
+ * 1=公告，2=系统消息
+ */
+ private Integer type;
+ /**
+ * 1=用户，2=司机
+ */
+ private Integer userType;
+ /**
+ * 公告id
+ */
+ private Integer noticesId;
+ /**
+ * 消息内容
+ */
+ private String content;
+ /**
+ * 接收对象id
+ */
+ private Integer userId;
+ /**
+ * 添加时间
+ */
+ private Date insertTime;
+ /**
+ * 1=未读，2=已读
+ */
+ private Integer read;
+
+
+ public Integer getId() {
+ return id;
+ }
+
+ public void setId(Integer id) {
+ this.id = id;
+ }
+
+ public Integer getType() {
+ return type;
+ }
+
+ public void setType(Integer type) {
+ this.type = type;
+ }
+
+ public Integer getUserType() {
+ return userType;
+ }
+
+ public void setUserType(Integer userType) {
+ this.userType = userType;
+ }
+
+ public Integer getNoticesId() {
+ return noticesId;
+ }
+
+ public void setNoticesId(Integer noticesId) {
+ this.noticesId = noticesId;
+ }
+
+ public String getContent() {
+ return content;
+ }
+
+ public void setContent(String content) {
+ this.content = content;
+ }
+
+ public Integer getUserId() {
+ return userId;
+ }
+
+ public void setUserId(Integer userId) {
+ this.userId = userId;
+ }
+
+ public Date getInsertTime() {
+ return insertTime;
+ }
+
+ public void setInsertTime(Date insertTime) {
+ this.insertTime = insertTime;
+ }
+
+ public Integer getRead() {
+ return read;
+ }
+
+ public void setRead(Integer read) {
+ this.read = read;
+ }
+
+ @Override
+ protected Serializable pkVal() {
+ return this.id;
+ }
+
+ @Override
+ public String toString() {
+ return "TSystemNotice{" +
+ "id=" + id +
+ ", type=" + type +
+ ", userType=" + userType +
+ ", noticesId=" + noticesId +
+ ", content=" + content +
+ ", userId=" + userId +
+ ", insertTime=" + insertTime +
+ ", read=" + read +
+ "}";
+ }
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TSystemPrice.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TSystemPrice.java
new file mode 100644
index 0000000..49f39b0
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TSystemPrice.java
@@ -0,0 +1,127 @@
+package com.stylefeng.guns.modular.system.model;
+
+import com.baomidou.mybatisplus.annotations.TableField;
+import com.baomidou.mybatisplus.enums.IdType;
+import com.baomidou.mybatisplus.annotations.TableId;
+import com.baomidou.mybatisplus.activerecord.Model;
+import com.baomidou.mybatisplus.annotations.TableName;
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 服务价格规则
+ * </p>
+ *
+ * @author 吕雪
+ * @since 2020-08-29
+ */
+@TableName("t_system_price")
+public class TSystemPrice extends Model<TSystemPrice> {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 主键
+ */
+ @TableId(value = "id", type = IdType.AUTO)
+ private Integer id;
+ /**
+ * 业务类型（1=专车，2=出租车，3=城际，4=小件物流-同城，5=小件物流-跨城，6=包车）
+ */
+ private Integer type;
+ /**
+ * 企业id
+ */
+ private Integer companyId;
+ /**
+ * 服务车型id
+ */
+ private Integer serverCarModelId;
+ /**
+ * 价格规则，每个输入框为一个参数{"num1":1,"num2":2.3}
+ */
+ private String content;
+ /**
+ * 运价类型说明
+ */
+ @TableField("fareTypeNote")
+ private String fareTypeNote;
+ /**
+ * 状态（1=正常，2=冻结，3=删除）
+ */
+ private Integer state;
+
+ public Integer getState() {
+ return state;
+ }
+
+ public void setState(Integer state) {
+ this.state = state;
+ }
+
+ public Integer getId() {
+ return id;
+ }
+
+ public void setId(Integer id) {
+ this.id = id;
+ }
+
+ public Integer getType() {
+ return type;
+ }
+
+ public void setType(Integer type) {
+ this.type = type;
+ }
+
+ public Integer getCompanyId() {
+ return companyId;
+ }
+
+ public void setCompanyId(Integer companyId) {
+ this.companyId = companyId;
+ }
+
+ public Integer getServerCarModelId() {
+ return serverCarModelId;
+ }
+
+ public void setServerCarModelId(Integer serverCarModelId) {
+ this.serverCarModelId = serverCarModelId;
+ }
+
+ public String getContent() {
+ return content;
+ }
+
+ public void setContent(String content) {
+ this.content = content;
+ }
+
+ public String getFareTypeNote() {
+ return fareTypeNote;
+ }
+
+ public void setFareTypeNote(String fareTypeNote) {
+ this.fareTypeNote = fareTypeNote;
+ }
+
+ @Override
+ protected Serializable pkVal() {
+ return this.id;
+ }
+
+ @Override
+ public String toString() {
+ return "TSystemPrice{" +
+ "id=" + id +
+ ", type=" + type +
+ ", companyId=" + companyId +
+ ", serverCarModelId=" + serverCarModelId +
+ ", content='" + content + '\'' +
+ ", fareTypeNote='" + fareTypeNote + '\'' +
+ ", state=" + state +
+ '}';
+ }
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TUser.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TUser.java
new file mode 100644
index 0000000..78249f9
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TUser.java
@@ -0,0 +1,402 @@
+package com.stylefeng.guns.modular.system.model;
+
+import com.baomidou.mybatisplus.enums.IdType;
+import java.math.BigDecimal;
+import java.util.Date;
+import com.baomidou.mybatisplus.annotations.TableId;
+import com.baomidou.mybatisplus.activerecord.Model;
+import com.baomidou.mybatisplus.annotations.TableName;
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 用户信息
+ * </p>
+ *
+ * @author 吕雪
+ * @since 2020-06-01
+ */
+@TableName("t_user")
+public class TUser extends Model<TUser> {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 主键id
+ */
+ @TableId(value = "id", type = IdType.AUTO)
+ private Integer id;
+ /**
+ * 企业id
+ */
+ private Integer companyId;
+ /**
+ * 注册ip
+ */
+ private String registIp;
+ /**
+ * 注册地区县code
+ */
+ private String registAreaCode;
+ /**
+ * 手机号
+ */
+ private String phone;
+ /**
+ * 昵称
+ */
+ private String nickName;
+ /**
+ * 头像
+ */
+ private String avatar;
+ /**
+ * 生日
+ */
+ private Date birthday;
+ /**
+ * 性别（1：男，2：女）
+ */
+ private Integer sex;
+ /**
+ * 紧急联系人
+ */
+ private String emergencyContact;
+ /**
+ * 紧急联系电话
+ */
+ private String emergencyContactNumber;
+ /**
+ * 是否实名认证(1=否，2=是)
+ */
+ private Integer isAuth;
+ /**
+ * 真实姓名
+ */
+ private String name;
+ /**
+ * 身份证号
+ */
+ private String idCard;
+ /**
+ * 身份证正面
+ */
+ private String idCardFront;
+ /**
+ * 身份证反面
+ */
+ private String idCardReverse;
+ /**
+ * 历史消费
+ */
+ private BigDecimal consumption;
+ /**
+ * 余额
+ */
+ private BigDecimal balance;
+ /**
+ * 积分
+ */
+ private Integer integral;
+ /**
+ * 密码
+ */
+ private String passWord;
+ /**
+ * 微信openid
+ */
+ private String openId;
+ /**
+ * 微信unionid
+ */
+ private String unionid;
+ /**
+ * 备注
+ */
+ private String remark;
+ /**
+ * 1=正常，2=冻结
+ */
+ private Integer state;
+ /**
+ * 1：创建，2：修改，3：删除
+ */
+ private String flag;
+ private Date insertTime;
+ private Integer insertUser;
+ private Date updateTime;
+ private Integer updateUser;
+
+
+ public Integer getId() {
+ return id;
+ }
+
+ public void setId(Integer id) {
+ this.id = id;
+ }
+
+ public Integer getCompanyId() {
+ return companyId;
+ }
+
+ public void setCompanyId(Integer companyId) {
+ this.companyId = companyId;
+ }
+
+ public String getRegistIp() {
+ return registIp;
+ }
+
+ public void setRegistIp(String registIp) {
+ this.registIp = registIp;
+ }
+
+ public String getRegistAreaCode() {
+ return registAreaCode;
+ }
+
+ public void setRegistAreaCode(String registAreaCode) {
+ this.registAreaCode = registAreaCode;
+ }
+
+ public String getPhone() {
+ return phone;
+ }
+
+ public void setPhone(String phone) {
+ this.phone = phone;
+ }
+
+ public String getNickName() {
+ return nickName;
+ }
+
+ public void setNickName(String nickName) {
+ this.nickName = nickName;
+ }
+
+ public String getAvatar() {
+ return avatar;
+ }
+
+ public void setAvatar(String avatar) {
+ this.avatar = avatar;
+ }
+
+ public Date getBirthday() {
+ return birthday;
+ }
+
+ public void setBirthday(Date birthday) {
+ this.birthday = birthday;
+ }
+
+ public Integer getSex() {
+ return sex;
+ }
+
+ public void setSex(Integer sex) {
+ this.sex = sex;
+ }
+
+ public String getEmergencyContact() {
+ return emergencyContact;
+ }
+
+ public void setEmergencyContact(String emergencyContact) {
+ this.emergencyContact = emergencyContact;
+ }
+
+ public String getEmergencyContactNumber() {
+ return emergencyContactNumber;
+ }
+
+ public void setEmergencyContactNumber(String emergencyContactNumber) {
+ this.emergencyContactNumber = emergencyContactNumber;
+ }
+
+ public Integer getIsAuth() {
+ return isAuth;
+ }
+
+ public void setIsAuth(Integer isAuth) {
+ this.isAuth = isAuth;
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ public String getIdCard() {
+ return idCard;
+ }
+
+ public void setIdCard(String idCard) {
+ this.idCard = idCard;
+ }
+
+ public String getIdCardFront() {
+ return idCardFront;
+ }
+
+ public void setIdCardFront(String idCardFront) {
+ this.idCardFront = idCardFront;
+ }
+
+ public String getIdCardReverse() {
+ return idCardReverse;
+ }
+
+ public void setIdCardReverse(String idCardReverse) {
+ this.idCardReverse = idCardReverse;
+ }
+
+ public BigDecimal getConsumption() {
+ return consumption;
+ }
+
+ public void setConsumption(BigDecimal consumption) {
+ this.consumption = consumption;
+ }
+
+ public BigDecimal getBalance() {
+ return balance;
+ }
+
+ public void setBalance(BigDecimal balance) {
+ this.balance = balance;
+ }
+
+ public Integer getIntegral() {
+ return integral;
+ }
+
+ public void setIntegral(Integer integral) {
+ this.integral = integral;
+ }
+
+ public String getPassWord() {
+ return passWord;
+ }
+
+ public void setPassWord(String passWord) {
+ this.passWord = passWord;
+ }
+
+ public String getOpenId() {
+ return openId;
+ }
+
+ public void setOpenId(String openId) {
+ this.openId = openId;
+ }
+
+ public String getUnionid() {
+ return unionid;
+ }
+
+ public void setUnionid(String unionid) {
+ this.unionid = unionid;
+ }
+
+ public String getRemark() {
+ return remark;
+ }
+
+ public void setRemark(String remark) {
+ this.remark = remark;
+ }
+
+ public Integer getState() {
+ return state;
+ }
+
+ public void setState(Integer state) {
+ this.state = state;
+ }
+
+ public String getFlag() {
+ return flag;
+ }
+
+ public void setFlag(String flag) {
+ this.flag = flag;
+ }
+
+ public Date getInsertTime() {
+ return insertTime;
+ }
+
+ public void setInsertTime(Date insertTime) {
+ this.insertTime = insertTime;
+ }
+
+ public Integer getInsertUser() {
+ return insertUser;
+ }
+
+ public void setInsertUser(Integer insertUser) {
+ this.insertUser = insertUser;
+ }
+
+ public Date getUpdateTime() {
+ return updateTime;
+ }
+
+ public void setUpdateTime(Date updateTime) {
+ this.updateTime = updateTime;
+ }
+
+ public Integer getUpdateUser() {
+ return updateUser;
+ }
+
+ public void setUpdateUser(Integer updateUser) {
+ this.updateUser = updateUser;
+ }
+
+ @Override
+ protected Serializable pkVal() {
+ return this.id;
+ }
+
+ @Override
+ public String toString() {
+ return "TUser{" +
+ "id=" + id +
+ ", companyId=" + companyId +
+ ", registIp=" + registIp +
+ ", registAreaCode=" + registAreaCode +
+ ", phone=" + phone +
+ ", nickName=" + nickName +
+ ", avatar=" + avatar +
+ ", birthday=" + birthday +
+ ", sex=" + sex +
+ ", emergencyContact=" + emergencyContact +
+ ", emergencyContactNumber=" + emergencyContactNumber +
+ ", isAuth=" + isAuth +
+ ", name=" + name +
+ ", idCard=" + idCard +
+ ", idCardFront=" + idCardFront +
+ ", idCardReverse=" + idCardReverse +
+ ", consumption=" + consumption +
+ ", balance=" + balance +
+ ", integral=" + integral +
+ ", passWord=" + passWord +
+ ", openId=" + openId +
+ ", unionid=" + unionid +
+ ", remark=" + remark +
+ ", state=" + state +
+ ", flag=" + flag +
+ ", insertTime=" + insertTime +
+ ", insertUser=" + insertUser +
+ ", updateTime=" + updateTime +
+ ", updateUser=" + updateUser +
+ "}";
+ }
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TUserRedPacketRecord.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TUserRedPacketRecord.java
new file mode 100644
index 0000000..4a7ffd5
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TUserRedPacketRecord.java
@@ -0,0 +1,164 @@
+package com.stylefeng.guns.modular.system.model;
+
+import com.baomidou.mybatisplus.enums.IdType;
+import java.math.BigDecimal;
+import java.util.Date;
+import com.baomidou.mybatisplus.annotations.TableId;
+import com.baomidou.mybatisplus.activerecord.Model;
+import com.baomidou.mybatisplus.annotations.TableName;
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 用户红包记录
+ * </p>
+ *
+ * @author stylefeng
+ * @since 2020-07-10
+ */
+@TableName("t_user_red_packet_record")
+public class TUserRedPacketRecord extends Model<TUserRedPacketRecord> {
+
+ private static final long serialVersionUID = 1L;
+
+ @TableId(value = "id", type = IdType.AUTO)
+ private Integer id;
+ /**
+ * 金额
+ */
+ private BigDecimal money;
+ /**
+ * 过期时间
+ */
+ private Date expirationTime;
+ /**
+ * 获取时间
+ */
+ private Date insertTime;
+ /**
+ * 公司id
+ */
+ private Integer companyId;
+ /**
+ * 状态(0=临时，1=未使用，2=已使用，3=已过期)
+ */
+ private Integer state;
+ /**
+ * 订单id
+ */
+ private Integer orderId;
+ /**
+ * 订单类型(1=专车，2=出租车，3=城际，4=小件物流)
+ */
+ private Integer orderType;
+ /**
+ * 用户id
+ */
+ private Integer userId;
+ /**
+ * 活动id
+ */
+ private Integer redPacketActivityId;
+
+
+ public Integer getId() {
+ return id;
+ }
+
+ public void setId(Integer id) {
+ this.id = id;
+ }
+
+ public BigDecimal getMoney() {
+ return money;
+ }
+
+ public void setMoney(BigDecimal money) {
+ this.money = money;
+ }
+
+ public Date getExpirationTime() {
+ return expirationTime;
+ }
+
+ public void setExpirationTime(Date expirationTime) {
+ this.expirationTime = expirationTime;
+ }
+
+ public Date getInsertTime() {
+ return insertTime;
+ }
+
+ public void setInsertTime(Date insertTime) {
+ this.insertTime = insertTime;
+ }
+
+ public Integer getCompanyId() {
+ return companyId;
+ }
+
+ public void setCompanyId(Integer companyId) {
+ this.companyId = companyId;
+ }
+
+ public Integer getState() {
+ return state;
+ }
+
+ public void setState(Integer state) {
+ this.state = state;
+ }
+
+ public Integer getOrderId() {
+ return orderId;
+ }
+
+ public void setOrderId(Integer orderId) {
+ this.orderId = orderId;
+ }
+
+ public Integer getOrderType() {
+ return orderType;
+ }
+
+ public void setOrderType(Integer orderType) {
+ this.orderType = orderType;
+ }
+
+ public Integer getUserId() {
+ return userId;
+ }
+
+ public void setUserId(Integer userId) {
+ this.userId = userId;
+ }
+
+ public Integer getRedPacketActivityId() {
+ return redPacketActivityId;
+ }
+
+ public void setRedPacketActivityId(Integer redPacketActivityId) {
+ this.redPacketActivityId = redPacketActivityId;
+ }
+
+ @Override
+ protected Serializable pkVal() {
+ return this.id;
+ }
+
+ @Override
+ public String toString() {
+ return "TUserRedPacketRecord{" +
+ "id=" + id +
+ ", money=" + money +
+ ", expirationTime=" + expirationTime +
+ ", insertTime=" + insertTime +
+ ", companyId=" + companyId +
+ ", state=" + state +
+ ", orderId=" + orderId +
+ ", orderType=" + orderType +
+ ", userId=" + userId +
+ ", redPacketActivityId=" + redPacketActivityId +
+ "}";
+ }
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TVerified.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TVerified.java
new file mode 100644
index 0000000..2437731
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TVerified.java
@@ -0,0 +1,137 @@
+package com.stylefeng.guns.modular.system.model;
+
+import com.baomidou.mybatisplus.enums.IdType;
+import java.util.Date;
+import com.baomidou.mybatisplus.annotations.TableId;
+import com.baomidou.mybatisplus.activerecord.Model;
+import com.baomidou.mybatisplus.annotations.TableName;
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 实名认证
+ * </p>
+ *
+ * @author 吕雪
+ * @since 2020-06-09
+ */
+@TableName("t_verified")
+public class TVerified extends Model<TVerified> {
+
+ private static final long serialVersionUID = 1L;
+
+ @TableId(value = "id", type = IdType.AUTO)
+ private Integer id;
+ /**
+ * 用户id
+ */
+ private Integer userId;
+ /**
+ * 认证姓名
+ */
+ private String name;
+ /**
+ * 身份证号码
+ */
+ private String idcode;
+ /**
+ * 身份证正面照
+ */
+ private String img1;
+ /**
+ * 身份证背面照
+ */
+ private String img2;
+ /**
+ * 认证结果（1=待认证，2=认证通过，3=认证失败）
+ */
+ private Integer state;
+ /**
+ * 请求时间
+ */
+ private Date insertTime;
+
+
+ public Integer getId() {
+ return id;
+ }
+
+ public void setId(Integer id) {
+ this.id = id;
+ }
+
+ public Integer getUserId() {
+ return userId;
+ }
+
+ public void setUserId(Integer userId) {
+ this.userId = userId;
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ public String getIdcode() {
+ return idcode;
+ }
+
+ public void setIdcode(String idcode) {
+ this.idcode = idcode;
+ }
+
+ public String getImg1() {
+ return img1;
+ }
+
+ public void setImg1(String img1) {
+ this.img1 = img1;
+ }
+
+ public String getImg2() {
+ return img2;
+ }
+
+ public void setImg2(String img2) {
+ this.img2 = img2;
+ }
+
+ public Integer getState() {
+ return state;
+ }
+
+ public void setState(Integer state) {
+ this.state = state;
+ }
+
+ public Date getInsertTime() {
+ return insertTime;
+ }
+
+ public void setInsertTime(Date insertTime) {
+ this.insertTime = insertTime;
+ }
+
+ @Override
+ protected Serializable pkVal() {
+ return this.id;
+ }
+
+ @Override
+ public String toString() {
+ return "TVerified{" +
+ "id=" + id +
+ ", userId=" + userId +
+ ", name=" + name +
+ ", idcode=" + idcode +
+ ", img1=" + img1 +
+ ", img2=" + img2 +
+ ", state=" + state +
+ ", insertTime=" + insertTime +
+ "}";
+ }
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TVersionManagement.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TVersionManagement.java
new file mode 100644
index 0000000..e66ac39
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TVersionManagement.java
@@ -0,0 +1,127 @@
+package com.stylefeng.guns.modular.system.model;
+
+import com.baomidou.mybatisplus.enums.IdType;
+import java.util.Date;
+import com.baomidou.mybatisplus.annotations.TableId;
+import com.baomidou.mybatisplus.activerecord.Model;
+import com.baomidou.mybatisplus.annotations.TableName;
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 版本管理
+ * </p>
+ *
+ * @author 吕雪
+ * @since 2020-06-10
+ */
+@TableName("t_version_management")
+public class TVersionManagement extends Model<TVersionManagement> {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 主键id
+ */
+ @TableId(value = "id", type = IdType.AUTO)
+ private Integer id;
+ /**
+ * 包路径
+ */
+ private String url;
+ /**
+ * 版本号
+ */
+ private String version;
+ /**
+ * 更新公告
+ */
+ private String content;
+ /**
+ * 是否强制升级(1=是 2=否）
+ */
+ private Integer mandatory;
+ /**
+ * 更新时间
+ */
+ private Date insertTime;
+ /**
+ * 类型(1=安卓，2=ios)
+ */
+ private Integer type;
+
+
+ public Integer getId() {
+ return id;
+ }
+
+ public void setId(Integer id) {
+ this.id = id;
+ }
+
+ public String getUrl() {
+ return url;
+ }
+
+ public void setUrl(String url) {
+ this.url = url;
+ }
+
+ public String getVersion() {
+ return version;
+ }
+
+ public void setVersion(String version) {
+ this.version = version;
+ }
+
+ public String getContent() {
+ return content;
+ }
+
+ public void setContent(String content) {
+ this.content = content;
+ }
+
+ public Integer getMandatory() {
+ return mandatory;
+ }
+
+ public void setMandatory(Integer mandatory) {
+ this.mandatory = mandatory;
+ }
+
+ public Date getInsertTime() {
+ return insertTime;
+ }
+
+ public void setInsertTime(Date insertTime) {
+ this.insertTime = insertTime;
+ }
+
+ public Integer getType() {
+ return type;
+ }
+
+ public void setType(Integer type) {
+ this.type = type;
+ }
+
+ @Override
+ protected Serializable pkVal() {
+ return this.id;
+ }
+
+ @Override
+ public String toString() {
+ return "TVersionManagement{" +
+ "id=" + id +
+ ", url=" + url +
+ ", version=" + version +
+ ", content=" + content +
+ ", mandatory=" + mandatory +
+ ", insertTime=" + insertTime +
+ ", type=" + type +
+ "}";
+ }
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TransactionDetails.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TransactionDetails.java
new file mode 100644
index 0000000..3f1ee5c
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TransactionDetails.java
@@ -0,0 +1,164 @@
+package com.stylefeng.guns.modular.system.model;
+
+import com.baomidou.mybatisplus.annotations.TableField;
+import com.baomidou.mybatisplus.annotations.TableId;
+import com.baomidou.mybatisplus.annotations.TableName;
+import com.baomidou.mybatisplus.enums.IdType;
+
+import java.util.Date;
+
+/**
+ * 交易明细
+ */
+@TableName("t_pub_transaction_details")
+public class TransactionDetails {
+ /**
+ * 主键
+ */
+ @TableId(value = "id", type = IdType.AUTO)
+ @TableField("id")
+ private Integer id;
+ /**
+ * 对象id
+ */
+ @TableField("userId")
+ private Integer userId;
+ /**
+ * 添加时间
+ */
+ @TableField("insertTime")
+ private Date insertTime;
+ /**
+ * 备注
+ */
+ @TableField("remark")
+ private String remark;
+ /**
+ * 金额/积分
+ */
+ @TableField("money")
+ private Double money;
+ /**
+ * 状态（1=增加，2=减少）
+ */
+ @TableField("state")
+ private Integer state;
+ /**
+ * 类型（1=金额，2：积分）
+ */
+ @TableField("type")
+ private Integer type;
+ /**
+ * 类型（1=用户，2=司机）
+ */
+ @TableField("userType")
+ private Integer userType;
+ /**
+ * 订单类型（1=专车，2=出租车，3=城际，4=小件物流）
+ */
+ @TableField("orderType")
+ private Integer orderType;
+ /**
+ * 订单id
+ */
+ @TableField("orderId")
+ private Integer orderId;
+
+ public Integer getId() {
+ return id;
+ }
+
+ public void setId(Integer id) {
+ this.id = id;
+ }
+
+ public Integer getUserId() {
+ return userId;
+ }
+
+ public void setUserId(Integer userId) {
+ this.userId = userId;
+ }
+
+ public Date getInsertTime() {
+ return insertTime;
+ }
+
+ public void setInsertTime(Date insertTime) {
+ this.insertTime = insertTime;
+ }
+
+ public String getRemark() {
+ return remark;
+ }
+
+ public void setRemark(String remark) {
+ this.remark = remark;
+ }
+
+ public Double getMoney() {
+ return money;
+ }
+
+ public void setMoney(Double money) {
+ this.money = money;
+ }
+
+ public Integer getState() {
+ return state;
+ }
+
+ public void setState(Integer state) {
+ this.state = state;
+ }
+
+ public Integer getType() {
+ return type;
+ }
+
+ public void setType(Integer type) {
+ this.type = type;
+ }
+
+ public Integer getUserType() {
+ return userType;
+ }
+
+ public void setUserType(Integer userType) {
+ this.userType = userType;
+ }
+
+ public Integer getOrderType() {
+ return orderType;
+ }
+
+ public void setOrderType(Integer orderType) {
+ this.orderType = orderType;
+ }
+
+ public Integer getOrderId() {
+ return orderId;
+ }
+
+ public void setOrderId(Integer orderId) {
+ this.orderId = orderId;
+ }
+
+ @Override
+ public String toString() {
+ return "TransactionDetails{" +
+ "id=" + id +
+ ", userId=" + userId +
+ ", insertTime=" + insertTime +
+ ", remark='" + remark + '\'' +
+ ", money=" + money +
+ ", state=" + state +
+ ", type=" + type +
+ ", userType=" + userType +
+ ", orderType=" + orderType +
+ ", orderId=" + orderId +
+ '}';
+ }
+
+
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/User.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/User.java
new file mode 100644
index 0000000..64b5373
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/User.java
@@ -0,0 +1,268 @@
+package com.stylefeng.guns.modular.system.model;
+
+import com.baomidou.mybatisplus.activerecord.Model;
+
+import com.baomidou.mybatisplus.annotations.TableId;
+import com.baomidou.mybatisplus.annotations.TableName;
+import com.baomidou.mybatisplus.enums.IdType;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 管理员表
+ * </p>
+ *
+ * @author stylefeng
+ * @since 2017-07-11
+ */
+@TableName("sys_user")
+public class User extends Model<User> {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 主键id
+ */
+ @TableId(value="id", type= IdType.AUTO)
+ private Integer id;
+ /**
+ * 头像
+ */
+ private String avatar;
+ /**
+ * 账号
+ */
+ private String account;
+ /**
+ * 密码
+ */
+ private String password;
+ /**
+ * 密码修改时间
+ */
+ private Date passWordUpdate;
+ /**
+ * md5密码盐
+ */
+ private String salt;
+ /**
+ * 名字
+ */
+ private String name;
+ /**
+ * 生日
+ */
+ private Date birthday;
+ /**
+ * 性别（1：男 2：女）
+ */
+ private Integer sex;
+ /**
+ * 电子邮件
+ */
+ private String email;
+ /**
+ * 电话
+ */
+ private String phone;
+ /**
+ * 角色id
+ */
+ private String roleid;
+ /**
+ * 部门id
+ */
+ private Integer deptid;
+ /**
+ * 状态(1：启用 2：冻结 3：删除）
+ */
+ private Integer status;
+ /**
+ * 创建时间
+ */
+ private Date createtime;
+ /**
+ * 保留字段
+ */
+ private Integer version;
+ /**
+ * 角色类型 1=平台 2=分公司 3=加盟商
+ */
+ private Integer roleType;
+ /**
+ * 对象ID
+ */
+ private Integer objectId;
+
+ public Integer getRoleType() {
+ return roleType;
+ }
+
+ public void setRoleType(Integer roleType) {
+ this.roleType = roleType;
+ }
+
+ public Integer getObjectId() {
+ return objectId;
+ }
+
+ public void setObjectId(Integer objectId) {
+ this.objectId = objectId;
+ }
+
+ public Integer getId() {
+ return id;
+ }
+
+ public void setId(Integer id) {
+ this.id = id;
+ }
+
+ public String getAvatar() {
+ return avatar;
+ }
+
+ public void setAvatar(String avatar) {
+ this.avatar = avatar;
+ }
+
+ public String getAccount() {
+ return account;
+ }
+
+ public void setAccount(String account) {
+ this.account = account;
+ }
+
+ public String getPassword() {
+ return password;
+ }
+
+ public Date getPassWordUpdate() {
+ return passWordUpdate;
+ }
+
+ public void setPassWordUpdate(Date passWordUpdate) {
+ this.passWordUpdate = passWordUpdate;
+ }
+
+ public void setPassword(String password) {
+ this.password = password;
+ }
+
+ public String getSalt() {
+ return salt;
+ }
+
+ public void setSalt(String salt) {
+ this.salt = salt;
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ public Date getBirthday() {
+ return birthday;
+ }
+
+ public void setBirthday(Date birthday) {
+ this.birthday = birthday;
+ }
+
+ public Integer getSex() {
+ return sex;
+ }
+
+ public void setSex(Integer sex) {
+ this.sex = sex;
+ }
+
+ public String getEmail() {
+ return email;
+ }
+
+ public void setEmail(String email) {
+ this.email = email;
+ }
+
+ public String getPhone() {
+ return phone;
+ }
+
+ public void setPhone(String phone) {
+ this.phone = phone;
+ }
+
+ public String getRoleid() {
+ return roleid;
+ }
+
+ public void setRoleid(String roleid) {
+ this.roleid = roleid;
+ }
+
+ public Integer getDeptid() {
+ return deptid;
+ }
+
+ public void setDeptid(Integer deptid) {
+ this.deptid = deptid;
+ }
+
+ public Integer getStatus() {
+ return status;
+ }
+
+ public void setStatus(Integer status) {
+ this.status = status;
+ }
+
+ public Date getCreatetime() {
+ return createtime;
+ }
+
+ public void setCreatetime(Date createtime) {
+ this.createtime = createtime;
+ }
+
+ public Integer getVersion() {
+ return version;
+ }
+
+ public void setVersion(Integer version) {
+ this.version = version;
+ }
+
+ @Override
+ protected Serializable pkVal() {
+ return this.id;
+ }
+
+ @Override
+ public String toString() {
+ return "User{" +
+ "id=" + id +
+ ", avatar=" + avatar +
+ ", account=" + account +
+ ", password=" + password +
+ ", salt=" + salt +
+ ", name=" + name +
+ ", birthday=" + birthday +
+ ", sex=" + sex +
+ ", email=" + email +
+ ", phone=" + phone +
+ ", roleid=" + roleid +
+ ", deptid=" + deptid +
+ ", status=" + status +
+ ", createtime=" + createtime +
+ ", version=" + version +
+ "}";
+ }
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/UserActivity.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/UserActivity.java
new file mode 100644
index 0000000..29708b4
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/UserActivity.java
@@ -0,0 +1,146 @@
+package com.stylefeng.guns.modular.system.model;
+
+import com.baomidou.mybatisplus.enums.IdType;
+import java.util.Date;
+import com.baomidou.mybatisplus.annotations.TableId;
+import com.baomidou.mybatisplus.activerecord.Model;
+import com.baomidou.mybatisplus.annotations.TableName;
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 用户活动主表
+ * </p>
+ *
+ * @author stylefeng
+ * @since 2020-06-19
+ */
+@TableName("t_user_activity")
+public class UserActivity extends Model<UserActivity> {
+
+ private static final long serialVersionUID = 1L;
+
+ @TableId(value = "id", type = IdType.AUTO)
+ private Integer id;
+ /**
+ * 活动名称
+ */
+ private String name;
+ /**
+ * 有效期开始时间
+ */
+ private Date startTime;
+ /**
+ * 有效期结束时间
+ */
+ private Date endTime;
+ /**
+ * 添加时间
+ */
+ private Date insertTime;
+ /**
+ * 状态(1=待审核，2=驳回，3=通过，)
+ */
+ private Integer status;
+ /**
+ * 备注
+ */
+ private String remark;
+ /**
+ * 1=平台 2=分公司 3=加盟商
+ */
+ private Integer companyType;
+
+ private Integer companyId;
+
+ public Integer getCompanyId() {
+ return companyId;
+ }
+
+ public void setCompanyId(Integer companyId) {
+ this.companyId = companyId;
+ }
+
+ public Integer getId() {
+ return id;
+ }
+
+ public void setId(Integer id) {
+ this.id = id;
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ public Date getStartTime() {
+ return startTime;
+ }
+
+ public void setStartTime(Date startTime) {
+ this.startTime = startTime;
+ }
+
+ public Date getEndTime() {
+ return endTime;
+ }
+
+ public void setEndTime(Date endTime) {
+ this.endTime = endTime;
+ }
+
+ public Date getInsertTime() {
+ return insertTime;
+ }
+
+ public void setInsertTime(Date insertTime) {
+ this.insertTime = insertTime;
+ }
+
+ public Integer getStatus() {
+ return status;
+ }
+
+ public void setStatus(Integer status) {
+ this.status = status;
+ }
+
+ public String getRemark() {
+ return remark;
+ }
+
+ public void setRemark(String remark) {
+ this.remark = remark;
+ }
+
+ public Integer getCompanyType() {
+ return companyType;
+ }
+
+ public void setCompanyType(Integer companyType) {
+ this.companyType = companyType;
+ }
+
+ @Override
+ protected Serializable pkVal() {
+ return this.id;
+ }
+
+ @Override
+ public String toString() {
+ return "UserActivity{" +
+ "id=" + id +
+ ", name=" + name +
+ ", startTime=" + startTime +
+ ", endTime=" + endTime +
+ ", insertTime=" + insertTime +
+ ", status=" + status +
+ ", remark=" + remark +
+ ", companyType=" + companyType +
+ "}";
+ }
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/UserActivityBalance.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/UserActivityBalance.java
new file mode 100644
index 0000000..361ce53
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/UserActivityBalance.java
@@ -0,0 +1,313 @@
+package com.stylefeng.guns.modular.system.model;
+
+import com.baomidou.mybatisplus.enums.IdType;
+import java.util.Date;
+import com.baomidou.mybatisplus.annotations.TableId;
+import com.baomidou.mybatisplus.activerecord.Model;
+import com.baomidou.mybatisplus.annotations.TableName;
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 用户活动-充值
+ * </p>
+ *
+ * @author stylefeng
+ * @since 2020-06-19
+ */
+@TableName("t_user_activity_balance")
+public class UserActivityBalance extends Model<UserActivityBalance> {
+
+ private static final long serialVersionUID = 1L;
+
+ @TableId(value = "id", type = IdType.AUTO)
+ private Integer id;
+ /**
+ * 1=不启用，2=启用
+ */
+ private Integer enable;
+ /**
+ * 用户活动主表id
+ */
+ private Integer userActivityId;
+ /**
+ * 充值金额
+ */
+ private Double money;
+ /**
+ * 通用优惠券数量
+ */
+ private Integer generalNum;
+ /**
+ * 通用优惠券id
+ */
+ private Integer generalCouponId;
+ /**
+ * 专车优惠券数量
+ */
+ private Integer specialNum;
+ /**
+ * 专车优惠券id
+ */
+ private Integer specialCouponId;
+ /**
+ * 出租车优惠券数量
+ */
+ private Integer taxiNum;
+ /**
+ * 出租车优惠券id
+ */
+ private Integer taxiCouponId;
+ /**
+ * 城际优惠券数量
+ */
+ private Integer intercityNum;
+ /**
+ * 城际优惠券id
+ */
+ private Integer intercityCouponId;
+ /**
+ * 添加时间
+ */
+ private Date insertTime;
+ /**
+ * 有效期开始时间
+ */
+ private Date startTime;
+ /**
+ * 有效期结束时间
+ */
+ private Date endTime;
+ /**
+ * 有效天数
+ */
+ private Integer effective;
+ /**
+ * 通用券金额
+ */
+ private Double generalCouponMoney;
+ /**
+ * 专车券金额
+ */
+ private Double specialCouponMoney;
+ /**
+ * 出租车券金额
+ */
+ private Double taxiCouponMoney;
+ /**
+ * 城际券金额
+ */
+ private Double intercityCouponMoney;
+ /**
+ * 总金额上限
+ * @return
+ */
+ private Double totalPrice;
+ /**
+ * 剩余总金额上限
+ * @return
+ */
+ private Double lavePrice;
+
+ public Integer getEffective() {
+ return effective;
+ }
+
+ public void setEffective(Integer effective) {
+ this.effective = effective;
+ }
+
+ public Double getGeneralCouponMoney() {
+ return generalCouponMoney;
+ }
+
+ public void setGeneralCouponMoney(Double generalCouponMoney) {
+ this.generalCouponMoney = generalCouponMoney;
+ }
+
+ public Double getSpecialCouponMoney() {
+ return specialCouponMoney;
+ }
+
+ public void setSpecialCouponMoney(Double specialCouponMoney) {
+ this.specialCouponMoney = specialCouponMoney;
+ }
+
+ public Double getTaxiCouponMoney() {
+ return taxiCouponMoney;
+ }
+
+ public void setTaxiCouponMoney(Double taxiCouponMoney) {
+ this.taxiCouponMoney = taxiCouponMoney;
+ }
+
+ public Double getIntercityCouponMoney() {
+ return intercityCouponMoney;
+ }
+
+ public void setIntercityCouponMoney(Double intercityCouponMoney) {
+ this.intercityCouponMoney = intercityCouponMoney;
+ }
+
+ public Integer getId() {
+ return id;
+ }
+
+ public void setId(Integer id) {
+ this.id = id;
+ }
+
+ public Integer getEnable() {
+ return enable;
+ }
+
+ public void setEnable(Integer enable) {
+ this.enable = enable;
+ }
+
+ public Integer getUserActivityId() {
+ return userActivityId;
+ }
+
+ public void setUserActivityId(Integer userActivityId) {
+ this.userActivityId = userActivityId;
+ }
+
+ public Double getMoney() {
+ return money;
+ }
+
+ public void setMoney(Double money) {
+ this.money = money;
+ }
+
+ public Integer getGeneralNum() {
+ return generalNum;
+ }
+
+ public void setGeneralNum(Integer generalNum) {
+ this.generalNum = generalNum;
+ }
+
+ public Integer getGeneralCouponId() {
+ return generalCouponId;
+ }
+
+ public void setGeneralCouponId(Integer generalCouponId) {
+ this.generalCouponId = generalCouponId;
+ }
+
+ public Integer getSpecialNum() {
+ return specialNum;
+ }
+
+ public void setSpecialNum(Integer specialNum) {
+ this.specialNum = specialNum;
+ }
+
+ public Integer getSpecialCouponId() {
+ return specialCouponId;
+ }
+
+ public void setSpecialCouponId(Integer specialCouponId) {
+ this.specialCouponId = specialCouponId;
+ }
+
+ public Integer getTaxiNum() {
+ return taxiNum;
+ }
+
+ public void setTaxiNum(Integer taxiNum) {
+ this.taxiNum = taxiNum;
+ }
+
+ public Integer getTaxiCouponId() {
+ return taxiCouponId;
+ }
+
+ public void setTaxiCouponId(Integer taxiCouponId) {
+ this.taxiCouponId = taxiCouponId;
+ }
+
+ public Integer getIntercityNum() {
+ return intercityNum;
+ }
+
+ public void setIntercityNum(Integer intercityNum) {
+ this.intercityNum = intercityNum;
+ }
+
+ public Integer getIntercityCouponId() {
+ return intercityCouponId;
+ }
+
+ public void setIntercityCouponId(Integer intercityCouponId) {
+ this.intercityCouponId = intercityCouponId;
+ }
+
+ public Date getInsertTime() {
+ return insertTime;
+ }
+
+ public void setInsertTime(Date insertTime) {
+ this.insertTime = insertTime;
+ }
+
+ public Date getStartTime() {
+ return startTime;
+ }
+
+ public void setStartTime(Date startTime) {
+ this.startTime = startTime;
+ }
+
+ public Date getEndTime() {
+ return endTime;
+ }
+
+ public void setEndTime(Date endTime) {
+ this.endTime = endTime;
+ }
+
+ public Double getTotalPrice() {
+ return totalPrice;
+ }
+
+ public void setTotalPrice(Double totalPrice) {
+ this.totalPrice = totalPrice;
+ }
+
+ public Double getLavePrice() {
+ return lavePrice;
+ }
+
+ public void setLavePrice(Double lavePrice) {
+ this.lavePrice = lavePrice;
+ }
+
+ @Override
+ protected Serializable pkVal() {
+ return this.id;
+ }
+
+ @Override
+ public String toString() {
+ return "UserActivityBalance{" +
+ "id=" + id +
+ ", enable=" + enable +
+ ", userActivityId=" + userActivityId +
+ ", money=" + money +
+ ", generalNum=" + generalNum +
+ ", generalCouponId=" + generalCouponId +
+ ", specialNum=" + specialNum +
+ ", specialCouponId=" + specialCouponId +
+ ", taxiNum=" + taxiNum +
+ ", taxiCouponId=" + taxiCouponId +
+ ", intercityNum=" + intercityNum +
+ ", intercityCouponId=" + intercityCouponId +
+ ", insertTime=" + insertTime +
+ ", startTime=" + startTime +
+ ", endTime=" + endTime +
+ "}";
+ }
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/UserActivityDiscount1.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/UserActivityDiscount1.java
new file mode 100644
index 0000000..e109b13
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/UserActivityDiscount1.java
@@ -0,0 +1,137 @@
+package com.stylefeng.guns.modular.system.model;
+
+import com.baomidou.mybatisplus.enums.IdType;
+import java.util.Date;
+import com.baomidou.mybatisplus.annotations.TableId;
+import com.baomidou.mybatisplus.activerecord.Model;
+import com.baomidou.mybatisplus.annotations.TableName;
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 用户活动-折扣1
+ * </p>
+ *
+ * @author stylefeng
+ * @since 2020-06-19
+ */
+@TableName("t_user_activity_discount1")
+public class UserActivityDiscount1 extends Model<UserActivityDiscount1> {
+
+ private static final long serialVersionUID = 1L;
+
+ @TableId(value = "id", type = IdType.AUTO)
+ private Integer id;
+ /**
+ * 用户活动主表id
+ */
+ private Integer userActivityId;
+ /**
+ * 专车打折（8.5）
+ */
+ private Double special;
+ /**
+ * 出租车打折（8.5）
+ */
+ private Double taxi;
+ /**
+ * 小件物流打折（8.5）
+ */
+ private Double logistics;
+ /**
+ * 有效期开始时间
+ */
+ private Date startTime;
+ /**
+ * 有效期结束时间
+ */
+ private Date endTime;
+ /**
+ * 1=不启用，2=启用
+ */
+ private Integer enable;
+
+
+ public Integer getId() {
+ return id;
+ }
+
+ public void setId(Integer id) {
+ this.id = id;
+ }
+
+ public Integer getUserActivityId() {
+ return userActivityId;
+ }
+
+ public void setUserActivityId(Integer userActivityId) {
+ this.userActivityId = userActivityId;
+ }
+
+ public Double getSpecial() {
+ return special;
+ }
+
+ public void setSpecial(Double special) {
+ this.special = special;
+ }
+
+ public Double getTaxi() {
+ return taxi;
+ }
+
+ public void setTaxi(Double taxi) {
+ this.taxi = taxi;
+ }
+
+ public Double getLogistics() {
+ return logistics;
+ }
+
+ public void setLogistics(Double logistics) {
+ this.logistics = logistics;
+ }
+
+ public Date getStartTime() {
+ return startTime;
+ }
+
+ public void setStartTime(Date startTime) {
+ this.startTime = startTime;
+ }
+
+ public Date getEndTime() {
+ return endTime;
+ }
+
+ public void setEndTime(Date endTime) {
+ this.endTime = endTime;
+ }
+
+ public Integer getEnable() {
+ return enable;
+ }
+
+ public void setEnable(Integer enable) {
+ this.enable = enable;
+ }
+
+ @Override
+ protected Serializable pkVal() {
+ return this.id;
+ }
+
+ @Override
+ public String toString() {
+ return "UserActivityDiscount1{" +
+ "id=" + id +
+ ", userActivityId=" + userActivityId +
+ ", special=" + special +
+ ", taxi=" + taxi +
+ ", logistics=" + logistics +
+ ", startTime=" + startTime +
+ ", endTime=" + endTime +
+ ", enable=" + enable +
+ "}";
+ }
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/UserActivityDiscount2.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/UserActivityDiscount2.java
new file mode 100644
index 0000000..abce17c
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/UserActivityDiscount2.java
@@ -0,0 +1,124 @@
+package com.stylefeng.guns.modular.system.model;
+
+import com.baomidou.mybatisplus.enums.IdType;
+import java.util.Date;
+import com.baomidou.mybatisplus.annotations.TableId;
+import com.baomidou.mybatisplus.activerecord.Model;
+import com.baomidou.mybatisplus.annotations.TableName;
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 用户活动-折扣2（跨城）
+ * </p>
+ *
+ * @author stylefeng
+ * @since 2020-06-19
+ */
+@TableName("t_user_activity_discount2")
+public class UserActivityDiscount2 extends Model<UserActivityDiscount2> {
+
+ private static final long serialVersionUID = 1L;
+
+ @TableId(value = "id", type = IdType.AUTO)
+ private Integer id;
+ /**
+ * 用户活动主表id
+ */
+ private Integer userActivityId;
+ /**
+ * 跨城线路id
+ */
+ private Integer lineId;
+ /**
+ * 折扣（8.5）
+ */
+ private Double discount;
+ /**
+ * 有效期开始时间
+ */
+ private Date startTime;
+ /**
+ * 有效期结束时间
+ */
+ private Date endTime;
+ /**
+ * 1=不启用，2=启用
+ */
+ private Integer enable;
+
+
+ public Integer getId() {
+ return id;
+ }
+
+ public void setId(Integer id) {
+ this.id = id;
+ }
+
+ public Integer getUserActivityId() {
+ return userActivityId;
+ }
+
+ public void setUserActivityId(Integer userActivityId) {
+ this.userActivityId = userActivityId;
+ }
+
+ public Integer getLineId() {
+ return lineId;
+ }
+
+ public void setLineId(Integer lineId) {
+ this.lineId = lineId;
+ }
+
+ public Double getDiscount() {
+ return discount;
+ }
+
+ public void setDiscount(Double discount) {
+ this.discount = discount;
+ }
+
+ public Date getStartTime() {
+ return startTime;
+ }
+
+ public void setStartTime(Date startTime) {
+ this.startTime = startTime;
+ }
+
+ public Date getEndTime() {
+ return endTime;
+ }
+
+ public void setEndTime(Date endTime) {
+ this.endTime = endTime;
+ }
+
+ public Integer getEnable() {
+ return enable;
+ }
+
+ public void setEnable(Integer enable) {
+ this.enable = enable;
+ }
+
+ @Override
+ protected Serializable pkVal() {
+ return this.id;
+ }
+
+ @Override
+ public String toString() {
+ return "UserActivityDiscount2{" +
+ "id=" + id +
+ ", userActivityId=" + userActivityId +
+ ", lineId=" + lineId +
+ ", discount=" + discount +
+ ", startTime=" + startTime +
+ ", endTime=" + endTime +
+ ", enable=" + enable +
+ "}";
+ }
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/UserActivityInvite.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/UserActivityInvite.java
new file mode 100644
index 0000000..865c1f5
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/UserActivityInvite.java
@@ -0,0 +1,174 @@
+package com.stylefeng.guns.modular.system.model;
+
+import com.baomidou.mybatisplus.enums.IdType;
+import java.util.Date;
+import com.baomidou.mybatisplus.annotations.TableId;
+import com.baomidou.mybatisplus.activerecord.Model;
+import com.baomidou.mybatisplus.annotations.TableName;
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 用户活动-邀请
+ * </p>
+ *
+ * @author stylefeng
+ * @since 2020-06-19
+ */
+@TableName("t_user_activity_invite")
+public class UserActivityInvite extends Model<UserActivityInvite> {
+
+ private static final long serialVersionUID = 1L;
+
+ @TableId(value = "id", type = IdType.AUTO)
+ private Integer id;
+ /**
+ * 用户活动主表id
+ */
+ private Integer userActivityId;
+ /**
+ * 优惠券id
+ */
+ private Integer couponId;
+ /**
+ * 优惠券总数量
+ */
+ private Integer totalNum;
+ /**
+ * 剩余数量
+ */
+ private Integer laveNum;
+ /**
+ * 有效期开始时间
+ */
+ private Date startTime;
+ /**
+ * 有效期结束时间
+ */
+ private Date endTime;
+ /**
+ * 1=不启用，2=启用
+ */
+ private Integer enable;
+ /**
+ * 有效天数
+ */
+ private Integer effective;
+ /**
+ * 总金额上限
+ * @return
+ */
+ private Double totalPrice;
+ /**
+ * 剩余总金额上限
+ * @return
+ */
+ private Double lavePrice;
+
+ public Integer getEffective() {
+ return effective;
+ }
+
+ public void setEffective(Integer effective) {
+ this.effective = effective;
+ }
+
+ public Integer getId() {
+ return id;
+ }
+
+ public void setId(Integer id) {
+ this.id = id;
+ }
+
+ public Integer getUserActivityId() {
+ return userActivityId;
+ }
+
+ public void setUserActivityId(Integer userActivityId) {
+ this.userActivityId = userActivityId;
+ }
+
+ public Integer getCouponId() {
+ return couponId;
+ }
+
+ public void setCouponId(Integer couponId) {
+ this.couponId = couponId;
+ }
+
+ public Integer getTotalNum() {
+ return totalNum;
+ }
+
+ public void setTotalNum(Integer totalNum) {
+ this.totalNum = totalNum;
+ }
+
+ public Integer getLaveNum() {
+ return laveNum;
+ }
+
+ public void setLaveNum(Integer laveNum) {
+ this.laveNum = laveNum;
+ }
+
+ public Date getStartTime() {
+ return startTime;
+ }
+
+ public void setStartTime(Date startTime) {
+ this.startTime = startTime;
+ }
+
+ public Date getEndTime() {
+ return endTime;
+ }
+
+ public void setEndTime(Date endTime) {
+ this.endTime = endTime;
+ }
+
+ public Integer getEnable() {
+ return enable;
+ }
+
+ public void setEnable(Integer enable) {
+ this.enable = enable;
+ }
+
+ public Double getTotalPrice() {
+ return totalPrice;
+ }
+
+ public void setTotalPrice(Double totalPrice) {
+ this.totalPrice = totalPrice;
+ }
+
+ public Double getLavePrice() {
+ return lavePrice;
+ }
+
+ public void setLavePrice(Double lavePrice) {
+ this.lavePrice = lavePrice;
+ }
+
+ @Override
+ protected Serializable pkVal() {
+ return this.id;
+ }
+
+ @Override
+ public String toString() {
+ return "UserActivityInvite{" +
+ "id=" + id +
+ ", userActivityId=" + userActivityId +
+ ", couponId=" + couponId +
+ ", totalNum=" + totalNum +
+ ", laveNum=" + laveNum +
+ ", startTime=" + startTime +
+ ", endTime=" + endTime +
+ ", enable=" + enable +
+ "}";
+ }
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/UserActivityRedenvelope.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/UserActivityRedenvelope.java
new file mode 100644
index 0000000..51809fb
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/UserActivityRedenvelope.java
@@ -0,0 +1,163 @@
+package com.stylefeng.guns.modular.system.model;
+
+import com.baomidou.mybatisplus.enums.IdType;
+import java.util.Date;
+import com.baomidou.mybatisplus.annotations.TableId;
+import com.baomidou.mybatisplus.activerecord.Model;
+import com.baomidou.mybatisplus.annotations.TableName;
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 用户活动-红包
+ * </p>
+ *
+ * @author stylefeng
+ * @since 2020-06-19
+ */
+@TableName("t_user_activity_redenvelope")
+public class UserActivityRedenvelope extends Model<UserActivityRedenvelope> {
+
+ private static final long serialVersionUID = 1L;
+
+ @TableId(value = "id", type = IdType.AUTO)
+ private Integer id;
+ /**
+ * 用户活动主表id
+ */
+ private Integer userActivityId;
+ /**
+ * 红包id
+ */
+ private Integer redEnvelopeId;
+ /**
+ * 总金额
+ */
+ private Double totalMoney;
+ /**
+ * 剩余金额
+ */
+ private Double laveMoney;
+ /**
+ * 有效期开始时间
+ */
+ private Date startTime;
+ /**
+ * 有效期结束时间
+ */
+ private Date endTime;
+ /**
+ * 1=不启用，2=启用
+ */
+ private Integer enable;
+ /**
+ * 总金额上限
+ * @return
+ */
+ private Double totalPrice;
+ /**
+ * 剩余总金额上限
+ * @return
+ */
+ private Double lavePrice;
+
+
+ public Integer getId() {
+ return id;
+ }
+
+ public void setId(Integer id) {
+ this.id = id;
+ }
+
+ public Integer getUserActivityId() {
+ return userActivityId;
+ }
+
+ public void setUserActivityId(Integer userActivityId) {
+ this.userActivityId = userActivityId;
+ }
+
+ public Integer getRedEnvelopeId() {
+ return redEnvelopeId;
+ }
+
+ public void setRedEnvelopeId(Integer redEnvelopeId) {
+ this.redEnvelopeId = redEnvelopeId;
+ }
+
+ public Double getTotalMoney() {
+ return totalMoney;
+ }
+
+ public void setTotalMoney(Double totalMoney) {
+ this.totalMoney = totalMoney;
+ }
+
+ public Double getLaveMoney() {
+ return laveMoney;
+ }
+
+ public void setLaveMoney(Double laveMoney) {
+ this.laveMoney = laveMoney;
+ }
+
+ public Date getStartTime() {
+ return startTime;
+ }
+
+ public void setStartTime(Date startTime) {
+ this.startTime = startTime;
+ }
+
+ public Date getEndTime() {
+ return endTime;
+ }
+
+ public void setEndTime(Date endTime) {
+ this.endTime = endTime;
+ }
+
+ public Integer getEnable() {
+ return enable;
+ }
+
+ public void setEnable(Integer enable) {
+ this.enable = enable;
+ }
+
+ public Double getTotalPrice() {
+ return totalPrice;
+ }
+
+ public void setTotalPrice(Double totalPrice) {
+ this.totalPrice = totalPrice;
+ }
+
+ public Double getLavePrice() {
+ return lavePrice;
+ }
+
+ public void setLavePrice(Double lavePrice) {
+ this.lavePrice = lavePrice;
+ }
+
+ @Override
+ protected Serializable pkVal() {
+ return this.id;
+ }
+
+ @Override
+ public String toString() {
+ return "UserActivityRedenvelope{" +
+ "id=" + id +
+ ", userActivityId=" + userActivityId +
+ ", redEnvelopeId=" + redEnvelopeId +
+ ", totalMoney=" + totalMoney +
+ ", laveMoney=" + laveMoney +
+ ", startTime=" + startTime +
+ ", endTime=" + endTime +
+ ", enable=" + enable +
+ "}";
+ }
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/UserActivityRegistered.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/UserActivityRegistered.java
new file mode 100644
index 0000000..dd0ee52
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/UserActivityRegistered.java
@@ -0,0 +1,174 @@
+package com.stylefeng.guns.modular.system.model;
+
+import com.baomidou.mybatisplus.enums.IdType;
+import java.util.Date;
+import com.baomidou.mybatisplus.annotations.TableId;
+import com.baomidou.mybatisplus.activerecord.Model;
+import com.baomidou.mybatisplus.annotations.TableName;
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 用户活动-注册
+ * </p>
+ *
+ * @author stylefeng
+ * @since 2020-06-19
+ */
+@TableName("t_user_activity_registered")
+public class UserActivityRegistered extends Model<UserActivityRegistered> {
+
+ private static final long serialVersionUID = 1L;
+
+ @TableId(value = "id", type = IdType.AUTO)
+ private Integer id;
+ /**
+ * 用户活动id
+ */
+ private Integer userActivityId;
+ /**
+ * 优惠券id
+ */
+ private Integer couponId;
+ /**
+ * 优惠券总数
+ */
+ private Integer totalNum;
+ /**
+ * 剩余数量
+ */
+ private Integer laveNum;
+ /**
+ * 有效期开始时间
+ */
+ private Date startTime;
+ /**
+ * 有效期结束时间
+ */
+ private Date endTime;
+ /**
+ * 1=不启用，2=启用
+ */
+ private Integer enable;
+ /**
+ * 有效天数
+ */
+ private Integer effective;
+ /**
+ * 总金额上限
+ * @return
+ */
+ private Double totalPrice;
+ /**
+ * 剩余总金额上限
+ * @return
+ */
+ private Double lavePrice;
+
+ public Integer getEffective() {
+ return effective;
+ }
+
+ public void setEffective(Integer effective) {
+ this.effective = effective;
+ }
+
+ public Integer getId() {
+ return id;
+ }
+
+ public void setId(Integer id) {
+ this.id = id;
+ }
+
+ public Integer getUserActivityId() {
+ return userActivityId;
+ }
+
+ public void setUserActivityId(Integer userActivityId) {
+ this.userActivityId = userActivityId;
+ }
+
+ public Integer getCouponId() {
+ return couponId;
+ }
+
+ public void setCouponId(Integer couponId) {
+ this.couponId = couponId;
+ }
+
+ public Integer getTotalNum() {
+ return totalNum;
+ }
+
+ public void setTotalNum(Integer totalNum) {
+ this.totalNum = totalNum;
+ }
+
+ public Integer getLaveNum() {
+ return laveNum;
+ }
+
+ public void setLaveNum(Integer laveNum) {
+ this.laveNum = laveNum;
+ }
+
+ public Date getStartTime() {
+ return startTime;
+ }
+
+ public void setStartTime(Date startTime) {
+ this.startTime = startTime;
+ }
+
+ public Date getEndTime() {
+ return endTime;
+ }
+
+ public void setEndTime(Date endTime) {
+ this.endTime = endTime;
+ }
+
+ public Integer getEnable() {
+ return enable;
+ }
+
+ public void setEnable(Integer enable) {
+ this.enable = enable;
+ }
+
+ public Double getTotalPrice() {
+ return totalPrice;
+ }
+
+ public void setTotalPrice(Double totalPrice) {
+ this.totalPrice = totalPrice;
+ }
+
+ public Double getLavePrice() {
+ return lavePrice;
+ }
+
+ public void setLavePrice(Double lavePrice) {
+ this.lavePrice = lavePrice;
+ }
+
+ @Override
+ protected Serializable pkVal() {
+ return this.id;
+ }
+
+ @Override
+ public String toString() {
+ return "UserActivityRegistered{" +
+ "id=" + id +
+ ", userActivityId=" + userActivityId +
+ ", couponId=" + couponId +
+ ", totalNum=" + totalNum +
+ ", laveNum=" + laveNum +
+ ", startTime=" + startTime +
+ ", endTime=" + endTime +
+ ", enable=" + enable +
+ "}";
+ }
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/UserCouponRecord.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/UserCouponRecord.java
new file mode 100644
index 0000000..7150c73
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/UserCouponRecord.java
@@ -0,0 +1,215 @@
+package com.stylefeng.guns.modular.system.model;
+
+import com.baomidou.mybatisplus.enums.IdType;
+import java.math.BigDecimal;
+import java.util.Date;
+import com.baomidou.mybatisplus.annotations.TableId;
+import com.baomidou.mybatisplus.activerecord.Model;
+import com.baomidou.mybatisplus.annotations.TableName;
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 用户优惠券记录
+ * </p>
+ *
+ * @author stylefeng
+ * @since 2020-06-17
+ */
+@TableName("t_user_coupon_record")
+public class UserCouponRecord extends Model<UserCouponRecord> {
+
+ private static final long serialVersionUID = 1L;
+
+ @TableId(value = "id", type = IdType.AUTO)
+ private Integer id;
+ /**
+ * 金额
+ */
+ private BigDecimal money;
+ /**
+ * 满减金额
+ */
+ private BigDecimal fullMoney;
+ /**
+ * 过期时间
+ */
+ private Date expirationTime;
+ /**
+ * 获取时间
+ */
+ private Date insertTime;
+ /**
+ * 公司id
+ */
+ private Integer companyId;
+ /**
+ * 状态(1=未使用，2=已使用，3=已过期)
+ */
+ private Integer state;
+ /**
+ * 使用结束时间
+ */
+ private Date endTime;
+ /**
+ * 优惠券使用类型(0=通用，1=专车，2=出租车，3=城际，4=小件物流)
+ */
+ private Integer couponUseType;
+ /**
+ * 优惠券类型(1=抵扣，2=满减)
+ */
+ private Integer couponType;
+ /**
+ * 用户id
+ */
+ private Integer userId;
+ /**
+ * 优惠券发放id
+ */
+ private Integer couponId;
+ /**
+ * 活动id
+ */
+ private Integer couponActivityId;
+ /**
+ * 活动类型(1=赠送活动，2=注册，3=邀请，4=充值)
+ */
+ private Integer activityType;
+
+
+ public Integer getId() {
+ return id;
+ }
+
+ public void setId(Integer id) {
+ this.id = id;
+ }
+
+ public BigDecimal getMoney() {
+ return money;
+ }
+
+ public void setMoney(BigDecimal money) {
+ this.money = money;
+ }
+
+ public BigDecimal getFullMoney() {
+ return fullMoney;
+ }
+
+ public void setFullMoney(BigDecimal fullMoney) {
+ this.fullMoney = fullMoney;
+ }
+
+ public Date getExpirationTime() {
+ return expirationTime;
+ }
+
+ public void setExpirationTime(Date expirationTime) {
+ this.expirationTime = expirationTime;
+ }
+
+ public Date getInsertTime() {
+ return insertTime;
+ }
+
+ public void setInsertTime(Date insertTime) {
+ this.insertTime = insertTime;
+ }
+
+ public Integer getCompanyId() {
+ return companyId;
+ }
+
+ public void setCompanyId(Integer companyId) {
+ this.companyId = companyId;
+ }
+
+ public Integer getState() {
+ return state;
+ }
+
+ public void setState(Integer state) {
+ this.state = state;
+ }
+
+ public Integer getCouponUseType() {
+ return couponUseType;
+ }
+
+ public void setCouponUseType(Integer couponUseType) {
+ this.couponUseType = couponUseType;
+ }
+
+ public Integer getCouponType() {
+ return couponType;
+ }
+
+ public void setCouponType(Integer couponType) {
+ this.couponType = couponType;
+ }
+
+ public Integer getUserId() {
+ return userId;
+ }
+
+ public void setUserId(Integer userId) {
+ this.userId = userId;
+ }
+
+ public Integer getCouponId() {
+ return couponId;
+ }
+
+ public void setCouponId(Integer couponId) {
+ this.couponId = couponId;
+ }
+
+ public Integer getCouponActivityId() {
+ return couponActivityId;
+ }
+
+ public void setCouponActivityId(Integer couponActivityId) {
+ this.couponActivityId = couponActivityId;
+ }
+
+ public Integer getActivityType() {
+ return activityType;
+ }
+
+ public void setActivityType(Integer activityType) {
+ this.activityType = activityType;
+ }
+
+ public Date getEndTime() {
+ return endTime;
+ }
+
+ public void setEndTime(Date endTime) {
+ this.endTime = endTime;
+ }
+
+ @Override
+ protected Serializable pkVal() {
+ return this.id;
+ }
+
+ @Override
+ public String toString() {
+ return "UserCouponRecord{" +
+ "id=" + id +
+ ", money=" + money +
+ ", fullMoney=" + fullMoney +
+ ", expirationTime=" + expirationTime +
+ ", insertTime=" + insertTime +
+ ", companyId=" + companyId +
+ ", state=" + state +
+ ", couponUseType=" + couponUseType +
+ ", couponType=" + couponType +
+ ", userId=" + userId +
+ ", couponId=" + couponId +
+ ", couponActivityId=" + couponActivityId +
+ ", activityType=" + activityType +
+ "}";
+ }
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/UserRedPacketRecord.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/UserRedPacketRecord.java
new file mode 100644
index 0000000..5f2fa60
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/UserRedPacketRecord.java
@@ -0,0 +1,175 @@
+package com.stylefeng.guns.modular.system.model;
+
+import com.baomidou.mybatisplus.annotations.TableField;
+import com.baomidou.mybatisplus.annotations.TableId;
+import com.baomidou.mybatisplus.annotations.TableName;
+import com.baomidou.mybatisplus.enums.IdType;
+
+import java.util.Date;
+
+/**
+ * 用户红包记录
+ */
+@TableName("t_user_red_packet_record")
+public class UserRedPacketRecord {
+ /**
+ * 主键
+ */
+ @TableId(value = "id", type = IdType.AUTO)
+ @TableField("id")
+ private Integer id;
+ /**
+ * 金额
+ */
+ @TableField("money")
+ private Double money;
+ /**
+ * 过期时间
+ */
+ @TableField("expirationTime")
+ private Date expirationTime;
+ /**
+ * 添加时间
+ */
+ @TableField("insertTime")
+ private Date insertTime;
+ /**
+ * 企业id
+ */
+ @TableField("companyId")
+ private Integer companyId;
+ /**
+ * 状态（0=临时，1=未使用，2=已使用，3=已过期）
+ */
+ @TableField("state")
+ private Integer state;
+ /**
+ * 使用结束时间
+ */
+ private Date endTime;
+ /**
+ * 订单id(获取红包的订单)
+ */
+ @TableField("orderId")
+ private Integer orderId;
+ /**
+ * 订单类型（1=专车，2=出租车，3=城际，4=小件物流）
+ */
+ @TableField("orderType")
+ private Integer orderType;
+ /**
+ * 用户id
+ */
+ @TableField("userId")
+ private Integer userId;
+ /**
+ * 活动id
+ * @return
+ */
+ @TableField("redPacketActivityId")
+ private Integer redPacketActivityId;
+
+ public Integer getId() {
+ return id;
+ }
+
+ public void setId(Integer id) {
+ this.id = id;
+ }
+
+ public Double getMoney() {
+ return money;
+ }
+
+ public void setMoney(Double money) {
+ this.money = money;
+ }
+
+ public Date getExpirationTime() {
+ return expirationTime;
+ }
+
+ public void setExpirationTime(Date expirationTime) {
+ this.expirationTime = expirationTime;
+ }
+
+ public Date getInsertTime() {
+ return insertTime;
+ }
+
+ public void setInsertTime(Date insertTime) {
+ this.insertTime = insertTime;
+ }
+
+ public Integer getCompanyId() {
+ return companyId;
+ }
+
+ public void setCompanyId(Integer companyId) {
+ this.companyId = companyId;
+ }
+
+ public Integer getState() {
+ return state;
+ }
+
+ public void setState(Integer state) {
+ this.state = state;
+ }
+
+ public Integer getOrderId() {
+ return orderId;
+ }
+
+ public void setOrderId(Integer orderId) {
+ this.orderId = orderId;
+ }
+
+ public Integer getOrderType() {
+ return orderType;
+ }
+
+ public void setOrderType(Integer orderType) {
+ this.orderType = orderType;
+ }
+
+ public Integer getUserId() {
+ return userId;
+ }
+
+ public void setUserId(Integer userId) {
+ this.userId = userId;
+ }
+
+ public Integer getRedPacketActivityId() {
+ return redPacketActivityId;
+ }
+
+ public void setRedPacketActivityId(Integer redPacketActivityId) {
+ this.redPacketActivityId = redPacketActivityId;
+ }
+
+ public Date getEndTime() {
+ return endTime;
+ }
+
+ public void setEndTime(Date endTime) {
+ this.endTime = endTime;
+ }
+
+ @Override
+ public String toString() {
+ return "UserRedPacketRecord{" +
+ "id=" + id +
+ ", money=" + money +
+ ", expirationTime=" + expirationTime +
+ ", insertTime=" + insertTime +
+ ", companyId=" + companyId +
+ ", state=" + state +
+ ", orderId=" + orderId +
+ ", orderType=" + orderType +
+ ", userId=" + userId +
+ ", redPacketActivityId=" + redPacketActivityId +
+ '}';
+ }
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IDeptService.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IDeptService.java
new file mode 100644
index 0000000..fb02331
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IDeptService.java
@@ -0,0 +1,33 @@
+package com.stylefeng.guns.modular.system.service;
+
+import com.baomidou.mybatisplus.service.IService;
+import com.stylefeng.guns.core.node.ZTreeNode;
+import com.stylefeng.guns.modular.system.model.Dept;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 部门服务
+ *
+ * @author fengshuonan
+ * @date 2017-04-27 17:00
+ */
+public interface IDeptService extends IService<Dept> {
+
+ /**
+ * 删除部门
+ */
+ void deleteDept(Integer deptId);
+
+ /**
+ * 获取ztree的节点列表
+ */
+ List<ZTreeNode> tree();
+
+ /**
+ * 获取所有部门列表
+ */
+ List<Map<String, Object>> list(@Param("condition") String condition);
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IDictService.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IDictService.java
new file mode 100644
index 0000000..6e3c3c4
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IDictService.java
@@ -0,0 +1,48 @@
+package com.stylefeng.guns.modular.system.service;
+
+import com.baomidou.mybatisplus.service.IService;
+import com.stylefeng.guns.modular.system.model.Dict;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 字典服务
+ *
+ * @author fengshuonan
+ * @date 2017-04-27 17:00
+ */
+public interface IDictService extends IService<Dict> {
+
+ /**
+ * 添加字典
+ */
+ void addDict(String dictCode,String dictName,String dictTips, String dictValues);
+
+ /**
+ * 编辑字典
+ */
+ void editDict(Integer dictId,String dictCode, String dictName,String dictTips, String dicts);
+
+ /**
+ * 删除字典
+ */
+ void delteDict(Integer dictId);
+
+ /**
+ * 根据编码获取词典列表
+ */
+ List<Dict> selectByCode(@Param("code") String code);
+
+ /**
+ * 根据父类编码获取词典列表
+ */
+ List<Dict> selectByParentCode(@Param("code") String code);
+
+ /**
+ * 查询字典列表
+ */
+ List<Map<String, Object>> list(@Param("condition") String conditiion);
+
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IDriverActivityHistoryService.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IDriverActivityHistoryService.java
new file mode 100644
index 0000000..e52bfd7
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IDriverActivityHistoryService.java
@@ -0,0 +1,28 @@
+package com.stylefeng.guns.modular.system.service;
+
+import com.baomidou.mybatisplus.plugins.Page;
+import com.stylefeng.guns.modular.system.model.DriverActivityHistory;
+import com.baomidou.mybatisplus.service.IService;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * 司机完成活动记录 服务类
+ * </p>
+ *
+ * @author stylefeng
+ * @since 2020-06-17
+ */
+public interface IDriverActivityHistoryService extends IService<DriverActivityHistory> {
+ /**
+ * 获取领取记录列表
+ * @param page
+ * @param activityId
+ * @param type
+ * @return
+ */
+ List<Map<String,Object>> getList(Page<Map<String, Object>> page,Integer activityId,Integer type);
+
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IDriverActivityOnlineService.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IDriverActivityOnlineService.java
new file mode 100644
index 0000000..37fc3cf
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IDriverActivityOnlineService.java
@@ -0,0 +1,16 @@
+package com.stylefeng.guns.modular.system.service;
+
+import com.stylefeng.guns.modular.system.model.DriverActivityOnline;
+import com.baomidou.mybatisplus.service.IService;
+
+/**
+ * <p>
+ * 司机活动-在线 服务类
+ * </p>
+ *
+ * @author stylefeng
+ * @since 2020-06-17
+ */
+public interface IDriverActivityOnlineService extends IService<DriverActivityOnline> {
+
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IDriverActivityOrderService.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IDriverActivityOrderService.java
new file mode 100644
index 0000000..452b295
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IDriverActivityOrderService.java
@@ -0,0 +1,16 @@
+package com.stylefeng.guns.modular.system.service;
+
+import com.stylefeng.guns.modular.system.model.DriverActivityOrder;
+import com.baomidou.mybatisplus.service.IService;
+
+/**
+ * <p>
+ * 司机活动-订单 服务类
+ * </p>
+ *
+ * @author stylefeng
+ * @since 2020-06-17
+ */
+public interface IDriverActivityOrderService extends IService<DriverActivityOrder> {
+
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IDriverActivityRegisteredService.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IDriverActivityRegisteredService.java
new file mode 100644
index 0000000..ee3cc1d
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IDriverActivityRegisteredService.java
@@ -0,0 +1,16 @@
+package com.stylefeng.guns.modular.system.service;
+
+import com.stylefeng.guns.modular.system.model.DriverActivityRegistered;
+import com.baomidou.mybatisplus.service.IService;
+
+/**
+ * <p>
+ * 司机活动-注册 服务类
+ * </p>
+ *
+ * @author stylefeng
+ * @since 2020-06-17
+ */
+public interface IDriverActivityRegisteredService extends IService<DriverActivityRegistered> {
+
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IDriverActivityService.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IDriverActivityService.java
new file mode 100644
index 0000000..eefcc58
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IDriverActivityService.java
@@ -0,0 +1,45 @@
+package com.stylefeng.guns.modular.system.service;
+
+import com.baomidou.mybatisplus.plugins.Page;
+import com.stylefeng.guns.modular.system.model.DriverActivity;
+import com.baomidou.mybatisplus.service.IService;
+
+import java.math.BigDecimal;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * 司机活动主表 服务类
+ * </p>
+ *
+ * @author stylefeng
+ * @since 2020-06-17
+ */
+public interface IDriverActivityService extends IService<DriverActivity> {
+ /**
+ * 获取司机活动列表
+ * @param page
+ * @param beginTime
+ * @param endTime
+ * @param name
+ * @return
+ */
+ List<Map<String,Object>> getList(Page<Map<String, Object>> page,
+ String beginTime,
+ String endTime,
+ String name,
+ Integer companyType,
+ Integer companyId);
+
+ void insertOrUpdate(Integer id,String staTime, String startTime, String num1, Double num2
+ , Double num3
+ , Integer num4
+ , Double num5
+ , Integer num6
+ , Double num7
+ , Integer num8
+ , Double num9
+ , Integer num10
+ , Double num11);
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IDriverOnlineService.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IDriverOnlineService.java
new file mode 100644
index 0000000..4c91b67
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IDriverOnlineService.java
@@ -0,0 +1,24 @@
+package com.stylefeng.guns.modular.system.service;
+
+import com.baomidou.mybatisplus.service.IService;
+import com.stylefeng.guns.modular.system.model.DriverOnline;
+
+import java.util.Map;
+
+public interface IDriverOnlineService extends IService<DriverOnline> {
+
+
+ /**
+ * 获取列表数据
+ * @param name
+ * @param phone
+ * @param offset
+ * @param limit
+ * @return
+ * @throws Exception
+ */
+ Map<String, Object> queryOnlineDriver(String name, String phone, Integer offset, Integer limit) throws Exception;
+
+
+ int queryOnlineDriverCount(String name, String phone);
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IGDInterfaceService.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IGDInterfaceService.java
new file mode 100644
index 0000000..e40f4c2
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IGDInterfaceService.java
@@ -0,0 +1,10 @@
+package com.stylefeng.guns.modular.system.service;
+
+import com.baomidou.mybatisplus.service.IService;
+import com.stylefeng.guns.modular.system.model.GDInterface;
+
+public interface IGDInterfaceService extends IService<GDInterface> {
+
+
+ void saveData(String name, String explanation);
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IIncomeService.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IIncomeService.java
new file mode 100644
index 0000000..e1a2fd3
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IIncomeService.java
@@ -0,0 +1,19 @@
+package com.stylefeng.guns.modular.system.service;
+
+import com.baomidou.mybatisplus.service.IService;
+import com.stylefeng.guns.modular.system.model.Income;
+
+public interface IIncomeService extends IService<Income> {
+
+
+ /**
+ * 添加数据
+ * @param userType
+ * @param objectId
+ * @param type
+ * @param incomeId
+ * @param money
+ * @throws Exception
+ */
+ void saveData(Integer userType, Integer objectId, Integer type, Integer incomeId, Integer orderType, Double money) throws Exception;
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ILoginLogService.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ILoginLogService.java
new file mode 100644
index 0000000..d0f4290
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ILoginLogService.java
@@ -0,0 +1,24 @@
+package com.stylefeng.guns.modular.system.service;
+
+import com.baomidou.mybatisplus.plugins.Page;
+import com.baomidou.mybatisplus.service.IService;
+import com.stylefeng.guns.modular.system.model.LoginLog;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * 登录记录 服务类
+ * </p>
+ *
+ * @author stylefeng123
+ * @since 2018-02-22
+ */
+public interface ILoginLogService extends IService<LoginLog> {
+
+ /**
+ * 获取登录日志列表
+ */
+ List<Map<String, Object>> getLoginLogs(Page<LoginLog> page, String beginTime, String endTime, String logName, String orderByField, boolean asc);
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IMenuService.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IMenuService.java
new file mode 100644
index 0000000..b976165
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IMenuService.java
@@ -0,0 +1,94 @@
+package com.stylefeng.guns.modular.system.service;
+
+import com.baomidou.mybatisplus.service.IService;
+import com.stylefeng.guns.core.node.MenuNode;
+import com.stylefeng.guns.core.node.ZTreeNode;
+import com.stylefeng.guns.modular.system.model.Menu;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 菜单服务
+ *
+ * @author fengshuonan
+ * @date 2017-05-05 22:19
+ */
+public interface IMenuService extends IService<Menu> {
+
+ /**
+ * 删除菜单
+ *
+ * @author stylefeng
+ * @Date 2017/5/5 22:20
+ */
+ void delMenu(Long menuId);
+
+ /**
+ * 删除菜单包含所有子菜单
+ *
+ * @author stylefeng
+ * @Date 2017/6/13 22:02
+ */
+ void delMenuContainSubMenus(Long menuId);
+
+ /**
+ * 根据条件查询菜单
+ *
+ * @return
+ * @date 2017年2月12日 下午9:14:34
+ */
+ List<Map<String, Object>> selectMenus(@Param("condition") String condition, @Param("level") String level);
+
+ /**
+ * 根据条件查询菜单
+ *
+ * @return
+ * @date 2017年2月12日 下午9:14:34
+ */
+ List<Long> getMenuIdsByRoleId(@Param("roleId") Integer roleId);
+
+ /**
+ * 获取菜单列表树
+ *
+ * @return
+ * @date 2017年2月19日 下午1:33:51
+ */
+ List<ZTreeNode> menuTreeList();
+
+ /**
+ * 获取菜单列表树
+ *
+ * @return
+ * @date 2017年2月19日 下午1:33:51
+ */
+ List<ZTreeNode> menuTreeListByMenuIds(List<Long> menuIds);
+
+ /**
+ * 删除menu关联的relation
+ *
+ * @param menuId
+ * @return
+ * @date 2017年2月19日 下午4:10:59
+ */
+ int deleteRelationByMenu(Long menuId);
+
+ /**
+ * 获取资源url通过角色id
+ *
+ * @param roleId
+ * @return
+ * @date 2017年2月19日 下午7:12:38
+ */
+ List<String> getResUrlsByRoleId(Integer roleId);
+
+ /**
+ * 根据角色获取菜单
+ *
+ * @param roleIds
+ * @return
+ * @date 2017年2月19日 下午10:35:40
+ */
+ List<MenuNode> getMenusByRoleIds(List<Integer> roleIds);
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/INoticeService.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/INoticeService.java
new file mode 100644
index 0000000..ced40b4
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/INoticeService.java
@@ -0,0 +1,23 @@
+package com.stylefeng.guns.modular.system.service;
+
+import com.baomidou.mybatisplus.service.IService;
+import com.stylefeng.guns.modular.system.model.Notice;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * 通知表 服务类
+ * </p>
+ *
+ * @author stylefeng123
+ * @since 2018-02-22
+ */
+public interface INoticeService extends IService<Notice> {
+
+ /**
+ * 获取通知列表
+ */
+ List<Map<String, Object>> list(String condition);
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IOperationLogService.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IOperationLogService.java
new file mode 100644
index 0000000..9c37b6b
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IOperationLogService.java
@@ -0,0 +1,24 @@
+package com.stylefeng.guns.modular.system.service;
+
+import com.baomidou.mybatisplus.plugins.Page;
+import com.baomidou.mybatisplus.service.IService;
+import com.stylefeng.guns.modular.system.model.OperationLog;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * 操作日志 服务类
+ * </p>
+ *
+ * @author stylefeng123
+ * @since 2018-02-22
+ */
+public interface IOperationLogService extends IService<OperationLog> {
+
+ /**
+ * 获取操作日志列表
+ */
+ List<Map<String, Object>> getOperationLogs(Page<OperationLog> page, String beginTime, String endTime, String logName, String s, String orderByField, boolean asc);
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IPaymentRecordService.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IPaymentRecordService.java
new file mode 100644
index 0000000..3eba161
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IPaymentRecordService.java
@@ -0,0 +1,35 @@
+package com.stylefeng.guns.modular.system.service;
+
+import com.baomidou.mybatisplus.service.IService;
+import com.stylefeng.guns.modular.system.model.PaymentRecord;
+
+import java.util.List;
+
+public interface IPaymentRecordService extends IService<PaymentRecord> {
+
+
+ /**
+ * 添加数据
+ * @param orderId 订单id
+ * @param orderType 订单类型
+ * @param payType 支付方式（1=微信，2=支付宝）
+ * @param amount 支付金额
+ * @param code 第三方支付单号
+ * @param state 支付状态（1=待支付，2=已支付）
+ * @throws Exception
+ */
+ Integer saveData(Integer category, Integer userId, Integer type, Integer orderId, Integer orderType, Integer payType,
+ Double amount, String code, Integer state) throws Exception;
+
+
+ /**
+ * 获取数据
+ * @param orderId
+ * @param payType
+ * @param state
+ * @return
+ * @throws Exception
+ */
+ List<PaymentRecord> query(Integer category, Integer userId, Integer type, Integer orderId, Integer orderType,
+ Integer payType, Integer state) throws Exception;
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IRelationService.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IRelationService.java
new file mode 100644
index 0000000..4214359
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IRelationService.java
@@ -0,0 +1,16 @@
+package com.stylefeng.guns.modular.system.service;
+
+import com.baomidou.mybatisplus.service.IService;
+import com.stylefeng.guns.modular.system.model.Relation;
+
+/**
+ * <p>
+ * 角色和菜单关联表 服务类
+ * </p>
+ *
+ * @author stylefeng123
+ * @since 2018-02-22
+ */
+public interface IRelationService extends IService<Relation> {
+
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IRoleService.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IRoleService.java
new file mode 100644
index 0000000..cc7332d
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IRoleService.java
@@ -0,0 +1,68 @@
+package com.stylefeng.guns.modular.system.service;
+
+import com.baomidou.mybatisplus.service.IService;
+import com.stylefeng.guns.core.node.ZTreeNode;
+import com.stylefeng.guns.modular.system.model.Role;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 角色相关业务
+ *
+ * @author fengshuonan
+ * @Date 2017年1月10日 下午9:11:57
+ */
+public interface IRoleService extends IService<Role> {
+
+ /**
+ * 设置某个角色的权限
+ *
+ * @param roleId 角色id
+ * @param ids 权限的id
+ * @date 2017年2月13日 下午8:26:53
+ */
+ void setAuthority(Integer roleId, String ids);
+
+ /**
+ * 删除角色
+ *
+ * @author stylefeng
+ * @Date 2017/5/5 22:24
+ */
+ void delRoleById(Integer roleId);
+
+ /**
+ * 根据条件查询角色列表
+ *
+ * @return
+ * @date 2017年2月12日 下午9:14:34
+ */
+ List<Map<String, Object>> selectRoles(@Param("condition") String condition);
+
+ /**
+ * 删除某个角色的所有权限
+ *
+ * @param roleId 角色id
+ * @return
+ * @date 2017年2月13日 下午7:57:51
+ */
+ int deleteRolesById(@Param("roleId") Integer roleId);
+
+ /**
+ * 获取角色列表树
+ *
+ * @return
+ * @date 2017年2月18日 上午10:32:04
+ */
+ List<ZTreeNode> roleTreeList();
+
+ /**
+ * 获取角色列表树
+ *
+ * @return
+ * @date 2017年2月18日 上午10:32:04
+ */
+ List<ZTreeNode> roleTreeListByRoleId(String[] roleId);
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ISysCouponActivityService.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ISysCouponActivityService.java
new file mode 100644
index 0000000..39cf8c5
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ISysCouponActivityService.java
@@ -0,0 +1,16 @@
+package com.stylefeng.guns.modular.system.service;
+
+import com.stylefeng.guns.modular.system.model.SysCouponActivity;
+import com.baomidou.mybatisplus.service.IService;
+
+/**
+ * <p>
+ * 系统设置-优惠券活动 服务类
+ * </p>
+ *
+ * @author stylefeng
+ * @since 2020-06-17
+ */
+public interface ISysCouponActivityService extends IService<SysCouponActivity> {
+
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ISysCouponRecordService.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ISysCouponRecordService.java
new file mode 100644
index 0000000..b1b65a7
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ISysCouponRecordService.java
@@ -0,0 +1,16 @@
+package com.stylefeng.guns.modular.system.service;
+
+import com.stylefeng.guns.modular.system.model.SysCouponRecord;
+import com.baomidou.mybatisplus.service.IService;
+
+/**
+ * <p>
+ * 系统设置-优惠券记录 服务类
+ * </p>
+ *
+ * @author stylefeng
+ * @since 2020-06-15
+ */
+public interface ISysCouponRecordService extends IService<SysCouponRecord> {
+
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ISysRedPacketRecordService.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ISysRedPacketRecordService.java
new file mode 100644
index 0000000..94a73a2
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ISysRedPacketRecordService.java
@@ -0,0 +1,16 @@
+package com.stylefeng.guns.modular.system.service;
+
+import com.stylefeng.guns.modular.system.model.SysRedPacketRecord;
+import com.baomidou.mybatisplus.service.IService;
+
+/**
+ * <p>
+ * 系统设置-红包记录 服务类
+ * </p>
+ *
+ * @author stylefeng
+ * @since 2020-06-13
+ */
+public interface ISysRedPacketRecordService extends IService<SysRedPacketRecord> {
+
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITAdvertisementService.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITAdvertisementService.java
new file mode 100644
index 0000000..a34e6d7
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITAdvertisementService.java
@@ -0,0 +1,35 @@
+package com.stylefeng.guns.modular.system.service;
+
+import com.baomidou.mybatisplus.plugins.Page;
+import com.stylefeng.guns.modular.system.model.TAdvertisement;
+import com.baomidou.mybatisplus.service.IService;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * 广告 服务类
+ * </p>
+ *
+ * @author 吕雪
+ * @since 2020-06-02
+ */
+public interface ITAdvertisementService extends IService<TAdvertisement> {
+
+ /**
+ * 根据条件查询广告列表
+ * @param page 分页
+ * @param beginTime 开始时间
+ * @param endTime 结束时间
+ * @param type 类型
+ * @param name 名称
+ * @return
+ */
+ List<Map<String,Object>> getAdvertisementList(@Param("page") Page<Map<String, Object>> page,
+ @Param("beginTime") String beginTime,
+ @Param("endTime") String endTime,
+ @Param("type") Integer type,
+ @Param("name") String name);
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITAgreementService.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITAgreementService.java
new file mode 100644
index 0000000..74bb705
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITAgreementService.java
@@ -0,0 +1,16 @@
+package com.stylefeng.guns.modular.system.service;
+
+import com.stylefeng.guns.modular.system.model.TAgreement;
+import com.baomidou.mybatisplus.service.IService;
+
+/**
+ * <p>
+ * 平台协议 服务类
+ * </p>
+ *
+ * @author 吕雪
+ * @since 2020-06-01
+ */
+public interface ITAgreementService extends IService<TAgreement> {
+
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITCarBrandService.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITCarBrandService.java
new file mode 100644
index 0000000..d3409cc
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITCarBrandService.java
@@ -0,0 +1,29 @@
+package com.stylefeng.guns.modular.system.service;
+
+import com.baomidou.mybatisplus.plugins.Page;
+import com.stylefeng.guns.modular.system.model.TCarBrand;
+import com.baomidou.mybatisplus.service.IService;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * 车辆品牌 服务类
+ * </p>
+ *
+ * @author 吕雪
+ * @since 2020-06-05
+ */
+public interface ITCarBrandService extends IService<TCarBrand> {
+
+ /**
+ * 根据条件查询车辆品牌列表
+ * @return
+ */
+ List<Map<String,Object>> getCarBrandList(@Param("page") Page<Map<String, Object>> page,
+ @Param("beginTime") String beginTime,
+ @Param("endTime") String endTime,
+ @Param("name") String name);
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITCarModelService.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITCarModelService.java
new file mode 100644
index 0000000..061687c
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITCarModelService.java
@@ -0,0 +1,29 @@
+package com.stylefeng.guns.modular.system.service;
+
+import com.baomidou.mybatisplus.plugins.Page;
+import com.stylefeng.guns.modular.system.model.TCarModel;
+import com.baomidou.mybatisplus.service.IService;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * 车辆车型 服务类
+ * </p>
+ *
+ * @author 吕雪
+ * @since 2020-06-05
+ */
+public interface ITCarModelService extends IService<TCarModel> {
+
+ /**
+ * 根据条件查询车辆车型列表
+ * @return
+ */
+ List<Map<String,Object>> getCarModelList(@Param("page") Page<Map<String, Object>> page,
+ @Param("beginTime") String beginTime,
+ @Param("endTime") String endTime,
+ @Param("name") String name);
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITCarService.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITCarService.java
new file mode 100644
index 0000000..29f4fcf
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITCarService.java
@@ -0,0 +1,47 @@
+package com.stylefeng.guns.modular.system.service;
+
+import com.baomidou.mybatisplus.plugins.Page;
+import com.stylefeng.guns.modular.system.model.TCar;
+import com.baomidou.mybatisplus.service.IService;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * 车辆 服务类
+ * </p>
+ *
+ * @author 吕雪
+ * @since 2020-06-05
+ */
+public interface ITCarService extends IService<TCar> {
+
+ /**
+ * 根据条件查询车辆列表
+ * @param page
+ * @return
+ */
+ List<Map<String,Object>> getCarList(@Param("page") Page<Map<String, Object>> page,
+ @Param("roleType") Integer roleType,
+ @Param("nowUserId") Integer nowUserId,
+ @Param("beginTime") String beginTime,
+ @Param("endTime") String endTime,
+ @Param("id") String id,
+ @Param("brandName") String brandName,
+ @Param("modelName") String modelName,
+ @Param("carColor") String carColor,
+ @Param("serverStr") String serverStr,
+ @Param("carLicensePlate") String carLicensePlate,
+ @Param("driverName") String driverName,
+ @Param("companyName") String companyName,
+ @Param("franchiseeName") String franchiseeName);
+
+ /**
+ * 根据条件查询车辆列表不分页
+ * @return
+ */
+ List<Map<String,Object>> getCarListNoPage(@Param("roleType") Integer roleType,
+ @Param("nowUserId") Integer nowUserId);
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITCarServiceService.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITCarServiceService.java
new file mode 100644
index 0000000..d06f838
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITCarServiceService.java
@@ -0,0 +1,16 @@
+package com.stylefeng.guns.modular.system.service;
+
+import com.stylefeng.guns.modular.system.model.TCarService;
+import com.baomidou.mybatisplus.service.IService;
+
+/**
+ * <p>
+ * 车辆经营业务 服务类
+ * </p>
+ *
+ * @author 吕雪
+ * @since 2020-06-05
+ */
+public interface ITCarServiceService extends IService<TCarService> {
+
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITCompanyCityService.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITCompanyCityService.java
new file mode 100644
index 0000000..b03f68f
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITCompanyCityService.java
@@ -0,0 +1,16 @@
+package com.stylefeng.guns.modular.system.service;
+
+import com.stylefeng.guns.modular.system.model.TCompanyCity;
+import com.baomidou.mybatisplus.service.IService;
+
+/**
+ * <p>
+ * 公司经营地区 服务类
+ * </p>
+ *
+ * @author 吕雪
+ * @since 2020-06-06
+ */
+public interface ITCompanyCityService extends IService<TCompanyCity> {
+
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITCompanyService.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITCompanyService.java
new file mode 100644
index 0000000..f27c79f
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITCompanyService.java
@@ -0,0 +1,92 @@
+package com.stylefeng.guns.modular.system.service;
+
+import com.baomidou.mybatisplus.plugins.Page;
+import com.stylefeng.guns.modular.system.model.TCompany;
+import com.baomidou.mybatisplus.service.IService;
+import com.stylefeng.guns.modular.system.util.ResultUtil;
+import org.apache.ibatis.annotations.Param;
+import org.apache.poi.hssf.usermodel.HSSFWorkbook;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * 公司信息表 服务类
+ * </p>
+ *
+ * @author 吕雪
+ * @since 2020-06-06
+ */
+public interface ITCompanyService extends IService<TCompany> {
+
+ /**
+ * 根据条件查询分公司列表
+ * @return
+ */
+ List<Map<String,Object>> getCompanyList(@Param("page") Page<Map<String, Object>> page,
+ @Param("beginTime") String beginTime,
+ @Param("endTime") String endTime,
+ @Param("name") String name,
+ @Param("principalName") String principalName,
+ @Param("principalPhone") String principalPhone,
+ @Param("adminName") String adminName,
+ @Param("adminPhone") String adminPhone,
+ @Param("serviceStr") String serviceStr,
+ @Param("state") Integer state);
+
+ /**
+ * 根据公司ID获取公司经营区域
+ * @param id
+ * @return
+ */
+ List<Map<String,Object>> getCompanyScopeById(@Param("id") Integer id);
+
+ /**
+ * 根据条件查询加盟商列表
+ * @return
+ */
+ List<Map<String,Object>> getFranchiseeList(@Param("page") Page<Map<String, Object>> page,
+ @Param("beginTime") String beginTime,
+ @Param("endTime") String endTime,
+ @Param("name") String name,
+ @Param("account") String account,
+ @Param("principalName") String principalName,
+ @Param("principalPhone") String principalPhone,
+ @Param("serviceStr") String serviceStr,
+ @Param("state") Integer state,
+ @Param("roleType") Integer roleType,
+ @Param("nowUserId") Integer nowUserId);
+
+ /**
+ * 根据企业id查询详情
+ * @param id
+ * @return
+ * @throws Exception
+ */
+ ResultUtil selectCompanyInfoById(String id) throws Exception;
+
+
+ /**
+ * 获取运营汇总数据
+ * @param type
+ * @param start
+ * @param end
+ * @param companyId
+ * @param offset
+ * @param limit
+ * @return
+ * @throws Exception
+ */
+ Map<String, Object> queryOperationalData(Integer type, String start, String end, Integer companyId, Integer offset, Integer limit) throws Exception;
+
+
+ /**
+ * 下载运营汇总数据
+ * @param type
+ * @param companyId
+ * @return
+ * @throws Exception
+ */
+ HSSFWorkbook downloadOperationalData(Integer type, String start, String end, Integer companyId) throws Exception;
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITComplaintService.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITComplaintService.java
new file mode 100644
index 0000000..0f0a33c
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITComplaintService.java
@@ -0,0 +1,34 @@
+package com.stylefeng.guns.modular.system.service;
+
+import com.baomidou.mybatisplus.plugins.Page;
+import com.stylefeng.guns.modular.system.model.TComplaint;
+import com.baomidou.mybatisplus.service.IService;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * 投诉管理 服务类
+ * </p>
+ *
+ * @author 吕雪
+ * @since 2020-06-09
+ */
+public interface ITComplaintService extends IService<TComplaint> {
+
+ /**
+ * 根据条件查询投诉列表
+ * @return
+ */
+ List<Map<String,Object>> getComplaintList(@Param("page") Page<Map<String, Object>> page,
+ @Param("roleType") Integer roleType,
+ @Param("nowUserId") Integer nowUserId,
+ @Param("beginTime") String beginTime,
+ @Param("endTime") String endTime,
+ @Param("userName") String userName,
+ @Param("userPhone") String userPhone,
+ @Param("driverPhone") String driverPhone,
+ @Param("isHandle") Integer isHandle);
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITDispatchService.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITDispatchService.java
new file mode 100644
index 0000000..56cf77c
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITDispatchService.java
@@ -0,0 +1,35 @@
+package com.stylefeng.guns.modular.system.service;
+
+import com.baomidou.mybatisplus.plugins.Page;
+import com.stylefeng.guns.modular.system.model.TDispatch;
+import com.baomidou.mybatisplus.service.IService;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * 调度管理 服务类
+ * </p>
+ *
+ * @author 吕雪
+ * @since 2020-09-01
+ */
+public interface ITDispatchService extends IService<TDispatch> {
+
+ /**
+ * 根据条件查询调度列表
+ * @return
+ */
+ List<Map<String,Object>> getDispatchList(@Param("page") Page<Map<String, Object>> page,
+ @Param("roleType") Integer roleType,
+ @Param("nowUserId") Integer nowUserId,
+ @Param("beginTime") String beginTime,
+ @Param("endTime") String endTime,
+ @Param("name") String name,
+ @Param("companyName") String companyName,
+ @Param("franchiseeName") String franchiseeName,
+ @Param("account") String account,
+ @Param("state") Integer state);
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITDriverLineService.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITDriverLineService.java
new file mode 100644
index 0000000..6e769ec
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITDriverLineService.java
@@ -0,0 +1,26 @@
+package com.stylefeng.guns.modular.system.service;
+
+import com.stylefeng.guns.modular.system.model.TDriverLine;
+import com.baomidou.mybatisplus.service.IService;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * 司机关联线路 服务类
+ * </p>
+ *
+ * @author 吕雪
+ * @since 2020-06-05
+ */
+public interface ITDriverLineService extends IService<TDriverLine> {
+
+ /**
+ * 根据司机ID查询司机关联线路列表
+ * @param driverId
+ * @return
+ */
+ List<Map<String,Object>> getDriverLineListByDriverId(@Param("driverId") Integer driverId);
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITDriverService.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITDriverService.java
new file mode 100644
index 0000000..385fd22
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITDriverService.java
@@ -0,0 +1,94 @@
+package com.stylefeng.guns.modular.system.service;
+
+import com.baomidou.mybatisplus.plugins.Page;
+import com.stylefeng.guns.modular.system.model.TDriver;
+import com.baomidou.mybatisplus.service.IService;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * 司机表 服务类
+ * </p>
+ *
+ * @author 吕雪
+ * @since 2020-06-04
+ */
+public interface ITDriverService extends IService<TDriver> {
+
+ /**
+ * 根据条件查询待审核司机列表
+ * @return
+ */
+ List<Map<String,Object>> getAuthDriverList(@Param("page") Page<Map<String, Object>> page,
+ @Param("beginTime") String beginTime,
+ @Param("endTime") String endTime,
+ @Param("companyName") String companyName,
+ @Param("phone") String phone,
+ @Param("account") String account,
+ @Param("addType") Integer addType,
+ @Param("authState") Integer authState);
+
+ /**
+ * 根据用户ID获取用户详情
+ * @param driverId
+ * @return
+ */
+ Map<String,Object> getDriverById(@Param("driverId") Integer driverId);
+
+ /**
+ * 根据审核通过的司机列表
+ * @return
+ */
+ List<Map<String,Object>> getDriverList(@Param("page") Page<Map<String, Object>> page,
+ @Param("roleType") Integer roleType,
+ @Param("nowUserId") Integer nowUserId,
+ @Param("beginTime") String beginTime,
+ @Param("endTime") String endTime,
+ @Param("companyName") String companyName,
+ @Param("phone") String phone,
+ @Param("name") String name,
+ @Param("addType") Integer addType,
+ @Param("authState") Integer authState);
+
+ /**
+ * 查询已被使用的车辆ID
+ * @return
+ */
+ String getUseCarIdStr(@Param("carId") Integer carId);
+
+ /**
+ * 查询当前可被选择的车辆列表
+ * @return
+ */
+ List<Map<String,Object>> getCanSelectCarList(@Param("page") Page<Map<String, Object>> page,
+ @Param("roleType") Integer roleType,
+ @Param("nowUserId") Integer nowUserId,
+ @Param("carIdStr") String carIdStr,
+ @Param("carLicensePlate") String carLicensePlate,
+ @Param("brandName") String brandName,
+ @Param("modelName") String modelName,
+ @Param("color") String color,
+ @Param("serverStr") String serverStr);
+
+ /**
+ * 修改分公司司机的状态
+ */
+ void updateCompanyDriverState( @Param("authState") Integer authState, @Param("companyId") Integer companyId);
+
+ /**
+ * 修改加盟商司机的状态
+ */
+ void updateFranchiseeDriverState( @Param("authState") Integer authState, @Param("franchiseeId") Integer franchiseeId);
+
+ /**
+ * 根据审核通过的司机列表无分页
+ * @return
+ * @return
+ */
+ List<Map<String,Object>> getDriverListNoPage(@Param("roleType") Integer roleType,
+ @Param("nowUserId") Integer nowUserId);
+
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITDriverServiceService.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITDriverServiceService.java
new file mode 100644
index 0000000..eb806a8
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITDriverServiceService.java
@@ -0,0 +1,16 @@
+package com.stylefeng.guns.modular.system.service;
+
+import com.stylefeng.guns.modular.system.model.TDriverService;
+import com.baomidou.mybatisplus.service.IService;
+
+/**
+ * <p>
+ * 司机经营业务 服务类
+ * </p>
+ *
+ * @author 吕雪
+ * @since 2020-06-05
+ */
+public interface ITDriverServiceService extends IService<TDriverService> {
+
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITFeedbackService.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITFeedbackService.java
new file mode 100644
index 0000000..38d4615
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITFeedbackService.java
@@ -0,0 +1,32 @@
+package com.stylefeng.guns.modular.system.service;
+
+import com.baomidou.mybatisplus.plugins.Page;
+import com.stylefeng.guns.modular.system.model.TFeedback;
+import com.baomidou.mybatisplus.service.IService;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * 反馈管理 服务类
+ * </p>
+ *
+ * @author 吕雪
+ * @since 2020-06-10
+ */
+public interface ITFeedbackService extends IService<TFeedback> {
+
+ /**
+ * 根据条件查询用反馈记录列表
+ * @return
+ */
+ List<Map<String,Object>> getFeedbackList(@Param("page") Page<Map<String, Object>> page,
+ @Param("beginTime") String beginTime,
+ @Param("endTime") String endTime,
+ @Param("type") Integer type,
+ @Param("name") String name,
+ @Param("phone") String phone,
+ @Param("state") Integer state);
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITIntegralGoodsService.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITIntegralGoodsService.java
new file mode 100644
index 0000000..c465481
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITIntegralGoodsService.java
@@ -0,0 +1,30 @@
+package com.stylefeng.guns.modular.system.service;
+
+import com.baomidou.mybatisplus.plugins.Page;
+import com.stylefeng.guns.modular.system.model.TIntegralGoods;
+import com.baomidou.mybatisplus.service.IService;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * 积分商品管理 服务类
+ * </p>
+ *
+ * @author 吕雪
+ * @since 2020-09-02
+ */
+public interface ITIntegralGoodsService extends IService<TIntegralGoods> {
+
+ /**
+ * 根据条件查询积分商品列表
+ * @return
+ */
+ List<Map<String,Object>> getIntegralGoodsList(@Param("page") Page<Map<String, Object>> page,
+ @Param("beginTime") String beginTime,
+ @Param("endTime") String endTime,
+ @Param("name") String name,
+ @Param("state") Integer state);
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITIntegralOrderService.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITIntegralOrderService.java
new file mode 100644
index 0000000..ae12339
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITIntegralOrderService.java
@@ -0,0 +1,33 @@
+package com.stylefeng.guns.modular.system.service;
+
+import com.baomidou.mybatisplus.plugins.Page;
+import com.stylefeng.guns.modular.system.model.TIntegralOrder;
+import com.baomidou.mybatisplus.service.IService;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * 积分订单管理 服务类
+ * </p>
+ *
+ * @author 吕雪
+ * @since 2020-09-02
+ */
+public interface ITIntegralOrderService extends IService<TIntegralOrder> {
+
+ /**
+ * 根据条件查询兑换订单列表
+ * @return
+ */
+ List<Map<String,Object>> getIntegralOrderList(@Param("page") Page<Map<String, Object>> page,
+ @Param("beginTime") String beginTime,
+ @Param("endTime") String endTime,
+ @Param("userName") String userName,
+ @Param("goodsName") String goodsName,
+ @Param("consigneeName") String consigneeName,
+ @Param("consigneePhone") String consigneePhone,
+ @Param("state") Integer state);
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITInvoiceService.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITInvoiceService.java
new file mode 100644
index 0000000..34df7a0
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITInvoiceService.java
@@ -0,0 +1,32 @@
+package com.stylefeng.guns.modular.system.service;
+
+import com.baomidou.mybatisplus.plugins.Page;
+import com.stylefeng.guns.modular.system.model.TInvoice;
+import com.baomidou.mybatisplus.service.IService;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * 发票 服务类
+ * </p>
+ *
+ * @author 吕雪
+ * @since 2020-06-09
+ */
+public interface ITInvoiceService extends IService<TInvoice> {
+
+ /**
+ * 根据条件查询用开发票记录列表
+ * @return
+ */
+ List<Map<String,Object>> getInvoiceList(@Param("page") Page<Map<String, Object>> page,
+ @Param("beginTime") String beginTime,
+ @Param("endTime") String endTime,
+ @Param("email") String email,
+ @Param("name") String name,
+ @Param("type") Integer type,
+ @Param("state") Integer state);
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITLineCompanyService.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITLineCompanyService.java
new file mode 100644
index 0000000..7635095
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITLineCompanyService.java
@@ -0,0 +1,16 @@
+package com.stylefeng.guns.modular.system.service;
+
+import com.stylefeng.guns.modular.system.model.TLineCompany;
+import com.baomidou.mybatisplus.service.IService;
+
+/**
+ * <p>
+ * 企业-线路关系表 服务类
+ * </p>
+ *
+ * @author 吕雪
+ * @since 2020-09-16
+ */
+public interface ITLineCompanyService extends IService<TLineCompany> {
+
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITLinePriceService.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITLinePriceService.java
new file mode 100644
index 0000000..06c15b1
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITLinePriceService.java
@@ -0,0 +1,16 @@
+package com.stylefeng.guns.modular.system.service;
+
+import com.stylefeng.guns.modular.system.model.TLinePrice;
+import com.baomidou.mybatisplus.service.IService;
+
+/**
+ * <p>
+ * 跨城线路价格规则 服务类
+ * </p>
+ *
+ * @author 吕雪
+ * @since 2020-09-16
+ */
+public interface ITLinePriceService extends IService<TLinePrice> {
+
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITLineService.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITLineService.java
new file mode 100644
index 0000000..afb0bd6
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITLineService.java
@@ -0,0 +1,46 @@
+package com.stylefeng.guns.modular.system.service;
+
+import com.baomidou.mybatisplus.plugins.Page;
+import com.stylefeng.guns.modular.system.model.TLine;
+import com.baomidou.mybatisplus.service.IService;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * 跨城线路 服务类
+ * </p>
+ *
+ * @author 吕雪
+ * @since 2020-09-15
+ */
+public interface ITLineService extends IService<TLine> {
+
+ /**
+ * 根据条件查询线路列表
+ * @return
+ */
+ List<Map<String,Object>> getLineList(@Param("page") Page<Map<String, Object>> page,
+ @Param("beginTime") String beginTime,
+ @Param("endTime") String endTime,
+ @Param("name") String name,
+ @Param("insertUser") String insertUser,
+ @Param("modelStr") String modelStr,
+ @Param("state") Integer state);
+
+ /**
+ * 根据线路ID查询线路价格
+ * @param lineId
+ * @return
+ */
+ List<Map<String,Object>> getLinePriceList(@Param("lineId") Integer lineId);
+
+ /**
+ * 根据线路ID查询线路已分配公司
+ * @param lineId
+ * @return
+ */
+ List<Map<String,Object>> getLineCompanyList(@Param("lineId") Integer lineId);
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITLineShiftService.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITLineShiftService.java
new file mode 100644
index 0000000..b338124
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITLineShiftService.java
@@ -0,0 +1,16 @@
+package com.stylefeng.guns.modular.system.service;
+
+import com.stylefeng.guns.modular.system.model.TLineShift;
+import com.baomidou.mybatisplus.service.IService;
+
+/**
+ * <p>
+ * 线路班次 服务类
+ * </p>
+ *
+ * @author 吕雪
+ * @since 2020-09-16
+ */
+public interface ITLineShiftService extends IService<TLineShift> {
+
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITLineSiteService.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITLineSiteService.java
new file mode 100644
index 0000000..d5006c3
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITLineSiteService.java
@@ -0,0 +1,16 @@
+package com.stylefeng.guns.modular.system.service;
+
+import com.stylefeng.guns.modular.system.model.TLineSite;
+import com.baomidou.mybatisplus.service.IService;
+
+/**
+ * <p>
+ * 线路-站点关系表 服务类
+ * </p>
+ *
+ * @author 吕雪
+ * @since 2020-09-16
+ */
+public interface ITLineSiteService extends IService<TLineSite> {
+
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITLocationService.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITLocationService.java
new file mode 100644
index 0000000..4a059ef
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITLocationService.java
@@ -0,0 +1,22 @@
+package com.stylefeng.guns.modular.system.service;
+
+import com.stylefeng.guns.modular.system.model.TLocation;
+import com.baomidou.mybatisplus.service.IService;
+
+/**
+ * <p>
+ * 地点 服务类
+ * </p>
+ *
+ * @author 吕雪
+ * @since 2020-09-04
+ */
+public interface ITLocationService extends IService<TLocation> {
+
+
+ /**
+ * 定时任务更新线上围栏的有效时间
+ * @throws Exception
+ */
+ void updateFence() throws Exception;
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITNoticesService.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITNoticesService.java
new file mode 100644
index 0000000..6afd752
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITNoticesService.java
@@ -0,0 +1,30 @@
+package com.stylefeng.guns.modular.system.service;
+
+import com.baomidou.mybatisplus.plugins.Page;
+import com.stylefeng.guns.modular.system.model.TNotices;
+import com.baomidou.mybatisplus.service.IService;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * 发布公告和滚动消息 服务类
+ * </p>
+ *
+ * @author 吕雪
+ * @since 2020-06-10
+ */
+public interface ITNoticesService extends IService<TNotices> {
+
+ /**
+ * 根据条件查询滚动消息列表
+ * @return
+ */
+ List<Map<String,Object>> getRollingNoticeList(@Param("page") Page<Map<String, Object>> page,
+ @Param("beginTime") String beginTime,
+ @Param("endTime") String endTime,
+ @Param("typeValue") Integer typeValue,
+ @Param("content") String content);
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITOpenCityBusinessService.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITOpenCityBusinessService.java
new file mode 100644
index 0000000..a4dcdd1
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITOpenCityBusinessService.java
@@ -0,0 +1,16 @@
+package com.stylefeng.guns.modular.system.service;
+
+import com.stylefeng.guns.modular.system.model.TOpenCityBusiness;
+import com.baomidou.mybatisplus.service.IService;
+
+/**
+ * <p>
+ * 开通城市经营业务 服务类
+ * </p>
+ *
+ * @author 吕雪
+ * @since 2020-06-02
+ */
+public interface ITOpenCityBusinessService extends IService<TOpenCityBusiness> {
+
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITOpenCityService.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITOpenCityService.java
new file mode 100644
index 0000000..8381119
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITOpenCityService.java
@@ -0,0 +1,40 @@
+package com.stylefeng.guns.modular.system.service;
+
+import com.baomidou.mybatisplus.plugins.Page;
+import com.stylefeng.guns.modular.system.model.TOpenCity;
+import com.baomidou.mybatisplus.service.IService;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * 开通城市表 服务类
+ * </p>
+ *
+ * @author 吕雪
+ * @since 2020-06-02
+ */
+public interface ITOpenCityService extends IService<TOpenCity> {
+
+ /**
+ * 根据条件查询开通城市列表
+ * @param page 分页
+ * @param beginTime 开始时间
+ * @param endTime 结束时间
+ * @param condition 省/市/区
+ * @return
+ */
+ List<Map<String,Object>> getOpenCityList(@Param("page") Page<Map<String, Object>> page,
+ @Param("beginTime") String beginTime,
+ @Param("endTime") String endTime,
+ @Param("condition") String condition);
+
+ /**
+ * 根据城市ID获取经营业务
+ * @param openCityId
+ * @return
+ */
+ List<Map<String,Object>> getBusinessByCityId(@Param("openCityId") Integer openCityId);
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITOrderCharterService.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITOrderCharterService.java
new file mode 100644
index 0000000..1f66e36
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITOrderCharterService.java
@@ -0,0 +1,33 @@
+package com.stylefeng.guns.modular.system.service;
+
+import com.baomidou.mybatisplus.plugins.Page;
+import com.stylefeng.guns.modular.system.model.TOrderCharter;
+import com.baomidou.mybatisplus.service.IService;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * 包车订单 服务类
+ * </p>
+ *
+ * @author 吕雪
+ * @since 2020-09-02
+ */
+public interface ITOrderCharterService extends IService<TOrderCharter> {
+
+ /**
+ * 根据条件查询包车订单列表
+ * @return
+ */
+ List<Map<String,Object>> getCharterOrderList(@Param("page") Page<Map<String, Object>> page,
+ @Param("beginTime") String beginTime,
+ @Param("endTime") String endTime,
+ @Param("userName") String userName,
+ @Param("contactName") String contactName,
+ @Param("contactPhone") String contactPhone,
+ @Param("useDemand") String useDemand,
+ @Param("state") Integer state);
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITOrderCharteredCarService.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITOrderCharteredCarService.java
new file mode 100644
index 0000000..4e6cc89
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITOrderCharteredCarService.java
@@ -0,0 +1,35 @@
+package com.stylefeng.guns.modular.system.service;
+
+import com.baomidou.mybatisplus.plugins.Page;
+import com.stylefeng.guns.modular.system.model.TOrderCharteredCar;
+import com.baomidou.mybatisplus.service.IService;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * 订单-包车 服务类
+ * </p>
+ *
+ * @author 吕雪
+ * @since 2020-09-24
+ */
+public interface ITOrderCharteredCarService extends IService<TOrderCharteredCar> {
+
+ /**
+ * 根据条件查询包车订单列表
+ * @return
+ */
+ List<Map<String,Object>> getCharterCarOrderList(@Param("page") Page<Map<String, Object>> page,
+ @Param("beginTime") String beginTime,
+ @Param("endTime") String endTime,
+ @Param("userName") String userName,
+ @Param("contactPerson") String contactPerson,
+ @Param("contactPhone") String contactPhone,
+ @Param("modelUse") String modelUse,
+ @Param("state") Integer state,
+ @Param("roleType") Integer roleType,
+ @Param("nowUserId") Integer nowUserId);
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITOrderCrossCityService.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITOrderCrossCityService.java
new file mode 100644
index 0000000..668551f
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITOrderCrossCityService.java
@@ -0,0 +1,54 @@
+package com.stylefeng.guns.modular.system.service;
+
+import com.baomidou.mybatisplus.plugins.Page;
+import com.stylefeng.guns.modular.system.model.TOrderCrossCity;
+import com.baomidou.mybatisplus.service.IService;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * 订单-跨城 服务类
+ * </p>
+ *
+ * @author 吕雪
+ * @since 2020-09-16
+ */
+public interface ITOrderCrossCityService extends IService<TOrderCrossCity> {
+
+ /**
+ * 根据条件查询跨城出行订单列表
+ * @return
+ */
+ List<Map<String,Object>> getCrossCityOrderList(@Param("page") Page<Map<String, Object>> page,
+ @Param("beginTime") String beginTime,
+ @Param("endTime") String endTime,
+ @Param("roleType") Integer roleType,
+ @Param("nowUserId") Integer nowUserId,
+ @Param("orderNum") String orderNum,
+ @Param("orderSource") Integer orderSource,
+ @Param("userName") String userName,
+ @Param("userPhone") String userPhone,
+ @Param("passengers") String passengers,
+ @Param("passengersPhone") String passengersPhone,
+ @Param("serverCarModelId") Integer serverCarModelId,
+ @Param("driver") String driver,
+ @Param("lineId") Integer lineId,
+ @Param("state") Integer state);
+
+ /**
+ * 根据跨城出行订单ID获取跨城出行订单详情
+ * @param orderId
+ * @return
+ */
+ Map<String,Object> getCrossCityOrderDetailById(@Param("orderId") Integer orderId);
+
+
+ List<TOrderCrossCity> queryOrders(@Param("driverId") Integer driverId, @Param("lineShiftDriverId") Integer lineShiftDriverId,
+ @Param("state") List<Integer> state);
+
+
+ String getOrderNum(Integer driverId, Integer lineShiftDriverId) throws Exception;
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITOrderEvaluateService.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITOrderEvaluateService.java
new file mode 100644
index 0000000..d36c4c4
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITOrderEvaluateService.java
@@ -0,0 +1,36 @@
+package com.stylefeng.guns.modular.system.service;
+
+import com.baomidou.mybatisplus.plugins.Page;
+import com.stylefeng.guns.modular.system.model.TOrderEvaluate;
+import com.baomidou.mybatisplus.service.IService;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * 订单评价 服务类
+ * </p>
+ *
+ * @author 吕雪
+ * @since 2020-06-09
+ */
+public interface ITOrderEvaluateService extends IService<TOrderEvaluate> {
+
+ /**
+ * 根据条件查询评价列表
+ * @return
+ */
+ List<Map<String,Object>> getOrderEvaluateList(@Param("page") Page<Map<String, Object>> page,
+ @Param("roleType") Integer roleType,
+ @Param("nowUserId") Integer nowUserId,
+ @Param("beginTime") String beginTime,
+ @Param("endTime") String endTime,
+ @Param("userName") String userName,
+ @Param("userPhone") String userPhone,
+ @Param("driverName") String driverName,
+ @Param("driverPhone") String driverPhone,
+ @Param("fraction") String fraction,
+ @Param("orderType") Integer orderType);
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITOrderLogisticsService.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITOrderLogisticsService.java
new file mode 100644
index 0000000..99f051b
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITOrderLogisticsService.java
@@ -0,0 +1,47 @@
+package com.stylefeng.guns.modular.system.service;
+
+import com.baomidou.mybatisplus.plugins.Page;
+import com.stylefeng.guns.modular.system.model.TOrderLogistics;
+import com.baomidou.mybatisplus.service.IService;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * 订单-小件物流 服务类
+ * </p>
+ *
+ * @author 吕雪
+ * @since 2020-09-24
+ */
+public interface ITOrderLogisticsService extends IService<TOrderLogistics> {
+
+ /**
+ * 根据条件查询小件物流订单列表
+ * @return
+ */
+ List<Map<String,Object>> getLogisticsOrderList(@Param("page") Page<Map<String, Object>> page,
+ @Param("beginTime") String beginTime,
+ @Param("endTime") String endTime,
+ @Param("roleType") Integer roleType,
+ @Param("nowUserId") Integer nowUserId,
+ @Param("orderNum") String orderNum,
+ @Param("orderSource") Integer orderSource,
+ @Param("type") Integer type,
+ @Param("userName") String userName,
+ @Param("userPhone") String userPhone,
+ @Param("recipient") String recipient,
+ @Param("recipientPhone") String recipientPhone,
+ @Param("driver") String driver,
+ @Param("state") Integer state);
+
+ /**
+ * 根据专车订单ID获取小件物流订单详情
+ * @param orderId
+ * @return
+ */
+ Map<String,Object> getLogisticsOrderDetailById(@Param("orderId") Integer orderId);
+
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITOrderPositionService.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITOrderPositionService.java
new file mode 100644
index 0000000..ae92c1f
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITOrderPositionService.java
@@ -0,0 +1,16 @@
+package com.stylefeng.guns.modular.system.service;
+
+import com.stylefeng.guns.modular.system.model.TOrderPosition;
+import com.baomidou.mybatisplus.service.IService;
+
+/**
+ * <p>
+ * 订单坐标信息表 服务类
+ * </p>
+ *
+ * @author 吕雪
+ * @since 2020-06-08
+ */
+public interface ITOrderPositionService extends IService<TOrderPosition> {
+
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITOrderPrivateCarService.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITOrderPrivateCarService.java
new file mode 100644
index 0000000..d4aad0f
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITOrderPrivateCarService.java
@@ -0,0 +1,46 @@
+package com.stylefeng.guns.modular.system.service;
+
+import com.baomidou.mybatisplus.plugins.Page;
+import com.stylefeng.guns.modular.system.model.TOrderPrivateCar;
+import com.baomidou.mybatisplus.service.IService;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * 订单-专车 服务类
+ * </p>
+ *
+ * @author 吕雪
+ * @since 2020-09-02
+ */
+public interface ITOrderPrivateCarService extends IService<TOrderPrivateCar> {
+
+ /**
+ * 根据条件查询专车订单列表
+ * @return
+ */
+ List<Map<String,Object>> getPrivateCarOrderList(@Param("page") Page<Map<String, Object>> page,
+ @Param("beginTime") String beginTime,
+ @Param("endTime") String endTime,
+ @Param("roleType") Integer roleType,
+ @Param("nowUserId") Integer nowUserId,
+ @Param("orderNum") String orderNum,
+ @Param("orderSource") Integer orderSource,
+ @Param("userName") String userName,
+ @Param("userPhone") String userPhone,
+ @Param("passengers") String passengers,
+ @Param("passengersPhone") String passengersPhone,
+ @Param("serverCarModelId") Integer serverCarModelId,
+ @Param("driver") String driver,
+ @Param("state") Integer state);
+
+ /**
+ * 根据专车订单ID获取专车订单详情
+ * @param orderId
+ * @return
+ */
+ Map<String,Object> getPrivateCarOrderDetailById(@Param("orderId") Integer orderId);
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITOrderTaxiService.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITOrderTaxiService.java
new file mode 100644
index 0000000..f73bd6e
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITOrderTaxiService.java
@@ -0,0 +1,81 @@
+package com.stylefeng.guns.modular.system.service;
+
+import com.baomidou.mybatisplus.plugins.Page;
+import com.stylefeng.guns.modular.system.model.TOrderTaxi;
+import com.baomidou.mybatisplus.service.IService;
+import com.stylefeng.guns.modular.system.util.ResultUtil;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * 订单-出租车 服务类
+ * </p>
+ *
+ * @author 吕雪
+ * @since 2020-06-08
+ */
+public interface ITOrderTaxiService extends IService<TOrderTaxi> {
+
+ /**
+ * 根据条件查询出租车订单列表
+ * @return
+ */
+ List<Map<String,Object>> getTaxiOrderList(@Param("page") Page<Map<String, Object>> page,
+ @Param("beginTime") String beginTime,
+ @Param("endTime") String endTime,
+ @Param("roleType") Integer roleType,
+ @Param("nowUserId") Integer nowUserId,
+ @Param("orderNum") String orderNum,
+ @Param("orderSource") Integer orderSource,
+ @Param("userName") String userName,
+ @Param("userPhone") String userPhone,
+ @Param("passengers") String passengers,
+ @Param("passengersPhone") String passengersPhone,
+ @Param("driver") String driver,
+ @Param("state") Integer state);
+
+ /**
+ * 根据出租车订单ID获取出租车订单详情
+ * @param orderId
+ * @return
+ */
+ Map<String,Object> getTaxiOrderDetailById(@Param("orderId") Integer orderId);
+
+ /**
+ * 根据条件查询可被选择的出租车司机列表
+ * @return
+ */
+ List<Map<String,Object>> getCanSelectTaxiDriverList(@Param("page") Page<Map<String, Object>> page,
+ @Param("companyId") Integer companyId,
+ @Param("name") String name,
+ @Param("phone") String phone);
+
+ /**
+ * 查询所有订单条数
+ * @param companyId
+ * @return
+ */
+ Integer getAllOrderNum(@Param("companyId") Integer companyId,@Param("beginTime") String beginTime,@Param("endTime") String endTime);
+
+ /**
+ * 查询所有总交易金额
+ * @param companyId
+ * @param beginTime
+ * @param endTime
+ * @return
+ */
+ Double getAllTradeMoney(@Param("companyId") Integer companyId,@Param("beginTime") String beginTime,@Param("endTime") String endTime);
+
+ /**
+ * 查询所有总收益
+ * @param companyId
+ * @param beginTime
+ * @param endTime
+ * @return
+ */
+ Double getAllIncomeMoney(@Param("companyId") Integer companyId,@Param("beginTime") String beginTime,@Param("endTime") String endTime);
+
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITPhoneService.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITPhoneService.java
new file mode 100644
index 0000000..3fde1aa
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITPhoneService.java
@@ -0,0 +1,16 @@
+package com.stylefeng.guns.modular.system.service;
+
+import com.stylefeng.guns.modular.system.model.TPhone;
+import com.baomidou.mybatisplus.service.IService;
+
+/**
+ * <p>
+ * 系统电话设置 服务类
+ * </p>
+ *
+ * @author 吕雪
+ * @since 2020-06-09
+ */
+public interface ITPhoneService extends IService<TPhone> {
+
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITProblemService.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITProblemService.java
new file mode 100644
index 0000000..8e7f56c
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITProblemService.java
@@ -0,0 +1,30 @@
+package com.stylefeng.guns.modular.system.service;
+
+import com.baomidou.mybatisplus.plugins.Page;
+import com.stylefeng.guns.modular.system.model.TProblem;
+import com.baomidou.mybatisplus.service.IService;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * 在线客服 服务类
+ * </p>
+ *
+ * @author 吕雪
+ * @since 2020-06-24
+ */
+public interface ITProblemService extends IService<TProblem> {
+
+ /**
+ * 根据条件查询用户留言列表
+ * @return
+ */
+ List<Map<String,Object>> getProblemList(@Param("page") Page<Map<String, Object>> page,
+ @Param("beginTime") String beginTime,
+ @Param("endTime") String endTime,
+ @Param("userName") String userName,
+ @Param("state") Integer state);
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITPubTransactionDetailsService.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITPubTransactionDetailsService.java
new file mode 100644
index 0000000..4bac33f
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITPubTransactionDetailsService.java
@@ -0,0 +1,16 @@
+package com.stylefeng.guns.modular.system.service;
+
+import com.stylefeng.guns.modular.system.model.TPubTransactionDetails;
+import com.baomidou.mybatisplus.service.IService;
+
+/**
+ * <p>
+ * 交易明细(司机/用户) 服务类
+ * </p>
+ *
+ * @author 吕雪
+ * @since 2020-09-16
+ */
+public interface ITPubTransactionDetailsService extends IService<TPubTransactionDetails> {
+
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITPubWithdrawalService.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITPubWithdrawalService.java
new file mode 100644
index 0000000..9675a4b
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITPubWithdrawalService.java
@@ -0,0 +1,30 @@
+package com.stylefeng.guns.modular.system.service;
+
+import com.baomidou.mybatisplus.plugins.Page;
+import com.stylefeng.guns.modular.system.model.TPubWithdrawal;
+import com.baomidou.mybatisplus.service.IService;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * 提现记录表(司机/用户) 服务类
+ * </p>
+ *
+ * @author 吕雪
+ * @since 2020-06-09
+ */
+public interface ITPubWithdrawalService extends IService<TPubWithdrawal> {
+
+ /**
+ * 根据条件查询提现列表
+ * @return
+ */
+ List<Map<String,Object>> getWithdrawalList(@Param("page") Page<Map<String, Object>> page,
+ @Param("beginTime") String beginTime,
+ @Param("endTime") String endTime,
+ @Param("name") String name,
+ @Param("withdrawalType") Integer withdrawalType);
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITReassignService.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITReassignService.java
new file mode 100644
index 0000000..354bc96
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITReassignService.java
@@ -0,0 +1,108 @@
+package com.stylefeng.guns.modular.system.service;
+
+import com.baomidou.mybatisplus.plugins.Page;
+import com.stylefeng.guns.modular.system.model.TReassign;
+import com.baomidou.mybatisplus.service.IService;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * 订单改派 服务类
+ * </p>
+ *
+ * @author 吕雪
+ * @since 2020-09-03
+ */
+public interface ITReassignService extends IService<TReassign> {
+
+ /**
+ * 根据条件查询专车改派订单列表
+ */
+ List<Map<String,Object>> getPrivateCarReassignOrderList(@Param("page") Page<Map<String, Object>> page,
+ @Param("roleType") Integer roleType,
+ @Param("nowUserId") Integer nowUserId,
+ @Param("beginTime") String beginTime,
+ @Param("endTime") String endTime,
+ @Param("originalDriverName") String originalDriverName,
+ @Param("originalDriverPhone") String originalDriverPhone,
+ @Param("orderNum") String orderNum,
+ @Param("nowDriverName") String nowDriverName,
+ @Param("nowDriverPhone") String nowDriverPhone,
+ @Param("orderState") Integer orderState,
+ @Param("state") Integer state);
+
+ /**
+ * 根据条件查询可被选择的专车司机列表
+ * @return
+ */
+ List<Map<String,Object>> getCanSelectPrivateCarDriverList(@Param("page") Page<Map<String, Object>> page,
+ @Param("companyId") Integer companyId,
+ @Param("name") String name,
+ @Param("phone") String phone);
+
+
+ /**
+ * 根据条件查询可被选择的专车司机列表
+ * @return
+ */
+ List<Map<String,Object>> getCanSelectSmallDriverList(@Param("page") Page<Map<String, Object>> page,
+ @Param("companyId") Integer companyId,
+ @Param("type") Integer type,
+ @Param("name") String name,
+ @Param("phone") String phone);
+
+
+ /**
+ * 根据条件查询跨城改派订单列表
+ */
+ List<Map<String,Object>> getCrossReassignOrderList(@Param("page") Page<Map<String, Object>> page,
+ @Param("roleType") Integer roleType,
+ @Param("nowUserId") Integer nowUserId,
+ @Param("beginTime") String beginTime,
+ @Param("endTime") String endTime,
+ @Param("originalDriverName") String originalDriverName,
+ @Param("originalDriverPhone") String originalDriverPhone,
+ @Param("orderNum") String orderNum,
+ @Param("nowDriverName") String nowDriverName,
+ @Param("nowDriverPhone") String nowDriverPhone,
+ @Param("orderState") Integer orderState,
+ @Param("state") Integer state);
+
+ /**
+ * 根据条件查询可被选择的跨城司机列表
+ * @return
+ */
+ List<Map<String,Object>> getCanSelectCrossDriverList(@Param("page") Page<Map<String, Object>> page,
+ @Param("companyId") Integer companyId,
+ @Param("serverCarModelId") Integer serverCarModelId,
+ @Param("lineId") Integer lineId,
+ @Param("lineShiftId") Integer lineShiftId,
+ @Param("time") Date time,
+ @Param("num") Integer num,
+ @Param("name") String name,
+ @Param("phone") String phone,
+ @Param("driverId") Integer driverId);
+
+
+
+ /**
+ * 根据条件查询跨城改派订单列表
+ */
+ List<Map<String,Object>> getSmallPieceLogisticsList(@Param("page") Page<Map<String, Object>> page,
+ @Param("roleType") Integer roleType,
+ @Param("nowUserId") Integer nowUserId,
+ @Param("beginTime") String beginTime,
+ @Param("endTime") String endTime,
+ @Param("originalDriverName") String originalDriverName,
+ @Param("originalDriverPhone") String originalDriverPhone,
+ @Param("orderNum") String orderNum,
+ @Param("nowDriverName") String nowDriverName,
+ @Param("nowDriverPhone") String nowDriverPhone,
+ @Param("orderState") Integer orderState,
+ @Param("state") Integer state);
+
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITRegionService.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITRegionService.java
new file mode 100644
index 0000000..4230d25
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITRegionService.java
@@ -0,0 +1,16 @@
+package com.stylefeng.guns.modular.system.service;
+
+import com.stylefeng.guns.modular.system.model.TRegion;
+import com.baomidou.mybatisplus.service.IService;
+
+/**
+ * <p>
+ * 省市区三级联动 服务类
+ * </p>
+ *
+ * @author 吕雪
+ * @since 2020-06-02
+ */
+public interface ITRegionService extends IService<TRegion> {
+
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITServerCarmodelService.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITServerCarmodelService.java
new file mode 100644
index 0000000..3ecc7f9
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITServerCarmodelService.java
@@ -0,0 +1,28 @@
+package com.stylefeng.guns.modular.system.service;
+
+import com.baomidou.mybatisplus.plugins.Page;
+import com.stylefeng.guns.modular.system.model.TServerCarmodel;
+import com.baomidou.mybatisplus.service.IService;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * 服务车型设置 服务类
+ * </p>
+ *
+ * @author 吕雪
+ * @since 2020-08-29
+ */
+public interface ITServerCarmodelService extends IService<TServerCarmodel> {
+
+ /**
+ * 根据条件查询服务车型列表
+ */
+ List<Map<String,Object>> getServerCarModelList(@Param("page") Page<Map<String, Object>> page,
+ @Param("type") Integer type,
+ @Param("name") String name,
+ @Param("state") Integer state);
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITSiteService.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITSiteService.java
new file mode 100644
index 0000000..88e38ca
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITSiteService.java
@@ -0,0 +1,37 @@
+package com.stylefeng.guns.modular.system.service;
+
+import com.baomidou.mybatisplus.plugins.Page;
+import com.stylefeng.guns.modular.system.model.TSite;
+import com.baomidou.mybatisplus.service.IService;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * 线路站点 服务类
+ * </p>
+ *
+ * @author 吕雪
+ * @since 2020-09-04
+ */
+public interface ITSiteService extends IService<TSite> {
+
+ /**
+ * 根据条件查询站点列表
+ * @return
+ */
+ List<Map<String,Object>> getSiteList(@Param("page") Page<Map<String, Object>> page,
+ @Param("beginTime") String beginTime,
+ @Param("endTime") String endTime,
+ @Param("name") String name,
+ @Param("insertUser") String insertUser,
+ @Param("city") String city,
+ @Param("state") Integer state);
+
+
+
+ List<TSite> query(@Param("provinceCode") String provinceCode, @Param("cityCode")String cityCode,
+ @Param("districtCode")String districtCode);
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITSmsrecordService.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITSmsrecordService.java
new file mode 100644
index 0000000..67b716b
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITSmsrecordService.java
@@ -0,0 +1,29 @@
+package com.stylefeng.guns.modular.system.service;
+
+import com.baomidou.mybatisplus.plugins.Page;
+import com.stylefeng.guns.modular.system.model.TSmsrecord;
+import com.baomidou.mybatisplus.service.IService;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * 验证码 服务类
+ * </p>
+ *
+ * @author 吕雪
+ * @since 2020-06-10
+ */
+public interface ITSmsrecordService extends IService<TSmsrecord> {
+
+ /**
+ * 根据条件查询验证码记录列表
+ * @return
+ */
+ List<Map<String,Object>> getSmsCodeList(@Param("page") Page<Map<String, Object>> page,
+ @Param("beginTime") String beginTime,
+ @Param("endTime") String endTime,
+ @Param("phone") String phone);
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITSysCancleOrderService.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITSysCancleOrderService.java
new file mode 100644
index 0000000..b3b307a
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITSysCancleOrderService.java
@@ -0,0 +1,16 @@
+package com.stylefeng.guns.modular.system.service;
+
+import com.stylefeng.guns.modular.system.model.TSysCancleOrder;
+import com.baomidou.mybatisplus.service.IService;
+
+/**
+ * <p>
+ * 系统设置-取消订单 服务类
+ * </p>
+ *
+ * @author 吕雪
+ * @since 2020-06-09
+ */
+public interface ITSysCancleOrderService extends IService<TSysCancleOrder> {
+
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITSysFaceDistinguishService.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITSysFaceDistinguishService.java
new file mode 100644
index 0000000..dfb4f16
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITSysFaceDistinguishService.java
@@ -0,0 +1,16 @@
+package com.stylefeng.guns.modular.system.service;
+
+import com.stylefeng.guns.modular.system.model.TSysFaceDistinguish;
+import com.baomidou.mybatisplus.service.IService;
+
+/**
+ * <p>
+ * 系统设置-人脸识别 服务类
+ * </p>
+ *
+ * @author 吕雪
+ * @since 2020-06-09
+ */
+public interface ITSysFaceDistinguishService extends IService<TSysFaceDistinguish> {
+
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITSysIntegralService.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITSysIntegralService.java
new file mode 100644
index 0000000..9eee237
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITSysIntegralService.java
@@ -0,0 +1,16 @@
+package com.stylefeng.guns.modular.system.service;
+
+import com.stylefeng.guns.modular.system.model.TSysIntegral;
+import com.baomidou.mybatisplus.service.IService;
+
+/**
+ * <p>
+ * 系统设置-积分 服务类
+ * </p>
+ *
+ * @author 吕雪
+ * @since 2020-06-09
+ */
+public interface ITSysIntegralService extends IService<TSysIntegral> {
+
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITSysPushOrderService.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITSysPushOrderService.java
new file mode 100644
index 0000000..e4a5cbe
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITSysPushOrderService.java
@@ -0,0 +1,16 @@
+package com.stylefeng.guns.modular.system.service;
+
+import com.stylefeng.guns.modular.system.model.TSysPushOrder;
+import com.baomidou.mybatisplus.service.IService;
+
+/**
+ * <p>
+ * 系统设置-推单 服务类
+ * </p>
+ *
+ * @author 吕雪
+ * @since 2020-06-09
+ */
+public interface ITSysPushOrderService extends IService<TSysPushOrder> {
+
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITSysReformistService.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITSysReformistService.java
new file mode 100644
index 0000000..027a875
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITSysReformistService.java
@@ -0,0 +1,16 @@
+package com.stylefeng.guns.modular.system.service;
+
+import com.stylefeng.guns.modular.system.model.TSysReformist;
+import com.baomidou.mybatisplus.service.IService;
+
+/**
+ * <p>
+ * 系统设置-改派 服务类
+ * </p>
+ *
+ * @author 吕雪
+ * @since 2020-06-09
+ */
+public interface ITSysReformistService extends IService<TSysReformist> {
+
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITSysSensitiveWordsService.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITSysSensitiveWordsService.java
new file mode 100644
index 0000000..2e7d740
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITSysSensitiveWordsService.java
@@ -0,0 +1,29 @@
+package com.stylefeng.guns.modular.system.service;
+
+import com.baomidou.mybatisplus.plugins.Page;
+import com.stylefeng.guns.modular.system.model.TSysSensitiveWords;
+import com.baomidou.mybatisplus.service.IService;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * 系统设置-敏感词 服务类
+ * </p>
+ *
+ * @author 吕雪
+ * @since 2020-06-09
+ */
+public interface ITSysSensitiveWordsService extends IService<TSysSensitiveWords> {
+
+ /**
+ * 根据条件查询敏感词列表
+ * @return
+ */
+ List<Map<String,Object>> getSensitiveWordList(@Param("page") Page<Map<String, Object>> page,
+ @Param("beginTime") String beginTime,
+ @Param("endTime") String endTime,
+ @Param("content") String content);
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITSystemNoticeService.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITSystemNoticeService.java
new file mode 100644
index 0000000..8867c65
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITSystemNoticeService.java
@@ -0,0 +1,16 @@
+package com.stylefeng.guns.modular.system.service;
+
+import com.stylefeng.guns.modular.system.model.TSystemNotice;
+import com.baomidou.mybatisplus.service.IService;
+
+/**
+ * <p>
+ * 系统通知 服务类
+ * </p>
+ *
+ * @author 吕雪
+ * @since 2020-06-10
+ */
+public interface ITSystemNoticeService extends IService<TSystemNotice> {
+
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITSystemPriceService.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITSystemPriceService.java
new file mode 100644
index 0000000..03fdca8
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITSystemPriceService.java
@@ -0,0 +1,28 @@
+package com.stylefeng.guns.modular.system.service;
+
+import com.baomidou.mybatisplus.plugins.Page;
+import com.stylefeng.guns.modular.system.model.TSystemPrice;
+import com.baomidou.mybatisplus.service.IService;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * 服务价格规则 服务类
+ * </p>
+ *
+ * @author 吕雪
+ * @since 2020-08-29
+ */
+public interface ITSystemPriceService extends IService<TSystemPrice> {
+
+ /**
+ * 查询专车价格设置
+ */
+ List<Map<String,Object>> getSpecialPriceList(@Param("page") Page<Map<String, Object>> page,
+ @Param("companyId") Integer companyId,
+ @Param("name") String name,
+ @Param("state") Integer state);
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITUserRedPacketRecordService.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITUserRedPacketRecordService.java
new file mode 100644
index 0000000..eb20795
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITUserRedPacketRecordService.java
@@ -0,0 +1,16 @@
+package com.stylefeng.guns.modular.system.service;
+
+import com.stylefeng.guns.modular.system.model.TUserRedPacketRecord;
+import com.baomidou.mybatisplus.service.IService;
+
+/**
+ * <p>
+ * 用户红包记录 服务类
+ * </p>
+ *
+ * @author stylefeng
+ * @since 2020-07-10
+ */
+public interface ITUserRedPacketRecordService extends IService<TUserRedPacketRecord> {
+
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITUserService.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITUserService.java
new file mode 100644
index 0000000..5b19558
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITUserService.java
@@ -0,0 +1,57 @@
+package com.stylefeng.guns.modular.system.service;
+
+import com.baomidou.mybatisplus.plugins.Page;
+import com.stylefeng.guns.modular.system.model.TUser;
+import com.baomidou.mybatisplus.service.IService;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * 用户信息 服务类
+ * </p>
+ *
+ * @author 吕雪
+ * @since 2020-06-01
+ */
+public interface ITUserService extends IService<TUser> {
+
+ /**
+ * 根据条件查询用户列表
+ * @param page 分页
+ * @param beginTime 开始时间
+ * @param endTime 结束时间
+ * @param isAuth 是否实名认证
+ * @param state 状态
+ * @param id 用户ID
+ * @param nickName 用户昵称
+ * @return
+ */
+ List<Map<String,Object>> getUserList(@Param("page") Page<Map<String, Object>> page,
+ @Param("beginTime") String beginTime,
+ @Param("endTime") String endTime,
+ @Param("roleType") Integer roleType,
+ @Param("nowUserId") Integer nowUserId,
+ @Param("isAuth") Integer isAuth,
+ @Param("state") Integer state,
+ @Param("id") String id,
+ @Param("nickName") String nickName,
+ @Param("phone") String phone,
+ @Param("companyName") String companyName);
+
+ /**
+ * 根据用户ID获取用户详情
+ * @param userId
+ * @return
+ */
+ Map<String,Object> getUserDetailById(@Param("userId") Integer userId);
+
+ /**
+ * 根据条件查询用户列表-无分页
+ * @return
+ */
+ List<Map<String,Object>> getUserListNoPage(@Param("roleType") Integer roleType,
+ @Param("nowUserId") Integer nowUserId);
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITVerifiedService.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITVerifiedService.java
new file mode 100644
index 0000000..9b11daf
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITVerifiedService.java
@@ -0,0 +1,32 @@
+package com.stylefeng.guns.modular.system.service;
+
+import com.baomidou.mybatisplus.plugins.Page;
+import com.stylefeng.guns.modular.system.model.TVerified;
+import com.baomidou.mybatisplus.service.IService;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * 实名认证 服务类
+ * </p>
+ *
+ * @author 吕雪
+ * @since 2020-06-09
+ */
+public interface ITVerifiedService extends IService<TVerified> {
+
+ /**
+ * 根据条件查询用户实名认证列表
+ * @return
+ */
+ List<Map<String,Object>> getVerifiedList(@Param("page") Page<Map<String, Object>> page,
+ @Param("beginTime") String beginTime,
+ @Param("endTime") String endTime,
+ @Param("userName") String userName,
+ @Param("userPhone") String userPhone,
+ @Param("name") String name,
+ @Param("state") Integer state);
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITVersionManagementService.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITVersionManagementService.java
new file mode 100644
index 0000000..9fc4411
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITVersionManagementService.java
@@ -0,0 +1,29 @@
+package com.stylefeng.guns.modular.system.service;
+
+import com.baomidou.mybatisplus.plugins.Page;
+import com.stylefeng.guns.modular.system.model.TVersionManagement;
+import com.baomidou.mybatisplus.service.IService;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * 版本管理 服务类
+ * </p>
+ *
+ * @author 吕雪
+ * @since 2020-06-10
+ */
+public interface ITVersionManagementService extends IService<TVersionManagement> {
+
+ /**
+ * 根据条件查询版本列表
+ * @return
+ */
+ List<Map<String,Object>> getVersionList(@Param("page") Page<Map<String, Object>> page,
+ @Param("beginTime") String beginTime,
+ @Param("endTime") String endTime,
+ @Param("version") String version);
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITransactionDetailsService.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITransactionDetailsService.java
new file mode 100644
index 0000000..04ed3d9
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITransactionDetailsService.java
@@ -0,0 +1,23 @@
+package com.stylefeng.guns.modular.system.service;
+
+import com.baomidou.mybatisplus.service.IService;
+import com.stylefeng.guns.modular.system.model.TransactionDetails;
+
+public interface ITransactionDetailsService extends IService<TransactionDetails> {
+
+
+ /**
+ * 添加数据
+ * @param userId 对象id
+ * @param remark 备注
+ * @param money 金额
+ * @param state 状态（1=添加，2=减少）
+ * @param type 类型（1=金额，2=积分）
+ * @param userType 用户类型（1=用户，2=司机）
+ * @param orderType 订单类型（1=专车，2=出租车，3=城际，4=小件物流，5=余额充值，6=余额提现）
+ * @param orderId
+ * @throws Exception
+ */
+ void saveData(Integer userId, String remark, Double money, Integer state,
+ Integer type, Integer userType, Integer orderType, Integer orderId) throws Exception;
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IUserActivityBalanceService.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IUserActivityBalanceService.java
new file mode 100644
index 0000000..2e67172
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IUserActivityBalanceService.java
@@ -0,0 +1,16 @@
+package com.stylefeng.guns.modular.system.service;
+
+import com.stylefeng.guns.modular.system.model.UserActivityBalance;
+import com.baomidou.mybatisplus.service.IService;
+
+/**
+ * <p>
+ * 用户活动-充值 服务类
+ * </p>
+ *
+ * @author stylefeng
+ * @since 2020-06-19
+ */
+public interface IUserActivityBalanceService extends IService<UserActivityBalance> {
+
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IUserActivityDiscount1Service.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IUserActivityDiscount1Service.java
new file mode 100644
index 0000000..7cf3894
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IUserActivityDiscount1Service.java
@@ -0,0 +1,65 @@
+package com.stylefeng.guns.modular.system.service;
+
+import com.stylefeng.guns.modular.system.model.UserActivityDiscount1;
+import com.baomidou.mybatisplus.service.IService;
+import org.apache.poi.hssf.usermodel.HSSFWorkbook;
+
+import java.util.Map;
+
+/**
+ * <p>
+ * 用户活动-折扣1 服务类
+ * </p>
+ *
+ * @author stylefeng
+ * @since 2020-06-19
+ */
+public interface IUserActivityDiscount1Service extends IService<UserActivityDiscount1> {
+
+
+ /**
+ * 获取折扣
+ * @param name
+ * @param time
+ * @param companyId
+ * @param offset
+ * @param limit
+ * @return
+ * @throws Exception
+ */
+ Map<String, Object> queryDiscount1(String name, String time, Integer companyId, Integer offset, Integer limit) throws Exception;
+
+
+ /**
+ * 下载折扣优惠
+ * @param name
+ * @param time
+ * @param companyId
+ * @return
+ * @throws Exception
+ */
+ HSSFWorkbook downloadDiscount1(String name, String time, Integer companyId) throws Exception;
+
+
+ /**
+ * 获取折扣优惠券详情
+ * @param time
+ * @param companyId
+ * @param offset
+ * @param limit
+ * @return
+ * @throws Exception
+ */
+ Map<String, Object> queryDiscountInfo(String name, String time, Integer companyId, Integer offset, Integer limit) throws Exception;
+
+
+ /**
+ * 下载折扣优惠详情
+ * @param name
+ * @param time
+ * @param companyId
+ * @return
+ * @throws Exception
+ */
+ HSSFWorkbook downloadDiscountInfo(String name, String time, Integer companyId) throws Exception;
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IUserActivityDiscount2Service.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IUserActivityDiscount2Service.java
new file mode 100644
index 0000000..a3057fa
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IUserActivityDiscount2Service.java
@@ -0,0 +1,16 @@
+package com.stylefeng.guns.modular.system.service;
+
+import com.stylefeng.guns.modular.system.model.UserActivityDiscount2;
+import com.baomidou.mybatisplus.service.IService;
+
+/**
+ * <p>
+ * 用户活动-折扣2（跨城） 服务类
+ * </p>
+ *
+ * @author stylefeng
+ * @since 2020-06-19
+ */
+public interface IUserActivityDiscount2Service extends IService<UserActivityDiscount2> {
+
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IUserActivityInviteService.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IUserActivityInviteService.java
new file mode 100644
index 0000000..4c118b2
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IUserActivityInviteService.java
@@ -0,0 +1,16 @@
+package com.stylefeng.guns.modular.system.service;
+
+import com.stylefeng.guns.modular.system.model.UserActivityInvite;
+import com.baomidou.mybatisplus.service.IService;
+
+/**
+ * <p>
+ * 用户活动-邀请 服务类
+ * </p>
+ *
+ * @author stylefeng
+ * @since 2020-06-19
+ */
+public interface IUserActivityInviteService extends IService<UserActivityInvite> {
+
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IUserActivityRedenvelopeService.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IUserActivityRedenvelopeService.java
new file mode 100644
index 0000000..69da36a
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IUserActivityRedenvelopeService.java
@@ -0,0 +1,16 @@
+package com.stylefeng.guns.modular.system.service;
+
+import com.stylefeng.guns.modular.system.model.UserActivityRedenvelope;
+import com.baomidou.mybatisplus.service.IService;
+
+/**
+ * <p>
+ * 用户活动-红包 服务类
+ * </p>
+ *
+ * @author stylefeng
+ * @since 2020-06-19
+ */
+public interface IUserActivityRedenvelopeService extends IService<UserActivityRedenvelope> {
+
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IUserActivityRegisteredService.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IUserActivityRegisteredService.java
new file mode 100644
index 0000000..dee26f0
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IUserActivityRegisteredService.java
@@ -0,0 +1,16 @@
+package com.stylefeng.guns.modular.system.service;
+
+import com.stylefeng.guns.modular.system.model.UserActivityRegistered;
+import com.baomidou.mybatisplus.service.IService;
+
+/**
+ * <p>
+ * 用户活动-注册 服务类
+ * </p>
+ *
+ * @author stylefeng
+ * @since 2020-06-19
+ */
+public interface IUserActivityRegisteredService extends IService<UserActivityRegistered> {
+
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IUserActivityService.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IUserActivityService.java
new file mode 100644
index 0000000..3d13fa6
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IUserActivityService.java
@@ -0,0 +1,35 @@
+package com.stylefeng.guns.modular.system.service;
+
+import com.stylefeng.guns.modular.system.model.UserActivity;
+import com.baomidou.mybatisplus.service.IService;
+
+import java.util.Date;
+import java.util.Map;
+
+/**
+ * <p>
+ * 用户活动主表 服务类
+ * </p>
+ *
+ * @author stylefeng
+ * @since 2020-06-19
+ */
+public interface IUserActivityService extends IService<UserActivity> {
+ public void insertOrUpdate(Integer id,String name,String startTime,Integer registCouponId,
+ Integer registEnable,Integer registNumber,Integer registEffective,
+ Integer inviteCouponId,Integer inviteEnable,Integer inviteNumber,Integer inviteEffective,
+ Integer balanceEnable,String balanceInfo,
+ Integer discountEnable,Double discountSpecial,Double discountTaxi,Double discountLogistics,
+ Integer redenvelopeId,Integer redenvelopeEnable, Double registerPrice, Double invitationPrice, Double redPrice);
+
+
+ /**
+ * 获取列表 数据
+ * @param name
+ * @param status
+ * @param offset
+ * @param limit
+ * @return
+ */
+ Map<String, Object> queryUserActivityList(Integer uid, Date start, Date end, String name, Integer status, Integer offset, Integer limit);
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IUserCouponRecordService.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IUserCouponRecordService.java
new file mode 100644
index 0000000..d739e27
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IUserCouponRecordService.java
@@ -0,0 +1,175 @@
+package com.stylefeng.guns.modular.system.service;
+
+import com.baomidou.mybatisplus.plugins.Page;
+import com.stylefeng.guns.modular.system.model.UserCouponRecord;
+import com.baomidou.mybatisplus.service.IService;
+import org.apache.poi.hssf.usermodel.HSSFWorkbook;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * 用户优惠券记录 服务类
+ * </p>
+ *
+ * @author stylefeng
+ * @since 2020-06-17
+ */
+public interface IUserCouponRecordService extends IService<UserCouponRecord> {
+
+ List<Map<String,Object>> getList(Page<Map<String, Object>> page,
+ String beginTime,
+ String endTime,
+ String userName,
+ String userPhone,
+ Integer couponActivityId,
+ Integer activityType,Integer state);
+
+ List<Map<String,Object>> getRedList(Page<Map<String, Object>> page,
+ String beginTime,
+ String endTime,
+ String userName,
+ String userPhone,
+ Integer couponActivityId,Integer state);
+
+ /**
+ * 统计优惠券
+ * @param beginTime
+ * @param endTime
+ * @param activityId
+ * @param activityType
+ * @return
+ */
+ Map<String,Object> getCouponStatic(
+ String beginTime,
+ String endTime,
+ Integer activityId,
+ Integer activityType);
+
+ /**
+ * 统计红包
+ * @param beginTime
+ * @param endTime
+ * @param activityId
+ * @return
+ */
+ Map<String,Object> getRedStatic(
+ String beginTime,
+ String endTime,
+ Integer activityId);
+
+
+ /**
+ * 获取充值统计
+ * @param beginTime
+ * @param endTime
+ * @param activityId
+ * @return
+ */
+ Map<String,Object> getRegStatic(
+ String beginTime,
+ String endTime,
+ Integer activityId);
+
+ /**
+ * 获取打折统计
+ * @param beginTime
+ * @param endTime
+ * @param activityId
+ * @return
+ */
+ Map<String,Object> getDiscountStatic(
+ String beginTime,
+ String endTime,
+ Integer activityId);
+
+ /**
+ * 获取充值记录
+ * @param page
+ * @param beginTime
+ * @param endTime
+ * @param activityId
+ * @return
+ */
+ List<Map<String,Object>> getBlanceList( Page<Map<String, Object>> page,
+ String beginTime,
+ String endTime,
+ Integer activityId);
+
+
+ /**
+ * 获取优惠券领取数据
+ * @param type
+ * @param name
+ * @param time
+ * @param companyId
+ * @param offset
+ * @param limit
+ * @return
+ * @throws Exception
+ */
+ Map<String, Object> queryCouponRegister(Integer type, String name, String time, Integer companyId, Integer offset, Integer limit) throws Exception;
+
+
+ /**
+ * 下载优惠券领取数据
+ * @param type
+ * @param name
+ * @param time
+ * @param companyId
+ * @return
+ * @throws Exception
+ */
+ HSSFWorkbook downloadCouponRegister(Integer type, String name, String time, Integer companyId) throws Exception;
+
+
+ /**
+ * 获取优惠券统计明细
+ * @param type
+ * @param name
+ * @param time
+ * @param companyId
+ * @param offset
+ * @param limit
+ * @return
+ * @throws Exception
+ */
+ Map<String, Object> queryCouponRegisterInfo(Integer type, String name, String time, Integer companyId, Integer offset, Integer limit) throws Exception;
+
+
+ /**
+ * 下载优惠券统计明细
+ * @param type
+ * @param name
+ * @param time
+ * @param companyId
+ * @return
+ */
+ HSSFWorkbook downloadCouponRegisterInfo(Integer type, String name, String time, Integer companyId);
+
+
+
+ /**
+ * 获取充值优惠券明细
+ * @param name
+ * @param time
+ * @param companyId
+ * @param offset
+ * @param limit
+ * @return
+ * @throws Exception
+ */
+ Map<String, Object> queryCouponRegisterInfo1(String name, String time, Integer companyId, Integer offset, Integer limit) throws Exception;
+
+
+ /**
+ * 下载充值优惠券明细
+ * @param name
+ * @param time
+ * @param companyId
+ * @return
+ */
+ HSSFWorkbook downloadCouponRegisterInfo1(String name, String time, Integer companyId);
+
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IUserRedPacketRecordService.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IUserRedPacketRecordService.java
new file mode 100644
index 0000000..b858e07
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IUserRedPacketRecordService.java
@@ -0,0 +1,59 @@
+package com.stylefeng.guns.modular.system.service;
+
+import com.baomidou.mybatisplus.service.IService;
+import com.stylefeng.guns.modular.system.model.UserRedPacketRecord;
+import org.apache.poi.hssf.usermodel.HSSFWorkbook;
+
+import java.util.List;
+import java.util.Map;
+
+public interface IUserRedPacketRecordService extends IService<UserRedPacketRecord> {
+
+
+ /**
+ * 获取红包统计数据
+ * @param name
+ * @param time
+ * @param companyId
+ * @param offset
+ * @param limit
+ * @return
+ * @throws Exception
+ */
+ Map<String, Object> queryRedEnvelopes(String name, String time, Integer companyId, Integer offset, Integer limit) throws Exception;
+
+
+ /**
+ * 下载红包统计数据
+ * @param name
+ * @param time
+ * @param companyId
+ * @return
+ * @throws Exception
+ */
+ HSSFWorkbook downloadRedEnvelopes(String name, String time, Integer companyId) throws Exception;
+
+
+ /**
+ * 获取红包统计明细
+ * @param name
+ * @param time
+ * @param companyId
+ * @param offset
+ * @param limit
+ * @return
+ * @throws Exception
+ */
+ Map<String, Object> queryRedEnvelopesInfo(String name, String time, Integer companyId, Integer offset, Integer limit) throws Exception;
+
+
+ /**
+ * 下载红包统计明细
+ * @param name
+ * @param time
+ * @param companyId
+ * @return
+ * @throws Exception
+ */
+ HSSFWorkbook downloadRedEnvelopesInfo(String name, String time, Integer companyId) throws Exception;
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IUserService.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IUserService.java
new file mode 100644
index 0000000..ccaf6bd
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IUserService.java
@@ -0,0 +1,62 @@
+package com.stylefeng.guns.modular.system.service;
+
+import com.baomidou.mybatisplus.plugins.Page;
+import com.baomidou.mybatisplus.service.IService;
+
+import com.stylefeng.guns.core.datascope.DataScope;
+import com.stylefeng.guns.modular.system.model.User;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * 管理员表 服务类
+ * </p>
+ *
+ * @author stylefeng123
+ * @since 2018-02-22
+ */
+public interface IUserService extends IService<User> {
+
+ /**
+ * 修改用户状态
+ */
+ int setStatus(@Param("userId") Integer userId, @Param("status") int status);
+
+ /**
+ * 修改密码
+ */
+ int changePwd(@Param("userId") Integer userId, @Param("pwd") String pwd);
+
+ /**
+ * 根据条件查询用户列表
+ */
+ List<Map<String, Object>> selectUsers(@Param("dataScope") DataScope dataScope, @Param("name") String name, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("deptid") Integer deptid);
+
+ /**
+ * 设置用户的角色
+ */
+ int setRoles(@Param("userId") Integer userId, @Param("roleIds") String roleIds);
+
+ /**
+ * 通过账号获取用户
+ */
+ User getByAccount(@Param("account") String account);
+
+ /**
+ * 根据角色判断菜单有"首页"的数量
+ * @param roleStr
+ * @return
+ */
+ Integer getMenuNumByRole(@Param("roleStr") String roleStr);
+
+ List<Map<String,Object>> getUserListPage(@Param("page") Page<Map<String, Object>> page,
+ @Param("dataScope") DataScope dataScope,
+ @Param("name") String name,
+ @Param("beginTime") String beginTime,
+ @Param("endTime") String endTime,
+ @Param("deptid") Integer deptid);
+
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DeptServiceImpl.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DeptServiceImpl.java
new file mode 100644
index 0000000..e970d12
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DeptServiceImpl.java
@@ -0,0 +1,49 @@
+package com.stylefeng.guns.modular.system.service.impl;
+
+import java.util.List;
+import java.util.Map;
+
+import javax.annotation.Resource;
+
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.baomidou.mybatisplus.mapper.Wrapper;
+import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import com.stylefeng.guns.core.node.ZTreeNode;
+import com.stylefeng.guns.modular.system.dao.DeptMapper;
+import com.stylefeng.guns.modular.system.model.Dept;
+import com.stylefeng.guns.modular.system.service.IDeptService;
+
+@Service
+@Transactional
+public class DeptServiceImpl extends ServiceImpl<DeptMapper, Dept> implements IDeptService {
+
+ @Resource
+ private DeptMapper deptMapper;
+
+ @Override
+ public void deleteDept(Integer deptId) {
+ Dept dept = deptMapper.selectById(deptId);
+
+ Wrapper<Dept> wrapper = new EntityWrapper<>();
+ wrapper = wrapper.like("pids", "%[" + dept.getId() + "]%");
+ List<Dept> subDepts = deptMapper.selectList(wrapper);
+ for (Dept temp : subDepts) {
+ temp.deleteById();
+ }
+
+ dept.deleteById();
+ }
+
+ @Override
+ public List<ZTreeNode> tree() {
+ return this.baseMapper.tree();
+ }
+
+ @Override
+ public List<Map<String, Object>> list(String condition) {
+ return this.baseMapper.list(condition);
+ }
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DictServiceImpl.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DictServiceImpl.java
new file mode 100644
index 0000000..edb0c7e
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DictServiceImpl.java
@@ -0,0 +1,106 @@
+package com.stylefeng.guns.modular.system.service.impl;
+
+import static com.stylefeng.guns.core.common.constant.factory.MutiStrFactory.MUTI_STR_CODE;
+import static com.stylefeng.guns.core.common.constant.factory.MutiStrFactory.MUTI_STR_NAME;
+import static com.stylefeng.guns.core.common.constant.factory.MutiStrFactory.MUTI_STR_NUM;
+import static com.stylefeng.guns.core.common.constant.factory.MutiStrFactory.parseKeyValue;
+
+import java.util.List;
+import java.util.Map;
+
+import javax.annotation.Resource;
+
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.baomidou.mybatisplus.mapper.Wrapper;
+import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import com.stylefeng.guns.core.common.exception.BizExceptionEnum;
+import com.stylefeng.guns.core.exception.GunsException;
+import com.stylefeng.guns.modular.system.dao.DictMapper;
+import com.stylefeng.guns.modular.system.model.Dict;
+import com.stylefeng.guns.modular.system.service.IDictService;
+
+@Service
+@Transactional
+public class DictServiceImpl extends ServiceImpl<DictMapper, Dict> implements IDictService {
+
+ @Resource
+ private DictMapper dictMapper;
+
+ @Override
+ public void addDict(String dictCode,String dictName,String dictTips, String dictValues) {
+ //判断有没有该字典
+ List<Dict> dicts = dictMapper.selectList(new EntityWrapper<Dict>().eq("code", dictCode).and().eq("pid", 0));
+ if (dicts != null && dicts.size() > 0) {
+ throw new GunsException(BizExceptionEnum.DICT_EXISTED);
+ }
+
+ //解析dictValues
+ List<Map<String, String>> items = parseKeyValue(dictValues);
+
+ //添加字典
+ Dict dict = new Dict();
+ dict.setName(dictName);
+ dict.setCode(dictCode);
+ dict.setTips(dictTips);
+ dict.setNum(0);
+ dict.setPid(0);
+ this.dictMapper.insert(dict);
+
+ //添加字典条目
+ for (Map<String, String> item : items) {
+ String code = item.get(MUTI_STR_CODE);
+ String name = item.get(MUTI_STR_NAME);
+ String num = item.get(MUTI_STR_NUM);
+ Dict itemDict = new Dict();
+ itemDict.setPid(dict.getId());
+ itemDict.setCode(code);
+ itemDict.setName(name);
+
+ try {
+ itemDict.setNum(Integer.valueOf(num));
+ } catch (NumberFormatException e) {
+ throw new GunsException(BizExceptionEnum.DICT_MUST_BE_NUMBER);
+ }
+ this.dictMapper.insert(itemDict);
+ }
+ }
+
+ @Override
+ public void editDict(Integer dictId,String dictCode, String dictName,String dictTips, String dicts) {
+ //删除之前的字典
+ this.delteDict(dictId);
+
+ //重新添加新的字典
+ this.addDict(dictCode,dictName,dictTips, dicts);
+ }
+
+ @Override
+ public void delteDict(Integer dictId) {
+ //删除这个字典的子词典
+ Wrapper<Dict> dictEntityWrapper = new EntityWrapper<>();
+ dictEntityWrapper = dictEntityWrapper.eq("pid", dictId);
+ dictMapper.delete(dictEntityWrapper);
+
+ //删除这个词典
+ dictMapper.deleteById(dictId);
+ }
+
+ @Override
+ public List<Dict> selectByCode(String code) {
+ return this.baseMapper.selectByCode(code);
+ }
+
+ @Override
+ public List<Dict> selectByParentCode(String code) {
+ return this.baseMapper.selectByParentCode(code);
+ }
+
+
+ @Override
+ public List<Map<String, Object>> list(String conditiion) {
+ return this.baseMapper.list(conditiion);
+ }
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverActivityHistoryServiceImpl.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverActivityHistoryServiceImpl.java
new file mode 100644
index 0000000..df4008f
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverActivityHistoryServiceImpl.java
@@ -0,0 +1,27 @@
+package com.stylefeng.guns.modular.system.service.impl;
+
+import com.baomidou.mybatisplus.plugins.Page;
+import com.stylefeng.guns.modular.system.model.DriverActivityHistory;
+import com.stylefeng.guns.modular.system.dao.DriverActivityHistoryMapper;
+import com.stylefeng.guns.modular.system.service.IDriverActivityHistoryService;
+import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * 司机完成活动记录 服务实现类
+ * </p>
+ *
+ * @author stylefeng
+ * @since 2020-06-17
+ */
+@Service
+public class DriverActivityHistoryServiceImpl extends ServiceImpl<DriverActivityHistoryMapper, DriverActivityHistory> implements IDriverActivityHistoryService {
+ @Override
+ public List<Map<String, Object>> getList(Page<Map<String, Object>> page, Integer activityId, Integer type) {
+ return this.baseMapper.getList(page,activityId,type);
+ }
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverActivityOnlineServiceImpl.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverActivityOnlineServiceImpl.java
new file mode 100644
index 0000000..a08d9df
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverActivityOnlineServiceImpl.java
@@ -0,0 +1,20 @@
+package com.stylefeng.guns.modular.system.service.impl;
+
+import com.stylefeng.guns.modular.system.model.DriverActivityOnline;
+import com.stylefeng.guns.modular.system.dao.DriverActivityOnlineMapper;
+import com.stylefeng.guns.modular.system.service.IDriverActivityOnlineService;
+import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 司机活动-在线 服务实现类
+ * </p>
+ *
+ * @author stylefeng
+ * @since 2020-06-17
+ */
+@Service
+public class DriverActivityOnlineServiceImpl extends ServiceImpl<DriverActivityOnlineMapper, DriverActivityOnline> implements IDriverActivityOnlineService {
+
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverActivityOrderServiceImpl.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverActivityOrderServiceImpl.java
new file mode 100644
index 0000000..8f54e77
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverActivityOrderServiceImpl.java
@@ -0,0 +1,20 @@
+package com.stylefeng.guns.modular.system.service.impl;
+
+import com.stylefeng.guns.modular.system.model.DriverActivityOrder;
+import com.stylefeng.guns.modular.system.dao.DriverActivityOrderMapper;
+import com.stylefeng.guns.modular.system.service.IDriverActivityOrderService;
+import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 司机活动-订单 服务实现类
+ * </p>
+ *
+ * @author stylefeng
+ * @since 2020-06-17
+ */
+@Service
+public class DriverActivityOrderServiceImpl extends ServiceImpl<DriverActivityOrderMapper, DriverActivityOrder> implements IDriverActivityOrderService {
+
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverActivityRegisteredServiceImpl.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverActivityRegisteredServiceImpl.java
new file mode 100644
index 0000000..c8bc3a0
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverActivityRegisteredServiceImpl.java
@@ -0,0 +1,20 @@
+package com.stylefeng.guns.modular.system.service.impl;
+
+import com.stylefeng.guns.modular.system.model.DriverActivityRegistered;
+import com.stylefeng.guns.modular.system.dao.DriverActivityRegisteredMapper;
+import com.stylefeng.guns.modular.system.service.IDriverActivityRegisteredService;
+import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 司机活动-注册 服务实现类
+ * </p>
+ *
+ * @author stylefeng
+ * @since 2020-06-17
+ */
+@Service
+public class DriverActivityRegisteredServiceImpl extends ServiceImpl<DriverActivityRegisteredMapper, DriverActivityRegistered> implements IDriverActivityRegisteredService {
+
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverActivityServiceImpl.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverActivityServiceImpl.java
new file mode 100644
index 0000000..06d4769
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverActivityServiceImpl.java
@@ -0,0 +1,241 @@
+package com.stylefeng.guns.modular.system.service.impl;
+
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.baomidou.mybatisplus.plugins.Page;
+import com.stylefeng.guns.core.shiro.ShiroKit;
+import com.stylefeng.guns.core.shiro.ShiroUser;
+import com.stylefeng.guns.core.util.DateUtil;
+import com.stylefeng.guns.modular.system.model.DriverActivity;
+import com.stylefeng.guns.modular.system.dao.DriverActivityMapper;
+import com.stylefeng.guns.modular.system.model.DriverActivityOnline;
+import com.stylefeng.guns.modular.system.model.DriverActivityOrder;
+import com.stylefeng.guns.modular.system.model.DriverActivityRegistered;
+import com.stylefeng.guns.modular.system.service.IDriverActivityOnlineService;
+import com.stylefeng.guns.modular.system.service.IDriverActivityOrderService;
+import com.stylefeng.guns.modular.system.service.IDriverActivityRegisteredService;
+import com.stylefeng.guns.modular.system.service.IDriverActivityService;
+import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * 司机活动主表 服务实现类
+ * </p>
+ *
+ * @author stylefeng
+ * @since 2020-06-17
+ */
+@Service
+public class DriverActivityServiceImpl extends ServiceImpl<DriverActivityMapper, DriverActivity> implements IDriverActivityService {
+
+
+ @Autowired
+ private IDriverActivityOnlineService driverActivityOnlineService;
+
+ @Autowired
+ private IDriverActivityOrderService driverActivityOrderService;
+
+ @Autowired
+ private IDriverActivityRegisteredService driverActivityRegisteredService;
+
+ @Override
+ public List<Map<String, Object>> getList(Page<Map<String, Object>> page, String beginTime, String endTime, String name,
+ Integer companyType,
+ Integer companyId) {
+ return this.baseMapper.getList(page,beginTime,endTime,name,companyType,companyId);
+ }
+
+ @Override
+ public void insertOrUpdate(Integer id, String staTime, String startTime, String num1, Double num2, Double num3, Integer num4, Double num5, Integer num6, Double num7, Integer num8, Double num9, Integer num10, Double num11) {
+ //判断id是否为空，为空执行添加，或者执行修改
+ if(id==null){
+ String[] timeArray = startTime.split(" - ");
+ Date startTimes = DateUtil.getDate_str3(timeArray[0]);
+ Date endTimes = DateUtil.getDate_str3(timeArray[1]);
+ ShiroUser user = ShiroKit.getUser();
+ Date nowDay = new Date();
+ //添加活动
+ DriverActivity driverActivity = new DriverActivity();
+ driverActivity.setInsertTime(nowDay);
+ driverActivity.setCompanyId(ShiroKit.getUser().getObjectId());
+ driverActivity.setCompanyType(ShiroKit.getUser().getRoleType());
+ driverActivity.setStatus(driverActivity.getCompanyType()==1?3:1);
+ driverActivity.setName(num1);
+ driverActivity.setStartTime(startTimes);
+ driverActivity.setEndTime(endTimes);
+ driverActivity.insertOrUpdate();
+ //添加在线活动-专车
+ DriverActivityOnline driverActivityOnline = new DriverActivityOnline();
+ driverActivityOnline.setCompanyId(driverActivity.getCompanyId());
+ driverActivityOnline.setDriverActivityId(driverActivity.getId());
+ driverActivityOnline.setStartTime(startTimes);
+ driverActivityOnline.setEndTime(endTimes);
+ driverActivityOnline.setInsertTime(nowDay);
+ driverActivityOnline.setType(1);
+ driverActivityOnline.setOnline(num4);
+ driverActivityOnline.setMoney(num5);
+ driverActivityOnline.insertOrUpdate();
+ //添加在线活动-出租车
+ driverActivityOnline = new DriverActivityOnline();
+ driverActivityOnline.setCompanyId(driverActivity.getCompanyId());
+ driverActivityOnline.setDriverActivityId(driverActivity.getId());
+ driverActivityOnline.setStartTime(startTimes);
+ driverActivityOnline.setEndTime(endTimes);
+ driverActivityOnline.setInsertTime(nowDay);
+ driverActivityOnline.setType(2);
+ driverActivityOnline.setOnline(num6);
+ driverActivityOnline.setMoney(num7);
+ driverActivityOnline.insertOrUpdate();
+ //添加在线活动-城际
+ driverActivityOnline = new DriverActivityOnline();
+ driverActivityOnline.setCompanyId(driverActivity.getCompanyId());
+ driverActivityOnline.setDriverActivityId(driverActivity.getId());
+ driverActivityOnline.setStartTime(startTimes);
+ driverActivityOnline.setEndTime(endTimes);
+ driverActivityOnline.setInsertTime(nowDay);
+ driverActivityOnline.setType(3);
+ driverActivityOnline.setOnline(num8);
+ driverActivityOnline.setMoney(num9);
+ driverActivityOnline.insertOrUpdate();
+ //添加订单活动
+ DriverActivityOrder driverActivityOrder = new DriverActivityOrder();
+ driverActivityOrder.setCompanyId(driverActivity.getCompanyId());
+ driverActivityOrder.setDriverActivityId(driverActivity.getId());
+ driverActivityOrder.setStartTime(startTimes);
+ driverActivityOrder.setEndTime(endTimes);
+ driverActivityOrder.setInsertTime(nowDay);
+ driverActivityOrder.setStart(staTime.split(" - ")[0]);
+ driverActivityOrder.setEnd(staTime.split(" - ")[1]);
+ driverActivityOrder.setOrderNum(num10);
+ driverActivityOrder.setMoney(num11);
+ driverActivityOrder.insertOrUpdate();
+ //添加活动-邀请司机注册奖励
+ DriverActivityRegistered driverActivityRegistered = new DriverActivityRegistered();
+ driverActivityRegistered.setCompanyId(driverActivity.getCompanyId());
+ driverActivityRegistered.setDriverActivityId(driverActivity.getId());
+ driverActivityRegistered.setStartTime(startTimes);
+ driverActivityRegistered.setEndTime(endTimes);
+ driverActivityRegistered.setInsertTime(nowDay);
+ driverActivityRegistered.setType(1);
+ driverActivityRegistered.setMoney(num2);
+ driverActivityRegistered.insertOrUpdate();
+ //添加活动-邀请用户注册奖励
+ driverActivityRegistered = new DriverActivityRegistered();
+ driverActivityRegistered.setCompanyId(driverActivity.getCompanyId());
+ driverActivityRegistered.setDriverActivityId(driverActivity.getId());
+ driverActivityRegistered.setStartTime(startTimes);
+ driverActivityRegistered.setEndTime(endTimes);
+ driverActivityRegistered.setInsertTime(nowDay);
+ driverActivityRegistered.setType(2);
+ driverActivityRegistered.setMoney(num3);
+ driverActivityRegistered.insertOrUpdate();
+ }else{
+ String[] timeArray = startTime.split(" - ");
+ Date startTimes = DateUtil.getDate_str3(timeArray[0]);
+ Date endTimes = DateUtil.getDate_str3(timeArray[1]);
+ ShiroUser user = ShiroKit.getUser();
+
+ Date nowDay = new Date();
+ //添加活动
+ DriverActivity driverActivity = new DriverActivity();
+ driverActivity.setId(id);
+ driverActivity.setCompanyId(ShiroKit.getUser().getObjectId());
+ driverActivity.setCompanyType(ShiroKit.getUser().getRoleType());
+ driverActivity.setStatus(driverActivity.getCompanyType()==1?3:1);
+ driverActivity.setName(num1);
+ driverActivity.setStartTime(startTimes);
+ driverActivity.setEndTime(endTimes);
+ driverActivity.insertOrUpdate();
+
+ //添加在线活动-专车
+ DriverActivityOnline driverActivityOnline = driverActivityOnlineService.selectOne(new EntityWrapper<DriverActivityOnline>().eq("driverActivityId",id).eq("type",1));
+ if(driverActivityOnline==null){
+ driverActivityOnline = new DriverActivityOnline();
+ driverActivityOnline.setInsertTime(nowDay);
+ }
+ driverActivityOnline.setCompanyId(driverActivity.getCompanyId());
+ driverActivityOnline.setDriverActivityId(driverActivity.getId());
+ driverActivityOnline.setStartTime(startTimes);
+ driverActivityOnline.setEndTime(endTimes);
+ driverActivityOnline.setType(1);
+ driverActivityOnline.setOnline(num4);
+ driverActivityOnline.setMoney(num5);
+ driverActivityOnline.insertOrUpdate();
+ //添加在线活动-出租车
+ driverActivityOnline = driverActivityOnlineService.selectOne(new EntityWrapper<DriverActivityOnline>().eq("driverActivityId",id).eq("type",2));
+ if(driverActivityOnline==null){
+ driverActivityOnline = new DriverActivityOnline();
+ driverActivityOnline.setInsertTime(nowDay);
+ }
+ driverActivityOnline.setCompanyId(driverActivity.getCompanyId());
+ driverActivityOnline.setDriverActivityId(driverActivity.getId());
+ driverActivityOnline.setStartTime(startTimes);
+ driverActivityOnline.setEndTime(endTimes);
+ driverActivityOnline.setType(2);
+ driverActivityOnline.setOnline(num6);
+ driverActivityOnline.setMoney(num7);
+ driverActivityOnline.insertOrUpdate();
+ //添加在线活动-城际
+ driverActivityOnline =driverActivityOnlineService.selectOne(new EntityWrapper<DriverActivityOnline>().eq("driverActivityId",id).eq("type",3));
+ if(driverActivityOnline==null){
+ driverActivityOnline = new DriverActivityOnline();
+ driverActivityOnline.setInsertTime(nowDay);
+ }
+ driverActivityOnline.setCompanyId(driverActivity.getCompanyId());
+ driverActivityOnline.setDriverActivityId(driverActivity.getId());
+ driverActivityOnline.setStartTime(startTimes);
+ driverActivityOnline.setEndTime(endTimes);
+ driverActivityOnline.setType(3);
+ driverActivityOnline.setOnline(num8);
+ driverActivityOnline.setMoney(num9);
+ driverActivityOnline.insertOrUpdate();
+ //添加订单活动
+ DriverActivityOrder driverActivityOrder = driverActivityOrderService.selectOne(new EntityWrapper<DriverActivityOrder>().eq("driverActivityId",id));
+ if(driverActivityOrder==null){
+ driverActivityOrder = new DriverActivityOrder();
+ driverActivityOrder.setInsertTime(nowDay);
+ }
+ driverActivityOrder.setCompanyId(driverActivity.getCompanyId());
+ driverActivityOrder.setDriverActivityId(driverActivity.getId());
+ driverActivityOrder.setStartTime(startTimes);
+ driverActivityOrder.setEndTime(endTimes);
+ driverActivityOrder.setStart(staTime.split(" - ")[0]);
+ driverActivityOrder.setEnd(staTime.split(" - ")[1]);
+ driverActivityOrder.setOrderNum(num10);
+ driverActivityOrder.setMoney(num11);
+ driverActivityOrder.insertOrUpdate();
+ //添加活动-邀请司机注册奖励
+ DriverActivityRegistered driverActivityRegistered = driverActivityRegisteredService.selectOne(new EntityWrapper<DriverActivityRegistered>().eq("driverActivityId",id).eq("type",1));
+ if(driverActivityRegistered==null){
+ driverActivityRegistered = new DriverActivityRegistered();
+ driverActivityRegistered.setInsertTime(nowDay);
+ }
+ driverActivityRegistered.setCompanyId(driverActivity.getCompanyId());
+ driverActivityRegistered.setDriverActivityId(driverActivity.getId());
+ driverActivityRegistered.setStartTime(startTimes);
+ driverActivityRegistered.setEndTime(endTimes);
+ driverActivityRegistered.setType(1);
+ driverActivityRegistered.setMoney(num2);
+ driverActivityRegistered.insertOrUpdate();
+ //添加活动-邀请用户注册奖励
+ driverActivityRegistered = driverActivityRegisteredService.selectOne(new EntityWrapper<DriverActivityRegistered>().eq("driverActivityId",id).eq("type",2));
+ if(driverActivityRegistered==null){
+ driverActivityRegistered = new DriverActivityRegistered();
+ driverActivityRegistered.setInsertTime(nowDay);
+ }
+ driverActivityRegistered.setCompanyId(driverActivity.getCompanyId());
+ driverActivityRegistered.setDriverActivityId(driverActivity.getId());
+ driverActivityRegistered.setStartTime(startTimes);
+ driverActivityRegistered.setEndTime(endTimes);
+ driverActivityRegistered.setType(2);
+ driverActivityRegistered.setMoney(num3);
+ driverActivityRegistered.insertOrUpdate();
+ }
+ }
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverOnlineServiceImpl.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverOnlineServiceImpl.java
new file mode 100644
index 0000000..57336d2
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverOnlineServiceImpl.java
@@ -0,0 +1,47 @@
+package com.stylefeng.guns.modular.system.service.impl;
+
+import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import com.stylefeng.guns.modular.system.dao.DriverOnlineMapper;
+import com.stylefeng.guns.modular.system.model.DriverOnline;
+import com.stylefeng.guns.modular.system.service.IDriverOnlineService;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+
+@Service
+public class DriverOnlineServiceImpl extends ServiceImpl<DriverOnlineMapper, DriverOnline> implements IDriverOnlineService {
+
+ @Resource
+ private DriverOnlineMapper driverOnlineMapper;
+
+
+
+
+ /**
+ * 获取列表数据
+ * @param name
+ * @param phone
+ * @param offset
+ * @param limit
+ * @return
+ * @throws Exception
+ */
+ @Override
+ public Map<String, Object> queryOnlineDriver(String name, String phone, Integer offset, Integer limit) throws Exception {
+ Map<String, Object> map = new HashMap<>();
+ List<Map<String, Object>> list = driverOnlineMapper.queryOnlineDriver(name, phone, offset, limit);
+ int i = driverOnlineMapper.queryOnlineDriverCount(name, phone);
+ map.put("rows", list);
+ map.put("total", i);
+ return map;
+ }
+
+ @Override
+ public int queryOnlineDriverCount(String name, String phone) {
+ return driverOnlineMapper.queryOnlineDriverCount(name, phone);
+ }
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/GDInterfaceServiceImpl.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/GDInterfaceServiceImpl.java
new file mode 100644
index 0000000..95e4438
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/GDInterfaceServiceImpl.java
@@ -0,0 +1,39 @@
+package com.stylefeng.guns.modular.system.service.impl;
+
+import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import com.stylefeng.guns.modular.system.dao.GDInterfaceMapper;
+import com.stylefeng.guns.modular.system.model.GDInterface;
+import com.stylefeng.guns.modular.system.service.IGDInterfaceService;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
+
+@Service
+public class GDInterfaceServiceImpl extends ServiceImpl<GDInterfaceMapper, GDInterface> implements IGDInterfaceService {
+
+ @Resource
+ private GDInterfaceMapper gdInterfaceMapper;
+
+
+
+ @Override
+ public void saveData(String name, String explanation) {
+ Date date = new Date();
+ SimpleDateFormat sdf = new SimpleDateFormat("YYYY-MM-dd");
+ GDInterface query = gdInterfaceMapper.query(name, explanation, sdf.format(date));
+ if(null == query){
+ query = new GDInterface();
+ query.setName(name);
+ query.setExplanation(explanation);
+ query.setTime(sdf.format(date));
+ query.setNum(1);
+ this.insert(query);
+ }else{
+ query.setNum(query.getNum() + 1);
+ this.updateById(query);
+ }
+ }
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/IncomeServiceImpl.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/IncomeServiceImpl.java
new file mode 100644
index 0000000..2fa2538
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/IncomeServiceImpl.java
@@ -0,0 +1,37 @@
+package com.stylefeng.guns.modular.system.service.impl;
+
+import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import com.stylefeng.guns.modular.system.dao.IncomeMapper;
+import com.stylefeng.guns.modular.system.model.Income;
+import com.stylefeng.guns.modular.system.service.IIncomeService;
+import org.springframework.stereotype.Service;
+
+import java.util.Date;
+
+
+@Service
+public class IncomeServiceImpl extends ServiceImpl<IncomeMapper, Income> implements IIncomeService {
+
+
+ /**
+ * 添加数据
+ * @param userType
+ * @param objectId
+ * @param type
+ * @param incomeId
+ * @param money
+ * @throws Exception
+ */
+ @Override
+ public void saveData(Integer userType, Integer objectId, Integer type, Integer incomeId, Integer orderType, Double money) throws Exception {
+ Income income = new Income();
+ income.setUserType(userType);
+ income.setObjectId(objectId);
+ income.setType(type);
+ income.setIncomeId(incomeId);
+ income.setOrderType(orderType);
+ income.setMoney(money);
+ income.setInsertTime(new Date());
+ this.insert(income);
+ }
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/LoginLogServiceImpl.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/LoginLogServiceImpl.java
new file mode 100644
index 0000000..f0d4fcd
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/LoginLogServiceImpl.java
@@ -0,0 +1,29 @@
+package com.stylefeng.guns.modular.system.service.impl;
+
+import java.util.List;
+import java.util.Map;
+
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.plugins.Page;
+import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import com.stylefeng.guns.modular.system.dao.LoginLogMapper;
+import com.stylefeng.guns.modular.system.model.LoginLog;
+import com.stylefeng.guns.modular.system.service.ILoginLogService;
+
+/**
+ * <p>
+ * 登录记录 服务实现类
+ * </p>
+ *
+ * @author stylefeng123
+ * @since 2018-02-22
+ */
+@Service
+public class LoginLogServiceImpl extends ServiceImpl<LoginLogMapper, LoginLog> implements ILoginLogService {
+
+ @Override
+ public List<Map<String, Object>> getLoginLogs(Page<LoginLog> page, String beginTime, String endTime, String logName, String orderByField, boolean asc) {
+ return this.baseMapper.getLoginLogs(page, beginTime, endTime, logName, orderByField, asc);
+ }
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/MenuServiceImpl.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/MenuServiceImpl.java
new file mode 100644
index 0000000..2ee46fc
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/MenuServiceImpl.java
@@ -0,0 +1,92 @@
+package com.stylefeng.guns.modular.system.service.impl;
+
+import java.util.List;
+import java.util.Map;
+
+import javax.annotation.Resource;
+
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.baomidou.mybatisplus.mapper.Wrapper;
+import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import com.stylefeng.guns.core.node.MenuNode;
+import com.stylefeng.guns.core.node.ZTreeNode;
+import com.stylefeng.guns.modular.system.dao.MenuMapper;
+import com.stylefeng.guns.modular.system.model.Menu;
+import com.stylefeng.guns.modular.system.service.IMenuService;
+
+/**
+ * 菜单服务
+ *
+ * @author fengshuonan
+ * @date 2017-05-05 22:20
+ */
+@Service
+public class MenuServiceImpl extends ServiceImpl<MenuMapper, Menu> implements IMenuService {
+
+ @Resource
+ private MenuMapper menuMapper;
+
+ @Override
+ public void delMenu(Long menuId) {
+
+ //删除菜单
+ this.menuMapper.deleteById(menuId);
+
+ //删除关联的relation
+ this.menuMapper.deleteRelationByMenu(menuId);
+ }
+
+ @Override
+ public void delMenuContainSubMenus(Long menuId) {
+
+ Menu menu = menuMapper.selectById(menuId);
+
+ //删除当前菜单
+ delMenu(menuId);
+
+ //删除所有子菜单
+ Wrapper<Menu> wrapper = new EntityWrapper<>();
+ wrapper = wrapper.like("pcodes", "%[" + menu.getCode() + "]%");
+ List<Menu> menus = menuMapper.selectList(wrapper);
+ for (Menu temp : menus) {
+ delMenu(temp.getId());
+ }
+ }
+
+ @Override
+ public List<Map<String, Object>> selectMenus(String condition, String level) {
+ return this.baseMapper.selectMenus(condition, level);
+ }
+
+ @Override
+ public List<Long> getMenuIdsByRoleId(Integer roleId) {
+ return this.baseMapper.getMenuIdsByRoleId(roleId);
+ }
+
+ @Override
+ public List<ZTreeNode> menuTreeList() {
+ return this.baseMapper.menuTreeList();
+ }
+
+ @Override
+ public List<ZTreeNode> menuTreeListByMenuIds(List<Long> menuIds) {
+ return this.baseMapper.menuTreeListByMenuIds(menuIds);
+ }
+
+ @Override
+ public int deleteRelationByMenu(Long menuId) {
+ return this.baseMapper.deleteRelationByMenu(menuId);
+ }
+
+ @Override
+ public List<String> getResUrlsByRoleId(Integer roleId) {
+ return this.baseMapper.getResUrlsByRoleId(roleId);
+ }
+
+ @Override
+ public List<MenuNode> getMenusByRoleIds(List<Integer> roleIds) {
+ return this.baseMapper.getMenusByRoleIds(roleIds);
+ }
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/NoticeServiceImpl.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/NoticeServiceImpl.java
new file mode 100644
index 0000000..7c80666
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/NoticeServiceImpl.java
@@ -0,0 +1,28 @@
+package com.stylefeng.guns.modular.system.service.impl;
+
+import java.util.List;
+import java.util.Map;
+
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import com.stylefeng.guns.modular.system.dao.NoticeMapper;
+import com.stylefeng.guns.modular.system.model.Notice;
+import com.stylefeng.guns.modular.system.service.INoticeService;
+
+/**
+ * <p>
+ * 通知表 服务实现类
+ * </p>
+ *
+ * @author stylefeng123
+ * @since 2018-02-22
+ */
+@Service
+public class NoticeServiceImpl extends ServiceImpl<NoticeMapper, Notice> implements INoticeService {
+
+ @Override
+ public List<Map<String, Object>> list(String condition) {
+ return this.baseMapper.list(condition);
+ }
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/OperationLogServiceImpl.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/OperationLogServiceImpl.java
new file mode 100644
index 0000000..820a8af
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/OperationLogServiceImpl.java
@@ -0,0 +1,29 @@
+package com.stylefeng.guns.modular.system.service.impl;
+
+import java.util.List;
+import java.util.Map;
+
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.plugins.Page;
+import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import com.stylefeng.guns.modular.system.dao.OperationLogMapper;
+import com.stylefeng.guns.modular.system.model.OperationLog;
+import com.stylefeng.guns.modular.system.service.IOperationLogService;
+
+/**
+ * <p>
+ * 操作日志 服务实现类
+ * </p>
+ *
+ * @author stylefeng123
+ * @since 2018-02-22
+ */
+@Service
+public class OperationLogServiceImpl extends ServiceImpl<OperationLogMapper, OperationLog> implements IOperationLogService {
+
+ @Override
+ public List<Map<String, Object>> getOperationLogs(Page<OperationLog> page, String beginTime, String endTime, String logName, String s, String orderByField, boolean asc) {
+ return this.baseMapper.getOperationLogs(page, beginTime, endTime, logName, s, orderByField, asc);
+ }
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/PaymentRecordServiceImpl.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/PaymentRecordServiceImpl.java
new file mode 100644
index 0000000..6f1936d
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/PaymentRecordServiceImpl.java
@@ -0,0 +1,64 @@
+package com.stylefeng.guns.modular.system.service.impl;
+
+import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import com.stylefeng.guns.modular.system.dao.PaymentRecordMapper;
+import com.stylefeng.guns.modular.system.model.PaymentRecord;
+import com.stylefeng.guns.modular.system.service.IPaymentRecordService;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.Date;
+import java.util.List;
+
+
+@Service
+public class PaymentRecordServiceImpl extends ServiceImpl<PaymentRecordMapper, PaymentRecord> implements IPaymentRecordService {
+
+ @Resource
+ private PaymentRecordMapper paymentRecordMapper;
+
+
+
+
+ /**
+ * 添加数据
+ * @param orderId 订单id
+ * @param payType 支付方式（1=微信，2=支付宝）
+ * @param amount 支付金额
+ * @param code 第三方支付单号
+ * @param state 支付状态（1=待支付，2=已支付）
+ * @throws Exception
+ */
+ @Override
+ public Integer saveData(Integer category, Integer userId, Integer type, Integer orderId, Integer orderType, Integer payType,
+ Double amount, String code, Integer state) throws Exception {
+ PaymentRecord paymentRecord = new PaymentRecord();
+ paymentRecord.setCategory(category);
+ paymentRecord.setUserId(userId);
+ paymentRecord.setType(type);
+ paymentRecord.setOrderId(orderId);
+ paymentRecord.setOrderType(orderType);
+ paymentRecord.setPayType(payType);
+ paymentRecord.setAmount(amount);
+ paymentRecord.setCode(code);
+ paymentRecord.setState(state);
+ paymentRecord.setInsertTime(new Date());
+ this.insert(paymentRecord);
+ return paymentRecord.getId();
+ }
+
+
+ /**
+ * 获取数据
+ * @param orderId
+ * @param payType
+ * @param state
+ * @return
+ * @throws Exception
+ */
+ @Override
+ public List<PaymentRecord> query(Integer category, Integer userId, Integer type, Integer orderId, Integer orderType,
+ Integer payType, Integer state) throws Exception {
+ return paymentRecordMapper.query(category, userId, type, orderId, orderType, payType, state);
+ }
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/RelationServiceImpl.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/RelationServiceImpl.java
new file mode 100644
index 0000000..b378b2d
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/RelationServiceImpl.java
@@ -0,0 +1,21 @@
+package com.stylefeng.guns.modular.system.service.impl;
+
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import com.stylefeng.guns.modular.system.dao.RelationMapper;
+import com.stylefeng.guns.modular.system.model.Relation;
+import com.stylefeng.guns.modular.system.service.IRelationService;
+
+/**
+ * <p>
+ * 角色和菜单关联表 服务实现类
+ * </p>
+ *
+ * @author stylefeng123
+ * @since 2018-02-22
+ */
+@Service
+public class RelationServiceImpl extends ServiceImpl<RelationMapper, Relation> implements IRelationService {
+
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/RoleServiceImpl.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/RoleServiceImpl.java
new file mode 100644
index 0000000..34a0875
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/RoleServiceImpl.java
@@ -0,0 +1,75 @@
+package com.stylefeng.guns.modular.system.service.impl;
+
+import java.util.List;
+import java.util.Map;
+
+import javax.annotation.Resource;
+
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import com.stylefeng.guns.core.node.ZTreeNode;
+import com.stylefeng.guns.core.util.Convert;
+import com.stylefeng.guns.modular.system.dao.RelationMapper;
+import com.stylefeng.guns.modular.system.dao.RoleMapper;
+import com.stylefeng.guns.modular.system.model.Relation;
+import com.stylefeng.guns.modular.system.model.Role;
+import com.stylefeng.guns.modular.system.service.IRoleService;
+
+@Service
+public class RoleServiceImpl extends ServiceImpl<RoleMapper, Role> implements IRoleService {
+
+ @Resource
+ private RoleMapper roleMapper;
+
+ @Resource
+ private RelationMapper relationMapper;
+
+ @Override
+ @Transactional(readOnly = false)
+ public void setAuthority(Integer roleId, String ids) {
+
+ // 删除该角色所有的权限
+ this.roleMapper.deleteRolesById(roleId);
+
+ // 添加新的权限
+ for (Long id : Convert.toLongArray(true, Convert.toStrArray(",", ids))) {
+ Relation relation = new Relation();
+ relation.setRoleid(roleId);
+ relation.setMenuid(id);
+ this.relationMapper.insert(relation);
+ }
+ }
+
+ @Override
+ @Transactional(readOnly = false)
+ public void delRoleById(Integer roleId) {
+ //删除角色
+ this.roleMapper.deleteById(roleId);
+
+ // 删除该角色所有的权限
+ this.roleMapper.deleteRolesById(roleId);
+ }
+
+ @Override
+ public List<Map<String, Object>> selectRoles(String condition) {
+ return this.baseMapper.selectRoles(condition);
+ }
+
+ @Override
+ public int deleteRolesById(Integer roleId) {
+ return this.baseMapper.deleteRolesById(roleId);
+ }
+
+ @Override
+ public List<ZTreeNode> roleTreeList() {
+ return this.baseMapper.roleTreeList();
+ }
+
+ @Override
+ public List<ZTreeNode> roleTreeListByRoleId(String[] roleId) {
+ return this.baseMapper.roleTreeListByRoleId(roleId);
+ }
+
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/SysCouponActivityServiceImpl.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/SysCouponActivityServiceImpl.java
new file mode 100644
index 0000000..98bc00e
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/SysCouponActivityServiceImpl.java
@@ -0,0 +1,20 @@
+package com.stylefeng.guns.modular.system.service.impl;
+
+import com.stylefeng.guns.modular.system.model.SysCouponActivity;
+import com.stylefeng.guns.modular.system.dao.SysCouponActivityMapper;
+import com.stylefeng.guns.modular.system.service.ISysCouponActivityService;
+import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 系统设置-优惠券活动 服务实现类
+ * </p>
+ *
+ * @author stylefeng
+ * @since 2020-06-17
+ */
+@Service
+public class SysCouponActivityServiceImpl extends ServiceImpl<SysCouponActivityMapper, SysCouponActivity> implements ISysCouponActivityService {
+
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/SysCouponRecordServiceImpl.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/SysCouponRecordServiceImpl.java
new file mode 100644
index 0000000..d8f2f31
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/SysCouponRecordServiceImpl.java
@@ -0,0 +1,20 @@
+package com.stylefeng.guns.modular.system.service.impl;
+
+import com.stylefeng.guns.modular.system.model.SysCouponRecord;
+import com.stylefeng.guns.modular.system.dao.SysCouponRecordMapper;
+import com.stylefeng.guns.modular.system.service.ISysCouponRecordService;
+import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 系统设置-优惠券记录 服务实现类
+ * </p>
+ *
+ * @author stylefeng
+ * @since 2020-06-15
+ */
+@Service
+public class SysCouponRecordServiceImpl extends ServiceImpl<SysCouponRecordMapper, SysCouponRecord> implements ISysCouponRecordService {
+
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/SysRedPacketRecordServiceImpl.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/SysRedPacketRecordServiceImpl.java
new file mode 100644
index 0000000..f79e94e
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/SysRedPacketRecordServiceImpl.java
@@ -0,0 +1,20 @@
+package com.stylefeng.guns.modular.system.service.impl;
+
+import com.stylefeng.guns.modular.system.model.SysRedPacketRecord;
+import com.stylefeng.guns.modular.system.dao.SysRedPacketRecordMapper;
+import com.stylefeng.guns.modular.system.service.ISysRedPacketRecordService;
+import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 系统设置-红包记录 服务实现类
+ * </p>
+ *
+ * @author stylefeng
+ * @since 2020-06-13
+ */
+@Service
+public class SysRedPacketRecordServiceImpl extends ServiceImpl<SysRedPacketRecordMapper, SysRedPacketRecord> implements ISysRedPacketRecordService {
+
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TAdvertisementServiceImpl.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TAdvertisementServiceImpl.java
new file mode 100644
index 0000000..8b2a2ec
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TAdvertisementServiceImpl.java
@@ -0,0 +1,28 @@
+package com.stylefeng.guns.modular.system.service.impl;
+
+import com.baomidou.mybatisplus.plugins.Page;
+import com.stylefeng.guns.modular.system.model.TAdvertisement;
+import com.stylefeng.guns.modular.system.dao.TAdvertisementMapper;
+import com.stylefeng.guns.modular.system.service.ITAdvertisementService;
+import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * 广告 服务实现类
+ * </p>
+ *
+ * @author 吕雪
+ * @since 2020-06-02
+ */
+@Service
+public class TAdvertisementServiceImpl extends ServiceImpl<TAdvertisementMapper, TAdvertisement> implements ITAdvertisementService {
+
+ @Override
+ public List<Map<String, Object>> getAdvertisementList(Page<Map<String, Object>> page, String beginTime, String endTime, Integer type, String name) {
+ return this.baseMapper.getAdvertisementList(page, beginTime, endTime, type, name);
+ }
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TAgreementServiceImpl.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TAgreementServiceImpl.java
new file mode 100644
index 0000000..1462340
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TAgreementServiceImpl.java
@@ -0,0 +1,20 @@
+package com.stylefeng.guns.modular.system.service.impl;
+
+import com.stylefeng.guns.modular.system.model.TAgreement;
+import com.stylefeng.guns.modular.system.dao.TAgreementMapper;
+import com.stylefeng.guns.modular.system.service.ITAgreementService;
+import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 平台协议 服务实现类
+ * </p>
+ *
+ * @author 吕雪
+ * @since 2020-06-01
+ */
+@Service
+public class TAgreementServiceImpl extends ServiceImpl<TAgreementMapper, TAgreement> implements ITAgreementService {
+
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TCarBrandServiceImpl.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TCarBrandServiceImpl.java
new file mode 100644
index 0000000..e0cdb92
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TCarBrandServiceImpl.java
@@ -0,0 +1,28 @@
+package com.stylefeng.guns.modular.system.service.impl;
+
+import com.baomidou.mybatisplus.plugins.Page;
+import com.stylefeng.guns.modular.system.model.TCarBrand;
+import com.stylefeng.guns.modular.system.dao.TCarBrandMapper;
+import com.stylefeng.guns.modular.system.service.ITCarBrandService;
+import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * 车辆品牌 服务实现类
+ * </p>
+ *
+ * @author 吕雪
+ * @since 2020-06-05
+ */
+@Service
+public class TCarBrandServiceImpl extends ServiceImpl<TCarBrandMapper, TCarBrand> implements ITCarBrandService {
+
+ @Override
+ public List<Map<String, Object>> getCarBrandList(Page<Map<String, Object>> page, String beginTime, String endTime, String name) {
+ return this.baseMapper.getCarBrandList(page, beginTime, endTime, name);
+ }
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TCarModelServiceImpl.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TCarModelServiceImpl.java
new file mode 100644
index 0000000..8ad1604
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TCarModelServiceImpl.java
@@ -0,0 +1,28 @@
+package com.stylefeng.guns.modular.system.service.impl;
+
+import com.baomidou.mybatisplus.plugins.Page;
+import com.stylefeng.guns.modular.system.model.TCarModel;
+import com.stylefeng.guns.modular.system.dao.TCarModelMapper;
+import com.stylefeng.guns.modular.system.service.ITCarModelService;
+import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * 车辆车型 服务实现类
+ * </p>
+ *
+ * @author 吕雪
+ * @since 2020-06-05
+ */
+@Service
+public class TCarModelServiceImpl extends ServiceImpl<TCarModelMapper, TCarModel> implements ITCarModelService {
+
+ @Override
+ public List<Map<String, Object>> getCarModelList(Page<Map<String, Object>> page, String beginTime, String endTime, String name) {
+ return this.baseMapper.getCarModelList(page, beginTime, endTime, name);
+ }
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TCarServiceImpl.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TCarServiceImpl.java
new file mode 100644
index 0000000..e2d68d7
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TCarServiceImpl.java
@@ -0,0 +1,33 @@
+package com.stylefeng.guns.modular.system.service.impl;
+
+import com.baomidou.mybatisplus.plugins.Page;
+import com.stylefeng.guns.modular.system.model.TCar;
+import com.stylefeng.guns.modular.system.dao.TCarMapper;
+import com.stylefeng.guns.modular.system.service.ITCarService;
+import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * 车辆 服务实现类
+ * </p>
+ *
+ * @author 吕雪
+ * @since 2020-06-05
+ */
+@Service
+public class TCarServiceImpl extends ServiceImpl<TCarMapper, TCar> implements ITCarService {
+
+ @Override
+ public List<Map<String, Object>> getCarList(Page<Map<String, Object>> page, Integer roleType, Integer nowUserId, String beginTime, String endTime, String id, String brandName, String modelName, String carColor, String serverStr, String carLicensePlate, String driverName, String companyName, String franchiseeName) {
+ return this.baseMapper.getCarList(page, roleType, nowUserId, beginTime, endTime, id, brandName, modelName, carColor, serverStr, carLicensePlate, driverName, companyName, franchiseeName);
+ }
+
+ @Override
+ public List<Map<String, Object>> getCarListNoPage(Integer roleType, Integer nowUserId) {
+ return this.baseMapper.getCarListNoPage(roleType, nowUserId);
+ }
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TCarServiceServiceImpl.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TCarServiceServiceImpl.java
new file mode 100644
index 0000000..bc01d89
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TCarServiceServiceImpl.java
@@ -0,0 +1,20 @@
+package com.stylefeng.guns.modular.system.service.impl;
+
+import com.stylefeng.guns.modular.system.model.TCarService;
+import com.stylefeng.guns.modular.system.dao.TCarServiceMapper;
+import com.stylefeng.guns.modular.system.service.ITCarServiceService;
+import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 车辆经营业务 服务实现类
+ * </p>
+ *
+ * @author 吕雪
+ * @since 2020-06-05
+ */
+@Service
+public class TCarServiceServiceImpl extends ServiceImpl<TCarServiceMapper, TCarService> implements ITCarServiceService {
+
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TCompanyCityServiceImpl.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TCompanyCityServiceImpl.java
new file mode 100644
index 0000000..eb825e4
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TCompanyCityServiceImpl.java
@@ -0,0 +1,20 @@
+package com.stylefeng.guns.modular.system.service.impl;
+
+import com.stylefeng.guns.modular.system.model.TCompanyCity;
+import com.stylefeng.guns.modular.system.dao.TCompanyCityMapper;
+import com.stylefeng.guns.modular.system.service.ITCompanyCityService;
+import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 公司经营地区 服务实现类
+ * </p>
+ *
+ * @author 吕雪
+ * @since 2020-06-06
+ */
+@Service
+public class TCompanyCityServiceImpl extends ServiceImpl<TCompanyCityMapper, TCompanyCity> implements ITCompanyCityService {
+
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TCompanyServiceImpl.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TCompanyServiceImpl.java
new file mode 100644
index 0000000..654f690
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TCompanyServiceImpl.java
@@ -0,0 +1,237 @@
+package com.stylefeng.guns.modular.system.service.impl;
+
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.baomidou.mybatisplus.plugins.Page;
+import com.stylefeng.guns.modular.system.model.Region;
+import com.stylefeng.guns.modular.system.model.TCompany;
+import com.stylefeng.guns.modular.system.dao.TCompanyMapper;
+import com.stylefeng.guns.modular.system.model.User;
+import com.stylefeng.guns.modular.system.service.ITCompanyService;
+import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import com.stylefeng.guns.modular.system.util.ResultUtil;
+import org.apache.poi.hssf.usermodel.*;
+import org.apache.poi.ss.usermodel.CellType;
+import org.apache.poi.ss.usermodel.HorizontalAlignment;
+import org.apache.poi.ss.util.CellRangeAddress;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * 公司信息表 服务实现类
+ * </p>
+ *
+ * @author 吕雪
+ * @since 2020-06-06
+ */
+@Service
+public class TCompanyServiceImpl extends ServiceImpl<TCompanyMapper, TCompany> implements ITCompanyService {
+
+
+ @Resource
+ private TCompanyMapper companyMapper;
+
+
+
+
+ @Override
+ public List<Map<String, Object>> getCompanyList(Page<Map<String, Object>> page, String beginTime, String endTime, String name, String principalName, String principalPhone, String adminName, String adminPhone, String serviceStr, Integer state) {
+ return this.baseMapper.getCompanyList(page, beginTime, endTime, name, principalName, principalPhone, adminName, adminPhone, serviceStr, state);
+ }
+
+ @Override
+ public List<Map<String, Object>> getCompanyScopeById(Integer id) {
+ return this.baseMapper.getCompanyScopeById(id);
+ }
+
+ @Override
+ public List<Map<String, Object>> getFranchiseeList(Page<Map<String, Object>> page, String beginTime, String endTime, String name, String account, String principalName, String principalPhone, String serviceStr, Integer state, Integer roleType, Integer nowUserId) {
+ return this.baseMapper.getFranchiseeList(page, beginTime, endTime, name, account, principalName, principalPhone, serviceStr, state, roleType, nowUserId);
+ }
+
+ @Override
+ public ResultUtil selectCompanyInfoById(String id) throws Exception {
+ Map<String, Object> map = new HashMap<>();
+ TCompany companyInfo = this.selectById(id);
+ /*Address address = addressService.selectById((String) companyInfo.getDetailAddress());
+ companyInfo.setAddressId(address);
+ Map<String, List<Region>> regions = null;
+ if(null != address){
+ //查询注册地址对应的行政数据
+ regions = regionService.getRegions(address.getProvince(), address.getCity());
+ }
+ //查询企业的超级管理员
+ EntityWrapper<User> entityWrapper = new EntityWrapper<>();
+ entityWrapper.eq("is_admin", "0");
+ entityWrapper.eq("company_info_id", companyInfo.getCompanyId());
+ entityWrapper.ne("status", 3);
+ User user = userService.selectOne(entityWrapper);
+
+ //查询企业的经营范围
+ List<OperateRegion> OperateRegions = operateRegionService.getDataByCompanyInfoId(companyInfo.getCompanyId());
+
+ map.put("companyInfo", companyInfo);
+ map.put("region", regions);
+ map.put("OperateRegion", OperateRegions);
+ map.put("admin", user);*/
+ return ResultUtil.success(map);
+ }
+
+
+ /**
+ * 获取运营汇总数据
+ * @param type
+ * @param start
+ * @param end
+ * @param companyId
+ * @param offset
+ * @param limit
+ * @return
+ * @throws Exception
+ */
+ @Override
+ public Map<String, Object> queryOperationalData(Integer type, String start, String end, Integer companyId, Integer offset, Integer limit) throws Exception {
+ Map<String, Object> map = new HashMap<>();
+ List<Map<String, Object>> list = companyMapper.queryOperationalData(type, start, end, companyId, offset, limit);
+ int i = companyMapper.queryOperationalDataCount(type, start, end, companyId);
+ map.put("rows", list);
+ map.put("total", i);
+ return map;
+ }
+
+
+ /**
+ * 下载运营汇总数据
+ * @param type
+ * @param companyId
+ * @return
+ * @throws Exception
+ */
+ @Override
+ public HSSFWorkbook downloadOperationalData(Integer type, String start, String end, Integer companyId) throws Exception {
+ List<Map<String, Object>> list = companyMapper.queryOperationalData(type, start, end, companyId, null, null);
+
+ List<List<String>> lists = new ArrayList<>();
+ List<String> list1 = new ArrayList<>();
+ list1.add("类别：");
+ list1.add(type == 1 ? "专车" : type == 2 ? "出租车" : type == 3 ? "城际" : "小件物流");
+ list1.add("");
+ list1.add("");
+ list1.add("起止时间：");
+ list1.add(null == start || "".equals(start) ? "" : start + " ~ " + end);
+ list1.add("");
+ list1.add("");
+ list1.add("运营商：");
+ String company = "";
+ if(null != companyId){
+ company = companyMapper.selectById(companyId).getName();
+ }
+ list1.add(company);
+ list1.add("");
+ list1.add("");
+ lists.add(list1);
+ list1 = new ArrayList<>();
+ list1.add("日期");
+ list1.add("用户注册数量");
+ list1.add("在线司机数");
+ list1.add("订单情况");
+ list1.add("");
+ list1.add("");
+ list1.add("支付情况");
+ list1.add("");
+ list1.add("");
+ list1.add("");
+ list1.add("");
+ list1.add("投诉数量");
+ lists.add(list1);
+ list1 = new ArrayList<>();
+ list1.add("");
+ list1.add("");
+ list1.add("");
+ list1.add("下单数量");
+ list1.add("乘客取消数量");
+ list1.add("取消占比");
+ list1.add("通过平台支付（单）");
+ list1.add("通过其它支付（单）");
+ list1.add("合计");
+ list1.add("平台支付占比%");
+ list1.add("金额");
+ list1.add("");
+ lists.add(list1);
+
+ List<List<List<String>>> lists1 = new ArrayList<>();
+ List<List<String>> lists2 = new ArrayList<>();
+ for(Map<String, Object> map : list){
+ List<String> list2 = new ArrayList<>();
+ list2.add(null != map.get("time") ? map.get("time").toString() : "");
+ list2.add(null != map.get("register") ? map.get("register").toString() : "");
+ list2.add(null != map.get("online") ? map.get("online").toString() : "");
+ list2.add(null != map.get("orderNum") ? map.get("orderNum").toString() : "");
+ list2.add(null != map.get("cancelNum") ? map.get("cancelNum").toString() : "");
+ list2.add(null != map.get("cancelProportion") ? map.get("cancelProportion").toString() : "");
+ list2.add(null != map.get("onlinePay") ? map.get("onlinePay").toString() : "");
+ list2.add(null != map.get("offlinePay") ? map.get("offlinePay").toString() : "");
+ list2.add(null != map.get("total") ? map.get("total").toString() : "");
+ list2.add(null != map.get("payProportion") ? map.get("payProportion").toString() : "");
+ list2.add(null != map.get("money") ? map.get("money").toString() : "");
+ list2.add(null != map.get("complaint") ? map.get("complaint").toString() : "");
+ lists2.add(list2);
+ }
+ lists1.add(lists2);
+ HSSFWorkbook hssfWorkbook = new HSSFWorkbook();
+ HSSFSheet hssfSheet = hssfWorkbook.createSheet();
+ hssfSheet.setColumnWidth(0, 6 * 256);
+ hssfSheet.setDefaultRowHeightInPoints(20f);
+ for(int i = 0; i < lists.size(); i++){
+ HSSFRow hssfRow = hssfSheet.createRow(i);//设置第一行数据（标题）
+ HSSFCellStyle style = hssfWorkbook.createCellStyle();
+ HSSFFont font = hssfWorkbook.createFont();
+ font.setBold(true);
+ style.setFont(font);
+ style.setAlignment(HorizontalAlignment.CENTER);
+ for (int l = 0; l < lists.get(i).size(); l++) {
+ HSSFCell hssfCell = hssfRow.createCell(l);
+ hssfCell.setCellType(CellType.STRING);//设置表格类型
+ hssfCell.setCellValue(lists.get(i).get(l));
+ hssfCell.setCellStyle(style);
+ if(l > 0) {
+ hssfSheet.setColumnWidth(l , 20 * 256);
+ }
+
+ }
+ }
+ //这个就是合并单元格
+ //参数说明：1：开始行 2：结束行 3：开始列 4：结束列
+ //比如我要合并 第二行到第四行的 第六列到第八列 sheet.addMergedRegion(new CellRangeAddress(1,3,5,7));
+ hssfSheet.addMergedRegion(new CellRangeAddress(0,0,1,3));
+ hssfSheet.addMergedRegion(new CellRangeAddress(0,0,5,7));
+ hssfSheet.addMergedRegion(new CellRangeAddress(0,0,9,10));
+ hssfSheet.addMergedRegion(new CellRangeAddress(1,2,0,0));
+ hssfSheet.addMergedRegion(new CellRangeAddress(1,2,1,1));
+ hssfSheet.addMergedRegion(new CellRangeAddress(1,2,2,2));
+ hssfSheet.addMergedRegion(new CellRangeAddress(1,1,3,5));
+ hssfSheet.addMergedRegion(new CellRangeAddress(1,1,6,10));
+ hssfSheet.addMergedRegion(new CellRangeAddress(1,2,11,11));
+
+
+ for(int i = 0; i < lists1.size(); i++){
+ //将数据添加到表格中
+ List<String> data = null;
+ for (int l = 0; l < lists1.get(i).size(); l++) {
+ HSSFRow row = hssfSheet.createRow(l + 3);
+ data = lists1.get(i).get(l);
+ for (int j = 0; j < data.size(); j++) {
+ HSSFCell hssfCell = row.createCell(j);
+ hssfCell.setCellType(CellType.STRING);//设置表格类型
+ hssfCell.setCellValue(data.get(j));
+ }
+ }
+ }
+ return hssfWorkbook;
+ }
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TComplaintServiceImpl.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TComplaintServiceImpl.java
new file mode 100644
index 0000000..1574c0d
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TComplaintServiceImpl.java
@@ -0,0 +1,28 @@
+package com.stylefeng.guns.modular.system.service.impl;
+
+import com.baomidou.mybatisplus.plugins.Page;
+import com.stylefeng.guns.modular.system.model.TComplaint;
+import com.stylefeng.guns.modular.system.dao.TComplaintMapper;
+import com.stylefeng.guns.modular.system.service.ITComplaintService;
+import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * 投诉管理 服务实现类
+ * </p>
+ *
+ * @author 吕雪
+ * @since 2020-06-09
+ */
+@Service
+public class TComplaintServiceImpl extends ServiceImpl<TComplaintMapper, TComplaint> implements ITComplaintService {
+
+ @Override
+ public List<Map<String, Object>> getComplaintList(Page<Map<String, Object>> page, Integer roleType, Integer nowUserId, String beginTime, String endTime, String userName, String userPhone, String driverPhone, Integer isHandle) {
+ return this.baseMapper.getComplaintList(page, roleType, nowUserId, beginTime, endTime, userName, userPhone, driverPhone, isHandle);
+ }
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TDispatchServiceImpl.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TDispatchServiceImpl.java
new file mode 100644
index 0000000..ee6ce98
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TDispatchServiceImpl.java
@@ -0,0 +1,28 @@
+package com.stylefeng.guns.modular.system.service.impl;
+
+import com.baomidou.mybatisplus.plugins.Page;
+import com.stylefeng.guns.modular.system.model.TDispatch;
+import com.stylefeng.guns.modular.system.dao.TDispatchMapper;
+import com.stylefeng.guns.modular.system.service.ITDispatchService;
+import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * 调度管理 服务实现类
+ * </p>
+ *
+ * @author 吕雪
+ * @since 2020-09-01
+ */
+@Service
+public class TDispatchServiceImpl extends ServiceImpl<TDispatchMapper, TDispatch> implements ITDispatchService {
+
+ @Override
+ public List<Map<String, Object>> getDispatchList(Page<Map<String, Object>> page, Integer roleType, Integer nowUserId, String beginTime, String endTime, String name, String companyName, String franchiseeName, String account, Integer state) {
+ return this.baseMapper.getDispatchList(page, roleType, nowUserId, beginTime, endTime, name, companyName, franchiseeName, account, state);
+ }
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TDriverLineServiceImpl.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TDriverLineServiceImpl.java
new file mode 100644
index 0000000..c36e642
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TDriverLineServiceImpl.java
@@ -0,0 +1,27 @@
+package com.stylefeng.guns.modular.system.service.impl;
+
+import com.stylefeng.guns.modular.system.model.TDriverLine;
+import com.stylefeng.guns.modular.system.dao.TDriverLineMapper;
+import com.stylefeng.guns.modular.system.service.ITDriverLineService;
+import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * 司机关联线路 服务实现类
+ * </p>
+ *
+ * @author 吕雪
+ * @since 2020-06-05
+ */
+@Service
+public class TDriverLineServiceImpl extends ServiceImpl<TDriverLineMapper, TDriverLine> implements ITDriverLineService {
+
+ @Override
+ public List<Map<String, Object>> getDriverLineListByDriverId(Integer driverId) {
+ return this.baseMapper.getDriverLineListByDriverId(driverId);
+ }
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TDriverServiceImpl.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TDriverServiceImpl.java
new file mode 100644
index 0000000..a47b5e0
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TDriverServiceImpl.java
@@ -0,0 +1,64 @@
+package com.stylefeng.guns.modular.system.service.impl;
+
+import com.baomidou.mybatisplus.plugins.Page;
+import com.stylefeng.guns.modular.system.model.TDriver;
+import com.stylefeng.guns.modular.system.dao.TDriverMapper;
+import com.stylefeng.guns.modular.system.service.ITDriverService;
+import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * 司机表 服务实现类
+ * </p>
+ *
+ * @author 吕雪
+ * @since 2020-06-04
+ */
+@Service
+public class TDriverServiceImpl extends ServiceImpl<TDriverMapper, TDriver> implements ITDriverService {
+
+ @Override
+ public List<Map<String, Object>> getAuthDriverList(Page<Map<String, Object>> page, String beginTime, String endTime, String companyName, String phone, String account, Integer addType, Integer authState) {
+ return this.baseMapper.getAuthDriverList(page, beginTime, endTime, companyName, phone, account, addType, authState);
+ }
+
+ @Override
+ public Map<String, Object> getDriverById(Integer driverId) {
+ return this.baseMapper.getDriverById(driverId);
+ }
+
+ @Override
+ public List<Map<String, Object>> getDriverList(Page<Map<String, Object>> page, Integer roleType,Integer nowUserId,String beginTime, String endTime, String companyName, String phone, String name, Integer addType, Integer authState) {
+ return this.baseMapper.getDriverList(page,roleType,nowUserId, beginTime, endTime, companyName, phone, name, addType, authState);
+ }
+
+ @Override
+ public String getUseCarIdStr(Integer carId) {
+ return this.baseMapper.getUseCarIdStr(carId);
+ }
+
+ @Override
+ public List<Map<String, Object>> getCanSelectCarList(Page<Map<String, Object>> page, Integer roleType, Integer nowUserId, String carIdStr, String carLicensePlate, String brandName, String modelName, String color, String serverStr) {
+ return this.baseMapper.getCanSelectCarList(page, roleType, nowUserId, carIdStr, carLicensePlate, brandName, modelName, color, serverStr);
+ }
+
+ @Override
+ public void updateCompanyDriverState(Integer authState, Integer companyId) {
+ this.baseMapper.updateCompanyDriverState(authState, companyId);
+ }
+
+ @Override
+ public void updateFranchiseeDriverState(Integer authState, Integer franchiseeId) {
+ this.baseMapper.updateFranchiseeDriverState(authState, franchiseeId);
+ }
+
+ @Override
+ public List<Map<String, Object>> getDriverListNoPage(Integer roleType, Integer nowUserId) {
+ return this.baseMapper.getDriverListNoPage(roleType, nowUserId);
+ }
+
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TDriverServiceServiceImpl.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TDriverServiceServiceImpl.java
new file mode 100644
index 0000000..8db7271
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TDriverServiceServiceImpl.java
@@ -0,0 +1,20 @@
+package com.stylefeng.guns.modular.system.service.impl;
+
+import com.stylefeng.guns.modular.system.model.TDriverService;
+import com.stylefeng.guns.modular.system.dao.TDriverServiceMapper;
+import com.stylefeng.guns.modular.system.service.ITDriverServiceService;
+import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 司机经营业务 服务实现类
+ * </p>
+ *
+ * @author 吕雪
+ * @since 2020-06-05
+ */
+@Service
+public class TDriverServiceServiceImpl extends ServiceImpl<TDriverServiceMapper, TDriverService> implements ITDriverServiceService {
+
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TFeedbackServiceImpl.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TFeedbackServiceImpl.java
new file mode 100644
index 0000000..01befe7
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TFeedbackServiceImpl.java
@@ -0,0 +1,28 @@
+package com.stylefeng.guns.modular.system.service.impl;
+
+import com.baomidou.mybatisplus.plugins.Page;
+import com.stylefeng.guns.modular.system.model.TFeedback;
+import com.stylefeng.guns.modular.system.dao.TFeedbackMapper;
+import com.stylefeng.guns.modular.system.service.ITFeedbackService;
+import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * 反馈管理 服务实现类
+ * </p>
+ *
+ * @author 吕雪
+ * @since 2020-06-10
+ */
+@Service
+public class TFeedbackServiceImpl extends ServiceImpl<TFeedbackMapper, TFeedback> implements ITFeedbackService {
+
+ @Override
+ public List<Map<String, Object>> getFeedbackList(Page<Map<String, Object>> page, String beginTime, String endTime, Integer type, String name, String phone, Integer state) {
+ return this.baseMapper.getFeedbackList(page, beginTime, endTime, type, name, phone, state);
+ }
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TIntegralGoodsServiceImpl.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TIntegralGoodsServiceImpl.java
new file mode 100644
index 0000000..041b1f3
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TIntegralGoodsServiceImpl.java
@@ -0,0 +1,28 @@
+package com.stylefeng.guns.modular.system.service.impl;
+
+import com.baomidou.mybatisplus.plugins.Page;
+import com.stylefeng.guns.modular.system.model.TIntegralGoods;
+import com.stylefeng.guns.modular.system.dao.TIntegralGoodsMapper;
+import com.stylefeng.guns.modular.system.service.ITIntegralGoodsService;
+import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * 积分商品管理 服务实现类
+ * </p>
+ *
+ * @author 吕雪
+ * @since 2020-09-02
+ */
+@Service
+public class TIntegralGoodsServiceImpl extends ServiceImpl<TIntegralGoodsMapper, TIntegralGoods> implements ITIntegralGoodsService {
+
+ @Override
+ public List<Map<String, Object>> getIntegralGoodsList(Page<Map<String, Object>> page, String beginTime, String endTime, String name, Integer state) {
+ return this.baseMapper.getIntegralGoodsList(page, beginTime, endTime, name, state);
+ }
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TIntegralOrderServiceImpl.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TIntegralOrderServiceImpl.java
new file mode 100644
index 0000000..1470b74
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TIntegralOrderServiceImpl.java
@@ -0,0 +1,28 @@
+package com.stylefeng.guns.modular.system.service.impl;
+
+import com.baomidou.mybatisplus.plugins.Page;
+import com.stylefeng.guns.modular.system.model.TIntegralOrder;
+import com.stylefeng.guns.modular.system.dao.TIntegralOrderMapper;
+import com.stylefeng.guns.modular.system.service.ITIntegralOrderService;
+import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * 积分订单管理 服务实现类
+ * </p>
+ *
+ * @author 吕雪
+ * @since 2020-09-02
+ */
+@Service
+public class TIntegralOrderServiceImpl extends ServiceImpl<TIntegralOrderMapper, TIntegralOrder> implements ITIntegralOrderService {
+
+ @Override
+ public List<Map<String, Object>> getIntegralOrderList(Page<Map<String, Object>> page, String beginTime, String endTime, String userName, String goodsName, String consigneeName, String consigneePhone, Integer state) {
+ return this.baseMapper.getIntegralOrderList(page, beginTime, endTime, userName, goodsName, consigneeName, consigneePhone, state);
+ }
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TInvoiceServiceImpl.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TInvoiceServiceImpl.java
new file mode 100644
index 0000000..d3aca8e
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TInvoiceServiceImpl.java
@@ -0,0 +1,28 @@
+package com.stylefeng.guns.modular.system.service.impl;
+
+import com.baomidou.mybatisplus.plugins.Page;
+import com.stylefeng.guns.modular.system.model.TInvoice;
+import com.stylefeng.guns.modular.system.dao.TInvoiceMapper;
+import com.stylefeng.guns.modular.system.service.ITInvoiceService;
+import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * 发票 服务实现类
+ * </p>
+ *
+ * @author 吕雪
+ * @since 2020-06-09
+ */
+@Service
+public class TInvoiceServiceImpl extends ServiceImpl<TInvoiceMapper, TInvoice> implements ITInvoiceService {
+
+ @Override
+ public List<Map<String, Object>> getInvoiceList(Page<Map<String, Object>> page, String beginTime, String endTime, String email, String name, Integer type, Integer state) {
+ return this.baseMapper.getInvoiceList(page, beginTime, endTime, email, name, type, state);
+ }
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TLineCompanyServiceImpl.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TLineCompanyServiceImpl.java
new file mode 100644
index 0000000..bcc4a64
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TLineCompanyServiceImpl.java
@@ -0,0 +1,20 @@
+package com.stylefeng.guns.modular.system.service.impl;
+
+import com.stylefeng.guns.modular.system.model.TLineCompany;
+import com.stylefeng.guns.modular.system.dao.TLineCompanyMapper;
+import com.stylefeng.guns.modular.system.service.ITLineCompanyService;
+import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 企业-线路关系表 服务实现类
+ * </p>
+ *
+ * @author 吕雪
+ * @since 2020-09-16
+ */
+@Service
+public class TLineCompanyServiceImpl extends ServiceImpl<TLineCompanyMapper, TLineCompany> implements ITLineCompanyService {
+
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TLinePriceServiceImpl.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TLinePriceServiceImpl.java
new file mode 100644
index 0000000..c444d0f
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TLinePriceServiceImpl.java
@@ -0,0 +1,20 @@
+package com.stylefeng.guns.modular.system.service.impl;
+
+import com.stylefeng.guns.modular.system.model.TLinePrice;
+import com.stylefeng.guns.modular.system.dao.TLinePriceMapper;
+import com.stylefeng.guns.modular.system.service.ITLinePriceService;
+import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 跨城线路价格规则 服务实现类
+ * </p>
+ *
+ * @author 吕雪
+ * @since 2020-09-16
+ */
+@Service
+public class TLinePriceServiceImpl extends ServiceImpl<TLinePriceMapper, TLinePrice> implements ITLinePriceService {
+
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TLineServiceImpl.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TLineServiceImpl.java
new file mode 100644
index 0000000..14b72b8
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TLineServiceImpl.java
@@ -0,0 +1,38 @@
+package com.stylefeng.guns.modular.system.service.impl;
+
+import com.baomidou.mybatisplus.plugins.Page;
+import com.stylefeng.guns.modular.system.model.TLine;
+import com.stylefeng.guns.modular.system.dao.TLineMapper;
+import com.stylefeng.guns.modular.system.service.ITLineService;
+import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * 跨城线路 服务实现类
+ * </p>
+ *
+ * @author 吕雪
+ * @since 2020-09-15
+ */
+@Service
+public class TLineServiceImpl extends ServiceImpl<TLineMapper, TLine> implements ITLineService {
+
+ @Override
+ public List<Map<String, Object>> getLineList(Page<Map<String, Object>> page, String beginTime, String endTime, String name, String insertUser, String modelStr, Integer state) {
+ return this.baseMapper.getLineList(page, beginTime, endTime, name, insertUser, modelStr, state);
+ }
+
+ @Override
+ public List<Map<String, Object>> getLinePriceList(Integer lineId) {
+ return this.baseMapper.getLinePriceList(lineId);
+ }
+
+ @Override
+ public List<Map<String, Object>> getLineCompanyList(Integer lineId) {
+ return this.baseMapper.getLineCompanyList(lineId);
+ }
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TLineShiftServiceImpl.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TLineShiftServiceImpl.java
new file mode 100644
index 0000000..cfb7e48
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TLineShiftServiceImpl.java
@@ -0,0 +1,20 @@
+package com.stylefeng.guns.modular.system.service.impl;
+
+import com.stylefeng.guns.modular.system.model.TLineShift;
+import com.stylefeng.guns.modular.system.dao.TLineShiftMapper;
+import com.stylefeng.guns.modular.system.service.ITLineShiftService;
+import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 线路班次 服务实现类
+ * </p>
+ *
+ * @author 吕雪
+ * @since 2020-09-16
+ */
+@Service
+public class TLineShiftServiceImpl extends ServiceImpl<TLineShiftMapper, TLineShift> implements ITLineShiftService {
+
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TLineSiteServiceImpl.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TLineSiteServiceImpl.java
new file mode 100644
index 0000000..ee56fee
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TLineSiteServiceImpl.java
@@ -0,0 +1,20 @@
+package com.stylefeng.guns.modular.system.service.impl;
+
+import com.stylefeng.guns.modular.system.model.TLineSite;
+import com.stylefeng.guns.modular.system.dao.TLineSiteMapper;
+import com.stylefeng.guns.modular.system.service.ITLineSiteService;
+import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 线路-站点关系表 服务实现类
+ * </p>
+ *
+ * @author 吕雪
+ * @since 2020-09-16
+ */
+@Service
+public class TLineSiteServiceImpl extends ServiceImpl<TLineSiteMapper, TLineSite> implements ITLineSiteService {
+
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TLocationServiceImpl.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TLocationServiceImpl.java
new file mode 100644
index 0000000..67d9d01
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TLocationServiceImpl.java
@@ -0,0 +1,58 @@
+package com.stylefeng.guns.modular.system.service.impl;
+
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.stylefeng.guns.modular.system.model.TLocation;
+import com.stylefeng.guns.modular.system.dao.TLocationMapper;
+import com.stylefeng.guns.modular.system.service.ITLocationService;
+import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import com.stylefeng.guns.modular.system.util.GDMapElectricFenceUtil;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.text.SimpleDateFormat;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * <p>
+ * 地点 服务实现类
+ * </p>
+ *
+ * @author 吕雪
+ * @since 2020-09-04
+ */
+@Service
+public class TLocationServiceImpl extends ServiceImpl<TLocationMapper, TLocation> implements ITLocationService {
+
+ @Autowired
+ private GDMapElectricFenceUtil gdMapElectricFenceUtil;
+
+
+ /**
+ * 定时任务更新线上围栏的有效时间
+ * @throws Exception
+ */
+ @Override
+ public void updateFence() throws Exception {
+ Date date = new Date();
+ Calendar calendar = Calendar.getInstance();
+ calendar.setTime(new Date());
+ calendar.set(Calendar.DAY_OF_MONTH, calendar.get(Calendar.DAY_OF_MONTH) + 35);
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+ List<TLocation> type = this.selectList(new EntityWrapper<TLocation>().eq("type", 2));
+ for(TLocation location : type){
+ if((date.getTime() - location.getUpdateTime().getTime()) > 30 * 24 * 60 * 60 * 1000){//更新一个月之前的数据
+ String[] s = location.getGid().split("_");
+ String[] s1 = location.getCoordinate().split("_");
+ for(int i = 0; i < s.length; i++){
+ String[] split = s1[i].split(";");
+ gdMapElectricFenceUtil.updateElectricFenc(s[i], "location_" + location.getId(),
+ (split.length > 2 ? "" : split[0]), (split.length > 2 ? "" : split[1]),
+ (split.length > 2 ? s1[i] : ""), sdf.format(calendar.getTime()));
+ }
+
+ }
+ }
+ }
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TNoticesServiceImpl.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TNoticesServiceImpl.java
new file mode 100644
index 0000000..fb3ad53
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TNoticesServiceImpl.java
@@ -0,0 +1,28 @@
+package com.stylefeng.guns.modular.system.service.impl;
+
+import com.baomidou.mybatisplus.plugins.Page;
+import com.stylefeng.guns.modular.system.model.TNotices;
+import com.stylefeng.guns.modular.system.dao.TNoticesMapper;
+import com.stylefeng.guns.modular.system.service.ITNoticesService;
+import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * 发布公告和滚动消息 服务实现类
+ * </p>
+ *
+ * @author 吕雪
+ * @since 2020-06-10
+ */
+@Service
+public class TNoticesServiceImpl extends ServiceImpl<TNoticesMapper, TNotices> implements ITNoticesService {
+
+ @Override
+ public List<Map<String, Object>> getRollingNoticeList(Page<Map<String, Object>> page, String beginTime, String endTime,Integer typeValue, String content) {
+ return this.baseMapper.getRollingNoticeList(page, beginTime, endTime,typeValue, content);
+ }
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TOpenCityBusinessServiceImpl.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TOpenCityBusinessServiceImpl.java
new file mode 100644
index 0000000..2d76a5e
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TOpenCityBusinessServiceImpl.java
@@ -0,0 +1,20 @@
+package com.stylefeng.guns.modular.system.service.impl;
+
+import com.stylefeng.guns.modular.system.model.TOpenCityBusiness;
+import com.stylefeng.guns.modular.system.dao.TOpenCityBusinessMapper;
+import com.stylefeng.guns.modular.system.service.ITOpenCityBusinessService;
+import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 开通城市经营业务 服务实现类
+ * </p>
+ *
+ * @author 吕雪
+ * @since 2020-06-02
+ */
+@Service
+public class TOpenCityBusinessServiceImpl extends ServiceImpl<TOpenCityBusinessMapper, TOpenCityBusiness> implements ITOpenCityBusinessService {
+
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TOpenCityServiceImpl.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TOpenCityServiceImpl.java
new file mode 100644
index 0000000..a106fde
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TOpenCityServiceImpl.java
@@ -0,0 +1,33 @@
+package com.stylefeng.guns.modular.system.service.impl;
+
+import com.baomidou.mybatisplus.plugins.Page;
+import com.stylefeng.guns.modular.system.model.TOpenCity;
+import com.stylefeng.guns.modular.system.dao.TOpenCityMapper;
+import com.stylefeng.guns.modular.system.service.ITOpenCityService;
+import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * 开通城市表 服务实现类
+ * </p>
+ *
+ * @author 吕雪
+ * @since 2020-06-02
+ */
+@Service
+public class TOpenCityServiceImpl extends ServiceImpl<TOpenCityMapper, TOpenCity> implements ITOpenCityService {
+
+ @Override
+ public List<Map<String, Object>> getOpenCityList(Page<Map<String, Object>> page, String beginTime, String endTime, String condition) {
+ return this.baseMapper.getOpenCityList(page, beginTime, endTime, condition);
+ }
+
+ @Override
+ public List<Map<String,Object>> getBusinessByCityId(Integer openCityId) {
+ return this.baseMapper.getBusinessByCityId(openCityId);
+ }
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TOrderCharterServiceImpl.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TOrderCharterServiceImpl.java
new file mode 100644
index 0000000..2791e45
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TOrderCharterServiceImpl.java
@@ -0,0 +1,28 @@
+package com.stylefeng.guns.modular.system.service.impl;
+
+import com.baomidou.mybatisplus.plugins.Page;
+import com.stylefeng.guns.modular.system.model.TOrderCharter;
+import com.stylefeng.guns.modular.system.dao.TOrderCharterMapper;
+import com.stylefeng.guns.modular.system.service.ITOrderCharterService;
+import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * 包车订单 服务实现类
+ * </p>
+ *
+ * @author 吕雪
+ * @since 2020-09-02
+ */
+@Service
+public class TOrderCharterServiceImpl extends ServiceImpl<TOrderCharterMapper, TOrderCharter> implements ITOrderCharterService {
+
+ @Override
+ public List<Map<String, Object>> getCharterOrderList(Page<Map<String, Object>> page, String beginTime, String endTime, String userName, String contactName, String contactPhone, String useDemand, Integer state) {
+ return this.baseMapper.getCharterOrderList(page, beginTime, endTime, userName, contactName, contactPhone, useDemand, state);
+ }
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TOrderCharteredCarServiceImpl.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TOrderCharteredCarServiceImpl.java
new file mode 100644
index 0000000..bd6f670
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TOrderCharteredCarServiceImpl.java
@@ -0,0 +1,28 @@
+package com.stylefeng.guns.modular.system.service.impl;
+
+import com.baomidou.mybatisplus.plugins.Page;
+import com.stylefeng.guns.modular.system.model.TOrderCharteredCar;
+import com.stylefeng.guns.modular.system.dao.TOrderCharteredCarMapper;
+import com.stylefeng.guns.modular.system.service.ITOrderCharteredCarService;
+import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * 订单-包车 服务实现类
+ * </p>
+ *
+ * @author 吕雪
+ * @since 2020-09-24
+ */
+@Service
+public class TOrderCharteredCarServiceImpl extends ServiceImpl<TOrderCharteredCarMapper, TOrderCharteredCar> implements ITOrderCharteredCarService {
+
+ @Override
+ public List<Map<String, Object>> getCharterCarOrderList(Page<Map<String, Object>> page, String beginTime, String endTime, String userName, String contactPerson, String contactPhone, String modelUse, Integer state, Integer roleType, Integer nowUserId) {
+ return this.baseMapper.getCharterCarOrderList(page, beginTime, endTime, userName, contactPerson, contactPhone, modelUse, state, roleType, nowUserId);
+ }
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TOrderCrossCityServiceImpl.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TOrderCrossCityServiceImpl.java
new file mode 100644
index 0000000..248b9bb
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TOrderCrossCityServiceImpl.java
@@ -0,0 +1,58 @@
+package com.stylefeng.guns.modular.system.service.impl;
+
+import com.baomidou.mybatisplus.plugins.Page;
+import com.stylefeng.guns.modular.system.model.TOrderCrossCity;
+import com.stylefeng.guns.modular.system.dao.TOrderCrossCityMapper;
+import com.stylefeng.guns.modular.system.service.ITOrderCrossCityService;
+import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * 订单-跨城 服务实现类
+ * </p>
+ *
+ * @author 吕雪
+ * @since 2020-09-16
+ */
+@Service
+public class TOrderCrossCityServiceImpl extends ServiceImpl<TOrderCrossCityMapper, TOrderCrossCity> implements ITOrderCrossCityService {
+
+ @Resource
+ private TOrderCrossCityMapper orderCrossCityMapper;
+
+ @Override
+ public List<Map<String, Object>> getCrossCityOrderList(Page<Map<String, Object>> page, String beginTime, String endTime, Integer roleType, Integer nowUserId, String orderNum, Integer orderSource, String userName, String userPhone, String passengers, String passengersPhone, Integer serverCarModelId, String driver, Integer lineId, Integer state) {
+ return this.baseMapper.getCrossCityOrderList(page, beginTime, endTime, roleType, nowUserId, orderNum, orderSource, userName, userPhone, passengers, passengersPhone, serverCarModelId, driver, lineId, state);
+ }
+
+ @Override
+ public Map<String, Object> getCrossCityOrderDetailById(Integer orderId) {
+ return this.baseMapper.getCrossCityOrderDetailById(orderId);
+ }
+
+ @Override
+ public List<TOrderCrossCity> queryOrders(Integer driverId, Integer lineShiftDriverId, List<Integer> state) {
+ return orderCrossCityMapper.queryOrders(driverId, lineShiftDriverId, state);
+ }
+
+ /**
+ * 获取订单编号
+ * @return
+ * @throws Exception
+ */
+ @Override
+ public synchronized String getOrderNum(Integer driverId, Integer lineShiftDriverId) throws Exception{
+ List<TOrderCrossCity> orderCrossCities = orderCrossCityMapper.queryOrders(driverId, lineShiftDriverId, Arrays.asList(2, 3, 4, 7));
+ if(orderCrossCities.size() > 0){
+ return orderCrossCities.get(0).getOrderNum();
+ }
+ int size = this.selectCount(null);
+ return "CROSS" + String.valueOf(1000000 + size + 1).substring(1);
+ }
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TOrderEvaluateServiceImpl.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TOrderEvaluateServiceImpl.java
new file mode 100644
index 0000000..040b372
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TOrderEvaluateServiceImpl.java
@@ -0,0 +1,28 @@
+package com.stylefeng.guns.modular.system.service.impl;
+
+import com.baomidou.mybatisplus.plugins.Page;
+import com.stylefeng.guns.modular.system.model.TOrderEvaluate;
+import com.stylefeng.guns.modular.system.dao.TOrderEvaluateMapper;
+import com.stylefeng.guns.modular.system.service.ITOrderEvaluateService;
+import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * 订单评价 服务实现类
+ * </p>
+ *
+ * @author 吕雪
+ * @since 2020-06-09
+ */
+@Service
+public class TOrderEvaluateServiceImpl extends ServiceImpl<TOrderEvaluateMapper, TOrderEvaluate> implements ITOrderEvaluateService {
+
+ @Override
+ public List<Map<String, Object>> getOrderEvaluateList(Page<Map<String, Object>> page, Integer roleType, Integer nowUserId, String beginTime, String endTime, String userName, String userPhone, String driverName, String driverPhone, String fraction, Integer orderType) {
+ return this.baseMapper.getOrderEvaluateList(page, roleType, nowUserId, beginTime, endTime, userName, userPhone, driverName, driverPhone, fraction, orderType);
+ }
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TOrderLogisticsServiceImpl.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TOrderLogisticsServiceImpl.java
new file mode 100644
index 0000000..01810cf
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TOrderLogisticsServiceImpl.java
@@ -0,0 +1,33 @@
+package com.stylefeng.guns.modular.system.service.impl;
+
+import com.baomidou.mybatisplus.plugins.Page;
+import com.stylefeng.guns.modular.system.model.TOrderLogistics;
+import com.stylefeng.guns.modular.system.dao.TOrderLogisticsMapper;
+import com.stylefeng.guns.modular.system.service.ITOrderLogisticsService;
+import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * 订单-小件物流 服务实现类
+ * </p>
+ *
+ * @author 吕雪
+ * @since 2020-09-24
+ */
+@Service
+public class TOrderLogisticsServiceImpl extends ServiceImpl<TOrderLogisticsMapper, TOrderLogistics> implements ITOrderLogisticsService {
+
+ @Override
+ public List<Map<String, Object>> getLogisticsOrderList(Page<Map<String, Object>> page, String beginTime, String endTime, Integer roleType, Integer nowUserId, String orderNum, Integer orderSource, Integer type, String userName, String userPhone, String recipient, String recipientPhone, String driver, Integer state) {
+ return this.baseMapper.getLogisticsOrderList(page, beginTime, endTime, roleType, nowUserId, orderNum, orderSource, type, userName, userPhone, recipient, recipientPhone, driver, state);
+ }
+
+ @Override
+ public Map<String, Object> getLogisticsOrderDetailById(Integer orderId) {
+ return this.baseMapper.getLogisticsOrderDetailById(orderId);
+ }
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TOrderPositionServiceImpl.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TOrderPositionServiceImpl.java
new file mode 100644
index 0000000..5d57d5d
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TOrderPositionServiceImpl.java
@@ -0,0 +1,20 @@
+package com.stylefeng.guns.modular.system.service.impl;
+
+import com.stylefeng.guns.modular.system.model.TOrderPosition;
+import com.stylefeng.guns.modular.system.dao.TOrderPositionMapper;
+import com.stylefeng.guns.modular.system.service.ITOrderPositionService;
+import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 订单坐标信息表 服务实现类
+ * </p>
+ *
+ * @author 吕雪
+ * @since 2020-06-08
+ */
+@Service
+public class TOrderPositionServiceImpl extends ServiceImpl<TOrderPositionMapper, TOrderPosition> implements ITOrderPositionService {
+
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TOrderPrivateCarServiceImpl.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TOrderPrivateCarServiceImpl.java
new file mode 100644
index 0000000..8144e9d
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TOrderPrivateCarServiceImpl.java
@@ -0,0 +1,33 @@
+package com.stylefeng.guns.modular.system.service.impl;
+
+import com.baomidou.mybatisplus.plugins.Page;
+import com.stylefeng.guns.modular.system.model.TOrderPrivateCar;
+import com.stylefeng.guns.modular.system.dao.TOrderPrivateCarMapper;
+import com.stylefeng.guns.modular.system.service.ITOrderPrivateCarService;
+import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * 订单-专车 服务实现类
+ * </p>
+ *
+ * @author 吕雪
+ * @since 2020-09-02
+ */
+@Service
+public class TOrderPrivateCarServiceImpl extends ServiceImpl<TOrderPrivateCarMapper, TOrderPrivateCar> implements ITOrderPrivateCarService {
+
+ @Override
+ public List<Map<String, Object>> getPrivateCarOrderList(Page<Map<String, Object>> page, String beginTime, String endTime, Integer roleType, Integer nowUserId, String orderNum, Integer orderSource, String userName, String userPhone, String passengers, String passengersPhone, Integer serverCarModelId, String driver, Integer state) {
+ return this.baseMapper.getPrivateCarOrderList(page, beginTime, endTime, roleType, nowUserId, orderNum, orderSource, userName, userPhone, passengers, passengersPhone, serverCarModelId, driver, state);
+ }
+
+ @Override
+ public Map<String, Object> getPrivateCarOrderDetailById(Integer orderId) {
+ return this.baseMapper.getPrivateCarOrderDetailById(orderId);
+ }
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TOrderTaxiServiceImpl.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TOrderTaxiServiceImpl.java
new file mode 100644
index 0000000..3dcf708
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TOrderTaxiServiceImpl.java
@@ -0,0 +1,56 @@
+package com.stylefeng.guns.modular.system.service.impl;
+
+import com.baomidou.mybatisplus.plugins.Page;
+import com.stylefeng.guns.modular.system.model.TOrderPosition;
+import com.stylefeng.guns.modular.system.model.TOrderTaxi;
+import com.stylefeng.guns.modular.system.dao.TOrderTaxiMapper;
+import com.stylefeng.guns.modular.system.service.ITOrderTaxiService;
+import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import com.stylefeng.guns.modular.system.util.ResultUtil;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * 订单-出租车 服务实现类
+ * </p>
+ *
+ * @author 吕雪
+ * @since 2020-06-08
+ */
+@Service
+public class TOrderTaxiServiceImpl extends ServiceImpl<TOrderTaxiMapper, TOrderTaxi> implements ITOrderTaxiService {
+
+ @Override
+ public List<Map<String, Object>> getTaxiOrderList(Page<Map<String, Object>> page, String beginTime, String endTime, Integer roleType, Integer nowUserId, String orderNum, Integer orderSource, String userName, String userPhone, String passengers, String passengersPhone, String driver, Integer state) {
+ return this.baseMapper.getTaxiOrderList(page, beginTime, endTime, roleType, nowUserId, orderNum, orderSource, userName, userPhone, passengers, passengersPhone, driver, state);
+ }
+
+ @Override
+ public Map<String, Object> getTaxiOrderDetailById(Integer orderId) {
+ return this.baseMapper.getTaxiOrderDetailById(orderId);
+ }
+
+ @Override
+ public List<Map<String, Object>> getCanSelectTaxiDriverList(Page<Map<String, Object>> page,Integer companyId, String name, String phone) {
+ return this.baseMapper.getCanSelectTaxiDriverList(page,companyId, name, phone);
+ }
+
+ @Override
+ public Integer getAllOrderNum(Integer companyId, String beginTime, String endTime) {
+ return this.baseMapper.getAllOrderNum(companyId, beginTime, endTime);
+ }
+
+ @Override
+ public Double getAllTradeMoney(Integer companyId, String beginTime, String endTime) {
+ return this.baseMapper.getAllTradeMoney(companyId, beginTime, endTime);
+ }
+
+ @Override
+ public Double getAllIncomeMoney(Integer companyId, String beginTime, String endTime) {
+ return this.baseMapper.getAllIncomeMoney(companyId, beginTime, endTime);
+ }
+
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TPhoneServiceImpl.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TPhoneServiceImpl.java
new file mode 100644
index 0000000..c8f505b
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TPhoneServiceImpl.java
@@ -0,0 +1,20 @@
+package com.stylefeng.guns.modular.system.service.impl;
+
+import com.stylefeng.guns.modular.system.model.TPhone;
+import com.stylefeng.guns.modular.system.dao.TPhoneMapper;
+import com.stylefeng.guns.modular.system.service.ITPhoneService;
+import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 系统电话设置 服务实现类
+ * </p>
+ *
+ * @author 吕雪
+ * @since 2020-06-09
+ */
+@Service
+public class TPhoneServiceImpl extends ServiceImpl<TPhoneMapper, TPhone> implements ITPhoneService {
+
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TProblemServiceImpl.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TProblemServiceImpl.java
new file mode 100644
index 0000000..5382b4f
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TProblemServiceImpl.java
@@ -0,0 +1,28 @@
+package com.stylefeng.guns.modular.system.service.impl;
+
+import com.baomidou.mybatisplus.plugins.Page;
+import com.stylefeng.guns.modular.system.model.TProblem;
+import com.stylefeng.guns.modular.system.dao.TProblemMapper;
+import com.stylefeng.guns.modular.system.service.ITProblemService;
+import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * 在线客服 服务实现类
+ * </p>
+ *
+ * @author 吕雪
+ * @since 2020-06-24
+ */
+@Service
+public class TProblemServiceImpl extends ServiceImpl<TProblemMapper, TProblem> implements ITProblemService {
+
+ @Override
+ public List<Map<String, Object>> getProblemList(Page<Map<String, Object>> page, String beginTime, String endTime, String userName, Integer state) {
+ return this.baseMapper.getProblemList(page, beginTime, endTime, userName, state);
+ }
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TPubTransactionDetailsServiceImpl.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TPubTransactionDetailsServiceImpl.java
new file mode 100644
index 0000000..70ac626
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TPubTransactionDetailsServiceImpl.java
@@ -0,0 +1,20 @@
+package com.stylefeng.guns.modular.system.service.impl;
+
+import com.stylefeng.guns.modular.system.model.TPubTransactionDetails;
+import com.stylefeng.guns.modular.system.dao.TPubTransactionDetailsMapper;
+import com.stylefeng.guns.modular.system.service.ITPubTransactionDetailsService;
+import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 交易明细(司机/用户) 服务实现类
+ * </p>
+ *
+ * @author 吕雪
+ * @since 2020-09-16
+ */
+@Service
+public class TPubTransactionDetailsServiceImpl extends ServiceImpl<TPubTransactionDetailsMapper, TPubTransactionDetails> implements ITPubTransactionDetailsService {
+
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TPubWithdrawalServiceImpl.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TPubWithdrawalServiceImpl.java
new file mode 100644
index 0000000..9efc967
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TPubWithdrawalServiceImpl.java
@@ -0,0 +1,28 @@
+package com.stylefeng.guns.modular.system.service.impl;
+
+import com.baomidou.mybatisplus.plugins.Page;
+import com.stylefeng.guns.modular.system.model.TPubWithdrawal;
+import com.stylefeng.guns.modular.system.dao.TPubWithdrawalMapper;
+import com.stylefeng.guns.modular.system.service.ITPubWithdrawalService;
+import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * 提现记录表(司机/用户) 服务实现类
+ * </p>
+ *
+ * @author 吕雪
+ * @since 2020-06-09
+ */
+@Service
+public class TPubWithdrawalServiceImpl extends ServiceImpl<TPubWithdrawalMapper, TPubWithdrawal> implements ITPubWithdrawalService {
+
+ @Override
+ public List<Map<String, Object>> getWithdrawalList(Page<Map<String, Object>> page, String beginTime, String endTime, String name, Integer withdrawalType) {
+ return this.baseMapper.getWithdrawalList(page, beginTime, endTime, name, withdrawalType);
+ }
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TReassignServiceImpl.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TReassignServiceImpl.java
new file mode 100644
index 0000000..0440f96
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TReassignServiceImpl.java
@@ -0,0 +1,55 @@
+package com.stylefeng.guns.modular.system.service.impl;
+
+import com.baomidou.mybatisplus.plugins.Page;
+import com.stylefeng.guns.modular.system.model.TReassign;
+import com.stylefeng.guns.modular.system.dao.TReassignMapper;
+import com.stylefeng.guns.modular.system.service.ITReassignService;
+import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * 订单改派 服务实现类
+ * </p>
+ *
+ * @author 吕雪
+ * @since 2020-09-03
+ */
+@Service
+public class TReassignServiceImpl extends ServiceImpl<TReassignMapper, TReassign> implements ITReassignService {
+
+ @Override
+ public List<Map<String, Object>> getPrivateCarReassignOrderList(Page<Map<String, Object>> page, Integer roleType, Integer nowUserId, String beginTime, String endTime, String originalDriverName, String originalDriverPhone, String orderNum, String nowDriverName, String nowDriverPhone, Integer orderState, Integer state) {
+ return this.baseMapper.getPrivateCarReassignOrderList(page, roleType, nowUserId, beginTime, endTime, originalDriverName, originalDriverPhone, orderNum, nowDriverName, nowDriverPhone, orderState, state);
+ }
+
+ @Override
+ public List<Map<String, Object>> getCanSelectPrivateCarDriverList(Page<Map<String, Object>> page, Integer companyId, String name, String phone) {
+ return this.baseMapper.getCanSelectPrivateCarDriverList(page, companyId, name, phone);
+ }
+
+ @Override
+ public List<Map<String, Object>> getCanSelectSmallDriverList(Page<Map<String, Object>> page, Integer companyId, Integer type, String name, String phone) {
+ return this.baseMapper.getCanSelectSmallDriverList(page, companyId, type, name, phone);
+ }
+
+
+ @Override
+ public List<Map<String, Object>> getCrossReassignOrderList(Page<Map<String, Object>> page, Integer roleType, Integer nowUserId, String beginTime, String endTime, String originalDriverName, String originalDriverPhone, String orderNum, String nowDriverName, String nowDriverPhone, Integer orderState, Integer state) {
+ return this.baseMapper.getCrossReassignOrderList(page, roleType, nowUserId, beginTime, endTime, originalDriverName, originalDriverPhone, orderNum, nowDriverName, nowDriverPhone, orderState, state);
+ }
+
+ @Override
+ public List<Map<String, Object>> getCanSelectCrossDriverList(Page<Map<String, Object>> page, Integer companyId, Integer serverCarModelId, Integer lineId, Integer lineShiftId, Date time, Integer num, String name, String phone, Integer driverId) {
+ return this.baseMapper.getCanSelectCrossDriverList(page, companyId, serverCarModelId, lineId, lineShiftId, time, num, name, phone, driverId);
+ }
+
+ @Override
+ public List<Map<String, Object>> getSmallPieceLogisticsList(Page<Map<String, Object>> page, Integer roleType, Integer nowUserId, String beginTime, String endTime, String originalDriverName, String originalDriverPhone, String orderNum, String nowDriverName, String nowDriverPhone, Integer orderState, Integer state) {
+ return this.baseMapper.getSmallPieceLogisticsList(page, roleType, nowUserId, beginTime, endTime, originalDriverName, originalDriverPhone, orderNum, nowDriverName, nowDriverPhone, orderState, state);
+ }
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TRegionServiceImpl.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TRegionServiceImpl.java
new file mode 100644
index 0000000..4820c3c
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TRegionServiceImpl.java
@@ -0,0 +1,20 @@
+package com.stylefeng.guns.modular.system.service.impl;
+
+import com.stylefeng.guns.modular.system.model.TRegion;
+import com.stylefeng.guns.modular.system.dao.TRegionMapper;
+import com.stylefeng.guns.modular.system.service.ITRegionService;
+import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 省市区三级联动 服务实现类
+ * </p>
+ *
+ * @author 吕雪
+ * @since 2020-06-02
+ */
+@Service
+public class TRegionServiceImpl extends ServiceImpl<TRegionMapper, TRegion> implements ITRegionService {
+
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TServerCarmodelServiceImpl.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TServerCarmodelServiceImpl.java
new file mode 100644
index 0000000..0cb05bb
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TServerCarmodelServiceImpl.java
@@ -0,0 +1,28 @@
+package com.stylefeng.guns.modular.system.service.impl;
+
+import com.baomidou.mybatisplus.plugins.Page;
+import com.stylefeng.guns.modular.system.model.TServerCarmodel;
+import com.stylefeng.guns.modular.system.dao.TServerCarmodelMapper;
+import com.stylefeng.guns.modular.system.service.ITServerCarmodelService;
+import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * 服务车型设置 服务实现类
+ * </p>
+ *
+ * @author 吕雪
+ * @since 2020-08-29
+ */
+@Service
+public class TServerCarmodelServiceImpl extends ServiceImpl<TServerCarmodelMapper, TServerCarmodel> implements ITServerCarmodelService {
+
+ @Override
+ public List<Map<String, Object>> getServerCarModelList(Page<Map<String, Object>> page, Integer type, String name, Integer state) {
+ return this.baseMapper.getServerCarModelList(page, type, name, state);
+ }
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TSiteServiceImpl.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TSiteServiceImpl.java
new file mode 100644
index 0000000..49d458c
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TSiteServiceImpl.java
@@ -0,0 +1,37 @@
+package com.stylefeng.guns.modular.system.service.impl;
+
+import com.baomidou.mybatisplus.plugins.Page;
+import com.stylefeng.guns.modular.system.model.TSite;
+import com.stylefeng.guns.modular.system.dao.TSiteMapper;
+import com.stylefeng.guns.modular.system.service.ITSiteService;
+import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * 线路站点 服务实现类
+ * </p>
+ *
+ * @author 吕雪
+ * @since 2020-09-04
+ */
+@Service
+public class TSiteServiceImpl extends ServiceImpl<TSiteMapper, TSite> implements ITSiteService {
+
+ @Resource
+ private TSiteMapper siteMapper;
+
+ @Override
+ public List<Map<String, Object>> getSiteList(Page<Map<String, Object>> page, String beginTime, String endTime, String name, String insertUser, String city, Integer state) {
+ return this.baseMapper.getSiteList(page, beginTime, endTime, name, insertUser, city, state);
+ }
+
+ @Override
+ public List<TSite> query(String provinceCode, String cityCode, String districtCode) {
+ return siteMapper.query(provinceCode, cityCode, districtCode);
+ }
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TSmsrecordServiceImpl.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TSmsrecordServiceImpl.java
new file mode 100644
index 0000000..865e62d
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TSmsrecordServiceImpl.java
@@ -0,0 +1,28 @@
+package com.stylefeng.guns.modular.system.service.impl;
+
+import com.baomidou.mybatisplus.plugins.Page;
+import com.stylefeng.guns.modular.system.model.TSmsrecord;
+import com.stylefeng.guns.modular.system.dao.TSmsrecordMapper;
+import com.stylefeng.guns.modular.system.service.ITSmsrecordService;
+import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * 验证码 服务实现类
+ * </p>
+ *
+ * @author 吕雪
+ * @since 2020-06-10
+ */
+@Service
+public class TSmsrecordServiceImpl extends ServiceImpl<TSmsrecordMapper, TSmsrecord> implements ITSmsrecordService {
+
+ @Override
+ public List<Map<String, Object>> getSmsCodeList(Page<Map<String, Object>> page, String beginTime, String endTime, String phone) {
+ return this.baseMapper.getSmsCodeList(page, beginTime, endTime, phone);
+ }
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TSysCancleOrderServiceImpl.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TSysCancleOrderServiceImpl.java
new file mode 100644
index 0000000..f50090f
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TSysCancleOrderServiceImpl.java
@@ -0,0 +1,20 @@
+package com.stylefeng.guns.modular.system.service.impl;
+
+import com.stylefeng.guns.modular.system.model.TSysCancleOrder;
+import com.stylefeng.guns.modular.system.dao.TSysCancleOrderMapper;
+import com.stylefeng.guns.modular.system.service.ITSysCancleOrderService;
+import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 系统设置-取消订单 服务实现类
+ * </p>
+ *
+ * @author 吕雪
+ * @since 2020-06-09
+ */
+@Service
+public class TSysCancleOrderServiceImpl extends ServiceImpl<TSysCancleOrderMapper, TSysCancleOrder> implements ITSysCancleOrderService {
+
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TSysFaceDistinguishServiceImpl.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TSysFaceDistinguishServiceImpl.java
new file mode 100644
index 0000000..3ddbbce
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TSysFaceDistinguishServiceImpl.java
@@ -0,0 +1,20 @@
+package com.stylefeng.guns.modular.system.service.impl;
+
+import com.stylefeng.guns.modular.system.model.TSysFaceDistinguish;
+import com.stylefeng.guns.modular.system.dao.TSysFaceDistinguishMapper;
+import com.stylefeng.guns.modular.system.service.ITSysFaceDistinguishService;
+import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 系统设置-人脸识别 服务实现类
+ * </p>
+ *
+ * @author 吕雪
+ * @since 2020-06-09
+ */
+@Service
+public class TSysFaceDistinguishServiceImpl extends ServiceImpl<TSysFaceDistinguishMapper, TSysFaceDistinguish> implements ITSysFaceDistinguishService {
+
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TSysIntegralServiceImpl.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TSysIntegralServiceImpl.java
new file mode 100644
index 0000000..382f991
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TSysIntegralServiceImpl.java
@@ -0,0 +1,20 @@
+package com.stylefeng.guns.modular.system.service.impl;
+
+import com.stylefeng.guns.modular.system.model.TSysIntegral;
+import com.stylefeng.guns.modular.system.dao.TSysIntegralMapper;
+import com.stylefeng.guns.modular.system.service.ITSysIntegralService;
+import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 系统设置-积分 服务实现类
+ * </p>
+ *
+ * @author 吕雪
+ * @since 2020-06-09
+ */
+@Service
+public class TSysIntegralServiceImpl extends ServiceImpl<TSysIntegralMapper, TSysIntegral> implements ITSysIntegralService {
+
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TSysPushOrderServiceImpl.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TSysPushOrderServiceImpl.java
new file mode 100644
index 0000000..787ffed
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TSysPushOrderServiceImpl.java
@@ -0,0 +1,20 @@
+package com.stylefeng.guns.modular.system.service.impl;
+
+import com.stylefeng.guns.modular.system.model.TSysPushOrder;
+import com.stylefeng.guns.modular.system.dao.TSysPushOrderMapper;
+import com.stylefeng.guns.modular.system.service.ITSysPushOrderService;
+import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 系统设置-推单 服务实现类
+ * </p>
+ *
+ * @author 吕雪
+ * @since 2020-06-09
+ */
+@Service
+public class TSysPushOrderServiceImpl extends ServiceImpl<TSysPushOrderMapper, TSysPushOrder> implements ITSysPushOrderService {
+
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TSysReformistServiceImpl.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TSysReformistServiceImpl.java
new file mode 100644
index 0000000..ae656aa
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TSysReformistServiceImpl.java
@@ -0,0 +1,20 @@
+package com.stylefeng.guns.modular.system.service.impl;
+
+import com.stylefeng.guns.modular.system.model.TSysReformist;
+import com.stylefeng.guns.modular.system.dao.TSysReformistMapper;
+import com.stylefeng.guns.modular.system.service.ITSysReformistService;
+import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 系统设置-改派 服务实现类
+ * </p>
+ *
+ * @author 吕雪
+ * @since 2020-06-09
+ */
+@Service
+public class TSysReformistServiceImpl extends ServiceImpl<TSysReformistMapper, TSysReformist> implements ITSysReformistService {
+
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TSysSensitiveWordsServiceImpl.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TSysSensitiveWordsServiceImpl.java
new file mode 100644
index 0000000..0b4cc48
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TSysSensitiveWordsServiceImpl.java
@@ -0,0 +1,28 @@
+package com.stylefeng.guns.modular.system.service.impl;
+
+import com.baomidou.mybatisplus.plugins.Page;
+import com.stylefeng.guns.modular.system.model.TSysSensitiveWords;
+import com.stylefeng.guns.modular.system.dao.TSysSensitiveWordsMapper;
+import com.stylefeng.guns.modular.system.service.ITSysSensitiveWordsService;
+import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * 系统设置-敏感词 服务实现类
+ * </p>
+ *
+ * @author 吕雪
+ * @since 2020-06-09
+ */
+@Service
+public class TSysSensitiveWordsServiceImpl extends ServiceImpl<TSysSensitiveWordsMapper, TSysSensitiveWords> implements ITSysSensitiveWordsService {
+
+ @Override
+ public List<Map<String, Object>> getSensitiveWordList(Page<Map<String, Object>> page, String beginTime, String endTime, String content) {
+ return this.baseMapper.getSensitiveWordList(page, beginTime, endTime, content);
+ }
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TSystemNoticeServiceImpl.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TSystemNoticeServiceImpl.java
new file mode 100644
index 0000000..55a2301
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TSystemNoticeServiceImpl.java
@@ -0,0 +1,20 @@
+package com.stylefeng.guns.modular.system.service.impl;
+
+import com.stylefeng.guns.modular.system.model.TSystemNotice;
+import com.stylefeng.guns.modular.system.dao.TSystemNoticeMapper;
+import com.stylefeng.guns.modular.system.service.ITSystemNoticeService;
+import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 系统通知 服务实现类
+ * </p>
+ *
+ * @author 吕雪
+ * @since 2020-06-10
+ */
+@Service
+public class TSystemNoticeServiceImpl extends ServiceImpl<TSystemNoticeMapper, TSystemNotice> implements ITSystemNoticeService {
+
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TSystemPriceServiceImpl.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TSystemPriceServiceImpl.java
new file mode 100644
index 0000000..06c8caa
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TSystemPriceServiceImpl.java
@@ -0,0 +1,28 @@
+package com.stylefeng.guns.modular.system.service.impl;
+
+import com.baomidou.mybatisplus.plugins.Page;
+import com.stylefeng.guns.modular.system.model.TSystemPrice;
+import com.stylefeng.guns.modular.system.dao.TSystemPriceMapper;
+import com.stylefeng.guns.modular.system.service.ITSystemPriceService;
+import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * 服务价格规则 服务实现类
+ * </p>
+ *
+ * @author 吕雪
+ * @since 2020-08-29
+ */
+@Service
+public class TSystemPriceServiceImpl extends ServiceImpl<TSystemPriceMapper, TSystemPrice> implements ITSystemPriceService {
+
+ @Override
+ public List<Map<String, Object>> getSpecialPriceList(Page<Map<String, Object>> page, Integer companyId, String name, Integer state) {
+ return this.baseMapper.getSpecialPriceList(page, companyId, name, state);
+ }
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TUserRedPacketRecordServiceImpl.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TUserRedPacketRecordServiceImpl.java
new file mode 100644
index 0000000..64fd315
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TUserRedPacketRecordServiceImpl.java
@@ -0,0 +1,20 @@
+package com.stylefeng.guns.modular.system.service.impl;
+
+import com.stylefeng.guns.modular.system.model.TUserRedPacketRecord;
+import com.stylefeng.guns.modular.system.dao.TUserRedPacketRecordMapper;
+import com.stylefeng.guns.modular.system.service.ITUserRedPacketRecordService;
+import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 用户红包记录 服务实现类
+ * </p>
+ *
+ * @author stylefeng
+ * @since 2020-07-10
+ */
+@Service
+public class TUserRedPacketRecordServiceImpl extends ServiceImpl<TUserRedPacketRecordMapper, TUserRedPacketRecord> implements ITUserRedPacketRecordService {
+
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TUserServiceImpl.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TUserServiceImpl.java
new file mode 100644
index 0000000..07176db
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TUserServiceImpl.java
@@ -0,0 +1,38 @@
+package com.stylefeng.guns.modular.system.service.impl;
+
+import com.baomidou.mybatisplus.plugins.Page;
+import com.stylefeng.guns.modular.system.model.TUser;
+import com.stylefeng.guns.modular.system.dao.TUserMapper;
+import com.stylefeng.guns.modular.system.service.ITUserService;
+import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * 用户信息 服务实现类
+ * </p>
+ *
+ * @author 吕雪
+ * @since 2020-06-01
+ */
+@Service
+public class TUserServiceImpl extends ServiceImpl<TUserMapper, TUser> implements ITUserService {
+
+ @Override
+ public List<Map<String, Object>> getUserList(Page<Map<String, Object>> page, String beginTime, String endTime,Integer roleType,Integer nowUserId, Integer isAuth, Integer state, String id, String nickName,String phone,String companyName) {
+ return this.baseMapper.getUserList(page, beginTime, endTime,roleType,nowUserId, isAuth, state, id, nickName,phone,companyName);
+ }
+
+ @Override
+ public Map<String, Object> getUserDetailById(Integer userId) {
+ return this.baseMapper.getUserDetailById(userId);
+ }
+
+ @Override
+ public List<Map<String, Object>> getUserListNoPage(Integer roleType, Integer nowUserId) {
+ return this.baseMapper.getUserListNoPage(roleType, nowUserId);
+ }
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TVerifiedServiceImpl.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TVerifiedServiceImpl.java
new file mode 100644
index 0000000..a8d20d8
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TVerifiedServiceImpl.java
@@ -0,0 +1,28 @@
+package com.stylefeng.guns.modular.system.service.impl;
+
+import com.baomidou.mybatisplus.plugins.Page;
+import com.stylefeng.guns.modular.system.model.TVerified;
+import com.stylefeng.guns.modular.system.dao.TVerifiedMapper;
+import com.stylefeng.guns.modular.system.service.ITVerifiedService;
+import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * 实名认证 服务实现类
+ * </p>
+ *
+ * @author 吕雪
+ * @since 2020-06-09
+ */
+@Service
+public class TVerifiedServiceImpl extends ServiceImpl<TVerifiedMapper, TVerified> implements ITVerifiedService {
+
+ @Override
+ public List<Map<String, Object>> getVerifiedList(Page<Map<String, Object>> page, String beginTime, String endTime, String userName, String userPhone, String name, Integer state) {
+ return this.baseMapper.getVerifiedList(page, beginTime, endTime, userName, userPhone, name, state);
+ }
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TVersionManagementServiceImpl.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TVersionManagementServiceImpl.java
new file mode 100644
index 0000000..501eeef
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TVersionManagementServiceImpl.java
@@ -0,0 +1,28 @@
+package com.stylefeng.guns.modular.system.service.impl;
+
+import com.baomidou.mybatisplus.plugins.Page;
+import com.stylefeng.guns.modular.system.model.TVersionManagement;
+import com.stylefeng.guns.modular.system.dao.TVersionManagementMapper;
+import com.stylefeng.guns.modular.system.service.ITVersionManagementService;
+import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * 版本管理 服务实现类
+ * </p>
+ *
+ * @author 吕雪
+ * @since 2020-06-10
+ */
+@Service
+public class TVersionManagementServiceImpl extends ServiceImpl<TVersionManagementMapper, TVersionManagement> implements ITVersionManagementService {
+
+ @Override
+ public List<Map<String, Object>> getVersionList(Page<Map<String, Object>> page, String beginTime, String endTime, String version) {
+ return this.baseMapper.getVersionList(page, beginTime, endTime, version);
+ }
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TransactionDetailsServiceImpl.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TransactionDetailsServiceImpl.java
new file mode 100644
index 0000000..85d7001
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TransactionDetailsServiceImpl.java
@@ -0,0 +1,48 @@
+package com.stylefeng.guns.modular.system.service.impl;
+
+import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import com.stylefeng.guns.modular.system.dao.TransactionDetailsMapper;
+import com.stylefeng.guns.modular.system.model.TransactionDetails;
+import com.stylefeng.guns.modular.system.service.ITransactionDetailsService;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Isolation;
+import org.springframework.transaction.annotation.Propagation;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.Date;
+
+
+@Service
+@Transactional(isolation = Isolation.READ_UNCOMMITTED, propagation = Propagation.REQUIRED, rollbackFor = Exception.class)
+public class TransactionDetailsServiceImpl extends ServiceImpl<TransactionDetailsMapper, TransactionDetails> implements ITransactionDetailsService {
+
+
+ /**
+ * 添加数据
+ * @param userId 对象id
+ * @param remark 备注
+ * @param money 金额
+ * @param state 状态（1=添加，2=减少）
+ * @param type 类型（1=金额，2=积分）
+ * @param userType 用户类型（1=用户，2=司机）
+ * @param orderType 订单类型（1=专车，2=出租车，3=城际，4=小件物流）
+ * @param orderId
+ * @throws Exception
+ */
+ @Override
+ public void saveData(Integer userId, String remark, Double money, Integer state, Integer type, Integer userType,
+ Integer orderType, Integer orderId) throws Exception {
+
+ TransactionDetails transactionDetails = new TransactionDetails();
+ transactionDetails.setInsertTime(new Date());
+ transactionDetails.setMoney(money);
+ transactionDetails.setOrderId(orderId);
+ transactionDetails.setOrderType(orderType);
+ transactionDetails.setRemark(remark);
+ transactionDetails.setState(state);
+ transactionDetails.setType(type);
+ transactionDetails.setUserId(userId);
+ transactionDetails.setUserType(userType);
+ this.insert(transactionDetails);
+ }
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/UserActivityBalanceServiceImpl.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/UserActivityBalanceServiceImpl.java
new file mode 100644
index 0000000..58789de
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/UserActivityBalanceServiceImpl.java
@@ -0,0 +1,20 @@
+package com.stylefeng.guns.modular.system.service.impl;
+
+import com.stylefeng.guns.modular.system.model.UserActivityBalance;
+import com.stylefeng.guns.modular.system.dao.UserActivityBalanceMapper;
+import com.stylefeng.guns.modular.system.service.IUserActivityBalanceService;
+import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 用户活动-充值 服务实现类
+ * </p>
+ *
+ * @author stylefeng
+ * @since 2020-06-19
+ */
+@Service
+public class UserActivityBalanceServiceImpl extends ServiceImpl<UserActivityBalanceMapper, UserActivityBalance> implements IUserActivityBalanceService {
+
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/UserActivityDiscount1ServiceImpl.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/UserActivityDiscount1ServiceImpl.java
new file mode 100644
index 0000000..e7a8078
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/UserActivityDiscount1ServiceImpl.java
@@ -0,0 +1,268 @@
+package com.stylefeng.guns.modular.system.service.impl;
+
+import com.stylefeng.guns.core.util.ToolUtil;
+import com.stylefeng.guns.modular.system.model.UserActivityDiscount1;
+import com.stylefeng.guns.modular.system.dao.UserActivityDiscount1Mapper;
+import com.stylefeng.guns.modular.system.service.ITCompanyService;
+import com.stylefeng.guns.modular.system.service.IUserActivityDiscount1Service;
+import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import org.apache.poi.hssf.usermodel.*;
+import org.apache.poi.ss.usermodel.CellType;
+import org.apache.poi.ss.usermodel.HorizontalAlignment;
+import org.apache.poi.ss.util.CellRangeAddress;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * 用户活动-折扣1 服务实现类
+ * </p>
+ *
+ * @author stylefeng
+ * @since 2020-06-19
+ */
+@Service
+public class UserActivityDiscount1ServiceImpl extends ServiceImpl<UserActivityDiscount1Mapper, UserActivityDiscount1> implements IUserActivityDiscount1Service {
+
+ @Resource
+ private UserActivityDiscount1Mapper userActivityDiscount1Mapper;
+
+ @Autowired
+ private ITCompanyService companyService;
+
+
+ /**
+ * 获取折扣统计
+ * @param name
+ * @param time
+ * @param companyId
+ * @param offset
+ * @param limit
+ * @return
+ * @throws Exception
+ */
+ @Override
+ public Map<String, Object> queryDiscount1(String name, String time, Integer companyId, Integer offset, Integer limit) throws Exception {
+ String start = null;
+ String end = null;
+ if(ToolUtil.isNotEmpty(time)){
+ start = time.split(" - ")[0];
+ end = time.split(" - ")[1];
+ }
+ List<Map<String, Object>> list = userActivityDiscount1Mapper.queryDiscount1(name, start, end, companyId, offset, limit);
+ int i = userActivityDiscount1Mapper.queryDiscount1Count(name, start, end, companyId);
+ Map<String, Object> map = new HashMap<>();
+ map.put("rows", list);
+ map.put("total", i);
+ return map;
+ }
+
+
+ /**
+ * 下载折扣优惠
+ * @param name
+ * @param time
+ * @param companyId
+ * @return
+ * @throws Exception
+ */
+ @Override
+ public HSSFWorkbook downloadDiscount1(String name, String time, Integer companyId) throws Exception {
+ String start = null;
+ String end = null;
+ if(ToolUtil.isNotEmpty(time)){
+ start = time.split(" - ")[0];
+ end = time.split(" - ")[1];
+ }
+ List<Map<String, Object>> maps = userActivityDiscount1Mapper.queryDiscount1(name, start, end, companyId, null, null);
+
+ List<List<String>> lists = new ArrayList<>();
+ List<String> list = new ArrayList<>();
+ list.add("活动名称：" + name);
+ list.add("起止时间：" + time);
+ list.add("运营商：" + (null != companyId ? companyService.selectById(companyId).getName() : ""));
+ lists.add(list);
+ list = new ArrayList<>();
+ list.add("时间");
+ list.add("使用情况");
+ list.add("");
+ lists.add(list);
+ list = new ArrayList<>();
+ list.add("");
+ list.add("折扣参与人数");
+ list.add("折扣金额");
+ lists.add(list);
+
+ List<List<List<String>>> lists1 = new ArrayList<>();
+ List<List<String>> lists2 = new ArrayList<>();
+ for(Map<String, Object> map : maps){
+ List<String> list2 = new ArrayList<>();
+ list2.add(null != map.get("time") ? map.get("time").toString() : "");
+ list2.add(null != map.get("userNum") ? map.get("userNum").toString() : "");
+ list2.add(null != map.get("discountMoney") ? map.get("discountMoney").toString() : "");
+ lists2.add(list2);
+ }
+ lists1.add(lists2);
+
+ HSSFWorkbook hssfWorkbook = new HSSFWorkbook();
+ HSSFSheet hssfSheet = hssfWorkbook.createSheet();
+ hssfSheet.setColumnWidth(0, 6 * 256);
+ hssfSheet.setDefaultRowHeightInPoints(20f);
+ for(int i = 0; i < lists.size(); i++){
+ HSSFRow hssfRow = hssfSheet.createRow(i);//设置第一行数据（标题）
+ HSSFCellStyle style = hssfWorkbook.createCellStyle();
+ HSSFFont font = hssfWorkbook.createFont();
+ font.setBold(true);
+ style.setFont(font);
+ style.setAlignment(HorizontalAlignment.CENTER);
+ for (int l = 0; l < lists.get(i).size(); l++) {
+ HSSFCell hssfCell = hssfRow.createCell(l);
+ hssfCell.setCellType(CellType.STRING);//设置表格类型
+ hssfCell.setCellValue(lists.get(i).get(l));
+ hssfCell.setCellStyle(style);
+ if(l > 0) {
+ hssfSheet.setColumnWidth(l , 20 * 256);
+ }
+
+ }
+ }
+ //这个就是合并单元格
+ //参数说明：1：开始行 2：结束行 3：开始列 4：结束列
+ //比如我要合并 第二行到第四行的 第六列到第八列 sheet.addMergedRegion(new CellRangeAddress(1,3,5,7));
+ hssfSheet.addMergedRegion(new CellRangeAddress(1,2,0,0));
+ hssfSheet.addMergedRegion(new CellRangeAddress(1,1,1,2));
+
+
+ for(int i = 0; i < lists1.size(); i++){
+ //将数据添加到表格中
+ List<String> data = null;
+ for (int l = 0; l < lists1.get(i).size(); l++) {
+ HSSFRow row = hssfSheet.createRow(l + 3);
+ data = lists1.get(i).get(l);
+ for (int j = 0; j < data.size(); j++) {
+ HSSFCell hssfCell = row.createCell(j);
+ hssfCell.setCellType(CellType.STRING);//设置表格类型
+ hssfCell.setCellValue(data.get(j));
+ }
+ }
+ }
+ return hssfWorkbook;
+ }
+
+
+ /**
+ * 获取折扣优惠详情
+ * @param name
+ * @param time
+ * @param companyId
+ * @param offset
+ * @param limit
+ * @return
+ * @throws Exception
+ */
+ @Override
+ public Map<String, Object> queryDiscountInfo(String name, String time, Integer companyId, Integer offset, Integer limit) throws Exception {
+ String start = null;
+ String end = null;
+ if(ToolUtil.isNotEmpty(time)){
+ start = time.split(" - ")[0];
+ end = time.split(" - ")[1];
+ }
+ List<Map<String, Object>> list = userActivityDiscount1Mapper.queryDiscountInfo(name, start, end, companyId, offset, limit);
+ int i = userActivityDiscount1Mapper.queryDiscountInfoCount(name, start, end, companyId);
+ Map<String, Object> map = new HashMap<>();
+ map.put("rows", list);
+ map.put("total", i);
+ return map;
+ }
+
+
+ /**
+ * 下载折扣优惠详情
+ * @param name
+ * @param time
+ * @param companyId
+ * @return
+ * @throws Exception
+ */
+ @Override
+ public HSSFWorkbook downloadDiscountInfo(String name, String time, Integer companyId) throws Exception {
+ String start = null;
+ String end = null;
+ if(ToolUtil.isNotEmpty(time)){
+ start = time.split(" - ")[0];
+ end = time.split(" - ")[1];
+ }
+ List<Map<String, Object>> maps = userActivityDiscount1Mapper.queryDiscountInfo(name, start, end, companyId, null, null);
+
+ List<List<String>> lists = new ArrayList<>();
+ List<String> list = new ArrayList<>();
+ list.add("活动名称：" + name);
+ list.add("起止时间：" + time);
+ list.add("运营商：");
+ list.add(null != companyId ? companyService.selectById(companyId).getName() : "");
+ lists.add(list);
+ list = new ArrayList<>();
+ list.add("打折时间");
+ list.add("打折使用人");
+ list.add("打折使用人电话");
+ list.add("打折金额");
+ lists.add(list);
+
+ List<List<List<String>>> lists1 = new ArrayList<>();
+ List<List<String>> lists2 = new ArrayList<>();
+ for(Map<String, Object> map : maps){
+ List<String> list2 = new ArrayList<>();
+ list2.add(null != map.get("time") ? map.get("time").toString() : "");
+ list2.add(null != map.get("name") ? map.get("name").toString() : "");
+ list2.add(null != map.get("phone") ? map.get("phone").toString() : "");
+ list2.add(null != map.get("discountMoney") ? map.get("discountMoney").toString() : "");
+ lists2.add(list2);
+ }
+ lists1.add(lists2);
+
+ HSSFWorkbook hssfWorkbook = new HSSFWorkbook();
+ HSSFSheet hssfSheet = hssfWorkbook.createSheet();
+ hssfSheet.setColumnWidth(0, 6 * 256);
+ hssfSheet.setDefaultRowHeightInPoints(20f);
+ for(int i = 0; i < lists.size(); i++){
+ HSSFRow hssfRow = hssfSheet.createRow(i);//设置第一行数据（标题）
+ HSSFCellStyle style = hssfWorkbook.createCellStyle();
+ HSSFFont font = hssfWorkbook.createFont();
+ font.setBold(true);
+ style.setFont(font);
+ style.setAlignment(HorizontalAlignment.CENTER);
+ for (int l = 0; l < lists.get(i).size(); l++) {
+ HSSFCell hssfCell = hssfRow.createCell(l);
+ hssfCell.setCellType(CellType.STRING);//设置表格类型
+ hssfCell.setCellValue(lists.get(i).get(l));
+ hssfCell.setCellStyle(style);
+ if(l > 0) {
+ hssfSheet.setColumnWidth(l , 20 * 256);
+ }
+
+ }
+ }
+
+ for(int i = 0; i < lists1.size(); i++){
+ //将数据添加到表格中
+ List<String> data = null;
+ for (int l = 0; l < lists1.get(i).size(); l++) {
+ HSSFRow row = hssfSheet.createRow(l + 2);
+ data = lists1.get(i).get(l);
+ for (int j = 0; j < data.size(); j++) {
+ HSSFCell hssfCell = row.createCell(j);
+ hssfCell.setCellType(CellType.STRING);//设置表格类型
+ hssfCell.setCellValue(data.get(j));
+ }
+ }
+ }
+ return hssfWorkbook;
+ }
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/UserActivityDiscount2ServiceImpl.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/UserActivityDiscount2ServiceImpl.java
new file mode 100644
index 0000000..f4aebc6
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/UserActivityDiscount2ServiceImpl.java
@@ -0,0 +1,20 @@
+package com.stylefeng.guns.modular.system.service.impl;
+
+import com.stylefeng.guns.modular.system.model.UserActivityDiscount2;
+import com.stylefeng.guns.modular.system.dao.UserActivityDiscount2Mapper;
+import com.stylefeng.guns.modular.system.service.IUserActivityDiscount2Service;
+import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 用户活动-折扣2（跨城） 服务实现类
+ * </p>
+ *
+ * @author stylefeng
+ * @since 2020-06-19
+ */
+@Service
+public class UserActivityDiscount2ServiceImpl extends ServiceImpl<UserActivityDiscount2Mapper, UserActivityDiscount2> implements IUserActivityDiscount2Service {
+
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/UserActivityInviteServiceImpl.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/UserActivityInviteServiceImpl.java
new file mode 100644
index 0000000..2546d6c
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/UserActivityInviteServiceImpl.java
@@ -0,0 +1,20 @@
+package com.stylefeng.guns.modular.system.service.impl;
+
+import com.stylefeng.guns.modular.system.model.UserActivityInvite;
+import com.stylefeng.guns.modular.system.dao.UserActivityInviteMapper;
+import com.stylefeng.guns.modular.system.service.IUserActivityInviteService;
+import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 用户活动-邀请 服务实现类
+ * </p>
+ *
+ * @author stylefeng
+ * @since 2020-06-19
+ */
+@Service
+public class UserActivityInviteServiceImpl extends ServiceImpl<UserActivityInviteMapper, UserActivityInvite> implements IUserActivityInviteService {
+
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/UserActivityRedenvelopeServiceImpl.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/UserActivityRedenvelopeServiceImpl.java
new file mode 100644
index 0000000..f70fcf7
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/UserActivityRedenvelopeServiceImpl.java
@@ -0,0 +1,20 @@
+package com.stylefeng.guns.modular.system.service.impl;
+
+import com.stylefeng.guns.modular.system.model.UserActivityRedenvelope;
+import com.stylefeng.guns.modular.system.dao.UserActivityRedenvelopeMapper;
+import com.stylefeng.guns.modular.system.service.IUserActivityRedenvelopeService;
+import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 用户活动-红包 服务实现类
+ * </p>
+ *
+ * @author stylefeng
+ * @since 2020-06-19
+ */
+@Service
+public class UserActivityRedenvelopeServiceImpl extends ServiceImpl<UserActivityRedenvelopeMapper, UserActivityRedenvelope> implements IUserActivityRedenvelopeService {
+
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/UserActivityRegisteredServiceImpl.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/UserActivityRegisteredServiceImpl.java
new file mode 100644
index 0000000..44b2ace
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/UserActivityRegisteredServiceImpl.java
@@ -0,0 +1,20 @@
+package com.stylefeng.guns.modular.system.service.impl;
+
+import com.stylefeng.guns.modular.system.model.UserActivityRegistered;
+import com.stylefeng.guns.modular.system.dao.UserActivityRegisteredMapper;
+import com.stylefeng.guns.modular.system.service.IUserActivityRegisteredService;
+import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 用户活动-注册 服务实现类
+ * </p>
+ *
+ * @author stylefeng
+ * @since 2020-06-19
+ */
+@Service
+public class UserActivityRegisteredServiceImpl extends ServiceImpl<UserActivityRegisteredMapper, UserActivityRegistered> implements IUserActivityRegisteredService {
+
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/UserActivityServiceImpl.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/UserActivityServiceImpl.java
new file mode 100644
index 0000000..caf80bc
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/UserActivityServiceImpl.java
@@ -0,0 +1,293 @@
+package com.stylefeng.guns.modular.system.service.impl;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.stylefeng.guns.core.shiro.ShiroKit;
+import com.stylefeng.guns.core.shiro.ShiroUser;
+import com.stylefeng.guns.core.util.DateUtil;
+import com.stylefeng.guns.core.util.SinataUtil;
+import com.stylefeng.guns.modular.system.model.*;
+import com.stylefeng.guns.modular.system.dao.UserActivityMapper;
+import com.stylefeng.guns.modular.system.service.*;
+import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * 用户活动主表 服务实现类
+ * </p>
+ *
+ * @author stylefeng
+ * @since 2020-06-19
+ */
+@Service
+public class UserActivityServiceImpl extends ServiceImpl<UserActivityMapper, UserActivity> implements IUserActivityService {
+ @Resource
+ private UserActivityMapper userActivityMapper;
+
+ @Autowired
+ private ISysRedPacketRecordService redPacketRecordService;
+
+ @Autowired
+ private IUserActivityBalanceService userActivityBalanceService;
+
+ @Autowired
+ private IUserActivityDiscount1Service userActivityDiscount1Service;
+
+ @Autowired
+ private IUserActivityInviteService userActivityInviteService;
+
+ @Autowired
+ private IUserActivityRedenvelopeService userActivityRedenvelopeService;
+
+ @Autowired
+ private IUserActivityRegisteredService userActivityRegisteredService;
+
+ @Autowired
+ private IUserService userService;
+
+ @Override
+ public void insertOrUpdate(Integer id, String name, String startTime, Integer registCouponId, Integer registEnable, Integer registNumber, Integer registEffective,
+ Integer inviteCouponId, Integer inviteEnable, Integer inviteNumber, Integer inviteEffective, Integer balanceEnable, String balanceInfo,
+ Integer discountEnable, Double discountSpecial, Double discountTaxi, Double discountLogistics, Integer redenvelopeId, Integer redenvelopeEnable,
+ Double registerPrice, Double invitationPrice, Double redPrice) {
+ if(id==null){
+ String[] timeArray = startTime.split(" - ");
+ Date startTimes = DateUtil.getDate_str3(timeArray[0]);
+ Date endTimes = DateUtil.getDate_str3(timeArray[1]);
+ ShiroUser user = ShiroKit.getUser();
+ Date nowDay = new Date();
+ UserActivity userActivity = new UserActivity();
+ userActivity.setInsertTime(nowDay);
+ userActivity.setCompanyId(ShiroKit.getUser().getObjectId());
+ userActivity.setCompanyType(ShiroKit.getUser().getRoleType());
+ userActivity.setStatus(userActivity.getCompanyType()==1?3:1);
+ userActivity.setName(name);
+ userActivity.setStartTime(startTimes);
+ userActivity.setEndTime(endTimes);
+ userActivity.insertOrUpdate();
+ //添加注册奖励
+ if(registCouponId!=null){
+ UserActivityRegistered userActivityRegistered = new UserActivityRegistered();
+ userActivityRegistered.setCouponId(registCouponId);
+ userActivityRegistered.setEnable(registEnable);
+ userActivityRegistered.setEndTime(endTimes);
+ userActivityRegistered.setStartTime(startTimes);
+ userActivityRegistered.setTotalNum(registNumber);
+ userActivityRegistered.setLaveNum(registNumber);
+ userActivityRegistered.setUserActivityId(userActivity.getId());
+ userActivityRegistered.setEffective(registEffective);
+ userActivityRegistered.setTotalPrice(registerPrice);
+ userActivityRegistered.setLavePrice(registerPrice);
+ userActivityRegistered.insertOrUpdate();
+ }
+ //添加邀请奖励
+ if(inviteCouponId!=null){
+ UserActivityInvite userActivityInvite = new UserActivityInvite();
+ userActivityInvite.setCouponId(inviteCouponId);
+ userActivityInvite.setEnable(inviteEnable);
+ userActivityInvite.setEndTime(endTimes);
+ userActivityInvite.setStartTime(startTimes);
+ userActivityInvite.setTotalNum(inviteNumber);
+ userActivityInvite.setLaveNum(inviteNumber);
+ userActivityInvite.setUserActivityId(userActivity.getId());
+ userActivityInvite.setEffective(inviteEffective);
+ userActivityInvite.setTotalPrice(invitationPrice);
+ userActivityInvite.setLavePrice(invitationPrice);
+ userActivityInvite.insertOrUpdate();
+ }
+ //添加充值赠送
+ JSONArray jsonArray = JSON.parseArray(balanceInfo);
+ if(jsonArray.size()>0){
+ for(int i=0;i<jsonArray.size();i++){
+ JSONObject jsonObject = jsonArray.getJSONObject(i);
+ UserActivityBalance userActivityBalance = new UserActivityBalance();
+ userActivityBalance.setEnable(balanceEnable);
+ userActivityBalance.setUserActivityId(userActivity.getId());
+ userActivityBalance.setInsertTime(nowDay);
+ userActivityBalance.setStartTime(startTimes);
+ userActivityBalance.setEndTime(endTimes);
+ userActivityBalance.setGeneralCouponId(jsonObject.getInteger("id1"));
+ userActivityBalance.setSpecialCouponId(jsonObject.getInteger("id2"));
+ userActivityBalance.setTaxiCouponId(jsonObject.getInteger("id3"));
+ userActivityBalance.setIntercityCouponId(jsonObject.getInteger("id4"));
+ userActivityBalance.setEffective(jsonObject.getInteger("num10"));
+ userActivityBalance.setMoney(jsonObject.getDouble("num1"));
+ userActivityBalance.setGeneralNum(jsonObject.getInteger("num2"));
+ userActivityBalance.setGeneralCouponMoney(jsonObject.getDouble("num3"));
+ userActivityBalance.setSpecialNum(jsonObject.getInteger("num4"));
+ userActivityBalance.setSpecialCouponMoney(jsonObject.getDouble("num5"));
+ userActivityBalance.setTaxiNum(jsonObject.getInteger("num6"));
+ userActivityBalance.setTaxiCouponMoney(jsonObject.getDouble("num7"));
+ userActivityBalance.setIntercityNum(jsonObject.getInteger("num8"));
+ userActivityBalance.setIntercityCouponMoney(jsonObject.getDouble("num9"));
+ userActivityBalance.setTotalPrice(jsonObject.getDouble("num11"));
+ userActivityBalance.setLavePrice(jsonObject.getDouble("num11"));
+ userActivityBalance.insertOrUpdate();
+ }
+ }
+ //添加打折活动
+ if(SinataUtil.isNotEmpty(discountSpecial) ||
+ SinataUtil.isNotEmpty(discountTaxi) ||
+ SinataUtil.isNotEmpty(discountLogistics)){
+ UserActivityDiscount1 userActivityDiscount1 = new UserActivityDiscount1();
+ userActivityDiscount1.setUserActivityId(userActivity.getId());
+ userActivityDiscount1.setStartTime(startTimes);
+ userActivityDiscount1.setEndTime(endTimes);
+ userActivityDiscount1.setEnable(discountEnable);
+ userActivityDiscount1.setSpecial(SinataUtil.isEmpty(discountSpecial) ?10:discountSpecial);
+ userActivityDiscount1.setTaxi(SinataUtil.isEmpty(discountTaxi) ?10:discountTaxi);
+ userActivityDiscount1.setLogistics(SinataUtil.isEmpty(discountLogistics) ?10:discountLogistics);
+ userActivityDiscount1.insertOrUpdate();
+ }
+ //添加红包活动
+ if(redenvelopeId!=null){
+ UserActivityRedenvelope userActivityRedenvelope = new UserActivityRedenvelope();
+ userActivityRedenvelope.setUserActivityId(userActivity.getId());
+ userActivityRedenvelope.setStartTime(startTimes);
+ userActivityRedenvelope.setEndTime(endTimes);
+ userActivityRedenvelope.setEnable(redenvelopeEnable);
+ userActivityRedenvelope.setRedEnvelopeId(redenvelopeId);
+ SysRedPacketRecord redPacketRecord = redPacketRecordService.selectById(redenvelopeId);
+ userActivityRedenvelope.setTotalMoney(redPacketRecord.getTotalMoney().doubleValue());
+ userActivityRedenvelope.setLaveMoney(redPacketRecord.getTotalMoney().doubleValue());
+ userActivityRedenvelope.setTotalPrice(redPrice);
+ userActivityRedenvelope.setLavePrice(redPrice);
+ userActivityRedenvelope.insertOrUpdate();
+ }
+ }else{
+ String[] timeArray = startTime.split(" - ");
+ Date startTimes = DateUtil.getDate_str3(timeArray[0]);
+ Date endTimes = DateUtil.getDate_str3(timeArray[1]);
+ ShiroUser user = ShiroKit.getUser();
+ Date nowDay = new Date();
+ UserActivity userActivity = new UserActivity();
+ userActivity.setId(id);
+ userActivity.setInsertTime(nowDay);
+ userActivity.setCompanyId(ShiroKit.getUser().getObjectId());
+ userActivity.setCompanyType(ShiroKit.getUser().getRoleType());
+ userActivity.setStatus(userActivity.getCompanyType()==1?3:1);
+ userActivity.setName(name);
+ userActivity.setStartTime(startTimes);
+ userActivity.setEndTime(endTimes);
+ userActivity.insertOrUpdate();
+ userActivityBalanceService.delete(new EntityWrapper<UserActivityBalance>().eq("userActivityId",id));
+ userActivityDiscount1Service.delete(new EntityWrapper<UserActivityDiscount1>().eq("userActivityId",id));
+ userActivityInviteService.delete(new EntityWrapper<UserActivityInvite>().eq("userActivityId",id));
+ userActivityRedenvelopeService.delete(new EntityWrapper<UserActivityRedenvelope>().eq("userActivityId",id));
+ userActivityRegisteredService.delete(new EntityWrapper<UserActivityRegistered>().eq("userActivityId",id));
+ //添加注册奖励
+ if(registCouponId!=null){
+ UserActivityRegistered userActivityRegistered = new UserActivityRegistered();
+ userActivityRegistered.setCouponId(registCouponId);
+ userActivityRegistered.setEnable(registEnable);
+ userActivityRegistered.setEndTime(endTimes);
+ userActivityRegistered.setStartTime(startTimes);
+ userActivityRegistered.setTotalNum(registNumber);
+ userActivityRegistered.setLaveNum(registNumber);
+ userActivityRegistered.setUserActivityId(userActivity.getId());
+ userActivityRegistered.setEffective(registEffective);
+ userActivityRegistered.setTotalPrice(registerPrice);
+ userActivityRegistered.setLavePrice(registerPrice);
+ userActivityRegistered.insertOrUpdate();
+ }
+ //添加邀请奖励
+ if(inviteCouponId!=null){
+ UserActivityInvite userActivityInvite = new UserActivityInvite();
+ userActivityInvite.setCouponId(inviteCouponId);
+ userActivityInvite.setEnable(inviteEnable);
+ userActivityInvite.setEndTime(endTimes);
+ userActivityInvite.setStartTime(startTimes);
+ userActivityInvite.setTotalNum(inviteNumber);
+ userActivityInvite.setLaveNum(inviteNumber);
+ userActivityInvite.setUserActivityId(userActivity.getId());
+ userActivityInvite.setEffective(inviteEffective);
+ userActivityInvite.setTotalPrice(invitationPrice);
+ userActivityInvite.setLavePrice(invitationPrice);
+ userActivityInvite.insertOrUpdate();
+ }
+ //添加充值赠送
+ JSONArray jsonArray = JSON.parseArray(balanceInfo);
+ if(jsonArray.size()>0){
+ for(int i=0;i<jsonArray.size();i++){
+ JSONObject jsonObject = jsonArray.getJSONObject(i);
+ UserActivityBalance userActivityBalance = new UserActivityBalance();
+ userActivityBalance.setEnable(balanceEnable);
+ userActivityBalance.setUserActivityId(userActivity.getId());
+ userActivityBalance.setInsertTime(nowDay);
+ userActivityBalance.setStartTime(startTimes);
+ userActivityBalance.setEndTime(endTimes);
+ userActivityBalance.setEffective(jsonObject.getInteger("num10"));
+ userActivityBalance.setMoney(jsonObject.getDouble("num1"));
+ userActivityBalance.setGeneralNum(jsonObject.getInteger("num2"));
+ userActivityBalance.setGeneralCouponMoney(jsonObject.getDouble("num3"));
+ userActivityBalance.setSpecialNum(jsonObject.getInteger("num4"));
+ userActivityBalance.setSpecialCouponMoney(jsonObject.getDouble("num5"));
+ userActivityBalance.setTaxiNum(jsonObject.getInteger("num6"));
+ userActivityBalance.setTaxiCouponMoney(jsonObject.getDouble("num7"));
+ userActivityBalance.setIntercityNum(jsonObject.getInteger("num8"));
+ userActivityBalance.setIntercityCouponMoney(jsonObject.getDouble("num9"));
+ userActivityBalance.setTotalPrice(jsonObject.getDouble("num11"));
+ userActivityBalance.setLavePrice(jsonObject.getDouble("num11"));
+ userActivityBalance.insertOrUpdate();
+
+ }
+ }
+ //添加打折活动
+ UserActivityDiscount1 userActivityDiscount1 = new UserActivityDiscount1();
+ userActivityDiscount1.setUserActivityId(userActivity.getId());
+ userActivityDiscount1.setStartTime(startTimes);
+ userActivityDiscount1.setEndTime(endTimes);
+ userActivityDiscount1.setEnable(discountEnable);
+ userActivityDiscount1.setSpecial(SinataUtil.isEmpty(discountSpecial) ?10d:discountSpecial);
+ userActivityDiscount1.setTaxi(SinataUtil.isEmpty(discountTaxi) ?10d:discountTaxi);
+ userActivityDiscount1.setLogistics(SinataUtil.isEmpty(discountLogistics) ?10d:discountLogistics);
+ userActivityDiscount1.insertOrUpdate();
+ //添加红包活动
+ if(redenvelopeId!=null){
+ UserActivityRedenvelope userActivityRedenvelope = new UserActivityRedenvelope();
+ userActivityRedenvelope.setUserActivityId(userActivity.getId());
+ userActivityRedenvelope.setStartTime(startTimes);
+ userActivityRedenvelope.setEndTime(endTimes);
+ userActivityRedenvelope.setEnable(redenvelopeEnable);
+ userActivityRedenvelope.setRedEnvelopeId(redenvelopeId);
+ SysRedPacketRecord redPacketRecord = redPacketRecordService.selectById(redenvelopeId);
+ userActivityRedenvelope.setTotalMoney(redPacketRecord.getTotalMoney().doubleValue());
+ userActivityRedenvelope.setLaveMoney(redPacketRecord.getTotalMoney().doubleValue());
+ userActivityRedenvelope.setTotalPrice(redPrice);
+ userActivityRedenvelope.setLavePrice(redPrice);
+ userActivityRedenvelope.insertOrUpdate();
+ }
+ }
+ }
+
+ /**
+ * 获取列表数据
+ * @param start
+ * @param end
+ * @param name
+ * @param status
+ * @param offset
+ * @param limit
+ * @return
+ */
+ @Override
+ public Map<String, Object> queryUserActivityList(Integer uid, Date start, Date end, String name, Integer status, Integer offset, Integer limit) {
+ Map<String, Object> map = new HashMap<>();
+ Integer objectId = userService.selectById(uid).getObjectId();
+ List<Map<String, Object>> list = userActivityMapper.queryUserActivityList(objectId, start, end, name, status, offset, limit);
+ int i = userActivityMapper.queryUserActivityListCount(objectId, start, end, name, status);
+ map.put("rows", list);
+ map.put("total", i);
+ return map;
+ }
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/UserCouponRecordServiceImpl.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/UserCouponRecordServiceImpl.java
new file mode 100644
index 0000000..8dd09b3
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/UserCouponRecordServiceImpl.java
@@ -0,0 +1,483 @@
+package com.stylefeng.guns.modular.system.service.impl;
+
+import com.baomidou.mybatisplus.plugins.Page;
+import com.stylefeng.guns.core.util.ToolUtil;
+import com.stylefeng.guns.modular.system.model.UserCouponRecord;
+import com.stylefeng.guns.modular.system.dao.UserCouponRecordMapper;
+import com.stylefeng.guns.modular.system.service.ITCompanyService;
+import com.stylefeng.guns.modular.system.service.IUserCouponRecordService;
+import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import org.apache.poi.hssf.usermodel.*;
+import org.apache.poi.ss.usermodel.CellType;
+import org.apache.poi.ss.usermodel.HorizontalAlignment;
+import org.apache.poi.ss.util.CellRangeAddress;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * 用户优惠券记录 服务实现类
+ * </p>
+ *
+ * @author stylefeng
+ * @since 2020-06-17
+ */
+@Service
+public class UserCouponRecordServiceImpl extends ServiceImpl<UserCouponRecordMapper, UserCouponRecord> implements IUserCouponRecordService {
+
+ @Autowired
+ private ITCompanyService companyService;
+
+
+
+
+
+ @Override
+ public List<Map<String, Object>> getList(Page<Map<String, Object>> page, String beginTime, String endTime, String userName, String userPhone, Integer couponActivityId, Integer activityType,Integer state) {
+ return this.baseMapper.getList(page,beginTime,endTime,userName,userPhone,couponActivityId,activityType,state);
+ }
+ @Override
+ public List<Map<String, Object>> getRedList(Page<Map<String, Object>> page, String beginTime, String endTime, String userName, String userPhone, Integer couponActivityId,Integer state) {
+ return this.baseMapper.getRedList(page,beginTime,endTime,userName,userPhone,couponActivityId,state);
+ }
+ @Override
+ public Map<String, Object> getCouponStatic(String beginTime, String endTime, Integer activityId, Integer activityType) {
+ return this.baseMapper.getCouponStatic(beginTime,endTime,activityId,activityType);
+ }
+
+ @Override
+ public Map<String, Object> getRedStatic(String beginTime, String endTime, Integer activityId) {
+ return this.baseMapper.getRedStatic(beginTime,endTime,activityId);
+ }
+
+ @Override
+ public Map<String, Object> getRegStatic(String beginTime, String endTime, Integer activityId) {
+ return this.baseMapper.getRegStatic(beginTime,endTime,activityId);
+ }
+
+ @Override
+ public Map<String, Object> getDiscountStatic(String beginTime, String endTime, Integer activityId) {
+ return this.baseMapper.getDiscountStatic(beginTime,endTime,activityId);
+ }
+
+ @Override
+ public List<Map<String, Object>> getBlanceList(Page<Map<String, Object>> page, String beginTime, String endTime, Integer activityId) {
+ return this.baseMapper.getBlanceList(page,beginTime,endTime,activityId);
+ }
+
+
+ /**
+ * 获取优惠券领取统计
+ * @param type
+ * @param name
+ * @param time
+ * @param companyId
+ * @param offset
+ * @param limit
+ * @return
+ * @throws Exception
+ */
+ @Override
+ public Map<String, Object> queryCouponRegister(Integer type, String name, String time, Integer companyId, Integer offset, Integer limit) throws Exception {
+ Map<String, Object> map = new HashMap<>();
+ String start = null;
+ String end = null;
+ if(ToolUtil.isNotEmpty(time)){
+ start = time.split(" - ")[0];
+ end = time.split(" - ")[1];
+ }
+ List<Map<String, Object>> list = this.baseMapper.queryCouponRegister(type, name, start, end, companyId, offset, limit);
+ int i = this.baseMapper.queryCouponRegisterCount(type, name, start, end, companyId);
+ map.put("rows", list);
+ map.put("total", i);
+ return map;
+ }
+
+ /**
+ * 下载优惠券领取数据
+ * @param type
+ * @param name
+ * @param time
+ * @param companyId
+ * @return
+ * @throws Exception
+ */
+ @Override
+ public HSSFWorkbook downloadCouponRegister(Integer type, String name, String time, Integer companyId) throws Exception {
+ String start = null;
+ String end = null;
+ if(ToolUtil.isNotEmpty(time)){
+ start = time.split(" - ")[0];
+ end = time.split(" - ")[1];
+ }
+ List<Map<String, Object>> maps = this.baseMapper.queryCouponRegister(type, name, start, end, companyId, null, null);
+ List<List<String>> lists = new ArrayList<>();
+ List<String> list = new ArrayList<>();
+ list.add("活动名称：");
+ list.add(name);
+ if(type == 2){
+ list.add("");
+ }
+ list.add("起止时间：");
+ list.add(time);
+ list.add("");
+ list.add("运营商：");
+ list.add(null != companyId ? companyService.selectById(companyId).getName() : "");
+ lists.add(list);
+ list = new ArrayList<>();
+ list.add("时间");
+ list.add("领取情况");
+ if(type == 2){
+ list.add("");
+ }
+ list.add("");
+ list.add("");
+ list.add("使用情况");
+ list.add("");
+ list.add("");
+ lists.add(list);
+ list = new ArrayList<>();
+ list.add("");
+ list.add("注册领取人数");
+ if(type == 2){
+ list.add("赠送派发人数");
+ }
+ list.add("合计");
+ list.add("领取金额");
+ list.add("使用人数");
+ list.add("使用张数");
+ list.add("使用金额");
+ lists.add(list);
+
+ List<List<List<String>>> lists1 = new ArrayList<>();
+ List<List<String>> lists2 = new ArrayList<>();
+ for(Map<String, Object> map : maps){
+ List<String> list2 = new ArrayList<>();
+ list2.add(null != map.get("time") ? map.get("time").toString() : "");
+ list2.add(null != map.get("receivePeople") ? map.get("receivePeople").toString() : "");
+ if(type == 2){
+ list2.add(null != map.get("giving") ? map.get("giving").toString() : "");
+ }
+ list2.add(null != map.get("receive") ? map.get("receive").toString() : "");
+ list2.add(null != map.get("receiveMoney") ? map.get("receiveMoney").toString() : "");
+ list2.add(null != map.get("usePeople") ? map.get("usePeople").toString() : "");
+ list2.add(null != map.get("use") ? map.get("use").toString() : "");
+ list2.add(null != map.get("useMoney") ? map.get("useMoney").toString() : "");
+ lists2.add(list2);
+ }
+ lists1.add(lists2);
+
+ HSSFWorkbook hssfWorkbook = new HSSFWorkbook();
+ HSSFSheet hssfSheet = hssfWorkbook.createSheet();
+ hssfSheet.setColumnWidth(0, 6 * 256);
+ hssfSheet.setDefaultRowHeightInPoints(20f);
+ for(int i = 0; i < lists.size(); i++){
+ HSSFRow hssfRow = hssfSheet.createRow(i);//设置第一行数据（标题）
+ HSSFCellStyle style = hssfWorkbook.createCellStyle();
+ HSSFFont font = hssfWorkbook.createFont();
+ font.setBold(true);
+ style.setFont(font);
+ style.setAlignment(HorizontalAlignment.CENTER);
+ for (int l = 0; l < lists.get(i).size(); l++) {
+ HSSFCell hssfCell = hssfRow.createCell(l);
+ hssfCell.setCellType(CellType.STRING);//设置表格类型
+ hssfCell.setCellValue(lists.get(i).get(l));
+ hssfCell.setCellStyle(style);
+ if(l > 0) {
+ hssfSheet.setColumnWidth(l , 20 * 256);
+ }
+
+ }
+ }
+ //这个就是合并单元格
+ //参数说明：1：开始行 2：结束行 3：开始列 4：结束列
+ //比如我要合并 第二行到第四行的 第六列到第八列 sheet.addMergedRegion(new CellRangeAddress(1,3,5,7));
+ if(type == 2){
+ hssfSheet.addMergedRegion(new CellRangeAddress(0,0,1,2));
+ hssfSheet.addMergedRegion(new CellRangeAddress(0,0,4,5));
+ hssfSheet.addMergedRegion(new CellRangeAddress(1,2,0,0));
+ hssfSheet.addMergedRegion(new CellRangeAddress(1,1,1,4));
+ hssfSheet.addMergedRegion(new CellRangeAddress(1,1,5,7));
+ }else{
+ hssfSheet.addMergedRegion(new CellRangeAddress(0,0,3,4));
+ hssfSheet.addMergedRegion(new CellRangeAddress(1,2,0,0));
+ hssfSheet.addMergedRegion(new CellRangeAddress(1,1,1,3));
+ hssfSheet.addMergedRegion(new CellRangeAddress(1,1,4,6));
+ }
+
+
+
+ for(int i = 0; i < lists1.size(); i++){
+ //将数据添加到表格中
+ List<String> data = null;
+ for (int l = 0; l < lists1.get(i).size(); l++) {
+ HSSFRow row = hssfSheet.createRow(l + 3);
+ data = lists1.get(i).get(l);
+ for (int j = 0; j < data.size(); j++) {
+ HSSFCell hssfCell = row.createCell(j);
+ hssfCell.setCellType(CellType.STRING);//设置表格类型
+ hssfCell.setCellValue(data.get(j));
+ }
+ }
+ }
+ return hssfWorkbook;
+ }
+
+
+ /**
+ * 获取优惠券统计明细
+ * @param type
+ * @param name
+ * @param time
+ * @param companyId
+ * @param offset
+ * @param limit
+ * @return
+ * @throws Exception
+ */
+ @Override
+ public Map<String, Object> queryCouponRegisterInfo(Integer type, String name, String time, Integer companyId, Integer offset, Integer limit) throws Exception {
+ String start = null;
+ String end = null;
+ if(ToolUtil.isNotEmpty(time)){
+ start = time.split(" - ")[0];
+ end = time.split(" - ")[1];
+ }
+ List<Map<String, Object>> list = this.baseMapper.queryCouponRegisterInfo(type, name, start, end, companyId, offset, limit);
+ int i = this.baseMapper.queryCouponRegisterInfoCount(type, name, start, end, companyId);
+ Map<String, Object> map = new HashMap<>();
+ map.put("rows", list);
+ map.put("total", i);
+ return map;
+ }
+
+ @Override
+ public HSSFWorkbook downloadCouponRegisterInfo(Integer type, String name, String time, Integer companyId) {
+ String start = null;
+ String end = null;
+ if(ToolUtil.isNotEmpty(time)){
+ start = time.split(" - ")[0];
+ end = time.split(" - ")[1];
+ }
+ List<Map<String, Object>> maps = this.baseMapper.queryCouponRegisterInfo(type, name, start, end, companyId, null, null);
+
+ List<List<String>> lists = new ArrayList<>();
+ List<String> list = new ArrayList<>();
+ list.add("活动名称：");
+ list.add(name);
+ list.add("");
+ list.add("起止时间：");
+ list.add(time);
+ list.add("");
+ list.add("运营商：");
+ list.add(null != companyId ? companyService.selectById(companyId).getName() : "");
+ lists.add(list);
+ list = new ArrayList<>();
+ list.add("领取时间");
+ list.add("领取人");
+ list.add("领取人电话");
+ list.add("领取金额");
+ list.add("到期时间");
+ list.add("领取类型");
+ list.add("状态");
+ list.add("使用时间");
+ lists.add(list);
+
+ List<List<List<String>>> lists1 = new ArrayList<>();
+ List<List<String>> lists2 = new ArrayList<>();
+ for(Map<String, Object> map : maps){
+ List<String> list2 = new ArrayList<>();
+ list2.add(null != map.get("time") ? map.get("time").toString() : "");
+ list2.add(null != map.get("userName") ? map.get("userName").toString() : "");
+ list2.add(null != map.get("phone") ? map.get("phone").toString() : "");
+ list2.add(null != map.get("money") ? map.get("money").toString() : "");
+ list2.add(null != map.get("expirationTime") ? map.get("expirationTime").toString() : "");
+ list2.add(null != map.get("couponType") ? map.get("couponType").toString() : "");
+ list2.add(null != map.get("state") ? map.get("state").toString() : "");
+ list2.add(null != map.get("endTime") ? map.get("endTime").toString() : "");
+ lists2.add(list2);
+ }
+ lists1.add(lists2);
+
+ HSSFWorkbook hssfWorkbook = new HSSFWorkbook();
+ HSSFSheet hssfSheet = hssfWorkbook.createSheet();
+ hssfSheet.setColumnWidth(0, 6 * 256);
+ hssfSheet.setDefaultRowHeightInPoints(20f);
+ for(int i = 0; i < lists.size(); i++){
+ HSSFRow hssfRow = hssfSheet.createRow(i);//设置第一行数据（标题）
+ HSSFCellStyle style = hssfWorkbook.createCellStyle();
+ HSSFFont font = hssfWorkbook.createFont();
+ font.setBold(true);
+ style.setFont(font);
+ style.setAlignment(HorizontalAlignment.CENTER);
+ for (int l = 0; l < lists.get(i).size(); l++) {
+ HSSFCell hssfCell = hssfRow.createCell(l);
+ hssfCell.setCellType(CellType.STRING);//设置表格类型
+ hssfCell.setCellValue(lists.get(i).get(l));
+ hssfCell.setCellStyle(style);
+ if(l > 0) {
+ hssfSheet.setColumnWidth(l , 20 * 256);
+ }
+
+ }
+ }
+ //这个就是合并单元格
+ //参数说明：1：开始行 2：结束行 3：开始列 4：结束列
+ //比如我要合并 第二行到第四行的 第六列到第八列 sheet.addMergedRegion(new CellRangeAddress(1,3,5,7));
+ hssfSheet.addMergedRegion(new CellRangeAddress(0,0,1,2));
+ hssfSheet.addMergedRegion(new CellRangeAddress(0,0,4,5));
+
+ for(int i = 0; i < lists1.size(); i++){
+ //将数据添加到表格中
+ List<String> data = null;
+ for (int l = 0; l < lists1.get(i).size(); l++) {
+ HSSFRow row = hssfSheet.createRow(l + 2);
+ data = lists1.get(i).get(l);
+ for (int j = 0; j < data.size(); j++) {
+ HSSFCell hssfCell = row.createCell(j);
+ hssfCell.setCellType(CellType.STRING);//设置表格类型
+ hssfCell.setCellValue(data.get(j));
+ }
+ }
+ }
+ return hssfWorkbook;
+ }
+
+ @Override
+ public HSSFWorkbook downloadCouponRegisterInfo1(String name, String time, Integer companyId) {
+ String start = null;
+ String end = null;
+ if(ToolUtil.isNotEmpty(time)){
+ start = time.split(" - ")[0];
+ end = time.split(" - ")[1];
+ }
+ List<Map<String, Object>> maps = this.baseMapper.queryCouponRegisterInfo1(name, start, end, companyId, null, null);
+
+ List<List<String>> lists = new ArrayList<>();
+ List<String> list = new ArrayList<>();
+ list.add("活动名称：");
+ list.add(name);
+ list.add("");
+ list.add("起止时间：");
+ list.add(time);
+ list.add("");
+ list.add("运营商：");
+ list.add(null != companyId ? companyService.selectById(companyId).getName() : "");
+ list.add("");
+ list.add("");
+ list.add("");
+ list.add("");
+ list.add("");
+ list.add("");
+ list.add("");
+ list.add("");
+ lists.add(list);
+ list = new ArrayList<>();
+ list.add("充值时间");
+ list.add("充值人");
+ list.add("充值人电话");
+ list.add("充值金额");
+ list.add("通用券领取总数");
+ list.add("通用券使用总数");
+ list.add("通用券使用总金额");
+ list.add("专车券领取总数");
+ list.add("专车券使用总数");
+ list.add("专车券使用总金额");
+ list.add("出租车券领取总数");
+ list.add("出租车券使用总数");
+ list.add("出租车券使用总金额");
+ list.add("跨城券领取总数");
+ list.add("跨城券使用总数");
+ list.add("跨城券使用总金额");
+ lists.add(list);
+
+ List<List<List<String>>> lists1 = new ArrayList<>();
+ List<List<String>> lists2 = new ArrayList<>();
+ for(Map<String, Object> map : maps){
+ List<String> list2 = new ArrayList<>();
+ list2.add(null != map.get("time") ? map.get("time").toString() : "");
+ list2.add(null != map.get("userName") ? map.get("userName").toString() : "");
+ list2.add(null != map.get("phone") ? map.get("phone").toString() : "");
+ list2.add(null != map.get("amount") ? map.get("amount").toString() : "");
+ list2.add(null != map.get("tyNum") ? map.get("tyNum").toString() : "");
+ list2.add(null != map.get("tyUseNum") ? map.get("tyUseNum").toString() : "");
+ list2.add(null != map.get("tyUseMoney") ? map.get("tyUseMoney").toString() : "");
+ list2.add(null != map.get("zcNum") ? map.get("zcNum").toString() : "");
+ list2.add(null != map.get("zcUseNum") ? map.get("zcUseNum").toString() : "");
+ list2.add(null != map.get("zcUseMoney") ? map.get("zcUseMoney").toString() : "");
+ list2.add(null != map.get("czcNum") ? map.get("czcNum").toString() : "");
+ list2.add(null != map.get("czcUseNum") ? map.get("czcUseNum").toString() : "");
+ list2.add(null != map.get("czcUseMoney") ? map.get("czcUseMoney").toString() : "");
+ list2.add(null != map.get("kcNum") ? map.get("kcNum").toString() : "");
+ list2.add(null != map.get("kcUseNum") ? map.get("kcUseNum").toString() : "");
+ list2.add(null != map.get("kcUseMoney") ? map.get("kcUseMoney").toString() : "");
+ lists2.add(list2);
+ }
+ lists1.add(lists2);
+
+ HSSFWorkbook hssfWorkbook = new HSSFWorkbook();
+ HSSFSheet hssfSheet = hssfWorkbook.createSheet();
+ hssfSheet.setColumnWidth(0, 6 * 256);
+ hssfSheet.setDefaultRowHeightInPoints(20f);
+ for(int i = 0; i < lists.size(); i++){
+ HSSFRow hssfRow = hssfSheet.createRow(i);//设置第一行数据（标题）
+ HSSFCellStyle style = hssfWorkbook.createCellStyle();
+ HSSFFont font = hssfWorkbook.createFont();
+ font.setBold(true);
+ style.setFont(font);
+ style.setAlignment(HorizontalAlignment.CENTER);
+ for (int l = 0; l < lists.get(i).size(); l++) {
+ HSSFCell hssfCell = hssfRow.createCell(l);
+ hssfCell.setCellType(CellType.STRING);//设置表格类型
+ hssfCell.setCellValue(lists.get(i).get(l));
+ hssfCell.setCellStyle(style);
+ if(l > 0) {
+ hssfSheet.setColumnWidth(l , 20 * 256);
+ }
+
+ }
+ }
+ //这个就是合并单元格
+ //参数说明：1：开始行 2：结束行 3：开始列 4：结束列
+ //比如我要合并 第二行到第四行的 第六列到第八列 sheet.addMergedRegion(new CellRangeAddress(1,3,5,7));
+ hssfSheet.addMergedRegion(new CellRangeAddress(0,0,1,2));
+ hssfSheet.addMergedRegion(new CellRangeAddress(0,0,4,5));
+ hssfSheet.addMergedRegion(new CellRangeAddress(0,0,7,8));
+
+ for(int i = 0; i < lists1.size(); i++){
+ //将数据添加到表格中
+ List<String> data = null;
+ for (int l = 0; l < lists1.get(i).size(); l++) {
+ HSSFRow row = hssfSheet.createRow(l + 2);
+ data = lists1.get(i).get(l);
+ for (int j = 0; j < data.size(); j++) {
+ HSSFCell hssfCell = row.createCell(j);
+ hssfCell.setCellType(CellType.STRING);//设置表格类型
+ hssfCell.setCellValue(data.get(j));
+ }
+ }
+ }
+ return hssfWorkbook;
+ }
+
+ @Override
+ public Map<String, Object> queryCouponRegisterInfo1(String name, String time, Integer companyId, Integer offset, Integer limit) throws Exception {
+ String start = null;
+ String end = null;
+ if(ToolUtil.isNotEmpty(time)){
+ start = time.split(" - ")[0];
+ end = time.split(" - ")[1];
+ }
+ List<Map<String, Object>> list = this.baseMapper.queryCouponRegisterInfo1(name, start, end, companyId, offset, limit);
+ int i = this.baseMapper.queryCouponRegisterInfo1Count(name, start, end, companyId);
+ Map<String, Object> map = new HashMap<>();
+ map.put("rows", list);
+ map.put("total", i);
+ return map;
+ }
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/UserRedPacketRecordServiceImpl.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/UserRedPacketRecordServiceImpl.java
new file mode 100644
index 0000000..c277960
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/UserRedPacketRecordServiceImpl.java
@@ -0,0 +1,294 @@
+package com.stylefeng.guns.modular.system.service.impl;
+
+import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import com.stylefeng.guns.core.util.ToolUtil;
+import com.stylefeng.guns.modular.system.dao.UserRedPacketRecordMapper;
+import com.stylefeng.guns.modular.system.model.UserRedPacketRecord;
+import com.stylefeng.guns.modular.system.service.ITCompanyService;
+import com.stylefeng.guns.modular.system.service.IUserRedPacketRecordService;
+import org.apache.poi.hssf.usermodel.*;
+import org.apache.poi.ss.usermodel.CellType;
+import org.apache.poi.ss.usermodel.HorizontalAlignment;
+import org.apache.poi.ss.util.CellRangeAddress;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+
+@Service
+public class UserRedPacketRecordServiceImpl extends ServiceImpl<UserRedPacketRecordMapper, UserRedPacketRecord> implements IUserRedPacketRecordService {
+
+ @Resource
+ private UserRedPacketRecordMapper userRedPacketRecordMapper;
+
+ @Autowired
+ private ITCompanyService companyService;
+
+
+ /**
+ * 获取红包统计数据
+ * @param name
+ * @param time
+ * @param companyId
+ * @param offset
+ * @param limit
+ * @return
+ * @throws Exception
+ */
+ @Override
+ public Map<String, Object> queryRedEnvelopes(String name, String time, Integer companyId, Integer offset, Integer limit) throws Exception {
+ String start = null;
+ String end = null;
+ if(ToolUtil.isNotEmpty(time)){
+ start = time.split(" - ")[0];
+ end = time.split(" - ")[1];
+ }
+ List<Map<String, Object>> list = userRedPacketRecordMapper.queryRedEnvelopes(name, start, end, companyId, offset, limit);
+ int i = userRedPacketRecordMapper.queryRedEnvelopesCount(name, start, end, companyId);
+ Map<String, Object> map = new HashMap<>();
+ map.put("rows", list);
+ map.put("total", i);
+ return map;
+ }
+
+ /**
+ * 下载红包统计数据
+ * @param name
+ * @param time
+ * @param companyId
+ * @return
+ * @throws Exception
+ */
+ @Override
+ public HSSFWorkbook downloadRedEnvelopes(String name, String time, Integer companyId) throws Exception {
+ String start = null;
+ String end = null;
+ if(ToolUtil.isNotEmpty(time)){
+ start = time.split(" - ")[0];
+ end = time.split(" - ")[1];
+ }
+ List<Map<String, Object>> maps = userRedPacketRecordMapper.queryRedEnvelopes(name, start, end, companyId, null, null);
+ List<List<String>> lists = new ArrayList<>();
+ List<String> list = new ArrayList<>();
+ list.add("活动名称：");
+ list.add(name);
+ list.add("");
+ list.add("起止时间：");
+ list.add(time);
+ list.add("");
+ list.add("运营商：");
+ list.add(null != companyId ? companyService.selectById(companyId).getName() : "");
+ lists.add(list);
+ list = new ArrayList<>();
+ list.add("时间");
+ list.add("领取情况");
+ list.add("");
+ list.add("");
+ list.add("");
+ list.add("使用情况");
+ list.add("");
+ list.add("");
+ lists.add(list);
+ list = new ArrayList<>();
+ list.add("");
+ list.add("注册领取人数");
+ list.add("系统派发人数");
+ list.add("合计");
+ list.add("领取金额");
+ list.add("使用人数");
+ list.add("使用张数");
+ list.add("使用金额");
+ lists.add(list);
+
+ List<List<List<String>>> lists1 = new ArrayList<>();
+ List<List<String>> lists2 = new ArrayList<>();
+ for(Map<String, Object> map : maps){
+ List<String> list2 = new ArrayList<>();
+ list2.add(null != map.get("time") ? map.get("time").toString() : "");
+ list2.add(null != map.get("receivePeople") ? map.get("receivePeople").toString() : "");
+ list2.add(null != map.get("receivePeople") ? map.get("receivePeople").toString() : "");
+ list2.add(null != map.get("receive") ? map.get("receive").toString() : "");
+ list2.add(null != map.get("receiveMoney") ? map.get("receiveMoney").toString() : "");
+ list2.add(null != map.get("usePeople") ? map.get("usePeople").toString() : "");
+ list2.add(null != map.get("use") ? map.get("use").toString() : "");
+ list2.add(null != map.get("useMoney") ? map.get("useMoney").toString() : "");
+ lists2.add(list2);
+ }
+ lists1.add(lists2);
+
+ HSSFWorkbook hssfWorkbook = new HSSFWorkbook();
+ HSSFSheet hssfSheet = hssfWorkbook.createSheet();
+ hssfSheet.setColumnWidth(0, 6 * 256);
+ hssfSheet.setDefaultRowHeightInPoints(20f);
+ for(int i = 0; i < lists.size(); i++){
+ HSSFRow hssfRow = hssfSheet.createRow(i);//设置第一行数据（标题）
+ HSSFCellStyle style = hssfWorkbook.createCellStyle();
+ HSSFFont font = hssfWorkbook.createFont();
+ font.setBold(true);
+ style.setFont(font);
+ style.setAlignment(HorizontalAlignment.CENTER);
+ for (int l = 0; l < lists.get(i).size(); l++) {
+ HSSFCell hssfCell = hssfRow.createCell(l);
+ hssfCell.setCellType(CellType.STRING);//设置表格类型
+ hssfCell.setCellValue(lists.get(i).get(l));
+ hssfCell.setCellStyle(style);
+ if(l > 0) {
+ hssfSheet.setColumnWidth(l , 20 * 256);
+ }
+
+ }
+ }
+ //这个就是合并单元格
+ //参数说明：1：开始行 2：结束行 3：开始列 4：结束列
+ //比如我要合并 第二行到第四行的 第六列到第八列 sheet.addMergedRegion(new CellRangeAddress(1,3,5,7));
+ hssfSheet.addMergedRegion(new CellRangeAddress(0,0,1,2));
+ hssfSheet.addMergedRegion(new CellRangeAddress(0,0,4,5));
+ hssfSheet.addMergedRegion(new CellRangeAddress(1,2,0,0));
+ hssfSheet.addMergedRegion(new CellRangeAddress(1,1,1,4));
+ hssfSheet.addMergedRegion(new CellRangeAddress(1,1,5,7));
+
+
+ for(int i = 0; i < lists1.size(); i++){
+ //将数据添加到表格中
+ List<String> data = null;
+ for (int l = 0; l < lists1.get(i).size(); l++) {
+ HSSFRow row = hssfSheet.createRow(l + 3);
+ data = lists1.get(i).get(l);
+ for (int j = 0; j < data.size(); j++) {
+ HSSFCell hssfCell = row.createCell(j);
+ hssfCell.setCellType(CellType.STRING);//设置表格类型
+ hssfCell.setCellValue(data.get(j));
+ }
+ }
+ }
+ return hssfWorkbook;
+ }
+
+
+ /**
+ * 获取红包统计明细
+ * @param name
+ * @param time
+ * @param companyId
+ * @param offset
+ * @param limit
+ * @return
+ * @throws Exception
+ */
+ @Override
+ public Map<String, Object> queryRedEnvelopesInfo(String name, String time, Integer companyId, Integer offset, Integer limit) throws Exception {
+ String start = null;
+ String end = null;
+ if(ToolUtil.isNotEmpty(time)){
+ start = time.split(" - ")[0];
+ end = time.split(" - ")[1];
+ }
+ List<Map<String, Object>> list = userRedPacketRecordMapper.queryRedEnvelopesInfo(name, start, end, companyId, offset, limit);
+ int i = userRedPacketRecordMapper.queryRedEnvelopesInfoCount(name, start, end, companyId);
+ Map<String, Object> map = new HashMap<>();
+ map.put("rows", list);
+ map.put("total", i);
+ return map;
+ }
+
+ /**
+ * 下载红包统计明细
+ * @param name
+ * @param time
+ * @param companyId
+ * @return
+ * @throws Exception
+ */
+ @Override
+ public HSSFWorkbook downloadRedEnvelopesInfo(String name, String time, Integer companyId) throws Exception {
+ String start = null;
+ String end = null;
+ if(ToolUtil.isNotEmpty(time)){
+ start = time.split(" - ")[0];
+ end = time.split(" - ")[1];
+ }
+ List<Map<String, Object>> maps = userRedPacketRecordMapper.queryRedEnvelopesInfo(name, start, end, companyId, null, null);
+ List<List<String>> lists = new ArrayList<>();
+ List<String> list = new ArrayList<>();
+ list.add("活动名称：");
+ list.add(name);
+ list.add("");
+ list.add("起止时间：");
+ list.add(time);
+ list.add("运营商：");
+ list.add(null != companyId ? companyService.selectById(companyId).getName() : "");
+ lists.add(list);
+ list = new ArrayList<>();
+ list.add("领取时间");
+ list.add("领取人");
+ list.add("领取人电话");
+ list.add("领取金额");
+ list.add("到期时间");
+ list.add("状态");
+ list.add("使用时间");
+ lists.add(list);
+
+ List<List<List<String>>> lists1 = new ArrayList<>();
+ List<List<String>> lists2 = new ArrayList<>();
+ for(Map<String, Object> map : maps){
+ List<String> list2 = new ArrayList<>();
+ list2.add(null != map.get("time") ? map.get("time").toString() : "");
+ list2.add(null != map.get("name") ? map.get("name").toString() : "");
+ list2.add(null != map.get("phone") ? map.get("phone").toString() : "");
+ list2.add(null != map.get("money") ? map.get("money").toString() : "");
+ list2.add(null != map.get("expirationTime") ? map.get("expirationTime").toString() : "");
+ list2.add(null != map.get("state") ? map.get("state").toString() : "");
+ list2.add(null != map.get("endTime") ? map.get("endTime").toString() : "");
+ lists2.add(list2);
+ }
+ lists1.add(lists2);
+
+ HSSFWorkbook hssfWorkbook = new HSSFWorkbook();
+ HSSFSheet hssfSheet = hssfWorkbook.createSheet();
+ hssfSheet.setColumnWidth(0, 6 * 256);
+ hssfSheet.setDefaultRowHeightInPoints(20f);
+ for(int i = 0; i < lists.size(); i++){
+ HSSFRow hssfRow = hssfSheet.createRow(i);//设置第一行数据（标题）
+ HSSFCellStyle style = hssfWorkbook.createCellStyle();
+ HSSFFont font = hssfWorkbook.createFont();
+ font.setBold(true);
+ style.setFont(font);
+ style.setAlignment(HorizontalAlignment.CENTER);
+ for (int l = 0; l < lists.get(i).size(); l++) {
+ HSSFCell hssfCell = hssfRow.createCell(l);
+ hssfCell.setCellType(CellType.STRING);//设置表格类型
+ hssfCell.setCellValue(lists.get(i).get(l));
+ hssfCell.setCellStyle(style);
+ if(l > 0) {
+ hssfSheet.setColumnWidth(l , 20 * 256);
+ }
+
+ }
+ }
+ //这个就是合并单元格
+ //参数说明：1：开始行 2：结束行 3：开始列 4：结束列
+ //比如我要合并 第二行到第四行的 第六列到第八列 sheet.addMergedRegion(new CellRangeAddress(1,3,5,7));
+ hssfSheet.addMergedRegion(new CellRangeAddress(0,0,1,2));
+
+
+ for(int i = 0; i < lists1.size(); i++){
+ //将数据添加到表格中
+ List<String> data = null;
+ for (int l = 0; l < lists1.get(i).size(); l++) {
+ HSSFRow row = hssfSheet.createRow(l + 2);
+ data = lists1.get(i).get(l);
+ for (int j = 0; j < data.size(); j++) {
+ HSSFCell hssfCell = row.createCell(j);
+ hssfCell.setCellType(CellType.STRING);//设置表格类型
+ hssfCell.setCellValue(data.get(j));
+ }
+ }
+ }
+ return hssfWorkbook;
+ }
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/UserServiceImpl.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/UserServiceImpl.java
new file mode 100644
index 0000000..c44b83b
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/UserServiceImpl.java
@@ -0,0 +1,61 @@
+package com.stylefeng.guns.modular.system.service.impl;
+
+import java.util.List;
+
+import java.util.Map;
+
+import com.baomidou.mybatisplus.plugins.Page;
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import com.stylefeng.guns.core.datascope.DataScope;
+import com.stylefeng.guns.modular.system.dao.UserMapper;
+import com.stylefeng.guns.modular.system.model.User;
+import com.stylefeng.guns.modular.system.service.IUserService;
+
+/**
+ * <p>
+ * 管理员表 服务实现类
+ * </p>
+ *
+ * @author stylefeng123
+ * @since 2018-02-22
+ */
+@Service
+public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IUserService {
+
+ @Override
+ public int setStatus(Integer userId, int status) {
+ return this.baseMapper.setStatus(userId, status);
+ }
+
+ @Override
+ public int changePwd(Integer userId, String pwd) {
+ return this.baseMapper.changePwd(userId, pwd);
+ }
+
+ @Override
+ public List<Map<String, Object>> selectUsers(DataScope dataScope, String name, String beginTime, String endTime, Integer deptid) {
+ return this.baseMapper.selectUsers(dataScope, name, beginTime, endTime, deptid);
+ }
+
+ @Override
+ public int setRoles(Integer userId, String roleIds) {
+ return this.baseMapper.setRoles(userId, roleIds);
+ }
+
+ @Override
+ public User getByAccount(String account) {
+ return this.baseMapper.getByAccount(account);
+ }
+
+ @Override
+ public Integer getMenuNumByRole(String roleStr) {
+ return this.baseMapper.getMenuNumByRole(roleStr);
+ }
+
+ @Override
+ public List<Map<String, Object>> getUserListPage(Page<Map<String, Object>> page, DataScope dataScope, String name, String beginTime, String endTime, Integer deptid) {
+ return this.baseMapper.getUserListPage(page, dataScope, name, beginTime, endTime, deptid);
+ }
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/transfer/ManagerUser.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/transfer/ManagerUser.java
new file mode 100644
index 0000000..0e16e16
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/transfer/ManagerUser.java
@@ -0,0 +1,97 @@
+package com.stylefeng.guns.modular.system.transfer;
+
+import java.util.Date;
+
+/**
+ * 管理员的信息封装
+ *
+ * @author fengshuonan
+ * @Date 2017年1月11日 下午7:46:53
+ */
+public class ManagerUser {
+
+ private String userId;
+
+ /* 用户账号 */
+ private String userNo;
+
+ /* 用户姓名 */
+ private String userName;
+
+ private String userPhone;
+
+ //1:超级管理员 2：管理员
+ private String userRole;
+
+ /* 1：登录状态 2：退出状态 3：停用状态 */
+ private Integer userStatus;
+
+ private Date createTime;
+
+ private Date loginTime;
+
+ public String getUserId() {
+ return userId;
+ }
+
+ public void setUserId(String userId) {
+ this.userId = userId;
+ }
+
+ public String getUserNo() {
+ return userNo;
+ }
+
+ public void setUserNo(String userNo) {
+ this.userNo = userNo;
+ }
+
+ public String getUserName() {
+ return userName;
+ }
+
+ public void setUserName(String userName) {
+ this.userName = userName;
+ }
+
+ public String getUserPhone() {
+ return userPhone;
+ }
+
+ public void setUserPhone(String userPhone) {
+ this.userPhone = userPhone;
+ }
+
+ public String getUserRole() {
+ return userRole;
+ }
+
+ public void setUserRole(String userRole) {
+ this.userRole = userRole;
+ }
+
+ public Integer getUserStatus() {
+ return userStatus;
+ }
+
+ public void setUserStatus(Integer userStatus) {
+ this.userStatus = userStatus;
+ }
+
+ public Date getCreateTime() {
+ return createTime;
+ }
+
+ public void setCreateTime(Date createTime) {
+ this.createTime = createTime;
+ }
+
+ public Date getLoginTime() {
+ return loginTime;
+ }
+
+ public void setLoginTime(Date loginTime) {
+ this.loginTime = loginTime;
+ }
+
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/transfer/ReqAddManager.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/transfer/ReqAddManager.java
new file mode 100644
index 0000000..6e28801
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/transfer/ReqAddManager.java
@@ -0,0 +1,76 @@
+package com.stylefeng.guns.modular.system.transfer;
+
+import org.hibernate.validator.constraints.Length;
+
+import javax.validation.constraints.NotNull;
+
+/**
+ * 添加管理员的请求bean
+ *
+ * @author fengshuonan
+ * @Date 2017年1月12日 下午6:46:24
+ */
+public class ReqAddManager {
+
+ // 用户姓名
+ @NotNull
+ private String userName;
+
+ // 用户账号
+ @NotNull
+ private String userNo;
+
+ // 手机号
+ @NotNull
+ @Length(min = 11, max = 11)
+ private String userPhone;
+
+ // 1:超级管理员 2：管理员
+ @NotNull
+ private String userRole;
+
+ // 密码
+ @NotNull
+ private String userPassword;
+
+ public String getUserName() {
+ return userName;
+ }
+
+ public void setUserName(String userName) {
+ this.userName = userName;
+ }
+
+ public String getUserNo() {
+ return userNo;
+ }
+
+ public void setUserNo(String userNo) {
+ this.userNo = userNo;
+ }
+
+ public String getUserPhone() {
+ return userPhone;
+ }
+
+ public void setUserPhone(String userPhone) {
+ this.userPhone = userPhone;
+ }
+
+ public String getUserRole() {
+ return userRole;
+ }
+
+ public void setUserRole(String userRole) {
+ this.userRole = userRole;
+ }
+
+ public String getUserPassword() {
+ return userPassword;
+ }
+
+ public void setUserPassword(String userPassword) {
+ this.userPassword = userPassword;
+ }
+
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/transfer/ReqEditManager.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/transfer/ReqEditManager.java
new file mode 100644
index 0000000..394d4b4
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/transfer/ReqEditManager.java
@@ -0,0 +1,60 @@
+package com.stylefeng.guns.modular.system.transfer;
+
+import org.hibernate.validator.constraints.Length;
+
+import javax.validation.constraints.NotNull;
+
+/**
+ * 编辑管理员的请求
+ *
+ * @author fengshuonan
+ * @Date 2017年1月15日 下午10:29:16
+ */
+public class ReqEditManager {
+
+ @NotNull
+ private String userId;
+
+ /* 用户姓名 */
+ @NotNull
+ private String userName;
+
+ private String userPassword;
+
+ @NotNull
+ @Length(min = 11, max = 11)
+ private String userPhone;
+
+ public String getUserId() {
+ return userId;
+ }
+
+ public void setUserId(String userId) {
+ this.userId = userId;
+ }
+
+ public String getUserName() {
+ return userName;
+ }
+
+ public void setUserName(String userName) {
+ this.userName = userName;
+ }
+
+ public String getUserPassword() {
+ return userPassword;
+ }
+
+ public void setUserPassword(String userPassword) {
+ this.userPassword = userPassword;
+ }
+
+ public String getUserPhone() {
+ return userPhone;
+ }
+
+ public void setUserPhone(String userPhone) {
+ this.userPhone = userPhone;
+ }
+
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/transfer/UserDto.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/transfer/UserDto.java
new file mode 100644
index 0000000..d45f320
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/transfer/UserDto.java
@@ -0,0 +1,153 @@
+package com.stylefeng.guns.modular.system.transfer;
+
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.util.Date;
+
+/**
+ * 用户传输bean
+ *
+ * @author stylefeng
+ * @Date 2017/5/5 22:40
+ */
+public class UserDto{
+
+ private Integer id;
+ private String account;
+ private String password;
+ private String salt;
+ private String name;
+
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ private Date birthday;
+ private Integer sex;
+ private String email;
+ private String phone;
+ private String roleid;
+ private Integer deptid;
+ private Integer status;
+ private Date createtime;
+ private Integer version;
+ private String avatar;
+
+
+ public Integer getId() {
+ return id;
+ }
+
+ public void setId(Integer id) {
+ this.id = id;
+ }
+
+ public String getAccount() {
+ return account;
+ }
+
+ public void setAccount(String account) {
+ this.account = account;
+ }
+
+ public String getPassword() {
+ return password;
+ }
+
+ public void setPassword(String password) {
+ this.password = password;
+ }
+
+ public String getSalt() {
+ return salt;
+ }
+
+ public void setSalt(String salt) {
+ this.salt = salt;
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ public Date getBirthday() {
+ return birthday;
+ }
+
+ public void setBirthday(Date birthday) {
+ this.birthday = birthday;
+ }
+
+ public Integer getSex() {
+ return sex;
+ }
+
+ public void setSex(Integer sex) {
+ this.sex = sex;
+ }
+
+ public String getEmail() {
+ return email;
+ }
+
+ public void setEmail(String email) {
+ this.email = email;
+ }
+
+ public String getPhone() {
+ return phone;
+ }
+
+ public void setPhone(String phone) {
+ this.phone = phone;
+ }
+
+ public String getRoleid() {
+ return roleid;
+ }
+
+ public void setRoleid(String roleid) {
+ this.roleid = roleid;
+ }
+
+ public Integer getDeptid() {
+ return deptid;
+ }
+
+ public void setDeptid(Integer deptid) {
+ this.deptid = deptid;
+ }
+
+ public Integer getStatus() {
+ return status;
+ }
+
+ public void setStatus(Integer status) {
+ this.status = status;
+ }
+
+ public Date getCreatetime() {
+ return createtime;
+ }
+
+ public void setCreatetime(Date createtime) {
+ this.createtime = createtime;
+ }
+
+ public Integer getVersion() {
+ return version;
+ }
+
+ public void setVersion(Integer version) {
+ this.version = version;
+ }
+
+ public String getAvatar() {
+ return avatar;
+ }
+
+ public void setAvatar(String avatar) {
+ this.avatar = avatar;
+ }
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/AESUtils.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/AESUtils.java
new file mode 100644
index 0000000..040d6a4
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/AESUtils.java
@@ -0,0 +1,104 @@
+package com.stylefeng.guns.modular.system.util;
+
+import javax.crypto.Cipher;
+import javax.crypto.spec.IvParameterSpec;
+import javax.crypto.spec.SecretKeySpec;
+import java.security.Key;
+import java.security.spec.AlgorithmParameterSpec;
+import java.util.Base64;
+
+public class AESUtils {
+ private static final String TRANSFORMATION = "AES/CBC/PKCS5Padding";
+ private static final String ALGORITHM = "AES";
+ private static final String CHARSET = "utf-8";
+ /**
+ * 建议为16位或32位
+ */
+ private static final String KEY = "c53fd327353a09a1";
+ /**
+ * 必须16位
+ * 初始化向量IV不可以为32位，否则异常java.security.InvalidAlgorithmParameterException: Wrong IV length: must be 16 bytes long
+ */
+ private static final String IV = "3a0565e3b1d8ae3d";
+
+ /**
+ * 加密
+ *
+ * @param context
+ * @return
+ */
+ public static String encrypt(String context) {
+ try {
+ byte[] decode = context.getBytes(CHARSET);
+ byte[] bytes = createKeyAndIv(decode, Cipher.ENCRYPT_MODE);
+ return Base64.getEncoder().encodeToString(bytes);
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ return null;
+ }
+
+ /**
+ * 解密
+ *
+ * @param context
+ * @return
+ */
+ public static String decrypt(String context) {
+ try {
+ Base64.Decoder decoder = Base64.getDecoder();
+ byte[] decode = decoder.decode(context);
+ byte[] bytes = createKeyAndIv(decode, Cipher.DECRYPT_MODE);
+ return new String(bytes, CHARSET);
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ return null;
+ }
+
+ /**
+ * 获取key & iv
+ *
+ * @param context
+ * @param opmode
+ * @return
+ * @throws Exception
+ */
+ public static byte[] createKeyAndIv(byte[] context, int opmode) throws Exception {
+ byte[] key = KEY.getBytes(CHARSET);
+ byte[] iv = IV.getBytes(CHARSET);
+ return cipherFilter(context, opmode, key, iv);
+ }
+
+ /**
+ * 执行操作
+ *
+ * @param context
+ * @param opmode
+ * @param key
+ * @param iv
+ * @return
+ * @throws Exception
+ */
+ public static byte[] cipherFilter(byte[] context, int opmode, byte[] key, byte[] iv) throws Exception {
+ Key secretKeySpec = new SecretKeySpec(key, ALGORITHM);
+ AlgorithmParameterSpec ivParameterSpec = new IvParameterSpec(iv);
+ Cipher cipher = Cipher.getInstance(TRANSFORMATION);
+ cipher.init(opmode, secretKeySpec, ivParameterSpec);
+ return cipher.doFinal(context);
+ }
+
+ /**
+ * 主方法测试
+ *
+ * @param args
+ */
+ public static void main(String[] args) {
+ String context = "zhaors";
+ System.out.println("元数据" + context);
+ String encrypt = encrypt(context);
+ System.out.println("加密之后：" + encrypt);
+ String decrypt = decrypt(encrypt);
+ System.out.println("解密之后：" + decrypt);
+ }
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/AddAdminLogUtil.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/AddAdminLogUtil.java
new file mode 100644
index 0000000..98cf3a1
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/AddAdminLogUtil.java
@@ -0,0 +1,26 @@
+package com.stylefeng.guns.modular.system.util;
+
+import com.stylefeng.guns.core.base.controller.BaseController;
+import com.stylefeng.guns.core.shiro.ShiroKit;
+
+import java.util.Date;
+
+/**
+ * 添加操作日志工具包
+ */
+public class AddAdminLogUtil extends BaseController {
+
+ /**
+ * 添加
+ * @param content 操作内容
+ */
+// public static AppAdminLog addAdminLog(String content){
+// AppAdminLog log = new AppAdminLog();
+// log.setAddTime(new Date());
+// log.setContent(content);
+// log.setSysUserId(ShiroKit.getUser().getId());
+// return log;
+// }
+
+
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/ConstellationUtil.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/ConstellationUtil.java
new file mode 100644
index 0000000..bc1a3c7
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/ConstellationUtil.java
@@ -0,0 +1,68 @@
+package com.stylefeng.guns.modular.system.util;
+
+import java.util.Date;
+import java.util.Scanner;
+
+/**
+ * 根据出生日期获取星座
+ */
+public class ConstellationUtil {
+
+ /**
+ * 根据出生日期获取星座
+ * @param birthday 例如:2020-02-02
+ * @return
+ */
+ public static String getConstellation(String birthday) {
+ Date parse = DateUtil.parseDate(birthday);
+ String mMdd = DateUtil.format(parse, "MMdd");
+ Scanner sc = new Scanner(mMdd);
+ int monthday = sc.nextInt();
+ int month = monthday / 100;
+ int day = monthday % 100;
+ String xingzuo = "";
+ switch (month) {
+ case 1:
+ xingzuo = day < 21 ? "摩羯座" : "水瓶座";
+ break;
+ case 2:
+ xingzuo = day < 20 ? "水瓶座" : "双鱼座";
+ break;
+ case 3:
+ xingzuo = day < 21 ? "双鱼座" : "白羊座";
+ break;
+ case 4:
+ xingzuo = day < 21 ? "白羊座" : "金牛座";
+ break;
+ case 5:
+ xingzuo = day < 22 ? "金牛座" : "双子座";
+ break;
+ case 6:
+ xingzuo = day < 22 ? "双子座" : "巨蟹座";
+ break;
+ case 7:
+ xingzuo = day < 23 ? "巨蟹座" : "狮子座";
+ break;
+ case 8:
+ xingzuo = day < 24 ? "狮子座" : "处女座";
+ break;
+ case 9:
+ xingzuo = day < 24 ? "处女座" : "天秤座";
+ break;
+ case 10:
+ xingzuo = day < 24 ? "天秤座" : "天蝎座";
+ break;
+ case 11:
+ xingzuo = day < 23 ? "天蝎座" : "射手座";
+ break;
+ case 12:
+ xingzuo = day < 22 ? "射手座" : "摩羯座";
+ break;
+ }
+ return xingzuo;
+ }
+
+ public static void main(String[] args) {
+ System.out.println(ConstellationUtil.getConstellation("1995-09-07"));
+ }
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/DateUtil.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/DateUtil.java
new file mode 100644
index 0000000..e2a19ea
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/DateUtil.java
@@ -0,0 +1,1130 @@
+package com.stylefeng.guns.modular.system.util;
+
+import org.apache.commons.lang3.time.DateFormatUtils;
+import org.apache.commons.lang3.time.DateUtils;
+
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.GregorianCalendar;
+import java.util.TimeZone;
+
+/**
+ * <h3>处理时间的工具类</h3>
+ */
+public class DateUtil {
+
+
+
+
+ private static TimeZone tz = TimeZone.getTimeZone("GMT+8");
+
+ // private static TimeZone tz = TimeZone.getTimeZone("Asia/Shanghai");
+
+ /**
+ * 格式化日期
+ */
+ public static Date parse(String date, String pattern) {
+ try {
+ return DateUtils.parseDate(date, pattern);
+ } catch (ParseException e) {
+ e.printStackTrace();
+ return null;
+ }
+ }
+
+ /**
+ * 格式化日期
+ */
+ public static Date parseDate(String date) {
+ return parse(date, "yyyy-MM-dd");
+ }
+
+ /**
+ * 格式化日期
+ */
+ public static String format(Date date, String pattern) {
+ return DateFormatUtils.format(date, pattern);
+ }
+
+ public static boolean hourMinuteBetween(String nowDate, String startDate, String endDate) throws Exception{
+
+ SimpleDateFormat format = new SimpleDateFormat("HH:mm");
+
+ Date now = format.parse(nowDate);
+ Date start = format.parse(startDate);
+ Date end = format.parse(endDate);
+
+ long nowTime = now.getTime();
+ long startTime = start.getTime();
+ long endTime = end.getTime();
+
+ return nowTime >= startTime && nowTime <= endTime;
+ }
+
+ /**
+ * 得到系统日期
+ *
+ * @return
+ */
+ public static Date getDate() {
+ TimeZone.setDefault(tz);
+ return new Date();
+ }
+
+ /**
+ * 获取当然凌晨的时间
+ *
+ * @return Date
+ */
+ public static Date getZero() {
+ Calendar calendar = Calendar.getInstance();
+ calendar.setTime(new Date());
+ calendar.set(Calendar.HOUR_OF_DAY, 0);
+ calendar.set(Calendar.MINUTE, 0);
+ calendar.set(Calendar.SECOND, 0);
+ return calendar.getTime();
+ }
+
+ /**
+ * 判断日期是否在from，to之内 "yyyy-MM-dd" 格式
+ *
+ * @param time
+ * 指定日期
+ * @param from
+ * 开始日期
+ * @param to
+ * 结束日期
+ * @return true 在之间 false 不在之间
+ */
+ public static boolean belongCalendar(Date time, Date from, Date to) {
+ Calendar date = Calendar.getInstance();
+ date.setTime(time);
+
+ Calendar after = Calendar.getInstance();
+ after.setTime(from);
+
+ Calendar before = Calendar.getInstance();
+ before.setTime(to);
+
+ if ((date.after(after) && date.before(before)) || (time.compareTo(from) == 0 || time.compareTo(to) == 0)) {
+ return true;
+ } else {
+ return false;
+ }
+ }
+
+ /**
+ * 两个时间之差
+ *
+ * @param startTime
+ * @param endTime
+ * @param format
+ * @return
+ * @throws ParseException
+ */
+ public static String dateDiff(String startTime, String endTime, String format) throws ParseException {
+ // 按照传入的格式生成一个simpledateformate对象
+ SimpleDateFormat sd = new SimpleDateFormat(format);
+ long nd = 1000 * 24 * 60 * 60;// 一天的毫秒数
+ long nh = 1000 * 60 * 60;// 一小时的毫秒数
+ long nm = 1000 * 60;// 一分钟的毫秒数
+ long ns = 1000;// 一秒钟的毫秒数
+ long diff;
+ long day = 0;
+ long hour = 0;
+ long min = 0;
+ long sec = 0;
+ // long time=0;
+ String strTime = "";
+ // 获得两个时间的毫秒时间差异
+ diff = sd.parse(endTime).getTime() - sd.parse(startTime).getTime();
+ day = diff / nd;// 计算差多少天
+ hour = diff % nd / nh + day * 24;// 计算差多少小时
+ min = diff % nd % nh / nm + day * 24 * 60;// 计算差多少分钟
+ sec = diff % nd % nh % nm / ns;// 计算差多少秒
+ // 输出结果
+ /*
+ * System.out.println("时间相差：" + day + "天" + (hour - day * 24) + "小时" +
+ * (min - day * 24 * 60) + "分钟" + sec + "秒。");
+ * System.out.println("hour=" + hour + ",min=" + min);
+ */
+ if (day == 1) {
+ strTime = "昨天";
+ } else if (day > 1) {
+ // strTime=day+"天前";
+ strTime = startTime.substring(0, 10);
+ } else if (hour >= 1 && hour < 24) {
+ strTime = hour + "小时前";
+ } else {
+ if (min == 0) {
+ strTime = sec + "秒钟前";
+ } else {
+ strTime = min + "分钟前";
+ }
+
+ }
+ // if (str.equalsIgnoreCase("h")) {
+ // return hour;
+ // } else {
+ // return min;
+ // }
+
+ // if (str.equalsIgnoreCase("h")) {
+ // return hour;
+ // } else {
+ // return min;
+ // }
+ return strTime;
+ }
+
+ /**
+ * 得到系统Calendar日期
+ *
+ * @return
+ */
+ public static Calendar getCalendar() {
+ TimeZone.setDefault(tz);
+ Calendar cal = Calendar.getInstance();
+ return cal;
+ }
+
+ /**
+ * 获取当前时间
+ *
+ * @return
+ */
+ public static long getMillisecond() {
+ long millisecond = 0;
+ TimeZone.setDefault(tz);
+ Calendar cal = Calendar.getInstance();
+ millisecond = cal.getTimeInMillis();
+ return millisecond;
+ }
+
+ /**
+ * 获取本月1号的时间戳
+ *
+ * @return
+ */
+ public static long getMillisecond_MONTH() {
+ long millisecond = 0;
+ TimeZone.setDefault(tz);
+ Calendar cal = Calendar.getInstance();
+ cal.set(Calendar.DAY_OF_MONTH, 1);
+ millisecond = cal.getTimeInMillis();
+ return millisecond;
+ }
+
+
+ /**
+ * 获取上个月1号的时间戳
+ *
+ * @return
+ */
+ public static long getMillisecond_FRONTMONTH() {
+ long millisecond = 0;
+ Calendar cal = getCalendar();
+ cal.set(Calendar.DAY_OF_MONTH, 1);
+ cal.set(Calendar.MONTH, Calendar.MONTH - 2);
+ millisecond = cal.getTimeInMillis();
+ return millisecond;
+ }
+
+ /**
+ * 获取当前毫秒数
+ *
+ * @return long
+ */
+ public static long getCurMilli() {
+ long millisecond = 0;
+ Calendar cal = Calendar.getInstance();
+ millisecond = cal.getTimeInMillis();
+ return millisecond;
+ }
+
+ /**
+ * 日期转毫秒
+ *
+ * @param date
+ * @return
+ */
+ public static long getMillisecond(Date date) {
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+ String newDate = "";
+ if (!"".equals(date)) {
+ newDate = sdf.format(date);
+ } else {
+ newDate = sdf.format(DateUtil.getDate());
+ }
+ long millisecond = 0;
+ try {
+ millisecond = sdf.parse(newDate).getTime();
+ } catch (ParseException e) {
+ e.printStackTrace();
+ }
+ return millisecond;
+ }
+
+ /**
+ * 日期转毫秒（加24小时,yyyy-MM-dd HH:mm:ss）
+ *
+ * @param date
+ * @return
+ */
+ public static long getMillisecond_24h(Date date) {
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+ String newDate = "";
+ if (!"".equals(date)) {
+ newDate = sdf.format(date);
+ } else {
+ newDate = sdf.format(DateUtil.getDate());
+ }
+ long millisecond = 24 * 3600 * 1000;
+ try {
+ millisecond += sdf.parse(newDate).getTime();
+ } catch (ParseException e) {
+ e.printStackTrace();
+ }
+ return millisecond;
+ }
+
+ /**
+ * 日期转毫秒（加N年）
+ *
+ * @param date
+ * @return
+ */
+ public static long getMillisecond_year(String date, Integer year) {
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+ String newDate = "";
+ if ("".equals(date)) {
+ newDate = sdf.format(DateUtil.getDate());
+ } else {
+ newDate = getDateTime(Long.parseLong(date));
+ }
+ Date dt = null;
+ try {
+ dt = sdf.parse(newDate);
+ } catch (ParseException e) {
+ e.printStackTrace();
+ }
+ Calendar rightNow = Calendar.getInstance();
+ rightNow.setTime(dt);
+ rightNow.add(Calendar.YEAR, year);
+ Date dt1 = rightNow.getTime();
+ return dt1.getTime();
+ }
+
+ /**
+ * 日期转毫秒（加N天）
+ *
+ * @param date
+ * 毫秒字符串
+ * @return
+ */
+ public static Date getMillisecond_day(String date, Integer day) {
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+ String newDate = "";
+ if ("".equals(date)) {
+ newDate = sdf.format(DateUtil.getDate());
+ } else {
+ newDate = date;
+ }
+ Date dt = null;
+ try {
+ dt = sdf.parse(newDate);
+ } catch (ParseException e) {
+ e.printStackTrace();
+ }
+ Calendar rightNow = Calendar.getInstance();
+ rightNow.setTime(dt);
+ rightNow.add(Calendar.DATE, day);
+ Date dt1 = rightNow.getTime();
+ Date dates = new Date(dt1.getTime());
+ return dates;
+ }
+
+ /**
+ * 日期转毫秒（加N月）
+ *
+ * @param date
+ * @return
+ */
+ public static long getMillisecond_month(String date, Integer day) {
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+ String newDate = "";
+ if ("".equals(date)) {
+ newDate = sdf.format(DateUtil.getDate());
+ } else {
+ newDate = getDateTime(Long.parseLong(date));
+ }
+ Date dt = null;
+ try {
+ dt = sdf.parse(newDate);
+ } catch (ParseException e) {
+ e.printStackTrace();
+ }
+ Calendar rightNow = Calendar.getInstance();
+ rightNow.setTime(dt);
+ rightNow.add(Calendar.MONTH, day);
+ Date dt1 = rightNow.getTime();
+ return dt1.getTime();
+ }
+
+ /**
+ * 日期转毫秒（加分钟）
+ *
+ * @param date
+ * @return
+ */
+ public static long getMillisecond_fz(String date, Integer day) {
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+ String newDate = "";
+ if ("".equals(date)) {
+ newDate = sdf.format(DateUtil.getDate());
+ } else {
+ newDate = getDateTime(Long.parseLong(date));
+ }
+ Date dt = null;
+ try {
+ dt = sdf.parse(newDate);
+ } catch (ParseException e) {
+ e.printStackTrace();
+ }
+ Calendar rightNow = Calendar.getInstance();
+ rightNow.setTime(dt);
+ rightNow.add(Calendar.MINUTE, day);
+ Date dt1 = rightNow.getTime();
+ return dt1.getTime();
+ }
+
+ public static Date getMillisecond_fz1(String date, Integer day) {
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+ Date dt = null;
+ try {
+ dt = sdf.parse(date);
+ } catch (ParseException e) {
+ e.printStackTrace();
+ }
+ Calendar rightNow = Calendar.getInstance();
+ rightNow.setTime(dt);
+ rightNow.add(Calendar.MINUTE, day);
+ Date dt1 = rightNow.getTime();
+ return dt1;
+ }
+
+ /**
+ * 字符串日期转毫秒
+ *
+ * @param date
+ * @return
+ */
+ public static long getMillisecond_str(String date) {
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+ if ("".equals(date)) {
+ date = sdf.format(DateUtil.getDate());
+ }
+ long millisecond = 0;
+ try {
+ millisecond = sdf.parse(date).getTime();
+ } catch (ParseException e) {
+ e.printStackTrace();
+ }
+ return millisecond;
+ }
+
+ /**
+ * 字符串日期转毫秒
+ *
+ * @param date
+ * @return
+ */
+ public static long getMillisecond_strYmd(String date) {
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+ if ("".equals(date)) {
+ date = sdf.format(DateUtil.getDate());
+ }
+ long millisecond = 0;
+ try {
+ millisecond = sdf.parse(date).getTime();
+ } catch (ParseException e) {
+ e.printStackTrace();
+ }
+ return millisecond;
+ }
+
+ /**
+ * 字符串日期转Date
+ *
+ * @param string
+ * @return date
+ * @throws ParseException
+ */
+ public static Date getStrToDate(String dateString) throws ParseException {
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+ Date date = sdf.parse(dateString);
+ return date;
+ }
+
+ /**
+ * 字符串日期转Date
+ *
+ * @param date
+ * @return
+ */
+ public static Date getDate_str(String dateStr) {
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+ sdf.setTimeZone(tz);
+ if ("".equals(dateStr)) {
+ dateStr = sdf.format(DateUtil.getDate());
+ }
+ Date date = null;
+ try {
+ date = sdf.parse(dateStr);
+ } catch (ParseException e) {
+ e.printStackTrace();
+ }
+ return date;
+ }
+
+ /**
+ * 字符串日期转Date yyyy-MM-dd HH:mm
+ *
+ * @param date
+ * @return
+ */
+ public static Date getDate_str2(String dateStr) {
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm");
+ sdf.setTimeZone(tz);
+ if ("".equals(dateStr)) {
+ dateStr = sdf.format(DateUtil.getDate());
+ }
+ Date date = null;
+ try {
+ date = sdf.parse(dateStr);
+ } catch (ParseException e) {
+ e.printStackTrace();
+ }
+ return date;
+ }
+
+ /**
+ * 字符串日期转Date yyyy-MM-dd HH:mm:ss
+ *
+ * @param date
+ * @return
+ */
+ public static Date getDate_str3(String dateStr) {
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+ sdf.setTimeZone(tz);
+ if ("".equals(dateStr)) {
+ dateStr = sdf.format(DateUtil.getDate());
+ }
+ Date date = null;
+ try {
+ date = sdf.parse(dateStr);
+ } catch (ParseException e) {
+ e.printStackTrace();
+ }
+ return date;
+ }
+
+ /**
+ * 字符串日期转Date
+ *
+ * @param date
+ * @return
+ */
+ public static Date getDate_strYMd(Long dateStr) {
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+ if (dateStr == null) {
+ dateStr = DateUtil.getCurMilli();
+ }
+ Date date = null;
+ try {
+ date = sdf.parse(sdf.format(new Date(dateStr)));
+ } catch (ParseException e) {
+ e.printStackTrace();
+ }
+ return date;
+ }
+
+ /**
+ * 毫秒转Date
+ *
+ * @param date
+ * @return
+ */
+ public static Date getDate_strYMdHms(Long dateStr) {
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+ if (dateStr == null) {
+ dateStr = DateUtil.getCurMilli();
+ }
+ Date date = null;
+ try {
+ date = sdf.parse(sdf.format(new Date(dateStr)));
+ } catch (ParseException e) {
+ e.printStackTrace();
+ }
+ return date;
+ }
+
+ /**
+ * 字符串日期转Date
+ *
+ * @param date
+ * @return
+ */
+ public static Date getDate_strYMdHm(Long dateStr) {
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm");
+ if (dateStr == null) {
+ dateStr = DateUtil.getCurMilli();
+ }
+ Date date = null;
+ try {
+ date = sdf.parse(sdf.format(new Date(dateStr)));
+ } catch (ParseException e) {
+ e.printStackTrace();
+ }
+ return date;
+ }
+
+ /**
+ * 字符串日期转毫秒
+ *
+ * @param date
+ * @return
+ */
+ public static long getMillisecond_strDmy(String date) {
+ SimpleDateFormat sdf = new SimpleDateFormat("dd/MM/yyyy");
+ if ("".equals(date)) {
+ date = sdf.format(DateUtil.getDate());
+ }
+ long millisecond = 0;
+ try {
+ millisecond = sdf.parse(date).getTime();
+ } catch (ParseException e) {
+ e.printStackTrace();
+ }
+ return millisecond;
+ }
+
+ /**
+ * 字符串日期转毫秒转毫秒（加24小时）
+ *
+ * @param date
+ * @return
+ */
+ public static long getMillisecond_str_24h(String date) {
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+ if ("".equals(date)) {
+ date = sdf.format(DateUtil.getDate());
+ }
+ long millisecond = 24 * 3600 * 1000;
+ try {
+ millisecond += sdf.parse(date).getTime();
+ } catch (ParseException e) {
+ e.printStackTrace();
+ }
+ return millisecond;
+ }
+
+ /**
+ * 字符串日期转毫秒转毫秒（加24小时）
+ *
+ * @param date
+ * @return
+ */
+ public static long getMillisecond_strYmd_24h(String date) {
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+ if ("".equals(date)) {
+ date = sdf.format(DateUtil.getDate());
+ }
+ long millisecond = 24 * 3600 * 1000;
+ try {
+ millisecond += sdf.parse(date).getTime();
+ } catch (ParseException e) {
+ e.printStackTrace();
+ }
+ return millisecond;
+ }
+
+ /**
+ * 毫秒转日期
+ *
+ * @param millisecond
+ * @return
+ */
+ public static String getDate(long millisecond) {
+ if (millisecond == 0) {
+ millisecond = getCurMilli();
+ }
+ SimpleDateFormat dateformat = new SimpleDateFormat("yyyy-MM-dd");
+ Calendar calendar = getCalendar();
+ calendar.setTimeInMillis(millisecond);
+ return dateformat.format(calendar.getTime());
+ }
+
+ /**
+ * 转换为指定格式的时间
+ *
+ * @return Date
+ */
+ public static Date getDate(String date, String pattern) {
+ SimpleDateFormat format = new SimpleDateFormat(pattern);
+ Date d = null;
+ try {
+ d = format.parse(date);
+ } catch (ParseException ex) {
+ return null;
+ }
+ return d;
+ }
+
+ /**
+ * 毫秒转日期
+ *
+ * @param millisecond
+ * @return
+ */
+ public static String getDate_HH(long millisecond) {
+ if (millisecond == 0) {
+ millisecond = getCurMilli();
+ }
+ SimpleDateFormat dateformat = new SimpleDateFormat("HH");
+ Calendar calendar = getCalendar();
+ calendar.setTimeInMillis(millisecond);
+ return dateformat.format(calendar.getTime());
+ }
+
+ /**
+ * 毫秒转日期时间
+ *
+ * @param millisecond
+ * @return
+ */
+ public static String getDateTime(long millisecond) {
+ if (millisecond == 0) {
+ millisecond = getCurMilli();
+ }
+ SimpleDateFormat dateformat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+ Calendar calendar = getCalendar();
+ calendar.setTimeInMillis(millisecond);
+ return dateformat.format(calendar.getTime());
+ }
+
+ /**
+ * 毫秒转年月日
+ *
+ * @param millisecond
+ * @return
+ */
+ public static String getDateYMD(long millisecond) {
+ if (millisecond == 0) {
+ millisecond = getCurMilli();
+ }
+ SimpleDateFormat dateformat = new SimpleDateFormat("yyyy年MM月dd日");
+ Calendar calendar = getCalendar();
+ calendar.setTimeInMillis(millisecond);
+ return dateformat.format(calendar.getTime());
+ }
+
+ /**
+ * 两日期相差毫秒
+ *
+ * @param startDate
+ * @param endDate
+ * @return
+ */
+ public static long getMinusMillisecond(Date startDate, Date endDate) {
+ long startMillisecond = getMillisecond(startDate);
+ long endMillisecond = getMillisecond(endDate);
+ long minusMillisecond = endMillisecond - startMillisecond;
+ if (minusMillisecond < 0) {
+ minusMillisecond = 0;
+ }
+ return minusMillisecond;
+ }
+
+ /**
+ * 两日期相差天数
+ *
+ * @param startDate
+ * @param endDate
+ * @return
+ */
+ public static long getMinusDay(Date startDate, Date endDate) {
+ long startMillisecond = getMillisecond(startDate);
+ long endMillisecond = getMillisecond(endDate);
+ long minusMillisecond = endMillisecond - startMillisecond;
+ long day = 0;
+ if (minusMillisecond < 0) {
+ day = 0;
+ } else {
+ day = minusMillisecond / (24 * 3600 * 1000);
+ }
+ return day;
+ }
+
+ /**
+ * 前N天毫秒
+ *
+ * @param day
+ * @return
+ */
+ public static long getRetreatDay_millisecond(int day) {
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+ long nowMillisecond = 0;
+ try {
+ nowMillisecond = sdf.parse(sdf.format(DateUtil.getDate())).getTime();
+ } catch (ParseException e) {
+ e.printStackTrace();
+ }
+ nowMillisecond += 24 * 3600 * 1000;
+ long retreatMillisecond = 24 * 3600 * 1000 * day;
+ return nowMillisecond - retreatMillisecond;
+ }
+
+ /**
+ * 前N天时间
+ *
+ * @param day
+ * @return
+ */
+ public static String getRetreatDay_millisecond1(int day) {
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+ long nowMillisecond = 0;
+ try {
+ nowMillisecond = sdf.parse(sdf.format(DateUtil.getDate())).getTime();
+ } catch (ParseException e) {
+ e.printStackTrace();
+ }
+ nowMillisecond += 24 * 3600 * 1000;
+ long retreatMillisecond = 24 * 3600 * 1000 * day;
+ long s = nowMillisecond - retreatMillisecond;
+ Date date = new Date(s);
+ String res = sdf.format(date);
+ return res;
+ }
+
+ // 当前时间前30天
+ public static String getRetreatDay_millisecond2() {
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+ Date today = new Date();
+ String endDate = sdf.format(today);// 当前日期
+ // 获取三十天前日期
+ Calendar theCa = Calendar.getInstance();
+ theCa.setTime(today);
+ theCa.add(theCa.DATE, -30);// 最后一个数字30可改，30天的意思
+ Date start = theCa.getTime();
+ String startDate = sdf.format(start);// 三十天之前日期
+ return startDate;
+ }
+
+ /**
+ * 日期转秒
+ *
+ * @param date
+ * @return
+ */
+ public static long getDecond(Date date) {
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+ String newDate = "";
+ if (!"".equals(date)) {
+ newDate = sdf.format(date);
+ } else {
+ newDate = sdf.format(DateUtil.getDate());
+ }
+ long second = 0;
+ try {
+ second = sdf.parse(newDate).getTime() / 1000;
+ } catch (ParseException e) {
+ e.printStackTrace();
+ }
+ return second;
+ }
+
+ /**
+ * 日期转String
+ *
+ * @param date
+ * @return
+ * @throws ParseException
+ */
+ public static String getDateToString(Date date,String pattern) throws ParseException {
+ SimpleDateFormat sdf = new SimpleDateFormat(pattern);
+ String newDate = sdf.format(date);
+ long millisecond = sdf.parse(newDate).getTime();
+ Calendar calendar = getCalendar();
+ calendar.setTimeInMillis(millisecond);
+ return sdf.format(calendar.getTime());
+ }
+
+
+ /**
+ * 毫秒转星期XX
+ *
+ * @param millisecond
+ * @return
+ */
+ public static int getDate_week(Long millisecond) {
+ if (millisecond == null) {
+ millisecond = getCurMilli();
+ }
+ Calendar cal = getCalendar();
+ cal.setTimeInMillis(millisecond);
+ return cal.get(Calendar.DAY_OF_WEEK) - 1;
+
+ }
+
+ /**
+ * 获取当前系统时间已yyyy-MM-dd HH:mm:ss格式化的字符串
+ */
+ public static String nowStr() {
+
+ SimpleDateFormat dateFormat = new SimpleDateFormat("yy-MM-dd HH:mm:ss");
+ return dateFormat.format(getDate());
+ }
+
+ /**
+ *
+ * 获取之前几天日期
+ *
+ * @param pattern
+ * yyyy-MM-dd（默认）
+ * @param few
+ * 之前几天
+ */
+ public static String beforeFewDayStr(String pattern, Integer few) {
+
+ if (pattern == null || "".equals(pattern)) {
+ pattern = "yyyy-MM-dd";
+ }
+ Calendar c = getCalendar();
+ c.add(Calendar.DATE, -few);
+ return new SimpleDateFormat(pattern).format(c.getTime());
+ }
+
+
+ /**
+ * 得到几天后的时间
+ *
+ * @param d
+ * @param day
+ * @return
+ */
+ public static Date getDateAfter(Date d, int day) {
+ SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
+ Calendar now = Calendar.getInstance();
+ now.setTime(d);
+ now.set(Calendar.DATE, now.get(Calendar.DATE) - day);//+后 -前
+ return now.getTime();
+ }
+
+
+ /**
+ * 获取今天日期
+ *
+ * @param pattern
+ * yyyy-MM-dd（默认）
+ */
+ public static String todayStr(String pattern) {
+
+ if (pattern == null || "".equals(pattern)) {
+ pattern = "yyyy-MM-dd";
+ }
+ return new SimpleDateFormat(pattern).format(getDate());
+ }
+
+ /**
+ * 获取当前系统时间戳字符串
+ */
+ public static String nowDateLongStr() {
+
+ return getDate().getTime() + "";
+ }
+
+ /**
+ * 获取当前系统时间
+ *
+ * @return
+ */
+ public static Date now() {
+
+ return getDate();
+ }
+
+ /*public static void main(String[] args) throws ParseException {
+ // 打印测试日期包含
+ Date time1 = getDate_str("2017-3-11");
+ Date time2 = getDate_str("2017-3-15");
+ Date time3 = getDate_str("2017-3-17");
+ Date time4 = getDate_str("2017-3-12");
+ Date time5 = getDate_str("2017-3-16");
+ Date from = getDate_str("2017-3-12");
+ Date to = getDate_str("2017-3-16");
+ System.out.println(belongCalendar(time1, from, to));
+ System.out.println(belongCalendar(time2, from, to));
+ System.out.println(belongCalendar(time3, from, to));
+ System.out.println(belongCalendar(time4, from, to));
+ System.out.println(belongCalendar(time5, from, to));
+ System.out.println(nowStr());
+
+ }
+*/
+ /**
+ * 把日期往后增加一天. 正数往后推,负数往前移动
+ *
+ * @param day
+ * @return
+ */
+ public static String getString(int day) {
+ Date date = new Date();// 取时间
+ Calendar calendar = new GregorianCalendar();
+ calendar.setTime(date);
+ calendar.add(calendar.DATE, day);// 把日期往后增加一天.整数往后推,负数往前移动
+ date = calendar.getTime(); // 这个时间就是日期往后推一天的结果
+ SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd");
+ String dateString = formatter.format(date);
+ return dateString;
+ }
+
+ /**
+ * 根据当前日期获得所在周的日期区间（周一和周日日期）
+ *
+ * @return
+ * @author zhaoxuepu
+ * @throws ParseException
+ */
+ public static String getTimeInterval(Date date) {
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+ Calendar cal = Calendar.getInstance();
+ cal.setTime(date);
+ // 判断要计算的日期是否是周日，如果是则减一天计算周六的，否则会出问题，计算到下一周去了
+ int dayWeek = cal.get(Calendar.DAY_OF_WEEK);// 获得当前日期是一个星期的第几天
+ if (1 == dayWeek) {
+ cal.add(Calendar.DAY_OF_MONTH, -1);
+ }
+ // System.out.println("要计算日期为:" + sdf.format(cal.getTime())); // 输出要计算日期
+ // 设置一个星期的第一天，按中国的习惯一个星期的第一天是星期一
+ cal.setFirstDayOfWeek(Calendar.MONDAY);
+ // 获得当前日期是一个星期的第几天
+ int day = cal.get(Calendar.DAY_OF_WEEK);
+ // 根据日历的规则，给当前日期减去星期几与一个星期第一天的差值
+ cal.add(Calendar.DATE, cal.getFirstDayOfWeek() - day);
+ String imptimeBegin = sdf.format(cal.getTime());
+ // System.out.println("所在周星期一的日期：" + imptimeBegin);
+ cal.add(Calendar.DATE, 6);
+ String imptimeEnd = sdf.format(cal.getTime());
+ // System.out.println("所在周星期日的日期：" + imptimeEnd);
+ return imptimeBegin + "," + imptimeEnd;
+ }
+
+ /**
+ * 根据当前日期获得上周的日期区间（上周周一和周日日期）
+ *
+ * @return
+ * @author zhaoxuepu
+ */
+ public static String getLastTimeInterval() {
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+ Calendar calendar1 = Calendar.getInstance();
+ Calendar calendar2 = Calendar.getInstance();
+ int dayOfWeek = calendar1.get(Calendar.DAY_OF_WEEK) - 1;
+ int offset1 = 1 - dayOfWeek;
+ int offset2 = 7 - dayOfWeek;
+ calendar1.add(Calendar.DATE, offset1 - 7);
+ calendar2.add(Calendar.DATE, offset2 - 7);
+ // System.out.println(sdf.format(calendar1.getTime()));// last Monday
+ String lastBeginDate = sdf.format(calendar1.getTime());
+ // System.out.println(sdf.format(calendar2.getTime()));// last Sunday
+ String lastEndDate = sdf.format(calendar2.getTime());
+ return lastBeginDate + "," + lastEndDate;
+ }
+
+ public static String DateYUE() {
+ SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
+ Calendar c = Calendar.getInstance();
+ c.add(Calendar.MONTH, 0);
+ c.set(Calendar.DAY_OF_MONTH, 1);// 设置为1号,当前日期既为本月第一天
+ String first = format.format(c.getTime());
+
+ // 获取当前月最后一天
+ Calendar ca = Calendar.getInstance();
+ ca.set(Calendar.DAY_OF_MONTH, ca.getActualMaximum(Calendar.DAY_OF_MONTH));
+ String last = format.format(ca.getTime());
+ return first + "," + last;
+ }
+
+ public static String getBeforeFirstMonthdate() {
+ SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
+ Calendar calendar = Calendar.getInstance();
+ Calendar calendar1 = Calendar.getInstance();
+ calendar.add(Calendar.MONTH, -1);
+ calendar.set(Calendar.DAY_OF_MONTH, 1);
+
+ int month = calendar1.get(Calendar.MONTH);
+ calendar1.set(Calendar.MONTH, month - 1);
+ calendar1.set(Calendar.DAY_OF_MONTH, calendar1.getActualMaximum(Calendar.DAY_OF_MONTH));
+ String str = format.format(calendar.getTime());
+ String str1 = format.format(calendar1.getTime());
+
+ return str + "," + str1;
+ }
+
+ /**
+ * 获取某年第一天和最后一天日期
+ *
+ * @param year
+ * 年份
+ * @return Date
+ */
+
+ public static String getYearFirst(int year) {
+ SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
+ Calendar calendar = Calendar.getInstance();
+ calendar.clear();
+ calendar.set(Calendar.YEAR, year);
+
+ Calendar calendar1 = Calendar.getInstance();
+ calendar1.clear();
+ calendar1.set(Calendar.YEAR, year);
+ calendar1.roll(Calendar.DAY_OF_YEAR, -1);
+
+ String str = format.format(calendar.getTime());
+ String str1 = format.format(calendar1.getTime());
+
+ return str + "," + str1;
+ }
+
+ /**
+ * 在指定日期上增加N天
+ */
+ public static Date addDate(Date date,long day) throws ParseException {
+ long time = date.getTime(); // 得到指定日期的毫秒数
+ day = day*24*60*60*1000; // 要加上的天数转换成毫秒数
+ time+=day; // 相加得到新的毫秒数
+ return new Date(time); // 将毫秒数转换成日期
+ }
+
+
+ // 获取一天开始和结束
+ public static String getDay() {
+ Date dBefore = new Date();
+ SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd"); //设置时间格式
+ String defaultStartDate = sdf.format(dBefore); //格式化前一天
+ defaultStartDate = defaultStartDate+" 00:00:00";
+ String defaultEndDate = defaultStartDate.substring(0,10)+" 23:59:59";
+
+ return defaultStartDate + "," + defaultEndDate;
+ }
+
+
+
+ public static void main(String[] args) throws ParseException {
+ System.out.println(getDay());
+ }
+
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/GDMapElectricFenceUtil.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/GDMapElectricFenceUtil.java
new file mode 100644
index 0000000..9579ee5
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/GDMapElectricFenceUtil.java
@@ -0,0 +1,405 @@
+package com.stylefeng.guns.modular.system.util;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.stylefeng.guns.core.util.ToolUtil;
+import com.stylefeng.guns.modular.system.service.IGDInterfaceService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Bean;
+import org.springframework.http.HttpEntity;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.MediaType;
+import org.springframework.http.client.ClientHttpRequestFactory;
+import org.springframework.http.client.HttpComponentsClientHttpRequestFactory;
+import org.springframework.stereotype.Component;
+import org.springframework.web.client.RestTemplate;
+
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.*;
+
+//import com.stylefeng.guns.modular.system.model.GDFence;
+//import com.stylefeng.guns.modular.system.service.IGDFenceService;
+
+/**
+ * 电子围栏工具类
+ */
+@Component
+public class GDMapElectricFenceUtil {
+
+ @Autowired
+ private RestTemplate restTemplate;
+
+ @Autowired
+ private IGDInterfaceService gdInterfaceService;
+
+ private String key = "e17d799b2506d05faf7f88320a266803";
+
+ private JSONArray jsonArray = new JSONArray();
+
+
+ @Bean
+ public ClientHttpRequestFactory simpleClientHttpRequestFactory() {
+// SimpleClientHttpRequestFactory factory=new SimpleClientHttpRequestFactory();
+// 上一行被注释掉的是Spring自己的实现，下面是依赖了httpclient包后的实现
+ HttpComponentsClientHttpRequestFactory factory = new HttpComponentsClientHttpRequestFactory();
+ factory.setConnectTimeout(5000);
+ factory.setReadTimeout(5000);
+ return factory;
+ }
+
+ /**
+ * 创建电子围栏
+ * @param id
+ * @param points
+ * @return
+ */
+ public List<String> createFence(String id, String points){
+ Calendar calendar = Calendar.getInstance();
+ calendar.setTime(new Date());
+ calendar.set(Calendar.DAY_OF_MONTH, calendar.get(Calendar.DAY_OF_MONTH) + 35);
+ SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");
+ String format = simpleDateFormat.format(calendar.getTime());
+
+
+ //开始调用高德接口创建围栏
+ String[] s = points.split("_");
+ List<String> resoult = new ArrayList<>();
+ for(int i = 0; i < s.length; i++){
+ String[] split = s[i].split(";");
+ JSONObject json = new JSONObject();
+ json.put("name", "location_" + id);
+ if(split.length == 2){
+ json.put("center", split[0]);
+ json.put("radius", split[1]);
+ }else{
+ json.put("points", s[i]);
+ }
+ json.put("enable", "true");
+ json.put("valid_time", format);
+ json.put("repeat", "Mon,Tues,Wed,Thur,Fri,Sat,Sun");
+ json.put("alert_condition", "enter;leave");
+ json.put("desc", id);
+
+ HttpHeaders headers = new HttpHeaders();
+ MediaType type = MediaType.parseMediaType("application/json; charset=UTF-8");
+ headers.setContentType(type);
+ headers.add("Accept", MediaType.APPLICATION_JSON.toString());
+ HttpEntity<String> formEntity = new HttpEntity<>(json.toString(), headers);
+
+ String url = "https://restapi.amap.com/v4/geofence/meta?key=" + key;
+ String js = restTemplate.postForObject(url, formEntity, String.class);
+ JSONObject jsonObject = JSON.parseObject(js);
+ JSONObject data = jsonObject.getJSONObject("data");
+ String status = data.getString("status");
+
+ gdInterfaceService.saveData("https://restapi.amap.com/v4/geofence/meta", "创建电子围栏");
+
+ if(status.equals("0")){//创建成功
+ resoult.add(data.getString("gid"));
+ }
+ }
+ return resoult;
+ }
+
+
+
+
+ /**
+ * 创建电子围栏
+ * @param id 围栏名称----绘制的数据id值
+ * @param points 多边形围栏坐标
+ */
+ public List<String> createElectricFenc(String id, String points){
+ List<String> fence = this.createFence(id, points);
+ List<String> gids = new ArrayList<>();
+ for(String f : fence){
+ JSONObject jsonObject = JSON.parseObject(f);
+ JSONObject data = jsonObject.getJSONObject("data");
+ String status = data.getString("status");
+ if(status.equals("0")){
+ gids.add(data.getString("gid"));
+ }
+ }
+ return gids;
+ }
+
+
+ /**
+ * 查询
+ * @param gid
+ * @return
+ */
+ public String findElectricFenc(String gid){
+ String url = "https://restapi.amap.com/v4/geofence/meta?key=" + key + "&gid=" + gid;
+ String forObject = restTemplate.getForObject(url, String.class);
+ JSONObject jsonObject = JSON.parseObject(forObject);
+ JSONObject data = jsonObject.getJSONObject("data");
+ JSONArray rs_list = data.getJSONArray("rs_list");
+ if(rs_list.size() > 0){
+ return rs_list.getJSONObject(0).getString("gid");
+ }
+ return "";
+ }
+
+
+
+ /**
+ * 查询以创建的所有电子围栏
+ */
+ public String findElectricFenc(String center, String radius, String points){
+ String url = "https://restapi.amap.com/v4/geofence/meta?key=" + key;
+ String forObject = restTemplate.getForObject(url, String.class);
+ JSONObject jsonObject = JSON.parseObject(forObject);
+ JSONObject data = jsonObject.getJSONObject("data");
+
+ gdInterfaceService.saveData("https://restapi.amap.com/v4/geofence/meta", "查询电子围栏");
+
+ if(ToolUtil.isNotEmpty(center)){//圆形电子围栏
+ JSONArray rs_list = data.getJSONArray("rs_list");
+ for(int i = 0; i < rs_list.size(); i++){
+ String c = rs_list.getJSONObject(i).getString("center");
+ Double r = rs_list.getJSONObject(i).getDouble("radius");
+ if(c.equals(center) && radius.equals(String.valueOf(r))){
+ return rs_list.getJSONObject(i).getString("gid");
+ }
+ }
+ }else{
+ JSONArray rs_list = data.getJSONArray("rs_list");
+ for(int i = 0; i < rs_list.size(); i++){
+ String p = rs_list.getJSONObject(i).getString("points");
+ if(points.equals(p)){
+ return rs_list.getJSONObject(i).getString("gid");
+ }
+ }
+ }
+ return null;
+ }
+
+
+ /**
+ * 查询所有绘制好的电子围栏
+ * @return
+ */
+ public JSONArray findAllElectricFenc(int page){
+ if(page == 1){
+ jsonArray = new JSONArray();
+ }
+ String url = "https://restapi.amap.com/v4/geofence/meta?key=" + key + "&page_no=" + page + "&page_size=" + 30;
+ String forObject = restTemplate.getForObject(url, String.class);
+ JSONObject jsonObject = JSON.parseObject(forObject);
+ JSONObject data = jsonObject.getJSONObject("data");
+ JSONArray rs_list = data.getJSONArray("rs_list");
+ jsonArray.addAll(rs_list);
+
+ gdInterfaceService.saveData("https://restapi.amap.com/v4/geofence/meta", "查询电子围栏");
+
+ //判断是否有分页
+ int total_record = data.getIntValue("total_record");
+ if(total_record > jsonArray.size()){
+ //有分页，递归调用自己
+ page++;
+ this.findAllElectricFenc(page);
+ }
+ return jsonArray;
+ }
+
+
+ /**
+ * 批量更新电子围栏（失效的数据）
+ * @param jsonArray
+ * @throws ParseException
+ */
+ public void updateElectricFenc(JSONArray jsonArray) throws ParseException{
+ //批量更新查询出的失效的电子围栏，围栏失效日期在当前日期之后的数据
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+ for(int i = 0; i < jsonArray.size(); i++){
+ JSONObject jsonObject = jsonArray.getJSONObject(i);
+ Calendar calendar = Calendar.getInstance();
+ calendar.setTime(new Date());
+ calendar.set(Calendar.HOUR_OF_DAY, 8);
+ calendar.set(Calendar.MINUTE, 0);
+ calendar.set(Calendar.SECOND, 0);
+ calendar.set(Calendar.MILLISECOND, 0);
+ long timeInMillis1 = calendar.getTimeInMillis();
+
+ String valid_time = jsonObject.getString("valid_time");
+ Date parse = sdf.parse(valid_time);
+ Calendar cale = Calendar.getInstance();
+ cale.setTime(parse);
+ cale.set(Calendar.HOUR_OF_DAY, 8);
+ cale.set(Calendar.MINUTE, 0);
+ cale.set(Calendar.SECOND, 0);
+ cale.set(Calendar.MILLISECOND, 0);
+ long timeInMillis = cale.getTimeInMillis();
+ if(timeInMillis1 >= timeInMillis){
+ String gid = jsonObject.getString("gid");
+ String id = jsonObject.getString("name");
+ String center = jsonObject.getString("center");
+ String radius = jsonObject.getString("radius");
+ String points = jsonObject.getString("points");
+ calendar = Calendar.getInstance();
+ calendar.setTime(new Date());
+ calendar.set(Calendar.DAY_OF_MONTH, calendar.get(Calendar.DAY_OF_MONTH) + 35);
+ SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");
+ String format = simpleDateFormat.format(calendar.getTime());
+ this.updateElectricFenc(gid, id, center, radius, points, format);
+ }
+
+ }
+ }
+
+
+
+ /**
+ * 更新电子围栏
+ * @param gid
+ * @param id
+ * @param center
+ * @param radius
+ * @param points
+ */
+ public void updateElectricFenc(String gid, String id, String center, String radius, String points, String valid_time) throws ParseException {
+ //开始调用高德接口创建围栏
+ JSONObject json = new JSONObject();
+ json.put("name", id);
+ if(ToolUtil.isNotEmpty(center)){
+ json.put("center", center);
+ json.put("radius", radius);
+ }else{
+ json.put("points", points);
+ }
+ json.put("valid_time", valid_time);
+ json.put("repeat", "Mon,Tues,Wed,Thur,Fri,Sat,Sun");
+ json.put("alert_condition", "enter;leave");
+ json.put("desc", id + "围栏更新描述");
+
+ HttpHeaders headers = new HttpHeaders();
+ MediaType type = MediaType.parseMediaType("application/json; charset=UTF-8");
+ headers.setContentType(type);
+ headers.add("Accept", MediaType.APPLICATION_JSON.toString());
+ HttpEntity<String> formEntity = new HttpEntity<>(json.toString(), headers);
+
+ String url = "https://restapi.amap.com/v4/geofence/meta?key=" + key + "&gid=" + gid;
+ String s = restTemplate.patchForObject(url, formEntity, String.class);
+ System.out.println(s);
+
+ gdInterfaceService.saveData("https://restapi.amap.com/v4/geofence/meta", "更新电子围栏");
+ }
+
+
+ /**
+ * 电子围栏监控
+ * @param diu 设备唯一标识符，作为记录依据，不影响判断结果。Android设备一般使用imei号码，iOS一般使用idfv号，其余设备可根据业务自定义。
+ * @param locations 数据为坐标数据和坐标产生的时间戳数据，至少包含一个坐标对和时间戳。
+ * 1、传入1个点时，直接判断交互关系。
+ * 2、当传入多个点时，可以通过前后时间判断动态交互关系。
+ * 格式: x1,y1,unix_ts1;x2,y2,unix_ts2
+ * 动态交互判断方法：第一个点作为当前时间的点，然后从其余点中选出在当前点之前10s～1小时范围内的最早点，用这两个时间点的位置判断设备与围栏的动态交互关系。若数据无效交互关系默认返回leave。
+ * @return
+ */
+ public List<String> monitorElectricFenc(String diu, String locations){
+ if(ToolUtil.isEmpty(diu)){
+ diu = "B78F99DD-2496-4A43-843B-172CDA2D9798";
+ }
+ locations = locations + "," + (new Date().getTime() / 1000);
+ String url = "https://restapi.amap.com/v4/geofence/status?key=" + key + "&diu=" + diu + "&locations=" + locations;
+ String forObject = restTemplate.getForObject(url, String.class);
+ JSONObject jsonObject = JSON.parseObject(forObject);
+ List<String> ids = new ArrayList<>();
+ JSONObject data = jsonObject.getJSONObject("data");
+ int status = data.getIntValue("status");
+ if(0 == status){
+ JSONArray fencingEventList = data.getJSONArray("fencing_event_list");
+ for(int i = 0; i < fencingEventList.size(); i++){
+ String clientStatus = fencingEventList.getJSONObject(i).getString("client_status");
+ if(clientStatus.equals("in")){//包含给定坐标的电子围栏
+ JSONObject fence_info = fencingEventList.getJSONObject(i).getJSONObject("fence_info");//获取电子围栏信息
+ String gid = fence_info.getString("fence_gid");
+ ids.add(gid);
+ }
+ }
+ }
+ System.out.println("检测：" + forObject);
+
+ gdInterfaceService.saveData("https://restapi.amap.com/v4/geofence/status", "电子围栏监控");
+ return ids;
+ }
+
+
+ /**
+ * 删除电子围栏
+ * @param gid
+ * @return
+ */
+ public boolean deleteElectricFenc(String gid){
+ restTemplate.delete("https://restapi.amap.com/v4/geofence/meta?key={1}&gid={2}", key, gid);
+ System.out.println("删除：" );
+
+ gdInterfaceService.saveData("https://restapi.amap.com/v4/geofence/meta", "删除电子围栏");
+
+ return true;
+ }
+
+
+ /**
+ * 获取两点的距离
+ * @param origins 起点坐标
+ * @param destination 终点坐标
+ * @param type 计算类型：0：直线距离 1：驾车导航距离（仅支持国内坐标）。
+ * @return
+ */
+ public Map<String, String> getDistance(String origins, String destination, Integer type){
+ String url = "https://restapi.amap.com/v3/distance?key=" + key + "&origins=" + origins + "&destination=" + destination +
+ "&type=" + type;
+ String forObject = restTemplate.getForObject(url, String.class);
+ JSONObject jsonObject = JSON.parseObject(forObject);
+ String status = jsonObject.getString("status");
+
+ gdInterfaceService.saveData("https://restapi.amap.com/v3/distance", "查询两点间的距离");
+
+ if(status.equals("1")){
+ JSONArray results = jsonObject.getJSONArray("results");
+ JSONObject jsonObject1 = results.getJSONObject(0);
+ Map<String, String> map = new HashMap<>();
+ map.put("distance", jsonObject1.getString("distance"));//距离（米）
+ map.put("duration", jsonObject1.getString("duration"));//预计时间（秒）
+ return map;
+ }else{
+ System.err.println(forObject);
+ }
+ return null;
+ }
+
+
+ /**
+ * 获取路径规划
+ * @param origins 起点坐标
+ * @param destination 终点坐标
+ * @param waypoints 途经点
+ * @return
+ */
+ public Map<String, String> getDriving(String origins, String destination, String waypoints){
+ String url = "https://restapi.amap.com/v3/direction/driving?key=" + key + "&origin=" + origins + "&destination=" + destination +
+ "&waypoints=" + waypoints + "&extensions=base&strategy=0";
+ String forObject = restTemplate.getForObject(url, String.class);
+ JSONObject jsonObject = JSON.parseObject(forObject);
+ String status = jsonObject.getString("status");
+
+ gdInterfaceService.saveData("https://restapi.amap.com/v3/direction/driving", "获取路径规划");
+
+ if(status.equals("1")){
+ JSONObject route = jsonObject.getJSONObject("route");
+ JSONArray results = route.getJSONArray("paths");
+ JSONObject jsonObject1 = results.getJSONObject(0);
+ Map<String, String> map = new HashMap<>();
+ map.put("distance", jsonObject1.getString("distance"));//距离（米）
+ map.put("duration", jsonObject1.getString("duration"));//预计时间（秒）
+ return map;
+ }
+ return null;
+ }
+
+
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/GDMapGeocodingUtil.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/GDMapGeocodingUtil.java
new file mode 100644
index 0000000..c488e51
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/GDMapGeocodingUtil.java
@@ -0,0 +1,138 @@
+package com.stylefeng.guns.modular.system.util;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.stylefeng.guns.core.util.ToolUtil;
+import com.stylefeng.guns.modular.system.service.IGDInterfaceService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+import org.springframework.web.client.RestTemplate;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 高德地图的地理编码工具类
+ */
+@Component
+public class GDMapGeocodingUtil {
+
+ private String key = "e17d799b2506d05faf7f88320a266803";
+
+ @Autowired
+ private RestTemplate restTemplate;
+
+ @Autowired
+ private IGDInterfaceService gdInterfaceService;
+
+
+ /**
+ * 将行政区域名称转化为坐标
+ * @param province
+ * @param city
+ * @param county
+ * @param address
+ * @return
+ */
+ public Map<String, Object> geocoding(String province, String city, String county, String address){
+ Map<String, Object> map = new HashMap<>();
+ if(ToolUtil.isEmpty(province)){
+ map.put("status", -1);
+ map.put("data", "省不能为空");
+ return map;
+ }
+ if((ToolUtil.isEmpty(city) && ToolUtil.isNotEmpty(county)) || (ToolUtil.isEmpty(city) && ToolUtil.isNotEmpty(address))){
+ map.put("status", -1);
+ map.put("data", "市不能为空");
+ return map;
+ }
+ if((ToolUtil.isEmpty(county) && ToolUtil.isNotEmpty(address))){
+ map.put("status", -1);
+ map.put("data", "县/区不能为空");
+ return map;
+ }
+
+ String url = "https://restapi.amap.com/v3/geocode/geo?key=" + key + "&output=JSON";
+ url += "&address=" + province + (ToolUtil.isNotEmpty(city) ? city : "") + (ToolUtil.isNotEmpty(county) ? county : "") + (ToolUtil.isNotEmpty(address) ? address : "");
+ String forObject = restTemplate.getForObject(url, String.class);
+ JSONObject jsonObject = JSON.parseObject(forObject);
+ String status = jsonObject.getString("status");
+ List<String> list = new ArrayList<>();
+
+ gdInterfaceService.saveData("https://restapi.amap.com/v3/geocode/geo", "行政区域转经纬度");
+
+ if(status.equals("1")){
+ JSONArray geocodes = jsonObject.getJSONArray("geocodes");
+ for(int i = 0; i < geocodes.size(); i++){
+ String location = geocodes.getJSONObject(i).getString("location");
+ list.add(location);
+ }
+ }
+ map.put("status", 0);
+ map.put("data", list);
+ return map;
+ }
+
+
+
+ public Map<String, Object> geocoding(String address){
+ Map<String, Object> map = new HashMap<>();
+ String url = "https://restapi.amap.com/v3/geocode/geo?key=" + key + "&output=JSON&address=" + address;
+ String forObject = restTemplate.getForObject(url, String.class);
+ JSONObject jsonObject = JSON.parseObject(forObject);
+ String status = jsonObject.getString("status");
+ List<String> list = new ArrayList<>();
+
+ gdInterfaceService.saveData("https://restapi.amap.com/v3/geocode/geo", "行政区域转经纬度");
+
+ if(status.equals("1")){
+ JSONArray geocodes = jsonObject.getJSONArray("geocodes");
+ for(int i = 0; i < geocodes.size(); i++){
+ String location = geocodes.getJSONObject(i).getString("location");
+ list.add(location);
+ }
+ }
+ map.put("status", 0);
+ map.put("data", list);
+ return map;
+ }
+
+
+
+ /**
+ * 根据经纬度获取行政区域信息
+ * @param lon
+ * @param lan
+ * @return
+ * @throws Exception
+ */
+ public Map<String, String> geocode(String lon, String lan) throws Exception{
+ String url = "https://restapi.amap.com/v3/geocode/regeo?key=" + key + "&location=" + lon + "," + lan;
+ String forObject = restTemplate.getForObject(url, String.class);
+ JSONObject jsonObject = JSON.parseObject(forObject);
+ Map<String, String> map = new HashMap<>();
+
+ gdInterfaceService.saveData("https://restapi.amap.com/v3/geocode/regeo", "经纬度转行政区域");
+
+ if(jsonObject.getString("status").equals("1")){
+ JSONObject regeocode = jsonObject.getJSONObject("regeocode");
+ JSONObject addressComponent = regeocode.getJSONObject("addressComponent");
+ String address = regeocode.getString("formatted_address");
+ map.put("address", address);
+ String code = addressComponent.getString("adcode");
+ String province = addressComponent.getString("province");
+ String city = addressComponent.getString("city");
+ String district = addressComponent.getString("district");
+ map.put("province", province);
+ map.put("provinceCode", code.substring(0, 2) + "0000");
+ map.put("city", city);
+ map.put("cityCode", code.substring(0, 4) + "00");
+ map.put("district", district);
+ map.put("districtCode", code);
+ }
+ return map;
+ }
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/GaoDeMapUtil.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/GaoDeMapUtil.java
new file mode 100644
index 0000000..c263393
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/GaoDeMapUtil.java
@@ -0,0 +1,85 @@
+package com.stylefeng.guns.modular.system.util;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import org.apache.http.HttpEntity;
+import org.apache.http.client.config.RequestConfig;
+import org.apache.http.client.methods.CloseableHttpResponse;
+import org.apache.http.client.methods.HttpGet;
+import org.apache.http.impl.client.CloseableHttpClient;
+import org.apache.http.impl.client.HttpClients;
+import org.apache.http.util.EntityUtils;
+
+import java.io.IOException;
+public class GaoDeMapUtil {
+
+ public static void main(String[] args) {
+ // 地址名称
+ String address = "深圳市";
+ // 调用自己写好的封装方法
+ JSONObject positionObj = getLngAndLat(address);
+ String longitude = positionObj.getString("longitude");
+ String latitude = positionObj.getString("latitude");
+ System.out.println("经度：" + longitude);
+ System.out.println("纬度：" + latitude);
+
+ }
+
+ /**
+ * 根据地址查询经纬度
+ *
+ * @param address
+ * @return
+ */
+ public static JSONObject getLngAndLat(String address) {
+ JSONObject positionObj = new JSONObject();
+
+ try {
+ // 拼接请求高德的url
+ String url = "http://restapi.amap.com/v3/geocode/geo?address=" + address + "&output=JSON&key=" + "e17d799b2506d05faf7f88320a266803";
+ // 请求高德接口
+ String result = sendHttpGet(url);
+ JSONObject resultJOSN = JSONObject.parseObject(result);
+ System.out.println("高德接口返回原始数据：");
+ System.out.println(resultJOSN);
+ JSONArray geocodesArray = resultJOSN.getJSONArray("geocodes");
+ if (geocodesArray.size() > 0) {
+ String position = geocodesArray.getJSONObject(0).getString("location");
+ String[] lngAndLat = position.split(",");
+ String longitude = lngAndLat[0];
+ String latitude = lngAndLat[1];
+ positionObj.put("longitude", longitude);
+ positionObj.put("latitude", latitude);
+ }
+ geocodesArray.getJSONObject(0).getString("location");
+
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ return positionObj;
+ }
+
+ /**
+ * 发送Get请求
+ *
+ * @param url
+ * @return
+ */
+ public static String sendHttpGet(String url) {
+ HttpGet httpGet = new HttpGet(url);
+ RequestConfig defaultRequestConfig = RequestConfig.custom()
+ .setConnectTimeout(3000)
+ .setSocketTimeout(10000)
+ .build();
+ CloseableHttpClient httpClient = HttpClients.custom().setDefaultRequestConfig(defaultRequestConfig).build();
+ String result = "";
+ try {
+ CloseableHttpResponse closeableHttpResponse = httpClient.execute(httpGet);
+ HttpEntity entity = closeableHttpResponse.getEntity();
+ result = EntityUtils.toString(entity, "UTF-8");
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
+ return result;
+ }
+
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/HttpRequestUtil.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/HttpRequestUtil.java
new file mode 100644
index 0000000..25245b9
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/HttpRequestUtil.java
@@ -0,0 +1,182 @@
+package com.stylefeng.guns.modular.system.util;
+
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.util.Map;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+
+import com.alibaba.fastjson.JSONObject;
+import org.apache.commons.httpclient.HttpClient;
+import org.apache.commons.httpclient.HttpException;
+import org.apache.commons.httpclient.SimpleHttpConnectionManager;
+import org.apache.commons.httpclient.methods.GetMethod;
+import org.apache.commons.httpclient.methods.PostMethod;
+public class HttpRequestUtil {
+
+ public static String postRequest(String url, Map<String, String> params) {
+ // 构造HttpClient的实例
+ HttpClient httpClient = new HttpClient();
+ // 创建POST方法的实例
+ PostMethod postMethod = new PostMethod(url);
+ // 设置请求头信息
+ postMethod.setRequestHeader("Connection", "close");
+ postMethod.addRequestHeader("Content-Type", "application/x-www-form-urlencoded;charset=UTF-8");
+ // 添加参数
+ for (Map.Entry<String, String> entry : params.entrySet()) {
+ postMethod.addParameter(entry.getKey(), entry.getValue());
+ }
+ // 使用系统提供的默认的恢复策略,设置请求重试处理，用的是默认的重试处理：请求三次
+ httpClient.getParams().setBooleanParameter("http.protocol.expect-continue", false);
+ // 接收处理结果
+ String result = null;
+ try {
+ // 执行Http Post请求
+ httpClient.executeMethod(postMethod);
+ // 返回处理结果
+ result = postMethod.getResponseBodyAsString();
+ } catch (HttpException e) {
+ // 发生致命的异常，可能是协议不对或者返回的内容有问题
+ System.out.println("请检查输入的URL!");
+ e.printStackTrace();
+ } catch (IOException e) {
+ // 发生网络异常
+ System.out.println("发生网络异常!");
+ e.printStackTrace();
+ } finally {
+ // 释放链接
+ postMethod.releaseConnection();
+ // 关闭HttpClient实例
+ if (httpClient != null) {
+ ((SimpleHttpConnectionManager) httpClient.getHttpConnectionManager()).shutdown();
+ httpClient = null;
+ }
+ }
+ return result;
+ }
+
+ public static String getRequest(String url, Map<String, String> params) {
+ // 构造HttpClient实例
+ HttpClient client = new HttpClient();
+ // 拼接参数
+ String paramStr = "";
+ for (String key : params.keySet()) {
+ paramStr = paramStr + "&" + key + "=" + params.get(key);
+ }
+ paramStr = paramStr.substring(1);
+ // 创建GET方法的实例
+ GetMethod method = new GetMethod(url + "?" + paramStr);
+ // 接收返回结果
+ String result = null;
+ try {
+ // 执行HTTP GET方法请求
+ client.executeMethod(method);
+ // 返回处理结果
+ result = method.getResponseBodyAsString();
+ } catch (HttpException e) {
+ // 发生致命的异常，可能是协议不对或者返回的内容有问题
+ System.out.println("请检查输入的URL!");
+ e.printStackTrace();
+ } catch (IOException e) {
+ // 发生网络异常
+ System.out.println("发生网络异常!");
+ e.printStackTrace();
+ } finally {
+ // 释放链接
+ method.releaseConnection();
+ // 关闭HttpClient实例
+ if (client != null) {
+ ((SimpleHttpConnectionManager) client
+ .getHttpConnectionManager()).shutdown();
+ client = null;
+ }
+ }
+ return result;
+ }
+
+
+ /**
+ * 发送网络请求
+ * @param url
+ * @return
+ */
+ public static String sendNetRequest(String url, Map<String, String> params) {
+ // 构造HttpClient实例
+ HttpClient client = new HttpClient();
+ String paramStr = "";
+ for (String key : params.keySet()) {
+ paramStr = paramStr + "&" + key + "=" + params.get(key);
+ }
+ paramStr = paramStr.substring(1);
+ System.err.println(url + "?" + paramStr);
+ // 创建GET方法的实例
+ GetMethod method = new GetMethod(url + "?" + paramStr);
+ // 接收返回结果
+ String result = null;
+ try {
+ // 执行HTTP GET方法请求
+ client.executeMethod(method);
+ // 返回处理结果
+ result = method.getResponseBodyAsString();
+ } catch (HttpException e) {
+ // 发生致命的异常，可能是协议不对或者返回的内容有问题
+ System.out.println("请检查输入的URL!");
+ e.printStackTrace();
+ } catch (IOException e) {
+ // 发生网络异常
+ System.out.println("发生网络异常!");
+ e.printStackTrace();
+ } finally {
+ // 释放链接
+ method.releaseConnection();
+ // 关闭HttpClient实例
+ if (client != null) {
+ ((SimpleHttpConnectionManager) client.getHttpConnectionManager()).shutdown();
+ client = null;
+ }
+ }
+ return result;
+ }
+
+
+
+ /**
+ * jsonp跨域请求数据响应<br/>
+ * 方法名：responsejsonpData<br/>
+ * @author：Mryang<br/>
+ * @createTime：2016年7月31日-下午11:17:31 <br/>
+ * @tel: 15198268054<br/>
+ * @param request
+ * @param response
+ * @param map void<br/>
+ * @exception <br/>
+ * @since 1.0.0
+ */
+ public void responsejsonpData(HttpServletRequest request, HttpServletResponse response, Map<String, Object> map) {
+ response.setCharacterEncoding("UTF-8");
+ response.setHeader("Content-Type", "text/html;Charset=utf-8");
+ try {
+ PrintWriter writer = response.getWriter();
+ String params = request.getParameter("callback");
+ String json = JSONObject.toJSONString(map);
+ writer.print(params+ "("+json+")");
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
+ }
+
+
+
+
+
+
+
+
+
+
+
+
+
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/HuaWeiSMSUtil.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/HuaWeiSMSUtil.java
new file mode 100644
index 0000000..daf0a94
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/HuaWeiSMSUtil.java
@@ -0,0 +1,171 @@
+package com.stylefeng.guns.modular.system.util;
+
+import org.apache.commons.codec.binary.Hex;
+import org.apache.commons.codec.digest.DigestUtils;
+import org.apache.http.HttpHeaders;
+import org.apache.http.HttpResponse;
+import org.apache.http.NameValuePair;
+import org.apache.http.client.methods.RequestBuilder;
+import org.apache.http.client.utils.URLEncodedUtils;
+import org.apache.http.conn.ssl.NoopHostnameVerifier;
+import org.apache.http.entity.StringEntity;
+import org.apache.http.impl.client.CloseableHttpClient;
+import org.apache.http.impl.client.HttpClients;
+import org.apache.http.message.BasicNameValuePair;
+import org.apache.http.ssl.SSLContextBuilder;
+import org.apache.http.util.EntityUtils;
+
+import java.nio.charset.Charset;
+import java.text.SimpleDateFormat;
+import java.util.*;
+
+//如果JDK版本是1.8,可使用原生Base64类
+
+public class HuaWeiSMSUtil {
+
+ //无需修改,用于格式化鉴权头域,给"X-WSSE"参数赋值
+ private static final String WSSE_HEADER_FORMAT = "UsernameToken Username=\"%s\",PasswordDigest=\"%s\",Nonce=\"%s\",Created=\"%s\"";
+ //无需修改,用于格式化鉴权头域,给"Authorization"参数赋值
+ private static final String AUTH_HEADER_VALUE = "WSSE realm=\"SDP\",profile=\"UsernameToken\",type=\"Appkey\"";
+
+ public static void main(String[] args) throws Exception{
+
+// sendSms("[\""+1235+"\"]","17623778642","10690400999303617","d8f8f781b6e04c848f8148f4d6604bcd");
+// sendSms("[\"17623778642\",\"蓉A-7823\"]","17623778642","8819122535459","6c848255000c4619833ab690e393f906");
+ sendSms("[\"17623778642\",\"蓉A-7823\",\"2019/12/27\",\"14:00\"]","17623778642","8819122535459","bb13d00d11e043659001a89c72d54cab");
+ }
+
+ public static void sendSms(String code,String phone,String sender,String templateId) throws Exception{
+ //必填,请参考"开发准备"获取如下数据,替换为实际值
+ String url = "https://rtcsms.cn-north-1.myhuaweicloud.com:10743/sms/batchSendSms/v1"; //APP接入地址+接口访问URI
+ String appKey = "qnay92s7V0K7719H10m7X4yo3fl3"; //APP_Key
+ String appSecret = "6nSHQzZ3o18JeW6UtS448BbblOa0"; //APP_Secret
+// String sender = "10690400999303617"; //国内短信签名通道号或国际/港澳台短信通道号
+// String templateId = "d8f8f781b6e04c848f8148f4d6604bcd"; //模板ID
+
+ //条件必填,国内短信关注,当templateId指定的模板类型为通用模板时生效且必填,必须是已审核通过的,与模板类型一致的签名名称
+ //国际/港澳台短信不用关注该参数
+ String signature = "超级过客"; //签名名称
+
+ //必填,全局号码格式(包含国家码),示例:+8615123456789,多个号码之间用英文逗号分隔
+ String receiver = "+86"+phone; //短信接收人号码
+
+ //选填,短信状态报告接收地址,推荐使用域名,为空或者不填表示不接收状态报告
+ String statusCallBack = "";
+
+ /**
+ * 选填,使用无变量模板时请赋空值 String templateParas = "";
+ * 单变量模板示例:模板内容为"您的验证码是${NUM_6}"时,templateParas可填写为"[\"369751\"]"
+ * 双变量模板示例:模板内容为"您有${NUM_2}件快递请到${TXT_20}领取"时,templateParas可填写为"[\"3\",\"人民公园正门\"]"
+ * ${DATE}${TIME}变量不允许取值为空,${TXT_20}变量可以使用英文空格或点号替代空值,${NUM_6}变量可以使用0替代空值
+ * 查看更多模板和变量规范:产品介绍>模板和变量规范
+ */
+// String templateParas = "[\""+code+"\"]"; //模板变量
+ String templateParas = code; //模板变量
+
+ //请求Body,不携带签名名称时,signature请填null
+ String body = buildRequestBody(sender, receiver, templateId, templateParas, statusCallBack, signature);
+ if (null == body || body.isEmpty()) {
+ System.out.println("body is null.");
+ return;
+ }
+
+ //请求Headers中的X-WSSE参数值
+ String wsseHeader = buildWsseHeader(appKey, appSecret);
+ if (null == wsseHeader || wsseHeader.isEmpty()) {
+ System.out.println("wsse header is null.");
+ return;
+ }
+
+ //如果JDK版本低于1.8,可使用如下代码
+ //为防止因HTTPS证书认证失败造成API调用失败,需要先忽略证书信任问题
+ //CloseableHttpClient client = HttpClients.custom()
+ // .setSSLContext(new SSLContextBuilder().loadTrustMaterial(null, new TrustStrategy() {
+ // @Override
+ // public boolean isTrusted(X509Certificate[] x509Certificates, String s) throws CertificateException {
+ // return true;
+ // }
+ // }).build()).setSSLHostnameVerifier(NoopHostnameVerifier.INSTANCE).build();
+
+ //如果JDK版本是1.8,可使用如下代码
+ //为防止因HTTPS证书认证失败造成API调用失败,需要先忽略证书信任问题
+ CloseableHttpClient client = HttpClients.custom()
+ .setSSLContext(new SSLContextBuilder().loadTrustMaterial(null,
+ (x509CertChain, authType) -> true).build())
+ .setSSLHostnameVerifier(NoopHostnameVerifier.INSTANCE)
+ .build();
+
+ HttpResponse response = client.execute(RequestBuilder.create("POST")//请求方法POST
+ .setUri(url)
+ .addHeader(HttpHeaders.CONTENT_TYPE, "application/x-www-form-urlencoded")
+ .addHeader(HttpHeaders.AUTHORIZATION, AUTH_HEADER_VALUE)
+ .addHeader("X-WSSE", wsseHeader)
+ .setEntity(new StringEntity(body)).build());
+
+ System.out.println(response.toString()); //打印响应头域信息
+ System.out.println(EntityUtils.toString(response.getEntity())); //打印响应消息实体
+ }
+
+ /**
+ * 构造请求Body体
+ * @param sender
+ * @param receiver
+ * @param templateId
+ * @param templateParas
+ * @param statusCallbackUrl
+ * @param signature | 签名名称,使用国内短信通用模板时填写
+ * @return
+ */
+ static String buildRequestBody(String sender, String receiver, String templateId, String templateParas,
+ String statusCallbackUrl, String signature) {
+ if (null == sender || null == receiver || null == templateId || sender.isEmpty() || receiver.isEmpty()
+ || templateId.isEmpty()) {
+ System.out.println("buildRequestBody(): sender, receiver or templateId is null.");
+ return null;
+ }
+ List<NameValuePair> keyValues = new ArrayList<NameValuePair>();
+
+ keyValues.add(new BasicNameValuePair("from", sender));
+ keyValues.add(new BasicNameValuePair("to", receiver));
+ keyValues.add(new BasicNameValuePair("templateId", templateId));
+ if (null != templateParas && !templateParas.isEmpty()) {
+ keyValues.add(new BasicNameValuePair("templateParas", templateParas));
+ }
+ if (null != statusCallbackUrl && !statusCallbackUrl.isEmpty()) {
+ keyValues.add(new BasicNameValuePair("statusCallback", statusCallbackUrl));
+ }
+ if (null != signature && !signature.isEmpty()) {
+ keyValues.add(new BasicNameValuePair("signature", signature));
+ }
+
+ return URLEncodedUtils.format(keyValues, Charset.forName("UTF-8"));
+ }
+
+ /**
+ * 构造X-WSSE参数值
+ * @param appKey
+ * @param appSecret
+ * @return
+ */
+ static String buildWsseHeader(String appKey, String appSecret) {
+ if (null == appKey || null == appSecret || appKey.isEmpty() || appSecret.isEmpty()) {
+ System.out.println("buildWsseHeader(): appKey or appSecret is null.");
+ return null;
+ }
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss'Z'");
+ String time = sdf.format(new Date()); //Created
+ String nonce = UUID.randomUUID().toString().replace("-", ""); //Nonce
+
+ byte[] passwordDigest = DigestUtils.sha256(nonce + time + appSecret);
+ String hexDigest = Hex.encodeHexString(passwordDigest);
+
+ //如果JDK版本是1.8,请加载原生Base64类,并使用如下代码
+ String passwordDigestBase64Str = Base64.getEncoder().encodeToString(hexDigest.getBytes()); //PasswordDigest
+ //如果JDK版本低于1.8,请加载三方库提供Base64类,并使用如下代码
+ //String passwordDigestBase64Str = Base64.encodeBase64String(hexDigest.getBytes(Charset.forName("utf-8"))); //PasswordDigest
+ //若passwordDigestBase64Str中包含换行符,请执行如下代码进行修正
+ //passwordDigestBase64Str = passwordDigestBase64Str.replaceAll("[\\s*\t\n\r]", "");
+
+ return String.format(WSSE_HEADER_FORMAT, appKey, passwordDigestBase64Str, nonce, time);
+ }
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/JpushUtil.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/JpushUtil.java
new file mode 100644
index 0000000..b16af6c
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/JpushUtil.java
@@ -0,0 +1,256 @@
+package com.stylefeng.guns.modular.system.util;
+
+import cn.jiguang.common.ClientConfig;
+import cn.jiguang.common.resp.APIConnectionException;
+import cn.jiguang.common.resp.APIRequestException;
+import cn.jpush.api.JPushClient;
+import cn.jpush.api.push.PushResult;
+import cn.jpush.api.push.model.Message;
+import cn.jpush.api.push.model.Options;
+import cn.jpush.api.push.model.Platform;
+import cn.jpush.api.push.model.PushPayload;
+import cn.jpush.api.push.model.audience.Audience;
+import cn.jpush.api.push.model.audience.AudienceTarget;
+import cn.jpush.api.push.model.notification.AndroidNotification;
+import cn.jpush.api.push.model.notification.IosNotification;
+import cn.jpush.api.push.model.notification.Notification;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import org.apache.http.HttpResponse;
+import org.apache.http.client.HttpClient;
+import org.apache.http.client.methods.HttpPost;
+import org.apache.http.entity.StringEntity;
+import org.apache.http.impl.client.DefaultHttpClient;
+import org.apache.http.util.EntityUtils;
+import sun.misc.BASE64Encoder;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * 极光推送
+ * @author suen
+ * 2017年3月23日-上午11:00:57
+ * version 1.0
+ * jdk 1.8
+ */
+public class JpushUtil {
+
+ /**
+ * AppKey
+ */
+ private static String masterSecret = "e4f6f435faefad29db6ba9b2";
+
+ /**
+ * Master Secret
+ */
+ private static String appKey = "93204c35ded9ba377a14af19";
+ private static String pushUrl = "https://api.jpush.cn/v3/push";
+ private static boolean apns_production = true;
+ private static int time_to_live = 86400;
+
+ /**
+ * 推送
+ */
+ private static JPushClient jpushClient = new JPushClient(masterSecret, appKey);
+
+ public static void main(String[] args) throws APIConnectionException, APIRequestException {
+ Map<String, Object> map=new HashMap<String, Object>();
+ map.put("sound", 1); //是否有声音 1=否 2=是
+ map.put("vibrate", 1); //是否有震动 1=否 2=是
+ map.put("type", 1); //消息类型 1=互动 2=公告
+ map.put("id", 1); //对象ID
+ //SendPushWithCustomForSh("1", "收到通知了11111！", "反馈", JSON.toJSONString(map));
+// String result = push(pushUrl,"121",JSON.toJSONString(map),appKey,masterSecret,apns_production,time_to_live);
+ SendPushWithCustomForTransmission("1","测试极光自定义消息","自定义消息",map);
+ }
+
+ /**
+ * 系统消息
+ * @param alias
+ * @param alert
+ * @param androidTitle
+ * @param value
+ */
+ public static void SendPushWithCustomForSh(String alias, String alert, String androidTitle, String value) {
+ ClientConfig config = ClientConfig.getInstance();
+ config.setPushHostName("https://api.jpush.cn");
+ JPushClient jpushClient = new JPushClient(masterSecret, appKey, 3, null, config);
+ PushPayload payload = PushPayload.newBuilder()
+ .setPlatform(Platform.android_ios())
+ .setAudience(Audience.alias(alias))
+ .setNotification(Notification.newBuilder()
+ .setAlert(alert)
+ .addPlatformNotification(AndroidNotification.newBuilder()
+ .setTitle(androidTitle)
+ .addExtra("action", value)
+ .build())
+ .addPlatformNotification(IosNotification.newBuilder()
+ .incrBadge(1)
+ .setSound("default").setBadge(+1)
+ .addExtra("action", value).build())
+ .build())
+ .setOptions(Options.newBuilder().setApnsProduction(false).build())
+ .build();
+ try {
+ PushResult result = jpushClient.sendPush(payload);
+ System.out.println(result);
+ } catch (APIConnectionException e) {
+
+ } catch (APIRequestException e) {
+
+ }
+ }
+ /**
+ * 透传消息
+ * @param alias 别名
+ * @param alert 内容
+ * @param title 标题
+ * @param map 参数
+ */
+ public static void SendPushWithCustomForTransmission(String alias, String alert, String title, Map<String, Object> map) {
+ ClientConfig config = ClientConfig.getInstance();
+ config.setPushHostName("https://api.jpush.cn");
+ JPushClient jpushClient = new JPushClient(masterSecret, appKey, 3, null, config);
+ PushPayload payload = PushPayload.newBuilder()
+
+ .setPlatform(Platform.android_ios())
+
+ .setAudience(Audience.alias(alias))
+
+ .setMessage(Message.newBuilder()
+ .setMsgContent(alert)
+ .setContentType("text")
+ .setTitle(title)
+ .addExtra("sound",String.valueOf(map.get("sound")))
+ .addExtra("vibrate",String.valueOf(map.get("vibrate")))
+ .addExtra("type",String.valueOf(map.get("type")))
+ .addExtra("id",String.valueOf(map.get("id")))
+ .build())
+
+ .setOptions(Options.newBuilder().setApnsProduction(false).build())
+ .build();
+ try {
+ PushResult result = jpushClient.sendPush(payload);
+ System.out.println(result);
+ } catch (APIConnectionException e) {
+
+ } catch (APIRequestException e) {
+
+ }
+ }
+ /**
+ * 内容推送
+ * @param registrationId 注册用户ID
+ * @param content 推送内容
+ * @param extra 附加域
+ * @return
+ * @throws APIConnectionException
+ * @throws APIRequestException
+ */
+ public static PushResult buildPushObject_ios_audienceMore_messageWithExtras(String registrationId, String content, String extra)
+ throws APIConnectionException, APIRequestException {
+ return jpushClient.sendPush(PushPayload.newBuilder().setPlatform(Platform.android_ios())
+ .setAudience(Audience.newBuilder().addAudienceTarget(AudienceTarget.alias(registrationId)).build())
+ .setMessage(Message.newBuilder().setMsgContent(content).addExtra("from", extra).build())
+ .setOptions(Options.newBuilder().setApnsProduction(false).build())
+ .build());
+
+ }
+ /**
+ * 组装极光推送专用json串
+ * @param alias
+ * @param alert
+ * @return json
+ */
+ public static JSONObject generateJson(String alias,String alert,boolean apns_production,int time_to_live){
+ JSONObject json = new JSONObject();
+ JSONArray platform = new JSONArray();//平台
+ platform.add("android");
+ platform.add("ios");
+
+ JSONObject audience = new JSONObject();//推送目标
+ JSONArray alias1 = new JSONArray();
+ alias1.add(alias);
+ audience.put("alias", alias1);
+
+ JSONObject notification = new JSONObject();//通知内容
+ JSONObject android = new JSONObject();//android通知内容
+ android.put("alert", alert);
+ android.put("builder_id", 1);
+ JSONObject android_extras = new JSONObject();//android额外参数
+ android_extras.put("type", "infomation");
+ android.put("extras", android_extras);
+
+ JSONObject ios = new JSONObject();//ios通知内容
+ ios.put("alert", alert);
+ ios.put("sound", "default");
+ ios.put("badge", "+1");
+ JSONObject ios_extras = new JSONObject();//ios额外参数
+ ios_extras.put("type", "infomation");
+ ios.put("extras", ios_extras);
+ notification.put("android", android);
+ notification.put("ios", ios);
+
+ JSONObject options = new JSONObject();//设置参数
+ options.put("time_to_live", Integer.valueOf(time_to_live));
+ options.put("apns_production", apns_production);
+
+ json.put("platform", platform);
+ json.put("audience", audience);
+ json.put("notification", notification);
+ json.put("options", options);
+ return json;
+
+ }
+
+ /**
+ * 推送方法-调用极光API
+ * @param reqUrl
+ * @param alias
+ * @param alert
+ * @return result
+ */
+ public static String push(String reqUrl,String alias,String alert,String appKey,String masterSecret,boolean apns_production,int time_to_live){
+ String base64_auth_string = encryptBASE64(appKey + ":" + masterSecret);
+ String authorization = "Basic " + base64_auth_string;
+ return sendPostRequest(reqUrl,generateJson(alias,alert,apns_production,time_to_live).toString(),"UTF-8",authorization);
+ }
+
+ /**
+ * 发送Post请求（json格式）
+ * @param reqURL
+ * @param data
+ * @param encodeCharset
+ * @param authorization
+ * @return result
+ */
+ @SuppressWarnings({ "resource" })
+ public static String sendPostRequest(String reqURL, String data, String encodeCharset,String authorization){
+ HttpPost httpPost = new HttpPost(reqURL);
+ HttpClient client = new DefaultHttpClient();
+ HttpResponse response = null;
+ String result = "";
+ try {
+ StringEntity entity = new StringEntity(data, encodeCharset);
+ entity.setContentType("application/json");
+ httpPost.setEntity(entity);
+ httpPost.setHeader("Authorization",authorization.trim());
+ response = client.execute(httpPost);
+ result = EntityUtils.toString(response.getEntity(), encodeCharset);
+ } catch (Exception e) {
+ }finally{
+ client.getConnectionManager().shutdown();
+ }
+ return result;
+ }
+ /**
+ * BASE64加密工具
+ */
+ public static String encryptBASE64(String str) {
+ byte[] key = str.getBytes();
+ BASE64Encoder base64Encoder = new BASE64Encoder();
+ String strs = base64Encoder.encodeBuffer(key);
+ return strs;
+ }
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/OrderUtil.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/OrderUtil.java
new file mode 100644
index 0000000..c49e50c
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/OrderUtil.java
@@ -0,0 +1,57 @@
+package com.stylefeng.guns.modular.system.util;
+
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
+/**
+ * 订单处理工具类
+ * @author taonb
+ * @createDate 2016年5月27日
+ * @version 1.0
+ */
+public class OrderUtil {
+
+ /* 订单号 */
+ private static long orderNum = 0l;
+
+ /* 日期 */
+ private static String date;
+
+ /**
+ * 生成不重复的订单号 【纯数字】
+ * @return
+ */
+ public static synchronized String getOrderNo() {
+ String str = new SimpleDateFormat("yyMMddHHmmss").format(new Date());
+ if (date == null || !date.equals(str)) {
+ date = str;
+ orderNum = 0l;
+ }
+ orderNum++;
+ long orderNo = Long.parseLong((date)) * 1000000;
+ orderNo += orderNum;
+ return orderNo + "";
+ }
+
+ /**
+ * 生成不重复的订单号 【含前缀】
+ * @param prefix
+ * @return
+ */
+ public static synchronized String getOrderNoForPrefix(String prefix) {
+ return prefix + getOrderNo();
+ }
+
+ /**
+ * 生成不重复的订单号 【含后缀】
+ * @param suffix
+ * @return
+ */
+ public static synchronized String getOrderNoForSuffix(String suffix) {
+ return getOrderNo() + suffix;
+ }
+
+ public static void main(String[] args) {
+ System.out.println(getOrderNo());
+ }
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/OssUploadUtil.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/OssUploadUtil.java
new file mode 100644
index 0000000..90dbe31
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/OssUploadUtil.java
@@ -0,0 +1,39 @@
+package com.stylefeng.guns.modular.system.util;
+
+import com.aliyun.oss.OSSClient;
+import com.aliyun.oss.model.ObjectMetadata;
+import org.springframework.web.multipart.MultipartFile;
+
+import javax.servlet.http.HttpServletRequest;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.UUID;
+
+public class OssUploadUtil {
+ //OSS图片访问域名
+ public static String oss_domain = "https://newok.oss-cn-shenzhen.aliyuncs.com/";
+ public static String accessKeyId = "LTAI4G9Zez9H4B36vakPXGy4";
+ public static String accessKeySecret = "BOVPUeZndKVbrPOq6Ef5j6oiydB3XZ";
+ public static String bucketName="newok";
+ public static String endpoint = "oss-cn-shenzhen.aliyuncs.com";
+
+ public static OSSClient ossClient = new OSSClient(endpoint, accessKeyId,accessKeySecret);
+
+ public static String ossUpload(HttpServletRequest request, MultipartFile file) throws IOException{
+ //CommonsMultipartFile file = (CommonsMultipartFile)multipartFile;
+ String fileName = "";
+ if(file!=null && !"".equals(file.getOriginalFilename()) && file.getOriginalFilename()!=null){
+ InputStream content = file.getInputStream();//获得指定文件的输入流
+ ObjectMetadata meta = new ObjectMetadata();// 创建上传Object的Metadata
+ meta.setContentLength(file.getSize()); // 必须设置ContentLength
+ String originalFilename = file.getOriginalFilename();
+ fileName = UUID.randomUUID().toString().replaceAll("-","") + originalFilename.subSequence(originalFilename.lastIndexOf("."), originalFilename.length());
+ ossClient.putObject(bucketName,"img/"+fileName,content,meta);// 上传Object.
+ if(fileName != null && !"".equals(fileName)){
+ System.out.println(fileName);
+ fileName = oss_domain+"img/"+fileName;
+ }
+ }
+ return fileName;
+ }
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/PushMinistryOfTransportUtil.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/PushMinistryOfTransportUtil.java
new file mode 100644
index 0000000..8ba6338
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/PushMinistryOfTransportUtil.java
@@ -0,0 +1,609 @@
+package com.stylefeng.guns.modular.system.util;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.stylefeng.guns.modular.system.dao.CarInsuranceMapper;
+import com.stylefeng.guns.modular.system.dao.DriverPunishMapper;
+import com.stylefeng.guns.modular.system.dao.DriverTrainMapper;
+import com.stylefeng.guns.modular.system.dao.OrderCancelMapper;
+import com.stylefeng.guns.modular.system.model.*;
+import com.stylefeng.guns.modular.system.service.*;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.Resource;
+import java.util.*;
+import java.util.regex.Pattern;
+
+/**
+ * 上传安全平台数据
+ */
+@Component
+public class PushMinistryOfTransportUtil {
+
+ @Autowired
+ private ITCarService carService;
+
+ @Autowired
+ private ITDriverService driverService;
+
+ @Autowired
+ private ITCompanyService companyService;
+
+ @Autowired
+ private ITSystemPriceService systemPriceService;
+
+ @Autowired
+ private ITCarModelService carModelService;
+
+ @Autowired
+ private ITCarBrandService carBrandService;
+
+ @Autowired
+ private ITCarServiceService carServiceService;
+
+ @Autowired
+ private ITVersionManagementService versionManagementService;
+
+ @Autowired
+ private ITOrderPrivateCarService orderPrivateCarService;
+
+ @Autowired
+ private ITComplaintService complaintService;
+
+ @Resource
+ private OrderCancelMapper orderCancelMapper;
+
+ @Autowired
+ private GDMapGeocodingUtil gdMapGeocodingUtil;
+
+ @Resource
+ private CarInsuranceMapper carInsuranceMapper;
+
+ @Resource
+ private DriverTrainMapper driverTrainMapper;
+
+ @Resource
+ private DriverPunishMapper driverPunishMapper;
+
+
+ /**
+ * 上传企业基础信息
+ */
+ public void baseInfoCompany(Integer id){
+ TCompany tCompany = companyService.selectById(id);
+ String fileName = System.currentTimeMillis() + ".jpg";
+ //上传图片文件
+ Map<String, String> file = new HashMap<>();
+ file.put("path", "/tmp");
+ file.put("fileName", fileName);
+ file.put("url", tCompany.getLegalPhotoUrl());
+ file.put("newFilePath", "/swapfiles");
+ String result_ = HttpRequestUtil.postRequest(PushURL.ministry_of_transport_ftp + "/uploadAndMoveFile", file);
+ System.out.println("上传图片文件：" + result_);
+
+ //上传数据
+ JSONObject jsonObject = new JSONObject();
+ jsonObject.put("CompanyName", tCompany.getName());//公司名称
+ jsonObject.put("Identifier", tCompany.getIdentifier());//统一社会信用代码
+ jsonObject.put("Address", Integer.valueOf(tCompany.getAddressCode()));//注册地行政区划代码
+ jsonObject.put("BusinessScope", tCompany.getBusinessScope());//经营范围
+ jsonObject.put("ContactAddress", tCompany.getContactAddress());//通信地址
+ jsonObject.put("EconomicType", tCompany.getEconomicType());//经营业户经济类型
+ jsonObject.put("RegCapital", tCompany.getRegCapital());//注册资本
+ jsonObject.put("LegalName", tCompany.getLegalName());//法人代表姓名
+ jsonObject.put("LegalID", tCompany.getLegalId());//法人代表身份证号
+ jsonObject.put("LegalPhone", tCompany.getLegalPhone());//法人代表电话
+ jsonObject.put("LegalPhoto", fileName);//法人代表身份证扫描件文件编号(.jpg)
+ jsonObject.put("State", 0);//状态（0：有效，1：失效）
+ jsonObject.put("Flag", 1);//操作标识（1：新增，2：更新，3：删除）
+ jsonObject.put("UpdateTime", new Date());
+ Map<String, String> map = new HashMap<>();
+ map.put("baseInfoCompany", jsonObject.toJSONString());
+ String result = HttpRequestUtil.postRequest(PushURL.ministry_of_transport_data + "/baseInfoCompany", map);
+ System.out.println("上传企业基础信息：" + result);
+ }
+
+
+
+
+ /**
+ * 上传网约车平台公司营运规模信息
+ */
+ public void baseInfoCompanyStat(){
+ int state = carService.selectCount(new EntityWrapper<TCar>().eq("state", 1));
+ int i = driverService.selectCount(new EntityWrapper<TDriver>().eq("authState", 2).ne("flag", 3));
+ JSONObject jsonObject = new JSONObject();
+ jsonObject.put("VehicleNum", state);
+ jsonObject.put("DriverNum", i);
+ jsonObject.put("Flag", 1);
+ jsonObject.put("UpdateTime", new Date());
+ Map<String, String> map = new HashMap<>();
+ map.put("baseInfoCompanyStat", jsonObject.toJSONString());
+ String result = HttpRequestUtil.postRequest(PushURL.ministry_of_transport_data + "/baseInfoCompanyStat", map);
+ System.out.println("上传网约车平台公司营运规模信息：" + result);
+
+ }
+
+
+ /**
+ * 上传网约车平台公司支付信息
+ */
+ public void baseInfoCompanyPay(){
+ JSONObject jsonObject = new JSONObject();
+ jsonObject.put("PayName", "支付宝（中国）网络技术有限公司");//银行或者非银行支付机构名称
+ jsonObject.put("PayId", "2000133000019");//非银行支付机构支付业务许可证编号
+ jsonObject.put("PayType", "1");//支付业务类型
+ jsonObject.put("PayScope", "全国");//业务覆盖范围
+ jsonObject.put("PrepareBank", "中国工商银行");//备付金存管银行
+ jsonObject.put("CountDate", 15);//结算周期
+ jsonObject.put("State", 0);//状态（0：有效，1：失效）
+ jsonObject.put("Flag", 1);//操作标识（1：新增，2：更新，3：删除）
+ jsonObject.put("UpdateTime", new Date());
+ Map<String, String> map = new HashMap<>();
+ map.put("baseInfoCompanyPay", jsonObject.toJSONString());
+ String result = HttpRequestUtil.postRequest(PushURL.ministry_of_transport_data + "/baseInfoCompanyPay", map);
+ System.out.println("上传网约车平台公司支付信息：" + result);
+ }
+
+
+ /**
+ * 网约车平台公司服务机构
+ */
+ public void baseInfoCompanyService(){
+ JSONObject jsonObject = new JSONObject();
+ jsonObject.put("Address", 450204);//行政区划代码
+ jsonObject.put("ServiceName", "广西云森科技有限公司");//服务机构名称
+ jsonObject.put("ServiceNo", "45020401");//服务机构代码
+ jsonObject.put("DetailAddress", "柳州市柳邕路新翔小区二区6栋11号");//服务机构地址
+ jsonObject.put("ResponsibleName", "翁克顺");//服务机构负责人姓名
+ jsonObject.put("ResponsiblePhone", "13907728585");//负责人联系电话
+ jsonObject.put("ManagerName", "吴志武");//服务机构管理人姓名
+ jsonObject.put("ManagerPhone", "15907720083");//管理人联系电话
+ jsonObject.put("ContactPhone", "0772-3633333");//服务机构紧急联系电话
+ jsonObject.put("MailAddress", "柳州市城中区滨江西路15栋2号OK充电站");//行政文书送达邮寄地址
+ jsonObject.put("CreateDate", "2015年09月18日");//服务机构设立日期
+ jsonObject.put("State", 0);//状态（0：有效，1：失效）
+ jsonObject.put("Flag", 1);//操作标识（1：新增，2：更新，3：删除）
+ jsonObject.put("UpdateTime", new Date());
+ Map<String, String> map = new HashMap<>();
+ map.put("baseInfoCompanyService", jsonObject.toJSONString());
+ String result = HttpRequestUtil.postRequest(PushURL.ministry_of_transport_data + "/baseInfoCompanyService", map);
+ System.out.println("网约车平台公司服务机构：" + result);
+ }
+
+
+ /**
+ * 网约车平台公司经营许可
+ * @param id
+ */
+ public void baseInfoCompanyPermit(Integer id){
+ TCompany tCompany = companyService.selectById(id);
+ JSONObject jsonObject = new JSONObject();
+ jsonObject.put("Address", tCompany.getAddressCode());//许可地行政区划代码
+ jsonObject.put("Certificate", tCompany.getLicenseNumber());//网络预约出租车经营许可证号
+ jsonObject.put("OperationArea", "广西壮族自治区柳州市城区");//经营区域
+ jsonObject.put("OwnerName", tCompany.getName());//公司名称
+ jsonObject.put("Organization", tCompany.getLicensingAgency());//发证机构名称
+ jsonObject.put("StartDate", tCompany.getLicenseStartTime());//有效期起YYYYMMDD
+ jsonObject.put("StopDate", tCompany.getLicenseEndTime());//有效期止YYYYMMDD
+ jsonObject.put("CertifyDate", tCompany.getLicenseTime());//初次发证日期YYYYMMDD
+ jsonObject.put("State", 0);//状态（0：有效，1：失效）
+ jsonObject.put("Flag", 1);//操作标识（1：新增，2：更新，3：删除）
+ jsonObject.put("UpdateTime", new Date());
+ Map<String, String> map = new HashMap<>();
+ map.put("baseInfoCompanyPermit", jsonObject.toJSONString());
+ String result = HttpRequestUtil.postRequest(PushURL.ministry_of_transport_data + "/baseInfoCompanyPermit", map);
+ System.out.println("网约车平台公司经营许可：" + result);
+ }
+
+
+
+ /**
+ * 网约车平台公司运价信息
+ */
+ public void baseInfoCompanyFare(Integer id){
+ TSystemPrice tSystemPrice = systemPriceService.selectById(id);
+ String content = tSystemPrice.getContent();
+ JSONObject price = JSON.parseObject(content);
+
+ JSONObject jsonObject = new JSONObject();
+ jsonObject.put("Address", 450204);//运价适用地行政区划代码
+ jsonObject.put("FareType", id);//运价类型编码（由网约车平台公司统一编码，应确保唯一性）
+ jsonObject.put("FareTypeNote", tSystemPrice.getFareTypeNote());//运价类型说明
+ jsonObject.put("FareValidOn", new Date());//运价有效期起YYYYMMDDhhmmss
+ Calendar calendar = Calendar.getInstance();
+ calendar.setTime(new Date());
+ calendar.set(Calendar.YEAR, calendar.get(Calendar.YEAR) +1);
+ jsonObject.put("FareValidOff", calendar.getTime());//运价有效止YYYYMMDDhhmmss
+ jsonObject.put("StartFare", Double.valueOf(price.get("num1").toString()));//起步价（元）
+ jsonObject.put("StartMile", Double.valueOf(price.get("num2").toString()));//起步里程（km）
+ jsonObject.put("UnitPricePerMile", Double.valueOf(price.get("num4").toString()));//计程单价（按公里/元）
+ jsonObject.put("UnitPricePerMinute", Double.valueOf(price.get("num5").toString()));//计时单价（按分钟/元）
+ jsonObject.put("UpPrice", Double.valueOf(price.get("num10").toString()));//单程加价单价（元）
+ jsonObject.put("UpPriceStartMile", Double.valueOf(price.get("num8").toString()));//单程加价公里（km）
+ String[] num23s = price.get("num23").toString().split(" - ");
+ jsonObject.put("MorningPeakTimeOn", num23s[0]);//营运早高峰时间起（HHmm 24小时）
+ jsonObject.put("MorningPeakTimeOff", num23s[1]);//营运早高峰时间止（HHmm 24小时）
+ String[] num24s = price.get("num24").toString().split(" - ");
+ jsonObject.put("EveningPeakTimeOn", num24s[0]);//营运晚高峰时间起（HHmm 24小时）
+ jsonObject.put("EveningPeakTimeOff", num24s[1]);//营运晚高峰时间止（HHmm 24小时）
+ jsonObject.put("OtherPeakTimeOn", "");//其他营运高峰时间起（HHmm 24小时）
+ jsonObject.put("OtherPeakTineOff", "");//其他营运高峰时间止（HHmm 24小时）
+ jsonObject.put("PeakUnitPrice", Double.valueOf(price.get("num28").toString()));//高峰时间单程加价单价（元）
+ jsonObject.put("PeakPriceStartMile", Double.valueOf(price.get("num8").toString()));//高峰时间单程加价公里（km）
+ jsonObject.put("LowSpeedPriceMinute", 0);//低速计时加价（按分钟 元）
+ jsonObject.put("NightPricePerMile", Double.valueOf(price.get("num18").toString()));//夜间费（按公里 元）
+ jsonObject.put("NightPricePerMinute", Double.valueOf(price.get("num19").toString()));//夜间费（按分钟 元）
+ jsonObject.put("OtherPrice", 0);//其它加价金额（元）
+
+ jsonObject.put("State", tSystemPrice.getState() != 1 ? 1 : 0);//状态（0：有效，1：失效）
+ jsonObject.put("Flag", 1);//操作标识（1：新增，2：更新，3：删除）
+ jsonObject.put("UpdateTime", new Date());
+ Map<String, String> map = new HashMap<>();
+ map.put("baseInfoCompanyFare", jsonObject.toJSONString());
+ String result = HttpRequestUtil.postRequest(PushURL.ministry_of_transport_data + "/baseInfoCompanyFare", map);
+ System.out.println("网约车平台公司运价信息：" + result);
+ }
+
+
+ /**
+ * 车辆基本信息
+ * @param id
+ */
+ public void baseInfoVehicle(Integer id){
+ TCar tCar = carService.selectById(id);
+ TCarModel tCarModel = carModelService.selectById(tCar.getCarModelId());
+ TCarBrand tCarBrand = carBrandService.selectById(tCar.getCarBrandId());
+ TCarService tCarService = carServiceService.selectOne(new EntityWrapper<TCarService>().eq("carId", id).eq("type", 1));
+ TSystemPrice tSystemPrice = systemPriceService.selectOne(new EntityWrapper<TSystemPrice>()
+ .eq("type", 1)
+ .eq("serverCarModelId", tCarService.getServerCarModelId())
+ .eq("companyId", (tCar.getFranchiseeId() == null || tCar.getFranchiseeId() == 0) ? tCar.getCompanyId() : tCar.getFranchiseeId()).eq("state", 1));
+
+ String fileName = System.currentTimeMillis() + ".jpg";
+ //上传图片文件
+ Map<String, String> file = new HashMap<>();
+ file.put("path", "/tmp");
+ file.put("fileName", fileName);
+ file.put("url", tCar.getCarPhoto());
+ file.put("newFilePath", "/swapfiles");
+ String result_ = HttpRequestUtil.postRequest(PushURL.ministry_of_transport_ftp + "/uploadAndMoveFile", file);
+ System.out.println("上传图片文件：" + result_);
+
+ JSONObject jsonObject = new JSONObject();
+ jsonObject.put("Address", 450204);//车辆所在城市行政区划代码
+ jsonObject.put("VehicleNo", tCar.getCarLicensePlate());//车辆号牌
+ jsonObject.put("PlateColor", tCar.getPlateColor());//车牌颜色
+ jsonObject.put("Seats", tCarModel.getSeat());//核定载客位
+ jsonObject.put("Brand", tCarBrand.getName());//车辆厂牌
+ jsonObject.put("Model", tCarModel.getName());//车辆型号
+ jsonObject.put("VehicleType", tCar.getVehicleType());//车辆类型（以机动车行驶证为准）
+ jsonObject.put("OwnerName", tCar.getOwnerName());//车辆所有人（以机动车行驶证为准）
+ jsonObject.put("VehicleColor", tCar.getCarColor());//车身颜色
+ jsonObject.put("EngineId", tCar.getEngineId());//发动机号（以机动车行驶证为准）
+ jsonObject.put("VIN", tCar.getVIN());//车辆VIN码（以机动车行驶证为准）
+ jsonObject.put("CertifyDateA", tCar.getCertifyDateA());//车辆注册日期（以机动车行驶证为准）YYYY-MM-DD
+ jsonObject.put("FuelType", tCar.getFuelType());//车辆燃料类型
+ jsonObject.put("EngineDisplace", tCar.getEngineDisplace());//发送机排量（毫升）
+ jsonObject.put("PhotoId", fileName);//车辆照片文件编号
+ jsonObject.put("Certificate", tCar.getCertificate());//运输证字号
+ jsonObject.put("TransAgency", tCar.getTransAgency());//车辆运输证发证机构
+ jsonObject.put("TransArea", tCar.getTransArea());//车辆经营区域
+ jsonObject.put("TransDateStart", tCar.getTransDateStart());//车辆运输证有效期起YYYYMMDD
+ jsonObject.put("TransDateStop", tCar.getTransDateStop());//车辆运输证有效期止YYYYMMDD
+ jsonObject.put("CertifyDateB", tCar.getCertifyDateB());//车辆初次登记日期YYYY-MM-DD
+ jsonObject.put("FixState", tCar.getFixState());//车辆维修状态（0：未检修，1：已检修，2：未知）
+ jsonObject.put("NextFixDate", tCar.getNextFixDate());//车辆下次年检时间YYYY-MM-DD
+ jsonObject.put("CheckState", tCar.getCheckState());//车辆年度审验状态
+ jsonObject.put("FeePrintId", tCar.getFeePrintId());//发票打印设备序列号
+ jsonObject.put("GPSBrand", tCar.getGPSBrand());//卫星定位装置品牌
+ jsonObject.put("GPSModel", tCar.getGPSModel());//卫星定位装置型号
+ jsonObject.put("GPSIMEI", tCar.getGPSIMEI());//卫星定位装置IMEI号
+ jsonObject.put("GPSInstallDate", tCar.getGPSInstallDate());//卫星定位设备安装日期YYYYMMDD
+ jsonObject.put("RegisterDate", tCar.getRegisterDate());//报备日期（车辆信息向服务所在地出租车行政主管部门报备日期YYYYMMDD）
+ jsonObject.put("CommercialType", Integer.valueOf(tCar.getCommercialType()));//服务类型（1：网络预约出租车，2：巡游出租汽车，3：私人小客车合乘）
+ jsonObject.put("FareType", null == tSystemPrice ? "" : tSystemPrice.getId());//运价类型编码（与运价信息中一一对应）
+ jsonObject.put("State", tCar.getState() == 1 ? 0 : 1);//状态（0：有效，1：失效）
+ jsonObject.put("Flag", 1);//操作标识（1：新增，2：更新，3：删除）
+ jsonObject.put("UpdateTime", new Date());//YYYYMMDDhhmmss
+ Map<String, String> map = new HashMap<>();
+ map.put("baseInfoVehicle", jsonObject.toJSONString());
+ String result = HttpRequestUtil.postRequest(PushURL.ministry_of_transport_data + "/baseInfoVehicle", map);
+ System.out.println("车辆基本信息：" + result);
+ }
+
+
+ /**
+ * 车辆保险信息
+ */
+ public void baseInfoVehicleInsurance(Integer id, Integer flag){
+ CarInsurance carInsurance = carInsuranceMapper.selectById(id);
+ TCar tCar = carService.selectById(carInsurance.getCarId());
+ JSONObject jsonObject = new JSONObject();
+ jsonObject.put("VehicleNo", tCar.getCarLicensePlate());//车辆号牌
+ jsonObject.put("InsurCom", carInsurance.getInsurCom());//保险公司名称
+ jsonObject.put("InsurNum", carInsurance.getInsurNum());//保险号
+ jsonObject.put("InsurType", carInsurance.getInsurType());//保险类型
+ jsonObject.put("InsurCount", carInsurance.getInsurCount());//保险金额（元）
+ jsonObject.put("InsurEff", carInsurance.getInsurEff());//保险生效时间YYYYMMDD
+ jsonObject.put("InsurExp", carInsurance.getInsurExp());//保险到期时间YYYYMMDD
+ jsonObject.put("Flag", flag);//操作标识（1：新增，2：更新，3：删除）
+ jsonObject.put("UpdateTime", new Date());
+ Map<String, String> map = new HashMap<>();
+ map.put("baseInfoVehicleInsurance", jsonObject.toJSONString());
+ String result = HttpRequestUtil.postRequest(PushURL.ministry_of_transport_data + "/baseInfoVehicleInsurance", map);
+ System.out.println("车辆保险信息：" + result);
+ }
+
+
+ /**
+ * 驾驶员基本信息
+ * @param driverId
+ */
+ public void baseInfoDriver(Integer driverId){
+ TDriver tDriver = driverService.selectById(driverId);
+
+ //上传图片文件
+ String fileName = System.currentTimeMillis() + ".jpg";
+ Map<String, String> file = new HashMap<>();
+ file.put("path", "/tmp");
+ file.put("fileName", fileName);
+ file.put("url", tDriver.getHeadImgUrl());
+ file.put("newFilePath", "/swapfiles");
+ String result_ = HttpRequestUtil.postRequest(PushURL.ministry_of_transport_ftp + "/uploadAndMoveFile", file);
+ System.out.println("上传图片文件：" + result_);
+
+ String fileName1 = System.currentTimeMillis() + ".jpg";
+ Map<String, String> file1 = new HashMap<>();
+ file1.put("path", "/tmp");
+ file1.put("fileName", fileName1);
+ file1.put("url", tDriver.getDriveCardImgUrl());
+ file1.put("newFilePath", "/swapfiles");
+ String result1_ = HttpRequestUtil.postRequest(PushURL.ministry_of_transport_ftp + "/uploadAndMoveFile", file1);
+ System.out.println("上传图片文件：" + result1_);
+
+ JSONObject jsonObject = new JSONObject();
+ jsonObject.put("Address", 450204);//注册地行政区划代码
+ jsonObject.put("DriverName", tDriver.getName());//机动车驾驶员姓名
+ jsonObject.put("DriverPhone", tDriver.getPhone());//驾驶员手机号
+ jsonObject.put("DriverGender", (tDriver.getSex() == 1 ? "男" : "女"));//驾驶员性别
+ jsonObject.put("DriverBirthday", tDriver.getBirthday());//出生日期YYYYMMDD
+ jsonObject.put("DriverNationality", tDriver.getDriverNationality());//国籍
+ jsonObject.put("DriverNation", tDriver.getDriverNation());//驾驶员民族
+ jsonObject.put("DriverMaritalStatus", (tDriver.getDriverMaritalStatus() == 1 ? "未婚" : tDriver.getDriverMaritalStatus() == 2 ? "已婚" : "离异"));//驾驶员婚姻状况（未婚，已婚，离异）
+ jsonObject.put("DriverLanguageLevel", tDriver.getDriverLanguageLevel());//驾驶员外语能力
+ jsonObject.put("DriverEducation", tDriver.getDriverEducation());//驾驶员学历
+ jsonObject.put("DriverCensus", tDriver.getDriverCensus());//户口登记机关名称
+ jsonObject.put("DriverAddress", tDriver.getDriverAddress());//户口住址或长住地址
+ jsonObject.put("DriverContactAddress", tDriver.getDriverContactAddress());//驾驶员通信地址
+ jsonObject.put("PhotoId", fileName);//驾驶员照片文件编号
+ jsonObject.put("LicenseId", tDriver.getDriveCard());//机动车驾驶证号
+ jsonObject.put("LicensePhotoId", fileName1);//机动车驾驶证扫描件文件编号
+ jsonObject.put("DriverType", tDriver.getDriverType());//准驾车型
+ jsonObject.put("GetDriverLicenseDate", tDriver.getGetDriverLicenseDate());//初次领取驾驶证日期YYYYMMDD
+ jsonObject.put("DriverLicenseOn", tDriver.getDriverLicenseOn());//驾驶证有效期限起YYYYMMDD
+ jsonObject.put("DriverLicenseOff", tDriver.getDriverLicenseOff());//驾驶证有效期限止YYYYMMDD
+ jsonObject.put("TaxiDriver", tDriver.getTaxiDriver() == 0 ? 2 : 1);//是否巡游出租汽车驾驶员（1：是，2：否）
+ jsonObject.put("CertificateNo", tDriver.getTaxiAptitudeCard());//网络预约出租汽车驾驶员资格证号
+ jsonObject.put("NetworkCarIssueOrganization", tDriver.getNetworkCarlssueOrganization());//网络预约出租汽车驾驶员证发证机构
+ jsonObject.put("NetworkCarIssueDate", tDriver.getNetworkCarlssueDate());//资格证发证日期YYYYMMDD
+ jsonObject.put("GetNetworkCarProofDate", tDriver.getGetNetworkCarProofDate());//初次领取资格证日期YYYYMMDD
+ jsonObject.put("NetworkCarProofOn", tDriver.getNetworkCarProofOn());//资格证有效起始日期YYYYMMDD
+ jsonObject.put("NetworkCarProofOff", tDriver.getNetworkCarProofOff());//资格证有截止日期YYYYMMDD
+ jsonObject.put("RegisterDate", tDriver.getRegisterDate());//报备日期（驾驶员信息向服务所在地出租车行政主管部门报备日期）
+ jsonObject.put("FullTimeDriver", tDriver.getFullTimeDriver());//是否专职驾驶员（1：是，0：否）
+ jsonObject.put("InDriverBlacklist", tDriver.getInDriverBlacklist());//是否在驾驶员黑名单内（1：是，0：否）
+ jsonObject.put("CommercialType", tDriver.getCommercialType());//服务类型（1：网络预约出租汽车，2：巡游出租汽车，3：私人小客车合乘）
+ jsonObject.put("ContractCompany", tDriver.getContractCompany());//驾驶员合同签署公司
+ jsonObject.put("ContractOn", tDriver.getContractOn());//合同有效期起YYYYMMDD
+ jsonObject.put("ContractOff", tDriver.getContractOff());//合同有效期止YYYYMMDD
+ jsonObject.put("EmergencyContact", tDriver.getEmergencyContact());//紧急情况联系人
+ jsonObject.put("EmergencyContactPhone", tDriver.getEmergencyContactPhone());//紧急情况联系人电话
+ jsonObject.put("EmergencyContactAddress", tDriver.getEmergencyContactAddress());//紧急情况联系人通信地址
+
+ jsonObject.put("State", tDriver.getAuthState() == 2 ? 0 : 1);//状态（0：有效，1：失效）
+ jsonObject.put("Flag", tDriver.getFlag());//操作标识（1：新增，2：更新，3：删除）
+ jsonObject.put("UpdateTime", new Date());
+ Map<String, String> map = new HashMap<>();
+ map.put("baseInfoDriver", jsonObject.toJSONString());
+ String result = HttpRequestUtil.postRequest(PushURL.ministry_of_transport_data + "/baseInfoDriver", map);
+ System.out.println("驾驶员基本信息：" + result);
+ }
+
+
+ /**
+ * 网约车驾驶员培训信息
+ * @param id
+ * @param id
+ */
+ public void baseInfoDriverEducate(Integer id, Integer flag){
+ DriverTrain driverTrain = driverTrainMapper.selectById(id);
+ TDriver driver = driverService.selectById(driverTrain.getDriverId());
+ JSONObject jsonObject = new JSONObject();
+ jsonObject.put("Address", 450204);//注册地行政区划代码
+ jsonObject.put("LicenseId", driver.getDriveCard());//机动车驾驶证号
+ jsonObject.put("CourseName", driverTrain.getCourseName());//驾驶员培训课程名称
+ jsonObject.put("CourseDate", driverTrain.getCourseDate());//培训课程日期YYYYMMDD
+ jsonObject.put("StartTime", driverTrain.getStartTime());//培训开始时间
+ jsonObject.put("StopTime", driverTrain.getStopTime());//培训结束时间
+ jsonObject.put("Duration", driverTrain.getDuration());//培训时长
+ jsonObject.put("Flag", flag);//操作标识（1：新增，2：更新，3：删除）
+ jsonObject.put("UpdateTime", new Date());
+ Map<String, String> map = new HashMap<>();
+ map.put("baseInfoDriverEducate", jsonObject.toJSONString());
+ String result = HttpRequestUtil.postRequest(PushURL.ministry_of_transport_data + "/baseInfoDriverEducate", map);
+ System.out.println("网约车驾驶员培训信息：" + result);
+ }
+
+
+ /**
+ * 驾驶员移动终端信息
+ * @param driverId
+ */
+ public void baseInfoDriverApp(Integer driverId){
+ TDriver tDriver = driverService.selectById(driverId);
+ TVersionManagement type = versionManagementService.selectOne(new EntityWrapper<TVersionManagement>().eq("type", 2).orderBy("insertTime desc limit 0, 1"));
+ JSONObject jsonObject = new JSONObject();
+ jsonObject.put("Address", 450204);//注册地行政区划代码
+ jsonObject.put("LicenseId", tDriver.getDriveCard());//机动车驾驶证号
+ jsonObject.put("DriverPhone", tDriver.getPhone());//驾驶员手机号
+ jsonObject.put("NetType", phoneExp(tDriver.getPhone()));//手机运营商（1：中国联通，2：中国移动，3：中国电信，4：其他）
+ jsonObject.put("AppVersion", type.getVersion());//使用APP版本号
+ jsonObject.put("MapType", 2);//使用地图类型（1：百度地图，2：高德地图，3：其他）
+ jsonObject.put("State", 0);//状态（0：有效，1：失效）
+ jsonObject.put("Flag", 1);//操作标识（1：新增，2：更新，3：删除）
+ jsonObject.put("UpdateTime", new Date());
+ Map<String, String> map = new HashMap<>();
+ map.put("baseInfoDriverApp", jsonObject.toJSONString());
+ String result = HttpRequestUtil.postRequest(PushURL.ministry_of_transport_data + "/baseInfoDriverApp", map);
+ System.out.println("驾驶员移动终端信息：" + result);
+ }
+
+
+ /**
+ * 驾驶员统计信息
+ * @param driverId
+ */
+ public void baseInfoDriverStat(Integer driverId){
+ TDriver tDriver = driverService.selectById(driverId);
+ Calendar s = Calendar.getInstance();
+ s.setTime(new Date());
+ s.set(s.get(Calendar.YEAR), s.get(Calendar.MONTH) - 1, 1, 0, 0, 0);
+
+ Calendar e = Calendar.getInstance();
+ e.setTime(new Date());
+ e.set(e.get(Calendar.YEAR), e.get(Calendar.MONTH) - 1, e.getActualMaximum(Calendar.DAY_OF_MONTH), 23, 59, 59);
+
+ int i = orderPrivateCarService.selectCount(
+ new EntityWrapper<TOrderPrivateCar>()
+ .eq("driverId", driverId)
+ .in("state", Arrays.asList(6, 7, 8, 9))
+ .between("travelTime", s.getTime(), e.getTime())
+ );
+ int i1 = complaintService.selectCount(
+ new EntityWrapper<TComplaint>()
+ .eq("driverId", driverId)
+ .between("insert_time", s.getTime(), e.getTime())
+ );
+ JSONObject jsonObject = new JSONObject();
+ jsonObject.put("Address", 450204);//注册地行政区划代码
+ jsonObject.put("LicenseId", tDriver.getDriveCard());//机动车驾驶证号
+ jsonObject.put("Cycle", s.getTime());//统计周期（统计周期按月，内容填写统计月份YYYYMM）
+ jsonObject.put("OrderCount", i);//完成订单次数
+ jsonObject.put("TrafficViolationCount", 0);//交通违章次数
+ jsonObject.put("ComplainedCount", i1);//被投诉次数
+ jsonObject.put("Flag", 1);//操作标识（1：新增，2：更新，3：删除）
+ jsonObject.put("UpdateTime", new Date());
+ Map<String, String> map = new HashMap<>();
+ map.put("baseInfoDriverStat", jsonObject.toJSONString());
+ String result = HttpRequestUtil.postRequest(PushURL.ministry_of_transport_data + "/baseInfoDriverStat", map);
+ System.out.println("驾驶员统计信息：" + result);
+ }
+
+
+ /**
+ * 订单撤销接口
+ * @param orderId
+ */
+ public void orderCancel(Integer orderId){
+ TOrderPrivateCar tOrderPrivateCar = orderPrivateCarService.selectById(orderId);
+ TDriver driver = driverService.selectById(tOrderPrivateCar.getDriverId());
+ OrderCancel query = orderCancelMapper.query(orderId, 1, null, null, 2);
+ Map<String, String> geocode = null;
+ try {
+ geocode = gdMapGeocodingUtil.geocode(tOrderPrivateCar.getBoardingLon().toString(),
+ tOrderPrivateCar.getBoardingLat().toString());
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ JSONObject jsonObject = new JSONObject();
+ jsonObject.put("Address", Integer.valueOf(geocode.get("districtCode")));//上车地点行政区划代码
+ jsonObject.put("OrderId", tOrderPrivateCar.getOrderNum());//订单编号
+ jsonObject.put("OrderTime", tOrderPrivateCar.getOrderNum());//订单时间YYYYMMDDhhmmss
+ jsonObject.put("CancelTime", query.getInsertTime());//订单撤销时间YYYYMMDDhhmmss
+ jsonObject.put("Operator", "3");//撤销发起方（1：乘客，2：驾驶员，3：平台公司）
+ jsonObject.put("CancelTypeCode", null != driver ? driver.getDriveCard() : "");//机动车驾驶证编号
+ jsonObject.put("CancelReason", query.getReason());//撤销或违约原因
+ Map<String, String> map = new HashMap<>();
+ map.put("orderCancel", jsonObject.toJSONString());
+ String result = HttpRequestUtil.postRequest(PushURL.ministry_of_transport_data + "/orderCancel", map);
+ System.out.println("订单撤销接口：" + result);
+ }
+
+
+ /**
+ * 乘客投诉信息
+ * @param id
+ */
+ public void ratedPassengerComplaint(Integer id){
+ TComplaint tComplaint = complaintService.selectById(id);
+ JSONObject jsonObject = new JSONObject();
+ jsonObject.put("OrderId", "");//订单号
+ jsonObject.put("ComplaintTime", tComplaint.getInsertTime());//投诉时间YYYYMMDDhhmms
+ jsonObject.put("Detail", tComplaint.getReason());//投诉内容
+ jsonObject.put("Result", tComplaint.getHandleResult());//处理结果
+ Map<String, String> map = new HashMap<>();
+ map.put("ratedPassengerComplaint", jsonObject.toJSONString());
+ String result = HttpRequestUtil.postRequest(PushURL.ministry_of_transport_data + "/ratedPassengerComplaint", map);
+ System.out.println("乘客投诉信息：" + result);
+ }
+
+
+ /**
+ * 驾驶员处罚信息
+ * @param id
+ */
+ public void ratedDriverPunish(Integer id){
+ DriverPunish driverPunish = driverPunishMapper.selectById(id);
+ TDriver driver = driverService.selectById(driverPunish.getDriverId());
+ JSONObject jsonObject = new JSONObject();
+ jsonObject.put("LicenseId", driver.getDriveCard());//机动车驾驶证编号
+ jsonObject.put("PunishTime", driverPunish.getPunishTime());//处罚时间YYYYMMDDhhmms
+ jsonObject.put("PunishReason", driverPunish.getPunishReason());//处罚原因
+ jsonObject.put("PunishReault", driverPunish.getPunishReault());//处罚结果
+ Map<String, String> map = new HashMap<>();
+ map.put("ratedDriverPunish", jsonObject.toJSONString());
+ String result = HttpRequestUtil.postRequest(PushURL.ministry_of_transport_data + "/ratedDriverPunish", map);
+ System.out.println("驾驶员处罚信息：" + result);
+ }
+
+
+
+
+
+
+ private int phoneExp(String phone){
+ /**
+ * 中国移动号码正则
+ * 139、138、137、136、135、134、147、150、151、152、157、158、159、178、182、183、184、187、188、198、195
+ * 虚拟运营商号段: 1703、1705、1706、165
+ **/
+ String MOBILE_PATTERN = "(^1(3[4-9]|47|5[0-27-9]|65|78|8[2-478]|98)\\d{8}$)|(^170[356]\\d{7}$)";
+
+ /**
+ * 中国电信号码正则
+ * 133、149、153、173、177、180、181、189、199、191
+ * 虚拟运营商号段: 162、1700、1701、1702
+ **/
+ String TELECOM_PATTERN = "(^1(33|49|53|62|7[37]|8[019]|9[19])\\d{8}$)|(^170[012]\\d{7}$)";
+
+ /**
+ * 中国联通号码正则
+ * 130、131、132、155、156、185、186、145、175、176、166、140
+ * 虚拟运营商号段: 171、1707、1708、1709、167
+ **/
+ String UNICOM_PATTERN = "(^1(3[0-2]|4[05]|5[56]|6[67]|7[156]|8[56])\\d{8}$)|(^170[7-9]\\d{7}$)";
+ if(Pattern.matches(UNICOM_PATTERN, phone)){
+ return 1;
+ }
+ if(Pattern.matches(MOBILE_PATTERN, phone)){
+ return 2;
+ }
+ if(Pattern.matches(TELECOM_PATTERN, phone)){
+ return 3;
+ }
+ return 4;
+ }
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/PushURL.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/PushURL.java
new file mode 100644
index 0000000..411a367
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/PushURL.java
@@ -0,0 +1,22 @@
+package com.stylefeng.guns.modular.system.util;
+
+public class PushURL {
+ public static String zull_user_url = "https://okyueche.com:443";
+ public static String order_push_url = zull_user_url + "/driver/base/order/pushOrderState";
+ public static String driver_auth_url = zull_user_url + "/driver/base/driver/sendsms";
+ public static String withdraw_auth_url = zull_user_url + "/driver/base/withdrawal/withdrawalAudit";
+ public static String cancel_order_url = zull_user_url + "/user/base/order/sendOrderState";
+ public static String freeze_user_url = zull_user_url + "/user/base/user/freeze";
+ public static String ministry_of_transport_data = "http://120.77.11.218:8868/ministryOfTransport";
+ public static String ministry_of_transport_ftp = "http://120.77.11.218:8868/ftp";
+
+
+// public static String zull_user_url = "http://127.0.0.1:80";
+// public static String order_push_url = zull_user_url + "/driver/base/order/pushOrderState";
+// public static String driver_auth_url = zull_user_url + "/driver/base/driver/sendsms";
+// public static String withdraw_auth_url = zull_user_url + "/driver/base/withdrawal/withdrawalAudit";
+// public static String cancel_order_url = zull_user_url + "/user/base/order/sendOrderState";
+// public static String freeze_user_url = zull_user_url + "/user/base/user/freeze";
+// public static String ministry_of_transport_data = "http://120.77.11.218:8868/ministryOfTransport";
+// public static String ministry_of_transport_ftp = "http://120.77.11.218:8868/ftp";
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/RedisUtil.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/RedisUtil.java
new file mode 100644
index 0000000..ce51f7f
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/RedisUtil.java
@@ -0,0 +1,129 @@
+package com.stylefeng.guns.modular.system.util;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.stylefeng.guns.core.util.ToolUtil;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpEntity;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.MediaType;
+import org.springframework.stereotype.Component;
+import org.springframework.util.LinkedMultiValueMap;
+import org.springframework.util.MultiValueMap;
+import org.springframework.web.client.RestTemplate;
+import redis.clients.jedis.Jedis;
+import redis.clients.jedis.JedisPool;
+
+import java.util.HashMap;
+import java.util.Map;
+
+
+/**
+ * Redis工具类
+ */
+@Component
+public class RedisUtil {
+
+
+
+ /**
+ * 向redis中存储字符串没有过期时间
+ * @param key
+ * @param value
+ */
+ public void setStrValue(String key, String value){
+ if(ToolUtil.isNotEmpty(key)){
+ //将请求头部和参数合成一个请求
+ Map<String,String> map = new HashMap<>();
+ map.put("key", key);
+ map.put("value", value);
+ String s = HttpRequestUtil.postRequest(PushURL.zull_user_url + "/redis/setValue_", map);
+ JSONObject jsonObject = JSON.parseObject(s, JSONObject.class);
+ if(jsonObject.getIntValue("code") != 200){
+ System.err.println("调用redis出错了");
+ }
+ }
+
+ }
+
+
+ /**
+ * 以分钟为单位设置存储值（设置过期时间）
+ * @param key
+ * @param value
+ * @param time 秒
+ */
+ public void setStrValue(String key, String value, int time){
+ if(ToolUtil.isNotEmpty(key)){
+ Map<String,String> map = new HashMap<>();
+ map.put("key", key);
+ map.put("value", value);
+ map.put("time", String.valueOf(time));
+ String s = HttpRequestUtil.postRequest(PushURL.zull_user_url + "/redis/setValue", map);
+ JSONObject jsonObject = JSON.parseObject(s, JSONObject.class);
+ if(jsonObject.getIntValue("code") != 200){
+ System.err.println("调用redis出错了");
+ }
+ }
+ }
+
+
+ /**
+ * 从redis中获取值
+ * @param key
+ * @return
+ */
+ public String getValue(String key){
+ if(ToolUtil.isNotEmpty(key)){
+ Map<String,String> map = new HashMap<>();
+ map.put("key", key);
+ String s = HttpRequestUtil.postRequest(PushURL.zull_user_url + "/redis/getValue", map);
+ JSONObject jsonObject = JSON.parseObject(s, JSONObject.class);
+ if(jsonObject.getIntValue("code") != 200){
+ System.err.println("调用redis出错了");
+ }
+ return jsonObject.getString("data");
+ }
+ return null;
+ }
+
+
+
+ /**
+ * 从redis中获取值
+ * @param key
+ * @return
+ */
+ public String getValues(String key){
+ if(ToolUtil.isNotEmpty(key)){
+ Map<String,String> map = new HashMap<>();
+ map.put("keys", key);
+ String s = HttpRequestUtil.postRequest(PushURL.zull_user_url + "/redis/getValues", map);
+ JSONObject jsonObject = JSON.parseObject(s, JSONObject.class);
+ if(jsonObject.getIntValue("code") != 200){
+ System.err.println("调用redis出错了");
+ }
+ return jsonObject.getString("data");
+ }
+ return null;
+ }
+
+
+ /**
+ * 删除key
+ * @param key
+ */
+ public String remove(String key){
+ if(ToolUtil.isNotEmpty(key)){
+ Map<String,String> map = new HashMap<>();
+ map.put("key", key);
+ String s = HttpRequestUtil.postRequest(PushURL.zull_user_url + "/redis/getValue", map);
+ JSONObject jsonObject = JSON.parseObject(s, JSONObject.class);
+ if(jsonObject.getIntValue("code") != 200){
+ System.err.println("调用redis出错了");
+ }
+ return jsonObject.getString("data");
+ }
+ return null;
+ }
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/ResultUtil.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/ResultUtil.java
new file mode 100644
index 0000000..75dfbc8
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/ResultUtil.java
@@ -0,0 +1,195 @@
+package com.stylefeng.guns.modular.system.util;
+
+/**
+ * 定义统一返回对象
+ */
+public class ResultUtil<T> {
+
+ public static final Integer SUCCESS = 200;
+
+ public static final Integer PARAM_ERROR = 300;
+
+ public static final Integer RUNTIME_ERROR = 400;
+
+ public static final Integer ERROR = 500;
+
+ public static final String Token = "Token失效";
+
+ private Integer status;//状态码
+
+ private Integer code;//备用状态码
+
+ private String msg;//返回说明
+
+ private T data;//返回数据
+
+ private String str;//存储单个字符串值
+
+
+ public Integer getStatus() {
+ return status;
+ }
+
+ public String getMsg() {
+ return msg;
+ }
+
+ public T getData() {
+ return data;
+ }
+
+ public String getStr() {
+ return str;
+ }
+
+ public Integer getCode() {
+ return code;
+ }
+
+ private ResultUtil(Integer status, Integer code, String msg) {
+ this.status = status;
+ this.code = code;
+ this.msg = msg;
+ }
+
+ private ResultUtil(Integer status, Integer code, String msg, T data) {
+ this.status = status;
+ this.code = code;
+ this.msg = msg;
+ this.data = data;
+ }
+
+ private ResultUtil(Integer status, Integer code, String msg, T data, String str) {
+ this.status = status;
+ this.code = code;
+ this.msg = msg;
+ this.data = data;
+ this.str = str;
+ }
+
+ private ResultUtil(Integer status, Integer code, String msg, String str) {
+ this.status = status;
+ this.code = code;
+ this.msg = msg;
+ this.str = str;
+ }
+
+
+ public static <T> ResultUtil<T> getResult(Integer status, Integer code, String msg){
+ return new ResultUtil<>(status, code, msg);
+ }
+
+ public static <T> ResultUtil<T> getResult(Integer status, Integer code, String msg, T data){
+ return new ResultUtil<>(status, code, msg, data);
+ }
+
+ public static <T> ResultUtil<T> getResult(Integer status, Integer code, String msg, T data, String str){
+ return new ResultUtil<>(status, code, msg, data, str);
+ }
+
+ /**
+ * 错误信息
+ * @return
+ */
+ public static ResultUtil error(String mag){
+ return ResultUtil.getResult(ResultUtil.ERROR, ResultUtil.ERROR, mag);
+ }
+
+ /**
+ * 错误信息
+ * @return
+ */
+ public static <T> ResultUtil <T> error(String mag, T obj){
+ return ResultUtil.getResult(ResultUtil.ERROR, ResultUtil.ERROR, mag, obj);
+ }
+
+ /**
+ * token失效
+ * @return
+ */
+ public static ResultUtil tokenErr(){
+ return ResultUtil.getResult(ResultUtil.ERROR, ResultUtil.ERROR, ResultUtil.Token);
+ }
+
+ /**
+ * token失效
+ * @return
+ */
+ public static ResultUtil tokenErr(String msg){
+ return ResultUtil.getResult(ResultUtil.ERROR, ResultUtil.ERROR, msg);
+ }
+
+ /**
+ * 参数异常
+ * @return
+ */
+ public static ResultUtil paranErr(){
+ return ResultUtil.getResult(ResultUtil.PARAM_ERROR, ResultUtil.PARAM_ERROR, "参数异常");
+ }
+
+ /**
+ * 参数异常
+ * @return
+ */
+ public static <T> ResultUtil<T> paranErr(T data){
+ return ResultUtil.getResult(ResultUtil.PARAM_ERROR, ResultUtil.PARAM_ERROR, "参数异常", data);
+ }
+
+ /**
+ * 运行异常
+ * @return
+ */
+ public static ResultUtil runErr(){
+ return ResultUtil.getResult(ResultUtil.RUNTIME_ERROR, ResultUtil.RUNTIME_ERROR, "服务器运行异常");
+ }
+
+
+ /**
+ * 运行异常
+ * @return
+ */
+ public static <T>ResultUtil<T> runErr(T data){
+ return ResultUtil.getResult(ResultUtil.RUNTIME_ERROR, ResultUtil.RUNTIME_ERROR, "服务器运行异常", data);
+ }
+
+
+ /**
+ * 返回成功
+ * @param
+ * @return
+ */
+ public static ResultUtil success(){
+ return ResultUtil.getResult(ResultUtil.SUCCESS, ResultUtil.SUCCESS, "成功");
+ }
+
+
+ /**
+ * 返回成功
+ * @param data
+ * @param <T>
+ * @return
+ */
+ public static <T> ResultUtil<T> success(T data){
+ return ResultUtil.getResult(ResultUtil.SUCCESS, ResultUtil.SUCCESS, "成功", data);
+ }
+
+ /**
+ * 返回成功
+ * @param data
+ * @param str
+ * @param <T>
+ * @return
+ */
+ public static <T> ResultUtil<T> success(T data, String str){
+ return ResultUtil.getResult(ResultUtil.SUCCESS, ResultUtil.SUCCESS, "成功", data, str);
+ }
+
+ public static <T> ResultUtil<T> success(String msg, T data){
+ return ResultUtil.getResult(ResultUtil.SUCCESS, ResultUtil.SUCCESS, msg, data);
+ }
+
+ public static <T> ResultUtil<T> success(String msg, T data, String str){
+ return ResultUtil.getResult(ResultUtil.SUCCESS, ResultUtil.SUCCESS, msg, data, str);
+ }
+
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/RongCloudUtil.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/RongCloudUtil.java
new file mode 100644
index 0000000..04f11ef
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/RongCloudUtil.java
@@ -0,0 +1,148 @@
+package com.stylefeng.guns.modular.system.util;
+
+import io.rong.RongCloud;
+import io.rong.methods.push.Push;
+import io.rong.methods.user.User;
+import io.rong.models.Result;
+import io.rong.models.push.Audience;
+import io.rong.models.push.Notification;
+import io.rong.models.push.PlatformNotification;
+import io.rong.models.push.PushModel;
+import io.rong.models.response.PushResult;
+import io.rong.models.response.TokenResult;
+import io.rong.models.user.UserModel;
+import io.rong.util.HostType;
+import io.rong.util.HttpUtil;
+
+import java.net.HttpURLConnection;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * 融云
+ */
+public class RongCloudUtil {
+ private static String appKey = "25wehl3u20ddw";
+ private static String appSecret = "gG3IjHADkAK";
+
+ private static RongCloud rongCloud = RongCloud.getInstance(appKey, appSecret);
+ /**
+ * 融云注册
+ * @param id
+ * @param name
+ * @param portrait
+ * @return
+ * @throws Exception
+ */
+ public static TokenResult getToken(String id,String name,String portrait) throws Exception{
+ User user = rongCloud.user;
+ UserModel userModel = new UserModel()
+ .setId(id)
+ .setName(name)
+ .setPortrait(portrait);
+ TokenResult result = user.register(userModel);
+ return result;
+ }
+ /**
+ * 修改
+ * @param id
+ * @param name
+ * @param portrait
+ * @return
+ * @throws Exception
+ */
+ public static Result update(String id,String name,String portrait) throws Exception{
+ User user = rongCloud.user;
+ UserModel userModel = new UserModel()
+ .setId(id)
+ .setName(name)
+ .setPortrait(portrait);
+ Result result = user.update(userModel);
+ return result;
+ }
+
+ /**
+ * 推送
+ * @param userId
+ * @param content
+ * @param extras
+ * @return
+ * @throws Exception
+ */
+ public static String push( String userId, String content,String extras) throws Exception {
+ String platform="[\"ios\",\"android\"]";
+ String audience="{\"userid\":"+"[\""+userId+"\"]"+",\"is_to_all\":false}";
+ String notification="{\"alert\":\""+content+"\",\"ios\":"+extras+",\"android\":"+extras+"}";
+ String[] tag = {"10"};
+ StringBuilder sb = new StringBuilder();
+ sb.append("platform=").append(platform);
+ sb.append("&tag=").append(tag.toString());
+ sb.append("&audience=").append(audience);
+ sb.append("¬ification=").append(notification);
+ /*sb.append(",");
+ sb.append("\"extras\":").append(extras);*/
+ HostType apiHostType = new HostType("https://api-cn.ronghub.com/message/system");
+ HttpURLConnection conn = HttpUtil.CreatePostHttpConnection(apiHostType, appKey, appSecret, "/publish.json", "application/json");
+ HttpUtil.setBodyParameter(sb, conn);
+ return HttpUtil.returnResult(conn);
+ }
+
+ /**
+ * 发送推送信息
+ *
+ * @param alert 消息内容
+ * @param fromUserId 1
+ * @param toUserId userId
+// * @param objectName RC:TxtMsg
+// * @param pushContent 消息标题
+// * @param pushData 空-安卓 非空：苹果
+ * @throws Exception
+ */
+ public static PushResult pushSystemMessage(String alert, String fromUserId, String[] toUserId,Map<String, String> extras) throws Exception {
+
+ //请求路径
+ Push push = rongCloud.push;
+ //推送条件
+ Audience audience = new Audience();
+ audience.setIs_to_all(false);
+ audience.setUserid(toUserId);
+
+ ////按操作系统类型推送消息内容
+ Notification notification = new Notification();
+ notification.setAlert(alert);
+
+ //IOS内容
+ PlatformNotification ios = new PlatformNotification();
+ ios.setAlert(alert);
+ ios.setExtras(extras);
+ notification.setIos(ios);
+
+ //Android内容
+ PlatformNotification android = new PlatformNotification();
+ android.setAlert(alert);
+ android.setExtras(extras);
+ notification.setAndroid(android);
+
+ PushModel pushModel = new PushModel();
+ //目标操作系统
+ String[] platform="ios,android".split(",");
+ pushModel.setPlatform(platform);
+ pushModel.setAudience(audience);
+ pushModel.setNotification(notification);
+ //推送消息
+ PushResult result = push.push(pushModel);
+ return result;
+ }
+
+
+ public static void main(String[] args) {
+ try {
+ Map<String,String> extras = new HashMap<>();
+ extras.put("state","1");
+ PushResult pushResult = pushSystemMessage("您的账号已重置密码为123456，请修改密码后重新登录，如有问题，请联系平台客服。", "1", new String[]{"122"}, extras);
+ System.out.println(pushResult);
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ }
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/SpringContextsUtil.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/SpringContextsUtil.java
new file mode 100644
index 0000000..fc674da
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/SpringContextsUtil.java
@@ -0,0 +1,37 @@
+package com.stylefeng.guns.modular.system.util;
+
+import org.springframework.beans.BeansException;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.ApplicationContextAware;
+import org.springframework.stereotype.Component;
+
+@Component
+public class SpringContextsUtil implements ApplicationContextAware{
+
+ private static ApplicationContext applicationContext;
+
+ @Override
+ public void setApplicationContext(ApplicationContext applicationContext) throws BeansException {
+ if (SpringContextsUtil.applicationContext == null) {
+ SpringContextsUtil.applicationContext = applicationContext;
+ }
+ }
+ // 获取applicationContext
+ public static ApplicationContext getApplicationContext() {
+ return applicationContext;
+ }
+ // 通过name获取 Bean.
+ public static Object getBean(String name) {
+ return getApplicationContext().getBean(name);
+ }
+ // 通过class获取Bean.
+ public static <T> T getBean(Class<T> clazz) {
+ return getApplicationContext().getBean(clazz);
+ }
+ // 通过name,以及Clazz返回指定的Bean
+ public static <T> T getBean(String name, Class<T> clazz) {
+ System.out.println(getApplicationContext().getBean(name, clazz));
+ return getApplicationContext().getBean(name, clazz);
+ }
+
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/TaskUtil.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/TaskUtil.java
new file mode 100644
index 0000000..fe42e7e
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/TaskUtil.java
@@ -0,0 +1,79 @@
+package com.stylefeng.guns.modular.system.util;
+
+
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.stylefeng.guns.modular.system.model.TDriver;
+import com.stylefeng.guns.modular.system.service.ITDriverService;
+import com.stylefeng.guns.modular.system.service.ITLocationService;
+import com.stylefeng.guns.modular.system.service.IUserCouponRecordService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+
+/**
+ * 定时任务工具类
+ */
+@Component
+public class TaskUtil {
+
+ @Autowired
+ private ITLocationService locationService;
+
+ @Autowired
+ private PushMinistryOfTransportUtil pushMinistryOfTransportUtil;
+
+ @Value("${pushMinistryOfTransport}")
+ private boolean pushMinistryOfTransport;
+
+ @Autowired
+ private ITDriverService driverService;
+
+
+
+ /**
+ * 每隔一分钟去处理的定时任务
+ */
+ @Scheduled(fixedRate = 1000 * 60)
+ public void taskMinute(){
+ try {
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ }
+
+
+ /**
+ * 每天的凌晨执行的任务
+ */
+ @Scheduled(cron = "0 0 0 * * *")
+ public void taskDay(){
+ try {
+ locationService.updateFence();//更新线上电子围栏
+ }catch (Exception e){
+ e.printStackTrace();
+ }
+ }
+
+
+
+ /**
+ * 每月第一天的1点执行的任务
+ */
+ @Scheduled(cron = "0 0 1 1 * *")
+ public void taskMonth(){
+ try {
+ if(pushMinistryOfTransport){
+ List<TDriver> tDrivers = driverService.selectList(new EntityWrapper<TDriver>().eq("authState", 2).ne("flag", 3));
+ for(TDriver driver : tDrivers){
+ pushMinistryOfTransportUtil.baseInfoDriverStat(driver.getId());
+ }
+ }
+ }catch (Exception e){
+ e.printStackTrace();
+ }
+ }
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/WoUtil.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/WoUtil.java
new file mode 100644
index 0000000..a5849d2
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/WoUtil.java
@@ -0,0 +1,31 @@
+package com.stylefeng.guns.modular.system.util;
+
+import org.apache.poi.hssf.usermodel.HSSFWorkbook;
+import org.apache.poi.ss.usermodel.Workbook;
+import org.apache.poi.xssf.usermodel.XSSFWorkbook;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.io.IOException;
+
+public class WoUtil {
+ public static Workbook ImportFile(MultipartFile importFile) {
+ Workbook book = null;
+ if(importFile == null)
+ {
+ //throw new WoException(SysConstant.ERR_EXCEL_NULL);
+ }
+ String fileName = importFile.getOriginalFilename();
+ try {
+ if(fileName.endsWith(".xlsx")) //当表格的后缀是".xlsx时"
+ {
+ book = new XSSFWorkbook(importFile.getInputStream());
+ }else
+ {
+ book = new HSSFWorkbook(importFile.getInputStream());
+ }
+ } catch (IOException e) {
+ //throw new WoException(e,SysConstant.ERR_EXCEL_NO);
+ }
+ return book;
+ }
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/task/QuartzTest.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/task/QuartzTest.java
new file mode 100644
index 0000000..dcd730d
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/task/QuartzTest.java
@@ -0,0 +1,19 @@
+package com.stylefeng.guns.modular.system.util.task;
+
+import java.util.Map;
+
+import org.quartz.SchedulerException;
+
+import com.google.common.collect.ImmutableMap;
+
+public class QuartzTest {
+
+ public static void main(String[] args) throws SchedulerException {
+ Map<String, ? extends Object> maps = ImmutableMap
+ .of("id", 1) ;
+ //QuartzManager.addJob(ActivityStartJob.class, (ActivityStartJob.FROZEN_JOB_NAME_PREFIX+1).toUpperCase(), TimeJobType.ACTIVITYSTART, new Date() , maps);
+
+ }
+
+
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/task/TestJob.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/task/TestJob.java
new file mode 100644
index 0000000..fa471a3
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/task/TestJob.java
@@ -0,0 +1,23 @@
+package com.stylefeng.guns.modular.system.util.task;
+
+import java.util.Date;
+
+import org.apache.commons.lang.time.DateFormatUtils;
+import org.quartz.JobExecutionContext;
+import org.quartz.JobExecutionException;
+
+import com.stylefeng.guns.modular.system.util.task.base.AbstractJob;
+
+public class TestJob extends AbstractJob{
+
+ @Override
+ public void execute(JobExecutionContext context) throws JobExecutionException {
+ logger.debug("Start >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>");
+ Integer serial = (Integer) context.get("serialize");
+ Integer keys = context.getMergedJobDataMap().getIntValue("keys");
+ System.out.println(">>>>>>>>>>> serial:"+serial);
+ System.out.println(">>>>>>>>>>> keys:"+keys);
+
+ System.out.println(">>>>>>>>>>>>>>>>>>>>>>>>>"+DateFormatUtils.format(new Date(), "yyyy-MM-dd HH:mm:ss.SSS"));
+ }
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/task/ThreadTes.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/task/ThreadTes.java
new file mode 100644
index 0000000..5a525e3
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/task/ThreadTes.java
@@ -0,0 +1,25 @@
+package com.stylefeng.guns.modular.system.util.task;
+
+
+public class ThreadTes implements Runnable{
+ @Override
+ public void run() {
+ try {
+ System.out.println(">>>>>>>>>>>>>>>>>>> start ");
+ Thread.sleep(2000);
+ System.out.println(">>>>>>>>>>>>>>>>>>> remove job 5 ");
+ /*QuartzManager.removeJob(String.valueOf(5),
+ TimeJobType.NEWS);*/
+ System.out.println(">>>>>>>>>>>>>>>>>>> stop");
+
+
+ Thread.sleep(2000);
+ System.out.println(">>>>>>>>>>>>>>>>>>> modify job 10 ");
+ //QuartzManager.modifyJobTime(String.valueOf(10), TimeJobType.NEWS, new Date(Calendar.getInstance().getTimeInMillis() + 20*1000));
+ System.out.println(">>>>>>>>>>>>>>>>>>> stop");
+ } catch (InterruptedException e) {
+ e.printStackTrace();
+ }
+ }
+
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/task/base/AbstractJob.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/task/base/AbstractJob.java
new file mode 100644
index 0000000..f0969ba
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/task/base/AbstractJob.java
@@ -0,0 +1,36 @@
+package com.stylefeng.guns.modular.system.util.task.base;
+
+import com.stylefeng.guns.core.util.SpringContextHolder;
+import com.stylefeng.guns.modular.system.service.ITDriverService;
+import com.stylefeng.guns.modular.system.service.ITNoticesService;
+import com.stylefeng.guns.modular.system.service.ITSystemNoticeService;
+import com.stylefeng.guns.modular.system.service.ITUserService;
+import org.quartz.Job;
+import org.quartz.JobExecutionContext;
+import org.quartz.JobExecutionException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public abstract class AbstractJob implements Job{
+ protected Logger logger = LoggerFactory.getLogger(getClass());
+
+ @Override
+ public abstract void execute(JobExecutionContext context) throws JobExecutionException;
+
+ protected ITUserService tUserService; //用户
+ protected ITNoticesService tNoticesService; //公告
+ protected ITSystemNoticeService tSystemNoticeService; //公告记录
+ protected ITDriverService tDriverService; //司机
+
+ public AbstractJob(){
+ //this.exhibitionService = SpringContextsUtil.getBean("exhibitionService", IExhibitionService.class);
+ this.tUserService = SpringContextHolder.getBean( ITUserService.class);
+ this.tNoticesService = SpringContextHolder.getBean( ITNoticesService.class);
+ this.tSystemNoticeService = SpringContextHolder.getBean( ITSystemNoticeService.class);
+ this.tDriverService = SpringContextHolder.getBean( ITDriverService.class);
+
+
+ }
+
+
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/task/base/QuartzManager.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/task/base/QuartzManager.java
new file mode 100644
index 0000000..7533872
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/task/base/QuartzManager.java
@@ -0,0 +1,141 @@
+package com.stylefeng.guns.modular.system.util.task.base;
+
+import java.util.Date;
+import java.util.Map;
+
+import org.quartz.Job;
+import org.quartz.JobBuilder;
+import org.quartz.JobDataMap;
+import org.quartz.JobDetail;
+import org.quartz.JobKey;
+import org.quartz.Scheduler;
+import org.quartz.SchedulerFactory;
+import org.quartz.SimpleTrigger;
+import org.quartz.TriggerBuilder;
+import org.quartz.TriggerKey;
+import org.quartz.impl.StdSchedulerFactory;
+
+public class QuartzManager {
+ private static SchedulerFactory factory = new StdSchedulerFactory();
+ private static final String TRIGGER_NAME_PREFIX = "TRIGGER_PREFIX_";
+ private static final String JOB_NAME_PREFIX = "JOB_PREFIX_";
+
+ /**
+ * 添加定时任务：具体某个时间点执行一次的任务，如：在某个2015-06-01 12:00发送一条消息
+ *
+ * @param class1
+ * @param jobName
+ * 具体的任务名+ID标识唯一
+ * @param jobType
+ * @param date
+ * @param jp
+ */
+ public synchronized static void addJob(Class<? extends Job> jobClass, String jobName, TimeJobType jobType, Date date,
+ Map<String, ? extends Object> jp) {
+ //logger.debug("ADD JOB {},jobName={},jobTyep={},jobDate={},",jobClass.getName(),jobName,jobType,date);
+ try {
+ Scheduler sched = factory.getScheduler();
+ JobDetail job = JobBuilder.newJob(jobClass).withIdentity(JOB_NAME_PREFIX + jobName, jobType.getType())
+ .setJobData(new JobDataMap(jp)).build();
+
+ SimpleTrigger trigger = (SimpleTrigger) TriggerBuilder.newTrigger()
+ .withIdentity(TRIGGER_NAME_PREFIX + jobName, jobType.getType()).startAt(date).build();
+ removeJob(jobName, jobType);
+
+ sched.scheduleJob(job, trigger);
+
+ if (!sched.isShutdown()) {
+ sched.start();
+ }
+ } catch (Exception e) {
+ //logger.error("ADD JOB exception {},jobName={},jobTyep={},jobDate={},",jobClass.getName(),jobName,jobType,date);
+ }
+ }
+
+ /**
+ * 修改一个任务的触发时间(使用默认的任务组名，触发器名，触发器组名)
+ * @param jobName
+ * @param time
+ */
+ public synchronized static void modifyJobTime(String jobName,TimeJobType jobType, Date time) {
+ //logger.error("Update JOB exception,jobName={},jobTyep={},jobDate={}," ,jobName,jobType,time);
+ try {
+ JobKey jobKey = new JobKey(JOB_NAME_PREFIX + jobName, jobType.getType());
+ TriggerKey key = new TriggerKey(TRIGGER_NAME_PREFIX + jobName, jobType.getType());
+
+
+ Scheduler sched = factory.getScheduler();
+ SimpleTrigger trigger = (SimpleTrigger) sched.getTrigger(key);
+ if(trigger == null) {
+ return;
+ }
+ Date oldTime = trigger.getStartTime();
+
+ if (oldTime.getTime() != time.getTime()) {
+ JobDetail jobDetail = sched.getJobDetail(jobKey);
+ Class<? extends Job> objJobClass = jobDetail.getJobClass();
+ removeJob(jobName,jobType);
+ Map<String, Object> jp = jobDetail.getJobDataMap();
+ addJob(objJobClass, jobName, jobType, time, jp);
+ }
+ } catch (Exception e) {
+ // logger.error("Update JOB exception,jobName={},jobTyep={},jobDate={}," ,jobName,jobType,time);
+ }
+ }
+
+ /**
+ * 移除一个任务
+ *
+ * @param jobName
+ * @param jobGroupName
+ * @param triggerName
+ * @param triggerGroupName
+ */
+ public synchronized static void removeJob(String jobName, TimeJobType jobType) {
+ try {
+ JobKey jobKey = new JobKey(JOB_NAME_PREFIX + jobName, jobType.getType());
+ TriggerKey key = new TriggerKey(TRIGGER_NAME_PREFIX + jobName, jobType.getType());
+ Scheduler sched = factory.getScheduler();
+
+ JobDetail detail = sched.getJobDetail(jobKey);
+ if (detail != null) {
+ sched.pauseJob(jobKey);
+ sched.pauseTrigger(key);// 停止触发器
+ sched.unscheduleJob(key);// 移除触发器
+ sched.deleteJob(jobKey);// 删除任务
+ }
+ } catch (Exception e) {
+ e.printStackTrace();
+ throw new RuntimeException(e);
+ }
+ }
+
+ /**
+ * 启动所有定时任务
+ */
+ public synchronized static void startJobs() {
+ try {
+ Scheduler sched = factory.getScheduler();
+ sched.start();
+ } catch (Exception e) {
+ e.printStackTrace();
+ throw new RuntimeException(e);
+ }
+ }
+
+ /**
+ * 关闭所有定时任务
+ */
+ public synchronized static void shutdownJobs() {
+ try {
+ Scheduler sched = factory.getScheduler();
+ if (!sched.isShutdown()) {
+ sched.shutdown();
+ }
+ } catch (Exception e) {
+ e.printStackTrace();
+ throw new RuntimeException(e);
+ }
+ }
+
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/task/base/TimeJobType.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/task/base/TimeJobType.java
new file mode 100644
index 0000000..3e8594e
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/task/base/TimeJobType.java
@@ -0,0 +1,30 @@
+package com.stylefeng.guns.modular.system.util.task.base;
+
+/**
+ * @Description 按时间点发布的任务类型
+ * @author Leeyns
+ * @date 2016年5月17日 下午7:22:28
+ */
+public enum TimeJobType {
+ EXHIBITION("EXHIBITION","展会定时"),
+ UNLOCK("UNLOCK","是否过期");
+ private String type;
+ private String desc;
+ private TimeJobType(String type, String desc) {
+ this.type = type;
+ this.desc = desc;
+ }
+ public String getType() {
+ return type;
+ }
+ public void setType(String type) {
+ this.type = type;
+ }
+ public String getDesc() {
+ return desc;
+ }
+ public void setDesc(String desc) {
+ this.desc = desc;
+ }
+
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/task/exceptions/TimeException.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/task/exceptions/TimeException.java
new file mode 100644
index 0000000..92b4f49
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/task/exceptions/TimeException.java
@@ -0,0 +1,37 @@
+package com.stylefeng.guns.modular.system.util.task.exceptions;
+
+/**
+ * @文件说明:定时器任务执行异常
+ * @版权所有：成都喜来达
+ * @项目名称: fengsheng
+ * @创建者: Leeyns
+ * @创建日期: 2016年5月18日
+ * @最近修改者：Leeyns
+ * @最近修改日期：2016年5月18日
+ */
+public class TimeException extends Exception {
+
+ /**
+ * TODO
+ */
+ private static final long serialVersionUID = 5703430073981692250L;
+
+ private String message;
+
+ public TimeException() {
+ super();
+ }
+
+ public TimeException(String message) {
+ super(message);
+ this.message = message;
+ }
+
+ public String getMessage() {
+ return message;
+ }
+
+ public void setMessage(String message) {
+ this.message = message;
+ }
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/task/jobs/AddMachine.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/task/jobs/AddMachine.java
new file mode 100644
index 0000000..8c81329
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/task/jobs/AddMachine.java
@@ -0,0 +1,185 @@
+package com.stylefeng.guns.modular.system.util.task.jobs;
+
+import com.stylefeng.guns.core.util.SinataUtil;
+import com.stylefeng.guns.modular.system.util.ConstellationUtil;
+import com.stylefeng.guns.modular.system.util.task.base.AbstractJob;
+import org.apache.commons.lang.time.DateUtils;
+import org.apache.poi.ss.usermodel.Cell;
+import org.apache.poi.ss.usermodel.Row;
+import org.apache.poi.ss.usermodel.Sheet;
+import org.apache.poi.ss.usermodel.Workbook;
+import org.quartz.JobDataMap;
+import org.quartz.JobExecutionContext;
+import org.quartz.JobExecutionException;
+
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
+import java.util.*;
+
+/**
+ * 定时1秒后导出用户详情记录
+ */
+public class AddMachine extends AbstractJob {
+
+ public static final String name = "addMachineJob";
+
+ @Override
+ public void execute(JobExecutionContext context) throws JobExecutionException {
+ JobDataMap maps = context.getMergedJobDataMap();
+ Workbook book = (Workbook) maps.get("book");
+
+ try {
+ System.out.println("----定时2秒后导入机器人-----");
+ Sheet sh = book.getSheetAt(0); //获取到第一个表
+ for (int i = 1; i <= sh.getLastRowNum(); i++) {
+ Row row = sh.getRow(i);
+
+ Cell cell0 = row.getCell(0); //用户昵称
+ String nickname = null;
+ if (SinataUtil.isNotEmpty(cell0)){
+ nickname = String.valueOf(cell0.getStringCellValue()).trim();
+ }
+
+ Cell cell1 = row.getCell(1); //性别
+ String sex = null;
+ if (SinataUtil.isNotEmpty(cell1)){
+ sex = String.valueOf(cell1.getStringCellValue()).trim();
+ }
+
+ Cell cell2 = row.getCell(2); //认证
+ String authType = null;
+ if (SinataUtil.isNotEmpty(cell2)){
+ authType = String.valueOf(cell2.getStringCellValue()).trim();
+ }
+
+ Cell cell3 = row.getCell(3); //女神认证
+ String isGoddess = null;
+ if (SinataUtil.isNotEmpty(cell3)){
+ isGoddess = String.valueOf(cell3.getStringCellValue()).trim();
+ }
+
+ Cell cell4 = row.getCell(4); //会员
+ String isVip = null;
+ if (SinataUtil.isNotEmpty(cell4)){
+ isVip = String.valueOf(cell4.getStringCellValue()).trim();
+ }
+
+ Cell cell5 = row.getCell(5); //生日
+ String birthday = null;
+ if (SinataUtil.isNotEmpty(cell5)){
+ birthday = String.valueOf(cell5.getStringCellValue()).trim();
+ }
+
+ Cell cell6 = row.getCell(6); //爱好
+ String hobbyStr = null;
+ if (SinataUtil.isNotEmpty(cell6)){
+ hobbyStr = String.valueOf(cell6.getStringCellValue()).trim();
+ }
+
+ Cell cell7 = row.getCell(7); //交友原则
+ String principleStr = null;
+ if (SinataUtil.isNotEmpty(cell7)){
+ principleStr = String.valueOf(cell7.getStringCellValue()).trim();
+ }
+
+ Cell cell8 = row.getCell(8); //身高cm
+ String height = null;
+ if (SinataUtil.isNotEmpty(cell8)){
+ height = String.valueOf(cell8.getStringCellValue()).trim();
+ }
+
+ Cell cell9 = row.getCell(9); //体重kg
+ String weight = null;
+ if (SinataUtil.isNotEmpty(cell9)){
+ weight = String.valueOf(cell9.getStringCellValue()).trim();
+ }
+
+ Cell cell10 = row.getCell(10); //个人简介
+ String introduction = null;
+ if (SinataUtil.isNotEmpty(cell10)){
+ introduction = String.valueOf(cell10.getStringCellValue()).trim();
+ }
+
+ if (SinataUtil.isEmpty(nickname) || SinataUtil.isEmpty(sex) || SinataUtil.isEmpty(authType)
+ || SinataUtil.isEmpty(isGoddess) || SinataUtil.isEmpty(isVip) || SinataUtil.isEmpty(birthday)
+ || SinataUtil.isEmpty(hobbyStr) || SinataUtil.isEmpty(principleStr)){
+ continue;
+ }else{
+ if (SinataUtil.isNotEmpty(height)){
+ if (!isDouble(height)){
+ continue;
+ }
+ }
+ if (SinataUtil.isNotEmpty(weight)){
+ if (!isDouble(weight)){
+ continue;
+ }
+ }
+ String constellation = null;
+ try {
+ String time = importByExcelForDate(birthday);
+ constellation = ConstellationUtil.getConstellation(time);
+ }catch (Exception e){
+ continue;
+ }
+ /*AppUserInfo user = new AppUserInfo();
+ user.setAddTime(new Date());
+ user.setConstellation(constellation);
+ user.setNickname(nickname);
+ user.setSex(Integer.valueOf(sex));
+ user.setIsGoddess(Integer.valueOf(isGoddess));
+ user.setAuthType(Integer.valueOf(authType));
+ user.setIsVip(Integer.valueOf(isVip));
+ user.setState(1);
+ user.setBirthday(birthday);
+ user.setHobbyStr(hobbyStr);
+ user.setPrincipleStr(principleStr);
+ if (SinataUtil.isNotEmpty(height))
+ user.setHeight(Double.valueOf(height));
+ if (SinataUtil.isNotEmpty(weight))
+ user.setWeight(Double.valueOf(weight));
+ if (SinataUtil.isNotEmpty(introduction))
+ user.setIntroduction(introduction);
+ user.setIsComplete(1);
+ user.setIsMachine(2);
+ appUserInfoService.insert(user);*/
+ }
+ }
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ }
+
+ /**
+ * 转换日期
+ * @return
+ */
+ public static String importByExcelForDate(String value) {//value就是它的天数
+ String currentCellValue = "";
+ if(value != null && !value.equals("")){
+ Calendar calendar = new GregorianCalendar(1900,0,-1);
+ Date d = calendar.getTime();
+ Date dd = DateUtils.addDays(d,Integer.valueOf(value));
+ DateFormat formater = new SimpleDateFormat("yyyy-MM-dd");
+ currentCellValue = formater.format(dd);
+ }
+ return currentCellValue;
+ }
+
+ /**
+ * 验证是否可以字符转为金额值
+ * @param str
+ * @return
+ */
+ public static boolean isDouble(String str)
+ {
+ try{
+ Double.parseDouble(str);
+ return true;
+ }catch(NumberFormatException e)
+ {
+ System.out.println("异常：\"" + str + "\"不是数字/整数/小数...");
+ return false;
+ }
+ }
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/task/jobs/AddNotice.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/task/jobs/AddNotice.java
new file mode 100644
index 0000000..b22e3d7
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/task/jobs/AddNotice.java
@@ -0,0 +1,91 @@
+package com.stylefeng.guns.modular.system.util.task.jobs;
+
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.stylefeng.guns.core.util.SinataUtil;
+import com.stylefeng.guns.modular.system.model.TDriver;
+import com.stylefeng.guns.modular.system.model.TNotices;
+import com.stylefeng.guns.modular.system.model.TSystemNotice;
+import com.stylefeng.guns.modular.system.model.TUser;
+import com.stylefeng.guns.modular.system.util.JpushUtil;
+import com.stylefeng.guns.modular.system.util.task.base.AbstractJob;
+import org.quartz.JobDataMap;
+import org.quartz.JobExecutionContext;
+import org.quartz.JobExecutionException;
+
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 添加公告记录
+ */
+public class AddNotice extends AbstractJob {
+
+ public static final String name = "addNoticeJob";
+
+ @Override
+ public void execute(JobExecutionContext context) throws JobExecutionException {
+ JobDataMap maps = context.getMergedJobDataMap();
+ Integer noticeId = maps.getIntValue("noticeId");
+
+ try {
+ System.out.println("----定时1秒后生成公告记录-----");
+ TNotices tNotices = tNoticesService.selectById(noticeId);
+ if (SinataUtil.isNotEmpty(tNotices)){
+ if (tNotices.getIsUser() == 2){
+ List<TUser> tUsers = tUserService.selectList(new EntityWrapper<TUser>().eq("state",1));
+ //发送公告给用户
+ for (TUser user : tUsers){
+ TSystemNotice notice = new TSystemNotice();
+ notice.setType(1);
+ notice.setUserType(1);
+ notice.setNoticesId(noticeId);
+ notice.setContent(tNotices.getContent());
+ notice.setUserId(user.getId());
+ notice.setInsertTime(new Date());
+ notice.setRead(1);
+ tSystemNoticeService.insert(notice);
+
+ /*Map<String,Object> map = new HashMap<String,Object>();
+ map.put("sound", userInfo.getIsVoice()); //是否有声音 1=否 2=是
+ map.put("vibrate", userInfo.getIsShake()); //是否有震动 1=否 2=是
+ map.put("type", 2); //消息类型 1=互动 2=公告
+ map.put("id", record.getId()); //对象ID
+ JpushUtil.SendPushWithCustomForTransmission(String.valueOf(userInfo.getId()),"【超级过客】提醒您，您有一条新的公告消息。","通知消息",map);*/
+ }
+ }
+ if (tNotices.getIsDriver() == 2){
+ List<TDriver> tDrivers = tDriverService.selectList(new EntityWrapper<TDriver>().eq("authState",2));
+ //发送公告给用户
+ for (TDriver driver : tDrivers){
+ TSystemNotice notice = new TSystemNotice();
+ notice.setType(1);
+ notice.setUserType(2);
+ notice.setNoticesId(noticeId);
+ notice.setContent(tNotices.getContent());
+ notice.setUserId(driver.getId());
+ notice.setInsertTime(new Date());
+ notice.setRead(1);
+ tSystemNoticeService.insert(notice);
+
+ /*Map<String,Object> map = new HashMap<String,Object>();
+ map.put("sound", userInfo.getIsVoice()); //是否有声音 1=否 2=是
+ map.put("vibrate", userInfo.getIsShake()); //是否有震动 1=否 2=是
+ map.put("type", 2); //消息类型 1=互动 2=公告
+ map.put("id", record.getId()); //对象ID
+ JpushUtil.SendPushWithCustomForTransmission(String.valueOf(userInfo.getId()),"【超级过客】提醒您，您有一条新的公告消息。","通知消息",map);*/
+
+ if (tNotices.getIsBroadcast() == 1){
+ //增加极光推送
+ JpushUtil.SendPushWithCustomForSh("DRIVER"+driver.getId().toString(),tNotices.getTitle(),"通知消息",null);
+ }
+
+ }
+ }
+ }
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ }
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/task/jobs/AddSensitiveWord.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/task/jobs/AddSensitiveWord.java
new file mode 100644
index 0000000..fb0274d
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/task/jobs/AddSensitiveWord.java
@@ -0,0 +1,50 @@
+package com.stylefeng.guns.modular.system.util.task.jobs;
+
+import com.stylefeng.guns.core.util.SinataUtil;
+import com.stylefeng.guns.modular.system.util.task.base.AbstractJob;
+import org.apache.poi.ss.usermodel.Cell;
+import org.apache.poi.ss.usermodel.Row;
+import org.apache.poi.ss.usermodel.Sheet;
+import org.apache.poi.ss.usermodel.Workbook;
+import org.quartz.JobDataMap;
+import org.quartz.JobExecutionContext;
+import org.quartz.JobExecutionException;
+
+import java.util.Date;
+
+/**
+ * 添加敏感词
+ */
+public class AddSensitiveWord extends AbstractJob {
+
+ public static final String name = "addSensitiveWordJob";
+
+ @Override
+ public void execute(JobExecutionContext context) throws JobExecutionException {
+ JobDataMap maps = context.getMergedJobDataMap();
+ Workbook book = (Workbook) maps.get("book");
+ try {
+ System.out.println("----定时1秒后添加敏感词-----");
+ Sheet sh = book.getSheetAt(0); //获取到第一个表
+ for (int i = 1; i <= sh.getLastRowNum(); i++) {
+ Row row = sh.getRow(i);
+
+ Cell cell0 = row.getCell(0); //第一大类名称
+ String name = null;
+ if (SinataUtil.isNotEmpty(cell0)) {
+ name = String.valueOf(cell0.getStringCellValue()).trim();
+ }
+ if (SinataUtil.isEmpty(name)){
+ continue;
+ }else{
+ /* AppSensitiveWord word = new AppSensitiveWord();
+ word.setAddTime(new Date());
+ word.setName(name.trim());
+ appSensitiveWordService.insert(word);*/
+ }
+ }
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ }
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/task/jobs/SendSms.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/task/jobs/SendSms.java
new file mode 100644
index 0000000..098eb1b
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/task/jobs/SendSms.java
@@ -0,0 +1,33 @@
+package com.stylefeng.guns.modular.system.util.task.jobs;
+
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.stylefeng.guns.core.util.DateUtil;
+import com.stylefeng.guns.core.util.SinataUtil;
+import com.stylefeng.guns.modular.system.util.HuaWeiSMSUtil;
+import com.stylefeng.guns.modular.system.util.task.base.AbstractJob;
+import org.quartz.JobDataMap;
+import org.quartz.JobExecutionContext;
+import org.quartz.JobExecutionException;
+
+import java.util.List;
+
+/**
+ * 发送短信
+ */
+public class SendSms extends AbstractJob {
+
+ public static final String name = "sendSmsJob";
+
+ @Override
+ public void execute(JobExecutionContext context) throws JobExecutionException {
+ JobDataMap maps = context.getMergedJobDataMap();
+
+ try {
+ System.out.println("----定时1秒后发送短信-----");
+
+
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ }
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/task/start/TimerServerStartJob.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/task/start/TimerServerStartJob.java
new file mode 100644
index 0000000..554ca09
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/task/start/TimerServerStartJob.java
@@ -0,0 +1,39 @@
+package com.stylefeng.guns.modular.system.util.task.start;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.stereotype.Component;
+
+/**
+ * 主要用于定时任务在服务器重新启动时添加任务
+ * @author Leeyns
+ *
+ */
+@Component
+public class TimerServerStartJob {
+
+
+ private Logger logger = LoggerFactory.getLogger(TimerServerStartJob.class);
+
+ public TimerServerStartJob(){
+ //服务器重新启动时，重新加载定时任务
+// start();
+ }
+
+ public void start(){
+ new Thread(new Runnable() {
+ @Override
+ public void run() {
+ logger.debug("==>> Start timer job.");
+ try {
+ Thread.sleep(15000);
+ } catch (InterruptedException e) {
+ e.printStackTrace();
+ }
+ System.out.println("定时启动了");
+ logger.debug("==>> Stop all timer job.");
+ }
+ }).start();
+ }
+
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/three/Base64Coder.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/three/Base64Coder.java
new file mode 100644
index 0000000..902eb7c
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/three/Base64Coder.java
@@ -0,0 +1,125 @@
+package com.stylefeng.guns.modular.system.util.three;
+
+public class Base64Coder {
+ public final static char[] base64_alphabet = new char[] { 'A', 'B', 'C',
+ 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P',
+ 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z', 'a', 'b', 'c',
+ 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n', 'o', 'p',
+ 'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z', '0', '1', '2',
+ '3', '4', '5', '6', '7', '8', '9', '+', '/', '=' };
+
+ public static String encode(byte[] data) {
+ int length = data.length;
+ byte[] char_array_3 = new byte[] { 0, 0, 0 };
+ byte[] char_array_4 = new byte[] { '=', '=', '=', '=' };
+ String retContent = "";
+ int i = 0;
+ int j = 0;
+ int reversePos = 0;
+ while (length > 0) {
+ length--;
+ char_array_3[i++] = data[reversePos++];
+ if (i == 3) {
+ char_array_4[0] = (byte) ((char_array_3[0] & 0xfc) >> 2); // convert
+ // the
+ // char
+ char_array_4[1] = (byte) (((char_array_3[0] & 0x03) << 4) + ((char_array_3[1] & 0xf0) >> 4));
+ char_array_4[2] = (byte) (((char_array_3[1] & 0x0f) << 2) + ((char_array_3[2] & 0xc0) >> 6));
+ char_array_4[3] = (byte) (char_array_3[2] & 0x3f);
+ for (i = 0; (i < 4); i++)
+ retContent += base64_alphabet[char_array_4[i]];
+ i = 0;
+ }
+ }
+
+ // handling the last input content
+ if (i > 0) {
+ for (j = i; j < 3; j++)
+ char_array_3[j] = 0; // padding of zero
+
+ char_array_4[0] = (byte) ((char_array_3[0] & 0xfc) >> 2); // right
+ // shift
+ char_array_4[1] = (byte) (((char_array_3[0] & 0x03) << 4) + ((char_array_3[1] & 0xf0) >> 4));
+ char_array_4[2] = (byte) (((char_array_3[1] & 0x0f) << 2) + ((char_array_3[2] & 0xc0) >> 6));
+ char_array_4[3] = (byte) (char_array_3[2] & 0x3f);
+
+ for (j = 0; (j < i + 1); j++)
+ retContent += base64_alphabet[char_array_4[j]];
+
+ while ((i++ < 3))
+ // padding of '=' of output string
+ retContent += '=';
+
+ }
+ return retContent;
+ }
+
+ public static String decode(String enContent) {
+ byte[] data = enContent.getBytes();
+ int i = 0, j = 0, enCode = 0;
+ int mLength = data.length;
+ byte[] char_array_4 = new byte[4];
+ byte[] char_array_3 = new byte[3];
+ String retContent = "";
+
+ // filter out the padding '=' chars
+ while (mLength > 0 && (((char) data[enCode]) != '=')
+ && isBase64((char) data[enCode])) {
+ mLength--;
+ char_array_4[i++] = data[enCode++];
+ if (i == 4) {
+ for (i = 0; i < 4; i++)
+ char_array_4[i] = findChar((char) char_array_4[i]);
+
+ char_array_3[0] = (byte) ((char_array_4[0] << 2) + ((char_array_4[1] & 0x30) >> 4));
+ char_array_3[1] = (byte) (((char_array_4[1] & 0xf) << 4) + ((char_array_4[2] & 0x3c) >> 2));
+ char_array_3[2] = (byte) (((char_array_4[2] & 0x3) << 6) + char_array_4[3]);
+
+ for (i = 0; (i < 3); i++)
+ retContent += (char) char_array_3[i];
+ i = 0;
+ }
+ }
+
+ // last content handling
+ if (i > 0) {
+ for (j = i; j < 4; j++)
+ char_array_4[j] = 0;
+
+ for (j = 0; j < 4; j++)
+ char_array_4[j] = findChar((char) char_array_4[j]);
+
+ char_array_3[0] = (byte) ((char_array_4[0] << 2) + ((char_array_4[1] & 0x30) >> 4));
+ char_array_3[1] = (byte) (((char_array_4[1] & 0xf) << 4) + ((char_array_4[2] & 0x3c) >> 2));
+ char_array_3[2] = (byte) (((char_array_4[2] & 0x3) << 6) + char_array_4[3]);
+
+ for (j = 0; (j < i - 1); j++)
+ retContent += (char) char_array_3[j];
+ }
+
+ return retContent;
+ }
+
+ public static boolean isBase64(char c) {
+ boolean base64 = false;
+ for (int i = 0; i < 64; i++) {
+ if (c == base64_alphabet[i]) {
+ base64 = true;
+ break;
+ }
+ }
+ return base64;
+ }
+
+ public static byte findChar(char x) {
+ byte index = 64; // 65th char '='
+ for (int i = 0; i < 64; i++) {
+ if (x == base64_alphabet[i]) {
+ index = (byte) i;
+ break;
+ }
+ }
+ return index;
+ }
+
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/three/HMACSHA1Util.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/three/HMACSHA1Util.java
new file mode 100644
index 0000000..c560ea3
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/three/HMACSHA1Util.java
@@ -0,0 +1,31 @@
+package com.stylefeng.guns.modular.system.util.three;
+
+import javax.crypto.Mac;
+import javax.crypto.SecretKey;
+import javax.crypto.spec.SecretKeySpec;
+
+public class HMACSHA1Util {
+ private static final String MAC_NAME = "HmacSHA1";
+ private static final String ENCODING = "UTF-8";
+
+ /**
+ * 使用 HMAC-SHA1 签名方法对对encryptText进行签名
+ * @param encryptText 被签名的字符串
+ * @param encryptKey 密钥
+ * @return
+ * @throws Exception
+ */
+ public static byte[] HmacSHA1Encrypt(String encryptText, String encryptKey) throws Exception
+ {
+ byte[] data=encryptKey.getBytes(ENCODING);
+ //根据给定的字节数组构造一个密钥,第二参数指定一个密钥算法的名称
+ SecretKey secretKey = new SecretKeySpec(data, MAC_NAME);
+ //生成一个指定 Mac 算法 的 Mac 对象
+ Mac mac = Mac.getInstance(MAC_NAME);
+ //用给定密钥初始化 Mac 对象
+ mac.init(secretKey);
+ byte[] text = encryptText.getBytes(ENCODING);
+ //完成 Mac 操作
+ return mac.doFinal(text);
+ }
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/three/PlatformUtil.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/three/PlatformUtil.java
new file mode 100644
index 0000000..92f681e
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/three/PlatformUtil.java
@@ -0,0 +1,374 @@
+package com.stylefeng.guns.modular.system.util.three;
+
+import com.alibaba.fastjson.JSONObject;
+import org.apache.http.HttpResponse;
+import org.apache.http.NameValuePair;
+import org.apache.http.client.HttpClient;
+import org.apache.http.client.config.RequestConfig;
+import org.apache.http.client.entity.UrlEncodedFormEntity;
+import org.apache.http.client.methods.CloseableHttpResponse;
+import org.apache.http.client.methods.HttpGet;
+import org.apache.http.client.methods.HttpPost;
+import org.apache.http.client.utils.URIBuilder;
+import org.apache.http.entity.ContentType;
+import org.apache.http.entity.StringEntity;
+import org.apache.http.impl.client.CloseableHttpClient;
+import org.apache.http.impl.client.HttpClientBuilder;
+import org.apache.http.impl.client.HttpClients;
+import org.apache.http.message.BasicNameValuePair;
+import org.apache.http.util.EntityUtils;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.net.URI;
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
+import java.util.*;
+
+public class PlatformUtil {
+ public static String doGet(String url, Map<String, String> param) {
+ // 创建Httpclient对象
+ CloseableHttpClient httpclient = HttpClients.createDefault();
+ String resultString = "";
+ CloseableHttpResponse response = null;
+ try {
+ // 创建uri
+ URIBuilder builder = new URIBuilder(url);
+ if (param != null) {
+ for (String key : param.keySet()) {
+ builder.addParameter(key, param.get(key));
+ }
+ }
+ URI uri = builder.build();
+
+ // 创建http GET请求
+ HttpGet httpGet = new HttpGet(uri);
+
+ // 执行请求
+ response = httpclient.execute(httpGet);
+ // 判断返回状态是否为200
+ if (response.getStatusLine().getStatusCode() == 200) {
+ resultString = EntityUtils.toString(response.getEntity(), "UTF-8");
+ }
+ } catch (Exception e) {
+ e.printStackTrace();
+ } finally {
+ try {
+ if (response != null) {
+ response.close();
+ }
+ httpclient.close();
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
+ }
+ return resultString;
+ }
+
+ public static String doGet(String url) {
+ return doGet(url, null);
+ }
+
+ public static String doPost(String url, Map<String, String> param) {
+ // 创建Httpclient对象
+ CloseableHttpClient httpClient = HttpClients.createDefault();
+ CloseableHttpResponse response = null;
+ String resultString = "";
+ try {
+ // 创建Http Post请求
+ HttpPost httpPost = new HttpPost(url);
+ // 创建参数列表
+ if (param != null) {
+ List<NameValuePair> paramList = new ArrayList<NameValuePair>();
+ for (String key : param.keySet()) {
+ paramList.add(new BasicNameValuePair(key, param.get(key)));
+ }
+ // 模拟表单
+ UrlEncodedFormEntity entity = new UrlEncodedFormEntity(paramList);
+ httpPost.setEntity(entity);
+ }
+ // 执行http请求
+ response = httpClient.execute(httpPost);
+ resultString = EntityUtils.toString(response.getEntity(), "utf-8");
+ } catch (Exception e) {
+ e.printStackTrace();
+ } finally {
+ try {
+ response.close();
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
+ }
+
+ return resultString;
+ }
+
+ public static String doPost(String url) {
+ return doPost(url, null);
+ }
+
+ public static String doPostJson(String url, String json,Map<String, String> headers) {
+ // 创建Httpclient对象
+ CloseableHttpClient httpClient = HttpClients.createDefault();
+ CloseableHttpResponse response = null;
+ String resultString = "";
+
+ try {
+ // 创建Http Post请求
+ HttpPost httpPost = new HttpPost(url);
+ // 添加http headers
+ if (headers != null && headers.size() > 0) {
+ for (String key : headers.keySet()) {
+ httpPost.addHeader(key, headers.get(key));
+ }
+ }
+ // 创建请求内容
+ StringEntity entity = new StringEntity(json, ContentType.APPLICATION_JSON);
+ httpPost.setEntity(entity);
+ // 执行http请求
+ response = httpClient.execute(httpPost);
+ resultString = EntityUtils.toString(response.getEntity(), "utf-8");
+ } catch (Exception e) {
+ e.printStackTrace();
+ } finally {
+ try {
+ response.close();
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
+ }
+
+ return resultString;
+ }
+ public static String doPostJson1(String url, String json,Map<String, String> headers) {
+ // 创建Httpclient对象
+ CloseableHttpClient httpClient = HttpClients.createDefault();
+ CloseableHttpResponse response = null;
+ String resultString = "";
+
+ try {
+ // 创建Http Post请求
+ HttpPost httpPost = new HttpPost(url);
+ // 添加http headers
+ if (headers != null && headers.size() > 0) {
+ for (String key : headers.keySet()) {
+ httpPost.addHeader(key, headers.get(key));
+ }
+ }
+ // 创建请求内容
+ StringEntity entity = new StringEntity(json, ContentType.create("application/x-www-form-urlencoded","UTF-8"));
+ httpPost.setEntity(entity);
+ // 执行http请求
+ response = httpClient.execute(httpPost);
+ resultString = EntityUtils.toString(response.getEntity(), "utf-8");
+ } catch (Exception e) {
+ e.printStackTrace();
+ } finally {
+ try {
+ response.close();
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
+ }
+ return resultString;
+ }
+
+ public static String doGet(String url, String param, Map<String, String> headers, int timeout) {
+ String result = "";
+ BufferedReader in = null;
+ String reqUrl = url + "?" + param;
+ try {
+ // 构造httprequest设置
+ RequestConfig config = RequestConfig.custom().setConnectTimeout(timeout)
+ .setConnectionRequestTimeout(timeout).build();
+ HttpClient client = HttpClientBuilder.create().setDefaultRequestConfig(config).build();
+ HttpGet htGet = new HttpGet(reqUrl);
+ // 添加http headers
+ if (headers != null && headers.size() > 0) {
+ for (String key : headers.keySet()) {
+ htGet.addHeader(key, headers.get(key));
+ }
+ }
+ // 读取数据
+ HttpResponse r = client.execute(htGet);
+ in = new BufferedReader(new InputStreamReader(r.getEntity().getContent(), "UTF-8"));
+ String line;
+ while ((line = in.readLine()) != null) {
+ result += line;
+ }
+ } catch (Exception e) {
+ System.out.println("发送GET请求出现异常！" + e);
+ e.printStackTrace();
+ } finally {
+ try {
+ if (in != null) {
+ in = null;
+ }
+ } catch (Exception e2) {
+ e2.printStackTrace();
+ }
+ }
+ return result;
+ }
+
+ /**
+ * 价格预估
+ * @param host 访问路径
+ * @param appkey 秘钥
+ * @param appId 用户id
+ * @param startLat 起点纬度
+ * @param startLng 起点经度
+ * @param startName 起点名称
+ * @param endLat 终点纬度
+ * @param endLng 终点经度
+ * @param endName 终点名称
+ * @param rideType 运力类型
+ * @param departureTime 出行时间
+ * @return
+ */
+ public static JSONObject estimatesPrices(String host,String appkey,String appId,String startLat
+ ,String startLng,String startName,String endLat,String endLng,String endName,String rideType,String departureTime){
+ Map<String,Object> map = new HashMap<>();
+ map.put("startLat", startLat);
+ map.put("startLng", startLng);
+ map.put("startName", startName);
+ map.put("endLat", endLat);
+ map.put("endLng", endLng);
+ map.put("endName", endName);
+ map.put("rideType", rideType);
+ map.put("departureTime", departureTime);
+ String jsonMsg =JSONObject.toJSONString(map);
+ String signature = null;
+ String url = "/api/platform/estimatesPrices";
+ TokenUtil.RequestEntity req = new TokenUtil.RequestEntity();
+ req.setReqMethod(TokenUtil.REQ_METHOD_GET);
+ req.setUri(url);
+ req.setContent(jsonMsg);
+ DateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+ String time = dateFormat.format(new Date());
+ req.setReqTime(time);
+ req.setEncryptKey(appkey);
+ try {
+ signature = TokenUtil.generateToken(req);
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+
+ Map<String,String> headers = new HashMap<String, String>();
+ headers.put("appId", appId);
+ headers.put("reqTime",time);
+ headers.put("token",signature);
+
+ String response = PlatformUtil.doPostJson(host+url,req.getContent(),headers);
+ return JSONObject.parseObject(response);
+ }
+
+ /**
+ * 取消订单
+ * @param host 访问路径
+ * @param appkey 秘钥
+ * @param appId 用户id
+ * @param oid 订单id
+ * @param passengerPhone 乘客手机号(用于判断该手机号下订单唯一)
+ * @return
+ */
+ public static JSONObject cancleOrder(String host,String appkey,String appId,String oid
+ ,String passengerPhone){
+ Map<String,Object> map = new HashMap<>();
+ map.put("startLat", oid);
+ map.put("startLng", passengerPhone);
+ String jsonMsg =JSONObject.toJSONString(map);
+ String signature = null;
+ String url = "/api/platform/cancleOrder";
+ TokenUtil.RequestEntity req = new TokenUtil.RequestEntity();
+ req.setReqMethod(TokenUtil.REQ_METHOD_POST);
+ req.setUri(url);
+ req.setContent(jsonMsg);
+ DateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+ String time = dateFormat.format(new Date());
+ req.setReqTime(time);
+ req.setEncryptKey(appkey);
+ try {
+ signature = TokenUtil.generateToken(req);
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+
+ Map<String,String> headers = new HashMap<String, String>();
+ headers.put("appId", appId);
+ headers.put("reqTime",time);
+ headers.put("token",signature);
+
+ String response = PlatformUtil.doPostJson(host+url,req.getContent(),headers);
+ return JSONObject.parseObject(response);
+ }
+
+ /**
+ * 叫单
+ * @param host 访问路径
+ * @param appkey 秘钥
+ * @param appId 用户id
+ * @param startLat 起点纬度
+ * @param startLng 起点经度
+ * @param startName 起点名称
+ * @param endLat 终点纬度
+ * @param endLng 终点经度
+ * @param endName 终点名称
+ * @param rideType 运力类型
+ * @param departureTime 出行时间
+ * @param oid 订单id
+ * @param passengerName 乘客手机号
+ * @param passengerPhone 乘客名称
+ * @param userId 第三方平台用户Id
+ * @param userPhone 用户电话(与乘客电话相同可以不填)
+ * @param userName 用户姓名(与乘客姓名相同可以不填)
+ * @return
+ */
+ public static JSONObject sendOrder(String host,String appkey,String appId,String startLat
+ ,String startLng,String startName,String endLat,String endLng,String endName,String rideType,String departureTime,String oid
+ ,String passengerName,String passengerPhone,String userId,String userPhone,String userName){
+ Map<String,Object> map = new HashMap<>();
+ map.put("oid", oid);
+ map.put("passengerPhone", passengerPhone);
+ map.put("userId", userId);
+ map.put("passengerName", passengerName);
+ map.put("userName", userName);
+ map.put("userPhone", userPhone);
+ map.put("startLat", startLat);
+ map.put("startLng", startLng);
+ map.put("startName", startName);
+ map.put("endLat", endLat);
+ map.put("endLng", endLng);
+ map.put("endName", endName);
+ map.put("rideType", rideType);
+ map.put("departureTime", departureTime);
+ String jsonMsg =JSONObject.toJSONString(map);
+ String signature = null;
+ String url = "/api/platform/estimatesPrices";
+ TokenUtil.RequestEntity req = new TokenUtil.RequestEntity();
+ req.setReqMethod(TokenUtil.REQ_METHOD_POST);
+ req.setUri(url);
+ req.setContent(jsonMsg);
+ DateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+ String time = dateFormat.format(new Date());
+ req.setReqTime(time);
+ req.setEncryptKey(appkey);
+ try {
+ signature = TokenUtil.generateToken(req);
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+
+ Map<String,String> headers = new HashMap<String, String>();
+ headers.put("appId", appId);
+ headers.put("reqTime",time);
+ headers.put("token",signature);
+
+ String response = PlatformUtil.doPostJson(host+url,req.getContent(),headers);
+ return JSONObject.parseObject(response);
+ }
+ public static void main(String[] args) {
+ }
+}
+
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/three/TokenUtil.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/three/TokenUtil.java
new file mode 100644
index 0000000..d3d9814
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/three/TokenUtil.java
@@ -0,0 +1,95 @@
+package com.stylefeng.guns.modular.system.util.three;
+
+
+import org.apache.commons.lang3.StringUtils;
+
+/**
+ * 生成测试签名工具类
+ * @author 271755
+ *
+ */
+public class TokenUtil {
+ public static final String REQ_METHOD_GET = "GET";
+ public static final String REQ_METHOD_POST = "POST";
+ public static final String REQ_METHOD_PUT = "PUT";
+ public static final String REQ_METHOD_DELETE = "DELETE";
+ public static void main(String[] args) throws Exception {
+ RequestEntity req = new RequestEntity();
+ req.setReqMethod(REQ_METHOD_POST);
+ req.setUri("/open-web/rs/order/v1/add");
+ req.setReqTime("2015-04-14 13:21:00");
+ req.setContent("{\"senderProvince\":\"上海市\",\"senderCity\":\"上海市\",\"senderCounty\":\"闵行区\",\"senderAddress\":\"华翔路2239号\"}");
+ req.setEncryptKey("asd123");
+ System.out.println(generateToken(req));
+ }
+ public static String generateToken(RequestEntity req) throws Exception{
+ /**
+ * 将请求方式+uri+请求时间+请求参数进行签名生成token 1.对请求方式+uri+请求时间+请求参数进行HMAC-SHA1加密
+ * 2.对加密后的byte数组进行Base64编码
+ */
+ StringBuffer signatureStr = new StringBuffer();
+ signatureStr.append(req.getReqMethod())
+ .append("&");
+ signatureStr.append(req.getUri()).append("&");
+ signatureStr.append(req.getReqTime())
+ .append("&");
+ signatureStr.append(StringUtils.isEmpty(req.getContent()) ? "" : req.getContent());
+ String signature = Base64Coder.encode(HMACSHA1Util.HmacSHA1Encrypt(
+ signatureStr.toString(), req.getEncryptKey()));
+ return signature;
+ }
+ public static class RequestEntity{
+ /**
+ * 请求方式
+ */
+ private String reqMethod;
+ /**
+ * 请求uri
+ */
+ private String uri;
+ /**
+ * 请求时间
+ */
+ private String reqTime;
+ /**
+ * 请求参数
+ */
+ private String content;
+ /**
+ * 秘钥
+ */
+ private String encryptKey;
+ public String getReqMethod() {
+ return reqMethod;
+ }
+ public void setReqMethod(String reqMethod) {
+ this.reqMethod = reqMethod;
+ }
+ public String getUri() {
+ return uri;
+ }
+ public void setUri(String uri) {
+ this.uri = uri;
+ }
+ public String getReqTime() {
+ return reqTime;
+ }
+ public void setReqTime(String reqTime) {
+ this.reqTime = reqTime;
+ }
+ public String getContent() {
+ return content;
+ }
+ public void setContent(String content) {
+ this.content = content;
+ }
+ public String getEncryptKey() {
+ return encryptKey;
+ }
+ public void setEncryptKey(String encryptKey) {
+ this.encryptKey = encryptKey;
+ }
+
+ }
+
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/CustomWarpper.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/CustomWarpper.java
new file mode 100644
index 0000000..9893e2d
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/CustomWarpper.java
@@ -0,0 +1,6 @@
+package com.stylefeng.guns.modular.system.warpper;
+
+public class CustomWarpper {
+
+
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/DeptWarpper.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/DeptWarpper.java
new file mode 100644
index 0000000..d1cb1a8
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/DeptWarpper.java
@@ -0,0 +1,33 @@
+package com.stylefeng.guns.modular.system.warpper;
+
+import com.stylefeng.guns.core.common.constant.factory.ConstantFactory;
+import com.stylefeng.guns.core.base.warpper.BaseControllerWarpper;
+import com.stylefeng.guns.core.util.ToolUtil;
+
+import java.util.Map;
+
+/**
+ * 部门列表的包装
+ *
+ * @author fengshuonan
+ * @date 2017年4月25日 18:10:31
+ */
+public class DeptWarpper extends BaseControllerWarpper {
+
+ public DeptWarpper(Object list) {
+ super(list);
+ }
+
+ @Override
+ public void warpTheMap(Map<String, Object> map) {
+
+ Integer pid = (Integer) map.get("pid");
+
+ if (ToolUtil.isEmpty(pid) || pid.equals(0)) {
+ map.put("pName", "--");
+ } else {
+ map.put("pName", ConstantFactory.me().getDeptName(pid));
+ }
+ }
+
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/DictWarpper.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/DictWarpper.java
new file mode 100644
index 0000000..c56a1e4
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/DictWarpper.java
@@ -0,0 +1,36 @@
+package com.stylefeng.guns.modular.system.warpper;
+
+import com.stylefeng.guns.core.common.constant.factory.ConstantFactory;
+import com.stylefeng.guns.modular.system.model.Dict;
+import com.stylefeng.guns.core.base.warpper.BaseControllerWarpper;
+import com.stylefeng.guns.core.util.ToolUtil;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 字典列表的包装
+ *
+ * @author fengshuonan
+ * @date 2017年4月25日 18:10:31
+ */
+public class DictWarpper extends BaseControllerWarpper {
+
+ public DictWarpper(Object list) {
+ super(list);
+ }
+
+ @Override
+ public void warpTheMap(Map<String, Object> map) {
+ StringBuffer detail = new StringBuffer();
+ Integer id = Integer.valueOf(map.get("id").toString());
+ List<Dict> dicts = ConstantFactory.me().findInDict(id);
+ if(dicts != null){
+ for (Dict dict : dicts) {
+ detail.append(dict.getCode() + ":" +dict.getName() + ",");
+ }
+ map.put("detail", ToolUtil.removeSuffix(detail.toString(),","));
+ }
+ }
+
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/LogWarpper.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/LogWarpper.java
new file mode 100644
index 0000000..4026c14
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/LogWarpper.java
@@ -0,0 +1,40 @@
+package com.stylefeng.guns.modular.system.warpper;
+
+import com.stylefeng.guns.core.base.warpper.BaseControllerWarpper;
+import com.stylefeng.guns.core.util.Contrast;
+import com.stylefeng.guns.core.util.ToolUtil;
+
+import java.util.Map;
+
+/**
+ * 日志列表的包装类
+ *
+ * @author fengshuonan
+ * @date 2017年4月5日22:56:24
+ */
+public class LogWarpper extends BaseControllerWarpper {
+
+ public LogWarpper(Object list) {
+ super(list);
+ }
+
+ @Override
+ public void warpTheMap(Map<String, Object> map) {
+ String message = (String) map.get("message");
+
+ //如果信息过长,则只截取前100位字符串
+ if (ToolUtil.isNotEmpty(message) && message.length() >= 100) {
+ String subMessage = message.substring(0, 100) + "...";
+ map.put("message", subMessage);
+ }
+
+ //如果信息中包含分割符号;;; 则分割字符串返给前台
+ if (ToolUtil.isNotEmpty(message) && message.indexOf(Contrast.separator) != -1) {
+ String[] msgs = message.split(Contrast.separator);
+ map.put("regularMessage",msgs);
+ }else{
+ map.put("regularMessage",message);
+ }
+ }
+
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/MenuWarpper.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/MenuWarpper.java
new file mode 100644
index 0000000..3503f3e
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/MenuWarpper.java
@@ -0,0 +1,28 @@
+package com.stylefeng.guns.modular.system.warpper;
+
+import com.stylefeng.guns.core.base.warpper.BaseControllerWarpper;
+import com.stylefeng.guns.core.common.constant.factory.ConstantFactory;
+import com.stylefeng.guns.core.constant.IsMenu;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 菜单列表的包装类
+ *
+ * @author fengshuonan
+ * @date 2017年2月19日15:07:29
+ */
+public class MenuWarpper extends BaseControllerWarpper {
+
+ public MenuWarpper(List<Map<String, Object>> list) {
+ super(list);
+ }
+
+ @Override
+ public void warpTheMap(Map<String, Object> map) {
+ map.put("statusName", ConstantFactory.me().getMenuStatusName((Integer) map.get("status")));
+ map.put("isMenuName", IsMenu.valueOf((Integer) map.get("ismenu")));
+ }
+
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/NoticeWrapper.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/NoticeWrapper.java
new file mode 100644
index 0000000..6e5cc76
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/NoticeWrapper.java
@@ -0,0 +1,26 @@
+package com.stylefeng.guns.modular.system.warpper;
+
+import com.stylefeng.guns.core.common.constant.factory.ConstantFactory;
+import com.stylefeng.guns.core.base.warpper.BaseControllerWarpper;
+
+import java.util.Map;
+
+/**
+ * 部门列表的包装
+ *
+ * @author fengshuonan
+ * @date 2017年4月25日 18:10:31
+ */
+public class NoticeWrapper extends BaseControllerWarpper {
+
+ public NoticeWrapper(Object list) {
+ super(list);
+ }
+
+ @Override
+ public void warpTheMap(Map<String, Object> map) {
+ Integer creater = (Integer) map.get("creater");
+ map.put("createrName", ConstantFactory.me().getUserNameById(creater));
+ }
+
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/RoleWarpper.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/RoleWarpper.java
new file mode 100644
index 0000000..172961b
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/RoleWarpper.java
@@ -0,0 +1,27 @@
+package com.stylefeng.guns.modular.system.warpper;
+
+import com.stylefeng.guns.core.common.constant.factory.ConstantFactory;
+import com.stylefeng.guns.core.base.warpper.BaseControllerWarpper;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 角色列表的包装类
+ *
+ * @author fengshuonan
+ * @date 2017年2月19日10:59:02
+ */
+public class RoleWarpper extends BaseControllerWarpper {
+
+ public RoleWarpper(List<Map<String, Object>> list) {
+ super(list);
+ }
+
+ @Override
+ public void warpTheMap(Map<String, Object> map) {
+ map.put("pName", ConstantFactory.me().getSingleRoleName((Integer) map.get("pid")));
+ map.put("deptName", ConstantFactory.me().getDeptName((Integer) map.get("deptid")));
+ }
+
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/TFeedbackWarpper.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/TFeedbackWarpper.java
new file mode 100644
index 0000000..654ddd3
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/TFeedbackWarpper.java
@@ -0,0 +1,28 @@
+package com.stylefeng.guns.modular.system.warpper;
+
+import com.stylefeng.guns.core.base.warpper.BaseControllerWarpper;
+import com.stylefeng.guns.core.common.constant.factory.ConstantFactory;
+import com.stylefeng.guns.core.util.ToolUtil;
+
+import java.util.Map;
+
+/**
+ * 意见反馈列表的包装
+ */
+public class TFeedbackWarpper extends BaseControllerWarpper {
+
+ public TFeedbackWarpper(Object list) {
+ super(list);
+ }
+
+ @Override
+ public void warpTheMap(Map<String, Object> map) {
+ Integer userId = (Integer) map.get("userId");
+ if (ToolUtil.isEmpty(userId) || userId.equals(0)) {
+ map.put("userId", "--");
+ } else {
+ map.put("userId", ConstantFactory.me().getTUserNickNameById(userId));
+ }
+ }
+
+}
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/UserWarpper.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/UserWarpper.java
new file mode 100644
index 0000000..643677e
--- /dev/null
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/UserWarpper.java
@@ -0,0 +1,29 @@
+package com.stylefeng.guns.modular.system.warpper;
+
+import com.stylefeng.guns.core.common.constant.factory.ConstantFactory;
+import com.stylefeng.guns.core.base.warpper.BaseControllerWarpper;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 用户管理的包装类
+ *
+ * @author fengshuonan
+ * @date 2017年2月13日 下午10:47:03
+ */
+public class UserWarpper extends BaseControllerWarpper {
+
+ public UserWarpper(List<Map<String, Object>> list) {
+ super(list);
+ }
+
+ @Override
+ public void warpTheMap(Map<String, Object> map) {
+ map.put("sexName", ConstantFactory.me().getSexName((Integer) map.get("sex")));
+ map.put("roleName", ConstantFactory.me().getRoleName((String) map.get("roleid")));
+ map.put("deptName", ConstantFactory.me().getDeptName((Integer) map.get("deptid")));
+ map.put("statusName", ConstantFactory.me().getStatusName((Integer) map.get("status")));
+ }
+
+}
diff --git a/management/guns-admin/src/main/resources/META-INF/spring-devtools.properties b/management/guns-admin/src/main/resources/META-INF/spring-devtools.properties
new file mode 100644
index 0000000..3e72835
--- /dev/null
+++ b/management/guns-admin/src/main/resources/META-INF/spring-devtools.properties
@@ -0,0 +1 @@
+restart.include.beetl=/beetl-2.8.5.jar
\ No newline at end of file
diff --git a/management/guns-admin/src/main/resources/application.yml b/management/guns-admin/src/main/resources/application.yml
new file mode 100644
index 0000000..2671d7b
--- /dev/null
+++ b/management/guns-admin/src/main/resources/application.yml
@@ -0,0 +1,104 @@
+server:
+ port: 8010
+
+guns:
+ swagger-open: true #是否开启swagger (true/false)
+ kaptcha-open: false #是否开启登录时验证码 (true/false)
+ spring-session-open: false #是否开启spring session,如果是多机环境需要开启(true/false)
+ session-invalidate-time: 1800 #session失效时间(只在单机环境下生效，多机环境在SpringSessionConfig类中配置) 单位：秒
+ session-validation-interval: 900 #多久检测一次失效的session(只在单机环境下生效) 单位：秒
+# file-upload-path: C:\Users\hi\Desktop\ #文件上传目录(不配置的话为java.io.tmpdir目录)
+# picture-server-address: http://192.168.0.43/resources/ #图片服务器地址
+ file-upload-path: C:\Users\Administrator\Desktop\apache-tomcat-8.0.33\webapps\ROOT\upload\ #文件上传目录(不配置的话为java.io.tmpdir目录)
+ picture-server-address: http://139.9.249.67:8080/upload/ #图片服务器地址
+ rest-url: http://139.9.249.67:8080/rest/ #前端接口调用基础路径
+
+spring:
+ profiles:
+ active: local
+ mvc:
+ static-path-pattern: /static/**
+ view:
+ prefix: /WEB-INF/view
+ devtools:
+ restart:
+ enabled: false
+ additional-paths: src/main/java
+ exclude: static/**,WEB-INF/view/**
+ servlet:
+ multipart:
+ max-request-size: 100MB
+ max-file-size: 100MB
+
+mybatis-plus:
+ type-aliases-package: com.stylefeng.guns.modular.system.model
+ global-config:
+ id-type: 0 #0:数据库ID自增 1:用户输入id 2:全局唯一id(IdWorker) 3:全局唯一ID(uuid)
+ db-column-underline: false
+ configuration:
+ configuration.map-underscore-to-camel-case: true #是否开启自动驼峰命名规则（camel case）映射
+ log-impl: org.apache.ibatis.logging.slf4j.Slf4jImpl #输出Sql，如需打印Sql注释该配置
+
+
+
+#eureka:
+# client:
+# service-url: #注册中心地址
+# defaultZone: http://sinata:sinata@139.9.249.67:8000/eureka #启用身份验证的方式连接
+# register-with-eureka: true #在注册中心进行注册
+# fetch-registry: true #从Eureka中获取注册信息。
+
+
+---
+
+#spring:
+# profiles: local
+# datasource:
+# url: jdbc:mysql://Rm-wz9rpe0t74ys3b1h8go.mysql.rds.aliyuncs.com:3306/oktravel?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=Asia/Shanghai
+# username: root
+# password: Root2020!
+# db-name: guns #用来搜集数据库的所有表
+# filters: wall,mergeStat
+
+
+spring:
+ profiles: local
+ datasource:
+ url: jdbc:mysql://192.168.0.80:3306/super_save_driving?autoReconnect=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=GMT%2B8
+ username: root
+ password: 123456
+ db-name: oktravel #用来搜集数据库的所有表
+ filters: wall,mergeStat
+
+
+
+#多数据源情况的配置
+guns:
+ muti-datasource:
+ open: false
+ url: jdbc:mysql://120.24.34.190:3306/mask?autoReconnect=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=GMT%2B8
+ username: root
+ password: Root2020!
+ dataSourceNames:
+ - dataSourceGuns
+ - dataSourceBiz
+
+---
+
+spring:
+ profiles: produce
+ datasource:
+ url: jdbc:mysql://120.24.34.190:3306/mask?autoReconnect=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=GMT%2B8
+ username: root
+ password: Root2020!
+ db-name: mask #用来搜集数据库的所有表
+ filters: wall,mergeStat
+
+---
+
+filePath: /usr/local/server/orderPostionFile/ #存储订单轨迹文件路径
+#filePath: C:/orderPostionFile/ #存储订单轨迹文件路径
+
+
+#交通部推送数据功能开关
+pushMinistryOfTransport: true
\ No newline at end of file
diff --git a/management/guns-admin/src/main/resources/ehcache.xml b/management/guns-admin/src/main/resources/ehcache.xml
new file mode 100644
index 0000000..1e47379
--- /dev/null
+++ b/management/guns-admin/src/main/resources/ehcache.xml
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ehcache xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:noNamespaceSchemaLocation="ehcache.xsd"
+ updateCheck="false" monitoring="autodetect"
+ dynamicConfig="true" >
+
+ <diskStore path="java.io.tmpdir/ehcache"/>
+
+ <defaultCache
+ maxElementsInMemory="50000"
+ eternal="false"
+ timeToIdleSeconds="3600"
+ timeToLiveSeconds="3600"
+ overflowToDisk="true"
+ diskPersistent="false"
+ diskExpiryThreadIntervalSeconds="120"
+ />
+
+ <!-- 全局变量：永不过期-->
+ <cache name="CONSTANT"
+ maxElementsInMemory="50000"
+ eternal="true"
+ clearOnFlush="false"
+ overflowToDisk="true"
+ diskSpoolBufferSizeMB="1024"
+ maxElementsOnDisk="100000"
+ diskPersistent="false"
+ diskExpiryThreadIntervalSeconds="120"
+ memoryStoreEvictionPolicy="LFU"
+ transactionalMode="off">
+ </cache>
+
+</ehcache>
+
+ <!--
+ maxElementsInMemory="10000" //Cache中最多允许保存的数据对象的数量
+ external="false" //缓存中对象是否为永久的，如果是，超时设置将被忽略，对象从不过期
+ timeToLiveSeconds="3600" //缓存的存活时间，从开始创建的时间算起
+ timeToIdleSeconds="3600" //多长时间不访问该缓存，那么ehcache 就会清除该缓存
+
+ 这两个参数很容易误解，看文档根本没用，我仔细分析了ehcache的代码。结论如下：
+ 1、timeToLiveSeconds的定义是：以创建时间为基准开始计算的超时时长；
+ 2、timeToIdleSeconds的定义是：在创建时间和最近访问时间中取出离现在最近的时间作为基准计算的超时时长；
+ 3、如果仅设置了timeToLiveSeconds，则该对象的超时时间=创建时间+timeToLiveSeconds，假设为A；
+ 4、如果没设置timeToLiveSeconds，则该对象的超时时间=min(创建时间，最近访问时间)+timeToIdleSeconds，假设为B；
+ 5、如果两者都设置了，则取出A、B最少的值，即min(A,B)，表示只要有一个超时成立即算超时。
+
+ overflowToDisk="true" //内存不足时，是否启用磁盘缓存
+ diskSpoolBufferSizeMB //设置DiskStore（磁盘缓存）的缓存区大小。默认是30MB。每个Cache都应该有自己的一个缓冲区
+ maxElementsOnDisk //硬盘最大缓存个数
+ diskPersistent //是否缓存虚拟机重启期数据The default value is false
+ diskExpiryThreadIntervalSeconds //磁盘失效线程运行时间间隔，默认是120秒。
+ memoryStoreEvictionPolicy="LRU" //当达到maxElementsInMemory限制时，Ehcache将会根据指定的策略去清理内存。默认策略是LRU（最近最少使用）。你可以设置为FIFO（先进先出）或是LFU（较少使用）。
+ clearOnFlush //内存数量最大时是否清除
+ maxEntriesLocalHeap="0" //堆内存中最大缓存对象数,0没有限制
+ maxEntriesLocalDisk="1000" //硬盘最大缓存个数。
+ -->
diff --git a/management/guns-admin/src/main/resources/logback-spring.xml b/management/guns-admin/src/main/resources/logback-spring.xml
new file mode 100644
index 0000000..894a46b
--- /dev/null
+++ b/management/guns-admin/src/main/resources/logback-spring.xml
@@ -0,0 +1,132 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration>
+
+ <!--定义日志存放的位置-->
+ <springProperty scope="context" name="gunsLogPath" source="log.path" defaultValue="guns-logs"/>
+
+ <!-- ****************************************************************************************** -->
+ <!-- ****************************** 本地开发只在控制台打印日志 ******************************** -->
+ <!-- ****************************************************************************************** -->
+ <springProfile name="local">
+
+ <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+ <!--encoder 默认配置为PatternLayoutEncoder-->
+ <encoder>
+ <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} %highlight(%-5level) %logger Line:%-3L - %msg%n</pattern>
+ <charset>utf-8</charset>
+ </encoder>
+ </appender>
+
+ <!-- 日志记录器，日期滚动记录 -->
+ <appender name="FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
+ <!-- 正在记录的日志文件的路径及文件名 -->
+ <file>${gunsLogPath}/log_error.log</file>
+ <!-- 日志记录器的滚动策略，按日期，按大小记录 -->
+ <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+ <!-- 归档的日志文件的路径，例如今天是2013-12-21日志，当前写的日志文件路径为file节点指定，可以将此文件与file指定文件路径设置为不同路径，从而将当前日志文件或归档日志文件置不同的目录。
+ 而2013-12-21的日志文件在由fileNamePattern指定。%d{yyyy-MM-dd}指定日期格式，%i指定索引 -->
+ <fileNamePattern>${gunsLogPath}/error/log-error-%d{yyyy-MM-dd}.%i.log</fileNamePattern>
+ <!-- 除按日志记录之外，还配置了日志文件不能超过2M，若超过2M，日志文件会以索引0开始，
+ 命名日志文件，例如log-error-2013-12-21.0.log -->
+ <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
+ <maxFileSize>2MB</maxFileSize>
+ </timeBasedFileNamingAndTriggeringPolicy>
+ </rollingPolicy>
+ <!-- 追加方式记录日志 -->
+ <append>true</append>
+ <!-- 日志文件的格式 -->
+ <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
+ <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} %-5level %logger Line:%-3L - %msg%n</pattern>
+ <charset>utf-8</charset>
+ </encoder>
+ <!-- 日志文件记录级别配置。
+ 日志级别：ALL < TRACE < DEBUG < INFO < WARN < ERROR < FATAL < OFF
+ onMatch="ACCEPT" 表示匹配该级别及以上
+ onMatch="DENY" 表示不匹配该级别及以上
+ onMatch="NEUTRAL" 表示该级别及以上的，由下一个filter处理，如果当前是最后一个，则表示匹配该级别及以上
+ onMismatch="ACCEPT" 表示匹配该级别以下
+ onMismatch="NEUTRAL" 表示该级别及以下的，由下一个filter处理，如果当前是最后一个，则不匹配该级别以下的
+ onMismatch="DENY" 表示不匹配该级别以下的
+ -->
+ <filter class="ch.qos.logback.classic.filter.LevelFilter">
+ <level>ERROR</level>
+ <onMatch>ACCEPT</onMatch>
+ <onMismatch>DENY</onMismatch>
+ </filter>
+ </appender>
+
+ <root level="INFO">
+ <appender-ref ref="STDOUT"/>
+ <appender-ref ref="FILE"/>
+ </root>
+ </springProfile>
+
+ <!-- ****************************************************************************************** -->
+ <!-- ********************** 放到服务器上不管在什么环境都只在文件记录日志 ********************** -->
+ <!-- ****************************************************************************************** -->
+ <springProfile name="!local">
+
+ <!-- 日志记录器，日期滚动记录 -->
+ <appender name="FILE_ERROR" class="ch.qos.logback.core.rolling.RollingFileAppender">
+ <!-- 正在记录的日志文件的路径及文件名 -->
+ <file>${gunsLogPath}/log_error.log</file>
+ <!-- 日志记录器的滚动策略，按日期，按大小记录 -->
+ <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+ <!-- 归档的日志文件的路径，例如今天是2013-12-21日志，当前写的日志文件路径为file节点指定，可以将此文件与file指定文件路径设置为不同路径，从而将当前日志文件或归档日志文件置不同的目录。
+ 而2013-12-21的日志文件在由fileNamePattern指定。%d{yyyy-MM-dd}指定日期格式，%i指定索引 -->
+ <fileNamePattern>${gunsLogPath}/error/log-error-%d{yyyy-MM-dd}.%i.log</fileNamePattern>
+ <!-- 除按日志记录之外，还配置了日志文件不能超过2M，若超过2M，日志文件会以索引0开始，
+ 命名日志文件，例如log-error-2013-12-21.0.log -->
+ <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
+ <maxFileSize>2MB</maxFileSize>
+ </timeBasedFileNamingAndTriggeringPolicy>
+ </rollingPolicy>
+ <!-- 追加方式记录日志 -->
+ <append>true</append>
+ <!-- 日志文件的格式 -->
+ <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
+ <pattern>===%d{yyyy-MM-dd HH:mm:ss.SSS} %-5level %logger Line:%-3L - %msg%n</pattern>
+ <charset>utf-8</charset>
+ </encoder>
+ <!-- 此日志文件只记录error级别的 -->
+ <filter class="ch.qos.logback.classic.filter.LevelFilter">
+ <level>error</level>
+ <onMatch>ACCEPT</onMatch>
+ <onMismatch>DENY</onMismatch>
+ </filter>
+ </appender>
+
+ <!-- 日志记录器，日期滚动记录 -->
+ <appender name="FILE_ALL" class="ch.qos.logback.core.rolling.RollingFileAppender">
+ <!-- 正在记录的日志文件的路径及文件名 -->
+ <file>${gunsLogPath}/log_total.log</file>
+ <!-- 日志记录器的滚动策略，按日期，按大小记录 -->
+ <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+ <!-- 归档的日志文件的路径，例如今天是2013-12-21日志，当前写的日志文件路径为file节点指定，可以将此文件与file指定文件路径设置为不同路径，从而将当前日志文件或归档日志文件置不同的目录。
+ 而2013-12-21的日志文件在由fileNamePattern指定。%d{yyyy-MM-dd}指定日期格式，%i指定索引 -->
+ <fileNamePattern>${gunsLogPath}/total/log-total-%d{yyyy-MM-dd}.%i.log</fileNamePattern>
+ <!-- 除按日志记录之外，还配置了日志文件不能超过2M，若超过2M，日志文件会以索引0开始，
+ 命名日志文件，例如log-error-2013-12-21.0.log -->
+ <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
+ <maxFileSize>2MB</maxFileSize>
+ </timeBasedFileNamingAndTriggeringPolicy>
+ </rollingPolicy>
+ <!-- 追加方式记录日志 -->
+ <append>true</append>
+ <!-- 日志文件的格式 -->
+ <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
+ <pattern>===%d{yyyy-MM-dd HH:mm:ss.SSS} %-5level %logger Line:%-3L - %msg%n</pattern>
+ <charset>utf-8</charset>
+ </encoder>
+ </appender>
+
+ <root level="INFO">
+ <appender-ref ref="FILE_ERROR"/>
+ <appender-ref ref="FILE_ALL"/>
+ </root>
+
+ </springProfile>
+
+</configuration>
+
+
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/404.html b/management/guns-admin/src/main/webapp/WEB-INF/view/404.html
new file mode 100644
index 0000000..7c3e291
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/404.html
@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<html>
+
+<head>
+
+ <meta charset="utf-8">
+ <meta name="viewport" content="width=device-width, initial-scale=1.0">
+
+
+ <title>OK出行 - 404 页面</title>
+ <link rel="shortcut icon" href="${ctxPath}/static/favicon1.ico"> <link href="${ctxPath}/static/css/bootstrap.min.css?v=3.3.6" rel="stylesheet">
+ <link href="${ctxPath}/static/css/font-awesome.css?v=4.4.0" rel="stylesheet">
+ <link href="${ctxPath}/static/css/style.css?v=4.1.0" rel="stylesheet">
+
+</head>
+
+<body class="gray-bg">
+
+
+ <div class="middle-box text-center">
+ <h1>404</h1>
+ <h3 class="font-bold">页面未找到！</h3>
+
+ <div class="error-desc">
+ 抱歉，页面好像去火星了~
+ <!--<form class="form-inline m-t" role="form">
+ <div class="form-group">
+ <input type="email" class="form-control" placeholder="请输入您需要查找的内容 …">
+ </div>
+ <button type="submit" class="btn btn-primary">搜索</button>
+ </form>-->
+ </div>
+ </div>
+
+ <!-- 全局js -->
+ <script src="${ctxPath}/static/js/jquery.min.js?v=2.1.4"></script>
+ <script src="${ctxPath}/static/js/bootstrap.min.js?v=3.3.6"></script>
+
+</body>
+
+</html>
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/blackboard.html b/management/guns-admin/src/main/webapp/WEB-INF/view/blackboard.html
new file mode 100644
index 0000000..f3710fe
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/blackboard.html
@@ -0,0 +1,634 @@
+@layout("/common/_container.html"){
+<style type="text/css">
+ .ztree li span.button.add {margin-left:4px; margin-right: -1px; background-position:-144px 0; vertical-align:top; *vertical-align:middle}
+ .titleDiv{
+ overflow: hidden;
+ }
+ .titleItem{
+ float: left;text-align: center;width: 180px;
+ line-height: 40px;border-top:1px solid #E7EBEE;border-bottom: 1px solid #E7EBEE;
+ border-left:1px solid #E7EBEE;font-size: 16px;
+ }
+ .titleItemCk{
+ color: #fff !important;background: #1AB395 !important;
+ }
+ .titleItem:last-child{
+ border-right: 1px solid #E7EBEE;
+ }
+ .ibox-title{
+ display: flex;
+ justify-content: space-between;
+ align-items: center;
+ }
+ .ibox-title div span{
+ cursor: pointer;
+ }
+ .ibox-title div span.active{
+ color:white;
+ background: #3d91d9;
+ border-radius: 4px;
+ }
+ .ibox-content{
+ min-height: 130px;
+ display: flex;
+ flex-direction: column;
+ justify-content: center;
+ align-items: center;
+ }
+ .sp-item{
+ padding:2px 8px;
+
+ }
+ .sp-col{
+ font-size: 18px;
+ }
+ .sp-hidden{
+ visibility: hidden !important;
+ }
+ .flex-div{
+ display: flex;
+ align-items: center;
+ position: relative;
+ flex-wrap: nowrap;
+ }
+ \@media screen and (min-width: 1200px) {
+ .sp-width {
+ width:260px;
+ }
+ }
+ \@media screen and (max-width: 1200px) {
+ .sp-width {
+ width: 180px;
+ }
+ }
+
+</style>
+<div class="container-fluid" style="padding: 0 !important;">
+ <div class="row content">
+ <div class="col-sm-12">
+ <div class="col-sm-3">
+ <div class="ibox float-e-margins">
+ <div class="ibox-title">
+ <h3>待处理</h3>
+ </div>
+ <a class="J_menuItem" href="javascript:void(0);" onclick="goddess()" name="tabMenuItem" data-index="27">
+ <div class="ibox-content">
+ <h1 class="no-margins">${goddessCount}</h1>
+ <small>待处理女神认证</small>
+ </div>
+ </a>
+ <a class="J_menuItem" href="javascript:void(0);" onclick="withdrawal()" name="tabMenuItem" data-index="27">
+ <div class="ibox-content">
+ <h1 class="no-margins">${withdrawalCount}</h1>
+ <small>待处理提现申请</small>
+ </div>
+ </a>
+ <a class="J_menuItem" href="javascript:void(0);" onclick="report()" name="tabMenuItem" data-index="27">
+ <div class="ibox-content">
+ <h1 class="no-margins">${reportCount}</h1>
+ <small>待处理用户举报</small>
+ </div>
+ </a>
+ <a class="J_menuItem" href="javascript:void(0);" onclick="feedback()" name="tabMenuItem" data-index="27">
+ <div class="ibox-content">
+ <h1 class="no-margins">${feedbackCount}</h1>
+ <small>待处理用户反馈</small>
+ </div>
+ </a>
+ </div>
+ </div>
+ <div class="col-sm-9">
+ <div class="col-sm-4 ">
+ <div class="ibox float-e-margins">
+ <div class="ibox-title">
+ <h3>非会员付费解锁</h3>
+ <div id="noVipUnlockDiv" class="flex-div">
+ <div class="sp-hidden flex-div noVipUnlockTimess sp-width" style="position: absolute;right: 40px;top: 50%;transform: translateY(-50%);">
+ <input type="text" id="noVipUnlockTime" class="form-control layer-date " >
+ <#button style="margin: 0;" btnCs="info" name="搜索" id="ensure" icon="fa-check" clickFun="noVipUnlockSubmit()"/>
+ </div>
+ <div class="noVipUnlockTimes flex-div" style="position: absolute;right: 40px;top: 50%;transform: translateY(-50%);width: 180px;justify-content: flex-end;">
+ <span class="active sp-item">今日</span>
+ <span class="sp-item">本周</span>
+ <span class="sp-item">本月</span>
+ </div>
+ <div class="noVipUnlockSpan" onclick="noVipUnlockTime()" style="margin-left: 20px;"><i class="fa fa-calendar-plus-o"></i></div>
+ </div>
+ </div>
+ <div class="ibox-content">
+ <h1 class="sp-col" style="width: 100%;">订单数<span style="margin-left: 50px;font-size: 28px;" id="noVipUnlockNum">${noVipUnlockNumToDay}</span>单</h1>
+ <h1 class="sp-col" style="width: 100%;">成交额<span style="margin-left: 50px;font-size: 28px;" id="noVipUnlockMoney">${noVipUnlockMoneyToDay}</span>元</h1>
+ </div>
+ </div>
+ </div>
+ <div class="col-sm-4">
+ <div class="ibox float-e-margins">
+ <div class="ibox-title">
+ <h3>会员付费解锁</h3>
+ <div id="vipUnlockDiv" class="flex-div">
+ <div class="sp-hidden flex-div vipUnlockTimess sp-width" style="position: absolute;right: 40px;top: 50%;transform: translateY(-50%);">
+ <input type="text" id="vipUnlockTime" class="form-control layer-date " >
+ <#button style="margin: 0;" btnCs="info" name="搜索" id="ensure" icon="fa-check" clickFun="vipUnlockSubmit()"/>
+ </div>
+ <div class="vipUnlockTimes flex-div" style="position: absolute;right: 40px;top: 50%;transform: translateY(-50%);width: 180px;justify-content: flex-end;">
+ <span class="active sp-item">今日</span>
+ <span class="sp-item">本周</span>
+ <span class="sp-item">本月</span>
+ </div>
+ <div class="vipUnlockSpan" onclick="vipUnlockTime()" style="margin-left: 20px;"><i class="fa fa-calendar-plus-o"></i></div>
+ </div>
+ </div>
+ <div class="ibox-content">
+ <h1 class="sp-col" style="width: 100%;">订单数<span style="margin-left: 50px;font-size: 28px;" id="vipUnlockNum">${vipUnlockNumToDay}</span>单</h1>
+ <h1 class="sp-col" style="width: 100%;">成交额<span style="margin-left: 50px;font-size: 28px;" id="vipUnlockMoney">${vipUnlockMoneyToDay}</span>元</h1>
+ </div>
+ </div>
+ </div>
+ <div class="col-sm-4">
+ <div class="ibox float-e-margins">
+ <div class="ibox-title">
+ <h3>总营收</h3>
+ <div id="allIncomeDiv" class="flex-div">
+ <div class="sp-hidden flex-div allIncomeTimess sp-width" style="position: absolute;right: 40px;top: 50%;transform: translateY(-50%);">
+ <input type="text" id="allIncomeTime" class="form-control layer-date " >
+ <#button style="margin: 0;" btnCs="info" name="搜索" id="ensure" icon="fa-check" clickFun="allIncomeSubmit()"/>
+ </div>
+ <div class="allIncomeTimes flex-div" style="position: absolute;right: 40px;top: 50%;transform: translateY(-50%);width: 180px;justify-content: flex-end;">
+ <span class="active sp-item">今日</span>
+ <span class="sp-item">本周</span>
+ <span class="sp-item">本月</span>
+ </div>
+ <div class="allIncomeSpan" onclick="allIncomeTime()" style="margin-left: 20px;"><i class="fa fa-calendar-plus-o"></i></div>
+ </div>
+ </div>
+ <div class="ibox-content">
+ <h1 class="sp-col" style="width: 100%;">订单数<span style="margin-left: 50px;font-size: 28px;" id="allIncomeNum">${allIncomeNumToDay}</span>单</h1>
+ <h1 class="sp-col" style="width: 100%;">成交额<span style="margin-left: 50px;font-size: 28px;" id="allIncomeMoney">${allIncomeMoneyToDay}</span>元</h1>
+ </div>
+ </div>
+ </div>
+ <div class="col-sm-4">
+ <div class="ibox float-e-margins">
+ <div class="ibox-title">
+ <h3>新增会员</h3>
+ <div id="addVipDiv" class="flex-div">
+ <div class="sp-hidden flex-div addVipTimess sp-width" style="position: absolute;right: 40px;top: 50%;transform: translateY(-50%);">
+ <input type="text" id="addVipTime" class="form-control layer-date " >
+ <#button style="margin: 0;" btnCs="info" name="搜索" id="ensure" icon="fa-check" clickFun="addVipSubmit()"/>
+ </div>
+ <div class="addVipTimes flex-div" style="position: absolute;right: 40px;top: 50%;transform: translateY(-50%);width: 180px;justify-content: flex-end;">
+ <span class="active sp-item">今日</span>
+ <span class="sp-item">本周</span>
+ <span class="sp-item">本月</span>
+ </div>
+ <div class="addVipSpan" onclick="addVipTime()" style="margin-left: 20px;"><i class="fa fa-calendar-plus-o"></i></div>
+ </div>
+ </div>
+ <div class="ibox-content">
+ <h1 class="sp-col" style="width: 100%;">新增数<span style="margin-left: 50px;font-size: 28px;" id="addVipNum">${addVipNumToDay}</span>位</h1>
+ <h1 class="sp-col" style="width: 100%;">新增收益<span style="margin-left: 50px;font-size: 28px;" id="addVipMoney">${addVipMoneyToDay}</span>元</h1>
+ </div>
+ </div>
+ </div>
+ <div class="col-sm-4">
+ <div class="ibox float-e-margins">
+ <div class="ibox-title">
+ <h3>发布活动付费</h3>
+ <div id="sendActiveDiv" class="flex-div">
+ <div class="sp-hidden flex-div sendActiveTimess sp-width" style="position: absolute;right: 40px;top: 50%;transform: translateY(-50%);">
+ <input type="text" id="sendActiveTime" class="form-control layer-date " >
+ <#button style="margin: 0;" btnCs="info" name="搜索" id="ensure" icon="fa-check" clickFun="sendActiveSubmit()"/>
+ </div>
+ <div class="sendActiveTimes flex-div" style="position: absolute;right: 40px;top: 50%;transform: translateY(-50%);width: 180px;justify-content: flex-end;">
+ <span class="active sp-item">今日</span>
+ <span class="sp-item">本周</span>
+ <span class="sp-item">本月</span>
+ </div>
+ <div class="sendActiveSpan" onclick="sendActiveTime()" style="margin-left: 20px;"><i class="fa fa-calendar-plus-o"></i></div>
+ </div>
+ </div>
+ <div class="ibox-content">
+ <h1 class="sp-col" style="width: 100%;">订单数<span style="margin-left: 50px;font-size: 28px;" id="sendActiveNum">${sendActiveNumDay}</span>单</h1>
+ <h1 class="sp-col" style="width: 100%;">成交额<span style="margin-left: 50px;font-size: 28px;" id="sendActiveMoney">${sendActiveMoneyToDay}</span>元</h1>
+ </div>
+ </div>
+ </div>
+ <div class="col-sm-4">
+ <div class="ibox float-e-margins">
+ <div class="ibox-title">
+ <h3>历史总营收</h3>
+ </div>
+ <div class="ibox-content">
+ <h1 class="sp-col" style="text-align: center;"><span style="font-size: 28px;">${historyIncomeMoney}</span>元</h1>
+ </div>
+ </div>
+ </div>
+ <div class="col-sm-4">
+ <div class="ibox float-e-margins">
+ <div class="ibox-title">
+ <h4>新增用户</h4>
+ <div id="userDiv" class="flex-div">
+ <div class="sp-hidden flex-div userTimess sp-width" style="position: absolute;right: 40px;top: 50%;transform: translateY(-50%);">
+ <input type="text" id="userTime" class="form-control layer-date " >
+ <#button style="margin: 0;" btnCs="info" name="搜索" id="ensure" icon="fa-check" clickFun="userSubmit()"/>
+ </div>
+ <div class="userTimes flex-div" style="position: absolute;right: 40px;top: 50%;transform: translateY(-50%);width: 180px;justify-content: flex-end;">
+ <span class="active sp-item">今日</span>
+ <span class="sp-item">本周</span>
+ <span class="sp-item">本月</span>
+ </div>
+ <div class="userSpan" onclick="userTime()" style="margin-left: 20px;"><i class="fa fa-calendar-plus-o"></i></div>
+ </div>
+ </div>
+ <div class="ibox-content">
+ <h1 class="sp-col" style="text-align: center;"><span style="font-size: 28px;" id="userNum">${userNumToDay}</span>位</h1>
+ <div class="sp-col" style="display: flex;justify-content: space-between;width: 100%;">
+ <div style="text-align: center;display: inline-block;">男<span style="font-size: 28px;margin: 0 10px" id="maleUserNum">${maleUserNumToDay}</span>位</div>
+ <div style="text-align: center;display: inline-block;">女<span style="font-size: 28px;margin: 0 10px" id="femaleUserNum">${femaleUserNumToDay}</span>位</div>
+ </div>
+ </div>
+ </div>
+ </div>
+ <div class="col-sm-4">
+ <div class="ibox float-e-margins">
+ <div class="ibox-title">
+ <h3>总用户数</h3>
+ </div>
+ <div class="ibox-content">
+ <h1 class="sp-col" style="text-align: center;"><span style="font-size: 28px;" >${userNum}</span>位</h1>
+ <div class="sp-col" style="display: flex;justify-content: space-between;width: 100%;">
+ <div style="text-align: center;display: inline-block;">男<span style="font-size: 28px;margin: 0 10px" >${maleUserNum}</span>位</div>
+ <div style="text-align: center;display: inline-block;">女<span style="font-size: 28px;margin: 0 10px" >${femaleUserNum}</span>位</div>
+ </div>
+ </div>
+ </div>
+ </div>
+ <div class="col-sm-4">
+ <div class="ibox float-e-margins">
+ <div class="ibox-title">
+ <h3>总会员数</h3>
+ </div>
+ <div class="ibox-content">
+ <h1 class="sp-col" style="text-align: center;"><span style="font-size: 28px;">${allVipNum}</span>位</h1>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+</div>
+<link rel="icon" href="https://static.jianshukeji.com/highcharts/images/favicon1.ico">
+<script>
+ laydate.render({
+ elem: '#noVipUnlockTime'
+ ,range: true
+ });
+ laydate.render({
+ elem: '#vipUnlockTime'
+ ,range: true
+ });
+ laydate.render({
+ elem: '#allIncomeTime'
+ ,range: true
+ });
+ laydate.render({
+ elem: '#addVipTime'
+ ,range: true
+ });
+ laydate.render({
+ elem: '#sendActiveTime'
+ ,range: true
+ });
+ laydate.render({
+ elem: '#userTime'
+ ,range: true
+ });
+</script>
+<script type="text/javascript">
+ $(function () {
+ //非会员解锁
+ $("#noVipUnlockDiv span").click(function () {
+ $(this).addClass("active").siblings().removeClass("active");
+ var ajax = new $ax(Feng.ctxPath + "/blackboard/noVipUnlock", function (data) {
+ $("#noVipUnlockNum").html(data.noVipUnlockNum);
+ $("#noVipUnlockMoney").html(data.noVipUnlockMoney);
+ }, function (data) {
+ });
+ ajax.set("active",$(this).html());
+ ajax.start();
+ });
+ //会员解锁
+ $("#vipUnlockDiv span").click(function () {
+ $(this).addClass("active").siblings().removeClass("active");
+ var ajax = new $ax(Feng.ctxPath + "/blackboard/vipUnlock", function (data) {
+ $("#vipUnlockNum").html(data.vipUnlockNum);
+ $("#vipUnlockMoney").html(data.vipUnlockMoney);
+ }, function (data) {
+ });
+ ajax.set("active",$(this).html());
+ ajax.start();
+ });
+ //总营收
+ $("#allIncomeDiv span").click(function () {
+ $(this).addClass("active").siblings().removeClass("active");
+ var ajax = new $ax(Feng.ctxPath + "/blackboard/allIncome", function (data) {
+ $("#allIncomeNum").html(data.allIncomeNum);
+ $("#allIncomeMoney").html(data.allIncomeMoney);
+ }, function (data) {
+ });
+ ajax.set("active",$(this).html());
+ ajax.start();
+ });
+ //新增会员
+ $("#addVipDiv span").click(function () {
+ $(this).addClass("active").siblings().removeClass("active");
+ var ajax = new $ax(Feng.ctxPath + "/blackboard/addVip", function (data) {
+ $("#addVipNum").html(data.addVipNum);
+ $("#addVipMoney").html(data.addVipMoney);
+ }, function (data) {
+ });
+ ajax.set("active",$(this).html());
+ ajax.start();
+ });
+ //发布活动付费
+ $("#sendActiveDiv span").click(function () {
+ $(this).addClass("active").siblings().removeClass("active");
+ var ajax = new $ax(Feng.ctxPath + "/blackboard/sendActive", function (data) {
+ $("#sendActiveNum").html(data.sendActiveNum);
+ $("#sendActiveMoney").html(data.sendActiveMoney);
+ }, function (data) {
+ });
+ ajax.set("active",$(this).html());
+ ajax.start();
+ });
+ //新增用户
+ $("#userDiv span").click(function () {
+ $(this).addClass("active").siblings().removeClass("active");
+ var ajax = new $ax(Feng.ctxPath + "/blackboard/user", function (data) {
+ $("#userNum").html(data.userNum);
+ $("#maleUserNum").html(data.maleUserNum);
+ $("#femaleUserNum").html(data.femaleUserNum);
+ }, function (data) {
+ });
+ ajax.set("active",$(this).html());
+ ajax.start();
+ });
+ });
+
+ function goddess() {
+ var index = layer.open({
+ type: 2,
+ title: '待处理女神认证',
+ area: ['80%', '80%'], //宽高
+ fix: false, //不固定
+ maxmin: true,
+ content: Feng.ctxPath + '/appUserAuth'
+ });
+ this.layerIndex = index;
+ }
+ function withdrawal() {
+ var index = layer.open({
+ type: 2,
+ title: '待处理提现申请',
+ area: ['80%', '80%'], //宽高
+ fix: false, //不固定
+ maxmin: true,
+ content: Feng.ctxPath + '/appUserWithdrawal'
+ });
+ this.layerIndex = index;
+ }
+ function report() {
+ var index = layer.open({
+ type: 2,
+ title: '待处理用户举报',
+ area: ['80%', '80%'], //宽高
+ fix: false, //不固定
+ maxmin: true,
+ content: Feng.ctxPath + '/appUserReport'
+ });
+ this.layerIndex = index;
+ }
+ function feedback() {
+ var index = layer.open({
+ type: 2,
+ title: '待处理用户反馈',
+ area: ['80%', '80%'], //宽高
+ fix: false, //不固定
+ maxmin: true,
+ content: Feng.ctxPath + '/appUserFeedback'
+ });
+ this.layerIndex = index;
+ }
+
+ //非会员解锁日期选择切换
+ function noVipUnlockTime() {
+ $('.noVipUnlockSpan').toggleClass("active");
+ $('.noVipUnlockTimess').toggleClass("sp-hidden");
+ $('.noVipUnlockTimes').toggleClass('sp-hidden');
+ $("#noVipUnlockNum").html("0");
+ $("#noVipUnlockMoney").html("0");
+ $("#noVipUnlockTime").val("");
+ if ($(".noVipUnlockTimess").hasClass('sp-hidden')){
+ var ajax = new $ax(Feng.ctxPath + "/blackboard/noVipUnlock", function (data) {
+ $("#noVipUnlockNum").html(data.noVipUnlockNum);
+ $("#noVipUnlockMoney").html(data.noVipUnlockMoney);
+ }, function (data) {
+ });
+ ajax.set("active",$("#noVipUnlockDiv .active").html());
+ ajax.start();
+ }
+ }
+ //非会员解锁日期选择提交
+ function noVipUnlockSubmit(){
+ var time = $("#noVipUnlockTime").val();
+ if ("" == time) {
+ Feng.info("请选择查询时间");
+ return;
+ }
+ var ajax = new $ax(Feng.ctxPath + "/blackboard/noVipUnlockSubmit", function (data) {
+ $("#noVipUnlockNum").html(data.noVipUnlockNum);
+ $("#noVipUnlockMoney").html(data.noVipUnlockMoney);
+ }, function (data) {
+ });
+ ajax.set("time",time);
+ ajax.start();
+ }
+
+ // 会员解锁日期选择切换
+ function vipUnlockTime() {
+ $('.vipUnlockSpan').toggleClass("active");
+ $('.vipUnlockTimess').toggleClass("sp-hidden");
+ $('.vipUnlockTimes').toggleClass('sp-hidden');
+ $("#vipUnlockNum").html("0");
+ $("#vipUnlockMoney").html("0");
+ $("#vipUnlockTime").val("");
+ if ($(".vipUnlockTimess").hasClass('sp-hidden')){
+ var ajax = new $ax(Feng.ctxPath + "/blackboard/vipUnlock", function (data) {
+ $("#vipUnlockNum").html(data.vipUnlockNum);
+ $("#vipUnlockMoney").html(data.vipUnlockMoney);
+ }, function (data) {
+ });
+ ajax.set("active",$("#vipUnlockDiv .active").html());
+ ajax.start();
+ }
+ }
+ // 会员解锁日期选择提交
+ function vipUnlockSubmit(){
+ var time = $("#vipUnlockTime").val();
+ if ("" == time) {
+ Feng.info("请选择查询时间");
+ return;
+ }
+ var ajax = new $ax(Feng.ctxPath + "/blackboard/vipUnlockSubmit", function (data) {
+ $("#vipUnlockNum").html(data.vipUnlockNum);
+ $("#vipUnlockMoney").html(data.vipUnlockMoney);
+ }, function (data) {
+ });
+ ajax.set("time",time);
+ ajax.start();
+ }
+
+
+ // 总营收日期选择切换
+ function allIncomeTime() {
+ $('.allIncomeSpan').toggleClass("active");
+ $('.allIncomeTimess').toggleClass("sp-hidden");
+ $('.allIncomeTimes').toggleClass('sp-hidden');
+ $("#allIncomeNum").html("0");
+ $("#allIncomeMoney").html("0");
+ $("#allIncomeTime").val("");
+ if ($(".allIncomeTimess").hasClass('sp-hidden')){
+ var ajax = new $ax(Feng.ctxPath + "/blackboard/allIncome", function (data) {
+ $("#allIncomeNum").html(data.allIncomeNum);
+ $("#allIncomeMoney").html(data.allIncomeMoney);
+ }, function (data) {
+ });
+ ajax.set("active",$("#allIncomeDiv .active").html());
+ ajax.start();
+ }
+ }
+ // 总营收日期选择提交
+ function allIncomeSubmit(){
+ var time = $("#allIncomeTime").val();
+ if ("" == time) {
+ Feng.info("请选择查询时间");
+ return;
+ }
+ var ajax = new $ax(Feng.ctxPath + "/blackboard/allIncomeSubmit", function (data) {
+ $("#allIncomeNum").html(data.allIncomeNum);
+ $("#allIncomeMoney").html(data.allIncomeMoney);
+ }, function (data) {
+ });
+ ajax.set("time",time);
+ ajax.start();
+ }
+
+
+ // 新增会员日期选择切换
+ function addVipTime() {
+ $('.addVipSpan').toggleClass("active");
+ $('.addVipTimess').toggleClass("sp-hidden");
+ $('.addVipTimes').toggleClass('sp-hidden');
+ $("#addVipNum").html("0");
+ $("#addVipMoney").html("0");
+ $("#addVipTime").val("");
+ if ($(".addVipTimess").hasClass('sp-hidden')){
+ var ajax = new $ax(Feng.ctxPath + "/blackboard/addVip", function (data) {
+ $("#addVipNum").html(data.addVipNum);
+ $("#addVipMoney").html(data.addVipMoney);
+ }, function (data) {
+ });
+ ajax.set("active",$("#addVipDiv .active").html());
+ ajax.start();
+ }
+ }
+ // 新增会员日期选择提交
+ function addVipSubmit(){
+ var time = $("#addVipTime").val();
+ if ("" == time) {
+ Feng.info("请选择查询时间");
+ return;
+ }
+ var ajax = new $ax(Feng.ctxPath + "/blackboard/addVipSubmit", function (data) {
+ $("#addVipNum").html(data.addVipNum);
+ $("#addVipMoney").html(data.addVipMoney);
+ }, function (data) {
+ });
+ ajax.set("time",time);
+ ajax.start();
+ }
+
+
+ // 发布活动付费日期选择切换
+ function sendActiveTime() {
+ $('.sendActiveSpan').toggleClass("active");
+ $('.sendActiveTimess').toggleClass("sp-hidden");
+ $('.sendActiveTimes').toggleClass('sp-hidden');
+ $("#sendActiveNum").html("0");
+ $("#sendActiveMoney").html("0");
+ $("#sendActiveTime").val("");
+ if ($(".sendActiveTimess").hasClass('sp-hidden')){
+ var ajax = new $ax(Feng.ctxPath + "/blackboard/sendActive", function (data) {
+ $("#sendActiveNum").html(data.sendActiveNum);
+ $("#sendActiveMoney").html(data.sendActiveMoney);
+ }, function (data) {
+ });
+ ajax.set("active",$("#sendActiveDiv .active").html());
+ ajax.start();
+ }
+ }
+ // 发布活动付费日期选择提交
+ function sendActiveSubmit(){
+ var time = $("#sendActiveTime").val();
+ if ("" == time) {
+ Feng.info("请选择查询时间");
+ return;
+ }
+ var ajax = new $ax(Feng.ctxPath + "/blackboard/sendActiveSubmit", function (data) {
+ $("#sendActiveNum").html(data.sendActiveNum);
+ $("#sendActiveMoney").html(data.sendActiveMoney);
+ }, function (data) {
+ });
+ ajax.set("time",time);
+ ajax.start();
+ }
+
+ // 用户日期选择切换
+ function userTime() {
+ $('.userSpan').toggleClass("active");
+ $('.userTimess').toggleClass("sp-hidden");
+ $('.userTimes').toggleClass('sp-hidden');
+ $("#userNum").html("0");
+ $("#maleUserNum").html("0");
+ $("#femaleUserNum").html("0");
+ $("#userTime").val("");
+ if ($(".userTimess").hasClass('sp-hidden')){
+ var ajax = new $ax(Feng.ctxPath + "/blackboard/user", function (data) {
+ $("#userNum").html(data.userNum);
+ $("#maleUserNum").html(data.maleUserNum);
+ $("#femaleUserNum").html(data.femaleUserNum);
+ }, function (data) {
+ });
+ ajax.set("active",$("#userDiv .active").html());
+ ajax.start();
+ }
+ }
+ // 用户日期选择提交
+ function userSubmit(){
+ var time = $("#userTime").val();
+ if ("" == time) {
+ Feng.info("请选择查询时间");
+ return;
+ }
+ var ajax = new $ax(Feng.ctxPath + "/blackboard/userSubmit", function (data) {
+ $("#userNum").html(data.userNum);
+ $("#maleUserNum").html(data.maleUserNum);
+ $("#femaleUserNum").html(data.femaleUserNum);
+ }, function (data) {
+ });
+ ajax.set("time",time);
+ ajax.start();
+ }
+</script>
+@}
+
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/blackboardBlank.html b/management/guns-admin/src/main/webapp/WEB-INF/view/blackboardBlank.html
new file mode 100644
index 0000000..816af83
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/blackboardBlank.html
@@ -0,0 +1,59 @@
+@layout("/common/_container.html"){
+<style>
+ .contact-box {
+ background: unset;
+ border: unset;
+ }
+ strong{
+ line-height: 23px;
+ }
+</style>
+
+<div class="wrapper wrapper-content animated fadeInRight">
+ <div class="row">
+ <div class="col-sm-6">
+ <div class="contact-box">
+ <div class="col-sm-4">
+ <div class="text-center">
+ @if(user.avatar!=null){
+ <img alt="image" class="img-circle " src="${user.avatar}" style="width: 120px;height: 120px " >
+ @}
+ @if(user.avatar==null){
+ <img alt="image" class="img-circle " src="${ctxPath}/static/img/login-background.jpg" style="width: 120px;height: 120px" >
+ @}
+
+ <div class="m-t-xs font-bold">${deptName}</div>
+ </div>
+ </div>
+ <div class="col-sm-8">
+ <h3><strong>${user.name}</strong></h3>
+ <p><i class="fa fa-user-secret"></i> ${roleName}</p>
+ <address>
+ <strong>E-mail:${user.email}</strong><br>
+ <strong>Tel:${user.phone}</strong><br>
+ <strong>登录次数：${loginNum}次</strong><br>
+ <strong>登录时间：${date}</strong><br>
+ </address>
+ </div>
+ <div class="clearfix"></div>
+ </div>
+ </div>
+ </div>
+</div>
+<script>
+ $(document).ready(function () {
+ $('.contact-box').each(function () {
+ animationHover(this, 'pulse');
+ });
+ $(".row").css({
+ height: window.innerHeight+"px",
+ display:"flex",
+ alignItems: "center",
+ justifyContent: "center",
+ })
+ });
+</script>
+
+<script type="text/javascript" src="http://tajs.qq.com/stats?sId=9051096" charset="UTF-8"></script>
+@}
+
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/code/code.html b/management/guns-admin/src/main/webapp/WEB-INF/view/code/code.html
new file mode 100644
index 0000000..6cececb
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/code/code.html
@@ -0,0 +1,101 @@
+@layout("/common/_container.html"){
+<div class="row" xmlns="">
+ <div class="col-sm-12">
+ <div class="ibox float-e-margins">
+ <div class="ibox-title">
+ <h5>代码生成</h5>
+ </div>
+ <div class="ibox-content">
+ <div class="row row-lg">
+ <div class="col-sm-12">
+ <div class="form-horizontal" id="generate">
+ <div class="row">
+ <div class="col-sm-4">
+ <#input id="projectPath" name="项目路径" value="${params.projectPath}"/>
+ </div>
+ <div class="col-sm-4">
+ <#input id="projectPackage" name="项目的包" value="${params.projectPackage}"/>
+ </div>
+ <div class="col-sm-4">
+ <#input id="corePackage" name="核心包" value="${params.corePackage}"/>
+ </div>
+ </div>
+
+ <div class="row">
+ <div class="col-sm-3">
+ <#input id="author" name="作者" value="${params.author!}"/>
+ </div>
+ <div class="col-sm-3">
+ <#input id="bizName" name="业务名称" />
+ </div>
+ <div class="col-sm-3">
+ <#input id="moduleName" name="模块名称" value="${params.moduleName}"/>
+ </div>
+ <div class="col-sm-3">
+ <#input id="parentMenuName" name="父级菜单名称" underline="false" value="${params.parentMenuName}"
+ hidden="pid" readonly="readonly"
+ clickFun="Code.showMenuSelectTree(); return false;"
+ style="background-color: #ffffff !important;"
+ selectFlag="true" selectId="pcodeTreeDiv" selectTreeId="pcodeTree" selectStyle=""/>
+ </div>
+ </div>
+
+ <div class="row">
+ <div class="col-sm-3">
+ <#input id="tableName" name="表名称" disabled="disabled"/>
+ </div>
+ <div class="col-sm-3">
+ <#input id="ignoreTabelPrefix" name="表前缀" value="${params.ignoreTabelPrefix}"/>
+ </div>
+ <div class="col-sm-3">
+ <#input id="className" name="类名" disabled="disabled"/>
+ </div>
+ </div>
+ <div class="row">
+ <div class="col-sm-6">
+ <button id="genBtn" type="button" class="btn btn-primary mr10"
+ onclick="Code.generate()">
+ <span style="padding: 5px 20px;">生成</span>
+ </button>
+ </div>
+ </div>
+ </div>
+ <div style="padding-top: 10px; overflow: hidden"
+ class="container-fluid">
+ <div class="col-md-12">
+ <div class="row admin-form">
+ <div class="col-md-3 col-md-offset-3">
+ <h2>数据表</h2>
+ <div class="list-group" id="tableList"
+ data-bind="foreach: tables"
+ style="height: 500px; overflow-y: scroll">
+ @for(table in tables!){
+ <a href="javascript:void(0)" class="list-group-item" tableName="${table.tableName}" onclick="Code.selectTable('${table.tableName}')">${table.tableName}-${table.tableComment}</a>
+ @}
+ </div>
+ </div>
+ <div class="col-md-3">
+ <span><h2>模板</h2></span>
+ <div class="list-group" id="templateList"
+ style="height: 500px; overflow-y: scroll">
+ @for(template in templates!){
+ <a href="javascript:void(0)" class="list-group-item" key="${template.key}" onclick="Code.selectTemplate('${template.key}')">${template.desc}</a>
+ @}
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ <ul class="nav nav-list">
+ <li class="divider"></li>
+ </ul>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+</div>
+<script src="${ctxPath}/static/js/common/select-list-object.js"></script>
+<script src="${ctxPath}/static/modular/code/gen.js"></script>
+@}
+
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/common/_container.html b/management/guns-admin/src/main/webapp/WEB-INF/view/common/_container.html
new file mode 100644
index 0000000..61ac26d
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/common/_container.html
@@ -0,0 +1,194 @@
+<!DOCTYPE html>
+<html>
+<head>
+ <meta charset="utf-8">
+ <meta name="viewport" content="width=device-width, initial-scale=1.0">
+ <meta name="renderer" content="webkit"/><!-- 让360浏览器默认选择webkit内核 -->
+
+ <!--地图-->
+ <script src="https://webapi.amap.com/maps?v=1.4.8&key=e17d799b2506d05faf7f88320a266803"></script>
+ <!--<script type="text/javascript" src="https://api.map.baidu.com/api?v=2.0&ak=IRKL4FLGKZUFr6T3gFk3t9X6kKarKu1K"></script>-->
+
+ <!-- 全局css -->
+ <link rel="shortcut icon" href="${ctxPath}/static/favicon1.ico">
+ <link href="${ctxPath}/static/css/bootstrap.min.css?v=3.3.6" rel="stylesheet">
+ <link href="${ctxPath}/static/css/plugins/switchery/switchery.css" rel="stylesheet">
+ <link href="${ctxPath}/static/css/font-awesome.css?v=4.4.0" rel="stylesheet">
+ <link href="${ctxPath}/static/css/plugins/chosen/chosen.css" rel="stylesheet">
+ <link href="${ctxPath}/static/css/plugins/bootstrap-table/bootstrap-table.min.css" rel="stylesheet">
+ <link href="${ctxPath}/static/css/plugins/validate/bootstrapValidator.min.css" rel="stylesheet">
+ <link href="${ctxPath}/static/css/style.css?v=4.1.0" rel="stylesheet">
+ <link href="${ctxPath}/static/css/_fstyle.css" rel="stylesheet">
+ <link href="${ctxPath}/static/css/plugins/iCheck/custom.css" rel="stylesheet">
+ <link href="${ctxPath}/static/css/plugins/webuploader/webuploader.css" rel="stylesheet">
+ <link href="${ctxPath}/static/css/plugins/ztree/zTreeStyle.css" rel="stylesheet">
+ <link href="${ctxPath}/static/css/plugins/bootstrap-treetable/bootstrap-treetable.css" rel="stylesheet"/>
+ <!-- <link href="${ctxPath}/static/css/plugins/ztree/demo.css" rel="stylesheet"> -->
+ <link href="${ctxPath}/static/css/plugins/awesome-bootstrap-checkbox/awesome-bootstrap-checkbox.css" rel="stylesheet">
+ <link href="${ctxPath}/static/css/plugins/sweetalert/sweetalert.css" rel="stylesheet">
+ <link href="${ctxPath}/static/layui/css/layui.css" rel="stylesheet">
+
+ <!--富文本编辑器 css-->
+ <link type="text/css" rel="stylesheet" href="${ctxPath}/static/js/ueditor/jsp/themes/default/css/ueditor.css">
+
+ <!-- 全局js -->
+ <script src="${ctxPath}/static/js/jquery.min.js?v=2.1.4"></script>
+ <script src="${ctxPath}/static/js/bootstrap.min.js?v=3.3.6"></script>
+ <script src="${ctxPath}/static/js/plugins/ztree/jquery.ztree.all.min.js"></script>
+ <script src="${ctxPath}/static/js/plugins/bootstrap-table/bootstrap-table.min.js"></script>
+ <script src="${ctxPath}/static/js/plugins/validate/bootstrapValidator.min.js"></script>
+ <script src="${ctxPath}/static/js/plugins/validate/zh_CN.js"></script>
+ <script src="${ctxPath}/static/js/plugins/bootstrap-table/bootstrap-table-mobile.min.js"></script>
+ <script src="${ctxPath}/static/js/plugins/bootstrap-table/locale/bootstrap-table-zh-CN.min.js"></script>
+ <script src="${ctxPath}/static/js/plugins/bootstrap-treetable/bootstrap-treetable.js"></script>
+ <script src="${ctxPath}/static/js/plugins/layer/layer.js"></script>
+ <script src="${ctxPath}/static/js/plugins/switchery/switchery.js"></script>
+ <script src="${ctxPath}/static/js/plugins/chosen/chosen.jquery.js"></script>
+ <script src="${ctxPath}/static/js/plugins/iCheck/icheck.min.js"></script>
+ <script src="${ctxPath}/static/js/plugins/laydate/laydate.js"></script>
+ <script src="${ctxPath}/static/js/common/laydateChoose.js"></script>
+ <script src="${ctxPath}/static/js/plugins/webuploader/webuploader.min.js"></script>
+ <script src="${ctxPath}/static/js/common/ajax-object.js"></script>
+ <script src="${ctxPath}/static/js/common/bootstrap-table-object.js"></script>
+ <script src="${ctxPath}/static/js/common/tree-table-object.js"></script>
+ <script src="${ctxPath}/static/js/common/web-upload-object.js"></script>
+ <script src="${ctxPath}/static/js/common/web-upload-image.js"></script>
+ <script src="${ctxPath}/static/js/common/ztree-object.js"></script>
+ <script src="${ctxPath}/static/js/common/Feng.js"></script>
+ <script src="${ctxPath}/static/js/plugins/sweetalert/sweetalert.min.js"></script>
+ <script src="${ctxPath}/static/layui/layui.js"></script>
+
+ <!--富文本编辑器 js-->
+ <!-- <script type="text/javascript" charset="utf-8" src="${ctxPath}/static/js/plugins/umeditor/umeditor.config.js"></script>
+ <script type="text/javascript" charset="utf-8" src="${ctxPath}/static/js/plugins/umeditor/umeditor.js"></script>
+ <script type="text/javascript" charset="utf-8" src="${ctxPath}/static/js/plugins/umeditor/lang/zh-cn/zh-cn.js"></script>-->
+ <script type="text/javascript" charset="utf-8" src="${ctxPath}/static/js/ueditor/jsp/ueditor.config.js"></script>
+ <script type="text/javascript" charset="utf-8" src="${ctxPath}/static/js/ueditor/jsp/ueditor.all.js"></script>
+ <script type="text/javascript" charset="utf-8" src="${ctxPath}/static/js/ueditor/jsp/lang/zh-cn/zh-cn.js"></script>
+ <!--<style type="text/css">
+ table{
+ width:100px;
+ table-layout:fixed;/* 只有定义了表格的布局算法为fixed，下面td的定义才能起作用。 */
+ }
+ td{
+ width:100%;
+ word-break:keep-all;/* 不换行 */
+ white-space:nowrap;/* 不换行 */
+ overflow:hidden;/* 内容超出宽度时隐藏超出部分的内容 */
+ text-overflow:ellipsis;/* 当对象内文本溢出时显示省略标记(...) ；需与overflow:hidden;一起使用*/
+ }
+ </style>-->
+
+ <script type="text/javascript">
+ Feng.addCtx("${ctxPath}");
+ Feng.sessionTimeoutRegistry();
+ //验证电话号码
+ var phoneReg = /^1(3|4|5|7|8|9)\d{9}$/;
+ //验证是否输入正整数
+ var reg = /^[0-9]\d*$/;
+ //6-12位正整数
+ var regSix = /^[0-9]{6,12}$/;
+ //验证是否输入小数
+ var regDouble = /^(([1-9]{1}\d*)|(0{1}))(\.\d{0,2})?$/;
+ //保留一位小数
+ var regDoubleOne = /^(([1-9]{1}\d*)|(0{1}))(\.\d{0,1})?$/;
+ /**
+ * 图片弹出预览框（可选）
+ */
+ window.operateEvents = {
+ 'click .view': function (e, value, row) {
+ // 设置图片路径
+ var imgUrl = value;
+ if(imgUrl != "") {
+ imgUrl = imgUrl;// 设置图片路径
+ } else {
+ imgUrl = Feng.ctxPath + '/static/img/NoPIC.png';// 默认无图
+ }
+ layer.open({
+ type: 1,
+ title: false,
+ closeBtn: 0,
+ area: 'auto',
+ skin: 'layui-layer-nobg', //没有背景色
+ shadeClose: true,
+ content: '<img src="' + imgUrl + '" height="100%" width="100%" />'
+ });
+ },
+ };
+ /**
+ * 查看大图
+ */
+ function lookBigImg(obj){
+ // 设置图片路径
+ var imgUrl = obj;
+ if(imgUrl != "") {
+ imgUrl = imgUrl;// 设置图片路径
+ } else {
+ imgUrl = Feng.ctxPath + '/static/img/NoPIC.png';// 默认无图
+ }
+ layer.open({
+ type: 1,
+ title: false,
+ closeBtn: 0,
+ area: 'auto',
+ skin: 'layui-layer-nobg', //没有背景色
+ shadeClose: true,
+ content: '<img src="' + imgUrl + '" height="100%" width="100%" />'
+ });
+ }
+ /*表单验证错误点击叉叉可以清除文本框内容*/
+ $(function () {
+ $(".form-control:input").each(function () {
+ $(this).click(function () {
+ if($(this).next().hasClass("glyphicon-remove")){
+ $(this).val("");
+ }
+ })
+ })
+ })
+ /*验证输入字符*/
+ function checkField(value) {
+ var newvalue = value.replace(/[^\x00-\xff]/g, "**");
+ var length = newvalue.length;
+ return length;
+ }
+ //字符串操作函数 往指定位置插入字符 删除指定位置字符 替换指定位置字符
+ function insert_flg(str,flg,sn){
+ var newstr="";
+ for(var i=0;i<str.length;i+=sn){
+ var tmp=str.substring(i, i+sn);
+ if(sn==i){
+ newstr+=flg;
+ }
+ newstr+=tmp;
+ }
+ return newstr;
+ }
+
+ //获取当前时间，格式YYYY-MM-DD
+ function getNowFormatDate() {
+ var date = new Date();
+ var seperator1 = "-";
+ var year = date.getFullYear();
+ var month = date.getMonth() + 1;
+ var strDate = date.getDate();
+ if (month >= 1 && month <= 9) {
+ month = "0" + month;
+ }
+ if (strDate >= 0 && strDate <= 9) {
+ strDate = "0" + strDate;
+ }
+ var currentdate = year + seperator1 + month + seperator1 + strDate;
+ return currentdate;
+ }
+
+ </script>
+</head>
+
+<body class="gray-bg">
+<div class="wrapper wrapper-content">
+ ${layoutContent}
+</div>
+<script src="${ctxPath}/static/js/content.js?v=1.0.0"></script>
+</body>
+</html>
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/common/_right.html b/management/guns-admin/src/main/webapp/WEB-INF/view/common/_right.html
new file mode 100644
index 0000000..795564a
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/common/_right.html
@@ -0,0 +1,59 @@
+<div id="page-wrapper" class="gray-bg dashbard-1">
+ <div class="row border-bottom">
+ <nav class="navbar navbar-static-top" role="navigation" style="margin-bottom: 0">
+ <div class="navbar-header"><a class="navbar-minimalize minimalize-styl-2 btn btn-primary " href="#"><i class="fa fa-bars"></i> </a>
+ <form role="search" class="navbar-form-custom" method="post" action="search_results.html">
+ <div class="form-group">
+ <input type="text" placeholder="OK出行后台管理系统 …" class="form-control" name="top-search" id="top-search" value="OK出行后台管理系统" disabled>
+ </div>
+ </form>
+ <h3 style="float: right;line-height: 50px;color: red;">${passwordHint}</h3>
+ </div>
+ <ul class="nav navbar-top-links navbar-right">
+ <li class="dropdown hidden-xs">
+ <a class="right-sidebar-toggle" aria-expanded="false">
+ <i class="fa fa-tasks"></i> 主题
+ </a>
+ </li>
+ </ul>
+ </nav>
+ </div>
+ <div class="row content-tabs">
+ <button class="roll-nav roll-left J_tabLeft"><i class="fa fa-backward"></i>
+ </button>
+ <nav class="page-tabs J_menuTabs">
+ <div class="page-tabs-content">
+ <a href="javascript:;" class="active J_menuTab" data-id="${ctxPath}/blackboard">首页</a>
+ </div>
+ </nav>
+ <!--<nav class="page-tabs J_menuTabs">
+ <div class="page-tabs-content">
+ <a href="javascript:;" class="active J_menuTab" data-id="${ctxPath}/blackboard?type=0"></a>
+ </div>
+ </nav>-->
+ <button class="roll-nav roll-right J_tabRight"><i class="fa fa-forward"></i>
+ </button>
+ <div class="btn-group roll-nav roll-right">
+ <button class="dropdown J_tabClose" data-toggle="dropdown">关闭操作<span class="caret"></span>
+
+ </button>
+ <ul role="menu" class="dropdown-menu dropdown-menu-right">
+ <li class="J_tabShowActive"><a>定位当前选项卡</a>
+ </li>
+ <li class="divider"></li>
+ <li class="J_tabCloseAll"><a>关闭全部选项卡</a>
+ </li>
+ <li class="J_tabCloseOther"><a>关闭其他选项卡</a>
+ </li>
+ </ul>
+ </div>
+ <a href="logout" class="roll-nav roll-right J_tabExit"><i class="fa fa fa-sign-out"></i> 退出</a>
+ </div>
+ <div class="row J_mainContent" id="content-main">
+ <iframe class="J_iframe" name="iframe0" width="100%" height="100%" src="${ctxPath}/blackboard?type=${type}" frameborder="0" data-id="${ctxPath}/blackboard" seamless></iframe>
+ </div>
+ <div class="footer">
+ <div class="pull-right">© 2019-2021 <a href="#" onclick="return false" target="_blank">OK出行</a>
+ </div>
+ </div>
+</div>
\ No newline at end of file
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/common/_tab.html b/management/guns-admin/src/main/webapp/WEB-INF/view/common/_tab.html
new file mode 100644
index 0000000..79b3def
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/common/_tab.html
@@ -0,0 +1,74 @@
+<nav class="navbar-default navbar-static-side" role="navigation">
+ <div class="nav-close"><i class="fa fa-times-circle"></i>
+ </div>
+ <div class="sidebar-collapse">
+ <ul class="nav" id="side-menu">
+ <li class="nav-header">
+ <div class="dropdown profile-element">
+ <span><img alt="image" class="img-circle"
+ @if(isEmpty(avatar)){
+ src="${ctxPath}/static/img/NoPIC.png"
+ @}else{
+ src="${avatar}"
+ @}
+ width="64px" height="64px"/></span>
+ <a data-toggle="dropdown" class="dropdown-toggle" href="#">
+ <span class="clear">
+ <span class="block m-t-xs"><strong class="font-bold" id="userNameTab">${userName}</strong></span>
+ <span class="text-muted text-xs block">${shiro.getUser().roleNames[0]}<b class="caret"></b></span>
+ </span>
+ </a>
+ <ul class="dropdown-menu m-t-xs">
+ <li><a class="J_menuItem" href="${ctxPath}/mgr/user_info">个人资料</a></li>
+ <li><a class="J_menuItem" href="${ctxPath}/mgr/user_chpwd">修改密码</a></li>
+ <li class="divider"></li>
+ <li><a href="${ctxPath}/logout">安全退出</a>
+ </li>
+ </ul>
+ </div>
+ <div class="logo-element">MS
+ </div>
+ </li>
+
+ @for(title in titles){
+ @if(tool.isEmpty(title.children)){
+ <li>
+ <a class="J_menuItem" href="${ctxPath}${title.url}" name="tabMenuItem">
+ <i class="fa ${title.icon}"></i>
+ <span class="nav-label">${title.name}</span>
+ </a>
+ </li>
+ @}else{
+ <li>
+ <a href="#">
+ <i class="fa ${title.icon}"></i>
+ <span class="nav-label">${title.name}</span>
+ <span class="fa arrow"></span>
+ </a>
+ <ul class="nav nav-second-level">
+ @for(subTitle in title.children){
+ @if(tool.isEmpty(subTitle.children)){
+ <li>
+ <a class="J_menuItem" href="${ctxPath}${subTitle.url}" name="tabMenuItem">${subTitle.name}</a>
+ </li>
+ @}else{
+ <li>
+ <a href="#">${subTitle.name} <span class="fa arrow"></span></a>
+ <ul class="nav nav-third-level">
+ @for(thirdTitle in subTitle.children){
+ <li>
+ <a class="J_menuItem" href="${ctxPath}${thirdTitle.url}" name="tabMenuItem">${thirdTitle.name}</a>
+ </li>
+ @}
+ </ul>
+ </li>
+ @}
+ @}
+ </ul>
+ </li>
+ @}
+ @}
+
+ </ul>
+ </div>
+</nav>
\ No newline at end of file
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/common/_theme.html b/management/guns-admin/src/main/webapp/WEB-INF/view/common/_theme.html
new file mode 100644
index 0000000..4c093d8
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/common/_theme.html
@@ -0,0 +1,84 @@
+<div id="right-sidebar">
+ <div class="sidebar-container">
+
+ <ul class="nav nav-tabs navs-3">
+ <li class="active"><a data-toggle="tab" href="#tab-1"> <i
+ class="fa fa-gear"></i> 主题
+ </a></li>
+ </ul>
+
+ <div class="tab-content">
+ <div id="tab-1" class="tab-pane active">
+ <div class="sidebar-title">
+ <h3>
+ <i class="fa fa-comments-o"></i> 主题设置
+ </h3>
+ <small><i class="fa fa-tim"></i>
+ 你可以从这里选择和预览主题的布局和样式，这些设置会被保存在本地，下次打开的时候会直接应用这些设置。</small>
+ </div>
+ <div class="skin-setttings">
+ <div class="title">主题设置</div>
+ <div class="setings-item">
+ <span>收起左侧菜单</span>
+ <div class="switch">
+ <div class="onoffswitch">
+ <input type="checkbox" name="collapsemenu"
+ class="onoffswitch-checkbox" id="collapsemenu"> <label
+ class="onoffswitch-label" for="collapsemenu"> <span
+ class="onoffswitch-inner"></span> <span
+ class="onoffswitch-switch"></span>
+ </label>
+ </div>
+ </div>
+ </div>
+ <div class="setings-item">
+ <span>固定顶部</span>
+
+ <div class="switch">
+ <div class="onoffswitch">
+ <input type="checkbox" name="fixednavbar"
+ class="onoffswitch-checkbox" id="fixednavbar"> <label
+ class="onoffswitch-label" for="fixednavbar"> <span
+ class="onoffswitch-inner"></span> <span
+ class="onoffswitch-switch"></span>
+ </label>
+ </div>
+ </div>
+ </div>
+ <div class="setings-item">
+ <span> 固定宽度 </span>
+
+ <div class="switch">
+ <div class="onoffswitch">
+ <input type="checkbox" name="boxedlayout"
+ class="onoffswitch-checkbox" id="boxedlayout"> <label
+ class="onoffswitch-label" for="boxedlayout"> <span
+ class="onoffswitch-inner"></span> <span
+ class="onoffswitch-switch"></span>
+ </label>
+ </div>
+ </div>
+ </div>
+ <div class="title">皮肤选择</div>
+ <div class="setings-item default-skin nb">
+ <span class="skin-name "> <a href="#" class="s-skin-0">
+ 默认皮肤 </a>
+ </span>
+ </div>
+ <div class="setings-item blue-skin nb">
+ <span class="skin-name "> <a href="#" class="s-skin-1">
+ 蓝色主题 </a>
+ </span>
+ </div>
+ <div class="setings-item yellow-skin nb">
+ <span class="skin-name "> <a href="#" class="s-skin-3">
+ 黄色/紫色主题 </a>
+ </span>
+ </div>
+ </div>
+ </div>
+
+ </div>
+
+ </div>
+</div>
\ No newline at end of file
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/common/tags/NameCon.tag b/management/guns-admin/src/main/webapp/WEB-INF/view/common/tags/NameCon.tag
new file mode 100644
index 0000000..37cbe1d
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/common/tags/NameCon.tag
@@ -0,0 +1,14 @@
+@/*
+ 名称查询条件标签的参数说明:
+
+ name : 查询条件的名称
+ id : 查询内容的input框id
+@*/
+<div class="input-group">
+ <div class="input-group-btn">
+ <button data-toggle="dropdown" class="btn btn-white dropdown-toggle"
+ type="button">${name}
+ </button>
+ </div>
+ <input type="text" class="form-control" id="${id}" placeholder="${placeholder!}" />
+</div>
\ No newline at end of file
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/common/tags/SelectCon.tag b/management/guns-admin/src/main/webapp/WEB-INF/view/common/tags/SelectCon.tag
new file mode 100644
index 0000000..a350fc9
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/common/tags/SelectCon.tag
@@ -0,0 +1,16 @@
+@/*
+ 选择查询条件标签的参数说明:
+
+ name : 查询条件的名称
+ id : 查询内容的input框id
+@*/
+<div class="input-group">
+ <div class="input-group-btn">
+ <button data-toggle="dropdown" class="btn btn-white dropdown-toggle" type="button">
+ ${name}
+ </button>
+ </div>
+ <select class="form-control" id="${id}">
+ ${tagBody!}
+ </select>
+</div>
\ No newline at end of file
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/common/tags/TimeCon.tag b/management/guns-admin/src/main/webapp/WEB-INF/view/common/tags/TimeCon.tag
new file mode 100644
index 0000000..a1fb8a3
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/common/tags/TimeCon.tag
@@ -0,0 +1,15 @@
+@/*
+ 时间查询条件标签的参数说明:
+
+ name : 查询条件的名称
+ id : 查询内容的input框id
+ isTime : 日期是否带有小时和分钟(true/false)
+@*/
+<div class="input-group">
+ <div class="input-group-btn">
+ <button data-toggle="dropdown" class="btn btn-white dropdown-toggle"
+ type="button">${name}
+ </button>
+ </div>
+ <input type="text" class="form-control layer-date" id="${id}"/>
+</div>
\ No newline at end of file
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/common/tags/avatar.tag b/management/guns-admin/src/main/webapp/WEB-INF/view/common/tags/avatar.tag
new file mode 100644
index 0000000..b7f7608
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/common/tags/avatar.tag
@@ -0,0 +1,29 @@
+@/*
+ 头像参数的说明:
+ name : 名称
+ id : 头像的id
+@*/
+<div class="form-group">
+ <label class="col-sm-3 control-label head-scu-label">${name}</label>
+ <div class="col-sm-4">
+ <div id="${id}PreId">
+ <div><img width="100px" height="100px"
+ @if(isEmpty(avatarImg)){
+ src="${ctxPath}/static/img/NoPIC.png"></div>
+ @}else{
+ src="${avatarImg}"></div>
+ @}
+ </div>
+ </div>
+ <div class="col-sm-2">
+ <div class="head-scu-btn upload-btn" id="${id}BtnId">
+ <i class="fa fa-upload"></i> 上传
+ </div>
+ </div>
+ <input type="hidden" id="${id}" value="${avatarImg!}"/>
+</div>
+@if(isNotEmpty(underline) && underline == 'true'){
+ <div class="hr-line-dashed"></div>
+@}
+
+
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/common/tags/button.tag b/management/guns-admin/src/main/webapp/WEB-INF/view/common/tags/button.tag
new file mode 100644
index 0000000..86def81
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/common/tags/button.tag
@@ -0,0 +1,30 @@
+@/*
+ 按钮标签中各个参数的说明:
+
+ btnType : 按钮的类型决定了颜色(default-灰色,primary-绿色,success-蓝色,info-淡蓝色,warning-黄色,danger-红色,white-白色)
+ space : 按钮左侧是否有间隔(true/false)
+ clickFun : 点击按钮所执行的方法
+ icon : 按钮上的图标的样式
+ name : 按钮名称
+@*/
+
+@var spaceCss = "";
+@var btnType = "";
+@if(isEmpty(space) || space == "false"){
+@ spaceCss = "";
+@}else{
+@ spaceCss = "button-margin";
+@}
+@if(isEmpty(btnCss)){
+@ btnType = "primary";
+@}else{
+@ btnType = btnCss;
+@}
+<button type="button" class="btn btn-${btnType} ${spaceCss}" onclick="${clickFun!}" id="${id!}"
+ @if(isNotEmpty(style)){
+ style="${style}"
+ @}
+>
+ <i class="fa ${icon}"></i> ${name}
+</button>
+
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/common/tags/input.tag b/management/guns-admin/src/main/webapp/WEB-INF/view/common/tags/input.tag
new file mode 100644
index 0000000..371ce9e
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/common/tags/input.tag
@@ -0,0 +1,54 @@
+@/*
+ 表单中input框标签中各个参数的说明:
+
+ hidden : input hidden框的id
+ id : input框id
+ name : input框名称
+ readonly : readonly属性
+ clickFun : 点击事件的方法名
+ style : 附加的css属性
+@*/
+<div class="form-group">
+ <label class="col-sm-3 control-label">${name}：</label>
+ <div class="col-sm-9">
+ <input class="form-control" id="${id}" name="${id}"
+ @if(isNotEmpty(value)){
+ value="${tool.dateType(value)}"
+ @}
+ @if(isNotEmpty(type)){
+ type="${type}"
+ @}else{
+ type="text"
+ @}
+ @if(isNotEmpty(readonly)){
+ readonly="${readonly}"
+ @}
+ @if(isNotEmpty(clickFun)){
+ onclick="${clickFun}"
+ @}
+ @if(isNotEmpty(style)){
+ style="${style}"
+ @}
+ @if(isNotEmpty(disabled)){
+ disabled="${disabled}"
+ @}
+ @if(isNotEmpty(placeholder)){
+ placeholder="${placeholder}"
+ @}
+ >
+ @if(isNotEmpty(hidden)){
+ <input class="form-control" type="hidden" id="${hidden}" value="${hiddenValue!}">
+ @}
+
+ @if(isNotEmpty(selectFlag)){
+ <div id="${selectId}" style="display: none; position: absolute; z-index: 200;">
+ <ul id="${selectTreeId}" class="ztree tree-box" style="${selectStyle!}"></ul>
+ </div>
+ @}
+ </div>
+</div>
+@if(isNotEmpty(underline) && underline == 'true'){
+ <div class="hr-line-dashed"></div>
+@}
+
+
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/common/tags/inputRequired.tag b/management/guns-admin/src/main/webapp/WEB-INF/view/common/tags/inputRequired.tag
new file mode 100644
index 0000000..6ff1d2a
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/common/tags/inputRequired.tag
@@ -0,0 +1,51 @@
+@/*
+ 表单中input框标签中各个参数的说明:
+
+ hidden : input hidden框的id
+ id : input框id
+ name : input框名称
+ readonly : readonly属性
+ clickFun : 点击事件的方法名
+ style : 附加的css属性
+@*/
+<div class="form-group">
+ <label class="col-sm-3 control-label"><span style="color:red">*</span> ${name}：</label>
+ <div class="col-sm-9">
+ <input class="form-control" id="${id}" name="${id}"
+ @if(isNotEmpty(value)){
+ value="${tool.dateType(value)}"
+ @}
+ @if(isNotEmpty(type)){
+ type="${type}"
+ @}else{
+ type="text"
+ @}
+ @if(isNotEmpty(readonly)){
+ readonly="${readonly}"
+ @}
+ @if(isNotEmpty(clickFun)){
+ onclick="${clickFun}"
+ @}
+ @if(isNotEmpty(style)){
+ style="${style}"
+ @}
+ @if(isNotEmpty(disabled)){
+ disabled="${disabled}"
+ @}
+ >
+ @if(isNotEmpty(hidden)){
+ <input class="form-control" type="hidden" id="${hidden}" value="${hiddenValue!}">
+ @}
+
+ @if(isNotEmpty(selectFlag)){
+ <div id="${selectId}" style="display: none; position: absolute; z-index: 200;">
+ <ul id="${selectTreeId}" class="ztree tree-box" style="${selectStyle!}"></ul>
+ </div>
+ @}
+ </div>
+</div>
+@if(isNotEmpty(underline) && underline == 'true'){
+ <div class="hr-line-dashed"></div>
+@}
+
+
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/common/tags/label.tag b/management/guns-admin/src/main/webapp/WEB-INF/view/common/tags/label.tag
new file mode 100644
index 0000000..2221b95
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/common/tags/label.tag
@@ -0,0 +1,31 @@
+@/*
+ 表单中input框标签中各个参数的说明:
+
+ hidden : input hidden框的id
+ id : input框id
+ name : input框名称
+ readonly : readonly属性
+ clickFun : 点击事件的方法名
+ style : 附加的css属性
+@*/
+<div class="form-group">
+ <label class="col-sm-3 control-label">${name}：</label>
+ <div class="col-sm-9">
+ <label class="control-label" id="${id}" name="${id}"
+ @if(isNotEmpty(style)){
+ style="${style};text-align: left;"
+ @}else{
+ style="text-align: left;"
+ @}
+ >
+ @if(isNotEmpty(value)){
+ ${tool.dateType(value)}
+ @}
+ </label>
+ </div>
+</div>
+@if(isNotEmpty(underline) && underline == 'true'){
+ <div class="hr-line-dashed"></div>
+@}
+
+
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/common/tags/select.tag b/management/guns-admin/src/main/webapp/WEB-INF/view/common/tags/select.tag
new file mode 100644
index 0000000..7072de1
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/common/tags/select.tag
@@ -0,0 +1,26 @@
+@/*
+ select标签中各个参数的说明:
+ name : select的名称
+ id : select的id
+ underline : 是否带分割线
+@*/
+<div class="form-group">
+ <label class="col-sm-3 control-label">${name}</label>
+ <div class="col-sm-9">
+ <select class="form-control" id="${id}" name="${id}"
+ @if(isNotEmpty(onchange)){
+ onchange="${onchange}"
+ @}
+ >
+ ${tagBody!}
+ </select>
+ @if(isNotEmpty(hidden)){
+ <input class="form-control" type="hidden" id="${hidden}" value="${hiddenValue!}">
+ @}
+ </div>
+</div>
+@if(isNotEmpty(underline) && underline == 'true'){
+ <div class="hr-line-dashed"></div>
+@}
+
+
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/common/tags/table.tag b/management/guns-admin/src/main/webapp/WEB-INF/view/common/tags/table.tag
new file mode 100644
index 0000000..3760417
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/common/tags/table.tag
@@ -0,0 +1,12 @@
+@/*
+ 表格标签的参数说明:
+
+ id : table表格的id
+@*/
+<table id="${id}" data-mobile-responsive="true" data-click-to-select="true">
+ <thead>
+ <tr>
+ <th data-field="selectItem" data-checkbox="true"></th>
+ </tr>
+ </thead>
+</table>
\ No newline at end of file
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/common/tags/tag_tips b/management/guns-admin/src/main/webapp/WEB-INF/view/common/tags/tag_tips
new file mode 100644
index 0000000..3a5d5d4
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/common/tags/tag_tips
@@ -0,0 +1,22 @@
+1 dictSelector(字典选择器)
+ 此标签是为了方便在前台form表单中使用系统中维护的字典而开发的，具体说明如下：
+1.1 标签样例
+ <#dictSelector id="sex" name ="sex" code="sys_sex" readonly="readonly" label="性别" underline="true" value="${user.sex}" />
+1.2 属性说明
+ id: (非必须) 控件的id
+ name: (非必须) 控件的name
+ code:(必须) 字典类型编码,根据code的值去后台查询该类型的字典。
+ type:(非必须) 控件类型，可选项为[select,radio,checkbox],标签会根据填写的类型，生成不同的控件。
+ searchnum：(非必须)下拉框达到多少个，开启搜索框，默认10个,type为select起效。
+ label：(非必须) 字典属性名称
+ width：(非必须) 控件的宽度单位为px，type为select起效。
+ value: (非必须) 控件默认值,多选时值要用,分隔。
+ placeholder：(非必须) 控件提示信息，type为select起效。
+ multiple：(非必须) 是否开启多选,可选值[true,false],默认为false,type为select起效。
+ underline:(非必须) 是否显示分割线,可选值[true,false],默认为false。
+ onchange：(非必须) onchange事件方法名称,会传入更改后的值作为参数,例：onchange="myOnChange" function myOnChange(newVal){}。
+ readonly：(非必须)只读控件,可选值[true,false],默认false
+ disabled：(非必须) 禁用控件,可选值[true,false],默认false
+
+
+
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/common/tags/uploadFile.tag b/management/guns-admin/src/main/webapp/WEB-INF/view/common/tags/uploadFile.tag
new file mode 100644
index 0000000..793cd19
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/common/tags/uploadFile.tag
@@ -0,0 +1,13 @@
+<div class="form-group">
+ <label class="col-sm-2 control-label">上传文件</label>
+ <div class="col-sm-6">
+ <input type="file" class="form-control" id="upFile" name="upFile">
+ <input type="hidden" id="${id}" name="${id}"/>
+ </div>
+ <div class="col-sm-2">
+ <button class="btn btn-outline btn-success" type="button" onclick="UploadFileFn()"><i class="fa fa-upload"></i>上传文件</button>
+ </div>
+</div>
+<div class="col-sm-12 progress progress-striped" style="margin-top: 10px;">
+ <div id="progressBarFile" style="width: 0%" aria-valuemax="100" aria-valuemin="0" aria-valuenow="0" role="progressbar" class="progress-bar progress-bar-info"></div>
+</div>
\ No newline at end of file
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/common/tags/uploadImg.tag b/management/guns-admin/src/main/webapp/WEB-INF/view/common/tags/uploadImg.tag
new file mode 100644
index 0000000..8a0c521
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/common/tags/uploadImg.tag
@@ -0,0 +1,26 @@
+@/*
+ 上传文件参数的说明:
+ id : 文件的id
+@*/
+<div class="form-group">
+ <div class="col-sm-4">
+ <div id="${id}PreId">
+ <div><img width="100px" height="100px"
+ @if(isEmpty(fileImg)){
+ src="${ctxPath}/static/img/NoPIC.png">
+ @}else{
+ src="${fileImg}">
+ @}
+ </div>
+ </div>
+ </div>
+ <div class="col-sm-2">
+ <div class="head-scu-btn upload-btn" id="${id}BtnId">
+ <i class="fa fa-upload"></i> 上传
+ </div>
+ </div>
+ <input type="hidden" id="${id}" value="${fileImg!}"/>
+</div>
+@if(isNotEmpty(underline) && underline == 'true'){
+ <div class="hr-line-dashed"></div>
+@}
\ No newline at end of file
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/driverOnline.html b/management/guns-admin/src/main/webapp/WEB-INF/view/driverOnline.html
new file mode 100644
index 0000000..9299d76
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/driverOnline.html
@@ -0,0 +1,33 @@
+@layout("/common/_container.html"){
+<div class="row">
+ <div class="col-sm-12">
+ <div class="ibox float-e-margins">
+ <div class="ibox-title">
+ <h5>在线司机</h5>
+ </div>
+ <div class="ibox-content">
+ <div class="row row-lg">
+ <div class="col-sm-12">
+ <div class="row">
+ <div class="col-sm-3">
+ <#NameCon id="name" name="司机姓名" />
+ </div>
+ <div class="col-sm-3">
+ <#NameCon id="phone" name="手机号" />
+ </div>
+ <div class="col-sm-3">
+ <#button name="搜索" icon="fa-search" clickFun="Home.search()"/>
+ <#button name="重置" icon="fa-trash" clickFun="Home.resetSearch()" space="true"/>
+ </div>
+ </div>
+ <div class="hidden-xs" id="HomeTableToolbar" role="group">
+ </div>
+ <#table id="HomeTable"/>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+</div>
+<script src="${ctxPath}/static/home.js"></script>
+@}
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/home.html b/management/guns-admin/src/main/webapp/WEB-INF/view/home.html
new file mode 100644
index 0000000..07cce38
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/home.html
@@ -0,0 +1,264 @@
+@layout("/common/_container.html"){
+<div class="container-fluid" style="padding: 0 !important;">
+ <div class="row">
+ <div class="col-sm-12">
+ <div class="row" style="border-style: none none solid; border-color: #e7eaec; border-width: 1px 0px;">
+ <ul class="breadcrumb" style="height: 45px; line-height: 45px; padding-left: 20px;">
+ <li><a href="#" class="statistics">运营数据总览</a></li>
+ <li><a href="#" class="map">车辆地图总览</a></li>
+ <li><a href="#" class="order">订单热点图</a></li>
+ </ul>
+ </div>
+
+ <div class="row content" id="statisticsDiv">
+ <div class="form-group" style="height: 80px; padding-top: 20px; background-color: #FFFFFF;margin-bottom: 8px;">
+ <div class="col-sm-3">
+ <div class="input-group">
+ <div class="input-group-btn">
+ <button data-toggle="dropdown" class="btn btn-white dropdown-toggle"
+ type="button">选择查看范围
+ </button>
+ </div>
+ <div style="padding-left: 0px;">
+ <select class="form-control" id="branchOffice">
+ <option value="">----请选择----</option>
+ </select>
+ </div>
+ </div>
+ </div>
+ <div class="col-sm-2">
+ <#button name="搜索" icon="fa-search" clickFun="getData()"/>
+ </div>
+ </div>
+ <div class="col-sm-3">
+ <div class="ibox float-e-margins">
+ <div class="ibox-title">
+ <div class="pull-right" style="margin-top: -10px;">
+ <input type="text" class="layui-input form-control" id="addDate">
+ </div>
+ <h5>今日运行情况</h5>
+ </div>
+ <div class="ibox-content">
+ <h1 class="no-margins" id="newPassengerInfo">0</h1>
+ <small>新增用户</small>
+ </div>
+ <div class="ibox-content" onclick="Home.onlineDriver()">
+ <h1 class="no-margins" id="newNetcardriver">0</h1>
+ <small>在线司机</small>
+ </div>
+ <div class="ibox-content">
+ <h1 class="no-margins" id="orderDetail1">0</h1>
+ <small>专车订单数</small>
+ </div>
+ <div class="ibox-content">
+ <h1 class="no-margins" id="orderDetail2">0</h1>
+ <small>出租车订单</small>
+ </div>
+ <div class="ibox-content">
+ <h1 class="no-margins" id="orderDetail3">0</h1>
+ <small>跨城出行订单</small>
+ </div>
+ <div class="ibox-content">
+ <h1 class="no-margins" id="orderDetail4">0</h1>
+ <small>同城小件物流订单</small>
+ </div>
+ <div class="ibox-content">
+ <h1 class="no-margins" id="orderDetail5">0</h1>
+ <small>跨城小件物流订单</small>
+ </div>
+ </div>
+ </div>
+ <div class="col-sm-3">
+ <div class="ibox float-e-margins">
+ <div class="ibox-title">
+ <span class="label label-info pull-right">全部</span>
+ <h5>运营总数据</h5>
+ </div>
+ <div class="ibox-content">
+ <h1 class="no-margins" id="passengerInfoSum">0</h1>
+ <small>总用户</small>
+ </div>
+ <div class="ibox-content">
+ <h1 class="no-margins" id="netcarDriverSum">0</h1>
+ <small>总司机</small>
+ </div>
+ <div class="ibox-content">
+ <h1 class="no-margins" id="netCarSum">0</h1>
+ <small>总车辆</small>
+ </div>
+ <div class="ibox-content">
+ <h1 class="no-margins" id="orderDetailSum">0</h1>
+ <small>总订单</small>
+ </div>
+ <div class="ibox-content">
+ <h1 class="no-margins" id="paiceSum">0</h1>
+ <small>交易总金额</small>
+ </div>
+ <div class="ibox-content">
+ <h1 class="no-margins" id="paySum">0</h1>
+ <small>总收益</small>
+ </div>
+ </div>
+ </div>
+ <div class="col-sm-3">
+ <div class="ibox float-e-margins">
+ <div class="ibox-title">
+ <div class="pull-right" style="margin-top: -10px;">
+ <input type="text" class="layui-input form-control" id="rangeDate">
+ </div>
+ <h5>运营数据增长查询</h5>
+ </div>
+ <div class="ibox-content">
+ <h1 class="no-margins" id="passengerInfoSum1">0</h1>
+ <small>用户增长数</small>
+ </div>
+ <div class="ibox-content">
+ <h1 class="no-margins" id="netcarDriverSum1">0</h1>
+ <small>新增司机</small>
+ </div>
+ <div class="ibox-content">
+ <h1 class="no-margins" id="orderDetail11">0</h1>
+ <small>专车订单数</small>
+ </div>
+ <div class="ibox-content">
+ <h1 class="no-margins" id="orderDetail21">0</h1>
+ <small>出租车订单数</small>
+ </div>
+ <div class="ibox-content">
+ <h1 class="no-margins" id="orderDetail31">0</h1>
+ <small>跨城出行订单数</small>
+ </div>
+ <div class="ibox-content">
+ <h1 class="no-margins" id="orderDetail41">0</h1>
+ <small>同城小件物流订单数</small>
+ </div>
+ <div class="ibox-content">
+ <h1 class="no-margins" id="orderDetail51">0</h1>
+ <small>跨城小件物流订单数</small>
+ </div>
+ <div class="ibox-content">
+ <h1 class="no-margins" id="paiceSum1">0</h1>
+ <small>交易总金额</small>
+ </div>
+ <div class="ibox-content">
+ <h1 class="no-margins" id="paySum1">0</h1>
+ <small>总收益</small>
+ </div>
+ </div>
+ </div>
+ <div class="col-sm-3">
+ <div class="ibox float-e-margins">
+ <div class="ibox-title">
+ <span class="label label-danger pull-right">最近30天</span>
+ <h5>运营总趋势</h5>
+ </div>
+ <div class="ibox-content">
+ <h1 class="no-margins">
+ <span class="dynamicsparkline" id="orderDetailSum1">Loading..</span>
+ </h1>
+ <small>订单数趋势图</small>
+ </div>
+ <div class="ibox-content">
+ <h1 class="no-margins">
+ <span class="dynamicsparkline" id="passengerInfoSum2">Loading..</span>
+ </h1>
+ <small>用户注册趋势图</small>
+ </div>
+ <div class="ibox-content">
+ <h1 class="no-margins">
+ <span class="dynamicsparkline" id="orderDetail12">Loading..</span>
+ </h1>
+ <small>专车订单趋势图</small>
+ </div>
+ <div class="ibox-content">
+ <h1 class="no-margins">
+ <span class="dynamicsparkline" id="orderDetail22">Loading..</span>
+ </h1>
+ <small>出租车订单趋势图</small>
+ </div>
+ <div class="ibox-content">
+ <h1 class="no-margins">
+ <span class="dynamicsparkline" id="orderDetail32">Loading..</span>
+ </h1>
+ <small>跨城出行订单趋势图</small>
+ </div>
+ <div class="ibox-content">
+ <h1 class="no-margins">
+ <span class="dynamicsparkline" id="orderDetail42">Loading..</span>
+ </h1>
+ <small>同城小件物流订单趋势图</small>
+ </div>
+ <div class="ibox-content">
+ <h1 class="no-margins">
+ <span class="dynamicsparkline" id="orderDetail52">Loading..</span>
+ </h1>
+ <small>跨城小件物流订单趋势图</small>
+ </div>
+ </div>
+ </div>
+ </div>
+
+ <div class="row content" id="mapDiv">
+ <div class="form-group" style="height: 80px; padding-top: 20px; background-color: #FFFFFF;margin-bottom: 8px;">
+ <div class="col-sm-8">
+ <div class="input-group">
+ <div class="input-group-btn">
+ <button data-toggle="dropdown" class="btn btn-white dropdown-toggle"
+ type="button">选择查看范围
+ </button>
+ </div>
+ <div class="col-sm-4" style="padding-left: 0px;">
+ <select class="form-control" id="branchOffice1">
+ <option value="">----请选择----</option>
+ </select>
+ </div>
+ </div>
+ </div>
+ <div class="col-sm-2">
+ <#button name="搜索" icon="fa-search" clickFun="getData1()"/>
+ </div>
+ </div>
+ <div class="form-group">
+ <div class="col-sm-2" style="padding: 0px; height: 47em; overflow: auto">
+ <div class="form-group" style="padding: 0px 5px;">
+ <div class="col-sm-12">
+ <ul class="list-group" id="netcardriver">
+
+ </ul>
+ </div>
+ </div>
+ </div>
+ <div class="col-sm-8" style="padding: 0px;">
+ <div class="form-group" style="padding: 0px 5px;">
+ <div id="container" style="height: 47em;"></div>
+ </div>
+ </div>
+ <div class="col-sm-2" style="padding: 0px; height: 47em; overflow: auto">
+ <div class="form-group">
+ <div class="col-sm-12" style="padding: 0px 5px;">
+ <ul class="list-group" id="order">
+
+ </ul>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+
+ <div class="row content" id="orderDiv">
+ <div class="form-group" style="height: 80px; padding-top: 20px; background-color: #FFFFFF;margin-bottom: 8px;">
+ <div class="col-sm-12">
+ <div id="container_" style="height: 47em;"></div>
+ </div>
+ </div>
+ </div>
+
+ </div>
+ </div>
+</div>
+<script type="text/javascript" src="https://webapi.amap.com/maps?v=1.4.15&key=c59c0ec8058a8305009eb315584e07d1"></script>
+<script src="https://webapi.amap.com/maps?v=1.4.15&key=c59c0ec8058a8305009eb315584e07d1&plugin=AMap.MouseTool"></script>
+<script type="text/javascript" src='https://a.amap.com/jsapi_demos/static/citys.js'></script>
+<script src="${ctxPath}/static/home.js"></script>
+<script src="${ctxPath}/static/js/jquery.sparkline 2.1.2.js"></script>
+@}
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/index.html b/management/guns-admin/src/main/webapp/WEB-INF/view/index.html
new file mode 100644
index 0000000..3202f8e
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/index.html
@@ -0,0 +1,47 @@
+<!DOCTYPE html>
+<html>
+<head>
+ <meta charset="utf-8">
+ <meta name="viewport" content="width=device-width, initial-scale=1.0">
+ <meta name="renderer" content="webkit">
+ <title>OK出行 - 主页</title>
+ <link rel="shortcut icon" href="${ctxPath}/static/favicon1.ico">
+ <link href="${ctxPath}/static/css/bootstrap.min.css?v=3.3.6" rel="stylesheet">
+ <link href="${ctxPath}/static/css/font-awesome.min.css?v=4.4.0" rel="stylesheet">
+ <link href="${ctxPath}/static/css/style.css?v=4.1.0" rel="stylesheet">
+</head>
+
+<body class="fixed-sidebar full-height-layout gray-bg" style="overflow:hidden">
+ <div id="wrapper">
+
+ <!--左侧导航开始-->
+ @include("/common/_tab.html"){}
+ <!--左侧导航结束-->
+
+ <!--右侧部分开始-->
+ @include("/common/_right.html"){}
+ <!--右侧部分结束-->
+
+ <!--右侧边栏开始-->
+ @include("/common/_theme.html"){}
+ <!--右侧边栏结束-->
+
+ </div>
+
+ <!-- 全局js -->
+ <script src="${ctxPath}/static/js/jquery.min.js?v=2.1.4"></script>
+ <script src="${ctxPath}/static/js/bootstrap.min.js?v=3.3.6"></script>
+ <script src="${ctxPath}/static/js/plugins/metisMenu/jquery.metisMenu.js"></script>
+ <script src="${ctxPath}/static/js/plugins/slimscroll/jquery.slimscroll.min.js"></script>
+ <script src="${ctxPath}/static/js/plugins/layer/layer.js"></script>
+
+ <!-- 自定义js -->
+ <script src="${ctxPath}/static/js/hplus.js?v=4.1.0"></script>
+ <script type="text/javascript" src="${ctxPath}/static/js/contabs.js"></script>
+
+ <!-- 第三方插件 -->
+ <script src="${ctxPath}/static/js/plugins/pace/pace.min.js"></script>
+
+</body>
+
+</html>
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/login.html b/management/guns-admin/src/main/webapp/WEB-INF/view/login.html
new file mode 100644
index 0000000..e853409
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/login.html
@@ -0,0 +1,234 @@
+<!DOCTYPE html>
+<html>
+<head>
+ <meta charset="utf-8">
+ <meta name="viewport" content="width=device-width, initial-scale=1.0">
+
+ <title>OK出行 - 登录</title>
+
+ <link rel="shortcut icon" href="${ctxPath}/static/favicon1.ico">
+ <link href="${ctxPath}/static/css/bootstrap.min.css?v=3.3.6" rel="stylesheet">
+ <link href="${ctxPath}/static/css/font-awesome.css?v=4.4.0" rel="stylesheet">
+ <link href="${ctxPath}/static/css/style.css?v=4.1.0" rel="stylesheet">
+ <script>if (window.top !== window.self) {
+ window.top.location = window.location;
+ }</script>
+ <script src="${ctxPath}/static/js/jquery.min.js?v=2.1.4"></script>
+ <script src="${ctxPath}/static/js/bootstrap.min.js?v=3.3.6"></script>
+ <style>
+ .item{
+ display: flex;
+ align-items: center;
+ /*border: 1px solid red !important;*/
+ margin: 24px 0;
+ position: relative;
+ }
+ .item>img{
+ position: absolute;
+ left: 8px;
+ /*bottom: 50%;*/
+ }
+ .itemInput{
+ background:none;
+ outline:none;
+ border:0px;
+ border-bottom:1px solid grey ;
+ padding-left: 30px;
+ height: 34px;
+ width: 100%;
+ }
+ .itemInput[type="text"]{
+
+ background: #fff;
+ outline: none;
+ }
+
+ .itemInput:-webkit-autofill {
+ -webkit-box-shadow: 0 0 0 1000px white inset; // 背景设为白色
+ -webkit-text-fill-color: #fff; // 字体颜色
+ }
+ </style>
+</head>
+
+<body class="gray-bg" style="background:url(${ctxPath}/static/img/index1.png) no-repeat; background-size:cover;">
+
+<div style="display: flex;align-items: center;justify-content: center;height: 100%">
+
+
+<img src="${ctxPath}/static/img/index4.png" style="width: 300px;height: 400px;z-index: 1000">
+<div style="position: relative;left: -20px; max-width: 300px;min-height: 300px;background: white;border-radius: 8px;box-sizing: border-box;padding: 0 30px 0 50px;display: flex;align-items: center;justify-content: center;">
+ <div style="max-height: 100%">
+ <h3 style="color: black;"><img src="${ctxPath}/static/img/logo.png" width="30px" height="30px"/> OK出行管理后台</h3>
+ <br/>
+ <h4 style="color: red;">${tips!}</h4>
+ <form class="m-t" role="form" action="${ctxPath}/login" method="post">
+ <div class="item">
+ <img src="${ctxPath}/static/img/account.png" />
+ <input class="itemInput" type="text" name="username" id="username" placeholder="请输入您的账号" required="" value="">
+ </div>
+ <div class="item">
+ <img src="${ctxPath}/static/img/password.png" />
+ <input class="itemInput" type="password" name="password" id="password" placeholder="请输入您的密码" required="" value="">
+ </div>
+ @if(kaptcha.getKaptchaOnOff() == true){
+ <div class="form-group" style="float: left;">
+ <div class="col-sm-8" style="padding-left: 0px; padding-right: 0px;">
+ <input class="form-control" type="text" name="kaptcha" placeholder="验证码" required="">
+ </div>
+ <div class="col-sm-4" style="padding-left: 0px; padding-right: 0px;">
+ <img src="${ctxPath}/kaptcha" id="kaptcha" width="100%" height="100%"/>
+ </div>
+ </div>
+ @}
+ <div class="form-group" style="float: left;">
+ <div class="checkbox" style="text-align: left">
+ <!--<label>
+ <input type="checkbox" name="remember" style="margin-top: 2px;">记住我
+ </label>-->
+ </div>
+ </div>
+ <button onclick="login()" class="btn full-width m-b" style="background-color: #d56b29;color: black;">登 录</button>
+ <button type="submit" id="submit" style="display: none;"></button>
+ </p>
+ </form>
+ </div>
+</div></div>
+</body>
+<script src="${ctxPath}/static/js/jquery.min.js?v=2.1.4"></script>
+<script src="${ctxPath}/static/js/common/ajax-object.js"></script>
+<script src="${ctxPath}/static/js/common/Feng.js"></script>
+<script src="${ctxPath}/static/crypto-js/crypto-js.js"></script>
+<script>
+ $(function () {
+ $("#kaptcha").on('click', function () {
+ $("#kaptcha").attr('src', '${ctxPath}/kaptcha?' + Math.floor(Math.random() * 100)).fadeIn();
+ });
+ });
+ var key = CryptoJS.enc.Utf8.parse("c53fd327353a09a1");
+ var iv = CryptoJS.enc.Utf8.parse("3a0565e3b1d8ae3d");
+
+ //aes加密
+ function encrypt(context) {
+ var encrypted = '';
+ if (typeof(context) == 'string') {
+
+ }else if(typeof(context) == 'object'){
+ context = JSON.stringify(context);
+ }
+ var srcs = CryptoJS.enc.Utf8.parse(context);
+ encrypted = CryptoJS.AES.encrypt(srcs, key, {
+ iv: iv,
+ mode: CryptoJS.mode.CBC,
+ padding: CryptoJS.pad.Pkcs7
+ });
+ return encrypted.toString();
+ }
+ // aes解密
+ function decrypt(context) {
+ var decrypt = CryptoJS.AES.decrypt(context, key, {
+ iv: iv,
+ mode: CryptoJS.mode.CBC,
+ padding: CryptoJS.pad.Pkcs7
+ });
+ var decryptedStr = decrypt.toString(CryptoJS.enc.Utf8);
+ return decryptedStr.toString();
+ }
+ function login(){
+ let password = $('#password').val();
+ password = encrypt(password);
+ $('#password').val(password);
+ $('#submit').submit();
+ }
+
+
+ window.addEventListener(
+ "mousewheel",
+ function(event) {
+ if (event.ctrlKey === true || event.metaKey) {
+ event.preventDefault();
+ }
+ },
+ { passive: false }
+ );
+
+ //firefox
+ window.addEventListener(
+ "DOMMouseScroll",
+ function(event) {
+ if (event.ctrlKey === true || event.metaKey) {
+ event.preventDefault();
+ }
+ },
+ { passive: false }
+ );
+
+
+ function fontSize(designWidth, maxWidth, minWidth) {
+ var doc = document,
+ win = window,
+ docEl = doc.documentElement,
+ remStyle = document.createElement("style"),
+ tid;
+
+ function refreshRem() {
+ var width = docEl.getBoundingClientRect().width;
+ maxWidth = maxWidth || 540;
+ width > maxWidth && (width = maxWidth);
+ var rem = (width * 100) / designWidth;
+ remStyle.innerHTML = "html{font-size:" + rem + "px;}";
+ }
+
+ if (docEl.firstElementChild) {
+ docEl.firstElementChild.appendChild(remStyle);
+ } else {
+ var wrap = doc.createElement("div");
+ wrap.appendChild(remStyle);
+ doc.write(wrap.innerHTML);
+ wrap = null;
+ }
+ // 要等 wiewport 设置好后才能执行 refreshRem，不然 refreshRem 会执行2次；
+ refreshRem();
+
+ win.addEventListener(
+ "resize",
+ function(res) {
+ // console.log(res);
+ if (minWidth < res.currentTarget.innerWidth) {
+ clearTimeout(tid); //防止执行两次
+ return;
+ }
+
+ tid = setTimeout(refreshRem, 10);
+ },
+ false
+ );
+
+ win.addEventListener(
+ "pageshow",
+ function(e) {
+ if (e.persisted) {
+ // 浏览器后退的时候重新计算
+ clearTimeout(tid);
+ tid = setTimeout(refreshRem, 300);
+ }
+ },
+ false
+ );
+
+ if (doc.readyState === "complete") {
+ doc.body.style.fontSize = "16px";
+ } else {
+ doc.addEventListener(
+ "DOMContentLoaded",
+ function(e) {
+ doc.body.style.fontSize = "16px";
+ },
+ false
+ );
+ }
+ }
+ fontSize(768, 1920);
+</script>
+</body>
+
+</html>
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/netCarInfo.html b/management/guns-admin/src/main/webapp/WEB-INF/view/netCarInfo.html
new file mode 100644
index 0000000..76a4e05
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/netCarInfo.html
@@ -0,0 +1,25 @@
+@layout("/common/_container.html"){
+<style type="text/css">
+ tr{
+ height: 40px;
+ }
+ td{
+ width: 200px;
+ }
+ h4{
+ color: #1AB394;
+ }
+ img{
+ height: 80px;
+ }
+</style>
+<div class="ibox float-e-margins">
+ <div class="ibox-content">
+ <input type="hidden" id="driverId" value="${id}">
+ <div class="form-horizontal" id="content">
+
+ </div>
+ </div>
+</div>
+<script src="${ctxPath}/static/netCarInfo.js"></script>
+@}
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/code/code.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/code/code.html
new file mode 100644
index 0000000..cacd239
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/code/code.html
@@ -0,0 +1,47 @@
+@layout("/common/_container.html"){
+<div class="row">
+ <div class="col-sm-6 col-sm-offset-3">
+ <div class="ibox float-e-margins">
+ <div class="ibox-title">
+ <h5>代码生成</h5>
+ </div>
+ <div class="ibox-content">
+ <div class="form-horizontal">
+ <div class="form-group">
+ <label class="col-sm-2 control-label">模块英文名称</label>
+ <div class="col-sm-10">
+ <input type="text" class="form-control" id="moduleName"> <span class="help-block m-b-none">例如:system</span>
+ </div>
+ </div>
+ <div class="form-group">
+ <label class="col-sm-2 control-label">业务名称</label>
+ <div class="col-sm-10">
+ <input type="text" class="form-control" id="bizChName"> <span class="help-block m-b-none">例如:测试</span>
+ </div>
+ </div>
+ <div class="hr-line-dashed"></div>
+ <div class="form-group">
+ <label class="col-sm-2 control-label">业务英文名称</label>
+ <div class="col-sm-10">
+ <input type="text" class="form-control" id="bizEnName"> <span class="help-block m-b-none">例如:test</span>
+ </div>
+ </div>
+ <div class="hr-line-dashed"></div>
+ <div class="form-group">
+ <label class="col-sm-2 control-label">输出路径</label>
+ <div class="col-sm-10">
+ <input type="text" class="form-control" id="path"> <span class="help-block m-b-none">默认路径为D:\ideaSpace\guns,可修改为您的项目的路径</span>
+ </div>
+ </div>
+ <div class="form-group">
+ <div class="col-sm-4 col-sm-offset-2">
+ <button class="btn btn-primary" onclick="Code.generate()">代码生成</button>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/code/code.js"></script>
+@}
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/dept/dept.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/dept/dept.html
new file mode 100644
index 0000000..a0570a2
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/dept/dept.html
@@ -0,0 +1,38 @@
+@layout("/common/_container.html"){
+<div class="row">
+ <div class="col-sm-12">
+ <div class="ibox float-e-margins">
+ <div class="ibox-title">
+ <h5>部门管理</h5>
+ </div>
+ <div class="ibox-content">
+ <div class="row row-lg">
+ <div class="col-sm-12">
+ <div class="row">
+ <div class="col-sm-3">
+ <#NameCon id="condition" name="名称" />
+ </div>
+ <div class="col-sm-3">
+ <#button name="搜索" icon="fa-search" clickFun="Dept.search()"/>
+ </div>
+ </div>
+ <div class="hidden-xs" id="DeptTableToolbar" role="group">
+ @if(shiro.hasPermission("/dept/add")){
+ <#button name="添加" icon="fa-plus" clickFun="Dept.openAddDept()"/>
+ @}
+ @if(shiro.hasPermission("/dept/update")){
+ <#button name="修改" icon="fa-plus" clickFun="Dept.openDeptDetail()" space="true"/>
+ @}
+ @if(shiro.hasPermission("/dept/delete")){
+ <#button name="删除" icon="fa-plus" clickFun="Dept.delete()" space="true"/>
+ @}
+ </div>
+ <#table id="DeptTable"/>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/dept/dept.js"></script>
+@}
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/dept/dept_add.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/dept/dept_add.html
new file mode 100644
index 0000000..2be4b89
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/dept/dept_add.html
@@ -0,0 +1,42 @@
+@layout("/common/_container.html"){
+<div class="ibox float-e-margins">
+ <div class="ibox-content">
+ <div class="form-horizontal" id="deptInfoForm">
+
+ <input type="hidden" id="id" value="">
+
+ <div class="row">
+ <div class="col-sm-6 b-r">
+ <#input id="simplename" name="部门名称" underline="true"/>
+
+ <#input id="fullname" name="部门全称" underline="true"/>
+
+ <#input id="tips" name="备注" underline="true"/>
+ </div>
+ <div class="col-sm-6">
+ <#input id="num" name="排序" underline="true"/>
+
+ <#input id="pName" name="上级部门" readonly="readonly" hidden="pid"
+ clickFun="DeptInfoDlg.showDeptSelectTree(); return false;"
+ style="background-color: #ffffff !important;"/>
+ </div>
+ </div>
+
+ <!-- 父级部门的选择框 -->
+ <div id="parentDeptMenu" class="menuContent"
+ style="display: none; position: absolute; z-index: 200;">
+ <ul id="parentDeptMenuTree" class="ztree tree-box" style="width: 245px !important;"></ul>
+ </div>
+
+ <div class="row btn-group-m-t">
+ <div class="col-sm-10 col-sm-offset-5">
+ <#button btnCss="info" name="提交" id="ensure" icon="fa-check" clickFun="DeptInfoDlg.addSubmit()"/>
+ <#button btnCss="danger" name="取消" id="cancel" icon="fa-eraser" clickFun="DeptInfoDlg.close()"/>
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/dept/dept_info.js"></script>
+@}
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/dept/dept_edit.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/dept/dept_edit.html
new file mode 100644
index 0000000..c805552
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/dept/dept_edit.html
@@ -0,0 +1,44 @@
+@layout("/common/_container.html"){
+<div class="ibox float-e-margins">
+ <div class="ibox-content">
+ <div class="form-horizontal" id="deptInfoForm">
+
+ <input type="hidden" id="id" value="${dept.id}">
+ <input type="hidden" id="pid" value="${dept.pid}">
+
+ <div class="row">
+ <div class="col-sm-6 b-r">
+ <#input id="simplename" name="部门名称" underline="true" value="${dept.simplename}"/>
+
+ <#input id="fullname" name="部门全称" underline="true" value="${dept.fullname}"/>
+
+ <#input id="tips" name="备注" underline="true" value="${dept.tips}"/>
+ </div>
+ <div class="col-sm-6">
+ <#input id="num" name="排序" underline="true" value="${dept.num}"/>
+
+ <#input id="pName" name="上级部门" readonly="readonly" hidden="pid"
+ hiddenValue="${dept.pid}" value="${pName}"
+ clickFun="DeptInfoDlg.showDeptSelectTree(); return false;"
+ style="background-color: #ffffff !important;"/>
+ </div>
+ </div>
+
+ <!-- 父级部门的选择框 -->
+ <div id="parentDeptMenu" class="menuContent"
+ style="display: none; position: absolute; z-index: 200;">
+ <ul id="parentDeptMenuTree" class="ztree tree-box" style="width: 245px !important;"></ul>
+ </div>
+
+ <div class="row btn-group-m-t">
+ <div class="col-sm-10 col-sm-offset-5">
+ <#button btnCss="info" name="提交" id="ensure" icon="fa-check" clickFun="DeptInfoDlg.editSubmit()"/>
+ <#button btnCss="danger" name="取消" id="cancel" icon="fa-eraser" clickFun="DeptInfoDlg.close()"/>
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/dept/dept_info.js"></script>
+@}
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/dict/dict.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/dict/dict.html
new file mode 100644
index 0000000..2bf81ee
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/dict/dict.html
@@ -0,0 +1,38 @@
+@layout("/common/_container.html"){
+<div class="row">
+ <div class="col-sm-12">
+ <div class="ibox float-e-margins">
+ <div class="ibox-title">
+ <h5>字典管理</h5>
+ </div>
+ <div class="ibox-content">
+ <div class="row row-lg">
+ <div class="col-sm-12">
+ <div class="row">
+ <div class="col-sm-3">
+ <#NameCon id="condition" name="名称" />
+ </div>
+ <div class="col-sm-3">
+ <#button name="搜索" icon="fa-search" clickFun="Dict.search()"/>
+ </div>
+ </div>
+ <div class="hidden-xs" id="DictTableToolbar" role="group">
+ @if(shiro.hasPermission("/dict/add")){
+ <#button name="添加" icon="fa-plus" clickFun="Dict.openAddDict()"/>
+ @}
+ @if(shiro.hasPermission("/dict/update")){
+ <#button name="修改" icon="fa-plus" clickFun="Dict.openDictDetail()" space="true"/>
+ @}
+ @if(shiro.hasPermission("/dict/delete")){
+ <#button name="删除" icon="fa-plus" clickFun="Dict.delete()" space="true"/>
+ @}
+ </div>
+ <#table id="DictTable"/>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/dict/dict.js"></script>
+@}
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/dict/dict_add.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/dict/dict_add.html
new file mode 100644
index 0000000..f3d51f3
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/dict/dict_add.html
@@ -0,0 +1,64 @@
+@layout("/common/_container.html"){
+<div class="ibox float-e-margins">
+ <div class="ibox-content">
+ <div class="form-horizontal">
+
+ <input type="hidden" id="id" value="">
+
+ <div class="row">
+ <div class="col-sm-12" id="itemsArea">
+ <div class="form-group">
+ <label class="col-sm-2 control-label">类型编码</label>
+ <div class="col-sm-2">
+ <input class="form-control" id="dictCode" type="text">
+ </div>
+ <label class="col-sm-2 control-label">类型名称</label>
+ <div class="col-sm-2">
+ <input class="form-control" id="dictName" type="text">
+ </div>
+
+ <div class="col-sm-2">
+ <#button btnCss="info" name="增加" icon="fa-plus" clickFun="DictInfoDlg.addItem()"/>
+ </div>
+ </div>
+ <div class="form-group">
+ <label class="col-sm-2 control-label">备注</label>
+ <div class="col-sm-8">
+ <input class="form-control" id="dictTips" type="text">
+ </div>
+ </div>
+ <div class="hr-line-dashed"></div>
+
+ </div>
+ </div>
+ <div class="row btn-group-m-t">
+ <div class="col-sm-10 col-sm-offset-5">
+ <#button btnCss="info" name="提交" id="ensure" icon="fa-check" clickFun="DictInfoDlg.addSubmit()"/>
+ <#button btnCss="danger" name="取消" id="cancel" icon="fa-eraser" clickFun="DictInfoDlg.close()"/>
+ </div>
+ </div>
+ </div>
+ </div>
+
+ <script type="text/template" id="itemTemplate">
+ <div class="form-group" name="dictItem" id="dictItem">
+ <label class="col-sm-1 control-label">值</label>
+ <div class="col-sm-2">
+ <input class="form-control" type="text" name="itemCode">
+ </div>
+ <label class="col-sm-1 control-label" >名称</label>
+ <div class="col-sm-2">
+ <input class="form-control" type="text" name="itemName">
+ </div>
+ <label class="col-sm-1 control-label" >序号</label>
+ <div class="col-sm-2">
+ <input class="form-control" type="text" name="itemNum">
+ </div>
+ <div class="col-sm-2">
+ <#button btnCss="danger" name="删除" id="cancel" icon="fa-remove" clickFun="DictInfoDlg.deleteItem(event)"/>
+ </div>
+ </div>
+ </script>
+
+ <script src="${ctxPath}/static/modular/system/dict/dict_info.js"></script>
+ @}
\ No newline at end of file
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/dict/dict_edit.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/dict/dict_edit.html
new file mode 100644
index 0000000..84027c5
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/dict/dict_edit.html
@@ -0,0 +1,86 @@
+@layout("/common/_container.html"){
+<div class="ibox float-e-margins">
+ <div class="ibox-content">
+ <div class="form-horizontal">
+
+ <input type="hidden" id="id" value="">
+
+ <div class="row">
+ <div class="col-sm-12" id="itemsArea">
+ <input type="hidden" id="itemSize" value="${subDicts.~size!0}" />
+ <div class="form-group">
+
+ <label class="col-sm-2 control-label">类型编码</label>
+ <div class="col-sm-2">
+ <input class="form-control" id="dictCode" type="text" value="${dict.code}">
+ </div>
+
+ <label class="col-sm-2 control-label">类型名称</label>
+ <div class="col-sm-2">
+ <input class="form-control" id="dictName" type="text" value="${dict.name}">
+ <input type="hidden" id="dictId" value="${dict.id}">
+ </div>
+
+ <div class="col-sm-2">
+ <#button btnCss="info" name="增加" icon="fa-plus" clickFun="DictInfoDlg.addItem()"/>
+ </div>
+ </div>
+ <div class="form-group">
+ <label class="col-sm-2 control-label">备注</label>
+ <div class="col-sm-8">
+ <input class="form-control" id="dictTips" type="text" value="${dict.tips}">
+ </div>
+ </div>
+ <div class="hr-line-dashed"></div>
+ @for(item in subDicts){
+ <div class="form-group" name="dictItem" id="dictItem${itemLP.index}">
+ <label class="col-sm-1 control-label">值</label>
+ <div class="col-sm-2">
+ <input class="form-control" type="text" name="itemCode" value="${item.code}">
+ </div>
+ <label class="col-sm-1 control-label" >名称</label>
+ <div class="col-sm-2">
+ <input class="form-control" type="text" name="itemName" value="${item.name}">
+ </div>
+ <label class="col-sm-1 control-label" >序号</label>
+ <div class="col-sm-2">
+ <input class="form-control" type="text" name="itemNum" value="${item.num}">
+ </div>
+ <div class="col-sm-2">
+ <#button btnCss="danger" name="删除" id="cancel" icon="fa-remove" clickFun="DictInfoDlg.deleteItem(event)"/>
+ </div>
+ </div>
+ @}
+ </input>
+ </div>
+ <div class="row btn-group-m-t">
+ <div class="col-sm-10 col-sm-offset-5">
+ <#button btnCss="info" name="提交" id="ensure" icon="fa-check" clickFun="DictInfoDlg.editSubmit()"/>
+ <#button btnCss="danger" name="取消" id="cancel" icon="fa-eraser" clickFun="DictInfoDlg.close()"/>
+ </div>
+ </div>
+ </div>
+ </div>
+
+ <script type="text/template" id="itemTemplate">
+ <div class="form-group" name="dictItem" id="dictItem">
+ <label class="col-sm-1 control-label">值</label>
+ <div class="col-sm-2">
+ <input class="form-control" type="text" name="itemCode">
+ </div>
+ <label class="col-sm-1 control-label" >名称</label>
+ <div class="col-sm-2">
+ <input class="form-control" type="text" name="itemName">
+ </div>
+ <label class="col-sm-1 control-label" >序号</label>
+ <div class="col-sm-2">
+ <input class="form-control" type="text" name="itemNum">
+ </div>
+ <div class="col-sm-2">
+ <#button btnCss="danger" name="删除" id="cancel" icon="fa-remove" clickFun="DictInfoDlg.deleteItem(event)"/>
+ </div>
+ </div>
+ </script>
+
+ <script src="${ctxPath}/static/modular/system/dict/dict_info.js"></script>
+ @}
\ No newline at end of file
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/driverActivity/driverActivity.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/driverActivity/driverActivity.html
new file mode 100644
index 0000000..5707610
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/driverActivity/driverActivity.html
@@ -0,0 +1,57 @@
+@layout("/common/_container.html"){
+<div class="row">
+ <div class="col-sm-12">
+ <div class="ibox float-e-margins">
+ <div class="ibox-title">
+ <h5>管理</h5>
+ </div>
+ <div class="ibox-content">
+ <div class="row row-lg">
+ <div class="col-sm-12">
+ <div class="row">
+ <div class="col-sm-3">
+ <#TimeCon id="createTime" name="添加时间" isTime="false"/>
+ </div>
+ <div class="col-sm-3">
+ <#NameCon id="name" name="名称" />
+ </div>
+ <div class="col-sm-3">
+ <#button name="搜索" icon="fa-search" clickFun="DriverActivity.search()"/>
+ <#button name="重置" icon="fa-trash" clickFun="DriverActivity.resetSearch()" space="true"/>
+ </div>
+ </div>
+ <div class="hidden-xs" id="DriverActivityTableToolbar" role="group">
+ @if(shiro.hasPermission("/driverActivity/add")){
+ <#button name="添加" icon="fa-plus" clickFun="DriverActivity.openAddDriverActivity()"/>
+ @}
+ @if(shiro.hasPermission("/driverActivity/update")){
+ <#button name="编辑" icon="fa-edit" clickFun="DriverActivity.openUpdateDriverActivity()" space="true"/>
+ @}
+ @if(shiro.hasPermission("/driverActivity/updateStatus")){
+ <#button name="启动/暂停" icon="" clickFun="DriverActivity.updateStatus()" space="true"/>
+ @}
+ @if(shiro.hasPermission("/driverActivity/detail")){
+ <#button name="详情" icon="" clickFun="DriverActivity.openDriverActivityDetail()" space="true"/>
+ @}
+ @if(shiro.hasPermission("/driverActivity/receiveRecord")){
+ <#button name="领取记录" icon="" clickFun="DriverActivity.receiveRecord()" space="true"/>
+ @}
+ @if(shiro.hasPermission("/driverActivity/immediately")){
+ <#button name="审核" icon="" clickFun="DriverActivity.immediately()" space="true"/>
+ @}
+ </div>
+ <#table id="DriverActivityTable"/>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/driverActivity/driverActivity.js"></script>
+<script>
+ laydate.render({
+ elem: '#createTime'
+ ,range: true
+ });
+</script>
+@}
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/driverActivity/driverActivity_add.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/driverActivity/driverActivity_add.html
new file mode 100644
index 0000000..0350c90
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/driverActivity/driverActivity_add.html
@@ -0,0 +1,85 @@
+@layout("/common/_container.html"){
+<style>
+ .newWidth, .single-line{
+ max-width:150px !important;display: initial !important;
+ }
+</style>
+<div class="ibox float-e-margins">
+ <div class="ibox-content">
+ <div class="form-horizontal">
+
+ <div class="row">
+ <div class="col-sm-11">
+ <div class="form-group">
+ <div class="col-sm-10">
+ 活动名称： <input type="text" name="zc1" id="num1" class="form-control newWidth" />
+ <br/>
+ <br/>
+ 司机邀请司机注册
+ <br/>
+ <br/>
+
+ 司机注册既赠送 <input type="text" id="num2" class="form-control newWidth" /> 元
+ <br/>
+ <br/>
+ 司机邀请用户注册
+ <br/>
+ <br/>
+ 用户注册既赠送 <input type="text" id="num3" class="form-control newWidth" /> 元
+ <br/>
+ <br/>
+ 司机APP每天累计在线奖励
+ <br/>
+ <br/>
+ 专车累计在线 <input type="text" id="num4" class="form-control newWidth" /> 小时奖励
+ <input type="text" id="num5" class="form-control newWidth" /> 元
+ <br/>
+ <br/>
+ 出租车累计在线 <input type="text" id="num6" class="form-control newWidth" /> 小时奖励
+ <input type="text" id="num7" class="form-control newWidth" /> 元
+ <br/>
+ <br/>
+ 跨城出行累计在线 <input type="text" id="num8" class="form-control newWidth" /> 小时奖励
+ <input type="text" id="num9" class="form-control newWidth" /> 元
+ <br/>
+ <br/>
+ 司机累计达到规定订单数奖励
+ <br/>
+ <br/>
+ 每天 <input type="text" id="staTime" class="form-control newWidth" /> 司机接单达到
+ <input type="text" id="num10" class="form-control newWidth" /> 单既奖励
+ <input type="text" id="num11" class="form-control newWidth" /> 元
+ <br/>
+ <br/>
+ 有效期为 <input type="text" id="startTime" name="zc7" class="form-control" style="max-width:300px !important;display: initial !important;" />
+ </div>
+ </div>
+ </div>
+ </div>
+
+ <div class="row btn-group-m-t">
+ <div class="col-sm-10">
+ <#button btnCss="info" name="提交" id="ensure" icon="fa-check" clickFun="DriverActivityInfoDlg.addSubmit()"/>
+ <#button btnCss="danger" name="取消" id="cancel" icon="fa-eraser" clickFun="DriverActivityInfoDlg.close()"/>
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/driverActivity/driverActivity_info.js"></script>
+<script>
+ laydate.render({
+ elem: '#startTime'
+ ,type: 'datetime'
+ ,range: true
+ ,min: 'new Date()' //最小值今天
+ });
+ laydate.render({
+ elem: '#staTime',
+ range: true,
+ type:'time',
+ format: 'HH:mm'
+ });
+</script>
+@}
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/driverActivity/driverActivity_detail.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/driverActivity/driverActivity_detail.html
new file mode 100644
index 0000000..d23f29f
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/driverActivity/driverActivity_detail.html
@@ -0,0 +1,132 @@
+@layout("/common/_container.html"){
+<style>
+ .newWidth, .single-line{
+ max-width:150px !important;display: initial !important;
+ }
+</style>
+<div class="ibox float-e-margins">
+ <div class="ibox-content">
+ <div class="form-horizontal">
+
+ <div class="row">
+ <div class="col-sm-11">
+ <div class="form-group">
+ <div class="col-sm-10">
+ 活动名称： <input type="text" value="${item.name}" name="zc1" id="zc1" class="form-control newWidth" readonly />
+ <br/>
+ <br/>
+ 司机邀请司机注册
+ <br/>
+ <br/>
+
+ 司机注册既赠送 <input type="text" @if(isNotEmpty(regist1)){
+ value="${regist1.money}"
+ @}else{
+ value=""
+ @}
+ name="zc7" class="form-control newWidth" readonly/> 元
+ <br/>
+ <br/>
+ 司机邀请用户注册
+ <br/>
+ <br/>
+ 用户注册既赠送 <input type="text" @if(isNotEmpty(regist2)){
+ value="${regist2.money}"
+ @}else{
+ value=""
+ @}
+ name="zc7" class="form-control newWidth" readonly/> 元
+ <br/>
+ <br/>
+ 司机APP每天累计在线奖励
+ <br/>
+ <br/>
+ 专车累计在线 <input type="text" @if(isNotEmpty(online1)){
+ value="${online1.online}"
+ @}else{
+ value=""
+ @}
+ name="zc7" class="form-control newWidth" readonly/> 小时奖励
+ <input type="text" @if(isNotEmpty(online1)){
+ value="${online1.money}"
+ @}else{
+ value=""
+ @}
+ name="zc7" class="form-control newWidth" readonly/> 元
+ <br/>
+ <br/>
+ 出租车累计在线 <input type="text" @if(isNotEmpty(online2)){
+ value="${online2.online}"
+ @}else{
+ value=""
+ @}
+ name="zc7" class="form-control newWidth" readonly/> 小时奖励
+ <input type="text" @if(isNotEmpty(online2)){
+ value="${online2.money}"
+ @}else{
+ value=""
+ @}
+ name="zc7" class="form-control newWidth" readonly/> 元
+ <br/>
+ <br/>
+ 跨城出行累计在线 <input type="text" @if(isNotEmpty(online3)){
+ value="${online3.online}"
+ @}else{
+ value=""
+ @}
+ name="zc7" class="form-control newWidth" readonly/> 小时奖励
+ <input type="text" @if(isNotEmpty(online3)){
+ value="${online3.money}"
+ @}else{
+ value=""
+ @}
+ name="zc7" class="form-control newWidth" readonly/> 元
+ <br/>
+ <br/>
+ 司机累计达到规定订单数奖励
+ <br/>
+ <br/>
+ 每天 <input type="text" @if(isNotEmpty(order)){
+ value="${order.start}"
+ @}else{
+ value=""
+ @}
+ name="zc7" class="form-control newWidth" readonly/>-
+ <input type="text" @if(isNotEmpty(order)){
+ value="${order.end}"
+ @}else{
+ value=""
+ @}
+ name="zc7" class="form-control newWidth" readonly/> 司机接单达到
+ <input type="text" @if(isNotEmpty(order)){
+ value="${order.orderNum}"
+ @}else{
+ value=""
+ @}
+ name="zc7" class="form-control newWidth" readonly/> 单既奖励
+ <input type="text" @if(isNotEmpty(order)){
+ value="${order.money}"
+ @}else{
+ value=""
+ @}
+ name="zc7" class="form-control newWidth" readonly/> 元
+ <br/>
+ <br/>
+ 有效期为 <input type="text" value="${startTime}" name="zc7" class="form-control newWidth" readonly/>-
+ <input type="text" value="${endTime}" name="zc7" class="form-control newWidth" readonly/>
+ </div>
+ </div>
+ </div>
+ </div>
+
+ <div class="row btn-group-m-t">
+ <div class="col-sm-10">
+ <#button btnCss="danger" name="关闭" id="cancel" icon="fa-eraser" clickFun="DriverActivityInfoDlg.close()"/>
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/driverActivity/driverActivity_info.js"></script>
+@}
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/driverActivity/driverActivity_edit.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/driverActivity/driverActivity_edit.html
new file mode 100644
index 0000000..eaad672
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/driverActivity/driverActivity_edit.html
@@ -0,0 +1,138 @@
+@layout("/common/_container.html"){
+<style>
+ .newWidth, .single-line{
+ max-width:150px !important;display: initial !important;
+ }
+</style>
+<div class="ibox float-e-margins">
+ <div class="ibox-content">
+ <div class="form-horizontal">
+
+ <div class="row">
+ <div class="col-sm-11">
+ <div class="form-group">
+ <input type="hidden" id="id" value="${item.id}">
+ <div class="col-sm-10">
+ 活动名称： <input type="text" value="${item.name}" name="zc1" id="num1" class="form-control newWidth" />
+ <br/>
+ <br/>
+ 司机邀请司机注册
+ <br/>
+ <br/>
+
+ 司机注册既赠送 <input type="text" @if(isNotEmpty(regist1)){
+ value="${regist1.money}"
+ @}else{
+ value=""
+ @}
+ name="zc7" id="num2" class="form-control newWidth"/> 元
+ <br/>
+ <br/>
+ 司机邀请用户注册
+ <br/>
+ <br/>
+ 用户注册既赠送 <input type="text" @if(isNotEmpty(regist2)){
+ value="${regist2.money}"
+ @}else{
+ value=""
+ @}
+ name="zc7" id="num3" class="form-control newWidth"/> 元
+ <br/>
+ <br/>
+ 司机APP每天累计在线奖励
+ <br/>
+ <br/>
+ 专车累计在线 <input type="text" @if(isNotEmpty(online1)){
+ value="${online1.online}"
+ @}else{
+ value=""
+ @}
+ name="zc7" id="num4" class="form-control newWidth"/> 小时奖励
+ <input type="text" @if(isNotEmpty(online1)){
+ value="${online1.money}"
+ @}else{
+ value=""
+ @}
+ name="zc7" id="num5" class="form-control newWidth"/> 元
+ <br/>
+ <br/>
+ 出租车累计在线 <input type="text" @if(isNotEmpty(online2)){
+ value="${online2.online}"
+ @}else{
+ value=""
+ @}
+ name="zc7" id="num6" class="form-control newWidth"/> 小时奖励
+ <input type="text" @if(isNotEmpty(online2)){
+ value="${online2.money}"
+ @}else{
+ value=""
+ @}
+ name="zc7" id="num7" class="form-control newWidth"/> 元
+ <br/>
+ <br/>
+ 跨城出行累计在线 <input type="text" @if(isNotEmpty(online3)){
+ value="${online3.online}"
+ @}else{
+ value=""
+ @}
+ name="zc7" id="num8" class="form-control newWidth"/> 小时奖励
+ <input type="text" @if(isNotEmpty(online3)){
+ value="${online3.money}"
+ @}else{
+ value=""
+ @}
+ name="zc7" id="num9" class="form-control newWidth"/> 元
+ <br/>
+ <br/>
+ 司机累计达到规定订单数奖励
+ <br/>
+ <br/>
+ 每天 <input type="text" id="staTime" class="form-control newWidth" /> 司机接单达到
+ <input type="text" @if(isNotEmpty(order)){
+ value="${order.orderNum}"
+ @}else{
+ value=""
+ @}
+ name="zc7" id="num10" class="form-control newWidth"/> 单既奖励
+ <input type="text" @if(isNotEmpty(order)){
+ value="${order.money}"
+ @}else{
+ value=""
+ @}
+ name="zc7" id="num11" class="form-control newWidth"/> 元
+ <br/>
+ <br/>
+ 有效期为 <input type="text" id="startTime" name="zc7" class="form-control" style="max-width:300px !important;display: initial !important;" />
+ </div>
+ </div>
+ </div>
+ </div>
+
+ <div class="row btn-group-m-t">
+ <div class="col-sm-10">
+ <#button btnCss="info" name="提交" id="ensure" icon="fa-check" clickFun="DriverActivityInfoDlg.editSubmit()"/>
+ <#button btnCss="danger" name="取消" id="cancel" icon="fa-eraser" clickFun="DriverActivityInfoDlg.close()"/>
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/driverActivity/driverActivity_info.js"></script>
+<script>
+ laydate.render({
+ elem: '#startTime'
+ ,type: 'datetime'
+ ,range: true
+ ,min: 'new Date()' //最小值今天
+ });
+ laydate.render({
+ elem: '#staTime'
+ ,range: true,
+ type:'time',
+ format: 'HH:mm'
+ });
+ $("#startTime").val("${startTime} - ${endTime}")
+ $("#staTime").val("${startTime1}")
+</script>
+@}
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/driverActivity/driverActivity_immediately.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/driverActivity/driverActivity_immediately.html
new file mode 100644
index 0000000..80af27d
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/driverActivity/driverActivity_immediately.html
@@ -0,0 +1,41 @@
+@layout("/common/_container.html"){
+<div class="ibox float-e-margins">
+ <div class="ibox-content">
+ <div class="form-horizontal" id="sysCouponActivityInfoForm">
+ <input type="hidden" id="id" name="id" value="${id}">
+ <div class="row">
+ <div class="col-sm-10">
+ <div class="form-group">
+ <label class="col-sm-3 control-label">处理意见：</label>
+ <div class="col-sm-9" style="display: flex;align-items: center;">
+ <div class="radio radio-info radio-inline">
+ <input type="radio" id="state2" value="3" name="state" checked="" >
+ <label for="state2"> 同意 </label>
+ </div>
+ <div class="radio radio-success radio-inline">
+ <input type="radio" id="state3" value="2" name="state" >
+ <label for="state3"> 拒绝 </label>
+ </div>
+ </div>
+ </div>
+ <div class="form-group">
+ <label class="col-sm-3 control-label">填写备注：</label>
+ <div class="col-sm-9">
+ <textarea type="text/plain" class="form-control" name="remark" id="remark" style="width:100%;height:150px;"></textarea>
+ </div>
+ </div>
+ </div>
+ </div>
+
+ <div class="row btn-group-m-t">
+ <div class="col-sm-10 col-sm-offset-5">
+ <#button btnCss="info" name="提交" id="ensure" icon="fa-check" clickFun="DriverActivityInfoDlg.immediately()"/>
+ <#button btnCss="danger" name="取消" id="cancel" icon="fa-eraser" clickFun="DriverActivityInfoDlg.close()"/>
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/driverActivity/driverActivity_info.js"></script>
+@}
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/driverActivity/receiveRecord.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/driverActivity/receiveRecord.html
new file mode 100644
index 0000000..823247d
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/driverActivity/receiveRecord.html
@@ -0,0 +1,226 @@
+@layout("/common/_container.html"){
+<style type="text/css">
+
+ ztree li span. {
+ margin-left: 4px;
+ margin-right: -1px;
+ background-position: -144px 0;
+ vertical-align: top;
+ *vertical-align: middle
+ }
+
+ .titleDiv {
+ overflow: hidden;
+ }
+
+ .titleItem {
+ float: left;
+ text-align: center;
+ width: 180px;
+ line-height: 40px;
+ border-top: 1px solid #E7EBEE;
+ border-bottom: 1px solid #E7EBEE;
+ border-left: 1px solid #E7EBEE;
+ font-size: 16px;
+ }
+
+ .titleItem1 {
+ float: left;
+ text-align: center;
+ width: 180px;
+ line-height: 40px;
+ border-bottom: 1px solid #E7EBEE;
+ border-left: 1px solid #E7EBEE;
+ font-size: 16px;
+ }
+
+ .titleItemCk {
+ color: #fff !important;
+ background: #1AB395 !important;
+ }
+
+ .titleItem:last-child {
+ border-right: 1px solid #E7EBEE;
+ }
+
+ /* 订单分析 */
+ ul {
+ list-style-type: none;
+ }
+
+ .orderFenxiBox {
+ width: 100%;
+ display: flex;
+ align-items: center;
+ background-color: white;
+ }
+
+ .orderFenxiItem {
+ flex: 1;
+ padding: 20px 0;
+ }
+
+ .orderFenxiItem:last-child .orderFenxiItem_number {
+ border-right: 0 none;
+ }
+
+ .orderFenxiItem_number {
+ width: 80%;
+ height: 80%;
+ line-height: 90px;
+ padding: 20px 0;
+ font-size: 32px;
+ color: #1AB394;
+ text-align: center;
+ border-right: 1px solid #eaeaea;
+ }
+
+ .orderFenxiItem_title, .orderFenxiItem_last {
+ line-height: 40px;
+ font-size: 14px;
+ }
+</style>
+
+<div class="row" style="margin-left: 2%;">
+ <div class="col-sm-3">
+ <input id="activityId" value="${activityId}" type="hidden">
+ <div class="ibox float-e-margins">
+ <div class="ibox-title">
+ <h3>活动时间：<input type="text" id="startTime" name="zc7" class="form-control" style="max-width:250px !important;display: initial !important;" onchange="receiveRecordDetail()"/></h3>
+ </div>
+ <div class="ibox-title">
+ <h3>领取总金额<span id="totalMOney"></span></h3>
+ </div>
+ </div>
+ </div>
+</div>
+
+
+<div class="row" style="margin-left: 2%;">
+ <div class="col-sm-3">
+ <div class="ibox float-e-margins">
+ <div class="ibox-title">
+ <h3>邀请司机注册</h3>
+ </div>
+ <div class="ibox-content">
+ <h1 class="no-margins text-navy">领取人数：<span id="number1"></span></h1>
+ <h1 class="no-margins text-navy">领取金额：<span id="money1"></span></h1>
+ </div>
+ <h4><a href="#" onclick="driverActivityHistory(1,${id1})">领取列表</a></h4>
+ </div>
+ </div>
+ <div class="col-sm-3">
+ <div class="ibox float-e-margins">
+ <div class="ibox-title">
+ <h3>邀请用户注册</h3>
+ </div>
+ <div class="ibox-content">
+ <h1 class="no-margins text-navy">领取人数：<span id="number2"></span></h1>
+ <h1 class="no-margins text-navy">领取金额：<span id="money2"></span></h1>
+ </div>
+ <h4><a href="#" onclick="driverActivityHistory(2,${id2})">领取列表</a></h4>
+ </div>
+ </div>
+ <div class="col-sm-3">
+ <div class="ibox float-e-margins">
+ <div class="ibox-title">
+ <h3>专车累计在线</h3>
+ </div>
+ <div class="ibox-content">
+ <h1 class="no-margins text-navy">领取人数：<span id="number3"></span></h1>
+ <h1 class="no-margins text-navy">领取金额：<span id="money3"></span></h1>
+ </div>
+ <h4><a href="#" onclick="driverActivityHistory(3,${id3})">领取列表</a></h4>
+ </div>
+ </div>
+ <div class="col-sm-3">
+ <div class="ibox float-e-margins">
+ <div class="ibox-title">
+ <h3>出租车累计在线</h3>
+ </div>
+ <div class="ibox-content">
+ <h1 class="no-margins text-navy">领取人数：<span id="number4"></span></h1>
+ <h1 class="no-margins text-navy">领取金额：<span id="money4"></span></h1>
+ </div>
+ <h4><a href="#" onclick="driverActivityHistory(3,${id4})">领取列表</a></h4>
+ </div>
+ </div>
+ <div class="col-sm-3">
+ <div class="ibox float-e-margins">
+ <div class="ibox-title">
+ <h3>跨城累计在线</h3>
+ </div>
+ <div class="ibox-content">
+ <h1 class="no-margins text-navy">领取人数：<span id="number5"></span></h1>
+ <h1 class="no-margins text-navy">领取金额：<span id="money5"></span></h1>
+ </div>
+ <h4><a href="#" onclick="driverActivityHistory(3,${id5})">领取列表</a></h4>
+ </div>
+ </div>
+ <div class="col-sm-3">
+ <div class="ibox float-e-margins">
+ <div class="ibox-title">
+ <h3>订单数奖励</h3>
+ </div>
+ <div class="ibox-content">
+ <h1 class="no-margins text-navy">领取人数：<span id="number6"></span></h1>
+ <h1 class="no-margins text-navy">领取金额：<span id="money6"></span></h1>
+ </div>
+ <h4><a href="#" onclick="driverActivityHistory(4,${id6})">领取列表</a></h4>
+ </div>
+ </div>
+</div>
+
+
+<!-- ChartJS-->
+<script type="text/javascript">
+ $(function () {
+ $("#startTime").val("${startTime} - ${endTime}")
+ receiveRecordDetail("${startTime} - ${endTime}");
+ })
+ laydate.render({
+ elem: '#startTime'
+ ,range: true
+ ,done: function(value, date, endDate){
+ // 回调函数
+ receiveRecordDetail(value);
+ }
+ });
+
+ function receiveRecordDetail(times){
+ var ajax = new $ax(Feng.ctxPath + "/driverActivity/receiveRecordDetail", function (data) {
+ $("#totalMOney").html(data.totalMOney);
+ $("#money1").html(data.money1);
+ $("#number1").html(data.number1);
+ $("#money2").html(data.money2);
+ $("#number2").html(data.number2);
+ $("#money3").html(data.money3);
+ $("#number3").html(data.number3);
+ $("#money4").html(data.money4);
+ $("#number4").html(data.number4);
+ $("#money5").html(data.money5);
+ $("#number5").html(data.number5);
+ $("#money6").html(data.money6);
+ $("#number6").html(data.number6);
+ }, function (data) {
+ Feng.error("操作失败!" + data.responseJSON.message + "!");
+ });
+ ajax.set("createTime",times);
+ ajax.set("activityId",$("#activityId").val());
+ ajax.start();
+ }
+ /**
+ * 领取记录
+ */
+ function driverActivityHistory(type,id) {
+ layer.open({
+ type: 2,
+ title: '领取记录',
+ area: ['100%', '100%'], //宽高
+ fix: false, //不固定
+ maxmin: true,
+ content: Feng.ctxPath + '/driverActivityHistory?activityId='+ id+"&type="+type
+ });
+ };
+</script>
+@}
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/driverActivityHistory/driverActivityHistory.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/driverActivityHistory/driverActivityHistory.html
new file mode 100644
index 0000000..1dda419
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/driverActivityHistory/driverActivityHistory.html
@@ -0,0 +1,25 @@
+@layout("/common/_container.html"){
+<div class="row">
+ <div class="col-sm-12">
+ <div class="ibox float-e-margins">
+ <div class="ibox-title">
+ <h5>领取记录</h5>
+ </div>
+ <div class="ibox-content">
+ <div class="row row-lg">
+ <input type="hidden" id="type" value="${type}">
+ <input type="hidden" id="activityId" value="${activityId}">
+ <div class="col-sm-12">
+
+ <div class="hidden-xs" id="DriverActivityHistoryTableToolbar" role="group">
+
+ </div>
+ <#table id="DriverActivityHistoryTable"/>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/driverActivityHistory/driverActivityHistory.js"></script>
+@}
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/log/log.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/log/log.html
new file mode 100644
index 0000000..a9b7f48
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/log/log.html
@@ -0,0 +1,48 @@
+@layout("/common/_container.html"){
+<div class="row">
+ <div class="col-sm-12">
+ <div class="ibox float-e-margins">
+ <div class="ibox-title">
+ <h5>业务日志</h5>
+ </div>
+ <div class="ibox-content">
+ <div class="row row-lg">
+ <div class="col-sm-12">
+ <div class="row">
+ <div class="col-sm-2">
+ <#NameCon id="beginTime" name="开始时间" isTime="false" pattern="YYYY-MM-DD" />
+ </div>
+ <div class="col-sm-2">
+ <#NameCon id="endTime" name="结束时间" isTime="false" pattern="YYYY-MM-DD" />
+ </div>
+ <div class="col-sm-2">
+ <#NameCon id="logName" name="用户名称" />
+ </div>
+ <div class="col-sm-2">
+ <#button name="搜索" icon="fa-search" clickFun="OptLog.search()"/>
+ <#button name="重置" icon="fa-trash" clickFun="OptLog.resetSearch()" space="true"/>
+ </div>
+ </div>
+ <div class="hidden-xs" id="OptLogTableToolbar" role="group">
+ <#button name="查看详情" icon="fa-plus" clickFun="OptLog.detail()"/>
+ @if(shiro.hasPermission("/log/delLog")){
+ <#button name="清空日志" icon="fa-plus" clickFun="OptLog.delLog()" space="true"/>
+ @}
+ </div>
+ <#table id="OptLogTable"/>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/log/log.js"></script>
+<script>
+ laydate.render({
+ elem: '#beginTime',
+ });
+ laydate.render({
+ elem: '#endTime',
+ });
+</script>
+@}
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/log/login_log.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/log/login_log.html
new file mode 100644
index 0000000..8d38ac9
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/log/login_log.html
@@ -0,0 +1,47 @@
+@layout("/common/_container.html"){
+<div class="row">
+ <div class="col-sm-12">
+ <div class="ibox float-e-margins">
+ <div class="ibox-title">
+ <h5>登录日志</h5>
+ </div>
+ <div class="ibox-content">
+ <div class="row row-lg">
+ <div class="col-sm-12">
+ <div class="row">
+ <div class="col-sm-3">
+ <#NameCon id="beginTime" name="开始时间" isTime="false" pattern="YYYY-MM-DD" />
+ </div>
+ <div class="col-sm-3">
+ <#NameCon id="endTime" name="结束时间" isTime="false" pattern="YYYY-MM-DD" />
+ </div>
+ <div class="col-sm-3">
+ <#NameCon id="logName" name="用户名称" />
+ </div>
+ <div class="col-sm-3">
+ <#button name="搜索" icon="fa-search" clickFun="LoginLog.search()"/>
+ <#button name="重置" icon="fa-trash" clickFun="LoginLog.resetSearch()" space="true"/>
+ </div>
+ </div>
+ <div class="hidden-xs" id="LoginLogTableToolbar" role="group">
+ @if(shiro.hasPermission("/loginLog/delLoginLog")){
+ <#button name="清空日志" icon="fa-plus" clickFun="LoginLog.delLog()"/>
+ @}
+ </div>
+ <#table id="LoginLogTable"/>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/log/login_log.js"></script>
+<script>
+ laydate.render({
+ elem: '#beginTime',
+ });
+ laydate.render({
+ elem: '#endTime',
+ });
+</script>
+@}
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/menu/menu.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/menu/menu.html
new file mode 100644
index 0000000..b0e89a7
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/menu/menu.html
@@ -0,0 +1,41 @@
+@layout("/common/_container.html"){
+<div class="row">
+ <div class="col-sm-12">
+ <div class="ibox float-e-margins">
+ <div class="ibox-title">
+ <h5>菜单管理</h5>
+ </div>
+ <div class="ibox-content">
+ <div class="row row-lg">
+ <div class="col-sm-12">
+ <div class="row">
+ <div class="col-sm-3">
+ <#NameCon id="menuName" name="菜单名称" />
+ </div>
+ <div class="col-sm-3">
+ <#NameCon id="level" name="层级" />
+ </div>
+ <div class="col-sm-3">
+ <#button name="搜索" icon="fa-search" clickFun="Menu.search()"/>
+ </div>
+ </div>
+ <div class="hidden-xs" id="menuTableToolbar" role="group">
+ @if(shiro.hasPermission("/menu/add")){
+ <#button name="添加" icon="fa-plus" clickFun="Menu.openAddMenu()"/>
+ @}
+ @if(shiro.hasPermission("/menu/edit")){
+ <#button name="修改" icon="fa-edit" clickFun="Menu.openChangeMenu()" space="true"/>
+ @}
+ @if(shiro.hasPermission("/menu/remove")){
+ <#button name="删除" icon="fa-remove" clickFun="Menu.delMenu()" space="true"/>
+ @}
+ </div>
+ <#table id="menuTable"/>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/menu/menu.js"></script>
+@}
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/menu/menu_add.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/menu/menu_add.html
new file mode 100644
index 0000000..aef8ae7
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/menu/menu_add.html
@@ -0,0 +1,40 @@
+@layout("/common/_container.html"){
+<div class="ibox float-e-margins">
+ <div class="ibox-content">
+ <div class="form-horizontal" id="menuInfoForm">
+
+ <input type="hidden" id="id" value="">
+
+ <div class="row">
+ <div class="col-sm-6 b-r">
+ <#input id="name" name="名称" underline="true" />
+ <#input id="code" name="菜单编号" underline="true" />
+ <#input id="pcodeName" name="父级编号" underline="true"
+ hidden="pcode" readonly="readonly"
+ clickFun="MenuInfoDlg.showMenuSelectTree(); return false;"
+ style="background-color: #ffffff !important;"
+ selectFlag="true" selectId="pcodeTreeDiv" selectTreeId="pcodeTree" selectStyle="width:244px !important;"/>
+ <#select id="ismenu" name="是否是菜单">
+ <option value="1">是</option>
+ <option value="0">不是</option>
+ </#select>
+ </div>
+ <div class="col-sm-6">
+ <#input id="url" name="请求地址" underline="true" />
+ <#input id="num" name="排序" underline="true" />
+ <#input id="icon" name="图标" underline="false" value="fa-bars" />
+ </div>
+ </div>
+
+ <div class="row btn-group-m-t">
+ <div class="col-sm-10 col-sm-offset-5">
+ <#button btnCss="info" name="提交" id="ensure" icon="fa-check" clickFun="MenuInfoDlg.addSubmit()"/>
+ <#button btnCss="danger" name="取消" id="cancel" icon="fa-eraser" clickFun="MenuInfoDlg.close()"/>
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/menu/menu_info.js"></script>
+@}
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/menu/menu_edit.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/menu/menu_edit.html
new file mode 100644
index 0000000..608a280
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/menu/menu_edit.html
@@ -0,0 +1,42 @@
+@layout("/common/_container.html"){
+<div class="ibox float-e-margins">
+ <div class="ibox-content">
+ <div class="form-horizontal" id="menuInfoForm">
+
+ <input type="hidden" id="id" value="${menu.id}">
+ <input type="hidden" id="ismenuValue" value="${menu.ismenu}">
+
+ <div class="row">
+ <div class="col-sm-6 b-r">
+ <#input id="name" name="名称" value="${menu.name}" underline="true" />
+ <#input id="code" name="菜单编号" value="${menu.code}" underline="true" />
+ <#input id="pcodeName" name="父级编号" value="${menu.pcodeName}" underline="true"
+ hidden="pcode" readonly="readonly" hiddenValue="${menu.pcode}"
+ clickFun="MenuInfoDlg.showMenuSelectTree(); return false;"
+ style="background-color: #ffffff !important;"
+ selectFlag="true" selectId="pcodeTreeDiv" selectTreeId="pcodeTree" selectStyle="width:244px !important;"/>
+ <#select id="ismenu" name="是否是菜单">
+ <option value="1">是</option>
+ <option value="0">不是</option>
+ </#select>
+
+ </div>
+ <div class="col-sm-6">
+ <#input id="url" name="请求地址" value="${menu.url}" underline="true" />
+ <#input id="num" name="排序" value="${menu.num}" underline="true" />
+ <#input id="icon" name="图标" underline="false" value="${menu.icon}"/>
+ </div>
+ </div>
+
+ <div class="row btn-group-m-t">
+ <div class="col-sm-10 col-sm-offset-5">
+ <#button btnCss="info" name="提交" id="ensure" icon="fa-check" clickFun="MenuInfoDlg.editSubmit()"/>
+ <#button btnCss="danger" name="取消" id="cancel" icon="fa-eraser" clickFun="MenuInfoDlg.close()"/>
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/menu/menu_info.js"></script>
+@}
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/notice/notice.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/notice/notice.html
new file mode 100644
index 0000000..f373984
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/notice/notice.html
@@ -0,0 +1,38 @@
+@layout("/common/_container.html"){
+<div class="row">
+ <div class="col-sm-12">
+ <div class="ibox float-e-margins">
+ <div class="ibox-title">
+ <h5>通知管理</h5>
+ </div>
+ <div class="ibox-content">
+ <div class="row row-lg">
+ <div class="col-sm-12">
+ <div class="row">
+ <div class="col-sm-3">
+ <#NameCon id="condition" name="名称" />
+ </div>
+ <div class="col-sm-3">
+ <#button name="搜索" icon="fa-search" clickFun="Notice.search()"/>
+ </div>
+ </div>
+ <div class="hidden-xs" id="NoticeTableToolbar" role="group">
+ @if(shiro.hasPermission("/notice/add")){
+ <#button name="添加" icon="fa-plus" clickFun="Notice.openAddNotice()"/>
+ @}
+ @if(shiro.hasPermission("/notice/update")){
+ <#button name="修改" icon="fa-plus" clickFun="Notice.openNoticeDetail()" space="true"/>
+ @}
+ @if(shiro.hasPermission("/notice/delete")){
+ <#button name="删除" icon="fa-plus" clickFun="Notice.delete()" space="true"/>
+ @}
+ </div>
+ <#table id="NoticeTable"/>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/notice/notice.js"></script>
+@}
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/notice/notice_add.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/notice/notice_add.html
new file mode 100644
index 0000000..037ebdc
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/notice/notice_add.html
@@ -0,0 +1,39 @@
+@layout("/common/_container.html"){
+<div class="ibox float-e-margins">
+ <div class="ibox-content">
+ <div class="form-horizontal" id="noticeInfoForm">
+
+ <input type="hidden" id="id" value="">
+
+ <div class="row">
+ <div class="col-sm-12">
+ <div class="form-group">
+ <label class="col-sm-1 control-label">标题</label>
+ <div class="col-sm-11">
+ <input class="form-control" id="title" name="title" type="text">
+
+ </div>
+ </div>
+ <div class="form-group">
+ <label class="col-sm-1 control-label">内容</label>
+ <div class="col-sm-11">
+ <div id="editor" class="editorHeight">
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+
+ <div class="row btn-group-m-t">
+ <div class="col-sm-10 col-sm-offset-5">
+ <#button btnCss="info" name="提交" id="ensure" icon="fa-check" clickFun="NoticeInfoDlg.addSubmit()"/>
+ <#button btnCss="danger" name="取消" id="cancel" icon="fa-eraser" clickFun="NoticeInfoDlg.close()"/>
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+<script type="text/javascript" src="//unpkg.com/wangeditor/release/wangEditor.min.js"></script>
+<script src="${ctxPath}/static/modular/system/notice/notice_info.js"></script>
+@}
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/notice/notice_edit.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/notice/notice_edit.html
new file mode 100644
index 0000000..1d5de30
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/notice/notice_edit.html
@@ -0,0 +1,39 @@
+@layout("/common/_container.html"){
+<div class="ibox float-e-margins">
+ <div class="ibox-content">
+ <div class="form-horizontal" id="noticeInfoForm">
+
+ <input type="hidden" id="id" value="${notice.id}">
+ <input type="hidden" id="contentVal" value='${notice.content}'>
+
+ <div class="row">
+ <div class="col-sm-12">
+ <div class="form-group">
+ <label class="col-sm-1 control-label">标题</label>
+ <div class="col-sm-11">
+ <input class="form-control" id="title" name="title" type="text" value="${notice.title}">
+
+ </div>
+ </div>
+ <div class="form-group">
+ <label class="col-sm-1 control-label">内容</label>
+ <div class="col-sm-11">
+ <div id="editor" class="editorHeight">
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+
+ <div class="row btn-group-m-t">
+ <div class="col-sm-10 col-sm-offset-5">
+ <#button btnCss="info" name="提交" id="ensure" icon="fa-check" clickFun="NoticeInfoDlg.editSubmit()"/>
+ <#button btnCss="danger" name="取消" id="cancel" icon="fa-eraser" clickFun="NoticeInfoDlg.close()"/>
+ </div>
+ </div>
+ </div>
+ </div>
+</div>
+<script type="text/javascript" src="${ctxPath}/static/js/plugins/wangEditor/wangEditor.js"></script>
+<script src="${ctxPath}/static/modular/system/notice/notice_info.js"></script>
+@}
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/report/couponStatistics.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/report/couponStatistics.html
new file mode 100644
index 0000000..1742b48
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/report/couponStatistics.html
@@ -0,0 +1,184 @@
+@layout("/common/_container.html"){
+<div class="row">
+ <div class="col-sm-12">
+ <div class="ibox float-e-margins">
+ <div class="ibox-title">
+ <h5>优惠券管理</h5>
+ </div>
+ <div class="ibox-content">
+ <div class="row row-lg">
+ <div class="col-sm-12">
+ <div class="row" style="margin-bottom: 20px;">
+ <ul class="nav nav-tabs">
+ <li class="active" onclick="CouponStatistics.cutover(1, this)"><a href="#">注册奖励</a></li>
+ <li onclick="CouponStatistics.cutover(2, this)"><a href="#">邀请奖励</a></li>
+ <li onclick="CouponStatistics.cutover(3, this)"><a href="#">充值奖励</a></li>
+ <li onclick="CouponStatistics.cutover(4, this)"><a href="#">打折活动</a></li>
+ <li onclick="CouponStatistics.cutover(5, this)"><a href="#">红包活动</a></li>
+ </ul>
+ </div>
+ <div id="panel1">
+ <div class="row">
+ <div class="col-sm-3">
+ <#NameCon id="name1" name="活动名称" />
+ </div>
+ <div class="col-sm-3">
+ <#TimeCon id="time1" name="起止时间" isTime="false"/>
+ </div>
+ <div class="col-sm-3">
+ <#SelectCon id="company1" name="运营商" >
+ <option value="">全部</option>
+ @for(c in company!){
+ <option value="${c.id}">${c.name}</option>
+ @}
+ </#SelectCon>
+ </div>
+ <div class="col-sm-3">
+ <#button name="搜索" icon="fa-search" clickFun="CouponStatistics.search1()"/>
+ <#button name="重置" icon="fa-search" clickFun="CouponStatistics.resetSearch1()"/>
+ <#button name="下载" icon="fa-download" clickFun="CouponStatistics.downloadExcel1()"/>
+ </div>
+ </div>
+ <div class="hidden-xs" id="TCarBrandTable1Toolbar" role="group">
+ <#button name="注册奖励详情" icon="fa-plus" clickFun="CouponStatistics.openCouponStatisticsInfo1(1)"/>
+ </div>
+ <#table id="TCarBrandTable1"/>
+ </div>
+ <div id="panel2" style="display: none;">
+ <div class="row">
+ <div class="col-sm-3">
+ <#NameCon id="name2" name="活动名称" />
+ </div>
+ <div class="col-sm-3">
+ <#TimeCon id="time2" name="起止时间" isTime="false"/>
+ </div>
+ <div class="col-sm-3">
+ <#SelectCon id="company2" name="运营商" >
+ <option value="">全部</option>
+ @for(c in company!){
+ <option value="${c.id}">${c.name}</option>
+ @}
+ </#SelectCon>
+ </div>
+ <div class="col-sm-3">
+ <#button name="搜索" icon="fa-search" clickFun="CouponStatistics.search2()"/>
+ <#button name="重置" icon="fa-search" clickFun="CouponStatistics.resetSearch2()"/>
+ <#button name="下载" icon="fa-download" clickFun="CouponStatistics.downloadExcel2()"/>
+ </div>
+ </div>
+ <div class="hidden-xs" id="TCarBrandTable2Toolbar" role="group">
+ <#button name="邀请奖励详情" icon="fa-plus" clickFun="CouponStatistics.openCouponStatisticsInfo2(2)"/>
+ </div>
+ <#table id="TCarBrandTable2"/>
+ </div>
+ <div id="panel3" style="display: none;">
+ <div class="row">
+ <div class="col-sm-3">
+ <#NameCon id="name3" name="活动名称" />
+ </div>
+ <div class="col-sm-3">
+ <#TimeCon id="time3" name="起止时间" isTime="false"/>
+ </div>
+ <div class="col-sm-3">
+ <#SelectCon id="company3" name="运营商" >
+ <option value="">全部</option>
+ @for(c in company!){
+ <option value="${c.id}">${c.name}</option>
+ @}
+ </#SelectCon>
+ </div>
+ <div class="col-sm-3">
+ <#button name="搜索" icon="fa-search" clickFun="CouponStatistics.search3()"/>
+ <#button name="重置" icon="fa-search" clickFun="CouponStatistics.resetSearch3()"/>
+ <#button name="下载" icon="fa-download" clickFun="CouponStatistics.downloadExcel3()"/>
+ </div>
+ </div>
+ <div class="hidden-xs" id="TCarBrandTable3Toolbar" role="group">
+ <#button name="充值奖励详情" icon="fa-plus" clickFun="CouponStatistics.openCouponStatisticsInfo3(3)"/>
+ </div>
+ <#table id="TCarBrandTable3"/>
+ </div>
+ <div id="panel4" style="display: none;">
+ <div class="row">
+ <div class="col-sm-3">
+ <#NameCon id="name4" name="活动名称" />
+ </div>
+ <div class="col-sm-3">
+ <#TimeCon id="time4" name="起止时间" isTime="false"/>
+ </div>
+ <div class="col-sm-3">
+ <#SelectCon id="company4" name="运营商" >
+ <option value="">全部</option>
+ @for(c in company!){
+ <option value="${c.id}">${c.name}</option>
+ @}
+ </#SelectCon>
+ </div>
+ <div class="col-sm-3">
+ <#button name="搜索" icon="fa-search" clickFun="CouponStatistics.search4()"/>
+ <#button name="重置" icon="fa-search" clickFun="CouponStatistics.resetSearch4()"/>
+ <#button name="下载" icon="fa-download" clickFun="CouponStatistics.downloadExcel4()"/>
+ </div>
+ </div>
+ <div class="hidden-xs" id="TCarBrandTable4Toolbar" role="group">
+ <#button name="折扣优惠详情" icon="fa-plus" clickFun="CouponStatistics.openCouponStatisticsInfo4(4)"/>
+ </div>
+ <#table id="TCarBrandTable4"/>
+ </div>
+ <div id="panel5" style="display: none;">
+ <div class="row">
+ <div class="col-sm-3">
+ <#NameCon id="name5" name="活动名称" />
+ </div>
+ <div class="col-sm-3">
+ <#TimeCon id="time5" name="起止时间" isTime="false"/>
+ </div>
+ <div class="col-sm-3">
+ <#SelectCon id="company5" name="运营商" >
+ <option value="">全部</option>
+ @for(c in company!){
+ <option value="${c.id}">${c.name}</option>
+ @}
+ </#SelectCon>
+ </div>
+ <div class="col-sm-3">
+ <#button name="搜索" icon="fa-search" clickFun="CouponStatistics.search5()"/>
+ <#button name="重置" icon="fa-search" clickFun="CouponStatistics.resetSearch5()"/>
+ <#button name="下载" icon="fa-download" clickFun="CouponStatistics.downloadExcel5()"/>
+ </div>
+ </div>
+ <div class="hidden-xs" id="TCarBrandTable5Toolbar" role="group">
+ <#button name="红包奖励详情" icon="fa-plus" clickFun="CouponStatistics.openCouponStatisticsInfo5(5)"/>
+ </div>
+ <#table id="TCarBrandTable5"/>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/report/couponStatistics.js"></script>
+<script>
+ laydate.render({
+ elem: '#time1'
+ ,range: true
+ });
+ laydate.render({
+ elem: '#time2'
+ ,range: true
+ });
+ laydate.render({
+ elem: '#time3'
+ ,range: true
+ });
+ laydate.render({
+ elem: '#time4'
+ ,range: true
+ });
+ laydate.render({
+ elem: '#time5'
+ ,range: true
+ });
+</script>
+@}
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/report/couponStatisticsInfo.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/report/couponStatisticsInfo.html
new file mode 100644
index 0000000..f98ec0f
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/report/couponStatisticsInfo.html
@@ -0,0 +1,46 @@
+@layout("/common/_container.html"){
+<div class="row">
+ <div class="col-sm-12">
+ <div class="ibox float-e-margins">
+ <input type="hidden" id="type" value="${type}">
+ <div class="ibox-content">
+ <div class="row row-lg">
+ <div class="col-sm-12">
+ <div class="row">
+ <div class="col-sm-3">
+ <#NameCon id="name" name="活动名称" />
+ </div>
+ <div class="col-sm-3">
+ <#TimeCon id="time" name="起止时间" isTime="false"/>
+ </div>
+ <div class="col-sm-3">
+ <#SelectCon id="company" name="运营商" >
+ <option value="">全部</option>
+ @for(c in company!){
+ <option value="${c.id}">${c.name}</option>
+ @}
+ </#SelectCon>
+ </div>
+ <div class="col-sm-3">
+ <#button name="搜索" icon="fa-search" clickFun="CouponStatisticsInfo.search()"/>
+ <#button name="重置" icon="fa-search" clickFun="CouponStatisticsInfo.resetSearch()"/>
+ <#button name="下载" icon="fa-download" clickFun="CouponStatisticsInfo.downloadExcel()"/>
+ </div>
+ </div>
+ <div class="hidden-xs" id="TCarBrandTableToolbar" role="group">
+ </div>
+ <#table id="TCarBrandTable"/>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/report/couponStatisticsInfo.js"></script>
+<script>
+ laydate.render({
+ elem: '#time'
+ ,range: true
+ });
+</script>
+@}
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/report/operationalData.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/report/operationalData.html
new file mode 100644
index 0000000..8cc397d
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/report/operationalData.html
@@ -0,0 +1,53 @@
+@layout("/common/_container.html"){
+<div class="row">
+ <div class="col-sm-12">
+ <div class="ibox float-e-margins">
+ <div class="ibox-title">
+ <h5>优惠券管理</h5>
+ </div>
+ <div class="ibox-content">
+ <div class="row row-lg">
+ <div class="col-sm-12">
+ <div class="row">
+ <div class="col-sm-3">
+ <#SelectCon id="type" name="类别" >
+ <option value="2">出租车</option>
+ <option value="1">专车</option>
+ <option value="3">跨城</option>
+ <option value="4">小件物流</option>
+ </#SelectCon>
+ </div>
+ <div class="col-sm-3">
+ <#TimeCon id="time" name="起止时间" isTime="false"/>
+ </div>
+ <div class="col-sm-3">
+ <#SelectCon id="company" name="运营商" >
+ <option value="">全部</option>
+ @for(c in company!){
+ <option value="${c.id}">${c.name}</option>
+ @}
+ </#SelectCon>
+ </div>
+ <div class="col-sm-3">
+ <#button name="搜索" icon="fa-search" clickFun="OperationalData.search()"/>
+ <#button name="重置" icon="fa-search" clickFun="OperationalData.resetSearch()"/>
+ <#button name="下载" icon="fa-download" clickFun="OperationalData.downloadExcel()"/>
+ </div>
+ </div>
+ <div class="hidden-xs" id="TCarBrandTableToolbar" role="group">
+ </div>
+ <#table id="TCarBrandTable"/>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/report/operationalData.js"></script>
+<script>
+ laydate.render({
+ elem: '#time'
+ ,range: true
+ });
+</script>
+@}
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/role/role.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/role/role.html
new file mode 100644
index 0000000..316cf85
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/role/role.html
@@ -0,0 +1,41 @@
+@layout("/common/_container.html"){
+<div class="row">
+ <div class="col-sm-12">
+ <div class="ibox float-e-margins">
+ <div class="ibox-title">
+ <h5>角色管理</h5>
+ </div>
+ <div class="ibox-content">
+ <div class="row row-lg">
+ <div class="col-sm-12">
+ <div class="row">
+ <div class="col-sm-3">
+ <#NameCon id="roleName" name="角色名称" />
+ </div>
+ <div class="col-sm-3">
+ <#button name="搜索" icon="fa-search" clickFun="Role.search()"/>
+ </div>
+ </div>
+ <div class="hidden-xs" id="roleTableToolbar" role="group">
+ @if(shiro.hasPermission("/role/add")){
+ <#button name="添加" icon="fa-plus" clickFun="Role.openAddRole()" />
+ @}
+ @if(shiro.hasPermission("/role/edit")){
+ <#button name="修改" icon="fa-edit" clickFun="Role.openChangeRole()" space="true"/>
+ @}
+ @if(shiro.hasPermission("/role/remove")){
+ <#button name="删除" icon="fa-remove" clickFun="Role.delRole()" space="true"/>
+ @}
+ @if(shiro.hasPermission("/role/setAuthority")){
+ <#button name="权限配置" icon="fa-user-secret" clickFun="Role.assign()" space="true"/>
+ @}
+ </div>
+ <#table id="roleTable"/>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/role/role.js"></script>
+@}
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/role/role_add.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/role/role_add.html
new file mode 100644
index 0000000..1d576cc
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/role/role_add.html
@@ -0,0 +1,47 @@
+@layout("/common/_container.html"){
+<div class="ibox float-e-margins">
+ <div class="ibox-content">
+ <div class="form-horizontal" id="roleInfoForm">
+
+ <input type="hidden" id="id" value="">
+
+ <div class="row">
+ <div class="col-sm-6 b-r">
+ <#input id="name" name="角色名称" underline="true"/>
+ <#input id="pName" name="上级名称" underline="true" hidden="pid" readonly="readonly"
+ clickFun="RolInfoDlg.showPNameSelectTree(); return false;"
+ style="background-color: #ffffff !important;"/>
+ <#input id="deptName" name="部门名称" hidden="deptid" readonly="readonly"
+ clickFun="RolInfoDlg.showDeptSelectTree(); return false;"
+ style="background-color: #ffffff !important;"/>
+ </div>
+ <div class="col-sm-6">
+ <#input id="tips" name="别名" underline="true"/>
+ <#input id="num" name="排序"/>
+ </div>
+ </div>
+
+ <!-- 这是部门下拉框 -->
+ <div id="deptContent" class="menuContent"
+ style="display: none; position: absolute; z-index: 200;">
+ <ul id="deptTree" class="ztree tree-box" style="width: 250px !important;"></ul>
+ </div>
+
+ <!-- 这是父级菜单下拉框 -->
+ <div id="pNameContent" class="menuContent"
+ style="display: none; position: absolute; z-index: 200;">
+ <ul id="pNameTree" class="ztree tree-box" style="width: 250px !important;"></ul>
+ </div>
+
+ <div class="row btn-group-m-t">
+ <div class="col-sm-10 col-sm-offset-5">
+ <#button btnCss="info" name="提交" id="ensure" icon="fa-check" clickFun="RolInfoDlg.addSubmit()"/>
+ <#button btnCss="danger" name="取消" id="cancel" icon="fa-eraser" clickFun="RolInfoDlg.close()"/>
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/role/role_info.js"></script>
+@}
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/role/role_assign.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/role/role_assign.html
new file mode 100644
index 0000000..6eee434
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/role/role_assign.html
@@ -0,0 +1,78 @@
+@layout("/common/_container.html"){
+
+
+<script type="text/javascript">
+ $(function () {
+ var index = parent.layer.getFrameIndex(window.name); //获取窗口索引
+
+ $("#btn_close").bind("click", function () {
+ parent.layer.close(index);
+ });
+
+ $("#btn_save").bind("click", function () {
+ var ids = Feng.zTreeCheckedNodes("zTree");
+ var index = parent.layer.load(0, {shade: false});// 加载动画层，0代表加载的风格，支持0-2
+ var ajax = new $ax(Feng.ctxPath + "/role/setAuthority", function (data) {
+ parent.layer.close(index);// 关闭加载动画层
+ Feng.success("分配角色成功!");
+ window.parent.Role.table.refresh();
+ parent.layer.close(index);
+ parent.layer.close(window.parent.Role.layerIndex);
+ }, function (data) {
+ Feng.error("分配角色失败!"
+ + data.responseJSON.message + "!");
+ });
+ ajax.set("roleId", "${roleId}");
+ ajax.set("ids", ids);
+ ajax.start();
+ });
+
+ initZtree();
+ });
+
+ function initZtree() {
+ var setting = {
+ check: {
+ enable: true,
+ chkboxType: { "Y": "ps", "N": "ps" }
+ },
+ data: {
+ simpleData: {
+ enable: true
+ }
+ }
+ };
+
+ var ztree = new $ZTree("zTree", "/menu/menuTreeListByRoleId/"
+ + "${roleId}");
+ ztree.setSettings(setting);
+ ztree.init();
+ }
+</script>
+
+
+<!-- 配置grid -->
+<div class="container" style="padding: 0px 10px !important;margin-top: -10px;text-align: center !important;">
+ <div class="row">
+ <div class="ibox float-e-margins">
+ <div class="ibox-title">
+ <h5>${roleName!}</h5>
+ </div>
+ <div class="ibox-content">
+ <ul id="zTree" class="ztree"></ul>
+ </div>
+ </div>
+ </div>
+ <div class="row">
+ <div class="col-md-12">
+ <button class="btn btn-sm btn-info" type="button" id="btn_save">
+ <i class="ace-icon fa fa-check bigger-110"></i>保存
+ </button>
+
+ <button class="btn btn-sm btn-danger" type="button" id="btn_close">
+ <i class="ace-icon fa fa-close bigger-110"></i>关闭
+ </button>
+ </div>
+ </div>
+</div>
+@}
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/role/role_edit.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/role/role_edit.html
new file mode 100644
index 0000000..ae538ac
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/role/role_edit.html
@@ -0,0 +1,47 @@
+ @layout("/common/_container.html"){
+<div class="ibox float-e-margins">
+ <div class="ibox-content">
+ <div class="form-horizontal" id="roleInfoForm">
+
+ <input type="hidden" id="id" value="${role.id}">
+
+ <div class="row">
+ <div class="col-sm-6 b-r">
+ <#input id="name" name="角色名称" underline="true" value="${role.name}"/>
+ <#input id="pName" name="上级名称" underline="true" hidden="pid" hiddenValue="${role.pid}" readonly="readonly" value="${pName}"
+ clickFun="RolInfoDlg.showPNameSelectTree(); return false;"
+ style="background-color: #ffffff !important;"/>
+ <#input id="deptName" name="部门名称" hidden="deptid" hiddenValue="${role.deptid}" readonly="readonly" value="${deptName}"
+ clickFun="RolInfoDlg.showDeptSelectTree(); return false;"
+ style="background-color: #ffffff !important;"/>
+ </div>
+ <div class="col-sm-6">
+ <#input id="tips" name="别名" underline="true" value="${role.tips}"/>
+ <#input id="num" name="排序" value="${role.num}"/>
+ </div>
+ </div>
+
+ <!-- 这是部门下拉框 -->
+ <div id="deptContent" class="menuContent"
+ style="display: none; position: absolute; z-index: 200;">
+ <ul id="deptTree" class="ztree tree-box" style="width: 250px !important;"></ul>
+ </div>
+
+ <!-- 这是父级菜单下拉框 -->
+ <div id="pNameContent" class="menuContent"
+ style="display: none; position: absolute; z-index: 200;">
+ <ul id="pNameTree" class="ztree tree-box" style="width: 250px !important;"></ul>
+ </div>
+
+ <div class="row btn-group-m-t">
+ <div class="col-sm-10 col-sm-offset-5">
+ <#button btnCss="info" name="提交" id="ensure" icon="fa-check" clickFun="RolInfoDlg.editSubmit()"/>
+ <#button btnCss="danger" name="取消" id="cancel" icon="fa-eraser" clickFun="RolInfoDlg.close()"/>
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/role/role_info.js"></script>
+@}
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/sysCouponActivity/sysCouponActivity.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/sysCouponActivity/sysCouponActivity.html
new file mode 100644
index 0000000..7cdc6ff
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/sysCouponActivity/sysCouponActivity.html
@@ -0,0 +1,68 @@
+@layout("/common/_container.html"){
+<div class="row">
+ <div class="col-sm-12">
+ <div class="ibox float-e-margins">
+ <div class="ibox-title">
+ <h5>赠送活动管理</h5>
+ </div>
+ <div class="ibox-content">
+ <div class="row row-lg">
+ <div class="col-sm-12">
+ <div class="row">
+ <div class="col-sm-3">
+ <#TimeCon id="createTime" name="添加时间" isTime="false"/>
+ </div>
+ <div class="col-sm-3">
+ <#SelectCon id="couponUseType" name="优惠券类型" >
+ <option value="">全部</option>
+ <option value="0">通用券</option>
+ <option value="1">专车券</option>
+ <option value="2">出租车券</option>
+ <option value="3">跨城出行券</option>
+ </#SelectCon>
+ </div>
+ <div class="col-sm-3">
+ <#SelectCon id="status" name="状态" >
+ <option value="">全部</option>
+ <option value="1">待审核</option>
+ <option value="2">已驳回</option>
+ <option value="3">已发送</option>
+ </#SelectCon>
+ </div>
+ <div class="col-sm-3">
+ <#button name="搜索" icon="fa-search" clickFun="SysCouponActivity.search()"/>
+ <#button name="重置" icon="fa-trash" clickFun="SysCouponActivity.resetSearch()" space="true"/>
+ </div>
+ </div>
+ <div class="hidden-xs" id="SysCouponActivityTableToolbar" role="group">
+ @if(shiro.hasPermission("/sysCouponActivity/add")){
+ <#button name="添加" icon="fa-plus" clickFun="SysCouponActivity.openAddSysCouponActivity()"/>
+ @}
+ @if(shiro.hasPermission("/sysCouponActivity/update")){
+ <#button name="编辑" icon="fa-edit" clickFun="SysCouponActivity.openSysCouponActivityDetail()" space="true"/>
+ @}
+ @if(shiro.hasPermission("/sysCouponActivity/delete")){
+ <#button name="删除记录" icon="fa-remove" clickFun="SysCouponActivity.delete()" space="true"/>
+ @}
+ @if(shiro.hasPermission("/sysCouponActivity/userCouponRecord")){
+ <#button name="领取记录" icon="fa-remove" clickFun="SysCouponActivity.userCouponRecord()" space="true"/>
+ @}
+ @if(shiro.hasPermission("/sysCouponActivity/immediately")){
+ <#button name="审核" icon="fa-edit" clickFun="SysCouponActivity.immediately()" space="true"/>
+ @}
+ </div>
+ <#table id="SysCouponActivityTable"/>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/sysCouponActivity/sysCouponActivity.js"></script>
+<script>
+ laydate.render({
+ elem: '#createTime'
+ ,range: true
+ });
+</script>
+@}
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/sysCouponActivity/sysCouponActivity_add.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/sysCouponActivity/sysCouponActivity_add.html
new file mode 100644
index 0000000..fcc93ae
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/sysCouponActivity/sysCouponActivity_add.html
@@ -0,0 +1,65 @@
+@layout("/common/_container.html"){
+<div class="ibox float-e-margins">
+ <div class="ibox-content">
+ <div class="form-horizontal" id="sysCouponActivityInfoForm">
+ <input type="hidden" id="activityId">
+ <div class="row">
+ <div class="col-sm-6">
+ <#input id="name" name="活动标题" underline="true"/>
+ <#button name="选择优惠券" icon="fa-plus" clickFun="SysCouponActivityInfoDlg.toSelectCouponOpt()" style="margin-left: 12%;"/>
+ <#input id="couponType" name="优惠券类型" readonly="true" />
+ <#input id="couponUseType" name="服务类型" underline="true" readonly="true" />
+ <#input id="money" name="金额" underline="true" readonly="true" />
+ <#input id="effective" name="有效天数" underline="true"/>
+ <#input id="number" name="张数" underline="true"/>
+ <div class="form-group">
+ <label class="col-sm-3 control-label">赠送用户：</label>
+ <div class="col-sm-9" style="display: flex;align-items: center;">
+ <div class="radio radio-info radio-inline">
+ <input type="radio" id="sendType1" value="1" name="sendType" checked="" >
+ <label for="sendType1"> 全部用户 </label>
+ </div>
+ <div class="radio radio-success radio-inline">
+ <input type="radio" id="sendType2" value="2" name="sendType" >
+ <label for="sendType2"> 选择用户 </label>
+ </div>
+ <#button name="选择" icon="fa-plus" clickFun="SysCouponActivityInfoDlg.toSelectUserOpt()"/>
+ </div>
+ </div>
+ <div class="form-group">
+ <label class="col-sm-3 control-label">已添加用户</label>
+ <div class="col-sm-9">
+ <div style="height: 200px; border: 1px solid #e5e6e7;overflow-y: auto;">
+ <table class="table table-striped table-bordered table-hover table-condensed">
+ <thead>
+ <tr>
+ <th style="width: 300px;">用户昵称</th>
+ <th style="width: 300px;">手机号</th>
+ <th style="width: 300px;">注册地所属分公司</th>
+ <th style="width: 100px;">操作</th>
+ </tr>
+ </thead>
+ <tbody id="coun">
+
+ </tbody>
+ </table>
+ </div>
+ </div>
+ </div>
+ </div>
+
+
+ </div>
+
+ <div class="row btn-group-m-t">
+ <div class="col-sm-10">
+ <#button btnCss="info" name="提交" id="ensure" icon="fa-check" clickFun="SysCouponActivityInfoDlg.addSubmit()"/>
+ <#button btnCss="danger" name="取消" id="cancel" icon="fa-eraser" clickFun="SysCouponActivityInfoDlg.close()"/>
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/sysCouponActivity/sysCouponActivity_info.js"></script>
+@}
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/sysCouponActivity/sysCouponActivity_edit.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/sysCouponActivity/sysCouponActivity_edit.html
new file mode 100644
index 0000000..5c4d49c
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/sysCouponActivity/sysCouponActivity_edit.html
@@ -0,0 +1,81 @@
+@layout("/common/_container.html"){
+<div class="ibox float-e-margins">
+ <div class="ibox-content">
+ <div class="form-horizontal" id="sysCouponActivityInfoForm">
+
+ <input type="hidden" id="id" value="${item.id}"/>
+ <input type="hidden" id="activityId" value="${item.couponId}">
+ <div class="row">
+ <div class="col-sm-6">
+ <#input id="name" name="活动标题" underline="true" value="${item.name}"/>
+ <#button name="选择优惠券" icon="fa-plus" clickFun="SysCouponActivityInfoDlg.toSelectCouponOpt()" style="margin-left: 12%;"/>
+ <#input id="couponType" name="优惠券类型" readonly="true" value="${item.couponType==1?'抵扣':'满减'}"/>
+ <#input id="couponUseType" name="服务类型" underline="true" readonly="true" value="${item.couponUseType==0?'通用券':item.couponUseType==1?'专车券':item.couponUseType==2?'出租券':'跨城出行券'}"/>
+ <#input id="money" name="金额" underline="true" readonly="true" value="${item.money}"/>
+ <#input id="effective" name="有效天数" underline="true" value="${item.effective}"/>
+ <#input id="number" name="张数" underline="true" value="${item.number}"/>
+ <div class="form-group">
+ <label class="col-sm-3 control-label">赠送用户：</label>
+ <div class="col-sm-9" style="display: flex;align-items: center;">
+ <div class="radio radio-info radio-inline">
+ <input type="radio" id="sendType1" value="1" name="sendType" checked="${item.sendType==1?'checked':''}" >
+ <label for="sendType1"> 全部用户 </label>
+ </div>
+ <div class="radio radio-success radio-inline">
+ <input type="radio" id="sendType2" value="2" name="sendType" checked="${item.sendType==2?'checked':''}">
+ <label for="sendType2"> 选择用户 </label>
+ </div>
+ <#button name="选择" icon="fa-plus" clickFun="SysCouponActivityInfoDlg.toSelectUserOpt()"/>
+ </div>
+ </div>
+ <div class="form-group">
+ <label class="col-sm-3 control-label">已添加用户</label>
+ <div class="col-sm-9">
+ <div style="height: 200px; border: 1px solid #e5e6e7;overflow-y: auto;">
+ <table class="table table-striped table-bordered table-hover table-condensed">
+ <thead>
+ <tr>
+ <th style="width: 300px;">用户昵称</th>
+ <th style="width: 300px;">手机号</th>
+ <th style="width: 300px;">注册地所属分公司</th>
+ <th style="width: 100px;">操作</th>
+ </tr>
+ </thead>
+ <tbody id="coun">
+ @for(obj in sendUserInfoList){
+ <tr class="timeClass">
+ <td>
+ <input type="hidden" id="userId" name="userId" value="${obj.userId}">
+ <input type="hidden" id="nickName" name="nickName" value="${obj.nickName}">${obj.nickName}
+ </td>
+ <td>
+ <input type="hidden" id="phone" name="phone" value="${obj.phone}">${obj.nickName}
+ </td>
+ <td>
+ <input type="hidden" id="companyName" name="companyName" value="${obj.companyName}">${obj.nickName}
+ </td>
+ <td>
+ <button onclick="deleteSub(this)">移除</button>
+ </td>
+ </tr>
+ @}
+ </tbody>
+ </table>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+
+ <div class="row btn-group-m-t">
+ <div class="col-sm-10">
+ <#button btnCss="info" name="提交" id="ensure" icon="fa-check" clickFun="SysCouponActivityInfoDlg.editSubmit()"/>
+ <#button btnCss="danger" name="取消" id="cancel" icon="fa-eraser" clickFun="SysCouponActivityInfoDlg.close()"/>
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/sysCouponActivity/sysCouponActivity_info.js"></script>
+@}
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/sysCouponActivity/sysCouponActivity_immediately.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/sysCouponActivity/sysCouponActivity_immediately.html
new file mode 100644
index 0000000..3079469
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/sysCouponActivity/sysCouponActivity_immediately.html
@@ -0,0 +1,41 @@
+@layout("/common/_container.html"){
+<div class="ibox float-e-margins">
+ <div class="ibox-content">
+ <div class="form-horizontal" id="sysCouponActivityInfoForm">
+ <input type="hidden" id="id" name="id" value="${id}">
+ <div class="row">
+ <div class="col-sm-10">
+ <div class="form-group">
+ <label class="col-sm-3 control-label">处理意见：</label>
+ <div class="col-sm-9" style="display: flex;align-items: center;">
+ <div class="radio radio-info radio-inline">
+ <input type="radio" id="state2" value="3" name="state" checked="" >
+ <label for="state2"> 同意 </label>
+ </div>
+ <div class="radio radio-success radio-inline">
+ <input type="radio" id="state3" value="2" name="state" >
+ <label for="state3"> 拒绝 </label>
+ </div>
+ </div>
+ </div>
+ <div class="form-group">
+ <label class="col-sm-3 control-label">填写备注：</label>
+ <div class="col-sm-9">
+ <textarea type="text/plain" class="form-control" name="remark" id="remark" style="width:100%;height:150px;"></textarea>
+ </div>
+ </div>
+ </div>
+ </div>
+
+ <div class="row btn-group-m-t">
+ <div class="col-sm-10 col-sm-offset-5">
+ <#button btnCss="info" name="提交" id="ensure" icon="fa-check" clickFun="SysCouponActivityInfoDlg.immediately()"/>
+ <#button btnCss="danger" name="取消" id="cancel" icon="fa-eraser" clickFun="SysCouponActivityInfoDlg.close()"/>
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/sysCouponActivity/sysCouponActivity_info.js"></script>
+@}
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/sysCouponActivity/sysCouponRecord.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/sysCouponActivity/sysCouponRecord.html
new file mode 100644
index 0000000..196d277
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/sysCouponActivity/sysCouponRecord.html
@@ -0,0 +1,37 @@
+@layout("/common/_container.html"){
+<div class="row">
+ <div class="col-sm-12">
+ <div class="ibox float-e-margins">
+ <div class="ibox-title">
+ <h5>优惠券管理</h5>
+ </div>
+ <div class="ibox-content">
+ <div class="row row-lg">
+ <div class="col-sm-12">
+ <div class="row">
+ <div class="col-sm-3">
+ <#TimeCon id="createTime" name="添加时间" isTime="false"/>
+ </div>
+ <div class="col-sm-3">
+ <#button name="搜索" icon="fa-search" clickFun="SysCouponRecord.search()"/>
+ <#button name="重置" icon="fa-search" clickFun="SysCouponRecord.resetSearch()"/>
+ <#button btnCss="info" name="确定" id="ensure" icon="fa-check" clickFun="SysCouponRecord.selectCouponOpt()" space="true"/>
+ <#button btnCss="danger" name="取消" id="cancel" icon="fa-eraser" clickFun="SysCouponRecord.close()" space="true"/>
+
+ </div>
+ </div>
+ <#table id="SysCouponRecordTable"/>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/sysCouponActivity/sysCouponRecord.js"></script>
+<script>
+ laydate.render({
+ elem: '#createTime'
+ ,range: true
+ });
+</script>
+@}
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/sysCouponActivity/tUser.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/sysCouponActivity/tUser.html
new file mode 100644
index 0000000..2027607
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/sysCouponActivity/tUser.html
@@ -0,0 +1,63 @@
+@layout("/common/_container.html"){
+<div class="row">
+ <div class="col-sm-12">
+ <div class="ibox float-e-margins">
+ <div class="ibox-title">
+ <h5>用户管理</h5>
+ </div>
+ <div class="ibox-content">
+ <div class="row row-lg">
+ <div class="col-sm-12">
+ <div class="row">
+ <div class="col-sm-3">
+ <#TimeCon id="insertTime" name="注册时间" isTime="false"/>
+ </div>
+ <div class="col-sm-3">
+ <#NameCon id="id" name="用户ID" />
+ </div>
+ <div class="col-sm-3">
+ <#NameCon id="nickName" name="昵称" />
+ </div>
+ <div class="col-sm-3">
+ <#NameCon id="phone" name="手机号" />
+ </div>
+ <div class="col-sm-3">
+ <#SelectCon id="isAuth" name="是否实名认证" >
+ <option value="">全部</option>
+ <option value="1">否</option>
+ <option value="2">是</option>
+ </#SelectCon>
+ </div>
+ <div class="col-sm-3">
+ <#SelectCon id="state" name="状态" >
+ <option value="">全部</option>
+ <option value="1">正常</option>
+ <option value="2">冻结</option>
+ </#SelectCon>
+ </div>
+ <div class="col-sm-3">
+ <#NameCon id="companyName" name="注册地所在分公司" />
+ </div>
+ <div class="col-sm-3">
+ <#button name="搜索" icon="fa-search" clickFun="TUser.search()"/>
+ <#button name="重置" icon="fa-trash" clickFun="TUser.resetSearch()" space="true"/>
+ <#button btnCss="info" name="确定" id="ensure" icon="fa-check" clickFun="TUser.selectUserOpt()" space="true"/>
+ <#button btnCss="danger" name="取消" id="cancel" icon="fa-eraser" clickFun="TUser.close()" space="true"/>
+
+ </div>
+ </div>
+ <#table id="TUserTable"/>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/sysCouponActivity/tUser.js"></script>
+<script>
+ laydate.render({
+ elem: '#insertTime'
+ ,range: true
+ });
+</script>
+@}
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/sysCouponRecord/sysCouponRecord.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/sysCouponRecord/sysCouponRecord.html
new file mode 100644
index 0000000..64de3fe
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/sysCouponRecord/sysCouponRecord.html
@@ -0,0 +1,61 @@
+@layout("/common/_container.html"){
+<div class="row">
+ <div class="col-sm-12">
+ <div class="ibox float-e-margins">
+ <div class="ibox-title">
+ <h5>优惠券管理</h5>
+ </div>
+ <div class="ibox-content">
+ <div class="row row-lg">
+ <div class="col-sm-12">
+ <div class="row">
+ <div class="col-sm-3">
+ <#TimeCon id="createTime" name="添加时间" isTime="false"/>
+ </div>
+ <div class="col-sm-3">
+ <#SelectCon id="couponUseType" name="优惠券类型" >
+ <option value="">全部</option>
+ <option value="0">通用券</option>
+ <option value="1">专车券</option>
+ <option value="2">出租车券</option>
+ <option value="3">跨城出行券</option>
+ </#SelectCon>
+ </div>
+ <div class="col-sm-3">
+ <#SelectCon id="couponType" name="服务类型" >
+ <option value="">全部</option>
+ <option value="1">抵扣</option>
+ <option value="2">满减</option>
+ </#SelectCon>
+ </div>
+ <div class="col-sm-3">
+ <#button name="搜索" icon="fa-search" clickFun="SysCouponRecord.search()"/>
+ <#button name="重置" icon="fa-search" clickFun="SysCouponRecord.resetSearch()"/>
+ </div>
+ </div>
+ <div class="hidden-xs" id="SysCouponRecordTableToolbar" role="group">
+ @if(shiro.hasPermission("/sysCouponRecord/add")){
+ <#button name="添加" icon="fa-plus" clickFun="SysCouponRecord.openAddSysCouponRecord()"/>
+ @}
+ @if(shiro.hasPermission("/sysCouponRecord/update")){
+ <#button name="修改" icon="fa-edit" clickFun="SysCouponRecord.openSysCouponRecordDetail()" space="true"/>
+ @}
+ @if(shiro.hasPermission("/sysCouponRecord/delete")){
+ <#button name="删除" icon="fa-remove" clickFun="SysCouponRecord.delete()" space="true"/>
+ @}
+ </div>
+ <#table id="SysCouponRecordTable"/>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/sysCouponRecord/sysCouponRecord.js"></script>
+<script>
+ laydate.render({
+ elem: '#createTime'
+ ,range: true
+ });
+</script>
+@}
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/sysCouponRecord/sysCouponRecord_add.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/sysCouponRecord/sysCouponRecord_add.html
new file mode 100644
index 0000000..aae3c66
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/sysCouponRecord/sysCouponRecord_add.html
@@ -0,0 +1,57 @@
+@layout("/common/_container.html"){
+<div class="ibox float-e-margins">
+ <div class="ibox-content">
+ <div class="form-horizontal"id="sysCouponRecordInfoForm">
+
+ <div class="row">
+ <div class="col-sm-6">
+ <#input id="name" name="名称" underline="true" placeholder="最多20个字"/>
+ <div class="form-group">
+ <label class="col-sm-3 control-label">优惠券类型</label>
+ <div class="col-sm-9">
+ <select class="form-control" id="couponType" name="couponType"
+ onchange="changeType()"
+ >
+ <option value="1">抵扣券</option>
+ <option value="2">满减券</option>
+ </select>
+ </div>
+ </div>
+ <#select id="couponUseType" name="服务类型" underline="true">
+ <option value="1">专车券</option>
+ <option value="2">出租车券</option>
+ <option value="3">跨城出行券</option>
+ <option value="0">通用券</option>
+ </#select>
+ <#input id="money" name="金额" underline="true" placeholder="最多4位数字"/>
+ <div class="form-group" id="fullMoneys" style="display: none">
+ <label class="col-sm-3 control-label">条件金额：</label>
+ <div class="col-sm-9">
+ <input class="form-control" id="fullMoney" name="fullMoney" >
+ </div>
+ </div>
+ </div>
+ </div>
+
+ <div class="row btn-group-m-t">
+ <div class="col-sm-10">
+ <#button btnCss="info" name="提交" id="ensure" icon="fa-check" clickFun="SysCouponRecordInfoDlg.addSubmit()"/>
+ <#button btnCss="danger" name="取消" id="cancel" icon="fa-eraser" clickFun="SysCouponRecordInfoDlg.close()"/>
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/sysCouponRecord/sysCouponRecord_info.js"></script>
+<script>
+ function changeType(){
+ if($("#couponType").val()==2){
+ $("#fullMoneys").show();
+ }else{
+ $("#fullMoneys").hide();
+ }
+
+ }
+</script>
+@}
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/sysCouponRecord/sysCouponRecord_edit.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/sysCouponRecord/sysCouponRecord_edit.html
new file mode 100644
index 0000000..3dc5f02
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/sysCouponRecord/sysCouponRecord_edit.html
@@ -0,0 +1,34 @@
+@layout("/common/_container.html"){
+<div class="ibox float-e-margins">
+ <div class="ibox-content">
+ <div class="form-horizontal">
+
+ <div class="row">
+ <div class="col-sm-6 b-r">
+ <#input id="id" name="" value="${item.id}" underline="true"/>
+ <#input id="money" name="金额" value="${item.money}" underline="true"/>
+ <#input id="fullMoney" name="满减金额" value="${item.fullMoney}" underline="true"/>
+ <#input id="insertTime" name="添加时间" value="${item.insertTime}" underline="true"/>
+ <#input id="companyId" name="公司id" value="${item.companyId}" />
+ </div>
+
+ <div class="col-sm-6">
+ <#input id="couponUseType" name="优惠券使用类型(0=通用，1=专车，2=出租车，3=城际，4=小件物流)" value="${item.couponUseType}" underline="true"/>
+ <#input id="couponType" name="优惠券类型(1=抵扣，2=满减)" value="${item.couponType}" underline="true"/>
+ <#input id="name" name="优惠券名称" value="${item.name}" underline="true"/>
+ <#input id="effective" name="有效天数" value="${item.effective}" />
+ </div>
+ </div>
+
+ <div class="row btn-group-m-t">
+ <div class="col-sm-10">
+ <#button btnCss="info" name="提交" id="ensure" icon="fa-check" clickFun="SysCouponRecordInfoDlg.editSubmit()"/>
+ <#button btnCss="danger" name="取消" id="cancel" icon="fa-eraser" clickFun="SysCouponRecordInfoDlg.close()"/>
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/sysCouponRecord/sysCouponRecord_info.js"></script>
+@}
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/sysRedPacketRecord/sysRedPacketRecord.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/sysRedPacketRecord/sysRedPacketRecord.html
new file mode 100644
index 0000000..4752c82
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/sysRedPacketRecord/sysRedPacketRecord.html
@@ -0,0 +1,45 @@
+@layout("/common/_container.html"){
+<div class="row">
+ <div class="col-sm-12">
+ <div class="ibox float-e-margins">
+ <div class="ibox-title">
+ <h5>红包管理</h5>
+ </div>
+ <div class="ibox-content">
+ <div class="row row-lg">
+ <div class="col-sm-12">
+ <div class="row">
+ <div class="col-sm-3">
+ <#TimeCon id="createTime" name="添加时间" isTime="false"/>
+ </div>
+ <div class="col-sm-3">
+ <#button name="搜索" icon="fa-search" clickFun="SysRedPacketRecord.search()"/>
+ <#button name="重置" icon="fa-trash" clickFun="SysRedPacketRecord.resetSearch()" space="true"/>
+ </div>
+ </div>
+ <div class="hidden-xs" id="SysRedPacketRecordTableToolbar" role="group">
+ @if(shiro.hasPermission("/sysRedPacketRecord/add")){
+ <#button name="添加" icon="fa-plus" clickFun="SysRedPacketRecord.openAddSysRedPacketRecord()"/>
+ @}
+ @if(shiro.hasPermission("/sysRedPacketRecord/update")){
+ <#button name="修改" icon="fa-edit" clickFun="SysRedPacketRecord.openSysRedPacketRecordDetail()" space="true"/>
+ @}
+ @if(shiro.hasPermission("/sysRedPacketRecord/delete")){
+ <#button name="删除" icon="fa-remove" clickFun="SysRedPacketRecord.delete()" space="true"/>
+ @}
+ </div>
+ <#table id="SysRedPacketRecordTable"/>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/sysRedPacketRecord/sysRedPacketRecord.js"></script>
+<script>
+ laydate.render({
+ elem: '#createTime'
+ ,range: true
+ });
+</script>
+@}
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/sysRedPacketRecord/sysRedPacketRecord_add.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/sysRedPacketRecord/sysRedPacketRecord_add.html
new file mode 100644
index 0000000..44f02c6
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/sysRedPacketRecord/sysRedPacketRecord_add.html
@@ -0,0 +1,82 @@
+@layout("/common/_container.html"){
+<div class="ibox float-e-margins">
+ <div class="ibox-content">
+ <div class="form-horizontal" id="sysRedPacketRecordInfoForm">
+
+ <div class="row">
+ <div class="col-sm-12">
+ <div class="form-group">
+ <label class="col-sm-2 control-label">红包名称</label>
+ <div class="col-sm-5">
+ <input id="name" style="width: 170px;height: 35px;" placeholder="最多15个字">
+ </div>
+ </div>
+ </div>
+ <div class="col-sm-12">
+ <div class="form-group">
+ <label class="col-sm-2 control-label">红包金额类型</label>
+ <div class="col-sm-5">
+ <label style="margin: 0 10px"><input type="radio" checked="checked" name="type" value="1" onclick="changeDiv(1)">固定金额</label>
+ <label style="margin: 0 10px"><input type="radio" name="type" value="2" onclick="changeDiv(2)" >随机金额</label>
+ </div>
+ </div>
+ </div>
+ <div class="col-sm-12">
+ <div class="form-group">
+ <label class="col-sm-2 control-label">总金额</label>
+ <div class="col-sm-5">
+ <input id="totalMoney" style="width: 170px;height: 35px;" placeholder="最多8位数"> 元
+ </div>
+ </div>
+ </div>
+ <div class="col-sm-12" id="moneyDiv">
+ <div class="form-group">
+ <label class="col-sm-2 control-label">每个红包金额</label>
+ <div class="col-sm-5">
+ <input id="money" style="width: 170px;height: 35px;" placeholder="最多3位数"> 元
+ </div>
+ </div>
+ </div>
+ <div class="col-sm-12" id="moneySectionDiv" style="display: none;">
+ <div class="form-group">
+ <label class="col-sm-2 control-label">每个红包金额范围</label>
+ <div class="col-sm-5">
+ <input id="startMoney" style="width: 80px;height: 35px;"> -
+ <input id="endMoney" style="width: 80px;height: 35px;"> 元
+ </div>
+ </div>
+ </div>
+ <div class="col-sm-12">
+ <div class="form-group">
+ <label class="col-sm-2 control-label">有效天数</label>
+ <div class="col-sm-5">
+ <input id="effective" style="width: 170px;height: 35px;"> 天
+ </div>
+ </div>
+ </div>
+ </div>
+
+ <div class="row btn-group-m-t">
+ <div class="col-sm-10">
+ <#button btnCss="info" name="提交" id="ensure" icon="fa-check" clickFun="SysRedPacketRecordInfoDlg.addSubmit()"/>
+ <#button btnCss="danger" name="取消" id="cancel" icon="fa-eraser" clickFun="SysRedPacketRecordInfoDlg.close()"/>
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/sysRedPacketRecord/sysRedPacketRecord_info.js"></script>
+<script>
+ function changeDiv(type){
+ if(type==1){
+ $("#moneySectionDiv").hide();
+ $("#moneyDiv").show();
+ }else{
+ $("#moneySectionDiv").show();
+ $("#moneyDiv").hide();
+ }
+ }
+
+</script>
+@}
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/sysRedPacketRecord/sysRedPacketRecord_edit.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/sysRedPacketRecord/sysRedPacketRecord_edit.html
new file mode 100644
index 0000000..e66baa3
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/sysRedPacketRecord/sysRedPacketRecord_edit.html
@@ -0,0 +1,34 @@
+@layout("/common/_container.html"){
+<div class="ibox float-e-margins">
+ <div class="ibox-content">
+ <div class="form-horizontal">
+
+ <div class="row">
+ <div class="col-sm-6 b-r">
+ <#input id="id" name="" value="${item.id}" underline="true"/>
+ <#input id="money" name="金额" value="${item.money}" underline="true"/>
+ <#input id="name" name="红包名称" value="${item.name}" underline="true"/>
+ <#input id="type" name="类型(1=固定金额，2=随机金额)" value="${item.type}" />
+ </div>
+
+ <div class="col-sm-6">
+ <#input id="totalMoney" name="总金额" value="${item.totalMoney}" underline="true"/>
+ <#input id="laveMoney" name="剩余金额" value="${item.laveMoney}" underline="true"/>
+ <#input id="startMoney" name="开始金额" value="${item.startMoney}" underline="true"/>
+ <#input id="endMoney" name="结束金额" value="${item.endMoney}" underline="true"/>
+ <#input id="effective" name="有效天数" value="${item.effective}" underline="true"/>
+ </div>
+ </div>
+
+ <div class="row btn-group-m-t">
+ <div class="col-sm-10">
+ <#button btnCss="info" name="提交" id="ensure" icon="fa-check" clickFun="SysRedPacketRecordInfoDlg.editSubmit()"/>
+ <#button btnCss="danger" name="取消" id="cancel" icon="fa-eraser" clickFun="SysRedPacketRecordInfoDlg.close()"/>
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/sysRedPacketRecord/sysRedPacketRecord_info.js"></script>
+@}
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tAdvertisement/tAdvertisement.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tAdvertisement/tAdvertisement.html
new file mode 100644
index 0000000..5547e7f
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tAdvertisement/tAdvertisement.html
@@ -0,0 +1,61 @@
+@layout("/common/_container.html"){
+<div class="row">
+ <div class="col-sm-12">
+ <div class="ibox float-e-margins">
+ <div class="ibox-title">
+ <h5>广告设置管理</h5>
+ </div>
+ <div class="ibox-content">
+ <div class="row row-lg">
+ <div class="col-sm-12">
+ <div class="row">
+ <div class="col-sm-3">
+ <#TimeCon id="insertTime" name="添加时间" isTime="false"/>
+ </div>
+ <div class="col-sm-3">
+ <#NameCon id="name" name="广告名称" />
+ </div>
+ <div class="col-sm-3">
+ <#SelectCon id="type" name="广告类型" >
+ <option value="">全部</option>
+ <option value="1">弹窗广告</option>
+ <option value="2">首页底部广告</option>
+ </#SelectCon>
+ </div>
+ <div class="col-sm-3">
+ <#button name="搜索" icon="fa-search" clickFun="TAdvertisement.search()"/>
+ <#button name="重置" icon="fa-trash" clickFun="TAdvertisement.resetSearch()" space="true"/>
+ </div>
+ </div>
+ <div class="hidden-xs" id="TAdvertisementTableToolbar" role="group">
+ @if(shiro.hasPermission("/tAdvertisement/add")){
+ <#button name="添加" icon="fa-plus" clickFun="TAdvertisement.openAddTAdvertisement()"/>
+ @}
+ @if(shiro.hasPermission("/tAdvertisement/update")){
+ <#button name="编辑" icon="fa-edit" clickFun="TAdvertisement.openTAdvertisementDetail()" space="true"/>
+ @}
+ @if(shiro.hasPermission("/tAdvertisement/delete")){
+ <#button name="删除" icon="fa-remove" clickFun="TAdvertisement.delete()" space="true"/>
+ @}
+ @if(shiro.hasPermission("/tAdvertisement/up")){
+ <#button name="上线" icon="fa-remove" clickFun="TAdvertisement.up()" space="true"/>
+ @}
+ @if(shiro.hasPermission("/tAdvertisement/down")){
+ <#button name="下线" icon="fa-remove" clickFun="TAdvertisement.down()" space="true"/>
+ @}
+ </div>
+ <#table id="TAdvertisementTable"/>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/tAdvertisement/tAdvertisement.js"></script>
+<script>
+ laydate.render({
+ elem: '#insertTime'
+ ,range: true
+ });
+</script>
+@}
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tAdvertisement/tAdvertisement_add.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tAdvertisement/tAdvertisement_add.html
new file mode 100644
index 0000000..34f542d
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tAdvertisement/tAdvertisement_add.html
@@ -0,0 +1,58 @@
+@layout("/common/_container.html"){
+<div class="ibox float-e-margins">
+ <div class="ibox-content">
+ <div class="form-horizontal" id="advertisementInfoForm">
+
+ <div class="row">
+ <div class="col-sm-10">
+ <#input id="name" name="广告图名称"/>
+ <#avatar id="imgUrl" name="广告图图片：" />
+ <#select id="type" name="广告类型：">
+ <option value="">选择广告类型</option>
+ <option value="1">弹窗广告</option>
+ <option value="2">首页底部广告</option>
+ </#select>
+ <#select id="provinceId" name="所属省：">
+ <option value="">选择所属省</option>
+ @for(province in list){
+ <option value="${province.id}"> ${province.name} </option>
+ @}
+ </#select>
+ <#select id="isJump" name="是否跳转：" onchange="TAdvertisementInfoDlg.isJump()">
+ <option value="">选择是否跳转</option>
+ <option value="1">是</option>
+ <option value="2">否</option>
+ </#select>
+ <div id="yesDiv" style="display: none;">
+ <#select id="jumpType" name="跳转类型：" onchange="TAdvertisementInfoDlg.jumpType()">
+ <option value="">选择跳转类型</option>
+ <option value="1">外部</option>
+ <option value="2">内部</option>
+ </#select>
+ <div id="internalDiv" style="display: none;">
+ <#input id="jumpUrl" name="跳转路径"/>
+ </div>
+ <div id="externalDiv" style="display: none;">
+ <div class="form-group" id="contentDiv">
+ <label class="col-sm-3 control-label">跳转内容：</label>
+ <div class="col-sm-9">
+ <textarea type="text/plain" id="editor" style="width:100%;height:350px;"></textarea>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+
+ <div class="row btn-group-m-t">
+ <div class="col-sm-10 col-sm-offset-5">
+ <#button btnCss="info" name="提交" id="ensure" icon="fa-check" clickFun="TAdvertisementInfoDlg.addSubmit()"/>
+ <#button btnCss="danger" name="取消" id="cancel" icon="fa-eraser" clickFun="TAdvertisementInfoDlg.close()"/>
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/tAdvertisement/tAdvertisement_info.js"></script>
+@}
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tAdvertisement/tAdvertisement_edit.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tAdvertisement/tAdvertisement_edit.html
new file mode 100644
index 0000000..70b2fa1
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tAdvertisement/tAdvertisement_edit.html
@@ -0,0 +1,79 @@
+@layout("/common/_container.html"){
+<div class="ibox float-e-margins">
+ <div class="ibox-content">
+ <div class="form-horizontal" id="advertisementInfoForm">
+ <input type="hidden" id="id" name="id" value="${item.id}">
+ <div class="row">
+ <div class="col-sm-10">
+ <#input id="name" name="广告图名称" value="${item.name}"/>
+ <#avatar id="imgUrl" name="广告图图片：" avatarImg="${item.imgUrl}"/>
+ <#select id="type" name="广告类型：">
+ <option value="">选择广告类型</option>
+ <option value="1" ${1 == item.type ? 'selected=selected' : ''}>弹窗广告</option>
+ <option value="2" ${2 == item.type ? 'selected=selected' : ''}>首页底部广告</option>
+ </#select>
+ <#select id="provinceId" name="所属省：">
+ <option value="">选择所属省</option>
+ @for(province in list){
+ <option value="${province.id}" ${province.id == item.provinceId ? 'selected=selected' : ''}> ${province.name} </option>
+ @}
+ </#select>
+ <#select id="isJump" name="是否跳转：" onchange="TAdvertisementInfoDlg.isJump()">
+ <option value="">选择是否跳转</option>
+ <option value="1" ${1 == item.isJump ? 'selected=selected' : ''}>是</option>
+ <option value="2" ${2 == item.isJump ? 'selected=selected' : ''}>否</option>
+ </#select>
+ <div id="yesDiv" style="display: none;">
+ <#select id="jumpType" name="跳转类型：" onchange="TAdvertisementInfoDlg.jumpType()">
+ <option value="">选择跳转类型</option>
+ <option value="1" ${1 == item.jumpType ? 'selected=selected' : ''}>外部</option>
+ <option value="2" ${2 == item.jumpType ? 'selected=selected' : ''}>内部</option>
+ </#select>
+ <div id="internalDiv" style="display: none;">
+ <#input id="jumpUrl" name="跳转路径" value="${item.jumpUrl}"/>
+ </div>
+ <div id="externalDiv" style="display: none;">
+ <div class="form-group" id="contentDiv">
+ <label class="col-sm-3 control-label">跳转内容：</label>
+ <div class="col-sm-9">
+ <textarea type="text/plain" id="editor" style="width:100%;height:350px;">${item.content}</textarea>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+
+ <div class="row btn-group-m-t">
+ <div class="col-sm-10 col-sm-offset-5">
+ <#button btnCss="info" name="提交" id="ensure" icon="fa-check" clickFun="TAdvertisementInfoDlg.editSubmit()"/>
+ <#button btnCss="danger" name="取消" id="cancel" icon="fa-eraser" clickFun="TAdvertisementInfoDlg.close()"/>
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/tAdvertisement/tAdvertisement_info.js"></script>
+<script type="text/javascript">
+ $(function() {
+ var isJump = $("#isJump").val();
+ if (1 == isJump){
+ $("#yesDiv").show();
+ }else{
+ $("#yesDiv").hide();
+ }
+ var jumpType = $("#jumpType").val();
+ if (1 == jumpType){
+ $("#internalDiv").show();
+ $("#externalDiv").hide();
+ } else if (2 == jumpType) {
+ $("#internalDiv").hide();
+ $("#externalDiv").show();
+ } else {
+ $("#internalDiv").hide();
+ $("#externalDiv").hide();
+ }
+ });
+</script>
+@}
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tAgreement/commonProblem.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tAgreement/commonProblem.html
new file mode 100644
index 0000000..0b4a77a
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tAgreement/commonProblem.html
@@ -0,0 +1,65 @@
+@layout("/common/_container.html"){
+<style>
+ .newWidth, .single-line{
+ max-width:350px !important;display: initial !important;
+ }
+</style>
+<div class="row">
+ <div class="col-sm-12">
+ <div class="ibox float-e-margins">
+ <div class="ibox-content">
+ <div class="row row-lg">
+ <div class="col-sm-12">
+ <div class="tabs-container">
+ <ul class="nav nav-tabs">
+ <li class="active"><a data-toggle="tab" href="#tab-1" aria-expanded="true">常见问题设置</a></li>
+ </ul>
+ <div class="tab-content">
+ <div id="tab-1" class="tab-pane active">
+ <div class="panel-body">
+ <textarea id="editor_1" type="text/plain" style="width:1200px;height:400px;">${one.content}</textarea>
+ <div class="row btn-group-m-t">
+ <div class="col-sm-10 col-sm-offset-5">
+ <#button btnCss="info" name="保存" id="ensure" icon="fa-check" clickFun="update_1(${one.id});"/>
+ </div>
+ </div>
+ </div>
+ </div>
+
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+</div>
+
+<script type="text/javascript">
+ var editor_1 = null;
+ $(function () {
+ //初始化编辑器
+ editor_1 = UE.getEditor('editor_1');
+ });
+
+ function update_1(id){
+ if (editor_1.getContentTxt() == ""){
+ Feng.error("内容不能为空!");
+ return;
+ }
+ submitData(editor_1.getContent(),id);
+ }
+
+ function submitData(content,id) {
+ //提交信息
+ var ajax = new $ax(Feng.ctxPath + "/tAgreement/updateAppParam", function(data){
+ Feng.success("编辑成功!");
+ },function(data){
+ Feng.error("编辑失败!" + data.responseJSON.message + "!");
+ });
+ ajax.set("context", content);
+ ajax.set("id", id);
+ ajax.start();
+ }
+</script>
+@}
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tAgreement/corssHtml.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tAgreement/corssHtml.html
new file mode 100644
index 0000000..263e853
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tAgreement/corssHtml.html
@@ -0,0 +1,65 @@
+@layout("/common/_container.html"){
+<style>
+ .newWidth, .single-line{
+ max-width:350px !important;display: initial !important;
+ }
+</style>
+<div class="row">
+ <div class="col-sm-12">
+ <div class="ibox float-e-margins">
+ <div class="ibox-content">
+ <div class="row row-lg">
+ <div class="col-sm-12">
+ <div class="tabs-container">
+ <ul class="nav nav-tabs">
+ <li class="active"><a data-toggle="tab" href="#tab-1" aria-expanded="true">跨城出行乘车须知</a></li>
+ </ul>
+ <div class="tab-content">
+ <div id="tab-1" class="tab-pane active">
+ <div class="panel-body">
+ <textarea id="editor_1" type="text/plain" style="width:1200px;height:400px;">${one.content}</textarea>
+ <div class="row btn-group-m-t">
+ <div class="col-sm-10 col-sm-offset-5">
+ <#button btnCss="info" name="保存" id="ensure" icon="fa-check" clickFun="update_1(${one.id});"/>
+ </div>
+ </div>
+ </div>
+ </div>
+
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+</div>
+
+<script type="text/javascript">
+ var editor_1 = null;
+ $(function () {
+ //初始化编辑器
+ editor_1 = UE.getEditor('editor_1');
+ });
+
+ function update_1(id){
+ if (editor_1.getContentTxt() == ""){
+ Feng.error("内容不能为空!");
+ return;
+ }
+ submitData(editor_1.getContent(),id);
+ }
+
+ function submitData(content,id) {
+ //提交信息
+ var ajax = new $ax(Feng.ctxPath + "/tAgreement/updateAppParam", function(data){
+ Feng.success("编辑成功!");
+ },function(data){
+ Feng.error("编辑失败!" + data.responseJSON.message + "!");
+ });
+ ajax.set("context", content);
+ ajax.set("id", id);
+ ajax.start();
+ }
+</script>
+@}
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tAgreement/driverRegister.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tAgreement/driverRegister.html
new file mode 100644
index 0000000..daa009c
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tAgreement/driverRegister.html
@@ -0,0 +1,65 @@
+@layout("/common/_container.html"){
+<style>
+ .newWidth, .single-line{
+ max-width:350px !important;display: initial !important;
+ }
+</style>
+<div class="row">
+ <div class="col-sm-12">
+ <div class="ibox float-e-margins">
+ <div class="ibox-content">
+ <div class="row row-lg">
+ <div class="col-sm-12">
+ <div class="tabs-container">
+ <ul class="nav nav-tabs">
+ <li class="active"><a data-toggle="tab" href="#tab-1" aria-expanded="true">司机注册协议设置</a></li>
+ </ul>
+ <div class="tab-content">
+ <div id="tab-1" class="tab-pane active">
+ <div class="panel-body">
+ <textarea id="editor_1" type="text/plain" style="width:1200px;height:400px;">${one.content}</textarea>
+ <div class="row btn-group-m-t">
+ <div class="col-sm-10 col-sm-offset-5">
+ <#button btnCss="info" name="保存" id="ensure" icon="fa-check" clickFun="update_1(${one.id});"/>
+ </div>
+ </div>
+ </div>
+ </div>
+
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+</div>
+
+<script type="text/javascript">
+ var editor_1 = null;
+ $(function () {
+ //初始化编辑器
+ editor_1 = UE.getEditor('editor_1');
+ });
+
+ function update_1(id){
+ if (editor_1.getContentTxt() == ""){
+ Feng.error("内容不能为空!");
+ return;
+ }
+ submitData(editor_1.getContentTxt(),id);
+ }
+
+ function submitData(content,id) {
+ //提交信息
+ var ajax = new $ax(Feng.ctxPath + "/tAgreement/updateAppParam", function(data){
+ Feng.success("编辑成功!");
+ },function(data){
+ Feng.error("编辑失败!" + data.responseJSON.message + "!");
+ });
+ ajax.set("context", content);
+ ajax.set("id", id);
+ ajax.start();
+ }
+</script>
+@}
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tAgreement/instructions.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tAgreement/instructions.html
new file mode 100644
index 0000000..10c0580
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tAgreement/instructions.html
@@ -0,0 +1,65 @@
+@layout("/common/_container.html"){
+<style>
+ .newWidth, .single-line{
+ max-width:350px !important;display: initial !important;
+ }
+</style>
+<div class="row">
+ <div class="col-sm-12">
+ <div class="ibox float-e-margins">
+ <div class="ibox-content">
+ <div class="row row-lg">
+ <div class="col-sm-12">
+ <div class="tabs-container">
+ <ul class="nav nav-tabs">
+ <li class="active"><a data-toggle="tab" href="#tab-1" aria-expanded="true">改派说明设置</a></li>
+ </ul>
+ <div class="tab-content">
+ <div id="tab-1" class="tab-pane active">
+ <div class="panel-body">
+ <textarea id="editor_1" type="text/plain" style="width:1200px;height:400px;">${one.content}</textarea>
+ <div class="row btn-group-m-t">
+ <div class="col-sm-10 col-sm-offset-5">
+ <#button btnCss="info" name="保存" id="ensure" icon="fa-check" clickFun="update_1(${one.id});"/>
+ </div>
+ </div>
+ </div>
+ </div>
+
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+</div>
+
+<script type="text/javascript">
+ var editor_1 = null;
+ $(function () {
+ //初始化编辑器
+ editor_1 = UE.getEditor('editor_1');
+ });
+
+ function update_1(id){
+ if (editor_1.getContentTxt() == ""){
+ Feng.error("内容不能为空!");
+ return;
+ }
+ submitData(editor_1.getContent(),id);
+ }
+
+ function submitData(content,id) {
+ //提交信息
+ var ajax = new $ax(Feng.ctxPath + "/tAgreement/updateAppParam", function(data){
+ Feng.success("编辑成功!");
+ },function(data){
+ Feng.error("编辑失败!" + data.responseJSON.message + "!");
+ });
+ ajax.set("context", content);
+ ajax.set("id", id);
+ ajax.start();
+ }
+</script>
+@}
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tAgreement/pricingRules.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tAgreement/pricingRules.html
new file mode 100644
index 0000000..939359b
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tAgreement/pricingRules.html
@@ -0,0 +1,65 @@
+@layout("/common/_container.html"){
+<style>
+ .newWidth, .single-line{
+ max-width:350px !important;display: initial !important;
+ }
+</style>
+<div class="row">
+ <div class="col-sm-12">
+ <div class="ibox float-e-margins">
+ <div class="ibox-content">
+ <div class="row row-lg">
+ <div class="col-sm-12">
+ <div class="tabs-container">
+ <ul class="nav nav-tabs">
+ <li class="active"><a data-toggle="tab" href="#tab-1" aria-expanded="true">计价规则设置</a></li>
+ </ul>
+ <div class="tab-content">
+ <div id="tab-1" class="tab-pane active">
+ <div class="panel-body">
+ <textarea id="editor_1" type="text/plain" style="width:1200px;height:400px;">${one.content}</textarea>
+ <div class="row btn-group-m-t">
+ <div class="col-sm-10 col-sm-offset-5">
+ <#button btnCss="info" name="保存" id="ensure" icon="fa-check" clickFun="update_1(${one.id});"/>
+ </div>
+ </div>
+ </div>
+ </div>
+
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+</div>
+
+<script type="text/javascript">
+ var editor_1 = null;
+ $(function () {
+ //初始化编辑器
+ editor_1 = UE.getEditor('editor_1');
+ });
+
+ function update_1(id){
+ if (editor_1.getContentTxt() == ""){
+ Feng.error("内容不能为空!");
+ return;
+ }
+ submitData(editor_1.getContent(),id);
+ }
+
+ function submitData(content,id) {
+ //提交信息
+ var ajax = new $ax(Feng.ctxPath + "/tAgreement/updateAppParam", function(data){
+ Feng.success("编辑成功!");
+ },function(data){
+ Feng.error("编辑失败!" + data.responseJSON.message + "!");
+ });
+ ajax.set("context", content);
+ ajax.set("id", id);
+ ajax.start();
+ }
+</script>
+@}
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tAgreement/tAgreement.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tAgreement/tAgreement.html
new file mode 100644
index 0000000..4a47ce4
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tAgreement/tAgreement.html
@@ -0,0 +1,105 @@
+@layout("/common/_container.html"){
+<style>
+ .newWidth, .single-line{
+ max-width:350px !important;display: initial !important;
+ }
+</style>
+<div class="row">
+ <div class="col-sm-12">
+ <div class="ibox float-e-margins">
+ <div class="ibox-content">
+ <div class="row row-lg">
+ <div class="col-sm-12">
+ <div class="tabs-container">
+ <ul class="nav nav-tabs">
+ <li class="active"><a data-toggle="tab" href="#tab-1" aria-expanded="true">注册协议</a></li>
+ <li class=""><a data-toggle="tab" href="#tab-2" aria-expanded="false">用户协议</a></li>
+ <li class=""><a data-toggle="tab" href="#tab-3" aria-expanded="false">隐私协议</a></li>
+ </ul>
+ <div class="tab-content">
+ <div id="tab-1" class="tab-pane active">
+ <div class="panel-body">
+ <textarea id="editor_1" type="text/plain" style="width:1200px;height:400px;">${one.content}</textarea>
+ <div class="row btn-group-m-t">
+ <div class="col-sm-10 col-sm-offset-5">
+ <#button btnCss="info" name="保存" id="ensure" icon="fa-check" clickFun="update_1(${one.id});"/>
+ </div>
+ </div>
+ </div>
+ </div>
+ <div id="tab-2" class="tab-pane">
+ <div class="panel-body">
+ <textarea type="text/plain" id="editor_2" style="width:1200px;height:400px;">${two.content}</textarea>
+ <div class="row btn-group-m-t">
+ <div class="col-sm-10 col-sm-offset-5">
+ <#button btnCss="info" name="保存" id="ensure" icon="fa-check" clickFun="update_2(${two.id});"/>
+ </div>
+ </div>
+ </div>
+ </div>
+ <div id="tab-3" class="tab-pane">
+ <div class="panel-body">
+ <textarea type="text/plain" id="editor_3" style="width:1200px;height:400px;">${three.content}</textarea>
+ <div class="row btn-group-m-t">
+ <div class="col-sm-10 col-sm-offset-5">
+ <#button btnCss="info" name="保存" id="ensure" icon="fa-check" clickFun="update_3(${three.id});"/>
+ </div>
+ </div>
+ </div>
+ </div>
+
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+</div>
+
+<script type="text/javascript">
+ var editor_1 = null;
+ var editor_2 = null;
+ var editor_3 = null;
+ $(function () {
+ //初始化编辑器
+ editor_1 = UE.getEditor('editor_1');
+ editor_2 = UE.getEditor('editor_2');
+ editor_3 = UE.getEditor('editor_3');
+ });
+
+ function update_1(id){
+ if (editor_1.getContentTxt() == ""){
+ Feng.error("内容不能为空!");
+ return;
+ }
+ submitData(editor_1.getContent(),id);
+ }
+ function update_2(id){
+ if (editor_2.getContentTxt() == ""){
+ Feng.error("内容不能为空!");
+ return;
+ }
+ submitData(editor_2.getContent(),id);
+ }
+ function update_3(id){
+ if (editor_3.getContentTxt() == ""){
+ Feng.error("内容不能为空!");
+ return;
+ }
+ submitData(editor_3.getContent(),id);
+ }
+
+ function submitData(content,id) {
+ //提交信息
+ var ajax = new $ax(Feng.ctxPath + "/tAgreement/updateAppParam", function(data){
+ Feng.success("编辑成功!");
+ },function(data){
+ Feng.error("编辑失败!" + data.responseJSON.message + "!");
+ });
+ ajax.set("context", content);
+ ajax.set("id", id);
+ ajax.start();
+ }
+</script>
+@}
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tAgreement/tAgreementCharterCar.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tAgreement/tAgreementCharterCar.html
new file mode 100644
index 0000000..1cdbaa0
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tAgreement/tAgreementCharterCar.html
@@ -0,0 +1,65 @@
+@layout("/common/_container.html"){
+<style>
+ .newWidth, .single-line{
+ max-width:350px !important;display: initial !important;
+ }
+</style>
+<div class="row">
+ <div class="col-sm-12">
+ <div class="ibox float-e-margins">
+ <div class="ibox-content">
+ <div class="row row-lg">
+ <div class="col-sm-12">
+ <div class="tabs-container">
+ <ul class="nav nav-tabs">
+ <li class="active"><a data-toggle="tab" href="#tab-1" aria-expanded="true">包车协议设置</a></li>
+ </ul>
+ <div class="tab-content">
+ <div id="tab-1" class="tab-pane active">
+ <div class="panel-body">
+ <textarea id="editor_1" type="text/plain" style="width:1200px;height:400px;">${one.content}</textarea>
+ <div class="row btn-group-m-t">
+ <div class="col-sm-10 col-sm-offset-5">
+ <#button btnCss="info" name="保存" id="ensure" icon="fa-check" clickFun="update_1(${one.id});"/>
+ </div>
+ </div>
+ </div>
+ </div>
+
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+</div>
+
+<script type="text/javascript">
+ var editor_1 = null;
+ $(function () {
+ //初始化编辑器
+ editor_1 = UE.getEditor('editor_1');
+ });
+
+ function update_1(id){
+ if (editor_1.getContentTxt() == ""){
+ Feng.error("内容不能为空!");
+ return;
+ }
+ submitData(editor_1.getContent(),id);
+ }
+
+ function submitData(content,id) {
+ //提交信息
+ var ajax = new $ax(Feng.ctxPath + "/tAgreement/updateAppParam", function(data){
+ Feng.success("编辑成功!");
+ },function(data){
+ Feng.error("编辑失败!" + data.responseJSON.message + "!");
+ });
+ ajax.set("context", content);
+ ajax.set("id", id);
+ ajax.start();
+ }
+</script>
+@}
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tAgreement/tAgreementDriver.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tAgreement/tAgreementDriver.html
new file mode 100644
index 0000000..4a47ce4
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tAgreement/tAgreementDriver.html
@@ -0,0 +1,105 @@
+@layout("/common/_container.html"){
+<style>
+ .newWidth, .single-line{
+ max-width:350px !important;display: initial !important;
+ }
+</style>
+<div class="row">
+ <div class="col-sm-12">
+ <div class="ibox float-e-margins">
+ <div class="ibox-content">
+ <div class="row row-lg">
+ <div class="col-sm-12">
+ <div class="tabs-container">
+ <ul class="nav nav-tabs">
+ <li class="active"><a data-toggle="tab" href="#tab-1" aria-expanded="true">注册协议</a></li>
+ <li class=""><a data-toggle="tab" href="#tab-2" aria-expanded="false">用户协议</a></li>
+ <li class=""><a data-toggle="tab" href="#tab-3" aria-expanded="false">隐私协议</a></li>
+ </ul>
+ <div class="tab-content">
+ <div id="tab-1" class="tab-pane active">
+ <div class="panel-body">
+ <textarea id="editor_1" type="text/plain" style="width:1200px;height:400px;">${one.content}</textarea>
+ <div class="row btn-group-m-t">
+ <div class="col-sm-10 col-sm-offset-5">
+ <#button btnCss="info" name="保存" id="ensure" icon="fa-check" clickFun="update_1(${one.id});"/>
+ </div>
+ </div>
+ </div>
+ </div>
+ <div id="tab-2" class="tab-pane">
+ <div class="panel-body">
+ <textarea type="text/plain" id="editor_2" style="width:1200px;height:400px;">${two.content}</textarea>
+ <div class="row btn-group-m-t">
+ <div class="col-sm-10 col-sm-offset-5">
+ <#button btnCss="info" name="保存" id="ensure" icon="fa-check" clickFun="update_2(${two.id});"/>
+ </div>
+ </div>
+ </div>
+ </div>
+ <div id="tab-3" class="tab-pane">
+ <div class="panel-body">
+ <textarea type="text/plain" id="editor_3" style="width:1200px;height:400px;">${three.content}</textarea>
+ <div class="row btn-group-m-t">
+ <div class="col-sm-10 col-sm-offset-5">
+ <#button btnCss="info" name="保存" id="ensure" icon="fa-check" clickFun="update_3(${three.id});"/>
+ </div>
+ </div>
+ </div>
+ </div>
+
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+</div>
+
+<script type="text/javascript">
+ var editor_1 = null;
+ var editor_2 = null;
+ var editor_3 = null;
+ $(function () {
+ //初始化编辑器
+ editor_1 = UE.getEditor('editor_1');
+ editor_2 = UE.getEditor('editor_2');
+ editor_3 = UE.getEditor('editor_3');
+ });
+
+ function update_1(id){
+ if (editor_1.getContentTxt() == ""){
+ Feng.error("内容不能为空!");
+ return;
+ }
+ submitData(editor_1.getContent(),id);
+ }
+ function update_2(id){
+ if (editor_2.getContentTxt() == ""){
+ Feng.error("内容不能为空!");
+ return;
+ }
+ submitData(editor_2.getContent(),id);
+ }
+ function update_3(id){
+ if (editor_3.getContentTxt() == ""){
+ Feng.error("内容不能为空!");
+ return;
+ }
+ submitData(editor_3.getContent(),id);
+ }
+
+ function submitData(content,id) {
+ //提交信息
+ var ajax = new $ax(Feng.ctxPath + "/tAgreement/updateAppParam", function(data){
+ Feng.success("编辑成功!");
+ },function(data){
+ Feng.error("编辑失败!" + data.responseJSON.message + "!");
+ });
+ ajax.set("context", content);
+ ajax.set("id", id);
+ ajax.start();
+ }
+</script>
+@}
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tAgreement/tAgreementLaw.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tAgreement/tAgreementLaw.html
new file mode 100644
index 0000000..0a28fd1
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tAgreement/tAgreementLaw.html
@@ -0,0 +1,65 @@
+@layout("/common/_container.html"){
+<style>
+ .newWidth, .single-line{
+ max-width:350px !important;display: initial !important;
+ }
+</style>
+<div class="row">
+ <div class="col-sm-12">
+ <div class="ibox float-e-margins">
+ <div class="ibox-content">
+ <div class="row row-lg">
+ <div class="col-sm-12">
+ <div class="tabs-container">
+ <ul class="nav nav-tabs">
+ <li class="active"><a data-toggle="tab" href="#tab-1" aria-expanded="true">法律法规设置</a></li>
+ </ul>
+ <div class="tab-content">
+ <div id="tab-1" class="tab-pane active">
+ <div class="panel-body">
+ <textarea id="editor_1" type="text/plain" style="width:1200px;height:400px;">${one.content}</textarea>
+ <div class="row btn-group-m-t">
+ <div class="col-sm-10 col-sm-offset-5">
+ <#button btnCss="info" name="保存" id="ensure" icon="fa-check" clickFun="update_1(${one.id});"/>
+ </div>
+ </div>
+ </div>
+ </div>
+
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+</div>
+
+<script type="text/javascript">
+ var editor_1 = null;
+ $(function () {
+ //初始化编辑器
+ editor_1 = UE.getEditor('editor_1');
+ });
+
+ function update_1(id){
+ if (editor_1.getContentTxt() == ""){
+ Feng.error("内容不能为空!");
+ return;
+ }
+ submitData(editor_1.getContent(),id);
+ }
+
+ function submitData(content,id) {
+ //提交信息
+ var ajax = new $ax(Feng.ctxPath + "/tAgreement/updateAppParam", function(data){
+ Feng.success("编辑成功!");
+ },function(data){
+ Feng.error("编辑失败!" + data.responseJSON.message + "!");
+ });
+ ajax.set("context", content);
+ ajax.set("id", id);
+ ajax.start();
+ }
+</script>
+@}
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tAgreement/tAgreementMe.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tAgreement/tAgreementMe.html
new file mode 100644
index 0000000..afc7dbc
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tAgreement/tAgreementMe.html
@@ -0,0 +1,65 @@
+@layout("/common/_container.html"){
+<style>
+ .newWidth, .single-line{
+ max-width:350px !important;display: initial !important;
+ }
+</style>
+<div class="row">
+ <div class="col-sm-12">
+ <div class="ibox float-e-margins">
+ <div class="ibox-content">
+ <div class="row row-lg">
+ <div class="col-sm-12">
+ <div class="tabs-container">
+ <ul class="nav nav-tabs">
+ <li class="active"><a data-toggle="tab" href="#tab-1" aria-expanded="true">关于我们设置</a></li>
+ </ul>
+ <div class="tab-content">
+ <div id="tab-1" class="tab-pane active">
+ <div class="panel-body">
+ <textarea id="editor_1" type="text/plain" style="width:1200px;height:400px;">${one.content}</textarea>
+ <div class="row btn-group-m-t">
+ <div class="col-sm-10 col-sm-offset-5">
+ <#button btnCss="info" name="保存" id="ensure" icon="fa-check" clickFun="update_1(${one.id});"/>
+ </div>
+ </div>
+ </div>
+ </div>
+
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+</div>
+
+<script type="text/javascript">
+ var editor_1 = null;
+ $(function () {
+ //初始化编辑器
+ editor_1 = UE.getEditor('editor_1');
+ });
+
+ function update_1(id){
+ if (editor_1.getContentTxt() == ""){
+ Feng.error("内容不能为空!");
+ return;
+ }
+ submitData(editor_1.getContent(),id);
+ }
+
+ function submitData(content,id) {
+ //提交信息
+ var ajax = new $ax(Feng.ctxPath + "/tAgreement/updateAppParam", function(data){
+ Feng.success("编辑成功!");
+ },function(data){
+ Feng.error("编辑失败!" + data.responseJSON.message + "!");
+ });
+ ajax.set("context", content);
+ ajax.set("id", id);
+ ajax.start();
+ }
+</script>
+@}
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tAgreement/tAgreementOrder.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tAgreement/tAgreementOrder.html
new file mode 100644
index 0000000..2177676
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tAgreement/tAgreementOrder.html
@@ -0,0 +1,65 @@
+@layout("/common/_container.html"){
+<style>
+ .newWidth, .single-line{
+ max-width:350px !important;display: initial !important;
+ }
+</style>
+<div class="row">
+ <div class="col-sm-12">
+ <div class="ibox float-e-margins">
+ <div class="ibox-content">
+ <div class="row row-lg">
+ <div class="col-sm-12">
+ <div class="tabs-container">
+ <ul class="nav nav-tabs">
+ <li class="active"><a data-toggle="tab" href="#tab-1" aria-expanded="true">取消订单说明</a></li>
+ </ul>
+ <div class="tab-content">
+ <div id="tab-1" class="tab-pane active">
+ <div class="panel-body">
+ <textarea id="editor_1" type="text/plain" style="width:1200px;height:400px;">${one.content}</textarea>
+ <div class="row btn-group-m-t">
+ <div class="col-sm-10 col-sm-offset-5">
+ <#button btnCss="info" name="保存" id="ensure" icon="fa-check" clickFun="update_1(${one.id});"/>
+ </div>
+ </div>
+ </div>
+ </div>
+
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+</div>
+
+<script type="text/javascript">
+ var editor_1 = null;
+ $(function () {
+ //初始化编辑器
+ editor_1 = UE.getEditor('editor_1');
+ });
+
+ function update_1(id){
+ if (editor_1.getContentTxt() == ""){
+ Feng.error("内容不能为空!");
+ return;
+ }
+ submitData(editor_1.getContent(),id);
+ }
+
+ function submitData(content,id) {
+ //提交信息
+ var ajax = new $ax(Feng.ctxPath + "/tAgreement/updateAppParam", function(data){
+ Feng.success("编辑成功!");
+ },function(data){
+ Feng.error("编辑失败!" + data.responseJSON.message + "!");
+ });
+ ajax.set("context", content);
+ ajax.set("id", id);
+ ajax.start();
+ }
+</script>
+@}
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tAgreement/tAgreementRecharge.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tAgreement/tAgreementRecharge.html
new file mode 100644
index 0000000..88ee69d
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tAgreement/tAgreementRecharge.html
@@ -0,0 +1,65 @@
+@layout("/common/_container.html"){
+<style>
+ .newWidth, .single-line{
+ max-width:350px !important;display: initial !important;
+ }
+</style>
+<div class="row">
+ <div class="col-sm-12">
+ <div class="ibox float-e-margins">
+ <div class="ibox-content">
+ <div class="row row-lg">
+ <div class="col-sm-12">
+ <div class="tabs-container">
+ <ul class="nav nav-tabs">
+ <li class="active"><a data-toggle="tab" href="#tab-1" aria-expanded="true">充值领券规则设置</a></li>
+ </ul>
+ <div class="tab-content">
+ <div id="tab-1" class="tab-pane active">
+ <div class="panel-body">
+ <textarea id="editor_1" type="text/plain" style="width:1200px;height:400px;">${one.content}</textarea>
+ <div class="row btn-group-m-t">
+ <div class="col-sm-10 col-sm-offset-5">
+ <#button btnCss="info" name="保存" id="ensure" icon="fa-check" clickFun="update_1(${one.id});"/>
+ </div>
+ </div>
+ </div>
+ </div>
+
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+</div>
+
+<script type="text/javascript">
+ var editor_1 = null;
+ $(function () {
+ //初始化编辑器
+ editor_1 = UE.getEditor('editor_1');
+ });
+
+ function update_1(id){
+ if (editor_1.getContentTxt() == ""){
+ Feng.error("内容不能为空!");
+ return;
+ }
+ submitData(editor_1.getContent(),id);
+ }
+
+ function submitData(content,id) {
+ //提交信息
+ var ajax = new $ax(Feng.ctxPath + "/tAgreement/updateAppParam", function(data){
+ Feng.success("编辑成功!");
+ },function(data){
+ Feng.error("编辑失败!" + data.responseJSON.message + "!");
+ });
+ ajax.set("context", content);
+ ajax.set("id", id);
+ ajax.start();
+ }
+</script>
+@}
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tAgreement/tAgreementSmallPieceLogistics.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tAgreement/tAgreementSmallPieceLogistics.html
new file mode 100644
index 0000000..da1ab70
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tAgreement/tAgreementSmallPieceLogistics.html
@@ -0,0 +1,65 @@
+@layout("/common/_container.html"){
+<style>
+ .newWidth, .single-line{
+ max-width:350px !important;display: initial !important;
+ }
+</style>
+<div class="row">
+ <div class="col-sm-12">
+ <div class="ibox float-e-margins">
+ <div class="ibox-content">
+ <div class="row row-lg">
+ <div class="col-sm-12">
+ <div class="tabs-container">
+ <ul class="nav nav-tabs">
+ <li class="active"><a data-toggle="tab" href="#tab-1" aria-expanded="true">小件物流协议设置</a></li>
+ </ul>
+ <div class="tab-content">
+ <div id="tab-1" class="tab-pane active">
+ <div class="panel-body">
+ <textarea id="editor_1" type="text/plain" style="width:1200px;height:400px;">${one.content}</textarea>
+ <div class="row btn-group-m-t">
+ <div class="col-sm-10 col-sm-offset-5">
+ <#button btnCss="info" name="保存" id="ensure" icon="fa-check" clickFun="update_1(${one.id});"/>
+ </div>
+ </div>
+ </div>
+ </div>
+
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+</div>
+
+<script type="text/javascript">
+ var editor_1 = null;
+ $(function () {
+ //初始化编辑器
+ editor_1 = UE.getEditor('editor_1');
+ });
+
+ function update_1(id){
+ if (editor_1.getContentTxt() == ""){
+ Feng.error("内容不能为空!");
+ return;
+ }
+ submitData(editor_1.getContent(),id);
+ }
+
+ function submitData(content,id) {
+ //提交信息
+ var ajax = new $ax(Feng.ctxPath + "/tAgreement/updateAppParam", function(data){
+ Feng.success("编辑成功!");
+ },function(data){
+ Feng.error("编辑失败!" + data.responseJSON.message + "!");
+ });
+ ajax.set("context", content);
+ ajax.set("id", id);
+ ajax.start();
+ }
+</script>
+@}
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tAgreement/tAgreementUser.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tAgreement/tAgreementUser.html
new file mode 100644
index 0000000..d7625bf
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tAgreement/tAgreementUser.html
@@ -0,0 +1,65 @@
+@layout("/common/_container.html"){
+<style>
+ .newWidth, .single-line{
+ max-width:350px !important;display: initial !important;
+ }
+</style>
+<div class="row">
+ <div class="col-sm-12">
+ <div class="ibox float-e-margins">
+ <div class="ibox-content">
+ <div class="row row-lg">
+ <div class="col-sm-12">
+ <div class="tabs-container">
+ <ul class="nav nav-tabs">
+ <li class="active"><a data-toggle="tab" href="#tab-1" aria-expanded="true">用户指南设置</a></li>
+ </ul>
+ <div class="tab-content">
+ <div id="tab-1" class="tab-pane active">
+ <div class="panel-body">
+ <textarea id="editor_1" type="text/plain" style="width:1200px;height:400px;">${one.content}</textarea>
+ <div class="row btn-group-m-t">
+ <div class="col-sm-10 col-sm-offset-5">
+ <#button btnCss="info" name="保存" id="ensure" icon="fa-check" clickFun="update_1(${one.id});"/>
+ </div>
+ </div>
+ </div>
+ </div>
+
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+</div>
+
+<script type="text/javascript">
+ var editor_1 = null;
+ $(function () {
+ //初始化编辑器
+ editor_1 = UE.getEditor('editor_1');
+ });
+
+ function update_1(id){
+ if (editor_1.getContentTxt() == ""){
+ Feng.error("内容不能为空!");
+ return;
+ }
+ submitData(editor_1.getContent(),id);
+ }
+
+ function submitData(content,id) {
+ //提交信息
+ var ajax = new $ax(Feng.ctxPath + "/tAgreement/updateAppParam", function(data){
+ Feng.success("编辑成功!");
+ },function(data){
+ Feng.error("编辑失败!" + data.responseJSON.message + "!");
+ });
+ ajax.set("context", content);
+ ajax.set("id", id);
+ ajax.start();
+ }
+</script>
+@}
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tCar/carInsurance.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tCar/carInsurance.html
new file mode 100644
index 0000000..aa23eeb
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tCar/carInsurance.html
@@ -0,0 +1,31 @@
+@layout("/common/_container.html"){
+<div class="row">
+ <div class="col-sm-12">
+ <div class="ibox float-e-margins">
+ <div class="ibox-title">
+ <h5>车辆保险管理</h5>
+ </div>
+ <div class="ibox-content">
+ <input type="hidden" id="carId" value="${carId}">
+ <div class="row row-lg">
+ <div class="col-sm-12">
+ <div class="hidden-xs" id="TCarTableToolbar" role="group">
+ @if(shiro.hasPermission("/CarInsurance/openAddCarInsurance")){
+ <#button name="添加" icon="fa-plus" clickFun="CarInsurance.openAddCarInsurance()"/>
+ @}
+ @if(shiro.hasPermission("/CarInsurance/openCarInsuranceDetail")){
+ <#button name="修改" icon="fa-edit" clickFun="CarInsurance.openCarInsuranceDetail()" space="true"/>
+ @}
+ @if(shiro.hasPermission("/CarInsurance/delete")){
+ <#button name="删除" icon="fa-remove" clickFun="CarInsurance.delete()" space="true"/>
+ @}
+ </div>
+ <#table id="TCarTable"/>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/tCar/carInsurance.js"></script>
+@}
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tCar/carInsuranceInfo.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tCar/carInsuranceInfo.html
new file mode 100644
index 0000000..c34faf8
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tCar/carInsuranceInfo.html
@@ -0,0 +1,35 @@
+@layout("/common/_container.html"){
+<div class="ibox float-e-margins">
+ <div class="ibox-content">
+ <div class="form-horizontal" id="carInfoForm">
+ <input type="hidden" id="carId" value="${carId}">
+ <input type="hidden" id="id" value="${id}">
+ <div class="row">
+ <div class="col-sm-11">
+ <#input id="insurCom" name="保险公司名称"/>
+ <#input id="insurNum" name="保险号" />
+ <#input id="insurType" name="保险类型"/>
+ <#input id="insurCount" name="保险金额" type="number"/>
+ <#input id="insurEff" name="保险生效日期" type="text" />
+ <#input id="insurExp" name="保险到期日期" type="text" />
+ </div>
+ </div>
+ <div class="row btn-group-m-t">
+ <div class="col-sm-10 col-sm-offset-5">
+ <#button btnCss="info" name="提交" id="ensure" icon="fa-check" clickFun="CarInsuranceInfo.addSubmit()"/>
+ <#button btnCss="danger" name="取消" id="cancel" icon="fa-eraser" clickFun="CarInsuranceInfo.close()"/>
+ </div>
+ </div>
+ </div>
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/tCar/carInsuranceInfo.js"></script>
+<script>
+ laydate.render({
+ elem: '#insurEff'
+ });
+ laydate.render({
+ elem: '#insurExp'
+ });
+</script>
+@}
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tCar/tCar.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tCar/tCar.html
new file mode 100644
index 0000000..bdcfe5a
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tCar/tCar.html
@@ -0,0 +1,90 @@
+@layout("/common/_container.html"){
+<div class="row">
+ <div class="col-sm-12">
+ <div class="ibox float-e-margins">
+ <div class="ibox-title">
+ <h5>车辆管理</h5>
+ </div>
+ <div class="ibox-content">
+ <div class="row row-lg">
+ <div class="col-sm-12">
+ <div class="row">
+ <div class="col-sm-3">
+ <#TimeCon id="createTime" name="添加时间" isTime="false"/>
+ </div>
+ <div class="col-sm-3">
+ <#NameCon id="id" name="车辆ID" />
+ </div>
+ <div class="col-sm-3">
+ <#NameCon id="brandName" name="车辆品牌" />
+ </div>
+ <div class="col-sm-3">
+ <#NameCon id="modelName" name="车辆类型" />
+ </div>
+ <div class="col-sm-3">
+ <#NameCon id="carColor" name="车辆颜色" />
+ </div>
+ <div class="col-sm-3">
+ <#NameCon id="serverStr" name="服务模式" />
+ </div>
+ <div class="col-sm-3">
+ <#NameCon id="carLicensePlate" name="车牌号" />
+ </div>
+ <div class="col-sm-3">
+ <#NameCon id="driverName" name="关联司机" />
+ </div>
+ <div class="col-sm-3">
+ <#NameCon id="companyName" name="所属分公司" />
+ </div>
+ <div class="col-sm-3">
+ <#NameCon id="franchiseeName" name="所属加盟商" />
+ </div>
+ <div class="col-sm-3">
+ <#button name="搜索" icon="fa-search" clickFun="TCar.search()"/>
+ <#button name="重置" icon="fa-trash" clickFun="TCar.resetSearch()" space="true"/>
+ </div>
+ <div class="col-sm-3">
+ <input type="file" name="file" style="width:0px;height:0px;" id="uploadEventFile" onchange="TCar.exportCar()">
+ </div>
+ </div>
+ <div class="hidden-xs" id="TCarTableToolbar" role="group">
+ @if(shiro.hasPermission("/tCar/add")){
+ <#button name="添加" icon="fa-plus" clickFun="TCar.openAddTCar()"/>
+ @}
+ @if(shiro.hasPermission("/tCar/update")){
+ <#button name="修改" icon="fa-edit" clickFun="TCar.openTCarDetail()" space="true"/>
+ @}
+ @if(shiro.hasPermission("/tCar/delete")){
+ <#button name="删除" icon="fa-remove" clickFun="TCar.delete()" space="true"/>
+ @}
+ @if(shiro.hasPermission("/tCar/inCar")){
+ <#button btnCss="info" name="下载模板" id="uploadModel" icon="fa fa-level-down" clickFun="TCar.uploadCarModel()" space="true"/>
+ <#button btnCss="danger" name="导入" id="uploadEventBtn" icon="fa fa-level-up" space="true"/>
+ @}
+ @if(shiro.hasPermission("/tCar/outCar")){
+ <#button name="导出" icon="fa-remove" clickFun="TCar.outCar()" space="true"/>
+ @}
+ @if(shiro.hasPermission("/tCar/carInsurance")){
+ <#button name="车辆保险" icon="fa-remove" clickFun="TCar.carInsurance()" space="true"/>
+ @}
+ </div>
+ <!--<div style="width: 100%;overflow-y: auto">
+ <div style="width:1920px">
+ <#table id="TCarTable"/>
+ </div>
+ </div>-->
+ <#table id="TCarTable"/>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/tCar/tCar.js"></script>
+<script>
+ laydate.render({
+ elem: '#createTime'
+ ,range: true
+ });
+</script>
+@}
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tCar/tCar_add.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tCar/tCar_add.html
new file mode 100644
index 0000000..a3836a4
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tCar/tCar_add.html
@@ -0,0 +1,198 @@
+@layout("/common/_container.html"){
+<div class="ibox float-e-margins">
+ <div class="ibox-content">
+ <div class="form-horizontal" id="carInfoForm">
+ <input type="hidden" id="roleType" name="roleType" value="${roleType}">
+ <div class="row">
+ <div class="col-sm-11">
+ <div class="form-group">
+ <label class="col-sm-3 control-label">所属机构：</label>
+ <div class="col-sm-9" style="display: flex;align-items: center;">
+ @if(roleType == 1){
+ <div class="radio radio-info radio-inline">
+ <input type="radio" id="companyType1" value="1" name="companyType" checked="" onclick="TCarInfoDlg.companyTypeClick(1)">
+ <label for="companyType1"> 平台车辆 </label>
+ </div>
+ <div class="radio radio-success radio-inline">
+ <input type="radio" id="companyTyp2" value="2" name="companyType" onclick="TCarInfoDlg.companyTypeClick(2)">
+ <label for="companyTyp2"> 加盟车辆 </label>
+ </div>
+ <!--<div id="companyDiv">-->
+ <select class="form-control companyDiv" id="oneId" onchange="TCarInfoDlg.oneChange(this)" style="width: 200px;display: none;">
+ <option value="">选择所属分公司</option>
+ @for(obj in companyList!){
+ <option value="${obj.id}">${obj.name}</option>
+ @}
+ </select>
+ <select class="form-control companyDiv" id="twoId" style="width: 200px;margin-left: 30px;display: none;">
+ <option value="">选择所属加盟商</option>
+ </select>
+ <!--</div>-->
+ @}else if(roleType == 2){
+ <span class="control-label">${objectName!}</span>
+ <select class="form-control" id="franchiseeId" style="width: 200px;margin-left: 30px;">
+ <option value="">选择所属加盟商</option>
+ @for(obj in franchiseeList!){
+ <option value="${obj.id}">${obj.name}</option>
+ @}
+ </select>
+ @}else if(roleType == 3){
+ <span class="control-label">${objectName!}</span>
+ @}
+ </div>
+ </div>
+ <div class="form-group">
+ <fieldset>
+ <label class="col-sm-3 control-label">服务模式：</label>
+ <div class="col-sm-9">
+ <div class="checkbox checkbox-success checkbox-inline">
+ <input type="checkbox" name="serverBox" id="serverBox1" value="1" onclick="TCarInfoDlg.zcServerClick()">
+ <label for="serverBox1"> 专车 </label>
+ </div>
+ <div class="checkbox checkbox-success checkbox-inline">
+ <input type="checkbox" name="serverBox" id="serverBox2" value="2">
+ <label for="serverBox2"> 出租车 </label>
+ </div>
+ <div class="checkbox checkbox-success checkbox-inline">
+ <input type="checkbox" name="serverBox" id="serverBox3" value="3" onclick="TCarInfoDlg.kcServerClick()">
+ <label for="serverBox3"> 跨城出行 </label>
+ </div>
+ <div class="checkbox checkbox-success checkbox-inline">
+ <input type="checkbox" name="serverBox" id="serverBox4" value="4">
+ <label for="serverBox4"> 小件物流-同城 </label>
+ </div>
+ <div class="checkbox checkbox-success checkbox-inline">
+ <input type="checkbox" name="serverBox" id="serverBox5" value="5">
+ <label for="serverBox5"> 小件物流-跨城 </label>
+ </div>
+ <div class="checkbox checkbox-success checkbox-inline">
+ <input type="checkbox" name="serverBox" id="serverBox6" value="6">
+ <label for="serverBox6"> 包车 </label>
+ </div>
+ </div>
+ </fieldset>
+ </div>
+ <div class="form-group" style="display: none;" id="zcModelDiv">
+ <label class="col-sm-3 control-label">专车车型：</label>
+ <div class="col-sm-9">
+ <select class="form-control" id="zcModel" name="zcModel">
+ <option value="">选择车型</option>
+ @for(obj in zcModelList){
+ <option value="${obj.id}">${obj.name}</option>
+ @}
+ </select>
+ </div>
+ </div>
+ <div class="form-group" style="display: none;" id="kcModelDiv">
+ <label class="col-sm-3 control-label">跨城出行车型：</label>
+ <div class="col-sm-9">
+ <select class="form-control" id="kcModel" name="kcModel">
+ <option value="">选择车型</option>
+ @for(obj in kcModelList){
+ <option value="${obj.id}">${obj.name}</option>
+ @}
+ </select>
+ </div>
+ </div>
+
+ <#select id="carBrandId" name="车辆品牌：" onchange="TCarInfoDlg.brandChange(this)">
+ <option value="">选择车辆品牌</option>
+ @for(obj in brandList){
+ <option value="${obj.id}">${obj.name}</option>
+ @}
+ </#select>
+ <#select id="carModelId" name="车辆类型：">
+ <option value="">选择车辆类型</option>
+ </#select>
+ <#select id="carColor" name="车辆颜色：">
+ <option value="">选择车辆颜色</option>
+ <option value="黑色">黑色</option>
+ <option value="银色">银色</option>
+ <option value="白色">白色</option>
+ <option value="红色">红色</option>
+ <option value="黄色">黄色</option>
+ <option value="橙色">橙色</option>
+ <option value="蓝色">蓝色</option>
+ </#select>
+ <#input id="carLicensePlate" name="车牌号" />
+ <#avatar id="carPhoto" name="车辆照片：" />
+ <#input id="drivingLicenseNumber" name="行驶证编号" />
+ <#avatar id="drivingLicensePhoto" name="行驶证照片：" />
+ <#input id="annualInspectionTime" name="年检到期时间" type="text"/>
+ <#input id="commercialInsuranceTime" name="商业保险到期时间" type="text"/>
+ <#input id="plateColor" name="车牌颜色" />
+ <#input id="vehicleType" name="车辆类型" />
+ <#input id="ownerName" name="车辆所有人" />
+ <#input id="engineId" name="发动机号" />
+ <#input id="VIN" name="车辆VIN码" />
+ <#input id="certifyDateA" name="车辆注册日期" type="text"/>
+ <#input id="fuelType" name="车辆燃料类型" />
+ <#input id="engineDisplace" name="发动机排量" />
+ <#input id="certificate" name="运输证字号" />
+ <#input id="transAgency" name="车辆运输证发证机构" />
+ <#input id="transArea" name="车辆经营区域" />
+ <#input id="transDateStart" name="车辆运输证有效期起" type="text"/>
+ <#input id="transDateStop" name="车辆运输证有效期止" type="text"/>
+ <#input id="certifyDateB" name="车辆初次登记日期" type="text"/>
+ <#select id="fixState" name="车辆维修状态：">
+ <option value="0">未检修</option>
+ <option value="1">已检修</option>
+ <option value="2">未知</option>
+ </#select>
+ <#input id="nextFixDate" name="车辆下次年检时间" type="text"/>
+ <#input id="checkState" name="车辆年度审核状态" />
+ <#input id="feePrintId" name="发票打印设备序列号" />
+ <#input id="GPSBrand" name="卫星定位装置品牌" />
+ <#input id="GPSModel" name="卫星定位装置型号" />
+ <#input id="GPSIMEI" name="卫星定位装置IMEI号" />
+ <#input id="GPSInstallDate" name="卫星定位装置安装时间" type="text"/>
+ <#input id="registerDate" name="车辆报备日期" type="text"/>
+ <#select id="commercialType" name="服务类型：">
+ <option value="1">网络预约出租车</option>
+ <option value="2">巡游出租汽车</option>
+ <option value="3">私人小客车合乘</option>
+ </#select>
+ </div>
+ </div>
+
+ <div class="row btn-group-m-t">
+ <div class="col-sm-10 col-sm-offset-5">
+ <#button btnCss="info" name="提交" id="ensure" icon="fa-check" clickFun="TCarInfoDlg.addSubmit()"/>
+ <#button btnCss="danger" name="取消" id="cancel" icon="fa-eraser" clickFun="TCarInfoDlg.close()"/>
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/tCar/tCar_info.js"></script>
+<script>
+ laydate.render({
+ elem: '#annualInspectionTime'
+ });
+ laydate.render({
+ elem: '#commercialInsuranceTime'
+ });
+ laydate.render({
+ elem: '#certifyDateA'
+ });
+ laydate.render({
+ elem: '#transDateStart'
+ });
+ laydate.render({
+ elem: '#transDateStop'
+ });
+ laydate.render({
+ elem: '#certifyDateB'
+ });
+ laydate.render({
+ elem: '#nextFixDate'
+ });
+ laydate.render({
+ elem: '#GPSInstallDate'
+ });
+ laydate.render({
+ elem: '#registerDate'
+ });
+</script>
+@}
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tCar/tCar_edit.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tCar/tCar_edit.html
new file mode 100644
index 0000000..e76e39b
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tCar/tCar_edit.html
@@ -0,0 +1,216 @@
+@layout("/common/_container.html"){
+<div class="ibox float-e-margins">
+ <div class="ibox-content">
+ <div class="form-horizontal" id="carInfoForm">
+ <input type="hidden" id="id" name="id" value="${item.id}">
+ <input type="hidden" id="roleType" name="roleType" value="${roleType}">
+ <div class="row">
+ <div class="col-sm-11">
+ <div class="form-group">
+ <label class="col-sm-3 control-label">所属机构：</label>
+ <div class="col-sm-9" style="display: flex;align-items: center;">
+ @if(roleType == 1){
+ <div class="radio radio-info radio-inline">
+ <input type="radio" id="companyType1" value="1" name="companyType" ${1 == companyType ? 'checked=checked' : ''} onclick="TCarInfoDlg.companyTypeClick(1)">
+ <label for="companyType1"> 平台车辆 </label>
+ </div>
+ <div class="radio radio-success radio-inline">
+ <input type="radio" id="companyTyp2" value="2" name="companyType" ${2 == companyType ? 'checked=checked' : ''} onclick="TCarInfoDlg.companyTypeClick(2)">
+ <label for="companyTyp2"> 加盟车辆 </label>
+ </div>
+ <select class="form-control companyDiv" id="oneId" onchange="TCarInfoDlg.oneChange(this)" style="width: 200px">
+ <option value="">选择所属分公司</option>
+ @for(obj in companyList!){
+ <option value="${obj.id}" ${obj.id == item.companyId ? 'selected=selected' : ''}>${obj.name}</option>
+ @}
+ </select>
+ <select class="form-control companyDiv" id="twoId" style="width: 200px;margin-left: 30px;">
+ <option value="">选择所属加盟商</option>
+ @for(obj in franchiseeList!){
+ <option value="${obj.id}" ${obj.id == item.franchiseeId ? 'selected=selected' : ''}>${obj.name}</option>
+ @}
+ </select>
+ @}else if(roleType == 2){
+ <span class="control-label">${objectName!}</span>
+ <select class="form-control" id="franchiseeId" style="width: 200px;margin-left: 30px;">
+ <option value="">选择所属加盟商</option>
+ @for(obj in franchiseeList!){
+ <option value="${obj.id}" ${obj.id == item.franchiseeId ? 'selected=selected' : ''}>${obj.name}</option>
+ @}
+ </select>
+ @}else if(roleType == 3){
+ <span class="control-label">${objectName!}</span>
+ @}
+ </div>
+ </div>
+ <div class="form-group">
+ <fieldset>
+ <label class="col-sm-3 control-label">服务模式：</label>
+ <div class="col-sm-9">
+ <div class="checkbox checkbox-success checkbox-inline">
+ <input type="checkbox" name="serverBox" id="serverBox1" value="1" ${2 == one ? 'checked=checked' : ''} onclick="TCarInfoDlg.zcServerClick()">
+ <label for="serverBox1"> 专车 </label>
+ </div>
+ <div class="checkbox checkbox-success checkbox-inline">
+ <input type="checkbox" name="serverBox" id="serverBox2" value="2" ${2 == two ? 'checked=checked' : ''}>
+ <label for="serverBox2"> 出租车 </label>
+ </div>
+ <div class="checkbox checkbox-success checkbox-inline">
+ <input type="checkbox" name="serverBox" id="serverBox3" value="3" ${2 == three ? 'checked=checked' : ''} onclick="TCarInfoDlg.kcServerClick()">
+ <label for="serverBox3"> 跨城出行 </label>
+ </div>
+ <div class="checkbox checkbox-success checkbox-inline">
+ <input type="checkbox" name="serverBox" id="serverBox4" value="4" ${2 == four ? 'checked=checked' : ''}>
+ <label for="serverBox4"> 小件物流-同城 </label>
+ </div>
+ <div class="checkbox checkbox-success checkbox-inline">
+ <input type="checkbox" name="serverBox" id="serverBox5" value="5" ${2 == five ? 'checked=checked' : ''}>
+ <label for="serverBox5"> 小件物流-跨城 </label>
+ </div>
+ <div class="checkbox checkbox-success checkbox-inline">
+ <input type="checkbox" name="serverBox" id="serverBox6" value="6" ${2 == six ? 'checked=checked' : ''}>
+ <label for="serverBox6"> 包车 </label>
+ </div>
+ </div>
+ </fieldset>
+ </div>
+ <div class="form-group" id="zcModelDiv">
+ <label class="col-sm-3 control-label">专车车型：</label>
+ <div class="col-sm-9">
+ <select class="form-control" id="zcModel" name="zcModel">
+ <option value="">选择车型</option>
+ @for(obj in zcModelList){
+ <option value="${obj.id}" ${obj.id == zcModel ? 'selected=selected' : ''}>${obj.name}</option>
+ @}
+ </select>
+ </div>
+ </div>
+ <div class="form-group" id="kcModelDiv">
+ <label class="col-sm-3 control-label">跨城出行车型：</label>
+ <div class="col-sm-9">
+ <select class="form-control" id="kcModel" name="kcModel">
+ <option value="">选择车型</option>
+ @for(obj in kcModelList){
+ <option value="${obj.id}" ${obj.id == kcModel ? 'selected=selected' : ''}>${obj.name}</option>
+ @}
+ </select>
+ </div>
+ </div>
+ <#select id="carBrandId" name="车辆品牌：" onchange="TCarInfoDlg.brandChange(this)">
+ <option value="">选择车辆品牌</option>
+ @for(obj in brandList){
+ <option value="${obj.id}" ${obj.id == item.carBrandId ? 'selected=selected' : ''}>${obj.name}</option>
+ @}
+ </#select>
+ <#select id="carModelId" name="车辆类型：">
+ <option value="">选择车辆类型</option>
+ @for(obj in modelList){
+ <option value="${obj.id}" ${obj.id == item.carModelId ? 'selected=selected' : ''}>${obj.name}</option>
+ @}
+ </#select>
+ <#select id="carColor" name="车辆颜色：">
+ <option value="">选择车辆颜色</option>
+ <option value="黑色" ${'黑色' == item.carColor ? 'selected=selected' : ''}>黑色</option>
+ <option value="银色" ${'银色' == item.carColor ? 'selected=selected' : ''}>银色</option>
+ <option value="白色" ${'白色' == item.carColor ? 'selected=selected' : ''}>白色</option>
+ <option value="红色" ${'红色' == item.carColor ? 'selected=selected' : ''}>红色</option>
+ <option value="黄色" ${'黄色' == item.carColor ? 'selected=selected' : ''}>黄色</option>
+ <option value="橙色" ${'橙色' == item.carColor ? 'selected=selected' : ''}>橙色</option>
+ <option value="蓝色" ${'蓝色' == item.carColor ? 'selected=selected' : ''}>蓝色</option>
+ </#select>
+ <#input id="carLicensePlate" name="车牌号" value="${item.carLicensePlate}"/>
+ <#avatar id="carPhoto" name="车辆照片：" avatarImg="${item.carPhoto}"/>
+ <#input id="drivingLicenseNumber" name="行驶证编号" value="${item.drivingLicenseNumber}"/>
+ <#avatar id="drivingLicensePhoto" name="行驶证照片：" avatarImg="${item.drivingLicensePhoto}"/>
+ <#input id="annualInspectionTime" name="年检到期时间" type="text" value="${item.annualInspectionTime}"/>
+ <#input id="commercialInsuranceTime" name="商业保险到期时间" type="text" value="${item.commercialInsuranceTime}"/>
+ <#input id="plateColor" name="车牌颜色" value="${item.plateColor}"/>
+ <#input id="vehicleType" name="车辆类型" value="${item.vehicleType}"/>
+ <#input id="ownerName" name="车辆所有人" value="${item.ownerName}"/>
+ <#input id="engineId" name="发动机号" value="${item.engineId}"/>
+ <#input id="VIN" name="车辆VIN码" value="${item.VIN}"/>
+ <#input id="certifyDateA" name="车辆注册日期" type="text" value="${item.certifyDateA}"/>
+ <#input id="fuelType" name="车辆燃料类型" value="${item.fuelType}"/>
+ <#input id="engineDisplace" name="发动机排量" value="${item.engineDisplace}"/>
+ <#input id="certificate" name="运输证字号" value="${item.certificate}"/>
+ <#input id="transAgency" name="车辆运输证发证机构" value="${item.transAgency}"/>
+ <#input id="transArea" name="车辆经营区域" value="${item.transArea}"/>
+ <#input id="transDateStart" name="车辆运输证有效期起" type="text" value="${item.transDateStart}"/>
+ <#input id="transDateStop" name="车辆运输证有效期止" type="text" value="${item.transDateStop}"/>
+ <#input id="certifyDateB" name="车辆初次登记日期" type="text" value="${item.certifyDateB}"/>
+ <#select id="fixState" name="车辆维修状态：">
+ <option value="0" ${'0' == item.fixState ? 'selected=selected' : ''}>未检修</option>
+ <option value="1" ${'1' == item.fixState ? 'selected=selected' : ''}>已检修</option>
+ <option value="2" ${'2' == item.fixState ? 'selected=selected' : ''}>未知</option>
+ </#select>
+ <#input id="nextFixDate" name="车辆下次年检时间" type="text" value="${item.nextFixDate}"/>
+ <#input id="checkState" name="车辆年度审核状态" value="${item.checkState}"/>
+ <#input id="feePrintId" name="发票打印设备序列号" value="${item.feePrintId}"/>
+ <#input id="GPSBrand" name="卫星定位装置品牌" value="${item.GPSBrand}"/>
+ <#input id="GPSModel" name="卫星定位装置型号" value="${item.GPSModel}"/>
+ <#input id="GPSIMEI" name="卫星定位装置IMEI号" value="${item.GPSIMEI}"/>
+ <#input id="GPSInstallDate" name="卫星定位装置安装时间" type="text" value="${item.GPSInstallDate}"/>
+ <#input id="registerDate" name="车辆报备日期" type="text" value="${item.registerDate}"/>
+ <#select id="commercialType" name="服务类型：">
+ <option value="1" ${'1' == item.commercialType ? 'selected=selected' : ''}>网络预约出租车</option>
+ <option value="2" ${'2' == item.commercialType ? 'selected=selected' : ''}>巡游出租汽车</option>
+ <option value="3" ${'3' == item.commercialType ? 'selected=selected' : ''}>私人小客车合乘</option>
+ </#select>
+ </div>
+ </div>
+
+ <div class="row btn-group-m-t">
+ <div class="col-sm-10 col-sm-offset-5">
+ <#button btnCss="info" name="提交" id="ensure" icon="fa-check" clickFun="TCarInfoDlg.editSubmit()"/>
+ <#button btnCss="danger" name="取消" id="cancel" icon="fa-eraser" clickFun="TCarInfoDlg.close()"/>
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/tCar/tCar_info.js"></script>
+<script>
+ laydate.render({
+ elem: '#annualInspectionTime'
+ });
+ laydate.render({
+ elem: '#commercialInsuranceTime'
+ });
+ laydate.render({
+ elem: '#certifyDateA'
+ });
+ laydate.render({
+ elem: '#transDateStart'
+ });
+ laydate.render({
+ elem: '#transDateStop'
+ });
+ laydate.render({
+ elem: '#certifyDateB'
+ });
+ laydate.render({
+ elem: '#nextFixDate'
+ });
+ laydate.render({
+ elem: '#GPSInstallDate'
+ });
+ laydate.render({
+ elem: '#registerDate'
+ });
+</script>
+<script type="application/javascript">
+ $(function() {
+ var companyType = $("input[name='companyType']:checked").val();
+ if (1 == companyType){
+ $(".companyDiv").hide();
+ } else if (2 == companyType){
+ $(".companyDiv").show();
+ }
+
+ TCarInfoDlg.zcServerClick();
+ TCarInfoDlg.kcServerClick();
+
+ });
+</script>
+@}
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tCarBrand/tCarBrand.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tCarBrand/tCarBrand.html
new file mode 100644
index 0000000..9355e97
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tCarBrand/tCarBrand.html
@@ -0,0 +1,48 @@
+@layout("/common/_container.html"){
+<div class="row">
+ <div class="col-sm-12">
+ <div class="ibox float-e-margins">
+ <div class="ibox-title">
+ <h5>车辆品牌管理</h5>
+ </div>
+ <div class="ibox-content">
+ <div class="row row-lg">
+ <div class="col-sm-12">
+ <div class="row">
+ <div class="col-sm-3">
+ <#TimeCon id="createTime" name="添加时间" isTime="false"/>
+ </div>
+ <div class="col-sm-3">
+ <#NameCon id="name" name="名称" />
+ </div>
+ <div class="col-sm-3">
+ <#button name="搜索" icon="fa-search" clickFun="TCarBrand.search()"/>
+ <#button name="重置" icon="fa-trash" clickFun="TCarBrand.resetSearch()" space="true"/>
+ </div>
+ </div>
+ <div class="hidden-xs" id="TCarBrandTableToolbar" role="group">
+ @if(shiro.hasPermission("/tCarBrand/add")){
+ <#button name="添加" icon="fa-plus" clickFun="TCarBrand.openAddTCarBrand()"/>
+ @}
+ @if(shiro.hasPermission("/tCarBrand/update")){
+ <#button name="编辑" icon="fa-edit" clickFun="TCarBrand.openTCarBrandDetail()" space="true"/>
+ @}
+ @if(shiro.hasPermission("/tCarBrand/delete")){
+ <#button name="删除" icon="fa-remove" clickFun="TCarBrand.delete()" space="true"/>
+ @}
+ </div>
+ <#table id="TCarBrandTable"/>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/tCarBrand/tCarBrand.js"></script>
+<script>
+ laydate.render({
+ elem: '#createTime'
+ ,range: true
+ });
+</script>
+@}
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tCarBrand/tCarBrand_add.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tCarBrand/tCarBrand_add.html
new file mode 100644
index 0000000..308916e
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tCarBrand/tCarBrand_add.html
@@ -0,0 +1,30 @@
+@layout("/common/_container.html"){
+<div class="ibox float-e-margins">
+ <div class="ibox-content">
+ <div class="form-horizontal" id="carBrandInfoForm">
+
+ <div class="row">
+ <div class="col-sm-11">
+ <#input id="name" name="品牌名称"/>
+ <#avatar id="imgUrl" name="品牌图标：" />
+ <div class="form-group">
+ <label class="col-sm-3 control-label">备注：</label>
+ <div class="col-sm-9">
+ <textarea type="text/plain" class="form-control" name="remark" id="remark" style="width:100%;height:150px;"></textarea>
+ </div>
+ </div>
+ </div>
+ </div>
+
+ <div class="row btn-group-m-t">
+ <div class="col-sm-10 col-sm-offset-5">
+ <#button btnCss="info" name="提交" id="ensure" icon="fa-check" clickFun="TCarBrandInfoDlg.addSubmit()"/>
+ <#button btnCss="danger" name="取消" id="cancel" icon="fa-eraser" clickFun="TCarBrandInfoDlg.close()"/>
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/tCarBrand/tCarBrand_info.js"></script>
+@}
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tCarBrand/tCarBrand_edit.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tCarBrand/tCarBrand_edit.html
new file mode 100644
index 0000000..7904907
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tCarBrand/tCarBrand_edit.html
@@ -0,0 +1,30 @@
+@layout("/common/_container.html"){
+<div class="ibox float-e-margins">
+ <div class="ibox-content">
+ <div class="form-horizontal" id="carBrandInfoForm">
+ <input type="hidden" id="id" name="id" value="${item.id}">
+ <div class="row">
+ <div class="col-sm-11">
+ <#input id="name" name="名称" value="${item.name}"/>
+ <#avatar id="imgUrl" name="品牌图标：" avatarImg="${item.imgUrl}"/>
+ <div class="form-group">
+ <label class="col-sm-3 control-label">备注：</label>
+ <div class="col-sm-9">
+ <textarea type="text/plain" class="form-control" name="remark" id="remark" style="width:100%;height:150px;">${item.remark}</textarea>
+ </div>
+ </div>
+ </div>
+ </div>
+
+ <div class="row btn-group-m-t">
+ <div class="col-sm-10 col-sm-offset-5">
+ <#button btnCss="info" name="提交" id="ensure" icon="fa-check" clickFun="TCarBrandInfoDlg.editSubmit()"/>
+ <#button btnCss="danger" name="取消" id="cancel" icon="fa-eraser" clickFun="TCarBrandInfoDlg.close()"/>
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/tCarBrand/tCarBrand_info.js"></script>
+@}
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tCarModel/tCarModel.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tCarModel/tCarModel.html
new file mode 100644
index 0000000..4158d58
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tCarModel/tCarModel.html
@@ -0,0 +1,48 @@
+@layout("/common/_container.html"){
+<div class="row">
+ <div class="col-sm-12">
+ <div class="ibox float-e-margins">
+ <div class="ibox-title">
+ <h5>车辆类型管理</h5>
+ </div>
+ <div class="ibox-content">
+ <div class="row row-lg">
+ <div class="col-sm-12">
+ <div class="row">
+ <div class="col-sm-3">
+ <#TimeCon id="createTime" name="添加时间" isTime="false"/>
+ </div>
+ <div class="col-sm-3">
+ <#NameCon id="name" name="名称" />
+ </div>
+ <div class="col-sm-3">
+ <#button name="搜索" icon="fa-search" clickFun="TCarModel.search()"/>
+ <#button name="重置" icon="fa-trash" clickFun="TCarModel.resetSearch()" space="true"/>
+ </div>
+ </div>
+ <div class="hidden-xs" id="TCarModelTableToolbar" role="group">
+ @if(shiro.hasPermission("/tCarModel/add")){
+ <#button name="添加" icon="fa-plus" clickFun="TCarModel.openAddTCarModel()"/>
+ @}
+ @if(shiro.hasPermission("/tCarModel/update")){
+ <#button name="编辑" icon="fa-edit" clickFun="TCarModel.openTCarModelDetail()" space="true"/>
+ @}
+ @if(shiro.hasPermission("/tCarModel/delete")){
+ <#button name="删除" icon="fa-remove" clickFun="TCarModel.delete()" space="true"/>
+ @}
+ </div>
+ <#table id="TCarModelTable"/>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/tCarModel/tCarModel.js"></script>
+<script>
+ laydate.render({
+ elem: '#createTime'
+ ,range: true
+ });
+</script>
+@}
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tCarModel/tCarModel_add.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tCarModel/tCarModel_add.html
new file mode 100644
index 0000000..57105bc
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tCarModel/tCarModel_add.html
@@ -0,0 +1,38 @@
+@layout("/common/_container.html"){
+<div class="ibox float-e-margins">
+ <div class="ibox-content">
+ <div class="form-horizontal" id="carModelInfoForm">
+ <div class="row">
+ <div class="col-sm-11">
+ <#input id="name" name="类型名称" />
+ <#select id="seat" name="座位数：">
+ <option value="5">5座</option>
+ <option value="7">7座</option>
+ </#select>
+ <#select id="brandId" name="所属车辆品牌：" >
+ <option value="">选择所属车辆品牌</option>
+ @for(obj in brandList){
+ <option value="${obj.id}">${obj.name}</option>
+ @}
+ </#select>
+ <div class="form-group">
+ <label class="col-sm-3 control-label">备注：</label>
+ <div class="col-sm-9">
+ <textarea type="text/plain" class="form-control" name="remark" id="remark" style="width:100%;height:150px;"></textarea>
+ </div>
+ </div>
+ </div>
+ </div>
+
+ <div class="row btn-group-m-t">
+ <div class="col-sm-10 col-sm-offset-5">
+ <#button btnCss="info" name="提交" id="ensure" icon="fa-check" clickFun="TCarModelInfoDlg.addSubmit()"/>
+ <#button btnCss="danger" name="取消" id="cancel" icon="fa-eraser" clickFun="TCarModelInfoDlg.close()"/>
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/tCarModel/tCarModel_info.js"></script>
+@}
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tCarModel/tCarModel_edit.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tCarModel/tCarModel_edit.html
new file mode 100644
index 0000000..d6c7db8
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tCarModel/tCarModel_edit.html
@@ -0,0 +1,39 @@
+@layout("/common/_container.html"){
+<div class="ibox float-e-margins">
+ <div class="ibox-content">
+ <div class="form-horizontal" id="carModelInfoForm">
+ <input type="hidden" id="id" name="id" value="${item.id}">
+ <div class="row">
+ <div class="col-sm-11">
+ <#input id="name" name="类型名称" value="${item.name}"/>
+ <#select id="seat" name="座位数：">
+ <option value="5" ${5 == item.seat ? 'selected=selected' : ''}>5座</option>
+ <option value="7" ${7 == item.seat ? 'selected=selected' : ''}>7座</option>
+ </#select>
+ <#select id="brandId" name="所属车辆品牌：" >
+ <option value="">选择所属车辆品牌</option>
+ @for(obj in brandList){
+ <option value="${obj.id}" ${obj.id == item.brandId ? 'selected=selected' : ''}>${obj.name}</option>
+ @}
+ </#select>
+ <div class="form-group">
+ <label class="col-sm-3 control-label">备注：</label>
+ <div class="col-sm-9">
+ <textarea type="text/plain" class="form-control" name="remark" id="remark" style="width:100%;height:150px;">${item.remark}</textarea>
+ </div>
+ </div>
+ </div>
+ </div>
+
+ <div class="row btn-group-m-t">
+ <div class="col-sm-10 col-sm-offset-5">
+ <#button btnCss="info" name="提交" id="ensure" icon="fa-check" clickFun="TCarModelInfoDlg.editSubmit()"/>
+ <#button btnCss="danger" name="取消" id="cancel" icon="fa-eraser" clickFun="TCarModelInfoDlg.close()"/>
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/tCarModel/tCarModel_info.js"></script>
+@}
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tCompany/franchisee.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tCompany/franchisee.html
new file mode 100644
index 0000000..ccfe69f
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tCompany/franchisee.html
@@ -0,0 +1,70 @@
+@layout("/common/_container.html"){
+<div class="row">
+ <div class="col-sm-12">
+ <div class="ibox float-e-margins">
+ <div class="ibox-title">
+ <h5>加盟商管理</h5>
+ </div>
+ <div class="ibox-content">
+ <div class="row row-lg">
+ <div class="col-sm-12">
+ <div class="row">
+ <div class="col-sm-3">
+ <#TimeCon id="insertTime" name="添加时间" isTime="false"/>
+ </div>
+ <div class="col-sm-3">
+ <#NameCon id="name" name="加盟商名称" />
+ </div>
+ <div class="col-sm-3">
+ <#NameCon id="account" name="账号" />
+ </div>
+ <div class="col-sm-3">
+ <#NameCon id="principalName" name="联系人" />
+ </div>
+ <div class="col-sm-3">
+ <#NameCon id="principalPhone" name="联系电话" />
+ </div>
+ <div class="col-sm-3">
+ <#NameCon id="serviceStr" name="经营业务" />
+ </div>
+ <div class="col-sm-3">
+ <#SelectCon id="state" name="状态" >
+ <option value="">全部</option>
+ <option value="2">正常</option>
+ <option value="1">禁用</option>
+ </#SelectCon>
+ </div>
+ <div class="col-sm-3">
+ <#button name="搜索" icon="fa-search" clickFun="Franchisee.search()"/>
+ <#button name="重置" icon="fa-trash" clickFun="Franchisee.resetSearch()" space="true"/>
+ </div>
+ </div>
+ <div class="hidden-xs" id="FranchiseeTableToolbar" role="group">
+ @if(shiro.hasPermission("/tCompany/addFranchisee")){
+ <#button name="添加" icon="fa-plus" clickFun="Franchisee.addFranchisee()"/>
+ @}
+ @if(shiro.hasPermission("/tCompany/updateFranchisee")){
+ <#button name="修改" icon="fa-edit" clickFun="Franchisee.updateFranchisee()" space="true"/>
+ @}
+ @if(shiro.hasPermission("/tCompany/deleteFranchisee")){
+ <#button name="删除" icon="fa-remove" clickFun="Franchisee.deleteFranchisee()" space="true"/>
+ @}
+ @if(shiro.hasPermission("/tCompany/detailFranchisee")){
+ <#button name="查看详情" icon="fa-remove" clickFun="Franchisee.detailFranchisee()" space="true"/>
+ @}
+ </div>
+ <#table id="FranchiseeTable"/>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/tCompany/franchisee.js"></script>
+<script>
+ laydate.render({
+ elem: '#insertTime'
+ ,range: true
+ });
+</script>
+@}
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tCompany/platformEdit.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tCompany/platformEdit.html
new file mode 100644
index 0000000..a63dc5f
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tCompany/platformEdit.html
@@ -0,0 +1,371 @@
+@layout("/common/_container.html"){
+<div class="ibox float-e-margins">
+ <div class="ibox-content">
+ <div class="form-horizontal" id="companyInfoForm">
+ <input type="hidden" id="id" name="id" value="${item.id}">
+ <input type="hidden" id="userId" name="userId" value="${user.id}">
+ <div class="row">
+ <div class="col-sm-6 b-r">
+ <#input id="name" name="分公司名称" value="${item.name}" />
+ <#input id="code" name="分公司代码" value="${item.code}" />
+ <#input id="principalName" name="分公司负责人" value="${item.principalName}" />
+ <#input id="adminName" name="分公司管理人" value="${item.adminName}" />
+ <#input id="documentAddress" name="行政文书送达地址" value="${item.documentAddress}" />
+ <#input id="setupTime" name="服务机构设立日期" value="${item.setupTime}" />
+ <#input id="licenseNumber" name="网络预约出租汽<br>车经营许可证号" value="${item.licenseNumber}" />
+ <#input id="addressCode" name="注册地行政区域划<br>分代码" value="${item.addressCode}" />
+ <#input id="licenseTime" name="经营许可证初次发证日期" value="${item.licenseTime}" />
+ <#input id="licenseEndTime" name="经营许可证有效期止" value="${item.licenseEndTime}" />
+ <#input id="regCapital" name="注册资本" value="${item.regCapital}" />
+ <#input id="driverNum" name="注册网络预约车驾驶员数量" value="${item.driverNum}" />
+ <#input id="legalId" name="法人代表身份证号" value="${item.legalId}" />
+ <#avatar id="idCardPositive" name="法定代表人身份<br>证照片(正面)：" avatarImg="${item.idCardPositive}"/>
+ <#input id="contactAddress" name="通信地址" value="${item.contactAddress}"/>
+ </div>
+
+ <div class="col-sm-6">
+ <#input id="scopeCode" name="分公司区划代码" value="${item.scopeCode}"/>
+ <#input id="detailAddress" name="分公司具体地址" value="${item.detailAddress}"/>
+ <#input id="principalPhone" name="负责人电话" value="${item.principalPhone}"/>
+ <#input id="adminPhone" name="管理员电话" value="${item.adminPhone}"/>
+ <#input id="urgentPhoen" name="紧急联系电话" value="${item.urgentPhoen}"/>
+ <#input id="identifier" name="统一社会信用代码" value="${item.identifier}"/>
+ <#input id="serviceScope" name="经营区域" value="${item.serviceScope}"/>
+ <#input id="licensingAgency" name="经营许可证发证机构" value="${item.licensingAgency}"/>
+ <#input id="licenseStartTime" name="经营许可证有效期起" value="${item.licenseStartTime}"/>
+ <#input id="economicType" name="经营业户经济类型" value="${item.economicType}"/>
+ <#input id="carNum" name="注册网络预约出租车<br>车辆数" value="${item.carNum}"/>
+ <#input id="legalName" name="法人代表姓名" value="${item.legalName}"/>
+ <#input id="legalPhone" name="法人代表电话" value="${item.legalPhone}"/>
+ <#avatar id="idCardReverse" name="法定代表人身份<br>证照片(反面)：" avatarImg="${item.idCardReverse}"/>
+ <#input id="businessScope" name="经营范围" value="${item.businessScope}"/>
+ </div>
+ </div>
+ <div class="row">
+ <div class="col-sm-12">
+ <div class="form-group">
+ <label class="col-sm-2 control-label">经营业务：</label>
+ <div class="col-sm-10">
+ <fieldset>
+ <div class="checkbox checkbox-success">
+ <input name="checkbox" id="checkbox1" type="checkbox" value="1" ${1 == item.isSpe ? 'checked=checked' : ''} onclick="TCompanyInfoDlg.checkbox1()">
+ <label for="checkbox1">
+ 专车
+ </label>
+ <fieldset>
+ <div class="row" style="display: none;" id="zcDiv">
+ <div class="col-sm-6">
+ <div class="checkbox checkbox-circle">
+ <input type="radio" name="zc" id="zc1" value="1" ${1 == item.isSpeFixedOrProportional ? 'checked=checked' : ''}>
+ <label for="zc1">
+ <div style="position: relative;top: -8px;">
+ <span>按比例抽成,每笔订单抽取</span>
+ <input style="width: 50%;display: inline-block;" type="text" class="form-control" id="zcPercent" name="zcPercent"
+ @if(1 == item.isSpeFixedOrProportional){
+ value="${item.speMoney}"
+ @}
+ >
+ <span>%</span>
+ </div>
+ </label>
+ </div>
+ <div class="checkbox checkbox-circle">
+ <input type="radio" name="zc" id="zc2" value="2" ${2 == item.isSpeFixedOrProportional ? 'checked=checked' : ''}>
+ <label for="zc2">
+ <div style="position: relative;top: -8px;">
+ <span>按固定金额抽成,每笔订单抽取</span>
+ <input style="width: 50%;display: inline-block;" type="text" class="form-control" id="zcMoney" name="zcMoney"
+ @if(2 == item.isSpeFixedOrProportional){
+ value="${item.speMoney}"
+ @}
+ >
+ <span>元</span>
+ </div>
+ </label>
+ </div>
+ </div>
+ </div>
+ </fieldset>
+ </div>
+ <div class="checkbox checkbox-primary">
+ <input name="checkbox" id="checkbox2" type="checkbox" value="2" ${1 == item.isTaxi ? 'checked=checked' : ''} onclick="TCompanyInfoDlg.checkbox2()">
+ <label for="checkbox2">
+ 出租车
+ </label>
+ <fieldset>
+ <div class="row" style="display: none;" id="czDiv">
+ <div class="col-sm-6">
+ <div class="checkbox checkbox-circle">
+ <input type="radio" name="cz" id="cz1" value="1" ${1 == item.isTaxiFixedOrProportional ? 'checked=checked' : ''}>
+ <label for="cz1">
+ <div style="position: relative;top: -8px;">
+ <span>按比例抽成,每笔订单抽取</span>
+ <input style="width: 50%;display: inline-block;" type="text" class="form-control" id="czPercent" name="czPercent"
+ @if(1 == item.isTaxiFixedOrProportional){
+ value="${item.taxiMoney}"
+ @}
+ >
+ <span>%</span>
+ </div>
+ </label>
+ </div>
+ <div class="checkbox checkbox-circle">
+ <input type="radio" name="cz" id="cz2" value="2" ${2 == item.isTaxiFixedOrProportional ? 'checked=checked' : ''}>
+ <label for="cz2">
+ <div style="position: relative;top: -8px;">
+ <span>按固定金额抽成,每笔订单抽取</span>
+ <input style="width: 50%;display: inline-block;" type="text" class="form-control" id="czMoney" name="czMoney"
+ @if(2 == item.isTaxiFixedOrProportional){
+ value="${item.taxiMoney}"
+ @}
+ >
+ <span>元</span>
+ </div>
+ </label>
+ </div>
+ </div>
+ </div>
+ </fieldset>
+ </div>
+ <div class="checkbox checkbox-success">
+ <input name="checkbox" id="checkbox3" type="checkbox" value="3" ${1 == item.isCross ? 'checked=checked' : ''} onclick="TCompanyInfoDlg.checkbox3()">
+ <label for="checkbox3">
+ 跨城出行
+ </label>
+ </div>
+ <div class="checkbox checkbox-info">
+ <input name="checkbox" id="checkbox4" type="checkbox" value="4" ${1 == item.isSameLogistics ? 'checked=checked' : ''} onclick="TCompanyInfoDlg.checkbox4()">
+ <label for="checkbox4">
+ 同城小件物流
+ </label>
+ <fieldset>
+ <div class="row" style="display: none;" id="tcxDiv">
+ <div class="col-sm-6">
+ <div class="checkbox checkbox-circle">
+ <input type="radio" name="tcx" id="tcx1" value="1" ${1 == item.isSameLogisticsFixedOrProportional ? 'checked=checked' : ''}>
+ <label for="tcx1">
+ <div style="position: relative;top: -8px;">
+ <span>按比例抽成,每笔订单抽取</span>
+ <input style="width: 50%;display: inline-block;" type="text" class="form-control" id="tcxPercent" name="tcxPercent"
+ @if(1 == item.isSameLogisticsFixedOrProportional){
+ value="${item.sameLogisticsMoney}"
+ @}
+ >
+ <span>%</span>
+ </div>
+ </label>
+ </div>
+ <div class="checkbox checkbox-circle">
+ <input type="radio" name="tcx" id="tcx2" value="2" ${2 == item.isSameLogisticsFixedOrProportional ? 'checked=checked' : ''}>
+ <label for="tcx2">
+ <div style="position: relative;top: -8px;">
+ <span>按固定金额抽成,每笔订单抽取</span>
+ <input style="width: 50%;display: inline-block;" type="text" class="form-control" id="tcxMoney" name="tcxMoney"
+ @if(2 == item.isSameLogisticsFixedOrProportional){
+ value="${item.sameLogisticsMoney}"
+ @}
+ >
+ <span>元</span>
+ </div>
+ </label>
+ </div>
+ </div>
+ </div>
+ </fieldset>
+ </div>
+ <div class="checkbox checkbox-warning">
+ <input name="checkbox" id="checkbox5" type="checkbox" value="5" ${1 == item.isCrossLogistics ? 'checked=checked' : ''} onclick="TCompanyInfoDlg.checkbox5()">
+ <label for="checkbox5">
+ 跨城小件物流
+ </label>
+ <fieldset>
+ <div class="row" style="display: none;" id="kcxDiv">
+ <div class="col-sm-6">
+ <div class="checkbox checkbox-circle">
+ <input type="radio" name="kcx" id="kcx1" value="1" ${1 == item.isCrossLogisticsFixedOrProportional ? 'checked=checked' : ''}>
+ <label for="kcx1">
+ <div style="position: relative;top: -8px;">
+ <span>按比例抽成,每笔订单抽取</span>
+ <input style="width: 50%;display: inline-block;" type="text" class="form-control" id="kcxPercent" name="kcxPercent"
+ @if(1 == item.isCrossLogisticsFixedOrProportional){
+ value="${item.crossLogisticsMoney}"
+ @}
+ >
+ <span>%</span>
+ </div>
+ </label>
+ </div>
+ <div class="checkbox checkbox-circle">
+ <input type="radio" name="kcx" id="kcx2" value="2" ${2 == item.isCrossLogisticsFixedOrProportional ? 'checked=checked' : ''}>
+ <label for="kcx2">
+ <div style="position: relative;top: -8px;">
+ <span>按固定金额抽成,每笔订单抽取</span>
+ <input style="width: 50%;display: inline-block;" type="text" class="form-control" id="kcxMoney" name="kcxMoney"
+ @if(2 == item.isCrossLogisticsFixedOrProportional){
+ value="${item.crossLogisticsMoney}"
+ @}
+ >
+ <span>元</span>
+ </div>
+ </label>
+ </div>
+ </div>
+ </div>
+ </fieldset>
+ </div>
+ <div class="checkbox checkbox-danger">
+ <input name="checkbox" id="checkbox6" type="checkbox" value="6" ${1 == item.isCharter ? 'checked=checked' : ''} onclick="TCompanyInfoDlg.checkbox6()">
+ <label for="checkbox6">
+ 包车
+ </label>
+ </div>
+ </fieldset>
+ </div>
+ </div>
+ </div>
+ </div>
+
+ <div class="row">
+ <div class="col-sm-12">
+ <div class="form-group">
+ <label class="col-sm-2 control-label">经营区域：</label>
+ <div class="col-sm-2">
+ <select class="form-control" id="province" onchange="TCompanyInfoDlg.provinceChange(this)">
+ <option value="">选择省</option>
+ @for(obj in provinceList){
+ <option value="${obj.code}">${obj.name}</option>
+ @}
+ </select>
+ </div>
+ <div class="col-sm-2">
+ <select class="form-control" id="city" onchange="TCompanyInfoDlg.cityChage(this)">
+ <option value="">选择市</option>
+ </select>
+ </div>
+ <div class="col-sm-2">
+ <select class="form-control" id="area">
+ <option value="">选择区</option>
+ </select>
+ </div>
+ <div class="col-sm-1">
+ <#button btnCss="info" name="添加" id="ensure" icon="fa-check" clickFun="TCompanyInfoDlg.addScope()"/>
+ </div>
+ </div>
+ <div class="form-group">
+ <label class="col-sm-2 control-label">添加区域</label>
+ <div class="col-sm-9">
+ <div style="height: 200px; border: 1px solid #e5e6e7;overflow-y: auto;">
+ <table class="table table-striped table-bordered table-hover table-condensed">
+ <thead>
+ <tr>
+ <th style="width: 300px;">区域</th>
+ <th style="width: 200px;">操作</th>
+ </tr>
+ </thead>
+ <tbody id="conn">
+ @for(obj in scopeList){
+ <tr class="timeClass">
+ <td><input type="hidden" id="recordId" name="recordId" value="${obj.id}">
+ <input type="hidden" id="provinceCode" name="provinceCode" value="${obj.provinceCode}">
+ <input type="hidden" id="cityCode" name="cityCode" value="${obj.cityCode}">
+ <input type="hidden" id="areaCode" name="areaCode" value="${obj.areaCode}">${obj.value}</td>
+ <td><button onclick="deleteSub(this)">移除</button></td>
+ </tr>
+ @}
+ </tbody>
+ </table>
+ </div>
+ </div>
+ </div>
+
+ <div class="form-group">
+ <label class="col-sm-2 control-label">是否需要摆渡车：</label>
+ <div class="col-sm-9" style="display: flex;align-items: center;">
+ <div class="radio radio-info radio-inline">
+ <input type="radio" id="isNeedFerry1" value="1" name="isNeedFerry" ${1 == item.isNeedFerry ? 'checked=checked' : ''} >
+ <label for="isNeedFerry1"> 是 </label>
+ </div>
+ <div class="radio radio-success radio-inline">
+ <input type="radio" id="isNeedFerry2" value="2" name="isNeedFerry" ${2 == item.isNeedFerry ? 'checked=checked' : ''}>
+ <label for="isNeedFerry2"> 否 </label>
+ </div>
+ </div>
+ </div>
+ <!-- <div class="form-group">
+ <label class="col-sm-2 control-label">限登录MAC地址：</label>
+ <div class="col-sm-9">
+ <input type="text" class="form-control" id="mac" name="mac" value="${item.mac}">
+ </div>
+ </div>
+ <div class="form-group">
+ <label class="col-sm-2 control-label">登录账号：</label>
+ <div class="col-sm-9">
+ <input type="text" class="form-control" id="account" name="account" value="${user.account}">
+ </div>
+ </div>
+ <div class="form-group">
+ <label class="col-sm-2 control-label">登录密码：</label>
+ <div class="col-sm-9">
+ <input type="password" class="form-control" id="password" name="password" >
+ </div>
+ </div>
+ <div class="form-group">
+ <label class="col-sm-2 control-label">确认密码：</label>
+ <div class="col-sm-9">
+ <input type="password" class="form-control" id="rePassword" name="rePassword" >
+ </div>
+ </div>-->
+ </div>
+ </div>
+
+ <div class="row btn-group-m-t">
+ <div class="col-sm-10 col-sm-offset-5">
+ <#button btnCss="info" name="提交" id="ensure" icon="fa-check" clickFun="TCompanyInfoDlg.editSubmit()"/>
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/tCompany/tCompany_info.js"></script>
+<script type="application/javascript">
+ laydate.render({
+ elem: '#setupTime'
+ });
+ laydate.render({
+ elem: '#licenseTime'
+ });
+ laydate.render({
+ elem: '#licenseStartTime'
+ });
+ laydate.render({
+ elem: '#licenseEndTime'
+ });
+
+ $(function() {
+ TCompanyInfoDlg.checkbox1();
+ TCompanyInfoDlg.checkbox2();
+ TCompanyInfoDlg.checkbox3();
+ TCompanyInfoDlg.checkbox4();
+ TCompanyInfoDlg.checkbox5();
+ TCompanyInfoDlg.checkbox6();
+
+ var zc = $("input[name='zc']:checked").val();
+ var cz = $("input[name='cz']:checked").val();
+ var tcx = $("input[name='tcx']:checked").val();
+ var kcx = $("input[name='kcx']:checked").val();
+ if (zc == "" || zc == null || zc == undefined){
+ $("#zc1").attr("checked","checked")
+ }
+ if (cz == "" || cz == null || cz == undefined){
+ $("#cz1").attr("checked","checked")
+ }
+ if (tcx == "" || tcx == null || tcx == undefined){
+ $("#tcx1").attr("checked","checked")
+ }
+ if (kcx == "" || kcx == null || kcx == undefined){
+ $("#kcx1").attr("checked","checked")
+ }
+ });
+</script>
+@}
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tCompany/tCompany.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tCompany/tCompany.html
new file mode 100644
index 0000000..677cd52
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tCompany/tCompany.html
@@ -0,0 +1,73 @@
+@layout("/common/_container.html"){
+<div class="row">
+ <div class="col-sm-12">
+ <div class="ibox float-e-margins">
+ <div class="ibox-title">
+ <h5>分公司管理</h5>
+ </div>
+ <div class="ibox-content">
+ <div class="row row-lg">
+ <div class="col-sm-12">
+ <div class="row">
+ <div class="col-sm-3">
+ <#TimeCon id="insertTime" name="添加时间" isTime="false"/>
+ </div>
+ <div class="col-sm-3">
+ <#NameCon id="name" name="分公司名称" />
+ </div>
+ <div class="col-sm-3">
+ <#NameCon id="principalName" name="负责人名称" />
+ </div>
+ <div class="col-sm-3">
+ <#NameCon id="principalPhone" name="负责人电话" />
+ </div>
+ <div class="col-sm-3">
+ <#NameCon id="adminName" name="管理人名称" />
+ </div>
+ <div class="col-sm-3">
+ <#NameCon id="adminPhone" name="管理人电话" />
+ </div>
+ <div class="col-sm-3">
+ <#NameCon id="serviceStr" name="经营业务" />
+ </div>
+ <div class="col-sm-3">
+ <#SelectCon id="state" name="状态" >
+ <option value="">全部</option>
+ <option value="2">正常</option>
+ <option value="1">禁用</option>
+ </#SelectCon>
+ </div>
+ <div class="col-sm-3">
+ <#button name="搜索" icon="fa-search" clickFun="TCompany.search()"/>
+ <#button name="重置" icon="fa-trash" clickFun="TCompany.resetSearch()" space="true"/>
+ </div>
+ </div>
+ <div class="hidden-xs" id="TCompanyTableToolbar" role="group">
+ @if(shiro.hasPermission("/tCompany/add")){
+ <#button name="添加" icon="fa-plus" clickFun="TCompany.openAddTCompany()"/>
+ @}
+ @if(shiro.hasPermission("/tCompany/update")){
+ <#button name="修改" icon="fa-edit" clickFun="TCompany.openTCompanyDetail()" space="true"/>
+ @}
+ @if(shiro.hasPermission("/tCompany/delete")){
+ <#button name="删除" icon="fa-remove" clickFun="TCompany.delete()" space="true"/>
+ @}
+ @if(shiro.hasPermission("/tCompany/detail")){
+ <#button name="查看详情" icon="fa-remove" clickFun="TCompany.detail()" space="true"/>
+ @}
+ </div>
+ <#table id="TCompanyTable"/>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/tCompany/tCompany.js"></script>
+<script>
+ laydate.render({
+ elem: '#insertTime'
+ ,range: true
+ });
+</script>
+@}
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tCompany/tCompany_add.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tCompany/tCompany_add.html
new file mode 100644
index 0000000..6d36708
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tCompany/tCompany_add.html
@@ -0,0 +1,307 @@
+@layout("/common/_container.html"){
+<div class="ibox float-e-margins">
+ <div class="ibox-content">
+ <div class="form-horizontal" id="companyInfoForm">
+
+ <div class="row">
+ <div class="col-sm-6 b-r">
+ <#input id="name" name="分公司名称"/>
+ <#input id="code" name="分公司代码"/>
+ <#input id="principalName" name="分公司负责人" />
+ <#input id="adminName" name="分公司管理人"/>
+ <#input id="documentAddress" name="行政文书送达地址"/>
+ <#input id="setupTime" name="服务机构设立日期"/>
+ <#input id="licenseNumber" name="网络预约出租汽<br>车经营许可证号"/>
+ <#input id="addressCode" name="注册地行政区域划<br>分代码"/>
+ <#input id="licenseTime" name="经营许可证初次发证日期" />
+ <#input id="licenseEndTime" name="经营许可证有效期止" />
+ <#input id="regCapital" name="注册资本"/>
+ <#input id="driverNum" name="注册网络预约车驾驶员数量" />
+ <#input id="legalId" name="法人代表身份证号"/>
+ <#avatar id="idCardPositive" name="法定代表人身份<br>证照片(正面)：" />
+ <#input id="contactAddress" name="通信地址"/>
+ </div>
+
+ <div class="col-sm-6">
+ <#input id="scopeCode" name="分公司区划代码"/>
+ <#input id="detailAddress" name="分公司具体地址" />
+ <#input id="principalPhone" name="负责人电话" />
+ <#input id="adminPhone" name="管理员电话" />
+ <#input id="urgentPhoen" name="紧急联系电话" />
+ <#input id="identifier" name="统一社会信用代码" />
+ <#input id="serviceScope" name="经营区域" />
+ <#input id="licensingAgency" name="经营许可证发证机构"/>
+ <#input id="licenseStartTime" name="经营许可证有效期起"/>
+ <#input id="economicType" name="经营业户经济类型"/>
+ <#input id="carNum" name="注册网络预约出租车<br>车辆数"/>
+ <#input id="legalName" name="法人代表姓名" />
+ <#input id="legalPhone" name="法人代表电话" />
+ <#avatar id="idCardReverse" name="法定代表人身份<br>证照片(反面)：" />
+ <#input id="businessScope" name="经营范围" />
+
+ </div>
+ </div>
+ <div class="row">
+ <div class="col-sm-12">
+ <div class="form-group">
+ <label class="col-sm-2 control-label">经营业务：</label>
+ <div class="col-sm-10">
+ <fieldset>
+ <div class="checkbox checkbox-success">
+ <input name="checkbox" id="checkbox1" type="checkbox" value="1" onclick="TCompanyInfoDlg.checkbox1()">
+ <label for="checkbox1">
+ 专车
+ </label>
+ <fieldset>
+ <div class="row" style="display: none;" id="zcDiv">
+ <div class="col-sm-6">
+ <div class="checkbox checkbox-circle" >
+ <input type="radio" name="zc" id="zc1" value="1" checked="">
+ <label for="zc1" >
+ <div style="position: relative;top: -8px;">
+ <span>按比例抽成,每笔订单抽取</span>
+ <input style="width: 50%;display: inline-block;" type="text" class="form-control" id="zcPercent" name="zcPercent">
+ <span>%</span>
+ </div>
+ </label>
+ </div>
+ <div class="checkbox checkbox-circle">
+ <input type="radio" name="zc" id="zc2" value="2">
+ <label for="zc2">
+ <div style="position: relative;top: -8px;">
+ <span>按固定金额抽成,每笔订单抽取</span>
+ <input style="width: 50%;display: inline-block;" type="text" class="form-control" id="zcMoney" name="zcMoney">
+ <span>元</span>
+ </div>
+ </label>
+ </div>
+ </div>
+ </div>
+ </fieldset>
+ </div>
+ <div class="checkbox checkbox-primary">
+ <input name="checkbox" id="checkbox2" type="checkbox" value="2" onclick="TCompanyInfoDlg.checkbox2()">
+ <label for="checkbox2">
+ 出租车
+ </label>
+ <fieldset>
+ <div class="row" style="display: none;" id="czDiv">
+ <div class="col-sm-6">
+ <div class="checkbox checkbox-circle">
+ <input type="radio" name="cz" id="cz1" value="1" checked="">
+ <label for="cz1">
+ <div style="position: relative;top: -8px;">
+ <span>按比例抽成,每笔订单抽取</span>
+ <input style="width: 50%;display: inline-block;" type="text" class="form-control" id="czPercent" name="czPercent">
+ <span>%</span>
+ </div>
+ </label>
+ </div>
+ <div class="checkbox checkbox-circle">
+ <input type="radio" name="cz" id="cz2" value="2">
+ <label for="cz2">
+ <div style="position: relative;top: -8px;">
+ <span>按固定金额抽成,每笔订单抽取</span>
+ <input style="width: 50%;display: inline-block;" type="text" class="form-control" id="czMoney" name="czMoney">
+ <span>元</span>
+ </div>
+ </label>
+ </div>
+ </div>
+ </div>
+ </fieldset>
+ </div>
+ <div class="checkbox checkbox-success">
+ <input name="checkbox" id="checkbox3" type="checkbox" value="3" onclick="TCompanyInfoDlg.checkbox3()">
+ <label for="checkbox3">
+ 跨城出行
+ </label>
+ </div>
+ <div class="checkbox checkbox-info">
+ <input name="checkbox" id="checkbox4" type="checkbox" value="4" onclick="TCompanyInfoDlg.checkbox4()">
+ <label for="checkbox4">
+ 同城小件物流
+ </label>
+ <fieldset>
+ <div class="row" style="display: none;" id="tcxDiv">
+ <div class="col-sm-6">
+ <div class="checkbox checkbox-circle">
+ <input type="radio" name="tcx" id="tcx1" value="1" checked="">
+ <label for="tcx1">
+ <div style="position: relative;top: -8px;">
+ <span>按比例抽成,每笔订单抽取</span>
+ <input style="width: 50%;display: inline-block;" type="text" class="form-control" id="tcxPercent" name="tcxPercent">
+ <span>%</span>
+ </div>
+ </label>
+ </div>
+ <div class="checkbox checkbox-circle">
+ <input type="radio" name="tcx" id="tcx2" value="2">
+ <label for="tcx2">
+ <div style="position: relative;top: -8px;">
+ <span>按固定金额抽成,每笔订单抽取</span>
+ <input style="width: 50%;display: inline-block;" type="text" class="form-control" id="tcxMoney" name="tcxMoney">
+ <span>元</span>
+ </div>
+ </label>
+ </div>
+ </div>
+ </div>
+ </fieldset>
+ </div>
+ <div class="checkbox checkbox-warning">
+ <input name="checkbox" id="checkbox5" type="checkbox" value="5" onclick="TCompanyInfoDlg.checkbox5()">
+ <label for="checkbox5">
+ 跨城小件物流
+ </label>
+ <fieldset>
+ <div class="row" style="display: none;" id="kcxDiv">
+ <div class="col-sm-6">
+ <div class="checkbox checkbox-circle">
+ <input type="radio" name="kcx" id="kcx1" value="1" checked="">
+ <label for="kcx1">
+ <div style="position: relative;top: -8px;">
+ <span>按比例抽成,每笔订单抽取</span>
+ <input style="width: 50%;display: inline-block;" type="text" class="form-control" id="kcxPercent" name="kcxPercent">
+ <span>%</span>
+ </div>
+ </label>
+ </div>
+ <div class="checkbox checkbox-circle">
+ <input type="radio" name="kcx" id="kcx2" value="2">
+ <label for="kcx2">
+ <div style="position: relative;top: -8px;">
+ <span>按固定金额抽成,每笔订单抽取</span>
+ <input style="width: 50%;display: inline-block;" type="text" class="form-control" id="kcxMoney" name="kcxMoney">
+ <span>元</span>
+ </div>
+ </label>
+ </div>
+ </div>
+ </div>
+ </fieldset>
+ </div>
+ <div class="checkbox checkbox-danger">
+ <input name="checkbox" id="checkbox6" type="checkbox" value="6" onclick="TCompanyInfoDlg.checkbox6()">
+ <label for="checkbox6">
+ 包车
+ </label>
+ </div>
+ </fieldset>
+ </div>
+ </div>
+ </div>
+ </div>
+
+ <div class="row">
+ <div class="col-sm-12">
+ <div class="form-group">
+ <label class="col-sm-2 control-label">经营区域：</label>
+ <div class="col-sm-2">
+ <select class="form-control" id="province" onchange="TCompanyInfoDlg.provinceChange(this)">
+ <option value="">选择省</option>
+ @for(obj in provinceList){
+ <option value="${obj.code}">${obj.name}</option>
+ @}
+ </select>
+ </div>
+ <div class="col-sm-2">
+ <select class="form-control" id="city" onchange="TCompanyInfoDlg.cityChage(this)">
+ <option value="">选择市</option>
+ </select>
+ </div>
+ <div class="col-sm-2">
+ <select class="form-control" id="area">
+ <option value="">选择区</option>
+ </select>
+ </div>
+ <div class="col-sm-1">
+ <#button btnCss="info" name="添加" id="ensure" icon="fa-check" clickFun="TCompanyInfoDlg.addScope()"/>
+ </div>
+ </div>
+ <div class="form-group">
+ <label class="col-sm-2 control-label">添加区域</label>
+ <div class="col-sm-9">
+ <div style="height: 200px; border: 1px solid #e5e6e7;overflow-y: auto;">
+ <table class="table table-striped table-bordered table-hover table-condensed">
+ <thead>
+ <tr>
+ <th style="width: 300px;">区域</th>
+ <th style="width: 200px;">操作</th>
+ </tr>
+ </thead>
+ <tbody id="conn">
+
+ </tbody>
+ </table>
+ </div>
+ </div>
+ </div>
+
+ <div class="form-group">
+ <label class="col-sm-2 control-label">是否需要摆渡车：</label>
+ <div class="col-sm-9" style="display: flex;align-items: center;">
+ <div class="radio radio-info radio-inline">
+ <input type="radio" id="isNeedFerry1" value="1" name="isNeedFerry" checked="" >
+ <label for="isNeedFerry1"> 是 </label>
+ </div>
+ <div class="radio radio-success radio-inline">
+ <input type="radio" id="isNeedFerry2" value="2" name="isNeedFerry" >
+ <label for="isNeedFerry2"> 否 </label>
+ </div>
+ </div>
+ </div>
+ <div class="form-group">
+ <label class="col-sm-2 control-label">限登录MAC地址：</label>
+ <div class="col-sm-9">
+ <input type="text" class="form-control" id="mac" name="mac" >
+ </div>
+ </div>
+ <div class="form-group">
+ <label class="col-sm-2 control-label">登录账号：</label>
+ <div class="col-sm-9">
+ <input type="text" class="form-control" id="account" name="account" >
+ </div>
+ </div>
+ <div class="form-group">
+ <label class="col-sm-2 control-label">登录密码：</label>
+ <div class="col-sm-9">
+ <input type="password" class="form-control" id="password" name="password" >
+ </div>
+ </div>
+ <div class="form-group">
+ <label class="col-sm-2 control-label">确认密码：</label>
+ <div class="col-sm-9">
+ <input type="password" class="form-control" id="rePassword" name="rePassword" >
+ </div>
+ </div>
+ </div>
+ </div>
+
+
+ <div class="row btn-group-m-t">
+ <div class="col-sm-10 col-sm-offset-5">
+ <#button btnCss="info" name="提交" id="ensure" icon="fa-check" clickFun="TCompanyInfoDlg.addSubmit()"/>
+ <#button btnCss="danger" name="取消" id="cancel" icon="fa-eraser" clickFun="TCompanyInfoDlg.close()"/>
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/tCompany/tCompany_info.js"></script>
+<script>
+ laydate.render({
+ elem: '#setupTime'
+ });
+ laydate.render({
+ elem: '#licenseTime'
+ });
+ laydate.render({
+ elem: '#licenseStartTime'
+ });
+ laydate.render({
+ elem: '#licenseEndTime'
+ });
+</script>
+@}
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tCompany/tCompany_addFranchisee.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tCompany/tCompany_addFranchisee.html
new file mode 100644
index 0000000..10c4b12
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tCompany/tCompany_addFranchisee.html
@@ -0,0 +1,221 @@
+@layout("/common/_container.html"){
+<div class="ibox float-e-margins">
+ <div class="ibox-content">
+ <div class="form-horizontal" id="franchiseeInfoForm">
+
+ <div class="row">
+ <div class="col-sm-10">
+ @if(roleType == 1){
+ <#select id="superiorId" name="所属分公司：" onchange="TOpenCityInfoDlg.provinceChange()">
+ <option value="">选择所属分公司</option>
+ @for(obj in companyList){
+ <option value="${obj.id}">${obj.name}</option>
+ @}
+ </#select>
+ @}else if(roleType == 2){
+ <#label id="companyName" name="所属分公司" value="${company.name}"/>
+ @}
+ <#input id="name" name="加盟商名称"/>
+ <#input id="detailAddress" name="加盟商地址"/>
+
+ <#input id="principalName" name="联系人" />
+ <#input id="principalPhone" name="联系电话" />
+ </div>
+ </div>
+ <div class="row">
+ <div class="col-sm-10">
+ <div class="form-group">
+ <label class="col-sm-3 control-label">经营业务：</label>
+ <div class="col-sm-9">
+ <fieldset>
+ <div class="checkbox checkbox-success">
+ <input name="checkbox" id="checkbox1" type="checkbox" value="1" onclick="FranchiseeInfoDlg.checkbox1()">
+ <label for="checkbox1">
+ 专车
+ </label>
+ <fieldset>
+ <div class="row" style="display: none;" id="zcDiv">
+ <div class="col-sm-6">
+ <div class="checkbox checkbox-circle">
+ <input type="radio" name="zc" id="zc1" value="1" checked="">
+ <label for="zc1">
+ <div style="position: relative;top: -8px;">
+ <span>按比例抽成,每笔订单抽取</span>
+ <input style="width: 50%;display: inline-block;" type="text" class="form-control" id="zcPercent" name="zcPercent">
+ <span>%</span>
+ </div>
+ </label>
+ </div>
+ <div class="checkbox checkbox-circle">
+ <input type="radio" name="zc" id="zc2" value="2">
+ <label for="zc2">
+ <div style="position: relative;top: -8px;">
+ <span>按固定金额抽成,每笔订单抽取</span>
+ <input style="width: 50%;display: inline-block;" type="text" class="form-control" id="zcMoney" name="zcMoney">
+ <span>元</span>
+ </div>
+ </label>
+ </div>
+ </div>
+ </div>
+ </fieldset>
+ </div>
+ <div class="checkbox checkbox-primary">
+ <input name="checkbox" id="checkbox2" type="checkbox" value="2" onclick="FranchiseeInfoDlg.checkbox2()">
+ <label for="checkbox2">
+ 出租车
+ </label>
+ <fieldset>
+ <div class="row" style="display: none;" id="czDiv">
+ <div class="col-sm-6">
+ <div class="checkbox checkbox-circle">
+ <input type="radio" name="cz" id="cz1" value="1" checked="">
+ <label for="cz1">
+ <div style="position: relative;top: -8px;">
+ <span>按比例抽成,每笔订单抽取</span>
+ <input style="width: 50%;display: inline-block;" type="text" class="form-control" id="czPercent" name="czPercent">
+ <span>%</span>
+ </div>
+ </label>
+ </div>
+ <div class="checkbox checkbox-circle">
+ <input type="radio" name="cz" id="cz2" value="2">
+ <label for="cz2">
+ <div style="position: relative;top: -8px;">
+ <span>按固定金额抽成,每笔订单抽取</span>
+ <input style="width: 50%;display: inline-block;" type="text" class="form-control" id="czMoney" name="czMoney">
+ <span>元</span>
+ </div>
+ </label>
+ </div>
+ </div>
+ </div>
+ </fieldset>
+ </div>
+ <div class="checkbox checkbox-success">
+ <input name="checkbox" id="checkbox3" type="checkbox" value="3" onclick="FranchiseeInfoDlg.checkbox3()">
+ <label for="checkbox3">
+ 跨城出行
+ </label>
+ </div>
+ <div class="checkbox checkbox-info">
+ <input name="checkbox" id="checkbox4" type="checkbox" value="4" onclick="FranchiseeInfoDlg.checkbox4()">
+ <label for="checkbox4">
+ 同城小件物流
+ </label>
+ <fieldset>
+ <div class="row" style="display: none;" id="tcxDiv">
+ <div class="col-sm-6">
+ <div class="checkbox checkbox-circle">
+ <input type="radio" name="tcx" id="tcx1" value="1" checked="">
+ <label for="tcx1">
+ <div style="position: relative;top: -8px;">
+ <span>按比例抽成,每笔订单抽取</span>
+ <input style="width: 50%;display: inline-block;" type="text" class="form-control" id="tcxPercent" name="tcxPercent">
+ <span>%</span>
+ </div>
+ </label>
+ </div>
+ <div class="checkbox checkbox-circle">
+ <input type="radio" name="tcx" id="tcx2" value="2">
+ <label for="tcx2">
+ <div style="position: relative;top: -8px;">
+ <span>按固定金额抽成,每笔订单抽取</span>
+ <input style="width: 50%;display: inline-block;" type="text" class="form-control" id="tcxMoney" name="tcxMoney">
+ <span>元</span>
+ </div>
+ </label>
+ </div>
+ </div>
+ </div>
+ </fieldset>
+ </div>
+ <div class="checkbox checkbox-warning">
+ <input name="checkbox" id="checkbox5" type="checkbox" value="5" onclick="FranchiseeInfoDlg.checkbox5()">
+ <label for="checkbox5">
+ 跨城小件物流
+ </label>
+ <fieldset>
+ <div class="row" style="display: none;" id="kcxDiv">
+ <div class="col-sm-6">
+ <div class="checkbox checkbox-circle">
+ <input type="radio" name="kcx" id="kcx1" value="1" checked="">
+ <label for="kcx1">
+ <div style="position: relative;top: -8px;">
+ <span>按比例抽成,每笔订单抽取</span>
+ <input style="width: 50%;display: inline-block;" type="text" class="form-control" id="kcxPercent" name="kcxPercent">
+ <span>%</span>
+ </div>
+ </label>
+ </div>
+ <div class="checkbox checkbox-circle">
+ <input type="radio" name="kcx" id="kcx2" value="2">
+ <label for="kcx2">
+ <div style="position: relative;top: -8px;">
+ <span>按固定金额抽成,每笔订单抽取</span>
+ <input style="width: 50%;display: inline-block;" type="text" class="form-control" id="kcxMoney" name="kcxMoney">
+ <span>元</span>
+ </div>
+ </label>
+ </div>
+ </div>
+ </div>
+ </fieldset>
+ </div>
+ <div class="checkbox checkbox-danger">
+ <input name="checkbox" id="checkbox6" type="checkbox" value="6" onclick="FranchiseeInfoDlg.checkbox6()">
+ <label for="checkbox6">
+ 包车
+ </label>
+ </div>
+ </fieldset>
+ </div>
+ </div>
+ <div class="form-group">
+ <label class="col-sm-3 control-label">是否需要摆渡车：</label>
+ <div class="col-sm-9" style="display: flex;align-items: center;">
+ <div class="radio radio-info radio-inline">
+ <input type="radio" id="isNeedFerry1" value="1" name="isNeedFerry" checked="" >
+ <label for="isNeedFerry1"> 是 </label>
+ </div>
+ <div class="radio radio-success radio-inline">
+ <input type="radio" id="isNeedFerry2" value="2" name="isNeedFerry" >
+ <label for="isNeedFerry2"> 否 </label>
+ </div>
+ </div>
+ </div>
+ <div class="form-group">
+ <label class="col-sm-3 control-label">登录账号：</label>
+ <div class="col-sm-9">
+ <input type="text" class="form-control" id="account" name="account" >
+ </div>
+ </div>
+ <div class="form-group">
+ <label class="col-sm-3 control-label">登录密码：</label>
+ <div class="col-sm-9">
+ <input type="password" class="form-control" id="password" name="password" >
+ </div>
+ </div>
+ <div class="form-group">
+ <label class="col-sm-3 control-label">确认密码：</label>
+ <div class="col-sm-9">
+ <input type="password" class="form-control" id="rePassword" name="rePassword" >
+ </div>
+ </div>
+ </div>
+ </div>
+
+
+
+ <div class="row btn-group-m-t">
+ <div class="col-sm-10 col-sm-offset-5">
+ <#button btnCss="info" name="提交" id="ensure" icon="fa-check" clickFun="FranchiseeInfoDlg.addFranchisee()"/>
+ <#button btnCss="danger" name="取消" id="cancel" icon="fa-eraser" clickFun="FranchiseeInfoDlg.close()"/>
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/tCompany/franchisee_info.js"></script>
+@}
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tCompany/tCompany_detail.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tCompany/tCompany_detail.html
new file mode 100644
index 0000000..77f004f
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tCompany/tCompany_detail.html
@@ -0,0 +1,346 @@
+@layout("/common/_container.html"){
+<div class="ibox float-e-margins">
+ <div class="ibox-content">
+ <div class="form-horizontal" id="companyInfoForm">
+ <input type="hidden" id="id" name="id" value="${item.id}">
+ <input type="hidden" id="userId" name="userId" value="${user.id}">
+ <div class="row">
+ <div class="col-sm-6 b-r">
+ <#label id="account" name="登录账号" value="${user.account}"/>
+ <#label id="name" name="分公司名称" value="${item.name}"/>
+ <#label id="code" name="分公司代码" value="${item.code}"/>
+ <#label id="principalName" name="分公司负责人" value="${item.principalName}"/>
+ <#label id="adminName" name="分公司管理人" value="${item.adminName}"/>
+ <#label id="documentAddress" name="行政文书送达地址" value="${item.documentAddress}"/>
+ <#label id="setupTime" name="服务机构设立日期" value="${item.setupTime}"/>
+ <#label id="licenseNumber" name="网络预约出租汽<br>车经营许可证号" value="${item.licenseNumber}"/>
+ <#label id="addressCode" name="注册地行政区域划<br>分代码" value="${item.addressCode}"/>
+ <#label id="licenseTime" name="经营许可证初次发证日期" value="${item.licenseTime}"/>
+ <#label id="licenseEndTime" name="经营许可证有效期止" value="${item.licenseEndTime}"/>
+ <#label id="regCapital" name="注册资本" value="${item.regCapital}"/>
+ <#label id="driverNum" name="注册网络预约车驾驶员数量" value="${item.driverNum}"/>
+ <#label id="legalId" name="法人代表身份证号" value="${item.legalId}"/>
+ <#label id="contactAddress" name="通信地址" value="${item.contactAddress}"/>
+ <div class="form-group">
+ <label class="col-sm-3 control-label">法定代表人身份<br>证照片(正面)：</label>
+ <div class="col-sm-9">
+ <div class="form-group">
+ <div class="col-sm-6">
+ <div id="idCardPositivePreId">
+ <div>
+ @if(isEmpty(item.idCardPositive)){
+ <img onclick="lookBigImg('${ctxPath}/static/img/NoPIC.png')" src="${ctxPath}/static/img/NoPIC.png" style="max-width:150px;">
+ @}else{
+ <img onclick="lookBigImg('${item.idCardPositive}')" src="${item.idCardPositive}" style="max-width:250px;">
+ @}
+ </div>
+ </div>
+ </div>
+ <input type="hidden" id="idCardPositive" name="idCardPositive" value="${item.idCardPositive}"/>
+ </div>
+ </div>
+ </div>
+
+
+ </div>
+
+ <div class="col-sm-6">
+ <#label id="mac" name="限登录MAC地址" value="${item.mac}"/>
+ <#label id="scopeCode" name="分公司区划代码" value="${item.scopeCode}"/>
+ <#label id="detailAddress" name="分公司具体地址" value="${item.detailAddress}"/>
+ <#label id="principalPhone" name="负责人电话" value="${item.principalPhone}"/>
+ <#label id="adminPhone" name="管理员电话" value="${item.adminPhone}"/>
+ <#label id="urgentPhoen" name="紧急联系电话" value="${item.urgentPhoen}"/>
+ <#label id="identifier" name="统一社会信用代码" value="${item.identifier}"/>
+ <#label id="serviceScope" name="经营区域" value="${item.serviceScope}"/>
+ <#label id="licensingAgency" name="经营许可证发证机构" value="${item.licensingAgency}"/>
+ <#label id="licenseStartTime" name="经营许可证有效期起" value="${item.licenseStartTime}"/>
+ <#label id="economicType" name="经营业户经济类型" value="${item.economicType}"/>
+ <#label id="carNum" name="注册网络预约出租车<br>车辆数" value="${item.carNum}"/>
+ <#label id="legalName" name="法人代表姓名" value="${item.legalName}"/>
+ <#label id="legalPhone" name="法人代表电话" value="${item.legalPhone}"/>
+ <#label id="businessScope" name="经营范围" value="${item.businessScope}"/>
+ <div class="form-group">
+ <label class="col-sm-3 control-label">法定代表人身份<br>证照片(反面)：</label>
+ <div class="col-sm-9">
+ <div class="form-group">
+ <div class="col-sm-6">
+ <div id="idCardReversePreId">
+ <div>
+ @if(isEmpty(item.idCardReverse)){
+ <img onclick="lookBigImg('${ctxPath}/static/img/NoPIC.png')" src="${ctxPath}/static/img/NoPIC.png" style="max-width:150px;">
+ @}else{
+ <img onclick="lookBigImg('${item.idCardReverse}')" src="${item.idCardReverse}" style="max-width:250px;">
+ @}
+ </div>
+ </div>
+ </div>
+ <input type="hidden" id="idCardReverse" name="idCardReverse" value="${item.idCardReverse}"/>
+ </div>
+ </div>
+ </div>
+
+ </div>
+ </div>
+ <div class="row">
+ <div class="col-sm-12">
+ <div class="form-group">
+ <label class="col-sm-2 control-label">经营业务：</label>
+ <div class="col-sm-10">
+ <fieldset>
+ <div class="checkbox checkbox-success">
+ <input name="checkbox" id="checkbox1" type="checkbox" disabled value="1" ${1 == item.isSpe ? 'checked=checked' : ''} >
+ <label for="checkbox1">
+ 专车
+ </label>
+ <fieldset>
+ <div class="row" style="display: none;" id="zcDiv">
+ <div class="col-sm-6">
+ <div class="checkbox checkbox-circle">
+ <input type="radio" name="zc" id="zc1" disabled value="1" ${1 == item.isSpeFixedOrProportional ? 'checked=checked' : ''}>
+ <label for="zc1">
+ <div style="position: relative;top: -8px;">
+ <span>按比例抽成,每笔订单抽取</span>
+ <input style="width: 50%;display: inline-block;" type="text" disabled class="form-control" id="zcPercent" name="zcPercent" disabled
+ @if(1 == item.isSpeFixedOrProportional){
+ value="${item.speMoney}"
+ @}
+ >
+ <span>%</span>
+ </div>
+ </label>
+ </div>
+ <div class="checkbox checkbox-circle">
+ <input type="radio" name="zc" id="zc2" disabled value="2" ${2 == item.isSpeFixedOrProportional ? 'checked=checked' : ''}>
+ <label for="zc2">
+ <div style="position: relative;top: -8px;">
+ <span>按固定金额抽成,每笔订单抽取</span>
+ <input style="width: 50%;display: inline-block;" type="text" disabled class="form-control" id="zcMoney" name="zcMoney" disabled
+ @if(2 == item.isSpeFixedOrProportional){
+ value="${item.speMoney}"
+ @}
+ >
+ <span>元</span>
+ </div>
+ </label>
+ </div>
+ </div>
+ </div>
+ </fieldset>
+ </div>
+ <div class="checkbox checkbox-primary">
+ <input name="checkbox" id="checkbox2" type="checkbox" disabled value="2" ${1 == item.isTaxi ? 'checked=checked' : ''} >
+ <label for="checkbox2">
+ 出租车
+ </label>
+ <fieldset>
+ <div class="row" style="display: none;" id="czDiv">
+ <div class="col-sm-6">
+ <div class="checkbox checkbox-circle">
+ <input type="radio" name="cz" id="cz1" disabled value="1" ${1 == item.isTaxiFixedOrProportional ? 'checked=checked' : ''}>
+ <label for="cz1">
+ <div style="position: relative;top: -8px;">
+ <span>按比例抽成,每笔订单抽取</span>
+ <input style="width: 50%;display: inline-block;" type="text" disabled class="form-control" id="czPercent" name="czPercent" disabled
+ @if(1 == item.isTaxiFixedOrProportional){
+ value="${item.taxiMoney}"
+ @}
+ >
+ <span>%</span>
+ </div>
+ </label>
+ </div>
+ <div class="checkbox checkbox-circle">
+ <input type="radio" name="cz" id="cz2" disabled value="2" ${2 == item.isTaxiFixedOrProportional ? 'checked=checked' : ''}>
+ <label for="cz2">
+ <div style="position: relative;top: -8px;">
+ <span>按固定金额抽成,每笔订单抽取</span>
+ <input style="width: 50%;display: inline-block;" type="text" disabled class="form-control" id="czMoney" name="czMoney" disabled
+ @if(2 == item.isTaxiFixedOrProportional){
+ value="${item.taxiMoney}"
+ @}
+ >
+ <span>元</span>
+ </div>
+ </label>
+ </div>
+ </div>
+ </div>
+ </fieldset>
+ </div>
+ <div class="checkbox checkbox-success">
+ <input name="checkbox" id="checkbox3" type="checkbox" disabled value="3" ${1 == item.isCross ? 'checked=checked' : ''} >
+ <label for="checkbox3">
+ 跨城出行
+ </label>
+ </div>
+ <div class="checkbox checkbox-info">
+ <input name="checkbox" id="checkbox4" type="checkbox" disabled value="4" ${1 == item.isSameLogistics ? 'checked=checked' : ''}>
+ <label for="checkbox4">
+ 同城小件物流
+ </label>
+ <fieldset>
+ <div class="row" style="display: none;" id="tcxDiv">
+ <div class="col-sm-6">
+ <div class="checkbox checkbox-circle">
+ <input type="radio" name="tcx" id="tcx1" disabled value="1" ${1 == item.isSameLogisticsFixedOrProportional ? 'checked=checked' : ''}>
+ <label for="tcx1">
+ <div style="position: relative;top: -8px;">
+ <span>按比例抽成,每笔订单抽取</span>
+ <input style="width: 50%;display: inline-block;" type="text" disabled class="form-control" id="tcxPercent" name="tcxPercent" disabled
+ @if(1 == item.isSameLogisticsFixedOrProportional){
+ value="${item.sameLogisticsMoney}"
+ @}
+ >
+ <span>%</span>
+ </div>
+ </label>
+ </div>
+ <div class="checkbox checkbox-circle">
+ <input type="radio" name="tcx" id="tcx2" disabled value="2" ${2 == item.isSameLogisticsFixedOrProportional ? 'checked=checked' : ''}>
+ <label for="tcx2">
+ <div style="position: relative;top: -8px;">
+ <span>按固定金额抽成,每笔订单抽取</span>
+ <input style="width: 50%;display: inline-block;" type="text" disabled class="form-control" id="tcxMoney" name="tcxMoney" disabled
+ @if(2 == item.isSameLogisticsFixedOrProportional){
+ value="${item.sameLogisticsMoney}"
+ @}
+ >
+ <span>元</span>
+ </div>
+ </label>
+ </div>
+ </div>
+ </div>
+ </fieldset>
+ </div>
+ <div class="checkbox checkbox-warning">
+ <input name="checkbox" id="checkbox5" type="checkbox" disabled value="5" ${1 == item.isCrossLogistics ? 'checked=checked' : ''} >
+ <label for="checkbox5">
+ 跨城小件物流
+ </label>
+ <fieldset>
+ <div class="row" style="display: none;" id="kcxDiv">
+ <div class="col-sm-6">
+ <div class="checkbox checkbox-circle">
+ <input type="radio" name="kcx" id="kcx1" disabled value="1" ${1 == item.isCrossLogisticsFixedOrProportional ? 'checked=checked' : ''}>
+ <label for="kcx1">
+ <div style="position: relative;top: -8px;">
+ <span>按比例抽成,每笔订单抽取</span>
+ <input style="width: 50%;display: inline-block;" type="text" disabled class="form-control" id="kcxPercent" name="kcxPercent" disabled
+ @if(1 == item.isCrossLogisticsFixedOrProportional){
+ value="${item.crossLogisticsMoney}"
+ @}
+ >
+ <span>%</span>
+ </div>
+ </label>
+ </div>
+ <div class="checkbox checkbox-circle">
+ <input type="radio" name="kcx" disabled id="kcx2" value="2" ${2 == item.isCrossLogisticsFixedOrProportional ? 'checked=checked' : ''}>
+ <label for="kcx2">
+ <div style="position: relative;top: -8px;">
+ <span>按固定金额抽成,每笔订单抽取</span>
+ <input style="width: 50%;display: inline-block;" type="text" class="form-control" id="kcxMoney" name="kcxMoney" disabled
+ @if(2 == item.isCrossLogisticsFixedOrProportional){
+ value="${item.crossLogisticsMoney}"
+ @}
+ >
+ <span>元</span>
+ </div>
+ </label>
+ </div>
+ </div>
+ </div>
+ </fieldset>
+ </div>
+ <div class="checkbox checkbox-danger">
+ <input name="checkbox" id="checkbox6" disabled type="checkbox" value="6" ${1 == item.isCharter ? 'checked=checked' : ''} >
+ <label for="checkbox6">
+ 包车
+ </label>
+ </div>
+ </fieldset>
+ </div>
+ </div>
+ </div>
+ </div>
+
+ <div class="row">
+ <div class="col-sm-12">
+ <div class="form-group">
+ <label class="col-sm-2 control-label">添加区域</label>
+ <div class="col-sm-9">
+ <div style="height: 200px; border: 1px solid #e5e6e7;overflow-y: auto;">
+ <table class="table table-striped table-bordered table-hover table-condensed">
+ <thead>
+ <tr>
+ <th style="width: 300px;text-align: center;">区域</th>
+ <!--<th style="width: 200px;">操作</th>-->
+ </tr>
+ </thead>
+ <tbody id="conn">
+ @for(obj in scopeList){
+ <tr class="timeClass" style="text-align: center;">
+ <td><input type="hidden" id="recordId" name="recordId" value="${obj.id}">
+ <input type="hidden" id="provinceCode" name="provinceCode" value="${obj.provinceCode}">
+ <input type="hidden" id="cityCode" name="cityCode" value="${obj.cityCode}">
+ <input type="hidden" id="areaCode" name="areaCode" value="${obj.areaCode}">${obj.value}</td>
+ <!--<td><button onclick="deleteSub(this)">移除</button></td>-->
+ </tr>
+ @}
+ </tbody>
+ </table>
+ </div>
+ </div>
+ </div>
+
+ <div class="form-group">
+ <label class="col-sm-2 control-label">是否需要摆渡车：</label>
+ <div class="col-sm-9" style="display: flex;align-items: center;">
+ <div class="radio radio-info radio-inline">
+ <input type="radio" id="isNeedFerry1" value="1" disabled name="isNeedFerry" ${1 == item.isNeedFerry ? 'checked=checked' : ''} >
+ <label for="isNeedFerry1"> 是 </label>
+ </div>
+ <div class="radio radio-success radio-inline">
+ <input type="radio" id="isNeedFerry2" value="2" disabled name="isNeedFerry" ${2 == item.isNeedFerry ? 'checked=checked' : ''}>
+ <label for="isNeedFerry2"> 否 </label>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+
+ </div>
+
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/tCompany/tCompany_info.js"></script>
+<script type="application/javascript">
+ $(function() {
+ TCompanyInfoDlg.checkbox1();
+ TCompanyInfoDlg.checkbox2();
+ TCompanyInfoDlg.checkbox3();
+ TCompanyInfoDlg.checkbox4();
+ TCompanyInfoDlg.checkbox5();
+ TCompanyInfoDlg.checkbox6();
+
+ var zc = $("input[name='zc']:checked").val();
+ var cz = $("input[name='cz']:checked").val();
+ var tcx = $("input[name='tcx']:checked").val();
+ var kcx = $("input[name='kcx']:checked").val();
+ if (zc == "" || zc == null || zc == undefined){
+ $("#zc1").attr("checked","checked")
+ }
+ if (cz == "" || cz == null || cz == undefined){
+ $("#cz1").attr("checked","checked")
+ }
+ if (tcx == "" || tcx == null || tcx == undefined){
+ $("#tcx1").attr("checked","checked")
+ }
+ if (kcx == "" || kcx == null || kcx == undefined){
+ $("#kcx1").attr("checked","checked")
+ }
+ });
+</script>
+@}
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tCompany/tCompany_detailFranchisee.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tCompany/tCompany_detailFranchisee.html
new file mode 100644
index 0000000..48c238a
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tCompany/tCompany_detailFranchisee.html
@@ -0,0 +1,246 @@
+@layout("/common/_container.html"){
+<div class="ibox float-e-margins">
+ <div class="ibox-content">
+ <div class="form-horizontal" id="franchiseeInfoForm">
+ <input type="hidden" id="id" name="id" value="${item.id}">
+ <input type="hidden" id="userId" name="userId" value="${user.id}">
+ <div class="row">
+ <div class="col-sm-10">
+ <#label id="account" name="登录账号" value="${user.account}"/>
+ <#label id="companyName" name="所属分公司" value="${companyName}"/>
+ <#label id="name" name="加盟商名称" value="${item.name}"/>
+ <#label id="detailAddress" name="加盟商地址" value="${item.detailAddress}"/>
+ <#label id="principalName" name="联系人" value="${item.principalName}"/>
+ <#label id="principalPhone" name="联系电话" value="${item.principalPhone}"/>
+ </div>
+ </div>
+ <div class="row">
+ <div class="col-sm-10">
+ <div class="form-group">
+ <label class="col-sm-3 control-label">经营业务：</label>
+ <div class="col-sm-9">
+ <fieldset>
+ <div class="checkbox checkbox-success">
+ <input name="checkbox" id="checkbox1" disabled type="checkbox" value="1" ${1 == item.isSpe ? 'checked=checked' : ''} >
+ <label for="checkbox1">
+ 专车
+ </label>
+ <fieldset>
+ <div class="row" style="display: none;" id="zcDiv">
+ <div class="col-sm-6">
+ <div class="checkbox checkbox-circle">
+ <input type="radio" disabled name="zc" id="zc1" value="1" ${1 == item.isSpeFixedOrProportional ? 'checked=checked' : ''}>
+ <label for="zc1">
+ <div style="position: relative;top: -8px;">
+ <span>按比例抽成,每笔订单抽取</span>
+ <input style="width: 50%;display: inline-block;" type="text" disabled class="form-control" id="zcPercent" name="zcPercent"
+ @if(1 == item.isSpeFixedOrProportional){
+ value="${item.speMoney}"
+ @}
+ >
+ <span>%</span>
+ </div>
+ </label>
+ </div>
+ <div class="checkbox checkbox-circle">
+ <input type="radio" disabled name="zc" id="zc2" value="2" ${2 == item.isSpeFixedOrProportional ? 'checked=checked' : ''}>
+ <label for="zc2">
+ <div style="position: relative;top: -8px;">
+ <span>按固定金额抽成,每笔订单抽取</span>
+ <input style="width: 50%;display: inline-block;" type="text" disabled class="form-control" id="zcMoney" name="zcMoney"
+ @if(2 == item.isSpeFixedOrProportional){
+ value="${item.speMoney}"
+ @}
+ >
+ <span>元</span>
+ </div>
+ </label>
+ </div>
+ </div>
+ </div>
+ </fieldset>
+ </div>
+ <div class="checkbox checkbox-primary">
+ <input name="checkbox" id="checkbox2" type="checkbox" disabled value="2" ${1 == item.isTaxi ? 'checked=checked' : ''}>
+ <label for="checkbox2">
+ 出租车
+ </label>
+ <fieldset>
+ <div class="row" style="display: none;" id="czDiv">
+ <div class="col-sm-6">
+ <div class="checkbox checkbox-circle">
+ <input type="radio" disabled name="cz" id="cz1" value="1" ${1 == item.isTaxiFixedOrProportional ? 'checked=checked' : ''}>
+ <label for="cz1">
+ <div style="position: relative;top: -8px;">
+ <span>按比例抽成,每笔订单抽取</span>
+ <input style="width: 50%;display: inline-block;" type="text" disabled class="form-control" id="czPercent" name="czPercent"
+ @if(1 == item.isTaxiFixedOrProportional){
+ value="${item.taxiMoney}"
+ @}
+ >
+ <span>%</span>
+ </div>
+ </label>
+ </div>
+ <div class="checkbox checkbox-circle">
+ <input type="radio" disabled name="cz" id="cz2" value="2" ${2 == item.isTaxiFixedOrProportional ? 'checked=checked' : ''}>
+ <label for="cz2">
+ <div style="position: relative;top: -8px;">
+ <span>按固定金额抽成,每笔订单抽取</span>
+ <input style="width: 50%;display: inline-block;" type="text" disabled class="form-control" id="czMoney" name="czMoney"
+ @if(2 == item.isTaxiFixedOrProportional){
+ value="${item.taxiMoney}"
+ @}
+ >
+ <span>元</span>
+ </div>
+ </label>
+ </div>
+ </div>
+ </div>
+ </fieldset>
+ </div>
+ <div class="checkbox checkbox-success">
+ <input name="checkbox" id="checkbox3" type="checkbox" disabled value="3" ${1 == item.isCross ? 'checked=checked' : ''} >
+ <label for="checkbox3">
+ 跨城出行
+ </label>
+ </div>
+ <div class="checkbox checkbox-info">
+ <input name="checkbox" id="checkbox4" type="checkbox" disabled value="4" ${1 == item.isSameLogistics ? 'checked=checked' : ''} >
+ <label for="checkbox4">
+ 同城小件物流
+ </label>
+ <fieldset>
+ <div class="row" style="display: none;" id="tcxDiv">
+ <div class="col-sm-6">
+ <div class="checkbox checkbox-circle">
+ <input type="radio" disabled name="tcx" id="tcx1" value="1" ${1 == item.isSameLogisticsFixedOrProportional ? 'checked=checked' : ''}>
+ <label for="tcx1">
+ <div style="position: relative;top: -8px;">
+ <span>按比例抽成,每笔订单抽取</span>
+ <input style="width: 50%;display: inline-block;" type="text" disabled class="form-control" id="tcxPercent" name="tcxPercent"
+ @if(1 == item.isSameLogisticsFixedOrProportional){
+ value="${item.sameLogisticsMoney}"
+ @}
+ >
+ <span>%</span>
+ </div>
+ </label>
+ </div>
+ <div class="checkbox checkbox-circle">
+ <input type="radio" disabled name="tcx" id="tcx2" value="2" ${2 == item.isSameLogisticsFixedOrProportional ? 'checked=checked' : ''}>
+ <label for="tcx2">
+ <div style="position: relative;top: -8px;">
+ <span>按固定金额抽成,每笔订单抽取</span>
+ <input style="width: 50%;display: inline-block;" type="text" disabled class="form-control" id="tcxMoney" name="tcxMoney"
+ @if(2 == item.isSameLogisticsFixedOrProportional){
+ value="${item.sameLogisticsMoney}"
+ @}
+ >
+ <span>元</span>
+ </div>
+ </label>
+ </div>
+ </div>
+ </div>
+ </fieldset>
+ </div>
+ <div class="checkbox checkbox-warning">
+ <input name="checkbox" id="checkbox5" type="checkbox" disabled value="5" ${1 == item.isCrossLogistics ? 'checked=checked' : ''} >
+ <label for="checkbox5">
+ 跨城小件物流
+ </label>
+ <fieldset>
+ <div class="row" style="display: none;" id="kcxDiv">
+ <div class="col-sm-6">
+ <div class="checkbox checkbox-circle">
+ <input type="radio" disabled name="kcx" id="kcx1" value="1" ${1 == item.isCrossLogisticsFixedOrProportional ? 'checked=checked' : ''}>
+ <label for="kcx1">
+ <div style="position: relative;top: -8px;">
+ <span>按比例抽成,每笔订单抽取</span>
+ <input style="width: 50%;display: inline-block;" type="text" disabled class="form-control" id="kcxPercent" name="kcxPercent"
+ @if(1 == item.isCrossLogisticsFixedOrProportional){
+ value="${item.crossLogisticsMoney}"
+ @}
+ >
+ <span>%</span>
+ </div>
+ </label>
+ </div>
+ <div class="checkbox checkbox-circle">
+ <input type="radio" name="kcx" disabled id="kcx2" value="2" ${2 == item.isCrossLogisticsFixedOrProportional ? 'checked=checked' : ''}>
+ <label for="kcx2">
+ <div style="position: relative;top: -8px;">
+ <span>按固定金额抽成,每笔订单抽取</span>
+ <input style="width: 50%;display: inline-block;" type="text" disabled class="form-control" id="kcxMoney" name="kcxMoney"
+ @if(2 == item.isCrossLogisticsFixedOrProportional){
+ value="${item.crossLogisticsMoney}"
+ @}
+ >
+ <span>元</span>
+ </div>
+ </label>
+ </div>
+ </div>
+ </div>
+ </fieldset>
+ </div>
+ <div class="checkbox checkbox-danger">
+ <input name="checkbox" id="checkbox6" type="checkbox" disabled value="6" ${1 == item.isCharter ? 'checked=checked' : ''} >
+ <label for="checkbox6">
+ 包车
+ </label>
+ </div>
+ </fieldset>
+ </div>
+ </div>
+ <div class="form-group">
+ <label class="col-sm-3 control-label">是否需要摆渡车：</label>
+ <div class="col-sm-9" style="display: flex;align-items: center;">
+ <div class="radio radio-info radio-inline">
+ <input type="radio" disabled id="isNeedFerry1" value="1" name="isNeedFerry" ${1 == item.isNeedFerry ? 'checked=checked' : ''} >
+ <label for="isNeedFerry1"> 是 </label>
+ </div>
+ <div class="radio radio-success radio-inline">
+ <input type="radio" disabled id="isNeedFerry2" value="2" name="isNeedFerry" ${2 == item.isNeedFerry ? 'checked=checked' : ''}>
+ <label for="isNeedFerry2"> 否 </label>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+
+ </div>
+
+</div>
+</div>
+<script src="${ctxPath}/static/modular/system/tCompany/franchisee_info.js"></script>
+<script type="application/javascript">
+ $(function() {
+ FranchiseeInfoDlg.checkbox1();
+ FranchiseeInfoDlg.checkbox2();
+ FranchiseeInfoDlg.checkbox3();
+ FranchiseeInfoDlg.checkbox4();
+ FranchiseeInfoDlg.checkbox5();
+ FranchiseeInfoDlg.checkbox6();
+
+ var zc = $("input[name='zc']:checked").val();
+ var cz = $("input[name='cz']:checked").val();
+ var tcx = $("input[name='tcx']:checked").val();
+ var kcx = $("input[name='kcx']:checked").val();
+ if (zc == "" || zc == null || zc == undefined){
+ $("#zc1").attr("checked","checked")
+ }
+ if (cz == "" || cz == null || cz == undefined){
+ $("#cz1").attr("checked","checked")
+ }
+ if (tcx == "" || tcx == null || tcx == undefined){
+ $("#tcx1").attr("checked","checked")
+ }
+ if (kcx == "" || kcx == null || kcx == undefined){
+ $("#kcx1").attr("checked","checked")
+ }
+ });
+</script>
+@}
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tCompany/tCompany_edit.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tCompany/tCompany_edit.html
new file mode 100644
index 0000000..a66685f
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tCompany/tCompany_edit.html
@@ -0,0 +1,372 @@
+@layout("/common/_container.html"){
+<div class="ibox float-e-margins">
+ <div class="ibox-content">
+ <div class="form-horizontal" id="companyInfoForm">
+ <input type="hidden" id="id" name="id" value="${item.id}">
+ <input type="hidden" id="userId" name="userId" value="${user.id}">
+ <div class="row">
+ <div class="col-sm-6 b-r">
+ <#input id="name" name="分公司名称" value="${item.name}" />
+ <#input id="code" name="分公司代码" value="${item.code}" />
+ <#input id="principalName" name="分公司负责人" value="${item.principalName}" />
+ <#input id="adminName" name="分公司管理人" value="${item.adminName}" />
+ <#input id="documentAddress" name="行政文书送达地址" value="${item.documentAddress}" />
+ <#input id="setupTime" name="服务机构设立日期" value="${item.setupTime}" />
+ <#input id="licenseNumber" name="网络预约出租汽<br>车经营许可证号" value="${item.licenseNumber}" />
+ <#input id="addressCode" name="注册地行政区域划<br>分代码" value="${item.addressCode}" />
+ <#input id="licenseTime" name="经营许可证初次发证日期" value="${item.licenseTime}" />
+ <#input id="licenseEndTime" name="经营许可证有效期止" value="${item.licenseEndTime}" />
+ <#input id="regCapital" name="注册资本" value="${item.regCapital}" />
+ <#input id="driverNum" name="注册网络预约车驾驶员数量" value="${item.driverNum}" />
+ <#input id="legalId" name="法人代表身份证号" value="${item.legalId}" />
+ <#avatar id="idCardPositive" name="法定代表人身份<br>证照片(正面)：" avatarImg="${item.idCardPositive}"/>
+ <#input id="contactAddress" name="通信地址" value="${item.contactAddress}"/>
+ </div>
+
+ <div class="col-sm-6">
+ <#input id="scopeCode" name="分公司区划代码" value="${item.scopeCode}"/>
+ <#input id="detailAddress" name="分公司具体地址" value="${item.detailAddress}"/>
+ <#input id="principalPhone" name="负责人电话" value="${item.principalPhone}"/>
+ <#input id="adminPhone" name="管理员电话" value="${item.adminPhone}"/>
+ <#input id="urgentPhoen" name="紧急联系电话" value="${item.urgentPhoen}"/>
+ <#input id="identifier" name="统一社会信用代码" value="${item.identifier}"/>
+ <#input id="serviceScope" name="经营区域" value="${item.serviceScope}"/>
+ <#input id="licensingAgency" name="经营许可证发证机构" value="${item.licensingAgency}"/>
+ <#input id="licenseStartTime" name="经营许可证有效期起" value="${item.licenseStartTime}"/>
+ <#input id="economicType" name="经营业户经济类型" value="${item.economicType}"/>
+ <#input id="carNum" name="注册网络预约出租车<br>车辆数" value="${item.carNum}"/>
+ <#input id="legalName" name="法人代表姓名" value="${item.legalName}"/>
+ <#input id="legalPhone" name="法人代表电话" value="${item.legalPhone}"/>
+ <#avatar id="idCardReverse" name="法定代表人身份<br>证照片(反面)：" avatarImg="${item.idCardReverse}"/>
+ <#input id="businessScope" name="经营范围" value="${item.businessScope}"/>
+ </div>
+ </div>
+ <div class="row">
+ <div class="col-sm-12">
+ <div class="form-group">
+ <label class="col-sm-2 control-label">经营业务：</label>
+ <div class="col-sm-10">
+ <fieldset>
+ <div class="checkbox checkbox-success">
+ <input name="checkbox" id="checkbox1" type="checkbox" value="1" ${1 == item.isSpe ? 'checked=checked' : ''} onclick="TCompanyInfoDlg.checkbox1()">
+ <label for="checkbox1">
+ 专车
+ </label>
+ <fieldset>
+ <div class="row" style="display: none;" id="zcDiv">
+ <div class="col-sm-6">
+ <div class="checkbox checkbox-circle">
+ <input type="radio" name="zc" id="zc1" value="1" ${1 == item.isSpeFixedOrProportional ? 'checked=checked' : ''}>
+ <label for="zc1">
+ <div style="position: relative;top: -8px;">
+ <span>按比例抽成,每笔订单抽取</span>
+ <input style="width: 50%;display: inline-block;" type="text" class="form-control" id="zcPercent" name="zcPercent"
+ @if(1 == item.isSpeFixedOrProportional){
+ value="${item.speMoney}"
+ @}
+ >
+ <span>%</span>
+ </div>
+ </label>
+ </div>
+ <div class="checkbox checkbox-circle">
+ <input type="radio" name="zc" id="zc2" value="2" ${2 == item.isSpeFixedOrProportional ? 'checked=checked' : ''}>
+ <label for="zc2">
+ <div style="position: relative;top: -8px;">
+ <span>按固定金额抽成,每笔订单抽取</span>
+ <input style="width: 50%;display: inline-block;" type="text" class="form-control" id="zcMoney" name="zcMoney"
+ @if(2 == item.isSpeFixedOrProportional){
+ value="${item.speMoney}"
+ @}
+ >
+ <span>元</span>
+ </div>
+ </label>
+ </div>
+ </div>
+ </div>
+ </fieldset>
+ </div>
+ <div class="checkbox checkbox-primary">
+ <input name="checkbox" id="checkbox2" type="checkbox" value="2" ${1 == item.isTaxi ? 'checked=checked' : ''} onclick="TCompanyInfoDlg.checkbox2()">
+ <label for="checkbox2">
+ 出租车
+ </label>
+ <fieldset>
+ <div class="row" style="display: none;" id="czDiv">
+ <div class="col-sm-6">
+ <div class="checkbox checkbox-circle">
+ <input type="radio" name="cz" id="cz1" value="1" ${1 == item.isTaxiFixedOrProportional ? 'checked=checked' : ''}>
+ <label for="cz1">
+ <div style="position: relative;top: -8px;">
+ <span>按比例抽成,每笔订单抽取</span>
+ <input style="width: 50%;display: inline-block;" type="text" class="form-control" id="czPercent" name="czPercent"
+ @if(1 == item.isTaxiFixedOrProportional){
+ value="${item.taxiMoney}"
+ @}
+ >
+ <span>%</span>
+ </div>
+ </label>
+ </div>
+ <div class="checkbox checkbox-circle">
+ <input type="radio" name="cz" id="cz2" value="2" ${2 == item.isTaxiFixedOrProportional ? 'checked=checked' : ''}>
+ <label for="cz2">
+ <div style="position: relative;top: -8px;">
+ <span>按固定金额抽成,每笔订单抽取</span>
+ <input style="width: 50%;display: inline-block;" type="text" class="form-control" id="czMoney" name="czMoney"
+ @if(2 == item.isTaxiFixedOrProportional){
+ value="${item.taxiMoney}"
+ @}
+ >
+ <span>元</span>
+ </div>
+ </label>
+ </div>
+ </div>
+ </div>
+ </fieldset>
+ </div>
+ <div class="checkbox checkbox-success">
+ <input name="checkbox" id="checkbox3" type="checkbox" value="3" ${1 == item.isCross ? 'checked=checked' : ''} onclick="TCompanyInfoDlg.checkbox3()">
+ <label for="checkbox3">
+ 跨城出行
+ </label>
+ </div>
+ <div class="checkbox checkbox-info">
+ <input name="checkbox" id="checkbox4" type="checkbox" value="4" ${1 == item.isSameLogistics ? 'checked=checked' : ''} onclick="TCompanyInfoDlg.checkbox4()">
+ <label for="checkbox4">
+ 同城小件物流
+ </label>
+ <fieldset>
+ <div class="row" style="display: none;" id="tcxDiv">
+ <div class="col-sm-6">
+ <div class="checkbox checkbox-circle">
+ <input type="radio" name="tcx" id="tcx1" value="1" ${1 == item.isSameLogisticsFixedOrProportional ? 'checked=checked' : ''}>
+ <label for="tcx1">
+ <div style="position: relative;top: -8px;">
+ <span>按比例抽成,每笔订单抽取</span>
+ <input style="width: 50%;display: inline-block;" type="text" class="form-control" id="tcxPercent" name="tcxPercent"
+ @if(1 == item.isSameLogisticsFixedOrProportional){
+ value="${item.sameLogisticsMoney}"
+ @}
+ >
+ <span>%</span>
+ </div>
+ </label>
+ </div>
+ <div class="checkbox checkbox-circle">
+ <input type="radio" name="tcx" id="tcx2" value="2" ${2 == item.isSameLogisticsFixedOrProportional ? 'checked=checked' : ''}>
+ <label for="tcx2">
+ <div style="position: relative;top: -8px;">
+ <span>按固定金额抽成,每笔订单抽取</span>
+ <input style="width: 50%;display: inline-block;" type="text" class="form-control" id="tcxMoney" name="tcxMoney"
+ @if(2 == item.isSameLogisticsFixedOrProportional){
+ value="${item.sameLogisticsMoney}"
+ @}
+ >
+ <span>元</span>
+ </div>
+ </label>
+ </div>
+ </div>
+ </div>
+ </fieldset>
+ </div>
+ <div class="checkbox checkbox-warning">
+ <input name="checkbox" id="checkbox5" type="checkbox" value="5" ${1 == item.isCrossLogistics ? 'checked=checked' : ''} onclick="TCompanyInfoDlg.checkbox5()">
+ <label for="checkbox5">
+ 跨城小件物流
+ </label>
+ <fieldset>
+ <div class="row" style="display: none;" id="kcxDiv">
+ <div class="col-sm-6">
+ <div class="checkbox checkbox-circle">
+ <input type="radio" name="kcx" id="kcx1" value="1" ${1 == item.isCrossLogisticsFixedOrProportional ? 'checked=checked' : ''}>
+ <label for="kcx1">
+ <div style="position: relative;top: -8px;">
+ <span>按比例抽成,每笔订单抽取</span>
+ <input style="width: 50%;display: inline-block;" type="text" class="form-control" id="kcxPercent" name="kcxPercent"
+ @if(1 == item.isCrossLogisticsFixedOrProportional){
+ value="${item.crossLogisticsMoney}"
+ @}
+ >
+ <span>%</span>
+ </div>
+ </label>
+ </div>
+ <div class="checkbox checkbox-circle">
+ <input type="radio" name="kcx" id="kcx2" value="2" ${2 == item.isCrossLogisticsFixedOrProportional ? 'checked=checked' : ''}>
+ <label for="kcx2">
+ <div style="position: relative;top: -8px;">
+ <span>按固定金额抽成,每笔订单抽取</span>
+ <input style="width: 50%;display: inline-block;" type="text" class="form-control" id="kcxMoney" name="kcxMoney"
+ @if(2 == item.isCrossLogisticsFixedOrProportional){
+ value="${item.crossLogisticsMoney}"
+ @}
+ >
+ <span>元</span>
+ </div>
+ </label>
+ </div>
+ </div>
+ </div>
+ </fieldset>
+ </div>
+ <div class="checkbox checkbox-danger">
+ <input name="checkbox" id="checkbox6" type="checkbox" value="6" ${1 == item.isCharter ? 'checked=checked' : ''} onclick="TCompanyInfoDlg.checkbox6()">
+ <label for="checkbox6">
+ 包车
+ </label>
+ </div>
+ </fieldset>
+ </div>
+ </div>
+ </div>
+ </div>
+
+ <div class="row">
+ <div class="col-sm-12">
+ <div class="form-group">
+ <label class="col-sm-2 control-label">经营区域：</label>
+ <div class="col-sm-2">
+ <select class="form-control" id="province" onchange="TCompanyInfoDlg.provinceChange(this)">
+ <option value="">选择省</option>
+ @for(obj in provinceList){
+ <option value="${obj.code}">${obj.name}</option>
+ @}
+ </select>
+ </div>
+ <div class="col-sm-2">
+ <select class="form-control" id="city" onchange="TCompanyInfoDlg.cityChage(this)">
+ <option value="">选择市</option>
+ </select>
+ </div>
+ <div class="col-sm-2">
+ <select class="form-control" id="area">
+ <option value="">选择区</option>
+ </select>
+ </div>
+ <div class="col-sm-1">
+ <#button btnCss="info" name="添加" id="ensure" icon="fa-check" clickFun="TCompanyInfoDlg.addScope()"/>
+ </div>
+ </div>
+ <div class="form-group">
+ <label class="col-sm-2 control-label">添加区域</label>
+ <div class="col-sm-9">
+ <div style="height: 200px; border: 1px solid #e5e6e7;overflow-y: auto;">
+ <table class="table table-striped table-bordered table-hover table-condensed">
+ <thead>
+ <tr>
+ <th style="width: 300px;">区域</th>
+ <th style="width: 200px;">操作</th>
+ </tr>
+ </thead>
+ <tbody id="conn">
+ @for(obj in scopeList){
+ <tr class="timeClass">
+ <td><input type="hidden" id="recordId" name="recordId" value="${obj.id}">
+ <input type="hidden" id="provinceCode" name="provinceCode" value="${obj.provinceCode}">
+ <input type="hidden" id="cityCode" name="cityCode" value="${obj.cityCode}">
+ <input type="hidden" id="areaCode" name="areaCode" value="${obj.areaCode}">${obj.value}</td>
+ <td><button onclick="deleteSub(this)">移除</button></td>
+ </tr>
+ @}
+ </tbody>
+ </table>
+ </div>
+ </div>
+ </div>
+
+ <div class="form-group">
+ <label class="col-sm-2 control-label">是否需要摆渡车：</label>
+ <div class="col-sm-9" style="display: flex;align-items: center;">
+ <div class="radio radio-info radio-inline">
+ <input type="radio" id="isNeedFerry1" value="1" name="isNeedFerry" ${1 == item.isNeedFerry ? 'checked=checked' : ''} >
+ <label for="isNeedFerry1"> 是 </label>
+ </div>
+ <div class="radio radio-success radio-inline">
+ <input type="radio" id="isNeedFerry2" value="2" name="isNeedFerry" ${2 == item.isNeedFerry ? 'checked=checked' : ''}>
+ <label for="isNeedFerry2"> 否 </label>
+ </div>
+ </div>
+ </div>
+ <div class="form-group">
+ <label class="col-sm-2 control-label">限登录MAC地址：</label>
+ <div class="col-sm-9">
+ <input type="text" class="form-control" id="mac" name="mac" value="${item.mac}">
+ </div>
+ </div>
+ <div class="form-group">
+ <label class="col-sm-2 control-label">登录账号：</label>
+ <div class="col-sm-9">
+ <input type="text" class="form-control" id="account" name="account" value="${user.account}">
+ </div>
+ </div>
+ <div class="form-group">
+ <label class="col-sm-2 control-label">登录密码：</label>
+ <div class="col-sm-9">
+ <input type="password" class="form-control" id="password" name="password" >
+ </div>
+ </div>
+ <div class="form-group">
+ <label class="col-sm-2 control-label">确认密码：</label>
+ <div class="col-sm-9">
+ <input type="password" class="form-control" id="rePassword" name="rePassword" >
+ </div>
+ </div>
+ </div>
+ </div>
+
+ <div class="row btn-group-m-t">
+ <div class="col-sm-10 col-sm-offset-5">
+ <#button btnCss="info" name="提交" id="ensure" icon="fa-check" clickFun="TCompanyInfoDlg.editSubmit()"/>
+ <#button btnCss="danger" name="取消" id="cancel" icon="fa-eraser" clickFun="TCompanyInfoDlg.close()"/>
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/tCompany/tCompany_info.js"></script>
+<script type="application/javascript">
+ laydate.render({
+ elem: '#setupTime'
+ });
+ laydate.render({
+ elem: '#licenseTime'
+ });
+ laydate.render({
+ elem: '#licenseStartTime'
+ });
+ laydate.render({
+ elem: '#licenseEndTime'
+ });
+
+ $(function() {
+ TCompanyInfoDlg.checkbox1();
+ TCompanyInfoDlg.checkbox2();
+ TCompanyInfoDlg.checkbox3();
+ TCompanyInfoDlg.checkbox4();
+ TCompanyInfoDlg.checkbox5();
+ TCompanyInfoDlg.checkbox6();
+
+ var zc = $("input[name='zc']:checked").val();
+ var cz = $("input[name='cz']:checked").val();
+ var tcx = $("input[name='tcx']:checked").val();
+ var kcx = $("input[name='kcx']:checked").val();
+ if (zc == "" || zc == null || zc == undefined){
+ $("#zc1").attr("checked","checked")
+ }
+ if (cz == "" || cz == null || cz == undefined){
+ $("#cz1").attr("checked","checked")
+ }
+ if (tcx == "" || tcx == null || tcx == undefined){
+ $("#tcx1").attr("checked","checked")
+ }
+ if (kcx == "" || kcx == null || kcx == undefined){
+ $("#kcx1").attr("checked","checked")
+ }
+ });
+</script>
+@}
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tCompany/tCompany_updateFranchisee.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tCompany/tCompany_updateFranchisee.html
new file mode 100644
index 0000000..fbadeed
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tCompany/tCompany_updateFranchisee.html
@@ -0,0 +1,278 @@
+@layout("/common/_container.html"){
+<div class="ibox float-e-margins">
+ <div class="ibox-content">
+ <div class="form-horizontal" id="franchiseeInfoForm">
+ <input type="hidden" id="id" name="id" value="${item.id}">
+ <input type="hidden" id="userId" name="userId" value="${user.id}">
+ <div class="row">
+ <div class="col-sm-10">
+ @if(roleType == 1){
+ <#select id="superiorId" name="所属分公司：" onchange="TOpenCityInfoDlg.provinceChange()">
+ <option value="">选择所属分公司</option>
+ @for(obj in companyList){
+ <option value="${obj.id}" ${obj.id == item.superiorId ? 'selected=selected' : ''}>${obj.name}</option>
+ @}
+ </#select>
+ @}else if(roleType == 2){
+ <#label id="companyName" name="所属分公司" value="${company.name}"/>
+ @}
+ <#input id="name" name="加盟商名称" value="${item.name}"/>
+ <#input id="detailAddress" name="加盟商地址" value="${item.detailAddress}"/>
+ <#input id="principalName" name="联系人" value="${item.principalName}"/>
+ <#input id="principalPhone" name="联系电话" value="${item.principalPhone}" />
+ </div>
+ </div>
+ <div class="row">
+ <div class="col-sm-10">
+ <div class="form-group">
+ <label class="col-sm-3 control-label">经营业务：</label>
+ <div class="col-sm-9">
+ <fieldset>
+ <div class="checkbox checkbox-success">
+ <input name="checkbox" id="checkbox1" type="checkbox" value="1" ${1 == item.isSpe ? 'checked=checked' : ''} onclick="FranchiseeInfoDlg.checkbox1()">
+ <label for="checkbox1">
+ 专车
+ </label>
+ <fieldset>
+ <div class="row" style="display: none;" id="zcDiv">
+ <div class="col-sm-6">
+ <div class="checkbox checkbox-circle">
+ <input type="radio" name="zc" id="zc1" value="1" ${1 == item.isSpeFixedOrProportional ? 'checked=checked' : ''}>
+ <label for="zc1">
+ <div style="position: relative;top: -8px;">
+ <span>按比例抽成,每笔订单抽取</span>
+ <input style="width: 50%;display: inline-block;" type="text" class="form-control" id="zcPercent" name="zcPercent"
+ @if(1 == item.isSpeFixedOrProportional){
+ value="${item.speMoney}"
+ @}
+ >
+ <span>%</span>
+ </div>
+ </label>
+ </div>
+ <div class="checkbox checkbox-circle">
+ <input type="radio" name="zc" id="zc2" value="2" ${2 == item.isSpeFixedOrProportional ? 'checked=checked' : ''}>
+ <label for="zc2">
+ <div style="position: relative;top: -8px;">
+ <span>按固定金额抽成,每笔订单抽取</span>
+ <input style="width: 50%;display: inline-block;" type="text" class="form-control" id="zcMoney" name="zcMoney"
+ @if(2 == item.isSpeFixedOrProportional){
+ value="${item.speMoney}"
+ @}
+ >
+ <span>元</span>
+ </div>
+ </label>
+ </div>
+ </div>
+ </div>
+ </fieldset>
+ </div>
+ <div class="checkbox checkbox-primary">
+ <input name="checkbox" id="checkbox2" type="checkbox" value="2" ${1 == item.isTaxi ? 'checked=checked' : ''} onclick="FranchiseeInfoDlg.checkbox2()">
+ <label for="checkbox2">
+ 出租车
+ </label>
+ <fieldset>
+ <div class="row" style="display: none;" id="czDiv">
+ <div class="col-sm-6">
+ <div class="checkbox checkbox-circle">
+ <input type="radio" name="cz" id="cz1" value="1" ${1 == item.isTaxiFixedOrProportional ? 'checked=checked' : ''}>
+ <label for="cz1">
+ <div style="position: relative;top: -8px;">
+ <span>按比例抽成,每笔订单抽取</span>
+ <input style="width: 50%;display: inline-block;" type="text" class="form-control" id="czPercent" name="czPercent"
+ @if(1 == item.isTaxiFixedOrProportional){
+ value="${item.taxiMoney}"
+ @}
+ >
+ <span>%</span>
+ </div>
+ </label>
+ </div>
+ <div class="checkbox checkbox-circle">
+ <input type="radio" name="cz" id="cz2" value="2" ${2 == item.isTaxiFixedOrProportional ? 'checked=checked' : ''}>
+ <label for="cz2">
+ <div style="position: relative;top: -8px;">
+ <span>按固定金额抽成,每笔订单抽取</span>
+ <input style="width: 50%;display: inline-block;" type="text" class="form-control" id="czMoney" name="czMoney"
+ @if(2 == item.isTaxiFixedOrProportional){
+ value="${item.taxiMoney}"
+ @}
+ >
+ <span>元</span>
+ </div>
+ </label>
+ </div>
+ </div>
+ </div>
+ </fieldset>
+ </div>
+ <div class="checkbox checkbox-success">
+ <input name="checkbox" id="checkbox3" type="checkbox" value="3" ${1 == item.isCross ? 'checked=checked' : ''} onclick="FranchiseeInfoDlg.checkbox3()">
+ <label for="checkbox3">
+ 跨城出行
+ </label>
+ </div>
+ <div class="checkbox checkbox-info">
+ <input name="checkbox" id="checkbox4" type="checkbox" value="4" ${1 == item.isSameLogistics ? 'checked=checked' : ''} onclick="FranchiseeInfoDlg.checkbox4()">
+ <label for="checkbox4">
+ 同城小件物流
+ </label>
+ <fieldset>
+ <div class="row" style="display: none;" id="tcxDiv">
+ <div class="col-sm-6">
+ <div class="checkbox checkbox-circle">
+ <input type="radio" name="tcx" id="tcx1" value="1" ${1 == item.isSameLogisticsFixedOrProportional ? 'checked=checked' : ''}>
+ <label for="tcx1">
+ <div style="position: relative;top: -8px;">
+ <span>按比例抽成,每笔订单抽取</span>
+ <input style="width: 50%;display: inline-block;" type="text" class="form-control" id="tcxPercent" name="tcxPercent"
+ @if(1 == item.isSameLogisticsFixedOrProportional){
+ value="${item.sameLogisticsMoney}"
+ @}
+ >
+ <span>%</span>
+ </div>
+ </label>
+ </div>
+ <div class="checkbox checkbox-circle">
+ <input type="radio" name="tcx" id="tcx2" value="2" ${2 == item.isSameLogisticsFixedOrProportional ? 'checked=checked' : ''}>
+ <label for="tcx2">
+ <div style="position: relative;top: -8px;">
+ <span>按固定金额抽成,每笔订单抽取</span>
+ <input style="width: 50%;display: inline-block;" type="text" class="form-control" id="tcxMoney" name="tcxMoney"
+ @if(2 == item.isSameLogisticsFixedOrProportional){
+ value="${item.sameLogisticsMoney}"
+ @}
+ >
+ <span>元</span>
+ </div>
+ </label>
+ </div>
+ </div>
+ </div>
+ </fieldset>
+ </div>
+ <div class="checkbox checkbox-warning">
+ <input name="checkbox" id="checkbox5" type="checkbox" value="5" ${1 == item.isCrossLogistics ? 'checked=checked' : ''} onclick="FranchiseeInfoDlg.checkbox5()">
+ <label for="checkbox5">
+ 跨城小件物流
+ </label>
+ <fieldset>
+ <div class="row" style="display: none;" id="kcxDiv">
+ <div class="col-sm-6">
+ <div class="checkbox checkbox-circle">
+ <input type="radio" name="kcx" id="kcx1" value="1" ${1 == item.isCrossLogisticsFixedOrProportional ? 'checked=checked' : ''}>
+ <label for="kcx1">
+ <div style="position: relative;top: -8px;">
+ <span>按比例抽成,每笔订单抽取</span>
+ <input style="width: 50%;display: inline-block;" type="text" class="form-control" id="kcxPercent" name="kcxPercent"
+ @if(1 == item.isCrossLogisticsFixedOrProportional){
+ value="${item.crossLogisticsMoney}"
+ @}
+ >
+ <span>%</span>
+ </div>
+ </label>
+ </div>
+ <div class="checkbox checkbox-circle">
+ <input type="radio" name="kcx" id="kcx2" value="2" ${2 == item.isCrossLogisticsFixedOrProportional ? 'checked=checked' : ''}>
+ <label for="kcx2">
+ <div style="position: relative;top: -8px;">
+ <span>按固定金额抽成,每笔订单抽取</span>
+ <input style="width: 50%;display: inline-block;" type="text" class="form-control" id="kcxMoney" name="kcxMoney"
+ @if(2 == item.isCrossLogisticsFixedOrProportional){
+ value="${item.crossLogisticsMoney}"
+ @}
+ >
+ <span>元</span>
+ </div>
+ </label>
+ </div>
+ </div>
+ </div>
+ </fieldset>
+ </div>
+ <div class="checkbox checkbox-danger">
+ <input name="checkbox" id="checkbox6" type="checkbox" value="6" ${1 == item.isCharter ? 'checked=checked' : ''} onclick="FranchiseeInfoDlg.checkbox6()">
+ <label for="checkbox6">
+ 包车
+ </label>
+ </div>
+ </fieldset>
+ </div>
+ </div>
+ <div class="form-group">
+ <label class="col-sm-3 control-label">是否需要摆渡车：</label>
+ <div class="col-sm-9" style="display: flex;align-items: center;">
+ <div class="radio radio-info radio-inline">
+ <input type="radio" id="isNeedFerry1" value="1" name="isNeedFerry" ${1 == item.isNeedFerry ? 'checked=checked' : ''} >
+ <label for="isNeedFerry1"> 是 </label>
+ </div>
+ <div class="radio radio-success radio-inline">
+ <input type="radio" id="isNeedFerry2" value="2" name="isNeedFerry" ${2 == item.isNeedFerry ? 'checked=checked' : ''}>
+ <label for="isNeedFerry2"> 否 </label>
+ </div>
+ </div>
+ </div>
+ <div class="form-group">
+ <label class="col-sm-3 control-label">登录账号：</label>
+ <div class="col-sm-9">
+ <input type="text" class="form-control" id="account" name="account" value="${user.account}">
+ </div>
+ </div>
+ <div class="form-group">
+ <label class="col-sm-3 control-label">登录密码：</label>
+ <div class="col-sm-9">
+ <input type="password" class="form-control" id="password" name="password" >
+ </div>
+ </div>
+ <div class="form-group">
+ <label class="col-sm-3 control-label">确认密码：</label>
+ <div class="col-sm-9">
+ <input type="password" class="form-control" id="rePassword" name="rePassword" >
+ </div>
+ </div>
+ </div>
+ </div>
+
+ <div class="row btn-group-m-t">
+ <div class="col-sm-10 col-sm-offset-5">
+ <#button btnCss="info" name="提交" id="ensure" icon="fa-check" clickFun="FranchiseeInfoDlg.updateFranchisee()"/>
+ <#button btnCss="danger" name="取消" id="cancel" icon="fa-eraser" clickFun="FranchiseeInfoDlg.close()"/>
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/tCompany/franchisee_info.js"></script>
+<script type="application/javascript">
+ $(function() {
+ FranchiseeInfoDlg.checkbox1();
+ FranchiseeInfoDlg.checkbox2();
+ FranchiseeInfoDlg.checkbox3();
+ FranchiseeInfoDlg.checkbox4();
+ FranchiseeInfoDlg.checkbox5();
+ FranchiseeInfoDlg.checkbox6();
+
+ var zc = $("input[name='zc']:checked").val();
+ var cz = $("input[name='cz']:checked").val();
+ var tcx = $("input[name='tcx']:checked").val();
+ var kcx = $("input[name='kcx']:checked").val();
+ if (zc == "" || zc == null || zc == undefined){
+ $("#zc1").attr("checked","checked")
+ }
+ if (cz == "" || cz == null || cz == undefined){
+ $("#cz1").attr("checked","checked")
+ }
+ if (tcx == "" || tcx == null || tcx == undefined){
+ $("#tcx1").attr("checked","checked")
+ }
+ if (kcx == "" || kcx == null || kcx == undefined){
+ $("#kcx1").attr("checked","checked")
+ }
+ });
+</script>
+@}
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tComplaint/lookDetail.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tComplaint/lookDetail.html
new file mode 100644
index 0000000..e9a69a5
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tComplaint/lookDetail.html
@@ -0,0 +1,29 @@
+@layout("/common/_container.html"){
+<div class="ibox float-e-margins">
+ <div class="ibox-content">
+ <div class="form-horizontal">
+
+ <div class="row">
+ <div class="col-sm-12">
+ <div class="ibox-content">
+ <div class="alert alert-success">
+ ${str}
+ </div>
+ <!--<div class="alert alert-info">
+ ${str}
+ </div>
+ <div class="alert alert-warning">
+ ${str}
+ </div>
+ <div class="alert alert-danger">
+ ${str}
+ </div>-->
+ </div>
+ </div>
+ </div>
+
+ </div>
+
+ </div>
+</div>
+@}
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tComplaint/tComplaint.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tComplaint/tComplaint.html
new file mode 100644
index 0000000..2eebeb2
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tComplaint/tComplaint.html
@@ -0,0 +1,58 @@
+@layout("/common/_container.html"){
+<div class="row">
+ <div class="col-sm-12">
+ <div class="ibox float-e-margins">
+ <div class="ibox-title">
+ <h5>投诉列表管理</h5>
+ </div>
+ <div class="ibox-content">
+ <div class="row row-lg">
+ <div class="col-sm-12">
+ <div class="row">
+ <div class="col-sm-3">
+ <#TimeCon id="insertTime" name="投诉时间" isTime="false"/>
+ </div>
+ <div class="col-sm-3">
+ <#NameCon id="userName" name="投诉人昵称" />
+ </div>
+ <div class="col-sm-3">
+ <#NameCon id="userPhone" name="投诉人电话" />
+ </div>
+ <div class="col-sm-3">
+ <#NameCon id="driverPhone" name="投诉司机电话" />
+ </div>
+ <div class="col-sm-3">
+ <#SelectCon id="isHandle" name="状态" >
+ <option value="">全部</option>
+ <option value="2">未处理</option>
+ <option value="1">已处理</option>
+ </#SelectCon>
+ </div>
+ <div class="col-sm-3">
+ <#button name="搜索" icon="fa-search" clickFun="TComplaint.search()"/>
+ <#button name="重置" icon="fa-trash" clickFun="TComplaint.resetSearch()" space="true"/>
+ </div>
+ </div>
+ <div class="hidden-xs" id="TComplaintTableToolbar" role="group">
+ @if(shiro.hasPermission("/tComplaint/immediately")){
+ <#button name="立即处理" icon="fa-edit" clickFun="TComplaint.immediately()"/>
+ @}
+ @if(shiro.hasPermission("/tComplaint/delete")){
+ <#button name="删除记录" icon="fa-remove" clickFun="TComplaint.delete()" space="true"/>
+ @}
+ </div>
+ <#table id="TComplaintTable"/>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/tComplaint/tComplaint.js"></script>
+<script>
+ laydate.render({
+ elem: '#insertTime'
+ ,range: true
+ });
+</script>
+@}
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tComplaint/tComplaint_add.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tComplaint/tComplaint_add.html
new file mode 100644
index 0000000..2b53ab9
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tComplaint/tComplaint_add.html
@@ -0,0 +1,34 @@
+@layout("/common/_container.html"){
+<div class="ibox float-e-margins">
+ <div class="ibox-content">
+ <div class="form-horizontal">
+
+ <div class="row">
+ <div class="col-sm-6 b-r">
+ <#input id="id" name="主键" underline="true"/>
+ <#input id="userId" name="用户Id" underline="true"/>
+ <#input id="reason" name="投诉原因" underline="true"/>
+ <#input id="driverId" name="被投诉人Id" underline="true"/>
+ <#input id="description" name="描述"/>
+ </div>
+
+ <div class="col-sm-6">
+ <#input id="isHandle" name="是否处理（0：未处理，1：已处理）" underline="true"/>
+ <#input id="insertTime" name="投诉时间" underline="true"/>
+ <#input id="handleResult" name="处理结果" underline="true"/>
+ <#input id="handleUserId" name="处理人id" underline="true"/>
+ </div>
+ </div>
+
+ <div class="row btn-group-m-t">
+ <div class="col-sm-10">
+ <#button btnCss="info" name="提交" id="ensure" icon="fa-check" clickFun="TComplaintInfoDlg.addSubmit()"/>
+ <#button btnCss="danger" name="取消" id="cancel" icon="fa-eraser" clickFun="TComplaintInfoDlg.close()"/>
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/tComplaint/tComplaint_info.js"></script>
+@}
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tComplaint/tComplaint_edit.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tComplaint/tComplaint_edit.html
new file mode 100644
index 0000000..2affa4e
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tComplaint/tComplaint_edit.html
@@ -0,0 +1,34 @@
+@layout("/common/_container.html"){
+<div class="ibox float-e-margins">
+ <div class="ibox-content">
+ <div class="form-horizontal">
+
+ <div class="row">
+ <div class="col-sm-6 b-r">
+ <#input id="id" name="主键" value="${item.id}" underline="true"/>
+ <#input id="userId" name="用户Id" value="${item.userId}" underline="true"/>
+ <#input id="reason" name="投诉原因" value="${item.reason}" underline="true"/>
+ <#input id="driverId" name="被投诉人Id" value="${item.driverId}" underline="true"/>
+ <#input id="description" name="描述" value="${item.description}" />
+ </div>
+
+ <div class="col-sm-6">
+ <#input id="isHandle" name="是否处理（0：未处理，1：已处理）" value="${item.isHandle}" underline="true"/>
+ <#input id="insertTime" name="投诉时间" value="${item.insertTime}" underline="true"/>
+ <#input id="handleResult" name="处理结果" value="${item.handleResult}" underline="true"/>
+ <#input id="handleUserId" name="处理人id" value="${item.handleUserId}" />
+ </div>
+ </div>
+
+ <div class="row btn-group-m-t">
+ <div class="col-sm-10">
+ <#button btnCss="info" name="提交" id="ensure" icon="fa-check" clickFun="TComplaintInfoDlg.editSubmit()"/>
+ <#button btnCss="danger" name="取消" id="cancel" icon="fa-eraser" clickFun="TComplaintInfoDlg.close()"/>
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/tComplaint/tComplaint_info.js"></script>
+@}
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tComplaint/tComplaint_immediately.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tComplaint/tComplaint_immediately.html
new file mode 100644
index 0000000..906ce24
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tComplaint/tComplaint_immediately.html
@@ -0,0 +1,28 @@
+@layout("/common/_container.html"){
+<div class="ibox float-e-margins">
+ <div class="ibox-content">
+ <div class="form-horizontal" id="complaintFormInfo">
+ <input type="hidden" id="id" name="id" value="${tComplaintId}">
+ <div class="row">
+ <div class="col-sm-11">
+ <div class="form-group">
+ <label class="col-sm-3 control-label">填写备注：</label>
+ <div class="col-sm-9">
+ <textarea type="text/plain" class="form-control" name="handleResult" id="handleResult" placeholder="多行输入,最多500字" style="width:100%;height:150px;"></textarea>
+ </div>
+ </div>
+ </div>
+ </div>
+
+ <div class="row btn-group-m-t">
+ <div class="col-sm-10 col-sm-offset-5">
+ <#button btnCss="info" name="提交" id="ensure" icon="fa-check" clickFun="TComplaintInfoDlg.immediately()"/>
+ <#button btnCss="danger" name="取消" id="cancel" icon="fa-eraser" clickFun="TComplaintInfoDlg.close()"/>
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/tComplaint/tComplaint_info.js"></script>
+@}
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tDispatch/tDispatch.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tDispatch/tDispatch.html
new file mode 100644
index 0000000..ce876ec
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tDispatch/tDispatch.html
@@ -0,0 +1,70 @@
+@layout("/common/_container.html"){
+<div class="row">
+ <div class="col-sm-12">
+ <div class="ibox float-e-margins">
+ <div class="ibox-title">
+ <h5>调度管理</h5>
+ </div>
+ <div class="ibox-content">
+ <div class="row row-lg">
+ <div class="col-sm-12">
+ <div class="row">
+ <div class="col-sm-3">
+ <#TimeCon id="insertTime" name="添加时间" isTime="false"/>
+ </div>
+ <div class="col-sm-3">
+ <#NameCon id="name" name="调度名称" />
+ </div>
+ <div class="col-sm-3">
+ <#NameCon id="companyName" name="所属分公司" />
+ </div>
+ <div class="col-sm-3">
+ <#NameCon id="franchiseeName" name="所属加盟商" />
+ </div>
+ <div class="col-sm-3">
+ <#NameCon id="account" name="账号" />
+ </div>
+ <div class="col-sm-3">
+ <#SelectCon id="state" name="状态" >
+ <option value="">全部</option>
+ <option value="1">正常</option>
+ <option value="2">冻结</option>
+ </#SelectCon>
+ </div>
+ <div class="col-sm-3">
+ <#button name="搜索" icon="fa-search" clickFun="TDispatch.search()"/>
+ <#button name="重置" icon="fa-trash" clickFun="TDispatch.resetSearch()" space="true"/>
+ </div>
+ </div>
+ <div class="hidden-xs" id="TDispatchTableToolbar" role="group">
+ @if(shiro.hasPermission("/tDispatch/add")){
+ <#button name="添加" icon="fa-plus" clickFun="TDispatch.openAddTDispatch()"/>
+ @}
+ @if(shiro.hasPermission("/tDispatch/update")){
+ <#button name="编辑" icon="fa-edit" clickFun="TDispatch.openTDispatchDetail()" space="true"/>
+ @}
+ @if(shiro.hasPermission("/tDispatch/delete")){
+ <#button name="删除" icon="fa-remove" clickFun="TDispatch.opt(1)" space="true"/>
+ @}
+ @if(shiro.hasPermission("/tDispatch/freeze")){
+ <#button name="冻结" icon="fa-remove" clickFun="TDispatch.opt(2)" space="true"/>
+ @}
+ @if(shiro.hasPermission("/tDispatch/thaw")){
+ <#button name="解冻" icon="fa-remove" clickFun="TDispatch.opt(3)" space="true"/>
+ @}
+ </div>
+ <#table id="TDispatchTable"/>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/tDispatch/tDispatch.js"></script>
+<script>
+ laydate.render({
+ elem: '#insertTime'
+ ,range: true
+ });
+</script>
+@}
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tDispatch/tDispatch_add.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tDispatch/tDispatch_add.html
new file mode 100644
index 0000000..47924fa
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tDispatch/tDispatch_add.html
@@ -0,0 +1,47 @@
+@layout("/common/_container.html"){
+<div class="ibox float-e-margins">
+ <div class="ibox-content">
+ <div class="form-horizontal" id="dispatchInfoForm">
+ <input type="hidden" id="roleType" name="roleType" value="${roleType}">
+ <div class="row">
+ <div class="col-sm-11">
+ <#input id="name" name="调度名称"/>
+
+ @if(roleType == 1){
+ <#select id="oneId" name="所属分公司：" onchange="TDispatchInfoDlg.companyChange(this)">
+ <option value="">选择所属分公司</option>
+ @for(obj in companyList){
+ <option value="${obj.id}">${obj.name}</option>
+ @}
+ </#select>
+ <#select id="twoId" name="所属加盟商：" >
+ <option value="">选择所属加盟商</option>
+ </#select>
+ @}
+ @if(roleType == 2){
+ <#select id="franchiseeId" name="所属加盟商：" >
+ <option value="">选择所属加盟商</option>
+ @for(obj in franchiseeList){
+ <option value="${obj.id}">${obj.name}</option>
+ @}
+ </#select>
+ @}
+ <#input id="phone" name="联系电话"/>
+ <#input id="account" name="登录账号"/>
+ <#input id="password" name="登录密码" type="password"/>
+ <#input id="rePassword" name="确认密码" type="password"/>
+ </div>
+ </div>
+
+ <div class="row btn-group-m-t">
+ <div class="col-sm-10 col-sm-offset-5">
+ <#button btnCss="info" name="提交" id="ensure" icon="fa-check" clickFun="TDispatchInfoDlg.addSubmit()"/>
+ <#button btnCss="danger" name="取消" id="cancel" icon="fa-eraser" clickFun="TDispatchInfoDlg.close()"/>
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/tDispatch/tDispatch_info.js"></script>
+@}
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tDispatch/tDispatch_edit.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tDispatch/tDispatch_edit.html
new file mode 100644
index 0000000..1a36c30
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tDispatch/tDispatch_edit.html
@@ -0,0 +1,51 @@
+@layout("/common/_container.html"){
+<div class="ibox float-e-margins">
+ <div class="ibox-content">
+ <div class="form-horizontal" id="dispatchInfoForm">
+ <input type="hidden" id="roleType" name="roleType" value="${roleType}">
+ <input type="hidden" id="id" name="id" value="${item.id}">
+ <div class="row">
+ <div class="col-sm-11">
+ <#input id="name" name="调度名称" value="${item.name}"/>
+
+ @if(roleType == 1){
+ <#select id="oneId" name="所属分公司：" onchange="TDispatchInfoDlg.companyChange(this)">
+ <option value="">选择所属分公司</option>
+ @for(obj in companyList){
+ <option value="${obj.id}" ${obj.id == item.companyId ? 'selected=selected' : ''}>${obj.name}</option>
+ @}
+ </#select>
+ <#select id="twoId" name="所属加盟商：" >
+ <option value="">选择所属加盟商</option>
+ @for(obj in franchiseeList){
+ <option value="${obj.id}" ${obj.id == item.franchiseeId ? 'selected=selected' : ''}>${obj.name}</option>
+ @}
+ </#select>
+ @}
+ @if(roleType == 2){
+ <#select id="franchiseeId" name="所属加盟商：" >
+ <option value="">选择所属加盟商</option>
+ @for(obj in franchiseeList){
+ <option value="${obj.id}" ${obj.id == item.franchiseeId ? 'selected=selected' : ''}>${obj.name}</option>
+ @}
+ </#select>
+ @}
+ <#input id="phone" name="联系电话" value="${item.phone}" />
+ <#input id="account" name="登录账号" value="${item.account}"/>
+ <#input id="password" name="登录密码" value="" type="password"/>
+ <#input id="rePassword" name="确认密码" value="" type="password"/>
+ </div>
+ </div>
+
+ <div class="row btn-group-m-t">
+ <div class="col-sm-10 col-sm-offset-5">
+ <#button btnCss="info" name="提交" id="ensure" icon="fa-check" clickFun="TDispatchInfoDlg.editSubmit()"/>
+ <#button btnCss="danger" name="取消" id="cancel" icon="fa-eraser" clickFun="TDispatchInfoDlg.close()"/>
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/tDispatch/tDispatch_info.js"></script>
+@}
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/punish.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/punish.html
new file mode 100644
index 0000000..dcc440b
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/punish.html
@@ -0,0 +1,62 @@
+@layout("/common/_container.html"){
+<div class="ibox float-e-margins">
+ <input type="hidden" id="netCarDriverId" value="${id}">
+ <input type="hidden" id="id">
+ <div class="ibox-content">
+ <div class="form-horizontal">
+ <div class="hr-line-dashed"></div>
+ <div class="form-group">
+ <label class="col-sm-2 control-label">课程日期</label>
+ <div class="col-sm-9">
+ <input type="text" class="layui-input form-control" id="punishTime">
+ </div>
+ </div>
+ <div class="hr-line-dashed"></div>
+ <div class="form-group">
+ <label class="col-sm-2 control-label">处罚原因</label>
+ <div class="col-sm-8">
+ <textarea type="text" class="form-control" id="punishReason"></textarea>
+ </div>
+ </div>
+ <div class="hr-line-dashed"></div>
+ <div class="form-group">
+ <label class="col-sm-2 control-label">处罚结果</label>
+ <div class="col-sm-8">
+ <textarea type="text" class="form-control" id="punishReault"></textarea>
+ </div>
+ <button type="button" class="btn btn-default btn-sm" id="add" onclick="add()">添加</button>
+ </div>
+ <div class="hr-line-dashed"></div>
+ <div class="form-group">
+ <label class="col-sm-2 control-label">已添加的培训记录</label>
+ <div class="col-sm-9">
+ <div style="height: 150px; border: 1px solid #e5e6e7;overflow-y: auto;">
+ <table class="table table-striped table-bordered table-hover table-condensed">
+ <thead>
+ <tr>
+ <th style="width: 50px; text-align: center;">序号</th>
+ <th style="width: 200px; text-align: center;">处罚时间</th>
+ <th style="width: 200px; text-align: center;">处罚原因</th>
+ <th style="width: 200px; text-align: center;">处罚结果</th>
+ <th style="width: 200px; text-align: center;">操作</th>
+ </tr>
+ </thead>
+ <tbody id="transAreaAdd">
+
+ </tbody>
+ </table>
+ </div>
+ </div>
+ </div>
+ <div class="form-group">
+ <div class="col-sm-10">
+ <#button btnCss="info" name="提交" id="ensure" icon="fa-check" clickFun="save()"/>
+ <#button btnCss="danger" name="取消" id="cancel" icon="fa-eraser" clickFun="Training.close()"/>
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/tDriver/punish.js"></script>
+@}
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/tDriver.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/tDriver.html
new file mode 100644
index 0000000..cedbd84
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/tDriver.html
@@ -0,0 +1,70 @@
+@layout("/common/_container.html"){
+<div class="row">
+ <div class="col-sm-12">
+ <div class="ibox float-e-margins">
+ <div class="ibox-title">
+ <h5>司机审核列表管理</h5>
+ </div>
+ <div class="ibox-content">
+ <div class="row row-lg">
+ <div class="col-sm-12">
+ <div class="row">
+ <div class="col-sm-3">
+ <#TimeCon id="insertTime" name="注册时间" isTime="false"/>
+ </div>
+ <div class="col-sm-3">
+ <#NameCon id="companyName" name="所属分公司/加盟商" />
+ </div>
+ <div class="col-sm-3">
+ <#NameCon id="phone" name="手机号" />
+ </div>
+ <div class="col-sm-3">
+ <#NameCon id="account" name="账号" />
+ </div>
+ <div class="col-sm-3">
+ <#SelectCon id="addType" name="司机来源" >
+ <option value="">全部</option>
+ <option value="1">司机注册</option>
+ <option value="2">平台添加</option>
+ <option value="3">分公司添加</option>
+ <option value="4">加盟商添加</option>
+ </#SelectCon>
+ </div>
+ <div class="col-sm-3">
+ <#SelectCon id="authState" name="状态" >
+ <option value="">全部</option>
+ <option value="1">待审核</option>
+ <option value="4">已拒绝</option>
+ </#SelectCon>
+ </div>
+ <div class="col-sm-3">
+ <#button name="搜索" icon="fa-search" clickFun="TDriver.search()"/>
+ <#button name="重置" icon="fa-trash" clickFun="TDriver.resetSearch()" space="true"/>
+ </div>
+ </div>
+ <div class="hidden-xs" id="TDriverTableToolbar" role="group">
+ @if(shiro.hasPermission("/tDriver/immediately")){
+ <#button name="立即审核" icon="fa-plus" clickFun="TDriver.immediately()"/>
+ @}
+ @if(shiro.hasPermission("/tDriver/look")){
+ <#button name="查看详情" icon="fa-edit" clickFun="TDriver.look()" space="true"/>
+ @}
+ @if(shiro.hasPermission("/tDriver/delete")){
+ <#button name="删除" icon="fa-remove" clickFun="TDriver.delete()" space="true"/>
+ @}
+ </div>
+ <#table id="TDriverTable"/>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/tDriver/tDriver.js"></script>
+<script>
+ laydate.render({
+ elem: '#insertTime'
+ ,range: true
+ });
+</script>
+@}
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/tDriver_add.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/tDriver_add.html
new file mode 100644
index 0000000..84b7d6f
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/tDriver_add.html
@@ -0,0 +1,257 @@
+@layout("/common/_container.html"){
+<div class="ibox float-e-margins">
+ <div class="ibox-content">
+ <div class="form-horizontal" id="yesDriverInfoForm">
+ <input type="hidden" id="roleType" name="roleType" value="${roleType}">
+ <div class="row">
+ <div class="col-sm-10">
+ <#input id="name" name="司机姓名" />
+
+ <div class="form-group">
+ <label class="col-sm-3 control-label">所属机构：</label>
+ <div class="col-sm-9" style="display: flex;align-items: center;">
+ @if(roleType == 1){
+ <div class="radio radio-info radio-inline">
+ <input type="radio" id="companyType1" value="1" name="companyType" checked="" onclick="YesDriverInfoDlg.companyTypeClick(1)">
+ <label for="companyType1"> 平台司机 </label>
+ </div>
+ <div class="radio radio-success radio-inline">
+ <input type="radio" id="companyTyp2" value="2" name="companyType" onclick="YesDriverInfoDlg.companyTypeClick(2)">
+ <label for="companyTyp2"> 加盟司机 </label>
+ </div>
+ <select class="form-control companyDiv" id="oneId" onchange="YesDriverInfoDlg.oneChange(this)" style="width: 200px;display: none;" >
+ <option value="">选择所属分公司</option>
+ @for(obj in companyList!){
+ <option value="${obj.id}">${obj.name}</option>
+ @}
+ </select>
+ <select class="form-control companyDiv" id="twoId" style="width: 200px;margin-left: 30px;display: none;">
+ <option value="">选择所属加盟商</option>
+ </select>
+ @}else if(roleType == 2){
+ <span class="control-label">${objectName!}</span>
+ <select class="form-control" id="franchiseeId" style="width: 200px;margin-left: 30px;">
+ <option value="">选择所属加盟商</option>
+ @for(obj in franchiseeList!){
+ <option value="${obj.id}">${obj.name}</option>
+ @}
+ </select>
+ @}else if(roleType == 3){
+ <span class="control-label">${objectName!}</span>
+ @}
+ </div>
+ </div>
+
+ <#avatar id="headImgUrl" name="头像：" />
+ <#avatar id="faceImgUrl" name="人脸识别照片：" />
+ <!--<#input id="phone" name="手机号" />-->
+ <div class="form-group">
+ <label class="col-sm-3 control-label">性别：</label>
+ <div class="col-sm-9" style="display: flex;align-items: center;">
+ <div class="radio radio-info radio-inline">
+ <input type="radio" id="sex1" value="1" name="sex" checked="" >
+ <label for="sex1"> 男 </label>
+ </div>
+ <div class="radio radio-success radio-inline">
+ <input type="radio" id="sex2" value="2" name="sex" >
+ <label for="sex2"> 女 </label>
+ </div>
+ </div>
+ </div>
+ <#input id="driveCard" name="驾驶证号码"/>
+ <#avatar id="driveCardImgUrl" name="驾驶证照片：" />
+ <#input id="driverAge" name="驾龄" />
+ <#input id="idCard" name="身份证号" />
+ <#input id="driverAddress" name="居住地址" />
+ <#input id="taxiAptitudeCard" name="出租车资格证号" />
+ <#avatar id="networkCarlssueImg" name="网约车资格证照片：" />
+ <#input id="jobNumber" name="工号(选填)" />
+ <div class="form-group">
+ <fieldset>
+ <label class="col-sm-3 control-label">经营业务：</label>
+ <div class="col-sm-9">
+ <div class="checkbox checkbox-success checkbox-inline">
+ <input type="checkbox" name="serverBox" id="serverBox1" value="1">
+ <label for="serverBox1"> 专车 </label>
+ </div>
+ <div class="checkbox checkbox-success checkbox-inline">
+ <input type="checkbox" name="serverBox" id="serverBox2" value="2">
+ <label for="serverBox2"> 出租车 </label>
+ </div>
+ <div class="checkbox checkbox-success checkbox-inline">
+ <input type="checkbox" name="serverBox" id="serverBox3" value="3" onclick="YesDriverInfoDlg.checkBox()" >
+ <label for="serverBox3"> 跨城出行 </label>
+ </div>
+ <div class="checkbox checkbox-success checkbox-inline">
+ <input type="checkbox" name="serverBox" id="serverBox4" value="4">
+ <label for="serverBox4"> 小件物流-同城 </label>
+ </div>
+ <div class="checkbox checkbox-success checkbox-inline">
+ <input type="checkbox" name="serverBox" id="serverBox5" value="5">
+ <label for="serverBox5"> 小件物流-跨城 </label>
+ </div>
+ <div class="checkbox checkbox-success checkbox-inline">
+ <input type="checkbox" name="serverBox" id="serverBox6" value="6">
+ <label for="serverBox6"> 包车 </label>
+ </div>
+ </div>
+ </fieldset>
+ </div>
+ <div id="lineDiv" style="display: none;">
+ <div class="form-group">
+ <label class="col-sm-3 control-label">关联线路：</label>
+ <div class="col-sm-3">
+ <select class="form-control" id="selectLineId">
+ <option value="">选择关联线路</option>
+ @for(obj in lineList){
+ <option value="${obj.id}">${obj.name}</option>
+ @}
+ </select>
+ </div>
+ <div class="col-sm-2">
+ <#button btnCss="info" name="添加" id="ensure" icon="fa-check" clickFun="YesDriverInfoDlg.addLine()"/>
+ </div>
+ </div>
+ <div class="form-group">
+ <label class="col-sm-3 control-label">已添加线路</label>
+ <div class="col-sm-9">
+ <div style="height: 200px; border: 1px solid #e5e6e7;overflow-y: auto;">
+ <table class="table table-striped table-bordered table-hover table-condensed">
+ <thead>
+ <tr>
+ <th style="width: 300px;text-align: center;">关联时间</th>
+ <th style="width: 300px;text-align: center;">线路名称</th>
+ <th style="width: 100px;text-align: center;">操作</th>
+ </tr>
+ </thead>
+ <tbody id="line">
+
+ </tbody>
+ </table>
+ </div>
+ </div>
+ </div>
+ </div>
+
+
+ <#input id="phone" name="登录账号【手机号】" />
+ <#input id="password" name="密码" type="password"/>
+ <#input id="rePassword" name="确认密码" type="password"/>
+
+ <#input id="driverNationality" name="国籍"/>
+ <#input id="driverNation" name="民族"/>
+ <div class="form-group">
+ <label class="col-sm-3 control-label">婚姻状况：</label>
+ <div class="col-sm-3">
+ <select class="form-control" id="driverMaritalStatus">
+ <option value="1">已婚</option>
+ <option value="2">未婚</option>
+ <option value="3">离异</option>
+ </select>
+ </div>
+ </div>
+ <#input id="driverLanguageLevel" name="外语能力"/>
+ <#input id="driverEducation" name="学历"/>
+ <#input id="driverCensus" name="户口登记机关名称"/>
+ <#input id="driverAddress" name="户口地址"/>
+ <#input id="driverContactAddress" name="通信地址"/>
+ <#input id="getDriverLicenseDate" name="初次领取驾驶证日期"/>
+ <#input id="driverLicenseOn" name="驾驶证有效期限起"/>
+ <#input id="driverLicenseOff" name="驾驶证有效期限止"/>
+ <div class="form-group">
+ <label class="col-sm-3 control-label">是否巡游出租车驾驶员：</label>
+ <div class="col-sm-3">
+ <select class="form-control" id="taxiDriver">
+ <option value="0">否</option>
+ <option value="1">是</option>
+ </select>
+ </div>
+ </div>
+ <#input id="networkCarlssueOrganization" name="网络预约出租车驾驶员证发证机构"/>
+ <#input id="networkCarlssueDate" name="资格证发证日期"/>
+ <#input id="getNetworkCarProofDate" name="初次认领资格证日期"/>
+ <#input id="networkCarProofOn" name="资格证有效起始日期"/>
+ <#input id="networkCarProofOff" name="资格证有效截至日期"/>
+ <#input id="registerDate" name="报备日期"/>
+ <div class="form-group">
+ <label class="col-sm-3 control-label">是否是专职驾驶员：</label>
+ <div class="col-sm-3">
+ <select class="form-control" id="fullTimeDriver">
+ <option value="0">否</option>
+ <option value="1">是</option>
+ </select>
+ </div>
+ </div>
+ <div class="form-group">
+ <label class="col-sm-3 control-label">是否在驾驶员黑名单内：</label>
+ <div class="col-sm-3">
+ <select class="form-control" id="inDriverBlacklist">
+ <option value="0">否</option>
+ <option value="1">是</option>
+ </select>
+ </div>
+ </div>
+ <div class="form-group">
+ <label class="col-sm-3 control-label">服务类型：</label>
+ <div class="col-sm-3">
+ <select class="form-control" id="commercialType">
+ <option value="1">网络预约出租汽车</option>
+ <option value="2">巡游出租汽车</option>
+ <option value="3">私人小客车合乘</option>
+ </select>
+ </div>
+ </div>
+ <#input id="contractCompany" name="驾驶员合同签署公司"/>
+ <#input id="contractOn" name="合同有效期起"/>
+ <#input id="contractOff" name="合同有效期止"/>
+ <#input id="emergencyContact" name="紧急联系人"/>
+ <#input id="emergencyContactPhone" name="紧急联系电话"/>
+ <#input id="emergencyContactAddress" name="紧急联系地址"/>
+ </div>
+ </div>
+
+ <div class="row btn-group-m-t">
+ <div class="col-sm-10 col-sm-offset-5">
+ <#button btnCss="info" name="提交" id="ensure" icon="fa-check" clickFun="YesDriverInfoDlg.addSubmit()"/>
+ <#button btnCss="danger" name="取消" id="cancel" icon="fa-eraser" clickFun="YesDriverInfoDlg.close()"/>
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/tDriver/yesDriver_info.js"></script>
+
+<script>
+ laydate.render({
+ elem: '#getDriverLicenseDate'
+ });
+ laydate.render({
+ elem: '#driverLicenseOn'
+ });
+ laydate.render({
+ elem: '#driverLicenseOff'
+ });
+ laydate.render({
+ elem: '#networkCarlssueDate'
+ });
+ laydate.render({
+ elem: '#getNetworkCarProofDate'
+ });
+ laydate.render({
+ elem: '#networkCarProofOn'
+ });
+ laydate.render({
+ elem: '#networkCarProofOff'
+ });
+ laydate.render({
+ elem: '#contractOn'
+ });
+ laydate.render({
+ elem: '#contractOff'
+ });
+ laydate.render({
+ elem: '#registerDate'
+ });
+</script>
+@}
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/tDriver_changeCar.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/tDriver_changeCar.html
new file mode 100644
index 0000000..e831775
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/tDriver_changeCar.html
@@ -0,0 +1,46 @@
+@layout("/common/_container.html"){
+<div class="row">
+ <div class="col-sm-12">
+ <div class="ibox float-e-margins">
+ <div class="ibox-content">
+ <input type="hidden" id="tDriverId" name="tDriverId" value="${tDriverId}">
+ <div class="row row-lg">
+ <div class="col-sm-12">
+ <div class="row">
+ <div class="col-sm-3">
+ <#NameCon id="carLicensePlate" name="车牌号" />
+ </div>
+ <div class="col-sm-3">
+ <#NameCon id="brandName" name="车辆品牌" />
+ </div>
+ <div class="col-sm-3">
+ <#NameCon id="modelName" name="车辆类型" />
+ </div>
+ <div class="col-sm-3">
+ <#NameCon id="color" name="车辆颜色" />
+ </div>
+ <div class="col-sm-3">
+ <#NameCon id="serverStr" name="服务模式" />
+ </div>
+ <div class="col-sm-3">
+ <#button name="搜索" icon="fa-search" clickFun="SelectCar.search()"/>
+ <#button name="重置" icon="fa-trash" clickFun="SelectCar.resetSearch()" space="true"/>
+ <#button btnCss="info" name="确定" id="ensure" icon="fa-check" clickFun="SelectCar.selectCarOpt()" space="true"/>
+ <#button btnCss="danger" name="取消" id="cancel" icon="fa-eraser" clickFun="SelectCar.close()" space="true"/>
+ </div>
+ </div>
+ <#table id="SelectCarTable"/>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/tDriver/yesDriver_selectCar.js"></script>
+<script>
+ laydate.render({
+ elem: '#insertTime'
+ ,range: true
+ });
+</script>
+@}
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/tDriver_edit.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/tDriver_edit.html
new file mode 100644
index 0000000..fff2374
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/tDriver_edit.html
@@ -0,0 +1,283 @@
+@layout("/common/_container.html"){
+<div class="ibox float-e-margins">
+ <div class="ibox-content">
+ <div class="form-horizontal" id="yesDriverInfoForm">
+ <input type="hidden" id="id" name="id" value="${item.id}">
+ <input type="hidden" id="roleType" name="roleType" value="${roleType}">
+ <div class="row">
+ <div class="col-sm-11">
+ <#input id="name" name="司机姓名" value="${item.name}"/>
+
+ <div class="form-group">
+ <label class="col-sm-3 control-label">所属机构：</label>
+ <div class="col-sm-9" style="display: flex;align-items: center;">
+ @if(roleType == 1){
+ <div class="radio radio-info radio-inline">
+ <input type="radio" id="companyType1" value="1" name="companyType" ${1 == companyType ? 'checked=checked' : ''} onclick="YesDriverInfoDlg.companyTypeClick(1)">
+ <label for="companyType1"> 平台司机 </label>
+ </div>
+ <div class="radio radio-success radio-inline">
+ <input type="radio" id="companyTyp2" value="2" name="companyType" ${2 == companyType ? 'checked=checked' : ''} onclick="YesDriverInfoDlg.companyTypeClick(2)">
+ <label for="companyTyp2"> 加盟司机 </label>
+ </div>
+ <select class="form-control companyDiv" id="oneId" onchange="YesDriverInfoDlg.oneChange(this)" style="width: 200px">
+ <option value="">选择所属分公司</option>
+ @for(obj in companyList!){
+ <option value="${obj.id}" ${obj.id == item.companyId ? 'selected=selected' : ''}>${obj.name}</option>
+ @}
+ </select>
+ <select class="form-control companyDiv" id="twoId" style="width: 200px;margin-left: 30px;">
+ <option value="">选择所属加盟商</option>
+ @for(obj in franchiseeList!){
+ <option value="${obj.id}" ${obj.id == item.franchiseeId ? 'selected=selected' : ''}>${obj.name}</option>
+ @}
+ </select>
+ @}else if(roleType == 2){
+ <span class="control-label">${objectName!}</span>
+ <select class="form-control" id="franchiseeId" style="width: 200px;margin-left: 30px;">
+ <option value="">选择所属加盟商</option>
+ @for(obj in franchiseeList!){
+ <option value="${obj.id}" ${obj.id == item.franchiseeId ? 'selected=selected' : ''}>${obj.name}</option>
+ @}
+ </select>
+ @}else if(roleType == 3){
+ <span class="control-label">${objectName!}</span>
+ @}
+ </div>
+ </div>
+
+ <#avatar id="headImgUrl" name="头像：" avatarImg="${item.headImgUrl}"/>
+ <#avatar id="faceImgUrl" name="人脸识别照片：" avatarImg="${item.faceImgUrl}"/>
+ <!--<#input id="phone" name="手机号" value="${item.phone}"/>-->
+ <div class="form-group">
+ <label class="col-sm-3 control-label">性别：</label>
+ <div class="col-sm-9" style="display: flex;align-items: center;">
+ <div class="radio radio-info radio-inline">
+ <input type="radio" id="sex1" value="1" name="sex" ${1 == item.sex ? 'checked=checked' : ''} >
+ <label for="sex1"> 男 </label>
+ </div>
+ <div class="radio radio-success radio-inline">
+ <input type="radio" id="sex2" value="2" name="sex" ${2 == item.sex ? 'checked=checked' : ''} >
+ <label for="sex2"> 女 </label>
+ </div>
+ </div>
+ </div>
+ <#input id="driveCard" name="驾驶证号码" value="${item.driveCard}"/>
+ <#avatar id="driveCardImgUrl" name="驾驶证照片：" avatarImg="${item.driveCardImgUrl}"/>
+ <#input id="driverAge" name="驾龄" value="${item.driverAge}"/>
+ <#input id="idCard" name="身份证号" value="${item.idCard}"/>
+ <#input id="driverAddress" name="居住地址" value="${item.driverAddress}"/>
+ <#input id="taxiAptitudeCard" name="出租车资格证号" value="${item.taxiAptitudeCard}"/>
+ <#input id="jobNumber" name="工号(选填)" value="${item.jobNumber}"/>
+ <div class="form-group">
+ <fieldset>
+ <label class="col-sm-3 control-label">经营业务：</label>
+ <div class="col-sm-9">
+ <div class="checkbox checkbox-success checkbox-inline">
+ <input type="checkbox" name="serverBox" id="serverBox1" value="1" ${2 == one ? 'checked=checked' : ''}>
+ <label for="serverBox1"> 专车 </label>
+ </div>
+ <div class="checkbox checkbox-success checkbox-inline">
+ <input type="checkbox" name="serverBox" id="serverBox2" value="2" ${2 == two ? 'checked=checked' : ''}>
+ <label for="serverBox2"> 出租车 </label>
+ </div>
+ <div class="checkbox checkbox-success checkbox-inline">
+ <input type="checkbox" name="serverBox" id="serverBox3" value="3" ${2 == three ? 'checked=checked' : ''} onclick="YesDriverInfoDlg.checkBox()" >
+ <label for="serverBox3"> 跨城出行 </label>
+ </div>
+ <div class="checkbox checkbox-success checkbox-inline">
+ <input type="checkbox" name="serverBox" id="serverBox4" value="4" ${2 == four ? 'checked=checked' : ''}>
+ <label for="serverBox4"> 小件物流-同城 </label>
+ </div>
+ <div class="checkbox checkbox-success checkbox-inline">
+ <input type="checkbox" name="serverBox" id="serverBox5" value="5" ${2 == five ? 'checked=checked' : ''}>
+ <label for="serverBox5"> 小件物流-跨城 </label>
+ </div>
+ <div class="checkbox checkbox-success checkbox-inline">
+ <input type="checkbox" name="serverBox" id="serverBox6" value="6" ${2 == six ? 'checked=checked' : ''}>
+ <label for="serverBox6"> 包车 </label>
+ </div>
+ </div>
+ </fieldset>
+ </div>
+
+ <div id="lineDiv" style="display: none;">
+ <div class="form-group">
+ <label class="col-sm-3 control-label">关联线路：</label>
+ <div class="col-sm-3">
+ <select class="form-control" id="selectLineId">
+ <option value="">选择关联线路</option>
+ @for(obj in lineList){
+ <option value="${obj.id}">${obj.name}</option>
+ @}
+ </select>
+ </div>
+ <div class="col-sm-2">
+ <#button btnCss="info" name="添加" id="ensure" icon="fa-check" clickFun="YesDriverInfoDlg.addLine()"/>
+ </div>
+ </div>
+ <div class="form-group">
+ <label class="col-sm-3 control-label">已添加线路</label>
+ <div class="col-sm-9">
+ <div style="height: 200px; border: 1px solid #e5e6e7;overflow-y: auto;">
+ <table class="table table-striped table-bordered table-hover table-condensed">
+ <thead>
+ <tr>
+ <th style="width: 300px;">关联时间</th>
+ <th style="width: 300px;">项目名称</th>
+ <th style="width: 100px;">操作</th>
+ </tr>
+ </thead>
+ <tbody id="line">
+ @for(line in driverLineList!){
+ <tr class="lineClass">
+ <td><input type="hidden" id="lineId" name="lineId" value="${line.lineId}">
+ <input type="hidden" id="time" name="time" value="${line.addTime}">${line.addTime}</td>
+ <td>${line.lineName}</td>
+ <td><button onclick="deleteSub(this)">移除</button></td>
+ </tr>
+ @}
+ </tbody>
+ </table>
+ </div>
+ </div>
+ </div>
+ </div>
+
+ <#input id="phone" name="登录账号【手机号】" value="${item.phone}"/>
+ <#input id="password" name="密码" type="password" />
+ <#input id="rePassword" name="确认密码" type="password" />
+
+ <#input id="driverNationality" name="国籍" value="${item.driverNationality}"/>
+ <#input id="driverNation" name="民族" value="${item.driverNation}"/>
+ <div class="form-group">
+ <label class="col-sm-3 control-label">婚姻状况：</label>
+ <div class="col-sm-3">
+ <select class="form-control" id="driverMaritalStatus">
+ <option value="1" ${item.driverMaritalStatus == 1 ? 'selected' : ''}>已婚</option>
+ <option value="2" ${item.driverMaritalStatus == 2 ? 'selected' : ''}>未婚</option>
+ <option value="3" ${item.driverMaritalStatus == 3 ? 'selected' : ''}>离异</option>
+ </select>
+ </div>
+ </div>
+ <#input id="driverLanguageLevel" name="外语能力" value="${item.driverLanguageLevel}"/>
+ <#input id="driverEducation" name="学历" value="${item.driverEducation}"/>
+ <#input id="driverCensus" name="户口登记机关名称" value="${item.driverCensus}"/>
+ <#input id="driverAddress" name="户口地址" value="${item.driverAddress}"/>
+ <#input id="driverContactAddress" name="通信地址" value="${item.driverContactAddress}"/>
+ <#input id="getDriverLicenseDate" name="初次领取驾驶证日期" value="${item.getDriverLicenseDate}"/>
+ <#input id="driverLicenseOn" name="驾驶证有效期限起" value="${item.driverLicenseOn}"/>
+ <#input id="driverLicenseOff" name="驾驶证有效期限止" value="${item.driverLicenseOff}"/>
+ <div class="form-group">
+ <label class="col-sm-3 control-label">是否巡游出租车驾驶员：</label>
+ <div class="col-sm-3">
+ <select class="form-control" id="taxiDriver">
+ <option value="0" ${item.taxiDriver == 0 ? 'selected' : ''}>否</option>
+ <option value="1" ${item.taxiDriver == 1 ? 'selected' : ''}>是</option>
+ </select>
+ </div>
+ </div>
+ <#input id="networkCarlssueOrganization" name="网络预约出租车驾驶员证发证机构" value="${item.networkCarlssueOrganization}"/>
+ <#input id="networkCarlssueDate" name="资格证发证日期" value="${item.networkCarlssueDate}"/>
+ <#input id="getNetworkCarProofDate" name="初次认领资格证日期" value="${item.getNetworkCarProofDate}"/>
+ <#input id="networkCarProofOn" name="资格证有效起始日期" value="${item.networkCarProofOn}"/>
+ <#input id="networkCarProofOff" name="资格证有效截至日期" value="${item.networkCarProofOff}"/>
+ <#input id="registerDate" name="报备日期" value="${item.registerDate}"/>
+ <div class="form-group">
+ <label class="col-sm-3 control-label">是否是专职驾驶员：</label>
+ <div class="col-sm-3">
+ <select class="form-control" id="fullTimeDriver">
+ <option value="0" ${item.fullTimeDriver == 0 ? 'selected' : ''}>否</option>
+ <option value="1" ${item.fullTimeDriver == 1 ? 'selected' : ''}>是</option>
+ </select>
+ </div>
+ </div>
+ <div class="form-group">
+ <label class="col-sm-3 control-label">是否在驾驶员黑名单内：</label>
+ <div class="col-sm-3">
+ <select class="form-control" id="inDriverBlacklist">
+ <option value="0" ${item.inDriverBlacklist == 0 ? 'selected' : ''}>否</option>
+ <option value="1" ${item.inDriverBlacklist == 1 ? 'selected' : ''}>是</option>
+ </select>
+ </div>
+ </div>
+ <div class="form-group">
+ <label class="col-sm-3 control-label">服务类型：</label>
+ <div class="col-sm-3">
+ <select class="form-control" id="commercialType">
+ <option value="1" ${item.commercialType == 1 ? 'selected' : ''}>网络预约出租汽车</option>
+ <option value="2" ${item.commercialType == 2 ? 'selected' : ''}>巡游出租汽车</option>
+ <option value="3" ${item.commercialType == 3 ? 'selected' : ''}>私人小客车合乘</option>
+ </select>
+ </div>
+ </div>
+ <#input id="contractCompany" name="驾驶员合同签署公司" value="${item.contractCompany}"/>
+ <#input id="contractOn" name="合同有效期起" value="${item.contractOn}"/>
+ <#input id="contractOff" name="合同有效期止" value="${item.contractOff}"/>
+ <#input id="emergencyContact" name="紧急联系人" value="${item.emergencyContact}"/>
+ <#input id="emergencyContactPhone" name="紧急联系电话" value="${item.emergencyContactPhone}"/>
+ <#input id="emergencyContactAddress" name="紧急联系地址" value="${item.emergencyContactAddress}"/>
+
+
+ </div>
+ </div>
+
+ <div class="row btn-group-m-t">
+ <div class="col-sm-10 col-sm-offset-5">
+ <#button btnCss="info" name="提交" id="ensure" icon="fa-check" clickFun="YesDriverInfoDlg.editSubmit()"/>
+ <#button btnCss="danger" name="取消" id="cancel" icon="fa-eraser" clickFun="YesDriverInfoDlg.close()"/>
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/tDriver/yesDriver_info.js"></script>
+<script type="application/javascript">
+ laydate.render({
+ elem: '#getDriverLicenseDate'
+ });
+ laydate.render({
+ elem: '#driverLicenseOn'
+ });
+ laydate.render({
+ elem: '#driverLicenseOff'
+ });
+ laydate.render({
+ elem: '#networkCarlssueDate'
+ });
+ laydate.render({
+ elem: '#getNetworkCarProofDate'
+ });
+ laydate.render({
+ elem: '#networkCarProofOn'
+ });
+ laydate.render({
+ elem: '#networkCarProofOff'
+ });
+ laydate.render({
+ elem: '#contractOn'
+ });
+ laydate.render({
+ elem: '#contractOff'
+ });
+ laydate.render({
+ elem: '#registerDate'
+ });
+
+ $(function() {
+ var serverBox3 = $('#serverBox3').prop('checked');
+ if (serverBox3){
+ $("#lineDiv").show();
+ } else {
+ $("#lineDiv").hide();
+ }
+ var companyType = $("input[name='companyType']:checked").val();
+ if (1 == companyType){
+ $(".companyDiv").hide();
+ } else if (2 == companyType){
+ $(".companyDiv").show();
+ }
+ });
+</script>
+@}
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/tDriver_immediately.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/tDriver_immediately.html
new file mode 100644
index 0000000..df85e92
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/tDriver_immediately.html
@@ -0,0 +1,87 @@
+@layout("/common/_container.html"){
+<div class="ibox float-e-margins">
+ <div class="ibox-content">
+ <div class="form-horizontal">
+ <input type="hidden" id="id" name="id" value="${item.id}">
+ <div class="row">
+ <div class="col-sm-6 b-r">
+ <#label id="name" name="姓名" value="${item.name}"/>
+ <#label id="phone" name="手机号" value="${item.phone}"/>
+ <#label id="sexStr" name="性别" value="${item.sexStr}"/>
+ <#label id="addTypeStr" name="司机来源" value="${item.addTypeStr}"/>
+ <#label id="driveCard" name="驾驶证号码" value="${item.driveCard}"/>
+ <div class="form-group">
+ <label class="col-sm-3 control-label">驾驶证照片：</label>
+ <div class="col-sm-9">
+ <div class="form-group">
+ <div class="col-sm-6">
+ <div id="driveCardImgUrlPreId">
+ <div>
+ @if(isEmpty(item.driveCardImgUrl)){
+ <img onclick="lookBigImg('${ctxPath}/static/img/NoPIC.png')" src="${ctxPath}/static/img/NoPIC.png" style="max-width:150px;">
+ @}else{
+ <img onclick="lookBigImg('${item.driveCardImgUrl}')" src="${item.driveCardImgUrl}" style="max-width:250px;">
+ @}
+ </div>
+ </div>
+ </div>
+ <input type="hidden" id="driveCardImgUrl" name="driveCardImgUrl" value="${item.driveCardImgUrl}"/>
+ </div>
+ </div>
+ </div>
+ <#label id="idCard" name="身份证号码" value="${item.idCard}"/>
+ <#label id="driverAddress" name="居住地址" value="${item.driverAddress}"/>
+ <#label id="taxiAptitudeCard" name="出租车资格证号" value="${item.taxiAptitudeCard}"/>
+ <#label id="serverStr" name="服务模式" value="${item.serverStr}"/>
+ <div class="form-group">
+ <label class="col-sm-3 control-label">审核结果：</label>
+ <div class="col-sm-9">
+ <div class="radio radio-info radio-inline">
+ <input type="radio" id="authState1" value="1" name="authState" checked="" >
+ <label for="authState1"> 审核通过 </label>
+ </div>
+ <div class="radio radio-success radio-inline">
+ <input type="radio" id="authState4" value="4" name="authState" >
+ <label for="authState4"> 审核不通过 </label>
+ </div>
+ </div>
+ </div>
+ </div>
+
+ <div class="col-sm-6">
+ <div class="form-group">
+ <label class="col-sm-3 control-label">头像：</label>
+ <div class="col-sm-9">
+ <div class="form-group">
+ <div class="col-sm-6">
+ <div id="headImgUrlPreId">
+ <div>
+ @if(isEmpty(item.headImgUrl)){
+ <img onclick="lookBigImg('${ctxPath}/static/img/NoPIC.png')" src="${ctxPath}/static/img/NoPIC.png" style="max-width:150px;">
+ @}else{
+ <img onclick="lookBigImg('${item.headImgUrl}')" src="${item.headImgUrl}" style="max-width:250px;">
+ @}
+ </div>
+ </div>
+ </div>
+ <input type="hidden" id="headImgUrl" name="headImgUrl" value="${item.headImgUrl}"/>
+ </div>
+ </div>
+ </div>
+ <#label id="companyName" name="所属机构" value="${item.companyName}"/>
+ <#label id="driverAge" name="驾龄" value="${item.driverAge}"/>
+ </div>
+ </div>
+
+ <div class="row btn-group-m-t">
+ <div class="col-sm-10 col-sm-offset-5">
+ <#button btnCss="info" name="确定" id="ensure" icon="fa-check" clickFun="TDriverInfoDlg.authOpt()"/>
+ <#button btnCss="danger" name="取消" id="cancel" icon="fa-eraser" clickFun="TDriverInfoDlg.close()"/>
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/tDriver/tDriver_info.js"></script>
+@}
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/tDriver_look.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/tDriver_look.html
new file mode 100644
index 0000000..e05878b
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/tDriver_look.html
@@ -0,0 +1,70 @@
+@layout("/common/_container.html"){
+<div class="ibox float-e-margins">
+ <div class="ibox-content">
+ <div class="form-horizontal">
+ <input type="hidden" id="id" name="id" value="${item.id}">
+ <div class="row">
+ <div class="col-sm-6 b-r">
+ <#label id="name" name="姓名" value="${item.name}"/>
+ <#label id="phone" name="手机号" value="${item.phone}"/>
+ <#label id="sexStr" name="性别" value="${item.sexStr}"/>
+ <#label id="addTypeStr" name="司机来源" value="${item.addTypeStr}"/>
+ <#label id="driveCard" name="驾驶证号码" value="${item.driveCard}"/>
+ <div class="form-group">
+ <label class="col-sm-3 control-label">驾驶证照片：</label>
+ <div class="col-sm-9">
+ <div class="form-group">
+ <div class="col-sm-6">
+ <div id="driveCardImgUrlPreId">
+ <div>
+ @if(isEmpty(item.driveCardImgUrl)){
+ <img onclick="lookBigImg('${ctxPath}/static/img/NoPIC.png')" src="${ctxPath}/static/img/NoPIC.png" style="max-width:150px;">
+ @}else{
+ <img onclick="lookBigImg('${item.driveCardImgUrl}')" src="${item.driveCardImgUrl}" style="max-width:250px;">
+ @}
+ </div>
+ </div>
+ </div>
+ <input type="hidden" id="driveCardImgUrl" name="driveCardImgUrl" value="${item.driveCardImgUrl}"/>
+ </div>
+ </div>
+ </div>
+ <#label id="idCard" name="身份证号码" value="${item.idCard}"/>
+ <#label id="driverAddress" name="居住地址" value="${item.driverAddress}"/>
+ <#label id="taxiAptitudeCard" name="出租车资格证号" value="${item.taxiAptitudeCard}"/>
+ <#label id="serverStr" name="服务模式" value="${item.serverStr}"/>
+ <#label id="authStateStr" name="审核结果" value="${item.authStateStr}"/>
+ </div>
+
+ <div class="col-sm-6">
+ <div class="form-group">
+ <label class="col-sm-3 control-label">头像：</label>
+ <div class="col-sm-9">
+ <div class="form-group">
+ <div class="col-sm-6">
+ <div id="headImgUrlPreId">
+ <div>
+ @if(isEmpty(item.headImgUrl)){
+ <img onclick="lookBigImg('${ctxPath}/static/img/NoPIC.png')" src="${ctxPath}/static/img/NoPIC.png" style="max-width:150px;">
+ @}else{
+ <img onclick="lookBigImg('${item.headImgUrl}')" src="${item.headImgUrl}" style="max-width:250px;">
+ @}
+ </div>
+ </div>
+ </div>
+ <input type="hidden" id="headImgUrl" name="headImgUrl" value="${item.headImgUrl}"/>
+ </div>
+ </div>
+ </div>
+ <#label id="companyName" name="所属机构" value="${item.companyName}"/>
+ <#label id="driverAge" name="驾龄" value="${item.driverAge}"/>
+ </div>
+ </div>
+
+
+ </div>
+
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/tDriver/tDriver_info.js"></script>
+@}
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/tDriver_optDriver.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/tDriver_optDriver.html
new file mode 100644
index 0000000..415a59f
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/tDriver_optDriver.html
@@ -0,0 +1,29 @@
+@layout("/common/_container.html"){
+<div class="ibox float-e-margins">
+ <div class="ibox-content">
+ <div class="form-horizontal" id="yesDriverInfoForm">
+ <input type="hidden" id="tDriverId" name="tDriverId" value="${tDriverId}">
+ <input type="hidden" id="optType" name="optType" value="${optType}">
+ <div class="row">
+ <div class="col-sm-11">
+ <div class="form-group">
+ <label class="col-sm-3 control-label">操作备注：</label>
+ <div class="col-sm-9">
+ <textarea type="text/plain" class="form-control" name="remark" id="remark" style="width:100%;height:150px;"></textarea>
+ </div>
+ </div>
+ </div>
+ </div>
+
+ <div class="row btn-group-m-t" style="text-align: center;">
+ <div class="col-sm-10 col-sm-offset-5">
+ <#button btnCss="info" name="提交" id="ensure" icon="fa-check" clickFun="YesDriverInfoDlg.optDriver()"/>
+ <#button btnCss="danger" name="取消" id="cancel" icon="fa-eraser" clickFun="YesDriverInfoDlg.close()"/>
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/tDriver/yesDriver_info.js"></script>
+@}
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/training.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/training.html
new file mode 100644
index 0000000..30739cc
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/training.html
@@ -0,0 +1,75 @@
+@layout("/common/_container.html"){
+<div class="ibox float-e-margins">
+ <input type="hidden" id="netCarDriverId" value="${id}">
+ <input type="hidden" id="id">
+ <div class="ibox-content">
+ <div class="form-horizontal">
+ <div class="form-group">
+ <label class="col-sm-2 control-label">课程名称</label>
+ <div class="col-sm-9">
+ <input type="text" class="layui-input form-control" id="courseName">
+ </div>
+ </div>
+ <div class="hr-line-dashed"></div>
+ <div class="form-group">
+ <label class="col-sm-2 control-label">课程日期</label>
+ <div class="col-sm-9">
+ <input type="text" class="layui-input form-control" id="courseTime">
+ </div>
+ </div>
+ <div class="hr-line-dashed"></div>
+ <div class="form-group">
+ <label class="col-sm-2 control-label">课程时间</label>
+ <div class="col-sm-4">
+ <input type="text" class="layui-input form-control" id="startTime">
+ </div>
+ <div class="col-sm-1">
+ ~
+ </div>
+ <div class="col-sm-4">
+ <input type="text" class="layui-input form-control" id="endTime">
+ </div>
+ </div>
+ <div class="hr-line-dashed"></div>
+ <div class="form-group">
+ <label class="col-sm-2 control-label">时长</label>
+ <div class="col-sm-8">
+ <input type="number" class="layui-input form-control" id="duration" min="0">
+ </div>
+ <button type="button" class="btn btn-default btn-sm" id="add" onclick="add()">添加</button>
+ </div>
+ <div class="form-group">
+ <label class="col-sm-2 control-label">已添加的培训记录</label>
+ <div class="col-sm-9">
+ <div style="height: 150px; border: 1px solid #e5e6e7;overflow-y: auto;">
+ <table class="table table-striped table-bordered table-hover table-condensed">
+ <thead>
+ <tr>
+ <th style="width: 50px; text-align: center;">序号</th>
+ <th style="width: 200px; text-align: center;">课程名称</th>
+ <th style="width: 200px; text-align: center;">课程日期</th>
+ <th style="width: 200px; text-align: center;">开始时间</th>
+ <th style="width: 200px; text-align: center;">结束时间</th>
+ <th style="width: 80px; text-align: center;">时长</th>
+ <th style="width: 200px; text-align: center;">操作</th>
+ </tr>
+ </thead>
+ <tbody id="transAreaAdd">
+
+ </tbody>
+ </table>
+ </div>
+ </div>
+ </div>
+ <div class="form-group">
+ <div class="col-sm-10">
+ <#button btnCss="info" name="提交" id="ensure" icon="fa-check" clickFun="save()"/>
+ <#button btnCss="danger" name="取消" id="cancel" icon="fa-eraser" clickFun="Training.close()"/>
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/tDriver/training.js"></script>
+@}
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/yesDriver.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/yesDriver.html
new file mode 100644
index 0000000..7e280e5
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tDriver/yesDriver.html
@@ -0,0 +1,95 @@
+@layout("/common/_container.html"){
+<div class="row">
+ <div class="col-sm-12">
+ <div class="ibox float-e-margins">
+ <div class="ibox-title">
+ <h5>司机列表管理</h5>
+ </div>
+ <div class="ibox-content">
+ <div class="row row-lg">
+ <div class="col-sm-12">
+ <div class="row">
+ <div class="col-sm-3">
+ <#TimeCon id="insertTime" name="注册时间" isTime="false"/>
+ </div>
+ <div class="col-sm-3">
+ <#NameCon id="companyName" name="所属分公司/加盟商" />
+ </div>
+ <div class="col-sm-3">
+ <#NameCon id="phone" name="手机号" />
+ </div>
+ <div class="col-sm-3">
+ <#NameCon id="name" name="姓名" />
+ </div>
+ <div class="col-sm-3">
+ <#SelectCon id="addType" name="司机来源" >
+ <option value="">全部</option>
+ <option value="1">司机注册</option>
+ <option value="2">平台添加</option>
+ <option value="3">分公司添加</option>
+ <option value="4">加盟商添加</option>
+ </#SelectCon>
+ </div>
+ <div class="col-sm-3">
+ <#SelectCon id="authState" name="状态" >
+ <option value="">全部</option>
+ <option value="2">正常</option>
+ <option value="3">冻结</option>
+ </#SelectCon>
+ </div>
+ <div class="col-sm-3">
+ <#button name="搜索" icon="fa-search" clickFun="YesDriver.search()"/>
+ <#button name="重置" icon="fa-trash" clickFun="YesDriver.resetSearch()" space="true"/>
+ </div>
+ <div class="col-sm-3">
+ <input type="file" name="file" style="width:0px;height:0px;" id="uploadEventFile" onchange="YesDriver.exportDriver()">
+ </div>
+ </div>
+ <div class="hidden-xs" id="YesDriverTableToolbar" role="group">
+ @if(shiro.hasPermission("/tDriver/add")){
+ <#button name="添加司机" icon="fa-plus" clickFun="YesDriver.add()"/>
+ @}
+ @if(shiro.hasPermission("/tDriver/update")){
+ <#button name="编辑司机" icon="fa-edit" clickFun="YesDriver.update()" space="true"/>
+ @}
+ @if(shiro.hasPermission("/tDriver/deleteDriver")){
+ <#button name="删除司机" icon="fa-edit" clickFun="YesDriver.deleteDriver()" space="true"/>
+ @}
+ @if(shiro.hasPermission("/tDriver/freeze")){
+ <#button name="冻结司机" icon="fa-remove" clickFun="YesDriver.freeze()" space="true"/>
+ @}
+ @if(shiro.hasPermission("/tDriver/thaw")){
+ <#button name="解冻司机" icon="fa-remove" clickFun="YesDriver.thaw()" space="true"/>
+ @}
+ @if(shiro.hasPermission("/tDriver/training")){
+ <#button name="添加培训记录" icon="fa-remove" clickFun="YesDriver.training()" space="true"/>
+ @}
+ @if(shiro.hasPermission("/tDriver/illegal")){
+ <#button name="添加处罚记录" icon="fa-remove" clickFun="YesDriver.punish()" space="true"/>
+ @}
+ @if(shiro.hasPermission("/tDriver/import")){
+ <#button btnCss="info" name="下载模板" id="uploadModel" icon="fa fa-level-down" clickFun="YesDriver.uploadDriverModel()" space="true"/>
+ <#button btnCss="danger" name="导入" id="uploadEventBtn" icon="fa fa-level-up" space="true"/>
+ @}
+ @if(shiro.hasPermission("/tDriver/export")){
+ <#button name="导出司机" icon="fa-remove" clickFun="YesDriver.outDriver()" space="true"/>
+ @}
+ @if(shiro.hasPermission("/tDriver/changeCar")){
+ <#button name="更换/绑定车辆" icon="fa-remove" clickFun="YesDriver.changeCar()" space="true"/>
+ @}
+ </div>
+ <#table id="YesDriverTable"/>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/tDriver/yesDriver.js"></script>
+<script>
+ laydate.render({
+ elem: '#insertTime'
+ ,range: true
+ });
+</script>
+@}
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tFeedback/tFeedback.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tFeedback/tFeedback.html
new file mode 100644
index 0000000..7303056
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tFeedback/tFeedback.html
@@ -0,0 +1,52 @@
+@layout("/common/_container.html"){
+<div class="row">
+ <div class="col-sm-12">
+ <div class="ibox float-e-margins">
+ <div class="ibox-title">
+ <h5>司机反馈管理</h5>
+ </div>
+ <div class="ibox-content">
+ <div class="row row-lg">
+ <div class="col-sm-12">
+ <div class="row">
+ <div class="col-sm-3">
+ <#TimeCon id="insertTime" name="反馈时间" isTime="false"/>
+ </div>
+ <div class="col-sm-3">
+ <#NameCon id="driverName" name="反馈人" />
+ </div>
+ <div class="col-sm-3">
+ <#NameCon id="driverPhone" name="反馈人手机号" />
+ </div>
+ <div class="col-sm-3">
+ <#SelectCon id="state" name="状态" >
+ <option value="">全部</option>
+ <option value="1">未处理</option>
+ <option value="2">已处理</option>
+ </#SelectCon>
+ </div>
+ <div class="col-sm-3">
+ <#button name="搜索" icon="fa-search" clickFun="TFeedback.search()"/>
+ <#button name="重置" icon="fa-trash" clickFun="TFeedback.resetSearch()" space="true"/>
+ </div>
+ </div>
+ <div class="hidden-xs" id="TFeedbackTableToolbar" role="group">
+ @if(shiro.hasPermission("/tFeedback/immediately")){
+ <#button name="立即处理" icon="fa-edit" clickFun="TFeedback.immediately()"/>
+ @}
+ </div>
+ <#table id="TFeedbackTable"/>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/tFeedback/tFeedback.js"></script>
+<script>
+ laydate.render({
+ elem: '#insertTime'
+ ,range: true
+ });
+</script>
+@}
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tFeedback/tFeedback_add.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tFeedback/tFeedback_add.html
new file mode 100644
index 0000000..8ef6e4b
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tFeedback/tFeedback_add.html
@@ -0,0 +1,36 @@
+@layout("/common/_container.html"){
+<div class="ibox float-e-margins">
+ <div class="ibox-content">
+ <div class="form-horizontal">
+
+ <div class="row">
+ <div class="col-sm-6 b-r">
+ <#input id="id" name="" underline="true"/>
+ <#input id="userId" name="反馈人ID" underline="true"/>
+ <#input id="handleUserId" name="处理人Id" underline="true"/>
+ <#input id="content" name="反馈内容" underline="true"/>
+ <#input id="insertTime" name="反馈时间" underline="true"/>
+ <#input id="imgUrl" name="图片"/>
+ </div>
+
+ <div class="col-sm-6">
+ <#input id="flag" name="状态(1=正常,2=删除)" underline="true"/>
+ <#input id="state" name="处理状态 1=未处理 2=已处理" underline="true"/>
+ <#input id="cldate" name="处理时间" underline="true"/>
+ <#input id="remark" name="处理备注" underline="true"/>
+ <#input id="type" name="1=用户，2=司机" underline="true"/>
+ </div>
+ </div>
+
+ <div class="row btn-group-m-t">
+ <div class="col-sm-10">
+ <#button btnCss="info" name="提交" id="ensure" icon="fa-check" clickFun="TFeedbackInfoDlg.addSubmit()"/>
+ <#button btnCss="danger" name="取消" id="cancel" icon="fa-eraser" clickFun="TFeedbackInfoDlg.close()"/>
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/tFeedback/tFeedback_info.js"></script>
+@}
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tFeedback/tFeedback_edit.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tFeedback/tFeedback_edit.html
new file mode 100644
index 0000000..ab2343a
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tFeedback/tFeedback_edit.html
@@ -0,0 +1,36 @@
+@layout("/common/_container.html"){
+<div class="ibox float-e-margins">
+ <div class="ibox-content">
+ <div class="form-horizontal">
+
+ <div class="row">
+ <div class="col-sm-6 b-r">
+ <#input id="id" name="" value="${item.id}" underline="true"/>
+ <#input id="userId" name="反馈人ID" value="${item.userId}" underline="true"/>
+ <#input id="handleUserId" name="处理人Id" value="${item.handleUserId}" underline="true"/>
+ <#input id="content" name="反馈内容" value="${item.content}" underline="true"/>
+ <#input id="insertTime" name="反馈时间" value="${item.insertTime}" underline="true"/>
+ <#input id="imgUrl" name="图片" value="${item.imgUrl}" />
+ </div>
+
+ <div class="col-sm-6">
+ <#input id="flag" name="状态(1=正常,2=删除)" value="${item.flag}" underline="true"/>
+ <#input id="state" name="处理状态 1=未处理 2=已处理" value="${item.state}" underline="true"/>
+ <#input id="cldate" name="处理时间" value="${item.cldate}" underline="true"/>
+ <#input id="remark" name="处理备注" value="${item.remark}" underline="true"/>
+ <#input id="type" name="1=用户，2=司机" value="${item.type}" />
+ </div>
+ </div>
+
+ <div class="row btn-group-m-t">
+ <div class="col-sm-10">
+ <#button btnCss="info" name="提交" id="ensure" icon="fa-check" clickFun="TFeedbackInfoDlg.editSubmit()"/>
+ <#button btnCss="danger" name="取消" id="cancel" icon="fa-eraser" clickFun="TFeedbackInfoDlg.close()"/>
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/tFeedback/tFeedback_info.js"></script>
+@}
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tFeedback/tFeedback_immediately.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tFeedback/tFeedback_immediately.html
new file mode 100644
index 0000000..a902b13
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tFeedback/tFeedback_immediately.html
@@ -0,0 +1,29 @@
+@layout("/common/_container.html"){
+<div class="ibox float-e-margins">
+ <div class="ibox-content" >
+ <div class="form-horizontal" id="feedbackInfoForm">
+ <input type="hidden" id="id" name="id" value="${tFeedbackId}">
+ <input type="hidden" id="type" name="type" value="${type}">
+ <div class="row">
+ <div class="col-sm-11">
+ <div class="form-group">
+ <label class="col-sm-2 control-label">备注：</label>
+ <div class="col-sm-9">
+ <textarea type="text/plain" class="form-control" name="remark" id="remark" placeholder="多行输入,最多500字" style="width:100%;height:150px;"></textarea>
+ </div>
+ </div>
+ </div>
+ </div>
+
+ <div class="row btn-group-m-t">
+ <div class="col-sm-10 col-sm-offset-5">
+ <#button btnCss="info" name="提交" id="ensure" icon="fa-check" clickFun="TFeedbackInfoDlg.immediately()"/>
+ <#button btnCss="danger" name="取消" id="cancel" icon="fa-eraser" clickFun="TFeedbackInfoDlg.close()"/>
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/tFeedback/tFeedback_info.js"></script>
+@}
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tFeedback/userFeedback.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tFeedback/userFeedback.html
new file mode 100644
index 0000000..ea7f094
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tFeedback/userFeedback.html
@@ -0,0 +1,52 @@
+@layout("/common/_container.html"){
+<div class="row">
+ <div class="col-sm-12">
+ <div class="ibox float-e-margins">
+ <div class="ibox-title">
+ <h5>用户反馈管理</h5>
+ </div>
+ <div class="ibox-content">
+ <div class="row row-lg">
+ <div class="col-sm-12">
+ <div class="row">
+ <div class="col-sm-3">
+ <#TimeCon id="insertTime" name="反馈时间" isTime="false"/>
+ </div>
+ <div class="col-sm-3">
+ <#NameCon id="userName" name="反馈人" />
+ </div>
+ <div class="col-sm-3">
+ <#NameCon id="userPhone" name="反馈人手机号" />
+ </div>
+ <div class="col-sm-3">
+ <#SelectCon id="state" name="状态" >
+ <option value="">全部</option>
+ <option value="1">未处理</option>
+ <option value="2">已处理</option>
+ </#SelectCon>
+ </div>
+ <div class="col-sm-3">
+ <#button name="搜索" icon="fa-search" clickFun="TUserFeedback.search()"/>
+ <#button name="重置" icon="fa-trash" clickFun="TUserFeedback.resetSearch()" space="true"/>
+ </div>
+ </div>
+ <div class="hidden-xs" id="TUserFeedbackTableToolbar" role="group">
+ @if(shiro.hasPermission("/tFeedback/immediatelyUser")){
+ <#button name="立即处理" icon="fa-edit" clickFun="TUserFeedback.immediately()"/>
+ @}
+ </div>
+ <#table id="TUserFeedbackTable"/>
+ </div>
+ </div>
+ </div>
+ </div>
+</div>
+</div>
+<script src="${ctxPath}/static/modular/system/tFeedback/userFeedback.js"></script>
+<script>
+ laydate.render({
+ elem: '#insertTime'
+ ,range: true
+ });
+</script>
+@}
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tIntegralGoods/tIntegralGoods.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tIntegralGoods/tIntegralGoods.html
new file mode 100644
index 0000000..55468ff
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tIntegralGoods/tIntegralGoods.html
@@ -0,0 +1,61 @@
+@layout("/common/_container.html"){
+<div class="row">
+ <div class="col-sm-12">
+ <div class="ibox float-e-margins">
+ <div class="ibox-title">
+ <h5>商品管理</h5>
+ </div>
+ <div class="ibox-content">
+ <div class="row row-lg">
+ <div class="col-sm-12">
+ <div class="row">
+ <div class="col-sm-3">
+ <#TimeCon id="insertTime" name="添加时间" isTime="false"/>
+ </div>
+ <div class="col-sm-3">
+ <#NameCon id="name" name="商品名称" />
+ </div>
+ <div class="col-sm-3">
+ <#SelectCon id="state" name="状态" >
+ <option value="">全部</option>
+ <option value="1">正常</option>
+ <option value="2">已下架</option>
+ </#SelectCon>
+ </div>
+ <div class="col-sm-3">
+ <#button name="搜索" icon="fa-search" clickFun="TIntegralGoods.search()"/>
+ <#button name="重置" icon="fa-trash" clickFun="TIntegralGoods.resetSearch()" space="true"/>
+ </div>
+ </div>
+ <div class="hidden-xs" id="TIntegralGoodsTableToolbar" role="group">
+ @if(shiro.hasPermission("/tIntegralGoods/add")){
+ <#button name="添加" icon="fa-plus" clickFun="TIntegralGoods.openAddTIntegralGoods()"/>
+ @}
+ @if(shiro.hasPermission("/tIntegralGoods/update")){
+ <#button name="编辑" icon="fa-edit" clickFun="TIntegralGoods.openTIntegralGoodsDetail()" space="true"/>
+ @}
+ @if(shiro.hasPermission("/tIntegralGoods/delete")){
+ <#button name="删除" icon="fa-remove" clickFun="TIntegralGoods.opt(3)" space="true"/>
+ @}
+ @if(shiro.hasPermission("/tIntegralGoods/up")){
+ <#button name="上架" icon="fa-remove" clickFun="TIntegralGoods.opt(1)" space="true"/>
+ @}
+ @if(shiro.hasPermission("/tIntegralGoods/down")){
+ <#button name="下架" icon="fa-remove" clickFun="TIntegralGoods.opt(2)" space="true"/>
+ @}
+ </div>
+ <#table id="TIntegralGoodsTable"/>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/tIntegralGoods/tIntegralGoods.js"></script>
+<script>
+ laydate.render({
+ elem: '#insertTime'
+ ,range: true
+ });
+</script>
+@}
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tIntegralGoods/tIntegralGoods_add.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tIntegralGoods/tIntegralGoods_add.html
new file mode 100644
index 0000000..9c113eb
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tIntegralGoods/tIntegralGoods_add.html
@@ -0,0 +1,31 @@
+@layout("/common/_container.html"){
+<div class="ibox float-e-margins">
+ <div class="ibox-content">
+ <div class="form-horizontal" id="integralGoodsInfoForm">
+
+ <div class="row">
+ <div class="col-sm-11">
+ <#input id="name" name="商品名称"/>
+ <#avatar id="imgUrl" name="商品图片：" />
+ <#input id="integral" name="兑换积分"/>
+ <div class="form-group">
+ <label class="col-sm-3 control-label">商品说明：</label>
+ <div class="col-sm-9">
+ <textarea type="text/plain" id="editor" style="width:100%;height:350px;"></textarea>
+ </div>
+ </div>
+ </div>
+ </div>
+
+ <div class="row btn-group-m-t">
+ <div class="col-sm-10 col-sm-offset-5">
+ <#button btnCss="info" name="提交" id="ensure" icon="fa-check" clickFun="TIntegralGoodsInfoDlg.addSubmit()"/>
+ <#button btnCss="danger" name="取消" id="cancel" icon="fa-eraser" clickFun="TIntegralGoodsInfoDlg.close()"/>
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/tIntegralGoods/tIntegralGoods_info.js"></script>
+@}
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tIntegralGoods/tIntegralGoods_edit.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tIntegralGoods/tIntegralGoods_edit.html
new file mode 100644
index 0000000..c05bc99
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tIntegralGoods/tIntegralGoods_edit.html
@@ -0,0 +1,31 @@
+@layout("/common/_container.html"){
+<div class="ibox float-e-margins">
+ <div class="ibox-content">
+ <div class="form-horizontal" id="integralGoodsInfoForm">
+ <input type="hidden" id="id" name="id" value="${item.id}">
+ <div class="row">
+ <div class="col-sm-11">
+ <#input id="name" name="商品名称" value="${item.name}"/>
+ <#avatar id="imgUrl" name="商品图片：" avatarImg="${item.imgUrl}"/>
+ <#input id="integral" name="兑换积分" value="${item.integral}"/>
+ <div class="form-group">
+ <label class="col-sm-3 control-label">商品说明：</label>
+ <div class="col-sm-9">
+ <textarea type="text/plain" id="editor" style="width:100%;height:350px;">${item.instructions}</textarea>
+ </div>
+ </div>
+ </div>
+ </div>
+
+ <div class="row btn-group-m-t">
+ <div class="col-sm-10 col-sm-offset-5">
+ <#button btnCss="info" name="提交" id="ensure" icon="fa-check" clickFun="TIntegralGoodsInfoDlg.editSubmit()"/>
+ <#button btnCss="danger" name="取消" id="cancel" icon="fa-eraser" clickFun="TIntegralGoodsInfoDlg.close()"/>
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/tIntegralGoods/tIntegralGoods_info.js"></script>
+@}
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tIntegralOrder/tIntegralOrder.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tIntegralOrder/tIntegralOrder.html
new file mode 100644
index 0000000..8d1842e
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tIntegralOrder/tIntegralOrder.html
@@ -0,0 +1,61 @@
+@layout("/common/_container.html"){
+<div class="row">
+ <div class="col-sm-12">
+ <div class="ibox float-e-margins">
+ <div class="ibox-title">
+ <h5>积分兑换订单管理</h5>
+ </div>
+ <div class="ibox-content">
+ <div class="row row-lg">
+ <div class="col-sm-12">
+ <div class="row">
+ <div class="col-sm-3">
+ <#TimeCon id="insertTime" name="兑换时间" isTime="false"/>
+ </div>
+ <div class="col-sm-3">
+ <#NameCon id="userName" name="兑换用户" />
+ </div>
+ <div class="col-sm-3">
+ <#NameCon id="goodsName" name="兑换商品" />
+ </div>
+ <div class="col-sm-3">
+ <#NameCon id="consigneeName" name="收货人" />
+ </div>
+ <div class="col-sm-3">
+ <#NameCon id="consigneePhone" name="联系电话" />
+ </div>
+ <div class="col-sm-3">
+ <#SelectCon id="state" name="状态" >
+ <option value="">全部</option>
+ <option value="1">待处理</option>
+ <option value="2">已处理</option>
+ </#SelectCon>
+ </div>
+ <div class="col-sm-3">
+ <#button name="搜索" icon="fa-search" clickFun="TIntegralOrder.search()"/>
+ <#button name="重置" icon="fa-trash" clickFun="TIntegralOrder.resetSearch()" space="true"/>
+ </div>
+ </div>
+ <div class="hidden-xs" id="TIntegralOrderTableToolbar" role="group">
+ @if(shiro.hasPermission("/tIntegralOrder/immediately")){
+ <#button name="立即处理" icon="fa-edit" clickFun="TIntegralOrder.immediately()"/>
+ @}
+ @if(shiro.hasPermission("/tIntegralOrder/delete")){
+ <#button name="删除记录" icon="fa-remove" clickFun="TIntegralOrder.delete()" space="true"/>
+ @}
+ </div>
+ <#table id="TIntegralOrderTable"/>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/tIntegralOrder/tIntegralOrder.js"></script>
+<script>
+ laydate.render({
+ elem: '#insertTime'
+ ,range: true
+ });
+</script>
+@}
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tIntegralOrder/tIntegralOrder_add.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tIntegralOrder/tIntegralOrder_add.html
new file mode 100644
index 0000000..57fbd7c
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tIntegralOrder/tIntegralOrder_add.html
@@ -0,0 +1,35 @@
+@layout("/common/_container.html"){
+<div class="ibox float-e-margins">
+ <div class="ibox-content">
+ <div class="form-horizontal">
+
+ <div class="row">
+ <div class="col-sm-6 b-r">
+ <#input id="id" name="主键ID" underline="true"/>
+ <#input id="insertTime" name="兑换时间" underline="true"/>
+ <#input id="userId" name="兑换用户ID" underline="true"/>
+ <#input id="goodsId" name="兑换商品ID" underline="true"/>
+ <#input id="num" name="兑换数量"/>
+ </div>
+
+ <div class="col-sm-6">
+ <#input id="consigneeName" name="收货人" underline="true"/>
+ <#input id="consigneePhone" name="收货人联系电话" underline="true"/>
+ <#input id="consigneeAddress" name="收货人收货地址" underline="true"/>
+ <#input id="remark" name="备注" underline="true"/>
+ <#input id="state" name="状态 1=未处理 2=已处理 3=已删除" underline="true"/>
+ </div>
+ </div>
+
+ <div class="row btn-group-m-t">
+ <div class="col-sm-10">
+ <#button btnCss="info" name="提交" id="ensure" icon="fa-check" clickFun="TIntegralOrderInfoDlg.addSubmit()"/>
+ <#button btnCss="danger" name="取消" id="cancel" icon="fa-eraser" clickFun="TIntegralOrderInfoDlg.close()"/>
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/tIntegralOrder/tIntegralOrder_info.js"></script>
+@}
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tIntegralOrder/tIntegralOrder_edit.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tIntegralOrder/tIntegralOrder_edit.html
new file mode 100644
index 0000000..49d4252
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tIntegralOrder/tIntegralOrder_edit.html
@@ -0,0 +1,35 @@
+@layout("/common/_container.html"){
+<div class="ibox float-e-margins">
+ <div class="ibox-content">
+ <div class="form-horizontal">
+
+ <div class="row">
+ <div class="col-sm-6 b-r">
+ <#input id="id" name="主键ID" value="${item.id}" underline="true"/>
+ <#input id="insertTime" name="兑换时间" value="${item.insertTime}" underline="true"/>
+ <#input id="userId" name="兑换用户ID" value="${item.userId}" underline="true"/>
+ <#input id="goodsId" name="兑换商品ID" value="${item.goodsId}" underline="true"/>
+ <#input id="num" name="兑换数量" value="${item.num}" />
+ </div>
+
+ <div class="col-sm-6">
+ <#input id="consigneeName" name="收货人" value="${item.consigneeName}" underline="true"/>
+ <#input id="consigneePhone" name="收货人联系电话" value="${item.consigneePhone}" underline="true"/>
+ <#input id="consigneeAddress" name="收货人收货地址" value="${item.consigneeAddress}" underline="true"/>
+ <#input id="remark" name="备注" value="${item.remark}" underline="true"/>
+ <#input id="state" name="状态 1=未处理 2=已处理 3=已删除" value="${item.state}" />
+ </div>
+ </div>
+
+ <div class="row btn-group-m-t">
+ <div class="col-sm-10">
+ <#button btnCss="info" name="提交" id="ensure" icon="fa-check" clickFun="TIntegralOrderInfoDlg.editSubmit()"/>
+ <#button btnCss="danger" name="取消" id="cancel" icon="fa-eraser" clickFun="TIntegralOrderInfoDlg.close()"/>
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/tIntegralOrder/tIntegralOrder_info.js"></script>
+@}
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tIntegralOrder/tIntegralOrder_immediately.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tIntegralOrder/tIntegralOrder_immediately.html
new file mode 100644
index 0000000..8e7ce0b
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tIntegralOrder/tIntegralOrder_immediately.html
@@ -0,0 +1,28 @@
+@layout("/common/_container.html"){
+<div class="ibox float-e-margins">
+ <div class="ibox-content">
+ <div class="form-horizontal" id="integralOrderInfoForm">
+ <input type="hidden" id="id" name="id" value="${id}">
+ <div class="row">
+ <div class="col-sm-11">
+ <div class="form-group">
+ <label class="col-sm-3 control-label">处理备注：</label>
+ <div class="col-sm-9">
+ <textarea type="text/plain" class="form-control" name="remark" id="remark" style="width:100%;height:150px;" placeholder="多行输入"></textarea>
+ </div>
+ </div>
+ </div>
+ </div>
+
+ <div class="row btn-group-m-t">
+ <div class="col-sm-10 col-sm-offset-5">
+ <#button btnCss="info" name="提交" id="ensure" icon="fa-check" clickFun="TIntegralOrderInfoDlg.immediately()"/>
+ <#button btnCss="danger" name="取消" id="cancel" icon="fa-eraser" clickFun="TIntegralOrderInfoDlg.close()"/>
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/tIntegralOrder/tIntegralOrder_info.js"></script>
+@}
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tInvoice/tInvoice.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tInvoice/tInvoice.html
new file mode 100644
index 0000000..d17d306
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tInvoice/tInvoice.html
@@ -0,0 +1,63 @@
+@layout("/common/_container.html"){
+<div class="row">
+ <div class="col-sm-12">
+ <div class="ibox float-e-margins">
+ <div class="ibox-title">
+ <h5>开发票列表管理</h5>
+ </div>
+ <div class="ibox-content">
+ <div class="row row-lg">
+ <div class="col-sm-12">
+ <div class="row">
+ <div class="col-sm-3">
+ <#TimeCon id="insertTime" name="申请时间" isTime="false"/>
+ </div>
+ <div class="col-sm-3">
+ <#NameCon id="email" name="邮箱" />
+ </div>
+ <div class="col-sm-3">
+ <#NameCon id="name" name="发票抬头" />
+ </div>
+ <div class="col-sm-3">
+ <#SelectCon id="type" name="抬头类型" >
+ <option value="">全部</option>
+ <option value="1">个人发票</option>
+ <option value="2">单位发票</option>
+ </#SelectCon>
+ </div>
+ <div class="col-sm-3">
+ <#SelectCon id="state" name="状态" >
+ <option value="">全部</option>
+ <option value="1">待开票</option>
+ <option value="2">开票成功</option>
+ <option value="3">开票失败</option>
+ </#SelectCon>
+ </div>
+ <div class="col-sm-3">
+ <#button name="搜索" icon="fa-search" clickFun="TInvoice.search()"/>
+ <#button name="重置" icon="fa-trash" clickFun="TInvoice.resetSearch()" space="true"/>
+ </div>
+ </div>
+ <div class="hidden-xs" id="TInvoiceTableToolbar" role="group">
+ @if(shiro.hasPermission("/tInvoice/again")){
+ <#button name="重新开票" icon="fa-edit" clickFun="TInvoice.again()"/>
+ @}
+ @if(shiro.hasPermission("/tInvoice/delete")){
+ <#button name="删除记录" icon="fa-remove" clickFun="TInvoice.delete()" space="true"/>
+ @}
+ </div>
+ <#table id="TInvoiceTable"/>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/tInvoice/tInvoice.js"></script>
+<script>
+ laydate.render({
+ elem: '#insertTime'
+ ,range: true
+ });
+</script>
+@}
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tInvoice/tInvoice_add.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tInvoice/tInvoice_add.html
new file mode 100644
index 0000000..ab8a523
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tInvoice/tInvoice_add.html
@@ -0,0 +1,39 @@
+@layout("/common/_container.html"){
+<div class="ibox float-e-margins">
+ <div class="ibox-content">
+ <div class="form-horizontal">
+
+ <div class="row">
+ <div class="col-sm-6 b-r">
+ <#input id="id" name="" underline="true"/>
+ <#input id="money" name="开票金额" underline="true"/>
+ <#input id="orderNum" name="开票订单数量" underline="true"/>
+ <#input id="type" name="开票类型（1=个人发票，2=单位发票）" underline="true"/>
+ <#input id="name" name="抬头名称（公司名称/个人姓名）" underline="true"/>
+ <#input id="code" name="税号" underline="true"/>
+ <#input id="content" name="发票内容"/>
+ </div>
+
+ <div class="col-sm-6">
+ <#input id="remark" name="备注" underline="true"/>
+ <#input id="address" name="地址+电话" underline="true"/>
+ <#input id="bank" name="开户行+账号" underline="true"/>
+ <#input id="email" name="邮箱" underline="true"/>
+ <#input id="userId" name="开票用户id" underline="true"/>
+ <#input id="state" name="状态（1=待开票，2=成功，3=失败）" underline="true"/>
+ <#input id="insertTime" name="申请时间" underline="true"/>
+ </div>
+ </div>
+
+ <div class="row btn-group-m-t">
+ <div class="col-sm-10">
+ <#button btnCss="info" name="提交" id="ensure" icon="fa-check" clickFun="TInvoiceInfoDlg.addSubmit()"/>
+ <#button btnCss="danger" name="取消" id="cancel" icon="fa-eraser" clickFun="TInvoiceInfoDlg.close()"/>
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/tInvoice/tInvoice_info.js"></script>
+@}
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tInvoice/tInvoice_edit.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tInvoice/tInvoice_edit.html
new file mode 100644
index 0000000..093e97f
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tInvoice/tInvoice_edit.html
@@ -0,0 +1,39 @@
+@layout("/common/_container.html"){
+<div class="ibox float-e-margins">
+ <div class="ibox-content">
+ <div class="form-horizontal">
+
+ <div class="row">
+ <div class="col-sm-6 b-r">
+ <#input id="id" name="" value="${item.id}" underline="true"/>
+ <#input id="money" name="开票金额" value="${item.money}" underline="true"/>
+ <#input id="orderNum" name="开票订单数量" value="${item.orderNum}" underline="true"/>
+ <#input id="type" name="开票类型（1=个人发票，2=单位发票）" value="${item.type}" underline="true"/>
+ <#input id="name" name="抬头名称（公司名称/个人姓名）" value="${item.name}" underline="true"/>
+ <#input id="code" name="税号" value="${item.code}" underline="true"/>
+ <#input id="content" name="发票内容" value="${item.content}" />
+ </div>
+
+ <div class="col-sm-6">
+ <#input id="remark" name="备注" value="${item.remark}" underline="true"/>
+ <#input id="address" name="地址+电话" value="${item.address}" underline="true"/>
+ <#input id="bank" name="开户行+账号" value="${item.bank}" underline="true"/>
+ <#input id="email" name="邮箱" value="${item.email}" underline="true"/>
+ <#input id="userId" name="开票用户id" value="${item.userId}" underline="true"/>
+ <#input id="state" name="状态（1=待开票，2=成功，3=失败）" value="${item.state}" underline="true"/>
+ <#input id="insertTime" name="申请时间" value="${item.insertTime}" />
+ </div>
+ </div>
+
+ <div class="row btn-group-m-t">
+ <div class="col-sm-10">
+ <#button btnCss="info" name="提交" id="ensure" icon="fa-check" clickFun="TInvoiceInfoDlg.editSubmit()"/>
+ <#button btnCss="danger" name="取消" id="cancel" icon="fa-eraser" clickFun="TInvoiceInfoDlg.close()"/>
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/tInvoice/tInvoice_info.js"></script>
+@}
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tLine/tLine.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tLine/tLine.html
new file mode 100644
index 0000000..c450377
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tLine/tLine.html
@@ -0,0 +1,70 @@
+@layout("/common/_container.html"){
+<div class="row">
+ <div class="col-sm-12">
+ <div class="ibox float-e-margins">
+ <div class="ibox-title">
+ <h5>跨城线路管理</h5>
+ </div>
+ <div class="ibox-content">
+ <div class="row row-lg">
+ <div class="col-sm-12">
+ <div class="row">
+ <div class="col-sm-3">
+ <#TimeCon id="insertTime" name="添加时间" isTime="false"/>
+ </div>
+ <div class="col-sm-3">
+ <#NameCon id="name" name="线路名称" />
+ </div>
+ <div class="col-sm-3">
+ <#NameCon id="insertUser" name="创建者" />
+ </div>
+ <div class="col-sm-3">
+ <#NameCon id="modelStr" name="关联车型" />
+ </div>
+ <div class="col-sm-3">
+ <#SelectCon id="state" name="状态" >
+ <option value="">全部</option>
+ <option value="1">正常</option>
+ <option value="2">冻结</option>
+ </#SelectCon>
+ </div>
+ <div class="col-sm-3">
+ <#button name="搜索" icon="fa-search" clickFun="TLine.search()"/>
+ <#button name="重置" icon="fa-trash" clickFun="TLine.resetSearch()" space="true"/>
+ </div>
+ </div>
+ <div class="hidden-xs" id="TLineTableToolbar" role="group">
+ @if(shiro.hasPermission("/tLine/add")){
+ <#button name="添加" icon="fa-plus" clickFun="TLine.openAddTLine()"/>
+ @}
+ @if(shiro.hasPermission("/tLine/update")){
+ <#button name="编辑" icon="fa-edit" clickFun="TLine.openTLineDetail()" space="true"/>
+ @}
+ @if(shiro.hasPermission("/tLine/delete")){
+ <#button name="删除" icon="fa-remove" clickFun="TLine.opt(1)" space="true"/>
+ @}
+ @if(shiro.hasPermission("/tLine/freeze")){
+ <#button name="冻结" icon="fa-remove" clickFun="TLine.opt(2)" space="true"/>
+ @}
+ @if(shiro.hasPermission("/tLine/thaw")){
+ <#button name="解冻" icon="fa-remove" clickFun="TLine.opt(3)" space="true"/>
+ @}
+ @if(shiro.hasPermission("/tLine/addCompany")){
+ <#button name="分配企业" icon="fa-plus" clickFun="TLine.addCompany()" space="true"/>
+ @}
+ </div>
+ <#table id="TLineTable"/>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/tLine/tLine.js"></script>
+<script>
+ laydate.render({
+ elem: '#insertTime'
+ ,range: true
+ });
+</script>
+@}
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tLine/tLine_add.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tLine/tLine_add.html
new file mode 100644
index 0000000..da95513
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tLine/tLine_add.html
@@ -0,0 +1,243 @@
+@layout("/common/_container.html"){
+<style>
+ .newWidth, .single-line{
+ max-width:150px !important;display: initial !important;
+ }
+ .newWidth1, .single-line{
+ max-width:200px !important;display: initial !important;
+ }
+</style>
+<div class="ibox float-e-margins">
+ <div class="ibox-content">
+ <div class="form-horizontal" id="lineInfoForm">
+ <div class="row" style="margin-top: 15px;">
+ <div class="col-sm-4">
+ <h2 style="font-weight: 700;">基础设置</h2>
+ </div>
+ </div>
+ <div class="row">
+ <div class="col-sm-11">
+ <div class="form-group">
+ <label class="col-sm-2 control-label">线路名称：</label>
+ <div class="col-sm-5">
+ <input type="text" class="form-control" id="name" name="name">
+ </div>
+ </div>
+ <div class="form-group">
+ <label class="col-sm-2 control-label">起点：</label>
+ <div class="col-sm-2">
+ <select class="form-control" id="startSiteId" >
+ <option value="">选择站点</option>
+ @for(obj in siteList){
+ <option value="${obj.id}">${obj.name}</option>
+ @}
+ </select>
+ </div>
+ </div>
+ <div class="form-group">
+ <label class="col-sm-2 control-label">终点：</label>
+ <div class="col-sm-2">
+ <select class="form-control" id="endSiteId" >
+ <option value="">选择站点</option>
+ @for(obj in siteList){
+ <option value="${obj.id}">${obj.name}</option>
+ @}
+ </select>
+ </div>
+ </div>
+ <div class="form-group">
+ <label class="col-sm-2 control-label">司机申请限制：</label>
+ <div class="col-sm-6">
+ 司机申请班次的最小时间间隔为 <input type="text" oninput="checkIsMinute(this)" class="form-control newWidth" id="shiftInterval" name="shiftInterval"> 分钟
+ </div>
+ </div>
+ <div class="form-group">
+ <label class="col-sm-2 control-label">抽成比例：</label>
+ <div class="col-sm-6">
+ <input type="text" oninput="checkIsBiLi(this)" class="form-control newWidth" id="rakeRate" name="rakeRate"> %
+ </div>
+ </div>
+ </div>
+ </div>
+
+ <div class="row" style="margin-top: 30px;">
+ <div class="col-sm-4">
+ <h2 style="font-weight: 700;">价格设置</h2>
+ </div>
+ </div>
+
+ <div class="row">
+ <div class="col-sm-11">
+ <div class="form-group">
+ <label class="col-sm-2 control-label">选择车型：</label>
+ <div class="col-sm-2">
+ <select class="form-control" id="serverModelId" >
+ <option value="">选择车型</option>
+ @for(obj in carmodelList){
+ <option value="${obj.id}">${obj.name}</option>
+ @}
+ </select>
+ </div>
+ </div>
+ <div class="form-group">
+ <label class="col-sm-2 control-label">选择车型：</label>
+ <div class="col-sm-2" style="display: flex;align-items: center;">
+ <div class="radio radio-info radio-inline">
+ <input type="radio" id="type1" value="1" name="type" checked="" onclick="TLineInfoDlg.typeClick(1)">
+ <label for="type1"> 固定计价 </label>
+ </div>
+ <div class="radio radio-success radio-inline">
+ <input type="radio" id="type2" value="2" name="type" onclick="TLineInfoDlg.typeClick(2)">
+ <label for="type2"> 浮动计价 </label>
+ </div>
+ </div>
+ </div>
+
+ <div class="form-group" id="fixedDiv">
+ <label class="col-sm-2 control-label">固定计价：</label>
+ <div class="col-sm-10">
+ 单人价格： <input type="text" oninput="checkIsYuan(this)" name="num1" id="num1" class="form-control newWidth" /> 元；
+ 包车价格： <input type="text" oninput="checkIsYuan(this)" name="num2" id="num2" class="form-control newWidth" /> 元；<br><br>
+ 五座系数： <input type="text" oninput="checkIsXiShu(this)" name="num3" id="num3" class="form-control newWidth" /> ；
+ 七座系数： <input type="text" oninput="checkIsXiShu(this)" name="num4" id="num4" class="form-control newWidth" /> ；
+ </div>
+ </div>
+
+ <div class="form-group" id="floatDiv" style="display: none;">
+ <label class="col-sm-2 control-label">浮动计价：</label>
+ <div class="col-sm-10">
+ 参考费用： <input type="text" oninput="checkIsYuan(this)" name="num11" id="num11" class="form-control newWidth" /> 元；
+ 参考里程： <input type="text" oninput="checkIsYuan(this)" name="num12" id="num12" class="form-control newWidth" /> 公里；<br><br>
+ 基础单价： <input type="text" oninput="checkIsYuan(this)" name="num13" id="num13" class="form-control newWidth" /> 元；
+ 优惠系数： <input type="text" oninput="checkIsXiShu(this)" name="num14" id="num14" class="form-control newWidth" /> ；<br><br>
+ 包车系数： <input type="text" oninput="checkIsXiShu(this)" name="num15" id="num15" class="form-control newWidth" /> ；
+ 五座系数： <input type="text" oninput="checkIsXiShu(this)" name="num16" id="num16" class="form-control newWidth" /> ；<br><br>
+ 七座系数： <input type="text" oninput="checkIsXiShu(this)" name="num17" id="num17" class="form-control newWidth" /> ；
+ </div>
+ </div>
+
+ <div class="form-group">
+ <label class="col-sm-2 control-label"></label>
+ <div class="col-sm-10">
+ <#button btnCss="info" name="添加" id="ensure" icon="fa-check" clickFun="TLineInfoDlg.addPrice()"/>
+ </div>
+ </div>
+
+ <div class="form-group">
+ <label class="col-sm-2 control-label">已添加价格</label>
+ <div class="col-sm-6">
+ <div style="height: 200px; border: 1px solid #e5e6e7;overflow-y: auto;">
+ <table class="table table-striped table-bordered table-hover table-condensed">
+ <thead>
+ <tr>
+ <th style="width: 300px;text-align: center;">添加时间</th>
+ <th style="width: 300px;text-align: center;">车型名称</th>
+ <th style="width: 300px;text-align: center;">价格设置</th>
+ <th style="width: 100px;text-align: center;">操作</th>
+ </tr>
+ </thead>
+ <tbody id="priceValue">
+
+ </tbody>
+ </table>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+
+ <div class="row" style="margin-top: 30px;">
+ <div class="col-sm-4">
+ <h2 style="font-weight: 700;">班次设置</h2>
+ </div>
+ </div>
+ <div class="row">
+ <div class="col-sm-11">
+ <div class="form-group">
+ <label class="col-sm-2 control-label">班次时间：</label>
+ <div class="col-sm-2">
+ <input type="text" name="shiftTime" id="shiftTime" class="form-control" placeholder="选择时间"/>
+ </div>
+ <label class="col-sm-1 control-label">车次数：</label>
+ <div class="col-sm-2">
+ <input type="text" name="carNum" id="carNum" class="form-control" />
+ </div>
+ <div class="col-sm-2">
+ <#button btnCss="info" name="添加" id="ensure" icon="fa-check" clickFun="TLineInfoDlg.addShift()"/>
+ </div>
+ </div>
+ <div class="form-group">
+ <label class="col-sm-2 control-label">已添加班次</label>
+ <div class="col-sm-6">
+ <div style="height: 200px; border: 1px solid #e5e6e7;overflow-y: auto;">
+ <table class="table table-striped table-bordered table-hover table-condensed">
+ <thead>
+ <tr>
+ <th style="width: 300px;text-align: center;">添加时间</th>
+ <th style="width: 300px;text-align: center;">班次时间</th>
+ <th style="width: 300px;text-align: center;">车次数</th>
+ <th style="width: 100px;text-align: center;">操作</th>
+ </tr>
+ </thead>
+ <tbody id="shiftValue">
+
+ </tbody>
+ </table>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+
+
+
+
+ <div class="row btn-group-m-t">
+ <div class="col-sm-10 col-sm-offset-5">
+ <#button btnCss="info" name="提交" id="ensure" icon="fa-check" clickFun="TLineInfoDlg.addSubmit()"/>
+ <#button btnCss="danger" name="取消" id="cancel" icon="fa-eraser" clickFun="TLineInfoDlg.close()"/>
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/tLine/tLine_info.js"></script>
+<script type="text/javascript">
+ laydate.render({
+ elem: '#shiftTime'
+ ,type: 'time'
+ ,range: '-'
+ ,format: 'HH:mm'
+ });
+ var regDouble = /^(0|[1-9]\d{0,2})(\.\d{1,2})?$/;
+ var regXiShu = /^(0(\.\d{1,2})?|1(\.0{1,2})?)$/;
+ var regBiLi = /^([0-9]{1,2}$)|(^[0-9]{1,2}\.[0-9]{1,2}$)|100$/;
+ var regInt = /^[0-9]{0,3}$/;
+ function checkIsYuan(obj){
+ var num = $(obj).val();
+ if(!regDouble.test(num)){
+ layer.msg("【元】输入框不能超过3位数,保留两位小数");
+ }
+ }
+ function checkIsXiShu(obj){
+ var num = $(obj).val();
+ if(!regXiShu.test(num)){
+ layer.msg("【系数】输入框大于0小于1,保留两位小数");
+ }
+ }
+ function checkIsBiLi(obj){
+ var num = $(obj).val();
+ if(!regBiLi.test(num)){
+ layer.msg("【比例】输入框大于等于0小于100");
+ }
+ }
+ function checkIsMinute(obj){
+ var num = $(obj).val();
+ if(!regInt.test(num)){
+ layer.msg("【分钟】输入框不能超过3位数");
+ }
+ }
+
+</script>
+@}
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tLine/tLine_addCompany.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tLine/tLine_addCompany.html
new file mode 100644
index 0000000..9564a26
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tLine/tLine_addCompany.html
@@ -0,0 +1,65 @@
+@layout("/common/_container.html"){
+<div class="ibox float-e-margins">
+ <div class="ibox-content">
+ <div class="form-horizontal" id="lineInfoForm">
+ <div class="row">
+ <input type="hidden" id="lineId" name="lineId" value="${tLine.id}">
+ <div class="col-sm-11">
+ <div class="form-group">
+ <label class="col-sm-2 control-label">线路名称：</label>
+ <div class="col-sm-9">
+ <label class="control-label" id="name" name="name">${tLine.name}</label>
+ </div>
+ </div>
+ <div class="form-group">
+ <label class="col-sm-2 control-label">选择企业：</label>
+ <div class="col-sm-2">
+ <select class="form-control" id="companyId" >
+ <option value="">选择企业</option>
+ @for(obj in companyList){
+ <option value="${obj.id}">${obj.name}</option>
+ @}
+ </select>
+ </div>
+ <div class="col-sm-2">
+ <#button btnCss="info" name="添加" id="ensure" icon="fa-check" clickFun="TLineInfoDlg.addCompany()"/>
+ </div>
+ </div>
+ <div class="form-group">
+ <label class="col-sm-2 control-label">已分配企业</label>
+ <div class="col-sm-6">
+ <div style="height: 200px; border: 1px solid #e5e6e7;overflow-y: auto;">
+ <table class="table table-striped table-bordered table-hover table-condensed">
+ <thead>
+ <tr>
+ <th style="width: 300px;text-align: center;">公司名称</th>
+ <th style="width: 100px;text-align: center;">操作</th>
+ </tr>
+ </thead>
+ <tbody id="companyValue">
+ @for(obj in lineCompanyList!){
+ <tr class="companyValueClass">
+ <td style="text-align: center;"><input type="hidden" id="companyIdValue" name="companyIdValue" value="${obj.companyId}">${obj.companyName}</td>
+ <td style="text-align: center;"><button onclick="deleteSub(this)">移除</button></td>
+ </tr>
+ @}
+ </tbody>
+ </table>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+
+ <div class="row btn-group-m-t">
+ <div class="col-sm-10 col-sm-offset-5">
+ <#button btnCss="info" name="提交" id="ensure" icon="fa-check" clickFun="TLineInfoDlg.addCompanySubmit()"/>
+ <#button btnCss="danger" name="取消" id="cancel" icon="fa-eraser" clickFun="TLineInfoDlg.close()"/>
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/tLine/tLine_info.js"></script>
+@}
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tLine/tLine_edit.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tLine/tLine_edit.html
new file mode 100644
index 0000000..3835e4f
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tLine/tLine_edit.html
@@ -0,0 +1,257 @@
+@layout("/common/_container.html"){
+<style>
+ .newWidth, .single-line{
+ max-width:150px !important;display: initial !important;
+ }
+ .newWidth1, .single-line{
+ max-width:200px !important;display: initial !important;
+ }
+</style>
+<div class="ibox float-e-margins">
+ <div class="ibox-content">
+ <div class="form-horizontal" id="lineInfoForm">
+ <div class="row" style="margin-top: 15px;">
+ <div class="col-sm-4">
+ <h2 style="font-weight: 700;">基础设置</h2>
+ </div>
+ </div>
+ <input type="hidden" id="id" name="id" value="${item.id}">
+ <div class="row">
+ <div class="col-sm-11">
+ <div class="form-group">
+ <label class="col-sm-2 control-label">线路名称：</label>
+ <div class="col-sm-5">
+ <input type="text" class="form-control" id="name" name="name" value="${item.name}">
+ </div>
+ </div>
+ <div class="form-group">
+ <label class="col-sm-2 control-label">起点：</label>
+ <div class="col-sm-2">
+ <select class="form-control" id="startSiteId" >
+ <option value="">选择站点</option>
+ @for(obj in siteList){
+ <option value="${obj.id}" ${obj.id == start.siteId ? 'selected=selected' : ''}>${obj.name}</option>
+ @}
+ </select>
+ </div>
+ </div>
+ <div class="form-group">
+ <label class="col-sm-2 control-label">终点：</label>
+ <div class="col-sm-2">
+ <select class="form-control" id="endSiteId" >
+ <option value="">选择站点</option>
+ @for(obj in siteList){
+ <option value="${obj.id}" ${obj.id == end.siteId ? 'selected=selected' : ''}>${obj.name}</option>
+ @}
+ </select>
+ </div>
+ </div>
+ <div class="form-group">
+ <label class="col-sm-2 control-label">司机申请限制：</label>
+ <div class="col-sm-6">
+ 司机申请班次的最小时间间隔为 <input type="text" oninput="checkIsMinute(this)" class="form-control newWidth" id="shiftInterval" name="shiftInterval" value="${item.shiftInterval}" > 分钟
+ </div>
+ </div>
+ <div class="form-group">
+ <label class="col-sm-2 control-label">抽成比例：</label>
+ <div class="col-sm-6">
+ <input type="text" oninput="checkIsBiLi(this)" class="form-control newWidth" id="rakeRate" name="rakeRate" value="${item.rakeRate}"> %
+ </div>
+ </div>
+ </div>
+ </div>
+
+ <div class="row" style="margin-top: 30px;">
+ <div class="col-sm-4">
+ <h2 style="font-weight: 700;">价格设置</h2>
+ </div>
+ </div>
+ <div class="row">
+ <div class="col-sm-11">
+ <div class="form-group">
+ <label class="col-sm-2 control-label">选择车型：</label>
+ <div class="col-sm-2">
+ <select class="form-control" id="serverModelId" >
+ <option value="">选择车型</option>
+ @for(obj in carmodelList){
+ <option value="${obj.id}">${obj.name}</option>
+ @}
+ </select>
+ </div>
+ </div>
+ <div class="form-group">
+ <label class="col-sm-2 control-label">选择车型：</label>
+ <div class="col-sm-2" style="display: flex;align-items: center;">
+ <div class="radio radio-info radio-inline">
+ <input type="radio" id="type1" value="1" name="type" checked="" onclick="TLineInfoDlg.typeClick(1)">
+ <label for="type1"> 固定计价 </label>
+ </div>
+ <div class="radio radio-success radio-inline">
+ <input type="radio" id="type2" value="2" name="type" onclick="TLineInfoDlg.typeClick(2)">
+ <label for="type2"> 浮动计价 </label>
+ </div>
+ </div>
+ </div>
+
+ <div class="form-group" id="fixedDiv">
+ <label class="col-sm-2 control-label">固定计价：</label>
+ <div class="col-sm-10">
+ 单人价格： <input type="text" oninput="checkIsYuan(this)" name="num1" id="num1" class="form-control newWidth" /> 元；
+ 包车价格： <input type="text" oninput="checkIsYuan(this)" name="num2" id="num2" class="form-control newWidth" /> 元；<br><br>
+ 五座系数： <input type="text" oninput="checkIsXiShu(this)" name="num3" id="num3" class="form-control newWidth" /> ；
+ 七座系数： <input type="text" oninput="checkIsXiShu(this)" name="num4" id="num4" class="form-control newWidth" /> ；
+ </div>
+ </div>
+
+ <div class="form-group" id="floatDiv" style="display: none;">
+ <label class="col-sm-2 control-label">浮动计价：</label>
+ <div class="col-sm-10">
+ 参考费用： <input type="text" oninput="checkIsYuan(this)" name="num11" id="num11" class="form-control newWidth" /> 元；
+ 参考里程： <input type="text" oninput="checkIsYuan(this)" name="num12" id="num12" class="form-control newWidth" /> 公里；<br><br>
+ 基础单价： <input type="text" oninput="checkIsYuan(this)" name="num13" id="num13" class="form-control newWidth" /> 元；
+ 优惠系数： <input type="text" oninput="checkIsXiShu(this)" name="num14" id="num14" class="form-control newWidth" /> ；<br><br>
+ 包车系数： <input type="text" oninput="checkIsXiShu(this)" name="num15" id="num15" class="form-control newWidth" /> ；
+ 五座系数： <input type="text" oninput="checkIsXiShu(this)" name="num16" id="num16" class="form-control newWidth" /> ；<br><br>
+ 七座系数： <input type="text" oninput="checkIsXiShu(this)" name="num17" id="num17" class="form-control newWidth" /> ；
+ </div>
+ </div>
+
+ <div class="form-group">
+ <label class="col-sm-2 control-label"></label>
+ <div class="col-sm-10">
+ <#button btnCss="info" name="添加" id="ensure" icon="fa-check" clickFun="TLineInfoDlg.addPrice()"/>
+ </div>
+ </div>
+
+ <div class="form-group">
+ <label class="col-sm-2 control-label">已添加价格</label>
+ <div class="col-sm-6">
+ <div style="height: 200px; border: 1px solid #e5e6e7;overflow-y: auto;">
+ <table class="table table-striped table-bordered table-hover table-condensed">
+ <thead>
+ <tr>
+ <th style="width: 300px;text-align: center;">添加时间</th>
+ <th style="width: 300px;text-align: center;">车型名称</th>
+ <th style="width: 300px;text-align: center;">价格设置</th>
+ <th style="width: 100px;text-align: center;">操作</th>
+ </tr>
+ </thead>
+ <tbody id="priceValue">
+ @for(obj in linePriceList!){
+ <tr class="typeValueClass">
+ <td style="text-align: center;"><input type="hidden" id="timeValue" name="timeValue" value="${obj.addTime}">${obj.addTime}</td>
+ <td style="text-align: center;"><input type="hidden" id="serverModelIdValue" name="serverModelIdValue" value="${obj.serverCarModelId}">${obj.name}</td>
+ <td style="text-align: center;"><input type="hidden" id="typeValue" name="typeValue" value="${obj.type}">
+ <input type="hidden" id="contentValue" name="contentValue" value='${obj.content}'>
+ <input type="hidden" id="contentStrValue" name="contentStrValue" value="${obj.contentStr}">${obj.contentStr}</td>
+ <td style="text-align: center;"><button onclick="deleteSub(this)">移除</button></td>
+ </tr>
+ @}
+ </tbody>
+ </table>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+
+ <div class="row" style="margin-top: 30px;">
+ <div class="col-sm-4">
+ <h2 style="font-weight: 700;">班次设置</h2>
+ </div>
+ </div>
+ <div class="row">
+ <div class="col-sm-11">
+ <div class="form-group">
+ <label class="col-sm-2 control-label">班次时间：</label>
+ <div class="col-sm-2">
+ <input type="text" name="shiftTime" id="shiftTime" class="form-control" placeholder="选择时间"/>
+ </div>
+ <label class="col-sm-1 control-label">车次数：</label>
+ <div class="col-sm-2">
+ <input type="text" name="carNum" id="carNum" class="form-control" />
+ </div>
+ <div class="col-sm-2">
+ <#button btnCss="info" name="添加" id="ensure" icon="fa-check" clickFun="TLineInfoDlg.addShift()"/>
+ </div>
+ </div>
+ <div class="form-group">
+ <label class="col-sm-2 control-label">已添加班次</label>
+ <div class="col-sm-6">
+ <div style="height: 200px; border: 1px solid #e5e6e7;overflow-y: auto;">
+ <table class="table table-striped table-bordered table-hover table-condensed">
+ <thead>
+ <tr>
+ <th style="width: 300px;text-align: center;">添加时间</th>
+ <th style="width: 300px;text-align: center;">班次时间</th>
+ <th style="width: 300px;text-align: center;">车次数</th>
+ <th style="width: 100px;text-align: center;">操作</th>
+ </tr>
+ </thead>
+ <tbody id="shiftValue">
+ @for(obj in lineShiftList!){
+ <tr class="shiftValueClass">
+ <td style="text-align: center;"><input type="hidden" id="time2Value" name="time2Value" value="${obj.addTime}">${obj.addTime}</td>
+ <td style="text-align: center;"><input type="hidden" id="shiftTimeValue" name="shiftTimeValue" value="${obj.startTime} - ${obj.endTime}">${obj.startTime} - ${obj.endTime}</td>
+ <td style="text-align: center;"><input type="hidden" id="carNumValue" name="carNumValue" value="${obj.carNum}">${obj.carNum}</td>
+ <td style="text-align: center;"><button onclick="deleteSub(this)">移除</button></td>
+ </tr>
+ @}
+ </tbody>
+ </table>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+
+
+ <div class="row btn-group-m-t">
+ <div class="col-sm-10 col-sm-offset-5">
+ <#button btnCss="info" name="提交" id="ensure" icon="fa-check" clickFun="TLineInfoDlg.editSubmit()"/>
+ <#button btnCss="danger" name="取消" id="cancel" icon="fa-eraser" clickFun="TLineInfoDlg.close()"/>
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/tLine/tLine_info.js"></script>
+<script type="text/javascript">
+ laydate.render({
+ elem: '#shiftTime'
+ ,type: 'time'
+ ,range: '-'
+ ,format: 'HH:mm'
+ });
+ var regDouble = /^(([1-9]{1}\d*)|(0{1}))(\.\d{0,2})?$/;
+ var regXiShu = /^(0(\.\d{1,2})?|1(\.0{1,2})?)$/;
+ var regBiLi = /^([0-9]{1,2}$)|(^[0-9]{1,2}\.[0-9]{1,2}$)|100$/;
+ var regInt = /^[0-9]{0,3}$/;
+ function checkIsYuan(obj){
+ var num = $(obj).val();
+ if(!regDouble.test(num)){
+ layer.msg("【元】输入框不能超过3位数,保留两位小数");
+ }
+ }
+ function checkIsXiShu(obj){
+ var num = $(obj).val();
+ if(!regXiShu.test(num)){
+ layer.msg("【系数】输入框大于0小于1,保留两位小数");
+ }
+ }
+ function checkIsBiLi(obj){
+ var num = $(obj).val();
+ if(!regBiLi.test(num)){
+ layer.msg("【比例】输入框大于等于0小于100");
+ }
+ }
+ function checkIsMinute(obj){
+ var num = $(obj).val();
+ if(!regInt.test(num)){
+ layer.msg("【分钟】输入框不能超过3位数");
+ }
+ }
+
+</script>
+@}
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tNotices/system.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tNotices/system.html
new file mode 100644
index 0000000..e7c74a4
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tNotices/system.html
@@ -0,0 +1,51 @@
+@layout("/common/_container.html"){
+<div class="row">
+ <div class="col-sm-12">
+ <div class="ibox float-e-margins">
+ <div class="ibox-title">
+ <h5>系统公告设置管理</h5>
+ </div>
+ <div class="ibox-content">
+ <div class="row row-lg">
+ <div class="col-sm-12">
+ <div class="row">
+ <div class="col-sm-3">
+ <#TimeCon id="insertTime" name="添加时间" isTime="false"/>
+ </div>
+ <div class="col-sm-3">
+ <#NameCon id="content" name="消息内容" />
+ </div>
+ <div class="col-sm-3">
+ <#button name="搜索" icon="fa-search" clickFun="System.search()"/>
+ <#button name="重置" icon="fa-trash" clickFun="System.resetSearch()" space="true"/>
+ </div>
+ </div>
+ <div class="hidden-xs" id="SystemTableToolbar" role="group">
+ @if(shiro.hasPermission("/tNotices/addSystem")){
+ <#button name="添加" icon="fa-plus" clickFun="System.addSystem()"/>
+ @}
+ @if(shiro.hasPermission("/tNotices/updateSystem")){
+ <#button name="编辑" icon="fa-edit" clickFun="System.updateSystem()" space="true"/>
+ @}
+ @if(shiro.hasPermission("/tNotices/deleteSystem")){
+ <#button name="删除" icon="fa-remove" clickFun="System.deleteSystem()" space="true"/>
+ @}
+ @if(shiro.hasPermission("/tNotices/sendSystem")){
+ <#button name="发布" icon="fa-remove" clickFun="System.sendSystem()" space="true"/>
+ @}
+ </div>
+ <#table id="SystemTable"/>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/tNotices/system.js"></script>
+<script>
+ laydate.render({
+ elem: '#insertTime'
+ ,range: true
+ });
+</script>
+@}
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tNotices/system_add.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tNotices/system_add.html
new file mode 100644
index 0000000..d562f9b
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tNotices/system_add.html
@@ -0,0 +1,55 @@
+@layout("/common/_container.html"){
+<div class="ibox float-e-margins">
+ <div class="ibox-content">
+ <div class="form-horizontal" id="systemInfoForm">
+
+ <div class="row">
+ <div class="col-sm-11">
+ <div class="form-group">
+ <fieldset>
+ <label class="col-sm-3 control-label">发布对象：</label>
+ <div class="col-sm-9">
+ <div class="checkbox checkbox-success checkbox-inline">
+ <input type="checkbox" name="serverBox" id="serverBox1" checked="checked" value="1">
+ <label for="serverBox1"> 用户 </label>
+ </div>
+ <div class="checkbox checkbox-success checkbox-inline">
+ <input type="checkbox" name="serverBox" id="serverBox2" value="2">
+ <label for="serverBox2"> 司机 </label>
+ </div>
+ </div>
+ </fieldset>
+ </div>
+ <#avatar id="imgUrl" name="封面：" />
+ <#input id="title" name="标题"/>
+ <#select id="isBroadcast" name="是否播报：" >
+ <option value="">选择是否播报</option>
+ <option value="1">是</option>
+ <option value="2">否</option>
+ </#select>
+ <div class="form-group" id="contentDiv">
+ <label class="col-sm-3 control-label">公告内容：</label>
+ <div class="col-sm-9">
+ <textarea type="text/plain" id="editor" style="width:100%;height:350px;"></textarea>
+ </div>
+ </div>
+ <#select id="isShow" name="是否发布：" >
+ <option value="">选择是否发布</option>
+ <option value="1">是</option>
+ <option value="2">否</option>
+ </#select>
+ </div>
+ </div>
+
+ <div class="row btn-group-m-t">
+ <div class="col-sm-10 col-sm-offset-5">
+ <#button btnCss="info" name="提交" id="ensure" icon="fa-check" clickFun="SystemInfoDlg.addSubmit()"/>
+ <#button btnCss="danger" name="取消" id="cancel" icon="fa-eraser" clickFun="SystemInfoDlg.close()"/>
+ </div>
+ </div>
+ </div>
+
+</div>
+</div>
+<script src="${ctxPath}/static/modular/system/tNotices/system_info.js"></script>
+@}
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tNotices/system_update.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tNotices/system_update.html
new file mode 100644
index 0000000..8243e79
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tNotices/system_update.html
@@ -0,0 +1,40 @@
+@layout("/common/_container.html"){
+<div class="ibox float-e-margins">
+ <div class="ibox-content">
+ <div class="form-horizontal" id="systemInfoForm">
+ <input type="hidden" id="id" name="id" value="${item.id}">
+ <div class="row">
+ <div class="col-sm-11">
+ <#avatar id="imgUrl" name="封面：" avatarImg="${item.imgUrl}"/>
+ <#input id="title" name="标题" value="${item.title}"/>
+ <#select id="isBroadcast" name="是否播报：" >
+ <option value="">选择是否播报</option>
+ <option value="1" ${1 == item.isBroadcast ? 'selected=selected' : ''}>是</option>
+ <option value="2" ${2 == item.isBroadcast ? 'selected=selected' : ''}>否</option>
+ </#select>
+ <div class="form-group" id="contentDiv">
+ <label class="col-sm-3 control-label">公告内容：</label>
+ <div class="col-sm-9">
+ <textarea type="text/plain" id="editor" style="width:100%;height:350px;">${item.content}</textarea>
+ </div>
+ </div>
+ <#select id="isShow" name="是否发布：" >
+ <option value="">选择是否发布</option>
+ <option value="1" ${1 == item.isShow ? 'selected=selected' : ''}>是</option>
+ <option value="2" ${2 == item.isShow ? 'selected=selected' : ''}>否</option>
+ </#select>
+ </div>
+ </div>
+
+ <div class="row btn-group-m-t">
+ <div class="col-sm-10 col-sm-offset-5">
+ <#button btnCss="info" name="提交" id="ensure" icon="fa-check" clickFun="SystemInfoDlg.editSubmit()"/>
+ <#button btnCss="danger" name="取消" id="cancel" icon="fa-eraser" clickFun="SystemInfoDlg.close()"/>
+ </div>
+ </div>
+</div>
+
+</div>
+</div>
+<script src="${ctxPath}/static/modular/system/tNotices/system_info.js"></script>
+@}
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tNotices/tNotices.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tNotices/tNotices.html
new file mode 100644
index 0000000..fbf8f2a
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tNotices/tNotices.html
@@ -0,0 +1,48 @@
+@layout("/common/_container.html"){
+<div class="row">
+ <div class="col-sm-12">
+ <div class="ibox float-e-margins">
+ <div class="ibox-title">
+ <h5>滚动消息设置管理</h5>
+ </div>
+ <div class="ibox-content">
+ <div class="row row-lg">
+ <div class="col-sm-12">
+ <div class="row">
+ <div class="col-sm-3">
+ <#TimeCon id="insertTime" name="添加时间" isTime="false"/>
+ </div>
+ <div class="col-sm-3">
+ <#NameCon id="content" name="消息内容" />
+ </div>
+ <div class="col-sm-3">
+ <#button name="搜索" icon="fa-search" clickFun="TNotices.search()"/>
+ <#button name="重置" icon="fa-trash" clickFun="TNotices.resetSearch()" space="true"/>
+ </div>
+ </div>
+ <div class="hidden-xs" id="TNoticesTableToolbar" role="group">
+ @if(shiro.hasPermission("/tNotices/add")){
+ <#button name="添加" icon="fa-plus" clickFun="TNotices.openAddTNotices()"/>
+ @}
+ @if(shiro.hasPermission("/tNotices/update")){
+ <#button name="编辑" icon="fa-edit" clickFun="TNotices.openTNoticesDetail()" space="true"/>
+ @}
+ @if(shiro.hasPermission("/tNotices/delete")){
+ <#button name="删除" icon="fa-remove" clickFun="TNotices.delete()" space="true"/>
+ @}
+ </div>
+ <#table id="TNoticesTable"/>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/tNotices/tNotices.js"></script>
+<script>
+ laydate.render({
+ elem: '#insertTime'
+ ,range: true
+ });
+</script>
+@}
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tNotices/tNotices_add.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tNotices/tNotices_add.html
new file mode 100644
index 0000000..b8d2f90
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tNotices/tNotices_add.html
@@ -0,0 +1,29 @@
+@layout("/common/_container.html"){
+<div class="ibox float-e-margins">
+ <div class="ibox-content">
+ <div class="form-horizontal" id="noticeInfoForm">
+
+ <div class="row">
+ <div class="col-sm-11">
+ <#input id="content" name="消息内容" />
+ <#input id="sort" name="排序"/>
+ <#select id="isShow" name="是否显示：" >
+ <option value="">选择是否显示</option>
+ <option value="1">是</option>
+ <option value="2">否</option>
+ </#select>
+ </div>
+ </div>
+
+ <div class="row btn-group-m-t">
+ <div class="col-sm-10 col-sm-offset-5">
+ <#button btnCss="info" name="提交" id="ensure" icon="fa-check" clickFun="TNoticesInfoDlg.addSubmit()"/>
+ <#button btnCss="danger" name="取消" id="cancel" icon="fa-eraser" clickFun="TNoticesInfoDlg.close()"/>
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/tNotices/tNotices_info.js"></script>
+@}
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tNotices/tNotices_edit.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tNotices/tNotices_edit.html
new file mode 100644
index 0000000..0b13d67
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tNotices/tNotices_edit.html
@@ -0,0 +1,29 @@
+@layout("/common/_container.html"){
+<div class="ibox float-e-margins">
+ <div class="ibox-content">
+ <div class="form-horizontal" id="noticeInfoForm">
+ <input type="hidden" id="id" name="id" value="${item.id}">
+ <div class="row">
+ <div class="col-sm-11">
+ <#input id="content" name="消息内容" value="${item.content}"/>
+ <#input id="sort" name="排序" value="${item.sort}"/>
+ <#select id="isShow" name="是否显示：" >
+ <option value="">选择是否显示</option>
+ <option value="1" ${1 == item.isShow ? 'selected=selected' : ''}>是</option>
+ <option value="2" ${2 == item.isShow ? 'selected=selected' : ''}>否</option>
+ </#select>
+ </div>
+ </div>
+
+ <div class="row btn-group-m-t">
+ <div class="col-sm-10 col-sm-offset-5">
+ <#button btnCss="info" name="提交" id="ensure" icon="fa-check" clickFun="TNoticesInfoDlg.editSubmit()"/>
+ <#button btnCss="danger" name="取消" id="cancel" icon="fa-eraser" clickFun="TNoticesInfoDlg.close()"/>
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/tNotices/tNotices_info.js"></script>
+@}
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tOpenCity/tOpenCity.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tOpenCity/tOpenCity.html
new file mode 100644
index 0000000..48eea26
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tOpenCity/tOpenCity.html
@@ -0,0 +1,48 @@
+@layout("/common/_container.html"){
+<div class="row">
+ <div class="col-sm-12">
+ <div class="ibox float-e-margins">
+ <div class="ibox-title">
+ <h5>城市管理</h5>
+ </div>
+ <div class="ibox-content">
+ <div class="row row-lg">
+ <div class="col-sm-12">
+ <div class="row">
+ <div class="col-sm-3">
+ <#TimeCon id="insertTime" name="添加时间" isTime="false"/>
+ </div>
+ <div class="col-sm-3">
+ <#NameCon id="condition" name="省/市/区名称" />
+ </div>
+ <div class="col-sm-3">
+ <#button name="搜索" icon="fa-search" clickFun="TOpenCity.search()"/>
+ <#button name="重置" icon="fa-trash" clickFun="TOpenCity.resetSearch()" space="true"/>
+ </div>
+ </div>
+ <div class="hidden-xs" id="TOpenCityTableToolbar" role="group">
+ @if(shiro.hasPermission("/tOpenCity/add")){
+ <#button name="添加" icon="fa-plus" clickFun="TOpenCity.openAddTOpenCity()"/>
+ @}
+ @if(shiro.hasPermission("/tOpenCity/update")){
+ <#button name="编辑" icon="fa-edit" clickFun="TOpenCity.openTOpenCityDetail()" space="true"/>
+ @}
+ @if(shiro.hasPermission("/tOpenCity/delete")){
+ <#button name="删除" icon="fa-remove" clickFun="TOpenCity.delete()" space="true"/>
+ @}
+ </div>
+ <#table id="TOpenCityTable"/>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/tOpenCity/tOpenCity.js"></script>
+<script>
+ laydate.render({
+ elem: '#insertTime'
+ ,range: true
+ });
+</script>
+@}
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tOpenCity/tOpenCity_add.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tOpenCity/tOpenCity_add.html
new file mode 100644
index 0000000..b20a892
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tOpenCity/tOpenCity_add.html
@@ -0,0 +1,79 @@
+@layout("/common/_container.html"){
+<div class="ibox float-e-margins">
+ <div class="ibox-content">
+ <div class="form-horizontal" id="openCityForm">
+ <div class="row">
+ <div class="col-sm-10">
+ <#select id="provinceId" name="省：" onchange="TOpenCityInfoDlg.provinceChange()">
+ <option value="">选择省</option>
+ @for(province in provinceList){
+ <option value="${province.id}">${province.name}</option>
+ @}
+ </#select>
+ <#select id="cityId" name="市：" onchange="TOpenCityInfoDlg.cityChange()">
+ <option value="">选择市</option>
+ </#select>
+ <#select id="areaId" name="区：">
+ <option value="">选择区</option>
+ </#select>
+ <#select id="isQualifications" name="是否需要网约车资格证：">
+ <option value="">选择是否需要网约车资格证</option>
+ <option value="1">是</option>
+ <option value="2">否</option>
+ </#select>
+ <div class="form-group">
+ <label class="col-sm-3 control-label">经营业务：</label>
+ <div class="col-sm-3">
+ <select class="form-control" id="businessType">
+ <option value="">选择经营业务</option>
+ <option value="1">专车</option>
+ <option value="2">出租车</option>
+ <option value="3">跨城出行</option>
+ <option value="4">跨城小件物流</option>
+ <option value="5">同城小件物流</option>
+ <option value="6">包车</option>
+ </select>
+ </div>
+ <div class="col-sm-3" >
+ <#input id="businessSort" name="排序" value="" />
+ </div>
+ <div class="col-sm-2">
+ <#button btnCss="info" name="添加" id="ensure" icon="fa-check" clickFun="addBusinessType()"/>
+ </div>
+ </div>
+ <div class="form-group">
+ <label class="col-sm-3 control-label">已添加经营业务</label>
+ <div class="col-sm-9">
+ <div style="height: 200px; border: 1px solid #e5e6e7;overflow-y: auto;">
+ <table class="table table-striped table-bordered table-hover table-condensed">
+ <thead>
+ <tr>
+ <th style="width: 300px;">添加时间</th>
+ <th style="width: 300px;">经营业务</th>
+ <th style="width: 300px;">排序</th>
+ <th style="width: 100px;">操作</th>
+ </tr>
+ </thead>
+ <tbody id="coun">
+
+ </tbody>
+ </table>
+ </div>
+ </div>
+ </div>
+
+ </div>
+ </div>
+
+ <div class="row btn-group-m-t">
+ <div class="col-sm-10 col-sm-offset-5">
+ <#button btnCss="info" name="提交" id="ensure" icon="fa-check" clickFun="TOpenCityInfoDlg.addSubmit()"/>
+ <#button btnCss="danger" name="取消" id="cancel" icon="fa-eraser" clickFun="TOpenCityInfoDlg.close()"/>
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/tOpenCity/tOpenCity_info.js"></script>
+@}
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tOpenCity/tOpenCity_edit.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tOpenCity/tOpenCity_edit.html
new file mode 100644
index 0000000..844d9f1
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tOpenCity/tOpenCity_edit.html
@@ -0,0 +1,95 @@
+@layout("/common/_container.html"){
+<div class="ibox float-e-margins">
+ <div class="ibox-content">
+ <div class="form-horizontal" id="openCityForm">
+ <input type="hidden" id="id" name="id" value="${item.id}">
+ <div class="row">
+ <div class="col-sm-10">
+ <#select id="provinceId" name="省：" onchange="TOpenCityInfoDlg.provinceChange()">
+ <option value="">选择省</option>
+ @for(province in provinceList){
+ <option value="${province.id}" ${province.id == item.areaId ? 'selected=selected' : ''}>${province.name}</option>
+ @}
+ </#select>
+ <#select id="cityId" name="市：" onchange="TOpenCityInfoDlg.cityChange()">
+ <option value="">选择市</option>
+ @for(city in cityList){
+ <option value="${city.id}" ${city.id == item.cityId ? 'selected=selected' : ''}>${city.name}</option>
+ @}
+ </#select>
+ <#select id="areaId" name="区：">
+ <option value="">选择区</option>
+ @for(area in areaList){
+ <option value="${area.id}" ${area.id == item.provinceId ? 'selected=selected' : ''}>${area.name}</option>
+ @}
+ </#select>
+ <#select id="isQualifications" name="是否需要网约车资格证：">
+ <option value="">选择是否需要网约车资格证</option>
+ <option value="1" ${1 == item.isQualifications ? 'selected=selected' : ''}>是</option>
+ <option value="2" ${2 == item.isQualifications ? 'selected=selected' : ''}>否</option>
+ </#select>
+ <div class="form-group">
+ <label class="col-sm-3 control-label">经营业务：</label>
+ <div class="col-sm-3">
+ <select class="form-control" id="businessType">
+ <option value="">选择经营业务</option>
+ <option value="1">专车</option>
+ <option value="2">出租车</option>
+ <option value="3">跨城出行</option>
+ <option value="4">跨城小件物流</option>
+ <option value="5">同城小件物流</option>
+ <option value="6">包车</option>
+ </select>
+ </div>
+ <div class="col-sm-3" >
+ <#input id="businessSort" name="排序" value="" />
+ </div>
+ <div class="col-sm-2">
+ <#button btnCss="info" name="添加" id="ensure" icon="fa-check" clickFun="addBusinessType()"/>
+ </div>
+ </div>
+ <div class="form-group">
+ <label class="col-sm-3 control-label">已添加经营业务</label>
+ <div class="col-sm-9">
+ <div style="height: 200px; border: 1px solid #e5e6e7;overflow-y: auto;">
+ <table class="table table-striped table-bordered table-hover table-condensed">
+ <thead>
+ <tr>
+ <th style="width: 300px;">添加时间</th>
+ <th style="width: 300px;">经营业务</th>
+ <th style="width: 300px;">排序</th>
+ <th style="width: 100px;">操作</th>
+ </tr>
+ </thead>
+ <tbody id="coun">
+ @for(obj in businessList){
+ <tr class="timeClass">
+ <td>
+ <input type="hidden" id="busId" name="busId" value="${obj.id}">
+ <input type="hidden" id="time" name="time" value="${obj.insertTimeStr}">${obj.insertTimeStr}</td>
+ <td><input type="hidden" id="type" name="type" value="${obj.businessTypeStr}">${obj.businessTypeStr}</td>
+ <td><input type="hidden" id="sort" name="sort" value="${obj.sort}">${obj.sort}</td>
+ <td><button onclick="deleteSub(this)">移除</button></td></td>
+ </tr>
+ @}
+ </tbody>
+ </table>
+ </div>
+ </div>
+ </div>
+
+ </div>
+ </div>
+
+ <div class="row btn-group-m-t">
+ <div class="col-sm-10 col-sm-offset-5">
+ <#button btnCss="info" name="提交" id="ensure" icon="fa-check" clickFun="TOpenCityInfoDlg.editSubmit()"/>
+ <#button btnCss="danger" name="取消" id="cancel" icon="fa-eraser" clickFun="TOpenCityInfoDlg.close()"/>
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/tOpenCity/tOpenCity_info.js"></script>
+@}
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderCharter/tOrderCharter.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderCharter/tOrderCharter.html
new file mode 100644
index 0000000..69948d4
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderCharter/tOrderCharter.html
@@ -0,0 +1,61 @@
+@layout("/common/_container.html"){
+<div class="row">
+ <div class="col-sm-12">
+ <div class="ibox float-e-margins">
+ <div class="ibox-title">
+ <h5>旅游包车订单管理</h5>
+ </div>
+ <div class="ibox-content">
+ <div class="row row-lg">
+ <div class="col-sm-12">
+ <div class="row">
+ <div class="col-sm-3">
+ <#TimeCon id="insertTime" name="添加时间" isTime="false"/>
+ </div>
+ <div class="col-sm-3">
+ <#NameCon id="userName" name="提交用户" />
+ </div>
+ <div class="col-sm-3">
+ <#NameCon id="contactName" name="联系人" />
+ </div>
+ <div class="col-sm-3">
+ <#NameCon id="contactPhone" name="联系电话" />
+ </div>
+ <div class="col-sm-3">
+ <#NameCon id="useDemand" name="用车需求" />
+ </div>
+ <div class="col-sm-3">
+ <#SelectCon id="state" name="状态" >
+ <option value="">全部</option>
+ <option value="1">待处理</option>
+ <option value="2">已处理</option>
+ </#SelectCon>
+ </div>
+ <div class="col-sm-3">
+ <#button name="搜索" icon="fa-search" clickFun="TOrderCharter.search()"/>
+ <#button name="重置" icon="fa-trash" clickFun="TOrderCharter.resetSearch()" space="true"/>
+ </div>
+ </div>
+ <div class="hidden-xs" id="TOrderCharterTableToolbar" role="group">
+ @if(shiro.hasPermission("/tOrderCharter/immediately")){
+ <#button name="立即处理" icon="fa-edit" clickFun="TOrderCharter.immediately()"/>
+ @}
+ @if(shiro.hasPermission("/tOrderCharter/delete")){
+ <#button name="删除记录" icon="fa-remove" clickFun="TOrderCharter.delete()" space="true"/>
+ @}
+ </div>
+ <#table id="TOrderCharterTable"/>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/tOrderCharter/tOrderCharter.js"></script>
+<script>
+ laydate.render({
+ elem: '#insertTime'
+ ,range: true
+ });
+</script>
+@}
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderCharter/tOrderCharter_add.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderCharter/tOrderCharter_add.html
new file mode 100644
index 0000000..546f8a7
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderCharter/tOrderCharter_add.html
@@ -0,0 +1,35 @@
+@layout("/common/_container.html"){
+<div class="ibox float-e-margins">
+ <div class="ibox-content">
+ <div class="form-horizontal">
+
+ <div class="row">
+ <div class="col-sm-6 b-r">
+ <#input id="id" name="主键ID" underline="true"/>
+ <#input id="insertTime" name="提交时间" underline="true"/>
+ <#input id="userId" name="用户ID" underline="true"/>
+ <#input id="useTime" name="用车时间" underline="true"/>
+ <#input id="useDuration" name="用车时长"/>
+ </div>
+
+ <div class="col-sm-6">
+ <#input id="useDemand" name="用车需求" underline="true"/>
+ <#input id="contactName" name="联系人" underline="true"/>
+ <#input id="contactPhone" name="联系电话" underline="true"/>
+ <#input id="remark" name="处理备注" underline="true"/>
+ <#input id="state" name="状态 1=未处理 2=已处理 3=已删除" underline="true"/>
+ </div>
+ </div>
+
+ <div class="row btn-group-m-t">
+ <div class="col-sm-10">
+ <#button btnCss="info" name="提交" id="ensure" icon="fa-check" clickFun="TOrderCharterInfoDlg.addSubmit()"/>
+ <#button btnCss="danger" name="取消" id="cancel" icon="fa-eraser" clickFun="TOrderCharterInfoDlg.close()"/>
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/tOrderCharter/tOrderCharter_info.js"></script>
+@}
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderCharter/tOrderCharter_edit.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderCharter/tOrderCharter_edit.html
new file mode 100644
index 0000000..1d8eecb
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderCharter/tOrderCharter_edit.html
@@ -0,0 +1,35 @@
+@layout("/common/_container.html"){
+<div class="ibox float-e-margins">
+ <div class="ibox-content">
+ <div class="form-horizontal">
+
+ <div class="row">
+ <div class="col-sm-6 b-r">
+ <#input id="id" name="主键ID" value="${item.id}" underline="true"/>
+ <#input id="insertTime" name="提交时间" value="${item.insertTime}" underline="true"/>
+ <#input id="userId" name="用户ID" value="${item.userId}" underline="true"/>
+ <#input id="useTime" name="用车时间" value="${item.useTime}" underline="true"/>
+ <#input id="useDuration" name="用车时长" value="${item.useDuration}" />
+ </div>
+
+ <div class="col-sm-6">
+ <#input id="useDemand" name="用车需求" value="${item.useDemand}" underline="true"/>
+ <#input id="contactName" name="联系人" value="${item.contactName}" underline="true"/>
+ <#input id="contactPhone" name="联系电话" value="${item.contactPhone}" underline="true"/>
+ <#input id="remark" name="处理备注" value="${item.remark}" underline="true"/>
+ <#input id="state" name="状态 1=未处理 2=已处理 3=已删除" value="${item.state}" />
+ </div>
+ </div>
+
+ <div class="row btn-group-m-t">
+ <div class="col-sm-10">
+ <#button btnCss="info" name="提交" id="ensure" icon="fa-check" clickFun="TOrderCharterInfoDlg.editSubmit()"/>
+ <#button btnCss="danger" name="取消" id="cancel" icon="fa-eraser" clickFun="TOrderCharterInfoDlg.close()"/>
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/tOrderCharter/tOrderCharter_info.js"></script>
+@}
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderCharter/tOrderCharter_immediately.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderCharter/tOrderCharter_immediately.html
new file mode 100644
index 0000000..3abd254
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderCharter/tOrderCharter_immediately.html
@@ -0,0 +1,28 @@
+@layout("/common/_container.html"){
+<div class="ibox float-e-margins">
+ <div class="ibox-content">
+ <div class="form-horizontal" id="orderCharterInfoForm">
+ <input type="hidden" id="id" name="id" value="${id}">
+ <div class="row">
+ <div class="col-sm-11">
+ <div class="form-group">
+ <label class="col-sm-3 control-label">处理备注：</label>
+ <div class="col-sm-9">
+ <textarea type="text/plain" class="form-control" name="remark" id="remark" style="width:100%;height:150px;" placeholder="多行输入"></textarea>
+ </div>
+ </div>
+ </div>
+ </div>
+
+ <div class="row btn-group-m-t">
+ <div class="col-sm-10 col-sm-offset-5">
+ <#button btnCss="info" name="提交" id="ensure" icon="fa-check" clickFun="TOrderCharterInfoDlg.immediately()"/>
+ <#button btnCss="danger" name="取消" id="cancel" icon="fa-eraser" clickFun="TOrderCharterInfoDlg.close()"/>
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/tOrderCharter/tOrderCharter_info.js"></script>
+@}
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderCharteredCar/tOrderCharteredCar.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderCharteredCar/tOrderCharteredCar.html
new file mode 100644
index 0000000..533d084
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderCharteredCar/tOrderCharteredCar.html
@@ -0,0 +1,61 @@
+@layout("/common/_container.html"){
+<div class="row">
+ <div class="col-sm-12">
+ <div class="ibox float-e-margins">
+ <div class="ibox-title">
+ <h5>旅游包车订单管理</h5>
+ </div>
+ <div class="ibox-content">
+ <div class="row row-lg">
+ <div class="col-sm-12">
+ <div class="row">
+ <div class="col-sm-3">
+ <#TimeCon id="insertTime" name="提交时间" isTime="false"/>
+ </div>
+ <div class="col-sm-3">
+ <#NameCon id="userName" name="提交用户" />
+ </div>
+ <div class="col-sm-3">
+ <#NameCon id="contactPerson" name="联系人" />
+ </div>
+ <div class="col-sm-3">
+ <#NameCon id="contactPhone" name="联系电话" />
+ </div>
+ <div class="col-sm-3">
+ <#NameCon id="modelUse" name="用车需求" />
+ </div>
+ <div class="col-sm-3">
+ <#SelectCon id="state" name="状态" >
+ <option value="">全部</option>
+ <option value="1">待处理</option>
+ <option value="2">已处理</option>
+ </#SelectCon>
+ </div>
+ <div class="col-sm-3">
+ <#button name="搜索" icon="fa-search" clickFun="TOrderCharteredCar.search()"/>
+ <#button name="重置" icon="fa-trash" clickFun="TOrderCharter.resetSearch()" space="true"/>
+ </div>
+ </div>
+ <div class="hidden-xs" id="TOrderCharteredCarTableToolbar" role="group">
+ @if(shiro.hasPermission("/tOrderCharteredCar/immediately")){
+ <#button name="立即处理" icon="fa-edit" clickFun="TOrderCharteredCar.immediately()"/>
+ @}
+ @if(shiro.hasPermission("/tOrderCharteredCar/delete")){
+ <#button name="删除记录" icon="fa-remove" clickFun="TOrderCharteredCar.delete()" space="true"/>
+ @}
+ </div>
+ <#table id="TOrderCharteredCarTable"/>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/tOrderCharteredCar/tOrderCharteredCar.js"></script>
+<script>
+ laydate.render({
+ elem: '#insertTime'
+ ,range: true
+ });
+</script>
+@}
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderCharteredCar/tOrderCharteredCar_add.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderCharteredCar/tOrderCharteredCar_add.html
new file mode 100644
index 0000000..0e5eedd
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderCharteredCar/tOrderCharteredCar_add.html
@@ -0,0 +1,40 @@
+@layout("/common/_container.html"){
+<div class="ibox float-e-margins">
+ <div class="ibox-content">
+ <div class="form-horizontal">
+
+ <div class="row">
+ <div class="col-sm-6 b-r">
+ <#input id="id" name="" underline="true"/>
+ <#input id="userId" name="用户id" underline="true"/>
+ <#input id="companyId" name="企业id" underline="true"/>
+ <#input id="orderNumber" name="订单编号" underline="true"/>
+ <#input id="traveltime" name="出行时间" underline="true"/>
+ <#input id="carTime" name="用车时长（天）" underline="true"/>
+ <#input id="serverCarModelId" name="服务车型id" underline="true"/>
+ <#input id="modelUse" name="车型用途"/>
+ </div>
+
+ <div class="col-sm-6">
+ <#input id="peopleNumber" name="乘车人数" underline="true"/>
+ <#input id="contactPerson" name="联系人" underline="true"/>
+ <#input id="contactPhone" name="联系电话" underline="true"/>
+ <#input id="state" name="订单状态（1=待处理，2=已处理）" underline="true"/>
+ <#input id="remark" name="处理备注" underline="true"/>
+ <#input id="isDelete" name="删除状态（1=否，2=是）" underline="true"/>
+ <#input id="insertTime" name="添加时间" underline="true"/>
+ </div>
+ </div>
+
+ <div class="row btn-group-m-t">
+ <div class="col-sm-10">
+ <#button btnCss="info" name="提交" id="ensure" icon="fa-check" clickFun="TOrderCharteredCarInfoDlg.addSubmit()"/>
+ <#button btnCss="danger" name="取消" id="cancel" icon="fa-eraser" clickFun="TOrderCharteredCarInfoDlg.close()"/>
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/tOrderCharteredCar/tOrderCharteredCar_info.js"></script>
+@}
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderCharteredCar/tOrderCharteredCar_edit.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderCharteredCar/tOrderCharteredCar_edit.html
new file mode 100644
index 0000000..fa6e2a4
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderCharteredCar/tOrderCharteredCar_edit.html
@@ -0,0 +1,40 @@
+@layout("/common/_container.html"){
+<div class="ibox float-e-margins">
+ <div class="ibox-content">
+ <div class="form-horizontal">
+
+ <div class="row">
+ <div class="col-sm-6 b-r">
+ <#input id="id" name="" value="${item.id}" underline="true"/>
+ <#input id="userId" name="用户id" value="${item.userId}" underline="true"/>
+ <#input id="companyId" name="企业id" value="${item.companyId}" underline="true"/>
+ <#input id="orderNumber" name="订单编号" value="${item.orderNumber}" underline="true"/>
+ <#input id="traveltime" name="出行时间" value="${item.traveltime}" underline="true"/>
+ <#input id="carTime" name="用车时长（天）" value="${item.carTime}" underline="true"/>
+ <#input id="serverCarModelId" name="服务车型id" value="${item.serverCarModelId}" underline="true"/>
+ <#input id="modelUse" name="车型用途" value="${item.modelUse}" />
+ </div>
+
+ <div class="col-sm-6">
+ <#input id="peopleNumber" name="乘车人数" value="${item.peopleNumber}" underline="true"/>
+ <#input id="contactPerson" name="联系人" value="${item.contactPerson}" underline="true"/>
+ <#input id="contactPhone" name="联系电话" value="${item.contactPhone}" underline="true"/>
+ <#input id="state" name="订单状态（1=待处理，2=已处理）" value="${item.state}" underline="true"/>
+ <#input id="remark" name="处理备注" value="${item.remark}" underline="true"/>
+ <#input id="isDelete" name="删除状态（1=否，2=是）" value="${item.isDelete}" underline="true"/>
+ <#input id="insertTime" name="添加时间" value="${item.insertTime}" />
+ </div>
+ </div>
+
+ <div class="row btn-group-m-t">
+ <div class="col-sm-10">
+ <#button btnCss="info" name="提交" id="ensure" icon="fa-check" clickFun="TOrderCharteredCarInfoDlg.editSubmit()"/>
+ <#button btnCss="danger" name="取消" id="cancel" icon="fa-eraser" clickFun="TOrderCharteredCarInfoDlg.close()"/>
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/tOrderCharteredCar/tOrderCharteredCar_info.js"></script>
+@}
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderCharteredCar/tOrderCharteredCar_immediately.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderCharteredCar/tOrderCharteredCar_immediately.html
new file mode 100644
index 0000000..18978c9
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderCharteredCar/tOrderCharteredCar_immediately.html
@@ -0,0 +1,28 @@
+@layout("/common/_container.html"){
+<div class="ibox float-e-margins">
+ <div class="ibox-content">
+ <div class="form-horizontal" id="orderCharterCarInfoForm">
+ <input type="hidden" id="id" name="id" value="${id}">
+ <div class="row">
+ <div class="col-sm-11">
+ <div class="form-group">
+ <label class="col-sm-3 control-label">处理备注：</label>
+ <div class="col-sm-9">
+ <textarea type="text/plain" class="form-control" name="remark" id="remark" style="width:100%;height:150px;" placeholder="多行输入"></textarea>
+ </div>
+ </div>
+ </div>
+ </div>
+
+ <div class="row btn-group-m-t">
+ <div class="col-sm-10 col-sm-offset-5">
+ <#button btnCss="info" name="提交" id="ensure" icon="fa-check" clickFun="TOrderCharteredCarInfoDlg.immediately()"/>
+ <#button btnCss="danger" name="取消" id="cancel" icon="fa-eraser" clickFun="TOrderCharteredCarInfoDlg.close()"/>
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/tOrderCharteredCar/tOrderCharteredCar_info.js"></script>
+@}
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderCrossCity/tOrderCrossCity.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderCrossCity/tOrderCrossCity.html
new file mode 100644
index 0000000..e3a09d2
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderCrossCity/tOrderCrossCity.html
@@ -0,0 +1,109 @@
+@layout("/common/_container.html"){
+<div class="row">
+ <div class="col-sm-12">
+ <div class="ibox float-e-margins">
+ <div class="ibox-title">
+ <h5>跨城出行订单管理</h5>
+ </div>
+ <div class="ibox-content">
+ <div class="row row-lg">
+ <div class="col-sm-12">
+ <div class="row">
+ <div class="col-sm-3">
+ <#TimeCon id="insertTime" name="订单时间" isTime="false"/>
+ </div>
+ <div class="col-sm-3">
+ <#NameCon id="orderNum" name="订单编号" />
+ </div>
+ <div class="col-sm-3">
+ <#SelectCon id="orderSource" name="订单来源" >
+ <option value="">全部</option>
+ <option value="1">APP下单</option>
+ <option value="2">扫码下单</option>
+ <option value="3">小程序下单</option>
+ <option value="4">司机下单</option>
+ <option value="5">调度下单</option>
+ </#SelectCon>
+ </div>
+ <div class="col-sm-3">
+ <#NameCon id="userName" name="下单用户昵称" />
+ </div>
+ <div class="col-sm-3">
+ <#NameCon id="userPhone" name="下单用户手机" />
+ </div>
+ <div class="col-sm-3">
+ <#NameCon id="passengers" name="乘车用户姓名" />
+ </div>
+ <div class="col-sm-3">
+ <#NameCon id="passengersPhone" name="乘车用户手机" />
+ </div>
+ <div class="col-sm-3">
+ <#SelectCon id="serverCarModelId" name="车型" >
+ <option value="">全部</option>
+ @for(obj in carmodelList){
+ <option value="${obj.id}">${obj.name}</option>
+ @}
+ </#SelectCon>
+ </div>
+ <div class="col-sm-3">
+ <#NameCon id="driver" name="接单司机" />
+ </div>
+ <div class="col-sm-3">
+ <#SelectCon id="lineId" name="线路" >
+ <option value="">全部</option>
+ @for(obj in lineList){
+ <option value="${obj.id}">${obj.name}</option>
+ @}
+ </#SelectCon>
+ </div>
+ <div class="col-sm-3">
+ <#SelectCon id="state" name="状态" >
+ <option value="">全部</option>
+ <option value="1">待接单</option>
+ <option value="2">待出发</option>
+ <option value="3">待到达预约地点</option>
+ <option value="4">待乘客上车</option>
+ <option value="5">服务中</option>
+ <option value="6">完成服务</option>
+ <option value="7">待支付</option>
+ <option value="8">待评价</option>
+ <option value="9">已完成</option>
+ <option value="10">已取消</option>
+ <option value="11">改派中</option>
+ <option value="12">取消待支付</option>
+ </#SelectCon>
+ </div>
+ <div class="col-sm-3">
+ <#button name="搜索" icon="fa-search" clickFun="TOrderCrossCity.search()"/>
+ <#button name="重置" icon="fa-trash" clickFun="TOrderCrossCity.resetSearch()" space="true"/>
+ </div>
+ </div>
+ <div class="hidden-xs" id="TOrderCrossCityTableToolbar" role="group">
+ @if(shiro.hasPermission("/tOrderCrossCity/detail")){
+ <#button name="订单详情" icon="fa-plus" clickFun="TOrderCrossCity.detail()"/>
+ @}
+ @if(shiro.hasPermission("/tOrderCrossCity/cancel")){
+ <#button name="取消订单" icon="fa-edit" clickFun="TOrderCrossCity.cancel()" space="true"/>
+ @}
+ @if(shiro.hasPermission("/tOrderCrossCity/track")){
+ <#button name="订单轨迹" icon="fa-remove" clickFun="TOrderCrossCity.track()" space="true"/>
+ @}
+ @if(shiro.hasPermission("/tOrderCrossCity/delete")){
+ <#button name="删除记录" icon="fa-remove" clickFun="TOrderCrossCity.delete()" space="true"/>
+ @}
+ </div>
+ <#table id="TOrderCrossCityTable"/>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/tOrderCrossCity/tOrderCrossCity.js"></script>
+<script>
+ laydate.render({
+ elem: '#insertTime'
+ ,range: true
+ });
+</script>
+@}
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderCrossCity/tOrderCrossCity_detail.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderCrossCity/tOrderCrossCity_detail.html
new file mode 100644
index 0000000..991ca55
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderCrossCity/tOrderCrossCity_detail.html
@@ -0,0 +1,107 @@
+@layout("/common/_container.html"){
+<style type="text/css">
+ html, body, #container {
+ height: 100%;
+ width: 100%;
+ }
+
+ .input-card .btn{
+ margin-right: 1.2rem;
+ width: 9rem;
+ }
+
+ .input-card .btn:last-child{
+ margin-right: 0;
+ }
+</style>
+<div class="ibox float-e-margins">
+ <div class="ibox-content">
+ <div class="form-horizontal">
+ <input type="hidden" id="id" name="id" value="${item.id}">
+ <div class="row" style="margin-top: 30px;">
+ <div class="col-sm-4">
+ <h2 class="h3Class" style="font-weight: 700;">订单详情</h2>
+ </div>
+ </div>
+ <div class="row">
+ <div class="col-sm-6 b-r">
+ <#label id="insertTimeStr" name="下单时间" value="${item.insertTimeStr}"/>
+ <#label id="orderSourceStr" name="订单来源" value="${item.orderSourceStr}"/>
+ <#label id="userName" name="下单用户昵称" value="${item.userName}"/>
+ <#label id="passengers" name="乘车用户昵称" value="${item.passengers}"/>
+ <#label id="placementAddress" name="起点" value="${item.startAddress}"/>
+ <#label id="driver" name="接单司机" value="${item.driver}"/>
+ <#label id="car" name="接单车辆" value="${item.car}"/>
+ <#label id="boardingAddress" name="上车地点" value="${item.boardingAddress}"/>
+ <#label id="getoffAddress" name="下车地点" value="${item.getoffAddress}"/>
+ <#label id="serverCarModel" name="选择车型" value="${item.serverCarModel}"/>
+ </div>
+
+ <div class="col-sm-6">
+ <#label id="orderNum" name="订单编号" value="${item.orderNum}"/>
+ <#label id="travelTimeStr" name="乘车时间" value="${item.travelTimeStr}"/>
+ <#label id="userPhone" name="下单用户手机号" value="${item.userPhone}"/>
+ <#label id="passengersPhone" name="乘车用户手机号" value="${item.passengersPhone}"/>
+ <#label id="endAddress" name="终点" value="${item.endAddress}"/>
+ <#label id="companyName" name="车辆所属机构" value="${item.companyName}"/>
+ <#label id="boardingTimeStr" name="上车时间" value="${item.boardingTimeStr}"/>
+ <#label id="getoffTimeStr" name="下车时间" value="${item.getoffTimeStr}"/>
+ <#label id="lineName" name="线路" value="${item.lineName}"/>
+ </div>
+ </div>
+
+ <div class="row" style="margin-top: 30px;">
+ <div class="col-sm-4">
+ <h2 class="h3Class" style="font-weight: 700;">费用明细</h2>
+ </div>
+ </div>
+ <div class="row">
+ @if(isNotEmpty(item.orderMoney) && item.orderMoney > 0){
+ <div class="col-sm-6 b-r">
+ <#label id="orderMoney" name="订单总价" value="${item.orderMoney}元"/>
+ <#label id="couponMoney" name="优惠券抵扣费用" value="${item.couponMoney}元"/>
+ </div>
+ <div class="col-sm-6">
+ @if(isNotEmpty(item.payMoney)){
+ <#label id="payMoney" name="实际支付费用" value="${item.payMoney}元"/>
+ @}else{
+ <#label id="payMoney" name="实际支付费用" value="0.00元"/>
+ @}
+ <#label id="payTypeStr" name="支付方式" value="${item.payTypeStr}"/>
+ </div>
+ @}else{
+ <h4 style="margin-left: 10%">暂无费用明细</h4>
+ @}
+ </div>
+
+ <div class="row" style="margin-top: 30px;">
+ <div class="col-sm-4">
+ <h2 class="h3Class" style="font-weight: 700;">线路轨迹</h2>
+ </div>
+ </div>
+ <div class="row">
+ <div class="col-sm-10">
+ <div class="form-horizontal" id="container" style="margin-left: 50px;width: 100%; height: 500px;"></div>
+ <div class="input-card" style="margin-left: 50px;">
+ <h4>轨迹回放控制</h4>
+ <div class="input-item">
+ <input type="button" class="btn" value="开始动画" id="start" onclick="startAnimation()"/>
+ <input type="button" class="btn" value="暂停动画" id="pause" onclick="pauseAnimation()"/>
+ <input type="button" class="btn" value="继续动画" id="resume" onclick="resumeAnimation()"/>
+ <input type="button" class="btn" value="停止动画" id="stop" onclick="stopAnimation()"/>
+ </div>
+ <div class="input-item">
+
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+<script src="https://a.amap.com/jsapi_demos/static/demo-center/js/demoutils.js"></script>
+<script src="https://webapi.amap.com/maps?v=1.4.8&key=e17d799b2506d05faf7f88320a266803"></script>
+<script src="https://cache.amap.com/lbs/static/addToolbar.js"></script>
+<script src="${ctxPath}/static/modular/system/tOrderCrossCity/tOrderCrossCity_info.js"></script>
+@}
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderCrossCity/tOrderCrossCity_track.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderCrossCity/tOrderCrossCity_track.html
new file mode 100644
index 0000000..f749bb9
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderCrossCity/tOrderCrossCity_track.html
@@ -0,0 +1,52 @@
+@layout("/common/_container.html"){
+<style type="text/css">
+ html, body, #container {
+ height: 100%;
+ width: 100%;
+ }
+
+ .input-card .btn{
+ margin-right: 1.2rem;
+ width: 9rem;
+ }
+
+ .input-card .btn:last-child{
+ margin-right: 0;
+ }
+</style>
+<div class="ibox float-e-margins">
+ <div class="ibox-content">
+ <div class="form-horizontal">
+ <input type="hidden" id="id" name="id" value="${tOrderCrossCityId}">
+ <div class="row" style="margin-top: 30px;">
+ <div class="col-sm-4">
+ <h2 class="h3Class" style="font-weight: 700;">线路轨迹</h2>
+ </div>
+ </div>
+ <div class="row" style="margin-top: 30px;">
+ <div class="col-sm-10">
+ <div class="form-horizontal" id="container" style="margin-left: 50px;width: 100%; height: 500px;"></div>
+ <div class="input-card" style="margin-left: 50px;">
+ <h4>轨迹回放控制</h4>
+ <div class="input-item">
+ <input type="button" class="btn" value="开始动画" id="start" onclick="startAnimation()"/>
+ <input type="button" class="btn" value="暂停动画" id="pause" onclick="pauseAnimation()"/>
+ <input type="button" class="btn" value="继续动画" id="resume" onclick="resumeAnimation()"/>
+ <input type="button" class="btn" value="停止动画" id="stop" onclick="stopAnimation()"/>
+ </div>
+ <div class="input-item">
+
+ </div>
+ </div>
+ </div>
+ </div>
+
+ </div>
+
+ </div>
+</div>
+<script src="https://a.amap.com/jsapi_demos/static/demo-center/js/demoutils.js"></script>
+<script src="https://webapi.amap.com/maps?v=1.4.8&key=e17d799b2506d05faf7f88320a266803"></script>
+<script src="https://cache.amap.com/lbs/static/addToolbar.js"></script>
+<script src="${ctxPath}/static/modular/system/tOrderCrossCity/tOrderCrossCity_info.js"></script>
+@}
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderEvaluate/tOrderEvaluate.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderEvaluate/tOrderEvaluate.html
new file mode 100644
index 0000000..4f9968a
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderEvaluate/tOrderEvaluate.html
@@ -0,0 +1,71 @@
+@layout("/common/_container.html"){
+<div class="row">
+ <div class="col-sm-12">
+ <div class="ibox float-e-margins">
+ <div class="ibox-title">
+ <h5>评价列表管理</h5>
+ </div>
+ <div class="ibox-content">
+ <div class="row row-lg">
+ <div class="col-sm-12">
+ <div class="row">
+ <div class="col-sm-3">
+ <#TimeCon id="insertTime" name="评论时间" isTime="false"/>
+ </div>
+ <div class="col-sm-3">
+ <#NameCon id="userName" name="评论用户" />
+ </div>
+ <div class="col-sm-3">
+ <#NameCon id="userPhone" name="评论用户手机号" />
+ </div>
+ <div class="col-sm-3">
+ <#NameCon id="driverName" name="评论司机" />
+ </div>
+ <div class="col-sm-3">
+ <#NameCon id="driverPhone" name="评论司机手机号" />
+ </div>
+ <div class="col-sm-3">
+ <#NameCon id="fraction" name="评分分数" />
+ </div>
+ <div class="col-sm-3">
+ <#SelectCon id="orderType" name="订单类型" >
+ <option value="">全部</option>
+ <option value="1">专车</option>
+ <option value="2">出租车</option>
+ <option value="3">跨城出行</option>
+ <option value="4">跨城小件物流</option>
+ <option value="5">同城小件物流</option>
+ <option value="6">包车</option>
+ </#SelectCon>
+ </div>
+ <div class="col-sm-3">
+ <#button name="搜索" icon="fa-search" clickFun="TOrderEvaluate.search()"/>
+ <#button name="重置" icon="fa-trash" clickFun="TOrderEvaluate.resetSearch()" space="true"/>
+ </div>
+ </div>
+ <div class="hidden-xs" id="TOrderEvaluateTableToolbar" role="group">
+ @if(shiro.hasPermission("/tOrderEvaluate/add")){
+ <#button name="添加" icon="fa-plus" clickFun="TOrderEvaluate.openAddTOrderEvaluate()"/>
+ @}
+ @if(shiro.hasPermission("/tOrderEvaluate/update")){
+ <#button name="修改" icon="fa-edit" clickFun="TOrderEvaluate.openTOrderEvaluateDetail()" space="true"/>
+ @}
+ @if(shiro.hasPermission("/tOrderEvaluate/delete")){
+ <#button name="删除" icon="fa-remove" clickFun="TOrderEvaluate.delete()" space="true"/>
+ @}
+ </div>
+ <#table id="TOrderEvaluateTable"/>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/tOrderEvaluate/tOrderEvaluate.js"></script>
+<script>
+ laydate.render({
+ elem: '#insertTime'
+ ,range: true
+ });
+</script>
+@}
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderEvaluate/tOrderEvaluate_add.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderEvaluate/tOrderEvaluate_add.html
new file mode 100644
index 0000000..7506902
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderEvaluate/tOrderEvaluate_add.html
@@ -0,0 +1,33 @@
+@layout("/common/_container.html"){
+<div class="ibox float-e-margins">
+ <div class="ibox-content">
+ <div class="form-horizontal">
+
+ <div class="row">
+ <div class="col-sm-6 b-r">
+ <#input id="id" name="" underline="true"/>
+ <#input id="orderId" name="订单id" underline="true"/>
+ <#input id="driverId" name="司机id" underline="true"/>
+ <#input id="orderType" name="1=专车，2=出租车，3=跨城出行，4=跨城小件物流，5=同城小件物流，6=包车"/>
+ </div>
+
+ <div class="col-sm-6">
+ <#input id="fraction" name="评分 0-5" underline="true"/>
+ <#input id="content" name="评价内容" underline="true"/>
+ <#input id="insertTime" name="评价时间" underline="true"/>
+ <#input id="userId" name="评价用户ID" underline="true"/>
+ </div>
+ </div>
+
+ <div class="row btn-group-m-t">
+ <div class="col-sm-10">
+ <#button btnCss="info" name="提交" id="ensure" icon="fa-check" clickFun="TOrderEvaluateInfoDlg.addSubmit()"/>
+ <#button btnCss="danger" name="取消" id="cancel" icon="fa-eraser" clickFun="TOrderEvaluateInfoDlg.close()"/>
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/tOrderEvaluate/tOrderEvaluate_info.js"></script>
+@}
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderEvaluate/tOrderEvaluate_edit.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderEvaluate/tOrderEvaluate_edit.html
new file mode 100644
index 0000000..28b8bb2
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderEvaluate/tOrderEvaluate_edit.html
@@ -0,0 +1,33 @@
+@layout("/common/_container.html"){
+<div class="ibox float-e-margins">
+ <div class="ibox-content">
+ <div class="form-horizontal">
+
+ <div class="row">
+ <div class="col-sm-6 b-r">
+ <#input id="id" name="" value="${item.id}" underline="true"/>
+ <#input id="orderId" name="订单id" value="${item.orderId}" underline="true"/>
+ <#input id="driverId" name="司机id" value="${item.driverId}" underline="true"/>
+ <#input id="orderType" name="1=专车，2=出租车，3=跨城出行，4=跨城小件物流，5=同城小件物流，6=包车" value="${item.orderType}" />
+ </div>
+
+ <div class="col-sm-6">
+ <#input id="fraction" name="评分 0-5" value="${item.fraction}" underline="true"/>
+ <#input id="content" name="评价内容" value="${item.content}" underline="true"/>
+ <#input id="insertTime" name="评价时间" value="${item.insertTime}" underline="true"/>
+ <#input id="userId" name="评价用户ID" value="${item.userId}" />
+ </div>
+ </div>
+
+ <div class="row btn-group-m-t">
+ <div class="col-sm-10">
+ <#button btnCss="info" name="提交" id="ensure" icon="fa-check" clickFun="TOrderEvaluateInfoDlg.editSubmit()"/>
+ <#button btnCss="danger" name="取消" id="cancel" icon="fa-eraser" clickFun="TOrderEvaluateInfoDlg.close()"/>
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/tOrderEvaluate/tOrderEvaluate_info.js"></script>
+@}
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderLogistics/tOrderLogistics.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderLogistics/tOrderLogistics.html
new file mode 100644
index 0000000..047e4a8
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderLogistics/tOrderLogistics.html
@@ -0,0 +1,94 @@
+@layout("/common/_container.html"){
+<div class="row">
+ <div class="col-sm-12">
+ <div class="ibox float-e-margins">
+ <div class="ibox-title">
+ <h5>小件物流订单管理</h5>
+ </div>
+ <div class="ibox-content">
+ <div class="row row-lg">
+ <div class="col-sm-12">
+ <div class="row">
+ <div class="col-sm-3">
+ <#TimeCon id="insertTime" name="订单时间" isTime="false"/>
+ </div>
+ <div class="col-sm-3">
+ <#NameCon id="orderNum" name="订单编号" />
+ </div>
+ <div class="col-sm-3">
+ <#SelectCon id="type" name="订单类型" >
+ <option value="">全部</option>
+ <option value="4">同城物流</option>
+ <option value="5">跨城物流</option>
+ </#SelectCon>
+ </div>
+ <div class="col-sm-3">
+ <#SelectCon id="orderSource" name="订单来源" >
+ <option value="">全部</option>
+ <option value="1">APP下单</option>
+ <option value="2">扫码下单</option>
+ <option value="3">小程序下单</option>
+ <option value="4">司机下单</option>
+ <option value="5">调度下单</option>
+ </#SelectCon>
+ </div>
+ <div class="col-sm-3">
+ <#NameCon id="userName" name="下单用户昵称" />
+ </div>
+ <div class="col-sm-3">
+ <#NameCon id="userPhone" name="下单用户手机" />
+ </div>
+ <div class="col-sm-3">
+ <#NameCon id="recipient" name="收货人姓名" />
+ </div>
+ <div class="col-sm-3">
+ <#NameCon id="recipientPhone" name="收货人手机" />
+ </div>
+ <div class="col-sm-3">
+ <#NameCon id="driver" name="接单司机" />
+ </div>
+ <div class="col-sm-3">
+ <#SelectCon id="state" name="状态" >
+ <option value="">全部</option>
+ <option value="1">待接单</option>
+ <option value="2">待出发</option>
+ <option value="3">待到达预约地点</option>
+ <option value="4">待取货</option>
+ <option value="5">服务中</option>
+ <option value="6">完成服务</option>
+ <option value="7">待支付</option>
+ <option value="9">已完成</option>
+ <option value="10">已取消</option>
+ </#SelectCon>
+ </div>
+ <div class="col-sm-3">
+ <#button name="搜索" icon="fa-search" clickFun="TOrderLogistics.search()"/>
+ <#button name="重置" icon="fa-trash" clickFun="TOrderLogistics.resetSearch()" space="true"/>
+ </div>
+ </div>
+ <div class="hidden-xs" id="TOrderLogisticsTableToolbar" role="group">
+ @if(shiro.hasPermission("/tOrderLogistics/detail")){
+ <#button name="订单详情" icon="fa-plus" clickFun="TOrderLogistics.detail()"/>
+ @}
+ @if(shiro.hasPermission("/tOrderLogistics/cancel")){
+ <#button name="取消订单" icon="fa-edit" clickFun="TOrderLogistics.cancel()" space="true"/>
+ @}
+ @if(shiro.hasPermission("/tOrderLogistics/delete")){
+ <#button name="删除记录" icon="fa-remove" clickFun="TOrderLogistics.delete()" space="true"/>
+ @}
+ </div>
+ <#table id="TOrderLogisticsTable"/>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/tOrderLogistics/tOrderLogistics.js"></script>
+<script>
+ laydate.render({
+ elem: '#insertTime'
+ ,range: true
+ });
+</script>
+@}
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderLogistics/tOrderLogistics_add.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderLogistics/tOrderLogistics_add.html
new file mode 100644
index 0000000..c033fa7
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderLogistics/tOrderLogistics_add.html
@@ -0,0 +1,82 @@
+@layout("/common/_container.html"){
+<div class="ibox float-e-margins">
+ <div class="ibox-content">
+ <div class="form-horizontal">
+
+ <div class="row">
+ <div class="col-sm-6 b-r">
+ <#input id="id" name="主键id" underline="true"/>
+ <#input id="type" name="订单类型（4=同城物流，5=跨城物流）" underline="true"/>
+ <#input id="userId" name="用户id" underline="true"/>
+ <#input id="driverId" name="接单司机ID" underline="true"/>
+ <#input id="carId" name="车辆id" underline="true"/>
+ <#input id="orderNum" name="订单号" underline="true"/>
+ <#input id="cargoType" name="货物类型（1=普通货物，2=贵重货物）" underline="true"/>
+ <#input id="cargoNumber" name="货物数量" underline="true"/>
+ <#input id="remark" name="备注" underline="true"/>
+ <#input id="placementLon" name="下单地点经度" underline="true"/>
+ <#input id="placementLat" name="下单地点纬度" underline="true"/>
+ <#input id="placementAddress" name="下单地点" underline="true"/>
+ <#input id="startLon" name="出发地经度值" underline="true"/>
+ <#input id="startLat" name="出发地纬度值" underline="true"/>
+ <#input id="startAddress" name="出发地地点" underline="true"/>
+ <#input id="endLon" name="目的地经度" underline="true"/>
+ <#input id="endLat" name="目的地纬度" underline="true"/>
+ <#input id="endAddress" name="目的地地点" underline="true"/>
+ <#input id="recipient" name="收件人姓名" underline="true"/>
+ <#input id="recipientPhone" name="收件人电话" underline="true"/>
+ <#input id="boardingLon" name="上车点经度" underline="true"/>
+ <#input id="boardingLat" name="上车点纬度" underline="true"/>
+ <#input id="boardingAddress" name="上车点" underline="true"/>
+ <#input id="boardingTime" name="上车时间" underline="true"/>
+ <#input id="getoffLon" name="下车点经度" underline="true"/>
+ <#input id="getoffLat" name="下车点纬度" underline="true"/>
+ <#input id="getoffAddress" name="下车地点" underline="true"/>
+ <#input id="getoffTime" name="下车时间" underline="true"/>
+ <#input id="mileage" name="行驶里程数（米）"/>
+ </div>
+
+ <div class="col-sm-6">
+ <#input id="payManner" name="支付方式（1=OK平台支付，2=其他方式支付）" underline="true"/>
+ <#input id="payType" name="支付方式(1=微信，2=支付宝，3=其他)" underline="true"/>
+ <#input id="orderMoney" name="订单金额" underline="true"/>
+ <#input id="travelMoney" name="行程费" underline="true"/>
+ <#input id="tipMoney" name="小费" underline="true"/>
+ <#input id="redPacketMoney" name="红包抵扣金额" underline="true"/>
+ <#input id="couponMoney" name="优惠券抵扣金额" underline="true"/>
+ <#input id="redPacketId" name="红包记录id" underline="true"/>
+ <#input id="couponId" name="优惠券id" underline="true"/>
+ <#input id="discount" name="折扣" underline="true"/>
+ <#input id="discountMoney" name="折扣优惠金额" underline="true"/>
+ <#input id="activityId" name="折扣活动id" underline="true"/>
+ <#input id="companyId" name="公司id" underline="true"/>
+ <#input id="payMoney" name="支付金额" underline="true"/>
+ <#input id="state" name="状态(1=待接单，2=待出发，3=待到达预约地点，4=待取货，5=服务中，6=完成服务，7=待支付，9=已完成，10=已取消)" underline="true"/>
+ <#input id="insertTime" name="下单时间" underline="true"/>
+ <#input id="travelTime" name="出行时间" underline="true"/>
+ <#input id="snatchOrderTime" name="抢单时间" underline="true"/>
+ <#input id="setOutTime" name="司机点出发时间" underline="true"/>
+ <#input id="arriveTime" name="司机到达预约地点时间" underline="true"/>
+ <#input id="startServiceTime" name="开始服务时间" underline="true"/>
+ <#input id="endServiceTime" name="结束服务时间" underline="true"/>
+ <#input id="orderSource" name="下单方式（1：APP下单，2：扫码下单，3：小程序下单，4：司机下单，5：调度下单）" underline="true"/>
+ <#input id="invoiceId" name="发票id" underline="true"/>
+ <#input id="trackId" name="高德猎鹰上的轨迹id" underline="true"/>
+ <#input id="isDelete" name="是否删除 1=否 2=是" underline="true"/>
+ <#input id="telX" name="移动小号" underline="true"/>
+ <#input id="bindId" name="移动小号绑定关系id" underline="true"/>
+ </div>
+ </div>
+
+ <div class="row btn-group-m-t">
+ <div class="col-sm-10">
+ <#button btnCss="info" name="提交" id="ensure" icon="fa-check" clickFun="TOrderLogisticsInfoDlg.addSubmit()"/>
+ <#button btnCss="danger" name="取消" id="cancel" icon="fa-eraser" clickFun="TOrderLogisticsInfoDlg.close()"/>
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/tOrderLogistics/tOrderLogistics_info.js"></script>
+@}
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderLogistics/tOrderLogistics_detail.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderLogistics/tOrderLogistics_detail.html
new file mode 100644
index 0000000..b6cb775
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderLogistics/tOrderLogistics_detail.html
@@ -0,0 +1,63 @@
+@layout("/common/_container.html"){
+<div class="ibox float-e-margins">
+ <div class="ibox-content">
+ <div class="form-horizontal">
+ <div class="row" style="margin-top: 30px;">
+ <div class="col-sm-4">
+ <h2 class="h3Class" style="font-weight: 700;">订单详情</h2>
+ </div>
+ </div>
+ <div class="row">
+ <div class="col-sm-6 b-r">
+ <#label id="insertTimeStr" name="下单时间" value="${item.insertTimeStr}"/>
+ <#label id="orderSourceStr" name="订单来源" value="${item.orderSourceStr}"/>
+ <#label id="userName" name="下单用户昵称" value="${item.userName}"/>
+ <#label id="recipient" name="收货人昵称" value="${item.recipient}"/>
+ <#label id="startAddress" name="起点" value="${item.startAddress}"/>
+ <#label id="driver" name="接单司机" value="${item.driver}"/>
+ <#label id="companyName" name="车辆所属机构" value="${item.companyName}"/>
+ </div>
+
+ <div class="col-sm-6">
+ <#label id="typeStr" name="订单类型" value="${item.typeStr}"/>
+ <#label id="orderNum" name="订单编号" value="${item.orderNum}"/>
+ <#label id="travelTimeStr" name="乘车时间" value="${item.travelTimeStr}"/>
+ <#label id="userPhone" name="下单用户手机号" value="${item.userPhone}"/>
+ <#label id="passengersPhone" name="收货人手机号" value="${item.passengersPhone}"/>
+ <#label id="endAddress" name="终点" value="${item.endAddress}"/>
+ <#label id="car" name="接单车辆" value="${item.car}"/>
+ </div>
+ </div>
+ <div class="row" style="margin-top: 30px;">
+ <div class="col-sm-4">
+ <h2 class="h3Class" style="font-weight: 700;">费用明细</h2>
+ </div>
+ </div>
+ <div class="row">
+ @if(isNotEmpty(item.orderMoney) && item.orderMoney > 0){
+ <div class="col-sm-6 b-r">
+ <#label id="orderMoney" name="订单总价" value="${item.orderMoney}元"/>
+ @if(isNotEmpty(item.payMoney)){
+ <#label id="payMoney" name="实际支付费用" value="${item.payMoney}元"/>
+ @}else{
+ <#label id="payMoney" name="实际支付费用" value="0.00元"/>
+ @}
+ @if(isNotEmpty(item.couponMoney)){
+ <#label id="couponMoney" name="优惠券抵扣费用" value="${item.couponMoney}元"/>
+ @}else{
+ <#label id="couponMoney" name="优惠券抵扣费用" value="0.00元"/>
+ @}
+ </div>
+ <div class="col-sm-6">
+ <#label id="payTypeStr" name="支付方式" value="${item.payTypeStr}"/>
+ </div>
+ @}else{
+ <h4 style="margin-left: 10%">暂无费用明细</h4>
+ @}
+ </div>
+
+ </div>
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/tOrderLogistics/tOrderLogistics_info.js"></script>
+@}
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderLogistics/tOrderLogistics_edit.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderLogistics/tOrderLogistics_edit.html
new file mode 100644
index 0000000..46b7cb9
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderLogistics/tOrderLogistics_edit.html
@@ -0,0 +1,82 @@
+@layout("/common/_container.html"){
+<div class="ibox float-e-margins">
+ <div class="ibox-content">
+ <div class="form-horizontal">
+
+ <div class="row">
+ <div class="col-sm-6 b-r">
+ <#input id="id" name="主键id" value="${item.id}" underline="true"/>
+ <#input id="type" name="订单类型（4=同城物流，5=跨城物流）" value="${item.type}" underline="true"/>
+ <#input id="userId" name="用户id" value="${item.userId}" underline="true"/>
+ <#input id="driverId" name="接单司机ID" value="${item.driverId}" underline="true"/>
+ <#input id="carId" name="车辆id" value="${item.carId}" underline="true"/>
+ <#input id="orderNum" name="订单号" value="${item.orderNum}" underline="true"/>
+ <#input id="cargoType" name="货物类型（1=普通货物，2=贵重货物）" value="${item.cargoType}" underline="true"/>
+ <#input id="cargoNumber" name="货物数量" value="${item.cargoNumber}" underline="true"/>
+ <#input id="remark" name="备注" value="${item.remark}" underline="true"/>
+ <#input id="placementLon" name="下单地点经度" value="${item.placementLon}" underline="true"/>
+ <#input id="placementLat" name="下单地点纬度" value="${item.placementLat}" underline="true"/>
+ <#input id="placementAddress" name="下单地点" value="${item.placementAddress}" underline="true"/>
+ <#input id="startLon" name="出发地经度值" value="${item.startLon}" underline="true"/>
+ <#input id="startLat" name="出发地纬度值" value="${item.startLat}" underline="true"/>
+ <#input id="startAddress" name="出发地地点" value="${item.startAddress}" underline="true"/>
+ <#input id="endLon" name="目的地经度" value="${item.endLon}" underline="true"/>
+ <#input id="endLat" name="目的地纬度" value="${item.endLat}" underline="true"/>
+ <#input id="endAddress" name="目的地地点" value="${item.endAddress}" underline="true"/>
+ <#input id="recipient" name="收件人姓名" value="${item.recipient}" underline="true"/>
+ <#input id="recipientPhone" name="收件人电话" value="${item.recipientPhone}" underline="true"/>
+ <#input id="boardingLon" name="上车点经度" value="${item.boardingLon}" underline="true"/>
+ <#input id="boardingLat" name="上车点纬度" value="${item.boardingLat}" underline="true"/>
+ <#input id="boardingAddress" name="上车点" value="${item.boardingAddress}" underline="true"/>
+ <#input id="boardingTime" name="上车时间" value="${item.boardingTime}" underline="true"/>
+ <#input id="getoffLon" name="下车点经度" value="${item.getoffLon}" underline="true"/>
+ <#input id="getoffLat" name="下车点纬度" value="${item.getoffLat}" underline="true"/>
+ <#input id="getoffAddress" name="下车地点" value="${item.getoffAddress}" underline="true"/>
+ <#input id="getoffTime" name="下车时间" value="${item.getoffTime}" underline="true"/>
+ <#input id="mileage" name="行驶里程数（米）" value="${item.mileage}" />
+ </div>
+
+ <div class="col-sm-6">
+ <#input id="payManner" name="支付方式（1=OK平台支付，2=其他方式支付）" value="${item.payManner}" underline="true"/>
+ <#input id="payType" name="支付方式(1=微信，2=支付宝，3=其他)" value="${item.payType}" underline="true"/>
+ <#input id="orderMoney" name="订单金额" value="${item.orderMoney}" underline="true"/>
+ <#input id="travelMoney" name="行程费" value="${item.travelMoney}" underline="true"/>
+ <#input id="tipMoney" name="小费" value="${item.tipMoney}" underline="true"/>
+ <#input id="redPacketMoney" name="红包抵扣金额" value="${item.redPacketMoney}" underline="true"/>
+ <#input id="couponMoney" name="优惠券抵扣金额" value="${item.couponMoney}" underline="true"/>
+ <#input id="redPacketId" name="红包记录id" value="${item.redPacketId}" underline="true"/>
+ <#input id="couponId" name="优惠券id" value="${item.couponId}" underline="true"/>
+ <#input id="discount" name="折扣" value="${item.discount}" underline="true"/>
+ <#input id="discountMoney" name="折扣优惠金额" value="${item.discountMoney}" underline="true"/>
+ <#input id="activityId" name="折扣活动id" value="${item.activityId}" underline="true"/>
+ <#input id="companyId" name="公司id" value="${item.companyId}" underline="true"/>
+ <#input id="payMoney" name="支付金额" value="${item.payMoney}" underline="true"/>
+ <#input id="state" name="状态(1=待接单，2=待出发，3=待到达预约地点，4=待取货，5=服务中，6=完成服务，7=待支付，9=已完成，10=已取消)" value="${item.state}" underline="true"/>
+ <#input id="insertTime" name="下单时间" value="${item.insertTime}" underline="true"/>
+ <#input id="travelTime" name="出行时间" value="${item.travelTime}" underline="true"/>
+ <#input id="snatchOrderTime" name="抢单时间" value="${item.snatchOrderTime}" underline="true"/>
+ <#input id="setOutTime" name="司机点出发时间" value="${item.setOutTime}" underline="true"/>
+ <#input id="arriveTime" name="司机到达预约地点时间" value="${item.arriveTime}" underline="true"/>
+ <#input id="startServiceTime" name="开始服务时间" value="${item.startServiceTime}" underline="true"/>
+ <#input id="endServiceTime" name="结束服务时间" value="${item.endServiceTime}" underline="true"/>
+ <#input id="orderSource" name="下单方式（1：APP下单，2：扫码下单，3：小程序下单，4：司机下单，5：调度下单）" value="${item.orderSource}" underline="true"/>
+ <#input id="invoiceId" name="发票id" value="${item.invoiceId}" underline="true"/>
+ <#input id="trackId" name="高德猎鹰上的轨迹id" value="${item.trackId}" underline="true"/>
+ <#input id="isDelete" name="是否删除 1=否 2=是" value="${item.isDelete}" underline="true"/>
+ <#input id="telX" name="移动小号" value="${item.telX}" underline="true"/>
+ <#input id="bindId" name="移动小号绑定关系id" value="${item.bindId}" />
+ </div>
+ </div>
+
+ <div class="row btn-group-m-t">
+ <div class="col-sm-10">
+ <#button btnCss="info" name="提交" id="ensure" icon="fa-check" clickFun="TOrderLogisticsInfoDlg.editSubmit()"/>
+ <#button btnCss="danger" name="取消" id="cancel" icon="fa-eraser" clickFun="TOrderLogisticsInfoDlg.close()"/>
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/tOrderLogistics/tOrderLogistics_info.js"></script>
+@}
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderPrivateCar/tOrderPrivateCar.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderPrivateCar/tOrderPrivateCar.html
new file mode 100644
index 0000000..1ff3203
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderPrivateCar/tOrderPrivateCar.html
@@ -0,0 +1,101 @@
+@layout("/common/_container.html"){
+<div class="row">
+ <div class="col-sm-12">
+ <div class="ibox float-e-margins">
+ <div class="ibox-title">
+ <h5>专车订单管理</h5>
+ </div>
+ <div class="ibox-content">
+ <div class="row row-lg">
+ <div class="col-sm-12">
+ <div class="row">
+ <div class="col-sm-3">
+ <#TimeCon id="insertTime" name="订单时间" isTime="false"/>
+ </div>
+ <div class="col-sm-3">
+ <#NameCon id="orderNum" name="订单编号" />
+ </div>
+ <div class="col-sm-3">
+ <#SelectCon id="orderSource" name="订单来源" >
+ <option value="">全部</option>
+ <option value="1">APP下单</option>
+ <option value="2">扫码下单</option>
+ <option value="3">小程序下单</option>
+ <option value="4">司机下单</option>
+ <option value="5">调度下单</option>
+ </#SelectCon>
+ </div>
+ <div class="col-sm-3">
+ <#NameCon id="userName" name="下单用户昵称" />
+ </div>
+ <div class="col-sm-3">
+ <#NameCon id="userPhone" name="下单用户手机" />
+ </div>
+ <div class="col-sm-3">
+ <#NameCon id="passengers" name="乘车用户姓名" />
+ </div>
+ <div class="col-sm-3">
+ <#NameCon id="passengersPhone" name="乘车用户手机" />
+ </div>
+ <div class="col-sm-3">
+ <#SelectCon id="serverCarModelId" name="车型" >
+ <option value="">全部</option>
+ @for(obj in carmodelList){
+ <option value="${obj.id}">${obj.name}</option>
+ @}
+ </#SelectCon>
+ </div>
+ <div class="col-sm-3">
+ <#NameCon id="driver" name="接单司机" />
+ </div>
+ <div class="col-sm-3">
+ <#SelectCon id="state" name="状态" >
+ <option value="">全部</option>
+ <option value="1">待接单</option>
+ <option value="2">待出发</option>
+ <option value="3">待到达预约地点</option>
+ <option value="4">待乘客上车</option>
+ <option value="5">服务中</option>
+ <option value="6">完成服务</option>
+ <option value="7">待支付</option>
+ <option value="8">待评价</option>
+ <option value="9">已完成</option>
+ <option value="10">已取消</option>
+ <option value="11">改派中</option>
+ <option value="12">取消待支付</option>
+ </#SelectCon>
+ </div>
+ <div class="col-sm-3">
+ <#button name="搜索" icon="fa-search" clickFun="TOrderPrivateCar.search()"/>
+ <#button name="重置" icon="fa-trash" clickFun="TOrderPrivateCar.resetSearch()" space="true"/>
+ </div>
+ </div>
+ <div class="hidden-xs" id="TOrderPrivateCarTableToolbar" role="group">
+ @if(shiro.hasPermission("/tOrderPrivateCar/orderDetail")){
+ <#button name="订单详情" icon="fa-plus" clickFun="TOrderPrivateCar.orderDetail()"/>
+ @}
+ @if(shiro.hasPermission("/tOrderPrivateCar/cancelOrder")){
+ <#button name="取消订单" icon="fa-edit" clickFun="TOrderPrivateCar.cancelOrder()" space="true"/>
+ @}
+ @if(shiro.hasPermission("/tOrderPrivateCar/orderTrack")){
+ <#button name="订单轨迹" icon="fa-edit" clickFun="TOrderPrivateCar.trajectory()" space="true"/>
+ @}
+ @if(shiro.hasPermission("/tOrderPrivateCar/deleteOrder")){
+ <#button name="删除记录" icon="fa-remove" clickFun="TOrderPrivateCar.deleteOrder()" space="true"/>
+ @}
+ </div>
+ <#table id="TOrderPrivateCarTable"/>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/tOrderPrivateCar/tOrderPrivateCar.js"></script>
+<script>
+ laydate.render({
+ elem: '#insertTime'
+ ,range: true
+ });
+</script>
+@}
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderPrivateCar/tOrderPrivateCar_add.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderPrivateCar/tOrderPrivateCar_add.html
new file mode 100644
index 0000000..e5b17b4
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderPrivateCar/tOrderPrivateCar_add.html
@@ -0,0 +1,89 @@
+@layout("/common/_container.html"){
+<div class="ibox float-e-margins">
+ <div class="ibox-content">
+ <div class="form-horizontal">
+
+ <div class="row">
+ <div class="col-sm-6 b-r">
+ <#input id="id" name="主键id" underline="true"/>
+ <#input id="type" name="类型（1=普通订单，2=摆渡订单）" underline="true"/>
+ <#input id="userId" name="用户id" underline="true"/>
+ <#input id="driverId" name="接单司机ID" underline="true"/>
+ <#input id="carId" name="车辆id" underline="true"/>
+ <#input id="orderNum" name="订单号" underline="true"/>
+ <#input id="placementLon" name="下单地点经度" underline="true"/>
+ <#input id="placementLat" name="下单地点纬度" underline="true"/>
+ <#input id="placementAddress" name="下单地点" underline="true"/>
+ <#input id="startLon" name="出发地经度值" underline="true"/>
+ <#input id="startLat" name="出发地纬度值" underline="true"/>
+ <#input id="endLon" name="目的地经度" underline="true"/>
+ <#input id="startAddress" name="出发地地点" underline="true"/>
+ <#input id="endLat" name="目的地纬度" underline="true"/>
+ <#input id="endAddress" name="目的地地点" underline="true"/>
+ <#input id="boardingLon" name="上车点经度" underline="true"/>
+ <#input id="boardingLat" name="上车点纬度" underline="true"/>
+ <#input id="boardingAddress" name="上车点" underline="true"/>
+ <#input id="boardingTime" name="上车时间" underline="true"/>
+ <#input id="getoffLon" name="下车点经度" underline="true"/>
+ <#input id="getoffLat" name="下车点纬度" underline="true"/>
+ <#input id="getoffAddress" name="下车地点" underline="true"/>
+ <#input id="getoffTime" name="下车时间" underline="true"/>
+ <#input id="mileage" name="行驶里程数（米）" underline="true"/>
+ <#input id="payManner" name="支付方式（1=OK平台支付，2=其他方式支付）" underline="true"/>
+ <#input id="payType" name="支付方式(1=微信，2=支付宝，3=其他)" underline="true"/>
+ <#input id="orderMoney" name="订单金额" underline="true"/>
+ <#input id="startMoney" name="起步价" underline="true"/>
+ <#input id="mileageMoney" name="里程费" underline="true"/>
+ <#input id="durationMoney" name="时长费" underline="true"/>
+ <#input id="longDistanceMoney" name="远途费" underline="true"/>
+ <#input id="parkMoney" name="停车费"/>
+ </div>
+
+ <div class="col-sm-6">
+ <#input id="roadTollMoney" name="过路费" underline="true"/>
+ <#input id="redPacketMoney" name="红包抵扣金额" underline="true"/>
+ <#input id="couponMoney" name="优惠券抵扣金额" underline="true"/>
+ <#input id="redPacketId" name="红包记录id" underline="true"/>
+ <#input id="couponId" name="优惠券id" underline="true"/>
+ <#input id="discount" name="折扣" underline="true"/>
+ <#input id="discountMoney" name="折扣优惠金额" underline="true"/>
+ <#input id="activityId" name="折扣活动id" underline="true"/>
+ <#input id="companyId" name="公司id" underline="true"/>
+ <#input id="payMoney" name="支付金额" underline="true"/>
+ <#input id="substitute" name="是否是代下单（0：否，1：是）" underline="true"/>
+ <#input id="passengers" name="乘车人" underline="true"/>
+ <#input id="passengersPhone" name="乘车人电话" underline="true"/>
+ <#input id="state" name="状态(1=待接单，2=待出发，3=待到达预约地点，4=待乘客上车，5=服务中，6=完成服务，7=待支付，8=待评价，9=已完成，10=已取消，11=改派中，12=取消待支付)" underline="true"/>
+ <#input id="insertTime" name="下单时间" underline="true"/>
+ <#input id="travelTime" name="出行时间" underline="true"/>
+ <#input id="snatchOrderTime" name="抢单时间" underline="true"/>
+ <#input id="setOutTime" name="司机点出发时间" underline="true"/>
+ <#input id="arriveTime" name="司机到达预约地点时间" underline="true"/>
+ <#input id="startServiceTime" name="开始服务时间" underline="true"/>
+ <#input id="endServiceTime" name="结束服务时间" underline="true"/>
+ <#input id="orderType" name="订单类型(1=普通，2=预约)" underline="true"/>
+ <#input id="orderSource" name="下单方式（1：APP下单，2：扫码下单，3：小程序下单，4：司机下单，5：调度下单）" underline="true"/>
+ <#input id="invoiceId" name="发票id" underline="true"/>
+ <#input id="isReassign" name="是否是改派单（1=否，2=是）" underline="true"/>
+ <#input id="reassignNotice" name="改派通知（0=没有改派，1=改派中，2=已改派）" underline="true"/>
+ <#input id="trackId" name="高德猎鹰上的轨迹id" underline="true"/>
+ <#input id="isDelete" name="是否删除 1=否 2=是" underline="true"/>
+ <#input id="oldState" name="状态(改派前订单状态)" underline="true"/>
+ <#input id="telX" name="移动小号" underline="true"/>
+ <#input id="bindId" name="移动小号绑定关系id" underline="true"/>
+ <#input id="serverCarModelId" name="专车车型ID 关联t_server_carmodel表" underline="true"/>
+ </div>
+ </div>
+
+ <div class="row btn-group-m-t">
+ <div class="col-sm-10">
+ <#button btnCss="info" name="提交" id="ensure" icon="fa-check" clickFun="TOrderPrivateCarInfoDlg.addSubmit()"/>
+ <#button btnCss="danger" name="取消" id="cancel" icon="fa-eraser" clickFun="TOrderPrivateCarInfoDlg.close()"/>
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/tOrderPrivateCar/tOrderPrivateCar_info.js"></script>
+@}
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderPrivateCar/tOrderPrivateCar_orderDetail.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderPrivateCar/tOrderPrivateCar_orderDetail.html
new file mode 100644
index 0000000..f5acceb
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderPrivateCar/tOrderPrivateCar_orderDetail.html
@@ -0,0 +1,115 @@
+@layout("/common/_container.html"){
+<style type="text/css">
+ html, body, #container {
+ height: 100%;
+ width: 100%;
+ }
+
+ .input-card .btn{
+ margin-right: 1.2rem;
+ width: 9rem;
+ }
+
+ .input-card .btn:last-child{
+ margin-right: 0;
+ }
+</style>
+<div class="ibox float-e-margins">
+ <div class="ibox-content">
+ <div class="form-horizontal">
+ <input type="hidden" id="id" name="id" value="${item.id}">
+ <div class="row" style="margin-top: 30px;">
+ <div class="col-sm-4">
+ <h2 class="h3Class" style="font-weight: 700;">订单详情</h2>
+ </div>
+ </div>
+ <div class="row">
+ <div class="col-sm-6 b-r">
+ <#label id="insertTimeStr" name="下单时间" value="${item.insertTimeStr}"/>
+ <#label id="orderSourceStr" name="订单来源" value="${item.orderSourceStr}"/>
+ <#label id="userName" name="下单用户昵称" value="${item.userName}"/>
+ <#label id="passengers" name="乘车用户昵称" value="${item.passengers}"/>
+ <#label id="placementAddress" name="起点" value="${item.startAddress}"/>
+ <#label id="serverCarModel" name="选择车型" value="${item.serverCarModel}"/>
+ <#label id="car" name="接单车辆" value="${item.car}"/>
+ <#label id="boardingAddress" name="上车地点" value="${item.boardingAddress}"/>
+ <#label id="getoffAddress" name="下车地点" value="${item.getoffAddress}"/>
+ </div>
+
+ <div class="col-sm-6">
+ <#label id="orderNum" name="订单编号" value="${item.orderNum}"/>
+ <#label id="travelTimeStr" name="乘车时间" value="${item.travelTimeStr}"/>
+ <#label id="userPhone" name="下单用户手机号" value="${item.userPhone}"/>
+ <#label id="passengersPhone" name="乘车用户手机号" value="${item.passengersPhone}"/>
+ <#label id="endAddress" name="终点" value="${item.endAddress}"/>
+ <#label id="driver" name="接单司机" value="${item.driver}"/>
+ <#label id="companyName" name="车辆所属机构" value="${item.companyName}"/>
+ <#label id="boardingTimeStr" name="上车时间" value="${item.boardingTimeStr}"/>
+ <#label id="getoffTimeStr" name="下车时间" value="${item.getoffTimeStr}"/>
+ </div>
+ </div>
+ <div class="row" style="margin-top: 30px;">
+ <div class="col-sm-4">
+ <h2 class="h3Class" style="font-weight: 700;">费用明细</h2>
+ </div>
+ </div>
+ <div class="row">
+ @if(isNotEmpty(item.orderMoney) && item.orderMoney > 0){
+ <div class="col-sm-6 b-r">
+ <#label id="orderMoney" name="订单总价" value="${item.orderMoney}元"/>
+ <#label id="travelMoney" name="行程费" value="${item.travelMoney}元"/>
+ <#label id="parkMoney" name="停车费" value="${item.parkMoney}元"/>
+ <#label id="roadTollMoney" name="过路费" value="${item.roadTollMoney}元"/>
+ <#label id="tipMoney" name="小费" value="${item.tipMoney}元"/>
+
+ @if(isNotEmpty(item.payMoney)){
+ <#label id="payMoney" name="实际支付费用" value="${item.payMoney}元"/>
+ @}else{
+ <#label id="payMoney" name="实际支付费用" value="0.00元"/>
+ @}
+
+ <#label id="payTypeStr" name="支付方式" value="${item.payTypeStr}"/>
+ <#label id="couponMoney" name="优惠券抵扣费用" value="${item.couponMoney}元"/>
+ <#label id="redPacketMoney" name="红包抵扣金额" value="${item.redPacketMoney}元"/>
+ </div>
+ <div class="col-sm-6">
+ <#label id="platIncome" name="平台收益" value="${item.platIncome}元"/>
+ <#label id="companyIncome" name="分公司收益" value="${item.companyIncome}元"/>
+ <#label id="franchiseeIncome" name="加盟商收益" value="${item.franchiseeIncome}元"/>
+ <#label id="driverIncome" name="司机收益" value="${item.driverIncome}元"/>
+ </div>
+ @}else{
+ <h4 style="margin-left: 10%">暂无费用明细</h4>
+ @}
+ </div>
+ <div class="row" style="margin-top: 30px;">
+ <div class="col-sm-4">
+ <h2 class="h3Class" style="font-weight: 700;">线路轨迹</h2>
+ </div>
+ </div>
+ <div class="row">
+ <div class="col-sm-10">
+ <div class="form-horizontal" id="container" style="margin-left: 50px;width: 100%; height: 500px;"></div>
+ <div class="input-card" style="margin-left: 50px;">
+ <h4>轨迹回放控制</h4>
+ <div class="input-item">
+ <input type="button" class="btn" value="开始动画" id="start" onclick="startAnimation()"/>
+ <input type="button" class="btn" value="暂停动画" id="pause" onclick="pauseAnimation()"/>
+ <input type="button" class="btn" value="继续动画" id="resume" onclick="resumeAnimation()"/>
+ <input type="button" class="btn" value="停止动画" id="stop" onclick="stopAnimation()"/>
+ </div>
+ <div class="input-item">
+
+ </div>
+ </div>
+ </div>
+ </div>
+
+ </div>
+ </div>
+</div>
+<script src="https://a.amap.com/jsapi_demos/static/demo-center/js/demoutils.js"></script>
+<script src="https://webapi.amap.com/maps?v=1.4.8&key=e17d799b2506d05faf7f88320a266803"></script>
+<script src="https://cache.amap.com/lbs/static/addToolbar.js"></script>
+<script src="${ctxPath}/static/modular/system/tOrderPrivateCar/tOrderPrivateCar_info.js"></script>
+@}
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderPrivateCar/tOrderPrivateCar_trajectory.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderPrivateCar/tOrderPrivateCar_trajectory.html
new file mode 100644
index 0000000..308863e
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderPrivateCar/tOrderPrivateCar_trajectory.html
@@ -0,0 +1,52 @@
+@layout("/common/_container.html"){
+<style type="text/css">
+ html, body, #container {
+ height: 100%;
+ width: 100%;
+ }
+
+ .input-card .btn{
+ margin-right: 1.2rem;
+ width: 9rem;
+ }
+
+ .input-card .btn:last-child{
+ margin-right: 0;
+ }
+</style>
+<div class="ibox float-e-margins">
+ <div class="ibox-content">
+ <div class="form-horizontal">
+ <input type="hidden" id="id" name="id" value="${tOrderPrivateCarId}">
+ <div class="row" style="margin-top: 30px;">
+ <div class="col-sm-4">
+ <h2 class="h3Class" style="font-weight: 700;">线路轨迹</h2>
+ </div>
+ </div>
+ <div class="row" style="margin-top: 30px;">
+ <div class="col-sm-10">
+ <div class="form-horizontal" id="container" style="margin-left: 50px;width: 100%; height: 500px;"></div>
+ <div class="input-card" style="margin-left: 50px;">
+ <h4>轨迹回放控制</h4>
+ <div class="input-item">
+ <input type="button" class="btn" value="开始动画" id="start" onclick="startAnimation()"/>
+ <input type="button" class="btn" value="暂停动画" id="pause" onclick="pauseAnimation()"/>
+ <input type="button" class="btn" value="继续动画" id="resume" onclick="resumeAnimation()"/>
+ <input type="button" class="btn" value="停止动画" id="stop" onclick="stopAnimation()"/>
+ </div>
+ <div class="input-item">
+
+ </div>
+ </div>
+ </div>
+ </div>
+
+ </div>
+
+ </div>
+</div>
+<script src="https://a.amap.com/jsapi_demos/static/demo-center/js/demoutils.js"></script>
+<script src="https://webapi.amap.com/maps?v=1.4.8&key=e17d799b2506d05faf7f88320a266803"></script>
+<script src="https://cache.amap.com/lbs/static/addToolbar.js"></script>
+<script src="${ctxPath}/static/modular/system/tOrderPrivateCar/tOrderPrivateCar_info.js"></script>
+@}
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderTaxi/tOrderTaxi.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderTaxi/tOrderTaxi.html
new file mode 100644
index 0000000..47ec8b9
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderTaxi/tOrderTaxi.html
@@ -0,0 +1,97 @@
+@layout("/common/_container.html"){
+<div class="row">
+ <div class="col-sm-12">
+ <div class="ibox float-e-margins">
+ <div class="ibox-title">
+ <h5>出租车订单管理</h5>
+ </div>
+ <div class="ibox-content">
+ <div class="row row-lg">
+ <div class="col-sm-12">
+ <div class="row">
+ <div class="col-sm-3">
+ <#TimeCon id="insertTime" name="下单时间" isTime="false"/>
+ </div>
+ <div class="col-sm-3">
+ <#NameCon id="orderNum" name="订单编号" />
+ </div>
+ <div class="col-sm-3">
+ <#SelectCon id="orderSource" name="订单来源" >
+ <option value="">全部</option>
+ <option value="1">APP下单</option>
+ <option value="2">扫码下单</option>
+ <option value="3">小程序下单</option>
+ <option value="4">司机下单</option>
+ <option value="5">调度下单</option>
+ <option value="6">道行龙城下单</option>
+ </#SelectCon>
+ </div>
+ <div class="col-sm-3">
+ <#NameCon id="userName" name="下单用户昵称" />
+ </div>
+ <div class="col-sm-3">
+ <#NameCon id="userPhone" name="下单用户手机" />
+ </div>
+ <div class="col-sm-3">
+ <#NameCon id="passengers" name="乘车用户姓名" />
+ </div>
+ <div class="col-sm-3">
+ <#NameCon id="passengersPhone" name="乘车用户手机" />
+ </div>
+ <div class="col-sm-3">
+ <#NameCon id="driver" name="接单司机" />
+ </div>
+ <div class="col-sm-3">
+ <#SelectCon id="state" name="状态" >
+ <option value="">全部</option>
+ <option value="1">待接单</option>
+ <option value="2">待出发</option>
+ <option value="3">待到达预约地点</option>
+ <option value="4">待乘客上车</option>
+ <option value="5">服务中</option>
+ <option value="6">完成服务</option>
+ <option value="7">待支付</option>
+ <option value="8">待评价</option>
+ <option value="9">已完成</option>
+ <option value="10">已取消</option>
+ <option value="11">改派中</option>
+ <option value="12">取消待支付</option>
+ </#SelectCon>
+ </div>
+ <div class="col-sm-3">
+ <#button name="搜索" icon="fa-search" clickFun="TOrderTaxi.search()"/>
+ <#button name="重置" icon="fa-trash" clickFun="TOrderTaxi.resetSearch()" space="true"/>
+ </div>
+ </div>
+ <div class="hidden-xs" id="TOrderTaxiTableToolbar" role="group">
+ @if(shiro.hasPermission("/tOrderTaxi/detail")){
+ <#button name="订单详情" icon="fa-plus" clickFun="TOrderTaxi.detail()"/>
+ @}
+ @if(shiro.hasPermission("/tOrderTaxi/cancel")){
+ <#button name="取消订单" icon="fa-edit" clickFun="TOrderTaxi.cancel()" space="true"/>
+ @}
+ @if(shiro.hasPermission("/tOrderTaxi/trajectory")){
+ <#button name="订单轨迹" icon="fa-remove" clickFun="TOrderTaxi.trajectory()" space="true"/>
+ @}
+ @if(shiro.hasPermission("/tOrderTaxi/delete")){
+ <#button name="删除记录" icon="fa-remove" clickFun="TOrderTaxi.delete()" space="true"/>
+ @}
+ @if(shiro.hasPermission("/tOrderTaxi/changeOrder")){
+ <#button name="改派订单" icon="fa-remove" clickFun="TOrderTaxi.changeOrder()" space="true"/>
+ @}
+ </div>
+ <#table id="TOrderTaxiTable"/>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/tOrderTaxi/tOrderTaxi.js"></script>
+<script>
+ laydate.render({
+ elem: '#insertTime'
+ ,range: true
+ });
+</script>
+@}
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderTaxi/tOrderTaxi_add.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderTaxi/tOrderTaxi_add.html
new file mode 100644
index 0000000..d293fd0
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderTaxi/tOrderTaxi_add.html
@@ -0,0 +1,76 @@
+@layout("/common/_container.html"){
+<div class="ibox float-e-margins">
+ <div class="ibox-content">
+ <div class="form-horizontal">
+
+ <div class="row">
+ <div class="col-sm-6 b-r">
+ <#input id="id" name="主键id" underline="true"/>
+ <#input id="userId" name="用户id" underline="true"/>
+ <#input id="driverId" name="接单司机ID" underline="true"/>
+ <#input id="carId" name="车辆id" underline="true"/>
+ <#input id="orderNum" name="订单号" underline="true"/>
+ <#input id="placementLon" name="下单地点经度" underline="true"/>
+ <#input id="placementLat" name="下单地点纬度" underline="true"/>
+ <#input id="placementAddress" name="下单地点" underline="true"/>
+ <#input id="startLon" name="出发地经度值" underline="true"/>
+ <#input id="startLat" name="出发地纬度值" underline="true"/>
+ <#input id="endLon" name="目的地经度" underline="true"/>
+ <#input id="startAddress" name="出发地地点" underline="true"/>
+ <#input id="endLat" name="目的地纬度" underline="true"/>
+ <#input id="endAddress" name="目的地地点" underline="true"/>
+ <#input id="boardingLon" name="上车点经度" underline="true"/>
+ <#input id="boardingLat" name="上车点纬度" underline="true"/>
+ <#input id="boardingAddress" name="上车点" underline="true"/>
+ <#input id="boardingTime" name="上车时间" underline="true"/>
+ <#input id="getoffLon" name="下车点经度" underline="true"/>
+ <#input id="getoffLat" name="下车点纬度" underline="true"/>
+ <#input id="getoffAddress" name="下车地点" underline="true"/>
+ <#input id="getoffTime" name="下车时间" underline="true"/>
+ <#input id="mileage" name="行驶里程数（米）" underline="true"/>
+ <#input id="payManner" name="支付方式（1=OK平台支付，2=其他方式支付）" underline="true"/>
+ <#input id="payType" name="支付方式(1=微信，2=支付宝，3=其他)" underline="true"/>
+ <#input id="orderMoney" name="订单金额"/>
+ </div>
+
+ <div class="col-sm-6">
+ <#input id="travelMoney" name="行程费" underline="true"/>
+ <#input id="parkMoney" name="停车费" underline="true"/>
+ <#input id="roadTollMoney" name="过路费" underline="true"/>
+ <#input id="tipMoney" name="小费" underline="true"/>
+ <#input id="redPacketMoney" name="红包抵扣金额" underline="true"/>
+ <#input id="couponMoney" name="优惠券抵扣金额" underline="true"/>
+ <#input id="redPacketId" name="红包记录id" underline="true"/>
+ <#input id="couponId" name="优惠券id" underline="true"/>
+ <#input id="companyId" name="公司id" underline="true"/>
+ <#input id="payMoney" name="支付金额" underline="true"/>
+ <#input id="substitute" name="是否是代下单（0：否，1：是）" underline="true"/>
+ <#input id="passengers" name="乘车人" underline="true"/>
+ <#input id="passengersPhone" name="乘车人电话" underline="true"/>
+ <#input id="state" name="状态(1=待接单，2=待出发，3=待到达预约地点，4=待乘客上车，5=服务中，6=完成服务，7=待支付，8=待评价，9=已完成，10=已取消，11=改派中)" underline="true"/>
+ <#input id="insertTime" name="下单时间" underline="true"/>
+ <#input id="travelTime" name="出行时间" underline="true"/>
+ <#input id="snatchOrderTime" name="抢单时间" underline="true"/>
+ <#input id="setOutTime" name="司机点出发时间" underline="true"/>
+ <#input id="arriveTime" name="司机到达预约地点时间" underline="true"/>
+ <#input id="startServiceTime" name="开始服务时间" underline="true"/>
+ <#input id="endServiceTime" name="结束服务时间" underline="true"/>
+ <#input id="orderType" name="订单类型(1=普通，2=预约)" underline="true"/>
+ <#input id="orderSource" name="下单方式（1：APP下单，2：扫码下单，3：小程序下单，4：司机下单，5：调度下单）" underline="true"/>
+ <#input id="invoiceId" name="发票id" underline="true"/>
+ <#input id="isReassign" name="是否是改派单（1=否，2=是）" underline="true"/>
+ </div>
+ </div>
+
+ <div class="row btn-group-m-t">
+ <div class="col-sm-10">
+ <#button btnCss="info" name="提交" id="ensure" icon="fa-check" clickFun="TOrderTaxiInfoDlg.addSubmit()"/>
+ <#button btnCss="danger" name="取消" id="cancel" icon="fa-eraser" clickFun="TOrderTaxiInfoDlg.close()"/>
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/tOrderTaxi/tOrderTaxi_info.js"></script>
+@}
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderTaxi/tOrderTaxi_changeOrder.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderTaxi/tOrderTaxi_changeOrder.html
new file mode 100644
index 0000000..055996b
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderTaxi/tOrderTaxi_changeOrder.html
@@ -0,0 +1,35 @@
+@layout("/common/_container.html"){
+<div class="row">
+ <div class="col-sm-12">
+ <div class="ibox float-e-margins">
+ <div class="ibox-title">
+ <h5>选择改派司机</h5>
+ </div>
+ <input type="hidden" id="id" name="id" value="${item.id}">
+ <input type="hidden" id="companyId" name="companyId" value="${item.companyId}">
+ <div class="ibox-content">
+ <div class="row row-lg">
+ <div class="col-sm-12">
+ <div class="row">
+ <div class="col-sm-3">
+ <#NameCon id="name" name="司机姓名" />
+ </div>
+ <div class="col-sm-3">
+ <#NameCon id="phone" name="司机手机号" />
+ </div>
+ <div class="col-sm-3">
+ <#button name="搜索" icon="fa-search" clickFun="SelectDriver.search()"/>
+ <#button name="重置" icon="fa-trash" clickFun="SelectDriver.resetSearch()" space="true"/>
+ <#button btnCss="info" name="确定" id="ensure" icon="fa-check" clickFun="SelectDriver.selectDriver()" space="true"/>
+ <#button btnCss="danger" name="取消" id="cancel" icon="fa-eraser" clickFun="SelectDriver.close()" space="true"/>
+ </div>
+ </div>
+ <#table id="SelectDriverTable"/>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/tOrderTaxi/selectDriver.js"></script>
+@}
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderTaxi/tOrderTaxi_edit.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderTaxi/tOrderTaxi_edit.html
new file mode 100644
index 0000000..d72664d
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderTaxi/tOrderTaxi_edit.html
@@ -0,0 +1,108 @@
+@layout("/common/_container.html"){
+<style type="text/css">
+ html, body, #container {
+ height: 100%;
+ width: 100%;
+ }
+
+ .input-card .btn{
+ margin-right: 1.2rem;
+ width: 9rem;
+ }
+
+ .input-card .btn:last-child{
+ margin-right: 0;
+ }
+</style>
+<div class="ibox float-e-margins">
+ <div class="ibox-content">
+ <div class="form-horizontal">
+ <input type="hidden" id="id" name="id" value="${item.id}">
+ <div class="row" style="margin-top: 30px;">
+ <div class="col-sm-4">
+ <h2 class="h3Class" style="font-weight: 700;">订单详情</h2>
+ </div>
+ </div>
+ <div class="row">
+ <div class="col-sm-6 b-r">
+ <#label id="insertTimeStr" name="下单时间" value="${item.insertTimeStr}"/>
+ <#label id="orderSourceStr" name="订单来源" value="${item.orderSourceStr}"/>
+ <#label id="userName" name="下单用户昵称" value="${item.userName}"/>
+ <#label id="passengers" name="乘车用户昵称" value="${item.passengers}"/>
+ <#label id="placementAddress" name="起点" value="${item.startAddress}"/>
+ <#label id="driver" name="接单司机" value="${item.driver}"/>
+ <#label id="car" name="接单车辆" value="${item.car}"/>
+ <#label id="boardingAddress" name="上车地点" value="${item.boardingAddress}"/>
+ <#label id="getoffAddress" name="下车地点" value="${item.getoffAddress}"/>
+ </div>
+
+ <div class="col-sm-6">
+ <#label id="orderNum" name="订单编号" value="${item.orderNum}"/>
+ <#label id="travelTimeStr" name="乘车时间" value="${item.travelTimeStr}"/>
+ <#label id="userPhone" name="下单用户手机号" value="${item.userPhone}"/>
+ <#label id="passengersPhone" name="乘车用户手机号" value="${item.passengersPhone}"/>
+ <#label id="endAddress" name="终点" value="${item.endAddress}"/>
+ <#label id="companyName" name="车辆所属机构" value="${item.companyName}"/>
+ <#label id="boardingTimeStr" name="上车时间" value="${item.boardingTimeStr}"/>
+ <#label id="getoffTimeStr" name="下车时间" value="${item.getoffTimeStr}"/>
+ </div>
+ </div>
+ <div class="row" style="margin-top: 30px;">
+ <div class="col-sm-4">
+ <h2 class="h3Class" style="font-weight: 700;">费用明细</h2>
+ </div>
+ </div>
+ <div class="row">
+ <div class="col-sm-6">
+ @if(isNotEmpty(item.orderMoney) && item.orderMoney > 0){
+ <#label id="orderMoney" name="订单总价" value="${item.orderMoney}元"/>
+
+ <#label id="travelMoney" name="行程费" value="${item.travelMoney}元"/>
+ <#label id="parkMoney" name="停车费" value="${item.parkMoney}元"/>
+ <#label id="roadTollMoney" name="过路费" value="${item.roadTollMoney}元"/>
+ <#label id="tipMoney" name="小费" value="${item.tipMoney}元"/>
+ @if(isNotEmpty(item.payMoney)){
+ <#label id="payMoney" name="实际支付费用" value="${item.payMoney}元"/>
+ @}else{
+ <#label id="payMoney" name="实际支付费用" value="0.00元"/>
+ @}
+ <#label id="payTypeStr" name="支付方式" value="${item.payTypeStr}"/>
+ <#label id="couponMoney" name="优惠券抵扣费用" value="${item.couponMoney}元"/>
+ <#label id="redPacketMoney" name="红包抵扣金额" value="${item.redPacketMoney}元"/>
+ @}else{
+ <h4 style="margin-left: 10%">暂无费用明细</h4>
+ @}
+ </div>
+ </div>
+ <div class="row" style="margin-top: 30px;">
+ <div class="col-sm-4">
+ <h2 class="h3Class" style="font-weight: 700;">线路轨迹</h2>
+ </div>
+ </div>
+ <div class="row">
+ <div class="col-sm-10">
+ <div class="form-horizontal" id="container" style="margin-left: 50px;width: 100%; height: 500px;"></div>
+ <div class="input-card" style="margin-left: 50px;">
+ <h4>轨迹回放控制</h4>
+ <div class="input-item">
+ <input type="button" class="btn" value="开始动画" id="start" onclick="startAnimation()"/>
+ <input type="button" class="btn" value="暂停动画" id="pause" onclick="pauseAnimation()"/>
+ <input type="button" class="btn" value="继续动画" id="resume" onclick="resumeAnimation()"/>
+ <input type="button" class="btn" value="停止动画" id="stop" onclick="stopAnimation()"/>
+ </div>
+ <div class="input-item">
+
+ </div>
+ </div>
+ </div>
+ </div>
+
+ </div>
+
+ </div>
+</div>
+<script src="https://a.amap.com/jsapi_demos/static/demo-center/js/demoutils.js"></script>
+<script src="https://webapi.amap.com/maps?v=1.4.8&key=e17d799b2506d05faf7f88320a266803"></script>
+<script src="https://cache.amap.com/lbs/static/addToolbar.js"></script>
+<script src="${ctxPath}/static/modular/system/tOrderTaxi/tOrderTaxi_info.js"></script>
+@}
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderTaxi/tOrderTaxi_trajectory.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderTaxi/tOrderTaxi_trajectory.html
new file mode 100644
index 0000000..6bdd85e
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderTaxi/tOrderTaxi_trajectory.html
@@ -0,0 +1,52 @@
+@layout("/common/_container.html"){
+<style type="text/css">
+ html, body, #container {
+ height: 100%;
+ width: 100%;
+ }
+
+ .input-card .btn{
+ margin-right: 1.2rem;
+ width: 9rem;
+ }
+
+ .input-card .btn:last-child{
+ margin-right: 0;
+ }
+</style>
+<div class="ibox float-e-margins">
+ <div class="ibox-content">
+ <div class="form-horizontal">
+ <input type="hidden" id="id" name="id" value="${tOrderTaxiId}">
+ <div class="row" style="margin-top: 30px;">
+ <div class="col-sm-4">
+ <h2 class="h3Class" style="font-weight: 700;">线路轨迹</h2>
+ </div>
+ </div>
+ <div class="row" style="margin-top: 30px;">
+ <div class="col-sm-10">
+ <div class="form-horizontal" id="container" style="margin-left: 50px;width: 100%; height: 500px;"></div>
+ <div class="input-card" style="margin-left: 50px;">
+ <h4>轨迹回放控制</h4>
+ <div class="input-item">
+ <input type="button" class="btn" value="开始动画" id="start" onclick="startAnimation()"/>
+ <input type="button" class="btn" value="暂停动画" id="pause" onclick="pauseAnimation()"/>
+ <input type="button" class="btn" value="继续动画" id="resume" onclick="resumeAnimation()"/>
+ <input type="button" class="btn" value="停止动画" id="stop" onclick="stopAnimation()"/>
+ </div>
+ <div class="input-item">
+
+ </div>
+ </div>
+ </div>
+ </div>
+
+ </div>
+
+ </div>
+</div>
+<script src="https://a.amap.com/jsapi_demos/static/demo-center/js/demoutils.js"></script>
+<script src="https://webapi.amap.com/maps?v=1.4.8&key=e17d799b2506d05faf7f88320a266803"></script>
+<script src="https://cache.amap.com/lbs/static/addToolbar.js"></script>
+<script src="${ctxPath}/static/modular/system/tOrderTaxi/tOrderTaxi_info.js"></script>
+@}
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tProblem/tProblem.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tProblem/tProblem.html
new file mode 100644
index 0000000..23ccd05
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tProblem/tProblem.html
@@ -0,0 +1,49 @@
+@layout("/common/_container.html"){
+<div class="row">
+ <div class="col-sm-12">
+ <div class="ibox float-e-margins">
+ <div class="ibox-title">
+ <h5>用户留言管理</h5>
+ </div>
+ <div class="ibox-content">
+ <div class="row row-lg">
+ <div class="col-sm-12">
+ <div class="row">
+ <div class="col-sm-3">
+ <#TimeCon id="insertTime" name="提问时间" isTime="false"/>
+ </div>
+ <div class="col-sm-3">
+ <#NameCon id="userName" name="留言用户" />
+ </div>
+ <div class="col-sm-3">
+ <#SelectCon id="state" name="处理状态" >
+ <option value="">全部</option>
+ <option value="1">待处理</option>
+ <option value="2">已处理</option>
+ </#SelectCon>
+ </div>
+ <div class="col-sm-3">
+ <#button name="搜索" icon="fa-search" clickFun="TProblem.search()"/>
+ <#button name="重置" icon="fa-trash" clickFun="TProblem.resetSearch()" space="true"/>
+ </div>
+ </div>
+ <div class="hidden-xs" id="TProblemTableToolbar" role="group">
+ @if(shiro.hasPermission("/tProblem/immediately")){
+ <#button name="立即处理" icon="fa-plus" clickFun="TProblem.immediately()"/>
+ @}
+ </div>
+ <#table id="TProblemTable"/>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/tProblem/tProblem.js"></script>
+<script>
+ laydate.render({
+ elem: '#insertTime'
+ ,range: true
+ });
+</script>
+@}
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tProblem/tProblem_add.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tProblem/tProblem_add.html
new file mode 100644
index 0000000..df5620a
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tProblem/tProblem_add.html
@@ -0,0 +1,33 @@
+@layout("/common/_container.html"){
+<div class="ibox float-e-margins">
+ <div class="ibox-content">
+ <div class="form-horizontal">
+
+ <div class="row">
+ <div class="col-sm-6 b-r">
+ <#input id="id" name="" underline="true"/>
+ <#input id="userId" name="用户id" underline="true"/>
+ <#input id="content" name="提问内容" underline="true"/>
+ <#input id="answer" name="回答内容"/>
+ </div>
+
+ <div class="col-sm-6">
+ <#input id="handleUserId" name="处理人id" underline="true"/>
+ <#input id="handleTime" name="处理时间" underline="true"/>
+ <#input id="insertTime" name="提问时间" underline="true"/>
+ <#input id="state" name="状态（1=待处理，2=已处理）" underline="true"/>
+ </div>
+ </div>
+
+ <div class="row btn-group-m-t">
+ <div class="col-sm-10">
+ <#button btnCss="info" name="提交" id="ensure" icon="fa-check" clickFun="TProblemInfoDlg.addSubmit()"/>
+ <#button btnCss="danger" name="取消" id="cancel" icon="fa-eraser" clickFun="TProblemInfoDlg.close()"/>
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/tProblem/tProblem_info.js"></script>
+@}
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tProblem/tProblem_edit.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tProblem/tProblem_edit.html
new file mode 100644
index 0000000..09cb49c
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tProblem/tProblem_edit.html
@@ -0,0 +1,33 @@
+@layout("/common/_container.html"){
+<div class="ibox float-e-margins">
+ <div class="ibox-content">
+ <div class="form-horizontal">
+
+ <div class="row">
+ <div class="col-sm-6 b-r">
+ <#input id="id" name="" value="${item.id}" underline="true"/>
+ <#input id="userId" name="用户id" value="${item.userId}" underline="true"/>
+ <#input id="content" name="提问内容" value="${item.content}" underline="true"/>
+ <#input id="answer" name="回答内容" value="${item.answer}" />
+ </div>
+
+ <div class="col-sm-6">
+ <#input id="handleUserId" name="处理人id" value="${item.handleUserId}" underline="true"/>
+ <#input id="handleTime" name="处理时间" value="${item.handleTime}" underline="true"/>
+ <#input id="insertTime" name="提问时间" value="${item.insertTime}" underline="true"/>
+ <#input id="state" name="状态（1=待处理，2=已处理）" value="${item.state}" />
+ </div>
+ </div>
+
+ <div class="row btn-group-m-t">
+ <div class="col-sm-10">
+ <#button btnCss="info" name="提交" id="ensure" icon="fa-check" clickFun="TProblemInfoDlg.editSubmit()"/>
+ <#button btnCss="danger" name="取消" id="cancel" icon="fa-eraser" clickFun="TProblemInfoDlg.close()"/>
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/tProblem/tProblem_info.js"></script>
+@}
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tProblem/tProblem_immediately.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tProblem/tProblem_immediately.html
new file mode 100644
index 0000000..bf912ed
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tProblem/tProblem_immediately.html
@@ -0,0 +1,28 @@
+@layout("/common/_container.html"){
+<div class="ibox float-e-margins">
+ <div class="ibox-content">
+ <div class="form-horizontal" id="problemInfoForm">
+ <input type="hidden" id="tProblemId" name="tProblemId" value="${tProblemId}">
+ <div class="row">
+ <div class="col-sm-11">
+ <div class="form-group">
+ <label class="col-sm-3 control-label">回复内容：</label>
+ <div class="col-sm-9">
+ <textarea type="text/plain" class="form-control" name="answer" id="answer" style="width:100%;height:150px;" placeholder="多行输入,最多500字"></textarea>
+ </div>
+ </div>
+ </div>
+ </div>
+
+ <div class="row btn-group-m-t">
+ <div class="col-sm-10 col-sm-offset-5">
+ <#button btnCss="info" name="提交" id="ensure" icon="fa-check" clickFun="TProblemInfoDlg.immediately()"/>
+ <#button btnCss="danger" name="取消" id="cancel" icon="fa-eraser" clickFun="TProblemInfoDlg.close()"/>
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/tProblem/tProblem_info.js"></script>
+@}
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tPubWithdrawal/tPubWithdrawal.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tPubWithdrawal/tPubWithdrawal.html
new file mode 100644
index 0000000..317fb0f
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tPubWithdrawal/tPubWithdrawal.html
@@ -0,0 +1,49 @@
+@layout("/common/_container.html"){
+<div class="row">
+ <div class="col-sm-12">
+ <div class="ibox float-e-margins">
+ <div class="ibox-title">
+ <h5>提现列表管理</h5>
+ </div>
+ <div class="ibox-content">
+ <div class="row row-lg">
+ <div class="col-sm-12">
+ <div class="row">
+ <div class="col-sm-3">
+ <#TimeCon id="insertTime" name="申请时间" isTime="false"/>
+ </div>
+ <div class="col-sm-3">
+ <#NameCon id="name" name="提现人" />
+ </div>
+ <div class="col-sm-3">
+ <#SelectCon id="withdrawalType" name="提现方式" >
+ <option value="">全部</option>
+ <option value="1">银行卡</option>
+ <option value="2">线下</option>
+ </#SelectCon>
+ </div>
+ <div class="col-sm-3">
+ <#button name="搜索" icon="fa-search" clickFun="TPubWithdrawal.search()"/>
+ <#button name="重置" icon="fa-trash" clickFun="TPubWithdrawal.resetSearch()" space="true"/>
+ </div>
+ </div>
+ <div class="hidden-xs" id="TPubWithdrawalTableToolbar" role="group">
+ @if(shiro.hasPermission("/tPubWithdrawal/immediately")){
+ <#button name="立即处理" icon="fa-edit" clickFun="TPubWithdrawal.immediately()"/>
+ @}
+ </div>
+ <#table id="TPubWithdrawalTable"/>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/tPubWithdrawal/tPubWithdrawal.js"></script>
+<script>
+ laydate.render({
+ elem: '#insertTime'
+ ,range: true
+ });
+</script>
+@}
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tPubWithdrawal/tPubWithdrawal_add.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tPubWithdrawal/tPubWithdrawal_add.html
new file mode 100644
index 0000000..c23416c
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tPubWithdrawal/tPubWithdrawal_add.html
@@ -0,0 +1,38 @@
+@layout("/common/_container.html"){
+<div class="ibox float-e-margins">
+ <div class="ibox-content">
+ <div class="form-horizontal">
+
+ <div class="row">
+ <div class="col-sm-6 b-r">
+ <#input id="id" name="主键id" underline="true"/>
+ <#input id="userId" name="用户id" underline="true"/>
+ <#input id="handleTime" name="处理时间" underline="true"/>
+ <#input id="balance" name="原钱包余额" underline="true"/>
+ <#input id="money" name="提现金额" underline="true"/>
+ <#input id="state" name="状态(1=待处理，2=成功，3=失败)" underline="true"/>
+ <#input id="remark" name="备注"/>
+ </div>
+
+ <div class="col-sm-6">
+ <#input id="code" name="银行账号" underline="true"/>
+ <#input id="name" name="账户持有人姓名" underline="true"/>
+ <#input id="userType" name="用户类型(1=用户，2=司机)" underline="true"/>
+ <#input id="insertTime" name="申请时间" underline="true"/>
+ <#input id="flag" name="1：创建，2：修改，3：删除" underline="true"/>
+ <#input id="withdrawalType" name="提现方式 1=银行卡 2=线下" underline="true"/>
+ </div>
+ </div>
+
+ <div class="row btn-group-m-t">
+ <div class="col-sm-10">
+ <#button btnCss="info" name="提交" id="ensure" icon="fa-check" clickFun="TPubWithdrawalInfoDlg.addSubmit()"/>
+ <#button btnCss="danger" name="取消" id="cancel" icon="fa-eraser" clickFun="TPubWithdrawalInfoDlg.close()"/>
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/tPubWithdrawal/tPubWithdrawal_info.js"></script>
+@}
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tPubWithdrawal/tPubWithdrawal_edit.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tPubWithdrawal/tPubWithdrawal_edit.html
new file mode 100644
index 0000000..2b01284
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tPubWithdrawal/tPubWithdrawal_edit.html
@@ -0,0 +1,38 @@
+@layout("/common/_container.html"){
+<div class="ibox float-e-margins">
+ <div class="ibox-content">
+ <div class="form-horizontal">
+
+ <div class="row">
+ <div class="col-sm-6 b-r">
+ <#input id="id" name="主键id" value="${item.id}" underline="true"/>
+ <#input id="userId" name="用户id" value="${item.userId}" underline="true"/>
+ <#input id="handleTime" name="处理时间" value="${item.handleTime}" underline="true"/>
+ <#input id="balance" name="原钱包余额" value="${item.balance}" underline="true"/>
+ <#input id="money" name="提现金额" value="${item.money}" underline="true"/>
+ <#input id="state" name="状态(1=待处理，2=成功，3=失败)" value="${item.state}" underline="true"/>
+ <#input id="remark" name="备注" value="${item.remark}" />
+ </div>
+
+ <div class="col-sm-6">
+ <#input id="code" name="银行账号" value="${item.code}" underline="true"/>
+ <#input id="name" name="账户持有人姓名" value="${item.name}" underline="true"/>
+ <#input id="userType" name="用户类型(1=用户，2=司机)" value="${item.userType}" underline="true"/>
+ <#input id="insertTime" name="申请时间" value="${item.insertTime}" underline="true"/>
+ <#input id="flag" name="1：创建，2：修改，3：删除" value="${item.flag}" underline="true"/>
+ <#input id="withdrawalType" name="提现方式 1=银行卡 2=线下" value="${item.withdrawalType}" />
+ </div>
+ </div>
+
+ <div class="row btn-group-m-t">
+ <div class="col-sm-10">
+ <#button btnCss="info" name="提交" id="ensure" icon="fa-check" clickFun="TPubWithdrawalInfoDlg.editSubmit()"/>
+ <#button btnCss="danger" name="取消" id="cancel" icon="fa-eraser" clickFun="TPubWithdrawalInfoDlg.close()"/>
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/tPubWithdrawal/tPubWithdrawal_info.js"></script>
+@}
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tPubWithdrawal/tPubWithdrawal_immediately.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tPubWithdrawal/tPubWithdrawal_immediately.html
new file mode 100644
index 0000000..16d1d49
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tPubWithdrawal/tPubWithdrawal_immediately.html
@@ -0,0 +1,41 @@
+@layout("/common/_container.html"){
+<div class="ibox float-e-margins">
+ <div class="ibox-content">
+ <div class="form-horizontal" id="withdrawalInfoForm">
+ <input type="hidden" id="id" name="id" value="${tPubWithdrawalId}">
+ <div class="row">
+ <div class="col-sm-10">
+ <div class="form-group">
+ <label class="col-sm-3 control-label">处理意见：</label>
+ <div class="col-sm-9" style="display: flex;align-items: center;">
+ <div class="radio radio-info radio-inline">
+ <input type="radio" id="state2" value="2" name="state" checked="" >
+ <label for="state2"> 同意 </label>
+ </div>
+ <div class="radio radio-success radio-inline">
+ <input type="radio" id="state3" value="3" name="state" >
+ <label for="state3"> 拒绝 </label>
+ </div>
+ </div>
+ </div>
+ <div class="form-group">
+ <label class="col-sm-3 control-label">填写备注：</label>
+ <div class="col-sm-9">
+ <textarea type="text/plain" class="form-control" name="remark" id="remark" style="width:100%;height:150px;"></textarea>
+ </div>
+ </div>
+ </div>
+ </div>
+
+ <div class="row btn-group-m-t">
+ <div class="col-sm-10 col-sm-offset-5">
+ <#button btnCss="info" name="提交" id="ensure" icon="fa-check" clickFun="TPubWithdrawalInfoDlg.immediately()"/>
+ <#button btnCss="danger" name="取消" id="cancel" icon="fa-eraser" clickFun="TPubWithdrawalInfoDlg.close()"/>
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/tPubWithdrawal/tPubWithdrawal_info.js"></script>
+@}
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tReassign/cross.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tReassign/cross.html
new file mode 100644
index 0000000..b7b5faa
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tReassign/cross.html
@@ -0,0 +1,87 @@
+@layout("/common/_container.html"){
+<div class="row">
+ <div class="col-sm-12">
+ <div class="ibox float-e-margins">
+ <div class="ibox-title">
+ <h5>跨城改派管理</h5>
+ </div>
+ <div class="ibox-content">
+ <div class="row row-lg">
+ <div class="col-sm-12">
+ <div class="row">
+ <div class="col-sm-3">
+ <#TimeCon id="insertTime" name="申请改派时间" isTime="false"/>
+ </div>
+ <div class="col-sm-3">
+ <#NameCon id="originalDriverName" name="申请司机姓名" />
+ </div>
+ <div class="col-sm-3">
+ <#NameCon id="originalDriverPhone" name="申请司机手机号" />
+ </div>
+ <div class="col-sm-3">
+ <#NameCon id="orderNum" name="订单编号" />
+ </div>
+ <div class="col-sm-3">
+ <#NameCon id="nowDriverName" name="改派服务司机姓名" />
+ </div>
+ <div class="col-sm-3">
+ <#NameCon id="nowDriverPhone" name="改派服务司机手机号" />
+ </div>
+ <div class="col-sm-3">
+ <#SelectCon id="orderState" name="订单当前状态" >
+ <option value="">全部</option>
+ <option value="1">待接单</option>
+ <option value="2">待出发</option>
+ <option value="3">待到达预约地点</option>
+ <option value="4">待乘客上车</option>
+ <option value="5">服务中</option>
+ <option value="6">完成服务</option>
+ <option value="7">待支付</option>
+ <option value="8">待评价</option>
+ <option value="9">已完成</option>
+ <option value="10">已取消</option>
+ <option value="11">改派中</option>
+ <option value="12">取消待支付</option>
+ </#SelectCon>
+ </div>
+ <div class="col-sm-3">
+ <#SelectCon id="state" name="改派状态" >
+ <option value="">全部</option>
+ <option value="1">提交申请</option>
+ <option value="2">已支付</option>
+ <option value="3">已改派</option>
+ <option value="4">已取消</option>
+ <option value="5">已拒绝</option>
+ </#SelectCon>
+ </div>
+ <div class="col-sm-3">
+ <#button name="搜索" icon="fa-search" clickFun="TCross.search()"/>
+ <#button name="重置" icon="fa-trash" clickFun="TCross.resetSearch()" space="true"/>
+ </div>
+ </div>
+ <div class="hidden-xs" id="TCrossTableToolbar" role="group">
+ @if(shiro.hasPermission("/tReassign/refusedCross")){
+ <#button name="拒绝改派" icon="fa-plus" clickFun="TCross.opt(1)"/>
+ @}
+ @if(shiro.hasPermission("/tReassign/reassignmentCross")){
+ <#button name="立即改派" icon="fa-edit" clickFun="TCross.reassignmentCross()" space="true"/>
+ @}
+ @if(shiro.hasPermission("/tReassign/cancelCross")){
+ <#button name="取消订单" icon="fa-remove" clickFun="TCross.opt(2)" space="true"/>
+ @}
+ </div>
+ <#table id="TCrossTable"/>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/tReassign/tCross.js"></script>
+<script>
+ laydate.render({
+ elem: '#insertTime'
+ ,range: true
+ });
+</script>
+@}
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tReassign/smallPieceLogistics.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tReassign/smallPieceLogistics.html
new file mode 100644
index 0000000..259c40f
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tReassign/smallPieceLogistics.html
@@ -0,0 +1,86 @@
+@layout("/common/_container.html"){
+<div class="row">
+ <div class="col-sm-12">
+ <div class="ibox float-e-margins">
+ <div class="ibox-title">
+ <h5>小件物流改派管理</h5>
+ </div>
+ <div class="ibox-content">
+ <div class="row row-lg">
+ <div class="col-sm-12">
+ <div class="row">
+ <div class="col-sm-3">
+ <#TimeCon id="insertTime" name="申请改派时间" isTime="false"/>
+ </div>
+ <div class="col-sm-3">
+ <#NameCon id="originalDriverName" name="申请司机姓名" />
+ </div>
+ <div class="col-sm-3">
+ <#NameCon id="originalDriverPhone" name="申请司机手机号" />
+ </div>
+ <div class="col-sm-3">
+ <#NameCon id="orderNum" name="订单编号" />
+ </div>
+ <div class="col-sm-3">
+ <#NameCon id="nowDriverName" name="改派服务司机姓名" />
+ </div>
+ <div class="col-sm-3">
+ <#NameCon id="nowDriverPhone" name="改派服务司机手机号" />
+ </div>
+ <div class="col-sm-3">
+ <#SelectCon id="orderState" name="订单当前状态" >
+ <option value="">全部</option>
+ <option value="1">待接单</option>
+ <option value="2">待出发</option>
+ <option value="3">待到达预约地点</option>
+ <option value="4">待取件</option>
+ <option value="5">送件中</option>
+ <option value="6">已送达</option>
+ <option value="7">待支付</option>
+ <option value="8">需补差价</option>
+ <option value="9">已取货</option>
+ <option value="10">已取消</option>
+ <option value="11">已支付差价</option>
+ </#SelectCon>
+ </div>
+ <div class="col-sm-3">
+ <#SelectCon id="state" name="改派状态" >
+ <option value="">全部</option>
+ <option value="1">提交申请</option>
+ <option value="2">已支付</option>
+ <option value="3">已改派</option>
+ <option value="4">已取消</option>
+ <option value="5">已拒绝</option>
+ </#SelectCon>
+ </div>
+ <div class="col-sm-3">
+ <#button name="搜索" icon="fa-search" clickFun="TReassign.search()"/>
+ <#button name="重置" icon="fa-trash" clickFun="TReassign.resetSearch()" space="true"/>
+ </div>
+ </div>
+ <div class="hidden-xs" id="TReassignTableToolbar" role="group">
+ @if(shiro.hasPermission("/smallPieceLogistics/refused")){
+ <#button name="拒绝改派" icon="fa-plus" clickFun="TReassign.opt(1)"/>
+ @}
+ @if(shiro.hasPermission("/smallPieceLogistics/reassignment")){
+ <#button name="立即改派" icon="fa-edit" clickFun="TReassign.reassignment()" space="true"/>
+ @}
+ @if(shiro.hasPermission("/smallPieceLogistics/cancel")){
+ <#button name="取消订单" icon="fa-remove" clickFun="TReassign.opt(2)" space="true"/>
+ @}
+ </div>
+ <#table id="TReassignTable"/>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/tReassign/smallPieceLogistics.js"></script>
+<script>
+ laydate.render({
+ elem: '#insertTime'
+ ,range: true
+ });
+</script>
+@}
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tReassign/tReassign.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tReassign/tReassign.html
new file mode 100644
index 0000000..e5fbcb1
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tReassign/tReassign.html
@@ -0,0 +1,87 @@
+@layout("/common/_container.html"){
+<div class="row">
+ <div class="col-sm-12">
+ <div class="ibox float-e-margins">
+ <div class="ibox-title">
+ <h5>专车改派管理</h5>
+ </div>
+ <div class="ibox-content">
+ <div class="row row-lg">
+ <div class="col-sm-12">
+ <div class="row">
+ <div class="col-sm-3">
+ <#TimeCon id="insertTime" name="申请改派时间" isTime="false"/>
+ </div>
+ <div class="col-sm-3">
+ <#NameCon id="originalDriverName" name="申请司机姓名" />
+ </div>
+ <div class="col-sm-3">
+ <#NameCon id="originalDriverPhone" name="申请司机手机号" />
+ </div>
+ <div class="col-sm-3">
+ <#NameCon id="orderNum" name="订单编号" />
+ </div>
+ <div class="col-sm-3">
+ <#NameCon id="nowDriverName" name="改派服务司机姓名" />
+ </div>
+ <div class="col-sm-3">
+ <#NameCon id="nowDriverPhone" name="改派服务司机手机号" />
+ </div>
+ <div class="col-sm-3">
+ <#SelectCon id="orderState" name="订单当前状态" >
+ <option value="">全部</option>
+ <option value="1">待接单</option>
+ <option value="2">待出发</option>
+ <option value="3">待到达预约地点</option>
+ <option value="4">待乘客上车</option>
+ <option value="5">服务中</option>
+ <option value="6">完成服务</option>
+ <option value="7">待支付</option>
+ <option value="8">待评价</option>
+ <option value="9">已完成</option>
+ <option value="10">已取消</option>
+ <option value="11">改派中</option>
+ <option value="12">取消待支付</option>
+ </#SelectCon>
+ </div>
+ <div class="col-sm-3">
+ <#SelectCon id="state" name="改派状态" >
+ <option value="">全部</option>
+ <option value="1">提交申请</option>
+ <option value="2">已支付</option>
+ <option value="3">已改派</option>
+ <option value="4">已取消</option>
+ <option value="5">已拒绝</option>
+ </#SelectCon>
+ </div>
+ <div class="col-sm-3">
+ <#button name="搜索" icon="fa-search" clickFun="TReassign.search()"/>
+ <#button name="重置" icon="fa-trash" clickFun="TReassign.resetSearch()" space="true"/>
+ </div>
+ </div>
+ <div class="hidden-xs" id="TReassignTableToolbar" role="group">
+ @if(shiro.hasPermission("/tReassign/refused")){
+ <#button name="拒绝改派" icon="fa-plus" clickFun="TReassign.opt(1)"/>
+ @}
+ @if(shiro.hasPermission("/tReassign/reassignment")){
+ <#button name="立即改派" icon="fa-edit" clickFun="TReassign.reassignment()" space="true"/>
+ @}
+ @if(shiro.hasPermission("/tReassign/cancel")){
+ <#button name="取消订单" icon="fa-remove" clickFun="TReassign.opt(2)" space="true"/>
+ @}
+ </div>
+ <#table id="TReassignTable"/>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/tReassign/tReassign.js"></script>
+<script>
+ laydate.render({
+ elem: '#insertTime'
+ ,range: true
+ });
+</script>
+@}
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tReassign/tReassign_reassignment.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tReassign/tReassign_reassignment.html
new file mode 100644
index 0000000..62241b2
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tReassign/tReassign_reassignment.html
@@ -0,0 +1,34 @@
+@layout("/common/_container.html"){
+<div class="row">
+ <div class="col-sm-12">
+ <div class="ibox float-e-margins">
+ <div class="ibox-title">
+ <h5>选择改派司机</h5>
+ </div>
+ <input type="hidden" id="id" name="id" value="${tReassignId}">
+ <div class="ibox-content">
+ <div class="row row-lg">
+ <div class="col-sm-12">
+ <div class="row">
+ <div class="col-sm-3">
+ <#NameCon id="name" name="司机姓名" />
+ </div>
+ <div class="col-sm-3">
+ <#NameCon id="phone" name="司机手机号" />
+ </div>
+ <div class="col-sm-3">
+ <#button name="搜索" icon="fa-search" clickFun="SelectPrivateCarDriver.search()"/>
+ <#button name="重置" icon="fa-trash" clickFun="SelectPrivateCarDriver.resetSearch()" space="true"/>
+ <#button btnCss="info" name="确定" id="ensure" icon="fa-check" clickFun="SelectPrivateCarDriver.selectDriver()" space="true"/>
+ <#button btnCss="danger" name="取消" id="cancel" icon="fa-eraser" clickFun="SelectPrivateCarDriver.close()" space="true"/>
+ </div>
+ </div>
+ <#table id="SelectPrivateCarDriverTable"/>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/tReassign/selectPrivateCarDriver.js"></script>
+@}
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tReassign/tReassign_reassignmentCross.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tReassign/tReassign_reassignmentCross.html
new file mode 100644
index 0000000..a4a739b
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tReassign/tReassign_reassignmentCross.html
@@ -0,0 +1,34 @@
+@layout("/common/_container.html"){
+<div class="row">
+ <div class="col-sm-12">
+ <div class="ibox float-e-margins">
+ <div class="ibox-title">
+ <h5>选择改派司机</h5>
+ </div>
+ <input type="hidden" id="id" name="id" value="${tReassignId}">
+ <div class="ibox-content">
+ <div class="row row-lg">
+ <div class="col-sm-12">
+ <div class="row">
+ <div class="col-sm-3">
+ <#NameCon id="name" name="司机姓名" />
+ </div>
+ <div class="col-sm-3">
+ <#NameCon id="phone" name="司机手机号" />
+ </div>
+ <div class="col-sm-3">
+ <#button name="搜索" icon="fa-search" clickFun="SelectCrossDriver.search()"/>
+ <#button name="重置" icon="fa-trash" clickFun="SelectCrossDriver.resetSearch()" space="true"/>
+ <#button btnCss="info" name="确定" id="ensure" icon="fa-check" clickFun="SelectCrossDriver.selectDriver()" space="true"/>
+ <#button btnCss="danger" name="取消" id="cancel" icon="fa-eraser" clickFun="SelectCrossDriver.close()" space="true"/>
+ </div>
+ </div>
+ <#table id="SelectCrossDriverTable"/>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/tReassign/selectCrossDriver.js"></script>
+@}
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tReassign/tReassign_reassignmentSmall.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tReassign/tReassign_reassignmentSmall.html
new file mode 100644
index 0000000..6af6c90
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tReassign/tReassign_reassignmentSmall.html
@@ -0,0 +1,34 @@
+@layout("/common/_container.html"){
+<div class="row">
+ <div class="col-sm-12">
+ <div class="ibox float-e-margins">
+ <div class="ibox-title">
+ <h5>选择改派司机</h5>
+ </div>
+ <input type="hidden" id="id" name="id" value="${tReassignId}">
+ <div class="ibox-content">
+ <div class="row row-lg">
+ <div class="col-sm-12">
+ <div class="row">
+ <div class="col-sm-3">
+ <#NameCon id="name" name="司机姓名" />
+ </div>
+ <div class="col-sm-3">
+ <#NameCon id="phone" name="司机手机号" />
+ </div>
+ <div class="col-sm-3">
+ <#button name="搜索" icon="fa-search" clickFun="SelectPrivateCarDriver.search()"/>
+ <#button name="重置" icon="fa-trash" clickFun="SelectPrivateCarDriver.resetSearch()" space="true"/>
+ <#button btnCss="info" name="确定" id="ensure" icon="fa-check" clickFun="SelectPrivateCarDriver.selectDriver()" space="true"/>
+ <#button btnCss="danger" name="取消" id="cancel" icon="fa-eraser" clickFun="SelectPrivateCarDriver.close()" space="true"/>
+ </div>
+ </div>
+ <#table id="SelectPrivateCarDriverTable"/>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/tReassign/selectSmallDriver.js"></script>
+@}
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tServerCarmodel/acrossCity.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tServerCarmodel/acrossCity.html
new file mode 100644
index 0000000..a821e59
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tServerCarmodel/acrossCity.html
@@ -0,0 +1,49 @@
+@layout("/common/_container.html"){
+<div class="row">
+ <div class="col-sm-12">
+ <div class="ibox float-e-margins">
+ <div class="ibox-title">
+ <h5>跨城车型设置管理</h5>
+ </div>
+ <div class="ibox-content">
+ <div class="row row-lg">
+ <div class="col-sm-12">
+ <div class="row">
+ <div class="col-sm-3">
+ <#NameCon id="name" name="车型名称" />
+ </div>
+ <div class="col-sm-3">
+ <#SelectCon id="state" name="状态" >
+ <option value="">全部</option>
+ <option value="1">正常</option>
+ <option value="2">禁用</option>
+ </#SelectCon>
+ </div>
+ <div class="col-sm-3">
+ <#button name="搜索" icon="fa-search" clickFun="TAcrossCity.search()"/>
+ <#button name="重置" icon="fa-trash" clickFun="TAcrossCity.resetSearch()" space="true"/>
+ </div>
+ </div>
+ <div class="hidden-xs" id="TAcrossCityTableToolbar" role="group">
+ @if(shiro.hasPermission("/tServerCarmodel/addAcrossCity")){
+ <#button name="添加" icon="fa-plus" clickFun="TAcrossCity.addAcrossCity()"/>
+ @}
+ @if(shiro.hasPermission("/tServerCarmodel/updateServerCarmodel")){
+ <#button name="修改" icon="fa-edit" clickFun="TAcrossCity.updateServerCarmodel()" space="true"/>
+ @}
+ @if(shiro.hasPermission("/tServerCarmodel/noAcrossCity")){
+ <#button name="禁用" icon="fa-edit" clickFun="TAcrossCity.noAcrossCity()" space="true"/>
+ @}
+ @if(shiro.hasPermission("/tServerCarmodel/yesAcrossCity")){
+ <#button name="启用" icon="fa-remove" clickFun="TAcrossCity.yesAcrossCity()" space="true"/>
+ @}
+ </div>
+ <#table id="TAcrossCityTable"/>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/tServerCarmodel/acrossCity.js"></script>
+@}
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tServerCarmodel/acrossCity_add.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tServerCarmodel/acrossCity_add.html
new file mode 100644
index 0000000..0a5a200
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tServerCarmodel/acrossCity_add.html
@@ -0,0 +1,24 @@
+@layout("/common/_container.html"){
+<div class="ibox float-e-margins">
+ <div class="ibox-content">
+ <div class="form-horizontal" id="acrossCityInfoForm">
+
+ <div class="row">
+ <div class="col-sm-11">
+ <#input id="name" name="车型名称"/>
+ <#avatar id="img" name="车型图片：" />
+ </div>
+ </div>
+
+ <div class="row btn-group-m-t">
+ <div class="col-sm-10 col-sm-offset-5">
+ <#button btnCss="info" name="提交" id="ensure" icon="fa-check" clickFun="TAcrossCityInfoDlg.addAcrossCity()"/>
+ <#button btnCss="danger" name="取消" id="cancel" icon="fa-eraser" clickFun="TAcrossCityInfoDlg.close()"/>
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/tServerCarmodel/acrossCity_info.js"></script>
+@}
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tServerCarmodel/acrossCity_edit.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tServerCarmodel/acrossCity_edit.html
new file mode 100644
index 0000000..1ff94c8
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tServerCarmodel/acrossCity_edit.html
@@ -0,0 +1,24 @@
+@layout("/common/_container.html"){
+<div class="ibox float-e-margins">
+ <div class="ibox-content">
+ <div class="form-horizontal" id="acrossCityInfoForm">
+ <input type="hidden" id="id" value="${data.id}">
+ <div class="row">
+ <div class="col-sm-11">
+ <#input id="name" name="车型名称" value="${data.name}"/>
+ <#avatar id="img" name="车型图片：" avatarImg="${data.img}"/>
+ </div>
+ </div>
+
+ <div class="row btn-group-m-t">
+ <div class="col-sm-10 col-sm-offset-5">
+ <#button btnCss="info" name="提交" id="ensure" icon="fa-check" clickFun="TAcrossCityInfoDlg.editAcrossCity()"/>
+ <#button btnCss="danger" name="取消" id="cancel" icon="fa-eraser" clickFun="TAcrossCityInfoDlg.close()"/>
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/tServerCarmodel/acrossCity_info.js"></script>
+@}
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tServerCarmodel/charter.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tServerCarmodel/charter.html
new file mode 100644
index 0000000..09f6d97
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tServerCarmodel/charter.html
@@ -0,0 +1,49 @@
+@layout("/common/_container.html"){
+<div class="row">
+ <div class="col-sm-12">
+ <div class="ibox float-e-margins">
+ <div class="ibox-title">
+ <h5>包车车型设置管理</h5>
+ </div>
+ <div class="ibox-content">
+ <div class="row row-lg">
+ <div class="col-sm-12">
+ <div class="row">
+ <div class="col-sm-3">
+ <#NameCon id="name" name="车型名称" />
+ </div>
+ <div class="col-sm-3">
+ <#SelectCon id="state" name="状态" >
+ <option value="">全部</option>
+ <option value="1">正常</option>
+ <option value="2">禁用</option>
+ </#SelectCon>
+ </div>
+ <div class="col-sm-3">
+ <#button name="搜索" icon="fa-search" clickFun="TCharter.search()"/>
+ <#button name="重置" icon="fa-trash" clickFun="TCharter.resetSearch()" space="true"/>
+ </div>
+ </div>
+ <div class="hidden-xs" id="TCharterTableToolbar" role="group">
+ @if(shiro.hasPermission("/tServerCarmodel/addCharter")){
+ <#button name="添加" icon="fa-plus" clickFun="TCharter.addCharter()"/>
+ @}
+ @if(shiro.hasPermission("/tServerCarmodel/update")){
+ <#button name="修改" icon="fa-edit" clickFun="TCharter.editCharter()" space="true"/>
+ @}
+ @if(shiro.hasPermission("/tServerCarmodel/noCharter")){
+ <#button name="禁用" icon="fa-edit" clickFun="TCharter.noCharter()" space="true"/>
+ @}
+ @if(shiro.hasPermission("/tServerCarmodel/yesCharter")){
+ <#button name="启用" icon="fa-remove" clickFun="TCharter.yesCharter()" space="true"/>
+ @}
+ </div>
+ <#table id="TCharterTable"/>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/tServerCarmodel/charter.js"></script>
+@}
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tServerCarmodel/charter_add.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tServerCarmodel/charter_add.html
new file mode 100644
index 0000000..3e6c009
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tServerCarmodel/charter_add.html
@@ -0,0 +1,47 @@
+@layout("/common/_container.html"){
+<style>
+ .newWidth, .single-line{
+ max-width:150px !important;display: initial !important;
+ }
+</style>
+<div class="ibox float-e-margins">
+ <div class="ibox-content">
+ <div class="form-horizontal" id="charterInfoForm">
+
+ <div class="row">
+ <div class="col-sm-11">
+ <#input id="name" name="车型名称"/>
+
+ <div class="form-group">
+ <label class="col-sm-3 control-label">车型价格范围为：</label>
+ <div class="col-sm-9">
+ <input type="text" oninput="checkIsYuan(this)" name="one" id="one" class="form-control newWidth" />
+ 至 <input type="text" oninput="checkIsYuan(this)" name="two" id="two" class="form-control newWidth" /> 元
+ </div>
+ </div>
+
+ <#avatar id="img" name="车型图片：" />
+ </div>
+ </div>
+
+ <div class="row btn-group-m-t">
+ <div class="col-sm-10 col-sm-offset-5">
+ <#button btnCss="info" name="提交" id="ensure" icon="fa-check" clickFun="TCharterInfoDlg.addCharter()"/>
+ <#button btnCss="danger" name="取消" id="cancel" icon="fa-eraser" clickFun="TCharterInfoDlg.close()"/>
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/tServerCarmodel/charter_info.js"></script>
+<script type="text/javascript">
+ var regDouble = /^(([1-9]{1}\d*)|(0{1}))(\.\d{0,2})?$/;
+ function checkIsYuan(obj){
+ var num = $(obj).val();
+ if(!regDouble.test(num)){
+ layer.msg("【元】格式不正确,保留两位小数");
+ }
+ }
+</script>
+@}
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tServerCarmodel/charter_edit.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tServerCarmodel/charter_edit.html
new file mode 100644
index 0000000..00db466
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tServerCarmodel/charter_edit.html
@@ -0,0 +1,47 @@
+@layout("/common/_container.html"){
+<style>
+ .newWidth, .single-line{
+ max-width:150px !important;display: initial !important;
+ }
+</style>
+<div class="ibox float-e-margins">
+ <div class="ibox-content">
+ <div class="form-horizontal" id="charterInfoForm">
+ <input type="hidden" id="id" value="${data.id}">
+ <div class="row">
+ <div class="col-sm-11">
+ <#input id="name" name="车型名称" value="${data.name}"/>
+
+ <div class="form-group">
+ <label class="col-sm-3 control-label">车型价格范围为：</label>
+ <div class="col-sm-9">
+ <input type="text" oninput="checkIsYuan(this)" name="one" id="one" class="form-control newWidth" value="${price1}"/>
+ 至 <input type="text" oninput="checkIsYuan(this)" name="two" id="two" class="form-control newWidth" value="${price2}"/> 元
+ </div>
+ </div>
+
+ <#avatar id="img" name="车型图片：" avatarImg="${data.img}"/>
+ </div>
+ </div>
+
+ <div class="row btn-group-m-t">
+ <div class="col-sm-10 col-sm-offset-5">
+ <#button btnCss="info" name="提交" id="ensure" icon="fa-check" clickFun="TCharterInfoDlg.editCharter()"/>
+ <#button btnCss="danger" name="取消" id="cancel" icon="fa-eraser" clickFun="TCharterInfoDlg.close()"/>
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/tServerCarmodel/charter_info.js"></script>
+<script type="text/javascript">
+ var regDouble = /^(([1-9]{1}\d*)|(0{1}))(\.\d{0,2})?$/;
+ function checkIsYuan(obj){
+ var num = $(obj).val();
+ if(!regDouble.test(num)){
+ layer.msg("【元】格式不正确,保留两位小数");
+ }
+ }
+</script>
+@}
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tServerCarmodel/tServerCarmodel.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tServerCarmodel/tServerCarmodel.html
new file mode 100644
index 0000000..0d7ea20
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tServerCarmodel/tServerCarmodel.html
@@ -0,0 +1,49 @@
+@layout("/common/_container.html"){
+<div class="row">
+ <div class="col-sm-12">
+ <div class="ibox float-e-margins">
+ <div class="ibox-title">
+ <h5>专车车型设置管理</h5>
+ </div>
+ <div class="ibox-content">
+ <div class="row row-lg">
+ <div class="col-sm-12">
+ <div class="row">
+ <div class="col-sm-3">
+ <#NameCon id="name" name="车型名称" />
+ </div>
+ <div class="col-sm-3">
+ <#SelectCon id="state" name="状态" >
+ <option value="">全部</option>
+ <option value="1">正常</option>
+ <option value="2">禁用</option>
+ </#SelectCon>
+ </div>
+ <div class="col-sm-3">
+ <#button name="搜索" icon="fa-search" clickFun="TServerCarmodel.search()"/>
+ <#button name="重置" icon="fa-trash" clickFun="TServerCarmodel.resetSearch()" space="true"/>
+ </div>
+ </div>
+ <div class="hidden-xs" id="TServerCarmodelTableToolbar" role="group">
+ @if(shiro.hasPermission("/tServerCarmodel/add")){
+ <#button name="添加" icon="fa-plus" clickFun="TServerCarmodel.openAddTServerCarmodel()"/>
+ @}
+ @if(shiro.hasPermission("/tServerCarmodel/update")){
+ <#button name="修改" icon="fa-edit" clickFun="TServerCarmodel.updateTOrderEvaluateDetail()" space="true"/>
+ @}
+ @if(shiro.hasPermission("/tServerCarmodel/no")){
+ <#button name="禁用" icon="fa-edit" clickFun="TServerCarmodel.no()" space="true"/>
+ @}
+ @if(shiro.hasPermission("/tServerCarmodel/yes")){
+ <#button name="启用" icon="fa-remove" clickFun="TServerCarmodel.yes()" space="true"/>
+ @}
+ </div>
+ <#table id="TServerCarmodelTable"/>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/tServerCarmodel/tServerCarmodel.js"></script>
+@}
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tServerCarmodel/tServerCarmodel_add.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tServerCarmodel/tServerCarmodel_add.html
new file mode 100644
index 0000000..b650cf8
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tServerCarmodel/tServerCarmodel_add.html
@@ -0,0 +1,24 @@
+@layout("/common/_container.html"){
+<div class="ibox float-e-margins">
+ <div class="ibox-content">
+ <div class="form-horizontal" id="serverCarModelInfoForm">
+
+ <div class="row">
+ <div class="col-sm-11">
+ <#input id="name" name="车型名称"/>
+ <#avatar id="img" name="车型图片：" />
+ </div>
+ </div>
+
+ <div class="row btn-group-m-t">
+ <div class="col-sm-10 col-sm-offset-5">
+ <#button btnCss="info" name="提交" id="ensure" icon="fa-check" clickFun="TServerCarmodelInfoDlg.addSubmit()"/>
+ <#button btnCss="danger" name="取消" id="cancel" icon="fa-eraser" clickFun="TServerCarmodelInfoDlg.close()"/>
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/tServerCarmodel/tServerCarmodel_info.js"></script>
+@}
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tServerCarmodel/tServerCarmodel_edit.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tServerCarmodel/tServerCarmodel_edit.html
new file mode 100644
index 0000000..587aa9c
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tServerCarmodel/tServerCarmodel_edit.html
@@ -0,0 +1,24 @@
+@layout("/common/_container.html"){
+<div class="ibox float-e-margins">
+ <div class="ibox-content">
+ <div class="form-horizontal" id="serverCarModelInfoForm">
+ <input type="hidden" id="id" value="${data.id}">
+ <div class="row">
+ <div class="col-sm-11">
+ <#input id="name" name="车型名称" value="${data.name}"/>
+ <#avatar id="img" name="车型图片：" avatarImg="${data.img}"/>
+ </div>
+ </div>
+
+ <div class="row btn-group-m-t">
+ <div class="col-sm-10 col-sm-offset-5">
+ <#button btnCss="info" name="提交" id="ensure" icon="fa-check" clickFun="TServerCarmodelInfoDlg.editSubmit()"/>
+ <#button btnCss="danger" name="取消" id="cancel" icon="fa-eraser" clickFun="TServerCarmodelInfoDlg.close()"/>
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/tServerCarmodel/tServerCarmodel_info.js"></script>
+@}
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tSite/tSite.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tSite/tSite.html
new file mode 100644
index 0000000..20a8dd3
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tSite/tSite.html
@@ -0,0 +1,67 @@
+@layout("/common/_container.html"){
+<div class="row">
+ <div class="col-sm-12">
+ <div class="ibox float-e-margins">
+ <div class="ibox-title">
+ <h5>跨城站点管理</h5>
+ </div>
+ <div class="ibox-content">
+ <div class="row row-lg">
+ <div class="col-sm-12">
+ <div class="row">
+ <div class="col-sm-3">
+ <#TimeCon id="insertTime" name="添加时间" isTime="false"/>
+ </div>
+ <div class="col-sm-3">
+ <#NameCon id="name" name="站点名称" />
+ </div>
+ <div class="col-sm-3">
+ <#NameCon id="insertUser" name="创建者" />
+ </div>
+ <div class="col-sm-3">
+ <#NameCon id="city" name="所属城市" />
+ </div>
+ <div class="col-sm-3">
+ <#SelectCon id="state" name="状态" >
+ <option value="">全部</option>
+ <option value="1">正常</option>
+ <option value="2">冻结</option>
+ </#SelectCon>
+ </div>
+ <div class="col-sm-3">
+ <#button name="搜索" icon="fa-search" clickFun="TSite.search()"/>
+ <#button name="重置" icon="fa-trash" clickFun="TSite.resetSearch()" space="true"/>
+ </div>
+ </div>
+ <div class="hidden-xs" id="TSiteTableToolbar" role="group">
+ @if(shiro.hasPermission("/tSite/add")){
+ <#button name="添加" icon="fa-plus" clickFun="TSite.openAddTSite()"/>
+ @}
+ @if(shiro.hasPermission("/tSite/update")){
+ <#button name="编辑" icon="fa-edit" clickFun="TSite.openTSiteDetail()" space="true"/>
+ @}
+ @if(shiro.hasPermission("/tSite/delete")){
+ <#button name="删除" icon="fa-remove" clickFun="TSite.opt(1)" space="true"/>
+ @}
+ @if(shiro.hasPermission("/tSite/freeze")){
+ <#button name="冻结" icon="fa-remove" clickFun="TSite.opt(2)" space="true"/>
+ @}
+ @if(shiro.hasPermission("/tSite/thaw")){
+ <#button name="解冻" icon="fa-remove" clickFun="TSite.opt(3)" space="true"/>
+ @}
+ </div>
+ <#table id="TSiteTable"/>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/tSite/tSite.js"></script>
+<script>
+ laydate.render({
+ elem: '#insertTime'
+ ,range: true
+ });
+</script>
+@}
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tSite/tSite_add.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tSite/tSite_add.html
new file mode 100644
index 0000000..284514e
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tSite/tSite_add.html
@@ -0,0 +1,170 @@
+@layout("/common/_container.html"){
+<div class="ibox float-e-margins">
+ <div class="ibox-content">
+ <div class="form-horizontal" id="siteInfoForm">
+ <div class="row">
+ <div class="col-sm-12">
+ <div class="">
+ <h3 style="margin-left: 100px;">站点信息</h3>
+ </div>
+ <div class="form-group">
+ <label class="col-sm-2 control-label">站点名称：</label>
+ <div class="col-sm-6">
+ <input type="text" class="form-control" id="name" name="name">
+ </div>
+ </div>
+ <div class="form-group">
+ <label class="col-sm-2 control-label">所属城市：</label>
+ <div class="col-sm-2">
+ <select class="form-control" id="provinceCode" onchange="TSiteInfoDlg.provinceChange(this)">
+ <option value="">选择省</option>
+ @for(obj in provinceList){
+ <option value="${obj.code}">${obj.name}</option>
+ @}
+ </select>
+ </div>
+ <div class="col-sm-2">
+ <select class="form-control" id="cityCode" onchange="TSiteInfoDlg.cityChange(this)">
+ <option value="">选择市</option>
+ </select>
+ </div>
+ <div class="col-sm-2">
+ <select class="form-control" id="districtCode">
+ <option value="">选择区</option>
+ </select>
+ </div>
+ </div>
+
+ <div class="">
+ <h3 style="margin-left: 100px;margin-top: 70px;">站点区域</h3>
+ </div>
+ <div class="form-group">
+ <label class="col-sm-2 control-label">区域名称：</label>
+ <div class="col-sm-2">
+ <input type="text" class="form-control" id="areaName" name="areaName">
+ </div>
+ <label class="col-sm-1 control-label">类型：</label>
+ <div class="col-sm-2" style="display: flex;align-items: center;">
+ <div class="radio radio-info radio-inline">
+ <input type="radio" id="areaType1" value="1" name="areaType" checked="" onclick="TSiteInfoDlg.areaTypeClick(1)">
+ <label for="areaType1"> 行政区域 </label>
+ </div>
+ <div class="radio radio-success radio-inline">
+ <input type="radio" id="areaType2" value="2" name="areaType" onclick="TSiteInfoDlg.areaTypeClick(2)">
+ <label for="areaType2"> 电子围栏 </label>
+ </div>
+ </div>
+ <div class="col-sm-2">
+ <#button btnCss="info" name="添加" id="ensure" icon="fa-check" clickFun="TSiteInfoDlg.addArea()"/>
+ </div>
+ </div>
+ <div class="form-group" id="areaType1Div">
+ <label class="col-sm-2 control-label">行政区域：</label>
+ <div class="col-sm-2">
+ <select class="form-control" id="provinceCode1" onchange="TSiteInfoDlg.provinceChange1(this)">
+ <option value="">选择省</option>
+ @for(obj in provinceList){
+ <option value="${obj.code}">${obj.name}</option>
+ @}
+ </select>
+ </div>
+ <div class="col-sm-2">
+ <select class="form-control" id="cityCode1" onchange="TSiteInfoDlg.cityChange1(this)">
+ <option value="">选择市</option>
+ </select>
+ </div>
+ <div class="col-sm-2">
+ <select class="form-control" id="districtCode1">
+ <option value="">选择区</option>
+ </select>
+ </div>
+ </div>
+ <div class="form-group" id="areaType2Div" style="display: none;">
+ <label class="col-sm-2 control-label">电子围栏：</label>
+ <div class="col-sm-8">
+ <div id="container" style="height: 350px;width: 1000px;"></div>
+ <div class='info' style="margin-top:10px;position: absolute; z-index: 999; left: 20px; width: 450px;">操作说明：圆和矩形通过拖拽来绘制，其他覆盖物通过点击来绘制</div>
+ <div class="input-card" style='margin-top:28px;width: 100rem; z-index: 999; bottom: 20px;'>
+ <div class="input-item">
+ <!--<input type="radio" name='func' checked="" value='marker'><span class="input-text">画点</span>-->
+ <!--<input type="radio" name='func' value='polyline'><span class="input-text">画折线</span> -->
+ <input type="radio" name='func' value='polygon'><span class="input-text" style='width:5rem;'>画多边形</span>
+ <!--<input type="radio" name='func' value='rectangle'><span class="input-text" style='width:5rem;'>画矩形</span> -->
+ <input type="radio" name='func' value='circle'><span class="input-text" style='width:5rem;'>画圆</span>
+ </div>
+ <div class="input-item">
+ <input id="clear" type="button" class="btn" value="清除" />
+ <input id="close" type="button" class="btn" value="关闭绘图" />
+ <input type="button" class="btn" value="开始编辑" onclick="editAll()" />
+ <input type="button" class="btn" value="结束编辑" onclick="closeEdit()" />
+ </div>
+ </div>
+ </div>
+ <div class="col-sm-2">
+ <div class="form-group">
+ <label style='color:grey'>行政区边界查询</label>
+ <div class="input-group">
+ <div class="input-group-btn">
+ <button data-toggle="dropdown" class="btn btn-white dropdown-toggle"
+ type="button">行政级别
+ </button>
+ </div>
+ <select id="level" class="form-control">
+ <option value="district">区</option>
+ <option value="city">市</option>
+ <option value="province">省</option>
+ </select>
+
+ </div>
+ </div>
+ <div class="form-group">
+ <div class="input-group">
+ <div class="input-group-btn">
+ <button data-toggle="dropdown" class="btn btn-white dropdown-toggle"
+ type="button">名称/adcode
+ </button>
+ </div>
+ <input id='district' class="layui-input form-control" type="text" value=''>
+ </div>
+ </div>
+ <input id="find" type="button" class="btn btn-primary btn-sm" value="查询" />
+ </div>
+ </div>
+
+ <div class="form-group">
+ <label class="col-sm-2 control-label">已添加区域</label>
+ <div class="col-sm-6">
+ <div style="height: 200px; border: 1px solid #e5e6e7;overflow-y: auto;">
+ <table class="table table-striped table-bordered table-hover table-condensed">
+ <thead>
+ <tr>
+ <th style="width: 300px;text-align: center;">添加时间</th>
+ <th style="width: 300px;text-align: center;">区域名称</th>
+ <th style="width: 100px;text-align: center;">操作</th>
+ </tr>
+ </thead>
+ <tbody id="areaValue">
+
+ </tbody>
+ </table>
+ </div>
+ </div>
+ </div>
+
+ </div>
+ </div>
+
+ <div class="row btn-group-m-t">
+ <div class="col-sm-10 col-sm-offset-5">
+ <#button btnCss="info" name="提交" id="ensure" icon="fa-check" clickFun="TSiteInfoDlg.addSubmit()"/>
+ <#button btnCss="danger" name="取消" id="cancel" icon="fa-eraser" clickFun="TSiteInfoDlg.close()"/>
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+<script src="https://webapi.amap.com/maps?v=1.4.15&key=c59c0ec8058a8305009eb315584e07d1&plugin=AMap.MouseTool,AMap.DistrictSearch,AMap.PolyEditor,AMap.RectangleEditor,AMap.CircleEditor"></script>
+<script src="${ctxPath}/static/modular/system/tSite/electricFence.js"></script>
+<script src="${ctxPath}/static/modular/system/tSite/tSite_info.js"></script>
+@}
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tSite/tSite_edit.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tSite/tSite_edit.html
new file mode 100644
index 0000000..319a285
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tSite/tSite_edit.html
@@ -0,0 +1,193 @@
+@layout("/common/_container.html"){
+<div class="ibox float-e-margins">
+ <div class="ibox-content">
+ <div class="form-horizontal" id="siteInfoForm">
+ <input type="hidden" id="id" name="id" value="${item.id}">
+ <div class="row">
+ <div class="col-sm-12">
+ <div class="">
+ <h3 style="margin-left: 100px;">站点信息</h3>
+ </div>
+ <div class="form-group">
+ <label class="col-sm-2 control-label">站点名称：</label>
+ <div class="col-sm-6">
+ <input type="text" class="form-control" id="name" name="name" value="${item.name}">
+ </div>
+ </div>
+ <div class="form-group">
+ <label class="col-sm-2 control-label">所属城市：</label>
+ <div class="col-sm-2">
+ <select class="form-control" id="provinceCode" onchange="TSiteInfoDlg.provinceChange(this)">
+ <option value="">选择省</option>
+ @for(obj in provinceList){
+ <option value="${obj.code}" ${obj.code == item.provinceCode ? 'selected=selected' : ''}>${obj.name}</option>
+ @}
+ </select>
+ </div>
+ <div class="col-sm-2">
+ <select class="form-control" id="cityCode" onchange="TSiteInfoDlg.cityChange(this)">
+ <option value="">选择市</option>
+ @for(obj in cityList){
+ <option value="${obj.code}" ${obj.code == item.cityCode ? 'selected=selected' : ''}>${obj.name}</option>
+ @}
+ </select>
+ </div>
+ <div class="col-sm-2">
+ <select class="form-control" id="districtCode">
+ <option value="">选择区</option>
+ @for(obj in areaList){
+ <option value="${obj.code}" ${obj.code == item.districtCode ? 'selected=selected' : ''}>${obj.name}</option>
+ @}
+ </select>
+ </div>
+ </div>
+
+ <div class="">
+ <h3 style="margin-left: 100px;margin-top: 70px;">站点区域</h3>
+ </div>
+ <div class="form-group">
+ <label class="col-sm-2 control-label">区域名称：</label>
+ <div class="col-sm-2">
+ <input type="text" class="form-control" id="areaName" name="areaName">
+ </div>
+ <label class="col-sm-1 control-label">类型：</label>
+ <div class="col-sm-2" style="display: flex;align-items: center;">
+ <div class="radio radio-info radio-inline">
+ <input type="radio" id="areaType1" value="1" name="areaType" ${checked1} disabled onclick="TSiteInfoDlg.areaTypeClick(1)">
+ <label for="areaType1"> 行政区域 </label>
+ </div>
+ <div class="radio radio-success radio-inline">
+ <input type="radio" id="areaType2" value="2" name="areaType" ${checked2} disabled onclick="TSiteInfoDlg.areaTypeClick(2)">
+ <label for="areaType2"> 电子围栏 </label>
+ </div>
+ </div>
+ <div class="col-sm-2">
+ <#button btnCss="info" name="添加" id="ensure" icon="fa-check" clickFun="TSiteInfoDlg.addArea()"/>
+ </div>
+ </div>
+ <div class="form-group" id="areaType1Div" style="display: ${type1};">
+ <label class="col-sm-2 control-label">行政区域：</label>
+ <div class="col-sm-2">
+ <select class="form-control" id="provinceCode1" onchange="TSiteInfoDlg.provinceChange1(this)">
+ <option value="">选择省</option>
+ @for(obj in provinceList){
+ <option value="${obj.code}">${obj.name}</option>
+ @}
+ </select>
+ </div>
+ <div class="col-sm-2">
+ <select class="form-control" id="cityCode1" onchange="TSiteInfoDlg.cityChange1(this)">
+ <option value="">选择市</option>
+ </select>
+ </div>
+ <div class="col-sm-2">
+ <select class="form-control" id="districtCode1">
+ <option value="">选择区</option>
+ </select>
+ </div>
+ </div>
+ <div class="form-group" id="areaType2Div" style="display: ${type2};">
+ <label class="col-sm-2 control-label">电子围栏：</label>
+ <div class="col-sm-8">
+ <div id="container" style="height: 350px;width: 1000px;"></div>
+ <div class='info' style="margin-top:10px;position: absolute; z-index: 999; left: 20px; width: 450px;">操作说明：圆和矩形通过拖拽来绘制，其他覆盖物通过点击来绘制</div>
+ <div class="input-card" style='margin-top:28px;width: 100rem; z-index: 999; bottom: 20px;'>
+ <div class="input-item">
+ <!--<input type="radio" name='func' checked="" value='marker'><span class="input-text">画点</span>-->
+ <!--<input type="radio" name='func' value='polyline'><span class="input-text">画折线</span> -->
+ <input type="radio" name='func' value='polygon'><span class="input-text" style='width:5rem;'>画多边形</span>
+ <!--<input type="radio" name='func' value='rectangle'><span class="input-text" style='width:5rem;'>画矩形</span> -->
+ <input type="radio" name='func' value='circle'><span class="input-text" style='width:5rem;'>画圆</span>
+ </div>
+ <div class="input-item">
+ <input id="clear" type="button" class="btn" value="清除" />
+ <input id="close" type="button" class="btn" value="关闭绘图" />
+ <input type="button" class="btn" value="开始编辑" onclick="editAll()" />
+ <input type="button" class="btn" value="结束编辑" onclick="closeEdit()" />
+ </div>
+ </div>
+ </div>
+ <div class="col-sm-2">
+ <div class="form-group">
+ <label style='color:grey'>行政区边界查询</label>
+ <div class="input-group">
+ <div class="input-group-btn">
+ <button data-toggle="dropdown" class="btn btn-white dropdown-toggle"
+ type="button">行政级别
+ </button>
+ </div>
+ <select id="level" class="form-control">
+ <option value="district">区</option>
+ <option value="city">市</option>
+ <option value="province">省</option>
+ </select>
+
+ </div>
+ </div>
+ <div class="form-group">
+ <div class="input-group">
+ <div class="input-group-btn">
+ <button data-toggle="dropdown" class="btn btn-white dropdown-toggle"
+ type="button">名称/adcode
+ </button>
+ </div>
+ <input id='district' class="layui-input form-control" type="text" value=''>
+ </div>
+ </div>
+ <input id="find" type="button" class="btn btn-primary btn-sm" value="查询" />
+ </div>
+ </div>
+ <div class="form-group">
+ <label class="col-sm-2 control-label">已添加区域</label>
+ <div class="col-sm-6">
+ <div style="height: 200px; border: 1px solid #e5e6e7;overflow-y: auto;">
+ <table class="table table-striped table-bordered table-hover table-condensed">
+ <thead>
+ <tr>
+ <th style="width: 300px;text-align: center;">添加时间</th>
+ <th style="width: 300px;text-align: center;">区域名称</th>
+ <th style="width: 100px;text-align: center;">操作</th>
+ </tr>
+ </thead>
+ <tbody id="areaValue">
+ @for(obj in locationList!){
+ <tr class="areaValueClass">
+ <td style="text-align: center;"><input type="hidden" id="areaType1" name="areaType1" value="${obj.type}">
+ <input type="hidden" id="time" name="time" value="${obj.addTime}">${obj.addTime}</td>
+ <td style="text-align: center;">
+ <input type="hidden" id="id" name="id" value="${obj.id}">
+ <input type="hidden" id="name" name="name" value="${obj.name}">
+ <input type="hidden" id="provinceCode1" name="provinceCode1" value="${obj.provinceCode}">
+ <input type="hidden" id="province1" name="province1" value="${obj.province}">
+ <input type="hidden" id="cityCode1" name="cityCode1" value="${obj.cityCode}">
+ <input type="hidden" id="city1" name="city1" value="${obj.city}">
+ <input type="hidden" id="districtCode1" name="districtCode1" value="${obj.districtCode}">
+ <input type="hidden" id="district1" name="district1" value="${obj.district}">
+ <input type="hidden" id="coordinate1" name="coordinate1" value="${obj.coordinate}">
+ ${obj.name}</td>
+ <td style="text-align: center;"><button onclick="deleteSub(this)">移除</button></td>
+ </tr>
+ @}
+ </tbody>
+ </table>
+ </div>
+ </div>
+ </div>
+
+ </div>
+ </div>
+
+ <div class="row btn-group-m-t">
+ <div class="col-sm-10 col-sm-offset-5">
+ <#button btnCss="info" name="提交" id="ensure" icon="fa-check" clickFun="TSiteInfoDlg.editSubmit()"/>
+ <#button btnCss="danger" name="取消" id="cancel" icon="fa-eraser" clickFun="TSiteInfoDlg.close()"/>
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+<script src="https://webapi.amap.com/maps?v=1.4.15&key=c59c0ec8058a8305009eb315584e07d1&plugin=AMap.MouseTool,AMap.DistrictSearch,AMap.PolyEditor,AMap.RectangleEditor,AMap.CircleEditor"></script>
+<script src="${ctxPath}/static/modular/system/tSite/electricFence.js"></script>
+<script src="${ctxPath}/static/modular/system/tSite/tSite_info.js"></script>
+@}
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tSmsrecord/tSmsrecord.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tSmsrecord/tSmsrecord.html
new file mode 100644
index 0000000..4514c5e
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tSmsrecord/tSmsrecord.html
@@ -0,0 +1,48 @@
+@layout("/common/_container.html"){
+<div class="row">
+ <div class="col-sm-12">
+ <div class="ibox float-e-margins">
+ <div class="ibox-title">
+ <h5>短信记录管理</h5>
+ </div>
+ <div class="ibox-content">
+ <div class="row row-lg">
+ <div class="col-sm-12">
+ <div class="row">
+ <div class="col-sm-3">
+ <#TimeCon id="insertTime" name="发送时间" isTime="false"/>
+ </div>
+ <div class="col-sm-3">
+ <#NameCon id="phone" name="手机号" />
+ </div>
+ <div class="col-sm-3">
+ <#button name="搜索" icon="fa-search" clickFun="TSmsrecord.search()"/>
+ <#button name="重置" icon="fa-trash" clickFun="TSmsrecord.resetSearch()" space="true"/>
+ </div>
+ </div>
+ <div class="hidden-xs" id="TSmsrecordTableToolbar" role="group">
+ @if(shiro.hasPermission("/tSmsrecord/add")){
+ <#button name="添加" icon="fa-plus" clickFun="TSmsrecord.openAddTSmsrecord()"/>
+ @}
+ @if(shiro.hasPermission("/tSmsrecord/update")){
+ <#button name="修改" icon="fa-edit" clickFun="TSmsrecord.openTSmsrecordDetail()" space="true"/>
+ @}
+ @if(shiro.hasPermission("/tSmsrecord/delete")){
+ <#button name="删除" icon="fa-remove" clickFun="TSmsrecord.delete()" space="true"/>
+ @}
+ </div>
+ <#table id="TSmsrecordTable"/>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/tSmsrecord/tSmsrecord.js"></script>
+<script>
+ laydate.render({
+ elem: '#insertTime'
+ ,range: true
+ });
+</script>
+@}
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tSmsrecord/tSmsrecord_add.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tSmsrecord/tSmsrecord_add.html
new file mode 100644
index 0000000..1bffdff
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tSmsrecord/tSmsrecord_add.html
@@ -0,0 +1,31 @@
+@layout("/common/_container.html"){
+<div class="ibox float-e-margins">
+ <div class="ibox-content">
+ <div class="form-horizontal">
+
+ <div class="row">
+ <div class="col-sm-6 b-r">
+ <#input id="id" name="主键ID" underline="true"/>
+ <#input id="type" name="类型：1=用户端注册/登录，2=用户端更换手机,3=用户端忘记密码，4=用户修改密码，5=司机注册，6=司机忘记密码，7=司机修改手机号，8=司机修改密码" underline="true"/>
+ <#input id="phone" name="电话 "/>
+ </div>
+
+ <div class="col-sm-6">
+ <#input id="code" name="验证码" underline="true"/>
+ <#input id="content" name="短信内容" underline="true"/>
+ <#input id="createTime" name="添加时间 " underline="true"/>
+ </div>
+ </div>
+
+ <div class="row btn-group-m-t">
+ <div class="col-sm-10">
+ <#button btnCss="info" name="提交" id="ensure" icon="fa-check" clickFun="TSmsrecordInfoDlg.addSubmit()"/>
+ <#button btnCss="danger" name="取消" id="cancel" icon="fa-eraser" clickFun="TSmsrecordInfoDlg.close()"/>
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/tSmsrecord/tSmsrecord_info.js"></script>
+@}
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tSmsrecord/tSmsrecord_edit.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tSmsrecord/tSmsrecord_edit.html
new file mode 100644
index 0000000..63926d0
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tSmsrecord/tSmsrecord_edit.html
@@ -0,0 +1,31 @@
+@layout("/common/_container.html"){
+<div class="ibox float-e-margins">
+ <div class="ibox-content">
+ <div class="form-horizontal">
+
+ <div class="row">
+ <div class="col-sm-6 b-r">
+ <#input id="id" name="主键ID" value="${item.id}" underline="true"/>
+ <#input id="type" name="类型：1=用户端注册/登录，2=用户端更换手机,3=用户端忘记密码，4=用户修改密码，5=司机注册，6=司机忘记密码，7=司机修改手机号，8=司机修改密码" value="${item.type}" underline="true"/>
+ <#input id="phone" name="电话 " value="${item.phone}" />
+ </div>
+
+ <div class="col-sm-6">
+ <#input id="code" name="验证码" value="${item.code}" underline="true"/>
+ <#input id="content" name="短信内容" value="${item.content}" underline="true"/>
+ <#input id="createTime" name="添加时间 " value="${item.createTime}" />
+ </div>
+ </div>
+
+ <div class="row btn-group-m-t">
+ <div class="col-sm-10">
+ <#button btnCss="info" name="提交" id="ensure" icon="fa-check" clickFun="TSmsrecordInfoDlg.editSubmit()"/>
+ <#button btnCss="danger" name="取消" id="cancel" icon="fa-eraser" clickFun="TSmsrecordInfoDlg.close()"/>
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/tSmsrecord/tSmsrecord_info.js"></script>
+@}
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tSysReformist/tSysReformist.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tSysReformist/tSysReformist.html
new file mode 100644
index 0000000..8f11299
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tSysReformist/tSysReformist.html
@@ -0,0 +1,554 @@
+@layout("/common/_container.html"){
+<style>
+ .newWidth, .single-line{
+ max-width:150px !important;display: initial !important;
+ }
+</style>
+<div class="ibox float-e-margins">
+ <div class="ibox-content">
+ <div class="form-horizontal">
+ <div class="row">
+ <div class="col-sm-11">
+ <div class="ibox-title">
+ <h3>系统设置:</h3>
+ </div>
+
+ <div class="form-group">
+ <label class="col-sm-2 control-label">改派设置：</label>
+ <div class="col-sm-10">
+ 改派费用为 <input type="text" oninput="checkIsDouble(this)"
+ @if(isNotEmpty(reformist)){
+ value="${reformist.money}"
+ @}else{
+ value=""
+ @}
+ name="one" id="one" class="form-control newWidth" /> 元；<br/>
+ </div>
+ </div>
+
+ <div class="form-group">
+ <label class="col-sm-2 control-label">积分设置：</label>
+ <div class="col-sm-10">
+ 消费一元积 <input type="text" oninput="checkIsInt(this)"
+ @if(isNotEmpty(integral)){
+ value="${integral.integral}"
+ @}else{
+ value=""
+ @}
+ name="two" id="two" class="form-control newWidth" /> 积分；<br/>
+ </div>
+ </div>
+
+ <div class="form-group" style="height: 70px;">
+ <label class="col-sm-2 control-label">人脸识别：</label>
+ <div class="col-sm-10">
+ <div class="radio radio-danger">
+ <input type="radio" name="three" id="three1" value="2"
+ ${isNotEmpty(faceDistinguish) && 2 == faceDistinguish.isOpen ? 'checked=checked' : ''}
+ onclick="threeClick(2)">
+ <label for="three1">
+ 关闭
+ </label>
+ </div>
+ <div class="radio radio-danger">
+ <input type="radio" name="three" id="three2" value="1"
+ ${isNotEmpty(faceDistinguish) && 1 == faceDistinguish.isOpen ? 'checked=checked' : ''}
+ onclick="threeClick(1)">
+ <label for="three2">
+ 打开
+ <div id="openDiv" style="position: relative;top: -26px;margin-left: 50px;display: none;">
+ <span style="margin-left: 20px;">上班中每隔</span>
+ <input type="text" oninput="checkIsInt(this)" class="form-control newWidth"
+ ${isNotEmpty(faceDistinguish) && 1 == faceDistinguish.isOpen ? 'value='+faceDistinguish.minuteNum : ''}
+ id="openValue" name="openValue">
+ <span>分钟，进行一次人脸识别；</span>
+ </div>
+ </label>
+ </div>
+ </div>
+ </div>
+
+ <div class="form-group">
+ <label class="col-sm-2 control-label">专车改派：</label>
+ <div class="col-sm-10">
+ <div class="form-group">
+ <div class="col-sm-9">
+ <input type="checkbox" class="js-switch" id="isSpecialCar"
+ @if(isNotEmpty(reformist)){
+ ${1 == reformist.isSpecialCar ? '' : 'checked=checked'}
+ @}
+ />
+ </div>
+ </div>
+ </div>
+ </div>
+
+ <div class="form-group">
+ <label class="col-sm-2 control-label">出租车改派：</label>
+ <div class="col-sm-10">
+ <div class="form-group">
+ <div class="col-sm-9">
+ <input type="checkbox" class="js-switch1" id="isTaxiCar"
+ @if(isNotEmpty(reformist)){
+ ${1 == reformist.isTaxiCar ? '' : 'checked=checked'}
+ @}
+ />
+ </div>
+ </div>
+ </div>
+ </div>
+
+ <div class="ibox-title" >
+ <h3>推单设置:</h3>
+ </div>
+ <div class="form-group">
+ <label class="col-sm-2 control-label">专车推单：</label>
+ <div class="col-sm-10">
+ 第一轮推单：推单距离为 <input type="text" oninput="checkIsDouble(this)"
+ @if(isNotEmpty(zcOne)){
+ value="${zcOne.pushDistance}"
+ @}else{
+ value=""
+ @}
+ name="zc1" id="zc1" class="form-control newWidth" /> 公里，
+ 推单时间为 <input type="text" oninput="checkIsInt(this)"
+ @if(isNotEmpty(zcOne)){
+ value="${zcOne.pushTime}"
+ @}else{
+ value=""
+ @}
+ name="zc2" id="zc2" class="form-control newWidth" /> 秒钟；
+ 每次推所有司机的 <input type="text" oninput="checkIsDouble(this)"
+ @if(isNotEmpty(zcOne)){
+ value="${zcOne.driverProportion}"
+ @}else{
+ value=""
+ @}
+ name="zc3" id="zc3" class="form-control newWidth" /> %
+ <br/>
+ <br/>
+ 第二轮推单：推单距离为 <input type="text" oninput="checkIsDouble(this)"
+ @if(isNotEmpty(zcTwo)){
+ value="${zcTwo.pushDistance}"
+ @}else{
+ value=""
+ @}
+ name="zc4" id="zc4" class="form-control newWidth" /> 公里，
+ 推单时间为 <input type="text" oninput="checkIsInt(this)"
+ @if(isNotEmpty(zcTwo)){
+ value="${zcTwo.pushTime}"
+ @}else{
+ value=""
+ @}
+ name="zc5" id="zc5" class="form-control newWidth" /> 秒钟；
+ 每次推所有司机的 <input type="text" oninput="checkIsDouble(this)"
+ @if(isNotEmpty(zcTwo)){
+ value="${zcTwo.driverProportion}"
+ @}else{
+ value=""
+ @}
+ name="zc6" id="zc6" class="form-control newWidth" /> %
+ <br/>
+ <br/>
+ 第三轮推单：推单距离为 <input type="text" oninput="checkIsDouble(this)"
+ @if(isNotEmpty(zcThree)){
+ value="${zcThree.pushDistance}"
+ @}else{
+ value=""
+ @}
+ name="zc7" id="zc7" class="form-control newWidth" /> 公里，
+ 推单时间为 <input type="text" oninput="checkIsInt(this)"
+ @if(isNotEmpty(zcThree)){
+ value="${zcThree.pushTime}"
+ @}else{
+ value=""
+ @}
+ name="zc8" id="zc8" class="form-control newWidth" /> 秒钟；
+ 每次推所有司机的 <input type="text" oninput="checkIsDouble(this)"
+ @if(isNotEmpty(zcThree)){
+ value="${zcThree.driverProportion}"
+ @}else{
+ value=""
+ @}
+ name="zc9" id="zc9" class="form-control newWidth" /> %
+ <br/>
+ </div>
+ </div>
+ <div class="form-group">
+ <label class="col-sm-2 control-label">出租车推单：</label>
+ <div class="col-sm-10">
+ 第一轮推单：推单距离为 <input type="text" oninput="checkIsDouble(this)"
+ @if(isNotEmpty(czcOne)){
+ value="${czcOne.pushDistance}"
+ @}else{
+ value=""
+ @}
+ name="czc1" id="czc1" class="form-control newWidth" /> 公里，
+ 推单时间为 <input type="text" oninput="checkIsInt(this)"
+ @if(isNotEmpty(czcOne)){
+ value="${czcOne.pushTime}"
+ @}else{
+ value=""
+ @}
+ name="czc2" id="czc2" class="form-control newWidth" /> 秒钟；
+ 每次推所有司机的 <input type="text" oninput="checkIsDouble(this)"
+ @if(isNotEmpty(czcOne)){
+ value="${czcOne.driverProportion}"
+ @}else{
+ value=""
+ @}
+ name="czc3" id="czc3" class="form-control newWidth" /> %
+ <br/>
+ <br/>
+ 第二轮推单：推单距离为 <input type="text" oninput="checkIsDouble(this)"
+ @if(isNotEmpty(czcTwo)){
+ value="${czcTwo.pushDistance}"
+ @}else{
+ value=""
+ @}
+ name="czc4" id="czc4" class="form-control newWidth" /> 公里，
+ 推单时间为 <input type="text" oninput="checkIsInt(this)"
+ @if(isNotEmpty(czcTwo)){
+ value="${czcTwo.pushTime}"
+ @}else{
+ value=""
+ @}
+ name="czc5" id="czc5" class="form-control newWidth" /> 秒钟；
+ 每次推所有司机的 <input type="text" oninput="checkIsDouble(this)"
+ @if(isNotEmpty(czcTwo)){
+ value="${czcTwo.driverProportion}"
+ @}else{
+ value=""
+ @}
+ name="czc6" id="czc6" class="form-control newWidth" /> %
+ <br/>
+ <br/>
+ 第三轮推单：推单距离为 <input type="text" oninput="checkIsDouble(this)"
+ @if(isNotEmpty(czcThree)){
+ value="${czcThree.pushDistance}"
+ @}else{
+ value=""
+ @}
+ name="czc7" id="czc7" class="form-control newWidth" /> 公里，
+ 推单时间为 <input type="text" oninput="checkIsInt(this)"
+ @if(isNotEmpty(czcThree)){
+ value="${czcThree.pushTime}"
+ @}else{
+ value=""
+ @}
+ name="czc8" id="czc8" class="form-control newWidth" /> 秒钟；
+ 每次推所有司机的 <input type="text" oninput="checkIsDouble(this)"
+ @if(isNotEmpty(czcThree)){
+ value="${czcThree.driverProportion}"
+ @}else{
+ value=""
+ @}
+ name="czc9" id="czc9" class="form-control newWidth" /> %
+ <br/>
+ </div>
+ </div>
+ <div class="form-group">
+ <label class="col-sm-2 control-label">取消设置：</label>
+ <div class="col-sm-10">
+ 专车订单取消规则：专车订单在司机接单 <input type="text" oninput="checkIsInt(this)"
+ @if(isNotEmpty(ptCancel1)){
+ value="${ptCancel1.minuteNum}"
+ @}else{
+ value=""
+ @}
+ name="ptCancel1" id="ptCancel1" class="form-control newWidth" /> 分钟后，
+ 取消订单收取 <input type="text" oninput="checkIsDouble(this)"
+ @if(isNotEmpty(ptCancel1)){
+ value="${ptCancel1.money}"
+ @}else{
+ value=""
+ @}
+ name="ptCancel2" id="ptCancel2" class="form-control newWidth" /> 元取消费用；
+ <br/>
+ <br/>
+ 出租车订单取消规则：出租车订单在司机接单 <input type="text" oninput="checkIsInt(this)"
+ @if(isNotEmpty(ptCancel2)){
+ value="${ptCancel2.minuteNum}"
+ @}else{
+ value=""
+ @}
+ name="ptCancel3" id="ptCancel3" class="form-control newWidth" /> 分钟后，
+ 取消订单收取 <input type="text" oninput="checkIsDouble(this)"
+ @if(isNotEmpty(ptCancel2)){
+ value="${ptCancel2.money}"
+ @}else{
+ value=""
+ @}
+ name="ptCancel4" id="ptCancel4" class="form-control newWidth" /> 元取消费用；
+ <br/>
+ </div>
+ </div>
+ <div class="form-group">
+ <label class="col-sm-2 control-label">预约单取消设置：</label>
+ <div class="col-sm-10">
+ 专车订单取消规则：专车订单在司机接单 <input type="text" oninput="checkIsInt(this)"
+ @if(isNotEmpty(yyCancel1)){
+ value="${yyCancel1.minuteNum}"
+ @}else{
+ value=""
+ @}
+ name="yyCancel1" id="yyCancel1" class="form-control newWidth" /> 分钟后，
+ 取消订单收取 <input type="text" oninput="checkIsDouble(this)"
+ @if(isNotEmpty(yyCancel1)){
+ value="${yyCancel1.money}"
+ @}else{
+ value=""
+ @}
+ name="yyCancel2" id="yyCancel2" class="form-control newWidth" /> 元取消费用；
+ <br/>
+ <br/>
+ 出租车订单取消规则：出租车订单在司机接单 <input type="text" oninput="checkIsInt(this)"
+ @if(isNotEmpty(yyCancel2)){
+ value="${yyCancel2.minuteNum}"
+ @}else{
+ value=""
+ @}
+ name="yyCancel3" id="yyCancel3" class="form-control newWidth" /> 分钟后，
+ 取消订单收取 <input type="text" oninput="checkIsDouble(this)"
+ @if(isNotEmpty(yyCancel2)){
+ value="${yyCancel2.money}"
+ @}else{
+ value=""
+ @}
+ name="yyCancel4" id="yyCancel4" class="form-control newWidth" /> 元取消费用；
+ <br/>
+ </div>
+ </div>
+ <div class="form-group">
+ <label class="col-sm-2 control-label">电话设置：</label>
+ <div class="col-sm-10">
+ 报警电话： <input type="text"
+ @if(isNotEmpty(phone1)){
+ value="${phone1.phone}"
+ @}else{
+ value=""
+ @}
+ name="phone1" id="phone1" class="form-control newWidth" />
+ <br/>
+ <br/>
+ 客服电话： <input type="text"
+ @if(isNotEmpty(phone2)){
+ value="${phone2.phone}"
+ @}else{
+ value=""
+ @}
+ name="phone2" id="phone2" class="form-control newWidth" />
+ <br/>
+ <br/>
+ 包车调度电话： <input type="text"
+ @if(isNotEmpty(phone3)){
+ value="${phone3.phone}"
+ @}else{
+ value=""
+ @}
+ name="phone3" id="phone3" class="form-control newWidth" />
+ <br/>
+ </div>
+ </div>
+ </div>
+ </div>
+
+ <div class="row btn-group-m-t">
+ <div class="col-sm-10 col-sm-offset-5">
+ <#button btnCss="info" name="提交" id="ensure" icon="fa-check" clickFun="setUp()"/>
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+<script type="text/javascript">
+ $(function() {
+ var elem = document.querySelector(".js-switch");
+ var init = new Switchery(elem);
+ var elem1 = document.querySelector(".js-switch1");
+ var init1 = new Switchery(elem1);
+
+ var three = $("input[name='three']:checked").val();
+ if (three == "" || three == null || three == undefined){
+ $("#three1").attr("checked","checked");
+ }
+ threeClick($("input[name='three']:checked").val());
+ });
+
+ //人脸识别打开按钮被点击
+ function threeClick(obj) {
+ if (obj == 1){
+ $("#openDiv").show();
+ } else {
+ $("#openDiv").hide();
+ }
+ }
+
+ var regDouble = /^[0-9]\d*(\.\d*[0-9])?$/;
+ function checkIsDouble(obj){
+ var num = $(obj).val();
+ if(!regDouble.test(num)){
+ layer.msg("小数/正整数格式");
+ }
+ }
+
+ //验证是否输入正整数
+ var regInt = /^[0-9]\d*$/;
+ function checkIsInt(obj){
+ var num = $(obj).val();
+ if(!regInt.test(num)){
+ layer.msg("正整数格式");
+ }
+ }
+
+ /**
+ * 提交操作
+ */
+ function setUp() {
+ var one = $("#one").val().trim();
+ var two = $("#two").val().trim();
+ var three = $("input[name='three']:checked").val();
+ var openValue = $("#openValue").val();
+
+ var isSpecialCar = $("#isSpecialCar").is(":checked");
+ if (isSpecialCar){
+ isSpecialCar = 2;
+ } else {
+ isSpecialCar = 1;
+ }
+ var isTaxiCar = $("#isTaxiCar").is(":checked");
+ if (isTaxiCar){
+ isTaxiCar = 2;
+ } else {
+ isTaxiCar = 1;
+ }
+
+ var zc1 = $("#zc1").val().trim();
+ var zc2 = $("#zc2").val().trim();
+ var zc3 = $("#zc3").val().trim();
+ var zc4 = $("#zc4").val().trim();
+ var zc5 = $("#zc5").val().trim();
+ var zc6 = $("#zc6").val().trim();
+ var zc7 = $("#zc7").val().trim();
+ var zc8 = $("#zc8").val().trim();
+ var zc9 = $("#zc9").val().trim();
+
+ var czc1 = $("#czc1").val().trim();
+ var czc2 = $("#czc2").val().trim();
+ var czc3 = $("#czc3").val().trim();
+ var czc4 = $("#czc4").val().trim();
+ var czc5 = $("#czc5").val().trim();
+ var czc6 = $("#czc6").val().trim();
+ var czc7 = $("#czc7").val().trim();
+ var czc8 = $("#czc8").val().trim();
+ var czc9 = $("#czc9").val().trim();
+
+ var ptCancel1 = $("#ptCancel1").val().trim();
+ var ptCancel2 = $("#ptCancel2").val().trim();
+ var ptCancel3 = $("#ptCancel3").val().trim();
+ var ptCancel4 = $("#ptCancel4").val().trim();
+ // var ptCancel5 = $("#ptCancel5").val().trim();
+ // var ptCancel6 = $("#ptCancel6").val().trim();
+
+ var yyCancel1 = $("#yyCancel1").val().trim();
+ var yyCancel2 = $("#yyCancel2").val().trim();
+ var yyCancel3 = $("#yyCancel3").val().trim();
+ var yyCancel4 = $("#yyCancel4").val().trim();
+
+ var phone1 = $("#phone1").val().trim();
+ var phone2 = $("#phone2").val().trim();
+ var phone3 = $("#phone3").val().trim();
+
+ if ("" == one || "" == two || "" == three
+ || "" == zc1 || "" == zc2 || "" == zc3 || "" == zc4 || "" == zc5 || "" == zc6 || "" == zc7 || "" == zc8 || "" == zc9
+ || "" == czc1 || "" == czc2 || "" == czc3 || "" == czc4 || "" == czc5 || "" == czc6 || "" == czc7 || "" == czc8 || "" == czc9
+ || "" == ptCancel1 || "" == ptCancel2 || "" == ptCancel3 || "" == ptCancel4 /*|| "" == ptCancel5 || "" == ptCancel6*/
+ || "" == yyCancel1 || "" == yyCancel2 || "" == yyCancel3 || "" == yyCancel4
+ || "" == phone1 || "" == phone2 ) {
+ Feng.info("输入框不能为空!");
+ return;
+ }else if (1 == three){
+ if ("" == openValue || null == openValue || undefined == openValue){
+ Feng.info("人脸识别分钟数不能为空!");
+ return;
+ }else if (!regInt.test(openValue)) {
+ Feng.info("人脸识别分钟数格式不正确!");
+ return;
+ }
+ } else if (!regDouble.test(one) || !regInt.test(two)
+
+ || !regDouble.test(zc1) || !regInt.test(zc2) || !regDouble.test(zc3)
+ || !regDouble.test(zc4) || !regInt.test(zc5) || !regDouble.test(zc6)
+ || !regDouble.test(zc7) || !regInt.test(zc8) || !regDouble.test(zc9)
+
+ || !regDouble.test(czc1) || !regInt.test(czc2) || !regDouble.test(czc3)
+ || !regDouble.test(czc4) || !regInt.test(czc5) || !regDouble.test(czc6)
+ || !regDouble.test(czc7) || !regInt.test(czc8) || !regDouble.test(czc9)
+
+ || !regInt.test(ptCancel1) || !regDouble.test(ptCancel2) || !regInt.test(ptCancel3) || !regDouble.test(ptCancel4) /*|| !regInt.test(ptCancel5) || !regDouble.test(ptCancel6)*/
+ || !regInt.test(yyCancel1) || !regDouble.test(yyCancel2) || !regInt.test(yyCancel3) || !regDouble.test(yyCancel4)) {
+ Feng.info("格式不正确!");
+ return ;
+ }
+
+ //提交信息
+ var ajax = new $ax(Feng.ctxPath + "/tSysReformist/setUp", function(data){
+ Feng.success("操作成功!");
+ location.reload();
+ },function(data){
+ Feng.error("操作失败!" + data.responseJSON.message + "!");
+ });
+ ajax.set("one", one);
+ ajax.set("two", two);
+ ajax.set("three", three);
+ if (1 == three){
+ ajax.set("openValue",openValue);
+ } else if (2 == three){
+ ajax.set("openValue",0);
+ }
+
+ ajax.set("isSpecialCar", isSpecialCar);
+ ajax.set("isTaxiCar", isTaxiCar);
+
+ ajax.set("zc1", zc1);
+ ajax.set("zc2", zc2);
+ ajax.set("zc3", zc3);
+ ajax.set("zc4", zc4);
+ ajax.set("zc5", zc5);
+ ajax.set("zc6", zc6);
+ ajax.set("zc7", zc7);
+ ajax.set("zc8", zc8);
+ ajax.set("zc9", zc9);
+
+ ajax.set("czc1", czc1);
+ ajax.set("czc2", czc2);
+ ajax.set("czc3", czc3);
+ ajax.set("czc4", czc4);
+ ajax.set("czc5", czc5);
+ ajax.set("czc6", czc6);
+ ajax.set("czc7", czc7);
+ ajax.set("czc8", czc8);
+ ajax.set("czc9", czc9);
+
+ ajax.set("ptCancel1", ptCancel1);
+ ajax.set("ptCancel2", ptCancel2);
+ ajax.set("ptCancel3", ptCancel3);
+ ajax.set("ptCancel4", ptCancel4);
+ ajax.set("ptCancel5", 0);
+ ajax.set("ptCancel6", 0);
+
+ ajax.set("yyCancel1", yyCancel1);
+ ajax.set("yyCancel2", yyCancel2);
+ ajax.set("yyCancel3", yyCancel3);
+ ajax.set("yyCancel4", yyCancel4);
+
+ ajax.set("phone1", phone1);
+ ajax.set("phone2", phone2);
+ ajax.set("phone3", phone3);
+ ajax.start();
+
+ }
+
+</script>
+@}
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tSysSensitiveWords/tSysSensitiveWords.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tSysSensitiveWords/tSysSensitiveWords.html
new file mode 100644
index 0000000..f3cf3bf
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tSysSensitiveWords/tSysSensitiveWords.html
@@ -0,0 +1,48 @@
+@layout("/common/_container.html"){
+<div class="row">
+ <div class="col-sm-12">
+ <div class="ibox float-e-margins">
+ <div class="ibox-title">
+ <h5>敏感词管理</h5>
+ </div>
+ <div class="ibox-content">
+ <div class="row row-lg">
+ <div class="col-sm-12">
+ <div class="row">
+ <div class="col-sm-3">
+ <#TimeCon id="createTime" name="创建时间" isTime="false"/>
+ </div>
+ <div class="col-sm-3">
+ <#NameCon id="content" name="敏感词" />
+ </div>
+ <div class="col-sm-3">
+ <#button name="搜索" icon="fa-search" clickFun="TSysSensitiveWords.search()"/>
+ <#button name="重置" icon="fa-trash" clickFun="TSysSensitiveWords.resetSearch()" space="true"/>
+ </div>
+ </div>
+ <div class="hidden-xs" id="TSysSensitiveWordsTableToolbar" role="group">
+ @if(shiro.hasPermission("/tSysSensitiveWords/add")){
+ <#button name="添加" icon="fa-plus" clickFun="TSysSensitiveWords.openAddTSysSensitiveWords()"/>
+ @}
+ @if(shiro.hasPermission("/tSysSensitiveWords/update")){
+ <#button name="修改" icon="fa-edit" clickFun="TSysSensitiveWords.openTSysSensitiveWordsDetail()" space="true"/>
+ @}
+ @if(shiro.hasPermission("/tSysSensitiveWords/delete")){
+ <#button name="删除" icon="fa-remove" clickFun="TSysSensitiveWords.delete()" space="true"/>
+ @}
+ </div>
+ <#table id="TSysSensitiveWordsTable"/>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/tSysSensitiveWords/tSysSensitiveWords.js"></script>
+<script>
+ laydate.render({
+ elem: '#createTime'
+ ,range: true
+ });
+</script>
+@}
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tSysSensitiveWords/tSysSensitiveWords_add.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tSysSensitiveWords/tSysSensitiveWords_add.html
new file mode 100644
index 0000000..f154a18
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tSysSensitiveWords/tSysSensitiveWords_add.html
@@ -0,0 +1,22 @@
+@layout("/common/_container.html"){
+<div class="ibox float-e-margins">
+ <div class="ibox-content">
+ <div class="form-horizontal" id="sysSensitiveWordsForm">
+ <div class="row">
+ <div class="col-sm-11">
+ <#input id="content" name="敏感词" placeholder="敏感词最多15个字"/>
+ </div>
+ </div>
+
+ <div class="row btn-group-m-t">
+ <div class="col-sm-10 col-sm-offset-5">
+ <#button btnCss="info" name="提交" id="ensure" icon="fa-check" clickFun="TSysSensitiveWordsInfoDlg.addSubmit()"/>
+ <#button btnCss="danger" name="取消" id="cancel" icon="fa-eraser" clickFun="TSysSensitiveWordsInfoDlg.close()"/>
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/tSysSensitiveWords/tSysSensitiveWords_info.js"></script>
+@}
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tSysSensitiveWords/tSysSensitiveWords_edit.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tSysSensitiveWords/tSysSensitiveWords_edit.html
new file mode 100644
index 0000000..0099bfe
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tSysSensitiveWords/tSysSensitiveWords_edit.html
@@ -0,0 +1,28 @@
+@layout("/common/_container.html"){
+<div class="ibox float-e-margins">
+ <div class="ibox-content">
+ <div class="form-horizontal">
+
+ <div class="row">
+ <div class="col-sm-6 b-r">
+ <#input id="id" name="主键id" value="${item.id}" underline="true"/>
+ <#input id="createTime" name="创建时间" value="${item.createTime}" />
+ </div>
+
+ <div class="col-sm-6">
+ <#input id="content" name="敏感词" value="${item.content}" />
+ </div>
+ </div>
+
+ <div class="row btn-group-m-t">
+ <div class="col-sm-10">
+ <#button btnCss="info" name="提交" id="ensure" icon="fa-check" clickFun="TSysSensitiveWordsInfoDlg.editSubmit()"/>
+ <#button btnCss="danger" name="取消" id="cancel" icon="fa-eraser" clickFun="TSysSensitiveWordsInfoDlg.close()"/>
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/tSysSensitiveWords/tSysSensitiveWords_info.js"></script>
+@}
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tSystemPrice/small.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tSystemPrice/small.html
new file mode 100644
index 0000000..c84815f
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tSystemPrice/small.html
@@ -0,0 +1,397 @@
+@layout("/common/_container.html"){
+<style>
+ .newWidth, .single-line{
+ max-width:150px !important;display: initial !important;
+ }
+</style>
+<div class="ibox float-e-margins">
+ <div class="ibox-content">
+ <div class="form-horizontal" >
+
+ <div class="row">
+ <div class="col-sm-11">
+ <div class="ibox-title">
+ <h3>跨城小件物流价格设置:</h3>
+ </div>
+ <input type="hidden" id="kcId" name="kcId"
+ @if(isNotEmpty(kcId)){
+ value="${kcId}"
+ @}else{
+ value=""
+ @}
+ >
+ <div class="form-group">
+ <label class="col-sm-1 control-label"></label>
+ <div class="col-sm-10">
+ 普通小件价格为 <input type="text" oninput="checkIsYuan(this)"
+ @if(isNotEmpty(json1)){
+ value="${json1.num1}"
+ @}else{
+ value=""
+ @}
+ name="num101" id="num101" class="form-control newWidth" /> 元/件<br/>
+ </div>
+ </div>
+
+ <div class="form-group">
+ <label class="col-sm-1 control-label"></label>
+ <div class="col-sm-10">
+ 贵重物品价格为 <input type="text" oninput="checkIsYuan(this)"
+ @if(isNotEmpty(json1)){
+ value="${json1.num2}"
+ @}else{
+ value=""
+ @}
+ name="num102" id="num102" class="form-control newWidth" /> 元/件<br/>
+ </div>
+ </div>
+
+ <div class="ibox-title">
+ <h3>同城小件物流价格设置:</h3>
+ </div>
+ <input type="hidden" id="tcId" name="tcId"
+ @if(isNotEmpty(tcId)){
+ value="${tcId}"
+ @}else{
+ value=""
+ @}
+ >
+
+ <div class="form-group">
+ <label class="col-sm-1 control-label"></label>
+ <div class="col-sm-10">
+ 普通小件价格为(根据起点终点距离收费)：<br/>
+ </div>
+ </div>
+
+ <div class="form-group">
+ <label class="col-sm-1 control-label"></label>
+ <div class="col-sm-10">
+ 0 - <input type="text" oninput="checkIsGongLi(this)"
+ @if(isNotEmpty(json2)){
+ value="${json2.num1}"
+ @}else{
+ value=""
+ @}
+ name="num1" id="num1" class="form-control newWidth" /> 公里时,
+ 为 <input type="text" oninput="checkIsYuan(this)"
+ @if(isNotEmpty(json2)){
+ value="${json2.num2}"
+ @}else{
+ value=""
+ @}
+ name="num2" id="num2" class="form-control newWidth" />元/件 <br/>
+ </div>
+ </div>
+
+ <div class="form-group">
+ <label class="col-sm-1 control-label"></label>
+ <div class="col-sm-10">
+ <input type="text" disabled oninput="checkIsGongLi(this)"
+ @if(isNotEmpty(json2)){
+ value="${json2.num3}"
+ @}else{
+ value=""
+ @}
+ name="num3" id="num3" class="form-control newWidth" />
+ - <input type="text" oninput="checkIsGongLi(this)"
+ @if(isNotEmpty(json2)){
+ value="${json2.num4}"
+ @}else{
+ value=""
+ @}
+ name="num4" id="num4" class="form-control newWidth" /> 公里时,
+ 为 <input type="text" oninput="checkIsYuan(this)"
+ @if(isNotEmpty(json2)){
+ value="${json2.num5}"
+ @}else{
+ value=""
+ @}
+ name="num5" id="num5" class="form-control newWidth" />元/件 <br/>
+ </div>
+ </div>
+
+ <div class="form-group">
+ <label class="col-sm-1 control-label"></label>
+ <div class="col-sm-10">
+ <input type="text" disabled oninput="checkIsGongLi(this)"
+ @if(isNotEmpty(json2)){
+ value="${json2.num6}"
+ @}else{
+ value=""
+ @}
+ name="num6" id="num6" class="form-control newWidth" />
+ - <input type="text" oninput="checkIsGongLi(this)"
+ @if(isNotEmpty(json2)){
+ value="${json2.num7}"
+ @}else{
+ value=""
+ @}
+ name="num7" id="num7" class="form-control newWidth" /> 公里时,
+ 为 <input type="text" oninput="checkIsYuan(this)"
+ @if(isNotEmpty(json2)){
+ value="${json2.num8}"
+ @}else{
+ value=""
+ @}
+ name="num8" id="num8" class="form-control newWidth" />元/件 <br/>
+ </div>
+ </div>
+
+ <div class="form-group">
+ <label class="col-sm-1 control-label"></label>
+ <div class="col-sm-10">
+ <input type="text" disabled oninput="checkIsGongLi(this)"
+ @if(isNotEmpty(json2)){
+ value="${json2.num9}"
+ @}else{
+ value=""
+ @}
+ name="num9" id="num9" class="form-control newWidth" />
+ - <input type="text" oninput="checkIsGongLi(this)"
+ @if(isNotEmpty(json2)){
+ value="${json2.num10}"
+ @}else{
+ value=""
+ @}
+ name="num10" id="num10" class="form-control newWidth" /> 公里时,
+ 为 <input type="text" oninput="checkIsYuan(this)"
+ @if(isNotEmpty(json2)){
+ value="${json2.num11}"
+ @}else{
+ value=""
+ @}
+ name="num11" id="num11" class="form-control newWidth" />元/件 <br/>
+ </div>
+ </div>
+
+ <div class="form-group">
+ <label class="col-sm-1 control-label"></label>
+ <div class="col-sm-10">
+ 贵重物品价格为(根据起点终点距离收费)：<br/>
+ </div>
+ </div>
+
+ <div class="form-group">
+ <label class="col-sm-1 control-label"></label>
+ <div class="col-sm-10">
+ 0 - <input type="text" oninput="checkIsGongLi(this)"
+ @if(isNotEmpty(json2)){
+ value="${json2.num12}"
+ @}else{
+ value=""
+ @}
+ name="num12" id="num12" class="form-control newWidth" /> 公里时,
+ 为 <input type="text" oninput="checkIsYuan(this)"
+ @if(isNotEmpty(json2)){
+ value="${json2.num13}"
+ @}else{
+ value=""
+ @}
+ name="num13" id="num13" class="form-control newWidth" />元/件 <br/>
+ </div>
+ </div>
+
+ <div class="form-group">
+ <label class="col-sm-1 control-label"></label>
+ <div class="col-sm-10">
+ <input type="text" disabled oninput="checkIsGongLi(this)"
+ @if(isNotEmpty(json2)){
+ value="${json2.num14}"
+ @}else{
+ value=""
+ @}
+ name="num14" id="num14" class="form-control newWidth" />
+ - <input type="text" oninput="checkIsGongLi(this)"
+ @if(isNotEmpty(json2)){
+ value="${json2.num15}"
+ @}else{
+ value=""
+ @}
+ name="num15" id="num15" class="form-control newWidth" /> 公里时,
+ 为 <input type="text" oninput="checkIsYuan(this)"
+ @if(isNotEmpty(json2)){
+ value="${json2.num16}"
+ @}else{
+ value=""
+ @}
+ name="num16" id="num16" class="form-control newWidth" />元/件 <br/>
+ </div>
+ </div>
+
+ <div class="form-group">
+ <label class="col-sm-1 control-label"></label>
+ <div class="col-sm-10">
+ <input type="text" disabled oninput="checkIsGongLi(this)"
+ @if(isNotEmpty(json2)){
+ value="${json2.num17}"
+ @}else{
+ value=""
+ @}
+ name="num17" id="num17" class="form-control newWidth" />
+ - <input type="text" oninput="checkIsGongLi(this)"
+ @if(isNotEmpty(json2)){
+ value="${json2.num18}"
+ @}else{
+ value=""
+ @}
+ name="num18" id="num18" class="form-control newWidth" /> 公里时,
+ 为 <input type="text" oninput="checkIsYuan(this)"
+ @if(isNotEmpty(json2)){
+ value="${json2.num19}"
+ @}else{
+ value=""
+ @}
+ name="num19" id="num19" class="form-control newWidth" />元/件 <br/>
+ </div>
+ </div>
+
+ <div class="form-group">
+ <label class="col-sm-1 control-label"></label>
+ <div class="col-sm-10">
+ <input type="text" disabled oninput="checkIsGongLi(this)"
+ @if(isNotEmpty(json2)){
+ value="${json2.num20}"
+ @}else{
+ value=""
+ @}
+ name="num20" id="num20" class="form-control newWidth" />
+ - <input type="text" oninput="checkIsGongLi(this)"
+ @if(isNotEmpty(json2)){
+ value="${json2.num21}"
+ @}else{
+ value=""
+ @}
+ name="num21" id="num21" class="form-control newWidth" /> 公里时,
+ 为 <input type="text" oninput="checkIsYuan(this)"
+ @if(isNotEmpty(json2)){
+ value="${json2.num22}"
+ @}else{
+ value=""
+ @}
+ name="num22" id="num22" class="form-control newWidth" />元/件 <br/>
+ </div>
+ </div>
+
+ </div>
+ </div>
+
+ <div class="row btn-group-m-t">
+ <div class="col-sm-10 col-sm-offset-1">
+ <#button btnCss="info" name="提交" id="ensure" icon="fa-check" clickFun="addSubmit()"/>
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/tSystemPrice/tSystemPrice_info.js"></script>
+<script type="text/javascript">
+ var regDouble = /^(0|[1-9]\d{0,2})(\.\d{1,2})?$/;
+ var regInt = /^[0-9]{0,3}$/;
+ function checkIsYuan(obj){
+ var num = $(obj).val();
+ if(!regDouble.test(num)){
+ layer.msg("【元】输入框不能超过3位数,保留两位小数");
+ }
+ }
+ function checkIsGongLi(obj){
+ var num = $(obj).val();
+ if(!regDouble.test(num)){
+ layer.msg("【公里】输入框不能超过3位数,保留两位小数");
+ }
+ if (obj.id == "num1"){
+ $("#num3").val(num);
+ }else if (obj.id == "num4"){
+ $("#num6").val(num);
+ }else if (obj.id == "num7"){
+ $("#num9").val(num);
+ }else if (obj.id == "num12"){
+ $("#num14").val(num);
+ }else if (obj.id == "num15"){
+ $("#num17").val(num);
+ }else if (obj.id == "num18"){
+ $("#num20").val(num);
+ }
+ }
+ function checkIsMinute(obj){
+ var num = $(obj).val();
+ if(!regInt.test(num)){
+ layer.msg("【分钟】输入框不能超过3位数");
+ }
+ }
+
+ //提交数据
+ function addSubmit() {
+ //验证数据格式-跨城小件物流价格设置
+ var kcId = $("#kcId").val();
+ var num101 = $("#num101").val();
+ var num102 = $("#num102").val();
+ if ("" == num101 || "" == num102){
+ Feng.error("【跨城小件物流价格设置】输入框不能为空");
+ return;
+ }else if (!regDouble.test(num101) || !regDouble.test(num102)){
+ Feng.error("【跨城小件物流价格设置】输入框格式不正确");
+ return;
+ }
+ //验证数据格式-同城小件物流价格设置
+ var tcId = $("#tcId").val();
+ var num1 = $("#num1").val();
+ var num2 = $("#num2").val();
+ var num3 = $("#num3").val();
+ var num4 = $("#num4").val();
+ var num5 = $("#num5").val();
+ var num6 = $("#num6").val();
+ var num7 = $("#num7").val();
+ var num8 = $("#num8").val();
+ var num9 = $("#num9").val();
+ var num10 = $("#num10").val();
+ var num11 = $("#num11").val();
+ var num12 = $("#num12").val();
+ var num13 = $("#num13").val();
+ var num14 = $("#num14").val();
+ var num15 = $("#num15").val();
+ var num16 = $("#num16").val();
+ var num17 = $("#num17").val();
+ var num18 = $("#num18").val();
+ var num19 = $("#num19").val();
+ var num20 = $("#num20").val();
+ var num21 = $("#num21").val();
+ var num22 = $("#num22").val();
+
+ if ("" == num1 || "" == num2 || "" == num3 || "" == num4 || "" == num5 || "" == num6 || "" == num7 || "" == num8 || "" == num9 || "" == num10
+ || "" == num11 || "" == num12 || "" == num13 || "" == num14 || "" == num15 || "" == num16 || "" == num17 || "" == num18 || "" == num19 || "" == num20
+ || "" == num21 || "" == num22 ){
+ Feng.error("【同城小件物流价格设置】输入框不能为空");
+ return;
+ }else if (!regDouble.test(num1) || !regDouble.test(num2) || !regDouble.test(num3) || !regDouble.test(num4) || !regDouble.test(num5) || !regDouble.test(num6)
+ || !regDouble.test(num7) || !regDouble.test(num8) || !regDouble.test(num9) || !regDouble.test(num10) || !regDouble.test(num11) || !regDouble.test(num12)
+ || !regDouble.test(num13) || !regDouble.test(num14) || !regDouble.test(num15) || !regDouble.test(num16) || !regDouble.test(num17) || !regDouble.test(num18)
+ || !regDouble.test(num19) || !regDouble.test(num20) || !regDouble.test(num21) || !regDouble.test(num22) ){
+ Feng.error("【同城小件物流价格设置】输入框格式不正确");
+ return;
+ }
+ //封装数据
+ var json1 = '{"num1":"'+num101+'","num2":"'+num102+'"}';
+ var json2 = '{"num1":"'+num1+'","num2":"'+num2+'","num3":"'+num3+'","num4":"'+num4+'","num5":"'+num5+'","num6":"'+num6+'"' +
+ ',"num7":"'+num7+'","num8":"'+num8+'","num9":"'+num9+'","num10":"'+num10+'","num11":"'+num11+'","num12":"'+num12+'"' +
+ ',"num13":"'+num13+'","num14":"'+num14+'","num15":"'+num15+'","num16":"'+num16+'","num17":"'+num17+'","num18":"'+num18+'"' +
+ ',"num19":"'+num19+'","num20":"'+num20+'","num21":"'+num21+'","num22":"'+num22+'"}';
+
+ //提交信息
+ var ajax = new $ax(Feng.ctxPath + "/tSystemPrice/smallSubmit", function(data){
+ Feng.success("操作成功!");
+ location.reload();
+ },function(data){
+ Feng.error("操作失败!" + data.responseJSON.message + "!");
+ });
+ ajax.set("kcId", kcId);
+ ajax.set("json1", json1);
+ ajax.set("tcId", tcId);
+ ajax.set("json2", json2);
+ ajax.start();
+ }
+
+
+</script>
+@}
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tSystemPrice/tSystemPrice.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tSystemPrice/tSystemPrice.html
new file mode 100644
index 0000000..3d98984
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tSystemPrice/tSystemPrice.html
@@ -0,0 +1,52 @@
+@layout("/common/_container.html"){
+<div class="row">
+ <div class="col-sm-12">
+ <div class="ibox float-e-margins">
+ <div class="ibox-title">
+ <h5>专车价格设置管理</h5>
+ </div>
+ <div class="ibox-content">
+ <div class="row row-lg">
+ <div class="col-sm-12">
+ <div class="row">
+ <div class="col-sm-3">
+ <#NameCon id="name" name="车型名称" />
+ </div>
+ <div class="col-sm-3">
+ <#SelectCon id="state" name="状态" >
+ <option value="">全部</option>
+ <option value="1">正常</option>
+ <option value="2">冻结</option>
+ </#SelectCon>
+ </div>
+ <div class="col-sm-3">
+ <#button name="搜索" icon="fa-search" clickFun="TSystemPrice.search()"/>
+ <#button name="重置" icon="fa-trash" clickFun="TSystemPrice.resetSearch()" space="true"/>
+ </div>
+ </div>
+ <div class="hidden-xs" id="TSystemPriceTableToolbar" role="group">
+ @if(shiro.hasPermission("/tSystemPrice/addSpecial")){
+ <#button name="添加" icon="fa-plus" clickFun="TSystemPrice.addSpecial()"/>
+ @}
+ @if(shiro.hasPermission("/tSystemPrice/updateSpecial")){
+ <#button name="修改" icon="fa-edit" clickFun="TSystemPrice.updateSpecial()" space="true"/>
+ @}
+ @if(shiro.hasPermission("/tSystemPrice/deleteSpecial")){
+ <#button name="删除" icon="fa-remove" clickFun="TSystemPrice.deleteSpecial()" space="true"/>
+ @}
+ @if(shiro.hasPermission("/tSystemPrice/freezeSpecial")){
+ <#button name="冻结" icon="fa-remove" clickFun="TSystemPrice.freezeSpecial()" space="true"/>
+ @}
+ @if(shiro.hasPermission("/tSystemPrice/thawSpecial")){
+ <#button name="解冻" icon="fa-remove" clickFun="TSystemPrice.thawSpecial()" space="true"/>
+ @}
+ </div>
+ <#table id="TSystemPriceTable"/>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/tSystemPrice/tSystemPrice.js"></script>
+@}
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tSystemPrice/tSystemPrice_add.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tSystemPrice/tSystemPrice_add.html
new file mode 100644
index 0000000..41ed804
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tSystemPrice/tSystemPrice_add.html
@@ -0,0 +1,182 @@
+@layout("/common/_container.html"){
+<style>
+ .newWidth, .single-line{
+ max-width:150px !important;display: initial !important;
+ }
+</style>
+<div class="ibox float-e-margins">
+ <div class="ibox-content">
+ <div class="form-horizontal" id="specialPriceInfoForm">
+
+ <div class="row">
+ <div class="col-sm-11">
+ <div class="form-group">
+ <label class="col-sm-2 control-label">选择车型：</label>
+ <div class="col-sm-10">
+ <select class="form-control" id="serverCarModelId" name="serverCarModelId" style="width: 200px;">
+ <option value="">选择车型</option>
+ @for(obj in modelList!){
+ <option value="${obj.id}">${obj.name}</option>
+ @}
+ </select>
+ </div>
+ </div>
+ <div class="form-group">
+ <label class="col-sm-2 control-label">运价类型说明：</label>
+ <div class="col-sm-10">
+ <textarea class="form-control" id="fareTypeNote" name="fareTypeNote" style="height: 100px;"></textarea>
+ </div>
+ </div>
+ <div class="form-group">
+ <label class="col-sm-2 control-label">起步价设置：</label>
+ <div class="col-sm-10">
+ 起步价为 <input type="text" oninput="checkIsYuan(this)" name="num1" id="num1" class="form-control newWidth" placeholder="最多3位数"/> 元,
+ 起步包含 <input type="text" oninput="checkIsGongLi(this)" name="num2" id="num2" class="form-control newWidth" placeholder="最多3位数"/> 公里,
+ <input type="text" oninput="checkIsMinute(this)" name="num3" id="num3" class="form-control newWidth" placeholder="最多3位数"/> 分钟
+ <br/>
+ </div>
+ </div>
+
+ <div class="form-group">
+ <label class="col-sm-2 control-label">里程费设置：</label>
+ <div class="col-sm-10">
+ 超过起步里程后每公里 <input type="text" oninput="checkIsYuan(this)" name="num4" id="num4" class="form-control newWidth" placeholder="最多3位数"/> 元
+ <br/>
+ </div>
+ </div>
+
+ <div class="form-group">
+ <label class="col-sm-2 control-label">时长费设置：</label>
+ <div class="col-sm-10">
+ 超过起步时长后每分钟 <input type="text" oninput="checkIsYuan(this)" name="num5" id="num5" class="form-control newWidth" placeholder="最多3位数"/> 元
+ <br/>
+ </div>
+ </div>
+
+ <div class="form-group">
+ <label class="col-sm-2 control-label">等待费设置：</label>
+ <div class="col-sm-10">
+ 司机到达预约地点 <input type="text" oninput="checkIsMinute(this)" name="num6" id="num6" class="form-control newWidth" placeholder="最多3位数"/> 分钟过后开始收取等待费,
+ 为 <input type="text" oninput="checkIsYuan(this)" name="num7" id="num7" class="form-control newWidth" placeholder="最多3位数"/> 元/分,不足一分钟按照一分钟计算
+ <br/>
+ </div>
+ </div>
+
+ <div class="form-group">
+ <label class="col-sm-2 control-label">远途费设置：</label>
+ <div class="col-sm-10">
+ 总里程超过 <input type="text" oninput="checkIsGongLi(this)" name="num8" id="num8" class="form-control newWidth" placeholder="最多3位数"/> 公里
+ 不足 <input type="text" oninput="checkIsGongLi(this)" name="num9" id="num9" class="form-control newWidth" placeholder="最多3位数"/> 公里,
+ 超出部分每公里加收 <input type="text" oninput="checkIsYuan(this)" name="num10" id="num10" class="form-control newWidth" placeholder="最多3位数"/> 元
+ <br>
+ <br>
+ 超过 <input type="text" disabled oninput="checkIsGongLi(this)" name="num11" id="num11" class="form-control newWidth" placeholder="最多3位数"/> 公里
+ 不足 <input type="text" oninput="checkIsGongLi(this)" name="num12" id="num12" class="form-control newWidth" placeholder="最多3位数"/> 公里时,
+ 超出部分每公里加收 <input type="text" oninput="checkIsYuan(this)" name="num13" id="num13" class="form-control newWidth" placeholder="最多3位数"/> 元
+ <br/>
+ <br>
+ 超过 <input type="text" disabled oninput="checkIsGongLi(this)" name="num14" id="num14" class="form-control newWidth" placeholder="最多3位数"/> 公里以后,
+ 超出部分每公里加收 <input type="text" oninput="checkIsYuan(this)" name="num15" id="num15" class="form-control newWidth" placeholder="最多3位数"/> 元
+ <br/>
+ </div>
+ </div>
+
+ <div class="form-group">
+ <label class="col-sm-2 control-label">夜间行驶费用设置：</label>
+ <div class="col-sm-10">
+ <input type="text" name="num16" id="num16" class="form-control newWidth" placeholder="选择时间"/> 点为夜间行驶时间,
+ 起步价变为 <input type="text" oninput="checkIsYuan(this)" name="num17" id="num17" class="form-control newWidth" placeholder="最多3位数"/> 元
+ <br>
+ <br>
+ 里程费为每公里 <input type="text" oninput="checkIsYuan(this)" name="num18" id="num18" class="form-control newWidth" placeholder="最多3位数"/> 元,
+ 时长费为每分钟 <input type="text" oninput="checkIsYuan(this)" name="num19" id="num19" class="form-control newWidth" placeholder="最多3位数"/> 元
+ <br>
+ <br>
+ 远途费为每公里加收 <input type="text" oninput="checkIsYuan(this)" name="num20" id="num20" class="form-control newWidth" placeholder="最多3位数"/>
+ 、 <input type="text" oninput="checkIsYuan(this)" name="num21" id="num21" class="form-control newWidth" placeholder="最多3位数"/>
+ 、 <input type="text" oninput="checkIsYuan(this)" name="num22" id="num22" class="form-control newWidth" placeholder="最多3位数"/> 元
+ <br/>
+ </div>
+ </div>
+
+ <div class="form-group">
+ <label class="col-sm-2 control-label">高峰期费用设置：</label>
+ <div class="col-sm-10">
+ <input type="text" name="num23" id="num23" class="form-control newWidth" placeholder="选择时间段"/>
+ 和 <input type="text" name="num24" id="num24" class="form-control newWidth" placeholder="选择时间段"/> 为高峰期行车时间,
+ 起步价变为 <input type="text" oninput="checkIsYuan(this)" name="num25" id="num25" class="form-control newWidth" placeholder="最多3位数"/> 元
+ <br>
+ <br>
+ 里程费为每公里 <input type="text" oninput="checkIsYuan(this)" name="num26" id="num26" class="form-control newWidth" placeholder="最多3位数"/> 元,
+ 时长费为每分钟 <input type="text" oninput="checkIsYuan(this)" name="num27" id="num27" class="form-control newWidth" placeholder="最多3位数"/> 元
+ <br>
+ <br>
+ 远途费为每公里加收 <input type="text" oninput="checkIsYuan(this)" name="num28" id="num28" class="form-control newWidth" placeholder="最多3位数"/>
+ 、 <input type="text" oninput="checkIsYuan(this)" name="num29" id="num29" class="form-control newWidth" placeholder="最多3位数"/>
+ 、 <input type="text" oninput="checkIsYuan(this)" name="num30" id="num30" class="form-control newWidth" placeholder="最多3位数"/> 元
+ <br/>
+ </div>
+ </div>
+
+ </div>
+ </div>
+
+ <div class="row btn-group-m-t">
+ <div class="col-sm-10 col-sm-offset-5">
+ <#button btnCss="info" name="提交" id="ensure" icon="fa-check" clickFun="TSystemPriceInfoDlg.addSubmit()"/>
+ <#button btnCss="danger" name="取消" id="cancel" icon="fa-eraser" clickFun="TSystemPriceInfoDlg.close()"/>
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/tSystemPrice/tSystemPrice_info.js"></script>
+<script type="text/javascript">
+ laydate.render({
+ elem: '#num16'
+ ,type: 'time'
+ ,range: '-'
+ ,format: 'HH:mm'
+ });
+ laydate.render({
+ elem: '#num23'
+ ,type: 'time'
+ ,range: '-'
+ ,format: 'HH:mm'
+ });
+ laydate.render({
+ elem: '#num24'
+ ,type: 'time'
+ ,range: '-'
+ ,format: 'HH:mm'
+ });
+
+ var regDouble = /^(0|[1-9]\d{0,2})(\.\d{1,2})?$/;
+ var regInt = /^[0-9]{0,3}$/;
+ function checkIsYuan(obj){
+ var num = $(obj).val();
+ if(!regDouble.test(num)){
+ layer.msg("【元】输入框不能超过3位数,保留两位小数");
+ }
+ }
+ function checkIsGongLi(obj){
+ var num = $(obj).val();
+ if(!regDouble.test(num)){
+ layer.msg("【公里】输入框不能超过3位数,保留两位小数");
+ }
+ if (obj.id == "num9"){
+ $("#num11").val(num);
+ }else if (obj.id == "num12"){
+ $("#num14").val(num);
+ }
+ }
+ function checkIsMinute(obj){
+ var num = $(obj).val();
+ if(!regInt.test(num)){
+ layer.msg("【分钟】输入框不能超过3位数");
+ }
+ }
+
+</script>
+@}
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tSystemPrice/tSystemPrice_edit.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tSystemPrice/tSystemPrice_edit.html
new file mode 100644
index 0000000..d7a30f4
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tSystemPrice/tSystemPrice_edit.html
@@ -0,0 +1,182 @@
+@layout("/common/_container.html"){
+<style>
+ .newWidth, .single-line{
+ max-width:150px !important;display: initial !important;
+ }
+</style>
+<div class="ibox float-e-margins">
+ <div class="ibox-content">
+ <div class="form-horizontal" id="specialPriceInfoForm">
+ <label style="display: none;" id="id">${item.id}</label>
+ <div class="row">
+ <div class="col-sm-111">
+ <div class="form-group">
+ <label class="col-sm-2 control-label">选择车型：</label>
+ <div class="col-sm-10">
+ <select class="form-control" id="serverCarModelId" name="serverCarModelId" style="width: 200px;">
+ <option value="">选择车型</option>
+ @for(obj in modelList!){
+ <option value="${obj.id}" ${obj.id == item.serverCarModelId ? 'selected=selected' : ''}>${obj.name}</option>
+ @}
+ </select>
+ </div>
+ </div>
+ <div class="form-group">
+ <label class="col-sm-2 control-label">运价类型说明：</label>
+ <div class="col-sm-10">
+ <textarea class="form-control" id="fareTypeNote" name="fareTypeNote" style="height: 100px;">${item.fareTypeNote}</textarea>
+ </div>
+ </div>
+ <div class="form-group">
+ <label class="col-sm-2 control-label">起步价设置：</label>
+ <div class="col-sm-10">
+ 起步价为 <input type="text" oninput="checkIsYuan(this)" name="num1" id="num1" value="${json.num1}" class="form-control newWidth" placeholder="最多3位数"/> 元,
+ 起步包含 <input type="text" oninput="checkIsGongLi(this)" name="num2" id="num2" value="${json.num2}" class="form-control newWidth" placeholder="最多3位数"/> 公里,
+ <input type="text" oninput="checkIsMinute(this)" name="num3" id="num3" value="${json.num3}" class="form-control newWidth" placeholder="最多3位数"/> 分钟
+ <br/>
+ </div>
+ </div>
+
+ <div class="form-group">
+ <label class="col-sm-2 control-label">里程费设置：</label>
+ <div class="col-sm-10">
+ 超过起步里程后每公里 <input type="text" oninput="checkIsYuan(this)" name="num4" id="num4" value="${json.num4}" class="form-control newWidth" placeholder="最多3位数"/> 元
+ <br/>
+ </div>
+ </div>
+
+ <div class="form-group">
+ <label class="col-sm-2 control-label">时长费设置：</label>
+ <div class="col-sm-10">
+ 超过起步时长后每分钟 <input type="text" oninput="checkIsYuan(this)" name="num5" id="num5" value="${json.num5}" class="form-control newWidth" placeholder="最多3位数"/> 元
+ <br/>
+ </div>
+ </div>
+
+ <div class="form-group">
+ <label class="col-sm-2 control-label">等待费设置：</label>
+ <div class="col-sm-10">
+ 司机到达预约地点 <input type="text" oninput="checkIsMinute(this)" name="num6" id="num6" value="${json.num6}" class="form-control newWidth" placeholder="最多3位数"/> 分钟过后开始收取等待费,
+ 为 <input type="text" oninput="checkIsYuan(this)" name="num7" id="num7" value="${json.num7}" class="form-control newWidth" placeholder="最多3位数"/> 元/分,不足一分钟按照一分钟计算
+ <br/>
+ </div>
+ </div>
+
+ <div class="form-group">
+ <label class="col-sm-2 control-label">远途费设置：</label>
+ <div class="col-sm-10">
+ 总里程超过 <input type="text" oninput="checkIsGongLi(this)" name="num8" id="num8" value="${json.num8}" class="form-control newWidth" placeholder="最多3位数"/> 公里
+ 不足 <input type="text" oninput="checkIsGongLi(this)" name="num9" id="num9" value="${json.num9}" class="form-control newWidth" placeholder="最多3位数"/> 公里,
+ 超出部分每公里加收 <input type="text" oninput="checkIsYuan(this)" name="num10" id="num10" value="${json.num10}" class="form-control newWidth" placeholder="最多3位数"/> 元
+ <br>
+ <br>
+ 超过 <input type="text" disabled oninput="checkIsGongLi(this)" name="num11" id="num11" value="${json.num11}" class="form-control newWidth" placeholder="最多3位数"/> 公里
+ 不足 <input type="text" oninput="checkIsGongLi(this)" name="num12" id="num12" value="${json.num12}" class="form-control newWidth" placeholder="最多3位数"/> 公里时,
+ 超出部分每公里加收 <input type="text" oninput="checkIsYuan(this)" name="num13" value="${json.num13}" id="num13" class="form-control newWidth" placeholder="最多3位数"/> 元
+ <br/>
+ <br>
+ 超过 <input type="text" disabled oninput="checkIsGongLi(this)" name="num14" id="num14" value="${json.num14}" class="form-control newWidth" placeholder="最多3位数"/> 公里以后,
+ 超出部分每公里加收 <input type="text" oninput="checkIsYuan(this)" name="num15" id="num15" value="${json.num15}" class="form-control newWidth" placeholder="最多3位数"/> 元
+ <br/>
+ </div>
+ </div>
+
+ <div class="form-group">
+ <label class="col-sm-2 control-label">夜间行驶费用设置：</label>
+ <div class="col-sm-10">
+ <input type="text" name="num16" id="num16" value="${json.num16}" class="form-control newWidth" placeholder="选择时间"/> 点为夜间行驶时间,
+ 起步价变为 <input type="text" oninput="checkIsYuan(this)" name="num17" id="num17" value="${json.num17}" class="form-control newWidth" placeholder="最多3位数"/> 元
+ <br>
+ <br>
+ 里程费为每公里 <input type="text" oninput="checkIsYuan(this)" name="num18" id="num18" value="${json.num18}" class="form-control newWidth" placeholder="最多3位数"/> 元,
+ 时长费为每分钟 <input type="text" oninput="checkIsYuan(this)" name="num19" id="num19" value="${json.num19}" class="form-control newWidth" placeholder="最多3位数"/> 元
+ <br>
+ <br>
+ 远途费为每公里加收 <input type="text" oninput="checkIsYuan(this)" name="num20" id="num20" value="${json.num20}" class="form-control newWidth" placeholder="最多3位数"/>
+ 、 <input type="text" oninput="checkIsYuan(this)" name="num21" id="num21" value="${json.num21}" class="form-control newWidth" placeholder="最多3位数"/>
+ 、 <input type="text" oninput="checkIsYuan(this)" name="num22" id="num22" value="${json.num22}" class="form-control newWidth" placeholder="最多3位数"/> 元
+ <br/>
+ </div>
+ </div>
+
+ <div class="form-group">
+ <label class="col-sm-2 control-label">高峰期费用设置：</label>
+ <div class="col-sm-10">
+ <input type="text" name="num23" id="num23" value="${json.num23}" class="form-control newWidth" placeholder="选择时间段"/>
+ 和 <input type="text" name="num24" id="num24" value="${json.num24}" class="form-control newWidth" placeholder="选择时间段"/> 为高峰期行车时间,
+ 起步价变为 <input type="text" oninput="checkIsYuan(this)" name="num25" id="num25" value="${json.num25}" class="form-control newWidth" placeholder="最多3位数"/> 元
+ <br>
+ <br>
+ 里程费为每公里 <input type="text" oninput="checkIsYuan(this)" name="num26" id="num26" value="${json.num26}" class="form-control newWidth" placeholder="最多3位数"/> 元,
+ 时长费为每分钟 <input type="text" oninput="checkIsYuan(this)" name="num27" id="num27" value="${json.num27}" class="form-control newWidth" placeholder="最多3位数"/> 元
+ <br>
+ <br>
+ 远途费为每公里加收 <input type="text" oninput="checkIsYuan(this)" name="num28" id="num28" value="${json.num28}" class="form-control newWidth" placeholder="最多3位数"/>
+ 、 <input type="text" oninput="checkIsYuan(this)" name="num29" id="num29" value="${json.num29}" class="form-control newWidth" placeholder="最多3位数"/>
+ 、 <input type="text" oninput="checkIsYuan(this)" name="num30" id="num30" value="${json.num30}" class="form-control newWidth" placeholder="最多3位数"/> 元
+ <br/>
+ </div>
+ </div>
+
+ </div>
+ </div>
+
+ <div class="row btn-group-m-t">
+ <div class="col-sm-10 col-sm-offset-5">
+ <#button btnCss="info" name="提交" id="ensure" icon="fa-check" clickFun="TSystemPriceInfoDlg.editSubmit()"/>
+ <#button btnCss="danger" name="取消" id="cancel" icon="fa-eraser" clickFun="TSystemPriceInfoDlg.close()"/>
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/tSystemPrice/tSystemPrice_info.js"></script>
+<script type="text/javascript">
+ laydate.render({
+ elem: '#num16'
+ ,type: 'time'
+ ,range: '-'
+ ,format: 'HH:mm'
+ });
+ laydate.render({
+ elem: '#num23'
+ ,type: 'time'
+ ,range: '-'
+ ,format: 'HH:mm'
+ });
+ laydate.render({
+ elem: '#num24'
+ ,type: 'time'
+ ,range: '-'
+ ,format: 'HH:mm'
+ });
+
+ var regDouble = /^(0|[1-9]\d{0,2})(\.\d{1,2})?$/;
+ var regInt = /^[0-9]{0,3}$/;
+ function checkIsYuan(obj){
+ var num = $(obj).val();
+ if(!regDouble.test(num)){
+ layer.msg("【元】输入框不能超过3位数,保留两位小数");
+ }
+ }
+ function checkIsGongLi(obj){
+ var num = $(obj).val();
+ if(!regDouble.test(num)){
+ layer.msg("【公里】输入框不能超过3位数,保留两位小数");
+ }
+ if (obj.id == "num9"){
+ $("#num11").val(num);
+ }else if (obj.id == "num12"){
+ $("#num14").val(num);
+ }
+ }
+ function checkIsMinute(obj){
+ var num = $(obj).val();
+ if(!regInt.test(num)){
+ layer.msg("【分钟】输入框不能超过3位数");
+ }
+ }
+
+</script>
+@}
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tUser/tUser.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tUser/tUser.html
new file mode 100644
index 0000000..a6e9ced
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tUser/tUser.html
@@ -0,0 +1,84 @@
+@layout("/common/_container.html"){
+<div class="row">
+ <div class="col-sm-12">
+ <div class="ibox float-e-margins">
+ <div class="ibox-title">
+ <h5>用户管理</h5>
+ </div>
+ <div class="ibox-content">
+ <div class="row row-lg">
+ <div class="col-sm-12">
+ <div class="row">
+ <div class="col-sm-3">
+ <#TimeCon id="insertTime" name="注册时间" isTime="false"/>
+ </div>
+ <div class="col-sm-3">
+ <#NameCon id="id" name="用户ID" />
+ </div>
+ <div class="col-sm-3">
+ <#NameCon id="nickName" name="昵称" />
+ </div>
+ <div class="col-sm-3">
+ <#NameCon id="phone" name="手机号" />
+ </div>
+ <div class="col-sm-3">
+ <#SelectCon id="isAuth" name="是否实名认证" >
+ <option value="">全部</option>
+ <option value="1">否</option>
+ <option value="2">是</option>
+ </#SelectCon>
+ </div>
+ <div class="col-sm-3">
+ <#SelectCon id="state" name="状态" >
+ <option value="">全部</option>
+ <option value="1">正常</option>
+ <option value="2">冻结</option>
+ </#SelectCon>
+ </div>
+ <div class="col-sm-3">
+ <#button name="搜索" icon="fa-search" clickFun="TUser.search()"/>
+ <#button name="重置" icon="fa-trash" clickFun="TUser.resetSearch()" space="true"/>
+ </div>
+ <div class="col-sm-3">
+ <input type="file" name="file" style="width:0px;height:0px;" id="uploadEventFile" onchange="TUser.exportUser()">
+ </div>
+ </div>
+ <div class="hidden-xs" id="TUserTableToolbar" role="group">
+ @if(shiro.hasPermission("/tUser/userDetail")){
+ <#button name="用户详情" icon="fa-plus" clickFun="TUser.userDetail()"/>
+ @}
+ @if(shiro.hasPermission("/tUser/updateBalance")){
+ <#button name="修改余额" icon="fa-edit" clickFun="TUser.updateBalance()" space="true"/>
+ @}
+ @if(shiro.hasPermission("/tUser/updatePassword")){
+ <#button name="修改密码" icon="fa-remove" clickFun="TUser.updatePassword()" space="true"/>
+ @}
+ @if(shiro.hasPermission("/tUser/freezeUser")){
+ <#button name="冻结" icon="fa-remove" clickFun="TUser.freezeUser()" space="true"/>
+ @}
+ @if(shiro.hasPermission("/tUser/trawUser")){
+ <#button name="解冻" icon="fa-remove" clickFun="TUser.trawUser()" space="true"/>
+ @}
+ @if(shiro.hasPermission("/tUser/inUser")){
+ <#button btnCss="info" name="下载模板" id="uploadModel" icon="fa fa-level-down" clickFun="TUser.uploadUserModel()" space="true"/>
+ <#button btnCss="danger" name="导入" id="uploadEventBtn" icon="fa fa-level-up" space="true"/>
+ @}
+ @if(shiro.hasPermission("/tUser/outUser")){
+ <#button name="导出" icon="fa-remove" clickFun="TUser.outUser()" space="true"/>
+ @}
+ </div>
+ <#table id="TUserTable"/>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/tUser/tUser.js"></script>
+<script>
+ laydate.render({
+ elem: '#insertTime'
+ ,range: true
+ });
+</script>
+@}
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tUser/tUser_add.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tUser/tUser_add.html
new file mode 100644
index 0000000..b239da4
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tUser/tUser_add.html
@@ -0,0 +1,54 @@
+@layout("/common/_container.html"){
+<div class="ibox float-e-margins">
+ <div class="ibox-content">
+ <div class="form-horizontal">
+
+ <div class="row">
+ <div class="col-sm-6 b-r">
+ <#input id="id" name="主键id" underline="true"/>
+ <#input id="companyId" name="企业id" underline="true"/>
+ <#input id="registIp" name="注册ip" underline="true"/>
+ <#input id="registAreaCode" name="注册地区县code" underline="true"/>
+ <#input id="phone" name="手机号" underline="true"/>
+ <#input id="nickName" name="昵称" underline="true"/>
+ <#input id="avatar" name="头像" underline="true"/>
+ <#input id="birthday" name="生日" underline="true"/>
+ <#input id="sex" name="性别（1：男，2：女）" underline="true"/>
+ <#input id="emergencyContact" name="紧急联系人" underline="true"/>
+ <#input id="emergencyContactNumber" name="紧急联系电话" underline="true"/>
+ <#input id="isAuth" name="是否实名认证(1=否，2=是)" underline="true"/>
+ <#input id="name" name="真实姓名" underline="true"/>
+ <#input id="idCard" name="身份证号" underline="true"/>
+ <#input id="idCardFront" name="身份证正面"/>
+ </div>
+
+ <div class="col-sm-6">
+ <#input id="idCardReverse" name="身份证反面" underline="true"/>
+ <#input id="consumption" name="历史消费" underline="true"/>
+ <#input id="balance" name="余额" underline="true"/>
+ <#input id="integral" name="积分" underline="true"/>
+ <#input id="passWord" name="密码" underline="true"/>
+ <#input id="openId" name="微信openid" underline="true"/>
+ <#input id="unionid" name="微信unionid" underline="true"/>
+ <#input id="remark" name="备注" underline="true"/>
+ <#input id="state" name="1=正常，2=冻结" underline="true"/>
+ <#input id="flag" name="1：创建，2：修改，3：删除" underline="true"/>
+ <#input id="insertTime" name="" underline="true"/>
+ <#input id="insertUser" name="" underline="true"/>
+ <#input id="updateTime" name="" underline="true"/>
+ <#input id="updateUser" name="" underline="true"/>
+ </div>
+ </div>
+
+ <div class="row btn-group-m-t">
+ <div class="col-sm-10">
+ <#button btnCss="info" name="提交" id="ensure" icon="fa-check" clickFun="TUserInfoDlg.addSubmit()"/>
+ <#button btnCss="danger" name="取消" id="cancel" icon="fa-eraser" clickFun="TUserInfoDlg.close()"/>
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/tUser/tUser_info.js"></script>
+@}
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tUser/tUser_edit.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tUser/tUser_edit.html
new file mode 100644
index 0000000..ae6955d
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tUser/tUser_edit.html
@@ -0,0 +1,54 @@
+@layout("/common/_container.html"){
+<div class="ibox float-e-margins">
+ <div class="ibox-content">
+ <div class="form-horizontal">
+
+ <div class="row">
+ <div class="col-sm-6 b-r">
+ <#input id="id" name="主键id" value="${item.id}" underline="true"/>
+ <#input id="companyId" name="企业id" value="${item.companyId}" underline="true"/>
+ <#input id="registIp" name="注册ip" value="${item.registIp}" underline="true"/>
+ <#input id="registAreaCode" name="注册地区县code" value="${item.registAreaCode}" underline="true"/>
+ <#input id="phone" name="手机号" value="${item.phone}" underline="true"/>
+ <#input id="nickName" name="昵称" value="${item.nickName}" underline="true"/>
+ <#input id="avatar" name="头像" value="${item.avatar}" underline="true"/>
+ <#input id="birthday" name="生日" value="${item.birthday}" underline="true"/>
+ <#input id="sex" name="性别（1：男，2：女）" value="${item.sex}" underline="true"/>
+ <#input id="emergencyContact" name="紧急联系人" value="${item.emergencyContact}" underline="true"/>
+ <#input id="emergencyContactNumber" name="紧急联系电话" value="${item.emergencyContactNumber}" underline="true"/>
+ <#input id="isAuth" name="是否实名认证(1=否，2=是)" value="${item.isAuth}" underline="true"/>
+ <#input id="name" name="真实姓名" value="${item.name}" underline="true"/>
+ <#input id="idCard" name="身份证号" value="${item.idCard}" underline="true"/>
+ <#input id="idCardFront" name="身份证正面" value="${item.idCardFront}" />
+ </div>
+
+ <div class="col-sm-6">
+ <#input id="idCardReverse" name="身份证反面" value="${item.idCardReverse}" underline="true"/>
+ <#input id="consumption" name="历史消费" value="${item.consumption}" underline="true"/>
+ <#input id="balance" name="余额" value="${item.balance}" underline="true"/>
+ <#input id="integral" name="积分" value="${item.integral}" underline="true"/>
+ <#input id="passWord" name="密码" value="${item.passWord}" underline="true"/>
+ <#input id="openId" name="微信openid" value="${item.openId}" underline="true"/>
+ <#input id="unionid" name="微信unionid" value="${item.unionid}" underline="true"/>
+ <#input id="remark" name="备注" value="${item.remark}" underline="true"/>
+ <#input id="state" name="1=正常，2=冻结" value="${item.state}" underline="true"/>
+ <#input id="flag" name="1：创建，2：修改，3：删除" value="${item.flag}" underline="true"/>
+ <#input id="insertTime" name="" value="${item.insertTime}" underline="true"/>
+ <#input id="insertUser" name="" value="${item.insertUser}" underline="true"/>
+ <#input id="updateTime" name="" value="${item.updateTime}" underline="true"/>
+ <#input id="updateUser" name="" value="${item.updateUser}" />
+ </div>
+ </div>
+
+ <div class="row btn-group-m-t">
+ <div class="col-sm-10">
+ <#button btnCss="info" name="提交" id="ensure" icon="fa-check" clickFun="TUserInfoDlg.editSubmit()"/>
+ <#button btnCss="danger" name="取消" id="cancel" icon="fa-eraser" clickFun="TUserInfoDlg.close()"/>
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/tUser/tUser_info.js"></script>
+@}
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tUser/tUser_optUser.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tUser/tUser_optUser.html
new file mode 100644
index 0000000..918c7bc
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tUser/tUser_optUser.html
@@ -0,0 +1,29 @@
+@layout("/common/_container.html"){
+<div class="ibox float-e-margins">
+ <div class="ibox-content">
+ <div class="form-horizontal" id="userInfoForm">
+ <input type="hidden" id="tUserId" name="tUserId" value="${tUserId}">
+ <input type="hidden" id="optType" name="optType" value="${optType}">
+ <div class="row">
+ <div class="col-sm-11">
+ <div class="form-group">
+ <label class="col-sm-3 control-label">备注</label>
+ <div class="col-sm-9">
+ <textarea type="text/plain" class="form-control" name="remark" id="remark" style="width:100%;height:150px;"></textarea>
+ </div>
+ </div>
+ </div>
+ </div>
+
+ <div class="row btn-group-m-t" style="text-align: center;">
+ <div class="col-sm-12">
+ <#button btnCss="info" name="保存" id="ensure" icon="fa-check" clickFun="TUserInfoDlg.optUser()"/>
+ <#button btnCss="danger" name="取消" id="cancel" icon="fa-eraser" clickFun="TUserInfoDlg.close()"/>
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/tUser/tUser_info.js"></script>
+@}
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tUser/tUser_updateBalance.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tUser/tUser_updateBalance.html
new file mode 100644
index 0000000..9b01dad
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tUser/tUser_updateBalance.html
@@ -0,0 +1,28 @@
+@layout("/common/_container.html"){
+<div class="ibox float-e-margins">
+ <div class="ibox-content">
+ <div class="form-horizontal" id="userInfoForm">
+ <input type="hidden" id="tUserId" name="tUserId" value="${tUserId}">
+ <div class="row">
+ <div class="col-sm-11">
+ <#select id="updateType" name="修改类型：">
+ <option value="">请选择</option>
+ <option value="1">增加</option>
+ <option value="2">减少</option>
+ </#select>
+ <#input id="money" name="修改值" value=""/>
+ </div>
+ </div>
+
+ <div class="row btn-group-m-t" style="text-align: center;">
+ <div class="col-sm-12">
+ <#button btnCss="info" name="保存" id="ensure" icon="fa-check" clickFun="TUserInfoDlg.updateBalance()"/>
+ <#button btnCss="danger" name="取消" id="cancel" icon="fa-eraser" clickFun="TUserInfoDlg.close()"/>
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/tUser/tUser_info.js"></script>
+@}
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tUser/tUser_updatePassword.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tUser/tUser_updatePassword.html
new file mode 100644
index 0000000..7c641f3
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tUser/tUser_updatePassword.html
@@ -0,0 +1,24 @@
+@layout("/common/_container.html"){
+<div class="ibox float-e-margins">
+ <div class="ibox-content">
+ <div class="form-horizontal" id="userInfoForm">
+ <input type="hidden" id="tUserId" name="tUserId" value="${tUserId}">
+ <div class="row">
+ <div class="col-sm-11">
+ <#input id="password" name="密码" type="password"/>
+ <#input id="rePassword" name="确认密码" type="password"/>
+ </div>
+ </div>
+
+ <div class="row btn-group-m-t" style="text-align: center;">
+ <div class="col-sm-12">
+ <#button btnCss="info" name="保存" id="ensure" icon="fa-check" clickFun="TUserInfoDlg.updatePassword()"/>
+ <#button btnCss="danger" name="取消" id="cancel" icon="fa-eraser" clickFun="TUserInfoDlg.close()"/>
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/tUser/tUser_info.js"></script>
+@}
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tUser/tUser_userDetail.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tUser/tUser_userDetail.html
new file mode 100644
index 0000000..adc6932
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tUser/tUser_userDetail.html
@@ -0,0 +1,108 @@
+@layout("/common/_container.html"){
+<div class="ibox float-e-margins">
+ <div class="ibox-content">
+ <div class="form-horizontal">
+ <div class="row" style="margin-top: 30px;">
+ <div class="col-sm-4">
+ <h2 class="h3Class" style="font-weight: 700;">用户详情</h2>
+ </div>
+ </div>
+ <div class="row">
+ <div class="col-sm-6 b-r">
+ <#label id="insertTimeStr" name="注册时间" value="${item.insertTimeStr}"/>
+ <#label id="registIp" name="注册地IP" value="${item.registIp}"/>
+ <#label id="phone" name="手机号" value="${item.phone}"/>
+ <#label id="emergencyContact" name="紧急联系人姓名" value="${item.emergencyContact}"/>
+ <#label id="isAuthStr" name="是否实名认证" value="${item.isAuthStr}"/>
+
+ </div>
+ <div class="col-sm-6">
+ <#label id="id" name="用户ID" value="${item.id}"/>
+ <#label id="companyName" name="注册地分公司" value="${item.companyName}"/>
+ <#label id="nickName" name="昵称" value="${item.nickName}"/>
+ <#label id="emergencyContactNumber" name="紧急联系人电话" value="${item.emergencyContactNumber}"/>
+ </div>
+ </div>
+
+ <div class="row" style="margin-top: 30px;">
+ <div class="col-sm-4">
+ <h2 class="h3Class" style="font-weight: 700;">认证资料</h2>
+ </div>
+ </div>
+ <div class="row">
+ <div class="col-sm-6">
+ <#label id="name" name="姓名" value="${item.name}"/>
+ <div class="form-group">
+ <label class="col-sm-3 control-label">身份证正面照：</label>
+ <div class="col-sm-9">
+ <div class="form-group">
+ <div class="col-sm-6">
+ <div id="idCardFrontPreId">
+ <div>
+ @if(isEmpty(item.idCardFront)){
+ <img onclick="lookBigImg('${ctxPath}/static/img/NoPIC.png')" src="${ctxPath}/static/img/NoPIC.png" style="max-width:150px;">
+ @}else{
+ <img onclick="lookBigImg('${item.idCardFront}')" src="${item.idCardFront}" style="max-width:250px;">
+ @}
+ </div>
+ </div>
+ </div>
+ <input type="hidden" id="idCardFront" name="idCardFront" value="${item.idCardFront}"/>
+ </div>
+ </div>
+ </div>
+ </div>
+ <div class="col-sm-6">
+ <#label id="idCard" name="身份证号" value="${item.idCard}"/>
+ <div class="form-group">
+ <label class="col-sm-3 control-label">身份证正面照：</label>
+ <div class="col-sm-9">
+ <div class="form-group">
+ <div class="col-sm-6">
+ <div id="idCardReversePreId">
+ <div>
+ @if(isEmpty(item.idCardReverse)){
+ <img onclick="lookBigImg('${ctxPath}/static/img/NoPIC.png')" src="${ctxPath}/static/img/NoPIC.png" style="max-width:150px;">
+ @}else{
+ <img onclick="lookBigImg('${item.idCardReverse}')" src="${item.idCardReverse}" style="max-width:250px;">
+ @}
+ </div>
+ </div>
+ </div>
+ <input type="hidden" id="idCardReverse" name="idCardReverse" value="${item.idCardReverse}"/>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+
+ <div class="row" style="margin-top: 30px;">
+ <div class="col-sm-4">
+ <h2 class="h3Class" style="font-weight: 700;">历史出行次数</h2>
+ </div>
+ </div>
+ <div class="row">
+ <div class="col-sm-6">
+ <#label id="zcNum" name="专车" value="${item.zcNum}"/>
+ <#label id="czNum" name="出租车" value="${item.czNum}"/>
+ <#label id="consumptionStr" name="历史消费" value="¥${item.consumptionNum}"/>
+ <#label id="integral" name="积分" value="${item.integral}"/>
+ </div>
+ <div class="col-sm-6">
+ <#label id="kcNum" name="跨城出行" value="${item.kcNum}"/>
+ <#label id="wlNum" name="小件物流" value="${item.wlNum}"/>
+ <#label id="balance" name="钱包余额" value="¥${item.balanceStr}"/>
+ @if(item.state == 1){
+ <#label id="state" name="状态" value="正常" style="color: #0d8ddb;"/>
+ @}else if(item.state == 2){
+ <#label id="state" name="状态" value="冻结" style="color: red;"/>
+ @}
+ </div>
+ </div>
+
+ </div>
+
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/tUser/tUser_info.js"></script>
+@}
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tUserRedPacketRecord/tUserRedPacketRecord.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tUserRedPacketRecord/tUserRedPacketRecord.html
new file mode 100644
index 0000000..96f063e
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tUserRedPacketRecord/tUserRedPacketRecord.html
@@ -0,0 +1,61 @@
+@layout("/common/_container.html"){
+<div class="row">
+ <div class="col-sm-12">
+ <div class="ibox float-e-margins">
+ <div class="ibox-title">
+ <h5>管理</h5>
+ </div>
+ <div class="ibox-content">
+ <div class="row row-lg">
+ <div class="col-sm-12">
+ <input type="hidden" id="couponActivityId" value="${couponActivityId}">
+ <div class="row">
+ <div class="col-sm-3">
+ <#TimeCon id="createTime" name="领取时间" isTime="false"/>
+ </div>
+ <div class="col-sm-3">
+ <#NameCon id="userName" name="领取人" />
+ </div>
+ <div class="col-sm-3">
+ <#NameCon id="userPhone" name="领取人电话" />
+ </div>
+ <div class="col-sm-3">
+ <#SelectCon id="state" name="状态" >
+ <option value="">全部</option>
+ <option value="1">未使用</option>
+ <option value="2">已使用</option>
+ <option value="3">已过期</option>
+ </#SelectCon>
+ </div>
+ <div class="col-sm-3">
+ <#button name="搜索" icon="fa-search" clickFun="TUserRedPacketRecord.search()"/>
+ <#button name="重置" icon="fa-trash" clickFun="TUserRedPacketRecord.resetSearch()" space="true"/>
+ </div>
+ </div>
+
+ <div class="hidden-xs" id="TUserRedPacketRecordTableToolbar" role="group">
+ @if(shiro.hasPermission("/tUserRedPacketRecord/add")){
+ <#button name="添加" icon="fa-plus" clickFun="TUserRedPacketRecord.openAddTUserRedPacketRecord()"/>
+ @}
+ @if(shiro.hasPermission("/tUserRedPacketRecord/update")){
+ <#button name="修改" icon="fa-edit" clickFun="TUserRedPacketRecord.openTUserRedPacketRecordDetail()" space="true"/>
+ @}
+ @if(shiro.hasPermission("/tUserRedPacketRecord/delete")){
+ <#button name="删除" icon="fa-remove" clickFun="TUserRedPacketRecord.delete()" space="true"/>
+ @}
+ </div>
+ <#table id="TUserRedPacketRecordTable"/>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/tUserRedPacketRecord/tUserRedPacketRecord.js"></script>
+<script>
+ laydate.render({
+ elem: '#createTime'
+ ,range: true
+ });
+</script>
+@}
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tUserRedPacketRecord/tUserRedPacketRecord_add.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tUserRedPacketRecord/tUserRedPacketRecord_add.html
new file mode 100644
index 0000000..979bddc
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tUserRedPacketRecord/tUserRedPacketRecord_add.html
@@ -0,0 +1,35 @@
+@layout("/common/_container.html"){
+<div class="ibox float-e-margins">
+ <div class="ibox-content">
+ <div class="form-horizontal">
+
+ <div class="row">
+ <div class="col-sm-6 b-r">
+ <#input id="id" name="" underline="true"/>
+ <#input id="money" name="金额" underline="true"/>
+ <#input id="expirationTime" name="过期时间" underline="true"/>
+ <#input id="insertTime" name="获取时间" underline="true"/>
+ <#input id="companyId" name="公司id"/>
+ </div>
+
+ <div class="col-sm-6">
+ <#input id="state" name="状态(0=临时，1=未使用，2=已使用，3=已过期)" underline="true"/>
+ <#input id="orderId" name="订单id" underline="true"/>
+ <#input id="orderType" name="订单类型(1=专车，2=出租车，3=城际，4=小件物流)" underline="true"/>
+ <#input id="userId" name="用户id" underline="true"/>
+ <#input id="redPacketActivityId" name="活动id" underline="true"/>
+ </div>
+ </div>
+
+ <div class="row btn-group-m-t">
+ <div class="col-sm-10">
+ <#button btnCss="info" name="提交" id="ensure" icon="fa-check" clickFun="TUserRedPacketRecordInfoDlg.addSubmit()"/>
+ <#button btnCss="danger" name="取消" id="cancel" icon="fa-eraser" clickFun="TUserRedPacketRecordInfoDlg.close()"/>
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/tUserRedPacketRecord/tUserRedPacketRecord_info.js"></script>
+@}
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tUserRedPacketRecord/tUserRedPacketRecord_edit.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tUserRedPacketRecord/tUserRedPacketRecord_edit.html
new file mode 100644
index 0000000..5b092c2
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tUserRedPacketRecord/tUserRedPacketRecord_edit.html
@@ -0,0 +1,35 @@
+@layout("/common/_container.html"){
+<div class="ibox float-e-margins">
+ <div class="ibox-content">
+ <div class="form-horizontal">
+
+ <div class="row">
+ <div class="col-sm-6 b-r">
+ <#input id="id" name="" value="${item.id}" underline="true"/>
+ <#input id="money" name="金额" value="${item.money}" underline="true"/>
+ <#input id="expirationTime" name="过期时间" value="${item.expirationTime}" underline="true"/>
+ <#input id="insertTime" name="获取时间" value="${item.insertTime}" underline="true"/>
+ <#input id="companyId" name="公司id" value="${item.companyId}" />
+ </div>
+
+ <div class="col-sm-6">
+ <#input id="state" name="状态(0=临时，1=未使用，2=已使用，3=已过期)" value="${item.state}" underline="true"/>
+ <#input id="orderId" name="订单id" value="${item.orderId}" underline="true"/>
+ <#input id="orderType" name="订单类型(1=专车，2=出租车，3=城际，4=小件物流)" value="${item.orderType}" underline="true"/>
+ <#input id="userId" name="用户id" value="${item.userId}" underline="true"/>
+ <#input id="redPacketActivityId" name="活动id" value="${item.redPacketActivityId}" />
+ </div>
+ </div>
+
+ <div class="row btn-group-m-t">
+ <div class="col-sm-10">
+ <#button btnCss="info" name="提交" id="ensure" icon="fa-check" clickFun="TUserRedPacketRecordInfoDlg.editSubmit()"/>
+ <#button btnCss="danger" name="取消" id="cancel" icon="fa-eraser" clickFun="TUserRedPacketRecordInfoDlg.close()"/>
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/tUserRedPacketRecord/tUserRedPacketRecord_info.js"></script>
+@}
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tVerified/tVerified.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tVerified/tVerified.html
new file mode 100644
index 0000000..7c32649
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tVerified/tVerified.html
@@ -0,0 +1,59 @@
+@layout("/common/_container.html"){
+<div class="row">
+ <div class="col-sm-12">
+ <div class="ibox float-e-margins">
+ <div class="ibox-title">
+ <h5>实名认证列表管理</h5>
+ </div>
+ <div class="ibox-content">
+ <div class="row row-lg">
+ <div class="col-sm-12">
+ <div class="row">
+ <div class="col-sm-3">
+ <#TimeCon id="insertTime" name="提交时间" isTime="false"/>
+ </div>
+ <div class="col-sm-3">
+ <#NameCon id="userName" name="用户昵称" />
+ </div>
+ <div class="col-sm-3">
+ <#NameCon id="userPhone" name="手机号" />
+ </div>
+ <div class="col-sm-3">
+ <#NameCon id="name" name="姓名" />
+ </div>
+ <div class="col-sm-3">
+ <#SelectCon id="state" name="状态" >
+ <option value="">全部</option>
+ <option value="1">待认证</option>
+ <option value="2">认证通过</option>
+ <option value="3">认证失败</option>
+ </#SelectCon>
+ </div>
+ <div class="col-sm-3">
+ <#button name="搜索" icon="fa-search" clickFun="TVerified.search()"/>
+ <#button name="重置" icon="fa-trash" clickFun="TVerified.resetSearch()" space="true"/>
+ </div>
+ </div>
+ <div class="hidden-xs" id="TVerifiedTableToolbar" role="group">
+ @if(shiro.hasPermission("/tVerified/immediately")){
+ <#button name="立即审核" icon="fa-edit" clickFun="TVerified.immediately()"/>
+ @}
+ @if(shiro.hasPermission("/tVerified/delete")){
+ <#button name="删除记录" icon="fa-remove" clickFun="TVerified.delete()"/>
+ @}
+ </div>
+ <#table id="TVerifiedTable"/>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/tVerified/tVerified.js"></script>
+<script>
+ laydate.render({
+ elem: '#insertTime'
+ ,range: true
+ });
+</script>
+@}
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tVerified/tVerified_add.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tVerified/tVerified_add.html
new file mode 100644
index 0000000..5fb3278
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tVerified/tVerified_add.html
@@ -0,0 +1,33 @@
+@layout("/common/_container.html"){
+<div class="ibox float-e-margins">
+ <div class="ibox-content">
+ <div class="form-horizontal">
+
+ <div class="row">
+ <div class="col-sm-6 b-r">
+ <#input id="id" name="" underline="true"/>
+ <#input id="userId" name="用户id" underline="true"/>
+ <#input id="name" name="认证姓名" underline="true"/>
+ <#input id="idcode" name="身份证号码"/>
+ </div>
+
+ <div class="col-sm-6">
+ <#input id="img1" name="身份证正面照" underline="true"/>
+ <#input id="img2" name="身份证背面照" underline="true"/>
+ <#input id="state" name="认证结果（1=待认证，2=认证通过，3=认证失败）" underline="true"/>
+ <#input id="insertTime" name="请求时间" underline="true"/>
+ </div>
+ </div>
+
+ <div class="row btn-group-m-t">
+ <div class="col-sm-10">
+ <#button btnCss="info" name="提交" id="ensure" icon="fa-check" clickFun="TVerifiedInfoDlg.addSubmit()"/>
+ <#button btnCss="danger" name="取消" id="cancel" icon="fa-eraser" clickFun="TVerifiedInfoDlg.close()"/>
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/tVerified/tVerified_info.js"></script>
+@}
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tVerified/tVerified_edit.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tVerified/tVerified_edit.html
new file mode 100644
index 0000000..7ce2271
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tVerified/tVerified_edit.html
@@ -0,0 +1,33 @@
+@layout("/common/_container.html"){
+<div class="ibox float-e-margins">
+ <div class="ibox-content">
+ <div class="form-horizontal">
+
+ <div class="row">
+ <div class="col-sm-6 b-r">
+ <#input id="id" name="" value="${item.id}" underline="true"/>
+ <#input id="userId" name="用户id" value="${item.userId}" underline="true"/>
+ <#input id="name" name="认证姓名" value="${item.name}" underline="true"/>
+ <#input id="idcode" name="身份证号码" value="${item.idcode}" />
+ </div>
+
+ <div class="col-sm-6">
+ <#input id="img1" name="身份证正面照" value="${item.img1}" underline="true"/>
+ <#input id="img2" name="身份证背面照" value="${item.img2}" underline="true"/>
+ <#input id="state" name="认证结果（1=待认证，2=认证通过，3=认证失败）" value="${item.state}" underline="true"/>
+ <#input id="insertTime" name="请求时间" value="${item.insertTime}" />
+ </div>
+ </div>
+
+ <div class="row btn-group-m-t">
+ <div class="col-sm-10">
+ <#button btnCss="info" name="提交" id="ensure" icon="fa-check" clickFun="TVerifiedInfoDlg.editSubmit()"/>
+ <#button btnCss="danger" name="取消" id="cancel" icon="fa-eraser" clickFun="TVerifiedInfoDlg.close()"/>
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/tVerified/tVerified_info.js"></script>
+@}
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tVerified/tVerified_immediately.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tVerified/tVerified_immediately.html
new file mode 100644
index 0000000..3c7b069
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tVerified/tVerified_immediately.html
@@ -0,0 +1,35 @@
+@layout("/common/_container.html"){
+<div class="ibox float-e-margins">
+ <div class="ibox-content">
+ <div class="form-horizontal">
+ <input type="hidden" id="id" name="id" value="${tVerifiedId}">
+ <div class="row">
+ <div class="col-sm-10">
+ <div class="form-group">
+ <label class="col-sm-3 control-label">处理意见：</label>
+ <div class="col-sm-9" style="display: flex;align-items: center;">
+ <div class="radio radio-info radio-inline">
+ <input type="radio" id="state2" value="2" name="state" checked="" >
+ <label for="state2"> 审核成功 </label>
+ </div>
+ <div class="radio radio-success radio-inline">
+ <input type="radio" id="state3" value="3" name="state" >
+ <label for="state3"> 审核失败 </label>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+
+ <div class="row btn-group-m-t">
+ <div class="col-sm-10 col-sm-offset-5">
+ <#button btnCss="info" name="提交" id="ensure" icon="fa-check" clickFun="TVerifiedInfoDlg.immediately()"/>
+ <#button btnCss="danger" name="取消" id="cancel" icon="fa-eraser" clickFun="TVerifiedInfoDlg.close()"/>
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/tVerified/tVerified_info.js"></script>
+@}
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tVersionManagement/tVersionManagement.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tVersionManagement/tVersionManagement.html
new file mode 100644
index 0000000..1af1137
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tVersionManagement/tVersionManagement.html
@@ -0,0 +1,49 @@
+@layout("/common/_container.html"){
+<div class="row">
+ <div class="col-sm-12">
+ <div class="ibox float-e-margins">
+ <div class="ibox-title">
+ <h5>版本管理</h5>
+ </div>
+ <input style="position: fixed;left: -50000%;top: 0;" id="input" name="input">
+ <div class="ibox-content">
+ <div class="row row-lg">
+ <div class="col-sm-12">
+ <div class="row">
+ <div class="col-sm-3">
+ <#TimeCon id="insertTime" name="添加时间" isTime="false"/>
+ </div>
+ <div class="col-sm-3">
+ <#NameCon id="version" name="版本编号" />
+ </div>
+ <div class="col-sm-3">
+ <#button name="搜索" icon="fa-search" clickFun="TVersionManagement.search()"/>
+ <#button name="重置" icon="fa-trash" clickFun="TVersionManagement.resetSearch()" space="true"/>
+ </div>
+ </div>
+ <div class="hidden-xs" id="TVersionManagementTableToolbar" role="group">
+ @if(shiro.hasPermission("/tVersionManagement/add")){
+ <#button name="添加" icon="fa-plus" clickFun="TVersionManagement.openAddTVersionManagement()"/>
+ @}
+ @if(shiro.hasPermission("/tVersionManagement/update")){
+ <#button name="修改" icon="fa-edit" clickFun="TVersionManagement.openTVersionManagementDetail()" space="true"/>
+ @}
+ @if(shiro.hasPermission("/tVersionManagement/delete")){
+ <#button name="删除" icon="fa-remove" clickFun="TVersionManagement.delete()" space="true"/>
+ @}
+ </div>
+ <#table id="TVersionManagementTable"/>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/tVersionManagement/tVersionManagement.js"></script>
+<script>
+ laydate.render({
+ elem: '#insertTime'
+ ,range: true
+ });
+</script>
+@}
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tVersionManagement/tVersionManagement_add.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tVersionManagement/tVersionManagement_add.html
new file mode 100644
index 0000000..92c41a8
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tVersionManagement/tVersionManagement_add.html
@@ -0,0 +1,72 @@
+@layout("/common/_container.html"){
+<div class="ibox float-e-margins">
+ <div class="ibox-content">
+ <div class="form-horizontal" id="versionInfoForm">
+
+ <div class="row">
+ <div class="col-sm-11">
+ <#input id="version" name="版本编号" />
+ <div class="form-group">
+ <label class="col-sm-3 control-label">端口类型：</label>
+ <div class="col-sm-9" style="display: flex;align-items: center;">
+ <div class="radio radio-info radio-inline">
+ <input type="radio" id="type1" value="1" name="type" checked="" >
+ <label for="type1"> 用户端 </label>
+ </div>
+ <div class="radio radio-success radio-inline">
+ <input type="radio" id="type2" value="2" name="type" >
+ <label for="type2"> 司机端 </label>
+ </div>
+ <div class="radio radio-primary radio-inline">
+ <input type="radio" id="type3" value="3" name="type" >
+ <label for="type3"> 车载端 </label>
+ </div>
+ <div class="radio radio-primary radio-inline">
+ <input type="radio" id="type4" value="4" name="type" >
+ <label for="type4"> 调度端 </label>
+ </div>
+ </div>
+ </div>
+ <div id="androidDiv">
+ <div class="form-group">
+ <label class="col-sm-3 control-label">上传apk文件：</label>
+ <div class="col-sm-9">
+ <input type="file" name="images" onchange="TVersionManagementInfoDlg.previewFile()">
+ </div>
+ </div>
+ </div>
+ <#input id="url" name="版本链接" disabled="disabled"/>
+ <div class="form-group">
+ <label class="col-sm-3 control-label">是否强制更新：</label>
+ <div class="col-sm-9" style="display: flex;align-items: center;">
+ <div class="radio radio-info radio-inline">
+ <input type="radio" id="mandatory1" value="1" name="mandatory" checked="" >
+ <label for="mandatory1"> 是 </label>
+ </div>
+ <div class="radio radio-success radio-inline">
+ <input type="radio" id="mandatory2" value="2" name="mandatory" >
+ <label for="mandatory2"> 否 </label>
+ </div>
+ </div>
+ </div>
+ <div class="form-group">
+ <label class="col-sm-3 control-label">版本公告：</label>
+ <div class="col-sm-9">
+ <textarea type="text/plain" class="form-control" name="content" id="content" placeholder="多行输入" style="width:100%;height:150px;"></textarea>
+ </div>
+ </div>
+ </div>
+ </div>
+
+ <div class="row btn-group-m-t">
+ <div class="col-sm-10 col-sm-offset-5">
+ <#button btnCss="info" name="提交" id="ensure" icon="fa-check" clickFun="TVersionManagementInfoDlg.addSubmit()"/>
+ <#button btnCss="danger" name="取消" id="cancel" icon="fa-eraser" clickFun="TVersionManagementInfoDlg.close()"/>
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/tVersionManagement/tVersionManagement_info.js"></script>
+@}
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tVersionManagement/tVersionManagement_edit.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tVersionManagement/tVersionManagement_edit.html
new file mode 100644
index 0000000..e87955b
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tVersionManagement/tVersionManagement_edit.html
@@ -0,0 +1,32 @@
+@layout("/common/_container.html"){
+<div class="ibox float-e-margins">
+ <div class="ibox-content">
+ <div class="form-horizontal">
+
+ <div class="row">
+ <div class="col-sm-6 b-r">
+ <#input id="id" name="主键id" value="${item.id}" underline="true"/>
+ <#input id="url" name="包路径" value="${item.url}" underline="true"/>
+ <#input id="version" name="版本号" value="${item.version}" underline="true"/>
+ <#input id="content" name="更新公告" value="${item.content}" />
+ </div>
+
+ <div class="col-sm-6">
+ <#input id="mandatory" name="是否强制升级(1=是 2=否）" value="${item.mandatory}" underline="true"/>
+ <#input id="insertTime" name="更新时间" value="${item.insertTime}" underline="true"/>
+ <#input id="type" name="类型(1=安卓，2=ios)" value="${item.type}" />
+ </div>
+ </div>
+
+ <div class="row btn-group-m-t">
+ <div class="col-sm-10">
+ <#button btnCss="info" name="提交" id="ensure" icon="fa-check" clickFun="TVersionManagementInfoDlg.editSubmit()"/>
+ <#button btnCss="danger" name="取消" id="cancel" icon="fa-eraser" clickFun="TVersionManagementInfoDlg.close()"/>
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/tVersionManagement/tVersionManagement_info.js"></script>
+@}
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/user/user.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/user/user.html
new file mode 100644
index 0000000..b444d0f
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/user/user.html
@@ -0,0 +1,80 @@
+@layout("/common/_container.html"){
+<div class="row">
+ <div class="col-sm-12">
+ <div class="ibox float-e-margins">
+ <div class="ibox-title">
+ <h5>用户管理</h5>
+ </div>
+ <div class="ibox-content">
+ <div class="row row-lg">
+ <div class="col-sm-12">
+ <div class="row">
+ <div class="col-lg-2 col-sm-3">
+ <div class="panel panel-default">
+ <div class="panel-heading">组织机构</div>
+ <div class="panel-body dept-tree">
+ <ul id="deptTree" class="ztree"></ul>
+ </div>
+ </div>
+ </div>
+ <div class="col-lg-10 col-sm-9">
+ <div class="row">
+ <div class="col-lg-10 col-sm-9">
+ <div class="row">
+ <div class="col-lg-4 col-sm-6">
+ <#TimeCon id="createTime" name="创建时间" isTime="false"/>
+ </div>
+ <div class="col-lg-4 col-sm-12">
+ <#NameCon id="name" name="用户名称" placeholder="帐号/姓名/手机号"/>
+ </div>
+ </div>
+ </div>
+ <div class="col-lg-2 col-sm-3">
+ <div class="row">
+ <div class="col-lg-12 col-sm-12">
+ <#button name="搜索" icon="fa-search" clickFun="MgrUser.search()"/>
+ <#button name="重置" icon="fa-trash" clickFun="MgrUser.resetSearch()" space="true"/>
+ </div>
+ </div>
+ </div>
+ </div>
+ <div class="hidden-xs" id="managerTableToolbar" role="group">
+ @if(shiro.hasPermission("/mgr/add")){
+ <#button name="添加" icon="fa-plus" clickFun="MgrUser.openAddMgr()"/>
+ @}
+ @if(shiro.hasPermission("/mgr/edit")){
+ <#button name="修改" icon="fa-edit" clickFun="MgrUser.openChangeUser()" space="true"/>
+ @}
+ @if(shiro.hasPermission("/mgr/delete")){
+ <#button name="删除" icon="fa-remove" clickFun="MgrUser.delMgrUser()" space="true"/>
+ @}
+ @if(shiro.hasPermission("/mgr/reset")){
+ <#button name="重置密码" icon="fa-refresh" clickFun="MgrUser.resetPwd()" space="true"/>
+ @}
+ @if(shiro.hasPermission("/mgr/freeze")){
+ <#button name="冻结" icon="fa-warning" clickFun="MgrUser.freezeAccount()" space="true"/>
+ @}
+ @if(shiro.hasPermission("/mgr/unfreeze")){
+ <#button name="解除冻结" icon="fa-check-circle" clickFun="MgrUser.unfreeze()" space="true"/>
+ @}
+ @if(shiro.hasPermission("/mgr/setRole")){
+ <#button name="角色分配" icon="fa-user-secret" clickFun="MgrUser.roleAssign()" space="true"/>
+ @}
+ </div>
+ <#table id="managerTable"/>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/user/user.js"></script>
+<script type="text/javascript">
+ laydate.render({
+ elem: '#createTime'
+ ,range: true
+ });
+</script>
+@}
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/user/user_add.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/user/user_add.html
new file mode 100644
index 0000000..ed9ba50
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/user/user_add.html
@@ -0,0 +1,62 @@
+@layout("/common/_container.html"){
+<div class="ibox float-e-margins">
+ <div class="ibox-content">
+ <div class="form-horizontal" id="userInfoForm">
+
+ <input type="hidden" id="id" value="">
+
+ <div class="row">
+ <div class="col-sm-6 b-r">
+ <#input id="account" name="账户" underline="true"/>
+
+ <#select id="sex" name="性别：" underline="true">
+ <option value="1">男</option>
+ <option value="2">女</option>
+ </#select>
+
+ <#input id="password" name="密码" underline="true" type="password"/>
+ <#input id="rePassword" name="确认密码" type="password"/>
+
+ <#input id="email" name="邮箱" type="email"/>
+ <!--<#input id="roleid" name="角色" underline="true" type="hidden" disabled="disabled"/>-->
+ </div>
+ <div class="col-sm-6">
+ <div id="driverInfoContent">
+ <#input id="name" name="姓名" underline="true"/>
+
+ <#input id="birthday" name="出生日期" underline="true" type="text"/>
+
+ <#input id="citySel" name="部门" underline="true" readonly="readonly" hidden="deptid"
+ clickFun="UserInfoDlg.showDeptSelectTree(); return false;"
+ style="background-color: #ffffff !important;"/>
+
+ <#input id="phone" name="电话"/>
+
+
+ </div>
+ </div>
+ </div>
+
+ <!-- 这是部门选择的下拉框 -->
+ <div id="menuContent" class="menuContent"
+ style="display: none; position: absolute; z-index: 200;">
+ <ul id="treeDemo" class="ztree tree-box" style="width: 249px !important;"></ul>
+ </div>
+
+ <div class="row btn-group-m-t">
+ <div class="col-sm-10 col-sm-offset-4">
+ <#button btnCss="info" name="提交" id="ensure" icon="fa-check" clickFun="UserInfoDlg.addSubmit()"/>
+ <#button btnCss="danger" name="取消" id="cancel" icon="fa-eraser" clickFun="UserInfoDlg.close()"/>
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/user/user_info.js"></script>
+<script>
+ laydate.render({
+ elem: '#birthday'
+ });
+</script>
+@}
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/user/user_chpwd.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/user/user_chpwd.html
new file mode 100644
index 0000000..06372ae
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/user/user_chpwd.html
@@ -0,0 +1,34 @@
+@layout("/common/_container.html"){
+<div class="col-sm-4 col-sm-offset-4">
+ <div class="ibox float-e-margins">
+ <div class="ibox-title">
+ <h5>修改密码</h5>
+ </div>
+ <div class="ibox-content">
+ <div class="row row-lg">
+ <div class="col-sm-12">
+ <div class="ibox float-e-margins">
+ <div class="ibox-content" style="border:none !important; ">
+ <div class="form-horizontal">
+ <div class="row">
+ <div class="col-sm-12">
+ <#input id="oldPwd" name="原密码" underline="true" type="password"/>
+ <#input id="newPwd" name="新密码" underline="true" type="password"/>
+ <#input id="rePwd" name="新密码验证" type="password"/>
+ </div>
+ </div>
+ <div class="row btn-group-m-t">
+ <div class="col-sm-10 col-sm-offset-5">
+ <#button btnCss="info" name="提交" id="ensure" icon="fa-check" clickFun="UserInfoDlg.chPwd()"/>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/user/user_info.js"></script>
+@}
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/user/user_edit.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/user/user_edit.html
new file mode 100644
index 0000000..4271878
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/user/user_edit.html
@@ -0,0 +1,58 @@
+@layout("/common/_container.html"){
+<div class="ibox float-e-margins">
+ <div class="ibox-content">
+ <div class="form-horizontal" id="userInfoForm">
+
+ <input type="hidden" id="id" value="${user.id}">
+ <input type="hidden" id="sexValue" value="${user.sex}">
+
+ <div class="row">
+ <div class="col-sm-6 b-r">
+ <#input id="account" name="账户" underline="true" value="${user.account}"/>
+
+ <#select id="sex" name="性别：" underline="true">
+ <option value="1">男</option>
+ <option value="2">女</option>
+ </#select>
+
+ <#input id="citySel" name="部门" underline="false" readonly="readonly" hidden="deptid" hiddenValue="${user.deptid}" value="${deptName}" clickFun="UserInfoDlg.showDeptSelectTree(); return false;" style="background-color: #ffffff !important;"/>
+
+ <!--<#input id="roleid" name="角色" underline="true" value="${roleName}" disabled="disabled"/>-->
+ <#input id="email" name="邮箱" type="email" value="${user.email}"/>
+ </div>
+ <div class="col-sm-6">
+ <div id="driverInfoContent">
+ <#input id="name" name="姓名" underline="true" value="${user.name}"/>
+
+ <#input id="birthday" name="出生日期" underline="true" type="text"
+ value="${user.birthday}"/>
+
+ <#input id="phone" name="电话" value="${user.phone}"/>
+
+ </div>
+ </div>
+ </div>
+
+ <!-- 这是部门选择的下拉框 -->
+ <div id="menuContent" class="menuContent"
+ style="display: none; position: absolute; z-index: 200;">
+ <ul id="treeDemo" class="ztree tree-box" style="width: 249px !important;"></ul>
+ </div>
+
+ <div class="row btn-group-m-t">
+ <div class="col-sm-10 col-sm-offset-4">
+ <#button btnCss="info" name="提交" id="ensure" icon="fa-check" clickFun="UserInfoDlg.editSubmit()"/>
+ <#button btnCss="danger" name="取消" id="cancel" icon="fa-eraser" clickFun="UserInfoDlg.close()"/>
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/user/user_info.js"></script>
+<script>
+ laydate.render({
+ elem: '#birthday'
+ });
+</script>
+@}
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/user/user_roleassign.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/user/user_roleassign.html
new file mode 100644
index 0000000..8131bc8
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/user/user_roleassign.html
@@ -0,0 +1,79 @@
+@layout("/common/_container.html"){
+
+
+<script type="text/javascript">
+ $(function () {
+
+ var index = parent.layer.getFrameIndex(window.name); //获取窗口索引
+
+ $("#btn_close").bind("click", function () {
+ parent.layer.close(index);
+ });
+
+ $("#btn_save").bind("click", function () {
+ var ids = Feng.zTreeCheckedNodes("zTree");
+ var ajax = new $ax(Feng.ctxPath + "/mgr/setRole", function (data) {
+ Feng.success("分配角色成功!");
+ window.parent.MgrUser.table.refresh();
+ parent.layer.close(index);
+ }, function (data) {
+ Feng.error("分配角色失败!" + data.responseJSON.message + "!");
+ });
+ ajax.set("roleIds", ids);
+ ajax.set("userId", "${userId}");
+ ajax.start();
+ });
+
+ initZtree();
+ });
+
+ function initZtree() {
+ var setting = {
+ check: {
+ enable: true,
+ chkboxType: {
+ "Y": "",
+ "N": ""
+ }
+ },
+ data: {
+ simpleData: {
+ enable: true
+ }
+ }
+ };
+
+ var ztree = new $ZTree("zTree", "/role/roleTreeListByUserId/${userId}");
+ ztree.setSettings(setting);
+ ztree.init();
+ }
+</script>
+
+
+<!-- 配置grid -->
+<div class="container"
+ style="padding: 0px 10px !important; margin-top: -10px; text-align: center !important;">
+ <div class="row">
+ <div class="ibox float-e-margins">
+ <div class="ibox-title">
+ <h5>${userAccount!}</h5>
+ </div>
+ <div class="ibox-content">
+ <ul id="zTree" class="ztree"></ul>
+ </div>
+ </div>
+ </div>
+ <div class="row">
+ <div class="col-md-12">
+ <button class="btn btn-sm btn-info" type="button" id="btn_save">
+ <i class="ace-icon fa fa-check bigger-110"></i> 保存
+ </button>
+
+ <button class="btn btn-sm btn-danger" type="button" id="btn_close">
+ <i class="ace-icon fa fa-close bigger-110"></i> 关闭
+ </button>
+ </div>
+ </div>
+</div>
+
+@}
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/user/user_view.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/user/user_view.html
new file mode 100644
index 0000000..280c7e9
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/user/user_view.html
@@ -0,0 +1,75 @@
+@layout("/common/_container.html"){
+<div class="col-sm-6 col-sm-offset-3">
+ <div class="ibox float-e-margins">
+ <div class="ibox-title">
+ <h5>用户管理</h5>
+ </div>
+ <div class="ibox-content">
+ <div class="row row-lg">
+ <div class="col-sm-12">
+ <div class="ibox float-e-margins">
+ <div class="ibox-content" style="border:none !important; ">
+ <div class="form-horizontal" id="userInfoForm">
+
+ <input type="hidden" id="id" value="${user.id}">
+ <input type="hidden" id="sexValue" value="${user.sex}">
+
+ <div class="row">
+ <div class="col-sm-6 b-r">
+ <#avatar id="avatar" name="头像" underline="true" avatarImg="${user.avatar}"/>
+
+ <#input id="account" name="账户" underline="true" value="${user.account}" disabled="disabled" />
+
+ <#select id="sex" name="性别" underline="true" value="${user.sex}">
+ <option value="1">男</option>
+ <option value="2">女</option>
+ </#select>
+
+ <#input id="roleid" name="角色" underline="true" value="${roleName}" disabled="disabled"/>
+
+ <#input id="email" name="邮箱" type="email" value="${user.email}"/>
+ </div>
+
+ <div class="col-sm-6">
+ <div id="driverInfoContent">
+ <#input id="name" name="姓名" underline="true" value="${user.name}"/>
+
+ <#input id="birthday" name="出生日期" underline="true" type="text"
+ value="${user.birthday}"/>
+
+ <#input id="citySel" name="部门" underline="true" readonly="readonly" value="${deptName}"
+ hidden="deptid" hiddenValue="${user.deptid}"
+ clickFun="UserInfoDlg.showInfoDeptSelectTree(); return false;"
+ style="background-color: #ffffff !important;"
+ selectFlag="true" selectId="menuContent" selectTreeId="treeDemo" selectStyle="width:250px !important;"/>
+
+ <#input id="phone" name="电话" value="${user.phone}"/>
+ </div>
+ </div>
+ </div>
+
+ <div class="progress progress-striped" id="progressTipArea" style="margin-top: 20px;">
+ <div id="progressBar" style="width: 0%" aria-valuemax="100" aria-valuemin="0" aria-valuenow="0" role="progressbar" class="progress-bar progress-bar-info">
+ </div>
+ </div>
+
+ <div class="row btn-group-m-t">
+ <div class="col-sm-10 col-sm-offset-5">
+ <#button btnCss="info" name="提交" id="ensure" icon="fa-check" clickFun="UserInfoDlg.editSubmit()"/>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/user/user_info.js"></script>
+<script>
+ laydate.render({
+ elem: '#birthday'
+ });
+</script>
+@}
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/userActivity/addRegist.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/userActivity/addRegist.html
new file mode 100644
index 0000000..0efdcf4
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/userActivity/addRegist.html
@@ -0,0 +1,78 @@
+@layout("/common/_container.html"){
+<style>
+ .table{
+ display: inline;
+ width: 16.6666666%;
+ float:left;
+ text-align:center;
+ border-collapse:collapse;
+ font-size: 18px;
+ }
+ .table:hover{
+ background-color: rgba(255,0,0,.3);
+ }
+ .newWidth, .single-line{
+ max-width:150px !important;display: initial !important;
+ }
+</style>
+<div class="ibox float-e-margins">
+ <div class="ibox-content">
+ <div class="form-horizontal" id="sysCouponActivityInfoForm">
+ <input type="hidden" id="activityId">
+ <div class="row">
+ <div class="col-sm-7">
+ <div class="row" id="content5" style="margin-left: 100px;">
+ <div class="col-sm-11">
+ <div class="form-group">
+ <div class="col-sm-10">
+ <input type="hidden" id="id1">
+ <input type="hidden" id="id2">
+ <input type="hidden" id="id3">
+ <input type="hidden" id="id4">
+ 充值： <input type="text" name="zc1" id="num1" class="form-control newWidth" /> 元
+ <br/>
+ <br/>
+ 送
+ <input type="text" name="zc1" id="num2" class="form-control newWidth" /> 张
+ <input type="text" name="zc1" id="num3" class="form-control newWidth" placeholder="请选择" readonly="readonly" onclick="RegistInfoDlg.selecteCoupon(0)"/> 元通用优惠券
+ <br/>
+ <br/>
+ 送
+ <input type="text" name="zc1" id="num4" class="form-control newWidth" /> 张
+ <input type="text" name="zc1" id="num5" class="form-control newWidth" placeholder="请选择" readonly="readonly" onclick="RegistInfoDlg.selecteCoupon(1)"/> 元专车优惠券
+ <br/>
+ <br/>
+ 送
+ <input type="text" name="zc1" id="num6" class="form-control newWidth" /> 张
+ <input type="text" name="zc1" id="num7" class="form-control newWidth" placeholder="请选择" readonly="readonly" onclick="RegistInfoDlg.selecteCoupon(2)"/> 元出租车优惠券
+ <br/>
+ <br/>
+ 送
+ <input type="text" name="zc1" id="num8" class="form-control newWidth" /> 张
+ <input type="text" name="zc1" id="num9" class="form-control newWidth" placeholder="请选择" readonly="readonly" onclick="RegistInfoDlg.selecteCoupon(3)"/> 元城际优惠券
+ <br/>
+ <br/>
+ 有效期
+ <input type="text" name="zc1" id="num10" class="form-control newWidth" /> 天，
+ 最高金额
+ <input type="text" name="zc1" id="num11" class="form-control newWidth" /> 元
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+
+
+ </div>
+
+ <div class="row btn-group-m-t">
+ <div class="col-sm-10">
+ <#button btnCss="info" name="提交" id="ensure" icon="fa-check" clickFun="addSubmit()"/>
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/userActivity/addRegist.js"></script>
+@}
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/userActivity/receiveRecord.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/userActivity/receiveRecord.html
new file mode 100644
index 0000000..8b35875
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/userActivity/receiveRecord.html
@@ -0,0 +1,296 @@
+@layout("/common/_container.html"){
+<style type="text/css">
+
+ ztree li span. {
+ margin-left: 4px;
+ margin-right: -1px;
+ background-position: -144px 0;
+ vertical-align: top;
+ *vertical-align: middle
+ }
+
+ .titleDiv {
+ overflow: hidden;
+ }
+
+ .titleItem {
+ float: left;
+ text-align: center;
+ width: 180px;
+ line-height: 40px;
+ border-top: 1px solid #E7EBEE;
+ border-bottom: 1px solid #E7EBEE;
+ border-left: 1px solid #E7EBEE;
+ font-size: 16px;
+ }
+
+ .titleItem1 {
+ float: left;
+ text-align: center;
+ width: 180px;
+ line-height: 40px;
+ border-bottom: 1px solid #E7EBEE;
+ border-left: 1px solid #E7EBEE;
+ font-size: 16px;
+ }
+
+ .titleItemCk {
+ color: #fff !important;
+ background: #1AB395 !important;
+ }
+
+ .titleItem:last-child {
+ border-right: 1px solid #E7EBEE;
+ }
+
+ /* 订单分析 */
+ ul {
+ list-style-type: none;
+ }
+
+ .orderFenxiBox {
+ width: 100%;
+ display: flex;
+ align-items: center;
+ background-color: white;
+ }
+
+ .orderFenxiItem {
+ flex: 1;
+ padding: 20px 0;
+ }
+
+ .orderFenxiItem:last-child .orderFenxiItem_number {
+ border-right: 0 none;
+ }
+
+ .orderFenxiItem_number {
+ width: 80%;
+ height: 80%;
+ line-height: 90px;
+ padding: 20px 0;
+ font-size: 32px;
+ color: #1AB394;
+ text-align: center;
+ border-right: 1px solid #eaeaea;
+ }
+
+ .orderFenxiItem_title, .orderFenxiItem_last {
+ line-height: 40px;
+ font-size: 14px;
+ }
+</style>
+
+<div class="row" style="margin-left: 2%;">
+ <div class="col-sm-3">
+ <input id="activityId" value="${activityId}" type="hidden">
+ <div class="ibox float-e-margins">
+ <div class="ibox-title">
+ <h3>活动时间：<input type="text" id="startTime" name="zc7" class="form-control" style="max-width:250px !important;display: initial !important;" onchange="receiveRecordDetail()"/></h3>
+ </div>
+ <div class="ibox-title">
+ <h3>领取总金额<span id="totalMOney"></span></h3>
+ </div>
+ </div>
+ </div>
+</div>
+
+
+<div class="row" style="margin-left: 2%;">
+ <div class="col-sm-3">
+ <div class="ibox float-e-margins">
+ <div class="ibox-title">
+ <h3>注册奖励</h3>
+ </div>
+ <div class="ibox-content">
+ <h1 class="no-margins text-navy">领取人数：<span id="userActivityRegisteredNumber"></span></h1>
+ <h1 class="no-margins text-navy">领取总金额：<span id="userActivityRegisteredMoney"></span></h1>
+ <h1 class="no-margins text-navy">使用总金额：<span id="userActivityRegisteredUseMoney"></span></h1>
+ </div>
+ <h4><a href="#" onclick="driverActivityHistory(1,${userActivityRegisteredId})">领取列表</a></h4>
+ </div>
+ </div>
+ <div class="col-sm-3">
+ <div class="ibox float-e-margins">
+ <div class="ibox-title">
+ <h3>邀请奖励</h3>
+ </div>
+ <div class="ibox-content">
+ <h1 class="no-margins text-navy">领取人数：<span id="userActivityInviteNumber"></span></h1>
+ <h1 class="no-margins text-navy">领取总金额：<span id="userActivityInviteMoney"></span></h1>
+ <h1 class="no-margins text-navy">使用总金额：<span id="userActivityInviteUseMoney"></span></h1>
+ </div>
+ <h4><a href="#" onclick="driverActivityHistory(2,${userActivityInviteId})">领取列表</a></h4>
+ </div>
+ </div>
+ <div class="col-sm-3">
+ <div class="ibox float-e-margins">
+ <div class="ibox-title">
+ <h3>打折活动</h3>
+ </div>
+ <div class="ibox-content">
+ <h1 class="no-margins text-navy">使用人数：<span id="userActivityDiscount1Number"></span></h1>
+ <h1 class="no-margins text-navy">折扣总金额：<span id="userActivityDiscount1Money"></span></h1>
+ </div>
+ </div>
+ </div>
+ <div class="col-sm-3">
+ <div class="ibox float-e-margins">
+ <div class="ibox-title">
+ <h3>红包活动</h3>
+ </div>
+ <div class="ibox-content">
+ <h1 class="no-margins text-navy">领取人数：<span id="userActivityRedenvelopeNumber"></span></h1>
+ <h1 class="no-margins text-navy">领取总金额：<span id="userActivityRedenvelopeMoney"></span></h1>
+ <h1 class="no-margins text-navy">使用总金额：<span id="userActivityRedenvelopeUseMoney"></span></h1>
+ </div>
+ <h4><a href="#" onclick="driverActivityHistory(4,${userActivityRedenvelopeId})">领取列表</a></h4>
+ </div>
+ </div>
+</div>
+
+<div class="row">
+ <div class="col-sm-12">
+ <div class="ibox float-e-margins">
+ <div class="ibox-title">
+ <h5>充值活动</h5>
+ </div>
+ <div class="ibox-content">
+ <div class="row row-lg">
+ <div class="col-sm-12">
+ <#table id="DriverActivityTable"/>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+</div>
+<!-- ChartJS-->
+<script type="text/javascript">
+ $(function () {
+ $("#startTime").val("${startTime} - ${endTime}")
+ receiveRecordDetail("${startTime} - ${endTime}");
+ var defaultColunms = DriverActivity.initColumn();
+ var table = new BSTable(DriverActivity.id, "/userActivity/blanceList", defaultColunms);
+ table.setPaginationType("server");
+ DriverActivity.table = table.init();
+ })
+ laydate.render({
+ elem: '#startTime'
+ ,range: true
+ ,done: function(value, date, endDate){
+ // 回调函数
+ receiveRecordDetail(value);
+ var queryData = {};
+ queryData['createTime'] = value;
+ queryData['activityId'] = $("#activityId").val();
+ DriverActivity.table.refresh({query: queryData});
+ }
+ });
+
+ function receiveRecordDetail(times){
+ var ajax = new $ax(Feng.ctxPath + "/userActivity/receiveRecordDetail", function (data) {
+ $("#totalMOney").html(data.totalMOney);
+ $("#userActivityRegisteredUseMoney").html(data.userActivityRegisteredUseMoney);
+ $("#userActivityRegisteredMoney").html(data.userActivityRegisteredMoney);
+ $("#userActivityRegisteredNumber").html(data.userActivityRegisteredNumber);
+ $("#userActivityInviteUseMoney").html(data.userActivityInviteUseMoney);
+ $("#userActivityInviteMoney").html(data.userActivityInviteMoney);
+ $("#userActivityInviteNumber").html(data.userActivityInviteNumber);
+ $("#userActivityDiscount1Money").html(data.userActivityDiscount1Money);
+ $("#userActivityDiscount1Number").html(data.userActivityDiscount1Number);
+ $("#userActivityRedenvelopeUseMoney").html(data.userActivityRedenvelopeUseMoney);
+ $("#userActivityRedenvelopeMoney").html(data.userActivityRedenvelopeMoney);
+ $("#userActivityRedenvelopeNumber").html(data.userActivityRedenvelopeNumber);
+ }, function (data) {
+ Feng.error("操作失败!" + data.responseJSON.message + "!");
+ });
+ ajax.set("createTime",times);
+ ajax.set("activityId",$("#activityId").val());
+ ajax.start();
+ }
+ /**
+ * 领取记录
+ */
+ function driverActivityHistory(type,id) {
+ if(type==1){
+ layer.open({
+ type: 2,
+ title: '领取记录',
+ area: ['100%', '100%'], //宽高
+ fix: false, //不固定
+ maxmin: true,
+ content: Feng.ctxPath + '/userCouponRecord?couponActivityId='+ id+"&activityType=2"
+ });
+ }else if(type==2){
+ layer.open({
+ type: 2,
+ title: '领取记录',
+ area: ['100%', '100%'], //宽高
+ fix: false, //不固定
+ maxmin: true,
+ content: Feng.ctxPath + '/userCouponRecord?couponActivityId='+ id+"&activityType=3"
+ });
+ }else if(type==4){
+ layer.open({
+ type: 2,
+ title: '领取记录',
+ area: ['100%', '100%'], //宽高
+ fix: false, //不固定
+ maxmin: true,
+ content: Feng.ctxPath + '/tUserRedPacketRecord?couponActivityId='+ id
+ });
+ }else{
+ layer.open({
+ type: 2,
+ title: '领取记录',
+ area: ['100%', '100%'], //宽高
+ fix: false, //不固定
+ maxmin: true,
+ content: Feng.ctxPath + '/userCouponRecord?couponActivityId='+ id+"&activityType=4"
+ });
+ }
+
+ };
+
+ /**
+ * 管理初始化
+ */
+ var DriverActivity = {
+ id: "DriverActivityTable", //表格id
+ seItem: null, //选中的条目
+ table: null,
+ layerIndex: -1
+ };
+
+ /**
+ * 初始化表格的列
+ */
+ DriverActivity.initColumn = function () {
+ return [
+ {field: 'selectItem', radio: true},
+ {title: '', field: 'id', visible: false, align: 'center', valign: 'middle'},
+ {title: '充值金额', field: 'money', visible: true, align: 'center', valign: 'middle'},
+ {title: '通用券领取总数', field: 'number', visible: true, align: 'center', valign: 'middle'},
+ {title: '通用券使用总数', field: 'useNumber', visible: true, align: 'center', valign: 'middle'},
+ {title: '通用券使用总金额', field: 'useMoney', visible: true, align: 'center', valign: 'middle'},
+ {title: '专车券领取总数', field: 'speNumber', visible: true, align: 'center', valign: 'middle'},
+ {title: '专车券使用总数', field: 'speUseNumber', visible: true, align: 'center', valign: 'middle'},
+ {title: '专车券使用总金额', field: 'speUserMoney', visible: true, align: 'center', valign: 'middle'},
+ {title: '出租车券领取总数', field: 'taxiNumber', visible: true, align: 'center', valign: 'middle'},
+ {title: '出租车券使用总数', field: 'taxiUseNumber', visible: true, align: 'center', valign: 'middle'},
+ {title: '出租车券使用总金额', field: 'taxiUserMoney', visible: true, align: 'center', valign: 'middle'},
+ {title: '城际券领取总数', field: 'intercityNumber', visible: true, align: 'center', valign: 'middle'},
+ {title: '城际券使用总数', field: 'intercityUseNumber', visible: true, align: 'center', valign: 'middle'},
+ {title: '城际券使用总金额', field: 'intercityUserMoney', visible: true, align: 'center', valign: 'middle'},
+ {title: '', field: 'insertTime', visible: true, align: 'center', valign: 'middle',
+ formatter: function (value, row) {
+ var btn = '';
+ btn+='<a href="javascript:void(0);" onclick="driverActivityHistory(5,'+row.id+')">领取记录</a>'
+ return [btn];
+ }
+ },
+ ];
+ };
+</script>
+@}
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/userActivity/sysCouponRecord.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/userActivity/sysCouponRecord.html
new file mode 100644
index 0000000..7fa06a1
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/userActivity/sysCouponRecord.html
@@ -0,0 +1,37 @@
+@layout("/common/_container.html"){
+<div class="row">
+ <div class="col-sm-12">
+ <div class="ibox float-e-margins">
+ <div class="ibox-title">
+ <h5>优惠券管理</h5>
+ </div>
+ <div class="ibox-content">
+ <div class="row row-lg">
+ <div class="col-sm-12">
+ <div class="row">
+ <div class="col-sm-3">
+ <#TimeCon id="createTime" name="领取时间" isTime="false"/>
+ </div>
+ <div class="col-sm-3">
+ <#button name="搜索" icon="fa-search" clickFun="SysCouponRecord.search()"/>
+ <#button name="重置" icon="fa-search" clickFun="SysCouponRecord.resetSearch()"/>
+ <#button btnCss="info" name="确定" id="ensure" icon="fa-check" clickFun="SysCouponRecord.selectCouponOpt()" space="true"/>
+ <#button btnCss="danger" name="取消" id="cancel" icon="fa-eraser" clickFun="SysCouponRecord.close()" space="true"/>
+
+ </div>
+ </div>
+ <#table id="SysCouponRecordTable"/>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/userActivity/sysCouponRecord.js"></script>
+<script>
+ laydate.render({
+ elem: '#createTime'
+ ,range: true
+ });
+</script>
+@}
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/userActivity/sysCouponRecord1.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/userActivity/sysCouponRecord1.html
new file mode 100644
index 0000000..7356035
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/userActivity/sysCouponRecord1.html
@@ -0,0 +1,37 @@
+@layout("/common/_container.html"){
+<div class="row">
+ <div class="col-sm-12">
+ <div class="ibox float-e-margins">
+ <div class="ibox-title">
+ <h5>优惠券管理</h5>
+ </div>
+ <div class="ibox-content">
+ <div class="row row-lg">
+ <div class="col-sm-12">
+ <div class="row">
+ <div class="col-sm-3">
+ <#TimeCon id="createTime" name="领取时间" isTime="false"/>
+ </div>
+ <div class="col-sm-3">
+ <#button name="搜索" icon="fa-search" clickFun="SysCouponRecord.search()"/>
+ <#button name="重置" icon="fa-search" clickFun="SysCouponRecord.resetSearch()"/>
+ <#button btnCss="info" name="确定" id="ensure" icon="fa-check" clickFun="SysCouponRecord.selectCouponOpt1()" space="true"/>
+ <#button btnCss="danger" name="取消" id="cancel" icon="fa-eraser" clickFun="SysCouponRecord.close()" space="true"/>
+
+ </div>
+ </div>
+ <#table id="SysCouponRecordTable"/>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/userActivity/sysCouponRecord.js"></script>
+<script>
+ laydate.render({
+ elem: '#createTime'
+ ,range: true
+ });
+</script>
+@}
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/userActivity/sysCouponRecord2.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/userActivity/sysCouponRecord2.html
new file mode 100644
index 0000000..bcb6ea8
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/userActivity/sysCouponRecord2.html
@@ -0,0 +1,38 @@
+@layout("/common/_container.html"){
+<div class="row">
+ <div class="col-sm-12">
+ <div class="ibox float-e-margins">
+ <div class="ibox-title">
+ <h5>优惠券管理</h5>
+ </div>
+ <div class="ibox-content">
+ <div class="row row-lg">
+ <div class="col-sm-12">
+ <div class="row">
+ <div class="col-sm-3">
+ <input type="hidden" id="couponUseType" value="${type}">
+ <#TimeCon id="createTime" name="领取时间" isTime="false"/>
+ </div>
+ <div class="col-sm-3">
+ <#button name="搜索" icon="fa-search" clickFun="SysCouponRecord.search()"/>
+ <#button name="重置" icon="fa-search" clickFun="SysCouponRecord.resetSearch()"/>
+ <#button btnCss="info" name="确定" id="ensure" icon="fa-check" clickFun="SysCouponRecord.selectCouponOpt2()" space="true"/>
+ <#button btnCss="danger" name="取消" id="cancel" icon="fa-eraser" clickFun="SysCouponRecord.close1()" space="true"/>
+
+ </div>
+ </div>
+ <#table id="SysCouponRecordTable"/>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/userActivity/sysCouponRecord.js"></script>
+<script>
+ laydate.render({
+ elem: '#createTime'
+ ,range: true
+ });
+</script>
+@}
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/userActivity/sysRedPacketRecord.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/userActivity/sysRedPacketRecord.html
new file mode 100644
index 0000000..f1bf16c
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/userActivity/sysRedPacketRecord.html
@@ -0,0 +1,36 @@
+@layout("/common/_container.html"){
+<div class="row">
+ <div class="col-sm-12">
+ <div class="ibox float-e-margins">
+ <div class="ibox-title">
+ <h5>红包管理</h5>
+ </div>
+ <div class="ibox-content">
+ <div class="row row-lg">
+ <div class="col-sm-12">
+ <div class="row">
+ <div class="col-sm-3">
+ <#TimeCon id="createTime" name="领取时间" isTime="false"/>
+ </div>
+ <div class="col-sm-3">
+ <#button name="搜索" icon="fa-search" clickFun="SysRedPacketRecord.search()"/>
+ <#button name="重置" icon="fa-trash" clickFun="SysRedPacketRecord.resetSearch()" space="true"/>
+ <#button btnCss="info" name="确定" id="ensure" icon="fa-check" clickFun="SysRedPacketRecord.selectRedOpt()" space="true"/>
+ <#button btnCss="danger" name="取消" id="cancel" icon="fa-eraser" clickFun="SysRedPacketRecord.close()" space="true"/>
+ </div>
+ </div>
+ <#table id="SysRedPacketRecordTable"/>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/userActivity/sysRedPacketRecord.js"></script>
+<script>
+ laydate.render({
+ elem: '#createTime'
+ ,range: true
+ });
+</script>
+@}
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/userActivity/userActivity.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/userActivity/userActivity.html
new file mode 100644
index 0000000..8630871
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/userActivity/userActivity.html
@@ -0,0 +1,68 @@
+@layout("/common/_container.html"){
+<div class="row">
+ <div class="col-sm-12">
+ <div class="ibox float-e-margins">
+ <div class="ibox-title">
+ <h5>管理</h5>
+ </div>
+ <div class="ibox-content">
+ <div class="row row-lg">
+ <div class="col-sm-12">
+ <div class="row">
+ <div class="col-sm-3">
+ <#TimeCon id="createTime" name="添加时间" isTime="false"/>
+ </div>
+ <div class="col-sm-3">
+ <#NameCon id="name" name="名称" />
+ </div>
+ <div class="col-sm-3">
+ <#SelectCon id="status" name="状态" >
+ <option value="">全部</option>
+ <option value="1">待审核</option>
+ <option value="2">已驳回</option>
+ <option value="4">已暂停</option>
+ <option value="3">未开始</option>
+ <option value="5">进行中</option>
+ <option value="6">已结束</option>
+ </#SelectCon>
+ </div>
+ <div class="col-sm-3">
+ <#button name="搜索" icon="fa-search" clickFun="UserActivity.search()"/>
+ <#button name="重置" icon="fa-trash" clickFun="UserActivity.resetSearch()" space="true"/>
+ </div>
+ </div>
+ <div class="hidden-xs" id="UserActivityTableToolbar" role="group">
+ @if(shiro.hasPermission("/userActivity/add")){
+ <#button name="添加" icon="fa-plus" clickFun="UserActivity.openAddUserActivity()"/>
+ @}
+ @if(shiro.hasPermission("/userActivity/update")){
+ <#button name="编辑" icon="fa-edit" clickFun="UserActivity.openUpdateUserActivity()" space="true"/>
+ @}
+ @if(shiro.hasPermission("/userActivity/updateStatus")){
+ <#button name="启动/暂停" icon="" clickFun="UserActivity.updateStatus()" space="true"/>
+ @}
+ @if(shiro.hasPermission("/userActivity/detail")){
+ <#button name="详情" icon="" clickFun="UserActivity.openUserActivityDetail()" space="true"/>
+ @}
+ @if(shiro.hasPermission("/userActivity/receiveRecord")){
+ <#button name="领取记录" icon="" clickFun="UserActivity.receiveRecord()" space="true"/>
+ @}
+ @if(shiro.hasPermission("/userActivity/immediately")){
+ <#button name="审核" icon="" clickFun="UserActivity.immediately()" space="true"/>
+ @}
+ </div>
+ <#table id="UserActivityTable"/>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/userActivity/userActivity.js"></script>
+<script>
+ laydate.render({
+ elem: '#createTime'
+ ,range: true
+ });
+</script>
+@}
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/userActivity/userActivity_add.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/userActivity/userActivity_add.html
new file mode 100644
index 0000000..03ac1ca
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/userActivity/userActivity_add.html
@@ -0,0 +1,309 @@
+@layout("/common/_container.html"){
+<link href="${ctxPath}/static/css/plugins/switchery/switchery.css" rel="stylesheet">
+<style>
+ .table1{
+ display: inline;
+ width: 16.6666666%;
+ float:left;
+ text-align:center;
+ border-collapse:collapse;
+ font-size: 18px;
+ }
+ .table1:hover{
+ background-color: rgba(255,0,0,.3);
+ }
+ .newWidth, .single-line{
+ max-width:150px !important;display: initial !important;
+ }
+</style>
+<div class="ibox float-e-margins">
+ <div class="ibox-content">
+ <div class="form-horizontal">
+ <div class="row">
+ <div class="col-sm-10">
+ <div style="height: 50px;box-sizing: border-box;background:#f3f3f4;line-height: 50px;border:1px solid;margin-bottom: 20px;">
+ <div id="div1" class='table1' onclick="getContent(1)" style="border-right: 1px solid #333;background-color: rgb(26, 179, 148);color: white;">活动设置</div>
+ <div id="div2" class='table1' onclick="getContent(2)" style="border-right: 1px solid #333;">注册奖励</div>
+ <div id="div3" class='table1' onclick="getContent(3)" style="border-right: 1px solid #333;">邀请奖励</div>
+ <div id="div4" class='table1' onclick="getContent(4)" style="border-right: 1px solid #333;">充值赠送</div>
+ <div id="div5" class='table1' onclick="getContent(5)" style="border-right: 1px solid #333;">打折活动</div>
+ <div id="div6" class='table1' onclick="getContent(6)" style="border-right: 1px solid #333;">红包活动</div>
+ </div>
+ <div class="row" id="content1" style="margin-left: 100px;">
+ <div class="col-sm-11">
+ <div class="form-group">
+ <div class="col-sm-10">
+ <h1>添加活动</h1>
+ <br/>
+ <br/>
+ 活动名称： <input type="text" name="zc1" id="name" class="form-control newWidth" />
+ <br/>
+ <br/>
+ 活动时间： <input type="text" id="startTime" name="zc7" class="form-control" style="max-width:300px !important;display: initial !important;" />
+ </div>
+ </div>
+ </div>
+ </div>
+ <div class="row" id="content2" style="margin-left: 100px;">
+ <div class="col-sm-11">
+ <div class="form-group">
+ <div class="col-sm-15">
+ <input type="hidden" id="content2CouponId">
+ <h1>用户注册既赠送优惠券</h1>
+ <br/>
+ <br/>
+ 启用： <input type="checkbox" class="js-switch" id="content2Check" checked="">
+ <br/>
+ <br/>
+ <#button name="选择优惠券" icon="fa-plus" clickFun="UserActivityInfoDlg.toSelectCouponOpt()"/>
+ <br/>
+ <br/>
+ 优惠券名称： <input type="text" name="zc1" id="content2Num1" class="form-control newWidth" readonly/>
+ <br/>
+ <br/>
+ 服务类型： <input type="text" name="zc1" id="content2Num2" class="form-control newWidth" readonly/>
+ <br/>
+ <br/>
+ 优惠券类型： <input type="text" name="zc1" id="content2Num3" class="form-control newWidth" readonly/>
+ <br/>
+ <br/>
+ 金额：
+
+
+ <input type="text" name="zc1" id="content2Num4" class="form-control newWidth" readonly/>
+ <br/>
+ <br/>
+ 最高金额： <input type="text" name="zc1" id="content2Num7" class="form-control newWidth" />
+ <br/>
+ <br/>
+ 有效期：
+
+ <input type="text" name="zc1" id="content2Num5" class="form-control newWidth" /> 天
+ <br/>
+ <br/>
+ 张数：
+
+
+ <input type="text" name="zc1" id="content2Num6" class="form-control newWidth" />
+ </div>
+ </div>
+ </div>
+ </div>
+ <div class="row" id="content3" style="margin-left: 100px;">
+ <div class="col-sm-11">
+ <div class="form-group">
+ <div class="col-sm-10">
+ <input type="hidden" id="content3CouponId">
+ <h1>用户邀请用户奖励</h1>
+ <br/>
+ <br/>
+ 启用： <input type="checkbox" id="content3Check" class="js-switch1" checked="">
+ <br/>
+ <br/>
+ <#button name="选择优惠券" icon="fa-plus" clickFun="UserActivityInfoDlg.toSelectCouponOpt1()"/>
+ <br/>
+ <br/>
+ 优惠券名称： <input type="text" name="zc1" id="content3Num1" class="form-control newWidth" readonly/>
+ <br/>
+ <br/>
+ 服务类型： <input type="text" name="zc1" id="content3Num2" class="form-control newWidth" readonly/>
+ <br/>
+ <br/>
+ 优惠券类型： <input type="text" name="zc1" id="content3Num3" class="form-control newWidth" readonly/>
+ <br/>
+ <br/>
+ 金额：
+
+
+ <input type="text" name="zc1" id="content3Num4" class="form-control newWidth" readonly/>
+ <br/>
+ <br/>
+ 最高金额： <input type="text" name="zc1" id="content3Num7" class="form-control newWidth" />
+ <br/>
+ <br/>
+ 有效期：
+
+ <input type="text" name="zc1" id="content3Num5" class="form-control newWidth" /> 天
+ <br/>
+ <br/>
+ 张数：
+
+
+ <input type="text" name="zc1" id="content3Num6" class="form-control newWidth" />
+ </div>
+ </div>
+ </div>
+ </div>
+ <div class="row" id="content4" style="margin-left: 100px;">
+ <div class="col-sm-11">
+ <h1>充值赠送奖励</h1>
+ <br/>
+ <br/>
+ <div class="form-group">
+ <div class="col-sm-10">
+ <#button name="添加" icon="fa-plus" clickFun="UserActivityInfoDlg.toAddRegistOpt()"/> 启用： <input type="checkbox" id="content4Check" class="js-switch4" checked="">
+ </div>
+ </div>
+ <div class="form-group">
+ <div class="col-sm-15">
+ <div style="height: 200px; border: 1px solid #e5e6e7;overflow-y: auto;">
+ <table class="table table-striped table-bordered table-hover table-condensed">
+ <thead>
+ <tr>
+ <th style="width: 250px;">充值金额</th>
+ <th style="width: 250px;">有效天数</th>
+ <th style="width: 300px;">最高金额</th>
+ <th style="width: 300px;">通用券金额</th>
+ <th style="width: 300px;">通用券数量</th>
+ <th style="width: 300px;">专车券金额</th>
+ <th style="width: 300px;">专车券数量</th>
+ <th style="width: 400px;">出租车券金额</th>
+ <th style="width: 400px;">出租车券数量</th>
+ <th style="width: 300px;">城际金额</th>
+ <th style="width: 300px;">城际券数量</th>
+ <th style="width: 100px;">操作</th>
+ </tr>
+ </thead>
+ <tbody id="coun">
+
+ </tbody>
+ </table>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ <div class="row" id="content5" style="margin-left: 100px;">
+ <div class="col-sm-11">
+ <div class="form-group">
+ <div class="col-sm-10">
+ <h1>打折活动奖励</h1>
+ <br/>
+ <br/>
+ 启用： <input type="checkbox" id="content5Check" class="js-switch2" checked="">
+ <br/>
+ <br/>
+ 专车活动打折：
+
+ <input type="text" name="zc1" id="content5Num1" class="form-control newWidth" /> 折
+ <br/>
+ <br/>
+ 出租车活动打折：
+
+ <input type="text" name="zc1" id="content5Num2" class="form-control newWidth" /> 折
+ <br/>
+ <br/>
+ 小件物流活动打折：
+ <input type="text" name="zc1" id="content5Num3" class="form-control newWidth" /> 折
+ </div>
+ </div>
+ </div>
+ </div>
+
+ <div class="row" id="content6" style="margin-left: 100px;">
+ <div class="col-sm-11">
+ <div class="form-group">
+ <div class="col-sm-10">
+ <input type="hidden" id="content6RedId">
+ <h1>红包活动奖励</h1>
+ <br/>
+ <br/>
+ 启用： <input type="checkbox" id="content6Check" class="js-switch3" checked="">
+ <br/>
+ <br/>
+ <#button name="选择红包" icon="fa-plus" clickFun="UserActivityInfoDlg.toSelectRedOpt()"/>
+ <br/>
+ <br/>
+ 红包类型：
+
+
+ <input type="text" name="zc1" id="content6Num1" class="form-control newWidth" readonly/>
+ <br/>
+ <br/>
+ 总金额：
+
+
+ <input type="text" name="zc1" id="content6Num2" class="form-control newWidth" readonly/>
+ <br/>
+ <br/>
+ 每个红包金额： <input type="text" name="zc1" id="content6Num3" class="form-control newWidth" readonly/>
+ <br/>
+ <br/>
+ 有效期：
+
+ <input type="text" name="zc1" id="content6Num4" class="form-control newWidth" readonly/> 天
+ <br/>
+ <br/>
+ 最高金额： <input type="text" name="zc1" id="content6Num5" class="form-control newWidth" />
+ <br/>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+
+ <div class="row btn-group-m-t">
+ <div class="col-sm-10 col-sm-offset-5">
+ <input type="hidden" id="type" value="1">
+ <#button btnCss="info" name="保存" id="ensure" icon="fa-check" clickFun="UserActivityInfoDlg.addSubmit()"/>
+ <#button btnCss="info" name="下一步" icon="fa-check" id="nextB" clickFun="nextContent()"/>
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+<script src="${ctxPath}/static/js/plugins/switchery/switchery.js"></script>
+<script src="${ctxPath}/static/modular/system/userActivity/userActivity_info.js"></script>
+<script>
+ var elem = document.querySelector('.js-switch');
+ var switchery = new Switchery(elem,{size:"large"});
+ var elem1 = document.querySelector('.js-switch1');
+ var switchery1 = new Switchery(elem1,{size:"large"});
+ var elem2 = document.querySelector('.js-switch2');
+ var switchery2 = new Switchery(elem2,{size:"large"});
+ var elem3 = document.querySelector('.js-switch3');
+ var switchery3 = new Switchery(elem3,{size:"large"});
+ var elem4 = document.querySelector('.js-switch4');
+ var switchery4 = new Switchery(elem4,{size:"large"});
+
+ laydate.render({
+ elem: '#startTime'
+ ,type: 'datetime'
+ ,range: true
+ ,min: 'new Date()' //最小值今天
+ });
+ $(function(){
+ getContent(1);
+ });
+ function getContent(type){
+ //设置点击字体颜色效果
+ for(var i=1;i<7;i++){
+ document.getElementById("div"+i).style.color="#888888";//
+ document.getElementById("div"+i).style.backgroundColor ="";
+ $("#content"+i).hide();
+ }
+ //设置点击背景颜色效果
+ document.getElementById("div"+type).style.color="white";//
+ document.getElementById("div"+type).style.backgroundColor ="rgb(26, 179, 148)";
+ $("#type").val(type);
+ $("#content"+type).show();
+ if(type!=6){
+ $("#ensure").hide();
+ $("#nextB").show();
+ }else{
+ $("#ensure").show();
+ $("#nextB").hide();
+ }
+ }
+ function nextContent(){
+ var type = $("#type").val();
+ getContent(parseInt(type)+1);
+ if(parseInt(type)+1==6){
+ $("#ensure").show();
+ $("#nextB").hide();
+ }
+ }
+</script>
+@}
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/userActivity/userActivity_detail.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/userActivity/userActivity_detail.html
new file mode 100644
index 0000000..a81ec06
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/userActivity/userActivity_detail.html
@@ -0,0 +1,496 @@
+@layout("/common/_container.html"){
+<link href="${ctxPath}/static/css/plugins/switchery/switchery.css" rel="stylesheet">
+<style>
+ .table1{
+ display: inline;
+ width: 16.6666666%;
+ float:left;
+ text-align:center;
+ border-collapse:collapse;
+ font-size: 18px;
+ }
+ .table1:hover{
+ background-color: rgba(255,0,0,.3);
+ }
+ .newWidth, .single-line{
+ max-width:150px !important;display: initial !important;
+ }
+</style>
+<div class="ibox float-e-margins">
+ <div class="ibox-content">
+ <div class="form-horizontal">
+ <div class="row">
+ <input type="hidden" id="id" id="${item.id}">
+ <div class="col-sm-10">
+ <div style="height: 50px;box-sizing: border-box;background:#f3f3f4;line-height: 50px;border:1px solid;margin-bottom: 20px;">
+ <div id="div1" class='table1' onclick="getContent(1)" style="border-right: 1px solid #333;background-color: rgb(26, 179, 148);color: white;">活动设置</div>
+ <div id="div2" class='table1' onclick="getContent(2)" style="border-right: 1px solid #333;">注册奖励</div>
+ <div id="div3" class='table1' onclick="getContent(3)" style="border-right: 1px solid #333;">邀请奖励</div>
+ <div id="div4" class='table1' onclick="getContent(4)" style="border-right: 1px solid #333;">充值赠送</div>
+ <div id="div5" class='table1' onclick="getContent(5)" style="border-right: 1px solid #333;">打折活动</div>
+ <div id="div6" class='table1' onclick="getContent(6)" style="border-right: 1px solid #333;">红包活动</div>
+ </div>
+ <div class="row" id="content1" style="margin-left: 100px;">
+ <div class="col-sm-11">
+ <div class="form-group">
+ <div class="col-sm-10">
+ <h1>活动详情</h1>
+ <br/>
+ <br/>
+ 活动名称： <input type="text" name="zc1" id="name" value="${item.name}" class="form-control newWidth" readonly/>
+ <br/>
+ <br/>
+ 活动时间： <input type="text" id="startTime" name="zc7" class="form-control" style="max-width:300px !important;display: initial !important;" readonly/>
+ </div>
+ </div>
+ </div>
+ </div>
+ <div class="row" id="content2" style="margin-left: 100px;">
+ <div class="col-sm-11">
+ <div class="form-group">
+ <div class="col-sm-15">
+ <input type="hidden"
+ @if(isNotEmpty(item1)){
+ value="${item1.couponId}"
+ @}else{
+ value=""
+ @}
+ id="content2CouponId">
+
+ <h1>用户注册既赠送优惠券</h1>
+ <br/>
+ <br/>
+ 启用： <input type="checkbox"
+ @if(isNotEmpty(item1) && item1.enable==2){
+ checked=""
+ @}
+ class="js-switch" id="content2Check">
+ <br/>
+ <br/>
+ 优惠券名称： <input type="text"
+ @if(isNotEmpty(item1Coupon)){
+ value="${item1Coupon.name}"
+ @}else{
+ value=""
+ @}
+ name="zc1" id="content2Num1" class="form-control newWidth" readonly/>
+ <br/>
+ <br/>
+ 服务类型： <input type="text"
+ @if(isNotEmpty(item1Coupon)){
+ value="${item1Coupon.couponUseType==0?'通用券':
+ item1Coupon.couponUseType==1?'专车券':
+ item1Coupon.couponUseType==2?'出租券':'跨城出行券'}"
+ @}else{
+ value=""
+ @}
+ name="zc1" id="content2Num2" class="form-control newWidth" readonly/>
+ <br/>
+ <br/>
+ 优惠券类型： <input type="text"
+ @if(isNotEmpty(item1Coupon)){
+ value="${item1Coupon.couponType==1?'抵扣':'满减'}"
+ @}else{
+ value=""
+ @}
+ name="zc1" id="content2Num3" class="form-control newWidth" readonly/>
+ <br/>
+ <br/>
+ 金额：
+
+
+ <input type="text"
+ @if(isNotEmpty(item1Coupon)){
+ value="${item1Coupon.money}"
+ @}else{
+ value=""
+ @}
+ name="zc1" id="content2Num4" class="form-control newWidth" readonly/>
+ <br/>
+ <br/>
+ 最高金额： <input type="text"
+ @if(isNotEmpty(item1)){
+ value="${item1.totalPrice}"
+ @}else{
+ value=""
+ @}
+ name="zc1" id="content2Num7" class="form-control newWidth" readonly/>
+ <br/>
+ <br/>
+ 有效期：
+
+ <input type="text"
+ @if(isNotEmpty(item1)){
+ value="${item1.effective}"
+ @}else{
+ value=""
+ @}
+ name="zc1" id="content2Num5" class="form-control newWidth" readonly/> 天
+ <br/>
+ <br/>
+ 张数：
+
+
+ <input type="text"
+ @if(isNotEmpty(item1)){
+ value="${item1.totalNum}"
+ @}else{
+ value=""
+ @}
+ name="zc1" id="content2Num6" class="form-control newWidth" readonly/>
+ </div>
+ </div>
+ </div>
+ </div>
+ <div class="row" id="content3" style="margin-left: 100px;">
+ <div class="col-sm-11">
+ <div class="form-group">
+ <div class="col-sm-10">
+ <input type="hidden"
+ @if(isNotEmpty(item2)){
+ value="${item2.couponId}"
+ @}else{
+ value=""
+ @}
+ id="content3CouponId">
+
+ <h1>用户邀请用户奖励</h1>
+ <br/>
+ <br/>
+ 启用： <input
+ @if(isNotEmpty(item2) && item2.enable==2){
+ checked=""
+ @}
+ type="checkbox" id="content3Check" class="js-switch1">
+ <br/>
+ <br/>
+ 优惠券名称： <input type="text"
+ @if(isNotEmpty(item2Coupon)){
+ value="${item2Coupon.name}"
+ @}else{
+ value=""
+ @}
+ name="zc1" id="content3Num1" class="form-control newWidth" readonly/>
+ <br/>
+ <br/>
+ 服务类型： <input type="text"
+
+ @if(isNotEmpty(item2Coupon)){
+ value="${item2Coupon.couponUseType==0?'通用券':
+ item2Coupon.couponUseType==1?'专车券':
+ item2Coupon.couponUseType==2?'出租券':'跨城出行券'}"
+ @}else{
+ value=""
+ @}
+ name="zc1" id="content3Num2" class="form-control newWidth" readonly/>
+ <br/>
+ <br/>
+ 优惠券类型： <input type="text"
+ @if(isNotEmpty(item2Coupon)){
+ value="${item2Coupon.couponType==1?'抵扣':'满减'}"
+ @}else{
+ value=""
+ @}
+ name="zc1" id="content3Num3" class="form-control newWidth" readonly/>
+ <br/>
+ <br/>
+ 金额：
+
+
+ <input type="text"
+ @if(isNotEmpty(item2Coupon)){
+ value="${item2Coupon.money}"
+ @}else{
+ value=""
+ @}
+ name="zc1" id="content3Num4" class="form-control newWidth" readonly/>
+ <br/>
+ <br/>
+ 最高金额： <input type="text"
+ @if(isNotEmpty(item2)){
+ value="${item2.totalPrice}"
+ @}else{
+ value=""
+ @}
+ name="zc1" id="content3Num7" class="form-control newWidth" readonly/>
+ <br/>
+ <br/>
+ 有效期：
+
+ <input type="text"
+ @if(isNotEmpty(item2)){
+ value="${item2.effective}"
+ @}else{
+ value=""
+ @}
+ name="zc1" id="content3Num5" class="form-control newWidth" readonly/> 天
+ <br/>
+ <br/>
+ 张数：
+
+
+ <input type="text"
+ @if(isNotEmpty(item2)){
+ value="${item2.totalNum}"
+ @}else{
+ value=""
+ @}
+ name="zc1" id="content3Num6" class="form-control newWidth" readonly/>
+ </div>
+ </div>
+ </div>
+ </div>
+ <div class="row" id="content4" style="margin-left: 100px;">
+ <div class="col-sm-11">
+ <h1>充值赠送奖励</h1>
+ <br/>
+ <br/>
+ <div class="form-group">
+ <div class="col-sm-10">
+ 启用：
+ <input type="checkbox"
+ @if(isNotEmpty(balanceInfoList) && balanceInfoList[0].enable==2){
+ checked=""
+ @}
+ id="content4Check" class="js-switch4">
+ </div>
+ </div>
+ <div class="form-group">
+ <div class="col-sm-15">
+ <div style="height: 200px; border: 1px solid #e5e6e7;overflow-y: auto;">
+ <table class="table table-striped table-bordered table-hover table-condensed">
+ <thead>
+ <tr>
+ <th style="width: 250px;">充值金额</th>
+ <th style="width: 250px;">有效天数</th>
+ <th style="width: 300px;">最高金额</th>
+ <th style="width: 300px;">通用券金额</th>
+ <th style="width: 300px;">通用券数量</th>
+ <th style="width: 300px;">专车券金额</th>
+ <th style="width: 300px;">专车券数量</th>
+ <th style="width: 400px;">出租车券金额</th>
+ <th style="width: 400px;">出租车券数量</th>
+ <th style="width: 300px;">城际金额</th>
+ <th style="width: 300px;">城际券数量</th>
+ </tr>
+ </thead>
+ <tbody id="coun">
+ @for(obj in balanceInfoList){
+ <tr class="timeClass">' +
+ <td><input type="hidden" id="num1" name="num1" value="${obj.money}">${obj.money}</td>
+ <td><input type="hidden" id="num10" name="num10" value="${obj.effective}">${obj.effective}</td>
+ <td><input type="hidden" id="num11" name="num3" value="${obj.totalPrice}">${obj.totalPrice}</td>
+ <td><input type="hidden" id="num3" name="num3" value="${obj.generalCouponMoney}">${obj.generalCouponMoney}</td>
+ <td><input type="hidden" id="num2" name="num2" value="${obj.generalNum}">${obj.generalNum}</td>
+
+ <td><input type="hidden" id="num5" name="num5" value="${obj.specialCouponMoney}">${obj.specialCouponMoney}</td>
+ <td><input type="hidden" id="num4" name="num4" value="${obj.specialNum}">${obj.specialNum}</td>
+
+ <td><input type="hidden" id="num7" name="num7" value="${obj.taxiCouponMoney}">${obj.taxiCouponMoney}</td>
+ <td><input type="hidden" id="num6" name="num6" value="${obj.taxiNum}">${obj.taxiNum}</td>
+
+ <td><input type="hidden" id="num9" name="num9" value="${obj.intercityCouponMoney}">${obj.intercityCouponMoney}</td>
+ <td><input type="hidden" id="num8" name="num8" value="${obj.intercityNum}">${obj.intercityNum}</td>
+ </tr>
+ @}
+ </tbody>
+ </table>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ <div class="row" id="content5" style="margin-left: 100px;">
+ <div class="col-sm-11">
+ <div class="form-group">
+ <div class="col-sm-10">
+ <h1>打折活动奖励</h1>
+ <br/>
+ <br/>
+ 启用： <input
+ @if(isNotEmpty(item4) && item4.enable==2){
+ checked=""
+ @}
+ type="checkbox" id="content5Check" class="js-switch2">
+ <br/>
+ <br/>
+ 专车活动打折：
+
+ <input type="text"
+ @if(isNotEmpty(item4)){
+ value="${item4.special}"
+ @}else{
+ value=""
+ @}
+ name="zc1" id="content5Num1" class="form-control newWidth" readonly/>
+ <br/>
+ <br/>
+ 出租车活动打折：
+
+ <input type="text"
+ @if(isNotEmpty(item4)){
+ value="${item4.taxi}"
+ @}else{
+ value=""
+ @}
+ name="zc1" id="content5Num2" class="form-control newWidth" readonly/>
+ <br/>
+ <br/>
+ 小件物流活动打折：
+ <input type="text"
+ @if(isNotEmpty(item4)){
+ value="${item4.logistics}"
+ @}else{
+ value=""
+ @}
+ name="zc1" id="content5Num3" class="form-control newWidth" readonly />
+ </div>
+ </div>
+ </div>
+ </div>
+
+ <div class="row" id="content6" style="margin-left: 100px;">
+ <div class="col-sm-11">
+ <div class="form-group">
+ <div class="col-sm-10">
+ <input type="hidden"
+ @if(isNotEmpty(item5)){
+ value="${item5.redEnvelopeId}"
+ @}else{
+ value=""
+ @}
+ id="content6RedId">
+
+ <h1>红包活动奖励</h1>
+ <br/>
+ <br/>
+ 启用： <input type="checkbox"
+ @if(isNotEmpty(item5) && item5.enable==2){
+ checked=""
+ @}
+ id="content6Check" class="js-switch3">
+ <br/>
+ <br/>
+ 红包类型：
+
+
+ <input type="text"
+ @if(isNotEmpty(item5Red)){
+ value="${item5Red.type==1?'固定金额':'随机金额'}"
+ @}else{
+ value=""
+ @}
+ name="zc1" id="content6Num1" class="form-control newWidth" readonly/>
+ <br/>
+ <br/>
+ 总金额：
+
+
+ <input type="text"
+
+ @if(isNotEmpty(item5Red)){
+ value="${item5Red.totalMoney}"
+ @}else{
+ value=""
+ @}
+ name="zc1" id="content6Num2" class="form-control newWidth" readonly/>
+ <br/>
+ <br/>
+ 每个红包金额： <input type="text"
+ @if(isNotEmpty(item5Red)){
+ value="${item5Red.type==1?item5Red.money:item5Red.startMoney+'-'+item5Red.endMoney}"
+ @}else{
+ value=""
+ @}
+ name="zc1" id="content6Num3" class="form-control newWidth" readonly/>
+ <br/>
+ <br/>
+ 有效期：
+
+ <input type="text"
+
+ @if(isNotEmpty(item5Red)){
+ value="${item5Red.effective}"
+ @}else{
+ value=""
+ @}
+ name="zc1" id="content6Num4" class="form-control newWidth" readonly/> 天，
+ 最高金额： <input type="text"
+ @if(isNotEmpty(item5)){
+ value="${item5.totalPrice}"
+ @}else{
+ value=""
+ @}
+ name="zc1" id="content6Num5" class="form-control newWidth" readonly/>
+ <br/>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+
+ <div class="row btn-group-m-t">
+ <div class="col-sm-10 col-sm-offset-5">
+ <input type="hidden" id="type" value="1">
+ <#button btnCss="info" name="关闭" id="ensure" icon="fa-check" clickFun="UserActivityInfoDlg.close()"/>
+ <#button btnCss="info" name="下一步" icon="fa-check" id="nextB" clickFun="nextContent()"/>
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+<script src="${ctxPath}/static/js/plugins/switchery/switchery.js"></script>
+<script src="${ctxPath}/static/modular/system/userActivity/userActivity_info.js"></script>
+<script>
+ var elem = document.querySelector('.js-switch');
+ var switchery = new Switchery(elem,{size:"large"});
+ var elem1 = document.querySelector('.js-switch1');
+ var switchery1 = new Switchery(elem1,{size:"large"});
+ var elem2 = document.querySelector('.js-switch2');
+ var switchery2 = new Switchery(elem2,{size:"large"});
+ var elem3 = document.querySelector('.js-switch3');
+ var switchery3 = new Switchery(elem3,{size:"large"});
+ var elem4 = document.querySelector('.js-switch4');
+ var switchery4 = new Switchery(elem4,{size:"large"});
+
+ laydate.render({
+ elem: '#startTime'
+ ,type: 'datetime'
+ ,range: true
+ });
+ $("#startTime").val("${startTime} - ${endTime}")
+ $(function(){
+ getContent(1);
+ });
+ function getContent(type){
+ //设置点击字体颜色效果
+ for(var i=1;i<7;i++){
+ document.getElementById("div"+i).style.color="#888888";//
+ document.getElementById("div"+i).style.backgroundColor ="";
+ $("#content"+i).hide();
+ }
+ //设置点击背景颜色效果
+ document.getElementById("div"+type).style.color="white";//
+ document.getElementById("div"+type).style.backgroundColor ="rgb(26, 179, 148)";
+ $("#type").val(type);
+ $("#content"+type).show();
+ if(type!=6){
+ $("#ensure").hide();
+ $("#nextB").show();
+ }else{
+ $("#ensure").show();
+ $("#nextB").hide();
+ }
+ }
+ function nextContent(){
+ var type = $("#type").val();
+ getContent(parseInt(type)+1);
+ if(parseInt(type)+1==6){
+ $("#ensure").show();
+ $("#nextB").hide();
+ }
+ }
+</script>
+@}
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/userActivity/userActivity_edit.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/userActivity/userActivity_edit.html
new file mode 100644
index 0000000..46e2c07
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/userActivity/userActivity_edit.html
@@ -0,0 +1,509 @@
+@layout("/common/_container.html"){
+<link href="${ctxPath}/static/css/plugins/switchery/switchery.css" rel="stylesheet">
+<style>
+ .table1{
+ display: inline;
+ width: 16.6666666%;
+ float:left;
+ text-align:center;
+ border-collapse:collapse;
+ font-size: 18px;
+ }
+ .table1:hover{
+ background-color: rgba(255,0,0,.3);
+ }
+ .newWidth, .single-line{
+ max-width:150px !important;display: initial !important;
+ }
+</style>
+<div class="ibox float-e-margins">
+ <div class="ibox-content">
+ <div class="form-horizontal">
+ <div class="row">
+ <input type="hidden" id="id" value="${item.id}">
+ <div class="col-sm-10">
+ <div style="height: 50px;box-sizing: border-box;background:#f3f3f4;line-height: 50px;border:1px solid;margin-bottom: 20px;">
+ <div id="div1" class='table1' onclick="getContent(1)" style="border-right: 1px solid #333;background-color: rgb(26, 179, 148);color: white;">活动设置</div>
+ <div id="div2" class='table1' onclick="getContent(2)" style="border-right: 1px solid #333;">注册奖励</div>
+ <div id="div3" class='table1' onclick="getContent(3)" style="border-right: 1px solid #333;">邀请奖励</div>
+ <div id="div4" class='table1' onclick="getContent(4)" style="border-right: 1px solid #333;">充值赠送</div>
+ <div id="div5" class='table1' onclick="getContent(5)" style="border-right: 1px solid #333;">打折活动</div>
+ <div id="div6" class='table1' onclick="getContent(6)" style="border-right: 1px solid #333;">红包活动</div>
+ </div>
+ <div class="row" id="content1" style="margin-left: 100px;">
+ <div class="col-sm-11">
+ <div class="form-group">
+ <div class="col-sm-10">
+ <h1>编辑活动</h1>
+ <br/>
+ <br/>
+ 活动名称： <input type="text" name="zc1" id="name" value="${item.name}" class="form-control newWidth" />
+ <br/>
+ <br/>
+ 活动时间： <input type="text" id="startTime" name="zc7" class="form-control" style="max-width:300px !important;display: initial !important;"/>
+ </div>
+ </div>
+ </div>
+ </div>
+ <div class="row" id="content2" style="margin-left: 100px;">
+ <div class="col-sm-11">
+ <div class="form-group">
+ <div class="col-sm-15">
+ <input type="hidden"
+ @if(isNotEmpty(item1)){
+ value="${item1.couponId}"
+ @}else{
+ value=""
+ @}
+ id="content2CouponId">
+
+ <h1>用户注册既赠送优惠券</h1>
+ <br/>
+ <br/>
+ 启用： <input type="checkbox"
+ @if(isNotEmpty(item1) && item1.enable==2){
+ checked=""
+ @}
+ class="js-switch" id="content2Check">
+ <br/>
+ <br/>
+ <#button name="选择优惠券" icon="fa-plus" clickFun="UserActivityInfoDlg.toSelectCouponOpt()"/>
+ <br/>
+ <br/>
+ 优惠券名称： <input type="text"
+ @if(isNotEmpty(item1Coupon)){
+ value="${item1Coupon.name}"
+ @}else{
+ value=""
+ @}
+ name="zc1" id="content2Num1" class="form-control newWidth" readonly/>
+ <br/>
+ <br/>
+ 服务类型： <input type="text"
+ @if(isNotEmpty(item1Coupon)){
+ value="${item1Coupon.couponUseType==0?'通用券':
+ item1Coupon.couponUseType==1?'专车券':
+ item1Coupon.couponUseType==2?'出租券':'跨城出行券'}"
+ @}else{
+ value=""
+ @}
+ name="zc1" id="content2Num2" class="form-control newWidth" readonly/>
+ <br/>
+ <br/>
+ 优惠券类型： <input type="text"
+ @if(isNotEmpty(item1Coupon)){
+ value="${item1Coupon.couponType==1?'抵扣':'满减'}"
+ @}else{
+ value=""
+ @}
+ name="zc1" id="content2Num3" class="form-control newWidth" readonly/>
+ <br/>
+ <br/>
+ 金额：
+
+
+ <input type="text"
+ @if(isNotEmpty(item1Coupon)){
+ value="${item1Coupon.money}"
+ @}else{
+ value=""
+ @}
+ name="zc1" id="content2Num4" class="form-control newWidth" readonly/>
+ <br/>
+ <br/>
+ 最高金额： <input type="text"
+ @if(isNotEmpty(item1)){
+ value="${item1.totalPrice}"
+ @}else{
+ value=""
+ @}
+ name="zc1" id="content2Num7" class="form-control newWidth" />
+ <br/>
+ <br/>
+ 有效期：
+
+ <input type="text"
+ @if(isNotEmpty(item1)){
+ value="${item1.effective}"
+ @}else{
+ value=""
+ @}
+ name="zc1" id="content2Num5" class="form-control newWidth" /> 天
+ <br/>
+ <br/>
+ 张数：
+
+
+ <input type="text"
+ @if(isNotEmpty(item1)){
+ value="${item1.totalNum}"
+ @}else{
+ value=""
+ @}
+ name="zc1" id="content2Num6" class="form-control newWidth" />
+ </div>
+ </div>
+ </div>
+ </div>
+ <div class="row" id="content3" style="margin-left: 100px;">
+ <div class="col-sm-11">
+ <div class="form-group">
+ <div class="col-sm-10">
+ <input type="hidden"
+ @if(isNotEmpty(item2)){
+ value="${item2.couponId}"
+ @}else{
+ value=""
+ @}
+ id="content3CouponId">
+
+ <h1>用户邀请用户奖励</h1>
+ <br/>
+ <br/>
+ 启用： <input
+ @if(isNotEmpty(item2) && item2.enable==2){
+ checked=""
+ @}
+ type="checkbox" id="content3Check" class="js-switch1">
+ <br/>
+ <br/>
+ <#button name="选择优惠券" icon="fa-plus" clickFun="UserActivityInfoDlg.toSelectCouponOpt1()"/>
+ <br/>
+ <br/>
+ 优惠券名称： <input type="text"
+ @if(isNotEmpty(item2Coupon)){
+ value="${item2Coupon.name}"
+ @}else{
+ value=""
+ @}
+ name="zc1" id="content3Num1" class="form-control newWidth" readonly/>
+ <br/>
+ <br/>
+ 服务类型： <input type="text"
+
+ @if(isNotEmpty(item2Coupon)){
+ value="${item2Coupon.couponUseType==0?'通用券':
+ item2Coupon.couponUseType==1?'专车券':
+ item2Coupon.couponUseType==2?'出租券':'跨城出行券'}"
+ @}else{
+ value=""
+ @}
+ name="zc1" id="content3Num2" class="form-control newWidth" readonly/>
+ <br/>
+ <br/>
+ 优惠券类型： <input type="text"
+ @if(isNotEmpty(item2Coupon)){
+ value="${item2Coupon.couponType==1?'抵扣':'满减'}"
+ @}else{
+ value=""
+ @}
+ name="zc1" id="content3Num3" class="form-control newWidth" readonly/>
+ <br/>
+ <br/>
+ 金额：
+
+
+ <input type="text"
+ @if(isNotEmpty(item2Coupon)){
+ value="${item2Coupon.money}"
+ @}else{
+ value=""
+ @}
+ name="zc1" id="content3Num4" class="form-control newWidth" readonly/>
+ <br/>
+ <br/>
+ 最高金额： <input type="text"
+ @if(isNotEmpty(item2)){
+ value="${item2.totalPrice}"
+ @}else{
+ value=""
+ @}
+ name="zc1" id="content3Num7" class="form-control newWidth" />
+ <br/>
+ <br/>
+ 有效期：
+
+ <input type="text"
+ @if(isNotEmpty(item2)){
+ value="${item2.effective}"
+ @}else{
+ value=""
+ @}
+ name="zc1" id="content3Num5" class="form-control newWidth" /> 天
+ <br/>
+ <br/>
+ 张数：
+
+
+ <input type="text"
+ @if(isNotEmpty(item2)){
+ value="${item2.totalNum}"
+ @}else{
+ value=""
+ @}
+ name="zc1" id="content3Num6" class="form-control newWidth" />
+ </div>
+ </div>
+ </div>
+ </div>
+ <div class="row" id="content4" style="margin-left: 100px;">
+ <div class="col-sm-11">
+ <h1>充值赠送奖励</h1>
+ <br/>
+ <br/>
+
+ <div class="form-group">
+ <div class="col-sm-10">
+ <#button name="添加" icon="fa-plus" clickFun="UserActivityInfoDlg.toAddRegistOpt()"/>
+ 启用：
+ <input type="checkbox"
+ @if(isNotEmpty(balanceInfoList) && balanceInfoList[0].enable==2){
+ checked=""
+ @}
+ id="content4Check" class="js-switch4">
+ </div>
+ </div>
+ <div class="form-group">
+ <div class="col-sm-15">
+ <div style="height: 200px; border: 1px solid #e5e6e7;overflow-y: auto;">
+ <table class="table table-striped table-bordered table-hover table-condensed">
+ <thead>
+ <tr>
+ <th style="width: 250px;">充值金额</th>
+ <th style="width: 250px;">有效天数</th>
+ <th style="width: 300px;">最高金额</th>
+ <th style="width: 300px;">通用券金额</th>
+ <th style="width: 300px;">通用券数量</th>
+ <th style="width: 300px;">专车券金额</th>
+ <th style="width: 300px;">专车券数量</th>
+ <th style="width: 400px;">出租车券金额</th>
+ <th style="width: 400px;">出租车券数量</th>
+ <th style="width: 300px;">城际金额</th>
+ <th style="width: 300px;">城际券数量</th>
+ <th style="width: 100px;">操作</th>
+ </tr>
+ </thead>
+ <tbody id="coun">
+ @for(obj in balanceInfoList){
+ <tr class="timeClass">' +
+ <td><input type="hidden" id="id1" name="id1" value="${obj.generalCouponId}"><input type="hidden" id="num1" name="num1" value="${obj.money}">${obj.money}</td>
+ <td><input type="hidden" id="id2" name="id2" value="${obj.specialCouponId}"><input type="hidden" id="num10" name="num10" value="${obj.effective}">${obj.effective}</td>
+ <td><input type="hidden" id="num11" name="num11" value="${obj.totalPrice}">${obj.totalPrice}</td>
+ <td><input type="hidden" id="id3" name="id3" value="${obj.taxiCouponId}"><input type="hidden" id="num3" name="num3" value="${obj.generalCouponMoney}">${obj.generalCouponMoney}</td>
+ <td><input type="hidden" id="id4" name="id4" value="${obj.intercityCouponId}"><input type="hidden" id="num2" name="num2" value="${obj.generalNum}">${obj.generalNum}</td>
+
+ <td><input type="hidden" id="num5" name="num5" value="${obj.specialCouponMoney}">${obj.specialCouponMoney}</td>
+ <td><input type="hidden" id="num4" name="num4" value="${obj.specialNum}">${obj.specialNum}</td>
+
+ <td><input type="hidden" id="num7" name="num7" value="${obj.taxiCouponMoney}">${obj.taxiCouponMoney}</td>
+ <td><input type="hidden" id="num6" name="num6" value="${obj.taxiNum}">${obj.taxiNum}</td>
+
+ <td><input type="hidden" id="num9" name="num9" value="${obj.intercityCouponMoney}">${obj.intercityCouponMoney}</td>
+ <td><input type="hidden" id="num8" name="num8" value="${obj.intercityNum}">${obj.intercityNum}</td>
+ <td><button onclick="deleteSub(this)">移除</button></td>
+ </tr>
+ @}
+ </tbody>
+ </table>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ <div class="row" id="content5" style="margin-left: 100px;">
+ <div class="col-sm-11">
+ <div class="form-group">
+ <div class="col-sm-10">
+ <h1>打折活动奖励</h1>
+ <br/>
+ <br/>
+ 启用： <input
+ @if(isNotEmpty(item4) && item4.enable==2){
+ checked=""
+ @}
+ type="checkbox" id="content5Check" class="js-switch2">
+ <br/>
+ <br/>
+ 专车活动打折：
+
+ <input type="text"
+ @if(isNotEmpty(item4)){
+ value="${item4.special}"
+ @}else{
+ value=""
+ @}
+ name="zc1" id="content5Num1" class="form-control newWidth" />
+ <br/>
+ <br/>
+ 出租车活动打折：
+
+ <input type="text"
+ @if(isNotEmpty(item4)){
+ value="${item4.taxi}"
+ @}else{
+ value=""
+ @}
+ name="zc1" id="content5Num2" class="form-control newWidth" />
+ <br/>
+ <br/>
+ 小件物流活动打折：
+ <input type="text"
+ @if(isNotEmpty(item4)){
+ value="${item4.logistics}"
+ @}else{
+ value=""
+ @}
+ name="zc1" id="content5Num3" class="form-control newWidth" />
+ </div>
+ </div>
+ </div>
+ </div>
+
+ <div class="row" id="content6" style="margin-left: 100px;">
+ <div class="col-sm-11">
+ <div class="form-group">
+ <div class="col-sm-10">
+ <input type="hidden"
+ @if(isNotEmpty(item5)){
+ value="${item5.redEnvelopeId}"
+ @}else{
+ value=""
+ @}
+ id="content6RedId">
+
+ <h1>红包活动奖励</h1>
+ <br/>
+ <br/>
+ 启用： <input type="checkbox"
+ @if(isNotEmpty(item5) && item5.enable==2){
+ checked=""
+ @}
+ id="content6Check" class="js-switch3">
+ <br/>
+ <br/>
+ <#button name="选择红包" icon="fa-plus" clickFun="UserActivityInfoDlg.toSelectRedOpt()"/>
+ <br/>
+ <br/>
+ 红包类型：
+
+
+ <input type="text"
+ @if(isNotEmpty(item5Red)){
+ value="${item5Red.type==1?'固定金额':'随机金额'}"
+ @}else{
+ value=""
+ @}
+ name="zc1" id="content6Num1" class="form-control newWidth" readonly/>
+ <br/>
+ <br/>
+ 总金额：
+
+
+ <input type="text"
+
+ @if(isNotEmpty(item5Red)){
+ value="${item5Red.totalMoney}"
+ @}else{
+ value=""
+ @}
+ name="zc1" id="content6Num2" class="form-control newWidth" readonly/>
+ <br/>
+ <br/>
+ 每个红包金额： <input type="text"
+ @if(isNotEmpty(item5Red)){
+ value="${item5Red.type==1?item5Red.money:item5Red.startMoney+'-'+item5Red.endMoney}"
+ @}else{
+ value=""
+ @}
+ name="zc1" id="content6Num3" class="form-control newWidth" readonly/>
+ <br/>
+ <br/>
+ 有效期：
+
+ <input type="text"
+
+ @if(isNotEmpty(item5Red)){
+ value="${item5Red.effective}"
+ @}else{
+ value=""
+ @}
+ name="zc1" id="content6Num4" class="form-control newWidth" readonly/> 天
+ 最高金额： <input type="text"
+ @if(isNotEmpty(item5)){
+ value="${item5.totalPrice}"
+ @}else{
+ value=""
+ @}
+ name="zc1" id="content6Num5" class="form-control newWidth" />
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+
+ <div class="row btn-group-m-t">
+ <div class="col-sm-10 col-sm-offset-5">
+ <input type="hidden" id="type" value="1">
+ <#button btnCss="info" name="保存" id="ensure" icon="fa-check" clickFun="UserActivityInfoDlg.editSubmit()"/>
+ <#button btnCss="info" name="下一步" icon="fa-check" id="nextB" clickFun="nextContent()"/>
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+<script src="${ctxPath}/static/js/plugins/switchery/switchery.js"></script>
+<script src="${ctxPath}/static/modular/system/userActivity/userActivity_info.js"></script>
+<script>
+ var elem = document.querySelector('.js-switch');
+ var switchery = new Switchery(elem,{size:"large"});
+ var elem1 = document.querySelector('.js-switch1');
+ var switchery1 = new Switchery(elem1,{size:"large"});
+ var elem2 = document.querySelector('.js-switch2');
+ var switchery2 = new Switchery(elem2,{size:"large"});
+ var elem3 = document.querySelector('.js-switch3');
+ var switchery3 = new Switchery(elem3,{size:"large"});
+ var elem4 = document.querySelector('.js-switch4');
+ var switchery4 = new Switchery(elem4,{size:"large"});
+
+ laydate.render({
+ elem: '#startTime'
+ ,type: 'datetime'
+ ,range: true
+ ,min: 'new Date()' //最小值今天
+ });
+ $("#startTime").val("${startTime} - ${endTime}")
+ $(function(){
+ getContent(1);
+ });
+ function getContent(type){
+ //设置点击字体颜色效果
+ for(var i=1;i<7;i++){
+ document.getElementById("div"+i).style.color="#888888";//
+ document.getElementById("div"+i).style.backgroundColor ="";
+ $("#content"+i).hide();
+ }
+ //设置点击背景颜色效果
+ document.getElementById("div"+type).style.color="white";//
+ document.getElementById("div"+type).style.backgroundColor ="rgb(26, 179, 148)";
+ $("#type").val(type);
+ $("#content"+type).show();
+ if(type!=6){
+ $("#ensure").hide();
+ $("#nextB").show();
+ }else{
+ $("#ensure").show();
+ $("#nextB").hide();
+ }
+ }
+ function nextContent(){
+ var type = $("#type").val();
+ getContent(parseInt(type)+1);
+ if(parseInt(type)+1==6){
+ $("#ensure").show();
+ $("#nextB").hide();
+ }
+ }
+</script>
+@}
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/userActivity/userActivity_immediately.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/userActivity/userActivity_immediately.html
new file mode 100644
index 0000000..72c3304
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/userActivity/userActivity_immediately.html
@@ -0,0 +1,41 @@
+@layout("/common/_container.html"){
+<div class="ibox float-e-margins">
+ <div class="ibox-content">
+ <div class="form-horizontal" id="userActivityInfoForm">
+ <input type="hidden" id="id" name="id" value="${id}">
+ <div class="row">
+ <div class="col-sm-10">
+ <div class="form-group">
+ <label class="col-sm-3 control-label">处理意见：</label>
+ <div class="col-sm-9" style="display: flex;align-items: center;">
+ <div class="radio radio-info radio-inline">
+ <input type="radio" id="state2" value="3" name="state" checked="" >
+ <label for="state2"> 同意 </label>
+ </div>
+ <div class="radio radio-success radio-inline">
+ <input type="radio" id="state3" value="2" name="state" >
+ <label for="state3"> 拒绝 </label>
+ </div>
+ </div>
+ </div>
+ <div class="form-group">
+ <label class="col-sm-3 control-label">填写备注：</label>
+ <div class="col-sm-9">
+ <textarea type="text/plain" class="form-control" name="remark" id="remark" style="width:100%;height:150px;"></textarea>
+ </div>
+ </div>
+ </div>
+ </div>
+
+ <div class="row btn-group-m-t">
+ <div class="col-sm-10 col-sm-offset-5">
+ <#button btnCss="info" name="提交" id="ensure" icon="fa-check" clickFun="UserActivityInfoDlg.immediately()"/>
+ <#button btnCss="danger" name="取消" id="cancel" icon="fa-eraser" clickFun="UserActivityInfoDlg.close()"/>
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/userActivity/userActivity_info.js"></script>
+@}
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/userCouponRecord/userCouponRecord.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/userCouponRecord/userCouponRecord.html
new file mode 100644
index 0000000..b0792f2
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/userCouponRecord/userCouponRecord.html
@@ -0,0 +1,61 @@
+@layout("/common/_container.html"){
+<div class="row">
+ <div class="col-sm-12">
+ <div class="ibox float-e-margins">
+ <div class="ibox-title">
+ <h5>管理</h5>
+ </div>
+ <div class="ibox-content">
+ <div class="row row-lg">
+ <div class="col-sm-12">
+ <input type="hidden" id="activityType" value="${activityType}">
+ <input type="hidden" id="couponActivityId" value="${couponActivityId}">
+ <div class="row">
+ <div class="col-sm-3">
+ <#TimeCon id="createTime" name="领取时间" isTime="false"/>
+ </div>
+ <div class="col-sm-3">
+ <#NameCon id="userName" name="领取人" />
+ </div>
+ <div class="col-sm-3">
+ <#NameCon id="userPhone" name="领取人电话" />
+ </div>
+ <div class="col-sm-3">
+ <#SelectCon id="state" name="状态" >
+ <option value="">全部</option>
+ <option value="1">未使用</option>
+ <option value="2">已使用</option>
+ <option value="3">已过期</option>
+ </#SelectCon>
+ </div>
+ <div class="col-sm-3">
+ <#button name="搜索" icon="fa-search" clickFun="UserCouponRecord.search()"/>
+ <#button name="重置" icon="fa-trash" clickFun="UserCouponRecord.resetSearch()" space="true"/>
+ </div>
+ </div>
+ <div class="hidden-xs" id="UserCouponRecordTableToolbar" role="group">
+ @if(shiro.hasPermission("/userCouponRecord/add")){
+ <#button name="添加" icon="fa-plus" clickFun="UserCouponRecord.openAddUserCouponRecord()"/>
+ @}
+ @if(shiro.hasPermission("/userCouponRecord/update")){
+ <#button name="修改" icon="fa-edit" clickFun="UserCouponRecord.openUserCouponRecordDetail()" space="true"/>
+ @}
+ @if(shiro.hasPermission("/userCouponRecord/delete")){
+ <#button name="删除" icon="fa-remove" clickFun="UserCouponRecord.delete()" space="true"/>
+ @}
+ </div>
+ <#table id="UserCouponRecordTable"/>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+</div>
+<script src="${ctxPath}/static/modular/system/userCouponRecord/userCouponRecord.js"></script>
+<script>
+ laydate.render({
+ elem: '#createTime'
+ ,range: true
+ });
+</script>
+@}
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/web.xml b/management/guns-admin/src/main/webapp/WEB-INF/web.xml
new file mode 100644
index 0000000..ee7c48d
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/WEB-INF/web.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<web-app xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://xmlns.jcp.org/xml/ns/javaee" xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd" version="3.1">
+ <display-name>guns-admin</display-name>
+ <welcome-file-list>
+ <welcome-file>index.html</welcome-file>
+ <welcome-file>index.htm</welcome-file>
+ <welcome-file>index.jsp</welcome-file>
+ <welcome-file>default.html</welcome-file>
+ <welcome-file>default.htm</welcome-file>
+ <welcome-file>default.jsp</welcome-file>
+ </welcome-file-list>
+</web-app>
\ No newline at end of file
diff --git a/management/guns-admin/src/main/webapp/static/bitbug_favicon.ico b/management/guns-admin/src/main/webapp/static/bitbug_favicon.ico
new file mode 100644
index 0000000..2f64e7e
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/static/bitbug_favicon.ico
Binary files differ
diff --git a/management/guns-admin/src/main/webapp/static/car.png b/management/guns-admin/src/main/webapp/static/car.png
new file mode 100644
index 0000000..b10aec8
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/static/car.png
Binary files differ
diff --git a/management/guns-admin/src/main/webapp/static/crypto-js/aes.js b/management/guns-admin/src/main/webapp/static/crypto-js/aes.js
new file mode 100644
index 0000000..166e3ea
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/static/crypto-js/aes.js
@@ -0,0 +1,234 @@
+;(function (root, factory, undef) {
+ if (typeof exports === "object") {
+ // CommonJS
+ module.exports = exports = factory(require("./core"), require("./enc-base64"), require("./md5"), require("./evpkdf"), require("./cipher-core"));
+ }
+ else if (typeof define === "function" && define.amd) {
+ // AMD
+ define(["./core", "./enc-base64", "./md5", "./evpkdf", "./cipher-core"], factory);
+ }
+ else {
+ // Global (browser)
+ factory(root.CryptoJS);
+ }
+}(this, function (CryptoJS) {
+
+ (function () {
+ // Shortcuts
+ var C = CryptoJS;
+ var C_lib = C.lib;
+ var BlockCipher = C_lib.BlockCipher;
+ var C_algo = C.algo;
+
+ // Lookup tables
+ var SBOX = [];
+ var INV_SBOX = [];
+ var SUB_MIX_0 = [];
+ var SUB_MIX_1 = [];
+ var SUB_MIX_2 = [];
+ var SUB_MIX_3 = [];
+ var INV_SUB_MIX_0 = [];
+ var INV_SUB_MIX_1 = [];
+ var INV_SUB_MIX_2 = [];
+ var INV_SUB_MIX_3 = [];
+
+ // Compute lookup tables
+ (function () {
+ // Compute double table
+ var d = [];
+ for (var i = 0; i < 256; i++) {
+ if (i < 128) {
+ d[i] = i << 1;
+ } else {
+ d[i] = (i << 1) ^ 0x11b;
+ }
+ }
+
+ // Walk GF(2^8)
+ var x = 0;
+ var xi = 0;
+ for (var i = 0; i < 256; i++) {
+ // Compute sbox
+ var sx = xi ^ (xi << 1) ^ (xi << 2) ^ (xi << 3) ^ (xi << 4);
+ sx = (sx >>> 8) ^ (sx & 0xff) ^ 0x63;
+ SBOX[x] = sx;
+ INV_SBOX[sx] = x;
+
+ // Compute multiplication
+ var x2 = d[x];
+ var x4 = d[x2];
+ var x8 = d[x4];
+
+ // Compute sub bytes, mix columns tables
+ var t = (d[sx] * 0x101) ^ (sx * 0x1010100);
+ SUB_MIX_0[x] = (t << 24) | (t >>> 8);
+ SUB_MIX_1[x] = (t << 16) | (t >>> 16);
+ SUB_MIX_2[x] = (t << 8) | (t >>> 24);
+ SUB_MIX_3[x] = t;
+
+ // Compute inv sub bytes, inv mix columns tables
+ var t = (x8 * 0x1010101) ^ (x4 * 0x10001) ^ (x2 * 0x101) ^ (x * 0x1010100);
+ INV_SUB_MIX_0[sx] = (t << 24) | (t >>> 8);
+ INV_SUB_MIX_1[sx] = (t << 16) | (t >>> 16);
+ INV_SUB_MIX_2[sx] = (t << 8) | (t >>> 24);
+ INV_SUB_MIX_3[sx] = t;
+
+ // Compute next counter
+ if (!x) {
+ x = xi = 1;
+ } else {
+ x = x2 ^ d[d[d[x8 ^ x2]]];
+ xi ^= d[d[xi]];
+ }
+ }
+ }());
+
+ // Precomputed Rcon lookup
+ var RCON = [0x00, 0x01, 0x02, 0x04, 0x08, 0x10, 0x20, 0x40, 0x80, 0x1b, 0x36];
+
+ /**
+ * AES block cipher algorithm.
+ */
+ var AES = C_algo.AES = BlockCipher.extend({
+ _doReset: function () {
+ var t;
+
+ // Skip reset of nRounds has been set before and key did not change
+ if (this._nRounds && this._keyPriorReset === this._key) {
+ return;
+ }
+
+ // Shortcuts
+ var key = this._keyPriorReset = this._key;
+ var keyWords = key.words;
+ var keySize = key.sigBytes / 4;
+
+ // Compute number of rounds
+ var nRounds = this._nRounds = keySize + 6;
+
+ // Compute number of key schedule rows
+ var ksRows = (nRounds + 1) * 4;
+
+ // Compute key schedule
+ var keySchedule = this._keySchedule = [];
+ for (var ksRow = 0; ksRow < ksRows; ksRow++) {
+ if (ksRow < keySize) {
+ keySchedule[ksRow] = keyWords[ksRow];
+ } else {
+ t = keySchedule[ksRow - 1];
+
+ if (!(ksRow % keySize)) {
+ // Rot word
+ t = (t << 8) | (t >>> 24);
+
+ // Sub word
+ t = (SBOX[t >>> 24] << 24) | (SBOX[(t >>> 16) & 0xff] << 16) | (SBOX[(t >>> 8) & 0xff] << 8) | SBOX[t & 0xff];
+
+ // Mix Rcon
+ t ^= RCON[(ksRow / keySize) | 0] << 24;
+ } else if (keySize > 6 && ksRow % keySize == 4) {
+ // Sub word
+ t = (SBOX[t >>> 24] << 24) | (SBOX[(t >>> 16) & 0xff] << 16) | (SBOX[(t >>> 8) & 0xff] << 8) | SBOX[t & 0xff];
+ }
+
+ keySchedule[ksRow] = keySchedule[ksRow - keySize] ^ t;
+ }
+ }
+
+ // Compute inv key schedule
+ var invKeySchedule = this._invKeySchedule = [];
+ for (var invKsRow = 0; invKsRow < ksRows; invKsRow++) {
+ var ksRow = ksRows - invKsRow;
+
+ if (invKsRow % 4) {
+ var t = keySchedule[ksRow];
+ } else {
+ var t = keySchedule[ksRow - 4];
+ }
+
+ if (invKsRow < 4 || ksRow <= 4) {
+ invKeySchedule[invKsRow] = t;
+ } else {
+ invKeySchedule[invKsRow] = INV_SUB_MIX_0[SBOX[t >>> 24]] ^ INV_SUB_MIX_1[SBOX[(t >>> 16) & 0xff]] ^
+ INV_SUB_MIX_2[SBOX[(t >>> 8) & 0xff]] ^ INV_SUB_MIX_3[SBOX[t & 0xff]];
+ }
+ }
+ },
+
+ encryptBlock: function (M, offset) {
+ this._doCryptBlock(M, offset, this._keySchedule, SUB_MIX_0, SUB_MIX_1, SUB_MIX_2, SUB_MIX_3, SBOX);
+ },
+
+ decryptBlock: function (M, offset) {
+ // Swap 2nd and 4th rows
+ var t = M[offset + 1];
+ M[offset + 1] = M[offset + 3];
+ M[offset + 3] = t;
+
+ this._doCryptBlock(M, offset, this._invKeySchedule, INV_SUB_MIX_0, INV_SUB_MIX_1, INV_SUB_MIX_2, INV_SUB_MIX_3, INV_SBOX);
+
+ // Inv swap 2nd and 4th rows
+ var t = M[offset + 1];
+ M[offset + 1] = M[offset + 3];
+ M[offset + 3] = t;
+ },
+
+ _doCryptBlock: function (M, offset, keySchedule, SUB_MIX_0, SUB_MIX_1, SUB_MIX_2, SUB_MIX_3, SBOX) {
+ // Shortcut
+ var nRounds = this._nRounds;
+
+ // Get input, add round key
+ var s0 = M[offset] ^ keySchedule[0];
+ var s1 = M[offset + 1] ^ keySchedule[1];
+ var s2 = M[offset + 2] ^ keySchedule[2];
+ var s3 = M[offset + 3] ^ keySchedule[3];
+
+ // Key schedule row counter
+ var ksRow = 4;
+
+ // Rounds
+ for (var round = 1; round < nRounds; round++) {
+ // Shift rows, sub bytes, mix columns, add round key
+ var t0 = SUB_MIX_0[s0 >>> 24] ^ SUB_MIX_1[(s1 >>> 16) & 0xff] ^ SUB_MIX_2[(s2 >>> 8) & 0xff] ^ SUB_MIX_3[s3 & 0xff] ^ keySchedule[ksRow++];
+ var t1 = SUB_MIX_0[s1 >>> 24] ^ SUB_MIX_1[(s2 >>> 16) & 0xff] ^ SUB_MIX_2[(s3 >>> 8) & 0xff] ^ SUB_MIX_3[s0 & 0xff] ^ keySchedule[ksRow++];
+ var t2 = SUB_MIX_0[s2 >>> 24] ^ SUB_MIX_1[(s3 >>> 16) & 0xff] ^ SUB_MIX_2[(s0 >>> 8) & 0xff] ^ SUB_MIX_3[s1 & 0xff] ^ keySchedule[ksRow++];
+ var t3 = SUB_MIX_0[s3 >>> 24] ^ SUB_MIX_1[(s0 >>> 16) & 0xff] ^ SUB_MIX_2[(s1 >>> 8) & 0xff] ^ SUB_MIX_3[s2 & 0xff] ^ keySchedule[ksRow++];
+
+ // Update state
+ s0 = t0;
+ s1 = t1;
+ s2 = t2;
+ s3 = t3;
+ }
+
+ // Shift rows, sub bytes, add round key
+ var t0 = ((SBOX[s0 >>> 24] << 24) | (SBOX[(s1 >>> 16) & 0xff] << 16) | (SBOX[(s2 >>> 8) & 0xff] << 8) | SBOX[s3 & 0xff]) ^ keySchedule[ksRow++];
+ var t1 = ((SBOX[s1 >>> 24] << 24) | (SBOX[(s2 >>> 16) & 0xff] << 16) | (SBOX[(s3 >>> 8) & 0xff] << 8) | SBOX[s0 & 0xff]) ^ keySchedule[ksRow++];
+ var t2 = ((SBOX[s2 >>> 24] << 24) | (SBOX[(s3 >>> 16) & 0xff] << 16) | (SBOX[(s0 >>> 8) & 0xff] << 8) | SBOX[s1 & 0xff]) ^ keySchedule[ksRow++];
+ var t3 = ((SBOX[s3 >>> 24] << 24) | (SBOX[(s0 >>> 16) & 0xff] << 16) | (SBOX[(s1 >>> 8) & 0xff] << 8) | SBOX[s2 & 0xff]) ^ keySchedule[ksRow++];
+
+ // Set output
+ M[offset] = t0;
+ M[offset + 1] = t1;
+ M[offset + 2] = t2;
+ M[offset + 3] = t3;
+ },
+
+ keySize: 256/32
+ });
+
+ /**
+ * Shortcut functions to the cipher's object interface.
+ *
+ * @example
+ *
+ * var ciphertext = CryptoJS.AES.encrypt(message, key, cfg);
+ * var plaintext = CryptoJS.AES.decrypt(ciphertext, key, cfg);
+ */
+ C.AES = BlockCipher._createHelper(AES);
+ }());
+
+
+ return CryptoJS.AES;
+
+}));
\ No newline at end of file
diff --git a/management/guns-admin/src/main/webapp/static/crypto-js/cipher-core.js b/management/guns-admin/src/main/webapp/static/crypto-js/cipher-core.js
new file mode 100644
index 0000000..c560c9e
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/static/crypto-js/cipher-core.js
@@ -0,0 +1,890 @@
+;(function (root, factory, undef) {
+ if (typeof exports === "object") {
+ // CommonJS
+ module.exports = exports = factory(require("./core"), require("./evpkdf"));
+ }
+ else if (typeof define === "function" && define.amd) {
+ // AMD
+ define(["./core", "./evpkdf"], factory);
+ }
+ else {
+ // Global (browser)
+ factory(root.CryptoJS);
+ }
+}(this, function (CryptoJS) {
+
+ /**
+ * Cipher core components.
+ */
+ CryptoJS.lib.Cipher || (function (undefined) {
+ // Shortcuts
+ var C = CryptoJS;
+ var C_lib = C.lib;
+ var Base = C_lib.Base;
+ var WordArray = C_lib.WordArray;
+ var BufferedBlockAlgorithm = C_lib.BufferedBlockAlgorithm;
+ var C_enc = C.enc;
+ var Utf8 = C_enc.Utf8;
+ var Base64 = C_enc.Base64;
+ var C_algo = C.algo;
+ var EvpKDF = C_algo.EvpKDF;
+
+ /**
+ * Abstract base cipher template.
+ *
+ * @property {number} keySize This cipher's key size. Default: 4 (128 bits)
+ * @property {number} ivSize This cipher's IV size. Default: 4 (128 bits)
+ * @property {number} _ENC_XFORM_MODE A constant representing encryption mode.
+ * @property {number} _DEC_XFORM_MODE A constant representing decryption mode.
+ */
+ var Cipher = C_lib.Cipher = BufferedBlockAlgorithm.extend({
+ /**
+ * Configuration options.
+ *
+ * @property {WordArray} iv The IV to use for this operation.
+ */
+ cfg: Base.extend(),
+
+ /**
+ * Creates this cipher in encryption mode.
+ *
+ * @param {WordArray} key The key.
+ * @param {Object} cfg (Optional) The configuration options to use for this operation.
+ *
+ * @return {Cipher} A cipher instance.
+ *
+ * @static
+ *
+ * @example
+ *
+ * var cipher = CryptoJS.algo.AES.createEncryptor(keyWordArray, { iv: ivWordArray });
+ */
+ createEncryptor: function (key, cfg) {
+ return this.create(this._ENC_XFORM_MODE, key, cfg);
+ },
+
+ /**
+ * Creates this cipher in decryption mode.
+ *
+ * @param {WordArray} key The key.
+ * @param {Object} cfg (Optional) The configuration options to use for this operation.
+ *
+ * @return {Cipher} A cipher instance.
+ *
+ * @static
+ *
+ * @example
+ *
+ * var cipher = CryptoJS.algo.AES.createDecryptor(keyWordArray, { iv: ivWordArray });
+ */
+ createDecryptor: function (key, cfg) {
+ return this.create(this._DEC_XFORM_MODE, key, cfg);
+ },
+
+ /**
+ * Initializes a newly created cipher.
+ *
+ * @param {number} xformMode Either the encryption or decryption transormation mode constant.
+ * @param {WordArray} key The key.
+ * @param {Object} cfg (Optional) The configuration options to use for this operation.
+ *
+ * @example
+ *
+ * var cipher = CryptoJS.algo.AES.create(CryptoJS.algo.AES._ENC_XFORM_MODE, keyWordArray, { iv: ivWordArray });
+ */
+ init: function (xformMode, key, cfg) {
+ // Apply config defaults
+ this.cfg = this.cfg.extend(cfg);
+
+ // Store transform mode and key
+ this._xformMode = xformMode;
+ this._key = key;
+
+ // Set initial values
+ this.reset();
+ },
+
+ /**
+ * Resets this cipher to its initial state.
+ *
+ * @example
+ *
+ * cipher.reset();
+ */
+ reset: function () {
+ // Reset data buffer
+ BufferedBlockAlgorithm.reset.call(this);
+
+ // Perform concrete-cipher logic
+ this._doReset();
+ },
+
+ /**
+ * Adds data to be encrypted or decrypted.
+ *
+ * @param {WordArray|string} dataUpdate The data to encrypt or decrypt.
+ *
+ * @return {WordArray} The data after processing.
+ *
+ * @example
+ *
+ * var encrypted = cipher.process('data');
+ * var encrypted = cipher.process(wordArray);
+ */
+ process: function (dataUpdate) {
+ // Append
+ this._append(dataUpdate);
+
+ // Process available blocks
+ return this._process();
+ },
+
+ /**
+ * Finalizes the encryption or decryption process.
+ * Note that the finalize operation is effectively a destructive, read-once operation.
+ *
+ * @param {WordArray|string} dataUpdate The final data to encrypt or decrypt.
+ *
+ * @return {WordArray} The data after final processing.
+ *
+ * @example
+ *
+ * var encrypted = cipher.finalize();
+ * var encrypted = cipher.finalize('data');
+ * var encrypted = cipher.finalize(wordArray);
+ */
+ finalize: function (dataUpdate) {
+ // Final data update
+ if (dataUpdate) {
+ this._append(dataUpdate);
+ }
+
+ // Perform concrete-cipher logic
+ var finalProcessedData = this._doFinalize();
+
+ return finalProcessedData;
+ },
+
+ keySize: 128/32,
+
+ ivSize: 128/32,
+
+ _ENC_XFORM_MODE: 1,
+
+ _DEC_XFORM_MODE: 2,
+
+ /**
+ * Creates shortcut functions to a cipher's object interface.
+ *
+ * @param {Cipher} cipher The cipher to create a helper for.
+ *
+ * @return {Object} An object with encrypt and decrypt shortcut functions.
+ *
+ * @static
+ *
+ * @example
+ *
+ * var AES = CryptoJS.lib.Cipher._createHelper(CryptoJS.algo.AES);
+ */
+ _createHelper: (function () {
+ function selectCipherStrategy(key) {
+ if (typeof key == 'string') {
+ return PasswordBasedCipher;
+ } else {
+ return SerializableCipher;
+ }
+ }
+
+ return function (cipher) {
+ return {
+ encrypt: function (message, key, cfg) {
+ return selectCipherStrategy(key).encrypt(cipher, message, key, cfg);
+ },
+
+ decrypt: function (ciphertext, key, cfg) {
+ return selectCipherStrategy(key).decrypt(cipher, ciphertext, key, cfg);
+ }
+ };
+ };
+ }())
+ });
+
+ /**
+ * Abstract base stream cipher template.
+ *
+ * @property {number} blockSize The number of 32-bit words this cipher operates on. Default: 1 (32 bits)
+ */
+ var StreamCipher = C_lib.StreamCipher = Cipher.extend({
+ _doFinalize: function () {
+ // Process partial blocks
+ var finalProcessedBlocks = this._process(!!'flush');
+
+ return finalProcessedBlocks;
+ },
+
+ blockSize: 1
+ });
+
+ /**
+ * Mode namespace.
+ */
+ var C_mode = C.mode = {};
+
+ /**
+ * Abstract base block cipher mode template.
+ */
+ var BlockCipherMode = C_lib.BlockCipherMode = Base.extend({
+ /**
+ * Creates this mode for encryption.
+ *
+ * @param {Cipher} cipher A block cipher instance.
+ * @param {Array} iv The IV words.
+ *
+ * @static
+ *
+ * @example
+ *
+ * var mode = CryptoJS.mode.CBC.createEncryptor(cipher, iv.words);
+ */
+ createEncryptor: function (cipher, iv) {
+ return this.Encryptor.create(cipher, iv);
+ },
+
+ /**
+ * Creates this mode for decryption.
+ *
+ * @param {Cipher} cipher A block cipher instance.
+ * @param {Array} iv The IV words.
+ *
+ * @static
+ *
+ * @example
+ *
+ * var mode = CryptoJS.mode.CBC.createDecryptor(cipher, iv.words);
+ */
+ createDecryptor: function (cipher, iv) {
+ return this.Decryptor.create(cipher, iv);
+ },
+
+ /**
+ * Initializes a newly created mode.
+ *
+ * @param {Cipher} cipher A block cipher instance.
+ * @param {Array} iv The IV words.
+ *
+ * @example
+ *
+ * var mode = CryptoJS.mode.CBC.Encryptor.create(cipher, iv.words);
+ */
+ init: function (cipher, iv) {
+ this._cipher = cipher;
+ this._iv = iv;
+ }
+ });
+
+ /**
+ * Cipher Block Chaining mode.
+ */
+ var CBC = C_mode.CBC = (function () {
+ /**
+ * Abstract base CBC mode.
+ */
+ var CBC = BlockCipherMode.extend();
+
+ /**
+ * CBC encryptor.
+ */
+ CBC.Encryptor = CBC.extend({
+ /**
+ * Processes the data block at offset.
+ *
+ * @param {Array} words The data words to operate on.
+ * @param {number} offset The offset where the block starts.
+ *
+ * @example
+ *
+ * mode.processBlock(data.words, offset);
+ */
+ processBlock: function (words, offset) {
+ // Shortcuts
+ var cipher = this._cipher;
+ var blockSize = cipher.blockSize;
+
+ // XOR and encrypt
+ xorBlock.call(this, words, offset, blockSize);
+ cipher.encryptBlock(words, offset);
+
+ // Remember this block to use with next block
+ this._prevBlock = words.slice(offset, offset + blockSize);
+ }
+ });
+
+ /**
+ * CBC decryptor.
+ */
+ CBC.Decryptor = CBC.extend({
+ /**
+ * Processes the data block at offset.
+ *
+ * @param {Array} words The data words to operate on.
+ * @param {number} offset The offset where the block starts.
+ *
+ * @example
+ *
+ * mode.processBlock(data.words, offset);
+ */
+ processBlock: function (words, offset) {
+ // Shortcuts
+ var cipher = this._cipher;
+ var blockSize = cipher.blockSize;
+
+ // Remember this block to use with next block
+ var thisBlock = words.slice(offset, offset + blockSize);
+
+ // Decrypt and XOR
+ cipher.decryptBlock(words, offset);
+ xorBlock.call(this, words, offset, blockSize);
+
+ // This block becomes the previous block
+ this._prevBlock = thisBlock;
+ }
+ });
+
+ function xorBlock(words, offset, blockSize) {
+ var block;
+
+ // Shortcut
+ var iv = this._iv;
+
+ // Choose mixing block
+ if (iv) {
+ block = iv;
+
+ // Remove IV for subsequent blocks
+ this._iv = undefined;
+ } else {
+ block = this._prevBlock;
+ }
+
+ // XOR blocks
+ for (var i = 0; i < blockSize; i++) {
+ words[offset + i] ^= block[i];
+ }
+ }
+
+ return CBC;
+ }());
+
+ /**
+ * Padding namespace.
+ */
+ var C_pad = C.pad = {};
+
+ /**
+ * PKCS #5/7 padding strategy.
+ */
+ var Pkcs7 = C_pad.Pkcs7 = {
+ /**
+ * Pads data using the algorithm defined in PKCS #5/7.
+ *
+ * @param {WordArray} data The data to pad.
+ * @param {number} blockSize The multiple that the data should be padded to.
+ *
+ * @static
+ *
+ * @example
+ *
+ * CryptoJS.pad.Pkcs7.pad(wordArray, 4);
+ */
+ pad: function (data, blockSize) {
+ // Shortcut
+ var blockSizeBytes = blockSize * 4;
+
+ // Count padding bytes
+ var nPaddingBytes = blockSizeBytes - data.sigBytes % blockSizeBytes;
+
+ // Create padding word
+ var paddingWord = (nPaddingBytes << 24) | (nPaddingBytes << 16) | (nPaddingBytes << 8) | nPaddingBytes;
+
+ // Create padding
+ var paddingWords = [];
+ for (var i = 0; i < nPaddingBytes; i += 4) {
+ paddingWords.push(paddingWord);
+ }
+ var padding = WordArray.create(paddingWords, nPaddingBytes);
+
+ // Add padding
+ data.concat(padding);
+ },
+
+ /**
+ * Unpads data that had been padded using the algorithm defined in PKCS #5/7.
+ *
+ * @param {WordArray} data The data to unpad.
+ *
+ * @static
+ *
+ * @example
+ *
+ * CryptoJS.pad.Pkcs7.unpad(wordArray);
+ */
+ unpad: function (data) {
+ // Get number of padding bytes from last byte
+ var nPaddingBytes = data.words[(data.sigBytes - 1) >>> 2] & 0xff;
+
+ // Remove padding
+ data.sigBytes -= nPaddingBytes;
+ }
+ };
+
+ /**
+ * Abstract base block cipher template.
+ *
+ * @property {number} blockSize The number of 32-bit words this cipher operates on. Default: 4 (128 bits)
+ */
+ var BlockCipher = C_lib.BlockCipher = Cipher.extend({
+ /**
+ * Configuration options.
+ *
+ * @property {Mode} mode The block mode to use. Default: CBC
+ * @property {Padding} padding The padding strategy to use. Default: Pkcs7
+ */
+ cfg: Cipher.cfg.extend({
+ mode: CBC,
+ padding: Pkcs7
+ }),
+
+ reset: function () {
+ var modeCreator;
+
+ // Reset cipher
+ Cipher.reset.call(this);
+
+ // Shortcuts
+ var cfg = this.cfg;
+ var iv = cfg.iv;
+ var mode = cfg.mode;
+
+ // Reset block mode
+ if (this._xformMode == this._ENC_XFORM_MODE) {
+ modeCreator = mode.createEncryptor;
+ } else /* if (this._xformMode == this._DEC_XFORM_MODE) */ {
+ modeCreator = mode.createDecryptor;
+ // Keep at least one block in the buffer for unpadding
+ this._minBufferSize = 1;
+ }
+
+ if (this._mode && this._mode.__creator == modeCreator) {
+ this._mode.init(this, iv && iv.words);
+ } else {
+ this._mode = modeCreator.call(mode, this, iv && iv.words);
+ this._mode.__creator = modeCreator;
+ }
+ },
+
+ _doProcessBlock: function (words, offset) {
+ this._mode.processBlock(words, offset);
+ },
+
+ _doFinalize: function () {
+ var finalProcessedBlocks;
+
+ // Shortcut
+ var padding = this.cfg.padding;
+
+ // Finalize
+ if (this._xformMode == this._ENC_XFORM_MODE) {
+ // Pad data
+ padding.pad(this._data, this.blockSize);
+
+ // Process final blocks
+ finalProcessedBlocks = this._process(!!'flush');
+ } else /* if (this._xformMode == this._DEC_XFORM_MODE) */ {
+ // Process final blocks
+ finalProcessedBlocks = this._process(!!'flush');
+
+ // Unpad data
+ padding.unpad(finalProcessedBlocks);
+ }
+
+ return finalProcessedBlocks;
+ },
+
+ blockSize: 128/32
+ });
+
+ /**
+ * A collection of cipher parameters.
+ *
+ * @property {WordArray} ciphertext The raw ciphertext.
+ * @property {WordArray} key The key to this ciphertext.
+ * @property {WordArray} iv The IV used in the ciphering operation.
+ * @property {WordArray} salt The salt used with a key derivation function.
+ * @property {Cipher} algorithm The cipher algorithm.
+ * @property {Mode} mode The block mode used in the ciphering operation.
+ * @property {Padding} padding The padding scheme used in the ciphering operation.
+ * @property {number} blockSize The block size of the cipher.
+ * @property {Format} formatter The default formatting strategy to convert this cipher params object to a string.
+ */
+ var CipherParams = C_lib.CipherParams = Base.extend({
+ /**
+ * Initializes a newly created cipher params object.
+ *
+ * @param {Object} cipherParams An object with any of the possible cipher parameters.
+ *
+ * @example
+ *
+ * var cipherParams = CryptoJS.lib.CipherParams.create({
+ * ciphertext: ciphertextWordArray,
+ * key: keyWordArray,
+ * iv: ivWordArray,
+ * salt: saltWordArray,
+ * algorithm: CryptoJS.algo.AES,
+ * mode: CryptoJS.mode.CBC,
+ * padding: CryptoJS.pad.PKCS7,
+ * blockSize: 4,
+ * formatter: CryptoJS.format.OpenSSL
+ * });
+ */
+ init: function (cipherParams) {
+ this.mixIn(cipherParams);
+ },
+
+ /**
+ * Converts this cipher params object to a string.
+ *
+ * @param {Format} formatter (Optional) The formatting strategy to use.
+ *
+ * @return {string} The stringified cipher params.
+ *
+ * @throws Error If neither the formatter nor the default formatter is set.
+ *
+ * @example
+ *
+ * var string = cipherParams + '';
+ * var string = cipherParams.toString();
+ * var string = cipherParams.toString(CryptoJS.format.OpenSSL);
+ */
+ toString: function (formatter) {
+ return (formatter || this.formatter).stringify(this);
+ }
+ });
+
+ /**
+ * Format namespace.
+ */
+ var C_format = C.format = {};
+
+ /**
+ * OpenSSL formatting strategy.
+ */
+ var OpenSSLFormatter = C_format.OpenSSL = {
+ /**
+ * Converts a cipher params object to an OpenSSL-compatible string.
+ *
+ * @param {CipherParams} cipherParams The cipher params object.
+ *
+ * @return {string} The OpenSSL-compatible string.
+ *
+ * @static
+ *
+ * @example
+ *
+ * var openSSLString = CryptoJS.format.OpenSSL.stringify(cipherParams);
+ */
+ stringify: function (cipherParams) {
+ var wordArray;
+
+ // Shortcuts
+ var ciphertext = cipherParams.ciphertext;
+ var salt = cipherParams.salt;
+
+ // Format
+ if (salt) {
+ wordArray = WordArray.create([0x53616c74, 0x65645f5f]).concat(salt).concat(ciphertext);
+ } else {
+ wordArray = ciphertext;
+ }
+
+ return wordArray.toString(Base64);
+ },
+
+ /**
+ * Converts an OpenSSL-compatible string to a cipher params object.
+ *
+ * @param {string} openSSLStr The OpenSSL-compatible string.
+ *
+ * @return {CipherParams} The cipher params object.
+ *
+ * @static
+ *
+ * @example
+ *
+ * var cipherParams = CryptoJS.format.OpenSSL.parse(openSSLString);
+ */
+ parse: function (openSSLStr) {
+ var salt;
+
+ // Parse base64
+ var ciphertext = Base64.parse(openSSLStr);
+
+ // Shortcut
+ var ciphertextWords = ciphertext.words;
+
+ // Test for salt
+ if (ciphertextWords[0] == 0x53616c74 && ciphertextWords[1] == 0x65645f5f) {
+ // Extract salt
+ salt = WordArray.create(ciphertextWords.slice(2, 4));
+
+ // Remove salt from ciphertext
+ ciphertextWords.splice(0, 4);
+ ciphertext.sigBytes -= 16;
+ }
+
+ return CipherParams.create({ ciphertext: ciphertext, salt: salt });
+ }
+ };
+
+ /**
+ * A cipher wrapper that returns ciphertext as a serializable cipher params object.
+ */
+ var SerializableCipher = C_lib.SerializableCipher = Base.extend({
+ /**
+ * Configuration options.
+ *
+ * @property {Formatter} format The formatting strategy to convert cipher param objects to and from a string. Default: OpenSSL
+ */
+ cfg: Base.extend({
+ format: OpenSSLFormatter
+ }),
+
+ /**
+ * Encrypts a message.
+ *
+ * @param {Cipher} cipher The cipher algorithm to use.
+ * @param {WordArray|string} message The message to encrypt.
+ * @param {WordArray} key The key.
+ * @param {Object} cfg (Optional) The configuration options to use for this operation.
+ *
+ * @return {CipherParams} A cipher params object.
+ *
+ * @static
+ *
+ * @example
+ *
+ * var ciphertextParams = CryptoJS.lib.SerializableCipher.encrypt(CryptoJS.algo.AES, message, key);
+ * var ciphertextParams = CryptoJS.lib.SerializableCipher.encrypt(CryptoJS.algo.AES, message, key, { iv: iv });
+ * var ciphertextParams = CryptoJS.lib.SerializableCipher.encrypt(CryptoJS.algo.AES, message, key, { iv: iv, format: CryptoJS.format.OpenSSL });
+ */
+ encrypt: function (cipher, message, key, cfg) {
+ // Apply config defaults
+ cfg = this.cfg.extend(cfg);
+
+ // Encrypt
+ var encryptor = cipher.createEncryptor(key, cfg);
+ var ciphertext = encryptor.finalize(message);
+
+ // Shortcut
+ var cipherCfg = encryptor.cfg;
+
+ // Create and return serializable cipher params
+ return CipherParams.create({
+ ciphertext: ciphertext,
+ key: key,
+ iv: cipherCfg.iv,
+ algorithm: cipher,
+ mode: cipherCfg.mode,
+ padding: cipherCfg.padding,
+ blockSize: cipher.blockSize,
+ formatter: cfg.format
+ });
+ },
+
+ /**
+ * Decrypts serialized ciphertext.
+ *
+ * @param {Cipher} cipher The cipher algorithm to use.
+ * @param {CipherParams|string} ciphertext The ciphertext to decrypt.
+ * @param {WordArray} key The key.
+ * @param {Object} cfg (Optional) The configuration options to use for this operation.
+ *
+ * @return {WordArray} The plaintext.
+ *
+ * @static
+ *
+ * @example
+ *
+ * var plaintext = CryptoJS.lib.SerializableCipher.decrypt(CryptoJS.algo.AES, formattedCiphertext, key, { iv: iv, format: CryptoJS.format.OpenSSL });
+ * var plaintext = CryptoJS.lib.SerializableCipher.decrypt(CryptoJS.algo.AES, ciphertextParams, key, { iv: iv, format: CryptoJS.format.OpenSSL });
+ */
+ decrypt: function (cipher, ciphertext, key, cfg) {
+ // Apply config defaults
+ cfg = this.cfg.extend(cfg);
+
+ // Convert string to CipherParams
+ ciphertext = this._parse(ciphertext, cfg.format);
+
+ // Decrypt
+ var plaintext = cipher.createDecryptor(key, cfg).finalize(ciphertext.ciphertext);
+
+ return plaintext;
+ },
+
+ /**
+ * Converts serialized ciphertext to CipherParams,
+ * else assumed CipherParams already and returns ciphertext unchanged.
+ *
+ * @param {CipherParams|string} ciphertext The ciphertext.
+ * @param {Formatter} format The formatting strategy to use to parse serialized ciphertext.
+ *
+ * @return {CipherParams} The unserialized ciphertext.
+ *
+ * @static
+ *
+ * @example
+ *
+ * var ciphertextParams = CryptoJS.lib.SerializableCipher._parse(ciphertextStringOrParams, format);
+ */
+ _parse: function (ciphertext, format) {
+ if (typeof ciphertext == 'string') {
+ return format.parse(ciphertext, this);
+ } else {
+ return ciphertext;
+ }
+ }
+ });
+
+ /**
+ * Key derivation function namespace.
+ */
+ var C_kdf = C.kdf = {};
+
+ /**
+ * OpenSSL key derivation function.
+ */
+ var OpenSSLKdf = C_kdf.OpenSSL = {
+ /**
+ * Derives a key and IV from a password.
+ *
+ * @param {string} password The password to derive from.
+ * @param {number} keySize The size in words of the key to generate.
+ * @param {number} ivSize The size in words of the IV to generate.
+ * @param {WordArray|string} salt (Optional) A 64-bit salt to use. If omitted, a salt will be generated randomly.
+ *
+ * @return {CipherParams} A cipher params object with the key, IV, and salt.
+ *
+ * @static
+ *
+ * @example
+ *
+ * var derivedParams = CryptoJS.kdf.OpenSSL.execute('Password', 256/32, 128/32);
+ * var derivedParams = CryptoJS.kdf.OpenSSL.execute('Password', 256/32, 128/32, 'saltsalt');
+ */
+ execute: function (password, keySize, ivSize, salt) {
+ // Generate random salt
+ if (!salt) {
+ salt = WordArray.random(64/8);
+ }
+
+ // Derive key and IV
+ var key = EvpKDF.create({ keySize: keySize + ivSize }).compute(password, salt);
+
+ // Separate key and IV
+ var iv = WordArray.create(key.words.slice(keySize), ivSize * 4);
+ key.sigBytes = keySize * 4;
+
+ // Return params
+ return CipherParams.create({ key: key, iv: iv, salt: salt });
+ }
+ };
+
+ /**
+ * A serializable cipher wrapper that derives the key from a password,
+ * and returns ciphertext as a serializable cipher params object.
+ */
+ var PasswordBasedCipher = C_lib.PasswordBasedCipher = SerializableCipher.extend({
+ /**
+ * Configuration options.
+ *
+ * @property {KDF} kdf The key derivation function to use to generate a key and IV from a password. Default: OpenSSL
+ */
+ cfg: SerializableCipher.cfg.extend({
+ kdf: OpenSSLKdf
+ }),
+
+ /**
+ * Encrypts a message using a password.
+ *
+ * @param {Cipher} cipher The cipher algorithm to use.
+ * @param {WordArray|string} message The message to encrypt.
+ * @param {string} password The password.
+ * @param {Object} cfg (Optional) The configuration options to use for this operation.
+ *
+ * @return {CipherParams} A cipher params object.
+ *
+ * @static
+ *
+ * @example
+ *
+ * var ciphertextParams = CryptoJS.lib.PasswordBasedCipher.encrypt(CryptoJS.algo.AES, message, 'password');
+ * var ciphertextParams = CryptoJS.lib.PasswordBasedCipher.encrypt(CryptoJS.algo.AES, message, 'password', { format: CryptoJS.format.OpenSSL });
+ */
+ encrypt: function (cipher, message, password, cfg) {
+ // Apply config defaults
+ cfg = this.cfg.extend(cfg);
+
+ // Derive key and other params
+ var derivedParams = cfg.kdf.execute(password, cipher.keySize, cipher.ivSize);
+
+ // Add IV to config
+ cfg.iv = derivedParams.iv;
+
+ // Encrypt
+ var ciphertext = SerializableCipher.encrypt.call(this, cipher, message, derivedParams.key, cfg);
+
+ // Mix in derived params
+ ciphertext.mixIn(derivedParams);
+
+ return ciphertext;
+ },
+
+ /**
+ * Decrypts serialized ciphertext using a password.
+ *
+ * @param {Cipher} cipher The cipher algorithm to use.
+ * @param {CipherParams|string} ciphertext The ciphertext to decrypt.
+ * @param {string} password The password.
+ * @param {Object} cfg (Optional) The configuration options to use for this operation.
+ *
+ * @return {WordArray} The plaintext.
+ *
+ * @static
+ *
+ * @example
+ *
+ * var plaintext = CryptoJS.lib.PasswordBasedCipher.decrypt(CryptoJS.algo.AES, formattedCiphertext, 'password', { format: CryptoJS.format.OpenSSL });
+ * var plaintext = CryptoJS.lib.PasswordBasedCipher.decrypt(CryptoJS.algo.AES, ciphertextParams, 'password', { format: CryptoJS.format.OpenSSL });
+ */
+ decrypt: function (cipher, ciphertext, password, cfg) {
+ // Apply config defaults
+ cfg = this.cfg.extend(cfg);
+
+ // Convert string to CipherParams
+ ciphertext = this._parse(ciphertext, cfg.format);
+
+ // Derive key and other params
+ var derivedParams = cfg.kdf.execute(password, cipher.keySize, cipher.ivSize, ciphertext.salt);
+
+ // Add IV to config
+ cfg.iv = derivedParams.iv;
+
+ // Decrypt
+ var plaintext = SerializableCipher.decrypt.call(this, cipher, ciphertext, derivedParams.key, cfg);
+
+ return plaintext;
+ }
+ });
+ }());
+
+
+}));
\ No newline at end of file
diff --git a/management/guns-admin/src/main/webapp/static/crypto-js/core.js b/management/guns-admin/src/main/webapp/static/crypto-js/core.js
new file mode 100644
index 0000000..e3a498b
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/static/crypto-js/core.js
@@ -0,0 +1,807 @@
+;(function (root, factory) {
+ if (typeof exports === "object") {
+ // CommonJS
+ module.exports = exports = factory();
+ }
+ else if (typeof define === "function" && define.amd) {
+ // AMD
+ define([], factory);
+ }
+ else {
+ // Global (browser)
+ root.CryptoJS = factory();
+ }
+}(this, function () {
+
+ /*globals window, global, require*/
+
+ /**
+ * CryptoJS core components.
+ */
+ var CryptoJS = CryptoJS || (function (Math, undefined) {
+
+ var crypto;
+
+ // Native crypto from window (Browser)
+ if (typeof window !== 'undefined' && window.crypto) {
+ crypto = window.crypto;
+ }
+
+ // Native crypto in web worker (Browser)
+ if (typeof self !== 'undefined' && self.crypto) {
+ crypto = self.crypto;
+ }
+
+ // Native crypto from worker
+ if (typeof globalThis !== 'undefined' && globalThis.crypto) {
+ crypto = globalThis.crypto;
+ }
+
+ // Native (experimental IE 11) crypto from window (Browser)
+ if (!crypto && typeof window !== 'undefined' && window.msCrypto) {
+ crypto = window.msCrypto;
+ }
+
+ // Native crypto from global (NodeJS)
+ if (!crypto && typeof global !== 'undefined' && global.crypto) {
+ crypto = global.crypto;
+ }
+
+ // Native crypto import via require (NodeJS)
+ if (!crypto && typeof require === 'function') {
+ try {
+ crypto = require('crypto');
+ } catch (err) {}
+ }
+
+ /*
+ * Cryptographically secure pseudorandom number generator
+ *
+ * As Math.random() is cryptographically not safe to use
+ */
+ var cryptoSecureRandomInt = function () {
+ if (crypto) {
+ // Use getRandomValues method (Browser)
+ if (typeof crypto.getRandomValues === 'function') {
+ try {
+ return crypto.getRandomValues(new Uint32Array(1))[0];
+ } catch (err) {}
+ }
+
+ // Use randomBytes method (NodeJS)
+ if (typeof crypto.randomBytes === 'function') {
+ try {
+ return crypto.randomBytes(4).readInt32LE();
+ } catch (err) {}
+ }
+ }
+
+ throw new Error('Native crypto module could not be used to get secure random number.');
+ };
+
+ /*
+ * Local polyfill of Object.create
+
+ */
+ var create = Object.create || (function () {
+ function F() {}
+
+ return function (obj) {
+ var subtype;
+
+ F.prototype = obj;
+
+ subtype = new F();
+
+ F.prototype = null;
+
+ return subtype;
+ };
+ }());
+
+ /**
+ * CryptoJS namespace.
+ */
+ var C = {};
+
+ /**
+ * Library namespace.
+ */
+ var C_lib = C.lib = {};
+
+ /**
+ * Base object for prototypal inheritance.
+ */
+ var Base = C_lib.Base = (function () {
+
+
+ return {
+ /**
+ * Creates a new object that inherits from this object.
+ *
+ * @param {Object} overrides Properties to copy into the new object.
+ *
+ * @return {Object} The new object.
+ *
+ * @static
+ *
+ * @example
+ *
+ * var MyType = CryptoJS.lib.Base.extend({
+ * field: 'value',
+ *
+ * method: function () {
+ * }
+ * });
+ */
+ extend: function (overrides) {
+ // Spawn
+ var subtype = create(this);
+
+ // Augment
+ if (overrides) {
+ subtype.mixIn(overrides);
+ }
+
+ // Create default initializer
+ if (!subtype.hasOwnProperty('init') || this.init === subtype.init) {
+ subtype.init = function () {
+ subtype.$super.init.apply(this, arguments);
+ };
+ }
+
+ // Initializer's prototype is the subtype object
+ subtype.init.prototype = subtype;
+
+ // Reference supertype
+ subtype.$super = this;
+
+ return subtype;
+ },
+
+ /**
+ * Extends this object and runs the init method.
+ * Arguments to create() will be passed to init().
+ *
+ * @return {Object} The new object.
+ *
+ * @static
+ *
+ * @example
+ *
+ * var instance = MyType.create();
+ */
+ create: function () {
+ var instance = this.extend();
+ instance.init.apply(instance, arguments);
+
+ return instance;
+ },
+
+ /**
+ * Initializes a newly created object.
+ * Override this method to add some logic when your objects are created.
+ *
+ * @example
+ *
+ * var MyType = CryptoJS.lib.Base.extend({
+ * init: function () {
+ * // ...
+ * }
+ * });
+ */
+ init: function () {
+ },
+
+ /**
+ * Copies properties into this object.
+ *
+ * @param {Object} properties The properties to mix in.
+ *
+ * @example
+ *
+ * MyType.mixIn({
+ * field: 'value'
+ * });
+ */
+ mixIn: function (properties) {
+ for (var propertyName in properties) {
+ if (properties.hasOwnProperty(propertyName)) {
+ this[propertyName] = properties[propertyName];
+ }
+ }
+
+ // IE won't copy toString using the loop above
+ if (properties.hasOwnProperty('toString')) {
+ this.toString = properties.toString;
+ }
+ },
+
+ /**
+ * Creates a copy of this object.
+ *
+ * @return {Object} The clone.
+ *
+ * @example
+ *
+ * var clone = instance.clone();
+ */
+ clone: function () {
+ return this.init.prototype.extend(this);
+ }
+ };
+ }());
+
+ /**
+ * An array of 32-bit words.
+ *
+ * @property {Array} words The array of 32-bit words.
+ * @property {number} sigBytes The number of significant bytes in this word array.
+ */
+ var WordArray = C_lib.WordArray = Base.extend({
+ /**
+ * Initializes a newly created word array.
+ *
+ * @param {Array} words (Optional) An array of 32-bit words.
+ * @param {number} sigBytes (Optional) The number of significant bytes in the words.
+ *
+ * @example
+ *
+ * var wordArray = CryptoJS.lib.WordArray.create();
+ * var wordArray = CryptoJS.lib.WordArray.create([0x00010203, 0x04050607]);
+ * var wordArray = CryptoJS.lib.WordArray.create([0x00010203, 0x04050607], 6);
+ */
+ init: function (words, sigBytes) {
+ words = this.words = words || [];
+
+ if (sigBytes != undefined) {
+ this.sigBytes = sigBytes;
+ } else {
+ this.sigBytes = words.length * 4;
+ }
+ },
+
+ /**
+ * Converts this word array to a string.
+ *
+ * @param {Encoder} encoder (Optional) The encoding strategy to use. Default: CryptoJS.enc.Hex
+ *
+ * @return {string} The stringified word array.
+ *
+ * @example
+ *
+ * var string = wordArray + '';
+ * var string = wordArray.toString();
+ * var string = wordArray.toString(CryptoJS.enc.Utf8);
+ */
+ toString: function (encoder) {
+ return (encoder || Hex).stringify(this);
+ },
+
+ /**
+ * Concatenates a word array to this word array.
+ *
+ * @param {WordArray} wordArray The word array to append.
+ *
+ * @return {WordArray} This word array.
+ *
+ * @example
+ *
+ * wordArray1.concat(wordArray2);
+ */
+ concat: function (wordArray) {
+ // Shortcuts
+ var thisWords = this.words;
+ var thatWords = wordArray.words;
+ var thisSigBytes = this.sigBytes;
+ var thatSigBytes = wordArray.sigBytes;
+
+ // Clamp excess bits
+ this.clamp();
+
+ // Concat
+ if (thisSigBytes % 4) {
+ // Copy one byte at a time
+ for (var i = 0; i < thatSigBytes; i++) {
+ var thatByte = (thatWords[i >>> 2] >>> (24 - (i % 4) * 8)) & 0xff;
+ thisWords[(thisSigBytes + i) >>> 2] |= thatByte << (24 - ((thisSigBytes + i) % 4) * 8);
+ }
+ } else {
+ // Copy one word at a time
+ for (var j = 0; j < thatSigBytes; j += 4) {
+ thisWords[(thisSigBytes + j) >>> 2] = thatWords[j >>> 2];
+ }
+ }
+ this.sigBytes += thatSigBytes;
+
+ // Chainable
+ return this;
+ },
+
+ /**
+ * Removes insignificant bits.
+ *
+ * @example
+ *
+ * wordArray.clamp();
+ */
+ clamp: function () {
+ // Shortcuts
+ var words = this.words;
+ var sigBytes = this.sigBytes;
+
+ // Clamp
+ words[sigBytes >>> 2] &= 0xffffffff << (32 - (sigBytes % 4) * 8);
+ words.length = Math.ceil(sigBytes / 4);
+ },
+
+ /**
+ * Creates a copy of this word array.
+ *
+ * @return {WordArray} The clone.
+ *
+ * @example
+ *
+ * var clone = wordArray.clone();
+ */
+ clone: function () {
+ var clone = Base.clone.call(this);
+ clone.words = this.words.slice(0);
+
+ return clone;
+ },
+
+ /**
+ * Creates a word array filled with random bytes.
+ *
+ * @param {number} nBytes The number of random bytes to generate.
+ *
+ * @return {WordArray} The random word array.
+ *
+ * @static
+ *
+ * @example
+ *
+ * var wordArray = CryptoJS.lib.WordArray.random(16);
+ */
+ random: function (nBytes) {
+ var words = [];
+
+ for (var i = 0; i < nBytes; i += 4) {
+ words.push(cryptoSecureRandomInt());
+ }
+
+ return new WordArray.init(words, nBytes);
+ }
+ });
+
+ /**
+ * Encoder namespace.
+ */
+ var C_enc = C.enc = {};
+
+ /**
+ * Hex encoding strategy.
+ */
+ var Hex = C_enc.Hex = {
+ /**
+ * Converts a word array to a hex string.
+ *
+ * @param {WordArray} wordArray The word array.
+ *
+ * @return {string} The hex string.
+ *
+ * @static
+ *
+ * @example
+ *
+ * var hexString = CryptoJS.enc.Hex.stringify(wordArray);
+ */
+ stringify: function (wordArray) {
+ // Shortcuts
+ var words = wordArray.words;
+ var sigBytes = wordArray.sigBytes;
+
+ // Convert
+ var hexChars = [];
+ for (var i = 0; i < sigBytes; i++) {
+ var bite = (words[i >>> 2] >>> (24 - (i % 4) * 8)) & 0xff;
+ hexChars.push((bite >>> 4).toString(16));
+ hexChars.push((bite & 0x0f).toString(16));
+ }
+
+ return hexChars.join('');
+ },
+
+ /**
+ * Converts a hex string to a word array.
+ *
+ * @param {string} hexStr The hex string.
+ *
+ * @return {WordArray} The word array.
+ *
+ * @static
+ *
+ * @example
+ *
+ * var wordArray = CryptoJS.enc.Hex.parse(hexString);
+ */
+ parse: function (hexStr) {
+ // Shortcut
+ var hexStrLength = hexStr.length;
+
+ // Convert
+ var words = [];
+ for (var i = 0; i < hexStrLength; i += 2) {
+ words[i >>> 3] |= parseInt(hexStr.substr(i, 2), 16) << (24 - (i % 8) * 4);
+ }
+
+ return new WordArray.init(words, hexStrLength / 2);
+ }
+ };
+
+ /**
+ * Latin1 encoding strategy.
+ */
+ var Latin1 = C_enc.Latin1 = {
+ /**
+ * Converts a word array to a Latin1 string.
+ *
+ * @param {WordArray} wordArray The word array.
+ *
+ * @return {string} The Latin1 string.
+ *
+ * @static
+ *
+ * @example
+ *
+ * var latin1String = CryptoJS.enc.Latin1.stringify(wordArray);
+ */
+ stringify: function (wordArray) {
+ // Shortcuts
+ var words = wordArray.words;
+ var sigBytes = wordArray.sigBytes;
+
+ // Convert
+ var latin1Chars = [];
+ for (var i = 0; i < sigBytes; i++) {
+ var bite = (words[i >>> 2] >>> (24 - (i % 4) * 8)) & 0xff;
+ latin1Chars.push(String.fromCharCode(bite));
+ }
+
+ return latin1Chars.join('');
+ },
+
+ /**
+ * Converts a Latin1 string to a word array.
+ *
+ * @param {string} latin1Str The Latin1 string.
+ *
+ * @return {WordArray} The word array.
+ *
+ * @static
+ *
+ * @example
+ *
+ * var wordArray = CryptoJS.enc.Latin1.parse(latin1String);
+ */
+ parse: function (latin1Str) {
+ // Shortcut
+ var latin1StrLength = latin1Str.length;
+
+ // Convert
+ var words = [];
+ for (var i = 0; i < latin1StrLength; i++) {
+ words[i >>> 2] |= (latin1Str.charCodeAt(i) & 0xff) << (24 - (i % 4) * 8);
+ }
+
+ return new WordArray.init(words, latin1StrLength);
+ }
+ };
+
+ /**
+ * UTF-8 encoding strategy.
+ */
+ var Utf8 = C_enc.Utf8 = {
+ /**
+ * Converts a word array to a UTF-8 string.
+ *
+ * @param {WordArray} wordArray The word array.
+ *
+ * @return {string} The UTF-8 string.
+ *
+ * @static
+ *
+ * @example
+ *
+ * var utf8String = CryptoJS.enc.Utf8.stringify(wordArray);
+ */
+ stringify: function (wordArray) {
+ try {
+ return decodeURIComponent(escape(Latin1.stringify(wordArray)));
+ } catch (e) {
+ throw new Error('Malformed UTF-8 data');
+ }
+ },
+
+ /**
+ * Converts a UTF-8 string to a word array.
+ *
+ * @param {string} utf8Str The UTF-8 string.
+ *
+ * @return {WordArray} The word array.
+ *
+ * @static
+ *
+ * @example
+ *
+ * var wordArray = CryptoJS.enc.Utf8.parse(utf8String);
+ */
+ parse: function (utf8Str) {
+ return Latin1.parse(unescape(encodeURIComponent(utf8Str)));
+ }
+ };
+
+ /**
+ * Abstract buffered block algorithm template.
+ *
+ * The property blockSize must be implemented in a concrete subtype.
+ *
+ * @property {number} _minBufferSize The number of blocks that should be kept unprocessed in the buffer. Default: 0
+ */
+ var BufferedBlockAlgorithm = C_lib.BufferedBlockAlgorithm = Base.extend({
+ /**
+ * Resets this block algorithm's data buffer to its initial state.
+ *
+ * @example
+ *
+ * bufferedBlockAlgorithm.reset();
+ */
+ reset: function () {
+ // Initial values
+ this._data = new WordArray.init();
+ this._nDataBytes = 0;
+ },
+
+ /**
+ * Adds new data to this block algorithm's buffer.
+ *
+ * @param {WordArray|string} data The data to append. Strings are converted to a WordArray using UTF-8.
+ *
+ * @example
+ *
+ * bufferedBlockAlgorithm._append('data');
+ * bufferedBlockAlgorithm._append(wordArray);
+ */
+ _append: function (data) {
+ // Convert string to WordArray, else assume WordArray already
+ if (typeof data == 'string') {
+ data = Utf8.parse(data);
+ }
+
+ // Append
+ this._data.concat(data);
+ this._nDataBytes += data.sigBytes;
+ },
+
+ /**
+ * Processes available data blocks.
+ *
+ * This method invokes _doProcessBlock(offset), which must be implemented by a concrete subtype.
+ *
+ * @param {boolean} doFlush Whether all blocks and partial blocks should be processed.
+ *
+ * @return {WordArray} The processed data.
+ *
+ * @example
+ *
+ * var processedData = bufferedBlockAlgorithm._process();
+ * var processedData = bufferedBlockAlgorithm._process(!!'flush');
+ */
+ _process: function (doFlush) {
+ var processedWords;
+
+ // Shortcuts
+ var data = this._data;
+ var dataWords = data.words;
+ var dataSigBytes = data.sigBytes;
+ var blockSize = this.blockSize;
+ var blockSizeBytes = blockSize * 4;
+
+ // Count blocks ready
+ var nBlocksReady = dataSigBytes / blockSizeBytes;
+ if (doFlush) {
+ // Round up to include partial blocks
+ nBlocksReady = Math.ceil(nBlocksReady);
+ } else {
+ // Round down to include only full blocks,
+ // less the number of blocks that must remain in the buffer
+ nBlocksReady = Math.max((nBlocksReady | 0) - this._minBufferSize, 0);
+ }
+
+ // Count words ready
+ var nWordsReady = nBlocksReady * blockSize;
+
+ // Count bytes ready
+ var nBytesReady = Math.min(nWordsReady * 4, dataSigBytes);
+
+ // Process blocks
+ if (nWordsReady) {
+ for (var offset = 0; offset < nWordsReady; offset += blockSize) {
+ // Perform concrete-algorithm logic
+ this._doProcessBlock(dataWords, offset);
+ }
+
+ // Remove processed words
+ processedWords = dataWords.splice(0, nWordsReady);
+ data.sigBytes -= nBytesReady;
+ }
+
+ // Return processed words
+ return new WordArray.init(processedWords, nBytesReady);
+ },
+
+ /**
+ * Creates a copy of this object.
+ *
+ * @return {Object} The clone.
+ *
+ * @example
+ *
+ * var clone = bufferedBlockAlgorithm.clone();
+ */
+ clone: function () {
+ var clone = Base.clone.call(this);
+ clone._data = this._data.clone();
+
+ return clone;
+ },
+
+ _minBufferSize: 0
+ });
+
+ /**
+ * Abstract hasher template.
+ *
+ * @property {number} blockSize The number of 32-bit words this hasher operates on. Default: 16 (512 bits)
+ */
+ var Hasher = C_lib.Hasher = BufferedBlockAlgorithm.extend({
+ /**
+ * Configuration options.
+ */
+ cfg: Base.extend(),
+
+ /**
+ * Initializes a newly created hasher.
+ *
+ * @param {Object} cfg (Optional) The configuration options to use for this hash computation.
+ *
+ * @example
+ *
+ * var hasher = CryptoJS.algo.SHA256.create();
+ */
+ init: function (cfg) {
+ // Apply config defaults
+ this.cfg = this.cfg.extend(cfg);
+
+ // Set initial values
+ this.reset();
+ },
+
+ /**
+ * Resets this hasher to its initial state.
+ *
+ * @example
+ *
+ * hasher.reset();
+ */
+ reset: function () {
+ // Reset data buffer
+ BufferedBlockAlgorithm.reset.call(this);
+
+ // Perform concrete-hasher logic
+ this._doReset();
+ },
+
+ /**
+ * Updates this hasher with a message.
+ *
+ * @param {WordArray|string} messageUpdate The message to append.
+ *
+ * @return {Hasher} This hasher.
+ *
+ * @example
+ *
+ * hasher.update('message');
+ * hasher.update(wordArray);
+ */
+ update: function (messageUpdate) {
+ // Append
+ this._append(messageUpdate);
+
+ // Update the hash
+ this._process();
+
+ // Chainable
+ return this;
+ },
+
+ /**
+ * Finalizes the hash computation.
+ * Note that the finalize operation is effectively a destructive, read-once operation.
+ *
+ * @param {WordArray|string} messageUpdate (Optional) A final message update.
+ *
+ * @return {WordArray} The hash.
+ *
+ * @example
+ *
+ * var hash = hasher.finalize();
+ * var hash = hasher.finalize('message');
+ * var hash = hasher.finalize(wordArray);
+ */
+ finalize: function (messageUpdate) {
+ // Final message update
+ if (messageUpdate) {
+ this._append(messageUpdate);
+ }
+
+ // Perform concrete-hasher logic
+ var hash = this._doFinalize();
+
+ return hash;
+ },
+
+ blockSize: 512/32,
+
+ /**
+ * Creates a shortcut function to a hasher's object interface.
+ *
+ * @param {Hasher} hasher The hasher to create a helper for.
+ *
+ * @return {Function} The shortcut function.
+ *
+ * @static
+ *
+ * @example
+ *
+ * var SHA256 = CryptoJS.lib.Hasher._createHelper(CryptoJS.algo.SHA256);
+ */
+ _createHelper: function (hasher) {
+ return function (message, cfg) {
+ return new hasher.init(cfg).finalize(message);
+ };
+ },
+
+ /**
+ * Creates a shortcut function to the HMAC's object interface.
+ *
+ * @param {Hasher} hasher The hasher to use in this HMAC helper.
+ *
+ * @return {Function} The shortcut function.
+ *
+ * @static
+ *
+ * @example
+ *
+ * var HmacSHA256 = CryptoJS.lib.Hasher._createHmacHelper(CryptoJS.algo.SHA256);
+ */
+ _createHmacHelper: function (hasher) {
+ return function (message, key) {
+ return new C_algo.HMAC.init(hasher, key).finalize(message);
+ };
+ }
+ });
+
+ /**
+ * Algorithm namespace.
+ */
+ var C_algo = C.algo = {};
+
+ return C;
+ }(Math));
+
+
+ return CryptoJS;
+
+}));
\ No newline at end of file
diff --git a/management/guns-admin/src/main/webapp/static/crypto-js/crypto-js.js b/management/guns-admin/src/main/webapp/static/crypto-js/crypto-js.js
new file mode 100644
index 0000000..27f0a62
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/static/crypto-js/crypto-js.js
@@ -0,0 +1,6191 @@
+;(function (root, factory) {
+ if (typeof exports === "object") {
+ // CommonJS
+ module.exports = exports = factory();
+ }
+ else if (typeof define === "function" && define.amd) {
+ // AMD
+ define([], factory);
+ }
+ else {
+ // Global (browser)
+ root.CryptoJS = factory();
+ }
+}(this, function () {
+
+ /*globals window, global, require*/
+
+ /**
+ * CryptoJS core components.
+ */
+ var CryptoJS = CryptoJS || (function (Math, undefined) {
+
+ var crypto;
+
+ // Native crypto from window (Browser)
+ if (typeof window !== 'undefined' && window.crypto) {
+ crypto = window.crypto;
+ }
+
+ // Native crypto in web worker (Browser)
+ if (typeof self !== 'undefined' && self.crypto) {
+ crypto = self.crypto;
+ }
+
+ // Native crypto from worker
+ if (typeof globalThis !== 'undefined' && globalThis.crypto) {
+ crypto = globalThis.crypto;
+ }
+
+ // Native (experimental IE 11) crypto from window (Browser)
+ if (!crypto && typeof window !== 'undefined' && window.msCrypto) {
+ crypto = window.msCrypto;
+ }
+
+ // Native crypto from global (NodeJS)
+ if (!crypto && typeof global !== 'undefined' && global.crypto) {
+ crypto = global.crypto;
+ }
+
+ // Native crypto import via require (NodeJS)
+ if (!crypto && typeof require === 'function') {
+ try {
+ crypto = require('crypto');
+ } catch (err) {}
+ }
+
+ /*
+ * Cryptographically secure pseudorandom number generator
+ *
+ * As Math.random() is cryptographically not safe to use
+ */
+ var cryptoSecureRandomInt = function () {
+ if (crypto) {
+ // Use getRandomValues method (Browser)
+ if (typeof crypto.getRandomValues === 'function') {
+ try {
+ return crypto.getRandomValues(new Uint32Array(1))[0];
+ } catch (err) {}
+ }
+
+ // Use randomBytes method (NodeJS)
+ if (typeof crypto.randomBytes === 'function') {
+ try {
+ return crypto.randomBytes(4).readInt32LE();
+ } catch (err) {}
+ }
+ }
+
+ throw new Error('Native crypto module could not be used to get secure random number.');
+ };
+
+ /*
+ * Local polyfill of Object.create
+
+ */
+ var create = Object.create || (function () {
+ function F() {}
+
+ return function (obj) {
+ var subtype;
+
+ F.prototype = obj;
+
+ subtype = new F();
+
+ F.prototype = null;
+
+ return subtype;
+ };
+ }());
+
+ /**
+ * CryptoJS namespace.
+ */
+ var C = {};
+
+ /**
+ * Library namespace.
+ */
+ var C_lib = C.lib = {};
+
+ /**
+ * Base object for prototypal inheritance.
+ */
+ var Base = C_lib.Base = (function () {
+
+
+ return {
+ /**
+ * Creates a new object that inherits from this object.
+ *
+ * @param {Object} overrides Properties to copy into the new object.
+ *
+ * @return {Object} The new object.
+ *
+ * @static
+ *
+ * @example
+ *
+ * var MyType = CryptoJS.lib.Base.extend({
+ * field: 'value',
+ *
+ * method: function () {
+ * }
+ * });
+ */
+ extend: function (overrides) {
+ // Spawn
+ var subtype = create(this);
+
+ // Augment
+ if (overrides) {
+ subtype.mixIn(overrides);
+ }
+
+ // Create default initializer
+ if (!subtype.hasOwnProperty('init') || this.init === subtype.init) {
+ subtype.init = function () {
+ subtype.$super.init.apply(this, arguments);
+ };
+ }
+
+ // Initializer's prototype is the subtype object
+ subtype.init.prototype = subtype;
+
+ // Reference supertype
+ subtype.$super = this;
+
+ return subtype;
+ },
+
+ /**
+ * Extends this object and runs the init method.
+ * Arguments to create() will be passed to init().
+ *
+ * @return {Object} The new object.
+ *
+ * @static
+ *
+ * @example
+ *
+ * var instance = MyType.create();
+ */
+ create: function () {
+ var instance = this.extend();
+ instance.init.apply(instance, arguments);
+
+ return instance;
+ },
+
+ /**
+ * Initializes a newly created object.
+ * Override this method to add some logic when your objects are created.
+ *
+ * @example
+ *
+ * var MyType = CryptoJS.lib.Base.extend({
+ * init: function () {
+ * // ...
+ * }
+ * });
+ */
+ init: function () {
+ },
+
+ /**
+ * Copies properties into this object.
+ *
+ * @param {Object} properties The properties to mix in.
+ *
+ * @example
+ *
+ * MyType.mixIn({
+ * field: 'value'
+ * });
+ */
+ mixIn: function (properties) {
+ for (var propertyName in properties) {
+ if (properties.hasOwnProperty(propertyName)) {
+ this[propertyName] = properties[propertyName];
+ }
+ }
+
+ // IE won't copy toString using the loop above
+ if (properties.hasOwnProperty('toString')) {
+ this.toString = properties.toString;
+ }
+ },
+
+ /**
+ * Creates a copy of this object.
+ *
+ * @return {Object} The clone.
+ *
+ * @example
+ *
+ * var clone = instance.clone();
+ */
+ clone: function () {
+ return this.init.prototype.extend(this);
+ }
+ };
+ }());
+
+ /**
+ * An array of 32-bit words.
+ *
+ * @property {Array} words The array of 32-bit words.
+ * @property {number} sigBytes The number of significant bytes in this word array.
+ */
+ var WordArray = C_lib.WordArray = Base.extend({
+ /**
+ * Initializes a newly created word array.
+ *
+ * @param {Array} words (Optional) An array of 32-bit words.
+ * @param {number} sigBytes (Optional) The number of significant bytes in the words.
+ *
+ * @example
+ *
+ * var wordArray = CryptoJS.lib.WordArray.create();
+ * var wordArray = CryptoJS.lib.WordArray.create([0x00010203, 0x04050607]);
+ * var wordArray = CryptoJS.lib.WordArray.create([0x00010203, 0x04050607], 6);
+ */
+ init: function (words, sigBytes) {
+ words = this.words = words || [];
+
+ if (sigBytes != undefined) {
+ this.sigBytes = sigBytes;
+ } else {
+ this.sigBytes = words.length * 4;
+ }
+ },
+
+ /**
+ * Converts this word array to a string.
+ *
+ * @param {Encoder} encoder (Optional) The encoding strategy to use. Default: CryptoJS.enc.Hex
+ *
+ * @return {string} The stringified word array.
+ *
+ * @example
+ *
+ * var string = wordArray + '';
+ * var string = wordArray.toString();
+ * var string = wordArray.toString(CryptoJS.enc.Utf8);
+ */
+ toString: function (encoder) {
+ return (encoder || Hex).stringify(this);
+ },
+
+ /**
+ * Concatenates a word array to this word array.
+ *
+ * @param {WordArray} wordArray The word array to append.
+ *
+ * @return {WordArray} This word array.
+ *
+ * @example
+ *
+ * wordArray1.concat(wordArray2);
+ */
+ concat: function (wordArray) {
+ // Shortcuts
+ var thisWords = this.words;
+ var thatWords = wordArray.words;
+ var thisSigBytes = this.sigBytes;
+ var thatSigBytes = wordArray.sigBytes;
+
+ // Clamp excess bits
+ this.clamp();
+
+ // Concat
+ if (thisSigBytes % 4) {
+ // Copy one byte at a time
+ for (var i = 0; i < thatSigBytes; i++) {
+ var thatByte = (thatWords[i >>> 2] >>> (24 - (i % 4) * 8)) & 0xff;
+ thisWords[(thisSigBytes + i) >>> 2] |= thatByte << (24 - ((thisSigBytes + i) % 4) * 8);
+ }
+ } else {
+ // Copy one word at a time
+ for (var j = 0; j < thatSigBytes; j += 4) {
+ thisWords[(thisSigBytes + j) >>> 2] = thatWords[j >>> 2];
+ }
+ }
+ this.sigBytes += thatSigBytes;
+
+ // Chainable
+ return this;
+ },
+
+ /**
+ * Removes insignificant bits.
+ *
+ * @example
+ *
+ * wordArray.clamp();
+ */
+ clamp: function () {
+ // Shortcuts
+ var words = this.words;
+ var sigBytes = this.sigBytes;
+
+ // Clamp
+ words[sigBytes >>> 2] &= 0xffffffff << (32 - (sigBytes % 4) * 8);
+ words.length = Math.ceil(sigBytes / 4);
+ },
+
+ /**
+ * Creates a copy of this word array.
+ *
+ * @return {WordArray} The clone.
+ *
+ * @example
+ *
+ * var clone = wordArray.clone();
+ */
+ clone: function () {
+ var clone = Base.clone.call(this);
+ clone.words = this.words.slice(0);
+
+ return clone;
+ },
+
+ /**
+ * Creates a word array filled with random bytes.
+ *
+ * @param {number} nBytes The number of random bytes to generate.
+ *
+ * @return {WordArray} The random word array.
+ *
+ * @static
+ *
+ * @example
+ *
+ * var wordArray = CryptoJS.lib.WordArray.random(16);
+ */
+ random: function (nBytes) {
+ var words = [];
+
+ for (var i = 0; i < nBytes; i += 4) {
+ words.push(cryptoSecureRandomInt());
+ }
+
+ return new WordArray.init(words, nBytes);
+ }
+ });
+
+ /**
+ * Encoder namespace.
+ */
+ var C_enc = C.enc = {};
+
+ /**
+ * Hex encoding strategy.
+ */
+ var Hex = C_enc.Hex = {
+ /**
+ * Converts a word array to a hex string.
+ *
+ * @param {WordArray} wordArray The word array.
+ *
+ * @return {string} The hex string.
+ *
+ * @static
+ *
+ * @example
+ *
+ * var hexString = CryptoJS.enc.Hex.stringify(wordArray);
+ */
+ stringify: function (wordArray) {
+ // Shortcuts
+ var words = wordArray.words;
+ var sigBytes = wordArray.sigBytes;
+
+ // Convert
+ var hexChars = [];
+ for (var i = 0; i < sigBytes; i++) {
+ var bite = (words[i >>> 2] >>> (24 - (i % 4) * 8)) & 0xff;
+ hexChars.push((bite >>> 4).toString(16));
+ hexChars.push((bite & 0x0f).toString(16));
+ }
+
+ return hexChars.join('');
+ },
+
+ /**
+ * Converts a hex string to a word array.
+ *
+ * @param {string} hexStr The hex string.
+ *
+ * @return {WordArray} The word array.
+ *
+ * @static
+ *
+ * @example
+ *
+ * var wordArray = CryptoJS.enc.Hex.parse(hexString);
+ */
+ parse: function (hexStr) {
+ // Shortcut
+ var hexStrLength = hexStr.length;
+
+ // Convert
+ var words = [];
+ for (var i = 0; i < hexStrLength; i += 2) {
+ words[i >>> 3] |= parseInt(hexStr.substr(i, 2), 16) << (24 - (i % 8) * 4);
+ }
+
+ return new WordArray.init(words, hexStrLength / 2);
+ }
+ };
+
+ /**
+ * Latin1 encoding strategy.
+ */
+ var Latin1 = C_enc.Latin1 = {
+ /**
+ * Converts a word array to a Latin1 string.
+ *
+ * @param {WordArray} wordArray The word array.
+ *
+ * @return {string} The Latin1 string.
+ *
+ * @static
+ *
+ * @example
+ *
+ * var latin1String = CryptoJS.enc.Latin1.stringify(wordArray);
+ */
+ stringify: function (wordArray) {
+ // Shortcuts
+ var words = wordArray.words;
+ var sigBytes = wordArray.sigBytes;
+
+ // Convert
+ var latin1Chars = [];
+ for (var i = 0; i < sigBytes; i++) {
+ var bite = (words[i >>> 2] >>> (24 - (i % 4) * 8)) & 0xff;
+ latin1Chars.push(String.fromCharCode(bite));
+ }
+
+ return latin1Chars.join('');
+ },
+
+ /**
+ * Converts a Latin1 string to a word array.
+ *
+ * @param {string} latin1Str The Latin1 string.
+ *
+ * @return {WordArray} The word array.
+ *
+ * @static
+ *
+ * @example
+ *
+ * var wordArray = CryptoJS.enc.Latin1.parse(latin1String);
+ */
+ parse: function (latin1Str) {
+ // Shortcut
+ var latin1StrLength = latin1Str.length;
+
+ // Convert
+ var words = [];
+ for (var i = 0; i < latin1StrLength; i++) {
+ words[i >>> 2] |= (latin1Str.charCodeAt(i) & 0xff) << (24 - (i % 4) * 8);
+ }
+
+ return new WordArray.init(words, latin1StrLength);
+ }
+ };
+
+ /**
+ * UTF-8 encoding strategy.
+ */
+ var Utf8 = C_enc.Utf8 = {
+ /**
+ * Converts a word array to a UTF-8 string.
+ *
+ * @param {WordArray} wordArray The word array.
+ *
+ * @return {string} The UTF-8 string.
+ *
+ * @static
+ *
+ * @example
+ *
+ * var utf8String = CryptoJS.enc.Utf8.stringify(wordArray);
+ */
+ stringify: function (wordArray) {
+ try {
+ return decodeURIComponent(escape(Latin1.stringify(wordArray)));
+ } catch (e) {
+ throw new Error('Malformed UTF-8 data');
+ }
+ },
+
+ /**
+ * Converts a UTF-8 string to a word array.
+ *
+ * @param {string} utf8Str The UTF-8 string.
+ *
+ * @return {WordArray} The word array.
+ *
+ * @static
+ *
+ * @example
+ *
+ * var wordArray = CryptoJS.enc.Utf8.parse(utf8String);
+ */
+ parse: function (utf8Str) {
+ return Latin1.parse(unescape(encodeURIComponent(utf8Str)));
+ }
+ };
+
+ /**
+ * Abstract buffered block algorithm template.
+ *
+ * The property blockSize must be implemented in a concrete subtype.
+ *
+ * @property {number} _minBufferSize The number of blocks that should be kept unprocessed in the buffer. Default: 0
+ */
+ var BufferedBlockAlgorithm = C_lib.BufferedBlockAlgorithm = Base.extend({
+ /**
+ * Resets this block algorithm's data buffer to its initial state.
+ *
+ * @example
+ *
+ * bufferedBlockAlgorithm.reset();
+ */
+ reset: function () {
+ // Initial values
+ this._data = new WordArray.init();
+ this._nDataBytes = 0;
+ },
+
+ /**
+ * Adds new data to this block algorithm's buffer.
+ *
+ * @param {WordArray|string} data The data to append. Strings are converted to a WordArray using UTF-8.
+ *
+ * @example
+ *
+ * bufferedBlockAlgorithm._append('data');
+ * bufferedBlockAlgorithm._append(wordArray);
+ */
+ _append: function (data) {
+ // Convert string to WordArray, else assume WordArray already
+ if (typeof data == 'string') {
+ data = Utf8.parse(data);
+ }
+
+ // Append
+ this._data.concat(data);
+ this._nDataBytes += data.sigBytes;
+ },
+
+ /**
+ * Processes available data blocks.
+ *
+ * This method invokes _doProcessBlock(offset), which must be implemented by a concrete subtype.
+ *
+ * @param {boolean} doFlush Whether all blocks and partial blocks should be processed.
+ *
+ * @return {WordArray} The processed data.
+ *
+ * @example
+ *
+ * var processedData = bufferedBlockAlgorithm._process();
+ * var processedData = bufferedBlockAlgorithm._process(!!'flush');
+ */
+ _process: function (doFlush) {
+ var processedWords;
+
+ // Shortcuts
+ var data = this._data;
+ var dataWords = data.words;
+ var dataSigBytes = data.sigBytes;
+ var blockSize = this.blockSize;
+ var blockSizeBytes = blockSize * 4;
+
+ // Count blocks ready
+ var nBlocksReady = dataSigBytes / blockSizeBytes;
+ if (doFlush) {
+ // Round up to include partial blocks
+ nBlocksReady = Math.ceil(nBlocksReady);
+ } else {
+ // Round down to include only full blocks,
+ // less the number of blocks that must remain in the buffer
+ nBlocksReady = Math.max((nBlocksReady | 0) - this._minBufferSize, 0);
+ }
+
+ // Count words ready
+ var nWordsReady = nBlocksReady * blockSize;
+
+ // Count bytes ready
+ var nBytesReady = Math.min(nWordsReady * 4, dataSigBytes);
+
+ // Process blocks
+ if (nWordsReady) {
+ for (var offset = 0; offset < nWordsReady; offset += blockSize) {
+ // Perform concrete-algorithm logic
+ this._doProcessBlock(dataWords, offset);
+ }
+
+ // Remove processed words
+ processedWords = dataWords.splice(0, nWordsReady);
+ data.sigBytes -= nBytesReady;
+ }
+
+ // Return processed words
+ return new WordArray.init(processedWords, nBytesReady);
+ },
+
+ /**
+ * Creates a copy of this object.
+ *
+ * @return {Object} The clone.
+ *
+ * @example
+ *
+ * var clone = bufferedBlockAlgorithm.clone();
+ */
+ clone: function () {
+ var clone = Base.clone.call(this);
+ clone._data = this._data.clone();
+
+ return clone;
+ },
+
+ _minBufferSize: 0
+ });
+
+ /**
+ * Abstract hasher template.
+ *
+ * @property {number} blockSize The number of 32-bit words this hasher operates on. Default: 16 (512 bits)
+ */
+ var Hasher = C_lib.Hasher = BufferedBlockAlgorithm.extend({
+ /**
+ * Configuration options.
+ */
+ cfg: Base.extend(),
+
+ /**
+ * Initializes a newly created hasher.
+ *
+ * @param {Object} cfg (Optional) The configuration options to use for this hash computation.
+ *
+ * @example
+ *
+ * var hasher = CryptoJS.algo.SHA256.create();
+ */
+ init: function (cfg) {
+ // Apply config defaults
+ this.cfg = this.cfg.extend(cfg);
+
+ // Set initial values
+ this.reset();
+ },
+
+ /**
+ * Resets this hasher to its initial state.
+ *
+ * @example
+ *
+ * hasher.reset();
+ */
+ reset: function () {
+ // Reset data buffer
+ BufferedBlockAlgorithm.reset.call(this);
+
+ // Perform concrete-hasher logic
+ this._doReset();
+ },
+
+ /**
+ * Updates this hasher with a message.
+ *
+ * @param {WordArray|string} messageUpdate The message to append.
+ *
+ * @return {Hasher} This hasher.
+ *
+ * @example
+ *
+ * hasher.update('message');
+ * hasher.update(wordArray);
+ */
+ update: function (messageUpdate) {
+ // Append
+ this._append(messageUpdate);
+
+ // Update the hash
+ this._process();
+
+ // Chainable
+ return this;
+ },
+
+ /**
+ * Finalizes the hash computation.
+ * Note that the finalize operation is effectively a destructive, read-once operation.
+ *
+ * @param {WordArray|string} messageUpdate (Optional) A final message update.
+ *
+ * @return {WordArray} The hash.
+ *
+ * @example
+ *
+ * var hash = hasher.finalize();
+ * var hash = hasher.finalize('message');
+ * var hash = hasher.finalize(wordArray);
+ */
+ finalize: function (messageUpdate) {
+ // Final message update
+ if (messageUpdate) {
+ this._append(messageUpdate);
+ }
+
+ // Perform concrete-hasher logic
+ var hash = this._doFinalize();
+
+ return hash;
+ },
+
+ blockSize: 512/32,
+
+ /**
+ * Creates a shortcut function to a hasher's object interface.
+ *
+ * @param {Hasher} hasher The hasher to create a helper for.
+ *
+ * @return {Function} The shortcut function.
+ *
+ * @static
+ *
+ * @example
+ *
+ * var SHA256 = CryptoJS.lib.Hasher._createHelper(CryptoJS.algo.SHA256);
+ */
+ _createHelper: function (hasher) {
+ return function (message, cfg) {
+ return new hasher.init(cfg).finalize(message);
+ };
+ },
+
+ /**
+ * Creates a shortcut function to the HMAC's object interface.
+ *
+ * @param {Hasher} hasher The hasher to use in this HMAC helper.
+ *
+ * @return {Function} The shortcut function.
+ *
+ * @static
+ *
+ * @example
+ *
+ * var HmacSHA256 = CryptoJS.lib.Hasher._createHmacHelper(CryptoJS.algo.SHA256);
+ */
+ _createHmacHelper: function (hasher) {
+ return function (message, key) {
+ return new C_algo.HMAC.init(hasher, key).finalize(message);
+ };
+ }
+ });
+
+ /**
+ * Algorithm namespace.
+ */
+ var C_algo = C.algo = {};
+
+ return C;
+ }(Math));
+
+
+ (function (undefined) {
+ // Shortcuts
+ var C = CryptoJS;
+ var C_lib = C.lib;
+ var Base = C_lib.Base;
+ var X32WordArray = C_lib.WordArray;
+
+ /**
+ * x64 namespace.
+ */
+ var C_x64 = C.x64 = {};
+
+ /**
+ * A 64-bit word.
+ */
+ var X64Word = C_x64.Word = Base.extend({
+ /**
+ * Initializes a newly created 64-bit word.
+ *
+ * @param {number} high The high 32 bits.
+ * @param {number} low The low 32 bits.
+ *
+ * @example
+ *
+ * var x64Word = CryptoJS.x64.Word.create(0x00010203, 0x04050607);
+ */
+ init: function (high, low) {
+ this.high = high;
+ this.low = low;
+ }
+
+ /**
+ * Bitwise NOTs this word.
+ *
+ * @return {X64Word} A new x64-Word object after negating.
+ *
+ * @example
+ *
+ * var negated = x64Word.not();
+ */
+ // not: function () {
+ // var high = ~this.high;
+ // var low = ~this.low;
+
+ // return X64Word.create(high, low);
+ // },
+
+ /**
+ * Bitwise ANDs this word with the passed word.
+ *
+ * @param {X64Word} word The x64-Word to AND with this word.
+ *
+ * @return {X64Word} A new x64-Word object after ANDing.
+ *
+ * @example
+ *
+ * var anded = x64Word.and(anotherX64Word);
+ */
+ // and: function (word) {
+ // var high = this.high & word.high;
+ // var low = this.low & word.low;
+
+ // return X64Word.create(high, low);
+ // },
+
+ /**
+ * Bitwise ORs this word with the passed word.
+ *
+ * @param {X64Word} word The x64-Word to OR with this word.
+ *
+ * @return {X64Word} A new x64-Word object after ORing.
+ *
+ * @example
+ *
+ * var ored = x64Word.or(anotherX64Word);
+ */
+ // or: function (word) {
+ // var high = this.high | word.high;
+ // var low = this.low | word.low;
+
+ // return X64Word.create(high, low);
+ // },
+
+ /**
+ * Bitwise XORs this word with the passed word.
+ *
+ * @param {X64Word} word The x64-Word to XOR with this word.
+ *
+ * @return {X64Word} A new x64-Word object after XORing.
+ *
+ * @example
+ *
+ * var xored = x64Word.xor(anotherX64Word);
+ */
+ // xor: function (word) {
+ // var high = this.high ^ word.high;
+ // var low = this.low ^ word.low;
+
+ // return X64Word.create(high, low);
+ // },
+
+ /**
+ * Shifts this word n bits to the left.
+ *
+ * @param {number} n The number of bits to shift.
+ *
+ * @return {X64Word} A new x64-Word object after shifting.
+ *
+ * @example
+ *
+ * var shifted = x64Word.shiftL(25);
+ */
+ // shiftL: function (n) {
+ // if (n < 32) {
+ // var high = (this.high << n) | (this.low >>> (32 - n));
+ // var low = this.low << n;
+ // } else {
+ // var high = this.low << (n - 32);
+ // var low = 0;
+ // }
+
+ // return X64Word.create(high, low);
+ // },
+
+ /**
+ * Shifts this word n bits to the right.
+ *
+ * @param {number} n The number of bits to shift.
+ *
+ * @return {X64Word} A new x64-Word object after shifting.
+ *
+ * @example
+ *
+ * var shifted = x64Word.shiftR(7);
+ */
+ // shiftR: function (n) {
+ // if (n < 32) {
+ // var low = (this.low >>> n) | (this.high << (32 - n));
+ // var high = this.high >>> n;
+ // } else {
+ // var low = this.high >>> (n - 32);
+ // var high = 0;
+ // }
+
+ // return X64Word.create(high, low);
+ // },
+
+ /**
+ * Rotates this word n bits to the left.
+ *
+ * @param {number} n The number of bits to rotate.
+ *
+ * @return {X64Word} A new x64-Word object after rotating.
+ *
+ * @example
+ *
+ * var rotated = x64Word.rotL(25);
+ */
+ // rotL: function (n) {
+ // return this.shiftL(n).or(this.shiftR(64 - n));
+ // },
+
+ /**
+ * Rotates this word n bits to the right.
+ *
+ * @param {number} n The number of bits to rotate.
+ *
+ * @return {X64Word} A new x64-Word object after rotating.
+ *
+ * @example
+ *
+ * var rotated = x64Word.rotR(7);
+ */
+ // rotR: function (n) {
+ // return this.shiftR(n).or(this.shiftL(64 - n));
+ // },
+
+ /**
+ * Adds this word with the passed word.
+ *
+ * @param {X64Word} word The x64-Word to add with this word.
+ *
+ * @return {X64Word} A new x64-Word object after adding.
+ *
+ * @example
+ *
+ * var added = x64Word.add(anotherX64Word);
+ */
+ // add: function (word) {
+ // var low = (this.low + word.low) | 0;
+ // var carry = (low >>> 0) < (this.low >>> 0) ? 1 : 0;
+ // var high = (this.high + word.high + carry) | 0;
+
+ // return X64Word.create(high, low);
+ // }
+ });
+
+ /**
+ * An array of 64-bit words.
+ *
+ * @property {Array} words The array of CryptoJS.x64.Word objects.
+ * @property {number} sigBytes The number of significant bytes in this word array.
+ */
+ var X64WordArray = C_x64.WordArray = Base.extend({
+ /**
+ * Initializes a newly created word array.
+ *
+ * @param {Array} words (Optional) An array of CryptoJS.x64.Word objects.
+ * @param {number} sigBytes (Optional) The number of significant bytes in the words.
+ *
+ * @example
+ *
+ * var wordArray = CryptoJS.x64.WordArray.create();
+ *
+ * var wordArray = CryptoJS.x64.WordArray.create([
+ * CryptoJS.x64.Word.create(0x00010203, 0x04050607),
+ * CryptoJS.x64.Word.create(0x18191a1b, 0x1c1d1e1f)
+ * ]);
+ *
+ * var wordArray = CryptoJS.x64.WordArray.create([
+ * CryptoJS.x64.Word.create(0x00010203, 0x04050607),
+ * CryptoJS.x64.Word.create(0x18191a1b, 0x1c1d1e1f)
+ * ], 10);
+ */
+ init: function (words, sigBytes) {
+ words = this.words = words || [];
+
+ if (sigBytes != undefined) {
+ this.sigBytes = sigBytes;
+ } else {
+ this.sigBytes = words.length * 8;
+ }
+ },
+
+ /**
+ * Converts this 64-bit word array to a 32-bit word array.
+ *
+ * @return {CryptoJS.lib.WordArray} This word array's data as a 32-bit word array.
+ *
+ * @example
+ *
+ * var x32WordArray = x64WordArray.toX32();
+ */
+ toX32: function () {
+ // Shortcuts
+ var x64Words = this.words;
+ var x64WordsLength = x64Words.length;
+
+ // Convert
+ var x32Words = [];
+ for (var i = 0; i < x64WordsLength; i++) {
+ var x64Word = x64Words[i];
+ x32Words.push(x64Word.high);
+ x32Words.push(x64Word.low);
+ }
+
+ return X32WordArray.create(x32Words, this.sigBytes);
+ },
+
+ /**
+ * Creates a copy of this word array.
+ *
+ * @return {X64WordArray} The clone.
+ *
+ * @example
+ *
+ * var clone = x64WordArray.clone();
+ */
+ clone: function () {
+ var clone = Base.clone.call(this);
+
+ // Clone "words" array
+ var words = clone.words = this.words.slice(0);
+
+ // Clone each X64Word object
+ var wordsLength = words.length;
+ for (var i = 0; i < wordsLength; i++) {
+ words[i] = words[i].clone();
+ }
+
+ return clone;
+ }
+ });
+ }());
+
+
+ (function () {
+ // Check if typed arrays are supported
+ if (typeof ArrayBuffer != 'function') {
+ return;
+ }
+
+ // Shortcuts
+ var C = CryptoJS;
+ var C_lib = C.lib;
+ var WordArray = C_lib.WordArray;
+
+ // Reference original init
+ var superInit = WordArray.init;
+
+ // Augment WordArray.init to handle typed arrays
+ var subInit = WordArray.init = function (typedArray) {
+ // Convert buffers to uint8
+ if (typedArray instanceof ArrayBuffer) {
+ typedArray = new Uint8Array(typedArray);
+ }
+
+ // Convert other array views to uint8
+ if (
+ typedArray instanceof Int8Array ||
+ (typeof Uint8ClampedArray !== "undefined" && typedArray instanceof Uint8ClampedArray) ||
+ typedArray instanceof Int16Array ||
+ typedArray instanceof Uint16Array ||
+ typedArray instanceof Int32Array ||
+ typedArray instanceof Uint32Array ||
+ typedArray instanceof Float32Array ||
+ typedArray instanceof Float64Array
+ ) {
+ typedArray = new Uint8Array(typedArray.buffer, typedArray.byteOffset, typedArray.byteLength);
+ }
+
+ // Handle Uint8Array
+ if (typedArray instanceof Uint8Array) {
+ // Shortcut
+ var typedArrayByteLength = typedArray.byteLength;
+
+ // Extract bytes
+ var words = [];
+ for (var i = 0; i < typedArrayByteLength; i++) {
+ words[i >>> 2] |= typedArray[i] << (24 - (i % 4) * 8);
+ }
+
+ // Initialize this word array
+ superInit.call(this, words, typedArrayByteLength);
+ } else {
+ // Else call normal init
+ superInit.apply(this, arguments);
+ }
+ };
+
+ subInit.prototype = WordArray;
+ }());
+
+
+ (function () {
+ // Shortcuts
+ var C = CryptoJS;
+ var C_lib = C.lib;
+ var WordArray = C_lib.WordArray;
+ var C_enc = C.enc;
+
+ /**
+ * UTF-16 BE encoding strategy.
+ */
+ var Utf16BE = C_enc.Utf16 = C_enc.Utf16BE = {
+ /**
+ * Converts a word array to a UTF-16 BE string.
+ *
+ * @param {WordArray} wordArray The word array.
+ *
+ * @return {string} The UTF-16 BE string.
+ *
+ * @static
+ *
+ * @example
+ *
+ * var utf16String = CryptoJS.enc.Utf16.stringify(wordArray);
+ */
+ stringify: function (wordArray) {
+ // Shortcuts
+ var words = wordArray.words;
+ var sigBytes = wordArray.sigBytes;
+
+ // Convert
+ var utf16Chars = [];
+ for (var i = 0; i < sigBytes; i += 2) {
+ var codePoint = (words[i >>> 2] >>> (16 - (i % 4) * 8)) & 0xffff;
+ utf16Chars.push(String.fromCharCode(codePoint));
+ }
+
+ return utf16Chars.join('');
+ },
+
+ /**
+ * Converts a UTF-16 BE string to a word array.
+ *
+ * @param {string} utf16Str The UTF-16 BE string.
+ *
+ * @return {WordArray} The word array.
+ *
+ * @static
+ *
+ * @example
+ *
+ * var wordArray = CryptoJS.enc.Utf16.parse(utf16String);
+ */
+ parse: function (utf16Str) {
+ // Shortcut
+ var utf16StrLength = utf16Str.length;
+
+ // Convert
+ var words = [];
+ for (var i = 0; i < utf16StrLength; i++) {
+ words[i >>> 1] |= utf16Str.charCodeAt(i) << (16 - (i % 2) * 16);
+ }
+
+ return WordArray.create(words, utf16StrLength * 2);
+ }
+ };
+
+ /**
+ * UTF-16 LE encoding strategy.
+ */
+ C_enc.Utf16LE = {
+ /**
+ * Converts a word array to a UTF-16 LE string.
+ *
+ * @param {WordArray} wordArray The word array.
+ *
+ * @return {string} The UTF-16 LE string.
+ *
+ * @static
+ *
+ * @example
+ *
+ * var utf16Str = CryptoJS.enc.Utf16LE.stringify(wordArray);
+ */
+ stringify: function (wordArray) {
+ // Shortcuts
+ var words = wordArray.words;
+ var sigBytes = wordArray.sigBytes;
+
+ // Convert
+ var utf16Chars = [];
+ for (var i = 0; i < sigBytes; i += 2) {
+ var codePoint = swapEndian((words[i >>> 2] >>> (16 - (i % 4) * 8)) & 0xffff);
+ utf16Chars.push(String.fromCharCode(codePoint));
+ }
+
+ return utf16Chars.join('');
+ },
+
+ /**
+ * Converts a UTF-16 LE string to a word array.
+ *
+ * @param {string} utf16Str The UTF-16 LE string.
+ *
+ * @return {WordArray} The word array.
+ *
+ * @static
+ *
+ * @example
+ *
+ * var wordArray = CryptoJS.enc.Utf16LE.parse(utf16Str);
+ */
+ parse: function (utf16Str) {
+ // Shortcut
+ var utf16StrLength = utf16Str.length;
+
+ // Convert
+ var words = [];
+ for (var i = 0; i < utf16StrLength; i++) {
+ words[i >>> 1] |= swapEndian(utf16Str.charCodeAt(i) << (16 - (i % 2) * 16));
+ }
+
+ return WordArray.create(words, utf16StrLength * 2);
+ }
+ };
+
+ function swapEndian(word) {
+ return ((word << 8) & 0xff00ff00) | ((word >>> 8) & 0x00ff00ff);
+ }
+ }());
+
+
+ (function () {
+ // Shortcuts
+ var C = CryptoJS;
+ var C_lib = C.lib;
+ var WordArray = C_lib.WordArray;
+ var C_enc = C.enc;
+
+ /**
+ * Base64 encoding strategy.
+ */
+ var Base64 = C_enc.Base64 = {
+ /**
+ * Converts a word array to a Base64 string.
+ *
+ * @param {WordArray} wordArray The word array.
+ *
+ * @return {string} The Base64 string.
+ *
+ * @static
+ *
+ * @example
+ *
+ * var base64String = CryptoJS.enc.Base64.stringify(wordArray);
+ */
+ stringify: function (wordArray) {
+ // Shortcuts
+ var words = wordArray.words;
+ var sigBytes = wordArray.sigBytes;
+ var map = this._map;
+
+ // Clamp excess bits
+ wordArray.clamp();
+
+ // Convert
+ var base64Chars = [];
+ for (var i = 0; i < sigBytes; i += 3) {
+ var byte1 = (words[i >>> 2] >>> (24 - (i % 4) * 8)) & 0xff;
+ var byte2 = (words[(i + 1) >>> 2] >>> (24 - ((i + 1) % 4) * 8)) & 0xff;
+ var byte3 = (words[(i + 2) >>> 2] >>> (24 - ((i + 2) % 4) * 8)) & 0xff;
+
+ var triplet = (byte1 << 16) | (byte2 << 8) | byte3;
+
+ for (var j = 0; (j < 4) && (i + j * 0.75 < sigBytes); j++) {
+ base64Chars.push(map.charAt((triplet >>> (6 * (3 - j))) & 0x3f));
+ }
+ }
+
+ // Add padding
+ var paddingChar = map.charAt(64);
+ if (paddingChar) {
+ while (base64Chars.length % 4) {
+ base64Chars.push(paddingChar);
+ }
+ }
+
+ return base64Chars.join('');
+ },
+
+ /**
+ * Converts a Base64 string to a word array.
+ *
+ * @param {string} base64Str The Base64 string.
+ *
+ * @return {WordArray} The word array.
+ *
+ * @static
+ *
+ * @example
+ *
+ * var wordArray = CryptoJS.enc.Base64.parse(base64String);
+ */
+ parse: function (base64Str) {
+ // Shortcuts
+ var base64StrLength = base64Str.length;
+ var map = this._map;
+ var reverseMap = this._reverseMap;
+
+ if (!reverseMap) {
+ reverseMap = this._reverseMap = [];
+ for (var j = 0; j < map.length; j++) {
+ reverseMap[map.charCodeAt(j)] = j;
+ }
+ }
+
+ // Ignore padding
+ var paddingChar = map.charAt(64);
+ if (paddingChar) {
+ var paddingIndex = base64Str.indexOf(paddingChar);
+ if (paddingIndex !== -1) {
+ base64StrLength = paddingIndex;
+ }
+ }
+
+ // Convert
+ return parseLoop(base64Str, base64StrLength, reverseMap);
+
+ },
+
+ _map: 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/='
+ };
+
+ function parseLoop(base64Str, base64StrLength, reverseMap) {
+ var words = [];
+ var nBytes = 0;
+ for (var i = 0; i < base64StrLength; i++) {
+ if (i % 4) {
+ var bits1 = reverseMap[base64Str.charCodeAt(i - 1)] << ((i % 4) * 2);
+ var bits2 = reverseMap[base64Str.charCodeAt(i)] >>> (6 - (i % 4) * 2);
+ var bitsCombined = bits1 | bits2;
+ words[nBytes >>> 2] |= bitsCombined << (24 - (nBytes % 4) * 8);
+ nBytes++;
+ }
+ }
+ return WordArray.create(words, nBytes);
+ }
+ }());
+
+
+ (function () {
+ // Shortcuts
+ var C = CryptoJS;
+ var C_lib = C.lib;
+ var WordArray = C_lib.WordArray;
+ var C_enc = C.enc;
+
+ /**
+ * Base64url encoding strategy.
+ */
+ var Base64url = C_enc.Base64url = {
+ /**
+ * Converts a word array to a Base64url string.
+ *
+ * @param {WordArray} wordArray The word array.
+ *
+ * @param {boolean} urlSafe Whether to use url safe
+ *
+ * @return {string} The Base64url string.
+ *
+ * @static
+ *
+ * @example
+ *
+ * var base64String = CryptoJS.enc.Base64url.stringify(wordArray);
+ */
+ stringify: function (wordArray, urlSafe=true) {
+ // Shortcuts
+ var words = wordArray.words;
+ var sigBytes = wordArray.sigBytes;
+ var map = urlSafe ? this._safe_map : this._map;
+
+ // Clamp excess bits
+ wordArray.clamp();
+
+ // Convert
+ var base64Chars = [];
+ for (var i = 0; i < sigBytes; i += 3) {
+ var byte1 = (words[i >>> 2] >>> (24 - (i % 4) * 8)) & 0xff;
+ var byte2 = (words[(i + 1) >>> 2] >>> (24 - ((i + 1) % 4) * 8)) & 0xff;
+ var byte3 = (words[(i + 2) >>> 2] >>> (24 - ((i + 2) % 4) * 8)) & 0xff;
+
+ var triplet = (byte1 << 16) | (byte2 << 8) | byte3;
+
+ for (var j = 0; (j < 4) && (i + j * 0.75 < sigBytes); j++) {
+ base64Chars.push(map.charAt((triplet >>> (6 * (3 - j))) & 0x3f));
+ }
+ }
+
+ // Add padding
+ var paddingChar = map.charAt(64);
+ if (paddingChar) {
+ while (base64Chars.length % 4) {
+ base64Chars.push(paddingChar);
+ }
+ }
+
+ return base64Chars.join('');
+ },
+
+ /**
+ * Converts a Base64url string to a word array.
+ *
+ * @param {string} base64Str The Base64url string.
+ *
+ * @param {boolean} urlSafe Whether to use url safe
+ *
+ * @return {WordArray} The word array.
+ *
+ * @static
+ *
+ * @example
+ *
+ * var wordArray = CryptoJS.enc.Base64url.parse(base64String);
+ */
+ parse: function (base64Str, urlSafe=true) {
+ // Shortcuts
+ var base64StrLength = base64Str.length;
+ var map = urlSafe ? this._safe_map : this._map;
+ var reverseMap = this._reverseMap;
+
+ if (!reverseMap) {
+ reverseMap = this._reverseMap = [];
+ for (var j = 0; j < map.length; j++) {
+ reverseMap[map.charCodeAt(j)] = j;
+ }
+ }
+
+ // Ignore padding
+ var paddingChar = map.charAt(64);
+ if (paddingChar) {
+ var paddingIndex = base64Str.indexOf(paddingChar);
+ if (paddingIndex !== -1) {
+ base64StrLength = paddingIndex;
+ }
+ }
+
+ // Convert
+ return parseLoop(base64Str, base64StrLength, reverseMap);
+
+ },
+
+ _map: 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=',
+ _safe_map: 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-_',
+ };
+
+ function parseLoop(base64Str, base64StrLength, reverseMap) {
+ var words = [];
+ var nBytes = 0;
+ for (var i = 0; i < base64StrLength; i++) {
+ if (i % 4) {
+ var bits1 = reverseMap[base64Str.charCodeAt(i - 1)] << ((i % 4) * 2);
+ var bits2 = reverseMap[base64Str.charCodeAt(i)] >>> (6 - (i % 4) * 2);
+ var bitsCombined = bits1 | bits2;
+ words[nBytes >>> 2] |= bitsCombined << (24 - (nBytes % 4) * 8);
+ nBytes++;
+ }
+ }
+ return WordArray.create(words, nBytes);
+ }
+ }());
+
+ (function (Math) {
+ // Shortcuts
+ var C = CryptoJS;
+ var C_lib = C.lib;
+ var WordArray = C_lib.WordArray;
+ var Hasher = C_lib.Hasher;
+ var C_algo = C.algo;
+
+ // Constants table
+ var T = [];
+
+ // Compute constants
+ (function () {
+ for (var i = 0; i < 64; i++) {
+ T[i] = (Math.abs(Math.sin(i + 1)) * 0x100000000) | 0;
+ }
+ }());
+
+ /**
+ * MD5 hash algorithm.
+ */
+ var MD5 = C_algo.MD5 = Hasher.extend({
+ _doReset: function () {
+ this._hash = new WordArray.init([
+ 0x67452301, 0xefcdab89,
+ 0x98badcfe, 0x10325476
+ ]);
+ },
+
+ _doProcessBlock: function (M, offset) {
+ // Swap endian
+ for (var i = 0; i < 16; i++) {
+ // Shortcuts
+ var offset_i = offset + i;
+ var M_offset_i = M[offset_i];
+
+ M[offset_i] = (
+ (((M_offset_i << 8) | (M_offset_i >>> 24)) & 0x00ff00ff) |
+ (((M_offset_i << 24) | (M_offset_i >>> 8)) & 0xff00ff00)
+ );
+ }
+
+ // Shortcuts
+ var H = this._hash.words;
+
+ var M_offset_0 = M[offset + 0];
+ var M_offset_1 = M[offset + 1];
+ var M_offset_2 = M[offset + 2];
+ var M_offset_3 = M[offset + 3];
+ var M_offset_4 = M[offset + 4];
+ var M_offset_5 = M[offset + 5];
+ var M_offset_6 = M[offset + 6];
+ var M_offset_7 = M[offset + 7];
+ var M_offset_8 = M[offset + 8];
+ var M_offset_9 = M[offset + 9];
+ var M_offset_10 = M[offset + 10];
+ var M_offset_11 = M[offset + 11];
+ var M_offset_12 = M[offset + 12];
+ var M_offset_13 = M[offset + 13];
+ var M_offset_14 = M[offset + 14];
+ var M_offset_15 = M[offset + 15];
+
+ // Working varialbes
+ var a = H[0];
+ var b = H[1];
+ var c = H[2];
+ var d = H[3];
+
+ // Computation
+ a = FF(a, b, c, d, M_offset_0, 7, T[0]);
+ d = FF(d, a, b, c, M_offset_1, 12, T[1]);
+ c = FF(c, d, a, b, M_offset_2, 17, T[2]);
+ b = FF(b, c, d, a, M_offset_3, 22, T[3]);
+ a = FF(a, b, c, d, M_offset_4, 7, T[4]);
+ d = FF(d, a, b, c, M_offset_5, 12, T[5]);
+ c = FF(c, d, a, b, M_offset_6, 17, T[6]);
+ b = FF(b, c, d, a, M_offset_7, 22, T[7]);
+ a = FF(a, b, c, d, M_offset_8, 7, T[8]);
+ d = FF(d, a, b, c, M_offset_9, 12, T[9]);
+ c = FF(c, d, a, b, M_offset_10, 17, T[10]);
+ b = FF(b, c, d, a, M_offset_11, 22, T[11]);
+ a = FF(a, b, c, d, M_offset_12, 7, T[12]);
+ d = FF(d, a, b, c, M_offset_13, 12, T[13]);
+ c = FF(c, d, a, b, M_offset_14, 17, T[14]);
+ b = FF(b, c, d, a, M_offset_15, 22, T[15]);
+
+ a = GG(a, b, c, d, M_offset_1, 5, T[16]);
+ d = GG(d, a, b, c, M_offset_6, 9, T[17]);
+ c = GG(c, d, a, b, M_offset_11, 14, T[18]);
+ b = GG(b, c, d, a, M_offset_0, 20, T[19]);
+ a = GG(a, b, c, d, M_offset_5, 5, T[20]);
+ d = GG(d, a, b, c, M_offset_10, 9, T[21]);
+ c = GG(c, d, a, b, M_offset_15, 14, T[22]);
+ b = GG(b, c, d, a, M_offset_4, 20, T[23]);
+ a = GG(a, b, c, d, M_offset_9, 5, T[24]);
+ d = GG(d, a, b, c, M_offset_14, 9, T[25]);
+ c = GG(c, d, a, b, M_offset_3, 14, T[26]);
+ b = GG(b, c, d, a, M_offset_8, 20, T[27]);
+ a = GG(a, b, c, d, M_offset_13, 5, T[28]);
+ d = GG(d, a, b, c, M_offset_2, 9, T[29]);
+ c = GG(c, d, a, b, M_offset_7, 14, T[30]);
+ b = GG(b, c, d, a, M_offset_12, 20, T[31]);
+
+ a = HH(a, b, c, d, M_offset_5, 4, T[32]);
+ d = HH(d, a, b, c, M_offset_8, 11, T[33]);
+ c = HH(c, d, a, b, M_offset_11, 16, T[34]);
+ b = HH(b, c, d, a, M_offset_14, 23, T[35]);
+ a = HH(a, b, c, d, M_offset_1, 4, T[36]);
+ d = HH(d, a, b, c, M_offset_4, 11, T[37]);
+ c = HH(c, d, a, b, M_offset_7, 16, T[38]);
+ b = HH(b, c, d, a, M_offset_10, 23, T[39]);
+ a = HH(a, b, c, d, M_offset_13, 4, T[40]);
+ d = HH(d, a, b, c, M_offset_0, 11, T[41]);
+ c = HH(c, d, a, b, M_offset_3, 16, T[42]);
+ b = HH(b, c, d, a, M_offset_6, 23, T[43]);
+ a = HH(a, b, c, d, M_offset_9, 4, T[44]);
+ d = HH(d, a, b, c, M_offset_12, 11, T[45]);
+ c = HH(c, d, a, b, M_offset_15, 16, T[46]);
+ b = HH(b, c, d, a, M_offset_2, 23, T[47]);
+
+ a = II(a, b, c, d, M_offset_0, 6, T[48]);
+ d = II(d, a, b, c, M_offset_7, 10, T[49]);
+ c = II(c, d, a, b, M_offset_14, 15, T[50]);
+ b = II(b, c, d, a, M_offset_5, 21, T[51]);
+ a = II(a, b, c, d, M_offset_12, 6, T[52]);
+ d = II(d, a, b, c, M_offset_3, 10, T[53]);
+ c = II(c, d, a, b, M_offset_10, 15, T[54]);
+ b = II(b, c, d, a, M_offset_1, 21, T[55]);
+ a = II(a, b, c, d, M_offset_8, 6, T[56]);
+ d = II(d, a, b, c, M_offset_15, 10, T[57]);
+ c = II(c, d, a, b, M_offset_6, 15, T[58]);
+ b = II(b, c, d, a, M_offset_13, 21, T[59]);
+ a = II(a, b, c, d, M_offset_4, 6, T[60]);
+ d = II(d, a, b, c, M_offset_11, 10, T[61]);
+ c = II(c, d, a, b, M_offset_2, 15, T[62]);
+ b = II(b, c, d, a, M_offset_9, 21, T[63]);
+
+ // Intermediate hash value
+ H[0] = (H[0] + a) | 0;
+ H[1] = (H[1] + b) | 0;
+ H[2] = (H[2] + c) | 0;
+ H[3] = (H[3] + d) | 0;
+ },
+
+ _doFinalize: function () {
+ // Shortcuts
+ var data = this._data;
+ var dataWords = data.words;
+
+ var nBitsTotal = this._nDataBytes * 8;
+ var nBitsLeft = data.sigBytes * 8;
+
+ // Add padding
+ dataWords[nBitsLeft >>> 5] |= 0x80 << (24 - nBitsLeft % 32);
+
+ var nBitsTotalH = Math.floor(nBitsTotal / 0x100000000);
+ var nBitsTotalL = nBitsTotal;
+ dataWords[(((nBitsLeft + 64) >>> 9) << 4) + 15] = (
+ (((nBitsTotalH << 8) | (nBitsTotalH >>> 24)) & 0x00ff00ff) |
+ (((nBitsTotalH << 24) | (nBitsTotalH >>> 8)) & 0xff00ff00)
+ );
+ dataWords[(((nBitsLeft + 64) >>> 9) << 4) + 14] = (
+ (((nBitsTotalL << 8) | (nBitsTotalL >>> 24)) & 0x00ff00ff) |
+ (((nBitsTotalL << 24) | (nBitsTotalL >>> 8)) & 0xff00ff00)
+ );
+
+ data.sigBytes = (dataWords.length + 1) * 4;
+
+ // Hash final blocks
+ this._process();
+
+ // Shortcuts
+ var hash = this._hash;
+ var H = hash.words;
+
+ // Swap endian
+ for (var i = 0; i < 4; i++) {
+ // Shortcut
+ var H_i = H[i];
+
+ H[i] = (((H_i << 8) | (H_i >>> 24)) & 0x00ff00ff) |
+ (((H_i << 24) | (H_i >>> 8)) & 0xff00ff00);
+ }
+
+ // Return final computed hash
+ return hash;
+ },
+
+ clone: function () {
+ var clone = Hasher.clone.call(this);
+ clone._hash = this._hash.clone();
+
+ return clone;
+ }
+ });
+
+ function FF(a, b, c, d, x, s, t) {
+ var n = a + ((b & c) | (~b & d)) + x + t;
+ return ((n << s) | (n >>> (32 - s))) + b;
+ }
+
+ function GG(a, b, c, d, x, s, t) {
+ var n = a + ((b & d) | (c & ~d)) + x + t;
+ return ((n << s) | (n >>> (32 - s))) + b;
+ }
+
+ function HH(a, b, c, d, x, s, t) {
+ var n = a + (b ^ c ^ d) + x + t;
+ return ((n << s) | (n >>> (32 - s))) + b;
+ }
+
+ function II(a, b, c, d, x, s, t) {
+ var n = a + (c ^ (b | ~d)) + x + t;
+ return ((n << s) | (n >>> (32 - s))) + b;
+ }
+
+ /**
+ * Shortcut function to the hasher's object interface.
+ *
+ * @param {WordArray|string} message The message to hash.
+ *
+ * @return {WordArray} The hash.
+ *
+ * @static
+ *
+ * @example
+ *
+ * var hash = CryptoJS.MD5('message');
+ * var hash = CryptoJS.MD5(wordArray);
+ */
+ C.MD5 = Hasher._createHelper(MD5);
+
+ /**
+ * Shortcut function to the HMAC's object interface.
+ *
+ * @param {WordArray|string} message The message to hash.
+ * @param {WordArray|string} key The secret key.
+ *
+ * @return {WordArray} The HMAC.
+ *
+ * @static
+ *
+ * @example
+ *
+ * var hmac = CryptoJS.HmacMD5(message, key);
+ */
+ C.HmacMD5 = Hasher._createHmacHelper(MD5);
+ }(Math));
+
+
+ (function () {
+ // Shortcuts
+ var C = CryptoJS;
+ var C_lib = C.lib;
+ var WordArray = C_lib.WordArray;
+ var Hasher = C_lib.Hasher;
+ var C_algo = C.algo;
+
+ // Reusable object
+ var W = [];
+
+ /**
+ * SHA-1 hash algorithm.
+ */
+ var SHA1 = C_algo.SHA1 = Hasher.extend({
+ _doReset: function () {
+ this._hash = new WordArray.init([
+ 0x67452301, 0xefcdab89,
+ 0x98badcfe, 0x10325476,
+ 0xc3d2e1f0
+ ]);
+ },
+
+ _doProcessBlock: function (M, offset) {
+ // Shortcut
+ var H = this._hash.words;
+
+ // Working variables
+ var a = H[0];
+ var b = H[1];
+ var c = H[2];
+ var d = H[3];
+ var e = H[4];
+
+ // Computation
+ for (var i = 0; i < 80; i++) {
+ if (i < 16) {
+ W[i] = M[offset + i] | 0;
+ } else {
+ var n = W[i - 3] ^ W[i - 8] ^ W[i - 14] ^ W[i - 16];
+ W[i] = (n << 1) | (n >>> 31);
+ }
+
+ var t = ((a << 5) | (a >>> 27)) + e + W[i];
+ if (i < 20) {
+ t += ((b & c) | (~b & d)) + 0x5a827999;
+ } else if (i < 40) {
+ t += (b ^ c ^ d) + 0x6ed9eba1;
+ } else if (i < 60) {
+ t += ((b & c) | (b & d) | (c & d)) - 0x70e44324;
+ } else /* if (i < 80) */ {
+ t += (b ^ c ^ d) - 0x359d3e2a;
+ }
+
+ e = d;
+ d = c;
+ c = (b << 30) | (b >>> 2);
+ b = a;
+ a = t;
+ }
+
+ // Intermediate hash value
+ H[0] = (H[0] + a) | 0;
+ H[1] = (H[1] + b) | 0;
+ H[2] = (H[2] + c) | 0;
+ H[3] = (H[3] + d) | 0;
+ H[4] = (H[4] + e) | 0;
+ },
+
+ _doFinalize: function () {
+ // Shortcuts
+ var data = this._data;
+ var dataWords = data.words;
+
+ var nBitsTotal = this._nDataBytes * 8;
+ var nBitsLeft = data.sigBytes * 8;
+
+ // Add padding
+ dataWords[nBitsLeft >>> 5] |= 0x80 << (24 - nBitsLeft % 32);
+ dataWords[(((nBitsLeft + 64) >>> 9) << 4) + 14] = Math.floor(nBitsTotal / 0x100000000);
+ dataWords[(((nBitsLeft + 64) >>> 9) << 4) + 15] = nBitsTotal;
+ data.sigBytes = dataWords.length * 4;
+
+ // Hash final blocks
+ this._process();
+
+ // Return final computed hash
+ return this._hash;
+ },
+
+ clone: function () {
+ var clone = Hasher.clone.call(this);
+ clone._hash = this._hash.clone();
+
+ return clone;
+ }
+ });
+
+ /**
+ * Shortcut function to the hasher's object interface.
+ *
+ * @param {WordArray|string} message The message to hash.
+ *
+ * @return {WordArray} The hash.
+ *
+ * @static
+ *
+ * @example
+ *
+ * var hash = CryptoJS.SHA1('message');
+ * var hash = CryptoJS.SHA1(wordArray);
+ */
+ C.SHA1 = Hasher._createHelper(SHA1);
+
+ /**
+ * Shortcut function to the HMAC's object interface.
+ *
+ * @param {WordArray|string} message The message to hash.
+ * @param {WordArray|string} key The secret key.
+ *
+ * @return {WordArray} The HMAC.
+ *
+ * @static
+ *
+ * @example
+ *
+ * var hmac = CryptoJS.HmacSHA1(message, key);
+ */
+ C.HmacSHA1 = Hasher._createHmacHelper(SHA1);
+ }());
+
+
+ (function (Math) {
+ // Shortcuts
+ var C = CryptoJS;
+ var C_lib = C.lib;
+ var WordArray = C_lib.WordArray;
+ var Hasher = C_lib.Hasher;
+ var C_algo = C.algo;
+
+ // Initialization and round constants tables
+ var H = [];
+ var K = [];
+
+ // Compute constants
+ (function () {
+ function isPrime(n) {
+ var sqrtN = Math.sqrt(n);
+ for (var factor = 2; factor <= sqrtN; factor++) {
+ if (!(n % factor)) {
+ return false;
+ }
+ }
+
+ return true;
+ }
+
+ function getFractionalBits(n) {
+ return ((n - (n | 0)) * 0x100000000) | 0;
+ }
+
+ var n = 2;
+ var nPrime = 0;
+ while (nPrime < 64) {
+ if (isPrime(n)) {
+ if (nPrime < 8) {
+ H[nPrime] = getFractionalBits(Math.pow(n, 1 / 2));
+ }
+ K[nPrime] = getFractionalBits(Math.pow(n, 1 / 3));
+
+ nPrime++;
+ }
+
+ n++;
+ }
+ }());
+
+ // Reusable object
+ var W = [];
+
+ /**
+ * SHA-256 hash algorithm.
+ */
+ var SHA256 = C_algo.SHA256 = Hasher.extend({
+ _doReset: function () {
+ this._hash = new WordArray.init(H.slice(0));
+ },
+
+ _doProcessBlock: function (M, offset) {
+ // Shortcut
+ var H = this._hash.words;
+
+ // Working variables
+ var a = H[0];
+ var b = H[1];
+ var c = H[2];
+ var d = H[3];
+ var e = H[4];
+ var f = H[5];
+ var g = H[6];
+ var h = H[7];
+
+ // Computation
+ for (var i = 0; i < 64; i++) {
+ if (i < 16) {
+ W[i] = M[offset + i] | 0;
+ } else {
+ var gamma0x = W[i - 15];
+ var gamma0 = ((gamma0x << 25) | (gamma0x >>> 7)) ^
+ ((gamma0x << 14) | (gamma0x >>> 18)) ^
+ (gamma0x >>> 3);
+
+ var gamma1x = W[i - 2];
+ var gamma1 = ((gamma1x << 15) | (gamma1x >>> 17)) ^
+ ((gamma1x << 13) | (gamma1x >>> 19)) ^
+ (gamma1x >>> 10);
+
+ W[i] = gamma0 + W[i - 7] + gamma1 + W[i - 16];
+ }
+
+ var ch = (e & f) ^ (~e & g);
+ var maj = (a & b) ^ (a & c) ^ (b & c);
+
+ var sigma0 = ((a << 30) | (a >>> 2)) ^ ((a << 19) | (a >>> 13)) ^ ((a << 10) | (a >>> 22));
+ var sigma1 = ((e << 26) | (e >>> 6)) ^ ((e << 21) | (e >>> 11)) ^ ((e << 7) | (e >>> 25));
+
+ var t1 = h + sigma1 + ch + K[i] + W[i];
+ var t2 = sigma0 + maj;
+
+ h = g;
+ g = f;
+ f = e;
+ e = (d + t1) | 0;
+ d = c;
+ c = b;
+ b = a;
+ a = (t1 + t2) | 0;
+ }
+
+ // Intermediate hash value
+ H[0] = (H[0] + a) | 0;
+ H[1] = (H[1] + b) | 0;
+ H[2] = (H[2] + c) | 0;
+ H[3] = (H[3] + d) | 0;
+ H[4] = (H[4] + e) | 0;
+ H[5] = (H[5] + f) | 0;
+ H[6] = (H[6] + g) | 0;
+ H[7] = (H[7] + h) | 0;
+ },
+
+ _doFinalize: function () {
+ // Shortcuts
+ var data = this._data;
+ var dataWords = data.words;
+
+ var nBitsTotal = this._nDataBytes * 8;
+ var nBitsLeft = data.sigBytes * 8;
+
+ // Add padding
+ dataWords[nBitsLeft >>> 5] |= 0x80 << (24 - nBitsLeft % 32);
+ dataWords[(((nBitsLeft + 64) >>> 9) << 4) + 14] = Math.floor(nBitsTotal / 0x100000000);
+ dataWords[(((nBitsLeft + 64) >>> 9) << 4) + 15] = nBitsTotal;
+ data.sigBytes = dataWords.length * 4;
+
+ // Hash final blocks
+ this._process();
+
+ // Return final computed hash
+ return this._hash;
+ },
+
+ clone: function () {
+ var clone = Hasher.clone.call(this);
+ clone._hash = this._hash.clone();
+
+ return clone;
+ }
+ });
+
+ /**
+ * Shortcut function to the hasher's object interface.
+ *
+ * @param {WordArray|string} message The message to hash.
+ *
+ * @return {WordArray} The hash.
+ *
+ * @static
+ *
+ * @example
+ *
+ * var hash = CryptoJS.SHA256('message');
+ * var hash = CryptoJS.SHA256(wordArray);
+ */
+ C.SHA256 = Hasher._createHelper(SHA256);
+
+ /**
+ * Shortcut function to the HMAC's object interface.
+ *
+ * @param {WordArray|string} message The message to hash.
+ * @param {WordArray|string} key The secret key.
+ *
+ * @return {WordArray} The HMAC.
+ *
+ * @static
+ *
+ * @example
+ *
+ * var hmac = CryptoJS.HmacSHA256(message, key);
+ */
+ C.HmacSHA256 = Hasher._createHmacHelper(SHA256);
+ }(Math));
+
+
+ (function () {
+ // Shortcuts
+ var C = CryptoJS;
+ var C_lib = C.lib;
+ var WordArray = C_lib.WordArray;
+ var C_algo = C.algo;
+ var SHA256 = C_algo.SHA256;
+
+ /**
+ * SHA-224 hash algorithm.
+ */
+ var SHA224 = C_algo.SHA224 = SHA256.extend({
+ _doReset: function () {
+ this._hash = new WordArray.init([
+ 0xc1059ed8, 0x367cd507, 0x3070dd17, 0xf70e5939,
+ 0xffc00b31, 0x68581511, 0x64f98fa7, 0xbefa4fa4
+ ]);
+ },
+
+ _doFinalize: function () {
+ var hash = SHA256._doFinalize.call(this);
+
+ hash.sigBytes -= 4;
+
+ return hash;
+ }
+ });
+
+ /**
+ * Shortcut function to the hasher's object interface.
+ *
+ * @param {WordArray|string} message The message to hash.
+ *
+ * @return {WordArray} The hash.
+ *
+ * @static
+ *
+ * @example
+ *
+ * var hash = CryptoJS.SHA224('message');
+ * var hash = CryptoJS.SHA224(wordArray);
+ */
+ C.SHA224 = SHA256._createHelper(SHA224);
+
+ /**
+ * Shortcut function to the HMAC's object interface.
+ *
+ * @param {WordArray|string} message The message to hash.
+ * @param {WordArray|string} key The secret key.
+ *
+ * @return {WordArray} The HMAC.
+ *
+ * @static
+ *
+ * @example
+ *
+ * var hmac = CryptoJS.HmacSHA224(message, key);
+ */
+ C.HmacSHA224 = SHA256._createHmacHelper(SHA224);
+ }());
+
+
+ (function () {
+ // Shortcuts
+ var C = CryptoJS;
+ var C_lib = C.lib;
+ var Hasher = C_lib.Hasher;
+ var C_x64 = C.x64;
+ var X64Word = C_x64.Word;
+ var X64WordArray = C_x64.WordArray;
+ var C_algo = C.algo;
+
+ function X64Word_create() {
+ return X64Word.create.apply(X64Word, arguments);
+ }
+
+ // Constants
+ var K = [
+ X64Word_create(0x428a2f98, 0xd728ae22), X64Word_create(0x71374491, 0x23ef65cd),
+ X64Word_create(0xb5c0fbcf, 0xec4d3b2f), X64Word_create(0xe9b5dba5, 0x8189dbbc),
+ X64Word_create(0x3956c25b, 0xf348b538), X64Word_create(0x59f111f1, 0xb605d019),
+ X64Word_create(0x923f82a4, 0xaf194f9b), X64Word_create(0xab1c5ed5, 0xda6d8118),
+ X64Word_create(0xd807aa98, 0xa3030242), X64Word_create(0x12835b01, 0x45706fbe),
+ X64Word_create(0x243185be, 0x4ee4b28c), X64Word_create(0x550c7dc3, 0xd5ffb4e2),
+ X64Word_create(0x72be5d74, 0xf27b896f), X64Word_create(0x80deb1fe, 0x3b1696b1),
+ X64Word_create(0x9bdc06a7, 0x25c71235), X64Word_create(0xc19bf174, 0xcf692694),
+ X64Word_create(0xe49b69c1, 0x9ef14ad2), X64Word_create(0xefbe4786, 0x384f25e3),
+ X64Word_create(0x0fc19dc6, 0x8b8cd5b5), X64Word_create(0x240ca1cc, 0x77ac9c65),
+ X64Word_create(0x2de92c6f, 0x592b0275), X64Word_create(0x4a7484aa, 0x6ea6e483),
+ X64Word_create(0x5cb0a9dc, 0xbd41fbd4), X64Word_create(0x76f988da, 0x831153b5),
+ X64Word_create(0x983e5152, 0xee66dfab), X64Word_create(0xa831c66d, 0x2db43210),
+ X64Word_create(0xb00327c8, 0x98fb213f), X64Word_create(0xbf597fc7, 0xbeef0ee4),
+ X64Word_create(0xc6e00bf3, 0x3da88fc2), X64Word_create(0xd5a79147, 0x930aa725),
+ X64Word_create(0x06ca6351, 0xe003826f), X64Word_create(0x14292967, 0x0a0e6e70),
+ X64Word_create(0x27b70a85, 0x46d22ffc), X64Word_create(0x2e1b2138, 0x5c26c926),
+ X64Word_create(0x4d2c6dfc, 0x5ac42aed), X64Word_create(0x53380d13, 0x9d95b3df),
+ X64Word_create(0x650a7354, 0x8baf63de), X64Word_create(0x766a0abb, 0x3c77b2a8),
+ X64Word_create(0x81c2c92e, 0x47edaee6), X64Word_create(0x92722c85, 0x1482353b),
+ X64Word_create(0xa2bfe8a1, 0x4cf10364), X64Word_create(0xa81a664b, 0xbc423001),
+ X64Word_create(0xc24b8b70, 0xd0f89791), X64Word_create(0xc76c51a3, 0x0654be30),
+ X64Word_create(0xd192e819, 0xd6ef5218), X64Word_create(0xd6990624, 0x5565a910),
+ X64Word_create(0xf40e3585, 0x5771202a), X64Word_create(0x106aa070, 0x32bbd1b8),
+ X64Word_create(0x19a4c116, 0xb8d2d0c8), X64Word_create(0x1e376c08, 0x5141ab53),
+ X64Word_create(0x2748774c, 0xdf8eeb99), X64Word_create(0x34b0bcb5, 0xe19b48a8),
+ X64Word_create(0x391c0cb3, 0xc5c95a63), X64Word_create(0x4ed8aa4a, 0xe3418acb),
+ X64Word_create(0x5b9cca4f, 0x7763e373), X64Word_create(0x682e6ff3, 0xd6b2b8a3),
+ X64Word_create(0x748f82ee, 0x5defb2fc), X64Word_create(0x78a5636f, 0x43172f60),
+ X64Word_create(0x84c87814, 0xa1f0ab72), X64Word_create(0x8cc70208, 0x1a6439ec),
+ X64Word_create(0x90befffa, 0x23631e28), X64Word_create(0xa4506ceb, 0xde82bde9),
+ X64Word_create(0xbef9a3f7, 0xb2c67915), X64Word_create(0xc67178f2, 0xe372532b),
+ X64Word_create(0xca273ece, 0xea26619c), X64Word_create(0xd186b8c7, 0x21c0c207),
+ X64Word_create(0xeada7dd6, 0xcde0eb1e), X64Word_create(0xf57d4f7f, 0xee6ed178),
+ X64Word_create(0x06f067aa, 0x72176fba), X64Word_create(0x0a637dc5, 0xa2c898a6),
+ X64Word_create(0x113f9804, 0xbef90dae), X64Word_create(0x1b710b35, 0x131c471b),
+ X64Word_create(0x28db77f5, 0x23047d84), X64Word_create(0x32caab7b, 0x40c72493),
+ X64Word_create(0x3c9ebe0a, 0x15c9bebc), X64Word_create(0x431d67c4, 0x9c100d4c),
+ X64Word_create(0x4cc5d4be, 0xcb3e42b6), X64Word_create(0x597f299c, 0xfc657e2a),
+ X64Word_create(0x5fcb6fab, 0x3ad6faec), X64Word_create(0x6c44198c, 0x4a475817)
+ ];
+
+ // Reusable objects
+ var W = [];
+ (function () {
+ for (var i = 0; i < 80; i++) {
+ W[i] = X64Word_create();
+ }
+ }());
+
+ /**
+ * SHA-512 hash algorithm.
+ */
+ var SHA512 = C_algo.SHA512 = Hasher.extend({
+ _doReset: function () {
+ this._hash = new X64WordArray.init([
+ new X64Word.init(0x6a09e667, 0xf3bcc908), new X64Word.init(0xbb67ae85, 0x84caa73b),
+ new X64Word.init(0x3c6ef372, 0xfe94f82b), new X64Word.init(0xa54ff53a, 0x5f1d36f1),
+ new X64Word.init(0x510e527f, 0xade682d1), new X64Word.init(0x9b05688c, 0x2b3e6c1f),
+ new X64Word.init(0x1f83d9ab, 0xfb41bd6b), new X64Word.init(0x5be0cd19, 0x137e2179)
+ ]);
+ },
+
+ _doProcessBlock: function (M, offset) {
+ // Shortcuts
+ var H = this._hash.words;
+
+ var H0 = H[0];
+ var H1 = H[1];
+ var H2 = H[2];
+ var H3 = H[3];
+ var H4 = H[4];
+ var H5 = H[5];
+ var H6 = H[6];
+ var H7 = H[7];
+
+ var H0h = H0.high;
+ var H0l = H0.low;
+ var H1h = H1.high;
+ var H1l = H1.low;
+ var H2h = H2.high;
+ var H2l = H2.low;
+ var H3h = H3.high;
+ var H3l = H3.low;
+ var H4h = H4.high;
+ var H4l = H4.low;
+ var H5h = H5.high;
+ var H5l = H5.low;
+ var H6h = H6.high;
+ var H6l = H6.low;
+ var H7h = H7.high;
+ var H7l = H7.low;
+
+ // Working variables
+ var ah = H0h;
+ var al = H0l;
+ var bh = H1h;
+ var bl = H1l;
+ var ch = H2h;
+ var cl = H2l;
+ var dh = H3h;
+ var dl = H3l;
+ var eh = H4h;
+ var el = H4l;
+ var fh = H5h;
+ var fl = H5l;
+ var gh = H6h;
+ var gl = H6l;
+ var hh = H7h;
+ var hl = H7l;
+
+ // Rounds
+ for (var i = 0; i < 80; i++) {
+ var Wil;
+ var Wih;
+
+ // Shortcut
+ var Wi = W[i];
+
+ // Extend message
+ if (i < 16) {
+ Wih = Wi.high = M[offset + i * 2] | 0;
+ Wil = Wi.low = M[offset + i * 2 + 1] | 0;
+ } else {
+ // Gamma0
+ var gamma0x = W[i - 15];
+ var gamma0xh = gamma0x.high;
+ var gamma0xl = gamma0x.low;
+ var gamma0h = ((gamma0xh >>> 1) | (gamma0xl << 31)) ^ ((gamma0xh >>> 8) | (gamma0xl << 24)) ^ (gamma0xh >>> 7);
+ var gamma0l = ((gamma0xl >>> 1) | (gamma0xh << 31)) ^ ((gamma0xl >>> 8) | (gamma0xh << 24)) ^ ((gamma0xl >>> 7) | (gamma0xh << 25));
+
+ // Gamma1
+ var gamma1x = W[i - 2];
+ var gamma1xh = gamma1x.high;
+ var gamma1xl = gamma1x.low;
+ var gamma1h = ((gamma1xh >>> 19) | (gamma1xl << 13)) ^ ((gamma1xh << 3) | (gamma1xl >>> 29)) ^ (gamma1xh >>> 6);
+ var gamma1l = ((gamma1xl >>> 19) | (gamma1xh << 13)) ^ ((gamma1xl << 3) | (gamma1xh >>> 29)) ^ ((gamma1xl >>> 6) | (gamma1xh << 26));
+
+ // W[i] = gamma0 + W[i - 7] + gamma1 + W[i - 16]
+ var Wi7 = W[i - 7];
+ var Wi7h = Wi7.high;
+ var Wi7l = Wi7.low;
+
+ var Wi16 = W[i - 16];
+ var Wi16h = Wi16.high;
+ var Wi16l = Wi16.low;
+
+ Wil = gamma0l + Wi7l;
+ Wih = gamma0h + Wi7h + ((Wil >>> 0) < (gamma0l >>> 0) ? 1 : 0);
+ Wil = Wil + gamma1l;
+ Wih = Wih + gamma1h + ((Wil >>> 0) < (gamma1l >>> 0) ? 1 : 0);
+ Wil = Wil + Wi16l;
+ Wih = Wih + Wi16h + ((Wil >>> 0) < (Wi16l >>> 0) ? 1 : 0);
+
+ Wi.high = Wih;
+ Wi.low = Wil;
+ }
+
+ var chh = (eh & fh) ^ (~eh & gh);
+ var chl = (el & fl) ^ (~el & gl);
+ var majh = (ah & bh) ^ (ah & ch) ^ (bh & ch);
+ var majl = (al & bl) ^ (al & cl) ^ (bl & cl);
+
+ var sigma0h = ((ah >>> 28) | (al << 4)) ^ ((ah << 30) | (al >>> 2)) ^ ((ah << 25) | (al >>> 7));
+ var sigma0l = ((al >>> 28) | (ah << 4)) ^ ((al << 30) | (ah >>> 2)) ^ ((al << 25) | (ah >>> 7));
+ var sigma1h = ((eh >>> 14) | (el << 18)) ^ ((eh >>> 18) | (el << 14)) ^ ((eh << 23) | (el >>> 9));
+ var sigma1l = ((el >>> 14) | (eh << 18)) ^ ((el >>> 18) | (eh << 14)) ^ ((el << 23) | (eh >>> 9));
+
+ // t1 = h + sigma1 + ch + K[i] + W[i]
+ var Ki = K[i];
+ var Kih = Ki.high;
+ var Kil = Ki.low;
+
+ var t1l = hl + sigma1l;
+ var t1h = hh + sigma1h + ((t1l >>> 0) < (hl >>> 0) ? 1 : 0);
+ var t1l = t1l + chl;
+ var t1h = t1h + chh + ((t1l >>> 0) < (chl >>> 0) ? 1 : 0);
+ var t1l = t1l + Kil;
+ var t1h = t1h + Kih + ((t1l >>> 0) < (Kil >>> 0) ? 1 : 0);
+ var t1l = t1l + Wil;
+ var t1h = t1h + Wih + ((t1l >>> 0) < (Wil >>> 0) ? 1 : 0);
+
+ // t2 = sigma0 + maj
+ var t2l = sigma0l + majl;
+ var t2h = sigma0h + majh + ((t2l >>> 0) < (sigma0l >>> 0) ? 1 : 0);
+
+ // Update working variables
+ hh = gh;
+ hl = gl;
+ gh = fh;
+ gl = fl;
+ fh = eh;
+ fl = el;
+ el = (dl + t1l) | 0;
+ eh = (dh + t1h + ((el >>> 0) < (dl >>> 0) ? 1 : 0)) | 0;
+ dh = ch;
+ dl = cl;
+ ch = bh;
+ cl = bl;
+ bh = ah;
+ bl = al;
+ al = (t1l + t2l) | 0;
+ ah = (t1h + t2h + ((al >>> 0) < (t1l >>> 0) ? 1 : 0)) | 0;
+ }
+
+ // Intermediate hash value
+ H0l = H0.low = (H0l + al);
+ H0.high = (H0h + ah + ((H0l >>> 0) < (al >>> 0) ? 1 : 0));
+ H1l = H1.low = (H1l + bl);
+ H1.high = (H1h + bh + ((H1l >>> 0) < (bl >>> 0) ? 1 : 0));
+ H2l = H2.low = (H2l + cl);
+ H2.high = (H2h + ch + ((H2l >>> 0) < (cl >>> 0) ? 1 : 0));
+ H3l = H3.low = (H3l + dl);
+ H3.high = (H3h + dh + ((H3l >>> 0) < (dl >>> 0) ? 1 : 0));
+ H4l = H4.low = (H4l + el);
+ H4.high = (H4h + eh + ((H4l >>> 0) < (el >>> 0) ? 1 : 0));
+ H5l = H5.low = (H5l + fl);
+ H5.high = (H5h + fh + ((H5l >>> 0) < (fl >>> 0) ? 1 : 0));
+ H6l = H6.low = (H6l + gl);
+ H6.high = (H6h + gh + ((H6l >>> 0) < (gl >>> 0) ? 1 : 0));
+ H7l = H7.low = (H7l + hl);
+ H7.high = (H7h + hh + ((H7l >>> 0) < (hl >>> 0) ? 1 : 0));
+ },
+
+ _doFinalize: function () {
+ // Shortcuts
+ var data = this._data;
+ var dataWords = data.words;
+
+ var nBitsTotal = this._nDataBytes * 8;
+ var nBitsLeft = data.sigBytes * 8;
+
+ // Add padding
+ dataWords[nBitsLeft >>> 5] |= 0x80 << (24 - nBitsLeft % 32);
+ dataWords[(((nBitsLeft + 128) >>> 10) << 5) + 30] = Math.floor(nBitsTotal / 0x100000000);
+ dataWords[(((nBitsLeft + 128) >>> 10) << 5) + 31] = nBitsTotal;
+ data.sigBytes = dataWords.length * 4;
+
+ // Hash final blocks
+ this._process();
+
+ // Convert hash to 32-bit word array before returning
+ var hash = this._hash.toX32();
+
+ // Return final computed hash
+ return hash;
+ },
+
+ clone: function () {
+ var clone = Hasher.clone.call(this);
+ clone._hash = this._hash.clone();
+
+ return clone;
+ },
+
+ blockSize: 1024/32
+ });
+
+ /**
+ * Shortcut function to the hasher's object interface.
+ *
+ * @param {WordArray|string} message The message to hash.
+ *
+ * @return {WordArray} The hash.
+ *
+ * @static
+ *
+ * @example
+ *
+ * var hash = CryptoJS.SHA512('message');
+ * var hash = CryptoJS.SHA512(wordArray);
+ */
+ C.SHA512 = Hasher._createHelper(SHA512);
+
+ /**
+ * Shortcut function to the HMAC's object interface.
+ *
+ * @param {WordArray|string} message The message to hash.
+ * @param {WordArray|string} key The secret key.
+ *
+ * @return {WordArray} The HMAC.
+ *
+ * @static
+ *
+ * @example
+ *
+ * var hmac = CryptoJS.HmacSHA512(message, key);
+ */
+ C.HmacSHA512 = Hasher._createHmacHelper(SHA512);
+ }());
+
+
+ (function () {
+ // Shortcuts
+ var C = CryptoJS;
+ var C_x64 = C.x64;
+ var X64Word = C_x64.Word;
+ var X64WordArray = C_x64.WordArray;
+ var C_algo = C.algo;
+ var SHA512 = C_algo.SHA512;
+
+ /**
+ * SHA-384 hash algorithm.
+ */
+ var SHA384 = C_algo.SHA384 = SHA512.extend({
+ _doReset: function () {
+ this._hash = new X64WordArray.init([
+ new X64Word.init(0xcbbb9d5d, 0xc1059ed8), new X64Word.init(0x629a292a, 0x367cd507),
+ new X64Word.init(0x9159015a, 0x3070dd17), new X64Word.init(0x152fecd8, 0xf70e5939),
+ new X64Word.init(0x67332667, 0xffc00b31), new X64Word.init(0x8eb44a87, 0x68581511),
+ new X64Word.init(0xdb0c2e0d, 0x64f98fa7), new X64Word.init(0x47b5481d, 0xbefa4fa4)
+ ]);
+ },
+
+ _doFinalize: function () {
+ var hash = SHA512._doFinalize.call(this);
+
+ hash.sigBytes -= 16;
+
+ return hash;
+ }
+ });
+
+ /**
+ * Shortcut function to the hasher's object interface.
+ *
+ * @param {WordArray|string} message The message to hash.
+ *
+ * @return {WordArray} The hash.
+ *
+ * @static
+ *
+ * @example
+ *
+ * var hash = CryptoJS.SHA384('message');
+ * var hash = CryptoJS.SHA384(wordArray);
+ */
+ C.SHA384 = SHA512._createHelper(SHA384);
+
+ /**
+ * Shortcut function to the HMAC's object interface.
+ *
+ * @param {WordArray|string} message The message to hash.
+ * @param {WordArray|string} key The secret key.
+ *
+ * @return {WordArray} The HMAC.
+ *
+ * @static
+ *
+ * @example
+ *
+ * var hmac = CryptoJS.HmacSHA384(message, key);
+ */
+ C.HmacSHA384 = SHA512._createHmacHelper(SHA384);
+ }());
+
+
+ (function (Math) {
+ // Shortcuts
+ var C = CryptoJS;
+ var C_lib = C.lib;
+ var WordArray = C_lib.WordArray;
+ var Hasher = C_lib.Hasher;
+ var C_x64 = C.x64;
+ var X64Word = C_x64.Word;
+ var C_algo = C.algo;
+
+ // Constants tables
+ var RHO_OFFSETS = [];
+ var PI_INDEXES = [];
+ var ROUND_CONSTANTS = [];
+
+ // Compute Constants
+ (function () {
+ // Compute rho offset constants
+ var x = 1, y = 0;
+ for (var t = 0; t < 24; t++) {
+ RHO_OFFSETS[x + 5 * y] = ((t + 1) * (t + 2) / 2) % 64;
+
+ var newX = y % 5;
+ var newY = (2 * x + 3 * y) % 5;
+ x = newX;
+ y = newY;
+ }
+
+ // Compute pi index constants
+ for (var x = 0; x < 5; x++) {
+ for (var y = 0; y < 5; y++) {
+ PI_INDEXES[x + 5 * y] = y + ((2 * x + 3 * y) % 5) * 5;
+ }
+ }
+
+ // Compute round constants
+ var LFSR = 0x01;
+ for (var i = 0; i < 24; i++) {
+ var roundConstantMsw = 0;
+ var roundConstantLsw = 0;
+
+ for (var j = 0; j < 7; j++) {
+ if (LFSR & 0x01) {
+ var bitPosition = (1 << j) - 1;
+ if (bitPosition < 32) {
+ roundConstantLsw ^= 1 << bitPosition;
+ } else /* if (bitPosition >= 32) */ {
+ roundConstantMsw ^= 1 << (bitPosition - 32);
+ }
+ }
+
+ // Compute next LFSR
+ if (LFSR & 0x80) {
+ // Primitive polynomial over GF(2): x^8 + x^6 + x^5 + x^4 + 1
+ LFSR = (LFSR << 1) ^ 0x71;
+ } else {
+ LFSR <<= 1;
+ }
+ }
+
+ ROUND_CONSTANTS[i] = X64Word.create(roundConstantMsw, roundConstantLsw);
+ }
+ }());
+
+ // Reusable objects for temporary values
+ var T = [];
+ (function () {
+ for (var i = 0; i < 25; i++) {
+ T[i] = X64Word.create();
+ }
+ }());
+
+ /**
+ * SHA-3 hash algorithm.
+ */
+ var SHA3 = C_algo.SHA3 = Hasher.extend({
+ /**
+ * Configuration options.
+ *
+ * @property {number} outputLength
+ * The desired number of bits in the output hash.
+ * Only values permitted are: 224, 256, 384, 512.
+ * Default: 512
+ */
+ cfg: Hasher.cfg.extend({
+ outputLength: 512
+ }),
+
+ _doReset: function () {
+ var state = this._state = []
+ for (var i = 0; i < 25; i++) {
+ state[i] = new X64Word.init();
+ }
+
+ this.blockSize = (1600 - 2 * this.cfg.outputLength) / 32;
+ },
+
+ _doProcessBlock: function (M, offset) {
+ // Shortcuts
+ var state = this._state;
+ var nBlockSizeLanes = this.blockSize / 2;
+
+ // Absorb
+ for (var i = 0; i < nBlockSizeLanes; i++) {
+ // Shortcuts
+ var M2i = M[offset + 2 * i];
+ var M2i1 = M[offset + 2 * i + 1];
+
+ // Swap endian
+ M2i = (
+ (((M2i << 8) | (M2i >>> 24)) & 0x00ff00ff) |
+ (((M2i << 24) | (M2i >>> 8)) & 0xff00ff00)
+ );
+ M2i1 = (
+ (((M2i1 << 8) | (M2i1 >>> 24)) & 0x00ff00ff) |
+ (((M2i1 << 24) | (M2i1 >>> 8)) & 0xff00ff00)
+ );
+
+ // Absorb message into state
+ var lane = state[i];
+ lane.high ^= M2i1;
+ lane.low ^= M2i;
+ }
+
+ // Rounds
+ for (var round = 0; round < 24; round++) {
+ // Theta
+ for (var x = 0; x < 5; x++) {
+ // Mix column lanes
+ var tMsw = 0, tLsw = 0;
+ for (var y = 0; y < 5; y++) {
+ var lane = state[x + 5 * y];
+ tMsw ^= lane.high;
+ tLsw ^= lane.low;
+ }
+
+ // Temporary values
+ var Tx = T[x];
+ Tx.high = tMsw;
+ Tx.low = tLsw;
+ }
+ for (var x = 0; x < 5; x++) {
+ // Shortcuts
+ var Tx4 = T[(x + 4) % 5];
+ var Tx1 = T[(x + 1) % 5];
+ var Tx1Msw = Tx1.high;
+ var Tx1Lsw = Tx1.low;
+
+ // Mix surrounding columns
+ var tMsw = Tx4.high ^ ((Tx1Msw << 1) | (Tx1Lsw >>> 31));
+ var tLsw = Tx4.low ^ ((Tx1Lsw << 1) | (Tx1Msw >>> 31));
+ for (var y = 0; y < 5; y++) {
+ var lane = state[x + 5 * y];
+ lane.high ^= tMsw;
+ lane.low ^= tLsw;
+ }
+ }
+
+ // Rho Pi
+ for (var laneIndex = 1; laneIndex < 25; laneIndex++) {
+ var tMsw;
+ var tLsw;
+
+ // Shortcuts
+ var lane = state[laneIndex];
+ var laneMsw = lane.high;
+ var laneLsw = lane.low;
+ var rhoOffset = RHO_OFFSETS[laneIndex];
+
+ // Rotate lanes
+ if (rhoOffset < 32) {
+ tMsw = (laneMsw << rhoOffset) | (laneLsw >>> (32 - rhoOffset));
+ tLsw = (laneLsw << rhoOffset) | (laneMsw >>> (32 - rhoOffset));
+ } else /* if (rhoOffset >= 32) */ {
+ tMsw = (laneLsw << (rhoOffset - 32)) | (laneMsw >>> (64 - rhoOffset));
+ tLsw = (laneMsw << (rhoOffset - 32)) | (laneLsw >>> (64 - rhoOffset));
+ }
+
+ // Transpose lanes
+ var TPiLane = T[PI_INDEXES[laneIndex]];
+ TPiLane.high = tMsw;
+ TPiLane.low = tLsw;
+ }
+
+ // Rho pi at x = y = 0
+ var T0 = T[0];
+ var state0 = state[0];
+ T0.high = state0.high;
+ T0.low = state0.low;
+
+ // Chi
+ for (var x = 0; x < 5; x++) {
+ for (var y = 0; y < 5; y++) {
+ // Shortcuts
+ var laneIndex = x + 5 * y;
+ var lane = state[laneIndex];
+ var TLane = T[laneIndex];
+ var Tx1Lane = T[((x + 1) % 5) + 5 * y];
+ var Tx2Lane = T[((x + 2) % 5) + 5 * y];
+
+ // Mix rows
+ lane.high = TLane.high ^ (~Tx1Lane.high & Tx2Lane.high);
+ lane.low = TLane.low ^ (~Tx1Lane.low & Tx2Lane.low);
+ }
+ }
+
+ // Iota
+ var lane = state[0];
+ var roundConstant = ROUND_CONSTANTS[round];
+ lane.high ^= roundConstant.high;
+ lane.low ^= roundConstant.low;
+ }
+ },
+
+ _doFinalize: function () {
+ // Shortcuts
+ var data = this._data;
+ var dataWords = data.words;
+ var nBitsTotal = this._nDataBytes * 8;
+ var nBitsLeft = data.sigBytes * 8;
+ var blockSizeBits = this.blockSize * 32;
+
+ // Add padding
+ dataWords[nBitsLeft >>> 5] |= 0x1 << (24 - nBitsLeft % 32);
+ dataWords[((Math.ceil((nBitsLeft + 1) / blockSizeBits) * blockSizeBits) >>> 5) - 1] |= 0x80;
+ data.sigBytes = dataWords.length * 4;
+
+ // Hash final blocks
+ this._process();
+
+ // Shortcuts
+ var state = this._state;
+ var outputLengthBytes = this.cfg.outputLength / 8;
+ var outputLengthLanes = outputLengthBytes / 8;
+
+ // Squeeze
+ var hashWords = [];
+ for (var i = 0; i < outputLengthLanes; i++) {
+ // Shortcuts
+ var lane = state[i];
+ var laneMsw = lane.high;
+ var laneLsw = lane.low;
+
+ // Swap endian
+ laneMsw = (
+ (((laneMsw << 8) | (laneMsw >>> 24)) & 0x00ff00ff) |
+ (((laneMsw << 24) | (laneMsw >>> 8)) & 0xff00ff00)
+ );
+ laneLsw = (
+ (((laneLsw << 8) | (laneLsw >>> 24)) & 0x00ff00ff) |
+ (((laneLsw << 24) | (laneLsw >>> 8)) & 0xff00ff00)
+ );
+
+ // Squeeze state to retrieve hash
+ hashWords.push(laneLsw);
+ hashWords.push(laneMsw);
+ }
+
+ // Return final computed hash
+ return new WordArray.init(hashWords, outputLengthBytes);
+ },
+
+ clone: function () {
+ var clone = Hasher.clone.call(this);
+
+ var state = clone._state = this._state.slice(0);
+ for (var i = 0; i < 25; i++) {
+ state[i] = state[i].clone();
+ }
+
+ return clone;
+ }
+ });
+
+ /**
+ * Shortcut function to the hasher's object interface.
+ *
+ * @param {WordArray|string} message The message to hash.
+ *
+ * @return {WordArray} The hash.
+ *
+ * @static
+ *
+ * @example
+ *
+ * var hash = CryptoJS.SHA3('message');
+ * var hash = CryptoJS.SHA3(wordArray);
+ */
+ C.SHA3 = Hasher._createHelper(SHA3);
+
+ /**
+ * Shortcut function to the HMAC's object interface.
+ *
+ * @param {WordArray|string} message The message to hash.
+ * @param {WordArray|string} key The secret key.
+ *
+ * @return {WordArray} The HMAC.
+ *
+ * @static
+ *
+ * @example
+ *
+ * var hmac = CryptoJS.HmacSHA3(message, key);
+ */
+ C.HmacSHA3 = Hasher._createHmacHelper(SHA3);
+ }(Math));
+
+
+ /** @preserve
+ (c) 2012 by Cédric Mesnil. All rights reserved.
+
+ Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+
+ - Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
+ - Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
+
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+ (function (Math) {
+ // Shortcuts
+ var C = CryptoJS;
+ var C_lib = C.lib;
+ var WordArray = C_lib.WordArray;
+ var Hasher = C_lib.Hasher;
+ var C_algo = C.algo;
+
+ // Constants table
+ var _zl = WordArray.create([
+ 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15,
+ 7, 4, 13, 1, 10, 6, 15, 3, 12, 0, 9, 5, 2, 14, 11, 8,
+ 3, 10, 14, 4, 9, 15, 8, 1, 2, 7, 0, 6, 13, 11, 5, 12,
+ 1, 9, 11, 10, 0, 8, 12, 4, 13, 3, 7, 15, 14, 5, 6, 2,
+ 4, 0, 5, 9, 7, 12, 2, 10, 14, 1, 3, 8, 11, 6, 15, 13]);
+ var _zr = WordArray.create([
+ 5, 14, 7, 0, 9, 2, 11, 4, 13, 6, 15, 8, 1, 10, 3, 12,
+ 6, 11, 3, 7, 0, 13, 5, 10, 14, 15, 8, 12, 4, 9, 1, 2,
+ 15, 5, 1, 3, 7, 14, 6, 9, 11, 8, 12, 2, 10, 0, 4, 13,
+ 8, 6, 4, 1, 3, 11, 15, 0, 5, 12, 2, 13, 9, 7, 10, 14,
+ 12, 15, 10, 4, 1, 5, 8, 7, 6, 2, 13, 14, 0, 3, 9, 11]);
+ var _sl = WordArray.create([
+ 11, 14, 15, 12, 5, 8, 7, 9, 11, 13, 14, 15, 6, 7, 9, 8,
+ 7, 6, 8, 13, 11, 9, 7, 15, 7, 12, 15, 9, 11, 7, 13, 12,
+ 11, 13, 6, 7, 14, 9, 13, 15, 14, 8, 13, 6, 5, 12, 7, 5,
+ 11, 12, 14, 15, 14, 15, 9, 8, 9, 14, 5, 6, 8, 6, 5, 12,
+ 9, 15, 5, 11, 6, 8, 13, 12, 5, 12, 13, 14, 11, 8, 5, 6 ]);
+ var _sr = WordArray.create([
+ 8, 9, 9, 11, 13, 15, 15, 5, 7, 7, 8, 11, 14, 14, 12, 6,
+ 9, 13, 15, 7, 12, 8, 9, 11, 7, 7, 12, 7, 6, 15, 13, 11,
+ 9, 7, 15, 11, 8, 6, 6, 14, 12, 13, 5, 14, 13, 13, 7, 5,
+ 15, 5, 8, 11, 14, 14, 6, 14, 6, 9, 12, 9, 12, 5, 15, 8,
+ 8, 5, 12, 9, 12, 5, 14, 6, 8, 13, 6, 5, 15, 13, 11, 11 ]);
+
+ var _hl = WordArray.create([ 0x00000000, 0x5A827999, 0x6ED9EBA1, 0x8F1BBCDC, 0xA953FD4E]);
+ var _hr = WordArray.create([ 0x50A28BE6, 0x5C4DD124, 0x6D703EF3, 0x7A6D76E9, 0x00000000]);
+
+ /**
+ * RIPEMD160 hash algorithm.
+ */
+ var RIPEMD160 = C_algo.RIPEMD160 = Hasher.extend({
+ _doReset: function () {
+ this._hash = WordArray.create([0x67452301, 0xEFCDAB89, 0x98BADCFE, 0x10325476, 0xC3D2E1F0]);
+ },
+
+ _doProcessBlock: function (M, offset) {
+
+ // Swap endian
+ for (var i = 0; i < 16; i++) {
+ // Shortcuts
+ var offset_i = offset + i;
+ var M_offset_i = M[offset_i];
+
+ // Swap
+ M[offset_i] = (
+ (((M_offset_i << 8) | (M_offset_i >>> 24)) & 0x00ff00ff) |
+ (((M_offset_i << 24) | (M_offset_i >>> 8)) & 0xff00ff00)
+ );
+ }
+ // Shortcut
+ var H = this._hash.words;
+ var hl = _hl.words;
+ var hr = _hr.words;
+ var zl = _zl.words;
+ var zr = _zr.words;
+ var sl = _sl.words;
+ var sr = _sr.words;
+
+ // Working variables
+ var al, bl, cl, dl, el;
+ var ar, br, cr, dr, er;
+
+ ar = al = H[0];
+ br = bl = H[1];
+ cr = cl = H[2];
+ dr = dl = H[3];
+ er = el = H[4];
+ // Computation
+ var t;
+ for (var i = 0; i < 80; i += 1) {
+ t = (al + M[offset+zl[i]])|0;
+ if (i<16){
+ t += f1(bl,cl,dl) + hl[0];
+ } else if (i<32) {
+ t += f2(bl,cl,dl) + hl[1];
+ } else if (i<48) {
+ t += f3(bl,cl,dl) + hl[2];
+ } else if (i<64) {
+ t += f4(bl,cl,dl) + hl[3];
+ } else {// if (i<80) {
+ t += f5(bl,cl,dl) + hl[4];
+ }
+ t = t|0;
+ t = rotl(t,sl[i]);
+ t = (t+el)|0;
+ al = el;
+ el = dl;
+ dl = rotl(cl, 10);
+ cl = bl;
+ bl = t;
+
+ t = (ar + M[offset+zr[i]])|0;
+ if (i<16){
+ t += f5(br,cr,dr) + hr[0];
+ } else if (i<32) {
+ t += f4(br,cr,dr) + hr[1];
+ } else if (i<48) {
+ t += f3(br,cr,dr) + hr[2];
+ } else if (i<64) {
+ t += f2(br,cr,dr) + hr[3];
+ } else {// if (i<80) {
+ t += f1(br,cr,dr) + hr[4];
+ }
+ t = t|0;
+ t = rotl(t,sr[i]) ;
+ t = (t+er)|0;
+ ar = er;
+ er = dr;
+ dr = rotl(cr, 10);
+ cr = br;
+ br = t;
+ }
+ // Intermediate hash value
+ t = (H[1] + cl + dr)|0;
+ H[1] = (H[2] + dl + er)|0;
+ H[2] = (H[3] + el + ar)|0;
+ H[3] = (H[4] + al + br)|0;
+ H[4] = (H[0] + bl + cr)|0;
+ H[0] = t;
+ },
+
+ _doFinalize: function () {
+ // Shortcuts
+ var data = this._data;
+ var dataWords = data.words;
+
+ var nBitsTotal = this._nDataBytes * 8;
+ var nBitsLeft = data.sigBytes * 8;
+
+ // Add padding
+ dataWords[nBitsLeft >>> 5] |= 0x80 << (24 - nBitsLeft % 32);
+ dataWords[(((nBitsLeft + 64) >>> 9) << 4) + 14] = (
+ (((nBitsTotal << 8) | (nBitsTotal >>> 24)) & 0x00ff00ff) |
+ (((nBitsTotal << 24) | (nBitsTotal >>> 8)) & 0xff00ff00)
+ );
+ data.sigBytes = (dataWords.length + 1) * 4;
+
+ // Hash final blocks
+ this._process();
+
+ // Shortcuts
+ var hash = this._hash;
+ var H = hash.words;
+
+ // Swap endian
+ for (var i = 0; i < 5; i++) {
+ // Shortcut
+ var H_i = H[i];
+
+ // Swap
+ H[i] = (((H_i << 8) | (H_i >>> 24)) & 0x00ff00ff) |
+ (((H_i << 24) | (H_i >>> 8)) & 0xff00ff00);
+ }
+
+ // Return final computed hash
+ return hash;
+ },
+
+ clone: function () {
+ var clone = Hasher.clone.call(this);
+ clone._hash = this._hash.clone();
+
+ return clone;
+ }
+ });
+
+
+ function f1(x, y, z) {
+ return ((x) ^ (y) ^ (z));
+
+ }
+
+ function f2(x, y, z) {
+ return (((x)&(y)) | ((~x)&(z)));
+ }
+
+ function f3(x, y, z) {
+ return (((x) | (~(y))) ^ (z));
+ }
+
+ function f4(x, y, z) {
+ return (((x) & (z)) | ((y)&(~(z))));
+ }
+
+ function f5(x, y, z) {
+ return ((x) ^ ((y) |(~(z))));
+
+ }
+
+ function rotl(x,n) {
+ return (x<<n) | (x>>>(32-n));
+ }
+
+
+ /**
+ * Shortcut function to the hasher's object interface.
+ *
+ * @param {WordArray|string} message The message to hash.
+ *
+ * @return {WordArray} The hash.
+ *
+ * @static
+ *
+ * @example
+ *
+ * var hash = CryptoJS.RIPEMD160('message');
+ * var hash = CryptoJS.RIPEMD160(wordArray);
+ */
+ C.RIPEMD160 = Hasher._createHelper(RIPEMD160);
+
+ /**
+ * Shortcut function to the HMAC's object interface.
+ *
+ * @param {WordArray|string} message The message to hash.
+ * @param {WordArray|string} key The secret key.
+ *
+ * @return {WordArray} The HMAC.
+ *
+ * @static
+ *
+ * @example
+ *
+ * var hmac = CryptoJS.HmacRIPEMD160(message, key);
+ */
+ C.HmacRIPEMD160 = Hasher._createHmacHelper(RIPEMD160);
+ }(Math));
+
+
+ (function () {
+ // Shortcuts
+ var C = CryptoJS;
+ var C_lib = C.lib;
+ var Base = C_lib.Base;
+ var C_enc = C.enc;
+ var Utf8 = C_enc.Utf8;
+ var C_algo = C.algo;
+
+ /**
+ * HMAC algorithm.
+ */
+ var HMAC = C_algo.HMAC = Base.extend({
+ /**
+ * Initializes a newly created HMAC.
+ *
+ * @param {Hasher} hasher The hash algorithm to use.
+ * @param {WordArray|string} key The secret key.
+ *
+ * @example
+ *
+ * var hmacHasher = CryptoJS.algo.HMAC.create(CryptoJS.algo.SHA256, key);
+ */
+ init: function (hasher, key) {
+ // Init hasher
+ hasher = this._hasher = new hasher.init();
+
+ // Convert string to WordArray, else assume WordArray already
+ if (typeof key == 'string') {
+ key = Utf8.parse(key);
+ }
+
+ // Shortcuts
+ var hasherBlockSize = hasher.blockSize;
+ var hasherBlockSizeBytes = hasherBlockSize * 4;
+
+ // Allow arbitrary length keys
+ if (key.sigBytes > hasherBlockSizeBytes) {
+ key = hasher.finalize(key);
+ }
+
+ // Clamp excess bits
+ key.clamp();
+
+ // Clone key for inner and outer pads
+ var oKey = this._oKey = key.clone();
+ var iKey = this._iKey = key.clone();
+
+ // Shortcuts
+ var oKeyWords = oKey.words;
+ var iKeyWords = iKey.words;
+
+ // XOR keys with pad constants
+ for (var i = 0; i < hasherBlockSize; i++) {
+ oKeyWords[i] ^= 0x5c5c5c5c;
+ iKeyWords[i] ^= 0x36363636;
+ }
+ oKey.sigBytes = iKey.sigBytes = hasherBlockSizeBytes;
+
+ // Set initial values
+ this.reset();
+ },
+
+ /**
+ * Resets this HMAC to its initial state.
+ *
+ * @example
+ *
+ * hmacHasher.reset();
+ */
+ reset: function () {
+ // Shortcut
+ var hasher = this._hasher;
+
+ // Reset
+ hasher.reset();
+ hasher.update(this._iKey);
+ },
+
+ /**
+ * Updates this HMAC with a message.
+ *
+ * @param {WordArray|string} messageUpdate The message to append.
+ *
+ * @return {HMAC} This HMAC instance.
+ *
+ * @example
+ *
+ * hmacHasher.update('message');
+ * hmacHasher.update(wordArray);
+ */
+ update: function (messageUpdate) {
+ this._hasher.update(messageUpdate);
+
+ // Chainable
+ return this;
+ },
+
+ /**
+ * Finalizes the HMAC computation.
+ * Note that the finalize operation is effectively a destructive, read-once operation.
+ *
+ * @param {WordArray|string} messageUpdate (Optional) A final message update.
+ *
+ * @return {WordArray} The HMAC.
+ *
+ * @example
+ *
+ * var hmac = hmacHasher.finalize();
+ * var hmac = hmacHasher.finalize('message');
+ * var hmac = hmacHasher.finalize(wordArray);
+ */
+ finalize: function (messageUpdate) {
+ // Shortcut
+ var hasher = this._hasher;
+
+ // Compute HMAC
+ var innerHash = hasher.finalize(messageUpdate);
+ hasher.reset();
+ var hmac = hasher.finalize(this._oKey.clone().concat(innerHash));
+
+ return hmac;
+ }
+ });
+ }());
+
+
+ (function () {
+ // Shortcuts
+ var C = CryptoJS;
+ var C_lib = C.lib;
+ var Base = C_lib.Base;
+ var WordArray = C_lib.WordArray;
+ var C_algo = C.algo;
+ var SHA1 = C_algo.SHA1;
+ var HMAC = C_algo.HMAC;
+
+ /**
+ * Password-Based Key Derivation Function 2 algorithm.
+ */
+ var PBKDF2 = C_algo.PBKDF2 = Base.extend({
+ /**
+ * Configuration options.
+ *
+ * @property {number} keySize The key size in words to generate. Default: 4 (128 bits)
+ * @property {Hasher} hasher The hasher to use. Default: SHA1
+ * @property {number} iterations The number of iterations to perform. Default: 1
+ */
+ cfg: Base.extend({
+ keySize: 128/32,
+ hasher: SHA1,
+ iterations: 1
+ }),
+
+ /**
+ * Initializes a newly created key derivation function.
+ *
+ * @param {Object} cfg (Optional) The configuration options to use for the derivation.
+ *
+ * @example
+ *
+ * var kdf = CryptoJS.algo.PBKDF2.create();
+ * var kdf = CryptoJS.algo.PBKDF2.create({ keySize: 8 });
+ * var kdf = CryptoJS.algo.PBKDF2.create({ keySize: 8, iterations: 1000 });
+ */
+ init: function (cfg) {
+ this.cfg = this.cfg.extend(cfg);
+ },
+
+ /**
+ * Computes the Password-Based Key Derivation Function 2.
+ *
+ * @param {WordArray|string} password The password.
+ * @param {WordArray|string} salt A salt.
+ *
+ * @return {WordArray} The derived key.
+ *
+ * @example
+ *
+ * var key = kdf.compute(password, salt);
+ */
+ compute: function (password, salt) {
+ // Shortcut
+ var cfg = this.cfg;
+
+ // Init HMAC
+ var hmac = HMAC.create(cfg.hasher, password);
+
+ // Initial values
+ var derivedKey = WordArray.create();
+ var blockIndex = WordArray.create([0x00000001]);
+
+ // Shortcuts
+ var derivedKeyWords = derivedKey.words;
+ var blockIndexWords = blockIndex.words;
+ var keySize = cfg.keySize;
+ var iterations = cfg.iterations;
+
+ // Generate key
+ while (derivedKeyWords.length < keySize) {
+ var block = hmac.update(salt).finalize(blockIndex);
+ hmac.reset();
+
+ // Shortcuts
+ var blockWords = block.words;
+ var blockWordsLength = blockWords.length;
+
+ // Iterations
+ var intermediate = block;
+ for (var i = 1; i < iterations; i++) {
+ intermediate = hmac.finalize(intermediate);
+ hmac.reset();
+
+ // Shortcut
+ var intermediateWords = intermediate.words;
+
+ // XOR intermediate with block
+ for (var j = 0; j < blockWordsLength; j++) {
+ blockWords[j] ^= intermediateWords[j];
+ }
+ }
+
+ derivedKey.concat(block);
+ blockIndexWords[0]++;
+ }
+ derivedKey.sigBytes = keySize * 4;
+
+ return derivedKey;
+ }
+ });
+
+ /**
+ * Computes the Password-Based Key Derivation Function 2.
+ *
+ * @param {WordArray|string} password The password.
+ * @param {WordArray|string} salt A salt.
+ * @param {Object} cfg (Optional) The configuration options to use for this computation.
+ *
+ * @return {WordArray} The derived key.
+ *
+ * @static
+ *
+ * @example
+ *
+ * var key = CryptoJS.PBKDF2(password, salt);
+ * var key = CryptoJS.PBKDF2(password, salt, { keySize: 8 });
+ * var key = CryptoJS.PBKDF2(password, salt, { keySize: 8, iterations: 1000 });
+ */
+ C.PBKDF2 = function (password, salt, cfg) {
+ return PBKDF2.create(cfg).compute(password, salt);
+ };
+ }());
+
+
+ (function () {
+ // Shortcuts
+ var C = CryptoJS;
+ var C_lib = C.lib;
+ var Base = C_lib.Base;
+ var WordArray = C_lib.WordArray;
+ var C_algo = C.algo;
+ var MD5 = C_algo.MD5;
+
+ /**
+ * This key derivation function is meant to conform with EVP_BytesToKey.
+ * www.openssl.org/docs/crypto/EVP_BytesToKey.html
+ */
+ var EvpKDF = C_algo.EvpKDF = Base.extend({
+ /**
+ * Configuration options.
+ *
+ * @property {number} keySize The key size in words to generate. Default: 4 (128 bits)
+ * @property {Hasher} hasher The hash algorithm to use. Default: MD5
+ * @property {number} iterations The number of iterations to perform. Default: 1
+ */
+ cfg: Base.extend({
+ keySize: 128/32,
+ hasher: MD5,
+ iterations: 1
+ }),
+
+ /**
+ * Initializes a newly created key derivation function.
+ *
+ * @param {Object} cfg (Optional) The configuration options to use for the derivation.
+ *
+ * @example
+ *
+ * var kdf = CryptoJS.algo.EvpKDF.create();
+ * var kdf = CryptoJS.algo.EvpKDF.create({ keySize: 8 });
+ * var kdf = CryptoJS.algo.EvpKDF.create({ keySize: 8, iterations: 1000 });
+ */
+ init: function (cfg) {
+ this.cfg = this.cfg.extend(cfg);
+ },
+
+ /**
+ * Derives a key from a password.
+ *
+ * @param {WordArray|string} password The password.
+ * @param {WordArray|string} salt A salt.
+ *
+ * @return {WordArray} The derived key.
+ *
+ * @example
+ *
+ * var key = kdf.compute(password, salt);
+ */
+ compute: function (password, salt) {
+ var block;
+
+ // Shortcut
+ var cfg = this.cfg;
+
+ // Init hasher
+ var hasher = cfg.hasher.create();
+
+ // Initial values
+ var derivedKey = WordArray.create();
+
+ // Shortcuts
+ var derivedKeyWords = derivedKey.words;
+ var keySize = cfg.keySize;
+ var iterations = cfg.iterations;
+
+ // Generate key
+ while (derivedKeyWords.length < keySize) {
+ if (block) {
+ hasher.update(block);
+ }
+ block = hasher.update(password).finalize(salt);
+ hasher.reset();
+
+ // Iterations
+ for (var i = 1; i < iterations; i++) {
+ block = hasher.finalize(block);
+ hasher.reset();
+ }
+
+ derivedKey.concat(block);
+ }
+ derivedKey.sigBytes = keySize * 4;
+
+ return derivedKey;
+ }
+ });
+
+ /**
+ * Derives a key from a password.
+ *
+ * @param {WordArray|string} password The password.
+ * @param {WordArray|string} salt A salt.
+ * @param {Object} cfg (Optional) The configuration options to use for this computation.
+ *
+ * @return {WordArray} The derived key.
+ *
+ * @static
+ *
+ * @example
+ *
+ * var key = CryptoJS.EvpKDF(password, salt);
+ * var key = CryptoJS.EvpKDF(password, salt, { keySize: 8 });
+ * var key = CryptoJS.EvpKDF(password, salt, { keySize: 8, iterations: 1000 });
+ */
+ C.EvpKDF = function (password, salt, cfg) {
+ return EvpKDF.create(cfg).compute(password, salt);
+ };
+ }());
+
+
+ /**
+ * Cipher core components.
+ */
+ CryptoJS.lib.Cipher || (function (undefined) {
+ // Shortcuts
+ var C = CryptoJS;
+ var C_lib = C.lib;
+ var Base = C_lib.Base;
+ var WordArray = C_lib.WordArray;
+ var BufferedBlockAlgorithm = C_lib.BufferedBlockAlgorithm;
+ var C_enc = C.enc;
+ var Utf8 = C_enc.Utf8;
+ var Base64 = C_enc.Base64;
+ var C_algo = C.algo;
+ var EvpKDF = C_algo.EvpKDF;
+
+ /**
+ * Abstract base cipher template.
+ *
+ * @property {number} keySize This cipher's key size. Default: 4 (128 bits)
+ * @property {number} ivSize This cipher's IV size. Default: 4 (128 bits)
+ * @property {number} _ENC_XFORM_MODE A constant representing encryption mode.
+ * @property {number} _DEC_XFORM_MODE A constant representing decryption mode.
+ */
+ var Cipher = C_lib.Cipher = BufferedBlockAlgorithm.extend({
+ /**
+ * Configuration options.
+ *
+ * @property {WordArray} iv The IV to use for this operation.
+ */
+ cfg: Base.extend(),
+
+ /**
+ * Creates this cipher in encryption mode.
+ *
+ * @param {WordArray} key The key.
+ * @param {Object} cfg (Optional) The configuration options to use for this operation.
+ *
+ * @return {Cipher} A cipher instance.
+ *
+ * @static
+ *
+ * @example
+ *
+ * var cipher = CryptoJS.algo.AES.createEncryptor(keyWordArray, { iv: ivWordArray });
+ */
+ createEncryptor: function (key, cfg) {
+ return this.create(this._ENC_XFORM_MODE, key, cfg);
+ },
+
+ /**
+ * Creates this cipher in decryption mode.
+ *
+ * @param {WordArray} key The key.
+ * @param {Object} cfg (Optional) The configuration options to use for this operation.
+ *
+ * @return {Cipher} A cipher instance.
+ *
+ * @static
+ *
+ * @example
+ *
+ * var cipher = CryptoJS.algo.AES.createDecryptor(keyWordArray, { iv: ivWordArray });
+ */
+ createDecryptor: function (key, cfg) {
+ return this.create(this._DEC_XFORM_MODE, key, cfg);
+ },
+
+ /**
+ * Initializes a newly created cipher.
+ *
+ * @param {number} xformMode Either the encryption or decryption transormation mode constant.
+ * @param {WordArray} key The key.
+ * @param {Object} cfg (Optional) The configuration options to use for this operation.
+ *
+ * @example
+ *
+ * var cipher = CryptoJS.algo.AES.create(CryptoJS.algo.AES._ENC_XFORM_MODE, keyWordArray, { iv: ivWordArray });
+ */
+ init: function (xformMode, key, cfg) {
+ // Apply config defaults
+ this.cfg = this.cfg.extend(cfg);
+
+ // Store transform mode and key
+ this._xformMode = xformMode;
+ this._key = key;
+
+ // Set initial values
+ this.reset();
+ },
+
+ /**
+ * Resets this cipher to its initial state.
+ *
+ * @example
+ *
+ * cipher.reset();
+ */
+ reset: function () {
+ // Reset data buffer
+ BufferedBlockAlgorithm.reset.call(this);
+
+ // Perform concrete-cipher logic
+ this._doReset();
+ },
+
+ /**
+ * Adds data to be encrypted or decrypted.
+ *
+ * @param {WordArray|string} dataUpdate The data to encrypt or decrypt.
+ *
+ * @return {WordArray} The data after processing.
+ *
+ * @example
+ *
+ * var encrypted = cipher.process('data');
+ * var encrypted = cipher.process(wordArray);
+ */
+ process: function (dataUpdate) {
+ // Append
+ this._append(dataUpdate);
+
+ // Process available blocks
+ return this._process();
+ },
+
+ /**
+ * Finalizes the encryption or decryption process.
+ * Note that the finalize operation is effectively a destructive, read-once operation.
+ *
+ * @param {WordArray|string} dataUpdate The final data to encrypt or decrypt.
+ *
+ * @return {WordArray} The data after final processing.
+ *
+ * @example
+ *
+ * var encrypted = cipher.finalize();
+ * var encrypted = cipher.finalize('data');
+ * var encrypted = cipher.finalize(wordArray);
+ */
+ finalize: function (dataUpdate) {
+ // Final data update
+ if (dataUpdate) {
+ this._append(dataUpdate);
+ }
+
+ // Perform concrete-cipher logic
+ var finalProcessedData = this._doFinalize();
+
+ return finalProcessedData;
+ },
+
+ keySize: 128/32,
+
+ ivSize: 128/32,
+
+ _ENC_XFORM_MODE: 1,
+
+ _DEC_XFORM_MODE: 2,
+
+ /**
+ * Creates shortcut functions to a cipher's object interface.
+ *
+ * @param {Cipher} cipher The cipher to create a helper for.
+ *
+ * @return {Object} An object with encrypt and decrypt shortcut functions.
+ *
+ * @static
+ *
+ * @example
+ *
+ * var AES = CryptoJS.lib.Cipher._createHelper(CryptoJS.algo.AES);
+ */
+ _createHelper: (function () {
+ function selectCipherStrategy(key) {
+ if (typeof key == 'string') {
+ return PasswordBasedCipher;
+ } else {
+ return SerializableCipher;
+ }
+ }
+
+ return function (cipher) {
+ return {
+ encrypt: function (message, key, cfg) {
+ return selectCipherStrategy(key).encrypt(cipher, message, key, cfg);
+ },
+
+ decrypt: function (ciphertext, key, cfg) {
+ return selectCipherStrategy(key).decrypt(cipher, ciphertext, key, cfg);
+ }
+ };
+ };
+ }())
+ });
+
+ /**
+ * Abstract base stream cipher template.
+ *
+ * @property {number} blockSize The number of 32-bit words this cipher operates on. Default: 1 (32 bits)
+ */
+ var StreamCipher = C_lib.StreamCipher = Cipher.extend({
+ _doFinalize: function () {
+ // Process partial blocks
+ var finalProcessedBlocks = this._process(!!'flush');
+
+ return finalProcessedBlocks;
+ },
+
+ blockSize: 1
+ });
+
+ /**
+ * Mode namespace.
+ */
+ var C_mode = C.mode = {};
+
+ /**
+ * Abstract base block cipher mode template.
+ */
+ var BlockCipherMode = C_lib.BlockCipherMode = Base.extend({
+ /**
+ * Creates this mode for encryption.
+ *
+ * @param {Cipher} cipher A block cipher instance.
+ * @param {Array} iv The IV words.
+ *
+ * @static
+ *
+ * @example
+ *
+ * var mode = CryptoJS.mode.CBC.createEncryptor(cipher, iv.words);
+ */
+ createEncryptor: function (cipher, iv) {
+ return this.Encryptor.create(cipher, iv);
+ },
+
+ /**
+ * Creates this mode for decryption.
+ *
+ * @param {Cipher} cipher A block cipher instance.
+ * @param {Array} iv The IV words.
+ *
+ * @static
+ *
+ * @example
+ *
+ * var mode = CryptoJS.mode.CBC.createDecryptor(cipher, iv.words);
+ */
+ createDecryptor: function (cipher, iv) {
+ return this.Decryptor.create(cipher, iv);
+ },
+
+ /**
+ * Initializes a newly created mode.
+ *
+ * @param {Cipher} cipher A block cipher instance.
+ * @param {Array} iv The IV words.
+ *
+ * @example
+ *
+ * var mode = CryptoJS.mode.CBC.Encryptor.create(cipher, iv.words);
+ */
+ init: function (cipher, iv) {
+ this._cipher = cipher;
+ this._iv = iv;
+ }
+ });
+
+ /**
+ * Cipher Block Chaining mode.
+ */
+ var CBC = C_mode.CBC = (function () {
+ /**
+ * Abstract base CBC mode.
+ */
+ var CBC = BlockCipherMode.extend();
+
+ /**
+ * CBC encryptor.
+ */
+ CBC.Encryptor = CBC.extend({
+ /**
+ * Processes the data block at offset.
+ *
+ * @param {Array} words The data words to operate on.
+ * @param {number} offset The offset where the block starts.
+ *
+ * @example
+ *
+ * mode.processBlock(data.words, offset);
+ */
+ processBlock: function (words, offset) {
+ // Shortcuts
+ var cipher = this._cipher;
+ var blockSize = cipher.blockSize;
+
+ // XOR and encrypt
+ xorBlock.call(this, words, offset, blockSize);
+ cipher.encryptBlock(words, offset);
+
+ // Remember this block to use with next block
+ this._prevBlock = words.slice(offset, offset + blockSize);
+ }
+ });
+
+ /**
+ * CBC decryptor.
+ */
+ CBC.Decryptor = CBC.extend({
+ /**
+ * Processes the data block at offset.
+ *
+ * @param {Array} words The data words to operate on.
+ * @param {number} offset The offset where the block starts.
+ *
+ * @example
+ *
+ * mode.processBlock(data.words, offset);
+ */
+ processBlock: function (words, offset) {
+ // Shortcuts
+ var cipher = this._cipher;
+ var blockSize = cipher.blockSize;
+
+ // Remember this block to use with next block
+ var thisBlock = words.slice(offset, offset + blockSize);
+
+ // Decrypt and XOR
+ cipher.decryptBlock(words, offset);
+ xorBlock.call(this, words, offset, blockSize);
+
+ // This block becomes the previous block
+ this._prevBlock = thisBlock;
+ }
+ });
+
+ function xorBlock(words, offset, blockSize) {
+ var block;
+
+ // Shortcut
+ var iv = this._iv;
+
+ // Choose mixing block
+ if (iv) {
+ block = iv;
+
+ // Remove IV for subsequent blocks
+ this._iv = undefined;
+ } else {
+ block = this._prevBlock;
+ }
+
+ // XOR blocks
+ for (var i = 0; i < blockSize; i++) {
+ words[offset + i] ^= block[i];
+ }
+ }
+
+ return CBC;
+ }());
+
+ /**
+ * Padding namespace.
+ */
+ var C_pad = C.pad = {};
+
+ /**
+ * PKCS #5/7 padding strategy.
+ */
+ var Pkcs7 = C_pad.Pkcs7 = {
+ /**
+ * Pads data using the algorithm defined in PKCS #5/7.
+ *
+ * @param {WordArray} data The data to pad.
+ * @param {number} blockSize The multiple that the data should be padded to.
+ *
+ * @static
+ *
+ * @example
+ *
+ * CryptoJS.pad.Pkcs7.pad(wordArray, 4);
+ */
+ pad: function (data, blockSize) {
+ // Shortcut
+ var blockSizeBytes = blockSize * 4;
+
+ // Count padding bytes
+ var nPaddingBytes = blockSizeBytes - data.sigBytes % blockSizeBytes;
+
+ // Create padding word
+ var paddingWord = (nPaddingBytes << 24) | (nPaddingBytes << 16) | (nPaddingBytes << 8) | nPaddingBytes;
+
+ // Create padding
+ var paddingWords = [];
+ for (var i = 0; i < nPaddingBytes; i += 4) {
+ paddingWords.push(paddingWord);
+ }
+ var padding = WordArray.create(paddingWords, nPaddingBytes);
+
+ // Add padding
+ data.concat(padding);
+ },
+
+ /**
+ * Unpads data that had been padded using the algorithm defined in PKCS #5/7.
+ *
+ * @param {WordArray} data The data to unpad.
+ *
+ * @static
+ *
+ * @example
+ *
+ * CryptoJS.pad.Pkcs7.unpad(wordArray);
+ */
+ unpad: function (data) {
+ // Get number of padding bytes from last byte
+ var nPaddingBytes = data.words[(data.sigBytes - 1) >>> 2] & 0xff;
+
+ // Remove padding
+ data.sigBytes -= nPaddingBytes;
+ }
+ };
+
+ /**
+ * Abstract base block cipher template.
+ *
+ * @property {number} blockSize The number of 32-bit words this cipher operates on. Default: 4 (128 bits)
+ */
+ var BlockCipher = C_lib.BlockCipher = Cipher.extend({
+ /**
+ * Configuration options.
+ *
+ * @property {Mode} mode The block mode to use. Default: CBC
+ * @property {Padding} padding The padding strategy to use. Default: Pkcs7
+ */
+ cfg: Cipher.cfg.extend({
+ mode: CBC,
+ padding: Pkcs7
+ }),
+
+ reset: function () {
+ var modeCreator;
+
+ // Reset cipher
+ Cipher.reset.call(this);
+
+ // Shortcuts
+ var cfg = this.cfg;
+ var iv = cfg.iv;
+ var mode = cfg.mode;
+
+ // Reset block mode
+ if (this._xformMode == this._ENC_XFORM_MODE) {
+ modeCreator = mode.createEncryptor;
+ } else /* if (this._xformMode == this._DEC_XFORM_MODE) */ {
+ modeCreator = mode.createDecryptor;
+ // Keep at least one block in the buffer for unpadding
+ this._minBufferSize = 1;
+ }
+
+ if (this._mode && this._mode.__creator == modeCreator) {
+ this._mode.init(this, iv && iv.words);
+ } else {
+ this._mode = modeCreator.call(mode, this, iv && iv.words);
+ this._mode.__creator = modeCreator;
+ }
+ },
+
+ _doProcessBlock: function (words, offset) {
+ this._mode.processBlock(words, offset);
+ },
+
+ _doFinalize: function () {
+ var finalProcessedBlocks;
+
+ // Shortcut
+ var padding = this.cfg.padding;
+
+ // Finalize
+ if (this._xformMode == this._ENC_XFORM_MODE) {
+ // Pad data
+ padding.pad(this._data, this.blockSize);
+
+ // Process final blocks
+ finalProcessedBlocks = this._process(!!'flush');
+ } else /* if (this._xformMode == this._DEC_XFORM_MODE) */ {
+ // Process final blocks
+ finalProcessedBlocks = this._process(!!'flush');
+
+ // Unpad data
+ padding.unpad(finalProcessedBlocks);
+ }
+
+ return finalProcessedBlocks;
+ },
+
+ blockSize: 128/32
+ });
+
+ /**
+ * A collection of cipher parameters.
+ *
+ * @property {WordArray} ciphertext The raw ciphertext.
+ * @property {WordArray} key The key to this ciphertext.
+ * @property {WordArray} iv The IV used in the ciphering operation.
+ * @property {WordArray} salt The salt used with a key derivation function.
+ * @property {Cipher} algorithm The cipher algorithm.
+ * @property {Mode} mode The block mode used in the ciphering operation.
+ * @property {Padding} padding The padding scheme used in the ciphering operation.
+ * @property {number} blockSize The block size of the cipher.
+ * @property {Format} formatter The default formatting strategy to convert this cipher params object to a string.
+ */
+ var CipherParams = C_lib.CipherParams = Base.extend({
+ /**
+ * Initializes a newly created cipher params object.
+ *
+ * @param {Object} cipherParams An object with any of the possible cipher parameters.
+ *
+ * @example
+ *
+ * var cipherParams = CryptoJS.lib.CipherParams.create({
+ * ciphertext: ciphertextWordArray,
+ * key: keyWordArray,
+ * iv: ivWordArray,
+ * salt: saltWordArray,
+ * algorithm: CryptoJS.algo.AES,
+ * mode: CryptoJS.mode.CBC,
+ * padding: CryptoJS.pad.PKCS7,
+ * blockSize: 4,
+ * formatter: CryptoJS.format.OpenSSL
+ * });
+ */
+ init: function (cipherParams) {
+ this.mixIn(cipherParams);
+ },
+
+ /**
+ * Converts this cipher params object to a string.
+ *
+ * @param {Format} formatter (Optional) The formatting strategy to use.
+ *
+ * @return {string} The stringified cipher params.
+ *
+ * @throws Error If neither the formatter nor the default formatter is set.
+ *
+ * @example
+ *
+ * var string = cipherParams + '';
+ * var string = cipherParams.toString();
+ * var string = cipherParams.toString(CryptoJS.format.OpenSSL);
+ */
+ toString: function (formatter) {
+ return (formatter || this.formatter).stringify(this);
+ }
+ });
+
+ /**
+ * Format namespace.
+ */
+ var C_format = C.format = {};
+
+ /**
+ * OpenSSL formatting strategy.
+ */
+ var OpenSSLFormatter = C_format.OpenSSL = {
+ /**
+ * Converts a cipher params object to an OpenSSL-compatible string.
+ *
+ * @param {CipherParams} cipherParams The cipher params object.
+ *
+ * @return {string} The OpenSSL-compatible string.
+ *
+ * @static
+ *
+ * @example
+ *
+ * var openSSLString = CryptoJS.format.OpenSSL.stringify(cipherParams);
+ */
+ stringify: function (cipherParams) {
+ var wordArray;
+
+ // Shortcuts
+ var ciphertext = cipherParams.ciphertext;
+ var salt = cipherParams.salt;
+
+ // Format
+ if (salt) {
+ wordArray = WordArray.create([0x53616c74, 0x65645f5f]).concat(salt).concat(ciphertext);
+ } else {
+ wordArray = ciphertext;
+ }
+
+ return wordArray.toString(Base64);
+ },
+
+ /**
+ * Converts an OpenSSL-compatible string to a cipher params object.
+ *
+ * @param {string} openSSLStr The OpenSSL-compatible string.
+ *
+ * @return {CipherParams} The cipher params object.
+ *
+ * @static
+ *
+ * @example
+ *
+ * var cipherParams = CryptoJS.format.OpenSSL.parse(openSSLString);
+ */
+ parse: function (openSSLStr) {
+ var salt;
+
+ // Parse base64
+ var ciphertext = Base64.parse(openSSLStr);
+
+ // Shortcut
+ var ciphertextWords = ciphertext.words;
+
+ // Test for salt
+ if (ciphertextWords[0] == 0x53616c74 && ciphertextWords[1] == 0x65645f5f) {
+ // Extract salt
+ salt = WordArray.create(ciphertextWords.slice(2, 4));
+
+ // Remove salt from ciphertext
+ ciphertextWords.splice(0, 4);
+ ciphertext.sigBytes -= 16;
+ }
+
+ return CipherParams.create({ ciphertext: ciphertext, salt: salt });
+ }
+ };
+
+ /**
+ * A cipher wrapper that returns ciphertext as a serializable cipher params object.
+ */
+ var SerializableCipher = C_lib.SerializableCipher = Base.extend({
+ /**
+ * Configuration options.
+ *
+ * @property {Formatter} format The formatting strategy to convert cipher param objects to and from a string. Default: OpenSSL
+ */
+ cfg: Base.extend({
+ format: OpenSSLFormatter
+ }),
+
+ /**
+ * Encrypts a message.
+ *
+ * @param {Cipher} cipher The cipher algorithm to use.
+ * @param {WordArray|string} message The message to encrypt.
+ * @param {WordArray} key The key.
+ * @param {Object} cfg (Optional) The configuration options to use for this operation.
+ *
+ * @return {CipherParams} A cipher params object.
+ *
+ * @static
+ *
+ * @example
+ *
+ * var ciphertextParams = CryptoJS.lib.SerializableCipher.encrypt(CryptoJS.algo.AES, message, key);
+ * var ciphertextParams = CryptoJS.lib.SerializableCipher.encrypt(CryptoJS.algo.AES, message, key, { iv: iv });
+ * var ciphertextParams = CryptoJS.lib.SerializableCipher.encrypt(CryptoJS.algo.AES, message, key, { iv: iv, format: CryptoJS.format.OpenSSL });
+ */
+ encrypt: function (cipher, message, key, cfg) {
+ // Apply config defaults
+ cfg = this.cfg.extend(cfg);
+
+ // Encrypt
+ var encryptor = cipher.createEncryptor(key, cfg);
+ var ciphertext = encryptor.finalize(message);
+
+ // Shortcut
+ var cipherCfg = encryptor.cfg;
+
+ // Create and return serializable cipher params
+ return CipherParams.create({
+ ciphertext: ciphertext,
+ key: key,
+ iv: cipherCfg.iv,
+ algorithm: cipher,
+ mode: cipherCfg.mode,
+ padding: cipherCfg.padding,
+ blockSize: cipher.blockSize,
+ formatter: cfg.format
+ });
+ },
+
+ /**
+ * Decrypts serialized ciphertext.
+ *
+ * @param {Cipher} cipher The cipher algorithm to use.
+ * @param {CipherParams|string} ciphertext The ciphertext to decrypt.
+ * @param {WordArray} key The key.
+ * @param {Object} cfg (Optional) The configuration options to use for this operation.
+ *
+ * @return {WordArray} The plaintext.
+ *
+ * @static
+ *
+ * @example
+ *
+ * var plaintext = CryptoJS.lib.SerializableCipher.decrypt(CryptoJS.algo.AES, formattedCiphertext, key, { iv: iv, format: CryptoJS.format.OpenSSL });
+ * var plaintext = CryptoJS.lib.SerializableCipher.decrypt(CryptoJS.algo.AES, ciphertextParams, key, { iv: iv, format: CryptoJS.format.OpenSSL });
+ */
+ decrypt: function (cipher, ciphertext, key, cfg) {
+ // Apply config defaults
+ cfg = this.cfg.extend(cfg);
+
+ // Convert string to CipherParams
+ ciphertext = this._parse(ciphertext, cfg.format);
+
+ // Decrypt
+ var plaintext = cipher.createDecryptor(key, cfg).finalize(ciphertext.ciphertext);
+
+ return plaintext;
+ },
+
+ /**
+ * Converts serialized ciphertext to CipherParams,
+ * else assumed CipherParams already and returns ciphertext unchanged.
+ *
+ * @param {CipherParams|string} ciphertext The ciphertext.
+ * @param {Formatter} format The formatting strategy to use to parse serialized ciphertext.
+ *
+ * @return {CipherParams} The unserialized ciphertext.
+ *
+ * @static
+ *
+ * @example
+ *
+ * var ciphertextParams = CryptoJS.lib.SerializableCipher._parse(ciphertextStringOrParams, format);
+ */
+ _parse: function (ciphertext, format) {
+ if (typeof ciphertext == 'string') {
+ return format.parse(ciphertext, this);
+ } else {
+ return ciphertext;
+ }
+ }
+ });
+
+ /**
+ * Key derivation function namespace.
+ */
+ var C_kdf = C.kdf = {};
+
+ /**
+ * OpenSSL key derivation function.
+ */
+ var OpenSSLKdf = C_kdf.OpenSSL = {
+ /**
+ * Derives a key and IV from a password.
+ *
+ * @param {string} password The password to derive from.
+ * @param {number} keySize The size in words of the key to generate.
+ * @param {number} ivSize The size in words of the IV to generate.
+ * @param {WordArray|string} salt (Optional) A 64-bit salt to use. If omitted, a salt will be generated randomly.
+ *
+ * @return {CipherParams} A cipher params object with the key, IV, and salt.
+ *
+ * @static
+ *
+ * @example
+ *
+ * var derivedParams = CryptoJS.kdf.OpenSSL.execute('Password', 256/32, 128/32);
+ * var derivedParams = CryptoJS.kdf.OpenSSL.execute('Password', 256/32, 128/32, 'saltsalt');
+ */
+ execute: function (password, keySize, ivSize, salt) {
+ // Generate random salt
+ if (!salt) {
+ salt = WordArray.random(64/8);
+ }
+
+ // Derive key and IV
+ var key = EvpKDF.create({ keySize: keySize + ivSize }).compute(password, salt);
+
+ // Separate key and IV
+ var iv = WordArray.create(key.words.slice(keySize), ivSize * 4);
+ key.sigBytes = keySize * 4;
+
+ // Return params
+ return CipherParams.create({ key: key, iv: iv, salt: salt });
+ }
+ };
+
+ /**
+ * A serializable cipher wrapper that derives the key from a password,
+ * and returns ciphertext as a serializable cipher params object.
+ */
+ var PasswordBasedCipher = C_lib.PasswordBasedCipher = SerializableCipher.extend({
+ /**
+ * Configuration options.
+ *
+ * @property {KDF} kdf The key derivation function to use to generate a key and IV from a password. Default: OpenSSL
+ */
+ cfg: SerializableCipher.cfg.extend({
+ kdf: OpenSSLKdf
+ }),
+
+ /**
+ * Encrypts a message using a password.
+ *
+ * @param {Cipher} cipher The cipher algorithm to use.
+ * @param {WordArray|string} message The message to encrypt.
+ * @param {string} password The password.
+ * @param {Object} cfg (Optional) The configuration options to use for this operation.
+ *
+ * @return {CipherParams} A cipher params object.
+ *
+ * @static
+ *
+ * @example
+ *
+ * var ciphertextParams = CryptoJS.lib.PasswordBasedCipher.encrypt(CryptoJS.algo.AES, message, 'password');
+ * var ciphertextParams = CryptoJS.lib.PasswordBasedCipher.encrypt(CryptoJS.algo.AES, message, 'password', { format: CryptoJS.format.OpenSSL });
+ */
+ encrypt: function (cipher, message, password, cfg) {
+ // Apply config defaults
+ cfg = this.cfg.extend(cfg);
+
+ // Derive key and other params
+ var derivedParams = cfg.kdf.execute(password, cipher.keySize, cipher.ivSize);
+
+ // Add IV to config
+ cfg.iv = derivedParams.iv;
+
+ // Encrypt
+ var ciphertext = SerializableCipher.encrypt.call(this, cipher, message, derivedParams.key, cfg);
+
+ // Mix in derived params
+ ciphertext.mixIn(derivedParams);
+
+ return ciphertext;
+ },
+
+ /**
+ * Decrypts serialized ciphertext using a password.
+ *
+ * @param {Cipher} cipher The cipher algorithm to use.
+ * @param {CipherParams|string} ciphertext The ciphertext to decrypt.
+ * @param {string} password The password.
+ * @param {Object} cfg (Optional) The configuration options to use for this operation.
+ *
+ * @return {WordArray} The plaintext.
+ *
+ * @static
+ *
+ * @example
+ *
+ * var plaintext = CryptoJS.lib.PasswordBasedCipher.decrypt(CryptoJS.algo.AES, formattedCiphertext, 'password', { format: CryptoJS.format.OpenSSL });
+ * var plaintext = CryptoJS.lib.PasswordBasedCipher.decrypt(CryptoJS.algo.AES, ciphertextParams, 'password', { format: CryptoJS.format.OpenSSL });
+ */
+ decrypt: function (cipher, ciphertext, password, cfg) {
+ // Apply config defaults
+ cfg = this.cfg.extend(cfg);
+
+ // Convert string to CipherParams
+ ciphertext = this._parse(ciphertext, cfg.format);
+
+ // Derive key and other params
+ var derivedParams = cfg.kdf.execute(password, cipher.keySize, cipher.ivSize, ciphertext.salt);
+
+ // Add IV to config
+ cfg.iv = derivedParams.iv;
+
+ // Decrypt
+ var plaintext = SerializableCipher.decrypt.call(this, cipher, ciphertext, derivedParams.key, cfg);
+
+ return plaintext;
+ }
+ });
+ }());
+
+
+ /**
+ * Cipher Feedback block mode.
+ */
+ CryptoJS.mode.CFB = (function () {
+ var CFB = CryptoJS.lib.BlockCipherMode.extend();
+
+ CFB.Encryptor = CFB.extend({
+ processBlock: function (words, offset) {
+ // Shortcuts
+ var cipher = this._cipher;
+ var blockSize = cipher.blockSize;
+
+ generateKeystreamAndEncrypt.call(this, words, offset, blockSize, cipher);
+
+ // Remember this block to use with next block
+ this._prevBlock = words.slice(offset, offset + blockSize);
+ }
+ });
+
+ CFB.Decryptor = CFB.extend({
+ processBlock: function (words, offset) {
+ // Shortcuts
+ var cipher = this._cipher;
+ var blockSize = cipher.blockSize;
+
+ // Remember this block to use with next block
+ var thisBlock = words.slice(offset, offset + blockSize);
+
+ generateKeystreamAndEncrypt.call(this, words, offset, blockSize, cipher);
+
+ // This block becomes the previous block
+ this._prevBlock = thisBlock;
+ }
+ });
+
+ function generateKeystreamAndEncrypt(words, offset, blockSize, cipher) {
+ var keystream;
+
+ // Shortcut
+ var iv = this._iv;
+
+ // Generate keystream
+ if (iv) {
+ keystream = iv.slice(0);
+
+ // Remove IV for subsequent blocks
+ this._iv = undefined;
+ } else {
+ keystream = this._prevBlock;
+ }
+ cipher.encryptBlock(keystream, 0);
+
+ // Encrypt
+ for (var i = 0; i < blockSize; i++) {
+ words[offset + i] ^= keystream[i];
+ }
+ }
+
+ return CFB;
+ }());
+
+
+ /**
+ * Counter block mode.
+ */
+ CryptoJS.mode.CTR = (function () {
+ var CTR = CryptoJS.lib.BlockCipherMode.extend();
+
+ var Encryptor = CTR.Encryptor = CTR.extend({
+ processBlock: function (words, offset) {
+ // Shortcuts
+ var cipher = this._cipher
+ var blockSize = cipher.blockSize;
+ var iv = this._iv;
+ var counter = this._counter;
+
+ // Generate keystream
+ if (iv) {
+ counter = this._counter = iv.slice(0);
+
+ // Remove IV for subsequent blocks
+ this._iv = undefined;
+ }
+ var keystream = counter.slice(0);
+ cipher.encryptBlock(keystream, 0);
+
+ // Increment counter
+ counter[blockSize - 1] = (counter[blockSize - 1] + 1) | 0
+
+ // Encrypt
+ for (var i = 0; i < blockSize; i++) {
+ words[offset + i] ^= keystream[i];
+ }
+ }
+ });
+
+ CTR.Decryptor = Encryptor;
+
+ return CTR;
+ }());
+
+
+ /** @preserve
+ * Counter block mode compatible with Dr Brian Gladman fileenc.c
+ * derived from CryptoJS.mode.CTR
+ * Jan Hruby jhruby.web@gmail.com
+ */
+ CryptoJS.mode.CTRGladman = (function () {
+ var CTRGladman = CryptoJS.lib.BlockCipherMode.extend();
+
+ function incWord(word)
+ {
+ if (((word >> 24) & 0xff) === 0xff) { //overflow
+ var b1 = (word >> 16)&0xff;
+ var b2 = (word >> 8)&0xff;
+ var b3 = word & 0xff;
+
+ if (b1 === 0xff) // overflow b1
+ {
+ b1 = 0;
+ if (b2 === 0xff)
+ {
+ b2 = 0;
+ if (b3 === 0xff)
+ {
+ b3 = 0;
+ }
+ else
+ {
+ ++b3;
+ }
+ }
+ else
+ {
+ ++b2;
+ }
+ }
+ else
+ {
+ ++b1;
+ }
+
+ word = 0;
+ word += (b1 << 16);
+ word += (b2 << 8);
+ word += b3;
+ }
+ else
+ {
+ word += (0x01 << 24);
+ }
+ return word;
+ }
+
+ function incCounter(counter)
+ {
+ if ((counter[0] = incWord(counter[0])) === 0)
+ {
+ // encr_data in fileenc.c from Dr Brian Gladman's counts only with DWORD j < 8
+ counter[1] = incWord(counter[1]);
+ }
+ return counter;
+ }
+
+ var Encryptor = CTRGladman.Encryptor = CTRGladman.extend({
+ processBlock: function (words, offset) {
+ // Shortcuts
+ var cipher = this._cipher
+ var blockSize = cipher.blockSize;
+ var iv = this._iv;
+ var counter = this._counter;
+
+ // Generate keystream
+ if (iv) {
+ counter = this._counter = iv.slice(0);
+
+ // Remove IV for subsequent blocks
+ this._iv = undefined;
+ }
+
+ incCounter(counter);
+
+ var keystream = counter.slice(0);
+ cipher.encryptBlock(keystream, 0);
+
+ // Encrypt
+ for (var i = 0; i < blockSize; i++) {
+ words[offset + i] ^= keystream[i];
+ }
+ }
+ });
+
+ CTRGladman.Decryptor = Encryptor;
+
+ return CTRGladman;
+ }());
+
+
+
+
+ /**
+ * Output Feedback block mode.
+ */
+ CryptoJS.mode.OFB = (function () {
+ var OFB = CryptoJS.lib.BlockCipherMode.extend();
+
+ var Encryptor = OFB.Encryptor = OFB.extend({
+ processBlock: function (words, offset) {
+ // Shortcuts
+ var cipher = this._cipher
+ var blockSize = cipher.blockSize;
+ var iv = this._iv;
+ var keystream = this._keystream;
+
+ // Generate keystream
+ if (iv) {
+ keystream = this._keystream = iv.slice(0);
+
+ // Remove IV for subsequent blocks
+ this._iv = undefined;
+ }
+ cipher.encryptBlock(keystream, 0);
+
+ // Encrypt
+ for (var i = 0; i < blockSize; i++) {
+ words[offset + i] ^= keystream[i];
+ }
+ }
+ });
+
+ OFB.Decryptor = Encryptor;
+
+ return OFB;
+ }());
+
+
+ /**
+ * Electronic Codebook block mode.
+ */
+ CryptoJS.mode.ECB = (function () {
+ var ECB = CryptoJS.lib.BlockCipherMode.extend();
+
+ ECB.Encryptor = ECB.extend({
+ processBlock: function (words, offset) {
+ this._cipher.encryptBlock(words, offset);
+ }
+ });
+
+ ECB.Decryptor = ECB.extend({
+ processBlock: function (words, offset) {
+ this._cipher.decryptBlock(words, offset);
+ }
+ });
+
+ return ECB;
+ }());
+
+
+ /**
+ * ANSI X.923 padding strategy.
+ */
+ CryptoJS.pad.AnsiX923 = {
+ pad: function (data, blockSize) {
+ // Shortcuts
+ var dataSigBytes = data.sigBytes;
+ var blockSizeBytes = blockSize * 4;
+
+ // Count padding bytes
+ var nPaddingBytes = blockSizeBytes - dataSigBytes % blockSizeBytes;
+
+ // Compute last byte position
+ var lastBytePos = dataSigBytes + nPaddingBytes - 1;
+
+ // Pad
+ data.clamp();
+ data.words[lastBytePos >>> 2] |= nPaddingBytes << (24 - (lastBytePos % 4) * 8);
+ data.sigBytes += nPaddingBytes;
+ },
+
+ unpad: function (data) {
+ // Get number of padding bytes from last byte
+ var nPaddingBytes = data.words[(data.sigBytes - 1) >>> 2] & 0xff;
+
+ // Remove padding
+ data.sigBytes -= nPaddingBytes;
+ }
+ };
+
+
+ /**
+ * ISO 10126 padding strategy.
+ */
+ CryptoJS.pad.Iso10126 = {
+ pad: function (data, blockSize) {
+ // Shortcut
+ var blockSizeBytes = blockSize * 4;
+
+ // Count padding bytes
+ var nPaddingBytes = blockSizeBytes - data.sigBytes % blockSizeBytes;
+
+ // Pad
+ data.concat(CryptoJS.lib.WordArray.random(nPaddingBytes - 1)).
+ concat(CryptoJS.lib.WordArray.create([nPaddingBytes << 24], 1));
+ },
+
+ unpad: function (data) {
+ // Get number of padding bytes from last byte
+ var nPaddingBytes = data.words[(data.sigBytes - 1) >>> 2] & 0xff;
+
+ // Remove padding
+ data.sigBytes -= nPaddingBytes;
+ }
+ };
+
+
+ /**
+ * ISO/IEC 9797-1 Padding Method 2.
+ */
+ CryptoJS.pad.Iso97971 = {
+ pad: function (data, blockSize) {
+ // Add 0x80 byte
+ data.concat(CryptoJS.lib.WordArray.create([0x80000000], 1));
+
+ // Zero pad the rest
+ CryptoJS.pad.ZeroPadding.pad(data, blockSize);
+ },
+
+ unpad: function (data) {
+ // Remove zero padding
+ CryptoJS.pad.ZeroPadding.unpad(data);
+
+ // Remove one more byte -- the 0x80 byte
+ data.sigBytes--;
+ }
+ };
+
+
+ /**
+ * Zero padding strategy.
+ */
+ CryptoJS.pad.ZeroPadding = {
+ pad: function (data, blockSize) {
+ // Shortcut
+ var blockSizeBytes = blockSize * 4;
+
+ // Pad
+ data.clamp();
+ data.sigBytes += blockSizeBytes - ((data.sigBytes % blockSizeBytes) || blockSizeBytes);
+ },
+
+ unpad: function (data) {
+ // Shortcut
+ var dataWords = data.words;
+
+ // Unpad
+ var i = data.sigBytes - 1;
+ for (var i = data.sigBytes - 1; i >= 0; i--) {
+ if (((dataWords[i >>> 2] >>> (24 - (i % 4) * 8)) & 0xff)) {
+ data.sigBytes = i + 1;
+ break;
+ }
+ }
+ }
+ };
+
+
+ /**
+ * A noop padding strategy.
+ */
+ CryptoJS.pad.NoPadding = {
+ pad: function () {
+ },
+
+ unpad: function () {
+ }
+ };
+
+
+ (function (undefined) {
+ // Shortcuts
+ var C = CryptoJS;
+ var C_lib = C.lib;
+ var CipherParams = C_lib.CipherParams;
+ var C_enc = C.enc;
+ var Hex = C_enc.Hex;
+ var C_format = C.format;
+
+ var HexFormatter = C_format.Hex = {
+ /**
+ * Converts the ciphertext of a cipher params object to a hexadecimally encoded string.
+ *
+ * @param {CipherParams} cipherParams The cipher params object.
+ *
+ * @return {string} The hexadecimally encoded string.
+ *
+ * @static
+ *
+ * @example
+ *
+ * var hexString = CryptoJS.format.Hex.stringify(cipherParams);
+ */
+ stringify: function (cipherParams) {
+ return cipherParams.ciphertext.toString(Hex);
+ },
+
+ /**
+ * Converts a hexadecimally encoded ciphertext string to a cipher params object.
+ *
+ * @param {string} input The hexadecimally encoded string.
+ *
+ * @return {CipherParams} The cipher params object.
+ *
+ * @static
+ *
+ * @example
+ *
+ * var cipherParams = CryptoJS.format.Hex.parse(hexString);
+ */
+ parse: function (input) {
+ var ciphertext = Hex.parse(input);
+ return CipherParams.create({ ciphertext: ciphertext });
+ }
+ };
+ }());
+
+
+ (function () {
+ // Shortcuts
+ var C = CryptoJS;
+ var C_lib = C.lib;
+ var BlockCipher = C_lib.BlockCipher;
+ var C_algo = C.algo;
+
+ // Lookup tables
+ var SBOX = [];
+ var INV_SBOX = [];
+ var SUB_MIX_0 = [];
+ var SUB_MIX_1 = [];
+ var SUB_MIX_2 = [];
+ var SUB_MIX_3 = [];
+ var INV_SUB_MIX_0 = [];
+ var INV_SUB_MIX_1 = [];
+ var INV_SUB_MIX_2 = [];
+ var INV_SUB_MIX_3 = [];
+
+ // Compute lookup tables
+ (function () {
+ // Compute double table
+ var d = [];
+ for (var i = 0; i < 256; i++) {
+ if (i < 128) {
+ d[i] = i << 1;
+ } else {
+ d[i] = (i << 1) ^ 0x11b;
+ }
+ }
+
+ // Walk GF(2^8)
+ var x = 0;
+ var xi = 0;
+ for (var i = 0; i < 256; i++) {
+ // Compute sbox
+ var sx = xi ^ (xi << 1) ^ (xi << 2) ^ (xi << 3) ^ (xi << 4);
+ sx = (sx >>> 8) ^ (sx & 0xff) ^ 0x63;
+ SBOX[x] = sx;
+ INV_SBOX[sx] = x;
+
+ // Compute multiplication
+ var x2 = d[x];
+ var x4 = d[x2];
+ var x8 = d[x4];
+
+ // Compute sub bytes, mix columns tables
+ var t = (d[sx] * 0x101) ^ (sx * 0x1010100);
+ SUB_MIX_0[x] = (t << 24) | (t >>> 8);
+ SUB_MIX_1[x] = (t << 16) | (t >>> 16);
+ SUB_MIX_2[x] = (t << 8) | (t >>> 24);
+ SUB_MIX_3[x] = t;
+
+ // Compute inv sub bytes, inv mix columns tables
+ var t = (x8 * 0x1010101) ^ (x4 * 0x10001) ^ (x2 * 0x101) ^ (x * 0x1010100);
+ INV_SUB_MIX_0[sx] = (t << 24) | (t >>> 8);
+ INV_SUB_MIX_1[sx] = (t << 16) | (t >>> 16);
+ INV_SUB_MIX_2[sx] = (t << 8) | (t >>> 24);
+ INV_SUB_MIX_3[sx] = t;
+
+ // Compute next counter
+ if (!x) {
+ x = xi = 1;
+ } else {
+ x = x2 ^ d[d[d[x8 ^ x2]]];
+ xi ^= d[d[xi]];
+ }
+ }
+ }());
+
+ // Precomputed Rcon lookup
+ var RCON = [0x00, 0x01, 0x02, 0x04, 0x08, 0x10, 0x20, 0x40, 0x80, 0x1b, 0x36];
+
+ /**
+ * AES block cipher algorithm.
+ */
+ var AES = C_algo.AES = BlockCipher.extend({
+ _doReset: function () {
+ var t;
+
+ // Skip reset of nRounds has been set before and key did not change
+ if (this._nRounds && this._keyPriorReset === this._key) {
+ return;
+ }
+
+ // Shortcuts
+ var key = this._keyPriorReset = this._key;
+ var keyWords = key.words;
+ var keySize = key.sigBytes / 4;
+
+ // Compute number of rounds
+ var nRounds = this._nRounds = keySize + 6;
+
+ // Compute number of key schedule rows
+ var ksRows = (nRounds + 1) * 4;
+
+ // Compute key schedule
+ var keySchedule = this._keySchedule = [];
+ for (var ksRow = 0; ksRow < ksRows; ksRow++) {
+ if (ksRow < keySize) {
+ keySchedule[ksRow] = keyWords[ksRow];
+ } else {
+ t = keySchedule[ksRow - 1];
+
+ if (!(ksRow % keySize)) {
+ // Rot word
+ t = (t << 8) | (t >>> 24);
+
+ // Sub word
+ t = (SBOX[t >>> 24] << 24) | (SBOX[(t >>> 16) & 0xff] << 16) | (SBOX[(t >>> 8) & 0xff] << 8) | SBOX[t & 0xff];
+
+ // Mix Rcon
+ t ^= RCON[(ksRow / keySize) | 0] << 24;
+ } else if (keySize > 6 && ksRow % keySize == 4) {
+ // Sub word
+ t = (SBOX[t >>> 24] << 24) | (SBOX[(t >>> 16) & 0xff] << 16) | (SBOX[(t >>> 8) & 0xff] << 8) | SBOX[t & 0xff];
+ }
+
+ keySchedule[ksRow] = keySchedule[ksRow - keySize] ^ t;
+ }
+ }
+
+ // Compute inv key schedule
+ var invKeySchedule = this._invKeySchedule = [];
+ for (var invKsRow = 0; invKsRow < ksRows; invKsRow++) {
+ var ksRow = ksRows - invKsRow;
+
+ if (invKsRow % 4) {
+ var t = keySchedule[ksRow];
+ } else {
+ var t = keySchedule[ksRow - 4];
+ }
+
+ if (invKsRow < 4 || ksRow <= 4) {
+ invKeySchedule[invKsRow] = t;
+ } else {
+ invKeySchedule[invKsRow] = INV_SUB_MIX_0[SBOX[t >>> 24]] ^ INV_SUB_MIX_1[SBOX[(t >>> 16) & 0xff]] ^
+ INV_SUB_MIX_2[SBOX[(t >>> 8) & 0xff]] ^ INV_SUB_MIX_3[SBOX[t & 0xff]];
+ }
+ }
+ },
+
+ encryptBlock: function (M, offset) {
+ this._doCryptBlock(M, offset, this._keySchedule, SUB_MIX_0, SUB_MIX_1, SUB_MIX_2, SUB_MIX_3, SBOX);
+ },
+
+ decryptBlock: function (M, offset) {
+ // Swap 2nd and 4th rows
+ var t = M[offset + 1];
+ M[offset + 1] = M[offset + 3];
+ M[offset + 3] = t;
+
+ this._doCryptBlock(M, offset, this._invKeySchedule, INV_SUB_MIX_0, INV_SUB_MIX_1, INV_SUB_MIX_2, INV_SUB_MIX_3, INV_SBOX);
+
+ // Inv swap 2nd and 4th rows
+ var t = M[offset + 1];
+ M[offset + 1] = M[offset + 3];
+ M[offset + 3] = t;
+ },
+
+ _doCryptBlock: function (M, offset, keySchedule, SUB_MIX_0, SUB_MIX_1, SUB_MIX_2, SUB_MIX_3, SBOX) {
+ // Shortcut
+ var nRounds = this._nRounds;
+
+ // Get input, add round key
+ var s0 = M[offset] ^ keySchedule[0];
+ var s1 = M[offset + 1] ^ keySchedule[1];
+ var s2 = M[offset + 2] ^ keySchedule[2];
+ var s3 = M[offset + 3] ^ keySchedule[3];
+
+ // Key schedule row counter
+ var ksRow = 4;
+
+ // Rounds
+ for (var round = 1; round < nRounds; round++) {
+ // Shift rows, sub bytes, mix columns, add round key
+ var t0 = SUB_MIX_0[s0 >>> 24] ^ SUB_MIX_1[(s1 >>> 16) & 0xff] ^ SUB_MIX_2[(s2 >>> 8) & 0xff] ^ SUB_MIX_3[s3 & 0xff] ^ keySchedule[ksRow++];
+ var t1 = SUB_MIX_0[s1 >>> 24] ^ SUB_MIX_1[(s2 >>> 16) & 0xff] ^ SUB_MIX_2[(s3 >>> 8) & 0xff] ^ SUB_MIX_3[s0 & 0xff] ^ keySchedule[ksRow++];
+ var t2 = SUB_MIX_0[s2 >>> 24] ^ SUB_MIX_1[(s3 >>> 16) & 0xff] ^ SUB_MIX_2[(s0 >>> 8) & 0xff] ^ SUB_MIX_3[s1 & 0xff] ^ keySchedule[ksRow++];
+ var t3 = SUB_MIX_0[s3 >>> 24] ^ SUB_MIX_1[(s0 >>> 16) & 0xff] ^ SUB_MIX_2[(s1 >>> 8) & 0xff] ^ SUB_MIX_3[s2 & 0xff] ^ keySchedule[ksRow++];
+
+ // Update state
+ s0 = t0;
+ s1 = t1;
+ s2 = t2;
+ s3 = t3;
+ }
+
+ // Shift rows, sub bytes, add round key
+ var t0 = ((SBOX[s0 >>> 24] << 24) | (SBOX[(s1 >>> 16) & 0xff] << 16) | (SBOX[(s2 >>> 8) & 0xff] << 8) | SBOX[s3 & 0xff]) ^ keySchedule[ksRow++];
+ var t1 = ((SBOX[s1 >>> 24] << 24) | (SBOX[(s2 >>> 16) & 0xff] << 16) | (SBOX[(s3 >>> 8) & 0xff] << 8) | SBOX[s0 & 0xff]) ^ keySchedule[ksRow++];
+ var t2 = ((SBOX[s2 >>> 24] << 24) | (SBOX[(s3 >>> 16) & 0xff] << 16) | (SBOX[(s0 >>> 8) & 0xff] << 8) | SBOX[s1 & 0xff]) ^ keySchedule[ksRow++];
+ var t3 = ((SBOX[s3 >>> 24] << 24) | (SBOX[(s0 >>> 16) & 0xff] << 16) | (SBOX[(s1 >>> 8) & 0xff] << 8) | SBOX[s2 & 0xff]) ^ keySchedule[ksRow++];
+
+ // Set output
+ M[offset] = t0;
+ M[offset + 1] = t1;
+ M[offset + 2] = t2;
+ M[offset + 3] = t3;
+ },
+
+ keySize: 256/32
+ });
+
+ /**
+ * Shortcut functions to the cipher's object interface.
+ *
+ * @example
+ *
+ * var ciphertext = CryptoJS.AES.encrypt(message, key, cfg);
+ * var plaintext = CryptoJS.AES.decrypt(ciphertext, key, cfg);
+ */
+ C.AES = BlockCipher._createHelper(AES);
+ }());
+
+
+ (function () {
+ // Shortcuts
+ var C = CryptoJS;
+ var C_lib = C.lib;
+ var WordArray = C_lib.WordArray;
+ var BlockCipher = C_lib.BlockCipher;
+ var C_algo = C.algo;
+
+ // Permuted Choice 1 constants
+ var PC1 = [
+ 57, 49, 41, 33, 25, 17, 9, 1,
+ 58, 50, 42, 34, 26, 18, 10, 2,
+ 59, 51, 43, 35, 27, 19, 11, 3,
+ 60, 52, 44, 36, 63, 55, 47, 39,
+ 31, 23, 15, 7, 62, 54, 46, 38,
+ 30, 22, 14, 6, 61, 53, 45, 37,
+ 29, 21, 13, 5, 28, 20, 12, 4
+ ];
+
+ // Permuted Choice 2 constants
+ var PC2 = [
+ 14, 17, 11, 24, 1, 5,
+ 3, 28, 15, 6, 21, 10,
+ 23, 19, 12, 4, 26, 8,
+ 16, 7, 27, 20, 13, 2,
+ 41, 52, 31, 37, 47, 55,
+ 30, 40, 51, 45, 33, 48,
+ 44, 49, 39, 56, 34, 53,
+ 46, 42, 50, 36, 29, 32
+ ];
+
+ // Cumulative bit shift constants
+ var BIT_SHIFTS = [1, 2, 4, 6, 8, 10, 12, 14, 15, 17, 19, 21, 23, 25, 27, 28];
+
+ // SBOXes and round permutation constants
+ var SBOX_P = [
+ {
+ 0x0: 0x808200,
+ 0x10000000: 0x8000,
+ 0x20000000: 0x808002,
+ 0x30000000: 0x2,
+ 0x40000000: 0x200,
+ 0x50000000: 0x808202,
+ 0x60000000: 0x800202,
+ 0x70000000: 0x800000,
+ 0x80000000: 0x202,
+ 0x90000000: 0x800200,
+ 0xa0000000: 0x8200,
+ 0xb0000000: 0x808000,
+ 0xc0000000: 0x8002,
+ 0xd0000000: 0x800002,
+ 0xe0000000: 0x0,
+ 0xf0000000: 0x8202,
+ 0x8000000: 0x0,
+ 0x18000000: 0x808202,
+ 0x28000000: 0x8202,
+ 0x38000000: 0x8000,
+ 0x48000000: 0x808200,
+ 0x58000000: 0x200,
+ 0x68000000: 0x808002,
+ 0x78000000: 0x2,
+ 0x88000000: 0x800200,
+ 0x98000000: 0x8200,
+ 0xa8000000: 0x808000,
+ 0xb8000000: 0x800202,
+ 0xc8000000: 0x800002,
+ 0xd8000000: 0x8002,
+ 0xe8000000: 0x202,
+ 0xf8000000: 0x800000,
+ 0x1: 0x8000,
+ 0x10000001: 0x2,
+ 0x20000001: 0x808200,
+ 0x30000001: 0x800000,
+ 0x40000001: 0x808002,
+ 0x50000001: 0x8200,
+ 0x60000001: 0x200,
+ 0x70000001: 0x800202,
+ 0x80000001: 0x808202,
+ 0x90000001: 0x808000,
+ 0xa0000001: 0x800002,
+ 0xb0000001: 0x8202,
+ 0xc0000001: 0x202,
+ 0xd0000001: 0x800200,
+ 0xe0000001: 0x8002,
+ 0xf0000001: 0x0,
+ 0x8000001: 0x808202,
+ 0x18000001: 0x808000,
+ 0x28000001: 0x800000,
+ 0x38000001: 0x200,
+ 0x48000001: 0x8000,
+ 0x58000001: 0x800002,
+ 0x68000001: 0x2,
+ 0x78000001: 0x8202,
+ 0x88000001: 0x8002,
+ 0x98000001: 0x800202,
+ 0xa8000001: 0x202,
+ 0xb8000001: 0x808200,
+ 0xc8000001: 0x800200,
+ 0xd8000001: 0x0,
+ 0xe8000001: 0x8200,
+ 0xf8000001: 0x808002
+ },
+ {
+ 0x0: 0x40084010,
+ 0x1000000: 0x4000,
+ 0x2000000: 0x80000,
+ 0x3000000: 0x40080010,
+ 0x4000000: 0x40000010,
+ 0x5000000: 0x40084000,
+ 0x6000000: 0x40004000,
+ 0x7000000: 0x10,
+ 0x8000000: 0x84000,
+ 0x9000000: 0x40004010,
+ 0xa000000: 0x40000000,
+ 0xb000000: 0x84010,
+ 0xc000000: 0x80010,
+ 0xd000000: 0x0,
+ 0xe000000: 0x4010,
+ 0xf000000: 0x40080000,
+ 0x800000: 0x40004000,
+ 0x1800000: 0x84010,
+ 0x2800000: 0x10,
+ 0x3800000: 0x40004010,
+ 0x4800000: 0x40084010,
+ 0x5800000: 0x40000000,
+ 0x6800000: 0x80000,
+ 0x7800000: 0x40080010,
+ 0x8800000: 0x80010,
+ 0x9800000: 0x0,
+ 0xa800000: 0x4000,
+ 0xb800000: 0x40080000,
+ 0xc800000: 0x40000010,
+ 0xd800000: 0x84000,
+ 0xe800000: 0x40084000,
+ 0xf800000: 0x4010,
+ 0x10000000: 0x0,
+ 0x11000000: 0x40080010,
+ 0x12000000: 0x40004010,
+ 0x13000000: 0x40084000,
+ 0x14000000: 0x40080000,
+ 0x15000000: 0x10,
+ 0x16000000: 0x84010,
+ 0x17000000: 0x4000,
+ 0x18000000: 0x4010,
+ 0x19000000: 0x80000,
+ 0x1a000000: 0x80010,
+ 0x1b000000: 0x40000010,
+ 0x1c000000: 0x84000,
+ 0x1d000000: 0x40004000,
+ 0x1e000000: 0x40000000,
+ 0x1f000000: 0x40084010,
+ 0x10800000: 0x84010,
+ 0x11800000: 0x80000,
+ 0x12800000: 0x40080000,
+ 0x13800000: 0x4000,
+ 0x14800000: 0x40004000,
+ 0x15800000: 0x40084010,
+ 0x16800000: 0x10,
+ 0x17800000: 0x40000000,
+ 0x18800000: 0x40084000,
+ 0x19800000: 0x40000010,
+ 0x1a800000: 0x40004010,
+ 0x1b800000: 0x80010,
+ 0x1c800000: 0x0,
+ 0x1d800000: 0x4010,
+ 0x1e800000: 0x40080010,
+ 0x1f800000: 0x84000
+ },
+ {
+ 0x0: 0x104,
+ 0x100000: 0x0,
+ 0x200000: 0x4000100,
+ 0x300000: 0x10104,
+ 0x400000: 0x10004,
+ 0x500000: 0x4000004,
+ 0x600000: 0x4010104,
+ 0x700000: 0x4010000,
+ 0x800000: 0x4000000,
+ 0x900000: 0x4010100,
+ 0xa00000: 0x10100,
+ 0xb00000: 0x4010004,
+ 0xc00000: 0x4000104,
+ 0xd00000: 0x10000,
+ 0xe00000: 0x4,
+ 0xf00000: 0x100,
+ 0x80000: 0x4010100,
+ 0x180000: 0x4010004,
+ 0x280000: 0x0,
+ 0x380000: 0x4000100,
+ 0x480000: 0x4000004,
+ 0x580000: 0x10000,
+ 0x680000: 0x10004,
+ 0x780000: 0x104,
+ 0x880000: 0x4,
+ 0x980000: 0x100,
+ 0xa80000: 0x4010000,
+ 0xb80000: 0x10104,
+ 0xc80000: 0x10100,
+ 0xd80000: 0x4000104,
+ 0xe80000: 0x4010104,
+ 0xf80000: 0x4000000,
+ 0x1000000: 0x4010100,
+ 0x1100000: 0x10004,
+ 0x1200000: 0x10000,
+ 0x1300000: 0x4000100,
+ 0x1400000: 0x100,
+ 0x1500000: 0x4010104,
+ 0x1600000: 0x4000004,
+ 0x1700000: 0x0,
+ 0x1800000: 0x4000104,
+ 0x1900000: 0x4000000,
+ 0x1a00000: 0x4,
+ 0x1b00000: 0x10100,
+ 0x1c00000: 0x4010000,
+ 0x1d00000: 0x104,
+ 0x1e00000: 0x10104,
+ 0x1f00000: 0x4010004,
+ 0x1080000: 0x4000000,
+ 0x1180000: 0x104,
+ 0x1280000: 0x4010100,
+ 0x1380000: 0x0,
+ 0x1480000: 0x10004,
+ 0x1580000: 0x4000100,
+ 0x1680000: 0x100,
+ 0x1780000: 0x4010004,
+ 0x1880000: 0x10000,
+ 0x1980000: 0x4010104,
+ 0x1a80000: 0x10104,
+ 0x1b80000: 0x4000004,
+ 0x1c80000: 0x4000104,
+ 0x1d80000: 0x4010000,
+ 0x1e80000: 0x4,
+ 0x1f80000: 0x10100
+ },
+ {
+ 0x0: 0x80401000,
+ 0x10000: 0x80001040,
+ 0x20000: 0x401040,
+ 0x30000: 0x80400000,
+ 0x40000: 0x0,
+ 0x50000: 0x401000,
+ 0x60000: 0x80000040,
+ 0x70000: 0x400040,
+ 0x80000: 0x80000000,
+ 0x90000: 0x400000,
+ 0xa0000: 0x40,
+ 0xb0000: 0x80001000,
+ 0xc0000: 0x80400040,
+ 0xd0000: 0x1040,
+ 0xe0000: 0x1000,
+ 0xf0000: 0x80401040,
+ 0x8000: 0x80001040,
+ 0x18000: 0x40,
+ 0x28000: 0x80400040,
+ 0x38000: 0x80001000,
+ 0x48000: 0x401000,
+ 0x58000: 0x80401040,
+ 0x68000: 0x0,
+ 0x78000: 0x80400000,
+ 0x88000: 0x1000,
+ 0x98000: 0x80401000,
+ 0xa8000: 0x400000,
+ 0xb8000: 0x1040,
+ 0xc8000: 0x80000000,
+ 0xd8000: 0x400040,
+ 0xe8000: 0x401040,
+ 0xf8000: 0x80000040,
+ 0x100000: 0x400040,
+ 0x110000: 0x401000,
+ 0x120000: 0x80000040,
+ 0x130000: 0x0,
+ 0x140000: 0x1040,
+ 0x150000: 0x80400040,
+ 0x160000: 0x80401000,
+ 0x170000: 0x80001040,
+ 0x180000: 0x80401040,
+ 0x190000: 0x80000000,
+ 0x1a0000: 0x80400000,
+ 0x1b0000: 0x401040,
+ 0x1c0000: 0x80001000,
+ 0x1d0000: 0x400000,
+ 0x1e0000: 0x40,
+ 0x1f0000: 0x1000,
+ 0x108000: 0x80400000,
+ 0x118000: 0x80401040,
+ 0x128000: 0x0,
+ 0x138000: 0x401000,
+ 0x148000: 0x400040,
+ 0x158000: 0x80000000,
+ 0x168000: 0x80001040,
+ 0x178000: 0x40,
+ 0x188000: 0x80000040,
+ 0x198000: 0x1000,
+ 0x1a8000: 0x80001000,
+ 0x1b8000: 0x80400040,
+ 0x1c8000: 0x1040,
+ 0x1d8000: 0x80401000,
+ 0x1e8000: 0x400000,
+ 0x1f8000: 0x401040
+ },
+ {
+ 0x0: 0x80,
+ 0x1000: 0x1040000,
+ 0x2000: 0x40000,
+ 0x3000: 0x20000000,
+ 0x4000: 0x20040080,
+ 0x5000: 0x1000080,
+ 0x6000: 0x21000080,
+ 0x7000: 0x40080,
+ 0x8000: 0x1000000,
+ 0x9000: 0x20040000,
+ 0xa000: 0x20000080,
+ 0xb000: 0x21040080,
+ 0xc000: 0x21040000,
+ 0xd000: 0x0,
+ 0xe000: 0x1040080,
+ 0xf000: 0x21000000,
+ 0x800: 0x1040080,
+ 0x1800: 0x21000080,
+ 0x2800: 0x80,
+ 0x3800: 0x1040000,
+ 0x4800: 0x40000,
+ 0x5800: 0x20040080,
+ 0x6800: 0x21040000,
+ 0x7800: 0x20000000,
+ 0x8800: 0x20040000,
+ 0x9800: 0x0,
+ 0xa800: 0x21040080,
+ 0xb800: 0x1000080,
+ 0xc800: 0x20000080,
+ 0xd800: 0x21000000,
+ 0xe800: 0x1000000,
+ 0xf800: 0x40080,
+ 0x10000: 0x40000,
+ 0x11000: 0x80,
+ 0x12000: 0x20000000,
+ 0x13000: 0x21000080,
+ 0x14000: 0x1000080,
+ 0x15000: 0x21040000,
+ 0x16000: 0x20040080,
+ 0x17000: 0x1000000,
+ 0x18000: 0x21040080,
+ 0x19000: 0x21000000,
+ 0x1a000: 0x1040000,
+ 0x1b000: 0x20040000,
+ 0x1c000: 0x40080,
+ 0x1d000: 0x20000080,
+ 0x1e000: 0x0,
+ 0x1f000: 0x1040080,
+ 0x10800: 0x21000080,
+ 0x11800: 0x1000000,
+ 0x12800: 0x1040000,
+ 0x13800: 0x20040080,
+ 0x14800: 0x20000000,
+ 0x15800: 0x1040080,
+ 0x16800: 0x80,
+ 0x17800: 0x21040000,
+ 0x18800: 0x40080,
+ 0x19800: 0x21040080,
+ 0x1a800: 0x0,
+ 0x1b800: 0x21000000,
+ 0x1c800: 0x1000080,
+ 0x1d800: 0x40000,
+ 0x1e800: 0x20040000,
+ 0x1f800: 0x20000080
+ },
+ {
+ 0x0: 0x10000008,
+ 0x100: 0x2000,
+ 0x200: 0x10200000,
+ 0x300: 0x10202008,
+ 0x400: 0x10002000,
+ 0x500: 0x200000,
+ 0x600: 0x200008,
+ 0x700: 0x10000000,
+ 0x800: 0x0,
+ 0x900: 0x10002008,
+ 0xa00: 0x202000,
+ 0xb00: 0x8,
+ 0xc00: 0x10200008,
+ 0xd00: 0x202008,
+ 0xe00: 0x2008,
+ 0xf00: 0x10202000,
+ 0x80: 0x10200000,
+ 0x180: 0x10202008,
+ 0x280: 0x8,
+ 0x380: 0x200000,
+ 0x480: 0x202008,
+ 0x580: 0x10000008,
+ 0x680: 0x10002000,
+ 0x780: 0x2008,
+ 0x880: 0x200008,
+ 0x980: 0x2000,
+ 0xa80: 0x10002008,
+ 0xb80: 0x10200008,
+ 0xc80: 0x0,
+ 0xd80: 0x10202000,
+ 0xe80: 0x202000,
+ 0xf80: 0x10000000,
+ 0x1000: 0x10002000,
+ 0x1100: 0x10200008,
+ 0x1200: 0x10202008,
+ 0x1300: 0x2008,
+ 0x1400: 0x200000,
+ 0x1500: 0x10000000,
+ 0x1600: 0x10000008,
+ 0x1700: 0x202000,
+ 0x1800: 0x202008,
+ 0x1900: 0x0,
+ 0x1a00: 0x8,
+ 0x1b00: 0x10200000,
+ 0x1c00: 0x2000,
+ 0x1d00: 0x10002008,
+ 0x1e00: 0x10202000,
+ 0x1f00: 0x200008,
+ 0x1080: 0x8,
+ 0x1180: 0x202000,
+ 0x1280: 0x200000,
+ 0x1380: 0x10000008,
+ 0x1480: 0x10002000,
+ 0x1580: 0x2008,
+ 0x1680: 0x10202008,
+ 0x1780: 0x10200000,
+ 0x1880: 0x10202000,
+ 0x1980: 0x10200008,
+ 0x1a80: 0x2000,
+ 0x1b80: 0x202008,
+ 0x1c80: 0x200008,
+ 0x1d80: 0x0,
+ 0x1e80: 0x10000000,
+ 0x1f80: 0x10002008
+ },
+ {
+ 0x0: 0x100000,
+ 0x10: 0x2000401,
+ 0x20: 0x400,
+ 0x30: 0x100401,
+ 0x40: 0x2100401,
+ 0x50: 0x0,
+ 0x60: 0x1,
+ 0x70: 0x2100001,
+ 0x80: 0x2000400,
+ 0x90: 0x100001,
+ 0xa0: 0x2000001,
+ 0xb0: 0x2100400,
+ 0xc0: 0x2100000,
+ 0xd0: 0x401,
+ 0xe0: 0x100400,
+ 0xf0: 0x2000000,
+ 0x8: 0x2100001,
+ 0x18: 0x0,
+ 0x28: 0x2000401,
+ 0x38: 0x2100400,
+ 0x48: 0x100000,
+ 0x58: 0x2000001,
+ 0x68: 0x2000000,
+ 0x78: 0x401,
+ 0x88: 0x100401,
+ 0x98: 0x2000400,
+ 0xa8: 0x2100000,
+ 0xb8: 0x100001,
+ 0xc8: 0x400,
+ 0xd8: 0x2100401,
+ 0xe8: 0x1,
+ 0xf8: 0x100400,
+ 0x100: 0x2000000,
+ 0x110: 0x100000,
+ 0x120: 0x2000401,
+ 0x130: 0x2100001,
+ 0x140: 0x100001,
+ 0x150: 0x2000400,
+ 0x160: 0x2100400,
+ 0x170: 0x100401,
+ 0x180: 0x401,
+ 0x190: 0x2100401,
+ 0x1a0: 0x100400,
+ 0x1b0: 0x1,
+ 0x1c0: 0x0,
+ 0x1d0: 0x2100000,
+ 0x1e0: 0x2000001,
+ 0x1f0: 0x400,
+ 0x108: 0x100400,
+ 0x118: 0x2000401,
+ 0x128: 0x2100001,
+ 0x138: 0x1,
+ 0x148: 0x2000000,
+ 0x158: 0x100000,
+ 0x168: 0x401,
+ 0x178: 0x2100400,
+ 0x188: 0x2000001,
+ 0x198: 0x2100000,
+ 0x1a8: 0x0,
+ 0x1b8: 0x2100401,
+ 0x1c8: 0x100401,
+ 0x1d8: 0x400,
+ 0x1e8: 0x2000400,
+ 0x1f8: 0x100001
+ },
+ {
+ 0x0: 0x8000820,
+ 0x1: 0x20000,
+ 0x2: 0x8000000,
+ 0x3: 0x20,
+ 0x4: 0x20020,
+ 0x5: 0x8020820,
+ 0x6: 0x8020800,
+ 0x7: 0x800,
+ 0x8: 0x8020000,
+ 0x9: 0x8000800,
+ 0xa: 0x20800,
+ 0xb: 0x8020020,
+ 0xc: 0x820,
+ 0xd: 0x0,
+ 0xe: 0x8000020,
+ 0xf: 0x20820,
+ 0x80000000: 0x800,
+ 0x80000001: 0x8020820,
+ 0x80000002: 0x8000820,
+ 0x80000003: 0x8000000,
+ 0x80000004: 0x8020000,
+ 0x80000005: 0x20800,
+ 0x80000006: 0x20820,
+ 0x80000007: 0x20,
+ 0x80000008: 0x8000020,
+ 0x80000009: 0x820,
+ 0x8000000a: 0x20020,
+ 0x8000000b: 0x8020800,
+ 0x8000000c: 0x0,
+ 0x8000000d: 0x8020020,
+ 0x8000000e: 0x8000800,
+ 0x8000000f: 0x20000,
+ 0x10: 0x20820,
+ 0x11: 0x8020800,
+ 0x12: 0x20,
+ 0x13: 0x800,
+ 0x14: 0x8000800,
+ 0x15: 0x8000020,
+ 0x16: 0x8020020,
+ 0x17: 0x20000,
+ 0x18: 0x0,
+ 0x19: 0x20020,
+ 0x1a: 0x8020000,
+ 0x1b: 0x8000820,
+ 0x1c: 0x8020820,
+ 0x1d: 0x20800,
+ 0x1e: 0x820,
+ 0x1f: 0x8000000,
+ 0x80000010: 0x20000,
+ 0x80000011: 0x800,
+ 0x80000012: 0x8020020,
+ 0x80000013: 0x20820,
+ 0x80000014: 0x20,
+ 0x80000015: 0x8020000,
+ 0x80000016: 0x8000000,
+ 0x80000017: 0x8000820,
+ 0x80000018: 0x8020820,
+ 0x80000019: 0x8000020,
+ 0x8000001a: 0x8000800,
+ 0x8000001b: 0x0,
+ 0x8000001c: 0x20800,
+ 0x8000001d: 0x820,
+ 0x8000001e: 0x20020,
+ 0x8000001f: 0x8020800
+ }
+ ];
+
+ // Masks that select the SBOX input
+ var SBOX_MASK = [
+ 0xf8000001, 0x1f800000, 0x01f80000, 0x001f8000,
+ 0x0001f800, 0x00001f80, 0x000001f8, 0x8000001f
+ ];
+
+ /**
+ * DES block cipher algorithm.
+ */
+ var DES = C_algo.DES = BlockCipher.extend({
+ _doReset: function () {
+ // Shortcuts
+ var key = this._key;
+ var keyWords = key.words;
+
+ // Select 56 bits according to PC1
+ var keyBits = [];
+ for (var i = 0; i < 56; i++) {
+ var keyBitPos = PC1[i] - 1;
+ keyBits[i] = (keyWords[keyBitPos >>> 5] >>> (31 - keyBitPos % 32)) & 1;
+ }
+
+ // Assemble 16 subkeys
+ var subKeys = this._subKeys = [];
+ for (var nSubKey = 0; nSubKey < 16; nSubKey++) {
+ // Create subkey
+ var subKey = subKeys[nSubKey] = [];
+
+ // Shortcut
+ var bitShift = BIT_SHIFTS[nSubKey];
+
+ // Select 48 bits according to PC2
+ for (var i = 0; i < 24; i++) {
+ // Select from the left 28 key bits
+ subKey[(i / 6) | 0] |= keyBits[((PC2[i] - 1) + bitShift) % 28] << (31 - i % 6);
+
+ // Select from the right 28 key bits
+ subKey[4 + ((i / 6) | 0)] |= keyBits[28 + (((PC2[i + 24] - 1) + bitShift) % 28)] << (31 - i % 6);
+ }
+
+ // Since each subkey is applied to an expanded 32-bit input,
+ // the subkey can be broken into 8 values scaled to 32-bits,
+ // which allows the key to be used without expansion
+ subKey[0] = (subKey[0] << 1) | (subKey[0] >>> 31);
+ for (var i = 1; i < 7; i++) {
+ subKey[i] = subKey[i] >>> ((i - 1) * 4 + 3);
+ }
+ subKey[7] = (subKey[7] << 5) | (subKey[7] >>> 27);
+ }
+
+ // Compute inverse subkeys
+ var invSubKeys = this._invSubKeys = [];
+ for (var i = 0; i < 16; i++) {
+ invSubKeys[i] = subKeys[15 - i];
+ }
+ },
+
+ encryptBlock: function (M, offset) {
+ this._doCryptBlock(M, offset, this._subKeys);
+ },
+
+ decryptBlock: function (M, offset) {
+ this._doCryptBlock(M, offset, this._invSubKeys);
+ },
+
+ _doCryptBlock: function (M, offset, subKeys) {
+ // Get input
+ this._lBlock = M[offset];
+ this._rBlock = M[offset + 1];
+
+ // Initial permutation
+ exchangeLR.call(this, 4, 0x0f0f0f0f);
+ exchangeLR.call(this, 16, 0x0000ffff);
+ exchangeRL.call(this, 2, 0x33333333);
+ exchangeRL.call(this, 8, 0x00ff00ff);
+ exchangeLR.call(this, 1, 0x55555555);
+
+ // Rounds
+ for (var round = 0; round < 16; round++) {
+ // Shortcuts
+ var subKey = subKeys[round];
+ var lBlock = this._lBlock;
+ var rBlock = this._rBlock;
+
+ // Feistel function
+ var f = 0;
+ for (var i = 0; i < 8; i++) {
+ f |= SBOX_P[i][((rBlock ^ subKey[i]) & SBOX_MASK[i]) >>> 0];
+ }
+ this._lBlock = rBlock;
+ this._rBlock = lBlock ^ f;
+ }
+
+ // Undo swap from last round
+ var t = this._lBlock;
+ this._lBlock = this._rBlock;
+ this._rBlock = t;
+
+ // Final permutation
+ exchangeLR.call(this, 1, 0x55555555);
+ exchangeRL.call(this, 8, 0x00ff00ff);
+ exchangeRL.call(this, 2, 0x33333333);
+ exchangeLR.call(this, 16, 0x0000ffff);
+ exchangeLR.call(this, 4, 0x0f0f0f0f);
+
+ // Set output
+ M[offset] = this._lBlock;
+ M[offset + 1] = this._rBlock;
+ },
+
+ keySize: 64/32,
+
+ ivSize: 64/32,
+
+ blockSize: 64/32
+ });
+
+ // Swap bits across the left and right words
+ function exchangeLR(offset, mask) {
+ var t = ((this._lBlock >>> offset) ^ this._rBlock) & mask;
+ this._rBlock ^= t;
+ this._lBlock ^= t << offset;
+ }
+
+ function exchangeRL(offset, mask) {
+ var t = ((this._rBlock >>> offset) ^ this._lBlock) & mask;
+ this._lBlock ^= t;
+ this._rBlock ^= t << offset;
+ }
+
+ /**
+ * Shortcut functions to the cipher's object interface.
+ *
+ * @example
+ *
+ * var ciphertext = CryptoJS.DES.encrypt(message, key, cfg);
+ * var plaintext = CryptoJS.DES.decrypt(ciphertext, key, cfg);
+ */
+ C.DES = BlockCipher._createHelper(DES);
+
+ /**
+ * Triple-DES block cipher algorithm.
+ */
+ var TripleDES = C_algo.TripleDES = BlockCipher.extend({
+ _doReset: function () {
+ // Shortcuts
+ var key = this._key;
+ var keyWords = key.words;
+ // Make sure the key length is valid (64, 128 or >= 192 bit)
+ if (keyWords.length !== 2 && keyWords.length !== 4 && keyWords.length < 6) {
+ throw new Error('Invalid key length - 3DES requires the key length to be 64, 128, 192 or >192.');
+ }
+
+ // Extend the key according to the keying options defined in 3DES standard
+ var key1 = keyWords.slice(0, 2);
+ var key2 = keyWords.length < 4 ? keyWords.slice(0, 2) : keyWords.slice(2, 4);
+ var key3 = keyWords.length < 6 ? keyWords.slice(0, 2) : keyWords.slice(4, 6);
+
+ // Create DES instances
+ this._des1 = DES.createEncryptor(WordArray.create(key1));
+ this._des2 = DES.createEncryptor(WordArray.create(key2));
+ this._des3 = DES.createEncryptor(WordArray.create(key3));
+ },
+
+ encryptBlock: function (M, offset) {
+ this._des1.encryptBlock(M, offset);
+ this._des2.decryptBlock(M, offset);
+ this._des3.encryptBlock(M, offset);
+ },
+
+ decryptBlock: function (M, offset) {
+ this._des3.decryptBlock(M, offset);
+ this._des2.encryptBlock(M, offset);
+ this._des1.decryptBlock(M, offset);
+ },
+
+ keySize: 192/32,
+
+ ivSize: 64/32,
+
+ blockSize: 64/32
+ });
+
+ /**
+ * Shortcut functions to the cipher's object interface.
+ *
+ * @example
+ *
+ * var ciphertext = CryptoJS.TripleDES.encrypt(message, key, cfg);
+ * var plaintext = CryptoJS.TripleDES.decrypt(ciphertext, key, cfg);
+ */
+ C.TripleDES = BlockCipher._createHelper(TripleDES);
+ }());
+
+
+ (function () {
+ // Shortcuts
+ var C = CryptoJS;
+ var C_lib = C.lib;
+ var StreamCipher = C_lib.StreamCipher;
+ var C_algo = C.algo;
+
+ /**
+ * RC4 stream cipher algorithm.
+ */
+ var RC4 = C_algo.RC4 = StreamCipher.extend({
+ _doReset: function () {
+ // Shortcuts
+ var key = this._key;
+ var keyWords = key.words;
+ var keySigBytes = key.sigBytes;
+
+ // Init sbox
+ var S = this._S = [];
+ for (var i = 0; i < 256; i++) {
+ S[i] = i;
+ }
+
+ // Key setup
+ for (var i = 0, j = 0; i < 256; i++) {
+ var keyByteIndex = i % keySigBytes;
+ var keyByte = (keyWords[keyByteIndex >>> 2] >>> (24 - (keyByteIndex % 4) * 8)) & 0xff;
+
+ j = (j + S[i] + keyByte) % 256;
+
+ // Swap
+ var t = S[i];
+ S[i] = S[j];
+ S[j] = t;
+ }
+
+ // Counters
+ this._i = this._j = 0;
+ },
+
+ _doProcessBlock: function (M, offset) {
+ M[offset] ^= generateKeystreamWord.call(this);
+ },
+
+ keySize: 256/32,
+
+ ivSize: 0
+ });
+
+ function generateKeystreamWord() {
+ // Shortcuts
+ var S = this._S;
+ var i = this._i;
+ var j = this._j;
+
+ // Generate keystream word
+ var keystreamWord = 0;
+ for (var n = 0; n < 4; n++) {
+ i = (i + 1) % 256;
+ j = (j + S[i]) % 256;
+
+ // Swap
+ var t = S[i];
+ S[i] = S[j];
+ S[j] = t;
+
+ keystreamWord |= S[(S[i] + S[j]) % 256] << (24 - n * 8);
+ }
+
+ // Update counters
+ this._i = i;
+ this._j = j;
+
+ return keystreamWord;
+ }
+
+ /**
+ * Shortcut functions to the cipher's object interface.
+ *
+ * @example
+ *
+ * var ciphertext = CryptoJS.RC4.encrypt(message, key, cfg);
+ * var plaintext = CryptoJS.RC4.decrypt(ciphertext, key, cfg);
+ */
+ C.RC4 = StreamCipher._createHelper(RC4);
+
+ /**
+ * Modified RC4 stream cipher algorithm.
+ */
+ var RC4Drop = C_algo.RC4Drop = RC4.extend({
+ /**
+ * Configuration options.
+ *
+ * @property {number} drop The number of keystream words to drop. Default 192
+ */
+ cfg: RC4.cfg.extend({
+ drop: 192
+ }),
+
+ _doReset: function () {
+ RC4._doReset.call(this);
+
+ // Drop
+ for (var i = this.cfg.drop; i > 0; i--) {
+ generateKeystreamWord.call(this);
+ }
+ }
+ });
+
+ /**
+ * Shortcut functions to the cipher's object interface.
+ *
+ * @example
+ *
+ * var ciphertext = CryptoJS.RC4Drop.encrypt(message, key, cfg);
+ * var plaintext = CryptoJS.RC4Drop.decrypt(ciphertext, key, cfg);
+ */
+ C.RC4Drop = StreamCipher._createHelper(RC4Drop);
+ }());
+
+
+ (function () {
+ // Shortcuts
+ var C = CryptoJS;
+ var C_lib = C.lib;
+ var StreamCipher = C_lib.StreamCipher;
+ var C_algo = C.algo;
+
+ // Reusable objects
+ var S = [];
+ var C_ = [];
+ var G = [];
+
+ /**
+ * Rabbit stream cipher algorithm
+ */
+ var Rabbit = C_algo.Rabbit = StreamCipher.extend({
+ _doReset: function () {
+ // Shortcuts
+ var K = this._key.words;
+ var iv = this.cfg.iv;
+
+ // Swap endian
+ for (var i = 0; i < 4; i++) {
+ K[i] = (((K[i] << 8) | (K[i] >>> 24)) & 0x00ff00ff) |
+ (((K[i] << 24) | (K[i] >>> 8)) & 0xff00ff00);
+ }
+
+ // Generate initial state values
+ var X = this._X = [
+ K[0], (K[3] << 16) | (K[2] >>> 16),
+ K[1], (K[0] << 16) | (K[3] >>> 16),
+ K[2], (K[1] << 16) | (K[0] >>> 16),
+ K[3], (K[2] << 16) | (K[1] >>> 16)
+ ];
+
+ // Generate initial counter values
+ var C = this._C = [
+ (K[2] << 16) | (K[2] >>> 16), (K[0] & 0xffff0000) | (K[1] & 0x0000ffff),
+ (K[3] << 16) | (K[3] >>> 16), (K[1] & 0xffff0000) | (K[2] & 0x0000ffff),
+ (K[0] << 16) | (K[0] >>> 16), (K[2] & 0xffff0000) | (K[3] & 0x0000ffff),
+ (K[1] << 16) | (K[1] >>> 16), (K[3] & 0xffff0000) | (K[0] & 0x0000ffff)
+ ];
+
+ // Carry bit
+ this._b = 0;
+
+ // Iterate the system four times
+ for (var i = 0; i < 4; i++) {
+ nextState.call(this);
+ }
+
+ // Modify the counters
+ for (var i = 0; i < 8; i++) {
+ C[i] ^= X[(i + 4) & 7];
+ }
+
+ // IV setup
+ if (iv) {
+ // Shortcuts
+ var IV = iv.words;
+ var IV_0 = IV[0];
+ var IV_1 = IV[1];
+
+ // Generate four subvectors
+ var i0 = (((IV_0 << 8) | (IV_0 >>> 24)) & 0x00ff00ff) | (((IV_0 << 24) | (IV_0 >>> 8)) & 0xff00ff00);
+ var i2 = (((IV_1 << 8) | (IV_1 >>> 24)) & 0x00ff00ff) | (((IV_1 << 24) | (IV_1 >>> 8)) & 0xff00ff00);
+ var i1 = (i0 >>> 16) | (i2 & 0xffff0000);
+ var i3 = (i2 << 16) | (i0 & 0x0000ffff);
+
+ // Modify counter values
+ C[0] ^= i0;
+ C[1] ^= i1;
+ C[2] ^= i2;
+ C[3] ^= i3;
+ C[4] ^= i0;
+ C[5] ^= i1;
+ C[6] ^= i2;
+ C[7] ^= i3;
+
+ // Iterate the system four times
+ for (var i = 0; i < 4; i++) {
+ nextState.call(this);
+ }
+ }
+ },
+
+ _doProcessBlock: function (M, offset) {
+ // Shortcut
+ var X = this._X;
+
+ // Iterate the system
+ nextState.call(this);
+
+ // Generate four keystream words
+ S[0] = X[0] ^ (X[5] >>> 16) ^ (X[3] << 16);
+ S[1] = X[2] ^ (X[7] >>> 16) ^ (X[5] << 16);
+ S[2] = X[4] ^ (X[1] >>> 16) ^ (X[7] << 16);
+ S[3] = X[6] ^ (X[3] >>> 16) ^ (X[1] << 16);
+
+ for (var i = 0; i < 4; i++) {
+ // Swap endian
+ S[i] = (((S[i] << 8) | (S[i] >>> 24)) & 0x00ff00ff) |
+ (((S[i] << 24) | (S[i] >>> 8)) & 0xff00ff00);
+
+ // Encrypt
+ M[offset + i] ^= S[i];
+ }
+ },
+
+ blockSize: 128/32,
+
+ ivSize: 64/32
+ });
+
+ function nextState() {
+ // Shortcuts
+ var X = this._X;
+ var C = this._C;
+
+ // Save old counter values
+ for (var i = 0; i < 8; i++) {
+ C_[i] = C[i];
+ }
+
+ // Calculate new counter values
+ C[0] = (C[0] + 0x4d34d34d + this._b) | 0;
+ C[1] = (C[1] + 0xd34d34d3 + ((C[0] >>> 0) < (C_[0] >>> 0) ? 1 : 0)) | 0;
+ C[2] = (C[2] + 0x34d34d34 + ((C[1] >>> 0) < (C_[1] >>> 0) ? 1 : 0)) | 0;
+ C[3] = (C[3] + 0x4d34d34d + ((C[2] >>> 0) < (C_[2] >>> 0) ? 1 : 0)) | 0;
+ C[4] = (C[4] + 0xd34d34d3 + ((C[3] >>> 0) < (C_[3] >>> 0) ? 1 : 0)) | 0;
+ C[5] = (C[5] + 0x34d34d34 + ((C[4] >>> 0) < (C_[4] >>> 0) ? 1 : 0)) | 0;
+ C[6] = (C[6] + 0x4d34d34d + ((C[5] >>> 0) < (C_[5] >>> 0) ? 1 : 0)) | 0;
+ C[7] = (C[7] + 0xd34d34d3 + ((C[6] >>> 0) < (C_[6] >>> 0) ? 1 : 0)) | 0;
+ this._b = (C[7] >>> 0) < (C_[7] >>> 0) ? 1 : 0;
+
+ // Calculate the g-values
+ for (var i = 0; i < 8; i++) {
+ var gx = X[i] + C[i];
+
+ // Construct high and low argument for squaring
+ var ga = gx & 0xffff;
+ var gb = gx >>> 16;
+
+ // Calculate high and low result of squaring
+ var gh = ((((ga * ga) >>> 17) + ga * gb) >>> 15) + gb * gb;
+ var gl = (((gx & 0xffff0000) * gx) | 0) + (((gx & 0x0000ffff) * gx) | 0);
+
+ // High XOR low
+ G[i] = gh ^ gl;
+ }
+
+ // Calculate new state values
+ X[0] = (G[0] + ((G[7] << 16) | (G[7] >>> 16)) + ((G[6] << 16) | (G[6] >>> 16))) | 0;
+ X[1] = (G[1] + ((G[0] << 8) | (G[0] >>> 24)) + G[7]) | 0;
+ X[2] = (G[2] + ((G[1] << 16) | (G[1] >>> 16)) + ((G[0] << 16) | (G[0] >>> 16))) | 0;
+ X[3] = (G[3] + ((G[2] << 8) | (G[2] >>> 24)) + G[1]) | 0;
+ X[4] = (G[4] + ((G[3] << 16) | (G[3] >>> 16)) + ((G[2] << 16) | (G[2] >>> 16))) | 0;
+ X[5] = (G[5] + ((G[4] << 8) | (G[4] >>> 24)) + G[3]) | 0;
+ X[6] = (G[6] + ((G[5] << 16) | (G[5] >>> 16)) + ((G[4] << 16) | (G[4] >>> 16))) | 0;
+ X[7] = (G[7] + ((G[6] << 8) | (G[6] >>> 24)) + G[5]) | 0;
+ }
+
+ /**
+ * Shortcut functions to the cipher's object interface.
+ *
+ * @example
+ *
+ * var ciphertext = CryptoJS.Rabbit.encrypt(message, key, cfg);
+ * var plaintext = CryptoJS.Rabbit.decrypt(ciphertext, key, cfg);
+ */
+ C.Rabbit = StreamCipher._createHelper(Rabbit);
+ }());
+
+
+ (function () {
+ // Shortcuts
+ var C = CryptoJS;
+ var C_lib = C.lib;
+ var StreamCipher = C_lib.StreamCipher;
+ var C_algo = C.algo;
+
+ // Reusable objects
+ var S = [];
+ var C_ = [];
+ var G = [];
+
+ /**
+ * Rabbit stream cipher algorithm.
+ *
+ * This is a legacy version that neglected to convert the key to little-endian.
+ * This error doesn't affect the cipher's security,
+ * but it does affect its compatibility with other implementations.
+ */
+ var RabbitLegacy = C_algo.RabbitLegacy = StreamCipher.extend({
+ _doReset: function () {
+ // Shortcuts
+ var K = this._key.words;
+ var iv = this.cfg.iv;
+
+ // Generate initial state values
+ var X = this._X = [
+ K[0], (K[3] << 16) | (K[2] >>> 16),
+ K[1], (K[0] << 16) | (K[3] >>> 16),
+ K[2], (K[1] << 16) | (K[0] >>> 16),
+ K[3], (K[2] << 16) | (K[1] >>> 16)
+ ];
+
+ // Generate initial counter values
+ var C = this._C = [
+ (K[2] << 16) | (K[2] >>> 16), (K[0] & 0xffff0000) | (K[1] & 0x0000ffff),
+ (K[3] << 16) | (K[3] >>> 16), (K[1] & 0xffff0000) | (K[2] & 0x0000ffff),
+ (K[0] << 16) | (K[0] >>> 16), (K[2] & 0xffff0000) | (K[3] & 0x0000ffff),
+ (K[1] << 16) | (K[1] >>> 16), (K[3] & 0xffff0000) | (K[0] & 0x0000ffff)
+ ];
+
+ // Carry bit
+ this._b = 0;
+
+ // Iterate the system four times
+ for (var i = 0; i < 4; i++) {
+ nextState.call(this);
+ }
+
+ // Modify the counters
+ for (var i = 0; i < 8; i++) {
+ C[i] ^= X[(i + 4) & 7];
+ }
+
+ // IV setup
+ if (iv) {
+ // Shortcuts
+ var IV = iv.words;
+ var IV_0 = IV[0];
+ var IV_1 = IV[1];
+
+ // Generate four subvectors
+ var i0 = (((IV_0 << 8) | (IV_0 >>> 24)) & 0x00ff00ff) | (((IV_0 << 24) | (IV_0 >>> 8)) & 0xff00ff00);
+ var i2 = (((IV_1 << 8) | (IV_1 >>> 24)) & 0x00ff00ff) | (((IV_1 << 24) | (IV_1 >>> 8)) & 0xff00ff00);
+ var i1 = (i0 >>> 16) | (i2 & 0xffff0000);
+ var i3 = (i2 << 16) | (i0 & 0x0000ffff);
+
+ // Modify counter values
+ C[0] ^= i0;
+ C[1] ^= i1;
+ C[2] ^= i2;
+ C[3] ^= i3;
+ C[4] ^= i0;
+ C[5] ^= i1;
+ C[6] ^= i2;
+ C[7] ^= i3;
+
+ // Iterate the system four times
+ for (var i = 0; i < 4; i++) {
+ nextState.call(this);
+ }
+ }
+ },
+
+ _doProcessBlock: function (M, offset) {
+ // Shortcut
+ var X = this._X;
+
+ // Iterate the system
+ nextState.call(this);
+
+ // Generate four keystream words
+ S[0] = X[0] ^ (X[5] >>> 16) ^ (X[3] << 16);
+ S[1] = X[2] ^ (X[7] >>> 16) ^ (X[5] << 16);
+ S[2] = X[4] ^ (X[1] >>> 16) ^ (X[7] << 16);
+ S[3] = X[6] ^ (X[3] >>> 16) ^ (X[1] << 16);
+
+ for (var i = 0; i < 4; i++) {
+ // Swap endian
+ S[i] = (((S[i] << 8) | (S[i] >>> 24)) & 0x00ff00ff) |
+ (((S[i] << 24) | (S[i] >>> 8)) & 0xff00ff00);
+
+ // Encrypt
+ M[offset + i] ^= S[i];
+ }
+ },
+
+ blockSize: 128/32,
+
+ ivSize: 64/32
+ });
+
+ function nextState() {
+ // Shortcuts
+ var X = this._X;
+ var C = this._C;
+
+ // Save old counter values
+ for (var i = 0; i < 8; i++) {
+ C_[i] = C[i];
+ }
+
+ // Calculate new counter values
+ C[0] = (C[0] + 0x4d34d34d + this._b) | 0;
+ C[1] = (C[1] + 0xd34d34d3 + ((C[0] >>> 0) < (C_[0] >>> 0) ? 1 : 0)) | 0;
+ C[2] = (C[2] + 0x34d34d34 + ((C[1] >>> 0) < (C_[1] >>> 0) ? 1 : 0)) | 0;
+ C[3] = (C[3] + 0x4d34d34d + ((C[2] >>> 0) < (C_[2] >>> 0) ? 1 : 0)) | 0;
+ C[4] = (C[4] + 0xd34d34d3 + ((C[3] >>> 0) < (C_[3] >>> 0) ? 1 : 0)) | 0;
+ C[5] = (C[5] + 0x34d34d34 + ((C[4] >>> 0) < (C_[4] >>> 0) ? 1 : 0)) | 0;
+ C[6] = (C[6] + 0x4d34d34d + ((C[5] >>> 0) < (C_[5] >>> 0) ? 1 : 0)) | 0;
+ C[7] = (C[7] + 0xd34d34d3 + ((C[6] >>> 0) < (C_[6] >>> 0) ? 1 : 0)) | 0;
+ this._b = (C[7] >>> 0) < (C_[7] >>> 0) ? 1 : 0;
+
+ // Calculate the g-values
+ for (var i = 0; i < 8; i++) {
+ var gx = X[i] + C[i];
+
+ // Construct high and low argument for squaring
+ var ga = gx & 0xffff;
+ var gb = gx >>> 16;
+
+ // Calculate high and low result of squaring
+ var gh = ((((ga * ga) >>> 17) + ga * gb) >>> 15) + gb * gb;
+ var gl = (((gx & 0xffff0000) * gx) | 0) + (((gx & 0x0000ffff) * gx) | 0);
+
+ // High XOR low
+ G[i] = gh ^ gl;
+ }
+
+ // Calculate new state values
+ X[0] = (G[0] + ((G[7] << 16) | (G[7] >>> 16)) + ((G[6] << 16) | (G[6] >>> 16))) | 0;
+ X[1] = (G[1] + ((G[0] << 8) | (G[0] >>> 24)) + G[7]) | 0;
+ X[2] = (G[2] + ((G[1] << 16) | (G[1] >>> 16)) + ((G[0] << 16) | (G[0] >>> 16))) | 0;
+ X[3] = (G[3] + ((G[2] << 8) | (G[2] >>> 24)) + G[1]) | 0;
+ X[4] = (G[4] + ((G[3] << 16) | (G[3] >>> 16)) + ((G[2] << 16) | (G[2] >>> 16))) | 0;
+ X[5] = (G[5] + ((G[4] << 8) | (G[4] >>> 24)) + G[3]) | 0;
+ X[6] = (G[6] + ((G[5] << 16) | (G[5] >>> 16)) + ((G[4] << 16) | (G[4] >>> 16))) | 0;
+ X[7] = (G[7] + ((G[6] << 8) | (G[6] >>> 24)) + G[5]) | 0;
+ }
+
+ /**
+ * Shortcut functions to the cipher's object interface.
+ *
+ * @example
+ *
+ * var ciphertext = CryptoJS.RabbitLegacy.encrypt(message, key, cfg);
+ * var plaintext = CryptoJS.RabbitLegacy.decrypt(ciphertext, key, cfg);
+ */
+ C.RabbitLegacy = StreamCipher._createHelper(RabbitLegacy);
+ }());
+
+
+ return CryptoJS;
+
+}));
\ No newline at end of file
diff --git a/management/guns-admin/src/main/webapp/static/crypto-js/enc-base64.js b/management/guns-admin/src/main/webapp/static/crypto-js/enc-base64.js
new file mode 100644
index 0000000..0ffcd53
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/static/crypto-js/enc-base64.js
@@ -0,0 +1,136 @@
+;(function (root, factory) {
+ if (typeof exports === "object") {
+ // CommonJS
+ module.exports = exports = factory(require("./core"));
+ }
+ else if (typeof define === "function" && define.amd) {
+ // AMD
+ define(["./core"], factory);
+ }
+ else {
+ // Global (browser)
+ factory(root.CryptoJS);
+ }
+}(this, function (CryptoJS) {
+
+ (function () {
+ // Shortcuts
+ var C = CryptoJS;
+ var C_lib = C.lib;
+ var WordArray = C_lib.WordArray;
+ var C_enc = C.enc;
+
+ /**
+ * Base64 encoding strategy.
+ */
+ var Base64 = C_enc.Base64 = {
+ /**
+ * Converts a word array to a Base64 string.
+ *
+ * @param {WordArray} wordArray The word array.
+ *
+ * @return {string} The Base64 string.
+ *
+ * @static
+ *
+ * @example
+ *
+ * var base64String = CryptoJS.enc.Base64.stringify(wordArray);
+ */
+ stringify: function (wordArray) {
+ // Shortcuts
+ var words = wordArray.words;
+ var sigBytes = wordArray.sigBytes;
+ var map = this._map;
+
+ // Clamp excess bits
+ wordArray.clamp();
+
+ // Convert
+ var base64Chars = [];
+ for (var i = 0; i < sigBytes; i += 3) {
+ var byte1 = (words[i >>> 2] >>> (24 - (i % 4) * 8)) & 0xff;
+ var byte2 = (words[(i + 1) >>> 2] >>> (24 - ((i + 1) % 4) * 8)) & 0xff;
+ var byte3 = (words[(i + 2) >>> 2] >>> (24 - ((i + 2) % 4) * 8)) & 0xff;
+
+ var triplet = (byte1 << 16) | (byte2 << 8) | byte3;
+
+ for (var j = 0; (j < 4) && (i + j * 0.75 < sigBytes); j++) {
+ base64Chars.push(map.charAt((triplet >>> (6 * (3 - j))) & 0x3f));
+ }
+ }
+
+ // Add padding
+ var paddingChar = map.charAt(64);
+ if (paddingChar) {
+ while (base64Chars.length % 4) {
+ base64Chars.push(paddingChar);
+ }
+ }
+
+ return base64Chars.join('');
+ },
+
+ /**
+ * Converts a Base64 string to a word array.
+ *
+ * @param {string} base64Str The Base64 string.
+ *
+ * @return {WordArray} The word array.
+ *
+ * @static
+ *
+ * @example
+ *
+ * var wordArray = CryptoJS.enc.Base64.parse(base64String);
+ */
+ parse: function (base64Str) {
+ // Shortcuts
+ var base64StrLength = base64Str.length;
+ var map = this._map;
+ var reverseMap = this._reverseMap;
+
+ if (!reverseMap) {
+ reverseMap = this._reverseMap = [];
+ for (var j = 0; j < map.length; j++) {
+ reverseMap[map.charCodeAt(j)] = j;
+ }
+ }
+
+ // Ignore padding
+ var paddingChar = map.charAt(64);
+ if (paddingChar) {
+ var paddingIndex = base64Str.indexOf(paddingChar);
+ if (paddingIndex !== -1) {
+ base64StrLength = paddingIndex;
+ }
+ }
+
+ // Convert
+ return parseLoop(base64Str, base64StrLength, reverseMap);
+
+ },
+
+ _map: 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/='
+ };
+
+ function parseLoop(base64Str, base64StrLength, reverseMap) {
+ var words = [];
+ var nBytes = 0;
+ for (var i = 0; i < base64StrLength; i++) {
+ if (i % 4) {
+ var bits1 = reverseMap[base64Str.charCodeAt(i - 1)] << ((i % 4) * 2);
+ var bits2 = reverseMap[base64Str.charCodeAt(i)] >>> (6 - (i % 4) * 2);
+ var bitsCombined = bits1 | bits2;
+ words[nBytes >>> 2] |= bitsCombined << (24 - (nBytes % 4) * 8);
+ nBytes++;
+ }
+ }
+ return WordArray.create(words, nBytes);
+ }
+ }());
+
+
+ return CryptoJS.enc.Base64;
+
+}));
\ No newline at end of file
diff --git a/management/guns-admin/src/main/webapp/static/crypto-js/enc-base64url.js b/management/guns-admin/src/main/webapp/static/crypto-js/enc-base64url.js
new file mode 100644
index 0000000..2468912
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/static/crypto-js/enc-base64url.js
@@ -0,0 +1,140 @@
+;(function (root, factory) {
+ if (typeof exports === "object") {
+ // CommonJS
+ module.exports = exports = factory(require("./core"));
+ }
+ else if (typeof define === "function" && define.amd) {
+ // AMD
+ define(["./core"], factory);
+ }
+ else {
+ // Global (browser)
+ factory(root.CryptoJS);
+ }
+}(this, function (CryptoJS) {
+
+ (function () {
+ // Shortcuts
+ var C = CryptoJS;
+ var C_lib = C.lib;
+ var WordArray = C_lib.WordArray;
+ var C_enc = C.enc;
+
+ /**
+ * Base64url encoding strategy.
+ */
+ var Base64url = C_enc.Base64url = {
+ /**
+ * Converts a word array to a Base64url string.
+ *
+ * @param {WordArray} wordArray The word array.
+ *
+ * @param {boolean} urlSafe Whether to use url safe
+ *
+ * @return {string} The Base64url string.
+ *
+ * @static
+ *
+ * @example
+ *
+ * var base64String = CryptoJS.enc.Base64url.stringify(wordArray);
+ */
+ stringify: function (wordArray, urlSafe=true) {
+ // Shortcuts
+ var words = wordArray.words;
+ var sigBytes = wordArray.sigBytes;
+ var map = urlSafe ? this._safe_map : this._map;
+
+ // Clamp excess bits
+ wordArray.clamp();
+
+ // Convert
+ var base64Chars = [];
+ for (var i = 0; i < sigBytes; i += 3) {
+ var byte1 = (words[i >>> 2] >>> (24 - (i % 4) * 8)) & 0xff;
+ var byte2 = (words[(i + 1) >>> 2] >>> (24 - ((i + 1) % 4) * 8)) & 0xff;
+ var byte3 = (words[(i + 2) >>> 2] >>> (24 - ((i + 2) % 4) * 8)) & 0xff;
+
+ var triplet = (byte1 << 16) | (byte2 << 8) | byte3;
+
+ for (var j = 0; (j < 4) && (i + j * 0.75 < sigBytes); j++) {
+ base64Chars.push(map.charAt((triplet >>> (6 * (3 - j))) & 0x3f));
+ }
+ }
+
+ // Add padding
+ var paddingChar = map.charAt(64);
+ if (paddingChar) {
+ while (base64Chars.length % 4) {
+ base64Chars.push(paddingChar);
+ }
+ }
+
+ return base64Chars.join('');
+ },
+
+ /**
+ * Converts a Base64url string to a word array.
+ *
+ * @param {string} base64Str The Base64url string.
+ *
+ * @param {boolean} urlSafe Whether to use url safe
+ *
+ * @return {WordArray} The word array.
+ *
+ * @static
+ *
+ * @example
+ *
+ * var wordArray = CryptoJS.enc.Base64url.parse(base64String);
+ */
+ parse: function (base64Str, urlSafe=true) {
+ // Shortcuts
+ var base64StrLength = base64Str.length;
+ var map = urlSafe ? this._safe_map : this._map;
+ var reverseMap = this._reverseMap;
+
+ if (!reverseMap) {
+ reverseMap = this._reverseMap = [];
+ for (var j = 0; j < map.length; j++) {
+ reverseMap[map.charCodeAt(j)] = j;
+ }
+ }
+
+ // Ignore padding
+ var paddingChar = map.charAt(64);
+ if (paddingChar) {
+ var paddingIndex = base64Str.indexOf(paddingChar);
+ if (paddingIndex !== -1) {
+ base64StrLength = paddingIndex;
+ }
+ }
+
+ // Convert
+ return parseLoop(base64Str, base64StrLength, reverseMap);
+
+ },
+
+ _map: 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=',
+ _safe_map: 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-_',
+ };
+
+ function parseLoop(base64Str, base64StrLength, reverseMap) {
+ var words = [];
+ var nBytes = 0;
+ for (var i = 0; i < base64StrLength; i++) {
+ if (i % 4) {
+ var bits1 = reverseMap[base64Str.charCodeAt(i - 1)] << ((i % 4) * 2);
+ var bits2 = reverseMap[base64Str.charCodeAt(i)] >>> (6 - (i % 4) * 2);
+ var bitsCombined = bits1 | bits2;
+ words[nBytes >>> 2] |= bitsCombined << (24 - (nBytes % 4) * 8);
+ nBytes++;
+ }
+ }
+ return WordArray.create(words, nBytes);
+ }
+ }());
+
+ return CryptoJS.enc.Base64url;
+
+}));
\ No newline at end of file
diff --git a/management/guns-admin/src/main/webapp/static/crypto-js/enc-hex.js b/management/guns-admin/src/main/webapp/static/crypto-js/enc-hex.js
new file mode 100644
index 0000000..88161ff
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/static/crypto-js/enc-hex.js
@@ -0,0 +1,18 @@
+;(function (root, factory) {
+ if (typeof exports === "object") {
+ // CommonJS
+ module.exports = exports = factory(require("./core"));
+ }
+ else if (typeof define === "function" && define.amd) {
+ // AMD
+ define(["./core"], factory);
+ }
+ else {
+ // Global (browser)
+ factory(root.CryptoJS);
+ }
+}(this, function (CryptoJS) {
+
+ return CryptoJS.enc.Hex;
+
+}));
\ No newline at end of file
diff --git a/management/guns-admin/src/main/webapp/static/crypto-js/enc-latin1.js b/management/guns-admin/src/main/webapp/static/crypto-js/enc-latin1.js
new file mode 100644
index 0000000..ade56dc
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/static/crypto-js/enc-latin1.js
@@ -0,0 +1,18 @@
+;(function (root, factory) {
+ if (typeof exports === "object") {
+ // CommonJS
+ module.exports = exports = factory(require("./core"));
+ }
+ else if (typeof define === "function" && define.amd) {
+ // AMD
+ define(["./core"], factory);
+ }
+ else {
+ // Global (browser)
+ factory(root.CryptoJS);
+ }
+}(this, function (CryptoJS) {
+
+ return CryptoJS.enc.Latin1;
+
+}));
\ No newline at end of file
diff --git a/management/guns-admin/src/main/webapp/static/crypto-js/enc-utf16.js b/management/guns-admin/src/main/webapp/static/crypto-js/enc-utf16.js
new file mode 100644
index 0000000..7de6245
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/static/crypto-js/enc-utf16.js
@@ -0,0 +1,149 @@
+;(function (root, factory) {
+ if (typeof exports === "object") {
+ // CommonJS
+ module.exports = exports = factory(require("./core"));
+ }
+ else if (typeof define === "function" && define.amd) {
+ // AMD
+ define(["./core"], factory);
+ }
+ else {
+ // Global (browser)
+ factory(root.CryptoJS);
+ }
+}(this, function (CryptoJS) {
+
+ (function () {
+ // Shortcuts
+ var C = CryptoJS;
+ var C_lib = C.lib;
+ var WordArray = C_lib.WordArray;
+ var C_enc = C.enc;
+
+ /**
+ * UTF-16 BE encoding strategy.
+ */
+ var Utf16BE = C_enc.Utf16 = C_enc.Utf16BE = {
+ /**
+ * Converts a word array to a UTF-16 BE string.
+ *
+ * @param {WordArray} wordArray The word array.
+ *
+ * @return {string} The UTF-16 BE string.
+ *
+ * @static
+ *
+ * @example
+ *
+ * var utf16String = CryptoJS.enc.Utf16.stringify(wordArray);
+ */
+ stringify: function (wordArray) {
+ // Shortcuts
+ var words = wordArray.words;
+ var sigBytes = wordArray.sigBytes;
+
+ // Convert
+ var utf16Chars = [];
+ for (var i = 0; i < sigBytes; i += 2) {
+ var codePoint = (words[i >>> 2] >>> (16 - (i % 4) * 8)) & 0xffff;
+ utf16Chars.push(String.fromCharCode(codePoint));
+ }
+
+ return utf16Chars.join('');
+ },
+
+ /**
+ * Converts a UTF-16 BE string to a word array.
+ *
+ * @param {string} utf16Str The UTF-16 BE string.
+ *
+ * @return {WordArray} The word array.
+ *
+ * @static
+ *
+ * @example
+ *
+ * var wordArray = CryptoJS.enc.Utf16.parse(utf16String);
+ */
+ parse: function (utf16Str) {
+ // Shortcut
+ var utf16StrLength = utf16Str.length;
+
+ // Convert
+ var words = [];
+ for (var i = 0; i < utf16StrLength; i++) {
+ words[i >>> 1] |= utf16Str.charCodeAt(i) << (16 - (i % 2) * 16);
+ }
+
+ return WordArray.create(words, utf16StrLength * 2);
+ }
+ };
+
+ /**
+ * UTF-16 LE encoding strategy.
+ */
+ C_enc.Utf16LE = {
+ /**
+ * Converts a word array to a UTF-16 LE string.
+ *
+ * @param {WordArray} wordArray The word array.
+ *
+ * @return {string} The UTF-16 LE string.
+ *
+ * @static
+ *
+ * @example
+ *
+ * var utf16Str = CryptoJS.enc.Utf16LE.stringify(wordArray);
+ */
+ stringify: function (wordArray) {
+ // Shortcuts
+ var words = wordArray.words;
+ var sigBytes = wordArray.sigBytes;
+
+ // Convert
+ var utf16Chars = [];
+ for (var i = 0; i < sigBytes; i += 2) {
+ var codePoint = swapEndian((words[i >>> 2] >>> (16 - (i % 4) * 8)) & 0xffff);
+ utf16Chars.push(String.fromCharCode(codePoint));
+ }
+
+ return utf16Chars.join('');
+ },
+
+ /**
+ * Converts a UTF-16 LE string to a word array.
+ *
+ * @param {string} utf16Str The UTF-16 LE string.
+ *
+ * @return {WordArray} The word array.
+ *
+ * @static
+ *
+ * @example
+ *
+ * var wordArray = CryptoJS.enc.Utf16LE.parse(utf16Str);
+ */
+ parse: function (utf16Str) {
+ // Shortcut
+ var utf16StrLength = utf16Str.length;
+
+ // Convert
+ var words = [];
+ for (var i = 0; i < utf16StrLength; i++) {
+ words[i >>> 1] |= swapEndian(utf16Str.charCodeAt(i) << (16 - (i % 2) * 16));
+ }
+
+ return WordArray.create(words, utf16StrLength * 2);
+ }
+ };
+
+ function swapEndian(word) {
+ return ((word << 8) & 0xff00ff00) | ((word >>> 8) & 0x00ff00ff);
+ }
+ }());
+
+
+ return CryptoJS.enc.Utf16;
+
+}));
\ No newline at end of file
diff --git a/management/guns-admin/src/main/webapp/static/crypto-js/enc-utf8.js b/management/guns-admin/src/main/webapp/static/crypto-js/enc-utf8.js
new file mode 100644
index 0000000..e7a251d
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/static/crypto-js/enc-utf8.js
@@ -0,0 +1,18 @@
+;(function (root, factory) {
+ if (typeof exports === "object") {
+ // CommonJS
+ module.exports = exports = factory(require("./core"));
+ }
+ else if (typeof define === "function" && define.amd) {
+ // AMD
+ define(["./core"], factory);
+ }
+ else {
+ // Global (browser)
+ factory(root.CryptoJS);
+ }
+}(this, function (CryptoJS) {
+
+ return CryptoJS.enc.Utf8;
+
+}));
\ No newline at end of file
diff --git a/management/guns-admin/src/main/webapp/static/crypto-js/evpkdf.js b/management/guns-admin/src/main/webapp/static/crypto-js/evpkdf.js
new file mode 100644
index 0000000..578974a
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/static/crypto-js/evpkdf.js
@@ -0,0 +1,134 @@
+;(function (root, factory, undef) {
+ if (typeof exports === "object") {
+ // CommonJS
+ module.exports = exports = factory(require("./core"), require("./sha1"), require("./hmac"));
+ }
+ else if (typeof define === "function" && define.amd) {
+ // AMD
+ define(["./core", "./sha1", "./hmac"], factory);
+ }
+ else {
+ // Global (browser)
+ factory(root.CryptoJS);
+ }
+}(this, function (CryptoJS) {
+
+ (function () {
+ // Shortcuts
+ var C = CryptoJS;
+ var C_lib = C.lib;
+ var Base = C_lib.Base;
+ var WordArray = C_lib.WordArray;
+ var C_algo = C.algo;
+ var MD5 = C_algo.MD5;
+
+ /**
+ * This key derivation function is meant to conform with EVP_BytesToKey.
+ * www.openssl.org/docs/crypto/EVP_BytesToKey.html
+ */
+ var EvpKDF = C_algo.EvpKDF = Base.extend({
+ /**
+ * Configuration options.
+ *
+ * @property {number} keySize The key size in words to generate. Default: 4 (128 bits)
+ * @property {Hasher} hasher The hash algorithm to use. Default: MD5
+ * @property {number} iterations The number of iterations to perform. Default: 1
+ */
+ cfg: Base.extend({
+ keySize: 128/32,
+ hasher: MD5,
+ iterations: 1
+ }),
+
+ /**
+ * Initializes a newly created key derivation function.
+ *
+ * @param {Object} cfg (Optional) The configuration options to use for the derivation.
+ *
+ * @example
+ *
+ * var kdf = CryptoJS.algo.EvpKDF.create();
+ * var kdf = CryptoJS.algo.EvpKDF.create({ keySize: 8 });
+ * var kdf = CryptoJS.algo.EvpKDF.create({ keySize: 8, iterations: 1000 });
+ */
+ init: function (cfg) {
+ this.cfg = this.cfg.extend(cfg);
+ },
+
+ /**
+ * Derives a key from a password.
+ *
+ * @param {WordArray|string} password The password.
+ * @param {WordArray|string} salt A salt.
+ *
+ * @return {WordArray} The derived key.
+ *
+ * @example
+ *
+ * var key = kdf.compute(password, salt);
+ */
+ compute: function (password, salt) {
+ var block;
+
+ // Shortcut
+ var cfg = this.cfg;
+
+ // Init hasher
+ var hasher = cfg.hasher.create();
+
+ // Initial values
+ var derivedKey = WordArray.create();
+
+ // Shortcuts
+ var derivedKeyWords = derivedKey.words;
+ var keySize = cfg.keySize;
+ var iterations = cfg.iterations;
+
+ // Generate key
+ while (derivedKeyWords.length < keySize) {
+ if (block) {
+ hasher.update(block);
+ }
+ block = hasher.update(password).finalize(salt);
+ hasher.reset();
+
+ // Iterations
+ for (var i = 1; i < iterations; i++) {
+ block = hasher.finalize(block);
+ hasher.reset();
+ }
+
+ derivedKey.concat(block);
+ }
+ derivedKey.sigBytes = keySize * 4;
+
+ return derivedKey;
+ }
+ });
+
+ /**
+ * Derives a key from a password.
+ *
+ * @param {WordArray|string} password The password.
+ * @param {WordArray|string} salt A salt.
+ * @param {Object} cfg (Optional) The configuration options to use for this computation.
+ *
+ * @return {WordArray} The derived key.
+ *
+ * @static
+ *
+ * @example
+ *
+ * var key = CryptoJS.EvpKDF(password, salt);
+ * var key = CryptoJS.EvpKDF(password, salt, { keySize: 8 });
+ * var key = CryptoJS.EvpKDF(password, salt, { keySize: 8, iterations: 1000 });
+ */
+ C.EvpKDF = function (password, salt, cfg) {
+ return EvpKDF.create(cfg).compute(password, salt);
+ };
+ }());
+
+
+ return CryptoJS.EvpKDF;
+
+}));
\ No newline at end of file
diff --git a/management/guns-admin/src/main/webapp/static/crypto-js/format-hex.js b/management/guns-admin/src/main/webapp/static/crypto-js/format-hex.js
new file mode 100644
index 0000000..2e9a861
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/static/crypto-js/format-hex.js
@@ -0,0 +1,66 @@
+;(function (root, factory, undef) {
+ if (typeof exports === "object") {
+ // CommonJS
+ module.exports = exports = factory(require("./core"), require("./cipher-core"));
+ }
+ else if (typeof define === "function" && define.amd) {
+ // AMD
+ define(["./core", "./cipher-core"], factory);
+ }
+ else {
+ // Global (browser)
+ factory(root.CryptoJS);
+ }
+}(this, function (CryptoJS) {
+
+ (function (undefined) {
+ // Shortcuts
+ var C = CryptoJS;
+ var C_lib = C.lib;
+ var CipherParams = C_lib.CipherParams;
+ var C_enc = C.enc;
+ var Hex = C_enc.Hex;
+ var C_format = C.format;
+
+ var HexFormatter = C_format.Hex = {
+ /**
+ * Converts the ciphertext of a cipher params object to a hexadecimally encoded string.
+ *
+ * @param {CipherParams} cipherParams The cipher params object.
+ *
+ * @return {string} The hexadecimally encoded string.
+ *
+ * @static
+ *
+ * @example
+ *
+ * var hexString = CryptoJS.format.Hex.stringify(cipherParams);
+ */
+ stringify: function (cipherParams) {
+ return cipherParams.ciphertext.toString(Hex);
+ },
+
+ /**
+ * Converts a hexadecimally encoded ciphertext string to a cipher params object.
+ *
+ * @param {string} input The hexadecimally encoded string.
+ *
+ * @return {CipherParams} The cipher params object.
+ *
+ * @static
+ *
+ * @example
+ *
+ * var cipherParams = CryptoJS.format.Hex.parse(hexString);
+ */
+ parse: function (input) {
+ var ciphertext = Hex.parse(input);
+ return CipherParams.create({ ciphertext: ciphertext });
+ }
+ };
+ }());
+
+
+ return CryptoJS.format.Hex;
+
+}));
\ No newline at end of file
diff --git a/management/guns-admin/src/main/webapp/static/crypto-js/format-openssl.js b/management/guns-admin/src/main/webapp/static/crypto-js/format-openssl.js
new file mode 100644
index 0000000..3373edc
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/static/crypto-js/format-openssl.js
@@ -0,0 +1,18 @@
+;(function (root, factory, undef) {
+ if (typeof exports === "object") {
+ // CommonJS
+ module.exports = exports = factory(require("./core"), require("./cipher-core"));
+ }
+ else if (typeof define === "function" && define.amd) {
+ // AMD
+ define(["./core", "./cipher-core"], factory);
+ }
+ else {
+ // Global (browser)
+ factory(root.CryptoJS);
+ }
+}(this, function (CryptoJS) {
+
+ return CryptoJS.format.OpenSSL;
+
+}));
\ No newline at end of file
diff --git a/management/guns-admin/src/main/webapp/static/crypto-js/hmac-md5.js b/management/guns-admin/src/main/webapp/static/crypto-js/hmac-md5.js
new file mode 100644
index 0000000..ad7a90a
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/static/crypto-js/hmac-md5.js
@@ -0,0 +1,18 @@
+;(function (root, factory, undef) {
+ if (typeof exports === "object") {
+ // CommonJS
+ module.exports = exports = factory(require("./core"), require("./md5"), require("./hmac"));
+ }
+ else if (typeof define === "function" && define.amd) {
+ // AMD
+ define(["./core", "./md5", "./hmac"], factory);
+ }
+ else {
+ // Global (browser)
+ factory(root.CryptoJS);
+ }
+}(this, function (CryptoJS) {
+
+ return CryptoJS.HmacMD5;
+
+}));
\ No newline at end of file
diff --git a/management/guns-admin/src/main/webapp/static/crypto-js/hmac-ripemd160.js b/management/guns-admin/src/main/webapp/static/crypto-js/hmac-ripemd160.js
new file mode 100644
index 0000000..73d55a7
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/static/crypto-js/hmac-ripemd160.js
@@ -0,0 +1,18 @@
+;(function (root, factory, undef) {
+ if (typeof exports === "object") {
+ // CommonJS
+ module.exports = exports = factory(require("./core"), require("./ripemd160"), require("./hmac"));
+ }
+ else if (typeof define === "function" && define.amd) {
+ // AMD
+ define(["./core", "./ripemd160", "./hmac"], factory);
+ }
+ else {
+ // Global (browser)
+ factory(root.CryptoJS);
+ }
+}(this, function (CryptoJS) {
+
+ return CryptoJS.HmacRIPEMD160;
+
+}));
\ No newline at end of file
diff --git a/management/guns-admin/src/main/webapp/static/crypto-js/hmac-sha1.js b/management/guns-admin/src/main/webapp/static/crypto-js/hmac-sha1.js
new file mode 100644
index 0000000..0b570cb
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/static/crypto-js/hmac-sha1.js
@@ -0,0 +1,18 @@
+;(function (root, factory, undef) {
+ if (typeof exports === "object") {
+ // CommonJS
+ module.exports = exports = factory(require("./core"), require("./sha1"), require("./hmac"));
+ }
+ else if (typeof define === "function" && define.amd) {
+ // AMD
+ define(["./core", "./sha1", "./hmac"], factory);
+ }
+ else {
+ // Global (browser)
+ factory(root.CryptoJS);
+ }
+}(this, function (CryptoJS) {
+
+ return CryptoJS.HmacSHA1;
+
+}));
\ No newline at end of file
diff --git a/management/guns-admin/src/main/webapp/static/crypto-js/hmac-sha224.js b/management/guns-admin/src/main/webapp/static/crypto-js/hmac-sha224.js
new file mode 100644
index 0000000..3778863
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/static/crypto-js/hmac-sha224.js
@@ -0,0 +1,18 @@
+;(function (root, factory, undef) {
+ if (typeof exports === "object") {
+ // CommonJS
+ module.exports = exports = factory(require("./core"), require("./sha256"), require("./sha224"), require("./hmac"));
+ }
+ else if (typeof define === "function" && define.amd) {
+ // AMD
+ define(["./core", "./sha256", "./sha224", "./hmac"], factory);
+ }
+ else {
+ // Global (browser)
+ factory(root.CryptoJS);
+ }
+}(this, function (CryptoJS) {
+
+ return CryptoJS.HmacSHA224;
+
+}));
\ No newline at end of file
diff --git a/management/guns-admin/src/main/webapp/static/crypto-js/hmac-sha256.js b/management/guns-admin/src/main/webapp/static/crypto-js/hmac-sha256.js
new file mode 100644
index 0000000..33b0c9f
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/static/crypto-js/hmac-sha256.js
@@ -0,0 +1,18 @@
+;(function (root, factory, undef) {
+ if (typeof exports === "object") {
+ // CommonJS
+ module.exports = exports = factory(require("./core"), require("./sha256"), require("./hmac"));
+ }
+ else if (typeof define === "function" && define.amd) {
+ // AMD
+ define(["./core", "./sha256", "./hmac"], factory);
+ }
+ else {
+ // Global (browser)
+ factory(root.CryptoJS);
+ }
+}(this, function (CryptoJS) {
+
+ return CryptoJS.HmacSHA256;
+
+}));
\ No newline at end of file
diff --git a/management/guns-admin/src/main/webapp/static/crypto-js/hmac-sha3.js b/management/guns-admin/src/main/webapp/static/crypto-js/hmac-sha3.js
new file mode 100644
index 0000000..1248804
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/static/crypto-js/hmac-sha3.js
@@ -0,0 +1,18 @@
+;(function (root, factory, undef) {
+ if (typeof exports === "object") {
+ // CommonJS
+ module.exports = exports = factory(require("./core"), require("./x64-core"), require("./sha3"), require("./hmac"));
+ }
+ else if (typeof define === "function" && define.amd) {
+ // AMD
+ define(["./core", "./x64-core", "./sha3", "./hmac"], factory);
+ }
+ else {
+ // Global (browser)
+ factory(root.CryptoJS);
+ }
+}(this, function (CryptoJS) {
+
+ return CryptoJS.HmacSHA3;
+
+}));
\ No newline at end of file
diff --git a/management/guns-admin/src/main/webapp/static/crypto-js/hmac-sha384.js b/management/guns-admin/src/main/webapp/static/crypto-js/hmac-sha384.js
new file mode 100644
index 0000000..0036e2b
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/static/crypto-js/hmac-sha384.js
@@ -0,0 +1,18 @@
+;(function (root, factory, undef) {
+ if (typeof exports === "object") {
+ // CommonJS
+ module.exports = exports = factory(require("./core"), require("./x64-core"), require("./sha512"), require("./sha384"), require("./hmac"));
+ }
+ else if (typeof define === "function" && define.amd) {
+ // AMD
+ define(["./core", "./x64-core", "./sha512", "./sha384", "./hmac"], factory);
+ }
+ else {
+ // Global (browser)
+ factory(root.CryptoJS);
+ }
+}(this, function (CryptoJS) {
+
+ return CryptoJS.HmacSHA384;
+
+}));
\ No newline at end of file
diff --git a/management/guns-admin/src/main/webapp/static/crypto-js/hmac-sha512.js b/management/guns-admin/src/main/webapp/static/crypto-js/hmac-sha512.js
new file mode 100644
index 0000000..c1005b6
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/static/crypto-js/hmac-sha512.js
@@ -0,0 +1,18 @@
+;(function (root, factory, undef) {
+ if (typeof exports === "object") {
+ // CommonJS
+ module.exports = exports = factory(require("./core"), require("./x64-core"), require("./sha512"), require("./hmac"));
+ }
+ else if (typeof define === "function" && define.amd) {
+ // AMD
+ define(["./core", "./x64-core", "./sha512", "./hmac"], factory);
+ }
+ else {
+ // Global (browser)
+ factory(root.CryptoJS);
+ }
+}(this, function (CryptoJS) {
+
+ return CryptoJS.HmacSHA512;
+
+}));
\ No newline at end of file
diff --git a/management/guns-admin/src/main/webapp/static/crypto-js/hmac.js b/management/guns-admin/src/main/webapp/static/crypto-js/hmac.js
new file mode 100644
index 0000000..8c09851
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/static/crypto-js/hmac.js
@@ -0,0 +1,143 @@
+;(function (root, factory) {
+ if (typeof exports === "object") {
+ // CommonJS
+ module.exports = exports = factory(require("./core"));
+ }
+ else if (typeof define === "function" && define.amd) {
+ // AMD
+ define(["./core"], factory);
+ }
+ else {
+ // Global (browser)
+ factory(root.CryptoJS);
+ }
+}(this, function (CryptoJS) {
+
+ (function () {
+ // Shortcuts
+ var C = CryptoJS;
+ var C_lib = C.lib;
+ var Base = C_lib.Base;
+ var C_enc = C.enc;
+ var Utf8 = C_enc.Utf8;
+ var C_algo = C.algo;
+
+ /**
+ * HMAC algorithm.
+ */
+ var HMAC = C_algo.HMAC = Base.extend({
+ /**
+ * Initializes a newly created HMAC.
+ *
+ * @param {Hasher} hasher The hash algorithm to use.
+ * @param {WordArray|string} key The secret key.
+ *
+ * @example
+ *
+ * var hmacHasher = CryptoJS.algo.HMAC.create(CryptoJS.algo.SHA256, key);
+ */
+ init: function (hasher, key) {
+ // Init hasher
+ hasher = this._hasher = new hasher.init();
+
+ // Convert string to WordArray, else assume WordArray already
+ if (typeof key == 'string') {
+ key = Utf8.parse(key);
+ }
+
+ // Shortcuts
+ var hasherBlockSize = hasher.blockSize;
+ var hasherBlockSizeBytes = hasherBlockSize * 4;
+
+ // Allow arbitrary length keys
+ if (key.sigBytes > hasherBlockSizeBytes) {
+ key = hasher.finalize(key);
+ }
+
+ // Clamp excess bits
+ key.clamp();
+
+ // Clone key for inner and outer pads
+ var oKey = this._oKey = key.clone();
+ var iKey = this._iKey = key.clone();
+
+ // Shortcuts
+ var oKeyWords = oKey.words;
+ var iKeyWords = iKey.words;
+
+ // XOR keys with pad constants
+ for (var i = 0; i < hasherBlockSize; i++) {
+ oKeyWords[i] ^= 0x5c5c5c5c;
+ iKeyWords[i] ^= 0x36363636;
+ }
+ oKey.sigBytes = iKey.sigBytes = hasherBlockSizeBytes;
+
+ // Set initial values
+ this.reset();
+ },
+
+ /**
+ * Resets this HMAC to its initial state.
+ *
+ * @example
+ *
+ * hmacHasher.reset();
+ */
+ reset: function () {
+ // Shortcut
+ var hasher = this._hasher;
+
+ // Reset
+ hasher.reset();
+ hasher.update(this._iKey);
+ },
+
+ /**
+ * Updates this HMAC with a message.
+ *
+ * @param {WordArray|string} messageUpdate The message to append.
+ *
+ * @return {HMAC} This HMAC instance.
+ *
+ * @example
+ *
+ * hmacHasher.update('message');
+ * hmacHasher.update(wordArray);
+ */
+ update: function (messageUpdate) {
+ this._hasher.update(messageUpdate);
+
+ // Chainable
+ return this;
+ },
+
+ /**
+ * Finalizes the HMAC computation.
+ * Note that the finalize operation is effectively a destructive, read-once operation.
+ *
+ * @param {WordArray|string} messageUpdate (Optional) A final message update.
+ *
+ * @return {WordArray} The HMAC.
+ *
+ * @example
+ *
+ * var hmac = hmacHasher.finalize();
+ * var hmac = hmacHasher.finalize('message');
+ * var hmac = hmacHasher.finalize(wordArray);
+ */
+ finalize: function (messageUpdate) {
+ // Shortcut
+ var hasher = this._hasher;
+
+ // Compute HMAC
+ var innerHash = hasher.finalize(messageUpdate);
+ hasher.reset();
+ var hmac = hasher.finalize(this._oKey.clone().concat(innerHash));
+
+ return hmac;
+ }
+ });
+ }());
+
+
+}));
\ No newline at end of file
diff --git a/management/guns-admin/src/main/webapp/static/crypto-js/index.js b/management/guns-admin/src/main/webapp/static/crypto-js/index.js
new file mode 100644
index 0000000..7235391
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/static/crypto-js/index.js
@@ -0,0 +1,18 @@
+;(function (root, factory, undef) {
+ if (typeof exports === "object") {
+ // CommonJS
+ module.exports = exports = factory(require("./core"), require("./x64-core"), require("./lib-typedarrays"), require("./enc-utf16"), require("./enc-base64"), require("./enc-base64url"), require("./md5"), require("./sha1"), require("./sha256"), require("./sha224"), require("./sha512"), require("./sha384"), require("./sha3"), require("./ripemd160"), require("./hmac"), require("./pbkdf2"), require("./evpkdf"), require("./cipher-core"), require("./mode-cfb"), require("./mode-ctr"), require("./mode-ctr-gladman"), require("./mode-ofb"), require("./mode-ecb"), require("./pad-ansix923"), require("./pad-iso10126"), require("./pad-iso97971"), require("./pad-zeropadding"), require("./pad-nopadding"), require("./format-hex"), require("./aes"), require("./tripledes"), require("./rc4"), require("./rabbit"), require("./rabbit-legacy"));
+ }
+ else if (typeof define === "function" && define.amd) {
+ // AMD
+ define(["./core", "./x64-core", "./lib-typedarrays", "./enc-utf16", "./enc-base64", "./enc-base64url", "./md5", "./sha1", "./sha256", "./sha224", "./sha512", "./sha384", "./sha3", "./ripemd160", "./hmac", "./pbkdf2", "./evpkdf", "./cipher-core", "./mode-cfb", "./mode-ctr", "./mode-ctr-gladman", "./mode-ofb", "./mode-ecb", "./pad-ansix923", "./pad-iso10126", "./pad-iso97971", "./pad-zeropadding", "./pad-nopadding", "./format-hex", "./aes", "./tripledes", "./rc4", "./rabbit", "./rabbit-legacy"], factory);
+ }
+ else {
+ // Global (browser)
+ root.CryptoJS = factory(root.CryptoJS);
+ }
+}(this, function (CryptoJS) {
+
+ return CryptoJS;
+
+}));
\ No newline at end of file
diff --git a/management/guns-admin/src/main/webapp/static/crypto-js/lib-typedarrays.js b/management/guns-admin/src/main/webapp/static/crypto-js/lib-typedarrays.js
new file mode 100644
index 0000000..264b210
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/static/crypto-js/lib-typedarrays.js
@@ -0,0 +1,76 @@
+;(function (root, factory) {
+ if (typeof exports === "object") {
+ // CommonJS
+ module.exports = exports = factory(require("./core"));
+ }
+ else if (typeof define === "function" && define.amd) {
+ // AMD
+ define(["./core"], factory);
+ }
+ else {
+ // Global (browser)
+ factory(root.CryptoJS);
+ }
+}(this, function (CryptoJS) {
+
+ (function () {
+ // Check if typed arrays are supported
+ if (typeof ArrayBuffer != 'function') {
+ return;
+ }
+
+ // Shortcuts
+ var C = CryptoJS;
+ var C_lib = C.lib;
+ var WordArray = C_lib.WordArray;
+
+ // Reference original init
+ var superInit = WordArray.init;
+
+ // Augment WordArray.init to handle typed arrays
+ var subInit = WordArray.init = function (typedArray) {
+ // Convert buffers to uint8
+ if (typedArray instanceof ArrayBuffer) {
+ typedArray = new Uint8Array(typedArray);
+ }
+
+ // Convert other array views to uint8
+ if (
+ typedArray instanceof Int8Array ||
+ (typeof Uint8ClampedArray !== "undefined" && typedArray instanceof Uint8ClampedArray) ||
+ typedArray instanceof Int16Array ||
+ typedArray instanceof Uint16Array ||
+ typedArray instanceof Int32Array ||
+ typedArray instanceof Uint32Array ||
+ typedArray instanceof Float32Array ||
+ typedArray instanceof Float64Array
+ ) {
+ typedArray = new Uint8Array(typedArray.buffer, typedArray.byteOffset, typedArray.byteLength);
+ }
+
+ // Handle Uint8Array
+ if (typedArray instanceof Uint8Array) {
+ // Shortcut
+ var typedArrayByteLength = typedArray.byteLength;
+
+ // Extract bytes
+ var words = [];
+ for (var i = 0; i < typedArrayByteLength; i++) {
+ words[i >>> 2] |= typedArray[i] << (24 - (i % 4) * 8);
+ }
+
+ // Initialize this word array
+ superInit.call(this, words, typedArrayByteLength);
+ } else {
+ // Else call normal init
+ superInit.apply(this, arguments);
+ }
+ };
+
+ subInit.prototype = WordArray;
+ }());
+
+
+ return CryptoJS.lib.WordArray;
+
+}));
\ No newline at end of file
diff --git a/management/guns-admin/src/main/webapp/static/crypto-js/md5.js b/management/guns-admin/src/main/webapp/static/crypto-js/md5.js
new file mode 100644
index 0000000..12b0fdd
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/static/crypto-js/md5.js
@@ -0,0 +1,268 @@
+;(function (root, factory) {
+ if (typeof exports === "object") {
+ // CommonJS
+ module.exports = exports = factory(require("./core"));
+ }
+ else if (typeof define === "function" && define.amd) {
+ // AMD
+ define(["./core"], factory);
+ }
+ else {
+ // Global (browser)
+ factory(root.CryptoJS);
+ }
+}(this, function (CryptoJS) {
+
+ (function (Math) {
+ // Shortcuts
+ var C = CryptoJS;
+ var C_lib = C.lib;
+ var WordArray = C_lib.WordArray;
+ var Hasher = C_lib.Hasher;
+ var C_algo = C.algo;
+
+ // Constants table
+ var T = [];
+
+ // Compute constants
+ (function () {
+ for (var i = 0; i < 64; i++) {
+ T[i] = (Math.abs(Math.sin(i + 1)) * 0x100000000) | 0;
+ }
+ }());
+
+ /**
+ * MD5 hash algorithm.
+ */
+ var MD5 = C_algo.MD5 = Hasher.extend({
+ _doReset: function () {
+ this._hash = new WordArray.init([
+ 0x67452301, 0xefcdab89,
+ 0x98badcfe, 0x10325476
+ ]);
+ },
+
+ _doProcessBlock: function (M, offset) {
+ // Swap endian
+ for (var i = 0; i < 16; i++) {
+ // Shortcuts
+ var offset_i = offset + i;
+ var M_offset_i = M[offset_i];
+
+ M[offset_i] = (
+ (((M_offset_i << 8) | (M_offset_i >>> 24)) & 0x00ff00ff) |
+ (((M_offset_i << 24) | (M_offset_i >>> 8)) & 0xff00ff00)
+ );
+ }
+
+ // Shortcuts
+ var H = this._hash.words;
+
+ var M_offset_0 = M[offset + 0];
+ var M_offset_1 = M[offset + 1];
+ var M_offset_2 = M[offset + 2];
+ var M_offset_3 = M[offset + 3];
+ var M_offset_4 = M[offset + 4];
+ var M_offset_5 = M[offset + 5];
+ var M_offset_6 = M[offset + 6];
+ var M_offset_7 = M[offset + 7];
+ var M_offset_8 = M[offset + 8];
+ var M_offset_9 = M[offset + 9];
+ var M_offset_10 = M[offset + 10];
+ var M_offset_11 = M[offset + 11];
+ var M_offset_12 = M[offset + 12];
+ var M_offset_13 = M[offset + 13];
+ var M_offset_14 = M[offset + 14];
+ var M_offset_15 = M[offset + 15];
+
+ // Working varialbes
+ var a = H[0];
+ var b = H[1];
+ var c = H[2];
+ var d = H[3];
+
+ // Computation
+ a = FF(a, b, c, d, M_offset_0, 7, T[0]);
+ d = FF(d, a, b, c, M_offset_1, 12, T[1]);
+ c = FF(c, d, a, b, M_offset_2, 17, T[2]);
+ b = FF(b, c, d, a, M_offset_3, 22, T[3]);
+ a = FF(a, b, c, d, M_offset_4, 7, T[4]);
+ d = FF(d, a, b, c, M_offset_5, 12, T[5]);
+ c = FF(c, d, a, b, M_offset_6, 17, T[6]);
+ b = FF(b, c, d, a, M_offset_7, 22, T[7]);
+ a = FF(a, b, c, d, M_offset_8, 7, T[8]);
+ d = FF(d, a, b, c, M_offset_9, 12, T[9]);
+ c = FF(c, d, a, b, M_offset_10, 17, T[10]);
+ b = FF(b, c, d, a, M_offset_11, 22, T[11]);
+ a = FF(a, b, c, d, M_offset_12, 7, T[12]);
+ d = FF(d, a, b, c, M_offset_13, 12, T[13]);
+ c = FF(c, d, a, b, M_offset_14, 17, T[14]);
+ b = FF(b, c, d, a, M_offset_15, 22, T[15]);
+
+ a = GG(a, b, c, d, M_offset_1, 5, T[16]);
+ d = GG(d, a, b, c, M_offset_6, 9, T[17]);
+ c = GG(c, d, a, b, M_offset_11, 14, T[18]);
+ b = GG(b, c, d, a, M_offset_0, 20, T[19]);
+ a = GG(a, b, c, d, M_offset_5, 5, T[20]);
+ d = GG(d, a, b, c, M_offset_10, 9, T[21]);
+ c = GG(c, d, a, b, M_offset_15, 14, T[22]);
+ b = GG(b, c, d, a, M_offset_4, 20, T[23]);
+ a = GG(a, b, c, d, M_offset_9, 5, T[24]);
+ d = GG(d, a, b, c, M_offset_14, 9, T[25]);
+ c = GG(c, d, a, b, M_offset_3, 14, T[26]);
+ b = GG(b, c, d, a, M_offset_8, 20, T[27]);
+ a = GG(a, b, c, d, M_offset_13, 5, T[28]);
+ d = GG(d, a, b, c, M_offset_2, 9, T[29]);
+ c = GG(c, d, a, b, M_offset_7, 14, T[30]);
+ b = GG(b, c, d, a, M_offset_12, 20, T[31]);
+
+ a = HH(a, b, c, d, M_offset_5, 4, T[32]);
+ d = HH(d, a, b, c, M_offset_8, 11, T[33]);
+ c = HH(c, d, a, b, M_offset_11, 16, T[34]);
+ b = HH(b, c, d, a, M_offset_14, 23, T[35]);
+ a = HH(a, b, c, d, M_offset_1, 4, T[36]);
+ d = HH(d, a, b, c, M_offset_4, 11, T[37]);
+ c = HH(c, d, a, b, M_offset_7, 16, T[38]);
+ b = HH(b, c, d, a, M_offset_10, 23, T[39]);
+ a = HH(a, b, c, d, M_offset_13, 4, T[40]);
+ d = HH(d, a, b, c, M_offset_0, 11, T[41]);
+ c = HH(c, d, a, b, M_offset_3, 16, T[42]);
+ b = HH(b, c, d, a, M_offset_6, 23, T[43]);
+ a = HH(a, b, c, d, M_offset_9, 4, T[44]);
+ d = HH(d, a, b, c, M_offset_12, 11, T[45]);
+ c = HH(c, d, a, b, M_offset_15, 16, T[46]);
+ b = HH(b, c, d, a, M_offset_2, 23, T[47]);
+
+ a = II(a, b, c, d, M_offset_0, 6, T[48]);
+ d = II(d, a, b, c, M_offset_7, 10, T[49]);
+ c = II(c, d, a, b, M_offset_14, 15, T[50]);
+ b = II(b, c, d, a, M_offset_5, 21, T[51]);
+ a = II(a, b, c, d, M_offset_12, 6, T[52]);
+ d = II(d, a, b, c, M_offset_3, 10, T[53]);
+ c = II(c, d, a, b, M_offset_10, 15, T[54]);
+ b = II(b, c, d, a, M_offset_1, 21, T[55]);
+ a = II(a, b, c, d, M_offset_8, 6, T[56]);
+ d = II(d, a, b, c, M_offset_15, 10, T[57]);
+ c = II(c, d, a, b, M_offset_6, 15, T[58]);
+ b = II(b, c, d, a, M_offset_13, 21, T[59]);
+ a = II(a, b, c, d, M_offset_4, 6, T[60]);
+ d = II(d, a, b, c, M_offset_11, 10, T[61]);
+ c = II(c, d, a, b, M_offset_2, 15, T[62]);
+ b = II(b, c, d, a, M_offset_9, 21, T[63]);
+
+ // Intermediate hash value
+ H[0] = (H[0] + a) | 0;
+ H[1] = (H[1] + b) | 0;
+ H[2] = (H[2] + c) | 0;
+ H[3] = (H[3] + d) | 0;
+ },
+
+ _doFinalize: function () {
+ // Shortcuts
+ var data = this._data;
+ var dataWords = data.words;
+
+ var nBitsTotal = this._nDataBytes * 8;
+ var nBitsLeft = data.sigBytes * 8;
+
+ // Add padding
+ dataWords[nBitsLeft >>> 5] |= 0x80 << (24 - nBitsLeft % 32);
+
+ var nBitsTotalH = Math.floor(nBitsTotal / 0x100000000);
+ var nBitsTotalL = nBitsTotal;
+ dataWords[(((nBitsLeft + 64) >>> 9) << 4) + 15] = (
+ (((nBitsTotalH << 8) | (nBitsTotalH >>> 24)) & 0x00ff00ff) |
+ (((nBitsTotalH << 24) | (nBitsTotalH >>> 8)) & 0xff00ff00)
+ );
+ dataWords[(((nBitsLeft + 64) >>> 9) << 4) + 14] = (
+ (((nBitsTotalL << 8) | (nBitsTotalL >>> 24)) & 0x00ff00ff) |
+ (((nBitsTotalL << 24) | (nBitsTotalL >>> 8)) & 0xff00ff00)
+ );
+
+ data.sigBytes = (dataWords.length + 1) * 4;
+
+ // Hash final blocks
+ this._process();
+
+ // Shortcuts
+ var hash = this._hash;
+ var H = hash.words;
+
+ // Swap endian
+ for (var i = 0; i < 4; i++) {
+ // Shortcut
+ var H_i = H[i];
+
+ H[i] = (((H_i << 8) | (H_i >>> 24)) & 0x00ff00ff) |
+ (((H_i << 24) | (H_i >>> 8)) & 0xff00ff00);
+ }
+
+ // Return final computed hash
+ return hash;
+ },
+
+ clone: function () {
+ var clone = Hasher.clone.call(this);
+ clone._hash = this._hash.clone();
+
+ return clone;
+ }
+ });
+
+ function FF(a, b, c, d, x, s, t) {
+ var n = a + ((b & c) | (~b & d)) + x + t;
+ return ((n << s) | (n >>> (32 - s))) + b;
+ }
+
+ function GG(a, b, c, d, x, s, t) {
+ var n = a + ((b & d) | (c & ~d)) + x + t;
+ return ((n << s) | (n >>> (32 - s))) + b;
+ }
+
+ function HH(a, b, c, d, x, s, t) {
+ var n = a + (b ^ c ^ d) + x + t;
+ return ((n << s) | (n >>> (32 - s))) + b;
+ }
+
+ function II(a, b, c, d, x, s, t) {
+ var n = a + (c ^ (b | ~d)) + x + t;
+ return ((n << s) | (n >>> (32 - s))) + b;
+ }
+
+ /**
+ * Shortcut function to the hasher's object interface.
+ *
+ * @param {WordArray|string} message The message to hash.
+ *
+ * @return {WordArray} The hash.
+ *
+ * @static
+ *
+ * @example
+ *
+ * var hash = CryptoJS.MD5('message');
+ * var hash = CryptoJS.MD5(wordArray);
+ */
+ C.MD5 = Hasher._createHelper(MD5);
+
+ /**
+ * Shortcut function to the HMAC's object interface.
+ *
+ * @param {WordArray|string} message The message to hash.
+ * @param {WordArray|string} key The secret key.
+ *
+ * @return {WordArray} The HMAC.
+ *
+ * @static
+ *
+ * @example
+ *
+ * var hmac = CryptoJS.HmacMD5(message, key);
+ */
+ C.HmacMD5 = Hasher._createHmacHelper(MD5);
+ }(Math));
+
+
+ return CryptoJS.MD5;
+
+}));
\ No newline at end of file
diff --git a/management/guns-admin/src/main/webapp/static/crypto-js/mode-cfb.js b/management/guns-admin/src/main/webapp/static/crypto-js/mode-cfb.js
new file mode 100644
index 0000000..444c9cb
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/static/crypto-js/mode-cfb.js
@@ -0,0 +1,80 @@
+;(function (root, factory, undef) {
+ if (typeof exports === "object") {
+ // CommonJS
+ module.exports = exports = factory(require("./core"), require("./cipher-core"));
+ }
+ else if (typeof define === "function" && define.amd) {
+ // AMD
+ define(["./core", "./cipher-core"], factory);
+ }
+ else {
+ // Global (browser)
+ factory(root.CryptoJS);
+ }
+}(this, function (CryptoJS) {
+
+ /**
+ * Cipher Feedback block mode.
+ */
+ CryptoJS.mode.CFB = (function () {
+ var CFB = CryptoJS.lib.BlockCipherMode.extend();
+
+ CFB.Encryptor = CFB.extend({
+ processBlock: function (words, offset) {
+ // Shortcuts
+ var cipher = this._cipher;
+ var blockSize = cipher.blockSize;
+
+ generateKeystreamAndEncrypt.call(this, words, offset, blockSize, cipher);
+
+ // Remember this block to use with next block
+ this._prevBlock = words.slice(offset, offset + blockSize);
+ }
+ });
+
+ CFB.Decryptor = CFB.extend({
+ processBlock: function (words, offset) {
+ // Shortcuts
+ var cipher = this._cipher;
+ var blockSize = cipher.blockSize;
+
+ // Remember this block to use with next block
+ var thisBlock = words.slice(offset, offset + blockSize);
+
+ generateKeystreamAndEncrypt.call(this, words, offset, blockSize, cipher);
+
+ // This block becomes the previous block
+ this._prevBlock = thisBlock;
+ }
+ });
+
+ function generateKeystreamAndEncrypt(words, offset, blockSize, cipher) {
+ var keystream;
+
+ // Shortcut
+ var iv = this._iv;
+
+ // Generate keystream
+ if (iv) {
+ keystream = iv.slice(0);
+
+ // Remove IV for subsequent blocks
+ this._iv = undefined;
+ } else {
+ keystream = this._prevBlock;
+ }
+ cipher.encryptBlock(keystream, 0);
+
+ // Encrypt
+ for (var i = 0; i < blockSize; i++) {
+ words[offset + i] ^= keystream[i];
+ }
+ }
+
+ return CFB;
+ }());
+
+
+ return CryptoJS.mode.CFB;
+
+}));
\ No newline at end of file
diff --git a/management/guns-admin/src/main/webapp/static/crypto-js/mode-ctr-gladman.js b/management/guns-admin/src/main/webapp/static/crypto-js/mode-ctr-gladman.js
new file mode 100644
index 0000000..bbc5687
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/static/crypto-js/mode-ctr-gladman.js
@@ -0,0 +1,116 @@
+;(function (root, factory, undef) {
+ if (typeof exports === "object") {
+ // CommonJS
+ module.exports = exports = factory(require("./core"), require("./cipher-core"));
+ }
+ else if (typeof define === "function" && define.amd) {
+ // AMD
+ define(["./core", "./cipher-core"], factory);
+ }
+ else {
+ // Global (browser)
+ factory(root.CryptoJS);
+ }
+}(this, function (CryptoJS) {
+
+ /** @preserve
+ * Counter block mode compatible with Dr Brian Gladman fileenc.c
+ * derived from CryptoJS.mode.CTR
+ * Jan Hruby jhruby.web@gmail.com
+ */
+ CryptoJS.mode.CTRGladman = (function () {
+ var CTRGladman = CryptoJS.lib.BlockCipherMode.extend();
+
+ function incWord(word)
+ {
+ if (((word >> 24) & 0xff) === 0xff) { //overflow
+ var b1 = (word >> 16)&0xff;
+ var b2 = (word >> 8)&0xff;
+ var b3 = word & 0xff;
+
+ if (b1 === 0xff) // overflow b1
+ {
+ b1 = 0;
+ if (b2 === 0xff)
+ {
+ b2 = 0;
+ if (b3 === 0xff)
+ {
+ b3 = 0;
+ }
+ else
+ {
+ ++b3;
+ }
+ }
+ else
+ {
+ ++b2;
+ }
+ }
+ else
+ {
+ ++b1;
+ }
+
+ word = 0;
+ word += (b1 << 16);
+ word += (b2 << 8);
+ word += b3;
+ }
+ else
+ {
+ word += (0x01 << 24);
+ }
+ return word;
+ }
+
+ function incCounter(counter)
+ {
+ if ((counter[0] = incWord(counter[0])) === 0)
+ {
+ // encr_data in fileenc.c from Dr Brian Gladman's counts only with DWORD j < 8
+ counter[1] = incWord(counter[1]);
+ }
+ return counter;
+ }
+
+ var Encryptor = CTRGladman.Encryptor = CTRGladman.extend({
+ processBlock: function (words, offset) {
+ // Shortcuts
+ var cipher = this._cipher
+ var blockSize = cipher.blockSize;
+ var iv = this._iv;
+ var counter = this._counter;
+
+ // Generate keystream
+ if (iv) {
+ counter = this._counter = iv.slice(0);
+
+ // Remove IV for subsequent blocks
+ this._iv = undefined;
+ }
+
+ incCounter(counter);
+
+ var keystream = counter.slice(0);
+ cipher.encryptBlock(keystream, 0);
+
+ // Encrypt
+ for (var i = 0; i < blockSize; i++) {
+ words[offset + i] ^= keystream[i];
+ }
+ }
+ });
+
+ CTRGladman.Decryptor = Encryptor;
+
+ return CTRGladman;
+ }());
+
+
+
+
+ return CryptoJS.mode.CTRGladman;
+
+}));
\ No newline at end of file
diff --git a/management/guns-admin/src/main/webapp/static/crypto-js/mode-ctr.js b/management/guns-admin/src/main/webapp/static/crypto-js/mode-ctr.js
new file mode 100644
index 0000000..c3d470a
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/static/crypto-js/mode-ctr.js
@@ -0,0 +1,58 @@
+;(function (root, factory, undef) {
+ if (typeof exports === "object") {
+ // CommonJS
+ module.exports = exports = factory(require("./core"), require("./cipher-core"));
+ }
+ else if (typeof define === "function" && define.amd) {
+ // AMD
+ define(["./core", "./cipher-core"], factory);
+ }
+ else {
+ // Global (browser)
+ factory(root.CryptoJS);
+ }
+}(this, function (CryptoJS) {
+
+ /**
+ * Counter block mode.
+ */
+ CryptoJS.mode.CTR = (function () {
+ var CTR = CryptoJS.lib.BlockCipherMode.extend();
+
+ var Encryptor = CTR.Encryptor = CTR.extend({
+ processBlock: function (words, offset) {
+ // Shortcuts
+ var cipher = this._cipher
+ var blockSize = cipher.blockSize;
+ var iv = this._iv;
+ var counter = this._counter;
+
+ // Generate keystream
+ if (iv) {
+ counter = this._counter = iv.slice(0);
+
+ // Remove IV for subsequent blocks
+ this._iv = undefined;
+ }
+ var keystream = counter.slice(0);
+ cipher.encryptBlock(keystream, 0);
+
+ // Increment counter
+ counter[blockSize - 1] = (counter[blockSize - 1] + 1) | 0
+
+ // Encrypt
+ for (var i = 0; i < blockSize; i++) {
+ words[offset + i] ^= keystream[i];
+ }
+ }
+ });
+
+ CTR.Decryptor = Encryptor;
+
+ return CTR;
+ }());
+
+
+ return CryptoJS.mode.CTR;
+
+}));
\ No newline at end of file
diff --git a/management/guns-admin/src/main/webapp/static/crypto-js/mode-ecb.js b/management/guns-admin/src/main/webapp/static/crypto-js/mode-ecb.js
new file mode 100644
index 0000000..ff06921
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/static/crypto-js/mode-ecb.js
@@ -0,0 +1,40 @@
+;(function (root, factory, undef) {
+ if (typeof exports === "object") {
+ // CommonJS
+ module.exports = exports = factory(require("./core"), require("./cipher-core"));
+ }
+ else if (typeof define === "function" && define.amd) {
+ // AMD
+ define(["./core", "./cipher-core"], factory);
+ }
+ else {
+ // Global (browser)
+ factory(root.CryptoJS);
+ }
+}(this, function (CryptoJS) {
+
+ /**
+ * Electronic Codebook block mode.
+ */
+ CryptoJS.mode.ECB = (function () {
+ var ECB = CryptoJS.lib.BlockCipherMode.extend();
+
+ ECB.Encryptor = ECB.extend({
+ processBlock: function (words, offset) {
+ this._cipher.encryptBlock(words, offset);
+ }
+ });
+
+ ECB.Decryptor = ECB.extend({
+ processBlock: function (words, offset) {
+ this._cipher.decryptBlock(words, offset);
+ }
+ });
+
+ return ECB;
+ }());
+
+
+ return CryptoJS.mode.ECB;
+
+}));
\ No newline at end of file
diff --git a/management/guns-admin/src/main/webapp/static/crypto-js/mode-ofb.js b/management/guns-admin/src/main/webapp/static/crypto-js/mode-ofb.js
new file mode 100644
index 0000000..c01314c
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/static/crypto-js/mode-ofb.js
@@ -0,0 +1,54 @@
+;(function (root, factory, undef) {
+ if (typeof exports === "object") {
+ // CommonJS
+ module.exports = exports = factory(require("./core"), require("./cipher-core"));
+ }
+ else if (typeof define === "function" && define.amd) {
+ // AMD
+ define(["./core", "./cipher-core"], factory);
+ }
+ else {
+ // Global (browser)
+ factory(root.CryptoJS);
+ }
+}(this, function (CryptoJS) {
+
+ /**
+ * Output Feedback block mode.
+ */
+ CryptoJS.mode.OFB = (function () {
+ var OFB = CryptoJS.lib.BlockCipherMode.extend();
+
+ var Encryptor = OFB.Encryptor = OFB.extend({
+ processBlock: function (words, offset) {
+ // Shortcuts
+ var cipher = this._cipher
+ var blockSize = cipher.blockSize;
+ var iv = this._iv;
+ var keystream = this._keystream;
+
+ // Generate keystream
+ if (iv) {
+ keystream = this._keystream = iv.slice(0);
+
+ // Remove IV for subsequent blocks
+ this._iv = undefined;
+ }
+ cipher.encryptBlock(keystream, 0);
+
+ // Encrypt
+ for (var i = 0; i < blockSize; i++) {
+ words[offset + i] ^= keystream[i];
+ }
+ }
+ });
+
+ OFB.Decryptor = Encryptor;
+
+ return OFB;
+ }());
+
+
+ return CryptoJS.mode.OFB;
+
+}));
\ No newline at end of file
diff --git a/management/guns-admin/src/main/webapp/static/crypto-js/pad-ansix923.js b/management/guns-admin/src/main/webapp/static/crypto-js/pad-ansix923.js
new file mode 100644
index 0000000..f01f21e
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/static/crypto-js/pad-ansix923.js
@@ -0,0 +1,49 @@
+;(function (root, factory, undef) {
+ if (typeof exports === "object") {
+ // CommonJS
+ module.exports = exports = factory(require("./core"), require("./cipher-core"));
+ }
+ else if (typeof define === "function" && define.amd) {
+ // AMD
+ define(["./core", "./cipher-core"], factory);
+ }
+ else {
+ // Global (browser)
+ factory(root.CryptoJS);
+ }
+}(this, function (CryptoJS) {
+
+ /**
+ * ANSI X.923 padding strategy.
+ */
+ CryptoJS.pad.AnsiX923 = {
+ pad: function (data, blockSize) {
+ // Shortcuts
+ var dataSigBytes = data.sigBytes;
+ var blockSizeBytes = blockSize * 4;
+
+ // Count padding bytes
+ var nPaddingBytes = blockSizeBytes - dataSigBytes % blockSizeBytes;
+
+ // Compute last byte position
+ var lastBytePos = dataSigBytes + nPaddingBytes - 1;
+
+ // Pad
+ data.clamp();
+ data.words[lastBytePos >>> 2] |= nPaddingBytes << (24 - (lastBytePos % 4) * 8);
+ data.sigBytes += nPaddingBytes;
+ },
+
+ unpad: function (data) {
+ // Get number of padding bytes from last byte
+ var nPaddingBytes = data.words[(data.sigBytes - 1) >>> 2] & 0xff;
+
+ // Remove padding
+ data.sigBytes -= nPaddingBytes;
+ }
+ };
+
+
+ return CryptoJS.pad.Ansix923;
+
+}));
\ No newline at end of file
diff --git a/management/guns-admin/src/main/webapp/static/crypto-js/pad-iso10126.js b/management/guns-admin/src/main/webapp/static/crypto-js/pad-iso10126.js
new file mode 100644
index 0000000..6e2aefd
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/static/crypto-js/pad-iso10126.js
@@ -0,0 +1,44 @@
+;(function (root, factory, undef) {
+ if (typeof exports === "object") {
+ // CommonJS
+ module.exports = exports = factory(require("./core"), require("./cipher-core"));
+ }
+ else if (typeof define === "function" && define.amd) {
+ // AMD
+ define(["./core", "./cipher-core"], factory);
+ }
+ else {
+ // Global (browser)
+ factory(root.CryptoJS);
+ }
+}(this, function (CryptoJS) {
+
+ /**
+ * ISO 10126 padding strategy.
+ */
+ CryptoJS.pad.Iso10126 = {
+ pad: function (data, blockSize) {
+ // Shortcut
+ var blockSizeBytes = blockSize * 4;
+
+ // Count padding bytes
+ var nPaddingBytes = blockSizeBytes - data.sigBytes % blockSizeBytes;
+
+ // Pad
+ data.concat(CryptoJS.lib.WordArray.random(nPaddingBytes - 1)).
+ concat(CryptoJS.lib.WordArray.create([nPaddingBytes << 24], 1));
+ },
+
+ unpad: function (data) {
+ // Get number of padding bytes from last byte
+ var nPaddingBytes = data.words[(data.sigBytes - 1) >>> 2] & 0xff;
+
+ // Remove padding
+ data.sigBytes -= nPaddingBytes;
+ }
+ };
+
+
+ return CryptoJS.pad.Iso10126;
+
+}));
\ No newline at end of file
diff --git a/management/guns-admin/src/main/webapp/static/crypto-js/pad-iso97971.js b/management/guns-admin/src/main/webapp/static/crypto-js/pad-iso97971.js
new file mode 100644
index 0000000..41049b4
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/static/crypto-js/pad-iso97971.js
@@ -0,0 +1,40 @@
+;(function (root, factory, undef) {
+ if (typeof exports === "object") {
+ // CommonJS
+ module.exports = exports = factory(require("./core"), require("./cipher-core"));
+ }
+ else if (typeof define === "function" && define.amd) {
+ // AMD
+ define(["./core", "./cipher-core"], factory);
+ }
+ else {
+ // Global (browser)
+ factory(root.CryptoJS);
+ }
+}(this, function (CryptoJS) {
+
+ /**
+ * ISO/IEC 9797-1 Padding Method 2.
+ */
+ CryptoJS.pad.Iso97971 = {
+ pad: function (data, blockSize) {
+ // Add 0x80 byte
+ data.concat(CryptoJS.lib.WordArray.create([0x80000000], 1));
+
+ // Zero pad the rest
+ CryptoJS.pad.ZeroPadding.pad(data, blockSize);
+ },
+
+ unpad: function (data) {
+ // Remove zero padding
+ CryptoJS.pad.ZeroPadding.unpad(data);
+
+ // Remove one more byte -- the 0x80 byte
+ data.sigBytes--;
+ }
+ };
+
+
+ return CryptoJS.pad.Iso97971;
+
+}));
\ No newline at end of file
diff --git a/management/guns-admin/src/main/webapp/static/crypto-js/pad-nopadding.js b/management/guns-admin/src/main/webapp/static/crypto-js/pad-nopadding.js
new file mode 100644
index 0000000..c7787c9
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/static/crypto-js/pad-nopadding.js
@@ -0,0 +1,30 @@
+;(function (root, factory, undef) {
+ if (typeof exports === "object") {
+ // CommonJS
+ module.exports = exports = factory(require("./core"), require("./cipher-core"));
+ }
+ else if (typeof define === "function" && define.amd) {
+ // AMD
+ define(["./core", "./cipher-core"], factory);
+ }
+ else {
+ // Global (browser)
+ factory(root.CryptoJS);
+ }
+}(this, function (CryptoJS) {
+
+ /**
+ * A noop padding strategy.
+ */
+ CryptoJS.pad.NoPadding = {
+ pad: function () {
+ },
+
+ unpad: function () {
+ }
+ };
+
+
+ return CryptoJS.pad.NoPadding;
+
+}));
\ No newline at end of file
diff --git a/management/guns-admin/src/main/webapp/static/crypto-js/pad-pkcs7.js b/management/guns-admin/src/main/webapp/static/crypto-js/pad-pkcs7.js
new file mode 100644
index 0000000..3555168
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/static/crypto-js/pad-pkcs7.js
@@ -0,0 +1,18 @@
+;(function (root, factory, undef) {
+ if (typeof exports === "object") {
+ // CommonJS
+ module.exports = exports = factory(require("./core"), require("./cipher-core"));
+ }
+ else if (typeof define === "function" && define.amd) {
+ // AMD
+ define(["./core", "./cipher-core"], factory);
+ }
+ else {
+ // Global (browser)
+ factory(root.CryptoJS);
+ }
+}(this, function (CryptoJS) {
+
+ return CryptoJS.pad.Pkcs7;
+
+}));
\ No newline at end of file
diff --git a/management/guns-admin/src/main/webapp/static/crypto-js/pad-zeropadding.js b/management/guns-admin/src/main/webapp/static/crypto-js/pad-zeropadding.js
new file mode 100644
index 0000000..a1a459e
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/static/crypto-js/pad-zeropadding.js
@@ -0,0 +1,47 @@
+;(function (root, factory, undef) {
+ if (typeof exports === "object") {
+ // CommonJS
+ module.exports = exports = factory(require("./core"), require("./cipher-core"));
+ }
+ else if (typeof define === "function" && define.amd) {
+ // AMD
+ define(["./core", "./cipher-core"], factory);
+ }
+ else {
+ // Global (browser)
+ factory(root.CryptoJS);
+ }
+}(this, function (CryptoJS) {
+
+ /**
+ * Zero padding strategy.
+ */
+ CryptoJS.pad.ZeroPadding = {
+ pad: function (data, blockSize) {
+ // Shortcut
+ var blockSizeBytes = blockSize * 4;
+
+ // Pad
+ data.clamp();
+ data.sigBytes += blockSizeBytes - ((data.sigBytes % blockSizeBytes) || blockSizeBytes);
+ },
+
+ unpad: function (data) {
+ // Shortcut
+ var dataWords = data.words;
+
+ // Unpad
+ var i = data.sigBytes - 1;
+ for (var i = data.sigBytes - 1; i >= 0; i--) {
+ if (((dataWords[i >>> 2] >>> (24 - (i % 4) * 8)) & 0xff)) {
+ data.sigBytes = i + 1;
+ break;
+ }
+ }
+ }
+ };
+
+
+ return CryptoJS.pad.ZeroPadding;
+
+}));
\ No newline at end of file
diff --git a/management/guns-admin/src/main/webapp/static/crypto-js/pbkdf2.js b/management/guns-admin/src/main/webapp/static/crypto-js/pbkdf2.js
new file mode 100644
index 0000000..1258251
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/static/crypto-js/pbkdf2.js
@@ -0,0 +1,145 @@
+;(function (root, factory, undef) {
+ if (typeof exports === "object") {
+ // CommonJS
+ module.exports = exports = factory(require("./core"), require("./sha1"), require("./hmac"));
+ }
+ else if (typeof define === "function" && define.amd) {
+ // AMD
+ define(["./core", "./sha1", "./hmac"], factory);
+ }
+ else {
+ // Global (browser)
+ factory(root.CryptoJS);
+ }
+}(this, function (CryptoJS) {
+
+ (function () {
+ // Shortcuts
+ var C = CryptoJS;
+ var C_lib = C.lib;
+ var Base = C_lib.Base;
+ var WordArray = C_lib.WordArray;
+ var C_algo = C.algo;
+ var SHA1 = C_algo.SHA1;
+ var HMAC = C_algo.HMAC;
+
+ /**
+ * Password-Based Key Derivation Function 2 algorithm.
+ */
+ var PBKDF2 = C_algo.PBKDF2 = Base.extend({
+ /**
+ * Configuration options.
+ *
+ * @property {number} keySize The key size in words to generate. Default: 4 (128 bits)
+ * @property {Hasher} hasher The hasher to use. Default: SHA1
+ * @property {number} iterations The number of iterations to perform. Default: 1
+ */
+ cfg: Base.extend({
+ keySize: 128/32,
+ hasher: SHA1,
+ iterations: 1
+ }),
+
+ /**
+ * Initializes a newly created key derivation function.
+ *
+ * @param {Object} cfg (Optional) The configuration options to use for the derivation.
+ *
+ * @example
+ *
+ * var kdf = CryptoJS.algo.PBKDF2.create();
+ * var kdf = CryptoJS.algo.PBKDF2.create({ keySize: 8 });
+ * var kdf = CryptoJS.algo.PBKDF2.create({ keySize: 8, iterations: 1000 });
+ */
+ init: function (cfg) {
+ this.cfg = this.cfg.extend(cfg);
+ },
+
+ /**
+ * Computes the Password-Based Key Derivation Function 2.
+ *
+ * @param {WordArray|string} password The password.
+ * @param {WordArray|string} salt A salt.
+ *
+ * @return {WordArray} The derived key.
+ *
+ * @example
+ *
+ * var key = kdf.compute(password, salt);
+ */
+ compute: function (password, salt) {
+ // Shortcut
+ var cfg = this.cfg;
+
+ // Init HMAC
+ var hmac = HMAC.create(cfg.hasher, password);
+
+ // Initial values
+ var derivedKey = WordArray.create();
+ var blockIndex = WordArray.create([0x00000001]);
+
+ // Shortcuts
+ var derivedKeyWords = derivedKey.words;
+ var blockIndexWords = blockIndex.words;
+ var keySize = cfg.keySize;
+ var iterations = cfg.iterations;
+
+ // Generate key
+ while (derivedKeyWords.length < keySize) {
+ var block = hmac.update(salt).finalize(blockIndex);
+ hmac.reset();
+
+ // Shortcuts
+ var blockWords = block.words;
+ var blockWordsLength = blockWords.length;
+
+ // Iterations
+ var intermediate = block;
+ for (var i = 1; i < iterations; i++) {
+ intermediate = hmac.finalize(intermediate);
+ hmac.reset();
+
+ // Shortcut
+ var intermediateWords = intermediate.words;
+
+ // XOR intermediate with block
+ for (var j = 0; j < blockWordsLength; j++) {
+ blockWords[j] ^= intermediateWords[j];
+ }
+ }
+
+ derivedKey.concat(block);
+ blockIndexWords[0]++;
+ }
+ derivedKey.sigBytes = keySize * 4;
+
+ return derivedKey;
+ }
+ });
+
+ /**
+ * Computes the Password-Based Key Derivation Function 2.
+ *
+ * @param {WordArray|string} password The password.
+ * @param {WordArray|string} salt A salt.
+ * @param {Object} cfg (Optional) The configuration options to use for this computation.
+ *
+ * @return {WordArray} The derived key.
+ *
+ * @static
+ *
+ * @example
+ *
+ * var key = CryptoJS.PBKDF2(password, salt);
+ * var key = CryptoJS.PBKDF2(password, salt, { keySize: 8 });
+ * var key = CryptoJS.PBKDF2(password, salt, { keySize: 8, iterations: 1000 });
+ */
+ C.PBKDF2 = function (password, salt, cfg) {
+ return PBKDF2.create(cfg).compute(password, salt);
+ };
+ }());
+
+
+ return CryptoJS.PBKDF2;
+
+}));
\ No newline at end of file
diff --git a/management/guns-admin/src/main/webapp/static/crypto-js/rabbit-legacy.js b/management/guns-admin/src/main/webapp/static/crypto-js/rabbit-legacy.js
new file mode 100644
index 0000000..e118b6b
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/static/crypto-js/rabbit-legacy.js
@@ -0,0 +1,190 @@
+;(function (root, factory, undef) {
+ if (typeof exports === "object") {
+ // CommonJS
+ module.exports = exports = factory(require("./core"), require("./enc-base64"), require("./md5"), require("./evpkdf"), require("./cipher-core"));
+ }
+ else if (typeof define === "function" && define.amd) {
+ // AMD
+ define(["./core", "./enc-base64", "./md5", "./evpkdf", "./cipher-core"], factory);
+ }
+ else {
+ // Global (browser)
+ factory(root.CryptoJS);
+ }
+}(this, function (CryptoJS) {
+
+ (function () {
+ // Shortcuts
+ var C = CryptoJS;
+ var C_lib = C.lib;
+ var StreamCipher = C_lib.StreamCipher;
+ var C_algo = C.algo;
+
+ // Reusable objects
+ var S = [];
+ var C_ = [];
+ var G = [];
+
+ /**
+ * Rabbit stream cipher algorithm.
+ *
+ * This is a legacy version that neglected to convert the key to little-endian.
+ * This error doesn't affect the cipher's security,
+ * but it does affect its compatibility with other implementations.
+ */
+ var RabbitLegacy = C_algo.RabbitLegacy = StreamCipher.extend({
+ _doReset: function () {
+ // Shortcuts
+ var K = this._key.words;
+ var iv = this.cfg.iv;
+
+ // Generate initial state values
+ var X = this._X = [
+ K[0], (K[3] << 16) | (K[2] >>> 16),
+ K[1], (K[0] << 16) | (K[3] >>> 16),
+ K[2], (K[1] << 16) | (K[0] >>> 16),
+ K[3], (K[2] << 16) | (K[1] >>> 16)
+ ];
+
+ // Generate initial counter values
+ var C = this._C = [
+ (K[2] << 16) | (K[2] >>> 16), (K[0] & 0xffff0000) | (K[1] & 0x0000ffff),
+ (K[3] << 16) | (K[3] >>> 16), (K[1] & 0xffff0000) | (K[2] & 0x0000ffff),
+ (K[0] << 16) | (K[0] >>> 16), (K[2] & 0xffff0000) | (K[3] & 0x0000ffff),
+ (K[1] << 16) | (K[1] >>> 16), (K[3] & 0xffff0000) | (K[0] & 0x0000ffff)
+ ];
+
+ // Carry bit
+ this._b = 0;
+
+ // Iterate the system four times
+ for (var i = 0; i < 4; i++) {
+ nextState.call(this);
+ }
+
+ // Modify the counters
+ for (var i = 0; i < 8; i++) {
+ C[i] ^= X[(i + 4) & 7];
+ }
+
+ // IV setup
+ if (iv) {
+ // Shortcuts
+ var IV = iv.words;
+ var IV_0 = IV[0];
+ var IV_1 = IV[1];
+
+ // Generate four subvectors
+ var i0 = (((IV_0 << 8) | (IV_0 >>> 24)) & 0x00ff00ff) | (((IV_0 << 24) | (IV_0 >>> 8)) & 0xff00ff00);
+ var i2 = (((IV_1 << 8) | (IV_1 >>> 24)) & 0x00ff00ff) | (((IV_1 << 24) | (IV_1 >>> 8)) & 0xff00ff00);
+ var i1 = (i0 >>> 16) | (i2 & 0xffff0000);
+ var i3 = (i2 << 16) | (i0 & 0x0000ffff);
+
+ // Modify counter values
+ C[0] ^= i0;
+ C[1] ^= i1;
+ C[2] ^= i2;
+ C[3] ^= i3;
+ C[4] ^= i0;
+ C[5] ^= i1;
+ C[6] ^= i2;
+ C[7] ^= i3;
+
+ // Iterate the system four times
+ for (var i = 0; i < 4; i++) {
+ nextState.call(this);
+ }
+ }
+ },
+
+ _doProcessBlock: function (M, offset) {
+ // Shortcut
+ var X = this._X;
+
+ // Iterate the system
+ nextState.call(this);
+
+ // Generate four keystream words
+ S[0] = X[0] ^ (X[5] >>> 16) ^ (X[3] << 16);
+ S[1] = X[2] ^ (X[7] >>> 16) ^ (X[5] << 16);
+ S[2] = X[4] ^ (X[1] >>> 16) ^ (X[7] << 16);
+ S[3] = X[6] ^ (X[3] >>> 16) ^ (X[1] << 16);
+
+ for (var i = 0; i < 4; i++) {
+ // Swap endian
+ S[i] = (((S[i] << 8) | (S[i] >>> 24)) & 0x00ff00ff) |
+ (((S[i] << 24) | (S[i] >>> 8)) & 0xff00ff00);
+
+ // Encrypt
+ M[offset + i] ^= S[i];
+ }
+ },
+
+ blockSize: 128/32,
+
+ ivSize: 64/32
+ });
+
+ function nextState() {
+ // Shortcuts
+ var X = this._X;
+ var C = this._C;
+
+ // Save old counter values
+ for (var i = 0; i < 8; i++) {
+ C_[i] = C[i];
+ }
+
+ // Calculate new counter values
+ C[0] = (C[0] + 0x4d34d34d + this._b) | 0;
+ C[1] = (C[1] + 0xd34d34d3 + ((C[0] >>> 0) < (C_[0] >>> 0) ? 1 : 0)) | 0;
+ C[2] = (C[2] + 0x34d34d34 + ((C[1] >>> 0) < (C_[1] >>> 0) ? 1 : 0)) | 0;
+ C[3] = (C[3] + 0x4d34d34d + ((C[2] >>> 0) < (C_[2] >>> 0) ? 1 : 0)) | 0;
+ C[4] = (C[4] + 0xd34d34d3 + ((C[3] >>> 0) < (C_[3] >>> 0) ? 1 : 0)) | 0;
+ C[5] = (C[5] + 0x34d34d34 + ((C[4] >>> 0) < (C_[4] >>> 0) ? 1 : 0)) | 0;
+ C[6] = (C[6] + 0x4d34d34d + ((C[5] >>> 0) < (C_[5] >>> 0) ? 1 : 0)) | 0;
+ C[7] = (C[7] + 0xd34d34d3 + ((C[6] >>> 0) < (C_[6] >>> 0) ? 1 : 0)) | 0;
+ this._b = (C[7] >>> 0) < (C_[7] >>> 0) ? 1 : 0;
+
+ // Calculate the g-values
+ for (var i = 0; i < 8; i++) {
+ var gx = X[i] + C[i];
+
+ // Construct high and low argument for squaring
+ var ga = gx & 0xffff;
+ var gb = gx >>> 16;
+
+ // Calculate high and low result of squaring
+ var gh = ((((ga * ga) >>> 17) + ga * gb) >>> 15) + gb * gb;
+ var gl = (((gx & 0xffff0000) * gx) | 0) + (((gx & 0x0000ffff) * gx) | 0);
+
+ // High XOR low
+ G[i] = gh ^ gl;
+ }
+
+ // Calculate new state values
+ X[0] = (G[0] + ((G[7] << 16) | (G[7] >>> 16)) + ((G[6] << 16) | (G[6] >>> 16))) | 0;
+ X[1] = (G[1] + ((G[0] << 8) | (G[0] >>> 24)) + G[7]) | 0;
+ X[2] = (G[2] + ((G[1] << 16) | (G[1] >>> 16)) + ((G[0] << 16) | (G[0] >>> 16))) | 0;
+ X[3] = (G[3] + ((G[2] << 8) | (G[2] >>> 24)) + G[1]) | 0;
+ X[4] = (G[4] + ((G[3] << 16) | (G[3] >>> 16)) + ((G[2] << 16) | (G[2] >>> 16))) | 0;
+ X[5] = (G[5] + ((G[4] << 8) | (G[4] >>> 24)) + G[3]) | 0;
+ X[6] = (G[6] + ((G[5] << 16) | (G[5] >>> 16)) + ((G[4] << 16) | (G[4] >>> 16))) | 0;
+ X[7] = (G[7] + ((G[6] << 8) | (G[6] >>> 24)) + G[5]) | 0;
+ }
+
+ /**
+ * Shortcut functions to the cipher's object interface.
+ *
+ * @example
+ *
+ * var ciphertext = CryptoJS.RabbitLegacy.encrypt(message, key, cfg);
+ * var plaintext = CryptoJS.RabbitLegacy.decrypt(ciphertext, key, cfg);
+ */
+ C.RabbitLegacy = StreamCipher._createHelper(RabbitLegacy);
+ }());
+
+
+ return CryptoJS.RabbitLegacy;
+
+}));
\ No newline at end of file
diff --git a/management/guns-admin/src/main/webapp/static/crypto-js/rabbit.js b/management/guns-admin/src/main/webapp/static/crypto-js/rabbit.js
new file mode 100644
index 0000000..1b06833
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/static/crypto-js/rabbit.js
@@ -0,0 +1,192 @@
+;(function (root, factory, undef) {
+ if (typeof exports === "object") {
+ // CommonJS
+ module.exports = exports = factory(require("./core"), require("./enc-base64"), require("./md5"), require("./evpkdf"), require("./cipher-core"));
+ }
+ else if (typeof define === "function" && define.amd) {
+ // AMD
+ define(["./core", "./enc-base64", "./md5", "./evpkdf", "./cipher-core"], factory);
+ }
+ else {
+ // Global (browser)
+ factory(root.CryptoJS);
+ }
+}(this, function (CryptoJS) {
+
+ (function () {
+ // Shortcuts
+ var C = CryptoJS;
+ var C_lib = C.lib;
+ var StreamCipher = C_lib.StreamCipher;
+ var C_algo = C.algo;
+
+ // Reusable objects
+ var S = [];
+ var C_ = [];
+ var G = [];
+
+ /**
+ * Rabbit stream cipher algorithm
+ */
+ var Rabbit = C_algo.Rabbit = StreamCipher.extend({
+ _doReset: function () {
+ // Shortcuts
+ var K = this._key.words;
+ var iv = this.cfg.iv;
+
+ // Swap endian
+ for (var i = 0; i < 4; i++) {
+ K[i] = (((K[i] << 8) | (K[i] >>> 24)) & 0x00ff00ff) |
+ (((K[i] << 24) | (K[i] >>> 8)) & 0xff00ff00);
+ }
+
+ // Generate initial state values
+ var X = this._X = [
+ K[0], (K[3] << 16) | (K[2] >>> 16),
+ K[1], (K[0] << 16) | (K[3] >>> 16),
+ K[2], (K[1] << 16) | (K[0] >>> 16),
+ K[3], (K[2] << 16) | (K[1] >>> 16)
+ ];
+
+ // Generate initial counter values
+ var C = this._C = [
+ (K[2] << 16) | (K[2] >>> 16), (K[0] & 0xffff0000) | (K[1] & 0x0000ffff),
+ (K[3] << 16) | (K[3] >>> 16), (K[1] & 0xffff0000) | (K[2] & 0x0000ffff),
+ (K[0] << 16) | (K[0] >>> 16), (K[2] & 0xffff0000) | (K[3] & 0x0000ffff),
+ (K[1] << 16) | (K[1] >>> 16), (K[3] & 0xffff0000) | (K[0] & 0x0000ffff)
+ ];
+
+ // Carry bit
+ this._b = 0;
+
+ // Iterate the system four times
+ for (var i = 0; i < 4; i++) {
+ nextState.call(this);
+ }
+
+ // Modify the counters
+ for (var i = 0; i < 8; i++) {
+ C[i] ^= X[(i + 4) & 7];
+ }
+
+ // IV setup
+ if (iv) {
+ // Shortcuts
+ var IV = iv.words;
+ var IV_0 = IV[0];
+ var IV_1 = IV[1];
+
+ // Generate four subvectors
+ var i0 = (((IV_0 << 8) | (IV_0 >>> 24)) & 0x00ff00ff) | (((IV_0 << 24) | (IV_0 >>> 8)) & 0xff00ff00);
+ var i2 = (((IV_1 << 8) | (IV_1 >>> 24)) & 0x00ff00ff) | (((IV_1 << 24) | (IV_1 >>> 8)) & 0xff00ff00);
+ var i1 = (i0 >>> 16) | (i2 & 0xffff0000);
+ var i3 = (i2 << 16) | (i0 & 0x0000ffff);
+
+ // Modify counter values
+ C[0] ^= i0;
+ C[1] ^= i1;
+ C[2] ^= i2;
+ C[3] ^= i3;
+ C[4] ^= i0;
+ C[5] ^= i1;
+ C[6] ^= i2;
+ C[7] ^= i3;
+
+ // Iterate the system four times
+ for (var i = 0; i < 4; i++) {
+ nextState.call(this);
+ }
+ }
+ },
+
+ _doProcessBlock: function (M, offset) {
+ // Shortcut
+ var X = this._X;
+
+ // Iterate the system
+ nextState.call(this);
+
+ // Generate four keystream words
+ S[0] = X[0] ^ (X[5] >>> 16) ^ (X[3] << 16);
+ S[1] = X[2] ^ (X[7] >>> 16) ^ (X[5] << 16);
+ S[2] = X[4] ^ (X[1] >>> 16) ^ (X[7] << 16);
+ S[3] = X[6] ^ (X[3] >>> 16) ^ (X[1] << 16);
+
+ for (var i = 0; i < 4; i++) {
+ // Swap endian
+ S[i] = (((S[i] << 8) | (S[i] >>> 24)) & 0x00ff00ff) |
+ (((S[i] << 24) | (S[i] >>> 8)) & 0xff00ff00);
+
+ // Encrypt
+ M[offset + i] ^= S[i];
+ }
+ },
+
+ blockSize: 128/32,
+
+ ivSize: 64/32
+ });
+
+ function nextState() {
+ // Shortcuts
+ var X = this._X;
+ var C = this._C;
+
+ // Save old counter values
+ for (var i = 0; i < 8; i++) {
+ C_[i] = C[i];
+ }
+
+ // Calculate new counter values
+ C[0] = (C[0] + 0x4d34d34d + this._b) | 0;
+ C[1] = (C[1] + 0xd34d34d3 + ((C[0] >>> 0) < (C_[0] >>> 0) ? 1 : 0)) | 0;
+ C[2] = (C[2] + 0x34d34d34 + ((C[1] >>> 0) < (C_[1] >>> 0) ? 1 : 0)) | 0;
+ C[3] = (C[3] + 0x4d34d34d + ((C[2] >>> 0) < (C_[2] >>> 0) ? 1 : 0)) | 0;
+ C[4] = (C[4] + 0xd34d34d3 + ((C[3] >>> 0) < (C_[3] >>> 0) ? 1 : 0)) | 0;
+ C[5] = (C[5] + 0x34d34d34 + ((C[4] >>> 0) < (C_[4] >>> 0) ? 1 : 0)) | 0;
+ C[6] = (C[6] + 0x4d34d34d + ((C[5] >>> 0) < (C_[5] >>> 0) ? 1 : 0)) | 0;
+ C[7] = (C[7] + 0xd34d34d3 + ((C[6] >>> 0) < (C_[6] >>> 0) ? 1 : 0)) | 0;
+ this._b = (C[7] >>> 0) < (C_[7] >>> 0) ? 1 : 0;
+
+ // Calculate the g-values
+ for (var i = 0; i < 8; i++) {
+ var gx = X[i] + C[i];
+
+ // Construct high and low argument for squaring
+ var ga = gx & 0xffff;
+ var gb = gx >>> 16;
+
+ // Calculate high and low result of squaring
+ var gh = ((((ga * ga) >>> 17) + ga * gb) >>> 15) + gb * gb;
+ var gl = (((gx & 0xffff0000) * gx) | 0) + (((gx & 0x0000ffff) * gx) | 0);
+
+ // High XOR low
+ G[i] = gh ^ gl;
+ }
+
+ // Calculate new state values
+ X[0] = (G[0] + ((G[7] << 16) | (G[7] >>> 16)) + ((G[6] << 16) | (G[6] >>> 16))) | 0;
+ X[1] = (G[1] + ((G[0] << 8) | (G[0] >>> 24)) + G[7]) | 0;
+ X[2] = (G[2] + ((G[1] << 16) | (G[1] >>> 16)) + ((G[0] << 16) | (G[0] >>> 16))) | 0;
+ X[3] = (G[3] + ((G[2] << 8) | (G[2] >>> 24)) + G[1]) | 0;
+ X[4] = (G[4] + ((G[3] << 16) | (G[3] >>> 16)) + ((G[2] << 16) | (G[2] >>> 16))) | 0;
+ X[5] = (G[5] + ((G[4] << 8) | (G[4] >>> 24)) + G[3]) | 0;
+ X[6] = (G[6] + ((G[5] << 16) | (G[5] >>> 16)) + ((G[4] << 16) | (G[4] >>> 16))) | 0;
+ X[7] = (G[7] + ((G[6] << 8) | (G[6] >>> 24)) + G[5]) | 0;
+ }
+
+ /**
+ * Shortcut functions to the cipher's object interface.
+ *
+ * @example
+ *
+ * var ciphertext = CryptoJS.Rabbit.encrypt(message, key, cfg);
+ * var plaintext = CryptoJS.Rabbit.decrypt(ciphertext, key, cfg);
+ */
+ C.Rabbit = StreamCipher._createHelper(Rabbit);
+ }());
+
+
+ return CryptoJS.Rabbit;
+
+}));
\ No newline at end of file
diff --git a/management/guns-admin/src/main/webapp/static/crypto-js/rc4.js b/management/guns-admin/src/main/webapp/static/crypto-js/rc4.js
new file mode 100644
index 0000000..0e4bdff
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/static/crypto-js/rc4.js
@@ -0,0 +1,139 @@
+;(function (root, factory, undef) {
+ if (typeof exports === "object") {
+ // CommonJS
+ module.exports = exports = factory(require("./core"), require("./enc-base64"), require("./md5"), require("./evpkdf"), require("./cipher-core"));
+ }
+ else if (typeof define === "function" && define.amd) {
+ // AMD
+ define(["./core", "./enc-base64", "./md5", "./evpkdf", "./cipher-core"], factory);
+ }
+ else {
+ // Global (browser)
+ factory(root.CryptoJS);
+ }
+}(this, function (CryptoJS) {
+
+ (function () {
+ // Shortcuts
+ var C = CryptoJS;
+ var C_lib = C.lib;
+ var StreamCipher = C_lib.StreamCipher;
+ var C_algo = C.algo;
+
+ /**
+ * RC4 stream cipher algorithm.
+ */
+ var RC4 = C_algo.RC4 = StreamCipher.extend({
+ _doReset: function () {
+ // Shortcuts
+ var key = this._key;
+ var keyWords = key.words;
+ var keySigBytes = key.sigBytes;
+
+ // Init sbox
+ var S = this._S = [];
+ for (var i = 0; i < 256; i++) {
+ S[i] = i;
+ }
+
+ // Key setup
+ for (var i = 0, j = 0; i < 256; i++) {
+ var keyByteIndex = i % keySigBytes;
+ var keyByte = (keyWords[keyByteIndex >>> 2] >>> (24 - (keyByteIndex % 4) * 8)) & 0xff;
+
+ j = (j + S[i] + keyByte) % 256;
+
+ // Swap
+ var t = S[i];
+ S[i] = S[j];
+ S[j] = t;
+ }
+
+ // Counters
+ this._i = this._j = 0;
+ },
+
+ _doProcessBlock: function (M, offset) {
+ M[offset] ^= generateKeystreamWord.call(this);
+ },
+
+ keySize: 256/32,
+
+ ivSize: 0
+ });
+
+ function generateKeystreamWord() {
+ // Shortcuts
+ var S = this._S;
+ var i = this._i;
+ var j = this._j;
+
+ // Generate keystream word
+ var keystreamWord = 0;
+ for (var n = 0; n < 4; n++) {
+ i = (i + 1) % 256;
+ j = (j + S[i]) % 256;
+
+ // Swap
+ var t = S[i];
+ S[i] = S[j];
+ S[j] = t;
+
+ keystreamWord |= S[(S[i] + S[j]) % 256] << (24 - n * 8);
+ }
+
+ // Update counters
+ this._i = i;
+ this._j = j;
+
+ return keystreamWord;
+ }
+
+ /**
+ * Shortcut functions to the cipher's object interface.
+ *
+ * @example
+ *
+ * var ciphertext = CryptoJS.RC4.encrypt(message, key, cfg);
+ * var plaintext = CryptoJS.RC4.decrypt(ciphertext, key, cfg);
+ */
+ C.RC4 = StreamCipher._createHelper(RC4);
+
+ /**
+ * Modified RC4 stream cipher algorithm.
+ */
+ var RC4Drop = C_algo.RC4Drop = RC4.extend({
+ /**
+ * Configuration options.
+ *
+ * @property {number} drop The number of keystream words to drop. Default 192
+ */
+ cfg: RC4.cfg.extend({
+ drop: 192
+ }),
+
+ _doReset: function () {
+ RC4._doReset.call(this);
+
+ // Drop
+ for (var i = this.cfg.drop; i > 0; i--) {
+ generateKeystreamWord.call(this);
+ }
+ }
+ });
+
+ /**
+ * Shortcut functions to the cipher's object interface.
+ *
+ * @example
+ *
+ * var ciphertext = CryptoJS.RC4Drop.encrypt(message, key, cfg);
+ * var plaintext = CryptoJS.RC4Drop.decrypt(ciphertext, key, cfg);
+ */
+ C.RC4Drop = StreamCipher._createHelper(RC4Drop);
+ }());
+
+
+ return CryptoJS.RC4;
+
+}));
\ No newline at end of file
diff --git a/management/guns-admin/src/main/webapp/static/crypto-js/ripemd160.js b/management/guns-admin/src/main/webapp/static/crypto-js/ripemd160.js
new file mode 100644
index 0000000..24feb47
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/static/crypto-js/ripemd160.js
@@ -0,0 +1,267 @@
+;(function (root, factory) {
+ if (typeof exports === "object") {
+ // CommonJS
+ module.exports = exports = factory(require("./core"));
+ }
+ else if (typeof define === "function" && define.amd) {
+ // AMD
+ define(["./core"], factory);
+ }
+ else {
+ // Global (browser)
+ factory(root.CryptoJS);
+ }
+}(this, function (CryptoJS) {
+
+ /** @preserve
+ (c) 2012 by Cédric Mesnil. All rights reserved.
+
+ Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+
+ - Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
+ - Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
+
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+ (function (Math) {
+ // Shortcuts
+ var C = CryptoJS;
+ var C_lib = C.lib;
+ var WordArray = C_lib.WordArray;
+ var Hasher = C_lib.Hasher;
+ var C_algo = C.algo;
+
+ // Constants table
+ var _zl = WordArray.create([
+ 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15,
+ 7, 4, 13, 1, 10, 6, 15, 3, 12, 0, 9, 5, 2, 14, 11, 8,
+ 3, 10, 14, 4, 9, 15, 8, 1, 2, 7, 0, 6, 13, 11, 5, 12,
+ 1, 9, 11, 10, 0, 8, 12, 4, 13, 3, 7, 15, 14, 5, 6, 2,
+ 4, 0, 5, 9, 7, 12, 2, 10, 14, 1, 3, 8, 11, 6, 15, 13]);
+ var _zr = WordArray.create([
+ 5, 14, 7, 0, 9, 2, 11, 4, 13, 6, 15, 8, 1, 10, 3, 12,
+ 6, 11, 3, 7, 0, 13, 5, 10, 14, 15, 8, 12, 4, 9, 1, 2,
+ 15, 5, 1, 3, 7, 14, 6, 9, 11, 8, 12, 2, 10, 0, 4, 13,
+ 8, 6, 4, 1, 3, 11, 15, 0, 5, 12, 2, 13, 9, 7, 10, 14,
+ 12, 15, 10, 4, 1, 5, 8, 7, 6, 2, 13, 14, 0, 3, 9, 11]);
+ var _sl = WordArray.create([
+ 11, 14, 15, 12, 5, 8, 7, 9, 11, 13, 14, 15, 6, 7, 9, 8,
+ 7, 6, 8, 13, 11, 9, 7, 15, 7, 12, 15, 9, 11, 7, 13, 12,
+ 11, 13, 6, 7, 14, 9, 13, 15, 14, 8, 13, 6, 5, 12, 7, 5,
+ 11, 12, 14, 15, 14, 15, 9, 8, 9, 14, 5, 6, 8, 6, 5, 12,
+ 9, 15, 5, 11, 6, 8, 13, 12, 5, 12, 13, 14, 11, 8, 5, 6 ]);
+ var _sr = WordArray.create([
+ 8, 9, 9, 11, 13, 15, 15, 5, 7, 7, 8, 11, 14, 14, 12, 6,
+ 9, 13, 15, 7, 12, 8, 9, 11, 7, 7, 12, 7, 6, 15, 13, 11,
+ 9, 7, 15, 11, 8, 6, 6, 14, 12, 13, 5, 14, 13, 13, 7, 5,
+ 15, 5, 8, 11, 14, 14, 6, 14, 6, 9, 12, 9, 12, 5, 15, 8,
+ 8, 5, 12, 9, 12, 5, 14, 6, 8, 13, 6, 5, 15, 13, 11, 11 ]);
+
+ var _hl = WordArray.create([ 0x00000000, 0x5A827999, 0x6ED9EBA1, 0x8F1BBCDC, 0xA953FD4E]);
+ var _hr = WordArray.create([ 0x50A28BE6, 0x5C4DD124, 0x6D703EF3, 0x7A6D76E9, 0x00000000]);
+
+ /**
+ * RIPEMD160 hash algorithm.
+ */
+ var RIPEMD160 = C_algo.RIPEMD160 = Hasher.extend({
+ _doReset: function () {
+ this._hash = WordArray.create([0x67452301, 0xEFCDAB89, 0x98BADCFE, 0x10325476, 0xC3D2E1F0]);
+ },
+
+ _doProcessBlock: function (M, offset) {
+
+ // Swap endian
+ for (var i = 0; i < 16; i++) {
+ // Shortcuts
+ var offset_i = offset + i;
+ var M_offset_i = M[offset_i];
+
+ // Swap
+ M[offset_i] = (
+ (((M_offset_i << 8) | (M_offset_i >>> 24)) & 0x00ff00ff) |
+ (((M_offset_i << 24) | (M_offset_i >>> 8)) & 0xff00ff00)
+ );
+ }
+ // Shortcut
+ var H = this._hash.words;
+ var hl = _hl.words;
+ var hr = _hr.words;
+ var zl = _zl.words;
+ var zr = _zr.words;
+ var sl = _sl.words;
+ var sr = _sr.words;
+
+ // Working variables
+ var al, bl, cl, dl, el;
+ var ar, br, cr, dr, er;
+
+ ar = al = H[0];
+ br = bl = H[1];
+ cr = cl = H[2];
+ dr = dl = H[3];
+ er = el = H[4];
+ // Computation
+ var t;
+ for (var i = 0; i < 80; i += 1) {
+ t = (al + M[offset+zl[i]])|0;
+ if (i<16){
+ t += f1(bl,cl,dl) + hl[0];
+ } else if (i<32) {
+ t += f2(bl,cl,dl) + hl[1];
+ } else if (i<48) {
+ t += f3(bl,cl,dl) + hl[2];
+ } else if (i<64) {
+ t += f4(bl,cl,dl) + hl[3];
+ } else {// if (i<80) {
+ t += f5(bl,cl,dl) + hl[4];
+ }
+ t = t|0;
+ t = rotl(t,sl[i]);
+ t = (t+el)|0;
+ al = el;
+ el = dl;
+ dl = rotl(cl, 10);
+ cl = bl;
+ bl = t;
+
+ t = (ar + M[offset+zr[i]])|0;
+ if (i<16){
+ t += f5(br,cr,dr) + hr[0];
+ } else if (i<32) {
+ t += f4(br,cr,dr) + hr[1];
+ } else if (i<48) {
+ t += f3(br,cr,dr) + hr[2];
+ } else if (i<64) {
+ t += f2(br,cr,dr) + hr[3];
+ } else {// if (i<80) {
+ t += f1(br,cr,dr) + hr[4];
+ }
+ t = t|0;
+ t = rotl(t,sr[i]) ;
+ t = (t+er)|0;
+ ar = er;
+ er = dr;
+ dr = rotl(cr, 10);
+ cr = br;
+ br = t;
+ }
+ // Intermediate hash value
+ t = (H[1] + cl + dr)|0;
+ H[1] = (H[2] + dl + er)|0;
+ H[2] = (H[3] + el + ar)|0;
+ H[3] = (H[4] + al + br)|0;
+ H[4] = (H[0] + bl + cr)|0;
+ H[0] = t;
+ },
+
+ _doFinalize: function () {
+ // Shortcuts
+ var data = this._data;
+ var dataWords = data.words;
+
+ var nBitsTotal = this._nDataBytes * 8;
+ var nBitsLeft = data.sigBytes * 8;
+
+ // Add padding
+ dataWords[nBitsLeft >>> 5] |= 0x80 << (24 - nBitsLeft % 32);
+ dataWords[(((nBitsLeft + 64) >>> 9) << 4) + 14] = (
+ (((nBitsTotal << 8) | (nBitsTotal >>> 24)) & 0x00ff00ff) |
+ (((nBitsTotal << 24) | (nBitsTotal >>> 8)) & 0xff00ff00)
+ );
+ data.sigBytes = (dataWords.length + 1) * 4;
+
+ // Hash final blocks
+ this._process();
+
+ // Shortcuts
+ var hash = this._hash;
+ var H = hash.words;
+
+ // Swap endian
+ for (var i = 0; i < 5; i++) {
+ // Shortcut
+ var H_i = H[i];
+
+ // Swap
+ H[i] = (((H_i << 8) | (H_i >>> 24)) & 0x00ff00ff) |
+ (((H_i << 24) | (H_i >>> 8)) & 0xff00ff00);
+ }
+
+ // Return final computed hash
+ return hash;
+ },
+
+ clone: function () {
+ var clone = Hasher.clone.call(this);
+ clone._hash = this._hash.clone();
+
+ return clone;
+ }
+ });
+
+
+ function f1(x, y, z) {
+ return ((x) ^ (y) ^ (z));
+
+ }
+
+ function f2(x, y, z) {
+ return (((x)&(y)) | ((~x)&(z)));
+ }
+
+ function f3(x, y, z) {
+ return (((x) | (~(y))) ^ (z));
+ }
+
+ function f4(x, y, z) {
+ return (((x) & (z)) | ((y)&(~(z))));
+ }
+
+ function f5(x, y, z) {
+ return ((x) ^ ((y) |(~(z))));
+
+ }
+
+ function rotl(x,n) {
+ return (x<<n) | (x>>>(32-n));
+ }
+
+
+ /**
+ * Shortcut function to the hasher's object interface.
+ *
+ * @param {WordArray|string} message The message to hash.
+ *
+ * @return {WordArray} The hash.
+ *
+ * @static
+ *
+ * @example
+ *
+ * var hash = CryptoJS.RIPEMD160('message');
+ * var hash = CryptoJS.RIPEMD160(wordArray);
+ */
+ C.RIPEMD160 = Hasher._createHelper(RIPEMD160);
+
+ /**
+ * Shortcut function to the HMAC's object interface.
+ *
+ * @param {WordArray|string} message The message to hash.
+ * @param {WordArray|string} key The secret key.
+ *
+ * @return {WordArray} The HMAC.
+ *
+ * @static
+ *
+ * @example
+ *
+ * var hmac = CryptoJS.HmacRIPEMD160(message, key);
+ */
+ C.HmacRIPEMD160 = Hasher._createHmacHelper(RIPEMD160);
+ }(Math));
+
+
+ return CryptoJS.RIPEMD160;
+
+}));
\ No newline at end of file
diff --git a/management/guns-admin/src/main/webapp/static/crypto-js/sha1.js b/management/guns-admin/src/main/webapp/static/crypto-js/sha1.js
new file mode 100644
index 0000000..6691149
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/static/crypto-js/sha1.js
@@ -0,0 +1,150 @@
+;(function (root, factory) {
+ if (typeof exports === "object") {
+ // CommonJS
+ module.exports = exports = factory(require("./core"));
+ }
+ else if (typeof define === "function" && define.amd) {
+ // AMD
+ define(["./core"], factory);
+ }
+ else {
+ // Global (browser)
+ factory(root.CryptoJS);
+ }
+}(this, function (CryptoJS) {
+
+ (function () {
+ // Shortcuts
+ var C = CryptoJS;
+ var C_lib = C.lib;
+ var WordArray = C_lib.WordArray;
+ var Hasher = C_lib.Hasher;
+ var C_algo = C.algo;
+
+ // Reusable object
+ var W = [];
+
+ /**
+ * SHA-1 hash algorithm.
+ */
+ var SHA1 = C_algo.SHA1 = Hasher.extend({
+ _doReset: function () {
+ this._hash = new WordArray.init([
+ 0x67452301, 0xefcdab89,
+ 0x98badcfe, 0x10325476,
+ 0xc3d2e1f0
+ ]);
+ },
+
+ _doProcessBlock: function (M, offset) {
+ // Shortcut
+ var H = this._hash.words;
+
+ // Working variables
+ var a = H[0];
+ var b = H[1];
+ var c = H[2];
+ var d = H[3];
+ var e = H[4];
+
+ // Computation
+ for (var i = 0; i < 80; i++) {
+ if (i < 16) {
+ W[i] = M[offset + i] | 0;
+ } else {
+ var n = W[i - 3] ^ W[i - 8] ^ W[i - 14] ^ W[i - 16];
+ W[i] = (n << 1) | (n >>> 31);
+ }
+
+ var t = ((a << 5) | (a >>> 27)) + e + W[i];
+ if (i < 20) {
+ t += ((b & c) | (~b & d)) + 0x5a827999;
+ } else if (i < 40) {
+ t += (b ^ c ^ d) + 0x6ed9eba1;
+ } else if (i < 60) {
+ t += ((b & c) | (b & d) | (c & d)) - 0x70e44324;
+ } else /* if (i < 80) */ {
+ t += (b ^ c ^ d) - 0x359d3e2a;
+ }
+
+ e = d;
+ d = c;
+ c = (b << 30) | (b >>> 2);
+ b = a;
+ a = t;
+ }
+
+ // Intermediate hash value
+ H[0] = (H[0] + a) | 0;
+ H[1] = (H[1] + b) | 0;
+ H[2] = (H[2] + c) | 0;
+ H[3] = (H[3] + d) | 0;
+ H[4] = (H[4] + e) | 0;
+ },
+
+ _doFinalize: function () {
+ // Shortcuts
+ var data = this._data;
+ var dataWords = data.words;
+
+ var nBitsTotal = this._nDataBytes * 8;
+ var nBitsLeft = data.sigBytes * 8;
+
+ // Add padding
+ dataWords[nBitsLeft >>> 5] |= 0x80 << (24 - nBitsLeft % 32);
+ dataWords[(((nBitsLeft + 64) >>> 9) << 4) + 14] = Math.floor(nBitsTotal / 0x100000000);
+ dataWords[(((nBitsLeft + 64) >>> 9) << 4) + 15] = nBitsTotal;
+ data.sigBytes = dataWords.length * 4;
+
+ // Hash final blocks
+ this._process();
+
+ // Return final computed hash
+ return this._hash;
+ },
+
+ clone: function () {
+ var clone = Hasher.clone.call(this);
+ clone._hash = this._hash.clone();
+
+ return clone;
+ }
+ });
+
+ /**
+ * Shortcut function to the hasher's object interface.
+ *
+ * @param {WordArray|string} message The message to hash.
+ *
+ * @return {WordArray} The hash.
+ *
+ * @static
+ *
+ * @example
+ *
+ * var hash = CryptoJS.SHA1('message');
+ * var hash = CryptoJS.SHA1(wordArray);
+ */
+ C.SHA1 = Hasher._createHelper(SHA1);
+
+ /**
+ * Shortcut function to the HMAC's object interface.
+ *
+ * @param {WordArray|string} message The message to hash.
+ * @param {WordArray|string} key The secret key.
+ *
+ * @return {WordArray} The HMAC.
+ *
+ * @static
+ *
+ * @example
+ *
+ * var hmac = CryptoJS.HmacSHA1(message, key);
+ */
+ C.HmacSHA1 = Hasher._createHmacHelper(SHA1);
+ }());
+
+
+ return CryptoJS.SHA1;
+
+}));
\ No newline at end of file
diff --git a/management/guns-admin/src/main/webapp/static/crypto-js/sha224.js b/management/guns-admin/src/main/webapp/static/crypto-js/sha224.js
new file mode 100644
index 0000000..d8ce988
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/static/crypto-js/sha224.js
@@ -0,0 +1,80 @@
+;(function (root, factory, undef) {
+ if (typeof exports === "object") {
+ // CommonJS
+ module.exports = exports = factory(require("./core"), require("./sha256"));
+ }
+ else if (typeof define === "function" && define.amd) {
+ // AMD
+ define(["./core", "./sha256"], factory);
+ }
+ else {
+ // Global (browser)
+ factory(root.CryptoJS);
+ }
+}(this, function (CryptoJS) {
+
+ (function () {
+ // Shortcuts
+ var C = CryptoJS;
+ var C_lib = C.lib;
+ var WordArray = C_lib.WordArray;
+ var C_algo = C.algo;
+ var SHA256 = C_algo.SHA256;
+
+ /**
+ * SHA-224 hash algorithm.
+ */
+ var SHA224 = C_algo.SHA224 = SHA256.extend({
+ _doReset: function () {
+ this._hash = new WordArray.init([
+ 0xc1059ed8, 0x367cd507, 0x3070dd17, 0xf70e5939,
+ 0xffc00b31, 0x68581511, 0x64f98fa7, 0xbefa4fa4
+ ]);
+ },
+
+ _doFinalize: function () {
+ var hash = SHA256._doFinalize.call(this);
+
+ hash.sigBytes -= 4;
+
+ return hash;
+ }
+ });
+
+ /**
+ * Shortcut function to the hasher's object interface.
+ *
+ * @param {WordArray|string} message The message to hash.
+ *
+ * @return {WordArray} The hash.
+ *
+ * @static
+ *
+ * @example
+ *
+ * var hash = CryptoJS.SHA224('message');
+ * var hash = CryptoJS.SHA224(wordArray);
+ */
+ C.SHA224 = SHA256._createHelper(SHA224);
+
+ /**
+ * Shortcut function to the HMAC's object interface.
+ *
+ * @param {WordArray|string} message The message to hash.
+ * @param {WordArray|string} key The secret key.
+ *
+ * @return {WordArray} The HMAC.
+ *
+ * @static
+ *
+ * @example
+ *
+ * var hmac = CryptoJS.HmacSHA224(message, key);
+ */
+ C.HmacSHA224 = SHA256._createHmacHelper(SHA224);
+ }());
+
+
+ return CryptoJS.SHA224;
+
+}));
\ No newline at end of file
diff --git a/management/guns-admin/src/main/webapp/static/crypto-js/sha256.js b/management/guns-admin/src/main/webapp/static/crypto-js/sha256.js
new file mode 100644
index 0000000..de2d7fc
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/static/crypto-js/sha256.js
@@ -0,0 +1,199 @@
+;(function (root, factory) {
+ if (typeof exports === "object") {
+ // CommonJS
+ module.exports = exports = factory(require("./core"));
+ }
+ else if (typeof define === "function" && define.amd) {
+ // AMD
+ define(["./core"], factory);
+ }
+ else {
+ // Global (browser)
+ factory(root.CryptoJS);
+ }
+}(this, function (CryptoJS) {
+
+ (function (Math) {
+ // Shortcuts
+ var C = CryptoJS;
+ var C_lib = C.lib;
+ var WordArray = C_lib.WordArray;
+ var Hasher = C_lib.Hasher;
+ var C_algo = C.algo;
+
+ // Initialization and round constants tables
+ var H = [];
+ var K = [];
+
+ // Compute constants
+ (function () {
+ function isPrime(n) {
+ var sqrtN = Math.sqrt(n);
+ for (var factor = 2; factor <= sqrtN; factor++) {
+ if (!(n % factor)) {
+ return false;
+ }
+ }
+
+ return true;
+ }
+
+ function getFractionalBits(n) {
+ return ((n - (n | 0)) * 0x100000000) | 0;
+ }
+
+ var n = 2;
+ var nPrime = 0;
+ while (nPrime < 64) {
+ if (isPrime(n)) {
+ if (nPrime < 8) {
+ H[nPrime] = getFractionalBits(Math.pow(n, 1 / 2));
+ }
+ K[nPrime] = getFractionalBits(Math.pow(n, 1 / 3));
+
+ nPrime++;
+ }
+
+ n++;
+ }
+ }());
+
+ // Reusable object
+ var W = [];
+
+ /**
+ * SHA-256 hash algorithm.
+ */
+ var SHA256 = C_algo.SHA256 = Hasher.extend({
+ _doReset: function () {
+ this._hash = new WordArray.init(H.slice(0));
+ },
+
+ _doProcessBlock: function (M, offset) {
+ // Shortcut
+ var H = this._hash.words;
+
+ // Working variables
+ var a = H[0];
+ var b = H[1];
+ var c = H[2];
+ var d = H[3];
+ var e = H[4];
+ var f = H[5];
+ var g = H[6];
+ var h = H[7];
+
+ // Computation
+ for (var i = 0; i < 64; i++) {
+ if (i < 16) {
+ W[i] = M[offset + i] | 0;
+ } else {
+ var gamma0x = W[i - 15];
+ var gamma0 = ((gamma0x << 25) | (gamma0x >>> 7)) ^
+ ((gamma0x << 14) | (gamma0x >>> 18)) ^
+ (gamma0x >>> 3);
+
+ var gamma1x = W[i - 2];
+ var gamma1 = ((gamma1x << 15) | (gamma1x >>> 17)) ^
+ ((gamma1x << 13) | (gamma1x >>> 19)) ^
+ (gamma1x >>> 10);
+
+ W[i] = gamma0 + W[i - 7] + gamma1 + W[i - 16];
+ }
+
+ var ch = (e & f) ^ (~e & g);
+ var maj = (a & b) ^ (a & c) ^ (b & c);
+
+ var sigma0 = ((a << 30) | (a >>> 2)) ^ ((a << 19) | (a >>> 13)) ^ ((a << 10) | (a >>> 22));
+ var sigma1 = ((e << 26) | (e >>> 6)) ^ ((e << 21) | (e >>> 11)) ^ ((e << 7) | (e >>> 25));
+
+ var t1 = h + sigma1 + ch + K[i] + W[i];
+ var t2 = sigma0 + maj;
+
+ h = g;
+ g = f;
+ f = e;
+ e = (d + t1) | 0;
+ d = c;
+ c = b;
+ b = a;
+ a = (t1 + t2) | 0;
+ }
+
+ // Intermediate hash value
+ H[0] = (H[0] + a) | 0;
+ H[1] = (H[1] + b) | 0;
+ H[2] = (H[2] + c) | 0;
+ H[3] = (H[3] + d) | 0;
+ H[4] = (H[4] + e) | 0;
+ H[5] = (H[5] + f) | 0;
+ H[6] = (H[6] + g) | 0;
+ H[7] = (H[7] + h) | 0;
+ },
+
+ _doFinalize: function () {
+ // Shortcuts
+ var data = this._data;
+ var dataWords = data.words;
+
+ var nBitsTotal = this._nDataBytes * 8;
+ var nBitsLeft = data.sigBytes * 8;
+
+ // Add padding
+ dataWords[nBitsLeft >>> 5] |= 0x80 << (24 - nBitsLeft % 32);
+ dataWords[(((nBitsLeft + 64) >>> 9) << 4) + 14] = Math.floor(nBitsTotal / 0x100000000);
+ dataWords[(((nBitsLeft + 64) >>> 9) << 4) + 15] = nBitsTotal;
+ data.sigBytes = dataWords.length * 4;
+
+ // Hash final blocks
+ this._process();
+
+ // Return final computed hash
+ return this._hash;
+ },
+
+ clone: function () {
+ var clone = Hasher.clone.call(this);
+ clone._hash = this._hash.clone();
+
+ return clone;
+ }
+ });
+
+ /**
+ * Shortcut function to the hasher's object interface.
+ *
+ * @param {WordArray|string} message The message to hash.
+ *
+ * @return {WordArray} The hash.
+ *
+ * @static
+ *
+ * @example
+ *
+ * var hash = CryptoJS.SHA256('message');
+ * var hash = CryptoJS.SHA256(wordArray);
+ */
+ C.SHA256 = Hasher._createHelper(SHA256);
+
+ /**
+ * Shortcut function to the HMAC's object interface.
+ *
+ * @param {WordArray|string} message The message to hash.
+ * @param {WordArray|string} key The secret key.
+ *
+ * @return {WordArray} The HMAC.
+ *
+ * @static
+ *
+ * @example
+ *
+ * var hmac = CryptoJS.HmacSHA256(message, key);
+ */
+ C.HmacSHA256 = Hasher._createHmacHelper(SHA256);
+ }(Math));
+
+
+ return CryptoJS.SHA256;
+
+}));
\ No newline at end of file
diff --git a/management/guns-admin/src/main/webapp/static/crypto-js/sha3.js b/management/guns-admin/src/main/webapp/static/crypto-js/sha3.js
new file mode 100644
index 0000000..34ad86c
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/static/crypto-js/sha3.js
@@ -0,0 +1,326 @@
+;(function (root, factory, undef) {
+ if (typeof exports === "object") {
+ // CommonJS
+ module.exports = exports = factory(require("./core"), require("./x64-core"));
+ }
+ else if (typeof define === "function" && define.amd) {
+ // AMD
+ define(["./core", "./x64-core"], factory);
+ }
+ else {
+ // Global (browser)
+ factory(root.CryptoJS);
+ }
+}(this, function (CryptoJS) {
+
+ (function (Math) {
+ // Shortcuts
+ var C = CryptoJS;
+ var C_lib = C.lib;
+ var WordArray = C_lib.WordArray;
+ var Hasher = C_lib.Hasher;
+ var C_x64 = C.x64;
+ var X64Word = C_x64.Word;
+ var C_algo = C.algo;
+
+ // Constants tables
+ var RHO_OFFSETS = [];
+ var PI_INDEXES = [];
+ var ROUND_CONSTANTS = [];
+
+ // Compute Constants
+ (function () {
+ // Compute rho offset constants
+ var x = 1, y = 0;
+ for (var t = 0; t < 24; t++) {
+ RHO_OFFSETS[x + 5 * y] = ((t + 1) * (t + 2) / 2) % 64;
+
+ var newX = y % 5;
+ var newY = (2 * x + 3 * y) % 5;
+ x = newX;
+ y = newY;
+ }
+
+ // Compute pi index constants
+ for (var x = 0; x < 5; x++) {
+ for (var y = 0; y < 5; y++) {
+ PI_INDEXES[x + 5 * y] = y + ((2 * x + 3 * y) % 5) * 5;
+ }
+ }
+
+ // Compute round constants
+ var LFSR = 0x01;
+ for (var i = 0; i < 24; i++) {
+ var roundConstantMsw = 0;
+ var roundConstantLsw = 0;
+
+ for (var j = 0; j < 7; j++) {
+ if (LFSR & 0x01) {
+ var bitPosition = (1 << j) - 1;
+ if (bitPosition < 32) {
+ roundConstantLsw ^= 1 << bitPosition;
+ } else /* if (bitPosition >= 32) */ {
+ roundConstantMsw ^= 1 << (bitPosition - 32);
+ }
+ }
+
+ // Compute next LFSR
+ if (LFSR & 0x80) {
+ // Primitive polynomial over GF(2): x^8 + x^6 + x^5 + x^4 + 1
+ LFSR = (LFSR << 1) ^ 0x71;
+ } else {
+ LFSR <<= 1;
+ }
+ }
+
+ ROUND_CONSTANTS[i] = X64Word.create(roundConstantMsw, roundConstantLsw);
+ }
+ }());
+
+ // Reusable objects for temporary values
+ var T = [];
+ (function () {
+ for (var i = 0; i < 25; i++) {
+ T[i] = X64Word.create();
+ }
+ }());
+
+ /**
+ * SHA-3 hash algorithm.
+ */
+ var SHA3 = C_algo.SHA3 = Hasher.extend({
+ /**
+ * Configuration options.
+ *
+ * @property {number} outputLength
+ * The desired number of bits in the output hash.
+ * Only values permitted are: 224, 256, 384, 512.
+ * Default: 512
+ */
+ cfg: Hasher.cfg.extend({
+ outputLength: 512
+ }),
+
+ _doReset: function () {
+ var state = this._state = []
+ for (var i = 0; i < 25; i++) {
+ state[i] = new X64Word.init();
+ }
+
+ this.blockSize = (1600 - 2 * this.cfg.outputLength) / 32;
+ },
+
+ _doProcessBlock: function (M, offset) {
+ // Shortcuts
+ var state = this._state;
+ var nBlockSizeLanes = this.blockSize / 2;
+
+ // Absorb
+ for (var i = 0; i < nBlockSizeLanes; i++) {
+ // Shortcuts
+ var M2i = M[offset + 2 * i];
+ var M2i1 = M[offset + 2 * i + 1];
+
+ // Swap endian
+ M2i = (
+ (((M2i << 8) | (M2i >>> 24)) & 0x00ff00ff) |
+ (((M2i << 24) | (M2i >>> 8)) & 0xff00ff00)
+ );
+ M2i1 = (
+ (((M2i1 << 8) | (M2i1 >>> 24)) & 0x00ff00ff) |
+ (((M2i1 << 24) | (M2i1 >>> 8)) & 0xff00ff00)
+ );
+
+ // Absorb message into state
+ var lane = state[i];
+ lane.high ^= M2i1;
+ lane.low ^= M2i;
+ }
+
+ // Rounds
+ for (var round = 0; round < 24; round++) {
+ // Theta
+ for (var x = 0; x < 5; x++) {
+ // Mix column lanes
+ var tMsw = 0, tLsw = 0;
+ for (var y = 0; y < 5; y++) {
+ var lane = state[x + 5 * y];
+ tMsw ^= lane.high;
+ tLsw ^= lane.low;
+ }
+
+ // Temporary values
+ var Tx = T[x];
+ Tx.high = tMsw;
+ Tx.low = tLsw;
+ }
+ for (var x = 0; x < 5; x++) {
+ // Shortcuts
+ var Tx4 = T[(x + 4) % 5];
+ var Tx1 = T[(x + 1) % 5];
+ var Tx1Msw = Tx1.high;
+ var Tx1Lsw = Tx1.low;
+
+ // Mix surrounding columns
+ var tMsw = Tx4.high ^ ((Tx1Msw << 1) | (Tx1Lsw >>> 31));
+ var tLsw = Tx4.low ^ ((Tx1Lsw << 1) | (Tx1Msw >>> 31));
+ for (var y = 0; y < 5; y++) {
+ var lane = state[x + 5 * y];
+ lane.high ^= tMsw;
+ lane.low ^= tLsw;
+ }
+ }
+
+ // Rho Pi
+ for (var laneIndex = 1; laneIndex < 25; laneIndex++) {
+ var tMsw;
+ var tLsw;
+
+ // Shortcuts
+ var lane = state[laneIndex];
+ var laneMsw = lane.high;
+ var laneLsw = lane.low;
+ var rhoOffset = RHO_OFFSETS[laneIndex];
+
+ // Rotate lanes
+ if (rhoOffset < 32) {
+ tMsw = (laneMsw << rhoOffset) | (laneLsw >>> (32 - rhoOffset));
+ tLsw = (laneLsw << rhoOffset) | (laneMsw >>> (32 - rhoOffset));
+ } else /* if (rhoOffset >= 32) */ {
+ tMsw = (laneLsw << (rhoOffset - 32)) | (laneMsw >>> (64 - rhoOffset));
+ tLsw = (laneMsw << (rhoOffset - 32)) | (laneLsw >>> (64 - rhoOffset));
+ }
+
+ // Transpose lanes
+ var TPiLane = T[PI_INDEXES[laneIndex]];
+ TPiLane.high = tMsw;
+ TPiLane.low = tLsw;
+ }
+
+ // Rho pi at x = y = 0
+ var T0 = T[0];
+ var state0 = state[0];
+ T0.high = state0.high;
+ T0.low = state0.low;
+
+ // Chi
+ for (var x = 0; x < 5; x++) {
+ for (var y = 0; y < 5; y++) {
+ // Shortcuts
+ var laneIndex = x + 5 * y;
+ var lane = state[laneIndex];
+ var TLane = T[laneIndex];
+ var Tx1Lane = T[((x + 1) % 5) + 5 * y];
+ var Tx2Lane = T[((x + 2) % 5) + 5 * y];
+
+ // Mix rows
+ lane.high = TLane.high ^ (~Tx1Lane.high & Tx2Lane.high);
+ lane.low = TLane.low ^ (~Tx1Lane.low & Tx2Lane.low);
+ }
+ }
+
+ // Iota
+ var lane = state[0];
+ var roundConstant = ROUND_CONSTANTS[round];
+ lane.high ^= roundConstant.high;
+ lane.low ^= roundConstant.low;
+ }
+ },
+
+ _doFinalize: function () {
+ // Shortcuts
+ var data = this._data;
+ var dataWords = data.words;
+ var nBitsTotal = this._nDataBytes * 8;
+ var nBitsLeft = data.sigBytes * 8;
+ var blockSizeBits = this.blockSize * 32;
+
+ // Add padding
+ dataWords[nBitsLeft >>> 5] |= 0x1 << (24 - nBitsLeft % 32);
+ dataWords[((Math.ceil((nBitsLeft + 1) / blockSizeBits) * blockSizeBits) >>> 5) - 1] |= 0x80;
+ data.sigBytes = dataWords.length * 4;
+
+ // Hash final blocks
+ this._process();
+
+ // Shortcuts
+ var state = this._state;
+ var outputLengthBytes = this.cfg.outputLength / 8;
+ var outputLengthLanes = outputLengthBytes / 8;
+
+ // Squeeze
+ var hashWords = [];
+ for (var i = 0; i < outputLengthLanes; i++) {
+ // Shortcuts
+ var lane = state[i];
+ var laneMsw = lane.high;
+ var laneLsw = lane.low;
+
+ // Swap endian
+ laneMsw = (
+ (((laneMsw << 8) | (laneMsw >>> 24)) & 0x00ff00ff) |
+ (((laneMsw << 24) | (laneMsw >>> 8)) & 0xff00ff00)
+ );
+ laneLsw = (
+ (((laneLsw << 8) | (laneLsw >>> 24)) & 0x00ff00ff) |
+ (((laneLsw << 24) | (laneLsw >>> 8)) & 0xff00ff00)
+ );
+
+ // Squeeze state to retrieve hash
+ hashWords.push(laneLsw);
+ hashWords.push(laneMsw);
+ }
+
+ // Return final computed hash
+ return new WordArray.init(hashWords, outputLengthBytes);
+ },
+
+ clone: function () {
+ var clone = Hasher.clone.call(this);
+
+ var state = clone._state = this._state.slice(0);
+ for (var i = 0; i < 25; i++) {
+ state[i] = state[i].clone();
+ }
+
+ return clone;
+ }
+ });
+
+ /**
+ * Shortcut function to the hasher's object interface.
+ *
+ * @param {WordArray|string} message The message to hash.
+ *
+ * @return {WordArray} The hash.
+ *
+ * @static
+ *
+ * @example
+ *
+ * var hash = CryptoJS.SHA3('message');
+ * var hash = CryptoJS.SHA3(wordArray);
+ */
+ C.SHA3 = Hasher._createHelper(SHA3);
+
+ /**
+ * Shortcut function to the HMAC's object interface.
+ *
+ * @param {WordArray|string} message The message to hash.
+ * @param {WordArray|string} key The secret key.
+ *
+ * @return {WordArray} The HMAC.
+ *
+ * @static
+ *
+ * @example
+ *
+ * var hmac = CryptoJS.HmacSHA3(message, key);
+ */
+ C.HmacSHA3 = Hasher._createHmacHelper(SHA3);
+ }(Math));
+
+
+ return CryptoJS.SHA3;
+
+}));
\ No newline at end of file
diff --git a/management/guns-admin/src/main/webapp/static/crypto-js/sha384.js b/management/guns-admin/src/main/webapp/static/crypto-js/sha384.js
new file mode 100644
index 0000000..a0b95bf
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/static/crypto-js/sha384.js
@@ -0,0 +1,83 @@
+;(function (root, factory, undef) {
+ if (typeof exports === "object") {
+ // CommonJS
+ module.exports = exports = factory(require("./core"), require("./x64-core"), require("./sha512"));
+ }
+ else if (typeof define === "function" && define.amd) {
+ // AMD
+ define(["./core", "./x64-core", "./sha512"], factory);
+ }
+ else {
+ // Global (browser)
+ factory(root.CryptoJS);
+ }
+}(this, function (CryptoJS) {
+
+ (function () {
+ // Shortcuts
+ var C = CryptoJS;
+ var C_x64 = C.x64;
+ var X64Word = C_x64.Word;
+ var X64WordArray = C_x64.WordArray;
+ var C_algo = C.algo;
+ var SHA512 = C_algo.SHA512;
+
+ /**
+ * SHA-384 hash algorithm.
+ */
+ var SHA384 = C_algo.SHA384 = SHA512.extend({
+ _doReset: function () {
+ this._hash = new X64WordArray.init([
+ new X64Word.init(0xcbbb9d5d, 0xc1059ed8), new X64Word.init(0x629a292a, 0x367cd507),
+ new X64Word.init(0x9159015a, 0x3070dd17), new X64Word.init(0x152fecd8, 0xf70e5939),
+ new X64Word.init(0x67332667, 0xffc00b31), new X64Word.init(0x8eb44a87, 0x68581511),
+ new X64Word.init(0xdb0c2e0d, 0x64f98fa7), new X64Word.init(0x47b5481d, 0xbefa4fa4)
+ ]);
+ },
+
+ _doFinalize: function () {
+ var hash = SHA512._doFinalize.call(this);
+
+ hash.sigBytes -= 16;
+
+ return hash;
+ }
+ });
+
+ /**
+ * Shortcut function to the hasher's object interface.
+ *
+ * @param {WordArray|string} message The message to hash.
+ *
+ * @return {WordArray} The hash.
+ *
+ * @static
+ *
+ * @example
+ *
+ * var hash = CryptoJS.SHA384('message');
+ * var hash = CryptoJS.SHA384(wordArray);
+ */
+ C.SHA384 = SHA512._createHelper(SHA384);
+
+ /**
+ * Shortcut function to the HMAC's object interface.
+ *
+ * @param {WordArray|string} message The message to hash.
+ * @param {WordArray|string} key The secret key.
+ *
+ * @return {WordArray} The HMAC.
+ *
+ * @static
+ *
+ * @example
+ *
+ * var hmac = CryptoJS.HmacSHA384(message, key);
+ */
+ C.HmacSHA384 = SHA512._createHmacHelper(SHA384);
+ }());
+
+
+ return CryptoJS.SHA384;
+
+}));
\ No newline at end of file
diff --git a/management/guns-admin/src/main/webapp/static/crypto-js/sha512.js b/management/guns-admin/src/main/webapp/static/crypto-js/sha512.js
new file mode 100644
index 0000000..d274ab0
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/static/crypto-js/sha512.js
@@ -0,0 +1,326 @@
+;(function (root, factory, undef) {
+ if (typeof exports === "object") {
+ // CommonJS
+ module.exports = exports = factory(require("./core"), require("./x64-core"));
+ }
+ else if (typeof define === "function" && define.amd) {
+ // AMD
+ define(["./core", "./x64-core"], factory);
+ }
+ else {
+ // Global (browser)
+ factory(root.CryptoJS);
+ }
+}(this, function (CryptoJS) {
+
+ (function () {
+ // Shortcuts
+ var C = CryptoJS;
+ var C_lib = C.lib;
+ var Hasher = C_lib.Hasher;
+ var C_x64 = C.x64;
+ var X64Word = C_x64.Word;
+ var X64WordArray = C_x64.WordArray;
+ var C_algo = C.algo;
+
+ function X64Word_create() {
+ return X64Word.create.apply(X64Word, arguments);
+ }
+
+ // Constants
+ var K = [
+ X64Word_create(0x428a2f98, 0xd728ae22), X64Word_create(0x71374491, 0x23ef65cd),
+ X64Word_create(0xb5c0fbcf, 0xec4d3b2f), X64Word_create(0xe9b5dba5, 0x8189dbbc),
+ X64Word_create(0x3956c25b, 0xf348b538), X64Word_create(0x59f111f1, 0xb605d019),
+ X64Word_create(0x923f82a4, 0xaf194f9b), X64Word_create(0xab1c5ed5, 0xda6d8118),
+ X64Word_create(0xd807aa98, 0xa3030242), X64Word_create(0x12835b01, 0x45706fbe),
+ X64Word_create(0x243185be, 0x4ee4b28c), X64Word_create(0x550c7dc3, 0xd5ffb4e2),
+ X64Word_create(0x72be5d74, 0xf27b896f), X64Word_create(0x80deb1fe, 0x3b1696b1),
+ X64Word_create(0x9bdc06a7, 0x25c71235), X64Word_create(0xc19bf174, 0xcf692694),
+ X64Word_create(0xe49b69c1, 0x9ef14ad2), X64Word_create(0xefbe4786, 0x384f25e3),
+ X64Word_create(0x0fc19dc6, 0x8b8cd5b5), X64Word_create(0x240ca1cc, 0x77ac9c65),
+ X64Word_create(0x2de92c6f, 0x592b0275), X64Word_create(0x4a7484aa, 0x6ea6e483),
+ X64Word_create(0x5cb0a9dc, 0xbd41fbd4), X64Word_create(0x76f988da, 0x831153b5),
+ X64Word_create(0x983e5152, 0xee66dfab), X64Word_create(0xa831c66d, 0x2db43210),
+ X64Word_create(0xb00327c8, 0x98fb213f), X64Word_create(0xbf597fc7, 0xbeef0ee4),
+ X64Word_create(0xc6e00bf3, 0x3da88fc2), X64Word_create(0xd5a79147, 0x930aa725),
+ X64Word_create(0x06ca6351, 0xe003826f), X64Word_create(0x14292967, 0x0a0e6e70),
+ X64Word_create(0x27b70a85, 0x46d22ffc), X64Word_create(0x2e1b2138, 0x5c26c926),
+ X64Word_create(0x4d2c6dfc, 0x5ac42aed), X64Word_create(0x53380d13, 0x9d95b3df),
+ X64Word_create(0x650a7354, 0x8baf63de), X64Word_create(0x766a0abb, 0x3c77b2a8),
+ X64Word_create(0x81c2c92e, 0x47edaee6), X64Word_create(0x92722c85, 0x1482353b),
+ X64Word_create(0xa2bfe8a1, 0x4cf10364), X64Word_create(0xa81a664b, 0xbc423001),
+ X64Word_create(0xc24b8b70, 0xd0f89791), X64Word_create(0xc76c51a3, 0x0654be30),
+ X64Word_create(0xd192e819, 0xd6ef5218), X64Word_create(0xd6990624, 0x5565a910),
+ X64Word_create(0xf40e3585, 0x5771202a), X64Word_create(0x106aa070, 0x32bbd1b8),
+ X64Word_create(0x19a4c116, 0xb8d2d0c8), X64Word_create(0x1e376c08, 0x5141ab53),
+ X64Word_create(0x2748774c, 0xdf8eeb99), X64Word_create(0x34b0bcb5, 0xe19b48a8),
+ X64Word_create(0x391c0cb3, 0xc5c95a63), X64Word_create(0x4ed8aa4a, 0xe3418acb),
+ X64Word_create(0x5b9cca4f, 0x7763e373), X64Word_create(0x682e6ff3, 0xd6b2b8a3),
+ X64Word_create(0x748f82ee, 0x5defb2fc), X64Word_create(0x78a5636f, 0x43172f60),
+ X64Word_create(0x84c87814, 0xa1f0ab72), X64Word_create(0x8cc70208, 0x1a6439ec),
+ X64Word_create(0x90befffa, 0x23631e28), X64Word_create(0xa4506ceb, 0xde82bde9),
+ X64Word_create(0xbef9a3f7, 0xb2c67915), X64Word_create(0xc67178f2, 0xe372532b),
+ X64Word_create(0xca273ece, 0xea26619c), X64Word_create(0xd186b8c7, 0x21c0c207),
+ X64Word_create(0xeada7dd6, 0xcde0eb1e), X64Word_create(0xf57d4f7f, 0xee6ed178),
+ X64Word_create(0x06f067aa, 0x72176fba), X64Word_create(0x0a637dc5, 0xa2c898a6),
+ X64Word_create(0x113f9804, 0xbef90dae), X64Word_create(0x1b710b35, 0x131c471b),
+ X64Word_create(0x28db77f5, 0x23047d84), X64Word_create(0x32caab7b, 0x40c72493),
+ X64Word_create(0x3c9ebe0a, 0x15c9bebc), X64Word_create(0x431d67c4, 0x9c100d4c),
+ X64Word_create(0x4cc5d4be, 0xcb3e42b6), X64Word_create(0x597f299c, 0xfc657e2a),
+ X64Word_create(0x5fcb6fab, 0x3ad6faec), X64Word_create(0x6c44198c, 0x4a475817)
+ ];
+
+ // Reusable objects
+ var W = [];
+ (function () {
+ for (var i = 0; i < 80; i++) {
+ W[i] = X64Word_create();
+ }
+ }());
+
+ /**
+ * SHA-512 hash algorithm.
+ */
+ var SHA512 = C_algo.SHA512 = Hasher.extend({
+ _doReset: function () {
+ this._hash = new X64WordArray.init([
+ new X64Word.init(0x6a09e667, 0xf3bcc908), new X64Word.init(0xbb67ae85, 0x84caa73b),
+ new X64Word.init(0x3c6ef372, 0xfe94f82b), new X64Word.init(0xa54ff53a, 0x5f1d36f1),
+ new X64Word.init(0x510e527f, 0xade682d1), new X64Word.init(0x9b05688c, 0x2b3e6c1f),
+ new X64Word.init(0x1f83d9ab, 0xfb41bd6b), new X64Word.init(0x5be0cd19, 0x137e2179)
+ ]);
+ },
+
+ _doProcessBlock: function (M, offset) {
+ // Shortcuts
+ var H = this._hash.words;
+
+ var H0 = H[0];
+ var H1 = H[1];
+ var H2 = H[2];
+ var H3 = H[3];
+ var H4 = H[4];
+ var H5 = H[5];
+ var H6 = H[6];
+ var H7 = H[7];
+
+ var H0h = H0.high;
+ var H0l = H0.low;
+ var H1h = H1.high;
+ var H1l = H1.low;
+ var H2h = H2.high;
+ var H2l = H2.low;
+ var H3h = H3.high;
+ var H3l = H3.low;
+ var H4h = H4.high;
+ var H4l = H4.low;
+ var H5h = H5.high;
+ var H5l = H5.low;
+ var H6h = H6.high;
+ var H6l = H6.low;
+ var H7h = H7.high;
+ var H7l = H7.low;
+
+ // Working variables
+ var ah = H0h;
+ var al = H0l;
+ var bh = H1h;
+ var bl = H1l;
+ var ch = H2h;
+ var cl = H2l;
+ var dh = H3h;
+ var dl = H3l;
+ var eh = H4h;
+ var el = H4l;
+ var fh = H5h;
+ var fl = H5l;
+ var gh = H6h;
+ var gl = H6l;
+ var hh = H7h;
+ var hl = H7l;
+
+ // Rounds
+ for (var i = 0; i < 80; i++) {
+ var Wil;
+ var Wih;
+
+ // Shortcut
+ var Wi = W[i];
+
+ // Extend message
+ if (i < 16) {
+ Wih = Wi.high = M[offset + i * 2] | 0;
+ Wil = Wi.low = M[offset + i * 2 + 1] | 0;
+ } else {
+ // Gamma0
+ var gamma0x = W[i - 15];
+ var gamma0xh = gamma0x.high;
+ var gamma0xl = gamma0x.low;
+ var gamma0h = ((gamma0xh >>> 1) | (gamma0xl << 31)) ^ ((gamma0xh >>> 8) | (gamma0xl << 24)) ^ (gamma0xh >>> 7);
+ var gamma0l = ((gamma0xl >>> 1) | (gamma0xh << 31)) ^ ((gamma0xl >>> 8) | (gamma0xh << 24)) ^ ((gamma0xl >>> 7) | (gamma0xh << 25));
+
+ // Gamma1
+ var gamma1x = W[i - 2];
+ var gamma1xh = gamma1x.high;
+ var gamma1xl = gamma1x.low;
+ var gamma1h = ((gamma1xh >>> 19) | (gamma1xl << 13)) ^ ((gamma1xh << 3) | (gamma1xl >>> 29)) ^ (gamma1xh >>> 6);
+ var gamma1l = ((gamma1xl >>> 19) | (gamma1xh << 13)) ^ ((gamma1xl << 3) | (gamma1xh >>> 29)) ^ ((gamma1xl >>> 6) | (gamma1xh << 26));
+
+ // W[i] = gamma0 + W[i - 7] + gamma1 + W[i - 16]
+ var Wi7 = W[i - 7];
+ var Wi7h = Wi7.high;
+ var Wi7l = Wi7.low;
+
+ var Wi16 = W[i - 16];
+ var Wi16h = Wi16.high;
+ var Wi16l = Wi16.low;
+
+ Wil = gamma0l + Wi7l;
+ Wih = gamma0h + Wi7h + ((Wil >>> 0) < (gamma0l >>> 0) ? 1 : 0);
+ Wil = Wil + gamma1l;
+ Wih = Wih + gamma1h + ((Wil >>> 0) < (gamma1l >>> 0) ? 1 : 0);
+ Wil = Wil + Wi16l;
+ Wih = Wih + Wi16h + ((Wil >>> 0) < (Wi16l >>> 0) ? 1 : 0);
+
+ Wi.high = Wih;
+ Wi.low = Wil;
+ }
+
+ var chh = (eh & fh) ^ (~eh & gh);
+ var chl = (el & fl) ^ (~el & gl);
+ var majh = (ah & bh) ^ (ah & ch) ^ (bh & ch);
+ var majl = (al & bl) ^ (al & cl) ^ (bl & cl);
+
+ var sigma0h = ((ah >>> 28) | (al << 4)) ^ ((ah << 30) | (al >>> 2)) ^ ((ah << 25) | (al >>> 7));
+ var sigma0l = ((al >>> 28) | (ah << 4)) ^ ((al << 30) | (ah >>> 2)) ^ ((al << 25) | (ah >>> 7));
+ var sigma1h = ((eh >>> 14) | (el << 18)) ^ ((eh >>> 18) | (el << 14)) ^ ((eh << 23) | (el >>> 9));
+ var sigma1l = ((el >>> 14) | (eh << 18)) ^ ((el >>> 18) | (eh << 14)) ^ ((el << 23) | (eh >>> 9));
+
+ // t1 = h + sigma1 + ch + K[i] + W[i]
+ var Ki = K[i];
+ var Kih = Ki.high;
+ var Kil = Ki.low;
+
+ var t1l = hl + sigma1l;
+ var t1h = hh + sigma1h + ((t1l >>> 0) < (hl >>> 0) ? 1 : 0);
+ var t1l = t1l + chl;
+ var t1h = t1h + chh + ((t1l >>> 0) < (chl >>> 0) ? 1 : 0);
+ var t1l = t1l + Kil;
+ var t1h = t1h + Kih + ((t1l >>> 0) < (Kil >>> 0) ? 1 : 0);
+ var t1l = t1l + Wil;
+ var t1h = t1h + Wih + ((t1l >>> 0) < (Wil >>> 0) ? 1 : 0);
+
+ // t2 = sigma0 + maj
+ var t2l = sigma0l + majl;
+ var t2h = sigma0h + majh + ((t2l >>> 0) < (sigma0l >>> 0) ? 1 : 0);
+
+ // Update working variables
+ hh = gh;
+ hl = gl;
+ gh = fh;
+ gl = fl;
+ fh = eh;
+ fl = el;
+ el = (dl + t1l) | 0;
+ eh = (dh + t1h + ((el >>> 0) < (dl >>> 0) ? 1 : 0)) | 0;
+ dh = ch;
+ dl = cl;
+ ch = bh;
+ cl = bl;
+ bh = ah;
+ bl = al;
+ al = (t1l + t2l) | 0;
+ ah = (t1h + t2h + ((al >>> 0) < (t1l >>> 0) ? 1 : 0)) | 0;
+ }
+
+ // Intermediate hash value
+ H0l = H0.low = (H0l + al);
+ H0.high = (H0h + ah + ((H0l >>> 0) < (al >>> 0) ? 1 : 0));
+ H1l = H1.low = (H1l + bl);
+ H1.high = (H1h + bh + ((H1l >>> 0) < (bl >>> 0) ? 1 : 0));
+ H2l = H2.low = (H2l + cl);
+ H2.high = (H2h + ch + ((H2l >>> 0) < (cl >>> 0) ? 1 : 0));
+ H3l = H3.low = (H3l + dl);
+ H3.high = (H3h + dh + ((H3l >>> 0) < (dl >>> 0) ? 1 : 0));
+ H4l = H4.low = (H4l + el);
+ H4.high = (H4h + eh + ((H4l >>> 0) < (el >>> 0) ? 1 : 0));
+ H5l = H5.low = (H5l + fl);
+ H5.high = (H5h + fh + ((H5l >>> 0) < (fl >>> 0) ? 1 : 0));
+ H6l = H6.low = (H6l + gl);
+ H6.high = (H6h + gh + ((H6l >>> 0) < (gl >>> 0) ? 1 : 0));
+ H7l = H7.low = (H7l + hl);
+ H7.high = (H7h + hh + ((H7l >>> 0) < (hl >>> 0) ? 1 : 0));
+ },
+
+ _doFinalize: function () {
+ // Shortcuts
+ var data = this._data;
+ var dataWords = data.words;
+
+ var nBitsTotal = this._nDataBytes * 8;
+ var nBitsLeft = data.sigBytes * 8;
+
+ // Add padding
+ dataWords[nBitsLeft >>> 5] |= 0x80 << (24 - nBitsLeft % 32);
+ dataWords[(((nBitsLeft + 128) >>> 10) << 5) + 30] = Math.floor(nBitsTotal / 0x100000000);
+ dataWords[(((nBitsLeft + 128) >>> 10) << 5) + 31] = nBitsTotal;
+ data.sigBytes = dataWords.length * 4;
+
+ // Hash final blocks
+ this._process();
+
+ // Convert hash to 32-bit word array before returning
+ var hash = this._hash.toX32();
+
+ // Return final computed hash
+ return hash;
+ },
+
+ clone: function () {
+ var clone = Hasher.clone.call(this);
+ clone._hash = this._hash.clone();
+
+ return clone;
+ },
+
+ blockSize: 1024/32
+ });
+
+ /**
+ * Shortcut function to the hasher's object interface.
+ *
+ * @param {WordArray|string} message The message to hash.
+ *
+ * @return {WordArray} The hash.
+ *
+ * @static
+ *
+ * @example
+ *
+ * var hash = CryptoJS.SHA512('message');
+ * var hash = CryptoJS.SHA512(wordArray);
+ */
+ C.SHA512 = Hasher._createHelper(SHA512);
+
+ /**
+ * Shortcut function to the HMAC's object interface.
+ *
+ * @param {WordArray|string} message The message to hash.
+ * @param {WordArray|string} key The secret key.
+ *
+ * @return {WordArray} The HMAC.
+ *
+ * @static
+ *
+ * @example
+ *
+ * var hmac = CryptoJS.HmacSHA512(message, key);
+ */
+ C.HmacSHA512 = Hasher._createHmacHelper(SHA512);
+ }());
+
+
+ return CryptoJS.SHA512;
+
+}));
\ No newline at end of file
diff --git a/management/guns-admin/src/main/webapp/static/crypto-js/tripledes.js b/management/guns-admin/src/main/webapp/static/crypto-js/tripledes.js
new file mode 100644
index 0000000..1a92477
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/static/crypto-js/tripledes.js
@@ -0,0 +1,779 @@
+;(function (root, factory, undef) {
+ if (typeof exports === "object") {
+ // CommonJS
+ module.exports = exports = factory(require("./core"), require("./enc-base64"), require("./md5"), require("./evpkdf"), require("./cipher-core"));
+ }
+ else if (typeof define === "function" && define.amd) {
+ // AMD
+ define(["./core", "./enc-base64", "./md5", "./evpkdf", "./cipher-core"], factory);
+ }
+ else {
+ // Global (browser)
+ factory(root.CryptoJS);
+ }
+}(this, function (CryptoJS) {
+
+ (function () {
+ // Shortcuts
+ var C = CryptoJS;
+ var C_lib = C.lib;
+ var WordArray = C_lib.WordArray;
+ var BlockCipher = C_lib.BlockCipher;
+ var C_algo = C.algo;
+
+ // Permuted Choice 1 constants
+ var PC1 = [
+ 57, 49, 41, 33, 25, 17, 9, 1,
+ 58, 50, 42, 34, 26, 18, 10, 2,
+ 59, 51, 43, 35, 27, 19, 11, 3,
+ 60, 52, 44, 36, 63, 55, 47, 39,
+ 31, 23, 15, 7, 62, 54, 46, 38,
+ 30, 22, 14, 6, 61, 53, 45, 37,
+ 29, 21, 13, 5, 28, 20, 12, 4
+ ];
+
+ // Permuted Choice 2 constants
+ var PC2 = [
+ 14, 17, 11, 24, 1, 5,
+ 3, 28, 15, 6, 21, 10,
+ 23, 19, 12, 4, 26, 8,
+ 16, 7, 27, 20, 13, 2,
+ 41, 52, 31, 37, 47, 55,
+ 30, 40, 51, 45, 33, 48,
+ 44, 49, 39, 56, 34, 53,
+ 46, 42, 50, 36, 29, 32
+ ];
+
+ // Cumulative bit shift constants
+ var BIT_SHIFTS = [1, 2, 4, 6, 8, 10, 12, 14, 15, 17, 19, 21, 23, 25, 27, 28];
+
+ // SBOXes and round permutation constants
+ var SBOX_P = [
+ {
+ 0x0: 0x808200,
+ 0x10000000: 0x8000,
+ 0x20000000: 0x808002,
+ 0x30000000: 0x2,
+ 0x40000000: 0x200,
+ 0x50000000: 0x808202,
+ 0x60000000: 0x800202,
+ 0x70000000: 0x800000,
+ 0x80000000: 0x202,
+ 0x90000000: 0x800200,
+ 0xa0000000: 0x8200,
+ 0xb0000000: 0x808000,
+ 0xc0000000: 0x8002,
+ 0xd0000000: 0x800002,
+ 0xe0000000: 0x0,
+ 0xf0000000: 0x8202,
+ 0x8000000: 0x0,
+ 0x18000000: 0x808202,
+ 0x28000000: 0x8202,
+ 0x38000000: 0x8000,
+ 0x48000000: 0x808200,
+ 0x58000000: 0x200,
+ 0x68000000: 0x808002,
+ 0x78000000: 0x2,
+ 0x88000000: 0x800200,
+ 0x98000000: 0x8200,
+ 0xa8000000: 0x808000,
+ 0xb8000000: 0x800202,
+ 0xc8000000: 0x800002,
+ 0xd8000000: 0x8002,
+ 0xe8000000: 0x202,
+ 0xf8000000: 0x800000,
+ 0x1: 0x8000,
+ 0x10000001: 0x2,
+ 0x20000001: 0x808200,
+ 0x30000001: 0x800000,
+ 0x40000001: 0x808002,
+ 0x50000001: 0x8200,
+ 0x60000001: 0x200,
+ 0x70000001: 0x800202,
+ 0x80000001: 0x808202,
+ 0x90000001: 0x808000,
+ 0xa0000001: 0x800002,
+ 0xb0000001: 0x8202,
+ 0xc0000001: 0x202,
+ 0xd0000001: 0x800200,
+ 0xe0000001: 0x8002,
+ 0xf0000001: 0x0,
+ 0x8000001: 0x808202,
+ 0x18000001: 0x808000,
+ 0x28000001: 0x800000,
+ 0x38000001: 0x200,
+ 0x48000001: 0x8000,
+ 0x58000001: 0x800002,
+ 0x68000001: 0x2,
+ 0x78000001: 0x8202,
+ 0x88000001: 0x8002,
+ 0x98000001: 0x800202,
+ 0xa8000001: 0x202,
+ 0xb8000001: 0x808200,
+ 0xc8000001: 0x800200,
+ 0xd8000001: 0x0,
+ 0xe8000001: 0x8200,
+ 0xf8000001: 0x808002
+ },
+ {
+ 0x0: 0x40084010,
+ 0x1000000: 0x4000,
+ 0x2000000: 0x80000,
+ 0x3000000: 0x40080010,
+ 0x4000000: 0x40000010,
+ 0x5000000: 0x40084000,
+ 0x6000000: 0x40004000,
+ 0x7000000: 0x10,
+ 0x8000000: 0x84000,
+ 0x9000000: 0x40004010,
+ 0xa000000: 0x40000000,
+ 0xb000000: 0x84010,
+ 0xc000000: 0x80010,
+ 0xd000000: 0x0,
+ 0xe000000: 0x4010,
+ 0xf000000: 0x40080000,
+ 0x800000: 0x40004000,
+ 0x1800000: 0x84010,
+ 0x2800000: 0x10,
+ 0x3800000: 0x40004010,
+ 0x4800000: 0x40084010,
+ 0x5800000: 0x40000000,
+ 0x6800000: 0x80000,
+ 0x7800000: 0x40080010,
+ 0x8800000: 0x80010,
+ 0x9800000: 0x0,
+ 0xa800000: 0x4000,
+ 0xb800000: 0x40080000,
+ 0xc800000: 0x40000010,
+ 0xd800000: 0x84000,
+ 0xe800000: 0x40084000,
+ 0xf800000: 0x4010,
+ 0x10000000: 0x0,
+ 0x11000000: 0x40080010,
+ 0x12000000: 0x40004010,
+ 0x13000000: 0x40084000,
+ 0x14000000: 0x40080000,
+ 0x15000000: 0x10,
+ 0x16000000: 0x84010,
+ 0x17000000: 0x4000,
+ 0x18000000: 0x4010,
+ 0x19000000: 0x80000,
+ 0x1a000000: 0x80010,
+ 0x1b000000: 0x40000010,
+ 0x1c000000: 0x84000,
+ 0x1d000000: 0x40004000,
+ 0x1e000000: 0x40000000,
+ 0x1f000000: 0x40084010,
+ 0x10800000: 0x84010,
+ 0x11800000: 0x80000,
+ 0x12800000: 0x40080000,
+ 0x13800000: 0x4000,
+ 0x14800000: 0x40004000,
+ 0x15800000: 0x40084010,
+ 0x16800000: 0x10,
+ 0x17800000: 0x40000000,
+ 0x18800000: 0x40084000,
+ 0x19800000: 0x40000010,
+ 0x1a800000: 0x40004010,
+ 0x1b800000: 0x80010,
+ 0x1c800000: 0x0,
+ 0x1d800000: 0x4010,
+ 0x1e800000: 0x40080010,
+ 0x1f800000: 0x84000
+ },
+ {
+ 0x0: 0x104,
+ 0x100000: 0x0,
+ 0x200000: 0x4000100,
+ 0x300000: 0x10104,
+ 0x400000: 0x10004,
+ 0x500000: 0x4000004,
+ 0x600000: 0x4010104,
+ 0x700000: 0x4010000,
+ 0x800000: 0x4000000,
+ 0x900000: 0x4010100,
+ 0xa00000: 0x10100,
+ 0xb00000: 0x4010004,
+ 0xc00000: 0x4000104,
+ 0xd00000: 0x10000,
+ 0xe00000: 0x4,
+ 0xf00000: 0x100,
+ 0x80000: 0x4010100,
+ 0x180000: 0x4010004,
+ 0x280000: 0x0,
+ 0x380000: 0x4000100,
+ 0x480000: 0x4000004,
+ 0x580000: 0x10000,
+ 0x680000: 0x10004,
+ 0x780000: 0x104,
+ 0x880000: 0x4,
+ 0x980000: 0x100,
+ 0xa80000: 0x4010000,
+ 0xb80000: 0x10104,
+ 0xc80000: 0x10100,
+ 0xd80000: 0x4000104,
+ 0xe80000: 0x4010104,
+ 0xf80000: 0x4000000,
+ 0x1000000: 0x4010100,
+ 0x1100000: 0x10004,
+ 0x1200000: 0x10000,
+ 0x1300000: 0x4000100,
+ 0x1400000: 0x100,
+ 0x1500000: 0x4010104,
+ 0x1600000: 0x4000004,
+ 0x1700000: 0x0,
+ 0x1800000: 0x4000104,
+ 0x1900000: 0x4000000,
+ 0x1a00000: 0x4,
+ 0x1b00000: 0x10100,
+ 0x1c00000: 0x4010000,
+ 0x1d00000: 0x104,
+ 0x1e00000: 0x10104,
+ 0x1f00000: 0x4010004,
+ 0x1080000: 0x4000000,
+ 0x1180000: 0x104,
+ 0x1280000: 0x4010100,
+ 0x1380000: 0x0,
+ 0x1480000: 0x10004,
+ 0x1580000: 0x4000100,
+ 0x1680000: 0x100,
+ 0x1780000: 0x4010004,
+ 0x1880000: 0x10000,
+ 0x1980000: 0x4010104,
+ 0x1a80000: 0x10104,
+ 0x1b80000: 0x4000004,
+ 0x1c80000: 0x4000104,
+ 0x1d80000: 0x4010000,
+ 0x1e80000: 0x4,
+ 0x1f80000: 0x10100
+ },
+ {
+ 0x0: 0x80401000,
+ 0x10000: 0x80001040,
+ 0x20000: 0x401040,
+ 0x30000: 0x80400000,
+ 0x40000: 0x0,
+ 0x50000: 0x401000,
+ 0x60000: 0x80000040,
+ 0x70000: 0x400040,
+ 0x80000: 0x80000000,
+ 0x90000: 0x400000,
+ 0xa0000: 0x40,
+ 0xb0000: 0x80001000,
+ 0xc0000: 0x80400040,
+ 0xd0000: 0x1040,
+ 0xe0000: 0x1000,
+ 0xf0000: 0x80401040,
+ 0x8000: 0x80001040,
+ 0x18000: 0x40,
+ 0x28000: 0x80400040,
+ 0x38000: 0x80001000,
+ 0x48000: 0x401000,
+ 0x58000: 0x80401040,
+ 0x68000: 0x0,
+ 0x78000: 0x80400000,
+ 0x88000: 0x1000,
+ 0x98000: 0x80401000,
+ 0xa8000: 0x400000,
+ 0xb8000: 0x1040,
+ 0xc8000: 0x80000000,
+ 0xd8000: 0x400040,
+ 0xe8000: 0x401040,
+ 0xf8000: 0x80000040,
+ 0x100000: 0x400040,
+ 0x110000: 0x401000,
+ 0x120000: 0x80000040,
+ 0x130000: 0x0,
+ 0x140000: 0x1040,
+ 0x150000: 0x80400040,
+ 0x160000: 0x80401000,
+ 0x170000: 0x80001040,
+ 0x180000: 0x80401040,
+ 0x190000: 0x80000000,
+ 0x1a0000: 0x80400000,
+ 0x1b0000: 0x401040,
+ 0x1c0000: 0x80001000,
+ 0x1d0000: 0x400000,
+ 0x1e0000: 0x40,
+ 0x1f0000: 0x1000,
+ 0x108000: 0x80400000,
+ 0x118000: 0x80401040,
+ 0x128000: 0x0,
+ 0x138000: 0x401000,
+ 0x148000: 0x400040,
+ 0x158000: 0x80000000,
+ 0x168000: 0x80001040,
+ 0x178000: 0x40,
+ 0x188000: 0x80000040,
+ 0x198000: 0x1000,
+ 0x1a8000: 0x80001000,
+ 0x1b8000: 0x80400040,
+ 0x1c8000: 0x1040,
+ 0x1d8000: 0x80401000,
+ 0x1e8000: 0x400000,
+ 0x1f8000: 0x401040
+ },
+ {
+ 0x0: 0x80,
+ 0x1000: 0x1040000,
+ 0x2000: 0x40000,
+ 0x3000: 0x20000000,
+ 0x4000: 0x20040080,
+ 0x5000: 0x1000080,
+ 0x6000: 0x21000080,
+ 0x7000: 0x40080,
+ 0x8000: 0x1000000,
+ 0x9000: 0x20040000,
+ 0xa000: 0x20000080,
+ 0xb000: 0x21040080,
+ 0xc000: 0x21040000,
+ 0xd000: 0x0,
+ 0xe000: 0x1040080,
+ 0xf000: 0x21000000,
+ 0x800: 0x1040080,
+ 0x1800: 0x21000080,
+ 0x2800: 0x80,
+ 0x3800: 0x1040000,
+ 0x4800: 0x40000,
+ 0x5800: 0x20040080,
+ 0x6800: 0x21040000,
+ 0x7800: 0x20000000,
+ 0x8800: 0x20040000,
+ 0x9800: 0x0,
+ 0xa800: 0x21040080,
+ 0xb800: 0x1000080,
+ 0xc800: 0x20000080,
+ 0xd800: 0x21000000,
+ 0xe800: 0x1000000,
+ 0xf800: 0x40080,
+ 0x10000: 0x40000,
+ 0x11000: 0x80,
+ 0x12000: 0x20000000,
+ 0x13000: 0x21000080,
+ 0x14000: 0x1000080,
+ 0x15000: 0x21040000,
+ 0x16000: 0x20040080,
+ 0x17000: 0x1000000,
+ 0x18000: 0x21040080,
+ 0x19000: 0x21000000,
+ 0x1a000: 0x1040000,
+ 0x1b000: 0x20040000,
+ 0x1c000: 0x40080,
+ 0x1d000: 0x20000080,
+ 0x1e000: 0x0,
+ 0x1f000: 0x1040080,
+ 0x10800: 0x21000080,
+ 0x11800: 0x1000000,
+ 0x12800: 0x1040000,
+ 0x13800: 0x20040080,
+ 0x14800: 0x20000000,
+ 0x15800: 0x1040080,
+ 0x16800: 0x80,
+ 0x17800: 0x21040000,
+ 0x18800: 0x40080,
+ 0x19800: 0x21040080,
+ 0x1a800: 0x0,
+ 0x1b800: 0x21000000,
+ 0x1c800: 0x1000080,
+ 0x1d800: 0x40000,
+ 0x1e800: 0x20040000,
+ 0x1f800: 0x20000080
+ },
+ {
+ 0x0: 0x10000008,
+ 0x100: 0x2000,
+ 0x200: 0x10200000,
+ 0x300: 0x10202008,
+ 0x400: 0x10002000,
+ 0x500: 0x200000,
+ 0x600: 0x200008,
+ 0x700: 0x10000000,
+ 0x800: 0x0,
+ 0x900: 0x10002008,
+ 0xa00: 0x202000,
+ 0xb00: 0x8,
+ 0xc00: 0x10200008,
+ 0xd00: 0x202008,
+ 0xe00: 0x2008,
+ 0xf00: 0x10202000,
+ 0x80: 0x10200000,
+ 0x180: 0x10202008,
+ 0x280: 0x8,
+ 0x380: 0x200000,
+ 0x480: 0x202008,
+ 0x580: 0x10000008,
+ 0x680: 0x10002000,
+ 0x780: 0x2008,
+ 0x880: 0x200008,
+ 0x980: 0x2000,
+ 0xa80: 0x10002008,
+ 0xb80: 0x10200008,
+ 0xc80: 0x0,
+ 0xd80: 0x10202000,
+ 0xe80: 0x202000,
+ 0xf80: 0x10000000,
+ 0x1000: 0x10002000,
+ 0x1100: 0x10200008,
+ 0x1200: 0x10202008,
+ 0x1300: 0x2008,
+ 0x1400: 0x200000,
+ 0x1500: 0x10000000,
+ 0x1600: 0x10000008,
+ 0x1700: 0x202000,
+ 0x1800: 0x202008,
+ 0x1900: 0x0,
+ 0x1a00: 0x8,
+ 0x1b00: 0x10200000,
+ 0x1c00: 0x2000,
+ 0x1d00: 0x10002008,
+ 0x1e00: 0x10202000,
+ 0x1f00: 0x200008,
+ 0x1080: 0x8,
+ 0x1180: 0x202000,
+ 0x1280: 0x200000,
+ 0x1380: 0x10000008,
+ 0x1480: 0x10002000,
+ 0x1580: 0x2008,
+ 0x1680: 0x10202008,
+ 0x1780: 0x10200000,
+ 0x1880: 0x10202000,
+ 0x1980: 0x10200008,
+ 0x1a80: 0x2000,
+ 0x1b80: 0x202008,
+ 0x1c80: 0x200008,
+ 0x1d80: 0x0,
+ 0x1e80: 0x10000000,
+ 0x1f80: 0x10002008
+ },
+ {
+ 0x0: 0x100000,
+ 0x10: 0x2000401,
+ 0x20: 0x400,
+ 0x30: 0x100401,
+ 0x40: 0x2100401,
+ 0x50: 0x0,
+ 0x60: 0x1,
+ 0x70: 0x2100001,
+ 0x80: 0x2000400,
+ 0x90: 0x100001,
+ 0xa0: 0x2000001,
+ 0xb0: 0x2100400,
+ 0xc0: 0x2100000,
+ 0xd0: 0x401,
+ 0xe0: 0x100400,
+ 0xf0: 0x2000000,
+ 0x8: 0x2100001,
+ 0x18: 0x0,
+ 0x28: 0x2000401,
+ 0x38: 0x2100400,
+ 0x48: 0x100000,
+ 0x58: 0x2000001,
+ 0x68: 0x2000000,
+ 0x78: 0x401,
+ 0x88: 0x100401,
+ 0x98: 0x2000400,
+ 0xa8: 0x2100000,
+ 0xb8: 0x100001,
+ 0xc8: 0x400,
+ 0xd8: 0x2100401,
+ 0xe8: 0x1,
+ 0xf8: 0x100400,
+ 0x100: 0x2000000,
+ 0x110: 0x100000,
+ 0x120: 0x2000401,
+ 0x130: 0x2100001,
+ 0x140: 0x100001,
+ 0x150: 0x2000400,
+ 0x160: 0x2100400,
+ 0x170: 0x100401,
+ 0x180: 0x401,
+ 0x190: 0x2100401,
+ 0x1a0: 0x100400,
+ 0x1b0: 0x1,
+ 0x1c0: 0x0,
+ 0x1d0: 0x2100000,
+ 0x1e0: 0x2000001,
+ 0x1f0: 0x400,
+ 0x108: 0x100400,
+ 0x118: 0x2000401,
+ 0x128: 0x2100001,
+ 0x138: 0x1,
+ 0x148: 0x2000000,
+ 0x158: 0x100000,
+ 0x168: 0x401,
+ 0x178: 0x2100400,
+ 0x188: 0x2000001,
+ 0x198: 0x2100000,
+ 0x1a8: 0x0,
+ 0x1b8: 0x2100401,
+ 0x1c8: 0x100401,
+ 0x1d8: 0x400,
+ 0x1e8: 0x2000400,
+ 0x1f8: 0x100001
+ },
+ {
+ 0x0: 0x8000820,
+ 0x1: 0x20000,
+ 0x2: 0x8000000,
+ 0x3: 0x20,
+ 0x4: 0x20020,
+ 0x5: 0x8020820,
+ 0x6: 0x8020800,
+ 0x7: 0x800,
+ 0x8: 0x8020000,
+ 0x9: 0x8000800,
+ 0xa: 0x20800,
+ 0xb: 0x8020020,
+ 0xc: 0x820,
+ 0xd: 0x0,
+ 0xe: 0x8000020,
+ 0xf: 0x20820,
+ 0x80000000: 0x800,
+ 0x80000001: 0x8020820,
+ 0x80000002: 0x8000820,
+ 0x80000003: 0x8000000,
+ 0x80000004: 0x8020000,
+ 0x80000005: 0x20800,
+ 0x80000006: 0x20820,
+ 0x80000007: 0x20,
+ 0x80000008: 0x8000020,
+ 0x80000009: 0x820,
+ 0x8000000a: 0x20020,
+ 0x8000000b: 0x8020800,
+ 0x8000000c: 0x0,
+ 0x8000000d: 0x8020020,
+ 0x8000000e: 0x8000800,
+ 0x8000000f: 0x20000,
+ 0x10: 0x20820,
+ 0x11: 0x8020800,
+ 0x12: 0x20,
+ 0x13: 0x800,
+ 0x14: 0x8000800,
+ 0x15: 0x8000020,
+ 0x16: 0x8020020,
+ 0x17: 0x20000,
+ 0x18: 0x0,
+ 0x19: 0x20020,
+ 0x1a: 0x8020000,
+ 0x1b: 0x8000820,
+ 0x1c: 0x8020820,
+ 0x1d: 0x20800,
+ 0x1e: 0x820,
+ 0x1f: 0x8000000,
+ 0x80000010: 0x20000,
+ 0x80000011: 0x800,
+ 0x80000012: 0x8020020,
+ 0x80000013: 0x20820,
+ 0x80000014: 0x20,
+ 0x80000015: 0x8020000,
+ 0x80000016: 0x8000000,
+ 0x80000017: 0x8000820,
+ 0x80000018: 0x8020820,
+ 0x80000019: 0x8000020,
+ 0x8000001a: 0x8000800,
+ 0x8000001b: 0x0,
+ 0x8000001c: 0x20800,
+ 0x8000001d: 0x820,
+ 0x8000001e: 0x20020,
+ 0x8000001f: 0x8020800
+ }
+ ];
+
+ // Masks that select the SBOX input
+ var SBOX_MASK = [
+ 0xf8000001, 0x1f800000, 0x01f80000, 0x001f8000,
+ 0x0001f800, 0x00001f80, 0x000001f8, 0x8000001f
+ ];
+
+ /**
+ * DES block cipher algorithm.
+ */
+ var DES = C_algo.DES = BlockCipher.extend({
+ _doReset: function () {
+ // Shortcuts
+ var key = this._key;
+ var keyWords = key.words;
+
+ // Select 56 bits according to PC1
+ var keyBits = [];
+ for (var i = 0; i < 56; i++) {
+ var keyBitPos = PC1[i] - 1;
+ keyBits[i] = (keyWords[keyBitPos >>> 5] >>> (31 - keyBitPos % 32)) & 1;
+ }
+
+ // Assemble 16 subkeys
+ var subKeys = this._subKeys = [];
+ for (var nSubKey = 0; nSubKey < 16; nSubKey++) {
+ // Create subkey
+ var subKey = subKeys[nSubKey] = [];
+
+ // Shortcut
+ var bitShift = BIT_SHIFTS[nSubKey];
+
+ // Select 48 bits according to PC2
+ for (var i = 0; i < 24; i++) {
+ // Select from the left 28 key bits
+ subKey[(i / 6) | 0] |= keyBits[((PC2[i] - 1) + bitShift) % 28] << (31 - i % 6);
+
+ // Select from the right 28 key bits
+ subKey[4 + ((i / 6) | 0)] |= keyBits[28 + (((PC2[i + 24] - 1) + bitShift) % 28)] << (31 - i % 6);
+ }
+
+ // Since each subkey is applied to an expanded 32-bit input,
+ // the subkey can be broken into 8 values scaled to 32-bits,
+ // which allows the key to be used without expansion
+ subKey[0] = (subKey[0] << 1) | (subKey[0] >>> 31);
+ for (var i = 1; i < 7; i++) {
+ subKey[i] = subKey[i] >>> ((i - 1) * 4 + 3);
+ }
+ subKey[7] = (subKey[7] << 5) | (subKey[7] >>> 27);
+ }
+
+ // Compute inverse subkeys
+ var invSubKeys = this._invSubKeys = [];
+ for (var i = 0; i < 16; i++) {
+ invSubKeys[i] = subKeys[15 - i];
+ }
+ },
+
+ encryptBlock: function (M, offset) {
+ this._doCryptBlock(M, offset, this._subKeys);
+ },
+
+ decryptBlock: function (M, offset) {
+ this._doCryptBlock(M, offset, this._invSubKeys);
+ },
+
+ _doCryptBlock: function (M, offset, subKeys) {
+ // Get input
+ this._lBlock = M[offset];
+ this._rBlock = M[offset + 1];
+
+ // Initial permutation
+ exchangeLR.call(this, 4, 0x0f0f0f0f);
+ exchangeLR.call(this, 16, 0x0000ffff);
+ exchangeRL.call(this, 2, 0x33333333);
+ exchangeRL.call(this, 8, 0x00ff00ff);
+ exchangeLR.call(this, 1, 0x55555555);
+
+ // Rounds
+ for (var round = 0; round < 16; round++) {
+ // Shortcuts
+ var subKey = subKeys[round];
+ var lBlock = this._lBlock;
+ var rBlock = this._rBlock;
+
+ // Feistel function
+ var f = 0;
+ for (var i = 0; i < 8; i++) {
+ f |= SBOX_P[i][((rBlock ^ subKey[i]) & SBOX_MASK[i]) >>> 0];
+ }
+ this._lBlock = rBlock;
+ this._rBlock = lBlock ^ f;
+ }
+
+ // Undo swap from last round
+ var t = this._lBlock;
+ this._lBlock = this._rBlock;
+ this._rBlock = t;
+
+ // Final permutation
+ exchangeLR.call(this, 1, 0x55555555);
+ exchangeRL.call(this, 8, 0x00ff00ff);
+ exchangeRL.call(this, 2, 0x33333333);
+ exchangeLR.call(this, 16, 0x0000ffff);
+ exchangeLR.call(this, 4, 0x0f0f0f0f);
+
+ // Set output
+ M[offset] = this._lBlock;
+ M[offset + 1] = this._rBlock;
+ },
+
+ keySize: 64/32,
+
+ ivSize: 64/32,
+
+ blockSize: 64/32
+ });
+
+ // Swap bits across the left and right words
+ function exchangeLR(offset, mask) {
+ var t = ((this._lBlock >>> offset) ^ this._rBlock) & mask;
+ this._rBlock ^= t;
+ this._lBlock ^= t << offset;
+ }
+
+ function exchangeRL(offset, mask) {
+ var t = ((this._rBlock >>> offset) ^ this._lBlock) & mask;
+ this._lBlock ^= t;
+ this._rBlock ^= t << offset;
+ }
+
+ /**
+ * Shortcut functions to the cipher's object interface.
+ *
+ * @example
+ *
+ * var ciphertext = CryptoJS.DES.encrypt(message, key, cfg);
+ * var plaintext = CryptoJS.DES.decrypt(ciphertext, key, cfg);
+ */
+ C.DES = BlockCipher._createHelper(DES);
+
+ /**
+ * Triple-DES block cipher algorithm.
+ */
+ var TripleDES = C_algo.TripleDES = BlockCipher.extend({
+ _doReset: function () {
+ // Shortcuts
+ var key = this._key;
+ var keyWords = key.words;
+ // Make sure the key length is valid (64, 128 or >= 192 bit)
+ if (keyWords.length !== 2 && keyWords.length !== 4 && keyWords.length < 6) {
+ throw new Error('Invalid key length - 3DES requires the key length to be 64, 128, 192 or >192.');
+ }
+
+ // Extend the key according to the keying options defined in 3DES standard
+ var key1 = keyWords.slice(0, 2);
+ var key2 = keyWords.length < 4 ? keyWords.slice(0, 2) : keyWords.slice(2, 4);
+ var key3 = keyWords.length < 6 ? keyWords.slice(0, 2) : keyWords.slice(4, 6);
+
+ // Create DES instances
+ this._des1 = DES.createEncryptor(WordArray.create(key1));
+ this._des2 = DES.createEncryptor(WordArray.create(key2));
+ this._des3 = DES.createEncryptor(WordArray.create(key3));
+ },
+
+ encryptBlock: function (M, offset) {
+ this._des1.encryptBlock(M, offset);
+ this._des2.decryptBlock(M, offset);
+ this._des3.encryptBlock(M, offset);
+ },
+
+ decryptBlock: function (M, offset) {
+ this._des3.decryptBlock(M, offset);
+ this._des2.encryptBlock(M, offset);
+ this._des1.decryptBlock(M, offset);
+ },
+
+ keySize: 192/32,
+
+ ivSize: 64/32,
+
+ blockSize: 64/32
+ });
+
+ /**
+ * Shortcut functions to the cipher's object interface.
+ *
+ * @example
+ *
+ * var ciphertext = CryptoJS.TripleDES.encrypt(message, key, cfg);
+ * var plaintext = CryptoJS.TripleDES.decrypt(ciphertext, key, cfg);
+ */
+ C.TripleDES = BlockCipher._createHelper(TripleDES);
+ }());
+
+
+ return CryptoJS.TripleDES;
+
+}));
\ No newline at end of file
diff --git a/management/guns-admin/src/main/webapp/static/crypto-js/x64-core.js b/management/guns-admin/src/main/webapp/static/crypto-js/x64-core.js
new file mode 100644
index 0000000..57dcc14
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/static/crypto-js/x64-core.js
@@ -0,0 +1,304 @@
+;(function (root, factory) {
+ if (typeof exports === "object") {
+ // CommonJS
+ module.exports = exports = factory(require("./core"));
+ }
+ else if (typeof define === "function" && define.amd) {
+ // AMD
+ define(["./core"], factory);
+ }
+ else {
+ // Global (browser)
+ factory(root.CryptoJS);
+ }
+}(this, function (CryptoJS) {
+
+ (function (undefined) {
+ // Shortcuts
+ var C = CryptoJS;
+ var C_lib = C.lib;
+ var Base = C_lib.Base;
+ var X32WordArray = C_lib.WordArray;
+
+ /**
+ * x64 namespace.
+ */
+ var C_x64 = C.x64 = {};
+
+ /**
+ * A 64-bit word.
+ */
+ var X64Word = C_x64.Word = Base.extend({
+ /**
+ * Initializes a newly created 64-bit word.
+ *
+ * @param {number} high The high 32 bits.
+ * @param {number} low The low 32 bits.
+ *
+ * @example
+ *
+ * var x64Word = CryptoJS.x64.Word.create(0x00010203, 0x04050607);
+ */
+ init: function (high, low) {
+ this.high = high;
+ this.low = low;
+ }
+
+ /**
+ * Bitwise NOTs this word.
+ *
+ * @return {X64Word} A new x64-Word object after negating.
+ *
+ * @example
+ *
+ * var negated = x64Word.not();
+ */
+ // not: function () {
+ // var high = ~this.high;
+ // var low = ~this.low;
+
+ // return X64Word.create(high, low);
+ // },
+
+ /**
+ * Bitwise ANDs this word with the passed word.
+ *
+ * @param {X64Word} word The x64-Word to AND with this word.
+ *
+ * @return {X64Word} A new x64-Word object after ANDing.
+ *
+ * @example
+ *
+ * var anded = x64Word.and(anotherX64Word);
+ */
+ // and: function (word) {
+ // var high = this.high & word.high;
+ // var low = this.low & word.low;
+
+ // return X64Word.create(high, low);
+ // },
+
+ /**
+ * Bitwise ORs this word with the passed word.
+ *
+ * @param {X64Word} word The x64-Word to OR with this word.
+ *
+ * @return {X64Word} A new x64-Word object after ORing.
+ *
+ * @example
+ *
+ * var ored = x64Word.or(anotherX64Word);
+ */
+ // or: function (word) {
+ // var high = this.high | word.high;
+ // var low = this.low | word.low;
+
+ // return X64Word.create(high, low);
+ // },
+
+ /**
+ * Bitwise XORs this word with the passed word.
+ *
+ * @param {X64Word} word The x64-Word to XOR with this word.
+ *
+ * @return {X64Word} A new x64-Word object after XORing.
+ *
+ * @example
+ *
+ * var xored = x64Word.xor(anotherX64Word);
+ */
+ // xor: function (word) {
+ // var high = this.high ^ word.high;
+ // var low = this.low ^ word.low;
+
+ // return X64Word.create(high, low);
+ // },
+
+ /**
+ * Shifts this word n bits to the left.
+ *
+ * @param {number} n The number of bits to shift.
+ *
+ * @return {X64Word} A new x64-Word object after shifting.
+ *
+ * @example
+ *
+ * var shifted = x64Word.shiftL(25);
+ */
+ // shiftL: function (n) {
+ // if (n < 32) {
+ // var high = (this.high << n) | (this.low >>> (32 - n));
+ // var low = this.low << n;
+ // } else {
+ // var high = this.low << (n - 32);
+ // var low = 0;
+ // }
+
+ // return X64Word.create(high, low);
+ // },
+
+ /**
+ * Shifts this word n bits to the right.
+ *
+ * @param {number} n The number of bits to shift.
+ *
+ * @return {X64Word} A new x64-Word object after shifting.
+ *
+ * @example
+ *
+ * var shifted = x64Word.shiftR(7);
+ */
+ // shiftR: function (n) {
+ // if (n < 32) {
+ // var low = (this.low >>> n) | (this.high << (32 - n));
+ // var high = this.high >>> n;
+ // } else {
+ // var low = this.high >>> (n - 32);
+ // var high = 0;
+ // }
+
+ // return X64Word.create(high, low);
+ // },
+
+ /**
+ * Rotates this word n bits to the left.
+ *
+ * @param {number} n The number of bits to rotate.
+ *
+ * @return {X64Word} A new x64-Word object after rotating.
+ *
+ * @example
+ *
+ * var rotated = x64Word.rotL(25);
+ */
+ // rotL: function (n) {
+ // return this.shiftL(n).or(this.shiftR(64 - n));
+ // },
+
+ /**
+ * Rotates this word n bits to the right.
+ *
+ * @param {number} n The number of bits to rotate.
+ *
+ * @return {X64Word} A new x64-Word object after rotating.
+ *
+ * @example
+ *
+ * var rotated = x64Word.rotR(7);
+ */
+ // rotR: function (n) {
+ // return this.shiftR(n).or(this.shiftL(64 - n));
+ // },
+
+ /**
+ * Adds this word with the passed word.
+ *
+ * @param {X64Word} word The x64-Word to add with this word.
+ *
+ * @return {X64Word} A new x64-Word object after adding.
+ *
+ * @example
+ *
+ * var added = x64Word.add(anotherX64Word);
+ */
+ // add: function (word) {
+ // var low = (this.low + word.low) | 0;
+ // var carry = (low >>> 0) < (this.low >>> 0) ? 1 : 0;
+ // var high = (this.high + word.high + carry) | 0;
+
+ // return X64Word.create(high, low);
+ // }
+ });
+
+ /**
+ * An array of 64-bit words.
+ *
+ * @property {Array} words The array of CryptoJS.x64.Word objects.
+ * @property {number} sigBytes The number of significant bytes in this word array.
+ */
+ var X64WordArray = C_x64.WordArray = Base.extend({
+ /**
+ * Initializes a newly created word array.
+ *
+ * @param {Array} words (Optional) An array of CryptoJS.x64.Word objects.
+ * @param {number} sigBytes (Optional) The number of significant bytes in the words.
+ *
+ * @example
+ *
+ * var wordArray = CryptoJS.x64.WordArray.create();
+ *
+ * var wordArray = CryptoJS.x64.WordArray.create([
+ * CryptoJS.x64.Word.create(0x00010203, 0x04050607),
+ * CryptoJS.x64.Word.create(0x18191a1b, 0x1c1d1e1f)
+ * ]);
+ *
+ * var wordArray = CryptoJS.x64.WordArray.create([
+ * CryptoJS.x64.Word.create(0x00010203, 0x04050607),
+ * CryptoJS.x64.Word.create(0x18191a1b, 0x1c1d1e1f)
+ * ], 10);
+ */
+ init: function (words, sigBytes) {
+ words = this.words = words || [];
+
+ if (sigBytes != undefined) {
+ this.sigBytes = sigBytes;
+ } else {
+ this.sigBytes = words.length * 8;
+ }
+ },
+
+ /**
+ * Converts this 64-bit word array to a 32-bit word array.
+ *
+ * @return {CryptoJS.lib.WordArray} This word array's data as a 32-bit word array.
+ *
+ * @example
+ *
+ * var x32WordArray = x64WordArray.toX32();
+ */
+ toX32: function () {
+ // Shortcuts
+ var x64Words = this.words;
+ var x64WordsLength = x64Words.length;
+
+ // Convert
+ var x32Words = [];
+ for (var i = 0; i < x64WordsLength; i++) {
+ var x64Word = x64Words[i];
+ x32Words.push(x64Word.high);
+ x32Words.push(x64Word.low);
+ }
+
+ return X32WordArray.create(x32Words, this.sigBytes);
+ },
+
+ /**
+ * Creates a copy of this word array.
+ *
+ * @return {X64WordArray} The clone.
+ *
+ * @example
+ *
+ * var clone = x64WordArray.clone();
+ */
+ clone: function () {
+ var clone = Base.clone.call(this);
+
+ // Clone "words" array
+ var words = clone.words = this.words.slice(0);
+
+ // Clone each X64Word object
+ var wordsLength = words.length;
+ for (var i = 0; i < wordsLength; i++) {
+ words[i] = words[i].clone();
+ }
+
+ return clone;
+ }
+ });
+ }());
+
+
+ return CryptoJS;
+
+}));
\ No newline at end of file
diff --git a/management/guns-admin/src/main/webapp/static/css/_fstyle.css b/management/guns-admin/src/main/webapp/static/css/_fstyle.css
new file mode 100644
index 0000000..3b2ded1
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/static/css/_fstyle.css
@@ -0,0 +1,65 @@
+.button-margin {
+ margin-left: 15px !important;
+}
+
+.input-none-margin {
+ margin: 0px !important;
+}
+
+.btn-margin-left {
+ margin-left: 15px !important;
+}
+
+.table-head {
+ float: left;
+ width: 100%;
+ height: auto;
+}
+
+.head-scu-label {
+ margin-top: 35px;
+}
+
+.head-scu-btn {
+ margin-top: 68px;
+}
+
+.line-margin {
+ margin: 8px 0 !important;
+}
+
+.be-driver-checkbox {
+ margin-top: 7px;
+}
+
+.btn-group-m-t {
+ margin-top: 20px;
+}
+
+.upload-btn {
+ white-space: nowrap;
+}
+
+.tree-box {
+ border-radius: 0px !important;
+ box-shadow: 0px 2px 4px rgba(0, 0, 0, 0.2) !important;
+ background: rgb(250, 250, 250) none repeat scroll 0% 0% !important;
+ border: 1px solid rgb(204, 204, 204) !important;
+ overflow-y: scroll !important;
+ overflow-x: auto !important;
+ margin-top: 0px !important;
+ width: 224px !important;
+ max-height: 160px !important;
+ -moz-user-select: none !important;
+}
+.dept-tree {
+ padding:10px
+}
+
+.w-e-text-container{
+ height: 150px !important;
+}
+
+.editorHeight{
+ height: 170px;
+}
\ No newline at end of file
diff --git a/management/guns-admin/src/main/webapp/static/css/bootstrap-rtl.css b/management/guns-admin/src/main/webapp/static/css/bootstrap-rtl.css
new file mode 100644
index 0000000..30014e6
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/static/css/bootstrap-rtl.css
@@ -0,0 +1,1468 @@
+/*******************************************************************************
+ * bootstrap-rtl (version 3.3.1)
+ * Author: Morteza Ansarinia (http://github.com/morteza)
+ * Created on: January 21,2015
+ * Project: bootstrap-rtl
+ * Copyright: Unlicensed Public Domain
+ *******************************************************************************/
+
+html {
+ direction: rtl;
+}
+body {
+ direction: rtl;
+}
+.list-unstyled {
+ padding-right: 0;
+ padding-left: initial;
+}
+.list-inline {
+ padding-right: 0;
+ padding-left: initial;
+ margin-right: -5px;
+ margin-left: 0;
+}
+dd {
+ margin-right: 0;
+ margin-left: initial;
+}
+@media (min-width: 768px) {
+ .dl-horizontal dt {
+ float: right;
+ clear: right;
+ text-align: left;
+ }
+ .dl-horizontal dd {
+ margin-right: 180px;
+ margin-left: 0;
+ }
+}
+blockquote {
+ border-right: 5px solid #eeeeee;
+ border-left: 0;
+}
+.blockquote-reverse,
+blockquote.pull-left {
+ padding-left: 15px;
+ padding-right: 0;
+ border-left: 5px solid #eeeeee;
+ border-right: 0;
+ text-align: left;
+}
+.col-xs-1, .col-sm-1, .col-md-1, .col-lg-1, .col-xs-2, .col-sm-2, .col-md-2, .col-lg-2, .col-xs-3, .col-sm-3, .col-md-3, .col-lg-3, .col-xs-4, .col-sm-4, .col-md-4, .col-lg-4, .col-xs-5, .col-sm-5, .col-md-5, .col-lg-5, .col-xs-6, .col-sm-6, .col-md-6, .col-lg-6, .col-xs-7, .col-sm-7, .col-md-7, .col-lg-7, .col-xs-8, .col-sm-8, .col-md-8, .col-lg-8, .col-xs-9, .col-sm-9, .col-md-9, .col-lg-9, .col-xs-10, .col-sm-10, .col-md-10, .col-lg-10, .col-xs-11, .col-sm-11, .col-md-11, .col-lg-11, .col-xs-12, .col-sm-12, .col-md-12, .col-lg-12 {
+ position: relative;
+ min-height: 1px;
+ padding-left: 15px;
+ padding-right: 15px;
+}
+.col-xs-1, .col-xs-2, .col-xs-3, .col-xs-4, .col-xs-5, .col-xs-6, .col-xs-7, .col-xs-8, .col-xs-9, .col-xs-10, .col-xs-11, .col-xs-12 {
+ float: right;
+}
+.col-xs-12 {
+ width: 100%;
+}
+.col-xs-11 {
+ width: 91.66666667%;
+}
+.col-xs-10 {
+ width: 83.33333333%;
+}
+.col-xs-9 {
+ width: 75%;
+}
+.col-xs-8 {
+ width: 66.66666667%;
+}
+.col-xs-7 {
+ width: 58.33333333%;
+}
+.col-xs-6 {
+ width: 50%;
+}
+.col-xs-5 {
+ width: 41.66666667%;
+}
+.col-xs-4 {
+ width: 33.33333333%;
+}
+.col-xs-3 {
+ width: 25%;
+}
+.col-xs-2 {
+ width: 16.66666667%;
+}
+.col-xs-1 {
+ width: 8.33333333%;
+}
+.col-xs-pull-12 {
+ left: 100%;
+ right: auto;
+}
+.col-xs-pull-11 {
+ left: 91.66666667%;
+ right: auto;
+}
+.col-xs-pull-10 {
+ left: 83.33333333%;
+ right: auto;
+}
+.col-xs-pull-9 {
+ left: 75%;
+ right: auto;
+}
+.col-xs-pull-8 {
+ left: 66.66666667%;
+ right: auto;
+}
+.col-xs-pull-7 {
+ left: 58.33333333%;
+ right: auto;
+}
+.col-xs-pull-6 {
+ left: 50%;
+ right: auto;
+}
+.col-xs-pull-5 {
+ left: 41.66666667%;
+ right: auto;
+}
+.col-xs-pull-4 {
+ left: 33.33333333%;
+ right: auto;
+}
+.col-xs-pull-3 {
+ left: 25%;
+ right: auto;
+}
+.col-xs-pull-2 {
+ left: 16.66666667%;
+ right: auto;
+}
+.col-xs-pull-1 {
+ left: 8.33333333%;
+ right: auto;
+}
+.col-xs-pull-0 {
+ left: auto;
+ right: auto;
+}
+.col-xs-push-12 {
+ right: 100%;
+ left: 0;
+}
+.col-xs-push-11 {
+ right: 91.66666667%;
+ left: 0;
+}
+.col-xs-push-10 {
+ right: 83.33333333%;
+ left: 0;
+}
+.col-xs-push-9 {
+ right: 75%;
+ left: 0;
+}
+.col-xs-push-8 {
+ right: 66.66666667%;
+ left: 0;
+}
+.col-xs-push-7 {
+ right: 58.33333333%;
+ left: 0;
+}
+.col-xs-push-6 {
+ right: 50%;
+ left: 0;
+}
+.col-xs-push-5 {
+ right: 41.66666667%;
+ left: 0;
+}
+.col-xs-push-4 {
+ right: 33.33333333%;
+ left: 0;
+}
+.col-xs-push-3 {
+ right: 25%;
+ left: 0;
+}
+.col-xs-push-2 {
+ right: 16.66666667%;
+ left: 0;
+}
+.col-xs-push-1 {
+ right: 8.33333333%;
+ left: 0;
+}
+.col-xs-push-0 {
+ right: auto;
+ left: 0;
+}
+.col-xs-offset-12 {
+ margin-right: 100%;
+ margin-left: 0;
+}
+.col-xs-offset-11 {
+ margin-right: 91.66666667%;
+ margin-left: 0;
+}
+.col-xs-offset-10 {
+ margin-right: 83.33333333%;
+ margin-left: 0;
+}
+.col-xs-offset-9 {
+ margin-right: 75%;
+ margin-left: 0;
+}
+.col-xs-offset-8 {
+ margin-right: 66.66666667%;
+ margin-left: 0;
+}
+.col-xs-offset-7 {
+ margin-right: 58.33333333%;
+ margin-left: 0;
+}
+.col-xs-offset-6 {
+ margin-right: 50%;
+ margin-left: 0;
+}
+.col-xs-offset-5 {
+ margin-right: 41.66666667%;
+ margin-left: 0;
+}
+.col-xs-offset-4 {
+ margin-right: 33.33333333%;
+ margin-left: 0;
+}
+.col-xs-offset-3 {
+ margin-right: 25%;
+ margin-left: 0;
+}
+.col-xs-offset-2 {
+ margin-right: 16.66666667%;
+ margin-left: 0;
+}
+.col-xs-offset-1 {
+ margin-right: 8.33333333%;
+ margin-left: 0;
+}
+.col-xs-offset-0 {
+ margin-right: 0%;
+ margin-left: 0;
+}
+@media (min-width: 768px) {
+ .col-sm-1, .col-sm-2, .col-sm-3, .col-sm-4, .col-sm-5, .col-sm-6, .col-sm-7, .col-sm-8, .col-sm-9, .col-sm-10, .col-sm-11, .col-sm-12 {
+ float: right;
+ }
+ .col-sm-12 {
+ width: 100%;
+ }
+ .col-sm-11 {
+ width: 91.66666667%;
+ }
+ .col-sm-10 {
+ width: 83.33333333%;
+ }
+ .col-sm-9 {
+ width: 75%;
+ }
+ .col-sm-8 {
+ width: 66.66666667%;
+ }
+ .col-sm-7 {
+ width: 58.33333333%;
+ }
+ .col-sm-6 {
+ width: 50%;
+ }
+ .col-sm-5 {
+ width: 41.66666667%;
+ }
+ .col-sm-4 {
+ width: 33.33333333%;
+ }
+ .col-sm-3 {
+ width: 25%;
+ }
+ .col-sm-2 {
+ width: 16.66666667%;
+ }
+ .col-sm-1 {
+ width: 8.33333333%;
+ }
+ .col-sm-pull-12 {
+ left: 100%;
+ right: auto;
+ }
+ .col-sm-pull-11 {
+ left: 91.66666667%;
+ right: auto;
+ }
+ .col-sm-pull-10 {
+ left: 83.33333333%;
+ right: auto;
+ }
+ .col-sm-pull-9 {
+ left: 75%;
+ right: auto;
+ }
+ .col-sm-pull-8 {
+ left: 66.66666667%;
+ right: auto;
+ }
+ .col-sm-pull-7 {
+ left: 58.33333333%;
+ right: auto;
+ }
+ .col-sm-pull-6 {
+ left: 50%;
+ right: auto;
+ }
+ .col-sm-pull-5 {
+ left: 41.66666667%;
+ right: auto;
+ }
+ .col-sm-pull-4 {
+ left: 33.33333333%;
+ right: auto;
+ }
+ .col-sm-pull-3 {
+ left: 25%;
+ right: auto;
+ }
+ .col-sm-pull-2 {
+ left: 16.66666667%;
+ right: auto;
+ }
+ .col-sm-pull-1 {
+ left: 8.33333333%;
+ right: auto;
+ }
+ .col-sm-pull-0 {
+ left: auto;
+ right: auto;
+ }
+ .col-sm-push-12 {
+ right: 100%;
+ left: 0;
+ }
+ .col-sm-push-11 {
+ right: 91.66666667%;
+ left: 0;
+ }
+ .col-sm-push-10 {
+ right: 83.33333333%;
+ left: 0;
+ }
+ .col-sm-push-9 {
+ right: 75%;
+ left: 0;
+ }
+ .col-sm-push-8 {
+ right: 66.66666667%;
+ left: 0;
+ }
+ .col-sm-push-7 {
+ right: 58.33333333%;
+ left: 0;
+ }
+ .col-sm-push-6 {
+ right: 50%;
+ left: 0;
+ }
+ .col-sm-push-5 {
+ right: 41.66666667%;
+ left: 0;
+ }
+ .col-sm-push-4 {
+ right: 33.33333333%;
+ left: 0;
+ }
+ .col-sm-push-3 {
+ right: 25%;
+ left: 0;
+ }
+ .col-sm-push-2 {
+ right: 16.66666667%;
+ left: 0;
+ }
+ .col-sm-push-1 {
+ right: 8.33333333%;
+ left: 0;
+ }
+ .col-sm-push-0 {
+ right: auto;
+ left: 0;
+ }
+ .col-sm-offset-12 {
+ margin-right: 100%;
+ margin-left: 0;
+ }
+ .col-sm-offset-11 {
+ margin-right: 91.66666667%;
+ margin-left: 0;
+ }
+ .col-sm-offset-10 {
+ margin-right: 83.33333333%;
+ margin-left: 0;
+ }
+ .col-sm-offset-9 {
+ margin-right: 75%;
+ margin-left: 0;
+ }
+ .col-sm-offset-8 {
+ margin-right: 66.66666667%;
+ margin-left: 0;
+ }
+ .col-sm-offset-7 {
+ margin-right: 58.33333333%;
+ margin-left: 0;
+ }
+ .col-sm-offset-6 {
+ margin-right: 50%;
+ margin-left: 0;
+ }
+ .col-sm-offset-5 {
+ margin-right: 41.66666667%;
+ margin-left: 0;
+ }
+ .col-sm-offset-4 {
+ margin-right: 33.33333333%;
+ margin-left: 0;
+ }
+ .col-sm-offset-3 {
+ margin-right: 25%;
+ margin-left: 0;
+ }
+ .col-sm-offset-2 {
+ margin-right: 16.66666667%;
+ margin-left: 0;
+ }
+ .col-sm-offset-1 {
+ margin-right: 8.33333333%;
+ margin-left: 0;
+ }
+ .col-sm-offset-0 {
+ margin-right: 0%;
+ margin-left: 0;
+ }
+}
+@media (min-width: 992px) {
+ .col-md-1, .col-md-2, .col-md-3, .col-md-4, .col-md-5, .col-md-6, .col-md-7, .col-md-8, .col-md-9, .col-md-10, .col-md-11, .col-md-12 {
+ float: right;
+ }
+ .col-md-12 {
+ width: 100%;
+ }
+ .col-md-11 {
+ width: 91.66666667%;
+ }
+ .col-md-10 {
+ width: 83.33333333%;
+ }
+ .col-md-9 {
+ width: 75%;
+ }
+ .col-md-8 {
+ width: 66.66666667%;
+ }
+ .col-md-7 {
+ width: 58.33333333%;
+ }
+ .col-md-6 {
+ width: 50%;
+ }
+ .col-md-5 {
+ width: 41.66666667%;
+ }
+ .col-md-4 {
+ width: 33.33333333%;
+ }
+ .col-md-3 {
+ width: 25%;
+ }
+ .col-md-2 {
+ width: 16.66666667%;
+ }
+ .col-md-1 {
+ width: 8.33333333%;
+ }
+ .col-md-pull-12 {
+ left: 100%;
+ right: auto;
+ }
+ .col-md-pull-11 {
+ left: 91.66666667%;
+ right: auto;
+ }
+ .col-md-pull-10 {
+ left: 83.33333333%;
+ right: auto;
+ }
+ .col-md-pull-9 {
+ left: 75%;
+ right: auto;
+ }
+ .col-md-pull-8 {
+ left: 66.66666667%;
+ right: auto;
+ }
+ .col-md-pull-7 {
+ left: 58.33333333%;
+ right: auto;
+ }
+ .col-md-pull-6 {
+ left: 50%;
+ right: auto;
+ }
+ .col-md-pull-5 {
+ left: 41.66666667%;
+ right: auto;
+ }
+ .col-md-pull-4 {
+ left: 33.33333333%;
+ right: auto;
+ }
+ .col-md-pull-3 {
+ left: 25%;
+ right: auto;
+ }
+ .col-md-pull-2 {
+ left: 16.66666667%;
+ right: auto;
+ }
+ .col-md-pull-1 {
+ left: 8.33333333%;
+ right: auto;
+ }
+ .col-md-pull-0 {
+ left: auto;
+ right: auto;
+ }
+ .col-md-push-12 {
+ right: 100%;
+ left: 0;
+ }
+ .col-md-push-11 {
+ right: 91.66666667%;
+ left: 0;
+ }
+ .col-md-push-10 {
+ right: 83.33333333%;
+ left: 0;
+ }
+ .col-md-push-9 {
+ right: 75%;
+ left: 0;
+ }
+ .col-md-push-8 {
+ right: 66.66666667%;
+ left: 0;
+ }
+ .col-md-push-7 {
+ right: 58.33333333%;
+ left: 0;
+ }
+ .col-md-push-6 {
+ right: 50%;
+ left: 0;
+ }
+ .col-md-push-5 {
+ right: 41.66666667%;
+ left: 0;
+ }
+ .col-md-push-4 {
+ right: 33.33333333%;
+ left: 0;
+ }
+ .col-md-push-3 {
+ right: 25%;
+ left: 0;
+ }
+ .col-md-push-2 {
+ right: 16.66666667%;
+ left: 0;
+ }
+ .col-md-push-1 {
+ right: 8.33333333%;
+ left: 0;
+ }
+ .col-md-push-0 {
+ right: auto;
+ left: 0;
+ }
+ .col-md-offset-12 {
+ margin-right: 100%;
+ margin-left: 0;
+ }
+ .col-md-offset-11 {
+ margin-right: 91.66666667%;
+ margin-left: 0;
+ }
+ .col-md-offset-10 {
+ margin-right: 83.33333333%;
+ margin-left: 0;
+ }
+ .col-md-offset-9 {
+ margin-right: 75%;
+ margin-left: 0;
+ }
+ .col-md-offset-8 {
+ margin-right: 66.66666667%;
+ margin-left: 0;
+ }
+ .col-md-offset-7 {
+ margin-right: 58.33333333%;
+ margin-left: 0;
+ }
+ .col-md-offset-6 {
+ margin-right: 50%;
+ margin-left: 0;
+ }
+ .col-md-offset-5 {
+ margin-right: 41.66666667%;
+ margin-left: 0;
+ }
+ .col-md-offset-4 {
+ margin-right: 33.33333333%;
+ margin-left: 0;
+ }
+ .col-md-offset-3 {
+ margin-right: 25%;
+ margin-left: 0;
+ }
+ .col-md-offset-2 {
+ margin-right: 16.66666667%;
+ margin-left: 0;
+ }
+ .col-md-offset-1 {
+ margin-right: 8.33333333%;
+ margin-left: 0;
+ }
+ .col-md-offset-0 {
+ margin-right: 0%;
+ margin-left: 0;
+ }
+}
+@media (min-width: 1200px) {
+ .col-lg-1, .col-lg-2, .col-lg-3, .col-lg-4, .col-lg-5, .col-lg-6, .col-lg-7, .col-lg-8, .col-lg-9, .col-lg-10, .col-lg-11, .col-lg-12 {
+ float: right;
+ }
+ .col-lg-12 {
+ width: 100%;
+ }
+ .col-lg-11 {
+ width: 91.66666667%;
+ }
+ .col-lg-10 {
+ width: 83.33333333%;
+ }
+ .col-lg-9 {
+ width: 75%;
+ }
+ .col-lg-8 {
+ width: 66.66666667%;
+ }
+ .col-lg-7 {
+ width: 58.33333333%;
+ }
+ .col-lg-6 {
+ width: 50%;
+ }
+ .col-lg-5 {
+ width: 41.66666667%;
+ }
+ .col-lg-4 {
+ width: 33.33333333%;
+ }
+ .col-lg-3 {
+ width: 25%;
+ }
+ .col-lg-2 {
+ width: 16.66666667%;
+ }
+ .col-lg-1 {
+ width: 8.33333333%;
+ }
+ .col-lg-pull-12 {
+ left: 100%;
+ right: auto;
+ }
+ .col-lg-pull-11 {
+ left: 91.66666667%;
+ right: auto;
+ }
+ .col-lg-pull-10 {
+ left: 83.33333333%;
+ right: auto;
+ }
+ .col-lg-pull-9 {
+ left: 75%;
+ right: auto;
+ }
+ .col-lg-pull-8 {
+ left: 66.66666667%;
+ right: auto;
+ }
+ .col-lg-pull-7 {
+ left: 58.33333333%;
+ right: auto;
+ }
+ .col-lg-pull-6 {
+ left: 50%;
+ right: auto;
+ }
+ .col-lg-pull-5 {
+ left: 41.66666667%;
+ right: auto;
+ }
+ .col-lg-pull-4 {
+ left: 33.33333333%;
+ right: auto;
+ }
+ .col-lg-pull-3 {
+ left: 25%;
+ right: auto;
+ }
+ .col-lg-pull-2 {
+ left: 16.66666667%;
+ right: auto;
+ }
+ .col-lg-pull-1 {
+ left: 8.33333333%;
+ right: auto;
+ }
+ .col-lg-pull-0 {
+ left: auto;
+ right: auto;
+ }
+ .col-lg-push-12 {
+ right: 100%;
+ left: 0;
+ }
+ .col-lg-push-11 {
+ right: 91.66666667%;
+ left: 0;
+ }
+ .col-lg-push-10 {
+ right: 83.33333333%;
+ left: 0;
+ }
+ .col-lg-push-9 {
+ right: 75%;
+ left: 0;
+ }
+ .col-lg-push-8 {
+ right: 66.66666667%;
+ left: 0;
+ }
+ .col-lg-push-7 {
+ right: 58.33333333%;
+ left: 0;
+ }
+ .col-lg-push-6 {
+ right: 50%;
+ left: 0;
+ }
+ .col-lg-push-5 {
+ right: 41.66666667%;
+ left: 0;
+ }
+ .col-lg-push-4 {
+ right: 33.33333333%;
+ left: 0;
+ }
+ .col-lg-push-3 {
+ right: 25%;
+ left: 0;
+ }
+ .col-lg-push-2 {
+ right: 16.66666667%;
+ left: 0;
+ }
+ .col-lg-push-1 {
+ right: 8.33333333%;
+ left: 0;
+ }
+ .col-lg-push-0 {
+ right: auto;
+ left: 0;
+ }
+ .col-lg-offset-12 {
+ margin-right: 100%;
+ margin-left: 0;
+ }
+ .col-lg-offset-11 {
+ margin-right: 91.66666667%;
+ margin-left: 0;
+ }
+ .col-lg-offset-10 {
+ margin-right: 83.33333333%;
+ margin-left: 0;
+ }
+ .col-lg-offset-9 {
+ margin-right: 75%;
+ margin-left: 0;
+ }
+ .col-lg-offset-8 {
+ margin-right: 66.66666667%;
+ margin-left: 0;
+ }
+ .col-lg-offset-7 {
+ margin-right: 58.33333333%;
+ margin-left: 0;
+ }
+ .col-lg-offset-6 {
+ margin-right: 50%;
+ margin-left: 0;
+ }
+ .col-lg-offset-5 {
+ margin-right: 41.66666667%;
+ margin-left: 0;
+ }
+ .col-lg-offset-4 {
+ margin-right: 33.33333333%;
+ margin-left: 0;
+ }
+ .col-lg-offset-3 {
+ margin-right: 25%;
+ margin-left: 0;
+ }
+ .col-lg-offset-2 {
+ margin-right: 16.66666667%;
+ margin-left: 0;
+ }
+ .col-lg-offset-1 {
+ margin-right: 8.33333333%;
+ margin-left: 0;
+ }
+ .col-lg-offset-0 {
+ margin-right: 0%;
+ margin-left: 0;
+ }
+}
+caption {
+ text-align: right;
+}
+th {
+ text-align: right;
+}
+@media screen and (max-width: 767px) {
+ .table-responsive > .table-bordered {
+ border: 0;
+ }
+ .table-responsive > .table-bordered > thead > tr > th:first-child,
+ .table-responsive > .table-bordered > tbody > tr > th:first-child,
+ .table-responsive > .table-bordered > tfoot > tr > th:first-child,
+ .table-responsive > .table-bordered > thead > tr > td:first-child,
+ .table-responsive > .table-bordered > tbody > tr > td:first-child,
+ .table-responsive > .table-bordered > tfoot > tr > td:first-child {
+ border-right: 0;
+ border-left: initial;
+ }
+ .table-responsive > .table-bordered > thead > tr > th:last-child,
+ .table-responsive > .table-bordered > tbody > tr > th:last-child,
+ .table-responsive > .table-bordered > tfoot > tr > th:last-child,
+ .table-responsive > .table-bordered > thead > tr > td:last-child,
+ .table-responsive > .table-bordered > tbody > tr > td:last-child,
+ .table-responsive > .table-bordered > tfoot > tr > td:last-child {
+ border-left: 0;
+ border-right: initial;
+ }
+}
+.radio label,
+.checkbox label {
+ padding-right: 20px;
+ padding-left: initial;
+}
+.radio input[type="radio"],
+.radio-inline input[type="radio"],
+.checkbox input[type="checkbox"],
+.checkbox-inline input[type="checkbox"] {
+ margin-right: -20px;
+ margin-left: auto;
+}
+.radio-inline,
+.checkbox-inline {
+ padding-right: 20px;
+ padding-left: 0;
+}
+.radio-inline + .radio-inline,
+.checkbox-inline + .checkbox-inline {
+ margin-right: 10px;
+ margin-left: 0;
+}
+.has-feedback .form-control {
+ padding-left: 42.5px;
+ padding-right: 12px;
+}
+.form-control-feedback {
+ left: 0;
+ right: auto;
+}
+@media (min-width: 768px) {
+ .form-inline label {
+ padding-right: 0;
+ padding-left: initial;
+ }
+ .form-inline .radio input[type="radio"],
+ .form-inline .checkbox input[type="checkbox"] {
+ margin-right: 0;
+ margin-left: auto;
+ }
+}
+@media (min-width: 768px) {
+ .form-horizontal .control-label {
+ text-align: left;
+ }
+}
+.form-horizontal .has-feedback .form-control-feedback {
+ left: 15px;
+ right: auto;
+}
+.caret {
+ margin-right: 2px;
+ margin-left: 0;
+}
+.dropdown-menu {
+ right: 0;
+ left: auto;
+ float: left;
+ text-align: right;
+}
+.dropdown-menu.pull-right {
+ left: 0;
+ right: auto;
+ float: right;
+}
+.dropdown-menu-right {
+ left: auto;
+ right: 0;
+}
+.dropdown-menu-left {
+ left: 0;
+ right: auto;
+}
+@media (min-width: 768px) {
+ .navbar-right .dropdown-menu {
+ left: auto;
+ right: 0;
+ }
+ .navbar-right .dropdown-menu-left {
+ left: 0;
+ right: auto;
+ }
+}
+.btn-group > .btn,
+.btn-group-vertical > .btn {
+ float: right;
+}
+.btn-group .btn + .btn,
+.btn-group .btn + .btn-group,
+.btn-group .btn-group + .btn,
+.btn-group .btn-group + .btn-group {
+ margin-right: -1px;
+ margin-left: 0px;
+}
+.btn-toolbar {
+ margin-right: -5px;
+ margin-left: 0px;
+}
+.btn-toolbar .btn-group,
+.btn-toolbar .input-group {
+ float: right;
+}
+.btn-toolbar > .btn,
+.btn-toolbar > .btn-group,
+.btn-toolbar > .input-group {
+ margin-right: 5px;
+ margin-left: 0px;
+}
+.btn-group > .btn:first-child {
+ margin-right: 0;
+}
+.btn-group > .btn:first-child:not(:last-child):not(.dropdown-toggle) {
+ border-top-right-radius: 4px;
+ border-bottom-right-radius: 4px;
+ border-bottom-left-radius: 0;
+ border-top-left-radius: 0;
+}
+.btn-group > .btn:last-child:not(:first-child),
+.btn-group > .dropdown-toggle:not(:first-child) {
+ border-top-left-radius: 4px;
+ border-bottom-left-radius: 4px;
+ border-bottom-right-radius: 0;
+ border-top-right-radius: 0;
+}
+.btn-group > .btn-group {
+ float: right;
+}
+.btn-group.btn-group-justified > .btn,
+.btn-group.btn-group-justified > .btn-group {
+ float: none;
+}
+.btn-group > .btn-group:not(:first-child):not(:last-child) > .btn {
+ border-radius: 0;
+}
+.btn-group > .btn-group:first-child > .btn:last-child,
+.btn-group > .btn-group:first-child > .dropdown-toggle {
+ border-top-right-radius: 4px;
+ border-bottom-right-radius: 4px;
+ border-bottom-left-radius: 0;
+ border-top-left-radius: 0;
+}
+.btn-group > .btn-group:last-child > .btn:first-child {
+ border-top-left-radius: 4px;
+ border-bottom-left-radius: 4px;
+ border-bottom-right-radius: 0;
+ border-top-right-radius: 0;
+}
+.btn .caret {
+ margin-right: 0;
+}
+.btn-group-vertical > .btn + .btn,
+.btn-group-vertical > .btn + .btn-group,
+.btn-group-vertical > .btn-group + .btn,
+.btn-group-vertical > .btn-group + .btn-group {
+ margin-top: -1px;
+ margin-right: 0;
+}
+.input-group .form-control {
+ float: right;
+}
+.input-group .form-control:first-child,
+.input-group-addon:first-child,
+.input-group-btn:first-child > .btn,
+.input-group-btn:first-child > .btn-group > .btn,
+.input-group-btn:first-child > .dropdown-toggle,
+.input-group-btn:last-child > .btn:not(:last-child):not(.dropdown-toggle),
+.input-group-btn:last-child > .btn-group:not(:last-child) > .btn {
+ border-bottom-right-radius: 4px;
+ border-top-right-radius: 4px;
+ border-bottom-left-radius: 0;
+ border-top-left-radius: 0;
+}
+.input-group-addon:first-child {
+ border-right-width: 1px;
+ border-right-style: solid;
+ border-left: 0px;
+}
+.input-group .form-control:last-child,
+.input-group-addon:last-child,
+.input-group-btn:last-child > .btn,
+.input-group-btn:last-child > .btn-group > .btn,
+.input-group-btn:last-child > .dropdown-toggle,
+.input-group-btn:first-child > .btn:not(:first-child),
+.input-group-btn:first-child > .btn-group:not(:first-child) > .btn {
+ border-bottom-left-radius: 4px;
+ border-top-left-radius: 4px;
+ border-bottom-right-radius: 0;
+ border-top-right-radius: 0;
+}
+.input-group-addon:last-child {
+ border-left-width: 1px;
+ border-left-style: solid;
+ border-right: 0px;
+}
+.input-group-btn > .btn + .btn {
+ margin-right: -1px;
+ margin-left: auto;
+}
+.input-group-btn:first-child > .btn,
+.input-group-btn:first-child > .btn-group {
+ margin-left: -1px;
+ margin-right: auto;
+}
+.input-group-btn:last-child > .btn,
+.input-group-btn:last-child > .btn-group {
+ margin-right: -1px;
+ margin-left: auto;
+}
+.nav {
+ padding-right: 0;
+ padding-left: initial;
+}
+.nav-tabs > li {
+ float: right;
+}
+.nav-tabs > li > a {
+ margin-left: auto;
+ margin-right: -2px;
+ border-radius: 4px 4px 0 0;
+}
+.nav-pills > li {
+ float: right;
+}
+.nav-pills > li > a {
+ border-radius: 4px;
+}
+.nav-pills > li + li {
+ margin-right: 2px;
+ margin-left: auto;
+}
+.nav-stacked > li {
+ float: none;
+}
+.nav-stacked > li + li {
+ margin-right: 0;
+ margin-left: auto;
+}
+.nav-justified > .dropdown .dropdown-menu {
+ right: auto;
+}
+.nav-tabs-justified > li > a {
+ margin-left: 0;
+ margin-right: auto;
+}
+@media (min-width: 768px) {
+ .nav-tabs-justified > li > a {
+ border-radius: 4px 4px 0 0;
+ }
+}
+@media (min-width: 768px) {
+ .navbar-header {
+ float: right;
+ }
+}
+.navbar-collapse {
+ padding-right: 15px;
+ padding-left: 15px;
+}
+.navbar-brand {
+ float: right;
+}
+@media (min-width: 768px) {
+ .navbar > .container .navbar-brand,
+ .navbar > .container-fluid .navbar-brand {
+ margin-right: -15px;
+ margin-left: auto;
+ }
+}
+.navbar-toggle {
+ float: left;
+ margin-left: 15px;
+ margin-right: auto;
+}
+@media (max-width: 767px) {
+ .navbar-nav .open .dropdown-menu > li > a,
+ .navbar-nav .open .dropdown-menu .dropdown-header {
+ padding: 5px 25px 5px 15px;
+ }
+}
+@media (min-width: 768px) {
+ .navbar-nav {
+ float: right;
+ }
+ .navbar-nav > li {
+ float: right;
+ }
+}
+@media (min-width: 768px) {
+ .navbar-left.flip {
+ float: right !important;
+ }
+ .navbar-right:last-child {
+ margin-left: -15px;
+ margin-right: auto;
+ }
+ .navbar-right.flip {
+ float: left !important;
+ margin-left: -15px;
+ margin-right: auto;
+ }
+ .navbar-right .dropdown-menu {
+ left: 0;
+ right: auto;
+ }
+}
+@media (min-width: 768px) {
+ .navbar-text {
+ float: right;
+ }
+ .navbar-text.navbar-right:last-child {
+ margin-left: 0;
+ margin-right: auto;
+ }
+}
+.pagination {
+ padding-right: 0;
+}
+.pagination > li > a,
+.pagination > li > span {
+ float: right;
+ margin-right: -1px;
+ margin-left: 0px;
+}
+.pagination > li:first-child > a,
+.pagination > li:first-child > span {
+ margin-left: 0;
+ border-bottom-right-radius: 4px;
+ border-top-right-radius: 4px;
+ border-bottom-left-radius: 0;
+ border-top-left-radius: 0;
+}
+.pagination > li:last-child > a,
+.pagination > li:last-child > span {
+ margin-right: -1px;
+ border-bottom-left-radius: 4px;
+ border-top-left-radius: 4px;
+ border-bottom-right-radius: 0;
+ border-top-right-radius: 0;
+}
+.pager {
+ padding-right: 0;
+ padding-left: initial;
+}
+.pager .next > a,
+.pager .next > span {
+ float: left;
+}
+.pager .previous > a,
+.pager .previous > span {
+ float: right;
+}
+.nav-pills > li > a > .badge {
+ margin-left: 0px;
+ margin-right: 3px;
+}
+.list-group-item > .badge {
+ float: left;
+}
+.list-group-item > .badge + .badge {
+ margin-left: 5px;
+ margin-right: auto;
+}
+.alert-dismissable,
+.alert-dismissible {
+ padding-left: 35px;
+ padding-right: 15px;
+}
+.alert-dismissable .close,
+.alert-dismissible .close {
+ right: auto;
+ left: -21px;
+}
+.progress-bar {
+ float: right;
+}
+.media > .pull-left {
+ margin-right: 10px;
+}
+.media > .pull-left.flip {
+ margin-right: 0;
+ margin-left: 10px;
+}
+.media > .pull-right {
+ margin-left: 10px;
+}
+.media > .pull-right.flip {
+ margin-left: 0;
+ margin-right: 10px;
+}
+.media-right,
+.media > .pull-right {
+ padding-right: 10px;
+ padding-left: initial;
+}
+.media-left,
+.media > .pull-left {
+ padding-left: 10px;
+ padding-right: initial;
+}
+.media-list {
+ padding-right: 0;
+ padding-left: initial;
+ list-style: none;
+}
+.list-group {
+ padding-right: 0;
+ padding-left: initial;
+}
+.panel > .table:first-child > thead:first-child > tr:first-child td:first-child,
+.panel > .table-responsive:first-child > .table:first-child > thead:first-child > tr:first-child td:first-child,
+.panel > .table:first-child > tbody:first-child > tr:first-child td:first-child,
+.panel > .table-responsive:first-child > .table:first-child > tbody:first-child > tr:first-child td:first-child,
+.panel > .table:first-child > thead:first-child > tr:first-child th:first-child,
+.panel > .table-responsive:first-child > .table:first-child > thead:first-child > tr:first-child th:first-child,
+.panel > .table:first-child > tbody:first-child > tr:first-child th:first-child,
+.panel > .table-responsive:first-child > .table:first-child > tbody:first-child > tr:first-child th:first-child {
+ border-top-right-radius: 3px;
+ border-top-left-radius: 0;
+}
+.panel > .table:first-child > thead:first-child > tr:first-child td:last-child,
+.panel > .table-responsive:first-child > .table:first-child > thead:first-child > tr:first-child td:last-child,
+.panel > .table:first-child > tbody:first-child > tr:first-child td:last-child,
+.panel > .table-responsive:first-child > .table:first-child > tbody:first-child > tr:first-child td:last-child,
+.panel > .table:first-child > thead:first-child > tr:first-child th:last-child,
+.panel > .table-responsive:first-child > .table:first-child > thead:first-child > tr:first-child th:last-child,
+.panel > .table:first-child > tbody:first-child > tr:first-child th:last-child,
+.panel > .table-responsive:first-child > .table:first-child > tbody:first-child > tr:first-child th:last-child {
+ border-top-left-radius: 3px;
+ border-top-right-radius: 0;
+}
+.panel > .table:last-child > tbody:last-child > tr:last-child td:first-child,
+.panel > .table-responsive:last-child > .table:last-child > tbody:last-child > tr:last-child td:first-child,
+.panel > .table:last-child > tfoot:last-child > tr:last-child td:first-child,
+.panel > .table-responsive:last-child > .table:last-child > tfoot:last-child > tr:last-child td:first-child,
+.panel > .table:last-child > tbody:last-child > tr:last-child th:first-child,
+.panel > .table-responsive:last-child > .table:last-child > tbody:last-child > tr:last-child th:first-child,
+.panel > .table:last-child > tfoot:last-child > tr:last-child th:first-child,
+.panel > .table-responsive:last-child > .table:last-child > tfoot:last-child > tr:last-child th:first-child {
+ border-bottom-left-radius: 3px;
+ border-top-right-radius: 0;
+}
+.panel > .table:last-child > tbody:last-child > tr:last-child td:last-child,
+.panel > .table-responsive:last-child > .table:last-child > tbody:last-child > tr:last-child td:last-child,
+.panel > .table:last-child > tfoot:last-child > tr:last-child td:last-child,
+.panel > .table-responsive:last-child > .table:last-child > tfoot:last-child > tr:last-child td:last-child,
+.panel > .table:last-child > tbody:last-child > tr:last-child th:last-child,
+.panel > .table-responsive:last-child > .table:last-child > tbody:last-child > tr:last-child th:last-child,
+.panel > .table:last-child > tfoot:last-child > tr:last-child th:last-child,
+.panel > .table-responsive:last-child > .table:last-child > tfoot:last-child > tr:last-child th:last-child {
+ border-bottom-right-radius: 3px;
+ border-top-left-radius: 0;
+}
+.panel > .table-bordered > thead > tr > th:first-child,
+.panel > .table-responsive > .table-bordered > thead > tr > th:first-child,
+.panel > .table-bordered > tbody > tr > th:first-child,
+.panel > .table-responsive > .table-bordered > tbody > tr > th:first-child,
+.panel > .table-bordered > tfoot > tr > th:first-child,
+.panel > .table-responsive > .table-bordered > tfoot > tr > th:first-child,
+.panel > .table-bordered > thead > tr > td:first-child,
+.panel > .table-responsive > .table-bordered > thead > tr > td:first-child,
+.panel > .table-bordered > tbody > tr > td:first-child,
+.panel > .table-responsive > .table-bordered > tbody > tr > td:first-child,
+.panel > .table-bordered > tfoot > tr > td:first-child,
+.panel > .table-responsive > .table-bordered > tfoot > tr > td:first-child {
+ border-right: 0;
+ border-left: none;
+}
+.panel > .table-bordered > thead > tr > th:last-child,
+.panel > .table-responsive > .table-bordered > thead > tr > th:last-child,
+.panel > .table-bordered > tbody > tr > th:last-child,
+.panel > .table-responsive > .table-bordered > tbody > tr > th:last-child,
+.panel > .table-bordered > tfoot > tr > th:last-child,
+.panel > .table-responsive > .table-bordered > tfoot > tr > th:last-child,
+.panel > .table-bordered > thead > tr > td:last-child,
+.panel > .table-responsive > .table-bordered > thead > tr > td:last-child,
+.panel > .table-bordered > tbody > tr > td:last-child,
+.panel > .table-responsive > .table-bordered > tbody > tr > td:last-child,
+.panel > .table-bordered > tfoot > tr > td:last-child,
+.panel > .table-responsive > .table-bordered > tfoot > tr > td:last-child {
+ border-right: none;
+ border-left: 0;
+}
+.embed-responsive .embed-responsive-item,
+.embed-responsive iframe,
+.embed-responsive embed,
+.embed-responsive object {
+ right: 0;
+ left: auto;
+}
+.close {
+ float: left;
+}
+.modal-footer {
+ text-align: left;
+}
+.modal-footer .btn + .btn {
+ margin-left: auto;
+ margin-right: 5px;
+}
+.modal-footer .btn-group .btn + .btn {
+ margin-right: -1px;
+ margin-left: auto;
+}
+.modal-footer .btn-block + .btn-block {
+ margin-right: 0;
+ margin-left: auto;
+}
+.popover {
+ left: auto;
+ text-align: right;
+}
+.popover.top > .arrow {
+ right: 50%;
+ left: auto;
+ margin-right: -11px;
+ margin-left: auto;
+}
+.popover.top > .arrow:after {
+ margin-right: -10px;
+ margin-left: auto;
+}
+.popover.bottom > .arrow {
+ right: 50%;
+ left: auto;
+ margin-right: -11px;
+ margin-left: auto;
+}
+.popover.bottom > .arrow:after {
+ margin-right: -10px;
+ margin-left: auto;
+}
+.carousel-control {
+ right: 0;
+ bottom: 0;
+}
+.carousel-control.left {
+ right: auto;
+ left: 0;
+ background-image: -webkit-linear-gradient(left, color-stop(rgba(0, 0, 0, 0.5) 0%), color-stop(rgba(0, 0, 0, 0.0001) 100%));
+ background-image: -o-linear-gradient(left, rgba(0, 0, 0, 0.5) 0%, rgba(0, 0, 0, 0.0001) 100%);
+ background-image: linear-gradient(to right, rgba(0, 0, 0, 0.5) 0%, rgba(0, 0, 0, 0.0001) 100%);
+ background-repeat: repeat-x;
+ filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#80000000', endColorstr='#00000000', GradientType=1);
+}
+.carousel-control.right {
+ left: auto;
+ right: 0;
+ background-image: -webkit-linear-gradient(left, color-stop(rgba(0, 0, 0, 0.0001) 0%), color-stop(rgba(0, 0, 0, 0.5) 100%));
+ background-image: -o-linear-gradient(left, rgba(0, 0, 0, 0.0001) 0%, rgba(0, 0, 0, 0.5) 100%);
+ background-image: linear-gradient(to right, rgba(0, 0, 0, 0.0001) 0%, rgba(0, 0, 0, 0.5) 100%);
+ background-repeat: repeat-x;
+ filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#00000000', endColorstr='#80000000', GradientType=1);
+}
+.carousel-control .icon-prev,
+.carousel-control .glyphicon-chevron-left {
+ left: 50%;
+ right: auto;
+ margin-right: -10px;
+}
+.carousel-control .icon-next,
+.carousel-control .glyphicon-chevron-right {
+ right: 50%;
+ left: auto;
+ margin-left: -10px;
+}
+.carousel-indicators {
+ right: 50%;
+ left: 0;
+ margin-right: -30%;
+ margin-left: 0;
+ padding-left: 0;
+}
+@media screen and (min-width: 768px) {
+ .carousel-control .glyphicon-chevron-left,
+ .carousel-control .icon-prev {
+ margin-left: 0;
+ margin-right: -15px;
+ }
+ .carousel-control .glyphicon-chevron-right,
+ .carousel-control .icon-next {
+ margin-left: 0;
+ margin-right: -15px;
+ }
+ .carousel-caption {
+ left: 20%;
+ right: 20%;
+ padding-bottom: 30px;
+ }
+}
+.pull-right.flip {
+ float: left !important;
+}
+.pull-left.flip {
+ float: right !important;
+}
+/*# sourceMappingURL=bootstrap-rtl.css.map */
diff --git a/management/guns-admin/src/main/webapp/static/css/bootstrap.min.css b/management/guns-admin/src/main/webapp/static/css/bootstrap.min.css
new file mode 100644
index 0000000..1f0e4d5
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/static/css/bootstrap.min.css
@@ -0,0 +1,6 @@
+/*!
+ * Bootstrap v3.3.6 (http://getbootstrap.com)
+ * Copyright 2011-2015 Twitter, Inc.
+ * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
+ *//*! normalize.css v3.0.3 | MIT License | github.com/necolas/normalize.css */html{font-family:sans-serif;-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%}body{margin:0}article,aside,details,figcaption,figure,footer,header,hgroup,main,menu,nav,section,summary{display:block}audio,canvas,progress,video{display:inline-block;vertical-align:baseline}audio:not([controls]){display:none;height:0}[hidden],template{display:none}a{background-color:transparent}a:active,a:hover{outline:0}abbr[title]{border-bottom:1px dotted}b,strong{font-weight:700}dfn{font-style:italic}h1{margin:.67em 0;font-size:2em}mark{color:#000;background:#ff0}small{font-size:80%}sub,sup{position:relative;font-size:75%;line-height:0;vertical-align:baseline}sup{top:-.5em}sub{bottom:-.25em}img{border:0}svg:not(:root){overflow:hidden}figure{margin:1em 40px}hr{height:0;-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box}pre{overflow:auto}code,kbd,pre,samp{font-family:monospace,monospace;font-size:1em}button,input,optgroup,select,textarea{margin:0;font:inherit;color:inherit}button{overflow:visible}button,select{text-transform:none}button,html input[type=button],input[type=reset],input[type=submit]{-webkit-appearance:button;cursor:pointer}button[disabled],html input[disabled]{cursor:default}button::-moz-focus-inner,input::-moz-focus-inner{padding:0;border:0}input{line-height:normal}input[type=checkbox],input[type=radio]{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;padding:0}input[type=number]::-webkit-inner-spin-button,input[type=number]::-webkit-outer-spin-button{height:auto}input[type=search]{-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box;-webkit-appearance:textfield}input[type=search]::-webkit-search-cancel-button,input[type=search]::-webkit-search-decoration{-webkit-appearance:none}fieldset{padding:.35em .625em .75em;margin:0 2px;border:1px solid silver}legend{padding:0;border:0}textarea{overflow:auto}optgroup{font-weight:700}table{border-spacing:0;border-collapse:collapse}td,th{padding:0}/*! Source: https://github.com/h5bp/html5-boilerplate/blob/master/src/css/main.css */@media print{*,:after,:before{color:#000!important;text-shadow:none!important;background:0 0!important;-webkit-box-shadow:none!important;box-shadow:none!important}a,a:visited{text-decoration:underline}a[href]:after{content:" (" attr(href) ")"}abbr[title]:after{content:" (" attr(title) ")"}a[href^="javascript:"]:after,a[href^="#"]:after{content:""}blockquote,pre{border:1px solid #999;page-break-inside:avoid}thead{display:table-header-group}img,tr{page-break-inside:avoid}img{max-width:100%!important}h2,h3,p{orphans:3;widows:3}h2,h3{page-break-after:avoid}.navbar{display:none}.btn>.caret,.dropup>.btn>.caret{border-top-color:#000!important}.label{border:1px solid #000}.table{border-collapse:collapse!important}.table td,.table th{background-color:#fff!important}.table-bordered td,.table-bordered th{border:1px solid #ddd!important}}@font-face{font-family:'Glyphicons Halflings';src:url(../fonts/glyphicons-halflings-regular.eot);src:url(../fonts/glyphicons-halflings-regular.eot?#iefix) format('embedded-opentype'),url(../fonts/glyphicons-halflings-regular.woff2) format('woff2'),url(../fonts/glyphicons-halflings-regular.woff) format('woff'),url(../fonts/glyphicons-halflings-regular.ttf) format('truetype'),url(../fonts/glyphicons-halflings-regular.svg#glyphicons_halflingsregular) format('svg')}.glyphicon{position:relative;top:1px;display:inline-block;font-family:'Glyphicons Halflings';font-style:normal;font-weight:400;line-height:1;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}.glyphicon-asterisk:before{content:"\002a"}.glyphicon-plus:before{content:"\002b"}.glyphicon-eur:before,.glyphicon-euro:before{content:"\20ac"}.glyphicon-minus:before{content:"\2212"}.glyphicon-cloud:before{content:"\2601"}.glyphicon-envelope:before{content:"\2709"}.glyphicon-pencil:before{content:"\270f"}.glyphicon-glass:before{content:"\e001"}.glyphicon-music:before{content:"\e002"}.glyphicon-search:before{content:"\e003"}.glyphicon-heart:before{content:"\e005"}.glyphicon-star:before{content:"\e006"}.glyphicon-star-empty:before{content:"\e007"}.glyphicon-user:before{content:"\e008"}.glyphicon-film:before{content:"\e009"}.glyphicon-th-large:before{content:"\e010"}.glyphicon-th:before{content:"\e011"}.glyphicon-th-list:before{content:"\e012"}.glyphicon-ok:before{content:"\e013"}.glyphicon-remove:before{content:"\e014"}.glyphicon-zoom-in:before{content:"\e015"}.glyphicon-zoom-out:before{content:"\e016"}.glyphicon-off:before{content:"\e017"}.glyphicon-signal:before{content:"\e018"}.glyphicon-cog:before{content:"\e019"}.glyphicon-trash:before{content:"\e020"}.glyphicon-home:before{content:"\e021"}.glyphicon-file:before{content:"\e022"}.glyphicon-time:before{content:"\e023"}.glyphicon-road:before{content:"\e024"}.glyphicon-download-alt:before{content:"\e025"}.glyphicon-download:before{content:"\e026"}.glyphicon-upload:before{content:"\e027"}.glyphicon-inbox:before{content:"\e028"}.glyphicon-play-circle:before{content:"\e029"}.glyphicon-repeat:before{content:"\e030"}.glyphicon-refresh:before{content:"\e031"}.glyphicon-list-alt:before{content:"\e032"}.glyphicon-lock:before{content:"\e033"}.glyphicon-flag:before{content:"\e034"}.glyphicon-headphones:before{content:"\e035"}.glyphicon-volume-off:before{content:"\e036"}.glyphicon-volume-down:before{content:"\e037"}.glyphicon-volume-up:before{content:"\e038"}.glyphicon-qrcode:before{content:"\e039"}.glyphicon-barcode:before{content:"\e040"}.glyphicon-tag:before{content:"\e041"}.glyphicon-tags:before{content:"\e042"}.glyphicon-book:before{content:"\e043"}.glyphicon-bookmark:before{content:"\e044"}.glyphicon-print:before{content:"\e045"}.glyphicon-camera:before{content:"\e046"}.glyphicon-font:before{content:"\e047"}.glyphicon-bold:before{content:"\e048"}.glyphicon-italic:before{content:"\e049"}.glyphicon-text-height:before{content:"\e050"}.glyphicon-text-width:before{content:"\e051"}.glyphicon-align-left:before{content:"\e052"}.glyphicon-align-center:before{content:"\e053"}.glyphicon-align-right:before{content:"\e054"}.glyphicon-align-justify:before{content:"\e055"}.glyphicon-list:before{content:"\e056"}.glyphicon-indent-left:before{content:"\e057"}.glyphicon-indent-right:before{content:"\e058"}.glyphicon-facetime-video:before{content:"\e059"}.glyphicon-picture:before{content:"\e060"}.glyphicon-map-marker:before{content:"\e062"}.glyphicon-adjust:before{content:"\e063"}.glyphicon-tint:before{content:"\e064"}.glyphicon-edit:before{content:"\e065"}.glyphicon-share:before{content:"\e066"}.glyphicon-check:before{content:"\e067"}.glyphicon-move:before{content:"\e068"}.glyphicon-step-backward:before{content:"\e069"}.glyphicon-fast-backward:before{content:"\e070"}.glyphicon-backward:before{content:"\e071"}.glyphicon-play:before{content:"\e072"}.glyphicon-pause:before{content:"\e073"}.glyphicon-stop:before{content:"\e074"}.glyphicon-forward:before{content:"\e075"}.glyphicon-fast-forward:before{content:"\e076"}.glyphicon-step-forward:before{content:"\e077"}.glyphicon-eject:before{content:"\e078"}.glyphicon-chevron-left:before{content:"\e079"}.glyphicon-chevron-right:before{content:"\e080"}.glyphicon-plus-sign:before{content:"\e081"}.glyphicon-minus-sign:before{content:"\e082"}.glyphicon-remove-sign:before{content:"\e083"}.glyphicon-ok-sign:before{content:"\e084"}.glyphicon-question-sign:before{content:"\e085"}.glyphicon-info-sign:before{content:"\e086"}.glyphicon-screenshot:before{content:"\e087"}.glyphicon-remove-circle:before{content:"\e088"}.glyphicon-ok-circle:before{content:"\e089"}.glyphicon-ban-circle:before{content:"\e090"}.glyphicon-arrow-left:before{content:"\e091"}.glyphicon-arrow-right:before{content:"\e092"}.glyphicon-arrow-up:before{content:"\e093"}.glyphicon-arrow-down:before{content:"\e094"}.glyphicon-share-alt:before{content:"\e095"}.glyphicon-resize-full:before{content:"\e096"}.glyphicon-resize-small:before{content:"\e097"}.glyphicon-exclamation-sign:before{content:"\e101"}.glyphicon-gift:before{content:"\e102"}.glyphicon-leaf:before{content:"\e103"}.glyphicon-fire:before{content:"\e104"}.glyphicon-eye-open:before{content:"\e105"}.glyphicon-eye-close:before{content:"\e106"}.glyphicon-warning-sign:before{content:"\e107"}.glyphicon-plane:before{content:"\e108"}.glyphicon-calendar:before{content:"\e109"}.glyphicon-random:before{content:"\e110"}.glyphicon-comment:before{content:"\e111"}.glyphicon-magnet:before{content:"\e112"}.glyphicon-chevron-up:before{content:"\e113"}.glyphicon-chevron-down:before{content:"\e114"}.glyphicon-retweet:before{content:"\e115"}.glyphicon-shopping-cart:before{content:"\e116"}.glyphicon-folder-close:before{content:"\e117"}.glyphicon-folder-open:before{content:"\e118"}.glyphicon-resize-vertical:before{content:"\e119"}.glyphicon-resize-horizontal:before{content:"\e120"}.glyphicon-hdd:before{content:"\e121"}.glyphicon-bullhorn:before{content:"\e122"}.glyphicon-bell:before{content:"\e123"}.glyphicon-certificate:before{content:"\e124"}.glyphicon-thumbs-up:before{content:"\e125"}.glyphicon-thumbs-down:before{content:"\e126"}.glyphicon-hand-right:before{content:"\e127"}.glyphicon-hand-left:before{content:"\e128"}.glyphicon-hand-up:before{content:"\e129"}.glyphicon-hand-down:before{content:"\e130"}.glyphicon-circle-arrow-right:before{content:"\e131"}.glyphicon-circle-arrow-left:before{content:"\e132"}.glyphicon-circle-arrow-up:before{content:"\e133"}.glyphicon-circle-arrow-down:before{content:"\e134"}.glyphicon-globe:before{content:"\e135"}.glyphicon-wrench:before{content:"\e136"}.glyphicon-tasks:before{content:"\e137"}.glyphicon-filter:before{content:"\e138"}.glyphicon-briefcase:before{content:"\e139"}.glyphicon-fullscreen:before{content:"\e140"}.glyphicon-dashboard:before{content:"\e141"}.glyphicon-paperclip:before{content:"\e142"}.glyphicon-heart-empty:before{content:"\e143"}.glyphicon-link:before{content:"\e144"}.glyphicon-phone:before{content:"\e145"}.glyphicon-pushpin:before{content:"\e146"}.glyphicon-usd:before{content:"\e148"}.glyphicon-gbp:before{content:"\e149"}.glyphicon-sort:before{content:"\e150"}.glyphicon-sort-by-alphabet:before{content:"\e151"}.glyphicon-sort-by-alphabet-alt:before{content:"\e152"}.glyphicon-sort-by-order:before{content:"\e153"}.glyphicon-sort-by-order-alt:before{content:"\e154"}.glyphicon-sort-by-attributes:before{content:"\e155"}.glyphicon-sort-by-attributes-alt:before{content:"\e156"}.glyphicon-unchecked:before{content:"\e157"}.glyphicon-expand:before{content:"\e158"}.glyphicon-collapse-down:before{content:"\e159"}.glyphicon-collapse-up:before{content:"\e160"}.glyphicon-log-in:before{content:"\e161"}.glyphicon-flash:before{content:"\e162"}.glyphicon-log-out:before{content:"\e163"}.glyphicon-new-window:before{content:"\e164"}.glyphicon-record:before{content:"\e165"}.glyphicon-save:before{content:"\e166"}.glyphicon-open:before{content:"\e167"}.glyphicon-saved:before{content:"\e168"}.glyphicon-import:before{content:"\e169"}.glyphicon-export:before{content:"\e170"}.glyphicon-send:before{content:"\e171"}.glyphicon-floppy-disk:before{content:"\e172"}.glyphicon-floppy-saved:before{content:"\e173"}.glyphicon-floppy-remove:before{content:"\e174"}.glyphicon-floppy-save:before{content:"\e175"}.glyphicon-floppy-open:before{content:"\e176"}.glyphicon-credit-card:before{content:"\e177"}.glyphicon-transfer:before{content:"\e178"}.glyphicon-cutlery:before{content:"\e179"}.glyphicon-header:before{content:"\e180"}.glyphicon-compressed:before{content:"\e181"}.glyphicon-earphone:before{content:"\e182"}.glyphicon-phone-alt:before{content:"\e183"}.glyphicon-tower:before{content:"\e184"}.glyphicon-stats:before{content:"\e185"}.glyphicon-sd-video:before{content:"\e186"}.glyphicon-hd-video:before{content:"\e187"}.glyphicon-subtitles:before{content:"\e188"}.glyphicon-sound-stereo:before{content:"\e189"}.glyphicon-sound-dolby:before{content:"\e190"}.glyphicon-sound-5-1:before{content:"\e191"}.glyphicon-sound-6-1:before{content:"\e192"}.glyphicon-sound-7-1:before{content:"\e193"}.glyphicon-copyright-mark:before{content:"\e194"}.glyphicon-registration-mark:before{content:"\e195"}.glyphicon-cloud-download:before{content:"\e197"}.glyphicon-cloud-upload:before{content:"\e198"}.glyphicon-tree-conifer:before{content:"\e199"}.glyphicon-tree-deciduous:before{content:"\e200"}.glyphicon-cd:before{content:"\e201"}.glyphicon-save-file:before{content:"\e202"}.glyphicon-open-file:before{content:"\e203"}.glyphicon-level-up:before{content:"\e204"}.glyphicon-copy:before{content:"\e205"}.glyphicon-paste:before{content:"\e206"}.glyphicon-alert:before{content:"\e209"}.glyphicon-equalizer:before{content:"\e210"}.glyphicon-king:before{content:"\e211"}.glyphicon-queen:before{content:"\e212"}.glyphicon-pawn:before{content:"\e213"}.glyphicon-bishop:before{content:"\e214"}.glyphicon-knight:before{content:"\e215"}.glyphicon-baby-formula:before{content:"\e216"}.glyphicon-tent:before{content:"\26fa"}.glyphicon-blackboard:before{content:"\e218"}.glyphicon-bed:before{content:"\e219"}.glyphicon-apple:before{content:"\f8ff"}.glyphicon-erase:before{content:"\e221"}.glyphicon-hourglass:before{content:"\231b"}.glyphicon-lamp:before{content:"\e223"}.glyphicon-duplicate:before{content:"\e224"}.glyphicon-piggy-bank:before{content:"\e225"}.glyphicon-scissors:before{content:"\e226"}.glyphicon-bitcoin:before{content:"\e227"}.glyphicon-btc:before{content:"\e227"}.glyphicon-xbt:before{content:"\e227"}.glyphicon-yen:before{content:"\00a5"}.glyphicon-jpy:before{content:"\00a5"}.glyphicon-ruble:before{content:"\20bd"}.glyphicon-rub:before{content:"\20bd"}.glyphicon-scale:before{content:"\e230"}.glyphicon-ice-lolly:before{content:"\e231"}.glyphicon-ice-lolly-tasted:before{content:"\e232"}.glyphicon-education:before{content:"\e233"}.glyphicon-option-horizontal:before{content:"\e234"}.glyphicon-option-vertical:before{content:"\e235"}.glyphicon-menu-hamburger:before{content:"\e236"}.glyphicon-modal-window:before{content:"\e237"}.glyphicon-oil:before{content:"\e238"}.glyphicon-grain:before{content:"\e239"}.glyphicon-sunglasses:before{content:"\e240"}.glyphicon-text-size:before{content:"\e241"}.glyphicon-text-color:before{content:"\e242"}.glyphicon-text-background:before{content:"\e243"}.glyphicon-object-align-top:before{content:"\e244"}.glyphicon-object-align-bottom:before{content:"\e245"}.glyphicon-object-align-horizontal:before{content:"\e246"}.glyphicon-object-align-left:before{content:"\e247"}.glyphicon-object-align-vertical:before{content:"\e248"}.glyphicon-object-align-right:before{content:"\e249"}.glyphicon-triangle-right:before{content:"\e250"}.glyphicon-triangle-left:before{content:"\e251"}.glyphicon-triangle-bottom:before{content:"\e252"}.glyphicon-triangle-top:before{content:"\e253"}.glyphicon-console:before{content:"\e254"}.glyphicon-superscript:before{content:"\e255"}.glyphicon-subscript:before{content:"\e256"}.glyphicon-menu-left:before{content:"\e257"}.glyphicon-menu-right:before{content:"\e258"}.glyphicon-menu-down:before{content:"\e259"}.glyphicon-menu-up:before{content:"\e260"}*{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}:after,:before{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}html{font-size:10px;-webkit-tap-highlight-color:rgba(0,0,0,0)}body{font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px;line-height:1.42857143;color:#333;background-color:#fff}button,input,select,textarea{font-family:inherit;font-size:inherit;line-height:inherit}a{color:#337ab7;text-decoration:none}a:focus,a:hover{color:#23527c;text-decoration:underline}a:focus{outline:thin dotted;outline:5px auto -webkit-focus-ring-color;outline-offset:-2px}figure{margin:0}img{vertical-align:middle}.carousel-inner>.item>a>img,.carousel-inner>.item>img,.img-responsive,.thumbnail a>img,.thumbnail>img{display:block;max-width:100%;height:auto}.img-rounded{border-radius:6px}.img-thumbnail{display:inline-block;max-width:100%;height:auto;padding:4px;line-height:1.42857143;background-color:#fff;border:1px solid #ddd;border-radius:4px;-webkit-transition:all .2s ease-in-out;-o-transition:all .2s ease-in-out;transition:all .2s ease-in-out}.img-circle{border-radius:50%}hr{margin-top:20px;margin-bottom:20px;border:0;border-top:1px solid #eee}.sr-only{position:absolute;width:1px;height:1px;padding:0;margin:-1px;overflow:hidden;clip:rect(0,0,0,0);border:0}.sr-only-focusable:active,.sr-only-focusable:focus{position:static;width:auto;height:auto;margin:0;overflow:visible;clip:auto}[role=button]{cursor:pointer}.h1,.h2,.h3,.h4,.h5,.h6,h1,h2,h3,h4,h5,h6{font-family:inherit;font-weight:500;line-height:1.1;color:inherit}.h1 .small,.h1 small,.h2 .small,.h2 small,.h3 .small,.h3 small,.h4 .small,.h4 small,.h5 .small,.h5 small,.h6 .small,.h6 small,h1 .small,h1 small,h2 .small,h2 small,h3 .small,h3 small,h4 .small,h4 small,h5 .small,h5 small,h6 .small,h6 small{font-weight:400;line-height:1;color:#777}.h1,.h2,.h3,h1,h2,h3{margin-top:20px;margin-bottom:10px}.h1 .small,.h1 small,.h2 .small,.h2 small,.h3 .small,.h3 small,h1 .small,h1 small,h2 .small,h2 small,h3 .small,h3 small{font-size:65%}.h4,.h5,.h6,h4,h5,h6{margin-top:10px;margin-bottom:10px}.h4 .small,.h4 small,.h5 .small,.h5 small,.h6 .small,.h6 small,h4 .small,h4 small,h5 .small,h5 small,h6 .small,h6 small{font-size:75%}.h1,h1{font-size:36px}.h2,h2{font-size:30px}.h3,h3{font-size:24px}.h4,h4{font-size:18px}.h5,h5{font-size:14px}.h6,h6{font-size:12px}p{margin:0 0 10px}.lead{margin-bottom:20px;font-size:16px;font-weight:300;line-height:1.4}@media (min-width:768px){.lead{font-size:21px}}.small,small{font-size:85%}.mark,mark{padding:.2em;background-color:#fcf8e3}.text-left{text-align:left}.text-right{text-align:right}.text-center{text-align:center}.text-justify{text-align:justify}.text-nowrap{white-space:nowrap}.text-lowercase{text-transform:lowercase}.text-uppercase{text-transform:uppercase}.text-capitalize{text-transform:capitalize}.text-muted{color:#777}.text-primary{color:#337ab7}a.text-primary:focus,a.text-primary:hover{color:#286090}.text-success{color:#3c763d}a.text-success:focus,a.text-success:hover{color:#2b542c}.text-info{color:#31708f}a.text-info:focus,a.text-info:hover{color:#245269}.text-warning{color:#8a6d3b}a.text-warning:focus,a.text-warning:hover{color:#66512c}.text-danger{color:#a94442}a.text-danger:focus,a.text-danger:hover{color:#843534}.bg-primary{color:#fff;background-color:#337ab7}a.bg-primary:focus,a.bg-primary:hover{background-color:#286090}.bg-success{background-color:#dff0d8}a.bg-success:focus,a.bg-success:hover{background-color:#c1e2b3}.bg-info{background-color:#d9edf7}a.bg-info:focus,a.bg-info:hover{background-color:#afd9ee}.bg-warning{background-color:#fcf8e3}a.bg-warning:focus,a.bg-warning:hover{background-color:#f7ecb5}.bg-danger{background-color:#f2dede}a.bg-danger:focus,a.bg-danger:hover{background-color:#e4b9b9}.page-header{padding-bottom:9px;margin:40px 0 20px;border-bottom:1px solid #eee}ol,ul{margin-top:0;margin-bottom:10px}ol ol,ol ul,ul ol,ul ul{margin-bottom:0}.list-unstyled{padding-left:0;list-style:none}.list-inline{padding-left:0;margin-left:-5px;list-style:none}.list-inline>li{display:inline-block;padding-right:5px;padding-left:5px}dl{margin-top:0;margin-bottom:20px}dd,dt{line-height:1.42857143}dt{font-weight:700}dd{margin-left:0}@media (min-width:768px){.dl-horizontal dt{float:left;width:160px;overflow:hidden;clear:left;text-align:right;text-overflow:ellipsis;white-space:nowrap}.dl-horizontal dd{margin-left:180px}}abbr[data-original-title],abbr[title]{cursor:help;border-bottom:1px dotted #777}.initialism{font-size:90%;text-transform:uppercase}blockquote{padding:10px 20px;margin:0 0 20px;font-size:17.5px;border-left:5px solid #eee}blockquote ol:last-child,blockquote p:last-child,blockquote ul:last-child{margin-bottom:0}blockquote .small,blockquote footer,blockquote small{display:block;font-size:80%;line-height:1.42857143;color:#777}blockquote .small:before,blockquote footer:before,blockquote small:before{content:'\2014 \00A0'}.blockquote-reverse,blockquote.pull-right{padding-right:15px;padding-left:0;text-align:right;border-right:5px solid #eee;border-left:0}.blockquote-reverse .small:before,.blockquote-reverse footer:before,.blockquote-reverse small:before,blockquote.pull-right .small:before,blockquote.pull-right footer:before,blockquote.pull-right small:before{content:''}.blockquote-reverse .small:after,.blockquote-reverse footer:after,.blockquote-reverse small:after,blockquote.pull-right .small:after,blockquote.pull-right footer:after,blockquote.pull-right small:after{content:'\00A0 \2014'}address{margin-bottom:20px;font-style:normal;line-height:1.42857143}code,kbd,pre,samp{font-family:Menlo,Monaco,Consolas,"Courier New",monospace}code{padding:2px 4px;font-size:90%;color:#c7254e;background-color:#f9f2f4;border-radius:4px}kbd{padding:2px 4px;font-size:90%;color:#fff;background-color:#333;border-radius:3px;-webkit-box-shadow:inset 0 -1px 0 rgba(0,0,0,.25);box-shadow:inset 0 -1px 0 rgba(0,0,0,.25)}kbd kbd{padding:0;font-size:100%;font-weight:700;-webkit-box-shadow:none;box-shadow:none}pre{display:block;padding:9.5px;margin:0 0 10px;font-size:13px;line-height:1.42857143;color:#333;word-break:break-all;word-wrap:break-word;background-color:#f5f5f5;border:1px solid #ccc;border-radius:4px}pre code{padding:0;font-size:inherit;color:inherit;white-space:pre-wrap;background-color:transparent;border-radius:0}.pre-scrollable{max-height:340px;overflow-y:scroll}.container{padding-right:15px;padding-left:15px;margin-right:auto;margin-left:auto}@media (min-width:768px){.container{width:750px}}@media (min-width:992px){.container{width:970px}}@media (min-width:1200px){.container{width:1170px}}.container-fluid{padding-right:15px;padding-left:15px;margin-right:auto;margin-left:auto}.row{margin-right:-15px;margin-left:-15px}.col-lg-1,.col-lg-10,.col-lg-11,.col-lg-12,.col-lg-2,.col-lg-3,.col-lg-4,.col-lg-5,.col-lg-6,.col-lg-7,.col-lg-8,.col-lg-9,.col-md-1,.col-md-10,.col-md-11,.col-md-12,.col-md-2,.col-md-3,.col-md-4,.col-md-5,.col-md-6,.col-md-7,.col-md-8,.col-md-9,.col-sm-1,.col-sm-10,.col-sm-11,.col-sm-12,.col-sm-2,.col-sm-3,.col-sm-4,.col-sm-5,.col-sm-6,.col-sm-7,.col-sm-8,.col-sm-9,.col-xs-1,.col-xs-10,.col-xs-11,.col-xs-12,.col-xs-2,.col-xs-3,.col-xs-4,.col-xs-5,.col-xs-6,.col-xs-7,.col-xs-8,.col-xs-9{position:relative;min-height:1px;padding-right:15px;padding-left:15px}.col-xs-1,.col-xs-10,.col-xs-11,.col-xs-12,.col-xs-2,.col-xs-3,.col-xs-4,.col-xs-5,.col-xs-6,.col-xs-7,.col-xs-8,.col-xs-9{float:left}.col-xs-12{width:100%}.col-xs-11{width:91.66666667%}.col-xs-10{width:83.33333333%}.col-xs-9{width:75%}.col-xs-8{width:66.66666667%}.col-xs-7{width:58.33333333%}.col-xs-6{width:50%}.col-xs-5{width:41.66666667%}.col-xs-4{width:33.33333333%}.col-xs-3{width:25%}.col-xs-2{width:16.66666667%}.col-xs-1{width:8.33333333%}.col-xs-pull-12{right:100%}.col-xs-pull-11{right:91.66666667%}.col-xs-pull-10{right:83.33333333%}.col-xs-pull-9{right:75%}.col-xs-pull-8{right:66.66666667%}.col-xs-pull-7{right:58.33333333%}.col-xs-pull-6{right:50%}.col-xs-pull-5{right:41.66666667%}.col-xs-pull-4{right:33.33333333%}.col-xs-pull-3{right:25%}.col-xs-pull-2{right:16.66666667%}.col-xs-pull-1{right:8.33333333%}.col-xs-pull-0{right:auto}.col-xs-push-12{left:100%}.col-xs-push-11{left:91.66666667%}.col-xs-push-10{left:83.33333333%}.col-xs-push-9{left:75%}.col-xs-push-8{left:66.66666667%}.col-xs-push-7{left:58.33333333%}.col-xs-push-6{left:50%}.col-xs-push-5{left:41.66666667%}.col-xs-push-4{left:33.33333333%}.col-xs-push-3{left:25%}.col-xs-push-2{left:16.66666667%}.col-xs-push-1{left:8.33333333%}.col-xs-push-0{left:auto}.col-xs-offset-12{margin-left:100%}.col-xs-offset-11{margin-left:91.66666667%}.col-xs-offset-10{margin-left:83.33333333%}.col-xs-offset-9{margin-left:75%}.col-xs-offset-8{margin-left:66.66666667%}.col-xs-offset-7{margin-left:58.33333333%}.col-xs-offset-6{margin-left:50%}.col-xs-offset-5{margin-left:41.66666667%}.col-xs-offset-4{margin-left:33.33333333%}.col-xs-offset-3{margin-left:25%}.col-xs-offset-2{margin-left:16.66666667%}.col-xs-offset-1{margin-left:8.33333333%}.col-xs-offset-0{margin-left:0}@media (min-width:768px){.col-sm-1,.col-sm-10,.col-sm-11,.col-sm-12,.col-sm-2,.col-sm-3,.col-sm-4,.col-sm-5,.col-sm-6,.col-sm-7,.col-sm-8,.col-sm-9{float:left}.col-sm-12{width:100%}.col-sm-11{width:91.66666667%}.col-sm-10{width:83.33333333%}.col-sm-9{width:75%}.col-sm-8{width:66.66666667%}.col-sm-7{width:58.33333333%}.col-sm-6{width:50%}.col-sm-5{width:41.66666667%}.col-sm-4{width:33.33333333%}.col-sm-3{width:25%}.col-sm-2{width:16.66666667%}.col-sm-1{width:8.33333333%}.col-sm-pull-12{right:100%}.col-sm-pull-11{right:91.66666667%}.col-sm-pull-10{right:83.33333333%}.col-sm-pull-9{right:75%}.col-sm-pull-8{right:66.66666667%}.col-sm-pull-7{right:58.33333333%}.col-sm-pull-6{right:50%}.col-sm-pull-5{right:41.66666667%}.col-sm-pull-4{right:33.33333333%}.col-sm-pull-3{right:25%}.col-sm-pull-2{right:16.66666667%}.col-sm-pull-1{right:8.33333333%}.col-sm-pull-0{right:auto}.col-sm-push-12{left:100%}.col-sm-push-11{left:91.66666667%}.col-sm-push-10{left:83.33333333%}.col-sm-push-9{left:75%}.col-sm-push-8{left:66.66666667%}.col-sm-push-7{left:58.33333333%}.col-sm-push-6{left:50%}.col-sm-push-5{left:41.66666667%}.col-sm-push-4{left:33.33333333%}.col-sm-push-3{left:25%}.col-sm-push-2{left:16.66666667%}.col-sm-push-1{left:8.33333333%}.col-sm-push-0{left:auto}.col-sm-offset-12{margin-left:100%}.col-sm-offset-11{margin-left:91.66666667%}.col-sm-offset-10{margin-left:83.33333333%}.col-sm-offset-9{margin-left:75%}.col-sm-offset-8{margin-left:66.66666667%}.col-sm-offset-7{margin-left:58.33333333%}.col-sm-offset-6{margin-left:50%}.col-sm-offset-5{margin-left:41.66666667%}.col-sm-offset-4{margin-left:33.33333333%}.col-sm-offset-3{margin-left:25%}.col-sm-offset-2{margin-left:16.66666667%}.col-sm-offset-1{margin-left:8.33333333%}.col-sm-offset-0{margin-left:0}}@media (min-width:992px){.col-md-1,.col-md-10,.col-md-11,.col-md-12,.col-md-2,.col-md-3,.col-md-4,.col-md-5,.col-md-6,.col-md-7,.col-md-8,.col-md-9{float:left}.col-md-12{width:100%}.col-md-11{width:91.66666667%}.col-md-10{width:83.33333333%}.col-md-9{width:75%}.col-md-8{width:66.66666667%}.col-md-7{width:58.33333333%}.col-md-6{width:50%}.col-md-5{width:41.66666667%}.col-md-4{width:33.33333333%}.col-md-3{width:25%}.col-md-2{width:16.66666667%}.col-md-1{width:8.33333333%}.col-md-pull-12{right:100%}.col-md-pull-11{right:91.66666667%}.col-md-pull-10{right:83.33333333%}.col-md-pull-9{right:75%}.col-md-pull-8{right:66.66666667%}.col-md-pull-7{right:58.33333333%}.col-md-pull-6{right:50%}.col-md-pull-5{right:41.66666667%}.col-md-pull-4{right:33.33333333%}.col-md-pull-3{right:25%}.col-md-pull-2{right:16.66666667%}.col-md-pull-1{right:8.33333333%}.col-md-pull-0{right:auto}.col-md-push-12{left:100%}.col-md-push-11{left:91.66666667%}.col-md-push-10{left:83.33333333%}.col-md-push-9{left:75%}.col-md-push-8{left:66.66666667%}.col-md-push-7{left:58.33333333%}.col-md-push-6{left:50%}.col-md-push-5{left:41.66666667%}.col-md-push-4{left:33.33333333%}.col-md-push-3{left:25%}.col-md-push-2{left:16.66666667%}.col-md-push-1{left:8.33333333%}.col-md-push-0{left:auto}.col-md-offset-12{margin-left:100%}.col-md-offset-11{margin-left:91.66666667%}.col-md-offset-10{margin-left:83.33333333%}.col-md-offset-9{margin-left:75%}.col-md-offset-8{margin-left:66.66666667%}.col-md-offset-7{margin-left:58.33333333%}.col-md-offset-6{margin-left:50%}.col-md-offset-5{margin-left:41.66666667%}.col-md-offset-4{margin-left:33.33333333%}.col-md-offset-3{margin-left:25%}.col-md-offset-2{margin-left:16.66666667%}.col-md-offset-1{margin-left:8.33333333%}.col-md-offset-0{margin-left:0}}@media (min-width:1200px){.col-lg-1,.col-lg-10,.col-lg-11,.col-lg-12,.col-lg-2,.col-lg-3,.col-lg-4,.col-lg-5,.col-lg-6,.col-lg-7,.col-lg-8,.col-lg-9{float:left}.col-lg-12{width:100%}.col-lg-11{width:91.66666667%}.col-lg-10{width:83.33333333%}.col-lg-9{width:75%}.col-lg-8{width:66.66666667%}.col-lg-7{width:58.33333333%}.col-lg-6{width:50%}.col-lg-5{width:41.66666667%}.col-lg-4{width:33.33333333%}.col-lg-3{width:25%}.col-lg-2{width:16.66666667%}.col-lg-1{width:8.33333333%}.col-lg-pull-12{right:100%}.col-lg-pull-11{right:91.66666667%}.col-lg-pull-10{right:83.33333333%}.col-lg-pull-9{right:75%}.col-lg-pull-8{right:66.66666667%}.col-lg-pull-7{right:58.33333333%}.col-lg-pull-6{right:50%}.col-lg-pull-5{right:41.66666667%}.col-lg-pull-4{right:33.33333333%}.col-lg-pull-3{right:25%}.col-lg-pull-2{right:16.66666667%}.col-lg-pull-1{right:8.33333333%}.col-lg-pull-0{right:auto}.col-lg-push-12{left:100%}.col-lg-push-11{left:91.66666667%}.col-lg-push-10{left:83.33333333%}.col-lg-push-9{left:75%}.col-lg-push-8{left:66.66666667%}.col-lg-push-7{left:58.33333333%}.col-lg-push-6{left:50%}.col-lg-push-5{left:41.66666667%}.col-lg-push-4{left:33.33333333%}.col-lg-push-3{left:25%}.col-lg-push-2{left:16.66666667%}.col-lg-push-1{left:8.33333333%}.col-lg-push-0{left:auto}.col-lg-offset-12{margin-left:100%}.col-lg-offset-11{margin-left:91.66666667%}.col-lg-offset-10{margin-left:83.33333333%}.col-lg-offset-9{margin-left:75%}.col-lg-offset-8{margin-left:66.66666667%}.col-lg-offset-7{margin-left:58.33333333%}.col-lg-offset-6{margin-left:50%}.col-lg-offset-5{margin-left:41.66666667%}.col-lg-offset-4{margin-left:33.33333333%}.col-lg-offset-3{margin-left:25%}.col-lg-offset-2{margin-left:16.66666667%}.col-lg-offset-1{margin-left:8.33333333%}.col-lg-offset-0{margin-left:0}}table{background-color:transparent}caption{padding-top:8px;padding-bottom:8px;color:#777;text-align:left}th{text-align:left}.table{width:100%;max-width:100%;margin-bottom:20px}.table>tbody>tr>td,.table>tbody>tr>th,.table>tfoot>tr>td,.table>tfoot>tr>th,.table>thead>tr>td,.table>thead>tr>th{padding:8px;line-height:1.42857143;vertical-align:top;border-top:1px solid #ddd}.table>thead>tr>th{vertical-align:bottom;border-bottom:2px solid #ddd}.table>caption+thead>tr:first-child>td,.table>caption+thead>tr:first-child>th,.table>colgroup+thead>tr:first-child>td,.table>colgroup+thead>tr:first-child>th,.table>thead:first-child>tr:first-child>td,.table>thead:first-child>tr:first-child>th{border-top:0}.table>tbody+tbody{border-top:2px solid #ddd}.table .table{background-color:#fff}.table-condensed>tbody>tr>td,.table-condensed>tbody>tr>th,.table-condensed>tfoot>tr>td,.table-condensed>tfoot>tr>th,.table-condensed>thead>tr>td,.table-condensed>thead>tr>th{padding:5px}.table-bordered{border:1px solid #ddd}.table-bordered>tbody>tr>td,.table-bordered>tbody>tr>th,.table-bordered>tfoot>tr>td,.table-bordered>tfoot>tr>th,.table-bordered>thead>tr>td,.table-bordered>thead>tr>th{border:1px solid #ddd}.table-bordered>thead>tr>td,.table-bordered>thead>tr>th{border-bottom-width:2px}.table-striped>tbody>tr:nth-of-type(odd){background-color:#f9f9f9}.table-hover>tbody>tr:hover{background-color:#f5f5f5}table col[class*=col-]{position:static;display:table-column;float:none}table td[class*=col-],table th[class*=col-]{position:static;display:table-cell;float:none}.table>tbody>tr.active>td,.table>tbody>tr.active>th,.table>tbody>tr>td.active,.table>tbody>tr>th.active,.table>tfoot>tr.active>td,.table>tfoot>tr.active>th,.table>tfoot>tr>td.active,.table>tfoot>tr>th.active,.table>thead>tr.active>td,.table>thead>tr.active>th,.table>thead>tr>td.active,.table>thead>tr>th.active{background-color:#f5f5f5}.table-hover>tbody>tr.active:hover>td,.table-hover>tbody>tr.active:hover>th,.table-hover>tbody>tr:hover>.active,.table-hover>tbody>tr>td.active:hover,.table-hover>tbody>tr>th.active:hover{background-color:#e8e8e8}.table>tbody>tr.success>td,.table>tbody>tr.success>th,.table>tbody>tr>td.success,.table>tbody>tr>th.success,.table>tfoot>tr.success>td,.table>tfoot>tr.success>th,.table>tfoot>tr>td.success,.table>tfoot>tr>th.success,.table>thead>tr.success>td,.table>thead>tr.success>th,.table>thead>tr>td.success,.table>thead>tr>th.success{background-color:#dff0d8}.table-hover>tbody>tr.success:hover>td,.table-hover>tbody>tr.success:hover>th,.table-hover>tbody>tr:hover>.success,.table-hover>tbody>tr>td.success:hover,.table-hover>tbody>tr>th.success:hover{background-color:#d0e9c6}.table>tbody>tr.info>td,.table>tbody>tr.info>th,.table>tbody>tr>td.info,.table>tbody>tr>th.info,.table>tfoot>tr.info>td,.table>tfoot>tr.info>th,.table>tfoot>tr>td.info,.table>tfoot>tr>th.info,.table>thead>tr.info>td,.table>thead>tr.info>th,.table>thead>tr>td.info,.table>thead>tr>th.info{background-color:#d9edf7}.table-hover>tbody>tr.info:hover>td,.table-hover>tbody>tr.info:hover>th,.table-hover>tbody>tr:hover>.info,.table-hover>tbody>tr>td.info:hover,.table-hover>tbody>tr>th.info:hover{background-color:#c4e3f3}.table>tbody>tr.warning>td,.table>tbody>tr.warning>th,.table>tbody>tr>td.warning,.table>tbody>tr>th.warning,.table>tfoot>tr.warning>td,.table>tfoot>tr.warning>th,.table>tfoot>tr>td.warning,.table>tfoot>tr>th.warning,.table>thead>tr.warning>td,.table>thead>tr.warning>th,.table>thead>tr>td.warning,.table>thead>tr>th.warning{background-color:#fcf8e3}.table-hover>tbody>tr.warning:hover>td,.table-hover>tbody>tr.warning:hover>th,.table-hover>tbody>tr:hover>.warning,.table-hover>tbody>tr>td.warning:hover,.table-hover>tbody>tr>th.warning:hover{background-color:#faf2cc}.table>tbody>tr.danger>td,.table>tbody>tr.danger>th,.table>tbody>tr>td.danger,.table>tbody>tr>th.danger,.table>tfoot>tr.danger>td,.table>tfoot>tr.danger>th,.table>tfoot>tr>td.danger,.table>tfoot>tr>th.danger,.table>thead>tr.danger>td,.table>thead>tr.danger>th,.table>thead>tr>td.danger,.table>thead>tr>th.danger{background-color:#f2dede}.table-hover>tbody>tr.danger:hover>td,.table-hover>tbody>tr.danger:hover>th,.table-hover>tbody>tr:hover>.danger,.table-hover>tbody>tr>td.danger:hover,.table-hover>tbody>tr>th.danger:hover{background-color:#ebcccc}.table-responsive{min-height:.01%;overflow-x:auto}@media screen and (max-width:767px){.table-responsive{width:100%;margin-bottom:15px;overflow-y:hidden;-ms-overflow-style:-ms-autohiding-scrollbar;border:1px solid #ddd}.table-responsive>.table{margin-bottom:0}.table-responsive>.table>tbody>tr>td,.table-responsive>.table>tbody>tr>th,.table-responsive>.table>tfoot>tr>td,.table-responsive>.table>tfoot>tr>th,.table-responsive>.table>thead>tr>td,.table-responsive>.table>thead>tr>th{white-space:nowrap}.table-responsive>.table-bordered{border:0}.table-responsive>.table-bordered>tbody>tr>td:first-child,.table-responsive>.table-bordered>tbody>tr>th:first-child,.table-responsive>.table-bordered>tfoot>tr>td:first-child,.table-responsive>.table-bordered>tfoot>tr>th:first-child,.table-responsive>.table-bordered>thead>tr>td:first-child,.table-responsive>.table-bordered>thead>tr>th:first-child{border-left:0}.table-responsive>.table-bordered>tbody>tr>td:last-child,.table-responsive>.table-bordered>tbody>tr>th:last-child,.table-responsive>.table-bordered>tfoot>tr>td:last-child,.table-responsive>.table-bordered>tfoot>tr>th:last-child,.table-responsive>.table-bordered>thead>tr>td:last-child,.table-responsive>.table-bordered>thead>tr>th:last-child{border-right:0}.table-responsive>.table-bordered>tbody>tr:last-child>td,.table-responsive>.table-bordered>tbody>tr:last-child>th,.table-responsive>.table-bordered>tfoot>tr:last-child>td,.table-responsive>.table-bordered>tfoot>tr:last-child>th{border-bottom:0}}fieldset{min-width:0;padding:0;margin:0;border:0}legend{display:block;width:100%;padding:0;margin-bottom:20px;font-size:21px;line-height:inherit;color:#333;border:0;border-bottom:1px solid #e5e5e5}label{display:inline-block;max-width:100%;margin-bottom:5px;font-weight:700}input[type=search]{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}input[type=checkbox],input[type=radio]{margin:4px 0 0;margin-top:1px\9;line-height:normal}input[type=file]{display:block}input[type=range]{display:block;width:100%}select[multiple],select[size]{height:auto}input[type=file]:focus,input[type=checkbox]:focus,input[type=radio]:focus{outline:thin dotted;outline:5px auto -webkit-focus-ring-color;outline-offset:-2px}output{display:block;padding-top:7px;font-size:14px;line-height:1.42857143;color:#555}.form-control{display:block;width:100%;height:34px;padding:6px 12px;font-size:14px;line-height:1.42857143;color:#555;background-color:#fff;background-image:none;border:1px solid #ccc;border-radius:4px;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075);box-shadow:inset 0 1px 1px rgba(0,0,0,.075);-webkit-transition:border-color ease-in-out .15s,-webkit-box-shadow ease-in-out .15s;-o-transition:border-color ease-in-out .15s,box-shadow ease-in-out .15s;transition:border-color ease-in-out .15s,box-shadow ease-in-out .15s}.form-control:focus{border-color:#66afe9;outline:0;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 8px rgba(102,175,233,.6);box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 8px rgba(102,175,233,.6)}.form-control::-moz-placeholder{color:#999;opacity:1}.form-control:-ms-input-placeholder{color:#999}.form-control::-webkit-input-placeholder{color:#999}.form-control::-ms-expand{background-color:transparent;border:0}.form-control[disabled],.form-control[readonly],fieldset[disabled] .form-control{background-color:#eee;opacity:1}.form-control[disabled],fieldset[disabled] .form-control{cursor:not-allowed}textarea.form-control{height:auto}input[type=search]{-webkit-appearance:none}@media screen and (-webkit-min-device-pixel-ratio:0){input[type=date].form-control,input[type=time].form-control,input[type=datetime-local].form-control,input[type=month].form-control{line-height:34px}.input-group-sm input[type=date],.input-group-sm input[type=time],.input-group-sm input[type=datetime-local],.input-group-sm input[type=month],input[type=date].input-sm,input[type=time].input-sm,input[type=datetime-local].input-sm,input[type=month].input-sm{line-height:30px}.input-group-lg input[type=date],.input-group-lg input[type=time],.input-group-lg input[type=datetime-local],.input-group-lg input[type=month],input[type=date].input-lg,input[type=time].input-lg,input[type=datetime-local].input-lg,input[type=month].input-lg{line-height:46px}}.form-group{margin-bottom:15px}.checkbox,.radio{position:relative;display:block;margin-top:10px;margin-bottom:10px}.checkbox label,.radio label{min-height:20px;padding-left:20px;margin-bottom:0;font-weight:400;cursor:pointer}.checkbox input[type=checkbox],.checkbox-inline input[type=checkbox],.radio input[type=radio],.radio-inline input[type=radio]{position:absolute;margin-top:4px\9;margin-left:-20px}.checkbox+.checkbox,.radio+.radio{margin-top:-5px}.checkbox-inline,.radio-inline{position:relative;display:inline-block;padding-left:20px;margin-bottom:0;font-weight:400;vertical-align:middle;cursor:pointer}.checkbox-inline+.checkbox-inline,.radio-inline+.radio-inline{margin-top:0;margin-left:10px}fieldset[disabled] input[type=checkbox],fieldset[disabled] input[type=radio],input[type=checkbox].disabled,input[type=checkbox][disabled],input[type=radio].disabled,input[type=radio][disabled]{cursor:not-allowed}.checkbox-inline.disabled,.radio-inline.disabled,fieldset[disabled] .checkbox-inline,fieldset[disabled] .radio-inline{cursor:not-allowed}.checkbox.disabled label,.radio.disabled label,fieldset[disabled] .checkbox label,fieldset[disabled] .radio label{cursor:not-allowed}.form-control-static{min-height:34px;padding-top:7px;padding-bottom:7px;margin-bottom:0}.form-control-static.input-lg,.form-control-static.input-sm{padding-right:0;padding-left:0}.input-sm{height:30px;padding:5px 10px;font-size:12px;line-height:1.5;border-radius:3px}select.input-sm{height:30px;line-height:30px}select[multiple].input-sm,textarea.input-sm{height:auto}.form-group-sm .form-control{height:30px;padding:5px 10px;font-size:12px;line-height:1.5;border-radius:3px}.form-group-sm select.form-control{height:30px;line-height:30px}.form-group-sm select[multiple].form-control,.form-group-sm textarea.form-control{height:auto}.form-group-sm .form-control-static{height:30px;min-height:32px;padding:6px 10px;font-size:12px;line-height:1.5}.input-lg{height:46px;padding:10px 16px;font-size:18px;line-height:1.3333333;border-radius:6px}select.input-lg{height:46px;line-height:46px}select[multiple].input-lg,textarea.input-lg{height:auto}.form-group-lg .form-control{height:46px;padding:10px 16px;font-size:18px;line-height:1.3333333;border-radius:6px}.form-group-lg select.form-control{height:46px;line-height:46px}.form-group-lg select[multiple].form-control,.form-group-lg textarea.form-control{height:auto}.form-group-lg .form-control-static{height:46px;min-height:38px;padding:11px 16px;font-size:18px;line-height:1.3333333}.has-feedback{position:relative}.has-feedback .form-control{padding-right:42.5px}.form-control-feedback{position:absolute;top:0;right:0;z-index:2;display:block;width:34px;height:34px;line-height:34px;text-align:center;pointer-events:none}.form-group-lg .form-control+.form-control-feedback,.input-group-lg+.form-control-feedback,.input-lg+.form-control-feedback{width:46px;height:46px;line-height:46px}.form-group-sm .form-control+.form-control-feedback,.input-group-sm+.form-control-feedback,.input-sm+.form-control-feedback{width:30px;height:30px;line-height:30px}.has-success .checkbox,.has-success .checkbox-inline,.has-success .control-label,.has-success .help-block,.has-success .radio,.has-success .radio-inline,.has-success.checkbox label,.has-success.checkbox-inline label,.has-success.radio label,.has-success.radio-inline label{color:#3c763d}.has-success .form-control{border-color:#3c763d;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075);box-shadow:inset 0 1px 1px rgba(0,0,0,.075)}.has-success .form-control:focus{border-color:#2b542c;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 6px #67b168;box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 6px #67b168}.has-success .input-group-addon{color:#3c763d;background-color:#dff0d8;border-color:#3c763d}.has-success .form-control-feedback{color:#3c763d}.has-warning .checkbox,.has-warning .checkbox-inline,.has-warning .control-label,.has-warning .help-block,.has-warning .radio,.has-warning .radio-inline,.has-warning.checkbox label,.has-warning.checkbox-inline label,.has-warning.radio label,.has-warning.radio-inline label{color:#8a6d3b}.has-warning .form-control{border-color:#8a6d3b;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075);box-shadow:inset 0 1px 1px rgba(0,0,0,.075)}.has-warning .form-control:focus{border-color:#66512c;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 6px #c0a16b;box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 6px #c0a16b}.has-warning .input-group-addon{color:#8a6d3b;background-color:#fcf8e3;border-color:#8a6d3b}.has-warning .form-control-feedback{color:#8a6d3b}.has-error .checkbox,.has-error .checkbox-inline,.has-error .control-label,.has-error .help-block,.has-error .radio,.has-error .radio-inline,.has-error.checkbox label,.has-error.checkbox-inline label,.has-error.radio label,.has-error.radio-inline label{color:#a94442}.has-error .form-control{border-color:#a94442;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075);box-shadow:inset 0 1px 1px rgba(0,0,0,.075)}.has-error .form-control:focus{border-color:#843534;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 6px #ce8483;box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 6px #ce8483}.has-error .input-group-addon{color:#a94442;background-color:#f2dede;border-color:#a94442}.has-error .form-control-feedback{color:#a94442}.has-feedback label~.form-control-feedback{top:25px}.has-feedback label.sr-only~.form-control-feedback{top:0}.help-block{display:block;margin-top:5px;margin-bottom:10px;color:#737373}@media (min-width:768px){.form-inline .form-group{display:inline-block;margin-bottom:0;vertical-align:middle}.form-inline .form-control{display:inline-block;width:auto;vertical-align:middle}.form-inline .form-control-static{display:inline-block}.form-inline .input-group{display:inline-table;vertical-align:middle}.form-inline .input-group .form-control,.form-inline .input-group .input-group-addon,.form-inline .input-group .input-group-btn{width:auto}.form-inline .input-group>.form-control{width:100%}.form-inline .control-label{margin-bottom:0;vertical-align:middle}.form-inline .checkbox,.form-inline .radio{display:inline-block;margin-top:0;margin-bottom:0;vertical-align:middle}.form-inline .checkbox label,.form-inline .radio label{padding-left:0}.form-inline .checkbox input[type=checkbox],.form-inline .radio input[type=radio]{position:relative;margin-left:0}.form-inline .has-feedback .form-control-feedback{top:0}}.form-horizontal .checkbox,.form-horizontal .checkbox-inline,.form-horizontal .radio,.form-horizontal .radio-inline{padding-top:7px;margin-top:0;margin-bottom:0}.form-horizontal .checkbox,.form-horizontal .radio{min-height:27px}.form-horizontal .form-group{margin-right:-15px;margin-left:-15px}@media (min-width:768px){.form-horizontal .control-label{padding-top:7px;margin-bottom:0;text-align:right}}.form-horizontal .has-feedback .form-control-feedback{right:15px}@media (min-width:768px){.form-horizontal .form-group-lg .control-label{padding-top:11px;font-size:18px}}@media (min-width:768px){.form-horizontal .form-group-sm .control-label{padding-top:6px;font-size:12px}}.btn{display:inline-block;padding:6px 12px;margin-bottom:0;font-size:14px;font-weight:400;line-height:1.42857143;text-align:center;white-space:nowrap;vertical-align:middle;-ms-touch-action:manipulation;touch-action:manipulation;cursor:pointer;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none;background-image:none;border:1px solid transparent;border-radius:4px}.btn.active.focus,.btn.active:focus,.btn.focus,.btn:active.focus,.btn:active:focus,.btn:focus{outline:thin dotted;outline:5px auto -webkit-focus-ring-color;outline-offset:-2px}.btn.focus,.btn:focus,.btn:hover{color:#333;text-decoration:none}.btn.active,.btn:active{background-image:none;outline:0;-webkit-box-shadow:inset 0 3px 5px rgba(0,0,0,.125);box-shadow:inset 0 3px 5px rgba(0,0,0,.125)}.btn.disabled,.btn[disabled],fieldset[disabled] .btn{cursor:not-allowed;filter:alpha(opacity=65);-webkit-box-shadow:none;box-shadow:none;opacity:.65}a.btn.disabled,fieldset[disabled] a.btn{pointer-events:none}.btn-default{color:#333;background-color:#fff;border-color:#ccc}.btn-default.focus,.btn-default:focus{color:#333;background-color:#e6e6e6;border-color:#8c8c8c}.btn-default:hover{color:#333;background-color:#e6e6e6;border-color:#adadad}.btn-default.active,.btn-default:active,.open>.dropdown-toggle.btn-default{color:#333;background-color:#e6e6e6;border-color:#adadad}.btn-default.active.focus,.btn-default.active:focus,.btn-default.active:hover,.btn-default:active.focus,.btn-default:active:focus,.btn-default:active:hover,.open>.dropdown-toggle.btn-default.focus,.open>.dropdown-toggle.btn-default:focus,.open>.dropdown-toggle.btn-default:hover{color:#333;background-color:#d4d4d4;border-color:#8c8c8c}.btn-default.active,.btn-default:active,.open>.dropdown-toggle.btn-default{background-image:none}.btn-default.disabled.focus,.btn-default.disabled:focus,.btn-default.disabled:hover,.btn-default[disabled].focus,.btn-default[disabled]:focus,.btn-default[disabled]:hover,fieldset[disabled] .btn-default.focus,fieldset[disabled] .btn-default:focus,fieldset[disabled] .btn-default:hover{background-color:#fff;border-color:#ccc}.btn-default .badge{color:#fff;background-color:#333}.btn-primary{color:#fff;background-color:#337ab7;border-color:#2e6da4}.btn-primary.focus,.btn-primary:focus{color:#fff;background-color:#286090;border-color:#122b40}.btn-primary:hover{color:#fff;background-color:#286090;border-color:#204d74}.btn-primary.active,.btn-primary:active,.open>.dropdown-toggle.btn-primary{color:#fff;background-color:#286090;border-color:#204d74}.btn-primary.active.focus,.btn-primary.active:focus,.btn-primary.active:hover,.btn-primary:active.focus,.btn-primary:active:focus,.btn-primary:active:hover,.open>.dropdown-toggle.btn-primary.focus,.open>.dropdown-toggle.btn-primary:focus,.open>.dropdown-toggle.btn-primary:hover{color:#fff;background-color:#204d74;border-color:#122b40}.btn-primary.active,.btn-primary:active,.open>.dropdown-toggle.btn-primary{background-image:none}.btn-primary.disabled.focus,.btn-primary.disabled:focus,.btn-primary.disabled:hover,.btn-primary[disabled].focus,.btn-primary[disabled]:focus,.btn-primary[disabled]:hover,fieldset[disabled] .btn-primary.focus,fieldset[disabled] .btn-primary:focus,fieldset[disabled] .btn-primary:hover{background-color:#337ab7;border-color:#2e6da4}.btn-primary .badge{color:#337ab7;background-color:#fff}.btn-success{color:#fff;background-color:#5cb85c;border-color:#4cae4c}.btn-success.focus,.btn-success:focus{color:#fff;background-color:#449d44;border-color:#255625}.btn-success:hover{color:#fff;background-color:#449d44;border-color:#398439}.btn-success.active,.btn-success:active,.open>.dropdown-toggle.btn-success{color:#fff;background-color:#449d44;border-color:#398439}.btn-success.active.focus,.btn-success.active:focus,.btn-success.active:hover,.btn-success:active.focus,.btn-success:active:focus,.btn-success:active:hover,.open>.dropdown-toggle.btn-success.focus,.open>.dropdown-toggle.btn-success:focus,.open>.dropdown-toggle.btn-success:hover{color:#fff;background-color:#398439;border-color:#255625}.btn-success.active,.btn-success:active,.open>.dropdown-toggle.btn-success{background-image:none}.btn-success.disabled.focus,.btn-success.disabled:focus,.btn-success.disabled:hover,.btn-success[disabled].focus,.btn-success[disabled]:focus,.btn-success[disabled]:hover,fieldset[disabled] .btn-success.focus,fieldset[disabled] .btn-success:focus,fieldset[disabled] .btn-success:hover{background-color:#5cb85c;border-color:#4cae4c}.btn-success .badge{color:#5cb85c;background-color:#fff}.btn-info{color:#fff;background-color:#5bc0de;border-color:#46b8da}.btn-info.focus,.btn-info:focus{color:#fff;background-color:#31b0d5;border-color:#1b6d85}.btn-info:hover{color:#fff;background-color:#31b0d5;border-color:#269abc}.btn-info.active,.btn-info:active,.open>.dropdown-toggle.btn-info{color:#fff;background-color:#31b0d5;border-color:#269abc}.btn-info.active.focus,.btn-info.active:focus,.btn-info.active:hover,.btn-info:active.focus,.btn-info:active:focus,.btn-info:active:hover,.open>.dropdown-toggle.btn-info.focus,.open>.dropdown-toggle.btn-info:focus,.open>.dropdown-toggle.btn-info:hover{color:#fff;background-color:#269abc;border-color:#1b6d85}.btn-info.active,.btn-info:active,.open>.dropdown-toggle.btn-info{background-image:none}.btn-info.disabled.focus,.btn-info.disabled:focus,.btn-info.disabled:hover,.btn-info[disabled].focus,.btn-info[disabled]:focus,.btn-info[disabled]:hover,fieldset[disabled] .btn-info.focus,fieldset[disabled] .btn-info:focus,fieldset[disabled] .btn-info:hover{background-color:#5bc0de;border-color:#46b8da}.btn-info .badge{color:#5bc0de;background-color:#fff}.btn-warning{color:#fff;background-color:#f0ad4e;border-color:#eea236}.btn-warning.focus,.btn-warning:focus{color:#fff;background-color:#ec971f;border-color:#985f0d}.btn-warning:hover{color:#fff;background-color:#ec971f;border-color:#d58512}.btn-warning.active,.btn-warning:active,.open>.dropdown-toggle.btn-warning{color:#fff;background-color:#ec971f;border-color:#d58512}.btn-warning.active.focus,.btn-warning.active:focus,.btn-warning.active:hover,.btn-warning:active.focus,.btn-warning:active:focus,.btn-warning:active:hover,.open>.dropdown-toggle.btn-warning.focus,.open>.dropdown-toggle.btn-warning:focus,.open>.dropdown-toggle.btn-warning:hover{color:#fff;background-color:#d58512;border-color:#985f0d}.btn-warning.active,.btn-warning:active,.open>.dropdown-toggle.btn-warning{background-image:none}.btn-warning.disabled.focus,.btn-warning.disabled:focus,.btn-warning.disabled:hover,.btn-warning[disabled].focus,.btn-warning[disabled]:focus,.btn-warning[disabled]:hover,fieldset[disabled] .btn-warning.focus,fieldset[disabled] .btn-warning:focus,fieldset[disabled] .btn-warning:hover{background-color:#f0ad4e;border-color:#eea236}.btn-warning .badge{color:#f0ad4e;background-color:#fff}.btn-danger{color:#fff;background-color:#d9534f;border-color:#d43f3a}.btn-danger.focus,.btn-danger:focus{color:#fff;background-color:#c9302c;border-color:#761c19}.btn-danger:hover{color:#fff;background-color:#c9302c;border-color:#ac2925}.btn-danger.active,.btn-danger:active,.open>.dropdown-toggle.btn-danger{color:#fff;background-color:#c9302c;border-color:#ac2925}.btn-danger.active.focus,.btn-danger.active:focus,.btn-danger.active:hover,.btn-danger:active.focus,.btn-danger:active:focus,.btn-danger:active:hover,.open>.dropdown-toggle.btn-danger.focus,.open>.dropdown-toggle.btn-danger:focus,.open>.dropdown-toggle.btn-danger:hover{color:#fff;background-color:#ac2925;border-color:#761c19}.btn-danger.active,.btn-danger:active,.open>.dropdown-toggle.btn-danger{background-image:none}.btn-danger.disabled.focus,.btn-danger.disabled:focus,.btn-danger.disabled:hover,.btn-danger[disabled].focus,.btn-danger[disabled]:focus,.btn-danger[disabled]:hover,fieldset[disabled] .btn-danger.focus,fieldset[disabled] .btn-danger:focus,fieldset[disabled] .btn-danger:hover{background-color:#d9534f;border-color:#d43f3a}.btn-danger .badge{color:#d9534f;background-color:#fff}.btn-link{font-weight:400;color:#337ab7;border-radius:0}.btn-link,.btn-link.active,.btn-link:active,.btn-link[disabled],fieldset[disabled] .btn-link{background-color:transparent;-webkit-box-shadow:none;box-shadow:none}.btn-link,.btn-link:active,.btn-link:focus,.btn-link:hover{border-color:transparent}.btn-link:focus,.btn-link:hover{color:#23527c;text-decoration:underline;background-color:transparent}.btn-link[disabled]:focus,.btn-link[disabled]:hover,fieldset[disabled] .btn-link:focus,fieldset[disabled] .btn-link:hover{color:#777;text-decoration:none}.btn-group-lg>.btn,.btn-lg{padding:10px 16px;font-size:18px;line-height:1.3333333;border-radius:6px}.btn-group-sm>.btn,.btn-sm{padding:5px 10px;font-size:12px;line-height:1.5;border-radius:3px}.btn-group-xs>.btn,.btn-xs{padding:1px 5px;font-size:12px;line-height:1.5;border-radius:3px}.btn-block{display:block;width:100%}.btn-block+.btn-block{margin-top:5px}input[type=button].btn-block,input[type=reset].btn-block,input[type=submit].btn-block{width:100%}.fade{opacity:0;-webkit-transition:opacity .15s linear;-o-transition:opacity .15s linear;transition:opacity .15s linear}.fade.in{opacity:1}.collapse{display:none}.collapse.in{display:block}tr.collapse.in{display:table-row}tbody.collapse.in{display:table-row-group}.collapsing{position:relative;height:0;overflow:hidden;-webkit-transition-timing-function:ease;-o-transition-timing-function:ease;transition-timing-function:ease;-webkit-transition-duration:.35s;-o-transition-duration:.35s;transition-duration:.35s;-webkit-transition-property:height,visibility;-o-transition-property:height,visibility;transition-property:height,visibility}.caret{display:inline-block;width:0;height:0;margin-left:2px;vertical-align:middle;border-top:4px dashed;border-top:4px solid\9;border-right:4px solid transparent;border-left:4px solid transparent}.dropdown,.dropup{position:relative}.dropdown-toggle:focus{outline:0}.dropdown-menu{position:absolute;top:100%;left:0;z-index:1000;display:none;float:left;min-width:160px;padding:5px 0;margin:2px 0 0;font-size:14px;text-align:left;list-style:none;background-color:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175)}.dropdown-menu.pull-right{right:0;left:auto}.dropdown-menu .divider{height:1px;margin:9px 0;overflow:hidden;background-color:#e5e5e5}.dropdown-menu>li>a{display:block;padding:3px 20px;clear:both;font-weight:400;line-height:1.42857143;color:#333;white-space:nowrap}.dropdown-menu>li>a:focus,.dropdown-menu>li>a:hover{color:#262626;text-decoration:none;background-color:#f5f5f5}.dropdown-menu>.active>a,.dropdown-menu>.active>a:focus,.dropdown-menu>.active>a:hover{color:#fff;text-decoration:none;background-color:#337ab7;outline:0}.dropdown-menu>.disabled>a,.dropdown-menu>.disabled>a:focus,.dropdown-menu>.disabled>a:hover{color:#777}.dropdown-menu>.disabled>a:focus,.dropdown-menu>.disabled>a:hover{text-decoration:none;cursor:not-allowed;background-color:transparent;background-image:none;filter:progid:DXImageTransform.Microsoft.gradient(enabled=false)}.open>.dropdown-menu{display:block}.open>a{outline:0}.dropdown-menu-right{right:0;left:auto}.dropdown-menu-left{right:auto;left:0}.dropdown-header{display:block;padding:3px 20px;font-size:12px;line-height:1.42857143;color:#777;white-space:nowrap}.dropdown-backdrop{position:fixed;top:0;right:0;bottom:0;left:0;z-index:990}.pull-right>.dropdown-menu{right:0;left:auto}.dropup .caret,.navbar-fixed-bottom .dropdown .caret{content:"";border-top:0;border-bottom:4px dashed;border-bottom:4px solid\9}.dropup .dropdown-menu,.navbar-fixed-bottom .dropdown .dropdown-menu{top:auto;bottom:100%;margin-bottom:2px}@media (min-width:768px){.navbar-right .dropdown-menu{right:0;left:auto}.navbar-right .dropdown-menu-left{right:auto;left:0}}.btn-group,.btn-group-vertical{position:relative;display:inline-block;vertical-align:middle}.btn-group-vertical>.btn,.btn-group>.btn{position:relative;float:left}.btn-group-vertical>.btn.active,.btn-group-vertical>.btn:active,.btn-group-vertical>.btn:focus,.btn-group-vertical>.btn:hover,.btn-group>.btn.active,.btn-group>.btn:active,.btn-group>.btn:focus,.btn-group>.btn:hover{z-index:2}.btn-group .btn+.btn,.btn-group .btn+.btn-group,.btn-group .btn-group+.btn,.btn-group .btn-group+.btn-group{margin-left:-1px}.btn-toolbar{margin-left:-5px}.btn-toolbar .btn,.btn-toolbar .btn-group,.btn-toolbar .input-group{float:left}.btn-toolbar>.btn,.btn-toolbar>.btn-group,.btn-toolbar>.input-group{margin-left:5px}.btn-group>.btn:not(:first-child):not(:last-child):not(.dropdown-toggle){border-radius:0}.btn-group>.btn:first-child{margin-left:0}.btn-group>.btn:first-child:not(:last-child):not(.dropdown-toggle){border-top-right-radius:0;border-bottom-right-radius:0}.btn-group>.btn:last-child:not(:first-child),.btn-group>.dropdown-toggle:not(:first-child){border-top-left-radius:0;border-bottom-left-radius:0}.btn-group>.btn-group{float:left}.btn-group>.btn-group:not(:first-child):not(:last-child)>.btn{border-radius:0}.btn-group>.btn-group:first-child:not(:last-child)>.btn:last-child,.btn-group>.btn-group:first-child:not(:last-child)>.dropdown-toggle{border-top-right-radius:0;border-bottom-right-radius:0}.btn-group>.btn-group:last-child:not(:first-child)>.btn:first-child{border-top-left-radius:0;border-bottom-left-radius:0}.btn-group .dropdown-toggle:active,.btn-group.open .dropdown-toggle{outline:0}.btn-group>.btn+.dropdown-toggle{padding-right:8px;padding-left:8px}.btn-group>.btn-lg+.dropdown-toggle{padding-right:12px;padding-left:12px}.btn-group.open .dropdown-toggle{-webkit-box-shadow:inset 0 3px 5px rgba(0,0,0,.125);box-shadow:inset 0 3px 5px rgba(0,0,0,.125)}.btn-group.open .dropdown-toggle.btn-link{-webkit-box-shadow:none;box-shadow:none}.btn .caret{margin-left:0}.btn-lg .caret{border-width:5px 5px 0;border-bottom-width:0}.dropup .btn-lg .caret{border-width:0 5px 5px}.btn-group-vertical>.btn,.btn-group-vertical>.btn-group,.btn-group-vertical>.btn-group>.btn{display:block;float:none;width:100%;max-width:100%}.btn-group-vertical>.btn-group>.btn{float:none}.btn-group-vertical>.btn+.btn,.btn-group-vertical>.btn+.btn-group,.btn-group-vertical>.btn-group+.btn,.btn-group-vertical>.btn-group+.btn-group{margin-top:-1px;margin-left:0}.btn-group-vertical>.btn:not(:first-child):not(:last-child){border-radius:0}.btn-group-vertical>.btn:first-child:not(:last-child){border-top-left-radius:4px;border-top-right-radius:4px;border-bottom-right-radius:0;border-bottom-left-radius:0}.btn-group-vertical>.btn:last-child:not(:first-child){border-top-left-radius:0;border-top-right-radius:0;border-bottom-right-radius:4px;border-bottom-left-radius:4px}.btn-group-vertical>.btn-group:not(:first-child):not(:last-child)>.btn{border-radius:0}.btn-group-vertical>.btn-group:first-child:not(:last-child)>.btn:last-child,.btn-group-vertical>.btn-group:first-child:not(:last-child)>.dropdown-toggle{border-bottom-right-radius:0;border-bottom-left-radius:0}.btn-group-vertical>.btn-group:last-child:not(:first-child)>.btn:first-child{border-top-left-radius:0;border-top-right-radius:0}.btn-group-justified{display:table;width:100%;table-layout:fixed;border-collapse:separate}.btn-group-justified>.btn,.btn-group-justified>.btn-group{display:table-cell;float:none;width:1%}.btn-group-justified>.btn-group .btn{width:100%}.btn-group-justified>.btn-group .dropdown-menu{left:auto}[data-toggle=buttons]>.btn input[type=checkbox],[data-toggle=buttons]>.btn input[type=radio],[data-toggle=buttons]>.btn-group>.btn input[type=checkbox],[data-toggle=buttons]>.btn-group>.btn input[type=radio]{position:absolute;clip:rect(0,0,0,0);pointer-events:none}.input-group{position:relative;display:table;border-collapse:separate}.input-group[class*=col-]{float:none;padding-right:0;padding-left:0}.input-group .form-control{position:relative;z-index:2;float:left;width:100%;margin-bottom:0}.input-group .form-control:focus{z-index:3}.input-group-lg>.form-control,.input-group-lg>.input-group-addon,.input-group-lg>.input-group-btn>.btn{height:46px;padding:10px 16px;font-size:18px;line-height:1.3333333;border-radius:6px}select.input-group-lg>.form-control,select.input-group-lg>.input-group-addon,select.input-group-lg>.input-group-btn>.btn{height:46px;line-height:46px}select[multiple].input-group-lg>.form-control,select[multiple].input-group-lg>.input-group-addon,select[multiple].input-group-lg>.input-group-btn>.btn,textarea.input-group-lg>.form-control,textarea.input-group-lg>.input-group-addon,textarea.input-group-lg>.input-group-btn>.btn{height:auto}.input-group-sm>.form-control,.input-group-sm>.input-group-addon,.input-group-sm>.input-group-btn>.btn{height:30px;padding:5px 10px;font-size:12px;line-height:1.5;border-radius:3px}select.input-group-sm>.form-control,select.input-group-sm>.input-group-addon,select.input-group-sm>.input-group-btn>.btn{height:30px;line-height:30px}select[multiple].input-group-sm>.form-control,select[multiple].input-group-sm>.input-group-addon,select[multiple].input-group-sm>.input-group-btn>.btn,textarea.input-group-sm>.form-control,textarea.input-group-sm>.input-group-addon,textarea.input-group-sm>.input-group-btn>.btn{height:auto}.input-group .form-control,.input-group-addon,.input-group-btn{display:table-cell}.input-group .form-control:not(:first-child):not(:last-child),.input-group-addon:not(:first-child):not(:last-child),.input-group-btn:not(:first-child):not(:last-child){border-radius:0}.input-group-addon,.input-group-btn{width:1%;white-space:nowrap;vertical-align:middle}.input-group-addon{padding:6px 12px;font-size:14px;font-weight:400;line-height:1;color:#555;text-align:center;background-color:#eee;border:1px solid #ccc;border-radius:4px}.input-group-addon.input-sm{padding:5px 10px;font-size:12px;border-radius:3px}.input-group-addon.input-lg{padding:10px 16px;font-size:18px;border-radius:6px}.input-group-addon input[type=checkbox],.input-group-addon input[type=radio]{margin-top:0}.input-group .form-control:first-child,.input-group-addon:first-child,.input-group-btn:first-child>.btn,.input-group-btn:first-child>.btn-group>.btn,.input-group-btn:first-child>.dropdown-toggle,.input-group-btn:last-child>.btn-group:not(:last-child)>.btn,.input-group-btn:last-child>.btn:not(:last-child):not(.dropdown-toggle){border-top-right-radius:0;border-bottom-right-radius:0}.input-group-addon:first-child{border-right:0}.input-group .form-control:last-child,.input-group-addon:last-child,.input-group-btn:first-child>.btn-group:not(:first-child)>.btn,.input-group-btn:first-child>.btn:not(:first-child),.input-group-btn:last-child>.btn,.input-group-btn:last-child>.btn-group>.btn,.input-group-btn:last-child>.dropdown-toggle{border-top-left-radius:0;border-bottom-left-radius:0}.input-group-addon:last-child{border-left:0}.input-group-btn{position:relative;font-size:0;white-space:nowrap}.input-group-btn>.btn{position:relative}.input-group-btn>.btn+.btn{margin-left:-1px}.input-group-btn>.btn:active,.input-group-btn>.btn:focus,.input-group-btn>.btn:hover{z-index:2}.input-group-btn:first-child>.btn,.input-group-btn:first-child>.btn-group{margin-right:-1px}.input-group-btn:last-child>.btn,.input-group-btn:last-child>.btn-group{z-index:2;margin-left:-1px}.nav{padding-left:0;margin-bottom:0;list-style:none}.nav>li{position:relative;display:block}.nav>li>a{position:relative;display:block;padding:10px 15px}.nav>li>a:focus,.nav>li>a:hover{text-decoration:none;background-color:#eee}.nav>li.disabled>a{color:#777}.nav>li.disabled>a:focus,.nav>li.disabled>a:hover{color:#777;text-decoration:none;cursor:not-allowed;background-color:transparent}.nav .open>a,.nav .open>a:focus,.nav .open>a:hover{background-color:#eee;border-color:#337ab7}.nav .nav-divider{height:1px;margin:9px 0;overflow:hidden;background-color:#e5e5e5}.nav>li>a>img{max-width:none}.nav-tabs{border-bottom:1px solid #ddd}.nav-tabs>li{float:left;margin-bottom:-1px}.nav-tabs>li>a{margin-right:2px;line-height:1.42857143;border:1px solid transparent;border-radius:4px 4px 0 0}.nav-tabs>li>a:hover{border-color:#eee #eee #ddd}.nav-tabs>li.active>a,.nav-tabs>li.active>a:focus,.nav-tabs>li.active>a:hover{color:#555;cursor:default;background-color:#fff;border:1px solid #ddd;border-bottom-color:transparent}.nav-tabs.nav-justified{width:100%;border-bottom:0}.nav-tabs.nav-justified>li{float:none}.nav-tabs.nav-justified>li>a{margin-bottom:5px;text-align:center}.nav-tabs.nav-justified>.dropdown .dropdown-menu{top:auto;left:auto}@media (min-width:768px){.nav-tabs.nav-justified>li{display:table-cell;width:1%}.nav-tabs.nav-justified>li>a{margin-bottom:0}}.nav-tabs.nav-justified>li>a{margin-right:0;border-radius:4px}.nav-tabs.nav-justified>.active>a,.nav-tabs.nav-justified>.active>a:focus,.nav-tabs.nav-justified>.active>a:hover{border:1px solid #ddd}@media (min-width:768px){.nav-tabs.nav-justified>li>a{border-bottom:1px solid #ddd;border-radius:4px 4px 0 0}.nav-tabs.nav-justified>.active>a,.nav-tabs.nav-justified>.active>a:focus,.nav-tabs.nav-justified>.active>a:hover{border-bottom-color:#fff}}.nav-pills>li{float:left}.nav-pills>li>a{border-radius:4px}.nav-pills>li+li{margin-left:2px}.nav-pills>li.active>a,.nav-pills>li.active>a:focus,.nav-pills>li.active>a:hover{color:#fff;background-color:#337ab7}.nav-stacked>li{float:none}.nav-stacked>li+li{margin-top:2px;margin-left:0}.nav-justified{width:100%}.nav-justified>li{float:none}.nav-justified>li>a{margin-bottom:5px;text-align:center}.nav-justified>.dropdown .dropdown-menu{top:auto;left:auto}@media (min-width:768px){.nav-justified>li{display:table-cell;width:1%}.nav-justified>li>a{margin-bottom:0}}.nav-tabs-justified{border-bottom:0}.nav-tabs-justified>li>a{margin-right:0;border-radius:4px}.nav-tabs-justified>.active>a,.nav-tabs-justified>.active>a:focus,.nav-tabs-justified>.active>a:hover{border:1px solid #ddd}@media (min-width:768px){.nav-tabs-justified>li>a{border-bottom:1px solid #ddd;border-radius:4px 4px 0 0}.nav-tabs-justified>.active>a,.nav-tabs-justified>.active>a:focus,.nav-tabs-justified>.active>a:hover{border-bottom-color:#fff}}.tab-content>.tab-pane{display:none}.tab-content>.active{display:block}.nav-tabs .dropdown-menu{margin-top:-1px;border-top-left-radius:0;border-top-right-radius:0}.navbar{position:relative;min-height:50px;margin-bottom:20px;border:1px solid transparent}@media (min-width:768px){.navbar{border-radius:4px}}@media (min-width:768px){.navbar-header{float:left}}.navbar-collapse{padding-right:15px;padding-left:15px;overflow-x:visible;-webkit-overflow-scrolling:touch;border-top:1px solid transparent;-webkit-box-shadow:inset 0 1px 0 rgba(255,255,255,.1);box-shadow:inset 0 1px 0 rgba(255,255,255,.1)}.navbar-collapse.in{overflow-y:auto}@media (min-width:768px){.navbar-collapse{width:auto;border-top:0;-webkit-box-shadow:none;box-shadow:none}.navbar-collapse.collapse{display:block!important;height:auto!important;padding-bottom:0;overflow:visible!important}.navbar-collapse.in{overflow-y:visible}.navbar-fixed-bottom .navbar-collapse,.navbar-fixed-top .navbar-collapse,.navbar-static-top .navbar-collapse{padding-right:0;padding-left:0}}.navbar-fixed-bottom .navbar-collapse,.navbar-fixed-top .navbar-collapse{max-height:340px}@media (max-device-width:480px) and (orientation:landscape){.navbar-fixed-bottom .navbar-collapse,.navbar-fixed-top .navbar-collapse{max-height:200px}}.container-fluid>.navbar-collapse,.container-fluid>.navbar-header,.container>.navbar-collapse,.container>.navbar-header{margin-right:-15px;margin-left:-15px}@media (min-width:768px){.container-fluid>.navbar-collapse,.container-fluid>.navbar-header,.container>.navbar-collapse,.container>.navbar-header{margin-right:0;margin-left:0}}.navbar-static-top{z-index:1000;border-width:0 0 1px}@media (min-width:768px){.navbar-static-top{border-radius:0}}.navbar-fixed-bottom,.navbar-fixed-top{position:fixed;right:0;left:0;z-index:1030}@media (min-width:768px){.navbar-fixed-bottom,.navbar-fixed-top{border-radius:0}}.navbar-fixed-top{top:0;border-width:0 0 1px}.navbar-fixed-bottom{bottom:0;margin-bottom:0;border-width:1px 0 0}.navbar-brand{float:left;height:50px;padding:15px 15px;font-size:18px;line-height:20px}.navbar-brand:focus,.navbar-brand:hover{text-decoration:none}.navbar-brand>img{display:block}@media (min-width:768px){.navbar>.container .navbar-brand,.navbar>.container-fluid .navbar-brand{margin-left:-15px}}.navbar-toggle{position:relative;float:right;padding:9px 10px;margin-top:8px;margin-right:15px;margin-bottom:8px;background-color:transparent;background-image:none;border:1px solid transparent;border-radius:4px}.navbar-toggle:focus{outline:0}.navbar-toggle .icon-bar{display:block;width:22px;height:2px;border-radius:1px}.navbar-toggle .icon-bar+.icon-bar{margin-top:4px}@media (min-width:768px){.navbar-toggle{display:none}}.navbar-nav{margin:7.5px -15px}.navbar-nav>li>a{padding-top:10px;padding-bottom:10px;line-height:20px}@media (max-width:767px){.navbar-nav .open .dropdown-menu{position:static;float:none;width:auto;margin-top:0;background-color:transparent;border:0;-webkit-box-shadow:none;box-shadow:none}.navbar-nav .open .dropdown-menu .dropdown-header,.navbar-nav .open .dropdown-menu>li>a{padding:5px 15px 5px 25px}.navbar-nav .open .dropdown-menu>li>a{line-height:20px}.navbar-nav .open .dropdown-menu>li>a:focus,.navbar-nav .open .dropdown-menu>li>a:hover{background-image:none}}@media (min-width:768px){.navbar-nav{float:left;margin:0}.navbar-nav>li{float:left}.navbar-nav>li>a{padding-top:15px;padding-bottom:15px}}.navbar-form{padding:10px 15px;margin-top:8px;margin-right:-15px;margin-bottom:8px;margin-left:-15px;border-top:1px solid transparent;border-bottom:1px solid transparent;-webkit-box-shadow:inset 0 1px 0 rgba(255,255,255,.1),0 1px 0 rgba(255,255,255,.1);box-shadow:inset 0 1px 0 rgba(255,255,255,.1),0 1px 0 rgba(255,255,255,.1)}@media (min-width:768px){.navbar-form .form-group{display:inline-block;margin-bottom:0;vertical-align:middle}.navbar-form .form-control{display:inline-block;width:auto;vertical-align:middle}.navbar-form .form-control-static{display:inline-block}.navbar-form .input-group{display:inline-table;vertical-align:middle}.navbar-form .input-group .form-control,.navbar-form .input-group .input-group-addon,.navbar-form .input-group .input-group-btn{width:auto}.navbar-form .input-group>.form-control{width:100%}.navbar-form .control-label{margin-bottom:0;vertical-align:middle}.navbar-form .checkbox,.navbar-form .radio{display:inline-block;margin-top:0;margin-bottom:0;vertical-align:middle}.navbar-form .checkbox label,.navbar-form .radio label{padding-left:0}.navbar-form .checkbox input[type=checkbox],.navbar-form .radio input[type=radio]{position:relative;margin-left:0}.navbar-form .has-feedback .form-control-feedback{top:0}}@media (max-width:767px){.navbar-form .form-group{margin-bottom:5px}.navbar-form .form-group:last-child{margin-bottom:0}}@media (min-width:768px){.navbar-form{width:auto;padding-top:0;padding-bottom:0;margin-right:0;margin-left:0;border:0;-webkit-box-shadow:none;box-shadow:none}}.navbar-nav>li>.dropdown-menu{margin-top:0;border-top-left-radius:0;border-top-right-radius:0}.navbar-fixed-bottom .navbar-nav>li>.dropdown-menu{margin-bottom:0;border-top-left-radius:4px;border-top-right-radius:4px;border-bottom-right-radius:0;border-bottom-left-radius:0}.navbar-btn{margin-top:8px;margin-bottom:8px}.navbar-btn.btn-sm{margin-top:10px;margin-bottom:10px}.navbar-btn.btn-xs{margin-top:14px;margin-bottom:14px}.navbar-text{margin-top:15px;margin-bottom:15px}@media (min-width:768px){.navbar-text{float:left;margin-right:15px;margin-left:15px}}@media (min-width:768px){.navbar-left{float:left!important}.navbar-right{float:right!important;margin-right:-15px}.navbar-right~.navbar-right{margin-right:0}}.navbar-default{background-color:#f8f8f8;border-color:#e7e7e7}.navbar-default .navbar-brand{color:#777}.navbar-default .navbar-brand:focus,.navbar-default .navbar-brand:hover{color:#5e5e5e;background-color:transparent}.navbar-default .navbar-text{color:#777}.navbar-default .navbar-nav>li>a{color:#777}.navbar-default .navbar-nav>li>a:focus,.navbar-default .navbar-nav>li>a:hover{color:#333;background-color:transparent}.navbar-default .navbar-nav>.active>a,.navbar-default .navbar-nav>.active>a:focus,.navbar-default .navbar-nav>.active>a:hover{color:#555;background-color:#e7e7e7}.navbar-default .navbar-nav>.disabled>a,.navbar-default .navbar-nav>.disabled>a:focus,.navbar-default .navbar-nav>.disabled>a:hover{color:#ccc;background-color:transparent}.navbar-default .navbar-toggle{border-color:#ddd}.navbar-default .navbar-toggle:focus,.navbar-default .navbar-toggle:hover{background-color:#ddd}.navbar-default .navbar-toggle .icon-bar{background-color:#888}.navbar-default .navbar-collapse,.navbar-default .navbar-form{border-color:#e7e7e7}.navbar-default .navbar-nav>.open>a,.navbar-default .navbar-nav>.open>a:focus,.navbar-default .navbar-nav>.open>a:hover{color:#555;background-color:#e7e7e7}@media (max-width:767px){.navbar-default .navbar-nav .open .dropdown-menu>li>a{color:#777}.navbar-default .navbar-nav .open .dropdown-menu>li>a:focus,.navbar-default .navbar-nav .open .dropdown-menu>li>a:hover{color:#333;background-color:transparent}.navbar-default .navbar-nav .open .dropdown-menu>.active>a,.navbar-default .navbar-nav .open .dropdown-menu>.active>a:focus,.navbar-default .navbar-nav .open .dropdown-menu>.active>a:hover{color:#555;background-color:#e7e7e7}.navbar-default .navbar-nav .open .dropdown-menu>.disabled>a,.navbar-default .navbar-nav .open .dropdown-menu>.disabled>a:focus,.navbar-default .navbar-nav .open .dropdown-menu>.disabled>a:hover{color:#ccc;background-color:transparent}}.navbar-default .navbar-link{color:#777}.navbar-default .navbar-link:hover{color:#333}.navbar-default .btn-link{color:#777}.navbar-default .btn-link:focus,.navbar-default .btn-link:hover{color:#333}.navbar-default .btn-link[disabled]:focus,.navbar-default .btn-link[disabled]:hover,fieldset[disabled] .navbar-default .btn-link:focus,fieldset[disabled] .navbar-default .btn-link:hover{color:#ccc}.navbar-inverse{background-color:#222;border-color:#080808}.navbar-inverse .navbar-brand{color:#9d9d9d}.navbar-inverse .navbar-brand:focus,.navbar-inverse .navbar-brand:hover{color:#fff;background-color:transparent}.navbar-inverse .navbar-text{color:#9d9d9d}.navbar-inverse .navbar-nav>li>a{color:#9d9d9d}.navbar-inverse .navbar-nav>li>a:focus,.navbar-inverse .navbar-nav>li>a:hover{color:#fff;background-color:transparent}.navbar-inverse .navbar-nav>.active>a,.navbar-inverse .navbar-nav>.active>a:focus,.navbar-inverse .navbar-nav>.active>a:hover{color:#fff;background-color:#080808}.navbar-inverse .navbar-nav>.disabled>a,.navbar-inverse .navbar-nav>.disabled>a:focus,.navbar-inverse .navbar-nav>.disabled>a:hover{color:#444;background-color:transparent}.navbar-inverse .navbar-toggle{border-color:#333}.navbar-inverse .navbar-toggle:focus,.navbar-inverse .navbar-toggle:hover{background-color:#333}.navbar-inverse .navbar-toggle .icon-bar{background-color:#fff}.navbar-inverse .navbar-collapse,.navbar-inverse .navbar-form{border-color:#101010}.navbar-inverse .navbar-nav>.open>a,.navbar-inverse .navbar-nav>.open>a:focus,.navbar-inverse .navbar-nav>.open>a:hover{color:#fff;background-color:#080808}@media (max-width:767px){.navbar-inverse .navbar-nav .open .dropdown-menu>.dropdown-header{border-color:#080808}.navbar-inverse .navbar-nav .open .dropdown-menu .divider{background-color:#080808}.navbar-inverse .navbar-nav .open .dropdown-menu>li>a{color:#9d9d9d}.navbar-inverse .navbar-nav .open .dropdown-menu>li>a:focus,.navbar-inverse .navbar-nav .open .dropdown-menu>li>a:hover{color:#fff;background-color:transparent}.navbar-inverse .navbar-nav .open .dropdown-menu>.active>a,.navbar-inverse .navbar-nav .open .dropdown-menu>.active>a:focus,.navbar-inverse .navbar-nav .open .dropdown-menu>.active>a:hover{color:#fff;background-color:#080808}.navbar-inverse .navbar-nav .open .dropdown-menu>.disabled>a,.navbar-inverse .navbar-nav .open .dropdown-menu>.disabled>a:focus,.navbar-inverse .navbar-nav .open .dropdown-menu>.disabled>a:hover{color:#444;background-color:transparent}}.navbar-inverse .navbar-link{color:#9d9d9d}.navbar-inverse .navbar-link:hover{color:#fff}.navbar-inverse .btn-link{color:#9d9d9d}.navbar-inverse .btn-link:focus,.navbar-inverse .btn-link:hover{color:#fff}.navbar-inverse .btn-link[disabled]:focus,.navbar-inverse .btn-link[disabled]:hover,fieldset[disabled] .navbar-inverse .btn-link:focus,fieldset[disabled] .navbar-inverse .btn-link:hover{color:#444}.breadcrumb{padding:8px 15px;margin-bottom:20px;list-style:none;background-color:#f5f5f5;border-radius:4px}.breadcrumb>li{display:inline-block}.breadcrumb>li+li:before{padding:0 5px;color:#ccc;content:"/\00a0"}.breadcrumb>.active{color:#777}.pagination{display:inline-block;padding-left:0;margin:20px 0;border-radius:4px}.pagination>li{display:inline}.pagination>li>a,.pagination>li>span{position:relative;float:left;padding:6px 12px;margin-left:-1px;line-height:1.42857143;color:#337ab7;text-decoration:none;background-color:#fff;border:1px solid #ddd}.pagination>li:first-child>a,.pagination>li:first-child>span{margin-left:0;border-top-left-radius:4px;border-bottom-left-radius:4px}.pagination>li:last-child>a,.pagination>li:last-child>span{border-top-right-radius:4px;border-bottom-right-radius:4px}.pagination>li>a:focus,.pagination>li>a:hover,.pagination>li>span:focus,.pagination>li>span:hover{z-index:2;color:#23527c;background-color:#eee;border-color:#ddd}.pagination>.active>a,.pagination>.active>a:focus,.pagination>.active>a:hover,.pagination>.active>span,.pagination>.active>span:focus,.pagination>.active>span:hover{z-index:3;color:#fff;cursor:default;background-color:#337ab7;border-color:#337ab7}.pagination>.disabled>a,.pagination>.disabled>a:focus,.pagination>.disabled>a:hover,.pagination>.disabled>span,.pagination>.disabled>span:focus,.pagination>.disabled>span:hover{color:#777;cursor:not-allowed;background-color:#fff;border-color:#ddd}.pagination-lg>li>a,.pagination-lg>li>span{padding:10px 16px;font-size:18px;line-height:1.3333333}.pagination-lg>li:first-child>a,.pagination-lg>li:first-child>span{border-top-left-radius:6px;border-bottom-left-radius:6px}.pagination-lg>li:last-child>a,.pagination-lg>li:last-child>span{border-top-right-radius:6px;border-bottom-right-radius:6px}.pagination-sm>li>a,.pagination-sm>li>span{padding:5px 10px;font-size:12px;line-height:1.5}.pagination-sm>li:first-child>a,.pagination-sm>li:first-child>span{border-top-left-radius:3px;border-bottom-left-radius:3px}.pagination-sm>li:last-child>a,.pagination-sm>li:last-child>span{border-top-right-radius:3px;border-bottom-right-radius:3px}.pager{padding-left:0;margin:20px 0;text-align:center;list-style:none}.pager li{display:inline}.pager li>a,.pager li>span{display:inline-block;padding:5px 14px;background-color:#fff;border:1px solid #ddd;border-radius:15px}.pager li>a:focus,.pager li>a:hover{text-decoration:none;background-color:#eee}.pager .next>a,.pager .next>span{float:right}.pager .previous>a,.pager .previous>span{float:left}.pager .disabled>a,.pager .disabled>a:focus,.pager .disabled>a:hover,.pager .disabled>span{color:#777;cursor:not-allowed;background-color:#fff}.label{display:inline;padding:.2em .6em .3em;font-size:75%;font-weight:700;line-height:1;color:#fff;text-align:center;white-space:nowrap;vertical-align:baseline;border-radius:.25em}a.label:focus,a.label:hover{color:#fff;text-decoration:none;cursor:pointer}.label:empty{display:none}.btn .label{position:relative;top:-1px}.label-default{background-color:#777}.label-default[href]:focus,.label-default[href]:hover{background-color:#5e5e5e}.label-primary{background-color:#337ab7}.label-primary[href]:focus,.label-primary[href]:hover{background-color:#286090}.label-success{background-color:#5cb85c}.label-success[href]:focus,.label-success[href]:hover{background-color:#449d44}.label-info{background-color:#5bc0de}.label-info[href]:focus,.label-info[href]:hover{background-color:#31b0d5}.label-warning{background-color:#f0ad4e}.label-warning[href]:focus,.label-warning[href]:hover{background-color:#ec971f}.label-danger{background-color:#d9534f}.label-danger[href]:focus,.label-danger[href]:hover{background-color:#c9302c}.badge{display:inline-block;min-width:10px;padding:3px 7px;font-size:12px;font-weight:700;line-height:1;color:#fff;text-align:center;white-space:nowrap;vertical-align:middle;background-color:#777;border-radius:10px}.badge:empty{display:none}.btn .badge{position:relative;top:-1px}.btn-group-xs>.btn .badge,.btn-xs .badge{top:0;padding:1px 5px}a.badge:focus,a.badge:hover{color:#fff;text-decoration:none;cursor:pointer}.list-group-item.active>.badge,.nav-pills>.active>a>.badge{color:#337ab7;background-color:#fff}.list-group-item>.badge{float:right}.list-group-item>.badge+.badge{margin-right:5px}.nav-pills>li>a>.badge{margin-left:3px}.jumbotron{padding-top:30px;padding-bottom:30px;margin-bottom:30px;color:inherit;background-color:#eee}.jumbotron .h1,.jumbotron h1{color:inherit}.jumbotron p{margin-bottom:15px;font-size:21px;font-weight:200}.jumbotron>hr{border-top-color:#d5d5d5}.container .jumbotron,.container-fluid .jumbotron{padding-right:15px;padding-left:15px;border-radius:6px}.jumbotron .container{max-width:100%}@media screen and (min-width:768px){.jumbotron{padding-top:48px;padding-bottom:48px}.container .jumbotron,.container-fluid .jumbotron{padding-right:60px;padding-left:60px}.jumbotron .h1,.jumbotron h1{font-size:63px}}.thumbnail{display:block;padding:4px;margin-bottom:20px;line-height:1.42857143;background-color:#fff;border:1px solid #ddd;border-radius:4px;-webkit-transition:border .2s ease-in-out;-o-transition:border .2s ease-in-out;transition:border .2s ease-in-out}.thumbnail a>img,.thumbnail>img{margin-right:auto;margin-left:auto}a.thumbnail.active,a.thumbnail:focus,a.thumbnail:hover{border-color:#337ab7}.thumbnail .caption{padding:9px;color:#333}.alert{padding:15px;margin-bottom:20px;border:1px solid transparent;border-radius:4px}.alert h4{margin-top:0;color:inherit}.alert .alert-link{font-weight:700}.alert>p,.alert>ul{margin-bottom:0}.alert>p+p{margin-top:5px}.alert-dismissable,.alert-dismissible{padding-right:35px}.alert-dismissable .close,.alert-dismissible .close{position:relative;top:-2px;right:-21px;color:inherit}.alert-success{color:#3c763d;background-color:#dff0d8;border-color:#d6e9c6}.alert-success hr{border-top-color:#c9e2b3}.alert-success .alert-link{color:#2b542c}.alert-info{color:#31708f;background-color:#d9edf7;border-color:#bce8f1}.alert-info hr{border-top-color:#a6e1ec}.alert-info .alert-link{color:#245269}.alert-warning{color:#8a6d3b;background-color:#fcf8e3;border-color:#faebcc}.alert-warning hr{border-top-color:#f7e1b5}.alert-warning .alert-link{color:#66512c}.alert-danger{color:#a94442;background-color:#f2dede;border-color:#ebccd1}.alert-danger hr{border-top-color:#e4b9c0}.alert-danger .alert-link{color:#843534}@-webkit-keyframes progress-bar-stripes{from{background-position:40px 0}to{background-position:0 0}}@-o-keyframes progress-bar-stripes{from{background-position:40px 0}to{background-position:0 0}}@keyframes progress-bar-stripes{from{background-position:40px 0}to{background-position:0 0}}.progress{height:20px;margin-bottom:20px;overflow:hidden;background-color:#f5f5f5;border-radius:4px;-webkit-box-shadow:inset 0 1px 2px rgba(0,0,0,.1);box-shadow:inset 0 1px 2px rgba(0,0,0,.1)}.progress-bar{float:left;width:0;height:100%;font-size:12px;line-height:20px;color:#fff;text-align:center;background-color:#337ab7;-webkit-box-shadow:inset 0 -1px 0 rgba(0,0,0,.15);box-shadow:inset 0 -1px 0 rgba(0,0,0,.15);-webkit-transition:width .6s ease;-o-transition:width .6s ease;transition:width .6s ease}.progress-bar-striped,.progress-striped .progress-bar{background-image:-webkit-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:-o-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);-webkit-background-size:40px 40px;background-size:40px 40px}.progress-bar.active,.progress.active .progress-bar{-webkit-animation:progress-bar-stripes 2s linear infinite;-o-animation:progress-bar-stripes 2s linear infinite;animation:progress-bar-stripes 2s linear infinite}.progress-bar-success{background-color:#5cb85c}.progress-striped .progress-bar-success{background-image:-webkit-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:-o-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent)}.progress-bar-info{background-color:#5bc0de}.progress-striped .progress-bar-info{background-image:-webkit-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:-o-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent)}.progress-bar-warning{background-color:#f0ad4e}.progress-striped .progress-bar-warning{background-image:-webkit-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:-o-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent)}.progress-bar-danger{background-color:#d9534f}.progress-striped .progress-bar-danger{background-image:-webkit-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:-o-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent)}.media{margin-top:15px}.media:first-child{margin-top:0}.media,.media-body{overflow:hidden;zoom:1}.media-body{width:10000px}.media-object{display:block}.media-object.img-thumbnail{max-width:none}.media-right,.media>.pull-right{padding-left:10px}.media-left,.media>.pull-left{padding-right:10px}.media-body,.media-left,.media-right{display:table-cell;vertical-align:top}.media-middle{vertical-align:middle}.media-bottom{vertical-align:bottom}.media-heading{margin-top:0;margin-bottom:5px}.media-list{padding-left:0;list-style:none}.list-group{padding-left:0;margin-bottom:20px}.list-group-item{position:relative;display:block;padding:10px 15px;margin-bottom:-1px;background-color:#fff;border:1px solid #ddd}.list-group-item:first-child{border-top-left-radius:4px;border-top-right-radius:4px}.list-group-item:last-child{margin-bottom:0;border-bottom-right-radius:4px;border-bottom-left-radius:4px}a.list-group-item,button.list-group-item{color:#555}a.list-group-item .list-group-item-heading,button.list-group-item .list-group-item-heading{color:#333}a.list-group-item:focus,a.list-group-item:hover,button.list-group-item:focus,button.list-group-item:hover{color:#555;text-decoration:none;background-color:#f5f5f5}button.list-group-item{width:100%;text-align:left}.list-group-item.disabled,.list-group-item.disabled:focus,.list-group-item.disabled:hover{color:#777;cursor:not-allowed;background-color:#eee}.list-group-item.disabled .list-group-item-heading,.list-group-item.disabled:focus .list-group-item-heading,.list-group-item.disabled:hover .list-group-item-heading{color:inherit}.list-group-item.disabled .list-group-item-text,.list-group-item.disabled:focus .list-group-item-text,.list-group-item.disabled:hover .list-group-item-text{color:#777}.list-group-item.active,.list-group-item.active:focus,.list-group-item.active:hover{z-index:2;color:#fff;background-color:#337ab7;border-color:#337ab7}.list-group-item.active .list-group-item-heading,.list-group-item.active .list-group-item-heading>.small,.list-group-item.active .list-group-item-heading>small,.list-group-item.active:focus .list-group-item-heading,.list-group-item.active:focus .list-group-item-heading>.small,.list-group-item.active:focus .list-group-item-heading>small,.list-group-item.active:hover .list-group-item-heading,.list-group-item.active:hover .list-group-item-heading>.small,.list-group-item.active:hover .list-group-item-heading>small{color:inherit}.list-group-item.active .list-group-item-text,.list-group-item.active:focus .list-group-item-text,.list-group-item.active:hover .list-group-item-text{color:#c7ddef}.list-group-item-success{color:#3c763d;background-color:#dff0d8}a.list-group-item-success,button.list-group-item-success{color:#3c763d}a.list-group-item-success .list-group-item-heading,button.list-group-item-success .list-group-item-heading{color:inherit}a.list-group-item-success:focus,a.list-group-item-success:hover,button.list-group-item-success:focus,button.list-group-item-success:hover{color:#3c763d;background-color:#d0e9c6}a.list-group-item-success.active,a.list-group-item-success.active:focus,a.list-group-item-success.active:hover,button.list-group-item-success.active,button.list-group-item-success.active:focus,button.list-group-item-success.active:hover{color:#fff;background-color:#3c763d;border-color:#3c763d}.list-group-item-info{color:#31708f;background-color:#d9edf7}a.list-group-item-info,button.list-group-item-info{color:#31708f}a.list-group-item-info .list-group-item-heading,button.list-group-item-info .list-group-item-heading{color:inherit}a.list-group-item-info:focus,a.list-group-item-info:hover,button.list-group-item-info:focus,button.list-group-item-info:hover{color:#31708f;background-color:#c4e3f3}a.list-group-item-info.active,a.list-group-item-info.active:focus,a.list-group-item-info.active:hover,button.list-group-item-info.active,button.list-group-item-info.active:focus,button.list-group-item-info.active:hover{color:#fff;background-color:#31708f;border-color:#31708f}.list-group-item-warning{color:#8a6d3b;background-color:#fcf8e3}a.list-group-item-warning,button.list-group-item-warning{color:#8a6d3b}a.list-group-item-warning .list-group-item-heading,button.list-group-item-warning .list-group-item-heading{color:inherit}a.list-group-item-warning:focus,a.list-group-item-warning:hover,button.list-group-item-warning:focus,button.list-group-item-warning:hover{color:#8a6d3b;background-color:#faf2cc}a.list-group-item-warning.active,a.list-group-item-warning.active:focus,a.list-group-item-warning.active:hover,button.list-group-item-warning.active,button.list-group-item-warning.active:focus,button.list-group-item-warning.active:hover{color:#fff;background-color:#8a6d3b;border-color:#8a6d3b}.list-group-item-danger{color:#a94442;background-color:#f2dede}a.list-group-item-danger,button.list-group-item-danger{color:#a94442}a.list-group-item-danger .list-group-item-heading,button.list-group-item-danger .list-group-item-heading{color:inherit}a.list-group-item-danger:focus,a.list-group-item-danger:hover,button.list-group-item-danger:focus,button.list-group-item-danger:hover{color:#a94442;background-color:#ebcccc}a.list-group-item-danger.active,a.list-group-item-danger.active:focus,a.list-group-item-danger.active:hover,button.list-group-item-danger.active,button.list-group-item-danger.active:focus,button.list-group-item-danger.active:hover{color:#fff;background-color:#a94442;border-color:#a94442}.list-group-item-heading{margin-top:0;margin-bottom:5px}.list-group-item-text{margin-bottom:0;line-height:1.3}.panel{margin-bottom:20px;background-color:#fff;border:1px solid transparent;border-radius:4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05)}.panel-body{padding:15px}.panel-heading{padding:10px 15px;border-bottom:1px solid transparent;border-top-left-radius:3px;border-top-right-radius:3px}.panel-heading>.dropdown .dropdown-toggle{color:inherit}.panel-title{margin-top:0;margin-bottom:0;font-size:16px;color:inherit}.panel-title>.small,.panel-title>.small>a,.panel-title>a,.panel-title>small,.panel-title>small>a{color:inherit}.panel-footer{padding:10px 15px;background-color:#f5f5f5;border-top:1px solid #ddd;border-bottom-right-radius:3px;border-bottom-left-radius:3px}.panel>.list-group,.panel>.panel-collapse>.list-group{margin-bottom:0}.panel>.list-group .list-group-item,.panel>.panel-collapse>.list-group .list-group-item{border-width:1px 0;border-radius:0}.panel>.list-group:first-child .list-group-item:first-child,.panel>.panel-collapse>.list-group:first-child .list-group-item:first-child{border-top:0;border-top-left-radius:3px;border-top-right-radius:3px}.panel>.list-group:last-child .list-group-item:last-child,.panel>.panel-collapse>.list-group:last-child .list-group-item:last-child{border-bottom:0;border-bottom-right-radius:3px;border-bottom-left-radius:3px}.panel>.panel-heading+.panel-collapse>.list-group .list-group-item:first-child{border-top-left-radius:0;border-top-right-radius:0}.panel-heading+.list-group .list-group-item:first-child{border-top-width:0}.list-group+.panel-footer{border-top-width:0}.panel>.panel-collapse>.table,.panel>.table,.panel>.table-responsive>.table{margin-bottom:0}.panel>.panel-collapse>.table caption,.panel>.table caption,.panel>.table-responsive>.table caption{padding-right:15px;padding-left:15px}.panel>.table-responsive:first-child>.table:first-child,.panel>.table:first-child{border-top-left-radius:3px;border-top-right-radius:3px}.panel>.table-responsive:first-child>.table:first-child>tbody:first-child>tr:first-child,.panel>.table-responsive:first-child>.table:first-child>thead:first-child>tr:first-child,.panel>.table:first-child>tbody:first-child>tr:first-child,.panel>.table:first-child>thead:first-child>tr:first-child{border-top-left-radius:3px;border-top-right-radius:3px}.panel>.table-responsive:first-child>.table:first-child>tbody:first-child>tr:first-child td:first-child,.panel>.table-responsive:first-child>.table:first-child>tbody:first-child>tr:first-child th:first-child,.panel>.table-responsive:first-child>.table:first-child>thead:first-child>tr:first-child td:first-child,.panel>.table-responsive:first-child>.table:first-child>thead:first-child>tr:first-child th:first-child,.panel>.table:first-child>tbody:first-child>tr:first-child td:first-child,.panel>.table:first-child>tbody:first-child>tr:first-child th:first-child,.panel>.table:first-child>thead:first-child>tr:first-child td:first-child,.panel>.table:first-child>thead:first-child>tr:first-child th:first-child{border-top-left-radius:3px}.panel>.table-responsive:first-child>.table:first-child>tbody:first-child>tr:first-child td:last-child,.panel>.table-responsive:first-child>.table:first-child>tbody:first-child>tr:first-child th:last-child,.panel>.table-responsive:first-child>.table:first-child>thead:first-child>tr:first-child td:last-child,.panel>.table-responsive:first-child>.table:first-child>thead:first-child>tr:first-child th:last-child,.panel>.table:first-child>tbody:first-child>tr:first-child td:last-child,.panel>.table:first-child>tbody:first-child>tr:first-child th:last-child,.panel>.table:first-child>thead:first-child>tr:first-child td:last-child,.panel>.table:first-child>thead:first-child>tr:first-child th:last-child{border-top-right-radius:3px}.panel>.table-responsive:last-child>.table:last-child,.panel>.table:last-child{border-bottom-right-radius:3px;border-bottom-left-radius:3px}.panel>.table-responsive:last-child>.table:last-child>tbody:last-child>tr:last-child,.panel>.table-responsive:last-child>.table:last-child>tfoot:last-child>tr:last-child,.panel>.table:last-child>tbody:last-child>tr:last-child,.panel>.table:last-child>tfoot:last-child>tr:last-child{border-bottom-right-radius:3px;border-bottom-left-radius:3px}.panel>.table-responsive:last-child>.table:last-child>tbody:last-child>tr:last-child td:first-child,.panel>.table-responsive:last-child>.table:last-child>tbody:last-child>tr:last-child th:first-child,.panel>.table-responsive:last-child>.table:last-child>tfoot:last-child>tr:last-child td:first-child,.panel>.table-responsive:last-child>.table:last-child>tfoot:last-child>tr:last-child th:first-child,.panel>.table:last-child>tbody:last-child>tr:last-child td:first-child,.panel>.table:last-child>tbody:last-child>tr:last-child th:first-child,.panel>.table:last-child>tfoot:last-child>tr:last-child td:first-child,.panel>.table:last-child>tfoot:last-child>tr:last-child th:first-child{border-bottom-left-radius:3px}.panel>.table-responsive:last-child>.table:last-child>tbody:last-child>tr:last-child td:last-child,.panel>.table-responsive:last-child>.table:last-child>tbody:last-child>tr:last-child th:last-child,.panel>.table-responsive:last-child>.table:last-child>tfoot:last-child>tr:last-child td:last-child,.panel>.table-responsive:last-child>.table:last-child>tfoot:last-child>tr:last-child th:last-child,.panel>.table:last-child>tbody:last-child>tr:last-child td:last-child,.panel>.table:last-child>tbody:last-child>tr:last-child th:last-child,.panel>.table:last-child>tfoot:last-child>tr:last-child td:last-child,.panel>.table:last-child>tfoot:last-child>tr:last-child th:last-child{border-bottom-right-radius:3px}.panel>.panel-body+.table,.panel>.panel-body+.table-responsive,.panel>.table+.panel-body,.panel>.table-responsive+.panel-body{border-top:1px solid #ddd}.panel>.table>tbody:first-child>tr:first-child td,.panel>.table>tbody:first-child>tr:first-child th{border-top:0}.panel>.table-bordered,.panel>.table-responsive>.table-bordered{border:0}.panel>.table-bordered>tbody>tr>td:first-child,.panel>.table-bordered>tbody>tr>th:first-child,.panel>.table-bordered>tfoot>tr>td:first-child,.panel>.table-bordered>tfoot>tr>th:first-child,.panel>.table-bordered>thead>tr>td:first-child,.panel>.table-bordered>thead>tr>th:first-child,.panel>.table-responsive>.table-bordered>tbody>tr>td:first-child,.panel>.table-responsive>.table-bordered>tbody>tr>th:first-child,.panel>.table-responsive>.table-bordered>tfoot>tr>td:first-child,.panel>.table-responsive>.table-bordered>tfoot>tr>th:first-child,.panel>.table-responsive>.table-bordered>thead>tr>td:first-child,.panel>.table-responsive>.table-bordered>thead>tr>th:first-child{border-left:0}.panel>.table-bordered>tbody>tr>td:last-child,.panel>.table-bordered>tbody>tr>th:last-child,.panel>.table-bordered>tfoot>tr>td:last-child,.panel>.table-bordered>tfoot>tr>th:last-child,.panel>.table-bordered>thead>tr>td:last-child,.panel>.table-bordered>thead>tr>th:last-child,.panel>.table-responsive>.table-bordered>tbody>tr>td:last-child,.panel>.table-responsive>.table-bordered>tbody>tr>th:last-child,.panel>.table-responsive>.table-bordered>tfoot>tr>td:last-child,.panel>.table-responsive>.table-bordered>tfoot>tr>th:last-child,.panel>.table-responsive>.table-bordered>thead>tr>td:last-child,.panel>.table-responsive>.table-bordered>thead>tr>th:last-child{border-right:0}.panel>.table-bordered>tbody>tr:first-child>td,.panel>.table-bordered>tbody>tr:first-child>th,.panel>.table-bordered>thead>tr:first-child>td,.panel>.table-bordered>thead>tr:first-child>th,.panel>.table-responsive>.table-bordered>tbody>tr:first-child>td,.panel>.table-responsive>.table-bordered>tbody>tr:first-child>th,.panel>.table-responsive>.table-bordered>thead>tr:first-child>td,.panel>.table-responsive>.table-bordered>thead>tr:first-child>th{border-bottom:0}.panel>.table-bordered>tbody>tr:last-child>td,.panel>.table-bordered>tbody>tr:last-child>th,.panel>.table-bordered>tfoot>tr:last-child>td,.panel>.table-bordered>tfoot>tr:last-child>th,.panel>.table-responsive>.table-bordered>tbody>tr:last-child>td,.panel>.table-responsive>.table-bordered>tbody>tr:last-child>th,.panel>.table-responsive>.table-bordered>tfoot>tr:last-child>td,.panel>.table-responsive>.table-bordered>tfoot>tr:last-child>th{border-bottom:0}.panel>.table-responsive{margin-bottom:0;border:0}.panel-group{margin-bottom:20px}.panel-group .panel{margin-bottom:0;border-radius:4px}.panel-group .panel+.panel{margin-top:5px}.panel-group .panel-heading{border-bottom:0}.panel-group .panel-heading+.panel-collapse>.list-group,.panel-group .panel-heading+.panel-collapse>.panel-body{border-top:1px solid #ddd}.panel-group .panel-footer{border-top:0}.panel-group .panel-footer+.panel-collapse .panel-body{border-bottom:1px solid #ddd}.panel-default{border-color:#ddd}.panel-default>.panel-heading{color:#333;background-color:#f5f5f5;border-color:#ddd}.panel-default>.panel-heading+.panel-collapse>.panel-body{border-top-color:#ddd}.panel-default>.panel-heading .badge{color:#f5f5f5;background-color:#333}.panel-default>.panel-footer+.panel-collapse>.panel-body{border-bottom-color:#ddd}.panel-primary{border-color:#337ab7}.panel-primary>.panel-heading{color:#fff;background-color:#337ab7;border-color:#337ab7}.panel-primary>.panel-heading+.panel-collapse>.panel-body{border-top-color:#337ab7}.panel-primary>.panel-heading .badge{color:#337ab7;background-color:#fff}.panel-primary>.panel-footer+.panel-collapse>.panel-body{border-bottom-color:#337ab7}.panel-success{border-color:#d6e9c6}.panel-success>.panel-heading{color:#3c763d;background-color:#dff0d8;border-color:#d6e9c6}.panel-success>.panel-heading+.panel-collapse>.panel-body{border-top-color:#d6e9c6}.panel-success>.panel-heading .badge{color:#dff0d8;background-color:#3c763d}.panel-success>.panel-footer+.panel-collapse>.panel-body{border-bottom-color:#d6e9c6}.panel-info{border-color:#bce8f1}.panel-info>.panel-heading{color:#31708f;background-color:#d9edf7;border-color:#bce8f1}.panel-info>.panel-heading+.panel-collapse>.panel-body{border-top-color:#bce8f1}.panel-info>.panel-heading .badge{color:#d9edf7;background-color:#31708f}.panel-info>.panel-footer+.panel-collapse>.panel-body{border-bottom-color:#bce8f1}.panel-warning{border-color:#faebcc}.panel-warning>.panel-heading{color:#8a6d3b;background-color:#fcf8e3;border-color:#faebcc}.panel-warning>.panel-heading+.panel-collapse>.panel-body{border-top-color:#faebcc}.panel-warning>.panel-heading .badge{color:#fcf8e3;background-color:#8a6d3b}.panel-warning>.panel-footer+.panel-collapse>.panel-body{border-bottom-color:#faebcc}.panel-danger{border-color:#ebccd1}.panel-danger>.panel-heading{color:#a94442;background-color:#f2dede;border-color:#ebccd1}.panel-danger>.panel-heading+.panel-collapse>.panel-body{border-top-color:#ebccd1}.panel-danger>.panel-heading .badge{color:#f2dede;background-color:#a94442}.panel-danger>.panel-footer+.panel-collapse>.panel-body{border-bottom-color:#ebccd1}.embed-responsive{position:relative;display:block;height:0;padding:0;overflow:hidden}.embed-responsive .embed-responsive-item,.embed-responsive embed,.embed-responsive iframe,.embed-responsive object,.embed-responsive video{position:absolute;top:0;bottom:0;left:0;width:100%;height:100%;border:0}.embed-responsive-16by9{padding-bottom:56.25%}.embed-responsive-4by3{padding-bottom:75%}.well{min-height:20px;padding:19px;margin-bottom:20px;background-color:#f5f5f5;border:1px solid #e3e3e3;border-radius:4px;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.05);box-shadow:inset 0 1px 1px rgba(0,0,0,.05)}.well blockquote{border-color:#ddd;border-color:rgba(0,0,0,.15)}.well-lg{padding:24px;border-radius:6px}.well-sm{padding:9px;border-radius:3px}.close{float:right;font-size:21px;font-weight:700;line-height:1;color:#000;text-shadow:0 1px 0 #fff;filter:alpha(opacity=20);opacity:.2}.close:focus,.close:hover{color:#000;text-decoration:none;cursor:pointer;filter:alpha(opacity=50);opacity:.5}button.close{-webkit-appearance:none;padding:0;cursor:pointer;background:0 0;border:0}.modal-open{overflow:hidden}.modal{position:fixed;top:0;right:0;bottom:0;left:0;z-index:1050;display:none;overflow:hidden;-webkit-overflow-scrolling:touch;outline:0}.modal.fade .modal-dialog{-webkit-transition:-webkit-transform .3s ease-out;-o-transition:-o-transform .3s ease-out;transition:transform .3s ease-out;-webkit-transform:translate(0,-25%);-ms-transform:translate(0,-25%);-o-transform:translate(0,-25%);transform:translate(0,-25%)}.modal.in .modal-dialog{-webkit-transform:translate(0,0);-ms-transform:translate(0,0);-o-transform:translate(0,0);transform:translate(0,0)}.modal-open .modal{overflow-x:hidden;overflow-y:auto}.modal-dialog{position:relative;width:auto;margin:10px}.modal-content{position:relative;background-color:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #999;border:1px solid rgba(0,0,0,.2);border-radius:6px;outline:0;-webkit-box-shadow:0 3px 9px rgba(0,0,0,.5);box-shadow:0 3px 9px rgba(0,0,0,.5)}.modal-backdrop{position:fixed;top:0;right:0;bottom:0;left:0;z-index:1040;background-color:#000}.modal-backdrop.fade{filter:alpha(opacity=0);opacity:0}.modal-backdrop.in{filter:alpha(opacity=50);opacity:.5}.modal-header{padding:15px;border-bottom:1px solid #e5e5e5}.modal-header .close{margin-top:-2px}.modal-title{margin:0;line-height:1.42857143}.modal-body{position:relative;padding:15px}.modal-footer{padding:15px;text-align:right;border-top:1px solid #e5e5e5}.modal-footer .btn+.btn{margin-bottom:0;margin-left:5px}.modal-footer .btn-group .btn+.btn{margin-left:-1px}.modal-footer .btn-block+.btn-block{margin-left:0}.modal-scrollbar-measure{position:absolute;top:-9999px;width:50px;height:50px;overflow:scroll}@media (min-width:768px){.modal-dialog{width:600px;margin:30px auto}.modal-content{-webkit-box-shadow:0 5px 15px rgba(0,0,0,.5);box-shadow:0 5px 15px rgba(0,0,0,.5)}.modal-sm{width:300px}}@media (min-width:992px){.modal-lg{width:900px}}.tooltip{position:absolute;z-index:1070;display:block;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:12px;font-style:normal;font-weight:400;line-height:1.42857143;text-align:left;text-align:start;text-decoration:none;text-shadow:none;text-transform:none;letter-spacing:normal;word-break:normal;word-spacing:normal;word-wrap:normal;white-space:normal;filter:alpha(opacity=0);opacity:0;line-break:auto}.tooltip.in{filter:alpha(opacity=90);opacity:.9}.tooltip.top{padding:5px 0;margin-top:-3px}.tooltip.right{padding:0 5px;margin-left:3px}.tooltip.bottom{padding:5px 0;margin-top:3px}.tooltip.left{padding:0 5px;margin-left:-3px}.tooltip-inner{max-width:200px;padding:3px 8px;color:#fff;text-align:center;background-color:#000;border-radius:4px}.tooltip-arrow{position:absolute;width:0;height:0;border-color:transparent;border-style:solid}.tooltip.top .tooltip-arrow{bottom:0;left:50%;margin-left:-5px;border-width:5px 5px 0;border-top-color:#000}.tooltip.top-left .tooltip-arrow{right:5px;bottom:0;margin-bottom:-5px;border-width:5px 5px 0;border-top-color:#000}.tooltip.top-right .tooltip-arrow{bottom:0;left:5px;margin-bottom:-5px;border-width:5px 5px 0;border-top-color:#000}.tooltip.right .tooltip-arrow{top:50%;left:0;margin-top:-5px;border-width:5px 5px 5px 0;border-right-color:#000}.tooltip.left .tooltip-arrow{top:50%;right:0;margin-top:-5px;border-width:5px 0 5px 5px;border-left-color:#000}.tooltip.bottom .tooltip-arrow{top:0;left:50%;margin-left:-5px;border-width:0 5px 5px;border-bottom-color:#000}.tooltip.bottom-left .tooltip-arrow{top:0;right:5px;margin-top:-5px;border-width:0 5px 5px;border-bottom-color:#000}.tooltip.bottom-right .tooltip-arrow{top:0;left:5px;margin-top:-5px;border-width:0 5px 5px;border-bottom-color:#000}.popover{position:absolute;top:0;left:0;z-index:1060;display:none;max-width:276px;padding:1px;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px;font-style:normal;font-weight:400;line-height:1.42857143;text-align:left;text-align:start;text-decoration:none;text-shadow:none;text-transform:none;letter-spacing:normal;word-break:normal;word-spacing:normal;word-wrap:normal;white-space:normal;background-color:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.2);border-radius:6px;-webkit-box-shadow:0 5px 10px rgba(0,0,0,.2);box-shadow:0 5px 10px rgba(0,0,0,.2);line-break:auto}.popover.top{margin-top:-10px}.popover.right{margin-left:10px}.popover.bottom{margin-top:10px}.popover.left{margin-left:-10px}.popover-title{padding:8px 14px;margin:0;font-size:14px;background-color:#f7f7f7;border-bottom:1px solid #ebebeb;border-radius:5px 5px 0 0}.popover-content{padding:9px 14px}.popover>.arrow,.popover>.arrow:after{position:absolute;display:block;width:0;height:0;border-color:transparent;border-style:solid}.popover>.arrow{border-width:11px}.popover>.arrow:after{content:"";border-width:10px}.popover.top>.arrow{bottom:-11px;left:50%;margin-left:-11px;border-top-color:#999;border-top-color:rgba(0,0,0,.25);border-bottom-width:0}.popover.top>.arrow:after{bottom:1px;margin-left:-10px;content:" ";border-top-color:#fff;border-bottom-width:0}.popover.right>.arrow{top:50%;left:-11px;margin-top:-11px;border-right-color:#999;border-right-color:rgba(0,0,0,.25);border-left-width:0}.popover.right>.arrow:after{bottom:-10px;left:1px;content:" ";border-right-color:#fff;border-left-width:0}.popover.bottom>.arrow{top:-11px;left:50%;margin-left:-11px;border-top-width:0;border-bottom-color:#999;border-bottom-color:rgba(0,0,0,.25)}.popover.bottom>.arrow:after{top:1px;margin-left:-10px;content:" ";border-top-width:0;border-bottom-color:#fff}.popover.left>.arrow{top:50%;right:-11px;margin-top:-11px;border-right-width:0;border-left-color:#999;border-left-color:rgba(0,0,0,.25)}.popover.left>.arrow:after{right:1px;bottom:-10px;content:" ";border-right-width:0;border-left-color:#fff}.carousel{position:relative}.carousel-inner{position:relative;width:100%;overflow:hidden}.carousel-inner>.item{position:relative;display:none;-webkit-transition:.6s ease-in-out left;-o-transition:.6s ease-in-out left;transition:.6s ease-in-out left}.carousel-inner>.item>a>img,.carousel-inner>.item>img{line-height:1}@media all and (transform-3d),(-webkit-transform-3d){.carousel-inner>.item{-webkit-transition:-webkit-transform .6s ease-in-out;-o-transition:-o-transform .6s ease-in-out;transition:transform .6s ease-in-out;-webkit-backface-visibility:hidden;backface-visibility:hidden;-webkit-perspective:1000px;perspective:1000px}.carousel-inner>.item.active.right,.carousel-inner>.item.next{left:0;-webkit-transform:translate3d(100%,0,0);transform:translate3d(100%,0,0)}.carousel-inner>.item.active.left,.carousel-inner>.item.prev{left:0;-webkit-transform:translate3d(-100%,0,0);transform:translate3d(-100%,0,0)}.carousel-inner>.item.active,.carousel-inner>.item.next.left,.carousel-inner>.item.prev.right{left:0;-webkit-transform:translate3d(0,0,0);transform:translate3d(0,0,0)}}.carousel-inner>.active,.carousel-inner>.next,.carousel-inner>.prev{display:block}.carousel-inner>.active{left:0}.carousel-inner>.next,.carousel-inner>.prev{position:absolute;top:0;width:100%}.carousel-inner>.next{left:100%}.carousel-inner>.prev{left:-100%}.carousel-inner>.next.left,.carousel-inner>.prev.right{left:0}.carousel-inner>.active.left{left:-100%}.carousel-inner>.active.right{left:100%}.carousel-control{position:absolute;top:0;bottom:0;left:0;width:15%;font-size:20px;color:#fff;text-align:center;text-shadow:0 1px 2px rgba(0,0,0,.6);background-color:rgba(0,0,0,0);filter:alpha(opacity=50);opacity:.5}.carousel-control.left{background-image:-webkit-linear-gradient(left,rgba(0,0,0,.5) 0,rgba(0,0,0,.0001) 100%);background-image:-o-linear-gradient(left,rgba(0,0,0,.5) 0,rgba(0,0,0,.0001) 100%);background-image:-webkit-gradient(linear,left top,right top,from(rgba(0,0,0,.5)),to(rgba(0,0,0,.0001)));background-image:linear-gradient(to right,rgba(0,0,0,.5) 0,rgba(0,0,0,.0001) 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#80000000', endColorstr='#00000000', GradientType=1);background-repeat:repeat-x}.carousel-control.right{right:0;left:auto;background-image:-webkit-linear-gradient(left,rgba(0,0,0,.0001) 0,rgba(0,0,0,.5) 100%);background-image:-o-linear-gradient(left,rgba(0,0,0,.0001) 0,rgba(0,0,0,.5) 100%);background-image:-webkit-gradient(linear,left top,right top,from(rgba(0,0,0,.0001)),to(rgba(0,0,0,.5)));background-image:linear-gradient(to right,rgba(0,0,0,.0001) 0,rgba(0,0,0,.5) 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#00000000', endColorstr='#80000000', GradientType=1);background-repeat:repeat-x}.carousel-control:focus,.carousel-control:hover{color:#fff;text-decoration:none;filter:alpha(opacity=90);outline:0;opacity:.9}.carousel-control .glyphicon-chevron-left,.carousel-control .glyphicon-chevron-right,.carousel-control .icon-next,.carousel-control .icon-prev{position:absolute;top:50%;z-index:5;display:inline-block;margin-top:-10px}.carousel-control .glyphicon-chevron-left,.carousel-control .icon-prev{left:50%;margin-left:-10px}.carousel-control .glyphicon-chevron-right,.carousel-control .icon-next{right:50%;margin-right:-10px}.carousel-control .icon-next,.carousel-control .icon-prev{width:20px;height:20px;font-family:serif;line-height:1}.carousel-control .icon-prev:before{content:'\2039'}.carousel-control .icon-next:before{content:'\203a'}.carousel-indicators{position:absolute;bottom:10px;left:50%;z-index:15;width:60%;padding-left:0;margin-left:-30%;text-align:center;list-style:none}.carousel-indicators li{display:inline-block;width:10px;height:10px;margin:1px;text-indent:-999px;cursor:pointer;background-color:#000\9;background-color:rgba(0,0,0,0);border:1px solid #fff;border-radius:10px}.carousel-indicators .active{width:12px;height:12px;margin:0;background-color:#fff}.carousel-caption{position:absolute;right:15%;bottom:20px;left:15%;z-index:10;padding-top:20px;padding-bottom:20px;color:#fff;text-align:center;text-shadow:0 1px 2px rgba(0,0,0,.6)}.carousel-caption .btn{text-shadow:none}@media screen and (min-width:768px){.carousel-control .glyphicon-chevron-left,.carousel-control .glyphicon-chevron-right,.carousel-control .icon-next,.carousel-control .icon-prev{width:30px;height:30px;margin-top:-10px;font-size:30px}.carousel-control .glyphicon-chevron-left,.carousel-control .icon-prev{margin-left:-10px}.carousel-control .glyphicon-chevron-right,.carousel-control .icon-next{margin-right:-10px}.carousel-caption{right:20%;left:20%;padding-bottom:30px}.carousel-indicators{bottom:20px}}.btn-group-vertical>.btn-group:after,.btn-group-vertical>.btn-group:before,.btn-toolbar:after,.btn-toolbar:before,.clearfix:after,.clearfix:before,.container-fluid:after,.container-fluid:before,.container:after,.container:before,.dl-horizontal dd:after,.dl-horizontal dd:before,.form-horizontal .form-group:after,.form-horizontal .form-group:before,.modal-footer:after,.modal-footer:before,.modal-header:after,.modal-header:before,.nav:after,.nav:before,.navbar-collapse:after,.navbar-collapse:before,.navbar-header:after,.navbar-header:before,.navbar:after,.navbar:before,.pager:after,.pager:before,.panel-body:after,.panel-body:before,.row:after,.row:before{display:table;content:" "}.btn-group-vertical>.btn-group:after,.btn-toolbar:after,.clearfix:after,.container-fluid:after,.container:after,.dl-horizontal dd:after,.form-horizontal .form-group:after,.modal-footer:after,.modal-header:after,.nav:after,.navbar-collapse:after,.navbar-header:after,.navbar:after,.pager:after,.panel-body:after,.row:after{clear:both}.center-block{display:block;margin-right:auto;margin-left:auto}.pull-right{float:right!important}.pull-left{float:left!important}.hide{display:none!important}.show{display:block!important}.invisible{visibility:hidden}.text-hide{font:0/0 a;color:transparent;text-shadow:none;background-color:transparent;border:0}.hidden{display:none!important}.affix{position:fixed}@-ms-viewport{width:device-width}.visible-lg,.visible-md,.visible-sm,.visible-xs{display:none!important}.visible-lg-block,.visible-lg-inline,.visible-lg-inline-block,.visible-md-block,.visible-md-inline,.visible-md-inline-block,.visible-sm-block,.visible-sm-inline,.visible-sm-inline-block,.visible-xs-block,.visible-xs-inline,.visible-xs-inline-block{display:none!important}@media (max-width:767px){.visible-xs{display:block!important}table.visible-xs{display:table!important}tr.visible-xs{display:table-row!important}td.visible-xs,th.visible-xs{display:table-cell!important}}@media (max-width:767px){.visible-xs-block{display:block!important}}@media (max-width:767px){.visible-xs-inline{display:inline!important}}@media (max-width:767px){.visible-xs-inline-block{display:inline-block!important}}@media (min-width:768px) and (max-width:991px){.visible-sm{display:block!important}table.visible-sm{display:table!important}tr.visible-sm{display:table-row!important}td.visible-sm,th.visible-sm{display:table-cell!important}}@media (min-width:768px) and (max-width:991px){.visible-sm-block{display:block!important}}@media (min-width:768px) and (max-width:991px){.visible-sm-inline{display:inline!important}}@media (min-width:768px) and (max-width:991px){.visible-sm-inline-block{display:inline-block!important}}@media (min-width:992px) and (max-width:1199px){.visible-md{display:block!important}table.visible-md{display:table!important}tr.visible-md{display:table-row!important}td.visible-md,th.visible-md{display:table-cell!important}}@media (min-width:992px) and (max-width:1199px){.visible-md-block{display:block!important}}@media (min-width:992px) and (max-width:1199px){.visible-md-inline{display:inline!important}}@media (min-width:992px) and (max-width:1199px){.visible-md-inline-block{display:inline-block!important}}@media (min-width:1200px){.visible-lg{display:block!important}table.visible-lg{display:table!important}tr.visible-lg{display:table-row!important}td.visible-lg,th.visible-lg{display:table-cell!important}}@media (min-width:1200px){.visible-lg-block{display:block!important}}@media (min-width:1200px){.visible-lg-inline{display:inline!important}}@media (min-width:1200px){.visible-lg-inline-block{display:inline-block!important}}@media (max-width:767px){.hidden-xs{display:none!important}}@media (min-width:768px) and (max-width:991px){.hidden-sm{display:none!important}}@media (min-width:992px) and (max-width:1199px){.hidden-md{display:none!important}}@media (min-width:1200px){.hidden-lg{display:none!important}}.visible-print{display:none!important}@media print{.visible-print{display:block!important}table.visible-print{display:table!important}tr.visible-print{display:table-row!important}td.visible-print,th.visible-print{display:table-cell!important}}.visible-print-block{display:none!important}@media print{.visible-print-block{display:block!important}}.visible-print-inline{display:none!important}@media print{.visible-print-inline{display:inline!important}}.visible-print-inline-block{display:none!important}@media print{.visible-print-inline-block{display:inline-block!important}}@media print{.hidden-print{display:none!important}}
+
diff --git a/management/guns-admin/src/main/webapp/static/css/font-awesome.css b/management/guns-admin/src/main/webapp/static/css/font-awesome.css
new file mode 100644
index 0000000..880eb82
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/static/css/font-awesome.css
@@ -0,0 +1,2026 @@
+/*!
+ * Font Awesome 4.4.0 by @davegandy - http://fontawesome.io - @fontawesome
+ * License - http://fontawesome.io/license (Font: SIL OFL 1.1, CSS: MIT License)
+ */
+/* FONT PATH
+ * -------------------------- */
+@font-face {
+ font-family: 'FontAwesome';
+ src: url('../fonts/fontawesome-webfont.eot?v=4.4.0');
+ src: url('../fonts/fontawesome-webfont.eot?#iefix&v=4.4.0') format('embedded-opentype'), url('../fonts/fontawesome-webfont.woff2?v=4.4.0') format('woff2'), url('../fonts/fontawesome-webfont.woff?v=4.4.0') format('woff'), url('../fonts/fontawesome-webfont.ttf?v=4.4.0') format('truetype'), url('../fonts/fontawesome-webfont.svg?v=4.4.0#fontawesomeregular') format('svg');
+ font-weight: normal;
+ font-style: normal;
+}
+.fa {
+ display: inline-block;
+ font: normal normal normal 14px/1 FontAwesome;
+ font-size: inherit;
+ text-rendering: auto;
+ -webkit-font-smoothing: antialiased;
+ -moz-osx-font-smoothing: grayscale;
+}
+/* makes the font 33% larger relative to the icon container */
+.fa-lg {
+ font-size: 1.33333333em;
+ line-height: 0.75em;
+ vertical-align: -15%;
+}
+.fa-2x {
+ font-size: 2em;
+}
+.fa-3x {
+ font-size: 3em;
+}
+.fa-4x {
+ font-size: 4em;
+}
+.fa-5x {
+ font-size: 5em;
+}
+.fa-fw {
+ width: 1.28571429em;
+ text-align: center;
+}
+.fa-ul {
+ padding-left: 0;
+ margin-left: 2.14285714em;
+ list-style-type: none;
+}
+.fa-ul > li {
+ position: relative;
+}
+.fa-li {
+ position: absolute;
+ left: -2.14285714em;
+ width: 2.14285714em;
+ top: 0.14285714em;
+ text-align: center;
+}
+.fa-li.fa-lg {
+ left: -1.85714286em;
+}
+.fa-border {
+ padding: .2em .25em .15em;
+ border: solid 0.08em #eeeeee;
+ border-radius: .1em;
+}
+.fa-pull-left {
+ float: left;
+}
+.fa-pull-right {
+ float: right;
+}
+.fa.fa-pull-left {
+ margin-right: .3em;
+}
+.fa.fa-pull-right {
+ margin-left: .3em;
+}
+/* Deprecated as of 4.4.0 */
+.pull-right {
+ float: right;
+}
+.pull-left {
+ float: left;
+}
+.fa.pull-left {
+ margin-right: .3em;
+}
+.fa.pull-right {
+ margin-left: .3em;
+}
+.fa-spin {
+ -webkit-animation: fa-spin 2s infinite linear;
+ animation: fa-spin 2s infinite linear;
+}
+.fa-pulse {
+ -webkit-animation: fa-spin 1s infinite steps(8);
+ animation: fa-spin 1s infinite steps(8);
+}
+@-webkit-keyframes fa-spin {
+ 0% {
+ -webkit-transform: rotate(0deg);
+ transform: rotate(0deg);
+ }
+ 100% {
+ -webkit-transform: rotate(359deg);
+ transform: rotate(359deg);
+ }
+}
+@keyframes fa-spin {
+ 0% {
+ -webkit-transform: rotate(0deg);
+ transform: rotate(0deg);
+ }
+ 100% {
+ -webkit-transform: rotate(359deg);
+ transform: rotate(359deg);
+ }
+}
+.fa-rotate-90 {
+ filter: progid:DXImageTransform.Microsoft.BasicImage(rotation=1);
+ -webkit-transform: rotate(90deg);
+ -ms-transform: rotate(90deg);
+ transform: rotate(90deg);
+}
+.fa-rotate-180 {
+ filter: progid:DXImageTransform.Microsoft.BasicImage(rotation=2);
+ -webkit-transform: rotate(180deg);
+ -ms-transform: rotate(180deg);
+ transform: rotate(180deg);
+}
+.fa-rotate-270 {
+ filter: progid:DXImageTransform.Microsoft.BasicImage(rotation=3);
+ -webkit-transform: rotate(270deg);
+ -ms-transform: rotate(270deg);
+ transform: rotate(270deg);
+}
+.fa-flip-horizontal {
+ filter: progid:DXImageTransform.Microsoft.BasicImage(rotation=0, mirror=1);
+ -webkit-transform: scale(-1, 1);
+ -ms-transform: scale(-1, 1);
+ transform: scale(-1, 1);
+}
+.fa-flip-vertical {
+ filter: progid:DXImageTransform.Microsoft.BasicImage(rotation=2, mirror=1);
+ -webkit-transform: scale(1, -1);
+ -ms-transform: scale(1, -1);
+ transform: scale(1, -1);
+}
+:root .fa-rotate-90,
+:root .fa-rotate-180,
+:root .fa-rotate-270,
+:root .fa-flip-horizontal,
+:root .fa-flip-vertical {
+ filter: none;
+}
+.fa-stack {
+ position: relative;
+ display: inline-block;
+ width: 2em;
+ height: 2em;
+ line-height: 2em;
+ vertical-align: middle;
+}
+.fa-stack-1x,
+.fa-stack-2x {
+ position: absolute;
+ left: 0;
+ width: 100%;
+ text-align: center;
+}
+.fa-stack-1x {
+ line-height: inherit;
+}
+.fa-stack-2x {
+ font-size: 2em;
+}
+.fa-inverse {
+ color: #ffffff;
+}
+/* Font Awesome uses the Unicode Private Use Area (PUA) to ensure screen
+ readers do not read off random characters that represent icons */
+.fa-glass:before {
+ content: "\f000";
+}
+.fa-music:before {
+ content: "\f001";
+}
+.fa-search:before {
+ content: "\f002";
+}
+.fa-envelope-o:before {
+ content: "\f003";
+}
+.fa-heart:before {
+ content: "\f004";
+}
+.fa-star:before {
+ content: "\f005";
+}
+.fa-star-o:before {
+ content: "\f006";
+}
+.fa-user:before {
+ content: "\f007";
+}
+.fa-film:before {
+ content: "\f008";
+}
+.fa-th-large:before {
+ content: "\f009";
+}
+.fa-th:before {
+ content: "\f00a";
+}
+.fa-th-list:before {
+ content: "\f00b";
+}
+.fa-check:before {
+ content: "\f00c";
+}
+.fa-remove:before,
+.fa-close:before,
+.fa-times:before {
+ content: "\f00d";
+}
+.fa-search-plus:before {
+ content: "\f00e";
+}
+.fa-search-minus:before {
+ content: "\f010";
+}
+.fa-power-off:before {
+ content: "\f011";
+}
+.fa-signal:before {
+ content: "\f012";
+}
+.fa-gear:before,
+.fa-cog:before {
+ content: "\f013";
+}
+.fa-trash-o:before {
+ content: "\f014";
+}
+.fa-home:before {
+ content: "\f015";
+}
+.fa-file-o:before {
+ content: "\f016";
+}
+.fa-clock-o:before {
+ content: "\f017";
+}
+.fa-road:before {
+ content: "\f018";
+}
+.fa-download:before {
+ content: "\f019";
+}
+.fa-arrow-circle-o-down:before {
+ content: "\f01a";
+}
+.fa-arrow-circle-o-up:before {
+ content: "\f01b";
+}
+.fa-inbox:before {
+ content: "\f01c";
+}
+.fa-play-circle-o:before {
+ content: "\f01d";
+}
+.fa-rotate-right:before,
+.fa-repeat:before {
+ content: "\f01e";
+}
+.fa-refresh:before {
+ content: "\f021";
+}
+.fa-list-alt:before {
+ content: "\f022";
+}
+.fa-lock:before {
+ content: "\f023";
+}
+.fa-flag:before {
+ content: "\f024";
+}
+.fa-headphones:before {
+ content: "\f025";
+}
+.fa-volume-off:before {
+ content: "\f026";
+}
+.fa-volume-down:before {
+ content: "\f027";
+}
+.fa-volume-up:before {
+ content: "\f028";
+}
+.fa-qrcode:before {
+ content: "\f029";
+}
+.fa-barcode:before {
+ content: "\f02a";
+}
+.fa-tag:before {
+ content: "\f02b";
+}
+.fa-tags:before {
+ content: "\f02c";
+}
+.fa-book:before {
+ content: "\f02d";
+}
+.fa-bookmark:before {
+ content: "\f02e";
+}
+.fa-print:before {
+ content: "\f02f";
+}
+.fa-camera:before {
+ content: "\f030";
+}
+.fa-font:before {
+ content: "\f031";
+}
+.fa-bold:before {
+ content: "\f032";
+}
+.fa-italic:before {
+ content: "\f033";
+}
+.fa-text-height:before {
+ content: "\f034";
+}
+.fa-text-width:before {
+ content: "\f035";
+}
+.fa-align-left:before {
+ content: "\f036";
+}
+.fa-align-center:before {
+ content: "\f037";
+}
+.fa-align-right:before {
+ content: "\f038";
+}
+.fa-align-justify:before {
+ content: "\f039";
+}
+.fa-list:before {
+ content: "\f03a";
+}
+.fa-dedent:before,
+.fa-outdent:before {
+ content: "\f03b";
+}
+.fa-indent:before {
+ content: "\f03c";
+}
+.fa-video-camera:before {
+ content: "\f03d";
+}
+.fa-photo:before,
+.fa-image:before,
+.fa-picture-o:before {
+ content: "\f03e";
+}
+.fa-pencil:before {
+ content: "\f040";
+}
+.fa-map-marker:before {
+ content: "\f041";
+}
+.fa-adjust:before {
+ content: "\f042";
+}
+.fa-tint:before {
+ content: "\f043";
+}
+.fa-edit:before,
+.fa-pencil-square-o:before {
+ content: "\f044";
+}
+.fa-share-square-o:before {
+ content: "\f045";
+}
+.fa-check-square-o:before {
+ content: "\f046";
+}
+.fa-arrows:before {
+ content: "\f047";
+}
+.fa-step-backward:before {
+ content: "\f048";
+}
+.fa-fast-backward:before {
+ content: "\f049";
+}
+.fa-backward:before {
+ content: "\f04a";
+}
+.fa-play:before {
+ content: "\f04b";
+}
+.fa-pause:before {
+ content: "\f04c";
+}
+.fa-stop:before {
+ content: "\f04d";
+}
+.fa-forward:before {
+ content: "\f04e";
+}
+.fa-fast-forward:before {
+ content: "\f050";
+}
+.fa-step-forward:before {
+ content: "\f051";
+}
+.fa-eject:before {
+ content: "\f052";
+}
+.fa-chevron-left:before {
+ content: "\f053";
+}
+.fa-chevron-right:before {
+ content: "\f054";
+}
+.fa-plus-circle:before {
+ content: "\f055";
+}
+.fa-minus-circle:before {
+ content: "\f056";
+}
+.fa-times-circle:before {
+ content: "\f057";
+}
+.fa-check-circle:before {
+ content: "\f058";
+}
+.fa-question-circle:before {
+ content: "\f059";
+}
+.fa-info-circle:before {
+ content: "\f05a";
+}
+.fa-crosshairs:before {
+ content: "\f05b";
+}
+.fa-times-circle-o:before {
+ content: "\f05c";
+}
+.fa-check-circle-o:before {
+ content: "\f05d";
+}
+.fa-ban:before {
+ content: "\f05e";
+}
+.fa-arrow-left:before {
+ content: "\f060";
+}
+.fa-arrow-right:before {
+ content: "\f061";
+}
+.fa-arrow-up:before {
+ content: "\f062";
+}
+.fa-arrow-down:before {
+ content: "\f063";
+}
+.fa-mail-forward:before,
+.fa-share:before {
+ content: "\f064";
+}
+.fa-expand:before {
+ content: "\f065";
+}
+.fa-compress:before {
+ content: "\f066";
+}
+.fa-plus:before {
+ content: "\f067";
+}
+.fa-minus:before {
+ content: "\f068";
+}
+.fa-asterisk:before {
+ content: "\f069";
+}
+.fa-exclamation-circle:before {
+ content: "\f06a";
+}
+.fa-gift:before {
+ content: "\f06b";
+}
+.fa-leaf:before {
+ content: "\f06c";
+}
+.fa-fire:before {
+ content: "\f06d";
+}
+.fa-eye:before {
+ content: "\f06e";
+}
+.fa-eye-slash:before {
+ content: "\f070";
+}
+.fa-warning:before,
+.fa-exclamation-triangle:before {
+ content: "\f071";
+}
+.fa-plane:before {
+ content: "\f072";
+}
+.fa-calendar:before {
+ content: "\f073";
+}
+.fa-random:before {
+ content: "\f074";
+}
+.fa-comment:before {
+ content: "\f075";
+}
+.fa-magnet:before {
+ content: "\f076";
+}
+.fa-chevron-up:before {
+ content: "\f077";
+}
+.fa-chevron-down:before {
+ content: "\f078";
+}
+.fa-retweet:before {
+ content: "\f079";
+}
+.fa-shopping-cart:before {
+ content: "\f07a";
+}
+.fa-folder:before {
+ content: "\f07b";
+}
+.fa-folder-open:before {
+ content: "\f07c";
+}
+.fa-arrows-v:before {
+ content: "\f07d";
+}
+.fa-arrows-h:before {
+ content: "\f07e";
+}
+.fa-bar-chart-o:before,
+.fa-bar-chart:before {
+ content: "\f080";
+}
+.fa-twitter-square:before {
+ content: "\f081";
+}
+.fa-facebook-square:before {
+ content: "\f082";
+}
+.fa-camera-retro:before {
+ content: "\f083";
+}
+.fa-key:before {
+ content: "\f084";
+}
+.fa-gears:before,
+.fa-cogs:before {
+ content: "\f085";
+}
+.fa-comments:before {
+ content: "\f086";
+}
+.fa-thumbs-o-up:before {
+ content: "\f087";
+}
+.fa-thumbs-o-down:before {
+ content: "\f088";
+}
+.fa-star-half:before {
+ content: "\f089";
+}
+.fa-heart-o:before {
+ content: "\f08a";
+}
+.fa-sign-out:before {
+ content: "\f08b";
+}
+.fa-linkedin-square:before {
+ content: "\f08c";
+}
+.fa-thumb-tack:before {
+ content: "\f08d";
+}
+.fa-external-link:before {
+ content: "\f08e";
+}
+.fa-sign-in:before {
+ content: "\f090";
+}
+.fa-trophy:before {
+ content: "\f091";
+}
+.fa-github-square:before {
+ content: "\f092";
+}
+.fa-upload:before {
+ content: "\f093";
+}
+.fa-lemon-o:before {
+ content: "\f094";
+}
+.fa-phone:before {
+ content: "\f095";
+}
+.fa-square-o:before {
+ content: "\f096";
+}
+.fa-bookmark-o:before {
+ content: "\f097";
+}
+.fa-phone-square:before {
+ content: "\f098";
+}
+.fa-twitter:before {
+ content: "\f099";
+}
+.fa-facebook-f:before,
+.fa-facebook:before {
+ content: "\f09a";
+}
+.fa-github:before {
+ content: "\f09b";
+}
+.fa-unlock:before {
+ content: "\f09c";
+}
+.fa-credit-card:before {
+ content: "\f09d";
+}
+.fa-feed:before,
+.fa-rss:before {
+ content: "\f09e";
+}
+.fa-hdd-o:before {
+ content: "\f0a0";
+}
+.fa-bullhorn:before {
+ content: "\f0a1";
+}
+.fa-bell:before {
+ content: "\f0f3";
+}
+.fa-certificate:before {
+ content: "\f0a3";
+}
+.fa-hand-o-right:before {
+ content: "\f0a4";
+}
+.fa-hand-o-left:before {
+ content: "\f0a5";
+}
+.fa-hand-o-up:before {
+ content: "\f0a6";
+}
+.fa-hand-o-down:before {
+ content: "\f0a7";
+}
+.fa-arrow-circle-left:before {
+ content: "\f0a8";
+}
+.fa-arrow-circle-right:before {
+ content: "\f0a9";
+}
+.fa-arrow-circle-up:before {
+ content: "\f0aa";
+}
+.fa-arrow-circle-down:before {
+ content: "\f0ab";
+}
+.fa-globe:before {
+ content: "\f0ac";
+}
+.fa-wrench:before {
+ content: "\f0ad";
+}
+.fa-tasks:before {
+ content: "\f0ae";
+}
+.fa-filter:before {
+ content: "\f0b0";
+}
+.fa-briefcase:before {
+ content: "\f0b1";
+}
+.fa-arrows-alt:before {
+ content: "\f0b2";
+}
+.fa-group:before,
+.fa-users:before {
+ content: "\f0c0";
+}
+.fa-chain:before,
+.fa-link:before {
+ content: "\f0c1";
+}
+.fa-cloud:before {
+ content: "\f0c2";
+}
+.fa-flask:before {
+ content: "\f0c3";
+}
+.fa-cut:before,
+.fa-scissors:before {
+ content: "\f0c4";
+}
+.fa-copy:before,
+.fa-files-o:before {
+ content: "\f0c5";
+}
+.fa-paperclip:before {
+ content: "\f0c6";
+}
+.fa-save:before,
+.fa-floppy-o:before {
+ content: "\f0c7";
+}
+.fa-square:before {
+ content: "\f0c8";
+}
+.fa-navicon:before,
+.fa-reorder:before,
+.fa-bars:before {
+ content: "\f0c9";
+}
+.fa-list-ul:before {
+ content: "\f0ca";
+}
+.fa-list-ol:before {
+ content: "\f0cb";
+}
+.fa-strikethrough:before {
+ content: "\f0cc";
+}
+.fa-underline:before {
+ content: "\f0cd";
+}
+.fa-table:before {
+ content: "\f0ce";
+}
+.fa-magic:before {
+ content: "\f0d0";
+}
+.fa-truck:before {
+ content: "\f0d1";
+}
+.fa-pinterest:before {
+ content: "\f0d2";
+}
+.fa-pinterest-square:before {
+ content: "\f0d3";
+}
+.fa-google-plus-square:before {
+ content: "\f0d4";
+}
+.fa-google-plus:before {
+ content: "\f0d5";
+}
+.fa-money:before {
+ content: "\f0d6";
+}
+.fa-caret-down:before {
+ content: "\f0d7";
+}
+.fa-caret-up:before {
+ content: "\f0d8";
+}
+.fa-caret-left:before {
+ content: "\f0d9";
+}
+.fa-caret-right:before {
+ content: "\f0da";
+}
+.fa-columns:before {
+ content: "\f0db";
+}
+.fa-unsorted:before,
+.fa-sort:before {
+ content: "\f0dc";
+}
+.fa-sort-down:before,
+.fa-sort-desc:before {
+ content: "\f0dd";
+}
+.fa-sort-up:before,
+.fa-sort-asc:before {
+ content: "\f0de";
+}
+.fa-envelope:before {
+ content: "\f0e0";
+}
+.fa-linkedin:before {
+ content: "\f0e1";
+}
+.fa-rotate-left:before,
+.fa-undo:before {
+ content: "\f0e2";
+}
+.fa-legal:before,
+.fa-gavel:before {
+ content: "\f0e3";
+}
+.fa-dashboard:before,
+.fa-tachometer:before {
+ content: "\f0e4";
+}
+.fa-comment-o:before {
+ content: "\f0e5";
+}
+.fa-comments-o:before {
+ content: "\f0e6";
+}
+.fa-flash:before,
+.fa-bolt:before {
+ content: "\f0e7";
+}
+.fa-sitemap:before {
+ content: "\f0e8";
+}
+.fa-umbrella:before {
+ content: "\f0e9";
+}
+.fa-paste:before,
+.fa-clipboard:before {
+ content: "\f0ea";
+}
+.fa-lightbulb-o:before {
+ content: "\f0eb";
+}
+.fa-exchange:before {
+ content: "\f0ec";
+}
+.fa-cloud-download:before {
+ content: "\f0ed";
+}
+.fa-cloud-upload:before {
+ content: "\f0ee";
+}
+.fa-user-md:before {
+ content: "\f0f0";
+}
+.fa-stethoscope:before {
+ content: "\f0f1";
+}
+.fa-suitcase:before {
+ content: "\f0f2";
+}
+.fa-bell-o:before {
+ content: "\f0a2";
+}
+.fa-coffee:before {
+ content: "\f0f4";
+}
+.fa-cutlery:before {
+ content: "\f0f5";
+}
+.fa-file-text-o:before {
+ content: "\f0f6";
+}
+.fa-building-o:before {
+ content: "\f0f7";
+}
+.fa-hospital-o:before {
+ content: "\f0f8";
+}
+.fa-ambulance:before {
+ content: "\f0f9";
+}
+.fa-medkit:before {
+ content: "\f0fa";
+}
+.fa-fighter-jet:before {
+ content: "\f0fb";
+}
+.fa-beer:before {
+ content: "\f0fc";
+}
+.fa-h-square:before {
+ content: "\f0fd";
+}
+.fa-plus-square:before {
+ content: "\f0fe";
+}
+.fa-angle-double-left:before {
+ content: "\f100";
+}
+.fa-angle-double-right:before {
+ content: "\f101";
+}
+.fa-angle-double-up:before {
+ content: "\f102";
+}
+.fa-angle-double-down:before {
+ content: "\f103";
+}
+.fa-angle-left:before {
+ content: "\f104";
+}
+.fa-angle-right:before {
+ content: "\f105";
+}
+.fa-angle-up:before {
+ content: "\f106";
+}
+.fa-angle-down:before {
+ content: "\f107";
+}
+.fa-desktop:before {
+ content: "\f108";
+}
+.fa-laptop:before {
+ content: "\f109";
+}
+.fa-tablet:before {
+ content: "\f10a";
+}
+.fa-mobile-phone:before,
+.fa-mobile:before {
+ content: "\f10b";
+}
+.fa-circle-o:before {
+ content: "\f10c";
+}
+.fa-quote-left:before {
+ content: "\f10d";
+}
+.fa-quote-right:before {
+ content: "\f10e";
+}
+.fa-spinner:before {
+ content: "\f110";
+}
+.fa-circle:before {
+ content: "\f111";
+}
+.fa-mail-reply:before,
+.fa-reply:before {
+ content: "\f112";
+}
+.fa-github-alt:before {
+ content: "\f113";
+}
+.fa-folder-o:before {
+ content: "\f114";
+}
+.fa-folder-open-o:before {
+ content: "\f115";
+}
+.fa-smile-o:before {
+ content: "\f118";
+}
+.fa-frown-o:before {
+ content: "\f119";
+}
+.fa-meh-o:before {
+ content: "\f11a";
+}
+.fa-gamepad:before {
+ content: "\f11b";
+}
+.fa-keyboard-o:before {
+ content: "\f11c";
+}
+.fa-flag-o:before {
+ content: "\f11d";
+}
+.fa-flag-checkered:before {
+ content: "\f11e";
+}
+.fa-terminal:before {
+ content: "\f120";
+}
+.fa-code:before {
+ content: "\f121";
+}
+.fa-mail-reply-all:before,
+.fa-reply-all:before {
+ content: "\f122";
+}
+.fa-star-half-empty:before,
+.fa-star-half-full:before,
+.fa-star-half-o:before {
+ content: "\f123";
+}
+.fa-location-arrow:before {
+ content: "\f124";
+}
+.fa-crop:before {
+ content: "\f125";
+}
+.fa-code-fork:before {
+ content: "\f126";
+}
+.fa-unlink:before,
+.fa-chain-broken:before {
+ content: "\f127";
+}
+.fa-question:before {
+ content: "\f128";
+}
+.fa-info:before {
+ content: "\f129";
+}
+.fa-exclamation:before {
+ content: "\f12a";
+}
+.fa-superscript:before {
+ content: "\f12b";
+}
+.fa-subscript:before {
+ content: "\f12c";
+}
+.fa-eraser:before {
+ content: "\f12d";
+}
+.fa-puzzle-piece:before {
+ content: "\f12e";
+}
+.fa-microphone:before {
+ content: "\f130";
+}
+.fa-microphone-slash:before {
+ content: "\f131";
+}
+.fa-shield:before {
+ content: "\f132";
+}
+.fa-calendar-o:before {
+ content: "\f133";
+}
+.fa-fire-extinguisher:before {
+ content: "\f134";
+}
+.fa-rocket:before {
+ content: "\f135";
+}
+.fa-maxcdn:before {
+ content: "\f136";
+}
+.fa-chevron-circle-left:before {
+ content: "\f137";
+}
+.fa-chevron-circle-right:before {
+ content: "\f138";
+}
+.fa-chevron-circle-up:before {
+ content: "\f139";
+}
+.fa-chevron-circle-down:before {
+ content: "\f13a";
+}
+.fa-html5:before {
+ content: "\f13b";
+}
+.fa-css3:before {
+ content: "\f13c";
+}
+.fa-anchor:before {
+ content: "\f13d";
+}
+.fa-unlock-alt:before {
+ content: "\f13e";
+}
+.fa-bullseye:before {
+ content: "\f140";
+}
+.fa-ellipsis-h:before {
+ content: "\f141";
+}
+.fa-ellipsis-v:before {
+ content: "\f142";
+}
+.fa-rss-square:before {
+ content: "\f143";
+}
+.fa-play-circle:before {
+ content: "\f144";
+}
+.fa-ticket:before {
+ content: "\f145";
+}
+.fa-minus-square:before {
+ content: "\f146";
+}
+.fa-minus-square-o:before {
+ content: "\f147";
+}
+.fa-level-up:before {
+ content: "\f148";
+}
+.fa-level-down:before {
+ content: "\f149";
+}
+.fa-check-square:before {
+ content: "\f14a";
+}
+.fa-pencil-square:before {
+ content: "\f14b";
+}
+.fa-external-link-square:before {
+ content: "\f14c";
+}
+.fa-share-square:before {
+ content: "\f14d";
+}
+.fa-compass:before {
+ content: "\f14e";
+}
+.fa-toggle-down:before,
+.fa-caret-square-o-down:before {
+ content: "\f150";
+}
+.fa-toggle-up:before,
+.fa-caret-square-o-up:before {
+ content: "\f151";
+}
+.fa-toggle-right:before,
+.fa-caret-square-o-right:before {
+ content: "\f152";
+}
+.fa-euro:before,
+.fa-eur:before {
+ content: "\f153";
+}
+.fa-gbp:before {
+ content: "\f154";
+}
+.fa-dollar:before,
+.fa-usd:before {
+ content: "\f155";
+}
+.fa-rupee:before,
+.fa-inr:before {
+ content: "\f156";
+}
+.fa-cny:before,
+.fa-rmb:before,
+.fa-yen:before,
+.fa-jpy:before {
+ content: "\f157";
+}
+.fa-ruble:before,
+.fa-rouble:before,
+.fa-rub:before {
+ content: "\f158";
+}
+.fa-won:before,
+.fa-krw:before {
+ content: "\f159";
+}
+.fa-bitcoin:before,
+.fa-btc:before {
+ content: "\f15a";
+}
+.fa-file:before {
+ content: "\f15b";
+}
+.fa-file-text:before {
+ content: "\f15c";
+}
+.fa-sort-alpha-asc:before {
+ content: "\f15d";
+}
+.fa-sort-alpha-desc:before {
+ content: "\f15e";
+}
+.fa-sort-amount-asc:before {
+ content: "\f160";
+}
+.fa-sort-amount-desc:before {
+ content: "\f161";
+}
+.fa-sort-numeric-asc:before {
+ content: "\f162";
+}
+.fa-sort-numeric-desc:before {
+ content: "\f163";
+}
+.fa-thumbs-up:before {
+ content: "\f164";
+}
+.fa-thumbs-down:before {
+ content: "\f165";
+}
+.fa-youtube-square:before {
+ content: "\f166";
+}
+.fa-youtube:before {
+ content: "\f167";
+}
+.fa-xing:before {
+ content: "\f168";
+}
+.fa-xing-square:before {
+ content: "\f169";
+}
+.fa-youtube-play:before {
+ content: "\f16a";
+}
+.fa-dropbox:before {
+ content: "\f16b";
+}
+.fa-stack-overflow:before {
+ content: "\f16c";
+}
+.fa-instagram:before {
+ content: "\f16d";
+}
+.fa-flickr:before {
+ content: "\f16e";
+}
+.fa-adn:before {
+ content: "\f170";
+}
+.fa-bitbucket:before {
+ content: "\f171";
+}
+.fa-bitbucket-square:before {
+ content: "\f172";
+}
+.fa-tumblr:before {
+ content: "\f173";
+}
+.fa-tumblr-square:before {
+ content: "\f174";
+}
+.fa-long-arrow-down:before {
+ content: "\f175";
+}
+.fa-long-arrow-up:before {
+ content: "\f176";
+}
+.fa-long-arrow-left:before {
+ content: "\f177";
+}
+.fa-long-arrow-right:before {
+ content: "\f178";
+}
+.fa-apple:before {
+ content: "\f179";
+}
+.fa-windows:before {
+ content: "\f17a";
+}
+.fa-android:before {
+ content: "\f17b";
+}
+.fa-linux:before {
+ content: "\f17c";
+}
+.fa-dribbble:before {
+ content: "\f17d";
+}
+.fa-skype:before {
+ content: "\f17e";
+}
+.fa-foursquare:before {
+ content: "\f180";
+}
+.fa-trello:before {
+ content: "\f181";
+}
+.fa-female:before {
+ content: "\f182";
+}
+.fa-male:before {
+ content: "\f183";
+}
+.fa-gittip:before,
+.fa-gratipay:before {
+ content: "\f184";
+}
+.fa-sun-o:before {
+ content: "\f185";
+}
+.fa-moon-o:before {
+ content: "\f186";
+}
+.fa-archive:before {
+ content: "\f187";
+}
+.fa-bug:before {
+ content: "\f188";
+}
+.fa-vk:before {
+ content: "\f189";
+}
+.fa-weibo:before {
+ content: "\f18a";
+}
+.fa-renren:before {
+ content: "\f18b";
+}
+.fa-pagelines:before {
+ content: "\f18c";
+}
+.fa-stack-exchange:before {
+ content: "\f18d";
+}
+.fa-arrow-circle-o-right:before {
+ content: "\f18e";
+}
+.fa-arrow-circle-o-left:before {
+ content: "\f190";
+}
+.fa-toggle-left:before,
+.fa-caret-square-o-left:before {
+ content: "\f191";
+}
+.fa-dot-circle-o:before {
+ content: "\f192";
+}
+.fa-wheelchair:before {
+ content: "\f193";
+}
+.fa-vimeo-square:before {
+ content: "\f194";
+}
+.fa-turkish-lira:before,
+.fa-try:before {
+ content: "\f195";
+}
+.fa-plus-square-o:before {
+ content: "\f196";
+}
+.fa-space-shuttle:before {
+ content: "\f197";
+}
+.fa-slack:before {
+ content: "\f198";
+}
+.fa-envelope-square:before {
+ content: "\f199";
+}
+.fa-wordpress:before {
+ content: "\f19a";
+}
+.fa-openid:before {
+ content: "\f19b";
+}
+.fa-institution:before,
+.fa-bank:before,
+.fa-university:before {
+ content: "\f19c";
+}
+.fa-mortar-board:before,
+.fa-graduation-cap:before {
+ content: "\f19d";
+}
+.fa-yahoo:before {
+ content: "\f19e";
+}
+.fa-google:before {
+ content: "\f1a0";
+}
+.fa-reddit:before {
+ content: "\f1a1";
+}
+.fa-reddit-square:before {
+ content: "\f1a2";
+}
+.fa-stumbleupon-circle:before {
+ content: "\f1a3";
+}
+.fa-stumbleupon:before {
+ content: "\f1a4";
+}
+.fa-delicious:before {
+ content: "\f1a5";
+}
+.fa-digg:before {
+ content: "\f1a6";
+}
+.fa-pied-piper:before {
+ content: "\f1a7";
+}
+.fa-pied-piper-alt:before {
+ content: "\f1a8";
+}
+.fa-drupal:before {
+ content: "\f1a9";
+}
+.fa-joomla:before {
+ content: "\f1aa";
+}
+.fa-language:before {
+ content: "\f1ab";
+}
+.fa-fax:before {
+ content: "\f1ac";
+}
+.fa-building:before {
+ content: "\f1ad";
+}
+.fa-child:before {
+ content: "\f1ae";
+}
+.fa-paw:before {
+ content: "\f1b0";
+}
+.fa-spoon:before {
+ content: "\f1b1";
+}
+.fa-cube:before {
+ content: "\f1b2";
+}
+.fa-cubes:before {
+ content: "\f1b3";
+}
+.fa-behance:before {
+ content: "\f1b4";
+}
+.fa-behance-square:before {
+ content: "\f1b5";
+}
+.fa-steam:before {
+ content: "\f1b6";
+}
+.fa-steam-square:before {
+ content: "\f1b7";
+}
+.fa-recycle:before {
+ content: "\f1b8";
+}
+.fa-automobile:before,
+.fa-car:before {
+ content: "\f1b9";
+}
+.fa-cab:before,
+.fa-taxi:before {
+ content: "\f1ba";
+}
+.fa-tree:before {
+ content: "\f1bb";
+}
+.fa-spotify:before {
+ content: "\f1bc";
+}
+.fa-deviantart:before {
+ content: "\f1bd";
+}
+.fa-soundcloud:before {
+ content: "\f1be";
+}
+.fa-database:before {
+ content: "\f1c0";
+}
+.fa-file-pdf-o:before {
+ content: "\f1c1";
+}
+.fa-file-word-o:before {
+ content: "\f1c2";
+}
+.fa-file-excel-o:before {
+ content: "\f1c3";
+}
+.fa-file-powerpoint-o:before {
+ content: "\f1c4";
+}
+.fa-file-photo-o:before,
+.fa-file-picture-o:before,
+.fa-file-image-o:before {
+ content: "\f1c5";
+}
+.fa-file-zip-o:before,
+.fa-file-archive-o:before {
+ content: "\f1c6";
+}
+.fa-file-sound-o:before,
+.fa-file-audio-o:before {
+ content: "\f1c7";
+}
+.fa-file-movie-o:before,
+.fa-file-video-o:before {
+ content: "\f1c8";
+}
+.fa-file-code-o:before {
+ content: "\f1c9";
+}
+.fa-vine:before {
+ content: "\f1ca";
+}
+.fa-codepen:before {
+ content: "\f1cb";
+}
+.fa-jsfiddle:before {
+ content: "\f1cc";
+}
+.fa-life-bouy:before,
+.fa-life-buoy:before,
+.fa-life-saver:before,
+.fa-support:before,
+.fa-life-ring:before {
+ content: "\f1cd";
+}
+.fa-circle-o-notch:before {
+ content: "\f1ce";
+}
+.fa-ra:before,
+.fa-rebel:before {
+ content: "\f1d0";
+}
+.fa-ge:before,
+.fa-empire:before {
+ content: "\f1d1";
+}
+.fa-git-square:before {
+ content: "\f1d2";
+}
+.fa-git:before {
+ content: "\f1d3";
+}
+.fa-y-combinator-square:before,
+.fa-yc-square:before,
+.fa-hacker-news:before {
+ content: "\f1d4";
+}
+.fa-tencent-weibo:before {
+ content: "\f1d5";
+}
+.fa-qq:before {
+ content: "\f1d6";
+}
+.fa-wechat:before,
+.fa-weixin:before {
+ content: "\f1d7";
+}
+.fa-send:before,
+.fa-paper-plane:before {
+ content: "\f1d8";
+}
+.fa-send-o:before,
+.fa-paper-plane-o:before {
+ content: "\f1d9";
+}
+.fa-history:before {
+ content: "\f1da";
+}
+.fa-circle-thin:before {
+ content: "\f1db";
+}
+.fa-header:before {
+ content: "\f1dc";
+}
+.fa-paragraph:before {
+ content: "\f1dd";
+}
+.fa-sliders:before {
+ content: "\f1de";
+}
+.fa-share-alt:before {
+ content: "\f1e0";
+}
+.fa-share-alt-square:before {
+ content: "\f1e1";
+}
+.fa-bomb:before {
+ content: "\f1e2";
+}
+.fa-soccer-ball-o:before,
+.fa-futbol-o:before {
+ content: "\f1e3";
+}
+.fa-tty:before {
+ content: "\f1e4";
+}
+.fa-binoculars:before {
+ content: "\f1e5";
+}
+.fa-plug:before {
+ content: "\f1e6";
+}
+.fa-slideshare:before {
+ content: "\f1e7";
+}
+.fa-twitch:before {
+ content: "\f1e8";
+}
+.fa-yelp:before {
+ content: "\f1e9";
+}
+.fa-newspaper-o:before {
+ content: "\f1ea";
+}
+.fa-wifi:before {
+ content: "\f1eb";
+}
+.fa-calculator:before {
+ content: "\f1ec";
+}
+.fa-paypal:before {
+ content: "\f1ed";
+}
+.fa-google-wallet:before {
+ content: "\f1ee";
+}
+.fa-cc-visa:before {
+ content: "\f1f0";
+}
+.fa-cc-mastercard:before {
+ content: "\f1f1";
+}
+.fa-cc-discover:before {
+ content: "\f1f2";
+}
+.fa-cc-amex:before {
+ content: "\f1f3";
+}
+.fa-cc-paypal:before {
+ content: "\f1f4";
+}
+.fa-cc-stripe:before {
+ content: "\f1f5";
+}
+.fa-bell-slash:before {
+ content: "\f1f6";
+}
+.fa-bell-slash-o:before {
+ content: "\f1f7";
+}
+.fa-trash:before {
+ content: "\f1f8";
+}
+.fa-copyright:before {
+ content: "\f1f9";
+}
+.fa-at:before {
+ content: "\f1fa";
+}
+.fa-eyedropper:before {
+ content: "\f1fb";
+}
+.fa-paint-brush:before {
+ content: "\f1fc";
+}
+.fa-birthday-cake:before {
+ content: "\f1fd";
+}
+.fa-area-chart:before {
+ content: "\f1fe";
+}
+.fa-pie-chart:before {
+ content: "\f200";
+}
+.fa-line-chart:before {
+ content: "\f201";
+}
+.fa-lastfm:before {
+ content: "\f202";
+}
+.fa-lastfm-square:before {
+ content: "\f203";
+}
+.fa-toggle-off:before {
+ content: "\f204";
+}
+.fa-toggle-on:before {
+ content: "\f205";
+}
+.fa-bicycle:before {
+ content: "\f206";
+}
+.fa-bus:before {
+ content: "\f207";
+}
+.fa-ioxhost:before {
+ content: "\f208";
+}
+.fa-angellist:before {
+ content: "\f209";
+}
+.fa-cc:before {
+ content: "\f20a";
+}
+.fa-shekel:before,
+.fa-sheqel:before,
+.fa-ils:before {
+ content: "\f20b";
+}
+.fa-meanpath:before {
+ content: "\f20c";
+}
+.fa-buysellads:before {
+ content: "\f20d";
+}
+.fa-connectdevelop:before {
+ content: "\f20e";
+}
+.fa-dashcube:before {
+ content: "\f210";
+}
+.fa-forumbee:before {
+ content: "\f211";
+}
+.fa-leanpub:before {
+ content: "\f212";
+}
+.fa-sellsy:before {
+ content: "\f213";
+}
+.fa-shirtsinbulk:before {
+ content: "\f214";
+}
+.fa-simplybuilt:before {
+ content: "\f215";
+}
+.fa-skyatlas:before {
+ content: "\f216";
+}
+.fa-cart-plus:before {
+ content: "\f217";
+}
+.fa-cart-arrow-down:before {
+ content: "\f218";
+}
+.fa-diamond:before {
+ content: "\f219";
+}
+.fa-ship:before {
+ content: "\f21a";
+}
+.fa-user-secret:before {
+ content: "\f21b";
+}
+.fa-motorcycle:before {
+ content: "\f21c";
+}
+.fa-street-view:before {
+ content: "\f21d";
+}
+.fa-heartbeat:before {
+ content: "\f21e";
+}
+.fa-venus:before {
+ content: "\f221";
+}
+.fa-mars:before {
+ content: "\f222";
+}
+.fa-mercury:before {
+ content: "\f223";
+}
+.fa-intersex:before,
+.fa-transgender:before {
+ content: "\f224";
+}
+.fa-transgender-alt:before {
+ content: "\f225";
+}
+.fa-venus-double:before {
+ content: "\f226";
+}
+.fa-mars-double:before {
+ content: "\f227";
+}
+.fa-venus-mars:before {
+ content: "\f228";
+}
+.fa-mars-stroke:before {
+ content: "\f229";
+}
+.fa-mars-stroke-v:before {
+ content: "\f22a";
+}
+.fa-mars-stroke-h:before {
+ content: "\f22b";
+}
+.fa-neuter:before {
+ content: "\f22c";
+}
+.fa-genderless:before {
+ content: "\f22d";
+}
+.fa-facebook-official:before {
+ content: "\f230";
+}
+.fa-pinterest-p:before {
+ content: "\f231";
+}
+.fa-whatsapp:before {
+ content: "\f232";
+}
+.fa-server:before {
+ content: "\f233";
+}
+.fa-user-plus:before {
+ content: "\f234";
+}
+.fa-user-times:before {
+ content: "\f235";
+}
+.fa-hotel:before,
+.fa-bed:before {
+ content: "\f236";
+}
+.fa-viacoin:before {
+ content: "\f237";
+}
+.fa-train:before {
+ content: "\f238";
+}
+.fa-subway:before {
+ content: "\f239";
+}
+.fa-medium:before {
+ content: "\f23a";
+}
+.fa-yc:before,
+.fa-y-combinator:before {
+ content: "\f23b";
+}
+.fa-optin-monster:before {
+ content: "\f23c";
+}
+.fa-opencart:before {
+ content: "\f23d";
+}
+.fa-expeditedssl:before {
+ content: "\f23e";
+}
+.fa-battery-4:before,
+.fa-battery-full:before {
+ content: "\f240";
+}
+.fa-battery-3:before,
+.fa-battery-three-quarters:before {
+ content: "\f241";
+}
+.fa-battery-2:before,
+.fa-battery-half:before {
+ content: "\f242";
+}
+.fa-battery-1:before,
+.fa-battery-quarter:before {
+ content: "\f243";
+}
+.fa-battery-0:before,
+.fa-battery-empty:before {
+ content: "\f244";
+}
+.fa-mouse-pointer:before {
+ content: "\f245";
+}
+.fa-i-cursor:before {
+ content: "\f246";
+}
+.fa-object-group:before {
+ content: "\f247";
+}
+.fa-object-ungroup:before {
+ content: "\f248";
+}
+.fa-sticky-note:before {
+ content: "\f249";
+}
+.fa-sticky-note-o:before {
+ content: "\f24a";
+}
+.fa-cc-jcb:before {
+ content: "\f24b";
+}
+.fa-cc-diners-club:before {
+ content: "\f24c";
+}
+.fa-clone:before {
+ content: "\f24d";
+}
+.fa-balance-scale:before {
+ content: "\f24e";
+}
+.fa-hourglass-o:before {
+ content: "\f250";
+}
+.fa-hourglass-1:before,
+.fa-hourglass-start:before {
+ content: "\f251";
+}
+.fa-hourglass-2:before,
+.fa-hourglass-half:before {
+ content: "\f252";
+}
+.fa-hourglass-3:before,
+.fa-hourglass-end:before {
+ content: "\f253";
+}
+.fa-hourglass:before {
+ content: "\f254";
+}
+.fa-hand-grab-o:before,
+.fa-hand-rock-o:before {
+ content: "\f255";
+}
+.fa-hand-stop-o:before,
+.fa-hand-paper-o:before {
+ content: "\f256";
+}
+.fa-hand-scissors-o:before {
+ content: "\f257";
+}
+.fa-hand-lizard-o:before {
+ content: "\f258";
+}
+.fa-hand-spock-o:before {
+ content: "\f259";
+}
+.fa-hand-pointer-o:before {
+ content: "\f25a";
+}
+.fa-hand-peace-o:before {
+ content: "\f25b";
+}
+.fa-trademark:before {
+ content: "\f25c";
+}
+.fa-registered:before {
+ content: "\f25d";
+}
+.fa-creative-commons:before {
+ content: "\f25e";
+}
+.fa-gg:before {
+ content: "\f260";
+}
+.fa-gg-circle:before {
+ content: "\f261";
+}
+.fa-tripadvisor:before {
+ content: "\f262";
+}
+.fa-odnoklassniki:before {
+ content: "\f263";
+}
+.fa-odnoklassniki-square:before {
+ content: "\f264";
+}
+.fa-get-pocket:before {
+ content: "\f265";
+}
+.fa-wikipedia-w:before {
+ content: "\f266";
+}
+.fa-safari:before {
+ content: "\f267";
+}
+.fa-chrome:before {
+ content: "\f268";
+}
+.fa-firefox:before {
+ content: "\f269";
+}
+.fa-opera:before {
+ content: "\f26a";
+}
+.fa-internet-explorer:before {
+ content: "\f26b";
+}
+.fa-tv:before,
+.fa-television:before {
+ content: "\f26c";
+}
+.fa-contao:before {
+ content: "\f26d";
+}
+.fa-500px:before {
+ content: "\f26e";
+}
+.fa-amazon:before {
+ content: "\f270";
+}
+.fa-calendar-plus-o:before {
+ content: "\f271";
+}
+.fa-calendar-minus-o:before {
+ content: "\f272";
+}
+.fa-calendar-times-o:before {
+ content: "\f273";
+}
+.fa-calendar-check-o:before {
+ content: "\f274";
+}
+.fa-industry:before {
+ content: "\f275";
+}
+.fa-map-pin:before {
+ content: "\f276";
+}
+.fa-map-signs:before {
+ content: "\f277";
+}
+.fa-map-o:before {
+ content: "\f278";
+}
+.fa-map:before {
+ content: "\f279";
+}
+.fa-commenting:before {
+ content: "\f27a";
+}
+.fa-commenting-o:before {
+ content: "\f27b";
+}
+.fa-houzz:before {
+ content: "\f27c";
+}
+.fa-vimeo:before {
+ content: "\f27d";
+}
+.fa-black-tie:before {
+ content: "\f27e";
+}
+.fa-fonticons:before {
+ content: "\f280";
+}
diff --git a/management/guns-admin/src/main/webapp/static/css/font-awesome.min.css b/management/guns-admin/src/main/webapp/static/css/font-awesome.min.css
new file mode 100644
index 0000000..ee4e978
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/static/css/font-awesome.min.css
@@ -0,0 +1,4 @@
+/*!
+ * Font Awesome 4.4.0 by @davegandy - http://fontawesome.io - @fontawesome
+ * License - http://fontawesome.io/license (Font: SIL OFL 1.1, CSS: MIT License)
+ */@font-face{font-family:'FontAwesome';src:url('../fonts/fontawesome-webfont.eot?v=4.4.0');src:url('../fonts/fontawesome-webfont.eot?#iefix&v=4.4.0') format('embedded-opentype'),url('../fonts/fontawesome-webfont.woff2?v=4.4.0') format('woff2'),url('../fonts/fontawesome-webfont.woff?v=4.4.0') format('woff'),url('../fonts/fontawesome-webfont.ttf?v=4.4.0') format('truetype'),url('../fonts/fontawesome-webfont.svg?v=4.4.0#fontawesomeregular') format('svg');font-weight:normal;font-style:normal}.fa{display:inline-block;font:normal normal normal 14px/1 FontAwesome;font-size:inherit;text-rendering:auto;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}.fa-lg{font-size:1.33333333em;line-height:.75em;vertical-align:-15%}.fa-2x{font-size:2em}.fa-3x{font-size:3em}.fa-4x{font-size:4em}.fa-5x{font-size:5em}.fa-fw{width:1.28571429em;text-align:center}.fa-ul{padding-left:0;margin-left:2.14285714em;list-style-type:none}.fa-ul>li{position:relative}.fa-li{position:absolute;left:-2.14285714em;width:2.14285714em;top:.14285714em;text-align:center}.fa-li.fa-lg{left:-1.85714286em}.fa-border{padding:.2em .25em .15em;border:solid .08em #eee;border-radius:.1em}.fa-pull-left{float:left}.fa-pull-right{float:right}.fa.fa-pull-left{margin-right:.3em}.fa.fa-pull-right{margin-left:.3em}.pull-right{float:right}.pull-left{float:left}.fa.pull-left{margin-right:.3em}.fa.pull-right{margin-left:.3em}.fa-spin{-webkit-animation:fa-spin 2s infinite linear;animation:fa-spin 2s infinite linear}.fa-pulse{-webkit-animation:fa-spin 1s infinite steps(8);animation:fa-spin 1s infinite steps(8)}@-webkit-keyframes fa-spin{0%{-webkit-transform:rotate(0deg);transform:rotate(0deg)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes fa-spin{0%{-webkit-transform:rotate(0deg);transform:rotate(0deg)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}.fa-rotate-90{filter:progid:DXImageTransform.Microsoft.BasicImage(rotation=1);-webkit-transform:rotate(90deg);-ms-transform:rotate(90deg);transform:rotate(90deg)}.fa-rotate-180{filter:progid:DXImageTransform.Microsoft.BasicImage(rotation=2);-webkit-transform:rotate(180deg);-ms-transform:rotate(180deg);transform:rotate(180deg)}.fa-rotate-270{filter:progid:DXImageTransform.Microsoft.BasicImage(rotation=3);-webkit-transform:rotate(270deg);-ms-transform:rotate(270deg);transform:rotate(270deg)}.fa-flip-horizontal{filter:progid:DXImageTransform.Microsoft.BasicImage(rotation=0, mirror=1);-webkit-transform:scale(-1, 1);-ms-transform:scale(-1, 1);transform:scale(-1, 1)}.fa-flip-vertical{filter:progid:DXImageTransform.Microsoft.BasicImage(rotation=2, mirror=1);-webkit-transform:scale(1, -1);-ms-transform:scale(1, -1);transform:scale(1, -1)}:root .fa-rotate-90,:root .fa-rotate-180,:root .fa-rotate-270,:root .fa-flip-horizontal,:root .fa-flip-vertical{filter:none}.fa-stack{position:relative;display:inline-block;width:2em;height:2em;line-height:2em;vertical-align:middle}.fa-stack-1x,.fa-stack-2x{position:absolute;left:0;width:100%;text-align:center}.fa-stack-1x{line-height:inherit}.fa-stack-2x{font-size:2em}.fa-inverse{color:#fff}.fa-glass:before{content:"\f000"}.fa-music:before{content:"\f001"}.fa-search:before{content:"\f002"}.fa-envelope-o:before{content:"\f003"}.fa-heart:before{content:"\f004"}.fa-star:before{content:"\f005"}.fa-star-o:before{content:"\f006"}.fa-user:before{content:"\f007"}.fa-film:before{content:"\f008"}.fa-th-large:before{content:"\f009"}.fa-th:before{content:"\f00a"}.fa-th-list:before{content:"\f00b"}.fa-check:before{content:"\f00c"}.fa-remove:before,.fa-close:before,.fa-times:before{content:"\f00d"}.fa-search-plus:before{content:"\f00e"}.fa-search-minus:before{content:"\f010"}.fa-power-off:before{content:"\f011"}.fa-signal:before{content:"\f012"}.fa-gear:before,.fa-cog:before{content:"\f013"}.fa-trash-o:before{content:"\f014"}.fa-home:before{content:"\f015"}.fa-file-o:before{content:"\f016"}.fa-clock-o:before{content:"\f017"}.fa-road:before{content:"\f018"}.fa-download:before{content:"\f019"}.fa-arrow-circle-o-down:before{content:"\f01a"}.fa-arrow-circle-o-up:before{content:"\f01b"}.fa-inbox:before{content:"\f01c"}.fa-play-circle-o:before{content:"\f01d"}.fa-rotate-right:before,.fa-repeat:before{content:"\f01e"}.fa-refresh:before{content:"\f021"}.fa-list-alt:before{content:"\f022"}.fa-lock:before{content:"\f023"}.fa-flag:before{content:"\f024"}.fa-headphones:before{content:"\f025"}.fa-volume-off:before{content:"\f026"}.fa-volume-down:before{content:"\f027"}.fa-volume-up:before{content:"\f028"}.fa-qrcode:before{content:"\f029"}.fa-barcode:before{content:"\f02a"}.fa-tag:before{content:"\f02b"}.fa-tags:before{content:"\f02c"}.fa-book:before{content:"\f02d"}.fa-bookmark:before{content:"\f02e"}.fa-print:before{content:"\f02f"}.fa-camera:before{content:"\f030"}.fa-font:before{content:"\f031"}.fa-bold:before{content:"\f032"}.fa-italic:before{content:"\f033"}.fa-text-height:before{content:"\f034"}.fa-text-width:before{content:"\f035"}.fa-align-left:before{content:"\f036"}.fa-align-center:before{content:"\f037"}.fa-align-right:before{content:"\f038"}.fa-align-justify:before{content:"\f039"}.fa-list:before{content:"\f03a"}.fa-dedent:before,.fa-outdent:before{content:"\f03b"}.fa-indent:before{content:"\f03c"}.fa-video-camera:before{content:"\f03d"}.fa-photo:before,.fa-image:before,.fa-picture-o:before{content:"\f03e"}.fa-pencil:before{content:"\f040"}.fa-map-marker:before{content:"\f041"}.fa-adjust:before{content:"\f042"}.fa-tint:before{content:"\f043"}.fa-edit:before,.fa-pencil-square-o:before{content:"\f044"}.fa-share-square-o:before{content:"\f045"}.fa-check-square-o:before{content:"\f046"}.fa-arrows:before{content:"\f047"}.fa-step-backward:before{content:"\f048"}.fa-fast-backward:before{content:"\f049"}.fa-backward:before{content:"\f04a"}.fa-play:before{content:"\f04b"}.fa-pause:before{content:"\f04c"}.fa-stop:before{content:"\f04d"}.fa-forward:before{content:"\f04e"}.fa-fast-forward:before{content:"\f050"}.fa-step-forward:before{content:"\f051"}.fa-eject:before{content:"\f052"}.fa-chevron-left:before{content:"\f053"}.fa-chevron-right:before{content:"\f054"}.fa-plus-circle:before{content:"\f055"}.fa-minus-circle:before{content:"\f056"}.fa-times-circle:before{content:"\f057"}.fa-check-circle:before{content:"\f058"}.fa-question-circle:before{content:"\f059"}.fa-info-circle:before{content:"\f05a"}.fa-crosshairs:before{content:"\f05b"}.fa-times-circle-o:before{content:"\f05c"}.fa-check-circle-o:before{content:"\f05d"}.fa-ban:before{content:"\f05e"}.fa-arrow-left:before{content:"\f060"}.fa-arrow-right:before{content:"\f061"}.fa-arrow-up:before{content:"\f062"}.fa-arrow-down:before{content:"\f063"}.fa-mail-forward:before,.fa-share:before{content:"\f064"}.fa-expand:before{content:"\f065"}.fa-compress:before{content:"\f066"}.fa-plus:before{content:"\f067"}.fa-minus:before{content:"\f068"}.fa-asterisk:before{content:"\f069"}.fa-exclamation-circle:before{content:"\f06a"}.fa-gift:before{content:"\f06b"}.fa-leaf:before{content:"\f06c"}.fa-fire:before{content:"\f06d"}.fa-eye:before{content:"\f06e"}.fa-eye-slash:before{content:"\f070"}.fa-warning:before,.fa-exclamation-triangle:before{content:"\f071"}.fa-plane:before{content:"\f072"}.fa-calendar:before{content:"\f073"}.fa-random:before{content:"\f074"}.fa-comment:before{content:"\f075"}.fa-magnet:before{content:"\f076"}.fa-chevron-up:before{content:"\f077"}.fa-chevron-down:before{content:"\f078"}.fa-retweet:before{content:"\f079"}.fa-shopping-cart:before{content:"\f07a"}.fa-folder:before{content:"\f07b"}.fa-folder-open:before{content:"\f07c"}.fa-arrows-v:before{content:"\f07d"}.fa-arrows-h:before{content:"\f07e"}.fa-bar-chart-o:before,.fa-bar-chart:before{content:"\f080"}.fa-twitter-square:before{content:"\f081"}.fa-facebook-square:before{content:"\f082"}.fa-camera-retro:before{content:"\f083"}.fa-key:before{content:"\f084"}.fa-gears:before,.fa-cogs:before{content:"\f085"}.fa-comments:before{content:"\f086"}.fa-thumbs-o-up:before{content:"\f087"}.fa-thumbs-o-down:before{content:"\f088"}.fa-star-half:before{content:"\f089"}.fa-heart-o:before{content:"\f08a"}.fa-sign-out:before{content:"\f08b"}.fa-linkedin-square:before{content:"\f08c"}.fa-thumb-tack:before{content:"\f08d"}.fa-external-link:before{content:"\f08e"}.fa-sign-in:before{content:"\f090"}.fa-trophy:before{content:"\f091"}.fa-github-square:before{content:"\f092"}.fa-upload:before{content:"\f093"}.fa-lemon-o:before{content:"\f094"}.fa-phone:before{content:"\f095"}.fa-square-o:before{content:"\f096"}.fa-bookmark-o:before{content:"\f097"}.fa-phone-square:before{content:"\f098"}.fa-twitter:before{content:"\f099"}.fa-facebook-f:before,.fa-facebook:before{content:"\f09a"}.fa-github:before{content:"\f09b"}.fa-unlock:before{content:"\f09c"}.fa-credit-card:before{content:"\f09d"}.fa-feed:before,.fa-rss:before{content:"\f09e"}.fa-hdd-o:before{content:"\f0a0"}.fa-bullhorn:before{content:"\f0a1"}.fa-bell:before{content:"\f0f3"}.fa-certificate:before{content:"\f0a3"}.fa-hand-o-right:before{content:"\f0a4"}.fa-hand-o-left:before{content:"\f0a5"}.fa-hand-o-up:before{content:"\f0a6"}.fa-hand-o-down:before{content:"\f0a7"}.fa-arrow-circle-left:before{content:"\f0a8"}.fa-arrow-circle-right:before{content:"\f0a9"}.fa-arrow-circle-up:before{content:"\f0aa"}.fa-arrow-circle-down:before{content:"\f0ab"}.fa-globe:before{content:"\f0ac"}.fa-wrench:before{content:"\f0ad"}.fa-tasks:before{content:"\f0ae"}.fa-filter:before{content:"\f0b0"}.fa-briefcase:before{content:"\f0b1"}.fa-arrows-alt:before{content:"\f0b2"}.fa-group:before,.fa-users:before{content:"\f0c0"}.fa-chain:before,.fa-link:before{content:"\f0c1"}.fa-cloud:before{content:"\f0c2"}.fa-flask:before{content:"\f0c3"}.fa-cut:before,.fa-scissors:before{content:"\f0c4"}.fa-copy:before,.fa-files-o:before{content:"\f0c5"}.fa-paperclip:before{content:"\f0c6"}.fa-save:before,.fa-floppy-o:before{content:"\f0c7"}.fa-square:before{content:"\f0c8"}.fa-navicon:before,.fa-reorder:before,.fa-bars:before{content:"\f0c9"}.fa-list-ul:before{content:"\f0ca"}.fa-list-ol:before{content:"\f0cb"}.fa-strikethrough:before{content:"\f0cc"}.fa-underline:before{content:"\f0cd"}.fa-table:before{content:"\f0ce"}.fa-magic:before{content:"\f0d0"}.fa-truck:before{content:"\f0d1"}.fa-pinterest:before{content:"\f0d2"}.fa-pinterest-square:before{content:"\f0d3"}.fa-google-plus-square:before{content:"\f0d4"}.fa-google-plus:before{content:"\f0d5"}.fa-money:before{content:"\f0d6"}.fa-caret-down:before{content:"\f0d7"}.fa-caret-up:before{content:"\f0d8"}.fa-caret-left:before{content:"\f0d9"}.fa-caret-right:before{content:"\f0da"}.fa-columns:before{content:"\f0db"}.fa-unsorted:before,.fa-sort:before{content:"\f0dc"}.fa-sort-down:before,.fa-sort-desc:before{content:"\f0dd"}.fa-sort-up:before,.fa-sort-asc:before{content:"\f0de"}.fa-envelope:before{content:"\f0e0"}.fa-linkedin:before{content:"\f0e1"}.fa-rotate-left:before,.fa-undo:before{content:"\f0e2"}.fa-legal:before,.fa-gavel:before{content:"\f0e3"}.fa-dashboard:before,.fa-tachometer:before{content:"\f0e4"}.fa-comment-o:before{content:"\f0e5"}.fa-comments-o:before{content:"\f0e6"}.fa-flash:before,.fa-bolt:before{content:"\f0e7"}.fa-sitemap:before{content:"\f0e8"}.fa-umbrella:before{content:"\f0e9"}.fa-paste:before,.fa-clipboard:before{content:"\f0ea"}.fa-lightbulb-o:before{content:"\f0eb"}.fa-exchange:before{content:"\f0ec"}.fa-cloud-download:before{content:"\f0ed"}.fa-cloud-upload:before{content:"\f0ee"}.fa-user-md:before{content:"\f0f0"}.fa-stethoscope:before{content:"\f0f1"}.fa-suitcase:before{content:"\f0f2"}.fa-bell-o:before{content:"\f0a2"}.fa-coffee:before{content:"\f0f4"}.fa-cutlery:before{content:"\f0f5"}.fa-file-text-o:before{content:"\f0f6"}.fa-building-o:before{content:"\f0f7"}.fa-hospital-o:before{content:"\f0f8"}.fa-ambulance:before{content:"\f0f9"}.fa-medkit:before{content:"\f0fa"}.fa-fighter-jet:before{content:"\f0fb"}.fa-beer:before{content:"\f0fc"}.fa-h-square:before{content:"\f0fd"}.fa-plus-square:before{content:"\f0fe"}.fa-angle-double-left:before{content:"\f100"}.fa-angle-double-right:before{content:"\f101"}.fa-angle-double-up:before{content:"\f102"}.fa-angle-double-down:before{content:"\f103"}.fa-angle-left:before{content:"\f104"}.fa-angle-right:before{content:"\f105"}.fa-angle-up:before{content:"\f106"}.fa-angle-down:before{content:"\f107"}.fa-desktop:before{content:"\f108"}.fa-laptop:before{content:"\f109"}.fa-tablet:before{content:"\f10a"}.fa-mobile-phone:before,.fa-mobile:before{content:"\f10b"}.fa-circle-o:before{content:"\f10c"}.fa-quote-left:before{content:"\f10d"}.fa-quote-right:before{content:"\f10e"}.fa-spinner:before{content:"\f110"}.fa-circle:before{content:"\f111"}.fa-mail-reply:before,.fa-reply:before{content:"\f112"}.fa-github-alt:before{content:"\f113"}.fa-folder-o:before{content:"\f114"}.fa-folder-open-o:before{content:"\f115"}.fa-smile-o:before{content:"\f118"}.fa-frown-o:before{content:"\f119"}.fa-meh-o:before{content:"\f11a"}.fa-gamepad:before{content:"\f11b"}.fa-keyboard-o:before{content:"\f11c"}.fa-flag-o:before{content:"\f11d"}.fa-flag-checkered:before{content:"\f11e"}.fa-terminal:before{content:"\f120"}.fa-code:before{content:"\f121"}.fa-mail-reply-all:before,.fa-reply-all:before{content:"\f122"}.fa-star-half-empty:before,.fa-star-half-full:before,.fa-star-half-o:before{content:"\f123"}.fa-location-arrow:before{content:"\f124"}.fa-crop:before{content:"\f125"}.fa-code-fork:before{content:"\f126"}.fa-unlink:before,.fa-chain-broken:before{content:"\f127"}.fa-question:before{content:"\f128"}.fa-info:before{content:"\f129"}.fa-exclamation:before{content:"\f12a"}.fa-superscript:before{content:"\f12b"}.fa-subscript:before{content:"\f12c"}.fa-eraser:before{content:"\f12d"}.fa-puzzle-piece:before{content:"\f12e"}.fa-microphone:before{content:"\f130"}.fa-microphone-slash:before{content:"\f131"}.fa-shield:before{content:"\f132"}.fa-calendar-o:before{content:"\f133"}.fa-fire-extinguisher:before{content:"\f134"}.fa-rocket:before{content:"\f135"}.fa-maxcdn:before{content:"\f136"}.fa-chevron-circle-left:before{content:"\f137"}.fa-chevron-circle-right:before{content:"\f138"}.fa-chevron-circle-up:before{content:"\f139"}.fa-chevron-circle-down:before{content:"\f13a"}.fa-html5:before{content:"\f13b"}.fa-css3:before{content:"\f13c"}.fa-anchor:before{content:"\f13d"}.fa-unlock-alt:before{content:"\f13e"}.fa-bullseye:before{content:"\f140"}.fa-ellipsis-h:before{content:"\f141"}.fa-ellipsis-v:before{content:"\f142"}.fa-rss-square:before{content:"\f143"}.fa-play-circle:before{content:"\f144"}.fa-ticket:before{content:"\f145"}.fa-minus-square:before{content:"\f146"}.fa-minus-square-o:before{content:"\f147"}.fa-level-up:before{content:"\f148"}.fa-level-down:before{content:"\f149"}.fa-check-square:before{content:"\f14a"}.fa-pencil-square:before{content:"\f14b"}.fa-external-link-square:before{content:"\f14c"}.fa-share-square:before{content:"\f14d"}.fa-compass:before{content:"\f14e"}.fa-toggle-down:before,.fa-caret-square-o-down:before{content:"\f150"}.fa-toggle-up:before,.fa-caret-square-o-up:before{content:"\f151"}.fa-toggle-right:before,.fa-caret-square-o-right:before{content:"\f152"}.fa-euro:before,.fa-eur:before{content:"\f153"}.fa-gbp:before{content:"\f154"}.fa-dollar:before,.fa-usd:before{content:"\f155"}.fa-rupee:before,.fa-inr:before{content:"\f156"}.fa-cny:before,.fa-rmb:before,.fa-yen:before,.fa-jpy:before{content:"\f157"}.fa-ruble:before,.fa-rouble:before,.fa-rub:before{content:"\f158"}.fa-won:before,.fa-krw:before{content:"\f159"}.fa-bitcoin:before,.fa-btc:before{content:"\f15a"}.fa-file:before{content:"\f15b"}.fa-file-text:before{content:"\f15c"}.fa-sort-alpha-asc:before{content:"\f15d"}.fa-sort-alpha-desc:before{content:"\f15e"}.fa-sort-amount-asc:before{content:"\f160"}.fa-sort-amount-desc:before{content:"\f161"}.fa-sort-numeric-asc:before{content:"\f162"}.fa-sort-numeric-desc:before{content:"\f163"}.fa-thumbs-up:before{content:"\f164"}.fa-thumbs-down:before{content:"\f165"}.fa-youtube-square:before{content:"\f166"}.fa-youtube:before{content:"\f167"}.fa-xing:before{content:"\f168"}.fa-xing-square:before{content:"\f169"}.fa-youtube-play:before{content:"\f16a"}.fa-dropbox:before{content:"\f16b"}.fa-stack-overflow:before{content:"\f16c"}.fa-instagram:before{content:"\f16d"}.fa-flickr:before{content:"\f16e"}.fa-adn:before{content:"\f170"}.fa-bitbucket:before{content:"\f171"}.fa-bitbucket-square:before{content:"\f172"}.fa-tumblr:before{content:"\f173"}.fa-tumblr-square:before{content:"\f174"}.fa-long-arrow-down:before{content:"\f175"}.fa-long-arrow-up:before{content:"\f176"}.fa-long-arrow-left:before{content:"\f177"}.fa-long-arrow-right:before{content:"\f178"}.fa-apple:before{content:"\f179"}.fa-windows:before{content:"\f17a"}.fa-android:before{content:"\f17b"}.fa-linux:before{content:"\f17c"}.fa-dribbble:before{content:"\f17d"}.fa-skype:before{content:"\f17e"}.fa-foursquare:before{content:"\f180"}.fa-trello:before{content:"\f181"}.fa-female:before{content:"\f182"}.fa-male:before{content:"\f183"}.fa-gittip:before,.fa-gratipay:before{content:"\f184"}.fa-sun-o:before{content:"\f185"}.fa-moon-o:before{content:"\f186"}.fa-archive:before{content:"\f187"}.fa-bug:before{content:"\f188"}.fa-vk:before{content:"\f189"}.fa-weibo:before{content:"\f18a"}.fa-renren:before{content:"\f18b"}.fa-pagelines:before{content:"\f18c"}.fa-stack-exchange:before{content:"\f18d"}.fa-arrow-circle-o-right:before{content:"\f18e"}.fa-arrow-circle-o-left:before{content:"\f190"}.fa-toggle-left:before,.fa-caret-square-o-left:before{content:"\f191"}.fa-dot-circle-o:before{content:"\f192"}.fa-wheelchair:before{content:"\f193"}.fa-vimeo-square:before{content:"\f194"}.fa-turkish-lira:before,.fa-try:before{content:"\f195"}.fa-plus-square-o:before{content:"\f196"}.fa-space-shuttle:before{content:"\f197"}.fa-slack:before{content:"\f198"}.fa-envelope-square:before{content:"\f199"}.fa-wordpress:before{content:"\f19a"}.fa-openid:before{content:"\f19b"}.fa-institution:before,.fa-bank:before,.fa-university:before{content:"\f19c"}.fa-mortar-board:before,.fa-graduation-cap:before{content:"\f19d"}.fa-yahoo:before{content:"\f19e"}.fa-google:before{content:"\f1a0"}.fa-reddit:before{content:"\f1a1"}.fa-reddit-square:before{content:"\f1a2"}.fa-stumbleupon-circle:before{content:"\f1a3"}.fa-stumbleupon:before{content:"\f1a4"}.fa-delicious:before{content:"\f1a5"}.fa-digg:before{content:"\f1a6"}.fa-pied-piper:before{content:"\f1a7"}.fa-pied-piper-alt:before{content:"\f1a8"}.fa-drupal:before{content:"\f1a9"}.fa-joomla:before{content:"\f1aa"}.fa-language:before{content:"\f1ab"}.fa-fax:before{content:"\f1ac"}.fa-building:before{content:"\f1ad"}.fa-child:before{content:"\f1ae"}.fa-paw:before{content:"\f1b0"}.fa-spoon:before{content:"\f1b1"}.fa-cube:before{content:"\f1b2"}.fa-cubes:before{content:"\f1b3"}.fa-behance:before{content:"\f1b4"}.fa-behance-square:before{content:"\f1b5"}.fa-steam:before{content:"\f1b6"}.fa-steam-square:before{content:"\f1b7"}.fa-recycle:before{content:"\f1b8"}.fa-automobile:before,.fa-car:before{content:"\f1b9"}.fa-cab:before,.fa-taxi:before{content:"\f1ba"}.fa-tree:before{content:"\f1bb"}.fa-spotify:before{content:"\f1bc"}.fa-deviantart:before{content:"\f1bd"}.fa-soundcloud:before{content:"\f1be"}.fa-database:before{content:"\f1c0"}.fa-file-pdf-o:before{content:"\f1c1"}.fa-file-word-o:before{content:"\f1c2"}.fa-file-excel-o:before{content:"\f1c3"}.fa-file-powerpoint-o:before{content:"\f1c4"}.fa-file-photo-o:before,.fa-file-picture-o:before,.fa-file-image-o:before{content:"\f1c5"}.fa-file-zip-o:before,.fa-file-archive-o:before{content:"\f1c6"}.fa-file-sound-o:before,.fa-file-audio-o:before{content:"\f1c7"}.fa-file-movie-o:before,.fa-file-video-o:before{content:"\f1c8"}.fa-file-code-o:before{content:"\f1c9"}.fa-vine:before{content:"\f1ca"}.fa-codepen:before{content:"\f1cb"}.fa-jsfiddle:before{content:"\f1cc"}.fa-life-bouy:before,.fa-life-buoy:before,.fa-life-saver:before,.fa-support:before,.fa-life-ring:before{content:"\f1cd"}.fa-circle-o-notch:before{content:"\f1ce"}.fa-ra:before,.fa-rebel:before{content:"\f1d0"}.fa-ge:before,.fa-empire:before{content:"\f1d1"}.fa-git-square:before{content:"\f1d2"}.fa-git:before{content:"\f1d3"}.fa-y-combinator-square:before,.fa-yc-square:before,.fa-hacker-news:before{content:"\f1d4"}.fa-tencent-weibo:before{content:"\f1d5"}.fa-qq:before{content:"\f1d6"}.fa-wechat:before,.fa-weixin:before{content:"\f1d7"}.fa-send:before,.fa-paper-plane:before{content:"\f1d8"}.fa-send-o:before,.fa-paper-plane-o:before{content:"\f1d9"}.fa-history:before{content:"\f1da"}.fa-circle-thin:before{content:"\f1db"}.fa-header:before{content:"\f1dc"}.fa-paragraph:before{content:"\f1dd"}.fa-sliders:before{content:"\f1de"}.fa-share-alt:before{content:"\f1e0"}.fa-share-alt-square:before{content:"\f1e1"}.fa-bomb:before{content:"\f1e2"}.fa-soccer-ball-o:before,.fa-futbol-o:before{content:"\f1e3"}.fa-tty:before{content:"\f1e4"}.fa-binoculars:before{content:"\f1e5"}.fa-plug:before{content:"\f1e6"}.fa-slideshare:before{content:"\f1e7"}.fa-twitch:before{content:"\f1e8"}.fa-yelp:before{content:"\f1e9"}.fa-newspaper-o:before{content:"\f1ea"}.fa-wifi:before{content:"\f1eb"}.fa-calculator:before{content:"\f1ec"}.fa-paypal:before{content:"\f1ed"}.fa-google-wallet:before{content:"\f1ee"}.fa-cc-visa:before{content:"\f1f0"}.fa-cc-mastercard:before{content:"\f1f1"}.fa-cc-discover:before{content:"\f1f2"}.fa-cc-amex:before{content:"\f1f3"}.fa-cc-paypal:before{content:"\f1f4"}.fa-cc-stripe:before{content:"\f1f5"}.fa-bell-slash:before{content:"\f1f6"}.fa-bell-slash-o:before{content:"\f1f7"}.fa-trash:before{content:"\f1f8"}.fa-copyright:before{content:"\f1f9"}.fa-at:before{content:"\f1fa"}.fa-eyedropper:before{content:"\f1fb"}.fa-paint-brush:before{content:"\f1fc"}.fa-birthday-cake:before{content:"\f1fd"}.fa-area-chart:before{content:"\f1fe"}.fa-pie-chart:before{content:"\f200"}.fa-line-chart:before{content:"\f201"}.fa-lastfm:before{content:"\f202"}.fa-lastfm-square:before{content:"\f203"}.fa-toggle-off:before{content:"\f204"}.fa-toggle-on:before{content:"\f205"}.fa-bicycle:before{content:"\f206"}.fa-bus:before{content:"\f207"}.fa-ioxhost:before{content:"\f208"}.fa-angellist:before{content:"\f209"}.fa-cc:before{content:"\f20a"}.fa-shekel:before,.fa-sheqel:before,.fa-ils:before{content:"\f20b"}.fa-meanpath:before{content:"\f20c"}.fa-buysellads:before{content:"\f20d"}.fa-connectdevelop:before{content:"\f20e"}.fa-dashcube:before{content:"\f210"}.fa-forumbee:before{content:"\f211"}.fa-leanpub:before{content:"\f212"}.fa-sellsy:before{content:"\f213"}.fa-shirtsinbulk:before{content:"\f214"}.fa-simplybuilt:before{content:"\f215"}.fa-skyatlas:before{content:"\f216"}.fa-cart-plus:before{content:"\f217"}.fa-cart-arrow-down:before{content:"\f218"}.fa-diamond:before{content:"\f219"}.fa-ship:before{content:"\f21a"}.fa-user-secret:before{content:"\f21b"}.fa-motorcycle:before{content:"\f21c"}.fa-street-view:before{content:"\f21d"}.fa-heartbeat:before{content:"\f21e"}.fa-venus:before{content:"\f221"}.fa-mars:before{content:"\f222"}.fa-mercury:before{content:"\f223"}.fa-intersex:before,.fa-transgender:before{content:"\f224"}.fa-transgender-alt:before{content:"\f225"}.fa-venus-double:before{content:"\f226"}.fa-mars-double:before{content:"\f227"}.fa-venus-mars:before{content:"\f228"}.fa-mars-stroke:before{content:"\f229"}.fa-mars-stroke-v:before{content:"\f22a"}.fa-mars-stroke-h:before{content:"\f22b"}.fa-neuter:before{content:"\f22c"}.fa-genderless:before{content:"\f22d"}.fa-facebook-official:before{content:"\f230"}.fa-pinterest-p:before{content:"\f231"}.fa-whatsapp:before{content:"\f232"}.fa-server:before{content:"\f233"}.fa-user-plus:before{content:"\f234"}.fa-user-times:before{content:"\f235"}.fa-hotel:before,.fa-bed:before{content:"\f236"}.fa-viacoin:before{content:"\f237"}.fa-train:before{content:"\f238"}.fa-subway:before{content:"\f239"}.fa-medium:before{content:"\f23a"}.fa-yc:before,.fa-y-combinator:before{content:"\f23b"}.fa-optin-monster:before{content:"\f23c"}.fa-opencart:before{content:"\f23d"}.fa-expeditedssl:before{content:"\f23e"}.fa-battery-4:before,.fa-battery-full:before{content:"\f240"}.fa-battery-3:before,.fa-battery-three-quarters:before{content:"\f241"}.fa-battery-2:before,.fa-battery-half:before{content:"\f242"}.fa-battery-1:before,.fa-battery-quarter:before{content:"\f243"}.fa-battery-0:before,.fa-battery-empty:before{content:"\f244"}.fa-mouse-pointer:before{content:"\f245"}.fa-i-cursor:before{content:"\f246"}.fa-object-group:before{content:"\f247"}.fa-object-ungroup:before{content:"\f248"}.fa-sticky-note:before{content:"\f249"}.fa-sticky-note-o:before{content:"\f24a"}.fa-cc-jcb:before{content:"\f24b"}.fa-cc-diners-club:before{content:"\f24c"}.fa-clone:before{content:"\f24d"}.fa-balance-scale:before{content:"\f24e"}.fa-hourglass-o:before{content:"\f250"}.fa-hourglass-1:before,.fa-hourglass-start:before{content:"\f251"}.fa-hourglass-2:before,.fa-hourglass-half:before{content:"\f252"}.fa-hourglass-3:before,.fa-hourglass-end:before{content:"\f253"}.fa-hourglass:before{content:"\f254"}.fa-hand-grab-o:before,.fa-hand-rock-o:before{content:"\f255"}.fa-hand-stop-o:before,.fa-hand-paper-o:before{content:"\f256"}.fa-hand-scissors-o:before{content:"\f257"}.fa-hand-lizard-o:before{content:"\f258"}.fa-hand-spock-o:before{content:"\f259"}.fa-hand-pointer-o:before{content:"\f25a"}.fa-hand-peace-o:before{content:"\f25b"}.fa-trademark:before{content:"\f25c"}.fa-registered:before{content:"\f25d"}.fa-creative-commons:before{content:"\f25e"}.fa-gg:before{content:"\f260"}.fa-gg-circle:before{content:"\f261"}.fa-tripadvisor:before{content:"\f262"}.fa-odnoklassniki:before{content:"\f263"}.fa-odnoklassniki-square:before{content:"\f264"}.fa-get-pocket:before{content:"\f265"}.fa-wikipedia-w:before{content:"\f266"}.fa-safari:before{content:"\f267"}.fa-chrome:before{content:"\f268"}.fa-firefox:before{content:"\f269"}.fa-opera:before{content:"\f26a"}.fa-internet-explorer:before{content:"\f26b"}.fa-tv:before,.fa-television:before{content:"\f26c"}.fa-contao:before{content:"\f26d"}.fa-500px:before{content:"\f26e"}.fa-amazon:before{content:"\f270"}.fa-calendar-plus-o:before{content:"\f271"}.fa-calendar-minus-o:before{content:"\f272"}.fa-calendar-times-o:before{content:"\f273"}.fa-calendar-check-o:before{content:"\f274"}.fa-industry:before{content:"\f275"}.fa-map-pin:before{content:"\f276"}.fa-map-signs:before{content:"\f277"}.fa-map-o:before{content:"\f278"}.fa-map:before{content:"\f279"}.fa-commenting:before{content:"\f27a"}.fa-commenting-o:before{content:"\f27b"}.fa-houzz:before{content:"\f27c"}.fa-vimeo:before{content:"\f27d"}.fa-black-tie:before{content:"\f27e"}.fa-fonticons:before{content:"\f280"}
diff --git a/management/guns-admin/src/main/webapp/static/css/login.css b/management/guns-admin/src/main/webapp/static/css/login.css
new file mode 100644
index 0000000..bfe8cb6
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/static/css/login.css
@@ -0,0 +1,93 @@
+html{height: 100%;}
+body.signin {
+ background: #18c8f6;
+ height: auto;
+ background:url("../img/login-background.jpg") no-repeat center fixed;
+ -webkit-background-size: cover;
+ -moz-background-size: cover;
+ -o-background-size: cover;
+ background-size: cover;
+ color: rgba(255,255,255,.95);
+}
+
+.signinpanel {
+ width: 750px;
+ margin: 10% auto 0 auto;
+}
+
+.signinpanel .logopanel {
+ float: none;
+ width: auto;
+ padding: 0;
+ background: none;
+}
+
+.signinpanel .signin-info ul {
+ list-style: none;
+ padding: 0;
+ margin: 20px 0;
+}
+
+.signinpanel .form-control {
+ display: block;
+ margin-top: 15px;
+}
+
+.signinpanel .uname {
+ background: #fff url(../img/user.png) no-repeat 95% center;color:#333;
+}
+
+.signinpanel .pword {
+ background: #fff url(../img/locked.png) no-repeat 95% center;color:#333;
+}
+
+.signinpanel .btn {
+ margin-top: 15px;
+}
+
+.signinpanel form {
+ background: rgba(255, 255, 255, 0.2);
+ border: 1px solid rgba(255,255,255,.3);
+ -moz-box-shadow: 0 3px 0 rgba(12, 12, 12, 0.03);
+ -webkit-box-shadow: 0 3px 0 rgba(12, 12, 12, 0.03);
+ box-shadow: 0 3px 0 rgba(12, 12, 12, 0.03);
+ -moz-border-radius: 3px;
+ -webkit-border-radius: 3px;
+ border-radius: 3px;
+ padding: 30px;
+}
+
+.signup-footer{border-top: solid 1px rgba(255,255,255,.3);margin:20px 0;padding-top: 15px;}
+
+@media screen and (max-width: 768px) {
+ .signinpanel,
+ .signuppanel {
+ margin: 0 auto;
+ width: 420px!important;
+ padding: 20px;
+ }
+ .signinpanel form {
+ margin-top: 20px;
+ }
+ .signup-footer {
+ margin-bottom: 10px;
+ }
+ .signuppanel .form-control {
+ margin-bottom: 10px;
+ }
+ .signup-footer .pull-left,
+ .signup-footer .pull-right {
+ float: none !important;
+ text-align: center;
+ }
+ .signinpanel .signin-info ul {
+ display: none;
+ }
+}
+@media screen and (max-width: 320px) {
+ .signinpanel,
+ .signuppanel {
+ margin:0 20px;
+ width:auto;
+ }
+}
diff --git a/management/guns-admin/src/main/webapp/static/css/patterns/header-profile-skin-1.png b/management/guns-admin/src/main/webapp/static/css/patterns/header-profile-skin-1.png
new file mode 100644
index 0000000..41c5c08
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/static/css/patterns/header-profile-skin-1.png
Binary files differ
diff --git a/management/guns-admin/src/main/webapp/static/css/patterns/header-profile-skin-3.png b/management/guns-admin/src/main/webapp/static/css/patterns/header-profile-skin-3.png
new file mode 100644
index 0000000..7a80132
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/static/css/patterns/header-profile-skin-3.png
Binary files differ
diff --git a/management/guns-admin/src/main/webapp/static/css/patterns/header-profile.png b/management/guns-admin/src/main/webapp/static/css/patterns/header-profile.png
new file mode 100644
index 0000000..7dea7f2
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/static/css/patterns/header-profile.png
Binary files differ
diff --git a/management/guns-admin/src/main/webapp/static/css/patterns/shattered.png b/management/guns-admin/src/main/webapp/static/css/patterns/shattered.png
new file mode 100644
index 0000000..90ed42b
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/static/css/patterns/shattered.png
Binary files differ
diff --git a/management/guns-admin/src/main/webapp/static/css/plugins/awesome-bootstrap-checkbox/awesome-bootstrap-checkbox.css b/management/guns-admin/src/main/webapp/static/css/plugins/awesome-bootstrap-checkbox/awesome-bootstrap-checkbox.css
new file mode 100644
index 0000000..f4e6575
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/static/css/plugins/awesome-bootstrap-checkbox/awesome-bootstrap-checkbox.css
@@ -0,0 +1,251 @@
+.checkbox {
+ padding-left: 20px;
+}
+.checkbox label {
+ display: inline-block;
+ vertical-align: middle;
+ position: relative;
+ padding-left: 5px;
+}
+.checkbox label::before {
+ content: "";
+ display: inline-block;
+ position: absolute;
+ width: 17px;
+ height: 17px;
+ left: 0;
+ margin-left: -20px;
+ border: 1px solid #cccccc;
+ border-radius: 3px;
+ background-color: #fff;
+ -webkit-transition: border 0.15s ease-in-out, color 0.15s ease-in-out;
+ -o-transition: border 0.15s ease-in-out, color 0.15s ease-in-out;
+ transition: border 0.15s ease-in-out, color 0.15s ease-in-out;
+}
+.checkbox label::after {
+ display: inline-block;
+ position: absolute;
+ width: 16px;
+ height: 16px;
+ left: 0;
+ top: 0;
+ margin-left: -20px;
+ padding-left: 3px;
+ padding-top: 1px;
+ font-size: 11px;
+ color: #555555;
+}
+.checkbox input[type="checkbox"],
+.checkbox input[type="radio"] {
+ opacity: 0;
+ z-index: 1;
+}
+.checkbox input[type="checkbox"]:focus + label::before,
+.checkbox input[type="radio"]:focus + label::before {
+ outline: thin dotted;
+ outline: 5px auto -webkit-focus-ring-color;
+ outline-offset: -2px;
+}
+.checkbox input[type="checkbox"]:checked + label::after,
+.checkbox input[type="radio"]:checked + label::after {
+ font-family: "FontAwesome";
+ content: "\f00c";
+}
+.checkbox input[type="checkbox"]:disabled + label,
+.checkbox input[type="radio"]:disabled + label {
+ opacity: 0.65;
+}
+.checkbox input[type="checkbox"]:disabled + label::before,
+.checkbox input[type="radio"]:disabled + label::before {
+ background-color: #eeeeee;
+ cursor: not-allowed;
+}
+.checkbox.checkbox-circle label::before {
+ border-radius: 50%;
+}
+.checkbox.checkbox-inline {
+ margin-top: 0;
+}
+
+.checkbox-primary input[type="checkbox"]:checked + label::before,
+.checkbox-primary input[type="radio"]:checked + label::before {
+ background-color: #337ab7;
+ border-color: #337ab7;
+}
+.checkbox-primary input[type="checkbox"]:checked + label::after,
+.checkbox-primary input[type="radio"]:checked + label::after {
+ color: #fff;
+}
+
+.checkbox-danger input[type="checkbox"]:checked + label::before,
+.checkbox-danger input[type="radio"]:checked + label::before {
+ background-color: #d9534f;
+ border-color: #d9534f;
+}
+.checkbox-danger input[type="checkbox"]:checked + label::after,
+.checkbox-danger input[type="radio"]:checked + label::after {
+ color: #fff;
+}
+
+.checkbox-info input[type="checkbox"]:checked + label::before,
+.checkbox-info input[type="radio"]:checked + label::before {
+ background-color: #5bc0de;
+ border-color: #5bc0de;
+}
+.checkbox-info input[type="checkbox"]:checked + label::after,
+.checkbox-info input[type="radio"]:checked + label::after {
+ color: #fff;
+}
+
+.checkbox-warning input[type="checkbox"]:checked + label::before,
+.checkbox-warning input[type="radio"]:checked + label::before {
+ background-color: #f0ad4e;
+ border-color: #f0ad4e;
+}
+.checkbox-warning input[type="checkbox"]:checked + label::after,
+.checkbox-warning input[type="radio"]:checked + label::after {
+ color: #fff;
+}
+
+.checkbox-success input[type="checkbox"]:checked + label::before,
+.checkbox-success input[type="radio"]:checked + label::before {
+ background-color: #5cb85c;
+ border-color: #5cb85c;
+}
+.checkbox-success input[type="checkbox"]:checked + label::after,
+.checkbox-success input[type="radio"]:checked + label::after {
+ color: #fff;
+}
+
+.radio {
+ padding-left: 20px;
+}
+.radio label {
+ display: inline-block;
+ vertical-align: middle;
+ position: relative;
+ padding-left: 5px;
+}
+.radio label::before {
+ content: "";
+ display: inline-block;
+ position: absolute;
+ width: 17px;
+ height: 17px;
+ left: 0;
+ margin-left: -20px;
+ border: 1px solid #cccccc;
+ border-radius: 50%;
+ background-color: #fff;
+ -webkit-transition: border 0.15s ease-in-out;
+ -o-transition: border 0.15s ease-in-out;
+ transition: border 0.15s ease-in-out;
+}
+.radio label::after {
+ display: inline-block;
+ position: absolute;
+ content: " ";
+ width: 11px;
+ height: 11px;
+ left: 3px;
+ top: 3px;
+ margin-left: -20px;
+ border-radius: 50%;
+ background-color: #555555;
+ -webkit-transform: scale(0, 0);
+ -ms-transform: scale(0, 0);
+ -o-transform: scale(0, 0);
+ transform: scale(0, 0);
+ -webkit-transition: -webkit-transform 0.1s cubic-bezier(0.8, -0.33, 0.2, 1.33);
+ -moz-transition: -moz-transform 0.1s cubic-bezier(0.8, -0.33, 0.2, 1.33);
+ -o-transition: -o-transform 0.1s cubic-bezier(0.8, -0.33, 0.2, 1.33);
+ transition: transform 0.1s cubic-bezier(0.8, -0.33, 0.2, 1.33);
+}
+.radio input[type="radio"] {
+ opacity: 0;
+ z-index: 1;
+}
+.radio input[type="radio"]:focus + label::before {
+ outline: thin dotted;
+ outline: 5px auto -webkit-focus-ring-color;
+ outline-offset: -2px;
+}
+.radio input[type="radio"]:checked + label::after {
+ -webkit-transform: scale(1, 1);
+ -ms-transform: scale(1, 1);
+ -o-transform: scale(1, 1);
+ transform: scale(1, 1);
+}
+.radio input[type="radio"]:disabled + label {
+ opacity: 0.65;
+}
+.radio input[type="radio"]:disabled + label::before {
+ cursor: not-allowed;
+}
+.radio.radio-inline {
+ margin-top: 0;
+}
+
+.radio-primary input[type="radio"] + label::after {
+ background-color: #337ab7;
+}
+.radio-primary input[type="radio"]:checked + label::before {
+ border-color: #337ab7;
+}
+.radio-primary input[type="radio"]:checked + label::after {
+ background-color: #337ab7;
+}
+
+.radio-danger input[type="radio"] + label::after {
+ background-color: #d9534f;
+}
+.radio-danger input[type="radio"]:checked + label::before {
+ border-color: #d9534f;
+}
+.radio-danger input[type="radio"]:checked + label::after {
+ background-color: #d9534f;
+}
+
+.radio-info input[type="radio"] + label::after {
+ background-color: #5bc0de;
+}
+.radio-info input[type="radio"]:checked + label::before {
+ border-color: #5bc0de;
+}
+.radio-info input[type="radio"]:checked + label::after {
+ background-color: #5bc0de;
+}
+
+.radio-warning input[type="radio"] + label::after {
+ background-color: #f0ad4e;
+}
+.radio-warning input[type="radio"]:checked + label::before {
+ border-color: #f0ad4e;
+}
+.radio-warning input[type="radio"]:checked + label::after {
+ background-color: #f0ad4e;
+}
+
+.radio-success input[type="radio"] + label::after {
+ background-color: #5cb85c;
+}
+.radio-success input[type="radio"]:checked + label::before {
+ border-color: #5cb85c;
+}
+.radio-success input[type="radio"]:checked + label::after {
+ background-color: #5cb85c;
+}
+
+input[type="checkbox"].styled:checked + label:after,
+input[type="radio"].styled:checked + label:after {
+ font-family: 'FontAwesome';
+ content: "\f00c";
+}
+input[type="checkbox"] .styled:checked + label::before,
+input[type="radio"] .styled:checked + label::before {
+ color: #fff;
+}
+input[type="checkbox"] .styled:checked + label::after,
+input[type="radio"] .styled:checked + label::after {
+ color: #fff;
+}
diff --git a/management/guns-admin/src/main/webapp/static/css/plugins/bootstrap-table/bootstrap-table.min.css b/management/guns-admin/src/main/webapp/static/css/plugins/bootstrap-table/bootstrap-table.min.css
new file mode 100644
index 0000000..f65b308
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/static/css/plugins/bootstrap-table/bootstrap-table.min.css
@@ -0,0 +1 @@
+.fixed-table-container .bs-checkbox,.fixed-table-container .no-records-found{text-align:center}.fixed-table-body thead th .th-inner,.table td,.table th{box-sizing:border-box}.bootstrap-table .table{margin-bottom:0!important;border-bottom:1px solid #ddd;border-collapse:collapse!important;border-radius:1px}.bootstrap-table .table:not(.table-condensed),.bootstrap-table .table:not(.table-condensed)>tbody>tr>td,.bootstrap-table .table:not(.table-condensed)>tbody>tr>th,.bootstrap-table .table:not(.table-condensed)>tfoot>tr>td,.bootstrap-table .table:not(.table-condensed)>tfoot>tr>th,.bootstrap-table .table:not(.table-condensed)>thead>tr>td{padding:8px}.bootstrap-table .table.table-no-bordered>tbody>tr>td,.bootstrap-table .table.table-no-bordered>thead>tr>th{border-right:2px solid transparent}.bootstrap-table .table.table-no-bordered>tbody>tr>td:last-child{border-right:none}.fixed-table-container{position:relative;clear:both;border:1px solid #ddd;border-radius:4px;-webkit-border-radius:4px;-moz-border-radius:4px}.fixed-table-container.table-no-bordered{border:1px solid transparent}.fixed-table-footer,.fixed-table-header{overflow:hidden}.fixed-table-footer{border-top:1px solid #ddd}.fixed-table-body{overflow-x:auto;overflow-y:auto;height:100%}.fixed-table-container table{width:100%}.fixed-table-container thead th{height:0;padding:0;margin:0;border-left:1px solid #ddd}.fixed-table-container thead th:focus{outline:transparent solid 0}.fixed-table-container thead th:first-child{border-left:none;border-top-left-radius:4px;-webkit-border-top-left-radius:4px;-moz-border-radius-topleft:4px}.fixed-table-container tbody td .th-inner,.fixed-table-container thead th .th-inner{padding:8px;line-height:24px;vertical-align:top;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.fixed-table-container thead th .sortable{cursor:pointer;background-position:right;background-repeat:no-repeat;padding-right:30px}.fixed-table-container thead th .both{background-image:url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABMAAAATCAQAAADYWf5HAAAAkElEQVQoz7X QMQ5AQBCF4dWQSJxC5wwax1Cq1e7BAdxD5SL+Tq/QCM1oNiJidwox0355mXnG/DrEtIQ6azioNZQxI0ykPhTQIwhCR+BmBYtlK7kLJYwWCcJA9M4qdrZrd8pPjZWPtOqdRQy320YSV17OatFC4euts6z39GYMKRPCTKY9UnPQ6P+GtMRfGtPnBCiqhAeJPmkqAAAAAElFTkSuQmCC')}.fixed-table-container thead th .asc{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABMAAAATCAYAAAByUDbMAAAAZ0lEQVQ4y2NgGLKgquEuFxBPAGI2ahhWCsS/gDibUoO0gPgxEP8H4ttArEyuQYxAPBdqEAxPBImTY5gjEL9DM+wTENuQahAvEO9DMwiGdwAxOymGJQLxTyD+jgWDxCMZRsEoGAVoAADeemwtPcZI2wAAAABJRU5ErkJggg==)}.fixed-table-container thead th .desc{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABMAAAATCAYAAAByUDbMAAAAZUlEQVQ4y2NgGAWjYBSggaqGu5FA/BOIv2PBIPFEUgxjB+IdQPwfC94HxLykus4GiD+hGfQOiB3J8SojEE9EM2wuSJzcsFMG4ttQgx4DsRalkZENxL+AuJQaMcsGxBOAmGvopk8AVz1sLZgg0bsAAAAASUVORK5CYII=)}.fixed-table-container th.detail{width:30px}.fixed-table-container tbody td{border-left:1px solid #ddd}.fixed-table-container tbody tr:first-child td{border-top:none}.fixed-table-container tbody td:first-child{border-left:none}.fixed-table-container tbody .selected td{background-color:#f5f5f5}.fixed-table-container .bs-checkbox .th-inner{padding:8px 0}.fixed-table-container input[type=radio],.fixed-table-container input[type=checkbox]{margin:0 auto!important}.fixed-table-pagination .pagination-detail,.fixed-table-pagination div.pagination{margin-top:10px;margin-bottom:10px}.fixed-table-pagination div.pagination .pagination{margin:0}.fixed-table-pagination .pagination a{padding:6px 12px;line-height:1.428571429}.fixed-table-pagination .pagination-info{line-height:34px;margin-right:5px}.fixed-table-pagination .btn-group{position:relative;display:inline-block;vertical-align:middle}.fixed-table-pagination .dropup .dropdown-menu{margin-bottom:0}.fixed-table-pagination .page-list{display:inline-block}.fixed-table-toolbar .columns-left{margin-right:5px}.fixed-table-toolbar .columns-right{margin-left:5px}.fixed-table-toolbar .columns label{display:block;padding:3px 20px;clear:both;font-weight:400;line-height:1.428571429}.fixed-table-toolbar .bs-bars,.fixed-table-toolbar .columns,.fixed-table-toolbar .search{position:relative;margin-top:10px;margin-bottom:10px;line-height:34px}.fixed-table-pagination li.disabled a{pointer-events:none;cursor:default}.fixed-table-loading{display:none;position:absolute;top:42px;right:0;bottom:0;left:0;z-index:99;background-color:#fff;text-align:center}.fixed-table-body .card-view .title{font-weight:700;display:inline-block;min-width:30%;text-align:left!important}.table td,.table th{vertical-align:middle}.fixed-table-toolbar .dropdown-menu{text-align:left;max-height:300px;overflow:auto}.fixed-table-toolbar .btn-group>.btn-group{display:inline-block;margin-left:-1px!important}.fixed-table-toolbar .btn-group>.btn-group>.btn{border-radius:0}.fixed-table-toolbar .btn-group>.btn-group:first-child>.btn{border-top-left-radius:4px;border-bottom-left-radius:4px}.fixed-table-toolbar .btn-group>.btn-group:last-child>.btn{border-top-right-radius:4px;border-bottom-right-radius:4px}.bootstrap-table .table>thead>tr>th{vertical-align:bottom;border-bottom:1px solid #ddd}.bootstrap-table .table thead>tr>th{padding:0;margin:0}.bootstrap-table .fixed-table-footer tbody>tr>td{padding:0!important}.bootstrap-table .fixed-table-footer .table{border-bottom:none;border-radius:0;padding:0!important}.bootstrap-table .pull-right .dropdown-menu{right:0;left:auto}p.fixed-table-scroll-inner{width:100%;height:200px}div.fixed-table-scroll-outer{top:0;left:0;visibility:hidden;width:200px;height:150px;overflow:hidden}.fixed-table-pagination:after,.fixed-table-toolbar:after{content:"";display:block;clear:both}
\ No newline at end of file
diff --git a/management/guns-admin/src/main/webapp/static/css/plugins/bootstrap-treetable/bootstrap-treetable.css b/management/guns-admin/src/main/webapp/static/css/plugins/bootstrap-treetable/bootstrap-treetable.css
new file mode 100644
index 0000000..ab08de5
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/static/css/plugins/bootstrap-treetable/bootstrap-treetable.css
@@ -0,0 +1,10 @@
+.treetable-indent {width:16px; height: 16px; display: inline-block; position: relative;}
+.treetable-expander {width:16px; height: 16px; display: inline-block; position: relative; cursor: pointer;}
+.treetable-selected{background: #f5f5f5 !important;}
+.treetable-table{border:0 !important;margin-bottom:0}
+.treetable-table tbody {display:block;height:auto;overflow-y:auto;}
+.treetable-table thead, .treetable-table tbody tr {display:table;width:100%;table-layout:fixed;}
+.treetable-thead th{line-height:40px;border: 0 !important;background:#fff !important;border-radius: 4px;border-left:1px solid #e7eaec !important;border-bottom:2px solid #e7eaec !important;text-align: center;}
+.treetable-thead tr :first-child{border-left:0 !important}
+.treetable-tbody td{border: 0 !important;border-left:1px solid #e7eaec !important;border-bottom:1px solid #e7eaec !important;}
+.treetable-tbody tr :first-child{border-left:0 !important}
diff --git a/management/guns-admin/src/main/webapp/static/css/plugins/chosen/chosen-sprite.png b/management/guns-admin/src/main/webapp/static/css/plugins/chosen/chosen-sprite.png
new file mode 100644
index 0000000..3611ae4
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/static/css/plugins/chosen/chosen-sprite.png
Binary files differ
diff --git a/management/guns-admin/src/main/webapp/static/css/plugins/chosen/chosen-sprite@2x.png b/management/guns-admin/src/main/webapp/static/css/plugins/chosen/chosen-sprite@2x.png
new file mode 100644
index 0000000..ffe4d7d
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/static/css/plugins/chosen/chosen-sprite@2x.png
Binary files differ
diff --git a/management/guns-admin/src/main/webapp/static/css/plugins/chosen/chosen.css b/management/guns-admin/src/main/webapp/static/css/plugins/chosen/chosen.css
new file mode 100644
index 0000000..edd6767
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/static/css/plugins/chosen/chosen.css
@@ -0,0 +1,423 @@
+/*!
+Chosen, a Select Box Enhancer for jQuery and Prototype
+by Patrick Filler for Harvest, http://getharvest.com
+
+Version 1.1.0
+Full source at https://github.com/harvesthq/chosen
+Copyright (c) 2011 Harvest http://getharvest.com
+
+MIT License, https://github.com/harvesthq/chosen/blob/master/LICENSE.md
+This file is generated by `grunt build`, do not edit it by hand.
+*/
+
+/* @group Base */
+.chosen-container {
+ position: relative;
+ display: inline-block;
+ vertical-align: middle;
+ font-size: 13px;
+ zoom: 1;
+ *display: inline;
+ -webkit-user-select: none;
+ -moz-user-select: none;
+ user-select: none;
+}
+.chosen-container .chosen-drop {
+ position: absolute;
+ top: 100%;
+ left: -9999px;
+ z-index: 1010;
+ -webkit-box-sizing: border-box;
+ -moz-box-sizing: border-box;
+ box-sizing: border-box;
+ width: 100%;
+ border: 1px solid #aaa;
+ border-top: 0;
+ background: #fff;
+ box-shadow: 0 4px 5px rgba(0, 0, 0, 0.15);
+}
+.chosen-container.chosen-with-drop .chosen-drop {
+ left: 0;
+}
+.chosen-container a {
+ cursor: pointer;
+}
+
+/* @end */
+/* @group Single Chosen */
+.chosen-container-single .chosen-single {
+ position: relative;
+ display: block;
+ overflow: hidden;
+ padding: 0 0 0 8px;
+ height: 23px;
+ border: 1px solid #aaa;
+ border-radius: 5px;
+ background-color: #fff;
+ background: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(20%, #ffffff), color-stop(50%, #f6f6f6), color-stop(52%, #eeeeee), color-stop(100%, #f4f4f4));
+ background: -webkit-linear-gradient(top, #ffffff 20%, #f6f6f6 50%, #eeeeee 52%, #f4f4f4 100%);
+ background: -moz-linear-gradient(top, #ffffff 20%, #f6f6f6 50%, #eeeeee 52%, #f4f4f4 100%);
+ background: -o-linear-gradient(top, #ffffff 20%, #f6f6f6 50%, #eeeeee 52%, #f4f4f4 100%);
+ background: linear-gradient(top, #ffffff 20%, #f6f6f6 50%, #eeeeee 52%, #f4f4f4 100%);
+ background-clip: padding-box;
+ box-shadow: 0 0 3px white inset, 0 1px 1px rgba(0, 0, 0, 0.1);
+ color: #444;
+ text-decoration: none;
+ white-space: nowrap;
+ line-height: 24px;
+}
+.chosen-container-single .chosen-default {
+ color: #999;
+}
+.chosen-container-single .chosen-single span {
+ display: block;
+ overflow: hidden;
+ margin-right: 26px;
+ text-overflow: ellipsis;
+ white-space: nowrap;
+}
+.chosen-container-single .chosen-single-with-deselect span {
+ margin-right: 38px;
+}
+.chosen-container-single .chosen-single abbr {
+ position: absolute;
+ top: 6px;
+ right: 26px;
+ display: block;
+ width: 12px;
+ height: 12px;
+ background: url('chosen-sprite.png') -42px 1px no-repeat;
+ font-size: 1px;
+}
+.chosen-container-single .chosen-single abbr:hover {
+ background-position: -42px -10px;
+}
+.chosen-container-single.chosen-disabled .chosen-single abbr:hover {
+ background-position: -42px -10px;
+}
+.chosen-container-single .chosen-single div {
+ position: absolute;
+ top: 0;
+ right: 0;
+ display: block;
+ width: 18px;
+ height: 100%;
+}
+.chosen-container-single .chosen-single div b {
+ display: block;
+ width: 100%;
+ height: 100%;
+ background: url('chosen-sprite.png') no-repeat 0px 7px;
+}
+.chosen-container-single .chosen-search {
+ position: relative;
+ z-index: 1010;
+ margin: 0;
+ padding: 3px 4px;
+ white-space: nowrap;
+}
+.chosen-container-single .chosen-search input[type="text"] {
+ -webkit-box-sizing: border-box;
+ -moz-box-sizing: border-box;
+ box-sizing: border-box;
+ margin: 1px 0;
+ padding: 4px 20px 4px 5px;
+ width: 100%;
+ height: auto;
+ outline: 0;
+ border: 1px solid #aaa;
+ background: white url('chosen-sprite.png') no-repeat 100% -20px;
+ background: url('chosen-sprite.png') no-repeat 100% -20px;
+ font-size: 1em;
+ font-family: sans-serif;
+ line-height: normal;
+ border-radius: 0;
+}
+.chosen-container-single .chosen-drop {
+ margin-top: -1px;
+ border-radius: 0 0 4px 4px;
+ background-clip: padding-box;
+}
+.chosen-container-single.chosen-container-single-nosearch .chosen-search {
+ position: absolute;
+ left: -9999px;
+}
+
+/* @end */
+/* @group Results */
+.chosen-container .chosen-results {
+ position: relative;
+ overflow-x: hidden;
+ overflow-y: auto;
+ margin: 0 4px 4px 0;
+ padding: 0 0 0 4px;
+ max-height: 240px;
+ -webkit-overflow-scrolling: touch;
+}
+.chosen-container .chosen-results li {
+ display: none;
+ margin: 0;
+ padding: 5px 6px;
+ list-style: none;
+ line-height: 15px;
+ -webkit-touch-callout: none;
+}
+.chosen-container .chosen-results li.active-result {
+ display: list-item;
+ cursor: pointer;
+}
+.chosen-container .chosen-results li.disabled-result {
+ display: list-item;
+ color: #ccc;
+ cursor: default;
+}
+.chosen-container .chosen-results li.highlighted {
+ background-color: #3875d7;
+ background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(20%, #3875d7), color-stop(90%, #2a62bc));
+ background-image: -webkit-linear-gradient(#3875d7 20%, #2a62bc 90%);
+ background-image: -moz-linear-gradient(#3875d7 20%, #2a62bc 90%);
+ background-image: -o-linear-gradient(#3875d7 20%, #2a62bc 90%);
+ background-image: linear-gradient(#3875d7 20%, #2a62bc 90%);
+ color: #fff;
+}
+.chosen-container .chosen-results li.no-results {
+ display: list-item;
+ background: #f4f4f4;
+}
+.chosen-container .chosen-results li.group-result {
+ display: list-item;
+ font-weight: bold;
+ cursor: default;
+}
+.chosen-container .chosen-results li.group-option {
+ padding-left: 15px;
+}
+.chosen-container .chosen-results li em {
+ font-style: normal;
+ text-decoration: underline;
+}
+
+/* @end */
+/* @group Multi Chosen */
+.chosen-container-multi .chosen-choices {
+ -moz-box-sizing: border-box;
+ background-color: #FFFFFF;
+ border: 1px solid #CBD5DD;
+ border-radius: 2px;
+ cursor: text;
+ height: auto !important;
+ margin: 0;
+ min-height: 30px;
+ overflow: hidden;
+ padding: 2px;
+ position: relative;
+ width: 100%;
+}
+.chosen-container-multi .chosen-choices li {
+ float: left;
+ list-style: none;
+}
+.chosen-container-multi .chosen-choices li.search-field {
+ margin: 0;
+ padding: 0;
+ white-space: nowrap;
+}
+.chosen-container-multi .chosen-choices li.search-field input[type="text"] {
+ margin: 1px 0;
+ padding: 5px;
+ height: 25px;
+ outline: 0;
+ border: 0 !important;
+ background: transparent !important;
+ box-shadow: none;
+ color: #666;
+ font-size: 100%;
+ font-family: sans-serif;
+ line-height: normal;
+ border-radius: 0;
+}
+.chosen-container-multi .chosen-choices li.search-field .default {
+ color: #999;
+}
+.chosen-container-multi .chosen-choices li.search-choice {
+ position: relative;
+ margin: 3px 0 3px 5px;
+ padding: 3px 20px 3px 5px;
+ border: 1px solid #aaa;
+ border-radius: 3px;
+ background-color: #e4e4e4;
+ background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(20%, #f4f4f4), color-stop(50%, #f0f0f0), color-stop(52%, #e8e8e8), color-stop(100%, #eeeeee));
+ background-image: -webkit-linear-gradient(#f4f4f4 20%, #f0f0f0 50%, #e8e8e8 52%, #eeeeee 100%);
+ background-image: -moz-linear-gradient(#f4f4f4 20%, #f0f0f0 50%, #e8e8e8 52%, #eeeeee 100%);
+ background-image: -o-linear-gradient(#f4f4f4 20%, #f0f0f0 50%, #e8e8e8 52%, #eeeeee 100%);
+ background-image: linear-gradient(#f4f4f4 20%, #f0f0f0 50%, #e8e8e8 52%, #eeeeee 100%);
+ background-clip: padding-box;
+ box-shadow: 0 0 2px white inset, 0 1px 0 rgba(0, 0, 0, 0.05);
+ color: #333;
+ line-height: 13px;
+ cursor: default;
+}
+.chosen-container-multi .chosen-choices li.search-choice .search-choice-close {
+ position: absolute;
+ top: 4px;
+ right: 3px;
+ display: block;
+ width: 12px;
+ height: 12px;
+ background: url('chosen-sprite.png') -42px 1px no-repeat;
+ font-size: 1px;
+}
+.chosen-container-multi .chosen-choices li.search-choice .search-choice-close:hover {
+ background-position: -42px -10px;
+}
+.chosen-container-multi .chosen-choices li.search-choice-disabled {
+ padding-right: 5px;
+ border: 1px solid #ccc;
+ background-color: #e4e4e4;
+ background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(20%, #f4f4f4), color-stop(50%, #f0f0f0), color-stop(52%, #e8e8e8), color-stop(100%, #eeeeee));
+ background-image: -webkit-linear-gradient(top, #f4f4f4 20%, #f0f0f0 50%, #e8e8e8 52%, #eeeeee 100%);
+ background-image: -moz-linear-gradient(top, #f4f4f4 20%, #f0f0f0 50%, #e8e8e8 52%, #eeeeee 100%);
+ background-image: -o-linear-gradient(top, #f4f4f4 20%, #f0f0f0 50%, #e8e8e8 52%, #eeeeee 100%);
+ background-image: linear-gradient(top, #f4f4f4 20%, #f0f0f0 50%, #e8e8e8 52%, #eeeeee 100%);
+ color: #666;
+}
+.chosen-container-multi .chosen-choices li.search-choice-focus {
+ background: #d4d4d4;
+}
+.chosen-container-multi .chosen-choices li.search-choice-focus .search-choice-close {
+ background-position: -42px -10px;
+}
+.chosen-container-multi .chosen-results {
+ margin: 0;
+ padding: 0;
+}
+.chosen-container-multi .chosen-drop .result-selected {
+ display: list-item;
+ color: #ccc;
+ cursor: default;
+}
+
+/* @end */
+/* @group Active */
+.chosen-container-active .chosen-single {
+ border: 1px solid #5897fb;
+ box-shadow: 0 0 5px rgba(0, 0, 0, 0.3);
+}
+.chosen-container-active.chosen-with-drop .chosen-single {
+ border: 1px solid #aaa;
+ -moz-border-radius-bottomright: 0;
+ border-bottom-right-radius: 0;
+ -moz-border-radius-bottomleft: 0;
+ border-bottom-left-radius: 0;
+}
+.chosen-container-active.chosen-with-drop .chosen-single div {
+ border-left: none;
+ background: transparent;
+}
+.chosen-container-active.chosen-with-drop .chosen-single div b {
+ background-position: -18px 7px;
+}
+.chosen-container-active .chosen-choices {
+ border: 1px solid #5897fb;
+ box-shadow: 0 0 5px rgba(0, 0, 0, 0.3);
+}
+.chosen-container-active .chosen-choices li.search-field input[type="text"] {
+ color: #111 !important;
+}
+
+/* @end */
+/* @group Disabled Support */
+.chosen-disabled {
+ opacity: 0.5 !important;
+ cursor: default;
+}
+.chosen-disabled .chosen-single {
+ cursor: default;
+}
+.chosen-disabled .chosen-choices .search-choice .search-choice-close {
+ cursor: default;
+}
+
+/* @end */
+/* @group Right to Left */
+.chosen-rtl {
+ text-align: right;
+}
+.chosen-rtl .chosen-single {
+ overflow: visible;
+ padding: 0 8px 0 0;
+}
+.chosen-rtl .chosen-single span {
+ margin-right: 0;
+ margin-left: 26px;
+ direction: rtl;
+}
+.chosen-rtl .chosen-single-with-deselect span {
+ margin-left: 38px;
+}
+.chosen-rtl .chosen-single div {
+ right: auto;
+ left: 3px;
+}
+.chosen-rtl .chosen-single abbr {
+ right: auto;
+ left: 26px;
+}
+.chosen-rtl .chosen-choices li {
+ float: right;
+}
+.chosen-rtl .chosen-choices li.search-field input[type="text"] {
+ direction: rtl;
+}
+.chosen-rtl .chosen-choices li.search-choice {
+ margin: 3px 5px 3px 0;
+ padding: 3px 5px 3px 19px;
+}
+.chosen-rtl .chosen-choices li.search-choice .search-choice-close {
+ right: auto;
+ left: 4px;
+}
+.chosen-rtl.chosen-container-single-nosearch .chosen-search,
+.chosen-rtl .chosen-drop {
+ left: 9999px;
+}
+.chosen-rtl.chosen-container-single .chosen-results {
+ margin: 0 0 4px 4px;
+ padding: 0 4px 0 0;
+}
+.chosen-rtl .chosen-results li.group-option {
+ padding-right: 15px;
+ padding-left: 0;
+}
+.chosen-rtl.chosen-container-active.chosen-with-drop .chosen-single div {
+ border-right: none;
+}
+.chosen-rtl .chosen-search input[type="text"] {
+ padding: 4px 5px 4px 20px;
+ background: white url('chosen-sprite.png') no-repeat -30px -20px;
+ background: url('chosen-sprite.png') no-repeat -30px -20px;
+ direction: rtl;
+}
+.chosen-rtl.chosen-container-single .chosen-single div b {
+ background-position: 6px 2px;
+}
+.chosen-rtl.chosen-container-single.chosen-with-drop .chosen-single div b {
+ background-position: -12px 2px;
+}
+
+/* @end */
+/* @group Retina compatibility */
+@media only screen and (-webkit-min-device-pixel-ratio: 2), only screen and (min-resolution: 144dpi) {
+ .chosen-rtl .chosen-search input[type="text"],
+ .chosen-container-single .chosen-single abbr,
+ .chosen-container-single .chosen-single div b,
+ .chosen-container-single .chosen-search input[type="text"],
+ .chosen-container-multi .chosen-choices .search-choice .search-choice-close,
+ .chosen-container .chosen-results-scroll-down span,
+ .chosen-container .chosen-results-scroll-up span {
+ background-image: url('chosen-sprite@2x.png') !important;
+ background-size: 52px 37px !important;
+ background-repeat: no-repeat !important;
+ }
+}
+/* @end */
diff --git a/management/guns-admin/src/main/webapp/static/css/plugins/iCheck/custom.css b/management/guns-admin/src/main/webapp/static/css/plugins/iCheck/custom.css
new file mode 100644
index 0000000..84e950b
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/static/css/plugins/iCheck/custom.css
@@ -0,0 +1,59 @@
+/* iCheck plugin Square skin, green
+----------------------------------- */
+.icheckbox_square-green,
+.iradio_square-green {
+ display: inline-block;
+ *display: inline;
+ vertical-align: middle;
+ margin: 0;
+ padding: 0;
+ width: 22px;
+ height: 22px;
+ background: url(green.png) no-repeat;
+ border: none;
+ cursor: pointer;
+}
+
+.icheckbox_square-green {
+ background-position: 0 0;
+}
+.icheckbox_square-green.hover {
+ background-position: -24px 0;
+}
+.icheckbox_square-green.checked {
+ background-position: -48px 0;
+}
+.icheckbox_square-green.disabled {
+ background-position: -72px 0;
+ cursor: default;
+}
+.icheckbox_square-green.checked.disabled {
+ background-position: -96px 0;
+}
+
+.iradio_square-green {
+ background-position: -120px 0;
+}
+.iradio_square-green.hover {
+ background-position: -144px 0;
+}
+.iradio_square-green.checked {
+ background-position: -168px 0;
+}
+.iradio_square-green.disabled {
+ background-position: -192px 0;
+ cursor: default;
+}
+.iradio_square-green.checked.disabled {
+ background-position: -216px 0;
+}
+
+/* HiDPI support */
+@media (-o-min-device-pixel-ratio: 5/4), (-webkit-min-device-pixel-ratio: 1.25), (min-resolution: 120dpi) {
+ .icheckbox_square-green,
+ .iradio_square-green {
+ background-image: url(green@2x.png);
+ -webkit-background-size: 240px 24px;
+ background-size: 240px 24px;
+ }
+}
diff --git a/management/guns-admin/src/main/webapp/static/css/plugins/iCheck/green.png b/management/guns-admin/src/main/webapp/static/css/plugins/iCheck/green.png
new file mode 100644
index 0000000..cf62300
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/static/css/plugins/iCheck/green.png
Binary files differ
diff --git a/management/guns-admin/src/main/webapp/static/css/plugins/iCheck/green@2x.png b/management/guns-admin/src/main/webapp/static/css/plugins/iCheck/green@2x.png
new file mode 100644
index 0000000..3bda5be
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/static/css/plugins/iCheck/green@2x.png
Binary files differ
diff --git a/management/guns-admin/src/main/webapp/static/css/plugins/images/sprite-skin-flat.png b/management/guns-admin/src/main/webapp/static/css/plugins/images/sprite-skin-flat.png
new file mode 100644
index 0000000..8356fc5
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/static/css/plugins/images/sprite-skin-flat.png
Binary files differ
diff --git a/management/guns-admin/src/main/webapp/static/css/plugins/sweetalert/sweetalert.css b/management/guns-admin/src/main/webapp/static/css/plugins/sweetalert/sweetalert.css
new file mode 100644
index 0000000..4469aea
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/static/css/plugins/sweetalert/sweetalert.css
@@ -0,0 +1,715 @@
+body.stop-scrolling {
+ height: 100%;
+ overflow: hidden; }
+
+.sweet-overlay {
+ background-color: black;
+ /* IE8 */
+ -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=40)";
+ /* IE8 */
+ background-color: rgba(0, 0, 0, 0.4);
+ position: fixed;
+ left: 0;
+ right: 0;
+ top: 0;
+ bottom: 0;
+ display: none;
+ z-index: 10000; }
+
+.sweet-alert {
+ background-color: white;
+ font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif;
+ width: 478px;
+ padding: 17px;
+ border-radius: 5px;
+ text-align: center;
+ position: fixed;
+ left: 50%;
+ top: 50%;
+ margin-left: -256px;
+ margin-top: -200px;
+ overflow: hidden;
+ display: none;
+ z-index: 99999; }
+ @media all and (max-width: 540px) {
+ .sweet-alert {
+ width: auto;
+ margin-left: 0;
+ margin-right: 0;
+ left: 15px;
+ right: 15px; } }
+ .sweet-alert h2 {
+ color: #575757;
+ font-size: 30px;
+ text-align: center;
+ font-weight: 600;
+ text-transform: none;
+ position: relative;
+ margin: 25px 0;
+ padding: 0;
+ line-height: 40px;
+ display: block; }
+ .sweet-alert p {
+ color: #797979;
+ font-size: 16px;
+ text-align: center;
+ font-weight: 300;
+ position: relative;
+ text-align: inherit;
+ float: none;
+ margin: 0;
+ padding: 0;
+ line-height: normal; }
+ .sweet-alert fieldset {
+ border: none;
+ position: relative; }
+ .sweet-alert .sa-error-container {
+ background-color: #f1f1f1;
+ margin-left: -17px;
+ margin-right: -17px;
+ overflow: hidden;
+ padding: 0 10px;
+ max-height: 0;
+ webkit-transition: padding 0.15s, max-height 0.15s;
+ transition: padding 0.15s, max-height 0.15s; }
+ .sweet-alert .sa-error-container.show {
+ padding: 10px 0;
+ max-height: 100px;
+ webkit-transition: padding 0.2s, max-height 0.2s;
+ transition: padding 0.25s, max-height 0.25s; }
+ .sweet-alert .sa-error-container .icon {
+ display: inline-block;
+ width: 24px;
+ height: 24px;
+ border-radius: 50%;
+ background-color: #ea7d7d;
+ color: white;
+ line-height: 24px;
+ text-align: center;
+ margin-right: 3px; }
+ .sweet-alert .sa-error-container p {
+ display: inline-block; }
+ .sweet-alert .sa-input-error {
+ position: absolute;
+ top: 29px;
+ right: 26px;
+ width: 20px;
+ height: 20px;
+ opacity: 0;
+ -webkit-transform: scale(0.5);
+ transform: scale(0.5);
+ -webkit-transform-origin: 50% 50%;
+ transform-origin: 50% 50%;
+ -webkit-transition: all 0.1s;
+ transition: all 0.1s; }
+ .sweet-alert .sa-input-error::before, .sweet-alert .sa-input-error::after {
+ content: "";
+ width: 20px;
+ height: 6px;
+ background-color: #f06e57;
+ border-radius: 3px;
+ position: absolute;
+ top: 50%;
+ margin-top: -4px;
+ left: 50%;
+ margin-left: -9px; }
+ .sweet-alert .sa-input-error::before {
+ -webkit-transform: rotate(-45deg);
+ transform: rotate(-45deg); }
+ .sweet-alert .sa-input-error::after {
+ -webkit-transform: rotate(45deg);
+ transform: rotate(45deg); }
+ .sweet-alert .sa-input-error.show {
+ opacity: 1;
+ -webkit-transform: scale(1);
+ transform: scale(1); }
+ .sweet-alert input {
+ width: 100%;
+ box-sizing: border-box;
+ border-radius: 3px;
+ border: 1px solid #d7d7d7;
+ height: 43px;
+ margin-top: 10px;
+ margin-bottom: 17px;
+ font-size: 18px;
+ box-shadow: inset 0px 1px 1px rgba(0, 0, 0, 0.06);
+ padding: 0 12px;
+ display: none;
+ -webkit-transition: all 0.3s;
+ transition: all 0.3s; }
+ .sweet-alert input:focus {
+ outline: none;
+ box-shadow: 0px 0px 3px #c4e6f5;
+ border: 1px solid #b4dbed; }
+ .sweet-alert input:focus::-moz-placeholder {
+ transition: opacity 0.3s 0.03s ease;
+ opacity: 0.5; }
+ .sweet-alert input:focus:-ms-input-placeholder {
+ transition: opacity 0.3s 0.03s ease;
+ opacity: 0.5; }
+ .sweet-alert input:focus::-webkit-input-placeholder {
+ transition: opacity 0.3s 0.03s ease;
+ opacity: 0.5; }
+ .sweet-alert input::-moz-placeholder {
+ color: #bdbdbd; }
+ .sweet-alert input:-ms-input-placeholder {
+ color: #bdbdbd; }
+ .sweet-alert input::-webkit-input-placeholder {
+ color: #bdbdbd; }
+ .sweet-alert.show-input input {
+ display: block; }
+ .sweet-alert button {
+ background-color: #AEDEF4;
+ color: white;
+ border: none;
+ box-shadow: none;
+ font-size: 17px;
+ font-weight: 500;
+ -webkit-border-radius: 4px;
+ border-radius: 5px;
+ padding: 10px 32px;
+ margin: 26px 5px 0 5px;
+ cursor: pointer; }
+ .sweet-alert button:focus {
+ outline: none;
+ box-shadow: 0 0 2px rgba(128, 179, 235, 0.5), inset 0 0 0 1px rgba(0, 0, 0, 0.05); }
+ .sweet-alert button:hover {
+ background-color: #a1d9f2; }
+ .sweet-alert button:active {
+ background-color: #81ccee; }
+ .sweet-alert button.cancel {
+ background-color: #D0D0D0; }
+ .sweet-alert button.cancel:hover {
+ background-color: #c8c8c8; }
+ .sweet-alert button.cancel:active {
+ background-color: #b6b6b6; }
+ .sweet-alert button.cancel:focus {
+ box-shadow: rgba(197, 205, 211, 0.8) 0px 0px 2px, rgba(0, 0, 0, 0.0470588) 0px 0px 0px 1px inset !important; }
+ .sweet-alert button::-moz-focus-inner {
+ border: 0; }
+ .sweet-alert[data-has-cancel-button=false] button {
+ box-shadow: none !important; }
+ .sweet-alert[data-has-confirm-button=false][data-has-cancel-button=false] {
+ padding-bottom: 40px; }
+ .sweet-alert .sa-icon {
+ width: 80px;
+ height: 80px;
+ border: 4px solid gray;
+ -webkit-border-radius: 40px;
+ border-radius: 40px;
+ border-radius: 50%;
+ margin: 20px auto;
+ padding: 0;
+ position: relative;
+ box-sizing: content-box; }
+ .sweet-alert .sa-icon.sa-error {
+ border-color: #F27474; }
+ .sweet-alert .sa-icon.sa-error .sa-x-mark {
+ position: relative;
+ display: block; }
+ .sweet-alert .sa-icon.sa-error .sa-line {
+ position: absolute;
+ height: 5px;
+ width: 47px;
+ background-color: #F27474;
+ display: block;
+ top: 37px;
+ border-radius: 2px; }
+ .sweet-alert .sa-icon.sa-error .sa-line.sa-left {
+ -webkit-transform: rotate(45deg);
+ transform: rotate(45deg);
+ left: 17px; }
+ .sweet-alert .sa-icon.sa-error .sa-line.sa-right {
+ -webkit-transform: rotate(-45deg);
+ transform: rotate(-45deg);
+ right: 16px; }
+ .sweet-alert .sa-icon.sa-warning {
+ border-color: #F8BB86; }
+ .sweet-alert .sa-icon.sa-warning .sa-body {
+ position: absolute;
+ width: 5px;
+ height: 47px;
+ left: 50%;
+ top: 10px;
+ -webkit-border-radius: 2px;
+ border-radius: 2px;
+ margin-left: -2px;
+ background-color: #F8BB86; }
+ .sweet-alert .sa-icon.sa-warning .sa-dot {
+ position: absolute;
+ width: 7px;
+ height: 7px;
+ -webkit-border-radius: 50%;
+ border-radius: 50%;
+ margin-left: -3px;
+ left: 50%;
+ bottom: 10px;
+ background-color: #F8BB86; }
+ .sweet-alert .sa-icon.sa-info {
+ border-color: #C9DAE1; }
+ .sweet-alert .sa-icon.sa-info::before {
+ content: "";
+ position: absolute;
+ width: 5px;
+ height: 29px;
+ left: 50%;
+ bottom: 17px;
+ border-radius: 2px;
+ margin-left: -2px;
+ background-color: #C9DAE1; }
+ .sweet-alert .sa-icon.sa-info::after {
+ content: "";
+ position: absolute;
+ width: 7px;
+ height: 7px;
+ border-radius: 50%;
+ margin-left: -3px;
+ top: 19px;
+ background-color: #C9DAE1; }
+ .sweet-alert .sa-icon.sa-success {
+ border-color: #A5DC86; }
+ .sweet-alert .sa-icon.sa-success::before, .sweet-alert .sa-icon.sa-success::after {
+ content: '';
+ -webkit-border-radius: 40px;
+ border-radius: 40px;
+ border-radius: 50%;
+ position: absolute;
+ width: 60px;
+ height: 120px;
+ background: white;
+ -webkit-transform: rotate(45deg);
+ transform: rotate(45deg); }
+ .sweet-alert .sa-icon.sa-success::before {
+ -webkit-border-radius: 120px 0 0 120px;
+ border-radius: 120px 0 0 120px;
+ top: -7px;
+ left: -33px;
+ -webkit-transform: rotate(-45deg);
+ transform: rotate(-45deg);
+ -webkit-transform-origin: 60px 60px;
+ transform-origin: 60px 60px; }
+ .sweet-alert .sa-icon.sa-success::after {
+ -webkit-border-radius: 0 120px 120px 0;
+ border-radius: 0 120px 120px 0;
+ top: -11px;
+ left: 30px;
+ -webkit-transform: rotate(-45deg);
+ transform: rotate(-45deg);
+ -webkit-transform-origin: 0px 60px;
+ transform-origin: 0px 60px; }
+ .sweet-alert .sa-icon.sa-success .sa-placeholder {
+ width: 80px;
+ height: 80px;
+ border: 4px solid rgba(165, 220, 134, 0.2);
+ -webkit-border-radius: 40px;
+ border-radius: 40px;
+ border-radius: 50%;
+ box-sizing: content-box;
+ position: absolute;
+ left: -4px;
+ top: -4px;
+ z-index: 2; }
+ .sweet-alert .sa-icon.sa-success .sa-fix {
+ width: 5px;
+ height: 90px;
+ background-color: white;
+ position: absolute;
+ left: 28px;
+ top: 8px;
+ z-index: 1;
+ -webkit-transform: rotate(-45deg);
+ transform: rotate(-45deg); }
+ .sweet-alert .sa-icon.sa-success .sa-line {
+ height: 5px;
+ background-color: #A5DC86;
+ display: block;
+ border-radius: 2px;
+ position: absolute;
+ z-index: 2; }
+ .sweet-alert .sa-icon.sa-success .sa-line.sa-tip {
+ width: 25px;
+ left: 14px;
+ top: 46px;
+ -webkit-transform: rotate(45deg);
+ transform: rotate(45deg); }
+ .sweet-alert .sa-icon.sa-success .sa-line.sa-long {
+ width: 47px;
+ right: 8px;
+ top: 38px;
+ -webkit-transform: rotate(-45deg);
+ transform: rotate(-45deg); }
+ .sweet-alert .sa-icon.sa-custom {
+ background-size: contain;
+ border-radius: 0;
+ border: none;
+ background-position: center center;
+ background-repeat: no-repeat; }
+
+/*
+ * Animations
+ */
+@-webkit-keyframes showSweetAlert {
+ 0% {
+ transform: scale(0.7);
+ -webkit-transform: scale(0.7); }
+ 45% {
+ transform: scale(1.05);
+ -webkit-transform: scale(1.05); }
+ 80% {
+ transform: scale(0.95);
+ -webkit-transform: scale(0.95); }
+ 100% {
+ transform: scale(1);
+ -webkit-transform: scale(1); } }
+
+@keyframes showSweetAlert {
+ 0% {
+ transform: scale(0.7);
+ -webkit-transform: scale(0.7); }
+ 45% {
+ transform: scale(1.05);
+ -webkit-transform: scale(1.05); }
+ 80% {
+ transform: scale(0.95);
+ -webkit-transform: scale(0.95); }
+ 100% {
+ transform: scale(1);
+ -webkit-transform: scale(1); } }
+
+@-webkit-keyframes hideSweetAlert {
+ 0% {
+ transform: scale(1);
+ -webkit-transform: scale(1); }
+ 100% {
+ transform: scale(0.5);
+ -webkit-transform: scale(0.5); } }
+
+@keyframes hideSweetAlert {
+ 0% {
+ transform: scale(1);
+ -webkit-transform: scale(1); }
+ 100% {
+ transform: scale(0.5);
+ -webkit-transform: scale(0.5); } }
+
+@-webkit-keyframes slideFromTop {
+ 0% {
+ top: 0%; }
+ 100% {
+ top: 50%; } }
+
+@keyframes slideFromTop {
+ 0% {
+ top: 0%; }
+ 100% {
+ top: 50%; } }
+
+@-webkit-keyframes slideToTop {
+ 0% {
+ top: 50%; }
+ 100% {
+ top: 0%; } }
+
+@keyframes slideToTop {
+ 0% {
+ top: 50%; }
+ 100% {
+ top: 0%; } }
+
+@-webkit-keyframes slideFromBottom {
+ 0% {
+ top: 70%; }
+ 100% {
+ top: 50%; } }
+
+@keyframes slideFromBottom {
+ 0% {
+ top: 70%; }
+ 100% {
+ top: 50%; } }
+
+@-webkit-keyframes slideToBottom {
+ 0% {
+ top: 50%; }
+ 100% {
+ top: 70%; } }
+
+@keyframes slideToBottom {
+ 0% {
+ top: 50%; }
+ 100% {
+ top: 70%; } }
+
+.showSweetAlert[data-animation=pop] {
+ -webkit-animation: showSweetAlert 0.3s;
+ animation: showSweetAlert 0.3s; }
+
+.showSweetAlert[data-animation=none] {
+ -webkit-animation: none;
+ animation: none; }
+
+.showSweetAlert[data-animation=slide-from-top] {
+ -webkit-animation: slideFromTop 0.3s;
+ animation: slideFromTop 0.3s; }
+
+.showSweetAlert[data-animation=slide-from-bottom] {
+ -webkit-animation: slideFromBottom 0.3s;
+ animation: slideFromBottom 0.3s; }
+
+.hideSweetAlert[data-animation=pop] {
+ -webkit-animation: hideSweetAlert 0.2s;
+ animation: hideSweetAlert 0.2s; }
+
+.hideSweetAlert[data-animation=none] {
+ -webkit-animation: none;
+ animation: none; }
+
+.hideSweetAlert[data-animation=slide-from-top] {
+ -webkit-animation: slideToTop 0.4s;
+ animation: slideToTop 0.4s; }
+
+.hideSweetAlert[data-animation=slide-from-bottom] {
+ -webkit-animation: slideToBottom 0.3s;
+ animation: slideToBottom 0.3s; }
+
+@-webkit-keyframes animateSuccessTip {
+ 0% {
+ width: 0;
+ left: 1px;
+ top: 19px; }
+ 54% {
+ width: 0;
+ left: 1px;
+ top: 19px; }
+ 70% {
+ width: 50px;
+ left: -8px;
+ top: 37px; }
+ 84% {
+ width: 17px;
+ left: 21px;
+ top: 48px; }
+ 100% {
+ width: 25px;
+ left: 14px;
+ top: 45px; } }
+
+@keyframes animateSuccessTip {
+ 0% {
+ width: 0;
+ left: 1px;
+ top: 19px; }
+ 54% {
+ width: 0;
+ left: 1px;
+ top: 19px; }
+ 70% {
+ width: 50px;
+ left: -8px;
+ top: 37px; }
+ 84% {
+ width: 17px;
+ left: 21px;
+ top: 48px; }
+ 100% {
+ width: 25px;
+ left: 14px;
+ top: 45px; } }
+
+@-webkit-keyframes animateSuccessLong {
+ 0% {
+ width: 0;
+ right: 46px;
+ top: 54px; }
+ 65% {
+ width: 0;
+ right: 46px;
+ top: 54px; }
+ 84% {
+ width: 55px;
+ right: 0px;
+ top: 35px; }
+ 100% {
+ width: 47px;
+ right: 8px;
+ top: 38px; } }
+
+@keyframes animateSuccessLong {
+ 0% {
+ width: 0;
+ right: 46px;
+ top: 54px; }
+ 65% {
+ width: 0;
+ right: 46px;
+ top: 54px; }
+ 84% {
+ width: 55px;
+ right: 0px;
+ top: 35px; }
+ 100% {
+ width: 47px;
+ right: 8px;
+ top: 38px; } }
+
+@-webkit-keyframes rotatePlaceholder {
+ 0% {
+ transform: rotate(-45deg);
+ -webkit-transform: rotate(-45deg); }
+ 5% {
+ transform: rotate(-45deg);
+ -webkit-transform: rotate(-45deg); }
+ 12% {
+ transform: rotate(-405deg);
+ -webkit-transform: rotate(-405deg); }
+ 100% {
+ transform: rotate(-405deg);
+ -webkit-transform: rotate(-405deg); } }
+
+@keyframes rotatePlaceholder {
+ 0% {
+ transform: rotate(-45deg);
+ -webkit-transform: rotate(-45deg); }
+ 5% {
+ transform: rotate(-45deg);
+ -webkit-transform: rotate(-45deg); }
+ 12% {
+ transform: rotate(-405deg);
+ -webkit-transform: rotate(-405deg); }
+ 100% {
+ transform: rotate(-405deg);
+ -webkit-transform: rotate(-405deg); } }
+
+.animateSuccessTip {
+ -webkit-animation: animateSuccessTip 0.75s;
+ animation: animateSuccessTip 0.75s; }
+
+.animateSuccessLong {
+ -webkit-animation: animateSuccessLong 0.75s;
+ animation: animateSuccessLong 0.75s; }
+
+.sa-icon.sa-success.animate::after {
+ -webkit-animation: rotatePlaceholder 4.25s ease-in;
+ animation: rotatePlaceholder 4.25s ease-in; }
+
+@-webkit-keyframes animateErrorIcon {
+ 0% {
+ transform: rotateX(100deg);
+ -webkit-transform: rotateX(100deg);
+ opacity: 0; }
+ 100% {
+ transform: rotateX(0deg);
+ -webkit-transform: rotateX(0deg);
+ opacity: 1; } }
+
+@keyframes animateErrorIcon {
+ 0% {
+ transform: rotateX(100deg);
+ -webkit-transform: rotateX(100deg);
+ opacity: 0; }
+ 100% {
+ transform: rotateX(0deg);
+ -webkit-transform: rotateX(0deg);
+ opacity: 1; } }
+
+.animateErrorIcon {
+ -webkit-animation: animateErrorIcon 0.5s;
+ animation: animateErrorIcon 0.5s; }
+
+@-webkit-keyframes animateXMark {
+ 0% {
+ transform: scale(0.4);
+ -webkit-transform: scale(0.4);
+ margin-top: 26px;
+ opacity: 0; }
+ 50% {
+ transform: scale(0.4);
+ -webkit-transform: scale(0.4);
+ margin-top: 26px;
+ opacity: 0; }
+ 80% {
+ transform: scale(1.15);
+ -webkit-transform: scale(1.15);
+ margin-top: -6px; }
+ 100% {
+ transform: scale(1);
+ -webkit-transform: scale(1);
+ margin-top: 0;
+ opacity: 1; } }
+
+@keyframes animateXMark {
+ 0% {
+ transform: scale(0.4);
+ -webkit-transform: scale(0.4);
+ margin-top: 26px;
+ opacity: 0; }
+ 50% {
+ transform: scale(0.4);
+ -webkit-transform: scale(0.4);
+ margin-top: 26px;
+ opacity: 0; }
+ 80% {
+ transform: scale(1.15);
+ -webkit-transform: scale(1.15);
+ margin-top: -6px; }
+ 100% {
+ transform: scale(1);
+ -webkit-transform: scale(1);
+ margin-top: 0;
+ opacity: 1; } }
+
+.animateXMark {
+ -webkit-animation: animateXMark 0.5s;
+ animation: animateXMark 0.5s; }
+
+@-webkit-keyframes pulseWarning {
+ 0% {
+ border-color: #F8D486; }
+ 100% {
+ border-color: #F8BB86; } }
+
+@keyframes pulseWarning {
+ 0% {
+ border-color: #F8D486; }
+ 100% {
+ border-color: #F8BB86; } }
+
+.pulseWarning {
+ -webkit-animation: pulseWarning 0.75s infinite alternate;
+ animation: pulseWarning 0.75s infinite alternate; }
+
+@-webkit-keyframes pulseWarningIns {
+ 0% {
+ background-color: #F8D486; }
+ 100% {
+ background-color: #F8BB86; } }
+
+@keyframes pulseWarningIns {
+ 0% {
+ background-color: #F8D486; }
+ 100% {
+ background-color: #F8BB86; } }
+
+.pulseWarningIns {
+ -webkit-animation: pulseWarningIns 0.75s infinite alternate;
+ animation: pulseWarningIns 0.75s infinite alternate; }
+
+/* Internet Explorer 9 has some special quirks that are fixed here */
+/* The icons are not animated. */
+/* This file is automatically merged into sweet-alert.min.js through Gulp */
+/* Error icon */
+.sweet-alert .sa-icon.sa-error .sa-line.sa-left {
+ -ms-transform: rotate(45deg) \9; }
+
+.sweet-alert .sa-icon.sa-error .sa-line.sa-right {
+ -ms-transform: rotate(-45deg) \9; }
+
+/* Success icon */
+.sweet-alert .sa-icon.sa-success {
+ border-color: transparent\9; }
+
+.sweet-alert .sa-icon.sa-success .sa-line.sa-tip {
+ -ms-transform: rotate(45deg) \9; }
+
+.sweet-alert .sa-icon.sa-success .sa-line.sa-long {
+ -ms-transform: rotate(-45deg) \9; }
diff --git a/management/guns-admin/src/main/webapp/static/css/plugins/switchery/switchery.css b/management/guns-admin/src/main/webapp/static/css/plugins/switchery/switchery.css
new file mode 100644
index 0000000..b689c6b
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/static/css/plugins/switchery/switchery.css
@@ -0,0 +1,32 @@
+/*
+ *
+ * Main stylesheet for Switchery.
+ * http://abpetkov.github.io/switchery/
+ *
+ */
+
+.switchery {
+ background-color: #fff;
+ border: 1px solid #dfdfdf;
+ border-radius: 20px;
+ cursor: pointer;
+ display: inline-block;
+ height: 30px;
+ position: relative;
+ vertical-align: middle;
+ width: 50px;
+
+ -webkit-box-sizing: content-box;
+ -moz-box-sizing: content-box;
+ box-sizing: content-box;
+}
+
+.switchery > small {
+ background: #fff;
+ border-radius: 100%;
+ box-shadow: 0 1px 3px rgba(0, 0, 0, 0.4);
+ height: 30px;
+ position: absolute;
+ top: 0;
+ width: 30px;
+}
diff --git a/management/guns-admin/src/main/webapp/static/css/plugins/validate/bootstrapValidator.min.css b/management/guns-admin/src/main/webapp/static/css/plugins/validate/bootstrapValidator.min.css
new file mode 100644
index 0000000..62d7b59
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/static/css/plugins/validate/bootstrapValidator.min.css
@@ -0,0 +1,12 @@
+/*!
+ * BootstrapValidator (http://bootstrapvalidator.com)
+ * The best jQuery plugin to validate form fields. Designed to use with Bootstrap 3
+ *
+ * @version v0.5.3, built on 2014-11-05 9:14:18 PM
+ * @author https://twitter.com/nghuuphuoc
+ * @copyright (c) 2013 - 2014 Nguyen Huu Phuoc
+ * @license Commercial: http://bootstrapvalidator.com/license/
+ * Non-commercial: http://creativecommons.org/licenses/by-nc-nd/3.0/
+ */
+
+.bv-form .help-block{margin-bottom:0}.bv-form .tooltip-inner{text-align:left}.nav-tabs li.bv-tab-success>a{color:#3c763d}.nav-tabs li.bv-tab-error>a{color:#a94442}.bv-form .bv-icon-no-label{top:0}.bv-form .bv-icon-input-group{top:0;z-index:100}
\ No newline at end of file
diff --git a/management/guns-admin/src/main/webapp/static/css/plugins/webuploader/webuploader.css b/management/guns-admin/src/main/webapp/static/css/plugins/webuploader/webuploader.css
new file mode 100644
index 0000000..f445e0d
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/static/css/plugins/webuploader/webuploader.css
@@ -0,0 +1,30 @@
+.webuploader-container {
+ position: relative;
+}
+.webuploader-element-invisible {
+ position: absolute !important;
+ clip: rect(1px 1px 1px 1px); /* IE6, IE7 */
+ clip: rect(1px,1px,1px,1px);
+}
+.webuploader-pick {
+ position: relative;
+ display: inline-block;
+ cursor: pointer;
+ background: #1ab394;
+ padding: 6px 12px;
+ color: #fff;
+ text-align: center;
+ border-radius: 3px;
+ overflow: hidden;
+ font-size: 14px;
+ font-weight: 400;
+}
+.webuploader-pick-hover {
+ background: #18ab8d;
+}
+
+.webuploader-pick-disable {
+ opacity: 0.6;
+ pointer-events:none;
+}
+
diff --git a/management/guns-admin/src/main/webapp/static/css/plugins/ztree/demo.css b/management/guns-admin/src/main/webapp/static/css/plugins/ztree/demo.css
new file mode 100644
index 0000000..f6dba0d
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/static/css/plugins/ztree/demo.css
@@ -0,0 +1,33 @@
+html, body, div, span, applet, object, iframe, h1, h2, h3, h4, h5, h6, p, blockquote, pre, a, abbr, acronym, address, big, cite, code, del, dfn, em, font, img, ins, kbd, q, s, samp, small, strike, strong, sub, sup, tt, var, dl, dt, dd, ol, ul, li, fieldset, form, label, legend, table, caption, tbody, tfoot, thead, tr, th, td {
+ margin: 0;padding: 0;border: 0;outline: 0;font-weight: inherit;font-style: inherit;font-size: 100%;font-family: inherit;vertical-align: baseline;}
+body {color: #2f332a;font: 15px/21px Arial, Helvetica, simsun, sans-serif;background: #f0f6e4 \9;}
+h1, h2, h3, h4, h5, h6 {color: #2f332a;font-weight: bold;font-family: Helvetica, Arial, sans-serif;padding-bottom: 5px;}
+h1 {font-size: 24px;line-height: 34px;text-align: center;}
+h2 {font-size: 14px;line-height: 24px;padding-top: 5px;}
+h6 {font-weight: normal;font-size: 12px;letter-spacing: 1px;line-height: 24px;text-align: center;}
+a {color:#3C6E31;text-decoration: underline;}
+a:hover {background-color:#3C6E31;color:white;}
+input.radio {margin: 0 2px 0 8px;}
+input.radio.first {margin-left:0;}
+input.empty {color: lightgray;}
+code {color: #2f332a;}
+.highlight_red {color:#A60000;}
+.highlight_green {color:#A7F43D;}
+li {list-style: circle;font-size: 12px;}
+li.title {list-style: none;}
+ul.list {margin-left: 17px;}
+
+div.content_wrap {width: 600px;height:380px;}
+div.content_wrap div.left{float: left;width: 250px;}
+div.content_wrap div.right{float: right;width: 340px;}
+div.zTreeDemoBackground {width:250px;height:362px;text-align:left;}
+
+ul.ztree {margin-top: 10px;border: 1px solid #617775;background: #f0f6e4;width:220px;height:360px;overflow-y:scroll;overflow-x:auto;}
+ul.log {border: 1px solid #617775;background: #f0f6e4;width:300px;height:170px;overflow: hidden;}
+ul.log.small {height:45px;}
+ul.log li {color: #666666;list-style: none;padding-left: 10px;}
+ul.log li.dark {background-color: #E3E3E3;}
+
+/* ruler */
+div.ruler {height:20px; width:220px; background-color:#f0f6e4;border: 1px solid #333; margin-bottom: 5px; cursor: pointer}
+div.ruler div.cursor {height:20px; width:30px; background-color:#3C6E31; color:white; text-align: right; padding-right: 5px; cursor: pointer}
\ No newline at end of file
diff --git a/management/guns-admin/src/main/webapp/static/css/plugins/ztree/img/diy/1_close.png b/management/guns-admin/src/main/webapp/static/css/plugins/ztree/img/diy/1_close.png
new file mode 100644
index 0000000..68ccb3c
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/static/css/plugins/ztree/img/diy/1_close.png
Binary files differ
diff --git a/management/guns-admin/src/main/webapp/static/css/plugins/ztree/img/diy/1_open.png b/management/guns-admin/src/main/webapp/static/css/plugins/ztree/img/diy/1_open.png
new file mode 100644
index 0000000..d6ff36d
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/static/css/plugins/ztree/img/diy/1_open.png
Binary files differ
diff --git a/management/guns-admin/src/main/webapp/static/css/plugins/ztree/img/diy/2.png b/management/guns-admin/src/main/webapp/static/css/plugins/ztree/img/diy/2.png
new file mode 100644
index 0000000..9eff506
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/static/css/plugins/ztree/img/diy/2.png
Binary files differ
diff --git a/management/guns-admin/src/main/webapp/static/css/plugins/ztree/img/diy/3.png b/management/guns-admin/src/main/webapp/static/css/plugins/ztree/img/diy/3.png
new file mode 100644
index 0000000..d7ba6d0
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/static/css/plugins/ztree/img/diy/3.png
Binary files differ
diff --git a/management/guns-admin/src/main/webapp/static/css/plugins/ztree/img/diy/4.png b/management/guns-admin/src/main/webapp/static/css/plugins/ztree/img/diy/4.png
new file mode 100644
index 0000000..753e2bf
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/static/css/plugins/ztree/img/diy/4.png
Binary files differ
diff --git a/management/guns-admin/src/main/webapp/static/css/plugins/ztree/img/diy/5.png b/management/guns-admin/src/main/webapp/static/css/plugins/ztree/img/diy/5.png
new file mode 100644
index 0000000..0c5eccd
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/static/css/plugins/ztree/img/diy/5.png
Binary files differ
diff --git a/management/guns-admin/src/main/webapp/static/css/plugins/ztree/img/diy/6.png b/management/guns-admin/src/main/webapp/static/css/plugins/ztree/img/diy/6.png
new file mode 100644
index 0000000..070b835
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/static/css/plugins/ztree/img/diy/6.png
Binary files differ
diff --git a/management/guns-admin/src/main/webapp/static/css/plugins/ztree/img/diy/7.png b/management/guns-admin/src/main/webapp/static/css/plugins/ztree/img/diy/7.png
new file mode 100644
index 0000000..532b037
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/static/css/plugins/ztree/img/diy/7.png
Binary files differ
diff --git a/management/guns-admin/src/main/webapp/static/css/plugins/ztree/img/diy/8.png b/management/guns-admin/src/main/webapp/static/css/plugins/ztree/img/diy/8.png
new file mode 100644
index 0000000..a8f3a86
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/static/css/plugins/ztree/img/diy/8.png
Binary files differ
diff --git a/management/guns-admin/src/main/webapp/static/css/plugins/ztree/img/diy/9.png b/management/guns-admin/src/main/webapp/static/css/plugins/ztree/img/diy/9.png
new file mode 100644
index 0000000..4db73cd
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/static/css/plugins/ztree/img/diy/9.png
Binary files differ
diff --git a/management/guns-admin/src/main/webapp/static/css/plugins/ztree/img/line_conn.gif b/management/guns-admin/src/main/webapp/static/css/plugins/ztree/img/line_conn.gif
new file mode 100644
index 0000000..d561d36
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/static/css/plugins/ztree/img/line_conn.gif
Binary files differ
diff --git a/management/guns-admin/src/main/webapp/static/css/plugins/ztree/img/loading.gif b/management/guns-admin/src/main/webapp/static/css/plugins/ztree/img/loading.gif
new file mode 100644
index 0000000..e8c2892
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/static/css/plugins/ztree/img/loading.gif
Binary files differ
diff --git a/management/guns-admin/src/main/webapp/static/css/plugins/ztree/img/zTreeStandard.gif b/management/guns-admin/src/main/webapp/static/css/plugins/ztree/img/zTreeStandard.gif
new file mode 100644
index 0000000..50c94fd
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/static/css/plugins/ztree/img/zTreeStandard.gif
Binary files differ
diff --git a/management/guns-admin/src/main/webapp/static/css/plugins/ztree/img/zTreeStandard.png b/management/guns-admin/src/main/webapp/static/css/plugins/ztree/img/zTreeStandard.png
new file mode 100644
index 0000000..ffda01e
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/static/css/plugins/ztree/img/zTreeStandard.png
Binary files differ
diff --git a/management/guns-admin/src/main/webapp/static/css/plugins/ztree/zTreeStyle.css b/management/guns-admin/src/main/webapp/static/css/plugins/ztree/zTreeStyle.css
new file mode 100644
index 0000000..4a1705b
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/static/css/plugins/ztree/zTreeStyle.css
@@ -0,0 +1,97 @@
+/*-------------------------------------
+zTree Style
+
+version: 3.5.19
+author: Hunter.z
+email: hunter.z@263.net
+website: http://code.google.com/p/jquerytree/
+
+-------------------------------------*/
+
+.ztree * {padding:0; margin:0; font-size:12px; font-family: Verdana, Arial, Helvetica, AppleGothic, sans-serif}
+.ztree {margin:0; padding:5px; color:#333}
+.ztree li{padding:0; margin:0; list-style:none; line-height:14px; text-align:left; white-space:nowrap; outline:0}
+.ztree li ul{ margin:0; padding:0 0 0 18px}
+.ztree li ul.line{ background:url(./img/line_conn.gif) 0 0 repeat-y;}
+
+.ztree li a {padding:1px 3px 0 0; margin:0; cursor:pointer; height:17px; color:#333; background-color: transparent;
+ text-decoration:none; vertical-align:top; display: inline-block}
+.ztree li a:hover {text-decoration:underline}
+.ztree li a.curSelectedNode {padding-top:0px; background-color:#FFE6B0; color:black; height:16px; border:1px #FFB951 solid; opacity:0.8;}
+.ztree li a.curSelectedNode_Edit {padding-top:0px; background-color:#FFE6B0; color:black; height:16px; border:1px #FFB951 solid; opacity:0.8;}
+.ztree li a.tmpTargetNode_inner {padding-top:0px; background-color:#316AC5; color:white; height:16px; border:1px #316AC5 solid;
+ opacity:0.8; filter:alpha(opacity=80)}
+.ztree li a.tmpTargetNode_prev {}
+.ztree li a.tmpTargetNode_next {}
+.ztree li a input.rename {height:14px; width:80px; padding:0; margin:0;
+ font-size:12px; border:1px #7EC4CC solid; *border:0px}
+.ztree li span {line-height:16px; margin-right:2px}
+.ztree li span.button {line-height:0; margin:0; width:16px; height:16px; display: inline-block; vertical-align:middle;
+ border:0 none; cursor: pointer;outline:none;
+ background-color:transparent; background-repeat:no-repeat; background-attachment: scroll;
+ background-image:url("./img/zTreeStandard.png"); *background-image:url("./img/zTreeStandard.gif")}
+
+.ztree li span.button.chk {width:13px; height:13px; margin:0 3px 0 0; cursor: auto}
+.ztree li span.button.chk.checkbox_false_full {background-position:0 0}
+.ztree li span.button.chk.checkbox_false_full_focus {background-position:0 -14px}
+.ztree li span.button.chk.checkbox_false_part {background-position:0 -28px}
+.ztree li span.button.chk.checkbox_false_part_focus {background-position:0 -42px}
+.ztree li span.button.chk.checkbox_false_disable {background-position:0 -56px}
+.ztree li span.button.chk.checkbox_true_full {background-position:-14px 0}
+.ztree li span.button.chk.checkbox_true_full_focus {background-position:-14px -14px}
+.ztree li span.button.chk.checkbox_true_part {background-position:-14px -28px}
+.ztree li span.button.chk.checkbox_true_part_focus {background-position:-14px -42px}
+.ztree li span.button.chk.checkbox_true_disable {background-position:-14px -56px}
+.ztree li span.button.chk.radio_false_full {background-position:-28px 0}
+.ztree li span.button.chk.radio_false_full_focus {background-position:-28px -14px}
+.ztree li span.button.chk.radio_false_part {background-position:-28px -28px}
+.ztree li span.button.chk.radio_false_part_focus {background-position:-28px -42px}
+.ztree li span.button.chk.radio_false_disable {background-position:-28px -56px}
+.ztree li span.button.chk.radio_true_full {background-position:-42px 0}
+.ztree li span.button.chk.radio_true_full_focus {background-position:-42px -14px}
+.ztree li span.button.chk.radio_true_part {background-position:-42px -28px}
+.ztree li span.button.chk.radio_true_part_focus {background-position:-42px -42px}
+.ztree li span.button.chk.radio_true_disable {background-position:-42px -56px}
+
+.ztree li span.button.switch {width:18px; height:18px}
+.ztree li span.button.root_open{background-position:-92px -54px}
+.ztree li span.button.root_close{background-position:-74px -54px}
+.ztree li span.button.roots_open{background-position:-92px 0}
+.ztree li span.button.roots_close{background-position:-74px 0}
+.ztree li span.button.center_open{background-position:-92px -18px}
+.ztree li span.button.center_close{background-position:-74px -18px}
+.ztree li span.button.bottom_open{background-position:-92px -36px}
+.ztree li span.button.bottom_close{background-position:-74px -36px}
+.ztree li span.button.noline_open{background-position:-92px -72px}
+.ztree li span.button.noline_close{background-position:-74px -72px}
+.ztree li span.button.root_docu{ background:none;}
+.ztree li span.button.roots_docu{background-position:-56px 0}
+.ztree li span.button.center_docu{background-position:-56px -18px}
+.ztree li span.button.bottom_docu{background-position:-56px -36px}
+.ztree li span.button.noline_docu{ background:none;}
+
+.ztree li span.button.ico_open{margin-right:2px; background-position:-110px -16px; vertical-align:top; *vertical-align:middle}
+.ztree li span.button.ico_close{margin-right:2px; background-position:-110px 0; vertical-align:top; *vertical-align:middle}
+.ztree li span.button.ico_docu{margin-right:2px; background-position:-110px -32px; vertical-align:top; *vertical-align:middle}
+.ztree li span.button.edit {margin-right:2px; background-position:-110px -48px; vertical-align:top; *vertical-align:middle}
+.ztree li span.button.remove {margin-right:2px; background-position:-110px -64px; vertical-align:top; *vertical-align:middle}
+
+.ztree li span.button.ico_loading{margin-right:2px; background:url(./img/loading.gif) no-repeat scroll 0 0 transparent; vertical-align:top; *vertical-align:middle}
+
+ul.tmpTargetzTree {background-color:#FFE6B0; opacity:0.8; filter:alpha(opacity=80)}
+
+span.tmpzTreeMove_arrow {width:16px; height:16px; display: inline-block; padding:0; margin:2px 0 0 1px; border:0 none; position:absolute;
+ background-color:transparent; background-repeat:no-repeat; background-attachment: scroll;
+ background-position:-110px -80px; background-image:url("./img/zTreeStandard.png"); *background-image:url("./img/zTreeStandard.gif")}
+
+ul.ztree.zTreeDragUL {margin:0; padding:0; position:absolute; width:auto; height:auto;overflow:hidden; background-color:#cfcfcf; border:1px #00B83F dotted; opacity:0.8; filter:alpha(opacity=80)}
+.zTreeMask {z-index:10000; background-color:#cfcfcf; opacity:0.0; filter:alpha(opacity=0); position:absolute}
+
+/* level style*/
+/*.ztree li span.button.level0 {
+ display:none;
+}
+.ztree li ul.level0 {
+ padding:0;
+ background:none;
+}*/
\ No newline at end of file
diff --git a/management/guns-admin/src/main/webapp/static/css/style.css b/management/guns-admin/src/main/webapp/static/css/style.css
new file mode 100644
index 0000000..198d105
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/static/css/style.css
@@ -0,0 +1,7897 @@
+/*
+ *
+ * H+ - 后台主题UI框架
+ * version 4.0
+ *
+*/
+
+h1,
+h2,
+h3,
+h4,
+h5,
+h6 {
+ font-weight: 100;
+}
+
+h1 {
+ font-size: 30px;
+}
+
+h2 {
+ font-size: 24px;
+}
+
+h3 {
+ font-size: 16px;
+}
+
+h4 {
+ font-size: 14px;
+}
+
+h5 {
+ font-size: 12px;
+}
+
+h6 {
+ font-size: 10px;
+}
+
+h3,
+h4,
+h5 {
+ margin-top: 5px;
+ font-weight: 600;
+}
+
+a:focus {
+ outline: none;
+}
+
+.nav > li > a {
+ color: #a7b1c2;
+ font-weight: 600;
+ padding: 14px 20px 14px 25px;
+}
+
+.nav li>a {
+ display: block;
+ /*white-space: nowrap;*/
+}
+
+.nav.navbar-right > li > a {
+ color: #999c9e;
+}
+
+.nav > li.active > a {
+ color: #ffffff;
+}
+
+.navbar-default .nav > li > a:hover,
+.navbar-default .nav > li > a:focus {
+ background-color: #293846;
+ color: white;
+}
+
+.nav .open > a,
+.nav .open > a:hover,
+.nav .open > a:focus {
+ background: #fff;
+}
+
+.nav > li > a i {
+ margin-right: 6px;
+}
+
+.navbar {
+ border: 0;
+}
+
+.navbar-default {
+ background-color: transparent;
+ border-color: #2f4050;
+ position: relative;
+}
+
+.navbar-top-links li {
+ display: inline-block;
+}
+
+.navbar-top-links li:last-child {
+ margin-right: 30px;
+}
+
+body.body-small .navbar-top-links li:last-child {
+ margin-right: 10px;
+}
+
+.navbar-top-links li a {
+ padding: 20px 10px;
+ min-height: 50px;
+}
+
+.dropdown-menu {
+ border: medium none;
+ display: none;
+ float: left;
+ font-size: 12px;
+ left: 0;
+ list-style: none outside none;
+ padding: 0;
+ position: absolute;
+ text-shadow: none;
+ top: 100%;
+ z-index: 1000;
+ border-radius: 0;
+ box-shadow: 0 0 3px rgba(86, 96, 117, 0.3);
+}
+
+.dropdown-menu > li > a {
+ border-radius: 3px;
+ color: inherit;
+ line-height: 25px;
+ margin: 4px;
+ text-align: left;
+ font-weight: normal;
+}
+
+.dropdown-menu > li > a.font-bold {
+ font-weight: 600;
+}
+
+.navbar-top-links .dropdown-menu li {
+ display: block;
+}
+
+.navbar-top-links .dropdown-menu li:last-child {
+ margin-right: 0;
+}
+
+.navbar-top-links .dropdown-menu li a {
+ padding: 3px 20px;
+ min-height: 0;
+}
+
+.navbar-top-links .dropdown-menu li a div {
+ white-space: normal;
+}
+
+.navbar-top-links .dropdown-messages,
+.navbar-top-links .dropdown-tasks,
+.navbar-top-links .dropdown-alerts {
+ width: 310px;
+ min-width: 0;
+}
+
+.navbar-top-links .dropdown-messages {
+ margin-left: 5px;
+}
+
+.navbar-top-links .dropdown-tasks {
+ margin-left: -59px;
+}
+
+.navbar-top-links .dropdown-alerts {
+ margin-left: -123px;
+}
+
+.navbar-top-links .dropdown-user {
+ right: 0;
+ left: auto;
+}
+
+.dropdown-messages,
+.dropdown-alerts {
+ padding: 10px 10px 10px 10px;
+}
+
+.dropdown-messages li a,
+.dropdown-alerts li a {
+ font-size: 12px;
+}
+
+.dropdown-messages li em,
+.dropdown-alerts li em {
+ font-size: 10px;
+}
+
+.nav.navbar-top-links .dropdown-alerts a {
+ font-size: 12px;
+}
+
+.nav-header {
+ padding: 33px 25px;
+ background: url("patterns/header-profile.png") no-repeat;
+}
+
+.pace-done .nav-header {
+ -webkit-transition: all 0.5s;
+ transition: all 0.5s;
+}
+
+.nav > li.active {
+ border-left: 4px solid #19aa8d;
+ background: #293846;
+}
+
+.nav.nav-second-level > li.active {
+ border: none;
+}
+
+.nav.nav-second-level.collapse[style] {
+ height: auto !important;
+}
+
+.nav-header a {
+ color: #DFE4ED;
+}
+
+.nav-header .text-muted {
+ color: #8095a8;
+}
+
+.minimalize-styl-2 {
+ padding: 4px 12px;
+ margin: 14px 5px 5px 20px;
+ font-size: 14px;
+ float: left;
+}
+
+.navbar-form-custom {
+ float: left;
+ height: 50px;
+ padding: 0;
+ width: 200px;
+ display: inline-table;
+}
+
+.navbar-form-custom .form-group {
+ margin-bottom: 0;
+}
+
+.nav.navbar-top-links a {
+ font-size: 14px;
+}
+
+.navbar-form-custom .form-control {
+ background: none repeat scroll 0 0 rgba(0, 0, 0, 0);
+ border: medium none;
+ font-size: 14px;
+ height: 60px;
+ margin: 0;
+ z-index: 2000;
+}
+
+.count-info .label {
+ line-height: 12px;
+ padding: 1px 5px;
+ position: absolute;
+ right: 6px;
+ top: 12px;
+}
+
+.arrow {
+ float: right;
+ margin-top: 2px;
+}
+
+.fa.arrow:before {
+ content: "\f104";
+}
+
+.active > a > .fa.arrow:before {
+ content: "\f107";
+}
+
+.nav-second-level li,
+.nav-third-level li {
+ border-bottom: none !important;
+}
+
+.nav-second-level li a {
+ padding: 7px 15px 7px 10px;
+ padding-left: 52px;
+}
+
+.nav-third-level li a {
+ padding-left: 62px;
+}
+
+.nav-second-level li:last-child {
+ margin-bottom: 10px;
+}
+
+body:not(.fixed-sidebar):not(.canvas-menu).mini-navbar .nav li:hover > .nav-second-level,
+.mini-navbar .nav li:focus > .nav-second-level {
+ display: block;
+ border-radius: 0 2px 2px 0;
+ min-width: 140px;
+ height: auto;
+}
+
+body.mini-navbar .navbar-default .nav > li > .nav-second-level li a {
+ font-size: 12px;
+ border-radius: 0 2px 2px 0;
+}
+
+.fixed-nav .slimScrollDiv #side-menu {
+ padding-bottom: 60px;
+ position: relative;
+}
+
+.slimScrollDiv >* {
+ overflow: hidden;
+}
+
+.mini-navbar .nav-second-level li a {
+ padding: 10px 10px 10px 15px;
+}
+
+.canvas-menu.mini-navbar .nav-second-level {
+ background: #293846;
+}
+
+.mini-navbar li.active .nav-second-level {
+ left: 65px;
+}
+
+.navbar-default .special_link a {
+ background: #1ab394;
+ color: white;
+}
+
+.navbar-default .special_link a:hover {
+ background: #17987e !important;
+ color: white;
+}
+
+.navbar-default .special_link a span.label {
+ background: #fff;
+ color: #1ab394;
+}
+
+.navbar-default .landing_link a {
+ background: #1cc09f;
+ color: white;
+}
+
+.navbar-default .landing_link a:hover {
+ background: #1ab394 !important;
+ color: white;
+}
+
+.navbar-default .landing_link a span.label {
+ background: #fff;
+ color: #1cc09f;
+}
+
+.logo-element {
+ text-align: center;
+ font-size: 18px;
+ font-weight: 600;
+ color: white;
+ display: none;
+ padding: 18px 0;
+}
+
+.pace-done .navbar-static-side,
+.pace-done .nav-header,
+.pace-done li.active,
+.pace-done #page-wrapper,
+.pace-done .footer {
+ -webkit-transition: all 0.5s;
+ transition: all 0.5s;
+}
+
+.navbar-fixed-top {
+ background: #fff;
+ -webkit-transition-duration: 0.5s;
+ transition-duration: 0.5s;
+ z-index: 2030;
+}
+
+.navbar-fixed-top,
+.navbar-static-top {
+ background: #f3f3f4;
+}
+
+.fixed-nav #wrapper {
+ padding-top: 60px;
+ box-sizing: border-box;
+}
+
+.fixed-nav .minimalize-styl-2 {
+ margin: 14px 5px 5px 15px;
+}
+
+.body-small .navbar-fixed-top {
+ margin-left: 0px;
+}
+
+body.mini-navbar .navbar-static-side {
+ width: 70px;
+}
+
+body.mini-navbar .profile-element,
+body.mini-navbar .nav-label,
+body.mini-navbar .navbar-default .nav li a span {
+ display: none;
+}
+
+body.canvas-menu .profile-element {
+ display: block;
+}
+
+body:not(.fixed-sidebar):not(.canvas-menu).mini-navbar .nav-second-level {
+ display: none;
+}
+
+body.mini-navbar .navbar-default .nav > li > a {
+ font-size: 16px;
+}
+
+body.mini-navbar .logo-element {
+ display: block;
+}
+
+body.canvas-menu .logo-element {
+ display: none;
+}
+
+body.mini-navbar .nav-header {
+ padding: 0;
+ background-color: #1ab394;
+}
+
+body.canvas-menu .nav-header {
+ padding: 33px 25px;
+}
+
+body.mini-navbar #page-wrapper {
+ margin: 0 0 0 70px;
+}
+
+body.canvas-menu.mini-navbar #page-wrapper,
+body.canvas-menu.mini-navbar .footer {
+ margin: 0 0 0 0;
+}
+
+body.fixed-sidebar .navbar-static-side,
+body.canvas-menu .navbar-static-side {
+ position: fixed;
+ width: 220px;
+ z-index: 2001;
+ height: 100%;
+}
+
+body.fixed-sidebar.mini-navbar .navbar-static-side {
+ width: 70px;
+}
+
+body.fixed-sidebar.mini-navbar #page-wrapper {
+ margin: 0 0 0 70px;
+}
+
+body.body-small.fixed-sidebar.mini-navbar #page-wrapper {
+ margin: 0 0 0 70px;
+}
+
+body.body-small.fixed-sidebar.mini-navbar .navbar-static-side {
+ width: 70px;
+}
+
+.fixed-sidebar.mini-navbar .nav li> .nav-second-level {
+ display: none;
+}
+
+.fixed-sidebar.mini-navbar .nav li.active {
+ border-left-width: 0;
+}
+
+.fixed-sidebar.mini-navbar .nav li:hover > .nav-second-level,
+.canvas-menu.mini-navbar .nav li:hover > .nav-second-level {
+ position: absolute;
+ left: 70px;
+ top: 0px;
+ background-color: #2f4050;
+ padding: 10px 10px 0 10px;
+ font-size: 12px;
+ display: block;
+ min-width: 140px;
+ border-radius: 2px;
+}
+
+body.fixed-sidebar.mini-navbar .navbar-default .nav > li > .nav-second-level li a {
+ font-size: 12px;
+ border-radius: 3px;
+}
+
+body.canvas-menu.mini-navbar .navbar-default .nav > li > .nav-second-level li a {
+ font-size: 13px;
+ border-radius: 3px;
+}
+
+.fixed-sidebar.mini-navbar .nav-second-level li a,
+.canvas-menu.mini-navbar .nav-second-level li a {
+ padding: 10px 10px 10px 15px;
+}
+
+.fixed-sidebar.mini-navbar .nav-second-level,
+.canvas-menu.mini-navbar .nav-second-level {
+ position: relative;
+ padding: 0;
+ font-size: 13px;
+}
+
+.fixed-sidebar.mini-navbar li.active .nav-second-level,
+.canvas-menu.mini-navbar li.active .nav-second-level {
+ left: 0px;
+}
+
+body.canvas-menu nav.navbar-static-side {
+ z-index: 2001;
+ background: #2f4050;
+ height: 100%;
+ position: fixed;
+ display: none;
+}
+
+body.canvas-menu.mini-navbar nav.navbar-static-side {
+ display: block;
+ width: 70px;
+}
+
+.top-navigation #page-wrapper {
+ margin-left: 0;
+}
+
+.top-navigation .navbar-nav .dropdown-menu > .active > a {
+ background: white;
+ color: #1ab394;
+ font-weight: bold;
+}
+
+.white-bg .navbar-fixed-top,
+.white-bg .navbar-static-top {
+ background: #fff;
+}
+
+.top-navigation .navbar {
+ margin-bottom: 0;
+}
+
+.top-navigation .nav > li > a {
+ padding: 15px 20px;
+ color: #676a6c;
+}
+
+.top-navigation .nav > li a:hover,
+.top-navigation .nav > li a:focus {
+ background: #fff;
+ color: #1ab394;
+}
+
+.top-navigation .nav > li.active {
+ background: #fff;
+ border: none;
+}
+
+.top-navigation .nav > li.active > a {
+ color: #1ab394;
+}
+
+.top-navigation .navbar-right {
+ padding-right: 10px;
+}
+
+.top-navigation .navbar-nav .dropdown-menu {
+ box-shadow: none;
+ border: 1px solid #e7eaec;
+}
+
+.top-navigation .dropdown-menu > li > a {
+ margin: 0;
+ padding: 7px 20px;
+}
+
+.navbar .dropdown-menu {
+ margin-top: 0px;
+}
+
+.top-navigation .navbar-brand {
+ background: #1ab394;
+ color: #fff;
+ padding: 15px 25px;
+}
+
+.top-navigation .navbar-top-links li:last-child {
+ margin-right: 0;
+}
+
+.top-navigation.mini-navbar #page-wrapper,
+.top-navigation.body-small.fixed-sidebar.mini-navbar #page-wrapper,
+.mini-navbar .top-navigation #page-wrapper,
+.body-small.fixed-sidebar.mini-navbar .top-navigation #page-wrapper,
+.canvas-menu #page-wrapper {
+ margin: 0;
+}
+
+.top-navigation.fixed-nav #wrapper,
+.fixed-nav #wrapper.top-navigation {
+ margin-top: 50px;
+}
+
+.top-navigation .footer.fixed {
+ margin-left: 0 !important;
+}
+
+.top-navigation .wrapper.wrapper-content {
+ padding: 40px;
+}
+
+.top-navigation.body-small .wrapper.wrapper-content,
+.body-small .top-navigation .wrapper.wrapper-content {
+ padding: 40px 0px 40px 0px;
+}
+
+.navbar-toggle {
+ background-color: #1ab394;
+ color: #fff;
+ padding: 6px 12px;
+ font-size: 14px;
+}
+
+.top-navigation .navbar-nav .open .dropdown-menu > li > a,
+.top-navigation .navbar-nav .open .dropdown-menu .dropdown-header {
+ padding: 10px 15px 10px 20px;
+}
+
+@media (max-width: 768px) {
+ .top-navigation .navbar-header {
+ display: block;
+ float: none;
+ }
+}
+
+.menu-visible-lg,
+.menu-visible-md {
+ display: none !important;
+}
+
+@media (min-width: 1200px) {
+ .menu-visible-lg {
+ display: block !important;
+ }
+}
+
+@media (min-width: 992px) {
+ .menu-visible-md {
+ display: block !important;
+ }
+}
+
+@media (max-width: 767px) {
+ .menu-visible-md {
+ display: block !important;
+ }
+ .menu-visible-lg {
+ display: block !important;
+ }
+}
+
+.btn {
+ border-radius: 3px;
+}
+
+.float-e-margins .btn {
+ margin-bottom: 5px;
+}
+
+.btn-w-m {
+ min-width: 120px;
+}
+
+.btn-primary.btn-outline {
+ color: #1ab394;
+}
+
+.btn-success.btn-outline {
+ color: #1c84c6;
+}
+
+.btn-info.btn-outline {
+ color: #23c6c8;
+}
+
+.btn-warning.btn-outline {
+ color: #f8ac59;
+}
+
+.btn-danger.btn-outline {
+ color: #ed5565;
+}
+
+.btn-primary.btn-outline:hover,
+.btn-success.btn-outline:hover,
+.btn-info.btn-outline:hover,
+.btn-warning.btn-outline:hover,
+.btn-danger.btn-outline:hover {
+ color: #fff;
+}
+
+.btn-primary {
+ background-color: #1ab394;
+ border-color: #1ab394;
+ color: #FFFFFF;
+}
+
+.btn-primary:hover,
+.btn-primary:focus,
+.btn-primary:active,
+.btn-primary.active,
+.open .dropdown-toggle.btn-primary {
+ background-color: #18a689;
+ border-color: #18a689;
+ color: #FFFFFF;
+}
+
+.btn-primary:active,
+.btn-primary.active,
+.open .dropdown-toggle.btn-primary {
+ background-image: none;
+}
+
+.btn-primary.disabled,
+.btn-primary.disabled:hover,
+.btn-primary.disabled:focus,
+.btn-primary.disabled:active,
+.btn-primary.disabled.active,
+.btn-primary[disabled],
+.btn-primary[disabled]:hover,
+.btn-primary[disabled]:focus,
+.btn-primary[disabled]:active,
+.btn-primary.active[disabled],
+fieldset[disabled] .btn-primary,
+fieldset[disabled] .btn-primary:hover,
+fieldset[disabled] .btn-primary:focus,
+fieldset[disabled] .btn-primary:active,
+fieldset[disabled] .btn-primary.active {
+ background-color: #1dc5a3;
+ border-color: #1dc5a3;
+}
+
+.btn-success {
+ background-color: #1c84c6;
+ border-color: #1c84c6;
+ color: #FFFFFF;
+}
+
+.btn-success:hover,
+.btn-success:focus,
+.btn-success:active,
+.btn-success.active,
+.open .dropdown-toggle.btn-success {
+ background-color: #1a7bb9;
+ border-color: #1a7bb9;
+ color: #FFFFFF;
+}
+
+.btn-success:active,
+.btn-success.active,
+.open .dropdown-toggle.btn-success {
+ background-image: none;
+}
+
+.btn-success.disabled,
+.btn-success.disabled:hover,
+.btn-success.disabled:focus,
+.btn-success.disabled:active,
+.btn-success.disabled.active,
+.btn-success[disabled],
+.btn-success[disabled]:hover,
+.btn-success[disabled]:focus,
+.btn-success[disabled]:active,
+.btn-success.active[disabled],
+fieldset[disabled] .btn-success,
+fieldset[disabled] .btn-success:hover,
+fieldset[disabled] .btn-success:focus,
+fieldset[disabled] .btn-success:active,
+fieldset[disabled] .btn-success.active {
+ background-color: #1f90d8;
+ border-color: #1f90d8;
+}
+
+.btn-info {
+ background-color: #23c6c8;
+ border-color: #23c6c8;
+ color: #FFFFFF;
+}
+
+.btn-info:hover,
+.btn-info:focus,
+.btn-info:active,
+.btn-info.active,
+.open .dropdown-toggle.btn-info {
+ background-color: #21b9bb;
+ border-color: #21b9bb;
+ color: #FFFFFF;
+}
+
+.btn-info:active,
+.btn-info.active,
+.open .dropdown-toggle.btn-info {
+ background-image: none;
+}
+
+.btn-info.disabled,
+.btn-info.disabled:hover,
+.btn-info.disabled:focus,
+.btn-info.disabled:active,
+.btn-info.disabled.active,
+.btn-info[disabled],
+.btn-info[disabled]:hover,
+.btn-info[disabled]:focus,
+.btn-info[disabled]:active,
+.btn-info.active[disabled],
+fieldset[disabled] .btn-info,
+fieldset[disabled] .btn-info:hover,
+fieldset[disabled] .btn-info:focus,
+fieldset[disabled] .btn-info:active,
+fieldset[disabled] .btn-info.active {
+ background-color: #26d7d9;
+ border-color: #26d7d9;
+}
+
+.btn-default {
+ background-color: #c2c2c2;
+ border-color: #c2c2c2;
+ color: #FFFFFF;
+}
+
+.btn-default:hover,
+.btn-default:focus,
+.btn-default:active,
+.btn-default.active,
+.open .dropdown-toggle.btn-default {
+ background-color: #bababa;
+ border-color: #bababa;
+ color: #FFFFFF;
+}
+
+.btn-default:active,
+.btn-default.active,
+.open .dropdown-toggle.btn-default {
+ background-image: none;
+}
+
+.btn-default.disabled,
+.btn-default.disabled:hover,
+.btn-default.disabled:focus,
+.btn-default.disabled:active,
+.btn-default.disabled.active,
+.btn-default[disabled],
+.btn-default[disabled]:hover,
+.btn-default[disabled]:focus,
+.btn-default[disabled]:active,
+.btn-default.active[disabled],
+fieldset[disabled] .btn-default,
+fieldset[disabled] .btn-default:hover,
+fieldset[disabled] .btn-default:focus,
+fieldset[disabled] .btn-default:active,
+fieldset[disabled] .btn-default.active {
+ background-color: #cccccc;
+ border-color: #cccccc;
+}
+
+.btn-warning {
+ background-color: #f8ac59;
+ border-color: #f8ac59;
+ color: #FFFFFF;
+}
+
+.btn-warning:hover,
+.btn-warning:focus,
+.btn-warning:active,
+.btn-warning.active,
+.open .dropdown-toggle.btn-warning {
+ background-color: #f7a54a;
+ border-color: #f7a54a;
+ color: #FFFFFF;
+}
+
+.btn-warning:active,
+.btn-warning.active,
+.open .dropdown-toggle.btn-warning {
+ background-image: none;
+}
+
+.btn-warning.disabled,
+.btn-warning.disabled:hover,
+.btn-warning.disabled:focus,
+.btn-warning.disabled:active,
+.btn-warning.disabled.active,
+.btn-warning[disabled],
+.btn-warning[disabled]:hover,
+.btn-warning[disabled]:focus,
+.btn-warning[disabled]:active,
+.btn-warning.active[disabled],
+fieldset[disabled] .btn-warning,
+fieldset[disabled] .btn-warning:hover,
+fieldset[disabled] .btn-warning:focus,
+fieldset[disabled] .btn-warning:active,
+fieldset[disabled] .btn-warning.active {
+ background-color: #f9b66d;
+ border-color: #f9b66d;
+}
+
+.btn-danger {
+ background-color: #ed5565;
+ border-color: #ed5565;
+ color: #FFFFFF;
+}
+
+.btn-danger:hover,
+.btn-danger:focus,
+.btn-danger:active,
+.btn-danger.active,
+.open .dropdown-toggle.btn-danger {
+ background-color: #ec4758;
+ border-color: #ec4758;
+ color: #FFFFFF;
+}
+
+.btn-danger:active,
+.btn-danger.active,
+.open .dropdown-toggle.btn-danger {
+ background-image: none;
+}
+
+.btn-danger.disabled,
+.btn-danger.disabled:hover,
+.btn-danger.disabled:focus,
+.btn-danger.disabled:active,
+.btn-danger.disabled.active,
+.btn-danger[disabled],
+.btn-danger[disabled]:hover,
+.btn-danger[disabled]:focus,
+.btn-danger[disabled]:active,
+.btn-danger.active[disabled],
+fieldset[disabled] .btn-danger,
+fieldset[disabled] .btn-danger:hover,
+fieldset[disabled] .btn-danger:focus,
+fieldset[disabled] .btn-danger:active,
+fieldset[disabled] .btn-danger.active {
+ background-color: #ef6776;
+ border-color: #ef6776;
+}
+
+.btn-link {
+ color: inherit;
+}
+
+.btn-link:hover,
+.btn-link:focus,
+.btn-link:active,
+.btn-link.active,
+.open .dropdown-toggle.btn-link {
+ color: #1ab394;
+ text-decoration: none;
+}
+
+.btn-link:active,
+.btn-link.active,
+.open .dropdown-toggle.btn-link {
+ background-image: none;
+}
+
+.btn-link.disabled,
+.btn-link.disabled:hover,
+.btn-link.disabled:focus,
+.btn-link.disabled:active,
+.btn-link.disabled.active,
+.btn-link[disabled],
+.btn-link[disabled]:hover,
+.btn-link[disabled]:focus,
+.btn-link[disabled]:active,
+.btn-link.active[disabled],
+fieldset[disabled] .btn-link,
+fieldset[disabled] .btn-link:hover,
+fieldset[disabled] .btn-link:focus,
+fieldset[disabled] .btn-link:active,
+fieldset[disabled] .btn-link.active {
+ color: #cacaca;
+}
+
+.btn-white {
+ color: inherit;
+ background: white;
+ border: 1px solid #e7eaec;
+}
+
+.btn-white:hover,
+.btn-white:focus,
+.btn-white:active,
+.btn-white.active,
+.open .dropdown-toggle.btn-white {
+ color: inherit;
+ border: 1px solid #d2d2d2;
+}
+
+.btn-white:active,
+.btn-white.active {
+ box-shadow: 0 2px 5px rgba(0, 0, 0, 0.15) inset;
+}
+
+.btn-white:active,
+.btn-white.active,
+.open .dropdown-toggle.btn-white {
+ background-image: none;
+}
+
+.btn-white.disabled,
+.btn-white.disabled:hover,
+.btn-white.disabled:focus,
+.btn-white.disabled:active,
+.btn-white.disabled.active,
+.btn-white[disabled],
+.btn-white[disabled]:hover,
+.btn-white[disabled]:focus,
+.btn-white[disabled]:active,
+.btn-white.active[disabled],
+fieldset[disabled] .btn-white,
+fieldset[disabled] .btn-white:hover,
+fieldset[disabled] .btn-white:focus,
+fieldset[disabled] .btn-white:active,
+fieldset[disabled] .btn-white.active {
+ color: #cacaca;
+}
+
+.form-control,
+.form-control:focus,
+.has-error .form-control:focus,
+.has-success .form-control:focus,
+.has-warning .form-control:focus,
+.navbar-collapse,
+.navbar-form,
+.navbar-form-custom .form-control:focus,
+.navbar-form-custom .form-control:hover,
+.open .btn.dropdown-toggle,
+.panel,
+.popover,
+.progress,
+.progress-bar {
+ box-shadow: none;
+}
+
+.btn-outline {
+ color: inherit;
+ background-color: transparent;
+ -webkit-transition: all .5s;
+ transition: all .5s;
+}
+
+.btn-rounded {
+ border-radius: 50px;
+}
+
+.btn-large-dim {
+ width: 90px;
+ height: 90px;
+ font-size: 42px;
+}
+
+button.dim {
+ display: inline-block;
+ color: #fff;
+ text-decoration: none;
+ text-transform: uppercase;
+ text-align: center;
+ padding-top: 6px;
+ margin-right: 10px;
+ position: relative;
+ cursor: pointer;
+ border-radius: 5px;
+ font-weight: 600;
+ margin-bottom: 20px !important;
+}
+
+button.dim:active {
+ top: 3px;
+}
+
+button.btn-primary.dim {
+ box-shadow: inset 0px 0px 0px #16987e, 0px 5px 0px 0px #16987e, 0px 10px 5px #999999;
+}
+
+button.btn-primary.dim:active {
+ box-shadow: inset 0px 0px 0px #16987e, 0px 2px 0px 0px #16987e, 0px 5px 3px #999999;
+}
+
+button.btn-default.dim {
+ box-shadow: inset 0px 0px 0px #b3b3b3, 0px 5px 0px 0px #b3b3b3, 0px 10px 5px #999999;
+}
+
+button.btn-default.dim:active {
+ box-shadow: inset 0px 0px 0px #b3b3b3, 0px 2px 0px 0px #b3b3b3, 0px 5px 3px #999999;
+}
+
+button.btn-warning.dim {
+ box-shadow: inset 0px 0px 0px #f79d3c, 0px 5px 0px 0px #f79d3c, 0px 10px 5px #999999;
+}
+
+button.btn-warning.dim:active {
+ box-shadow: inset 0px 0px 0px #f79d3c, 0px 2px 0px 0px #f79d3c, 0px 5px 3px #999999;
+}
+
+button.btn-info.dim {
+ box-shadow: inset 0px 0px 0px #1eacae, 0px 5px 0px 0px #1eacae, 0px 10px 5px #999999;
+}
+
+button.btn-info.dim:active {
+ box-shadow: inset 0px 0px 0px #1eacae, 0px 2px 0px 0px #1eacae, 0px 5px 3px #999999;
+}
+
+button.btn-success.dim {
+ box-shadow: inset 0px 0px 0px #1872ab, 0px 5px 0px 0px #1872ab, 0px 10px 5px #999999;
+}
+
+button.btn-success.dim:active {
+ box-shadow: inset 0px 0px 0px #1872ab, 0px 2px 0px 0px #1872ab, 0px 5px 3px #999999;
+}
+
+button.btn-danger.dim {
+ box-shadow: inset 0px 0px 0px #ea394c, 0px 5px 0px 0px #ea394c, 0px 10px 5px #999999;
+}
+
+button.btn-danger.dim:active {
+ box-shadow: inset 0px 0px 0px #ea394c, 0px 2px 0px 0px #ea394c, 0px 5px 3px #999999;
+}
+
+button.dim:before {
+ font-size: 50px;
+ line-height: 1em;
+ font-weight: normal;
+ color: #fff;
+ display: block;
+ padding-top: 10px;
+}
+
+button.dim:active:before {
+ top: 7px;
+ font-size: 50px;
+}
+
+.label {
+ background-color: #d1dade;
+ color: #5e5e5e;
+ font-size: 10px;
+ font-weight: 600;
+ padding: 3px 8px;
+ text-shadow: none;
+}
+
+.badge {
+ background-color: #d1dade;
+ color: #5e5e5e;
+ font-size: 11px;
+ font-weight: 600;
+ padding-bottom: 4px;
+ padding-left: 6px;
+ padding-right: 6px;
+ text-shadow: none;
+}
+
+.label-primary,
+.badge-primary {
+ background-color: #1ab394;
+ color: #FFFFFF;
+}
+
+.label-success,
+.badge-success {
+ background-color: #1c84c6;
+ color: #FFFFFF;
+}
+
+.label-warning,
+.badge-warning {
+ background-color: #f8ac59;
+ color: #FFFFFF;
+}
+
+.label-warning-light,
+.badge-warning-light {
+ background-color: #f8ac59;
+ color: #ffffff;
+}
+
+.label-danger,
+.badge-danger {
+ background-color: #ed5565;
+ color: #FFFFFF;
+}
+
+.label-info,
+.badge-info {
+ background-color: #23c6c8;
+ color: #FFFFFF;
+}
+
+.label-inverse,
+.badge-inverse {
+ background-color: #262626;
+ color: #FFFFFF;
+}
+
+.label-white,
+.badge-white {
+ background-color: #FFFFFF;
+ color: #5E5E5E;
+}
+
+.label-white,
+.badge-disable {
+ background-color: #2A2E36;
+ color: #8B91A0;
+}
+
+
+/* TOOGLE SWICH */
+
+.onoffswitch {
+ position: relative;
+ width: 64px;
+ -webkit-user-select: none;
+ -moz-user-select: none;
+ -ms-user-select: none;
+}
+
+.onoffswitch-checkbox {
+ display: none;
+}
+
+.onoffswitch-label {
+ display: block;
+ overflow: hidden;
+ cursor: pointer;
+ border: 2px solid #1ab394;
+ border-radius: 2px;
+}
+
+.onoffswitch-inner {
+ width: 200%;
+ margin-left: -100%;
+ -webkit-transition: margin 0.3s ease-in 0s;
+ transition: margin 0.3s ease-in 0s;
+}
+
+.onoffswitch-inner:before,
+.onoffswitch-inner:after {
+ float: left;
+ width: 50%;
+ height: 20px;
+ padding: 0;
+ line-height: 20px;
+ font-size: 12px;
+ color: white;
+ font-family: Trebuchet, Arial, sans-serif;
+ font-weight: bold;
+ box-sizing: border-box;
+}
+
+.onoffswitch-inner:before {
+ content: "ON";
+ padding-left: 10px;
+ background-color: #1ab394;
+ color: #FFFFFF;
+}
+
+.onoffswitch-inner:after {
+ content: "OFF";
+ padding-right: 10px;
+ background-color: #FFFFFF;
+ color: #999999;
+ text-align: right;
+}
+
+.onoffswitch-switch {
+ width: 20px;
+ margin: 0px;
+ background: #FFFFFF;
+ border: 2px solid #1ab394;
+ border-radius: 2px;
+ position: absolute;
+ top: 0;
+ bottom: 0;
+ right: 44px;
+ -webkit-transition: all 0.3s ease-in 0s;
+ transition: all 0.3s ease-in 0s;
+}
+
+.onoffswitch-checkbox:checked + .onoffswitch-label .onoffswitch-inner {
+ margin-left: 0;
+}
+
+.onoffswitch-checkbox:checked + .onoffswitch-label .onoffswitch-switch {
+ right: 0px;
+}
+
+
+/* CHOSEN PLUGIN */
+
+.chosen-container-single .chosen-single {
+ background: #ffffff;
+ box-shadow: none;
+ -moz-box-sizing: border-box;
+ background-color: #FFFFFF;
+ border: 1px solid #CBD5DD;
+ border-radius: 2px;
+ cursor: text;
+ height: auto !important;
+ margin: 0;
+ min-height: 30px;
+ overflow: hidden;
+ padding: 4px 12px;
+ position: relative;
+ width: 100%;
+}
+
+.chosen-container-multi .chosen-choices li.search-choice {
+ background: #f1f1f1;
+ border: 1px solid #ededed;
+ border-radius: 2px;
+ box-shadow: none;
+ color: #333333;
+ cursor: default;
+ line-height: 13px;
+ margin: 3px 0 3px 5px;
+ padding: 3px 20px 3px 5px;
+ position: relative;
+}
+
+
+/* PAGINATIN */
+
+.pagination > .active > a,
+.pagination > .active > span,
+.pagination > .active > a:hover,
+.pagination > .active > span:hover,
+.pagination > .active > a:focus,
+.pagination > .active > span:focus {
+ background-color: #f4f4f4;
+ border-color: #DDDDDD;
+ color: inherit;
+ cursor: default;
+ z-index: 2;
+}
+
+.pagination > li > a,
+.pagination > li > span {
+ background-color: #FFFFFF;
+ border: 1px solid #DDDDDD;
+ color: inherit;
+ float: left;
+ line-height: 1.42857;
+ margin-left: -1px;
+ padding: 4px 10px;
+ position: relative;
+ text-decoration: none;
+}
+
+
+/* TOOLTIPS */
+
+.tooltip-inner {
+ background-color: #2F4050;
+}
+
+.tooltip.top .tooltip-arrow {
+ border-top-color: #2F4050;
+}
+
+.tooltip.right .tooltip-arrow {
+ border-right-color: #2F4050;
+}
+
+.tooltip.bottom .tooltip-arrow {
+ border-bottom-color: #2F4050;
+}
+
+.tooltip.left .tooltip-arrow {
+ border-left-color: #2F4050;
+}
+
+
+/* EASY PIE CHART*/
+
+.easypiechart {
+ position: relative;
+ text-align: center;
+}
+
+.easypiechart .h2 {
+ margin-left: 10px;
+ margin-top: 10px;
+ display: inline-block;
+}
+
+.easypiechart canvas {
+ top: 0;
+ left: 0;
+}
+
+.easypiechart .easypie-text {
+ line-height: 1;
+ position: absolute;
+ top: 33px;
+ width: 100%;
+ z-index: 1;
+}
+
+.easypiechart img {
+ margin-top: -4px;
+}
+
+.jqstooltip {
+ box-sizing: content-box;
+}
+
+
+/* FULLCALENDAR */
+
+.fc-state-default {
+ background-color: #ffffff;
+ background-image: none;
+ background-repeat: repeat-x;
+ box-shadow: none;
+ color: #333333;
+ text-shadow: none;
+}
+
+.fc-state-default {
+ border: 1px solid;
+}
+
+.fc-button {
+ color: inherit;
+ border: 1px solid #e7eaec;
+ cursor: pointer;
+ display: inline-block;
+ height: 1.9em;
+ line-height: 1.9em;
+ overflow: hidden;
+ padding: 0 0.6em;
+ position: relative;
+ white-space: nowrap;
+}
+
+.fc-state-active {
+ background-color: #1ab394;
+ border-color: #1ab394;
+ color: #ffffff;
+}
+
+.fc-header-title h2 {
+ font-size: 16px;
+ font-weight: 600;
+ color: inherit;
+}
+
+.fc-content .fc-widget-header,
+.fc-content .fc-widget-content {
+ border-color: #e7eaec;
+ font-weight: normal;
+}
+
+.fc-border-separate tbody {
+ background-color: #F8F8F8;
+}
+
+.fc-state-highlight {
+ background: none repeat scroll 0 0 #FCF8E3;
+}
+
+.external-event {
+ padding: 5px 10px;
+ border-radius: 2px;
+ cursor: pointer;
+ margin-bottom: 5px;
+}
+
+.fc-ltr .fc-event-hori.fc-event-end,
+.fc-rtl .fc-event-hori.fc-event-start {
+ border-radius: 2px;
+}
+
+.fc-event,
+.fc-agenda .fc-event-time,
+.fc-event a {
+ padding: 4px 6px;
+ background-color: #1ab394;
+ /* background color */
+ border-color: #1ab394;
+ /* border color */
+}
+
+.fc-event-time,
+.fc-event-title {
+ color: #717171;
+ padding: 0 1px;
+}
+
+.ui-calendar .fc-event-time,
+.ui-calendar .fc-event-title {
+ color: #fff;
+}
+
+
+/* Chat */
+
+.chat-activity-list .chat-element {
+ border-bottom: 1px solid #e7eaec;
+}
+
+.chat-element:first-child {
+ margin-top: 0;
+}
+
+.chat-element {
+ padding-bottom: 15px;
+}
+
+.chat-element,
+.chat-element .media {
+ margin-top: 15px;
+}
+
+.chat-element,
+.media-body {
+ overflow: hidden;
+}
+
+.media-body {
+ display: block;
+ width: auto;
+}
+
+.chat-element > .pull-left {
+ margin-right: 10px;
+}
+
+.chat-element img.img-circle,
+.dropdown-messages-box img.img-circle {
+ width: 38px;
+ height: 38px;
+}
+
+.chat-element .well {
+ border: 1px solid #e7eaec;
+ box-shadow: none;
+ margin-top: 10px;
+ margin-bottom: 5px;
+ padding: 10px 20px;
+ font-size: 11px;
+ line-height: 16px;
+}
+
+.chat-element .actions {
+ margin-top: 10px;
+}
+
+.chat-element .photos {
+ margin: 10px 0;
+}
+
+.right.chat-element > .pull-right {
+ margin-left: 10px;
+}
+
+.chat-photo {
+ max-height: 180px;
+ border-radius: 4px;
+ overflow: hidden;
+ margin-right: 10px;
+ margin-bottom: 10px;
+}
+
+.chat {
+ margin: 0;
+ padding: 0;
+ list-style: none;
+}
+
+.chat li {
+ margin-bottom: 10px;
+ padding-bottom: 5px;
+ border-bottom: 1px dotted #B3A9A9;
+}
+
+.chat li.left .chat-body {
+ margin-left: 60px;
+}
+
+.chat li.right .chat-body {
+ margin-right: 60px;
+}
+
+.chat li .chat-body p {
+ margin: 0;
+ color: #777777;
+}
+
+.panel .slidedown .glyphicon,
+.chat .glyphicon {
+ margin-right: 5px;
+}
+
+.chat-panel .panel-body {
+ height: 350px;
+ overflow-y: scroll;
+}
+
+
+/* LIST GROUP */
+
+a.list-group-item.active,
+a.list-group-item.active:hover,
+a.list-group-item.active:focus {
+ background-color: #1ab394;
+ border-color: #1ab394;
+ color: #FFFFFF;
+ z-index: 2;
+}
+
+.list-group-item-heading {
+ margin-top: 10px;
+}
+
+.list-group-item-text {
+ margin: 0 0 10px;
+ color: inherit;
+ font-size: 12px;
+ line-height: inherit;
+}
+
+.no-padding .list-group-item {
+ border-left: none;
+ border-right: none;
+ border-bottom: none;
+}
+
+.no-padding .list-group-item:first-child {
+ border-left: none;
+ border-right: none;
+ border-bottom: none;
+ border-top: none;
+}
+
+.no-padding .list-group {
+ margin-bottom: 0;
+}
+
+.list-group-item {
+ background-color: inherit;
+ border: 1px solid #e7eaec;
+ display: block;
+ margin-bottom: -1px;
+ padding: 10px 15px;
+ position: relative;
+}
+
+.elements-list .list-group-item {
+ border-left: none;
+ border-right: none;
+ /*border-top: none;*/
+ padding: 15px 25px;
+}
+
+.elements-list .list-group-item:first-child {
+ border-left: none;
+ border-right: none;
+ border-top: none !important;
+}
+
+.elements-list .list-group {
+ margin-bottom: 0;
+}
+
+.elements-list a {
+ color: inherit;
+}
+
+.elements-list .list-group-item.active,
+.elements-list .list-group-item:hover {
+ background: #f3f3f4;
+ color: inherit;
+ border-color: #e7eaec;
+ /*border-bottom: 1px solid #e7eaec;*/
+ /*border-top: 1px solid #e7eaec;*/
+ border-radius: 0;
+}
+
+.elements-list li.active {
+ -webkit-transition: none;
+ transition: none;
+}
+
+.element-detail-box {
+ padding: 25px;
+}
+
+
+/* FLOT CHART */
+
+.flot-chart {
+ display: block;
+ height: 200px;
+}
+
+.widget .flot-chart.dashboard-chart {
+ display: block;
+ height: 120px;
+ margin-top: 40px;
+}
+
+.flot-chart.dashboard-chart {
+ display: block;
+ height: 180px;
+ margin-top: 40px;
+}
+
+.flot-chart-content {
+ width: 100%;
+ height: 100%;
+}
+
+.flot-chart-pie-content {
+ width: 200px;
+ height: 200px;
+ margin: auto;
+}
+
+.jqstooltip {
+ position: absolute;
+ display: block;
+ left: 0px;
+ top: 0px;
+ visibility: hidden;
+ background: #2b303a;
+ background-color: rgba(43, 48, 58, 0.8);
+ color: white;
+ text-align: left;
+ white-space: nowrap;
+ z-index: 10000;
+ padding: 5px 5px 5px 5px;
+ min-height: 22px;
+ border-radius: 3px;
+}
+
+.jqsfield {
+ color: white;
+ text-align: left;
+}
+
+.h-200 {
+ min-height: 200px;
+}
+
+.legendLabel {
+ padding-left: 5px;
+}
+
+.stat-list li:first-child {
+ margin-top: 0;
+}
+
+.stat-list {
+ list-style: none;
+ padding: 0;
+ margin: 0;
+}
+
+.stat-percent {
+ float: right;
+}
+
+.stat-list li {
+ margin-top: 15px;
+ position: relative;
+}
+
+
+/* DATATABLES */
+
+table.dataTable thead .sorting,
+table.dataTable thead .sorting_asc:after,
+table.dataTable thead .sorting_desc,
+table.dataTable thead .sorting_asc_disabled,
+table.dataTable thead .sorting_desc_disabled {
+ background: transparent;
+}
+
+table.dataTable thead .sorting_asc:after {
+ float: right;
+ font-family: fontawesome;
+}
+
+table.dataTable thead .sorting_desc:after {
+ content: "\f0dd";
+ float: right;
+ font-family: fontawesome;
+}
+
+table.dataTable thead .sorting:after {
+ content: "\f0dc";
+ float: right;
+ font-family: fontawesome;
+ color: rgba(50, 50, 50, 0.5);
+}
+
+.dataTables_wrapper {
+ padding-bottom: 30px;
+}
+
+
+/* CIRCLE */
+
+.img-circle {
+ border-radius: 50%;
+}
+
+.btn-circle {
+ width: 30px;
+ height: 30px;
+ padding: 6px 0;
+ border-radius: 15px;
+ text-align: center;
+ font-size: 12px;
+ line-height: 1.428571429;
+}
+
+.btn-circle.btn-lg {
+ width: 50px;
+ height: 50px;
+ padding: 10px 16px;
+ border-radius: 25px;
+ font-size: 18px;
+ line-height: 1.33;
+}
+
+.btn-circle.btn-xl {
+ width: 70px;
+ height: 70px;
+ padding: 10px 16px;
+ border-radius: 35px;
+ font-size: 24px;
+ line-height: 1.33;
+}
+
+.show-grid [class^="col-"] {
+ padding-top: 10px;
+ padding-bottom: 10px;
+ border: 1px solid #ddd;
+ background-color: #eee !important;
+}
+
+.show-grid {
+ margin: 15px 0;
+}
+
+
+/* ANIMATION */
+
+.css-animation-box h1 {
+ font-size: 44px;
+}
+
+.animation-efect-links a {
+ padding: 4px 6px;
+ font-size: 12px;
+}
+
+#animation_box {
+ background-color: #f9f8f8;
+ border-radius: 16px;
+ width: 80%;
+ margin: 0 auto;
+ padding-top: 80px;
+}
+
+.animation-text-box {
+ position: absolute;
+ margin-top: 40px;
+ left: 50%;
+ margin-left: -100px;
+ width: 200px;
+}
+
+.animation-text-info {
+ position: absolute;
+ margin-top: -60px;
+ left: 50%;
+ margin-left: -100px;
+ width: 200px;
+ font-size: 10px;
+}
+
+.animation-text-box h2 {
+ font-size: 54px;
+ font-weight: 600;
+ margin-bottom: 5px;
+}
+
+.animation-text-box p {
+ font-size: 12px;
+ text-transform: uppercase;
+}
+
+
+/* PEACE */
+
+.pace {
+ -webkit-pointer-events: none;
+ pointer-events: none;
+ -webkit-user-select: none;
+ -moz-user-select: none;
+ -ms-user-select: none;
+ user-select: none;
+}
+
+.pace-inactive {
+ display: none;
+}
+
+.pace .pace-progress {
+ background: #1ab394;
+ position: fixed;
+ z-index: 2000;
+ top: 0;
+ width: 100%;
+ height: 2px;
+}
+
+.pace-inactive {
+ display: none;
+}
+
+
+/* WIDGETS */
+
+.widget {
+ border-radius: 5px;
+ padding: 15px 20px;
+ margin-bottom: 10px;
+ margin-top: 10px;
+}
+
+.widget.style1 h2 {
+ font-size: 30px;
+}
+
+.widget h2,
+.widget h3 {
+ margin-top: 5px;
+ margin-bottom: 0;
+}
+
+.widget-text-box {
+ padding: 20px;
+ border: 1px solid #e7eaec;
+ background: #ffffff;
+}
+
+.widget-head-color-box {
+ border-radius: 5px 5px 0px 0px;
+ margin-top: 10px;
+}
+
+.widget .flot-chart {
+ height: 100px;
+}
+
+.vertical-align div {
+ display: inline-block;
+ vertical-align: middle;
+}
+
+.vertical-align h2,
+.vertical-align h3 {
+ margin: 0;
+}
+
+.todo-list {
+ list-style: none outside none;
+ margin: 0;
+ padding: 0;
+ font-size: 14px;
+}
+
+.todo-list.small-list {
+ font-size: 12px;
+}
+
+.todo-list.small-list > li {
+ background: #f3f3f4;
+ border-left: none;
+ border-right: none;
+ border-radius: 4px;
+ color: inherit;
+ margin-bottom: 2px;
+ padding: 6px 6px 6px 12px;
+}
+
+.todo-list.small-list .btn-xs,
+.todo-list.small-list .btn-group-xs > .btn {
+ border-radius: 5px;
+ font-size: 10px;
+ line-height: 1.5;
+ padding: 1px 2px 1px 5px;
+}
+
+.todo-list > li {
+ background: #f3f3f4;
+ border-left: 6px solid #e7eaec;
+ border-right: 6px solid #e7eaec;
+ border-radius: 4px;
+ color: inherit;
+ margin-bottom: 2px;
+ padding: 10px;
+}
+
+.todo-list .handle {
+ cursor: move;
+ display: inline-block;
+ font-size: 16px;
+ margin: 0 5px;
+}
+
+.todo-list > li .label {
+ font-size: 9px;
+ margin-left: 10px;
+}
+
+.check-link {
+ font-size: 16px;
+}
+
+.todo-completed {
+ text-decoration: line-through;
+}
+
+.geo-statistic h1 {
+ font-size: 36px;
+ margin-bottom: 0;
+}
+
+.glyphicon.fa {
+ font-family: "FontAwesome";
+}
+
+
+/* INPUTS */
+
+.inline {
+ display: inline-block !important;
+}
+
+.input-s-sm {
+ width: 120px;
+}
+
+.input-s {
+ width: 200px;
+}
+
+.input-s-lg {
+ width: 250px;
+}
+
+.i-checks {
+ padding-left: 0;
+}
+
+.form-control,
+.single-line {
+ background-color: #FFFFFF;
+ background-image: none;
+ border: 1px solid #e5e6e7;
+ border-radius: 1px;
+ color: inherit;
+ display: block;
+ padding: 6px 12px;
+ -webkit-transition: border-color 0.15s ease-in-out 0s, box-shadow 0.15s ease-in-out 0s;
+ transition: border-color 0.15s ease-in-out 0s, box-shadow 0.15s ease-in-out 0s;
+ width: 100%;
+ font-size: 14px;
+}
+
+.form-control:focus,
+.single-line:focus {
+ border-color: #1ab394 !important;
+}
+
+.has-success .form-control {
+ border-color: #1ab394;
+}
+
+.has-warning .form-control {
+ border-color: #f8ac59;
+}
+
+.has-error .form-control {
+ border-color: #ed5565;
+}
+
+.has-success .control-label {
+ color: #1ab394;
+}
+
+.has-warning .control-label {
+ color: #f8ac59;
+}
+
+.has-error .control-label {
+ color: #ed5565;
+}
+
+.input-group-addon {
+ background-color: #fff;
+ border: 1px solid #E5E6E7;
+ border-radius: 1px;
+ color: inherit;
+ font-size: 14px;
+ font-weight: 400;
+ line-height: 1;
+ padding: 6px 12px;
+ text-align: center;
+}
+
+.spinner-buttons.input-group-btn .btn-xs {
+ line-height: 1.13;
+}
+
+.spinner-buttons.input-group-btn {
+ width: 20%;
+}
+
+.noUi-connect {
+ background: none repeat scroll 0 0 #1ab394;
+ box-shadow: none;
+}
+
+.slider_red .noUi-connect {
+ background: none repeat scroll 0 0 #ed5565;
+ box-shadow: none;
+}
+
+
+/* UI Sortable */
+
+.ui-sortable .ibox-title {
+ cursor: move;
+}
+
+.ui-sortable-placeholder {
+ border: 1px dashed #cecece !important;
+ visibility: visible !important;
+ background: #e7eaec;
+}
+
+.ibox.ui-sortable-placeholder {
+ margin: 0px 0px 23px !important;
+}
+
+
+/* Tabs */
+
+.tabs-container .panel-body {
+ background: #fff;
+ border: 1px solid #e7eaec;
+ border-radius: 2px;
+ padding: 20px;
+ position: relative;
+}
+
+.tabs-container .nav-tabs > li.active > a,
+.tabs-container .nav-tabs > li.active > a:hover,
+.tabs-container .nav-tabs > li.active > a:focus {
+ border: 1px solid #e7eaec;
+ border-bottom-color: transparent;
+ background-color: #fff;
+}
+
+.tabs-container .nav-tabs > li {
+ float: left;
+ margin-bottom: -1px;
+}
+
+.tabs-container .tab-pane .panel-body {
+ border-top: none;
+}
+
+.tabs-container .nav-tabs > li.active > a,
+.tabs-container .nav-tabs > li.active > a:hover,
+.tabs-container .nav-tabs > li.active > a:focus {
+ border: 1px solid #e7eaec;
+ border-bottom-color: transparent;
+}
+
+.tabs-container .nav-tabs {
+ border-bottom: 1px solid #e7eaec;
+}
+
+.tabs-container .tab-pane .panel-body {
+ border-top: none;
+}
+
+.tabs-container .tabs-left .tab-pane .panel-body,
+.tabs-container .tabs-right .tab-pane .panel-body {
+ border-top: 1px solid #e7eaec;
+}
+
+.tabs-container .nav-tabs > li a:hover {
+ background: transparent;
+ border-color: transparent;
+}
+
+.tabs-container .tabs-below > .nav-tabs,
+.tabs-container .tabs-right > .nav-tabs,
+.tabs-container .tabs-left > .nav-tabs {
+ border-bottom: 0;
+}
+
+.tabs-container .tabs-left .panel-body {
+ position: static;
+}
+
+.tabs-container .tabs-left > .nav-tabs,
+.tabs-container .tabs-right > .nav-tabs {
+ width: 20%;
+}
+
+.tabs-container .tabs-left .panel-body {
+ width: 80%;
+ margin-left: 20%;
+}
+
+.tabs-container .tabs-right .panel-body {
+ width: 80%;
+ margin-right: 20%;
+}
+
+.tabs-container .tab-content > .tab-pane,
+.tabs-container .pill-content > .pill-pane {
+ display: none;
+}
+
+.tabs-container .tab-content > .active,
+.tabs-container .pill-content > .active {
+ display: block;
+}
+
+.tabs-container .tabs-below > .nav-tabs {
+ border-top: 1px solid #e7eaec;
+}
+
+.tabs-container .tabs-below > .nav-tabs > li {
+ margin-top: -1px;
+ margin-bottom: 0;
+}
+
+.tabs-container .tabs-below > .nav-tabs > li > a {
+ border-radius: 0 0 4px 4px;
+}
+
+.tabs-container .tabs-below > .nav-tabs > li > a:hover,
+.tabs-container .tabs-below > .nav-tabs > li > a:focus {
+ border-top-color: #e7eaec;
+ border-bottom-color: transparent;
+}
+
+.tabs-container .tabs-left > .nav-tabs > li,
+.tabs-container .tabs-right > .nav-tabs > li {
+ float: none;
+}
+
+.tabs-container .tabs-left > .nav-tabs > li > a,
+.tabs-container .tabs-right > .nav-tabs > li > a {
+ min-width: 74px;
+ margin-right: 0;
+ margin-bottom: 3px;
+}
+
+.tabs-container .tabs-left > .nav-tabs {
+ float: left;
+ margin-right: 19px;
+}
+
+.tabs-container .tabs-left > .nav-tabs > li > a {
+ margin-right: -1px;
+ border-radius: 4px 0 0 4px;
+}
+
+.tabs-container .tabs-left > .nav-tabs .active > a,
+.tabs-container .tabs-left > .nav-tabs .active > a:hover,
+.tabs-container .tabs-left > .nav-tabs .active > a:focus {
+ border-color: #e7eaec transparent #e7eaec #e7eaec;
+ *border-right-color: #ffffff;
+}
+
+.tabs-container .tabs-right > .nav-tabs {
+ float: right;
+ margin-left: 19px;
+}
+
+.tabs-container .tabs-right > .nav-tabs > li > a {
+ margin-left: -1px;
+ border-radius: 0 4px 4px 0;
+}
+
+.tabs-container .tabs-right > .nav-tabs .active > a,
+.tabs-container .tabs-right > .nav-tabs .active > a:hover,
+.tabs-container .tabs-right > .nav-tabs .active > a:focus {
+ border-color: #e7eaec #e7eaec #e7eaec transparent;
+ *border-left-color: #ffffff;
+ z-index: 1;
+}
+
+
+/* SWITCHES */
+
+.onoffswitch {
+ position: relative;
+ width: 54px;
+ -webkit-user-select: none;
+ -moz-user-select: none;
+ -ms-user-select: none;
+}
+
+.onoffswitch-checkbox {
+ display: none;
+}
+
+.onoffswitch-label {
+ display: block;
+ overflow: hidden;
+ cursor: pointer;
+ border: 2px solid #1AB394;
+ border-radius: 3px;
+}
+
+.onoffswitch-inner {
+ display: block;
+ width: 200%;
+ margin-left: -100%;
+ -webkit-transition: margin 0.3s ease-in 0s;
+ transition: margin 0.3s ease-in 0s;
+}
+
+.onoffswitch-inner:before,
+.onoffswitch-inner:after {
+ display: block;
+ float: left;
+ width: 50%;
+ height: 16px;
+ padding: 0;
+ line-height: 16px;
+ font-size: 10px;
+ color: white;
+ font-family: Trebuchet, Arial, sans-serif;
+ font-weight: bold;
+ box-sizing: border-box;
+}
+
+.onoffswitch-inner:before {
+ content: "ON";
+ padding-left: 7px;
+ background-color: #1AB394;
+ color: #FFFFFF;
+}
+
+.onoffswitch-inner:after {
+ content: "OFF";
+ padding-right: 7px;
+ background-color: #FFFFFF;
+ color: #919191;
+ text-align: right;
+}
+
+.onoffswitch-switch {
+ display: block;
+ width: 18px;
+ margin: 0px;
+ background: #FFFFFF;
+ border: 2px solid #1AB394;
+ border-radius: 3px;
+ position: absolute;
+ top: 0;
+ bottom: 0;
+ right: 36px;
+ -webkit-transition: all 0.3s ease-in 0s;
+ transition: all 0.3s ease-in 0s;
+}
+
+.onoffswitch-checkbox:checked + .onoffswitch-label .onoffswitch-inner {
+ margin-left: 0;
+}
+
+.onoffswitch-checkbox:checked + .onoffswitch-label .onoffswitch-switch {
+ right: 0px;
+}
+
+
+/* Nestable list */
+
+.dd {
+ position: relative;
+ display: block;
+ margin: 0;
+ padding: 0;
+ list-style: none;
+ font-size: 13px;
+ line-height: 20px;
+}
+
+.dd-list {
+ display: block;
+ position: relative;
+ margin: 0;
+ padding: 0;
+ list-style: none;
+}
+
+.dd-list .dd-list {
+ padding-left: 30px;
+}
+
+.dd-collapsed .dd-list {
+ display: none;
+}
+
+.dd-item,
+.dd-empty,
+.dd-placeholder {
+ display: block;
+ position: relative;
+ margin: 0;
+ padding: 0;
+ min-height: 20px;
+ font-size: 13px;
+ line-height: 20px;
+}
+
+.dd-handle {
+ display: block;
+ margin: 5px 0;
+ padding: 5px 10px;
+ color: #333;
+ text-decoration: none;
+ border: 1px solid #e7eaec;
+ background: #f5f5f5;
+ border-radius: 3px;
+ box-sizing: border-box;
+ -moz-box-sizing: border-box;
+}
+
+.dd-handle span {
+ font-weight: bold;
+}
+
+.dd-handle:hover {
+ background: #f0f0f0;
+ cursor: pointer;
+ font-weight: bold;
+}
+
+.dd-item > button {
+ display: block;
+ position: relative;
+ cursor: pointer;
+ float: left;
+ width: 25px;
+ height: 20px;
+ margin: 5px 0;
+ padding: 0;
+ text-indent: 100%;
+ white-space: nowrap;
+ overflow: hidden;
+ border: 0;
+ background: transparent;
+ font-size: 12px;
+ line-height: 1;
+ text-align: center;
+ font-weight: bold;
+}
+
+.dd-item > button:before {
+ content: '+';
+ display: block;
+ position: absolute;
+ width: 100%;
+ text-align: center;
+ text-indent: 0;
+}
+
+.dd-item > button[data-action="collapse"]:before {
+ content: '-';
+}
+
+#nestable2 .dd-item > button {
+ font-family: FontAwesome;
+ height: 34px;
+ width: 33px;
+ color: #c1c1c1;
+}
+
+#nestable2 .dd-item > button:before {
+ content: "\f067";
+}
+
+#nestable2 .dd-item > button[data-action="collapse"]:before {
+ content: "\f068";
+}
+
+.dd-placeholder,
+.dd-empty {
+ margin: 5px 0;
+ padding: 0;
+ min-height: 30px;
+ background: #f2fbff;
+ border: 1px dashed #b6bcbf;
+ box-sizing: border-box;
+ -moz-box-sizing: border-box;
+}
+
+.dd-empty {
+ border: 1px dashed #bbb;
+ min-height: 100px;
+ background-color: #e5e5e5;
+ background-image: -webkit-linear-gradient(45deg, #ffffff 25%, transparent 25%, transparent 75%, #ffffff 75%, #ffffff), -webkit-linear-gradient(45deg, #ffffff 25%, transparent 25%, transparent 75%, #ffffff 75%, #ffffff);
+ background-image: linear-gradient(45deg, #ffffff 25%, transparent 25%, transparent 75%, #ffffff 75%, #ffffff), linear-gradient(45deg, #ffffff 25%, transparent 25%, transparent 75%, #ffffff 75%, #ffffff);
+ background-size: 60px 60px;
+ background-position: 0 0, 30px 30px;
+}
+
+.dd-dragel {
+ position: absolute;
+ z-index: 9999;
+ pointer-events: none;
+}
+
+.dd-dragel > .dd-item .dd-handle {
+ margin-top: 0;
+}
+
+.dd-dragel .dd-handle {
+ box-shadow: 2px 4px 6px 0 rgba(0, 0, 0, 0.1);
+}
+
+
+/**
+* Nestable Extras
+*/
+
+.nestable-lists {
+ display: block;
+ clear: both;
+ padding: 30px 0;
+ width: 100%;
+ border: 0;
+ border-top: 2px solid #ddd;
+ border-bottom: 2px solid #ddd;
+}
+
+#nestable-menu {
+ padding: 0;
+ margin: 10px 0 20px 0;
+}
+
+#nestable-output,
+#nestable2-output {
+ width: 100%;
+ font-size: 0.75em;
+ line-height: 1.333333em;
+ font-family: lucida grande, lucida sans unicode, helvetica, arial, sans-serif;
+ padding: 5px;
+ box-sizing: border-box;
+ -moz-box-sizing: border-box;
+}
+
+#nestable2 .dd-handle {
+ color: inherit;
+ border: 1px dashed #e7eaec;
+ background: #f3f3f4;
+ padding: 10px;
+}
+
+#nestable2 .dd-handle:hover {
+ /*background: #bbb;*/
+}
+
+#nestable2 span.label {
+ margin-right: 10px;
+}
+
+#nestable-output,
+#nestable2-output {
+ font-size: 12px;
+ padding: 25px;
+ box-sizing: border-box;
+ -moz-box-sizing: border-box;
+}
+
+
+/* CodeMirror */
+
+.CodeMirror {
+ border: 1px solid #eee;
+ height: auto;
+}
+
+.CodeMirror-scroll {
+ overflow-y: hidden;
+ overflow-x: auto;
+}
+
+
+/* Google Maps */
+
+.google-map {
+ height: 300px;
+}
+
+
+/* Validation */
+
+label.error {
+ color: #cc5965;
+ display: inline-block;
+ margin-left: 5px;
+}
+
+.form-control.error {
+ border: 1px dotted #cc5965;
+}
+
+
+/* ngGrid */
+
+.gridStyle {
+ border: 1px solid #d4d4d4;
+ width: 100%;
+ height: 400px;
+}
+
+.gridStyle2 {
+ border: 1px solid #d4d4d4;
+ width: 500px;
+ height: 300px;
+}
+
+.ngH eaderCell {
+ border-right: none;
+ border-bottom: 1px solid #e7eaec;
+}
+
+.ngCell {
+ border-right: none;
+}
+
+.ngTopPanel {
+ background: #F5F5F6;
+}
+
+.ngRow.even {
+ background: #f9f9f9;
+}
+
+.ngRow.selected {
+ background: #EBF2F1;
+}
+
+.ngRow {
+ border-bottom: 1px solid #e7eaec;
+}
+
+.ngCell {
+ background-color: transparent;
+}
+
+.ngHeaderCell {
+ border-right: none;
+}
+
+
+/* Toastr custom style */
+
+#toast-container > .toast {
+ background-image: none !important;
+}
+
+#toast-container > .toast:before {
+ position: fixed;
+ font-family: FontAwesome;
+ font-size: 24px;
+ line-height: 24px;
+ float: left;
+ color: #FFF;
+ padding-right: 0.5em;
+ margin: auto 0.5em auto -1.5em;
+}
+
+#toast-container > div {
+ box-shadow: 0 0 3px #999;
+ opacity: .9;
+ -ms-filter: alpha(opacity=90);
+ filter: alpha(opacity=90);
+}
+
+#toast-container >:hover {
+ box-shadow: 0 0 4px #999;
+ opacity: 1;
+ -ms-filter: alpha(opacity=100);
+ filter: alpha(opacity=100);
+ cursor: pointer;
+}
+
+.toast {
+ background-color: #1ab394;
+}
+
+.toast-success {
+ background-color: #1ab394;
+}
+
+.toast-error {
+ background-color: #ed5565;
+}
+
+.toast-info {
+ background-color: #23c6c8;
+}
+
+.toast-warning {
+ background-color: #f8ac59;
+}
+
+.toast-top-full-width {
+ margin-top: 20px;
+}
+
+.toast-bottom-full-width {
+ margin-bottom: 20px;
+}
+
+
+/* Image cropper style */
+
+.img-container,
+.img-preview {
+ overflow: hidden;
+ text-align: center;
+ width: 100%;
+}
+
+.img-preview-sm {
+ height: 130px;
+ width: 200px;
+}
+
+
+/* Forum styles */
+
+.forum-post-container .media {
+ margin: 10px 10px 10px 10px;
+ padding: 20px 10px 20px 10px;
+ border-bottom: 1px solid #f1f1f1;
+}
+
+.forum-avatar {
+ float: left;
+ margin-right: 20px;
+ text-align: center;
+ width: 110px;
+}
+
+.forum-avatar .img-circle {
+ height: 48px;
+ width: 48px;
+}
+
+.author-info {
+ color: #676a6c;
+ font-size: 11px;
+ margin-top: 5px;
+ text-align: center;
+}
+
+.forum-post-info {
+ padding: 9px 12px 6px 12px;
+ background: #f9f9f9;
+ border: 1px solid #f1f1f1;
+}
+
+.media-body > .media {
+ background: #f9f9f9;
+ border-radius: 3px;
+ border: 1px solid #f1f1f1;
+}
+
+.forum-post-container .media-body .photos {
+ margin: 10px 0;
+}
+
+.forum-photo {
+ max-width: 140px;
+ border-radius: 3px;
+}
+
+.media-body > .media .forum-avatar {
+ width: 70px;
+ margin-right: 10px;
+}
+
+.media-body > .media .forum-avatar .img-circle {
+ height: 38px;
+ width: 38px;
+}
+
+.mid-icon {
+ font-size: 66px;
+}
+
+.forum-item {
+ margin: 10px 0;
+ padding: 10px 0 20px;
+ border-bottom: 1px solid #f1f1f1;
+}
+
+.views-number {
+ font-size: 24px;
+ line-height: 18px;
+ font-weight: 400;
+}
+
+.forum-container,
+.forum-post-container {
+ padding: 30px !important;
+}
+
+.forum-item small {
+ color: #999;
+}
+
+.forum-item .forum-sub-title {
+ color: #999;
+ margin-left: 50px;
+}
+
+.forum-title {
+ margin: 15px 0 15px 0;
+}
+
+.forum-info {
+ text-align: center;
+}
+
+.forum-desc {
+ color: #999;
+}
+
+.forum-icon {
+ float: left;
+ width: 30px;
+ margin-right: 20px;
+ text-align: center;
+}
+
+a.forum-item-title {
+ color: inherit;
+ display: block;
+ font-size: 18px;
+ font-weight: 600;
+}
+
+a.forum-item-title:hover {
+ color: inherit;
+}
+
+.forum-icon .fa {
+ font-size: 30px;
+ margin-top: 8px;
+ color: #9b9b9b;
+}
+
+.forum-item.active .fa {
+ color: #1ab394;
+}
+
+.forum-item.active a.forum-item-title {
+ color: #1ab394;
+}
+
+@media (max-width: 992px) {
+ .forum-info {
+ margin: 15px 0 10px 0px;
+ /* Comment this is you want to show forum info in small devices */
+ display: none;
+ }
+ .forum-desc {
+ float: none !important;
+ }
+}
+
+
+/* New Timeline style */
+
+.vertical-container {
+ /* this class is used to give a max-width to the element it is applied to, and center it horizontally when it reaches that max-width */
+ width: 90%;
+ max-width: 1170px;
+ margin: 0 auto;
+}
+
+.vertical-container::after {
+ /* clearfix */
+ content: '';
+ display: table;
+ clear: both;
+}
+
+#vertical-timeline {
+ position: relative;
+ padding: 0;
+ margin-top: 2em;
+ margin-bottom: 2em;
+}
+
+#vertical-timeline::before {
+ content: '';
+ position: absolute;
+ top: 0;
+ left: 18px;
+ height: 100%;
+ width: 4px;
+ background: #f1f1f1;
+}
+
+.vertical-timeline-content .btn {
+ float: right;
+}
+
+#vertical-timeline.light-timeline:before {
+ background: #e7eaec;
+}
+
+.dark-timeline .vertical-timeline-content:before {
+ border-color: transparent #f5f5f5 transparent transparent;
+}
+
+.dark-timeline.center-orientation .vertical-timeline-content:before {
+ border-color: transparent transparent transparent #f5f5f5;
+}
+
+.dark-timeline .vertical-timeline-block:nth-child(2n) .vertical-timeline-content:before,
+.dark-timeline.center-orientation .vertical-timeline-block:nth-child(2n) .vertical-timeline-content:before {
+ border-color: transparent #f5f5f5 transparent transparent;
+}
+
+.dark-timeline .vertical-timeline-content,
+.dark-timeline.center-orientation .vertical-timeline-content {
+ background: #f5f5f5;
+}
+
+@media only screen and (min-width: 1170px) {
+ #vertical-timeline.center-orientation {
+ margin-top: 3em;
+ margin-bottom: 3em;
+ }
+ #vertical-timeline.center-orientation:before {
+ left: 50%;
+ margin-left: -2px;
+ }
+}
+
+@media only screen and (max-width: 1170px) {
+ .center-orientation.dark-timeline .vertical-timeline-content:before {
+ border-color: transparent #f5f5f5 transparent transparent;
+ }
+}
+
+.vertical-timeline-block {
+ position: relative;
+ margin: 2em 0;
+}
+
+.vertical-timeline-block:after {
+ content: "";
+ display: table;
+ clear: both;
+}
+
+.vertical-timeline-block:first-child {
+ margin-top: 0;
+}
+
+.vertical-timeline-block:last-child {
+ margin-bottom: 0;
+}
+
+@media only screen and (min-width: 1170px) {
+ .center-orientation .vertical-timeline-block {
+ margin: 4em 0;
+ }
+ .center-orientation .vertical-timeline-block:first-child {
+ margin-top: 0;
+ }
+ .center-orientation .vertical-timeline-block:last-child {
+ margin-bottom: 0;
+ }
+}
+
+.vertical-timeline-icon {
+ position: absolute;
+ top: 0;
+ left: 0;
+ width: 40px;
+ height: 40px;
+ border-radius: 50%;
+ font-size: 16px;
+ border: 3px solid #f1f1f1;
+ text-align: center;
+}
+
+.vertical-timeline-icon i {
+ display: block;
+ width: 24px;
+ height: 24px;
+ position: relative;
+ left: 50%;
+ top: 50%;
+ margin-left: -12px;
+ margin-top: -9px;
+}
+
+@media only screen and (min-width: 1170px) {
+ .center-orientation .vertical-timeline-icon {
+ width: 50px;
+ height: 50px;
+ left: 50%;
+ margin-left: -25px;
+ -webkit-transform: translateZ(0);
+ -webkit-backface-visibility: hidden;
+ font-size: 19px;
+ }
+ .center-orientation .vertical-timeline-icon i {
+ margin-left: -12px;
+ margin-top: -10px;
+ }
+ .center-orientation .cssanimations .vertical-timeline-icon.is-hidden {
+ visibility: hidden;
+ }
+}
+
+.vertical-timeline-content {
+ position: relative;
+ margin-left: 60px;
+ background: white;
+ border-radius: 0.25em;
+ padding: 1em;
+}
+
+.vertical-timeline-content:after {
+ content: "";
+ display: table;
+ clear: both;
+}
+
+.vertical-timeline-content h2 {
+ font-weight: 400;
+ margin-top: 4px;
+}
+
+.vertical-timeline-content p {
+ margin: 1em 0;
+ line-height: 1.6;
+}
+
+.vertical-timeline-content .vertical-date {
+ float: left;
+ font-weight: 500;
+}
+
+.vertical-date small {
+ color: #1ab394;
+ font-weight: 400;
+}
+
+.vertical-timeline-content::before {
+ content: '';
+ position: absolute;
+ top: 16px;
+ right: 100%;
+ height: 0;
+ width: 0;
+ border: 7px solid transparent;
+ border-right: 7px solid white;
+}
+
+@media only screen and (min-width: 768px) {
+ .vertical-timeline-content h2 {
+ font-size: 18px;
+ }
+ .vertical-timeline-content p {
+ font-size: 13px;
+ }
+}
+
+@media only screen and (min-width: 1170px) {
+ .center-orientation .vertical-timeline-content {
+ margin-left: 0;
+ padding: 1.6em;
+ width: 45%;
+ }
+ .center-orientation .vertical-timeline-content::before {
+ top: 24px;
+ left: 100%;
+ border-color: transparent;
+ border-left-color: white;
+ }
+ .center-orientation .vertical-timeline-content .btn {
+ float: left;
+ }
+ .center-orientation .vertical-timeline-content .vertical-date {
+ position: absolute;
+ width: 100%;
+ left: 122%;
+ top: 2px;
+ font-size: 14px;
+ }
+ .center-orientation .vertical-timeline-block:nth-child(even) .vertical-timeline-content {
+ float: right;
+ }
+ .center-orientation .vertical-timeline-block:nth-child(even) .vertical-timeline-content::before {
+ top: 24px;
+ left: auto;
+ right: 100%;
+ border-color: transparent;
+ border-right-color: white;
+ }
+ .center-orientation .vertical-timeline-block:nth-child(even) .vertical-timeline-content .btn {
+ float: right;
+ }
+ .center-orientation .vertical-timeline-block:nth-child(even) .vertical-timeline-content .vertical-date {
+ left: auto;
+ right: 122%;
+ text-align: right;
+ }
+ .center-orientation .cssanimations .vertical-timeline-content.is-hidden {
+ visibility: hidden;
+ }
+}
+
+.sidebard-panel {
+ width: 220px;
+ background: #ebebed;
+ padding: 10px 20px;
+ position: absolute;
+ right: 0;
+}
+
+.sidebard-panel .feed-element img.img-circle {
+ width: 32px;
+ height: 32px;
+}
+
+.sidebard-panel .feed-element,
+.media-body,
+.sidebard-panel p {
+ font-size: 12px;
+}
+
+.sidebard-panel .feed-element {
+ margin-top: 20px;
+ padding-bottom: 0;
+}
+
+.sidebard-panel .list-group {
+ margin-bottom: 10px;
+}
+
+.sidebard-panel .list-group .list-group-item {
+ padding: 5px 0;
+ font-size: 12px;
+ border: 0;
+}
+
+.sidebar-content .wrapper,
+.wrapper.sidebar-content {
+ padding-right: 240px !important;
+}
+
+#right-sidebar {
+ background-color: #fff;
+ border-left: 1px solid #e7eaec;
+ border-top: 1px solid #e7eaec;
+ overflow: hidden;
+ position: fixed;
+ top: 60px;
+ width: 260px !important;
+ z-index: 1009;
+ bottom: 0;
+ right: -260px;
+}
+
+#right-sidebar.sidebar-open {
+ right: 0;
+}
+
+#right-sidebar.sidebar-open.sidebar-top {
+ top: 0;
+ border-top: none;
+}
+
+.sidebar-container ul.nav-tabs {
+ border: none;
+}
+
+.sidebar-container ul.nav-tabs.navs-4 li {
+ width: 25%;
+}
+
+.sidebar-container ul.nav-tabs.navs-3 li {
+ width: 33.3333%;
+}
+
+.sidebar-container ul.nav-tabs.navs-2 li {
+ width: 50%;
+}
+
+.sidebar-container ul.nav-tabs li {
+ border: none;
+}
+
+.sidebar-container ul.nav-tabs li a {
+ border: none;
+ padding: 12px 10px;
+ margin: 0;
+ border-radius: 0;
+ background: #2f4050;
+ color: #fff;
+ text-align: center;
+ border-right: 1px solid #334556;
+}
+
+.sidebar-container ul.nav-tabs li.active a {
+ border: none;
+ background: #f9f9f9;
+ color: #676a6c;
+ font-weight: bold;
+}
+
+.sidebar-container .nav-tabs > li.active > a:hover,
+.sidebar-container .nav-tabs > li.active > a:focus {
+ border: none;
+}
+
+.sidebar-container ul.sidebar-list {
+ margin: 0;
+ padding: 0;
+}
+
+.sidebar-container ul.sidebar-list li {
+ border-bottom: 1px solid #e7eaec;
+ padding: 15px 20px;
+ list-style: none;
+ font-size: 12px;
+}
+
+.sidebar-container .sidebar-message:nth-child(2n+2) {
+ background: #f9f9f9;
+}
+
+.sidebar-container ul.sidebar-list li a {
+ text-decoration: none;
+ color: inherit;
+}
+
+.sidebar-container .sidebar-content {
+ padding: 15px 20px;
+ font-size: 12px;
+}
+
+.sidebar-container .sidebar-title {
+ background: #f9f9f9;
+ padding: 20px;
+ border-bottom: 1px solid #e7eaec;
+}
+
+.sidebar-container .sidebar-title h3 {
+ margin-bottom: 3px;
+ padding-left: 2px;
+}
+
+.sidebar-container .tab-content h4 {
+ margin-bottom: 5px;
+}
+
+.sidebar-container .sidebar-message > a > .pull-left {
+ margin-right: 10px;
+}
+
+.sidebar-container .sidebar-message > a {
+ text-decoration: none;
+ color: inherit;
+}
+
+.sidebar-container .sidebar-message {
+ padding: 15px 20px;
+}
+
+.sidebar-container .sidebar-message .message-avatar {
+ height: 38px;
+ width: 38px;
+ border-radius: 50%;
+}
+
+.sidebar-container .setings-item {
+ padding: 15px 20px;
+ border-bottom: 1px solid #e7eaec;
+}
+
+body {
+ font-family: "open sans", "Helvetica Neue", Helvetica, Arial, sans-serif;
+ font-size: 13px;
+ color: #676a6c;
+ overflow-x: hidden;
+}
+
+html,
+body {
+ height: 100%;
+}
+
+body.full-height-layout #wrapper,
+body.full-height-layout #page-wrapper {
+ height: 100%;
+}
+
+#page-wrapper {
+ min-height: auto;
+}
+
+body.boxed-layout {
+ background: url('patterns/shattered.png');
+}
+
+body.boxed-layout #wrapper {
+ background-color: #2f4050;
+ max-width: 1200px;
+ margin: 0 auto;
+}
+
+.top-navigation.boxed-layout #wrapper,
+.boxed-layout #wrapper.top-navigation {
+ max-width: 1300px !important;
+}
+
+.block {
+ display: block;
+}
+
+.clear {
+ display: block;
+ overflow: hidden;
+}
+
+a {
+ cursor: pointer;
+}
+
+a:hover,
+a:focus {
+ text-decoration: none;
+}
+
+.border-bottom {
+ border-bottom: 1px solid #e7eaec !important;
+}
+
+.font-bold {
+ font-weight: 600;
+}
+
+.font-noraml {
+ font-weight: 400;
+}
+
+.text-uppercase {
+ text-transform: uppercase;
+}
+
+.b-r {
+ border-right: 1px solid #e7eaec;
+}
+
+.hr-line-dashed {
+ border-top: 1px dashed #e7eaec;
+ color: #ffffff;
+ background-color: #ffffff;
+ height: 1px;
+ margin: 20px 0;
+}
+
+.hr-line-solid {
+ border-bottom: 1px solid #e7eaec;
+ background-color: rgba(0, 0, 0, 0);
+ border-style: solid !important;
+ margin-top: 15px;
+ margin-bottom: 15px;
+}
+
+video {
+ width: 100% !important;
+ height: auto !important;
+}
+
+
+/* GALLERY */
+
+.gallery > .row > div {
+ margin-bottom: 15px;
+}
+
+.fancybox img {
+ margin-bottom: 5px;
+ /* Only for demo */
+ width: 24%;
+}
+
+
+/* Summernote text editor */
+
+.note-editor {
+ height: auto!important;
+ min-height: 100px;
+ border: solid 1px #e5e6e7;
+}
+
+
+/* MODAL */
+
+.modal-content {
+ background-clip: padding-box;
+ background-color: #FFFFFF;
+ border: 1px solid rgba(0, 0, 0, 0);
+ border-radius: 4px;
+ box-shadow: 0 1px 3px rgba(0, 0, 0, 0.3);
+ outline: 0 none;
+}
+
+.modal-dialog {
+ z-index: 1200;
+}
+
+.modal-body {
+ padding: 20px 30px 30px 30px;
+}
+
+.inmodal .modal-body {
+ background: #f8fafb;
+}
+
+.inmodal .modal-header {
+ padding: 30px 15px;
+ text-align: center;
+}
+
+.animated.modal.fade .modal-dialog {
+ -webkit-transform: none;
+ -ms-transform: none;
+ transform: none;
+}
+
+.inmodal .modal-title {
+ font-size: 26px;
+}
+
+.inmodal .modal-icon {
+ font-size: 84px;
+ color: #e2e3e3;
+}
+
+.modal-footer {
+ margin-top: 0;
+}
+
+
+/* WRAPPERS */
+
+#wrapper {
+ width: 100%;
+ overflow-x: hidden;
+ background-color: #2f4050;
+}
+
+.wrapper {
+ padding: 0 20px;
+}
+
+.wrapper-content {
+ padding: 20px;
+}
+
+#page-wrapper {
+ padding: 0 15px;
+ position: inherit;
+ margin: 0 0 0 220px;
+}
+
+.title-action {
+ text-align: right;
+ padding-top: 30px;
+}
+
+.ibox-content h1,
+.ibox-content h2,
+.ibox-content h3,
+.ibox-content h4,
+.ibox-content h5,
+.ibox-title h1,
+.ibox-title h2,
+.ibox-title h3,
+.ibox-title h4,
+.ibox-title h5 {
+ margin-top: 5px;
+}
+
+ul.unstyled,
+ol.unstyled {
+ list-style: none outside none;
+ margin-left: 0;
+}
+
+.big-icon {
+ font-size: 160px;
+ color: #e5e6e7;
+}
+
+
+/* FOOTER */
+
+.footer {
+ background: none repeat scroll 0 0 white;
+ border-top: 1px solid #e7eaec;
+ overflow: hidden;
+ padding: 10px 20px;
+ margin: 0 -15px;
+ height: 36px;
+}
+
+.footer.fixed_full {
+ position: fixed;
+ bottom: 0;
+ left: 0;
+ right: 0;
+ z-index: 1000;
+ padding: 10px 20px;
+ background: white;
+ border-top: 1px solid #e7eaec;
+}
+
+.footer.fixed {
+ position: fixed;
+ bottom: 0;
+ left: 0;
+ right: 0;
+ z-index: 1000;
+ padding: 10px 20px;
+ background: white;
+ border-top: 1px solid #e7eaec;
+ margin-left: 220px;
+}
+
+body.mini-navbar .footer.fixed,
+body.body-small.mini-navbar .footer.fixed {
+ margin: 0 0 0 70px;
+}
+
+body.mini-navbar.canvas-menu .footer.fixed,
+body.canvas-menu .footer.fixed {
+ margin: 0 !important;
+}
+
+body.fixed-sidebar.body-small.mini-navbar .footer.fixed {
+ margin: 0 0 0 220px;
+}
+
+body.body-small .footer.fixed {
+ margin-left: 0px;
+}
+
+
+/* PANELS */
+
+.page-heading {
+ border-top: 0;
+ padding: 0px 20px 20px;
+}
+
+.panel-heading h1,
+.panel-heading h2 {
+ margin-bottom: 5px;
+}
+
+
+/*CONTENTTABS*/
+
+.content-tabs {
+ position: relative;
+ height: 42px;
+ background: #fafafa;
+ line-height: 40px;
+}
+
+.content-tabs .roll-nav,
+.page-tabs-list {
+ position: absolute;
+ width: 40px;
+ height: 40px;
+ text-align: center;
+ color: #999;
+ z-index: 2;
+ top: 0;
+}
+
+.content-tabs .roll-left {
+ left: 0;
+ border-right: solid 1px #eee;
+}
+
+.content-tabs .roll-right {
+ right: 0;
+ border-left: solid 1px #eee;
+}
+
+.content-tabs button {
+ background: #fff;
+ border: 0;
+ height: 40px;
+ width: 40px;
+ outline: none;
+}
+
+.content-tabs button:hover {
+ background: #fafafa;
+}
+
+nav.page-tabs {
+ margin-left: 40px;
+ width: 100000px;
+ height: 40px;
+ overflow: hidden;
+}
+
+nav.page-tabs .page-tabs-content {
+ float: left;
+}
+
+.page-tabs a {
+ display: block;
+ float: left;
+ border-right: solid 1px #eee;
+ padding: 0 15px;
+}
+
+.page-tabs a i:hover {
+ color: #c00;
+}
+
+.page-tabs a:hover,
+.content-tabs .roll-nav:hover {
+ color: #777;
+ background: #f2f2f2;
+ cursor: pointer;
+}
+
+.roll-right.J_tabRight {
+ right: 140px;
+}
+
+.roll-right.btn-group {
+ right: 60px;
+ width: 80px;
+ padding: 0;
+}
+
+.roll-right.btn-group button {
+ width: 80px;
+}
+
+.roll-right.J_tabExit {
+ background: #fff;
+ height: 40px;
+ width: 60px;
+ outline: none;
+}
+
+.dropdown-menu-right {
+ left: auto;
+}
+
+#content-main {
+ height: calc(100% - 140px);
+ overflow: hidden;
+}
+
+.fixed-nav #content-main {
+ height: calc(100% - 80px);
+ overflow: hidden;
+}
+
+
+/* TABLES */
+
+.table-bordered {
+ border: 1px solid #EBEBEB;
+}
+
+.table-bordered > thead > tr > th,
+.table-bordered > thead > tr > td {
+ background-color: #F5F5F6;
+ border-bottom-width: 1px;
+}
+
+.table-bordered > thead > tr > th,
+.table-bordered > tbody > tr > th,
+.table-bordered > tfoot > tr > th,
+.table-bordered > thead > tr > td,
+.table-bordered > tbody > tr > td,
+.table-bordered > tfoot > tr > td {
+ border: 1px solid #e7e7e7;
+}
+
+.table > thead > tr > th {
+ border-bottom: 1px solid #DDDDDD;
+ vertical-align: bottom;
+}
+
+.table > thead > tr > th,
+.table > tbody > tr > th,
+.table > tfoot > tr > th,
+.table > thead > tr > td,
+.table > tbody > tr > td,
+.table > tfoot > tr > td {
+ border-top: 1px solid #e7eaec;
+ line-height: 1.42857;
+ padding: 8px;
+ vertical-align: middle;
+}
+
+
+/* PANELS */
+
+.panel.blank-panel {
+ background: none;
+ margin: 0;
+}
+
+.blank-panel .panel-heading {
+ padding-bottom: 0;
+}
+
+.nav-tabs > li.active > a,
+.nav-tabs > li.active > a:hover,
+.nav-tabs > li.active > a:focus {
+ -moz-border-bottom-colors: none;
+ -moz-border-left-colors: none;
+ -moz-border-right-colors: none;
+ -moz-border-top-colors: none;
+ background: none;
+ border-color: #dddddd #dddddd rgba(0, 0, 0, 0);
+ border-bottom: #f3f3f4;
+ -webkit-border-image: none;
+ -o-border-image: none;
+ border-image: none;
+ border-style: solid;
+ border-width: 1px;
+ color: #555555;
+ cursor: default;
+}
+
+.nav.nav-tabs li {
+ background: none;
+ border: none;
+}
+
+.nav-tabs > li > a {
+ color: #A7B1C2;
+ font-weight: 600;
+ padding: 10px 20px 10px 25px;
+}
+
+.nav-tabs > li > a:hover,
+.nav-tabs > li > a:focus {
+ background-color: #e6e6e6;
+ color: #676a6c;
+}
+
+.ui-tab .tab-content {
+ padding: 20px 0px;
+}
+
+
+/* GLOBAL */
+
+.no-padding {
+ padding: 0 !important;
+}
+
+.no-borders {
+ border: none !important;
+}
+
+.no-margins {
+ margin: 0 !important;
+}
+
+.no-top-border {
+ border-top: 0 !important;
+}
+
+.ibox-content.text-box {
+ padding-bottom: 0px;
+ padding-top: 15px;
+}
+
+.border-left-right {
+ border-left: 1px solid #e7eaec;
+ border-right: 1px solid #e7eaec;
+ border-top: none;
+ border-bottom: none;
+}
+
+.border-left {
+ border-left: 1px solid #e7eaec;
+ border-right: none;
+ border-top: none;
+ border-bottom: none;
+}
+
+.border-right {
+ border-left: none;
+ border-right: 1px solid #e7eaec;
+ border-top: none;
+ border-bottom: none;
+}
+
+.full-width {
+ width: 100% !important;
+}
+
+.link-block {
+ font-size: 12px;
+ padding: 10px;
+}
+
+.nav.navbar-top-links .link-block a {
+ font-size: 12px;
+}
+
+.link-block a {
+ font-size: 10px;
+ color: inherit;
+}
+
+body.mini-navbar .branding {
+ display: none;
+}
+
+img.circle-border {
+ border: 6px solid #FFFFFF;
+ border-radius: 50%;
+}
+
+.branding {
+ float: left;
+ color: #FFFFFF;
+ font-size: 18px;
+ font-weight: 600;
+ padding: 17px 20px;
+ text-align: center;
+ background-color: #1ab394;
+}
+
+.login-panel {
+ margin-top: 25%;
+}
+
+.page-header {
+ padding: 20px 0 9px;
+ margin: 0 0 20px;
+ border-bottom: 1px solid #eeeeee;
+}
+
+.fontawesome-icon-list {
+ margin-top: 22px;
+}
+
+.fontawesome-icon-list .fa-hover a {
+ overflow: hidden;
+ text-overflow: ellipsis;
+ white-space: nowrap;
+ display: block;
+ color: #222222;
+ line-height: 32px;
+ height: 32px;
+ padding-left: 10px;
+ border-radius: 4px;
+}
+
+.fontawesome-icon-list .fa-hover a .fa {
+ width: 32px;
+ font-size: 14px;
+ display: inline-block;
+ text-align: right;
+ margin-right: 10px;
+}
+
+.fontawesome-icon-list .fa-hover a:hover {
+ background-color: #1d9d74;
+ color: #ffffff;
+ text-decoration: none;
+}
+
+.fontawesome-icon-list .fa-hover a:hover .fa {
+ font-size: 30px;
+ vertical-align: -6px;
+}
+
+.fontawesome-icon-list .fa-hover a:hover .text-muted {
+ color: #bbe2d5;
+}
+
+.feature-list .col-md-4 {
+ margin-bottom: 22px;
+}
+
+.feature-list h4 .fa:before {
+ vertical-align: -10%;
+ font-size: 28px;
+ display: inline-block;
+ width: 1.07142857em;
+ text-align: center;
+ margin-right: 5px;
+}
+
+.ui-draggable .ibox-title {
+ cursor: move;
+}
+
+.breadcrumb {
+ background-color: #ffffff;
+ padding: 0;
+ margin-bottom: 0;
+}
+
+.breadcrumb > li a {
+ color: inherit;
+}
+
+.breadcrumb > .active {
+ color: inherit;
+}
+
+code {
+ background-color: #F9F2F4;
+ border-radius: 4px;
+ color: #ca4440;
+ font-size: 90%;
+ padding: 2px 4px;
+ white-space: nowrap;
+}
+
+.ibox {
+ clear: both;
+ margin-bottom: 25px;
+ margin-top: 0;
+ padding: 0;
+}
+
+.ibox.collapsed .ibox-content {
+ display: none;
+}
+
+.ibox.collapsed .fa.fa-chevron-up:before {
+ content: "\f078";
+}
+
+.ibox.collapsed .fa.fa-chevron-down:before {
+ content: "\f077";
+}
+
+.ibox:after,
+.ibox:before {
+ display: table;
+}
+
+.ibox-title {
+ -moz-border-bottom-colors: none;
+ -moz-border-left-colors: none;
+ -moz-border-right-colors: none;
+ -moz-border-top-colors: none;
+ background-color: #ffffff;
+ border-color: #e7eaec;
+ -webkit-border-image: none;
+ -o-border-image: none;
+ border-image: none;
+ border-style: solid solid none;
+ border-width: 4px 0px 0;
+ color: inherit;
+ margin-bottom: 0;
+ padding: 14px 15px 7px;
+ min-height: 48px;
+}
+
+.ibox-content {
+ background-color: #ffffff;
+ color: inherit;
+ padding: 15px 20px 20px 20px;
+ border-color: #e7eaec;
+ -webkit-border-image: none;
+ -o-border-image: none;
+ border-image: none;
+ border-style: solid solid none;
+ border-width: 1px 0px;
+}
+
+table.table-mail tr td {
+ padding: 12px;
+}
+
+.table-mail .check-mail {
+ padding-left: 20px;
+}
+
+.table-mail .mail-date {
+ padding-right: 20px;
+}
+
+.star-mail,
+.check-mail {
+ width: 40px;
+}
+
+.unread td a,
+.unread td {
+ font-weight: 600;
+ color: inherit;
+}
+
+.read td a,
+.read td {
+ font-weight: normal;
+ color: inherit;
+}
+
+.unread td {
+ background-color: #f9f8f8;
+}
+
+.ibox-content {
+ clear: both;
+}
+
+.ibox-heading {
+ background-color: #f3f6fb;
+ border-bottom: none;
+}
+
+.ibox-heading h3 {
+ font-weight: 200;
+ font-size: 24px;
+}
+
+.ibox-title h5 {
+ display: inline-block;
+ font-size: 14px;
+ margin: 0 0 7px;
+ padding: 0;
+ text-overflow: ellipsis;
+ float: left;
+}
+
+.ibox-title .label {
+ float: left;
+ margin-left: 4px;
+}
+
+.ibox-tools {
+ display: inline-block;
+ float: right;
+ margin-top: 0;
+ position: relative;
+ padding: 0;
+}
+
+.ibox-tools a {
+ cursor: pointer;
+ margin-left: 5px;
+ color: #c4c4c4;
+}
+
+.ibox-tools a.btn-primary {
+ color: #fff;
+}
+
+.ibox-tools .dropdown-menu > li > a {
+ padding: 4px 10px;
+ font-size: 12px;
+}
+
+.ibox .open > .dropdown-menu {
+ left: auto;
+ right: 0;
+}
+
+
+/* BACKGROUNDS */
+
+.gray-bg {
+ background-color: #f3f3f4;
+}
+
+.white-bg {
+ background-color: #ffffff;
+}
+
+.navy-bg {
+ background-color: #1ab394;
+ color: #ffffff;
+}
+
+.blue-bg {
+ background-color: #1c84c6;
+ color: #ffffff;
+}
+
+.lazur-bg {
+ background-color: #23c6c8;
+ color: #ffffff;
+}
+
+.yellow-bg {
+ background-color: #f8ac59;
+ color: #ffffff;
+}
+
+.red-bg {
+ background-color: #ed5565;
+ color: #ffffff;
+}
+
+.black-bg {
+ background-color: #262626;
+}
+
+.panel-primary {
+ border-color: #1ab394;
+}
+
+.panel-primary > .panel-heading {
+ background-color: #1ab394;
+ border-color: #1ab394;
+}
+
+.panel-success {
+ border-color: #1c84c6;
+}
+
+.panel-success > .panel-heading {
+ background-color: #1c84c6;
+ border-color: #1c84c6;
+ color: #ffffff;
+}
+
+.panel-info {
+ border-color: #23c6c8;
+}
+
+.panel-info > .panel-heading {
+ background-color: #23c6c8;
+ border-color: #23c6c8;
+ color: #ffffff;
+}
+
+.panel-warning {
+ border-color: #f8ac59;
+}
+
+.panel-warning > .panel-heading {
+ background-color: #f8ac59;
+ border-color: #f8ac59;
+ color: #ffffff;
+}
+
+.panel-danger {
+ border-color: #ed5565;
+}
+
+.panel-danger > .panel-heading {
+ background-color: #ed5565;
+ border-color: #ed5565;
+ color: #ffffff;
+}
+
+.progress-bar {
+ background-color: #1ab394;
+}
+
+.progress-small,
+.progress-small .progress-bar {
+ height: 10px;
+}
+
+.progress-small,
+.progress-mini {
+ margin-top: 5px;
+}
+
+.progress-mini,
+.progress-mini .progress-bar {
+ height: 5px;
+ margin-bottom: 0px;
+}
+
+.progress-bar-navy-light {
+ background-color: #3dc7ab;
+}
+
+.progress-bar-success {
+ background-color: #1c84c6;
+}
+
+.progress-bar-info {
+ background-color: #23c6c8;
+}
+
+.progress-bar-warning {
+ background-color: #f8ac59;
+}
+
+.progress-bar-danger {
+ background-color: #ed5565;
+}
+
+.panel-title {
+ font-size: inherit;
+}
+
+.jumbotron {
+ border-radius: 6px;
+ padding: 40px;
+}
+
+.jumbotron h1 {
+ margin-top: 0;
+}
+
+
+/* COLORS */
+
+.text-navy {
+ color: #1ab394;
+}
+
+.text-primary {
+ color: inherit;
+}
+
+.text-success {
+ color: #1c84c6;
+}
+
+.text-info {
+ color: #23c6c8;
+}
+
+.text-warning {
+ color: #f8ac59;
+}
+
+.text-danger {
+ color: #ed5565;
+}
+
+.text-muted {
+ color: #888888;
+}
+
+.simple_tag {
+ background-color: #f3f3f4;
+ border: 1px solid #e7eaec;
+ border-radius: 2px;
+ color: inherit;
+ font-size: 10px;
+ margin-right: 5px;
+ margin-top: 5px;
+ padding: 5px 12px;
+ display: inline-block;
+}
+
+.img-shadow {
+ box-shadow: 0px 0px 3px 0px #919191;
+}
+
+
+/* For handle diferent bg color in AngularJS version */
+
+.dashboards\.dashboard_2 nav.navbar,
+.dashboards\.dashboard_3 nav.navbar,
+.mailbox\.inbox nav.navbar,
+.mailbox\.email_view nav.navbar,
+.mailbox\.email_compose nav.navbar,
+.dashboards\.dashboard_4_1 nav.navbar {
+ background: #fff;
+}
+
+
+/* For handle diferent bg color in MVC version */
+
+.Dashboard_2 .navbar.navbar-static-top,
+.Dashboard_3 .navbar.navbar-static-top,
+.Dashboard_4_1 .navbar.navbar-static-top,
+.ComposeEmail .navbar.navbar-static-top,
+.EmailView .navbar.navbar-static-top,
+.Inbox .navbar.navbar-static-top {
+ background: #fff;
+}
+
+a.close-canvas-menu {
+ position: absolute;
+ top: 10px;
+ right: 15px;
+ z-index: 1011;
+ color: #a7b1c2;
+}
+
+a.close-canvas-menu:hover {
+ color: #fff;
+}
+
+
+/* FULL HEIGHT */
+
+.full-height {
+ height: 100%;
+}
+
+.fh-breadcrumb {
+ height: calc(100% - 196px);
+ margin: 0 -15px;
+ position: relative;
+}
+
+.fh-no-breadcrumb {
+ height: calc(100% - 99px);
+ margin: 0 -15px;
+ position: relative;
+}
+
+.fh-column {
+ background: #fff;
+ height: 100%;
+ width: 240px;
+ float: left;
+}
+
+.modal-backdrop {
+ z-index: 2040 !important;
+}
+
+.modal {
+ z-index: 2050 !important;
+}
+
+.spiner-example {
+ height: 200px;
+ padding-top: 70px;
+}
+
+
+/* MARGINS & PADDINGS */
+
+.p-xxs {
+ padding: 5px;
+}
+
+.p-xs {
+ padding: 10px;
+}
+
+.p-sm {
+ padding: 15px;
+}
+
+.p-m {
+ padding: 20px;
+}
+
+.p-md {
+ padding: 25px;
+}
+
+.p-lg {
+ padding: 30px;
+}
+
+.p-xl {
+ padding: 40px;
+}
+
+.m-xxs {
+ margin: 2px 4px;
+}
+
+.m-xs {
+ margin: 5px;
+}
+
+.m-sm {
+ margin: 10px;
+}
+
+.m {
+ margin: 15px;
+}
+
+.m-md {
+ margin: 20px;
+}
+
+.m-lg {
+ margin: 30px;
+}
+
+.m-xl {
+ margin: 50px;
+}
+
+.m-n {
+ margin: 0 !important;
+}
+
+.m-l-none {
+ margin-left: 0;
+}
+
+.m-l-xs {
+ margin-left: 5px;
+}
+
+.m-l-sm {
+ margin-left: 10px;
+}
+
+.m-l {
+ margin-left: 15px;
+}
+
+.m-l-md {
+ margin-left: 20px;
+}
+
+.m-l-lg {
+ margin-left: 30px;
+}
+
+.m-l-xl {
+ margin-left: 40px;
+}
+
+.m-l-n-xxs {
+ margin-left: -1px;
+}
+
+.m-l-n-xs {
+ margin-left: -5px;
+}
+
+.m-l-n-sm {
+ margin-left: -10px;
+}
+
+.m-l-n {
+ margin-left: -15px;
+}
+
+.m-l-n-md {
+ margin-left: -20px;
+}
+
+.m-l-n-lg {
+ margin-left: -30px;
+}
+
+.m-l-n-xl {
+ margin-left: -40px;
+}
+
+.m-t-none {
+ margin-top: 0;
+}
+
+.m-t-xxs {
+ margin-top: 1px;
+}
+
+.m-t-xs {
+ margin-top: 5px;
+}
+
+.m-t-sm {
+ margin-top: 10px;
+}
+
+.m-t {
+ margin-top: 15px;
+}
+
+.m-t-md {
+ margin-top: 20px;
+}
+
+.m-t-lg {
+ margin-top: 30px;
+}
+
+.m-t-xl {
+ margin-top: 40px;
+}
+
+.m-t-n-xxs {
+ margin-top: -1px;
+}
+
+.m-t-n-xs {
+ margin-top: -5px;
+}
+
+.m-t-n-sm {
+ margin-top: -10px;
+}
+
+.m-t-n {
+ margin-top: -15px;
+}
+
+.m-t-n-md {
+ margin-top: -20px;
+}
+
+.m-t-n-lg {
+ margin-top: -30px;
+}
+
+.m-t-n-xl {
+ margin-top: -40px;
+}
+
+.m-r-none {
+ margin-right: 0;
+}
+
+.m-r-xxs {
+ margin-right: 1px;
+}
+
+.m-r-xs {
+ margin-right: 5px;
+}
+
+.m-r-sm {
+ margin-right: 10px;
+}
+
+.m-r {
+ margin-right: 15px;
+}
+
+.m-r-md {
+ margin-right: 20px;
+}
+
+.m-r-lg {
+ margin-right: 30px;
+}
+
+.m-r-xl {
+ margin-right: 40px;
+}
+
+.m-r-n-xxs {
+ margin-right: -1px;
+}
+
+.m-r-n-xs {
+ margin-right: -5px;
+}
+
+.m-r-n-sm {
+ margin-right: -10px;
+}
+
+.m-r-n {
+ margin-right: -15px;
+}
+
+.m-r-n-md {
+ margin-right: -20px;
+}
+
+.m-r-n-lg {
+ margin-right: -30px;
+}
+
+.m-r-n-xl {
+ margin-right: -40px;
+}
+
+.m-b-none {
+ margin-bottom: 0;
+}
+
+.m-b-xxs {
+ margin-bottom: 1px;
+}
+
+.m-b-xs {
+ margin-bottom: 5px;
+}
+
+.m-b-sm {
+ margin-bottom: 10px;
+}
+
+.m-b {
+ margin-bottom: 15px;
+}
+
+.m-b-md {
+ margin-bottom: 20px;
+}
+
+.m-b-lg {
+ margin-bottom: 30px;
+}
+
+.m-b-xl {
+ margin-bottom: 40px;
+}
+
+.m-b-n-xxs {
+ margin-bottom: -1px;
+}
+
+.m-b-n-xs {
+ margin-bottom: -5px;
+}
+
+.m-b-n-sm {
+ margin-bottom: -10px;
+}
+
+.m-b-n {
+ margin-bottom: -15px;
+}
+
+.m-b-n-md {
+ margin-bottom: -20px;
+}
+
+.m-b-n-lg {
+ margin-bottom: -30px;
+}
+
+.m-b-n-xl {
+ margin-bottom: -40px;
+}
+
+.space-15 {
+ margin: 15px 0;
+}
+
+.space-20 {
+ margin: 20px 0;
+}
+
+.space-25 {
+ margin: 25px 0;
+}
+
+.space-30 {
+ margin: 30px 0;
+}
+
+body.modal-open {
+ padding-right: inherit !important;
+}
+
+
+/* SEARCH PAGE */
+
+.search-form {
+ margin-top: 10px;
+}
+
+.search-result h3 {
+ margin-bottom: 0;
+ color: #1E0FBE;
+}
+
+.search-result .search-link {
+ color: #006621;
+}
+
+.search-result p {
+ font-size: 12px;
+ margin-top: 5px;
+}
+
+
+/* CONTACTS */
+
+.contact-box {
+ background-color: #ffffff;
+ border: 1px solid #e7eaec;
+ padding: 20px;
+ margin-bottom: 20px;
+}
+
+.contact-box a {
+ color: inherit;
+}
+
+
+/* INVOICE */
+
+.invoice-table tbody > tr > td:last-child,
+.invoice-table tbody > tr > td:nth-child(4),
+.invoice-table tbody > tr > td:nth-child(3),
+.invoice-table tbody > tr > td:nth-child(2) {
+ text-align: right;
+}
+
+.invoice-table thead > tr > th:last-child,
+.invoice-table thead > tr > th:nth-child(4),
+.invoice-table thead > tr > th:nth-child(3),
+.invoice-table thead > tr > th:nth-child(2) {
+ text-align: right;
+}
+
+.invoice-total > tbody > tr > td:first-child {
+ text-align: right;
+}
+
+.invoice-total > tbody > tr > td {
+ border: 0 none;
+}
+
+.invoice-total > tbody > tr > td:last-child {
+ border-bottom: 1px solid #DDDDDD;
+ text-align: right;
+ width: 15%;
+}
+
+
+/* ERROR & LOGIN & LOCKSCREEN*/
+
+.middle-box {
+ max-width: 400px;
+ z-index: 100;
+ margin: 0 auto;
+ padding-top: 40px;
+}
+
+.lockscreen.middle-box {
+ width: 200px;
+ padding-top: 110px;
+}
+
+.loginscreen.middle-box {
+ width: 300px;
+}
+
+.loginColumns {
+ max-width: 800px;
+ margin: 0 auto;
+ padding: 100px 20px 20px 20px;
+}
+
+.passwordBox {
+ max-width: 460px;
+ margin: 0 auto;
+ padding: 100px 20px 20px 20px;
+}
+
+.logo-name {
+ color: #e6e6e6;
+ font-size: 180px;
+ font-weight: 800;
+ letter-spacing: -10px;
+ margin-bottom: 0px;
+}
+
+.middle-box h1 {
+ font-size: 170px;
+}
+
+.wrapper .middle-box {
+ margin-top: 140px;
+}
+
+.lock-word {
+ z-index: 10;
+ position: absolute;
+ top: 110px;
+ left: 50%;
+ margin-left: -470px;
+}
+
+.lock-word span {
+ font-size: 100px;
+ font-weight: 600;
+ color: #e9e9e9;
+ display: inline-block;
+}
+
+.lock-word .first-word {
+ margin-right: 160px;
+}
+
+
+/* DASBOARD */
+
+.dashboard-header {
+ border-top: 0;
+ padding: 20px 20px 20px 20px;
+}
+
+.dashboard-header h2 {
+ margin-top: 10px;
+ font-size: 26px;
+}
+
+.fist-item {
+ border-top: none !important;
+}
+
+.statistic-box {
+ margin-top: 40px;
+}
+
+.dashboard-header .list-group-item span.label {
+ margin-right: 10px;
+}
+
+.list-group.clear-list .list-group-item {
+ border-top: 1px solid #e7eaec;
+ border-bottom: 0;
+ border-right: 0;
+ border-left: 0;
+ padding: 10px 0;
+}
+
+ul.clear-list:first-child {
+ border-top: none !important;
+}
+
+
+/* Intimeline */
+
+.timeline-item .date i {
+ position: absolute;
+ top: 0;
+ right: 0;
+ padding: 5px;
+ width: 30px;
+ text-align: center;
+ border-top: 1px solid #e7eaec;
+ border-bottom: 1px solid #e7eaec;
+ border-left: 1px solid #e7eaec;
+ background: #f8f8f8;
+}
+
+.timeline-item .date {
+ text-align: right;
+ width: 110px;
+ position: relative;
+ padding-top: 30px;
+}
+
+.timeline-item .content {
+ border-left: 1px solid #e7eaec;
+ border-top: 1px solid #e7eaec;
+ padding-top: 10px;
+ min-height: 100px;
+}
+
+.timeline-item .content:hover {
+ background: #f6f6f6;
+}
+
+
+/* PIN BOARD */
+
+ul.notes li,
+ul.tag-list li {
+ list-style: none;
+}
+
+ul.notes li h4 {
+ margin-top: 20px;
+ font-size: 16px;
+}
+
+ul.notes li div {
+ text-decoration: none;
+ color: #000;
+ background: #ffc;
+ display: block;
+ height: 140px;
+ width: 140px;
+ padding: 1em;
+ position: relative;
+}
+
+ul.notes li div small {
+ position: absolute;
+ top: 5px;
+ right: 5px;
+ font-size: 10px;
+}
+
+ul.notes li div a {
+ position: absolute;
+ right: 10px;
+ bottom: 10px;
+ color: inherit;
+}
+
+ul.notes li {
+ margin: 10px 40px 50px 0px;
+ float: left;
+}
+
+ul.notes li div p {
+ font-size: 12px;
+}
+
+ul.notes li div {
+ text-decoration: none;
+ color: #000;
+ background: #ffc;
+ display: block;
+ height: 140px;
+ width: 140px;
+ padding: 1em;
+ /* Firefox */
+ /* Safari+Chrome */
+ /* Opera */
+ box-shadow: 5px 5px 2px rgba(33, 33, 33, 0.7);
+}
+
+ul.notes li div {
+ -webkit-transform: rotate(-6deg);
+ -o-transform: rotate(-6deg);
+ -moz-transform: rotate(-6deg);
+}
+
+ul.notes li:nth-child(even) div {
+ -o-transform: rotate(4deg);
+ -webkit-transform: rotate(4deg);
+ -moz-transform: rotate(4deg);
+ position: relative;
+ top: 5px;
+}
+
+ul.notes li:nth-child(3n) div {
+ -o-transform: rotate(-3deg);
+ -webkit-transform: rotate(-3deg);
+ -moz-transform: rotate(-3deg);
+ position: relative;
+ top: -5px;
+}
+
+ul.notes li:nth-child(5n) div {
+ -o-transform: rotate(5deg);
+ -webkit-transform: rotate(5deg);
+ -moz-transform: rotate(5deg);
+ position: relative;
+ top: -10px;
+}
+
+ul.notes li div:hover,
+ul.notes li div:focus {
+ -webkit-transform: scale(1.1);
+ -moz-transform: scale(1.1);
+ -o-transform: scale(1.1);
+ position: relative;
+ z-index: 5;
+}
+
+ul.notes li div {
+ text-decoration: none;
+ color: #000;
+ background: #ffc;
+ display: block;
+ height: 210px;
+ width: 210px;
+ padding: 1em;
+ box-shadow: 5px 5px 7px rgba(33, 33, 33, 0.7);
+ -webkit-transition: -webkit-transform 0.15s linear;
+}
+
+
+/* FILE MANAGER */
+
+.file-box {
+ float: left;
+ width: 220px;
+}
+
+.file-manager h5 {
+ text-transform: uppercase;
+}
+
+.file-manager {
+ list-style: none outside none;
+ margin: 0;
+ padding: 0;
+}
+
+.folder-list li a {
+ color: #666666;
+ display: block;
+ padding: 5px 0;
+}
+
+.folder-list li {
+ border-bottom: 1px solid #e7eaec;
+ display: block;
+}
+
+.folder-list li i {
+ margin-right: 8px;
+ color: #3d4d5d;
+}
+
+.category-list li a {
+ color: #666666;
+ display: block;
+ padding: 5px 0;
+}
+
+.category-list li {
+ display: block;
+}
+
+.category-list li i {
+ margin-right: 8px;
+ color: #3d4d5d;
+}
+
+.category-list li a .text-navy {
+ color: #1ab394;
+}
+
+.category-list li a .text-primary {
+ color: #1c84c6;
+}
+
+.category-list li a .text-info {
+ color: #23c6c8;
+}
+
+.category-list li a .text-danger {
+ color: #EF5352;
+}
+
+.category-list li a .text-warning {
+ color: #F8AC59;
+}
+
+.file-manager h5.tag-title {
+ margin-top: 20px;
+}
+
+.tag-list li {
+ float: left;
+}
+
+.tag-list li a {
+ font-size: 10px;
+ background-color: #f3f3f4;
+ padding: 5px 12px;
+ color: inherit;
+ border-radius: 2px;
+ border: 1px solid #e7eaec;
+ margin-right: 5px;
+ margin-top: 5px;
+ display: block;
+}
+
+.file {
+ border: 1px solid #e7eaec;
+ padding: 0;
+ background-color: #ffffff;
+ position: relative;
+ margin-bottom: 20px;
+ margin-right: 20px;
+}
+
+.file-manager .hr-line-dashed {
+ margin: 15px 0;
+}
+
+.file .icon,
+.file .image {
+ height: 100px;
+ overflow: hidden;
+}
+
+.file .icon {
+ padding: 15px 10px;
+ text-align: center;
+}
+
+.file-control {
+ color: inherit;
+ font-size: 11px;
+ margin-right: 10px;
+}
+
+.file-control.active {
+ text-decoration: underline;
+}
+
+.file .icon i {
+ font-size: 70px;
+ color: #dadada;
+}
+
+.file .file-name {
+ padding: 10px;
+ background-color: #f8f8f8;
+ border-top: 1px solid #e7eaec;
+}
+
+.file-name small {
+ color: #676a6c;
+}
+
+.corner {
+ position: absolute;
+ display: inline-block;
+ width: 0;
+ height: 0;
+ line-height: 0;
+ border: 0.6em solid transparent;
+ border-right: 0.6em solid #f1f1f1;
+ border-bottom: 0.6em solid #f1f1f1;
+ right: 0em;
+ bottom: 0em;
+}
+
+a.compose-mail {
+ padding: 8px 10px;
+}
+
+.mail-search {
+ max-width: 300px;
+}
+
+
+/* PROFILE */
+
+.profile-content {
+ border-top: none !important;
+}
+
+.feed-activity-list .feed-element {
+ border-bottom: 1px solid #e7eaec;
+}
+
+.feed-element:first-child {
+ margin-top: 0;
+}
+
+.feed-element {
+ padding-bottom: 15px;
+}
+
+.feed-element,
+.feed-element .media {
+ margin-top: 15px;
+}
+
+.feed-element,
+.media-body {
+ overflow: hidden;
+}
+
+.feed-element > .pull-left {
+ margin-right: 10px;
+}
+
+.feed-element img.img-circle,
+.dropdown-messages-box img.img-circle {
+ width: 38px;
+ height: 38px;
+}
+
+.feed-element .well {
+ border: 1px solid #e7eaec;
+ box-shadow: none;
+ margin-top: 10px;
+ margin-bottom: 5px;
+ padding: 10px 20px;
+ font-size: 11px;
+ line-height: 16px;
+}
+
+.feed-element .actions {
+ margin-top: 10px;
+}
+
+.feed-element .photos {
+ margin: 10px 0;
+}
+
+.feed-photo {
+ max-height: 180px;
+ border-radius: 4px;
+ overflow: hidden;
+ margin-right: 10px;
+ margin-bottom: 10px;
+}
+
+
+/* MAILBOX */
+
+.mail-box {
+ background-color: #ffffff;
+ border: 1px solid #e7eaec;
+ border-top: 0;
+ padding: 0px;
+ margin-bottom: 20px;
+}
+
+.mail-box-header {
+ background-color: #ffffff;
+ border: 1px solid #e7eaec;
+ border-bottom: 0;
+ padding: 30px 20px 20px 20px;
+}
+
+.mail-box-header h2 {
+ margin-top: 0px;
+}
+
+.mailbox-content .tag-list li a {
+ background: #ffffff;
+}
+
+.mail-body {
+ border-top: 1px solid #e7eaec;
+ padding: 20px;
+}
+
+.mail-text {
+ border-top: 1px solid #e7eaec;
+}
+
+.mail-text .note-toolbar {
+ padding: 10px 15px;
+}
+
+.mail-body .form-group {
+ margin-bottom: 5px;
+}
+
+.mail-text .note-editor .note-toolbar {
+ background-color: #F9F8F8;
+}
+
+.mail-attachment {
+ border-top: 1px solid #e7eaec;
+ padding: 20px;
+ font-size: 12px;
+}
+
+.mailbox-content {
+ background: none;
+ border: none;
+ padding: 10px;
+}
+
+.mail-ontact {
+ width: 23%;
+}
+
+
+/* PROJECTS */
+
+.project-people,
+.project-actions {
+ text-align: right;
+ vertical-align: middle;
+}
+
+dd.project-people {
+ text-align: left;
+ margin-top: 5px;
+}
+
+.project-people img {
+ width: 32px;
+ height: 32px;
+}
+
+.project-title a {
+ font-size: 14px;
+ color: #676a6c;
+ font-weight: 600;
+}
+
+.project-list table tr td {
+ border-top: none;
+ border-bottom: 1px solid #e7eaec;
+ padding: 15px 10px;
+ vertical-align: middle;
+}
+
+.project-manager .tag-list li a {
+ font-size: 10px;
+ background-color: white;
+ padding: 5px 12px;
+ color: inherit;
+ border-radius: 2px;
+ border: 1px solid #e7eaec;
+ margin-right: 5px;
+ margin-top: 5px;
+ display: block;
+}
+
+.project-files li a {
+ font-size: 11px;
+ color: #676a6c;
+ margin-left: 10px;
+ line-height: 22px;
+}
+
+
+/* FAQ */
+
+.faq-item {
+ padding: 20px;
+ margin-bottom: 2px;
+ background: #fff;
+}
+
+.faq-question {
+ font-size: 18px;
+ font-weight: 600;
+ color: #1ab394;
+ display: block;
+}
+
+.faq-question:hover {
+ color: #179d82;
+}
+
+.faq-answer {
+ margin-top: 10px;
+ background: #f3f3f4;
+ border: 1px solid #e7eaec;
+ border-radius: 3px;
+ padding: 15px;
+}
+
+.faq-item .tag-item {
+ background: #f3f3f4;
+ padding: 2px 6px;
+ font-size: 10px;
+ text-transform: uppercase;
+}
+
+
+/* Chat view */
+
+.message-input {
+ height: 90px !important;
+}
+
+.chat-avatar {
+ white: 36px;
+ height: 36px;
+ float: left;
+ margin-right: 10px;
+}
+
+.chat-user-name {
+ padding: 10px;
+}
+
+.chat-user {
+ padding: 8px 10px;
+ border-bottom: 1px solid #e7eaec;
+}
+
+.chat-user a {
+ color: inherit;
+}
+
+.chat-view {
+ z-index: 20012;
+}
+
+.chat-users,
+.chat-statistic {
+ margin-left: -30px;
+}
+
+@media (max-width: 992px) {
+ .chat-users,
+ .chat-statistic {
+ margin-left: 0px;
+ }
+}
+
+.chat-view .ibox-content {
+ padding: 0;
+}
+
+.chat-message {
+ padding: 10px 20px;
+}
+
+.message-avatar {
+ height: 48px;
+ width: 48px;
+ border: 1px solid #e7eaec;
+ border-radius: 4px;
+ margin-top: 1px;
+}
+
+.chat-discussion .chat-message:nth-child(2n+1) .message-avatar {
+ float: left;
+ margin-right: 10px;
+}
+
+.chat-discussion .chat-message:nth-child(2n) .message-avatar {
+ float: right;
+ margin-left: 10px;
+}
+
+.message {
+ background-color: #fff;
+ border: 1px solid #e7eaec;
+ text-align: left;
+ display: block;
+ padding: 10px 20px;
+ position: relative;
+ border-radius: 4px;
+}
+
+.chat-discussion .chat-message:nth-child(2n+1) .message-date {
+ float: right;
+}
+
+.chat-discussion .chat-message:nth-child(2n) .message-date {
+ float: left;
+}
+
+.chat-discussion .chat-message:nth-child(2n+1) .message {
+ text-align: left;
+ margin-left: 55px;
+}
+
+.chat-discussion .chat-message:nth-child(2n) .message {
+ text-align: right;
+ margin-right: 55px;
+}
+
+.message-date {
+ font-size: 10px;
+ color: #888888;
+}
+
+.message-content {
+ display: block;
+}
+
+.chat-discussion {
+ background: #eee;
+ padding: 15px;
+ height: 400px;
+ overflow-y: auto;
+}
+
+.chat-users {
+ overflow-y: auto;
+ height: 400px;
+}
+
+.chat-message-form .form-group {
+ margin-bottom: 0;
+}
+
+
+/* jsTree */
+
+.jstree-open > .jstree-anchor > .fa-folder:before {
+ content: "\f07c";
+}
+
+.jstree-default .jstree-icon.none {
+ width: 0;
+}
+
+
+/* CLIENTS */
+
+.clients-list {
+ margin-top: 20px;
+}
+
+.clients-list .tab-pane {
+ position: relative;
+ height: 600px;
+}
+
+.client-detail {
+ position: relative;
+ height: 620px;
+}
+
+.clients-list table tr td {
+ height: 46px;
+ vertical-align: middle;
+ border: none;
+}
+
+.client-link {
+ font-weight: 600;
+ color: inherit;
+}
+
+.client-link:hover {
+ color: inherit;
+}
+
+.client-avatar {
+ width: 42px;
+}
+
+.client-avatar img {
+ width: 28px;
+ height: 28px;
+ border-radius: 50%;
+}
+
+.contact-type {
+ width: 20px;
+ color: #c1c3c4;
+}
+
+.client-status {
+ text-align: left;
+}
+
+.client-detail .vertical-timeline-content p {
+ margin: 0;
+}
+
+.client-detail .vertical-timeline-icon.gray-bg {
+ color: #a7aaab;
+}
+
+.clients-list .nav-tabs > li.active > a,
+.clients-list .nav-tabs > li.active > a:hover,
+.clients-list .nav-tabs > li.active > a:focus {
+ border-bottom: 1px solid #fff;
+}
+
+
+/* BLOG ARTICLE */
+
+.blog h2 {
+ font-weight: 700;
+}
+
+.blog h5 {
+ margin: 0 0 5px 0;
+}
+
+.blog .btn {
+ margin: 0 0 5px 0;
+}
+
+.article h1 {
+ font-size: 48px;
+ font-weight: 700;
+ color: #2F4050;
+}
+
+.article p {
+ font-size: 15px;
+ line-height: 26px;
+}
+
+.article-title {
+ text-align: center;
+ margin: 60px 0 40px 0;
+}
+
+.article .ibox-content {
+ padding: 40px;
+}
+
+
+/* ISSUE TRACKER */
+
+.issue-tracker .btn-link {
+ color: #1ab394;
+}
+
+table.issue-tracker tbody tr td {
+ vertical-align: middle;
+ height: 50px;
+}
+
+.issue-info {
+ width: 50%;
+}
+
+.issue-info a {
+ font-weight: 600;
+ color: #676a6c;
+}
+
+.issue-info small {
+ display: block;
+}
+
+
+/* TEAMS */
+
+.team-members {
+ margin: 10px 0;
+}
+
+.team-members img.img-circle {
+ width: 42px;
+ height: 42px;
+ margin-bottom: 5px;
+}
+
+
+/* AGILE BOARD */
+
+.sortable-list {
+ padding: 10px 0;
+}
+
+.agile-list {
+ list-style: none;
+ margin: 0;
+}
+
+.agile-list li {
+ background: #FAFAFB;
+ border: 1px solid #e7eaec;
+ margin: 0px 0 10px 0;
+ padding: 10px;
+ border-radius: 2px;
+}
+
+.agile-list li:hover {
+ cursor: pointer;
+ background: #fff;
+}
+
+.agile-list li.warning-element {
+ border-left: 3px solid #f8ac59;
+}
+
+.agile-list li.danger-element {
+ border-left: 3px solid #ed5565;
+}
+
+.agile-list li.info-element {
+ border-left: 3px solid #1c84c6;
+}
+
+.agile-list li.success-element {
+ border-left: 3px solid #1ab394;
+}
+
+.agile-detail {
+ margin-top: 5px;
+ font-size: 12px;
+}
+
+
+/* DIFF */
+
+ins {
+ background-color: #c6ffc6;
+ text-decoration: none;
+}
+
+del {
+ background-color: #ffc6c6;
+}
+
+#small-chat {
+ position: fixed;
+ bottom: 50px;
+ right: 26px;
+ z-index: 100;
+}
+
+#small-chat .badge {
+ position: absolute;
+ top: -3px;
+ right: -4px;
+}
+
+.open-small-chat {
+ height: 38px;
+ width: 38px;
+ display: block;
+ background: #1ab394;
+ padding: 9px 8px;
+ text-align: center;
+ color: #fff;
+ border-radius: 50%;
+}
+
+.open-small-chat:hover {
+ color: white;
+ background: #1ab394;
+}
+
+.small-chat-box {
+ display: none;
+ position: fixed;
+ bottom: 50px;
+ right: 80px;
+ background: #fff;
+ border: 1px solid #e7eaec;
+ width: 230px;
+ height: 320px;
+ border-radius: 4px;
+}
+
+.small-chat-box.ng-small-chat {
+ display: block;
+}
+
+.body-small .small-chat-box {
+ bottom: 70px;
+ right: 20px;
+}
+
+.small-chat-box.active {
+ display: block;
+}
+
+.small-chat-box .heading {
+ background: #2f4050;
+ padding: 8px 15px;
+ font-weight: bold;
+ color: #fff;
+}
+
+.small-chat-box .chat-date {
+ opacity: 0.6;
+ font-size: 10px;
+ font-weight: normal;
+}
+
+.small-chat-box .content {
+ padding: 15px 15px;
+}
+
+.small-chat-box .content .author-name {
+ font-weight: bold;
+ margin-bottom: 3px;
+ font-size: 11px;
+}
+
+.small-chat-box .content > div {
+ padding-bottom: 20px;
+}
+
+.small-chat-box .content .chat-message {
+ padding: 5px 10px;
+ border-radius: 6px;
+ font-size: 11px;
+ line-height: 14px;
+ max-width: 80%;
+ background: #f3f3f4;
+ margin-bottom: 10px;
+}
+
+.small-chat-box .content .chat-message.active {
+ background: #1ab394;
+ color: #fff;
+}
+
+.small-chat-box .content .left {
+ text-align: left;
+ clear: both;
+}
+
+.small-chat-box .content .left .chat-message {
+ float: left;
+}
+
+.small-chat-box .content .right {
+ text-align: right;
+ clear: both;
+}
+
+.small-chat-box .content .right .chat-message {
+ float: right;
+}
+
+.small-chat-box .form-chat {
+ padding: 10px 10px;
+}
+
+
+/*
+ * Usage:
+ *
+ * <div class="sk-spinner sk-spinner-rotating-plane"></div>
+ *
+ */
+
+.sk-spinner-rotating-plane.sk-spinner {
+ width: 30px;
+ height: 30px;
+ background-color: #1ab394;
+ margin: 0 auto;
+ -webkit-animation: sk-rotatePlane 1.2s infinite ease-in-out;
+ animation: sk-rotatePlane 1.2s infinite ease-in-out;
+}
+
+@-webkit-keyframes sk-rotatePlane {
+ 0% {
+ -webkit-transform: perspective(120px) rotateX(0deg) rotateY(0deg);
+ transform: perspective(120px) rotateX(0deg) rotateY(0deg);
+ }
+ 50% {
+ -webkit-transform: perspective(120px) rotateX(-180.1deg) rotateY(0deg);
+ transform: perspective(120px) rotateX(-180.1deg) rotateY(0deg);
+ }
+ 100% {
+ -webkit-transform: perspective(120px) rotateX(-180deg) rotateY(-179.9deg);
+ transform: perspective(120px) rotateX(-180deg) rotateY(-179.9deg);
+ }
+}
+
+@keyframes sk-rotatePlane {
+ 0% {
+ -webkit-transform: perspective(120px) rotateX(0deg) rotateY(0deg);
+ transform: perspective(120px) rotateX(0deg) rotateY(0deg);
+ }
+ 50% {
+ -webkit-transform: perspective(120px) rotateX(-180.1deg) rotateY(0deg);
+ transform: perspective(120px) rotateX(-180.1deg) rotateY(0deg);
+ }
+ 100% {
+ -webkit-transform: perspective(120px) rotateX(-180deg) rotateY(-179.9deg);
+ transform: perspective(120px) rotateX(-180deg) rotateY(-179.9deg);
+ }
+}
+
+
+/*
+ * Usage:
+ *
+ * <div class="sk-spinner sk-spinner-double-bounce">
+ * <div class="sk-double-bounce1"></div>
+ * <div class="sk-double-bounce2"></div>
+ * </div>
+ *
+ */
+
+.sk-spinner-double-bounce.sk-spinner {
+ width: 40px;
+ height: 40px;
+ position: relative;
+ margin: 0 auto;
+}
+
+.sk-spinner-double-bounce .sk-double-bounce1,
+.sk-spinner-double-bounce .sk-double-bounce2 {
+ width: 100%;
+ height: 100%;
+ border-radius: 50%;
+ background-color: #1ab394;
+ opacity: 0.6;
+ position: absolute;
+ top: 0;
+ left: 0;
+ -webkit-animation: sk-doubleBounce 2s infinite ease-in-out;
+ animation: sk-doubleBounce 2s infinite ease-in-out;
+}
+
+.sk-spinner-double-bounce .sk-double-bounce2 {
+ -webkit-animation-delay: -1s;
+ animation-delay: -1s;
+}
+
+@-webkit-keyframes sk-doubleBounce {
+ 0%,
+ 100% {
+ -webkit-transform: scale(0);
+ transform: scale(0);
+ }
+ 50% {
+ -webkit-transform: scale(1);
+ transform: scale(1);
+ }
+}
+
+@keyframes sk-doubleBounce {
+ 0%,
+ 100% {
+ -webkit-transform: scale(0);
+ transform: scale(0);
+ }
+ 50% {
+ -webkit-transform: scale(1);
+ transform: scale(1);
+ }
+}
+
+
+/*
+ * Usage:
+ *
+ * <div class="sk-spinner sk-spinner-wave">
+ * <div class="sk-rect1"></div>
+ * <div class="sk-rect2"></div>
+ * <div class="sk-rect3"></div>
+ * <div class="sk-rect4"></div>
+ * <div class="sk-rect5"></div>
+ * </div>
+ *
+ */
+
+.sk-spinner-wave.sk-spinner {
+ margin: 0 auto;
+ width: 50px;
+ height: 30px;
+ text-align: center;
+ font-size: 10px;
+}
+
+.sk-spinner-wave div {
+ background-color: #1ab394;
+ height: 100%;
+ width: 6px;
+ display: inline-block;
+ -webkit-animation: sk-waveStretchDelay 1.2s infinite ease-in-out;
+ animation: sk-waveStretchDelay 1.2s infinite ease-in-out;
+}
+
+.sk-spinner-wave .sk-rect2 {
+ -webkit-animation-delay: -1.1s;
+ animation-delay: -1.1s;
+}
+
+.sk-spinner-wave .sk-rect3 {
+ -webkit-animation-delay: -1s;
+ animation-delay: -1s;
+}
+
+.sk-spinner-wave .sk-rect4 {
+ -webkit-animation-delay: -0.9s;
+ animation-delay: -0.9s;
+}
+
+.sk-spinner-wave .sk-rect5 {
+ -webkit-animation-delay: -0.8s;
+ animation-delay: -0.8s;
+}
+
+@-webkit-keyframes sk-waveStretchDelay {
+ 0%,
+ 40%,
+ 100% {
+ -webkit-transform: scaleY(0.4);
+ transform: scaleY(0.4);
+ }
+ 20% {
+ -webkit-transform: scaleY(1);
+ transform: scaleY(1);
+ }
+}
+
+@keyframes sk-waveStretchDelay {
+ 0%,
+ 40%,
+ 100% {
+ -webkit-transform: scaleY(0.4);
+ transform: scaleY(0.4);
+ }
+ 20% {
+ -webkit-transform: scaleY(1);
+ transform: scaleY(1);
+ }
+}
+
+
+/*
+ * Usage:
+ *
+ * <div class="sk-spinner sk-spinner-wandering-cubes">
+ * <div class="sk-cube1"></div>
+ * <div class="sk-cube2"></div>
+ * </div>
+ *
+ */
+
+.sk-spinner-wandering-cubes.sk-spinner {
+ margin: 0 auto;
+ width: 32px;
+ height: 32px;
+ position: relative;
+}
+
+.sk-spinner-wandering-cubes .sk-cube1,
+.sk-spinner-wandering-cubes .sk-cube2 {
+ background-color: #1ab394;
+ width: 10px;
+ height: 10px;
+ position: absolute;
+ top: 0;
+ left: 0;
+ -webkit-animation: sk-wanderingCubeMove 1.8s infinite ease-in-out;
+ animation: sk-wanderingCubeMove 1.8s infinite ease-in-out;
+}
+
+.sk-spinner-wandering-cubes .sk-cube2 {
+ -webkit-animation-delay: -0.9s;
+ animation-delay: -0.9s;
+}
+
+@-webkit-keyframes sk-wanderingCubeMove {
+ 25% {
+ -webkit-transform: translateX(42px) rotate(-90deg) scale(0.5);
+ transform: translateX(42px) rotate(-90deg) scale(0.5);
+ }
+ 50% {
+ /* Hack to make FF rotate in the right direction */
+ -webkit-transform: translateX(42px) translateY(42px) rotate(-179deg);
+ transform: translateX(42px) translateY(42px) rotate(-179deg);
+ }
+ 50.1% {
+ -webkit-transform: translateX(42px) translateY(42px) rotate(-180deg);
+ transform: translateX(42px) translateY(42px) rotate(-180deg);
+ }
+ 75% {
+ -webkit-transform: translateX(0px) translateY(42px) rotate(-270deg) scale(0.5);
+ transform: translateX(0px) translateY(42px) rotate(-270deg) scale(0.5);
+ }
+ 100% {
+ -webkit-transform: rotate(-360deg);
+ transform: rotate(-360deg);
+ }
+}
+
+@keyframes sk-wanderingCubeMove {
+ 25% {
+ -webkit-transform: translateX(42px) rotate(-90deg) scale(0.5);
+ transform: translateX(42px) rotate(-90deg) scale(0.5);
+ }
+ 50% {
+ /* Hack to make FF rotate in the right direction */
+ -webkit-transform: translateX(42px) translateY(42px) rotate(-179deg);
+ transform: translateX(42px) translateY(42px) rotate(-179deg);
+ }
+ 50.1% {
+ -webkit-transform: translateX(42px) translateY(42px) rotate(-180deg);
+ transform: translateX(42px) translateY(42px) rotate(-180deg);
+ }
+ 75% {
+ -webkit-transform: translateX(0px) translateY(42px) rotate(-270deg) scale(0.5);
+ transform: translateX(0px) translateY(42px) rotate(-270deg) scale(0.5);
+ }
+ 100% {
+ -webkit-transform: rotate(-360deg);
+ transform: rotate(-360deg);
+ }
+}
+
+
+/*
+ * Usage:
+ *
+ * <div class="sk-spinner sk-spinner-pulse"></div>
+ *
+ */
+
+.sk-spinner-pulse.sk-spinner {
+ width: 40px;
+ height: 40px;
+ margin: 0 auto;
+ background-color: #1ab394;
+ border-radius: 100%;
+ -webkit-animation: sk-pulseScaleOut 1s infinite ease-in-out;
+ animation: sk-pulseScaleOut 1s infinite ease-in-out;
+}
+
+@-webkit-keyframes sk-pulseScaleOut {
+ 0% {
+ -webkit-transform: scale(0);
+ transform: scale(0);
+ }
+ 100% {
+ -webkit-transform: scale(1);
+ transform: scale(1);
+ opacity: 0;
+ }
+}
+
+@keyframes sk-pulseScaleOut {
+ 0% {
+ -webkit-transform: scale(0);
+ transform: scale(0);
+ }
+ 100% {
+ -webkit-transform: scale(1);
+ transform: scale(1);
+ opacity: 0;
+ }
+}
+
+
+/*
+ * Usage:
+ *
+ * <div class="sk-spinner sk-spinner-chasing-dots">
+ * <div class="sk-dot1"></div>
+ * <div class="sk-dot2"></div>
+ * </div>
+ *
+ */
+
+.sk-spinner-chasing-dots.sk-spinner {
+ margin: 0 auto;
+ width: 40px;
+ height: 40px;
+ position: relative;
+ text-align: center;
+ -webkit-animation: sk-chasingDotsRotate 2s infinite linear;
+ animation: sk-chasingDotsRotate 2s infinite linear;
+}
+
+.sk-spinner-chasing-dots .sk-dot1,
+.sk-spinner-chasing-dots .sk-dot2 {
+ width: 60%;
+ height: 60%;
+ display: inline-block;
+ position: absolute;
+ top: 0;
+ background-color: #1ab394;
+ border-radius: 100%;
+ -webkit-animation: sk-chasingDotsBounce 2s infinite ease-in-out;
+ animation: sk-chasingDotsBounce 2s infinite ease-in-out;
+}
+
+.sk-spinner-chasing-dots .sk-dot2 {
+ top: auto;
+ bottom: 0px;
+ -webkit-animation-delay: -1s;
+ animation-delay: -1s;
+}
+
+@-webkit-keyframes sk-chasingDotsRotate {
+ 100% {
+ -webkit-transform: rotate(360deg);
+ transform: rotate(360deg);
+ }
+}
+
+@keyframes sk-chasingDotsRotate {
+ 100% {
+ -webkit-transform: rotate(360deg);
+ transform: rotate(360deg);
+ }
+}
+
+@-webkit-keyframes sk-chasingDotsBounce {
+ 0%,
+ 100% {
+ -webkit-transform: scale(0);
+ transform: scale(0);
+ }
+ 50% {
+ -webkit-transform: scale(1);
+ transform: scale(1);
+ }
+}
+
+@keyframes sk-chasingDotsBounce {
+ 0%,
+ 100% {
+ -webkit-transform: scale(0);
+ transform: scale(0);
+ }
+ 50% {
+ -webkit-transform: scale(1);
+ transform: scale(1);
+ }
+}
+
+
+/*
+ * Usage:
+ *
+ * <div class="sk-spinner sk-spinner-three-bounce">
+ * <div class="sk-bounce1"></div>
+ * <div class="sk-bounce2"></div>
+ * <div class="sk-bounce3"></div>
+ * </div>
+ *
+ */
+
+.sk-spinner-three-bounce.sk-spinner {
+ margin: 0 auto;
+ width: 70px;
+ text-align: center;
+}
+
+.sk-spinner-three-bounce div {
+ width: 18px;
+ height: 18px;
+ background-color: #1ab394;
+ border-radius: 100%;
+ display: inline-block;
+ -webkit-animation: sk-threeBounceDelay 1.4s infinite ease-in-out;
+ animation: sk-threeBounceDelay 1.4s infinite ease-in-out;
+ /* Prevent first frame from flickering when animation starts */
+ -webkit-animation-fill-mode: both;
+ animation-fill-mode: both;
+}
+
+.sk-spinner-three-bounce .sk-bounce1 {
+ -webkit-animation-delay: -0.32s;
+ animation-delay: -0.32s;
+}
+
+.sk-spinner-three-bounce .sk-bounce2 {
+ -webkit-animation-delay: -0.16s;
+ animation-delay: -0.16s;
+}
+
+@-webkit-keyframes sk-threeBounceDelay {
+ 0%,
+ 80%,
+ 100% {
+ -webkit-transform: scale(0);
+ transform: scale(0);
+ }
+ 40% {
+ -webkit-transform: scale(1);
+ transform: scale(1);
+ }
+}
+
+@keyframes sk-threeBounceDelay {
+ 0%,
+ 80%,
+ 100% {
+ -webkit-transform: scale(0);
+ transform: scale(0);
+ }
+ 40% {
+ -webkit-transform: scale(1);
+ transform: scale(1);
+ }
+}
+
+
+/*
+ * Usage:
+ *
+ * <div class="sk-spinner sk-spinner-circle">
+ * <div class="sk-circle1 sk-circle"></div>
+ * <div class="sk-circle2 sk-circle"></div>
+ * <div class="sk-circle3 sk-circle"></div>
+ * <div class="sk-circle4 sk-circle"></div>
+ * <div class="sk-circle5 sk-circle"></div>
+ * <div class="sk-circle6 sk-circle"></div>
+ * <div class="sk-circle7 sk-circle"></div>
+ * <div class="sk-circle8 sk-circle"></div>
+ * <div class="sk-circle9 sk-circle"></div>
+ * <div class="sk-circle10 sk-circle"></div>
+ * <div class="sk-circle11 sk-circle"></div>
+ * <div class="sk-circle12 sk-circle"></div>
+ * </div>
+ *
+ */
+
+.sk-spinner-circle.sk-spinner {
+ margin: 0 auto;
+ width: 22px;
+ height: 22px;
+ position: relative;
+}
+
+.sk-spinner-circle .sk-circle {
+ width: 100%;
+ height: 100%;
+ position: absolute;
+ left: 0;
+ top: 0;
+}
+
+.sk-spinner-circle .sk-circle:before {
+ content: '';
+ display: block;
+ margin: 0 auto;
+ width: 20%;
+ height: 20%;
+ background-color: #1ab394;
+ border-radius: 100%;
+ -webkit-animation: sk-circleBounceDelay 1.2s infinite ease-in-out;
+ animation: sk-circleBounceDelay 1.2s infinite ease-in-out;
+ /* Prevent first frame from flickering when animation starts */
+ -webkit-animation-fill-mode: both;
+ animation-fill-mode: both;
+}
+
+.sk-spinner-circle .sk-circle2 {
+ -webkit-transform: rotate(30deg);
+ -ms-transform: rotate(30deg);
+ transform: rotate(30deg);
+}
+
+.sk-spinner-circle .sk-circle3 {
+ -webkit-transform: rotate(60deg);
+ -ms-transform: rotate(60deg);
+ transform: rotate(60deg);
+}
+
+.sk-spinner-circle .sk-circle4 {
+ -webkit-transform: rotate(90deg);
+ -ms-transform: rotate(90deg);
+ transform: rotate(90deg);
+}
+
+.sk-spinner-circle .sk-circle5 {
+ -webkit-transform: rotate(120deg);
+ -ms-transform: rotate(120deg);
+ transform: rotate(120deg);
+}
+
+.sk-spinner-circle .sk-circle6 {
+ -webkit-transform: rotate(150deg);
+ -ms-transform: rotate(150deg);
+ transform: rotate(150deg);
+}
+
+.sk-spinner-circle .sk-circle7 {
+ -webkit-transform: rotate(180deg);
+ -ms-transform: rotate(180deg);
+ transform: rotate(180deg);
+}
+
+.sk-spinner-circle .sk-circle8 {
+ -webkit-transform: rotate(210deg);
+ -ms-transform: rotate(210deg);
+ transform: rotate(210deg);
+}
+
+.sk-spinner-circle .sk-circle9 {
+ -webkit-transform: rotate(240deg);
+ -ms-transform: rotate(240deg);
+ transform: rotate(240deg);
+}
+
+.sk-spinner-circle .sk-circle10 {
+ -webkit-transform: rotate(270deg);
+ -ms-transform: rotate(270deg);
+ transform: rotate(270deg);
+}
+
+.sk-spinner-circle .sk-circle11 {
+ -webkit-transform: rotate(300deg);
+ -ms-transform: rotate(300deg);
+ transform: rotate(300deg);
+}
+
+.sk-spinner-circle .sk-circle12 {
+ -webkit-transform: rotate(330deg);
+ -ms-transform: rotate(330deg);
+ transform: rotate(330deg);
+}
+
+.sk-spinner-circle .sk-circle2:before {
+ -webkit-animation-delay: -1.1s;
+ animation-delay: -1.1s;
+}
+
+.sk-spinner-circle .sk-circle3:before {
+ -webkit-animation-delay: -1s;
+ animation-delay: -1s;
+}
+
+.sk-spinner-circle .sk-circle4:before {
+ -webkit-animation-delay: -0.9s;
+ animation-delay: -0.9s;
+}
+
+.sk-spinner-circle .sk-circle5:before {
+ -webkit-animation-delay: -0.8s;
+ animation-delay: -0.8s;
+}
+
+.sk-spinner-circle .sk-circle6:before {
+ -webkit-animation-delay: -0.7s;
+ animation-delay: -0.7s;
+}
+
+.sk-spinner-circle .sk-circle7:before {
+ -webkit-animation-delay: -0.6s;
+ animation-delay: -0.6s;
+}
+
+.sk-spinner-circle .sk-circle8:before {
+ -webkit-animation-delay: -0.5s;
+ animation-delay: -0.5s;
+}
+
+.sk-spinner-circle .sk-circle9:before {
+ -webkit-animation-delay: -0.4s;
+ animation-delay: -0.4s;
+}
+
+.sk-spinner-circle .sk-circle10:before {
+ -webkit-animation-delay: -0.3s;
+ animation-delay: -0.3s;
+}
+
+.sk-spinner-circle .sk-circle11:before {
+ -webkit-animation-delay: -0.2s;
+ animation-delay: -0.2s;
+}
+
+.sk-spinner-circle .sk-circle12:before {
+ -webkit-animation-delay: -0.1s;
+ animation-delay: -0.1s;
+}
+
+@-webkit-keyframes sk-circleBounceDelay {
+ 0%,
+ 80%,
+ 100% {
+ -webkit-transform: scale(0);
+ transform: scale(0);
+ }
+ 40% {
+ -webkit-transform: scale(1);
+ transform: scale(1);
+ }
+}
+
+@keyframes sk-circleBounceDelay {
+ 0%,
+ 80%,
+ 100% {
+ -webkit-transform: scale(0);
+ transform: scale(0);
+ }
+ 40% {
+ -webkit-transform: scale(1);
+ transform: scale(1);
+ }
+}
+
+
+/*
+ * Usage:
+ *
+ * <div class="sk-spinner sk-spinner-cube-grid">
+ * <div class="sk-cube"></div>
+ * <div class="sk-cube"></div>
+ * <div class="sk-cube"></div>
+ * <div class="sk-cube"></div>
+ * <div class="sk-cube"></div>
+ * <div class="sk-cube"></div>
+ * <div class="sk-cube"></div>
+ * <div class="sk-cube"></div>
+ * <div class="sk-cube"></div>
+ * </div>
+ *
+ */
+
+.sk-spinner-cube-grid {
+ /*
+ * Spinner positions
+ * 1 2 3
+ * 4 5 6
+ * 7 8 9
+ */
+}
+
+.sk-spinner-cube-grid.sk-spinner {
+ width: 30px;
+ height: 30px;
+ margin: 0 auto;
+}
+
+.sk-spinner-cube-grid .sk-cube {
+ width: 33%;
+ height: 33%;
+ background-color: #1ab394;
+ float: left;
+ -webkit-animation: sk-cubeGridScaleDelay 1.3s infinite ease-in-out;
+ animation: sk-cubeGridScaleDelay 1.3s infinite ease-in-out;
+}
+
+.sk-spinner-cube-grid .sk-cube:nth-child(1) {
+ -webkit-animation-delay: 0.2s;
+ animation-delay: 0.2s;
+}
+
+.sk-spinner-cube-grid .sk-cube:nth-child(2) {
+ -webkit-animation-delay: 0.3s;
+ animation-delay: 0.3s;
+}
+
+.sk-spinner-cube-grid .sk-cube:nth-child(3) {
+ -webkit-animation-delay: 0.4s;
+ animation-delay: 0.4s;
+}
+
+.sk-spinner-cube-grid .sk-cube:nth-child(4) {
+ -webkit-animation-delay: 0.1s;
+ animation-delay: 0.1s;
+}
+
+.sk-spinner-cube-grid .sk-cube:nth-child(5) {
+ -webkit-animation-delay: 0.2s;
+ animation-delay: 0.2s;
+}
+
+.sk-spinner-cube-grid .sk-cube:nth-child(6) {
+ -webkit-animation-delay: 0.3s;
+ animation-delay: 0.3s;
+}
+
+.sk-spinner-cube-grid .sk-cube:nth-child(7) {
+ -webkit-animation-delay: 0s;
+ animation-delay: 0s;
+}
+
+.sk-spinner-cube-grid .sk-cube:nth-child(8) {
+ -webkit-animation-delay: 0.1s;
+ animation-delay: 0.1s;
+}
+
+.sk-spinner-cube-grid .sk-cube:nth-child(9) {
+ -webkit-animation-delay: 0.2s;
+ animation-delay: 0.2s;
+}
+
+@-webkit-keyframes sk-cubeGridScaleDelay {
+ 0%,
+ 70%,
+ 100% {
+ -webkit-transform: scale3D(1, 1, 1);
+ transform: scale3D(1, 1, 1);
+ }
+ 35% {
+ -webkit-transform: scale3D(0, 0, 1);
+ transform: scale3D(0, 0, 1);
+ }
+}
+
+@keyframes sk-cubeGridScaleDelay {
+ 0%,
+ 70%,
+ 100% {
+ -webkit-transform: scale3D(1, 1, 1);
+ transform: scale3D(1, 1, 1);
+ }
+ 35% {
+ -webkit-transform: scale3D(0, 0, 1);
+ transform: scale3D(0, 0, 1);
+ }
+}
+
+
+/*
+ * Usage:
+ *
+ * <div class="sk-spinner sk-spinner-wordpress">
+ * <span class="sk-inner-circle"></span>
+ * </div>
+ *
+ */
+
+.sk-spinner-wordpress.sk-spinner {
+ background-color: #1ab394;
+ width: 30px;
+ height: 30px;
+ border-radius: 30px;
+ position: relative;
+ margin: 0 auto;
+ -webkit-animation: sk-innerCircle 1s linear infinite;
+ animation: sk-innerCircle 1s linear infinite;
+}
+
+.sk-spinner-wordpress .sk-inner-circle {
+ display: block;
+ background-color: #fff;
+ width: 8px;
+ height: 8px;
+ position: absolute;
+ border-radius: 8px;
+ top: 5px;
+ left: 5px;
+}
+
+@-webkit-keyframes sk-innerCircle {
+ 0% {
+ -webkit-transform: rotate(0);
+ transform: rotate(0);
+ }
+ 100% {
+ -webkit-transform: rotate(360deg);
+ transform: rotate(360deg);
+ }
+}
+
+@keyframes sk-innerCircle {
+ 0% {
+ -webkit-transform: rotate(0);
+ transform: rotate(0);
+ }
+ 100% {
+ -webkit-transform: rotate(360deg);
+ transform: rotate(360deg);
+ }
+}
+
+
+/*
+ * Usage:
+ *
+ * <div class="sk-spinner sk-spinner-fading-circle">
+ * <div class="sk-circle1 sk-circle"></div>
+ * <div class="sk-circle2 sk-circle"></div>
+ * <div class="sk-circle3 sk-circle"></div>
+ * <div class="sk-circle4 sk-circle"></div>
+ * <div class="sk-circle5 sk-circle"></div>
+ * <div class="sk-circle6 sk-circle"></div>
+ * <div class="sk-circle7 sk-circle"></div>
+ * <div class="sk-circle8 sk-circle"></div>
+ * <div class="sk-circle9 sk-circle"></div>
+ * <div class="sk-circle10 sk-circle"></div>
+ * <div class="sk-circle11 sk-circle"></div>
+ * <div class="sk-circle12 sk-circle"></div>
+ * </div>
+ *
+ */
+
+.sk-spinner-fading-circle.sk-spinner {
+ margin: 0 auto;
+ width: 22px;
+ height: 22px;
+ position: relative;
+}
+
+.sk-spinner-fading-circle .sk-circle {
+ width: 100%;
+ height: 100%;
+ position: absolute;
+ left: 0;
+ top: 0;
+}
+
+.sk-spinner-fading-circle .sk-circle:before {
+ content: '';
+ display: block;
+ margin: 0 auto;
+ width: 18%;
+ height: 18%;
+ background-color: #1ab394;
+ border-radius: 100%;
+ -webkit-animation: sk-circleFadeDelay 1.2s infinite ease-in-out;
+ animation: sk-circleFadeDelay 1.2s infinite ease-in-out;
+ /* Prevent first frame from flickering when animation starts */
+ -webkit-animation-fill-mode: both;
+ animation-fill-mode: both;
+}
+
+.sk-spinner-fading-circle .sk-circle2 {
+ -webkit-transform: rotate(30deg);
+ -ms-transform: rotate(30deg);
+ transform: rotate(30deg);
+}
+
+.sk-spinner-fading-circle .sk-circle3 {
+ -webkit-transform: rotate(60deg);
+ -ms-transform: rotate(60deg);
+ transform: rotate(60deg);
+}
+
+.sk-spinner-fading-circle .sk-circle4 {
+ -webkit-transform: rotate(90deg);
+ -ms-transform: rotate(90deg);
+ transform: rotate(90deg);
+}
+
+.sk-spinner-fading-circle .sk-circle5 {
+ -webkit-transform: rotate(120deg);
+ -ms-transform: rotate(120deg);
+ transform: rotate(120deg);
+}
+
+.sk-spinner-fading-circle .sk-circle6 {
+ -webkit-transform: rotate(150deg);
+ -ms-transform: rotate(150deg);
+ transform: rotate(150deg);
+}
+
+.sk-spinner-fading-circle .sk-circle7 {
+ -webkit-transform: rotate(180deg);
+ -ms-transform: rotate(180deg);
+ transform: rotate(180deg);
+}
+
+.sk-spinner-fading-circle .sk-circle8 {
+ -webkit-transform: rotate(210deg);
+ -ms-transform: rotate(210deg);
+ transform: rotate(210deg);
+}
+
+.sk-spinner-fading-circle .sk-circle9 {
+ -webkit-transform: rotate(240deg);
+ -ms-transform: rotate(240deg);
+ transform: rotate(240deg);
+}
+
+.sk-spinner-fading-circle .sk-circle10 {
+ -webkit-transform: rotate(270deg);
+ -ms-transform: rotate(270deg);
+ transform: rotate(270deg);
+}
+
+.sk-spinner-fading-circle .sk-circle11 {
+ -webkit-transform: rotate(300deg);
+ -ms-transform: rotate(300deg);
+ transform: rotate(300deg);
+}
+
+.sk-spinner-fading-circle .sk-circle12 {
+ -webkit-transform: rotate(330deg);
+ -ms-transform: rotate(330deg);
+ transform: rotate(330deg);
+}
+
+.sk-spinner-fading-circle .sk-circle2:before {
+ -webkit-animation-delay: -1.1s;
+ animation-delay: -1.1s;
+}
+
+.sk-spinner-fading-circle .sk-circle3:before {
+ -webkit-animation-delay: -1s;
+ animation-delay: -1s;
+}
+
+.sk-spinner-fading-circle .sk-circle4:before {
+ -webkit-animation-delay: -0.9s;
+ animation-delay: -0.9s;
+}
+
+.sk-spinner-fading-circle .sk-circle5:before {
+ -webkit-animation-delay: -0.8s;
+ animation-delay: -0.8s;
+}
+
+.sk-spinner-fading-circle .sk-circle6:before {
+ -webkit-animation-delay: -0.7s;
+ animation-delay: -0.7s;
+}
+
+.sk-spinner-fading-circle .sk-circle7:before {
+ -webkit-animation-delay: -0.6s;
+ animation-delay: -0.6s;
+}
+
+.sk-spinner-fading-circle .sk-circle8:before {
+ -webkit-animation-delay: -0.5s;
+ animation-delay: -0.5s;
+}
+
+.sk-spinner-fading-circle .sk-circle9:before {
+ -webkit-animation-delay: -0.4s;
+ animation-delay: -0.4s;
+}
+
+.sk-spinner-fading-circle .sk-circle10:before {
+ -webkit-animation-delay: -0.3s;
+ animation-delay: -0.3s;
+}
+
+.sk-spinner-fading-circle .sk-circle11:before {
+ -webkit-animation-delay: -0.2s;
+ animation-delay: -0.2s;
+}
+
+.sk-spinner-fading-circle .sk-circle12:before {
+ -webkit-animation-delay: -0.1s;
+ animation-delay: -0.1s;
+}
+
+@-webkit-keyframes sk-circleFadeDelay {
+ 0%,
+ 39%,
+ 100% {
+ opacity: 0;
+ }
+ 40% {
+ opacity: 1;
+ }
+}
+
+@keyframes sk-circleFadeDelay {
+ 0%,
+ 39%,
+ 100% {
+ opacity: 0;
+ }
+ 40% {
+ opacity: 1;
+ }
+}
+
+body.rtls {
+ /* Theme config */
+}
+
+body.rtls #page-wrapper {
+ margin: 0 220px 0 0;
+}
+
+body.rtls .nav-second-level li a {
+ padding: 7px 35px 7px 10px;
+}
+
+body.rtls .ibox-title h5 {
+ float: right;
+}
+
+body.rtls .pull-right {
+ float: left !important;
+}
+
+body.rtls .pull-left {
+ float: right !important;
+}
+
+body.rtls .ibox-tools {
+ float: left;
+}
+
+body.rtls .stat-percent {
+ float: left;
+}
+
+body.rtls .navbar-right {
+ float: left !important;
+}
+
+body.rtls .navbar-top-links li:last-child {
+ margin-left: 40px;
+ margin-right: 0;
+}
+
+body.rtls .minimalize-styl-2 {
+ float: right;
+ margin: 14px 20px 5px 5px;
+}
+
+body.rtls .feed-element > .pull-left {
+ margin-left: 10px;
+ margin-right: 0;
+}
+
+body.rtls .timeline-item .date {
+ text-align: left;
+}
+
+body.rtls .timeline-item .date i {
+ left: 0;
+ right: auto;
+}
+
+body.rtls .timeline-item .content {
+ border-right: 1px solid #e7eaec;
+ border-left: none;
+}
+
+body.rtls .toast-close-button {
+ float: left;
+}
+
+body.rtls #toast-container > .toast:before {
+ margin: auto -1.5em auto 0.5em;
+}
+
+body.rtls #toast-container > div {
+ padding: 15px 50px 15px 15px;
+}
+
+body.rtls .center-orientation .vertical-timeline-icon i {
+ margin-left: 0;
+ margin-right: -12px;
+}
+
+body.rtls .vertical-timeline-icon i {
+ right: 50%;
+ left: auto;
+ margin-left: auto;
+ margin-right: -12px;
+}
+
+body.rtls .file-box {
+ float: right;
+}
+
+body.rtls ul.notes li {
+ float: right;
+}
+
+body.rtls .chat-users,
+body.rtls .chat-statistic {
+ margin-right: -30px;
+ margin-left: auto;
+}
+
+body.rtls .dropdown-menu > li > a {
+ text-align: right;
+}
+
+body.rtls .b-r {
+ border-left: 1px solid #e7eaec;
+ border-right: none;
+}
+
+body.rtls .dd-list .dd-list {
+ padding-right: 30px;
+ padding-left: 0;
+}
+
+body.rtls .dd-item > button {
+ float: right;
+}
+
+body.rtls .skin-setttings {
+ margin-right: 40px;
+ margin-left: 0;
+}
+
+body.rtls .skin-setttings {
+ direction: ltr;
+}
+
+body.rtls .footer.fixed {
+ margin-right: 220px;
+ margin-left: 0;
+}
+
+@media (max-width: 992px) {
+ body.rtls .chat-users,
+ body.rtls .chat-statistic {
+ margin-right: 0px;
+ }
+}
+
+body.rtls.mini-navbar .footer.fixed,
+body.body-small.mini-navbar .footer.fixed {
+ margin: 0 70px 0 0;
+}
+
+body.rtls.mini-navbar.fixed-sidebar .footer.fixed,
+body.body-small.mini-navbar .footer.fixed {
+ margin: 0 0 0 0;
+}
+
+body.rtls.top-navigation .navbar-toggle {
+ float: right;
+ margin-left: 15px;
+ margin-right: 15px;
+}
+
+.body-small.rtls.top-navigation .navbar-header {
+ float: none;
+}
+
+body.rtls.top-navigation #page-wrapper {
+ margin: 0;
+}
+
+body.rtls.mini-navbar #page-wrapper {
+ margin: 0 70px 0 0;
+}
+
+body.rtls.mini-navbar.fixed-sidebar #page-wrapper {
+ margin: 0 0 0 0;
+}
+
+body.rtls.body-small.fixed-sidebar.mini-navbar #page-wrapper {
+ margin: 0 220px 0 0;
+}
+
+body.rtls.body-small.fixed-sidebar.mini-navbar .navbar-static-side {
+ width: 220px;
+}
+
+.body-small.rtls .navbar-fixed-top {
+ margin-right: 0px;
+}
+
+.body-small.rtls .navbar-header {
+ float: right;
+}
+
+body.rtls .navbar-top-links li:last-child {
+ margin-left: 20px;
+}
+
+body.rtls .top-navigation #page-wrapper,
+body.rtls.mini-navbar .top-navigation #page-wrapper,
+body.rtls.mini-navbar.top-navigation #page-wrapper {
+ margin: 0;
+}
+
+body.rtls .top-navigation .footer.fixed,
+body.rtls.top-navigation .footer.fixed {
+ margin: 0;
+}
+
+@media (max-width: 768px) {
+ body.rtls .navbar-top-links li:last-child {
+ margin-left: 20px;
+ }
+ .body-small.rtls #page-wrapper {
+ position: inherit;
+ margin: 0 0 0 0px;
+ min-height: 1000px;
+ }
+ .body-small.rtls .navbar-static-side {
+ display: none;
+ z-index: 2001;
+ position: absolute;
+ width: 70px;
+ }
+ .body-small.rtls.mini-navbar .navbar-static-side {
+ display: block;
+ }
+ .rtls.fixed-sidebar.body-small .navbar-static-side {
+ display: none;
+ z-index: 2001;
+ position: fixed;
+ width: 220px;
+ }
+ .rtls.fixed-sidebar.body-small.mini-navbar .navbar-static-side {
+ display: block;
+ }
+}
+
+.rtls .ltr-support {
+ direction: ltr;
+}
+
+
+/*
+ *
+ * This is style for skin config
+ * Use only in demo theme
+ *
+*/
+
+.skin-setttings .title {
+ background: #efefef;
+ text-align: center;
+ text-transform: uppercase;
+ font-weight: 600;
+ display: block;
+ padding: 10px 15px;
+ font-size: 12px;
+}
+
+.setings-item {
+ padding: 10px 30px;
+}
+
+.setings-item.nb {
+ border: none;
+}
+
+.setings-item.skin {
+ text-align: center;
+}
+
+.setings-item .switch {
+ float: right;
+}
+
+.skin-name a {
+ text-transform: uppercase;
+}
+
+.setings-item a {
+ color: #fff;
+}
+
+.default-skin,
+.blue-skin,
+.ultra-skin,
+.yellow-skin {
+ text-align: center;
+}
+
+.default-skin {
+ font-weight: 600;
+ background: #1ab394;
+}
+
+.default-skin:hover {
+ background: #199d82;
+}
+
+.blue-skin {
+ font-weight: 600;
+ background: url("patterns/header-profile-skin-1.png") repeat scroll 0 0;
+}
+
+.blue-skin:hover {
+ background: #0d8ddb;
+}
+
+.yellow-skin {
+ font-weight: 600;
+ background: url("patterns/header-profile-skin-3.png") repeat scroll 0 100%;
+}
+
+.yellow-skin:hover {
+ background: #ce8735;
+}
+
+.content-tabs {
+ border-bottom: solid 2px #2f4050;
+}
+
+.page-tabs a {
+ color: #999;
+}
+
+.page-tabs a i {
+ color: #ccc;
+}
+
+.page-tabs a.active {
+ background: #2f4050;
+ color: #a7b1c2;
+}
+
+.page-tabs a.active:hover,
+.page-tabs a.active i:hover {
+ background: #293846;
+ color: #fff;
+}
+
+
+/*
+ *
+ * SKIN 1 - H+ - 后台主题UI框架
+ * NAME - Blue light
+ *
+*/
+
+.skin-1 .minimalize-styl-2 {
+ margin: 14px 5px 5px 30px;
+}
+
+.skin-1 .navbar-top-links li:last-child {
+ margin-right: 30px;
+}
+
+.skin-1.fixed-nav .minimalize-styl-2 {
+ margin: 14px 5px 5px 15px;
+}
+
+.skin-1 .spin-icon {
+ background: #0e9aef !important;
+}
+
+.skin-1 .nav-header {
+ background: #0e9aef;
+ background: url('patterns/header-profile-skin-1.png');
+}
+
+.skin-1.mini-navbar .nav-second-level {
+ background: #3e495f;
+}
+
+.skin-1 .breadcrumb {
+ background: transparent;
+}
+
+.skin-1 .page-heading {
+ border: none;
+}
+
+.skin-1 .nav > li.active {
+ background: #3a4459;
+}
+
+.skin-1 .nav > li > a {
+ color: #9ea6b9;
+}
+
+.skin-1 .nav > li.active > a {
+ color: #fff;
+}
+
+.skin-1 .navbar-minimalize {
+ background: #0e9aef;
+ border-color: #0e9aef;
+}
+
+body.skin-1 {
+ background: #3e495f;
+}
+
+.skin-1 .navbar-static-top {
+ background: #ffffff;
+}
+
+.skin-1 .dashboard-header {
+ background: transparent;
+ border-bottom: none !important;
+ border-top: none;
+ padding: 20px 30px 10px 30px;
+}
+
+.fixed-nav.skin-1 .navbar-fixed-top {
+ background: #fff;
+}
+
+.skin-1 .wrapper-content {
+ padding: 30px 15px;
+}
+
+.skin-1 #page-wrapper {
+ background: #f4f6fa;
+}
+
+.skin-1 .ibox-title,
+.skin-1 .ibox-content {
+ border-width: 1px;
+}
+
+.skin-1 .ibox-content:last-child {
+ border-style: solid solid solid solid;
+}
+
+.skin-1 .nav > li.active {
+ border: none;
+}
+
+.skin-1 .nav-header {
+ padding: 35px 25px 25px 25px;
+}
+
+.skin-1 .nav-header a.dropdown-toggle {
+ color: #fff;
+ margin-top: 10px;
+}
+
+.skin-1 .nav-header a.dropdown-toggle .text-muted {
+ color: #fff;
+ opacity: 0.8;
+}
+
+.skin-1 .profile-element {
+ text-align: center;
+}
+
+.skin-1 .img-circle {
+ border-radius: 5px;
+}
+
+.skin-1 .navbar-default .nav > li > a:hover,
+.skin-1 .navbar-default .nav > li > a:focus {
+ background: #39aef5;
+ color: #fff;
+}
+
+.skin-1 .nav.nav-tabs > li.active > a {
+ color: #555;
+}
+
+.skin-1 .content-tabs {
+ border-bottom: solid 2px #39aef5;
+}
+
+.skin-1 .nav.nav-tabs > li.active {
+ background: transparent;
+}
+
+.skin-1 .page-tabs a.active {
+ background: #39aef5;
+ color: #fff;
+}
+
+.skin-1 .page-tabs a.active:hover,
+.skin-1 .page-tabs a.active i:hover {
+ background: #0e9aef;
+ color: #fff;
+}
+
+
+/*
+ *
+ * SKIN 3 - H+ - 后台主题UI框架
+ * NAME - Yellow/purple
+ *
+*/
+
+.skin-3 .minimalize-styl-2 {
+ margin: 14px 5px 5px 30px;
+}
+
+.skin-3 .navbar-top-links li:last-child {
+ margin-right: 30px;
+}
+
+.skin-3.fixed-nav .minimalize-styl-2 {
+ margin: 14px 5px 5px 15px;
+}
+
+.skin-3 .spin-icon {
+ background: #ecba52 !important;
+}
+
+body.boxed-layout.skin-3 #wrapper {
+ background: #3e2c42;
+}
+
+.skin-3 .nav-header {
+ background: #ecba52;
+ background: url('patterns/header-profile-skin-3.png');
+}
+
+.skin-3.mini-navbar .nav-second-level {
+ background: #3e2c42;
+}
+
+.skin-3 .breadcrumb {
+ background: transparent;
+}
+
+.skin-3 .page-heading {
+ border: none;
+}
+
+.skin-3 .nav > li.active {
+ background: #38283c;
+}
+
+.fixed-nav.skin-3 .navbar-fixed-top {
+ background: #fff;
+}
+
+.skin-3 .nav > li > a {
+ color: #948b96;
+}
+
+.skin-3 .nav > li.active > a {
+ color: #fff;
+}
+
+.skin-3 .navbar-minimalize {
+ background: #ecba52;
+ border-color: #ecba52;
+}
+
+body.skin-3 {
+ background: #3e2c42;
+}
+
+.skin-3 .navbar-static-top {
+ background: #ffffff;
+}
+
+.skin-3 .dashboard-header {
+ background: transparent;
+ border-bottom: none !important;
+ border-top: none;
+ padding: 20px 30px 10px 30px;
+}
+
+.skin-3 .wrapper-content {
+ padding: 30px 15px;
+}
+
+.skin-3 #page-wrapper {
+ background: #f4f6fa;
+}
+
+.skin-3 .ibox-title,
+.skin-3 .ibox-content {
+ border-width: 1px;
+}
+
+.skin-3 .ibox-content:last-child {
+ border-style: solid solid solid solid;
+}
+
+.skin-3 .nav > li.active {
+ border: none;
+}
+
+.skin-3 .nav-header {
+ padding: 35px 25px 25px 25px;
+}
+
+.skin-3 .nav-header a.dropdown-toggle {
+ color: #fff;
+ margin-top: 10px;
+}
+
+.skin-3 .nav-header a.dropdown-toggle .text-muted {
+ color: #fff;
+ opacity: 0.8;
+}
+
+.skin-3 .profile-element {
+ text-align: center;
+}
+
+.skin-3 .img-circle {
+ border-radius: 5px;
+}
+
+.skin-3 .navbar-default .nav > li > a:hover,
+.skin-3 .navbar-default .nav > li > a:focus {
+ background: #38283c;
+ color: #fff;
+}
+
+.skin-3 .nav.nav-tabs > li.active > a {
+ color: #555;
+}
+
+.skin-3 .nav.nav-tabs > li.active {
+ background: transparent;
+}
+
+.skin-3 .content-tabs {
+ border-bottom: solid 2px #3e2c42;
+}
+
+.skin-3 .nav.nav-tabs > li.active {
+ background: transparent;
+}
+
+.skin-3 .page-tabs a.active {
+ background: #3e2c42;
+ color: #fff;
+}
+
+.skin-3 .page-tabs a.active:hover,
+.skin-3 .page-tabs a.active i:hover {
+ background: #38283c;
+ color: #fff;
+}
+
+@media (min-width: 768px) {
+ .navbar-top-links .dropdown-messages,
+ .navbar-top-links .dropdown-tasks,
+ .navbar-top-links .dropdown-alerts {
+ margin-left: auto;
+ }
+}
+
+@media (max-width: 768px) {
+ body.fixed-sidebar .navbar-static-side {
+ display: none;
+ }
+ body.fixed-sidebar.mini-navbar .navbar-static-side {
+ width: 70px;
+ }
+ .lock-word {
+ display: none;
+ }
+ .navbar-form-custom {
+ display: none;
+ }
+ .navbar-header {
+ display: inline;
+ float: left;
+ }
+ .sidebard-panel {
+ z-index: 2;
+ position: relative;
+ width: auto;
+ min-height: 100% !important;
+ }
+ .sidebar-content .wrapper {
+ padding-right: 0px;
+ z-index: 1;
+ }
+ .fixed-sidebar.body-small .navbar-static-side {
+ display: none;
+ z-index: 2001;
+ position: fixed;
+ width: 220px;
+ }
+ .fixed-sidebar.body-small.mini-navbar .navbar-static-side {
+ display: block;
+ }
+ .ibox-tools {
+ float: none;
+ text-align: right;
+ display: block;
+ }
+ .content-tabs {
+ display: none;
+ }
+ #content-main {
+ height: calc(100% - 100px);
+ }
+ .fixed-nav #content-main {
+ height: calc(100% - 38px);
+ }
+}
+
+.navbar-static-side {
+ background: #2f4050;
+}
+
+.nav-close {
+ padding: 10px;
+ display: block;
+ position: absolute;
+ right: 5px;
+ top: 5px;
+ font-size: 1.4em;
+ cursor: pointer;
+ z-index: 10;
+ display: none;
+ color: rgba(255, 255, 255, .3);
+}
+
+@media (max-width: 350px) {
+ body.fixed-sidebar.mini-navbar .navbar-static-side {
+ width: 0;
+ }
+ .nav-close {
+ display: block;
+ }
+ #page-wrapper {
+ margin-left: 0!important;
+ }
+ .timeline-item .date {
+ text-align: left;
+ width: 110px;
+ position: relative;
+ padding-top: 30px;
+ }
+ .timeline-item .date i {
+ position: absolute;
+ top: 0;
+ left: 15px;
+ padding: 5px;
+ width: 30px;
+ text-align: center;
+ border: 1px solid #e7eaec;
+ background: #f8f8f8;
+ }
+ .timeline-item .content {
+ border-left: none;
+ border-top: 1px solid #e7eaec;
+ padding-top: 10px;
+ min-height: 100px;
+ }
+ .nav.navbar-top-links li.dropdown {
+ display: none;
+ }
+ .ibox-tools {
+ float: none;
+ text-align: left;
+ display: inline-block;
+ }
+}
+
+
+/*JQGRID*/
+
+.ui-jqgrid-titlebar {
+ height: 40px;
+ line-height: 24px;
+ color: #676a6c;
+ background-color: #F9F9F9;
+ text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5);
+}
+
+.ui-jqgrid .ui-jqgrid-title {
+ float: left;
+ margin-left: 5px;
+ font-weight: 700;
+}
+
+.ui-jqgrid .ui-jqgrid-titlebar {
+ position: relative;
+ border-left: 0px solid;
+ border-right: 0px solid;
+ border-top: 0px solid;
+}
+
+
+/* Social feed */
+
+.social-feed-separated .social-feed-box {
+ margin-left: 62px;
+}
+
+.social-feed-separated .social-avatar {
+ float: left;
+ padding: 0;
+}
+
+.social-feed-separated .social-avatar img {
+ width: 52px;
+ height: 52px;
+ border: 1px solid #e7eaec;
+}
+
+.social-feed-separated .social-feed-box .social-avatar {
+ padding: 15px 15px 0 15px;
+ float: none;
+}
+
+.social-feed-box {
+ /*padding: 15px;*/
+ border: 1px solid #e7eaec;
+ background: #fff;
+ margin-bottom: 15px;
+}
+
+.article .social-feed-box {
+ margin-bottom: 0;
+ border-bottom: none;
+}
+
+.article .social-feed-box:last-child {
+ margin-bottom: 0;
+ border-bottom: 1px solid #e7eaec;
+}
+
+.article .social-feed-box p {
+ font-size: 13px;
+ line-height: 18px;
+}
+
+.social-action {
+ margin: 15px;
+}
+
+.social-avatar {
+ padding: 15px 15px 0 15px;
+}
+
+.social-comment .social-comment {
+ margin-left: 45px;
+}
+
+.social-avatar img {
+ height: 40px;
+ width: 40px;
+ margin-right: 10px;
+}
+
+.social-avatar .media-body a {
+ font-size: 14px;
+ display: block;
+}
+
+.social-body {
+ padding: 15px;
+}
+
+.social-body img {
+ margin-bottom: 10px;
+}
+
+.social-footer {
+ border-top: 1px solid #e7eaec;
+ padding: 10px 15px;
+ background: #f9f9f9;
+}
+
+.social-footer .social-comment img {
+ width: 32px;
+ margin-right: 10px;
+}
+
+.social-comment:first-child {
+ margin-top: 0;
+}
+
+.social-comment {
+ margin-top: 15px;
+}
+
+.social-comment textarea {
+ font-size: 12px;
+}
+
+.checkbox input[type=checkbox],
+.checkbox-inline input[type=checkbox],
+.radio input[type=radio],
+.radio-inline input[type=radio] {
+ margin-top: -4px;
+}
+
+
+/* Only demo */
+
+@media (max-width: 1000px) {
+ .welcome-message {
+ display: none;
+ }
+}
+
+
+/* ECHARTS */
+
+.echarts {
+ height: 240px;
+}
+
+.checkbox-inline,
+.radio-inline,
+.checkbox-inline+.checkbox-inline,
+.radio-inline+.radio-inline {
+ margin: 0 15px 0 0;
+}
+
+.navbar-toggle {
+ background-color: #fff;
+}
+
+.J_menuTab {
+ -webkit-transition: all .3s ease-out 0s;
+ transition: all .3s ease-out 0s;
+}
+
+::-webkit-scrollbar-track {
+ background-color: #F5F5F5;
+}
+
+::-webkit-scrollbar {
+ width: 6px;
+ background-color: #F5F5F5;
+}
+
+::-webkit-scrollbar-thumb {
+ background-color: #999;
+}
+
+
+/*GO HOME*/
+
+.gohome {
+ position: fixed;
+ top: 20px;
+ right: 20px;
+ z-index: 100;
+}
+
+.gohome a {
+ height: 38px;
+ width: 38px;
+ display: block;
+ background: #2f4050;
+ padding: 9px 8px;
+ text-align: center;
+ color: #fff;
+ border-radius: 50%;
+ opacity: .5;
+}
+
+.gohome a:hover {
+ opacity: 1;
+}
+
+@media only screen and (-webkit-min-device-pixel-ratio : 2){
+ #content-main {
+ -webkit-overflow-scrolling: touch;
+ }
+}
+
+.navbar-header {
+ width: 60%;
+}
+
+.bs-glyphicons {
+ margin: 0 -10px 20px;
+ overflow: hidden
+}
+
+.bs-glyphicons-list {
+ padding-left: 0;
+ list-style: none
+}
+
+.bs-glyphicons li {
+ float: left;
+ width: 25%;
+ height: 115px;
+ padding: 10px;
+ font-size: 10px;
+ line-height: 1.4;
+ text-align: center;
+ background-color: #f9f9f9;
+ border: 1px solid #fff
+}
+
+.bs-glyphicons .glyphicon {
+ margin-top: 5px;
+ margin-bottom: 10px;
+ font-size: 24px
+}
+
+.bs-glyphicons .glyphicon-class {
+ display: block;
+ text-align: center;
+ word-wrap: break-word
+}
+
+.bs-glyphicons li:hover {
+ color: #fff;
+ background-color: #1ab394;
+}
+
+@media (min-width: 768px) {
+ .bs-glyphicons {
+ margin-right: 0;
+ margin-left: 0
+ }
+ .bs-glyphicons li {
+ width: 12.5%;
+ font-size: 12px
+ }
+}
+
+.tab-menu-selected {
+ background-color: #293846 !important;
+ color: white !important;
+}
\ No newline at end of file
diff --git a/management/guns-admin/src/main/webapp/static/favicon.ico b/management/guns-admin/src/main/webapp/static/favicon.ico
new file mode 100644
index 0000000..a1a957e
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/static/favicon.ico
Binary files differ
diff --git a/management/guns-admin/src/main/webapp/static/favicon1.ico b/management/guns-admin/src/main/webapp/static/favicon1.ico
new file mode 100644
index 0000000..f628e5d
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/static/favicon1.ico
Binary files differ
diff --git a/management/guns-admin/src/main/webapp/static/fonts/FontAwesome.otf b/management/guns-admin/src/main/webapp/static/fonts/FontAwesome.otf
new file mode 100644
index 0000000..681bdd4
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/static/fonts/FontAwesome.otf
Binary files differ
diff --git a/management/guns-admin/src/main/webapp/static/fonts/fontawesome-webfont.eot b/management/guns-admin/src/main/webapp/static/fonts/fontawesome-webfont.eot
new file mode 100644
index 0000000..a30335d
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/static/fonts/fontawesome-webfont.eot
Binary files differ
diff --git a/management/guns-admin/src/main/webapp/static/fonts/fontawesome-webfont.svg b/management/guns-admin/src/main/webapp/static/fonts/fontawesome-webfont.svg
new file mode 100644
index 0000000..6c5bb76
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/static/fonts/fontawesome-webfont.svg
@@ -0,0 +1,640 @@
+<?xml version="1.0" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" >
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1">
+<metadata></metadata>
+<defs>
+<font id="fontawesomeregular" horiz-adv-x="1536" >
+<font-face units-per-em="1792" ascent="1536" descent="-256" />
+<missing-glyph horiz-adv-x="448" />
+<glyph unicode=" " horiz-adv-x="448" />
+<glyph unicode="	" horiz-adv-x="448" />
+<glyph unicode=" " horiz-adv-x="448" />
+<glyph unicode="¨" horiz-adv-x="1792" />
+<glyph unicode="©" horiz-adv-x="1792" />
+<glyph unicode="®" horiz-adv-x="1792" />
+<glyph unicode="´" horiz-adv-x="1792" />
+<glyph unicode="Æ" horiz-adv-x="1792" />
+<glyph unicode="Ø" horiz-adv-x="1792" />
+<glyph unicode=" " horiz-adv-x="768" />
+<glyph unicode=" " horiz-adv-x="1537" />
+<glyph unicode=" " horiz-adv-x="768" />
+<glyph unicode=" " horiz-adv-x="1537" />
+<glyph unicode=" " horiz-adv-x="512" />
+<glyph unicode=" " horiz-adv-x="384" />
+<glyph unicode=" " horiz-adv-x="256" />
+<glyph unicode=" " horiz-adv-x="256" />
+<glyph unicode=" " horiz-adv-x="192" />
+<glyph unicode=" " horiz-adv-x="307" />
+<glyph unicode=" " horiz-adv-x="85" />
+<glyph unicode=" " horiz-adv-x="307" />
+<glyph unicode=" " horiz-adv-x="384" />
+<glyph unicode="™" horiz-adv-x="1792" />
+<glyph unicode="∞" horiz-adv-x="1792" />
+<glyph unicode="≠" horiz-adv-x="1792" />
+<glyph unicode="◼" horiz-adv-x="500" d="M0 0z" />
+<glyph unicode="" horiz-adv-x="1792" d="M1699 1350q0 -35 -43 -78l-632 -632v-768h320q26 0 45 -19t19 -45t-19 -45t-45 -19h-896q-26 0 -45 19t-19 45t19 45t45 19h320v768l-632 632q-43 43 -43 78q0 23 18 36.5t38 17.5t43 4h1408q23 0 43 -4t38 -17.5t18 -36.5z" />
+<glyph unicode="" d="M1536 1312v-1120q0 -50 -34 -89t-86 -60.5t-103.5 -32t-96.5 -10.5t-96.5 10.5t-103.5 32t-86 60.5t-34 89t34 89t86 60.5t103.5 32t96.5 10.5q105 0 192 -39v537l-768 -237v-709q0 -50 -34 -89t-86 -60.5t-103.5 -32t-96.5 -10.5t-96.5 10.5t-103.5 32t-86 60.5t-34 89 t34 89t86 60.5t103.5 32t96.5 10.5q105 0 192 -39v967q0 31 19 56.5t49 35.5l832 256q12 4 28 4q40 0 68 -28t28 -68z" />
+<glyph unicode="" horiz-adv-x="1664" d="M1152 704q0 185 -131.5 316.5t-316.5 131.5t-316.5 -131.5t-131.5 -316.5t131.5 -316.5t316.5 -131.5t316.5 131.5t131.5 316.5zM1664 -128q0 -52 -38 -90t-90 -38q-54 0 -90 38l-343 342q-179 -124 -399 -124q-143 0 -273.5 55.5t-225 150t-150 225t-55.5 273.5 t55.5 273.5t150 225t225 150t273.5 55.5t273.5 -55.5t225 -150t150 -225t55.5 -273.5q0 -220 -124 -399l343 -343q37 -37 37 -90z" />
+<glyph unicode="" horiz-adv-x="1792" d="M1664 32v768q-32 -36 -69 -66q-268 -206 -426 -338q-51 -43 -83 -67t-86.5 -48.5t-102.5 -24.5h-1h-1q-48 0 -102.5 24.5t-86.5 48.5t-83 67q-158 132 -426 338q-37 30 -69 66v-768q0 -13 9.5 -22.5t22.5 -9.5h1472q13 0 22.5 9.5t9.5 22.5zM1664 1083v11v13.5t-0.5 13 t-3 12.5t-5.5 9t-9 7.5t-14 2.5h-1472q-13 0 -22.5 -9.5t-9.5 -22.5q0 -168 147 -284q193 -152 401 -317q6 -5 35 -29.5t46 -37.5t44.5 -31.5t50.5 -27.5t43 -9h1h1q20 0 43 9t50.5 27.5t44.5 31.5t46 37.5t35 29.5q208 165 401 317q54 43 100.5 115.5t46.5 131.5z M1792 1120v-1088q0 -66 -47 -113t-113 -47h-1472q-66 0 -113 47t-47 113v1088q0 66 47 113t113 47h1472q66 0 113 -47t47 -113z" />
+<glyph unicode="" horiz-adv-x="1792" d="M896 -128q-26 0 -44 18l-624 602q-10 8 -27.5 26t-55.5 65.5t-68 97.5t-53.5 121t-23.5 138q0 220 127 344t351 124q62 0 126.5 -21.5t120 -58t95.5 -68.5t76 -68q36 36 76 68t95.5 68.5t120 58t126.5 21.5q224 0 351 -124t127 -344q0 -221 -229 -450l-623 -600 q-18 -18 -44 -18z" />
+<glyph unicode="" horiz-adv-x="1664" d="M1664 889q0 -22 -26 -48l-363 -354l86 -500q1 -7 1 -20q0 -21 -10.5 -35.5t-30.5 -14.5q-19 0 -40 12l-449 236l-449 -236q-22 -12 -40 -12q-21 0 -31.5 14.5t-10.5 35.5q0 6 2 20l86 500l-364 354q-25 27 -25 48q0 37 56 46l502 73l225 455q19 41 49 41t49 -41l225 -455 l502 -73q56 -9 56 -46z" />
+<glyph unicode="" horiz-adv-x="1664" d="M1137 532l306 297l-422 62l-189 382l-189 -382l-422 -62l306 -297l-73 -421l378 199l377 -199zM1664 889q0 -22 -26 -48l-363 -354l86 -500q1 -7 1 -20q0 -50 -41 -50q-19 0 -40 12l-449 236l-449 -236q-22 -12 -40 -12q-21 0 -31.5 14.5t-10.5 35.5q0 6 2 20l86 500 l-364 354q-25 27 -25 48q0 37 56 46l502 73l225 455q19 41 49 41t49 -41l225 -455l502 -73q56 -9 56 -46z" />
+<glyph unicode="" horiz-adv-x="1408" d="M1408 131q0 -120 -73 -189.5t-194 -69.5h-874q-121 0 -194 69.5t-73 189.5q0 53 3.5 103.5t14 109t26.5 108.5t43 97.5t62 81t85.5 53.5t111.5 20q9 0 42 -21.5t74.5 -48t108 -48t133.5 -21.5t133.5 21.5t108 48t74.5 48t42 21.5q61 0 111.5 -20t85.5 -53.5t62 -81 t43 -97.5t26.5 -108.5t14 -109t3.5 -103.5zM1088 1024q0 -159 -112.5 -271.5t-271.5 -112.5t-271.5 112.5t-112.5 271.5t112.5 271.5t271.5 112.5t271.5 -112.5t112.5 -271.5z" />
+<glyph unicode="" horiz-adv-x="1920" d="M384 -64v128q0 26 -19 45t-45 19h-128q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45t45 -19h128q26 0 45 19t19 45zM384 320v128q0 26 -19 45t-45 19h-128q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45t45 -19h128q26 0 45 19t19 45zM384 704v128q0 26 -19 45t-45 19h-128 q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45t45 -19h128q26 0 45 19t19 45zM1408 -64v512q0 26 -19 45t-45 19h-768q-26 0 -45 -19t-19 -45v-512q0 -26 19 -45t45 -19h768q26 0 45 19t19 45zM384 1088v128q0 26 -19 45t-45 19h-128q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45 t45 -19h128q26 0 45 19t19 45zM1792 -64v128q0 26 -19 45t-45 19h-128q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45t45 -19h128q26 0 45 19t19 45zM1408 704v512q0 26 -19 45t-45 19h-768q-26 0 -45 -19t-19 -45v-512q0 -26 19 -45t45 -19h768q26 0 45 19t19 45zM1792 320v128 q0 26 -19 45t-45 19h-128q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45t45 -19h128q26 0 45 19t19 45zM1792 704v128q0 26 -19 45t-45 19h-128q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45t45 -19h128q26 0 45 19t19 45zM1792 1088v128q0 26 -19 45t-45 19h-128q-26 0 -45 -19 t-19 -45v-128q0 -26 19 -45t45 -19h128q26 0 45 19t19 45zM1920 1248v-1344q0 -66 -47 -113t-113 -47h-1600q-66 0 -113 47t-47 113v1344q0 66 47 113t113 47h1600q66 0 113 -47t47 -113z" />
+<glyph unicode="" horiz-adv-x="1664" d="M768 512v-384q0 -52 -38 -90t-90 -38h-512q-52 0 -90 38t-38 90v384q0 52 38 90t90 38h512q52 0 90 -38t38 -90zM768 1280v-384q0 -52 -38 -90t-90 -38h-512q-52 0 -90 38t-38 90v384q0 52 38 90t90 38h512q52 0 90 -38t38 -90zM1664 512v-384q0 -52 -38 -90t-90 -38 h-512q-52 0 -90 38t-38 90v384q0 52 38 90t90 38h512q52 0 90 -38t38 -90zM1664 1280v-384q0 -52 -38 -90t-90 -38h-512q-52 0 -90 38t-38 90v384q0 52 38 90t90 38h512q52 0 90 -38t38 -90z" />
+<glyph unicode="" horiz-adv-x="1792" d="M512 288v-192q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h320q40 0 68 -28t28 -68zM512 800v-192q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h320q40 0 68 -28t28 -68zM1152 288v-192q0 -40 -28 -68t-68 -28h-320 q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h320q40 0 68 -28t28 -68zM512 1312v-192q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h320q40 0 68 -28t28 -68zM1152 800v-192q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v192q0 40 28 68t68 28 h320q40 0 68 -28t28 -68zM1792 288v-192q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h320q40 0 68 -28t28 -68zM1152 1312v-192q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h320q40 0 68 -28t28 -68zM1792 800v-192 q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h320q40 0 68 -28t28 -68zM1792 1312v-192q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h320q40 0 68 -28t28 -68z" />
+<glyph unicode="" horiz-adv-x="1792" d="M512 288v-192q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h320q40 0 68 -28t28 -68zM512 800v-192q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h320q40 0 68 -28t28 -68zM1792 288v-192q0 -40 -28 -68t-68 -28h-960 q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h960q40 0 68 -28t28 -68zM512 1312v-192q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h320q40 0 68 -28t28 -68zM1792 800v-192q0 -40 -28 -68t-68 -28h-960q-40 0 -68 28t-28 68v192q0 40 28 68t68 28 h960q40 0 68 -28t28 -68zM1792 1312v-192q0 -40 -28 -68t-68 -28h-960q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h960q40 0 68 -28t28 -68z" />
+<glyph unicode="" horiz-adv-x="1792" d="M1671 970q0 -40 -28 -68l-724 -724l-136 -136q-28 -28 -68 -28t-68 28l-136 136l-362 362q-28 28 -28 68t28 68l136 136q28 28 68 28t68 -28l294 -295l656 657q28 28 68 28t68 -28l136 -136q28 -28 28 -68z" />
+<glyph unicode="" horiz-adv-x="1408" d="M1298 214q0 -40 -28 -68l-136 -136q-28 -28 -68 -28t-68 28l-294 294l-294 -294q-28 -28 -68 -28t-68 28l-136 136q-28 28 -28 68t28 68l294 294l-294 294q-28 28 -28 68t28 68l136 136q28 28 68 28t68 -28l294 -294l294 294q28 28 68 28t68 -28l136 -136q28 -28 28 -68 t-28 -68l-294 -294l294 -294q28 -28 28 -68z" />
+<glyph unicode="" horiz-adv-x="1664" d="M1024 736v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-224v-224q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v224h-224q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h224v224q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5v-224h224 q13 0 22.5 -9.5t9.5 -22.5zM1152 704q0 185 -131.5 316.5t-316.5 131.5t-316.5 -131.5t-131.5 -316.5t131.5 -316.5t316.5 -131.5t316.5 131.5t131.5 316.5zM1664 -128q0 -53 -37.5 -90.5t-90.5 -37.5q-54 0 -90 38l-343 342q-179 -124 -399 -124q-143 0 -273.5 55.5 t-225 150t-150 225t-55.5 273.5t55.5 273.5t150 225t225 150t273.5 55.5t273.5 -55.5t225 -150t150 -225t55.5 -273.5q0 -220 -124 -399l343 -343q37 -37 37 -90z" />
+<glyph unicode="" horiz-adv-x="1664" d="M1024 736v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-576q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h576q13 0 22.5 -9.5t9.5 -22.5zM1152 704q0 185 -131.5 316.5t-316.5 131.5t-316.5 -131.5t-131.5 -316.5t131.5 -316.5t316.5 -131.5t316.5 131.5t131.5 316.5z M1664 -128q0 -53 -37.5 -90.5t-90.5 -37.5q-54 0 -90 38l-343 342q-179 -124 -399 -124q-143 0 -273.5 55.5t-225 150t-150 225t-55.5 273.5t55.5 273.5t150 225t225 150t273.5 55.5t273.5 -55.5t225 -150t150 -225t55.5 -273.5q0 -220 -124 -399l343 -343q37 -37 37 -90z " />
+<glyph unicode="" d="M1536 640q0 -156 -61 -298t-164 -245t-245 -164t-298 -61t-298 61t-245 164t-164 245t-61 298q0 182 80.5 343t226.5 270q43 32 95.5 25t83.5 -50q32 -42 24.5 -94.5t-49.5 -84.5q-98 -74 -151.5 -181t-53.5 -228q0 -104 40.5 -198.5t109.5 -163.5t163.5 -109.5 t198.5 -40.5t198.5 40.5t163.5 109.5t109.5 163.5t40.5 198.5q0 121 -53.5 228t-151.5 181q-42 32 -49.5 84.5t24.5 94.5q31 43 84 50t95 -25q146 -109 226.5 -270t80.5 -343zM896 1408v-640q0 -52 -38 -90t-90 -38t-90 38t-38 90v640q0 52 38 90t90 38t90 -38t38 -90z" />
+<glyph unicode="" horiz-adv-x="1792" d="M256 96v-192q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h192q14 0 23 -9t9 -23zM640 224v-320q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v320q0 14 9 23t23 9h192q14 0 23 -9t9 -23zM1024 480v-576q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23 v576q0 14 9 23t23 9h192q14 0 23 -9t9 -23zM1408 864v-960q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v960q0 14 9 23t23 9h192q14 0 23 -9t9 -23zM1792 1376v-1472q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v1472q0 14 9 23t23 9h192q14 0 23 -9t9 -23z" />
+<glyph unicode="" d="M1024 640q0 106 -75 181t-181 75t-181 -75t-75 -181t75 -181t181 -75t181 75t75 181zM1536 749v-222q0 -12 -8 -23t-20 -13l-185 -28q-19 -54 -39 -91q35 -50 107 -138q10 -12 10 -25t-9 -23q-27 -37 -99 -108t-94 -71q-12 0 -26 9l-138 108q-44 -23 -91 -38 q-16 -136 -29 -186q-7 -28 -36 -28h-222q-14 0 -24.5 8.5t-11.5 21.5l-28 184q-49 16 -90 37l-141 -107q-10 -9 -25 -9q-14 0 -25 11q-126 114 -165 168q-7 10 -7 23q0 12 8 23q15 21 51 66.5t54 70.5q-27 50 -41 99l-183 27q-13 2 -21 12.5t-8 23.5v222q0 12 8 23t19 13 l186 28q14 46 39 92q-40 57 -107 138q-10 12 -10 24q0 10 9 23q26 36 98.5 107.5t94.5 71.5q13 0 26 -10l138 -107q44 23 91 38q16 136 29 186q7 28 36 28h222q14 0 24.5 -8.5t11.5 -21.5l28 -184q49 -16 90 -37l142 107q9 9 24 9q13 0 25 -10q129 -119 165 -170q7 -8 7 -22 q0 -12 -8 -23q-15 -21 -51 -66.5t-54 -70.5q26 -50 41 -98l183 -28q13 -2 21 -12.5t8 -23.5z" />
+<glyph unicode="" horiz-adv-x="1408" d="M512 800v-576q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v576q0 14 9 23t23 9h64q14 0 23 -9t9 -23zM768 800v-576q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v576q0 14 9 23t23 9h64q14 0 23 -9t9 -23zM1024 800v-576q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v576 q0 14 9 23t23 9h64q14 0 23 -9t9 -23zM1152 76v948h-896v-948q0 -22 7 -40.5t14.5 -27t10.5 -8.5h832q3 0 10.5 8.5t14.5 27t7 40.5zM480 1152h448l-48 117q-7 9 -17 11h-317q-10 -2 -17 -11zM1408 1120v-64q0 -14 -9 -23t-23 -9h-96v-948q0 -83 -47 -143.5t-113 -60.5h-832 q-66 0 -113 58.5t-47 141.5v952h-96q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h309l70 167q15 37 54 63t79 26h320q40 0 79 -26t54 -63l70 -167h309q14 0 23 -9t9 -23z" />
+<glyph unicode="" horiz-adv-x="1664" d="M1408 544v-480q0 -26 -19 -45t-45 -19h-384v384h-256v-384h-384q-26 0 -45 19t-19 45v480q0 1 0.5 3t0.5 3l575 474l575 -474q1 -2 1 -6zM1631 613l-62 -74q-8 -9 -21 -11h-3q-13 0 -21 7l-692 577l-692 -577q-12 -8 -24 -7q-13 2 -21 11l-62 74q-8 10 -7 23.5t11 21.5 l719 599q32 26 76 26t76 -26l244 -204v195q0 14 9 23t23 9h192q14 0 23 -9t9 -23v-408l219 -182q10 -8 11 -21.5t-7 -23.5z" />
+<glyph unicode="" d="M1468 1156q28 -28 48 -76t20 -88v-1152q0 -40 -28 -68t-68 -28h-1344q-40 0 -68 28t-28 68v1600q0 40 28 68t68 28h896q40 0 88 -20t76 -48zM1024 1400v-376h376q-10 29 -22 41l-313 313q-12 12 -41 22zM1408 -128v1024h-416q-40 0 -68 28t-28 68v416h-768v-1536h1280z " />
+<glyph unicode="" d="M896 992v-448q0 -14 -9 -23t-23 -9h-320q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h224v352q0 14 9 23t23 9h64q14 0 23 -9t9 -23zM1312 640q0 148 -73 273t-198 198t-273 73t-273 -73t-198 -198t-73 -273t73 -273t198 -198t273 -73t273 73t198 198t73 273zM1536 640 q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+<glyph unicode="" horiz-adv-x="1920" d="M1111 540v4l-24 320q-1 13 -11 22.5t-23 9.5h-186q-13 0 -23 -9.5t-11 -22.5l-24 -320v-4q-1 -12 8 -20t21 -8h244q12 0 21 8t8 20zM1870 73q0 -73 -46 -73h-704q13 0 22 9.5t8 22.5l-20 256q-1 13 -11 22.5t-23 9.5h-272q-13 0 -23 -9.5t-11 -22.5l-20 -256 q-1 -13 8 -22.5t22 -9.5h-704q-46 0 -46 73q0 54 26 116l417 1044q8 19 26 33t38 14h339q-13 0 -23 -9.5t-11 -22.5l-15 -192q-1 -14 8 -23t22 -9h166q13 0 22 9t8 23l-15 192q-1 13 -11 22.5t-23 9.5h339q20 0 38 -14t26 -33l417 -1044q26 -62 26 -116z" />
+<glyph unicode="" horiz-adv-x="1664" d="M1280 192q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1536 192q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1664 416v-320q0 -40 -28 -68t-68 -28h-1472q-40 0 -68 28t-28 68v320q0 40 28 68t68 28h465l135 -136 q58 -56 136 -56t136 56l136 136h464q40 0 68 -28t28 -68zM1339 985q17 -41 -14 -70l-448 -448q-18 -19 -45 -19t-45 19l-448 448q-31 29 -14 70q17 39 59 39h256v448q0 26 19 45t45 19h256q26 0 45 -19t19 -45v-448h256q42 0 59 -39z" />
+<glyph unicode="" d="M1120 608q0 -12 -10 -24l-319 -319q-11 -9 -23 -9t-23 9l-320 320q-15 16 -7 35q8 20 30 20h192v352q0 14 9 23t23 9h192q14 0 23 -9t9 -23v-352h192q14 0 23 -9t9 -23zM768 1184q-148 0 -273 -73t-198 -198t-73 -273t73 -273t198 -198t273 -73t273 73t198 198t73 273 t-73 273t-198 198t-273 73zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+<glyph unicode="" d="M1118 660q-8 -20 -30 -20h-192v-352q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v352h-192q-14 0 -23 9t-9 23q0 12 10 24l319 319q11 9 23 9t23 -9l320 -320q15 -16 7 -35zM768 1184q-148 0 -273 -73t-198 -198t-73 -273t73 -273t198 -198t273 -73t273 73t198 198 t73 273t-73 273t-198 198t-273 73zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+<glyph unicode="" d="M1023 576h316q-1 3 -2.5 8t-2.5 8l-212 496h-708l-212 -496q-1 -2 -2.5 -8t-2.5 -8h316l95 -192h320zM1536 546v-482q0 -26 -19 -45t-45 -19h-1408q-26 0 -45 19t-19 45v482q0 62 25 123l238 552q10 25 36.5 42t52.5 17h832q26 0 52.5 -17t36.5 -42l238 -552 q25 -61 25 -123z" />
+<glyph unicode="" d="M1184 640q0 -37 -32 -55l-544 -320q-15 -9 -32 -9q-16 0 -32 8q-32 19 -32 56v640q0 37 32 56q33 18 64 -1l544 -320q32 -18 32 -55zM1312 640q0 148 -73 273t-198 198t-273 73t-273 -73t-198 -198t-73 -273t73 -273t198 -198t273 -73t273 73t198 198t73 273zM1536 640 q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+<glyph unicode="" d="M1536 1280v-448q0 -26 -19 -45t-45 -19h-448q-42 0 -59 40q-17 39 14 69l138 138q-148 137 -349 137q-104 0 -198.5 -40.5t-163.5 -109.5t-109.5 -163.5t-40.5 -198.5t40.5 -198.5t109.5 -163.5t163.5 -109.5t198.5 -40.5q119 0 225 52t179 147q7 10 23 12q14 0 25 -9 l137 -138q9 -8 9.5 -20.5t-7.5 -22.5q-109 -132 -264 -204.5t-327 -72.5q-156 0 -298 61t-245 164t-164 245t-61 298t61 298t164 245t245 164t298 61q147 0 284.5 -55.5t244.5 -156.5l130 129q29 31 70 14q39 -17 39 -59z" />
+<glyph unicode="" d="M1511 480q0 -5 -1 -7q-64 -268 -268 -434.5t-478 -166.5q-146 0 -282.5 55t-243.5 157l-129 -129q-19 -19 -45 -19t-45 19t-19 45v448q0 26 19 45t45 19h448q26 0 45 -19t19 -45t-19 -45l-137 -137q71 -66 161 -102t187 -36q134 0 250 65t186 179q11 17 53 117 q8 23 30 23h192q13 0 22.5 -9.5t9.5 -22.5zM1536 1280v-448q0 -26 -19 -45t-45 -19h-448q-26 0 -45 19t-19 45t19 45l138 138q-148 137 -349 137q-134 0 -250 -65t-186 -179q-11 -17 -53 -117q-8 -23 -30 -23h-199q-13 0 -22.5 9.5t-9.5 22.5v7q65 268 270 434.5t480 166.5 q146 0 284 -55.5t245 -156.5l130 129q19 19 45 19t45 -19t19 -45z" />
+<glyph unicode="" horiz-adv-x="1792" d="M384 352v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM384 608v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z M384 864v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM1536 352v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-960q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h960q13 0 22.5 -9.5t9.5 -22.5z M1536 608v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-960q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h960q13 0 22.5 -9.5t9.5 -22.5zM1536 864v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-960q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h960q13 0 22.5 -9.5 t9.5 -22.5zM1664 160v832q0 13 -9.5 22.5t-22.5 9.5h-1472q-13 0 -22.5 -9.5t-9.5 -22.5v-832q0 -13 9.5 -22.5t22.5 -9.5h1472q13 0 22.5 9.5t9.5 22.5zM1792 1248v-1088q0 -66 -47 -113t-113 -47h-1472q-66 0 -113 47t-47 113v1088q0 66 47 113t113 47h1472q66 0 113 -47 t47 -113z" />
+<glyph unicode="" horiz-adv-x="1152" d="M320 768h512v192q0 106 -75 181t-181 75t-181 -75t-75 -181v-192zM1152 672v-576q0 -40 -28 -68t-68 -28h-960q-40 0 -68 28t-28 68v576q0 40 28 68t68 28h32v192q0 184 132 316t316 132t316 -132t132 -316v-192h32q40 0 68 -28t28 -68z" />
+<glyph unicode="" horiz-adv-x="1792" d="M320 1280q0 -72 -64 -110v-1266q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v1266q-64 38 -64 110q0 53 37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1792 1216v-763q0 -25 -12.5 -38.5t-39.5 -27.5q-215 -116 -369 -116q-61 0 -123.5 22t-108.5 48 t-115.5 48t-142.5 22q-192 0 -464 -146q-17 -9 -33 -9q-26 0 -45 19t-19 45v742q0 32 31 55q21 14 79 43q236 120 421 120q107 0 200 -29t219 -88q38 -19 88 -19q54 0 117.5 21t110 47t88 47t54.5 21q26 0 45 -19t19 -45z" />
+<glyph unicode="" horiz-adv-x="1664" d="M1664 650q0 -166 -60 -314l-20 -49l-185 -33q-22 -83 -90.5 -136.5t-156.5 -53.5v-32q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v576q0 14 9 23t23 9h64q14 0 23 -9t9 -23v-32q71 0 130 -35.5t93 -95.5l68 12q29 95 29 193q0 148 -88 279t-236.5 209t-315.5 78 t-315.5 -78t-236.5 -209t-88 -279q0 -98 29 -193l68 -12q34 60 93 95.5t130 35.5v32q0 14 9 23t23 9h64q14 0 23 -9t9 -23v-576q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v32q-88 0 -156.5 53.5t-90.5 136.5l-185 33l-20 49q-60 148 -60 314q0 151 67 291t179 242.5 t266 163.5t320 61t320 -61t266 -163.5t179 -242.5t67 -291z" />
+<glyph unicode="" horiz-adv-x="768" d="M768 1184v-1088q0 -26 -19 -45t-45 -19t-45 19l-333 333h-262q-26 0 -45 19t-19 45v384q0 26 19 45t45 19h262l333 333q19 19 45 19t45 -19t19 -45z" />
+<glyph unicode="" horiz-adv-x="1152" d="M768 1184v-1088q0 -26 -19 -45t-45 -19t-45 19l-333 333h-262q-26 0 -45 19t-19 45v384q0 26 19 45t45 19h262l333 333q19 19 45 19t45 -19t19 -45zM1152 640q0 -76 -42.5 -141.5t-112.5 -93.5q-10 -5 -25 -5q-26 0 -45 18.5t-19 45.5q0 21 12 35.5t29 25t34 23t29 35.5 t12 57t-12 57t-29 35.5t-34 23t-29 25t-12 35.5q0 27 19 45.5t45 18.5q15 0 25 -5q70 -27 112.5 -93t42.5 -142z" />
+<glyph unicode="" horiz-adv-x="1664" d="M768 1184v-1088q0 -26 -19 -45t-45 -19t-45 19l-333 333h-262q-26 0 -45 19t-19 45v384q0 26 19 45t45 19h262l333 333q19 19 45 19t45 -19t19 -45zM1152 640q0 -76 -42.5 -141.5t-112.5 -93.5q-10 -5 -25 -5q-26 0 -45 18.5t-19 45.5q0 21 12 35.5t29 25t34 23t29 35.5 t12 57t-12 57t-29 35.5t-34 23t-29 25t-12 35.5q0 27 19 45.5t45 18.5q15 0 25 -5q70 -27 112.5 -93t42.5 -142zM1408 640q0 -153 -85 -282.5t-225 -188.5q-13 -5 -25 -5q-27 0 -46 19t-19 45q0 39 39 59q56 29 76 44q74 54 115.5 135.5t41.5 173.5t-41.5 173.5 t-115.5 135.5q-20 15 -76 44q-39 20 -39 59q0 26 19 45t45 19q13 0 26 -5q140 -59 225 -188.5t85 -282.5zM1664 640q0 -230 -127 -422.5t-338 -283.5q-13 -5 -26 -5q-26 0 -45 19t-19 45q0 36 39 59q7 4 22.5 10.5t22.5 10.5q46 25 82 51q123 91 192 227t69 289t-69 289 t-192 227q-36 26 -82 51q-7 4 -22.5 10.5t-22.5 10.5q-39 23 -39 59q0 26 19 45t45 19q13 0 26 -5q211 -91 338 -283.5t127 -422.5z" />
+<glyph unicode="" horiz-adv-x="1408" d="M384 384v-128h-128v128h128zM384 1152v-128h-128v128h128zM1152 1152v-128h-128v128h128zM128 129h384v383h-384v-383zM128 896h384v384h-384v-384zM896 896h384v384h-384v-384zM640 640v-640h-640v640h640zM1152 128v-128h-128v128h128zM1408 128v-128h-128v128h128z M1408 640v-384h-384v128h-128v-384h-128v640h384v-128h128v128h128zM640 1408v-640h-640v640h640zM1408 1408v-640h-640v640h640z" />
+<glyph unicode="" horiz-adv-x="1792" d="M63 0h-63v1408h63v-1408zM126 1h-32v1407h32v-1407zM220 1h-31v1407h31v-1407zM377 1h-31v1407h31v-1407zM534 1h-62v1407h62v-1407zM660 1h-31v1407h31v-1407zM723 1h-31v1407h31v-1407zM786 1h-31v1407h31v-1407zM943 1h-63v1407h63v-1407zM1100 1h-63v1407h63v-1407z M1226 1h-63v1407h63v-1407zM1352 1h-63v1407h63v-1407zM1446 1h-63v1407h63v-1407zM1635 1h-94v1407h94v-1407zM1698 1h-32v1407h32v-1407zM1792 0h-63v1408h63v-1408z" />
+<glyph unicode="" d="M448 1088q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1515 512q0 -53 -37 -90l-491 -492q-39 -37 -91 -37q-53 0 -90 37l-715 716q-38 37 -64.5 101t-26.5 117v416q0 52 38 90t90 38h416q53 0 117 -26.5t102 -64.5 l715 -714q37 -39 37 -91z" />
+<glyph unicode="" horiz-adv-x="1920" d="M448 1088q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1515 512q0 -53 -37 -90l-491 -492q-39 -37 -91 -37q-53 0 -90 37l-715 716q-38 37 -64.5 101t-26.5 117v416q0 52 38 90t90 38h416q53 0 117 -26.5t102 -64.5 l715 -714q37 -39 37 -91zM1899 512q0 -53 -37 -90l-491 -492q-39 -37 -91 -37q-36 0 -59 14t-53 45l470 470q37 37 37 90q0 52 -37 91l-715 714q-38 38 -102 64.5t-117 26.5h224q53 0 117 -26.5t102 -64.5l715 -714q37 -39 37 -91z" />
+<glyph unicode="" horiz-adv-x="1664" d="M1639 1058q40 -57 18 -129l-275 -906q-19 -64 -76.5 -107.5t-122.5 -43.5h-923q-77 0 -148.5 53.5t-99.5 131.5q-24 67 -2 127q0 4 3 27t4 37q1 8 -3 21.5t-3 19.5q2 11 8 21t16.5 23.5t16.5 23.5q23 38 45 91.5t30 91.5q3 10 0.5 30t-0.5 28q3 11 17 28t17 23 q21 36 42 92t25 90q1 9 -2.5 32t0.5 28q4 13 22 30.5t22 22.5q19 26 42.5 84.5t27.5 96.5q1 8 -3 25.5t-2 26.5q2 8 9 18t18 23t17 21q8 12 16.5 30.5t15 35t16 36t19.5 32t26.5 23.5t36 11.5t47.5 -5.5l-1 -3q38 9 51 9h761q74 0 114 -56t18 -130l-274 -906 q-36 -119 -71.5 -153.5t-128.5 -34.5h-869q-27 0 -38 -15q-11 -16 -1 -43q24 -70 144 -70h923q29 0 56 15.5t35 41.5l300 987q7 22 5 57q38 -15 59 -43zM575 1056q-4 -13 2 -22.5t20 -9.5h608q13 0 25.5 9.5t16.5 22.5l21 64q4 13 -2 22.5t-20 9.5h-608q-13 0 -25.5 -9.5 t-16.5 -22.5zM492 800q-4 -13 2 -22.5t20 -9.5h608q13 0 25.5 9.5t16.5 22.5l21 64q4 13 -2 22.5t-20 9.5h-608q-13 0 -25.5 -9.5t-16.5 -22.5z" />
+<glyph unicode="" horiz-adv-x="1280" d="M1164 1408q23 0 44 -9q33 -13 52.5 -41t19.5 -62v-1289q0 -34 -19.5 -62t-52.5 -41q-19 -8 -44 -8q-48 0 -83 32l-441 424l-441 -424q-36 -33 -83 -33q-23 0 -44 9q-33 13 -52.5 41t-19.5 62v1289q0 34 19.5 62t52.5 41q21 9 44 9h1048z" />
+<glyph unicode="" horiz-adv-x="1664" d="M384 0h896v256h-896v-256zM384 640h896v384h-160q-40 0 -68 28t-28 68v160h-640v-640zM1536 576q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1664 576v-416q0 -13 -9.5 -22.5t-22.5 -9.5h-224v-160q0 -40 -28 -68t-68 -28h-960q-40 0 -68 28t-28 68 v160h-224q-13 0 -22.5 9.5t-9.5 22.5v416q0 79 56.5 135.5t135.5 56.5h64v544q0 40 28 68t68 28h672q40 0 88 -20t76 -48l152 -152q28 -28 48 -76t20 -88v-256h64q79 0 135.5 -56.5t56.5 -135.5z" />
+<glyph unicode="" horiz-adv-x="1920" d="M960 864q119 0 203.5 -84.5t84.5 -203.5t-84.5 -203.5t-203.5 -84.5t-203.5 84.5t-84.5 203.5t84.5 203.5t203.5 84.5zM1664 1280q106 0 181 -75t75 -181v-896q0 -106 -75 -181t-181 -75h-1408q-106 0 -181 75t-75 181v896q0 106 75 181t181 75h224l51 136 q19 49 69.5 84.5t103.5 35.5h512q53 0 103.5 -35.5t69.5 -84.5l51 -136h224zM960 128q185 0 316.5 131.5t131.5 316.5t-131.5 316.5t-316.5 131.5t-316.5 -131.5t-131.5 -316.5t131.5 -316.5t316.5 -131.5z" />
+<glyph unicode="" horiz-adv-x="1664" d="M725 977l-170 -450q33 0 136.5 -2t160.5 -2q19 0 57 2q-87 253 -184 452zM0 -128l2 79q23 7 56 12.5t57 10.5t49.5 14.5t44.5 29t31 50.5l237 616l280 724h75h53q8 -14 11 -21l205 -480q33 -78 106 -257.5t114 -274.5q15 -34 58 -144.5t72 -168.5q20 -45 35 -57 q19 -15 88 -29.5t84 -20.5q6 -38 6 -57q0 -4 -0.5 -13t-0.5 -13q-63 0 -190 8t-191 8q-76 0 -215 -7t-178 -8q0 43 4 78l131 28q1 0 12.5 2.5t15.5 3.5t14.5 4.5t15 6.5t11 8t9 11t2.5 14q0 16 -31 96.5t-72 177.5t-42 100l-450 2q-26 -58 -76.5 -195.5t-50.5 -162.5 q0 -22 14 -37.5t43.5 -24.5t48.5 -13.5t57 -8.5t41 -4q1 -19 1 -58q0 -9 -2 -27q-58 0 -174.5 10t-174.5 10q-8 0 -26.5 -4t-21.5 -4q-80 -14 -188 -14z" />
+<glyph unicode="" horiz-adv-x="1408" d="M555 15q74 -32 140 -32q376 0 376 335q0 114 -41 180q-27 44 -61.5 74t-67.5 46.5t-80.5 25t-84 10.5t-94.5 2q-73 0 -101 -10q0 -53 -0.5 -159t-0.5 -158q0 -8 -1 -67.5t-0.5 -96.5t4.5 -83.5t12 -66.5zM541 761q42 -7 109 -7q82 0 143 13t110 44.5t74.5 89.5t25.5 142 q0 70 -29 122.5t-79 82t-108 43.5t-124 14q-50 0 -130 -13q0 -50 4 -151t4 -152q0 -27 -0.5 -80t-0.5 -79q0 -46 1 -69zM0 -128l2 94q15 4 85 16t106 27q7 12 12.5 27t8.5 33.5t5.5 32.5t3 37.5t0.5 34v35.5v30q0 982 -22 1025q-4 8 -22 14.5t-44.5 11t-49.5 7t-48.5 4.5 t-30.5 3l-4 83q98 2 340 11.5t373 9.5q23 0 68.5 -0.5t67.5 -0.5q70 0 136.5 -13t128.5 -42t108 -71t74 -104.5t28 -137.5q0 -52 -16.5 -95.5t-39 -72t-64.5 -57.5t-73 -45t-84 -40q154 -35 256.5 -134t102.5 -248q0 -100 -35 -179.5t-93.5 -130.5t-138 -85.5t-163.5 -48.5 t-176 -14q-44 0 -132 3t-132 3q-106 0 -307 -11t-231 -12z" />
+<glyph unicode="" horiz-adv-x="1024" d="M0 -126l17 85q6 2 81.5 21.5t111.5 37.5q28 35 41 101q1 7 62 289t114 543.5t52 296.5v25q-24 13 -54.5 18.5t-69.5 8t-58 5.5l19 103q33 -2 120 -6.5t149.5 -7t120.5 -2.5q48 0 98.5 2.5t121 7t98.5 6.5q-5 -39 -19 -89q-30 -10 -101.5 -28.5t-108.5 -33.5 q-8 -19 -14 -42.5t-9 -40t-7.5 -45.5t-6.5 -42q-27 -148 -87.5 -419.5t-77.5 -355.5q-2 -9 -13 -58t-20 -90t-16 -83.5t-6 -57.5l1 -18q17 -4 185 -31q-3 -44 -16 -99q-11 0 -32.5 -1.5t-32.5 -1.5q-29 0 -87 10t-86 10q-138 2 -206 2q-51 0 -143 -9t-121 -11z" />
+<glyph unicode="" horiz-adv-x="1792" d="M1744 128q33 0 42 -18.5t-11 -44.5l-126 -162q-20 -26 -49 -26t-49 26l-126 162q-20 26 -11 44.5t42 18.5h80v1024h-80q-33 0 -42 18.5t11 44.5l126 162q20 26 49 26t49 -26l126 -162q20 -26 11 -44.5t-42 -18.5h-80v-1024h80zM81 1407l54 -27q12 -5 211 -5q44 0 132 2 t132 2q36 0 107.5 -0.5t107.5 -0.5h293q6 0 21 -0.5t20.5 0t16 3t17.5 9t15 17.5l42 1q4 0 14 -0.5t14 -0.5q2 -112 2 -336q0 -80 -5 -109q-39 -14 -68 -18q-25 44 -54 128q-3 9 -11 48t-14.5 73.5t-7.5 35.5q-6 8 -12 12.5t-15.5 6t-13 2.5t-18 0.5t-16.5 -0.5 q-17 0 -66.5 0.5t-74.5 0.5t-64 -2t-71 -6q-9 -81 -8 -136q0 -94 2 -388t2 -455q0 -16 -2.5 -71.5t0 -91.5t12.5 -69q40 -21 124 -42.5t120 -37.5q5 -40 5 -50q0 -14 -3 -29l-34 -1q-76 -2 -218 8t-207 10q-50 0 -151 -9t-152 -9q-3 51 -3 52v9q17 27 61.5 43t98.5 29t78 27 q19 42 19 383q0 101 -3 303t-3 303v117q0 2 0.5 15.5t0.5 25t-1 25.5t-3 24t-5 14q-11 12 -162 12q-33 0 -93 -12t-80 -26q-19 -13 -34 -72.5t-31.5 -111t-42.5 -53.5q-42 26 -56 44v383z" />
+<glyph unicode="" d="M81 1407l54 -27q12 -5 211 -5q44 0 132 2t132 2q70 0 246.5 1t304.5 0.5t247 -4.5q33 -1 56 31l42 1q4 0 14 -0.5t14 -0.5q2 -112 2 -336q0 -80 -5 -109q-39 -14 -68 -18q-25 44 -54 128q-3 9 -11 47.5t-15 73.5t-7 36q-10 13 -27 19q-5 2 -66 2q-30 0 -93 1t-103 1 t-94 -2t-96 -7q-9 -81 -8 -136l1 -152v52q0 -55 1 -154t1.5 -180t0.5 -153q0 -16 -2.5 -71.5t0 -91.5t12.5 -69q40 -21 124 -42.5t120 -37.5q5 -40 5 -50q0 -14 -3 -29l-34 -1q-76 -2 -218 8t-207 10q-50 0 -151 -9t-152 -9q-3 51 -3 52v9q17 27 61.5 43t98.5 29t78 27 q7 16 11.5 74t6 145.5t1.5 155t-0.5 153.5t-0.5 89q0 7 -2.5 21.5t-2.5 22.5q0 7 0.5 44t1 73t0 76.5t-3 67.5t-6.5 32q-11 12 -162 12q-41 0 -163 -13.5t-138 -24.5q-19 -12 -34 -71.5t-31.5 -111.5t-42.5 -54q-42 26 -56 44v383zM1310 125q12 0 42 -19.5t57.5 -41.5 t59.5 -49t36 -30q26 -21 26 -49t-26 -49q-4 -3 -36 -30t-59.5 -49t-57.5 -41.5t-42 -19.5q-13 0 -20.5 10.5t-10 28.5t-2.5 33.5t1.5 33t1.5 19.5h-1024q0 -2 1.5 -19.5t1.5 -33t-2.5 -33.5t-10 -28.5t-20.5 -10.5q-12 0 -42 19.5t-57.5 41.5t-59.5 49t-36 30q-26 21 -26 49 t26 49q4 3 36 30t59.5 49t57.5 41.5t42 19.5q13 0 20.5 -10.5t10 -28.5t2.5 -33.5t-1.5 -33t-1.5 -19.5h1024q0 2 -1.5 19.5t-1.5 33t2.5 33.5t10 28.5t20.5 10.5z" />
+<glyph unicode="" horiz-adv-x="1792" d="M1792 192v-128q0 -26 -19 -45t-45 -19h-1664q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1664q26 0 45 -19t19 -45zM1408 576v-128q0 -26 -19 -45t-45 -19h-1280q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1280q26 0 45 -19t19 -45zM1664 960v-128q0 -26 -19 -45 t-45 -19h-1536q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1536q26 0 45 -19t19 -45zM1280 1344v-128q0 -26 -19 -45t-45 -19h-1152q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1152q26 0 45 -19t19 -45z" />
+<glyph unicode="" horiz-adv-x="1792" d="M1792 192v-128q0 -26 -19 -45t-45 -19h-1664q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1664q26 0 45 -19t19 -45zM1408 576v-128q0 -26 -19 -45t-45 -19h-896q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h896q26 0 45 -19t19 -45zM1664 960v-128q0 -26 -19 -45t-45 -19 h-1408q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1408q26 0 45 -19t19 -45zM1280 1344v-128q0 -26 -19 -45t-45 -19h-640q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h640q26 0 45 -19t19 -45z" />
+<glyph unicode="" horiz-adv-x="1792" d="M1792 192v-128q0 -26 -19 -45t-45 -19h-1664q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1664q26 0 45 -19t19 -45zM1792 576v-128q0 -26 -19 -45t-45 -19h-1280q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1280q26 0 45 -19t19 -45zM1792 960v-128q0 -26 -19 -45 t-45 -19h-1536q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1536q26 0 45 -19t19 -45zM1792 1344v-128q0 -26 -19 -45t-45 -19h-1152q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1152q26 0 45 -19t19 -45z" />
+<glyph unicode="" horiz-adv-x="1792" d="M1792 192v-128q0 -26 -19 -45t-45 -19h-1664q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1664q26 0 45 -19t19 -45zM1792 576v-128q0 -26 -19 -45t-45 -19h-1664q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1664q26 0 45 -19t19 -45zM1792 960v-128q0 -26 -19 -45 t-45 -19h-1664q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1664q26 0 45 -19t19 -45zM1792 1344v-128q0 -26 -19 -45t-45 -19h-1664q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1664q26 0 45 -19t19 -45z" />
+<glyph unicode="" horiz-adv-x="1792" d="M256 224v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-192q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h192q13 0 22.5 -9.5t9.5 -22.5zM256 608v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-192q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h192q13 0 22.5 -9.5 t9.5 -22.5zM256 992v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-192q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h192q13 0 22.5 -9.5t9.5 -22.5zM1792 224v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1344q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1344 q13 0 22.5 -9.5t9.5 -22.5zM256 1376v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-192q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h192q13 0 22.5 -9.5t9.5 -22.5zM1792 608v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1344q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5 t22.5 9.5h1344q13 0 22.5 -9.5t9.5 -22.5zM1792 992v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1344q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1344q13 0 22.5 -9.5t9.5 -22.5zM1792 1376v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1344q-13 0 -22.5 9.5t-9.5 22.5v192 q0 13 9.5 22.5t22.5 9.5h1344q13 0 22.5 -9.5t9.5 -22.5z" />
+<glyph unicode="" horiz-adv-x="1792" d="M384 992v-576q0 -13 -9.5 -22.5t-22.5 -9.5q-14 0 -23 9l-288 288q-9 9 -9 23t9 23l288 288q9 9 23 9q13 0 22.5 -9.5t9.5 -22.5zM1792 224v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1728q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1728q13 0 22.5 -9.5 t9.5 -22.5zM1792 608v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1088q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1088q13 0 22.5 -9.5t9.5 -22.5zM1792 992v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1088q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1088 q13 0 22.5 -9.5t9.5 -22.5zM1792 1376v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1728q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1728q13 0 22.5 -9.5t9.5 -22.5z" />
+<glyph unicode="" horiz-adv-x="1792" d="M352 704q0 -14 -9 -23l-288 -288q-9 -9 -23 -9q-13 0 -22.5 9.5t-9.5 22.5v576q0 13 9.5 22.5t22.5 9.5q14 0 23 -9l288 -288q9 -9 9 -23zM1792 224v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1728q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1728q13 0 22.5 -9.5 t9.5 -22.5zM1792 608v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1088q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1088q13 0 22.5 -9.5t9.5 -22.5zM1792 992v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1088q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1088 q13 0 22.5 -9.5t9.5 -22.5zM1792 1376v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1728q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1728q13 0 22.5 -9.5t9.5 -22.5z" />
+<glyph unicode="" horiz-adv-x="1792" d="M1792 1184v-1088q0 -42 -39 -59q-13 -5 -25 -5q-27 0 -45 19l-403 403v-166q0 -119 -84.5 -203.5t-203.5 -84.5h-704q-119 0 -203.5 84.5t-84.5 203.5v704q0 119 84.5 203.5t203.5 84.5h704q119 0 203.5 -84.5t84.5 -203.5v-165l403 402q18 19 45 19q12 0 25 -5 q39 -17 39 -59z" />
+<glyph unicode="" horiz-adv-x="1920" d="M640 960q0 -80 -56 -136t-136 -56t-136 56t-56 136t56 136t136 56t136 -56t56 -136zM1664 576v-448h-1408v192l320 320l160 -160l512 512zM1760 1280h-1600q-13 0 -22.5 -9.5t-9.5 -22.5v-1216q0 -13 9.5 -22.5t22.5 -9.5h1600q13 0 22.5 9.5t9.5 22.5v1216 q0 13 -9.5 22.5t-22.5 9.5zM1920 1248v-1216q0 -66 -47 -113t-113 -47h-1600q-66 0 -113 47t-47 113v1216q0 66 47 113t113 47h1600q66 0 113 -47t47 -113z" />
+<glyph unicode="" d="M363 0l91 91l-235 235l-91 -91v-107h128v-128h107zM886 928q0 22 -22 22q-10 0 -17 -7l-542 -542q-7 -7 -7 -17q0 -22 22 -22q10 0 17 7l542 542q7 7 7 17zM832 1120l416 -416l-832 -832h-416v416zM1515 1024q0 -53 -37 -90l-166 -166l-416 416l166 165q36 38 90 38 q53 0 91 -38l235 -234q37 -39 37 -91z" />
+<glyph unicode="" horiz-adv-x="1024" d="M768 896q0 106 -75 181t-181 75t-181 -75t-75 -181t75 -181t181 -75t181 75t75 181zM1024 896q0 -109 -33 -179l-364 -774q-16 -33 -47.5 -52t-67.5 -19t-67.5 19t-46.5 52l-365 774q-33 70 -33 179q0 212 150 362t362 150t362 -150t150 -362z" />
+<glyph unicode="" d="M768 96v1088q-148 0 -273 -73t-198 -198t-73 -273t73 -273t198 -198t273 -73zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+<glyph unicode="" horiz-adv-x="1024" d="M512 384q0 36 -20 69q-1 1 -15.5 22.5t-25.5 38t-25 44t-21 50.5q-4 16 -21 16t-21 -16q-7 -23 -21 -50.5t-25 -44t-25.5 -38t-15.5 -22.5q-20 -33 -20 -69q0 -53 37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1024 512q0 -212 -150 -362t-362 -150t-362 150t-150 362 q0 145 81 275q6 9 62.5 90.5t101 151t99.5 178t83 201.5q9 30 34 47t51 17t51.5 -17t33.5 -47q28 -93 83 -201.5t99.5 -178t101 -151t62.5 -90.5q81 -127 81 -275z" />
+<glyph unicode="" horiz-adv-x="1792" d="M888 352l116 116l-152 152l-116 -116v-56h96v-96h56zM1328 1072q-16 16 -33 -1l-350 -350q-17 -17 -1 -33t33 1l350 350q17 17 1 33zM1408 478v-190q0 -119 -84.5 -203.5t-203.5 -84.5h-832q-119 0 -203.5 84.5t-84.5 203.5v832q0 119 84.5 203.5t203.5 84.5h832 q63 0 117 -25q15 -7 18 -23q3 -17 -9 -29l-49 -49q-14 -14 -32 -8q-23 6 -45 6h-832q-66 0 -113 -47t-47 -113v-832q0 -66 47 -113t113 -47h832q66 0 113 47t47 113v126q0 13 9 22l64 64q15 15 35 7t20 -29zM1312 1216l288 -288l-672 -672h-288v288zM1756 1084l-92 -92 l-288 288l92 92q28 28 68 28t68 -28l152 -152q28 -28 28 -68t-28 -68z" />
+<glyph unicode="" horiz-adv-x="1664" d="M1408 547v-259q0 -119 -84.5 -203.5t-203.5 -84.5h-832q-119 0 -203.5 84.5t-84.5 203.5v832q0 119 84.5 203.5t203.5 84.5h255v0q13 0 22.5 -9.5t9.5 -22.5q0 -27 -26 -32q-77 -26 -133 -60q-10 -4 -16 -4h-112q-66 0 -113 -47t-47 -113v-832q0 -66 47 -113t113 -47h832 q66 0 113 47t47 113v214q0 19 18 29q28 13 54 37q16 16 35 8q21 -9 21 -29zM1645 1043l-384 -384q-18 -19 -45 -19q-12 0 -25 5q-39 17 -39 59v192h-160q-323 0 -438 -131q-119 -137 -74 -473q3 -23 -20 -34q-8 -2 -12 -2q-16 0 -26 13q-10 14 -21 31t-39.5 68.5t-49.5 99.5 t-38.5 114t-17.5 122q0 49 3.5 91t14 90t28 88t47 81.5t68.5 74t94.5 61.5t124.5 48.5t159.5 30.5t196.5 11h160v192q0 42 39 59q13 5 25 5q26 0 45 -19l384 -384q19 -19 19 -45t-19 -45z" />
+<glyph unicode="" horiz-adv-x="1664" d="M1408 606v-318q0 -119 -84.5 -203.5t-203.5 -84.5h-832q-119 0 -203.5 84.5t-84.5 203.5v832q0 119 84.5 203.5t203.5 84.5h832q63 0 117 -25q15 -7 18 -23q3 -17 -9 -29l-49 -49q-10 -10 -23 -10q-3 0 -9 2q-23 6 -45 6h-832q-66 0 -113 -47t-47 -113v-832 q0 -66 47 -113t113 -47h832q66 0 113 47t47 113v254q0 13 9 22l64 64q10 10 23 10q6 0 12 -3q20 -8 20 -29zM1639 1095l-814 -814q-24 -24 -57 -24t-57 24l-430 430q-24 24 -24 57t24 57l110 110q24 24 57 24t57 -24l263 -263l647 647q24 24 57 24t57 -24l110 -110 q24 -24 24 -57t-24 -57z" />
+<glyph unicode="" horiz-adv-x="1792" d="M1792 640q0 -26 -19 -45l-256 -256q-19 -19 -45 -19t-45 19t-19 45v128h-384v-384h128q26 0 45 -19t19 -45t-19 -45l-256 -256q-19 -19 -45 -19t-45 19l-256 256q-19 19 -19 45t19 45t45 19h128v384h-384v-128q0 -26 -19 -45t-45 -19t-45 19l-256 256q-19 19 -19 45 t19 45l256 256q19 19 45 19t45 -19t19 -45v-128h384v384h-128q-26 0 -45 19t-19 45t19 45l256 256q19 19 45 19t45 -19l256 -256q19 -19 19 -45t-19 -45t-45 -19h-128v-384h384v128q0 26 19 45t45 19t45 -19l256 -256q19 -19 19 -45z" />
+<glyph unicode="" horiz-adv-x="1024" d="M979 1395q19 19 32 13t13 -32v-1472q0 -26 -13 -32t-32 13l-710 710q-9 9 -13 19v-678q0 -26 -19 -45t-45 -19h-128q-26 0 -45 19t-19 45v1408q0 26 19 45t45 19h128q26 0 45 -19t19 -45v-678q4 11 13 19z" />
+<glyph unicode="" horiz-adv-x="1792" d="M1747 1395q19 19 32 13t13 -32v-1472q0 -26 -13 -32t-32 13l-710 710q-9 9 -13 19v-710q0 -26 -13 -32t-32 13l-710 710q-9 9 -13 19v-678q0 -26 -19 -45t-45 -19h-128q-26 0 -45 19t-19 45v1408q0 26 19 45t45 19h128q26 0 45 -19t19 -45v-678q4 11 13 19l710 710 q19 19 32 13t13 -32v-710q4 11 13 19z" />
+<glyph unicode="" horiz-adv-x="1664" d="M1619 1395q19 19 32 13t13 -32v-1472q0 -26 -13 -32t-32 13l-710 710q-8 9 -13 19v-710q0 -26 -13 -32t-32 13l-710 710q-19 19 -19 45t19 45l710 710q19 19 32 13t13 -32v-710q5 11 13 19z" />
+<glyph unicode="" horiz-adv-x="1408" d="M1384 609l-1328 -738q-23 -13 -39.5 -3t-16.5 36v1472q0 26 16.5 36t39.5 -3l1328 -738q23 -13 23 -31t-23 -31z" />
+<glyph unicode="" d="M1536 1344v-1408q0 -26 -19 -45t-45 -19h-512q-26 0 -45 19t-19 45v1408q0 26 19 45t45 19h512q26 0 45 -19t19 -45zM640 1344v-1408q0 -26 -19 -45t-45 -19h-512q-26 0 -45 19t-19 45v1408q0 26 19 45t45 19h512q26 0 45 -19t19 -45z" />
+<glyph unicode="" d="M1536 1344v-1408q0 -26 -19 -45t-45 -19h-1408q-26 0 -45 19t-19 45v1408q0 26 19 45t45 19h1408q26 0 45 -19t19 -45z" />
+<glyph unicode="" horiz-adv-x="1664" d="M45 -115q-19 -19 -32 -13t-13 32v1472q0 26 13 32t32 -13l710 -710q8 -8 13 -19v710q0 26 13 32t32 -13l710 -710q19 -19 19 -45t-19 -45l-710 -710q-19 -19 -32 -13t-13 32v710q-5 -10 -13 -19z" />
+<glyph unicode="" horiz-adv-x="1792" d="M45 -115q-19 -19 -32 -13t-13 32v1472q0 26 13 32t32 -13l710 -710q8 -8 13 -19v710q0 26 13 32t32 -13l710 -710q8 -8 13 -19v678q0 26 19 45t45 19h128q26 0 45 -19t19 -45v-1408q0 -26 -19 -45t-45 -19h-128q-26 0 -45 19t-19 45v678q-5 -10 -13 -19l-710 -710 q-19 -19 -32 -13t-13 32v710q-5 -10 -13 -19z" />
+<glyph unicode="" horiz-adv-x="1024" d="M45 -115q-19 -19 -32 -13t-13 32v1472q0 26 13 32t32 -13l710 -710q8 -8 13 -19v678q0 26 19 45t45 19h128q26 0 45 -19t19 -45v-1408q0 -26 -19 -45t-45 -19h-128q-26 0 -45 19t-19 45v678q-5 -10 -13 -19z" />
+<glyph unicode="" horiz-adv-x="1538" d="M14 557l710 710q19 19 45 19t45 -19l710 -710q19 -19 13 -32t-32 -13h-1472q-26 0 -32 13t13 32zM1473 0h-1408q-26 0 -45 19t-19 45v256q0 26 19 45t45 19h1408q26 0 45 -19t19 -45v-256q0 -26 -19 -45t-45 -19z" />
+<glyph unicode="" horiz-adv-x="1280" d="M1171 1235l-531 -531l531 -531q19 -19 19 -45t-19 -45l-166 -166q-19 -19 -45 -19t-45 19l-742 742q-19 19 -19 45t19 45l742 742q19 19 45 19t45 -19l166 -166q19 -19 19 -45t-19 -45z" />
+<glyph unicode="" horiz-adv-x="1280" d="M1107 659l-742 -742q-19 -19 -45 -19t-45 19l-166 166q-19 19 -19 45t19 45l531 531l-531 531q-19 19 -19 45t19 45l166 166q19 19 45 19t45 -19l742 -742q19 -19 19 -45t-19 -45z" />
+<glyph unicode="" d="M1216 576v128q0 26 -19 45t-45 19h-256v256q0 26 -19 45t-45 19h-128q-26 0 -45 -19t-19 -45v-256h-256q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45t45 -19h256v-256q0 -26 19 -45t45 -19h128q26 0 45 19t19 45v256h256q26 0 45 19t19 45zM1536 640q0 -209 -103 -385.5 t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+<glyph unicode="" d="M1216 576v128q0 26 -19 45t-45 19h-768q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45t45 -19h768q26 0 45 19t19 45zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5 t103 -385.5z" />
+<glyph unicode="" d="M1149 414q0 26 -19 45l-181 181l181 181q19 19 19 45q0 27 -19 46l-90 90q-19 19 -46 19q-26 0 -45 -19l-181 -181l-181 181q-19 19 -45 19q-27 0 -46 -19l-90 -90q-19 -19 -19 -46q0 -26 19 -45l181 -181l-181 -181q-19 -19 -19 -45q0 -27 19 -46l90 -90q19 -19 46 -19 q26 0 45 19l181 181l181 -181q19 -19 45 -19q27 0 46 19l90 90q19 19 19 46zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+<glyph unicode="" d="M1284 802q0 28 -18 46l-91 90q-19 19 -45 19t-45 -19l-408 -407l-226 226q-19 19 -45 19t-45 -19l-91 -90q-18 -18 -18 -46q0 -27 18 -45l362 -362q19 -19 45 -19q27 0 46 19l543 543q18 18 18 45zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103 t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+<glyph unicode="" d="M896 160v192q0 14 -9 23t-23 9h-192q-14 0 -23 -9t-9 -23v-192q0 -14 9 -23t23 -9h192q14 0 23 9t9 23zM1152 832q0 88 -55.5 163t-138.5 116t-170 41q-243 0 -371 -213q-15 -24 8 -42l132 -100q7 -6 19 -6q16 0 25 12q53 68 86 92q34 24 86 24q48 0 85.5 -26t37.5 -59 q0 -38 -20 -61t-68 -45q-63 -28 -115.5 -86.5t-52.5 -125.5v-36q0 -14 9 -23t23 -9h192q14 0 23 9t9 23q0 19 21.5 49.5t54.5 49.5q32 18 49 28.5t46 35t44.5 48t28 60.5t12.5 81zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5 t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+<glyph unicode="" d="M1024 160v160q0 14 -9 23t-23 9h-96v512q0 14 -9 23t-23 9h-320q-14 0 -23 -9t-9 -23v-160q0 -14 9 -23t23 -9h96v-320h-96q-14 0 -23 -9t-9 -23v-160q0 -14 9 -23t23 -9h448q14 0 23 9t9 23zM896 1056v160q0 14 -9 23t-23 9h-192q-14 0 -23 -9t-9 -23v-160q0 -14 9 -23 t23 -9h192q14 0 23 9t9 23zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+<glyph unicode="" d="M1197 512h-109q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h109q-32 108 -112.5 188.5t-188.5 112.5v-109q0 -26 -19 -45t-45 -19h-128q-26 0 -45 19t-19 45v109q-108 -32 -188.5 -112.5t-112.5 -188.5h109q26 0 45 -19t19 -45v-128q0 -26 -19 -45t-45 -19h-109 q32 -108 112.5 -188.5t188.5 -112.5v109q0 26 19 45t45 19h128q26 0 45 -19t19 -45v-109q108 32 188.5 112.5t112.5 188.5zM1536 704v-128q0 -26 -19 -45t-45 -19h-143q-37 -161 -154.5 -278.5t-278.5 -154.5v-143q0 -26 -19 -45t-45 -19h-128q-26 0 -45 19t-19 45v143 q-161 37 -278.5 154.5t-154.5 278.5h-143q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h143q37 161 154.5 278.5t278.5 154.5v143q0 26 19 45t45 19h128q26 0 45 -19t19 -45v-143q161 -37 278.5 -154.5t154.5 -278.5h143q26 0 45 -19t19 -45z" />
+<glyph unicode="" d="M1097 457l-146 -146q-10 -10 -23 -10t-23 10l-137 137l-137 -137q-10 -10 -23 -10t-23 10l-146 146q-10 10 -10 23t10 23l137 137l-137 137q-10 10 -10 23t10 23l146 146q10 10 23 10t23 -10l137 -137l137 137q10 10 23 10t23 -10l146 -146q10 -10 10 -23t-10 -23 l-137 -137l137 -137q10 -10 10 -23t-10 -23zM1312 640q0 148 -73 273t-198 198t-273 73t-273 -73t-198 -198t-73 -273t73 -273t198 -198t273 -73t273 73t198 198t73 273zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5 t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+<glyph unicode="" d="M1171 723l-422 -422q-19 -19 -45 -19t-45 19l-294 294q-19 19 -19 45t19 45l102 102q19 19 45 19t45 -19l147 -147l275 275q19 19 45 19t45 -19l102 -102q19 -19 19 -45t-19 -45zM1312 640q0 148 -73 273t-198 198t-273 73t-273 -73t-198 -198t-73 -273t73 -273t198 -198 t273 -73t273 73t198 198t73 273zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+<glyph unicode="" d="M1312 643q0 161 -87 295l-754 -753q137 -89 297 -89q111 0 211.5 43.5t173.5 116.5t116 174.5t43 212.5zM313 344l755 754q-135 91 -300 91q-148 0 -273 -73t-198 -199t-73 -274q0 -162 89 -299zM1536 643q0 -157 -61 -300t-163.5 -246t-245 -164t-298.5 -61t-298.5 61 t-245 164t-163.5 246t-61 300t61 299.5t163.5 245.5t245 164t298.5 61t298.5 -61t245 -164t163.5 -245.5t61 -299.5z" />
+<glyph unicode="" d="M1536 640v-128q0 -53 -32.5 -90.5t-84.5 -37.5h-704l293 -294q38 -36 38 -90t-38 -90l-75 -76q-37 -37 -90 -37q-52 0 -91 37l-651 652q-37 37 -37 90q0 52 37 91l651 650q38 38 91 38q52 0 90 -38l75 -74q38 -38 38 -91t-38 -91l-293 -293h704q52 0 84.5 -37.5 t32.5 -90.5z" />
+<glyph unicode="" d="M1472 576q0 -54 -37 -91l-651 -651q-39 -37 -91 -37q-51 0 -90 37l-75 75q-38 38 -38 91t38 91l293 293h-704q-52 0 -84.5 37.5t-32.5 90.5v128q0 53 32.5 90.5t84.5 37.5h704l-293 294q-38 36 -38 90t38 90l75 75q38 38 90 38q53 0 91 -38l651 -651q37 -35 37 -90z" />
+<glyph unicode="" horiz-adv-x="1664" d="M1611 565q0 -51 -37 -90l-75 -75q-38 -38 -91 -38q-54 0 -90 38l-294 293v-704q0 -52 -37.5 -84.5t-90.5 -32.5h-128q-53 0 -90.5 32.5t-37.5 84.5v704l-294 -293q-36 -38 -90 -38t-90 38l-75 75q-38 38 -38 90q0 53 38 91l651 651q35 37 90 37q54 0 91 -37l651 -651 q37 -39 37 -91z" />
+<glyph unicode="" horiz-adv-x="1664" d="M1611 704q0 -53 -37 -90l-651 -652q-39 -37 -91 -37q-53 0 -90 37l-651 652q-38 36 -38 90q0 53 38 91l74 75q39 37 91 37q53 0 90 -37l294 -294v704q0 52 38 90t90 38h128q52 0 90 -38t38 -90v-704l294 294q37 37 90 37q52 0 91 -37l75 -75q37 -39 37 -91z" />
+<glyph unicode="" horiz-adv-x="1792" d="M1792 896q0 -26 -19 -45l-512 -512q-19 -19 -45 -19t-45 19t-19 45v256h-224q-98 0 -175.5 -6t-154 -21.5t-133 -42.5t-105.5 -69.5t-80 -101t-48.5 -138.5t-17.5 -181q0 -55 5 -123q0 -6 2.5 -23.5t2.5 -26.5q0 -15 -8.5 -25t-23.5 -10q-16 0 -28 17q-7 9 -13 22 t-13.5 30t-10.5 24q-127 285 -127 451q0 199 53 333q162 403 875 403h224v256q0 26 19 45t45 19t45 -19l512 -512q19 -19 19 -45z" />
+<glyph unicode="" d="M755 480q0 -13 -10 -23l-332 -332l144 -144q19 -19 19 -45t-19 -45t-45 -19h-448q-26 0 -45 19t-19 45v448q0 26 19 45t45 19t45 -19l144 -144l332 332q10 10 23 10t23 -10l114 -114q10 -10 10 -23zM1536 1344v-448q0 -26 -19 -45t-45 -19t-45 19l-144 144l-332 -332 q-10 -10 -23 -10t-23 10l-114 114q-10 10 -10 23t10 23l332 332l-144 144q-19 19 -19 45t19 45t45 19h448q26 0 45 -19t19 -45z" />
+<glyph unicode="" d="M768 576v-448q0 -26 -19 -45t-45 -19t-45 19l-144 144l-332 -332q-10 -10 -23 -10t-23 10l-114 114q-10 10 -10 23t10 23l332 332l-144 144q-19 19 -19 45t19 45t45 19h448q26 0 45 -19t19 -45zM1523 1248q0 -13 -10 -23l-332 -332l144 -144q19 -19 19 -45t-19 -45 t-45 -19h-448q-26 0 -45 19t-19 45v448q0 26 19 45t45 19t45 -19l144 -144l332 332q10 10 23 10t23 -10l114 -114q10 -10 10 -23z" />
+<glyph unicode="" horiz-adv-x="1408" d="M1408 800v-192q0 -40 -28 -68t-68 -28h-416v-416q0 -40 -28 -68t-68 -28h-192q-40 0 -68 28t-28 68v416h-416q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h416v416q0 40 28 68t68 28h192q40 0 68 -28t28 -68v-416h416q40 0 68 -28t28 -68z" />
+<glyph unicode="" horiz-adv-x="1408" d="M1408 800v-192q0 -40 -28 -68t-68 -28h-1216q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h1216q40 0 68 -28t28 -68z" />
+<glyph unicode="" horiz-adv-x="1664" d="M1482 486q46 -26 59.5 -77.5t-12.5 -97.5l-64 -110q-26 -46 -77.5 -59.5t-97.5 12.5l-266 153v-307q0 -52 -38 -90t-90 -38h-128q-52 0 -90 38t-38 90v307l-266 -153q-46 -26 -97.5 -12.5t-77.5 59.5l-64 110q-26 46 -12.5 97.5t59.5 77.5l266 154l-266 154 q-46 26 -59.5 77.5t12.5 97.5l64 110q26 46 77.5 59.5t97.5 -12.5l266 -153v307q0 52 38 90t90 38h128q52 0 90 -38t38 -90v-307l266 153q46 26 97.5 12.5t77.5 -59.5l64 -110q26 -46 12.5 -97.5t-59.5 -77.5l-266 -154z" />
+<glyph unicode="" d="M768 1408q209 0 385.5 -103t279.5 -279.5t103 -385.5t-103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103zM896 161v190q0 14 -9 23.5t-22 9.5h-192q-13 0 -23 -10t-10 -23v-190q0 -13 10 -23t23 -10h192 q13 0 22 9.5t9 23.5zM894 505l18 621q0 12 -10 18q-10 8 -24 8h-220q-14 0 -24 -8q-10 -6 -10 -18l17 -621q0 -10 10 -17.5t24 -7.5h185q14 0 23.5 7.5t10.5 17.5z" />
+<glyph unicode="" d="M928 180v56v468v192h-320v-192v-468v-56q0 -25 18 -38.5t46 -13.5h192q28 0 46 13.5t18 38.5zM472 1024h195l-126 161q-26 31 -69 31q-40 0 -68 -28t-28 -68t28 -68t68 -28zM1160 1120q0 40 -28 68t-68 28q-43 0 -69 -31l-125 -161h194q40 0 68 28t28 68zM1536 864v-320 q0 -14 -9 -23t-23 -9h-96v-416q0 -40 -28 -68t-68 -28h-1088q-40 0 -68 28t-28 68v416h-96q-14 0 -23 9t-9 23v320q0 14 9 23t23 9h440q-93 0 -158.5 65.5t-65.5 158.5t65.5 158.5t158.5 65.5q107 0 168 -77l128 -165l128 165q61 77 168 77q93 0 158.5 -65.5t65.5 -158.5 t-65.5 -158.5t-158.5 -65.5h440q14 0 23 -9t9 -23z" />
+<glyph unicode="" horiz-adv-x="1792" d="M1280 832q0 26 -19 45t-45 19q-172 0 -318 -49.5t-259.5 -134t-235.5 -219.5q-19 -21 -19 -45q0 -26 19 -45t45 -19q24 0 45 19q27 24 74 71t67 66q137 124 268.5 176t313.5 52q26 0 45 19t19 45zM1792 1030q0 -95 -20 -193q-46 -224 -184.5 -383t-357.5 -268 q-214 -108 -438 -108q-148 0 -286 47q-15 5 -88 42t-96 37q-16 0 -39.5 -32t-45 -70t-52.5 -70t-60 -32q-30 0 -51 11t-31 24t-27 42q-2 4 -6 11t-5.5 10t-3 9.5t-1.5 13.5q0 35 31 73.5t68 65.5t68 56t31 48q0 4 -14 38t-16 44q-9 51 -9 104q0 115 43.5 220t119 184.5 t170.5 139t204 95.5q55 18 145 25.5t179.5 9t178.5 6t163.5 24t113.5 56.5l29.5 29.5t29.5 28t27 20t36.5 16t43.5 4.5q39 0 70.5 -46t47.5 -112t24 -124t8 -96z" />
+<glyph unicode="" horiz-adv-x="1408" d="M1408 -160v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-1344q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h1344q13 0 22.5 -9.5t9.5 -22.5zM1152 896q0 -78 -24.5 -144t-64 -112.5t-87.5 -88t-96 -77.5t-87.5 -72t-64 -81.5t-24.5 -96.5q0 -96 67 -224l-4 1l1 -1 q-90 41 -160 83t-138.5 100t-113.5 122.5t-72.5 150.5t-27.5 184q0 78 24.5 144t64 112.5t87.5 88t96 77.5t87.5 72t64 81.5t24.5 96.5q0 94 -66 224l3 -1l-1 1q90 -41 160 -83t138.5 -100t113.5 -122.5t72.5 -150.5t27.5 -184z" />
+<glyph unicode="" horiz-adv-x="1792" d="M1664 576q-152 236 -381 353q61 -104 61 -225q0 -185 -131.5 -316.5t-316.5 -131.5t-316.5 131.5t-131.5 316.5q0 121 61 225q-229 -117 -381 -353q133 -205 333.5 -326.5t434.5 -121.5t434.5 121.5t333.5 326.5zM944 960q0 20 -14 34t-34 14q-125 0 -214.5 -89.5 t-89.5 -214.5q0 -20 14 -34t34 -14t34 14t14 34q0 86 61 147t147 61q20 0 34 14t14 34zM1792 576q0 -34 -20 -69q-140 -230 -376.5 -368.5t-499.5 -138.5t-499.5 139t-376.5 368q-20 35 -20 69t20 69q140 229 376.5 368t499.5 139t499.5 -139t376.5 -368q20 -35 20 -69z" />
+<glyph unicode="" horiz-adv-x="1792" d="M555 201l78 141q-87 63 -136 159t-49 203q0 121 61 225q-229 -117 -381 -353q167 -258 427 -375zM944 960q0 20 -14 34t-34 14q-125 0 -214.5 -89.5t-89.5 -214.5q0 -20 14 -34t34 -14t34 14t14 34q0 86 61 147t147 61q20 0 34 14t14 34zM1307 1151q0 -7 -1 -9 q-105 -188 -315 -566t-316 -567l-49 -89q-10 -16 -28 -16q-12 0 -134 70q-16 10 -16 28q0 12 44 87q-143 65 -263.5 173t-208.5 245q-20 31 -20 69t20 69q153 235 380 371t496 136q89 0 180 -17l54 97q10 16 28 16q5 0 18 -6t31 -15.5t33 -18.5t31.5 -18.5t19.5 -11.5 q16 -10 16 -27zM1344 704q0 -139 -79 -253.5t-209 -164.5l280 502q8 -45 8 -84zM1792 576q0 -35 -20 -69q-39 -64 -109 -145q-150 -172 -347.5 -267t-419.5 -95l74 132q212 18 392.5 137t301.5 307q-115 179 -282 294l63 112q95 -64 182.5 -153t144.5 -184q20 -34 20 -69z " />
+<glyph unicode="" horiz-adv-x="1792" d="M1024 161v190q0 14 -9.5 23.5t-22.5 9.5h-192q-13 0 -22.5 -9.5t-9.5 -23.5v-190q0 -14 9.5 -23.5t22.5 -9.5h192q13 0 22.5 9.5t9.5 23.5zM1022 535l18 459q0 12 -10 19q-13 11 -24 11h-220q-11 0 -24 -11q-10 -7 -10 -21l17 -457q0 -10 10 -16.5t24 -6.5h185 q14 0 23.5 6.5t10.5 16.5zM1008 1469l768 -1408q35 -63 -2 -126q-17 -29 -46.5 -46t-63.5 -17h-1536q-34 0 -63.5 17t-46.5 46q-37 63 -2 126l768 1408q17 31 47 49t65 18t65 -18t47 -49z" />
+<glyph unicode="" horiz-adv-x="1408" d="M1376 1376q44 -52 12 -148t-108 -172l-161 -161l160 -696q5 -19 -12 -33l-128 -96q-7 -6 -19 -6q-4 0 -7 1q-15 3 -21 16l-279 508l-259 -259l53 -194q5 -17 -8 -31l-96 -96q-9 -9 -23 -9h-2q-15 2 -24 13l-189 252l-252 189q-11 7 -13 23q-1 13 9 25l96 97q9 9 23 9 q6 0 8 -1l194 -53l259 259l-508 279q-14 8 -17 24q-2 16 9 27l128 128q14 13 30 8l665 -159l160 160q76 76 172 108t148 -12z" />
+<glyph unicode="" horiz-adv-x="1664" d="M128 -128h288v288h-288v-288zM480 -128h320v288h-320v-288zM128 224h288v320h-288v-320zM480 224h320v320h-320v-320zM128 608h288v288h-288v-288zM864 -128h320v288h-320v-288zM480 608h320v288h-320v-288zM1248 -128h288v288h-288v-288zM864 224h320v320h-320v-320z M512 1088v288q0 13 -9.5 22.5t-22.5 9.5h-64q-13 0 -22.5 -9.5t-9.5 -22.5v-288q0 -13 9.5 -22.5t22.5 -9.5h64q13 0 22.5 9.5t9.5 22.5zM1248 224h288v320h-288v-320zM864 608h320v288h-320v-288zM1248 608h288v288h-288v-288zM1280 1088v288q0 13 -9.5 22.5t-22.5 9.5h-64 q-13 0 -22.5 -9.5t-9.5 -22.5v-288q0 -13 9.5 -22.5t22.5 -9.5h64q13 0 22.5 9.5t9.5 22.5zM1664 1152v-1280q0 -52 -38 -90t-90 -38h-1408q-52 0 -90 38t-38 90v1280q0 52 38 90t90 38h128v96q0 66 47 113t113 47h64q66 0 113 -47t47 -113v-96h384v96q0 66 47 113t113 47 h64q66 0 113 -47t47 -113v-96h128q52 0 90 -38t38 -90z" />
+<glyph unicode="" horiz-adv-x="1792" d="M666 1055q-60 -92 -137 -273q-22 45 -37 72.5t-40.5 63.5t-51 56.5t-63 35t-81.5 14.5h-224q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h224q250 0 410 -225zM1792 256q0 -14 -9 -23l-320 -320q-9 -9 -23 -9q-13 0 -22.5 9.5t-9.5 22.5v192q-32 0 -85 -0.5t-81 -1t-73 1 t-71 5t-64 10.5t-63 18.5t-58 28.5t-59 40t-55 53.5t-56 69.5q59 93 136 273q22 -45 37 -72.5t40.5 -63.5t51 -56.5t63 -35t81.5 -14.5h256v192q0 14 9 23t23 9q12 0 24 -10l319 -319q9 -9 9 -23zM1792 1152q0 -14 -9 -23l-320 -320q-9 -9 -23 -9q-13 0 -22.5 9.5t-9.5 22.5 v192h-256q-48 0 -87 -15t-69 -45t-51 -61.5t-45 -77.5q-32 -62 -78 -171q-29 -66 -49.5 -111t-54 -105t-64 -100t-74 -83t-90 -68.5t-106.5 -42t-128 -16.5h-224q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h224q48 0 87 15t69 45t51 61.5t45 77.5q32 62 78 171q29 66 49.5 111 t54 105t64 100t74 83t90 68.5t106.5 42t128 16.5h256v192q0 14 9 23t23 9q12 0 24 -10l319 -319q9 -9 9 -23z" />
+<glyph unicode="" horiz-adv-x="1792" d="M1792 640q0 -174 -120 -321.5t-326 -233t-450 -85.5q-70 0 -145 8q-198 -175 -460 -242q-49 -14 -114 -22q-17 -2 -30.5 9t-17.5 29v1q-3 4 -0.5 12t2 10t4.5 9.5l6 9t7 8.5t8 9q7 8 31 34.5t34.5 38t31 39.5t32.5 51t27 59t26 76q-157 89 -247.5 220t-90.5 281 q0 130 71 248.5t191 204.5t286 136.5t348 50.5q244 0 450 -85.5t326 -233t120 -321.5z" />
+<glyph unicode="" d="M1536 704v-128q0 -201 -98.5 -362t-274 -251.5t-395.5 -90.5t-395.5 90.5t-274 251.5t-98.5 362v128q0 26 19 45t45 19h384q26 0 45 -19t19 -45v-128q0 -52 23.5 -90t53.5 -57t71 -30t64 -13t44 -2t44 2t64 13t71 30t53.5 57t23.5 90v128q0 26 19 45t45 19h384 q26 0 45 -19t19 -45zM512 1344v-384q0 -26 -19 -45t-45 -19h-384q-26 0 -45 19t-19 45v384q0 26 19 45t45 19h384q26 0 45 -19t19 -45zM1536 1344v-384q0 -26 -19 -45t-45 -19h-384q-26 0 -45 19t-19 45v384q0 26 19 45t45 19h384q26 0 45 -19t19 -45z" />
+<glyph unicode="" horiz-adv-x="1792" d="M1683 205l-166 -165q-19 -19 -45 -19t-45 19l-531 531l-531 -531q-19 -19 -45 -19t-45 19l-166 165q-19 19 -19 45.5t19 45.5l742 741q19 19 45 19t45 -19l742 -741q19 -19 19 -45.5t-19 -45.5z" />
+<glyph unicode="" horiz-adv-x="1792" d="M1683 728l-742 -741q-19 -19 -45 -19t-45 19l-742 741q-19 19 -19 45.5t19 45.5l166 165q19 19 45 19t45 -19l531 -531l531 531q19 19 45 19t45 -19l166 -165q19 -19 19 -45.5t-19 -45.5z" />
+<glyph unicode="" horiz-adv-x="1920" d="M1280 32q0 -13 -9.5 -22.5t-22.5 -9.5h-960q-8 0 -13.5 2t-9 7t-5.5 8t-3 11.5t-1 11.5v13v11v160v416h-192q-26 0 -45 19t-19 45q0 24 15 41l320 384q19 22 49 22t49 -22l320 -384q15 -17 15 -41q0 -26 -19 -45t-45 -19h-192v-384h576q16 0 25 -11l160 -192q7 -11 7 -21 zM1920 448q0 -24 -15 -41l-320 -384q-20 -23 -49 -23t-49 23l-320 384q-15 17 -15 41q0 26 19 45t45 19h192v384h-576q-16 0 -25 12l-160 192q-7 9 -7 20q0 13 9.5 22.5t22.5 9.5h960q8 0 13.5 -2t9 -7t5.5 -8t3 -11.5t1 -11.5v-13v-11v-160v-416h192q26 0 45 -19t19 -45z " />
+<glyph unicode="" horiz-adv-x="1664" d="M640 0q0 -52 -38 -90t-90 -38t-90 38t-38 90t38 90t90 38t90 -38t38 -90zM1536 0q0 -52 -38 -90t-90 -38t-90 38t-38 90t38 90t90 38t90 -38t38 -90zM1664 1088v-512q0 -24 -16.5 -42.5t-40.5 -21.5l-1044 -122q13 -60 13 -70q0 -16 -24 -64h920q26 0 45 -19t19 -45 t-19 -45t-45 -19h-1024q-26 0 -45 19t-19 45q0 11 8 31.5t16 36t21.5 40t15.5 29.5l-177 823h-204q-26 0 -45 19t-19 45t19 45t45 19h256q16 0 28.5 -6.5t19.5 -15.5t13 -24.5t8 -26t5.5 -29.5t4.5 -26h1201q26 0 45 -19t19 -45z" />
+<glyph unicode="" horiz-adv-x="1664" d="M1664 928v-704q0 -92 -66 -158t-158 -66h-1216q-92 0 -158 66t-66 158v960q0 92 66 158t158 66h320q92 0 158 -66t66 -158v-32h672q92 0 158 -66t66 -158z" />
+<glyph unicode="" horiz-adv-x="1920" d="M1879 584q0 -31 -31 -66l-336 -396q-43 -51 -120.5 -86.5t-143.5 -35.5h-1088q-34 0 -60.5 13t-26.5 43q0 31 31 66l336 396q43 51 120.5 86.5t143.5 35.5h1088q34 0 60.5 -13t26.5 -43zM1536 928v-160h-832q-94 0 -197 -47.5t-164 -119.5l-337 -396l-5 -6q0 4 -0.5 12.5 t-0.5 12.5v960q0 92 66 158t158 66h320q92 0 158 -66t66 -158v-32h544q92 0 158 -66t66 -158z" />
+<glyph unicode="" horiz-adv-x="768" d="M704 1216q0 -26 -19 -45t-45 -19h-128v-1024h128q26 0 45 -19t19 -45t-19 -45l-256 -256q-19 -19 -45 -19t-45 19l-256 256q-19 19 -19 45t19 45t45 19h128v1024h-128q-26 0 -45 19t-19 45t19 45l256 256q19 19 45 19t45 -19l256 -256q19 -19 19 -45z" />
+<glyph unicode="" horiz-adv-x="1792" d="M1792 640q0 -26 -19 -45l-256 -256q-19 -19 -45 -19t-45 19t-19 45v128h-1024v-128q0 -26 -19 -45t-45 -19t-45 19l-256 256q-19 19 -19 45t19 45l256 256q19 19 45 19t45 -19t19 -45v-128h1024v128q0 26 19 45t45 19t45 -19l256 -256q19 -19 19 -45z" />
+<glyph unicode="" horiz-adv-x="2048" d="M640 640v-512h-256v512h256zM1024 1152v-1024h-256v1024h256zM2048 0v-128h-2048v1536h128v-1408h1920zM1408 896v-768h-256v768h256zM1792 1280v-1152h-256v1152h256z" />
+<glyph unicode="" d="M1280 926q-56 -25 -121 -34q68 40 93 117q-65 -38 -134 -51q-61 66 -153 66q-87 0 -148.5 -61.5t-61.5 -148.5q0 -29 5 -48q-129 7 -242 65t-192 155q-29 -50 -29 -106q0 -114 91 -175q-47 1 -100 26v-2q0 -75 50 -133.5t123 -72.5q-29 -8 -51 -8q-13 0 -39 4 q21 -63 74.5 -104t121.5 -42q-116 -90 -261 -90q-26 0 -50 3q148 -94 322 -94q112 0 210 35.5t168 95t120.5 137t75 162t24.5 168.5q0 18 -1 27q63 45 105 109zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5 t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
+<glyph unicode="" d="M1248 1408q119 0 203.5 -84.5t84.5 -203.5v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-188v595h199l30 232h-229v148q0 56 23.5 84t91.5 28l122 1v207q-63 9 -178 9q-136 0 -217.5 -80t-81.5 -226v-171h-200v-232h200v-595h-532q-119 0 -203.5 84.5t-84.5 203.5v960 q0 119 84.5 203.5t203.5 84.5h960z" />
+<glyph unicode="" horiz-adv-x="1792" d="M928 704q0 14 -9 23t-23 9q-66 0 -113 -47t-47 -113q0 -14 9 -23t23 -9t23 9t9 23q0 40 28 68t68 28q14 0 23 9t9 23zM1152 574q0 -106 -75 -181t-181 -75t-181 75t-75 181t75 181t181 75t181 -75t75 -181zM128 0h1536v128h-1536v-128zM1280 574q0 159 -112.5 271.5 t-271.5 112.5t-271.5 -112.5t-112.5 -271.5t112.5 -271.5t271.5 -112.5t271.5 112.5t112.5 271.5zM256 1216h384v128h-384v-128zM128 1024h1536v118v138h-828l-64 -128h-644v-128zM1792 1280v-1280q0 -53 -37.5 -90.5t-90.5 -37.5h-1536q-53 0 -90.5 37.5t-37.5 90.5v1280 q0 53 37.5 90.5t90.5 37.5h1536q53 0 90.5 -37.5t37.5 -90.5z" />
+<glyph unicode="" horiz-adv-x="1792" d="M832 1024q0 80 -56 136t-136 56t-136 -56t-56 -136q0 -42 19 -83q-41 19 -83 19q-80 0 -136 -56t-56 -136t56 -136t136 -56t136 56t56 136q0 42 -19 83q41 -19 83 -19q80 0 136 56t56 136zM1683 320q0 -17 -49 -66t-66 -49q-9 0 -28.5 16t-36.5 33t-38.5 40t-24.5 26 l-96 -96l220 -220q28 -28 28 -68q0 -42 -39 -81t-81 -39q-40 0 -68 28l-671 671q-176 -131 -365 -131q-163 0 -265.5 102.5t-102.5 265.5q0 160 95 313t248 248t313 95q163 0 265.5 -102.5t102.5 -265.5q0 -189 -131 -365l355 -355l96 96q-3 3 -26 24.5t-40 38.5t-33 36.5 t-16 28.5q0 17 49 66t66 49q13 0 23 -10q6 -6 46 -44.5t82 -79.5t86.5 -86t73 -78t28.5 -41z" />
+<glyph unicode="" horiz-adv-x="1920" d="M896 640q0 106 -75 181t-181 75t-181 -75t-75 -181t75 -181t181 -75t181 75t75 181zM1664 128q0 52 -38 90t-90 38t-90 -38t-38 -90q0 -53 37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1664 1152q0 52 -38 90t-90 38t-90 -38t-38 -90q0 -53 37.5 -90.5t90.5 -37.5 t90.5 37.5t37.5 90.5zM1280 731v-185q0 -10 -7 -19.5t-16 -10.5l-155 -24q-11 -35 -32 -76q34 -48 90 -115q7 -10 7 -20q0 -12 -7 -19q-23 -30 -82.5 -89.5t-78.5 -59.5q-11 0 -21 7l-115 90q-37 -19 -77 -31q-11 -108 -23 -155q-7 -24 -30 -24h-186q-11 0 -20 7.5t-10 17.5 l-23 153q-34 10 -75 31l-118 -89q-7 -7 -20 -7q-11 0 -21 8q-144 133 -144 160q0 9 7 19q10 14 41 53t47 61q-23 44 -35 82l-152 24q-10 1 -17 9.5t-7 19.5v185q0 10 7 19.5t16 10.5l155 24q11 35 32 76q-34 48 -90 115q-7 11 -7 20q0 12 7 20q22 30 82 89t79 59q11 0 21 -7 l115 -90q34 18 77 32q11 108 23 154q7 24 30 24h186q11 0 20 -7.5t10 -17.5l23 -153q34 -10 75 -31l118 89q8 7 20 7q11 0 21 -8q144 -133 144 -160q0 -9 -7 -19q-12 -16 -42 -54t-45 -60q23 -48 34 -82l152 -23q10 -2 17 -10.5t7 -19.5zM1920 198v-140q0 -16 -149 -31 q-12 -27 -30 -52q51 -113 51 -138q0 -4 -4 -7q-122 -71 -124 -71q-8 0 -46 47t-52 68q-20 -2 -30 -2t-30 2q-14 -21 -52 -68t-46 -47q-2 0 -124 71q-4 3 -4 7q0 25 51 138q-18 25 -30 52q-149 15 -149 31v140q0 16 149 31q13 29 30 52q-51 113 -51 138q0 4 4 7q4 2 35 20 t59 34t30 16q8 0 46 -46.5t52 -67.5q20 2 30 2t30 -2q51 71 92 112l6 2q4 0 124 -70q4 -3 4 -7q0 -25 -51 -138q17 -23 30 -52q149 -15 149 -31zM1920 1222v-140q0 -16 -149 -31q-12 -27 -30 -52q51 -113 51 -138q0 -4 -4 -7q-122 -71 -124 -71q-8 0 -46 47t-52 68 q-20 -2 -30 -2t-30 2q-14 -21 -52 -68t-46 -47q-2 0 -124 71q-4 3 -4 7q0 25 51 138q-18 25 -30 52q-149 15 -149 31v140q0 16 149 31q13 29 30 52q-51 113 -51 138q0 4 4 7q4 2 35 20t59 34t30 16q8 0 46 -46.5t52 -67.5q20 2 30 2t30 -2q51 71 92 112l6 2q4 0 124 -70 q4 -3 4 -7q0 -25 -51 -138q17 -23 30 -52q149 -15 149 -31z" />
+<glyph unicode="" horiz-adv-x="1792" d="M1408 768q0 -139 -94 -257t-256.5 -186.5t-353.5 -68.5q-86 0 -176 16q-124 -88 -278 -128q-36 -9 -86 -16h-3q-11 0 -20.5 8t-11.5 21q-1 3 -1 6.5t0.5 6.5t2 6l2.5 5t3.5 5.5t4 5t4.5 5t4 4.5q5 6 23 25t26 29.5t22.5 29t25 38.5t20.5 44q-124 72 -195 177t-71 224 q0 139 94 257t256.5 186.5t353.5 68.5t353.5 -68.5t256.5 -186.5t94 -257zM1792 512q0 -120 -71 -224.5t-195 -176.5q10 -24 20.5 -44t25 -38.5t22.5 -29t26 -29.5t23 -25q1 -1 4 -4.5t4.5 -5t4 -5t3.5 -5.5l2.5 -5t2 -6t0.5 -6.5t-1 -6.5q-3 -14 -13 -22t-22 -7 q-50 7 -86 16q-154 40 -278 128q-90 -16 -176 -16q-271 0 -472 132q58 -4 88 -4q161 0 309 45t264 129q125 92 192 212t67 254q0 77 -23 152q129 -71 204 -178t75 -230z" />
+<glyph unicode="" d="M256 192q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1408 768q0 51 -39 89.5t-89 38.5h-352q0 58 48 159.5t48 160.5q0 98 -32 145t-128 47q-26 -26 -38 -85t-30.5 -125.5t-59.5 -109.5q-22 -23 -77 -91q-4 -5 -23 -30t-31.5 -41t-34.5 -42.5 t-40 -44t-38.5 -35.5t-40 -27t-35.5 -9h-32v-640h32q13 0 31.5 -3t33 -6.5t38 -11t35 -11.5t35.5 -12.5t29 -10.5q211 -73 342 -73h121q192 0 192 167q0 26 -5 56q30 16 47.5 52.5t17.5 73.5t-18 69q53 50 53 119q0 25 -10 55.5t-25 47.5q32 1 53.5 47t21.5 81zM1536 769 q0 -89 -49 -163q9 -33 9 -69q0 -77 -38 -144q3 -21 3 -43q0 -101 -60 -178q1 -139 -85 -219.5t-227 -80.5h-36h-93q-96 0 -189.5 22.5t-216.5 65.5q-116 40 -138 40h-288q-53 0 -90.5 37.5t-37.5 90.5v640q0 53 37.5 90.5t90.5 37.5h274q36 24 137 155q58 75 107 128 q24 25 35.5 85.5t30.5 126.5t62 108q39 37 90 37q84 0 151 -32.5t102 -101.5t35 -186q0 -93 -48 -192h176q104 0 180 -76t76 -179z" />
+<glyph unicode="" d="M256 1088q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1408 512q0 35 -21.5 81t-53.5 47q15 17 25 47.5t10 55.5q0 69 -53 119q18 32 18 69t-17.5 73.5t-47.5 52.5q5 30 5 56q0 85 -49 126t-136 41h-128q-131 0 -342 -73q-5 -2 -29 -10.5 t-35.5 -12.5t-35 -11.5t-38 -11t-33 -6.5t-31.5 -3h-32v-640h32q16 0 35.5 -9t40 -27t38.5 -35.5t40 -44t34.5 -42.5t31.5 -41t23 -30q55 -68 77 -91q41 -43 59.5 -109.5t30.5 -125.5t38 -85q96 0 128 47t32 145q0 59 -48 160.5t-48 159.5h352q50 0 89 38.5t39 89.5z M1536 511q0 -103 -76 -179t-180 -76h-176q48 -99 48 -192q0 -118 -35 -186q-35 -69 -102 -101.5t-151 -32.5q-51 0 -90 37q-34 33 -54 82t-25.5 90.5t-17.5 84.5t-31 64q-48 50 -107 127q-101 131 -137 155h-274q-53 0 -90.5 37.5t-37.5 90.5v640q0 53 37.5 90.5t90.5 37.5 h288q22 0 138 40q128 44 223 66t200 22h112q140 0 226.5 -79t85.5 -216v-5q60 -77 60 -178q0 -22 -3 -43q38 -67 38 -144q0 -36 -9 -69q49 -74 49 -163z" />
+<glyph unicode="" horiz-adv-x="896" d="M832 1504v-1339l-449 -236q-22 -12 -40 -12q-21 0 -31.5 14.5t-10.5 35.5q0 6 2 20l86 500l-364 354q-25 27 -25 48q0 37 56 46l502 73l225 455q19 41 49 41z" />
+<glyph unicode="" horiz-adv-x="1792" d="M1664 940q0 81 -21.5 143t-55 98.5t-81.5 59.5t-94 31t-98 8t-112 -25.5t-110.5 -64t-86.5 -72t-60 -61.5q-18 -22 -49 -22t-49 22q-24 28 -60 61.5t-86.5 72t-110.5 64t-112 25.5t-98 -8t-94 -31t-81.5 -59.5t-55 -98.5t-21.5 -143q0 -168 187 -355l581 -560l580 559 q188 188 188 356zM1792 940q0 -221 -229 -450l-623 -600q-18 -18 -44 -18t-44 18l-624 602q-10 8 -27.5 26t-55.5 65.5t-68 97.5t-53.5 121t-23.5 138q0 220 127 344t351 124q62 0 126.5 -21.5t120 -58t95.5 -68.5t76 -68q36 36 76 68t95.5 68.5t120 58t126.5 21.5 q224 0 351 -124t127 -344z" />
+<glyph unicode="" horiz-adv-x="1664" d="M640 96q0 -4 1 -20t0.5 -26.5t-3 -23.5t-10 -19.5t-20.5 -6.5h-320q-119 0 -203.5 84.5t-84.5 203.5v704q0 119 84.5 203.5t203.5 84.5h320q13 0 22.5 -9.5t9.5 -22.5q0 -4 1 -20t0.5 -26.5t-3 -23.5t-10 -19.5t-20.5 -6.5h-320q-66 0 -113 -47t-47 -113v-704 q0 -66 47 -113t113 -47h288h11h13t11.5 -1t11.5 -3t8 -5.5t7 -9t2 -13.5zM1568 640q0 -26 -19 -45l-544 -544q-19 -19 -45 -19t-45 19t-19 45v288h-448q-26 0 -45 19t-19 45v384q0 26 19 45t45 19h448v288q0 26 19 45t45 19t45 -19l544 -544q19 -19 19 -45z" />
+<glyph unicode="" d="M237 122h231v694h-231v-694zM483 1030q-1 52 -36 86t-93 34t-94.5 -34t-36.5 -86q0 -51 35.5 -85.5t92.5 -34.5h1q59 0 95 34.5t36 85.5zM1068 122h231v398q0 154 -73 233t-193 79q-136 0 -209 -117h2v101h-231q3 -66 0 -694h231v388q0 38 7 56q15 35 45 59.5t74 24.5 q116 0 116 -157v-371zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
+<glyph unicode="" horiz-adv-x="1152" d="M480 672v448q0 14 -9 23t-23 9t-23 -9t-9 -23v-448q0 -14 9 -23t23 -9t23 9t9 23zM1152 320q0 -26 -19 -45t-45 -19h-429l-51 -483q-2 -12 -10.5 -20.5t-20.5 -8.5h-1q-27 0 -32 27l-76 485h-404q-26 0 -45 19t-19 45q0 123 78.5 221.5t177.5 98.5v512q-52 0 -90 38 t-38 90t38 90t90 38h640q52 0 90 -38t38 -90t-38 -90t-90 -38v-512q99 0 177.5 -98.5t78.5 -221.5z" />
+<glyph unicode="" horiz-adv-x="1792" d="M1408 608v-320q0 -119 -84.5 -203.5t-203.5 -84.5h-832q-119 0 -203.5 84.5t-84.5 203.5v832q0 119 84.5 203.5t203.5 84.5h704q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-704q-66 0 -113 -47t-47 -113v-832q0 -66 47 -113t113 -47h832q66 0 113 47t47 113v320 q0 14 9 23t23 9h64q14 0 23 -9t9 -23zM1792 1472v-512q0 -26 -19 -45t-45 -19t-45 19l-176 176l-652 -652q-10 -10 -23 -10t-23 10l-114 114q-10 10 -10 23t10 23l652 652l-176 176q-19 19 -19 45t19 45t45 19h512q26 0 45 -19t19 -45z" />
+<glyph unicode="" d="M1184 640q0 -26 -19 -45l-544 -544q-19 -19 -45 -19t-45 19t-19 45v288h-448q-26 0 -45 19t-19 45v384q0 26 19 45t45 19h448v288q0 26 19 45t45 19t45 -19l544 -544q19 -19 19 -45zM1536 992v-704q0 -119 -84.5 -203.5t-203.5 -84.5h-320q-13 0 -22.5 9.5t-9.5 22.5 q0 4 -1 20t-0.5 26.5t3 23.5t10 19.5t20.5 6.5h320q66 0 113 47t47 113v704q0 66 -47 113t-113 47h-288h-11h-13t-11.5 1t-11.5 3t-8 5.5t-7 9t-2 13.5q0 4 -1 20t-0.5 26.5t3 23.5t10 19.5t20.5 6.5h320q119 0 203.5 -84.5t84.5 -203.5z" />
+<glyph unicode="" horiz-adv-x="1664" d="M458 653q-74 162 -74 371h-256v-96q0 -78 94.5 -162t235.5 -113zM1536 928v96h-256q0 -209 -74 -371q141 29 235.5 113t94.5 162zM1664 1056v-128q0 -71 -41.5 -143t-112 -130t-173 -97.5t-215.5 -44.5q-42 -54 -95 -95q-38 -34 -52.5 -72.5t-14.5 -89.5q0 -54 30.5 -91 t97.5 -37q75 0 133.5 -45.5t58.5 -114.5v-64q0 -14 -9 -23t-23 -9h-832q-14 0 -23 9t-9 23v64q0 69 58.5 114.5t133.5 45.5q67 0 97.5 37t30.5 91q0 51 -14.5 89.5t-52.5 72.5q-53 41 -95 95q-113 5 -215.5 44.5t-173 97.5t-112 130t-41.5 143v128q0 40 28 68t68 28h288v96 q0 66 47 113t113 47h576q66 0 113 -47t47 -113v-96h288q40 0 68 -28t28 -68z" />
+<glyph unicode="" d="M394 184q-8 -9 -20 3q-13 11 -4 19q8 9 20 -3q12 -11 4 -19zM352 245q9 -12 0 -19q-8 -6 -17 7t0 18q9 7 17 -6zM291 305q-5 -7 -13 -2q-10 5 -7 12q3 5 13 2q10 -5 7 -12zM322 271q-6 -7 -16 3q-9 11 -2 16q6 6 16 -3q9 -11 2 -16zM451 159q-4 -12 -19 -6q-17 4 -13 15 t19 7q16 -5 13 -16zM514 154q0 -11 -16 -11q-17 -2 -17 11q0 11 16 11q17 2 17 -11zM572 164q2 -10 -14 -14t-18 8t14 15q16 2 18 -9zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-224q-16 0 -24.5 1t-19.5 5t-16 14.5t-5 27.5v239q0 97 -52 142q57 6 102.5 18t94 39 t81 66.5t53 105t20.5 150.5q0 121 -79 206q37 91 -8 204q-28 9 -81 -11t-92 -44l-38 -24q-93 26 -192 26t-192 -26q-16 11 -42.5 27t-83.5 38.5t-86 13.5q-44 -113 -7 -204q-79 -85 -79 -206q0 -85 20.5 -150t52.5 -105t80.5 -67t94 -39t102.5 -18q-40 -36 -49 -103 q-21 -10 -45 -15t-57 -5t-65.5 21.5t-55.5 62.5q-19 32 -48.5 52t-49.5 24l-20 3q-21 0 -29 -4.5t-5 -11.5t9 -14t13 -12l7 -5q22 -10 43.5 -38t31.5 -51l10 -23q13 -38 44 -61.5t67 -30t69.5 -7t55.5 3.5l23 4q0 -38 0.5 -103t0.5 -68q0 -22 -11 -33.5t-22 -13t-33 -1.5 h-224q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
+<glyph unicode="" horiz-adv-x="1664" d="M1280 64q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1536 64q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1664 288v-320q0 -40 -28 -68t-68 -28h-1472q-40 0 -68 28t-28 68v320q0 40 28 68t68 28h427q21 -56 70.5 -92 t110.5 -36h256q61 0 110.5 36t70.5 92h427q40 0 68 -28t28 -68zM1339 936q-17 -40 -59 -40h-256v-448q0 -26 -19 -45t-45 -19h-256q-26 0 -45 19t-19 45v448h-256q-42 0 -59 40q-17 39 14 69l448 448q18 19 45 19t45 -19l448 -448q31 -30 14 -69z" />
+<glyph unicode="" d="M1407 710q0 44 -7 113.5t-18 96.5q-12 30 -17 44t-9 36.5t-4 48.5q0 23 5 68.5t5 67.5q0 37 -10 55q-4 1 -13 1q-19 0 -58 -4.5t-59 -4.5q-60 0 -176 24t-175 24q-43 0 -94.5 -11.5t-85 -23.5t-89.5 -34q-137 -54 -202 -103q-96 -73 -159.5 -189.5t-88 -236t-24.5 -248.5 q0 -40 12.5 -120t12.5 -121q0 -23 -11 -66.5t-11 -65.5t12 -36.5t34 -14.5q24 0 72.5 11t73.5 11q57 0 169.5 -15.5t169.5 -15.5q181 0 284 36q129 45 235.5 152.5t166 245.5t59.5 275zM1535 712q0 -165 -70 -327.5t-196 -288t-281 -180.5q-124 -44 -326 -44 q-57 0 -170 14.5t-169 14.5q-24 0 -72.5 -14.5t-73.5 -14.5q-73 0 -123.5 55.5t-50.5 128.5q0 24 11 68t11 67q0 40 -12.5 120.5t-12.5 121.5q0 111 18 217.5t54.5 209.5t100.5 194t150 156q78 59 232 120q194 78 316 78q60 0 175.5 -24t173.5 -24q19 0 57 5t58 5 q81 0 118 -50.5t37 -134.5q0 -23 -5 -68t-5 -68q0 -10 1 -18.5t3 -17t4 -13.5t6.5 -16t6.5 -17q16 -40 25 -118.5t9 -136.5z" />
+<glyph unicode="" horiz-adv-x="1408" d="M1408 296q0 -27 -10 -70.5t-21 -68.5q-21 -50 -122 -106q-94 -51 -186 -51q-27 0 -52.5 3.5t-57.5 12.5t-47.5 14.5t-55.5 20.5t-49 18q-98 35 -175 83q-128 79 -264.5 215.5t-215.5 264.5q-48 77 -83 175q-3 9 -18 49t-20.5 55.5t-14.5 47.5t-12.5 57.5t-3.5 52.5 q0 92 51 186q56 101 106 122q25 11 68.5 21t70.5 10q14 0 21 -3q18 -6 53 -76q11 -19 30 -54t35 -63.5t31 -53.5q3 -4 17.5 -25t21.5 -35.5t7 -28.5q0 -20 -28.5 -50t-62 -55t-62 -53t-28.5 -46q0 -9 5 -22.5t8.5 -20.5t14 -24t11.5 -19q76 -137 174 -235t235 -174 q2 -1 19 -11.5t24 -14t20.5 -8.5t22.5 -5q18 0 46 28.5t53 62t55 62t50 28.5q14 0 28.5 -7t35.5 -21.5t25 -17.5q25 -15 53.5 -31t63.5 -35t54 -30q70 -35 76 -53q3 -7 3 -21z" />
+<glyph unicode="" horiz-adv-x="1408" d="M1120 1280h-832q-66 0 -113 -47t-47 -113v-832q0 -66 47 -113t113 -47h832q66 0 113 47t47 113v832q0 66 -47 113t-113 47zM1408 1120v-832q0 -119 -84.5 -203.5t-203.5 -84.5h-832q-119 0 -203.5 84.5t-84.5 203.5v832q0 119 84.5 203.5t203.5 84.5h832 q119 0 203.5 -84.5t84.5 -203.5z" />
+<glyph unicode="" horiz-adv-x="1280" d="M1152 1280h-1024v-1242l423 406l89 85l89 -85l423 -406v1242zM1164 1408q23 0 44 -9q33 -13 52.5 -41t19.5 -62v-1289q0 -34 -19.5 -62t-52.5 -41q-19 -8 -44 -8q-48 0 -83 32l-441 424l-441 -424q-36 -33 -83 -33q-23 0 -44 9q-33 13 -52.5 41t-19.5 62v1289 q0 34 19.5 62t52.5 41q21 9 44 9h1048z" />
+<glyph unicode="" d="M1280 343q0 11 -2 16q-3 8 -38.5 29.5t-88.5 49.5l-53 29q-5 3 -19 13t-25 15t-21 5q-18 0 -47 -32.5t-57 -65.5t-44 -33q-7 0 -16.5 3.5t-15.5 6.5t-17 9.5t-14 8.5q-99 55 -170.5 126.5t-126.5 170.5q-2 3 -8.5 14t-9.5 17t-6.5 15.5t-3.5 16.5q0 13 20.5 33.5t45 38.5 t45 39.5t20.5 36.5q0 10 -5 21t-15 25t-13 19q-3 6 -15 28.5t-25 45.5t-26.5 47.5t-25 40.5t-16.5 18t-16 2q-48 0 -101 -22q-46 -21 -80 -94.5t-34 -130.5q0 -16 2.5 -34t5 -30.5t9 -33t10 -29.5t12.5 -33t11 -30q60 -164 216.5 -320.5t320.5 -216.5q6 -2 30 -11t33 -12.5 t29.5 -10t33 -9t30.5 -5t34 -2.5q57 0 130.5 34t94.5 80q22 53 22 101zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
+<glyph unicode="" horiz-adv-x="1664" d="M1620 1128q-67 -98 -162 -167q1 -14 1 -42q0 -130 -38 -259.5t-115.5 -248.5t-184.5 -210.5t-258 -146t-323 -54.5q-271 0 -496 145q35 -4 78 -4q225 0 401 138q-105 2 -188 64.5t-114 159.5q33 -5 61 -5q43 0 85 11q-112 23 -185.5 111.5t-73.5 205.5v4q68 -38 146 -41 q-66 44 -105 115t-39 154q0 88 44 163q121 -149 294.5 -238.5t371.5 -99.5q-8 38 -8 74q0 134 94.5 228.5t228.5 94.5q140 0 236 -102q109 21 205 78q-37 -115 -142 -178q93 10 186 50z" />
+<glyph unicode="" horiz-adv-x="1024" d="M959 1524v-264h-157q-86 0 -116 -36t-30 -108v-189h293l-39 -296h-254v-759h-306v759h-255v296h255v218q0 186 104 288.5t277 102.5q147 0 228 -12z" />
+<glyph unicode="" d="M1536 640q0 -251 -146.5 -451.5t-378.5 -277.5q-27 -5 -39.5 7t-12.5 30v211q0 97 -52 142q57 6 102.5 18t94 39t81 66.5t53 105t20.5 150.5q0 121 -79 206q37 91 -8 204q-28 9 -81 -11t-92 -44l-38 -24q-93 26 -192 26t-192 -26q-16 11 -42.5 27t-83.5 38.5t-86 13.5 q-44 -113 -7 -204q-79 -85 -79 -206q0 -85 20.5 -150t52.5 -105t80.5 -67t94 -39t102.5 -18q-40 -36 -49 -103q-21 -10 -45 -15t-57 -5t-65.5 21.5t-55.5 62.5q-19 32 -48.5 52t-49.5 24l-20 3q-21 0 -29 -4.5t-5 -11.5t9 -14t13 -12l7 -5q22 -10 43.5 -38t31.5 -51l10 -23 q13 -38 44 -61.5t67 -30t69.5 -7t55.5 3.5l23 4q0 -38 0.5 -89t0.5 -54q0 -18 -13 -30t-40 -7q-232 77 -378.5 277.5t-146.5 451.5q0 209 103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+<glyph unicode="" horiz-adv-x="1664" d="M1664 960v-256q0 -26 -19 -45t-45 -19h-64q-26 0 -45 19t-19 45v256q0 106 -75 181t-181 75t-181 -75t-75 -181v-192h96q40 0 68 -28t28 -68v-576q0 -40 -28 -68t-68 -28h-960q-40 0 -68 28t-28 68v576q0 40 28 68t68 28h672v192q0 185 131.5 316.5t316.5 131.5 t316.5 -131.5t131.5 -316.5z" />
+<glyph unicode="" horiz-adv-x="1920" d="M1760 1408q66 0 113 -47t47 -113v-1216q0 -66 -47 -113t-113 -47h-1600q-66 0 -113 47t-47 113v1216q0 66 47 113t113 47h1600zM160 1280q-13 0 -22.5 -9.5t-9.5 -22.5v-224h1664v224q0 13 -9.5 22.5t-22.5 9.5h-1600zM1760 0q13 0 22.5 9.5t9.5 22.5v608h-1664v-608 q0 -13 9.5 -22.5t22.5 -9.5h1600zM256 128v128h256v-128h-256zM640 128v128h384v-128h-384z" />
+<glyph unicode="" horiz-adv-x="1408" d="M384 192q0 -80 -56 -136t-136 -56t-136 56t-56 136t56 136t136 56t136 -56t56 -136zM896 69q2 -28 -17 -48q-18 -21 -47 -21h-135q-25 0 -43 16.5t-20 41.5q-22 229 -184.5 391.5t-391.5 184.5q-25 2 -41.5 20t-16.5 43v135q0 29 21 47q17 17 43 17h5q160 -13 306 -80.5 t259 -181.5q114 -113 181.5 -259t80.5 -306zM1408 67q2 -27 -18 -47q-18 -20 -46 -20h-143q-26 0 -44.5 17.5t-19.5 42.5q-12 215 -101 408.5t-231.5 336t-336 231.5t-408.5 102q-25 1 -42.5 19.5t-17.5 43.5v143q0 28 20 46q18 18 44 18h3q262 -13 501.5 -120t425.5 -294 q187 -186 294 -425.5t120 -501.5z" />
+<glyph unicode="" d="M1040 320q0 -33 -23.5 -56.5t-56.5 -23.5t-56.5 23.5t-23.5 56.5t23.5 56.5t56.5 23.5t56.5 -23.5t23.5 -56.5zM1296 320q0 -33 -23.5 -56.5t-56.5 -23.5t-56.5 23.5t-23.5 56.5t23.5 56.5t56.5 23.5t56.5 -23.5t23.5 -56.5zM1408 160v320q0 13 -9.5 22.5t-22.5 9.5 h-1216q-13 0 -22.5 -9.5t-9.5 -22.5v-320q0 -13 9.5 -22.5t22.5 -9.5h1216q13 0 22.5 9.5t9.5 22.5zM178 640h1180l-157 482q-4 13 -16 21.5t-26 8.5h-782q-14 0 -26 -8.5t-16 -21.5zM1536 480v-320q0 -66 -47 -113t-113 -47h-1216q-66 0 -113 47t-47 113v320q0 25 16 75 l197 606q17 53 63 86t101 33h782q55 0 101 -33t63 -86l197 -606q16 -50 16 -75z" />
+<glyph unicode="" horiz-adv-x="1792" d="M1664 896q53 0 90.5 -37.5t37.5 -90.5t-37.5 -90.5t-90.5 -37.5v-384q0 -52 -38 -90t-90 -38q-417 347 -812 380q-58 -19 -91 -66t-31 -100.5t40 -92.5q-20 -33 -23 -65.5t6 -58t33.5 -55t48 -50t61.5 -50.5q-29 -58 -111.5 -83t-168.5 -11.5t-132 55.5q-7 23 -29.5 87.5 t-32 94.5t-23 89t-15 101t3.5 98.5t22 110.5h-122q-66 0 -113 47t-47 113v192q0 66 47 113t113 47h480q435 0 896 384q52 0 90 -38t38 -90v-384zM1536 292v954q-394 -302 -768 -343v-270q377 -42 768 -341z" />
+<glyph unicode="" horiz-adv-x="1792" d="M912 -160q0 16 -16 16q-59 0 -101.5 42.5t-42.5 101.5q0 16 -16 16t-16 -16q0 -73 51.5 -124.5t124.5 -51.5q16 0 16 16zM246 128h1300q-266 300 -266 832q0 51 -24 105t-69 103t-121.5 80.5t-169.5 31.5t-169.5 -31.5t-121.5 -80.5t-69 -103t-24 -105q0 -532 -266 -832z M1728 128q0 -52 -38 -90t-90 -38h-448q0 -106 -75 -181t-181 -75t-181 75t-75 181h-448q-52 0 -90 38t-38 90q50 42 91 88t85 119.5t74.5 158.5t50 206t19.5 260q0 152 117 282.5t307 158.5q-8 19 -8 39q0 40 28 68t68 28t68 -28t28 -68q0 -20 -8 -39q190 -28 307 -158.5 t117 -282.5q0 -139 19.5 -260t50 -206t74.5 -158.5t85 -119.5t91 -88z" />
+<glyph unicode="" d="M1376 640l138 -135q30 -28 20 -70q-12 -41 -52 -51l-188 -48l53 -186q12 -41 -19 -70q-29 -31 -70 -19l-186 53l-48 -188q-10 -40 -51 -52q-12 -2 -19 -2q-31 0 -51 22l-135 138l-135 -138q-28 -30 -70 -20q-41 11 -51 52l-48 188l-186 -53q-41 -12 -70 19q-31 29 -19 70 l53 186l-188 48q-40 10 -52 51q-10 42 20 70l138 135l-138 135q-30 28 -20 70q12 41 52 51l188 48l-53 186q-12 41 19 70q29 31 70 19l186 -53l48 188q10 41 51 51q41 12 70 -19l135 -139l135 139q29 30 70 19q41 -10 51 -51l48 -188l186 53q41 12 70 -19q31 -29 19 -70 l-53 -186l188 -48q40 -10 52 -51q10 -42 -20 -70z" />
+<glyph unicode="" horiz-adv-x="1792" d="M256 192q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1664 768q0 51 -39 89.5t-89 38.5h-576q0 20 15 48.5t33 55t33 68t15 84.5q0 67 -44.5 97.5t-115.5 30.5q-24 0 -90 -139q-24 -44 -37 -65q-40 -64 -112 -145q-71 -81 -101 -106 q-69 -57 -140 -57h-32v-640h32q72 0 167 -32t193.5 -64t179.5 -32q189 0 189 167q0 26 -5 56q30 16 47.5 52.5t17.5 73.5t-18 69q53 50 53 119q0 25 -10 55.5t-25 47.5h331q52 0 90 38t38 90zM1792 769q0 -105 -75.5 -181t-180.5 -76h-169q-4 -62 -37 -119q3 -21 3 -43 q0 -101 -60 -178q1 -139 -85 -219.5t-227 -80.5q-133 0 -322 69q-164 59 -223 59h-288q-53 0 -90.5 37.5t-37.5 90.5v640q0 53 37.5 90.5t90.5 37.5h288q10 0 21.5 4.5t23.5 14t22.5 18t24 22.5t20.5 21.5t19 21.5t14 17q65 74 100 129q13 21 33 62t37 72t40.5 63t55 49.5 t69.5 17.5q125 0 206.5 -67t81.5 -189q0 -68 -22 -128h374q104 0 180 -76t76 -179z" />
+<glyph unicode="" horiz-adv-x="1792" d="M1376 128h32v640h-32q-35 0 -67.5 12t-62.5 37t-50 46t-49 54q-2 3 -3.5 4.5t-4 4.5t-4.5 5q-72 81 -112 145q-14 22 -38 68q-1 3 -10.5 22.5t-18.5 36t-20 35.5t-21.5 30.5t-18.5 11.5q-71 0 -115.5 -30.5t-44.5 -97.5q0 -43 15 -84.5t33 -68t33 -55t15 -48.5h-576 q-50 0 -89 -38.5t-39 -89.5q0 -52 38 -90t90 -38h331q-15 -17 -25 -47.5t-10 -55.5q0 -69 53 -119q-18 -32 -18 -69t17.5 -73.5t47.5 -52.5q-4 -24 -4 -56q0 -85 48.5 -126t135.5 -41q84 0 183 32t194 64t167 32zM1664 192q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45 t45 -19t45 19t19 45zM1792 768v-640q0 -53 -37.5 -90.5t-90.5 -37.5h-288q-59 0 -223 -59q-190 -69 -317 -69q-142 0 -230 77.5t-87 217.5l1 5q-61 76 -61 178q0 22 3 43q-33 57 -37 119h-169q-105 0 -180.5 76t-75.5 181q0 103 76 179t180 76h374q-22 60 -22 128 q0 122 81.5 189t206.5 67q38 0 69.5 -17.5t55 -49.5t40.5 -63t37 -72t33 -62q35 -55 100 -129q2 -3 14 -17t19 -21.5t20.5 -21.5t24 -22.5t22.5 -18t23.5 -14t21.5 -4.5h288q53 0 90.5 -37.5t37.5 -90.5z" />
+<glyph unicode="" d="M1280 -64q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1408 700q0 189 -167 189q-26 0 -56 -5q-16 30 -52.5 47.5t-73.5 17.5t-69 -18q-50 53 -119 53q-25 0 -55.5 -10t-47.5 -25v331q0 52 -38 90t-90 38q-51 0 -89.5 -39t-38.5 -89v-576 q-20 0 -48.5 15t-55 33t-68 33t-84.5 15q-67 0 -97.5 -44.5t-30.5 -115.5q0 -24 139 -90q44 -24 65 -37q64 -40 145 -112q81 -71 106 -101q57 -69 57 -140v-32h640v32q0 72 32 167t64 193.5t32 179.5zM1536 705q0 -133 -69 -322q-59 -164 -59 -223v-288q0 -53 -37.5 -90.5 t-90.5 -37.5h-640q-53 0 -90.5 37.5t-37.5 90.5v288q0 10 -4.5 21.5t-14 23.5t-18 22.5t-22.5 24t-21.5 20.5t-21.5 19t-17 14q-74 65 -129 100q-21 13 -62 33t-72 37t-63 40.5t-49.5 55t-17.5 69.5q0 125 67 206.5t189 81.5q68 0 128 -22v374q0 104 76 180t179 76 q105 0 181 -75.5t76 -180.5v-169q62 -4 119 -37q21 3 43 3q101 0 178 -60q139 1 219.5 -85t80.5 -227z" />
+<glyph unicode="" d="M1408 576q0 84 -32 183t-64 194t-32 167v32h-640v-32q0 -35 -12 -67.5t-37 -62.5t-46 -50t-54 -49q-9 -8 -14 -12q-81 -72 -145 -112q-22 -14 -68 -38q-3 -1 -22.5 -10.5t-36 -18.5t-35.5 -20t-30.5 -21.5t-11.5 -18.5q0 -71 30.5 -115.5t97.5 -44.5q43 0 84.5 15t68 33 t55 33t48.5 15v-576q0 -50 38.5 -89t89.5 -39q52 0 90 38t38 90v331q46 -35 103 -35q69 0 119 53q32 -18 69 -18t73.5 17.5t52.5 47.5q24 -4 56 -4q85 0 126 48.5t41 135.5zM1280 1344q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1536 580 q0 -142 -77.5 -230t-217.5 -87l-5 1q-76 -61 -178 -61q-22 0 -43 3q-54 -30 -119 -37v-169q0 -105 -76 -180.5t-181 -75.5q-103 0 -179 76t-76 180v374q-54 -22 -128 -22q-121 0 -188.5 81.5t-67.5 206.5q0 38 17.5 69.5t49.5 55t63 40.5t72 37t62 33q55 35 129 100 q3 2 17 14t21.5 19t21.5 20.5t22.5 24t18 22.5t14 23.5t4.5 21.5v288q0 53 37.5 90.5t90.5 37.5h640q53 0 90.5 -37.5t37.5 -90.5v-288q0 -59 59 -223q69 -190 69 -317z" />
+<glyph unicode="" d="M1280 576v128q0 26 -19 45t-45 19h-502l189 189q19 19 19 45t-19 45l-91 91q-18 18 -45 18t-45 -18l-362 -362l-91 -91q-18 -18 -18 -45t18 -45l91 -91l362 -362q18 -18 45 -18t45 18l91 91q18 18 18 45t-18 45l-189 189h502q26 0 45 19t19 45zM1536 640 q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+<glyph unicode="" d="M1285 640q0 27 -18 45l-91 91l-362 362q-18 18 -45 18t-45 -18l-91 -91q-18 -18 -18 -45t18 -45l189 -189h-502q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45t45 -19h502l-189 -189q-19 -19 -19 -45t19 -45l91 -91q18 -18 45 -18t45 18l362 362l91 91q18 18 18 45zM1536 640 q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+<glyph unicode="" d="M1284 641q0 27 -18 45l-362 362l-91 91q-18 18 -45 18t-45 -18l-91 -91l-362 -362q-18 -18 -18 -45t18 -45l91 -91q18 -18 45 -18t45 18l189 189v-502q0 -26 19 -45t45 -19h128q26 0 45 19t19 45v502l189 -189q19 -19 45 -19t45 19l91 91q18 18 18 45zM1536 640 q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+<glyph unicode="" d="M1284 639q0 27 -18 45l-91 91q-18 18 -45 18t-45 -18l-189 -189v502q0 26 -19 45t-45 19h-128q-26 0 -45 -19t-19 -45v-502l-189 189q-19 19 -45 19t-45 -19l-91 -91q-18 -18 -18 -45t18 -45l362 -362l91 -91q18 -18 45 -18t45 18l91 91l362 362q18 18 18 45zM1536 640 q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+<glyph unicode="" d="M768 1408q209 0 385.5 -103t279.5 -279.5t103 -385.5t-103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103zM1042 887q-2 -1 -9.5 -9.5t-13.5 -9.5q2 0 4.5 5t5 11t3.5 7q6 7 22 15q14 6 52 12q34 8 51 -11 q-2 2 9.5 13t14.5 12q3 2 15 4.5t15 7.5l2 22q-12 -1 -17.5 7t-6.5 21q0 -2 -6 -8q0 7 -4.5 8t-11.5 -1t-9 -1q-10 3 -15 7.5t-8 16.5t-4 15q-2 5 -9.5 10.5t-9.5 10.5q-1 2 -2.5 5.5t-3 6.5t-4 5.5t-5.5 2.5t-7 -5t-7.5 -10t-4.5 -5q-3 2 -6 1.5t-4.5 -1t-4.5 -3t-5 -3.5 q-3 -2 -8.5 -3t-8.5 -2q15 5 -1 11q-10 4 -16 3q9 4 7.5 12t-8.5 14h5q-1 4 -8.5 8.5t-17.5 8.5t-13 6q-8 5 -34 9.5t-33 0.5q-5 -6 -4.5 -10.5t4 -14t3.5 -12.5q1 -6 -5.5 -13t-6.5 -12q0 -7 14 -15.5t10 -21.5q-3 -8 -16 -16t-16 -12q-5 -8 -1.5 -18.5t10.5 -16.5 q2 -2 1.5 -4t-3.5 -4.5t-5.5 -4t-6.5 -3.5l-3 -2q-11 -5 -20.5 6t-13.5 26q-7 25 -16 30q-23 8 -29 -1q-5 13 -41 26q-25 9 -58 4q6 1 0 15q-7 15 -19 12q3 6 4 17.5t1 13.5q3 13 12 23q1 1 7 8.5t9.5 13.5t0.5 6q35 -4 50 11q5 5 11.5 17t10.5 17q9 6 14 5.5t14.5 -5.5 t14.5 -5q14 -1 15.5 11t-7.5 20q12 -1 3 17q-5 7 -8 9q-12 4 -27 -5q-8 -4 2 -8q-1 1 -9.5 -10.5t-16.5 -17.5t-16 5q-1 1 -5.5 13.5t-9.5 13.5q-8 0 -16 -15q3 8 -11 15t-24 8q19 12 -8 27q-7 4 -20.5 5t-19.5 -4q-5 -7 -5.5 -11.5t5 -8t10.5 -5.5t11.5 -4t8.5 -3 q14 -10 8 -14q-2 -1 -8.5 -3.5t-11.5 -4.5t-6 -4q-3 -4 0 -14t-2 -14q-5 5 -9 17.5t-7 16.5q7 -9 -25 -6l-10 1q-4 0 -16 -2t-20.5 -1t-13.5 8q-4 8 0 20q1 4 4 2q-4 3 -11 9.5t-10 8.5q-46 -15 -94 -41q6 -1 12 1q5 2 13 6.5t10 5.5q34 14 42 7l5 5q14 -16 20 -25 q-7 4 -30 1q-20 -6 -22 -12q7 -12 5 -18q-4 3 -11.5 10t-14.5 11t-15 5q-16 0 -22 -1q-146 -80 -235 -222q7 -7 12 -8q4 -1 5 -9t2.5 -11t11.5 3q9 -8 3 -19q1 1 44 -27q19 -17 21 -21q3 -11 -10 -18q-1 2 -9 9t-9 4q-3 -5 0.5 -18.5t10.5 -12.5q-7 0 -9.5 -16t-2.5 -35.5 t-1 -23.5l2 -1q-3 -12 5.5 -34.5t21.5 -19.5q-13 -3 20 -43q6 -8 8 -9q3 -2 12 -7.5t15 -10t10 -10.5q4 -5 10 -22.5t14 -23.5q-2 -6 9.5 -20t10.5 -23q-1 0 -2.5 -1t-2.5 -1q3 -7 15.5 -14t15.5 -13q1 -3 2 -10t3 -11t8 -2q2 20 -24 62q-15 25 -17 29q-3 5 -5.5 15.5 t-4.5 14.5q2 0 6 -1.5t8.5 -3.5t7.5 -4t2 -3q-3 -7 2 -17.5t12 -18.5t17 -19t12 -13q6 -6 14 -19.5t0 -13.5q9 0 20 -10t17 -20q5 -8 8 -26t5 -24q2 -7 8.5 -13.5t12.5 -9.5l16 -8t13 -7q5 -2 18.5 -10.5t21.5 -11.5q10 -4 16 -4t14.5 2.5t13.5 3.5q15 2 29 -15t21 -21 q36 -19 55 -11q-2 -1 0.5 -7.5t8 -15.5t9 -14.5t5.5 -8.5q5 -6 18 -15t18 -15q6 4 7 9q-3 -8 7 -20t18 -10q14 3 14 32q-31 -15 -49 18q0 1 -2.5 5.5t-4 8.5t-2.5 8.5t0 7.5t5 3q9 0 10 3.5t-2 12.5t-4 13q-1 8 -11 20t-12 15q-5 -9 -16 -8t-16 9q0 -1 -1.5 -5.5t-1.5 -6.5 q-13 0 -15 1q1 3 2.5 17.5t3.5 22.5q1 4 5.5 12t7.5 14.5t4 12.5t-4.5 9.5t-17.5 2.5q-19 -1 -26 -20q-1 -3 -3 -10.5t-5 -11.5t-9 -7q-7 -3 -24 -2t-24 5q-13 8 -22.5 29t-9.5 37q0 10 2.5 26.5t3 25t-5.5 24.5q3 2 9 9.5t10 10.5q2 1 4.5 1.5t4.5 0t4 1.5t3 6q-1 1 -4 3 q-3 3 -4 3q7 -3 28.5 1.5t27.5 -1.5q15 -11 22 2q0 1 -2.5 9.5t-0.5 13.5q5 -27 29 -9q3 -3 15.5 -5t17.5 -5q3 -2 7 -5.5t5.5 -4.5t5 0.5t8.5 6.5q10 -14 12 -24q11 -40 19 -44q7 -3 11 -2t4.5 9.5t0 14t-1.5 12.5l-1 8v18l-1 8q-15 3 -18.5 12t1.5 18.5t15 18.5q1 1 8 3.5 t15.5 6.5t12.5 8q21 19 15 35q7 0 11 9q-1 0 -5 3t-7.5 5t-4.5 2q9 5 2 16q5 3 7.5 11t7.5 10q9 -12 21 -2q7 8 1 16q5 7 20.5 10.5t18.5 9.5q7 -2 8 2t1 12t3 12q4 5 15 9t13 5l17 11q3 4 0 4q18 -2 31 11q10 11 -6 20q3 6 -3 9.5t-15 5.5q3 1 11.5 0.5t10.5 1.5 q15 10 -7 16q-17 5 -43 -12zM879 10q206 36 351 189q-3 3 -12.5 4.5t-12.5 3.5q-18 7 -24 8q1 7 -2.5 13t-8 9t-12.5 8t-11 7q-2 2 -7 6t-7 5.5t-7.5 4.5t-8.5 2t-10 -1l-3 -1q-3 -1 -5.5 -2.5t-5.5 -3t-4 -3t0 -2.5q-21 17 -36 22q-5 1 -11 5.5t-10.5 7t-10 1.5t-11.5 -7 q-5 -5 -6 -15t-2 -13q-7 5 0 17.5t2 18.5q-3 6 -10.5 4.5t-12 -4.5t-11.5 -8.5t-9 -6.5t-8.5 -5.5t-8.5 -7.5q-3 -4 -6 -12t-5 -11q-2 4 -11.5 6.5t-9.5 5.5q2 -10 4 -35t5 -38q7 -31 -12 -48q-27 -25 -29 -40q-4 -22 12 -26q0 -7 -8 -20.5t-7 -21.5q0 -6 2 -16z" />
+<glyph unicode="" horiz-adv-x="1664" d="M384 64q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1028 484l-682 -682q-37 -37 -90 -37q-52 0 -91 37l-106 108q-38 36 -38 90q0 53 38 91l681 681q39 -98 114.5 -173.5t173.5 -114.5zM1662 919q0 -39 -23 -106q-47 -134 -164.5 -217.5 t-258.5 -83.5q-185 0 -316.5 131.5t-131.5 316.5t131.5 316.5t316.5 131.5q58 0 121.5 -16.5t107.5 -46.5q16 -11 16 -28t-16 -28l-293 -169v-224l193 -107q5 3 79 48.5t135.5 81t70.5 35.5q15 0 23.5 -10t8.5 -25z" />
+<glyph unicode="" horiz-adv-x="1792" d="M1024 128h640v128h-640v-128zM640 640h1024v128h-1024v-128zM1280 1152h384v128h-384v-128zM1792 320v-256q0 -26 -19 -45t-45 -19h-1664q-26 0 -45 19t-19 45v256q0 26 19 45t45 19h1664q26 0 45 -19t19 -45zM1792 832v-256q0 -26 -19 -45t-45 -19h-1664q-26 0 -45 19 t-19 45v256q0 26 19 45t45 19h1664q26 0 45 -19t19 -45zM1792 1344v-256q0 -26 -19 -45t-45 -19h-1664q-26 0 -45 19t-19 45v256q0 26 19 45t45 19h1664q26 0 45 -19t19 -45z" />
+<glyph unicode="" horiz-adv-x="1408" d="M1403 1241q17 -41 -14 -70l-493 -493v-742q0 -42 -39 -59q-13 -5 -25 -5q-27 0 -45 19l-256 256q-19 19 -19 45v486l-493 493q-31 29 -14 70q17 39 59 39h1280q42 0 59 -39z" />
+<glyph unicode="" horiz-adv-x="1792" d="M640 1280h512v128h-512v-128zM1792 640v-480q0 -66 -47 -113t-113 -47h-1472q-66 0 -113 47t-47 113v480h672v-160q0 -26 19 -45t45 -19h320q26 0 45 19t19 45v160h672zM1024 640v-128h-256v128h256zM1792 1120v-384h-1792v384q0 66 47 113t113 47h352v160q0 40 28 68 t68 28h576q40 0 68 -28t28 -68v-160h352q66 0 113 -47t47 -113z" />
+<glyph unicode="" d="M1283 995l-355 -355l355 -355l144 144q29 31 70 14q39 -17 39 -59v-448q0 -26 -19 -45t-45 -19h-448q-42 0 -59 40q-17 39 14 69l144 144l-355 355l-355 -355l144 -144q31 -30 14 -69q-17 -40 -59 -40h-448q-26 0 -45 19t-19 45v448q0 42 40 59q39 17 69 -14l144 -144 l355 355l-355 355l-144 -144q-19 -19 -45 -19q-12 0 -24 5q-40 17 -40 59v448q0 26 19 45t45 19h448q42 0 59 -40q17 -39 -14 -69l-144 -144l355 -355l355 355l-144 144q-31 30 -14 69q17 40 59 40h448q26 0 45 -19t19 -45v-448q0 -42 -39 -59q-13 -5 -25 -5q-26 0 -45 19z " />
+<glyph unicode="" horiz-adv-x="1920" d="M593 640q-162 -5 -265 -128h-134q-82 0 -138 40.5t-56 118.5q0 353 124 353q6 0 43.5 -21t97.5 -42.5t119 -21.5q67 0 133 23q-5 -37 -5 -66q0 -139 81 -256zM1664 3q0 -120 -73 -189.5t-194 -69.5h-874q-121 0 -194 69.5t-73 189.5q0 53 3.5 103.5t14 109t26.5 108.5 t43 97.5t62 81t85.5 53.5t111.5 20q10 0 43 -21.5t73 -48t107 -48t135 -21.5t135 21.5t107 48t73 48t43 21.5q61 0 111.5 -20t85.5 -53.5t62 -81t43 -97.5t26.5 -108.5t14 -109t3.5 -103.5zM640 1280q0 -106 -75 -181t-181 -75t-181 75t-75 181t75 181t181 75t181 -75 t75 -181zM1344 896q0 -159 -112.5 -271.5t-271.5 -112.5t-271.5 112.5t-112.5 271.5t112.5 271.5t271.5 112.5t271.5 -112.5t112.5 -271.5zM1920 671q0 -78 -56 -118.5t-138 -40.5h-134q-103 123 -265 128q81 117 81 256q0 29 -5 66q66 -23 133 -23q59 0 119 21.5t97.5 42.5 t43.5 21q124 0 124 -353zM1792 1280q0 -106 -75 -181t-181 -75t-181 75t-75 181t75 181t181 75t181 -75t75 -181z" />
+<glyph unicode="" horiz-adv-x="1664" d="M1456 320q0 40 -28 68l-208 208q-28 28 -68 28q-42 0 -72 -32q3 -3 19 -18.5t21.5 -21.5t15 -19t13 -25.5t3.5 -27.5q0 -40 -28 -68t-68 -28q-15 0 -27.5 3.5t-25.5 13t-19 15t-21.5 21.5t-18.5 19q-33 -31 -33 -73q0 -40 28 -68l206 -207q27 -27 68 -27q40 0 68 26 l147 146q28 28 28 67zM753 1025q0 40 -28 68l-206 207q-28 28 -68 28q-39 0 -68 -27l-147 -146q-28 -28 -28 -67q0 -40 28 -68l208 -208q27 -27 68 -27q42 0 72 31q-3 3 -19 18.5t-21.5 21.5t-15 19t-13 25.5t-3.5 27.5q0 40 28 68t68 28q15 0 27.5 -3.5t25.5 -13t19 -15 t21.5 -21.5t18.5 -19q33 31 33 73zM1648 320q0 -120 -85 -203l-147 -146q-83 -83 -203 -83q-121 0 -204 85l-206 207q-83 83 -83 203q0 123 88 209l-88 88q-86 -88 -208 -88q-120 0 -204 84l-208 208q-84 84 -84 204t85 203l147 146q83 83 203 83q121 0 204 -85l206 -207 q83 -83 83 -203q0 -123 -88 -209l88 -88q86 88 208 88q120 0 204 -84l208 -208q84 -84 84 -204z" />
+<glyph unicode="" horiz-adv-x="1920" d="M1920 384q0 -159 -112.5 -271.5t-271.5 -112.5h-1088q-185 0 -316.5 131.5t-131.5 316.5q0 132 71 241.5t187 163.5q-2 28 -2 43q0 212 150 362t362 150q158 0 286.5 -88t187.5 -230q70 62 166 62q106 0 181 -75t75 -181q0 -75 -41 -138q129 -30 213 -134.5t84 -239.5z " />
+<glyph unicode="" horiz-adv-x="1664" d="M1527 88q56 -89 21.5 -152.5t-140.5 -63.5h-1152q-106 0 -140.5 63.5t21.5 152.5l503 793v399h-64q-26 0 -45 19t-19 45t19 45t45 19h512q26 0 45 -19t19 -45t-19 -45t-45 -19h-64v-399zM748 813l-272 -429h712l-272 429l-20 31v37v399h-128v-399v-37z" />
+<glyph unicode="" horiz-adv-x="1792" d="M960 640q26 0 45 -19t19 -45t-19 -45t-45 -19t-45 19t-19 45t19 45t45 19zM1260 576l507 -398q28 -20 25 -56q-5 -35 -35 -51l-128 -64q-13 -7 -29 -7q-17 0 -31 8l-690 387l-110 -66q-8 -4 -12 -5q14 -49 10 -97q-7 -77 -56 -147.5t-132 -123.5q-132 -84 -277 -84 q-136 0 -222 78q-90 84 -79 207q7 76 56 147t131 124q132 84 278 84q83 0 151 -31q9 13 22 22l122 73l-122 73q-13 9 -22 22q-68 -31 -151 -31q-146 0 -278 84q-82 53 -131 124t-56 147q-5 59 15.5 113t63.5 93q85 79 222 79q145 0 277 -84q83 -52 132 -123t56 -148 q4 -48 -10 -97q4 -1 12 -5l110 -66l690 387q14 8 31 8q16 0 29 -7l128 -64q30 -16 35 -51q3 -36 -25 -56zM579 836q46 42 21 108t-106 117q-92 59 -192 59q-74 0 -113 -36q-46 -42 -21 -108t106 -117q92 -59 192 -59q74 0 113 36zM494 91q81 51 106 117t-21 108 q-39 36 -113 36q-100 0 -192 -59q-81 -51 -106 -117t21 -108q39 -36 113 -36q100 0 192 59zM672 704l96 -58v11q0 36 33 56l14 8l-79 47l-26 -26q-3 -3 -10 -11t-12 -12q-2 -2 -4 -3.5t-3 -2.5zM896 480l96 -32l736 576l-128 64l-768 -431v-113l-160 -96l9 -8q2 -2 7 -6 q4 -4 11 -12t11 -12l26 -26zM1600 64l128 64l-520 408l-177 -138q-2 -3 -13 -7z" />
+<glyph unicode="" horiz-adv-x="1792" d="M1696 1152q40 0 68 -28t28 -68v-1216q0 -40 -28 -68t-68 -28h-960q-40 0 -68 28t-28 68v288h-544q-40 0 -68 28t-28 68v672q0 40 20 88t48 76l408 408q28 28 76 48t88 20h416q40 0 68 -28t28 -68v-328q68 40 128 40h416zM1152 939l-299 -299h299v299zM512 1323l-299 -299 h299v299zM708 676l316 316v416h-384v-416q0 -40 -28 -68t-68 -28h-416v-640h512v256q0 40 20 88t48 76zM1664 -128v1152h-384v-416q0 -40 -28 -68t-68 -28h-416v-640h896z" />
+<glyph unicode="" horiz-adv-x="1408" d="M1404 151q0 -117 -79 -196t-196 -79q-135 0 -235 100l-777 776q-113 115 -113 271q0 159 110 270t269 111q158 0 273 -113l605 -606q10 -10 10 -22q0 -16 -30.5 -46.5t-46.5 -30.5q-13 0 -23 10l-606 607q-79 77 -181 77q-106 0 -179 -75t-73 -181q0 -105 76 -181 l776 -777q63 -63 145 -63q64 0 106 42t42 106q0 82 -63 145l-581 581q-26 24 -60 24q-29 0 -48 -19t-19 -48q0 -32 25 -59l410 -410q10 -10 10 -22q0 -16 -31 -47t-47 -31q-12 0 -22 10l-410 410q-63 61 -63 149q0 82 57 139t139 57q88 0 149 -63l581 -581q100 -98 100 -235 z" />
+<glyph unicode="" d="M384 0h768v384h-768v-384zM1280 0h128v896q0 14 -10 38.5t-20 34.5l-281 281q-10 10 -34 20t-39 10v-416q0 -40 -28 -68t-68 -28h-576q-40 0 -68 28t-28 68v416h-128v-1280h128v416q0 40 28 68t68 28h832q40 0 68 -28t28 -68v-416zM896 928v320q0 13 -9.5 22.5t-22.5 9.5 h-192q-13 0 -22.5 -9.5t-9.5 -22.5v-320q0 -13 9.5 -22.5t22.5 -9.5h192q13 0 22.5 9.5t9.5 22.5zM1536 896v-928q0 -40 -28 -68t-68 -28h-1344q-40 0 -68 28t-28 68v1344q0 40 28 68t68 28h928q40 0 88 -20t76 -48l280 -280q28 -28 48 -76t20 -88z" />
+<glyph unicode="" d="M1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
+<glyph unicode="" d="M1536 192v-128q0 -26 -19 -45t-45 -19h-1408q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1408q26 0 45 -19t19 -45zM1536 704v-128q0 -26 -19 -45t-45 -19h-1408q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1408q26 0 45 -19t19 -45zM1536 1216v-128q0 -26 -19 -45 t-45 -19h-1408q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1408q26 0 45 -19t19 -45z" />
+<glyph unicode="" horiz-adv-x="1792" d="M384 128q0 -80 -56 -136t-136 -56t-136 56t-56 136t56 136t136 56t136 -56t56 -136zM384 640q0 -80 -56 -136t-136 -56t-136 56t-56 136t56 136t136 56t136 -56t56 -136zM1792 224v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1216q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5 t22.5 9.5h1216q13 0 22.5 -9.5t9.5 -22.5zM384 1152q0 -80 -56 -136t-136 -56t-136 56t-56 136t56 136t136 56t136 -56t56 -136zM1792 736v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1216q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1216q13 0 22.5 -9.5t9.5 -22.5z M1792 1248v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1216q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1216q13 0 22.5 -9.5t9.5 -22.5z" />
+<glyph unicode="" horiz-adv-x="1792" d="M381 -84q0 -80 -54.5 -126t-135.5 -46q-106 0 -172 66l57 88q49 -45 106 -45q29 0 50.5 14.5t21.5 42.5q0 64 -105 56l-26 56q8 10 32.5 43.5t42.5 54t37 38.5v1q-16 0 -48.5 -1t-48.5 -1v-53h-106v152h333v-88l-95 -115q51 -12 81 -49t30 -88zM383 543v-159h-362 q-6 36 -6 54q0 51 23.5 93t56.5 68t66 47.5t56.5 43.5t23.5 45q0 25 -14.5 38.5t-39.5 13.5q-46 0 -81 -58l-85 59q24 51 71.5 79.5t105.5 28.5q73 0 123 -41.5t50 -112.5q0 -50 -34 -91.5t-75 -64.5t-75.5 -50.5t-35.5 -52.5h127v60h105zM1792 224v-192q0 -13 -9.5 -22.5 t-22.5 -9.5h-1216q-13 0 -22.5 9.5t-9.5 22.5v192q0 14 9 23t23 9h1216q13 0 22.5 -9.5t9.5 -22.5zM384 1123v-99h-335v99h107q0 41 0.5 122t0.5 121v12h-2q-8 -17 -50 -54l-71 76l136 127h106v-404h108zM1792 736v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1216q-13 0 -22.5 9.5 t-9.5 22.5v192q0 14 9 23t23 9h1216q13 0 22.5 -9.5t9.5 -22.5zM1792 1248v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1216q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1216q13 0 22.5 -9.5t9.5 -22.5z" />
+<glyph unicode="" horiz-adv-x="1792" d="M1760 640q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-1728q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h1728zM483 704q-28 35 -51 80q-48 97 -48 188q0 181 134 309q133 127 393 127q50 0 167 -19q66 -12 177 -48q10 -38 21 -118q14 -123 14 -183q0 -18 -5 -45l-12 -3l-84 6 l-14 2q-50 149 -103 205q-88 91 -210 91q-114 0 -182 -59q-67 -58 -67 -146q0 -73 66 -140t279 -129q69 -20 173 -66q58 -28 95 -52h-743zM990 448h411q7 -39 7 -92q0 -111 -41 -212q-23 -55 -71 -104q-37 -35 -109 -81q-80 -48 -153 -66q-80 -21 -203 -21q-114 0 -195 23 l-140 40q-57 16 -72 28q-8 8 -8 22v13q0 108 -2 156q-1 30 0 68l2 37v44l102 2q15 -34 30 -71t22.5 -56t12.5 -27q35 -57 80 -94q43 -36 105 -57q59 -22 132 -22q64 0 139 27q77 26 122 86q47 61 47 129q0 84 -81 157q-34 29 -137 71z" />
+<glyph unicode="" d="M48 1313q-37 2 -45 4l-3 88q13 1 40 1q60 0 112 -4q132 -7 166 -7q86 0 168 3q116 4 146 5q56 0 86 2l-1 -14l2 -64v-9q-60 -9 -124 -9q-60 0 -79 -25q-13 -14 -13 -132q0 -13 0.5 -32.5t0.5 -25.5l1 -229l14 -280q6 -124 51 -202q35 -59 96 -92q88 -47 177 -47 q104 0 191 28q56 18 99 51q48 36 65 64q36 56 53 114q21 73 21 229q0 79 -3.5 128t-11 122.5t-13.5 159.5l-4 59q-5 67 -24 88q-34 35 -77 34l-100 -2l-14 3l2 86h84l205 -10q76 -3 196 10l18 -2q6 -38 6 -51q0 -7 -4 -31q-45 -12 -84 -13q-73 -11 -79 -17q-15 -15 -15 -41 q0 -7 1.5 -27t1.5 -31q8 -19 22 -396q6 -195 -15 -304q-15 -76 -41 -122q-38 -65 -112 -123q-75 -57 -182 -89q-109 -33 -255 -33q-167 0 -284 46q-119 47 -179 122q-61 76 -83 195q-16 80 -16 237v333q0 188 -17 213q-25 36 -147 39zM1536 -96v64q0 14 -9 23t-23 9h-1472 q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h1472q14 0 23 9t9 23z" />
+<glyph unicode="" horiz-adv-x="1664" d="M512 160v192q0 14 -9 23t-23 9h-320q-14 0 -23 -9t-9 -23v-192q0 -14 9 -23t23 -9h320q14 0 23 9t9 23zM512 544v192q0 14 -9 23t-23 9h-320q-14 0 -23 -9t-9 -23v-192q0 -14 9 -23t23 -9h320q14 0 23 9t9 23zM1024 160v192q0 14 -9 23t-23 9h-320q-14 0 -23 -9t-9 -23 v-192q0 -14 9 -23t23 -9h320q14 0 23 9t9 23zM512 928v192q0 14 -9 23t-23 9h-320q-14 0 -23 -9t-9 -23v-192q0 -14 9 -23t23 -9h320q14 0 23 9t9 23zM1024 544v192q0 14 -9 23t-23 9h-320q-14 0 -23 -9t-9 -23v-192q0 -14 9 -23t23 -9h320q14 0 23 9t9 23zM1536 160v192 q0 14 -9 23t-23 9h-320q-14 0 -23 -9t-9 -23v-192q0 -14 9 -23t23 -9h320q14 0 23 9t9 23zM1024 928v192q0 14 -9 23t-23 9h-320q-14 0 -23 -9t-9 -23v-192q0 -14 9 -23t23 -9h320q14 0 23 9t9 23zM1536 544v192q0 14 -9 23t-23 9h-320q-14 0 -23 -9t-9 -23v-192 q0 -14 9 -23t23 -9h320q14 0 23 9t9 23zM1536 928v192q0 14 -9 23t-23 9h-320q-14 0 -23 -9t-9 -23v-192q0 -14 9 -23t23 -9h320q14 0 23 9t9 23zM1664 1248v-1088q0 -66 -47 -113t-113 -47h-1344q-66 0 -113 47t-47 113v1088q0 66 47 113t113 47h1344q66 0 113 -47t47 -113 z" />
+<glyph unicode="" horiz-adv-x="1664" d="M1190 955l293 293l-107 107l-293 -293zM1637 1248q0 -27 -18 -45l-1286 -1286q-18 -18 -45 -18t-45 18l-198 198q-18 18 -18 45t18 45l1286 1286q18 18 45 18t45 -18l198 -198q18 -18 18 -45zM286 1438l98 -30l-98 -30l-30 -98l-30 98l-98 30l98 30l30 98zM636 1276 l196 -60l-196 -60l-60 -196l-60 196l-196 60l196 60l60 196zM1566 798l98 -30l-98 -30l-30 -98l-30 98l-98 30l98 30l30 98zM926 1438l98 -30l-98 -30l-30 -98l-30 98l-98 30l98 30l30 98z" />
+<glyph unicode="" horiz-adv-x="1792" d="M640 128q0 52 -38 90t-90 38t-90 -38t-38 -90t38 -90t90 -38t90 38t38 90zM256 640h384v256h-158q-13 0 -22 -9l-195 -195q-9 -9 -9 -22v-30zM1536 128q0 52 -38 90t-90 38t-90 -38t-38 -90t38 -90t90 -38t90 38t38 90zM1792 1216v-1024q0 -15 -4 -26.5t-13.5 -18.5 t-16.5 -11.5t-23.5 -6t-22.5 -2t-25.5 0t-22.5 0.5q0 -106 -75 -181t-181 -75t-181 75t-75 181h-384q0 -106 -75 -181t-181 -75t-181 75t-75 181h-64q-3 0 -22.5 -0.5t-25.5 0t-22.5 2t-23.5 6t-16.5 11.5t-13.5 18.5t-4 26.5q0 26 19 45t45 19v320q0 8 -0.5 35t0 38 t2.5 34.5t6.5 37t14 30.5t22.5 30l198 198q19 19 50.5 32t58.5 13h160v192q0 26 19 45t45 19h1024q26 0 45 -19t19 -45z" />
+<glyph unicode="" d="M1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103q-111 0 -218 32q59 93 78 164q9 34 54 211q20 -39 73 -67.5t114 -28.5q121 0 216 68.5t147 188.5t52 270q0 114 -59.5 214t-172.5 163t-255 63q-105 0 -196 -29t-154.5 -77t-109 -110.5t-67 -129.5t-21.5 -134 q0 -104 40 -183t117 -111q30 -12 38 20q2 7 8 31t8 30q6 23 -11 43q-51 61 -51 151q0 151 104.5 259.5t273.5 108.5q151 0 235.5 -82t84.5 -213q0 -170 -68.5 -289t-175.5 -119q-61 0 -98 43.5t-23 104.5q8 35 26.5 93.5t30 103t11.5 75.5q0 50 -27 83t-77 33 q-62 0 -105 -57t-43 -142q0 -73 25 -122l-99 -418q-17 -70 -13 -177q-206 91 -333 281t-127 423q0 209 103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+<glyph unicode="" d="M1248 1408q119 0 203.5 -84.5t84.5 -203.5v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-725q85 122 108 210q9 34 53 209q21 -39 73.5 -67t112.5 -28q181 0 295.5 147.5t114.5 373.5q0 84 -35 162.5t-96.5 139t-152.5 97t-197 36.5q-104 0 -194.5 -28.5t-153 -76.5 t-107.5 -109.5t-66.5 -128t-21.5 -132.5q0 -102 39.5 -180t116.5 -110q13 -5 23.5 0t14.5 19q10 44 15 61q6 23 -11 42q-50 62 -50 150q0 150 103.5 256.5t270.5 106.5q149 0 232.5 -81t83.5 -210q0 -168 -67.5 -286t-173.5 -118q-60 0 -97 43.5t-23 103.5q8 34 26.5 92.5 t29.5 102t11 74.5q0 49 -26.5 81.5t-75.5 32.5q-61 0 -103.5 -56.5t-42.5 -139.5q0 -72 24 -121l-98 -414q-24 -100 -7 -254h-183q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960z" />
+<glyph unicode="" d="M829 318q0 -76 -58.5 -112.5t-139.5 -36.5q-41 0 -80.5 9.5t-75.5 28.5t-58 53t-22 78q0 46 25 80t65.5 51.5t82 25t84.5 7.5q20 0 31 -2q2 -1 23 -16.5t26 -19t23 -18t24.5 -22t19 -22.5t17 -26t9 -26.5t4.5 -31.5zM755 863q0 -60 -33 -99.5t-92 -39.5q-53 0 -93 42.5 t-57.5 96.5t-17.5 106q0 61 32 104t92 43q53 0 93.5 -45t58 -101t17.5 -107zM861 1120l88 64h-265q-85 0 -161 -32t-127.5 -98t-51.5 -153q0 -93 64.5 -154.5t158.5 -61.5q22 0 43 3q-13 -29 -13 -54q0 -44 40 -94q-175 -12 -257 -63q-47 -29 -75.5 -73t-28.5 -95 q0 -43 18.5 -77.5t48.5 -56.5t69 -37t77.5 -21t76.5 -6q60 0 120.5 15.5t113.5 46t86 82.5t33 117q0 49 -20 89.5t-49 66.5t-58 47.5t-49 44t-20 44.5t15.5 42.5t37.5 39.5t44 42t37.5 59.5t15.5 82.5q0 60 -22.5 99.5t-72.5 90.5h83zM1152 672h128v64h-128v128h-64v-128 h-128v-64h128v-160h64v160zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
+<glyph unicode="" horiz-adv-x="1664" d="M735 740q0 -36 32 -70.5t77.5 -68t90.5 -73.5t77 -104t32 -142q0 -90 -48 -173q-72 -122 -211 -179.5t-298 -57.5q-132 0 -246.5 41.5t-171.5 137.5q-37 60 -37 131q0 81 44.5 150t118.5 115q131 82 404 100q-32 42 -47.5 74t-15.5 73q0 36 21 85q-46 -4 -68 -4 q-148 0 -249.5 96.5t-101.5 244.5q0 82 36 159t99 131q77 66 182.5 98t217.5 32h418l-138 -88h-131q74 -63 112 -133t38 -160q0 -72 -24.5 -129.5t-59 -93t-69.5 -65t-59.5 -61.5t-24.5 -66zM589 836q38 0 78 16.5t66 43.5q53 57 53 159q0 58 -17 125t-48.5 129.5 t-84.5 103.5t-117 41q-42 0 -82.5 -19.5t-65.5 -52.5q-47 -59 -47 -160q0 -46 10 -97.5t31.5 -103t52 -92.5t75 -67t96.5 -26zM591 -37q58 0 111.5 13t99 39t73 73t27.5 109q0 25 -7 49t-14.5 42t-27 41.5t-29.5 35t-38.5 34.5t-36.5 29t-41.5 30t-36.5 26q-16 2 -48 2 q-53 0 -105 -7t-107.5 -25t-97 -46t-68.5 -74.5t-27 -105.5q0 -70 35 -123.5t91.5 -83t119 -44t127.5 -14.5zM1401 839h213v-108h-213v-219h-105v219h-212v108h212v217h105v-217z" />
+<glyph unicode="" horiz-adv-x="1920" d="M768 384h384v96h-128v448h-114l-148 -137l77 -80q42 37 55 57h2v-288h-128v-96zM1280 640q0 -70 -21 -142t-59.5 -134t-101.5 -101t-138 -39t-138 39t-101.5 101t-59.5 134t-21 142t21 142t59.5 134t101.5 101t138 39t138 -39t101.5 -101t59.5 -134t21 -142zM1792 384 v512q-106 0 -181 75t-75 181h-1152q0 -106 -75 -181t-181 -75v-512q106 0 181 -75t75 -181h1152q0 106 75 181t181 75zM1920 1216v-1152q0 -26 -19 -45t-45 -19h-1792q-26 0 -45 19t-19 45v1152q0 26 19 45t45 19h1792q26 0 45 -19t19 -45z" />
+<glyph unicode="" horiz-adv-x="1024" d="M1024 832q0 -26 -19 -45l-448 -448q-19 -19 -45 -19t-45 19l-448 448q-19 19 -19 45t19 45t45 19h896q26 0 45 -19t19 -45z" />
+<glyph unicode="" horiz-adv-x="1024" d="M1024 320q0 -26 -19 -45t-45 -19h-896q-26 0 -45 19t-19 45t19 45l448 448q19 19 45 19t45 -19l448 -448q19 -19 19 -45z" />
+<glyph unicode="" horiz-adv-x="640" d="M640 1088v-896q0 -26 -19 -45t-45 -19t-45 19l-448 448q-19 19 -19 45t19 45l448 448q19 19 45 19t45 -19t19 -45z" />
+<glyph unicode="" horiz-adv-x="640" d="M576 640q0 -26 -19 -45l-448 -448q-19 -19 -45 -19t-45 19t-19 45v896q0 26 19 45t45 19t45 -19l448 -448q19 -19 19 -45z" />
+<glyph unicode="" horiz-adv-x="1664" d="M160 0h608v1152h-640v-1120q0 -13 9.5 -22.5t22.5 -9.5zM1536 32v1120h-640v-1152h608q13 0 22.5 9.5t9.5 22.5zM1664 1248v-1216q0 -66 -47 -113t-113 -47h-1344q-66 0 -113 47t-47 113v1216q0 66 47 113t113 47h1344q66 0 113 -47t47 -113z" />
+<glyph unicode="" horiz-adv-x="1024" d="M1024 448q0 -26 -19 -45l-448 -448q-19 -19 -45 -19t-45 19l-448 448q-19 19 -19 45t19 45t45 19h896q26 0 45 -19t19 -45zM1024 832q0 -26 -19 -45t-45 -19h-896q-26 0 -45 19t-19 45t19 45l448 448q19 19 45 19t45 -19l448 -448q19 -19 19 -45z" />
+<glyph unicode="" horiz-adv-x="1024" d="M1024 448q0 -26 -19 -45l-448 -448q-19 -19 -45 -19t-45 19l-448 448q-19 19 -19 45t19 45t45 19h896q26 0 45 -19t19 -45z" />
+<glyph unicode="" horiz-adv-x="1024" d="M1024 832q0 -26 -19 -45t-45 -19h-896q-26 0 -45 19t-19 45t19 45l448 448q19 19 45 19t45 -19l448 -448q19 -19 19 -45z" />
+<glyph unicode="" horiz-adv-x="1792" d="M1792 826v-794q0 -66 -47 -113t-113 -47h-1472q-66 0 -113 47t-47 113v794q44 -49 101 -87q362 -246 497 -345q57 -42 92.5 -65.5t94.5 -48t110 -24.5h1h1q51 0 110 24.5t94.5 48t92.5 65.5q170 123 498 345q57 39 100 87zM1792 1120q0 -79 -49 -151t-122 -123 q-376 -261 -468 -325q-10 -7 -42.5 -30.5t-54 -38t-52 -32.5t-57.5 -27t-50 -9h-1h-1q-23 0 -50 9t-57.5 27t-52 32.5t-54 38t-42.5 30.5q-91 64 -262 182.5t-205 142.5q-62 42 -117 115.5t-55 136.5q0 78 41.5 130t118.5 52h1472q65 0 112.5 -47t47.5 -113z" />
+<glyph unicode="" d="M349 911v-991h-330v991h330zM370 1217q1 -73 -50.5 -122t-135.5 -49h-2q-82 0 -132 49t-50 122q0 74 51.5 122.5t134.5 48.5t133 -48.5t51 -122.5zM1536 488v-568h-329v530q0 105 -40.5 164.5t-126.5 59.5q-63 0 -105.5 -34.5t-63.5 -85.5q-11 -30 -11 -81v-553h-329 q2 399 2 647t-1 296l-1 48h329v-144h-2q20 32 41 56t56.5 52t87 43.5t114.5 15.5q171 0 275 -113.5t104 -332.5z" />
+<glyph unicode="" d="M1536 640q0 -156 -61 -298t-164 -245t-245 -164t-298 -61q-172 0 -327 72.5t-264 204.5q-7 10 -6.5 22.5t8.5 20.5l137 138q10 9 25 9q16 -2 23 -12q73 -95 179 -147t225 -52q104 0 198.5 40.5t163.5 109.5t109.5 163.5t40.5 198.5t-40.5 198.5t-109.5 163.5 t-163.5 109.5t-198.5 40.5q-98 0 -188 -35.5t-160 -101.5l137 -138q31 -30 14 -69q-17 -40 -59 -40h-448q-26 0 -45 19t-19 45v448q0 42 40 59q39 17 69 -14l130 -129q107 101 244.5 156.5t284.5 55.5q156 0 298 -61t245 -164t164 -245t61 -298z" />
+<glyph unicode="" horiz-adv-x="1792" d="M1771 0q0 -53 -37 -90l-107 -108q-39 -37 -91 -37q-53 0 -90 37l-363 364q-38 36 -38 90q0 53 43 96l-256 256l-126 -126q-14 -14 -34 -14t-34 14q2 -2 12.5 -12t12.5 -13t10 -11.5t10 -13.5t6 -13.5t5.5 -16.5t1.5 -18q0 -38 -28 -68q-3 -3 -16.5 -18t-19 -20.5 t-18.5 -16.5t-22 -15.5t-22 -9t-26 -4.5q-40 0 -68 28l-408 408q-28 28 -28 68q0 13 4.5 26t9 22t15.5 22t16.5 18.5t20.5 19t18 16.5q30 28 68 28q10 0 18 -1.5t16.5 -5.5t13.5 -6t13.5 -10t11.5 -10t13 -12.5t12 -12.5q-14 14 -14 34t14 34l348 348q14 14 34 14t34 -14 q-2 2 -12.5 12t-12.5 13t-10 11.5t-10 13.5t-6 13.5t-5.5 16.5t-1.5 18q0 38 28 68q3 3 16.5 18t19 20.5t18.5 16.5t22 15.5t22 9t26 4.5q40 0 68 -28l408 -408q28 -28 28 -68q0 -13 -4.5 -26t-9 -22t-15.5 -22t-16.5 -18.5t-20.5 -19t-18 -16.5q-30 -28 -68 -28 q-10 0 -18 1.5t-16.5 5.5t-13.5 6t-13.5 10t-11.5 10t-13 12.5t-12 12.5q14 -14 14 -34t-14 -34l-126 -126l256 -256q43 43 96 43q52 0 91 -37l363 -363q37 -39 37 -91z" />
+<glyph unicode="" horiz-adv-x="1792" d="M384 384q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM576 832q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1004 351l101 382q6 26 -7.5 48.5t-38.5 29.5 t-48 -6.5t-30 -39.5l-101 -382q-60 -5 -107 -43.5t-63 -98.5q-20 -77 20 -146t117 -89t146 20t89 117q16 60 -6 117t-72 91zM1664 384q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1024 1024q0 53 -37.5 90.5 t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1472 832q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1792 384q0 -261 -141 -483q-19 -29 -54 -29h-1402q-35 0 -54 29 q-141 221 -141 483q0 182 71 348t191 286t286 191t348 71t348 -71t286 -191t191 -286t71 -348z" />
+<glyph unicode="" horiz-adv-x="1792" d="M896 1152q-204 0 -381.5 -69.5t-282 -187.5t-104.5 -255q0 -112 71.5 -213.5t201.5 -175.5l87 -50l-27 -96q-24 -91 -70 -172q152 63 275 171l43 38l57 -6q69 -8 130 -8q204 0 381.5 69.5t282 187.5t104.5 255t-104.5 255t-282 187.5t-381.5 69.5zM1792 640 q0 -174 -120 -321.5t-326 -233t-450 -85.5q-70 0 -145 8q-198 -175 -460 -242q-49 -14 -114 -22h-5q-15 0 -27 10.5t-16 27.5v1q-3 4 -0.5 12t2 10t4.5 9.5l6 9t7 8.5t8 9q7 8 31 34.5t34.5 38t31 39.5t32.5 51t27 59t26 76q-157 89 -247.5 220t-90.5 281q0 174 120 321.5 t326 233t450 85.5t450 -85.5t326 -233t120 -321.5z" />
+<glyph unicode="" horiz-adv-x="1792" d="M704 1152q-153 0 -286 -52t-211.5 -141t-78.5 -191q0 -82 53 -158t149 -132l97 -56l-35 -84q34 20 62 39l44 31l53 -10q78 -14 153 -14q153 0 286 52t211.5 141t78.5 191t-78.5 191t-211.5 141t-286 52zM704 1280q191 0 353.5 -68.5t256.5 -186.5t94 -257t-94 -257 t-256.5 -186.5t-353.5 -68.5q-86 0 -176 16q-124 -88 -278 -128q-36 -9 -86 -16h-3q-11 0 -20.5 8t-11.5 21q-1 3 -1 6.5t0.5 6.5t2 6l2.5 5t3.5 5.5t4 5t4.5 5t4 4.5q5 6 23 25t26 29.5t22.5 29t25 38.5t20.5 44q-124 72 -195 177t-71 224q0 139 94 257t256.5 186.5 t353.5 68.5zM1526 111q10 -24 20.5 -44t25 -38.5t22.5 -29t26 -29.5t23 -25q1 -1 4 -4.5t4.5 -5t4 -5t3.5 -5.5l2.5 -5t2 -6t0.5 -6.5t-1 -6.5q-3 -14 -13 -22t-22 -7q-50 7 -86 16q-154 40 -278 128q-90 -16 -176 -16q-271 0 -472 132q58 -4 88 -4q161 0 309 45t264 129 q125 92 192 212t67 254q0 77 -23 152q129 -71 204 -178t75 -230q0 -120 -71 -224.5t-195 -176.5z" />
+<glyph unicode="" horiz-adv-x="896" d="M885 970q18 -20 7 -44l-540 -1157q-13 -25 -42 -25q-4 0 -14 2q-17 5 -25.5 19t-4.5 30l197 808l-406 -101q-4 -1 -12 -1q-18 0 -31 11q-18 15 -13 39l201 825q4 14 16 23t28 9h328q19 0 32 -12.5t13 -29.5q0 -8 -5 -18l-171 -463l396 98q8 2 12 2q19 0 34 -15z" />
+<glyph unicode="" horiz-adv-x="1792" d="M1792 288v-320q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v320q0 40 28 68t68 28h96v192h-512v-192h96q40 0 68 -28t28 -68v-320q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v320q0 40 28 68t68 28h96v192h-512v-192h96q40 0 68 -28t28 -68v-320 q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v320q0 40 28 68t68 28h96v192q0 52 38 90t90 38h512v192h-96q-40 0 -68 28t-28 68v320q0 40 28 68t68 28h320q40 0 68 -28t28 -68v-320q0 -40 -28 -68t-68 -28h-96v-192h512q52 0 90 -38t38 -90v-192h96q40 0 68 -28t28 -68 z" />
+<glyph unicode="" horiz-adv-x="1664" d="M896 708v-580q0 -104 -76 -180t-180 -76t-180 76t-76 180q0 26 19 45t45 19t45 -19t19 -45q0 -50 39 -89t89 -39t89 39t39 89v580q33 11 64 11t64 -11zM1664 681q0 -13 -9.5 -22.5t-22.5 -9.5q-11 0 -23 10q-49 46 -93 69t-102 23q-68 0 -128 -37t-103 -97 q-7 -10 -17.5 -28t-14.5 -24q-11 -17 -28 -17q-18 0 -29 17q-4 6 -14.5 24t-17.5 28q-43 60 -102.5 97t-127.5 37t-127.5 -37t-102.5 -97q-7 -10 -17.5 -28t-14.5 -24q-11 -17 -29 -17q-17 0 -28 17q-4 6 -14.5 24t-17.5 28q-43 60 -103 97t-128 37q-58 0 -102 -23t-93 -69 q-12 -10 -23 -10q-13 0 -22.5 9.5t-9.5 22.5q0 5 1 7q45 183 172.5 319.5t298 204.5t360.5 68q140 0 274.5 -40t246.5 -113.5t194.5 -187t115.5 -251.5q1 -2 1 -7zM896 1408v-98q-42 2 -64 2t-64 -2v98q0 26 19 45t45 19t45 -19t19 -45z" />
+<glyph unicode="" horiz-adv-x="1792" d="M768 -128h896v640h-416q-40 0 -68 28t-28 68v416h-384v-1152zM1024 1312v64q0 13 -9.5 22.5t-22.5 9.5h-704q-13 0 -22.5 -9.5t-9.5 -22.5v-64q0 -13 9.5 -22.5t22.5 -9.5h704q13 0 22.5 9.5t9.5 22.5zM1280 640h299l-299 299v-299zM1792 512v-672q0 -40 -28 -68t-68 -28 h-960q-40 0 -68 28t-28 68v160h-544q-40 0 -68 28t-28 68v1344q0 40 28 68t68 28h1088q40 0 68 -28t28 -68v-328q21 -13 36 -28l408 -408q28 -28 48 -76t20 -88z" />
+<glyph unicode="" horiz-adv-x="1024" d="M736 960q0 -13 -9.5 -22.5t-22.5 -9.5t-22.5 9.5t-9.5 22.5q0 46 -54 71t-106 25q-13 0 -22.5 9.5t-9.5 22.5t9.5 22.5t22.5 9.5q50 0 99.5 -16t87 -54t37.5 -90zM896 960q0 72 -34.5 134t-90 101.5t-123 62t-136.5 22.5t-136.5 -22.5t-123 -62t-90 -101.5t-34.5 -134 q0 -101 68 -180q10 -11 30.5 -33t30.5 -33q128 -153 141 -298h228q13 145 141 298q10 11 30.5 33t30.5 33q68 79 68 180zM1024 960q0 -155 -103 -268q-45 -49 -74.5 -87t-59.5 -95.5t-34 -107.5q47 -28 47 -82q0 -37 -25 -64q25 -27 25 -64q0 -52 -45 -81q13 -23 13 -47 q0 -46 -31.5 -71t-77.5 -25q-20 -44 -60 -70t-87 -26t-87 26t-60 70q-46 0 -77.5 25t-31.5 71q0 24 13 47q-45 29 -45 81q0 37 25 64q-25 27 -25 64q0 54 47 82q-4 50 -34 107.5t-59.5 95.5t-74.5 87q-103 113 -103 268q0 99 44.5 184.5t117 142t164 89t186.5 32.5 t186.5 -32.5t164 -89t117 -142t44.5 -184.5z" />
+<glyph unicode="" horiz-adv-x="1792" d="M1792 352v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1376v-192q0 -13 -9.5 -22.5t-22.5 -9.5q-12 0 -24 10l-319 320q-9 9 -9 22q0 14 9 23l320 320q9 9 23 9q13 0 22.5 -9.5t9.5 -22.5v-192h1376q13 0 22.5 -9.5t9.5 -22.5zM1792 896q0 -14 -9 -23l-320 -320q-9 -9 -23 -9 q-13 0 -22.5 9.5t-9.5 22.5v192h-1376q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1376v192q0 14 9 23t23 9q12 0 24 -10l319 -319q9 -9 9 -23z" />
+<glyph unicode="" horiz-adv-x="1920" d="M1280 608q0 14 -9 23t-23 9h-224v352q0 13 -9.5 22.5t-22.5 9.5h-192q-13 0 -22.5 -9.5t-9.5 -22.5v-352h-224q-13 0 -22.5 -9.5t-9.5 -22.5q0 -14 9 -23l352 -352q9 -9 23 -9t23 9l351 351q10 12 10 24zM1920 384q0 -159 -112.5 -271.5t-271.5 -112.5h-1088 q-185 0 -316.5 131.5t-131.5 316.5q0 130 70 240t188 165q-2 30 -2 43q0 212 150 362t362 150q156 0 285.5 -87t188.5 -231q71 62 166 62q106 0 181 -75t75 -181q0 -76 -41 -138q130 -31 213.5 -135.5t83.5 -238.5z" />
+<glyph unicode="" horiz-adv-x="1920" d="M1280 672q0 14 -9 23l-352 352q-9 9 -23 9t-23 -9l-351 -351q-10 -12 -10 -24q0 -14 9 -23t23 -9h224v-352q0 -13 9.5 -22.5t22.5 -9.5h192q13 0 22.5 9.5t9.5 22.5v352h224q13 0 22.5 9.5t9.5 22.5zM1920 384q0 -159 -112.5 -271.5t-271.5 -112.5h-1088 q-185 0 -316.5 131.5t-131.5 316.5q0 130 70 240t188 165q-2 30 -2 43q0 212 150 362t362 150q156 0 285.5 -87t188.5 -231q71 62 166 62q106 0 181 -75t75 -181q0 -76 -41 -138q130 -31 213.5 -135.5t83.5 -238.5z" />
+<glyph unicode="" horiz-adv-x="1408" d="M384 192q0 -26 -19 -45t-45 -19t-45 19t-19 45t19 45t45 19t45 -19t19 -45zM1408 131q0 -121 -73 -190t-194 -69h-874q-121 0 -194 69t-73 190q0 68 5.5 131t24 138t47.5 132.5t81 103t120 60.5q-22 -52 -22 -120v-203q-58 -20 -93 -70t-35 -111q0 -80 56 -136t136 -56 t136 56t56 136q0 61 -35.5 111t-92.5 70v203q0 62 25 93q132 -104 295 -104t295 104q25 -31 25 -93v-64q-106 0 -181 -75t-75 -181v-89q-32 -29 -32 -71q0 -40 28 -68t68 -28t68 28t28 68q0 42 -32 71v89q0 52 38 90t90 38t90 -38t38 -90v-89q-32 -29 -32 -71q0 -40 28 -68 t68 -28t68 28t28 68q0 42 -32 71v89q0 68 -34.5 127.5t-93.5 93.5q0 10 0.5 42.5t0 48t-2.5 41.5t-7 47t-13 40q68 -15 120 -60.5t81 -103t47.5 -132.5t24 -138t5.5 -131zM1088 1024q0 -159 -112.5 -271.5t-271.5 -112.5t-271.5 112.5t-112.5 271.5t112.5 271.5t271.5 112.5 t271.5 -112.5t112.5 -271.5z" />
+<glyph unicode="" horiz-adv-x="1408" d="M1280 832q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1408 832q0 -62 -35.5 -111t-92.5 -70v-395q0 -159 -131.5 -271.5t-316.5 -112.5t-316.5 112.5t-131.5 271.5v132q-164 20 -274 128t-110 252v512q0 26 19 45t45 19q6 0 16 -2q17 30 47 48 t65 18q53 0 90.5 -37.5t37.5 -90.5t-37.5 -90.5t-90.5 -37.5q-33 0 -64 18v-402q0 -106 94 -181t226 -75t226 75t94 181v402q-31 -18 -64 -18q-53 0 -90.5 37.5t-37.5 90.5t37.5 90.5t90.5 37.5q35 0 65 -18t47 -48q10 2 16 2q26 0 45 -19t19 -45v-512q0 -144 -110 -252 t-274 -128v-132q0 -106 94 -181t226 -75t226 75t94 181v395q-57 21 -92.5 70t-35.5 111q0 80 56 136t136 56t136 -56t56 -136z" />
+<glyph unicode="" horiz-adv-x="1792" d="M640 1152h512v128h-512v-128zM288 1152v-1280h-64q-92 0 -158 66t-66 158v832q0 92 66 158t158 66h64zM1408 1152v-1280h-1024v1280h128v160q0 40 28 68t68 28h576q40 0 68 -28t28 -68v-160h128zM1792 928v-832q0 -92 -66 -158t-158 -66h-64v1280h64q92 0 158 -66 t66 -158z" />
+<glyph unicode="" horiz-adv-x="1792" d="M912 -160q0 16 -16 16q-59 0 -101.5 42.5t-42.5 101.5q0 16 -16 16t-16 -16q0 -73 51.5 -124.5t124.5 -51.5q16 0 16 16zM1728 128q0 -52 -38 -90t-90 -38h-448q0 -106 -75 -181t-181 -75t-181 75t-75 181h-448q-52 0 -90 38t-38 90q50 42 91 88t85 119.5t74.5 158.5 t50 206t19.5 260q0 152 117 282.5t307 158.5q-8 19 -8 39q0 40 28 68t68 28t68 -28t28 -68q0 -20 -8 -39q190 -28 307 -158.5t117 -282.5q0 -139 19.5 -260t50 -206t74.5 -158.5t85 -119.5t91 -88z" />
+<glyph unicode="" horiz-adv-x="1920" d="M1664 896q0 80 -56 136t-136 56h-64v-384h64q80 0 136 56t56 136zM0 128h1792q0 -106 -75 -181t-181 -75h-1280q-106 0 -181 75t-75 181zM1856 896q0 -159 -112.5 -271.5t-271.5 -112.5h-64v-32q0 -92 -66 -158t-158 -66h-704q-92 0 -158 66t-66 158v736q0 26 19 45 t45 19h1152q159 0 271.5 -112.5t112.5 -271.5z" />
+<glyph unicode="" horiz-adv-x="1408" d="M640 1472v-640q0 -61 -35.5 -111t-92.5 -70v-779q0 -52 -38 -90t-90 -38h-128q-52 0 -90 38t-38 90v779q-57 20 -92.5 70t-35.5 111v640q0 26 19 45t45 19t45 -19t19 -45v-416q0 -26 19 -45t45 -19t45 19t19 45v416q0 26 19 45t45 19t45 -19t19 -45v-416q0 -26 19 -45 t45 -19t45 19t19 45v416q0 26 19 45t45 19t45 -19t19 -45zM1408 1472v-1600q0 -52 -38 -90t-90 -38h-128q-52 0 -90 38t-38 90v512h-224q-13 0 -22.5 9.5t-9.5 22.5v800q0 132 94 226t226 94h256q26 0 45 -19t19 -45z" />
+<glyph unicode="" d="M1468 1156q28 -28 48 -76t20 -88v-1152q0 -40 -28 -68t-68 -28h-1344q-40 0 -68 28t-28 68v1600q0 40 28 68t68 28h896q40 0 88 -20t76 -48zM1024 1400v-376h376q-10 29 -22 41l-313 313q-12 12 -41 22zM1408 -128v1024h-416q-40 0 -68 28t-28 68v416h-768v-1536h1280z M384 736q0 14 9 23t23 9h704q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-704q-14 0 -23 9t-9 23v64zM1120 512q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-704q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h704zM1120 256q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-704 q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h704z" />
+<glyph unicode="" horiz-adv-x="1408" d="M384 224v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM384 480v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z M640 480v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM384 736v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z M1152 224v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM896 480v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z M640 736v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM384 992v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z M1152 480v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM896 736v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z M640 992v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM384 1248v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z M1152 736v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM896 992v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z M640 1248v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM1152 992v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z M896 1248v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM1152 1248v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z M896 -128h384v1536h-1152v-1536h384v224q0 13 9.5 22.5t22.5 9.5h320q13 0 22.5 -9.5t9.5 -22.5v-224zM1408 1472v-1664q0 -26 -19 -45t-45 -19h-1280q-26 0 -45 19t-19 45v1664q0 26 19 45t45 19h1280q26 0 45 -19t19 -45z" />
+<glyph unicode="" horiz-adv-x="1408" d="M384 224v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM384 480v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z M640 480v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM384 736v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z M1152 224v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM896 480v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z M640 736v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM1152 480v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z M896 736v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM1152 736v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z M896 -128h384v1152h-256v-32q0 -40 -28 -68t-68 -28h-448q-40 0 -68 28t-28 68v32h-256v-1152h384v224q0 13 9.5 22.5t22.5 9.5h320q13 0 22.5 -9.5t9.5 -22.5v-224zM896 1056v320q0 13 -9.5 22.5t-22.5 9.5h-64q-13 0 -22.5 -9.5t-9.5 -22.5v-96h-128v96q0 13 -9.5 22.5 t-22.5 9.5h-64q-13 0 -22.5 -9.5t-9.5 -22.5v-320q0 -13 9.5 -22.5t22.5 -9.5h64q13 0 22.5 9.5t9.5 22.5v96h128v-96q0 -13 9.5 -22.5t22.5 -9.5h64q13 0 22.5 9.5t9.5 22.5zM1408 1088v-1280q0 -26 -19 -45t-45 -19h-1280q-26 0 -45 19t-19 45v1280q0 26 19 45t45 19h320 v288q0 40 28 68t68 28h448q40 0 68 -28t28 -68v-288h320q26 0 45 -19t19 -45z" />
+<glyph unicode="" horiz-adv-x="1920" d="M640 128q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM256 640h384v256h-158q-14 -2 -22 -9l-195 -195q-7 -12 -9 -22v-30zM1536 128q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5 t90.5 37.5t37.5 90.5zM1664 800v192q0 14 -9 23t-23 9h-224v224q0 14 -9 23t-23 9h-192q-14 0 -23 -9t-9 -23v-224h-224q-14 0 -23 -9t-9 -23v-192q0 -14 9 -23t23 -9h224v-224q0 -14 9 -23t23 -9h192q14 0 23 9t9 23v224h224q14 0 23 9t9 23zM1920 1344v-1152 q0 -26 -19 -45t-45 -19h-192q0 -106 -75 -181t-181 -75t-181 75t-75 181h-384q0 -106 -75 -181t-181 -75t-181 75t-75 181h-128q-26 0 -45 19t-19 45t19 45t45 19v416q0 26 13 58t32 51l198 198q19 19 51 32t58 13h160v320q0 26 19 45t45 19h1152q26 0 45 -19t19 -45z" />
+<glyph unicode="" horiz-adv-x="1792" d="M1280 416v192q0 14 -9 23t-23 9h-224v224q0 14 -9 23t-23 9h-192q-14 0 -23 -9t-9 -23v-224h-224q-14 0 -23 -9t-9 -23v-192q0 -14 9 -23t23 -9h224v-224q0 -14 9 -23t23 -9h192q14 0 23 9t9 23v224h224q14 0 23 9t9 23zM640 1152h512v128h-512v-128zM256 1152v-1280h-32 q-92 0 -158 66t-66 158v832q0 92 66 158t158 66h32zM1440 1152v-1280h-1088v1280h160v160q0 40 28 68t68 28h576q40 0 68 -28t28 -68v-160h160zM1792 928v-832q0 -92 -66 -158t-158 -66h-32v1280h32q92 0 158 -66t66 -158z" />
+<glyph unicode="" horiz-adv-x="1920" d="M1920 576q-1 -32 -288 -96l-352 -32l-224 -64h-64l-293 -352h69q26 0 45 -4.5t19 -11.5t-19 -11.5t-45 -4.5h-96h-160h-64v32h64v416h-160l-192 -224h-96l-32 32v192h32v32h128v8l-192 24v128l192 24v8h-128v32h-32v192l32 32h96l192 -224h160v416h-64v32h64h160h96 q26 0 45 -4.5t19 -11.5t-19 -11.5t-45 -4.5h-69l293 -352h64l224 -64l352 -32q261 -58 287 -93z" />
+<glyph unicode="" horiz-adv-x="1664" d="M640 640v384h-256v-256q0 -53 37.5 -90.5t90.5 -37.5h128zM1664 192v-192h-1152v192l128 192h-128q-159 0 -271.5 112.5t-112.5 271.5v320l-64 64l32 128h480l32 128h960l32 -192l-64 -32v-800z" />
+<glyph unicode="" d="M1280 192v896q0 26 -19 45t-45 19h-128q-26 0 -45 -19t-19 -45v-320h-512v320q0 26 -19 45t-45 19h-128q-26 0 -45 -19t-19 -45v-896q0 -26 19 -45t45 -19h128q26 0 45 19t19 45v320h512v-320q0 -26 19 -45t45 -19h128q26 0 45 19t19 45zM1536 1120v-960 q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
+<glyph unicode="" d="M1280 576v128q0 26 -19 45t-45 19h-320v320q0 26 -19 45t-45 19h-128q-26 0 -45 -19t-19 -45v-320h-320q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45t45 -19h320v-320q0 -26 19 -45t45 -19h128q26 0 45 19t19 45v320h320q26 0 45 19t19 45zM1536 1120v-960 q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
+<glyph unicode="" horiz-adv-x="1024" d="M627 160q0 -13 -10 -23l-50 -50q-10 -10 -23 -10t-23 10l-466 466q-10 10 -10 23t10 23l466 466q10 10 23 10t23 -10l50 -50q10 -10 10 -23t-10 -23l-393 -393l393 -393q10 -10 10 -23zM1011 160q0 -13 -10 -23l-50 -50q-10 -10 -23 -10t-23 10l-466 466q-10 10 -10 23 t10 23l466 466q10 10 23 10t23 -10l50 -50q10 -10 10 -23t-10 -23l-393 -393l393 -393q10 -10 10 -23z" />
+<glyph unicode="" horiz-adv-x="1024" d="M595 576q0 -13 -10 -23l-466 -466q-10 -10 -23 -10t-23 10l-50 50q-10 10 -10 23t10 23l393 393l-393 393q-10 10 -10 23t10 23l50 50q10 10 23 10t23 -10l466 -466q10 -10 10 -23zM979 576q0 -13 -10 -23l-466 -466q-10 -10 -23 -10t-23 10l-50 50q-10 10 -10 23t10 23 l393 393l-393 393q-10 10 -10 23t10 23l50 50q10 10 23 10t23 -10l466 -466q10 -10 10 -23z" />
+<glyph unicode="" horiz-adv-x="1152" d="M1075 224q0 -13 -10 -23l-50 -50q-10 -10 -23 -10t-23 10l-393 393l-393 -393q-10 -10 -23 -10t-23 10l-50 50q-10 10 -10 23t10 23l466 466q10 10 23 10t23 -10l466 -466q10 -10 10 -23zM1075 608q0 -13 -10 -23l-50 -50q-10 -10 -23 -10t-23 10l-393 393l-393 -393 q-10 -10 -23 -10t-23 10l-50 50q-10 10 -10 23t10 23l466 466q10 10 23 10t23 -10l466 -466q10 -10 10 -23z" />
+<glyph unicode="" horiz-adv-x="1152" d="M1075 672q0 -13 -10 -23l-466 -466q-10 -10 -23 -10t-23 10l-466 466q-10 10 -10 23t10 23l50 50q10 10 23 10t23 -10l393 -393l393 393q10 10 23 10t23 -10l50 -50q10 -10 10 -23zM1075 1056q0 -13 -10 -23l-466 -466q-10 -10 -23 -10t-23 10l-466 466q-10 10 -10 23 t10 23l50 50q10 10 23 10t23 -10l393 -393l393 393q10 10 23 10t23 -10l50 -50q10 -10 10 -23z" />
+<glyph unicode="" horiz-adv-x="640" d="M627 992q0 -13 -10 -23l-393 -393l393 -393q10 -10 10 -23t-10 -23l-50 -50q-10 -10 -23 -10t-23 10l-466 466q-10 10 -10 23t10 23l466 466q10 10 23 10t23 -10l50 -50q10 -10 10 -23z" />
+<glyph unicode="" horiz-adv-x="640" d="M595 576q0 -13 -10 -23l-466 -466q-10 -10 -23 -10t-23 10l-50 50q-10 10 -10 23t10 23l393 393l-393 393q-10 10 -10 23t10 23l50 50q10 10 23 10t23 -10l466 -466q10 -10 10 -23z" />
+<glyph unicode="" horiz-adv-x="1152" d="M1075 352q0 -13 -10 -23l-50 -50q-10 -10 -23 -10t-23 10l-393 393l-393 -393q-10 -10 -23 -10t-23 10l-50 50q-10 10 -10 23t10 23l466 466q10 10 23 10t23 -10l466 -466q10 -10 10 -23z" />
+<glyph unicode="" horiz-adv-x="1152" d="M1075 800q0 -13 -10 -23l-466 -466q-10 -10 -23 -10t-23 10l-466 466q-10 10 -10 23t10 23l50 50q10 10 23 10t23 -10l393 -393l393 393q10 10 23 10t23 -10l50 -50q10 -10 10 -23z" />
+<glyph unicode="" horiz-adv-x="1920" d="M1792 544v832q0 13 -9.5 22.5t-22.5 9.5h-1600q-13 0 -22.5 -9.5t-9.5 -22.5v-832q0 -13 9.5 -22.5t22.5 -9.5h1600q13 0 22.5 9.5t9.5 22.5zM1920 1376v-1088q0 -66 -47 -113t-113 -47h-544q0 -37 16 -77.5t32 -71t16 -43.5q0 -26 -19 -45t-45 -19h-512q-26 0 -45 19 t-19 45q0 14 16 44t32 70t16 78h-544q-66 0 -113 47t-47 113v1088q0 66 47 113t113 47h1600q66 0 113 -47t47 -113z" />
+<glyph unicode="" horiz-adv-x="1920" d="M416 256q-66 0 -113 47t-47 113v704q0 66 47 113t113 47h1088q66 0 113 -47t47 -113v-704q0 -66 -47 -113t-113 -47h-1088zM384 1120v-704q0 -13 9.5 -22.5t22.5 -9.5h1088q13 0 22.5 9.5t9.5 22.5v704q0 13 -9.5 22.5t-22.5 9.5h-1088q-13 0 -22.5 -9.5t-9.5 -22.5z M1760 192h160v-96q0 -40 -47 -68t-113 -28h-1600q-66 0 -113 28t-47 68v96h160h1600zM1040 96q16 0 16 16t-16 16h-160q-16 0 -16 -16t16 -16h160z" />
+<glyph unicode="" horiz-adv-x="1152" d="M640 128q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1024 288v960q0 13 -9.5 22.5t-22.5 9.5h-832q-13 0 -22.5 -9.5t-9.5 -22.5v-960q0 -13 9.5 -22.5t22.5 -9.5h832q13 0 22.5 9.5t9.5 22.5zM1152 1248v-1088q0 -66 -47 -113t-113 -47h-832 q-66 0 -113 47t-47 113v1088q0 66 47 113t113 47h832q66 0 113 -47t47 -113z" />
+<glyph unicode="" horiz-adv-x="768" d="M464 128q0 33 -23.5 56.5t-56.5 23.5t-56.5 -23.5t-23.5 -56.5t23.5 -56.5t56.5 -23.5t56.5 23.5t23.5 56.5zM672 288v704q0 13 -9.5 22.5t-22.5 9.5h-512q-13 0 -22.5 -9.5t-9.5 -22.5v-704q0 -13 9.5 -22.5t22.5 -9.5h512q13 0 22.5 9.5t9.5 22.5zM480 1136 q0 16 -16 16h-160q-16 0 -16 -16t16 -16h160q16 0 16 16zM768 1152v-1024q0 -52 -38 -90t-90 -38h-512q-52 0 -90 38t-38 90v1024q0 52 38 90t90 38h512q52 0 90 -38t38 -90z" />
+<glyph unicode="" d="M768 1184q-148 0 -273 -73t-198 -198t-73 -273t73 -273t198 -198t273 -73t273 73t198 198t73 273t-73 273t-198 198t-273 73zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103 t279.5 -279.5t103 -385.5z" />
+<glyph unicode="" horiz-adv-x="1664" d="M768 576v-384q0 -80 -56 -136t-136 -56h-384q-80 0 -136 56t-56 136v704q0 104 40.5 198.5t109.5 163.5t163.5 109.5t198.5 40.5h64q26 0 45 -19t19 -45v-128q0 -26 -19 -45t-45 -19h-64q-106 0 -181 -75t-75 -181v-32q0 -40 28 -68t68 -28h224q80 0 136 -56t56 -136z M1664 576v-384q0 -80 -56 -136t-136 -56h-384q-80 0 -136 56t-56 136v704q0 104 40.5 198.5t109.5 163.5t163.5 109.5t198.5 40.5h64q26 0 45 -19t19 -45v-128q0 -26 -19 -45t-45 -19h-64q-106 0 -181 -75t-75 -181v-32q0 -40 28 -68t68 -28h224q80 0 136 -56t56 -136z" />
+<glyph unicode="" horiz-adv-x="1664" d="M768 1216v-704q0 -104 -40.5 -198.5t-109.5 -163.5t-163.5 -109.5t-198.5 -40.5h-64q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h64q106 0 181 75t75 181v32q0 40 -28 68t-68 28h-224q-80 0 -136 56t-56 136v384q0 80 56 136t136 56h384q80 0 136 -56t56 -136zM1664 1216 v-704q0 -104 -40.5 -198.5t-109.5 -163.5t-163.5 -109.5t-198.5 -40.5h-64q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h64q106 0 181 75t75 181v32q0 40 -28 68t-68 28h-224q-80 0 -136 56t-56 136v384q0 80 56 136t136 56h384q80 0 136 -56t56 -136z" />
+<glyph unicode="" horiz-adv-x="1792" d="M526 142q0 -53 -37.5 -90.5t-90.5 -37.5q-52 0 -90 38t-38 90q0 53 37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1024 -64q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5t-37.5 90.5t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM320 640q0 -53 -37.5 -90.5t-90.5 -37.5 t-90.5 37.5t-37.5 90.5t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1522 142q0 -52 -38 -90t-90 -38q-53 0 -90.5 37.5t-37.5 90.5t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM558 1138q0 -66 -47 -113t-113 -47t-113 47t-47 113t47 113t113 47t113 -47t47 -113z M1728 640q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5t-37.5 90.5t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1088 1344q0 -80 -56 -136t-136 -56t-136 56t-56 136t56 136t136 56t136 -56t56 -136zM1618 1138q0 -93 -66 -158.5t-158 -65.5q-93 0 -158.5 65.5t-65.5 158.5 q0 92 65.5 158t158.5 66q92 0 158 -66t66 -158z" />
+<glyph unicode="" d="M1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+<glyph unicode="" horiz-adv-x="1792" d="M1792 416q0 -166 -127 -451q-3 -7 -10.5 -24t-13.5 -30t-13 -22q-12 -17 -28 -17q-15 0 -23.5 10t-8.5 25q0 9 2.5 26.5t2.5 23.5q5 68 5 123q0 101 -17.5 181t-48.5 138.5t-80 101t-105.5 69.5t-133 42.5t-154 21.5t-175.5 6h-224v-256q0 -26 -19 -45t-45 -19t-45 19 l-512 512q-19 19 -19 45t19 45l512 512q19 19 45 19t45 -19t19 -45v-256h224q713 0 875 -403q53 -134 53 -333z" />
+<glyph unicode="" horiz-adv-x="1664" d="M640 320q0 -40 -12.5 -82t-43 -76t-72.5 -34t-72.5 34t-43 76t-12.5 82t12.5 82t43 76t72.5 34t72.5 -34t43 -76t12.5 -82zM1280 320q0 -40 -12.5 -82t-43 -76t-72.5 -34t-72.5 34t-43 76t-12.5 82t12.5 82t43 76t72.5 34t72.5 -34t43 -76t12.5 -82zM1440 320 q0 120 -69 204t-187 84q-41 0 -195 -21q-71 -11 -157 -11t-157 11q-152 21 -195 21q-118 0 -187 -84t-69 -204q0 -88 32 -153.5t81 -103t122 -60t140 -29.5t149 -7h168q82 0 149 7t140 29.5t122 60t81 103t32 153.5zM1664 496q0 -207 -61 -331q-38 -77 -105.5 -133t-141 -86 t-170 -47.5t-171.5 -22t-167 -4.5q-78 0 -142 3t-147.5 12.5t-152.5 30t-137 51.5t-121 81t-86 115q-62 123 -62 331q0 237 136 396q-27 82 -27 170q0 116 51 218q108 0 190 -39.5t189 -123.5q147 35 309 35q148 0 280 -32q105 82 187 121t189 39q51 -102 51 -218 q0 -87 -27 -168q136 -160 136 -398z" />
+<glyph unicode="" horiz-adv-x="1664" d="M1536 224v704q0 40 -28 68t-68 28h-704q-40 0 -68 28t-28 68v64q0 40 -28 68t-68 28h-320q-40 0 -68 -28t-28 -68v-960q0 -40 28 -68t68 -28h1216q40 0 68 28t28 68zM1664 928v-704q0 -92 -66 -158t-158 -66h-1216q-92 0 -158 66t-66 158v960q0 92 66 158t158 66h320 q92 0 158 -66t66 -158v-32h672q92 0 158 -66t66 -158z" />
+<glyph unicode="" horiz-adv-x="1920" d="M1781 605q0 35 -53 35h-1088q-40 0 -85.5 -21.5t-71.5 -52.5l-294 -363q-18 -24 -18 -40q0 -35 53 -35h1088q40 0 86 22t71 53l294 363q18 22 18 39zM640 768h768v160q0 40 -28 68t-68 28h-576q-40 0 -68 28t-28 68v64q0 40 -28 68t-68 28h-320q-40 0 -68 -28t-28 -68 v-853l256 315q44 53 116 87.5t140 34.5zM1909 605q0 -62 -46 -120l-295 -363q-43 -53 -116 -87.5t-140 -34.5h-1088q-92 0 -158 66t-66 158v960q0 92 66 158t158 66h320q92 0 158 -66t66 -158v-32h544q92 0 158 -66t66 -158v-160h192q54 0 99 -24.5t67 -70.5q15 -32 15 -68z " />
+<glyph unicode="" horiz-adv-x="1792" />
+<glyph unicode="" horiz-adv-x="1792" />
+<glyph unicode="" d="M1134 461q-37 -121 -138 -195t-228 -74t-228 74t-138 195q-8 25 4 48.5t38 31.5q25 8 48.5 -4t31.5 -38q25 -80 92.5 -129.5t151.5 -49.5t151.5 49.5t92.5 129.5q8 26 32 38t49 4t37 -31.5t4 -48.5zM640 896q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5t-37.5 90.5 t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1152 896q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5t-37.5 90.5t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1408 640q0 130 -51 248.5t-136.5 204t-204 136.5t-248.5 51t-248.5 -51t-204 -136.5t-136.5 -204t-51 -248.5 t51 -248.5t136.5 -204t204 -136.5t248.5 -51t248.5 51t204 136.5t136.5 204t51 248.5zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+<glyph unicode="" d="M1134 307q8 -25 -4 -48.5t-37 -31.5t-49 4t-32 38q-25 80 -92.5 129.5t-151.5 49.5t-151.5 -49.5t-92.5 -129.5q-8 -26 -31.5 -38t-48.5 -4q-26 8 -38 31.5t-4 48.5q37 121 138 195t228 74t228 -74t138 -195zM640 896q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5 t-37.5 90.5t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1152 896q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5t-37.5 90.5t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1408 640q0 130 -51 248.5t-136.5 204t-204 136.5t-248.5 51t-248.5 -51t-204 -136.5t-136.5 -204 t-51 -248.5t51 -248.5t136.5 -204t204 -136.5t248.5 -51t248.5 51t204 136.5t136.5 204t51 248.5zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+<glyph unicode="" d="M1152 448q0 -26 -19 -45t-45 -19h-640q-26 0 -45 19t-19 45t19 45t45 19h640q26 0 45 -19t19 -45zM640 896q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5t-37.5 90.5t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1152 896q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5 t-37.5 90.5t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1408 640q0 130 -51 248.5t-136.5 204t-204 136.5t-248.5 51t-248.5 -51t-204 -136.5t-136.5 -204t-51 -248.5t51 -248.5t136.5 -204t204 -136.5t248.5 -51t248.5 51t204 136.5t136.5 204t51 248.5zM1536 640 q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+<glyph unicode="" horiz-adv-x="1920" d="M832 448v128q0 14 -9 23t-23 9h-192v192q0 14 -9 23t-23 9h-128q-14 0 -23 -9t-9 -23v-192h-192q-14 0 -23 -9t-9 -23v-128q0 -14 9 -23t23 -9h192v-192q0 -14 9 -23t23 -9h128q14 0 23 9t9 23v192h192q14 0 23 9t9 23zM1408 384q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5 t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1664 640q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1920 512q0 -212 -150 -362t-362 -150q-192 0 -338 128h-220q-146 -128 -338 -128q-212 0 -362 150 t-150 362t150 362t362 150h896q212 0 362 -150t150 -362z" />
+<glyph unicode="" horiz-adv-x="1920" d="M384 368v-96q0 -16 -16 -16h-96q-16 0 -16 16v96q0 16 16 16h96q16 0 16 -16zM512 624v-96q0 -16 -16 -16h-224q-16 0 -16 16v96q0 16 16 16h224q16 0 16 -16zM384 880v-96q0 -16 -16 -16h-96q-16 0 -16 16v96q0 16 16 16h96q16 0 16 -16zM1408 368v-96q0 -16 -16 -16 h-864q-16 0 -16 16v96q0 16 16 16h864q16 0 16 -16zM768 624v-96q0 -16 -16 -16h-96q-16 0 -16 16v96q0 16 16 16h96q16 0 16 -16zM640 880v-96q0 -16 -16 -16h-96q-16 0 -16 16v96q0 16 16 16h96q16 0 16 -16zM1024 624v-96q0 -16 -16 -16h-96q-16 0 -16 16v96q0 16 16 16 h96q16 0 16 -16zM896 880v-96q0 -16 -16 -16h-96q-16 0 -16 16v96q0 16 16 16h96q16 0 16 -16zM1280 624v-96q0 -16 -16 -16h-96q-16 0 -16 16v96q0 16 16 16h96q16 0 16 -16zM1664 368v-96q0 -16 -16 -16h-96q-16 0 -16 16v96q0 16 16 16h96q16 0 16 -16zM1152 880v-96 q0 -16 -16 -16h-96q-16 0 -16 16v96q0 16 16 16h96q16 0 16 -16zM1408 880v-96q0 -16 -16 -16h-96q-16 0 -16 16v96q0 16 16 16h96q16 0 16 -16zM1664 880v-352q0 -16 -16 -16h-224q-16 0 -16 16v96q0 16 16 16h112v240q0 16 16 16h96q16 0 16 -16zM1792 128v896h-1664v-896 h1664zM1920 1024v-896q0 -53 -37.5 -90.5t-90.5 -37.5h-1664q-53 0 -90.5 37.5t-37.5 90.5v896q0 53 37.5 90.5t90.5 37.5h1664q53 0 90.5 -37.5t37.5 -90.5z" />
+<glyph unicode="" horiz-adv-x="1792" d="M1664 491v616q-169 -91 -306 -91q-82 0 -145 32q-100 49 -184 76.5t-178 27.5q-173 0 -403 -127v-599q245 113 433 113q55 0 103.5 -7.5t98 -26t77 -31t82.5 -39.5l28 -14q44 -22 101 -22q120 0 293 92zM320 1280q0 -35 -17.5 -64t-46.5 -46v-1266q0 -14 -9 -23t-23 -9 h-64q-14 0 -23 9t-9 23v1266q-29 17 -46.5 46t-17.5 64q0 53 37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1792 1216v-763q0 -39 -35 -57q-10 -5 -17 -9q-218 -116 -369 -116q-88 0 -158 35l-28 14q-64 33 -99 48t-91 29t-114 14q-102 0 -235.5 -44t-228.5 -102 q-15 -9 -33 -9q-16 0 -32 8q-32 19 -32 56v742q0 35 31 55q35 21 78.5 42.5t114 52t152.5 49.5t155 19q112 0 209 -31t209 -86q38 -19 89 -19q122 0 310 112q22 12 31 17q31 16 62 -2q31 -20 31 -55z" />
+<glyph unicode="" horiz-adv-x="1792" d="M832 536v192q-181 -16 -384 -117v-185q205 96 384 110zM832 954v197q-172 -8 -384 -126v-189q215 111 384 118zM1664 491v184q-235 -116 -384 -71v224q-20 6 -39 15q-5 3 -33 17t-34.5 17t-31.5 15t-34.5 15.5t-32.5 13t-36 12.5t-35 8.5t-39.5 7.5t-39.5 4t-44 2 q-23 0 -49 -3v-222h19q102 0 192.5 -29t197.5 -82q19 -9 39 -15v-188q42 -17 91 -17q120 0 293 92zM1664 918v189q-169 -91 -306 -91q-45 0 -78 8v-196q148 -42 384 90zM320 1280q0 -35 -17.5 -64t-46.5 -46v-1266q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v1266 q-29 17 -46.5 46t-17.5 64q0 53 37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1792 1216v-763q0 -39 -35 -57q-10 -5 -17 -9q-218 -116 -369 -116q-88 0 -158 35l-28 14q-64 33 -99 48t-91 29t-114 14q-102 0 -235.5 -44t-228.5 -102q-15 -9 -33 -9q-16 0 -32 8 q-32 19 -32 56v742q0 35 31 55q35 21 78.5 42.5t114 52t152.5 49.5t155 19q112 0 209 -31t209 -86q38 -19 89 -19q122 0 310 112q22 12 31 17q31 16 62 -2q31 -20 31 -55z" />
+<glyph unicode="" horiz-adv-x="1664" d="M585 553l-466 -466q-10 -10 -23 -10t-23 10l-50 50q-10 10 -10 23t10 23l393 393l-393 393q-10 10 -10 23t10 23l50 50q10 10 23 10t23 -10l466 -466q10 -10 10 -23t-10 -23zM1664 96v-64q0 -14 -9 -23t-23 -9h-960q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h960q14 0 23 -9 t9 -23z" />
+<glyph unicode="" horiz-adv-x="1920" d="M617 137l-50 -50q-10 -10 -23 -10t-23 10l-466 466q-10 10 -10 23t10 23l466 466q10 10 23 10t23 -10l50 -50q10 -10 10 -23t-10 -23l-393 -393l393 -393q10 -10 10 -23t-10 -23zM1208 1204l-373 -1291q-4 -13 -15.5 -19.5t-23.5 -2.5l-62 17q-13 4 -19.5 15.5t-2.5 24.5 l373 1291q4 13 15.5 19.5t23.5 2.5l62 -17q13 -4 19.5 -15.5t2.5 -24.5zM1865 553l-466 -466q-10 -10 -23 -10t-23 10l-50 50q-10 10 -10 23t10 23l393 393l-393 393q-10 10 -10 23t10 23l50 50q10 10 23 10t23 -10l466 -466q10 -10 10 -23t-10 -23z" />
+<glyph unicode="" horiz-adv-x="1792" d="M640 454v-70q0 -42 -39 -59q-13 -5 -25 -5q-27 0 -45 19l-512 512q-19 19 -19 45t19 45l512 512q29 31 70 14q39 -17 39 -59v-69l-397 -398q-19 -19 -19 -45t19 -45zM1792 416q0 -58 -17 -133.5t-38.5 -138t-48 -125t-40.5 -90.5l-20 -40q-8 -17 -28 -17q-6 0 -9 1 q-25 8 -23 34q43 400 -106 565q-64 71 -170.5 110.5t-267.5 52.5v-251q0 -42 -39 -59q-13 -5 -25 -5q-27 0 -45 19l-512 512q-19 19 -19 45t19 45l512 512q29 31 70 14q39 -17 39 -59v-262q411 -28 599 -221q169 -173 169 -509z" />
+<glyph unicode="" horiz-adv-x="1664" d="M1186 579l257 250l-356 52l-66 10l-30 60l-159 322v-963l59 -31l318 -168l-60 355l-12 66zM1638 841l-363 -354l86 -500q5 -33 -6 -51.5t-34 -18.5q-17 0 -40 12l-449 236l-449 -236q-23 -12 -40 -12q-23 0 -34 18.5t-6 51.5l86 500l-364 354q-32 32 -23 59.5t54 34.5 l502 73l225 455q20 41 49 41q28 0 49 -41l225 -455l502 -73q45 -7 54 -34.5t-24 -59.5z" />
+<glyph unicode="" horiz-adv-x="1408" d="M1401 1187l-640 -1280q-17 -35 -57 -35q-5 0 -15 2q-22 5 -35.5 22.5t-13.5 39.5v576h-576q-22 0 -39.5 13.5t-22.5 35.5t4 42t29 30l1280 640q13 7 29 7q27 0 45 -19q15 -14 18.5 -34.5t-6.5 -39.5z" />
+<glyph unicode="" horiz-adv-x="1664" d="M557 256h595v595zM512 301l595 595h-595v-595zM1664 224v-192q0 -14 -9 -23t-23 -9h-224v-224q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v224h-864q-14 0 -23 9t-9 23v864h-224q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h224v224q0 14 9 23t23 9h192q14 0 23 -9t9 -23 v-224h851l246 247q10 9 23 9t23 -9q9 -10 9 -23t-9 -23l-247 -246v-851h224q14 0 23 -9t9 -23z" />
+<glyph unicode="" horiz-adv-x="1024" d="M288 64q0 40 -28 68t-68 28t-68 -28t-28 -68t28 -68t68 -28t68 28t28 68zM288 1216q0 40 -28 68t-68 28t-68 -28t-28 -68t28 -68t68 -28t68 28t28 68zM928 1088q0 40 -28 68t-68 28t-68 -28t-28 -68t28 -68t68 -28t68 28t28 68zM1024 1088q0 -52 -26 -96.5t-70 -69.5 q-2 -287 -226 -414q-68 -38 -203 -81q-128 -40 -169.5 -71t-41.5 -100v-26q44 -25 70 -69.5t26 -96.5q0 -80 -56 -136t-136 -56t-136 56t-56 136q0 52 26 96.5t70 69.5v820q-44 25 -70 69.5t-26 96.5q0 80 56 136t136 56t136 -56t56 -136q0 -52 -26 -96.5t-70 -69.5v-497 q54 26 154 57q55 17 87.5 29.5t70.5 31t59 39.5t40.5 51t28 69.5t8.5 91.5q-44 25 -70 69.5t-26 96.5q0 80 56 136t136 56t136 -56t56 -136z" />
+<glyph unicode="" horiz-adv-x="1664" d="M439 265l-256 -256q-10 -9 -23 -9q-12 0 -23 9q-9 10 -9 23t9 23l256 256q10 9 23 9t23 -9q9 -10 9 -23t-9 -23zM608 224v-320q0 -14 -9 -23t-23 -9t-23 9t-9 23v320q0 14 9 23t23 9t23 -9t9 -23zM384 448q0 -14 -9 -23t-23 -9h-320q-14 0 -23 9t-9 23t9 23t23 9h320 q14 0 23 -9t9 -23zM1648 320q0 -120 -85 -203l-147 -146q-83 -83 -203 -83q-121 0 -204 85l-334 335q-21 21 -42 56l239 18l273 -274q27 -27 68 -27.5t68 26.5l147 146q28 28 28 67q0 40 -28 68l-274 275l18 239q35 -21 56 -42l336 -336q84 -86 84 -204zM1031 1044l-239 -18 l-273 274q-28 28 -68 28q-39 0 -68 -27l-147 -146q-28 -28 -28 -67q0 -40 28 -68l274 -274l-18 -240q-35 21 -56 42l-336 336q-84 86 -84 204q0 120 85 203l147 146q83 83 203 83q121 0 204 -85l334 -335q21 -21 42 -56zM1664 960q0 -14 -9 -23t-23 -9h-320q-14 0 -23 9 t-9 23t9 23t23 9h320q14 0 23 -9t9 -23zM1120 1504v-320q0 -14 -9 -23t-23 -9t-23 9t-9 23v320q0 14 9 23t23 9t23 -9t9 -23zM1527 1353l-256 -256q-11 -9 -23 -9t-23 9q-9 10 -9 23t9 23l256 256q10 9 23 9t23 -9q9 -10 9 -23t-9 -23z" />
+<glyph unicode="" horiz-adv-x="1024" d="M704 280v-240q0 -16 -12 -28t-28 -12h-240q-16 0 -28 12t-12 28v240q0 16 12 28t28 12h240q16 0 28 -12t12 -28zM1020 880q0 -54 -15.5 -101t-35 -76.5t-55 -59.5t-57.5 -43.5t-61 -35.5q-41 -23 -68.5 -65t-27.5 -67q0 -17 -12 -32.5t-28 -15.5h-240q-15 0 -25.5 18.5 t-10.5 37.5v45q0 83 65 156.5t143 108.5q59 27 84 56t25 76q0 42 -46.5 74t-107.5 32q-65 0 -108 -29q-35 -25 -107 -115q-13 -16 -31 -16q-12 0 -25 8l-164 125q-13 10 -15.5 25t5.5 28q160 266 464 266q80 0 161 -31t146 -83t106 -127.5t41 -158.5z" />
+<glyph unicode="" horiz-adv-x="640" d="M640 192v-128q0 -26 -19 -45t-45 -19h-512q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h64v384h-64q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h384q26 0 45 -19t19 -45v-576h64q26 0 45 -19t19 -45zM512 1344v-192q0 -26 -19 -45t-45 -19h-256q-26 0 -45 19t-19 45v192 q0 26 19 45t45 19h256q26 0 45 -19t19 -45z" />
+<glyph unicode="" horiz-adv-x="640" d="M512 288v-224q0 -26 -19 -45t-45 -19h-256q-26 0 -45 19t-19 45v224q0 26 19 45t45 19h256q26 0 45 -19t19 -45zM542 1344l-28 -768q-1 -26 -20.5 -45t-45.5 -19h-256q-26 0 -45.5 19t-20.5 45l-28 768q-1 26 17.5 45t44.5 19h320q26 0 44.5 -19t17.5 -45z" />
+<glyph unicode="" d="M897 167v-167h-248l-159 252l-24 42q-8 9 -11 21h-3l-9 -21q-10 -20 -25 -44l-155 -250h-258v167h128l197 291l-185 272h-137v168h276l139 -228q2 -4 23 -42q8 -9 11 -21h3q3 9 11 21l25 42l140 228h257v-168h-125l-184 -267l204 -296h109zM1534 846v-206h-514l-3 27 q-4 28 -4 46q0 64 26 117t65 86.5t84 65t84 54.5t65 54t26 64q0 38 -29.5 62.5t-70.5 24.5q-51 0 -97 -39q-14 -11 -36 -38l-105 92q26 37 63 66q83 65 188 65q110 0 178 -59.5t68 -158.5q0 -56 -24.5 -103t-62 -76.5t-81.5 -58.5t-82 -50.5t-65.5 -51.5t-30.5 -63h232v80 h126z" />
+<glyph unicode="" d="M897 167v-167h-248l-159 252l-24 42q-8 9 -11 21h-3l-9 -21q-10 -20 -25 -44l-155 -250h-258v167h128l197 291l-185 272h-137v168h276l139 -228q2 -4 23 -42q8 -9 11 -21h3q3 9 11 21l25 42l140 228h257v-168h-125l-184 -267l204 -296h109zM1536 -50v-206h-514l-4 27 q-3 45 -3 46q0 64 26 117t65 86.5t84 65t84 54.5t65 54t26 64q0 38 -29.5 62.5t-70.5 24.5q-51 0 -97 -39q-14 -11 -36 -38l-105 92q26 37 63 66q80 65 188 65q110 0 178 -59.5t68 -158.5q0 -66 -34.5 -118.5t-84 -86t-99.5 -62.5t-87 -63t-41 -73h232v80h126z" />
+<glyph unicode="" horiz-adv-x="1920" d="M896 128l336 384h-768l-336 -384h768zM1909 1205q15 -34 9.5 -71.5t-30.5 -65.5l-896 -1024q-38 -44 -96 -44h-768q-38 0 -69.5 20.5t-47.5 54.5q-15 34 -9.5 71.5t30.5 65.5l896 1024q38 44 96 44h768q38 0 69.5 -20.5t47.5 -54.5z" />
+<glyph unicode="" horiz-adv-x="1664" d="M1664 438q0 -81 -44.5 -135t-123.5 -54q-41 0 -77.5 17.5t-59 38t-56.5 38t-71 17.5q-110 0 -110 -124q0 -39 16 -115t15 -115v-5q-22 0 -33 -1q-34 -3 -97.5 -11.5t-115.5 -13.5t-98 -5q-61 0 -103 26.5t-42 83.5q0 37 17.5 71t38 56.5t38 59t17.5 77.5q0 79 -54 123.5 t-135 44.5q-84 0 -143 -45.5t-59 -127.5q0 -43 15 -83t33.5 -64.5t33.5 -53t15 -50.5q0 -45 -46 -89q-37 -35 -117 -35q-95 0 -245 24q-9 2 -27.5 4t-27.5 4l-13 2q-1 0 -3 1q-2 0 -2 1v1024q2 -1 17.5 -3.5t34 -5t21.5 -3.5q150 -24 245 -24q80 0 117 35q46 44 46 89 q0 22 -15 50.5t-33.5 53t-33.5 64.5t-15 83q0 82 59 127.5t144 45.5q80 0 134 -44.5t54 -123.5q0 -41 -17.5 -77.5t-38 -59t-38 -56.5t-17.5 -71q0 -57 42 -83.5t103 -26.5q64 0 180 15t163 17v-2q-1 -2 -3.5 -17.5t-5 -34t-3.5 -21.5q-24 -150 -24 -245q0 -80 35 -117 q44 -46 89 -46q22 0 50.5 15t53 33.5t64.5 33.5t83 15q82 0 127.5 -59t45.5 -143z" />
+<glyph unicode="" horiz-adv-x="1152" d="M1152 832v-128q0 -221 -147.5 -384.5t-364.5 -187.5v-132h256q26 0 45 -19t19 -45t-19 -45t-45 -19h-640q-26 0 -45 19t-19 45t19 45t45 19h256v132q-217 24 -364.5 187.5t-147.5 384.5v128q0 26 19 45t45 19t45 -19t19 -45v-128q0 -185 131.5 -316.5t316.5 -131.5 t316.5 131.5t131.5 316.5v128q0 26 19 45t45 19t45 -19t19 -45zM896 1216v-512q0 -132 -94 -226t-226 -94t-226 94t-94 226v512q0 132 94 226t226 94t226 -94t94 -226z" />
+<glyph unicode="" horiz-adv-x="1408" d="M271 591l-101 -101q-42 103 -42 214v128q0 26 19 45t45 19t45 -19t19 -45v-128q0 -53 15 -113zM1385 1193l-361 -361v-128q0 -132 -94 -226t-226 -94q-55 0 -109 19l-96 -96q97 -51 205 -51q185 0 316.5 131.5t131.5 316.5v128q0 26 19 45t45 19t45 -19t19 -45v-128 q0 -221 -147.5 -384.5t-364.5 -187.5v-132h256q26 0 45 -19t19 -45t-19 -45t-45 -19h-640q-26 0 -45 19t-19 45t19 45t45 19h256v132q-125 13 -235 81l-254 -254q-10 -10 -23 -10t-23 10l-82 82q-10 10 -10 23t10 23l1234 1234q10 10 23 10t23 -10l82 -82q10 -10 10 -23 t-10 -23zM1005 1325l-621 -621v512q0 132 94 226t226 94q102 0 184.5 -59t116.5 -152z" />
+<glyph unicode="" horiz-adv-x="1280" d="M1088 576v640h-448v-1137q119 63 213 137q235 184 235 360zM1280 1344v-768q0 -86 -33.5 -170.5t-83 -150t-118 -127.5t-126.5 -103t-121 -77.5t-89.5 -49.5t-42.5 -20q-12 -6 -26 -6t-26 6q-16 7 -42.5 20t-89.5 49.5t-121 77.5t-126.5 103t-118 127.5t-83 150 t-33.5 170.5v768q0 26 19 45t45 19h1152q26 0 45 -19t19 -45z" />
+<glyph unicode="" horiz-adv-x="1664" d="M128 -128h1408v1024h-1408v-1024zM512 1088v288q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-288q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM1280 1088v288q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-288q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM1664 1152v-1280 q0 -52 -38 -90t-90 -38h-1408q-52 0 -90 38t-38 90v1280q0 52 38 90t90 38h128v96q0 66 47 113t113 47h64q66 0 113 -47t47 -113v-96h384v96q0 66 47 113t113 47h64q66 0 113 -47t47 -113v-96h128q52 0 90 -38t38 -90z" />
+<glyph unicode="" horiz-adv-x="1408" d="M512 1344q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1408 1376v-320q0 -16 -12 -25q-8 -7 -20 -7q-4 0 -7 1l-448 96q-11 2 -18 11t-7 20h-256v-102q111 -23 183.5 -111t72.5 -203v-800q0 -26 -19 -45t-45 -19h-512q-26 0 -45 19t-19 45v800 q0 106 62.5 190.5t161.5 114.5v111h-32q-59 0 -115 -23.5t-91.5 -53t-66 -66.5t-40.5 -53.5t-14 -24.5q-17 -35 -57 -35q-16 0 -29 7q-23 12 -31.5 37t3.5 49q5 10 14.5 26t37.5 53.5t60.5 70t85 67t108.5 52.5q-25 42 -25 86q0 66 47 113t113 47t113 -47t47 -113 q0 -33 -14 -64h302q0 11 7 20t18 11l448 96q3 1 7 1q12 0 20 -7q12 -9 12 -25z" />
+<glyph unicode="" horiz-adv-x="1664" d="M1440 1088q0 40 -28 68t-68 28t-68 -28t-28 -68t28 -68t68 -28t68 28t28 68zM1664 1376q0 -249 -75.5 -430.5t-253.5 -360.5q-81 -80 -195 -176l-20 -379q-2 -16 -16 -26l-384 -224q-7 -4 -16 -4q-12 0 -23 9l-64 64q-13 14 -8 32l85 276l-281 281l-276 -85q-3 -1 -9 -1 q-14 0 -23 9l-64 64q-17 19 -5 39l224 384q10 14 26 16l379 20q96 114 176 195q188 187 358 258t431 71q14 0 24 -9.5t10 -22.5z" />
+<glyph unicode="" horiz-adv-x="1792" d="M1745 763l-164 -763h-334l178 832q13 56 -15 88q-27 33 -83 33h-169l-204 -953h-334l204 953h-286l-204 -953h-334l204 953l-153 327h1276q101 0 189.5 -40.5t147.5 -113.5q60 -73 81 -168.5t0 -194.5z" />
+<glyph unicode="" d="M909 141l102 102q19 19 19 45t-19 45l-307 307l307 307q19 19 19 45t-19 45l-102 102q-19 19 -45 19t-45 -19l-454 -454q-19 -19 -19 -45t19 -45l454 -454q19 -19 45 -19t45 19zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5 t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+<glyph unicode="" d="M717 141l454 454q19 19 19 45t-19 45l-454 454q-19 19 -45 19t-45 -19l-102 -102q-19 -19 -19 -45t19 -45l307 -307l-307 -307q-19 -19 -19 -45t19 -45l102 -102q19 -19 45 -19t45 19zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5 t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+<glyph unicode="" d="M1165 397l102 102q19 19 19 45t-19 45l-454 454q-19 19 -45 19t-45 -19l-454 -454q-19 -19 -19 -45t19 -45l102 -102q19 -19 45 -19t45 19l307 307l307 -307q19 -19 45 -19t45 19zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5 t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+<glyph unicode="" d="M813 237l454 454q19 19 19 45t-19 45l-102 102q-19 19 -45 19t-45 -19l-307 -307l-307 307q-19 19 -45 19t-45 -19l-102 -102q-19 -19 -19 -45t19 -45l454 -454q19 -19 45 -19t45 19zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5 t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+<glyph unicode="" horiz-adv-x="1408" d="M1130 939l16 175h-884l47 -534h612l-22 -228l-197 -53l-196 53l-13 140h-175l22 -278l362 -100h4v1l359 99l50 544h-644l-15 181h674zM0 1408h1408l-128 -1438l-578 -162l-574 162z" />
+<glyph unicode="" horiz-adv-x="1792" d="M275 1408h1505l-266 -1333l-804 -267l-698 267l71 356h297l-29 -147l422 -161l486 161l68 339h-1208l58 297h1209l38 191h-1208z" />
+<glyph unicode="" horiz-adv-x="1792" d="M960 1280q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1792 352v-352q0 -22 -20 -30q-8 -2 -12 -2q-13 0 -23 9l-93 93q-119 -143 -318.5 -226.5t-429.5 -83.5t-429.5 83.5t-318.5 226.5l-93 -93q-9 -9 -23 -9q-4 0 -12 2q-20 8 -20 30v352 q0 14 9 23t23 9h352q22 0 30 -20q8 -19 -7 -35l-100 -100q67 -91 189.5 -153.5t271.5 -82.5v647h-192q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h192v163q-58 34 -93 92.5t-35 128.5q0 106 75 181t181 75t181 -75t75 -181q0 -70 -35 -128.5t-93 -92.5v-163h192q26 0 45 -19 t19 -45v-128q0 -26 -19 -45t-45 -19h-192v-647q149 20 271.5 82.5t189.5 153.5l-100 100q-15 16 -7 35q8 20 30 20h352q14 0 23 -9t9 -23z" />
+<glyph unicode="" horiz-adv-x="1152" d="M1056 768q40 0 68 -28t28 -68v-576q0 -40 -28 -68t-68 -28h-960q-40 0 -68 28t-28 68v576q0 40 28 68t68 28h32v320q0 185 131.5 316.5t316.5 131.5t316.5 -131.5t131.5 -316.5q0 -26 -19 -45t-45 -19h-64q-26 0 -45 19t-19 45q0 106 -75 181t-181 75t-181 -75t-75 -181 v-320h736z" />
+<glyph unicode="" d="M1024 640q0 -106 -75 -181t-181 -75t-181 75t-75 181t75 181t181 75t181 -75t75 -181zM1152 640q0 159 -112.5 271.5t-271.5 112.5t-271.5 -112.5t-112.5 -271.5t112.5 -271.5t271.5 -112.5t271.5 112.5t112.5 271.5zM1280 640q0 -212 -150 -362t-362 -150t-362 150 t-150 362t150 362t362 150t362 -150t150 -362zM1408 640q0 130 -51 248.5t-136.5 204t-204 136.5t-248.5 51t-248.5 -51t-204 -136.5t-136.5 -204t-51 -248.5t51 -248.5t136.5 -204t204 -136.5t248.5 -51t248.5 51t204 136.5t136.5 204t51 248.5zM1536 640 q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+<glyph unicode="" horiz-adv-x="1408" d="M384 800v-192q0 -40 -28 -68t-68 -28h-192q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h192q40 0 68 -28t28 -68zM896 800v-192q0 -40 -28 -68t-68 -28h-192q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h192q40 0 68 -28t28 -68zM1408 800v-192q0 -40 -28 -68t-68 -28h-192 q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h192q40 0 68 -28t28 -68z" />
+<glyph unicode="" horiz-adv-x="384" d="M384 288v-192q0 -40 -28 -68t-68 -28h-192q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h192q40 0 68 -28t28 -68zM384 800v-192q0 -40 -28 -68t-68 -28h-192q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h192q40 0 68 -28t28 -68zM384 1312v-192q0 -40 -28 -68t-68 -28h-192 q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h192q40 0 68 -28t28 -68z" />
+<glyph unicode="" d="M512 256q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM863 162q-13 232 -177 396t-396 177q-14 1 -24 -9t-10 -23v-128q0 -13 8.5 -22t21.5 -10q154 -11 264 -121t121 -264q1 -13 10 -21.5t22 -8.5h128q13 0 23 10 t9 24zM1247 161q-5 154 -56 297.5t-139.5 260t-205 205t-260 139.5t-297.5 56q-14 1 -23 -9q-10 -10 -10 -23v-128q0 -13 9 -22t22 -10q204 -7 378 -111.5t278.5 -278.5t111.5 -378q1 -13 10 -22t22 -9h128q13 0 23 10q11 9 9 23zM1536 1120v-960q0 -119 -84.5 -203.5 t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
+<glyph unicode="" d="M768 1408q209 0 385.5 -103t279.5 -279.5t103 -385.5t-103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103zM1152 585q32 18 32 55t-32 55l-544 320q-31 19 -64 1q-32 -19 -32 -56v-640q0 -37 32 -56 q16 -8 32 -8q17 0 32 9z" />
+<glyph unicode="" horiz-adv-x="1792" d="M1024 1084l316 -316l-572 -572l-316 316zM813 105l618 618q19 19 19 45t-19 45l-362 362q-18 18 -45 18t-45 -18l-618 -618q-19 -19 -19 -45t19 -45l362 -362q18 -18 45 -18t45 18zM1702 742l-907 -908q-37 -37 -90.5 -37t-90.5 37l-126 126q56 56 56 136t-56 136 t-136 56t-136 -56l-125 126q-37 37 -37 90.5t37 90.5l907 906q37 37 90.5 37t90.5 -37l125 -125q-56 -56 -56 -136t56 -136t136 -56t136 56l126 -125q37 -37 37 -90.5t-37 -90.5z" />
+<glyph unicode="" d="M1280 576v128q0 26 -19 45t-45 19h-896q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45t45 -19h896q26 0 45 19t19 45zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5 t84.5 -203.5z" />
+<glyph unicode="" horiz-adv-x="1408" d="M1152 736v-64q0 -14 -9 -23t-23 -9h-832q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h832q14 0 23 -9t9 -23zM1280 288v832q0 66 -47 113t-113 47h-832q-66 0 -113 -47t-47 -113v-832q0 -66 47 -113t113 -47h832q66 0 113 47t47 113zM1408 1120v-832q0 -119 -84.5 -203.5 t-203.5 -84.5h-832q-119 0 -203.5 84.5t-84.5 203.5v832q0 119 84.5 203.5t203.5 84.5h832q119 0 203.5 -84.5t84.5 -203.5z" />
+<glyph unicode="" horiz-adv-x="1024" d="M1018 933q-18 -37 -58 -37h-192v-864q0 -14 -9 -23t-23 -9h-704q-21 0 -29 18q-8 20 4 35l160 192q9 11 25 11h320v640h-192q-40 0 -58 37q-17 37 9 68l320 384q18 22 49 22t49 -22l320 -384q27 -32 9 -68z" />
+<glyph unicode="" horiz-adv-x="1024" d="M32 1280h704q13 0 22.5 -9.5t9.5 -23.5v-863h192q40 0 58 -37t-9 -69l-320 -384q-18 -22 -49 -22t-49 22l-320 384q-26 31 -9 69q18 37 58 37h192v640h-320q-14 0 -25 11l-160 192q-13 14 -4 34q9 19 29 19z" />
+<glyph unicode="" d="M685 237l614 614q19 19 19 45t-19 45l-102 102q-19 19 -45 19t-45 -19l-467 -467l-211 211q-19 19 -45 19t-45 -19l-102 -102q-19 -19 -19 -45t19 -45l358 -358q19 -19 45 -19t45 19zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5 t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
+<glyph unicode="" d="M404 428l152 -152l-52 -52h-56v96h-96v56zM818 818q14 -13 -3 -30l-291 -291q-17 -17 -30 -3q-14 13 3 30l291 291q17 17 30 3zM544 128l544 544l-288 288l-544 -544v-288h288zM1152 736l92 92q28 28 28 68t-28 68l-152 152q-28 28 -68 28t-68 -28l-92 -92zM1536 1120 v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
+<glyph unicode="" d="M1280 608v480q0 26 -19 45t-45 19h-480q-42 0 -59 -39q-17 -41 14 -70l144 -144l-534 -534q-19 -19 -19 -45t19 -45l102 -102q19 -19 45 -19t45 19l534 534l144 -144q18 -19 45 -19q12 0 25 5q39 17 39 59zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960 q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
+<glyph unicode="" d="M1005 435l352 352q19 19 19 45t-19 45l-352 352q-30 31 -69 14q-40 -17 -40 -59v-160q-119 0 -216 -19.5t-162.5 -51t-114 -79t-76.5 -95.5t-44.5 -109t-21.5 -111.5t-5 -110.5q0 -181 167 -404q10 -12 25 -12q7 0 13 3q22 9 19 33q-44 354 62 473q46 52 130 75.5 t224 23.5v-160q0 -42 40 -59q12 -5 24 -5q26 0 45 19zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
+<glyph unicode="" d="M640 448l256 128l-256 128v-256zM1024 1039v-542l-512 -256v542zM1312 640q0 148 -73 273t-198 198t-273 73t-273 -73t-198 -198t-73 -273t73 -273t198 -198t273 -73t273 73t198 198t73 273zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103 t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+<glyph unicode="" d="M1145 861q18 -35 -5 -66l-320 -448q-19 -27 -52 -27t-52 27l-320 448q-23 31 -5 66q17 35 57 35h640q40 0 57 -35zM1280 160v960q0 13 -9.5 22.5t-22.5 9.5h-960q-13 0 -22.5 -9.5t-9.5 -22.5v-960q0 -13 9.5 -22.5t22.5 -9.5h960q13 0 22.5 9.5t9.5 22.5zM1536 1120 v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
+<glyph unicode="" d="M1145 419q-17 -35 -57 -35h-640q-40 0 -57 35q-18 35 5 66l320 448q19 27 52 27t52 -27l320 -448q23 -31 5 -66zM1280 160v960q0 13 -9.5 22.5t-22.5 9.5h-960q-13 0 -22.5 -9.5t-9.5 -22.5v-960q0 -13 9.5 -22.5t22.5 -9.5h960q13 0 22.5 9.5t9.5 22.5zM1536 1120v-960 q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
+<glyph unicode="" d="M1088 640q0 -33 -27 -52l-448 -320q-31 -23 -66 -5q-35 17 -35 57v640q0 40 35 57q35 18 66 -5l448 -320q27 -19 27 -52zM1280 160v960q0 14 -9 23t-23 9h-960q-14 0 -23 -9t-9 -23v-960q0 -14 9 -23t23 -9h960q14 0 23 9t9 23zM1536 1120v-960q0 -119 -84.5 -203.5 t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
+<glyph unicode="" horiz-adv-x="1024" d="M976 229l35 -159q3 -12 -3 -22.5t-17 -14.5l-5 -1q-4 -2 -10.5 -3.5t-16 -4.5t-21.5 -5.5t-25.5 -5t-30 -5t-33.5 -4.5t-36.5 -3t-38.5 -1q-234 0 -409 130.5t-238 351.5h-95q-13 0 -22.5 9.5t-9.5 22.5v113q0 13 9.5 22.5t22.5 9.5h66q-2 57 1 105h-67q-14 0 -23 9 t-9 23v114q0 14 9 23t23 9h98q67 210 243.5 338t400.5 128q102 0 194 -23q11 -3 20 -15q6 -11 3 -24l-43 -159q-3 -13 -14 -19.5t-24 -2.5l-4 1q-4 1 -11.5 2.5l-17.5 3.5t-22.5 3.5t-26 3t-29 2.5t-29.5 1q-126 0 -226 -64t-150 -176h468q16 0 25 -12q10 -12 7 -26 l-24 -114q-5 -26 -32 -26h-488q-3 -37 0 -105h459q15 0 25 -12q9 -12 6 -27l-24 -112q-2 -11 -11 -18.5t-20 -7.5h-387q48 -117 149.5 -185.5t228.5 -68.5q18 0 36 1.5t33.5 3.5t29.5 4.5t24.5 5t18.5 4.5l12 3l5 2q13 5 26 -2q12 -7 15 -21z" />
+<glyph unicode="" horiz-adv-x="1024" d="M1020 399v-367q0 -14 -9 -23t-23 -9h-956q-14 0 -23 9t-9 23v150q0 13 9.5 22.5t22.5 9.5h97v383h-95q-14 0 -23 9.5t-9 22.5v131q0 14 9 23t23 9h95v223q0 171 123.5 282t314.5 111q185 0 335 -125q9 -8 10 -20.5t-7 -22.5l-103 -127q-9 -11 -22 -12q-13 -2 -23 7 q-5 5 -26 19t-69 32t-93 18q-85 0 -137 -47t-52 -123v-215h305q13 0 22.5 -9t9.5 -23v-131q0 -13 -9.5 -22.5t-22.5 -9.5h-305v-379h414v181q0 13 9 22.5t23 9.5h162q14 0 23 -9.5t9 -22.5z" />
+<glyph unicode="" horiz-adv-x="1024" d="M978 351q0 -153 -99.5 -263.5t-258.5 -136.5v-175q0 -14 -9 -23t-23 -9h-135q-13 0 -22.5 9.5t-9.5 22.5v175q-66 9 -127.5 31t-101.5 44.5t-74 48t-46.5 37.5t-17.5 18q-17 21 -2 41l103 135q7 10 23 12q15 2 24 -9l2 -2q113 -99 243 -125q37 -8 74 -8q81 0 142.5 43 t61.5 122q0 28 -15 53t-33.5 42t-58.5 37.5t-66 32t-80 32.5q-39 16 -61.5 25t-61.5 26.5t-62.5 31t-56.5 35.5t-53.5 42.5t-43.5 49t-35.5 58t-21 66.5t-8.5 78q0 138 98 242t255 134v180q0 13 9.5 22.5t22.5 9.5h135q14 0 23 -9t9 -23v-176q57 -6 110.5 -23t87 -33.5 t63.5 -37.5t39 -29t15 -14q17 -18 5 -38l-81 -146q-8 -15 -23 -16q-14 -3 -27 7q-3 3 -14.5 12t-39 26.5t-58.5 32t-74.5 26t-85.5 11.5q-95 0 -155 -43t-60 -111q0 -26 8.5 -48t29.5 -41.5t39.5 -33t56 -31t60.5 -27t70 -27.5q53 -20 81 -31.5t76 -35t75.5 -42.5t62 -50 t53 -63.5t31.5 -76.5t13 -94z" />
+<glyph unicode="" horiz-adv-x="898" d="M898 1066v-102q0 -14 -9 -23t-23 -9h-168q-23 -144 -129 -234t-276 -110q167 -178 459 -536q14 -16 4 -34q-8 -18 -29 -18h-195q-16 0 -25 12q-306 367 -498 571q-9 9 -9 22v127q0 13 9.5 22.5t22.5 9.5h112q132 0 212.5 43t102.5 125h-427q-14 0 -23 9t-9 23v102 q0 14 9 23t23 9h413q-57 113 -268 113h-145q-13 0 -22.5 9.5t-9.5 22.5v133q0 14 9 23t23 9h832q14 0 23 -9t9 -23v-102q0 -14 -9 -23t-23 -9h-233q47 -61 64 -144h171q14 0 23 -9t9 -23z" />
+<glyph unicode="" horiz-adv-x="1027" d="M603 0h-172q-13 0 -22.5 9t-9.5 23v330h-288q-13 0 -22.5 9t-9.5 23v103q0 13 9.5 22.5t22.5 9.5h288v85h-288q-13 0 -22.5 9t-9.5 23v104q0 13 9.5 22.5t22.5 9.5h214l-321 578q-8 16 0 32q10 16 28 16h194q19 0 29 -18l215 -425q19 -38 56 -125q10 24 30.5 68t27.5 61 l191 420q8 19 29 19h191q17 0 27 -16q9 -14 1 -31l-313 -579h215q13 0 22.5 -9.5t9.5 -22.5v-104q0 -14 -9.5 -23t-22.5 -9h-290v-85h290q13 0 22.5 -9.5t9.5 -22.5v-103q0 -14 -9.5 -23t-22.5 -9h-290v-330q0 -13 -9.5 -22.5t-22.5 -9.5z" />
+<glyph unicode="" horiz-adv-x="1280" d="M1043 971q0 100 -65 162t-171 62h-320v-448h320q106 0 171 62t65 162zM1280 971q0 -193 -126.5 -315t-326.5 -122h-340v-118h505q14 0 23 -9t9 -23v-128q0 -14 -9 -23t-23 -9h-505v-192q0 -14 -9.5 -23t-22.5 -9h-167q-14 0 -23 9t-9 23v192h-224q-14 0 -23 9t-9 23v128 q0 14 9 23t23 9h224v118h-224q-14 0 -23 9t-9 23v149q0 13 9 22.5t23 9.5h224v629q0 14 9 23t23 9h539q200 0 326.5 -122t126.5 -315z" />
+<glyph unicode="" horiz-adv-x="1792" d="M514 341l81 299h-159l75 -300q1 -1 1 -3t1 -3q0 1 0.5 3.5t0.5 3.5zM630 768l35 128h-292l32 -128h225zM822 768h139l-35 128h-70zM1271 340l78 300h-162l81 -299q0 -1 0.5 -3.5t1.5 -3.5q0 1 0.5 3t0.5 3zM1382 768l33 128h-297l34 -128h230zM1792 736v-64q0 -14 -9 -23 t-23 -9h-213l-164 -616q-7 -24 -31 -24h-159q-24 0 -31 24l-166 616h-209l-167 -616q-7 -24 -31 -24h-159q-11 0 -19.5 7t-10.5 17l-160 616h-208q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h175l-33 128h-142q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h109l-89 344q-5 15 5 28 q10 12 26 12h137q26 0 31 -24l90 -360h359l97 360q7 24 31 24h126q24 0 31 -24l98 -360h365l93 360q5 24 31 24h137q16 0 26 -12q10 -13 5 -28l-91 -344h111q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-145l-34 -128h179q14 0 23 -9t9 -23z" />
+<glyph unicode="" horiz-adv-x="1280" d="M1167 896q18 -182 -131 -258q117 -28 175 -103t45 -214q-7 -71 -32.5 -125t-64.5 -89t-97 -58.5t-121.5 -34.5t-145.5 -15v-255h-154v251q-80 0 -122 1v-252h-154v255q-18 0 -54 0.5t-55 0.5h-200l31 183h111q50 0 58 51v402h16q-6 1 -16 1v287q-13 68 -89 68h-111v164 l212 -1q64 0 97 1v252h154v-247q82 2 122 2v245h154v-252q79 -7 140 -22.5t113 -45t82.5 -78t36.5 -114.5zM952 351q0 36 -15 64t-37 46t-57.5 30.5t-65.5 18.5t-74 9t-69 3t-64.5 -1t-47.5 -1v-338q8 0 37 -0.5t48 -0.5t53 1.5t58.5 4t57 8.5t55.5 14t47.5 21t39.5 30 t24.5 40t9.5 51zM881 827q0 33 -12.5 58.5t-30.5 42t-48 28t-55 16.5t-61.5 8t-58 2.5t-54 -1t-39.5 -0.5v-307q5 0 34.5 -0.5t46.5 0t50 2t55 5.5t51.5 11t48.5 18.5t37 27t27 38.5t9 51z" />
+<glyph unicode="" d="M1024 1024v472q22 -14 36 -28l408 -408q14 -14 28 -36h-472zM896 992q0 -40 28 -68t68 -28h544v-1056q0 -40 -28 -68t-68 -28h-1344q-40 0 -68 28t-28 68v1600q0 40 28 68t68 28h800v-544z" />
+<glyph unicode="" d="M1468 1060q14 -14 28 -36h-472v472q22 -14 36 -28zM992 896h544v-1056q0 -40 -28 -68t-68 -28h-1344q-40 0 -68 28t-28 68v1600q0 40 28 68t68 28h800v-544q0 -40 28 -68t68 -28zM1152 160v64q0 14 -9 23t-23 9h-704q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h704 q14 0 23 9t9 23zM1152 416v64q0 14 -9 23t-23 9h-704q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h704q14 0 23 9t9 23zM1152 672v64q0 14 -9 23t-23 9h-704q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h704q14 0 23 9t9 23z" />
+<glyph unicode="" horiz-adv-x="1664" d="M1191 1128h177l-72 218l-12 47q-2 16 -2 20h-4l-3 -20q0 -1 -3.5 -18t-7.5 -29zM736 96q0 -12 -10 -24l-319 -319q-10 -9 -23 -9q-12 0 -23 9l-320 320q-15 16 -7 35q8 20 30 20h192v1376q0 14 9 23t23 9h192q14 0 23 -9t9 -23v-1376h192q14 0 23 -9t9 -23zM1572 -23 v-233h-584v90l369 529q12 18 21 27l11 9v3q-2 0 -6.5 -0.5t-7.5 -0.5q-12 -3 -30 -3h-232v-115h-120v229h567v-89l-369 -530q-6 -8 -21 -26l-11 -11v-2l14 2q9 2 30 2h248v119h121zM1661 874v-106h-288v106h75l-47 144h-243l-47 -144h75v-106h-287v106h70l230 662h162 l230 -662h70z" />
+<glyph unicode="" horiz-adv-x="1664" d="M1191 104h177l-72 218l-12 47q-2 16 -2 20h-4l-3 -20q0 -1 -3.5 -18t-7.5 -29zM736 96q0 -12 -10 -24l-319 -319q-10 -9 -23 -9q-12 0 -23 9l-320 320q-15 16 -7 35q8 20 30 20h192v1376q0 14 9 23t23 9h192q14 0 23 -9t9 -23v-1376h192q14 0 23 -9t9 -23zM1661 -150 v-106h-288v106h75l-47 144h-243l-47 -144h75v-106h-287v106h70l230 662h162l230 -662h70zM1572 1001v-233h-584v90l369 529q12 18 21 27l11 9v3q-2 0 -6.5 -0.5t-7.5 -0.5q-12 -3 -30 -3h-232v-115h-120v229h567v-89l-369 -530q-6 -8 -21 -26l-11 -10v-3l14 3q9 1 30 1h248 v119h121z" />
+<glyph unicode="" horiz-adv-x="1792" d="M736 96q0 -12 -10 -24l-319 -319q-10 -9 -23 -9q-12 0 -23 9l-320 320q-15 16 -7 35q8 20 30 20h192v1376q0 14 9 23t23 9h192q14 0 23 -9t9 -23v-1376h192q14 0 23 -9t9 -23zM1792 -32v-192q0 -14 -9 -23t-23 -9h-832q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h832 q14 0 23 -9t9 -23zM1600 480v-192q0 -14 -9 -23t-23 -9h-640q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h640q14 0 23 -9t9 -23zM1408 992v-192q0 -14 -9 -23t-23 -9h-448q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h448q14 0 23 -9t9 -23zM1216 1504v-192q0 -14 -9 -23t-23 -9h-256 q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h256q14 0 23 -9t9 -23z" />
+<glyph unicode="" horiz-adv-x="1792" d="M1216 -32v-192q0 -14 -9 -23t-23 -9h-256q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h256q14 0 23 -9t9 -23zM736 96q0 -12 -10 -24l-319 -319q-10 -9 -23 -9q-12 0 -23 9l-320 320q-15 16 -7 35q8 20 30 20h192v1376q0 14 9 23t23 9h192q14 0 23 -9t9 -23v-1376h192 q14 0 23 -9t9 -23zM1408 480v-192q0 -14 -9 -23t-23 -9h-448q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h448q14 0 23 -9t9 -23zM1600 992v-192q0 -14 -9 -23t-23 -9h-640q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h640q14 0 23 -9t9 -23zM1792 1504v-192q0 -14 -9 -23t-23 -9h-832 q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h832q14 0 23 -9t9 -23z" />
+<glyph unicode="" d="M1346 223q0 63 -44 116t-103 53q-52 0 -83 -37t-31 -94t36.5 -95t104.5 -38q50 0 85 27t35 68zM736 96q0 -12 -10 -24l-319 -319q-10 -9 -23 -9q-12 0 -23 9l-320 320q-15 16 -7 35q8 20 30 20h192v1376q0 14 9 23t23 9h192q14 0 23 -9t9 -23v-1376h192q14 0 23 -9t9 -23 zM1486 165q0 -62 -13 -121.5t-41 -114t-68 -95.5t-98.5 -65.5t-127.5 -24.5q-62 0 -108 16q-24 8 -42 15l39 113q15 -7 31 -11q37 -13 75 -13q84 0 134.5 58.5t66.5 145.5h-2q-21 -23 -61.5 -37t-84.5 -14q-106 0 -173 71.5t-67 172.5q0 105 72 178t181 73q123 0 205 -94.5 t82 -252.5zM1456 882v-114h-469v114h167v432q0 7 0.5 19t0.5 17v16h-2l-7 -12q-8 -13 -26 -31l-62 -58l-82 86l192 185h123v-654h165z" />
+<glyph unicode="" d="M1346 1247q0 63 -44 116t-103 53q-52 0 -83 -37t-31 -94t36.5 -95t104.5 -38q50 0 85 27t35 68zM736 96q0 -12 -10 -24l-319 -319q-10 -9 -23 -9q-12 0 -23 9l-320 320q-15 16 -7 35q8 20 30 20h192v1376q0 14 9 23t23 9h192q14 0 23 -9t9 -23v-1376h192q14 0 23 -9 t9 -23zM1456 -142v-114h-469v114h167v432q0 7 0.5 19t0.5 17v16h-2l-7 -12q-8 -13 -26 -31l-62 -58l-82 86l192 185h123v-654h165zM1486 1189q0 -62 -13 -121.5t-41 -114t-68 -95.5t-98.5 -65.5t-127.5 -24.5q-62 0 -108 16q-24 8 -42 15l39 113q15 -7 31 -11q37 -13 75 -13 q84 0 134.5 58.5t66.5 145.5h-2q-21 -23 -61.5 -37t-84.5 -14q-106 0 -173 71.5t-67 172.5q0 105 72 178t181 73q123 0 205 -94.5t82 -252.5z" />
+<glyph unicode="" horiz-adv-x="1664" d="M256 192q0 26 -19 45t-45 19q-27 0 -45.5 -19t-18.5 -45q0 -27 18.5 -45.5t45.5 -18.5q26 0 45 18.5t19 45.5zM416 704v-640q0 -26 -19 -45t-45 -19h-288q-26 0 -45 19t-19 45v640q0 26 19 45t45 19h288q26 0 45 -19t19 -45zM1600 704q0 -86 -55 -149q15 -44 15 -76 q3 -76 -43 -137q17 -56 0 -117q-15 -57 -54 -94q9 -112 -49 -181q-64 -76 -197 -78h-36h-76h-17q-66 0 -144 15.5t-121.5 29t-120.5 39.5q-123 43 -158 44q-26 1 -45 19.5t-19 44.5v641q0 25 18 43.5t43 20.5q24 2 76 59t101 121q68 87 101 120q18 18 31 48t17.5 48.5 t13.5 60.5q7 39 12.5 61t19.5 52t34 50q19 19 45 19q46 0 82.5 -10.5t60 -26t40 -40.5t24 -45t12 -50t5 -45t0.5 -39q0 -38 -9.5 -76t-19 -60t-27.5 -56q-3 -6 -10 -18t-11 -22t-8 -24h277q78 0 135 -57t57 -135z" />
+<glyph unicode="" horiz-adv-x="1664" d="M256 960q0 -26 -19 -45t-45 -19q-27 0 -45.5 19t-18.5 45q0 27 18.5 45.5t45.5 18.5q26 0 45 -18.5t19 -45.5zM416 448v640q0 26 -19 45t-45 19h-288q-26 0 -45 -19t-19 -45v-640q0 -26 19 -45t45 -19h288q26 0 45 19t19 45zM1545 597q55 -61 55 -149q-1 -78 -57.5 -135 t-134.5 -57h-277q4 -14 8 -24t11 -22t10 -18q18 -37 27 -57t19 -58.5t10 -76.5q0 -24 -0.5 -39t-5 -45t-12 -50t-24 -45t-40 -40.5t-60 -26t-82.5 -10.5q-26 0 -45 19q-20 20 -34 50t-19.5 52t-12.5 61q-9 42 -13.5 60.5t-17.5 48.5t-31 48q-33 33 -101 120q-49 64 -101 121 t-76 59q-25 2 -43 20.5t-18 43.5v641q0 26 19 44.5t45 19.5q35 1 158 44q77 26 120.5 39.5t121.5 29t144 15.5h17h76h36q133 -2 197 -78q58 -69 49 -181q39 -37 54 -94q17 -61 0 -117q46 -61 43 -137q0 -32 -15 -76z" />
+<glyph unicode="" d="M919 233v157q0 50 -29 50q-17 0 -33 -16v-224q16 -16 33 -16q29 0 29 49zM1103 355h66v34q0 51 -33 51t-33 -51v-34zM532 621v-70h-80v-423h-74v423h-78v70h232zM733 495v-367h-67v40q-39 -45 -76 -45q-33 0 -42 28q-6 16 -6 54v290h66v-270q0 -24 1 -26q1 -15 15 -15 q20 0 42 31v280h67zM985 384v-146q0 -52 -7 -73q-12 -42 -53 -42q-35 0 -68 41v-36h-67v493h67v-161q32 40 68 40q41 0 53 -42q7 -21 7 -74zM1236 255v-9q0 -29 -2 -43q-3 -22 -15 -40q-27 -40 -80 -40q-52 0 -81 38q-21 27 -21 86v129q0 59 20 86q29 38 80 38t78 -38 q21 -28 21 -86v-76h-133v-65q0 -51 34 -51q24 0 30 26q0 1 0.5 7t0.5 16.5v21.5h68zM785 1079v-156q0 -51 -32 -51t-32 51v156q0 52 32 52t32 -52zM1318 366q0 177 -19 260q-10 44 -43 73.5t-76 34.5q-136 15 -412 15q-275 0 -411 -15q-44 -5 -76.5 -34.5t-42.5 -73.5 q-20 -87 -20 -260q0 -176 20 -260q10 -43 42.5 -73t75.5 -35q137 -15 412 -15t412 15q43 5 75.5 35t42.5 73q20 84 20 260zM563 1017l90 296h-75l-51 -195l-53 195h-78l24 -69t23 -69q35 -103 46 -158v-201h74v201zM852 936v130q0 58 -21 87q-29 38 -78 38q-51 0 -78 -38 q-21 -29 -21 -87v-130q0 -58 21 -87q27 -38 78 -38q49 0 78 38q21 27 21 87zM1033 816h67v370h-67v-283q-22 -31 -42 -31q-15 0 -16 16q-1 2 -1 26v272h-67v-293q0 -37 6 -55q11 -27 43 -27q36 0 77 45v-40zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960 q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
+<glyph unicode="" d="M971 292v-211q0 -67 -39 -67q-23 0 -45 22v301q22 22 45 22q39 0 39 -67zM1309 291v-46h-90v46q0 68 45 68t45 -68zM343 509h107v94h-312v-94h105v-569h100v569zM631 -60h89v494h-89v-378q-30 -42 -57 -42q-18 0 -21 21q-1 3 -1 35v364h-89v-391q0 -49 8 -73 q12 -37 58 -37q48 0 102 61v-54zM1060 88v197q0 73 -9 99q-17 56 -71 56q-50 0 -93 -54v217h-89v-663h89v48q45 -55 93 -55q54 0 71 55q9 27 9 100zM1398 98v13h-91q0 -51 -2 -61q-7 -36 -40 -36q-46 0 -46 69v87h179v103q0 79 -27 116q-39 51 -106 51q-68 0 -107 -51 q-28 -37 -28 -116v-173q0 -79 29 -116q39 -51 108 -51q72 0 108 53q18 27 21 54q2 9 2 58zM790 1011v210q0 69 -43 69t-43 -69v-210q0 -70 43 -70t43 70zM1509 260q0 -234 -26 -350q-14 -59 -58 -99t-102 -46q-184 -21 -555 -21t-555 21q-58 6 -102.5 46t-57.5 99 q-26 112 -26 350q0 234 26 350q14 59 58 99t103 47q183 20 554 20t555 -20q58 -7 102.5 -47t57.5 -99q26 -112 26 -350zM511 1536h102l-121 -399v-271h-100v271q-14 74 -61 212q-37 103 -65 187h106l71 -263zM881 1203v-175q0 -81 -28 -118q-37 -51 -106 -51q-67 0 -105 51 q-28 38 -28 118v175q0 80 28 117q38 51 105 51q69 0 106 -51q28 -37 28 -117zM1216 1365v-499h-91v55q-53 -62 -103 -62q-46 0 -59 37q-8 24 -8 75v394h91v-367q0 -33 1 -35q3 -22 21 -22q27 0 57 43v381h91z" />
+<glyph unicode="" horiz-adv-x="1408" d="M597 869q-10 -18 -257 -456q-27 -46 -65 -46h-239q-21 0 -31 17t0 36l253 448q1 0 0 1l-161 279q-12 22 -1 37q9 15 32 15h239q40 0 66 -45zM1403 1511q11 -16 0 -37l-528 -934v-1l336 -615q11 -20 1 -37q-10 -15 -32 -15h-239q-42 0 -66 45l-339 622q18 32 531 942 q25 45 64 45h241q22 0 31 -15z" />
+<glyph unicode="" d="M685 771q0 1 -126 222q-21 34 -52 34h-184q-18 0 -26 -11q-7 -12 1 -29l125 -216v-1l-196 -346q-9 -14 0 -28q8 -13 24 -13h185q31 0 50 36zM1309 1268q-7 12 -24 12h-187q-30 0 -49 -35l-411 -729q1 -2 262 -481q20 -35 52 -35h184q18 0 25 12q8 13 -1 28l-260 476v1 l409 723q8 16 0 28zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
+<glyph unicode="" horiz-adv-x="1792" d="M1280 640q0 37 -30 54l-512 320q-31 20 -65 2q-33 -18 -33 -56v-640q0 -38 33 -56q16 -8 31 -8q20 0 34 10l512 320q30 17 30 54zM1792 640q0 -96 -1 -150t-8.5 -136.5t-22.5 -147.5q-16 -73 -69 -123t-124 -58q-222 -25 -671 -25t-671 25q-71 8 -124.5 58t-69.5 123 q-14 65 -21.5 147.5t-8.5 136.5t-1 150t1 150t8.5 136.5t22.5 147.5q16 73 69 123t124 58q222 25 671 25t671 -25q71 -8 124.5 -58t69.5 -123q14 -65 21.5 -147.5t8.5 -136.5t1 -150z" />
+<glyph unicode="" horiz-adv-x="1792" d="M402 829l494 -305l-342 -285l-490 319zM1388 274v-108l-490 -293v-1l-1 1l-1 -1v1l-489 293v108l147 -96l342 284v2l1 -1l1 1v-2l343 -284zM554 1418l342 -285l-494 -304l-338 270zM1390 829l338 -271l-489 -319l-343 285zM1239 1418l489 -319l-338 -270l-494 304z" />
+<glyph unicode="" horiz-adv-x="1408" d="M928 135v-151l-707 -1v151zM1169 481v-701l-1 -35v-1h-1132l-35 1h-1v736h121v-618h928v618h120zM241 393l704 -65l-13 -150l-705 65zM309 709l683 -183l-39 -146l-683 183zM472 1058l609 -360l-77 -130l-609 360zM832 1389l398 -585l-124 -85l-399 584zM1285 1536 l121 -697l-149 -26l-121 697z" />
+<glyph unicode="" d="M1362 110v648h-135q20 -63 20 -131q0 -126 -64 -232.5t-174 -168.5t-240 -62q-197 0 -337 135.5t-140 327.5q0 68 20 131h-141v-648q0 -26 17.5 -43.5t43.5 -17.5h1069q25 0 43 17.5t18 43.5zM1078 643q0 124 -90.5 211.5t-218.5 87.5q-127 0 -217.5 -87.5t-90.5 -211.5 t90.5 -211.5t217.5 -87.5q128 0 218.5 87.5t90.5 211.5zM1362 1003v165q0 28 -20 48.5t-49 20.5h-174q-29 0 -49 -20.5t-20 -48.5v-165q0 -29 20 -49t49 -20h174q29 0 49 20t20 49zM1536 1211v-1142q0 -81 -58 -139t-139 -58h-1142q-81 0 -139 58t-58 139v1142q0 81 58 139 t139 58h1142q81 0 139 -58t58 -139z" />
+<glyph unicode="" d="M1248 1408q119 0 203.5 -84.5t84.5 -203.5v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960zM698 640q0 88 -62 150t-150 62t-150 -62t-62 -150t62 -150t150 -62t150 62t62 150zM1262 640q0 88 -62 150 t-150 62t-150 -62t-62 -150t62 -150t150 -62t150 62t62 150z" />
+<glyph unicode="" d="M768 914l201 -306h-402zM1133 384h94l-459 691l-459 -691h94l104 160h522zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+<glyph unicode="" horiz-adv-x="1408" d="M815 677q8 -63 -50.5 -101t-111.5 -6q-39 17 -53.5 58t-0.5 82t52 58q36 18 72.5 12t64 -35.5t27.5 -67.5zM926 698q-14 107 -113 164t-197 13q-63 -28 -100.5 -88.5t-34.5 -129.5q4 -91 77.5 -155t165.5 -56q91 8 152 84t50 168zM1165 1240q-20 27 -56 44.5t-58 22 t-71 12.5q-291 47 -566 -2q-43 -7 -66 -12t-55 -22t-50 -43q30 -28 76 -45.5t73.5 -22t87.5 -11.5q228 -29 448 -1q63 8 89.5 12t72.5 21.5t75 46.5zM1222 205q-8 -26 -15.5 -76.5t-14 -84t-28.5 -70t-58 -56.5q-86 -48 -189.5 -71.5t-202 -22t-201.5 18.5q-46 8 -81.5 18 t-76.5 27t-73 43.5t-52 61.5q-25 96 -57 292l6 16l18 9q223 -148 506.5 -148t507.5 148q21 -6 24 -23t-5 -45t-8 -37zM1403 1166q-26 -167 -111 -655q-5 -30 -27 -56t-43.5 -40t-54.5 -31q-252 -126 -610 -88q-248 27 -394 139q-15 12 -25.5 26.5t-17 35t-9 34t-6 39.5 t-5.5 35q-9 50 -26.5 150t-28 161.5t-23.5 147.5t-22 158q3 26 17.5 48.5t31.5 37.5t45 30t46 22.5t48 18.5q125 46 313 64q379 37 676 -50q155 -46 215 -122q16 -20 16.5 -51t-5.5 -54z" />
+<glyph unicode="" d="M848 666q0 43 -41 66t-77 1q-43 -20 -42.5 -72.5t43.5 -70.5q39 -23 81 4t36 72zM928 682q8 -66 -36 -121t-110 -61t-119 40t-56 113q-2 49 25.5 93t72.5 64q70 31 141.5 -10t81.5 -118zM1100 1073q-20 -21 -53.5 -34t-53 -16t-63.5 -8q-155 -20 -324 0q-44 6 -63 9.5 t-52.5 16t-54.5 32.5q13 19 36 31t40 15.5t47 8.5q198 35 408 1q33 -5 51 -8.5t43 -16t39 -31.5zM1142 327q0 7 5.5 26.5t3 32t-17.5 16.5q-161 -106 -365 -106t-366 106l-12 -6l-5 -12q26 -154 41 -210q47 -81 204 -108q249 -46 428 53q34 19 49 51.5t22.5 85.5t12.5 71z M1272 1020q9 53 -8 75q-43 55 -155 88q-216 63 -487 36q-132 -12 -226 -46q-38 -15 -59.5 -25t-47 -34t-29.5 -54q8 -68 19 -138t29 -171t24 -137q1 -5 5 -31t7 -36t12 -27t22 -28q105 -80 284 -100q259 -28 440 63q24 13 39.5 23t31 29t19.5 40q48 267 80 473zM1536 1120 v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
+<glyph unicode="" horiz-adv-x="1024" d="M944 207l80 -237q-23 -35 -111 -66t-177 -32q-104 -2 -190.5 26t-142.5 74t-95 106t-55.5 120t-16.5 118v544h-168v215q72 26 129 69.5t91 90t58 102t34 99t15 88.5q1 5 4.5 8.5t7.5 3.5h244v-424h333v-252h-334v-518q0 -30 6.5 -56t22.5 -52.5t49.5 -41.5t81.5 -14 q78 2 134 29z" />
+<glyph unicode="" d="M1136 75l-62 183q-44 -22 -103 -22q-36 -1 -62 10.5t-38.5 31.5t-17.5 40.5t-5 43.5v398h257v194h-256v326h-188q-8 0 -9 -10q-5 -44 -17.5 -87t-39 -95t-77 -95t-118.5 -68v-165h130v-418q0 -57 21.5 -115t65 -111t121 -85.5t176.5 -30.5q69 1 136.5 25t85.5 50z M1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
+<glyph unicode="" horiz-adv-x="768" d="M765 237q8 -19 -5 -35l-350 -384q-10 -10 -23 -10q-14 0 -24 10l-355 384q-13 16 -5 35q9 19 29 19h224v1248q0 14 9 23t23 9h192q14 0 23 -9t9 -23v-1248h224q21 0 29 -19z" />
+<glyph unicode="" horiz-adv-x="768" d="M765 1043q-9 -19 -29 -19h-224v-1248q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v1248h-224q-21 0 -29 19t5 35l350 384q10 10 23 10q14 0 24 -10l355 -384q13 -16 5 -35z" />
+<glyph unicode="" horiz-adv-x="1792" d="M1792 736v-192q0 -14 -9 -23t-23 -9h-1248v-224q0 -21 -19 -29t-35 5l-384 350q-10 10 -10 23q0 14 10 24l384 354q16 14 35 6q19 -9 19 -29v-224h1248q14 0 23 -9t9 -23z" />
+<glyph unicode="" horiz-adv-x="1792" d="M1728 643q0 -14 -10 -24l-384 -354q-16 -14 -35 -6q-19 9 -19 29v224h-1248q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h1248v224q0 21 19 29t35 -5l384 -350q10 -10 10 -23z" />
+<glyph unicode="" horiz-adv-x="1408" d="M1393 321q-39 -125 -123 -250q-129 -196 -257 -196q-49 0 -140 32q-86 32 -151 32q-61 0 -142 -33q-81 -34 -132 -34q-152 0 -301 259q-147 261 -147 503q0 228 113 374q112 144 284 144q72 0 177 -30q104 -30 138 -30q45 0 143 34q102 34 173 34q119 0 213 -65 q52 -36 104 -100q-79 -67 -114 -118q-65 -94 -65 -207q0 -124 69 -223t158 -126zM1017 1494q0 -61 -29 -136q-30 -75 -93 -138q-54 -54 -108 -72q-37 -11 -104 -17q3 149 78 257q74 107 250 148q1 -3 2.5 -11t2.5 -11q0 -4 0.5 -10t0.5 -10z" />
+<glyph unicode="" horiz-adv-x="1664" d="M682 530v-651l-682 94v557h682zM682 1273v-659h-682v565zM1664 530v-786l-907 125v661h907zM1664 1408v-794h-907v669z" />
+<glyph unicode="" horiz-adv-x="1408" d="M493 1053q16 0 27.5 11.5t11.5 27.5t-11.5 27.5t-27.5 11.5t-27 -11.5t-11 -27.5t11 -27.5t27 -11.5zM915 1053q16 0 27 11.5t11 27.5t-11 27.5t-27 11.5t-27.5 -11.5t-11.5 -27.5t11.5 -27.5t27.5 -11.5zM103 869q42 0 72 -30t30 -72v-430q0 -43 -29.5 -73t-72.5 -30 t-73 30t-30 73v430q0 42 30 72t73 30zM1163 850v-666q0 -46 -32 -78t-77 -32h-75v-227q0 -43 -30 -73t-73 -30t-73 30t-30 73v227h-138v-227q0 -43 -30 -73t-73 -30q-42 0 -72 30t-30 73l-1 227h-74q-46 0 -78 32t-32 78v666h918zM931 1255q107 -55 171 -153.5t64 -215.5 h-925q0 117 64 215.5t172 153.5l-71 131q-7 13 5 20q13 6 20 -6l72 -132q95 42 201 42t201 -42l72 132q7 12 20 6q12 -7 5 -20zM1408 767v-430q0 -43 -30 -73t-73 -30q-42 0 -72 30t-30 73v430q0 43 30 72.5t72 29.5q43 0 73 -29.5t30 -72.5z" />
+<glyph unicode="" d="M663 1125q-11 -1 -15.5 -10.5t-8.5 -9.5q-5 -1 -5 5q0 12 19 15h10zM750 1111q-4 -1 -11.5 6.5t-17.5 4.5q24 11 32 -2q3 -6 -3 -9zM399 684q-4 1 -6 -3t-4.5 -12.5t-5.5 -13.5t-10 -13q-7 -10 -1 -12q4 -1 12.5 7t12.5 18q1 3 2 7t2 6t1.5 4.5t0.5 4v3t-1 2.5t-3 2z M1254 325q0 18 -55 42q4 15 7.5 27.5t5 26t3 21.5t0.5 22.5t-1 19.5t-3.5 22t-4 20.5t-5 25t-5.5 26.5q-10 48 -47 103t-72 75q24 -20 57 -83q87 -162 54 -278q-11 -40 -50 -42q-31 -4 -38.5 18.5t-8 83.5t-11.5 107q-9 39 -19.5 69t-19.5 45.5t-15.5 24.5t-13 15t-7.5 7 q-14 62 -31 103t-29.5 56t-23.5 33t-15 40q-4 21 6 53.5t4.5 49.5t-44.5 25q-15 3 -44.5 18t-35.5 16q-8 1 -11 26t8 51t36 27q37 3 51 -30t4 -58q-11 -19 -2 -26.5t30 -0.5q13 4 13 36v37q-5 30 -13.5 50t-21 30.5t-23.5 15t-27 7.5q-107 -8 -89 -134q0 -15 -1 -15 q-9 9 -29.5 10.5t-33 -0.5t-15.5 5q1 57 -16 90t-45 34q-27 1 -41.5 -27.5t-16.5 -59.5q-1 -15 3.5 -37t13 -37.5t15.5 -13.5q10 3 16 14q4 9 -7 8q-7 0 -15.5 14.5t-9.5 33.5q-1 22 9 37t34 14q17 0 27 -21t9.5 -39t-1.5 -22q-22 -15 -31 -29q-8 -12 -27.5 -23.5 t-20.5 -12.5q-13 -14 -15.5 -27t7.5 -18q14 -8 25 -19.5t16 -19t18.5 -13t35.5 -6.5q47 -2 102 15q2 1 23 7t34.5 10.5t29.5 13t21 17.5q9 14 20 8q5 -3 6.5 -8.5t-3 -12t-16.5 -9.5q-20 -6 -56.5 -21.5t-45.5 -19.5q-44 -19 -70 -23q-25 -5 -79 2q-10 2 -9 -2t17 -19 q25 -23 67 -22q17 1 36 7t36 14t33.5 17.5t30 17t24.5 12t17.5 2.5t8.5 -11q0 -2 -1 -4.5t-4 -5t-6 -4.5t-8.5 -5t-9 -4.5t-10 -5t-9.5 -4.5q-28 -14 -67.5 -44t-66.5 -43t-49 -1q-21 11 -63 73q-22 31 -25 22q-1 -3 -1 -10q0 -25 -15 -56.5t-29.5 -55.5t-21 -58t11.5 -63 q-23 -6 -62.5 -90t-47.5 -141q-2 -18 -1.5 -69t-5.5 -59q-8 -24 -29 -3q-32 31 -36 94q-2 28 4 56q4 19 -1 18l-4 -5q-36 -65 10 -166q5 -12 25 -28t24 -20q20 -23 104 -90.5t93 -76.5q16 -15 17.5 -38t-14 -43t-45.5 -23q8 -15 29 -44.5t28 -54t7 -70.5q46 24 7 92 q-4 8 -10.5 16t-9.5 12t-2 6q3 5 13 9.5t20 -2.5q46 -52 166 -36q133 15 177 87q23 38 34 30q12 -6 10 -52q-1 -25 -23 -92q-9 -23 -6 -37.5t24 -15.5q3 19 14.5 77t13.5 90q2 21 -6.5 73.5t-7.5 97t23 70.5q15 18 51 18q1 37 34.5 53t72.5 10.5t60 -22.5zM626 1152 q3 17 -2.5 30t-11.5 15q-9 2 -9 -7q2 -5 5 -6q10 0 7 -15q-3 -20 8 -20q3 0 3 3zM1045 955q-2 8 -6.5 11.5t-13 5t-14.5 5.5q-5 3 -9.5 8t-7 8t-5.5 6.5t-4 4t-4 -1.5q-14 -16 7 -43.5t39 -31.5q9 -1 14.5 8t3.5 20zM867 1168q0 11 -5 19.5t-11 12.5t-9 3q-14 -1 -7 -7l4 -2 q14 -4 18 -31q0 -3 8 2zM921 1401q0 2 -2.5 5t-9 7t-9.5 6q-15 15 -24 15q-9 -1 -11.5 -7.5t-1 -13t-0.5 -12.5q-1 -4 -6 -10.5t-6 -9t3 -8.5q4 -3 8 0t11 9t15 9q1 1 9 1t15 2t9 7zM1486 60q20 -12 31 -24.5t12 -24t-2.5 -22.5t-15.5 -22t-23.5 -19.5t-30 -18.5 t-31.5 -16.5t-32 -15.5t-27 -13q-38 -19 -85.5 -56t-75.5 -64q-17 -16 -68 -19.5t-89 14.5q-18 9 -29.5 23.5t-16.5 25.5t-22 19.5t-47 9.5q-44 1 -130 1q-19 0 -57 -1.5t-58 -2.5q-44 -1 -79.5 -15t-53.5 -30t-43.5 -28.5t-53.5 -11.5q-29 1 -111 31t-146 43q-19 4 -51 9.5 t-50 9t-39.5 9.5t-33.5 14.5t-17 19.5q-10 23 7 66.5t18 54.5q1 16 -4 40t-10 42.5t-4.5 36.5t10.5 27q14 12 57 14t60 12q30 18 42 35t12 51q21 -73 -32 -106q-32 -20 -83 -15q-34 3 -43 -10q-13 -15 5 -57q2 -6 8 -18t8.5 -18t4.5 -17t1 -22q0 -15 -17 -49t-14 -48 q3 -17 37 -26q20 -6 84.5 -18.5t99.5 -20.5q24 -6 74 -22t82.5 -23t55.5 -4q43 6 64.5 28t23 48t-7.5 58.5t-19 52t-20 36.5q-121 190 -169 242q-68 74 -113 40q-11 -9 -15 15q-3 16 -2 38q1 29 10 52t24 47t22 42q8 21 26.5 72t29.5 78t30 61t39 54q110 143 124 195 q-12 112 -16 310q-2 90 24 151.5t106 104.5q39 21 104 21q53 1 106 -13.5t89 -41.5q57 -42 91.5 -121.5t29.5 -147.5q-5 -95 30 -214q34 -113 133 -218q55 -59 99.5 -163t59.5 -191q8 -49 5 -84.5t-12 -55.5t-20 -22q-10 -2 -23.5 -19t-27 -35.5t-40.5 -33.5t-61 -14 q-18 1 -31.5 5t-22.5 13.5t-13.5 15.5t-11.5 20.5t-9 19.5q-22 37 -41 30t-28 -49t7 -97q20 -70 1 -195q-10 -65 18 -100.5t73 -33t85 35.5q59 49 89.5 66.5t103.5 42.5q53 18 77 36.5t18.5 34.5t-25 28.5t-51.5 23.5q-33 11 -49.5 48t-15 72.5t15.5 47.5q1 -31 8 -56.5 t14.5 -40.5t20.5 -28.5t21 -19t21.5 -13t16.5 -9.5z" />
+<glyph unicode="" d="M1024 36q-42 241 -140 498h-2l-2 -1q-16 -6 -43 -16.5t-101 -49t-137 -82t-131 -114.5t-103 -148l-15 11q184 -150 418 -150q132 0 256 52zM839 643q-21 49 -53 111q-311 -93 -673 -93q-1 -7 -1 -21q0 -124 44 -236.5t124 -201.5q50 89 123.5 166.5t142.5 124.5t130.5 81 t99.5 48l37 13q4 1 13 3.5t13 4.5zM732 855q-120 213 -244 378q-138 -65 -234 -186t-128 -272q302 0 606 80zM1416 536q-210 60 -409 29q87 -239 128 -469q111 75 185 189.5t96 250.5zM611 1277q-1 0 -2 -1q1 1 2 1zM1201 1132q-185 164 -433 164q-76 0 -155 -19 q131 -170 246 -382q69 26 130 60.5t96.5 61.5t65.5 57t37.5 40.5zM1424 647q-3 232 -149 410l-1 -1q-9 -12 -19 -24.5t-43.5 -44.5t-71 -60.5t-100 -65t-131.5 -64.5q25 -53 44 -95q2 -6 6.5 -17.5t7.5 -16.5q36 5 74.5 7t73.5 2t69 -1.5t64 -4t56.5 -5.5t48 -6.5t36.5 -6 t25 -4.5zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+<glyph unicode="" d="M1173 473q0 50 -19.5 91.5t-48.5 68.5t-73 49t-82.5 34t-87.5 23l-104 24q-30 7 -44 10.5t-35 11.5t-30 16t-16.5 21t-7.5 30q0 77 144 77q43 0 77 -12t54 -28.5t38 -33.5t40 -29t48 -12q47 0 75.5 32t28.5 77q0 55 -56 99.5t-142 67.5t-182 23q-68 0 -132 -15.5 t-119.5 -47t-89 -87t-33.5 -128.5q0 -61 19 -106.5t56 -75.5t80 -48.5t103 -32.5l146 -36q90 -22 112 -36q32 -20 32 -60q0 -39 -40 -64.5t-105 -25.5q-51 0 -91.5 16t-65 38.5t-45.5 45t-46 38.5t-54 16q-50 0 -75.5 -30t-25.5 -75q0 -92 122 -157.5t291 -65.5 q73 0 140 18.5t122.5 53.5t88.5 93.5t33 131.5zM1536 256q0 -159 -112.5 -271.5t-271.5 -112.5q-130 0 -234 80q-77 -16 -150 -16q-143 0 -273.5 55.5t-225 150t-150 225t-55.5 273.5q0 73 16 150q-80 104 -80 234q0 159 112.5 271.5t271.5 112.5q130 0 234 -80 q77 16 150 16q143 0 273.5 -55.5t225 -150t150 -225t55.5 -273.5q0 -73 -16 -150q80 -104 80 -234z" />
+<glyph unicode="" horiz-adv-x="1280" d="M1000 1102l37 194q5 23 -9 40t-35 17h-712q-23 0 -38.5 -17t-15.5 -37v-1101q0 -7 6 -1l291 352q23 26 38 33.5t48 7.5h239q22 0 37 14.5t18 29.5q24 130 37 191q4 21 -11.5 40t-36.5 19h-294q-29 0 -48 19t-19 48v42q0 29 19 47.5t48 18.5h346q18 0 35 13.5t20 29.5z M1227 1324q-15 -73 -53.5 -266.5t-69.5 -350t-35 -173.5q-6 -22 -9 -32.5t-14 -32.5t-24.5 -33t-38.5 -21t-58 -10h-271q-13 0 -22 -10q-8 -9 -426 -494q-22 -25 -58.5 -28.5t-48.5 5.5q-55 22 -55 98v1410q0 55 38 102.5t120 47.5h888q95 0 127 -53t10 -159zM1227 1324 l-158 -790q4 17 35 173.5t69.5 350t53.5 266.5z" />
+<glyph unicode="" d="M704 192v1024q0 14 -9 23t-23 9h-480q-14 0 -23 -9t-9 -23v-1024q0 -14 9 -23t23 -9h480q14 0 23 9t9 23zM1376 576v640q0 14 -9 23t-23 9h-480q-14 0 -23 -9t-9 -23v-640q0 -14 9 -23t23 -9h480q14 0 23 9t9 23zM1536 1344v-1408q0 -26 -19 -45t-45 -19h-1408 q-26 0 -45 19t-19 45v1408q0 26 19 45t45 19h1408q26 0 45 -19t19 -45z" />
+<glyph unicode="" horiz-adv-x="1280" d="M1280 480q0 -40 -28 -68t-68 -28q-51 0 -80 43l-227 341h-45v-132l247 -411q9 -15 9 -33q0 -26 -19 -45t-45 -19h-192v-272q0 -46 -33 -79t-79 -33h-160q-46 0 -79 33t-33 79v272h-192q-26 0 -45 19t-19 45q0 18 9 33l247 411v132h-45l-227 -341q-29 -43 -80 -43 q-40 0 -68 28t-28 68q0 29 16 53l256 384q73 107 176 107h384q103 0 176 -107l256 -384q16 -24 16 -53zM864 1280q0 -93 -65.5 -158.5t-158.5 -65.5t-158.5 65.5t-65.5 158.5t65.5 158.5t158.5 65.5t158.5 -65.5t65.5 -158.5z" />
+<glyph unicode="" horiz-adv-x="1024" d="M1024 832v-416q0 -40 -28 -68t-68 -28t-68 28t-28 68v352h-64v-912q0 -46 -33 -79t-79 -33t-79 33t-33 79v464h-64v-464q0 -46 -33 -79t-79 -33t-79 33t-33 79v912h-64v-352q0 -40 -28 -68t-68 -28t-68 28t-28 68v416q0 80 56 136t136 56h640q80 0 136 -56t56 -136z M736 1280q0 -93 -65.5 -158.5t-158.5 -65.5t-158.5 65.5t-65.5 158.5t65.5 158.5t158.5 65.5t158.5 -65.5t65.5 -158.5z" />
+<glyph unicode="" d="M773 234l350 473q16 22 24.5 59t-6 85t-61.5 79q-40 26 -83 25.5t-73.5 -17.5t-54.5 -45q-36 -40 -96 -40q-59 0 -95 40q-24 28 -54.5 45t-73.5 17.5t-84 -25.5q-46 -31 -60.5 -79t-6 -85t24.5 -59zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103 t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+<glyph unicode="" horiz-adv-x="1792" d="M1472 640q0 117 -45.5 223.5t-123 184t-184 123t-223.5 45.5t-223.5 -45.5t-184 -123t-123 -184t-45.5 -223.5t45.5 -223.5t123 -184t184 -123t223.5 -45.5t223.5 45.5t184 123t123 184t45.5 223.5zM1748 363q-4 -15 -20 -20l-292 -96v-306q0 -16 -13 -26q-15 -10 -29 -4 l-292 94l-180 -248q-10 -13 -26 -13t-26 13l-180 248l-292 -94q-14 -6 -29 4q-13 10 -13 26v306l-292 96q-16 5 -20 20q-5 17 4 29l180 248l-180 248q-9 13 -4 29q4 15 20 20l292 96v306q0 16 13 26q15 10 29 4l292 -94l180 248q9 12 26 12t26 -12l180 -248l292 94 q14 6 29 -4q13 -10 13 -26v-306l292 -96q16 -5 20 -20q5 -16 -4 -29l-180 -248l180 -248q9 -12 4 -29z" />
+<glyph unicode="" d="M1262 233q-54 -9 -110 -9q-182 0 -337 90t-245 245t-90 337q0 192 104 357q-201 -60 -328.5 -229t-127.5 -384q0 -130 51 -248.5t136.5 -204t204 -136.5t248.5 -51q144 0 273.5 61.5t220.5 171.5zM1465 318q-94 -203 -283.5 -324.5t-413.5 -121.5q-156 0 -298 61 t-245 164t-164 245t-61 298q0 153 57.5 292.5t156 241.5t235.5 164.5t290 68.5q44 2 61 -39q18 -41 -15 -72q-86 -78 -131.5 -181.5t-45.5 -218.5q0 -148 73 -273t198 -198t273 -73q118 0 228 51q41 18 72 -13q14 -14 17.5 -34t-4.5 -38z" />
+<glyph unicode="" horiz-adv-x="1792" d="M1088 704q0 26 -19 45t-45 19h-256q-26 0 -45 -19t-19 -45t19 -45t45 -19h256q26 0 45 19t19 45zM1664 896v-960q0 -26 -19 -45t-45 -19h-1408q-26 0 -45 19t-19 45v960q0 26 19 45t45 19h1408q26 0 45 -19t19 -45zM1728 1344v-256q0 -26 -19 -45t-45 -19h-1536 q-26 0 -45 19t-19 45v256q0 26 19 45t45 19h1536q26 0 45 -19t19 -45z" />
+<glyph unicode="" horiz-adv-x="1664" d="M1632 576q0 -26 -19 -45t-45 -19h-224q0 -171 -67 -290l208 -209q19 -19 19 -45t-19 -45q-18 -19 -45 -19t-45 19l-198 197q-5 -5 -15 -13t-42 -28.5t-65 -36.5t-82 -29t-97 -13v896h-128v-896q-51 0 -101.5 13.5t-87 33t-66 39t-43.5 32.5l-15 14l-183 -207 q-20 -21 -48 -21q-24 0 -43 16q-19 18 -20.5 44.5t15.5 46.5l202 227q-58 114 -58 274h-224q-26 0 -45 19t-19 45t19 45t45 19h224v294l-173 173q-19 19 -19 45t19 45t45 19t45 -19l173 -173h844l173 173q19 19 45 19t45 -19t19 -45t-19 -45l-173 -173v-294h224q26 0 45 -19 t19 -45zM1152 1152h-640q0 133 93.5 226.5t226.5 93.5t226.5 -93.5t93.5 -226.5z" />
+<glyph unicode="" horiz-adv-x="1920" d="M1917 1016q23 -64 -150 -294q-24 -32 -65 -85q-78 -100 -90 -131q-17 -41 14 -81q17 -21 81 -82h1l1 -1l1 -1l2 -2q141 -131 191 -221q3 -5 6.5 -12.5t7 -26.5t-0.5 -34t-25 -27.5t-59 -12.5l-256 -4q-24 -5 -56 5t-52 22l-20 12q-30 21 -70 64t-68.5 77.5t-61 58 t-56.5 15.5q-3 -1 -8 -3.5t-17 -14.5t-21.5 -29.5t-17 -52t-6.5 -77.5q0 -15 -3.5 -27.5t-7.5 -18.5l-4 -5q-18 -19 -53 -22h-115q-71 -4 -146 16.5t-131.5 53t-103 66t-70.5 57.5l-25 24q-10 10 -27.5 30t-71.5 91t-106 151t-122.5 211t-130.5 272q-6 16 -6 27t3 16l4 6 q15 19 57 19l274 2q12 -2 23 -6.5t16 -8.5l5 -3q16 -11 24 -32q20 -50 46 -103.5t41 -81.5l16 -29q29 -60 56 -104t48.5 -68.5t41.5 -38.5t34 -14t27 5q2 1 5 5t12 22t13.5 47t9.5 81t0 125q-2 40 -9 73t-14 46l-6 12q-25 34 -85 43q-13 2 5 24q17 19 38 30q53 26 239 24 q82 -1 135 -13q20 -5 33.5 -13.5t20.5 -24t10.5 -32t3.5 -45.5t-1 -55t-2.5 -70.5t-1.5 -82.5q0 -11 -1 -42t-0.5 -48t3.5 -40.5t11.5 -39t22.5 -24.5q8 -2 17 -4t26 11t38 34.5t52 67t68 107.5q60 104 107 225q4 10 10 17.5t11 10.5l4 3l5 2.5t13 3t20 0.5l288 2 q39 5 64 -2.5t31 -16.5z" />
+<glyph unicode="" horiz-adv-x="1792" d="M675 252q21 34 11 69t-45 50q-34 14 -73 1t-60 -46q-22 -34 -13 -68.5t43 -50.5t74.5 -2.5t62.5 47.5zM769 373q8 13 3.5 26.5t-17.5 18.5q-14 5 -28.5 -0.5t-21.5 -18.5q-17 -31 13 -45q14 -5 29 0.5t22 18.5zM943 266q-45 -102 -158 -150t-224 -12 q-107 34 -147.5 126.5t6.5 187.5q47 93 151.5 139t210.5 19q111 -29 158.5 -119.5t2.5 -190.5zM1255 426q-9 96 -89 170t-208.5 109t-274.5 21q-223 -23 -369.5 -141.5t-132.5 -264.5q9 -96 89 -170t208.5 -109t274.5 -21q223 23 369.5 141.5t132.5 264.5zM1563 422 q0 -68 -37 -139.5t-109 -137t-168.5 -117.5t-226 -83t-270.5 -31t-275 33.5t-240.5 93t-171.5 151t-65 199.5q0 115 69.5 245t197.5 258q169 169 341.5 236t246.5 -7q65 -64 20 -209q-4 -14 -1 -20t10 -7t14.5 0.5t13.5 3.5l6 2q139 59 246 59t153 -61q45 -63 0 -178 q-2 -13 -4.5 -20t4.5 -12.5t12 -7.5t17 -6q57 -18 103 -47t80 -81.5t34 -116.5zM1489 1046q42 -47 54.5 -108.5t-6.5 -117.5q-8 -23 -29.5 -34t-44.5 -4q-23 8 -34 29.5t-4 44.5q20 63 -24 111t-107 35q-24 -5 -45 8t-25 37q-5 24 8 44.5t37 25.5q60 13 119 -5.5t101 -65.5z M1670 1209q87 -96 112.5 -222.5t-13.5 -241.5q-9 -27 -34 -40t-52 -4t-40 34t-5 52q28 82 10 172t-80 158q-62 69 -148 95.5t-173 8.5q-28 -6 -52 9.5t-30 43.5t9.5 51.5t43.5 29.5q123 26 244 -11.5t208 -134.5z" />
+<glyph unicode="" d="M1133 -34q-171 -94 -368 -94q-196 0 -367 94q138 87 235.5 211t131.5 268q35 -144 132.5 -268t235.5 -211zM638 1394v-485q0 -252 -126.5 -459.5t-330.5 -306.5q-181 215 -181 495q0 187 83.5 349.5t229.5 269.5t325 137zM1536 638q0 -280 -181 -495 q-204 99 -330.5 306.5t-126.5 459.5v485q179 -30 325 -137t229.5 -269.5t83.5 -349.5z" />
+<glyph unicode="" horiz-adv-x="1408" d="M1402 433q-32 -80 -76 -138t-91 -88.5t-99 -46.5t-101.5 -14.5t-96.5 8.5t-86.5 22t-69.5 27.5t-46 22.5l-17 10q-113 -228 -289.5 -359.5t-384.5 -132.5q-19 0 -32 13t-13 32t13 31.5t32 12.5q173 1 322.5 107.5t251.5 294.5q-36 -14 -72 -23t-83 -13t-91 2.5t-93 28.5 t-92 59t-84.5 100t-74.5 146q114 47 214 57t167.5 -7.5t124.5 -56.5t88.5 -77t56.5 -82q53 131 79 291q-7 -1 -18 -2.5t-46.5 -2.5t-69.5 0.5t-81.5 10t-88.5 23t-84 42.5t-75 65t-54.5 94.5t-28.5 127.5q70 28 133.5 36.5t112.5 -1t92 -30t73.5 -50t56 -61t42 -63t27.5 -56 t16 -39.5l4 -16q12 122 12 195q-8 6 -21.5 16t-49 44.5t-63.5 71.5t-54 93t-33 112.5t12 127t70 138.5q73 -25 127.5 -61.5t84.5 -76.5t48 -85t20.5 -89t-0.5 -85.5t-13 -76.5t-19 -62t-17 -42l-7 -15q1 -5 1 -50.5t-1 -71.5q3 7 10 18.5t30.5 43t50.5 58t71 55.5t91.5 44.5 t112 14.5t132.5 -24q-2 -78 -21.5 -141.5t-50 -104.5t-69.5 -71.5t-81.5 -45.5t-84.5 -24t-80 -9.5t-67.5 1t-46.5 4.5l-17 3q-23 -147 -73 -283q6 7 18 18.5t49.5 41t77.5 52.5t99.5 42t117.5 20t129 -23.5t137 -77.5z" />
+<glyph unicode="" horiz-adv-x="1280" d="M1259 283v-66q0 -85 -57.5 -144.5t-138.5 -59.5h-57l-260 -269v269h-529q-81 0 -138.5 59.5t-57.5 144.5v66h1238zM1259 609v-255h-1238v255h1238zM1259 937v-255h-1238v255h1238zM1259 1077v-67h-1238v67q0 84 57.5 143.5t138.5 59.5h846q81 0 138.5 -59.5t57.5 -143.5z " />
+<glyph unicode="" d="M1152 640q0 -14 -9 -23l-320 -320q-9 -9 -23 -9q-13 0 -22.5 9.5t-9.5 22.5v192h-352q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h352v192q0 14 9 23t23 9q12 0 24 -10l319 -319q9 -9 9 -23zM1312 640q0 148 -73 273t-198 198t-273 73t-273 -73t-198 -198 t-73 -273t73 -273t198 -198t273 -73t273 73t198 198t73 273zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+<glyph unicode="" d="M1152 736v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-352v-192q0 -14 -9 -23t-23 -9q-12 0 -24 10l-319 319q-9 9 -9 23t9 23l320 320q9 9 23 9q13 0 22.5 -9.5t9.5 -22.5v-192h352q13 0 22.5 -9.5t9.5 -22.5zM1312 640q0 148 -73 273t-198 198t-273 73t-273 -73t-198 -198 t-73 -273t73 -273t198 -198t273 -73t273 73t198 198t73 273zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+<glyph unicode="" d="M1024 960v-640q0 -26 -19 -45t-45 -19q-20 0 -37 12l-448 320q-27 19 -27 52t27 52l448 320q17 12 37 12q26 0 45 -19t19 -45zM1280 160v960q0 13 -9.5 22.5t-22.5 9.5h-960q-13 0 -22.5 -9.5t-9.5 -22.5v-960q0 -13 9.5 -22.5t22.5 -9.5h960q13 0 22.5 9.5t9.5 22.5z M1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
+<glyph unicode="" d="M1024 640q0 -106 -75 -181t-181 -75t-181 75t-75 181t75 181t181 75t181 -75t75 -181zM768 1184q-148 0 -273 -73t-198 -198t-73 -273t73 -273t198 -198t273 -73t273 73t198 198t73 273t-73 273t-198 198t-273 73zM1536 640q0 -209 -103 -385.5t-279.5 -279.5 t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+<glyph unicode="" horiz-adv-x="1664" d="M1023 349l102 -204q-58 -179 -210 -290t-339 -111q-156 0 -288.5 77.5t-210 210t-77.5 288.5q0 181 104.5 330t274.5 211l17 -131q-122 -54 -195 -165.5t-73 -244.5q0 -185 131.5 -316.5t316.5 -131.5q126 0 232.5 65t165 175.5t49.5 236.5zM1571 249l58 -114l-256 -128 q-13 -7 -29 -7q-40 0 -57 35l-239 477h-472q-24 0 -42.5 16.5t-21.5 40.5l-96 779q-2 16 6 42q14 51 57 82.5t97 31.5q66 0 113 -47t47 -113q0 -69 -52 -117.5t-120 -41.5l37 -289h423v-128h-407l16 -128h455q40 0 57 -35l228 -455z" />
+<glyph unicode="" d="M1292 898q10 216 -161 222q-231 8 -312 -261q44 19 82 19q85 0 74 -96q-4 -57 -74 -167t-105 -110q-43 0 -82 169q-13 54 -45 255q-30 189 -160 177q-59 -7 -164 -100l-81 -72l-81 -72l52 -67q76 52 87 52q57 0 107 -179q15 -55 45 -164.5t45 -164.5q68 -179 164 -179 q157 0 383 294q220 283 226 444zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
+<glyph unicode="" horiz-adv-x="1152" d="M1152 704q0 -191 -94.5 -353t-256.5 -256.5t-353 -94.5h-160q-14 0 -23 9t-9 23v611l-215 -66q-3 -1 -9 -1q-10 0 -19 6q-13 10 -13 26v128q0 23 23 31l233 71v93l-215 -66q-3 -1 -9 -1q-10 0 -19 6q-13 10 -13 26v128q0 23 23 31l233 71v250q0 14 9 23t23 9h160 q14 0 23 -9t9 -23v-181l375 116q15 5 28 -5t13 -26v-128q0 -23 -23 -31l-393 -121v-93l375 116q15 5 28 -5t13 -26v-128q0 -23 -23 -31l-393 -121v-487q188 13 318 151t130 328q0 14 9 23t23 9h160q14 0 23 -9t9 -23z" />
+<glyph unicode="" horiz-adv-x="1408" d="M1152 736v-64q0 -14 -9 -23t-23 -9h-352v-352q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v352h-352q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h352v352q0 14 9 23t23 9h64q14 0 23 -9t9 -23v-352h352q14 0 23 -9t9 -23zM1280 288v832q0 66 -47 113t-113 47h-832 q-66 0 -113 -47t-47 -113v-832q0 -66 47 -113t113 -47h832q66 0 113 47t47 113zM1408 1120v-832q0 -119 -84.5 -203.5t-203.5 -84.5h-832q-119 0 -203.5 84.5t-84.5 203.5v832q0 119 84.5 203.5t203.5 84.5h832q119 0 203.5 -84.5t84.5 -203.5z" />
+<glyph unicode="" horiz-adv-x="2176" d="M620 416q-110 -64 -268 -64h-128v64h-64q-13 0 -22.5 23.5t-9.5 56.5q0 24 7 49q-58 2 -96.5 10.5t-38.5 20.5t38.5 20.5t96.5 10.5q-7 25 -7 49q0 33 9.5 56.5t22.5 23.5h64v64h128q158 0 268 -64h1113q42 -7 106.5 -18t80.5 -14q89 -15 150 -40.5t83.5 -47.5t22.5 -40 t-22.5 -40t-83.5 -47.5t-150 -40.5q-16 -3 -80.5 -14t-106.5 -18h-1113zM1739 668q53 -36 53 -92t-53 -92l81 -30q68 48 68 122t-68 122zM625 400h1015q-217 -38 -456 -80q-57 0 -113 -24t-83 -48l-28 -24l-288 -288q-26 -26 -70.5 -45t-89.5 -19h-96l-93 464h29 q157 0 273 64zM352 816h-29l93 464h96q46 0 90 -19t70 -45l288 -288q4 -4 11 -10.5t30.5 -23t48.5 -29t61.5 -23t72.5 -10.5l456 -80h-1015q-116 64 -273 64z" />
+<glyph unicode="" horiz-adv-x="1664" d="M1519 760q62 0 103.5 -40.5t41.5 -101.5q0 -97 -93 -130l-172 -59l56 -167q7 -21 7 -47q0 -59 -42 -102t-101 -43q-47 0 -85.5 27t-53.5 72l-55 165l-310 -106l55 -164q8 -24 8 -47q0 -59 -42 -102t-102 -43q-47 0 -85 27t-53 72l-55 163l-153 -53q-29 -9 -50 -9 q-61 0 -101.5 40t-40.5 101q0 47 27.5 85t71.5 53l156 53l-105 313l-156 -54q-26 -8 -48 -8q-60 0 -101 40.5t-41 100.5q0 47 27.5 85t71.5 53l157 53l-53 159q-8 24 -8 47q0 60 42 102.5t102 42.5q47 0 85 -27t53 -72l54 -160l310 105l-54 160q-8 24 -8 47q0 59 42.5 102 t101.5 43q47 0 85.5 -27.5t53.5 -71.5l53 -161l162 55q21 6 43 6q60 0 102.5 -39.5t42.5 -98.5q0 -45 -30 -81.5t-74 -51.5l-157 -54l105 -316l164 56q24 8 46 8zM725 498l310 105l-105 315l-310 -107z" />
+<glyph unicode="" d="M1248 1408q119 0 203.5 -84.5t84.5 -203.5v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960zM1280 352v436q-31 -35 -64 -55q-34 -22 -132.5 -85t-151.5 -99q-98 -69 -164 -69v0v0q-66 0 -164 69 q-46 32 -141.5 92.5t-142.5 92.5q-12 8 -33 27t-31 27v-436q0 -40 28 -68t68 -28h832q40 0 68 28t28 68zM1280 925q0 41 -27.5 70t-68.5 29h-832q-40 0 -68 -28t-28 -68q0 -37 30.5 -76.5t67.5 -64.5q47 -32 137.5 -89t129.5 -83q3 -2 17 -11.5t21 -14t21 -13t23.5 -13 t21.5 -9.5t22.5 -7.5t20.5 -2.5t20.5 2.5t22.5 7.5t21.5 9.5t23.5 13t21 13t21 14t17 11.5l267 174q35 23 66.5 62.5t31.5 73.5z" />
+<glyph unicode="" horiz-adv-x="1792" d="M127 640q0 163 67 313l367 -1005q-196 95 -315 281t-119 411zM1415 679q0 -19 -2.5 -38.5t-10 -49.5t-11.5 -44t-17.5 -59t-17.5 -58l-76 -256l-278 826q46 3 88 8q19 2 26 18.5t-2.5 31t-28.5 13.5l-205 -10q-75 1 -202 10q-12 1 -20.5 -5t-11.5 -15t-1.5 -18.5t9 -16.5 t19.5 -8l80 -8l120 -328l-168 -504l-280 832q46 3 88 8q19 2 26 18.5t-2.5 31t-28.5 13.5l-205 -10q-7 0 -23 0.5t-26 0.5q105 160 274.5 253.5t367.5 93.5q147 0 280.5 -53t238.5 -149h-10q-55 0 -92 -40.5t-37 -95.5q0 -12 2 -24t4 -21.5t8 -23t9 -21t12 -22.5t12.5 -21 t14.5 -24t14 -23q63 -107 63 -212zM909 573l237 -647q1 -6 5 -11q-126 -44 -255 -44q-112 0 -217 32zM1570 1009q95 -174 95 -369q0 -209 -104 -385.5t-279 -278.5l235 678q59 169 59 276q0 42 -6 79zM896 1536q182 0 348 -71t286 -191t191 -286t71 -348t-71 -348t-191 -286 t-286 -191t-348 -71t-348 71t-286 191t-191 286t-71 348t71 348t191 286t286 191t348 71zM896 -215q173 0 331.5 68t273 182.5t182.5 273t68 331.5t-68 331.5t-182.5 273t-273 182.5t-331.5 68t-331.5 -68t-273 -182.5t-182.5 -273t-68 -331.5t68 -331.5t182.5 -273 t273 -182.5t331.5 -68z" />
+<glyph unicode="" horiz-adv-x="1792" d="M1086 1536v-1536l-272 -128q-228 20 -414 102t-293 208.5t-107 272.5q0 140 100.5 263.5t275 205.5t391.5 108v-172q-217 -38 -356.5 -150t-139.5 -255q0 -152 154.5 -267t388.5 -145v1360zM1755 954l37 -390l-525 114l147 83q-119 70 -280 99v172q277 -33 481 -157z" />
+<glyph unicode="" horiz-adv-x="2048" d="M960 1536l960 -384v-128h-128q0 -26 -20.5 -45t-48.5 -19h-1526q-28 0 -48.5 19t-20.5 45h-128v128zM256 896h256v-768h128v768h256v-768h128v768h256v-768h128v768h256v-768h59q28 0 48.5 -19t20.5 -45v-64h-1664v64q0 26 20.5 45t48.5 19h59v768zM1851 -64 q28 0 48.5 -19t20.5 -45v-128h-1920v128q0 26 20.5 45t48.5 19h1782z" />
+<glyph unicode="" horiz-adv-x="2304" d="M1774 700l18 -316q4 -69 -82 -128t-235 -93.5t-323 -34.5t-323 34.5t-235 93.5t-82 128l18 316l574 -181q22 -7 48 -7t48 7zM2304 1024q0 -23 -22 -31l-1120 -352q-4 -1 -10 -1t-10 1l-652 206q-43 -34 -71 -111.5t-34 -178.5q63 -36 63 -109q0 -69 -58 -107l58 -433 q2 -14 -8 -25q-9 -11 -24 -11h-192q-15 0 -24 11q-10 11 -8 25l58 433q-58 38 -58 107q0 73 65 111q11 207 98 330l-333 104q-22 8 -22 31t22 31l1120 352q4 1 10 1t10 -1l1120 -352q22 -8 22 -31z" />
+<glyph unicode="" d="M859 579l13 -707q-62 11 -105 11q-41 0 -105 -11l13 707q-40 69 -168.5 295.5t-216.5 374.5t-181 287q58 -15 108 -15q43 0 111 15q63 -111 133.5 -229.5t167 -276.5t138.5 -227q37 61 109.5 177.5t117.5 190t105 176t107 189.5q54 -14 107 -14q56 0 114 14v0 q-28 -39 -60 -88.5t-49.5 -78.5t-56.5 -96t-49 -84q-146 -248 -353 -610z" />
+<glyph unicode="" horiz-adv-x="1280" d="M981 197q0 25 -7 49t-14.5 42t-27 41.5t-29.5 35t-38.5 34.5t-36.5 29t-41.5 30t-36.5 26q-16 2 -49 2q-53 0 -104.5 -7t-107 -25t-97 -46t-68.5 -74.5t-27 -105.5q0 -56 23.5 -102t61 -75.5t87 -50t100 -29t101.5 -8.5q58 0 111.5 13t99 39t73 73t27.5 109zM864 1055 q0 59 -17 125.5t-48 129t-84 103.5t-117 41q-42 0 -82.5 -19.5t-66.5 -52.5q-46 -59 -46 -160q0 -46 10 -97.5t31.5 -103t52 -92.5t75 -67t96.5 -26q37 0 77.5 16.5t65.5 43.5q53 56 53 159zM752 1536h417l-137 -88h-132q75 -63 113 -133t38 -160q0 -72 -24.5 -129.5 t-59.5 -93t-69.5 -65t-59 -61.5t-24.5 -66q0 -36 32 -70.5t77 -68t90.5 -73.5t77.5 -104t32 -142q0 -91 -49 -173q-71 -122 -209.5 -179.5t-298.5 -57.5q-132 0 -246.5 41.5t-172.5 137.5q-36 59 -36 131q0 81 44.5 150t118.5 115q131 82 404 100q-32 41 -47.5 73.5 t-15.5 73.5q0 40 21 85q-46 -4 -68 -4q-148 0 -249.5 96.5t-101.5 244.5q0 82 36 159t99 131q76 66 182 98t218 32z" />
+<glyph unicode="" horiz-adv-x="1792" d="M1095 369q16 -16 0 -31q-62 -62 -199 -62t-199 62q-16 15 0 31q6 6 15 6t15 -6q48 -49 169 -49q120 0 169 49q6 6 15 6t15 -6zM788 550q0 -37 -26 -63t-63 -26t-63.5 26t-26.5 63q0 38 26.5 64t63.5 26t63 -26.5t26 -63.5zM1183 550q0 -37 -26.5 -63t-63.5 -26t-63 26 t-26 63t26 63.5t63 26.5t63.5 -26t26.5 -64zM1434 670q0 49 -35 84t-85 35t-86 -36q-130 90 -311 96l63 283l200 -45q0 -37 26 -63t63 -26t63.5 26.5t26.5 63.5t-26.5 63.5t-63.5 26.5q-54 0 -80 -50l-221 49q-19 5 -25 -16l-69 -312q-180 -7 -309 -97q-35 37 -87 37 q-50 0 -85 -35t-35 -84q0 -35 18.5 -64t49.5 -44q-6 -27 -6 -56q0 -142 140 -243t337 -101q198 0 338 101t140 243q0 32 -7 57q30 15 48 43.5t18 63.5zM1792 640q0 -182 -71 -348t-191 -286t-286 -191t-348 -71t-348 71t-286 191t-191 286t-71 348t71 348t191 286t286 191 t348 71t348 -71t286 -191t191 -286t71 -348z" />
+<glyph unicode="" d="M939 407q13 -13 0 -26q-53 -53 -171 -53t-171 53q-13 13 0 26q5 6 13 6t13 -6q42 -42 145 -42t145 42q5 6 13 6t13 -6zM676 563q0 -31 -23 -54t-54 -23t-54 23t-23 54q0 32 22.5 54.5t54.5 22.5t54.5 -22.5t22.5 -54.5zM1014 563q0 -31 -23 -54t-54 -23t-54 23t-23 54 q0 32 22.5 54.5t54.5 22.5t54.5 -22.5t22.5 -54.5zM1229 666q0 42 -30 72t-73 30q-42 0 -73 -31q-113 78 -267 82l54 243l171 -39q1 -32 23.5 -54t53.5 -22q32 0 54.5 22.5t22.5 54.5t-22.5 54.5t-54.5 22.5q-48 0 -69 -43l-189 42q-17 5 -21 -13l-60 -268q-154 -6 -265 -83 q-30 32 -74 32q-43 0 -73 -30t-30 -72q0 -30 16 -55t42 -38q-5 -25 -5 -48q0 -122 120 -208.5t289 -86.5q170 0 290 86.5t120 208.5q0 25 -6 49q25 13 40.5 37.5t15.5 54.5zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960 q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
+<glyph unicode="" d="M866 697l90 27v62q0 79 -58 135t-138 56t-138 -55.5t-58 -134.5v-283q0 -20 -14 -33.5t-33 -13.5t-32.5 13.5t-13.5 33.5v120h-151v-122q0 -82 57.5 -139t139.5 -57q81 0 138.5 56.5t57.5 136.5v280q0 19 13.5 33t33.5 14q19 0 32.5 -14t13.5 -33v-54zM1199 502v122h-150 v-126q0 -20 -13.5 -33.5t-33.5 -13.5q-19 0 -32.5 14t-13.5 33v123l-90 -26l-60 28v-123q0 -80 58 -137t139 -57t138.5 57t57.5 139zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103 t385.5 -103t279.5 -279.5t103 -385.5z" />
+<glyph unicode="" horiz-adv-x="1920" d="M1062 824v118q0 42 -30 72t-72 30t-72 -30t-30 -72v-612q0 -175 -126 -299t-303 -124q-178 0 -303.5 125.5t-125.5 303.5v266h328v-262q0 -43 30 -72.5t72 -29.5t72 29.5t30 72.5v620q0 171 126.5 292t301.5 121q176 0 302 -122t126 -294v-136l-195 -58zM1592 602h328 v-266q0 -178 -125.5 -303.5t-303.5 -125.5q-177 0 -303 124.5t-126 300.5v268l131 -61l195 58v-270q0 -42 30 -71.5t72 -29.5t72 29.5t30 71.5v275z" />
+<glyph unicode="" d="M1472 160v480h-704v704h-480q-93 0 -158.5 -65.5t-65.5 -158.5v-480h704v-704h480q93 0 158.5 65.5t65.5 158.5zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5 t84.5 -203.5z" />
+<glyph unicode="" horiz-adv-x="2048" d="M328 1254h204v-983h-532v697h328v286zM328 435v369h-123v-369h123zM614 968v-697h205v697h-205zM614 1254v-204h205v204h-205zM901 968h533v-942h-533v163h328v82h-328v697zM1229 435v369h-123v-369h123zM1516 968h532v-942h-532v163h327v82h-327v697zM1843 435v369h-123 v-369h123z" />
+<glyph unicode="" d="M1046 516q0 -64 -38 -109t-91 -45q-43 0 -70 15v277q28 17 70 17q53 0 91 -45.5t38 -109.5zM703 944q0 -64 -38 -109.5t-91 -45.5q-43 0 -70 15v277q28 17 70 17q53 0 91 -45t38 -109zM1265 513q0 134 -88 229t-213 95q-20 0 -39 -3q-23 -78 -78 -136q-87 -95 -211 -101 v-636l211 41v206q51 -19 117 -19q125 0 213 95t88 229zM922 940q0 134 -88.5 229t-213.5 95q-74 0 -141 -36h-186v-840l211 41v206q55 -19 116 -19q125 0 213.5 95t88.5 229zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960 q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
+<glyph unicode="" horiz-adv-x="2038" d="M1222 607q75 3 143.5 -20.5t118 -58.5t101 -94.5t84 -108t75.5 -120.5q33 -56 78.5 -109t75.5 -80.5t99 -88.5q-48 -30 -108.5 -57.5t-138.5 -59t-114 -47.5q-44 37 -74 115t-43.5 164.5t-33 180.5t-42.5 168.5t-72.5 123t-122.5 48.5l-10 -2l-6 -4q4 -5 13 -14 q6 -5 28 -23.5t25.5 -22t19 -18t18 -20.5t11.5 -21t10.5 -27.5t4.5 -31t4 -40.5l1 -33q1 -26 -2.5 -57.5t-7.5 -52t-12.5 -58.5t-11.5 -53q-35 1 -101 -9.5t-98 -10.5q-39 0 -72 10q-2 16 -2 47q0 74 3 96q2 13 31.5 41.5t57 59t26.5 51.5q-24 2 -43 -24 q-36 -53 -111.5 -99.5t-136.5 -46.5q-25 0 -75.5 63t-106.5 139.5t-84 96.5q-6 4 -27 30q-482 -112 -513 -112q-16 0 -28 11t-12 27q0 15 8.5 26.5t22.5 14.5l486 106q-8 14 -8 25t5.5 17.5t16 11.5t20 7t23 4.5t18.5 4.5q4 1 15.5 7.5t17.5 6.5q15 0 28 -16t20 -33 q163 37 172 37q17 0 29.5 -11t12.5 -28q0 -15 -8.5 -26t-23.5 -14l-182 -40l-1 -16q-1 -26 81.5 -117.5t104.5 -91.5q47 0 119 80t72 129q0 36 -23.5 53t-51 18.5t-51 11.5t-23.5 34q0 16 10 34l-68 19q43 44 43 117q0 26 -5 58q82 16 144 16q44 0 71.5 -1.5t48.5 -8.5 t31 -13.5t20.5 -24.5t15.5 -33.5t17 -47.5t24 -60l50 25q-3 -40 -23 -60t-42.5 -21t-40 -6.5t-16.5 -20.5zM1282 842q-5 5 -13.5 15.5t-12 14.5t-10.5 11.5t-10 10.5l-8 8t-8.5 7.5t-8 5t-8.5 4.5q-7 3 -14.5 5t-20.5 2.5t-22 0.5h-32.5h-37.5q-126 0 -217 -43 q16 30 36 46.5t54 29.5t65.5 36t46 36.5t50 55t43.5 50.5q12 -9 28 -31.5t32 -36.5t38 -13l12 1v-76l22 -1q247 95 371 190q28 21 50 39t42.5 37.5t33 31t29.5 34t24 31t24.5 37t23 38t27 47.5t29.5 53l7 9q-2 -53 -43 -139q-79 -165 -205 -264t-306 -142q-14 -3 -42 -7.5 t-50 -9.5t-39 -14q3 -19 24.5 -46t21.5 -34q0 -11 -26 -30zM1061 -79q39 26 131.5 47.5t146.5 21.5q9 0 22.5 -15.5t28 -42.5t26 -50t24 -51t14.5 -33q-121 -45 -244 -45q-61 0 -125 11zM822 568l48 12l109 -177l-73 -48zM1323 51q3 -15 3 -16q0 -7 -17.5 -14.5t-46 -13 t-54 -9.5t-53.5 -7.5t-32 -4.5l-7 43q21 2 60.5 8.5t72 10t60.5 3.5h14zM866 679l-96 -20l-6 17q10 1 32.5 7t34.5 6q19 0 35 -10zM1061 45h31l10 -83l-41 -12v95zM1950 1535v1v-1zM1950 1535l-1 -5l-2 -2l1 3zM1950 1535l1 1z" />
+<glyph unicode="" d="M1167 -50q-5 19 -24 5q-30 -22 -87 -39t-131 -17q-129 0 -193 49q-5 4 -13 4q-11 0 -26 -12q-7 -6 -7.5 -16t7.5 -20q34 -32 87.5 -46t102.5 -12.5t99 4.5q41 4 84.5 20.5t65 30t28.5 20.5q12 12 7 29zM1128 65q-19 47 -39 61q-23 15 -76 15q-47 0 -71 -10 q-29 -12 -78 -56q-26 -24 -12 -44q9 -8 17.5 -4.5t31.5 23.5q3 2 10.5 8.5t10.5 8.5t10 7t11.5 7t12.5 5t15 4.5t16.5 2.5t20.5 1q27 0 44.5 -7.5t23 -14.5t13.5 -22q10 -17 12.5 -20t12.5 1q23 12 14 34zM1483 346q0 22 -5 44.5t-16.5 45t-34 36.5t-52.5 14 q-33 0 -97 -41.5t-129 -83.5t-101 -42q-27 -1 -63.5 19t-76 49t-83.5 58t-100 49t-111 19q-115 -1 -197 -78.5t-84 -178.5q-2 -112 74 -164q29 -20 62.5 -28.5t103.5 -8.5q57 0 132 32.5t134 71t120 70.5t93 31q26 -1 65 -31.5t71.5 -67t68 -67.5t55.5 -32q35 -3 58.5 14 t55.5 63q28 41 42.5 101t14.5 106zM1536 506q0 -164 -62 -304.5t-166 -236t-242.5 -149.5t-290.5 -54t-293 57.5t-247.5 157t-170.5 241.5t-64 302q0 89 19.5 172.5t49 145.5t70.5 118.5t78.5 94t78.5 69.5t64.5 46.5t42.5 24.5q14 8 51 26.5t54.5 28.5t48 30t60.5 44 q36 28 58 72.5t30 125.5q129 -155 186 -193q44 -29 130 -68t129 -66q21 -13 39 -25t60.5 -46.5t76 -70.5t75 -95t69 -122t47 -148.5t19.5 -177.5z" />
+<glyph unicode="" d="M1070 463l-160 -160l-151 -152l-30 -30q-65 -64 -151.5 -87t-171.5 -2q-16 -70 -72 -115t-129 -45q-85 0 -145 60.5t-60 145.5q0 72 44.5 128t113.5 72q-22 86 1 173t88 152l12 12l151 -152l-11 -11q-37 -37 -37 -89t37 -90q37 -37 89 -37t89 37l30 30l151 152l161 160z M729 1145l12 -12l-152 -152l-12 12q-37 37 -89 37t-89 -37t-37 -89.5t37 -89.5l29 -29l152 -152l160 -160l-151 -152l-161 160l-151 152l-30 30q-68 67 -90 159.5t5 179.5q-70 15 -115 71t-45 129q0 85 60 145.5t145 60.5q76 0 133.5 -49t69.5 -123q84 20 169.5 -3.5 t149.5 -87.5zM1536 78q0 -85 -60 -145.5t-145 -60.5q-74 0 -131 47t-71 118q-86 -28 -179.5 -6t-161.5 90l-11 12l151 152l12 -12q37 -37 89 -37t89 37t37 89t-37 89l-30 30l-152 152l-160 160l152 152l160 -160l152 -152l29 -30q64 -64 87.5 -150.5t2.5 -171.5 q76 -11 126.5 -68.5t50.5 -134.5zM1534 1202q0 -77 -51 -135t-127 -69q26 -85 3 -176.5t-90 -158.5l-12 -12l-151 152l12 12q37 37 37 89t-37 89t-89 37t-89 -37l-30 -30l-152 -152l-160 -160l-152 152l161 160l152 152l29 30q67 67 159 89.5t178 -3.5q11 75 68.5 126 t135.5 51q85 0 145 -60.5t60 -145.5z" />
+<glyph unicode="" d="M654 458q-1 -3 -12.5 0.5t-31.5 11.5l-20 9q-44 20 -87 49q-7 5 -41 31.5t-38 28.5q-67 -103 -134 -181q-81 -95 -105 -110q-4 -2 -19.5 -4t-18.5 0q6 4 82 92q21 24 85.5 115t78.5 118q17 30 51 98.5t36 77.5q-8 1 -110 -33q-8 -2 -27.5 -7.5t-34.5 -9.5t-17 -5 q-2 -2 -2 -10.5t-1 -9.5q-5 -10 -31 -15q-23 -7 -47 0q-18 4 -28 21q-4 6 -5 23q6 2 24.5 5t29.5 6q58 16 105 32q100 35 102 35q10 2 43 19.5t44 21.5q9 3 21.5 8t14.5 5.5t6 -0.5q2 -12 -1 -33q0 -2 -12.5 -27t-26.5 -53.5t-17 -33.5q-25 -50 -77 -131l64 -28 q12 -6 74.5 -32t67.5 -28q4 -1 10.5 -25.5t4.5 -30.5zM449 944q3 -15 -4 -28q-12 -23 -50 -38q-30 -12 -60 -12q-26 3 -49 26q-14 15 -18 41l1 3q3 -3 19.5 -5t26.5 0t58 16q36 12 55 14q17 0 21 -17zM1147 815l63 -227l-139 42zM39 15l694 232v1032l-694 -233v-1031z M1280 332l102 -31l-181 657l-100 31l-216 -536l102 -31l45 110l211 -65zM777 1294l573 -184v380zM1088 -29l158 -13l-54 -160l-40 66q-130 -83 -276 -108q-58 -12 -91 -12h-84q-79 0 -199.5 39t-183.5 85q-8 7 -8 16q0 8 5 13.5t13 5.5q4 0 18 -7.5t30.5 -16.5t20.5 -11 q73 -37 159.5 -61.5t157.5 -24.5q95 0 167 14.5t157 50.5q15 7 30.5 15.5t34 19t28.5 16.5zM1536 1050v-1079l-774 246q-14 -6 -375 -127.5t-368 -121.5q-13 0 -18 13q0 1 -1 3v1078q3 9 4 10q5 6 20 11q106 35 149 50v384l558 -198q2 0 160.5 55t316 108.5t161.5 53.5 q20 0 20 -21v-418z" />
+<glyph unicode="" horiz-adv-x="1792" d="M288 1152q66 0 113 -47t47 -113v-1088q0 -66 -47 -113t-113 -47h-128q-66 0 -113 47t-47 113v1088q0 66 47 113t113 47h128zM1664 989q58 -34 93 -93t35 -128v-768q0 -106 -75 -181t-181 -75h-864q-66 0 -113 47t-47 113v1536q0 40 28 68t68 28h672q40 0 88 -20t76 -48 l152 -152q28 -28 48 -76t20 -88v-163zM928 0v128q0 14 -9 23t-23 9h-128q-14 0 -23 -9t-9 -23v-128q0 -14 9 -23t23 -9h128q14 0 23 9t9 23zM928 256v128q0 14 -9 23t-23 9h-128q-14 0 -23 -9t-9 -23v-128q0 -14 9 -23t23 -9h128q14 0 23 9t9 23zM928 512v128q0 14 -9 23 t-23 9h-128q-14 0 -23 -9t-9 -23v-128q0 -14 9 -23t23 -9h128q14 0 23 9t9 23zM1184 0v128q0 14 -9 23t-23 9h-128q-14 0 -23 -9t-9 -23v-128q0 -14 9 -23t23 -9h128q14 0 23 9t9 23zM1184 256v128q0 14 -9 23t-23 9h-128q-14 0 -23 -9t-9 -23v-128q0 -14 9 -23t23 -9h128 q14 0 23 9t9 23zM1184 512v128q0 14 -9 23t-23 9h-128q-14 0 -23 -9t-9 -23v-128q0 -14 9 -23t23 -9h128q14 0 23 9t9 23zM1440 0v128q0 14 -9 23t-23 9h-128q-14 0 -23 -9t-9 -23v-128q0 -14 9 -23t23 -9h128q14 0 23 9t9 23zM1440 256v128q0 14 -9 23t-23 9h-128 q-14 0 -23 -9t-9 -23v-128q0 -14 9 -23t23 -9h128q14 0 23 9t9 23zM1440 512v128q0 14 -9 23t-23 9h-128q-14 0 -23 -9t-9 -23v-128q0 -14 9 -23t23 -9h128q14 0 23 9t9 23zM1536 896v256h-160q-40 0 -68 28t-28 68v160h-640v-512h896z" />
+<glyph unicode="" d="M1344 1536q26 0 45 -19t19 -45v-1664q0 -26 -19 -45t-45 -19h-1280q-26 0 -45 19t-19 45v1664q0 26 19 45t45 19h1280zM512 1248v-64q0 -14 9 -23t23 -9h64q14 0 23 9t9 23v64q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23zM512 992v-64q0 -14 9 -23t23 -9h64q14 0 23 9 t9 23v64q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23zM512 736v-64q0 -14 9 -23t23 -9h64q14 0 23 9t9 23v64q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23zM512 480v-64q0 -14 9 -23t23 -9h64q14 0 23 9t9 23v64q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23zM384 160v64 q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM384 416v64q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM384 672v64q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h64 q14 0 23 9t9 23zM384 928v64q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM384 1184v64q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM896 -96v192q0 14 -9 23t-23 9h-320q-14 0 -23 -9 t-9 -23v-192q0 -14 9 -23t23 -9h320q14 0 23 9t9 23zM896 416v64q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM896 672v64q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM896 928v64 q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM896 1184v64q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM1152 160v64q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h64 q14 0 23 9t9 23zM1152 416v64q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM1152 672v64q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM1152 928v64q0 14 -9 23t-23 9h-64q-14 0 -23 -9 t-9 -23v-64q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM1152 1184v64q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h64q14 0 23 9t9 23z" />
+<glyph unicode="" horiz-adv-x="1280" d="M1188 988l-292 -292v-824q0 -46 -33 -79t-79 -33t-79 33t-33 79v384h-64v-384q0 -46 -33 -79t-79 -33t-79 33t-33 79v824l-292 292q-28 28 -28 68t28 68t68 28t68 -28l228 -228h368l228 228q28 28 68 28t68 -28t28 -68t-28 -68zM864 1152q0 -93 -65.5 -158.5 t-158.5 -65.5t-158.5 65.5t-65.5 158.5t65.5 158.5t158.5 65.5t158.5 -65.5t65.5 -158.5z" />
+<glyph unicode="" horiz-adv-x="1664" d="M780 1064q0 -60 -19 -113.5t-63 -92.5t-105 -39q-76 0 -138 57.5t-92 135.5t-30 151q0 60 19 113.5t63 92.5t105 39q77 0 138.5 -57.5t91.5 -135t30 -151.5zM438 581q0 -80 -42 -139t-119 -59q-76 0 -141.5 55.5t-100.5 133.5t-35 152q0 80 42 139.5t119 59.5 q76 0 141.5 -55.5t100.5 -134t35 -152.5zM832 608q118 0 255 -97.5t229 -237t92 -254.5q0 -46 -17 -76.5t-48.5 -45t-64.5 -20t-76 -5.5q-68 0 -187.5 45t-182.5 45q-66 0 -192.5 -44.5t-200.5 -44.5q-183 0 -183 146q0 86 56 191.5t139.5 192.5t187.5 146t193 59zM1071 819 q-61 0 -105 39t-63 92.5t-19 113.5q0 74 30 151.5t91.5 135t138.5 57.5q61 0 105 -39t63 -92.5t19 -113.5q0 -73 -30 -151t-92 -135.5t-138 -57.5zM1503 923q77 0 119 -59.5t42 -139.5q0 -74 -35 -152t-100.5 -133.5t-141.5 -55.5q-77 0 -119 59t-42 139q0 74 35 152.5 t100.5 134t141.5 55.5z" />
+<glyph unicode="" horiz-adv-x="768" d="M704 1008q0 -145 -57 -243.5t-152 -135.5l45 -821q2 -26 -16 -45t-44 -19h-192q-26 0 -44 19t-16 45l45 821q-95 37 -152 135.5t-57 243.5q0 128 42.5 249.5t117.5 200t160 78.5t160 -78.5t117.5 -200t42.5 -249.5z" />
+<glyph unicode="" horiz-adv-x="1792" d="M896 -93l640 349v636l-640 -233v-752zM832 772l698 254l-698 254l-698 -254zM1664 1024v-768q0 -35 -18 -65t-49 -47l-704 -384q-28 -16 -61 -16t-61 16l-704 384q-31 17 -49 47t-18 65v768q0 40 23 73t61 47l704 256q22 8 44 8t44 -8l704 -256q38 -14 61 -47t23 -73z " />
+<glyph unicode="" horiz-adv-x="2304" d="M640 -96l384 192v314l-384 -164v-342zM576 358l404 173l-404 173l-404 -173zM1664 -96l384 192v314l-384 -164v-342zM1600 358l404 173l-404 173l-404 -173zM1152 651l384 165v266l-384 -164v-267zM1088 1030l441 189l-441 189l-441 -189zM2176 512v-416q0 -36 -19 -67 t-52 -47l-448 -224q-25 -14 -57 -14t-57 14l-448 224q-5 2 -7 4q-2 -2 -7 -4l-448 -224q-25 -14 -57 -14t-57 14l-448 224q-33 16 -52 47t-19 67v416q0 38 21.5 70t56.5 48l434 186v400q0 38 21.5 70t56.5 48l448 192q23 10 50 10t50 -10l448 -192q35 -16 56.5 -48t21.5 -70 v-400l434 -186q36 -16 57 -48t21 -70z" />
+<glyph unicode="" horiz-adv-x="2048" d="M1848 1197h-511v-124h511v124zM1596 771q-90 0 -146 -52.5t-62 -142.5h408q-18 195 -200 195zM1612 186q63 0 122 32t76 87h221q-100 -307 -427 -307q-214 0 -340.5 132t-126.5 347q0 208 130.5 345.5t336.5 137.5q138 0 240.5 -68t153 -179t50.5 -248q0 -17 -2 -47h-658 q0 -111 57.5 -171.5t166.5 -60.5zM277 236h296q205 0 205 167q0 180 -199 180h-302v-347zM277 773h281q78 0 123.5 36.5t45.5 113.5q0 144 -190 144h-260v-294zM0 1282h594q87 0 155 -14t126.5 -47.5t90 -96.5t31.5 -154q0 -181 -172 -263q114 -32 172 -115t58 -204 q0 -75 -24.5 -136.5t-66 -103.5t-98.5 -71t-121 -42t-134 -13h-611v1260z" />
+<glyph unicode="" d="M1248 1408q119 0 203.5 -84.5t84.5 -203.5v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960zM499 1041h-371v-787h382q117 0 197 57.5t80 170.5q0 158 -143 200q107 52 107 164q0 57 -19.5 96.5 t-56.5 60.5t-79 29.5t-97 8.5zM477 723h-176v184h163q119 0 119 -90q0 -94 -106 -94zM486 388h-185v217h189q124 0 124 -113q0 -104 -128 -104zM1136 356q-68 0 -104 38t-36 107h411q1 10 1 30q0 132 -74.5 220.5t-203.5 88.5q-128 0 -210 -86t-82 -216q0 -135 79 -217 t213 -82q205 0 267 191h-138q-11 -34 -47.5 -54t-75.5 -20zM1126 722q113 0 124 -122h-254q4 56 39 89t91 33zM964 988h319v-77h-319v77z" />
+<glyph unicode="" horiz-adv-x="1792" d="M1582 954q0 -101 -71.5 -172.5t-172.5 -71.5t-172.5 71.5t-71.5 172.5t71.5 172.5t172.5 71.5t172.5 -71.5t71.5 -172.5zM812 212q0 104 -73 177t-177 73q-27 0 -54 -6l104 -42q77 -31 109.5 -106.5t1.5 -151.5q-31 -77 -107 -109t-152 -1q-21 8 -62 24.5t-61 24.5 q32 -60 91 -96.5t130 -36.5q104 0 177 73t73 177zM1642 953q0 126 -89.5 215.5t-215.5 89.5q-127 0 -216.5 -89.5t-89.5 -215.5q0 -127 89.5 -216t216.5 -89q126 0 215.5 89t89.5 216zM1792 953q0 -189 -133.5 -322t-321.5 -133l-437 -319q-12 -129 -109 -218t-229 -89 q-121 0 -214 76t-118 192l-230 92v429l389 -157q79 48 173 48q13 0 35 -2l284 407q2 187 135.5 319t320.5 132q188 0 321.5 -133.5t133.5 -321.5z" />
+<glyph unicode="" d="M1242 889q0 80 -57 136.5t-137 56.5t-136.5 -57t-56.5 -136q0 -80 56.5 -136.5t136.5 -56.5t137 56.5t57 136.5zM632 301q0 -83 -58 -140.5t-140 -57.5q-56 0 -103 29t-72 77q52 -20 98 -40q60 -24 120 1.5t85 86.5q24 60 -1.5 120t-86.5 84l-82 33q22 5 42 5 q82 0 140 -57.5t58 -140.5zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v153l172 -69q20 -92 93.5 -152t168.5 -60q104 0 181 70t87 173l345 252q150 0 255.5 105.5t105.5 254.5q0 150 -105.5 255.5t-255.5 105.5 q-148 0 -253 -104.5t-107 -252.5l-225 -322q-9 1 -28 1q-75 0 -137 -37l-297 119v468q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5zM1289 887q0 -100 -71 -170.5t-171 -70.5t-170.5 70.5t-70.5 170.5t70.5 171t170.5 71q101 0 171.5 -70.5t70.5 -171.5z " />
+<glyph unicode="" horiz-adv-x="1792" d="M836 367l-15 -368l-2 -22l-420 29q-36 3 -67 31.5t-47 65.5q-11 27 -14.5 55t4 65t12 55t21.5 64t19 53q78 -12 509 -28zM449 953l180 -379l-147 92q-63 -72 -111.5 -144.5t-72.5 -125t-39.5 -94.5t-18.5 -63l-4 -21l-190 357q-17 26 -18 56t6 47l8 18q35 63 114 188 l-140 86zM1680 436l-188 -359q-12 -29 -36.5 -46.5t-43.5 -20.5l-18 -4q-71 -7 -219 -12l8 -164l-230 367l211 362l7 -173q170 -16 283 -5t170 33zM895 1360q-47 -63 -265 -435l-317 187l-19 12l225 356q20 31 60 45t80 10q24 -2 48.5 -12t42 -21t41.5 -33t36 -34.5 t36 -39.5t32 -35zM1550 1053l212 -363q18 -37 12.5 -76t-27.5 -74q-13 -20 -33 -37t-38 -28t-48.5 -22t-47 -16t-51.5 -14t-46 -12q-34 72 -265 436l313 195zM1407 1279l142 83l-220 -373l-419 20l151 86q-34 89 -75 166t-75.5 123.5t-64.5 80t-47 46.5l-17 13l405 -1 q31 3 58 -10.5t39 -28.5l11 -15q39 -61 112 -190z" />
+<glyph unicode="" horiz-adv-x="2048" d="M480 448q0 66 -47 113t-113 47t-113 -47t-47 -113t47 -113t113 -47t113 47t47 113zM516 768h1016l-89 357q-2 8 -14 17.5t-21 9.5h-768q-9 0 -21 -9.5t-14 -17.5zM1888 448q0 66 -47 113t-113 47t-113 -47t-47 -113t47 -113t113 -47t113 47t47 113zM2048 544v-384 q0 -14 -9 -23t-23 -9h-96v-128q0 -80 -56 -136t-136 -56t-136 56t-56 136v128h-1024v-128q0 -80 -56 -136t-136 -56t-136 56t-56 136v128h-96q-14 0 -23 9t-9 23v384q0 93 65.5 158.5t158.5 65.5h28l105 419q23 94 104 157.5t179 63.5h768q98 0 179 -63.5t104 -157.5 l105 -419h28q93 0 158.5 -65.5t65.5 -158.5z" />
+<glyph unicode="" horiz-adv-x="2048" d="M1824 640q93 0 158.5 -65.5t65.5 -158.5v-384q0 -14 -9 -23t-23 -9h-96v-64q0 -80 -56 -136t-136 -56t-136 56t-56 136v64h-1024v-64q0 -80 -56 -136t-136 -56t-136 56t-56 136v64h-96q-14 0 -23 9t-9 23v384q0 93 65.5 158.5t158.5 65.5h28l105 419q23 94 104 157.5 t179 63.5h128v224q0 14 9 23t23 9h448q14 0 23 -9t9 -23v-224h128q98 0 179 -63.5t104 -157.5l105 -419h28zM320 160q66 0 113 47t47 113t-47 113t-113 47t-113 -47t-47 -113t47 -113t113 -47zM516 640h1016l-89 357q-2 8 -14 17.5t-21 9.5h-768q-9 0 -21 -9.5t-14 -17.5z M1728 160q66 0 113 47t47 113t-47 113t-113 47t-113 -47t-47 -113t47 -113t113 -47z" />
+<glyph unicode="" d="M1504 64q0 -26 -19 -45t-45 -19h-462q1 -17 6 -87.5t5 -108.5q0 -25 -18 -42.5t-43 -17.5h-320q-25 0 -43 17.5t-18 42.5q0 38 5 108.5t6 87.5h-462q-26 0 -45 19t-19 45t19 45l402 403h-229q-26 0 -45 19t-19 45t19 45l402 403h-197q-26 0 -45 19t-19 45t19 45l384 384 q19 19 45 19t45 -19l384 -384q19 -19 19 -45t-19 -45t-45 -19h-197l402 -403q19 -19 19 -45t-19 -45t-45 -19h-229l402 -403q19 -19 19 -45z" />
+<glyph unicode="" d="M1127 326q0 32 -30 51q-193 115 -447 115q-133 0 -287 -34q-42 -9 -42 -52q0 -20 13.5 -34.5t35.5 -14.5q5 0 37 8q132 27 243 27q226 0 397 -103q19 -11 33 -11q19 0 33 13.5t14 34.5zM1223 541q0 40 -35 61q-237 141 -548 141q-153 0 -303 -42q-48 -13 -48 -64 q0 -25 17.5 -42.5t42.5 -17.5q7 0 37 8q122 33 251 33q279 0 488 -124q24 -13 38 -13q25 0 42.5 17.5t17.5 42.5zM1331 789q0 47 -40 70q-126 73 -293 110.5t-343 37.5q-204 0 -364 -47q-23 -7 -38.5 -25.5t-15.5 -48.5q0 -31 20.5 -52t51.5 -21q11 0 40 8q133 37 307 37 q159 0 309.5 -34t253.5 -95q21 -12 40 -12q29 0 50.5 20.5t21.5 51.5zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+<glyph unicode="" horiz-adv-x="1024" d="M1024 1233l-303 -582l24 -31h279v-415h-507l-44 -30l-142 -273l-30 -30h-301v303l303 583l-24 30h-279v415h507l44 30l142 273l30 30h301v-303z" />
+<glyph unicode="" horiz-adv-x="2304" d="M784 164l16 241l-16 523q-1 10 -7.5 17t-16.5 7q-9 0 -16 -7t-7 -17l-14 -523l14 -241q1 -10 7.5 -16.5t15.5 -6.5q22 0 24 23zM1080 193l11 211l-12 586q0 16 -13 24q-8 5 -16 5t-16 -5q-13 -8 -13 -24l-1 -6l-10 -579q0 -1 11 -236v-1q0 -10 6 -17q9 -11 23 -11 q11 0 20 9q9 7 9 20zM35 533l20 -128l-20 -126q-2 -9 -9 -9t-9 9l-17 126l17 128q2 9 9 9t9 -9zM121 612l26 -207l-26 -203q-2 -9 -10 -9q-9 0 -9 10l-23 202l23 207q0 9 9 9q8 0 10 -9zM401 159zM213 650l25 -245l-25 -237q0 -11 -11 -11q-10 0 -12 11l-21 237l21 245 q2 12 12 12q11 0 11 -12zM307 657l23 -252l-23 -244q-2 -13 -14 -13q-13 0 -13 13l-21 244l21 252q0 13 13 13q12 0 14 -13zM401 639l21 -234l-21 -246q-2 -16 -16 -16q-6 0 -10.5 4.5t-4.5 11.5l-20 246l20 234q0 6 4.5 10.5t10.5 4.5q14 0 16 -15zM784 164zM495 785 l21 -380l-21 -246q0 -7 -5 -12.5t-12 -5.5q-16 0 -18 18l-18 246l18 380q2 18 18 18q7 0 12 -5.5t5 -12.5zM589 871l19 -468l-19 -244q0 -8 -5.5 -13.5t-13.5 -5.5q-18 0 -20 19l-16 244l16 468q2 19 20 19q8 0 13.5 -5.5t5.5 -13.5zM687 911l18 -506l-18 -242 q-2 -21 -22 -21q-19 0 -21 21l-16 242l16 506q0 9 6.5 15.5t14.5 6.5q9 0 15 -6.5t7 -15.5zM1079 169v0v0zM881 915l15 -510l-15 -239q0 -10 -7.5 -17.5t-17.5 -7.5t-17 7t-8 18l-14 239l14 510q0 11 7.5 18t17.5 7t17.5 -7t7.5 -18zM980 896l14 -492l-14 -236q0 -11 -8 -19 t-19 -8t-19 8t-9 19l-12 236l12 492q1 12 9 20t19 8t18.5 -8t8.5 -20zM1192 404l-14 -231v0q0 -13 -9 -22t-22 -9t-22 9t-10 22l-6 114l-6 117l12 636v3q2 15 12 24q9 7 20 7q8 0 15 -5q14 -8 16 -26zM2304 423q0 -117 -83 -199.5t-200 -82.5h-786q-13 2 -22 11t-9 22v899 q0 23 28 33q85 34 181 34q195 0 338 -131.5t160 -323.5q53 22 110 22q117 0 200 -83t83 -201z" />
+<glyph unicode="" d="M768 768q237 0 443 43t325 127v-170q0 -69 -103 -128t-280 -93.5t-385 -34.5t-385 34.5t-280 93.5t-103 128v170q119 -84 325 -127t443 -43zM768 0q237 0 443 43t325 127v-170q0 -69 -103 -128t-280 -93.5t-385 -34.5t-385 34.5t-280 93.5t-103 128v170q119 -84 325 -127 t443 -43zM768 384q237 0 443 43t325 127v-170q0 -69 -103 -128t-280 -93.5t-385 -34.5t-385 34.5t-280 93.5t-103 128v170q119 -84 325 -127t443 -43zM768 1536q208 0 385 -34.5t280 -93.5t103 -128v-128q0 -69 -103 -128t-280 -93.5t-385 -34.5t-385 34.5t-280 93.5 t-103 128v128q0 69 103 128t280 93.5t385 34.5z" />
+<glyph unicode="" d="M1468 1156q28 -28 48 -76t20 -88v-1152q0 -40 -28 -68t-68 -28h-1344q-40 0 -68 28t-28 68v1600q0 40 28 68t68 28h896q40 0 88 -20t76 -48zM1024 1400v-376h376q-10 29 -22 41l-313 313q-12 12 -41 22zM1408 -128v1024h-416q-40 0 -68 28t-28 68v416h-768v-1536h1280z M894 465q33 -26 84 -56q59 7 117 7q147 0 177 -49q16 -22 2 -52q0 -1 -1 -2l-2 -2v-1q-6 -38 -71 -38q-48 0 -115 20t-130 53q-221 -24 -392 -83q-153 -262 -242 -262q-15 0 -28 7l-24 12q-1 1 -6 5q-10 10 -6 36q9 40 56 91.5t132 96.5q14 9 23 -6q2 -2 2 -4q52 85 107 197 q68 136 104 262q-24 82 -30.5 159.5t6.5 127.5q11 40 42 40h21h1q23 0 35 -15q18 -21 9 -68q-2 -6 -4 -8q1 -3 1 -8v-30q-2 -123 -14 -192q55 -164 146 -238zM318 54q52 24 137 158q-51 -40 -87.5 -84t-49.5 -74zM716 974q-15 -42 -2 -132q1 7 7 44q0 3 7 43q1 4 4 8 q-1 1 -1 2t-0.5 1.5t-0.5 1.5q-1 22 -13 36q0 -1 -1 -2v-2zM592 313q135 54 284 81q-2 1 -13 9.5t-16 13.5q-76 67 -127 176q-27 -86 -83 -197q-30 -56 -45 -83zM1238 329q-24 24 -140 24q76 -28 124 -28q14 0 18 1q0 1 -2 3z" />
+<glyph unicode="" d="M1468 1156q28 -28 48 -76t20 -88v-1152q0 -40 -28 -68t-68 -28h-1344q-40 0 -68 28t-28 68v1600q0 40 28 68t68 28h896q40 0 88 -20t76 -48zM1024 1400v-376h376q-10 29 -22 41l-313 313q-12 12 -41 22zM1408 -128v1024h-416q-40 0 -68 28t-28 68v416h-768v-1536h1280z M233 768v-107h70l164 -661h159l128 485q7 20 10 46q2 16 2 24h4l3 -24q1 -3 3.5 -20t5.5 -26l128 -485h159l164 661h70v107h-300v-107h90l-99 -438q-5 -20 -7 -46l-2 -21h-4l-3 21q-1 5 -4 21t-5 25l-144 545h-114l-144 -545q-2 -9 -4.5 -24.5t-3.5 -21.5l-4 -21h-4l-2 21 q-2 26 -7 46l-99 438h90v107h-300z" />
+<glyph unicode="" d="M1468 1156q28 -28 48 -76t20 -88v-1152q0 -40 -28 -68t-68 -28h-1344q-40 0 -68 28t-28 68v1600q0 40 28 68t68 28h896q40 0 88 -20t76 -48zM1024 1400v-376h376q-10 29 -22 41l-313 313q-12 12 -41 22zM1408 -128v1024h-416q-40 0 -68 28t-28 68v416h-768v-1536h1280z M429 106v-106h281v106h-75l103 161q5 7 10 16.5t7.5 13.5t3.5 4h2q1 -4 5 -10q2 -4 4.5 -7.5t6 -8t6.5 -8.5l107 -161h-76v-106h291v106h-68l-192 273l195 282h67v107h-279v-107h74l-103 -159q-4 -7 -10 -16.5t-9 -13.5l-2 -3h-2q-1 4 -5 10q-6 11 -17 23l-106 159h76v107 h-290v-107h68l189 -272l-194 -283h-68z" />
+<glyph unicode="" d="M1468 1156q28 -28 48 -76t20 -88v-1152q0 -40 -28 -68t-68 -28h-1344q-40 0 -68 28t-28 68v1600q0 40 28 68t68 28h896q40 0 88 -20t76 -48zM1024 1400v-376h376q-10 29 -22 41l-313 313q-12 12 -41 22zM1408 -128v1024h-416q-40 0 -68 28t-28 68v416h-768v-1536h1280z M416 106v-106h327v106h-93v167h137q76 0 118 15q67 23 106.5 87t39.5 146q0 81 -37 141t-100 87q-48 19 -130 19h-368v-107h92v-555h-92zM769 386h-119v268h120q52 0 83 -18q56 -33 56 -115q0 -89 -62 -120q-31 -15 -78 -15z" />
+<glyph unicode="" d="M1468 1156q28 -28 48 -76t20 -88v-1152q0 -40 -28 -68t-68 -28h-1344q-40 0 -68 28t-28 68v1600q0 40 28 68t68 28h896q40 0 88 -20t76 -48zM1024 1400v-376h376q-10 29 -22 41l-313 313q-12 12 -41 22zM1408 -128v1024h-416q-40 0 -68 28t-28 68v416h-768v-1536h1280z M1280 320v-320h-1024v192l192 192l128 -128l384 384zM448 512q-80 0 -136 56t-56 136t56 136t136 56t136 -56t56 -136t-56 -136t-136 -56z" />
+<glyph unicode="" d="M640 1152v128h-128v-128h128zM768 1024v128h-128v-128h128zM640 896v128h-128v-128h128zM768 768v128h-128v-128h128zM1468 1156q28 -28 48 -76t20 -88v-1152q0 -40 -28 -68t-68 -28h-1344q-40 0 -68 28t-28 68v1600q0 40 28 68t68 28h896q40 0 88 -20t76 -48zM1024 1400 v-376h376q-10 29 -22 41l-313 313q-12 12 -41 22zM1408 -128v1024h-416q-40 0 -68 28t-28 68v416h-128v-128h-128v128h-512v-1536h1280zM781 593l107 -349q8 -27 8 -52q0 -83 -72.5 -137.5t-183.5 -54.5t-183.5 54.5t-72.5 137.5q0 25 8 52q21 63 120 396v128h128v-128h79 q22 0 39 -13t23 -34zM640 128q53 0 90.5 19t37.5 45t-37.5 45t-90.5 19t-90.5 -19t-37.5 -45t37.5 -45t90.5 -19z" />
+<glyph unicode="" d="M1468 1156q28 -28 48 -76t20 -88v-1152q0 -40 -28 -68t-68 -28h-1344q-40 0 -68 28t-28 68v1600q0 40 28 68t68 28h896q40 0 88 -20t76 -48zM1024 1400v-376h376q-10 29 -22 41l-313 313q-12 12 -41 22zM1408 -128v1024h-416q-40 0 -68 28t-28 68v416h-768v-1536h1280z M620 686q20 -8 20 -30v-544q0 -22 -20 -30q-8 -2 -12 -2q-12 0 -23 9l-166 167h-131q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h131l166 167q16 15 35 7zM1037 -3q31 0 50 24q129 159 129 363t-129 363q-16 21 -43 24t-47 -14q-21 -17 -23.5 -43.5t14.5 -47.5 q100 -123 100 -282t-100 -282q-17 -21 -14.5 -47.5t23.5 -42.5q18 -15 40 -15zM826 145q27 0 47 20q87 93 87 219t-87 219q-18 19 -45 20t-46 -17t-20 -44.5t18 -46.5q52 -57 52 -131t-52 -131q-19 -20 -18 -46.5t20 -44.5q20 -17 44 -17z" />
+<glyph unicode="" d="M1468 1156q28 -28 48 -76t20 -88v-1152q0 -40 -28 -68t-68 -28h-1344q-40 0 -68 28t-28 68v1600q0 40 28 68t68 28h896q40 0 88 -20t76 -48zM1024 1400v-376h376q-10 29 -22 41l-313 313q-12 12 -41 22zM1408 -128v1024h-416q-40 0 -68 28t-28 68v416h-768v-1536h1280z M768 768q52 0 90 -38t38 -90v-384q0 -52 -38 -90t-90 -38h-384q-52 0 -90 38t-38 90v384q0 52 38 90t90 38h384zM1260 766q20 -8 20 -30v-576q0 -22 -20 -30q-8 -2 -12 -2q-14 0 -23 9l-265 266v90l265 266q9 9 23 9q4 0 12 -2z" />
+<glyph unicode="" d="M1468 1156q28 -28 48 -76t20 -88v-1152q0 -40 -28 -68t-68 -28h-1344q-40 0 -68 28t-28 68v1600q0 40 28 68t68 28h896q40 0 88 -20t76 -48zM1024 1400v-376h376q-10 29 -22 41l-313 313q-12 12 -41 22zM1408 -128v1024h-416q-40 0 -68 28t-28 68v416h-768v-1536h1280z M480 768q8 11 21 12.5t24 -6.5l51 -38q11 -8 12.5 -21t-6.5 -24l-182 -243l182 -243q8 -11 6.5 -24t-12.5 -21l-51 -38q-11 -8 -24 -6.5t-21 12.5l-226 301q-14 19 0 38zM1282 467q14 -19 0 -38l-226 -301q-8 -11 -21 -12.5t-24 6.5l-51 38q-11 8 -12.5 21t6.5 24l182 243 l-182 243q-8 11 -6.5 24t12.5 21l51 38q11 8 24 6.5t21 -12.5zM662 6q-13 2 -20.5 13t-5.5 24l138 831q2 13 13 20.5t24 5.5l63 -10q13 -2 20.5 -13t5.5 -24l-138 -831q-2 -13 -13 -20.5t-24 -5.5z" />
+<glyph unicode="" d="M1497 709v-198q-101 -23 -198 -23q-65 -136 -165.5 -271t-181.5 -215.5t-128 -106.5q-80 -45 -162 3q-28 17 -60.5 43.5t-85 83.5t-102.5 128.5t-107.5 184t-105.5 244t-91.5 314.5t-70.5 390h283q26 -218 70 -398.5t104.5 -317t121.5 -235.5t140 -195q169 169 287 406 q-142 72 -223 220t-81 333q0 192 104 314.5t284 122.5q178 0 273 -105.5t95 -297.5q0 -159 -58 -286q-7 -1 -19.5 -3t-46 -2t-63 6t-62 25.5t-50.5 51.5q31 103 31 184q0 87 -29 132t-79 45q-53 0 -85 -49.5t-32 -140.5q0 -186 105 -293.5t267 -107.5q62 0 121 14z" />
+<glyph unicode="" horiz-adv-x="1792" d="M216 367l603 -402v359l-334 223zM154 511l193 129l-193 129v-258zM973 -35l603 402l-269 180l-334 -223v-359zM896 458l272 182l-272 182l-272 -182zM485 733l334 223v359l-603 -402zM1445 640l193 -129v258zM1307 733l269 180l-603 402v-359zM1792 913v-546 q0 -41 -34 -64l-819 -546q-21 -13 -43 -13t-43 13l-819 546q-34 23 -34 64v546q0 41 34 64l819 546q21 13 43 13t43 -13l819 -546q34 -23 34 -64z" />
+<glyph unicode="" horiz-adv-x="2048" d="M1800 764q111 -46 179.5 -145.5t68.5 -221.5q0 -164 -118 -280.5t-285 -116.5q-4 0 -11.5 0.5t-10.5 0.5h-1209h-1h-2h-5q-170 10 -288 125.5t-118 280.5q0 110 55 203t147 147q-12 39 -12 82q0 115 82 196t199 81q95 0 172 -58q75 154 222.5 248t326.5 94 q166 0 306 -80.5t221.5 -218.5t81.5 -301q0 -6 -0.5 -18t-0.5 -18zM468 498q0 -122 84 -193t208 -71q137 0 240 99q-16 20 -47.5 56.5t-43.5 50.5q-67 -65 -144 -65q-55 0 -93.5 33.5t-38.5 87.5q0 53 38.5 87t91.5 34q44 0 84.5 -21t73 -55t65 -75t69 -82t77 -75t97 -55 t121.5 -21q121 0 204.5 71.5t83.5 190.5q0 121 -84 192t-207 71q-143 0 -241 -97q14 -16 29.5 -34t34.5 -40t29 -34q66 64 142 64q52 0 92 -33t40 -84q0 -57 -37 -91.5t-94 -34.5q-43 0 -82.5 21t-72 55t-65.5 75t-69.5 82t-77.5 75t-96.5 55t-118.5 21q-122 0 -207 -70.5 t-85 -189.5z" />
+<glyph unicode="" horiz-adv-x="1792" d="M896 1536q182 0 348 -71t286 -191t191 -286t71 -348t-71 -348t-191 -286t-286 -191t-348 -71t-348 71t-286 191t-191 286t-71 348t71 348t191 286t286 191t348 71zM896 1408q-190 0 -361 -90l194 -194q82 28 167 28t167 -28l194 194q-171 90 -361 90zM218 279l194 194 q-28 82 -28 167t28 167l-194 194q-90 -171 -90 -361t90 -361zM896 -128q190 0 361 90l-194 194q-82 -28 -167 -28t-167 28l-194 -194q171 -90 361 -90zM896 256q159 0 271.5 112.5t112.5 271.5t-112.5 271.5t-271.5 112.5t-271.5 -112.5t-112.5 -271.5t112.5 -271.5 t271.5 -112.5zM1380 473l194 -194q90 171 90 361t-90 361l-194 -194q28 -82 28 -167t-28 -167z" />
+<glyph unicode="" horiz-adv-x="1792" d="M1792 640q0 -182 -71 -348t-191 -286t-286 -191t-348 -71t-348 71t-286 191t-191 286t-71 348q0 222 101 414.5t276.5 317t390.5 155.5v-260q-221 -45 -366.5 -221t-145.5 -406q0 -130 51 -248.5t136.5 -204t204 -136.5t248.5 -51t248.5 51t204 136.5t136.5 204t51 248.5 q0 230 -145.5 406t-366.5 221v260q215 -31 390.5 -155.5t276.5 -317t101 -414.5z" />
+<glyph unicode="" horiz-adv-x="1792" d="M19 662q8 217 116 406t305 318h5q0 -1 -1 -3q-8 -8 -28 -33.5t-52 -76.5t-60 -110.5t-44.5 -135.5t-14 -150.5t39 -157.5t108.5 -154q50 -50 102 -69.5t90.5 -11.5t69.5 23.5t47 32.5l16 16q39 51 53 116.5t6.5 122.5t-21 107t-26.5 80l-14 29q-10 25 -30.5 49.5t-43 41 t-43.5 29.5t-35 19l-13 6l104 115q39 -17 78 -52t59 -61l19 -27q1 48 -18.5 103.5t-40.5 87.5l-20 31l161 183l160 -181q-33 -46 -52.5 -102.5t-22.5 -90.5l-4 -33q22 37 61.5 72.5t67.5 52.5l28 17l103 -115q-44 -14 -85 -50t-60 -65l-19 -29q-31 -56 -48 -133.5t-7 -170 t57 -156.5q33 -45 77.5 -60.5t85 -5.5t76 26.5t57.5 33.5l21 16q60 53 96.5 115t48.5 121.5t10 121.5t-18 118t-37 107.5t-45.5 93t-45 72t-34.5 47.5l-13 17q-14 13 -7 13l10 -3q40 -29 62.5 -46t62 -50t64 -58t58.5 -65t55.5 -77t45.5 -88t38 -103t23.5 -117t10.5 -136 q3 -259 -108 -465t-312 -321t-456 -115q-185 0 -351 74t-283.5 198t-184 293t-60.5 353z" />
+<glyph unicode="" horiz-adv-x="1792" d="M874 -102v-66q-208 6 -385 109.5t-283 275.5l58 34q29 -49 73 -99l65 57q148 -168 368 -212l-17 -86q65 -12 121 -13zM276 428l-83 -28q22 -60 49 -112l-57 -33q-98 180 -98 385t98 385l57 -33q-30 -56 -49 -112l82 -28q-35 -100 -35 -212q0 -109 36 -212zM1528 251 l58 -34q-106 -172 -283 -275.5t-385 -109.5v66q56 1 121 13l-17 86q220 44 368 212l65 -57q44 50 73 99zM1377 805l-233 -80q14 -42 14 -85t-14 -85l232 -80q-31 -92 -98 -169l-185 162q-57 -67 -147 -85l48 -241q-52 -10 -98 -10t-98 10l48 241q-90 18 -147 85l-185 -162 q-67 77 -98 169l232 80q-14 42 -14 85t14 85l-233 80q33 93 99 169l185 -162q59 68 147 86l-48 240q44 10 98 10t98 -10l-48 -240q88 -18 147 -86l185 162q66 -76 99 -169zM874 1448v-66q-65 -2 -121 -13l17 -86q-220 -42 -368 -211l-65 56q-38 -42 -73 -98l-57 33 q106 172 282 275.5t385 109.5zM1705 640q0 -205 -98 -385l-57 33q27 52 49 112l-83 28q36 103 36 212q0 112 -35 212l82 28q-19 56 -49 112l57 33q98 -180 98 -385zM1585 1063l-57 -33q-35 56 -73 98l-65 -56q-148 169 -368 211l17 86q-56 11 -121 13v66q209 -6 385 -109.5 t282 -275.5zM1748 640q0 173 -67.5 331t-181.5 272t-272 181.5t-331 67.5t-331 -67.5t-272 -181.5t-181.5 -272t-67.5 -331t67.5 -331t181.5 -272t272 -181.5t331 -67.5t331 67.5t272 181.5t181.5 272t67.5 331zM1792 640q0 -182 -71 -348t-191 -286t-286 -191t-348 -71 t-348 71t-286 191t-191 286t-71 348t71 348t191 286t286 191t348 71t348 -71t286 -191t191 -286t71 -348z" />
+<glyph unicode="" d="M582 228q0 -66 -93 -66q-107 0 -107 63q0 64 98 64q102 0 102 -61zM546 694q0 -85 -74 -85q-77 0 -77 84q0 90 77 90q36 0 55 -25.5t19 -63.5zM712 769v125q-78 -29 -135 -29q-50 29 -110 29q-86 0 -145 -57t-59 -143q0 -50 29.5 -102t73.5 -67v-3q-38 -17 -38 -85 q0 -53 41 -77v-3q-113 -37 -113 -139q0 -45 20 -78.5t54 -51t72 -25.5t81 -8q224 0 224 188q0 67 -48 99t-126 46q-27 5 -51.5 20.5t-24.5 39.5q0 44 49 52q77 15 122 70t45 134q0 24 -10 52q37 9 49 13zM771 350h137q-2 27 -2 82v387q0 46 2 69h-137q3 -23 3 -71v-392 q0 -50 -3 -75zM1280 366v121q-30 -21 -68 -21q-53 0 -53 82v225h52q9 0 26.5 -1t26.5 -1v117h-105q0 82 3 102h-140q4 -24 4 -55v-47h-60v-117q36 3 37 3q3 0 11 -0.5t12 -0.5v-2h-2v-217q0 -37 2.5 -64t11.5 -56.5t24.5 -48.5t43.5 -31t66 -12q64 0 108 24zM924 1072 q0 36 -24 63.5t-60 27.5t-60.5 -27t-24.5 -64q0 -36 25 -62.5t60 -26.5t59.5 27t24.5 62zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
+<glyph unicode="" horiz-adv-x="1792" d="M595 22q0 100 -165 100q-158 0 -158 -104q0 -101 172 -101q151 0 151 105zM536 777q0 61 -30 102t-89 41q-124 0 -124 -145q0 -135 124 -135q119 0 119 137zM805 1101v-202q-36 -12 -79 -22q16 -43 16 -84q0 -127 -73 -216.5t-197 -112.5q-40 -8 -59.5 -27t-19.5 -58 q0 -31 22.5 -51.5t58 -32t78.5 -22t86 -25.5t78.5 -37.5t58 -64t22.5 -98.5q0 -304 -363 -304q-69 0 -130 12.5t-116 41t-87.5 82t-32.5 127.5q0 165 182 225v4q-67 41 -67 126q0 109 63 137v4q-72 24 -119.5 108.5t-47.5 165.5q0 139 95 231.5t235 92.5q96 0 178 -47 q98 0 218 47zM1123 220h-222q4 45 4 134v609q0 94 -4 128h222q-4 -33 -4 -124v-613q0 -89 4 -134zM1724 442v-196q-71 -39 -174 -39q-62 0 -107 20t-70 50t-39.5 78t-18.5 92t-4 103v351h2v4q-7 0 -19 1t-18 1q-21 0 -59 -6v190h96v76q0 54 -6 89h227q-6 -41 -6 -165h171 v-190q-15 0 -43.5 2t-42.5 2h-85v-365q0 -131 87 -131q61 0 109 33zM1148 1389q0 -58 -39 -101.5t-96 -43.5q-58 0 -98 43.5t-40 101.5q0 59 39.5 103t98.5 44q58 0 96.5 -44.5t38.5 -102.5z" />
+<glyph unicode="" d="M809 532l266 499h-112l-157 -312q-24 -48 -44 -92l-42 92l-155 312h-120l263 -493v-324h101v318zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
+<glyph unicode="" horiz-adv-x="1280" d="M842 964q0 -80 -57 -136.5t-136 -56.5q-60 0 -111 35q-62 -67 -115 -146q-247 -371 -202 -859q1 -22 -12.5 -38.5t-34.5 -18.5h-5q-20 0 -35 13.5t-17 33.5q-14 126 -3.5 247.5t29.5 217t54 186t69 155.5t74 125q61 90 132 165q-16 35 -16 77q0 80 56.5 136.5t136.5 56.5 t136.5 -56.5t56.5 -136.5zM1223 953q0 -158 -78 -292t-212.5 -212t-292.5 -78q-64 0 -131 14q-21 5 -32.5 23.5t-6.5 39.5q5 20 23 31.5t39 7.5q51 -13 108 -13q97 0 186 38t153 102t102 153t38 186t-38 186t-102 153t-153 102t-186 38t-186 -38t-153 -102t-102 -153 t-38 -186q0 -114 52 -218q10 -20 3.5 -40t-25.5 -30t-39.5 -3t-30.5 26q-64 123 -64 265q0 119 46.5 227t124.5 186t186 124t226 46q158 0 292.5 -78t212.5 -212.5t78 -292.5z" />
+<glyph unicode="" horiz-adv-x="1792" d="M270 730q-8 19 -8 52q0 20 11 49t24 45q-1 22 7.5 53t22.5 43q0 139 92.5 288.5t217.5 209.5q139 66 324 66q133 0 266 -55q49 -21 90 -48t71 -56t55 -68t42 -74t32.5 -84.5t25.5 -89.5t22 -98l1 -5q55 -83 55 -150q0 -14 -9 -40t-9 -38q0 -1 1.5 -3.5t3.5 -5t2 -3.5 q77 -114 120.5 -214.5t43.5 -208.5q0 -43 -19.5 -100t-55.5 -57q-9 0 -19.5 7.5t-19 17.5t-19 26t-16 26.5t-13.5 26t-9 17.5q-1 1 -3 1l-5 -4q-59 -154 -132 -223q20 -20 61.5 -38.5t69 -41.5t35.5 -65q-2 -4 -4 -16t-7 -18q-64 -97 -302 -97q-53 0 -110.5 9t-98 20 t-104.5 30q-15 5 -23 7q-14 4 -46 4.5t-40 1.5q-41 -45 -127.5 -65t-168.5 -20q-35 0 -69 1.5t-93 9t-101 20.5t-74.5 40t-32.5 64q0 40 10 59.5t41 48.5q11 2 40.5 13t49.5 12q4 0 14 2q2 2 2 4l-2 3q-48 11 -108 105.5t-73 156.5l-5 3q-4 0 -12 -20q-18 -41 -54.5 -74.5 t-77.5 -37.5h-1q-4 0 -6 4.5t-5 5.5q-23 54 -23 100q0 275 252 466z" />
+<glyph unicode="" horiz-adv-x="2048" d="M580 1075q0 41 -25 66t-66 25q-43 0 -76 -25.5t-33 -65.5q0 -39 33 -64.5t76 -25.5q41 0 66 24.5t25 65.5zM1323 568q0 28 -25.5 50t-65.5 22q-27 0 -49.5 -22.5t-22.5 -49.5q0 -28 22.5 -50.5t49.5 -22.5q40 0 65.5 22t25.5 51zM1087 1075q0 41 -24.5 66t-65.5 25 q-43 0 -76 -25.5t-33 -65.5q0 -39 33 -64.5t76 -25.5q41 0 65.5 24.5t24.5 65.5zM1722 568q0 28 -26 50t-65 22q-27 0 -49.5 -22.5t-22.5 -49.5q0 -28 22.5 -50.5t49.5 -22.5q39 0 65 22t26 51zM1456 965q-31 4 -70 4q-169 0 -311 -77t-223.5 -208.5t-81.5 -287.5 q0 -78 23 -152q-35 -3 -68 -3q-26 0 -50 1.5t-55 6.5t-44.5 7t-54.5 10.5t-50 10.5l-253 -127l72 218q-290 203 -290 490q0 169 97.5 311t264 223.5t363.5 81.5q176 0 332.5 -66t262 -182.5t136.5 -260.5zM2048 404q0 -117 -68.5 -223.5t-185.5 -193.5l55 -181l-199 109 q-150 -37 -218 -37q-169 0 -311 70.5t-223.5 191.5t-81.5 264t81.5 264t223.5 191.5t311 70.5q161 0 303 -70.5t227.5 -192t85.5 -263.5z" />
+<glyph unicode="" horiz-adv-x="1792" d="M1764 1525q33 -24 27 -64l-256 -1536q-5 -29 -32 -45q-14 -8 -31 -8q-11 0 -24 5l-453 185l-242 -295q-18 -23 -49 -23q-13 0 -22 4q-19 7 -30.5 23.5t-11.5 36.5v349l864 1059l-1069 -925l-395 162q-37 14 -40 55q-2 40 32 59l1664 960q15 9 32 9q20 0 36 -11z" />
+<glyph unicode="" horiz-adv-x="1792" d="M1764 1525q33 -24 27 -64l-256 -1536q-5 -29 -32 -45q-14 -8 -31 -8q-11 0 -24 5l-527 215l-298 -327q-18 -21 -47 -21q-14 0 -23 4q-19 7 -30 23.5t-11 36.5v452l-472 193q-37 14 -40 55q-3 39 32 59l1664 960q35 21 68 -2zM1422 26l221 1323l-1434 -827l336 -137 l863 639l-478 -797z" />
+<glyph unicode="" d="M1536 640q0 -156 -61 -298t-164 -245t-245 -164t-298 -61q-172 0 -327 72.5t-264 204.5q-7 10 -6.5 22.5t8.5 20.5l137 138q10 9 25 9q16 -2 23 -12q73 -95 179 -147t225 -52q104 0 198.5 40.5t163.5 109.5t109.5 163.5t40.5 198.5t-40.5 198.5t-109.5 163.5 t-163.5 109.5t-198.5 40.5q-98 0 -188 -35.5t-160 -101.5l137 -138q31 -30 14 -69q-17 -40 -59 -40h-448q-26 0 -45 19t-19 45v448q0 42 40 59q39 17 69 -14l130 -129q107 101 244.5 156.5t284.5 55.5q156 0 298 -61t245 -164t164 -245t61 -298zM896 928v-448q0 -14 -9 -23 t-23 -9h-320q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h224v352q0 14 9 23t23 9h64q14 0 23 -9t9 -23z" />
+<glyph unicode="" d="M768 1280q-130 0 -248.5 -51t-204 -136.5t-136.5 -204t-51 -248.5t51 -248.5t136.5 -204t204 -136.5t248.5 -51t248.5 51t204 136.5t136.5 204t51 248.5t-51 248.5t-136.5 204t-204 136.5t-248.5 51zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103 t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+<glyph unicode="" horiz-adv-x="1792" d="M1682 -128q-44 0 -132.5 3.5t-133.5 3.5q-44 0 -132 -3.5t-132 -3.5q-24 0 -37 20.5t-13 45.5q0 31 17 46t39 17t51 7t45 15q33 21 33 140l-1 391q0 21 -1 31q-13 4 -50 4h-675q-38 0 -51 -4q-1 -10 -1 -31l-1 -371q0 -142 37 -164q16 -10 48 -13t57 -3.5t45 -15 t20 -45.5q0 -26 -12.5 -48t-36.5 -22q-47 0 -139.5 3.5t-138.5 3.5q-43 0 -128 -3.5t-127 -3.5q-23 0 -35.5 21t-12.5 45q0 30 15.5 45t36 17.5t47.5 7.5t42 15q33 23 33 143l-1 57v813q0 3 0.5 26t0 36.5t-1.5 38.5t-3.5 42t-6.5 36.5t-11 31.5t-16 18q-15 10 -45 12t-53 2 t-41 14t-18 45q0 26 12 48t36 22q46 0 138.5 -3.5t138.5 -3.5q42 0 126.5 3.5t126.5 3.5q25 0 37.5 -22t12.5 -48q0 -30 -17 -43.5t-38.5 -14.5t-49.5 -4t-43 -13q-35 -21 -35 -160l1 -320q0 -21 1 -32q13 -3 39 -3h699q25 0 38 3q1 11 1 32l1 320q0 139 -35 160 q-18 11 -58.5 12.5t-66 13t-25.5 49.5q0 26 12.5 48t37.5 22q44 0 132 -3.5t132 -3.5q43 0 129 3.5t129 3.5q25 0 37.5 -22t12.5 -48q0 -30 -17.5 -44t-40 -14.5t-51.5 -3t-44 -12.5q-35 -23 -35 -161l1 -943q0 -119 34 -140q16 -10 46 -13.5t53.5 -4.5t41.5 -15.5t18 -44.5 q0 -26 -12 -48t-36 -22z" />
+<glyph unicode="" horiz-adv-x="1280" d="M1278 1347v-73q0 -29 -18.5 -61t-42.5 -32q-50 0 -54 -1q-26 -6 -32 -31q-3 -11 -3 -64v-1152q0 -25 -18 -43t-43 -18h-108q-25 0 -43 18t-18 43v1218h-143v-1218q0 -25 -17.5 -43t-43.5 -18h-108q-26 0 -43.5 18t-17.5 43v496q-147 12 -245 59q-126 58 -192 179 q-64 117 -64 259q0 166 88 286q88 118 209 159q111 37 417 37h479q25 0 43 -18t18 -43z" />
+<glyph unicode="" d="M352 128v-128h-352v128h352zM704 256q26 0 45 -19t19 -45v-256q0 -26 -19 -45t-45 -19h-256q-26 0 -45 19t-19 45v256q0 26 19 45t45 19h256zM864 640v-128h-864v128h864zM224 1152v-128h-224v128h224zM1536 128v-128h-736v128h736zM576 1280q26 0 45 -19t19 -45v-256 q0 -26 -19 -45t-45 -19h-256q-26 0 -45 19t-19 45v256q0 26 19 45t45 19h256zM1216 768q26 0 45 -19t19 -45v-256q0 -26 -19 -45t-45 -19h-256q-26 0 -45 19t-19 45v256q0 26 19 45t45 19h256zM1536 640v-128h-224v128h224zM1536 1152v-128h-864v128h864z" />
+<glyph unicode="" d="M1216 512q133 0 226.5 -93.5t93.5 -226.5t-93.5 -226.5t-226.5 -93.5t-226.5 93.5t-93.5 226.5q0 12 2 34l-360 180q-92 -86 -218 -86q-133 0 -226.5 93.5t-93.5 226.5t93.5 226.5t226.5 93.5q126 0 218 -86l360 180q-2 22 -2 34q0 133 93.5 226.5t226.5 93.5 t226.5 -93.5t93.5 -226.5t-93.5 -226.5t-226.5 -93.5q-126 0 -218 86l-360 -180q2 -22 2 -34t-2 -34l360 -180q92 86 218 86z" />
+<glyph unicode="" d="M1280 341q0 88 -62.5 151t-150.5 63q-84 0 -145 -58l-241 120q2 16 2 23t-2 23l241 120q61 -58 145 -58q88 0 150.5 63t62.5 151t-62.5 150.5t-150.5 62.5t-151 -62.5t-63 -150.5q0 -7 2 -23l-241 -120q-62 57 -145 57q-88 0 -150.5 -62.5t-62.5 -150.5t62.5 -150.5 t150.5 -62.5q83 0 145 57l241 -120q-2 -16 -2 -23q0 -88 63 -150.5t151 -62.5t150.5 62.5t62.5 150.5zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
+<glyph unicode="" horiz-adv-x="1792" d="M571 947q-10 25 -34 35t-49 0q-108 -44 -191 -127t-127 -191q-10 -25 0 -49t35 -34q13 -5 24 -5q42 0 60 40q34 84 98.5 148.5t148.5 98.5q25 11 35 35t0 49zM1513 1303l46 -46l-244 -243l68 -68q19 -19 19 -45.5t-19 -45.5l-64 -64q89 -161 89 -343q0 -143 -55.5 -273.5 t-150 -225t-225 -150t-273.5 -55.5t-273.5 55.5t-225 150t-150 225t-55.5 273.5t55.5 273.5t150 225t225 150t273.5 55.5q182 0 343 -89l64 64q19 19 45.5 19t45.5 -19l68 -68zM1521 1359q-10 -10 -22 -10q-13 0 -23 10l-91 90q-9 10 -9 23t9 23q10 9 23 9t23 -9l90 -91 q10 -9 10 -22.5t-10 -22.5zM1751 1129q-11 -9 -23 -9t-23 9l-90 91q-10 9 -10 22.5t10 22.5q9 10 22.5 10t22.5 -10l91 -90q9 -10 9 -23t-9 -23zM1792 1312q0 -14 -9 -23t-23 -9h-96q-14 0 -23 9t-9 23t9 23t23 9h96q14 0 23 -9t9 -23zM1600 1504v-96q0 -14 -9 -23t-23 -9 t-23 9t-9 23v96q0 14 9 23t23 9t23 -9t9 -23zM1751 1449l-91 -90q-10 -10 -22 -10q-13 0 -23 10q-10 9 -10 22.5t10 22.5l90 91q10 9 23 9t23 -9q9 -10 9 -23t-9 -23z" />
+<glyph unicode="" horiz-adv-x="1792" d="M609 720l287 208l287 -208l-109 -336h-355zM896 1536q182 0 348 -71t286 -191t191 -286t71 -348t-71 -348t-191 -286t-286 -191t-348 -71t-348 71t-286 191t-191 286t-71 348t71 348t191 286t286 191t348 71zM1515 186q149 203 149 454v3l-102 -89l-240 224l63 323 l134 -12q-150 206 -389 282l53 -124l-287 -159l-287 159l53 124q-239 -76 -389 -282l135 12l62 -323l-240 -224l-102 89v-3q0 -251 149 -454l30 132l326 -40l139 -298l-116 -69q117 -39 240 -39t240 39l-116 69l139 298l326 40z" />
+<glyph unicode="" horiz-adv-x="1792" d="M448 224v-192q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h192q14 0 23 -9t9 -23zM256 608v-192q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h192q14 0 23 -9t9 -23zM832 224v-192q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23 v192q0 14 9 23t23 9h192q14 0 23 -9t9 -23zM640 608v-192q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h192q14 0 23 -9t9 -23zM66 768q-28 0 -47 19t-19 46v129h514v-129q0 -27 -19 -46t-46 -19h-383zM1216 224v-192q0 -14 -9 -23t-23 -9h-192 q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h192q14 0 23 -9t9 -23zM1024 608v-192q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h192q14 0 23 -9t9 -23zM1600 224v-192q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h192q14 0 23 -9t9 -23 zM1408 608v-192q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h192q14 0 23 -9t9 -23zM1792 1016v-13h-514v10q0 104 -382 102q-382 -1 -382 -102v-10h-514v13q0 17 8.5 43t34 64t65.5 75.5t110.5 76t160 67.5t224 47.5t293.5 18.5t293 -18.5t224 -47.5 t160.5 -67.5t110.5 -76t65.5 -75.5t34 -64t8.5 -43zM1792 608v-192q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h192q14 0 23 -9t9 -23zM1792 962v-129q0 -27 -19 -46t-46 -19h-384q-27 0 -46 19t-19 46v129h514z" />
+<glyph unicode="" horiz-adv-x="1792" d="M704 1216v-768q0 -26 -19 -45t-45 -19v-576q0 -26 -19 -45t-45 -19h-512q-26 0 -45 19t-19 45v512l249 873q7 23 31 23h424zM1024 1216v-704h-256v704h256zM1792 320v-512q0 -26 -19 -45t-45 -19h-512q-26 0 -45 19t-19 45v576q-26 0 -45 19t-19 45v768h424q24 0 31 -23z M736 1504v-224h-352v224q0 14 9 23t23 9h288q14 0 23 -9t9 -23zM1408 1504v-224h-352v224q0 14 9 23t23 9h288q14 0 23 -9t9 -23z" />
+<glyph unicode="" horiz-adv-x="1792" d="M1755 1083q37 -37 37 -90t-37 -91l-401 -400l150 -150l-160 -160q-163 -163 -389.5 -186.5t-411.5 100.5l-362 -362h-181v181l362 362q-124 185 -100.5 411.5t186.5 389.5l160 160l150 -150l400 401q38 37 91 37t90 -37t37 -90.5t-37 -90.5l-400 -401l234 -234l401 400 q38 37 91 37t90 -37z" />
+<glyph unicode="" horiz-adv-x="1792" d="M873 796q0 -83 -63.5 -142.5t-152.5 -59.5t-152.5 59.5t-63.5 142.5q0 84 63.5 143t152.5 59t152.5 -59t63.5 -143zM1375 796q0 -83 -63 -142.5t-153 -59.5q-89 0 -152.5 59.5t-63.5 142.5q0 84 63.5 143t152.5 59q90 0 153 -59t63 -143zM1600 616v667q0 87 -32 123.5 t-111 36.5h-1112q-83 0 -112.5 -34t-29.5 -126v-673q43 -23 88.5 -40t81 -28t81 -18.5t71 -11t70 -4t58.5 -0.5t56.5 2t44.5 2q68 1 95 -27q6 -6 10 -9q26 -25 61 -51q7 91 118 87q5 0 36.5 -1.5t43 -2t45.5 -1t53 1t54.5 4.5t61 8.5t62 13.5t67 19.5t67.5 27t72 34.5z M1763 621q-121 -149 -372 -252q84 -285 -23 -465q-66 -113 -183 -148q-104 -32 -182 15q-86 51 -82 164l-1 326v1q-8 2 -24.5 6t-23.5 5l-1 -338q4 -114 -83 -164q-79 -47 -183 -15q-117 36 -182 150q-105 180 -22 463q-251 103 -372 252q-25 37 -4 63t60 -1q3 -2 11 -7 t11 -8v694q0 72 47 123t114 51h1257q67 0 114 -51t47 -123v-694l21 15q39 27 60 1t-4 -63z" />
+<glyph unicode="" horiz-adv-x="1792" d="M896 1102v-434h-145v434h145zM1294 1102v-434h-145v434h145zM1294 342l253 254v795h-1194v-1049h326v-217l217 217h398zM1692 1536v-1013l-434 -434h-326l-217 -217h-217v217h-398v1158l109 289h1483z" />
+<glyph unicode="" d="M773 217v-127q-1 -292 -6 -305q-12 -32 -51 -40q-54 -9 -181.5 38t-162.5 89q-13 15 -17 36q-1 12 4 26q4 10 34 47t181 216q1 0 60 70q15 19 39.5 24.5t49.5 -3.5q24 -10 37.5 -29t12.5 -42zM624 468q-3 -55 -52 -70l-120 -39q-275 -88 -292 -88q-35 2 -54 36 q-12 25 -17 75q-8 76 1 166.5t30 124.5t56 32q13 0 202 -77q70 -29 115 -47l84 -34q23 -9 35.5 -30.5t11.5 -48.5zM1450 171q-7 -54 -91.5 -161t-135.5 -127q-37 -14 -63 7q-14 10 -184 287l-47 77q-14 21 -11.5 46t19.5 46q35 43 83 26q1 -1 119 -40q203 -66 242 -79.5 t47 -20.5q28 -22 22 -61zM778 803q5 -102 -54 -122q-58 -17 -114 71l-378 598q-8 35 19 62q41 43 207.5 89.5t224.5 31.5q40 -10 49 -45q3 -18 22 -305.5t24 -379.5zM1440 695q3 -39 -26 -59q-15 -10 -329 -86q-67 -15 -91 -23l1 2q-23 -6 -46 4t-37 32q-30 47 0 87 q1 1 75 102q125 171 150 204t34 39q28 19 65 2q48 -23 123 -133.5t81 -167.5v-3z" />
+<glyph unicode="" horiz-adv-x="2048" d="M1024 1024h-384v-384h384v384zM1152 384v-128h-640v128h640zM1152 1152v-640h-640v640h640zM1792 384v-128h-512v128h512zM1792 640v-128h-512v128h512zM1792 896v-128h-512v128h512zM1792 1152v-128h-512v128h512zM256 192v960h-128v-960q0 -26 19 -45t45 -19t45 19 t19 45zM1920 192v1088h-1536v-1088q0 -33 -11 -64h1483q26 0 45 19t19 45zM2048 1408v-1216q0 -80 -56 -136t-136 -56h-1664q-80 0 -136 56t-56 136v1088h256v128h1792z" />
+<glyph unicode="" horiz-adv-x="2048" d="M1024 13q-20 0 -93 73.5t-73 93.5q0 32 62.5 54t103.5 22t103.5 -22t62.5 -54q0 -20 -73 -93.5t-93 -73.5zM1294 284q-2 0 -40 25t-101.5 50t-128.5 25t-128.5 -25t-101 -50t-40.5 -25q-18 0 -93.5 75t-75.5 93q0 13 10 23q78 77 196 121t233 44t233 -44t196 -121 q10 -10 10 -23q0 -18 -75.5 -93t-93.5 -75zM1567 556q-11 0 -23 8q-136 105 -252 154.5t-268 49.5q-85 0 -170.5 -22t-149 -53t-113.5 -62t-79 -53t-31 -22q-17 0 -92 75t-75 93q0 12 10 22q132 132 320 205t380 73t380 -73t320 -205q10 -10 10 -22q0 -18 -75 -93t-92 -75z M1838 827q-11 0 -22 9q-179 157 -371.5 236.5t-420.5 79.5t-420.5 -79.5t-371.5 -236.5q-11 -9 -22 -9q-17 0 -92.5 75t-75.5 93q0 13 10 23q187 186 445 288t527 102t527 -102t445 -288q10 -10 10 -23q0 -18 -75.5 -93t-92.5 -75z" />
+<glyph unicode="" horiz-adv-x="1792" d="M384 0q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM768 0q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM384 384q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5 t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1152 0q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM768 384q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5 t37.5 90.5zM384 768q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1152 384q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM768 768q0 53 -37.5 90.5t-90.5 37.5 t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1536 0v384q0 52 -38 90t-90 38t-90 -38t-38 -90v-384q0 -52 38 -90t90 -38t90 38t38 90zM1152 768q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5z M1536 1088v256q0 26 -19 45t-45 19h-1280q-26 0 -45 -19t-19 -45v-256q0 -26 19 -45t45 -19h1280q26 0 45 19t19 45zM1536 768q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1664 1408v-1536q0 -52 -38 -90t-90 -38 h-1408q-52 0 -90 38t-38 90v1536q0 52 38 90t90 38h1408q52 0 90 -38t38 -90z" />
+<glyph unicode="" d="M1519 890q18 -84 -4 -204q-87 -444 -565 -444h-44q-25 0 -44 -16.5t-24 -42.5l-4 -19l-55 -346l-2 -15q-5 -26 -24.5 -42.5t-44.5 -16.5h-251q-21 0 -33 15t-9 36q9 56 26.5 168t26.5 168t27 167.5t27 167.5q5 37 43 37h131q133 -2 236 21q175 39 287 144q102 95 155 246 q24 70 35 133q1 6 2.5 7.5t3.5 1t6 -3.5q79 -59 98 -162zM1347 1172q0 -107 -46 -236q-80 -233 -302 -315q-113 -40 -252 -42q0 -1 -90 -1l-90 1q-100 0 -118 -96q-2 -8 -85 -530q-1 -10 -12 -10h-295q-22 0 -36.5 16.5t-11.5 38.5l232 1471q5 29 27.5 48t51.5 19h598 q34 0 97.5 -13t111.5 -32q107 -41 163.5 -123t56.5 -196z" />
+<glyph unicode="" horiz-adv-x="1792" d="M602 949q19 -61 31 -123.5t17 -141.5t-14 -159t-62 -145q-21 81 -67 157t-95.5 127t-99 90.5t-78.5 57.5t-33 19q-62 34 -81.5 100t14.5 128t101 81.5t129 -14.5q138 -83 238 -177zM927 1236q11 -25 20.5 -46t36.5 -100.5t42.5 -150.5t25.5 -179.5t0 -205.5t-47.5 -209.5 t-105.5 -208.5q-51 -72 -138 -72q-54 0 -98 31q-57 40 -69 109t28 127q60 85 81 195t13 199.5t-32 180.5t-39 128t-22 52q-31 63 -8.5 129.5t85.5 97.5q34 17 75 17q47 0 88.5 -25t63.5 -69zM1248 567q-17 -160 -72 -311q-17 131 -63 246q25 174 -5 361q-27 178 -94 342 q114 -90 212 -211q9 -37 15 -80q26 -179 7 -347zM1520 1440q9 -17 23.5 -49.5t43.5 -117.5t50.5 -178t34 -227.5t5 -269t-47 -300t-112.5 -323.5q-22 -48 -66 -75.5t-95 -27.5q-39 0 -74 16q-67 31 -92.5 100t4.5 136q58 126 90 257.5t37.5 239.5t-3.5 213.5t-26.5 180.5 t-38.5 138.5t-32.5 90t-15.5 32.5q-34 65 -11.5 135.5t87.5 104.5q37 20 81 20q49 0 91.5 -25.5t66.5 -70.5z" />
+<glyph unicode="" horiz-adv-x="2304" d="M1975 546h-138q14 37 66 179l3 9q4 10 10 26t9 26l12 -55zM531 611l-58 295q-11 54 -75 54h-268l-2 -13q311 -79 403 -336zM710 960l-162 -438l-17 89q-26 70 -85 129.5t-131 88.5l135 -510h175l261 641h-176zM849 318h166l104 642h-166zM1617 944q-69 27 -149 27 q-123 0 -201 -59t-79 -153q-1 -102 145 -174q48 -23 67 -41t19 -39q0 -30 -30 -46t-69 -16q-86 0 -156 33l-22 11l-23 -144q74 -34 185 -34q130 -1 208.5 59t80.5 160q0 106 -140 174q-49 25 -71 42t-22 38q0 22 24.5 38.5t70.5 16.5q70 1 124 -24l15 -8zM2042 960h-128 q-65 0 -87 -54l-246 -588h174l35 96h212q5 -22 20 -96h154zM2304 1280v-1280q0 -52 -38 -90t-90 -38h-2048q-52 0 -90 38t-38 90v1280q0 52 38 90t90 38h2048q52 0 90 -38t38 -90z" />
+<glyph unicode="" horiz-adv-x="2304" d="M671 603h-13q-47 0 -47 -32q0 -22 20 -22q17 0 28 15t12 39zM1066 639h62v3q1 4 0.5 6.5t-1 7t-2 8t-4.5 6.5t-7.5 5t-11.5 2q-28 0 -36 -38zM1606 603h-12q-48 0 -48 -32q0 -22 20 -22q17 0 28 15t12 39zM1925 629q0 41 -30 41q-19 0 -31 -20t-12 -51q0 -42 28 -42 q20 0 32.5 20t12.5 52zM480 770h87l-44 -262h-56l32 201l-71 -201h-39l-4 200l-34 -200h-53l44 262h81l2 -163zM733 663q0 -6 -4 -42q-16 -101 -17 -113h-47l1 22q-20 -26 -58 -26q-23 0 -37.5 16t-14.5 42q0 39 26 60.5t73 21.5q14 0 23 -1q0 3 0.5 5.5t1 4.5t0.5 3 q0 20 -36 20q-29 0 -59 -10q0 4 7 48q38 11 67 11q74 0 74 -62zM889 721l-8 -49q-22 3 -41 3q-27 0 -27 -17q0 -8 4.5 -12t21.5 -11q40 -19 40 -60q0 -72 -87 -71q-34 0 -58 6q0 2 7 49q29 -8 51 -8q32 0 32 19q0 7 -4.5 11.5t-21.5 12.5q-43 20 -43 59q0 72 84 72 q30 0 50 -4zM977 721h28l-7 -52h-29q-2 -17 -6.5 -40.5t-7 -38.5t-2.5 -18q0 -16 19 -16q8 0 16 2l-8 -47q-21 -7 -40 -7q-43 0 -45 47q0 12 8 56q3 20 25 146h55zM1180 648q0 -23 -7 -52h-111q-3 -22 10 -33t38 -11q30 0 58 14l-9 -54q-30 -8 -57 -8q-95 0 -95 95 q0 55 27.5 90.5t69.5 35.5q35 0 55.5 -21t20.5 -56zM1319 722q-13 -23 -22 -62q-22 2 -31 -24t-25 -128h-56l3 14q22 130 29 199h51l-3 -33q14 21 25.5 29.5t28.5 4.5zM1506 763l-9 -57q-28 14 -50 14q-31 0 -51 -27.5t-20 -70.5q0 -30 13.5 -47t38.5 -17q21 0 48 13 l-10 -59q-28 -8 -50 -8q-45 0 -71.5 30.5t-26.5 82.5q0 70 35.5 114.5t91.5 44.5q26 0 61 -13zM1668 663q0 -18 -4 -42q-13 -79 -17 -113h-46l1 22q-20 -26 -59 -26q-23 0 -37 16t-14 42q0 39 25.5 60.5t72.5 21.5q15 0 23 -1q2 7 2 13q0 20 -36 20q-29 0 -59 -10q0 4 8 48 q38 11 67 11q73 0 73 -62zM1809 722q-14 -24 -21 -62q-23 2 -31.5 -23t-25.5 -129h-56l3 14q19 104 29 199h52q0 -11 -4 -33q15 21 26.5 29.5t27.5 4.5zM1950 770h56l-43 -262h-53l3 19q-23 -23 -52 -23q-31 0 -49.5 24t-18.5 64q0 53 27.5 92t64.5 39q31 0 53 -29z M2061 640q0 148 -72.5 273t-198 198t-273.5 73q-181 0 -328 -110q127 -116 171 -284h-50q-44 150 -158 253q-114 -103 -158 -253h-50q44 168 171 284q-147 110 -328 110q-148 0 -273.5 -73t-198 -198t-72.5 -273t72.5 -273t198 -198t273.5 -73q181 0 328 110 q-120 111 -165 264h50q46 -138 152 -233q106 95 152 233h50q-45 -153 -165 -264q147 -110 328 -110q148 0 273.5 73t198 198t72.5 273zM2304 1280v-1280q0 -52 -38 -90t-90 -38h-2048q-52 0 -90 38t-38 90v1280q0 52 38 90t90 38h2048q52 0 90 -38t38 -90z" />
+<glyph unicode="" horiz-adv-x="2304" d="M313 759q0 -51 -36 -84q-29 -26 -89 -26h-17v220h17q61 0 89 -27q36 -31 36 -83zM2089 824q0 -52 -64 -52h-19v101h20q63 0 63 -49zM380 759q0 74 -50 120.5t-129 46.5h-95v-333h95q74 0 119 38q60 51 60 128zM410 593h65v333h-65v-333zM730 694q0 40 -20.5 62t-75.5 42 q-29 10 -39.5 19t-10.5 23q0 16 13.5 26.5t34.5 10.5q29 0 53 -27l34 44q-41 37 -98 37q-44 0 -74 -27.5t-30 -67.5q0 -35 18 -55.5t64 -36.5q37 -13 45 -19q19 -12 19 -34q0 -20 -14 -33.5t-36 -13.5q-48 0 -71 44l-42 -40q44 -64 115 -64q51 0 83 30.5t32 79.5zM1008 604 v77q-37 -37 -78 -37q-49 0 -80.5 32.5t-31.5 82.5q0 48 31.5 81.5t77.5 33.5q43 0 81 -38v77q-40 20 -80 20q-74 0 -125.5 -50.5t-51.5 -123.5t51 -123.5t125 -50.5q42 0 81 19zM2240 0v527q-65 -40 -144.5 -84t-237.5 -117t-329.5 -137.5t-417.5 -134.5t-504 -118h1569 q26 0 45 19t19 45zM1389 757q0 75 -53 128t-128 53t-128 -53t-53 -128t53 -128t128 -53t128 53t53 128zM1541 584l144 342h-71l-90 -224l-89 224h-71l142 -342h35zM1714 593h184v56h-119v90h115v56h-115v74h119v57h-184v-333zM2105 593h80l-105 140q76 16 76 94q0 47 -31 73 t-87 26h-97v-333h65v133h9zM2304 1274v-1268q0 -56 -38.5 -95t-93.5 -39h-2040q-55 0 -93.5 39t-38.5 95v1268q0 56 38.5 95t93.5 39h2040q55 0 93.5 -39t38.5 -95z" />
+<glyph unicode="" horiz-adv-x="2304" d="M119 854h89l-45 108zM740 328l74 79l-70 79h-163v-49h142v-55h-142v-54h159zM898 406l99 -110v217zM1186 453q0 33 -40 33h-84v-69h83q41 0 41 36zM1475 457q0 29 -42 29h-82v-61h81q43 0 43 32zM1197 923q0 29 -42 29h-82v-60h81q43 0 43 31zM1656 854h89l-44 108z M699 1009v-271h-66v212l-94 -212h-57l-94 212v-212h-132l-25 60h-135l-25 -60h-70l116 271h96l110 -257v257h106l85 -184l77 184h108zM1255 453q0 -20 -5.5 -35t-14 -25t-22.5 -16.5t-26 -10t-31.5 -4.5t-31.5 -1t-32.5 0.5t-29.5 0.5v-91h-126l-80 90l-83 -90h-256v271h260 l80 -89l82 89h207q109 0 109 -89zM964 794v-56h-217v271h217v-57h-152v-49h148v-55h-148v-54h152zM2304 235v-229q0 -55 -38.5 -94.5t-93.5 -39.5h-2040q-55 0 -93.5 39.5t-38.5 94.5v678h111l25 61h55l25 -61h218v46l19 -46h113l20 47v-47h541v99l10 1q10 0 10 -14v-86h279 v23q23 -12 55 -18t52.5 -6.5t63 0.5t51.5 1l25 61h56l25 -61h227v58l34 -58h182v378h-180v-44l-25 44h-185v-44l-23 44h-249q-69 0 -109 -22v22h-172v-22q-24 22 -73 22h-628l-43 -97l-43 97h-198v-44l-22 44h-169l-78 -179v391q0 55 38.5 94.5t93.5 39.5h2040 q55 0 93.5 -39.5t38.5 -94.5v-678h-120q-51 0 -81 -22v22h-177q-55 0 -78 -22v22h-316v-22q-31 22 -87 22h-209v-22q-23 22 -91 22h-234l-54 -58l-50 58h-349v-378h343l55 59l52 -59h211v89h21q59 0 90 13v-102h174v99h8q8 0 10 -2t2 -10v-87h529q57 0 88 24v-24h168 q60 0 95 17zM1546 469q0 -23 -12 -43t-34 -29q25 -9 34 -26t9 -46v-54h-65v45q0 33 -12 43.5t-46 10.5h-69v-99h-65v271h154q48 0 77 -15t29 -58zM1269 936q0 -24 -12.5 -44t-33.5 -29q26 -9 34.5 -25.5t8.5 -46.5v-53h-65q0 9 0.5 26.5t0 25t-3 18.5t-8.5 16t-17.5 8.5 t-29.5 3.5h-70v-98h-64v271l153 -1q49 0 78 -14.5t29 -57.5zM1798 327v-56h-216v271h216v-56h-151v-49h148v-55h-148v-54zM1372 1009v-271h-66v271h66zM2065 357q0 -86 -102 -86h-126v58h126q34 0 34 25q0 16 -17 21t-41.5 5t-49.5 3.5t-42 22.5t-17 55q0 39 26 60t66 21 h130v-57h-119q-36 0 -36 -25q0 -16 17.5 -20.5t42 -4t49 -2.5t42 -21.5t17.5 -54.5zM2304 407v-101q-24 -35 -88 -35h-125v58h125q33 0 33 25q0 13 -12.5 19t-31 5.5t-40 2t-40 8t-31 24t-12.5 48.5q0 39 26.5 60t66.5 21h129v-57h-118q-36 0 -36 -25q0 -20 29 -22t68.5 -5 t56.5 -26zM2139 1008v-270h-92l-122 203v-203h-132l-26 60h-134l-25 -60h-75q-129 0 -129 133q0 138 133 138h63v-59q-7 0 -28 1t-28.5 0.5t-23 -2t-21.5 -6.5t-14.5 -13.5t-11.5 -23t-3 -33.5q0 -38 13.5 -58t49.5 -20h29l92 213h97l109 -256v256h99l114 -188v188h66z" />
+<glyph unicode="" horiz-adv-x="2304" d="M745 630q0 -37 -25.5 -61.5t-62.5 -24.5q-29 0 -46.5 16t-17.5 44q0 37 25 62.5t62 25.5q28 0 46.5 -16.5t18.5 -45.5zM1530 779q0 -42 -22 -57t-66 -15l-32 -1l17 107q2 11 13 11h18q22 0 35 -2t25 -12.5t12 -30.5zM1881 630q0 -36 -25.5 -61t-61.5 -25q-29 0 -47 16 t-18 44q0 37 25 62.5t62 25.5q28 0 46.5 -16.5t18.5 -45.5zM513 801q0 59 -38.5 85.5t-100.5 26.5h-160q-19 0 -21 -19l-65 -408q-1 -6 3 -11t10 -5h76q20 0 22 19l18 110q1 8 7 13t15 6.5t17 1.5t19 -1t14 -1q86 0 135 48.5t49 134.5zM822 489l41 261q1 6 -3 11t-10 5h-76 q-14 0 -17 -33q-27 40 -95 40q-72 0 -122.5 -54t-50.5 -127q0 -59 34.5 -94t92.5 -35q28 0 58 12t48 32q-4 -12 -4 -21q0 -16 13 -16h69q19 0 22 19zM1269 752q0 5 -4 9.5t-9 4.5h-77q-11 0 -18 -10l-106 -156l-44 150q-5 16 -22 16h-75q-5 0 -9 -4.5t-4 -9.5q0 -2 19.5 -59 t42 -123t23.5 -70q-82 -112 -82 -120q0 -13 13 -13h77q11 0 18 10l255 368q2 2 2 7zM1649 801q0 59 -38.5 85.5t-100.5 26.5h-159q-20 0 -22 -19l-65 -408q-1 -6 3 -11t10 -5h82q12 0 16 13l18 116q1 8 7 13t15 6.5t17 1.5t19 -1t14 -1q86 0 135 48.5t49 134.5zM1958 489 l41 261q1 6 -3 11t-10 5h-76q-14 0 -17 -33q-26 40 -95 40q-72 0 -122.5 -54t-50.5 -127q0 -59 34.5 -94t92.5 -35q29 0 59 12t47 32q0 -1 -2 -9t-2 -12q0 -16 13 -16h69q19 0 22 19zM2176 898v1q0 14 -13 14h-74q-11 0 -13 -11l-65 -416l-1 -2q0 -5 4 -9.5t10 -4.5h66 q19 0 21 19zM392 764q-5 -35 -26 -46t-60 -11l-33 -1l17 107q2 11 13 11h19q40 0 58 -11.5t12 -48.5zM2304 1280v-1280q0 -52 -38 -90t-90 -38h-2048q-52 0 -90 38t-38 90v1280q0 52 38 90t90 38h2048q52 0 90 -38t38 -90z" />
+<glyph unicode="" horiz-adv-x="2304" d="M1597 633q0 -69 -21 -106q-19 -35 -52 -35q-23 0 -41 9v224q29 30 57 30q57 0 57 -122zM2035 669h-110q6 98 56 98q51 0 54 -98zM476 534q0 59 -33 91.5t-101 57.5q-36 13 -52 24t-16 25q0 26 38 26q58 0 124 -33l18 112q-67 32 -149 32q-77 0 -123 -38q-48 -39 -48 -109 q0 -58 32.5 -90.5t99.5 -56.5q39 -14 54.5 -25.5t15.5 -27.5q0 -31 -48 -31q-29 0 -70 12.5t-72 30.5l-18 -113q72 -41 168 -41q81 0 129 37q51 41 51 117zM771 749l19 111h-96v135l-129 -21l-18 -114l-46 -8l-17 -103h62v-219q0 -84 44 -120q38 -30 111 -30q32 0 79 11v118 q-32 -7 -44 -7q-42 0 -42 50v197h77zM1087 724v139q-15 3 -28 3q-32 0 -55.5 -16t-33.5 -46l-10 56h-131v-471h150v306q26 31 82 31q16 0 26 -2zM1124 389h150v471h-150v-471zM1746 638q0 122 -45 179q-40 52 -111 52q-64 0 -117 -56l-8 47h-132v-645l150 25v151 q36 -11 68 -11q83 0 134 56q61 65 61 202zM1278 986q0 33 -23 56t-56 23t-56 -23t-23 -56t23 -56.5t56 -23.5t56 23.5t23 56.5zM2176 629q0 113 -48 176q-50 64 -144 64q-96 0 -151.5 -66t-55.5 -180q0 -128 63 -188q55 -55 161 -55q101 0 160 40l-16 103q-57 -31 -128 -31 q-43 0 -63 19q-23 19 -28 66h248q2 14 2 52zM2304 1280v-1280q0 -52 -38 -90t-90 -38h-2048q-52 0 -90 38t-38 90v1280q0 52 38 90t90 38h2048q52 0 90 -38t38 -90z" />
+<glyph unicode="" horiz-adv-x="2048" d="M1558 684q61 -356 298 -556q0 -52 -38 -90t-90 -38h-448q0 -106 -75 -181t-181 -75t-180.5 74.5t-75.5 180.5zM1024 -176q16 0 16 16t-16 16q-59 0 -101.5 42.5t-42.5 101.5q0 16 -16 16t-16 -16q0 -73 51.5 -124.5t124.5 -51.5zM2026 1424q8 -10 7.5 -23.5t-10.5 -22.5 l-1872 -1622q-10 -8 -23.5 -7t-21.5 11l-84 96q-8 10 -7.5 23.5t10.5 21.5l186 161q-19 32 -19 66q50 42 91 88t85 119.5t74.5 158.5t50 206t19.5 260q0 152 117 282.5t307 158.5q-8 19 -8 39q0 40 28 68t68 28t68 -28t28 -68q0 -20 -8 -39q124 -18 219 -82.5t148 -157.5 l418 363q10 8 23.5 7t21.5 -11z" />
+<glyph unicode="" horiz-adv-x="2048" d="M1040 -160q0 16 -16 16q-59 0 -101.5 42.5t-42.5 101.5q0 16 -16 16t-16 -16q0 -73 51.5 -124.5t124.5 -51.5q16 0 16 16zM503 315l877 760q-42 88 -132.5 146.5t-223.5 58.5q-93 0 -169.5 -31.5t-121.5 -80.5t-69 -103t-24 -105q0 -384 -137 -645zM1856 128 q0 -52 -38 -90t-90 -38h-448q0 -106 -75 -181t-181 -75t-180.5 74.5t-75.5 180.5l149 129h757q-166 187 -227 459l111 97q61 -356 298 -556zM1942 1520l84 -96q8 -10 7.5 -23.5t-10.5 -22.5l-1872 -1622q-10 -8 -23.5 -7t-21.5 11l-84 96q-8 10 -7.5 23.5t10.5 21.5l186 161 q-19 32 -19 66q50 42 91 88t85 119.5t74.5 158.5t50 206t19.5 260q0 152 117 282.5t307 158.5q-8 19 -8 39q0 40 28 68t68 28t68 -28t28 -68q0 -20 -8 -39q124 -18 219 -82.5t148 -157.5l418 363q10 8 23.5 7t21.5 -11z" />
+<glyph unicode="" horiz-adv-x="1408" d="M512 160v704q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-704q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM768 160v704q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-704q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM1024 160v704q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-704 q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM480 1152h448l-48 117q-7 9 -17 11h-317q-10 -2 -17 -11zM1408 1120v-64q0 -14 -9 -23t-23 -9h-96v-948q0 -83 -47 -143.5t-113 -60.5h-832q-66 0 -113 58.5t-47 141.5v952h-96q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h309l70 167 q15 37 54 63t79 26h320q40 0 79 -26t54 -63l70 -167h309q14 0 23 -9t9 -23z" />
+<glyph unicode="" d="M1150 462v-109q0 -50 -36.5 -89t-94 -60.5t-118 -32.5t-117.5 -11q-205 0 -342.5 139t-137.5 346q0 203 136 339t339 136q34 0 75.5 -4.5t93 -18t92.5 -34t69 -56.5t28 -81v-109q0 -16 -16 -16h-118q-16 0 -16 16v70q0 43 -65.5 67.5t-137.5 24.5q-140 0 -228.5 -91.5 t-88.5 -237.5q0 -151 91.5 -249.5t233.5 -98.5q68 0 138 24t70 66v70q0 7 4.5 11.5t10.5 4.5h119q6 0 11 -4.5t5 -11.5zM768 1280q-130 0 -248.5 -51t-204 -136.5t-136.5 -204t-51 -248.5t51 -248.5t136.5 -204t204 -136.5t248.5 -51t248.5 51t204 136.5t136.5 204t51 248.5 t-51 248.5t-136.5 204t-204 136.5t-248.5 51zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+<glyph unicode="" d="M972 761q0 108 -53.5 169t-147.5 61q-63 0 -124 -30.5t-110 -84.5t-79.5 -137t-30.5 -180q0 -112 53.5 -173t150.5 -61q96 0 176 66.5t122.5 166t42.5 203.5zM1536 640q0 -111 -37 -197t-98.5 -135t-131.5 -74.5t-145 -27.5q-6 0 -15.5 -0.5t-16.5 -0.5q-95 0 -142 53 q-28 33 -33 83q-52 -66 -131.5 -110t-173.5 -44q-161 0 -249.5 95.5t-88.5 269.5q0 157 66 290t179 210.5t246 77.5q87 0 155 -35.5t106 -99.5l2 19l11 56q1 6 5.5 12t9.5 6h118q5 0 13 -11q5 -5 3 -16l-120 -614q-5 -24 -5 -48q0 -39 12.5 -52t44.5 -13q28 1 57 5.5t73 24 t77 50t57 89.5t24 137q0 292 -174 466t-466 174q-130 0 -248.5 -51t-204 -136.5t-136.5 -204t-51 -248.5t51 -248.5t136.5 -204t204 -136.5t248.5 -51q228 0 405 144q11 9 24 8t21 -12l41 -49q8 -12 7 -24q-2 -13 -12 -22q-102 -83 -227.5 -128t-258.5 -45q-156 0 -298 61 t-245 164t-164 245t-61 298t61 298t164 245t245 164t298 61q344 0 556 -212t212 -556z" />
+<glyph unicode="" horiz-adv-x="1792" d="M1698 1442q94 -94 94 -226.5t-94 -225.5l-225 -223l104 -104q10 -10 10 -23t-10 -23l-210 -210q-10 -10 -23 -10t-23 10l-105 105l-603 -603q-37 -37 -90 -37h-203l-256 -128l-64 64l128 256v203q0 53 37 90l603 603l-105 105q-10 10 -10 23t10 23l210 210q10 10 23 10 t23 -10l104 -104l223 225q93 94 225.5 94t226.5 -94zM512 64l576 576l-192 192l-576 -576v-192h192z" />
+<glyph unicode="" horiz-adv-x="1792" d="M1615 1536q70 0 122.5 -46.5t52.5 -116.5q0 -63 -45 -151q-332 -629 -465 -752q-97 -91 -218 -91q-126 0 -216.5 92.5t-90.5 219.5q0 128 92 212l638 579q59 54 130 54zM706 502q39 -76 106.5 -130t150.5 -76l1 -71q4 -213 -129.5 -347t-348.5 -134q-123 0 -218 46.5 t-152.5 127.5t-86.5 183t-29 220q7 -5 41 -30t62 -44.5t59 -36.5t46 -17q41 0 55 37q25 66 57.5 112.5t69.5 76t88 47.5t103 25.5t125 10.5z" />
+<glyph unicode="" horiz-adv-x="1792" d="M1792 128v-384h-1792v384q45 0 85 14t59 27.5t47 37.5q30 27 51.5 38t56.5 11t55.5 -11t52.5 -38q29 -25 47 -38t58 -27t86 -14q45 0 85 14.5t58 27t48 37.5q21 19 32.5 27t31 15t43.5 7q35 0 56.5 -11t51.5 -38q28 -24 47 -37.5t59 -27.5t85 -14t85 14t59 27.5t47 37.5 q30 27 51.5 38t56.5 11q34 0 55.5 -11t51.5 -38q28 -24 47 -37.5t59 -27.5t85 -14zM1792 448v-192q-35 0 -55.5 11t-52.5 38q-29 25 -47 38t-58 27t-85 14q-46 0 -86 -14t-58 -27t-47 -38q-22 -19 -33 -27t-31 -15t-44 -7q-35 0 -56.5 11t-51.5 38q-29 25 -47 38t-58 27 t-86 14q-45 0 -85 -14.5t-58 -27t-48 -37.5q-21 -19 -32.5 -27t-31 -15t-43.5 -7q-35 0 -56.5 11t-51.5 38q-28 24 -47 37.5t-59 27.5t-85 14q-46 0 -86 -14t-58 -27t-47 -38q-30 -27 -51.5 -38t-56.5 -11v192q0 80 56 136t136 56h64v448h256v-448h256v448h256v-448h256v448 h256v-448h64q80 0 136 -56t56 -136zM512 1312q0 -77 -36 -118.5t-92 -41.5q-53 0 -90.5 37.5t-37.5 90.5q0 29 9.5 51t23.5 34t31 28t31 31.5t23.5 44.5t9.5 67q38 0 83 -74t45 -150zM1024 1312q0 -77 -36 -118.5t-92 -41.5q-53 0 -90.5 37.5t-37.5 90.5q0 29 9.5 51 t23.5 34t31 28t31 31.5t23.5 44.5t9.5 67q38 0 83 -74t45 -150zM1536 1312q0 -77 -36 -118.5t-92 -41.5q-53 0 -90.5 37.5t-37.5 90.5q0 29 9.5 51t23.5 34t31 28t31 31.5t23.5 44.5t9.5 67q38 0 83 -74t45 -150z" />
+<glyph unicode="" horiz-adv-x="2048" d="M2048 0v-128h-2048v1536h128v-1408h1920zM1664 1024l256 -896h-1664v576l448 576l576 -576z" />
+<glyph unicode="" horiz-adv-x="1792" d="M768 646l546 -546q-106 -108 -247.5 -168t-298.5 -60q-209 0 -385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103v-762zM955 640h773q0 -157 -60 -298.5t-168 -247.5zM1664 768h-768v768q209 0 385.5 -103t279.5 -279.5t103 -385.5z" />
+<glyph unicode="" horiz-adv-x="2048" d="M2048 0v-128h-2048v1536h128v-1408h1920zM1920 1248v-435q0 -21 -19.5 -29.5t-35.5 7.5l-121 121l-633 -633q-10 -10 -23 -10t-23 10l-233 233l-416 -416l-192 192l585 585q10 10 23 10t23 -10l233 -233l464 464l-121 121q-16 16 -7.5 35.5t29.5 19.5h435q14 0 23 -9 t9 -23z" />
+<glyph unicode="" horiz-adv-x="1792" d="M1292 832q0 -6 10 -41q10 -29 25 -49.5t41 -34t44 -20t55 -16.5q325 -91 325 -332q0 -146 -105.5 -242.5t-254.5 -96.5q-59 0 -111.5 18.5t-91.5 45.5t-77 74.5t-63 87.5t-53.5 103.5t-43.5 103t-39.5 106.5t-35.5 95q-32 81 -61.5 133.5t-73.5 96.5t-104 64t-142 20 q-96 0 -183 -55.5t-138 -144.5t-51 -185q0 -160 106.5 -279.5t263.5 -119.5q177 0 258 95q56 63 83 116l84 -152q-15 -34 -44 -70l1 -1q-131 -152 -388 -152q-147 0 -269.5 79t-190.5 207.5t-68 274.5q0 105 43.5 206t116 176.5t172 121.5t204.5 46q87 0 159 -19t123.5 -50 t95 -80t72.5 -99t58.5 -117t50.5 -124.5t50 -130.5t55 -127q96 -200 233 -200q81 0 138.5 48.5t57.5 128.5q0 42 -19 72t-50.5 46t-72.5 31.5t-84.5 27t-87.5 34t-81 52t-65 82t-39 122.5q-3 16 -3 33q0 110 87.5 192t198.5 78q78 -3 120.5 -14.5t90.5 -53.5h-1 q12 -11 23 -24.5t26 -36t19 -27.5l-129 -99q-26 49 -54 70v1q-23 21 -97 21q-49 0 -84 -33t-35 -83z" />
+<glyph unicode="" d="M1432 484q0 173 -234 239q-35 10 -53 16.5t-38 25t-29 46.5q0 2 -2 8.5t-3 12t-1 7.5q0 36 24.5 59.5t60.5 23.5q54 0 71 -15h-1q20 -15 39 -51l93 71q-39 54 -49 64q-33 29 -67.5 39t-85.5 10q-80 0 -142 -57.5t-62 -137.5q0 -7 2 -23q16 -96 64.5 -140t148.5 -73 q29 -8 49 -15.5t45 -21.5t38.5 -34.5t13.5 -46.5v-5q1 -58 -40.5 -93t-100.5 -35q-97 0 -167 144q-23 47 -51.5 121.5t-48 125.5t-54 110.5t-74 95.5t-103.5 60.5t-147 24.5q-101 0 -192 -56t-144 -148t-50 -192v-1q4 -108 50.5 -199t133.5 -147.5t196 -56.5q186 0 279 110 q20 27 31 51l-60 109q-42 -80 -99 -116t-146 -36q-115 0 -191 87t-76 204q0 105 82 189t186 84q112 0 170 -53.5t104 -172.5q8 -21 25.5 -68.5t28.5 -76.5t31.5 -74.5t38.5 -74t45.5 -62.5t55.5 -53.5t66 -33t80 -13.5q107 0 183 69.5t76 174.5zM1536 1120v-960 q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
+<glyph unicode="" horiz-adv-x="2048" d="M1152 640q0 104 -40.5 198.5t-109.5 163.5t-163.5 109.5t-198.5 40.5t-198.5 -40.5t-163.5 -109.5t-109.5 -163.5t-40.5 -198.5t40.5 -198.5t109.5 -163.5t163.5 -109.5t198.5 -40.5t198.5 40.5t163.5 109.5t109.5 163.5t40.5 198.5zM1920 640q0 104 -40.5 198.5 t-109.5 163.5t-163.5 109.5t-198.5 40.5h-386q119 -90 188.5 -224t69.5 -288t-69.5 -288t-188.5 -224h386q104 0 198.5 40.5t163.5 109.5t109.5 163.5t40.5 198.5zM2048 640q0 -130 -51 -248.5t-136.5 -204t-204 -136.5t-248.5 -51h-768q-130 0 -248.5 51t-204 136.5 t-136.5 204t-51 248.5t51 248.5t136.5 204t204 136.5t248.5 51h768q130 0 248.5 -51t204 -136.5t136.5 -204t51 -248.5z" />
+<glyph unicode="" horiz-adv-x="2048" d="M0 640q0 130 51 248.5t136.5 204t204 136.5t248.5 51h768q130 0 248.5 -51t204 -136.5t136.5 -204t51 -248.5t-51 -248.5t-136.5 -204t-204 -136.5t-248.5 -51h-768q-130 0 -248.5 51t-204 136.5t-136.5 204t-51 248.5zM1408 128q104 0 198.5 40.5t163.5 109.5 t109.5 163.5t40.5 198.5t-40.5 198.5t-109.5 163.5t-163.5 109.5t-198.5 40.5t-198.5 -40.5t-163.5 -109.5t-109.5 -163.5t-40.5 -198.5t40.5 -198.5t109.5 -163.5t163.5 -109.5t198.5 -40.5z" />
+<glyph unicode="" horiz-adv-x="2304" d="M762 384h-314q-40 0 -57.5 35t6.5 67l188 251q-65 31 -137 31q-132 0 -226 -94t-94 -226t94 -226t226 -94q115 0 203 72.5t111 183.5zM576 512h186q-18 85 -75 148zM1056 512l288 384h-480l-99 -132q105 -103 126 -252h165zM2176 448q0 132 -94 226t-226 94 q-60 0 -121 -24l174 -260q15 -23 10 -49t-27 -40q-15 -11 -36 -11q-35 0 -53 29l-174 260q-93 -95 -93 -225q0 -132 94 -226t226 -94t226 94t94 226zM2304 448q0 -185 -131.5 -316.5t-316.5 -131.5t-316.5 131.5t-131.5 316.5q0 97 39.5 183.5t109.5 149.5l-65 98l-353 -469 q-18 -26 -51 -26h-197q-23 -164 -149 -274t-294 -110q-185 0 -316.5 131.5t-131.5 316.5t131.5 316.5t316.5 131.5q114 0 215 -55l137 183h-224q-26 0 -45 19t-19 45t19 45t45 19h384v-128h435l-85 128h-222q-26 0 -45 19t-19 45t19 45t45 19h256q33 0 53 -28l267 -400 q91 44 192 44q185 0 316.5 -131.5t131.5 -316.5z" />
+<glyph unicode="" d="M384 320q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1408 320q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1362 716l-72 384q-5 23 -22.5 37.5t-40.5 14.5 h-918q-23 0 -40.5 -14.5t-22.5 -37.5l-72 -384q-5 -30 14 -53t49 -23h1062q30 0 49 23t14 53zM1136 1328q0 20 -14 34t-34 14h-640q-20 0 -34 -14t-14 -34t14 -34t34 -14h640q20 0 34 14t14 34zM1536 603v-603h-128v-128q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5 t-37.5 90.5v128h-768v-128q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5t-37.5 90.5v128h-128v603q0 112 25 223l103 454q9 78 97.5 137t230 89t312.5 30t312.5 -30t230 -89t97.5 -137l105 -454q23 -102 23 -223z" />
+<glyph unicode="" horiz-adv-x="2048" d="M1463 704q0 -35 -25 -60.5t-61 -25.5h-702q-36 0 -61 25.5t-25 60.5t25 60.5t61 25.5h702q36 0 61 -25.5t25 -60.5zM1677 704q0 86 -23 170h-982q-36 0 -61 25t-25 60q0 36 25 61t61 25h908q-88 143 -235 227t-320 84q-177 0 -327.5 -87.5t-238 -237.5t-87.5 -327 q0 -86 23 -170h982q36 0 61 -25t25 -60q0 -36 -25 -61t-61 -25h-908q88 -143 235.5 -227t320.5 -84q132 0 253 51.5t208 139t139 208t52 253.5zM2048 959q0 -35 -25 -60t-61 -25h-131q17 -85 17 -170q0 -167 -65.5 -319.5t-175.5 -263t-262.5 -176t-319.5 -65.5 q-246 0 -448.5 133t-301.5 350h-189q-36 0 -61 25t-25 61q0 35 25 60t61 25h132q-17 85 -17 170q0 167 65.5 319.5t175.5 263t262.5 176t320.5 65.5q245 0 447.5 -133t301.5 -350h188q36 0 61 -25t25 -61z" />
+<glyph unicode="" horiz-adv-x="1280" d="M953 1158l-114 -328l117 -21q165 451 165 518q0 56 -38 56q-57 0 -130 -225zM654 471l33 -88q37 42 71 67l-33 5.5t-38.5 7t-32.5 8.5zM362 1367q0 -98 159 -521q18 10 49 10q15 0 75 -5l-121 351q-75 220 -123 220q-19 0 -29 -17.5t-10 -37.5zM283 608q0 -36 51.5 -119 t117.5 -153t100 -70q14 0 25.5 13t11.5 27q0 24 -32 102q-13 32 -32 72t-47.5 89t-61.5 81t-62 32q-20 0 -45.5 -27t-25.5 -47zM125 273q0 -41 25 -104q59 -145 183.5 -227t281.5 -82q227 0 382 170q152 169 152 427q0 43 -1 67t-11.5 62t-30.5 56q-56 49 -211.5 75.5 t-270.5 26.5q-37 0 -49 -11q-12 -5 -12 -35q0 -34 21.5 -60t55.5 -40t77.5 -23.5t87.5 -11.5t85 -4t70 0h23q24 0 40 -19q15 -19 19 -55q-28 -28 -96 -54q-61 -22 -93 -46q-64 -46 -108.5 -114t-44.5 -137q0 -31 18.5 -88.5t18.5 -87.5l-3 -12q-4 -12 -4 -14 q-137 10 -146 216q-8 -2 -41 -2q2 -7 2 -21q0 -53 -40.5 -89.5t-94.5 -36.5q-82 0 -166.5 78t-84.5 159q0 34 33 67q52 -64 60 -76q77 -104 133 -104q12 0 26.5 8.5t14.5 20.5q0 34 -87.5 145t-116.5 111q-43 0 -70 -44.5t-27 -90.5zM11 264q0 101 42.5 163t136.5 88 q-28 74 -28 104q0 62 61 123t122 61q29 0 70 -15q-163 462 -163 567q0 80 41 130.5t119 50.5q131 0 325 -581q6 -17 8 -23q6 16 29 79.5t43.5 118.5t54 127.5t64.5 123t70.5 86.5t76.5 36q71 0 112 -49t41 -122q0 -108 -159 -550q61 -15 100.5 -46t58.5 -78t26 -93.5 t7 -110.5q0 -150 -47 -280t-132 -225t-211 -150t-278 -55q-111 0 -223 42q-149 57 -258 191.5t-109 286.5z" />
+<glyph unicode="" horiz-adv-x="2048" d="M785 528h207q-14 -158 -98.5 -248.5t-214.5 -90.5q-162 0 -254.5 116t-92.5 316q0 194 93 311.5t233 117.5q148 0 232 -87t97 -247h-203q-5 64 -35.5 99t-81.5 35q-57 0 -88.5 -60.5t-31.5 -177.5q0 -48 5 -84t18 -69.5t40 -51.5t66 -18q95 0 109 139zM1497 528h206 q-14 -158 -98 -248.5t-214 -90.5q-162 0 -254.5 116t-92.5 316q0 194 93 311.5t233 117.5q148 0 232 -87t97 -247h-204q-4 64 -35 99t-81 35q-57 0 -88.5 -60.5t-31.5 -177.5q0 -48 5 -84t18 -69.5t39.5 -51.5t65.5 -18q49 0 76.5 38t33.5 101zM1856 647q0 207 -15.5 307 t-60.5 161q-6 8 -13.5 14t-21.5 15t-16 11q-86 63 -697 63q-625 0 -710 -63q-5 -4 -17.5 -11.5t-21 -14t-14.5 -14.5q-45 -60 -60 -159.5t-15 -308.5q0 -208 15 -307.5t60 -160.5q6 -8 15 -15t20.5 -14t17.5 -12q44 -33 239.5 -49t470.5 -16q610 0 697 65q5 4 17 11t20.5 14 t13.5 16q46 60 61 159t15 309zM2048 1408v-1536h-2048v1536h2048z" />
+<glyph unicode="" d="M992 912v-496q0 -14 -9 -23t-23 -9h-160q-14 0 -23 9t-9 23v496q0 112 -80 192t-192 80h-272v-1152q0 -14 -9 -23t-23 -9h-160q-14 0 -23 9t-9 23v1344q0 14 9 23t23 9h464q135 0 249 -66.5t180.5 -180.5t66.5 -249zM1376 1376v-880q0 -135 -66.5 -249t-180.5 -180.5 t-249 -66.5h-464q-14 0 -23 9t-9 23v960q0 14 9 23t23 9h160q14 0 23 -9t9 -23v-768h272q112 0 192 80t80 192v880q0 14 9 23t23 9h160q14 0 23 -9t9 -23z" />
+<glyph unicode="" d="M1311 694v-114q0 -24 -13.5 -38t-37.5 -14h-202q-24 0 -38 14t-14 38v114q0 24 14 38t38 14h202q24 0 37.5 -14t13.5 -38zM821 464v250q0 53 -32.5 85.5t-85.5 32.5h-133q-68 0 -96 -52q-28 52 -96 52h-130q-53 0 -85.5 -32.5t-32.5 -85.5v-250q0 -22 21 -22h55 q22 0 22 22v230q0 24 13.5 38t38.5 14h94q24 0 38 -14t14 -38v-230q0 -22 21 -22h54q22 0 22 22v230q0 24 14 38t38 14h97q24 0 37.5 -14t13.5 -38v-230q0 -22 22 -22h55q21 0 21 22zM1410 560v154q0 53 -33 85.5t-86 32.5h-264q-53 0 -86 -32.5t-33 -85.5v-410 q0 -21 22 -21h55q21 0 21 21v180q31 -42 94 -42h191q53 0 86 32.5t33 85.5zM1536 1176v-1072q0 -96 -68 -164t-164 -68h-1072q-96 0 -164 68t-68 164v1072q0 96 68 164t164 68h1072q96 0 164 -68t68 -164z" />
+<glyph unicode="" d="M915 450h-294l147 551zM1001 128h311l-324 1024h-440l-324 -1024h311l383 314zM1536 1120v-960q0 -118 -85 -203t-203 -85h-960q-118 0 -203 85t-85 203v960q0 118 85 203t203 85h960q118 0 203 -85t85 -203z" />
+<glyph unicode="" horiz-adv-x="2048" d="M2048 641q0 -21 -13 -36.5t-33 -19.5l-205 -356q3 -9 3 -18q0 -20 -12.5 -35.5t-32.5 -19.5l-193 -337q3 -8 3 -16q0 -23 -16.5 -40t-40.5 -17q-25 0 -41 18h-400q-17 -20 -43 -20t-43 20h-399q-17 -20 -43 -20q-23 0 -40 16.5t-17 40.5q0 8 4 20l-193 335 q-20 4 -32.5 19.5t-12.5 35.5q0 9 3 18l-206 356q-20 5 -32.5 20.5t-12.5 35.5q0 21 13.5 36.5t33.5 19.5l199 344q0 1 -0.5 3t-0.5 3q0 36 34 51l209 363q-4 10 -4 18q0 24 17 40.5t40 16.5q26 0 44 -21h396q16 21 43 21t43 -21h398q18 21 44 21q23 0 40 -16.5t17 -40.5 q0 -6 -4 -18l207 -358q23 -1 39 -17.5t16 -38.5q0 -13 -7 -27l187 -324q19 -4 31.5 -19.5t12.5 -35.5zM1063 -158h389l-342 354h-143l-342 -354h360q18 16 39 16t39 -16zM112 654q1 -4 1 -13q0 -10 -2 -15l208 -360q2 0 4.5 -1t5.5 -2.5l5 -2.5l188 199v347l-187 194 q-13 -8 -29 -10zM986 1438h-388l190 -200l554 200h-280q-16 -16 -38 -16t-38 16zM1689 226q1 6 5 11l-64 68l-17 -79h76zM1583 226l22 105l-252 266l-296 -307l63 -64h463zM1495 -142l16 28l65 310h-427l333 -343q8 4 13 5zM578 -158h5l342 354h-373v-335l4 -6q14 -5 22 -13 zM552 226h402l64 66l-309 321l-157 -166v-221zM359 226h163v189l-168 -177q4 -8 5 -12zM358 1051q0 -1 0.5 -2t0.5 -2q0 -16 -8 -29l171 -177v269zM552 1121v-311l153 -157l297 314l-223 236zM556 1425l-4 -8v-264l205 74l-191 201q-6 -2 -10 -3zM1447 1438h-16l-621 -224 l213 -225zM1023 946l-297 -315l311 -319l296 307zM688 634l-136 141v-284zM1038 270l-42 -44h85zM1374 618l238 -251l132 624l-3 5l-1 1zM1718 1018q-8 13 -8 29v2l-216 376q-5 1 -13 5l-437 -463l310 -327zM522 1142v223l-163 -282zM522 196h-163l163 -283v283zM1607 196 l-48 -227l130 227h-82zM1729 266l207 361q-2 10 -2 14q0 1 3 16l-171 296l-129 -612l77 -82q5 3 15 7z" />
+<glyph unicode="" d="M0 856q0 131 91.5 226.5t222.5 95.5h742l352 358v-1470q0 -132 -91.5 -227t-222.5 -95h-780q-131 0 -222.5 95t-91.5 227v790zM1232 102l-176 180v425q0 46 -32 79t-78 33h-484q-46 0 -78 -33t-32 -79v-492q0 -46 32.5 -79.5t77.5 -33.5h770z" />
+<glyph unicode="" d="M934 1386q-317 -121 -556 -362.5t-358 -560.5q-20 89 -20 176q0 208 102.5 384.5t278.5 279t384 102.5q82 0 169 -19zM1203 1267q93 -65 164 -155q-389 -113 -674.5 -400.5t-396.5 -676.5q-93 72 -155 162q112 386 395 671t667 399zM470 -67q115 356 379.5 622t619.5 384 q40 -92 54 -195q-292 -120 -516 -345t-343 -518q-103 14 -194 52zM1536 -125q-193 50 -367 115q-135 -84 -290 -107q109 205 274 370.5t369 275.5q-21 -152 -101 -284q65 -175 115 -370z" />
+<glyph unicode="" horiz-adv-x="2048" d="M1893 1144l155 -1272q-131 0 -257 57q-200 91 -393 91q-226 0 -374 -148q-148 148 -374 148q-193 0 -393 -91q-128 -57 -252 -57h-5l155 1272q224 127 482 127q233 0 387 -106q154 106 387 106q258 0 482 -127zM1398 157q129 0 232 -28.5t260 -93.5l-124 1021 q-171 78 -368 78q-224 0 -374 -141q-150 141 -374 141q-197 0 -368 -78l-124 -1021q105 43 165.5 65t148.5 39.5t178 17.5q202 0 374 -108q172 108 374 108zM1438 191l-55 907q-211 -4 -359 -155q-152 155 -374 155q-176 0 -336 -66l-114 -941q124 51 228.5 76t221.5 25 q209 0 374 -102q172 107 374 102z" />
+<glyph unicode="" horiz-adv-x="2048" d="M1500 165v733q0 21 -15 36t-35 15h-93q-20 0 -35 -15t-15 -36v-733q0 -20 15 -35t35 -15h93q20 0 35 15t15 35zM1216 165v531q0 20 -15 35t-35 15h-101q-20 0 -35 -15t-15 -35v-531q0 -20 15 -35t35 -15h101q20 0 35 15t15 35zM924 165v429q0 20 -15 35t-35 15h-101 q-20 0 -35 -15t-15 -35v-429q0 -20 15 -35t35 -15h101q20 0 35 15t15 35zM632 165v362q0 20 -15 35t-35 15h-101q-20 0 -35 -15t-15 -35v-362q0 -20 15 -35t35 -15h101q20 0 35 15t15 35zM2048 311q0 -166 -118 -284t-284 -118h-1244q-166 0 -284 118t-118 284 q0 116 63 214.5t168 148.5q-10 34 -10 73q0 113 80.5 193.5t193.5 80.5q102 0 180 -67q45 183 194 300t338 117q149 0 275 -73.5t199.5 -199.5t73.5 -275q0 -66 -14 -122q135 -33 221 -142.5t86 -247.5z" />
+<glyph unicode="" d="M0 1536h1536v-1392l-776 -338l-760 338v1392zM1436 209v926h-1336v-926l661 -294zM1436 1235v201h-1336v-201h1336zM181 937v-115h-37v115h37zM181 789v-115h-37v115h37zM181 641v-115h-37v115h37zM181 493v-115h-37v115h37zM181 345v-115h-37v115h37zM207 202l15 34 l105 -47l-15 -33zM343 142l15 34l105 -46l-15 -34zM478 82l15 34l105 -46l-15 -34zM614 23l15 33l104 -46l-15 -34zM797 10l105 46l15 -33l-105 -47zM932 70l105 46l15 -34l-105 -46zM1068 130l105 46l15 -34l-105 -46zM1203 189l105 47l15 -34l-105 -46zM259 1389v-36h-114 v36h114zM421 1389v-36h-115v36h115zM583 1389v-36h-115v36h115zM744 1389v-36h-114v36h114zM906 1389v-36h-114v36h114zM1068 1389v-36h-115v36h115zM1230 1389v-36h-115v36h115zM1391 1389v-36h-114v36h114zM181 1049v-79h-37v115h115v-36h-78zM421 1085v-36h-115v36h115z M583 1085v-36h-115v36h115zM744 1085v-36h-114v36h114zM906 1085v-36h-114v36h114zM1068 1085v-36h-115v36h115zM1230 1085v-36h-115v36h115zM1355 970v79h-78v36h115v-115h-37zM1355 822v115h37v-115h-37zM1355 674v115h37v-115h-37zM1355 526v115h37v-115h-37zM1355 378 v115h37v-115h-37zM1355 230v115h37v-115h-37zM760 265q-129 0 -221 91.5t-92 221.5q0 129 92 221t221 92q130 0 221.5 -92t91.5 -221q0 -130 -91.5 -221.5t-221.5 -91.5zM595 646q0 -36 19.5 -56.5t49.5 -25t64 -7t64 -2t49.5 -9t19.5 -30.5q0 -49 -112 -49q-97 0 -123 51 h-3l-31 -63q67 -42 162 -42q29 0 56.5 5t55.5 16t45.5 33t17.5 53q0 46 -27.5 69.5t-67.5 27t-79.5 3t-67 5t-27.5 25.5q0 21 20.5 33t40.5 15t41 3q34 0 70.5 -11t51.5 -34h3l30 58q-3 1 -21 8.5t-22.5 9t-19.5 7t-22 7t-20 4.5t-24 4t-23 1q-29 0 -56.5 -5t-54 -16.5 t-43 -34t-16.5 -53.5z" />
+<glyph unicode="" horiz-adv-x="2048" d="M863 504q0 112 -79.5 191.5t-191.5 79.5t-191 -79.5t-79 -191.5t79 -191t191 -79t191.5 79t79.5 191zM1726 505q0 112 -79 191t-191 79t-191.5 -79t-79.5 -191q0 -113 79.5 -192t191.5 -79t191 79.5t79 191.5zM2048 1314v-1348q0 -44 -31.5 -75.5t-76.5 -31.5h-1832 q-45 0 -76.5 31.5t-31.5 75.5v1348q0 44 31.5 75.5t76.5 31.5h431q44 0 76 -31.5t32 -75.5v-161h754v161q0 44 32 75.5t76 31.5h431q45 0 76.5 -31.5t31.5 -75.5z" />
+<glyph unicode="" horiz-adv-x="2048" d="M1430 953zM1690 749q148 0 253 -98.5t105 -244.5q0 -157 -109 -261.5t-267 -104.5q-85 0 -162 27.5t-138 73.5t-118 106t-109 126.5t-103.5 132.5t-108.5 126t-117 106t-136 73.5t-159 27.5q-154 0 -251.5 -91.5t-97.5 -244.5q0 -157 104 -250t263 -93q100 0 208 37.5 t193 98.5q5 4 21 18.5t30 24t22 9.5q14 0 24.5 -10.5t10.5 -24.5q0 -24 -60 -77q-101 -88 -234.5 -142t-260.5 -54q-133 0 -245.5 58t-180 165t-67.5 241q0 205 141.5 341t347.5 136q120 0 226.5 -43.5t185.5 -113t151.5 -153t139 -167.5t133.5 -153.5t149.5 -113 t172.5 -43.5q102 0 168.5 61.5t66.5 162.5q0 95 -64.5 159t-159.5 64q-30 0 -81.5 -18.5t-68.5 -18.5q-20 0 -35.5 15t-15.5 35q0 18 8.5 57t8.5 59q0 159 -107.5 263t-266.5 104q-58 0 -111.5 -18.5t-84 -40.5t-55.5 -40.5t-33 -18.5q-15 0 -25.5 10.5t-10.5 25.5 q0 19 25 46q59 67 147 103.5t182 36.5q191 0 318 -125.5t127 -315.5q0 -37 -4 -66q57 15 115 15z" />
+<glyph unicode="" horiz-adv-x="1664" d="M1216 832q0 26 -19 45t-45 19h-128v128q0 26 -19 45t-45 19t-45 -19t-19 -45v-128h-128q-26 0 -45 -19t-19 -45t19 -45t45 -19h128v-128q0 -26 19 -45t45 -19t45 19t19 45v128h128q26 0 45 19t19 45zM640 0q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5t-37.5 90.5 t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1536 0q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5t-37.5 90.5t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1664 1088v-512q0 -24 -16 -42.5t-41 -21.5l-1044 -122q1 -7 4.5 -21.5t6 -26.5t2.5 -22q0 -16 -24 -64h920 q26 0 45 -19t19 -45t-19 -45t-45 -19h-1024q-26 0 -45 19t-19 45q0 14 11 39.5t29.5 59.5t20.5 38l-177 823h-204q-26 0 -45 19t-19 45t19 45t45 19h256q16 0 28.5 -6.5t20 -15.5t13 -24.5t7.5 -26.5t5.5 -29.5t4.5 -25.5h1201q26 0 45 -19t19 -45z" />
+<glyph unicode="" horiz-adv-x="1664" d="M1280 832q0 26 -19 45t-45 19t-45 -19l-147 -146v293q0 26 -19 45t-45 19t-45 -19t-19 -45v-293l-147 146q-19 19 -45 19t-45 -19t-19 -45t19 -45l256 -256q19 -19 45 -19t45 19l256 256q19 19 19 45zM640 0q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5t-37.5 90.5 t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1536 0q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5t-37.5 90.5t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1664 1088v-512q0 -24 -16 -42.5t-41 -21.5l-1044 -122q1 -7 4.5 -21.5t6 -26.5t2.5 -22q0 -16 -24 -64h920 q26 0 45 -19t19 -45t-19 -45t-45 -19h-1024q-26 0 -45 19t-19 45q0 14 11 39.5t29.5 59.5t20.5 38l-177 823h-204q-26 0 -45 19t-19 45t19 45t45 19h256q16 0 28.5 -6.5t20 -15.5t13 -24.5t7.5 -26.5t5.5 -29.5t4.5 -25.5h1201q26 0 45 -19t19 -45z" />
+<glyph unicode="" horiz-adv-x="2048" d="M212 768l623 -665l-300 665h-323zM1024 -4l349 772h-698zM538 896l204 384h-262l-288 -384h346zM1213 103l623 665h-323zM683 896h682l-204 384h-274zM1510 896h346l-288 384h-262zM1651 1382l384 -512q14 -18 13 -41.5t-17 -40.5l-960 -1024q-18 -20 -47 -20t-47 20 l-960 1024q-16 17 -17 40.5t13 41.5l384 512q18 26 51 26h1152q33 0 51 -26z" />
+<glyph unicode="" horiz-adv-x="2048" d="M1811 -19q19 19 45 19t45 -19l128 -128l-90 -90l-83 83l-83 -83q-18 -19 -45 -19t-45 19l-83 83l-83 -83q-19 -19 -45 -19t-45 19l-83 83l-83 -83q-19 -19 -45 -19t-45 19l-83 83l-83 -83q-19 -19 -45 -19t-45 19l-83 83l-83 -83q-19 -19 -45 -19t-45 19l-83 83l-83 -83 q-19 -19 -45 -19t-45 19l-83 83l-83 -83q-19 -19 -45 -19t-45 19l-128 128l90 90l83 -83l83 83q19 19 45 19t45 -19l83 -83l83 83q19 19 45 19t45 -19l83 -83l83 83q19 19 45 19t45 -19l83 -83l83 83q19 19 45 19t45 -19l83 -83l83 83q19 19 45 19t45 -19l83 -83l83 83 q19 19 45 19t45 -19l83 -83zM237 19q-19 -19 -45 -19t-45 19l-128 128l90 90l83 -82l83 82q19 19 45 19t45 -19l83 -82l64 64v293l-210 314q-17 26 -7 56.5t40 40.5l177 58v299h128v128h256v128h256v-128h256v-128h128v-299l177 -58q30 -10 40 -40.5t-7 -56.5l-210 -314 v-293l19 18q19 19 45 19t45 -19l83 -82l83 82q19 19 45 19t45 -19l128 -128l-90 -90l-83 83l-83 -83q-18 -19 -45 -19t-45 19l-83 83l-83 -83q-19 -19 -45 -19t-45 19l-83 83l-83 -83q-19 -19 -45 -19t-45 19l-83 83l-83 -83q-19 -19 -45 -19t-45 19l-83 83l-83 -83 q-19 -19 -45 -19t-45 19l-83 83l-83 -83q-19 -19 -45 -19t-45 19l-83 83zM640 1152v-128l384 128l384 -128v128h-128v128h-512v-128h-128z" />
+<glyph unicode="" d="M576 0l96 448l-96 128l-128 64zM832 0l128 640l-128 -64l-96 -128zM992 1010q-2 4 -4 6q-10 8 -96 8q-70 0 -167 -19q-7 -2 -21 -2t-21 2q-97 19 -167 19q-86 0 -96 -8q-2 -2 -4 -6q2 -18 4 -27q2 -3 7.5 -6.5t7.5 -10.5q2 -4 7.5 -20.5t7 -20.5t7.5 -17t8.5 -17t9 -14 t12 -13.5t14 -9.5t17.5 -8t20.5 -4t24.5 -2q36 0 59 12.5t32.5 30t14.5 34.5t11.5 29.5t17.5 12.5h12q11 0 17.5 -12.5t11.5 -29.5t14.5 -34.5t32.5 -30t59 -12.5q13 0 24.5 2t20.5 4t17.5 8t14 9.5t12 13.5t9 14t8.5 17t7.5 17t7 20.5t7.5 20.5q2 7 7.5 10.5t7.5 6.5 q2 9 4 27zM1408 131q0 -121 -73 -190t-194 -69h-874q-121 0 -194 69t-73 190q0 61 4.5 118t19 125.5t37.5 123.5t63.5 103.5t93.5 74.5l-90 220h214q-22 64 -22 128q0 12 2 32q-194 40 -194 96q0 57 210 99q17 62 51.5 134t70.5 114q32 37 76 37q30 0 84 -31t84 -31t84 31 t84 31q44 0 76 -37q36 -42 70.5 -114t51.5 -134q210 -42 210 -99q0 -56 -194 -96q7 -81 -20 -160h214l-82 -225q63 -33 107.5 -96.5t65.5 -143.5t29 -151.5t8 -148.5z" />
+<glyph unicode="" horiz-adv-x="2304" d="M2301 500q12 -103 -22 -198.5t-99 -163.5t-158.5 -106t-196.5 -31q-161 11 -279.5 125t-134.5 274q-12 111 27.5 210.5t118.5 170.5l-71 107q-96 -80 -151 -194t-55 -244q0 -27 -18.5 -46.5t-45.5 -19.5h-256h-69q-23 -164 -149 -274t-294 -110q-185 0 -316.5 131.5 t-131.5 316.5t131.5 316.5t316.5 131.5q76 0 152 -27l24 45q-123 110 -304 110h-64q-26 0 -45 19t-19 45t19 45t45 19h128q78 0 145 -13.5t116.5 -38.5t71.5 -39.5t51 -36.5h512h115l-85 128h-222q-30 0 -49 22.5t-14 52.5q4 23 23 38t43 15h253q33 0 53 -28l70 -105 l114 114q19 19 46 19h101q26 0 45 -19t19 -45v-128q0 -26 -19 -45t-45 -19h-179l115 -172q131 63 275 36q143 -26 244 -134.5t118 -253.5zM448 128q115 0 203 72.5t111 183.5h-314q-35 0 -55 31q-18 32 -1 63l147 277q-47 13 -91 13q-132 0 -226 -94t-94 -226t94 -226 t226 -94zM1856 128q132 0 226 94t94 226t-94 226t-226 94q-60 0 -121 -24l174 -260q15 -23 10 -49t-27 -40q-15 -11 -36 -11q-35 0 -53 29l-174 260q-93 -95 -93 -225q0 -132 94 -226t226 -94z" />
+<glyph unicode="" d="M1408 0q0 -63 -61.5 -113.5t-164 -81t-225 -46t-253.5 -15.5t-253.5 15.5t-225 46t-164 81t-61.5 113.5q0 49 33 88.5t91 66.5t118 44.5t131 29.5q26 5 48 -10.5t26 -41.5q5 -26 -10.5 -48t-41.5 -26q-58 -10 -106 -23.5t-76.5 -25.5t-48.5 -23.5t-27.5 -19.5t-8.5 -12 q3 -11 27 -26.5t73 -33t114 -32.5t160.5 -25t201.5 -10t201.5 10t160.5 25t114 33t73 33.5t27 27.5q-1 4 -8.5 11t-27.5 19t-48.5 23.5t-76.5 25t-106 23.5q-26 4 -41.5 26t-10.5 48q4 26 26 41.5t48 10.5q71 -12 131 -29.5t118 -44.5t91 -66.5t33 -88.5zM1024 896v-384 q0 -26 -19 -45t-45 -19h-64v-384q0 -26 -19 -45t-45 -19h-256q-26 0 -45 19t-19 45v384h-64q-26 0 -45 19t-19 45v384q0 53 37.5 90.5t90.5 37.5h384q53 0 90.5 -37.5t37.5 -90.5zM928 1280q0 -93 -65.5 -158.5t-158.5 -65.5t-158.5 65.5t-65.5 158.5t65.5 158.5t158.5 65.5 t158.5 -65.5t65.5 -158.5z" />
+<glyph unicode="" horiz-adv-x="1792" d="M1280 512h305q-5 -6 -10 -10.5t-9 -7.5l-3 -4l-623 -600q-18 -18 -44 -18t-44 18l-624 602q-5 2 -21 20h369q22 0 39.5 13.5t22.5 34.5l70 281l190 -667q6 -20 23 -33t39 -13q21 0 38 13t23 33l146 485l56 -112q18 -35 57 -35zM1792 940q0 -145 -103 -300h-369l-111 221 q-8 17 -25.5 27t-36.5 8q-45 -5 -56 -46l-129 -430l-196 686q-6 20 -23.5 33t-39.5 13t-39 -13.5t-22 -34.5l-116 -464h-423q-103 155 -103 300q0 220 127 344t351 124q62 0 126.5 -21.5t120 -58t95.5 -68.5t76 -68q36 36 76 68t95.5 68.5t120 58t126.5 21.5q224 0 351 -124 t127 -344z" />
+<glyph unicode="" horiz-adv-x="1280" d="M1152 960q0 -221 -147.5 -384.5t-364.5 -187.5v-260h224q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-224v-224q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v224h-224q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h224v260q-150 16 -271.5 103t-186 224t-52.5 292 q11 134 80.5 249t182 188t245.5 88q170 19 319 -54t236 -212t87 -306zM128 960q0 -185 131.5 -316.5t316.5 -131.5t316.5 131.5t131.5 316.5t-131.5 316.5t-316.5 131.5t-316.5 -131.5t-131.5 -316.5z" />
+<glyph unicode="" d="M1472 1408q26 0 45 -19t19 -45v-416q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v262l-382 -383q126 -156 126 -359q0 -117 -45.5 -223.5t-123 -184t-184 -123t-223.5 -45.5t-223.5 45.5t-184 123t-123 184t-45.5 223.5t45.5 223.5t123 184t184 123t223.5 45.5 q203 0 359 -126l382 382h-261q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h416zM576 0q185 0 316.5 131.5t131.5 316.5t-131.5 316.5t-316.5 131.5t-316.5 -131.5t-131.5 -316.5t131.5 -316.5t316.5 -131.5z" />
+<glyph unicode="" horiz-adv-x="1280" d="M830 1220q145 -72 233.5 -210.5t88.5 -305.5q0 -221 -147.5 -384.5t-364.5 -187.5v-132h96q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-96v-96q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v96h-96q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h96v132q-217 24 -364.5 187.5 t-147.5 384.5q0 167 88.5 305.5t233.5 210.5q-165 96 -228 273q-6 16 3.5 29.5t26.5 13.5h69q21 0 29 -20q44 -106 140 -171t214 -65t214 65t140 171q8 20 37 20h61q17 0 26.5 -13.5t3.5 -29.5q-63 -177 -228 -273zM576 256q185 0 316.5 131.5t131.5 316.5t-131.5 316.5 t-316.5 131.5t-316.5 -131.5t-131.5 -316.5t131.5 -316.5t316.5 -131.5z" />
+<glyph unicode="" d="M1024 1504q0 14 9 23t23 9h288q26 0 45 -19t19 -45v-288q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v134l-254 -255q126 -158 126 -359q0 -221 -147.5 -384.5t-364.5 -187.5v-132h96q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-96v-96q0 -14 -9 -23t-23 -9h-64 q-14 0 -23 9t-9 23v96h-96q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h96v132q-149 16 -270.5 103t-186.5 223.5t-53 291.5q16 204 160 353.5t347 172.5q118 14 228 -19t198 -103l255 254h-134q-14 0 -23 9t-9 23v64zM576 256q185 0 316.5 131.5t131.5 316.5t-131.5 316.5 t-316.5 131.5t-316.5 -131.5t-131.5 -316.5t131.5 -316.5t316.5 -131.5z" />
+<glyph unicode="" horiz-adv-x="1792" d="M1280 1504q0 14 9 23t23 9h288q26 0 45 -19t19 -45v-288q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v134l-254 -255q126 -158 126 -359q0 -221 -147.5 -384.5t-364.5 -187.5v-132h96q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-96v-96q0 -14 -9 -23t-23 -9h-64 q-14 0 -23 9t-9 23v96h-96q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h96v132q-217 24 -364.5 187.5t-147.5 384.5q0 201 126 359l-52 53l-101 -111q-9 -10 -22 -10.5t-23 7.5l-48 44q-10 8 -10.5 21.5t8.5 23.5l105 115l-111 112v-134q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9 t-9 23v288q0 26 19 45t45 19h288q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-133l106 -107l86 94q9 10 22 10.5t23 -7.5l48 -44q10 -8 10.5 -21.5t-8.5 -23.5l-90 -99l57 -56q158 126 359 126t359 -126l255 254h-134q-14 0 -23 9t-9 23v64zM832 256q185 0 316.5 131.5 t131.5 316.5t-131.5 316.5t-316.5 131.5t-316.5 -131.5t-131.5 -316.5t131.5 -316.5t316.5 -131.5z" />
+<glyph unicode="" horiz-adv-x="1792" d="M1790 1007q12 -155 -52.5 -292t-186 -224t-271.5 -103v-260h224q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-224v-224q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v224h-512v-224q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v224h-224q-14 0 -23 9t-9 23v64q0 14 9 23 t23 9h224v260q-150 16 -271.5 103t-186 224t-52.5 292q17 206 164.5 356.5t352.5 169.5q206 21 377 -94q171 115 377 94q205 -19 352.5 -169.5t164.5 -356.5zM896 647q128 131 128 313t-128 313q-128 -131 -128 -313t128 -313zM576 512q115 0 218 57q-154 165 -154 391 q0 224 154 391q-103 57 -218 57q-185 0 -316.5 -131.5t-131.5 -316.5t131.5 -316.5t316.5 -131.5zM1152 128v260q-137 15 -256 94q-119 -79 -256 -94v-260h512zM1216 512q185 0 316.5 131.5t131.5 316.5t-131.5 316.5t-316.5 131.5q-115 0 -218 -57q154 -167 154 -391 q0 -226 -154 -391q103 -57 218 -57z" />
+<glyph unicode="" horiz-adv-x="1920" d="M1536 1120q0 14 9 23t23 9h288q26 0 45 -19t19 -45v-288q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v134l-254 -255q76 -95 107.5 -214t9.5 -247q-31 -182 -166 -312t-318 -156q-210 -29 -384.5 80t-241.5 300q-117 6 -221 57.5t-177.5 133t-113.5 192.5t-32 230 q9 135 78 252t182 191.5t248 89.5q118 14 227.5 -19t198.5 -103l255 254h-134q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h288q26 0 45 -19t19 -45v-288q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v134l-254 -255q59 -74 93 -169q182 -9 328 -124l255 254h-134q-14 0 -23 9 t-9 23v64zM1024 704q0 20 -4 58q-162 -25 -271 -150t-109 -292q0 -20 4 -58q162 25 271 150t109 292zM128 704q0 -168 111 -294t276 -149q-3 29 -3 59q0 210 135 369.5t338 196.5q-53 120 -163.5 193t-245.5 73q-185 0 -316.5 -131.5t-131.5 -316.5zM1088 -128 q185 0 316.5 131.5t131.5 316.5q0 168 -111 294t-276 149q3 -29 3 -59q0 -210 -135 -369.5t-338 -196.5q53 -120 163.5 -193t245.5 -73z" />
+<glyph unicode="" horiz-adv-x="2048" d="M1664 1504q0 14 9 23t23 9h288q26 0 45 -19t19 -45v-288q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v134l-254 -255q76 -95 107.5 -214t9.5 -247q-32 -180 -164.5 -310t-313.5 -157q-223 -34 -409 90q-117 -78 -256 -93v-132h96q14 0 23 -9t9 -23v-64q0 -14 -9 -23 t-23 -9h-96v-96q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v96h-96q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h96v132q-155 17 -279.5 109.5t-187 237.5t-39.5 307q25 187 159.5 322.5t320.5 164.5q224 34 410 -90q146 97 320 97q201 0 359 -126l255 254h-134q-14 0 -23 9 t-9 23v64zM896 391q128 131 128 313t-128 313q-128 -131 -128 -313t128 -313zM128 704q0 -185 131.5 -316.5t316.5 -131.5q117 0 218 57q-154 167 -154 391t154 391q-101 57 -218 57q-185 0 -316.5 -131.5t-131.5 -316.5zM1216 256q185 0 316.5 131.5t131.5 316.5 t-131.5 316.5t-316.5 131.5q-117 0 -218 -57q154 -167 154 -391t-154 -391q101 -57 218 -57z" />
+<glyph unicode="" d="M1472 1408q26 0 45 -19t19 -45v-416q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v262l-213 -214l140 -140q9 -10 9 -23t-9 -22l-46 -46q-9 -9 -22 -9t-23 9l-140 141l-78 -79q126 -156 126 -359q0 -117 -45.5 -223.5t-123 -184t-184 -123t-223.5 -45.5t-223.5 45.5 t-184 123t-123 184t-45.5 223.5t45.5 223.5t123 184t184 123t223.5 45.5q203 0 359 -126l78 78l-172 172q-9 10 -9 23t9 22l46 46q9 9 22 9t23 -9l172 -172l213 213h-261q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h416zM576 0q185 0 316.5 131.5t131.5 316.5t-131.5 316.5 t-316.5 131.5t-316.5 -131.5t-131.5 -316.5t131.5 -316.5t316.5 -131.5z" />
+<glyph unicode="" horiz-adv-x="1280" d="M640 892q217 -24 364.5 -187.5t147.5 -384.5q0 -167 -87 -306t-236 -212t-319 -54q-133 15 -245.5 88t-182 188t-80.5 249q-12 155 52.5 292t186 224t271.5 103v132h-160q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h160v165l-92 -92q-10 -9 -23 -9t-22 9l-46 46q-9 9 -9 22 t9 23l202 201q19 19 45 19t45 -19l202 -201q9 -10 9 -23t-9 -22l-46 -46q-9 -9 -22 -9t-23 9l-92 92v-165h160q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-160v-132zM576 -128q185 0 316.5 131.5t131.5 316.5t-131.5 316.5t-316.5 131.5t-316.5 -131.5t-131.5 -316.5 t131.5 -316.5t316.5 -131.5z" />
+<glyph unicode="" horiz-adv-x="2048" d="M1901 621q19 -19 19 -45t-19 -45l-294 -294q-9 -10 -22.5 -10t-22.5 10l-45 45q-10 9 -10 22.5t10 22.5l185 185h-294v-224q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v224h-132q-24 -217 -187.5 -364.5t-384.5 -147.5q-167 0 -306 87t-212 236t-54 319q15 133 88 245.5 t188 182t249 80.5q155 12 292 -52.5t224 -186t103 -271.5h132v224q0 14 9 23t23 9h64q14 0 23 -9t9 -23v-224h294l-185 185q-10 9 -10 22.5t10 22.5l45 45q9 10 22.5 10t22.5 -10zM576 128q185 0 316.5 131.5t131.5 316.5t-131.5 316.5t-316.5 131.5t-316.5 -131.5 t-131.5 -316.5t131.5 -316.5t316.5 -131.5z" />
+<glyph unicode="" horiz-adv-x="1280" d="M1152 960q0 -221 -147.5 -384.5t-364.5 -187.5v-612q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v612q-217 24 -364.5 187.5t-147.5 384.5q0 117 45.5 223.5t123 184t184 123t223.5 45.5t223.5 -45.5t184 -123t123 -184t45.5 -223.5zM576 512q185 0 316.5 131.5 t131.5 316.5t-131.5 316.5t-316.5 131.5t-316.5 -131.5t-131.5 -316.5t131.5 -316.5t316.5 -131.5z" />
+<glyph unicode="" horiz-adv-x="1280" d="M1024 576q0 185 -131.5 316.5t-316.5 131.5t-316.5 -131.5t-131.5 -316.5t131.5 -316.5t316.5 -131.5t316.5 131.5t131.5 316.5zM1152 576q0 -117 -45.5 -223.5t-123 -184t-184 -123t-223.5 -45.5t-223.5 45.5t-184 123t-123 184t-45.5 223.5t45.5 223.5t123 184t184 123 t223.5 45.5t223.5 -45.5t184 -123t123 -184t45.5 -223.5z" />
+<glyph unicode="" horiz-adv-x="1792" />
+<glyph unicode="" horiz-adv-x="1792" />
+<glyph unicode="" d="M1451 1408q35 0 60 -25t25 -60v-1366q0 -35 -25 -60t-60 -25h-391v595h199l30 232h-229v148q0 56 23.5 84t91.5 28l122 1v207q-63 9 -178 9q-136 0 -217.5 -80t-81.5 -226v-171h-200v-232h200v-595h-735q-35 0 -60 25t-25 60v1366q0 35 25 60t60 25h1366z" />
+<glyph unicode="" horiz-adv-x="1280" d="M0 939q0 108 37.5 203.5t103.5 166.5t152 123t185 78t202 26q158 0 294 -66.5t221 -193.5t85 -287q0 -96 -19 -188t-60 -177t-100 -149.5t-145 -103t-189 -38.5q-68 0 -135 32t-96 88q-10 -39 -28 -112.5t-23.5 -95t-20.5 -71t-26 -71t-32 -62.5t-46 -77.5t-62 -86.5 l-14 -5l-9 10q-15 157 -15 188q0 92 21.5 206.5t66.5 287.5t52 203q-32 65 -32 169q0 83 52 156t132 73q61 0 95 -40.5t34 -102.5q0 -66 -44 -191t-44 -187q0 -63 45 -104.5t109 -41.5q55 0 102 25t78.5 68t56 95t38 110.5t20 111t6.5 99.5q0 173 -109.5 269.5t-285.5 96.5 q-200 0 -334 -129.5t-134 -328.5q0 -44 12.5 -85t27 -65t27 -45.5t12.5 -30.5q0 -28 -15 -73t-37 -45q-2 0 -17 3q-51 15 -90.5 56t-61 94.5t-32.5 108t-11 106.5z" />
+<glyph unicode="" d="M985 562q13 0 97.5 -44t89.5 -53q2 -5 2 -15q0 -33 -17 -76q-16 -39 -71 -65.5t-102 -26.5q-57 0 -190 62q-98 45 -170 118t-148 185q-72 107 -71 194v8q3 91 74 158q24 22 52 22q6 0 18 -1.5t19 -1.5q19 0 26.5 -6.5t15.5 -27.5q8 -20 33 -88t25 -75q0 -21 -34.5 -57.5 t-34.5 -46.5q0 -7 5 -15q34 -73 102 -137q56 -53 151 -101q12 -7 22 -7q15 0 54 48.5t52 48.5zM782 32q127 0 243.5 50t200.5 134t134 200.5t50 243.5t-50 243.5t-134 200.5t-200.5 134t-243.5 50t-243.5 -50t-200.5 -134t-134 -200.5t-50 -243.5q0 -203 120 -368l-79 -233 l242 77q158 -104 345 -104zM782 1414q153 0 292.5 -60t240.5 -161t161 -240.5t60 -292.5t-60 -292.5t-161 -240.5t-240.5 -161t-292.5 -60q-195 0 -365 94l-417 -134l136 405q-108 178 -108 389q0 153 60 292.5t161 240.5t240.5 161t292.5 60z" />
+<glyph unicode="" horiz-adv-x="1792" d="M128 128h1024v128h-1024v-128zM128 640h1024v128h-1024v-128zM1696 192q0 40 -28 68t-68 28t-68 -28t-28 -68t28 -68t68 -28t68 28t28 68zM128 1152h1024v128h-1024v-128zM1696 704q0 40 -28 68t-68 28t-68 -28t-28 -68t28 -68t68 -28t68 28t28 68zM1696 1216 q0 40 -28 68t-68 28t-68 -28t-28 -68t28 -68t68 -28t68 28t28 68zM1792 384v-384h-1792v384h1792zM1792 896v-384h-1792v384h1792zM1792 1408v-384h-1792v384h1792z" />
+<glyph unicode="" horiz-adv-x="2048" d="M704 640q-159 0 -271.5 112.5t-112.5 271.5t112.5 271.5t271.5 112.5t271.5 -112.5t112.5 -271.5t-112.5 -271.5t-271.5 -112.5zM1664 512h352q13 0 22.5 -9.5t9.5 -22.5v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-352v-352q0 -13 -9.5 -22.5t-22.5 -9.5h-192q-13 0 -22.5 9.5 t-9.5 22.5v352h-352q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h352v352q0 13 9.5 22.5t22.5 9.5h192q13 0 22.5 -9.5t9.5 -22.5v-352zM928 288q0 -52 38 -90t90 -38h256v-238q-68 -50 -171 -50h-874q-121 0 -194 69t-73 190q0 53 3.5 103.5t14 109t26.5 108.5 t43 97.5t62 81t85.5 53.5t111.5 20q19 0 39 -17q79 -61 154.5 -91.5t164.5 -30.5t164.5 30.5t154.5 91.5q20 17 39 17q132 0 217 -96h-223q-52 0 -90 -38t-38 -90v-192z" />
+<glyph unicode="" horiz-adv-x="2048" d="M704 640q-159 0 -271.5 112.5t-112.5 271.5t112.5 271.5t271.5 112.5t271.5 -112.5t112.5 -271.5t-112.5 -271.5t-271.5 -112.5zM1781 320l249 -249q9 -9 9 -23q0 -13 -9 -22l-136 -136q-9 -9 -22 -9q-14 0 -23 9l-249 249l-249 -249q-9 -9 -23 -9q-13 0 -22 9l-136 136 q-9 9 -9 22q0 14 9 23l249 249l-249 249q-9 9 -9 23q0 13 9 22l136 136q9 9 22 9q14 0 23 -9l249 -249l249 249q9 9 23 9q13 0 22 -9l136 -136q9 -9 9 -22q0 -14 -9 -23zM1283 320l-181 -181q-37 -37 -37 -91q0 -53 37 -90l83 -83q-21 -3 -44 -3h-874q-121 0 -194 69 t-73 190q0 53 3.5 103.5t14 109t26.5 108.5t43 97.5t62 81t85.5 53.5t111.5 20q19 0 39 -17q154 -122 319 -122t319 122q20 17 39 17q28 0 57 -6q-28 -27 -41 -50t-13 -56q0 -54 37 -91z" />
+<glyph unicode="" horiz-adv-x="2048" d="M256 512h1728q26 0 45 -19t19 -45v-448h-256v256h-1536v-256h-256v1216q0 26 19 45t45 19h128q26 0 45 -19t19 -45v-704zM832 832q0 106 -75 181t-181 75t-181 -75t-75 -181t75 -181t181 -75t181 75t75 181zM2048 576v64q0 159 -112.5 271.5t-271.5 112.5h-704 q-26 0 -45 -19t-19 -45v-384h1152z" />
+<glyph unicode="" d="M1536 1536l-192 -448h192v-192h-274l-55 -128h329v-192h-411l-357 -832l-357 832h-411v192h329l-55 128h-274v192h192l-192 448h256l323 -768h378l323 768h256zM768 320l108 256h-216z" />
+<glyph unicode="" d="M1088 1536q185 0 316.5 -93.5t131.5 -226.5v-896q0 -130 -125.5 -222t-305.5 -97l213 -202q16 -15 8 -35t-30 -20h-1056q-22 0 -30 20t8 35l213 202q-180 5 -305.5 97t-125.5 222v896q0 133 131.5 226.5t316.5 93.5h640zM768 192q80 0 136 56t56 136t-56 136t-136 56 t-136 -56t-56 -136t56 -136t136 -56zM1344 768v512h-1152v-512h1152z" />
+<glyph unicode="" d="M1088 1536q185 0 316.5 -93.5t131.5 -226.5v-896q0 -130 -125.5 -222t-305.5 -97l213 -202q16 -15 8 -35t-30 -20h-1056q-22 0 -30 20t8 35l213 202q-180 5 -305.5 97t-125.5 222v896q0 133 131.5 226.5t316.5 93.5h640zM288 224q66 0 113 47t47 113t-47 113t-113 47 t-113 -47t-47 -113t47 -113t113 -47zM704 768v512h-544v-512h544zM1248 224q66 0 113 47t47 113t-47 113t-113 47t-113 -47t-47 -113t47 -113t113 -47zM1408 768v512h-576v-512h576z" />
+<glyph unicode="" horiz-adv-x="1792" d="M1792 204v-209h-642v209h134v926h-6l-314 -1135h-243l-310 1135h-8v-926h135v-209h-538v209h69q21 0 43 19.5t22 37.5v881q0 18 -22 40t-43 22h-69v209h672l221 -821h6l223 821h670v-209h-71q-19 0 -41 -22t-22 -40v-881q0 -18 21.5 -37.5t41.5 -19.5h71z" />
+<glyph unicode="" d="M809 532l266 499h-112l-157 -312q-24 -48 -44 -92l-42 92l-155 312h-120l263 -493v-324h101v318zM1536 1408v-1536h-1536v1536h1536z" />
+<glyph unicode="" horiz-adv-x="2296" d="M478 -139q-8 -16 -27 -34.5t-37 -25.5q-25 -9 -51.5 3.5t-28.5 31.5q-1 22 40 55t68 38q23 4 34 -21.5t2 -46.5zM1819 -139q7 -16 26 -34.5t38 -25.5q25 -9 51.5 3.5t27.5 31.5q2 22 -39.5 55t-68.5 38q-22 4 -33 -21.5t-2 -46.5zM1867 -30q13 -27 56.5 -59.5t77.5 -41.5 q45 -13 82 4.5t37 50.5q0 46 -67.5 100.5t-115.5 59.5q-40 5 -63.5 -37.5t-6.5 -76.5zM428 -30q-13 -27 -56 -59.5t-77 -41.5q-45 -13 -82 4.5t-37 50.5q0 46 67.5 100.5t115.5 59.5q40 5 63 -37.5t6 -76.5zM1158 1094h1q-41 0 -76 -15q27 -8 44 -30.5t17 -49.5 q0 -35 -27 -60t-65 -25q-52 0 -80 43q-5 -23 -5 -42q0 -74 56 -126.5t135 -52.5q80 0 136 52.5t56 126.5t-56 126.5t-136 52.5zM1462 1312q-99 109 -220.5 131.5t-245.5 -44.5q27 60 82.5 96.5t118 39.5t121.5 -17t99.5 -74.5t44.5 -131.5zM2212 73q8 -11 -11 -42 q7 -23 7 -40q1 -56 -44.5 -112.5t-109.5 -91.5t-118 -37q-48 -2 -92 21.5t-66 65.5q-687 -25 -1259 0q-23 -41 -66.5 -65t-92.5 -22q-86 3 -179.5 80.5t-92.5 160.5q2 22 7 40q-19 31 -11 42q6 10 31 1q14 22 41 51q-7 29 2 38q11 10 39 -4q29 20 59 34q0 29 13 37 q23 12 51 -16q35 5 61 -2q18 -4 38 -19v73q-11 0 -18 2q-53 10 -97 44.5t-55 87.5q-9 38 0 81q15 62 93 95q2 17 19 35.5t36 23.5t33 -7.5t19 -30.5h13q46 -5 60 -23q3 -3 5 -7q10 1 30.5 3.5t30.5 3.5q-15 11 -30 17q-23 40 -91 43q0 6 1 10q-62 2 -118.5 18.5t-84.5 47.5 q-32 36 -42.5 92t-2.5 112q16 126 90 179q23 16 52 4.5t32 -40.5q0 -1 1.5 -14t2.5 -21t3 -20t5.5 -19t8.5 -10q27 -14 76 -12q48 46 98 74q-40 4 -162 -14l47 46q61 58 163 111q145 73 282 86q-20 8 -41 15.5t-47 14t-42.5 10.5t-47.5 11t-43 10q595 126 904 -139 q98 -84 158 -222q85 -10 121 9h1q5 3 8.5 10t5.5 19t3 19.5t3 21.5l1 14q3 28 32 40t52 -5q73 -52 91 -178q7 -57 -3.5 -113t-42.5 -91q-28 -32 -83.5 -48.5t-115.5 -18.5v-10q-71 -2 -95 -43q-14 -5 -31 -17q11 -1 32 -3.5t30 -3.5q1 4 5 8q16 18 60 23h13q5 18 19 30t33 8 t36 -23t19 -36q79 -32 93 -95q9 -40 1 -81q-12 -53 -56 -88t-97 -44q-10 -2 -17 -2q0 -49 -1 -73q20 15 38 19q26 7 61 2q28 28 51 16q14 -9 14 -37q33 -16 59 -34q27 13 38 4q10 -10 2 -38q28 -30 41 -51q23 8 31 -1zM1937 1025q0 -29 -9 -54q82 -32 112 -132 q4 37 -9.5 98.5t-41.5 90.5q-20 19 -36 17t-16 -20zM1859 925q35 -42 47.5 -108.5t-0.5 -124.5q67 13 97 45q13 14 18 28q-3 64 -31 114.5t-79 66.5q-15 -15 -52 -21zM1822 921q-30 0 -44 1q42 -115 53 -239q21 0 43 3q16 68 1 135t-53 100zM258 839q30 100 112 132 q-9 25 -9 54q0 18 -16.5 20t-35.5 -17q-28 -29 -41.5 -90.5t-9.5 -98.5zM294 737q29 -31 97 -45q-13 58 -0.5 124.5t47.5 108.5v0q-37 6 -52 21q-51 -16 -78.5 -66t-31.5 -115q9 -17 18 -28zM471 683q14 124 73 235q-19 -4 -55 -18l-45 -19v1q-46 -89 -20 -196q25 -3 47 -3z M1434 644q8 -38 16.5 -108.5t11.5 -89.5q3 -18 9.5 -21.5t23.5 4.5q40 20 62 85.5t23 125.5q-24 2 -146 4zM1152 1285q-116 0 -199 -82.5t-83 -198.5q0 -117 83 -199.5t199 -82.5t199 82.5t83 199.5q0 116 -83 198.5t-199 82.5zM1380 646q-106 2 -211 0v1q-1 -27 2.5 -86 t13.5 -66q29 -14 93.5 -14.5t95.5 10.5q9 3 11 39t-0.5 69.5t-4.5 46.5zM1112 447q8 4 9.5 48t-0.5 88t-4 63v1q-212 -3 -214 -3q-4 -20 -7 -62t0 -83t14 -46q34 -15 101 -16t101 10zM718 636q-16 -59 4.5 -118.5t77.5 -84.5q15 -8 24 -5t12 21q3 16 8 90t10 103 q-69 -2 -136 -6zM591 510q3 -23 -34 -36q132 -141 271.5 -240t305.5 -154q172 49 310.5 146t293.5 250q-33 13 -30 34l3 9v1v-1q-17 2 -50 5.5t-48 4.5q-26 -90 -82 -132q-51 -38 -82 1q-5 6 -9 14q-7 13 -17 62q-2 -5 -5 -9t-7.5 -7t-8 -5.5t-9.5 -4l-10 -2.5t-12 -2 l-12 -1.5t-13.5 -1t-13.5 -0.5q-106 -9 -163 11q-4 -17 -10 -26.5t-21 -15t-23 -7t-36 -3.5q-2 0 -3 -0.5t-3 -0.5h-3q-179 -17 -203 40q-2 -63 -56 -54q-47 8 -91 54q-12 13 -20 26q-17 29 -26 65q-58 -6 -87 -10q1 -2 4 -10zM507 -118q3 14 3 30q-17 71 -51 130t-73 70 q-41 12 -101.5 -14.5t-104.5 -80t-39 -107.5q35 -53 100 -93t119 -42q51 -2 94 28t53 79zM510 53q23 -63 27 -119q195 113 392 174q-98 52 -180.5 120t-179.5 165q-6 -4 -29 -13q0 -2 -1 -5t-1 -4q31 -18 22 -37q-12 -23 -56 -34q-10 -13 -29 -24h-1q-2 -83 1 -150 q19 -34 35 -73zM579 -113q532 -21 1145 0q-254 147 -428 196q-76 -35 -156 -57q-8 -3 -16 0q-65 21 -129 49q-208 -60 -416 -188h-1v-1q1 0 1 1zM1763 -67q4 54 28 120q14 38 33 71l-1 -1q3 77 3 153q-15 8 -30 25q-42 9 -56 33q-9 20 22 38q-2 4 -2 9q-16 4 -28 12 q-204 -190 -383 -284q198 -59 414 -176zM2155 -90q5 54 -39 107.5t-104 80t-102 14.5q-38 -11 -72.5 -70.5t-51.5 -129.5q0 -16 3 -30q10 -49 53 -79t94 -28q54 2 119 42t100 93z" />
+<glyph unicode="" horiz-adv-x="2304" d="M1524 -25q0 -68 -48 -116t-116 -48t-116.5 48t-48.5 116t48.5 116.5t116.5 48.5t116 -48.5t48 -116.5zM775 -25q0 -68 -48.5 -116t-116.5 -48t-116 48t-48 116t48 116.5t116 48.5t116.5 -48.5t48.5 -116.5zM0 1469q57 -60 110.5 -104.5t121 -82t136 -63t166 -45.5 t200 -31.5t250 -18.5t304 -9.5t372.5 -2.5q139 0 244.5 -5t181 -16.5t124 -27.5t71 -39.5t24 -51.5t-19.5 -64t-56.5 -76.5t-89.5 -91t-116 -104.5t-139 -119q-185 -157 -286 -247q29 51 76.5 109t94 105.5t94.5 98.5t83 91.5t54 80.5t13 70t-45.5 55.5t-116.5 41t-204 23.5 t-304 5q-168 -2 -314 6t-256 23t-204.5 41t-159.5 51.5t-122.5 62.5t-91.5 66.5t-68 71.5t-50.5 69.5t-40 68t-36.5 59.5z" />
+<glyph unicode="" horiz-adv-x="1792" d="M896 1472q-169 0 -323 -66t-265.5 -177.5t-177.5 -265.5t-66 -323t66 -323t177.5 -265.5t265.5 -177.5t323 -66t323 66t265.5 177.5t177.5 265.5t66 323t-66 323t-177.5 265.5t-265.5 177.5t-323 66zM896 1536q182 0 348 -71t286 -191t191 -286t71 -348t-71 -348 t-191 -286t-286 -191t-348 -71t-348 71t-286 191t-191 286t-71 348t71 348t191 286t286 191t348 71zM496 704q16 0 16 -16v-480q0 -16 -16 -16h-32q-16 0 -16 16v480q0 16 16 16h32zM896 640q53 0 90.5 -37.5t37.5 -90.5q0 -35 -17.5 -64t-46.5 -46v-114q0 -14 -9 -23 t-23 -9h-64q-14 0 -23 9t-9 23v114q-29 17 -46.5 46t-17.5 64q0 53 37.5 90.5t90.5 37.5zM896 1408q209 0 385.5 -103t279.5 -279.5t103 -385.5t-103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103zM544 928v-96 q0 -14 9 -23t23 -9h64q14 0 23 9t9 23v96q0 93 65.5 158.5t158.5 65.5t158.5 -65.5t65.5 -158.5v-96q0 -14 9 -23t23 -9h64q14 0 23 9t9 23v96q0 146 -103 249t-249 103t-249 -103t-103 -249zM1408 192v512q0 26 -19 45t-45 19h-896q-26 0 -45 -19t-19 -45v-512 q0 -26 19 -45t45 -19h896q26 0 45 19t19 45z" />
+<glyph unicode="" horiz-adv-x="2304" d="M1920 1024v-768h-1664v768h1664zM2048 448h128v384h-128v288q0 14 -9 23t-23 9h-1856q-14 0 -23 -9t-9 -23v-960q0 -14 9 -23t23 -9h1856q14 0 23 9t9 23v288zM2304 832v-384q0 -53 -37.5 -90.5t-90.5 -37.5v-160q0 -66 -47 -113t-113 -47h-1856q-66 0 -113 47t-47 113 v960q0 66 47 113t113 47h1856q66 0 113 -47t47 -113v-160q53 0 90.5 -37.5t37.5 -90.5z" />
+<glyph unicode="" horiz-adv-x="2304" d="M256 256v768h1280v-768h-1280zM2176 960q53 0 90.5 -37.5t37.5 -90.5v-384q0 -53 -37.5 -90.5t-90.5 -37.5v-160q0 -66 -47 -113t-113 -47h-1856q-66 0 -113 47t-47 113v960q0 66 47 113t113 47h1856q66 0 113 -47t47 -113v-160zM2176 448v384h-128v288q0 14 -9 23t-23 9 h-1856q-14 0 -23 -9t-9 -23v-960q0 -14 9 -23t23 -9h1856q14 0 23 9t9 23v288h128z" />
+<glyph unicode="" horiz-adv-x="2304" d="M256 256v768h896v-768h-896zM2176 960q53 0 90.5 -37.5t37.5 -90.5v-384q0 -53 -37.5 -90.5t-90.5 -37.5v-160q0 -66 -47 -113t-113 -47h-1856q-66 0 -113 47t-47 113v960q0 66 47 113t113 47h1856q66 0 113 -47t47 -113v-160zM2176 448v384h-128v288q0 14 -9 23t-23 9 h-1856q-14 0 -23 -9t-9 -23v-960q0 -14 9 -23t23 -9h1856q14 0 23 9t9 23v288h128z" />
+<glyph unicode="" horiz-adv-x="2304" d="M256 256v768h512v-768h-512zM2176 960q53 0 90.5 -37.5t37.5 -90.5v-384q0 -53 -37.5 -90.5t-90.5 -37.5v-160q0 -66 -47 -113t-113 -47h-1856q-66 0 -113 47t-47 113v960q0 66 47 113t113 47h1856q66 0 113 -47t47 -113v-160zM2176 448v384h-128v288q0 14 -9 23t-23 9 h-1856q-14 0 -23 -9t-9 -23v-960q0 -14 9 -23t23 -9h1856q14 0 23 9t9 23v288h128z" />
+<glyph unicode="" horiz-adv-x="2304" d="M2176 960q53 0 90.5 -37.5t37.5 -90.5v-384q0 -53 -37.5 -90.5t-90.5 -37.5v-160q0 -66 -47 -113t-113 -47h-1856q-66 0 -113 47t-47 113v960q0 66 47 113t113 47h1856q66 0 113 -47t47 -113v-160zM2176 448v384h-128v288q0 14 -9 23t-23 9h-1856q-14 0 -23 -9t-9 -23 v-960q0 -14 9 -23t23 -9h1856q14 0 23 9t9 23v288h128z" />
+<glyph unicode="" horiz-adv-x="1280" d="M1133 493q31 -30 14 -69q-17 -40 -59 -40h-382l201 -476q10 -25 0 -49t-34 -35l-177 -75q-25 -10 -49 0t-35 34l-191 452l-312 -312q-19 -19 -45 -19q-12 0 -24 5q-40 17 -40 59v1504q0 42 40 59q12 5 24 5q27 0 45 -19z" />
+<glyph unicode="" horiz-adv-x="1024" d="M832 1408q-320 0 -320 -224v-416h128v-128h-128v-544q0 -224 320 -224h64v-128h-64q-272 0 -384 146q-112 -146 -384 -146h-64v128h64q320 0 320 224v544h-128v128h128v416q0 224 -320 224h-64v128h64q272 0 384 -146q112 146 384 146h64v-128h-64z" />
+<glyph unicode="" horiz-adv-x="2048" d="M2048 1152h-128v-1024h128v-384h-384v128h-1280v-128h-384v384h128v1024h-128v384h384v-128h1280v128h384v-384zM1792 1408v-128h128v128h-128zM128 1408v-128h128v128h-128zM256 -128v128h-128v-128h128zM1664 0v128h128v1024h-128v128h-1280v-128h-128v-1024h128v-128 h1280zM1920 -128v128h-128v-128h128zM1280 896h384v-768h-896v256h-384v768h896v-256zM512 512h640v512h-640v-512zM1536 256v512h-256v-384h-384v-128h640z" />
+<glyph unicode="" horiz-adv-x="2304" d="M2304 768h-128v-640h128v-384h-384v128h-896v-128h-384v384h128v128h-384v-128h-384v384h128v640h-128v384h384v-128h896v128h384v-384h-128v-128h384v128h384v-384zM2048 1024v-128h128v128h-128zM1408 1408v-128h128v128h-128zM128 1408v-128h128v128h-128zM256 256 v128h-128v-128h128zM1536 384h-128v-128h128v128zM384 384h896v128h128v640h-128v128h-896v-128h-128v-640h128v-128zM896 -128v128h-128v-128h128zM2176 -128v128h-128v-128h128zM2048 128v640h-128v128h-384v-384h128v-384h-384v128h-384v-128h128v-128h896v128h128z" />
+<glyph unicode="" d="M1024 288v-416h-928q-40 0 -68 28t-28 68v1344q0 40 28 68t68 28h1344q40 0 68 -28t28 -68v-928h-416q-40 0 -68 -28t-28 -68zM1152 256h381q-15 -82 -65 -132l-184 -184q-50 -50 -132 -65v381z" />
+<glyph unicode="" d="M1400 256h-248v-248q29 10 41 22l185 185q12 12 22 41zM1120 384h288v896h-1280v-1280h896v288q0 40 28 68t68 28zM1536 1312v-1024q0 -40 -20 -88t-48 -76l-184 -184q-28 -28 -76 -48t-88 -20h-1024q-40 0 -68 28t-28 68v1344q0 40 28 68t68 28h1344q40 0 68 -28t28 -68 z" />
+<glyph unicode="" horiz-adv-x="2304" d="M1951 538q0 -26 -15.5 -44.5t-38.5 -23.5q-8 -2 -18 -2h-153v140h153q10 0 18 -2q23 -5 38.5 -23.5t15.5 -44.5zM1933 751q0 -25 -15 -42t-38 -21q-3 -1 -15 -1h-139v129h139q3 0 8.5 -0.5t6.5 -0.5q23 -4 38 -21.5t15 -42.5zM728 587v308h-228v-308q0 -58 -38 -94.5 t-105 -36.5q-108 0 -229 59v-112q53 -15 121 -23t109 -9l42 -1q328 0 328 217zM1442 403v113q-99 -52 -200 -59q-108 -8 -169 41t-61 142t61 142t169 41q101 -7 200 -58v112q-48 12 -100 19.5t-80 9.5l-28 2q-127 6 -218.5 -14t-140.5 -60t-71 -88t-22 -106t22 -106t71 -88 t140.5 -60t218.5 -14q101 4 208 31zM2176 518q0 54 -43 88.5t-109 39.5v3q57 8 89 41.5t32 79.5q0 55 -41 88t-107 36q-3 0 -12 0.5t-14 0.5h-455v-510h491q74 0 121.5 36.5t47.5 96.5zM2304 1280v-1280q0 -52 -38 -90t-90 -38h-2048q-52 0 -90 38t-38 90v1280q0 52 38 90 t90 38h2048q52 0 90 -38t38 -90z" />
+<glyph unicode="" horiz-adv-x="2304" d="M858 295v693q-106 -41 -172 -135.5t-66 -211.5t66 -211.5t172 -134.5zM1362 641q0 117 -66 211.5t-172 135.5v-694q106 41 172 135.5t66 211.5zM1577 641q0 -159 -78.5 -294t-213.5 -213.5t-294 -78.5q-119 0 -227.5 46.5t-187 125t-125 187t-46.5 227.5q0 159 78.5 294 t213.5 213.5t294 78.5t294 -78.5t213.5 -213.5t78.5 -294zM1960 634q0 139 -55.5 261.5t-147.5 205.5t-213.5 131t-252.5 48h-301q-176 0 -323.5 -81t-235 -230t-87.5 -335q0 -171 87 -317.5t236 -231.5t323 -85h301q129 0 251.5 50.5t214.5 135t147.5 202.5t55.5 246z M2304 1280v-1280q0 -52 -38 -90t-90 -38h-2048q-52 0 -90 38t-38 90v1280q0 52 38 90t90 38h2048q52 0 90 -38t38 -90z" />
+<glyph unicode="" horiz-adv-x="1792" d="M1664 -96v1088q0 13 -9.5 22.5t-22.5 9.5h-1088q-13 0 -22.5 -9.5t-9.5 -22.5v-1088q0 -13 9.5 -22.5t22.5 -9.5h1088q13 0 22.5 9.5t9.5 22.5zM1792 992v-1088q0 -66 -47 -113t-113 -47h-1088q-66 0 -113 47t-47 113v1088q0 66 47 113t113 47h1088q66 0 113 -47t47 -113 zM1408 1376v-160h-128v160q0 13 -9.5 22.5t-22.5 9.5h-1088q-13 0 -22.5 -9.5t-9.5 -22.5v-1088q0 -13 9.5 -22.5t22.5 -9.5h160v-128h-160q-66 0 -113 47t-47 113v1088q0 66 47 113t113 47h1088q66 0 113 -47t47 -113z" />
+<glyph unicode="" horiz-adv-x="2304" d="M1728 1088l-384 -704h768zM448 1088l-384 -704h768zM1269 1280q-14 -40 -45.5 -71.5t-71.5 -45.5v-1291h608q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-1344q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h608v1291q-40 14 -71.5 45.5t-45.5 71.5h-491q-14 0 -23 9t-9 23v64 q0 14 9 23t23 9h491q21 57 70 92.5t111 35.5t111 -35.5t70 -92.5h491q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-491zM1088 1264q33 0 56.5 23.5t23.5 56.5t-23.5 56.5t-56.5 23.5t-56.5 -23.5t-23.5 -56.5t23.5 -56.5t56.5 -23.5zM2176 384q0 -73 -46.5 -131t-117.5 -91 t-144.5 -49.5t-139.5 -16.5t-139.5 16.5t-144.5 49.5t-117.5 91t-46.5 131q0 11 35 81t92 174.5t107 195.5t102 184t56 100q18 33 56 33t56 -33q4 -7 56 -100t102 -184t107 -195.5t92 -174.5t35 -81zM896 384q0 -73 -46.5 -131t-117.5 -91t-144.5 -49.5t-139.5 -16.5 t-139.5 16.5t-144.5 49.5t-117.5 91t-46.5 131q0 11 35 81t92 174.5t107 195.5t102 184t56 100q18 33 56 33t56 -33q4 -7 56 -100t102 -184t107 -195.5t92 -174.5t35 -81z" />
+<glyph unicode="" d="M1408 1408q0 -261 -106.5 -461.5t-266.5 -306.5q160 -106 266.5 -306.5t106.5 -461.5h96q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-1472q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h96q0 261 106.5 461.5t266.5 306.5q-160 106 -266.5 306.5t-106.5 461.5h-96q-14 0 -23 9 t-9 23v64q0 14 9 23t23 9h1472q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-96zM874 700q77 29 149 92.5t129.5 152.5t92.5 210t35 253h-1024q0 -132 35 -253t92.5 -210t129.5 -152.5t149 -92.5q19 -7 30.5 -23.5t11.5 -36.5t-11.5 -36.5t-30.5 -23.5q-77 -29 -149 -92.5 t-129.5 -152.5t-92.5 -210t-35 -253h1024q0 132 -35 253t-92.5 210t-129.5 152.5t-149 92.5q-19 7 -30.5 23.5t-11.5 36.5t11.5 36.5t30.5 23.5z" />
+<glyph unicode="" d="M1408 1408q0 -261 -106.5 -461.5t-266.5 -306.5q160 -106 266.5 -306.5t106.5 -461.5h96q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-1472q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h96q0 261 106.5 461.5t266.5 306.5q-160 106 -266.5 306.5t-106.5 461.5h-96q-14 0 -23 9 t-9 23v64q0 14 9 23t23 9h1472q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-96zM1280 1408h-1024q0 -66 9 -128h1006q9 61 9 128zM1280 -128q0 130 -34 249.5t-90.5 208t-126.5 152t-146 94.5h-230q-76 -31 -146 -94.5t-126.5 -152t-90.5 -208t-34 -249.5h1024z" />
+<glyph unicode="" d="M1408 1408q0 -261 -106.5 -461.5t-266.5 -306.5q160 -106 266.5 -306.5t106.5 -461.5h96q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-1472q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h96q0 261 106.5 461.5t266.5 306.5q-160 106 -266.5 306.5t-106.5 461.5h-96q-14 0 -23 9 t-9 23v64q0 14 9 23t23 9h1472q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-96zM1280 1408h-1024q0 -206 85 -384h854q85 178 85 384zM1223 192q-54 141 -145.5 241.5t-194.5 142.5h-230q-103 -42 -194.5 -142.5t-145.5 -241.5h910z" />
+<glyph unicode="" d="M1408 1408q0 -261 -106.5 -461.5t-266.5 -306.5q160 -106 266.5 -306.5t106.5 -461.5h96q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-1472q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h96q0 261 106.5 461.5t266.5 306.5q-160 106 -266.5 306.5t-106.5 461.5h-96q-14 0 -23 9 t-9 23v64q0 14 9 23t23 9h1472q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-96zM874 700q77 29 149 92.5t129.5 152.5t92.5 210t35 253h-1024q0 -132 35 -253t92.5 -210t129.5 -152.5t149 -92.5q19 -7 30.5 -23.5t11.5 -36.5t-11.5 -36.5t-30.5 -23.5q-137 -51 -244 -196 h700q-107 145 -244 196q-19 7 -30.5 23.5t-11.5 36.5t11.5 36.5t30.5 23.5z" />
+<glyph unicode="" d="M1504 -64q14 0 23 -9t9 -23v-128q0 -14 -9 -23t-23 -9h-1472q-14 0 -23 9t-9 23v128q0 14 9 23t23 9h1472zM130 0q3 55 16 107t30 95t46 87t53.5 76t64.5 69.5t66 60t70.5 55t66.5 47.5t65 43q-43 28 -65 43t-66.5 47.5t-70.5 55t-66 60t-64.5 69.5t-53.5 76t-46 87 t-30 95t-16 107h1276q-3 -55 -16 -107t-30 -95t-46 -87t-53.5 -76t-64.5 -69.5t-66 -60t-70.5 -55t-66.5 -47.5t-65 -43q43 -28 65 -43t66.5 -47.5t70.5 -55t66 -60t64.5 -69.5t53.5 -76t46 -87t30 -95t16 -107h-1276zM1504 1536q14 0 23 -9t9 -23v-128q0 -14 -9 -23t-23 -9 h-1472q-14 0 -23 9t-9 23v128q0 14 9 23t23 9h1472z" />
+<glyph unicode="" d="M768 1152q-53 0 -90.5 -37.5t-37.5 -90.5v-128h-32v93q0 48 -32 81.5t-80 33.5q-46 0 -79 -33t-33 -79v-429l-32 30v172q0 48 -32 81.5t-80 33.5q-46 0 -79 -33t-33 -79v-224q0 -47 35 -82l310 -296q39 -39 39 -102q0 -26 19 -45t45 -19h640q26 0 45 19t19 45v25 q0 41 10 77l108 436q10 36 10 77v246q0 48 -32 81.5t-80 33.5q-46 0 -79 -33t-33 -79v-32h-32v125q0 40 -25 72.5t-64 40.5q-14 2 -23 2q-46 0 -79 -33t-33 -79v-128h-32v122q0 51 -32.5 89.5t-82.5 43.5q-5 1 -13 1zM768 1280q84 0 149 -50q57 34 123 34q59 0 111 -27 t86 -76q27 7 59 7q100 0 170 -71.5t70 -171.5v-246q0 -51 -13 -108l-109 -436q-6 -24 -6 -71q0 -80 -56 -136t-136 -56h-640q-84 0 -138 58.5t-54 142.5l-308 296q-76 73 -76 175v224q0 99 70.5 169.5t169.5 70.5q11 0 16 -1q6 95 75.5 160t164.5 65q52 0 98 -21 q72 69 174 69z" />
+<glyph unicode="" horiz-adv-x="1792" d="M880 1408q-46 0 -79 -33t-33 -79v-656h-32v528q0 46 -33 79t-79 33t-79 -33t-33 -79v-528v-256l-154 205q-38 51 -102 51q-53 0 -90.5 -37.5t-37.5 -90.5q0 -43 26 -77l384 -512q38 -51 102 -51h688q34 0 61 22t34 56l76 405q5 32 5 59v498q0 46 -33 79t-79 33t-79 -33 t-33 -79v-272h-32v528q0 46 -33 79t-79 33t-79 -33t-33 -79v-528h-32v656q0 46 -33 79t-79 33zM880 1536q68 0 125.5 -35.5t88.5 -96.5q19 4 42 4q99 0 169.5 -70.5t70.5 -169.5v-17q105 6 180.5 -64t75.5 -175v-498q0 -40 -8 -83l-76 -404q-14 -79 -76.5 -131t-143.5 -52 h-688q-60 0 -114.5 27.5t-90.5 74.5l-384 512q-51 68 -51 154q0 106 75 181t181 75q78 0 128 -34v434q0 99 70.5 169.5t169.5 70.5q23 0 42 -4q31 61 88.5 96.5t125.5 35.5z" />
+<glyph unicode="" horiz-adv-x="1792" d="M1073 -128h-177q-163 0 -226 141q-23 49 -23 102v5q-62 30 -98.5 88.5t-36.5 127.5q0 38 5 48h-261q-106 0 -181 75t-75 181t75 181t181 75h113l-44 17q-74 28 -119.5 93.5t-45.5 145.5q0 106 75 181t181 75q46 0 91 -17l628 -239h401q106 0 181 -75t75 -181v-668 q0 -88 -54 -157.5t-140 -90.5l-339 -85q-92 -23 -186 -23zM1024 583l-155 -71l-163 -74q-30 -14 -48 -41.5t-18 -60.5q0 -46 33 -79t79 -33q26 0 46 10l338 154q-49 10 -80.5 50t-31.5 90v55zM1344 272q0 46 -33 79t-79 33q-26 0 -46 -10l-290 -132q-28 -13 -37 -17 t-30.5 -17t-29.5 -23.5t-16 -29t-8 -40.5q0 -50 31.5 -82t81.5 -32q20 0 38 9l352 160q30 14 48 41.5t18 60.5zM1112 1024l-650 248q-24 8 -46 8q-53 0 -90.5 -37.5t-37.5 -90.5q0 -40 22.5 -73t59.5 -47l526 -200v-64h-640q-53 0 -90.5 -37.5t-37.5 -90.5t37.5 -90.5 t90.5 -37.5h535l233 106v198q0 63 46 106l111 102h-69zM1073 0q82 0 155 19l339 85q43 11 70 45.5t27 78.5v668q0 53 -37.5 90.5t-90.5 37.5h-308l-136 -126q-36 -33 -36 -82v-296q0 -46 33 -77t79 -31t79 35t33 81v208h32v-208q0 -70 -57 -114q52 -8 86.5 -48.5t34.5 -93.5 q0 -42 -23 -78t-61 -53l-310 -141h91z" />
+<glyph unicode="" horiz-adv-x="2048" d="M1151 1536q61 0 116 -28t91 -77l572 -781q118 -159 118 -359v-355q0 -80 -56 -136t-136 -56h-384q-80 0 -136 56t-56 136v177l-286 143h-546q-80 0 -136 56t-56 136v32q0 119 84.5 203.5t203.5 84.5h420l42 128h-686q-100 0 -173.5 67.5t-81.5 166.5q-65 79 -65 182v32 q0 80 56 136t136 56h959zM1920 -64v355q0 157 -93 284l-573 781q-39 52 -103 52h-959q-26 0 -45 -19t-19 -45q0 -32 1.5 -49.5t9.5 -40.5t25 -43q10 31 35.5 50t56.5 19h832v-32h-832q-26 0 -45 -19t-19 -45q0 -44 3 -58q8 -44 44 -73t81 -29h640h91q40 0 68 -28t28 -68 q0 -15 -5 -30l-64 -192q-10 -29 -35 -47.5t-56 -18.5h-443q-66 0 -113 -47t-47 -113v-32q0 -26 19 -45t45 -19h561q16 0 29 -7l317 -158q24 -13 38.5 -36t14.5 -50v-197q0 -26 19 -45t45 -19h384q26 0 45 19t19 45z" />
+<glyph unicode="" horiz-adv-x="2048" d="M816 1408q-48 0 -79.5 -34t-31.5 -82q0 -14 3 -28l150 -624h-26l-116 482q-9 38 -39.5 62t-69.5 24q-47 0 -79 -34t-32 -81q0 -11 4 -29q3 -13 39 -161t68 -282t32 -138v-227l-307 230q-34 26 -77 26q-52 0 -89.5 -36.5t-37.5 -88.5q0 -67 56 -110l507 -379 q34 -26 76 -26h694q33 0 59 20.5t34 52.5l100 401q8 30 10 88t9 86l116 478q3 12 3 26q0 46 -33 79t-80 33q-38 0 -69 -25.5t-40 -62.5l-99 -408h-26l132 547q3 14 3 28q0 47 -32 80t-80 33q-38 0 -68.5 -24t-39.5 -62l-145 -602h-127l-164 682q-9 38 -39.5 62t-68.5 24z M1461 -256h-694q-85 0 -153 51l-507 380q-50 38 -78.5 94t-28.5 118q0 105 75 179t180 74q25 0 49.5 -5.5t41.5 -11t41 -20.5t35 -23t38.5 -29.5t37.5 -28.5l-123 512q-7 35 -7 59q0 93 60 162t152 79q14 87 80.5 144.5t155.5 57.5q83 0 148 -51.5t85 -132.5l103 -428 l83 348q20 81 85 132.5t148 51.5q87 0 152.5 -54t82.5 -139q93 -10 155 -78t62 -161q0 -30 -7 -57l-116 -477q-5 -22 -5 -67q0 -51 -13 -108l-101 -401q-19 -75 -79.5 -122.5t-137.5 -47.5z" />
+<glyph unicode="" horiz-adv-x="1792" d="M640 1408q-53 0 -90.5 -37.5t-37.5 -90.5v-512v-384l-151 202q-41 54 -107 54q-52 0 -89 -38t-37 -90q0 -43 26 -77l384 -512q38 -51 102 -51h718q22 0 39.5 13.5t22.5 34.5l92 368q24 96 24 194v217q0 41 -28 71t-68 30t-68 -28t-28 -68h-32v61q0 48 -32 81.5t-80 33.5 q-46 0 -79 -33t-33 -79v-64h-32v90q0 55 -37 94.5t-91 39.5q-53 0 -90.5 -37.5t-37.5 -90.5v-96h-32v570q0 55 -37 94.5t-91 39.5zM640 1536q107 0 181.5 -77.5t74.5 -184.5v-220q22 2 32 2q99 0 173 -69q47 21 99 21q113 0 184 -87q27 7 56 7q94 0 159 -67.5t65 -161.5 v-217q0 -116 -28 -225l-92 -368q-16 -64 -68 -104.5t-118 -40.5h-718q-60 0 -114.5 27.5t-90.5 74.5l-384 512q-51 68 -51 154q0 105 74.5 180.5t179.5 75.5q71 0 130 -35v547q0 106 75 181t181 75zM768 128v384h-32v-384h32zM1024 128v384h-32v-384h32zM1280 128v384h-32 v-384h32z" />
+<glyph unicode="" d="M1288 889q60 0 107 -23q141 -63 141 -226v-177q0 -94 -23 -186l-85 -339q-21 -86 -90.5 -140t-157.5 -54h-668q-106 0 -181 75t-75 181v401l-239 628q-17 45 -17 91q0 106 75 181t181 75q80 0 145.5 -45.5t93.5 -119.5l17 -44v113q0 106 75 181t181 75t181 -75t75 -181 v-261q27 5 48 5q69 0 127.5 -36.5t88.5 -98.5zM1072 896q-33 0 -60.5 -18t-41.5 -48l-74 -163l-71 -155h55q50 0 90 -31.5t50 -80.5l154 338q10 20 10 46q0 46 -33 79t-79 33zM1293 761q-22 0 -40.5 -8t-29 -16t-23.5 -29.5t-17 -30.5t-17 -37l-132 -290q-10 -20 -10 -46 q0 -46 33 -79t79 -33q33 0 60.5 18t41.5 48l160 352q9 18 9 38q0 50 -32 81.5t-82 31.5zM128 1120q0 -22 8 -46l248 -650v-69l102 111q43 46 106 46h198l106 233v535q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5v-640h-64l-200 526q-14 37 -47 59.5t-73 22.5 q-53 0 -90.5 -37.5t-37.5 -90.5zM1180 -128q44 0 78.5 27t45.5 70l85 339q19 73 19 155v91l-141 -310q-17 -38 -53 -61t-78 -23q-53 0 -93.5 34.5t-48.5 86.5q-44 -57 -114 -57h-208v32h208q46 0 81 33t35 79t-31 79t-77 33h-296q-49 0 -82 -36l-126 -136v-308 q0 -53 37.5 -90.5t90.5 -37.5h668z" />
+<glyph unicode="" horiz-adv-x="1973" d="M857 992v-117q0 -13 -9.5 -22t-22.5 -9h-298v-812q0 -13 -9 -22.5t-22 -9.5h-135q-13 0 -22.5 9t-9.5 23v812h-297q-13 0 -22.5 9t-9.5 22v117q0 14 9 23t23 9h793q13 0 22.5 -9.5t9.5 -22.5zM1895 995l77 -961q1 -13 -8 -24q-10 -10 -23 -10h-134q-12 0 -21 8.5 t-10 20.5l-46 588l-189 -425q-8 -19 -29 -19h-120q-20 0 -29 19l-188 427l-45 -590q-1 -12 -10 -20.5t-21 -8.5h-135q-13 0 -23 10q-9 10 -9 24l78 961q1 12 10 20.5t21 8.5h142q20 0 29 -19l220 -520q10 -24 20 -51q3 7 9.5 24.5t10.5 26.5l221 520q9 19 29 19h141 q13 0 22 -8.5t10 -20.5z" />
+<glyph unicode="" horiz-adv-x="1792" d="M1042 833q0 88 -60 121q-33 18 -117 18h-123v-281h162q66 0 102 37t36 105zM1094 548l205 -373q8 -17 -1 -31q-8 -16 -27 -16h-152q-20 0 -28 17l-194 365h-155v-350q0 -14 -9 -23t-23 -9h-134q-14 0 -23 9t-9 23v960q0 14 9 23t23 9h294q128 0 190 -24q85 -31 134 -109 t49 -180q0 -92 -42.5 -165.5t-115.5 -109.5q6 -10 9 -16zM896 1376q-150 0 -286 -58.5t-234.5 -157t-157 -234.5t-58.5 -286t58.5 -286t157 -234.5t234.5 -157t286 -58.5t286 58.5t234.5 157t157 234.5t58.5 286t-58.5 286t-157 234.5t-234.5 157t-286 58.5zM1792 640 q0 -182 -71 -348t-191 -286t-286 -191t-348 -71t-348 71t-286 191t-191 286t-71 348t71 348t191 286t286 191t348 71t348 -71t286 -191t191 -286t71 -348z" />
+<glyph unicode="" horiz-adv-x="1792" d="M605 303q153 0 257 104q14 18 3 36l-45 82q-6 13 -24 17q-16 2 -27 -11l-4 -3q-4 -4 -11.5 -10t-17.5 -13t-23.5 -14.5t-28.5 -13.5t-33.5 -9.5t-37.5 -3.5q-76 0 -125 50t-49 127q0 76 48 125.5t122 49.5q37 0 71.5 -14t50.5 -28l16 -14q11 -11 26 -10q16 2 24 14l53 78 q13 20 -2 39q-3 4 -11 12t-30 23.5t-48.5 28t-67.5 22.5t-86 10q-148 0 -246 -96.5t-98 -240.5q0 -146 97 -241.5t247 -95.5zM1235 303q153 0 257 104q14 18 4 36l-45 82q-8 14 -25 17q-16 2 -27 -11l-4 -3q-4 -4 -11.5 -10t-17.5 -13t-23.5 -14.5t-28.5 -13.5t-33.5 -9.5 t-37.5 -3.5q-76 0 -125 50t-49 127q0 76 48 125.5t122 49.5q37 0 71.5 -14t50.5 -28l16 -14q11 -11 26 -10q16 2 24 14l53 78q13 20 -2 39q-3 4 -11 12t-30 23.5t-48.5 28t-67.5 22.5t-86 10q-147 0 -245.5 -96.5t-98.5 -240.5q0 -146 97 -241.5t247 -95.5zM896 1376 q-150 0 -286 -58.5t-234.5 -157t-157 -234.5t-58.5 -286t58.5 -286t157 -234.5t234.5 -157t286 -58.5t286 58.5t234.5 157t157 234.5t58.5 286t-58.5 286t-157 234.5t-234.5 157t-286 58.5zM896 1536q182 0 348 -71t286 -191t191 -286t71 -348t-71 -348t-191 -286t-286 -191 t-348 -71t-348 71t-286 191t-191 286t-71 348t71 348t191 286t286 191t348 71z" />
+<glyph unicode="" horiz-adv-x="2048" d="M736 736l384 -384l-384 -384l-672 672l672 672l168 -168l-96 -96l-72 72l-480 -480l480 -480l193 193l-289 287zM1312 1312l672 -672l-672 -672l-168 168l96 96l72 -72l480 480l-480 480l-193 -193l289 -287l-96 -96l-384 384z" />
+<glyph unicode="" horiz-adv-x="1792" d="M717 182l271 271l-279 279l-88 -88l192 -191l-96 -96l-279 279l279 279l40 -40l87 87l-127 128l-454 -454zM1075 190l454 454l-454 454l-271 -271l279 -279l88 88l-192 191l96 96l279 -279l-279 -279l-40 40l-87 -88zM1792 640q0 -182 -71 -348t-191 -286t-286 -191 t-348 -71t-348 71t-286 191t-191 286t-71 348t71 348t191 286t286 191t348 71t348 -71t286 -191t191 -286t71 -348z" />
+<glyph unicode="" horiz-adv-x="2304" d="M651 539q0 -39 -27.5 -66.5t-65.5 -27.5q-39 0 -66.5 27.5t-27.5 66.5q0 38 27.5 65.5t66.5 27.5q38 0 65.5 -27.5t27.5 -65.5zM1805 540q0 -39 -27.5 -66.5t-66.5 -27.5t-66.5 27.5t-27.5 66.5t27.5 66t66.5 27t66.5 -27t27.5 -66zM765 539q0 79 -56.5 136t-136.5 57 t-136.5 -56.5t-56.5 -136.5t56.5 -136.5t136.5 -56.5t136.5 56.5t56.5 136.5zM1918 540q0 80 -56.5 136.5t-136.5 56.5q-79 0 -136 -56.5t-57 -136.5t56.5 -136.5t136.5 -56.5t136.5 56.5t56.5 136.5zM850 539q0 -116 -81.5 -197.5t-196.5 -81.5q-116 0 -197.5 82t-81.5 197 t82 196.5t197 81.5t196.5 -81.5t81.5 -196.5zM2004 540q0 -115 -81.5 -196.5t-197.5 -81.5q-115 0 -196.5 81.5t-81.5 196.5t81.5 196.5t196.5 81.5q116 0 197.5 -81.5t81.5 -196.5zM1040 537q0 191 -135.5 326.5t-326.5 135.5q-125 0 -231 -62t-168 -168.5t-62 -231.5 t62 -231.5t168 -168.5t231 -62q191 0 326.5 135.5t135.5 326.5zM1708 1110q-254 111 -556 111q-319 0 -573 -110q117 0 223 -45.5t182.5 -122.5t122 -183t45.5 -223q0 115 43.5 219.5t118 180.5t177.5 123t217 50zM2187 537q0 191 -135 326.5t-326 135.5t-326.5 -135.5 t-135.5 -326.5t135.5 -326.5t326.5 -135.5t326 135.5t135 326.5zM1921 1103h383q-44 -51 -75 -114.5t-40 -114.5q110 -151 110 -337q0 -156 -77 -288t-209 -208.5t-287 -76.5q-133 0 -249 56t-196 155q-47 -56 -129 -179q-11 22 -53.5 82.5t-74.5 97.5 q-80 -99 -196.5 -155.5t-249.5 -56.5q-155 0 -287 76.5t-209 208.5t-77 288q0 186 110 337q-9 51 -40 114.5t-75 114.5h365q149 100 355 156.5t432 56.5q224 0 421 -56t348 -157z" />
+<glyph unicode="" horiz-adv-x="1280" d="M640 629q-188 0 -321 133t-133 320q0 188 133 321t321 133t321 -133t133 -321q0 -187 -133 -320t-321 -133zM640 1306q-92 0 -157.5 -65.5t-65.5 -158.5q0 -92 65.5 -157.5t157.5 -65.5t157.5 65.5t65.5 157.5q0 93 -65.5 158.5t-157.5 65.5zM1163 574q13 -27 15 -49.5 t-4.5 -40.5t-26.5 -38.5t-42.5 -37t-61.5 -41.5q-115 -73 -315 -94l73 -72l267 -267q30 -31 30 -74t-30 -73l-12 -13q-31 -30 -74 -30t-74 30q-67 68 -267 268l-267 -268q-31 -30 -74 -30t-73 30l-12 13q-31 30 -31 73t31 74l267 267l72 72q-203 21 -317 94 q-39 25 -61.5 41.5t-42.5 37t-26.5 38.5t-4.5 40.5t15 49.5q10 20 28 35t42 22t56 -2t65 -35q5 -4 15 -11t43 -24.5t69 -30.5t92 -24t113 -11q91 0 174 25.5t120 50.5l38 25q33 26 65 35t56 2t42 -22t28 -35z" />
+<glyph unicode="" d="M927 956q0 -66 -46.5 -112.5t-112.5 -46.5t-112.5 46.5t-46.5 112.5t46.5 112.5t112.5 46.5t112.5 -46.5t46.5 -112.5zM1141 593q-10 20 -28 32t-47.5 9.5t-60.5 -27.5q-10 -8 -29 -20t-81 -32t-127 -20t-124 18t-86 36l-27 18q-31 25 -60.5 27.5t-47.5 -9.5t-28 -32 q-22 -45 -2 -74.5t87 -73.5q83 -53 226 -67l-51 -52q-142 -142 -191 -190q-22 -22 -22 -52.5t22 -52.5l9 -9q22 -22 52.5 -22t52.5 22l191 191q114 -115 191 -191q22 -22 52.5 -22t52.5 22l9 9q22 22 22 52.5t-22 52.5l-191 190l-52 52q141 14 225 67q67 44 87 73.5t-2 74.5 zM1092 956q0 134 -95 229t-229 95t-229 -95t-95 -229t95 -229t229 -95t229 95t95 229zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
+<glyph unicode="" horiz-adv-x="1720" d="M1565 1408q65 0 110 -45.5t45 -110.5v-519q0 -176 -68 -336t-182.5 -275t-274 -182.5t-334.5 -67.5q-176 0 -335.5 67.5t-274.5 182.5t-183 275t-68 336v519q0 64 46 110t110 46h1409zM861 344q47 0 82 33l404 388q37 35 37 85q0 49 -34.5 83.5t-83.5 34.5q-47 0 -82 -33 l-323 -310l-323 310q-35 33 -81 33q-49 0 -83.5 -34.5t-34.5 -83.5q0 -51 36 -85l405 -388q33 -33 81 -33z" />
+<glyph unicode="" horiz-adv-x="2304" d="M1494 -103l-295 695q-25 -49 -158.5 -305.5t-198.5 -389.5q-1 -1 -27.5 -0.5t-26.5 1.5q-82 193 -255.5 587t-259.5 596q-21 50 -66.5 107.5t-103.5 100.5t-102 43q0 5 -0.5 24t-0.5 27h583v-50q-39 -2 -79.5 -16t-66.5 -43t-10 -64q26 -59 216.5 -499t235.5 -540 q31 61 140 266.5t131 247.5q-19 39 -126 281t-136 295q-38 69 -201 71v50l513 -1v-47q-60 -2 -93.5 -25t-12.5 -69q33 -70 87 -189.5t86 -187.5q110 214 173 363q24 55 -10 79.5t-129 26.5q1 7 1 25v24q64 0 170.5 0.5t180 1t92.5 0.5v-49q-62 -2 -119 -33t-90 -81 l-213 -442q13 -33 127.5 -290t121.5 -274l441 1017q-14 38 -49.5 62.5t-65 31.5t-55.5 8v50l460 -4l1 -2l-1 -44q-139 -4 -201 -145q-526 -1216 -559 -1291h-49z" />
+<glyph unicode="" horiz-adv-x="1792" d="M949 643q0 -26 -16.5 -45t-41.5 -19q-26 0 -45 16.5t-19 41.5q0 26 17 45t42 19t44 -16.5t19 -41.5zM964 585l350 581q-9 -8 -67.5 -62.5t-125.5 -116.5t-136.5 -127t-117 -110.5t-50.5 -51.5l-349 -580q7 7 67 62t126 116.5t136 127t117 111t50 50.5zM1611 640 q0 -201 -104 -371q-3 2 -17 11t-26.5 16.5t-16.5 7.5q-13 0 -13 -13q0 -10 59 -44q-74 -112 -184.5 -190.5t-241.5 -110.5l-16 67q-1 10 -15 10q-5 0 -8 -5.5t-2 -9.5l16 -68q-72 -15 -146 -15q-199 0 -372 105q1 2 13 20.5t21.5 33.5t9.5 19q0 13 -13 13q-6 0 -17 -14.5 t-22.5 -34.5t-13.5 -23q-113 75 -192 187.5t-110 244.5l69 15q10 3 10 15q0 5 -5.5 8t-10.5 2l-68 -15q-14 72 -14 139q0 206 109 379q2 -1 18.5 -12t30 -19t17.5 -8q13 0 13 12q0 6 -12.5 15.5t-32.5 21.5l-20 12q77 112 189 189t244 107l15 -67q2 -10 15 -10q5 0 8 5.5 t2 10.5l-15 66q71 13 134 13q204 0 379 -109q-39 -56 -39 -65q0 -13 12 -13q11 0 48 64q111 -75 187.5 -186t107.5 -241l-56 -12q-10 -2 -10 -16q0 -5 5.5 -8t9.5 -2l57 13q14 -72 14 -140zM1696 640q0 163 -63.5 311t-170.5 255t-255 170.5t-311 63.5t-311 -63.5 t-255 -170.5t-170.5 -255t-63.5 -311t63.5 -311t170.5 -255t255 -170.5t311 -63.5t311 63.5t255 170.5t170.5 255t63.5 311zM1792 640q0 -182 -71 -348t-191 -286t-286 -191t-348 -71t-348 71t-286 191t-191 286t-71 348t71 348t191 286t286 191t348 71t348 -71t286 -191 t191 -286t71 -348z" />
+<glyph unicode="" horiz-adv-x="1792" d="M893 1536q240 2 451 -120q232 -134 352 -372l-742 39q-160 9 -294 -74.5t-185 -229.5l-276 424q128 159 311 245.5t383 87.5zM146 1131l337 -663q72 -143 211 -217t293 -45l-230 -451q-212 33 -385 157.5t-272.5 316t-99.5 411.5q0 267 146 491zM1732 962 q58 -150 59.5 -310.5t-48.5 -306t-153 -272t-246 -209.5q-230 -133 -498 -119l405 623q88 131 82.5 290.5t-106.5 277.5zM896 942q125 0 213.5 -88.5t88.5 -213.5t-88.5 -213.5t-213.5 -88.5t-213.5 88.5t-88.5 213.5t88.5 213.5t213.5 88.5z" />
+<glyph unicode="" horiz-adv-x="1792" d="M903 -256q-283 0 -504.5 150.5t-329.5 398.5q-58 131 -67 301t26 332.5t111 312t179 242.5l-11 -281q11 14 68 15.5t70 -15.5q42 81 160.5 138t234.5 59q-54 -45 -119.5 -148.5t-58.5 -163.5q25 -8 62.5 -13.5t63 -7.5t68 -4t50.5 -3q15 -5 9.5 -45.5t-30.5 -75.5 q-5 -7 -16.5 -18.5t-56.5 -35.5t-101 -34l15 -189l-139 67q-18 -43 -7.5 -81.5t36 -66.5t65.5 -41.5t81 -6.5q51 9 98 34.5t83.5 45t73.5 17.5q61 -4 89.5 -33t19.5 -65q-1 -2 -2.5 -5.5t-8.5 -12.5t-18 -15.5t-31.5 -10.5t-46.5 -1q-60 -95 -144.5 -135.5t-209.5 -29.5 q74 -61 162.5 -82.5t168.5 -6t154.5 52t128 87.5t80.5 104q43 91 39 192.5t-37.5 188.5t-78.5 125q87 -38 137 -79.5t77 -112.5q15 170 -57.5 343t-209.5 284q265 -77 412 -279.5t151 -517.5q2 -127 -40.5 -255t-123.5 -238t-189 -196t-247.5 -135.5t-288.5 -49.5z" />
+<glyph unicode="" d="M768 -92q77 0 139.5 63t100.5 166t59 234.5t21 268.5t-21 268.5t-59 234.5t-100.5 166t-139.5 63t-139.5 -63t-100.5 -166t-59 -234.5t-21 -268.5t21 -268.5t59 -234.5t100.5 -166t139.5 -63zM768 -256q-184 0 -333 77t-240 203t-141 287t-50 329t50 329t141 287t240 203 t333 77q148 0 274 -50t214.5 -136t151.5 -201t92.5 -244t29.5 -265t-29.5 -265t-92.5 -244t-151.5 -201t-214.5 -136t-274 -50z" />
+<glyph unicode="" horiz-adv-x="1792" d="M716 -69q-143 35 -261.5 114t-197.5 191q-139 -300 -17 -398q26 -21 85 -24.5t127.5 9.5t141 41.5t122.5 66.5zM693 762h452q0 108 -61.5 169t-168.5 61q-103 0 -162.5 -62.5t-59.5 -167.5zM1724 1137h-34q26 102 22.5 170t-25 110t-63.5 57t-93.5 11t-115 -26.5 t-128.5 -56.5t-134 -79q129 -37 238.5 -113.5t185 -179t110 -231.5t15.5 -262h-1005q0 -60 10 -106t34 -85t69.5 -60t112.5 -21q87 0 142.5 44t72.5 122h540q-71 -230 -281.5 -377t-477.5 -147q-83 0 -159 15q-35 -40 -151 -94t-248 -78t-219 35q-78 60 -100 159t7 214 t88 242t143.5 248t173.5 226.5t177.5 183.5t156.5 112v24q-120 -37 -258.5 -137.5t-240.5 -207t-159 -195.5q4 106 34 201t80 169t118 135.5t147.5 100.5t168 65.5t180.5 29.5t185 -8q310 186 503 189h7q57 0 103 -18q80 -30 98 -132.5t-30 -248.5z" />
+<glyph unicode="" horiz-adv-x="2048" d="M1792 288v960q0 13 -9.5 22.5t-22.5 9.5h-1600q-13 0 -22.5 -9.5t-9.5 -22.5v-960q0 -13 9.5 -22.5t22.5 -9.5h1600q13 0 22.5 9.5t9.5 22.5zM1920 1248v-960q0 -66 -47 -113t-113 -47h-736v-128h352q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-832q-14 0 -23 9t-9 23 v64q0 14 9 23t23 9h352v128h-736q-66 0 -113 47t-47 113v960q0 66 47 113t113 47h1600q66 0 113 -47t47 -113z" />
+<glyph unicode="" horiz-adv-x="1792" d="M138 1408h197q-70 -64 -126 -149q-36 -56 -59 -115t-30 -125.5t-8.5 -120t10.5 -132t21 -126t28 -136.5q4 -19 6 -28q51 -238 81 -329q57 -171 152 -275h-272q-48 0 -82 34t-34 82v1304q0 48 34 82t82 34zM1346 1408h308q48 0 82 -34t34 -82v-1304q0 -48 -34 -82t-82 -34 h-178q212 210 196 565l-469 -101q-2 -45 -12 -82t-31 -72t-59.5 -59.5t-93.5 -36.5q-123 -26 -199 40q-32 27 -53 61t-51.5 129t-64.5 258q-35 163 -45.5 263t-5.5 139t23 77q20 41 62.5 73t102.5 45q45 12 83.5 6.5t67 -17t54 -35t43 -48t34.5 -56.5l468 100 q-68 175 -180 287z" />
+<glyph unicode="" horiz-adv-x="2304" d="M1391 390v0l-1 1q-15 18 -34.5 37.5t-62.5 57.5t-93.5 62t-95.5 24q-48 0 -83 -21.5t-51 -54t-23 -59t-7 -47.5v0v0q0 -21 7 -48t23 -59t51 -53.5t83 -21.5q45 0 95.5 24t94 62.5t62 57t34.5 37.5zM2103 390q0 21 -7 47.5t-23 59t-51 54t-83 21.5q-45 0 -95.5 -24 t-94 -62.5t-62 -57t-34.5 -37.5l-1 -1v0v0l1 -1q15 -18 34.5 -37.5t62.5 -57.5t93.5 -62t95.5 -24q48 0 83 21.5t51 53.5t23 59t7 48zM2304 393q0 -69 -24 -137.5t-68 -126t-116 -93.5t-159 -36q-68 0 -134 24t-113.5 58.5t-84.5 69.5t-59.5 59t-25.5 24t-22.5 -24 t-54.5 -58.5t-81.5 -69.5t-115 -59t-143.5 -24q-65 0 -123.5 22.5t-96.5 54t-66.5 66.5t-41 59.5t-12.5 32.5q0 -8 -8.5 -26.5t-25 -45.5t-47 -55t-69 -52.5t-96.5 -40t-125 -15.5q-71 0 -130 15.5t-98.5 39.5t-70.5 56.5t-48 63.5t-27.5 63.5t-14 54t-3.5 36.5h217 q0 -55 49 -107.5t126 -52.5q79 0 134.5 67t55.5 148q0 80 -52 136.5t-138 56.5q-5 0 -13 -0.5t-31 -5t-43 -12t-42 -24.5t-34 -40h-195l102 583h602v-174h-445q-27 -159 -41 -248q4 0 16.5 13t31.5 28.5t65 28.5t108 13t114 -20.5t82.5 -49.5t51.5 -58.5t31 -50t11 -20.5 t13 25t36.5 60.5t60.5 71.5t97 61t133 25t140.5 -25t115.5 -60.5t83.5 -71.5t56.5 -61t21 -25q2 0 22 25t56 60.5t83.5 71.5t115.5 61t140 25q92 0 164.5 -35t115.5 -93t65 -125t22 -137z" />
+<glyph unicode="" horiz-adv-x="1792" d="M1551 60q15 6 26 3t11 -17.5t-15 -33.5q-13 -16 -44 -43.5t-95.5 -68t-141 -74t-188 -58t-229.5 -24.5q-119 0 -238 31t-209 76.5t-172.5 104t-132.5 105t-84 87.5q-8 9 -10 16.5t1 12t8 7t11.5 2t11.5 -4.5q192 -117 300 -166q389 -176 799 -90q190 40 391 135z M1758 175q11 -16 2.5 -69.5t-28.5 -102.5q-34 -83 -85 -124q-17 -14 -26 -9t0 24q21 45 44.5 121.5t6.5 98.5q-5 7 -15.5 11.5t-27 6t-29.5 2.5t-35 0t-31.5 -2t-31 -3t-22.5 -2q-6 -1 -13 -1.5t-11 -1t-8.5 -1t-7 -0.5h-5.5h-4.5t-3 0.5t-2 1.5l-1.5 3q-6 16 47 40t103 30 q46 7 108 1t76 -24zM1364 618q0 -31 13.5 -64t32 -58t37.5 -46t33 -32l13 -11l-227 -224q-40 37 -79 75.5t-58 58.5l-19 20q-11 11 -25 33q-38 -59 -97.5 -102.5t-127.5 -63.5t-140 -23t-137.5 21t-117.5 65.5t-83 113t-31 162.5q0 84 28 154t72 116.5t106.5 83t122.5 57 t130 34.5t119.5 18.5t99.5 6.5v127q0 65 -21 97q-34 53 -121 53q-6 0 -16.5 -1t-40.5 -12t-56 -29.5t-56 -59.5t-48 -96l-294 27q0 60 22 119t67 113t108 95t151.5 65.5t190.5 24.5q100 0 181 -25t129.5 -61.5t81 -83t45 -86t12.5 -73.5v-589zM692 597q0 -86 70 -133 q66 -44 139 -22q84 25 114 123q14 45 14 101v162q-59 -2 -111 -12t-106.5 -33.5t-87 -71t-32.5 -114.5z" />
+<glyph unicode="" horiz-adv-x="1792" d="M1536 1280q52 0 90 -38t38 -90v-1280q0 -52 -38 -90t-90 -38h-1408q-52 0 -90 38t-38 90v1280q0 52 38 90t90 38h128v96q0 66 47 113t113 47h64q66 0 113 -47t47 -113v-96h384v96q0 66 47 113t113 47h64q66 0 113 -47t47 -113v-96h128zM1152 1376v-288q0 -14 9 -23t23 -9 h64q14 0 23 9t9 23v288q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23zM384 1376v-288q0 -14 9 -23t23 -9h64q14 0 23 9t9 23v288q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23zM1536 -128v1024h-1408v-1024h1408zM896 448h224q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-224 v-224q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v224h-224q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h224v224q0 14 9 23t23 9h64q14 0 23 -9t9 -23v-224z" />
+<glyph unicode="" horiz-adv-x="1792" d="M1152 416v-64q0 -14 -9 -23t-23 -9h-576q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h576q14 0 23 -9t9 -23zM128 -128h1408v1024h-1408v-1024zM512 1088v288q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-288q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM1280 1088v288q0 14 -9 23 t-23 9h-64q-14 0 -23 -9t-9 -23v-288q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM1664 1152v-1280q0 -52 -38 -90t-90 -38h-1408q-52 0 -90 38t-38 90v1280q0 52 38 90t90 38h128v96q0 66 47 113t113 47h64q66 0 113 -47t47 -113v-96h384v96q0 66 47 113t113 47h64q66 0 113 -47 t47 -113v-96h128q52 0 90 -38t38 -90z" />
+<glyph unicode="" horiz-adv-x="1792" d="M1111 151l-46 -46q-9 -9 -22 -9t-23 9l-188 189l-188 -189q-10 -9 -23 -9t-22 9l-46 46q-9 9 -9 22t9 23l189 188l-189 188q-9 10 -9 23t9 22l46 46q9 9 22 9t23 -9l188 -188l188 188q10 9 23 9t22 -9l46 -46q9 -9 9 -22t-9 -23l-188 -188l188 -188q9 -10 9 -23t-9 -22z M128 -128h1408v1024h-1408v-1024zM512 1088v288q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-288q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM1280 1088v288q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-288q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM1664 1152v-1280 q0 -52 -38 -90t-90 -38h-1408q-52 0 -90 38t-38 90v1280q0 52 38 90t90 38h128v96q0 66 47 113t113 47h64q66 0 113 -47t47 -113v-96h384v96q0 66 47 113t113 47h64q66 0 113 -47t47 -113v-96h128q52 0 90 -38t38 -90z" />
+<glyph unicode="" horiz-adv-x="1792" d="M1303 572l-512 -512q-10 -9 -23 -9t-23 9l-288 288q-9 10 -9 23t9 22l46 46q9 9 22 9t23 -9l220 -220l444 444q10 9 23 9t22 -9l46 -46q9 -9 9 -22t-9 -23zM128 -128h1408v1024h-1408v-1024zM512 1088v288q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-288q0 -14 9 -23 t23 -9h64q14 0 23 9t9 23zM1280 1088v288q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-288q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM1664 1152v-1280q0 -52 -38 -90t-90 -38h-1408q-52 0 -90 38t-38 90v1280q0 52 38 90t90 38h128v96q0 66 47 113t113 47h64q66 0 113 -47 t47 -113v-96h384v96q0 66 47 113t113 47h64q66 0 113 -47t47 -113v-96h128q52 0 90 -38t38 -90z" />
+<glyph unicode="" horiz-adv-x="1792" d="M448 1536q26 0 45 -19t19 -45v-891l536 429q17 14 40 14q26 0 45 -19t19 -45v-379l536 429q17 14 40 14q26 0 45 -19t19 -45v-1152q0 -26 -19 -45t-45 -19h-1664q-26 0 -45 19t-19 45v1664q0 26 19 45t45 19h384z" />
+<glyph unicode="" horiz-adv-x="1024" d="M512 448q66 0 128 15v-655q0 -26 -19 -45t-45 -19h-128q-26 0 -45 19t-19 45v655q61 -15 128 -15zM512 1536q212 0 362 -150t150 -362t-150 -362t-362 -150t-362 150t-150 362t150 362t362 150zM512 1312q14 0 23 9t9 23t-9 23t-23 9q-146 0 -249 -103t-103 -249 q0 -14 9 -23t23 -9t23 9t9 23q0 119 84.5 203.5t203.5 84.5z" />
+<glyph unicode="" horiz-adv-x="1792" d="M1745 1239q10 -10 10 -23t-10 -23l-141 -141q-28 -28 -68 -28h-1344q-26 0 -45 19t-19 45v256q0 26 19 45t45 19h576v64q0 26 19 45t45 19h128q26 0 45 -19t19 -45v-64h512q40 0 68 -28zM768 320h256v-512q0 -26 -19 -45t-45 -19h-128q-26 0 -45 19t-19 45v512zM1600 768 q26 0 45 -19t19 -45v-256q0 -26 -19 -45t-45 -19h-1344q-40 0 -68 28l-141 141q-10 10 -10 23t10 23l141 141q28 28 68 28h512v192h256v-192h576z" />
+<glyph unicode="" horiz-adv-x="2048" d="M2020 1525q28 -20 28 -53v-1408q0 -20 -11 -36t-29 -23l-640 -256q-24 -11 -48 0l-616 246l-616 -246q-10 -5 -24 -5q-19 0 -36 11q-28 20 -28 53v1408q0 20 11 36t29 23l640 256q24 11 48 0l616 -246l616 246q32 13 60 -6zM736 1390v-1270l576 -230v1270zM128 1173 v-1270l544 217v1270zM1920 107v1270l-544 -217v-1270z" />
+<glyph unicode="" horiz-adv-x="1792" d="M512 1536q13 0 22.5 -9.5t9.5 -22.5v-1472q0 -20 -17 -28l-480 -256q-7 -4 -15 -4q-13 0 -22.5 9.5t-9.5 22.5v1472q0 20 17 28l480 256q7 4 15 4zM1760 1536q13 0 22.5 -9.5t9.5 -22.5v-1472q0 -20 -17 -28l-480 -256q-7 -4 -15 -4q-13 0 -22.5 9.5t-9.5 22.5v1472 q0 20 17 28l480 256q7 4 15 4zM640 1536q8 0 14 -3l512 -256q18 -10 18 -29v-1472q0 -13 -9.5 -22.5t-22.5 -9.5q-8 0 -14 3l-512 256q-18 10 -18 29v1472q0 13 9.5 22.5t22.5 9.5z" />
+<glyph unicode="" horiz-adv-x="1792" d="M640 640q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1024 640q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1408 640q0 53 -37.5 90.5t-90.5 37.5 t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1792 640q0 -174 -120 -321.5t-326 -233t-450 -85.5q-110 0 -211 18q-173 -173 -435 -229q-52 -10 -86 -13q-12 -1 -22 6t-13 18q-4 15 20 37q5 5 23.5 21.5t25.5 23.5t23.5 25.5t24 31.5t20.5 37 t20 48t14.5 57.5t12.5 72.5q-146 90 -229.5 216.5t-83.5 269.5q0 174 120 321.5t326 233t450 85.5t450 -85.5t326 -233t120 -321.5z" />
+<glyph unicode="" horiz-adv-x="1792" d="M640 640q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5t-37.5 90.5t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1024 640q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5t-37.5 90.5t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1408 640q0 -53 -37.5 -90.5t-90.5 -37.5 t-90.5 37.5t-37.5 90.5t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM896 1152q-204 0 -381.5 -69.5t-282 -187.5t-104.5 -255q0 -112 71.5 -213.5t201.5 -175.5l87 -50l-27 -96q-24 -91 -70 -172q152 63 275 171l43 38l57 -6q69 -8 130 -8q204 0 381.5 69.5t282 187.5 t104.5 255t-104.5 255t-282 187.5t-381.5 69.5zM1792 640q0 -174 -120 -321.5t-326 -233t-450 -85.5q-70 0 -145 8q-198 -175 -460 -242q-49 -14 -114 -22h-5q-15 0 -27 10.5t-16 27.5v1q-3 4 -0.5 12t2 10t4.5 9.5l6 9t7 8.5t8 9q7 8 31 34.5t34.5 38t31 39.5t32.5 51 t27 59t26 76q-157 89 -247.5 220t-90.5 281q0 130 71 248.5t191 204.5t286 136.5t348 50.5t348 -50.5t286 -136.5t191 -204.5t71 -248.5z" />
+<glyph unicode="" horiz-adv-x="1024" d="M512 345l512 295v-591l-512 -296v592zM0 640v-591l512 296zM512 1527v-591l-512 -296v591zM512 936l512 295v-591z" />
+<glyph unicode="" horiz-adv-x="1792" d="M1709 1018q-10 -236 -332 -651q-333 -431 -562 -431q-142 0 -240 263q-44 160 -132 482q-72 262 -157 262q-18 0 -127 -76l-77 98q24 21 108 96.5t130 115.5q156 138 241 146q95 9 153 -55.5t81 -203.5q44 -287 66 -373q55 -249 120 -249q51 0 154 161q101 161 109 246 q13 139 -109 139q-57 0 -121 -26q120 393 459 382q251 -8 236 -326z" />
+<glyph unicode="" d="M0 1408h1536v-1536h-1536v1536zM1085 293l-221 631l221 297h-634l221 -297l-221 -631l317 -304z" />
+<glyph unicode="" d="M0 1408h1536v-1536h-1536v1536zM908 1088l-12 -33l75 -83l-31 -114l25 -25l107 57l107 -57l25 25l-31 114l75 83l-12 33h-95l-53 96h-32l-53 -96h-95zM641 925q32 0 44.5 -16t11.5 -63l174 21q0 55 -17.5 92.5t-50.5 56t-69 25.5t-85 7q-133 0 -199 -57.5t-66 -182.5v-72 h-96v-128h76q20 0 20 -8v-382q0 -14 -5 -20t-18 -7l-73 -7v-88h448v86l-149 14q-6 1 -8.5 1.5t-3.5 2.5t-0.5 4t1 7t0.5 10v387h191l38 128h-231q-6 0 -2 6t4 9v80q0 27 1.5 40.5t7.5 28t19.5 20t36.5 5.5zM1248 96v86l-54 9q-7 1 -9.5 2.5t-2.5 3t1 7.5t1 12v520h-275 l-23 -101l83 -22q23 -7 23 -27v-370q0 -14 -6 -18.5t-20 -6.5l-70 -9v-86h352z" />
+<glyph unicode="" horiz-adv-x="1792" />
+<glyph unicode="" horiz-adv-x="1792" />
+<glyph unicode="" horiz-adv-x="1792" />
+<glyph unicode="" horiz-adv-x="1792" />
+<glyph unicode="" horiz-adv-x="1792" />
+<glyph unicode="" horiz-adv-x="1792" />
+<glyph unicode="" horiz-adv-x="1792" />
+<glyph unicode="" horiz-adv-x="1792" />
+<glyph unicode="" horiz-adv-x="1792" />
+<glyph unicode="" horiz-adv-x="1792" />
+<glyph unicode="" horiz-adv-x="1792" />
+<glyph unicode="" horiz-adv-x="1792" />
+<glyph unicode="" horiz-adv-x="1792" />
+<glyph unicode="" horiz-adv-x="1792" />
+<glyph unicode="" horiz-adv-x="1792" />
+</font>
+</defs></svg>
diff --git a/management/guns-admin/src/main/webapp/static/fonts/fontawesome-webfont.ttf b/management/guns-admin/src/main/webapp/static/fonts/fontawesome-webfont.ttf
new file mode 100644
index 0000000..d7994e1
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/static/fonts/fontawesome-webfont.ttf
Binary files differ
diff --git a/management/guns-admin/src/main/webapp/static/fonts/fontawesome-webfont.woff b/management/guns-admin/src/main/webapp/static/fonts/fontawesome-webfont.woff
new file mode 100644
index 0000000..6fd4ede
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/static/fonts/fontawesome-webfont.woff
Binary files differ
diff --git a/management/guns-admin/src/main/webapp/static/fonts/fontawesome-webfont.woff2 b/management/guns-admin/src/main/webapp/static/fonts/fontawesome-webfont.woff2
new file mode 100644
index 0000000..5560193
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/static/fonts/fontawesome-webfont.woff2
Binary files differ
diff --git a/management/guns-admin/src/main/webapp/static/fonts/glyphicons-halflings-regular.eot b/management/guns-admin/src/main/webapp/static/fonts/glyphicons-halflings-regular.eot
new file mode 100644
index 0000000..b93a495
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/static/fonts/glyphicons-halflings-regular.eot
Binary files differ
diff --git a/management/guns-admin/src/main/webapp/static/fonts/glyphicons-halflings-regular.svg b/management/guns-admin/src/main/webapp/static/fonts/glyphicons-halflings-regular.svg
new file mode 100644
index 0000000..187805a
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/static/fonts/glyphicons-halflings-regular.svg
@@ -0,0 +1,288 @@
+<?xml version="1.0" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" >
+<svg xmlns="http://www.w3.org/2000/svg">
+<metadata></metadata>
+<defs>
+<font id="glyphicons_halflingsregular" horiz-adv-x="1200" >
+<font-face units-per-em="1200" ascent="960" descent="-240" />
+<missing-glyph horiz-adv-x="500" />
+<glyph horiz-adv-x="0" />
+<glyph horiz-adv-x="400" />
+<glyph unicode=" " />
+<glyph unicode="*" d="M600 1100q15 0 34 -1.5t30 -3.5l11 -1q10 -2 17.5 -10.5t7.5 -18.5v-224l158 158q7 7 18 8t19 -6l106 -106q7 -8 6 -19t-8 -18l-158 -158h224q10 0 18.5 -7.5t10.5 -17.5q6 -41 6 -75q0 -15 -1.5 -34t-3.5 -30l-1 -11q-2 -10 -10.5 -17.5t-18.5 -7.5h-224l158 -158 q7 -7 8 -18t-6 -19l-106 -106q-8 -7 -19 -6t-18 8l-158 158v-224q0 -10 -7.5 -18.5t-17.5 -10.5q-41 -6 -75 -6q-15 0 -34 1.5t-30 3.5l-11 1q-10 2 -17.5 10.5t-7.5 18.5v224l-158 -158q-7 -7 -18 -8t-19 6l-106 106q-7 8 -6 19t8 18l158 158h-224q-10 0 -18.5 7.5 t-10.5 17.5q-6 41 -6 75q0 15 1.5 34t3.5 30l1 11q2 10 10.5 17.5t18.5 7.5h224l-158 158q-7 7 -8 18t6 19l106 106q8 7 19 6t18 -8l158 -158v224q0 10 7.5 18.5t17.5 10.5q41 6 75 6z" />
+<glyph unicode="+" d="M450 1100h200q21 0 35.5 -14.5t14.5 -35.5v-350h350q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-350v-350q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5v350h-350q-21 0 -35.5 14.5t-14.5 35.5v200q0 21 14.5 35.5t35.5 14.5 h350v350q0 21 14.5 35.5t35.5 14.5z" />
+<glyph unicode=" " />
+<glyph unicode="¥" d="M825 1100h250q10 0 12.5 -5t-5.5 -13l-364 -364q-6 -6 -11 -18h268q10 0 13 -6t-3 -14l-120 -160q-6 -8 -18 -14t-22 -6h-125v-100h275q10 0 13 -6t-3 -14l-120 -160q-6 -8 -18 -14t-22 -6h-125v-174q0 -11 -7.5 -18.5t-18.5 -7.5h-148q-11 0 -18.5 7.5t-7.5 18.5v174 h-275q-10 0 -13 6t3 14l120 160q6 8 18 14t22 6h125v100h-275q-10 0 -13 6t3 14l120 160q6 8 18 14t22 6h118q-5 12 -11 18l-364 364q-8 8 -5.5 13t12.5 5h250q25 0 43 -18l164 -164q8 -8 18 -8t18 8l164 164q18 18 43 18z" />
+<glyph unicode=" " horiz-adv-x="650" />
+<glyph unicode=" " horiz-adv-x="1300" />
+<glyph unicode=" " horiz-adv-x="650" />
+<glyph unicode=" " horiz-adv-x="1300" />
+<glyph unicode=" " horiz-adv-x="433" />
+<glyph unicode=" " horiz-adv-x="325" />
+<glyph unicode=" " horiz-adv-x="216" />
+<glyph unicode=" " horiz-adv-x="216" />
+<glyph unicode=" " horiz-adv-x="162" />
+<glyph unicode=" " horiz-adv-x="260" />
+<glyph unicode=" " horiz-adv-x="72" />
+<glyph unicode=" " horiz-adv-x="260" />
+<glyph unicode=" " horiz-adv-x="325" />
+<glyph unicode="€" d="M744 1198q242 0 354 -189q60 -104 66 -209h-181q0 45 -17.5 82.5t-43.5 61.5t-58 40.5t-60.5 24t-51.5 7.5q-19 0 -40.5 -5.5t-49.5 -20.5t-53 -38t-49 -62.5t-39 -89.5h379l-100 -100h-300q-6 -50 -6 -100h406l-100 -100h-300q9 -74 33 -132t52.5 -91t61.5 -54.5t59 -29 t47 -7.5q22 0 50.5 7.5t60.5 24.5t58 41t43.5 61t17.5 80h174q-30 -171 -128 -278q-107 -117 -274 -117q-206 0 -324 158q-36 48 -69 133t-45 204h-217l100 100h112q1 47 6 100h-218l100 100h134q20 87 51 153.5t62 103.5q117 141 297 141z" />
+<glyph unicode="₽" d="M428 1200h350q67 0 120 -13t86 -31t57 -49.5t35 -56.5t17 -64.5t6.5 -60.5t0.5 -57v-16.5v-16.5q0 -36 -0.5 -57t-6.5 -61t-17 -65t-35 -57t-57 -50.5t-86 -31.5t-120 -13h-178l-2 -100h288q10 0 13 -6t-3 -14l-120 -160q-6 -8 -18 -14t-22 -6h-138v-175q0 -11 -5.5 -18 t-15.5 -7h-149q-10 0 -17.5 7.5t-7.5 17.5v175h-267q-10 0 -13 6t3 14l120 160q6 8 18 14t22 6h117v100h-267q-10 0 -13 6t3 14l120 160q6 8 18 14t22 6h117v475q0 10 7.5 17.5t17.5 7.5zM600 1000v-300h203q64 0 86.5 33t22.5 119q0 84 -22.5 116t-86.5 32h-203z" />
+<glyph unicode="−" d="M250 700h800q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-800q-21 0 -35.5 14.5t-14.5 35.5v200q0 21 14.5 35.5t35.5 14.5z" />
+<glyph unicode="⌛" d="M1000 1200v-150q0 -21 -14.5 -35.5t-35.5 -14.5h-50v-100q0 -91 -49.5 -165.5t-130.5 -109.5q81 -35 130.5 -109.5t49.5 -165.5v-150h50q21 0 35.5 -14.5t14.5 -35.5v-150h-800v150q0 21 14.5 35.5t35.5 14.5h50v150q0 91 49.5 165.5t130.5 109.5q-81 35 -130.5 109.5 t-49.5 165.5v100h-50q-21 0 -35.5 14.5t-14.5 35.5v150h800zM400 1000v-100q0 -60 32.5 -109.5t87.5 -73.5q28 -12 44 -37t16 -55t-16 -55t-44 -37q-55 -24 -87.5 -73.5t-32.5 -109.5v-150h400v150q0 60 -32.5 109.5t-87.5 73.5q-28 12 -44 37t-16 55t16 55t44 37 q55 24 87.5 73.5t32.5 109.5v100h-400z" />
+<glyph unicode="◼" horiz-adv-x="500" d="M0 0z" />
+<glyph unicode="☁" d="M503 1089q110 0 200.5 -59.5t134.5 -156.5q44 14 90 14q120 0 205 -86.5t85 -206.5q0 -121 -85 -207.5t-205 -86.5h-750q-79 0 -135.5 57t-56.5 137q0 69 42.5 122.5t108.5 67.5q-2 12 -2 37q0 153 108 260.5t260 107.5z" />
+<glyph unicode="⛺" d="M774 1193.5q16 -9.5 20.5 -27t-5.5 -33.5l-136 -187l467 -746h30q20 0 35 -18.5t15 -39.5v-42h-1200v42q0 21 15 39.5t35 18.5h30l468 746l-135 183q-10 16 -5.5 34t20.5 28t34 5.5t28 -20.5l111 -148l112 150q9 16 27 20.5t34 -5zM600 200h377l-182 112l-195 534v-646z " />
+<glyph unicode="✉" d="M25 1100h1150q10 0 12.5 -5t-5.5 -13l-564 -567q-8 -8 -18 -8t-18 8l-564 567q-8 8 -5.5 13t12.5 5zM18 882l264 -264q8 -8 8 -18t-8 -18l-264 -264q-8 -8 -13 -5.5t-5 12.5v550q0 10 5 12.5t13 -5.5zM918 618l264 264q8 8 13 5.5t5 -12.5v-550q0 -10 -5 -12.5t-13 5.5 l-264 264q-8 8 -8 18t8 18zM818 482l364 -364q8 -8 5.5 -13t-12.5 -5h-1150q-10 0 -12.5 5t5.5 13l364 364q8 8 18 8t18 -8l164 -164q8 -8 18 -8t18 8l164 164q8 8 18 8t18 -8z" />
+<glyph unicode="✏" d="M1011 1210q19 0 33 -13l153 -153q13 -14 13 -33t-13 -33l-99 -92l-214 214l95 96q13 14 32 14zM1013 800l-615 -614l-214 214l614 614zM317 96l-333 -112l110 335z" />
+<glyph unicode="" d="M700 650v-550h250q21 0 35.5 -14.5t14.5 -35.5v-50h-800v50q0 21 14.5 35.5t35.5 14.5h250v550l-500 550h1200z" />
+<glyph unicode="" d="M368 1017l645 163q39 15 63 0t24 -49v-831q0 -55 -41.5 -95.5t-111.5 -63.5q-79 -25 -147 -4.5t-86 75t25.5 111.5t122.5 82q72 24 138 8v521l-600 -155v-606q0 -42 -44 -90t-109 -69q-79 -26 -147 -5.5t-86 75.5t25.5 111.5t122.5 82.5q72 24 138 7v639q0 38 14.5 59 t53.5 34z" />
+<glyph unicode="" d="M500 1191q100 0 191 -39t156.5 -104.5t104.5 -156.5t39 -191l-1 -2l1 -5q0 -141 -78 -262l275 -274q23 -26 22.5 -44.5t-22.5 -42.5l-59 -58q-26 -20 -46.5 -20t-39.5 20l-275 274q-119 -77 -261 -77l-5 1l-2 -1q-100 0 -191 39t-156.5 104.5t-104.5 156.5t-39 191 t39 191t104.5 156.5t156.5 104.5t191 39zM500 1022q-88 0 -162 -43t-117 -117t-43 -162t43 -162t117 -117t162 -43t162 43t117 117t43 162t-43 162t-117 117t-162 43z" />
+<glyph unicode="" d="M649 949q48 68 109.5 104t121.5 38.5t118.5 -20t102.5 -64t71 -100.5t27 -123q0 -57 -33.5 -117.5t-94 -124.5t-126.5 -127.5t-150 -152.5t-146 -174q-62 85 -145.5 174t-150 152.5t-126.5 127.5t-93.5 124.5t-33.5 117.5q0 64 28 123t73 100.5t104 64t119 20 t120.5 -38.5t104.5 -104z" />
+<glyph unicode="" d="M407 800l131 353q7 19 17.5 19t17.5 -19l129 -353h421q21 0 24 -8.5t-14 -20.5l-342 -249l130 -401q7 -20 -0.5 -25.5t-24.5 6.5l-343 246l-342 -247q-17 -12 -24.5 -6.5t-0.5 25.5l130 400l-347 251q-17 12 -14 20.5t23 8.5h429z" />
+<glyph unicode="" d="M407 800l131 353q7 19 17.5 19t17.5 -19l129 -353h421q21 0 24 -8.5t-14 -20.5l-342 -249l130 -401q7 -20 -0.5 -25.5t-24.5 6.5l-343 246l-342 -247q-17 -12 -24.5 -6.5t-0.5 25.5l130 400l-347 251q-17 12 -14 20.5t23 8.5h429zM477 700h-240l197 -142l-74 -226 l193 139l195 -140l-74 229l192 140h-234l-78 211z" />
+<glyph unicode="" d="M600 1200q124 0 212 -88t88 -212v-250q0 -46 -31 -98t-69 -52v-75q0 -10 6 -21.5t15 -17.5l358 -230q9 -5 15 -16.5t6 -21.5v-93q0 -10 -7.5 -17.5t-17.5 -7.5h-1150q-10 0 -17.5 7.5t-7.5 17.5v93q0 10 6 21.5t15 16.5l358 230q9 6 15 17.5t6 21.5v75q-38 0 -69 52 t-31 98v250q0 124 88 212t212 88z" />
+<glyph unicode="" d="M25 1100h1150q10 0 17.5 -7.5t7.5 -17.5v-1050q0 -10 -7.5 -17.5t-17.5 -7.5h-1150q-10 0 -17.5 7.5t-7.5 17.5v1050q0 10 7.5 17.5t17.5 7.5zM100 1000v-100h100v100h-100zM875 1000h-550q-10 0 -17.5 -7.5t-7.5 -17.5v-350q0 -10 7.5 -17.5t17.5 -7.5h550 q10 0 17.5 7.5t7.5 17.5v350q0 10 -7.5 17.5t-17.5 7.5zM1000 1000v-100h100v100h-100zM100 800v-100h100v100h-100zM1000 800v-100h100v100h-100zM100 600v-100h100v100h-100zM1000 600v-100h100v100h-100zM875 500h-550q-10 0 -17.5 -7.5t-7.5 -17.5v-350q0 -10 7.5 -17.5 t17.5 -7.5h550q10 0 17.5 7.5t7.5 17.5v350q0 10 -7.5 17.5t-17.5 7.5zM100 400v-100h100v100h-100zM1000 400v-100h100v100h-100zM100 200v-100h100v100h-100zM1000 200v-100h100v100h-100z" />
+<glyph unicode="" d="M50 1100h400q21 0 35.5 -14.5t14.5 -35.5v-400q0 -21 -14.5 -35.5t-35.5 -14.5h-400q-21 0 -35.5 14.5t-14.5 35.5v400q0 21 14.5 35.5t35.5 14.5zM650 1100h400q21 0 35.5 -14.5t14.5 -35.5v-400q0 -21 -14.5 -35.5t-35.5 -14.5h-400q-21 0 -35.5 14.5t-14.5 35.5v400 q0 21 14.5 35.5t35.5 14.5zM50 500h400q21 0 35.5 -14.5t14.5 -35.5v-400q0 -21 -14.5 -35.5t-35.5 -14.5h-400q-21 0 -35.5 14.5t-14.5 35.5v400q0 21 14.5 35.5t35.5 14.5zM650 500h400q21 0 35.5 -14.5t14.5 -35.5v-400q0 -21 -14.5 -35.5t-35.5 -14.5h-400 q-21 0 -35.5 14.5t-14.5 35.5v400q0 21 14.5 35.5t35.5 14.5z" />
+<glyph unicode="" d="M50 1100h200q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5v200q0 21 14.5 35.5t35.5 14.5zM450 1100h200q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5v200 q0 21 14.5 35.5t35.5 14.5zM850 1100h200q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5v200q0 21 14.5 35.5t35.5 14.5zM50 700h200q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-200 q-21 0 -35.5 14.5t-14.5 35.5v200q0 21 14.5 35.5t35.5 14.5zM450 700h200q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5v200q0 21 14.5 35.5t35.5 14.5zM850 700h200q21 0 35.5 -14.5t14.5 -35.5v-200 q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5v200q0 21 14.5 35.5t35.5 14.5zM50 300h200q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5v200q0 21 14.5 35.5t35.5 14.5zM450 300h200 q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5v200q0 21 14.5 35.5t35.5 14.5zM850 300h200q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5v200q0 21 14.5 35.5 t35.5 14.5z" />
+<glyph unicode="" d="M50 1100h200q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5v200q0 21 14.5 35.5t35.5 14.5zM450 1100h700q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-700q-21 0 -35.5 14.5t-14.5 35.5v200 q0 21 14.5 35.5t35.5 14.5zM50 700h200q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5v200q0 21 14.5 35.5t35.5 14.5zM450 700h700q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-700 q-21 0 -35.5 14.5t-14.5 35.5v200q0 21 14.5 35.5t35.5 14.5zM50 300h200q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5v200q0 21 14.5 35.5t35.5 14.5zM450 300h700q21 0 35.5 -14.5t14.5 -35.5v-200 q0 -21 -14.5 -35.5t-35.5 -14.5h-700q-21 0 -35.5 14.5t-14.5 35.5v200q0 21 14.5 35.5t35.5 14.5z" />
+<glyph unicode="" d="M465 477l571 571q8 8 18 8t17 -8l177 -177q8 -7 8 -17t-8 -18l-783 -784q-7 -8 -17.5 -8t-17.5 8l-384 384q-8 8 -8 18t8 17l177 177q7 8 17 8t18 -8l171 -171q7 -7 18 -7t18 7z" />
+<glyph unicode="" d="M904 1083l178 -179q8 -8 8 -18.5t-8 -17.5l-267 -268l267 -268q8 -7 8 -17.5t-8 -18.5l-178 -178q-8 -8 -18.5 -8t-17.5 8l-268 267l-268 -267q-7 -8 -17.5 -8t-18.5 8l-178 178q-8 8 -8 18.5t8 17.5l267 268l-267 268q-8 7 -8 17.5t8 18.5l178 178q8 8 18.5 8t17.5 -8 l268 -267l268 268q7 7 17.5 7t18.5 -7z" />
+<glyph unicode="" d="M507 1177q98 0 187.5 -38.5t154.5 -103.5t103.5 -154.5t38.5 -187.5q0 -141 -78 -262l300 -299q8 -8 8 -18.5t-8 -18.5l-109 -108q-7 -8 -17.5 -8t-18.5 8l-300 299q-119 -77 -261 -77q-98 0 -188 38.5t-154.5 103t-103 154.5t-38.5 188t38.5 187.5t103 154.5 t154.5 103.5t188 38.5zM506.5 1023q-89.5 0 -165.5 -44t-120 -120.5t-44 -166t44 -165.5t120 -120t165.5 -44t166 44t120.5 120t44 165.5t-44 166t-120.5 120.5t-166 44zM425 900h150q10 0 17.5 -7.5t7.5 -17.5v-75h75q10 0 17.5 -7.5t7.5 -17.5v-150q0 -10 -7.5 -17.5 t-17.5 -7.5h-75v-75q0 -10 -7.5 -17.5t-17.5 -7.5h-150q-10 0 -17.5 7.5t-7.5 17.5v75h-75q-10 0 -17.5 7.5t-7.5 17.5v150q0 10 7.5 17.5t17.5 7.5h75v75q0 10 7.5 17.5t17.5 7.5z" />
+<glyph unicode="" d="M507 1177q98 0 187.5 -38.5t154.5 -103.5t103.5 -154.5t38.5 -187.5q0 -141 -78 -262l300 -299q8 -8 8 -18.5t-8 -18.5l-109 -108q-7 -8 -17.5 -8t-18.5 8l-300 299q-119 -77 -261 -77q-98 0 -188 38.5t-154.5 103t-103 154.5t-38.5 188t38.5 187.5t103 154.5 t154.5 103.5t188 38.5zM506.5 1023q-89.5 0 -165.5 -44t-120 -120.5t-44 -166t44 -165.5t120 -120t165.5 -44t166 44t120.5 120t44 165.5t-44 166t-120.5 120.5t-166 44zM325 800h350q10 0 17.5 -7.5t7.5 -17.5v-150q0 -10 -7.5 -17.5t-17.5 -7.5h-350q-10 0 -17.5 7.5 t-7.5 17.5v150q0 10 7.5 17.5t17.5 7.5z" />
+<glyph unicode="" d="M550 1200h100q21 0 35.5 -14.5t14.5 -35.5v-400q0 -21 -14.5 -35.5t-35.5 -14.5h-100q-21 0 -35.5 14.5t-14.5 35.5v400q0 21 14.5 35.5t35.5 14.5zM800 975v166q167 -62 272 -209.5t105 -331.5q0 -117 -45.5 -224t-123 -184.5t-184.5 -123t-224 -45.5t-224 45.5 t-184.5 123t-123 184.5t-45.5 224q0 184 105 331.5t272 209.5v-166q-103 -55 -165 -155t-62 -220q0 -116 57 -214.5t155.5 -155.5t214.5 -57t214.5 57t155.5 155.5t57 214.5q0 120 -62 220t-165 155z" />
+<glyph unicode="" d="M1025 1200h150q10 0 17.5 -7.5t7.5 -17.5v-1150q0 -10 -7.5 -17.5t-17.5 -7.5h-150q-10 0 -17.5 7.5t-7.5 17.5v1150q0 10 7.5 17.5t17.5 7.5zM725 800h150q10 0 17.5 -7.5t7.5 -17.5v-750q0 -10 -7.5 -17.5t-17.5 -7.5h-150q-10 0 -17.5 7.5t-7.5 17.5v750 q0 10 7.5 17.5t17.5 7.5zM425 500h150q10 0 17.5 -7.5t7.5 -17.5v-450q0 -10 -7.5 -17.5t-17.5 -7.5h-150q-10 0 -17.5 7.5t-7.5 17.5v450q0 10 7.5 17.5t17.5 7.5zM125 300h150q10 0 17.5 -7.5t7.5 -17.5v-250q0 -10 -7.5 -17.5t-17.5 -7.5h-150q-10 0 -17.5 7.5t-7.5 17.5 v250q0 10 7.5 17.5t17.5 7.5z" />
+<glyph unicode="" d="M600 1174q33 0 74 -5l38 -152l5 -1q49 -14 94 -39l5 -2l134 80q61 -48 104 -105l-80 -134l3 -5q25 -44 39 -93l1 -6l152 -38q5 -43 5 -73q0 -34 -5 -74l-152 -38l-1 -6q-15 -49 -39 -93l-3 -5l80 -134q-48 -61 -104 -105l-134 81l-5 -3q-44 -25 -94 -39l-5 -2l-38 -151 q-43 -5 -74 -5q-33 0 -74 5l-38 151l-5 2q-49 14 -94 39l-5 3l-134 -81q-60 48 -104 105l80 134l-3 5q-25 45 -38 93l-2 6l-151 38q-6 42 -6 74q0 33 6 73l151 38l2 6q13 48 38 93l3 5l-80 134q47 61 105 105l133 -80l5 2q45 25 94 39l5 1l38 152q43 5 74 5zM600 815 q-89 0 -152 -63t-63 -151.5t63 -151.5t152 -63t152 63t63 151.5t-63 151.5t-152 63z" />
+<glyph unicode="" d="M500 1300h300q41 0 70.5 -29.5t29.5 -70.5v-100h275q10 0 17.5 -7.5t7.5 -17.5v-75h-1100v75q0 10 7.5 17.5t17.5 7.5h275v100q0 41 29.5 70.5t70.5 29.5zM500 1200v-100h300v100h-300zM1100 900v-800q0 -41 -29.5 -70.5t-70.5 -29.5h-700q-41 0 -70.5 29.5t-29.5 70.5 v800h900zM300 800v-700h100v700h-100zM500 800v-700h100v700h-100zM700 800v-700h100v700h-100zM900 800v-700h100v700h-100z" />
+<glyph unicode="" d="M18 618l620 608q8 7 18.5 7t17.5 -7l608 -608q8 -8 5.5 -13t-12.5 -5h-175v-575q0 -10 -7.5 -17.5t-17.5 -7.5h-250q-10 0 -17.5 7.5t-7.5 17.5v375h-300v-375q0 -10 -7.5 -17.5t-17.5 -7.5h-250q-10 0 -17.5 7.5t-7.5 17.5v575h-175q-10 0 -12.5 5t5.5 13z" />
+<glyph unicode="" d="M600 1200v-400q0 -41 29.5 -70.5t70.5 -29.5h300v-650q0 -21 -14.5 -35.5t-35.5 -14.5h-800q-21 0 -35.5 14.5t-14.5 35.5v1100q0 21 14.5 35.5t35.5 14.5h450zM1000 800h-250q-21 0 -35.5 14.5t-14.5 35.5v250z" />
+<glyph unicode="" d="M600 1177q117 0 224 -45.5t184.5 -123t123 -184.5t45.5 -224t-45.5 -224t-123 -184.5t-184.5 -123t-224 -45.5t-224 45.5t-184.5 123t-123 184.5t-45.5 224t45.5 224t123 184.5t184.5 123t224 45.5zM600 1027q-116 0 -214.5 -57t-155.5 -155.5t-57 -214.5t57 -214.5 t155.5 -155.5t214.5 -57t214.5 57t155.5 155.5t57 214.5t-57 214.5t-155.5 155.5t-214.5 57zM525 900h50q10 0 17.5 -7.5t7.5 -17.5v-275h175q10 0 17.5 -7.5t7.5 -17.5v-50q0 -10 -7.5 -17.5t-17.5 -7.5h-250q-10 0 -17.5 7.5t-7.5 17.5v350q0 10 7.5 17.5t17.5 7.5z" />
+<glyph unicode="" d="M1300 0h-538l-41 400h-242l-41 -400h-538l431 1200h209l-21 -300h162l-20 300h208zM515 800l-27 -300h224l-27 300h-170z" />
+<glyph unicode="" d="M550 1200h200q21 0 35.5 -14.5t14.5 -35.5v-450h191q20 0 25.5 -11.5t-7.5 -27.5l-327 -400q-13 -16 -32 -16t-32 16l-327 400q-13 16 -7.5 27.5t25.5 11.5h191v450q0 21 14.5 35.5t35.5 14.5zM1125 400h50q10 0 17.5 -7.5t7.5 -17.5v-350q0 -10 -7.5 -17.5t-17.5 -7.5 h-1050q-10 0 -17.5 7.5t-7.5 17.5v350q0 10 7.5 17.5t17.5 7.5h50q10 0 17.5 -7.5t7.5 -17.5v-175h900v175q0 10 7.5 17.5t17.5 7.5z" />
+<glyph unicode="" d="M600 1177q117 0 224 -45.5t184.5 -123t123 -184.5t45.5 -224t-45.5 -224t-123 -184.5t-184.5 -123t-224 -45.5t-224 45.5t-184.5 123t-123 184.5t-45.5 224t45.5 224t123 184.5t184.5 123t224 45.5zM600 1027q-116 0 -214.5 -57t-155.5 -155.5t-57 -214.5t57 -214.5 t155.5 -155.5t214.5 -57t214.5 57t155.5 155.5t57 214.5t-57 214.5t-155.5 155.5t-214.5 57zM525 900h150q10 0 17.5 -7.5t7.5 -17.5v-275h137q21 0 26 -11.5t-8 -27.5l-223 -275q-13 -16 -32 -16t-32 16l-223 275q-13 16 -8 27.5t26 11.5h137v275q0 10 7.5 17.5t17.5 7.5z " />
+<glyph unicode="" d="M600 1177q117 0 224 -45.5t184.5 -123t123 -184.5t45.5 -224t-45.5 -224t-123 -184.5t-184.5 -123t-224 -45.5t-224 45.5t-184.5 123t-123 184.5t-45.5 224t45.5 224t123 184.5t184.5 123t224 45.5zM600 1027q-116 0 -214.5 -57t-155.5 -155.5t-57 -214.5t57 -214.5 t155.5 -155.5t214.5 -57t214.5 57t155.5 155.5t57 214.5t-57 214.5t-155.5 155.5t-214.5 57zM632 914l223 -275q13 -16 8 -27.5t-26 -11.5h-137v-275q0 -10 -7.5 -17.5t-17.5 -7.5h-150q-10 0 -17.5 7.5t-7.5 17.5v275h-137q-21 0 -26 11.5t8 27.5l223 275q13 16 32 16 t32 -16z" />
+<glyph unicode="" d="M225 1200h750q10 0 19.5 -7t12.5 -17l186 -652q7 -24 7 -49v-425q0 -12 -4 -27t-9 -17q-12 -6 -37 -6h-1100q-12 0 -27 4t-17 8q-6 13 -6 38l1 425q0 25 7 49l185 652q3 10 12.5 17t19.5 7zM878 1000h-556q-10 0 -19 -7t-11 -18l-87 -450q-2 -11 4 -18t16 -7h150 q10 0 19.5 -7t11.5 -17l38 -152q2 -10 11.5 -17t19.5 -7h250q10 0 19.5 7t11.5 17l38 152q2 10 11.5 17t19.5 7h150q10 0 16 7t4 18l-87 450q-2 11 -11 18t-19 7z" />
+<glyph unicode="" d="M600 1177q117 0 224 -45.5t184.5 -123t123 -184.5t45.5 -224t-45.5 -224t-123 -184.5t-184.5 -123t-224 -45.5t-224 45.5t-184.5 123t-123 184.5t-45.5 224t45.5 224t123 184.5t184.5 123t224 45.5zM600 1027q-116 0 -214.5 -57t-155.5 -155.5t-57 -214.5t57 -214.5 t155.5 -155.5t214.5 -57t214.5 57t155.5 155.5t57 214.5t-57 214.5t-155.5 155.5t-214.5 57zM540 820l253 -190q17 -12 17 -30t-17 -30l-253 -190q-16 -12 -28 -6.5t-12 26.5v400q0 21 12 26.5t28 -6.5z" />
+<glyph unicode="" d="M947 1060l135 135q7 7 12.5 5t5.5 -13v-362q0 -10 -7.5 -17.5t-17.5 -7.5h-362q-11 0 -13 5.5t5 12.5l133 133q-109 76 -238 76q-116 0 -214.5 -57t-155.5 -155.5t-57 -214.5t57 -214.5t155.5 -155.5t214.5 -57t214.5 57t155.5 155.5t57 214.5h150q0 -117 -45.5 -224 t-123 -184.5t-184.5 -123t-224 -45.5t-224 45.5t-184.5 123t-123 184.5t-45.5 224t45.5 224t123 184.5t184.5 123t224 45.5q192 0 347 -117z" />
+<glyph unicode="" d="M947 1060l135 135q7 7 12.5 5t5.5 -13v-361q0 -11 -7.5 -18.5t-18.5 -7.5h-361q-11 0 -13 5.5t5 12.5l134 134q-110 75 -239 75q-116 0 -214.5 -57t-155.5 -155.5t-57 -214.5h-150q0 117 45.5 224t123 184.5t184.5 123t224 45.5q192 0 347 -117zM1027 600h150 q0 -117 -45.5 -224t-123 -184.5t-184.5 -123t-224 -45.5q-192 0 -348 118l-134 -134q-7 -8 -12.5 -5.5t-5.5 12.5v360q0 11 7.5 18.5t18.5 7.5h360q10 0 12.5 -5.5t-5.5 -12.5l-133 -133q110 -76 240 -76q116 0 214.5 57t155.5 155.5t57 214.5z" />
+<glyph unicode="" d="M125 1200h1050q10 0 17.5 -7.5t7.5 -17.5v-1150q0 -10 -7.5 -17.5t-17.5 -7.5h-1050q-10 0 -17.5 7.5t-7.5 17.5v1150q0 10 7.5 17.5t17.5 7.5zM1075 1000h-850q-10 0 -17.5 -7.5t-7.5 -17.5v-850q0 -10 7.5 -17.5t17.5 -7.5h850q10 0 17.5 7.5t7.5 17.5v850 q0 10 -7.5 17.5t-17.5 7.5zM325 900h50q10 0 17.5 -7.5t7.5 -17.5v-50q0 -10 -7.5 -17.5t-17.5 -7.5h-50q-10 0 -17.5 7.5t-7.5 17.5v50q0 10 7.5 17.5t17.5 7.5zM525 900h450q10 0 17.5 -7.5t7.5 -17.5v-50q0 -10 -7.5 -17.5t-17.5 -7.5h-450q-10 0 -17.5 7.5t-7.5 17.5v50 q0 10 7.5 17.5t17.5 7.5zM325 700h50q10 0 17.5 -7.5t7.5 -17.5v-50q0 -10 -7.5 -17.5t-17.5 -7.5h-50q-10 0 -17.5 7.5t-7.5 17.5v50q0 10 7.5 17.5t17.5 7.5zM525 700h450q10 0 17.5 -7.5t7.5 -17.5v-50q0 -10 -7.5 -17.5t-17.5 -7.5h-450q-10 0 -17.5 7.5t-7.5 17.5v50 q0 10 7.5 17.5t17.5 7.5zM325 500h50q10 0 17.5 -7.5t7.5 -17.5v-50q0 -10 -7.5 -17.5t-17.5 -7.5h-50q-10 0 -17.5 7.5t-7.5 17.5v50q0 10 7.5 17.5t17.5 7.5zM525 500h450q10 0 17.5 -7.5t7.5 -17.5v-50q0 -10 -7.5 -17.5t-17.5 -7.5h-450q-10 0 -17.5 7.5t-7.5 17.5v50 q0 10 7.5 17.5t17.5 7.5zM325 300h50q10 0 17.5 -7.5t7.5 -17.5v-50q0 -10 -7.5 -17.5t-17.5 -7.5h-50q-10 0 -17.5 7.5t-7.5 17.5v50q0 10 7.5 17.5t17.5 7.5zM525 300h450q10 0 17.5 -7.5t7.5 -17.5v-50q0 -10 -7.5 -17.5t-17.5 -7.5h-450q-10 0 -17.5 7.5t-7.5 17.5v50 q0 10 7.5 17.5t17.5 7.5z" />
+<glyph unicode="" d="M900 800v200q0 83 -58.5 141.5t-141.5 58.5h-300q-82 0 -141 -59t-59 -141v-200h-100q-41 0 -70.5 -29.5t-29.5 -70.5v-600q0 -41 29.5 -70.5t70.5 -29.5h900q41 0 70.5 29.5t29.5 70.5v600q0 41 -29.5 70.5t-70.5 29.5h-100zM400 800v150q0 21 15 35.5t35 14.5h200 q20 0 35 -14.5t15 -35.5v-150h-300z" />
+<glyph unicode="" d="M125 1100h50q10 0 17.5 -7.5t7.5 -17.5v-1075h-100v1075q0 10 7.5 17.5t17.5 7.5zM1075 1052q4 0 9 -2q16 -6 16 -23v-421q0 -6 -3 -12q-33 -59 -66.5 -99t-65.5 -58t-56.5 -24.5t-52.5 -6.5q-26 0 -57.5 6.5t-52.5 13.5t-60 21q-41 15 -63 22.5t-57.5 15t-65.5 7.5 q-85 0 -160 -57q-7 -5 -15 -5q-6 0 -11 3q-14 7 -14 22v438q22 55 82 98.5t119 46.5q23 2 43 0.5t43 -7t32.5 -8.5t38 -13t32.5 -11q41 -14 63.5 -21t57 -14t63.5 -7q103 0 183 87q7 8 18 8z" />
+<glyph unicode="" d="M600 1175q116 0 227 -49.5t192.5 -131t131 -192.5t49.5 -227v-300q0 -10 -7.5 -17.5t-17.5 -7.5h-50q-10 0 -17.5 7.5t-7.5 17.5v300q0 127 -70.5 231.5t-184.5 161.5t-245 57t-245 -57t-184.5 -161.5t-70.5 -231.5v-300q0 -10 -7.5 -17.5t-17.5 -7.5h-50 q-10 0 -17.5 7.5t-7.5 17.5v300q0 116 49.5 227t131 192.5t192.5 131t227 49.5zM220 500h160q8 0 14 -6t6 -14v-460q0 -8 -6 -14t-14 -6h-160q-8 0 -14 6t-6 14v460q0 8 6 14t14 6zM820 500h160q8 0 14 -6t6 -14v-460q0 -8 -6 -14t-14 -6h-160q-8 0 -14 6t-6 14v460 q0 8 6 14t14 6z" />
+<glyph unicode="" d="M321 814l258 172q9 6 15 2.5t6 -13.5v-750q0 -10 -6 -13.5t-15 2.5l-258 172q-21 14 -46 14h-250q-10 0 -17.5 7.5t-7.5 17.5v350q0 10 7.5 17.5t17.5 7.5h250q25 0 46 14zM900 668l120 120q7 7 17 7t17 -7l34 -34q7 -7 7 -17t-7 -17l-120 -120l120 -120q7 -7 7 -17 t-7 -17l-34 -34q-7 -7 -17 -7t-17 7l-120 119l-120 -119q-7 -7 -17 -7t-17 7l-34 34q-7 7 -7 17t7 17l119 120l-119 120q-7 7 -7 17t7 17l34 34q7 8 17 8t17 -8z" />
+<glyph unicode="" d="M321 814l258 172q9 6 15 2.5t6 -13.5v-750q0 -10 -6 -13.5t-15 2.5l-258 172q-21 14 -46 14h-250q-10 0 -17.5 7.5t-7.5 17.5v350q0 10 7.5 17.5t17.5 7.5h250q25 0 46 14zM766 900h4q10 -1 16 -10q96 -129 96 -290q0 -154 -90 -281q-6 -9 -17 -10l-3 -1q-9 0 -16 6 l-29 23q-7 7 -8.5 16.5t4.5 17.5q72 103 72 229q0 132 -78 238q-6 8 -4.5 18t9.5 17l29 22q7 5 15 5z" />
+<glyph unicode="" d="M967 1004h3q11 -1 17 -10q135 -179 135 -396q0 -105 -34 -206.5t-98 -185.5q-7 -9 -17 -10h-3q-9 0 -16 6l-42 34q-8 6 -9 16t5 18q111 150 111 328q0 90 -29.5 176t-84.5 157q-6 9 -5 19t10 16l42 33q7 5 15 5zM321 814l258 172q9 6 15 2.5t6 -13.5v-750q0 -10 -6 -13.5 t-15 2.5l-258 172q-21 14 -46 14h-250q-10 0 -17.5 7.5t-7.5 17.5v350q0 10 7.5 17.5t17.5 7.5h250q25 0 46 14zM766 900h4q10 -1 16 -10q96 -129 96 -290q0 -154 -90 -281q-6 -9 -17 -10l-3 -1q-9 0 -16 6l-29 23q-7 7 -8.5 16.5t4.5 17.5q72 103 72 229q0 132 -78 238 q-6 8 -4.5 18.5t9.5 16.5l29 22q7 5 15 5z" />
+<glyph unicode="" d="M500 900h100v-100h-100v-100h-400v-100h-100v600h500v-300zM1200 700h-200v-100h200v-200h-300v300h-200v300h-100v200h600v-500zM100 1100v-300h300v300h-300zM800 1100v-300h300v300h-300zM300 900h-100v100h100v-100zM1000 900h-100v100h100v-100zM300 500h200v-500 h-500v500h200v100h100v-100zM800 300h200v-100h-100v-100h-200v100h-100v100h100v200h-200v100h300v-300zM100 400v-300h300v300h-300zM300 200h-100v100h100v-100zM1200 200h-100v100h100v-100zM700 0h-100v100h100v-100zM1200 0h-300v100h300v-100z" />
+<glyph unicode="" d="M100 200h-100v1000h100v-1000zM300 200h-100v1000h100v-1000zM700 200h-200v1000h200v-1000zM900 200h-100v1000h100v-1000zM1200 200h-200v1000h200v-1000zM400 0h-300v100h300v-100zM600 0h-100v91h100v-91zM800 0h-100v91h100v-91zM1100 0h-200v91h200v-91z" />
+<glyph unicode="" d="M500 1200l682 -682q8 -8 8 -18t-8 -18l-464 -464q-8 -8 -18 -8t-18 8l-682 682l1 475q0 10 7.5 17.5t17.5 7.5h474zM319.5 1024.5q-29.5 29.5 -71 29.5t-71 -29.5t-29.5 -71.5t29.5 -71.5t71 -29.5t71 29.5t29.5 71.5t-29.5 71.5z" />
+<glyph unicode="" d="M500 1200l682 -682q8 -8 8 -18t-8 -18l-464 -464q-8 -8 -18 -8t-18 8l-682 682l1 475q0 10 7.5 17.5t17.5 7.5h474zM800 1200l682 -682q8 -8 8 -18t-8 -18l-464 -464q-8 -8 -18 -8t-18 8l-56 56l424 426l-700 700h150zM319.5 1024.5q-29.5 29.5 -71 29.5t-71 -29.5 t-29.5 -71.5t29.5 -71.5t71 -29.5t71 29.5t29.5 71.5t-29.5 71.5z" />
+<glyph unicode="" d="M300 1200h825q75 0 75 -75v-900q0 -25 -18 -43l-64 -64q-8 -8 -13 -5.5t-5 12.5v950q0 10 -7.5 17.5t-17.5 7.5h-700q-25 0 -43 -18l-64 -64q-8 -8 -5.5 -13t12.5 -5h700q10 0 17.5 -7.5t7.5 -17.5v-950q0 -10 -7.5 -17.5t-17.5 -7.5h-850q-10 0 -17.5 7.5t-7.5 17.5v975 q0 25 18 43l139 139q18 18 43 18z" />
+<glyph unicode="" d="M250 1200h800q21 0 35.5 -14.5t14.5 -35.5v-1150l-450 444l-450 -445v1151q0 21 14.5 35.5t35.5 14.5z" />
+<glyph unicode="" d="M822 1200h-444q-11 0 -19 -7.5t-9 -17.5l-78 -301q-7 -24 7 -45l57 -108q6 -9 17.5 -15t21.5 -6h450q10 0 21.5 6t17.5 15l62 108q14 21 7 45l-83 301q-1 10 -9 17.5t-19 7.5zM1175 800h-150q-10 0 -21 -6.5t-15 -15.5l-78 -156q-4 -9 -15 -15.5t-21 -6.5h-550 q-10 0 -21 6.5t-15 15.5l-78 156q-4 9 -15 15.5t-21 6.5h-150q-10 0 -17.5 -7.5t-7.5 -17.5v-650q0 -10 7.5 -17.5t17.5 -7.5h150q10 0 17.5 7.5t7.5 17.5v150q0 10 7.5 17.5t17.5 7.5h750q10 0 17.5 -7.5t7.5 -17.5v-150q0 -10 7.5 -17.5t17.5 -7.5h150q10 0 17.5 7.5 t7.5 17.5v650q0 10 -7.5 17.5t-17.5 7.5zM850 200h-500q-10 0 -19.5 -7t-11.5 -17l-38 -152q-2 -10 3.5 -17t15.5 -7h600q10 0 15.5 7t3.5 17l-38 152q-2 10 -11.5 17t-19.5 7z" />
+<glyph unicode="" d="M500 1100h200q56 0 102.5 -20.5t72.5 -50t44 -59t25 -50.5l6 -20h150q41 0 70.5 -29.5t29.5 -70.5v-600q0 -41 -29.5 -70.5t-70.5 -29.5h-1000q-41 0 -70.5 29.5t-29.5 70.5v600q0 41 29.5 70.5t70.5 29.5h150q2 8 6.5 21.5t24 48t45 61t72 48t102.5 21.5zM900 800v-100 h100v100h-100zM600 730q-95 0 -162.5 -67.5t-67.5 -162.5t67.5 -162.5t162.5 -67.5t162.5 67.5t67.5 162.5t-67.5 162.5t-162.5 67.5zM600 603q43 0 73 -30t30 -73t-30 -73t-73 -30t-73 30t-30 73t30 73t73 30z" />
+<glyph unicode="" d="M681 1199l385 -998q20 -50 60 -92q18 -19 36.5 -29.5t27.5 -11.5l10 -2v-66h-417v66q53 0 75 43.5t5 88.5l-82 222h-391q-58 -145 -92 -234q-11 -34 -6.5 -57t25.5 -37t46 -20t55 -6v-66h-365v66q56 24 84 52q12 12 25 30.5t20 31.5l7 13l399 1006h93zM416 521h340 l-162 457z" />
+<glyph unicode="" d="M753 641q5 -1 14.5 -4.5t36 -15.5t50.5 -26.5t53.5 -40t50.5 -54.5t35.5 -70t14.5 -87q0 -67 -27.5 -125.5t-71.5 -97.5t-98.5 -66.5t-108.5 -40.5t-102 -13h-500v89q41 7 70.5 32.5t29.5 65.5v827q0 24 -0.5 34t-3.5 24t-8.5 19.5t-17 13.5t-28 12.5t-42.5 11.5v71 l471 -1q57 0 115.5 -20.5t108 -57t80.5 -94t31 -124.5q0 -51 -15.5 -96.5t-38 -74.5t-45 -50.5t-38.5 -30.5zM400 700h139q78 0 130.5 48.5t52.5 122.5q0 41 -8.5 70.5t-29.5 55.5t-62.5 39.5t-103.5 13.5h-118v-350zM400 200h216q80 0 121 50.5t41 130.5q0 90 -62.5 154.5 t-156.5 64.5h-159v-400z" />
+<glyph unicode="" d="M877 1200l2 -57q-83 -19 -116 -45.5t-40 -66.5l-132 -839q-9 -49 13 -69t96 -26v-97h-500v97q186 16 200 98l173 832q3 17 3 30t-1.5 22.5t-9 17.5t-13.5 12.5t-21.5 10t-26 8.5t-33.5 10q-13 3 -19 5v57h425z" />
+<glyph unicode="" d="M1300 900h-50q0 21 -4 37t-9.5 26.5t-18 17.5t-22 11t-28.5 5.5t-31 2t-37 0.5h-200v-850q0 -22 25 -34.5t50 -13.5l25 -2v-100h-400v100q4 0 11 0.5t24 3t30 7t24 15t11 24.5v850h-200q-25 0 -37 -0.5t-31 -2t-28.5 -5.5t-22 -11t-18 -17.5t-9.5 -26.5t-4 -37h-50v300 h1000v-300zM175 1000h-75v-800h75l-125 -167l-125 167h75v800h-75l125 167z" />
+<glyph unicode="" d="M1100 900h-50q0 21 -4 37t-9.5 26.5t-18 17.5t-22 11t-28.5 5.5t-31 2t-37 0.5h-200v-650q0 -22 25 -34.5t50 -13.5l25 -2v-100h-400v100q4 0 11 0.5t24 3t30 7t24 15t11 24.5v650h-200q-25 0 -37 -0.5t-31 -2t-28.5 -5.5t-22 -11t-18 -17.5t-9.5 -26.5t-4 -37h-50v300 h1000v-300zM1167 50l-167 -125v75h-800v-75l-167 125l167 125v-75h800v75z" />
+<glyph unicode="" d="M50 1100h600q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-600q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5zM50 800h1000q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-1000q-21 0 -35.5 14.5t-14.5 35.5v100 q0 21 14.5 35.5t35.5 14.5zM50 500h800q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-800q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5zM50 200h1100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-1100 q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5z" />
+<glyph unicode="" d="M250 1100h700q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-700q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5zM50 800h1100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-1100q-21 0 -35.5 14.5t-14.5 35.5v100 q0 21 14.5 35.5t35.5 14.5zM250 500h700q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-700q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5zM50 200h1100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-1100 q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5z" />
+<glyph unicode="" d="M500 950v100q0 21 14.5 35.5t35.5 14.5h600q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-600q-21 0 -35.5 14.5t-14.5 35.5zM100 650v100q0 21 14.5 35.5t35.5 14.5h1000q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-1000 q-21 0 -35.5 14.5t-14.5 35.5zM300 350v100q0 21 14.5 35.5t35.5 14.5h800q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-800q-21 0 -35.5 14.5t-14.5 35.5zM0 50v100q0 21 14.5 35.5t35.5 14.5h1100q21 0 35.5 -14.5t14.5 -35.5v-100 q0 -21 -14.5 -35.5t-35.5 -14.5h-1100q-21 0 -35.5 14.5t-14.5 35.5z" />
+<glyph unicode="" d="M50 1100h1100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-1100q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5zM50 800h1100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-1100q-21 0 -35.5 14.5t-14.5 35.5v100 q0 21 14.5 35.5t35.5 14.5zM50 500h1100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-1100q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5zM50 200h1100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-1100 q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5z" />
+<glyph unicode="" d="M50 1100h100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-100q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5zM350 1100h800q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-800q-21 0 -35.5 14.5t-14.5 35.5v100 q0 21 14.5 35.5t35.5 14.5zM50 800h100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-100q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5zM350 800h800q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-800 q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5zM50 500h100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-100q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5zM350 500h800q21 0 35.5 -14.5t14.5 -35.5v-100 q0 -21 -14.5 -35.5t-35.5 -14.5h-800q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5zM50 200h100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-100q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5zM350 200h800 q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-800q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5z" />
+<glyph unicode="" d="M400 0h-100v1100h100v-1100zM550 1100h100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-100q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5zM550 800h500q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-500 q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5zM267 550l-167 -125v75h-200v100h200v75zM550 500h300q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-300q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5zM550 200h600 q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-600q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5z" />
+<glyph unicode="" d="M50 1100h100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-100q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5zM900 0h-100v1100h100v-1100zM50 800h500q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-500 q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5zM1100 600h200v-100h-200v-75l-167 125l167 125v-75zM50 500h300q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-300q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5zM50 200h600 q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-600q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5z" />
+<glyph unicode="" d="M75 1000h750q31 0 53 -22t22 -53v-650q0 -31 -22 -53t-53 -22h-750q-31 0 -53 22t-22 53v650q0 31 22 53t53 22zM1200 300l-300 300l300 300v-600z" />
+<glyph unicode="" d="M44 1100h1112q18 0 31 -13t13 -31v-1012q0 -18 -13 -31t-31 -13h-1112q-18 0 -31 13t-13 31v1012q0 18 13 31t31 13zM100 1000v-737l247 182l298 -131l-74 156l293 318l236 -288v500h-1000zM342 884q56 0 95 -39t39 -94.5t-39 -95t-95 -39.5t-95 39.5t-39 95t39 94.5 t95 39z" />
+<glyph unicode="" d="M648 1169q117 0 216 -60t156.5 -161t57.5 -218q0 -115 -70 -258q-69 -109 -158 -225.5t-143 -179.5l-54 -62q-9 8 -25.5 24.5t-63.5 67.5t-91 103t-98.5 128t-95.5 148q-60 132 -60 249q0 88 34 169.5t91.5 142t137 96.5t166.5 36zM652.5 974q-91.5 0 -156.5 -65 t-65 -157t65 -156.5t156.5 -64.5t156.5 64.5t65 156.5t-65 157t-156.5 65z" />
+<glyph unicode="" d="M600 1177q117 0 224 -45.5t184.5 -123t123 -184.5t45.5 -224t-45.5 -224t-123 -184.5t-184.5 -123t-224 -45.5t-224 45.5t-184.5 123t-123 184.5t-45.5 224t45.5 224t123 184.5t184.5 123t224 45.5zM600 173v854q-116 0 -214.5 -57t-155.5 -155.5t-57 -214.5t57 -214.5 t155.5 -155.5t214.5 -57z" />
+<glyph unicode="" d="M554 1295q21 -72 57.5 -143.5t76 -130t83 -118t82.5 -117t70 -116t49.5 -126t18.5 -136.5q0 -71 -25.5 -135t-68.5 -111t-99 -82t-118.5 -54t-125.5 -23q-84 5 -161.5 34t-139.5 78.5t-99 125t-37 164.5q0 69 18 136.5t49.5 126.5t69.5 116.5t81.5 117.5t83.5 119 t76.5 131t58.5 143zM344 710q-23 -33 -43.5 -70.5t-40.5 -102.5t-17 -123q1 -37 14.5 -69.5t30 -52t41 -37t38.5 -24.5t33 -15q21 -7 32 -1t13 22l6 34q2 10 -2.5 22t-13.5 19q-5 4 -14 12t-29.5 40.5t-32.5 73.5q-26 89 6 271q2 11 -6 11q-8 1 -15 -10z" />
+<glyph unicode="" d="M1000 1013l108 115q2 1 5 2t13 2t20.5 -1t25 -9.5t28.5 -21.5q22 -22 27 -43t0 -32l-6 -10l-108 -115zM350 1100h400q50 0 105 -13l-187 -187h-368q-41 0 -70.5 -29.5t-29.5 -70.5v-500q0 -41 29.5 -70.5t70.5 -29.5h500q41 0 70.5 29.5t29.5 70.5v182l200 200v-332 q0 -165 -93.5 -257.5t-256.5 -92.5h-400q-165 0 -257.5 92.5t-92.5 257.5v400q0 165 92.5 257.5t257.5 92.5zM1009 803l-362 -362l-161 -50l55 170l355 355z" />
+<glyph unicode="" d="M350 1100h361q-164 -146 -216 -200h-195q-41 0 -70.5 -29.5t-29.5 -70.5v-500q0 -41 29.5 -70.5t70.5 -29.5h500q41 0 70.5 29.5t29.5 70.5l200 153v-103q0 -165 -92.5 -257.5t-257.5 -92.5h-400q-165 0 -257.5 92.5t-92.5 257.5v400q0 165 92.5 257.5t257.5 92.5z M824 1073l339 -301q8 -7 8 -17.5t-8 -17.5l-340 -306q-7 -6 -12.5 -4t-6.5 11v203q-26 1 -54.5 0t-78.5 -7.5t-92 -17.5t-86 -35t-70 -57q10 59 33 108t51.5 81.5t65 58.5t68.5 40.5t67 24.5t56 13.5t40 4.5v210q1 10 6.5 12.5t13.5 -4.5z" />
+<glyph unicode="" d="M350 1100h350q60 0 127 -23l-178 -177h-349q-41 0 -70.5 -29.5t-29.5 -70.5v-500q0 -41 29.5 -70.5t70.5 -29.5h500q41 0 70.5 29.5t29.5 70.5v69l200 200v-219q0 -165 -92.5 -257.5t-257.5 -92.5h-400q-165 0 -257.5 92.5t-92.5 257.5v400q0 165 92.5 257.5t257.5 92.5z M643 639l395 395q7 7 17.5 7t17.5 -7l101 -101q7 -7 7 -17.5t-7 -17.5l-531 -532q-7 -7 -17.5 -7t-17.5 7l-248 248q-7 7 -7 17.5t7 17.5l101 101q7 7 17.5 7t17.5 -7l111 -111q8 -7 18 -7t18 7z" />
+<glyph unicode="" d="M318 918l264 264q8 8 18 8t18 -8l260 -264q7 -8 4.5 -13t-12.5 -5h-170v-200h200v173q0 10 5 12t13 -5l264 -260q8 -7 8 -17.5t-8 -17.5l-264 -265q-8 -7 -13 -5t-5 12v173h-200v-200h170q10 0 12.5 -5t-4.5 -13l-260 -264q-8 -8 -18 -8t-18 8l-264 264q-8 8 -5.5 13 t12.5 5h175v200h-200v-173q0 -10 -5 -12t-13 5l-264 265q-8 7 -8 17.5t8 17.5l264 260q8 7 13 5t5 -12v-173h200v200h-175q-10 0 -12.5 5t5.5 13z" />
+<glyph unicode="" d="M250 1100h100q21 0 35.5 -14.5t14.5 -35.5v-438l464 453q15 14 25.5 10t10.5 -25v-1000q0 -21 -10.5 -25t-25.5 10l-464 453v-438q0 -21 -14.5 -35.5t-35.5 -14.5h-100q-21 0 -35.5 14.5t-14.5 35.5v1000q0 21 14.5 35.5t35.5 14.5z" />
+<glyph unicode="" d="M50 1100h100q21 0 35.5 -14.5t14.5 -35.5v-438l464 453q15 14 25.5 10t10.5 -25v-438l464 453q15 14 25.5 10t10.5 -25v-1000q0 -21 -10.5 -25t-25.5 10l-464 453v-438q0 -21 -10.5 -25t-25.5 10l-464 453v-438q0 -21 -14.5 -35.5t-35.5 -14.5h-100q-21 0 -35.5 14.5 t-14.5 35.5v1000q0 21 14.5 35.5t35.5 14.5z" />
+<glyph unicode="" d="M1200 1050v-1000q0 -21 -10.5 -25t-25.5 10l-464 453v-438q0 -21 -10.5 -25t-25.5 10l-492 480q-15 14 -15 35t15 35l492 480q15 14 25.5 10t10.5 -25v-438l464 453q15 14 25.5 10t10.5 -25z" />
+<glyph unicode="" d="M243 1074l814 -498q18 -11 18 -26t-18 -26l-814 -498q-18 -11 -30.5 -4t-12.5 28v1000q0 21 12.5 28t30.5 -4z" />
+<glyph unicode="" d="M250 1000h200q21 0 35.5 -14.5t14.5 -35.5v-800q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5v800q0 21 14.5 35.5t35.5 14.5zM650 1000h200q21 0 35.5 -14.5t14.5 -35.5v-800q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5v800 q0 21 14.5 35.5t35.5 14.5z" />
+<glyph unicode="" d="M1100 950v-800q0 -21 -14.5 -35.5t-35.5 -14.5h-800q-21 0 -35.5 14.5t-14.5 35.5v800q0 21 14.5 35.5t35.5 14.5h800q21 0 35.5 -14.5t14.5 -35.5z" />
+<glyph unicode="" d="M500 612v438q0 21 10.5 25t25.5 -10l492 -480q15 -14 15 -35t-15 -35l-492 -480q-15 -14 -25.5 -10t-10.5 25v438l-464 -453q-15 -14 -25.5 -10t-10.5 25v1000q0 21 10.5 25t25.5 -10z" />
+<glyph unicode="" d="M1048 1102l100 1q20 0 35 -14.5t15 -35.5l5 -1000q0 -21 -14.5 -35.5t-35.5 -14.5l-100 -1q-21 0 -35.5 14.5t-14.5 35.5l-2 437l-463 -454q-14 -15 -24.5 -10.5t-10.5 25.5l-2 437l-462 -455q-15 -14 -25.5 -9.5t-10.5 24.5l-5 1000q0 21 10.5 25.5t25.5 -10.5l466 -450 l-2 438q0 20 10.5 24.5t25.5 -9.5l466 -451l-2 438q0 21 14.5 35.5t35.5 14.5z" />
+<glyph unicode="" d="M850 1100h100q21 0 35.5 -14.5t14.5 -35.5v-1000q0 -21 -14.5 -35.5t-35.5 -14.5h-100q-21 0 -35.5 14.5t-14.5 35.5v438l-464 -453q-15 -14 -25.5 -10t-10.5 25v1000q0 21 10.5 25t25.5 -10l464 -453v438q0 21 14.5 35.5t35.5 14.5z" />
+<glyph unicode="" d="M686 1081l501 -540q15 -15 10.5 -26t-26.5 -11h-1042q-22 0 -26.5 11t10.5 26l501 540q15 15 36 15t36 -15zM150 400h1000q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-1000q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5z" />
+<glyph unicode="" d="M885 900l-352 -353l352 -353l-197 -198l-552 552l552 550z" />
+<glyph unicode="" d="M1064 547l-551 -551l-198 198l353 353l-353 353l198 198z" />
+<glyph unicode="" d="M600 1177q117 0 224 -45.5t184.5 -123t123 -184.5t45.5 -224t-45.5 -224t-123 -184.5t-184.5 -123t-224 -45.5t-224 45.5t-184.5 123t-123 184.5t-45.5 224t45.5 224t123 184.5t184.5 123t224 45.5zM650 900h-100q-21 0 -35.5 -14.5t-14.5 -35.5v-150h-150 q-21 0 -35.5 -14.5t-14.5 -35.5v-100q0 -21 14.5 -35.5t35.5 -14.5h150v-150q0 -21 14.5 -35.5t35.5 -14.5h100q21 0 35.5 14.5t14.5 35.5v150h150q21 0 35.5 14.5t14.5 35.5v100q0 21 -14.5 35.5t-35.5 14.5h-150v150q0 21 -14.5 35.5t-35.5 14.5z" />
+<glyph unicode="" d="M600 1177q117 0 224 -45.5t184.5 -123t123 -184.5t45.5 -224t-45.5 -224t-123 -184.5t-184.5 -123t-224 -45.5t-224 45.5t-184.5 123t-123 184.5t-45.5 224t45.5 224t123 184.5t184.5 123t224 45.5zM850 700h-500q-21 0 -35.5 -14.5t-14.5 -35.5v-100q0 -21 14.5 -35.5 t35.5 -14.5h500q21 0 35.5 14.5t14.5 35.5v100q0 21 -14.5 35.5t-35.5 14.5z" />
+<glyph unicode="" d="M600 1177q117 0 224 -45.5t184.5 -123t123 -184.5t45.5 -224t-45.5 -224t-123 -184.5t-184.5 -123t-224 -45.5t-224 45.5t-184.5 123t-123 184.5t-45.5 224t45.5 224t123 184.5t184.5 123t224 45.5zM741.5 913q-12.5 0 -21.5 -9l-120 -120l-120 120q-9 9 -21.5 9 t-21.5 -9l-141 -141q-9 -9 -9 -21.5t9 -21.5l120 -120l-120 -120q-9 -9 -9 -21.5t9 -21.5l141 -141q9 -9 21.5 -9t21.5 9l120 120l120 -120q9 -9 21.5 -9t21.5 9l141 141q9 9 9 21.5t-9 21.5l-120 120l120 120q9 9 9 21.5t-9 21.5l-141 141q-9 9 -21.5 9z" />
+<glyph unicode="" d="M600 1177q117 0 224 -45.5t184.5 -123t123 -184.5t45.5 -224t-45.5 -224t-123 -184.5t-184.5 -123t-224 -45.5t-224 45.5t-184.5 123t-123 184.5t-45.5 224t45.5 224t123 184.5t184.5 123t224 45.5zM546 623l-84 85q-7 7 -17.5 7t-18.5 -7l-139 -139q-7 -8 -7 -18t7 -18 l242 -241q7 -8 17.5 -8t17.5 8l375 375q7 7 7 17.5t-7 18.5l-139 139q-7 7 -17.5 7t-17.5 -7z" />
+<glyph unicode="" d="M600 1177q117 0 224 -45.5t184.5 -123t123 -184.5t45.5 -224t-45.5 -224t-123 -184.5t-184.5 -123t-224 -45.5t-224 45.5t-184.5 123t-123 184.5t-45.5 224t45.5 224t123 184.5t184.5 123t224 45.5zM588 941q-29 0 -59 -5.5t-63 -20.5t-58 -38.5t-41.5 -63t-16.5 -89.5 q0 -25 20 -25h131q30 -5 35 11q6 20 20.5 28t45.5 8q20 0 31.5 -10.5t11.5 -28.5q0 -23 -7 -34t-26 -18q-1 0 -13.5 -4t-19.5 -7.5t-20 -10.5t-22 -17t-18.5 -24t-15.5 -35t-8 -46q-1 -8 5.5 -16.5t20.5 -8.5h173q7 0 22 8t35 28t37.5 48t29.5 74t12 100q0 47 -17 83 t-42.5 57t-59.5 34.5t-64 18t-59 4.5zM675 400h-150q-10 0 -17.5 -7.5t-7.5 -17.5v-150q0 -10 7.5 -17.5t17.5 -7.5h150q10 0 17.5 7.5t7.5 17.5v150q0 10 -7.5 17.5t-17.5 7.5z" />
+<glyph unicode="" d="M600 1177q117 0 224 -45.5t184.5 -123t123 -184.5t45.5 -224t-45.5 -224t-123 -184.5t-184.5 -123t-224 -45.5t-224 45.5t-184.5 123t-123 184.5t-45.5 224t45.5 224t123 184.5t184.5 123t224 45.5zM675 1000h-150q-10 0 -17.5 -7.5t-7.5 -17.5v-150q0 -10 7.5 -17.5 t17.5 -7.5h150q10 0 17.5 7.5t7.5 17.5v150q0 10 -7.5 17.5t-17.5 7.5zM675 700h-250q-10 0 -17.5 -7.5t-7.5 -17.5v-50q0 -10 7.5 -17.5t17.5 -7.5h75v-200h-75q-10 0 -17.5 -7.5t-7.5 -17.5v-50q0 -10 7.5 -17.5t17.5 -7.5h350q10 0 17.5 7.5t7.5 17.5v50q0 10 -7.5 17.5 t-17.5 7.5h-75v275q0 10 -7.5 17.5t-17.5 7.5z" />
+<glyph unicode="" d="M525 1200h150q10 0 17.5 -7.5t7.5 -17.5v-194q103 -27 178.5 -102.5t102.5 -178.5h194q10 0 17.5 -7.5t7.5 -17.5v-150q0 -10 -7.5 -17.5t-17.5 -7.5h-194q-27 -103 -102.5 -178.5t-178.5 -102.5v-194q0 -10 -7.5 -17.5t-17.5 -7.5h-150q-10 0 -17.5 7.5t-7.5 17.5v194 q-103 27 -178.5 102.5t-102.5 178.5h-194q-10 0 -17.5 7.5t-7.5 17.5v150q0 10 7.5 17.5t17.5 7.5h194q27 103 102.5 178.5t178.5 102.5v194q0 10 7.5 17.5t17.5 7.5zM700 893v-168q0 -10 -7.5 -17.5t-17.5 -7.5h-150q-10 0 -17.5 7.5t-7.5 17.5v168q-68 -23 -119 -74 t-74 -119h168q10 0 17.5 -7.5t7.5 -17.5v-150q0 -10 -7.5 -17.5t-17.5 -7.5h-168q23 -68 74 -119t119 -74v168q0 10 7.5 17.5t17.5 7.5h150q10 0 17.5 -7.5t7.5 -17.5v-168q68 23 119 74t74 119h-168q-10 0 -17.5 7.5t-7.5 17.5v150q0 10 7.5 17.5t17.5 7.5h168 q-23 68 -74 119t-119 74z" />
+<glyph unicode="" d="M600 1177q117 0 224 -45.5t184.5 -123t123 -184.5t45.5 -224t-45.5 -224t-123 -184.5t-184.5 -123t-224 -45.5t-224 45.5t-184.5 123t-123 184.5t-45.5 224t45.5 224t123 184.5t184.5 123t224 45.5zM600 1027q-116 0 -214.5 -57t-155.5 -155.5t-57 -214.5t57 -214.5 t155.5 -155.5t214.5 -57t214.5 57t155.5 155.5t57 214.5t-57 214.5t-155.5 155.5t-214.5 57zM759 823l64 -64q7 -7 7 -17.5t-7 -17.5l-124 -124l124 -124q7 -7 7 -17.5t-7 -17.5l-64 -64q-7 -7 -17.5 -7t-17.5 7l-124 124l-124 -124q-7 -7 -17.5 -7t-17.5 7l-64 64 q-7 7 -7 17.5t7 17.5l124 124l-124 124q-7 7 -7 17.5t7 17.5l64 64q7 7 17.5 7t17.5 -7l124 -124l124 124q7 7 17.5 7t17.5 -7z" />
+<glyph unicode="" d="M600 1177q117 0 224 -45.5t184.5 -123t123 -184.5t45.5 -224t-45.5 -224t-123 -184.5t-184.5 -123t-224 -45.5t-224 45.5t-184.5 123t-123 184.5t-45.5 224t45.5 224t123 184.5t184.5 123t224 45.5zM600 1027q-116 0 -214.5 -57t-155.5 -155.5t-57 -214.5t57 -214.5 t155.5 -155.5t214.5 -57t214.5 57t155.5 155.5t57 214.5t-57 214.5t-155.5 155.5t-214.5 57zM782 788l106 -106q7 -7 7 -17.5t-7 -17.5l-320 -321q-8 -7 -18 -7t-18 7l-202 203q-8 7 -8 17.5t8 17.5l106 106q7 8 17.5 8t17.5 -8l79 -79l197 197q7 7 17.5 7t17.5 -7z" />
+<glyph unicode="" d="M600 1177q117 0 224 -45.5t184.5 -123t123 -184.5t45.5 -224t-45.5 -224t-123 -184.5t-184.5 -123t-224 -45.5t-224 45.5t-184.5 123t-123 184.5t-45.5 224t45.5 224t123 184.5t184.5 123t224 45.5zM600 1027q-116 0 -214.5 -57t-155.5 -155.5t-57 -214.5q0 -120 65 -225 l587 587q-105 65 -225 65zM965 819l-584 -584q104 -62 219 -62q116 0 214.5 57t155.5 155.5t57 214.5q0 115 -62 219z" />
+<glyph unicode="" d="M39 582l522 427q16 13 27.5 8t11.5 -26v-291h550q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-550v-291q0 -21 -11.5 -26t-27.5 8l-522 427q-16 13 -16 32t16 32z" />
+<glyph unicode="" d="M639 1009l522 -427q16 -13 16 -32t-16 -32l-522 -427q-16 -13 -27.5 -8t-11.5 26v291h-550q-21 0 -35.5 14.5t-14.5 35.5v200q0 21 14.5 35.5t35.5 14.5h550v291q0 21 11.5 26t27.5 -8z" />
+<glyph unicode="" d="M682 1161l427 -522q13 -16 8 -27.5t-26 -11.5h-291v-550q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5v550h-291q-21 0 -26 11.5t8 27.5l427 522q13 16 32 16t32 -16z" />
+<glyph unicode="" d="M550 1200h200q21 0 35.5 -14.5t14.5 -35.5v-550h291q21 0 26 -11.5t-8 -27.5l-427 -522q-13 -16 -32 -16t-32 16l-427 522q-13 16 -8 27.5t26 11.5h291v550q0 21 14.5 35.5t35.5 14.5z" />
+<glyph unicode="" d="M639 1109l522 -427q16 -13 16 -32t-16 -32l-522 -427q-16 -13 -27.5 -8t-11.5 26v291q-94 -2 -182 -20t-170.5 -52t-147 -92.5t-100.5 -135.5q5 105 27 193.5t67.5 167t113 135t167 91.5t225.5 42v262q0 21 11.5 26t27.5 -8z" />
+<glyph unicode="" d="M850 1200h300q21 0 35.5 -14.5t14.5 -35.5v-300q0 -21 -10.5 -25t-24.5 10l-94 94l-249 -249q-8 -7 -18 -7t-18 7l-106 106q-7 8 -7 18t7 18l249 249l-94 94q-14 14 -10 24.5t25 10.5zM350 0h-300q-21 0 -35.5 14.5t-14.5 35.5v300q0 21 10.5 25t24.5 -10l94 -94l249 249 q8 7 18 7t18 -7l106 -106q7 -8 7 -18t-7 -18l-249 -249l94 -94q14 -14 10 -24.5t-25 -10.5z" />
+<glyph unicode="" d="M1014 1120l106 -106q7 -8 7 -18t-7 -18l-249 -249l94 -94q14 -14 10 -24.5t-25 -10.5h-300q-21 0 -35.5 14.5t-14.5 35.5v300q0 21 10.5 25t24.5 -10l94 -94l249 249q8 7 18 7t18 -7zM250 600h300q21 0 35.5 -14.5t14.5 -35.5v-300q0 -21 -10.5 -25t-24.5 10l-94 94 l-249 -249q-8 -7 -18 -7t-18 7l-106 106q-7 8 -7 18t7 18l249 249l-94 94q-14 14 -10 24.5t25 10.5z" />
+<glyph unicode="" d="M600 1177q117 0 224 -45.5t184.5 -123t123 -184.5t45.5 -224t-45.5 -224t-123 -184.5t-184.5 -123t-224 -45.5t-224 45.5t-184.5 123t-123 184.5t-45.5 224t45.5 224t123 184.5t184.5 123t224 45.5zM704 900h-208q-20 0 -32 -14.5t-8 -34.5l58 -302q4 -20 21.5 -34.5 t37.5 -14.5h54q20 0 37.5 14.5t21.5 34.5l58 302q4 20 -8 34.5t-32 14.5zM675 400h-150q-10 0 -17.5 -7.5t-7.5 -17.5v-150q0 -10 7.5 -17.5t17.5 -7.5h150q10 0 17.5 7.5t7.5 17.5v150q0 10 -7.5 17.5t-17.5 7.5z" />
+<glyph unicode="" d="M260 1200q9 0 19 -2t15 -4l5 -2q22 -10 44 -23l196 -118q21 -13 36 -24q29 -21 37 -12q11 13 49 35l196 118q22 13 45 23q17 7 38 7q23 0 47 -16.5t37 -33.5l13 -16q14 -21 18 -45l25 -123l8 -44q1 -9 8.5 -14.5t17.5 -5.5h61q10 0 17.5 -7.5t7.5 -17.5v-50 q0 -10 -7.5 -17.5t-17.5 -7.5h-50q-10 0 -17.5 -7.5t-7.5 -17.5v-175h-400v300h-200v-300h-400v175q0 10 -7.5 17.5t-17.5 7.5h-50q-10 0 -17.5 7.5t-7.5 17.5v50q0 10 7.5 17.5t17.5 7.5h61q11 0 18 3t7 8q0 4 9 52l25 128q5 25 19 45q2 3 5 7t13.5 15t21.5 19.5t26.5 15.5 t29.5 7zM915 1079l-166 -162q-7 -7 -5 -12t12 -5h219q10 0 15 7t2 17l-51 149q-3 10 -11 12t-15 -6zM463 917l-177 157q-8 7 -16 5t-11 -12l-51 -143q-3 -10 2 -17t15 -7h231q11 0 12.5 5t-5.5 12zM500 0h-375q-10 0 -17.5 7.5t-7.5 17.5v375h400v-400zM1100 400v-375 q0 -10 -7.5 -17.5t-17.5 -7.5h-375v400h400z" />
+<glyph unicode="" d="M1165 1190q8 3 21 -6.5t13 -17.5q-2 -178 -24.5 -323.5t-55.5 -245.5t-87 -174.5t-102.5 -118.5t-118 -68.5t-118.5 -33t-120 -4.5t-105 9.5t-90 16.5q-61 12 -78 11q-4 1 -12.5 0t-34 -14.5t-52.5 -40.5l-153 -153q-26 -24 -37 -14.5t-11 43.5q0 64 42 102q8 8 50.5 45 t66.5 58q19 17 35 47t13 61q-9 55 -10 102.5t7 111t37 130t78 129.5q39 51 80 88t89.5 63.5t94.5 45t113.5 36t129 31t157.5 37t182 47.5zM1116 1098q-8 9 -22.5 -3t-45.5 -50q-38 -47 -119 -103.5t-142 -89.5l-62 -33q-56 -30 -102 -57t-104 -68t-102.5 -80.5t-85.5 -91 t-64 -104.5q-24 -56 -31 -86t2 -32t31.5 17.5t55.5 59.5q25 30 94 75.5t125.5 77.5t147.5 81q70 37 118.5 69t102 79.5t99 111t86.5 148.5q22 50 24 60t-6 19z" />
+<glyph unicode="" d="M653 1231q-39 -67 -54.5 -131t-10.5 -114.5t24.5 -96.5t47.5 -80t63.5 -62.5t68.5 -46.5t65 -30q-4 7 -17.5 35t-18.5 39.5t-17 39.5t-17 43t-13 42t-9.5 44.5t-2 42t4 43t13.5 39t23 38.5q96 -42 165 -107.5t105 -138t52 -156t13 -159t-19 -149.5q-13 -55 -44 -106.5 t-68 -87t-78.5 -64.5t-72.5 -45t-53 -22q-72 -22 -127 -11q-31 6 -13 19q6 3 17 7q13 5 32.5 21t41 44t38.5 63.5t21.5 81.5t-6.5 94.5t-50 107t-104 115.5q10 -104 -0.5 -189t-37 -140.5t-65 -93t-84 -52t-93.5 -11t-95 24.5q-80 36 -131.5 114t-53.5 171q-2 23 0 49.5 t4.5 52.5t13.5 56t27.5 60t46 64.5t69.5 68.5q-8 -53 -5 -102.5t17.5 -90t34 -68.5t44.5 -39t49 -2q31 13 38.5 36t-4.5 55t-29 64.5t-36 75t-26 75.5q-15 85 2 161.5t53.5 128.5t85.5 92.5t93.5 61t81.5 25.5z" />
+<glyph unicode="" d="M600 1094q82 0 160.5 -22.5t140 -59t116.5 -82.5t94.5 -95t68 -95t42.5 -82.5t14 -57.5t-14 -57.5t-43 -82.5t-68.5 -95t-94.5 -95t-116.5 -82.5t-140 -59t-159.5 -22.5t-159.5 22.5t-140 59t-116.5 82.5t-94.5 95t-68.5 95t-43 82.5t-14 57.5t14 57.5t42.5 82.5t68 95 t94.5 95t116.5 82.5t140 59t160.5 22.5zM888 829q-15 15 -18 12t5 -22q25 -57 25 -119q0 -124 -88 -212t-212 -88t-212 88t-88 212q0 59 23 114q8 19 4.5 22t-17.5 -12q-70 -69 -160 -184q-13 -16 -15 -40.5t9 -42.5q22 -36 47 -71t70 -82t92.5 -81t113 -58.5t133.5 -24.5 t133.5 24t113 58.5t92.5 81.5t70 81.5t47 70.5q11 18 9 42.5t-14 41.5q-90 117 -163 189zM448 727l-35 -36q-15 -15 -19.5 -38.5t4.5 -41.5q37 -68 93 -116q16 -13 38.5 -11t36.5 17l35 34q14 15 12.5 33.5t-16.5 33.5q-44 44 -89 117q-11 18 -28 20t-32 -12z" />
+<glyph unicode="" d="M592 0h-148l31 120q-91 20 -175.5 68.5t-143.5 106.5t-103.5 119t-66.5 110t-22 76q0 21 14 57.5t42.5 82.5t68 95t94.5 95t116.5 82.5t140 59t160.5 22.5q61 0 126 -15l32 121h148zM944 770l47 181q108 -85 176.5 -192t68.5 -159q0 -26 -19.5 -71t-59.5 -102t-93 -112 t-129 -104.5t-158 -75.5l46 173q77 49 136 117t97 131q11 18 9 42.5t-14 41.5q-54 70 -107 130zM310 824q-70 -69 -160 -184q-13 -16 -15 -40.5t9 -42.5q18 -30 39 -60t57 -70.5t74 -73t90 -61t105 -41.5l41 154q-107 18 -178.5 101.5t-71.5 193.5q0 59 23 114q8 19 4.5 22 t-17.5 -12zM448 727l-35 -36q-15 -15 -19.5 -38.5t4.5 -41.5q37 -68 93 -116q16 -13 38.5 -11t36.5 17l12 11l22 86l-3 4q-44 44 -89 117q-11 18 -28 20t-32 -12z" />
+<glyph unicode="" d="M-90 100l642 1066q20 31 48 28.5t48 -35.5l642 -1056q21 -32 7.5 -67.5t-50.5 -35.5h-1294q-37 0 -50.5 34t7.5 66zM155 200h345v75q0 10 7.5 17.5t17.5 7.5h150q10 0 17.5 -7.5t7.5 -17.5v-75h345l-445 723zM496 700h208q20 0 32 -14.5t8 -34.5l-58 -252 q-4 -20 -21.5 -34.5t-37.5 -14.5h-54q-20 0 -37.5 14.5t-21.5 34.5l-58 252q-4 20 8 34.5t32 14.5z" />
+<glyph unicode="" d="M650 1200q62 0 106 -44t44 -106v-339l363 -325q15 -14 26 -38.5t11 -44.5v-41q0 -20 -12 -26.5t-29 5.5l-359 249v-263q100 -93 100 -113v-64q0 -21 -13 -29t-32 1l-205 128l-205 -128q-19 -9 -32 -1t-13 29v64q0 20 100 113v263l-359 -249q-17 -12 -29 -5.5t-12 26.5v41 q0 20 11 44.5t26 38.5l363 325v339q0 62 44 106t106 44z" />
+<glyph unicode="" d="M850 1200h100q21 0 35.5 -14.5t14.5 -35.5v-50h50q21 0 35.5 -14.5t14.5 -35.5v-150h-1100v150q0 21 14.5 35.5t35.5 14.5h50v50q0 21 14.5 35.5t35.5 14.5h100q21 0 35.5 -14.5t14.5 -35.5v-50h500v50q0 21 14.5 35.5t35.5 14.5zM1100 800v-750q0 -21 -14.5 -35.5 t-35.5 -14.5h-1000q-21 0 -35.5 14.5t-14.5 35.5v750h1100zM100 600v-100h100v100h-100zM300 600v-100h100v100h-100zM500 600v-100h100v100h-100zM700 600v-100h100v100h-100zM900 600v-100h100v100h-100zM100 400v-100h100v100h-100zM300 400v-100h100v100h-100zM500 400 v-100h100v100h-100zM700 400v-100h100v100h-100zM900 400v-100h100v100h-100zM100 200v-100h100v100h-100zM300 200v-100h100v100h-100zM500 200v-100h100v100h-100zM700 200v-100h100v100h-100zM900 200v-100h100v100h-100z" />
+<glyph unicode="" d="M1135 1165l249 -230q15 -14 15 -35t-15 -35l-249 -230q-14 -14 -24.5 -10t-10.5 25v150h-159l-600 -600h-291q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5h209l600 600h241v150q0 21 10.5 25t24.5 -10zM522 819l-141 -141l-122 122h-209q-21 0 -35.5 14.5 t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5h291zM1135 565l249 -230q15 -14 15 -35t-15 -35l-249 -230q-14 -14 -24.5 -10t-10.5 25v150h-241l-181 181l141 141l122 -122h159v150q0 21 10.5 25t24.5 -10z" />
+<glyph unicode="" d="M100 1100h1000q41 0 70.5 -29.5t29.5 -70.5v-600q0 -41 -29.5 -70.5t-70.5 -29.5h-596l-304 -300v300h-100q-41 0 -70.5 29.5t-29.5 70.5v600q0 41 29.5 70.5t70.5 29.5z" />
+<glyph unicode="" d="M150 1200h200q21 0 35.5 -14.5t14.5 -35.5v-250h-300v250q0 21 14.5 35.5t35.5 14.5zM850 1200h200q21 0 35.5 -14.5t14.5 -35.5v-250h-300v250q0 21 14.5 35.5t35.5 14.5zM1100 800v-300q0 -41 -3 -77.5t-15 -89.5t-32 -96t-58 -89t-89 -77t-129 -51t-174 -20t-174 20 t-129 51t-89 77t-58 89t-32 96t-15 89.5t-3 77.5v300h300v-250v-27v-42.5t1.5 -41t5 -38t10 -35t16.5 -30t25.5 -24.5t35 -19t46.5 -12t60 -4t60 4.5t46.5 12.5t35 19.5t25 25.5t17 30.5t10 35t5 38t2 40.5t-0.5 42v25v250h300z" />
+<glyph unicode="" d="M1100 411l-198 -199l-353 353l-353 -353l-197 199l551 551z" />
+<glyph unicode="" d="M1101 789l-550 -551l-551 551l198 199l353 -353l353 353z" />
+<glyph unicode="" d="M404 1000h746q21 0 35.5 -14.5t14.5 -35.5v-551h150q21 0 25 -10.5t-10 -24.5l-230 -249q-14 -15 -35 -15t-35 15l-230 249q-14 14 -10 24.5t25 10.5h150v401h-381zM135 984l230 -249q14 -14 10 -24.5t-25 -10.5h-150v-400h385l215 -200h-750q-21 0 -35.5 14.5 t-14.5 35.5v550h-150q-21 0 -25 10.5t10 24.5l230 249q14 15 35 15t35 -15z" />
+<glyph unicode="" d="M56 1200h94q17 0 31 -11t18 -27l38 -162h896q24 0 39 -18.5t10 -42.5l-100 -475q-5 -21 -27 -42.5t-55 -21.5h-633l48 -200h535q21 0 35.5 -14.5t14.5 -35.5t-14.5 -35.5t-35.5 -14.5h-50v-50q0 -21 -14.5 -35.5t-35.5 -14.5t-35.5 14.5t-14.5 35.5v50h-300v-50 q0 -21 -14.5 -35.5t-35.5 -14.5t-35.5 14.5t-14.5 35.5v50h-31q-18 0 -32.5 10t-20.5 19l-5 10l-201 961h-54q-20 0 -35 14.5t-15 35.5t15 35.5t35 14.5z" />
+<glyph unicode="" d="M1200 1000v-100h-1200v100h200q0 41 29.5 70.5t70.5 29.5h300q41 0 70.5 -29.5t29.5 -70.5h500zM0 800h1200v-800h-1200v800z" />
+<glyph unicode="" d="M200 800l-200 -400v600h200q0 41 29.5 70.5t70.5 29.5h300q42 0 71 -29.5t29 -70.5h500v-200h-1000zM1500 700l-300 -700h-1200l300 700h1200z" />
+<glyph unicode="" d="M635 1184l230 -249q14 -14 10 -24.5t-25 -10.5h-150v-601h150q21 0 25 -10.5t-10 -24.5l-230 -249q-14 -15 -35 -15t-35 15l-230 249q-14 14 -10 24.5t25 10.5h150v601h-150q-21 0 -25 10.5t10 24.5l230 249q14 15 35 15t35 -15z" />
+<glyph unicode="" d="M936 864l249 -229q14 -15 14 -35.5t-14 -35.5l-249 -229q-15 -15 -25.5 -10.5t-10.5 24.5v151h-600v-151q0 -20 -10.5 -24.5t-25.5 10.5l-249 229q-14 15 -14 35.5t14 35.5l249 229q15 15 25.5 10.5t10.5 -25.5v-149h600v149q0 21 10.5 25.5t25.5 -10.5z" />
+<glyph unicode="" d="M1169 400l-172 732q-5 23 -23 45.5t-38 22.5h-672q-20 0 -38 -20t-23 -41l-172 -739h1138zM1100 300h-1000q-41 0 -70.5 -29.5t-29.5 -70.5v-100q0 -41 29.5 -70.5t70.5 -29.5h1000q41 0 70.5 29.5t29.5 70.5v100q0 41 -29.5 70.5t-70.5 29.5zM800 100v100h100v-100h-100 zM1000 100v100h100v-100h-100z" />
+<glyph unicode="" d="M1150 1100q21 0 35.5 -14.5t14.5 -35.5v-850q0 -21 -14.5 -35.5t-35.5 -14.5t-35.5 14.5t-14.5 35.5v850q0 21 14.5 35.5t35.5 14.5zM1000 200l-675 200h-38l47 -276q3 -16 -5.5 -20t-29.5 -4h-7h-84q-20 0 -34.5 14t-18.5 35q-55 337 -55 351v250v6q0 16 1 23.5t6.5 14 t17.5 6.5h200l675 250v-850zM0 750v-250q-4 0 -11 0.5t-24 6t-30 15t-24 30t-11 48.5v50q0 26 10.5 46t25 30t29 16t25.5 7z" />
+<glyph unicode="" d="M553 1200h94q20 0 29 -10.5t3 -29.5l-18 -37q83 -19 144 -82.5t76 -140.5l63 -327l118 -173h17q19 0 33 -14.5t14 -35t-13 -40.5t-31 -27q-8 -4 -23 -9.5t-65 -19.5t-103 -25t-132.5 -20t-158.5 -9q-57 0 -115 5t-104 12t-88.5 15.5t-73.5 17.5t-54.5 16t-35.5 12l-11 4 q-18 8 -31 28t-13 40.5t14 35t33 14.5h17l118 173l63 327q15 77 76 140t144 83l-18 32q-6 19 3.5 32t28.5 13zM498 110q50 -6 102 -6q53 0 102 6q-12 -49 -39.5 -79.5t-62.5 -30.5t-63 30.5t-39 79.5z" />
+<glyph unicode="" d="M800 946l224 78l-78 -224l234 -45l-180 -155l180 -155l-234 -45l78 -224l-224 78l-45 -234l-155 180l-155 -180l-45 234l-224 -78l78 224l-234 45l180 155l-180 155l234 45l-78 224l224 -78l45 234l155 -180l155 180z" />
+<glyph unicode="" d="M650 1200h50q40 0 70 -40.5t30 -84.5v-150l-28 -125h328q40 0 70 -40.5t30 -84.5v-100q0 -45 -29 -74l-238 -344q-16 -24 -38 -40.5t-45 -16.5h-250q-7 0 -42 25t-66 50l-31 25h-61q-45 0 -72.5 18t-27.5 57v400q0 36 20 63l145 196l96 198q13 28 37.5 48t51.5 20z M650 1100l-100 -212l-150 -213v-375h100l136 -100h214l250 375v125h-450l50 225v175h-50zM50 800h100q21 0 35.5 -14.5t14.5 -35.5v-500q0 -21 -14.5 -35.5t-35.5 -14.5h-100q-21 0 -35.5 14.5t-14.5 35.5v500q0 21 14.5 35.5t35.5 14.5z" />
+<glyph unicode="" d="M600 1100h250q23 0 45 -16.5t38 -40.5l238 -344q29 -29 29 -74v-100q0 -44 -30 -84.5t-70 -40.5h-328q28 -118 28 -125v-150q0 -44 -30 -84.5t-70 -40.5h-50q-27 0 -51.5 20t-37.5 48l-96 198l-145 196q-20 27 -20 63v400q0 39 27.5 57t72.5 18h61q124 100 139 100z M50 1000h100q21 0 35.5 -14.5t14.5 -35.5v-500q0 -21 -14.5 -35.5t-35.5 -14.5h-100q-21 0 -35.5 14.5t-14.5 35.5v500q0 21 14.5 35.5t35.5 14.5zM636 1000l-136 -100h-100v-375l150 -213l100 -212h50v175l-50 225h450v125l-250 375h-214z" />
+<glyph unicode="" d="M356 873l363 230q31 16 53 -6l110 -112q13 -13 13.5 -32t-11.5 -34l-84 -121h302q84 0 138 -38t54 -110t-55 -111t-139 -39h-106l-131 -339q-6 -21 -19.5 -41t-28.5 -20h-342q-7 0 -90 81t-83 94v525q0 17 14 35.5t28 28.5zM400 792v-503l100 -89h293l131 339 q6 21 19.5 41t28.5 20h203q21 0 30.5 25t0.5 50t-31 25h-456h-7h-6h-5.5t-6 0.5t-5 1.5t-5 2t-4 2.5t-4 4t-2.5 4.5q-12 25 5 47l146 183l-86 83zM50 800h100q21 0 35.5 -14.5t14.5 -35.5v-500q0 -21 -14.5 -35.5t-35.5 -14.5h-100q-21 0 -35.5 14.5t-14.5 35.5v500 q0 21 14.5 35.5t35.5 14.5z" />
+<glyph unicode="" d="M475 1103l366 -230q2 -1 6 -3.5t14 -10.5t18 -16.5t14.5 -20t6.5 -22.5v-525q0 -13 -86 -94t-93 -81h-342q-15 0 -28.5 20t-19.5 41l-131 339h-106q-85 0 -139.5 39t-54.5 111t54 110t138 38h302l-85 121q-11 15 -10.5 34t13.5 32l110 112q22 22 53 6zM370 945l146 -183 q17 -22 5 -47q-2 -2 -3.5 -4.5t-4 -4t-4 -2.5t-5 -2t-5 -1.5t-6 -0.5h-6h-6.5h-6h-475v-100h221q15 0 29 -20t20 -41l130 -339h294l106 89v503l-342 236zM1050 800h100q21 0 35.5 -14.5t14.5 -35.5v-500q0 -21 -14.5 -35.5t-35.5 -14.5h-100q-21 0 -35.5 14.5t-14.5 35.5 v500q0 21 14.5 35.5t35.5 14.5z" />
+<glyph unicode="" d="M550 1294q72 0 111 -55t39 -139v-106l339 -131q21 -6 41 -19.5t20 -28.5v-342q0 -7 -81 -90t-94 -83h-525q-17 0 -35.5 14t-28.5 28l-9 14l-230 363q-16 31 6 53l112 110q13 13 32 13.5t34 -11.5l121 -84v302q0 84 38 138t110 54zM600 972v203q0 21 -25 30.5t-50 0.5 t-25 -31v-456v-7v-6v-5.5t-0.5 -6t-1.5 -5t-2 -5t-2.5 -4t-4 -4t-4.5 -2.5q-25 -12 -47 5l-183 146l-83 -86l236 -339h503l89 100v293l-339 131q-21 6 -41 19.5t-20 28.5zM450 200h500q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-500 q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5z" />
+<glyph unicode="" d="M350 1100h500q21 0 35.5 14.5t14.5 35.5v100q0 21 -14.5 35.5t-35.5 14.5h-500q-21 0 -35.5 -14.5t-14.5 -35.5v-100q0 -21 14.5 -35.5t35.5 -14.5zM600 306v-106q0 -84 -39 -139t-111 -55t-110 54t-38 138v302l-121 -84q-15 -12 -34 -11.5t-32 13.5l-112 110 q-22 22 -6 53l230 363q1 2 3.5 6t10.5 13.5t16.5 17t20 13.5t22.5 6h525q13 0 94 -83t81 -90v-342q0 -15 -20 -28.5t-41 -19.5zM308 900l-236 -339l83 -86l183 146q22 17 47 5q2 -1 4.5 -2.5t4 -4t2.5 -4t2 -5t1.5 -5t0.5 -6v-5.5v-6v-7v-456q0 -22 25 -31t50 0.5t25 30.5 v203q0 15 20 28.5t41 19.5l339 131v293l-89 100h-503z" />
+<glyph unicode="" d="M600 1178q118 0 225 -45.5t184.5 -123t123 -184.5t45.5 -225t-45.5 -225t-123 -184.5t-184.5 -123t-225 -45.5t-225 45.5t-184.5 123t-123 184.5t-45.5 225t45.5 225t123 184.5t184.5 123t225 45.5zM914 632l-275 223q-16 13 -27.5 8t-11.5 -26v-137h-275 q-10 0 -17.5 -7.5t-7.5 -17.5v-150q0 -10 7.5 -17.5t17.5 -7.5h275v-137q0 -21 11.5 -26t27.5 8l275 223q16 13 16 32t-16 32z" />
+<glyph unicode="" d="M600 1178q118 0 225 -45.5t184.5 -123t123 -184.5t45.5 -225t-45.5 -225t-123 -184.5t-184.5 -123t-225 -45.5t-225 45.5t-184.5 123t-123 184.5t-45.5 225t45.5 225t123 184.5t184.5 123t225 45.5zM561 855l-275 -223q-16 -13 -16 -32t16 -32l275 -223q16 -13 27.5 -8 t11.5 26v137h275q10 0 17.5 7.5t7.5 17.5v150q0 10 -7.5 17.5t-17.5 7.5h-275v137q0 21 -11.5 26t-27.5 -8z" />
+<glyph unicode="" d="M600 1178q118 0 225 -45.5t184.5 -123t123 -184.5t45.5 -225t-45.5 -225t-123 -184.5t-184.5 -123t-225 -45.5t-225 45.5t-184.5 123t-123 184.5t-45.5 225t45.5 225t123 184.5t184.5 123t225 45.5zM855 639l-223 275q-13 16 -32 16t-32 -16l-223 -275q-13 -16 -8 -27.5 t26 -11.5h137v-275q0 -10 7.5 -17.5t17.5 -7.5h150q10 0 17.5 7.5t7.5 17.5v275h137q21 0 26 11.5t-8 27.5z" />
+<glyph unicode="" d="M600 1178q118 0 225 -45.5t184.5 -123t123 -184.5t45.5 -225t-45.5 -225t-123 -184.5t-184.5 -123t-225 -45.5t-225 45.5t-184.5 123t-123 184.5t-45.5 225t45.5 225t123 184.5t184.5 123t225 45.5zM675 900h-150q-10 0 -17.5 -7.5t-7.5 -17.5v-275h-137q-21 0 -26 -11.5 t8 -27.5l223 -275q13 -16 32 -16t32 16l223 275q13 16 8 27.5t-26 11.5h-137v275q0 10 -7.5 17.5t-17.5 7.5z" />
+<glyph unicode="" d="M600 1176q116 0 222.5 -46t184 -123.5t123.5 -184t46 -222.5t-46 -222.5t-123.5 -184t-184 -123.5t-222.5 -46t-222.5 46t-184 123.5t-123.5 184t-46 222.5t46 222.5t123.5 184t184 123.5t222.5 46zM627 1101q-15 -12 -36.5 -20.5t-35.5 -12t-43 -8t-39 -6.5 q-15 -3 -45.5 0t-45.5 -2q-20 -7 -51.5 -26.5t-34.5 -34.5q-3 -11 6.5 -22.5t8.5 -18.5q-3 -34 -27.5 -91t-29.5 -79q-9 -34 5 -93t8 -87q0 -9 17 -44.5t16 -59.5q12 0 23 -5t23.5 -15t19.5 -14q16 -8 33 -15t40.5 -15t34.5 -12q21 -9 52.5 -32t60 -38t57.5 -11 q7 -15 -3 -34t-22.5 -40t-9.5 -38q13 -21 23 -34.5t27.5 -27.5t36.5 -18q0 -7 -3.5 -16t-3.5 -14t5 -17q104 -2 221 112q30 29 46.5 47t34.5 49t21 63q-13 8 -37 8.5t-36 7.5q-15 7 -49.5 15t-51.5 19q-18 0 -41 -0.5t-43 -1.5t-42 -6.5t-38 -16.5q-51 -35 -66 -12 q-4 1 -3.5 25.5t0.5 25.5q-6 13 -26.5 17.5t-24.5 6.5q1 15 -0.5 30.5t-7 28t-18.5 11.5t-31 -21q-23 -25 -42 4q-19 28 -8 58q6 16 22 22q6 -1 26 -1.5t33.5 -4t19.5 -13.5q7 -12 18 -24t21.5 -20.5t20 -15t15.5 -10.5l5 -3q2 12 7.5 30.5t8 34.5t-0.5 32q-3 18 3.5 29 t18 22.5t15.5 24.5q6 14 10.5 35t8 31t15.5 22.5t34 22.5q-6 18 10 36q8 0 24 -1.5t24.5 -1.5t20 4.5t20.5 15.5q-10 23 -31 42.5t-37.5 29.5t-49 27t-43.5 23q0 1 2 8t3 11.5t1.5 10.5t-1 9.5t-4.5 4.5q31 -13 58.5 -14.5t38.5 2.5l12 5q5 28 -9.5 46t-36.5 24t-50 15 t-41 20q-18 -4 -37 0zM613 994q0 -17 8 -42t17 -45t9 -23q-8 1 -39.5 5.5t-52.5 10t-37 16.5q3 11 16 29.5t16 25.5q10 -10 19 -10t14 6t13.5 14.5t16.5 12.5z" />
+<glyph unicode="" d="M756 1157q164 92 306 -9l-259 -138l145 -232l251 126q6 -89 -34 -156.5t-117 -110.5q-60 -34 -127 -39.5t-126 16.5l-596 -596q-15 -16 -36.5 -16t-36.5 16l-111 110q-15 15 -15 36.5t15 37.5l600 599q-34 101 5.5 201.5t135.5 154.5z" />
+<glyph unicode="" horiz-adv-x="1220" d="M100 1196h1000q41 0 70.5 -29.5t29.5 -70.5v-100q0 -41 -29.5 -70.5t-70.5 -29.5h-1000q-41 0 -70.5 29.5t-29.5 70.5v100q0 41 29.5 70.5t70.5 29.5zM1100 1096h-200v-100h200v100zM100 796h1000q41 0 70.5 -29.5t29.5 -70.5v-100q0 -41 -29.5 -70.5t-70.5 -29.5h-1000 q-41 0 -70.5 29.5t-29.5 70.5v100q0 41 29.5 70.5t70.5 29.5zM1100 696h-500v-100h500v100zM100 396h1000q41 0 70.5 -29.5t29.5 -70.5v-100q0 -41 -29.5 -70.5t-70.5 -29.5h-1000q-41 0 -70.5 29.5t-29.5 70.5v100q0 41 29.5 70.5t70.5 29.5zM1100 296h-300v-100h300v100z " />
+<glyph unicode="" d="M150 1200h900q21 0 35.5 -14.5t14.5 -35.5t-14.5 -35.5t-35.5 -14.5h-900q-21 0 -35.5 14.5t-14.5 35.5t14.5 35.5t35.5 14.5zM700 500v-300l-200 -200v500l-350 500h900z" />
+<glyph unicode="" d="M500 1200h200q41 0 70.5 -29.5t29.5 -70.5v-100h300q41 0 70.5 -29.5t29.5 -70.5v-400h-500v100h-200v-100h-500v400q0 41 29.5 70.5t70.5 29.5h300v100q0 41 29.5 70.5t70.5 29.5zM500 1100v-100h200v100h-200zM1200 400v-200q0 -41 -29.5 -70.5t-70.5 -29.5h-1000 q-41 0 -70.5 29.5t-29.5 70.5v200h1200z" />
+<glyph unicode="" d="M50 1200h300q21 0 25 -10.5t-10 -24.5l-94 -94l199 -199q7 -8 7 -18t-7 -18l-106 -106q-8 -7 -18 -7t-18 7l-199 199l-94 -94q-14 -14 -24.5 -10t-10.5 25v300q0 21 14.5 35.5t35.5 14.5zM850 1200h300q21 0 35.5 -14.5t14.5 -35.5v-300q0 -21 -10.5 -25t-24.5 10l-94 94 l-199 -199q-8 -7 -18 -7t-18 7l-106 106q-7 8 -7 18t7 18l199 199l-94 94q-14 14 -10 24.5t25 10.5zM364 470l106 -106q7 -8 7 -18t-7 -18l-199 -199l94 -94q14 -14 10 -24.5t-25 -10.5h-300q-21 0 -35.5 14.5t-14.5 35.5v300q0 21 10.5 25t24.5 -10l94 -94l199 199 q8 7 18 7t18 -7zM1071 271l94 94q14 14 24.5 10t10.5 -25v-300q0 -21 -14.5 -35.5t-35.5 -14.5h-300q-21 0 -25 10.5t10 24.5l94 94l-199 199q-7 8 -7 18t7 18l106 106q8 7 18 7t18 -7z" />
+<glyph unicode="" d="M596 1192q121 0 231.5 -47.5t190 -127t127 -190t47.5 -231.5t-47.5 -231.5t-127 -190.5t-190 -127t-231.5 -47t-231.5 47t-190.5 127t-127 190.5t-47 231.5t47 231.5t127 190t190.5 127t231.5 47.5zM596 1010q-112 0 -207.5 -55.5t-151 -151t-55.5 -207.5t55.5 -207.5 t151 -151t207.5 -55.5t207.5 55.5t151 151t55.5 207.5t-55.5 207.5t-151 151t-207.5 55.5zM454.5 905q22.5 0 38.5 -16t16 -38.5t-16 -39t-38.5 -16.5t-38.5 16.5t-16 39t16 38.5t38.5 16zM754.5 905q22.5 0 38.5 -16t16 -38.5t-16 -39t-38 -16.5q-14 0 -29 10l-55 -145 q17 -23 17 -51q0 -36 -25.5 -61.5t-61.5 -25.5t-61.5 25.5t-25.5 61.5q0 32 20.5 56.5t51.5 29.5l122 126l1 1q-9 14 -9 28q0 23 16 39t38.5 16zM345.5 709q22.5 0 38.5 -16t16 -38.5t-16 -38.5t-38.5 -16t-38.5 16t-16 38.5t16 38.5t38.5 16zM854.5 709q22.5 0 38.5 -16 t16 -38.5t-16 -38.5t-38.5 -16t-38.5 16t-16 38.5t16 38.5t38.5 16z" />
+<glyph unicode="" d="M546 173l469 470q91 91 99 192q7 98 -52 175.5t-154 94.5q-22 4 -47 4q-34 0 -66.5 -10t-56.5 -23t-55.5 -38t-48 -41.5t-48.5 -47.5q-376 -375 -391 -390q-30 -27 -45 -41.5t-37.5 -41t-32 -46.5t-16 -47.5t-1.5 -56.5q9 -62 53.5 -95t99.5 -33q74 0 125 51l548 548 q36 36 20 75q-7 16 -21.5 26t-32.5 10q-26 0 -50 -23q-13 -12 -39 -38l-341 -338q-15 -15 -35.5 -15.5t-34.5 13.5t-14 34.5t14 34.5q327 333 361 367q35 35 67.5 51.5t78.5 16.5q14 0 29 -1q44 -8 74.5 -35.5t43.5 -68.5q14 -47 2 -96.5t-47 -84.5q-12 -11 -32 -32 t-79.5 -81t-114.5 -115t-124.5 -123.5t-123 -119.5t-96.5 -89t-57 -45q-56 -27 -120 -27q-70 0 -129 32t-93 89q-48 78 -35 173t81 163l511 511q71 72 111 96q91 55 198 55q80 0 152 -33q78 -36 129.5 -103t66.5 -154q17 -93 -11 -183.5t-94 -156.5l-482 -476 q-15 -15 -36 -16t-37 14t-17.5 34t14.5 35z" />
+<glyph unicode="" d="M649 949q48 68 109.5 104t121.5 38.5t118.5 -20t102.5 -64t71 -100.5t27 -123q0 -57 -33.5 -117.5t-94 -124.5t-126.5 -127.5t-150 -152.5t-146 -174q-62 85 -145.5 174t-150 152.5t-126.5 127.5t-93.5 124.5t-33.5 117.5q0 64 28 123t73 100.5t104 64t119 20 t120.5 -38.5t104.5 -104zM896 972q-33 0 -64.5 -19t-56.5 -46t-47.5 -53.5t-43.5 -45.5t-37.5 -19t-36 19t-40 45.5t-43 53.5t-54 46t-65.5 19q-67 0 -122.5 -55.5t-55.5 -132.5q0 -23 13.5 -51t46 -65t57.5 -63t76 -75l22 -22q15 -14 44 -44t50.5 -51t46 -44t41 -35t23 -12 t23.5 12t42.5 36t46 44t52.5 52t44 43q4 4 12 13q43 41 63.5 62t52 55t46 55t26 46t11.5 44q0 79 -53 133.5t-120 54.5z" />
+<glyph unicode="" d="M776.5 1214q93.5 0 159.5 -66l141 -141q66 -66 66 -160q0 -42 -28 -95.5t-62 -87.5l-29 -29q-31 53 -77 99l-18 18l95 95l-247 248l-389 -389l212 -212l-105 -106l-19 18l-141 141q-66 66 -66 159t66 159l283 283q65 66 158.5 66zM600 706l105 105q10 -8 19 -17l141 -141 q66 -66 66 -159t-66 -159l-283 -283q-66 -66 -159 -66t-159 66l-141 141q-66 66 -66 159.5t66 159.5l55 55q29 -55 75 -102l18 -17l-95 -95l247 -248l389 389z" />
+<glyph unicode="" d="M603 1200q85 0 162 -15t127 -38t79 -48t29 -46v-953q0 -41 -29.5 -70.5t-70.5 -29.5h-600q-41 0 -70.5 29.5t-29.5 70.5v953q0 21 30 46.5t81 48t129 37.5t163 15zM300 1000v-700h600v700h-600zM600 254q-43 0 -73.5 -30.5t-30.5 -73.5t30.5 -73.5t73.5 -30.5t73.5 30.5 t30.5 73.5t-30.5 73.5t-73.5 30.5z" />
+<glyph unicode="" d="M902 1185l283 -282q15 -15 15 -36t-14.5 -35.5t-35.5 -14.5t-35 15l-36 35l-279 -267v-300l-212 210l-308 -307l-280 -203l203 280l307 308l-210 212h300l267 279l-35 36q-15 14 -15 35t14.5 35.5t35.5 14.5t35 -15z" />
+<glyph unicode="" d="M700 1248v-78q38 -5 72.5 -14.5t75.5 -31.5t71 -53.5t52 -84t24 -118.5h-159q-4 36 -10.5 59t-21 45t-40 35.5t-64.5 20.5v-307l64 -13q34 -7 64 -16.5t70 -32t67.5 -52.5t47.5 -80t20 -112q0 -139 -89 -224t-244 -97v-77h-100v79q-150 16 -237 103q-40 40 -52.5 93.5 t-15.5 139.5h139q5 -77 48.5 -126t117.5 -65v335l-27 8q-46 14 -79 26.5t-72 36t-63 52t-40 72.5t-16 98q0 70 25 126t67.5 92t94.5 57t110 27v77h100zM600 754v274q-29 -4 -50 -11t-42 -21.5t-31.5 -41.5t-10.5 -65q0 -29 7 -50.5t16.5 -34t28.5 -22.5t31.5 -14t37.5 -10 q9 -3 13 -4zM700 547v-310q22 2 42.5 6.5t45 15.5t41.5 27t29 42t12 59.5t-12.5 59.5t-38 44.5t-53 31t-66.5 24.5z" />
+<glyph unicode="" d="M561 1197q84 0 160.5 -40t123.5 -109.5t47 -147.5h-153q0 40 -19.5 71.5t-49.5 48.5t-59.5 26t-55.5 9q-37 0 -79 -14.5t-62 -35.5q-41 -44 -41 -101q0 -26 13.5 -63t26.5 -61t37 -66q6 -9 9 -14h241v-100h-197q8 -50 -2.5 -115t-31.5 -95q-45 -62 -99 -112 q34 10 83 17.5t71 7.5q32 1 102 -16t104 -17q83 0 136 30l50 -147q-31 -19 -58 -30.5t-55 -15.5t-42 -4.5t-46 -0.5q-23 0 -76 17t-111 32.5t-96 11.5q-39 -3 -82 -16t-67 -25l-23 -11l-55 145q4 3 16 11t15.5 10.5t13 9t15.5 12t14.5 14t17.5 18.5q48 55 54 126.5 t-30 142.5h-221v100h166q-23 47 -44 104q-7 20 -12 41.5t-6 55.5t6 66.5t29.5 70.5t58.5 71q97 88 263 88z" />
+<glyph unicode="" d="M400 300h150q21 0 25 -11t-10 -25l-230 -250q-14 -15 -35 -15t-35 15l-230 250q-14 14 -10 25t25 11h150v900h200v-900zM935 1184l230 -249q14 -14 10 -24.5t-25 -10.5h-150v-900h-200v900h-150q-21 0 -25 10.5t10 24.5l230 249q14 15 35 15t35 -15z" />
+<glyph unicode="" d="M1000 700h-100v100h-100v-100h-100v500h300v-500zM400 300h150q21 0 25 -11t-10 -25l-230 -250q-14 -15 -35 -15t-35 15l-230 250q-14 14 -10 25t25 11h150v900h200v-900zM801 1100v-200h100v200h-100zM1000 350l-200 -250h200v-100h-300v150l200 250h-200v100h300v-150z " />
+<glyph unicode="" d="M400 300h150q21 0 25 -11t-10 -25l-230 -250q-14 -15 -35 -15t-35 15l-230 250q-14 14 -10 25t25 11h150v900h200v-900zM1000 1050l-200 -250h200v-100h-300v150l200 250h-200v100h300v-150zM1000 0h-100v100h-100v-100h-100v500h300v-500zM801 400v-200h100v200h-100z " />
+<glyph unicode="" d="M400 300h150q21 0 25 -11t-10 -25l-230 -250q-14 -15 -35 -15t-35 15l-230 250q-14 14 -10 25t25 11h150v900h200v-900zM1000 700h-100v400h-100v100h200v-500zM1100 0h-100v100h-200v400h300v-500zM901 400v-200h100v200h-100z" />
+<glyph unicode="" d="M400 300h150q21 0 25 -11t-10 -25l-230 -250q-14 -15 -35 -15t-35 15l-230 250q-14 14 -10 25t25 11h150v900h200v-900zM1100 700h-100v100h-200v400h300v-500zM901 1100v-200h100v200h-100zM1000 0h-100v400h-100v100h200v-500z" />
+<glyph unicode="" d="M400 300h150q21 0 25 -11t-10 -25l-230 -250q-14 -15 -35 -15t-35 15l-230 250q-14 14 -10 25t25 11h150v900h200v-900zM900 1000h-200v200h200v-200zM1000 700h-300v200h300v-200zM1100 400h-400v200h400v-200zM1200 100h-500v200h500v-200z" />
+<glyph unicode="" d="M400 300h150q21 0 25 -11t-10 -25l-230 -250q-14 -15 -35 -15t-35 15l-230 250q-14 14 -10 25t25 11h150v900h200v-900zM1200 1000h-500v200h500v-200zM1100 700h-400v200h400v-200zM1000 400h-300v200h300v-200zM900 100h-200v200h200v-200z" />
+<glyph unicode="" d="M350 1100h400q162 0 256 -93.5t94 -256.5v-400q0 -165 -93.5 -257.5t-256.5 -92.5h-400q-165 0 -257.5 92.5t-92.5 257.5v400q0 165 92.5 257.5t257.5 92.5zM800 900h-500q-41 0 -70.5 -29.5t-29.5 -70.5v-500q0 -41 29.5 -70.5t70.5 -29.5h500q41 0 70.5 29.5t29.5 70.5 v500q0 41 -29.5 70.5t-70.5 29.5z" />
+<glyph unicode="" d="M350 1100h400q165 0 257.5 -92.5t92.5 -257.5v-400q0 -165 -92.5 -257.5t-257.5 -92.5h-400q-163 0 -256.5 92.5t-93.5 257.5v400q0 163 94 256.5t256 93.5zM800 900h-500q-41 0 -70.5 -29.5t-29.5 -70.5v-500q0 -41 29.5 -70.5t70.5 -29.5h500q41 0 70.5 29.5t29.5 70.5 v500q0 41 -29.5 70.5t-70.5 29.5zM440 770l253 -190q17 -12 17 -30t-17 -30l-253 -190q-16 -12 -28 -6.5t-12 26.5v400q0 21 12 26.5t28 -6.5z" />
+<glyph unicode="" d="M350 1100h400q163 0 256.5 -94t93.5 -256v-400q0 -165 -92.5 -257.5t-257.5 -92.5h-400q-165 0 -257.5 92.5t-92.5 257.5v400q0 163 92.5 256.5t257.5 93.5zM800 900h-500q-41 0 -70.5 -29.5t-29.5 -70.5v-500q0 -41 29.5 -70.5t70.5 -29.5h500q41 0 70.5 29.5t29.5 70.5 v500q0 41 -29.5 70.5t-70.5 29.5zM350 700h400q21 0 26.5 -12t-6.5 -28l-190 -253q-12 -17 -30 -17t-30 17l-190 253q-12 16 -6.5 28t26.5 12z" />
+<glyph unicode="" d="M350 1100h400q165 0 257.5 -92.5t92.5 -257.5v-400q0 -163 -92.5 -256.5t-257.5 -93.5h-400q-163 0 -256.5 94t-93.5 256v400q0 165 92.5 257.5t257.5 92.5zM800 900h-500q-41 0 -70.5 -29.5t-29.5 -70.5v-500q0 -41 29.5 -70.5t70.5 -29.5h500q41 0 70.5 29.5t29.5 70.5 v500q0 41 -29.5 70.5t-70.5 29.5zM580 693l190 -253q12 -16 6.5 -28t-26.5 -12h-400q-21 0 -26.5 12t6.5 28l190 253q12 17 30 17t30 -17z" />
+<glyph unicode="" d="M550 1100h400q165 0 257.5 -92.5t92.5 -257.5v-400q0 -165 -92.5 -257.5t-257.5 -92.5h-400q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5h450q41 0 70.5 29.5t29.5 70.5v500q0 41 -29.5 70.5t-70.5 29.5h-450q-21 0 -35.5 14.5t-14.5 35.5v100 q0 21 14.5 35.5t35.5 14.5zM338 867l324 -284q16 -14 16 -33t-16 -33l-324 -284q-16 -14 -27 -9t-11 26v150h-250q-21 0 -35.5 14.5t-14.5 35.5v200q0 21 14.5 35.5t35.5 14.5h250v150q0 21 11 26t27 -9z" />
+<glyph unicode="" d="M793 1182l9 -9q8 -10 5 -27q-3 -11 -79 -225.5t-78 -221.5l300 1q24 0 32.5 -17.5t-5.5 -35.5q-1 0 -133.5 -155t-267 -312.5t-138.5 -162.5q-12 -15 -26 -15h-9l-9 8q-9 11 -4 32q2 9 42 123.5t79 224.5l39 110h-302q-23 0 -31 19q-10 21 6 41q75 86 209.5 237.5 t228 257t98.5 111.5q9 16 25 16h9z" />
+<glyph unicode="" d="M350 1100h400q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-450q-41 0 -70.5 -29.5t-29.5 -70.5v-500q0 -41 29.5 -70.5t70.5 -29.5h450q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-400q-165 0 -257.5 92.5t-92.5 257.5v400 q0 165 92.5 257.5t257.5 92.5zM938 867l324 -284q16 -14 16 -33t-16 -33l-324 -284q-16 -14 -27 -9t-11 26v150h-250q-21 0 -35.5 14.5t-14.5 35.5v200q0 21 14.5 35.5t35.5 14.5h250v150q0 21 11 26t27 -9z" />
+<glyph unicode="" d="M750 1200h400q21 0 35.5 -14.5t14.5 -35.5v-400q0 -21 -10.5 -25t-24.5 10l-109 109l-312 -312q-15 -15 -35.5 -15t-35.5 15l-141 141q-15 15 -15 35.5t15 35.5l312 312l-109 109q-14 14 -10 24.5t25 10.5zM456 900h-156q-41 0 -70.5 -29.5t-29.5 -70.5v-500 q0 -41 29.5 -70.5t70.5 -29.5h500q41 0 70.5 29.5t29.5 70.5v148l200 200v-298q0 -165 -93.5 -257.5t-256.5 -92.5h-400q-165 0 -257.5 92.5t-92.5 257.5v400q0 165 92.5 257.5t257.5 92.5h300z" />
+<glyph unicode="" d="M600 1186q119 0 227.5 -46.5t187 -125t125 -187t46.5 -227.5t-46.5 -227.5t-125 -187t-187 -125t-227.5 -46.5t-227.5 46.5t-187 125t-125 187t-46.5 227.5t46.5 227.5t125 187t187 125t227.5 46.5zM600 1022q-115 0 -212 -56.5t-153.5 -153.5t-56.5 -212t56.5 -212 t153.5 -153.5t212 -56.5t212 56.5t153.5 153.5t56.5 212t-56.5 212t-153.5 153.5t-212 56.5zM600 794q80 0 137 -57t57 -137t-57 -137t-137 -57t-137 57t-57 137t57 137t137 57z" />
+<glyph unicode="" d="M450 1200h200q21 0 35.5 -14.5t14.5 -35.5v-350h245q20 0 25 -11t-9 -26l-383 -426q-14 -15 -33.5 -15t-32.5 15l-379 426q-13 15 -8.5 26t25.5 11h250v350q0 21 14.5 35.5t35.5 14.5zM50 300h1000q21 0 35.5 -14.5t14.5 -35.5v-250h-1100v250q0 21 14.5 35.5t35.5 14.5z M900 200v-50h100v50h-100z" />
+<glyph unicode="" d="M583 1182l378 -435q14 -15 9 -31t-26 -16h-244v-250q0 -20 -17 -35t-39 -15h-200q-20 0 -32 14.5t-12 35.5v250h-250q-20 0 -25.5 16.5t8.5 31.5l383 431q14 16 33.5 17t33.5 -14zM50 300h1000q21 0 35.5 -14.5t14.5 -35.5v-250h-1100v250q0 21 14.5 35.5t35.5 14.5z M900 200v-50h100v50h-100z" />
+<glyph unicode="" d="M396 723l369 369q7 7 17.5 7t17.5 -7l139 -139q7 -8 7 -18.5t-7 -17.5l-525 -525q-7 -8 -17.5 -8t-17.5 8l-292 291q-7 8 -7 18t7 18l139 139q8 7 18.5 7t17.5 -7zM50 300h1000q21 0 35.5 -14.5t14.5 -35.5v-250h-1100v250q0 21 14.5 35.5t35.5 14.5zM900 200v-50h100v50 h-100z" />
+<glyph unicode="" d="M135 1023l142 142q14 14 35 14t35 -14l77 -77l-212 -212l-77 76q-14 15 -14 36t14 35zM655 855l210 210q14 14 24.5 10t10.5 -25l-2 -599q-1 -20 -15.5 -35t-35.5 -15l-597 -1q-21 0 -25 10.5t10 24.5l208 208l-154 155l212 212zM50 300h1000q21 0 35.5 -14.5t14.5 -35.5 v-250h-1100v250q0 21 14.5 35.5t35.5 14.5zM900 200v-50h100v50h-100z" />
+<glyph unicode="" d="M350 1200l599 -2q20 -1 35 -15.5t15 -35.5l1 -597q0 -21 -10.5 -25t-24.5 10l-208 208l-155 -154l-212 212l155 154l-210 210q-14 14 -10 24.5t25 10.5zM524 512l-76 -77q-15 -14 -36 -14t-35 14l-142 142q-14 14 -14 35t14 35l77 77zM50 300h1000q21 0 35.5 -14.5 t14.5 -35.5v-250h-1100v250q0 21 14.5 35.5t35.5 14.5zM900 200v-50h100v50h-100z" />
+<glyph unicode="" d="M1200 103l-483 276l-314 -399v423h-399l1196 796v-1096zM483 424v-230l683 953z" />
+<glyph unicode="" d="M1100 1000v-850q0 -21 -14.5 -35.5t-35.5 -14.5h-150v400h-700v-400h-150q-21 0 -35.5 14.5t-14.5 35.5v1000q0 20 14.5 35t35.5 15h250v-300h500v300h100zM700 1000h-100v200h100v-200z" />
+<glyph unicode="" d="M1100 1000l-2 -149l-299 -299l-95 95q-9 9 -21.5 9t-21.5 -9l-149 -147h-312v-400h-150q-21 0 -35.5 14.5t-14.5 35.5v1000q0 20 14.5 35t35.5 15h250v-300h500v300h100zM700 1000h-100v200h100v-200zM1132 638l106 -106q7 -7 7 -17.5t-7 -17.5l-420 -421q-8 -7 -18 -7 t-18 7l-202 203q-8 7 -8 17.5t8 17.5l106 106q7 8 17.5 8t17.5 -8l79 -79l297 297q7 7 17.5 7t17.5 -7z" />
+<glyph unicode="" d="M1100 1000v-269l-103 -103l-134 134q-15 15 -33.5 16.5t-34.5 -12.5l-266 -266h-329v-400h-150q-21 0 -35.5 14.5t-14.5 35.5v1000q0 20 14.5 35t35.5 15h250v-300h500v300h100zM700 1000h-100v200h100v-200zM1202 572l70 -70q15 -15 15 -35.5t-15 -35.5l-131 -131 l131 -131q15 -15 15 -35.5t-15 -35.5l-70 -70q-15 -15 -35.5 -15t-35.5 15l-131 131l-131 -131q-15 -15 -35.5 -15t-35.5 15l-70 70q-15 15 -15 35.5t15 35.5l131 131l-131 131q-15 15 -15 35.5t15 35.5l70 70q15 15 35.5 15t35.5 -15l131 -131l131 131q15 15 35.5 15 t35.5 -15z" />
+<glyph unicode="" d="M1100 1000v-300h-350q-21 0 -35.5 -14.5t-14.5 -35.5v-150h-500v-400h-150q-21 0 -35.5 14.5t-14.5 35.5v1000q0 20 14.5 35t35.5 15h250v-300h500v300h100zM700 1000h-100v200h100v-200zM850 600h100q21 0 35.5 -14.5t14.5 -35.5v-250h150q21 0 25 -10.5t-10 -24.5 l-230 -230q-14 -14 -35 -14t-35 14l-230 230q-14 14 -10 24.5t25 10.5h150v250q0 21 14.5 35.5t35.5 14.5z" />
+<glyph unicode="" d="M1100 1000v-400l-165 165q-14 15 -35 15t-35 -15l-263 -265h-402v-400h-150q-21 0 -35.5 14.5t-14.5 35.5v1000q0 20 14.5 35t35.5 15h250v-300h500v300h100zM700 1000h-100v200h100v-200zM935 565l230 -229q14 -15 10 -25.5t-25 -10.5h-150v-250q0 -20 -14.5 -35 t-35.5 -15h-100q-21 0 -35.5 15t-14.5 35v250h-150q-21 0 -25 10.5t10 25.5l230 229q14 15 35 15t35 -15z" />
+<glyph unicode="" d="M50 1100h1100q21 0 35.5 -14.5t14.5 -35.5v-150h-1200v150q0 21 14.5 35.5t35.5 14.5zM1200 800v-550q0 -21 -14.5 -35.5t-35.5 -14.5h-1100q-21 0 -35.5 14.5t-14.5 35.5v550h1200zM100 500v-200h400v200h-400z" />
+<glyph unicode="" d="M935 1165l248 -230q14 -14 14 -35t-14 -35l-248 -230q-14 -14 -24.5 -10t-10.5 25v150h-400v200h400v150q0 21 10.5 25t24.5 -10zM200 800h-50q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5h50v-200zM400 800h-100v200h100v-200zM18 435l247 230 q14 14 24.5 10t10.5 -25v-150h400v-200h-400v-150q0 -21 -10.5 -25t-24.5 10l-247 230q-15 14 -15 35t15 35zM900 300h-100v200h100v-200zM1000 500h51q20 0 34.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-34.5 -14.5h-51v200z" />
+<glyph unicode="" d="M862 1073l276 116q25 18 43.5 8t18.5 -41v-1106q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5v397q-4 1 -11 5t-24 17.5t-30 29t-24 42t-11 56.5v359q0 31 18.5 65t43.5 52zM550 1200q22 0 34.5 -12.5t14.5 -24.5l1 -13v-450q0 -28 -10.5 -59.5 t-25 -56t-29 -45t-25.5 -31.5l-10 -11v-447q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5v447q-4 4 -11 11.5t-24 30.5t-30 46t-24 55t-11 60v450q0 2 0.5 5.5t4 12t8.5 15t14.5 12t22.5 5.5q20 0 32.5 -12.5t14.5 -24.5l3 -13v-350h100v350v5.5t2.5 12 t7 15t15 12t25.5 5.5q23 0 35.5 -12.5t13.5 -24.5l1 -13v-350h100v350q0 2 0.5 5.5t3 12t7 15t15 12t24.5 5.5z" />
+<glyph unicode="" d="M1200 1100v-56q-4 0 -11 -0.5t-24 -3t-30 -7.5t-24 -15t-11 -24v-888q0 -22 25 -34.5t50 -13.5l25 -2v-56h-400v56q75 0 87.5 6.5t12.5 43.5v394h-500v-394q0 -37 12.5 -43.5t87.5 -6.5v-56h-400v56q4 0 11 0.5t24 3t30 7.5t24 15t11 24v888q0 22 -25 34.5t-50 13.5 l-25 2v56h400v-56q-75 0 -87.5 -6.5t-12.5 -43.5v-394h500v394q0 37 -12.5 43.5t-87.5 6.5v56h400z" />
+<glyph unicode="" d="M675 1000h375q21 0 35.5 -14.5t14.5 -35.5v-150h-105l-295 -98v98l-200 200h-400l100 100h375zM100 900h300q41 0 70.5 -29.5t29.5 -70.5v-500q0 -41 -29.5 -70.5t-70.5 -29.5h-300q-41 0 -70.5 29.5t-29.5 70.5v500q0 41 29.5 70.5t70.5 29.5zM100 800v-200h300v200 h-300zM1100 535l-400 -133v163l400 133v-163zM100 500v-200h300v200h-300zM1100 398v-248q0 -21 -14.5 -35.5t-35.5 -14.5h-375l-100 -100h-375l-100 100h400l200 200h105z" />
+<glyph unicode="" d="M17 1007l162 162q17 17 40 14t37 -22l139 -194q14 -20 11 -44.5t-20 -41.5l-119 -118q102 -142 228 -268t267 -227l119 118q17 17 42.5 19t44.5 -12l192 -136q19 -14 22.5 -37.5t-13.5 -40.5l-163 -162q-3 -1 -9.5 -1t-29.5 2t-47.5 6t-62.5 14.5t-77.5 26.5t-90 42.5 t-101.5 60t-111 83t-119 108.5q-74 74 -133.5 150.5t-94.5 138.5t-60 119.5t-34.5 100t-15 74.5t-4.5 48z" />
+<glyph unicode="" d="M600 1100q92 0 175 -10.5t141.5 -27t108.5 -36.5t81.5 -40t53.5 -37t31 -27l9 -10v-200q0 -21 -14.5 -33t-34.5 -9l-202 34q-20 3 -34.5 20t-14.5 38v146q-141 24 -300 24t-300 -24v-146q0 -21 -14.5 -38t-34.5 -20l-202 -34q-20 -3 -34.5 9t-14.5 33v200q3 4 9.5 10.5 t31 26t54 37.5t80.5 39.5t109 37.5t141 26.5t175 10.5zM600 795q56 0 97 -9.5t60 -23.5t30 -28t12 -24l1 -10v-50l365 -303q14 -15 24.5 -40t10.5 -45v-212q0 -21 -14.5 -35.5t-35.5 -14.5h-1100q-21 0 -35.5 14.5t-14.5 35.5v212q0 20 10.5 45t24.5 40l365 303v50 q0 4 1 10.5t12 23t30 29t60 22.5t97 10z" />
+<glyph unicode="" d="M1100 700l-200 -200h-600l-200 200v500h200v-200h200v200h200v-200h200v200h200v-500zM250 400h700q21 0 35.5 -14.5t14.5 -35.5t-14.5 -35.5t-35.5 -14.5h-12l137 -100h-950l137 100h-12q-21 0 -35.5 14.5t-14.5 35.5t14.5 35.5t35.5 14.5zM50 100h1100q21 0 35.5 -14.5 t14.5 -35.5v-50h-1200v50q0 21 14.5 35.5t35.5 14.5z" />
+<glyph unicode="" d="M700 1100h-100q-41 0 -70.5 -29.5t-29.5 -70.5v-1000h300v1000q0 41 -29.5 70.5t-70.5 29.5zM1100 800h-100q-41 0 -70.5 -29.5t-29.5 -70.5v-700h300v700q0 41 -29.5 70.5t-70.5 29.5zM400 0h-300v400q0 41 29.5 70.5t70.5 29.5h100q41 0 70.5 -29.5t29.5 -70.5v-400z " />
+<glyph unicode="" d="M200 1100h700q124 0 212 -88t88 -212v-500q0 -124 -88 -212t-212 -88h-700q-124 0 -212 88t-88 212v500q0 124 88 212t212 88zM100 900v-700h900v700h-900zM500 700h-200v-100h200v-300h-300v100h200v100h-200v300h300v-100zM900 700v-300l-100 -100h-200v500h200z M700 700v-300h100v300h-100z" />
+<glyph unicode="" d="M200 1100h700q124 0 212 -88t88 -212v-500q0 -124 -88 -212t-212 -88h-700q-124 0 -212 88t-88 212v500q0 124 88 212t212 88zM100 900v-700h900v700h-900zM500 300h-100v200h-100v-200h-100v500h100v-200h100v200h100v-500zM900 700v-300l-100 -100h-200v500h200z M700 700v-300h100v300h-100z" />
+<glyph unicode="" d="M200 1100h700q124 0 212 -88t88 -212v-500q0 -124 -88 -212t-212 -88h-700q-124 0 -212 88t-88 212v500q0 124 88 212t212 88zM100 900v-700h900v700h-900zM500 700h-200v-300h200v-100h-300v500h300v-100zM900 700h-200v-300h200v-100h-300v500h300v-100z" />
+<glyph unicode="" d="M200 1100h700q124 0 212 -88t88 -212v-500q0 -124 -88 -212t-212 -88h-700q-124 0 -212 88t-88 212v500q0 124 88 212t212 88zM100 900v-700h900v700h-900zM500 400l-300 150l300 150v-300zM900 550l-300 -150v300z" />
+<glyph unicode="" d="M200 1100h700q124 0 212 -88t88 -212v-500q0 -124 -88 -212t-212 -88h-700q-124 0 -212 88t-88 212v500q0 124 88 212t212 88zM100 900v-700h900v700h-900zM900 300h-700v500h700v-500zM800 700h-130q-38 0 -66.5 -43t-28.5 -108t27 -107t68 -42h130v300zM300 700v-300 h130q41 0 68 42t27 107t-28.5 108t-66.5 43h-130z" />
+<glyph unicode="" d="M200 1100h700q124 0 212 -88t88 -212v-500q0 -124 -88 -212t-212 -88h-700q-124 0 -212 88t-88 212v500q0 124 88 212t212 88zM100 900v-700h900v700h-900zM500 700h-200v-100h200v-300h-300v100h200v100h-200v300h300v-100zM900 300h-100v400h-100v100h200v-500z M700 300h-100v100h100v-100z" />
+<glyph unicode="" d="M200 1100h700q124 0 212 -88t88 -212v-500q0 -124 -88 -212t-212 -88h-700q-124 0 -212 88t-88 212v500q0 124 88 212t212 88zM100 900v-700h900v700h-900zM300 700h200v-400h-300v500h100v-100zM900 300h-100v400h-100v100h200v-500zM300 600v-200h100v200h-100z M700 300h-100v100h100v-100z" />
+<glyph unicode="" d="M200 1100h700q124 0 212 -88t88 -212v-500q0 -124 -88 -212t-212 -88h-700q-124 0 -212 88t-88 212v500q0 124 88 212t212 88zM100 900v-700h900v700h-900zM500 500l-199 -200h-100v50l199 200v150h-200v100h300v-300zM900 300h-100v400h-100v100h200v-500zM701 300h-100 v100h100v-100z" />
+<glyph unicode="" d="M600 1191q120 0 229.5 -47t188.5 -126t126 -188.5t47 -229.5t-47 -229.5t-126 -188.5t-188.5 -126t-229.5 -47t-229.5 47t-188.5 126t-126 188.5t-47 229.5t47 229.5t126 188.5t188.5 126t229.5 47zM600 1021q-114 0 -211 -56.5t-153.5 -153.5t-56.5 -211t56.5 -211 t153.5 -153.5t211 -56.5t211 56.5t153.5 153.5t56.5 211t-56.5 211t-153.5 153.5t-211 56.5zM800 700h-300v-200h300v-100h-300l-100 100v200l100 100h300v-100z" />
+<glyph unicode="" d="M600 1191q120 0 229.5 -47t188.5 -126t126 -188.5t47 -229.5t-47 -229.5t-126 -188.5t-188.5 -126t-229.5 -47t-229.5 47t-188.5 126t-126 188.5t-47 229.5t47 229.5t126 188.5t188.5 126t229.5 47zM600 1021q-114 0 -211 -56.5t-153.5 -153.5t-56.5 -211t56.5 -211 t153.5 -153.5t211 -56.5t211 56.5t153.5 153.5t56.5 211t-56.5 211t-153.5 153.5t-211 56.5zM800 700v-100l-50 -50l100 -100v-50h-100l-100 100h-150v-100h-100v400h300zM500 700v-100h200v100h-200z" />
+<glyph unicode="" d="M503 1089q110 0 200.5 -59.5t134.5 -156.5q44 14 90 14q120 0 205 -86.5t85 -207t-85 -207t-205 -86.5h-128v250q0 21 -14.5 35.5t-35.5 14.5h-300q-21 0 -35.5 -14.5t-14.5 -35.5v-250h-222q-80 0 -136 57.5t-56 136.5q0 69 43 122.5t108 67.5q-2 19 -2 37q0 100 49 185 t134 134t185 49zM525 500h150q10 0 17.5 -7.5t7.5 -17.5v-275h137q21 0 26 -11.5t-8 -27.5l-223 -244q-13 -16 -32 -16t-32 16l-223 244q-13 16 -8 27.5t26 11.5h137v275q0 10 7.5 17.5t17.5 7.5z" />
+<glyph unicode="" d="M502 1089q110 0 201 -59.5t135 -156.5q43 15 89 15q121 0 206 -86.5t86 -206.5q0 -99 -60 -181t-150 -110l-378 360q-13 16 -31.5 16t-31.5 -16l-381 -365h-9q-79 0 -135.5 57.5t-56.5 136.5q0 69 43 122.5t108 67.5q-2 19 -2 38q0 100 49 184.5t133.5 134t184.5 49.5z M632 467l223 -228q13 -16 8 -27.5t-26 -11.5h-137v-275q0 -10 -7.5 -17.5t-17.5 -7.5h-150q-10 0 -17.5 7.5t-7.5 17.5v275h-137q-21 0 -26 11.5t8 27.5q199 204 223 228q19 19 31.5 19t32.5 -19z" />
+<glyph unicode="" d="M700 100v100h400l-270 300h170l-270 300h170l-300 333l-300 -333h170l-270 -300h170l-270 -300h400v-100h-50q-21 0 -35.5 -14.5t-14.5 -35.5v-50h400v50q0 21 -14.5 35.5t-35.5 14.5h-50z" />
+<glyph unicode="" d="M600 1179q94 0 167.5 -56.5t99.5 -145.5q89 -6 150.5 -71.5t61.5 -155.5q0 -61 -29.5 -112.5t-79.5 -82.5q9 -29 9 -55q0 -74 -52.5 -126.5t-126.5 -52.5q-55 0 -100 30v-251q21 0 35.5 -14.5t14.5 -35.5v-50h-300v50q0 21 14.5 35.5t35.5 14.5v251q-45 -30 -100 -30 q-74 0 -126.5 52.5t-52.5 126.5q0 18 4 38q-47 21 -75.5 65t-28.5 97q0 74 52.5 126.5t126.5 52.5q5 0 23 -2q0 2 -1 10t-1 13q0 116 81.5 197.5t197.5 81.5z" />
+<glyph unicode="" d="M1010 1010q111 -111 150.5 -260.5t0 -299t-150.5 -260.5q-83 -83 -191.5 -126.5t-218.5 -43.5t-218.5 43.5t-191.5 126.5q-111 111 -150.5 260.5t0 299t150.5 260.5q83 83 191.5 126.5t218.5 43.5t218.5 -43.5t191.5 -126.5zM476 1065q-4 0 -8 -1q-121 -34 -209.5 -122.5 t-122.5 -209.5q-4 -12 2.5 -23t18.5 -14l36 -9q3 -1 7 -1q23 0 29 22q27 96 98 166q70 71 166 98q11 3 17.5 13.5t3.5 22.5l-9 35q-3 13 -14 19q-7 4 -15 4zM512 920q-4 0 -9 -2q-80 -24 -138.5 -82.5t-82.5 -138.5q-4 -13 2 -24t19 -14l34 -9q4 -1 8 -1q22 0 28 21 q18 58 58.5 98.5t97.5 58.5q12 3 18 13.5t3 21.5l-9 35q-3 12 -14 19q-7 4 -15 4zM719.5 719.5q-49.5 49.5 -119.5 49.5t-119.5 -49.5t-49.5 -119.5t49.5 -119.5t119.5 -49.5t119.5 49.5t49.5 119.5t-49.5 119.5zM855 551q-22 0 -28 -21q-18 -58 -58.5 -98.5t-98.5 -57.5 q-11 -4 -17 -14.5t-3 -21.5l9 -35q3 -12 14 -19q7 -4 15 -4q4 0 9 2q80 24 138.5 82.5t82.5 138.5q4 13 -2.5 24t-18.5 14l-34 9q-4 1 -8 1zM1000 515q-23 0 -29 -22q-27 -96 -98 -166q-70 -71 -166 -98q-11 -3 -17.5 -13.5t-3.5 -22.5l9 -35q3 -13 14 -19q7 -4 15 -4 q4 0 8 1q121 34 209.5 122.5t122.5 209.5q4 12 -2.5 23t-18.5 14l-36 9q-3 1 -7 1z" />
+<glyph unicode="" d="M700 800h300v-380h-180v200h-340v-200h-380v755q0 10 7.5 17.5t17.5 7.5h575v-400zM1000 900h-200v200zM700 300h162l-212 -212l-212 212h162v200h100v-200zM520 0h-395q-10 0 -17.5 7.5t-7.5 17.5v395zM1000 220v-195q0 -10 -7.5 -17.5t-17.5 -7.5h-195z" />
+<glyph unicode="" d="M700 800h300v-520l-350 350l-550 -550v1095q0 10 7.5 17.5t17.5 7.5h575v-400zM1000 900h-200v200zM862 200h-162v-200h-100v200h-162l212 212zM480 0h-355q-10 0 -17.5 7.5t-7.5 17.5v55h380v-80zM1000 80v-55q0 -10 -7.5 -17.5t-17.5 -7.5h-155v80h180z" />
+<glyph unicode="" d="M1162 800h-162v-200h100l100 -100h-300v300h-162l212 212zM200 800h200q27 0 40 -2t29.5 -10.5t23.5 -30t7 -57.5h300v-100h-600l-200 -350v450h100q0 36 7 57.5t23.5 30t29.5 10.5t40 2zM800 400h240l-240 -400h-800l300 500h500v-100z" />
+<glyph unicode="" d="M650 1100h100q21 0 35.5 -14.5t14.5 -35.5v-50h50q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-300q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5h50v50q0 21 14.5 35.5t35.5 14.5zM1000 850v150q41 0 70.5 -29.5t29.5 -70.5v-800 q0 -41 -29.5 -70.5t-70.5 -29.5h-600q-1 0 -20 4l246 246l-326 326v324q0 41 29.5 70.5t70.5 29.5v-150q0 -62 44 -106t106 -44h300q62 0 106 44t44 106zM412 250l-212 -212v162h-200v100h200v162z" />
+<glyph unicode="" d="M450 1100h100q21 0 35.5 -14.5t14.5 -35.5v-50h50q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-300q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5h50v50q0 21 14.5 35.5t35.5 14.5zM800 850v150q41 0 70.5 -29.5t29.5 -70.5v-500 h-200v-300h200q0 -36 -7 -57.5t-23.5 -30t-29.5 -10.5t-40 -2h-600q-41 0 -70.5 29.5t-29.5 70.5v800q0 41 29.5 70.5t70.5 29.5v-150q0 -62 44 -106t106 -44h300q62 0 106 44t44 106zM1212 250l-212 -212v162h-200v100h200v162z" />
+<glyph unicode="" d="M658 1197l637 -1104q23 -38 7 -65.5t-60 -27.5h-1276q-44 0 -60 27.5t7 65.5l637 1104q22 39 54 39t54 -39zM704 800h-208q-20 0 -32 -14.5t-8 -34.5l58 -302q4 -20 21.5 -34.5t37.5 -14.5h54q20 0 37.5 14.5t21.5 34.5l58 302q4 20 -8 34.5t-32 14.5zM500 300v-100h200 v100h-200z" />
+<glyph unicode="" d="M425 1100h250q10 0 17.5 -7.5t7.5 -17.5v-150q0 -10 -7.5 -17.5t-17.5 -7.5h-250q-10 0 -17.5 7.5t-7.5 17.5v150q0 10 7.5 17.5t17.5 7.5zM425 800h250q10 0 17.5 -7.5t7.5 -17.5v-150q0 -10 -7.5 -17.5t-17.5 -7.5h-250q-10 0 -17.5 7.5t-7.5 17.5v150q0 10 7.5 17.5 t17.5 7.5zM825 800h250q10 0 17.5 -7.5t7.5 -17.5v-150q0 -10 -7.5 -17.5t-17.5 -7.5h-250q-10 0 -17.5 7.5t-7.5 17.5v150q0 10 7.5 17.5t17.5 7.5zM25 500h250q10 0 17.5 -7.5t7.5 -17.5v-150q0 -10 -7.5 -17.5t-17.5 -7.5h-250q-10 0 -17.5 7.5t-7.5 17.5v150 q0 10 7.5 17.5t17.5 7.5zM425 500h250q10 0 17.5 -7.5t7.5 -17.5v-150q0 -10 -7.5 -17.5t-17.5 -7.5h-250q-10 0 -17.5 7.5t-7.5 17.5v150q0 10 7.5 17.5t17.5 7.5zM825 500h250q10 0 17.5 -7.5t7.5 -17.5v-150q0 -10 -7.5 -17.5t-17.5 -7.5h-250q-10 0 -17.5 7.5t-7.5 17.5 v150q0 10 7.5 17.5t17.5 7.5zM25 200h250q10 0 17.5 -7.5t7.5 -17.5v-150q0 -10 -7.5 -17.5t-17.5 -7.5h-250q-10 0 -17.5 7.5t-7.5 17.5v150q0 10 7.5 17.5t17.5 7.5zM425 200h250q10 0 17.5 -7.5t7.5 -17.5v-150q0 -10 -7.5 -17.5t-17.5 -7.5h-250q-10 0 -17.5 7.5 t-7.5 17.5v150q0 10 7.5 17.5t17.5 7.5zM825 200h250q10 0 17.5 -7.5t7.5 -17.5v-150q0 -10 -7.5 -17.5t-17.5 -7.5h-250q-10 0 -17.5 7.5t-7.5 17.5v150q0 10 7.5 17.5t17.5 7.5z" />
+<glyph unicode="" d="M700 1200h100v-200h-100v-100h350q62 0 86.5 -39.5t-3.5 -94.5l-66 -132q-41 -83 -81 -134h-772q-40 51 -81 134l-66 132q-28 55 -3.5 94.5t86.5 39.5h350v100h-100v200h100v100h200v-100zM250 400h700q21 0 35.5 -14.5t14.5 -35.5t-14.5 -35.5t-35.5 -14.5h-12l137 -100 h-950l138 100h-13q-21 0 -35.5 14.5t-14.5 35.5t14.5 35.5t35.5 14.5zM50 100h1100q21 0 35.5 -14.5t14.5 -35.5v-50h-1200v50q0 21 14.5 35.5t35.5 14.5z" />
+<glyph unicode="" d="M600 1300q40 0 68.5 -29.5t28.5 -70.5h-194q0 41 28.5 70.5t68.5 29.5zM443 1100h314q18 -37 18 -75q0 -8 -3 -25h328q41 0 44.5 -16.5t-30.5 -38.5l-175 -145h-678l-178 145q-34 22 -29 38.5t46 16.5h328q-3 17 -3 25q0 38 18 75zM250 700h700q21 0 35.5 -14.5 t14.5 -35.5t-14.5 -35.5t-35.5 -14.5h-150v-200l275 -200h-950l275 200v200h-150q-21 0 -35.5 14.5t-14.5 35.5t14.5 35.5t35.5 14.5zM50 100h1100q21 0 35.5 -14.5t14.5 -35.5v-50h-1200v50q0 21 14.5 35.5t35.5 14.5z" />
+<glyph unicode="" d="M600 1181q75 0 128 -53t53 -128t-53 -128t-128 -53t-128 53t-53 128t53 128t128 53zM602 798h46q34 0 55.5 -28.5t21.5 -86.5q0 -76 39 -183h-324q39 107 39 183q0 58 21.5 86.5t56.5 28.5h45zM250 400h700q21 0 35.5 -14.5t14.5 -35.5t-14.5 -35.5t-35.5 -14.5h-13 l138 -100h-950l137 100h-12q-21 0 -35.5 14.5t-14.5 35.5t14.5 35.5t35.5 14.5zM50 100h1100q21 0 35.5 -14.5t14.5 -35.5v-50h-1200v50q0 21 14.5 35.5t35.5 14.5z" />
+<glyph unicode="" d="M600 1300q47 0 92.5 -53.5t71 -123t25.5 -123.5q0 -78 -55.5 -133.5t-133.5 -55.5t-133.5 55.5t-55.5 133.5q0 62 34 143l144 -143l111 111l-163 163q34 26 63 26zM602 798h46q34 0 55.5 -28.5t21.5 -86.5q0 -76 39 -183h-324q39 107 39 183q0 58 21.5 86.5t56.5 28.5h45 zM250 400h700q21 0 35.5 -14.5t14.5 -35.5t-14.5 -35.5t-35.5 -14.5h-13l138 -100h-950l137 100h-12q-21 0 -35.5 14.5t-14.5 35.5t14.5 35.5t35.5 14.5zM50 100h1100q21 0 35.5 -14.5t14.5 -35.5v-50h-1200v50q0 21 14.5 35.5t35.5 14.5z" />
+<glyph unicode="" d="M600 1200l300 -161v-139h-300q0 -57 18.5 -108t50 -91.5t63 -72t70 -67.5t57.5 -61h-530q-60 83 -90.5 177.5t-30.5 178.5t33 164.5t87.5 139.5t126 96.5t145.5 41.5v-98zM250 400h700q21 0 35.5 -14.5t14.5 -35.5t-14.5 -35.5t-35.5 -14.5h-13l138 -100h-950l137 100 h-12q-21 0 -35.5 14.5t-14.5 35.5t14.5 35.5t35.5 14.5zM50 100h1100q21 0 35.5 -14.5t14.5 -35.5v-50h-1200v50q0 21 14.5 35.5t35.5 14.5z" />
+<glyph unicode="" d="M600 1300q41 0 70.5 -29.5t29.5 -70.5v-78q46 -26 73 -72t27 -100v-50h-400v50q0 54 27 100t73 72v78q0 41 29.5 70.5t70.5 29.5zM400 800h400q54 0 100 -27t72 -73h-172v-100h200v-100h-200v-100h200v-100h-200v-100h200q0 -83 -58.5 -141.5t-141.5 -58.5h-400 q-83 0 -141.5 58.5t-58.5 141.5v400q0 83 58.5 141.5t141.5 58.5z" />
+<glyph unicode="" d="M150 1100h900q21 0 35.5 -14.5t14.5 -35.5v-500q0 -21 -14.5 -35.5t-35.5 -14.5h-900q-21 0 -35.5 14.5t-14.5 35.5v500q0 21 14.5 35.5t35.5 14.5zM125 400h950q10 0 17.5 -7.5t7.5 -17.5v-50q0 -10 -7.5 -17.5t-17.5 -7.5h-283l224 -224q13 -13 13 -31.5t-13 -32 t-31.5 -13.5t-31.5 13l-88 88h-524l-87 -88q-13 -13 -32 -13t-32 13.5t-13 32t13 31.5l224 224h-289q-10 0 -17.5 7.5t-7.5 17.5v50q0 10 7.5 17.5t17.5 7.5zM541 300l-100 -100h324l-100 100h-124z" />
+<glyph unicode="" d="M200 1100h800q83 0 141.5 -58.5t58.5 -141.5v-200h-100q0 41 -29.5 70.5t-70.5 29.5h-250q-41 0 -70.5 -29.5t-29.5 -70.5h-100q0 41 -29.5 70.5t-70.5 29.5h-250q-41 0 -70.5 -29.5t-29.5 -70.5h-100v200q0 83 58.5 141.5t141.5 58.5zM100 600h1000q41 0 70.5 -29.5 t29.5 -70.5v-300h-1200v300q0 41 29.5 70.5t70.5 29.5zM300 100v-50q0 -21 -14.5 -35.5t-35.5 -14.5h-100q-21 0 -35.5 14.5t-14.5 35.5v50h200zM1100 100v-50q0 -21 -14.5 -35.5t-35.5 -14.5h-100q-21 0 -35.5 14.5t-14.5 35.5v50h200z" />
+<glyph unicode="" d="M480 1165l682 -683q31 -31 31 -75.5t-31 -75.5l-131 -131h-481l-517 518q-32 31 -32 75.5t32 75.5l295 296q31 31 75.5 31t76.5 -31zM108 794l342 -342l303 304l-341 341zM250 100h800q21 0 35.5 -14.5t14.5 -35.5v-50h-900v50q0 21 14.5 35.5t35.5 14.5z" />
+<glyph unicode="" d="M1057 647l-189 506q-8 19 -27.5 33t-40.5 14h-400q-21 0 -40.5 -14t-27.5 -33l-189 -506q-8 -19 1.5 -33t30.5 -14h625v-150q0 -21 14.5 -35.5t35.5 -14.5t35.5 14.5t14.5 35.5v150h125q21 0 30.5 14t1.5 33zM897 0h-595v50q0 21 14.5 35.5t35.5 14.5h50v50 q0 21 14.5 35.5t35.5 14.5h48v300h200v-300h47q21 0 35.5 -14.5t14.5 -35.5v-50h50q21 0 35.5 -14.5t14.5 -35.5v-50z" />
+<glyph unicode="" d="M900 800h300v-575q0 -10 -7.5 -17.5t-17.5 -7.5h-375v591l-300 300v84q0 10 7.5 17.5t17.5 7.5h375v-400zM1200 900h-200v200zM400 600h300v-575q0 -10 -7.5 -17.5t-17.5 -7.5h-650q-10 0 -17.5 7.5t-7.5 17.5v950q0 10 7.5 17.5t17.5 7.5h375v-400zM700 700h-200v200z " />
+<glyph unicode="" d="M484 1095h195q75 0 146 -32.5t124 -86t89.5 -122.5t48.5 -142q18 -14 35 -20q31 -10 64.5 6.5t43.5 48.5q10 34 -15 71q-19 27 -9 43q5 8 12.5 11t19 -1t23.5 -16q41 -44 39 -105q-3 -63 -46 -106.5t-104 -43.5h-62q-7 -55 -35 -117t-56 -100l-39 -234q-3 -20 -20 -34.5 t-38 -14.5h-100q-21 0 -33 14.5t-9 34.5l12 70q-49 -14 -91 -14h-195q-24 0 -65 8l-11 -64q-3 -20 -20 -34.5t-38 -14.5h-100q-21 0 -33 14.5t-9 34.5l26 157q-84 74 -128 175l-159 53q-19 7 -33 26t-14 40v50q0 21 14.5 35.5t35.5 14.5h124q11 87 56 166l-111 95 q-16 14 -12.5 23.5t24.5 9.5h203q116 101 250 101zM675 1000h-250q-10 0 -17.5 -7.5t-7.5 -17.5v-50q0 -10 7.5 -17.5t17.5 -7.5h250q10 0 17.5 7.5t7.5 17.5v50q0 10 -7.5 17.5t-17.5 7.5z" />
+<glyph unicode="" d="M641 900l423 247q19 8 42 2.5t37 -21.5l32 -38q14 -15 12.5 -36t-17.5 -34l-139 -120h-390zM50 1100h106q67 0 103 -17t66 -71l102 -212h823q21 0 35.5 -14.5t14.5 -35.5v-50q0 -21 -14 -40t-33 -26l-737 -132q-23 -4 -40 6t-26 25q-42 67 -100 67h-300q-62 0 -106 44 t-44 106v200q0 62 44 106t106 44zM173 928h-80q-19 0 -28 -14t-9 -35v-56q0 -51 42 -51h134q16 0 21.5 8t5.5 24q0 11 -16 45t-27 51q-18 28 -43 28zM550 727q-32 0 -54.5 -22.5t-22.5 -54.5t22.5 -54.5t54.5 -22.5t54.5 22.5t22.5 54.5t-22.5 54.5t-54.5 22.5zM130 389 l152 130q18 19 34 24t31 -3.5t24.5 -17.5t25.5 -28q28 -35 50.5 -51t48.5 -13l63 5l48 -179q13 -61 -3.5 -97.5t-67.5 -79.5l-80 -69q-47 -40 -109 -35.5t-103 51.5l-130 151q-40 47 -35.5 109.5t51.5 102.5zM380 377l-102 -88q-31 -27 2 -65l37 -43q13 -15 27.5 -19.5 t31.5 6.5l61 53q19 16 14 49q-2 20 -12 56t-17 45q-11 12 -19 14t-23 -8z" />
+<glyph unicode="" d="M625 1200h150q10 0 17.5 -7.5t7.5 -17.5v-109q79 -33 131 -87.5t53 -128.5q1 -46 -15 -84.5t-39 -61t-46 -38t-39 -21.5l-17 -6q6 0 15 -1.5t35 -9t50 -17.5t53 -30t50 -45t35.5 -64t14.5 -84q0 -59 -11.5 -105.5t-28.5 -76.5t-44 -51t-49.5 -31.5t-54.5 -16t-49.5 -6.5 t-43.5 -1v-75q0 -10 -7.5 -17.5t-17.5 -7.5h-150q-10 0 -17.5 7.5t-7.5 17.5v75h-100v-75q0 -10 -7.5 -17.5t-17.5 -7.5h-150q-10 0 -17.5 7.5t-7.5 17.5v75h-175q-10 0 -17.5 7.5t-7.5 17.5v150q0 10 7.5 17.5t17.5 7.5h75v600h-75q-10 0 -17.5 7.5t-7.5 17.5v150 q0 10 7.5 17.5t17.5 7.5h175v75q0 10 7.5 17.5t17.5 7.5h150q10 0 17.5 -7.5t7.5 -17.5v-75h100v75q0 10 7.5 17.5t17.5 7.5zM400 900v-200h263q28 0 48.5 10.5t30 25t15 29t5.5 25.5l1 10q0 4 -0.5 11t-6 24t-15 30t-30 24t-48.5 11h-263zM400 500v-200h363q28 0 48.5 10.5 t30 25t15 29t5.5 25.5l1 10q0 4 -0.5 11t-6 24t-15 30t-30 24t-48.5 11h-363z" />
+<glyph unicode="" d="M212 1198h780q86 0 147 -61t61 -147v-416q0 -51 -18 -142.5t-36 -157.5l-18 -66q-29 -87 -93.5 -146.5t-146.5 -59.5h-572q-82 0 -147 59t-93 147q-8 28 -20 73t-32 143.5t-20 149.5v416q0 86 61 147t147 61zM600 1045q-70 0 -132.5 -11.5t-105.5 -30.5t-78.5 -41.5 t-57 -45t-36 -41t-20.5 -30.5l-6 -12l156 -243h560l156 243q-2 5 -6 12.5t-20 29.5t-36.5 42t-57 44.5t-79 42t-105 29.5t-132.5 12zM762 703h-157l195 261z" />
+<glyph unicode="" d="M475 1300h150q103 0 189 -86t86 -189v-500q0 -41 -42 -83t-83 -42h-450q-41 0 -83 42t-42 83v500q0 103 86 189t189 86zM700 300v-225q0 -21 -27 -48t-48 -27h-150q-21 0 -48 27t-27 48v225h300z" />
+<glyph unicode="" d="M475 1300h96q0 -150 89.5 -239.5t239.5 -89.5v-446q0 -41 -42 -83t-83 -42h-450q-41 0 -83 42t-42 83v500q0 103 86 189t189 86zM700 300v-225q0 -21 -27 -48t-48 -27h-150q-21 0 -48 27t-27 48v225h300z" />
+<glyph unicode="" d="M1294 767l-638 -283l-378 170l-78 -60v-224l100 -150v-199l-150 148l-150 -149v200l100 150v250q0 4 -0.5 10.5t0 9.5t1 8t3 8t6.5 6l47 40l-147 65l642 283zM1000 380l-350 -166l-350 166v147l350 -165l350 165v-147z" />
+<glyph unicode="" d="M250 800q62 0 106 -44t44 -106t-44 -106t-106 -44t-106 44t-44 106t44 106t106 44zM650 800q62 0 106 -44t44 -106t-44 -106t-106 -44t-106 44t-44 106t44 106t106 44zM1050 800q62 0 106 -44t44 -106t-44 -106t-106 -44t-106 44t-44 106t44 106t106 44z" />
+<glyph unicode="" d="M550 1100q62 0 106 -44t44 -106t-44 -106t-106 -44t-106 44t-44 106t44 106t106 44zM550 700q62 0 106 -44t44 -106t-44 -106t-106 -44t-106 44t-44 106t44 106t106 44zM550 300q62 0 106 -44t44 -106t-44 -106t-106 -44t-106 44t-44 106t44 106t106 44z" />
+<glyph unicode="" d="M125 1100h950q10 0 17.5 -7.5t7.5 -17.5v-150q0 -10 -7.5 -17.5t-17.5 -7.5h-950q-10 0 -17.5 7.5t-7.5 17.5v150q0 10 7.5 17.5t17.5 7.5zM125 700h950q10 0 17.5 -7.5t7.5 -17.5v-150q0 -10 -7.5 -17.5t-17.5 -7.5h-950q-10 0 -17.5 7.5t-7.5 17.5v150q0 10 7.5 17.5 t17.5 7.5zM125 300h950q10 0 17.5 -7.5t7.5 -17.5v-150q0 -10 -7.5 -17.5t-17.5 -7.5h-950q-10 0 -17.5 7.5t-7.5 17.5v150q0 10 7.5 17.5t17.5 7.5z" />
+<glyph unicode="" d="M350 1200h500q162 0 256 -93.5t94 -256.5v-500q0 -165 -93.5 -257.5t-256.5 -92.5h-500q-165 0 -257.5 92.5t-92.5 257.5v500q0 165 92.5 257.5t257.5 92.5zM900 1000h-600q-41 0 -70.5 -29.5t-29.5 -70.5v-600q0 -41 29.5 -70.5t70.5 -29.5h600q41 0 70.5 29.5 t29.5 70.5v600q0 41 -29.5 70.5t-70.5 29.5zM350 900h500q21 0 35.5 -14.5t14.5 -35.5v-300q0 -21 -14.5 -35.5t-35.5 -14.5h-500q-21 0 -35.5 14.5t-14.5 35.5v300q0 21 14.5 35.5t35.5 14.5zM400 800v-200h400v200h-400z" />
+<glyph unicode="" d="M150 1100h1000q21 0 35.5 -14.5t14.5 -35.5t-14.5 -35.5t-35.5 -14.5h-50v-200h50q21 0 35.5 -14.5t14.5 -35.5t-14.5 -35.5t-35.5 -14.5h-50v-200h50q21 0 35.5 -14.5t14.5 -35.5t-14.5 -35.5t-35.5 -14.5h-50v-200h50q21 0 35.5 -14.5t14.5 -35.5t-14.5 -35.5 t-35.5 -14.5h-1000q-21 0 -35.5 14.5t-14.5 35.5t14.5 35.5t35.5 14.5h50v200h-50q-21 0 -35.5 14.5t-14.5 35.5t14.5 35.5t35.5 14.5h50v200h-50q-21 0 -35.5 14.5t-14.5 35.5t14.5 35.5t35.5 14.5h50v200h-50q-21 0 -35.5 14.5t-14.5 35.5t14.5 35.5t35.5 14.5z" />
+<glyph unicode="" d="M650 1187q87 -67 118.5 -156t0 -178t-118.5 -155q-87 66 -118.5 155t0 178t118.5 156zM300 800q124 0 212 -88t88 -212q-124 0 -212 88t-88 212zM1000 800q0 -124 -88 -212t-212 -88q0 124 88 212t212 88zM300 500q124 0 212 -88t88 -212q-124 0 -212 88t-88 212z M1000 500q0 -124 -88 -212t-212 -88q0 124 88 212t212 88zM700 199v-144q0 -21 -14.5 -35.5t-35.5 -14.5t-35.5 14.5t-14.5 35.5v142q40 -4 43 -4q17 0 57 6z" />
+<glyph unicode="" d="M745 878l69 19q25 6 45 -12l298 -295q11 -11 15 -26.5t-2 -30.5q-5 -14 -18 -23.5t-28 -9.5h-8q1 0 1 -13q0 -29 -2 -56t-8.5 -62t-20 -63t-33 -53t-51 -39t-72.5 -14h-146q-184 0 -184 288q0 24 10 47q-20 4 -62 4t-63 -4q11 -24 11 -47q0 -288 -184 -288h-142 q-48 0 -84.5 21t-56 51t-32 71.5t-16 75t-3.5 68.5q0 13 2 13h-7q-15 0 -27.5 9.5t-18.5 23.5q-6 15 -2 30.5t15 25.5l298 296q20 18 46 11l76 -19q20 -5 30.5 -22.5t5.5 -37.5t-22.5 -31t-37.5 -5l-51 12l-182 -193h891l-182 193l-44 -12q-20 -5 -37.5 6t-22.5 31t6 37.5 t31 22.5z" />
+<glyph unicode="" d="M1200 900h-50q0 21 -4 37t-9.5 26.5t-18 17.5t-22 11t-28.5 5.5t-31 2t-37 0.5h-200v-850q0 -22 25 -34.5t50 -13.5l25 -2v-100h-400v100q4 0 11 0.5t24 3t30 7t24 15t11 24.5v850h-200q-25 0 -37 -0.5t-31 -2t-28.5 -5.5t-22 -11t-18 -17.5t-9.5 -26.5t-4 -37h-50v300 h1000v-300zM500 450h-25q0 15 -4 24.5t-9 14.5t-17 7.5t-20 3t-25 0.5h-100v-425q0 -11 12.5 -17.5t25.5 -7.5h12v-50h-200v50q50 0 50 25v425h-100q-17 0 -25 -0.5t-20 -3t-17 -7.5t-9 -14.5t-4 -24.5h-25v150h500v-150z" />
+<glyph unicode="" d="M1000 300v50q-25 0 -55 32q-14 14 -25 31t-16 27l-4 11l-289 747h-69l-300 -754q-18 -35 -39 -56q-9 -9 -24.5 -18.5t-26.5 -14.5l-11 -5v-50h273v50q-49 0 -78.5 21.5t-11.5 67.5l69 176h293l61 -166q13 -34 -3.5 -66.5t-55.5 -32.5v-50h312zM412 691l134 342l121 -342 h-255zM1100 150v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-1000q-21 0 -35.5 14.5t-14.5 35.5v100q0 21 14.5 35.5t35.5 14.5h1000q21 0 35.5 -14.5t14.5 -35.5z" />
+<glyph unicode="" d="M50 1200h1100q21 0 35.5 -14.5t14.5 -35.5v-1100q0 -21 -14.5 -35.5t-35.5 -14.5h-1100q-21 0 -35.5 14.5t-14.5 35.5v1100q0 21 14.5 35.5t35.5 14.5zM611 1118h-70q-13 0 -18 -12l-299 -753q-17 -32 -35 -51q-18 -18 -56 -34q-12 -5 -12 -18v-50q0 -8 5.5 -14t14.5 -6 h273q8 0 14 6t6 14v50q0 8 -6 14t-14 6q-55 0 -71 23q-10 14 0 39l63 163h266l57 -153q11 -31 -6 -55q-12 -17 -36 -17q-8 0 -14 -6t-6 -14v-50q0 -8 6 -14t14 -6h313q8 0 14 6t6 14v50q0 7 -5.5 13t-13.5 7q-17 0 -42 25q-25 27 -40 63h-1l-288 748q-5 12 -19 12zM639 611 h-197l103 264z" />
+<glyph unicode="" d="M1200 1100h-1200v100h1200v-100zM50 1000h400q21 0 35.5 -14.5t14.5 -35.5v-900q0 -21 -14.5 -35.5t-35.5 -14.5h-400q-21 0 -35.5 14.5t-14.5 35.5v900q0 21 14.5 35.5t35.5 14.5zM650 1000h400q21 0 35.5 -14.5t14.5 -35.5v-400q0 -21 -14.5 -35.5t-35.5 -14.5h-400 q-21 0 -35.5 14.5t-14.5 35.5v400q0 21 14.5 35.5t35.5 14.5zM700 900v-300h300v300h-300z" />
+<glyph unicode="" d="M50 1200h400q21 0 35.5 -14.5t14.5 -35.5v-900q0 -21 -14.5 -35.5t-35.5 -14.5h-400q-21 0 -35.5 14.5t-14.5 35.5v900q0 21 14.5 35.5t35.5 14.5zM650 700h400q21 0 35.5 -14.5t14.5 -35.5v-400q0 -21 -14.5 -35.5t-35.5 -14.5h-400q-21 0 -35.5 14.5t-14.5 35.5v400 q0 21 14.5 35.5t35.5 14.5zM700 600v-300h300v300h-300zM1200 0h-1200v100h1200v-100z" />
+<glyph unicode="" d="M50 1000h400q21 0 35.5 -14.5t14.5 -35.5v-350h100v150q0 21 14.5 35.5t35.5 14.5h400q21 0 35.5 -14.5t14.5 -35.5v-150h100v-100h-100v-150q0 -21 -14.5 -35.5t-35.5 -14.5h-400q-21 0 -35.5 14.5t-14.5 35.5v150h-100v-350q0 -21 -14.5 -35.5t-35.5 -14.5h-400 q-21 0 -35.5 14.5t-14.5 35.5v800q0 21 14.5 35.5t35.5 14.5zM700 700v-300h300v300h-300z" />
+<glyph unicode="" d="M100 0h-100v1200h100v-1200zM250 1100h400q21 0 35.5 -14.5t14.5 -35.5v-400q0 -21 -14.5 -35.5t-35.5 -14.5h-400q-21 0 -35.5 14.5t-14.5 35.5v400q0 21 14.5 35.5t35.5 14.5zM300 1000v-300h300v300h-300zM250 500h900q21 0 35.5 -14.5t14.5 -35.5v-400 q0 -21 -14.5 -35.5t-35.5 -14.5h-900q-21 0 -35.5 14.5t-14.5 35.5v400q0 21 14.5 35.5t35.5 14.5z" />
+<glyph unicode="" d="M600 1100h150q21 0 35.5 -14.5t14.5 -35.5v-400q0 -21 -14.5 -35.5t-35.5 -14.5h-150v-100h450q21 0 35.5 -14.5t14.5 -35.5v-400q0 -21 -14.5 -35.5t-35.5 -14.5h-900q-21 0 -35.5 14.5t-14.5 35.5v400q0 21 14.5 35.5t35.5 14.5h350v100h-150q-21 0 -35.5 14.5 t-14.5 35.5v400q0 21 14.5 35.5t35.5 14.5h150v100h100v-100zM400 1000v-300h300v300h-300z" />
+<glyph unicode="" d="M1200 0h-100v1200h100v-1200zM550 1100h400q21 0 35.5 -14.5t14.5 -35.5v-400q0 -21 -14.5 -35.5t-35.5 -14.5h-400q-21 0 -35.5 14.5t-14.5 35.5v400q0 21 14.5 35.5t35.5 14.5zM600 1000v-300h300v300h-300zM50 500h900q21 0 35.5 -14.5t14.5 -35.5v-400 q0 -21 -14.5 -35.5t-35.5 -14.5h-900q-21 0 -35.5 14.5t-14.5 35.5v400q0 21 14.5 35.5t35.5 14.5z" />
+<glyph unicode="" d="M865 565l-494 -494q-23 -23 -41 -23q-14 0 -22 13.5t-8 38.5v1000q0 25 8 38.5t22 13.5q18 0 41 -23l494 -494q14 -14 14 -35t-14 -35z" />
+<glyph unicode="" d="M335 635l494 494q29 29 50 20.5t21 -49.5v-1000q0 -41 -21 -49.5t-50 20.5l-494 494q-14 14 -14 35t14 35z" />
+<glyph unicode="" d="M100 900h1000q41 0 49.5 -21t-20.5 -50l-494 -494q-14 -14 -35 -14t-35 14l-494 494q-29 29 -20.5 50t49.5 21z" />
+<glyph unicode="" d="M635 865l494 -494q29 -29 20.5 -50t-49.5 -21h-1000q-41 0 -49.5 21t20.5 50l494 494q14 14 35 14t35 -14z" />
+<glyph unicode="" d="M700 741v-182l-692 -323v221l413 193l-413 193v221zM1200 0h-800v200h800v-200z" />
+<glyph unicode="" d="M1200 900h-200v-100h200v-100h-300v300h200v100h-200v100h300v-300zM0 700h50q0 21 4 37t9.5 26.5t18 17.5t22 11t28.5 5.5t31 2t37 0.5h100v-550q0 -22 -25 -34.5t-50 -13.5l-25 -2v-100h400v100q-4 0 -11 0.5t-24 3t-30 7t-24 15t-11 24.5v550h100q25 0 37 -0.5t31 -2 t28.5 -5.5t22 -11t18 -17.5t9.5 -26.5t4 -37h50v300h-800v-300z" />
+<glyph unicode="" d="M800 700h-50q0 21 -4 37t-9.5 26.5t-18 17.5t-22 11t-28.5 5.5t-31 2t-37 0.5h-100v-550q0 -22 25 -34.5t50 -14.5l25 -1v-100h-400v100q4 0 11 0.5t24 3t30 7t24 15t11 24.5v550h-100q-25 0 -37 -0.5t-31 -2t-28.5 -5.5t-22 -11t-18 -17.5t-9.5 -26.5t-4 -37h-50v300 h800v-300zM1100 200h-200v-100h200v-100h-300v300h200v100h-200v100h300v-300z" />
+<glyph unicode="" d="M701 1098h160q16 0 21 -11t-7 -23l-464 -464l464 -464q12 -12 7 -23t-21 -11h-160q-13 0 -23 9l-471 471q-7 8 -7 18t7 18l471 471q10 9 23 9z" />
+<glyph unicode="" d="M339 1098h160q13 0 23 -9l471 -471q7 -8 7 -18t-7 -18l-471 -471q-10 -9 -23 -9h-160q-16 0 -21 11t7 23l464 464l-464 464q-12 12 -7 23t21 11z" />
+<glyph unicode="" d="M1087 882q11 -5 11 -21v-160q0 -13 -9 -23l-471 -471q-8 -7 -18 -7t-18 7l-471 471q-9 10 -9 23v160q0 16 11 21t23 -7l464 -464l464 464q12 12 23 7z" />
+<glyph unicode="" d="M618 993l471 -471q9 -10 9 -23v-160q0 -16 -11 -21t-23 7l-464 464l-464 -464q-12 -12 -23 -7t-11 21v160q0 13 9 23l471 471q8 7 18 7t18 -7z" />
+<glyph unicode="" d="M1000 1200q0 -124 -88 -212t-212 -88q0 124 88 212t212 88zM450 1000h100q21 0 40 -14t26 -33l79 -194q5 1 16 3q34 6 54 9.5t60 7t65.5 1t61 -10t56.5 -23t42.5 -42t29 -64t5 -92t-19.5 -121.5q-1 -7 -3 -19.5t-11 -50t-20.5 -73t-32.5 -81.5t-46.5 -83t-64 -70 t-82.5 -50q-13 -5 -42 -5t-65.5 2.5t-47.5 2.5q-14 0 -49.5 -3.5t-63 -3.5t-43.5 7q-57 25 -104.5 78.5t-75 111.5t-46.5 112t-26 90l-7 35q-15 63 -18 115t4.5 88.5t26 64t39.5 43.5t52 25.5t58.5 13t62.5 2t59.5 -4.5t55.5 -8l-147 192q-12 18 -5.5 30t27.5 12z" />
+<glyph unicode="🔑" d="M250 1200h600q21 0 35.5 -14.5t14.5 -35.5v-400q0 -21 -14.5 -35.5t-35.5 -14.5h-150v-500l-255 -178q-19 -9 -32 -1t-13 29v650h-150q-21 0 -35.5 14.5t-14.5 35.5v400q0 21 14.5 35.5t35.5 14.5zM400 1100v-100h300v100h-300z" />
+<glyph unicode="🚪" d="M250 1200h750q39 0 69.5 -40.5t30.5 -84.5v-933l-700 -117v950l600 125h-700v-1000h-100v1025q0 23 15.5 49t34.5 26zM500 525v-100l100 20v100z" />
+</font>
+</defs></svg>
diff --git a/management/guns-admin/src/main/webapp/static/fonts/glyphicons-halflings-regular.ttf b/management/guns-admin/src/main/webapp/static/fonts/glyphicons-halflings-regular.ttf
new file mode 100644
index 0000000..1413fc6
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/static/fonts/glyphicons-halflings-regular.ttf
Binary files differ
diff --git a/management/guns-admin/src/main/webapp/static/fonts/glyphicons-halflings-regular.woff b/management/guns-admin/src/main/webapp/static/fonts/glyphicons-halflings-regular.woff
new file mode 100644
index 0000000..9e61285
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/static/fonts/glyphicons-halflings-regular.woff
Binary files differ
diff --git a/management/guns-admin/src/main/webapp/static/fonts/glyphicons-halflings-regular.woff2 b/management/guns-admin/src/main/webapp/static/fonts/glyphicons-halflings-regular.woff2
new file mode 100644
index 0000000..64539b5
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/static/fonts/glyphicons-halflings-regular.woff2
Binary files differ
diff --git a/management/guns-admin/src/main/webapp/static/home.js b/management/guns-admin/src/main/webapp/static/home.js
new file mode 100644
index 0000000..b546552
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/static/home.js
@@ -0,0 +1,500 @@
+var uid = $("#3dnzNxplgTiHaddR",top.window.document).val();
+var markers = [];
+var companyId = '';
+
+var Home = {
+ id: "HomeTable", //表格id
+ seItem: null, //选中的条目
+ table: null,
+ layerIndex: -1,
+ businessType:null,//存储企业信息
+};
+
+
+/**
+ * 初始化表格的列
+ */
+Home.initColumn = function () {
+ return [
+ {field: 'selectItem', radio: true},
+ {title: '主键ID', field: 'id', visible: false, align: 'center', valign: 'middle'},
+ {title: '最后在线时间', field: 'insertTime', visible: true, align: 'center', valign: 'middle',
+ formatter: function (value, row) {
+ var btn = "";
+ if(row.insertTime != '' && row.insertTime != null) {
+ var time = row.insertTime.replace(" ",'<br>');
+ btn = ['<p class="toolTip" style="overflow:hidden;white-space:nowrap;text-overflow:ellipsis;" title="' + row.insertTime + '" onfocus="TUser.tooltip()">' + time + '</p>']
+ }
+ return btn;
+ }
+ },
+ {title: '司机头像', field: 'headImgUrl', visible: true, align: 'center', valign: 'middle',
+ formatter: function (value, row) {
+ if (row.headImgUrl == null || row.headImgUrl == '') {
+ return '<a class = "view" href="javascript:void(0)"><img style="width: 50px;height:50px;" src="' + Feng.ctxPath + '/static/img/NoPIC.png" /></a>';
+ } else {
+ return '<a class = "view" href="javascript:void(0)"><img style="width: 90px;height:50px;" src="' + row.headImgUrl + '" /></a>';
+ }
+ },
+ events: 'operateEvents'
+ },
+ {title: '司机姓名', field: 'name', visible: true, align: 'center', valign: 'middle',
+ formatter: function (value, row) {
+ var btn = "";
+ if(row.name != '' && row.name != null) {
+ btn = ['<p class="toolTip" style="overflow:hidden;white-space:nowrap;text-overflow:ellipsis;" title="' + row.name + '" onfocus="TUser.tooltip()">' + row.name + '</p>']
+ }
+ return btn;
+ }
+ },
+ {title: '司机电话', field: 'phone', visible: false, align: 'center', valign: 'middle'},
+ {title: '在线设备', field: 'device', visible: true, align: 'center', valign: 'middle'},
+ {title: '当前版本', field: 'version', visible: true, align: 'center', valign: 'middle'}
+ ];
+};
+
+
+
+/**
+ * 点击添加信息
+ */
+Home.openNetCarInfo = function (e) {
+ var id = e.getExtData()[0];
+ var index = layer.open({
+ type: 2,
+ title: '详细数据',
+ area: ['770px', '500px'], //宽高
+ fix: false, //不固定
+ maxmin: true,
+ content: Feng.ctxPath + '/home/openNetCarInfo?id=' + id,
+ });
+ this.layerIndex = index;
+};
+
+
+
+Home.onlineDriver = function () {
+ var index = layer.open({
+ type: 2,
+ title: '在线司机',
+ area: ['100%', '100%'], //宽高
+ fix: false, //不固定
+ maxmin: true,
+ content: Feng.ctxPath + '/home/showDriverOnline',
+ });
+ this.layerIndex = index;
+};
+
+
+Home.search = function () {
+ var queryData = {};
+ queryData['name'] = $("#name").val();
+ queryData['phone'] = $("#phone").val();
+ Home.table.refresh({query: queryData});
+};
+Home.resetSearch = function () {
+ $("#name").val("");
+ $("#phone").val("");
+ Home.search();
+};
+
+
+$(function () {
+ var defaultColunms = Home.initColumn();
+ var table = new BSTable(Home.id, "/home/queryOnlineDriver", defaultColunms);
+ table.setPaginationType("server");
+ Home.table = table.init();
+
+ var first = $('.breadcrumb').children('li:first').children('a');
+ first.css({
+ 'color': '#AB2626'
+ })
+ var className = first.attr('class');
+ $('.content').hide();
+ $('#' + className + 'Div').show();
+
+
+ $('.breadcrumb').find('a').on('click', function () {
+ $('.breadcrumb').children('li').each(function () {
+ $(this).children('a').removeAttr('style');
+ })
+
+ $(this).css({
+ 'color': '#AB2626'
+ });
+ var className = $(this).attr('class');
+ $('.content').hide();
+ $('#' + className + "Div").show();
+ switch (className) {
+ case "statistics":
+ getData();
+ break;
+ case "map":
+ var companyId = $('#branchOffice1').val();
+ if(null != companyId && '' != companyId){
+ Home.webSocketClient(companyId);
+ }else{
+ Home.webSocketClient(null);
+ }
+ break;
+ case "order":
+ Home.getAllOrder();
+ break;
+ }
+
+ })
+
+
+
+ laydate.render({
+ elem: '#addDate', //指定元素
+ format: 'yyyy-MM-dd',//日期格式
+ value: new Date(),//默认值
+ zIndex: 99999999,//层叠顺序
+ trigger: 'click',
+ done: function(value, date, endDate){
+ getData();
+ console.log(value); //得到日期生成的值，如：2017-08-18
+ }
+ });
+ laydate.render({
+ elem: '#rangeDate', //指定元素
+ format: 'yyyy-MM-dd',//日期格式
+ range: true,
+ value: '',//默认值
+ zIndex: 99999999,//层叠顺序
+ trigger: 'click',
+ done: function(value, date, endDate){
+ getData();
+ console.log(value); //得到日期生成的值，如：2017-08-18
+ }
+ });
+ getData();
+ getCompanyByUid();
+ // setInterval(function () {
+ // Home.webSocketClient(null);
+ // }, 60000 * 5);
+ // setInterval(function () {
+ // Home.getAllOrder();
+ // }, 60000 * 5);
+});
+
+
+
+var map = new AMap.Map('container',{
+ resizeEnable: true,
+ zoom:10
+});
+
+
+var map_ = new AMap.Map('container_',{
+ resizeEnable: true,
+ mapStyle: 'amap://styles/1de318cbb8d12c02303a22c550b9ccc9',
+ zoom:10
+});
+
+var mouseTool = new AMap.MouseTool(map);
+//监听draw事件可获取画好的覆盖物
+var overlays = [];
+var name = null;
+var coordinate = '';//存储坐标
+mouseTool.on('draw',function(e){
+ overlays.push(e.obj);
+ console.log(e.obj.getPath());
+
+ switch (name) {
+ case 'polyline':{//折线图
+ var polyline = e.obj.getPath();
+ getCoordinate(polyline);
+ break;
+ }
+ case 'polygon':{//多边形
+ var polygon = e.obj.getPath();
+ getCoordinate(polygon);
+ break;
+ }
+ case 'rectangle':{//矩形
+ var rectangle = e.obj.getPath();
+ getCoordinate(rectangle);
+ break;
+ }
+ case 'circle':{//圆行
+ var center = e.obj.getCenter();
+ var radius = e.obj.getRadius();
+ if(radius > 5000){
+ Feng.error("创建电子围栏失败，圆半径不能大于5000米");
+ return;
+ }
+ coordinate = center.lng + ',' + center.lat + ';' + radius;
+ break;
+ }
+ }
+ console.log(coordinate);
+})
+
+
+function getCompanyByUid() {
+ $.ajax({
+ url: Feng.ctxPath + "/home/getCompanyInfoByUserId",
+ type: 'POST',
+ success: function (res) {
+ var str = '<option value="">----请选择----</option>';
+ for(var i in res){
+ str += '<option value="' + res[i].id + '">' + res[i].name + '</option>'
+ }
+ $('#branchOffice').html(str);
+ $('#branchOffice1').html(str);
+ }
+ });
+}
+
+
+
+
+
+
+function getData() {
+ var branchOffice = $('#branchOffice').val();
+ var addDate = $('#addDate').val();
+ var date = $('#rangeDate').val();
+ var data = new FormData();
+ if(null != branchOffice && '' != branchOffice){
+ data.append("companyId", branchOffice);
+ }
+ if(null != addDate && '' != addDate){
+ data.append("addDate", addDate);
+ }
+ if(null != date && date != ''){
+ data.append("start", date.split(' - ')[0]);
+ data.append("end", date.split(' - ')[1]);
+ }
+
+ $.ajax({
+ url: Feng.ctxPath + "/home/getSumData",
+ type: 'POST',
+ contentType: false,
+ processData: false,
+ data: data,
+ success: function (res) {
+ var operationStatus = res.operationStatus;
+ var operationSum = res.operationSum;
+ var operationGrow = res.operationGrow;
+ var operationTrend = res.operationTrend;
+
+ $('#newPassengerInfo').text(operationStatus.passengerInfo == null ? 0 : operationStatus.passengerInfo);
+ $('#newNetcardriver').text(operationStatus.netcardriver == null ? 0 : operationStatus.netcardriver);
+ $('#orderDetail1').text(operationStatus.orderDetail1 == null ? 0 : operationStatus.orderDetail1);
+ $('#orderDetail2').text(operationStatus.orderDetail2 == null ? 0 : operationStatus.orderDetail2);
+ $('#orderDetail3').text(operationStatus.orderDetail3 == null ? 0 : operationStatus.orderDetail3);
+ $('#orderDetail4').text(operationStatus.orderDetail4 == null ? 0 : operationStatus.orderDetail4);
+ $('#orderDetail5').text(operationStatus.orderDetail5 == null ? 0 : operationStatus.orderDetail5);
+
+ $('#passengerInfoSum').text(operationSum.passengerInfoSum == null ? 0 : operationSum.passengerInfoSum);
+ $('#netcarDriverSum').text(operationSum.netcarDriverSum == null ? 0 : operationSum.netcarDriverSum);
+ $('#netCarSum').text(operationSum.netCarSum == null ? 0 : operationSum.netCarSum);
+ $('#orderDetailSum').text(operationSum.orderDetailSum == null ? 0 : operationSum.orderDetailSum);
+ $('#paiceSum').text(operationSum.paiceSum == null ? 0 : operationSum.paiceSum);
+ $('#paySum').text(operationSum.paySum == null ? 0 : operationSum.paySum);
+
+ $('#passengerInfoSum1').text(operationGrow.passengerInfoSum == null ? 0 : operationGrow.passengerInfoSum);
+ $('#netcarDriverSum1').text(operationGrow.netcarDriverSum == null ? 0 : operationGrow.netcarDriverSum);
+ $('#orderDetail11').text(operationGrow.orderDetail1 == null ? 0 : operationGrow.orderDetail1);
+ $('#orderDetail21').text(operationGrow.orderDetail2 == null ? 0 : operationGrow.orderDetail2);
+ $('#orderDetail31').text(operationGrow.orderDetail3 == null ? 0 : operationGrow.orderDetail3);
+ $('#orderDetail41').text(operationGrow.orderDetail4 == null ? 0 : operationGrow.orderDetail4);
+ $('#orderDetail51').text(operationGrow.orderDetail5 == null ? 0 : operationGrow.orderDetail5);
+ $('#paySum1').text(operationGrow.paySum == null ? 0 : operationGrow.paySum);
+ $('#paiceSum1').text(operationGrow.paiceSum == null ? 0 : operationGrow.paiceSum);
+
+ $('#orderDetailSum1').sparkline(operationTrend.orderDetailSum, {
+ lineColor:'green',
+ width: '100%',
+ height: '33px'
+ });
+ $('#passengerInfoSum2').sparkline(operationTrend.passengerInfoSum, {
+ lineColor:'green',
+ width: '100%',
+ height: '33px'
+ });
+ $('#orderDetail12').sparkline(operationTrend.orderDetail1, {
+ lineColor:'green',
+ width: '100%',
+ height: '33px'
+ });
+ $('#orderDetail22').sparkline(operationTrend.orderDetail2, {
+ lineColor:'green',
+ width: '100%',
+ height: '33px'
+ });
+ $('#orderDetail32').sparkline(operationTrend.orderDetail3, {
+ lineColor:'green',
+ width: '100%',
+ height: '33px'
+ });
+ $('#orderDetail42').sparkline(operationTrend.orderDetail4, {
+ lineColor:'green',
+ width: '100%',
+ height: '33px'
+ });
+ $('#orderDetail52').sparkline(operationTrend.orderDetail5, {
+ lineColor:'green',
+ width: '100%',
+ height: '33px'
+ });
+ }
+ });
+}
+
+
+Home.webSocketClient = function (companyId) {
+ $.ajax({
+ url: Feng.ctxPath + '/home/getDriverPosition',
+ type: 'POST',
+ data: {
+ companyId: companyId
+ },
+ success: function (res) {
+ map.remove(markers);
+ markers = [];
+ var data = res.driver;
+ var order = res.order;
+ var d = '';
+ for(var i in data){
+ var driver = data[i].driver;
+ var driverId = driver.id;
+ d += '<li class="list-group-item" id="' + driverId + '">' + driver.name + '-' + driver.phone + '</li>';
+ if('' != data[i].lon){
+ // 创建 AMap.Icon 实例：
+ var icon = new AMap.Icon({
+ size: new AMap.Size(40, 50), // 图标尺寸
+ image: '/static/car.png', // Icon的图像
+ // imageOffset: new AMap.Pixel(0, -60), // 图像相对展示区域的偏移量，适于雪碧图等
+ imageSize: new AMap.Size(40, 50), // 根据所设置的大小拉伸或压缩图片
+ });
+
+ var marker = new AMap.Marker({
+ position: new AMap.LngLat(data[i].lon, data[i].lat), // 经纬度对象，也可以是经纬度构成的一维数组[116.39, 39.9]
+ offset: new AMap.Pixel(-10, -10),
+ icon: icon, // 添加 Icon 实例
+ });
+ marker.setExtData([driverId])
+ marker.on('click', function(){
+ Home.openNetCarInfo(this);
+ });
+ markers.push(marker)
+ }
+ }
+ $('#netcardriver').html(d);
+ map.add(markers);
+
+ //订单数据
+ var zhuanche = order.zhuanche;
+ var kuacheng = order.kuacheng;
+ var chuzu = order.chuzu;
+ var kuahceng = order.kuahceng;
+ var o = '';
+ $('#order').html(o);
+ var zc = '<div class="list-group"><a href="#" class="list-group-item active">专车未接订单</a>'
+ for(var i in zhuanche){
+ zc += '<a href="#" class="list-group-item"><p class="list-group-item-text">起点：' + zhuanche[i].start + '</p><p class="list-group-item-text">终点：' + zhuanche[i].end + '</p>' +
+ '<p class="list-group-item-text">下单时间：' + zhuanche[i].travelTime + '</p><p class="list-group-item-text">车型：' + zhuanche[i].carModel + '</p>' +
+ '<p class="list-group-item-text">人数：' + zhuanche[i].num + '</p></a>';
+ }
+ zc += '</div>';
+ o += zc;
+
+ var kc = '<div class="list-group"><a href="#" class="list-group-item active">跨城出行未接订单</a>'
+ for(var i in kuacheng){
+ kc += '<a href="#" class="list-group-item"><p class="list-group-item-text">起点：' + kuacheng[i].start + '</p><p class="list-group-item-text">终点：' + kuacheng[i].end + '</p>' +
+ '<p class="list-group-item-text">下单时间：' + kuacheng[i].travelTime + '</p><p class="list-group-item-text">车型：' + kuacheng[i].carModel + '</p>' +
+ '<p class="list-group-item-text">人数：' + kuacheng[i].num + '</p></a>';
+ }
+ kc += '</div>';
+ o += kc;
+
+ var cz = '<div class="list-group"><a href="#" class="list-group-item active">出租车未接订单</a>'
+ for(var i in chuzu){
+ cz += '<a href="#" class="list-group-item"><p class="list-group-item-text">起点：' + chuzu[i].start + '</p><p class="list-group-item-text">终点：' + chuzu[i].end + '</p>' +
+ '<p class="list-group-item-text">下单时间：' + chuzu[i].travelTime + '</p><p class="list-group-item-text">车型：' + chuzu[i].carModel + '</p>' +
+ '<p class="list-group-item-text">人数：' + chuzu[i].num + '</p></a>';
+ }
+ cz += '</div>';
+ o += cz;
+
+ var cx = '<div class="list-group"><a href="#" class="list-group-item active">城乡出行未接订单</a>'
+ for(var i in kuahceng){
+ cx += '<a href="#" class="list-group-item"><p class="list-group-item-text">起点：' + kuahceng[i].start + '</p><p class="list-group-item-text">终点：' + kuahceng[i].end + '</p>' +
+ '<p class="list-group-item-text">下单时间：' + kuahceng[i].travelTime + '</p><p class="list-group-item-text">车型：' + kuahceng[i].carModel + '</p>' +
+ '<p class="list-group-item-text">人数：' + kuahceng[i].num + '</p></a>';
+ }
+ cx += '</div>';
+ o += cx;
+
+ $('#order').html(o);
+ }
+ })
+}
+
+
+
+Home.getAllOrder = function () {
+ $.ajax({
+ url: Feng.ctxPath + '/home/getAllOrder',
+ type: 'POST',
+ data: {
+ companyId: companyId,
+ uid: uid
+ },
+ success: function (res) {
+ var style = [{
+ url: 'https://a.amap.com/jsapi_demos/static/images/mass0.png',
+ anchor: new AMap.Pixel(6, 6),
+ size: new AMap.Size(11, 11)
+ }, {
+ url: 'https://a.amap.com/jsapi_demos/static/images/mass1.png',
+ anchor: new AMap.Pixel(4, 4),
+ size: new AMap.Size(7, 7)
+ }, {
+ url: 'https://a.amap.com/jsapi_demos/static/images/mass2.png',
+ anchor: new AMap.Pixel(3, 3),
+ size: new AMap.Size(5, 5)
+ }];
+
+ var mass = new AMap.MassMarks(citys, {
+ opacity: 0.8,
+ zIndex: 111,
+ cursor: 'pointer',
+ style: style
+ });
+
+ var marker = new AMap.Marker({content: ' ', map: map_});
+
+ mass.on('mouseover', function (e) {
+
+ marker.setPosition(e.data.lnglat);
+ marker.setLabel({content: e.data.name})
+ });
+
+ var data = [];
+ for(var i in res){
+ var obj = {
+ lnglat: [res[i].lon, res[i].lat]
+ }
+ data.push(obj);
+ }
+ mass.setData(data);
+ mass.setMap(map_);
+ }
+ });
+}
+
+
+
+function getData1() {
+ var companyId = null;
+ var branchOffice1 = $('#branchOffice1').val();
+ if('' != branchOffice1 && null != branchOffice1){
+ companyId = branchOffice1;
+ }
+ Home.webSocketClient(companyId);
+}
\ No newline at end of file
diff --git a/management/guns-admin/src/main/webapp/static/img/20210511-092352.JPG b/management/guns-admin/src/main/webapp/static/img/20210511-092352.JPG
new file mode 100644
index 0000000..de1fc76
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/static/img/20210511-092352.JPG
Binary files differ
diff --git a/management/guns-admin/src/main/webapp/static/img/NoPIC.png b/management/guns-admin/src/main/webapp/static/img/NoPIC.png
new file mode 100644
index 0000000..a1a957e
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/static/img/NoPIC.png
Binary files differ
diff --git a/management/guns-admin/src/main/webapp/static/img/account.png b/management/guns-admin/src/main/webapp/static/img/account.png
new file mode 100644
index 0000000..764808e
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/static/img/account.png
Binary files differ
diff --git a/management/guns-admin/src/main/webapp/static/img/bg.png b/management/guns-admin/src/main/webapp/static/img/bg.png
new file mode 100644
index 0000000..73d102d
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/static/img/bg.png
Binary files differ
diff --git a/management/guns-admin/src/main/webapp/static/img/boy.gif b/management/guns-admin/src/main/webapp/static/img/boy.gif
new file mode 100644
index 0000000..e1ba77e
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/static/img/boy.gif
Binary files differ
diff --git a/management/guns-admin/src/main/webapp/static/img/girl.gif b/management/guns-admin/src/main/webapp/static/img/girl.gif
new file mode 100644
index 0000000..8ef9a59
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/static/img/girl.gif
Binary files differ
diff --git a/management/guns-admin/src/main/webapp/static/img/icon100.png b/management/guns-admin/src/main/webapp/static/img/icon100.png
new file mode 100644
index 0000000..adcfcb6
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/static/img/icon100.png
Binary files differ
diff --git a/management/guns-admin/src/main/webapp/static/img/icons.png b/management/guns-admin/src/main/webapp/static/img/icons.png
new file mode 100644
index 0000000..12e4700
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/static/img/icons.png
Binary files differ
diff --git a/management/guns-admin/src/main/webapp/static/img/index.png b/management/guns-admin/src/main/webapp/static/img/index.png
new file mode 100644
index 0000000..7d486ef
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/static/img/index.png
Binary files differ
diff --git a/management/guns-admin/src/main/webapp/static/img/index1.png b/management/guns-admin/src/main/webapp/static/img/index1.png
new file mode 100644
index 0000000..7a76deb
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/static/img/index1.png
Binary files differ
diff --git a/management/guns-admin/src/main/webapp/static/img/index2.png b/management/guns-admin/src/main/webapp/static/img/index2.png
new file mode 100644
index 0000000..52bf8ba
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/static/img/index2.png
Binary files differ
diff --git a/management/guns-admin/src/main/webapp/static/img/index4.png b/management/guns-admin/src/main/webapp/static/img/index4.png
new file mode 100644
index 0000000..ece22c7
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/static/img/index4.png
Binary files differ
diff --git a/management/guns-admin/src/main/webapp/static/img/loading-upload.gif b/management/guns-admin/src/main/webapp/static/img/loading-upload.gif
new file mode 100644
index 0000000..6fba776
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/static/img/loading-upload.gif
Binary files differ
diff --git a/management/guns-admin/src/main/webapp/static/img/locked.png b/management/guns-admin/src/main/webapp/static/img/locked.png
new file mode 100644
index 0000000..c831c1f
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/static/img/locked.png
Binary files differ
diff --git a/management/guns-admin/src/main/webapp/static/img/login-background.jpg b/management/guns-admin/src/main/webapp/static/img/login-background.jpg
new file mode 100644
index 0000000..adfa3f9
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/static/img/login-background.jpg
Binary files differ
diff --git a/management/guns-admin/src/main/webapp/static/img/logo.png b/management/guns-admin/src/main/webapp/static/img/logo.png
new file mode 100644
index 0000000..f628e5d
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/static/img/logo.png
Binary files differ
diff --git a/management/guns-admin/src/main/webapp/static/img/password.png b/management/guns-admin/src/main/webapp/static/img/password.png
new file mode 100644
index 0000000..5083b51
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/static/img/password.png
Binary files differ
diff --git a/management/guns-admin/src/main/webapp/static/img/shangchuanpic.png b/management/guns-admin/src/main/webapp/static/img/shangchuanpic.png
new file mode 100644
index 0000000..bdc0e1c
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/static/img/shangchuanpic.png
Binary files differ
diff --git a/management/guns-admin/src/main/webapp/static/img/user.png b/management/guns-admin/src/main/webapp/static/img/user.png
new file mode 100644
index 0000000..7f77fd0
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/static/img/user.png
Binary files differ
diff --git a/management/guns-admin/src/main/webapp/static/js/bootstrap.min.js b/management/guns-admin/src/main/webapp/static/js/bootstrap.min.js
new file mode 100644
index 0000000..e364a13
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/static/js/bootstrap.min.js
@@ -0,0 +1,7 @@
+/*!
+ * Bootstrap v3.3.6 (http://getbootstrap.com)
+ * Copyright 2011-2015 Twitter, Inc.
+ * Licensed under the MIT license
+ */
+if("undefined"==typeof jQuery)throw new Error("Bootstrap's JavaScript requires jQuery");+function(a){"use strict";var b=a.fn.jquery.split(" ")[0].split(".");if(b[0]<2&&b[1]<9||1==b[0]&&9==b[1]&&b[2]<1||b[0]>2)throw new Error("Bootstrap's JavaScript requires jQuery version 1.9.1 or higher, but lower than version 3")}(jQuery),+function(a){"use strict";function b(){var a=document.createElement("bootstrap"),b={WebkitTransition:"webkitTransitionEnd",MozTransition:"transitionend",OTransition:"oTransitionEnd otransitionend",transition:"transitionend"};for(var c in b)if(void 0!==a.style[c])return{end:b[c]};return!1}a.fn.emulateTransitionEnd=function(b){var c=!1,d=this;a(this).one("bsTransitionEnd",function(){c=!0});var e=function(){c||a(d).trigger(a.support.transition.end)};return setTimeout(e,b),this},a(function(){a.support.transition=b(),a.support.transition&&(a.event.special.bsTransitionEnd={bindType:a.support.transition.end,delegateType:a.support.transition.end,handle:function(b){return a(b.target).is(this)?b.handleObj.handler.apply(this,arguments):void 0}})})}(jQuery),+function(a){"use strict";function b(b){return this.each(function(){var c=a(this),e=c.data("bs.alert");e||c.data("bs.alert",e=new d(this)),"string"==typeof b&&e[b].call(c)})}var c='[data-dismiss="alert"]',d=function(b){a(b).on("click",c,this.close)};d.VERSION="3.3.6",d.TRANSITION_DURATION=150,d.prototype.close=function(b){function c(){g.detach().trigger("closed.bs.alert").remove()}var e=a(this),f=e.attr("data-target");f||(f=e.attr("href"),f=f&&f.replace(/.*(?=#[^\s]*$)/,""));var g=a(f);b&&b.preventDefault(),g.length||(g=e.closest(".alert")),g.trigger(b=a.Event("close.bs.alert")),b.isDefaultPrevented()||(g.removeClass("in"),a.support.transition&&g.hasClass("fade")?g.one("bsTransitionEnd",c).emulateTransitionEnd(d.TRANSITION_DURATION):c())};var e=a.fn.alert;a.fn.alert=b,a.fn.alert.Constructor=d,a.fn.alert.noConflict=function(){return a.fn.alert=e,this},a(document).on("click.bs.alert.data-api",c,d.prototype.close)}(jQuery),+function(a){"use strict";function b(b){return this.each(function(){var d=a(this),e=d.data("bs.button"),f="object"==typeof b&&b;e||d.data("bs.button",e=new c(this,f)),"toggle"==b?e.toggle():b&&e.setState(b)})}var c=function(b,d){this.$element=a(b),this.options=a.extend({},c.DEFAULTS,d),this.isLoading=!1};c.VERSION="3.3.6",c.DEFAULTS={loadingText:"loading..."},c.prototype.setState=function(b){var c="disabled",d=this.$element,e=d.is("input")?"val":"html",f=d.data();b+="Text",null==f.resetText&&d.data("resetText",d[e]()),setTimeout(a.proxy(function(){d[e](null==f[b]?this.options[b]:f[b]),"loadingText"==b?(this.isLoading=!0,d.addClass(c).attr(c,c)):this.isLoading&&(this.isLoading=!1,d.removeClass(c).removeAttr(c))},this),0)},c.prototype.toggle=function(){var a=!0,b=this.$element.closest('[data-toggle="buttons"]');if(b.length){var c=this.$element.find("input");"radio"==c.prop("type")?(c.prop("checked")&&(a=!1),b.find(".active").removeClass("active"),this.$element.addClass("active")):"checkbox"==c.prop("type")&&(c.prop("checked")!==this.$element.hasClass("active")&&(a=!1),this.$element.toggleClass("active")),c.prop("checked",this.$element.hasClass("active")),a&&c.trigger("change")}else this.$element.attr("aria-pressed",!this.$element.hasClass("active")),this.$element.toggleClass("active")};var d=a.fn.button;a.fn.button=b,a.fn.button.Constructor=c,a.fn.button.noConflict=function(){return a.fn.button=d,this},a(document).on("click.bs.button.data-api",'[data-toggle^="button"]',function(c){var d=a(c.target);d.hasClass("btn")||(d=d.closest(".btn")),b.call(d,"toggle"),a(c.target).is('input[type="radio"]')||a(c.target).is('input[type="checkbox"]')||c.preventDefault()}).on("focus.bs.button.data-api blur.bs.button.data-api",'[data-toggle^="button"]',function(b){a(b.target).closest(".btn").toggleClass("focus",/^focus(in)?$/.test(b.type))})}(jQuery),+function(a){"use strict";function b(b){return this.each(function(){var d=a(this),e=d.data("bs.carousel"),f=a.extend({},c.DEFAULTS,d.data(),"object"==typeof b&&b),g="string"==typeof b?b:f.slide;e||d.data("bs.carousel",e=new c(this,f)),"number"==typeof b?e.to(b):g?e[g]():f.interval&&e.pause().cycle()})}var c=function(b,c){this.$element=a(b),this.$indicators=this.$element.find(".carousel-indicators"),this.options=c,this.paused=null,this.sliding=null,this.interval=null,this.$active=null,this.$items=null,this.options.keyboard&&this.$element.on("keydown.bs.carousel",a.proxy(this.keydown,this)),"hover"==this.options.pause&&!("ontouchstart"in document.documentElement)&&this.$element.on("mouseenter.bs.carousel",a.proxy(this.pause,this)).on("mouseleave.bs.carousel",a.proxy(this.cycle,this))};c.VERSION="3.3.6",c.TRANSITION_DURATION=600,c.DEFAULTS={interval:5e3,pause:"hover",wrap:!0,keyboard:!0},c.prototype.keydown=function(a){if(!/input|textarea/i.test(a.target.tagName)){switch(a.which){case 37:this.prev();break;case 39:this.next();break;default:return}a.preventDefault()}},c.prototype.cycle=function(b){return b||(this.paused=!1),this.interval&&clearInterval(this.interval),this.options.interval&&!this.paused&&(this.interval=setInterval(a.proxy(this.next,this),this.options.interval)),this},c.prototype.getItemIndex=function(a){return this.$items=a.parent().children(".item"),this.$items.index(a||this.$active)},c.prototype.getItemForDirection=function(a,b){var c=this.getItemIndex(b),d="prev"==a&&0===c||"next"==a&&c==this.$items.length-1;if(d&&!this.options.wrap)return b;var e="prev"==a?-1:1,f=(c+e)%this.$items.length;return this.$items.eq(f)},c.prototype.to=function(a){var b=this,c=this.getItemIndex(this.$active=this.$element.find(".item.active"));return a>this.$items.length-1||0>a?void 0:this.sliding?this.$element.one("slid.bs.carousel",function(){b.to(a)}):c==a?this.pause().cycle():this.slide(a>c?"next":"prev",this.$items.eq(a))},c.prototype.pause=function(b){return b||(this.paused=!0),this.$element.find(".next, .prev").length&&a.support.transition&&(this.$element.trigger(a.support.transition.end),this.cycle(!0)),this.interval=clearInterval(this.interval),this},c.prototype.next=function(){return this.sliding?void 0:this.slide("next")},c.prototype.prev=function(){return this.sliding?void 0:this.slide("prev")},c.prototype.slide=function(b,d){var e=this.$element.find(".item.active"),f=d||this.getItemForDirection(b,e),g=this.interval,h="next"==b?"left":"right",i=this;if(f.hasClass("active"))return this.sliding=!1;var j=f[0],k=a.Event("slide.bs.carousel",{relatedTarget:j,direction:h});if(this.$element.trigger(k),!k.isDefaultPrevented()){if(this.sliding=!0,g&&this.pause(),this.$indicators.length){this.$indicators.find(".active").removeClass("active");var l=a(this.$indicators.children()[this.getItemIndex(f)]);l&&l.addClass("active")}var m=a.Event("slid.bs.carousel",{relatedTarget:j,direction:h});return a.support.transition&&this.$element.hasClass("slide")?(f.addClass(b),f[0].offsetWidth,e.addClass(h),f.addClass(h),e.one("bsTransitionEnd",function(){f.removeClass([b,h].join(" ")).addClass("active"),e.removeClass(["active",h].join(" ")),i.sliding=!1,setTimeout(function(){i.$element.trigger(m)},0)}).emulateTransitionEnd(c.TRANSITION_DURATION)):(e.removeClass("active"),f.addClass("active"),this.sliding=!1,this.$element.trigger(m)),g&&this.cycle(),this}};var d=a.fn.carousel;a.fn.carousel=b,a.fn.carousel.Constructor=c,a.fn.carousel.noConflict=function(){return a.fn.carousel=d,this};var e=function(c){var d,e=a(this),f=a(e.attr("data-target")||(d=e.attr("href"))&&d.replace(/.*(?=#[^\s]+$)/,""));if(f.hasClass("carousel")){var g=a.extend({},f.data(),e.data()),h=e.attr("data-slide-to");h&&(g.interval=!1),b.call(f,g),h&&f.data("bs.carousel").to(h),c.preventDefault()}};a(document).on("click.bs.carousel.data-api","[data-slide]",e).on("click.bs.carousel.data-api","[data-slide-to]",e),a(window).on("load",function(){a('[data-ride="carousel"]').each(function(){var c=a(this);b.call(c,c.data())})})}(jQuery),+function(a){"use strict";function b(b){var c,d=b.attr("data-target")||(c=b.attr("href"))&&c.replace(/.*(?=#[^\s]+$)/,"");return a(d)}function c(b){return this.each(function(){var c=a(this),e=c.data("bs.collapse"),f=a.extend({},d.DEFAULTS,c.data(),"object"==typeof b&&b);!e&&f.toggle&&/show|hide/.test(b)&&(f.toggle=!1),e||c.data("bs.collapse",e=new d(this,f)),"string"==typeof b&&e[b]()})}var d=function(b,c){this.$element=a(b),this.options=a.extend({},d.DEFAULTS,c),this.$trigger=a('[data-toggle="collapse"][href="#'+b.id+'"],[data-toggle="collapse"][data-target="#'+b.id+'"]'),this.transitioning=null,this.options.parent?this.$parent=this.getParent():this.addAriaAndCollapsedClass(this.$element,this.$trigger),this.options.toggle&&this.toggle()};d.VERSION="3.3.6",d.TRANSITION_DURATION=350,d.DEFAULTS={toggle:!0},d.prototype.dimension=function(){var a=this.$element.hasClass("width");return a?"width":"height"},d.prototype.show=function(){if(!this.transitioning&&!this.$element.hasClass("in")){var b,e=this.$parent&&this.$parent.children(".panel").children(".in, .collapsing");if(!(e&&e.length&&(b=e.data("bs.collapse"),b&&b.transitioning))){var f=a.Event("show.bs.collapse");if(this.$element.trigger(f),!f.isDefaultPrevented()){e&&e.length&&(c.call(e,"hide"),b||e.data("bs.collapse",null));var g=this.dimension();this.$element.removeClass("collapse").addClass("collapsing")[g](0).attr("aria-expanded",!0),this.$trigger.removeClass("collapsed").attr("aria-expanded",!0),this.transitioning=1;var h=function(){this.$element.removeClass("collapsing").addClass("collapse in")[g](""),this.transitioning=0,this.$element.trigger("shown.bs.collapse")};if(!a.support.transition)return h.call(this);var i=a.camelCase(["scroll",g].join("-"));this.$element.one("bsTransitionEnd",a.proxy(h,this)).emulateTransitionEnd(d.TRANSITION_DURATION)[g](this.$element[0][i])}}}},d.prototype.hide=function(){if(!this.transitioning&&this.$element.hasClass("in")){var b=a.Event("hide.bs.collapse");if(this.$element.trigger(b),!b.isDefaultPrevented()){var c=this.dimension();this.$element[c](this.$element[c]())[0].offsetHeight,this.$element.addClass("collapsing").removeClass("collapse in").attr("aria-expanded",!1),this.$trigger.addClass("collapsed").attr("aria-expanded",!1),this.transitioning=1;var e=function(){this.transitioning=0,this.$element.removeClass("collapsing").addClass("collapse").trigger("hidden.bs.collapse")};return a.support.transition?void this.$element[c](0).one("bsTransitionEnd",a.proxy(e,this)).emulateTransitionEnd(d.TRANSITION_DURATION):e.call(this)}}},d.prototype.toggle=function(){this[this.$element.hasClass("in")?"hide":"show"]()},d.prototype.getParent=function(){return a(this.options.parent).find('[data-toggle="collapse"][data-parent="'+this.options.parent+'"]').each(a.proxy(function(c,d){var e=a(d);this.addAriaAndCollapsedClass(b(e),e)},this)).end()},d.prototype.addAriaAndCollapsedClass=function(a,b){var c=a.hasClass("in");a.attr("aria-expanded",c),b.toggleClass("collapsed",!c).attr("aria-expanded",c)};var e=a.fn.collapse;a.fn.collapse=c,a.fn.collapse.Constructor=d,a.fn.collapse.noConflict=function(){return a.fn.collapse=e,this},a(document).on("click.bs.collapse.data-api",'[data-toggle="collapse"]',function(d){var e=a(this);e.attr("data-target")||d.preventDefault();var f=b(e),g=f.data("bs.collapse"),h=g?"toggle":e.data();c.call(f,h)})}(jQuery),+function(a){"use strict";function b(b){var c=b.attr("data-target");c||(c=b.attr("href"),c=c&&/#[A-Za-z]/.test(c)&&c.replace(/.*(?=#[^\s]*$)/,""));var d=c&&a(c);return d&&d.length?d:b.parent()}function c(c){c&&3===c.which||(a(e).remove(),a(f).each(function(){var d=a(this),e=b(d),f={relatedTarget:this};e.hasClass("open")&&(c&&"click"==c.type&&/input|textarea/i.test(c.target.tagName)&&a.contains(e[0],c.target)||(e.trigger(c=a.Event("hide.bs.dropdown",f)),c.isDefaultPrevented()||(d.attr("aria-expanded","false"),e.removeClass("open").trigger(a.Event("hidden.bs.dropdown",f)))))}))}function d(b){return this.each(function(){var c=a(this),d=c.data("bs.dropdown");d||c.data("bs.dropdown",d=new g(this)),"string"==typeof b&&d[b].call(c)})}var e=".dropdown-backdrop",f='[data-toggle="dropdown"]',g=function(b){a(b).on("click.bs.dropdown",this.toggle)};g.VERSION="3.3.6",g.prototype.toggle=function(d){var e=a(this);if(!e.is(".disabled, :disabled")){var f=b(e),g=f.hasClass("open");if(c(),!g){"ontouchstart"in document.documentElement&&!f.closest(".navbar-nav").length&&a(document.createElement("div")).addClass("dropdown-backdrop").insertAfter(a(this)).on("click",c);var h={relatedTarget:this};if(f.trigger(d=a.Event("show.bs.dropdown",h)),d.isDefaultPrevented())return;e.trigger("focus").attr("aria-expanded","true"),f.toggleClass("open").trigger(a.Event("shown.bs.dropdown",h))}return!1}},g.prototype.keydown=function(c){if(/(38|40|27|32)/.test(c.which)&&!/input|textarea/i.test(c.target.tagName)){var d=a(this);if(c.preventDefault(),c.stopPropagation(),!d.is(".disabled, :disabled")){var e=b(d),g=e.hasClass("open");if(!g&&27!=c.which||g&&27==c.which)return 27==c.which&&e.find(f).trigger("focus"),d.trigger("click");var h=" li:not(.disabled):visible a",i=e.find(".dropdown-menu"+h);if(i.length){var j=i.index(c.target);38==c.which&&j>0&&j--,40==c.which&&j<i.length-1&&j++,~j||(j=0),i.eq(j).trigger("focus")}}}};var h=a.fn.dropdown;a.fn.dropdown=d,a.fn.dropdown.Constructor=g,a.fn.dropdown.noConflict=function(){return a.fn.dropdown=h,this},a(document).on("click.bs.dropdown.data-api",c).on("click.bs.dropdown.data-api",".dropdown form",function(a){a.stopPropagation()}).on("click.bs.dropdown.data-api",f,g.prototype.toggle).on("keydown.bs.dropdown.data-api",f,g.prototype.keydown).on("keydown.bs.dropdown.data-api",".dropdown-menu",g.prototype.keydown)}(jQuery),+function(a){"use strict";function b(b,d){return this.each(function(){var e=a(this),f=e.data("bs.modal"),g=a.extend({},c.DEFAULTS,e.data(),"object"==typeof b&&b);f||e.data("bs.modal",f=new c(this,g)),"string"==typeof b?f[b](d):g.show&&f.show(d)})}var c=function(b,c){this.options=c,this.$body=a(document.body),this.$element=a(b),this.$dialog=this.$element.find(".modal-dialog"),this.$backdrop=null,this.isShown=null,this.originalBodyPad=null,this.scrollbarWidth=0,this.ignoreBackdropClick=!1,this.options.remote&&this.$element.find(".modal-content").load(this.options.remote,a.proxy(function(){this.$element.trigger("loaded.bs.modal")},this))};c.VERSION="3.3.6",c.TRANSITION_DURATION=300,c.BACKDROP_TRANSITION_DURATION=150,c.DEFAULTS={backdrop:!0,keyboard:!0,show:!0},c.prototype.toggle=function(a){return this.isShown?this.hide():this.show(a)},c.prototype.show=function(b){var d=this,e=a.Event("show.bs.modal",{relatedTarget:b});this.$element.trigger(e),this.isShown||e.isDefaultPrevented()||(this.isShown=!0,this.checkScrollbar(),this.setScrollbar(),this.$body.addClass("modal-open"),this.escape(),this.resize(),this.$element.on("click.dismiss.bs.modal",'[data-dismiss="modal"]',a.proxy(this.hide,this)),this.$dialog.on("mousedown.dismiss.bs.modal",function(){d.$element.one("mouseup.dismiss.bs.modal",function(b){a(b.target).is(d.$element)&&(d.ignoreBackdropClick=!0)})}),this.backdrop(function(){var e=a.support.transition&&d.$element.hasClass("fade");d.$element.parent().length||d.$element.appendTo(d.$body),d.$element.show().scrollTop(0),d.adjustDialog(),e&&d.$element[0].offsetWidth,d.$element.addClass("in"),d.enforceFocus();var f=a.Event("shown.bs.modal",{relatedTarget:b});e?d.$dialog.one("bsTransitionEnd",function(){d.$element.trigger("focus").trigger(f)}).emulateTransitionEnd(c.TRANSITION_DURATION):d.$element.trigger("focus").trigger(f)}))},c.prototype.hide=function(b){b&&b.preventDefault(),b=a.Event("hide.bs.modal"),this.$element.trigger(b),this.isShown&&!b.isDefaultPrevented()&&(this.isShown=!1,this.escape(),this.resize(),a(document).off("focusin.bs.modal"),this.$element.removeClass("in").off("click.dismiss.bs.modal").off("mouseup.dismiss.bs.modal"),this.$dialog.off("mousedown.dismiss.bs.modal"),a.support.transition&&this.$element.hasClass("fade")?this.$element.one("bsTransitionEnd",a.proxy(this.hideModal,this)).emulateTransitionEnd(c.TRANSITION_DURATION):this.hideModal())},c.prototype.enforceFocus=function(){a(document).off("focusin.bs.modal").on("focusin.bs.modal",a.proxy(function(a){this.$element[0]===a.target||this.$element.has(a.target).length||this.$element.trigger("focus")},this))},c.prototype.escape=function(){this.isShown&&this.options.keyboard?this.$element.on("keydown.dismiss.bs.modal",a.proxy(function(a){27==a.which&&this.hide()},this)):this.isShown||this.$element.off("keydown.dismiss.bs.modal")},c.prototype.resize=function(){this.isShown?a(window).on("resize.bs.modal",a.proxy(this.handleUpdate,this)):a(window).off("resize.bs.modal")},c.prototype.hideModal=function(){var a=this;this.$element.hide(),this.backdrop(function(){a.$body.removeClass("modal-open"),a.resetAdjustments(),a.resetScrollbar(),a.$element.trigger("hidden.bs.modal")})},c.prototype.removeBackdrop=function(){this.$backdrop&&this.$backdrop.remove(),this.$backdrop=null},c.prototype.backdrop=function(b){var d=this,e=this.$element.hasClass("fade")?"fade":"";if(this.isShown&&this.options.backdrop){var f=a.support.transition&&e;if(this.$backdrop=a(document.createElement("div")).addClass("modal-backdrop "+e).appendTo(this.$body),this.$element.on("click.dismiss.bs.modal",a.proxy(function(a){return this.ignoreBackdropClick?void(this.ignoreBackdropClick=!1):void(a.target===a.currentTarget&&("static"==this.options.backdrop?this.$element[0].focus():this.hide()))},this)),f&&this.$backdrop[0].offsetWidth,this.$backdrop.addClass("in"),!b)return;f?this.$backdrop.one("bsTransitionEnd",b).emulateTransitionEnd(c.BACKDROP_TRANSITION_DURATION):b()}else if(!this.isShown&&this.$backdrop){this.$backdrop.removeClass("in");var g=function(){d.removeBackdrop(),b&&b()};a.support.transition&&this.$element.hasClass("fade")?this.$backdrop.one("bsTransitionEnd",g).emulateTransitionEnd(c.BACKDROP_TRANSITION_DURATION):g()}else b&&b()},c.prototype.handleUpdate=function(){this.adjustDialog()},c.prototype.adjustDialog=function(){var a=this.$element[0].scrollHeight>document.documentElement.clientHeight;this.$element.css({paddingLeft:!this.bodyIsOverflowing&&a?this.scrollbarWidth:"",paddingRight:this.bodyIsOverflowing&&!a?this.scrollbarWidth:""})},c.prototype.resetAdjustments=function(){this.$element.css({paddingLeft:"",paddingRight:""})},c.prototype.checkScrollbar=function(){var a=window.innerWidth;if(!a){var b=document.documentElement.getBoundingClientRect();a=b.right-Math.abs(b.left)}this.bodyIsOverflowing=document.body.clientWidth<a,this.scrollbarWidth=this.measureScrollbar()},c.prototype.setScrollbar=function(){var a=parseInt(this.$body.css("padding-right")||0,10);this.originalBodyPad=document.body.style.paddingRight||"",this.bodyIsOverflowing&&this.$body.css("padding-right",a+this.scrollbarWidth)},c.prototype.resetScrollbar=function(){this.$body.css("padding-right",this.originalBodyPad)},c.prototype.measureScrollbar=function(){var a=document.createElement("div");a.className="modal-scrollbar-measure",this.$body.append(a);var b=a.offsetWidth-a.clientWidth;return this.$body[0].removeChild(a),b};var d=a.fn.modal;a.fn.modal=b,a.fn.modal.Constructor=c,a.fn.modal.noConflict=function(){return a.fn.modal=d,this},a(document).on("click.bs.modal.data-api",'[data-toggle="modal"]',function(c){var d=a(this),e=d.attr("href"),f=a(d.attr("data-target")||e&&e.replace(/.*(?=#[^\s]+$)/,"")),g=f.data("bs.modal")?"toggle":a.extend({remote:!/#/.test(e)&&e},f.data(),d.data());d.is("a")&&c.preventDefault(),f.one("show.bs.modal",function(a){a.isDefaultPrevented()||f.one("hidden.bs.modal",function(){d.is(":visible")&&d.trigger("focus")})}),b.call(f,g,this)})}(jQuery),+function(a){"use strict";function b(b){return this.each(function(){var d=a(this),e=d.data("bs.tooltip"),f="object"==typeof b&&b;(e||!/destroy|hide/.test(b))&&(e||d.data("bs.tooltip",e=new c(this,f)),"string"==typeof b&&e[b]())})}var c=function(a,b){this.type=null,this.options=null,this.enabled=null,this.timeout=null,this.hoverState=null,this.$element=null,this.inState=null,this.init("tooltip",a,b)};c.VERSION="3.3.6",c.TRANSITION_DURATION=150,c.DEFAULTS={animation:!0,placement:"top",selector:!1,template:'<div class="tooltip" role="tooltip"><div class="tooltip-arrow"></div><div class="tooltip-inner"></div></div>',trigger:"hover focus",title:"",delay:0,html:!1,container:!1,viewport:{selector:"body",padding:0}},c.prototype.init=function(b,c,d){if(this.enabled=!0,this.type=b,this.$element=a(c),this.options=this.getOptions(d),this.$viewport=this.options.viewport&&a(a.isFunction(this.options.viewport)?this.options.viewport.call(this,this.$element):this.options.viewport.selector||this.options.viewport),this.inState={click:!1,hover:!1,focus:!1},this.$element[0]instanceof document.constructor&&!this.options.selector)throw new Error("`selector` option must be specified when initializing "+this.type+" on the window.document object!");for(var e=this.options.trigger.split(" "),f=e.length;f--;){var g=e[f];if("click"==g)this.$element.on("click."+this.type,this.options.selector,a.proxy(this.toggle,this));else if("manual"!=g){var h="hover"==g?"mouseenter":"focusin",i="hover"==g?"mouseleave":"focusout";this.$element.on(h+"."+this.type,this.options.selector,a.proxy(this.enter,this)),this.$element.on(i+"."+this.type,this.options.selector,a.proxy(this.leave,this))}}this.options.selector?this._options=a.extend({},this.options,{trigger:"manual",selector:""}):this.fixTitle()},c.prototype.getDefaults=function(){return c.DEFAULTS},c.prototype.getOptions=function(b){return b=a.extend({},this.getDefaults(),this.$element.data(),b),b.delay&&"number"==typeof b.delay&&(b.delay={show:b.delay,hide:b.delay}),b},c.prototype.getDelegateOptions=function(){var b={},c=this.getDefaults();return this._options&&a.each(this._options,function(a,d){c[a]!=d&&(b[a]=d)}),b},c.prototype.enter=function(b){var c=b instanceof this.constructor?b:a(b.currentTarget).data("bs."+this.type);return c||(c=new this.constructor(b.currentTarget,this.getDelegateOptions()),a(b.currentTarget).data("bs."+this.type,c)),b instanceof a.Event&&(c.inState["focusin"==b.type?"focus":"hover"]=!0),c.tip().hasClass("in")||"in"==c.hoverState?void(c.hoverState="in"):(clearTimeout(c.timeout),c.hoverState="in",c.options.delay&&c.options.delay.show?void(c.timeout=setTimeout(function(){"in"==c.hoverState&&c.show()},c.options.delay.show)):c.show())},c.prototype.isInStateTrue=function(){for(var a in this.inState)if(this.inState[a])return!0;return!1},c.prototype.leave=function(b){var c=b instanceof this.constructor?b:a(b.currentTarget).data("bs."+this.type);return c||(c=new this.constructor(b.currentTarget,this.getDelegateOptions()),a(b.currentTarget).data("bs."+this.type,c)),b instanceof a.Event&&(c.inState["focusout"==b.type?"focus":"hover"]=!1),c.isInStateTrue()?void 0:(clearTimeout(c.timeout),c.hoverState="out",c.options.delay&&c.options.delay.hide?void(c.timeout=setTimeout(function(){"out"==c.hoverState&&c.hide()},c.options.delay.hide)):c.hide())},c.prototype.show=function(){var b=a.Event("show.bs."+this.type);if(this.hasContent()&&this.enabled){this.$element.trigger(b);var d=a.contains(this.$element[0].ownerDocument.documentElement,this.$element[0]);if(b.isDefaultPrevented()||!d)return;var e=this,f=this.tip(),g=this.getUID(this.type);this.setContent(),f.attr("id",g),this.$element.attr("aria-describedby",g),this.options.animation&&f.addClass("fade");var h="function"==typeof this.options.placement?this.options.placement.call(this,f[0],this.$element[0]):this.options.placement,i=/\s?auto?\s?/i,j=i.test(h);j&&(h=h.replace(i,"")||"top"),f.detach().css({top:0,left:0,display:"block"}).addClass(h).data("bs."+this.type,this),this.options.container?f.appendTo(this.options.container):f.insertAfter(this.$element),this.$element.trigger("inserted.bs."+this.type);var k=this.getPosition(),l=f[0].offsetWidth,m=f[0].offsetHeight;if(j){var n=h,o=this.getPosition(this.$viewport);h="bottom"==h&&k.bottom+m>o.bottom?"top":"top"==h&&k.top-m<o.top?"bottom":"right"==h&&k.right+l>o.width?"left":"left"==h&&k.left-l<o.left?"right":h,f.removeClass(n).addClass(h)}var p=this.getCalculatedOffset(h,k,l,m);this.applyPlacement(p,h);var q=function(){var a=e.hoverState;e.$element.trigger("shown.bs."+e.type),e.hoverState=null,"out"==a&&e.leave(e)};a.support.transition&&this.$tip.hasClass("fade")?f.one("bsTransitionEnd",q).emulateTransitionEnd(c.TRANSITION_DURATION):q()}},c.prototype.applyPlacement=function(b,c){var d=this.tip(),e=d[0].offsetWidth,f=d[0].offsetHeight,g=parseInt(d.css("margin-top"),10),h=parseInt(d.css("margin-left"),10);isNaN(g)&&(g=0),isNaN(h)&&(h=0),b.top+=g,b.left+=h,a.offset.setOffset(d[0],a.extend({using:function(a){d.css({top:Math.round(a.top),left:Math.round(a.left)})}},b),0),d.addClass("in");var i=d[0].offsetWidth,j=d[0].offsetHeight;"top"==c&&j!=f&&(b.top=b.top+f-j);var k=this.getViewportAdjustedDelta(c,b,i,j);k.left?b.left+=k.left:b.top+=k.top;var l=/top|bottom/.test(c),m=l?2*k.left-e+i:2*k.top-f+j,n=l?"offsetWidth":"offsetHeight";d.offset(b),this.replaceArrow(m,d[0][n],l)},c.prototype.replaceArrow=function(a,b,c){this.arrow().css(c?"left":"top",50*(1-a/b)+"%").css(c?"top":"left","")},c.prototype.setContent=function(){var a=this.tip(),b=this.getTitle();a.find(".tooltip-inner")[this.options.html?"html":"text"](b),a.removeClass("fade in top bottom left right")},c.prototype.hide=function(b){function d(){"in"!=e.hoverState&&f.detach(),e.$element.removeAttr("aria-describedby").trigger("hidden.bs."+e.type),b&&b()}var e=this,f=a(this.$tip),g=a.Event("hide.bs."+this.type);return this.$element.trigger(g),g.isDefaultPrevented()?void 0:(f.removeClass("in"),a.support.transition&&f.hasClass("fade")?f.one("bsTransitionEnd",d).emulateTransitionEnd(c.TRANSITION_DURATION):d(),this.hoverState=null,this)},c.prototype.fixTitle=function(){var a=this.$element;(a.attr("title")||"string"!=typeof a.attr("data-original-title"))&&a.attr("data-original-title",a.attr("title")||"").attr("title","")},c.prototype.hasContent=function(){return this.getTitle()},c.prototype.getPosition=function(b){b=b||this.$element;var c=b[0],d="BODY"==c.tagName,e=c.getBoundingClientRect();null==e.width&&(e=a.extend({},e,{width:e.right-e.left,height:e.bottom-e.top}));var f=d?{top:0,left:0}:b.offset(),g={scroll:d?document.documentElement.scrollTop||document.body.scrollTop:b.scrollTop()},h=d?{width:a(window).width(),height:a(window).height()}:null;return a.extend({},e,g,h,f)},c.prototype.getCalculatedOffset=function(a,b,c,d){return"bottom"==a?{top:b.top+b.height,left:b.left+b.width/2-c/2}:"top"==a?{top:b.top-d,left:b.left+b.width/2-c/2}:"left"==a?{top:b.top+b.height/2-d/2,left:b.left-c}:{top:b.top+b.height/2-d/2,left:b.left+b.width}},c.prototype.getViewportAdjustedDelta=function(a,b,c,d){var e={top:0,left:0};if(!this.$viewport)return e;var f=this.options.viewport&&this.options.viewport.padding||0,g=this.getPosition(this.$viewport);if(/right|left/.test(a)){var h=b.top-f-g.scroll,i=b.top+f-g.scroll+d;h<g.top?e.top=g.top-h:i>g.top+g.height&&(e.top=g.top+g.height-i)}else{var j=b.left-f,k=b.left+f+c;j<g.left?e.left=g.left-j:k>g.right&&(e.left=g.left+g.width-k)}return e},c.prototype.getTitle=function(){var a,b=this.$element,c=this.options;return a=b.attr("data-original-title")||("function"==typeof c.title?c.title.call(b[0]):c.title)},c.prototype.getUID=function(a){do a+=~~(1e6*Math.random());while(document.getElementById(a));return a},c.prototype.tip=function(){if(!this.$tip&&(this.$tip=a(this.options.template),1!=this.$tip.length))throw new Error(this.type+" `template` option must consist of exactly 1 top-level element!");return this.$tip},c.prototype.arrow=function(){return this.$arrow=this.$arrow||this.tip().find(".tooltip-arrow")},c.prototype.enable=function(){this.enabled=!0},c.prototype.disable=function(){this.enabled=!1},c.prototype.toggleEnabled=function(){this.enabled=!this.enabled},c.prototype.toggle=function(b){var c=this;b&&(c=a(b.currentTarget).data("bs."+this.type),c||(c=new this.constructor(b.currentTarget,this.getDelegateOptions()),a(b.currentTarget).data("bs."+this.type,c))),b?(c.inState.click=!c.inState.click,c.isInStateTrue()?c.enter(c):c.leave(c)):c.tip().hasClass("in")?c.leave(c):c.enter(c)},c.prototype.destroy=function(){var a=this;clearTimeout(this.timeout),this.hide(function(){a.$element.off("."+a.type).removeData("bs."+a.type),a.$tip&&a.$tip.detach(),a.$tip=null,a.$arrow=null,a.$viewport=null})};var d=a.fn.tooltip;a.fn.tooltip=b,a.fn.tooltip.Constructor=c,a.fn.tooltip.noConflict=function(){return a.fn.tooltip=d,this}}(jQuery),+function(a){"use strict";function b(b){return this.each(function(){var d=a(this),e=d.data("bs.popover"),f="object"==typeof b&&b;(e||!/destroy|hide/.test(b))&&(e||d.data("bs.popover",e=new c(this,f)),"string"==typeof b&&e[b]())})}var c=function(a,b){this.init("popover",a,b)};if(!a.fn.tooltip)throw new Error("Popover requires tooltip.js");c.VERSION="3.3.6",c.DEFAULTS=a.extend({},a.fn.tooltip.Constructor.DEFAULTS,{placement:"right",trigger:"click",content:"",template:'<div class="popover" role="tooltip"><div class="arrow"></div><h3 class="popover-title"></h3><div class="popover-content"></div></div>'}),c.prototype=a.extend({},a.fn.tooltip.Constructor.prototype),c.prototype.constructor=c,c.prototype.getDefaults=function(){return c.DEFAULTS},c.prototype.setContent=function(){var a=this.tip(),b=this.getTitle(),c=this.getContent();a.find(".popover-title")[this.options.html?"html":"text"](b),a.find(".popover-content").children().detach().end()[this.options.html?"string"==typeof c?"html":"append":"text"](c),a.removeClass("fade top bottom left right in"),a.find(".popover-title").html()||a.find(".popover-title").hide()},c.prototype.hasContent=function(){return this.getTitle()||this.getContent()},c.prototype.getContent=function(){var a=this.$element,b=this.options;return a.attr("data-content")||("function"==typeof b.content?b.content.call(a[0]):b.content)},c.prototype.arrow=function(){return this.$arrow=this.$arrow||this.tip().find(".arrow")};var d=a.fn.popover;a.fn.popover=b,a.fn.popover.Constructor=c,a.fn.popover.noConflict=function(){return a.fn.popover=d,this}}(jQuery),+function(a){"use strict";function b(c,d){this.$body=a(document.body),this.$scrollElement=a(a(c).is(document.body)?window:c),this.options=a.extend({},b.DEFAULTS,d),this.selector=(this.options.target||"")+" .nav li > a",this.offsets=[],this.targets=[],this.activeTarget=null,this.scrollHeight=0,this.$scrollElement.on("scroll.bs.scrollspy",a.proxy(this.process,this)),this.refresh(),this.process()}function c(c){return this.each(function(){var d=a(this),e=d.data("bs.scrollspy"),f="object"==typeof c&&c;e||d.data("bs.scrollspy",e=new b(this,f)),"string"==typeof c&&e[c]()})}b.VERSION="3.3.6",b.DEFAULTS={offset:10},b.prototype.getScrollHeight=function(){return this.$scrollElement[0].scrollHeight||Math.max(this.$body[0].scrollHeight,document.documentElement.scrollHeight)},b.prototype.refresh=function(){var b=this,c="offset",d=0;this.offsets=[],this.targets=[],this.scrollHeight=this.getScrollHeight(),a.isWindow(this.$scrollElement[0])||(c="position",d=this.$scrollElement.scrollTop()),this.$body.find(this.selector).map(function(){var b=a(this),e=b.data("target")||b.attr("href"),f=/^#./.test(e)&&a(e);return f&&f.length&&f.is(":visible")&&[[f[c]().top+d,e]]||null}).sort(function(a,b){return a[0]-b[0]}).each(function(){b.offsets.push(this[0]),b.targets.push(this[1])})},b.prototype.process=function(){var a,b=this.$scrollElement.scrollTop()+this.options.offset,c=this.getScrollHeight(),d=this.options.offset+c-this.$scrollElement.height(),e=this.offsets,f=this.targets,g=this.activeTarget;if(this.scrollHeight!=c&&this.refresh(),b>=d)return g!=(a=f[f.length-1])&&this.activate(a);if(g&&b<e[0])return this.activeTarget=null,this.clear();for(a=e.length;a--;)g!=f[a]&&b>=e[a]&&(void 0===e[a+1]||b<e[a+1])&&this.activate(f[a])},b.prototype.activate=function(b){this.activeTarget=b,this.clear();var c=this.selector+'[data-target="'+b+'"],'+this.selector+'[href="'+b+'"]',d=a(c).parents("li").addClass("active");
+d.parent(".dropdown-menu").length&&(d=d.closest("li.dropdown").addClass("active")),d.trigger("activate.bs.scrollspy")},b.prototype.clear=function(){a(this.selector).parentsUntil(this.options.target,".active").removeClass("active")};var d=a.fn.scrollspy;a.fn.scrollspy=c,a.fn.scrollspy.Constructor=b,a.fn.scrollspy.noConflict=function(){return a.fn.scrollspy=d,this},a(window).on("load.bs.scrollspy.data-api",function(){a('[data-spy="scroll"]').each(function(){var b=a(this);c.call(b,b.data())})})}(jQuery),+function(a){"use strict";function b(b){return this.each(function(){var d=a(this),e=d.data("bs.tab");e||d.data("bs.tab",e=new c(this)),"string"==typeof b&&e[b]()})}var c=function(b){this.element=a(b)};c.VERSION="3.3.6",c.TRANSITION_DURATION=150,c.prototype.show=function(){var b=this.element,c=b.closest("ul:not(.dropdown-menu)"),d=b.data("target");if(d||(d=b.attr("href"),d=d&&d.replace(/.*(?=#[^\s]*$)/,"")),!b.parent("li").hasClass("active")){var e=c.find(".active:last a"),f=a.Event("hide.bs.tab",{relatedTarget:b[0]}),g=a.Event("show.bs.tab",{relatedTarget:e[0]});if(e.trigger(f),b.trigger(g),!g.isDefaultPrevented()&&!f.isDefaultPrevented()){var h=a(d);this.activate(b.closest("li"),c),this.activate(h,h.parent(),function(){e.trigger({type:"hidden.bs.tab",relatedTarget:b[0]}),b.trigger({type:"shown.bs.tab",relatedTarget:e[0]})})}}},c.prototype.activate=function(b,d,e){function f(){g.removeClass("active").find("> .dropdown-menu > .active").removeClass("active").end().find('[data-toggle="tab"]').attr("aria-expanded",!1),b.addClass("active").find('[data-toggle="tab"]').attr("aria-expanded",!0),h?(b[0].offsetWidth,b.addClass("in")):b.removeClass("fade"),b.parent(".dropdown-menu").length&&b.closest("li.dropdown").addClass("active").end().find('[data-toggle="tab"]').attr("aria-expanded",!0),e&&e()}var g=d.find("> .active"),h=e&&a.support.transition&&(g.length&&g.hasClass("fade")||!!d.find("> .fade").length);g.length&&h?g.one("bsTransitionEnd",f).emulateTransitionEnd(c.TRANSITION_DURATION):f(),g.removeClass("in")};var d=a.fn.tab;a.fn.tab=b,a.fn.tab.Constructor=c,a.fn.tab.noConflict=function(){return a.fn.tab=d,this};var e=function(c){c.preventDefault(),b.call(a(this),"show")};a(document).on("click.bs.tab.data-api",'[data-toggle="tab"]',e).on("click.bs.tab.data-api",'[data-toggle="pill"]',e)}(jQuery),+function(a){"use strict";function b(b){return this.each(function(){var d=a(this),e=d.data("bs.affix"),f="object"==typeof b&&b;e||d.data("bs.affix",e=new c(this,f)),"string"==typeof b&&e[b]()})}var c=function(b,d){this.options=a.extend({},c.DEFAULTS,d),this.$target=a(this.options.target).on("scroll.bs.affix.data-api",a.proxy(this.checkPosition,this)).on("click.bs.affix.data-api",a.proxy(this.checkPositionWithEventLoop,this)),this.$element=a(b),this.affixed=null,this.unpin=null,this.pinnedOffset=null,this.checkPosition()};c.VERSION="3.3.6",c.RESET="affix affix-top affix-bottom",c.DEFAULTS={offset:0,target:window},c.prototype.getState=function(a,b,c,d){var e=this.$target.scrollTop(),f=this.$element.offset(),g=this.$target.height();if(null!=c&&"top"==this.affixed)return c>e?"top":!1;if("bottom"==this.affixed)return null!=c?e+this.unpin<=f.top?!1:"bottom":a-d>=e+g?!1:"bottom";var h=null==this.affixed,i=h?e:f.top,j=h?g:b;return null!=c&&c>=e?"top":null!=d&&i+j>=a-d?"bottom":!1},c.prototype.getPinnedOffset=function(){if(this.pinnedOffset)return this.pinnedOffset;this.$element.removeClass(c.RESET).addClass("affix");var a=this.$target.scrollTop(),b=this.$element.offset();return this.pinnedOffset=b.top-a},c.prototype.checkPositionWithEventLoop=function(){setTimeout(a.proxy(this.checkPosition,this),1)},c.prototype.checkPosition=function(){if(this.$element.is(":visible")){var b=this.$element.height(),d=this.options.offset,e=d.top,f=d.bottom,g=Math.max(a(document).height(),a(document.body).height());"object"!=typeof d&&(f=e=d),"function"==typeof e&&(e=d.top(this.$element)),"function"==typeof f&&(f=d.bottom(this.$element));var h=this.getState(g,b,e,f);if(this.affixed!=h){null!=this.unpin&&this.$element.css("top","");var i="affix"+(h?"-"+h:""),j=a.Event(i+".bs.affix");if(this.$element.trigger(j),j.isDefaultPrevented())return;this.affixed=h,this.unpin="bottom"==h?this.getPinnedOffset():null,this.$element.removeClass(c.RESET).addClass(i).trigger(i.replace("affix","affixed")+".bs.affix")}"bottom"==h&&this.$element.offset({top:g-b-f})}};var d=a.fn.affix;a.fn.affix=b,a.fn.affix.Constructor=c,a.fn.affix.noConflict=function(){return a.fn.affix=d,this},a(window).on("load",function(){a('[data-spy="affix"]').each(function(){var c=a(this),d=c.data();d.offset=d.offset||{},null!=d.offsetBottom&&(d.offset.bottom=d.offsetBottom),null!=d.offsetTop&&(d.offset.top=d.offsetTop),b.call(c,d)})})}(jQuery);
diff --git a/management/guns-admin/src/main/webapp/static/js/common/DateUtils.js b/management/guns-admin/src/main/webapp/static/js/common/DateUtils.js
new file mode 100644
index 0000000..c80481c
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/static/js/common/DateUtils.js
@@ -0,0 +1,173 @@
+var DateUtils = {
+ /**
+ * 扩展Date 对象格式化方法
+ */
+ expandDate : function() {
+ Date.prototype.format = function(fmt)
+ { //author: meizz
+ var o = {
+ "M+" : this.getMonth()+1, //月份
+ "d+" : this.getDate(), //日
+ "h+" : this.getHours()%12 == 0 ? 12 : this.getHours()%12, //小时
+ "H+" : this.getHours(), //小时
+ "m+" : this.getMinutes(), //分
+ "s+" : this.getSeconds(), //秒
+ "q+" : Math.floor((this.getMonth()+3)/3), //季度
+ "S" : this.getMilliseconds() //毫秒
+ };
+ if(/(y+)/.test(fmt))
+ fmt=fmt.replace(RegExp.$1, (this.getFullYear()+"").substr(4 - RegExp.$1.length));
+ for(var k in o)
+ if(new RegExp("("+ k +")").test(fmt))
+ fmt = fmt.replace(RegExp.$1, (RegExp.$1.length==1) ? (o[k]) : (("00"+ o[k]).substr((""+ o[k]).length)));
+ return fmt;
+ }
+ },
+ /**
+ * 获取具体年龄
+ * @param {} beginStr
+ * @param {} endStr
+ * @return {}
+ */
+ getAgeInfo: function (beginStr, endStr) {
+ var reg = new RegExp(/^(\d{1,4})(-|\/)(\d{1,2})(-|\/)(\d{1,2})(\s)(\d{1,2})(:)(\d{1,2})(:{0,1})(\d{0,2})$/);
+ var beginArr = beginStr.match(reg);
+ var endArr = endStr.match(reg);
+
+ var days = 0;
+ var month = 0;
+ var year = 0;
+
+ days = endArr[5] - beginArr[5];
+ if (days < 0) {
+ month = -1;
+ days = 30 + days;
+ }
+
+ month = month + (endArr[3] - beginArr[3]);
+ if (month < 0) {
+ year = -1;
+ month = 12 + month;
+ }
+
+ year = year + (endArr[1] - beginArr[1]);
+
+ var yearString = year > 0 ? year + "岁" : "";
+ var mnthString = month > 0 ? month + "月" : "";
+ var dayString = days > 0 ? days + "天" : "";
+
+ /*
+ * 1 如果岁 大于等于1 那么年龄取 几岁 2 如果 岁等于0 但是月大于1 那么如果天等于0天小于3天 取小时 例如出生2天 就取 48小时
+ */
+ var result = "";
+ if (year >= 1) {
+ result = yearString + mnthString;
+ } else {
+ if (month >= 1) {
+ result = days > 0 ? mnthString + dayString : mnthString;
+ } else {
+ var begDate = new Date(beginArr[1], beginArr[3] - 1, beginArr[5],
+ beginArr[7], beginArr[9], beginArr[11]);
+ var endDate = new Date(endArr[1], endArr[3] - 1, endArr[5],
+ endArr[7], endArr[9], endArr[11]);
+
+ var between = (endDate.getTime() - begDate.getTime()) / 1000;
+ days = Math.floor(between / (24 * 3600));
+ var hours = Math.floor(between / 3600 - (days * 24));
+ var dayString = days > 0 ? days + "天" : "";
+ result = days >= 3 ? dayString : days * 24 + hours + "小时";
+ }
+ }
+
+ return result;
+ },
+ /**
+ * 获取年龄，不满一天算天
+ * @param {} birthday
+ * @param {} today
+ * @return {}
+ */
+ getAge :function(birthday,today) {
+ var reg = new RegExp(/^(\d{1,4})(-|\/)(\d{1,2})(-|\/)(\d{1,2})$/);
+ var beginArr = birthday.match(reg);
+ var endArr = today.match(reg);
+
+ var days = 0;
+ var month = 0;
+ var year = 0;
+
+ days = endArr[5] - beginArr[5];
+ if (days < 0) {
+ month = -1;
+ days = 30 + days;
+ }
+
+ month = month + (endArr[3] - beginArr[3]);
+ if (month < 0) {
+ year = -1;
+ month = 12 + month;
+ }
+
+ year = year + (endArr[1] - beginArr[1]);
+
+ var yearString = year > 0 ? year + "岁" : "";
+ var mnthString = month > 0 ? month + "月" : "";
+ var dayString = days > 0 ? days + "天" : "1天";
+
+ /*
+ * 1 如果岁 大于等于1 那么年龄取 几岁 2 如果 岁等于0 但是月大于1 name取几月 3 如果不足月， 则取天数 4 不满一天算一天
+ */
+ var result = "";
+ if (year >= 1) {
+ result = yearString + mnthString + dayString;
+ } else {
+ if (month >= 1) {
+ result = days > 0 ? mnthString + dayString : mnthString;
+ } else {
+ result = dayString;
+ }
+ }
+ return result;
+ },
+ /**
+ * 获取月龄
+ * @param {} birthday
+ * @param {} today
+ * @return {}
+ */
+ getMonthage :function(birthday,today) {
+ var reg = new RegExp(/^(\d{1,4})(-|\/)(\d{1,2})(-|\/)(\d{1,2})$/);
+ var beginArr = birthday.match(reg);
+ var endArr = today.match(reg);
+
+ var days = 0;
+ var month = 0;
+ var year = 0;
+
+ days = endArr[5] - beginArr[5];
+ if (days < 0) {
+ month = -1;
+ days = 30 + days;
+ }
+
+ month = month + (endArr[3] - beginArr[3]);
+ if (month < 0) {
+ year = -1;
+ month = 12 + month;
+ }
+
+ year = year + (endArr[1] - beginArr[1]);
+
+ var result = "";
+ if (year >= 1) {
+ result = (year * 12 + month + 1) + "个月";
+ } else {
+ if (month >= 1) {
+ result = (month + 1) + "个月";
+ } else {
+ result = "1个月";
+ }
+ }
+ return result;
+ }
+}
\ No newline at end of file
diff --git a/management/guns-admin/src/main/webapp/static/js/common/Feng.js b/management/guns-admin/src/main/webapp/static/js/common/Feng.js
new file mode 100644
index 0000000..7af4423
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/static/js/common/Feng.js
@@ -0,0 +1,233 @@
+var Feng = {
+ ctxPath: "",
+ addCtx: function (ctx) {
+ if (this.ctxPath == "") {
+ this.ctxPath = ctx;
+ }
+ },
+ confirm: function (tip, ensure) {//询问框
+ parent.layer.confirm(tip, {
+ btn: ['确定', '取消']
+ }, function (index) {
+ ensure();
+ parent.layer.close(index);
+ }, function (index) {
+ parent.layer.close(index);
+ });
+ },
+ log: function (info) {
+ console.log(info);
+ },
+ alert: function (info, iconIndex) {
+ parent.layer.msg(info, {
+ icon: iconIndex
+ });
+ },
+ info: function (info) {
+ Feng.alert(info, 0);
+ },
+ success: function (info) {
+ Feng.alert(info, 1);
+ },
+ error: function (info) {
+ Feng.alert(info, 2);
+ },
+ infoDetail: function (title, info) {
+ var display = "";
+ if (typeof info == "string") {
+ display = info;
+ } else {
+ if (info instanceof Array) {
+ for (var x in info) {
+ display = display + info[x] + "<br/>";
+ }
+ } else {
+ display = info;
+ }
+ }
+ parent.layer.open({
+ title: title,
+ type: 1,
+ skin: 'layui-layer-rim', //加上边框
+ area: ['950px', '600px'], //宽高
+ content: '<div style="padding: 20px;">' + display + '</div>'
+ });
+ },
+ writeObj: function (obj) {
+ var description = "";
+ for (var i in obj) {
+ var property = obj[i];
+ description += i + " = " + property + ",";
+ }
+ layer.alert(description, {
+ skin: 'layui-layer-molv',
+ closeBtn: 0
+ });
+ },
+ showInputTree: function (inputId, inputTreeContentId, leftOffset, rightOffset) {
+ var onBodyDown = function (event) {
+ if (!(event.target.id == "menuBtn" || event.target.id == inputTreeContentId || $(event.target).parents("#" + inputTreeContentId).length > 0)) {
+ $("#" + inputTreeContentId).fadeOut("fast");
+ $("body").unbind("mousedown", onBodyDown);// mousedown当鼠标按下就可以触发，不用弹起
+ }
+ };
+
+ if (leftOffset == undefined && rightOffset == undefined) {
+ var inputDiv = $("#" + inputId);
+ var inputDivOffset = $("#" + inputId).offset();
+ $("#" + inputTreeContentId).css({
+ left: inputDivOffset.left + "px",
+ top: inputDivOffset.top + inputDiv.outerHeight() + "px"
+ }).slideDown("fast");
+ } else {
+ $("#" + inputTreeContentId).css({
+ left: leftOffset + "px",
+ top: rightOffset + "px"
+ }).slideDown("fast");
+ }
+
+ $("body").bind("mousedown", onBodyDown);
+ },
+ baseAjax: function (url, tip) {
+ var ajax = new $ax(Feng.ctxPath + url, function (data) {
+ Feng.success(tip + "成功!");
+ }, function (data) {
+ Feng.error(tip + "失败!" + data.responseJSON.message + "!");
+ });
+ return ajax;
+ },
+ changeAjax: function (url) {
+ return Feng.baseAjax(url, "修改");
+ },
+ zTreeCheckedNodes: function (zTreeId) {
+ var zTree = $.fn.zTree.getZTreeObj(zTreeId);
+ var nodes = zTree.getCheckedNodes();
+ var ids = "";
+ for (var i = 0, l = nodes.length; i < l; i++) {
+ ids += "," + nodes[i].id;
+ }
+ return ids.substring(1);
+ },
+ eventParseObject: function (event) {//获取点击事件的源对象
+ event = event ? event : window.event;
+ var obj = event.srcElement ? event.srcElement : event.target;
+ return $(obj);
+ },
+ sessionTimeoutRegistry: function () {
+ $.ajaxSetup({
+ contentType: "application/x-www-form-urlencoded;charset=utf-8",
+ complete: function (XMLHttpRequest, textStatus) {
+ //通过XMLHttpRequest取得响应头，sessionstatus，
+ var sessionstatus = XMLHttpRequest.getResponseHeader("sessionstatus");
+ if (sessionstatus == "timeout") {
+ //如果超时就处理 ，指定要跳转的页面
+ window.location = Feng.ctxPath + "/global/sessionError";
+ }
+ }
+ });
+ },
+ initValidator: function (formId, fields) {
+ $('#' + formId).bootstrapValidator({
+ feedbackIcons: {
+ valid: 'glyphicon glyphicon-ok',
+ invalid: 'glyphicon glyphicon-remove',
+ validating: 'glyphicon glyphicon-refresh'
+ },
+ fields: fields,
+ live: 'enabled',
+ message: '该字段不能为空'
+ });
+ },
+ underLineToCamel: function (str) {
+ var strArr = str.split('_');
+ for (var i = 1; i < strArr.length; i++) {
+ strArr[i] = strArr[i].charAt(0).toUpperCase() + strArr[i].substring(1);
+ }
+ var result = strArr.join('');
+ return result.charAt(0).toUpperCase() + result.substring(1);
+ },
+ randomNum: function (minNum, maxNum) {
+ switch (arguments.length) {
+ case 1:
+ return parseInt(Math.random() * minNum + 1, 10);
+ break;
+ case 2:
+ return parseInt(Math.random() * (maxNum - minNum + 1) + minNum, 10);
+ break;
+ default:
+ return 0;
+ break;
+ }
+ },
+ newCrontab: function (href, menuName) {
+ var dataUrl = href;
+ var needCreateCrontab = true;
+
+ // 轮询已有的标签，判断是否已经存在标签
+ parent.$('.J_menuTab').each(function () {
+ if ($(this).data('id') == dataUrl) {
+ if (!$(this).hasClass('active')) {
+ $(this).addClass('active').siblings('.J_menuTab').removeClass('active');
+ parent.MyCrontab.scrollToTab(this);
+ parent.MyCrontab.$('.J_mainContent .J_iframe').each(function () {
+ if ($(this).data('id') == dataUrl) {
+ $(this).show().siblings('.J_iframe').hide();
+ $(this).attr('src', $(this).attr('src'));
+ return false;
+ }
+ });
+ }
+ needCreateCrontab = false;
+ return false;
+ }
+ });
+
+ //创建标签
+ if (needCreateCrontab) {
+ var tabLink = '<a href="javascript:;" class="active J_menuTab" data-id="' + dataUrl + '">' + menuName + ' <i class="fa fa-times-circle"></i></a>';
+ parent.$('.J_menuTab').removeClass('active');
+ parent.$('.J_menuTabs .page-tabs-content').append(tabLink);
+
+ var iframeContent = '<iframe class="J_iframe" name="iframe' + Feng.randomNum(100,999) + '" width="100%" height="100%" src="' + dataUrl + '" frameborder="0" data-id="' + dataUrl + '" seamless></iframe>';
+ parent.$('.J_mainContent').find('iframe.J_iframe').hide().parents('.J_mainContent').append(iframeContent);
+ parent.MyCrontab.scrollToTab($('.J_menuTab.active'));
+ }
+ },
+ /**
+ * 获取复选框选中值
+ */
+ checkBoxIds: function (tableId) {
+ var selected = $(tableId).bootstrapTable('getSelections');
+ var ids = '';
+ if (selected.length > 0) {
+ for (var i = 0; i < selected.length; i++) {
+ ids += selected[i]['id'] + ",";
+ }
+ ids = ids.substring(0, ids.length - 1);
+ }
+ return ids;
+ }
+};
+
+/**
+ * 图片弹出预览框（可选）
+ */
+window.operateEvents = {
+ 'click .view': function (e, value, row) {
+ var imgUrl = value;
+ if(imgUrl != "") {
+ imgUrl = Feng.ctxPath + '/kaptcha/' + imgUrl;// 设置图片路径
+ } else {
+ imgUrl = Feng.ctxPath + '/static/img/NoPIC.png';// 默认无图
+ }
+ layer.open({
+ type: 1,
+ title: false,
+ closeBtn: 0,
+ area: 'auto',
+ skin: 'layui-layer-nobg', //没有背景色
+ shadeClose: true,
+ content: '<img src="' + imgUrl + '" height="100%" width="100%" />'
+ });
+ },
+};
diff --git a/management/guns-admin/src/main/webapp/static/js/common/ajax-object.js b/management/guns-admin/src/main/webapp/static/js/common/ajax-object.js
new file mode 100644
index 0000000..d3b88c0
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/static/js/common/ajax-object.js
@@ -0,0 +1,66 @@
+(function () {
+ var $ax = function (url, success, error) {
+ this.url = url;
+ this.type = "post";
+ this.data = {};
+ this.dataType = "json";
+ this.async = false;
+ this.success = success;
+ this.error = error;
+ };
+
+ $ax.prototype = {
+ start : function () {
+ var me = this;
+
+ if (this.url.indexOf("?") == -1) {
+ this.url = this.url + "?jstime=" + new Date().getTime();
+ } else {
+ this.url = this.url + "&jstime=" + new Date().getTime();
+ }
+
+ $.ajax({
+ type: this.type,
+ url: this.url,
+ dataType: this.dataType,
+ async: this.async,
+ data: this.data,
+ beforeSend: function(data) {
+
+ },
+ success: function(data) {
+ me.success(data);
+ },
+ error: function(data) {
+ me.error(data);
+ }
+ });
+ },
+
+ set : function (key, value) {
+ if (typeof key == "object") {
+ for (var i in key) {
+ if (typeof i == "function")
+ continue;
+ this.data[i] = key[i];
+ }
+ } else {
+ this.data[key] = (typeof value == "undefined") ? $("#" + key).val() : value;
+ }
+ return this;
+ },
+
+ setData : function(data){
+ this.data = data;
+ return this;
+ },
+
+ clear : function () {
+ this.data = {};
+ return this;
+ }
+ };
+
+ window.$ax = $ax;
+
+} ());
\ No newline at end of file
diff --git a/management/guns-admin/src/main/webapp/static/js/common/bootstrap-table-object.js b/management/guns-admin/src/main/webapp/static/js/common/bootstrap-table-object.js
new file mode 100644
index 0000000..330280f
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/static/js/common/bootstrap-table-object.js
@@ -0,0 +1,146 @@
+/**
+ * 初始化 BootStrap Table 的封装
+ *
+ * 约定：toolbar的id为 (bstableId + "Toolbar")
+ * 这两个参数可以获取到当前页的条数和页码
+ * var pageSize=$('#tableId').bootstrapTable('getOptions').pageSize;
+ * var pageNumber=$('#tableId').bootstrapTable('getOptions').pageNumber;
+ * @author fengshuonan
+ */
+(function () {
+ var BSTable = function (bstableId, url, columns) {
+ this.btInstance = null; //jquery和BootStrapTable绑定的对象
+ this.bstableId = bstableId;
+ this.url = Feng.ctxPath + url;
+ this.method = "post";
+ this.paginationType = "server"; //默认分页方式是服务器分页,可选项"client"
+ this.toolbarId = bstableId + "Toolbar";
+ this.columns = columns;
+ this.height = 665; //默认表格高度665
+ this.data = {};
+ this.queryParams = {}; // 向后台传递的自定义参数
+ };
+
+ BSTable.prototype = {
+ /**
+ * 初始化bootstrap table
+ */
+ init: function () {
+ var tableId = this.bstableId;
+ var me = this;
+ this.btInstance =
+ $('#' + tableId).bootstrapTable({
+ contentType: "application/x-www-form-urlencoded",
+ url: this.url, //请求地址
+ method: this.method, //ajax方式,post还是get
+ ajaxOptions: { //ajax请求的附带参数
+ data: this.data
+ },
+ toolbar: "#" + this.toolbarId,//顶部工具条
+ striped: true, //是否显示行间隔色
+ cache: false, //是否使用缓存,默认为true
+ pagination: true, //是否显示分页（*）
+ sortable: true, //是否启用排序
+ sortOrder: "desc", //排序方式
+ pageNumber: 1, //初始化加载第一页，默认第一页
+ pageSize: 14, //每页的记录行数（*）
+ pageList: [14, 50, 100], //可供选择的每页的行数（*）
+ queryParamsType: 'limit', //默认值为 'limit' ,在默认情况下 传给服务端的参数为：offset,limit,sort
+ queryParams: function (param) {
+ return $.extend(me.queryParams, param);
+ }, // 向后台传递的自定义参数
+ sidePagination: this.paginationType, //分页方式：client客户端分页，server服务端分页（*）
+ search: false, //是否显示表格搜索，此搜索是客户端搜索，不会进服务端
+ strictSearch: true, //设置为 true启用 全匹配搜索，否则为模糊搜索
+ showColumns: true, //是否显示所有的列
+ showRefresh: true, //是否显示刷新按钮
+ minimumCountColumns: 2, //最少允许的列数
+ clickToSelect: true, //是否启用点击选中行
+ searchOnEnterKey: true, //设置为 true时，按回车触发搜索方法，否则自动触发搜索方法
+ columns: this.columns, //列数组
+ pagination: true, //是否显示分页条
+ height: this.height,
+ icons: {
+ refresh: 'glyphicon-repeat',
+ toggle: 'glyphicon-list-alt',
+ columns: 'glyphicon-list'
+ },
+ iconSize: 'outline'
+ });
+ return this;
+ },
+ /**
+ * 向后台传递的自定义参数
+ * @param param
+ */
+ setQueryParams: function (param) {
+ this.queryParams = param;
+ },
+ /**
+ * 设置分页方式：server 或者 client
+ */
+ setPaginationType: function (type) {
+ this.paginationType = type;
+ },
+
+ /**
+ * 设置ajax post请求时候附带的参数
+ */
+ set: function (key, value) {
+ if (typeof key == "object") {
+ for (var i in key) {
+ if (typeof i == "function")
+ continue;
+ this.data[i] = key[i];
+ }
+ } else {
+ this.data[key] = (typeof value == "undefined") ? $("#" + key).val() : value;
+ }
+ return this;
+ },
+
+ /**
+ * 设置ajax post请求时候附带的参数
+ */
+ setData: function (data) {
+ this.data = data;
+ return this;
+ },
+
+ /**
+ * 清空ajax post请求参数
+ */
+ clear: function () {
+ this.data = {};
+ return this;
+ },
+
+ /**
+ * 刷新 bootstrap 表格
+ * Refresh the remote server data,
+ * you can set {silent: true} to refresh the data silently,
+ * and set {url: newUrl} to change the url.
+ * To supply query params specific to this request, set {query: {foo: 'bar'}}
+ */
+ refresh: function (parms) {
+ if (typeof parms != "undefined") {
+ var startTime=parms['query']['beginTime'];
+ var endTime=parms['query']['endTime'];
+ if(startTime>endTime){
+ Feng.info("搜索开始时间大于了结束时间");
+ }
+ var startTime_=parms['query']['beginTime_'];
+ var endTime_=parms['query']['endTime_'];
+ if(startTime_>endTime_){
+ Feng.info("搜索开始时间大于了结束时间");
+ }
+ this.btInstance.bootstrapTable('refresh', parms);
+ } else {
+ this.btInstance.bootstrapTable('refresh');
+ }
+ }
+ };
+
+ window.BSTable = BSTable;
+
+}());
\ No newline at end of file
diff --git a/management/guns-admin/src/main/webapp/static/js/common/laydateChoose.js b/management/guns-admin/src/main/webapp/static/js/common/laydateChoose.js
new file mode 100644
index 0000000..2103855
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/static/js/common/laydateChoose.js
@@ -0,0 +1,30 @@
+var beginTime = laydate.render({
+ elem: '#beginTime',
+ // btns: ['confirm'],// 只要“确定”按钮，默认按钮的“现在、清空”和时间范围限制冲突
+ // done: function (value, date) {// 限制开始时间小于结束时间，取消注释
+ // if (value != '') {
+ // endTime.config.min.year = date.year;
+ // endTime.config.min.month = date.month - 1;
+ // endTime.config.min.date = date.date;
+ // } else {
+ // endTime.config.min.year = '';
+ // endTime.config.min.month = '';
+ // endTime.config.min.date = '';
+ // }
+ // }
+});
+var endTime = laydate.render({
+ elem: '#endTime',
+ // btns: ['confirm'],// 只要“确定”按钮，默认按钮的“现在、清空”和时间范围限制冲突
+ // done: function (value, date) {// 限制结束时间大于开始时间，取消注释
+ // if (value != '') {
+ // beginTime.config.max.year = date.year;
+ // beginTime.config.max.month = date.month - 1;
+ // beginTime.config.max.date = date.date;
+ // } else {
+ // beginTime.config.max.year = '';
+ // beginTime.config.max.month = '';
+ // beginTime.config.max.date = '';
+ // }
+ // }
+});
\ No newline at end of file
diff --git a/management/guns-admin/src/main/webapp/static/js/common/select-list-object.js b/management/guns-admin/src/main/webapp/static/js/common/select-list-object.js
new file mode 100644
index 0000000..5ef2df1
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/static/js/common/select-list-object.js
@@ -0,0 +1,36 @@
+var SelectList = {};
+SelectList.singelSelect = function (eleName, attr, data) {
+ var result = false;
+ $("#" + eleName).find("a").each(function (i, d) {
+ if ($(this).attr(attr) == data) {
+ if ($(this).hasClass('active')) {
+ $(this).removeClass('active');
+ } else {
+ $(this).addClass('active');
+ result = true;
+ }
+ } else {
+ $(this).removeClass('active');
+ }
+ });
+ return result;
+};
+SelectList.mutiSelect = function (eleName, attr, data) {
+ var result = false;
+ $("#" + eleName).find("a").each(function (i, d) {
+ if ($(this).attr(attr) == data) {
+ if ($(this).hasClass('active')) {
+ $(this).removeClass('active');
+ } else {
+ $(this).addClass('active');
+ result = true;
+ }
+ }
+ });
+ return result;
+};
+SelectList.clearSelect = function (eleName) {
+ $("#" + eleName).find("a").each(function (i, d) {
+ $(this).removeClass('active');
+ });
+};
\ No newline at end of file
diff --git a/management/guns-admin/src/main/webapp/static/js/common/tree-table-object.js b/management/guns-admin/src/main/webapp/static/js/common/tree-table-object.js
new file mode 100644
index 0000000..a67c6d9
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/static/js/common/tree-table-object.js
@@ -0,0 +1,136 @@
+/**
+ * 初始化 Tree Table 的封装
+ *
+ * @author cyf
+ */
+(function () {
+ var BSTreeTable = function (bstableId, url, columns) {
+ this.btInstance = null; //jquery和bootstrapTreeTable绑定的对象
+ this.bstableId = bstableId;
+ this.url = Feng.ctxPath + url;
+ this.method = "post";
+ this.columns = columns;
+ this.data = {};// ajax的参数
+ this.expandColumn = null;// 展开显示的列
+ this.id = 'id';// 选取记录返回的值
+ this.code = 'code';// 用于设置父子关系
+ this.parentCode = 'pcode';// 用于设置父子关系
+ this.expandAll = false;// 是否默认全部展开
+ this.toolbarId = bstableId + "Toolbar";
+ this.height = 665; //默认表格高度665
+ };
+
+ BSTreeTable.prototype = {
+ /**
+ * 初始化bootstrap table
+ */
+ init: function () {
+ var tableId = this.bstableId;
+ this.btInstance =
+ $('#'+tableId).bootstrapTreeTable({
+ id: this.id,// 选取记录返回的值
+ code: this.code,// 用于设置父子关系
+ parentCode: this.parentCode,// 用于设置父子关系
+ rootCodeValue: this.rootCodeValue,//设置根节点code值----可指定根节点，默认为null,"",0,"0"
+ type: this.method, //请求数据的ajax类型
+ url: this.url, //请求数据的ajax的url
+ ajaxParams: this.data, //请求数据的ajax的data属性
+ expandColumn: this.expandColumn,//在哪一列上面显示展开按钮,从0开始
+ striped: true, //是否各行渐变色
+ expandAll: this.expandAll, //是否全部展开
+ columns: this.columns, //列数组
+ toolbar: "#" + this.toolbarId,//顶部工具条
+ height: this.height,
+ });
+ return this;
+ },
+
+ /**
+ * 设置在哪一列上面显示展开按钮,从0开始
+ */
+ setExpandColumn: function (expandColumn) {
+ this.expandColumn = expandColumn;
+ },
+ /**
+ * 设置记录返回的id值
+ */
+ setIdField: function (id) {
+ this.id = id;
+ },
+ /**
+ * 设置记录分级的字段
+ */
+ setCodeField: function (code) {
+ this.code = code;
+ },
+ /**
+ * 设置记录分级的父级字段
+ */
+ setParentCodeField: function (parentCode) {
+ this.parentCode = parentCode;
+ },
+ /**
+ * 设置根节点code值----可指定根节点，默认为null,"",0,"0"
+ */
+ setRootCodeValue: function (rootCodeValue) {
+ this.rootCodeValue = rootCodeValue;
+ },
+ /**
+ * 设置是否默认全部展开
+ */
+ setExpandAll: function (expandAll) {
+ this.expandAll = expandAll;
+ },
+ /**
+ * 设置表格高度
+ */
+ setHeight: function (height) {
+ this.height = height;
+ },
+ /**
+ * 设置ajax post请求时候附带的参数
+ */
+ set: function (key, value) {
+ if (typeof key == "object") {
+ for (var i in key) {
+ if (typeof i == "function")
+ continue;
+ this.data[i] = key[i];
+ }
+ } else {
+ this.data[key] = (typeof value == "undefined") ? $("#" + key).val() : value;
+ }
+ return this;
+ },
+
+ /**
+ * 设置ajax post请求时候附带的参数
+ */
+ setData: function (data) {
+ this.data = data;
+ return this;
+ },
+
+ /**
+ * 清空ajax post请求参数
+ */
+ clear: function () {
+ this.data = {};
+ return this;
+ },
+
+ /**
+ * 刷新表格
+ */
+ refresh: function (parms) {
+ if (typeof parms != "undefined") {
+ this.btInstance.bootstrapTreeTable('refresh', parms.query);// 为了兼容bootstrap-table的写法
+ } else {
+ this.btInstance.bootstrapTreeTable('refresh');
+ }
+ }
+ };
+
+ window.BSTreeTable = BSTreeTable;
+
+}());
\ No newline at end of file
diff --git a/management/guns-admin/src/main/webapp/static/js/common/web-upload-file.js b/management/guns-admin/src/main/webapp/static/js/common/web-upload-file.js
new file mode 100644
index 0000000..2b714a5
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/static/js/common/web-upload-file.js
@@ -0,0 +1,40 @@
+/**
+ * web-upload 工具类（上传文件+进度条）
+ */
+// 开始上传文件
+function UploadFileFn() {
+ $("#progressBarFile").html("0%").css("width", "0%");
+ var upFile = $("#upFile").get(0).files[0]; //input file标签
+ var formData = new FormData(); //创建FormData对象
+ var xhr = $.ajaxSettings.xhr(); //创建并返回XMLHttpRequest对象的回调函数(jQuery中$.ajax中的方法)
+ formData.append("file", upFile); //将上传name属性名(注意：一定要和 file元素中的name名相同)，和file元素追加到FormData对象中去
+ $.ajax({
+ type: "POST",
+ url: Feng.ctxPath + "/upload/file", // 后端服务器上传地址
+ data: formData, // formData数据
+ cache: false, // 是否缓存
+ async: true, // 是否异步执行
+ processData: false, // 是否处理发送的数据 (必须false才会避开jQuery对 formdata 的默认处理)
+ contentType: false, // 是否设置Content-Type请求头
+ xhr: function () {
+ if (OnProgRess && xhr.upload) {
+ xhr.upload.addEventListener("progress", OnProgRess, false);
+ return xhr;
+ }
+ },
+ success: function (data) {
+ Feng.success("上传成功！");
+ $("#fileName").val(data);
+ },
+ error: function (data) {
+ Feng.error('上传失败！');
+ }
+ });
+};
+
+// 侦查附件上传情况 ,这个方法大概0.05-0.1秒执行一次
+function OnProgRess(event) {
+ var event = event || window.event;
+ var loaded = Math.floor(100 * (event.loaded / event.total)); //已经上传的百分比
+ $("#progressBarFile").html(loaded + "%").css("width", loaded + "%");
+};
\ No newline at end of file
diff --git a/management/guns-admin/src/main/webapp/static/js/common/web-upload-image.js b/management/guns-admin/src/main/webapp/static/js/common/web-upload-image.js
new file mode 100644
index 0000000..6356e46
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/static/js/common/web-upload-image.js
@@ -0,0 +1,124 @@
+/**
+ * web-upload 工具类（上传图片）
+ *
+ * 约定：
+ * 上传按钮的id = 图片隐藏域id + 'BtnId'
+ * 图片预览框的id = 图片隐藏域id + 'PreId'
+ */
+(function() {
+
+ var $WebUploadImage = function(pictureId) {
+ this.pictureId = pictureId;
+ this.uploadBtnId = pictureId + "BtnId";
+ this.uploadPreId = pictureId + "PreId";
+ this.uploadUrl = Feng.ctxPath + '/upload/image';
+ this.fileSizeLimit = 100 * 1024 * 1024;
+ this.picWidth = 800;
+ this.picHeight = 800;
+ this.uploadBarId = null;
+ };
+
+ $WebUploadImage.prototype = {
+ /**
+ * 初始化webUploader
+ */
+ init : function() {
+ var uploader = this.create();
+ this.bindEvent(uploader);
+ return uploader;
+ },
+
+ /**
+ * 创建webuploader对象
+ */
+ create : function() {
+ var webUploader = WebUploader.create({
+ auto : true,
+ pick : {
+ id : '#' + this.uploadBtnId,
+ multiple : false,// 只上传一个
+ },
+ accept : {
+ title : 'Images',
+ extensions : 'gif,jpg,jpeg,bmp,png',
+ mimeTypes : 'image/gif,image/jpg,image/jpeg,image/bmp,image/png'
+ },
+ swf : Feng.ctxPath
+ + '/static/js/plugins/webuploader/Uploader.swf',
+ disableGlobalDnd : true,
+ duplicate : true,
+ server : this.uploadUrl,
+ fileSingleSizeLimit : this.fileSizeLimit
+ });
+
+ return webUploader;
+ },
+
+ /**
+ * 绑定事件
+ */
+ bindEvent : function(bindedObj) {
+ var me = this;
+ bindedObj.on('fileQueued', function(file) {
+ var $li = $('<div><img width="200px" height="200px"></div>');
+ var $img = $li.find('img');
+
+ $("#" + me.uploadPreId).html($li);
+
+ // 生成缩略图
+ bindedObj.makeThumb(file, function(error, src) {
+ if (error) {
+ $img.replaceWith('<span>不能预览</span>');
+ return;
+ }
+ $img.attr('src', src);
+ }, me.picWidth, me.picHeight);
+ });
+
+ // 文件上传过程中创建进度条实时显示。
+ bindedObj.on('uploadProgress', function(file, percentage) {
+ $("#"+me.uploadBarId).css("width",percentage * 100 + "%");
+ });
+
+ // 文件上传成功，给item添加成功class, 用样式标记上传成功。
+ bindedObj.on('uploadSuccess', function(file,response) {
+ Feng.success("上传成功");
+ $("#" + me.pictureId).val(response);
+ });
+
+ // 文件上传失败，显示上传出错。
+ bindedObj.on('uploadError', function(file) {
+ Feng.error("上传失败");
+ });
+
+ // 其他错误
+ bindedObj.on('error', function(type) {
+ if ("Q_EXCEED_SIZE_LIMIT" == type) {
+ Feng.error("文件大小超出了限制");
+ } else if ("Q_TYPE_DENIED" == type) {
+ Feng.error("文件类型不满足");
+ } else if ("Q_EXCEED_NUM_LIMIT" == type) {
+ Feng.error("上传数量超过限制");
+ } else if ("F_DUPLICATE" == type) {
+ Feng.error("图片选择重复");
+ } else {
+ Feng.error("上传过程中出错");
+ }
+ });
+
+ // 完成上传完了，成功或者失败
+ bindedObj.on('uploadComplete', function(file) {
+ });
+ },
+
+ /**
+ * 设置图片上传的进度条的id
+ */
+ setUploadBarId: function (id) {
+ this.uploadBarId = id;
+ }
+ };
+
+ window.$WebUploadImage = $WebUploadImage;
+
+}());
\ No newline at end of file
diff --git a/management/guns-admin/src/main/webapp/static/js/common/web-upload-object.js b/management/guns-admin/src/main/webapp/static/js/common/web-upload-object.js
new file mode 100644
index 0000000..1130036
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/static/js/common/web-upload-object.js
@@ -0,0 +1,126 @@
+/**
+ * web-upload 工具类（上传头像）
+ *
+ * 约定：
+ * 上传按钮的id = 图片隐藏域id + 'BtnId'
+ * 图片预览框的id = 图片隐藏域id + 'PreId'
+ *
+ * @author fengshuonan
+ */
+(function() {
+
+ var $WebUpload = function(pictureId) {
+ this.pictureId = pictureId;
+ this.uploadBtnId = pictureId + "BtnId";
+ this.uploadPreId = pictureId + "PreId";
+ this.uploadUrl = Feng.ctxPath + '/upload/image';
+ this.fileSizeLimit = 100 * 1024 * 1024;
+ this.picWidth = 800;
+ this.picHeight = 800;
+ this.uploadBarId = null;
+ };
+
+ $WebUpload.prototype = {
+ /**
+ * 初始化webUploader
+ */
+ init : function() {
+ var uploader = this.create();
+ this.bindEvent(uploader);
+ return uploader;
+ },
+
+ /**
+ * 创建webuploader对象
+ */
+ create : function() {
+ var webUploader = WebUploader.create({
+ auto : true,
+ pick : {
+ id : '#' + this.uploadBtnId,
+ multiple : false,// 只上传一个
+ },
+ accept : {
+ title : 'Images',
+ extensions : 'gif,jpg,jpeg,bmp,png',
+ mimeTypes : 'image/gif,image/jpg,image/jpeg,image/bmp,image/png'
+ },
+ swf : Feng.ctxPath
+ + '/static/js/plugins/webuploader/Uploader.swf',
+ disableGlobalDnd : true,
+ duplicate : true,
+ server : this.uploadUrl,
+ fileSingleSizeLimit : this.fileSizeLimit
+ });
+
+ return webUploader;
+ },
+
+ /**
+ * 绑定事件
+ */
+ bindEvent : function(bindedObj) {
+ var me = this;
+ bindedObj.on('fileQueued', function(file) {
+ var $li = $('<div><img width="100px" height="100px"></div>');
+ var $img = $li.find('img');
+
+ $("#" + me.uploadPreId).html($li);
+
+ // 生成缩略图
+ bindedObj.makeThumb(file, function(error, src) {
+ if (error) {
+ $img.replaceWith('<span>不能预览</span>');
+ return;
+ }
+ $img.attr('src', src);
+ }, me.picWidth, me.picHeight);
+ });
+
+ // 文件上传过程中创建进度条实时显示。
+ bindedObj.on('uploadProgress', function(file, percentage) {
+ $("#"+me.uploadBarId).css("width",percentage * 100 + "%");
+ });
+
+ // 文件上传成功，给item添加成功class, 用样式标记上传成功。
+ bindedObj.on('uploadSuccess', function(file,response) {
+ Feng.success("上传成功");
+ $("#" + me.pictureId).val(response);
+ });
+
+ // 文件上传失败，显示上传出错。
+ bindedObj.on('uploadError', function(file) {
+ Feng.error("上传失败");
+ });
+
+ // 其他错误
+ bindedObj.on('error', function(type) {
+ if ("Q_EXCEED_SIZE_LIMIT" == type) {
+ Feng.error("文件大小超出了限制");
+ } else if ("Q_TYPE_DENIED" == type) {
+ Feng.error("文件类型不满足");
+ } else if ("Q_EXCEED_NUM_LIMIT" == type) {
+ Feng.error("上传数量超过限制");
+ } else if ("F_DUPLICATE" == type) {
+ Feng.error("图片选择重复");
+ } else {
+ Feng.error("上传过程中出错");
+ }
+ });
+
+ // 完成上传完了，成功或者失败
+ bindedObj.on('uploadComplete', function(file) {
+ });
+ },
+
+ /**
+ * 设置图片上传的进度条的id
+ */
+ setUploadBarId: function (id) {
+ this.uploadBarId = id;
+ }
+ };
+
+ window.$WebUpload = $WebUpload;
+
+}());
\ No newline at end of file
diff --git a/management/guns-admin/src/main/webapp/static/js/common/ztree-object.js b/management/guns-admin/src/main/webapp/static/js/common/ztree-object.js
new file mode 100644
index 0000000..eee6cb2
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/static/js/common/ztree-object.js
@@ -0,0 +1,94 @@
+/**
+ * ztree插件的封装
+ */
+(function() {
+
+ var $ZTree = function(id, url) {
+ this.id = id;
+ this.url = url;
+ this.onClick = null;
+ this.settings = null;
+ this.ondblclick=null;
+ };
+
+ $ZTree.prototype = {
+ /**
+ * 初始化ztree的设置
+ */
+ initSetting : function() {
+ var settings = {
+ view : {
+ dblClickExpand : true,
+ selectedMulti : false
+ },
+ data : {simpleData : {enable : true}},
+ callback : {
+ onClick : this.onClick,
+ onDblClick:this.ondblclick
+ }
+ };
+ return settings;
+ },
+
+ /**
+ * 手动设置ztree的设置
+ */
+ setSettings : function(val) {
+ this.settings = val;
+ },
+
+ /**
+ * 初始化ztree
+ */
+ init : function() {
+ var zNodeSeting = null;
+ if(this.settings != null){
+ zNodeSeting = this.settings;
+ }else{
+ zNodeSeting = this.initSetting();
+ }
+ var zNodes = this.loadNodes();
+ $.fn.zTree.init($("#" + this.id), zNodeSeting, zNodes);
+ },
+
+ /**
+ * 绑定onclick事件
+ */
+ bindOnClick : function(func) {
+ this.onClick = func;
+ },
+ /**
+ * 绑定双击事件
+ */
+ bindOnDblClick : function(func) {
+ this.ondblclick=func;
+ },
+
+
+ /**
+ * 加载节点
+ */
+ loadNodes : function() {
+ var zNodes = null;
+ var ajax = new $ax(Feng.ctxPath + this.url, function(data) {
+ zNodes = data;
+ }, function(data) {
+ Feng.error("加载ztree信息失败!");
+ });
+ ajax.start();
+ return zNodes;
+ },
+
+ /**
+ * 获取选中的值
+ */
+ getSelectedVal : function(){
+ var zTree = $.fn.zTree.getZTreeObj(this.id);
+ var nodes = zTree.getSelectedNodes();
+ return nodes[0].name;
+ }
+ };
+
+ window.$ZTree = $ZTree;
+
+}());
\ No newline at end of file
diff --git a/management/guns-admin/src/main/webapp/static/js/contabs.js b/management/guns-admin/src/main/webapp/static/js/contabs.js
new file mode 100644
index 0000000..1d4ebde
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/static/js/contabs.js
@@ -0,0 +1,339 @@
+var MyCrontab = {};
+
+
+/**
+ * 滚动到指定选项卡
+ */
+MyCrontab.scrollToTab = function (element) {
+ var marginLeftVal = MyCrontab.calSumWidth($(element).prevAll()),
+ marginRightVal = MyCrontab.calSumWidth($(element).nextAll());
+ // 可视区域非tab宽度
+ var tabOuterWidth = MyCrontab.calSumWidth($(".content-tabs").children().not(".J_menuTabs"));
+ //可视区域tab宽度
+ var visibleWidth = $(".content-tabs").outerWidth(true) - tabOuterWidth;
+ //实际滚动宽度
+ var scrollVal = 0;
+ if ($(".page-tabs-content").outerWidth() < visibleWidth) {
+ scrollVal = 0;
+ } else if (marginRightVal <= (visibleWidth - $(element).outerWidth(true) - $(element).next().outerWidth(true))) {
+ if ((visibleWidth - $(element).next().outerWidth(true)) > marginRightVal) {
+ scrollVal = marginLeftVal;
+ var tabElement = element;
+ while ((scrollVal - $(tabElement).outerWidth()) > ($(".page-tabs-content").outerWidth() - visibleWidth)) {
+ scrollVal -= $(tabElement).prev().outerWidth();
+ tabElement = $(tabElement).prev();
+ }
+ }
+ } else if (marginLeftVal > (visibleWidth - $(element).outerWidth(true) - $(element).prev().outerWidth(true))) {
+ scrollVal = marginLeftVal - $(element).prev().outerWidth(true);
+ }
+ $('.page-tabs-content').animate({
+ marginLeft: 0 - scrollVal + 'px'
+ }, "fast");
+};
+
+
+/**
+ * 计算元素集合的总宽度
+ */
+MyCrontab.calSumWidth = function (elements) {
+ var width = 0;
+ $(elements).each(function () {
+ width += $(this).outerWidth(true);
+ });
+ return width;
+};
+
+
+$(function () {
+
+ //计算元素集合的总宽度
+ function calSumWidth(elements) {
+ MyCrontab.calSumWidth(elements);
+ }
+
+ //滚动到指定选项卡
+ function scrollToTab(element) {
+ MyCrontab.scrollToTab(element);
+ }
+
+ //查看左侧隐藏的选项卡
+ function scrollTabLeft() {
+ var marginLeftVal = Math.abs(parseInt($('.page-tabs-content').css('margin-left')));
+ // 可视区域非tab宽度
+ var tabOuterWidth = calSumWidth($(".content-tabs").children().not(".J_menuTabs"));
+ //可视区域tab宽度
+ var visibleWidth = $(".content-tabs").outerWidth(true) - tabOuterWidth;
+ //实际滚动宽度
+ var scrollVal = 0;
+ if ($(".page-tabs-content").width() < visibleWidth) {
+ return false;
+ } else {
+ var tabElement = $(".J_menuTab:first");
+ var offsetVal = 0;
+ while ((offsetVal + $(tabElement).outerWidth(true)) <= marginLeftVal) {//找到离当前tab最近的元素
+ offsetVal += $(tabElement).outerWidth(true);
+ tabElement = $(tabElement).next();
+ }
+ offsetVal = 0;
+ if (calSumWidth($(tabElement).prevAll()) > visibleWidth) {
+ while ((offsetVal + $(tabElement).outerWidth(true)) < (visibleWidth) && tabElement.length > 0) {
+ offsetVal += $(tabElement).outerWidth(true);
+ tabElement = $(tabElement).prev();
+ }
+ scrollVal = calSumWidth($(tabElement).prevAll());
+ }
+ }
+ $('.page-tabs-content').animate({
+ marginLeft: 0 - scrollVal + 'px'
+ }, "fast");
+ }
+
+ //查看右侧隐藏的选项卡
+ function scrollTabRight() {
+ var marginLeftVal = Math.abs(parseInt($('.page-tabs-content').css('margin-left')));
+ // 可视区域非tab宽度
+ var tabOuterWidth = calSumWidth($(".content-tabs").children().not(".J_menuTabs"));
+ //可视区域tab宽度
+ var visibleWidth = $(".content-tabs").outerWidth(true) - tabOuterWidth;
+ //实际滚动宽度
+ var scrollVal = 0;
+ if ($(".page-tabs-content").width() < visibleWidth) {
+ return false;
+ } else {
+ var tabElement = $(".J_menuTab:first");
+ var offsetVal = 0;
+ while ((offsetVal + $(tabElement).outerWidth(true)) <= marginLeftVal) {//找到离当前tab最近的元素
+ offsetVal += $(tabElement).outerWidth(true);
+ tabElement = $(tabElement).next();
+ }
+ offsetVal = 0;
+ while ((offsetVal + $(tabElement).outerWidth(true)) < (visibleWidth) && tabElement.length > 0) {
+ offsetVal += $(tabElement).outerWidth(true);
+ tabElement = $(tabElement).next();
+ }
+ scrollVal = calSumWidth($(tabElement).prevAll());
+ if (scrollVal > 0) {
+ $('.page-tabs-content').animate({
+ marginLeft: 0 - scrollVal + 'px'
+ }, "fast");
+ }
+ }
+ }
+
+ //通过遍历给菜单项加上data-index属性
+ $(".J_menuItem").each(function (index) {
+ if (!$(this).attr('data-index')) {
+ $(this).attr('data-index', index);
+ }
+ });
+
+ function menuItem() {
+ // 获取标识数据
+ var dataUrl = $(this).attr('href'),
+ dataIndex = $(this).data('index'),
+ menuName = $.trim($(this).text()),
+ flag = true;
+ if (dataUrl == undefined || $.trim(dataUrl).length == 0) return false;
+
+ // 选项卡菜单已存在
+ $('.J_menuTab').each(function () {
+ if ($(this).data('id') == dataUrl) {
+ if (!$(this).hasClass('active')) {
+ $(this).addClass('active').siblings('.J_menuTab').removeClass('active');
+ scrollToTab(this);
+ // 显示tab对应的内容区
+ $('.J_mainContent .J_iframe').each(function () {
+ if ($(this).data('id') == dataUrl) {
+ $(this).show().siblings('.J_iframe').hide();
+ $(this).attr('src', $(this).attr('src'));
+ return false;
+ }
+ });
+ }
+ flag = false;
+ return false;
+ }
+ });
+
+ // 选项卡菜单不存在
+ if (flag) {
+ var str = '<a href="javascript:;" class="active J_menuTab" data-id="' + dataUrl + '">' + menuName + ' <i class="fa fa-times-circle"></i></a>';
+ $('.J_menuTab').removeClass('active');
+
+ // 添加选项卡对应的iframe
+ var str1 = '<iframe class="J_iframe" name="iframe' + dataIndex + '" width="100%" height="100%" src="' + dataUrl + '" frameborder="0" data-id="' + dataUrl + '" seamless></iframe>';
+ $('.J_mainContent').find('iframe.J_iframe').hide().parents('.J_mainContent').append(str1);
+
+ //显示loading提示
+ var loading = layer.load();
+
+ $('.J_mainContent iframe:visible').load(function () {
+ //iframe加载完成后隐藏loading提示
+ layer.close(loading);
+ });
+ // 添加选项卡
+ $('.J_menuTabs .page-tabs-content').append(str);
+ scrollToTab($('.J_menuTab.active'));
+ }
+ return false;
+ }
+
+ $('.J_menuItem').on('click', menuItem);
+
+ // 关闭选项卡菜单
+ function closeTab() {
+ var closeTabId = $(this).parents('.J_menuTab').data('id');
+ var currentWidth = $(this).parents('.J_menuTab').width();
+
+ // 当前元素处于活动状态
+ if ($(this).parents('.J_menuTab').hasClass('active')) {
+
+ // 当前元素后面有同辈元素，使后面的一个元素处于活动状态
+ if ($(this).parents('.J_menuTab').next('.J_menuTab').size()) {
+
+ var activeId = $(this).parents('.J_menuTab').next('.J_menuTab:eq(0)').data('id');
+ highLightMenuItem(activeId); //高亮对应的tab菜单
+ $(this).parents('.J_menuTab').next('.J_menuTab:eq(0)').addClass('active');
+
+ $('.J_mainContent .J_iframe').each(function () {
+ if ($(this).data('id') == activeId) {
+ $(this).show().siblings('.J_iframe').hide();
+ return false;
+ }
+ });
+
+ var marginLeftVal = parseInt($('.page-tabs-content').css('margin-left'));
+ if (marginLeftVal < 0) {
+ $('.page-tabs-content').animate({
+ marginLeft: (marginLeftVal + currentWidth) + 'px'
+ }, "fast");
+ }
+
+ // 移除当前选项卡
+ $(this).parents('.J_menuTab').remove();
+
+ // 移除tab对应的内容区
+ $('.J_mainContent .J_iframe').each(function () {
+ if ($(this).data('id') == closeTabId) {
+ $(this).remove();
+ return false;
+ }
+ });
+ }
+
+ // 当前元素后面没有同辈元素，使当前元素的上一个元素处于活动状态
+ if ($(this).parents('.J_menuTab').prev('.J_menuTab').size()) {
+ var activeId = $(this).parents('.J_menuTab').prev('.J_menuTab:last').data('id');
+ $(this).parents('.J_menuTab').prev('.J_menuTab:last').addClass('active');
+ $('.J_mainContent .J_iframe').each(function () {
+ if ($(this).data('id') == activeId) {
+ $(this).show().siblings('.J_iframe').hide();
+ return false;
+ }
+ });
+
+ // 移除当前选项卡
+ $(this).parents('.J_menuTab').remove();
+
+ // 移除tab对应的内容区
+ $('.J_mainContent .J_iframe').each(function () {
+ if ($(this).data('id') == closeTabId) {
+ $(this).remove();
+ return false;
+ }
+ });
+ highLightMenuItem(activeId);//高亮对应的tab菜单
+ }
+ }
+ // 当前元素不处于活动状态
+ else {
+ // 移除当前选项卡
+ $(this).parents('.J_menuTab').remove();
+
+ // 移除相应tab对应的内容区
+ $('.J_mainContent .J_iframe').each(function () {
+ if ($(this).data('id') == closeTabId) {
+ $(this).remove();
+ return false;
+ }
+ });
+ scrollToTab($('.J_menuTab.active'));
+ }
+ return false;
+ }
+
+ $('.J_menuTabs').on('click', '.J_menuTab i', closeTab);
+
+ //关闭其他选项卡
+ function closeOtherTabs() {
+ $('.page-tabs-content').children("[data-id]").not(":first").not(".active").each(function () {
+ $('.J_iframe[data-id="' + $(this).data('id') + '"]').remove();
+ $(this).remove();
+ });
+ $('.page-tabs-content').css("margin-left", "0");
+ }
+
+ $('.J_tabCloseOther').on('click', closeOtherTabs);
+
+ //滚动到已激活的选项卡
+ function showActiveTab() {
+ scrollToTab($('.J_menuTab.active'));
+ }
+
+ $('.J_tabShowActive').on('click', showActiveTab);
+
+
+ // 点击选项卡菜单
+ function activeTab() {
+ if (!$(this).hasClass('active')) {
+ var currentId = $(this).data('id');
+ highLightMenuItem(currentId); //高亮对应的tab菜单
+ // 显示tab对应的内容区
+ $('.J_mainContent .J_iframe').each(function () {
+ if ($(this).data('id') == currentId) {
+ $(this).show().siblings('.J_iframe').hide();
+ return false;
+ }
+ });
+ $(this).addClass('active').siblings('.J_menuTab').removeClass('active');
+ scrollToTab(this);
+ }
+ }
+
+ $('.J_menuTabs').on('click', '.J_menuTab', activeTab);
+
+ //刷新iframe
+ function refreshTab() {
+ var target = $('.J_iframe[data-id="' + $(this).data('id') + '"]');
+ var url = target.attr('src');
+ //显示loading提示
+ // var loading = layer.load();
+ // target.attr('src', url).load(function () {
+ // //关闭loading提示
+ // layer.close(loading);
+ // });
+ }
+
+ $('.J_menuTabs').on('dblclick', '.J_menuTab', refreshTab);
+
+ // 左移按扭
+ $('.J_tabLeft').on('click', scrollTabLeft);
+
+ // 右移按扭
+ $('.J_tabRight').on('click', scrollTabRight);
+
+ // 关闭全部
+ $('.J_tabCloseAll').on('click', function () {
+ $('.page-tabs-content').children("[data-id]").not(":first").each(function () {
+ $('.J_iframe[data-id="' + $(this).data('id') + '"]').remove();
+ $(this).remove();
+ });
+ $('.page-tabs-content').children("[data-id]:first").each(function () {
+ $('.J_iframe[data-id="' + $(this).data('id') + '"]').show();
+ $(this).addClass("active");
+ });
+ $('.page-tabs-content').css("margin-left", "0");
+ });
+
+});
diff --git a/management/guns-admin/src/main/webapp/static/js/content.js b/management/guns-admin/src/main/webapp/static/js/content.js
new file mode 100644
index 0000000..8252e9f
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/static/js/content.js
@@ -0,0 +1,98 @@
+var $parentNode = window.parent.document;
+
+function $childNode(name) {
+ return window.frames[name]
+}
+
+// tooltips
+$('.tooltip-demo').tooltip({
+ selector: "[data-toggle=tooltip]",
+ container: "body"
+});
+
+// 使用animation.css修改Bootstrap Modal
+$('.modal').appendTo("body");
+
+$("[data-toggle=popover]").popover();
+
+//折叠ibox
+$('.collapse-link').click(function () {
+ var ibox = $(this).closest('div.ibox');
+ var button = $(this).find('i');
+ var content = ibox.find('div.ibox-content');
+ content.slideToggle(200);
+ button.toggleClass('fa-chevron-up').toggleClass('fa-chevron-down');
+ ibox.toggleClass('').toggleClass('border-bottom');
+ setTimeout(function () {
+ ibox.resize();
+ ibox.find('[id^=map-]').resize();
+ }, 50);
+});
+
+//关闭ibox
+$('.close-link').click(function () {
+ var content = $(this).closest('div.ibox');
+ content.remove();
+});
+
+//判断当前页面是否在iframe中
+if (top == this) {
+ var gohome = '<div class="gohome"><a class="animated bounceInUp" href="' + Feng.ctxPath + '/" title="返回首页"><i class="fa fa-home"></i></a></div>';
+ $('body').append(gohome);
+}
+
+//animation.css
+function animationHover(element, animation) {
+ element = $(element);
+ element.hover(
+ function () {
+ element.addClass('animated ' + animation);
+ },
+ function () {
+ //动画完成之前移除class
+ window.setTimeout(function () {
+ element.removeClass('animated ' + animation);
+ }, 2000);
+ });
+}
+
+//拖动面板
+function WinMove() {
+ var element = "[class*=col]";
+ var handle = ".ibox-title";
+ var connect = "[class*=col]";
+ $(element).sortable({
+ handle: handle,
+ connectWith: connect,
+ tolerance: 'pointer',
+ forcePlaceholderSize: true,
+ opacity: 0.8,
+ })
+ .disableSelection();
+};
+
+$(function () {
+//初始化下拉框
+ var config = {
+ '.chosen-select': {},
+ '.chosen-select-deselect': {
+ allow_single_deselect: true
+ },
+ '.chosen-select-no-single': {
+ disable_search_threshold: 10
+ },
+ '.chosen-select-no-results': {
+ no_results_text: '没有要显示的数据!'
+ },
+ '.chosen-select-width': {
+ width: "95%"
+ }
+ }
+ for (var selector in config) {
+ $(selector).chosen(config[selector]);
+ }
+ $('.i-checks').iCheck({
+ checkboxClass: 'icheckbox_square-green',
+ radioClass: 'iradio_square-green',
+ });
+});
\ No newline at end of file
diff --git a/management/guns-admin/src/main/webapp/static/js/hplus.js b/management/guns-admin/src/main/webapp/static/js/hplus.js
new file mode 100644
index 0000000..b639026
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/static/js/hplus.js
@@ -0,0 +1,294 @@
+//自定义js
+
+//公共配置
+
+
+$(document).ready(function () {
+
+ // MetsiMenu
+ $('#side-menu').metisMenu();
+ // 打开右侧边栏
+ $('.right-sidebar-toggle').click(function () {
+ $('#right-sidebar').toggleClass('sidebar-open');
+ });
+
+ // 右侧边栏使用slimscroll
+ $('.sidebar-container').slimScroll({
+ height: '100%',
+ railOpacity: 0.4,
+ wheelStep: 10
+ });
+
+ // 打开聊天窗口
+ $('.open-small-chat').click(function () {
+ $(this).children().toggleClass('fa-comments').toggleClass('fa-remove');
+ $('.small-chat-box').toggleClass('active');
+ });
+
+ // 聊天窗口使用slimscroll
+ $('.small-chat-box .content').slimScroll({
+ height: '234px',
+ railOpacity: 0.4
+ });
+
+ // Small todo handler
+ $('.check-link').click(function () {
+ var button = $(this).find('i');
+ var label = $(this).next('span');
+ button.toggleClass('fa-check-square').toggleClass('fa-square-o');
+ label.toggleClass('todo-completed');
+ return false;
+ });
+
+ //固定菜单栏
+ $(function () {
+ $('.sidebar-collapse').slimScroll({
+ height: '100%',
+ railOpacity: 0.9,
+ alwaysVisible: false
+ });
+ });
+
+
+ // 菜单切换
+ $('.navbar-minimalize').click(function () {
+ $("body").toggleClass("mini-navbar");
+ SmoothlyMenu();
+ });
+
+
+ // 侧边栏高度
+ function fix_height() {
+ var heightWithoutNavbar = $("body > #wrapper").height() - 61;
+ $(".sidebard-panel").css("min-height", heightWithoutNavbar + "px");
+ }
+ fix_height();
+
+ $(window).bind("load resize click scroll", function () {
+ if (!$("body").hasClass('body-small')) {
+ fix_height();
+ }
+ });
+
+ //侧边栏滚动
+ $(window).scroll(function () {
+ if ($(window).scrollTop() > 0 && !$('body').hasClass('fixed-nav')) {
+ $('#right-sidebar').addClass('sidebar-top');
+ } else {
+ $('#right-sidebar').removeClass('sidebar-top');
+ }
+ });
+
+ $('.full-height-scroll').slimScroll({
+ height: '100%'
+ });
+
+ $('#side-menu>li').click(function () {
+ if ($('body').hasClass('mini-navbar')) {
+ NavToggle();
+ }
+ });
+ $('#side-menu>li li a').click(function () {
+ if ($(window).width() < 769) {
+ NavToggle();
+ }
+ });
+
+ //点击菜单的时候高亮显示菜单
+ $("a[name='tabMenuItem']").click(function(){
+ clearTabMenuItem();
+ $(this).addClass("tab-menu-selected");
+ });
+
+ $('.nav-close').click(NavToggle);
+
+ //ios浏览器兼容性处理
+ if (/(iPhone|iPad|iPod|iOS)/i.test(navigator.userAgent)) {
+ $('#content-main').css('overflow-y', 'auto');
+ }
+
+});
+
+$(window).bind("load resize", function () {
+ if ($(this).width() < 769) {
+ $('body').addClass('mini-navbar');
+ $('.navbar-static-side').fadeIn();
+ }
+});
+
+function clearTabMenuItem(){
+ $("a[name='tabMenuItem']").each(function(){
+ $(this).removeClass("tab-menu-selected");
+ });
+}
+
+function highLightMenuItem(hrefVal){
+ clearTabMenuItem();
+ $("a[href='" + hrefVal + "']").addClass("tab-menu-selected");
+}
+
+function NavToggle() {
+ $('.navbar-minimalize').trigger('click');
+}
+
+function SmoothlyMenu() {
+ if (!$('body').hasClass('mini-navbar')) {
+ $('#side-menu').hide();
+ setTimeout(
+ function () {
+ $('#side-menu').fadeIn(500);
+ }, 100);
+ } else if ($('body').hasClass('fixed-sidebar')) {
+ $('#side-menu').hide();
+ setTimeout(
+ function () {
+ $('#side-menu').fadeIn(500);
+ }, 300);
+ } else {
+ $('#side-menu').removeAttr('style');
+ }
+}
+
+
+//主题设置
+$(function () {
+
+ // 顶部菜单固定
+ $('#fixednavbar').click(function () {
+ if ($('#fixednavbar').is(':checked')) {
+ $(".navbar-static-top").removeClass('navbar-static-top').addClass('navbar-fixed-top');
+ $("body").removeClass('boxed-layout');
+ $("body").addClass('fixed-nav');
+ $('#boxedlayout').prop('checked', false);
+
+ if (localStorageSupport) {
+ localStorage.setItem("boxedlayout", 'off');
+ }
+
+ if (localStorageSupport) {
+ localStorage.setItem("fixednavbar", 'on');
+ }
+ } else {
+ $(".navbar-fixed-top").removeClass('navbar-fixed-top').addClass('navbar-static-top');
+ $("body").removeClass('fixed-nav');
+
+ if (localStorageSupport) {
+ localStorage.setItem("fixednavbar", 'off');
+ }
+ }
+ });
+
+
+ // 收起左侧菜单
+ $('#collapsemenu').click(function () {
+ if ($('#collapsemenu').is(':checked')) {
+ $("body").addClass('mini-navbar');
+ SmoothlyMenu();
+
+ if (localStorageSupport) {
+ localStorage.setItem("collapse_menu", 'on');
+ }
+
+ } else {
+ $("body").removeClass('mini-navbar');
+ SmoothlyMenu();
+
+ if (localStorageSupport) {
+ localStorage.setItem("collapse_menu", 'off');
+ }
+ }
+ });
+
+ // 固定宽度
+ $('#boxedlayout').click(function () {
+ if ($('#boxedlayout').is(':checked')) {
+ $("body").addClass('boxed-layout');
+ $('#fixednavbar').prop('checked', false);
+ $(".navbar-fixed-top").removeClass('navbar-fixed-top').addClass('navbar-static-top');
+ $("body").removeClass('fixed-nav');
+ if (localStorageSupport) {
+ localStorage.setItem("fixednavbar", 'off');
+ }
+
+
+ if (localStorageSupport) {
+ localStorage.setItem("boxedlayout", 'on');
+ }
+ } else {
+ $("body").removeClass('boxed-layout');
+
+ if (localStorageSupport) {
+ localStorage.setItem("boxedlayout", 'off');
+ }
+ }
+ });
+
+ // 默认主题
+ $('.s-skin-0').click(function () {
+ $("body").removeClass("skin-1");
+ $("body").removeClass("skin-2");
+ $("body").removeClass("skin-3");
+ return false;
+ });
+
+ // 蓝色主题
+ $('.s-skin-1').click(function () {
+ $("body").removeClass("skin-2");
+ $("body").removeClass("skin-3");
+ $("body").addClass("skin-1");
+ return false;
+ });
+
+ // 黄色主题
+ $('.s-skin-3').click(function () {
+ $("body").removeClass("skin-1");
+ $("body").removeClass("skin-2");
+ $("body").addClass("skin-3");
+ return false;
+ });
+
+ if (localStorageSupport) {
+ var collapse = localStorage.getItem("collapse_menu");
+ var fixednavbar = localStorage.getItem("fixednavbar");
+ var boxedlayout = localStorage.getItem("boxedlayout");
+
+ if (collapse == 'on') {
+ $('#collapsemenu').prop('checked', 'checked')
+ }
+ if (fixednavbar == 'on') {
+ $('#fixednavbar').prop('checked', 'checked')
+ }
+ if (boxedlayout == 'on') {
+ $('#boxedlayout').prop('checked', 'checked')
+ }
+ }
+
+ if (localStorageSupport) {
+
+ var collapse = localStorage.getItem("collapse_menu");
+ var fixednavbar = localStorage.getItem("fixednavbar");
+ var boxedlayout = localStorage.getItem("boxedlayout");
+
+ var body = $('body');
+
+ if (collapse == 'on') {
+ if (!body.hasClass('body-small')) {
+ body.addClass('mini-navbar');
+ }
+ }
+
+ if (fixednavbar == 'on') {
+ $(".navbar-static-top").removeClass('navbar-static-top').addClass('navbar-fixed-top');
+ body.addClass('fixed-nav');
+ }
+
+ if (boxedlayout == 'on') {
+ body.addClass('boxed-layout');
+ }
+ }
+});
+
+//判断浏览器是否支持html5本地存储
+function localStorageSupport() {
+ return (('localStorage' in window) && window['localStorage'] !== null)
+}
diff --git a/management/guns-admin/src/main/webapp/static/js/jquery.min.js b/management/guns-admin/src/main/webapp/static/js/jquery.min.js
new file mode 100644
index 0000000..49990d6
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/static/js/jquery.min.js
@@ -0,0 +1,4 @@
+/*! jQuery v2.1.4 | (c) 2005, 2015 jQuery Foundation, Inc. | jquery.org/license */
+!function(a,b){"object"==typeof module&&"object"==typeof module.exports?module.exports=a.document?b(a,!0):function(a){if(!a.document)throw new Error("jQuery requires a window with a document");return b(a)}:b(a)}("undefined"!=typeof window?window:this,function(a,b){var c=[],d=c.slice,e=c.concat,f=c.push,g=c.indexOf,h={},i=h.toString,j=h.hasOwnProperty,k={},l=a.document,m="2.1.4",n=function(a,b){return new n.fn.init(a,b)},o=/^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g,p=/^-ms-/,q=/-([\da-z])/gi,r=function(a,b){return b.toUpperCase()};n.fn=n.prototype={jquery:m,constructor:n,selector:"",length:0,toArray:function(){return d.call(this)},get:function(a){return null!=a?0>a?this[a+this.length]:this[a]:d.call(this)},pushStack:function(a){var b=n.merge(this.constructor(),a);return b.prevObject=this,b.context=this.context,b},each:function(a,b){return n.each(this,a,b)},map:function(a){return this.pushStack(n.map(this,function(b,c){return a.call(b,c,b)}))},slice:function(){return this.pushStack(d.apply(this,arguments))},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},eq:function(a){var b=this.length,c=+a+(0>a?b:0);return this.pushStack(c>=0&&b>c?[this[c]]:[])},end:function(){return this.prevObject||this.constructor(null)},push:f,sort:c.sort,splice:c.splice},n.extend=n.fn.extend=function(){var a,b,c,d,e,f,g=arguments[0]||{},h=1,i=arguments.length,j=!1;for("boolean"==typeof g&&(j=g,g=arguments[h]||{},h++),"object"==typeof g||n.isFunction(g)||(g={}),h===i&&(g=this,h--);i>h;h++)if(null!=(a=arguments[h]))for(b in a)c=g[b],d=a[b],g!==d&&(j&&d&&(n.isPlainObject(d)||(e=n.isArray(d)))?(e?(e=!1,f=c&&n.isArray(c)?c:[]):f=c&&n.isPlainObject(c)?c:{},g[b]=n.extend(j,f,d)):void 0!==d&&(g[b]=d));return g},n.extend({expando:"jQuery"+(m+Math.random()).replace(/\D/g,""),isReady:!0,error:function(a){throw new Error(a)},noop:function(){},isFunction:function(a){return"function"===n.type(a)},isArray:Array.isArray,isWindow:function(a){return null!=a&&a===a.window},isNumeric:function(a){return!n.isArray(a)&&a-parseFloat(a)+1>=0},isPlainObject:function(a){return"object"!==n.type(a)||a.nodeType||n.isWindow(a)?!1:a.constructor&&!j.call(a.constructor.prototype,"isPrototypeOf")?!1:!0},isEmptyObject:function(a){var b;for(b in a)return!1;return!0},type:function(a){return null==a?a+"":"object"==typeof a||"function"==typeof a?h[i.call(a)]||"object":typeof a},globalEval:function(a){var b,c=eval;a=n.trim(a),a&&(1===a.indexOf("use strict")?(b=l.createElement("script"),b.text=a,l.head.appendChild(b).parentNode.removeChild(b)):c(a))},camelCase:function(a){return a.replace(p,"ms-").replace(q,r)},nodeName:function(a,b){return a.nodeName&&a.nodeName.toLowerCase()===b.toLowerCase()},each:function(a,b,c){var d,e=0,f=a.length,g=s(a);if(c){if(g){for(;f>e;e++)if(d=b.apply(a[e],c),d===!1)break}else for(e in a)if(d=b.apply(a[e],c),d===!1)break}else if(g){for(;f>e;e++)if(d=b.call(a[e],e,a[e]),d===!1)break}else for(e in a)if(d=b.call(a[e],e,a[e]),d===!1)break;return a},trim:function(a){return null==a?"":(a+"").replace(o,"")},makeArray:function(a,b){var c=b||[];return null!=a&&(s(Object(a))?n.merge(c,"string"==typeof a?[a]:a):f.call(c,a)),c},inArray:function(a,b,c){return null==b?-1:g.call(b,a,c)},merge:function(a,b){for(var c=+b.length,d=0,e=a.length;c>d;d++)a[e++]=b[d];return a.length=e,a},grep:function(a,b,c){for(var d,e=[],f=0,g=a.length,h=!c;g>f;f++)d=!b(a[f],f),d!==h&&e.push(a[f]);return e},map:function(a,b,c){var d,f=0,g=a.length,h=s(a),i=[];if(h)for(;g>f;f++)d=b(a[f],f,c),null!=d&&i.push(d);else for(f in a)d=b(a[f],f,c),null!=d&&i.push(d);return e.apply([],i)},guid:1,proxy:function(a,b){var c,e,f;return"string"==typeof b&&(c=a[b],b=a,a=c),n.isFunction(a)?(e=d.call(arguments,2),f=function(){return a.apply(b||this,e.concat(d.call(arguments)))},f.guid=a.guid=a.guid||n.guid++,f):void 0},now:Date.now,support:k}),n.each("Boolean Number String Function Array Date RegExp Object Error".split(" "),function(a,b){h["[object "+b+"]"]=b.toLowerCase()});function s(a){var b="length"in a&&a.length,c=n.type(a);return"function"===c||n.isWindow(a)?!1:1===a.nodeType&&b?!0:"array"===c||0===b||"number"==typeof b&&b>0&&b-1 in a}var t=function(a){var b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u="sizzle"+1*new Date,v=a.document,w=0,x=0,y=ha(),z=ha(),A=ha(),B=function(a,b){return a===b&&(l=!0),0},C=1<<31,D={}.hasOwnProperty,E=[],F=E.pop,G=E.push,H=E.push,I=E.slice,J=function(a,b){for(var c=0,d=a.length;d>c;c++)if(a[c]===b)return c;return-1},K="checked|selected|async|autofocus|autoplay|controls|defer|disabled|hidden|ismap|loop|multiple|open|readonly|required|scoped",L="[\\x20\\t\\r\\n\\f]",M="(?:\\\\.|[\\w-]|[^\\x00-\\xa0])+",N=M.replace("w","w#"),O="\\["+L+"*("+M+")(?:"+L+"*([*^$|!~]?=)"+L+"*(?:'((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\"|("+N+"))|)"+L+"*\\]",P=":("+M+")(?:\\((('((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\")|((?:\\\\.|[^\\\\()[\\]]|"+O+")*)|.*)\\)|)",Q=new RegExp(L+"+","g"),R=new RegExp("^"+L+"+|((?:^|[^\\\\])(?:\\\\.)*)"+L+"+$","g"),S=new RegExp("^"+L+"*,"+L+"*"),T=new RegExp("^"+L+"*([>+~]|"+L+")"+L+"*"),U=new RegExp("="+L+"*([^\\]'\"]*?)"+L+"*\\]","g"),V=new RegExp(P),W=new RegExp("^"+N+"$"),X={ID:new RegExp("^#("+M+")"),CLASS:new RegExp("^\\.("+M+")"),TAG:new RegExp("^("+M.replace("w","w*")+")"),ATTR:new RegExp("^"+O),PSEUDO:new RegExp("^"+P),CHILD:new RegExp("^:(only|first|last|nth|nth-last)-(child|of-type)(?:\\("+L+"*(even|odd|(([+-]|)(\\d*)n|)"+L+"*(?:([+-]|)"+L+"*(\\d+)|))"+L+"*\\)|)","i"),bool:new RegExp("^(?:"+K+")$","i"),needsContext:new RegExp("^"+L+"*[>+~]|:(even|odd|eq|gt|lt|nth|first|last)(?:\\("+L+"*((?:-\\d)?\\d*)"+L+"*\\)|)(?=[^-]|$)","i")},Y=/^(?:input|select|textarea|button)$/i,Z=/^h\d$/i,$=/^[^{]+\{\s*\[native \w/,_=/^(?:#([\w-]+)|(\w+)|\.([\w-]+))$/,aa=/[+~]/,ba=/'|\\/g,ca=new RegExp("\\\\([\\da-f]{1,6}"+L+"?|("+L+")|.)","ig"),da=function(a,b,c){var d="0x"+b-65536;return d!==d||c?b:0>d?String.fromCharCode(d+65536):String.fromCharCode(d>>10|55296,1023&d|56320)},ea=function(){m()};try{H.apply(E=I.call(v.childNodes),v.childNodes),E[v.childNodes.length].nodeType}catch(fa){H={apply:E.length?function(a,b){G.apply(a,I.call(b))}:function(a,b){var c=a.length,d=0;while(a[c++]=b[d++]);a.length=c-1}}}function ga(a,b,d,e){var f,h,j,k,l,o,r,s,w,x;if((b?b.ownerDocument||b:v)!==n&&m(b),b=b||n,d=d||[],k=b.nodeType,"string"!=typeof a||!a||1!==k&&9!==k&&11!==k)return d;if(!e&&p){if(11!==k&&(f=_.exec(a)))if(j=f[1]){if(9===k){if(h=b.getElementById(j),!h||!h.parentNode)return d;if(h.id===j)return d.push(h),d}else if(b.ownerDocument&&(h=b.ownerDocument.getElementById(j))&&t(b,h)&&h.id===j)return d.push(h),d}else{if(f[2])return H.apply(d,b.getElementsByTagName(a)),d;if((j=f[3])&&c.getElementsByClassName)return H.apply(d,b.getElementsByClassName(j)),d}if(c.qsa&&(!q||!q.test(a))){if(s=r=u,w=b,x=1!==k&&a,1===k&&"object"!==b.nodeName.toLowerCase()){o=g(a),(r=b.getAttribute("id"))?s=r.replace(ba,"\\$&"):b.setAttribute("id",s),s="[id='"+s+"'] ",l=o.length;while(l--)o[l]=s+ra(o[l]);w=aa.test(a)&&pa(b.parentNode)||b,x=o.join(",")}if(x)try{return H.apply(d,w.querySelectorAll(x)),d}catch(y){}finally{r||b.removeAttribute("id")}}}return i(a.replace(R,"$1"),b,d,e)}function ha(){var a=[];function b(c,e){return a.push(c+" ")>d.cacheLength&&delete b[a.shift()],b[c+" "]=e}return b}function ia(a){return a[u]=!0,a}function ja(a){var b=n.createElement("div");try{return!!a(b)}catch(c){return!1}finally{b.parentNode&&b.parentNode.removeChild(b),b=null}}function ka(a,b){var c=a.split("|"),e=a.length;while(e--)d.attrHandle[c[e]]=b}function la(a,b){var c=b&&a,d=c&&1===a.nodeType&&1===b.nodeType&&(~b.sourceIndex||C)-(~a.sourceIndex||C);if(d)return d;if(c)while(c=c.nextSibling)if(c===b)return-1;return a?1:-1}function ma(a){return function(b){var c=b.nodeName.toLowerCase();return"input"===c&&b.type===a}}function na(a){return function(b){var c=b.nodeName.toLowerCase();return("input"===c||"button"===c)&&b.type===a}}function oa(a){return ia(function(b){return b=+b,ia(function(c,d){var e,f=a([],c.length,b),g=f.length;while(g--)c[e=f[g]]&&(c[e]=!(d[e]=c[e]))})})}function pa(a){return a&&"undefined"!=typeof a.getElementsByTagName&&a}c=ga.support={},f=ga.isXML=function(a){var b=a&&(a.ownerDocument||a).documentElement;return b?"HTML"!==b.nodeName:!1},m=ga.setDocument=function(a){var b,e,g=a?a.ownerDocument||a:v;return g!==n&&9===g.nodeType&&g.documentElement?(n=g,o=g.documentElement,e=g.defaultView,e&&e!==e.top&&(e.addEventListener?e.addEventListener("unload",ea,!1):e.attachEvent&&e.attachEvent("onunload",ea)),p=!f(g),c.attributes=ja(function(a){return a.className="i",!a.getAttribute("className")}),c.getElementsByTagName=ja(function(a){return a.appendChild(g.createComment("")),!a.getElementsByTagName("*").length}),c.getElementsByClassName=$.test(g.getElementsByClassName),c.getById=ja(function(a){return o.appendChild(a).id=u,!g.getElementsByName||!g.getElementsByName(u).length}),c.getById?(d.find.ID=function(a,b){if("undefined"!=typeof b.getElementById&&p){var c=b.getElementById(a);return c&&c.parentNode?[c]:[]}},d.filter.ID=function(a){var b=a.replace(ca,da);return function(a){return a.getAttribute("id")===b}}):(delete d.find.ID,d.filter.ID=function(a){var b=a.replace(ca,da);return function(a){var c="undefined"!=typeof a.getAttributeNode&&a.getAttributeNode("id");return c&&c.value===b}}),d.find.TAG=c.getElementsByTagName?function(a,b){return"undefined"!=typeof b.getElementsByTagName?b.getElementsByTagName(a):c.qsa?b.querySelectorAll(a):void 0}:function(a,b){var c,d=[],e=0,f=b.getElementsByTagName(a);if("*"===a){while(c=f[e++])1===c.nodeType&&d.push(c);return d}return f},d.find.CLASS=c.getElementsByClassName&&function(a,b){return p?b.getElementsByClassName(a):void 0},r=[],q=[],(c.qsa=$.test(g.querySelectorAll))&&(ja(function(a){o.appendChild(a).innerHTML="<a id='"+u+"'></a><select id='"+u+"-\f]' msallowcapture=''><option selected=''></option></select>",a.querySelectorAll("[msallowcapture^='']").length&&q.push("[*^$]="+L+"*(?:''|\"\")"),a.querySelectorAll("[selected]").length||q.push("\\["+L+"*(?:value|"+K+")"),a.querySelectorAll("[id~="+u+"-]").length||q.push("~="),a.querySelectorAll(":checked").length||q.push(":checked"),a.querySelectorAll("a#"+u+"+*").length||q.push(".#.+[+~]")}),ja(function(a){var b=g.createElement("input");b.setAttribute("type","hidden"),a.appendChild(b).setAttribute("name","D"),a.querySelectorAll("[name=d]").length&&q.push("name"+L+"*[*^$|!~]?="),a.querySelectorAll(":enabled").length||q.push(":enabled",":disabled"),a.querySelectorAll("*,:x"),q.push(",.*:")})),(c.matchesSelector=$.test(s=o.matches||o.webkitMatchesSelector||o.mozMatchesSelector||o.oMatchesSelector||o.msMatchesSelector))&&ja(function(a){c.disconnectedMatch=s.call(a,"div"),s.call(a,"[s!='']:x"),r.push("!=",P)}),q=q.length&&new RegExp(q.join("|")),r=r.length&&new RegExp(r.join("|")),b=$.test(o.compareDocumentPosition),t=b||$.test(o.contains)?function(a,b){var c=9===a.nodeType?a.documentElement:a,d=b&&b.parentNode;return a===d||!(!d||1!==d.nodeType||!(c.contains?c.contains(d):a.compareDocumentPosition&&16&a.compareDocumentPosition(d)))}:function(a,b){if(b)while(b=b.parentNode)if(b===a)return!0;return!1},B=b?function(a,b){if(a===b)return l=!0,0;var d=!a.compareDocumentPosition-!b.compareDocumentPosition;return d?d:(d=(a.ownerDocument||a)===(b.ownerDocument||b)?a.compareDocumentPosition(b):1,1&d||!c.sortDetached&&b.compareDocumentPosition(a)===d?a===g||a.ownerDocument===v&&t(v,a)?-1:b===g||b.ownerDocument===v&&t(v,b)?1:k?J(k,a)-J(k,b):0:4&d?-1:1)}:function(a,b){if(a===b)return l=!0,0;var c,d=0,e=a.parentNode,f=b.parentNode,h=[a],i=[b];if(!e||!f)return a===g?-1:b===g?1:e?-1:f?1:k?J(k,a)-J(k,b):0;if(e===f)return la(a,b);c=a;while(c=c.parentNode)h.unshift(c);c=b;while(c=c.parentNode)i.unshift(c);while(h[d]===i[d])d++;return d?la(h[d],i[d]):h[d]===v?-1:i[d]===v?1:0},g):n},ga.matches=function(a,b){return ga(a,null,null,b)},ga.matchesSelector=function(a,b){if((a.ownerDocument||a)!==n&&m(a),b=b.replace(U,"='$1']"),!(!c.matchesSelector||!p||r&&r.test(b)||q&&q.test(b)))try{var d=s.call(a,b);if(d||c.disconnectedMatch||a.document&&11!==a.document.nodeType)return d}catch(e){}return ga(b,n,null,[a]).length>0},ga.contains=function(a,b){return(a.ownerDocument||a)!==n&&m(a),t(a,b)},ga.attr=function(a,b){(a.ownerDocument||a)!==n&&m(a);var e=d.attrHandle[b.toLowerCase()],f=e&&D.call(d.attrHandle,b.toLowerCase())?e(a,b,!p):void 0;return void 0!==f?f:c.attributes||!p?a.getAttribute(b):(f=a.getAttributeNode(b))&&f.specified?f.value:null},ga.error=function(a){throw new Error("Syntax error, unrecognized expression: "+a)},ga.uniqueSort=function(a){var b,d=[],e=0,f=0;if(l=!c.detectDuplicates,k=!c.sortStable&&a.slice(0),a.sort(B),l){while(b=a[f++])b===a[f]&&(e=d.push(f));while(e--)a.splice(d[e],1)}return k=null,a},e=ga.getText=function(a){var b,c="",d=0,f=a.nodeType;if(f){if(1===f||9===f||11===f){if("string"==typeof a.textContent)return a.textContent;for(a=a.firstChild;a;a=a.nextSibling)c+=e(a)}else if(3===f||4===f)return a.nodeValue}else while(b=a[d++])c+=e(b);return c},d=ga.selectors={cacheLength:50,createPseudo:ia,match:X,attrHandle:{},find:{},relative:{">":{dir:"parentNode",first:!0}," ":{dir:"parentNode"},"+":{dir:"previousSibling",first:!0},"~":{dir:"previousSibling"}},preFilter:{ATTR:function(a){return a[1]=a[1].replace(ca,da),a[3]=(a[3]||a[4]||a[5]||"").replace(ca,da),"~="===a[2]&&(a[3]=" "+a[3]+" "),a.slice(0,4)},CHILD:function(a){return a[1]=a[1].toLowerCase(),"nth"===a[1].slice(0,3)?(a[3]||ga.error(a[0]),a[4]=+(a[4]?a[5]+(a[6]||1):2*("even"===a[3]||"odd"===a[3])),a[5]=+(a[7]+a[8]||"odd"===a[3])):a[3]&&ga.error(a[0]),a},PSEUDO:function(a){var b,c=!a[6]&&a[2];return X.CHILD.test(a[0])?null:(a[3]?a[2]=a[4]||a[5]||"":c&&V.test(c)&&(b=g(c,!0))&&(b=c.indexOf(")",c.length-b)-c.length)&&(a[0]=a[0].slice(0,b),a[2]=c.slice(0,b)),a.slice(0,3))}},filter:{TAG:function(a){var b=a.replace(ca,da).toLowerCase();return"*"===a?function(){return!0}:function(a){return a.nodeName&&a.nodeName.toLowerCase()===b}},CLASS:function(a){var b=y[a+" "];return b||(b=new RegExp("(^|"+L+")"+a+"("+L+"|$)"))&&y(a,function(a){return b.test("string"==typeof a.className&&a.className||"undefined"!=typeof a.getAttribute&&a.getAttribute("class")||"")})},ATTR:function(a,b,c){return function(d){var e=ga.attr(d,a);return null==e?"!="===b:b?(e+="","="===b?e===c:"!="===b?e!==c:"^="===b?c&&0===e.indexOf(c):"*="===b?c&&e.indexOf(c)>-1:"$="===b?c&&e.slice(-c.length)===c:"~="===b?(" "+e.replace(Q," ")+" ").indexOf(c)>-1:"|="===b?e===c||e.slice(0,c.length+1)===c+"-":!1):!0}},CHILD:function(a,b,c,d,e){var f="nth"!==a.slice(0,3),g="last"!==a.slice(-4),h="of-type"===b;return 1===d&&0===e?function(a){return!!a.parentNode}:function(b,c,i){var j,k,l,m,n,o,p=f!==g?"nextSibling":"previousSibling",q=b.parentNode,r=h&&b.nodeName.toLowerCase(),s=!i&&!h;if(q){if(f){while(p){l=b;while(l=l[p])if(h?l.nodeName.toLowerCase()===r:1===l.nodeType)return!1;o=p="only"===a&&!o&&"nextSibling"}return!0}if(o=[g?q.firstChild:q.lastChild],g&&s){k=q[u]||(q[u]={}),j=k[a]||[],n=j[0]===w&&j[1],m=j[0]===w&&j[2],l=n&&q.childNodes[n];while(l=++n&&l&&l[p]||(m=n=0)||o.pop())if(1===l.nodeType&&++m&&l===b){k[a]=[w,n,m];break}}else if(s&&(j=(b[u]||(b[u]={}))[a])&&j[0]===w)m=j[1];else while(l=++n&&l&&l[p]||(m=n=0)||o.pop())if((h?l.nodeName.toLowerCase()===r:1===l.nodeType)&&++m&&(s&&((l[u]||(l[u]={}))[a]=[w,m]),l===b))break;return m-=e,m===d||m%d===0&&m/d>=0}}},PSEUDO:function(a,b){var c,e=d.pseudos[a]||d.setFilters[a.toLowerCase()]||ga.error("unsupported pseudo: "+a);return e[u]?e(b):e.length>1?(c=[a,a,"",b],d.setFilters.hasOwnProperty(a.toLowerCase())?ia(function(a,c){var d,f=e(a,b),g=f.length;while(g--)d=J(a,f[g]),a[d]=!(c[d]=f[g])}):function(a){return e(a,0,c)}):e}},pseudos:{not:ia(function(a){var b=[],c=[],d=h(a.replace(R,"$1"));return d[u]?ia(function(a,b,c,e){var f,g=d(a,null,e,[]),h=a.length;while(h--)(f=g[h])&&(a[h]=!(b[h]=f))}):function(a,e,f){return b[0]=a,d(b,null,f,c),b[0]=null,!c.pop()}}),has:ia(function(a){return function(b){return ga(a,b).length>0}}),contains:ia(function(a){return a=a.replace(ca,da),function(b){return(b.textContent||b.innerText||e(b)).indexOf(a)>-1}}),lang:ia(function(a){return W.test(a||"")||ga.error("unsupported lang: "+a),a=a.replace(ca,da).toLowerCase(),function(b){var c;do if(c=p?b.lang:b.getAttribute("xml:lang")||b.getAttribute("lang"))return c=c.toLowerCase(),c===a||0===c.indexOf(a+"-");while((b=b.parentNode)&&1===b.nodeType);return!1}}),target:function(b){var c=a.location&&a.location.hash;return c&&c.slice(1)===b.id},root:function(a){return a===o},focus:function(a){return a===n.activeElement&&(!n.hasFocus||n.hasFocus())&&!!(a.type||a.href||~a.tabIndex)},enabled:function(a){return a.disabled===!1},disabled:function(a){return a.disabled===!0},checked:function(a){var b=a.nodeName.toLowerCase();return"input"===b&&!!a.checked||"option"===b&&!!a.selected},selected:function(a){return a.parentNode&&a.parentNode.selectedIndex,a.selected===!0},empty:function(a){for(a=a.firstChild;a;a=a.nextSibling)if(a.nodeType<6)return!1;return!0},parent:function(a){return!d.pseudos.empty(a)},header:function(a){return Z.test(a.nodeName)},input:function(a){return Y.test(a.nodeName)},button:function(a){var b=a.nodeName.toLowerCase();return"input"===b&&"button"===a.type||"button"===b},text:function(a){var b;return"input"===a.nodeName.toLowerCase()&&"text"===a.type&&(null==(b=a.getAttribute("type"))||"text"===b.toLowerCase())},first:oa(function(){return[0]}),last:oa(function(a,b){return[b-1]}),eq:oa(function(a,b,c){return[0>c?c+b:c]}),even:oa(function(a,b){for(var c=0;b>c;c+=2)a.push(c);return a}),odd:oa(function(a,b){for(var c=1;b>c;c+=2)a.push(c);return a}),lt:oa(function(a,b,c){for(var d=0>c?c+b:c;--d>=0;)a.push(d);return a}),gt:oa(function(a,b,c){for(var d=0>c?c+b:c;++d<b;)a.push(d);return a})}},d.pseudos.nth=d.pseudos.eq;for(b in{radio:!0,checkbox:!0,file:!0,password:!0,image:!0})d.pseudos[b]=ma(b);for(b in{submit:!0,reset:!0})d.pseudos[b]=na(b);function qa(){}qa.prototype=d.filters=d.pseudos,d.setFilters=new qa,g=ga.tokenize=function(a,b){var c,e,f,g,h,i,j,k=z[a+" "];if(k)return b?0:k.slice(0);h=a,i=[],j=d.preFilter;while(h){(!c||(e=S.exec(h)))&&(e&&(h=h.slice(e[0].length)||h),i.push(f=[])),c=!1,(e=T.exec(h))&&(c=e.shift(),f.push({value:c,type:e[0].replace(R," ")}),h=h.slice(c.length));for(g in d.filter)!(e=X[g].exec(h))||j[g]&&!(e=j[g](e))||(c=e.shift(),f.push({value:c,type:g,matches:e}),h=h.slice(c.length));if(!c)break}return b?h.length:h?ga.error(a):z(a,i).slice(0)};function ra(a){for(var b=0,c=a.length,d="";c>b;b++)d+=a[b].value;return d}function sa(a,b,c){var d=b.dir,e=c&&"parentNode"===d,f=x++;return b.first?function(b,c,f){while(b=b[d])if(1===b.nodeType||e)return a(b,c,f)}:function(b,c,g){var h,i,j=[w,f];if(g){while(b=b[d])if((1===b.nodeType||e)&&a(b,c,g))return!0}else while(b=b[d])if(1===b.nodeType||e){if(i=b[u]||(b[u]={}),(h=i[d])&&h[0]===w&&h[1]===f)return j[2]=h[2];if(i[d]=j,j[2]=a(b,c,g))return!0}}}function ta(a){return a.length>1?function(b,c,d){var e=a.length;while(e--)if(!a[e](b,c,d))return!1;return!0}:a[0]}function ua(a,b,c){for(var d=0,e=b.length;e>d;d++)ga(a,b[d],c);return c}function va(a,b,c,d,e){for(var f,g=[],h=0,i=a.length,j=null!=b;i>h;h++)(f=a[h])&&(!c||c(f,d,e))&&(g.push(f),j&&b.push(h));return g}function wa(a,b,c,d,e,f){return d&&!d[u]&&(d=wa(d)),e&&!e[u]&&(e=wa(e,f)),ia(function(f,g,h,i){var j,k,l,m=[],n=[],o=g.length,p=f||ua(b||"*",h.nodeType?[h]:h,[]),q=!a||!f&&b?p:va(p,m,a,h,i),r=c?e||(f?a:o||d)?[]:g:q;if(c&&c(q,r,h,i),d){j=va(r,n),d(j,[],h,i),k=j.length;while(k--)(l=j[k])&&(r[n[k]]=!(q[n[k]]=l))}if(f){if(e||a){if(e){j=[],k=r.length;while(k--)(l=r[k])&&j.push(q[k]=l);e(null,r=[],j,i)}k=r.length;while(k--)(l=r[k])&&(j=e?J(f,l):m[k])>-1&&(f[j]=!(g[j]=l))}}else r=va(r===g?r.splice(o,r.length):r),e?e(null,g,r,i):H.apply(g,r)})}function xa(a){for(var b,c,e,f=a.length,g=d.relative[a[0].type],h=g||d.relative[" "],i=g?1:0,k=sa(function(a){return a===b},h,!0),l=sa(function(a){return J(b,a)>-1},h,!0),m=[function(a,c,d){var e=!g&&(d||c!==j)||((b=c).nodeType?k(a,c,d):l(a,c,d));return b=null,e}];f>i;i++)if(c=d.relative[a[i].type])m=[sa(ta(m),c)];else{if(c=d.filter[a[i].type].apply(null,a[i].matches),c[u]){for(e=++i;f>e;e++)if(d.relative[a[e].type])break;return wa(i>1&&ta(m),i>1&&ra(a.slice(0,i-1).concat({value:" "===a[i-2].type?"*":""})).replace(R,"$1"),c,e>i&&xa(a.slice(i,e)),f>e&&xa(a=a.slice(e)),f>e&&ra(a))}m.push(c)}return ta(m)}function ya(a,b){var c=b.length>0,e=a.length>0,f=function(f,g,h,i,k){var l,m,o,p=0,q="0",r=f&&[],s=[],t=j,u=f||e&&d.find.TAG("*",k),v=w+=null==t?1:Math.random()||.1,x=u.length;for(k&&(j=g!==n&&g);q!==x&&null!=(l=u[q]);q++){if(e&&l){m=0;while(o=a[m++])if(o(l,g,h)){i.push(l);break}k&&(w=v)}c&&((l=!o&&l)&&p--,f&&r.push(l))}if(p+=q,c&&q!==p){m=0;while(o=b[m++])o(r,s,g,h);if(f){if(p>0)while(q--)r[q]||s[q]||(s[q]=F.call(i));s=va(s)}H.apply(i,s),k&&!f&&s.length>0&&p+b.length>1&&ga.uniqueSort(i)}return k&&(w=v,j=t),r};return c?ia(f):f}return h=ga.compile=function(a,b){var c,d=[],e=[],f=A[a+" "];if(!f){b||(b=g(a)),c=b.length;while(c--)f=xa(b[c]),f[u]?d.push(f):e.push(f);f=A(a,ya(e,d)),f.selector=a}return f},i=ga.select=function(a,b,e,f){var i,j,k,l,m,n="function"==typeof a&&a,o=!f&&g(a=n.selector||a);if(e=e||[],1===o.length){if(j=o[0]=o[0].slice(0),j.length>2&&"ID"===(k=j[0]).type&&c.getById&&9===b.nodeType&&p&&d.relative[j[1].type]){if(b=(d.find.ID(k.matches[0].replace(ca,da),b)||[])[0],!b)return e;n&&(b=b.parentNode),a=a.slice(j.shift().value.length)}i=X.needsContext.test(a)?0:j.length;while(i--){if(k=j[i],d.relative[l=k.type])break;if((m=d.find[l])&&(f=m(k.matches[0].replace(ca,da),aa.test(j[0].type)&&pa(b.parentNode)||b))){if(j.splice(i,1),a=f.length&&ra(j),!a)return H.apply(e,f),e;break}}}return(n||h(a,o))(f,b,!p,e,aa.test(a)&&pa(b.parentNode)||b),e},c.sortStable=u.split("").sort(B).join("")===u,c.detectDuplicates=!!l,m(),c.sortDetached=ja(function(a){return 1&a.compareDocumentPosition(n.createElement("div"))}),ja(function(a){return a.innerHTML="<a href='#'></a>","#"===a.firstChild.getAttribute("href")})||ka("type|href|height|width",function(a,b,c){return c?void 0:a.getAttribute(b,"type"===b.toLowerCase()?1:2)}),c.attributes&&ja(function(a){return a.innerHTML="<input/>",a.firstChild.setAttribute("value",""),""===a.firstChild.getAttribute("value")})||ka("value",function(a,b,c){return c||"input"!==a.nodeName.toLowerCase()?void 0:a.defaultValue}),ja(function(a){return null==a.getAttribute("disabled")})||ka(K,function(a,b,c){var d;return c?void 0:a[b]===!0?b.toLowerCase():(d=a.getAttributeNode(b))&&d.specified?d.value:null}),ga}(a);n.find=t,n.expr=t.selectors,n.expr[":"]=n.expr.pseudos,n.unique=t.uniqueSort,n.text=t.getText,n.isXMLDoc=t.isXML,n.contains=t.contains;var u=n.expr.match.needsContext,v=/^<(\w+)\s*\/?>(?:<\/\1>|)$/,w=/^.[^:#\[\.,]*$/;function x(a,b,c){if(n.isFunction(b))return n.grep(a,function(a,d){return!!b.call(a,d,a)!==c});if(b.nodeType)return n.grep(a,function(a){return a===b!==c});if("string"==typeof b){if(w.test(b))return n.filter(b,a,c);b=n.filter(b,a)}return n.grep(a,function(a){return g.call(b,a)>=0!==c})}n.filter=function(a,b,c){var d=b[0];return c&&(a=":not("+a+")"),1===b.length&&1===d.nodeType?n.find.matchesSelector(d,a)?[d]:[]:n.find.matches(a,n.grep(b,function(a){return 1===a.nodeType}))},n.fn.extend({find:function(a){var b,c=this.length,d=[],e=this;if("string"!=typeof a)return this.pushStack(n(a).filter(function(){for(b=0;c>b;b++)if(n.contains(e[b],this))return!0}));for(b=0;c>b;b++)n.find(a,e[b],d);return d=this.pushStack(c>1?n.unique(d):d),d.selector=this.selector?this.selector+" "+a:a,d},filter:function(a){return this.pushStack(x(this,a||[],!1))},not:function(a){return this.pushStack(x(this,a||[],!0))},is:function(a){return!!x(this,"string"==typeof a&&u.test(a)?n(a):a||[],!1).length}});var y,z=/^(?:\s*(<[\w\W]+>)[^>]*|#([\w-]*))$/,A=n.fn.init=function(a,b){var c,d;if(!a)return this;if("string"==typeof a){if(c="<"===a[0]&&">"===a[a.length-1]&&a.length>=3?[null,a,null]:z.exec(a),!c||!c[1]&&b)return!b||b.jquery?(b||y).find(a):this.constructor(b).find(a);if(c[1]){if(b=b instanceof n?b[0]:b,n.merge(this,n.parseHTML(c[1],b&&b.nodeType?b.ownerDocument||b:l,!0)),v.test(c[1])&&n.isPlainObject(b))for(c in b)n.isFunction(this[c])?this[c](b[c]):this.attr(c,b[c]);return this}return d=l.getElementById(c[2]),d&&d.parentNode&&(this.length=1,this[0]=d),this.context=l,this.selector=a,this}return a.nodeType?(this.context=this[0]=a,this.length=1,this):n.isFunction(a)?"undefined"!=typeof y.ready?y.ready(a):a(n):(void 0!==a.selector&&(this.selector=a.selector,this.context=a.context),n.makeArray(a,this))};A.prototype=n.fn,y=n(l);var B=/^(?:parents|prev(?:Until|All))/,C={children:!0,contents:!0,next:!0,prev:!0};n.extend({dir:function(a,b,c){var d=[],e=void 0!==c;while((a=a[b])&&9!==a.nodeType)if(1===a.nodeType){if(e&&n(a).is(c))break;d.push(a)}return d},sibling:function(a,b){for(var c=[];a;a=a.nextSibling)1===a.nodeType&&a!==b&&c.push(a);return c}}),n.fn.extend({has:function(a){var b=n(a,this),c=b.length;return this.filter(function(){for(var a=0;c>a;a++)if(n.contains(this,b[a]))return!0})},closest:function(a,b){for(var c,d=0,e=this.length,f=[],g=u.test(a)||"string"!=typeof a?n(a,b||this.context):0;e>d;d++)for(c=this[d];c&&c!==b;c=c.parentNode)if(c.nodeType<11&&(g?g.index(c)>-1:1===c.nodeType&&n.find.matchesSelector(c,a))){f.push(c);break}return this.pushStack(f.length>1?n.unique(f):f)},index:function(a){return a?"string"==typeof a?g.call(n(a),this[0]):g.call(this,a.jquery?a[0]:a):this[0]&&this[0].parentNode?this.first().prevAll().length:-1},add:function(a,b){return this.pushStack(n.unique(n.merge(this.get(),n(a,b))))},addBack:function(a){return this.add(null==a?this.prevObject:this.prevObject.filter(a))}});function D(a,b){while((a=a[b])&&1!==a.nodeType);return a}n.each({parent:function(a){var b=a.parentNode;return b&&11!==b.nodeType?b:null},parents:function(a){return n.dir(a,"parentNode")},parentsUntil:function(a,b,c){return n.dir(a,"parentNode",c)},next:function(a){return D(a,"nextSibling")},prev:function(a){return D(a,"previousSibling")},nextAll:function(a){return n.dir(a,"nextSibling")},prevAll:function(a){return n.dir(a,"previousSibling")},nextUntil:function(a,b,c){return n.dir(a,"nextSibling",c)},prevUntil:function(a,b,c){return n.dir(a,"previousSibling",c)},siblings:function(a){return n.sibling((a.parentNode||{}).firstChild,a)},children:function(a){return n.sibling(a.firstChild)},contents:function(a){return a.contentDocument||n.merge([],a.childNodes)}},function(a,b){n.fn[a]=function(c,d){var e=n.map(this,b,c);return"Until"!==a.slice(-5)&&(d=c),d&&"string"==typeof d&&(e=n.filter(d,e)),this.length>1&&(C[a]||n.unique(e),B.test(a)&&e.reverse()),this.pushStack(e)}});var E=/\S+/g,F={};function G(a){var b=F[a]={};return n.each(a.match(E)||[],function(a,c){b[c]=!0}),b}n.Callbacks=function(a){a="string"==typeof a?F[a]||G(a):n.extend({},a);var b,c,d,e,f,g,h=[],i=!a.once&&[],j=function(l){for(b=a.memory&&l,c=!0,g=e||0,e=0,f=h.length,d=!0;h&&f>g;g++)if(h[g].apply(l[0],l[1])===!1&&a.stopOnFalse){b=!1;break}d=!1,h&&(i?i.length&&j(i.shift()):b?h=[]:k.disable())},k={add:function(){if(h){var c=h.length;!function g(b){n.each(b,function(b,c){var d=n.type(c);"function"===d?a.unique&&k.has(c)||h.push(c):c&&c.length&&"string"!==d&&g(c)})}(arguments),d?f=h.length:b&&(e=c,j(b))}return this},remove:function(){return h&&n.each(arguments,function(a,b){var c;while((c=n.inArray(b,h,c))>-1)h.splice(c,1),d&&(f>=c&&f--,g>=c&&g--)}),this},has:function(a){return a?n.inArray(a,h)>-1:!(!h||!h.length)},empty:function(){return h=[],f=0,this},disable:function(){return h=i=b=void 0,this},disabled:function(){return!h},lock:function(){return i=void 0,b||k.disable(),this},locked:function(){return!i},fireWith:function(a,b){return!h||c&&!i||(b=b||[],b=[a,b.slice?b.slice():b],d?i.push(b):j(b)),this},fire:function(){return k.fireWith(this,arguments),this},fired:function(){return!!c}};return k},n.extend({Deferred:function(a){var b=[["resolve","done",n.Callbacks("once memory"),"resolved"],["reject","fail",n.Callbacks("once memory"),"rejected"],["notify","progress",n.Callbacks("memory")]],c="pending",d={state:function(){return c},always:function(){return e.done(arguments).fail(arguments),this},then:function(){var a=arguments;return n.Deferred(function(c){n.each(b,function(b,f){var g=n.isFunction(a[b])&&a[b];e[f[1]](function(){var a=g&&g.apply(this,arguments);a&&n.isFunction(a.promise)?a.promise().done(c.resolve).fail(c.reject).progress(c.notify):c[f[0]+"With"](this===d?c.promise():this,g?[a]:arguments)})}),a=null}).promise()},promise:function(a){return null!=a?n.extend(a,d):d}},e={};return d.pipe=d.then,n.each(b,function(a,f){var g=f[2],h=f[3];d[f[1]]=g.add,h&&g.add(function(){c=h},b[1^a][2].disable,b[2][2].lock),e[f[0]]=function(){return e[f[0]+"With"](this===e?d:this,arguments),this},e[f[0]+"With"]=g.fireWith}),d.promise(e),a&&a.call(e,e),e},when:function(a){var b=0,c=d.call(arguments),e=c.length,f=1!==e||a&&n.isFunction(a.promise)?e:0,g=1===f?a:n.Deferred(),h=function(a,b,c){return function(e){b[a]=this,c[a]=arguments.length>1?d.call(arguments):e,c===i?g.notifyWith(b,c):--f||g.resolveWith(b,c)}},i,j,k;if(e>1)for(i=new Array(e),j=new Array(e),k=new Array(e);e>b;b++)c[b]&&n.isFunction(c[b].promise)?c[b].promise().done(h(b,k,c)).fail(g.reject).progress(h(b,j,i)):--f;return f||g.resolveWith(k,c),g.promise()}});var H;n.fn.ready=function(a){return n.ready.promise().done(a),this},n.extend({isReady:!1,readyWait:1,holdReady:function(a){a?n.readyWait++:n.ready(!0)},ready:function(a){(a===!0?--n.readyWait:n.isReady)||(n.isReady=!0,a!==!0&&--n.readyWait>0||(H.resolveWith(l,[n]),n.fn.triggerHandler&&(n(l).triggerHandler("ready"),n(l).off("ready"))))}});function I(){l.removeEventListener("DOMContentLoaded",I,!1),a.removeEventListener("load",I,!1),n.ready()}n.ready.promise=function(b){return H||(H=n.Deferred(),"complete"===l.readyState?setTimeout(n.ready):(l.addEventListener("DOMContentLoaded",I,!1),a.addEventListener("load",I,!1))),H.promise(b)},n.ready.promise();var J=n.access=function(a,b,c,d,e,f,g){var h=0,i=a.length,j=null==c;if("object"===n.type(c)){e=!0;for(h in c)n.access(a,b,h,c[h],!0,f,g)}else if(void 0!==d&&(e=!0,n.isFunction(d)||(g=!0),j&&(g?(b.call(a,d),b=null):(j=b,b=function(a,b,c){return j.call(n(a),c)})),b))for(;i>h;h++)b(a[h],c,g?d:d.call(a[h],h,b(a[h],c)));return e?a:j?b.call(a):i?b(a[0],c):f};n.acceptData=function(a){return 1===a.nodeType||9===a.nodeType||!+a.nodeType};function K(){Object.defineProperty(this.cache={},0,{get:function(){return{}}}),this.expando=n.expando+K.uid++}K.uid=1,K.accepts=n.acceptData,K.prototype={key:function(a){if(!K.accepts(a))return 0;var b={},c=a[this.expando];if(!c){c=K.uid++;try{b[this.expando]={value:c},Object.defineProperties(a,b)}catch(d){b[this.expando]=c,n.extend(a,b)}}return this.cache[c]||(this.cache[c]={}),c},set:function(a,b,c){var d,e=this.key(a),f=this.cache[e];if("string"==typeof b)f[b]=c;else if(n.isEmptyObject(f))n.extend(this.cache[e],b);else for(d in b)f[d]=b[d];return f},get:function(a,b){var c=this.cache[this.key(a)];return void 0===b?c:c[b]},access:function(a,b,c){var d;return void 0===b||b&&"string"==typeof b&&void 0===c?(d=this.get(a,b),void 0!==d?d:this.get(a,n.camelCase(b))):(this.set(a,b,c),void 0!==c?c:b)},remove:function(a,b){var c,d,e,f=this.key(a),g=this.cache[f];if(void 0===b)this.cache[f]={};else{n.isArray(b)?d=b.concat(b.map(n.camelCase)):(e=n.camelCase(b),b in g?d=[b,e]:(d=e,d=d in g?[d]:d.match(E)||[])),c=d.length;while(c--)delete g[d[c]]}},hasData:function(a){return!n.isEmptyObject(this.cache[a[this.expando]]||{})},discard:function(a){a[this.expando]&&delete this.cache[a[this.expando]]}};var L=new K,M=new K,N=/^(?:\{[\w\W]*\}|\[[\w\W]*\])$/,O=/([A-Z])/g;function P(a,b,c){var d;if(void 0===c&&1===a.nodeType)if(d="data-"+b.replace(O,"-$1").toLowerCase(),c=a.getAttribute(d),"string"==typeof c){try{c="true"===c?!0:"false"===c?!1:"null"===c?null:+c+""===c?+c:N.test(c)?n.parseJSON(c):c}catch(e){}M.set(a,b,c)}else c=void 0;return c}n.extend({hasData:function(a){return M.hasData(a)||L.hasData(a)},data:function(a,b,c){
+return M.access(a,b,c)},removeData:function(a,b){M.remove(a,b)},_data:function(a,b,c){return L.access(a,b,c)},_removeData:function(a,b){L.remove(a,b)}}),n.fn.extend({data:function(a,b){var c,d,e,f=this[0],g=f&&f.attributes;if(void 0===a){if(this.length&&(e=M.get(f),1===f.nodeType&&!L.get(f,"hasDataAttrs"))){c=g.length;while(c--)g[c]&&(d=g[c].name,0===d.indexOf("data-")&&(d=n.camelCase(d.slice(5)),P(f,d,e[d])));L.set(f,"hasDataAttrs",!0)}return e}return"object"==typeof a?this.each(function(){M.set(this,a)}):J(this,function(b){var c,d=n.camelCase(a);if(f&&void 0===b){if(c=M.get(f,a),void 0!==c)return c;if(c=M.get(f,d),void 0!==c)return c;if(c=P(f,d,void 0),void 0!==c)return c}else this.each(function(){var c=M.get(this,d);M.set(this,d,b),-1!==a.indexOf("-")&&void 0!==c&&M.set(this,a,b)})},null,b,arguments.length>1,null,!0)},removeData:function(a){return this.each(function(){M.remove(this,a)})}}),n.extend({queue:function(a,b,c){var d;return a?(b=(b||"fx")+"queue",d=L.get(a,b),c&&(!d||n.isArray(c)?d=L.access(a,b,n.makeArray(c)):d.push(c)),d||[]):void 0},dequeue:function(a,b){b=b||"fx";var c=n.queue(a,b),d=c.length,e=c.shift(),f=n._queueHooks(a,b),g=function(){n.dequeue(a,b)};"inprogress"===e&&(e=c.shift(),d--),e&&("fx"===b&&c.unshift("inprogress"),delete f.stop,e.call(a,g,f)),!d&&f&&f.empty.fire()},_queueHooks:function(a,b){var c=b+"queueHooks";return L.get(a,c)||L.access(a,c,{empty:n.Callbacks("once memory").add(function(){L.remove(a,[b+"queue",c])})})}}),n.fn.extend({queue:function(a,b){var c=2;return"string"!=typeof a&&(b=a,a="fx",c--),arguments.length<c?n.queue(this[0],a):void 0===b?this:this.each(function(){var c=n.queue(this,a,b);n._queueHooks(this,a),"fx"===a&&"inprogress"!==c[0]&&n.dequeue(this,a)})},dequeue:function(a){return this.each(function(){n.dequeue(this,a)})},clearQueue:function(a){return this.queue(a||"fx",[])},promise:function(a,b){var c,d=1,e=n.Deferred(),f=this,g=this.length,h=function(){--d||e.resolveWith(f,[f])};"string"!=typeof a&&(b=a,a=void 0),a=a||"fx";while(g--)c=L.get(f[g],a+"queueHooks"),c&&c.empty&&(d++,c.empty.add(h));return h(),e.promise(b)}});var Q=/[+-]?(?:\d*\.|)\d+(?:[eE][+-]?\d+|)/.source,R=["Top","Right","Bottom","Left"],S=function(a,b){return a=b||a,"none"===n.css(a,"display")||!n.contains(a.ownerDocument,a)},T=/^(?:checkbox|radio)$/i;!function(){var a=l.createDocumentFragment(),b=a.appendChild(l.createElement("div")),c=l.createElement("input");c.setAttribute("type","radio"),c.setAttribute("checked","checked"),c.setAttribute("name","t"),b.appendChild(c),k.checkClone=b.cloneNode(!0).cloneNode(!0).lastChild.checked,b.innerHTML="<textarea>x</textarea>",k.noCloneChecked=!!b.cloneNode(!0).lastChild.defaultValue}();var U="undefined";k.focusinBubbles="onfocusin"in a;var V=/^key/,W=/^(?:mouse|pointer|contextmenu)|click/,X=/^(?:focusinfocus|focusoutblur)$/,Y=/^([^.]*)(?:\.(.+)|)$/;function Z(){return!0}function $(){return!1}function _(){try{return l.activeElement}catch(a){}}n.event={global:{},add:function(a,b,c,d,e){var f,g,h,i,j,k,l,m,o,p,q,r=L.get(a);if(r){c.handler&&(f=c,c=f.handler,e=f.selector),c.guid||(c.guid=n.guid++),(i=r.events)||(i=r.events={}),(g=r.handle)||(g=r.handle=function(b){return typeof n!==U&&n.event.triggered!==b.type?n.event.dispatch.apply(a,arguments):void 0}),b=(b||"").match(E)||[""],j=b.length;while(j--)h=Y.exec(b[j])||[],o=q=h[1],p=(h[2]||"").split(".").sort(),o&&(l=n.event.special[o]||{},o=(e?l.delegateType:l.bindType)||o,l=n.event.special[o]||{},k=n.extend({type:o,origType:q,data:d,handler:c,guid:c.guid,selector:e,needsContext:e&&n.expr.match.needsContext.test(e),namespace:p.join(".")},f),(m=i[o])||(m=i[o]=[],m.delegateCount=0,l.setup&&l.setup.call(a,d,p,g)!==!1||a.addEventListener&&a.addEventListener(o,g,!1)),l.add&&(l.add.call(a,k),k.handler.guid||(k.handler.guid=c.guid)),e?m.splice(m.delegateCount++,0,k):m.push(k),n.event.global[o]=!0)}},remove:function(a,b,c,d,e){var f,g,h,i,j,k,l,m,o,p,q,r=L.hasData(a)&&L.get(a);if(r&&(i=r.events)){b=(b||"").match(E)||[""],j=b.length;while(j--)if(h=Y.exec(b[j])||[],o=q=h[1],p=(h[2]||"").split(".").sort(),o){l=n.event.special[o]||{},o=(d?l.delegateType:l.bindType)||o,m=i[o]||[],h=h[2]&&new RegExp("(^|\\.)"+p.join("\\.(?:.*\\.|)")+"(\\.|$)"),g=f=m.length;while(f--)k=m[f],!e&&q!==k.origType||c&&c.guid!==k.guid||h&&!h.test(k.namespace)||d&&d!==k.selector&&("**"!==d||!k.selector)||(m.splice(f,1),k.selector&&m.delegateCount--,l.remove&&l.remove.call(a,k));g&&!m.length&&(l.teardown&&l.teardown.call(a,p,r.handle)!==!1||n.removeEvent(a,o,r.handle),delete i[o])}else for(o in i)n.event.remove(a,o+b[j],c,d,!0);n.isEmptyObject(i)&&(delete r.handle,L.remove(a,"events"))}},trigger:function(b,c,d,e){var f,g,h,i,k,m,o,p=[d||l],q=j.call(b,"type")?b.type:b,r=j.call(b,"namespace")?b.namespace.split("."):[];if(g=h=d=d||l,3!==d.nodeType&&8!==d.nodeType&&!X.test(q+n.event.triggered)&&(q.indexOf(".")>=0&&(r=q.split("."),q=r.shift(),r.sort()),k=q.indexOf(":")<0&&"on"+q,b=b[n.expando]?b:new n.Event(q,"object"==typeof b&&b),b.isTrigger=e?2:3,b.namespace=r.join("."),b.namespace_re=b.namespace?new RegExp("(^|\\.)"+r.join("\\.(?:.*\\.|)")+"(\\.|$)"):null,b.result=void 0,b.target||(b.target=d),c=null==c?[b]:n.makeArray(c,[b]),o=n.event.special[q]||{},e||!o.trigger||o.trigger.apply(d,c)!==!1)){if(!e&&!o.noBubble&&!n.isWindow(d)){for(i=o.delegateType||q,X.test(i+q)||(g=g.parentNode);g;g=g.parentNode)p.push(g),h=g;h===(d.ownerDocument||l)&&p.push(h.defaultView||h.parentWindow||a)}f=0;while((g=p[f++])&&!b.isPropagationStopped())b.type=f>1?i:o.bindType||q,m=(L.get(g,"events")||{})[b.type]&&L.get(g,"handle"),m&&m.apply(g,c),m=k&&g[k],m&&m.apply&&n.acceptData(g)&&(b.result=m.apply(g,c),b.result===!1&&b.preventDefault());return b.type=q,e||b.isDefaultPrevented()||o._default&&o._default.apply(p.pop(),c)!==!1||!n.acceptData(d)||k&&n.isFunction(d[q])&&!n.isWindow(d)&&(h=d[k],h&&(d[k]=null),n.event.triggered=q,d[q](),n.event.triggered=void 0,h&&(d[k]=h)),b.result}},dispatch:function(a){a=n.event.fix(a);var b,c,e,f,g,h=[],i=d.call(arguments),j=(L.get(this,"events")||{})[a.type]||[],k=n.event.special[a.type]||{};if(i[0]=a,a.delegateTarget=this,!k.preDispatch||k.preDispatch.call(this,a)!==!1){h=n.event.handlers.call(this,a,j),b=0;while((f=h[b++])&&!a.isPropagationStopped()){a.currentTarget=f.elem,c=0;while((g=f.handlers[c++])&&!a.isImmediatePropagationStopped())(!a.namespace_re||a.namespace_re.test(g.namespace))&&(a.handleObj=g,a.data=g.data,e=((n.event.special[g.origType]||{}).handle||g.handler).apply(f.elem,i),void 0!==e&&(a.result=e)===!1&&(a.preventDefault(),a.stopPropagation()))}return k.postDispatch&&k.postDispatch.call(this,a),a.result}},handlers:function(a,b){var c,d,e,f,g=[],h=b.delegateCount,i=a.target;if(h&&i.nodeType&&(!a.button||"click"!==a.type))for(;i!==this;i=i.parentNode||this)if(i.disabled!==!0||"click"!==a.type){for(d=[],c=0;h>c;c++)f=b[c],e=f.selector+" ",void 0===d[e]&&(d[e]=f.needsContext?n(e,this).index(i)>=0:n.find(e,this,null,[i]).length),d[e]&&d.push(f);d.length&&g.push({elem:i,handlers:d})}return h<b.length&&g.push({elem:this,handlers:b.slice(h)}),g},props:"altKey bubbles cancelable ctrlKey currentTarget eventPhase metaKey relatedTarget shiftKey target timeStamp view which".split(" "),fixHooks:{},keyHooks:{props:"char charCode key keyCode".split(" "),filter:function(a,b){return null==a.which&&(a.which=null!=b.charCode?b.charCode:b.keyCode),a}},mouseHooks:{props:"button buttons clientX clientY offsetX offsetY pageX pageY screenX screenY toElement".split(" "),filter:function(a,b){var c,d,e,f=b.button;return null==a.pageX&&null!=b.clientX&&(c=a.target.ownerDocument||l,d=c.documentElement,e=c.body,a.pageX=b.clientX+(d&&d.scrollLeft||e&&e.scrollLeft||0)-(d&&d.clientLeft||e&&e.clientLeft||0),a.pageY=b.clientY+(d&&d.scrollTop||e&&e.scrollTop||0)-(d&&d.clientTop||e&&e.clientTop||0)),a.which||void 0===f||(a.which=1&f?1:2&f?3:4&f?2:0),a}},fix:function(a){if(a[n.expando])return a;var b,c,d,e=a.type,f=a,g=this.fixHooks[e];g||(this.fixHooks[e]=g=W.test(e)?this.mouseHooks:V.test(e)?this.keyHooks:{}),d=g.props?this.props.concat(g.props):this.props,a=new n.Event(f),b=d.length;while(b--)c=d[b],a[c]=f[c];return a.target||(a.target=l),3===a.target.nodeType&&(a.target=a.target.parentNode),g.filter?g.filter(a,f):a},special:{load:{noBubble:!0},focus:{trigger:function(){return this!==_()&&this.focus?(this.focus(),!1):void 0},delegateType:"focusin"},blur:{trigger:function(){return this===_()&&this.blur?(this.blur(),!1):void 0},delegateType:"focusout"},click:{trigger:function(){return"checkbox"===this.type&&this.click&&n.nodeName(this,"input")?(this.click(),!1):void 0},_default:function(a){return n.nodeName(a.target,"a")}},beforeunload:{postDispatch:function(a){void 0!==a.result&&a.originalEvent&&(a.originalEvent.returnValue=a.result)}}},simulate:function(a,b,c,d){var e=n.extend(new n.Event,c,{type:a,isSimulated:!0,originalEvent:{}});d?n.event.trigger(e,null,b):n.event.dispatch.call(b,e),e.isDefaultPrevented()&&c.preventDefault()}},n.removeEvent=function(a,b,c){a.removeEventListener&&a.removeEventListener(b,c,!1)},n.Event=function(a,b){return this instanceof n.Event?(a&&a.type?(this.originalEvent=a,this.type=a.type,this.isDefaultPrevented=a.defaultPrevented||void 0===a.defaultPrevented&&a.returnValue===!1?Z:$):this.type=a,b&&n.extend(this,b),this.timeStamp=a&&a.timeStamp||n.now(),void(this[n.expando]=!0)):new n.Event(a,b)},n.Event.prototype={isDefaultPrevented:$,isPropagationStopped:$,isImmediatePropagationStopped:$,preventDefault:function(){var a=this.originalEvent;this.isDefaultPrevented=Z,a&&a.preventDefault&&a.preventDefault()},stopPropagation:function(){var a=this.originalEvent;this.isPropagationStopped=Z,a&&a.stopPropagation&&a.stopPropagation()},stopImmediatePropagation:function(){var a=this.originalEvent;this.isImmediatePropagationStopped=Z,a&&a.stopImmediatePropagation&&a.stopImmediatePropagation(),this.stopPropagation()}},n.each({mouseenter:"mouseover",mouseleave:"mouseout",pointerenter:"pointerover",pointerleave:"pointerout"},function(a,b){n.event.special[a]={delegateType:b,bindType:b,handle:function(a){var c,d=this,e=a.relatedTarget,f=a.handleObj;return(!e||e!==d&&!n.contains(d,e))&&(a.type=f.origType,c=f.handler.apply(this,arguments),a.type=b),c}}}),k.focusinBubbles||n.each({focus:"focusin",blur:"focusout"},function(a,b){var c=function(a){n.event.simulate(b,a.target,n.event.fix(a),!0)};n.event.special[b]={setup:function(){var d=this.ownerDocument||this,e=L.access(d,b);e||d.addEventListener(a,c,!0),L.access(d,b,(e||0)+1)},teardown:function(){var d=this.ownerDocument||this,e=L.access(d,b)-1;e?L.access(d,b,e):(d.removeEventListener(a,c,!0),L.remove(d,b))}}}),n.fn.extend({on:function(a,b,c,d,e){var f,g;if("object"==typeof a){"string"!=typeof b&&(c=c||b,b=void 0);for(g in a)this.on(g,b,c,a[g],e);return this}if(null==c&&null==d?(d=b,c=b=void 0):null==d&&("string"==typeof b?(d=c,c=void 0):(d=c,c=b,b=void 0)),d===!1)d=$;else if(!d)return this;return 1===e&&(f=d,d=function(a){return n().off(a),f.apply(this,arguments)},d.guid=f.guid||(f.guid=n.guid++)),this.each(function(){n.event.add(this,a,d,c,b)})},one:function(a,b,c,d){return this.on(a,b,c,d,1)},off:function(a,b,c){var d,e;if(a&&a.preventDefault&&a.handleObj)return d=a.handleObj,n(a.delegateTarget).off(d.namespace?d.origType+"."+d.namespace:d.origType,d.selector,d.handler),this;if("object"==typeof a){for(e in a)this.off(e,b,a[e]);return this}return(b===!1||"function"==typeof b)&&(c=b,b=void 0),c===!1&&(c=$),this.each(function(){n.event.remove(this,a,c,b)})},trigger:function(a,b){return this.each(function(){n.event.trigger(a,b,this)})},triggerHandler:function(a,b){var c=this[0];return c?n.event.trigger(a,b,c,!0):void 0}});var aa=/<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:]+)[^>]*)\/>/gi,ba=/<([\w:]+)/,ca=/<|&#?\w+;/,da=/<(?:script|style|link)/i,ea=/checked\s*(?:[^=]|=\s*.checked.)/i,fa=/^$|\/(?:java|ecma)script/i,ga=/^true\/(.*)/,ha=/^\s*<!(?:\[CDATA\[|--)|(?:\]\]|--)>\s*$/g,ia={option:[1,"<select multiple='multiple'>","</select>"],thead:[1,"<table>","</table>"],col:[2,"<table><colgroup>","</colgroup></table>"],tr:[2,"<table><tbody>","</tbody></table>"],td:[3,"<table><tbody><tr>","</tr></tbody></table>"],_default:[0,"",""]};ia.optgroup=ia.option,ia.tbody=ia.tfoot=ia.colgroup=ia.caption=ia.thead,ia.th=ia.td;function ja(a,b){return n.nodeName(a,"table")&&n.nodeName(11!==b.nodeType?b:b.firstChild,"tr")?a.getElementsByTagName("tbody")[0]||a.appendChild(a.ownerDocument.createElement("tbody")):a}function ka(a){return a.type=(null!==a.getAttribute("type"))+"/"+a.type,a}function la(a){var b=ga.exec(a.type);return b?a.type=b[1]:a.removeAttribute("type"),a}function ma(a,b){for(var c=0,d=a.length;d>c;c++)L.set(a[c],"globalEval",!b||L.get(b[c],"globalEval"))}function na(a,b){var c,d,e,f,g,h,i,j;if(1===b.nodeType){if(L.hasData(a)&&(f=L.access(a),g=L.set(b,f),j=f.events)){delete g.handle,g.events={};for(e in j)for(c=0,d=j[e].length;d>c;c++)n.event.add(b,e,j[e][c])}M.hasData(a)&&(h=M.access(a),i=n.extend({},h),M.set(b,i))}}function oa(a,b){var c=a.getElementsByTagName?a.getElementsByTagName(b||"*"):a.querySelectorAll?a.querySelectorAll(b||"*"):[];return void 0===b||b&&n.nodeName(a,b)?n.merge([a],c):c}function pa(a,b){var c=b.nodeName.toLowerCase();"input"===c&&T.test(a.type)?b.checked=a.checked:("input"===c||"textarea"===c)&&(b.defaultValue=a.defaultValue)}n.extend({clone:function(a,b,c){var d,e,f,g,h=a.cloneNode(!0),i=n.contains(a.ownerDocument,a);if(!(k.noCloneChecked||1!==a.nodeType&&11!==a.nodeType||n.isXMLDoc(a)))for(g=oa(h),f=oa(a),d=0,e=f.length;e>d;d++)pa(f[d],g[d]);if(b)if(c)for(f=f||oa(a),g=g||oa(h),d=0,e=f.length;e>d;d++)na(f[d],g[d]);else na(a,h);return g=oa(h,"script"),g.length>0&&ma(g,!i&&oa(a,"script")),h},buildFragment:function(a,b,c,d){for(var e,f,g,h,i,j,k=b.createDocumentFragment(),l=[],m=0,o=a.length;o>m;m++)if(e=a[m],e||0===e)if("object"===n.type(e))n.merge(l,e.nodeType?[e]:e);else if(ca.test(e)){f=f||k.appendChild(b.createElement("div")),g=(ba.exec(e)||["",""])[1].toLowerCase(),h=ia[g]||ia._default,f.innerHTML=h[1]+e.replace(aa,"<$1></$2>")+h[2],j=h[0];while(j--)f=f.lastChild;n.merge(l,f.childNodes),f=k.firstChild,f.textContent=""}else l.push(b.createTextNode(e));k.textContent="",m=0;while(e=l[m++])if((!d||-1===n.inArray(e,d))&&(i=n.contains(e.ownerDocument,e),f=oa(k.appendChild(e),"script"),i&&ma(f),c)){j=0;while(e=f[j++])fa.test(e.type||"")&&c.push(e)}return k},cleanData:function(a){for(var b,c,d,e,f=n.event.special,g=0;void 0!==(c=a[g]);g++){if(n.acceptData(c)&&(e=c[L.expando],e&&(b=L.cache[e]))){if(b.events)for(d in b.events)f[d]?n.event.remove(c,d):n.removeEvent(c,d,b.handle);L.cache[e]&&delete L.cache[e]}delete M.cache[c[M.expando]]}}}),n.fn.extend({text:function(a){return J(this,function(a){return void 0===a?n.text(this):this.empty().each(function(){(1===this.nodeType||11===this.nodeType||9===this.nodeType)&&(this.textContent=a)})},null,a,arguments.length)},append:function(){return this.domManip(arguments,function(a){if(1===this.nodeType||11===this.nodeType||9===this.nodeType){var b=ja(this,a);b.appendChild(a)}})},prepend:function(){return this.domManip(arguments,function(a){if(1===this.nodeType||11===this.nodeType||9===this.nodeType){var b=ja(this,a);b.insertBefore(a,b.firstChild)}})},before:function(){return this.domManip(arguments,function(a){this.parentNode&&this.parentNode.insertBefore(a,this)})},after:function(){return this.domManip(arguments,function(a){this.parentNode&&this.parentNode.insertBefore(a,this.nextSibling)})},remove:function(a,b){for(var c,d=a?n.filter(a,this):this,e=0;null!=(c=d[e]);e++)b||1!==c.nodeType||n.cleanData(oa(c)),c.parentNode&&(b&&n.contains(c.ownerDocument,c)&&ma(oa(c,"script")),c.parentNode.removeChild(c));return this},empty:function(){for(var a,b=0;null!=(a=this[b]);b++)1===a.nodeType&&(n.cleanData(oa(a,!1)),a.textContent="");return this},clone:function(a,b){return a=null==a?!1:a,b=null==b?a:b,this.map(function(){return n.clone(this,a,b)})},html:function(a){return J(this,function(a){var b=this[0]||{},c=0,d=this.length;if(void 0===a&&1===b.nodeType)return b.innerHTML;if("string"==typeof a&&!da.test(a)&&!ia[(ba.exec(a)||["",""])[1].toLowerCase()]){a=a.replace(aa,"<$1></$2>");try{for(;d>c;c++)b=this[c]||{},1===b.nodeType&&(n.cleanData(oa(b,!1)),b.innerHTML=a);b=0}catch(e){}}b&&this.empty().append(a)},null,a,arguments.length)},replaceWith:function(){var a=arguments[0];return this.domManip(arguments,function(b){a=this.parentNode,n.cleanData(oa(this)),a&&a.replaceChild(b,this)}),a&&(a.length||a.nodeType)?this:this.remove()},detach:function(a){return this.remove(a,!0)},domManip:function(a,b){a=e.apply([],a);var c,d,f,g,h,i,j=0,l=this.length,m=this,o=l-1,p=a[0],q=n.isFunction(p);if(q||l>1&&"string"==typeof p&&!k.checkClone&&ea.test(p))return this.each(function(c){var d=m.eq(c);q&&(a[0]=p.call(this,c,d.html())),d.domManip(a,b)});if(l&&(c=n.buildFragment(a,this[0].ownerDocument,!1,this),d=c.firstChild,1===c.childNodes.length&&(c=d),d)){for(f=n.map(oa(c,"script"),ka),g=f.length;l>j;j++)h=c,j!==o&&(h=n.clone(h,!0,!0),g&&n.merge(f,oa(h,"script"))),b.call(this[j],h,j);if(g)for(i=f[f.length-1].ownerDocument,n.map(f,la),j=0;g>j;j++)h=f[j],fa.test(h.type||"")&&!L.access(h,"globalEval")&&n.contains(i,h)&&(h.src?n._evalUrl&&n._evalUrl(h.src):n.globalEval(h.textContent.replace(ha,"")))}return this}}),n.each({appendTo:"append",prependTo:"prepend",insertBefore:"before",insertAfter:"after",replaceAll:"replaceWith"},function(a,b){n.fn[a]=function(a){for(var c,d=[],e=n(a),g=e.length-1,h=0;g>=h;h++)c=h===g?this:this.clone(!0),n(e[h])[b](c),f.apply(d,c.get());return this.pushStack(d)}});var qa,ra={};function sa(b,c){var d,e=n(c.createElement(b)).appendTo(c.body),f=a.getDefaultComputedStyle&&(d=a.getDefaultComputedStyle(e[0]))?d.display:n.css(e[0],"display");return e.detach(),f}function ta(a){var b=l,c=ra[a];return c||(c=sa(a,b),"none"!==c&&c||(qa=(qa||n("<iframe frameborder='0' width='0' height='0'/>")).appendTo(b.documentElement),b=qa[0].contentDocument,b.write(),b.close(),c=sa(a,b),qa.detach()),ra[a]=c),c}var ua=/^margin/,va=new RegExp("^("+Q+")(?!px)[a-z%]+$","i"),wa=function(b){return b.ownerDocument.defaultView.opener?b.ownerDocument.defaultView.getComputedStyle(b,null):a.getComputedStyle(b,null)};function xa(a,b,c){var d,e,f,g,h=a.style;return c=c||wa(a),c&&(g=c.getPropertyValue(b)||c[b]),c&&(""!==g||n.contains(a.ownerDocument,a)||(g=n.style(a,b)),va.test(g)&&ua.test(b)&&(d=h.width,e=h.minWidth,f=h.maxWidth,h.minWidth=h.maxWidth=h.width=g,g=c.width,h.width=d,h.minWidth=e,h.maxWidth=f)),void 0!==g?g+"":g}function ya(a,b){return{get:function(){return a()?void delete this.get:(this.get=b).apply(this,arguments)}}}!function(){var b,c,d=l.documentElement,e=l.createElement("div"),f=l.createElement("div");if(f.style){f.style.backgroundClip="content-box",f.cloneNode(!0).style.backgroundClip="",k.clearCloneStyle="content-box"===f.style.backgroundClip,e.style.cssText="border:0;width:0;height:0;top:0;left:-9999px;margin-top:1px;position:absolute",e.appendChild(f);function g(){f.style.cssText="-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;display:block;margin-top:1%;top:1%;border:1px;padding:1px;width:4px;position:absolute",f.innerHTML="",d.appendChild(e);var g=a.getComputedStyle(f,null);b="1%"!==g.top,c="4px"===g.width,d.removeChild(e)}a.getComputedStyle&&n.extend(k,{pixelPosition:function(){return g(),b},boxSizingReliable:function(){return null==c&&g(),c},reliableMarginRight:function(){var b,c=f.appendChild(l.createElement("div"));return c.style.cssText=f.style.cssText="-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box;display:block;margin:0;border:0;padding:0",c.style.marginRight=c.style.width="0",f.style.width="1px",d.appendChild(e),b=!parseFloat(a.getComputedStyle(c,null).marginRight),d.removeChild(e),f.removeChild(c),b}})}}(),n.swap=function(a,b,c,d){var e,f,g={};for(f in b)g[f]=a.style[f],a.style[f]=b[f];e=c.apply(a,d||[]);for(f in b)a.style[f]=g[f];return e};var za=/^(none|table(?!-c[ea]).+)/,Aa=new RegExp("^("+Q+")(.*)$","i"),Ba=new RegExp("^([+-])=("+Q+")","i"),Ca={position:"absolute",visibility:"hidden",display:"block"},Da={letterSpacing:"0",fontWeight:"400"},Ea=["Webkit","O","Moz","ms"];function Fa(a,b){if(b in a)return b;var c=b[0].toUpperCase()+b.slice(1),d=b,e=Ea.length;while(e--)if(b=Ea[e]+c,b in a)return b;return d}function Ga(a,b,c){var d=Aa.exec(b);return d?Math.max(0,d[1]-(c||0))+(d[2]||"px"):b}function Ha(a,b,c,d,e){for(var f=c===(d?"border":"content")?4:"width"===b?1:0,g=0;4>f;f+=2)"margin"===c&&(g+=n.css(a,c+R[f],!0,e)),d?("content"===c&&(g-=n.css(a,"padding"+R[f],!0,e)),"margin"!==c&&(g-=n.css(a,"border"+R[f]+"Width",!0,e))):(g+=n.css(a,"padding"+R[f],!0,e),"padding"!==c&&(g+=n.css(a,"border"+R[f]+"Width",!0,e)));return g}function Ia(a,b,c){var d=!0,e="width"===b?a.offsetWidth:a.offsetHeight,f=wa(a),g="border-box"===n.css(a,"boxSizing",!1,f);if(0>=e||null==e){if(e=xa(a,b,f),(0>e||null==e)&&(e=a.style[b]),va.test(e))return e;d=g&&(k.boxSizingReliable()||e===a.style[b]),e=parseFloat(e)||0}return e+Ha(a,b,c||(g?"border":"content"),d,f)+"px"}function Ja(a,b){for(var c,d,e,f=[],g=0,h=a.length;h>g;g++)d=a[g],d.style&&(f[g]=L.get(d,"olddisplay"),c=d.style.display,b?(f[g]||"none"!==c||(d.style.display=""),""===d.style.display&&S(d)&&(f[g]=L.access(d,"olddisplay",ta(d.nodeName)))):(e=S(d),"none"===c&&e||L.set(d,"olddisplay",e?c:n.css(d,"display"))));for(g=0;h>g;g++)d=a[g],d.style&&(b&&"none"!==d.style.display&&""!==d.style.display||(d.style.display=b?f[g]||"":"none"));return a}n.extend({cssHooks:{opacity:{get:function(a,b){if(b){var c=xa(a,"opacity");return""===c?"1":c}}}},cssNumber:{columnCount:!0,fillOpacity:!0,flexGrow:!0,flexShrink:!0,fontWeight:!0,lineHeight:!0,opacity:!0,order:!0,orphans:!0,widows:!0,zIndex:!0,zoom:!0},cssProps:{"float":"cssFloat"},style:function(a,b,c,d){if(a&&3!==a.nodeType&&8!==a.nodeType&&a.style){var e,f,g,h=n.camelCase(b),i=a.style;return b=n.cssProps[h]||(n.cssProps[h]=Fa(i,h)),g=n.cssHooks[b]||n.cssHooks[h],void 0===c?g&&"get"in g&&void 0!==(e=g.get(a,!1,d))?e:i[b]:(f=typeof c,"string"===f&&(e=Ba.exec(c))&&(c=(e[1]+1)*e[2]+parseFloat(n.css(a,b)),f="number"),null!=c&&c===c&&("number"!==f||n.cssNumber[h]||(c+="px"),k.clearCloneStyle||""!==c||0!==b.indexOf("background")||(i[b]="inherit"),g&&"set"in g&&void 0===(c=g.set(a,c,d))||(i[b]=c)),void 0)}},css:function(a,b,c,d){var e,f,g,h=n.camelCase(b);return b=n.cssProps[h]||(n.cssProps[h]=Fa(a.style,h)),g=n.cssHooks[b]||n.cssHooks[h],g&&"get"in g&&(e=g.get(a,!0,c)),void 0===e&&(e=xa(a,b,d)),"normal"===e&&b in Da&&(e=Da[b]),""===c||c?(f=parseFloat(e),c===!0||n.isNumeric(f)?f||0:e):e}}),n.each(["height","width"],function(a,b){n.cssHooks[b]={get:function(a,c,d){return c?za.test(n.css(a,"display"))&&0===a.offsetWidth?n.swap(a,Ca,function(){return Ia(a,b,d)}):Ia(a,b,d):void 0},set:function(a,c,d){var e=d&&wa(a);return Ga(a,c,d?Ha(a,b,d,"border-box"===n.css(a,"boxSizing",!1,e),e):0)}}}),n.cssHooks.marginRight=ya(k.reliableMarginRight,function(a,b){return b?n.swap(a,{display:"inline-block"},xa,[a,"marginRight"]):void 0}),n.each({margin:"",padding:"",border:"Width"},function(a,b){n.cssHooks[a+b]={expand:function(c){for(var d=0,e={},f="string"==typeof c?c.split(" "):[c];4>d;d++)e[a+R[d]+b]=f[d]||f[d-2]||f[0];return e}},ua.test(a)||(n.cssHooks[a+b].set=Ga)}),n.fn.extend({css:function(a,b){return J(this,function(a,b,c){var d,e,f={},g=0;if(n.isArray(b)){for(d=wa(a),e=b.length;e>g;g++)f[b[g]]=n.css(a,b[g],!1,d);return f}return void 0!==c?n.style(a,b,c):n.css(a,b)},a,b,arguments.length>1)},show:function(){return Ja(this,!0)},hide:function(){return Ja(this)},toggle:function(a){return"boolean"==typeof a?a?this.show():this.hide():this.each(function(){S(this)?n(this).show():n(this).hide()})}});function Ka(a,b,c,d,e){return new Ka.prototype.init(a,b,c,d,e)}n.Tween=Ka,Ka.prototype={constructor:Ka,init:function(a,b,c,d,e,f){this.elem=a,this.prop=c,this.easing=e||"swing",this.options=b,this.start=this.now=this.cur(),this.end=d,this.unit=f||(n.cssNumber[c]?"":"px")},cur:function(){var a=Ka.propHooks[this.prop];return a&&a.get?a.get(this):Ka.propHooks._default.get(this)},run:function(a){var b,c=Ka.propHooks[this.prop];return this.options.duration?this.pos=b=n.easing[this.easing](a,this.options.duration*a,0,1,this.options.duration):this.pos=b=a,this.now=(this.end-this.start)*b+this.start,this.options.step&&this.options.step.call(this.elem,this.now,this),c&&c.set?c.set(this):Ka.propHooks._default.set(this),this}},Ka.prototype.init.prototype=Ka.prototype,Ka.propHooks={_default:{get:function(a){var b;return null==a.elem[a.prop]||a.elem.style&&null!=a.elem.style[a.prop]?(b=n.css(a.elem,a.prop,""),b&&"auto"!==b?b:0):a.elem[a.prop]},set:function(a){n.fx.step[a.prop]?n.fx.step[a.prop](a):a.elem.style&&(null!=a.elem.style[n.cssProps[a.prop]]||n.cssHooks[a.prop])?n.style(a.elem,a.prop,a.now+a.unit):a.elem[a.prop]=a.now}}},Ka.propHooks.scrollTop=Ka.propHooks.scrollLeft={set:function(a){a.elem.nodeType&&a.elem.parentNode&&(a.elem[a.prop]=a.now)}},n.easing={linear:function(a){return a},swing:function(a){return.5-Math.cos(a*Math.PI)/2}},n.fx=Ka.prototype.init,n.fx.step={};var La,Ma,Na=/^(?:toggle|show|hide)$/,Oa=new RegExp("^(?:([+-])=|)("+Q+")([a-z%]*)$","i"),Pa=/queueHooks$/,Qa=[Va],Ra={"*":[function(a,b){var c=this.createTween(a,b),d=c.cur(),e=Oa.exec(b),f=e&&e[3]||(n.cssNumber[a]?"":"px"),g=(n.cssNumber[a]||"px"!==f&&+d)&&Oa.exec(n.css(c.elem,a)),h=1,i=20;if(g&&g[3]!==f){f=f||g[3],e=e||[],g=+d||1;do h=h||".5",g/=h,n.style(c.elem,a,g+f);while(h!==(h=c.cur()/d)&&1!==h&&--i)}return e&&(g=c.start=+g||+d||0,c.unit=f,c.end=e[1]?g+(e[1]+1)*e[2]:+e[2]),c}]};function Sa(){return setTimeout(function(){La=void 0}),La=n.now()}function Ta(a,b){var c,d=0,e={height:a};for(b=b?1:0;4>d;d+=2-b)c=R[d],e["margin"+c]=e["padding"+c]=a;return b&&(e.opacity=e.width=a),e}function Ua(a,b,c){for(var d,e=(Ra[b]||[]).concat(Ra["*"]),f=0,g=e.length;g>f;f++)if(d=e[f].call(c,b,a))return d}function Va(a,b,c){var d,e,f,g,h,i,j,k,l=this,m={},o=a.style,p=a.nodeType&&S(a),q=L.get(a,"fxshow");c.queue||(h=n._queueHooks(a,"fx"),null==h.unqueued&&(h.unqueued=0,i=h.empty.fire,h.empty.fire=function(){h.unqueued||i()}),h.unqueued++,l.always(function(){l.always(function(){h.unqueued--,n.queue(a,"fx").length||h.empty.fire()})})),1===a.nodeType&&("height"in b||"width"in b)&&(c.overflow=[o.overflow,o.overflowX,o.overflowY],j=n.css(a,"display"),k="none"===j?L.get(a,"olddisplay")||ta(a.nodeName):j,"inline"===k&&"none"===n.css(a,"float")&&(o.display="inline-block")),c.overflow&&(o.overflow="hidden",l.always(function(){o.overflow=c.overflow[0],o.overflowX=c.overflow[1],o.overflowY=c.overflow[2]}));for(d in b)if(e=b[d],Na.exec(e)){if(delete b[d],f=f||"toggle"===e,e===(p?"hide":"show")){if("show"!==e||!q||void 0===q[d])continue;p=!0}m[d]=q&&q[d]||n.style(a,d)}else j=void 0;if(n.isEmptyObject(m))"inline"===("none"===j?ta(a.nodeName):j)&&(o.display=j);else{q?"hidden"in q&&(p=q.hidden):q=L.access(a,"fxshow",{}),f&&(q.hidden=!p),p?n(a).show():l.done(function(){n(a).hide()}),l.done(function(){var b;L.remove(a,"fxshow");for(b in m)n.style(a,b,m[b])});for(d in m)g=Ua(p?q[d]:0,d,l),d in q||(q[d]=g.start,p&&(g.end=g.start,g.start="width"===d||"height"===d?1:0))}}function Wa(a,b){var c,d,e,f,g;for(c in a)if(d=n.camelCase(c),e=b[d],f=a[c],n.isArray(f)&&(e=f[1],f=a[c]=f[0]),c!==d&&(a[d]=f,delete a[c]),g=n.cssHooks[d],g&&"expand"in g){f=g.expand(f),delete a[d];for(c in f)c in a||(a[c]=f[c],b[c]=e)}else b[d]=e}function Xa(a,b,c){var d,e,f=0,g=Qa.length,h=n.Deferred().always(function(){delete i.elem}),i=function(){if(e)return!1;for(var b=La||Sa(),c=Math.max(0,j.startTime+j.duration-b),d=c/j.duration||0,f=1-d,g=0,i=j.tweens.length;i>g;g++)j.tweens[g].run(f);return h.notifyWith(a,[j,f,c]),1>f&&i?c:(h.resolveWith(a,[j]),!1)},j=h.promise({elem:a,props:n.extend({},b),opts:n.extend(!0,{specialEasing:{}},c),originalProperties:b,originalOptions:c,startTime:La||Sa(),duration:c.duration,tweens:[],createTween:function(b,c){var d=n.Tween(a,j.opts,b,c,j.opts.specialEasing[b]||j.opts.easing);return j.tweens.push(d),d},stop:function(b){var c=0,d=b?j.tweens.length:0;if(e)return this;for(e=!0;d>c;c++)j.tweens[c].run(1);return b?h.resolveWith(a,[j,b]):h.rejectWith(a,[j,b]),this}}),k=j.props;for(Wa(k,j.opts.specialEasing);g>f;f++)if(d=Qa[f].call(j,a,k,j.opts))return d;return n.map(k,Ua,j),n.isFunction(j.opts.start)&&j.opts.start.call(a,j),n.fx.timer(n.extend(i,{elem:a,anim:j,queue:j.opts.queue})),j.progress(j.opts.progress).done(j.opts.done,j.opts.complete).fail(j.opts.fail).always(j.opts.always)}n.Animation=n.extend(Xa,{tweener:function(a,b){n.isFunction(a)?(b=a,a=["*"]):a=a.split(" ");for(var c,d=0,e=a.length;e>d;d++)c=a[d],Ra[c]=Ra[c]||[],Ra[c].unshift(b)},prefilter:function(a,b){b?Qa.unshift(a):Qa.push(a)}}),n.speed=function(a,b,c){var d=a&&"object"==typeof a?n.extend({},a):{complete:c||!c&&b||n.isFunction(a)&&a,duration:a,easing:c&&b||b&&!n.isFunction(b)&&b};return d.duration=n.fx.off?0:"number"==typeof d.duration?d.duration:d.duration in n.fx.speeds?n.fx.speeds[d.duration]:n.fx.speeds._default,(null==d.queue||d.queue===!0)&&(d.queue="fx"),d.old=d.complete,d.complete=function(){n.isFunction(d.old)&&d.old.call(this),d.queue&&n.dequeue(this,d.queue)},d},n.fn.extend({fadeTo:function(a,b,c,d){return this.filter(S).css("opacity",0).show().end().animate({opacity:b},a,c,d)},animate:function(a,b,c,d){var e=n.isEmptyObject(a),f=n.speed(b,c,d),g=function(){var b=Xa(this,n.extend({},a),f);(e||L.get(this,"finish"))&&b.stop(!0)};return g.finish=g,e||f.queue===!1?this.each(g):this.queue(f.queue,g)},stop:function(a,b,c){var d=function(a){var b=a.stop;delete a.stop,b(c)};return"string"!=typeof a&&(c=b,b=a,a=void 0),b&&a!==!1&&this.queue(a||"fx",[]),this.each(function(){var b=!0,e=null!=a&&a+"queueHooks",f=n.timers,g=L.get(this);if(e)g[e]&&g[e].stop&&d(g[e]);else for(e in g)g[e]&&g[e].stop&&Pa.test(e)&&d(g[e]);for(e=f.length;e--;)f[e].elem!==this||null!=a&&f[e].queue!==a||(f[e].anim.stop(c),b=!1,f.splice(e,1));(b||!c)&&n.dequeue(this,a)})},finish:function(a){return a!==!1&&(a=a||"fx"),this.each(function(){var b,c=L.get(this),d=c[a+"queue"],e=c[a+"queueHooks"],f=n.timers,g=d?d.length:0;for(c.finish=!0,n.queue(this,a,[]),e&&e.stop&&e.stop.call(this,!0),b=f.length;b--;)f[b].elem===this&&f[b].queue===a&&(f[b].anim.stop(!0),f.splice(b,1));for(b=0;g>b;b++)d[b]&&d[b].finish&&d[b].finish.call(this);delete c.finish})}}),n.each(["toggle","show","hide"],function(a,b){var c=n.fn[b];n.fn[b]=function(a,d,e){return null==a||"boolean"==typeof a?c.apply(this,arguments):this.animate(Ta(b,!0),a,d,e)}}),n.each({slideDown:Ta("show"),slideUp:Ta("hide"),slideToggle:Ta("toggle"),fadeIn:{opacity:"show"},fadeOut:{opacity:"hide"},fadeToggle:{opacity:"toggle"}},function(a,b){n.fn[a]=function(a,c,d){return this.animate(b,a,c,d)}}),n.timers=[],n.fx.tick=function(){var a,b=0,c=n.timers;for(La=n.now();b<c.length;b++)a=c[b],a()||c[b]!==a||c.splice(b--,1);c.length||n.fx.stop(),La=void 0},n.fx.timer=function(a){n.timers.push(a),a()?n.fx.start():n.timers.pop()},n.fx.interval=13,n.fx.start=function(){Ma||(Ma=setInterval(n.fx.tick,n.fx.interval))},n.fx.stop=function(){clearInterval(Ma),Ma=null},n.fx.speeds={slow:600,fast:200,_default:400},n.fn.delay=function(a,b){return a=n.fx?n.fx.speeds[a]||a:a,b=b||"fx",this.queue(b,function(b,c){var d=setTimeout(b,a);c.stop=function(){clearTimeout(d)}})},function(){var a=l.createElement("input"),b=l.createElement("select"),c=b.appendChild(l.createElement("option"));a.type="checkbox",k.checkOn=""!==a.value,k.optSelected=c.selected,b.disabled=!0,k.optDisabled=!c.disabled,a=l.createElement("input"),a.value="t",a.type="radio",k.radioValue="t"===a.value}();var Ya,Za,$a=n.expr.attrHandle;n.fn.extend({attr:function(a,b){return J(this,n.attr,a,b,arguments.length>1)},removeAttr:function(a){return this.each(function(){n.removeAttr(this,a)})}}),n.extend({attr:function(a,b,c){var d,e,f=a.nodeType;if(a&&3!==f&&8!==f&&2!==f)return typeof a.getAttribute===U?n.prop(a,b,c):(1===f&&n.isXMLDoc(a)||(b=b.toLowerCase(),d=n.attrHooks[b]||(n.expr.match.bool.test(b)?Za:Ya)),
+void 0===c?d&&"get"in d&&null!==(e=d.get(a,b))?e:(e=n.find.attr(a,b),null==e?void 0:e):null!==c?d&&"set"in d&&void 0!==(e=d.set(a,c,b))?e:(a.setAttribute(b,c+""),c):void n.removeAttr(a,b))},removeAttr:function(a,b){var c,d,e=0,f=b&&b.match(E);if(f&&1===a.nodeType)while(c=f[e++])d=n.propFix[c]||c,n.expr.match.bool.test(c)&&(a[d]=!1),a.removeAttribute(c)},attrHooks:{type:{set:function(a,b){if(!k.radioValue&&"radio"===b&&n.nodeName(a,"input")){var c=a.value;return a.setAttribute("type",b),c&&(a.value=c),b}}}}}),Za={set:function(a,b,c){return b===!1?n.removeAttr(a,c):a.setAttribute(c,c),c}},n.each(n.expr.match.bool.source.match(/\w+/g),function(a,b){var c=$a[b]||n.find.attr;$a[b]=function(a,b,d){var e,f;return d||(f=$a[b],$a[b]=e,e=null!=c(a,b,d)?b.toLowerCase():null,$a[b]=f),e}});var _a=/^(?:input|select|textarea|button)$/i;n.fn.extend({prop:function(a,b){return J(this,n.prop,a,b,arguments.length>1)},removeProp:function(a){return this.each(function(){delete this[n.propFix[a]||a]})}}),n.extend({propFix:{"for":"htmlFor","class":"className"},prop:function(a,b,c){var d,e,f,g=a.nodeType;if(a&&3!==g&&8!==g&&2!==g)return f=1!==g||!n.isXMLDoc(a),f&&(b=n.propFix[b]||b,e=n.propHooks[b]),void 0!==c?e&&"set"in e&&void 0!==(d=e.set(a,c,b))?d:a[b]=c:e&&"get"in e&&null!==(d=e.get(a,b))?d:a[b]},propHooks:{tabIndex:{get:function(a){return a.hasAttribute("tabindex")||_a.test(a.nodeName)||a.href?a.tabIndex:-1}}}}),k.optSelected||(n.propHooks.selected={get:function(a){var b=a.parentNode;return b&&b.parentNode&&b.parentNode.selectedIndex,null}}),n.each(["tabIndex","readOnly","maxLength","cellSpacing","cellPadding","rowSpan","colSpan","useMap","frameBorder","contentEditable"],function(){n.propFix[this.toLowerCase()]=this});var ab=/[\t\r\n\f]/g;n.fn.extend({addClass:function(a){var b,c,d,e,f,g,h="string"==typeof a&&a,i=0,j=this.length;if(n.isFunction(a))return this.each(function(b){n(this).addClass(a.call(this,b,this.className))});if(h)for(b=(a||"").match(E)||[];j>i;i++)if(c=this[i],d=1===c.nodeType&&(c.className?(" "+c.className+" ").replace(ab," "):" ")){f=0;while(e=b[f++])d.indexOf(" "+e+" ")<0&&(d+=e+" ");g=n.trim(d),c.className!==g&&(c.className=g)}return this},removeClass:function(a){var b,c,d,e,f,g,h=0===arguments.length||"string"==typeof a&&a,i=0,j=this.length;if(n.isFunction(a))return this.each(function(b){n(this).removeClass(a.call(this,b,this.className))});if(h)for(b=(a||"").match(E)||[];j>i;i++)if(c=this[i],d=1===c.nodeType&&(c.className?(" "+c.className+" ").replace(ab," "):"")){f=0;while(e=b[f++])while(d.indexOf(" "+e+" ")>=0)d=d.replace(" "+e+" "," ");g=a?n.trim(d):"",c.className!==g&&(c.className=g)}return this},toggleClass:function(a,b){var c=typeof a;return"boolean"==typeof b&&"string"===c?b?this.addClass(a):this.removeClass(a):this.each(n.isFunction(a)?function(c){n(this).toggleClass(a.call(this,c,this.className,b),b)}:function(){if("string"===c){var b,d=0,e=n(this),f=a.match(E)||[];while(b=f[d++])e.hasClass(b)?e.removeClass(b):e.addClass(b)}else(c===U||"boolean"===c)&&(this.className&&L.set(this,"__className__",this.className),this.className=this.className||a===!1?"":L.get(this,"__className__")||"")})},hasClass:function(a){for(var b=" "+a+" ",c=0,d=this.length;d>c;c++)if(1===this[c].nodeType&&(" "+this[c].className+" ").replace(ab," ").indexOf(b)>=0)return!0;return!1}});var bb=/\r/g;n.fn.extend({val:function(a){var b,c,d,e=this[0];{if(arguments.length)return d=n.isFunction(a),this.each(function(c){var e;1===this.nodeType&&(e=d?a.call(this,c,n(this).val()):a,null==e?e="":"number"==typeof e?e+="":n.isArray(e)&&(e=n.map(e,function(a){return null==a?"":a+""})),b=n.valHooks[this.type]||n.valHooks[this.nodeName.toLowerCase()],b&&"set"in b&&void 0!==b.set(this,e,"value")||(this.value=e))});if(e)return b=n.valHooks[e.type]||n.valHooks[e.nodeName.toLowerCase()],b&&"get"in b&&void 0!==(c=b.get(e,"value"))?c:(c=e.value,"string"==typeof c?c.replace(bb,""):null==c?"":c)}}}),n.extend({valHooks:{option:{get:function(a){var b=n.find.attr(a,"value");return null!=b?b:n.trim(n.text(a))}},select:{get:function(a){for(var b,c,d=a.options,e=a.selectedIndex,f="select-one"===a.type||0>e,g=f?null:[],h=f?e+1:d.length,i=0>e?h:f?e:0;h>i;i++)if(c=d[i],!(!c.selected&&i!==e||(k.optDisabled?c.disabled:null!==c.getAttribute("disabled"))||c.parentNode.disabled&&n.nodeName(c.parentNode,"optgroup"))){if(b=n(c).val(),f)return b;g.push(b)}return g},set:function(a,b){var c,d,e=a.options,f=n.makeArray(b),g=e.length;while(g--)d=e[g],(d.selected=n.inArray(d.value,f)>=0)&&(c=!0);return c||(a.selectedIndex=-1),f}}}}),n.each(["radio","checkbox"],function(){n.valHooks[this]={set:function(a,b){return n.isArray(b)?a.checked=n.inArray(n(a).val(),b)>=0:void 0}},k.checkOn||(n.valHooks[this].get=function(a){return null===a.getAttribute("value")?"on":a.value})}),n.each("blur focus focusin focusout load resize scroll unload click dblclick mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave change select submit keydown keypress keyup error contextmenu".split(" "),function(a,b){n.fn[b]=function(a,c){return arguments.length>0?this.on(b,null,a,c):this.trigger(b)}}),n.fn.extend({hover:function(a,b){return this.mouseenter(a).mouseleave(b||a)},bind:function(a,b,c){return this.on(a,null,b,c)},unbind:function(a,b){return this.off(a,null,b)},delegate:function(a,b,c,d){return this.on(b,a,c,d)},undelegate:function(a,b,c){return 1===arguments.length?this.off(a,"**"):this.off(b,a||"**",c)}});var cb=n.now(),db=/\?/;n.parseJSON=function(a){return JSON.parse(a+"")},n.parseXML=function(a){var b,c;if(!a||"string"!=typeof a)return null;try{c=new DOMParser,b=c.parseFromString(a,"text/xml")}catch(d){b=void 0}return(!b||b.getElementsByTagName("parsererror").length)&&n.error("Invalid XML: "+a),b};var eb=/#.*$/,fb=/([?&])_=[^&]*/,gb=/^(.*?):[ \t]*([^\r\n]*)$/gm,hb=/^(?:about|app|app-storage|.+-extension|file|res|widget):$/,ib=/^(?:GET|HEAD)$/,jb=/^\/\//,kb=/^([\w.+-]+:)(?:\/\/(?:[^\/?#]*@|)([^\/?#:]*)(?::(\d+)|)|)/,lb={},mb={},nb="*/".concat("*"),ob=a.location.href,pb=kb.exec(ob.toLowerCase())||[];function qb(a){return function(b,c){"string"!=typeof b&&(c=b,b="*");var d,e=0,f=b.toLowerCase().match(E)||[];if(n.isFunction(c))while(d=f[e++])"+"===d[0]?(d=d.slice(1)||"*",(a[d]=a[d]||[]).unshift(c)):(a[d]=a[d]||[]).push(c)}}function rb(a,b,c,d){var e={},f=a===mb;function g(h){var i;return e[h]=!0,n.each(a[h]||[],function(a,h){var j=h(b,c,d);return"string"!=typeof j||f||e[j]?f?!(i=j):void 0:(b.dataTypes.unshift(j),g(j),!1)}),i}return g(b.dataTypes[0])||!e["*"]&&g("*")}function sb(a,b){var c,d,e=n.ajaxSettings.flatOptions||{};for(c in b)void 0!==b[c]&&((e[c]?a:d||(d={}))[c]=b[c]);return d&&n.extend(!0,a,d),a}function tb(a,b,c){var d,e,f,g,h=a.contents,i=a.dataTypes;while("*"===i[0])i.shift(),void 0===d&&(d=a.mimeType||b.getResponseHeader("Content-Type"));if(d)for(e in h)if(h[e]&&h[e].test(d)){i.unshift(e);break}if(i[0]in c)f=i[0];else{for(e in c){if(!i[0]||a.converters[e+" "+i[0]]){f=e;break}g||(g=e)}f=f||g}return f?(f!==i[0]&&i.unshift(f),c[f]):void 0}function ub(a,b,c,d){var e,f,g,h,i,j={},k=a.dataTypes.slice();if(k[1])for(g in a.converters)j[g.toLowerCase()]=a.converters[g];f=k.shift();while(f)if(a.responseFields[f]&&(c[a.responseFields[f]]=b),!i&&d&&a.dataFilter&&(b=a.dataFilter(b,a.dataType)),i=f,f=k.shift())if("*"===f)f=i;else if("*"!==i&&i!==f){if(g=j[i+" "+f]||j["* "+f],!g)for(e in j)if(h=e.split(" "),h[1]===f&&(g=j[i+" "+h[0]]||j["* "+h[0]])){g===!0?g=j[e]:j[e]!==!0&&(f=h[0],k.unshift(h[1]));break}if(g!==!0)if(g&&a["throws"])b=g(b);else try{b=g(b)}catch(l){return{state:"parsererror",error:g?l:"No conversion from "+i+" to "+f}}}return{state:"success",data:b}}n.extend({active:0,lastModified:{},etag:{},ajaxSettings:{url:ob,type:"GET",isLocal:hb.test(pb[1]),global:!0,processData:!0,async:!0,contentType:"application/x-www-form-urlencoded; charset=UTF-8",accepts:{"*":nb,text:"text/plain",html:"text/html",xml:"application/xml, text/xml",json:"application/json, text/javascript"},contents:{xml:/xml/,html:/html/,json:/json/},responseFields:{xml:"responseXML",text:"responseText",json:"responseJSON"},converters:{"* text":String,"text html":!0,"text json":n.parseJSON,"text xml":n.parseXML},flatOptions:{url:!0,context:!0}},ajaxSetup:function(a,b){return b?sb(sb(a,n.ajaxSettings),b):sb(n.ajaxSettings,a)},ajaxPrefilter:qb(lb),ajaxTransport:qb(mb),ajax:function(a,b){"object"==typeof a&&(b=a,a=void 0),b=b||{};var c,d,e,f,g,h,i,j,k=n.ajaxSetup({},b),l=k.context||k,m=k.context&&(l.nodeType||l.jquery)?n(l):n.event,o=n.Deferred(),p=n.Callbacks("once memory"),q=k.statusCode||{},r={},s={},t=0,u="canceled",v={readyState:0,getResponseHeader:function(a){var b;if(2===t){if(!f){f={};while(b=gb.exec(e))f[b[1].toLowerCase()]=b[2]}b=f[a.toLowerCase()]}return null==b?null:b},getAllResponseHeaders:function(){return 2===t?e:null},setRequestHeader:function(a,b){var c=a.toLowerCase();return t||(a=s[c]=s[c]||a,r[a]=b),this},overrideMimeType:function(a){return t||(k.mimeType=a),this},statusCode:function(a){var b;if(a)if(2>t)for(b in a)q[b]=[q[b],a[b]];else v.always(a[v.status]);return this},abort:function(a){var b=a||u;return c&&c.abort(b),x(0,b),this}};if(o.promise(v).complete=p.add,v.success=v.done,v.error=v.fail,k.url=((a||k.url||ob)+"").replace(eb,"").replace(jb,pb[1]+"//"),k.type=b.method||b.type||k.method||k.type,k.dataTypes=n.trim(k.dataType||"*").toLowerCase().match(E)||[""],null==k.crossDomain&&(h=kb.exec(k.url.toLowerCase()),k.crossDomain=!(!h||h[1]===pb[1]&&h[2]===pb[2]&&(h[3]||("http:"===h[1]?"80":"443"))===(pb[3]||("http:"===pb[1]?"80":"443")))),k.data&&k.processData&&"string"!=typeof k.data&&(k.data=n.param(k.data,k.traditional)),rb(lb,k,b,v),2===t)return v;i=n.event&&k.global,i&&0===n.active++&&n.event.trigger("ajaxStart"),k.type=k.type.toUpperCase(),k.hasContent=!ib.test(k.type),d=k.url,k.hasContent||(k.data&&(d=k.url+=(db.test(d)?"&":"?")+k.data,delete k.data),k.cache===!1&&(k.url=fb.test(d)?d.replace(fb,"$1_="+cb++):d+(db.test(d)?"&":"?")+"_="+cb++)),k.ifModified&&(n.lastModified[d]&&v.setRequestHeader("If-Modified-Since",n.lastModified[d]),n.etag[d]&&v.setRequestHeader("If-None-Match",n.etag[d])),(k.data&&k.hasContent&&k.contentType!==!1||b.contentType)&&v.setRequestHeader("Content-Type",k.contentType),v.setRequestHeader("Accept",k.dataTypes[0]&&k.accepts[k.dataTypes[0]]?k.accepts[k.dataTypes[0]]+("*"!==k.dataTypes[0]?", "+nb+"; q=0.01":""):k.accepts["*"]);for(j in k.headers)v.setRequestHeader(j,k.headers[j]);if(k.beforeSend&&(k.beforeSend.call(l,v,k)===!1||2===t))return v.abort();u="abort";for(j in{success:1,error:1,complete:1})v[j](k[j]);if(c=rb(mb,k,b,v)){v.readyState=1,i&&m.trigger("ajaxSend",[v,k]),k.async&&k.timeout>0&&(g=setTimeout(function(){v.abort("timeout")},k.timeout));try{t=1,c.send(r,x)}catch(w){if(!(2>t))throw w;x(-1,w)}}else x(-1,"No Transport");function x(a,b,f,h){var j,r,s,u,w,x=b;2!==t&&(t=2,g&&clearTimeout(g),c=void 0,e=h||"",v.readyState=a>0?4:0,j=a>=200&&300>a||304===a,f&&(u=tb(k,v,f)),u=ub(k,u,v,j),j?(k.ifModified&&(w=v.getResponseHeader("Last-Modified"),w&&(n.lastModified[d]=w),w=v.getResponseHeader("etag"),w&&(n.etag[d]=w)),204===a||"HEAD"===k.type?x="nocontent":304===a?x="notmodified":(x=u.state,r=u.data,s=u.error,j=!s)):(s=x,(a||!x)&&(x="error",0>a&&(a=0))),v.status=a,v.statusText=(b||x)+"",j?o.resolveWith(l,[r,x,v]):o.rejectWith(l,[v,x,s]),v.statusCode(q),q=void 0,i&&m.trigger(j?"ajaxSuccess":"ajaxError",[v,k,j?r:s]),p.fireWith(l,[v,x]),i&&(m.trigger("ajaxComplete",[v,k]),--n.active||n.event.trigger("ajaxStop")))}return v},getJSON:function(a,b,c){return n.get(a,b,c,"json")},getScript:function(a,b){return n.get(a,void 0,b,"script")}}),n.each(["get","post"],function(a,b){n[b]=function(a,c,d,e){return n.isFunction(c)&&(e=e||d,d=c,c=void 0),n.ajax({url:a,type:b,dataType:e,data:c,success:d})}}),n._evalUrl=function(a){return n.ajax({url:a,type:"GET",dataType:"script",async:!1,global:!1,"throws":!0})},n.fn.extend({wrapAll:function(a){var b;return n.isFunction(a)?this.each(function(b){n(this).wrapAll(a.call(this,b))}):(this[0]&&(b=n(a,this[0].ownerDocument).eq(0).clone(!0),this[0].parentNode&&b.insertBefore(this[0]),b.map(function(){var a=this;while(a.firstElementChild)a=a.firstElementChild;return a}).append(this)),this)},wrapInner:function(a){return this.each(n.isFunction(a)?function(b){n(this).wrapInner(a.call(this,b))}:function(){var b=n(this),c=b.contents();c.length?c.wrapAll(a):b.append(a)})},wrap:function(a){var b=n.isFunction(a);return this.each(function(c){n(this).wrapAll(b?a.call(this,c):a)})},unwrap:function(){return this.parent().each(function(){n.nodeName(this,"body")||n(this).replaceWith(this.childNodes)}).end()}}),n.expr.filters.hidden=function(a){return a.offsetWidth<=0&&a.offsetHeight<=0},n.expr.filters.visible=function(a){return!n.expr.filters.hidden(a)};var vb=/%20/g,wb=/\[\]$/,xb=/\r?\n/g,yb=/^(?:submit|button|image|reset|file)$/i,zb=/^(?:input|select|textarea|keygen)/i;function Ab(a,b,c,d){var e;if(n.isArray(b))n.each(b,function(b,e){c||wb.test(a)?d(a,e):Ab(a+"["+("object"==typeof e?b:"")+"]",e,c,d)});else if(c||"object"!==n.type(b))d(a,b);else for(e in b)Ab(a+"["+e+"]",b[e],c,d)}n.param=function(a,b){var c,d=[],e=function(a,b){b=n.isFunction(b)?b():null==b?"":b,d[d.length]=encodeURIComponent(a)+"="+encodeURIComponent(b)};if(void 0===b&&(b=n.ajaxSettings&&n.ajaxSettings.traditional),n.isArray(a)||a.jquery&&!n.isPlainObject(a))n.each(a,function(){e(this.name,this.value)});else for(c in a)Ab(c,a[c],b,e);return d.join("&").replace(vb,"+")},n.fn.extend({serialize:function(){return n.param(this.serializeArray())},serializeArray:function(){return this.map(function(){var a=n.prop(this,"elements");return a?n.makeArray(a):this}).filter(function(){var a=this.type;return this.name&&!n(this).is(":disabled")&&zb.test(this.nodeName)&&!yb.test(a)&&(this.checked||!T.test(a))}).map(function(a,b){var c=n(this).val();return null==c?null:n.isArray(c)?n.map(c,function(a){return{name:b.name,value:a.replace(xb,"\r\n")}}):{name:b.name,value:c.replace(xb,"\r\n")}}).get()}}),n.ajaxSettings.xhr=function(){try{return new XMLHttpRequest}catch(a){}};var Bb=0,Cb={},Db={0:200,1223:204},Eb=n.ajaxSettings.xhr();a.attachEvent&&a.attachEvent("onunload",function(){for(var a in Cb)Cb[a]()}),k.cors=!!Eb&&"withCredentials"in Eb,k.ajax=Eb=!!Eb,n.ajaxTransport(function(a){var b;return k.cors||Eb&&!a.crossDomain?{send:function(c,d){var e,f=a.xhr(),g=++Bb;if(f.open(a.type,a.url,a.async,a.username,a.password),a.xhrFields)for(e in a.xhrFields)f[e]=a.xhrFields[e];a.mimeType&&f.overrideMimeType&&f.overrideMimeType(a.mimeType),a.crossDomain||c["X-Requested-With"]||(c["X-Requested-With"]="XMLHttpRequest");for(e in c)f.setRequestHeader(e,c[e]);b=function(a){return function(){b&&(delete Cb[g],b=f.onload=f.onerror=null,"abort"===a?f.abort():"error"===a?d(f.status,f.statusText):d(Db[f.status]||f.status,f.statusText,"string"==typeof f.responseText?{text:f.responseText}:void 0,f.getAllResponseHeaders()))}},f.onload=b(),f.onerror=b("error"),b=Cb[g]=b("abort");try{f.send(a.hasContent&&a.data||null)}catch(h){if(b)throw h}},abort:function(){b&&b()}}:void 0}),n.ajaxSetup({accepts:{script:"text/javascript, application/javascript, application/ecmascript, application/x-ecmascript"},contents:{script:/(?:java|ecma)script/},converters:{"text script":function(a){return n.globalEval(a),a}}}),n.ajaxPrefilter("script",function(a){void 0===a.cache&&(a.cache=!1),a.crossDomain&&(a.type="GET")}),n.ajaxTransport("script",function(a){if(a.crossDomain){var b,c;return{send:function(d,e){b=n("<script>").prop({async:!0,charset:a.scriptCharset,src:a.url}).on("load error",c=function(a){b.remove(),c=null,a&&e("error"===a.type?404:200,a.type)}),l.head.appendChild(b[0])},abort:function(){c&&c()}}}});var Fb=[],Gb=/(=)\?(?=&|$)|\?\?/;n.ajaxSetup({jsonp:"callback",jsonpCallback:function(){var a=Fb.pop()||n.expando+"_"+cb++;return this[a]=!0,a}}),n.ajaxPrefilter("json jsonp",function(b,c,d){var e,f,g,h=b.jsonp!==!1&&(Gb.test(b.url)?"url":"string"==typeof b.data&&!(b.contentType||"").indexOf("application/x-www-form-urlencoded")&&Gb.test(b.data)&&"data");return h||"jsonp"===b.dataTypes[0]?(e=b.jsonpCallback=n.isFunction(b.jsonpCallback)?b.jsonpCallback():b.jsonpCallback,h?b[h]=b[h].replace(Gb,"$1"+e):b.jsonp!==!1&&(b.url+=(db.test(b.url)?"&":"?")+b.jsonp+"="+e),b.converters["script json"]=function(){return g||n.error(e+" was not called"),g[0]},b.dataTypes[0]="json",f=a[e],a[e]=function(){g=arguments},d.always(function(){a[e]=f,b[e]&&(b.jsonpCallback=c.jsonpCallback,Fb.push(e)),g&&n.isFunction(f)&&f(g[0]),g=f=void 0}),"script"):void 0}),n.parseHTML=function(a,b,c){if(!a||"string"!=typeof a)return null;"boolean"==typeof b&&(c=b,b=!1),b=b||l;var d=v.exec(a),e=!c&&[];return d?[b.createElement(d[1])]:(d=n.buildFragment([a],b,e),e&&e.length&&n(e).remove(),n.merge([],d.childNodes))};var Hb=n.fn.load;n.fn.load=function(a,b,c){if("string"!=typeof a&&Hb)return Hb.apply(this,arguments);var d,e,f,g=this,h=a.indexOf(" ");return h>=0&&(d=n.trim(a.slice(h)),a=a.slice(0,h)),n.isFunction(b)?(c=b,b=void 0):b&&"object"==typeof b&&(e="POST"),g.length>0&&n.ajax({url:a,type:e,dataType:"html",data:b}).done(function(a){f=arguments,g.html(d?n("<div>").append(n.parseHTML(a)).find(d):a)}).complete(c&&function(a,b){g.each(c,f||[a.responseText,b,a])}),this},n.each(["ajaxStart","ajaxStop","ajaxComplete","ajaxError","ajaxSuccess","ajaxSend"],function(a,b){n.fn[b]=function(a){return this.on(b,a)}}),n.expr.filters.animated=function(a){return n.grep(n.timers,function(b){return a===b.elem}).length};var Ib=a.document.documentElement;function Jb(a){return n.isWindow(a)?a:9===a.nodeType&&a.defaultView}n.offset={setOffset:function(a,b,c){var d,e,f,g,h,i,j,k=n.css(a,"position"),l=n(a),m={};"static"===k&&(a.style.position="relative"),h=l.offset(),f=n.css(a,"top"),i=n.css(a,"left"),j=("absolute"===k||"fixed"===k)&&(f+i).indexOf("auto")>-1,j?(d=l.position(),g=d.top,e=d.left):(g=parseFloat(f)||0,e=parseFloat(i)||0),n.isFunction(b)&&(b=b.call(a,c,h)),null!=b.top&&(m.top=b.top-h.top+g),null!=b.left&&(m.left=b.left-h.left+e),"using"in b?b.using.call(a,m):l.css(m)}},n.fn.extend({offset:function(a){if(arguments.length)return void 0===a?this:this.each(function(b){n.offset.setOffset(this,a,b)});var b,c,d=this[0],e={top:0,left:0},f=d&&d.ownerDocument;if(f)return b=f.documentElement,n.contains(b,d)?(typeof d.getBoundingClientRect!==U&&(e=d.getBoundingClientRect()),c=Jb(f),{top:e.top+c.pageYOffset-b.clientTop,left:e.left+c.pageXOffset-b.clientLeft}):e},position:function(){if(this[0]){var a,b,c=this[0],d={top:0,left:0};return"fixed"===n.css(c,"position")?b=c.getBoundingClientRect():(a=this.offsetParent(),b=this.offset(),n.nodeName(a[0],"html")||(d=a.offset()),d.top+=n.css(a[0],"borderTopWidth",!0),d.left+=n.css(a[0],"borderLeftWidth",!0)),{top:b.top-d.top-n.css(c,"marginTop",!0),left:b.left-d.left-n.css(c,"marginLeft",!0)}}},offsetParent:function(){return this.map(function(){var a=this.offsetParent||Ib;while(a&&!n.nodeName(a,"html")&&"static"===n.css(a,"position"))a=a.offsetParent;return a||Ib})}}),n.each({scrollLeft:"pageXOffset",scrollTop:"pageYOffset"},function(b,c){var d="pageYOffset"===c;n.fn[b]=function(e){return J(this,function(b,e,f){var g=Jb(b);return void 0===f?g?g[c]:b[e]:void(g?g.scrollTo(d?a.pageXOffset:f,d?f:a.pageYOffset):b[e]=f)},b,e,arguments.length,null)}}),n.each(["top","left"],function(a,b){n.cssHooks[b]=ya(k.pixelPosition,function(a,c){return c?(c=xa(a,b),va.test(c)?n(a).position()[b]+"px":c):void 0})}),n.each({Height:"height",Width:"width"},function(a,b){n.each({padding:"inner"+a,content:b,"":"outer"+a},function(c,d){n.fn[d]=function(d,e){var f=arguments.length&&(c||"boolean"!=typeof d),g=c||(d===!0||e===!0?"margin":"border");return J(this,function(b,c,d){var e;return n.isWindow(b)?b.document.documentElement["client"+a]:9===b.nodeType?(e=b.documentElement,Math.max(b.body["scroll"+a],e["scroll"+a],b.body["offset"+a],e["offset"+a],e["client"+a])):void 0===d?n.css(b,c,g):n.style(b,c,d,g)},b,f?d:void 0,f,null)}})}),n.fn.size=function(){return this.length},n.fn.andSelf=n.fn.addBack,"function"==typeof define&&define.amd&&define("jquery",[],function(){return n});var Kb=a.jQuery,Lb=a.$;return n.noConflict=function(b){return a.$===n&&(a.$=Lb),b&&a.jQuery===n&&(a.jQuery=Kb),n},typeof b===U&&(a.jQuery=a.$=n),n});
diff --git a/management/guns-admin/src/main/webapp/static/js/jquery.min.map b/management/guns-admin/src/main/webapp/static/js/jquery.min.map
new file mode 100644
index 0000000..0056ad2
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/static/js/jquery.min.map
@@ -0,0 +1 @@
+{"version":3,"file":"jquery-2.1.4.min.js","sources":["jquery-2.1.4.js"],"names":["global","factory","module","exports","document","w","Error","window","this","noGlobal","arr","slice","concat","push","indexOf","class2type","toString","hasOwn","hasOwnProperty","support","version","jQuery","selector","context","fn","init","rtrim","rmsPrefix","rdashAlpha","fcamelCase","all","letter","toUpperCase","prototype","jquery","constructor","length","toArray","call","get","num","pushStack","elems","ret","merge","prevObject","each","callback","args","map","elem","i","apply","arguments","first","eq","last","len","j","end","sort","splice","extend","options","name","src","copy","copyIsArray","clone","target","deep","isFunction","isPlainObject","isArray","undefined","expando","Math","random","replace","isReady","error","msg","noop","obj","type","Array","isWindow","isNumeric","parseFloat","nodeType","isEmptyObject","globalEval","code","script","indirect","eval","trim","createElement","text","head","appendChild","parentNode","removeChild","camelCase","string","nodeName","toLowerCase","value","isArraylike","makeArray","results","Object","inArray","second","grep","invert","callbackInverse","matches","callbackExpect","arg","guid","proxy","tmp","now","Date","split","Sizzle","Expr","getText","isXML","tokenize","compile","select","outermostContext","sortInput","hasDuplicate","setDocument","docElem","documentIsHTML","rbuggyQSA","rbuggyMatches","contains","preferredDoc","dirruns","done","classCache","createCache","tokenCache","compilerCache","sortOrder","a","b","MAX_NEGATIVE","pop","push_native","list","booleans","whitespace","characterEncoding","identifier","attributes","pseudos","rwhitespace","RegExp","rcomma","rcombinators","rattributeQuotes","rpseudo","ridentifier","matchExpr","ID","CLASS","TAG","ATTR","PSEUDO","CHILD","bool","needsContext","rinputs","rheader","rnative","rquickExpr","rsibling","rescape","runescape","funescape","_","escaped","escapedWhitespace","high","String","fromCharCode","unloadHandler","childNodes","e","els","seed","match","m","groups","old","nid","newContext","newSelector","ownerDocument","exec","getElementById","id","getElementsByTagName","getElementsByClassName","qsa","test","getAttribute","setAttribute","toSelector","testContext","join","querySelectorAll","qsaError","removeAttribute","keys","cache","key","cacheLength","shift","markFunction","assert","div","addHandle","attrs","handler","attrHandle","siblingCheck","cur","diff","sourceIndex","nextSibling","createInputPseudo","createButtonPseudo","createPositionalPseudo","argument","matchIndexes","documentElement","node","hasCompare","parent","doc","defaultView","top","addEventListener","attachEvent","className","createComment","getById","getElementsByName","find","filter","attrId","getAttributeNode","tag","innerHTML","input","matchesSelector","webkitMatchesSelector","mozMatchesSelector","oMatchesSelector","msMatchesSelector","disconnectedMatch","compareDocumentPosition","adown","bup","compare","sortDetached","aup","ap","bp","unshift","expr","elements","attr","val","specified","uniqueSort","duplicates","detectDuplicates","sortStable","textContent","firstChild","nodeValue","selectors","createPseudo","relative",">","dir"," ","+","~","preFilter","excess","unquoted","nodeNameSelector","pattern","operator","check","result","what","simple","forward","ofType","xml","outerCache","nodeIndex","start","useCache","lastChild","pseudo","setFilters","idx","matched","not","matcher","unmatched","has","innerText","lang","elemLang","hash","location","root","focus","activeElement","hasFocus","href","tabIndex","enabled","disabled","checked","selected","selectedIndex","empty","header","button","even","odd","lt","gt","radio","checkbox","file","password","image","submit","reset","filters","parseOnly","tokens","soFar","preFilters","cached","addCombinator","combinator","base","checkNonElements","doneName","oldCache","newCache","elementMatcher","matchers","multipleContexts","contexts","condense","newUnmatched","mapped","setMatcher","postFilter","postFinder","postSelector","temp","preMap","postMap","preexisting","matcherIn","matcherOut","matcherFromTokens","checkContext","leadingRelative","implicitRelative","matchContext","matchAnyContext","matcherFromGroupMatchers","elementMatchers","setMatchers","bySet","byElement","superMatcher","outermost","matchedCount","setMatched","contextBackup","dirrunsUnique","token","compiled","div1","defaultValue","unique","isXMLDoc","rneedsContext","rsingleTag","risSimple","winnow","qualifier","self","is","rootjQuery","parseHTML","ready","rparentsprev","guaranteedUnique","children","contents","next","prev","until","truncate","sibling","n","targets","l","closest","pos","index","prevAll","add","addBack","parents","parentsUntil","nextAll","nextUntil","prevUntil","siblings","contentDocument","reverse","rnotwhite","optionsCache","createOptions","object","flag","Callbacks","memory","fired","firing","firingStart","firingLength","firingIndex","stack","once","fire","data","stopOnFalse","disable","remove","lock","locked","fireWith","Deferred","func","tuples","state","promise","always","deferred","fail","then","fns","newDefer","tuple","returned","resolve","reject","progress","notify","pipe","stateString","when","subordinate","resolveValues","remaining","updateFunc","values","progressValues","notifyWith","resolveWith","progressContexts","resolveContexts","readyList","readyWait","holdReady","hold","wait","triggerHandler","off","completed","removeEventListener","readyState","setTimeout","access","chainable","emptyGet","raw","bulk","acceptData","owner","Data","defineProperty","uid","accepts","descriptor","unlock","defineProperties","set","prop","stored","camel","hasData","discard","data_priv","data_user","rbrace","rmultiDash","dataAttr","parseJSON","removeData","_data","_removeData","camelKey","queue","dequeue","startLength","hooks","_queueHooks","stop","setter","clearQueue","count","defer","pnum","source","cssExpand","isHidden","el","css","rcheckableType","fragment","createDocumentFragment","checkClone","cloneNode","noCloneChecked","strundefined","focusinBubbles","rkeyEvent","rmouseEvent","rfocusMorph","rtypenamespace","returnTrue","returnFalse","safeActiveElement","err","event","types","handleObjIn","eventHandle","events","t","handleObj","special","handlers","namespaces","origType","elemData","handle","triggered","dispatch","delegateType","bindType","namespace","delegateCount","setup","mappedTypes","origCount","teardown","removeEvent","trigger","onlyHandlers","bubbleType","ontype","eventPath","Event","isTrigger","namespace_re","noBubble","parentWindow","isPropagationStopped","preventDefault","isDefaultPrevented","_default","fix","handlerQueue","delegateTarget","preDispatch","currentTarget","isImmediatePropagationStopped","stopPropagation","postDispatch","sel","props","fixHooks","keyHooks","original","which","charCode","keyCode","mouseHooks","eventDoc","body","pageX","clientX","scrollLeft","clientLeft","pageY","clientY","scrollTop","clientTop","originalEvent","fixHook","load","blur","click","beforeunload","returnValue","simulate","bubble","isSimulated","defaultPrevented","timeStamp","stopImmediatePropagation","mouseenter","mouseleave","pointerenter","pointerleave","orig","related","relatedTarget","attaches","on","one","origFn","rxhtmlTag","rtagName","rhtml","rnoInnerhtml","rchecked","rscriptType","rscriptTypeMasked","rcleanScript","wrapMap","option","thead","col","tr","td","optgroup","tbody","tfoot","colgroup","caption","th","manipulationTarget","content","disableScript","restoreScript","setGlobalEval","refElements","cloneCopyEvent","dest","pdataOld","pdataCur","udataOld","udataCur","getAll","fixInput","dataAndEvents","deepDataAndEvents","srcElements","destElements","inPage","buildFragment","scripts","selection","wrap","nodes","createTextNode","cleanData","append","domManip","prepend","insertBefore","before","after","keepData","html","replaceWith","replaceChild","detach","hasScripts","iNoClone","_evalUrl","appendTo","prependTo","insertAfter","replaceAll","insert","iframe","elemdisplay","actualDisplay","style","display","getDefaultComputedStyle","defaultDisplay","write","close","rmargin","rnumnonpx","getStyles","opener","getComputedStyle","curCSS","computed","width","minWidth","maxWidth","getPropertyValue","addGetHookIf","conditionFn","hookFn","pixelPositionVal","boxSizingReliableVal","container","backgroundClip","clearCloneStyle","cssText","computePixelPositionAndBoxSizingReliable","divStyle","pixelPosition","boxSizingReliable","reliableMarginRight","marginDiv","marginRight","swap","rdisplayswap","rnumsplit","rrelNum","cssShow","position","visibility","cssNormalTransform","letterSpacing","fontWeight","cssPrefixes","vendorPropName","capName","origName","setPositiveNumber","subtract","max","augmentWidthOrHeight","extra","isBorderBox","styles","getWidthOrHeight","valueIsBorderBox","offsetWidth","offsetHeight","showHide","show","hidden","cssHooks","opacity","cssNumber","columnCount","fillOpacity","flexGrow","flexShrink","lineHeight","order","orphans","widows","zIndex","zoom","cssProps","float","margin","padding","border","prefix","suffix","expand","expanded","parts","hide","toggle","Tween","easing","unit","propHooks","run","percent","eased","duration","step","tween","fx","linear","p","swing","cos","PI","fxNow","timerId","rfxtypes","rfxnum","rrun","animationPrefilters","defaultPrefilter","tweeners","*","createTween","scale","maxIterations","createFxNow","genFx","includeWidth","height","animation","collection","opts","oldfire","checkDisplay","anim","dataShow","unqueued","overflow","overflowX","overflowY","propFilter","specialEasing","Animation","properties","stopped","tick","currentTime","startTime","tweens","originalProperties","originalOptions","gotoEnd","rejectWith","timer","complete","tweener","prefilter","speed","opt","speeds","fadeTo","to","animate","optall","doAnimation","finish","stopQueue","timers","cssFn","slideDown","slideUp","slideToggle","fadeIn","fadeOut","fadeToggle","interval","setInterval","clearInterval","slow","fast","delay","time","timeout","clearTimeout","checkOn","optSelected","optDisabled","radioValue","nodeHook","boolHook","removeAttr","nType","attrHooks","propName","attrNames","propFix","getter","rfocusable","removeProp","for","class","notxml","hasAttribute","rclass","addClass","classes","clazz","finalValue","proceed","removeClass","toggleClass","stateVal","classNames","hasClass","rreturn","valHooks","optionSet","hover","fnOver","fnOut","bind","unbind","delegate","undelegate","nonce","rquery","JSON","parse","parseXML","DOMParser","parseFromString","rhash","rts","rheaders","rlocalProtocol","rnoContent","rprotocol","rurl","prefilters","transports","allTypes","ajaxLocation","ajaxLocParts","addToPrefiltersOrTransports","structure","dataTypeExpression","dataType","dataTypes","inspectPrefiltersOrTransports","jqXHR","inspected","seekingTransport","inspect","prefilterOrFactory","dataTypeOrTransport","ajaxExtend","flatOptions","ajaxSettings","ajaxHandleResponses","s","responses","ct","finalDataType","firstDataType","mimeType","getResponseHeader","converters","ajaxConvert","response","isSuccess","conv2","current","conv","responseFields","dataFilter","active","lastModified","etag","url","isLocal","processData","async","contentType","json","* text","text html","text json","text xml","ajaxSetup","settings","ajaxPrefilter","ajaxTransport","ajax","transport","cacheURL","responseHeadersString","responseHeaders","timeoutTimer","fireGlobals","callbackContext","globalEventContext","completeDeferred","statusCode","requestHeaders","requestHeadersNames","strAbort","getAllResponseHeaders","setRequestHeader","lname","overrideMimeType","status","abort","statusText","finalText","success","method","crossDomain","param","traditional","hasContent","ifModified","headers","beforeSend","send","nativeStatusText","modified","getJSON","getScript","throws","wrapAll","firstElementChild","wrapInner","unwrap","visible","r20","rbracket","rCRLF","rsubmitterTypes","rsubmittable","buildParams","v","encodeURIComponent","serialize","serializeArray","xhr","XMLHttpRequest","xhrId","xhrCallbacks","xhrSuccessStatus",1223,"xhrSupported","cors","open","username","xhrFields","onload","onerror","responseText","text script","charset","scriptCharset","evt","oldCallbacks","rjsonp","jsonp","jsonpCallback","originalSettings","callbackName","overwritten","responseContainer","jsonProp","keepScripts","parsed","_load","params","animated","getWindow","offset","setOffset","curPosition","curLeft","curCSSTop","curTop","curOffset","curCSSLeft","calculatePosition","curElem","left","using","win","box","getBoundingClientRect","pageYOffset","pageXOffset","offsetParent","parentOffset","scrollTo","Height","Width","defaultExtra","funcName","size","andSelf","define","amd","_jQuery","_$","$","noConflict"],"mappings":";CAcC,SAAUA,EAAQC,GAEK,gBAAXC,SAAiD,gBAAnBA,QAAOC,QAQhDD,OAAOC,QAAUH,EAAOI,SACvBH,EAASD,GAAQ,GACjB,SAAUK,GACT,IAAMA,EAAED,SACP,KAAM,IAAIE,OAAO,2CAElB,OAAOL,GAASI,IAGlBJ,EAASD,IAIS,mBAAXO,QAAyBA,OAASC,KAAM,SAAUD,EAAQE,GAQnE,GAAIC,MAEAC,EAAQD,EAAIC,MAEZC,EAASF,EAAIE,OAEbC,EAAOH,EAAIG,KAEXC,EAAUJ,EAAII,QAEdC,KAEAC,EAAWD,EAAWC,SAEtBC,EAASF,EAAWG,eAEpBC,KAMHf,EAAWG,EAAOH,SAElBgB,EAAU,QAGVC,EAAS,SAAUC,EAAUC,GAG5B,MAAO,IAAIF,GAAOG,GAAGC,KAAMH,EAAUC,IAKtCG,EAAQ,qCAGRC,EAAY,QACZC,EAAa,eAGbC,EAAa,SAAUC,EAAKC,GAC3B,MAAOA,GAAOC,cAGhBX,GAAOG,GAAKH,EAAOY,WAElBC,OAAQd,EAERe,YAAad,EAGbC,SAAU,GAGVc,OAAQ,EAERC,QAAS,WACR,MAAO1B,GAAM2B,KAAM9B,OAKpB+B,IAAK,SAAUC,GACd,MAAc,OAAPA,EAGE,EAANA,EAAUhC,KAAMgC,EAAMhC,KAAK4B,QAAW5B,KAAMgC,GAG9C7B,EAAM2B,KAAM9B,OAKdiC,UAAW,SAAUC,GAGpB,GAAIC,GAAMtB,EAAOuB,MAAOpC,KAAK2B,cAAeO,EAO5C,OAJAC,GAAIE,WAAarC,KACjBmC,EAAIpB,QAAUf,KAAKe,QAGZoB,GAMRG,KAAM,SAAUC,EAAUC,GACzB,MAAO3B,GAAOyB,KAAMtC,KAAMuC,EAAUC,IAGrCC,IAAK,SAAUF,GACd,MAAOvC,MAAKiC,UAAWpB,EAAO4B,IAAIzC,KAAM,SAAU0C,EAAMC,GACvD,MAAOJ,GAAST,KAAMY,EAAMC,EAAGD,OAIjCvC,MAAO,WACN,MAAOH,MAAKiC,UAAW9B,EAAMyC,MAAO5C,KAAM6C,aAG3CC,MAAO,WACN,MAAO9C,MAAK+C,GAAI,IAGjBC,KAAM,WACL,MAAOhD,MAAK+C,GAAI,KAGjBA,GAAI,SAAUJ,GACb,GAAIM,GAAMjD,KAAK4B,OACdsB,GAAKP,GAAU,EAAJA,EAAQM,EAAM,EAC1B,OAAOjD,MAAKiC,UAAWiB,GAAK,GAASD,EAAJC,GAAYlD,KAAKkD,SAGnDC,IAAK,WACJ,MAAOnD,MAAKqC,YAAcrC,KAAK2B,YAAY,OAK5CtB,KAAMA,EACN+C,KAAMlD,EAAIkD,KACVC,OAAQnD,EAAImD,QAGbxC,EAAOyC,OAASzC,EAAOG,GAAGsC,OAAS,WAClC,GAAIC,GAASC,EAAMC,EAAKC,EAAMC,EAAaC,EAC1CC,EAAShB,UAAU,OACnBF,EAAI,EACJf,EAASiB,UAAUjB,OACnBkC,GAAO,CAsBR,KAnBuB,iBAAXD,KACXC,EAAOD,EAGPA,EAAShB,UAAWF,OACpBA,KAIsB,gBAAXkB,IAAwBhD,EAAOkD,WAAWF,KACrDA,MAIIlB,IAAMf,IACViC,EAAS7D,KACT2C,KAGWf,EAAJe,EAAYA,IAEnB,GAAmC,OAA7BY,EAAUV,UAAWF,IAE1B,IAAMa,IAAQD,GACbE,EAAMI,EAAQL,GACdE,EAAOH,EAASC,GAGXK,IAAWH,IAKXI,GAAQJ,IAAU7C,EAAOmD,cAAcN,KAAUC,EAAc9C,EAAOoD,QAAQP,MAC7EC,GACJA,GAAc,EACdC,EAAQH,GAAO5C,EAAOoD,QAAQR,GAAOA,MAGrCG,EAAQH,GAAO5C,EAAOmD,cAAcP,GAAOA,KAI5CI,EAAQL,GAAS3C,EAAOyC,OAAQQ,EAAMF,EAAOF,IAGzBQ,SAATR,IACXG,EAAQL,GAASE,GAOrB,OAAOG,IAGRhD,EAAOyC,QAENa,QAAS,UAAavD,EAAUwD,KAAKC,UAAWC,QAAS,MAAO,IAGhEC,SAAS,EAETC,MAAO,SAAUC,GAChB,KAAM,IAAI3E,OAAO2E,IAGlBC,KAAM,aAENX,WAAY,SAAUY,GACrB,MAA4B,aAArB9D,EAAO+D,KAAKD,IAGpBV,QAASY,MAAMZ,QAEfa,SAAU,SAAUH,GACnB,MAAc,OAAPA,GAAeA,IAAQA,EAAI5E,QAGnCgF,UAAW,SAAUJ,GAKpB,OAAQ9D,EAAOoD,QAASU,IAAUA,EAAMK,WAAYL,GAAQ,GAAM,GAGnEX,cAAe,SAAUW,GAKxB,MAA4B,WAAvB9D,EAAO+D,KAAMD,IAAsBA,EAAIM,UAAYpE,EAAOiE,SAAUH,IACjE,EAGHA,EAAIhD,cACNlB,EAAOqB,KAAM6C,EAAIhD,YAAYF,UAAW,kBACnC,GAKD,GAGRyD,cAAe,SAAUP,GACxB,GAAInB,EACJ,KAAMA,IAAQmB,GACb,OAAO,CAER,QAAO,GAGRC,KAAM,SAAUD,GACf,MAAY,OAAPA,EACGA,EAAM,GAGQ,gBAARA,IAAmC,kBAARA,GACxCpE,EAAYC,EAASsB,KAAK6C,KAAU,eAC7BA,IAITQ,WAAY,SAAUC,GACrB,GAAIC,GACHC,EAAWC,IAEZH,GAAOvE,EAAO2E,KAAMJ,GAEfA,IAIgC,IAA/BA,EAAK9E,QAAQ,eACjB+E,EAASzF,EAAS6F,cAAc,UAChCJ,EAAOK,KAAON,EACdxF,EAAS+F,KAAKC,YAAaP,GAASQ,WAAWC,YAAaT,IAI5DC,EAAUF,KAQbW,UAAW,SAAUC,GACpB,MAAOA,GAAO1B,QAASnD,EAAW,OAAQmD,QAASlD,EAAYC,IAGhE4E,SAAU,SAAUvD,EAAMc,GACzB,MAAOd,GAAKuD,UAAYvD,EAAKuD,SAASC,gBAAkB1C,EAAK0C,eAI9D5D,KAAM,SAAUqC,EAAKpC,EAAUC,GAC9B,GAAI2D,GACHxD,EAAI,EACJf,EAAS+C,EAAI/C,OACbqC,EAAUmC,EAAazB,EAExB,IAAKnC,GACJ,GAAKyB,GACJ,KAAYrC,EAAJe,EAAYA,IAGnB,GAFAwD,EAAQ5D,EAASK,MAAO+B,EAAKhC,GAAKH,GAE7B2D,KAAU,EACd,UAIF,KAAMxD,IAAKgC,GAGV,GAFAwB,EAAQ5D,EAASK,MAAO+B,EAAKhC,GAAKH,GAE7B2D,KAAU,EACd,UAOH,IAAKlC,GACJ,KAAYrC,EAAJe,EAAYA,IAGnB,GAFAwD,EAAQ5D,EAAST,KAAM6C,EAAKhC,GAAKA,EAAGgC,EAAKhC,IAEpCwD,KAAU,EACd,UAIF,KAAMxD,IAAKgC,GAGV,GAFAwB,EAAQ5D,EAAST,KAAM6C,EAAKhC,GAAKA,EAAGgC,EAAKhC,IAEpCwD,KAAU,EACd,KAMJ,OAAOxB,IAIRa,KAAM,SAAUE,GACf,MAAe,OAARA,EACN,IACEA,EAAO,IAAKpB,QAASpD,EAAO,KAIhCmF,UAAW,SAAUnG,EAAKoG,GACzB,GAAInE,GAAMmE,KAaV,OAXY,OAAPpG,IACCkG,EAAaG,OAAOrG,IACxBW,EAAOuB,MAAOD,EACE,gBAARjC,IACLA,GAAQA,GAGXG,EAAKyB,KAAMK,EAAKjC,IAIXiC,GAGRqE,QAAS,SAAU9D,EAAMxC,EAAKyC,GAC7B,MAAc,OAAPzC,EAAc,GAAKI,EAAQwB,KAAM5B,EAAKwC,EAAMC,IAGpDP,MAAO,SAAUU,EAAO2D,GAKvB,IAJA,GAAIxD,IAAOwD,EAAO7E,OACjBsB,EAAI,EACJP,EAAIG,EAAMlB,OAECqB,EAAJC,EAASA,IAChBJ,EAAOH,KAAQ8D,EAAQvD,EAKxB,OAFAJ,GAAMlB,OAASe,EAERG,GAGR4D,KAAM,SAAUxE,EAAOK,EAAUoE,GAShC,IARA,GAAIC,GACHC,KACAlE,EAAI,EACJf,EAASM,EAAMN,OACfkF,GAAkBH,EAIP/E,EAAJe,EAAYA,IACnBiE,GAAmBrE,EAAUL,EAAOS,GAAKA,GACpCiE,IAAoBE,GACxBD,EAAQxG,KAAM6B,EAAOS,GAIvB,OAAOkE,IAIRpE,IAAK,SAAUP,EAAOK,EAAUwE,GAC/B,GAAIZ,GACHxD,EAAI,EACJf,EAASM,EAAMN,OACfqC,EAAUmC,EAAalE,GACvBC,IAGD,IAAK8B,EACJ,KAAYrC,EAAJe,EAAYA,IACnBwD,EAAQ5D,EAAUL,EAAOS,GAAKA,EAAGoE,GAEnB,MAATZ,GACJhE,EAAI9B,KAAM8F,OAMZ,KAAMxD,IAAKT,GACViE,EAAQ5D,EAAUL,EAAOS,GAAKA,EAAGoE,GAEnB,MAATZ,GACJhE,EAAI9B,KAAM8F,EAMb,OAAO/F,GAAOwC,SAAWT,IAI1B6E,KAAM,EAINC,MAAO,SAAUjG,EAAID,GACpB,GAAImG,GAAK1E,EAAMyE,CAUf,OARwB,gBAAZlG,KACXmG,EAAMlG,EAAID,GACVA,EAAUC,EACVA,EAAKkG,GAKArG,EAAOkD,WAAY/C,IAKzBwB,EAAOrC,EAAM2B,KAAMe,UAAW,GAC9BoE,EAAQ,WACP,MAAOjG,GAAG4B,MAAO7B,GAAWf,KAAMwC,EAAKpC,OAAQD,EAAM2B,KAAMe,cAI5DoE,EAAMD,KAAOhG,EAAGgG,KAAOhG,EAAGgG,MAAQnG,EAAOmG,OAElCC,GAZC/C,QAeTiD,IAAKC,KAAKD,IAIVxG,QAASA,IAIVE,EAAOyB,KAAK,gEAAgE+E,MAAM,KAAM,SAAS1E,EAAGa,GACnGjD,EAAY,WAAaiD,EAAO,KAAQA,EAAK0C,eAG9C,SAASE,GAAazB,GAMrB,GAAI/C,GAAS,UAAY+C,IAAOA,EAAI/C,OACnCgD,EAAO/D,EAAO+D,KAAMD,EAErB,OAAc,aAATC,GAAuB/D,EAAOiE,SAAUH,IACrC,EAGc,IAAjBA,EAAIM,UAAkBrD,GACnB,EAGQ,UAATgD,GAA+B,IAAXhD,GACR,gBAAXA,IAAuBA,EAAS,GAAOA,EAAS,IAAO+C,GAEhE,GAAI2C,GAWJ,SAAWvH,GAEX,GAAI4C,GACHhC,EACA4G,EACAC,EACAC,EACAC,EACAC,EACAC,EACAC,EACAC,EACAC,EAGAC,EACApI,EACAqI,EACAC,EACAC,EACAC,EACAvB,EACAwB,EAGAlE,EAAU,SAAW,EAAI,GAAIiD,MAC7BkB,EAAevI,EAAOH,SACtB2I,EAAU,EACVC,EAAO,EACPC,EAAaC,KACbC,EAAaD,KACbE,EAAgBF,KAChBG,EAAY,SAAUC,EAAGC,GAIxB,MAHKD,KAAMC,IACVhB,GAAe,GAET,GAIRiB,EAAe,GAAK,GAGpBvI,KAAcC,eACdR,KACA+I,EAAM/I,EAAI+I,IACVC,EAAchJ,EAAIG,KAClBA,EAAOH,EAAIG,KACXF,EAAQD,EAAIC,MAGZG,EAAU,SAAU6I,EAAMzG,GAGzB,IAFA,GAAIC,GAAI,EACPM,EAAMkG,EAAKvH,OACAqB,EAAJN,EAASA,IAChB,GAAKwG,EAAKxG,KAAOD,EAChB,MAAOC,EAGT,OAAO,IAGRyG,EAAW,6HAKXC,EAAa,sBAEbC,EAAoB,mCAKpBC,EAAaD,EAAkBhF,QAAS,IAAK,MAG7CkF,EAAa,MAAQH,EAAa,KAAOC,EAAoB,OAASD,EAErE,gBAAkBA,EAElB,2DAA6DE,EAAa,OAASF,EACnF,OAEDI,EAAU,KAAOH,EAAoB,wFAKPE,EAAa,eAM3CE,EAAc,GAAIC,QAAQN,EAAa,IAAK,KAC5CnI,EAAQ,GAAIyI,QAAQ,IAAMN,EAAa,8BAAgCA,EAAa,KAAM,KAE1FO,EAAS,GAAID,QAAQ,IAAMN,EAAa,KAAOA,EAAa,KAC5DQ,EAAe,GAAIF,QAAQ,IAAMN,EAAa,WAAaA,EAAa,IAAMA,EAAa,KAE3FS,EAAmB,GAAIH,QAAQ,IAAMN,EAAa,iBAAmBA,EAAa,OAAQ,KAE1FU,EAAU,GAAIJ,QAAQF,GACtBO,EAAc,GAAIL,QAAQ,IAAMJ,EAAa,KAE7CU,GACCC,GAAM,GAAIP,QAAQ,MAAQL,EAAoB,KAC9Ca,MAAS,GAAIR,QAAQ,QAAUL,EAAoB,KACnDc,IAAO,GAAIT,QAAQ,KAAOL,EAAkBhF,QAAS,IAAK,MAAS,KACnE+F,KAAQ,GAAIV,QAAQ,IAAMH,GAC1Bc,OAAU,GAAIX,QAAQ,IAAMF,GAC5Bc,MAAS,GAAIZ,QAAQ,yDAA2DN,EAC/E,+BAAiCA,EAAa,cAAgBA,EAC9D,aAAeA,EAAa,SAAU,KACvCmB,KAAQ,GAAIb,QAAQ,OAASP,EAAW,KAAM,KAG9CqB,aAAgB,GAAId,QAAQ,IAAMN,EAAa,mDAC9CA,EAAa,mBAAqBA,EAAa,mBAAoB,MAGrEqB,EAAU,sCACVC,EAAU,SAEVC,EAAU,yBAGVC,EAAa,mCAEbC,GAAW,OACXC,GAAU,QAGVC,GAAY,GAAIrB,QAAQ,qBAAuBN,EAAa,MAAQA,EAAa,OAAQ,MACzF4B,GAAY,SAAUC,EAAGC,EAASC,GACjC,GAAIC,GAAO,KAAOF,EAAU,KAI5B,OAAOE,KAASA,GAAQD,EACvBD,EACO,EAAPE,EAECC,OAAOC,aAAcF,EAAO,OAE5BC,OAAOC,aAAcF,GAAQ,GAAK,MAAe,KAAPA,EAAe,QAO5DG,GAAgB,WACfxD,IAIF,KACC3H,EAAKuC,MACH1C,EAAMC,EAAM2B,KAAMwG,EAAamD,YAChCnD,EAAamD,YAIdvL,EAAKoI,EAAamD,WAAW7J,QAASqD,SACrC,MAAQyG,IACTrL,GAASuC,MAAO1C,EAAI0B,OAGnB,SAAUiC,EAAQ8H,GACjBzC,EAAYtG,MAAOiB,EAAQ1D,EAAM2B,KAAK6J,KAKvC,SAAU9H,EAAQ8H,GACjB,GAAIzI,GAAIW,EAAOjC,OACde,EAAI,CAEL,OAASkB,EAAOX,KAAOyI,EAAIhJ,MAC3BkB,EAAOjC,OAASsB,EAAI,IAKvB,QAASoE,IAAQxG,EAAUC,EAASuF,EAASsF,GAC5C,GAAIC,GAAOnJ,EAAMoJ,EAAG7G,EAEnBtC,EAAGoJ,EAAQC,EAAKC,EAAKC,EAAYC,CAUlC,KAROpL,EAAUA,EAAQqL,eAAiBrL,EAAUuH,KAAmB1I,GACtEoI,EAAajH,GAGdA,EAAUA,GAAWnB,EACrB0G,EAAUA,MACVrB,EAAWlE,EAAQkE,SAEM,gBAAbnE,KAA0BA,GACxB,IAAbmE,GAA+B,IAAbA,GAA+B,KAAbA,EAEpC,MAAOqB,EAGR,KAAMsF,GAAQ1D,EAAiB,CAG9B,GAAkB,KAAbjD,IAAoB4G,EAAQhB,EAAWwB,KAAMvL,IAEjD,GAAMgL,EAAID,EAAM,IACf,GAAkB,IAAb5G,EAAiB,CAIrB,GAHAvC,EAAO3B,EAAQuL,eAAgBR,IAG1BpJ,IAAQA,EAAKmD,WAQjB,MAAOS,EALP,IAAK5D,EAAK6J,KAAOT,EAEhB,MADAxF,GAAQjG,KAAMqC,GACP4D,MAOT,IAAKvF,EAAQqL,gBAAkB1J,EAAO3B,EAAQqL,cAAcE,eAAgBR,KAC3EzD,EAAUtH,EAAS2B,IAAUA,EAAK6J,KAAOT,EAEzC,MADAxF,GAAQjG,KAAMqC,GACP4D,MAKH,CAAA,GAAKuF,EAAM,GAEjB,MADAxL,GAAKuC,MAAO0D,EAASvF,EAAQyL,qBAAsB1L,IAC5CwF,CAGD,KAAMwF,EAAID,EAAM,KAAOlL,EAAQ8L,uBAErC,MADApM,GAAKuC,MAAO0D,EAASvF,EAAQ0L,uBAAwBX,IAC9CxF,EAKT,GAAK3F,EAAQ+L,OAASvE,IAAcA,EAAUwE,KAAM7L,IAAc,CASjE,GARAmL,EAAMD,EAAM7H,EACZ+H,EAAanL,EACboL,EAA2B,IAAblH,GAAkBnE,EAMd,IAAbmE,GAAqD,WAAnClE,EAAQkF,SAASC,cAA6B,CACpE6F,EAASrE,EAAU5G,IAEbkL,EAAMjL,EAAQ6L,aAAa,OAChCX,EAAMD,EAAI1H,QAASyG,GAAS,QAE5BhK,EAAQ8L,aAAc,KAAMZ,GAE7BA,EAAM,QAAUA,EAAM,MAEtBtJ,EAAIoJ,EAAOnK,MACX,OAAQe,IACPoJ,EAAOpJ,GAAKsJ,EAAMa,GAAYf,EAAOpJ,GAEtCuJ,GAAapB,GAAS6B,KAAM7L,IAAciM,GAAahM,EAAQ8E,aAAgB9E,EAC/EoL,EAAcJ,EAAOiB,KAAK,KAG3B,GAAKb,EACJ,IAIC,MAHA9L,GAAKuC,MAAO0D,EACX4F,EAAWe,iBAAkBd,IAEvB7F,EACN,MAAM4G,IACN,QACKlB,GACLjL,EAAQoM,gBAAgB,QAQ7B,MAAOvF,GAAQ9G,EAASwD,QAASpD,EAAO,MAAQH,EAASuF,EAASsF,GASnE,QAASlD,MACR,GAAI0E,KAEJ,SAASC,GAAOC,EAAKnH,GAMpB,MAJKiH,GAAK/M,KAAMiN,EAAM,KAAQ/F,EAAKgG,mBAE3BF,GAAOD,EAAKI,SAEZH,EAAOC,EAAM,KAAQnH,EAE9B,MAAOkH,GAOR,QAASI,IAAczM,GAEtB,MADAA,GAAImD,IAAY,EACTnD,EAOR,QAAS0M,IAAQ1M,GAChB,GAAI2M,GAAM/N,EAAS6F,cAAc,MAEjC,KACC,QAASzE,EAAI2M,GACZ,MAAOjC,GACR,OAAO,EACN,QAEIiC,EAAI9H,YACR8H,EAAI9H,WAAWC,YAAa6H,GAG7BA,EAAM,MASR,QAASC,IAAWC,EAAOC,GAC1B,GAAI5N,GAAM2N,EAAMxG,MAAM,KACrB1E,EAAIkL,EAAMjM,MAEX,OAAQe,IACP4E,EAAKwG,WAAY7N,EAAIyC,IAAOmL,EAU9B,QAASE,IAAclF,EAAGC,GACzB,GAAIkF,GAAMlF,GAAKD,EACdoF,EAAOD,GAAsB,IAAfnF,EAAE7D,UAAiC,IAAf8D,EAAE9D,YAChC8D,EAAEoF,aAAenF,KACjBF,EAAEqF,aAAenF,EAGtB,IAAKkF,EACJ,MAAOA,EAIR,IAAKD,EACJ,MAASA,EAAMA,EAAIG,YAClB,GAAKH,IAAQlF,EACZ,MAAO,EAKV,OAAOD,GAAI,EAAI,GAOhB,QAASuF,IAAmBzJ,GAC3B,MAAO,UAAUlC,GAChB,GAAIc,GAAOd,EAAKuD,SAASC,aACzB,OAAgB,UAAT1C,GAAoBd,EAAKkC,OAASA,GAQ3C,QAAS0J,IAAoB1J,GAC5B,MAAO,UAAUlC,GAChB,GAAIc,GAAOd,EAAKuD,SAASC,aACzB,QAAiB,UAAT1C,GAA6B,WAATA,IAAsBd,EAAKkC,OAASA,GAQlE,QAAS2J,IAAwBvN,GAChC,MAAOyM,IAAa,SAAUe,GAE7B,MADAA,IAAYA,EACLf,GAAa,SAAU7B,EAAM/E,GACnC,GAAI3D,GACHuL,EAAezN,KAAQ4K,EAAKhK,OAAQ4M,GACpC7L,EAAI8L,EAAa7M,MAGlB,OAAQe,IACFiJ,EAAO1I,EAAIuL,EAAa9L,MAC5BiJ,EAAK1I,KAAO2D,EAAQ3D,GAAK0I,EAAK1I,SAYnC,QAAS6J,IAAahM,GACrB,MAAOA,IAAmD,mBAAjCA,GAAQyL,sBAAwCzL,EAI1EJ,EAAU2G,GAAO3G,WAOjB8G,EAAQH,GAAOG,MAAQ,SAAU/E,GAGhC,GAAIgM,GAAkBhM,IAASA,EAAK0J,eAAiB1J,GAAMgM,eAC3D,OAAOA,GAA+C,SAA7BA,EAAgBzI,UAAsB,GAQhE+B,EAAcV,GAAOU,YAAc,SAAU2G,GAC5C,GAAIC,GAAYC,EACfC,EAAMH,EAAOA,EAAKvC,eAAiBuC,EAAOrG,CAG3C,OAAKwG,KAAQlP,GAA6B,IAAjBkP,EAAI7J,UAAmB6J,EAAIJ,iBAKpD9O,EAAWkP,EACX7G,EAAU6G,EAAIJ,gBACdG,EAASC,EAAIC,YAMRF,GAAUA,IAAWA,EAAOG,MAE3BH,EAAOI,iBACXJ,EAAOI,iBAAkB,SAAUzD,IAAe,GACvCqD,EAAOK,aAClBL,EAAOK,YAAa,WAAY1D,KAMlCtD,GAAkBT,EAAOqH,GAQzBnO,EAAQ6I,WAAakE,GAAO,SAAUC,GAErC,MADAA,GAAIwB,UAAY,KACRxB,EAAIf,aAAa,eAO1BjM,EAAQ6L,qBAAuBkB,GAAO,SAAUC,GAE/C,MADAA,GAAI/H,YAAakJ,EAAIM,cAAc,MAC3BzB,EAAInB,qBAAqB,KAAK5K,SAIvCjB,EAAQ8L,uBAAyB7B,EAAQ+B,KAAMmC,EAAIrC,wBAMnD9L,EAAQ0O,QAAU3B,GAAO,SAAUC,GAElC,MADA1F,GAAQrC,YAAa+H,GAAMpB,GAAKpI,GACxB2K,EAAIQ,oBAAsBR,EAAIQ,kBAAmBnL,GAAUvC,SAI/DjB,EAAQ0O,SACZ9H,EAAKgI,KAAS,GAAI,SAAUhD,EAAIxL,GAC/B,GAAuC,mBAA3BA,GAAQuL,gBAAkCpE,EAAiB,CACtE,GAAI4D,GAAI/K,EAAQuL,eAAgBC,EAGhC,OAAOT,IAAKA,EAAEjG,YAAeiG,QAG/BvE,EAAKiI,OAAW,GAAI,SAAUjD,GAC7B,GAAIkD,GAASlD,EAAGjI,QAAS0G,GAAWC,GACpC,OAAO,UAAUvI,GAChB,MAAOA,GAAKkK,aAAa,QAAU6C,YAM9BlI,GAAKgI,KAAS,GAErBhI,EAAKiI,OAAW,GAAK,SAAUjD,GAC9B,GAAIkD,GAASlD,EAAGjI,QAAS0G,GAAWC,GACpC,OAAO,UAAUvI,GAChB,GAAIiM,GAAwC,mBAA1BjM,GAAKgN,kBAAoChN,EAAKgN,iBAAiB,KACjF,OAAOf,IAAQA,EAAKxI,QAAUsJ,KAMjClI,EAAKgI,KAAU,IAAI5O,EAAQ6L,qBAC1B,SAAUmD,EAAK5O,GACd,MAA6C,mBAAjCA,GAAQyL,qBACZzL,EAAQyL,qBAAsBmD,GAG1BhP,EAAQ+L,IACZ3L,EAAQkM,iBAAkB0C,GAD3B,QAKR,SAAUA,EAAK5O,GACd,GAAI2B,GACHwE,KACAvE,EAAI,EAEJ2D,EAAUvF,EAAQyL,qBAAsBmD,EAGzC,IAAa,MAARA,EAAc,CAClB,MAASjN,EAAO4D,EAAQ3D,KACA,IAAlBD,EAAKuC,UACTiC,EAAI7G,KAAMqC,EAIZ,OAAOwE,GAER,MAAOZ,IAITiB,EAAKgI,KAAY,MAAI5O,EAAQ8L,wBAA0B,SAAU0C,EAAWpO,GAC3E,MAAKmH,GACGnH,EAAQ0L,uBAAwB0C,GADxC,QAWD/G,KAOAD,MAEMxH,EAAQ+L,IAAM9B,EAAQ+B,KAAMmC,EAAI7B,qBAGrCS,GAAO,SAAUC,GAMhB1F,EAAQrC,YAAa+H,GAAMiC,UAAY,UAAYzL,EAAU,qBAC3CA,EAAU,iEAOvBwJ,EAAIV,iBAAiB,wBAAwBrL,QACjDuG,EAAU9H,KAAM,SAAWgJ,EAAa,gBAKnCsE,EAAIV,iBAAiB,cAAcrL,QACxCuG,EAAU9H,KAAM,MAAQgJ,EAAa,aAAeD,EAAW,KAI1DuE,EAAIV,iBAAkB,QAAU9I,EAAU,MAAOvC,QACtDuG,EAAU9H,KAAK,MAMVsN,EAAIV,iBAAiB,YAAYrL,QACtCuG,EAAU9H,KAAK,YAMVsN,EAAIV,iBAAkB,KAAO9I,EAAU,MAAOvC,QACnDuG,EAAU9H,KAAK,cAIjBqN,GAAO,SAAUC,GAGhB,GAAIkC,GAAQf,EAAIrJ,cAAc,QAC9BoK,GAAMhD,aAAc,OAAQ,UAC5Bc,EAAI/H,YAAaiK,GAAQhD,aAAc,OAAQ,KAI1Cc,EAAIV,iBAAiB,YAAYrL,QACrCuG,EAAU9H,KAAM,OAASgJ,EAAa,eAKjCsE,EAAIV,iBAAiB,YAAYrL,QACtCuG,EAAU9H,KAAM,WAAY,aAI7BsN,EAAIV,iBAAiB,QACrB9E,EAAU9H,KAAK,YAIXM,EAAQmP,gBAAkBlF,EAAQ+B,KAAO9F,EAAUoB,EAAQpB,SAChEoB,EAAQ8H,uBACR9H,EAAQ+H,oBACR/H,EAAQgI,kBACRhI,EAAQiI,qBAERxC,GAAO,SAAUC,GAGhBhN,EAAQwP,kBAAoBtJ,EAAQ/E,KAAM6L,EAAK,OAI/C9G,EAAQ/E,KAAM6L,EAAK,aACnBvF,EAAc/H,KAAM,KAAMoJ,KAI5BtB,EAAYA,EAAUvG,QAAU,GAAI+H,QAAQxB,EAAU6E,KAAK,MAC3D5E,EAAgBA,EAAcxG,QAAU,GAAI+H,QAAQvB,EAAc4E,KAAK,MAIvE4B,EAAahE,EAAQ+B,KAAM1E,EAAQmI,yBAKnC/H,EAAWuG,GAAchE,EAAQ+B,KAAM1E,EAAQI,UAC9C,SAAUS,EAAGC,GACZ,GAAIsH,GAAuB,IAAfvH,EAAE7D,SAAiB6D,EAAE4F,gBAAkB5F,EAClDwH,EAAMvH,GAAKA,EAAElD,UACd,OAAOiD,KAAMwH,MAAWA,GAAwB,IAAjBA,EAAIrL,YAClCoL,EAAMhI,SACLgI,EAAMhI,SAAUiI,GAChBxH,EAAEsH,yBAA8D,GAAnCtH,EAAEsH,wBAAyBE,MAG3D,SAAUxH,EAAGC,GACZ,GAAKA,EACJ,MAASA,EAAIA,EAAElD,WACd,GAAKkD,IAAMD,EACV,OAAO,CAIV,QAAO,GAOTD,EAAY+F,EACZ,SAAU9F,EAAGC,GAGZ,GAAKD,IAAMC,EAEV,MADAhB,IAAe,EACR,CAIR,IAAIwI,IAAWzH,EAAEsH,yBAA2BrH,EAAEqH,uBAC9C,OAAKG,GACGA,GAIRA,GAAYzH,EAAEsD,eAAiBtD,MAAUC,EAAEqD,eAAiBrD,GAC3DD,EAAEsH,wBAAyBrH,GAG3B,EAGc,EAAVwH,IACF5P,EAAQ6P,cAAgBzH,EAAEqH,wBAAyBtH,KAAQyH,EAGxDzH,IAAMgG,GAAOhG,EAAEsD,gBAAkB9D,GAAgBD,EAASC,EAAcQ,GACrE,GAEHC,IAAM+F,GAAO/F,EAAEqD,gBAAkB9D,GAAgBD,EAASC,EAAcS,GACrE,EAIDjB,EACJxH,EAASwH,EAAWgB,GAAMxI,EAASwH,EAAWiB,GAChD,EAGe,EAAVwH,EAAc,GAAK,IAE3B,SAAUzH,EAAGC,GAEZ,GAAKD,IAAMC,EAEV,MADAhB,IAAe,EACR,CAGR,IAAIkG,GACHtL,EAAI,EACJ8N,EAAM3H,EAAEjD,WACRyK,EAAMvH,EAAElD,WACR6K,GAAO5H,GACP6H,GAAO5H,EAGR,KAAM0H,IAAQH,EACb,MAAOxH,KAAMgG,EAAM,GAClB/F,IAAM+F,EAAM,EACZ2B,EAAM,GACNH,EAAM,EACNxI,EACExH,EAASwH,EAAWgB,GAAMxI,EAASwH,EAAWiB,GAChD,CAGK,IAAK0H,IAAQH,EACnB,MAAOtC,IAAclF,EAAGC,EAIzBkF,GAAMnF,CACN,OAASmF,EAAMA,EAAIpI,WAClB6K,EAAGE,QAAS3C,EAEbA,GAAMlF,CACN,OAASkF,EAAMA,EAAIpI,WAClB8K,EAAGC,QAAS3C,EAIb,OAAQyC,EAAG/N,KAAOgO,EAAGhO,GACpBA,GAGD,OAAOA,GAENqL,GAAc0C,EAAG/N,GAAIgO,EAAGhO,IAGxB+N,EAAG/N,KAAO2F,EAAe,GACzBqI,EAAGhO,KAAO2F,EAAe,EACzB,GAGKwG,GA1WClP,GA6WT0H,GAAOT,QAAU,SAAUgK,EAAMC,GAChC,MAAOxJ,IAAQuJ,EAAM,KAAM,KAAMC,IAGlCxJ,GAAOwI,gBAAkB,SAAUpN,EAAMmO,GASxC,IAPOnO,EAAK0J,eAAiB1J,KAAW9C,GACvCoI,EAAatF,GAIdmO,EAAOA,EAAKvM,QAASwF,EAAkB,aAElCnJ,EAAQmP,kBAAmB5H,GAC5BE,GAAkBA,EAAcuE,KAAMkE,IACtC1I,GAAkBA,EAAUwE,KAAMkE,IAErC,IACC,GAAI1O,GAAM0E,EAAQ/E,KAAMY,EAAMmO,EAG9B,IAAK1O,GAAOxB,EAAQwP,mBAGlBzN,EAAK9C,UAAuC,KAA3B8C,EAAK9C,SAASqF,SAChC,MAAO9C,GAEP,MAAOuJ,IAGV,MAAOpE,IAAQuJ,EAAMjR,EAAU,MAAQ8C,IAASd,OAAS,GAG1D0F,GAAOe,SAAW,SAAUtH,EAAS2B,GAKpC,OAHO3B,EAAQqL,eAAiBrL,KAAcnB,GAC7CoI,EAAajH,GAEPsH,EAAUtH,EAAS2B,IAG3B4E,GAAOyJ,KAAO,SAAUrO,EAAMc,IAEtBd,EAAK0J,eAAiB1J,KAAW9C,GACvCoI,EAAatF,EAGd,IAAI1B,GAAKuG,EAAKwG,WAAYvK,EAAK0C,eAE9B8K,EAAMhQ,GAAMP,EAAOqB,KAAMyF,EAAKwG,WAAYvK,EAAK0C,eAC9ClF,EAAI0B,EAAMc,GAAO0E,GACjBhE,MAEF,OAAeA,UAAR8M,EACNA,EACArQ,EAAQ6I,aAAetB,EACtBxF,EAAKkK,aAAcpJ,IAClBwN,EAAMtO,EAAKgN,iBAAiBlM,KAAUwN,EAAIC,UAC1CD,EAAI7K,MACJ,MAGJmB,GAAO9C,MAAQ,SAAUC,GACxB,KAAM,IAAI3E,OAAO,0CAA4C2E,IAO9D6C,GAAO4J,WAAa,SAAU5K,GAC7B,GAAI5D,GACHyO,KACAjO,EAAI,EACJP,EAAI,CAOL,IAJAoF,GAAgBpH,EAAQyQ,iBACxBtJ,GAAanH,EAAQ0Q,YAAc/K,EAAQnG,MAAO,GAClDmG,EAAQlD,KAAMyF,GAETd,EAAe,CACnB,MAASrF,EAAO4D,EAAQ3D,KAClBD,IAAS4D,EAAS3D,KACtBO,EAAIiO,EAAW9Q,KAAMsC,GAGvB,OAAQO,IACPoD,EAAQjD,OAAQ8N,EAAYjO,GAAK,GAQnC,MAFA4E,GAAY,KAELxB,GAORkB,EAAUF,GAAOE,QAAU,SAAU9E,GACpC,GAAIiM,GACHxM,EAAM,GACNQ,EAAI,EACJsC,EAAWvC,EAAKuC,QAEjB,IAAMA,GAMC,GAAkB,IAAbA,GAA+B,IAAbA,GAA+B,KAAbA,EAAkB,CAGjE,GAAiC,gBAArBvC,GAAK4O,YAChB,MAAO5O,GAAK4O,WAGZ,KAAM5O,EAAOA,EAAK6O,WAAY7O,EAAMA,EAAOA,EAAK0L,YAC/CjM,GAAOqF,EAAS9E,OAGZ,IAAkB,IAAbuC,GAA+B,IAAbA,EAC7B,MAAOvC,GAAK8O,cAhBZ,OAAS7C,EAAOjM,EAAKC,KAEpBR,GAAOqF,EAASmH,EAkBlB,OAAOxM,IAGRoF,EAAOD,GAAOmK,WAGblE,YAAa,GAEbmE,aAAcjE,GAEd5B,MAAO5B,EAEP8D,cAEAwB,QAEAoC,UACCC,KAAOC,IAAK,aAAc/O,OAAO,GACjCgP,KAAOD,IAAK,cACZE,KAAOF,IAAK,kBAAmB/O,OAAO,GACtCkP,KAAOH,IAAK,oBAGbI,WACC5H,KAAQ,SAAUwB,GAUjB,MATAA,GAAM,GAAKA,EAAM,GAAGvH,QAAS0G,GAAWC,IAGxCY,EAAM,IAAOA,EAAM,IAAMA,EAAM,IAAMA,EAAM,IAAM,IAAKvH,QAAS0G,GAAWC,IAExD,OAAbY,EAAM,KACVA,EAAM,GAAK,IAAMA,EAAM,GAAK,KAGtBA,EAAM1L,MAAO,EAAG,IAGxBoK,MAAS,SAAUsB,GA6BlB,MAlBAA,GAAM,GAAKA,EAAM,GAAG3F,cAEY,QAA3B2F,EAAM,GAAG1L,MAAO,EAAG,IAEjB0L,EAAM,IACXvE,GAAO9C,MAAOqH,EAAM,IAKrBA,EAAM,KAAQA,EAAM,GAAKA,EAAM,IAAMA,EAAM,IAAM,GAAK,GAAmB,SAAbA,EAAM,IAA8B,QAAbA,EAAM,KACzFA,EAAM,KAAUA,EAAM,GAAKA,EAAM,IAAqB,QAAbA,EAAM,KAGpCA,EAAM,IACjBvE,GAAO9C,MAAOqH,EAAM,IAGdA,GAGRvB,OAAU,SAAUuB,GACnB,GAAIqG,GACHC,GAAYtG,EAAM,IAAMA,EAAM,EAE/B,OAAK5B,GAAiB,MAAE0C,KAAMd,EAAM,IAC5B,MAIHA,EAAM,GACVA,EAAM,GAAKA,EAAM,IAAMA,EAAM,IAAM,GAGxBsG,GAAYpI,EAAQ4C,KAAMwF,KAEpCD,EAASxK,EAAUyK,GAAU,MAE7BD,EAASC,EAAS7R,QAAS,IAAK6R,EAASvQ,OAASsQ,GAAWC,EAASvQ,UAGvEiK,EAAM,GAAKA,EAAM,GAAG1L,MAAO,EAAG+R,GAC9BrG,EAAM,GAAKsG,EAAShS,MAAO,EAAG+R,IAIxBrG,EAAM1L,MAAO,EAAG,MAIzBqP,QAECpF,IAAO,SAAUgI,GAChB,GAAInM,GAAWmM,EAAiB9N,QAAS0G,GAAWC,IAAY/E,aAChE,OAA4B,MAArBkM,EACN,WAAa,OAAO,GACpB,SAAU1P,GACT,MAAOA,GAAKuD,UAAYvD,EAAKuD,SAASC,gBAAkBD,IAI3DkE,MAAS,SAAUgF,GAClB,GAAIkD,GAAU5J,EAAY0G,EAAY,IAEtC,OAAOkD,KACLA,EAAU,GAAI1I,QAAQ,MAAQN,EAAa,IAAM8F,EAAY,IAAM9F,EAAa,SACjFZ,EAAY0G,EAAW,SAAUzM,GAChC,MAAO2P,GAAQ1F,KAAgC,gBAAnBjK,GAAKyM,WAA0BzM,EAAKyM,WAA0C,mBAAtBzM,GAAKkK,cAAgClK,EAAKkK,aAAa,UAAY,OAI1JvC,KAAQ,SAAU7G,EAAM8O,EAAUC,GACjC,MAAO,UAAU7P,GAChB,GAAI8P,GAASlL,GAAOyJ,KAAMrO,EAAMc,EAEhC,OAAe,OAAVgP,EACgB,OAAbF,EAEFA,GAINE,GAAU,GAEU,MAAbF,EAAmBE,IAAWD,EACvB,OAAbD,EAAoBE,IAAWD,EAClB,OAAbD,EAAoBC,GAAqC,IAA5BC,EAAOlS,QAASiS,GAChC,OAAbD,EAAoBC,GAASC,EAAOlS,QAASiS,GAAU,GAC1C,OAAbD,EAAoBC,GAASC,EAAOrS,OAAQoS,EAAM3Q,UAAa2Q,EAClD,OAAbD,GAAsB,IAAME,EAAOlO,QAASoF,EAAa,KAAQ,KAAMpJ,QAASiS,GAAU,GAC7E,OAAbD,EAAoBE,IAAWD,GAASC,EAAOrS,MAAO,EAAGoS,EAAM3Q,OAAS,KAAQ2Q,EAAQ,KACxF,IAZO,IAgBVhI,MAAS,SAAU3F,EAAM6N,EAAMjE,EAAU1L,EAAOE,GAC/C,GAAI0P,GAAgC,QAAvB9N,EAAKzE,MAAO,EAAG,GAC3BwS,EAA+B,SAArB/N,EAAKzE,MAAO,IACtByS,EAAkB,YAATH,CAEV,OAAiB,KAAV3P,GAAwB,IAATE,EAGrB,SAAUN,GACT,QAASA,EAAKmD,YAGf,SAAUnD,EAAM3B,EAAS8R,GACxB,GAAIxF,GAAOyF,EAAYnE,EAAMT,EAAM6E,EAAWC,EAC7CnB,EAAMa,IAAWC,EAAU,cAAgB,kBAC3C9D,EAASnM,EAAKmD,WACdrC,EAAOoP,GAAUlQ,EAAKuD,SAASC,cAC/B+M,GAAYJ,IAAQD,CAErB,IAAK/D,EAAS,CAGb,GAAK6D,EAAS,CACb,MAAQb,EAAM,CACblD,EAAOjM,CACP,OAASiM,EAAOA,EAAMkD,GACrB,GAAKe,EAASjE,EAAK1I,SAASC,gBAAkB1C,EAAyB,IAAlBmL,EAAK1J,SACzD,OAAO,CAIT+N,GAAQnB,EAAe,SAATjN,IAAoBoO,GAAS,cAE5C,OAAO,EAMR,GAHAA,GAAUL,EAAU9D,EAAO0C,WAAa1C,EAAOqE,WAG1CP,GAAWM,EAAW,CAE1BH,EAAajE,EAAQ1K,KAAc0K,EAAQ1K,OAC3CkJ,EAAQyF,EAAYlO,OACpBmO,EAAY1F,EAAM,KAAO9E,GAAW8E,EAAM,GAC1Ca,EAAOb,EAAM,KAAO9E,GAAW8E,EAAM,GACrCsB,EAAOoE,GAAalE,EAAOpD,WAAYsH,EAEvC,OAASpE,IAASoE,GAAapE,GAAQA,EAAMkD,KAG3C3D,EAAO6E,EAAY,IAAMC,EAAM/J,MAGhC,GAAuB,IAAlB0F,EAAK1J,YAAoBiJ,GAAQS,IAASjM,EAAO,CACrDoQ,EAAYlO,IAAW2D,EAASwK,EAAW7E,EAC3C,YAKI,IAAK+E,IAAa5F,GAAS3K,EAAMyB,KAAczB,EAAMyB,QAAkBS,KAAWyI,EAAM,KAAO9E,EACrG2F,EAAOb,EAAM,OAKb,OAASsB,IAASoE,GAAapE,GAAQA,EAAMkD,KAC3C3D,EAAO6E,EAAY,IAAMC,EAAM/J,MAEhC,IAAO2J,EAASjE,EAAK1I,SAASC,gBAAkB1C,EAAyB,IAAlBmL,EAAK1J,aAAsBiJ,IAE5E+E,KACHtE,EAAMxK,KAAcwK,EAAMxK,QAAkBS,IAAW2D,EAAS2F,IAG7DS,IAASjM,GACb,KAQJ,OADAwL,IAAQlL,EACDkL,IAASpL,GAAWoL,EAAOpL,IAAU,GAAKoL,EAAOpL,GAAS,KAKrEwH,OAAU,SAAU6I,EAAQ3E,GAK3B,GAAIhM,GACHxB,EAAKuG,EAAKkC,QAAS0J,IAAY5L,EAAK6L,WAAYD,EAAOjN,gBACtDoB,GAAO9C,MAAO,uBAAyB2O,EAKzC,OAAKnS,GAAImD,GACDnD,EAAIwN,GAIPxN,EAAGY,OAAS,GAChBY,GAAS2Q,EAAQA,EAAQ,GAAI3E,GACtBjH,EAAK6L,WAAW1S,eAAgByS,EAAOjN,eAC7CuH,GAAa,SAAU7B,EAAM/E,GAC5B,GAAIwM,GACHC,EAAUtS,EAAI4K,EAAM4C,GACpB7L,EAAI2Q,EAAQ1R,MACb,OAAQe,IACP0Q,EAAM/S,EAASsL,EAAM0H,EAAQ3Q,IAC7BiJ,EAAMyH,KAAWxM,EAASwM,GAAQC,EAAQ3Q,MAG5C,SAAUD,GACT,MAAO1B,GAAI0B,EAAM,EAAGF,KAIhBxB,IAITyI,SAEC8J,IAAO9F,GAAa,SAAU3M,GAI7B,GAAI+O,MACHvJ,KACAkN,EAAU7L,EAAS7G,EAASwD,QAASpD,EAAO,MAE7C,OAAOsS,GAASrP,GACfsJ,GAAa,SAAU7B,EAAM/E,EAAS9F,EAAS8R,GAC9C,GAAInQ,GACH+Q,EAAYD,EAAS5H,EAAM,KAAMiH,MACjClQ,EAAIiJ,EAAKhK,MAGV,OAAQe,KACDD,EAAO+Q,EAAU9Q,MACtBiJ,EAAKjJ,KAAOkE,EAAQlE,GAAKD,MAI5B,SAAUA,EAAM3B,EAAS8R,GAKxB,MAJAhD,GAAM,GAAKnN,EACX8Q,EAAS3D,EAAO,KAAMgD,EAAKvM,GAE3BuJ,EAAM,GAAK,MACHvJ,EAAQ2C,SAInByK,IAAOjG,GAAa,SAAU3M,GAC7B,MAAO,UAAU4B,GAChB,MAAO4E,IAAQxG,EAAU4B,GAAOd,OAAS,KAI3CyG,SAAYoF,GAAa,SAAU/H,GAElC,MADAA,GAAOA,EAAKpB,QAAS0G,GAAWC,IACzB,SAAUvI,GAChB,OAASA,EAAK4O,aAAe5O,EAAKiR,WAAanM,EAAS9E,IAASpC,QAASoF,GAAS,MAWrFkO,KAAQnG,GAAc,SAAUmG,GAM/B,MAJM5J,GAAY2C,KAAKiH,GAAQ,KAC9BtM,GAAO9C,MAAO,qBAAuBoP,GAEtCA,EAAOA,EAAKtP,QAAS0G,GAAWC,IAAY/E,cACrC,SAAUxD,GAChB,GAAImR,EACJ,GACC,IAAMA,EAAW3L,EAChBxF,EAAKkR,KACLlR,EAAKkK,aAAa,aAAelK,EAAKkK,aAAa,QAGnD,MADAiH,GAAWA,EAAS3N,cACb2N,IAAaD,GAA2C,IAAnCC,EAASvT,QAASsT,EAAO,YAE5ClR,EAAOA,EAAKmD,aAAiC,IAAlBnD,EAAKuC,SAC3C,QAAO,KAKTpB,OAAU,SAAUnB,GACnB,GAAIoR,GAAO/T,EAAOgU,UAAYhU,EAAOgU,SAASD,IAC9C,OAAOA,IAAQA,EAAK3T,MAAO,KAAQuC,EAAK6J,IAGzCyH,KAAQ,SAAUtR,GACjB,MAAOA,KAASuF,GAGjBgM,MAAS,SAAUvR,GAClB,MAAOA,KAAS9C,EAASsU,iBAAmBtU,EAASuU,UAAYvU,EAASuU,gBAAkBzR,EAAKkC,MAAQlC,EAAK0R,OAAS1R,EAAK2R,WAI7HC,QAAW,SAAU5R,GACpB,MAAOA,GAAK6R,YAAa,GAG1BA,SAAY,SAAU7R,GACrB,MAAOA,GAAK6R,YAAa,GAG1BC,QAAW,SAAU9R,GAGpB,GAAIuD,GAAWvD,EAAKuD,SAASC,aAC7B,OAAqB,UAAbD,KAA0BvD,EAAK8R,SAA0B,WAAbvO,KAA2BvD,EAAK+R,UAGrFA,SAAY,SAAU/R,GAOrB,MAJKA,GAAKmD,YACTnD,EAAKmD,WAAW6O,cAGVhS,EAAK+R,YAAa,GAI1BE,MAAS,SAAUjS,GAKlB,IAAMA,EAAOA,EAAK6O,WAAY7O,EAAMA,EAAOA,EAAK0L,YAC/C,GAAK1L,EAAKuC,SAAW,EACpB,OAAO,CAGT,QAAO,GAGR4J,OAAU,SAAUnM,GACnB,OAAQ6E,EAAKkC,QAAe,MAAG/G,IAIhCkS,OAAU,SAAUlS,GACnB,MAAOiI,GAAQgC,KAAMjK,EAAKuD,WAG3B4J,MAAS,SAAUnN,GAClB,MAAOgI,GAAQiC,KAAMjK,EAAKuD,WAG3B4O,OAAU,SAAUnS,GACnB,GAAIc,GAAOd,EAAKuD,SAASC,aACzB,OAAgB,UAAT1C,GAAkC,WAAdd,EAAKkC,MAA8B,WAATpB,GAGtDkC,KAAQ,SAAUhD,GACjB,GAAIqO,EACJ,OAAuC,UAAhCrO,EAAKuD,SAASC,eACN,SAAdxD,EAAKkC,OAImC,OAArCmM,EAAOrO,EAAKkK,aAAa,UAA2C,SAAvBmE,EAAK7K,gBAIvDpD,MAASyL,GAAuB,WAC/B,OAAS,KAGVvL,KAAQuL,GAAuB,SAAUE,EAAc7M,GACtD,OAASA,EAAS,KAGnBmB,GAAMwL,GAAuB,SAAUE,EAAc7M,EAAQ4M,GAC5D,OAAoB,EAAXA,EAAeA,EAAW5M,EAAS4M,KAG7CsG,KAAQvG,GAAuB,SAAUE,EAAc7M,GAEtD,IADA,GAAIe,GAAI,EACIf,EAAJe,EAAYA,GAAK,EACxB8L,EAAapO,KAAMsC,EAEpB,OAAO8L,KAGRsG,IAAOxG,GAAuB,SAAUE,EAAc7M,GAErD,IADA,GAAIe,GAAI,EACIf,EAAJe,EAAYA,GAAK,EACxB8L,EAAapO,KAAMsC,EAEpB,OAAO8L,KAGRuG,GAAMzG,GAAuB,SAAUE,EAAc7M,EAAQ4M,GAE5D,IADA,GAAI7L,GAAe,EAAX6L,EAAeA,EAAW5M,EAAS4M,IACjC7L,GAAK,GACd8L,EAAapO,KAAMsC,EAEpB,OAAO8L,KAGRwG,GAAM1G,GAAuB,SAAUE,EAAc7M,EAAQ4M,GAE5D,IADA,GAAI7L,GAAe,EAAX6L,EAAeA,EAAW5M,EAAS4M,IACjC7L,EAAIf,GACb6M,EAAapO,KAAMsC,EAEpB,OAAO8L,OAKVlH,EAAKkC,QAAa,IAAIlC,EAAKkC,QAAY,EAGvC,KAAM9G,KAAOuS,OAAO,EAAMC,UAAU,EAAMC,MAAM,EAAMC,UAAU,EAAMC,OAAO,GAC5E/N,EAAKkC,QAAS9G,GAAM0L,GAAmB1L,EAExC,KAAMA,KAAO4S,QAAQ,EAAMC,OAAO,GACjCjO,EAAKkC,QAAS9G,GAAM2L,GAAoB3L,EAIzC,SAASyQ,OACTA,GAAW3R,UAAY8F,EAAKkO,QAAUlO,EAAKkC,QAC3ClC,EAAK6L,WAAa,GAAIA,IAEtB1L,EAAWJ,GAAOI,SAAW,SAAU5G,EAAU4U,GAChD,GAAIpC,GAASzH,EAAO8J,EAAQ/Q,EAC3BgR,EAAO7J,EAAQ8J,EACfC,EAASnN,EAAY7H,EAAW,IAEjC,IAAKgV,EACJ,MAAOJ,GAAY,EAAII,EAAO3V,MAAO,EAGtCyV,GAAQ9U,EACRiL,KACA8J,EAAatO,EAAK0K,SAElB,OAAQ2D,EAAQ,GAGTtC,IAAYzH,EAAQjC,EAAOyC,KAAMuJ,OACjC/J,IAEJ+J,EAAQA,EAAMzV,MAAO0L,EAAM,GAAGjK,SAAYgU,GAE3C7J,EAAO1L,KAAOsV,OAGfrC,GAAU,GAGJzH,EAAQhC,EAAawC,KAAMuJ,MAChCtC,EAAUzH,EAAM2B,QAChBmI,EAAOtV,MACN8F,MAAOmN,EAEP1O,KAAMiH,EAAM,GAAGvH,QAASpD,EAAO,OAEhC0U,EAAQA,EAAMzV,MAAOmT,EAAQ1R,QAI9B,KAAMgD,IAAQ2C,GAAKiI,SACZ3D,EAAQ5B,EAAWrF,GAAOyH,KAAMuJ,KAAcC,EAAYjR,MAC9DiH,EAAQgK,EAAYjR,GAAQiH,MAC7ByH,EAAUzH,EAAM2B,QAChBmI,EAAOtV,MACN8F,MAAOmN,EACP1O,KAAMA,EACNiC,QAASgF,IAEV+J,EAAQA,EAAMzV,MAAOmT,EAAQ1R,QAI/B,KAAM0R,EACL,MAOF,MAAOoC,GACNE,EAAMhU,OACNgU,EACCtO,GAAO9C,MAAO1D,GAEd6H,EAAY7H,EAAUiL,GAAS5L,MAAO,GAGzC,SAAS2M,IAAY6I,GAIpB,IAHA,GAAIhT,GAAI,EACPM,EAAM0S,EAAO/T,OACbd,EAAW,GACAmC,EAAJN,EAASA,IAChB7B,GAAY6U,EAAOhT,GAAGwD,KAEvB,OAAOrF,GAGR,QAASiV,IAAevC,EAASwC,EAAYC,GAC5C,GAAIpE,GAAMmE,EAAWnE,IACpBqE,EAAmBD,GAAgB,eAARpE,EAC3BsE,EAAW3N,GAEZ,OAAOwN,GAAWlT,MAEjB,SAAUJ,EAAM3B,EAAS8R,GACxB,MAASnQ,EAAOA,EAAMmP,GACrB,GAAuB,IAAlBnP,EAAKuC,UAAkBiR,EAC3B,MAAO1C,GAAS9Q,EAAM3B,EAAS8R,IAMlC,SAAUnQ,EAAM3B,EAAS8R,GACxB,GAAIuD,GAAUtD,EACbuD,GAAa9N,EAAS4N,EAGvB,IAAKtD,GACJ,MAASnQ,EAAOA,EAAMmP,GACrB,IAAuB,IAAlBnP,EAAKuC,UAAkBiR,IACtB1C,EAAS9Q,EAAM3B,EAAS8R,GAC5B,OAAO,MAKV,OAASnQ,EAAOA,EAAMmP,GACrB,GAAuB,IAAlBnP,EAAKuC,UAAkBiR,EAAmB,CAE9C,GADApD,EAAapQ,EAAMyB,KAAczB,EAAMyB,QACjCiS,EAAWtD,EAAYjB,KAC5BuE,EAAU,KAAQ7N,GAAW6N,EAAU,KAAQD,EAG/C,MAAQE,GAAU,GAAMD,EAAU,EAMlC,IAHAtD,EAAYjB,GAAQwE,EAGdA,EAAU,GAAM7C,EAAS9Q,EAAM3B,EAAS8R,GAC7C,OAAO,IASf,QAASyD,IAAgBC,GACxB,MAAOA,GAAS3U,OAAS,EACxB,SAAUc,EAAM3B,EAAS8R,GACxB,GAAIlQ,GAAI4T,EAAS3U,MACjB,OAAQe,IACP,IAAM4T,EAAS5T,GAAID,EAAM3B,EAAS8R,GACjC,OAAO,CAGT,QAAO,GAER0D,EAAS,GAGX,QAASC,IAAkB1V,EAAU2V,EAAUnQ,GAG9C,IAFA,GAAI3D,GAAI,EACPM,EAAMwT,EAAS7U,OACJqB,EAAJN,EAASA,IAChB2E,GAAQxG,EAAU2V,EAAS9T,GAAI2D,EAEhC,OAAOA,GAGR,QAASoQ,IAAUjD,EAAWhR,EAAK+M,EAAQzO,EAAS8R,GAOnD,IANA,GAAInQ,GACHiU,KACAhU,EAAI,EACJM,EAAMwQ,EAAU7R,OAChBgV,EAAgB,MAAPnU,EAEEQ,EAAJN,EAASA,KACVD,EAAO+Q,EAAU9Q,OAChB6M,GAAUA,EAAQ9M,EAAM3B,EAAS8R,MACtC8D,EAAatW,KAAMqC,GACdkU,GACJnU,EAAIpC,KAAMsC,GAMd,OAAOgU,GAGR,QAASE,IAAY5E,EAAWnR,EAAU0S,EAASsD,EAAYC,EAAYC,GAO1E,MANKF,KAAeA,EAAY3S,KAC/B2S,EAAaD,GAAYC,IAErBC,IAAeA,EAAY5S,KAC/B4S,EAAaF,GAAYE,EAAYC,IAE/BvJ,GAAa,SAAU7B,EAAMtF,EAASvF,EAAS8R,GACrD,GAAIoE,GAAMtU,EAAGD,EACZwU,KACAC,KACAC,EAAc9Q,EAAQ1E,OAGtBM,EAAQ0J,GAAQ4K,GAAkB1V,GAAY,IAAKC,EAAQkE,UAAalE,GAAYA,MAGpFsW,GAAYpF,IAAerG,GAAS9K,EAEnCoB,EADAwU,GAAUxU,EAAOgV,EAAQjF,EAAWlR,EAAS8R,GAG9CyE,EAAa9D,EAEZuD,IAAgBnL,EAAOqG,EAAYmF,GAAeN,MAMjDxQ,EACD+Q,CAQF,IALK7D,GACJA,EAAS6D,EAAWC,EAAYvW,EAAS8R,GAIrCiE,EAAa,CACjBG,EAAOP,GAAUY,EAAYH,GAC7BL,EAAYG,KAAUlW,EAAS8R,GAG/BlQ,EAAIsU,EAAKrV,MACT,OAAQe,KACDD,EAAOuU,EAAKtU,MACjB2U,EAAYH,EAAQxU,MAAS0U,EAAWF,EAAQxU,IAAOD,IAK1D,GAAKkJ,GACJ,GAAKmL,GAAc9E,EAAY,CAC9B,GAAK8E,EAAa,CAEjBE,KACAtU,EAAI2U,EAAW1V,MACf,OAAQe,KACDD,EAAO4U,EAAW3U,KAEvBsU,EAAK5W,KAAOgX,EAAU1U,GAAKD,EAG7BqU,GAAY,KAAOO,KAAkBL,EAAMpE,GAI5ClQ,EAAI2U,EAAW1V,MACf,OAAQe,KACDD,EAAO4U,EAAW3U,MACtBsU,EAAOF,EAAazW,EAASsL,EAAMlJ,GAASwU,EAAOvU,IAAM,KAE1DiJ,EAAKqL,KAAU3Q,EAAQ2Q,GAAQvU,SAOlC4U,GAAaZ,GACZY,IAAehR,EACdgR,EAAWjU,OAAQ+T,EAAaE,EAAW1V,QAC3C0V,GAEGP,EACJA,EAAY,KAAMzQ,EAASgR,EAAYzE,GAEvCxS,EAAKuC,MAAO0D,EAASgR,KAMzB,QAASC,IAAmB5B,GAwB3B,IAvBA,GAAI6B,GAAchE,EAAStQ,EAC1BD,EAAM0S,EAAO/T,OACb6V,EAAkBlQ,EAAKoK,SAAUgE,EAAO,GAAG/Q,MAC3C8S,EAAmBD,GAAmBlQ,EAAKoK,SAAS,KACpDhP,EAAI8U,EAAkB,EAAI,EAG1BE,EAAe5B,GAAe,SAAUrT,GACvC,MAAOA,KAAS8U,GACdE,GAAkB,GACrBE,EAAkB7B,GAAe,SAAUrT,GAC1C,MAAOpC,GAASkX,EAAc9U,GAAS,IACrCgV,GAAkB,GACrBnB,GAAa,SAAU7T,EAAM3B,EAAS8R,GACrC,GAAI1Q,IAASsV,IAAqB5E,GAAO9R,IAAY8G,MACnD2P,EAAezW,GAASkE,SACxB0S,EAAcjV,EAAM3B,EAAS8R,GAC7B+E,EAAiBlV,EAAM3B,EAAS8R,GAGlC,OADA2E,GAAe,KACRrV,IAGGc,EAAJN,EAASA,IAChB,GAAM6Q,EAAUjM,EAAKoK,SAAUgE,EAAOhT,GAAGiC,MACxC2R,GAAaR,GAAcO,GAAgBC,GAAY/C,QACjD,CAIN,GAHAA,EAAUjM,EAAKiI,OAAQmG,EAAOhT,GAAGiC,MAAOhC,MAAO,KAAM+S,EAAOhT,GAAGkE,SAG1D2M,EAASrP,GAAY,CAGzB,IADAjB,IAAMP,EACMM,EAAJC,EAASA,IAChB,GAAKqE,EAAKoK,SAAUgE,EAAOzS,GAAG0B,MAC7B,KAGF,OAAOiS,IACNlU,EAAI,GAAK2T,GAAgBC,GACzB5T,EAAI,GAAKmK,GAER6I,EAAOxV,MAAO,EAAGwC,EAAI,GAAIvC,QAAS+F,MAAgC,MAAzBwP,EAAQhT,EAAI,GAAIiC,KAAe,IAAM,MAC7EN,QAASpD,EAAO,MAClBsS,EACItQ,EAAJP,GAAS4U,GAAmB5B,EAAOxV,MAAOwC,EAAGO,IACzCD,EAAJC,GAAWqU,GAAoB5B,EAASA,EAAOxV,MAAO+C,IAClDD,EAAJC,GAAW4J,GAAY6I,IAGzBY,EAASlW,KAAMmT,GAIjB,MAAO8C,IAAgBC,GAGxB,QAASsB,IAA0BC,EAAiBC,GACnD,GAAIC,GAAQD,EAAYnW,OAAS,EAChCqW,EAAYH,EAAgBlW,OAAS,EACrCsW,EAAe,SAAUtM,EAAM7K,EAAS8R,EAAKvM,EAAS6R,GACrD,GAAIzV,GAAMQ,EAAGsQ,EACZ4E,EAAe,EACfzV,EAAI,IACJ8Q,EAAY7H,MACZyM,KACAC,EAAgBzQ,EAEhB3F,EAAQ0J,GAAQqM,GAAa1Q,EAAKgI,KAAU,IAAG,IAAK4I,GAEpDI,EAAiBhQ,GAA4B,MAAjB+P,EAAwB,EAAIlU,KAAKC,UAAY,GACzEpB,EAAMf,EAAMN,MAUb,KARKuW,IACJtQ,EAAmB9G,IAAYnB,GAAYmB,GAOpC4B,IAAMM,GAA4B,OAApBP,EAAOR,EAAMS,IAAaA,IAAM,CACrD,GAAKsV,GAAavV,EAAO,CACxBQ,EAAI,CACJ,OAASsQ,EAAUsE,EAAgB5U,KAClC,GAAKsQ,EAAS9Q,EAAM3B,EAAS8R,GAAQ,CACpCvM,EAAQjG,KAAMqC,EACd,OAGGyV,IACJ5P,EAAUgQ,GAKPP,KAEEtV,GAAQ8Q,GAAW9Q,IACxB0V,IAIIxM,GACJ6H,EAAUpT,KAAMqC,IAOnB,GADA0V,GAAgBzV,EACXqV,GAASrV,IAAMyV,EAAe,CAClClV,EAAI,CACJ,OAASsQ,EAAUuE,EAAY7U,KAC9BsQ,EAASC,EAAW4E,EAAYtX,EAAS8R,EAG1C,IAAKjH,EAAO,CAEX,GAAKwM,EAAe,EACnB,MAAQzV,IACA8Q,EAAU9Q,IAAM0V,EAAW1V,KACjC0V,EAAW1V,GAAKsG,EAAInH,KAAMwE,GAM7B+R,GAAa3B,GAAU2B,GAIxBhY,EAAKuC,MAAO0D,EAAS+R,GAGhBF,IAAcvM,GAAQyM,EAAWzW,OAAS,GAC5CwW,EAAeL,EAAYnW,OAAW,GAExC0F,GAAO4J,WAAY5K,GAUrB,MALK6R,KACJ5P,EAAUgQ,EACV1Q,EAAmByQ,GAGb7E,EAGT,OAAOuE,GACNvK,GAAcyK,GACdA,EA+KF,MA5KAvQ,GAAUL,GAAOK,QAAU,SAAU7G,EAAU+K,GAC9C,GAAIlJ,GACHoV,KACAD,KACAhC,EAASlN,EAAe9H,EAAW,IAEpC,KAAMgV,EAAS,CAERjK,IACLA,EAAQnE,EAAU5G,IAEnB6B,EAAIkJ,EAAMjK,MACV,OAAQe,IACPmT,EAASyB,GAAmB1L,EAAMlJ,IAC7BmT,EAAQ3R,GACZ4T,EAAY1X,KAAMyV,GAElBgC,EAAgBzX,KAAMyV,EAKxBA,GAASlN,EAAe9H,EAAU+W,GAA0BC,EAAiBC,IAG7EjC,EAAOhV,SAAWA,EAEnB,MAAOgV,IAYRlO,EAASN,GAAOM,OAAS,SAAU9G,EAAUC,EAASuF,EAASsF,GAC9D,GAAIjJ,GAAGgT,EAAQ6C,EAAO5T,EAAM2K,EAC3BkJ,EAA+B,kBAAb3X,IAA2BA,EAC7C+K,GAASD,GAAQlE,EAAW5G,EAAW2X,EAAS3X,UAAYA,EAK7D,IAHAwF,EAAUA,MAGY,IAAjBuF,EAAMjK,OAAe,CAIzB,GADA+T,EAAS9J,EAAM,GAAKA,EAAM,GAAG1L,MAAO,GAC/BwV,EAAO/T,OAAS,GAAkC,QAA5B4W,EAAQ7C,EAAO,IAAI/Q,MAC5CjE,EAAQ0O,SAAgC,IAArBtO,EAAQkE,UAAkBiD,GAC7CX,EAAKoK,SAAUgE,EAAO,GAAG/Q,MAAS,CAGnC,GADA7D,GAAYwG,EAAKgI,KAAS,GAAGiJ,EAAM3R,QAAQ,GAAGvC,QAAQ0G,GAAWC,IAAYlK,QAAkB,IACzFA,EACL,MAAOuF,EAGImS,KACX1X,EAAUA,EAAQ8E,YAGnB/E,EAAWA,EAASX,MAAOwV,EAAOnI,QAAQrH,MAAMvE,QAIjDe,EAAIsH,EAAwB,aAAE0C,KAAM7L,GAAa,EAAI6U,EAAO/T,MAC5D,OAAQe,IAAM,CAIb,GAHA6V,EAAQ7C,EAAOhT,GAGV4E,EAAKoK,SAAW/M,EAAO4T,EAAM5T,MACjC,KAED,KAAM2K,EAAOhI,EAAKgI,KAAM3K,MAEjBgH,EAAO2D,EACZiJ,EAAM3R,QAAQ,GAAGvC,QAAS0G,GAAWC,IACrCH,GAAS6B,KAAMgJ,EAAO,GAAG/Q,OAAUmI,GAAahM,EAAQ8E,aAAgB9E,IACpE,CAKJ,GAFA4U,EAAOtS,OAAQV,EAAG,GAClB7B,EAAW8K,EAAKhK,QAAUkL,GAAY6I,IAChC7U,EAEL,MADAT,GAAKuC,MAAO0D,EAASsF,GACdtF,CAGR,SAeJ,OAPEmS,GAAY9Q,EAAS7G,EAAU+K,IAChCD,EACA7K,GACCmH,EACD5B,EACAwE,GAAS6B,KAAM7L,IAAciM,GAAahM,EAAQ8E,aAAgB9E,GAE5DuF,GAMR3F,EAAQ0Q,WAAalN,EAAQkD,MAAM,IAAIjE,KAAMyF,GAAYmE,KAAK,MAAQ7I,EAItExD,EAAQyQ,mBAAqBrJ,EAG7BC,IAIArH,EAAQ6P,aAAe9C,GAAO,SAAUgL,GAEvC,MAAuE,GAAhEA,EAAKtI,wBAAyBxQ,EAAS6F,cAAc,UAMvDiI,GAAO,SAAUC,GAEtB,MADAA,GAAIiC,UAAY,mBAC+B,MAAxCjC,EAAI4D,WAAW3E,aAAa,WAEnCgB,GAAW,yBAA0B,SAAUlL,EAAMc,EAAMiE,GAC1D,MAAMA,GAAN,OACQ/E,EAAKkK,aAAcpJ,EAA6B,SAAvBA,EAAK0C,cAA2B,EAAI,KAOjEvF,EAAQ6I,YAAekE,GAAO,SAAUC,GAG7C,MAFAA,GAAIiC,UAAY,WAChBjC,EAAI4D,WAAW1E,aAAc,QAAS,IACY,KAA3Cc,EAAI4D,WAAW3E,aAAc,YAEpCgB,GAAW,QAAS,SAAUlL,EAAMc,EAAMiE,GACzC,MAAMA,IAAyC,UAAhC/E,EAAKuD,SAASC,cAA7B,OACQxD,EAAKiW,eAOTjL,GAAO,SAAUC,GACtB,MAAuC,OAAhCA,EAAIf,aAAa,eAExBgB,GAAWxE,EAAU,SAAU1G,EAAMc,EAAMiE,GAC1C,GAAIuJ,EACJ,OAAMvJ,GAAN,OACQ/E,EAAMc,MAAW,EAAOA,EAAK0C,eACjC8K,EAAMtO,EAAKgN,iBAAkBlM,KAAWwN,EAAIC,UAC7CD,EAAI7K,MACL,OAKGmB,IAEHvH,EAIJc,GAAO0O,KAAOjI,EACdzG,EAAOgQ,KAAOvJ,EAAOmK,UACrB5Q,EAAOgQ,KAAK,KAAOhQ,EAAOgQ,KAAKpH,QAC/B5I,EAAO+X,OAAStR,EAAO4J,WACvBrQ,EAAO6E,KAAO4B,EAAOE,QACrB3G,EAAOgY,SAAWvR,EAAOG,MACzB5G,EAAOwH,SAAWf,EAAOe,QAIzB,IAAIyQ,GAAgBjY,EAAOgQ,KAAKhF,MAAMpB,aAElCsO,EAAa,6BAIbC,EAAY,gBAGhB,SAASC,GAAQnI,EAAUoI,EAAW3F,GACrC,GAAK1S,EAAOkD,WAAYmV,GACvB,MAAOrY,GAAO6F,KAAMoK,EAAU,SAAUpO,EAAMC,GAE7C,QAASuW,EAAUpX,KAAMY,EAAMC,EAAGD,KAAW6Q,GAK/C,IAAK2F,EAAUjU,SACd,MAAOpE,GAAO6F,KAAMoK,EAAU,SAAUpO,GACvC,MAASA,KAASwW,IAAgB3F,GAKpC,IAA0B,gBAAd2F,GAAyB,CACpC,GAAKF,EAAUrM,KAAMuM,GACpB,MAAOrY,GAAO2O,OAAQ0J,EAAWpI,EAAUyC,EAG5C2F,GAAYrY,EAAO2O,OAAQ0J,EAAWpI,GAGvC,MAAOjQ,GAAO6F,KAAMoK,EAAU,SAAUpO,GACvC,MAASpC,GAAQwB,KAAMoX,EAAWxW,IAAU,IAAQ6Q,IAItD1S,EAAO2O,OAAS,SAAUqB,EAAM3O,EAAOqR,GACtC,GAAI7Q,GAAOR,EAAO,EAMlB,OAJKqR,KACJ1C,EAAO,QAAUA,EAAO,KAGD,IAAjB3O,EAAMN,QAAkC,IAAlBc,EAAKuC,SACjCpE,EAAO0O,KAAKO,gBAAiBpN,EAAMmO,IAAWnO,MAC9C7B,EAAO0O,KAAK1I,QAASgK,EAAMhQ,EAAO6F,KAAMxE,EAAO,SAAUQ,GACxD,MAAyB,KAAlBA,EAAKuC,aAIfpE,EAAOG,GAAGsC,QACTiM,KAAM,SAAUzO,GACf,GAAI6B,GACHM,EAAMjD,KAAK4B,OACXO,KACAgX,EAAOnZ,IAER,IAAyB,gBAAbc,GACX,MAAOd,MAAKiC,UAAWpB,EAAQC,GAAW0O,OAAO,WAChD,IAAM7M,EAAI,EAAOM,EAAJN,EAASA,IACrB,GAAK9B,EAAOwH,SAAU8Q,EAAMxW,GAAK3C,MAChC,OAAO,IAMX,KAAM2C,EAAI,EAAOM,EAAJN,EAASA,IACrB9B,EAAO0O,KAAMzO,EAAUqY,EAAMxW,GAAKR,EAMnC,OAFAA,GAAMnC,KAAKiC,UAAWgB,EAAM,EAAIpC,EAAO+X,OAAQzW,GAAQA,GACvDA,EAAIrB,SAAWd,KAAKc,SAAWd,KAAKc,SAAW,IAAMA,EAAWA,EACzDqB,GAERqN,OAAQ,SAAU1O,GACjB,MAAOd,MAAKiC,UAAWgX,EAAOjZ,KAAMc,OAAgB,KAErDyS,IAAK,SAAUzS,GACd,MAAOd,MAAKiC,UAAWgX,EAAOjZ,KAAMc,OAAgB,KAErDsY,GAAI,SAAUtY,GACb,QAASmY,EACRjZ,KAIoB,gBAAbc,IAAyBgY,EAAcnM,KAAM7L,GACnDD,EAAQC,GACRA,OACD,GACCc,SASJ,IAAIyX,GAKHxO,EAAa,sCAEb5J,EAAOJ,EAAOG,GAAGC,KAAO,SAAUH,EAAUC,GAC3C,GAAI8K,GAAOnJ,CAGX,KAAM5B,EACL,MAAOd,KAIR,IAAyB,gBAAbc,GAAwB,CAUnC,GAPC+K,EAFoB,MAAhB/K,EAAS,IAAkD,MAApCA,EAAUA,EAASc,OAAS,IAAed,EAASc,QAAU,GAE/E,KAAMd,EAAU,MAGlB+J,EAAWwB,KAAMvL,IAIrB+K,IAAUA,EAAM,IAAO9K,EAgDrB,OAAMA,GAAWA,EAAQW,QACtBX,GAAWsY,GAAa9J,KAAMzO,GAKhCd,KAAK2B,YAAaZ,GAAUwO,KAAMzO,EAnDzC,IAAK+K,EAAM,GAAK,CAYf,GAXA9K,EAAUA,YAAmBF,GAASE,EAAQ,GAAKA,EAInDF,EAAOuB,MAAOpC,KAAMa,EAAOyY,UAC1BzN,EAAM,GACN9K,GAAWA,EAAQkE,SAAWlE,EAAQqL,eAAiBrL,EAAUnB,GACjE,IAIImZ,EAAWpM,KAAMd,EAAM,KAAQhL,EAAOmD,cAAejD,GACzD,IAAM8K,IAAS9K,GAETF,EAAOkD,WAAY/D,KAAM6L,IAC7B7L,KAAM6L,GAAS9K,EAAS8K,IAIxB7L,KAAK+Q,KAAMlF,EAAO9K,EAAS8K,GAK9B,OAAO7L,MAgBP,MAZA0C,GAAO9C,EAAS0M,eAAgBT,EAAM,IAIjCnJ,GAAQA,EAAKmD,aAEjB7F,KAAK4B,OAAS,EACd5B,KAAK,GAAK0C,GAGX1C,KAAKe,QAAUnB,EACfI,KAAKc,SAAWA,EACTd,KAcH,MAAKc,GAASmE,UACpBjF,KAAKe,QAAUf,KAAK,GAAKc,EACzBd,KAAK4B,OAAS,EACP5B,MAIIa,EAAOkD,WAAYjD,GACK,mBAArBuY,GAAWE,MACxBF,EAAWE,MAAOzY,GAElBA,EAAUD,IAGeqD,SAAtBpD,EAASA,WACbd,KAAKc,SAAWA,EAASA,SACzBd,KAAKe,QAAUD,EAASC,SAGlBF,EAAOwF,UAAWvF,EAAUd,OAIrCiB,GAAKQ,UAAYZ,EAAOG,GAGxBqY,EAAaxY,EAAQjB,EAGrB,IAAI4Z,GAAe,iCAElBC,GACCC,UAAU,EACVC,UAAU,EACVC,MAAM,EACNC,MAAM,EAGRhZ,GAAOyC,QACNuO,IAAK,SAAUnP,EAAMmP,EAAKiI,GACzB,GAAIxG,MACHyG,EAAqB7V,SAAV4V,CAEZ,QAASpX,EAAOA,EAAMmP,KAA4B,IAAlBnP,EAAKuC,SACpC,GAAuB,IAAlBvC,EAAKuC,SAAiB,CAC1B,GAAK8U,GAAYlZ,EAAQ6B,GAAO0W,GAAIU,GACnC,KAEDxG,GAAQjT,KAAMqC,GAGhB,MAAO4Q,IAGR0G,QAAS,SAAUC,EAAGvX,GAGrB,IAFA,GAAI4Q,MAEI2G,EAAGA,EAAIA,EAAE7L,YACI,IAAf6L,EAAEhV,UAAkBgV,IAAMvX,GAC9B4Q,EAAQjT,KAAM4Z,EAIhB,OAAO3G,MAITzS,EAAOG,GAAGsC,QACToQ,IAAK,SAAU7P,GACd,GAAIqW,GAAUrZ,EAAQgD,EAAQ7D,MAC7Bma,EAAID,EAAQtY,MAEb,OAAO5B,MAAKwP,OAAO,WAElB,IADA,GAAI7M,GAAI,EACIwX,EAAJxX,EAAOA,IACd,GAAK9B,EAAOwH,SAAUrI,KAAMka,EAAQvX,IACnC,OAAO,KAMXyX,QAAS,SAAU3I,EAAW1Q,GAS7B,IARA,GAAIkN,GACHtL,EAAI,EACJwX,EAAIna,KAAK4B,OACT0R,KACA+G,EAAMvB,EAAcnM,KAAM8E,IAAoC,gBAAdA,GAC/C5Q,EAAQ4Q,EAAW1Q,GAAWf,KAAKe,SACnC,EAEUoZ,EAAJxX,EAAOA,IACd,IAAMsL,EAAMjO,KAAK2C,GAAIsL,GAAOA,IAAQlN,EAASkN,EAAMA,EAAIpI,WAEtD,GAAKoI,EAAIhJ,SAAW,KAAOoV,EAC1BA,EAAIC,MAAMrM,GAAO,GAGA,IAAjBA,EAAIhJ,UACHpE,EAAO0O,KAAKO,gBAAgB7B,EAAKwD,IAAc,CAEhD6B,EAAQjT,KAAM4N,EACd,OAKH,MAAOjO,MAAKiC,UAAWqR,EAAQ1R,OAAS,EAAIf,EAAO+X,OAAQtF,GAAYA,IAIxEgH,MAAO,SAAU5X,GAGhB,MAAMA,GAKe,gBAATA,GACJpC,EAAQwB,KAAMjB,EAAQ6B,GAAQ1C,KAAM,IAIrCM,EAAQwB,KAAM9B,KAGpB0C,EAAKhB,OAASgB,EAAM,GAAMA,GAZjB1C,KAAM,IAAOA,KAAM,GAAI6F,WAAe7F,KAAK8C,QAAQyX,UAAU3Y,OAAS,IAgBjF4Y,IAAK,SAAU1Z,EAAUC,GACxB,MAAOf,MAAKiC,UACXpB,EAAO+X,OACN/X,EAAOuB,MAAOpC,KAAK+B,MAAOlB,EAAQC,EAAUC,OAK/C0Z,QAAS,SAAU3Z,GAClB,MAAOd,MAAKwa,IAAiB,MAAZ1Z,EAChBd,KAAKqC,WAAarC,KAAKqC,WAAWmN,OAAO1O,MAK5C,SAASkZ,GAAS/L,EAAK4D,GACtB,OAAS5D,EAAMA,EAAI4D,KAA0B,IAAjB5D,EAAIhJ,UAChC,MAAOgJ,GAGRpN,EAAOyB,MACNuM,OAAQ,SAAUnM,GACjB,GAAImM,GAASnM,EAAKmD,UAClB,OAAOgJ,IAA8B,KAApBA,EAAO5J,SAAkB4J,EAAS,MAEpD6L,QAAS,SAAUhY,GAClB,MAAO7B,GAAOgR,IAAKnP,EAAM,eAE1BiY,aAAc,SAAUjY,EAAMC,EAAGmX,GAChC,MAAOjZ,GAAOgR,IAAKnP,EAAM,aAAcoX,IAExCF,KAAM,SAAUlX,GACf,MAAOsX,GAAStX,EAAM,gBAEvBmX,KAAM,SAAUnX,GACf,MAAOsX,GAAStX,EAAM,oBAEvBkY,QAAS,SAAUlY,GAClB,MAAO7B,GAAOgR,IAAKnP,EAAM,gBAE1B6X,QAAS,SAAU7X,GAClB,MAAO7B,GAAOgR,IAAKnP,EAAM,oBAE1BmY,UAAW,SAAUnY,EAAMC,EAAGmX,GAC7B,MAAOjZ,GAAOgR,IAAKnP,EAAM,cAAeoX,IAEzCgB,UAAW,SAAUpY,EAAMC,EAAGmX,GAC7B,MAAOjZ,GAAOgR,IAAKnP,EAAM,kBAAmBoX,IAE7CiB,SAAU,SAAUrY,GACnB,MAAO7B,GAAOmZ,SAAWtX,EAAKmD,gBAAmB0L,WAAY7O,IAE9DgX,SAAU,SAAUhX,GACnB,MAAO7B,GAAOmZ,QAAStX,EAAK6O,aAE7BoI,SAAU,SAAUjX,GACnB,MAAOA,GAAKsY,iBAAmBna,EAAOuB,SAAWM,EAAK+I,cAErD,SAAUjI,EAAMxC,GAClBH,EAAOG,GAAIwC,GAAS,SAAUsW,EAAOhZ,GACpC,GAAIwS,GAAUzS,EAAO4B,IAAKzC,KAAMgB,EAAI8Y,EAsBpC,OApB0B,UAArBtW,EAAKrD,MAAO,MAChBW,EAAWgZ,GAGPhZ,GAAgC,gBAAbA,KACvBwS,EAAUzS,EAAO2O,OAAQ1O,EAAUwS,IAG/BtT,KAAK4B,OAAS,IAEZ6X,EAAkBjW,IACvB3C,EAAO+X,OAAQtF,GAIXkG,EAAa7M,KAAMnJ,IACvB8P,EAAQ2H,WAIHjb,KAAKiC,UAAWqR,KAGzB,IAAI4H,GAAY,OAKZC,IAGJ,SAASC,GAAe7X,GACvB,GAAI8X,GAASF,EAAc5X,KAI3B,OAHA1C,GAAOyB,KAAMiB,EAAQsI,MAAOqP,OAAmB,SAAUhQ,EAAGoQ,GAC3DD,EAAQC,IAAS,IAEXD,EAyBRxa,EAAO0a,UAAY,SAAUhY,GAI5BA,EAA6B,gBAAZA,GACd4X,EAAc5X,IAAa6X,EAAe7X,GAC5C1C,EAAOyC,UAAYC,EAEpB,IACCiY,GAEAC,EAEAC,EAEAC,EAEAC,EAEAC,EAEA1S,KAEA2S,GAASvY,EAAQwY,SAEjBC,EAAO,SAAUC,GAOhB,IANAT,EAASjY,EAAQiY,QAAUS,EAC3BR,GAAQ,EACRI,EAAcF,GAAe,EAC7BA,EAAc,EACdC,EAAezS,EAAKvH,OACpB8Z,GAAS,EACDvS,GAAsByS,EAAdC,EAA4BA,IAC3C,GAAK1S,EAAM0S,GAAcjZ,MAAOqZ,EAAM,GAAKA,EAAM,OAAU,GAAS1Y,EAAQ2Y,YAAc,CACzFV,GAAS,CACT,OAGFE,GAAS,EACJvS,IACC2S,EACCA,EAAMla,QACVoa,EAAMF,EAAMtO,SAEFgO,EACXrS,KAEAgQ,EAAKgD,YAKRhD,GAECqB,IAAK,WACJ,GAAKrR,EAAO,CAEX,GAAI6J,GAAQ7J,EAAKvH,QACjB,QAAU4Y,GAAKhY,GACd3B,EAAOyB,KAAME,EAAM,SAAU0I,EAAGnE,GAC/B,GAAInC,GAAO/D,EAAO+D,KAAMmC,EACV,cAATnC,EACErB,EAAQqV,QAAWO,EAAKzF,IAAK3M,IAClCoC,EAAK9I,KAAM0G,GAEDA,GAAOA,EAAInF,QAAmB,WAATgD,GAEhC4V,EAAKzT,MAGJlE,WAGC6Y,EACJE,EAAezS,EAAKvH,OAGT4Z,IACXG,EAAc3I,EACdgJ,EAAMR,IAGR,MAAOxb,OAGRoc,OAAQ,WAkBP,MAjBKjT,IACJtI,EAAOyB,KAAMO,UAAW,SAAUqI,EAAGnE,GACpC,GAAIuT,EACJ,QAAUA,EAAQzZ,EAAO2F,QAASO,EAAKoC,EAAMmR,IAAY,GACxDnR,EAAK9F,OAAQiX,EAAO,GAEfoB,IACUE,GAATtB,GACJsB,IAEaC,GAATvB,GACJuB,OAME7b,MAIR0T,IAAK,SAAU1S,GACd,MAAOA,GAAKH,EAAO2F,QAASxF,EAAImI,GAAS,MAASA,IAAQA,EAAKvH,SAGhE+S,MAAO,WAGN,MAFAxL,MACAyS,EAAe,EACR5b,MAGRmc,QAAS,WAER,MADAhT,GAAO2S,EAAQN,EAAStX,OACjBlE,MAGRuU,SAAU,WACT,OAAQpL,GAGTkT,KAAM,WAKL,MAJAP,GAAQ5X,OACFsX,GACLrC,EAAKgD,UAECnc,MAGRsc,OAAQ,WACP,OAAQR,GAGTS,SAAU,SAAUxb,EAASyB,GAU5B,OATK2G,GAAWsS,IAASK,IACxBtZ,EAAOA,MACPA,GAASzB,EAASyB,EAAKrC,MAAQqC,EAAKrC,QAAUqC,GACzCkZ,EACJI,EAAMzb,KAAMmC,GAEZwZ,EAAMxZ,IAGDxC,MAGRgc,KAAM,WAEL,MADA7C,GAAKoD,SAAUvc,KAAM6C,WACd7C,MAGRyb,MAAO,WACN,QAASA,GAIZ,OAAOtC,IAIRtY,EAAOyC,QAENkZ,SAAU,SAAUC,GACnB,GAAIC,KAEA,UAAW,OAAQ7b,EAAO0a,UAAU,eAAgB,aACpD,SAAU,OAAQ1a,EAAO0a,UAAU,eAAgB,aACnD,SAAU,WAAY1a,EAAO0a,UAAU,YAE1CoB,EAAQ,UACRC,GACCD,MAAO,WACN,MAAOA,IAERE,OAAQ,WAEP,MADAC,GAAStU,KAAM3F,WAAYka,KAAMla,WAC1B7C,MAERgd,KAAM,WACL,GAAIC,GAAMpa,SACV,OAAOhC,GAAO2b,SAAS,SAAUU,GAChCrc,EAAOyB,KAAMoa,EAAQ,SAAU/Z,EAAGwa,GACjC,GAAInc,GAAKH,EAAOkD,WAAYkZ,EAAKta,KAASsa,EAAKta,EAE/Cma,GAAUK,EAAM,IAAK,WACpB,GAAIC,GAAWpc,GAAMA,EAAG4B,MAAO5C,KAAM6C,UAChCua,IAAYvc,EAAOkD,WAAYqZ,EAASR,SAC5CQ,EAASR,UACPpU,KAAM0U,EAASG,SACfN,KAAMG,EAASI,QACfC,SAAUL,EAASM,QAErBN,EAAUC,EAAO,GAAM,QAAUnd,OAAS4c,EAAUM,EAASN,UAAY5c,KAAMgB,GAAOoc,GAAava,eAItGoa,EAAM,OACJL,WAIJA,QAAS,SAAUjY,GAClB,MAAc,OAAPA,EAAc9D,EAAOyC,OAAQqB,EAAKiY,GAAYA,IAGvDE,IAwCD,OArCAF,GAAQa,KAAOb,EAAQI,KAGvBnc,EAAOyB,KAAMoa,EAAQ,SAAU/Z,EAAGwa,GACjC,GAAIhU,GAAOgU,EAAO,GACjBO,EAAcP,EAAO,EAGtBP,GAASO,EAAM,IAAOhU,EAAKqR,IAGtBkD,GACJvU,EAAKqR,IAAI,WAERmC,EAAQe,GAGNhB,EAAY,EAAJ/Z,GAAS,GAAIwZ,QAASO,EAAQ,GAAK,GAAIL,MAInDS,EAAUK,EAAM,IAAO,WAEtB,MADAL,GAAUK,EAAM,GAAK,QAAUnd,OAAS8c,EAAWF,EAAU5c,KAAM6C,WAC5D7C,MAER8c,EAAUK,EAAM,GAAK,QAAWhU,EAAKoT,WAItCK,EAAQA,QAASE,GAGZL,GACJA,EAAK3a,KAAMgb,EAAUA,GAIfA,GAIRa,KAAM,SAAUC,GACf,GAAIjb,GAAI,EACPkb,EAAgB1d,EAAM2B,KAAMe,WAC5BjB,EAASic,EAAcjc,OAGvBkc,EAAuB,IAAXlc,GAAkBgc,GAAe/c,EAAOkD,WAAY6Z,EAAYhB,SAAchb,EAAS,EAGnGkb,EAAyB,IAAdgB,EAAkBF,EAAc/c,EAAO2b,WAGlDuB,EAAa,SAAUpb,EAAG8T,EAAUuH,GACnC,MAAO,UAAU7X,GAChBsQ,EAAU9T,GAAM3C,KAChBge,EAAQrb,GAAME,UAAUjB,OAAS,EAAIzB,EAAM2B,KAAMe,WAAcsD,EAC1D6X,IAAWC,EACfnB,EAASoB,WAAYzH,EAAUuH,KACfF,GAChBhB,EAASqB,YAAa1H,EAAUuH,KAKnCC,EAAgBG,EAAkBC,CAGnC,IAAKzc,EAAS,EAIb,IAHAqc,EAAiB,GAAIpZ,OAAOjD,GAC5Bwc,EAAmB,GAAIvZ,OAAOjD,GAC9Byc,EAAkB,GAAIxZ,OAAOjD,GACjBA,EAAJe,EAAYA,IACdkb,EAAelb,IAAO9B,EAAOkD,WAAY8Z,EAAelb,GAAIia,SAChEiB,EAAelb,GAAIia,UACjBpU,KAAMuV,EAAYpb,EAAG0b,EAAiBR,IACtCd,KAAMD,EAASQ,QACfC,SAAUQ,EAAYpb,EAAGyb,EAAkBH,MAE3CH,CAUL,OAJMA,IACLhB,EAASqB,YAAaE,EAAiBR,GAGjCf,EAASF,YAMlB,IAAI0B,EAEJzd,GAAOG,GAAGuY,MAAQ,SAAUvY,GAI3B,MAFAH,GAAO0Y,MAAMqD,UAAUpU,KAAMxH,GAEtBhB,MAGRa,EAAOyC,QAENiB,SAAS,EAITga,UAAW,EAGXC,UAAW,SAAUC,GACfA,EACJ5d,EAAO0d,YAEP1d,EAAO0Y,OAAO,IAKhBA,MAAO,SAAUmF,IAGXA,KAAS,IAAS7d,EAAO0d,UAAY1d,EAAO0D,WAKjD1D,EAAO0D,SAAU,EAGZma,KAAS,KAAU7d,EAAO0d,UAAY,IAK3CD,EAAUH,YAAave,GAAYiB,IAG9BA,EAAOG,GAAG2d,iBACd9d,EAAQjB,GAAW+e,eAAgB,SACnC9d,EAAQjB,GAAWgf,IAAK,cAQ3B,SAASC,KACRjf,EAASkf,oBAAqB,mBAAoBD,GAAW,GAC7D9e,EAAO+e,oBAAqB,OAAQD,GAAW,GAC/Che,EAAO0Y,QAGR1Y,EAAO0Y,MAAMqD,QAAU,SAAUjY,GAqBhC,MApBM2Z,KAELA,EAAYzd,EAAO2b,WAKU,aAAxB5c,EAASmf,WAEbC,WAAYne,EAAO0Y,QAKnB3Z,EAASqP,iBAAkB,mBAAoB4P,GAAW,GAG1D9e,EAAOkP,iBAAkB,OAAQ4P,GAAW,KAGvCP,EAAU1B,QAASjY,IAI3B9D,EAAO0Y,MAAMqD,SAOb,IAAIqC,GAASpe,EAAOoe,OAAS,SAAU/c,EAAOlB,EAAIsM,EAAKnH,EAAO+Y,EAAWC,EAAUC,GAClF,GAAIzc,GAAI,EACPM,EAAMf,EAAMN,OACZyd,EAAc,MAAP/R,CAGR,IAA4B,WAAvBzM,EAAO+D,KAAM0I,GAAqB,CACtC4R,GAAY,CACZ,KAAMvc,IAAK2K,GACVzM,EAAOoe,OAAQ/c,EAAOlB,EAAI2B,EAAG2K,EAAI3K,IAAI,EAAMwc,EAAUC,OAIhD,IAAelb,SAAViC,IACX+Y,GAAY,EAENre,EAAOkD,WAAYoC,KACxBiZ,GAAM,GAGFC,IAECD,GACJpe,EAAGc,KAAMI,EAAOiE,GAChBnF,EAAK,OAILqe,EAAOre,EACPA,EAAK,SAAU0B,EAAM4K,EAAKnH,GACzB,MAAOkZ,GAAKvd,KAAMjB,EAAQ6B,GAAQyD,MAKhCnF,GACJ,KAAYiC,EAAJN,EAASA,IAChB3B,EAAIkB,EAAMS,GAAI2K,EAAK8R,EAAMjZ,EAAQA,EAAMrE,KAAMI,EAAMS,GAAIA,EAAG3B,EAAIkB,EAAMS,GAAI2K,IAK3E,OAAO4R,GACNhd,EAGAmd,EACCre,EAAGc,KAAMI,GACTe,EAAMjC,EAAIkB,EAAM,GAAIoL,GAAQ6R,EAO/Bte,GAAOye,WAAa,SAAUC,GAQ7B,MAA0B,KAAnBA,EAAMta,UAAqC,IAAnBsa,EAAMta,YAAsBsa,EAAMta,SAIlE,SAASua,KAIRjZ,OAAOkZ,eAAgBzf,KAAKqN,SAAY,GACvCtL,IAAK,WACJ,YAIF/B,KAAKmE,QAAUtD,EAAOsD,QAAUqb,EAAKE,MAGtCF,EAAKE,IAAM,EACXF,EAAKG,QAAU9e,EAAOye,WAEtBE,EAAK/d,WACJ6L,IAAK,SAAUiS,GAId,IAAMC,EAAKG,QAASJ,GACnB,MAAO,EAGR,IAAIK,MAEHC,EAASN,EAAOvf,KAAKmE,QAGtB,KAAM0b,EAAS,CACdA,EAASL,EAAKE,KAGd,KACCE,EAAY5f,KAAKmE,UAAcgC,MAAO0Z,GACtCtZ,OAAOuZ,iBAAkBP,EAAOK,GAI/B,MAAQlU,GACTkU,EAAY5f,KAAKmE,SAAY0b,EAC7Bhf,EAAOyC,OAAQic,EAAOK,IASxB,MAJM5f,MAAKqN,MAAOwS,KACjB7f,KAAKqN,MAAOwS,OAGNA,GAERE,IAAK,SAAUR,EAAOtD,EAAM9V,GAC3B,GAAI6Z,GAIHH,EAAS7f,KAAKsN,IAAKiS,GACnBlS,EAAQrN,KAAKqN,MAAOwS,EAGrB,IAAqB,gBAAT5D,GACX5O,EAAO4O,GAAS9V,MAKhB,IAAKtF,EAAOqE,cAAemI,GAC1BxM,EAAOyC,OAAQtD,KAAKqN,MAAOwS,GAAU5D,OAGrC,KAAM+D,IAAQ/D,GACb5O,EAAO2S,GAAS/D,EAAM+D,EAIzB,OAAO3S,IAERtL,IAAK,SAAUwd,EAAOjS,GAKrB,GAAID,GAAQrN,KAAKqN,MAAOrN,KAAKsN,IAAKiS,GAElC,OAAerb,UAARoJ,EACND,EAAQA,EAAOC,IAEjB2R,OAAQ,SAAUM,EAAOjS,EAAKnH,GAC7B,GAAI8Z,EAYJ,OAAa/b,UAARoJ,GACDA,GAAsB,gBAARA,IAA+BpJ,SAAViC,GAEtC8Z,EAASjgB,KAAK+B,IAAKwd,EAAOjS,GAERpJ,SAAX+b,EACNA,EAASjgB,KAAK+B,IAAKwd,EAAO1e,EAAOkF,UAAUuH,MAS7CtN,KAAK+f,IAAKR,EAAOjS,EAAKnH,GAILjC,SAAViC,EAAsBA,EAAQmH,IAEtC8O,OAAQ,SAAUmD,EAAOjS,GACxB,GAAI3K,GAAGa,EAAM0c,EACZL,EAAS7f,KAAKsN,IAAKiS,GACnBlS,EAAQrN,KAAKqN,MAAOwS,EAErB,IAAa3b,SAARoJ,EACJtN,KAAKqN,MAAOwS,UAEN,CAEDhf,EAAOoD,QAASqJ,GAOpB9J,EAAO8J,EAAIlN,OAAQkN,EAAI7K,IAAK5B,EAAOkF,aAEnCma,EAAQrf,EAAOkF,UAAWuH,GAErBA,IAAOD,GACX7J,GAAS8J,EAAK4S,IAId1c,EAAO0c,EACP1c,EAAOA,IAAQ6J,IACZ7J,GAAWA,EAAKqI,MAAOqP,SAI5BvY,EAAIa,EAAK5B,MACT,OAAQe,UACA0K,GAAO7J,EAAMb,MAIvBwd,QAAS,SAAUZ,GAClB,OAAQ1e,EAAOqE,cACdlF,KAAKqN,MAAOkS,EAAOvf,KAAKmE,gBAG1Bic,QAAS,SAAUb,GACbA,EAAOvf,KAAKmE,gBACTnE,MAAKqN,MAAOkS,EAAOvf,KAAKmE,WAIlC,IAAIkc,GAAY,GAAIb,GAEhBc,EAAY,GAAId,GAchBe,EAAS,gCACZC,EAAa,UAEd,SAASC,GAAU/d,EAAM4K,EAAK2O,GAC7B,GAAIzY,EAIJ,IAAcU,SAAT+X,GAAwC,IAAlBvZ,EAAKuC,SAI/B,GAHAzB,EAAO,QAAU8J,EAAIhJ,QAASkc,EAAY,OAAQta,cAClD+V,EAAOvZ,EAAKkK,aAAcpJ,GAEL,gBAATyY,GAAoB,CAC/B,IACCA,EAAgB,SAATA,GAAkB,EACf,UAATA,GAAmB,EACV,SAATA,EAAkB,MAEjBA,EAAO,KAAOA,GAAQA,EACvBsE,EAAO5T,KAAMsP,GAASpb,EAAO6f,UAAWzE,GACxCA,EACA,MAAOvQ,IAGT4U,EAAUP,IAAKrd,EAAM4K,EAAK2O,OAE1BA,GAAO/X,MAGT,OAAO+X,GAGRpb,EAAOyC,QACN6c,QAAS,SAAUzd,GAClB,MAAO4d,GAAUH,QAASzd,IAAU2d,EAAUF,QAASzd,IAGxDuZ,KAAM,SAAUvZ,EAAMc,EAAMyY;AAC3B,MAAOqE,GAAUrB,OAAQvc,EAAMc,EAAMyY,IAGtC0E,WAAY,SAAUje,EAAMc,GAC3B8c,EAAUlE,OAAQ1Z,EAAMc,IAKzBod,MAAO,SAAUle,EAAMc,EAAMyY,GAC5B,MAAOoE,GAAUpB,OAAQvc,EAAMc,EAAMyY,IAGtC4E,YAAa,SAAUne,EAAMc,GAC5B6c,EAAUjE,OAAQ1Z,EAAMc,MAI1B3C,EAAOG,GAAGsC,QACT2Y,KAAM,SAAU3O,EAAKnH,GACpB,GAAIxD,GAAGa,EAAMyY,EACZvZ,EAAO1C,KAAM,GACb6N,EAAQnL,GAAQA,EAAK8G,UAGtB,IAAatF,SAARoJ,EAAoB,CACxB,GAAKtN,KAAK4B,SACTqa,EAAOqE,EAAUve,IAAKW,GAEC,IAAlBA,EAAKuC,WAAmBob,EAAUte,IAAKW,EAAM,iBAAmB,CACpEC,EAAIkL,EAAMjM,MACV,OAAQe,IAIFkL,EAAOlL,KACXa,EAAOqK,EAAOlL,GAAIa,KACe,IAA5BA,EAAKlD,QAAS,WAClBkD,EAAO3C,EAAOkF,UAAWvC,EAAKrD,MAAM,IACpCsgB,EAAU/d,EAAMc,EAAMyY,EAAMzY,KAI/B6c,GAAUN,IAAKrd,EAAM,gBAAgB,GAIvC,MAAOuZ,GAIR,MAAoB,gBAAR3O,GACJtN,KAAKsC,KAAK,WAChBge,EAAUP,IAAK/f,KAAMsN,KAIhB2R,EAAQjf,KAAM,SAAUmG,GAC9B,GAAI8V,GACH6E,EAAWjgB,EAAOkF,UAAWuH,EAO9B,IAAK5K,GAAkBwB,SAAViC,EAAb,CAIC,GADA8V,EAAOqE,EAAUve,IAAKW,EAAM4K,GACdpJ,SAAT+X,EACJ,MAAOA,EAMR,IADAA,EAAOqE,EAAUve,IAAKW,EAAMoe,GACd5c,SAAT+X,EACJ,MAAOA,EAMR,IADAA,EAAOwE,EAAU/d,EAAMoe,EAAU5c,QACnBA,SAAT+X,EACJ,MAAOA,OAQTjc,MAAKsC,KAAK,WAGT,GAAI2Z,GAAOqE,EAAUve,IAAK/B,KAAM8gB,EAKhCR,GAAUP,IAAK/f,KAAM8gB,EAAU3a,GAKL,KAArBmH,EAAIhN,QAAQ,MAAwB4D,SAAT+X,GAC/BqE,EAAUP,IAAK/f,KAAMsN,EAAKnH,MAG1B,KAAMA,EAAOtD,UAAUjB,OAAS,EAAG,MAAM,IAG7C+e,WAAY,SAAUrT,GACrB,MAAOtN,MAAKsC,KAAK,WAChBge,EAAUlE,OAAQpc,KAAMsN,QAM3BzM,EAAOyC,QACNyd,MAAO,SAAUre,EAAMkC,EAAMqX,GAC5B,GAAI8E,EAEJ,OAAKre,IACJkC,GAASA,GAAQ,MAAS,QAC1Bmc,EAAQV,EAAUte,IAAKW,EAAMkC,GAGxBqX,KACE8E,GAASlgB,EAAOoD,QAASgY,GAC9B8E,EAAQV,EAAUpB,OAAQvc,EAAMkC,EAAM/D,EAAOwF,UAAU4V,IAEvD8E,EAAM1gB,KAAM4b,IAGP8E,OAZR,QAgBDC,QAAS,SAAUte,EAAMkC,GACxBA,EAAOA,GAAQ,IAEf,IAAImc,GAAQlgB,EAAOkgB,MAAOre,EAAMkC,GAC/Bqc,EAAcF,EAAMnf,OACpBZ,EAAK+f,EAAMvT,QACX0T,EAAQrgB,EAAOsgB,YAAaze,EAAMkC,GAClCgV,EAAO,WACN/Y,EAAOmgB,QAASte,EAAMkC,GAIZ,gBAAP5D,IACJA,EAAK+f,EAAMvT,QACXyT,KAGIjgB,IAIU,OAAT4D,GACJmc,EAAMnQ,QAAS,oBAITsQ,GAAME,KACbpgB,EAAGc,KAAMY,EAAMkX,EAAMsH,KAGhBD,GAAeC,GACpBA,EAAMvM,MAAMqH,QAKdmF,YAAa,SAAUze,EAAMkC,GAC5B,GAAI0I,GAAM1I,EAAO,YACjB,OAAOyb,GAAUte,IAAKW,EAAM4K,IAAS+S,EAAUpB,OAAQvc,EAAM4K,GAC5DqH,MAAO9T,EAAO0a,UAAU,eAAef,IAAI,WAC1C6F,EAAUjE,OAAQ1Z,GAAQkC,EAAO,QAAS0I,WAM9CzM,EAAOG,GAAGsC,QACTyd,MAAO,SAAUnc,EAAMqX,GACtB,GAAIoF,GAAS,CAQb,OANqB,gBAATzc,KACXqX,EAAOrX,EACPA,EAAO,KACPyc,KAGIxe,UAAUjB,OAASyf,EAChBxgB,EAAOkgB,MAAO/gB,KAAK,GAAI4E,GAGfV,SAAT+X,EACNjc,KACAA,KAAKsC,KAAK,WACT,GAAIye,GAAQlgB,EAAOkgB,MAAO/gB,KAAM4E,EAAMqX,EAGtCpb,GAAOsgB,YAAanhB,KAAM4E,GAEZ,OAATA,GAA8B,eAAbmc,EAAM,IAC3BlgB,EAAOmgB,QAAShhB,KAAM4E,MAI1Boc,QAAS,SAAUpc,GAClB,MAAO5E,MAAKsC,KAAK,WAChBzB,EAAOmgB,QAAShhB,KAAM4E,MAGxB0c,WAAY,SAAU1c,GACrB,MAAO5E,MAAK+gB,MAAOnc,GAAQ,UAI5BgY,QAAS,SAAUhY,EAAMD,GACxB,GAAIuC,GACHqa,EAAQ,EACRC,EAAQ3gB,EAAO2b,WACf1L,EAAW9Q,KACX2C,EAAI3C,KAAK4B,OACTyb,EAAU,aACCkE,GACTC,EAAMrD,YAAarN,GAAYA,IAIb,iBAATlM,KACXD,EAAMC,EACNA,EAAOV,QAERU,EAAOA,GAAQ,IAEf,OAAQjC,IACPuE,EAAMmZ,EAAUte,IAAK+O,EAAUnO,GAAKiC,EAAO,cACtCsC,GAAOA,EAAIyN,QACf4M,IACAra,EAAIyN,MAAM6F,IAAK6C,GAIjB,OADAA,KACOmE,EAAM5E,QAASjY,KAGxB,IAAI8c,GAAO,sCAAwCC,OAE/CC,GAAc,MAAO,QAAS,SAAU,QAExCC,EAAW,SAAUlf,EAAMmf,GAI7B,MADAnf,GAAOmf,GAAMnf,EAC4B,SAAlC7B,EAAOihB,IAAKpf,EAAM,aAA2B7B,EAAOwH,SAAU3F,EAAK0J,cAAe1J,IAGvFqf,EAAiB,yBAIrB,WACC,GAAIC,GAAWpiB,EAASqiB,yBACvBtU,EAAMqU,EAASpc,YAAahG,EAAS6F,cAAe,QACpDoK,EAAQjQ,EAAS6F,cAAe,QAMjCoK,GAAMhD,aAAc,OAAQ,SAC5BgD,EAAMhD,aAAc,UAAW,WAC/BgD,EAAMhD,aAAc,OAAQ,KAE5Bc,EAAI/H,YAAaiK,GAIjBlP,EAAQuhB,WAAavU,EAAIwU,WAAW,GAAOA,WAAW,GAAOjP,UAAUsB,QAIvE7G,EAAIiC,UAAY,yBAChBjP,EAAQyhB,iBAAmBzU,EAAIwU,WAAW,GAAOjP,UAAUyF,eAE5D,IAAI0J,GAAe,WAInB1hB,GAAQ2hB,eAAiB,aAAeviB,EAGxC,IACCwiB,GAAY,OACZC,EAAc,uCACdC,EAAc,kCACdC,EAAiB,sBAElB,SAASC,KACR,OAAO,EAGR,QAASC,KACR,OAAO,EAGR,QAASC,KACR,IACC,MAAOjjB,GAASsU,cACf,MAAQ4O,KAOXjiB,EAAOkiB,OAENvjB,UAEAgb,IAAK,SAAU9X,EAAMsgB,EAAOlV,EAASmO,EAAMnb,GAE1C,GAAImiB,GAAaC,EAAahc,EAC7Bic,EAAQC,EAAGC,EACXC,EAASC,EAAU3e,EAAM4e,EAAYC,EACrCC,EAAWrD,EAAUte,IAAKW,EAG3B,IAAMghB,EAAN,CAKK5V,EAAQA,UACZmV,EAAcnV,EACdA,EAAUmV,EAAYnV,QACtBhN,EAAWmiB,EAAYniB,UAIlBgN,EAAQ9G,OACb8G,EAAQ9G,KAAOnG,EAAOmG,SAIhBmc,EAASO,EAASP,UACxBA,EAASO,EAASP,YAEZD,EAAcQ,EAASC,UAC7BT,EAAcQ,EAASC,OAAS,SAAUjY,GAGzC,aAAc7K,KAAWwhB,GAAgBxhB,EAAOkiB,MAAMa,YAAclY,EAAE9G,KACrE/D,EAAOkiB,MAAMc,SAASjhB,MAAOF,EAAMG,WAAcqB,SAKpD8e,GAAUA,GAAS,IAAKnX,MAAOqP,KAAiB,IAChDkI,EAAIJ,EAAMphB,MACV,OAAQwhB,IACPlc,EAAMwb,EAAerW,KAAM2W,EAAMI,QACjCxe,EAAO6e,EAAWvc,EAAI,GACtBsc,GAAetc,EAAI,IAAM,IAAKG,MAAO,KAAMjE,OAGrCwB,IAKN0e,EAAUziB,EAAOkiB,MAAMO,QAAS1e,OAGhCA,GAAS9D,EAAWwiB,EAAQQ,aAAeR,EAAQS,WAAcnf,EAGjE0e,EAAUziB,EAAOkiB,MAAMO,QAAS1e,OAGhCye,EAAYxiB,EAAOyC,QAClBsB,KAAMA,EACN6e,SAAUA,EACVxH,KAAMA,EACNnO,QAASA,EACT9G,KAAM8G,EAAQ9G,KACdlG,SAAUA,EACV2J,aAAc3J,GAAYD,EAAOgQ,KAAKhF,MAAMpB,aAAakC,KAAM7L,GAC/DkjB,UAAWR,EAAWxW,KAAK,MACzBiW,IAGIM,EAAWJ,EAAQve,MACzB2e,EAAWJ,EAAQve,MACnB2e,EAASU,cAAgB,EAGnBX,EAAQY,OAASZ,EAAQY,MAAMpiB,KAAMY,EAAMuZ,EAAMuH,EAAYN,MAAkB,GAC/ExgB,EAAKuM,kBACTvM,EAAKuM,iBAAkBrK,EAAMse,GAAa,IAKxCI,EAAQ9I,MACZ8I,EAAQ9I,IAAI1Y,KAAMY,EAAM2gB,GAElBA,EAAUvV,QAAQ9G,OACvBqc,EAAUvV,QAAQ9G,KAAO8G,EAAQ9G,OAK9BlG,EACJyiB,EAASlgB,OAAQkgB,EAASU,gBAAiB,EAAGZ,GAE9CE,EAASljB,KAAMgjB,GAIhBxiB,EAAOkiB,MAAMvjB,OAAQoF,IAAS,KAMhCwX,OAAQ,SAAU1Z,EAAMsgB,EAAOlV,EAAShN,EAAUqjB,GAEjD,GAAIjhB,GAAGkhB,EAAWld,EACjBic,EAAQC,EAAGC,EACXC,EAASC,EAAU3e,EAAM4e,EAAYC,EACrCC,EAAWrD,EAAUF,QAASzd,IAAU2d,EAAUte,IAAKW,EAExD,IAAMghB,IAAcP,EAASO,EAASP,QAAtC,CAKAH,GAAUA,GAAS,IAAKnX,MAAOqP,KAAiB,IAChDkI,EAAIJ,EAAMphB,MACV,OAAQwhB,IAMP,GALAlc,EAAMwb,EAAerW,KAAM2W,EAAMI,QACjCxe,EAAO6e,EAAWvc,EAAI,GACtBsc,GAAetc,EAAI,IAAM,IAAKG,MAAO,KAAMjE,OAGrCwB,EAAN,CAOA0e,EAAUziB,EAAOkiB,MAAMO,QAAS1e,OAChCA,GAAS9D,EAAWwiB,EAAQQ,aAAeR,EAAQS,WAAcnf,EACjE2e,EAAWJ,EAAQve,OACnBsC,EAAMA,EAAI,IAAM,GAAIyC,QAAQ,UAAY6Z,EAAWxW,KAAK,iBAAmB,WAG3EoX,EAAYlhB,EAAIqgB,EAAS3hB,MACzB,OAAQsB,IACPmgB,EAAYE,EAAUrgB,IAEfihB,GAAeV,IAAaJ,EAAUI,UACzC3V,GAAWA,EAAQ9G,OAASqc,EAAUrc,MACtCE,IAAOA,EAAIyF,KAAM0W,EAAUW,YAC3BljB,GAAYA,IAAauiB,EAAUviB,WAAyB,OAAbA,IAAqBuiB,EAAUviB,YACjFyiB,EAASlgB,OAAQH,EAAG,GAEfmgB,EAAUviB,UACdyiB,EAASU,gBAELX,EAAQlH,QACZkH,EAAQlH,OAAOta,KAAMY,EAAM2gB,GAOzBe,KAAcb,EAAS3hB,SACrB0hB,EAAQe,UAAYf,EAAQe,SAASviB,KAAMY,EAAM8gB,EAAYE,EAASC,WAAa,GACxF9iB,EAAOyjB,YAAa5hB,EAAMkC,EAAM8e,EAASC,cAGnCR,GAAQve,QAtCf,KAAMA,IAAQue,GACbtiB,EAAOkiB,MAAM3G,OAAQ1Z,EAAMkC,EAAOoe,EAAOI,GAAKtV,EAAShN,GAAU,EA0C/DD,GAAOqE,cAAeie,WACnBO,GAASC,OAChBtD,EAAUjE,OAAQ1Z,EAAM,aAI1B6hB,QAAS,SAAUxB,EAAO9G,EAAMvZ,EAAM8hB,GAErC,GAAI7hB,GAAGsL,EAAK/G,EAAKud,EAAYC,EAAQf,EAAQL,EAC5CqB,GAAcjiB,GAAQ9C,GACtBgF,EAAOnE,EAAOqB,KAAMihB,EAAO,QAAWA,EAAMne,KAAOme,EACnDS,EAAa/iB,EAAOqB,KAAMihB,EAAO,aAAgBA,EAAMiB,UAAU3c,MAAM,OAKxE,IAHA4G,EAAM/G,EAAMxE,EAAOA,GAAQ9C,EAGJ,IAAlB8C,EAAKuC,UAAoC,IAAlBvC,EAAKuC,WAK5Bwd,EAAY9V,KAAM/H,EAAO/D,EAAOkiB,MAAMa,aAItChf,EAAKtE,QAAQ,MAAQ,IAEzBkjB,EAAa5e,EAAKyC,MAAM,KACxBzC,EAAO4e,EAAWhW,QAClBgW,EAAWpgB,QAEZshB,EAAS9f,EAAKtE,QAAQ,KAAO,GAAK,KAAOsE,EAGzCme,EAAQA,EAAOliB,EAAOsD,SACrB4e,EACA,GAAIliB,GAAO+jB,MAAOhgB,EAAuB,gBAAVme,IAAsBA,GAGtDA,EAAM8B,UAAYL,EAAe,EAAI,EACrCzB,EAAMiB,UAAYR,EAAWxW,KAAK,KAClC+V,EAAM+B,aAAe/B,EAAMiB,UAC1B,GAAIra,QAAQ,UAAY6Z,EAAWxW,KAAK,iBAAmB,WAC3D,KAGD+V,EAAMvQ,OAAStO,OACT6e,EAAMlf,SACXkf,EAAMlf,OAASnB,GAIhBuZ,EAAe,MAARA,GACJ8G,GACFliB,EAAOwF,UAAW4V,GAAQ8G,IAG3BO,EAAUziB,EAAOkiB,MAAMO,QAAS1e,OAC1B4f,IAAgBlB,EAAQiB,SAAWjB,EAAQiB,QAAQ3hB,MAAOF,EAAMuZ,MAAW,GAAjF,CAMA,IAAMuI,IAAiBlB,EAAQyB,WAAalkB,EAAOiE,SAAUpC,GAAS,CAMrE,IAJA+hB,EAAanB,EAAQQ,cAAgBlf,EAC/B6d,EAAY9V,KAAM8X,EAAa7f,KACpCqJ,EAAMA,EAAIpI,YAEHoI,EAAKA,EAAMA,EAAIpI,WACtB8e,EAAUtkB,KAAM4N,GAChB/G,EAAM+G,CAIF/G,MAASxE,EAAK0J,eAAiBxM,IACnC+kB,EAAUtkB,KAAM6G,EAAI6H,aAAe7H,EAAI8d,cAAgBjlB,GAKzD4C,EAAI,CACJ,QAASsL,EAAM0W,EAAUhiB,QAAUogB,EAAMkC,uBAExClC,EAAMne,KAAOjC,EAAI,EAChB8hB,EACAnB,EAAQS,UAAYnf,EAGrB+e,GAAWtD,EAAUte,IAAKkM,EAAK,eAAoB8U,EAAMne,OAAUyb,EAAUte,IAAKkM,EAAK,UAClF0V,GACJA,EAAO/gB,MAAOqL,EAAKgO,GAIpB0H,EAASe,GAAUzW,EAAKyW,GACnBf,GAAUA,EAAO/gB,OAAS/B,EAAOye,WAAYrR,KACjD8U,EAAMvQ,OAASmR,EAAO/gB,MAAOqL,EAAKgO,GAC7B8G,EAAMvQ,UAAW,GACrBuQ,EAAMmC,iBAmCT,OA/BAnC,GAAMne,KAAOA,EAGP4f,GAAiBzB,EAAMoC,sBAErB7B,EAAQ8B,UAAY9B,EAAQ8B,SAASxiB,MAAO+hB,EAAU1b,MAAOgT,MAAW,IAC9Epb,EAAOye,WAAY5c,IAIdgiB,GAAU7jB,EAAOkD,WAAYrB,EAAMkC,MAAa/D,EAAOiE,SAAUpC,KAGrEwE,EAAMxE,EAAMgiB,GAEPxd,IACJxE,EAAMgiB,GAAW,MAIlB7jB,EAAOkiB,MAAMa,UAAYhf,EACzBlC,EAAMkC,KACN/D,EAAOkiB,MAAMa,UAAY1f,OAEpBgD,IACJxE,EAAMgiB,GAAWxd,IAMd6b,EAAMvQ,SAGdqR,SAAU,SAAUd,GAGnBA,EAAQliB,EAAOkiB,MAAMsC,IAAKtC,EAE1B,IAAIpgB,GAAGO,EAAGf,EAAKmR,EAAS+P,EACvBiC,KACA9iB,EAAOrC,EAAM2B,KAAMe,WACnB0gB,GAAalD,EAAUte,IAAK/B,KAAM,eAAoB+iB,EAAMne,UAC5D0e,EAAUziB,EAAOkiB,MAAMO,QAASP,EAAMne,SAOvC,IAJApC,EAAK,GAAKugB,EACVA,EAAMwC,eAAiBvlB,MAGlBsjB,EAAQkC,aAAelC,EAAQkC,YAAY1jB,KAAM9B,KAAM+iB,MAAY,EAAxE,CAKAuC,EAAezkB,EAAOkiB,MAAMQ,SAASzhB,KAAM9B,KAAM+iB,EAAOQ,GAGxD5gB,EAAI,CACJ,QAAS2Q,EAAUgS,EAAc3iB,QAAWogB,EAAMkC,uBAAyB,CAC1ElC,EAAM0C,cAAgBnS,EAAQ5Q,KAE9BQ,EAAI,CACJ,QAASmgB,EAAY/P,EAAQiQ,SAAUrgB,QAAW6f,EAAM2C,kCAIjD3C,EAAM+B,cAAgB/B,EAAM+B,aAAanY,KAAM0W,EAAUW,cAE9DjB,EAAMM,UAAYA,EAClBN,EAAM9G,KAAOoH,EAAUpH,KAEvB9Z,IAAStB,EAAOkiB,MAAMO,QAASD,EAAUI,eAAkBE,QAAUN,EAAUvV,SAC5ElL,MAAO0Q,EAAQ5Q,KAAMF,GAEX0B,SAAR/B,IACE4gB,EAAMvQ,OAASrQ,MAAS,IAC7B4gB,EAAMmC,iBACNnC,EAAM4C,oBAYX,MAJKrC,GAAQsC,cACZtC,EAAQsC,aAAa9jB,KAAM9B,KAAM+iB,GAG3BA,EAAMvQ,SAGd+Q,SAAU,SAAUR,EAAOQ,GAC1B,GAAI5gB,GAAGkE,EAASgf,EAAKxC,EACpBiC,KACArB,EAAgBV,EAASU,cACzBhW,EAAM8U,EAAMlf,MAKb,IAAKogB,GAAiBhW,EAAIhJ,YAAc8d,EAAMlO,QAAyB,UAAfkO,EAAMne,MAE7D,KAAQqJ,IAAQjO,KAAMiO,EAAMA,EAAIpI,YAAc7F,KAG7C,GAAKiO,EAAIsG,YAAa,GAAuB,UAAfwO,EAAMne,KAAmB,CAEtD,IADAiC,KACMlE,EAAI,EAAOshB,EAAJthB,EAAmBA,IAC/B0gB,EAAYE,EAAU5gB,GAGtBkjB,EAAMxC,EAAUviB,SAAW,IAEHoD,SAAnB2C,EAASgf,KACbhf,EAASgf,GAAQxC,EAAU5Y,aAC1B5J,EAAQglB,EAAK7lB,MAAOsa,MAAOrM,IAAS,EACpCpN,EAAO0O,KAAMsW,EAAK7lB,KAAM,MAAQiO,IAAQrM,QAErCiF,EAASgf,IACbhf,EAAQxG,KAAMgjB,EAGXxc,GAAQjF,QACZ0jB,EAAajlB,MAAOqC,KAAMuL,EAAKsV,SAAU1c,IAW7C,MAJKod,GAAgBV,EAAS3hB,QAC7B0jB,EAAajlB,MAAOqC,KAAM1C,KAAMujB,SAAUA,EAASpjB,MAAO8jB,KAGpDqB,GAIRQ,MAAO,wHAAwHze,MAAM,KAErI0e,YAEAC,UACCF,MAAO,4BAA4Bze,MAAM,KACzCmI,OAAQ,SAAUuT,EAAOkD,GAOxB,MAJoB,OAAflD,EAAMmD,QACVnD,EAAMmD,MAA6B,MAArBD,EAASE,SAAmBF,EAASE,SAAWF,EAASG,SAGjErD,IAITsD,YACCP,MAAO,uFAAuFze,MAAM,KACpGmI,OAAQ,SAAUuT,EAAOkD,GACxB,GAAIK,GAAUxX,EAAKyX,EAClB1R,EAASoR,EAASpR,MAkBnB,OAfoB,OAAfkO,EAAMyD,OAAqC,MAApBP,EAASQ,UACpCH,EAAWvD,EAAMlf,OAAOuI,eAAiBxM,EACzCkP,EAAMwX,EAAS5X,gBACf6X,EAAOD,EAASC,KAEhBxD,EAAMyD,MAAQP,EAASQ,SAAY3X,GAAOA,EAAI4X,YAAcH,GAAQA,EAAKG,YAAc,IAAQ5X,GAAOA,EAAI6X,YAAcJ,GAAQA,EAAKI,YAAc,GACnJ5D,EAAM6D,MAAQX,EAASY,SAAY/X,GAAOA,EAAIgY,WAAcP,GAAQA,EAAKO,WAAc,IAAQhY,GAAOA,EAAIiY,WAAcR,GAAQA,EAAKQ,WAAc,IAK9IhE,EAAMmD,OAAoBhiB,SAAX2Q,IACpBkO,EAAMmD,MAAmB,EAATrR,EAAa,EAAe,EAATA,EAAa,EAAe,EAATA,EAAa,EAAI,GAGjEkO,IAITsC,IAAK,SAAUtC,GACd,GAAKA,EAAOliB,EAAOsD,SAClB,MAAO4e,EAIR,IAAIpgB,GAAGqd,EAAMtc,EACZkB,EAAOme,EAAMne,KACboiB,EAAgBjE,EAChBkE,EAAUjnB,KAAK+lB,SAAUnhB,EAEpBqiB,KACLjnB,KAAK+lB,SAAUnhB,GAASqiB,EACvBzE,EAAY7V,KAAM/H,GAAS5E,KAAKqmB,WAChC9D,EAAU5V,KAAM/H,GAAS5E,KAAKgmB,aAGhCtiB,EAAOujB,EAAQnB,MAAQ9lB,KAAK8lB,MAAM1lB,OAAQ6mB,EAAQnB,OAAU9lB,KAAK8lB,MAEjE/C,EAAQ,GAAIliB,GAAO+jB,MAAOoC,GAE1BrkB,EAAIe,EAAK9B,MACT,OAAQe,IACPqd,EAAOtc,EAAMf,GACbogB,EAAO/C,GAASgH,EAAehH,EAehC,OAVM+C,GAAMlf,SACXkf,EAAMlf,OAASjE,GAKe,IAA1BmjB,EAAMlf,OAAOoB,WACjB8d,EAAMlf,OAASkf,EAAMlf,OAAOgC,YAGtBohB,EAAQzX,OAASyX,EAAQzX,OAAQuT,EAAOiE,GAAkBjE,GAGlEO,SACC4D,MAECnC,UAAU,GAEX9Q,OAECsQ,QAAS,WACR,MAAKvkB,QAAS6iB,KAAuB7iB,KAAKiU,OACzCjU,KAAKiU,SACE,GAFR,QAKD6P,aAAc,WAEfqD,MACC5C,QAAS,WACR,MAAKvkB,QAAS6iB,KAAuB7iB,KAAKmnB,MACzCnnB,KAAKmnB,QACE,GAFR,QAKDrD,aAAc,YAEfsD,OAEC7C,QAAS,WACR,MAAmB,aAAdvkB,KAAK4E,MAAuB5E,KAAKonB,OAASvmB,EAAOoF,SAAUjG,KAAM,UACrEA,KAAKonB,SACE,GAFR,QAODhC,SAAU,SAAUrC,GACnB,MAAOliB,GAAOoF,SAAU8c,EAAMlf,OAAQ,OAIxCwjB,cACCzB,aAAc,SAAU7C,GAID7e,SAAjB6e,EAAMvQ,QAAwBuQ,EAAMiE,gBACxCjE,EAAMiE,cAAcM,YAAcvE,EAAMvQ,WAM5C+U,SAAU,SAAU3iB,EAAMlC,EAAMqgB,EAAOyE,GAItC,GAAI9b,GAAI7K,EAAOyC,OACd,GAAIzC,GAAO+jB,MACX7B,GAECne,KAAMA,EACN6iB,aAAa,EACbT,kBAGGQ,GACJ3mB,EAAOkiB,MAAMwB,QAAS7Y,EAAG,KAAMhJ,GAE/B7B,EAAOkiB,MAAMc,SAAS/hB,KAAMY,EAAMgJ,GAE9BA,EAAEyZ,sBACNpC,EAAMmC,mBAKTrkB,EAAOyjB,YAAc,SAAU5hB,EAAMkC,EAAM+e,GACrCjhB,EAAKoc,qBACTpc,EAAKoc,oBAAqBla,EAAM+e,GAAQ,IAI1C9iB,EAAO+jB,MAAQ,SAAUnhB,EAAKqiB,GAE7B,MAAO9lB,gBAAgBa,GAAO+jB,OAKzBnhB,GAAOA,EAAImB,MACf5E,KAAKgnB,cAAgBvjB,EACrBzD,KAAK4E,KAAOnB,EAAImB,KAIhB5E,KAAKmlB,mBAAqB1hB,EAAIikB,kBACHxjB,SAAzBT,EAAIikB,kBAEJjkB,EAAI6jB,eAAgB,EACrB3E,EACAC,GAID5iB,KAAK4E,KAAOnB,EAIRqiB,GACJjlB,EAAOyC,OAAQtD,KAAM8lB,GAItB9lB,KAAK2nB,UAAYlkB,GAAOA,EAAIkkB,WAAa9mB,EAAOsG,WAGhDnH,KAAMa,EAAOsD,UAAY,IA/BjB,GAAItD,GAAO+jB,MAAOnhB,EAAKqiB,IAoChCjlB,EAAO+jB,MAAMnjB,WACZ0jB,mBAAoBvC,EACpBqC,qBAAsBrC,EACtB8C,8BAA+B9C,EAE/BsC,eAAgB,WACf,GAAIxZ,GAAI1L,KAAKgnB,aAEbhnB,MAAKmlB,mBAAqBxC,EAErBjX,GAAKA,EAAEwZ,gBACXxZ,EAAEwZ,kBAGJS,gBAAiB,WAChB,GAAIja,GAAI1L,KAAKgnB,aAEbhnB,MAAKilB,qBAAuBtC,EAEvBjX,GAAKA,EAAEia,iBACXja,EAAEia,mBAGJiC,yBAA0B,WACzB,GAAIlc,GAAI1L,KAAKgnB,aAEbhnB,MAAK0lB,8BAAgC/C,EAEhCjX,GAAKA,EAAEkc,0BACXlc,EAAEkc,2BAGH5nB,KAAK2lB,oBAMP9kB,EAAOyB,MACNulB,WAAY,YACZC,WAAY,WACZC,aAAc,cACdC,aAAc,cACZ,SAAUC,EAAM5C,GAClBxkB,EAAOkiB,MAAMO,QAAS2E,IACrBnE,aAAcuB,EACdtB,SAAUsB,EAEV1B,OAAQ,SAAUZ,GACjB,GAAI5gB,GACH0B,EAAS7D,KACTkoB,EAAUnF,EAAMoF,cAChB9E,EAAYN,EAAMM,SASnB,SALM6E,GAAYA,IAAYrkB,IAAWhD,EAAOwH,SAAUxE,EAAQqkB,MACjEnF,EAAMne,KAAOye,EAAUI,SACvBthB,EAAMkhB,EAAUvV,QAAQlL,MAAO5C,KAAM6C,WACrCkgB,EAAMne,KAAOygB,GAEPljB,MAOJxB,EAAQ2hB,gBACbzhB,EAAOyB,MAAO2R,MAAO,UAAWkT,KAAM,YAAc,SAAUc,EAAM5C,GAGnE,GAAIvX,GAAU,SAAUiV,GACtBliB,EAAOkiB,MAAMwE,SAAUlC,EAAKtC,EAAMlf,OAAQhD,EAAOkiB,MAAMsC,IAAKtC,IAAS,GAGvEliB,GAAOkiB,MAAMO,QAAS+B,IACrBnB,MAAO,WACN,GAAIpV,GAAM9O,KAAKoM,eAAiBpM,KAC/BooB,EAAW/H,EAAUpB,OAAQnQ,EAAKuW,EAE7B+C,IACLtZ,EAAIG,iBAAkBgZ,EAAMna,GAAS,GAEtCuS,EAAUpB,OAAQnQ,EAAKuW,GAAO+C,GAAY,GAAM,IAEjD/D,SAAU,WACT,GAAIvV,GAAM9O,KAAKoM,eAAiBpM,KAC/BooB,EAAW/H,EAAUpB,OAAQnQ,EAAKuW,GAAQ,CAErC+C,GAKL/H,EAAUpB,OAAQnQ,EAAKuW,EAAK+C,IAJ5BtZ,EAAIgQ,oBAAqBmJ,EAAMna,GAAS,GACxCuS,EAAUjE,OAAQtN,EAAKuW,QAU5BxkB,EAAOG,GAAGsC,QAET+kB,GAAI,SAAUrF,EAAOliB,EAAUmb,EAAMjb,EAAiBsnB,GACrD,GAAIC,GAAQ3jB,CAGZ,IAAsB,gBAAVoe,GAAqB,CAEP,gBAAbliB,KAEXmb,EAAOA,GAAQnb,EACfA,EAAWoD,OAEZ,KAAMU,IAAQoe,GACbhjB,KAAKqoB,GAAIzjB,EAAM9D,EAAUmb,EAAM+G,EAAOpe,GAAQ0jB,EAE/C,OAAOtoB,MAmBR,GAhBa,MAARic,GAAsB,MAANjb,GAEpBA,EAAKF,EACLmb,EAAOnb,EAAWoD,QACD,MAANlD,IACc,gBAAbF,IAEXE,EAAKib,EACLA,EAAO/X,SAGPlD,EAAKib,EACLA,EAAOnb,EACPA,EAAWoD,SAGRlD,KAAO,EACXA,EAAK4hB,MACC,KAAM5hB,EACZ,MAAOhB,KAaR,OAVa,KAARsoB,IACJC,EAASvnB,EACTA,EAAK,SAAU+hB,GAGd,MADAliB,KAAS+d,IAAKmE,GACPwF,EAAO3lB,MAAO5C,KAAM6C,YAG5B7B,EAAGgG,KAAOuhB,EAAOvhB,OAAUuhB,EAAOvhB,KAAOnG,EAAOmG,SAE1ChH,KAAKsC,KAAM,WACjBzB,EAAOkiB,MAAMvI,IAAKxa,KAAMgjB,EAAOhiB,EAAIib,EAAMnb,MAG3CwnB,IAAK,SAAUtF,EAAOliB,EAAUmb,EAAMjb,GACrC,MAAOhB,MAAKqoB,GAAIrF,EAAOliB,EAAUmb,EAAMjb,EAAI,IAE5C4d,IAAK,SAAUoE,EAAOliB,EAAUE,GAC/B,GAAIqiB,GAAWze,CACf,IAAKoe,GAASA,EAAMkC,gBAAkBlC,EAAMK,UAQ3C,MANAA,GAAYL,EAAMK,UAClBxiB,EAAQmiB,EAAMuC,gBAAiB3G,IAC9ByE,EAAUW,UAAYX,EAAUI,SAAW,IAAMJ,EAAUW,UAAYX,EAAUI,SACjFJ,EAAUviB,SACVuiB,EAAUvV,SAEJ9N,IAER,IAAsB,gBAAVgjB,GAAqB,CAEhC,IAAMpe,IAAQoe,GACbhjB,KAAK4e,IAAKha,EAAM9D,EAAUkiB,EAAOpe,GAElC,OAAO5E,MAUR,OARKc,KAAa,GAA6B,kBAAbA,MAEjCE,EAAKF,EACLA,EAAWoD,QAEPlD,KAAO,IACXA,EAAK4hB,GAEC5iB,KAAKsC,KAAK,WAChBzB,EAAOkiB,MAAM3G,OAAQpc,KAAMgjB,EAAOhiB,EAAIF,MAIxCyjB,QAAS,SAAU3f,EAAMqX,GACxB,MAAOjc,MAAKsC,KAAK,WAChBzB,EAAOkiB,MAAMwB,QAAS3f,EAAMqX,EAAMjc,SAGpC2e,eAAgB,SAAU/Z,EAAMqX,GAC/B,GAAIvZ,GAAO1C,KAAK,EAChB,OAAK0C,GACG7B,EAAOkiB,MAAMwB,QAAS3f,EAAMqX,EAAMvZ,GAAM,GADhD,SAOF,IACC8lB,IAAY,0EACZC,GAAW,YACXC,GAAQ,YACRC,GAAe,0BAEfC,GAAW,oCACXC,GAAc,4BACdC,GAAoB,cACpBC,GAAe,2CAGfC,IAGCC,QAAU,EAAG,+BAAgC,aAE7CC,OAAS,EAAG,UAAW,YACvBC,KAAO,EAAG,oBAAqB,uBAC/BC,IAAM,EAAG,iBAAkB,oBAC3BC,IAAM,EAAG,qBAAsB,yBAE/BjE,UAAY,EAAG,GAAI,IAIrB4D,IAAQM,SAAWN,GAAQC,OAE3BD,GAAQO,MAAQP,GAAQQ,MAAQR,GAAQS,SAAWT,GAAQU,QAAUV,GAAQE,MAC7EF,GAAQW,GAAKX,GAAQK,EAIrB,SAASO,IAAoBlnB,EAAMmnB,GAClC,MAAOhpB,GAAOoF,SAAUvD,EAAM,UAC7B7B,EAAOoF,SAA+B,KAArB4jB,EAAQ5kB,SAAkB4kB,EAAUA,EAAQtY,WAAY,MAEzE7O,EAAK8J,qBAAqB,SAAS,IAClC9J,EAAKkD,YAAalD,EAAK0J,cAAc3G,cAAc,UACpD/C,EAIF,QAASonB,IAAepnB,GAEvB,MADAA,GAAKkC,MAAsC,OAA9BlC,EAAKkK,aAAa,SAAoB,IAAMlK,EAAKkC,KACvDlC,EAER,QAASqnB,IAAernB,GACvB,GAAImJ,GAAQid,GAAkBzc,KAAM3J,EAAKkC,KAQzC,OANKiH,GACJnJ,EAAKkC,KAAOiH,EAAO,GAEnBnJ,EAAKyK,gBAAgB,QAGfzK,EAIR,QAASsnB,IAAe9nB,EAAO+nB,GAI9B,IAHA,GAAItnB,GAAI,EACPwX,EAAIjY,EAAMN,OAECuY,EAAJxX,EAAOA,IACd0d,EAAUN,IACT7d,EAAOS,GAAK,cAAesnB,GAAe5J,EAAUte,IAAKkoB,EAAatnB,GAAK,eAK9E,QAASunB,IAAgBzmB,EAAK0mB,GAC7B,GAAIxnB,GAAGwX,EAAGvV,EAAMwlB,EAAUC,EAAUC,EAAUC,EAAUpH,CAExD,IAAuB,IAAlBgH,EAAKllB,SAAV,CAKA,GAAKob,EAAUF,QAAS1c,KACvB2mB,EAAW/J,EAAUpB,OAAQxb,GAC7B4mB,EAAWhK,EAAUN,IAAKoK,EAAMC,GAChCjH,EAASiH,EAASjH,QAEJ,OACNkH,GAAS1G,OAChB0G,EAASlH,SAET,KAAMve,IAAQue,GACb,IAAMxgB,EAAI,EAAGwX,EAAIgJ,EAAQve,GAAOhD,OAAYuY,EAAJxX,EAAOA,IAC9C9B,EAAOkiB,MAAMvI,IAAK2P,EAAMvlB,EAAMue,EAAQve,GAAQjC,IAO7C2d,EAAUH,QAAS1c,KACvB6mB,EAAWhK,EAAUrB,OAAQxb,GAC7B8mB,EAAW1pB,EAAOyC,UAAYgnB,GAE9BhK,EAAUP,IAAKoK,EAAMI,KAIvB,QAASC,IAAQzpB,EAAS4O,GACzB,GAAIxN,GAAMpB,EAAQyL,qBAAuBzL,EAAQyL,qBAAsBmD,GAAO,KAC5E5O,EAAQkM,iBAAmBlM,EAAQkM,iBAAkB0C,GAAO,OAG9D,OAAezL,UAARyL,GAAqBA,GAAO9O,EAAOoF,SAAUlF,EAAS4O,GAC5D9O,EAAOuB,OAASrB,GAAWoB,GAC3BA,EAIF,QAASsoB,IAAUhnB,EAAK0mB,GACvB,GAAIlkB,GAAWkkB,EAAKlkB,SAASC,aAGX,WAAbD,GAAwB8b,EAAepV,KAAMlJ,EAAImB,MACrDulB,EAAK3V,QAAU/Q,EAAI+Q,SAGK,UAAbvO,GAAqC,aAAbA,KACnCkkB,EAAKxR,aAAelV,EAAIkV,cAI1B9X,EAAOyC,QACNM,MAAO,SAAUlB,EAAMgoB,EAAeC,GACrC,GAAIhoB,GAAGwX,EAAGyQ,EAAaC,EACtBjnB,EAAQlB,EAAKyf,WAAW,GACxB2I,EAASjqB,EAAOwH,SAAU3F,EAAK0J,cAAe1J,EAG/C,MAAM/B,EAAQyhB,gBAAsC,IAAlB1f,EAAKuC,UAAoC,KAAlBvC,EAAKuC,UAC3DpE,EAAOgY,SAAUnW,IAMnB,IAHAmoB,EAAeL,GAAQ5mB,GACvBgnB,EAAcJ,GAAQ9nB,GAEhBC,EAAI,EAAGwX,EAAIyQ,EAAYhpB,OAAYuY,EAAJxX,EAAOA,IAC3C8nB,GAAUG,EAAajoB,GAAKkoB,EAAcloB,GAK5C,IAAK+nB,EACJ,GAAKC,EAIJ,IAHAC,EAAcA,GAAeJ,GAAQ9nB,GACrCmoB,EAAeA,GAAgBL,GAAQ5mB,GAEjCjB,EAAI,EAAGwX,EAAIyQ,EAAYhpB,OAAYuY,EAAJxX,EAAOA,IAC3CunB,GAAgBU,EAAajoB,GAAKkoB,EAAcloB,QAGjDunB,IAAgBxnB,EAAMkB,EAWxB,OANAinB,GAAeL,GAAQ5mB,EAAO,UACzBinB,EAAajpB,OAAS,GAC1BooB,GAAea,GAAeC,GAAUN,GAAQ9nB,EAAM,WAIhDkB,GAGRmnB,cAAe,SAAU7oB,EAAOnB,EAASiqB,EAASC,GAOjD,IANA,GAAIvoB,GAAMwE,EAAKyI,EAAKub,EAAM7iB,EAAUnF,EACnC8e,EAAWjhB,EAAQkhB,yBACnBkJ,KACAxoB,EAAI,EACJwX,EAAIjY,EAAMN,OAECuY,EAAJxX,EAAOA,IAGd,GAFAD,EAAOR,EAAOS,GAETD,GAAiB,IAATA,EAGZ,GAA6B,WAAxB7B,EAAO+D,KAAMlC,GAGjB7B,EAAOuB,MAAO+oB,EAAOzoB,EAAKuC,UAAavC,GAASA,OAG1C,IAAMgmB,GAAM/b,KAAMjK,GAIlB,CACNwE,EAAMA,GAAO8a,EAASpc,YAAa7E,EAAQ0E,cAAc,QAGzDkK,GAAQ8Y,GAASpc,KAAM3J,KAAY,GAAI,KAAQ,GAAIwD,cACnDglB,EAAOlC,GAASrZ,IAASqZ,GAAQ5D,SACjCle,EAAI0I,UAAYsb,EAAM,GAAMxoB,EAAK4B,QAASkkB,GAAW,aAAgB0C,EAAM,GAG3EhoB,EAAIgoB,EAAM,EACV,OAAQhoB,IACPgE,EAAMA,EAAIgM,SAKXrS,GAAOuB,MAAO+oB,EAAOjkB,EAAIuE,YAGzBvE,EAAM8a,EAASzQ,WAGfrK,EAAIoK,YAAc,OAzBlB6Z,GAAM9qB,KAAMU,EAAQqqB,eAAgB1oB,GA+BvCsf,GAAS1Q,YAAc,GAEvB3O,EAAI,CACJ,OAASD,EAAOyoB,EAAOxoB,KAItB,KAAKsoB,GAAmD,KAAtCpqB,EAAO2F,QAAS9D,EAAMuoB,MAIxC5iB,EAAWxH,EAAOwH,SAAU3F,EAAK0J,cAAe1J,GAGhDwE,EAAMsjB,GAAQxI,EAASpc,YAAalD,GAAQ,UAGvC2F,GACJ2hB,GAAe9iB,GAIX8jB,GAAU,CACd9nB,EAAI,CACJ,OAASR,EAAOwE,EAAKhE,KACf2lB,GAAYlc,KAAMjK,EAAKkC,MAAQ,KACnComB,EAAQ3qB,KAAMqC,GAMlB,MAAOsf,IAGRqJ,UAAW,SAAUnpB,GAKpB,IAJA,GAAI+Z,GAAMvZ,EAAMkC,EAAM0I,EACrBgW,EAAUziB,EAAOkiB,MAAMO,QACvB3gB,EAAI,EAE2BuB,UAAvBxB,EAAOR,EAAOS,IAAoBA,IAAM,CAChD,GAAK9B,EAAOye,WAAY5c,KACvB4K,EAAM5K,EAAM2d,EAAUlc,SAEjBmJ,IAAQ2O,EAAOoE,EAAUhT,MAAOC,KAAS,CAC7C,GAAK2O,EAAKkH,OACT,IAAMve,IAAQqX,GAAKkH,OACbG,EAAS1e,GACb/D,EAAOkiB,MAAM3G,OAAQ1Z,EAAMkC,GAI3B/D,EAAOyjB,YAAa5hB,EAAMkC,EAAMqX,EAAK0H,OAInCtD,GAAUhT,MAAOC,UAEd+S,GAAUhT,MAAOC,SAKpBgT,GAAUjT,MAAO3K,EAAM4d,EAAUnc,cAK3CtD,EAAOG,GAAGsC,QACToC,KAAM,SAAUS,GACf,MAAO8Y,GAAQjf,KAAM,SAAUmG,GAC9B,MAAiBjC,UAAViC,EACNtF,EAAO6E,KAAM1F,MACbA,KAAK2U,QAAQrS,KAAK,YACM,IAAlBtC,KAAKiF,UAAoC,KAAlBjF,KAAKiF,UAAqC,IAAlBjF,KAAKiF,YACxDjF,KAAKsR,YAAcnL,MAGpB,KAAMA,EAAOtD,UAAUjB,SAG3B0pB,OAAQ,WACP,MAAOtrB,MAAKurB,SAAU1oB,UAAW,SAAUH,GAC1C,GAAuB,IAAlB1C,KAAKiF,UAAoC,KAAlBjF,KAAKiF,UAAqC,IAAlBjF,KAAKiF,SAAiB,CACzE,GAAIpB,GAAS+lB,GAAoB5pB,KAAM0C,EACvCmB,GAAO+B,YAAalD,OAKvB8oB,QAAS,WACR,MAAOxrB,MAAKurB,SAAU1oB,UAAW,SAAUH,GAC1C,GAAuB,IAAlB1C,KAAKiF,UAAoC,KAAlBjF,KAAKiF,UAAqC,IAAlBjF,KAAKiF,SAAiB,CACzE,GAAIpB,GAAS+lB,GAAoB5pB,KAAM0C,EACvCmB,GAAO4nB,aAAc/oB,EAAMmB,EAAO0N,gBAKrCma,OAAQ,WACP,MAAO1rB,MAAKurB,SAAU1oB,UAAW,SAAUH,GACrC1C,KAAK6F,YACT7F,KAAK6F,WAAW4lB,aAAc/oB,EAAM1C,SAKvC2rB,MAAO,WACN,MAAO3rB,MAAKurB,SAAU1oB,UAAW,SAAUH,GACrC1C,KAAK6F,YACT7F,KAAK6F,WAAW4lB,aAAc/oB,EAAM1C,KAAKoO,gBAK5CgO,OAAQ,SAAUtb,EAAU8qB,GAK3B,IAJA,GAAIlpB,GACHR,EAAQpB,EAAWD,EAAO2O,OAAQ1O,EAAUd,MAASA,KACrD2C,EAAI,EAEwB,OAApBD,EAAOR,EAAMS,IAAaA,IAC5BipB,GAA8B,IAAlBlpB,EAAKuC,UACtBpE,EAAOwqB,UAAWb,GAAQ9nB,IAGtBA,EAAKmD,aACJ+lB,GAAY/qB,EAAOwH,SAAU3F,EAAK0J,cAAe1J,IACrDsnB,GAAeQ,GAAQ9nB,EAAM,WAE9BA,EAAKmD,WAAWC,YAAapD,GAI/B,OAAO1C,OAGR2U,MAAO,WAIN,IAHA,GAAIjS,GACHC,EAAI,EAEuB,OAAnBD,EAAO1C,KAAK2C,IAAaA,IACV,IAAlBD,EAAKuC,WAGTpE,EAAOwqB,UAAWb,GAAQ9nB,GAAM,IAGhCA,EAAK4O,YAAc,GAIrB,OAAOtR,OAGR4D,MAAO,SAAU8mB,EAAeC,GAI/B,MAHAD,GAAiC,MAAjBA,GAAwB,EAAQA,EAChDC,EAAyC,MAArBA,EAA4BD,EAAgBC,EAEzD3qB,KAAKyC,IAAI,WACf,MAAO5B,GAAO+C,MAAO5D,KAAM0qB,EAAeC,MAI5CkB,KAAM,SAAU1lB,GACf,MAAO8Y,GAAQjf,KAAM,SAAUmG,GAC9B,GAAIzD,GAAO1C,KAAM,OAChB2C,EAAI,EACJwX,EAAIna,KAAK4B,MAEV,IAAesC,SAAViC,GAAyC,IAAlBzD,EAAKuC,SAChC,MAAOvC,GAAKkN,SAIb,IAAsB,gBAAVzJ,KAAuBwiB,GAAahc,KAAMxG,KACpD6iB,IAAWP,GAASpc,KAAMlG,KAAa,GAAI,KAAQ,GAAID,eAAkB,CAE1EC,EAAQA,EAAM7B,QAASkkB,GAAW,YAElC,KACC,KAAYrO,EAAJxX,EAAOA,IACdD,EAAO1C,KAAM2C,OAGU,IAAlBD,EAAKuC,WACTpE,EAAOwqB,UAAWb,GAAQ9nB,GAAM,IAChCA,EAAKkN,UAAYzJ,EAInBzD,GAAO,EAGN,MAAOgJ,KAGLhJ,GACJ1C,KAAK2U,QAAQ2W,OAAQnlB,IAEpB,KAAMA,EAAOtD,UAAUjB,SAG3BkqB,YAAa,WACZ,GAAI/kB,GAAMlE,UAAW,EAcrB,OAXA7C,MAAKurB,SAAU1oB,UAAW,SAAUH,GACnCqE,EAAM/G,KAAK6F,WAEXhF,EAAOwqB,UAAWb,GAAQxqB,OAErB+G,GACJA,EAAIglB,aAAcrpB,EAAM1C,QAKnB+G,IAAQA,EAAInF,QAAUmF,EAAI9B,UAAYjF,KAAOA,KAAKoc,UAG1D4P,OAAQ,SAAUlrB,GACjB,MAAOd,MAAKoc,OAAQtb,GAAU,IAG/ByqB,SAAU,SAAU/oB,EAAMD,GAGzBC,EAAOpC,EAAOwC,SAAWJ,EAEzB,IAAIwf,GAAUlf,EAAOkoB,EAASiB,EAAYtd,EAAMG,EAC/CnM,EAAI,EACJwX,EAAIna,KAAK4B,OACTme,EAAM/f,KACNksB,EAAW/R,EAAI,EACfhU,EAAQ3D,EAAM,GACduB,EAAalD,EAAOkD,WAAYoC,EAGjC,IAAKpC,GACDoW,EAAI,GAAsB,gBAAVhU,KAChBxF,EAAQuhB,YAAc0G,GAASjc,KAAMxG,GACxC,MAAOnG,MAAKsC,KAAK,SAAUgY,GAC1B,GAAInB,GAAO4G,EAAIhd,GAAIuX,EACdvW,KACJvB,EAAM,GAAM2D,EAAMrE,KAAM9B,KAAMsa,EAAOnB,EAAK0S,SAE3C1S,EAAKoS,SAAU/oB,EAAMD,IAIvB,IAAK4X,IACJ6H,EAAWnhB,EAAOkqB,cAAevoB,EAAMxC,KAAM,GAAIoM,eAAe,EAAOpM,MACvE8C,EAAQkf,EAASzQ,WAEmB,IAA/ByQ,EAASvW,WAAW7J,SACxBogB,EAAWlf,GAGPA,GAAQ,CAMZ,IALAkoB,EAAUnqB,EAAO4B,IAAK+nB,GAAQxI,EAAU,UAAY8H,IACpDmC,EAAajB,EAAQppB,OAITuY,EAAJxX,EAAOA,IACdgM,EAAOqT,EAEFrf,IAAMupB,IACVvd,EAAO9N,EAAO+C,MAAO+K,GAAM,GAAM,GAG5Bsd,GAGJprB,EAAOuB,MAAO4oB,EAASR,GAAQ7b,EAAM,YAIvCpM,EAAST,KAAM9B,KAAM2C,GAAKgM,EAAMhM,EAGjC,IAAKspB,EAOJ,IANAnd,EAAMkc,EAASA,EAAQppB,OAAS,GAAIwK,cAGpCvL,EAAO4B,IAAKuoB,EAASjB,IAGfpnB,EAAI,EAAOspB,EAAJtpB,EAAgBA,IAC5BgM,EAAOqc,EAASroB,GACXkmB,GAAYlc,KAAMgC,EAAK/J,MAAQ,MAClCyb,EAAUpB,OAAQtQ,EAAM,eAAkB9N,EAAOwH,SAAUyG,EAAKH,KAE5DA,EAAKlL,IAEJ5C,EAAOsrB,UACXtrB,EAAOsrB,SAAUxd,EAAKlL,KAGvB5C,EAAOsE,WAAYwJ,EAAK2C,YAAYhN,QAASykB,GAAc,MAQjE,MAAO/oB,SAITa,EAAOyB,MACN8pB,SAAU,SACVC,UAAW,UACXZ,aAAc,SACda,YAAa,QACbC,WAAY,eACV,SAAU/oB,EAAMyiB,GAClBplB,EAAOG,GAAIwC,GAAS,SAAU1C,GAO7B,IANA,GAAIoB,GACHC,KACAqqB,EAAS3rB,EAAQC,GACjBkC,EAAOwpB,EAAO5qB,OAAS,EACvBe,EAAI,EAEQK,GAALL,EAAWA,IAClBT,EAAQS,IAAMK,EAAOhD,KAAOA,KAAK4D,OAAO,GACxC/C,EAAQ2rB,EAAQ7pB,IAAOsjB,GAAY/jB,GAInC7B,EAAKuC,MAAOT,EAAKD,EAAMH,MAGxB,OAAO/B,MAAKiC,UAAWE,KAKzB,IAAIsqB,IACHC,KAQD,SAASC,IAAenpB,EAAMsL,GAC7B,GAAI8d,GACHlqB,EAAO7B,EAAQiO,EAAIrJ,cAAejC,IAAS4oB,SAAUtd,EAAIyX,MAGzDsG,EAAU9sB,EAAO+sB,0BAA6BF,EAAQ7sB,EAAO+sB,wBAAyBpqB,EAAM,KAI3FkqB,EAAMC,QAAUhsB,EAAOihB,IAAKpf,EAAM,GAAK,UAMzC,OAFAA,GAAKspB,SAEEa,EAOR,QAASE,IAAgB9mB,GACxB,GAAI6I,GAAMlP,EACTitB,EAAUH,GAAazmB,EA0BxB,OAxBM4mB,KACLA,EAAUF,GAAe1mB,EAAU6I,GAGlB,SAAZ+d,GAAuBA,IAG3BJ,IAAUA,IAAU5rB,EAAQ,mDAAoDurB,SAAUtd,EAAIJ,iBAG9FI,EAAM2d,GAAQ,GAAIzR,gBAGlBlM,EAAIke,QACJle,EAAIme,QAEJJ,EAAUF,GAAe1mB,EAAU6I,GACnC2d,GAAOT,UAIRU,GAAazmB,GAAa4mB,GAGpBA,EAER,GAAIK,IAAU,UAEVC,GAAY,GAAIxjB,QAAQ,KAAO8X,EAAO,kBAAmB,KAEzD2L,GAAY,SAAU1qB,GAIxB,MAAKA,GAAK0J,cAAc2C,YAAYse,OAC5B3qB,EAAK0J,cAAc2C,YAAYue,iBAAkB5qB,EAAM,MAGxD3C,EAAOutB,iBAAkB5qB,EAAM,MAKxC,SAAS6qB,IAAQ7qB,EAAMc,EAAMgqB,GAC5B,GAAIC,GAAOC,EAAUC,EAAUxrB,EAC9ByqB,EAAQlqB,EAAKkqB,KAsCd,OApCAY,GAAWA,GAAYJ,GAAW1qB,GAI7B8qB,IACJrrB,EAAMqrB,EAASI,iBAAkBpqB,IAAUgqB,EAAUhqB,IAGjDgqB,IAES,KAARrrB,GAAetB,EAAOwH,SAAU3F,EAAK0J,cAAe1J,KACxDP,EAAMtB,EAAO+rB,MAAOlqB,EAAMc,IAOtB2pB,GAAUxgB,KAAMxK,IAAS+qB,GAAQvgB,KAAMnJ,KAG3CiqB,EAAQb,EAAMa,MACdC,EAAWd,EAAMc,SACjBC,EAAWf,EAAMe,SAGjBf,EAAMc,SAAWd,EAAMe,SAAWf,EAAMa,MAAQtrB,EAChDA,EAAMqrB,EAASC,MAGfb,EAAMa,MAAQA,EACdb,EAAMc,SAAWA,EACjBd,EAAMe,SAAWA,IAIJzpB,SAAR/B,EAGNA,EAAM,GACNA,EAIF,QAAS0rB,IAAcC,EAAaC,GAEnC,OACChsB,IAAK,WACJ,MAAK+rB,gBAGG9tB,MAAK+B,KAKL/B,KAAK+B,IAAMgsB,GAAQnrB,MAAO5C,KAAM6C,cAM3C,WACC,GAAImrB,GAAkBC,EACrBhmB,EAAUrI,EAAS8O,gBACnBwf,EAAYtuB,EAAS6F,cAAe,OACpCkI,EAAM/N,EAAS6F,cAAe,MAE/B,IAAMkI,EAAIif,MAAV,CAMAjf,EAAIif,MAAMuB,eAAiB,cAC3BxgB,EAAIwU,WAAW,GAAOyK,MAAMuB,eAAiB,GAC7CxtB,EAAQytB,gBAA+C,gBAA7BzgB,EAAIif,MAAMuB,eAEpCD,EAAUtB,MAAMyB,QAAU,gFAE1BH,EAAUtoB,YAAa+H,EAIvB,SAAS2gB,KACR3gB,EAAIif,MAAMyB,QAGT,uKAGD1gB,EAAIiC,UAAY,GAChB3H,EAAQrC,YAAasoB,EAErB,IAAIK,GAAWxuB,EAAOutB,iBAAkB3f,EAAK,KAC7CqgB,GAAoC,OAAjBO,EAASvf,IAC5Bif,EAA0C,QAAnBM,EAASd,MAEhCxlB,EAAQnC,YAAaooB,GAKjBnuB,EAAOutB,kBACXzsB,EAAOyC,OAAQ3C,GACd6tB,cAAe,WAMd,MADAF,KACON,GAERS,kBAAmB,WAIlB,MAH6B,OAAxBR,GACJK,IAEML,GAERS,oBAAqB,WAOpB,GAAIvsB,GACHwsB,EAAYhhB,EAAI/H,YAAahG,EAAS6F,cAAe,OAiBtD,OAdAkpB,GAAU/B,MAAMyB,QAAU1gB,EAAIif,MAAMyB,QAGnC,8HAEDM,EAAU/B,MAAMgC,YAAcD,EAAU/B,MAAMa,MAAQ,IACtD9f,EAAIif,MAAMa,MAAQ,MAClBxlB,EAAQrC,YAAasoB,GAErB/rB,GAAO6C,WAAYjF,EAAOutB,iBAAkBqB,EAAW,MAAOC,aAE9D3mB,EAAQnC,YAAaooB,GACrBvgB,EAAI7H,YAAa6oB,GAEVxsB,SAQXtB,EAAOguB,KAAO,SAAUnsB,EAAMa,EAAShB,EAAUC,GAChD,GAAIL,GAAKqB,EACRwI,IAGD,KAAMxI,IAAQD,GACbyI,EAAKxI,GAASd,EAAKkqB,MAAOppB,GAC1Bd,EAAKkqB,MAAOppB,GAASD,EAASC,EAG/BrB,GAAMI,EAASK,MAAOF,EAAMF,MAG5B,KAAMgB,IAAQD,GACbb,EAAKkqB,MAAOppB,GAASwI,EAAKxI,EAG3B,OAAOrB,GAIR,IAGC2sB,IAAe,4BACfC,GAAY,GAAIplB,QAAQ,KAAO8X,EAAO,SAAU,KAChDuN,GAAU,GAAIrlB,QAAQ,YAAc8X,EAAO,IAAK,KAEhDwN,IAAYC,SAAU,WAAYC,WAAY,SAAUtC,QAAS,SACjEuC,IACCC,cAAe,IACfC,WAAY,OAGbC,IAAgB,SAAU,IAAK,MAAO,KAGvC,SAASC,IAAgB5C,EAAOppB,GAG/B,GAAKA,IAAQopB,GACZ,MAAOppB,EAIR,IAAIisB,GAAUjsB,EAAK,GAAGhC,cAAgBgC,EAAKrD,MAAM,GAChDuvB,EAAWlsB,EACXb,EAAI4sB,GAAY3tB,MAEjB,OAAQe,IAEP,GADAa,EAAO+rB,GAAa5sB,GAAM8sB,EACrBjsB,IAAQopB,GACZ,MAAOppB,EAIT,OAAOksB,GAGR,QAASC,IAAmBjtB,EAAMyD,EAAOypB,GACxC,GAAI/oB,GAAUkoB,GAAU1iB,KAAMlG,EAC9B,OAAOU,GAENzC,KAAKyrB,IAAK,EAAGhpB,EAAS,IAAQ+oB,GAAY,KAAU/oB,EAAS,IAAO,MACpEV,EAGF,QAAS2pB,IAAsBptB,EAAMc,EAAMusB,EAAOC,EAAaC,GAS9D,IARA,GAAIttB,GAAIotB,KAAYC,EAAc,SAAW,WAE5C,EAES,UAATxsB,EAAmB,EAAI,EAEvBwN,EAAM,EAEK,EAAJrO,EAAOA,GAAK,EAEJ,WAAVotB,IACJ/e,GAAOnQ,EAAOihB,IAAKpf,EAAMqtB,EAAQpO,EAAWhf,IAAK,EAAMstB,IAGnDD,GAEW,YAAVD,IACJ/e,GAAOnQ,EAAOihB,IAAKpf,EAAM,UAAYif,EAAWhf,IAAK,EAAMstB,IAI7C,WAAVF,IACJ/e,GAAOnQ,EAAOihB,IAAKpf,EAAM,SAAWif,EAAWhf,GAAM,SAAS,EAAMstB,MAIrEjf,GAAOnQ,EAAOihB,IAAKpf,EAAM,UAAYif,EAAWhf,IAAK,EAAMstB,GAG5C,YAAVF,IACJ/e,GAAOnQ,EAAOihB,IAAKpf,EAAM,SAAWif,EAAWhf,GAAM,SAAS,EAAMstB,IAKvE,OAAOjf,GAGR,QAASkf,IAAkBxtB,EAAMc,EAAMusB,GAGtC,GAAII,IAAmB,EACtBnf,EAAe,UAATxN,EAAmBd,EAAK0tB,YAAc1tB,EAAK2tB,aACjDJ,EAAS7C,GAAW1qB,GACpBstB,EAAiE,eAAnDnvB,EAAOihB,IAAKpf,EAAM,aAAa,EAAOutB,EAKrD,IAAY,GAAPjf,GAAmB,MAAPA,EAAc,CAQ9B,GANAA,EAAMuc,GAAQ7qB,EAAMc,EAAMysB,IACf,EAANjf,GAAkB,MAAPA,KACfA,EAAMtO,EAAKkqB,MAAOppB,IAId2pB,GAAUxgB,KAAKqE,GACnB,MAAOA,EAKRmf,GAAmBH,IAChBrvB,EAAQ8tB,qBAAuBzd,IAAQtO,EAAKkqB,MAAOppB,IAGtDwN,EAAMhM,WAAYgM,IAAS,EAI5B,MAASA,GACR8e,GACCptB,EACAc,EACAusB,IAAWC,EAAc,SAAW,WACpCG,EACAF,GAEE,KAGL,QAASK,IAAUxf,EAAUyf,GAM5B,IALA,GAAI1D,GAASnqB,EAAM8tB,EAClBxS,KACA1D,EAAQ,EACR1Y,EAASkP,EAASlP,OAEHA,EAAR0Y,EAAgBA,IACvB5X,EAAOoO,EAAUwJ,GACX5X,EAAKkqB,QAIX5O,EAAQ1D,GAAU+F,EAAUte,IAAKW,EAAM,cACvCmqB,EAAUnqB,EAAKkqB,MAAMC,QAChB0D,GAGEvS,EAAQ1D,IAAuB,SAAZuS,IACxBnqB,EAAKkqB,MAAMC,QAAU,IAMM,KAAvBnqB,EAAKkqB,MAAMC,SAAkBjL,EAAUlf,KAC3Csb,EAAQ1D,GAAU+F,EAAUpB,OAAQvc,EAAM,aAAcqqB,GAAerqB,EAAKuD,cAG7EuqB,EAAS5O,EAAUlf,GAEF,SAAZmqB,GAAuB2D,GAC3BnQ,EAAUN,IAAKrd,EAAM,aAAc8tB,EAAS3D,EAAUhsB,EAAOihB,IAAKpf,EAAM,aAO3E,KAAM4X,EAAQ,EAAW1Y,EAAR0Y,EAAgBA,IAChC5X,EAAOoO,EAAUwJ,GACX5X,EAAKkqB,QAGL2D,GAA+B,SAAvB7tB,EAAKkqB,MAAMC,SAA6C,KAAvBnqB,EAAKkqB,MAAMC,UACzDnqB,EAAKkqB,MAAMC,QAAU0D,EAAOvS,EAAQ1D,IAAW,GAAK,QAItD,OAAOxJ,GAGRjQ,EAAOyC,QAINmtB,UACCC,SACC3uB,IAAK,SAAUW,EAAM8qB,GACpB,GAAKA,EAAW,CAGf,GAAIrrB,GAAMorB,GAAQ7qB,EAAM,UACxB,OAAe,KAARP,EAAa,IAAMA,MAO9BwuB,WACCC,aAAe,EACfC,aAAe,EACfC,UAAY,EACZC,YAAc,EACdzB,YAAc,EACd0B,YAAc,EACdN,SAAW,EACXO,OAAS,EACTC,SAAW,EACXC,QAAU,EACVC,QAAU,EACVC,MAAQ,GAKTC,UACCC,QAAS,YAIV3E,MAAO,SAAUlqB,EAAMc,EAAM2C,EAAO4pB,GAGnC,GAAMrtB,GAA0B,IAAlBA,EAAKuC,UAAoC,IAAlBvC,EAAKuC,UAAmBvC,EAAKkqB,MAAlE,CAKA,GAAIzqB,GAAKyC,EAAMsc,EACdwO,EAAW7uB,EAAOkF,UAAWvC,GAC7BopB,EAAQlqB,EAAKkqB,KAQd,OANAppB,GAAO3C,EAAOywB,SAAU5B,KAAgB7uB,EAAOywB,SAAU5B,GAAaF,GAAgB5C,EAAO8C,IAG7FxO,EAAQrgB,EAAO4vB,SAAUjtB,IAAU3C,EAAO4vB,SAAUf,GAGrCxrB,SAAViC,EAiCC+a,GAAS,OAASA,IAAqDhd,UAA3C/B,EAAM+e,EAAMnf,IAAKW,GAAM,EAAOqtB,IACvD5tB,EAIDyqB,EAAOppB,IArCdoB,QAAcuB,GAGA,WAATvB,IAAsBzC,EAAM6sB,GAAQ3iB,KAAMlG,MAC9CA,GAAUhE,EAAI,GAAK,GAAMA,EAAI,GAAK6C,WAAYnE,EAAOihB,IAAKpf,EAAMc,IAEhEoB,EAAO,UAIM,MAATuB,GAAiBA,IAAUA,IAKlB,WAATvB,GAAsB/D,EAAO8vB,UAAWjB,KAC5CvpB,GAAS,MAKJxF,EAAQytB,iBAA6B,KAAVjoB,GAAiD,IAAjC3C,EAAKlD,QAAS,gBAC9DssB,EAAOppB,GAAS,WAIX0d,GAAW,OAASA,IAAwDhd,UAA7CiC,EAAQ+a,EAAMnB,IAAKrd,EAAMyD,EAAO4pB,MACpEnD,EAAOppB,GAAS2C,IAjBjB,UA+BF2b,IAAK,SAAUpf,EAAMc,EAAMusB,EAAOE,GACjC,GAAIjf,GAAKhP,EAAKkf,EACbwO,EAAW7uB,EAAOkF,UAAWvC,EAwB9B,OArBAA,GAAO3C,EAAOywB,SAAU5B,KAAgB7uB,EAAOywB,SAAU5B,GAAaF,GAAgB9sB,EAAKkqB,MAAO8C,IAGlGxO,EAAQrgB,EAAO4vB,SAAUjtB,IAAU3C,EAAO4vB,SAAUf,GAG/CxO,GAAS,OAASA,KACtBlQ,EAAMkQ,EAAMnf,IAAKW,GAAM,EAAMqtB,IAIjB7rB,SAAR8M,IACJA,EAAMuc,GAAQ7qB,EAAMc,EAAMysB,IAId,WAARjf,GAAoBxN,IAAQ4rB,MAChCpe,EAAMoe,GAAoB5rB,IAIZ,KAAVusB,GAAgBA,GACpB/tB,EAAMgD,WAAYgM,GACX+e,KAAU,GAAQlvB,EAAOkE,UAAW/C,GAAQA,GAAO,EAAIgP,GAExDA,KAITnQ,EAAOyB,MAAO,SAAU,SAAW,SAAUK,EAAGa,GAC/C3C,EAAO4vB,SAAUjtB,IAChBzB,IAAK,SAAUW,EAAM8qB,EAAUuC,GAC9B,MAAKvC,GAIGsB,GAAaniB,KAAM9L,EAAOihB,IAAKpf,EAAM,aAAsC,IAArBA,EAAK0tB,YACjEvvB,EAAOguB,KAAMnsB,EAAMusB,GAAS,WAC3B,MAAOiB,IAAkBxtB,EAAMc,EAAMusB,KAEtCG,GAAkBxtB,EAAMc,EAAMusB,GARhC,QAYDhQ,IAAK,SAAUrd,EAAMyD,EAAO4pB,GAC3B,GAAIE,GAASF,GAAS3C,GAAW1qB,EACjC,OAAOitB,IAAmBjtB,EAAMyD,EAAO4pB,EACtCD,GACCptB,EACAc,EACAusB,EACmD,eAAnDlvB,EAAOihB,IAAKpf,EAAM,aAAa,EAAOutB,GACtCA,GACG,OAORpvB,EAAO4vB,SAAS7B,YAAcf,GAAcltB,EAAQ+tB,oBACnD,SAAUhsB,EAAM8qB,GACf,MAAKA,GACG3sB,EAAOguB,KAAMnsB,GAAQmqB,QAAW,gBACtCU,IAAU7qB,EAAM,gBAFlB,SAQF7B,EAAOyB,MACNkvB,OAAQ,GACRC,QAAS,GACTC,OAAQ,SACN,SAAUC,EAAQC,GACpB/wB,EAAO4vB,SAAUkB,EAASC,IACzBC,OAAQ,SAAU1rB,GAOjB,IANA,GAAIxD,GAAI,EACPmvB,KAGAC,EAAyB,gBAAV5rB,GAAqBA,EAAMkB,MAAM,MAASlB,GAE9C,EAAJxD,EAAOA,IACdmvB,EAAUH,EAAShQ,EAAWhf,GAAMivB,GACnCG,EAAOpvB,IAAOovB,EAAOpvB,EAAI,IAAOovB,EAAO,EAGzC,OAAOD,KAIH5E,GAAQvgB,KAAMglB,KACnB9wB,EAAO4vB,SAAUkB,EAASC,GAAS7R,IAAM4P,MAI3C9uB,EAAOG,GAAGsC,QACTwe,IAAK,SAAUte,EAAM2C,GACpB,MAAO8Y,GAAQjf,KAAM,SAAU0C,EAAMc,EAAM2C,GAC1C,GAAI8pB,GAAQhtB,EACXR,KACAE,EAAI,CAEL,IAAK9B,EAAOoD,QAAST,GAAS,CAI7B,IAHAysB,EAAS7C,GAAW1qB,GACpBO,EAAMO,EAAK5B,OAECqB,EAAJN,EAASA,IAChBF,EAAKe,EAAMb,IAAQ9B,EAAOihB,IAAKpf,EAAMc,EAAMb,IAAK,EAAOstB,EAGxD,OAAOxtB,GAGR,MAAiByB,UAAViC,EACNtF,EAAO+rB,MAAOlqB,EAAMc,EAAM2C,GAC1BtF,EAAOihB,IAAKpf,EAAMc,IACjBA,EAAM2C,EAAOtD,UAAUjB,OAAS,IAEpC2uB,KAAM,WACL,MAAOD,IAAUtwB,MAAM,IAExBgyB,KAAM,WACL,MAAO1B,IAAUtwB,OAElBiyB,OAAQ,SAAUtV,GACjB,MAAsB,iBAAVA,GACJA,EAAQ3c,KAAKuwB,OAASvwB,KAAKgyB,OAG5BhyB,KAAKsC,KAAK,WACXsf,EAAU5hB,MACda,EAAQb,MAAOuwB,OAEf1vB,EAAQb,MAAOgyB,WAOnB,SAASE,IAAOxvB,EAAMa,EAASyc,EAAM7c,EAAKgvB,GACzC,MAAO,IAAID,IAAMzwB,UAAUR,KAAMyB,EAAMa,EAASyc,EAAM7c,EAAKgvB,GAE5DtxB,EAAOqxB,MAAQA,GAEfA,GAAMzwB,WACLE,YAAauwB,GACbjxB,KAAM,SAAUyB,EAAMa,EAASyc,EAAM7c,EAAKgvB,EAAQC,GACjDpyB,KAAK0C,KAAOA,EACZ1C,KAAKggB,KAAOA,EACZhgB,KAAKmyB,OAASA,GAAU,QACxBnyB,KAAKuD,QAAUA,EACfvD,KAAKgT,MAAQhT,KAAKmH,IAAMnH,KAAKiO,MAC7BjO,KAAKmD,IAAMA,EACXnD,KAAKoyB,KAAOA,IAAUvxB,EAAO8vB,UAAW3Q,GAAS,GAAK,OAEvD/R,IAAK,WACJ,GAAIiT,GAAQgR,GAAMG,UAAWryB,KAAKggB,KAElC,OAAOkB,IAASA,EAAMnf,IACrBmf,EAAMnf,IAAK/B,MACXkyB,GAAMG,UAAUjN,SAASrjB,IAAK/B,OAEhCsyB,IAAK,SAAUC,GACd,GAAIC,GACHtR,EAAQgR,GAAMG,UAAWryB,KAAKggB,KAoB/B,OAlBKhgB,MAAKuD,QAAQkvB,SACjBzyB,KAAKqa,IAAMmY,EAAQ3xB,EAAOsxB,OAAQnyB,KAAKmyB,QACtCI,EAASvyB,KAAKuD,QAAQkvB,SAAWF,EAAS,EAAG,EAAGvyB,KAAKuD,QAAQkvB,UAG9DzyB,KAAKqa,IAAMmY,EAAQD,EAEpBvyB,KAAKmH,KAAQnH,KAAKmD,IAAMnD,KAAKgT,OAAUwf,EAAQxyB,KAAKgT,MAE/ChT,KAAKuD,QAAQmvB,MACjB1yB,KAAKuD,QAAQmvB,KAAK5wB,KAAM9B,KAAK0C,KAAM1C,KAAKmH,IAAKnH,MAGzCkhB,GAASA,EAAMnB,IACnBmB,EAAMnB,IAAK/f,MAEXkyB,GAAMG,UAAUjN,SAASrF,IAAK/f,MAExBA,OAITkyB,GAAMzwB,UAAUR,KAAKQ,UAAYywB,GAAMzwB,UAEvCywB,GAAMG,WACLjN,UACCrjB,IAAK,SAAU4wB,GACd,GAAIngB,EAEJ,OAAiC,OAA5BmgB,EAAMjwB,KAAMiwB,EAAM3S,OACpB2S,EAAMjwB,KAAKkqB,OAA2C,MAAlC+F,EAAMjwB,KAAKkqB,MAAO+F,EAAM3S,OAQ/CxN,EAAS3R,EAAOihB,IAAK6Q,EAAMjwB,KAAMiwB,EAAM3S,KAAM,IAErCxN,GAAqB,SAAXA,EAAwBA,EAAJ,GAT9BmgB,EAAMjwB,KAAMiwB,EAAM3S,OAW3BD,IAAK,SAAU4S,GAIT9xB,EAAO+xB,GAAGF,KAAMC,EAAM3S,MAC1Bnf,EAAO+xB,GAAGF,KAAMC,EAAM3S,MAAQ2S,GACnBA,EAAMjwB,KAAKkqB,QAAgE,MAArD+F,EAAMjwB,KAAKkqB,MAAO/rB,EAAOywB,SAAUqB,EAAM3S,QAAoBnf,EAAO4vB,SAAUkC,EAAM3S,OACrHnf,EAAO+rB,MAAO+F,EAAMjwB,KAAMiwB,EAAM3S,KAAM2S,EAAMxrB,IAAMwrB,EAAMP,MAExDO,EAAMjwB,KAAMiwB,EAAM3S,MAAS2S,EAAMxrB,OAQrC+qB,GAAMG,UAAUvL,UAAYoL,GAAMG,UAAU3L,YAC3C3G,IAAK,SAAU4S,GACTA,EAAMjwB,KAAKuC,UAAY0tB,EAAMjwB,KAAKmD,aACtC8sB,EAAMjwB,KAAMiwB,EAAM3S,MAAS2S,EAAMxrB,OAKpCtG,EAAOsxB,QACNU,OAAQ,SAAUC,GACjB,MAAOA,IAERC,MAAO,SAAUD,GAChB,MAAO,GAAM1uB,KAAK4uB,IAAKF,EAAI1uB,KAAK6uB,IAAO,IAIzCpyB,EAAO+xB,GAAKV,GAAMzwB,UAAUR,KAG5BJ,EAAO+xB,GAAGF,OAKV,IACCQ,IAAOC,GACPC,GAAW,yBACXC,GAAS,GAAI1pB,QAAQ,iBAAmB8X,EAAO,cAAe,KAC9D6R,GAAO,cACPC,IAAwBC,IACxBC,IACCC,KAAO,SAAU1T,EAAM7Z,GACtB,GAAIwsB,GAAQ3yB,KAAK2zB,YAAa3T,EAAM7Z,GACnCtC,EAAS8uB,EAAM1kB,MACf8jB,EAAQsB,GAAOhnB,KAAMlG,GACrBisB,EAAOL,GAASA,EAAO,KAASlxB,EAAO8vB,UAAW3Q,GAAS,GAAK,MAGhEhN,GAAUnS,EAAO8vB,UAAW3Q,IAAmB,OAAToS,IAAkBvuB,IACvDwvB,GAAOhnB,KAAMxL,EAAOihB,IAAK6Q,EAAMjwB,KAAMsd,IACtC4T,EAAQ,EACRC,EAAgB,EAEjB,IAAK7gB,GAASA,EAAO,KAAQof,EAAO,CAEnCA,EAAOA,GAAQpf,EAAO,GAGtB+e,EAAQA,MAGR/e,GAASnP,GAAU,CAEnB,GAGC+vB,GAAQA,GAAS,KAGjB5gB,GAAgB4gB,EAChB/yB,EAAO+rB,MAAO+F,EAAMjwB,KAAMsd,EAAMhN,EAAQof,SAI/BwB,KAAWA,EAAQjB,EAAM1kB,MAAQpK,IAAqB,IAAV+vB,KAAiBC,GAaxE,MATK9B,KACJ/e,EAAQ2f,EAAM3f,OAASA,IAAUnP,GAAU,EAC3C8uB,EAAMP,KAAOA,EAEbO,EAAMxvB,IAAM4uB,EAAO,GAClB/e,GAAU+e,EAAO,GAAM,GAAMA,EAAO,IACnCA,EAAO,IAGHY,IAKV,SAASmB,MAIR,MAHA9U,YAAW,WACVkU,GAAQhvB,SAEAgvB,GAAQryB,EAAOsG,MAIzB,QAAS4sB,IAAOnvB,EAAMovB,GACrB,GAAI9N,GACHvjB,EAAI,EACJkL,GAAUomB,OAAQrvB,EAKnB,KADAovB,EAAeA,EAAe,EAAI,EACtB,EAAJrxB,EAAQA,GAAK,EAAIqxB,EACxB9N,EAAQvE,EAAWhf,GACnBkL,EAAO,SAAWqY,GAAUrY,EAAO,UAAYqY,GAAUthB,CAO1D,OAJKovB,KACJnmB,EAAM6iB,QAAU7iB,EAAM4f,MAAQ7oB,GAGxBiJ,EAGR,QAAS8lB,IAAaxtB,EAAO6Z,EAAMkU,GAKlC,IAJA,GAAIvB,GACHwB,GAAeV,GAAUzT,QAAe5f,OAAQqzB,GAAU,MAC1DnZ,EAAQ,EACR1Y,EAASuyB,EAAWvyB,OACLA,EAAR0Y,EAAgBA,IACvB,GAAMqY,EAAQwB,EAAY7Z,GAAQxY,KAAMoyB,EAAWlU,EAAM7Z,GAGxD,MAAOwsB,GAKV,QAASa,IAAkB9wB,EAAMojB,EAAOsO,GAEvC,GAAIpU,GAAM7Z,EAAO8rB,EAAQU,EAAOzR,EAAOmT,EAASxH,EAASyH,EACxDC,EAAOv0B,KACPioB,KACA2E,EAAQlqB,EAAKkqB,MACb4D,EAAS9tB,EAAKuC,UAAY2c,EAAUlf,GACpC8xB,EAAWnU,EAAUte,IAAKW,EAAM,SAG3B0xB,GAAKrT,QACVG,EAAQrgB,EAAOsgB,YAAaze,EAAM,MACX,MAAlBwe,EAAMuT,WACVvT,EAAMuT,SAAW,EACjBJ,EAAUnT,EAAMvM,MAAMqH,KACtBkF,EAAMvM,MAAMqH,KAAO,WACZkF,EAAMuT,UACXJ,MAIHnT,EAAMuT,WAENF,EAAK1X,OAAO,WAEX0X,EAAK1X,OAAO,WACXqE,EAAMuT,WACA5zB,EAAOkgB,MAAOre,EAAM,MAAOd,QAChCsf,EAAMvM,MAAMqH,YAOO,IAAlBtZ,EAAKuC,WAAoB,UAAY6gB,IAAS,SAAWA,MAK7DsO,EAAKM,UAAa9H,EAAM8H,SAAU9H,EAAM+H,UAAW/H,EAAMgI,WAIzD/H,EAAUhsB,EAAOihB,IAAKpf,EAAM,WAG5B4xB,EAA2B,SAAZzH,EACdxM,EAAUte,IAAKW,EAAM,eAAkBqqB,GAAgBrqB,EAAKuD,UAAa4mB,EAEpD,WAAjByH,GAA6D,SAAhCzzB,EAAOihB,IAAKpf,EAAM,WACnDkqB,EAAMC,QAAU,iBAIbuH,EAAKM,WACT9H,EAAM8H,SAAW,SACjBH,EAAK1X,OAAO,WACX+P,EAAM8H,SAAWN,EAAKM,SAAU,GAChC9H,EAAM+H,UAAYP,EAAKM,SAAU,GACjC9H,EAAMgI,UAAYR,EAAKM,SAAU,KAKnC,KAAM1U,IAAQ8F,GAEb,GADA3f,EAAQ2f,EAAO9F,GACVoT,GAAS/mB,KAAMlG,GAAU,CAG7B,SAFO2f,GAAO9F,GACdiS,EAASA,GAAoB,WAAV9rB,EACdA,KAAYqqB,EAAS,OAAS,QAAW,CAG7C,GAAe,SAAVrqB,IAAoBquB,GAAiCtwB,SAArBswB,EAAUxU,GAG9C,QAFAwQ,IAAS,EAKXvI,EAAMjI,GAASwU,GAAYA,EAAUxU,IAAUnf,EAAO+rB,MAAOlqB,EAAMsd,OAInE6M,GAAU3oB,MAIZ,IAAMrD,EAAOqE,cAAe+iB,GAyCqD,YAAxD,SAAZ4E,EAAqBE,GAAgBrqB,EAAKuD,UAAa4mB,KACnED,EAAMC,QAAUA,OA1CoB,CAC/B2H,EACC,UAAYA,KAChBhE,EAASgE,EAAShE,QAGnBgE,EAAWnU,EAAUpB,OAAQvc,EAAM,aAI/BuvB,IACJuC,EAAShE,QAAUA,GAEfA,EACJ3vB,EAAQ6B,GAAO6tB,OAEfgE,EAAK/rB,KAAK,WACT3H,EAAQ6B,GAAOsvB,SAGjBuC,EAAK/rB,KAAK,WACT,GAAIwX,EAEJK,GAAUjE,OAAQ1Z,EAAM,SACxB,KAAMsd,IAAQiI,GACbpnB,EAAO+rB,MAAOlqB,EAAMsd,EAAMiI,EAAMjI,KAGlC,KAAMA,IAAQiI,GACb0K,EAAQgB,GAAanD,EAASgE,EAAUxU,GAAS,EAAGA,EAAMuU,GAElDvU,IAAQwU,KACfA,EAAUxU,GAAS2S,EAAM3f,MACpBwd,IACJmC,EAAMxvB,IAAMwvB,EAAM3f,MAClB2f,EAAM3f,MAAiB,UAATgN,GAA6B,WAATA,EAAoB,EAAI,KAW/D,QAAS6U,IAAY/O,EAAOgP,GAC3B,GAAIxa,GAAO9W,EAAM2uB,EAAQhsB,EAAO+a,CAGhC,KAAM5G,IAASwL,GAed,GAdAtiB,EAAO3C,EAAOkF,UAAWuU,GACzB6X,EAAS2C,EAAetxB,GACxB2C,EAAQ2f,EAAOxL,GACVzZ,EAAOoD,QAASkC,KACpBgsB,EAAShsB,EAAO,GAChBA,EAAQ2f,EAAOxL,GAAUnU,EAAO,IAG5BmU,IAAU9W,IACdsiB,EAAOtiB,GAAS2C,QACT2f,GAAOxL,IAGf4G,EAAQrgB,EAAO4vB,SAAUjtB,GACpB0d,GAAS,UAAYA,GAAQ,CACjC/a,EAAQ+a,EAAM2Q,OAAQ1rB,SACf2f,GAAOtiB,EAId,KAAM8W,IAASnU,GACNmU,IAASwL,KAChBA,EAAOxL,GAAUnU,EAAOmU,GACxBwa,EAAexa,GAAU6X,OAI3B2C,GAAetxB,GAAS2uB,EAK3B,QAAS4C,IAAWryB,EAAMsyB,EAAYzxB,GACrC,GAAIiP,GACHyiB,EACA3a,EAAQ,EACR1Y,EAAS2xB,GAAoB3xB,OAC7Bkb,EAAWjc,EAAO2b,WAAWK,OAAQ,iBAE7BqY,GAAKxyB,OAEbwyB,EAAO,WACN,GAAKD,EACJ,OAAO,CAWR,KATA,GAAIE,GAAcjC,IAASY,KAC1BhW,EAAY1Z,KAAKyrB,IAAK,EAAGqE,EAAUkB,UAAYlB,EAAUzB,SAAW0C,GAGpEle,EAAO6G,EAAYoW,EAAUzB,UAAY,EACzCF,EAAU,EAAItb,EACdqD,EAAQ,EACR1Y,EAASsyB,EAAUmB,OAAOzzB,OAEXA,EAAR0Y,EAAiBA,IACxB4Z,EAAUmB,OAAQ/a,GAAQgY,IAAKC,EAKhC,OAFAzV,GAASoB,WAAYxb,GAAQwxB,EAAW3B,EAASzU,IAElC,EAAVyU,GAAe3wB,EACZkc,GAEPhB,EAASqB,YAAazb,GAAQwxB,KACvB,IAGTA,EAAYpX,EAASF,SACpBla,KAAMA,EACNojB,MAAOjlB,EAAOyC,UAAY0xB,GAC1BZ,KAAMvzB,EAAOyC,QAAQ,GAAQwxB,kBAAqBvxB,GAClD+xB,mBAAoBN,EACpBO,gBAAiBhyB,EACjB6xB,UAAWlC,IAASY,KACpBrB,SAAUlvB,EAAQkvB,SAClB4C,UACA1B,YAAa,SAAU3T,EAAM7c,GAC5B,GAAIwvB,GAAQ9xB,EAAOqxB,MAAOxvB,EAAMwxB,EAAUE,KAAMpU,EAAM7c,EACpD+wB,EAAUE,KAAKU,cAAe9U,IAAUkU,EAAUE,KAAKjC,OAEzD,OADA+B,GAAUmB,OAAOh1B,KAAMsyB,GAChBA,GAERvR,KAAM,SAAUoU,GACf,GAAIlb,GAAQ,EAGX1Y,EAAS4zB,EAAUtB,EAAUmB,OAAOzzB,OAAS,CAC9C,IAAKqzB,EACJ,MAAOj1B,KAGR,KADAi1B,GAAU,EACMrzB,EAAR0Y,EAAiBA,IACxB4Z,EAAUmB,OAAQ/a,GAAQgY,IAAK,EAShC,OALKkD,GACJ1Y,EAASqB,YAAazb,GAAQwxB,EAAWsB,IAEzC1Y,EAAS2Y,WAAY/yB,GAAQwxB,EAAWsB,IAElCx1B,QAGT8lB,EAAQoO,EAAUpO,KAInB,KAFA+O,GAAY/O,EAAOoO,EAAUE,KAAKU,eAElBlzB,EAAR0Y,EAAiBA,IAExB,GADA9H,EAAS+gB,GAAqBjZ,GAAQxY,KAAMoyB,EAAWxxB,EAAMojB,EAAOoO,EAAUE,MAE7E,MAAO5hB,EAmBT,OAfA3R,GAAO4B,IAAKqjB,EAAO6N,GAAaO,GAE3BrzB,EAAOkD,WAAYmwB,EAAUE,KAAKphB,QACtCkhB,EAAUE,KAAKphB,MAAMlR,KAAMY,EAAMwxB,GAGlCrzB,EAAO+xB,GAAG8C,MACT70B,EAAOyC,OAAQ4xB,GACdxyB,KAAMA,EACN6xB,KAAML,EACNnT,MAAOmT,EAAUE,KAAKrT,SAKjBmT,EAAU3W,SAAU2W,EAAUE,KAAK7W,UACxC/U,KAAM0rB,EAAUE,KAAK5rB,KAAM0rB,EAAUE,KAAKuB,UAC1C5Y,KAAMmX,EAAUE,KAAKrX,MACrBF,OAAQqX,EAAUE,KAAKvX,QAG1Bhc,EAAOk0B,UAAYl0B,EAAOyC,OAAQyxB,IAEjCa,QAAS,SAAU9P,EAAOvjB,GACpB1B,EAAOkD,WAAY+hB,IACvBvjB,EAAWujB,EACXA,GAAU,MAEVA,EAAQA,EAAMze,MAAM,IAOrB,KAJA,GAAI2Y,GACH1F,EAAQ,EACR1Y,EAASkkB,EAAMlkB,OAEAA,EAAR0Y,EAAiBA,IACxB0F,EAAO8F,EAAOxL,GACdmZ,GAAUzT,GAASyT,GAAUzT,OAC7ByT,GAAUzT,GAAOpP,QAASrO,IAI5BszB,UAAW,SAAUtzB,EAAUipB,GACzBA,EACJ+H,GAAoB3iB,QAASrO,GAE7BgxB,GAAoBlzB,KAAMkC,MAK7B1B,EAAOi1B,MAAQ,SAAUA,EAAO3D,EAAQnxB,GACvC,GAAI+0B,GAAMD,GAA0B,gBAAVA,GAAqBj1B,EAAOyC,UAAYwyB,IACjEH,SAAU30B,IAAOA,GAAMmxB,GACtBtxB,EAAOkD,WAAY+xB,IAAWA,EAC/BrD,SAAUqD,EACV3D,OAAQnxB,GAAMmxB,GAAUA,IAAWtxB,EAAOkD,WAAYouB,IAAYA,EAwBnE,OArBA4D,GAAItD,SAAW5xB,EAAO+xB,GAAGhU,IAAM,EAA4B,gBAAjBmX,GAAItD,SAAwBsD,EAAItD,SACzEsD,EAAItD,WAAY5xB,GAAO+xB,GAAGoD,OAASn1B,EAAO+xB,GAAGoD,OAAQD,EAAItD,UAAa5xB,EAAO+xB,GAAGoD,OAAO5Q,UAGtE,MAAb2Q,EAAIhV,OAAiBgV,EAAIhV,SAAU,KACvCgV,EAAIhV,MAAQ,MAIbgV,EAAI/pB,IAAM+pB,EAAIJ,SAEdI,EAAIJ,SAAW,WACT90B,EAAOkD,WAAYgyB,EAAI/pB,MAC3B+pB,EAAI/pB,IAAIlK,KAAM9B,MAGV+1B,EAAIhV,OACRlgB,EAAOmgB,QAAShhB,KAAM+1B,EAAIhV,QAIrBgV,GAGRl1B,EAAOG,GAAGsC,QACT2yB,OAAQ,SAAUH,EAAOI,EAAI/D,EAAQ5vB,GAGpC,MAAOvC,MAAKwP,OAAQoS,GAAWE,IAAK,UAAW,GAAIyO,OAGjDptB,MAAMgzB,SAAUzF,QAASwF,GAAMJ,EAAO3D,EAAQ5vB,IAEjD4zB,QAAS,SAAUnW,EAAM8V,EAAO3D,EAAQ5vB,GACvC,GAAIoS,GAAQ9T,EAAOqE,cAAe8a,GACjCoW,EAASv1B,EAAOi1B,MAAOA,EAAO3D,EAAQ5vB,GACtC8zB,EAAc,WAEb,GAAI9B,GAAOQ,GAAW/0B,KAAMa,EAAOyC,UAAY0c,GAAQoW,IAGlDzhB,GAAS0L,EAAUte,IAAK/B,KAAM,YAClCu0B,EAAKnT,MAAM,GAKd,OAFCiV,GAAYC,OAASD,EAEf1hB,GAASyhB,EAAOrV,SAAU,EAChC/gB,KAAKsC,KAAM+zB,GACXr2B,KAAK+gB,MAAOqV,EAAOrV,MAAOsV,IAE5BjV,KAAM,SAAUxc,EAAM0c,EAAYkU,GACjC,GAAIe,GAAY,SAAUrV,GACzB,GAAIE,GAAOF,EAAME,WACVF,GAAME,KACbA,EAAMoU,GAYP,OATqB,gBAAT5wB,KACX4wB,EAAUlU,EACVA,EAAa1c,EACbA,EAAOV,QAEHod,GAAc1c,KAAS,GAC3B5E,KAAK+gB,MAAOnc,GAAQ,SAGd5E,KAAKsC,KAAK,WAChB,GAAI0e,IAAU,EACb1G,EAAgB,MAAR1V,GAAgBA,EAAO,aAC/B4xB,EAAS31B,EAAO21B,OAChBva,EAAOoE,EAAUte,IAAK/B,KAEvB,IAAKsa,EACC2B,EAAM3B,IAAW2B,EAAM3B,GAAQ8G,MACnCmV,EAAWta,EAAM3B,QAGlB,KAAMA,IAAS2B,GACTA,EAAM3B,IAAW2B,EAAM3B,GAAQ8G,MAAQkS,GAAK3mB,KAAM2N,IACtDic,EAAWta,EAAM3B,GAKpB,KAAMA,EAAQkc,EAAO50B,OAAQ0Y,KACvBkc,EAAQlc,GAAQ5X,OAAS1C,MAAiB,MAAR4E,GAAgB4xB,EAAQlc,GAAQyG,QAAUnc,IAChF4xB,EAAQlc,GAAQia,KAAKnT,KAAMoU,GAC3BxU,GAAU,EACVwV,EAAOnzB,OAAQiX,EAAO,KAOnB0G,IAAYwU,IAChB30B,EAAOmgB,QAAShhB,KAAM4E,MAIzB0xB,OAAQ,SAAU1xB,GAIjB,MAHKA,MAAS,IACbA,EAAOA,GAAQ,MAET5E,KAAKsC,KAAK,WAChB,GAAIgY,GACH2B,EAAOoE,EAAUte,IAAK/B,MACtB+gB,EAAQ9E,EAAMrX,EAAO,SACrBsc,EAAQjF,EAAMrX,EAAO,cACrB4xB,EAAS31B,EAAO21B,OAChB50B,EAASmf,EAAQA,EAAMnf,OAAS,CAajC,KAVAqa,EAAKqa,QAAS,EAGdz1B,EAAOkgB,MAAO/gB,KAAM4E,MAEfsc,GAASA,EAAME,MACnBF,EAAME,KAAKtf,KAAM9B,MAAM,GAIlBsa,EAAQkc,EAAO50B,OAAQ0Y,KACvBkc,EAAQlc,GAAQ5X,OAAS1C,MAAQw2B,EAAQlc,GAAQyG,QAAUnc,IAC/D4xB,EAAQlc,GAAQia,KAAKnT,MAAM,GAC3BoV,EAAOnzB,OAAQiX,EAAO,GAKxB,KAAMA,EAAQ,EAAW1Y,EAAR0Y,EAAgBA,IAC3ByG,EAAOzG,IAAWyG,EAAOzG,GAAQgc,QACrCvV,EAAOzG,GAAQgc,OAAOx0B,KAAM9B,YAKvBic,GAAKqa,YAKfz1B,EAAOyB,MAAO,SAAU,OAAQ,QAAU,SAAUK,EAAGa,GACtD,GAAIizB,GAAQ51B,EAAOG,GAAIwC,EACvB3C,GAAOG,GAAIwC,GAAS,SAAUsyB,EAAO3D,EAAQ5vB,GAC5C,MAAgB,OAATuzB,GAAkC,iBAAVA,GAC9BW,EAAM7zB,MAAO5C,KAAM6C,WACnB7C,KAAKm2B,QAASpC,GAAOvwB,GAAM,GAAQsyB,EAAO3D,EAAQ5vB,MAKrD1B,EAAOyB,MACNo0B,UAAW3C,GAAM,QACjB4C,QAAS5C,GAAM,QACf6C,YAAa7C,GAAM,UACnB8C,QAAUnG,QAAS,QACnBoG,SAAWpG,QAAS,QACpBqG,YAAcrG,QAAS,WACrB,SAAUltB,EAAMsiB,GAClBjlB,EAAOG,GAAIwC,GAAS,SAAUsyB,EAAO3D,EAAQ5vB,GAC5C,MAAOvC,MAAKm2B,QAASrQ,EAAOgQ,EAAO3D,EAAQ5vB,MAI7C1B,EAAO21B,UACP31B,EAAO+xB,GAAGsC,KAAO,WAChB,GAAIQ,GACH/yB,EAAI,EACJ6zB,EAAS31B,EAAO21B,MAIjB,KAFAtD,GAAQryB,EAAOsG,MAEPxE,EAAI6zB,EAAO50B,OAAQe,IAC1B+yB,EAAQc,EAAQ7zB,GAEV+yB,KAAWc,EAAQ7zB,KAAQ+yB,GAChCc,EAAOnzB,OAAQV,IAAK,EAIhB6zB,GAAO50B,QACZf,EAAO+xB,GAAGxR,OAEX8R,GAAQhvB,QAGTrD,EAAO+xB,GAAG8C,MAAQ,SAAUA,GAC3B70B,EAAO21B,OAAOn2B,KAAMq1B,GACfA,IACJ70B,EAAO+xB,GAAG5f,QAEVnS,EAAO21B,OAAOvtB,OAIhBpI,EAAO+xB,GAAGoE,SAAW,GAErBn2B,EAAO+xB,GAAG5f,MAAQ,WACXmgB,KACLA,GAAU8D,YAAap2B,EAAO+xB,GAAGsC,KAAMr0B,EAAO+xB,GAAGoE,YAInDn2B,EAAO+xB,GAAGxR,KAAO,WAChB8V,cAAe/D,IACfA,GAAU,MAGXtyB,EAAO+xB,GAAGoD,QACTmB,KAAM,IACNC,KAAM,IAENhS,SAAU,KAMXvkB,EAAOG,GAAGq2B,MAAQ,SAAUC,EAAM1yB,GAIjC,MAHA0yB,GAAOz2B,EAAO+xB,GAAK/xB,EAAO+xB,GAAGoD,OAAQsB,IAAUA,EAAOA,EACtD1yB,EAAOA,GAAQ,KAER5E,KAAK+gB,MAAOnc,EAAM,SAAUgV,EAAMsH,GACxC,GAAIqW,GAAUvY,WAAYpF,EAAM0d,EAChCpW,GAAME,KAAO,WACZoW,aAAcD,OAMjB,WACC,GAAI1nB,GAAQjQ,EAAS6F,cAAe,SACnCmC,EAAShI,EAAS6F,cAAe,UACjCswB,EAAMnuB,EAAOhC,YAAahG,EAAS6F,cAAe,UAEnDoK,GAAMjL,KAAO,WAIbjE,EAAQ82B,QAA0B,KAAhB5nB,EAAM1J,MAIxBxF,EAAQ+2B,YAAc3B,EAAIthB,SAI1B7M,EAAO2M,UAAW,EAClB5T,EAAQg3B,aAAe5B,EAAIxhB,SAI3B1E,EAAQjQ,EAAS6F,cAAe,SAChCoK,EAAM1J,MAAQ,IACd0J,EAAMjL,KAAO,QACbjE,EAAQi3B,WAA6B,MAAhB/nB,EAAM1J,QAI5B,IAAI0xB,IAAUC,GACb/pB,GAAalN,EAAOgQ,KAAK9C,UAE1BlN,GAAOG,GAAGsC,QACTyN,KAAM,SAAUvN,EAAM2C,GACrB,MAAO8Y,GAAQjf,KAAMa,EAAOkQ,KAAMvN,EAAM2C,EAAOtD,UAAUjB,OAAS,IAGnEm2B,WAAY,SAAUv0B,GACrB,MAAOxD,MAAKsC,KAAK,WAChBzB,EAAOk3B,WAAY/3B,KAAMwD,QAK5B3C,EAAOyC,QACNyN,KAAM,SAAUrO,EAAMc,EAAM2C,GAC3B,GAAI+a,GAAO/e,EACV61B,EAAQt1B,EAAKuC,QAGd,IAAMvC,GAAkB,IAAVs1B,GAAyB,IAAVA,GAAyB,IAAVA,EAK5C,aAAYt1B,GAAKkK,eAAiByV,EAC1BxhB,EAAOmf,KAAMtd,EAAMc,EAAM2C,IAKlB,IAAV6xB,GAAgBn3B,EAAOgY,SAAUnW,KACrCc,EAAOA,EAAK0C,cACZgb,EAAQrgB,EAAOo3B,UAAWz0B,KACvB3C,EAAOgQ,KAAKhF,MAAMrB,KAAKmC,KAAMnJ,GAASs0B,GAAWD;AAGtC3zB,SAAViC,EAaO+a,GAAS,OAASA,IAA6C,QAAnC/e,EAAM+e,EAAMnf,IAAKW,EAAMc,IACvDrB,GAGPA,EAAMtB,EAAO0O,KAAKwB,KAAMrO,EAAMc,GAGhB,MAAPrB,EACN+B,OACA/B,GApBc,OAAVgE,EAGO+a,GAAS,OAASA,IAAoDhd,UAA1C/B,EAAM+e,EAAMnB,IAAKrd,EAAMyD,EAAO3C,IAC9DrB,GAGPO,EAAKmK,aAAcrJ,EAAM2C,EAAQ,IAC1BA,OAPPtF,GAAOk3B,WAAYr1B,EAAMc,KAuB5Bu0B,WAAY,SAAUr1B,EAAMyD,GAC3B,GAAI3C,GAAM00B,EACTv1B,EAAI,EACJw1B,EAAYhyB,GAASA,EAAM0F,MAAOqP,EAEnC,IAAKid,GAA+B,IAAlBz1B,EAAKuC,SACtB,MAASzB,EAAO20B,EAAUx1B,KACzBu1B,EAAWr3B,EAAOu3B,QAAS50B,IAAUA,EAGhC3C,EAAOgQ,KAAKhF,MAAMrB,KAAKmC,KAAMnJ,KAEjCd,EAAMw1B,IAAa,GAGpBx1B,EAAKyK,gBAAiB3J,IAKzBy0B,WACCrzB,MACCmb,IAAK,SAAUrd,EAAMyD,GACpB,IAAMxF,EAAQi3B,YAAwB,UAAVzxB,GAC3BtF,EAAOoF,SAAUvD,EAAM,SAAY,CACnC,GAAIsO,GAAMtO,EAAKyD,KAKf,OAJAzD,GAAKmK,aAAc,OAAQ1G,GACtB6K,IACJtO,EAAKyD,MAAQ6K,GAEP7K,QAQZ2xB,IACC/X,IAAK,SAAUrd,EAAMyD,EAAO3C,GAO3B,MANK2C,MAAU,EAEdtF,EAAOk3B,WAAYr1B,EAAMc,GAEzBd,EAAKmK,aAAcrJ,EAAMA,GAEnBA,IAGT3C,EAAOyB,KAAMzB,EAAOgQ,KAAKhF,MAAMrB,KAAKkX,OAAO7V,MAAO,QAAU,SAAUlJ,EAAGa,GACxE,GAAI60B,GAAStqB,GAAYvK,IAAU3C,EAAO0O,KAAKwB,IAE/ChD,IAAYvK,GAAS,SAAUd,EAAMc,EAAMiE,GAC1C,GAAItF,GAAKwhB,CAUT,OATMlc,KAELkc,EAAS5V,GAAYvK,GACrBuK,GAAYvK,GAASrB,EACrBA,EAAqC,MAA/Bk2B,EAAQ31B,EAAMc,EAAMiE,GACzBjE,EAAK0C,cACL,KACD6H,GAAYvK,GAASmgB,GAEfxhB,IAOT,IAAIm2B,IAAa,qCAEjBz3B,GAAOG,GAAGsC,QACT0c,KAAM,SAAUxc,EAAM2C,GACrB,MAAO8Y,GAAQjf,KAAMa,EAAOmf,KAAMxc,EAAM2C,EAAOtD,UAAUjB,OAAS,IAGnE22B,WAAY,SAAU/0B,GACrB,MAAOxD,MAAKsC,KAAK,iBACTtC,MAAMa,EAAOu3B,QAAS50B,IAAUA,QAK1C3C,EAAOyC,QACN80B,SACCI,MAAO,UACPC,QAAS,aAGVzY,KAAM,SAAUtd,EAAMc,EAAM2C,GAC3B,GAAIhE,GAAK+e,EAAOwX,EACfV,EAAQt1B,EAAKuC,QAGd,IAAMvC,GAAkB,IAAVs1B,GAAyB,IAAVA,GAAyB,IAAVA,EAY5C,MARAU,GAAmB,IAAVV,IAAgBn3B,EAAOgY,SAAUnW,GAErCg2B,IAEJl1B,EAAO3C,EAAOu3B,QAAS50B,IAAUA,EACjC0d,EAAQrgB,EAAOwxB,UAAW7uB,IAGZU,SAAViC,EACG+a,GAAS,OAASA,IAAoDhd,UAA1C/B,EAAM+e,EAAMnB,IAAKrd,EAAMyD,EAAO3C,IAChErB,EACEO,EAAMc,GAAS2C,EAGX+a,GAAS,OAASA,IAA6C,QAAnC/e,EAAM+e,EAAMnf,IAAKW,EAAMc,IACzDrB,EACAO,EAAMc,IAIT6uB,WACChe,UACCtS,IAAK,SAAUW,GACd,MAAOA,GAAKi2B,aAAc,aAAgBL,GAAW3rB,KAAMjK,EAAKuD,WAAcvD,EAAK0R,KAClF1R,EAAK2R,SACL,QAMC1T,EAAQ+2B,cACb72B,EAAOwxB,UAAU5d,UAChB1S,IAAK,SAAUW,GACd,GAAImM,GAASnM,EAAKmD,UAIlB,OAHKgJ,IAAUA,EAAOhJ,YACrBgJ,EAAOhJ,WAAW6O,cAEZ,QAKV7T,EAAOyB,MACN,WACA,WACA,YACA,cACA,cACA,UACA,UACA,SACA,cACA,mBACE,WACFzB,EAAOu3B,QAASp4B,KAAKkG,eAAkBlG,MAMxC,IAAI44B,IAAS,aAEb/3B,GAAOG,GAAGsC,QACTu1B,SAAU,SAAU1yB,GACnB,GAAI2yB,GAASp2B,EAAMuL,EAAK8qB,EAAO71B,EAAG81B,EACjCC,EAA2B,gBAAV9yB,IAAsBA,EACvCxD,EAAI,EACJM,EAAMjD,KAAK4B,MAEZ,IAAKf,EAAOkD,WAAYoC,GACvB,MAAOnG,MAAKsC,KAAK,SAAUY,GAC1BrC,EAAQb,MAAO64B,SAAU1yB,EAAMrE,KAAM9B,KAAMkD,EAAGlD,KAAKmP,aAIrD,IAAK8pB,EAIJ,IAFAH,GAAY3yB,GAAS,IAAK0F,MAAOqP,OAErBjY,EAAJN,EAASA,IAOhB,GANAD,EAAO1C,KAAM2C,GACbsL,EAAwB,IAAlBvL,EAAKuC,WAAoBvC,EAAKyM,WACjC,IAAMzM,EAAKyM,UAAY,KAAM7K,QAASs0B,GAAQ,KAChD,KAGU,CACV11B,EAAI,CACJ,OAAS61B,EAAQD,EAAQ51B,KACnB+K,EAAI3N,QAAS,IAAMy4B,EAAQ,KAAQ,IACvC9qB,GAAO8qB,EAAQ,IAKjBC,GAAan4B,EAAO2E,KAAMyI,GACrBvL,EAAKyM,YAAc6pB,IACvBt2B,EAAKyM,UAAY6pB,GAMrB,MAAOh5B,OAGRk5B,YAAa,SAAU/yB,GACtB,GAAI2yB,GAASp2B,EAAMuL,EAAK8qB,EAAO71B,EAAG81B,EACjCC,EAA+B,IAArBp2B,UAAUjB,QAAiC,gBAAVuE,IAAsBA,EACjExD,EAAI,EACJM,EAAMjD,KAAK4B,MAEZ,IAAKf,EAAOkD,WAAYoC,GACvB,MAAOnG,MAAKsC,KAAK,SAAUY,GAC1BrC,EAAQb,MAAOk5B,YAAa/yB,EAAMrE,KAAM9B,KAAMkD,EAAGlD,KAAKmP,aAGxD,IAAK8pB,EAGJ,IAFAH,GAAY3yB,GAAS,IAAK0F,MAAOqP,OAErBjY,EAAJN,EAASA,IAQhB,GAPAD,EAAO1C,KAAM2C,GAEbsL,EAAwB,IAAlBvL,EAAKuC,WAAoBvC,EAAKyM,WACjC,IAAMzM,EAAKyM,UAAY,KAAM7K,QAASs0B,GAAQ,KAChD,IAGU,CACV11B,EAAI,CACJ,OAAS61B,EAAQD,EAAQ51B,KAExB,MAAQ+K,EAAI3N,QAAS,IAAMy4B,EAAQ,MAAS,EAC3C9qB,EAAMA,EAAI3J,QAAS,IAAMy0B,EAAQ,IAAK,IAKxCC,GAAa7yB,EAAQtF,EAAO2E,KAAMyI,GAAQ,GACrCvL,EAAKyM,YAAc6pB,IACvBt2B,EAAKyM,UAAY6pB,GAMrB,MAAOh5B,OAGRm5B,YAAa,SAAUhzB,EAAOizB,GAC7B,GAAIx0B,SAAcuB,EAElB,OAAyB,iBAAbizB,IAAmC,WAATx0B,EAC9Bw0B,EAAWp5B,KAAK64B,SAAU1yB,GAAUnG,KAAKk5B,YAAa/yB,GAItDnG,KAAKsC,KADRzB,EAAOkD,WAAYoC,GACN,SAAUxD,GAC1B9B,EAAQb,MAAOm5B,YAAahzB,EAAMrE,KAAK9B,KAAM2C,EAAG3C,KAAKmP,UAAWiqB,GAAWA,IAI5D,WAChB,GAAc,WAATx0B,EAAoB,CAExB,GAAIuK,GACHxM,EAAI,EACJwW,EAAOtY,EAAQb,MACfq5B,EAAalzB,EAAM0F,MAAOqP,MAE3B,OAAS/L,EAAYkqB,EAAY12B,KAE3BwW,EAAKmgB,SAAUnqB,GACnBgK,EAAK+f,YAAa/pB,GAElBgK,EAAK0f,SAAU1pB,QAKNvK,IAASyd,GAAyB,YAATzd,KAC/B5E,KAAKmP,WAETkR,EAAUN,IAAK/f,KAAM,gBAAiBA,KAAKmP,WAO5CnP,KAAKmP,UAAYnP,KAAKmP,WAAahJ,KAAU,EAAQ,GAAKka,EAAUte,IAAK/B,KAAM,kBAAqB,OAKvGs5B,SAAU,SAAUx4B,GAInB,IAHA,GAAIqO,GAAY,IAAMrO,EAAW,IAChC6B,EAAI,EACJwX,EAAIna,KAAK4B,OACEuY,EAAJxX,EAAOA,IACd,GAA0B,IAArB3C,KAAK2C,GAAGsC,WAAmB,IAAMjF,KAAK2C,GAAGwM,UAAY,KAAK7K,QAAQs0B,GAAQ,KAAKt4B,QAAS6O,IAAe,EAC3G,OAAO,CAIT,QAAO,IAOT,IAAIoqB,IAAU,KAEd14B,GAAOG,GAAGsC,QACT0N,IAAK,SAAU7K,GACd,GAAI+a,GAAO/e,EAAK4B,EACfrB,EAAO1C,KAAK,EAEb,EAAA,GAAM6C,UAAUjB,OAsBhB,MAFAmC,GAAalD,EAAOkD,WAAYoC,GAEzBnG,KAAKsC,KAAK,SAAUK,GAC1B,GAAIqO,EAEmB,KAAlBhR,KAAKiF,WAKT+L,EADIjN,EACEoC,EAAMrE,KAAM9B,KAAM2C,EAAG9B,EAAQb,MAAOgR,OAEpC7K,EAIK,MAAP6K,EACJA,EAAM,GAEoB,gBAARA,GAClBA,GAAO,GAEInQ,EAAOoD,QAAS+M,KAC3BA,EAAMnQ,EAAO4B,IAAKuO,EAAK,SAAU7K,GAChC,MAAgB,OAATA,EAAgB,GAAKA,EAAQ,MAItC+a,EAAQrgB,EAAO24B,SAAUx5B,KAAK4E,OAAU/D,EAAO24B,SAAUx5B,KAAKiG,SAASC,eAGjEgb,GAAW,OAASA,IAA8Chd,SAApCgd,EAAMnB,IAAK/f,KAAMgR,EAAK,WACzDhR,KAAKmG,MAAQ6K,KAnDd,IAAKtO,EAGJ,MAFAwe,GAAQrgB,EAAO24B,SAAU92B,EAAKkC,OAAU/D,EAAO24B,SAAU92B,EAAKuD,SAASC,eAElEgb,GAAS,OAASA,IAAgDhd,UAAtC/B,EAAM+e,EAAMnf,IAAKW,EAAM,UAChDP,GAGRA,EAAMO,EAAKyD,MAEW,gBAARhE,GAEbA,EAAImC,QAAQi1B,GAAS,IAEd,MAAPp3B,EAAc,GAAKA,OA4CxBtB,EAAOyC,QACNk2B,UACCvQ,QACClnB,IAAK,SAAUW,GACd,GAAIsO,GAAMnQ,EAAO0O,KAAKwB,KAAMrO,EAAM,QAClC,OAAc,OAAPsO,EACNA,EAGAnQ,EAAO2E,KAAM3E,EAAO6E,KAAMhD,MAG7BkF,QACC7F,IAAK,SAAUW,GAYd,IAXA,GAAIyD,GAAO8iB,EACV1lB,EAAUb,EAAKa,QACf+W,EAAQ5X,EAAKgS,cACb4T,EAAoB,eAAd5lB,EAAKkC,MAAiC,EAAR0V,EACpC0D,EAASsK,EAAM,QACfuH,EAAMvH,EAAMhO,EAAQ,EAAI/W,EAAQ3B,OAChCe,EAAY,EAAR2X,EACHuV,EACAvH,EAAMhO,EAAQ,EAGJuV,EAAJltB,EAASA,IAIhB,GAHAsmB,EAAS1lB,EAASZ,MAGXsmB,EAAOxU,UAAY9R,IAAM2X,IAE5B3Z,EAAQg3B,YAAe1O,EAAO1U,SAAiD,OAAtC0U,EAAOrc,aAAc,cAC7Dqc,EAAOpjB,WAAW0O,UAAa1T,EAAOoF,SAAUgjB,EAAOpjB,WAAY,aAAiB,CAMxF,GAHAM,EAAQtF,EAAQooB,GAASjY,MAGpBsX,EACJ,MAAOniB,EAIR6X,GAAO3d,KAAM8F,GAIf,MAAO6X,IAGR+B,IAAK,SAAUrd,EAAMyD,GACpB,GAAIszB,GAAWxQ,EACd1lB,EAAUb,EAAKa,QACfya,EAASnd,EAAOwF,UAAWF,GAC3BxD,EAAIY,EAAQ3B,MAEb,OAAQe,IACPsmB,EAAS1lB,EAASZ,IACZsmB,EAAOxU,SAAW5T,EAAO2F,QAASyiB,EAAO9iB,MAAO6X,IAAY,KACjEyb,GAAY,EAQd,OAHMA,KACL/2B,EAAKgS,cAAgB,IAEfsJ,OAOXnd,EAAOyB,MAAO,QAAS,YAAc,WACpCzB,EAAO24B,SAAUx5B,OAChB+f,IAAK,SAAUrd,EAAMyD,GACpB,MAAKtF,GAAOoD,QAASkC,GACXzD,EAAK8R,QAAU3T,EAAO2F,QAAS3F,EAAO6B,GAAMsO,MAAO7K,IAAW,EADxE,SAKIxF,EAAQ82B,UACb52B,EAAO24B,SAAUx5B,MAAO+B,IAAM,SAAUW,GACvC,MAAsC,QAA/BA,EAAKkK,aAAa,SAAoB,KAAOlK,EAAKyD,UAW5DtF,EAAOyB,KAAM,0MAEqD+E,MAAM,KAAM,SAAU1E,EAAGa,GAG1F3C,EAAOG,GAAIwC,GAAS,SAAUyY,EAAMjb,GACnC,MAAO6B,WAAUjB,OAAS,EACzB5B,KAAKqoB,GAAI7kB,EAAM,KAAMyY,EAAMjb,GAC3BhB,KAAKukB,QAAS/gB,MAIjB3C,EAAOG,GAAGsC,QACTo2B,MAAO,SAAUC,EAAQC,GACxB,MAAO55B,MAAK6nB,WAAY8R,GAAS7R,WAAY8R,GAASD,IAGvDE,KAAM,SAAU7W,EAAO/G,EAAMjb,GAC5B,MAAOhB,MAAKqoB,GAAIrF,EAAO,KAAM/G,EAAMjb,IAEpC84B,OAAQ,SAAU9W,EAAOhiB,GACxB,MAAOhB,MAAK4e,IAAKoE,EAAO,KAAMhiB,IAG/B+4B,SAAU,SAAUj5B,EAAUkiB,EAAO/G,EAAMjb,GAC1C,MAAOhB,MAAKqoB,GAAIrF,EAAOliB,EAAUmb,EAAMjb,IAExCg5B,WAAY,SAAUl5B,EAAUkiB,EAAOhiB,GAEtC,MAA4B,KAArB6B,UAAUjB,OAAe5B,KAAK4e,IAAK9d,EAAU,MAASd,KAAK4e,IAAKoE,EAAOliB,GAAY,KAAME,KAKlG,IAAIi5B,IAAQp5B,EAAOsG,MAEf+yB,GAAS,IAMbr5B,GAAO6f,UAAY,SAAUzE,GAC5B,MAAOke,MAAKC,MAAOne,EAAO,KAK3Bpb,EAAOw5B,SAAW,SAAUpe,GAC3B,GAAIpJ,GAAK3L,CACT,KAAM+U,GAAwB,gBAATA,GACpB,MAAO,KAIR,KACC/U,EAAM,GAAIozB,WACVznB,EAAM3L,EAAIqzB,gBAAiBte,EAAM,YAChC,MAAQvQ,GACTmH,EAAM3O,OAMP,QAHM2O,GAAOA,EAAIrG,qBAAsB,eAAgB5K,SACtDf,EAAO2D,MAAO,gBAAkByX,GAE1BpJ,EAIR,IACC2nB,IAAQ,OACRC,GAAM,gBACNC,GAAW,6BAEXC,GAAiB,4DACjBC,GAAa,iBACbC,GAAY,QACZC,GAAO,4DAWPC,MAOAC,MAGAC,GAAW,KAAK76B,OAAQ,KAGxB86B,GAAen7B,EAAOgU,SAASK,KAG/B+mB,GAAeL,GAAKzuB,KAAM6uB,GAAah1B,kBAGxC,SAASk1B,IAA6BC,GAGrC,MAAO,UAAUC,EAAoB7e,GAED,gBAAvB6e,KACX7e,EAAO6e,EACPA,EAAqB,IAGtB,IAAIC,GACH54B,EAAI,EACJ64B,EAAYF,EAAmBp1B,cAAc2F,MAAOqP,MAErD,IAAKra,EAAOkD,WAAY0Y,GAEvB,MAAS8e,EAAWC,EAAU74B,KAER,MAAhB44B,EAAS,IACbA,EAAWA,EAASp7B,MAAO,IAAO,KACjCk7B,EAAWE,GAAaF,EAAWE,QAAkB3qB,QAAS6L,KAI9D4e,EAAWE,GAAaF,EAAWE,QAAkBl7B,KAAMoc,IAQjE,QAASgf,IAA+BJ,EAAW93B,EAASgyB,EAAiBmG,GAE5E,GAAIC,MACHC,EAAqBP,IAAcL,EAEpC,SAASa,GAASN,GACjB,GAAI9mB,EAYJ,OAXAknB,GAAWJ,IAAa,EACxB16B,EAAOyB,KAAM+4B,EAAWE,OAAkB,SAAUrwB,EAAG4wB,GACtD,GAAIC,GAAsBD,EAAoBv4B,EAASgyB,EAAiBmG,EACxE,OAAoC,gBAAxBK,IAAqCH,GAAqBD,EAAWI,GAIrEH,IACDnnB,EAAWsnB,GADf,QAHNx4B,EAAQi4B,UAAU5qB,QAASmrB,GAC3BF,EAASE,IACF,KAKFtnB,EAGR,MAAOonB,GAASt4B,EAAQi4B,UAAW,MAAUG,EAAW,MAASE,EAAS,KAM3E,QAASG,IAAYn4B,EAAQJ,GAC5B,GAAI6J,GAAKxJ,EACRm4B,EAAcp7B,EAAOq7B,aAAaD,eAEnC,KAAM3uB,IAAO7J,GACQS,SAAfT,EAAK6J,MACP2uB,EAAa3uB,GAAQzJ,EAAWC,IAASA,OAAgBwJ,GAAQ7J,EAAK6J,GAO1E,OAJKxJ,IACJjD,EAAOyC,QAAQ,EAAMO,EAAQC,GAGvBD,EAOR,QAASs4B,IAAqBC,EAAGV,EAAOW,GAEvC,GAAIC,GAAI13B,EAAM23B,EAAeC,EAC5B7iB,EAAWyiB,EAAEziB,SACb6hB,EAAYY,EAAEZ,SAGf,OAA2B,MAAnBA,EAAW,GAClBA,EAAUhuB,QACEtJ,SAAPo4B,IACJA,EAAKF,EAAEK,UAAYf,EAAMgB,kBAAkB,gBAK7C,IAAKJ,EACJ,IAAM13B,IAAQ+U,GACb,GAAKA,EAAU/U,IAAU+U,EAAU/U,GAAO+H,KAAM2vB,GAAO,CACtDd,EAAU5qB,QAAShM,EACnB,OAMH,GAAK42B,EAAW,IAAOa,GACtBE,EAAgBf,EAAW,OACrB,CAEN,IAAM52B,IAAQy3B,GAAY,CACzB,IAAMb,EAAW,IAAOY,EAAEO,WAAY/3B,EAAO,IAAM42B,EAAU,IAAO,CACnEe,EAAgB33B,CAChB,OAEK43B,IACLA,EAAgB53B,GAIlB23B,EAAgBA,GAAiBC,EAMlC,MAAKD,IACCA,IAAkBf,EAAW,IACjCA,EAAU5qB,QAAS2rB,GAEbF,EAAWE,IAJnB,OAWD,QAASK,IAAaR,EAAGS,EAAUnB,EAAOoB,GACzC,GAAIC,GAAOC,EAASC,EAAM/1B,EAAK2S,EAC9B8iB,KAEAnB,EAAYY,EAAEZ,UAAUr7B,OAGzB,IAAKq7B,EAAW,GACf,IAAMyB,IAAQb,GAAEO,WACfA,EAAYM,EAAK/2B,eAAkBk2B,EAAEO,WAAYM,EAInDD,GAAUxB,EAAUhuB,OAGpB,OAAQwvB,EAcP,GAZKZ,EAAEc,eAAgBF,KACtBtB,EAAOU,EAAEc,eAAgBF,IAAcH,IAIlChjB,GAAQijB,GAAaV,EAAEe,aAC5BN,EAAWT,EAAEe,WAAYN,EAAUT,EAAEb,WAGtC1hB,EAAOmjB,EACPA,EAAUxB,EAAUhuB,QAKnB,GAAiB,MAAZwvB,EAEJA,EAAUnjB,MAGJ,IAAc,MAATA,GAAgBA,IAASmjB,EAAU,CAM9C,GAHAC,EAAON,EAAY9iB,EAAO,IAAMmjB,IAAaL,EAAY,KAAOK,IAG1DC,EACL,IAAMF,IAASJ,GAId,GADAz1B,EAAM61B,EAAM11B,MAAO,KACdH,EAAK,KAAQ81B,IAGjBC,EAAON,EAAY9iB,EAAO,IAAM3S,EAAK,KACpCy1B,EAAY,KAAOz1B,EAAK,KACb,CAEN+1B,KAAS,EACbA,EAAON,EAAYI,GAGRJ,EAAYI,MAAY,IACnCC,EAAU91B,EAAK,GACfs0B,EAAU5qB,QAAS1J,EAAK,IAEzB,OAOJ,GAAK+1B,KAAS,EAGb,GAAKA,GAAQb,EAAG,UACfS,EAAWI,EAAMJ,OAEjB,KACCA,EAAWI,EAAMJ,GAChB,MAAQnxB,GACT,OAASiR,MAAO,cAAenY,MAAOy4B,EAAOvxB,EAAI,sBAAwBmO,EAAO,OAASmjB,IAQ/F,OAASrgB,MAAO,UAAWV,KAAM4gB,GAGlCh8B,EAAOyC,QAGN85B,OAAQ,EAGRC,gBACAC,QAEApB,cACCqB,IAAKrC,GACLt2B,KAAM,MACN44B,QAAS7C,GAAehuB,KAAMwuB,GAAc,IAC5C37B,QAAQ,EACRi+B,aAAa,EACbC,OAAO,EACPC,YAAa,mDAabhe,SACC+T,IAAKuH,GACLv1B,KAAM,aACNmmB,KAAM,YACNhZ,IAAK,4BACL+qB,KAAM,qCAGPjkB,UACC9G,IAAK,MACLgZ,KAAM,OACN+R,KAAM,QAGPV,gBACCrqB,IAAK,cACLnN,KAAM,eACNk4B,KAAM,gBAKPjB,YAGCkB,SAAUvyB,OAGVwyB,aAAa,EAGbC,YAAal9B,EAAO6f,UAGpBsd,WAAYn9B,EAAOw5B,UAOpB4B,aACCsB,KAAK,EACLx8B,SAAS,IAOXk9B,UAAW,SAAUp6B,EAAQq6B,GAC5B,MAAOA,GAGNlC,GAAYA,GAAYn4B,EAAQhD,EAAOq7B,cAAgBgC,GAGvDlC,GAAYn7B,EAAOq7B,aAAcr4B,IAGnCs6B,cAAe/C,GAA6BL,IAC5CqD,cAAehD,GAA6BJ,IAG5CqD,KAAM,SAAUd,EAAKh6B,GAGA,gBAARg6B,KACXh6B,EAAUg6B,EACVA,EAAMr5B,QAIPX,EAAUA,KAEV,IAAI+6B,GAEHC,EAEAC,EACAC,EAEAC,EAEA3M,EAEA4M,EAEAh8B,EAEAy5B,EAAIv7B,EAAOo9B,aAAe16B,GAE1Bq7B,EAAkBxC,EAAEr7B,SAAWq7B,EAE/ByC,EAAqBzC,EAAEr7B,UAAa69B,EAAgB35B,UAAY25B,EAAgBl9B,QAC/Eb,EAAQ+9B,GACR/9B,EAAOkiB,MAERjG,EAAWjc,EAAO2b,WAClBsiB,EAAmBj+B,EAAO0a,UAAU,eAEpCwjB,EAAa3C,EAAE2C,eAEfC,KACAC,KAEAtiB,EAAQ,EAERuiB,EAAW,WAEXxD,GACC3c,WAAY,EAGZ2d,kBAAmB,SAAUpvB,GAC5B,GAAIzB,EACJ,IAAe,IAAV8Q,EAAc,CAClB,IAAM8hB,EAAkB,CACvBA,IACA,OAAS5yB,EAAQ6uB,GAASruB,KAAMmyB,GAC/BC,EAAiB5yB,EAAM,GAAG3F,eAAkB2F,EAAO,GAGrDA,EAAQ4yB,EAAiBnxB,EAAIpH,eAE9B,MAAgB,OAAT2F,EAAgB,KAAOA,GAI/BszB,sBAAuB,WACtB,MAAiB,KAAVxiB,EAAc6hB,EAAwB,MAI9CY,iBAAkB,SAAU57B,EAAM2C,GACjC,GAAIk5B,GAAQ77B,EAAK0C,aAKjB,OAJMyW,KACLnZ,EAAOy7B,EAAqBI,GAAUJ,EAAqBI,IAAW77B,EACtEw7B,EAAgBx7B,GAAS2C,GAEnBnG,MAIRs/B,iBAAkB,SAAU16B,GAI3B,MAHM+X,KACLyf,EAAEK,SAAW73B,GAEP5E,MAIR++B,WAAY,SAAUt8B,GACrB,GAAI2C,EACJ,IAAK3C,EACJ,GAAa,EAARka,EACJ,IAAMvX,IAAQ3C,GAEbs8B,EAAY35B,IAAW25B,EAAY35B,GAAQ3C,EAAK2C,QAIjDs2B,GAAM7e,OAAQpa,EAAKi5B,EAAM6D,QAG3B,OAAOv/B,OAIRw/B,MAAO,SAAUC,GAChB,GAAIC,GAAYD,GAAcP,CAK9B,OAJKZ,IACJA,EAAUkB,MAAOE,GAElBl3B,EAAM,EAAGk3B,GACF1/B,MAyCV,IApCA8c,EAASF,QAAS8e,GAAQ/F,SAAWmJ,EAAiBtkB,IACtDkhB,EAAMiE,QAAUjE,EAAMlzB,KACtBkzB,EAAMl3B,MAAQk3B,EAAM3e,KAMpBqf,EAAEmB,MAAUA,GAAOnB,EAAEmB,KAAOrC,IAAiB,IAAK52B,QAASk2B,GAAO,IAChEl2B,QAASu2B,GAAWM,GAAc,GAAM,MAG1CiB,EAAEx3B,KAAOrB,EAAQq8B,QAAUr8B,EAAQqB,MAAQw3B,EAAEwD,QAAUxD,EAAEx3B,KAGzDw3B,EAAEZ,UAAY36B,EAAO2E,KAAM42B,EAAEb,UAAY,KAAMr1B,cAAc2F,MAAOqP,KAAiB,IAG/D,MAAjBkhB,EAAEyD,cACN9N,EAAQ+I,GAAKzuB,KAAM+vB,EAAEmB,IAAIr3B,eACzBk2B,EAAEyD,eAAkB9N,GACjBA,EAAO,KAAQoJ,GAAc,IAAOpJ,EAAO,KAAQoJ,GAAc,KAChEpJ,EAAO,KAAwB,UAAfA,EAAO,GAAkB,KAAO,WAC/CoJ,GAAc,KAA+B,UAAtBA,GAAc,GAAkB,KAAO,UAK/DiB,EAAEngB,MAAQmgB,EAAEqB,aAAiC,gBAAXrB,GAAEngB,OACxCmgB,EAAEngB,KAAOpb,EAAOi/B,MAAO1D,EAAEngB,KAAMmgB,EAAE2D,cAIlCtE,GAA+BV,GAAYqB,EAAG74B,EAASm4B,GAGxC,IAAV/e,EACJ,MAAO+e,EAKRiD,GAAc99B,EAAOkiB,OAASqZ,EAAE58B,OAG3Bm/B,GAAmC,IAApB99B,EAAOu8B,UAC1Bv8B,EAAOkiB,MAAMwB,QAAQ,aAItB6X,EAAEx3B,KAAOw3B,EAAEx3B,KAAKpD,cAGhB46B,EAAE4D,YAAcpF,GAAWjuB,KAAMyvB,EAAEx3B,MAInC25B,EAAWnC,EAAEmB,IAGPnB,EAAE4D,aAGF5D,EAAEngB,OACNsiB,EAAanC,EAAEmB,MAASrD,GAAOvtB,KAAM4xB,GAAa,IAAM,KAAQnC,EAAEngB,WAE3DmgB,GAAEngB,MAILmgB,EAAE/uB,SAAU,IAChB+uB,EAAEmB,IAAM9C,GAAI9tB,KAAM4xB,GAGjBA,EAASj6B,QAASm2B,GAAK,OAASR,MAGhCsE,GAAarE,GAAOvtB,KAAM4xB,GAAa,IAAM,KAAQ,KAAOtE,OAK1DmC,EAAE6D,aACDp/B,EAAOw8B,aAAckB,IACzB7C,EAAM0D,iBAAkB,oBAAqBv+B,EAAOw8B,aAAckB,IAE9D19B,EAAOy8B,KAAMiB,IACjB7C,EAAM0D,iBAAkB,gBAAiBv+B,EAAOy8B,KAAMiB,MAKnDnC,EAAEngB,MAAQmgB,EAAE4D,YAAc5D,EAAEuB,eAAgB,GAASp6B,EAAQo6B,cACjEjC,EAAM0D,iBAAkB,eAAgBhD,EAAEuB,aAI3CjC,EAAM0D,iBACL,SACAhD,EAAEZ,UAAW,IAAOY,EAAEzc,QAASyc,EAAEZ,UAAU,IAC1CY,EAAEzc,QAASyc,EAAEZ,UAAU,KAA8B,MAArBY,EAAEZ,UAAW,GAAc,KAAOP,GAAW,WAAa,IAC1FmB,EAAEzc,QAAS,KAIb,KAAMhd,IAAKy5B,GAAE8D,QACZxE,EAAM0D,iBAAkBz8B,EAAGy5B,EAAE8D,QAASv9B,GAIvC,IAAKy5B,EAAE+D,aAAgB/D,EAAE+D,WAAWr+B,KAAM88B,EAAiBlD,EAAOU,MAAQ,GAAmB,IAAVzf,GAElF,MAAO+e,GAAM8D,OAIdN,GAAW,OAGX,KAAMv8B,KAAOg9B,QAAS,EAAGn7B,MAAO,EAAGmxB,SAAU,GAC5C+F,EAAO/4B,GAAKy5B,EAAGz5B,GAOhB,IAHA27B,EAAY7C,GAA+BT,GAAYoB,EAAG74B,EAASm4B,GAK5D,CACNA,EAAM3c,WAAa,EAGd4f,GACJE,EAAmBta,QAAS,YAAcmX,EAAOU,IAG7CA,EAAEsB,OAAStB,EAAE7E,QAAU,IAC3BmH,EAAe1f,WAAW,WACzB0c,EAAM8D,MAAM,YACVpD,EAAE7E,SAGN,KACC5a,EAAQ,EACR2hB,EAAU8B,KAAMpB,EAAgBx2B,GAC/B,MAAQkD,GAET,KAAa,EAARiR,GAIJ,KAAMjR,EAHNlD,GAAM,GAAIkD,QArBZlD,GAAM,GAAI,eA8BX,SAASA,GAAM+2B,EAAQc,EAAkBhE,EAAW6D,GACnD,GAAIpD,GAAW6C,EAASn7B,EAAOq4B,EAAUyD,EACxCb,EAAaY,CAGC,KAAV1jB,IAKLA,EAAQ,EAGH+hB,GACJlH,aAAckH,GAKfJ,EAAYp6B,OAGZs6B,EAAwB0B,GAAW,GAGnCxE,EAAM3c,WAAawgB,EAAS,EAAI,EAAI,EAGpCzC,EAAYyC,GAAU,KAAgB,IAATA,GAA2B,MAAXA,EAGxClD,IACJQ,EAAWV,GAAqBC,EAAGV,EAAOW,IAI3CQ,EAAWD,GAAaR,EAAGS,EAAUnB,EAAOoB,GAGvCA,GAGCV,EAAE6D,aACNK,EAAW5E,EAAMgB,kBAAkB,iBAC9B4D,IACJz/B,EAAOw8B,aAAckB,GAAa+B,GAEnCA,EAAW5E,EAAMgB,kBAAkB,QAC9B4D,IACJz/B,EAAOy8B,KAAMiB,GAAa+B,IAKZ,MAAXf,GAA6B,SAAXnD,EAAEx3B,KACxB66B,EAAa,YAGS,MAAXF,EACXE,EAAa,eAIbA,EAAa5C,EAASlgB,MACtBgjB,EAAU9C,EAAS5gB,KACnBzX,EAAQq4B,EAASr4B,MACjBs4B,GAAat4B,KAIdA,EAAQi7B,GACHF,IAAWE,KACfA,EAAa,QACC,EAATF,IACJA,EAAS,KAMZ7D,EAAM6D,OAASA,EACf7D,EAAM+D,YAAeY,GAAoBZ,GAAe,GAGnD3C,EACJhgB,EAASqB,YAAaygB,GAAmBe,EAASF,EAAY/D,IAE9D5e,EAAS2Y,WAAYmJ,GAAmBlD,EAAO+D,EAAYj7B,IAI5Dk3B,EAAMqD,WAAYA,GAClBA,EAAa76B,OAERy6B,GACJE,EAAmBta,QAASuY,EAAY,cAAgB,aACrDpB,EAAOU,EAAGU,EAAY6C,EAAUn7B,IAIpCs6B,EAAiBviB,SAAUqiB,GAAmBlD,EAAO+D,IAEhDd,IACJE,EAAmBta,QAAS,gBAAkBmX,EAAOU,MAE3Cv7B,EAAOu8B,QAChBv8B,EAAOkiB,MAAMwB,QAAQ,cAKxB,MAAOmX,IAGR6E,QAAS,SAAUhD,EAAKthB,EAAM1Z,GAC7B,MAAO1B,GAAOkB,IAAKw7B,EAAKthB,EAAM1Z,EAAU,SAGzCi+B,UAAW,SAAUjD,EAAKh7B,GACzB,MAAO1B,GAAOkB,IAAKw7B,EAAKr5B,OAAW3B,EAAU,aAI/C1B,EAAOyB,MAAQ,MAAO,QAAU,SAAUK,EAAGi9B,GAC5C/+B,EAAQ++B,GAAW,SAAUrC,EAAKthB,EAAM1Z,EAAUqC,GAQjD,MANK/D,GAAOkD,WAAYkY,KACvBrX,EAAOA,GAAQrC,EACfA,EAAW0Z,EACXA,EAAO/X,QAGDrD,EAAOw9B,MACbd,IAAKA,EACL34B,KAAMg7B,EACNrE,SAAU32B,EACVqX,KAAMA,EACN0jB,QAASp9B,OAMZ1B,EAAOsrB,SAAW,SAAUoR,GAC3B,MAAO18B,GAAOw9B,MACbd,IAAKA,EACL34B,KAAM,MACN22B,SAAU,SACVmC,OAAO,EACPl+B,QAAQ,EACRihC,UAAU,KAKZ5/B,EAAOG,GAAGsC,QACTo9B,QAAS,SAAU7U,GAClB,GAAIX,EAEJ,OAAKrqB,GAAOkD,WAAY8nB,GAChB7rB,KAAKsC,KAAK,SAAUK,GAC1B9B,EAAQb,MAAO0gC,QAAS7U,EAAK/pB,KAAK9B,KAAM2C,OAIrC3C,KAAM,KAGVkrB,EAAOrqB,EAAQgrB,EAAM7rB,KAAM,GAAIoM,eAAgBrJ,GAAI,GAAIa,OAAO,GAEzD5D,KAAM,GAAI6F,YACdqlB,EAAKO,aAAczrB,KAAM,IAG1BkrB,EAAKzoB,IAAI,WACR,GAAIC,GAAO1C,IAEX,OAAQ0C,EAAKi+B,kBACZj+B,EAAOA,EAAKi+B,iBAGb,OAAOj+B,KACL4oB,OAAQtrB,OAGLA,OAGR4gC,UAAW,SAAU/U,GACpB,MACQ7rB,MAAKsC,KADRzB,EAAOkD,WAAY8nB,GACN,SAAUlpB,GAC1B9B,EAAQb,MAAO4gC,UAAW/U,EAAK/pB,KAAK9B,KAAM2C,KAI3B,WAChB,GAAIwW,GAAOtY,EAAQb,MAClB2Z,EAAWR,EAAKQ,UAEZA,GAAS/X,OACb+X,EAAS+mB,QAAS7U,GAGlB1S,EAAKmS,OAAQO,MAKhBX,KAAM,SAAUW,GACf,GAAI9nB,GAAalD,EAAOkD,WAAY8nB,EAEpC,OAAO7rB,MAAKsC,KAAK,SAAUK,GAC1B9B,EAAQb,MAAO0gC,QAAS38B,EAAa8nB,EAAK/pB,KAAK9B,KAAM2C,GAAKkpB,MAI5DgV,OAAQ,WACP,MAAO7gC,MAAK6O,SAASvM,KAAK,WACnBzB,EAAOoF,SAAUjG,KAAM,SAC5Ba,EAAQb,MAAO8rB,YAAa9rB,KAAKyL,cAEhCtI,SAKLtC,EAAOgQ,KAAK4E,QAAQ+a,OAAS,SAAU9tB,GAGtC,MAAOA,GAAK0tB,aAAe,GAAK1tB,EAAK2tB,cAAgB,GAEtDxvB,EAAOgQ,KAAK4E,QAAQqrB,QAAU,SAAUp+B,GACvC,OAAQ7B,EAAOgQ,KAAK4E,QAAQ+a,OAAQ9tB,GAMrC,IAAIq+B,IAAM,OACTC,GAAW,QACXC,GAAQ,SACRC,GAAkB,wCAClBC,GAAe,oCAEhB,SAASC,IAAazP,EAAQhtB,EAAKo7B,EAAavlB,GAC/C,GAAIhX,EAEJ,IAAK3C,EAAOoD,QAASU,GAEpB9D,EAAOyB,KAAMqC,EAAK,SAAUhC,EAAG0+B,GACzBtB,GAAeiB,GAASr0B,KAAMglB,GAElCnX,EAAKmX,EAAQ0P,GAIbD,GAAazP,EAAS,KAAqB,gBAAN0P,GAAiB1+B,EAAI,IAAO,IAAK0+B,EAAGtB,EAAavlB,SAIlF,IAAMulB,GAAsC,WAAvBl/B,EAAO+D,KAAMD,GAQxC6V,EAAKmX,EAAQhtB,OANb,KAAMnB,IAAQmB,GACby8B,GAAazP,EAAS,IAAMnuB,EAAO,IAAKmB,EAAKnB,GAAQu8B,EAAavlB,GAWrE3Z,EAAOi/B,MAAQ,SAAUh3B,EAAGi3B,GAC3B,GAAIpO,GACHyK,KACA5hB,EAAM,SAAUlN,EAAKnH,GAEpBA,EAAQtF,EAAOkD,WAAYoC,GAAUA,IAAqB,MAATA,EAAgB,GAAKA,EACtEi2B,EAAGA,EAAEx6B,QAAW0/B,mBAAoBh0B,GAAQ,IAAMg0B,mBAAoBn7B,GASxE,IALqBjC,SAAhB67B,IACJA,EAAcl/B,EAAOq7B,cAAgBr7B,EAAOq7B,aAAa6D,aAIrDl/B,EAAOoD,QAAS6E,IAASA,EAAEpH,SAAWb,EAAOmD,cAAe8E,GAEhEjI,EAAOyB,KAAMwG,EAAG,WACf0R,EAAKxa,KAAKwD,KAAMxD,KAAKmG,aAMtB,KAAMwrB,IAAU7oB,GACfs4B,GAAazP,EAAQ7oB,EAAG6oB,GAAUoO,EAAavlB,EAKjD,OAAO4hB,GAAEpvB,KAAM,KAAM1I,QAASy8B,GAAK,MAGpClgC,EAAOG,GAAGsC,QACTi+B,UAAW,WACV,MAAO1gC,GAAOi/B,MAAO9/B,KAAKwhC,mBAE3BA,eAAgB,WACf,MAAOxhC,MAAKyC,IAAI,WAEf,GAAIqO,GAAWjQ,EAAOmf,KAAMhgB,KAAM,WAClC,OAAO8Q,GAAWjQ,EAAOwF,UAAWyK,GAAa9Q,OAEjDwP,OAAO,WACP,GAAI5K,GAAO5E,KAAK4E,IAGhB,OAAO5E,MAAKwD,OAAS3C,EAAQb,MAAOoZ,GAAI,cACvC+nB,GAAax0B,KAAM3M,KAAKiG,YAAei7B,GAAgBv0B,KAAM/H,KAC3D5E,KAAKwU,UAAYuN,EAAepV,KAAM/H,MAEzCnC,IAAI,SAAUE,EAAGD,GACjB,GAAIsO,GAAMnQ,EAAQb,MAAOgR,KAEzB,OAAc,OAAPA,EACN,KACAnQ,EAAOoD,QAAS+M,GACfnQ,EAAO4B,IAAKuO,EAAK,SAAUA,GAC1B,OAASxN,KAAMd,EAAKc,KAAM2C,MAAO6K,EAAI1M,QAAS28B,GAAO,YAEpDz9B,KAAMd,EAAKc,KAAM2C,MAAO6K,EAAI1M,QAAS28B,GAAO,WAC9Cl/B,SAKLlB,EAAOq7B,aAAauF,IAAM,WACzB,IACC,MAAO,IAAIC,gBACV,MAAOh2B,KAGV,IAAIi2B,IAAQ,EACXC,MACAC,IAEC,EAAG,IAGHC,KAAM,KAEPC,GAAelhC,EAAOq7B,aAAauF,KAK/B1hC,GAAOmP,aACXnP,EAAOmP,YAAa,WAAY,WAC/B,IAAM,GAAI5B,KAAOs0B,IAChBA,GAAct0B,OAKjB3M,EAAQqhC,OAASD,IAAkB,mBAAqBA,IACxDphC,EAAQ09B,KAAO0D,KAAiBA,GAEhClhC,EAAOu9B,cAAc,SAAU76B,GAC9B,GAAIhB,EAGJ,OAAK5B,GAAQqhC,MAAQD,KAAiBx+B,EAAQs8B,aAE5CO,KAAM,SAAUF,EAASvK,GACxB,GAAIhzB,GACH8+B,EAAMl+B,EAAQk+B,MACdl1B,IAAOo1B,EAKR,IAHAF,EAAIQ,KAAM1+B,EAAQqB,KAAMrB,EAAQg6B,IAAKh6B,EAAQm6B,MAAOn6B,EAAQ2+B,SAAU3+B,EAAQ8R,UAGzE9R,EAAQ4+B,UACZ,IAAMx/B,IAAKY,GAAQ4+B,UAClBV,EAAK9+B,GAAMY,EAAQ4+B,UAAWx/B,EAK3BY,GAAQk5B,UAAYgF,EAAInC,kBAC5BmC,EAAInC,iBAAkB/7B,EAAQk5B,UAQzBl5B,EAAQs8B,aAAgBK,EAAQ,sBACrCA,EAAQ,oBAAsB,iBAI/B,KAAMv9B,IAAKu9B,GACVuB,EAAIrC,iBAAkBz8B,EAAGu9B,EAASv9B,GAInCJ,GAAW,SAAUqC,GACpB,MAAO,YACDrC,UACGq/B,IAAcr1B,GACrBhK,EAAWk/B,EAAIW,OAASX,EAAIY,QAAU,KAExB,UAATz9B,EACJ68B,EAAIjC,QACgB,UAAT56B,EACX+wB,EAEC8L,EAAIlC,OACJkC,EAAIhC,YAGL9J,EACCkM,GAAkBJ,EAAIlC,SAAYkC,EAAIlC,OACtCkC,EAAIhC,WAIwB,gBAArBgC,GAAIa,cACV58B,KAAM+7B,EAAIa,cACPp+B,OACJu9B,EAAItC,4BAQTsC,EAAIW,OAAS7/B,IACbk/B,EAAIY,QAAU9/B,EAAS,SAGvBA,EAAWq/B,GAAcr1B,GAAOhK,EAAS,QAEzC,KAECk/B,EAAIrB,KAAM78B,EAAQy8B,YAAcz8B,EAAQ0Y,MAAQ,MAC/C,MAAQvQ,GAET,GAAKnJ,EACJ,KAAMmJ,KAKT8zB,MAAO,WACDj9B,GACJA,MAvFJ,SAkGD1B,EAAOo9B,WACNte,SACCta,OAAQ,6FAETsU,UACCtU,OAAQ,uBAETs3B,YACC4F,cAAe,SAAU78B,GAExB,MADA7E,GAAOsE,WAAYO,GACZA,MAMV7E,EAAOs9B,cAAe,SAAU,SAAU/B,GACxBl4B,SAAZk4B,EAAE/uB,QACN+uB,EAAE/uB,OAAQ,GAEN+uB,EAAEyD,cACNzD,EAAEx3B,KAAO,SAKX/D,EAAOu9B,cAAe,SAAU,SAAUhC,GAEzC,GAAKA,EAAEyD,YAAc,CACpB,GAAIx6B,GAAQ9C,CACZ,QACC69B,KAAM,SAAUl1B,EAAGyqB,GAClBtwB,EAASxE,EAAO,YAAYmf,MAC3B0d,OAAO,EACP8E,QAASpG,EAAEqG,cACXh/B,IAAK24B,EAAEmB,MACLlV,GACF,aACA9lB,EAAW,SAAUmgC,GACpBr9B,EAAO+W,SACP7Z,EAAW,KACNmgC,GACJ/M,EAAuB,UAAb+M,EAAI99B,KAAmB,IAAM,IAAK89B,EAAI99B,QAInDhF,EAAS+F,KAAKC,YAAaP,EAAQ,KAEpCm6B,MAAO,WACDj9B,GACJA,QAUL,IAAIogC,OACHC,GAAS,mBAGV/hC,GAAOo9B,WACN4E,MAAO,WACPC,cAAe,WACd,GAAIvgC,GAAWogC,GAAa15B,OAAWpI,EAAOsD,QAAU,IAAQ81B,IAEhE,OADAj6B,MAAMuC,IAAa,EACZA,KAKT1B,EAAOs9B,cAAe,aAAc,SAAU/B,EAAG2G,EAAkBrH,GAElE,GAAIsH,GAAcC,EAAaC,EAC9BC,EAAW/G,EAAEyG,SAAU,IAAWD,GAAOj2B,KAAMyvB,EAAEmB,KAChD,MACkB,gBAAXnB,GAAEngB,QAAwBmgB,EAAEuB,aAAe,IAAKr9B,QAAQ,sCAAwCsiC,GAAOj2B,KAAMyvB,EAAEngB,OAAU,OAIlI,OAAKknB,IAAiC,UAArB/G,EAAEZ,UAAW,IAG7BwH,EAAe5G,EAAE0G,cAAgBjiC,EAAOkD,WAAYq4B,EAAE0G,eACrD1G,EAAE0G,gBACF1G,EAAE0G,cAGEK,EACJ/G,EAAG+G,GAAa/G,EAAG+G,GAAW7+B,QAASs+B,GAAQ,KAAOI,GAC3C5G,EAAEyG,SAAU,IACvBzG,EAAEmB,MAASrD,GAAOvtB,KAAMyvB,EAAEmB,KAAQ,IAAM,KAAQnB,EAAEyG,MAAQ,IAAMG,GAIjE5G,EAAEO,WAAW,eAAiB,WAI7B,MAHMuG,IACLriC,EAAO2D,MAAOw+B,EAAe,mBAEvBE,EAAmB,IAI3B9G,EAAEZ,UAAW,GAAM,OAGnByH,EAAcljC,EAAQijC,GACtBjjC,EAAQijC,GAAiB,WACxBE,EAAoBrgC,WAIrB64B,EAAM7e,OAAO,WAEZ9c,EAAQijC,GAAiBC,EAGpB7G,EAAG4G,KAEP5G,EAAE0G,cAAgBC,EAAiBD,cAGnCH,GAAatiC,KAAM2iC,IAIfE,GAAqBriC,EAAOkD,WAAYk/B,IAC5CA,EAAaC,EAAmB,IAGjCA,EAAoBD,EAAc/+B,SAI5B,UAtDR,SAgEDrD,EAAOyY,UAAY,SAAU2C,EAAMlb,EAASqiC,GAC3C,IAAMnnB,GAAwB,gBAATA,GACpB,MAAO,KAEgB,kBAAZlb,KACXqiC,EAAcriC,EACdA,GAAU,GAEXA,EAAUA,GAAWnB,CAErB,IAAIyjC,GAAStqB,EAAW1M,KAAM4P,GAC7B+O,GAAWoY,KAGZ,OAAKC,IACKtiC,EAAQ0E,cAAe49B,EAAO,MAGxCA,EAASxiC,EAAOkqB,eAAiB9O,GAAQlb,EAASiqB,GAE7CA,GAAWA,EAAQppB,QACvBf,EAAQmqB,GAAU5O,SAGZvb,EAAOuB,SAAWihC,EAAO53B,aAKjC,IAAI63B,IAAQziC,EAAOG,GAAGkmB,IAKtBrmB,GAAOG,GAAGkmB,KAAO,SAAUqW,EAAKgG,EAAQhhC,GACvC,GAAoB,gBAARg7B,IAAoB+F,GAC/B,MAAOA,IAAM1gC,MAAO5C,KAAM6C,UAG3B,IAAI/B,GAAU8D,EAAMi4B,EACnB1jB,EAAOnZ,KACP4e,EAAM2e,EAAIj9B,QAAQ,IA+CnB,OA7CKse,IAAO,IACX9d,EAAWD,EAAO2E,KAAM+3B,EAAIp9B,MAAOye,IACnC2e,EAAMA,EAAIp9B,MAAO,EAAGye,IAIhB/d,EAAOkD,WAAYw/B,IAGvBhhC,EAAWghC,EACXA,EAASr/B,QAGEq/B,GAA4B,gBAAXA,KAC5B3+B,EAAO,QAIHuU,EAAKvX,OAAS,GAClBf,EAAOw9B,MACNd,IAAKA,EAGL34B,KAAMA,EACN22B,SAAU,OACVtf,KAAMsnB,IACJ/6B,KAAK,SAAU85B,GAGjBzF,EAAWh6B,UAEXsW,EAAK0S,KAAM/qB,EAIVD,EAAO,SAASyqB,OAAQzqB,EAAOyY,UAAWgpB,IAAiB/yB,KAAMzO,GAGjEwhC,KAEC3M,SAAUpzB,GAAY,SAAUm5B,EAAO6D,GACzCpmB,EAAK7W,KAAMC,EAAUs6B,IAAcnB,EAAM4G,aAAc/C,EAAQ7D,MAI1D17B,MAORa,EAAOyB,MAAQ,YAAa,WAAY,eAAgB,YAAa,cAAe,YAAc,SAAUK,EAAGiC,GAC9G/D,EAAOG,GAAI4D,GAAS,SAAU5D,GAC7B,MAAOhB,MAAKqoB,GAAIzjB,EAAM5D,MAOxBH,EAAOgQ,KAAK4E,QAAQ+tB,SAAW,SAAU9gC,GACxC,MAAO7B,GAAO6F,KAAK7F,EAAO21B,OAAQ,SAAUx1B,GAC3C,MAAO0B,KAAS1B,EAAG0B,OACjBd,OAMJ,IAAIqG,IAAUlI,EAAOH,SAAS8O,eAK9B,SAAS+0B,IAAW/gC,GACnB,MAAO7B,GAAOiE,SAAUpC,GAASA,EAAyB,IAAlBA,EAAKuC,UAAkBvC,EAAKqM,YAGrElO,EAAO6iC,QACNC,UAAW,SAAUjhC,EAAMa,EAASZ,GACnC,GAAIihC,GAAaC,EAASC,EAAWC,EAAQC,EAAWC,EAAYC,EACnEhV,EAAWruB,EAAOihB,IAAKpf,EAAM,YAC7ByhC,EAAUtjC,EAAQ6B,GAClBojB,IAGiB,YAAboJ,IACJxsB,EAAKkqB,MAAMsC,SAAW,YAGvB8U,EAAYG,EAAQT,SACpBI,EAAYjjC,EAAOihB,IAAKpf,EAAM,OAC9BuhC,EAAapjC,EAAOihB,IAAKpf,EAAM,QAC/BwhC,GAAmC,aAAbhV,GAAwC,UAAbA,KAC9C4U,EAAYG,GAAa3jC,QAAQ,QAAU,GAIzC4jC,GACJN,EAAcO,EAAQjV,WACtB6U,EAASH,EAAY50B,IACrB60B,EAAUD,EAAYQ,OAGtBL,EAAS/+B,WAAY8+B,IAAe,EACpCD,EAAU7+B,WAAYi/B,IAAgB,GAGlCpjC,EAAOkD,WAAYR,KACvBA,EAAUA,EAAQzB,KAAMY,EAAMC,EAAGqhC,IAGd,MAAfzgC,EAAQyL,MACZ8W,EAAM9W,IAAQzL,EAAQyL,IAAMg1B,EAAUh1B,IAAQ+0B,GAE1B,MAAhBxgC,EAAQ6gC,OACZte,EAAMse,KAAS7gC,EAAQ6gC,KAAOJ,EAAUI,KAASP,GAG7C,SAAWtgC,GACfA,EAAQ8gC,MAAMviC,KAAMY,EAAMojB,GAG1Bqe,EAAQriB,IAAKgE,KAKhBjlB,EAAOG,GAAGsC,QACTogC,OAAQ,SAAUngC,GACjB,GAAKV,UAAUjB,OACd,MAAmBsC,UAAZX,EACNvD,KACAA,KAAKsC,KAAK,SAAUK,GACnB9B,EAAO6iC,OAAOC,UAAW3jC,KAAMuD,EAASZ,IAI3C,IAAIsF,GAASq8B,EACZ5hC,EAAO1C,KAAM,GACbukC,GAAQv1B,IAAK,EAAGo1B,KAAM,GACtBt1B,EAAMpM,GAAQA,EAAK0J,aAEpB,IAAM0C,EAON,MAHA7G,GAAU6G,EAAIJ,gBAGR7N,EAAOwH,SAAUJ,EAASvF,UAMpBA,GAAK8hC,wBAA0BniB,IAC1CkiB,EAAM7hC,EAAK8hC,yBAEZF,EAAMb,GAAW30B,IAEhBE,IAAKu1B,EAAIv1B,IAAMs1B,EAAIG,YAAcx8B,EAAQ8e,UACzCqd,KAAMG,EAAIH,KAAOE,EAAII,YAAcz8B,EAAQ0e,aAXpC4d,GAeTrV,SAAU,WACT,GAAMlvB,KAAM,GAAZ,CAIA,GAAI2kC,GAAcjB,EACjBhhC,EAAO1C,KAAM,GACb4kC,GAAiB51B,IAAK,EAAGo1B,KAAM,EAuBhC,OApBwC,UAAnCvjC,EAAOihB,IAAKpf,EAAM,YAEtBghC,EAAShhC,EAAK8hC,yBAIdG,EAAe3kC,KAAK2kC,eAGpBjB,EAAS1jC,KAAK0jC,SACR7iC,EAAOoF,SAAU0+B,EAAc,GAAK,UACzCC,EAAeD,EAAajB,UAI7BkB,EAAa51B,KAAOnO,EAAOihB,IAAK6iB,EAAc,GAAK,kBAAkB,GACrEC,EAAaR,MAAQvjC,EAAOihB,IAAK6iB,EAAc,GAAK,mBAAmB,KAKvE31B,IAAK00B,EAAO10B,IAAM41B,EAAa51B,IAAMnO,EAAOihB,IAAKpf,EAAM,aAAa,GACpE0hC,KAAMV,EAAOU,KAAOQ,EAAaR,KAAOvjC,EAAOihB,IAAKpf,EAAM,cAAc,MAI1EiiC,aAAc,WACb,MAAO3kC,MAAKyC,IAAI,WACf,GAAIkiC,GAAe3kC,KAAK2kC,cAAgB18B,EAExC,OAAQ08B,IAAmB9jC,EAAOoF,SAAU0+B,EAAc,SAAuD,WAA3C9jC,EAAOihB,IAAK6iB,EAAc,YAC/FA,EAAeA,EAAaA,YAG7B,OAAOA,IAAgB18B,QAM1BpH,EAAOyB,MAAQokB,WAAY,cAAeI,UAAW,eAAiB,SAAU8Y,EAAQ5f,GACvF,GAAIhR,GAAM,gBAAkBgR,CAE5Bnf,GAAOG,GAAI4+B,GAAW,SAAU5uB,GAC/B,MAAOiO,GAAQjf,KAAM,SAAU0C,EAAMk9B,EAAQ5uB,GAC5C,GAAIszB,GAAMb,GAAW/gC,EAErB,OAAawB,UAAR8M,EACGszB,EAAMA,EAAKtkB,GAAStd,EAAMk9B,QAG7B0E,EACJA,EAAIO,SACF71B,EAAYjP,EAAO2kC,YAAb1zB,EACPhC,EAAMgC,EAAMjR,EAAO0kC,aAIpB/hC,EAAMk9B,GAAW5uB,IAEhB4uB,EAAQ5uB,EAAKnO,UAAUjB,OAAQ,SAUpCf,EAAOyB,MAAQ,MAAO,QAAU,SAAUK,EAAGqd,GAC5Cnf,EAAO4vB,SAAUzQ,GAAS6N,GAAcltB,EAAQ6tB,cAC/C,SAAU9rB,EAAM8qB,GACf,MAAKA,IACJA,EAAWD,GAAQ7qB,EAAMsd,GAElBmN,GAAUxgB,KAAM6gB,GACtB3sB,EAAQ6B,GAAOwsB,WAAYlP,GAAS,KACpCwN,GALF,WAaH3sB,EAAOyB,MAAQwiC,OAAQ,SAAUC,MAAO,SAAW,SAAUvhC,EAAMoB,GAClE/D,EAAOyB,MAAQmvB,QAAS,QAAUjuB,EAAMqmB,QAASjlB,EAAM,GAAI,QAAUpB,GAAQ,SAAUwhC,EAAcC,GAEpGpkC,EAAOG,GAAIikC,GAAa,SAAUzT,EAAQrrB,GACzC,GAAI+Y,GAAYrc,UAAUjB,SAAYojC,GAAkC,iBAAXxT,IAC5DzB,EAAQiV,IAAkBxT,KAAW,GAAQrrB,KAAU,EAAO,SAAW,SAE1E,OAAO8Y,GAAQjf,KAAM,SAAU0C,EAAMkC,EAAMuB,GAC1C,GAAI2I,EAEJ,OAAKjO,GAAOiE,SAAUpC,GAIdA,EAAK9C,SAAS8O,gBAAiB,SAAWlL,GAI3B,IAAlBd,EAAKuC,UACT6J,EAAMpM,EAAKgM,gBAIJtK,KAAKyrB,IACXntB,EAAK6jB,KAAM,SAAW/iB,GAAQsL,EAAK,SAAWtL,GAC9Cd,EAAK6jB,KAAM,SAAW/iB,GAAQsL,EAAK,SAAWtL,GAC9CsL,EAAK,SAAWtL,KAIDU,SAAViC,EAENtF,EAAOihB,IAAKpf,EAAMkC,EAAMmrB,GAGxBlvB,EAAO+rB,MAAOlqB,EAAMkC,EAAMuB,EAAO4pB,IAChCnrB,EAAMsa,EAAYsS,EAASttB,OAAWgb,EAAW,WAOvDre,EAAOG,GAAGkkC,KAAO,WAChB,MAAOllC,MAAK4B,QAGbf,EAAOG,GAAGmkC,QAAUtkC,EAAOG,GAAGyZ,QAkBP,kBAAX2qB,SAAyBA,OAAOC,KAC3CD,OAAQ,YAAc,WACrB,MAAOvkC,IAOT,IAECykC,IAAUvlC,EAAOc,OAGjB0kC,GAAKxlC,EAAOylC,CAwBb,OAtBA3kC,GAAO4kC,WAAa,SAAU3hC,GAS7B,MARK/D,GAAOylC,IAAM3kC,IACjBd,EAAOylC,EAAID,IAGPzhC,GAAQ/D,EAAOc,SAAWA,IAC9Bd,EAAOc,OAASykC,IAGVzkC,SAMIZ,KAAaoiB,IACxBtiB,EAAOc,OAASd,EAAOylC,EAAI3kC,GAMrBA"}
\ No newline at end of file
diff --git a/management/guns-admin/src/main/webapp/static/js/jquery.sparkline 2.1.2.js b/management/guns-admin/src/main/webapp/static/js/jquery.sparkline 2.1.2.js
new file mode 100644
index 0000000..28542b0
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/static/js/jquery.sparkline 2.1.2.js
@@ -0,0 +1,5 @@
+/* jquery.sparkline 2.1.2 - http://omnipotent.net/jquery.sparkline/
+** Licensed under the New BSD License - see above site for details */
+
+(function(a,b,c){(function(a){typeof define=="function"&&define.amd?define(["jquery"],a):jQuery&&!jQuery.fn.sparkline&&a(jQuery)})(function(d){"use strict";var e={},f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z,A,B,C,D,E,F,G,H,I,J,K,L=0;f=function(){return{common:{type:"line",lineColor:"#00f",fillColor:"#cdf",defaultPixelsPerValue:3,width:"auto",height:"auto",composite:!1,tagValuesAttribute:"values",tagOptionsPrefix:"spark",enableTagOptions:!1,enableHighlight:!0,highlightLighten:1.4,tooltipSkipNull:!0,tooltipPrefix:"",tooltipSuffix:"",disableHiddenCheck:!1,numberFormatter:!1,numberDigitGroupCount:3,numberDigitGroupSep:",",numberDecimalMark:".",disableTooltips:!1,disableInteraction:!1},line:{spotColor:"#f80",highlightSpotColor:"#5f5",highlightLineColor:"#f22",spotRadius:1.5,minSpotColor:"#f80",maxSpotColor:"#f80",lineWidth:1,normalRangeMin:c,normalRangeMax:c,normalRangeColor:"#ccc",drawNormalOnTop:!1,chartRangeMin:c,chartRangeMax:c,chartRangeMinX:c,chartRangeMaxX:c,tooltipFormat:new h('<span style="color: {{color}}">●</span> {{prefix}}{{y}}{{suffix}}')},bar:{barColor:"#3366cc",negBarColor:"#f44",stackedBarColor:["#3366cc","#dc3912","#ff9900","#109618","#66aa00","#dd4477","#0099c6","#990099"],zeroColor:c,nullColor:c,zeroAxis:!0,barWidth:4,barSpacing:1,chartRangeMax:c,chartRangeMin:c,chartRangeClip:!1,colorMap:c,tooltipFormat:new h('<span style="color: {{color}}">●</span> {{prefix}}{{value}}{{suffix}}')},tristate:{barWidth:4,barSpacing:1,posBarColor:"#6f6",negBarColor:"#f44",zeroBarColor:"#999",colorMap:{},tooltipFormat:new h('<span style="color: {{color}}">●</span> {{value:map}}'),tooltipValueLookups:{map:{"-1":"Loss",0:"Draw",1:"Win"}}},discrete:{lineHeight:"auto",thresholdColor:c,thresholdValue:0,chartRangeMax:c,chartRangeMin:c,chartRangeClip:!1,tooltipFormat:new h("{{prefix}}{{value}}{{suffix}}")},bullet:{targetColor:"#f33",targetWidth:3,performanceColor:"#33f",rangeColors:["#d3dafe","#a8b6ff","#7f94ff"],base:c,tooltipFormat:new h("{{fieldkey:fields}} - {{value}}"),tooltipValueLookups:{fields:{r:"Range",p:"Performance",t:"Target"}}},pie:{offset:0,sliceColors:["#3366cc","#dc3912","#ff9900","#109618","#66aa00","#dd4477","#0099c6","#990099"],borderWidth:0,borderColor:"#000",tooltipFormat:new h('<span style="color: {{color}}">●</span> {{value}} ({{percent.1}}%)')},box:{raw:!1,boxLineColor:"#000",boxFillColor:"#cdf",whiskerColor:"#000",outlierLineColor:"#333",outlierFillColor:"#fff",medianColor:"#f00",showOutliers:!0,outlierIQR:1.5,spotRadius:1.5,target:c,targetColor:"#4a2",chartRangeMax:c,chartRangeMin:c,tooltipFormat:new h("{{field:fields}}: {{value}}"),tooltipFormatFieldlistKey:"field",tooltipValueLookups:{fields:{lq:"Lower Quartile",med:"Median",uq:"Upper Quartile",lo:"Left Outlier",ro:"Right Outlier",lw:"Left Whisker",rw:"Right Whisker"}}}}},E='.jqstooltip { position: absolute;left: 0px;top: 0px;visibility: hidden;background: rgb(0, 0, 0) transparent;background-color: rgba(0,0,0,0.6);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr=#99000000, endColorstr=#99000000);-ms-filter: "progid:DXImageTransform.Microsoft.gradient(startColorstr=#99000000, endColorstr=#99000000)";color: white;font: 10px arial, san serif;text-align: left;white-space: nowrap;padding: 5px;border: 1px solid white;z-index: 10000;}.jqsfield { color: white;font: 10px arial, san serif;text-align: left;}',g=function(){var a,b;return a=function(){this.init.apply(this,arguments)},arguments.length>1?(arguments[0]?(a.prototype=d.extend(new arguments[0],arguments[arguments.length-1]),a._super=arguments[0].prototype):a.prototype=arguments[arguments.length-1],arguments.length>2&&(b=Array.prototype.slice.call(arguments,1,-1),b.unshift(a.prototype),d.extend.apply(d,b))):a.prototype=arguments[0],a.prototype.cls=a,a},d.SPFormatClass=h=g({fre:/\{\{([\w.]+?)(:(.+?))?\}\}/g,precre:/(\w+)\.(\d+)/,init:function(a,b){this.format=a,this.fclass=b},render:function(a,b,d){var e=this,f=a,g,h,i,j,k;return this.format.replace(this.fre,function(){var a;return h=arguments[1],i=arguments[3],g=e.precre.exec(h),g?(k=g[2],h=g[1]):k=!1,j=f[h],j===c?"":i&&b&&b[i]?(a=b[i],a.get?b[i].get(j)||j:b[i][j]||j):(n(j)&&(d.get("numberFormatter")?j=d.get("numberFormatter")(j):j=s(j,k,d.get("numberDigitGroupCount"),d.get("numberDigitGroupSep"),d.get("numberDecimalMark"))),j)})}}),d.spformat=function(a,b){return new h(a,b)},i=function(a,b,c){return a<b?b:a>c?c:a},j=function(a,c){var d;return c===2?(d=b.floor(a.length/2),a.length%2?a[d]:(a[d-1]+a[d])/2):a.length%2?(d=(a.length*c+c)/4,d%1?(a[b.floor(d)]+a[b.floor(d)-1])/2:a[d-1]):(d=(a.length*c+2)/4,d%1?(a[b.floor(d)]+a[b.floor(d)-1])/2:a[d-1])},k=function(a){var b;switch(a){case"undefined":a=c;break;case"null":a=null;break;case"true":a=!0;break;case"false":a=!1;break;default:b=parseFloat(a),a==b&&(a=b)}return a},l=function(a){var b,c=[];for(b=a.length;b--;)c[b]=k(a[b]);return c},m=function(a,b){var c,d,e=[];for(c=0,d=a.length;c<d;c++)a[c]!==b&&e.push(a[c]);return e},n=function(a){return!isNaN(parseFloat(a))&&isFinite(a)},s=function(a,b,c,e,f){var g,h;a=(b===!1?parseFloat(a).toString():a.toFixed(b)).split(""),g=(g=d.inArray(".",a))<0?a.length:g,g<a.length&&(a[g]=f);for(h=g-c;h>0;h-=c)a.splice(h,0,e);return a.join("")},o=function(a,b,c){var d;for(d=b.length;d--;){if(c&&b[d]===null)continue;if(b[d]!==a)return!1}return!0},p=function(a){var b=0,c;for(c=a.length;c--;)b+=typeof a[c]=="number"?a[c]:0;return b},r=function(a){return d.isArray(a)?a:[a]},q=function(b){var c;a.createStyleSheet?a.createStyleSheet().cssText=b:(c=a.createElement("style"),c.type="text/css",a.getElementsByTagName("head")[0].appendChild(c),c[typeof a.body.style.WebkitAppearance=="string"?"innerText":"innerHTML"]=b)},d.fn.simpledraw=function(b,e,f,g){var h,i;if(f&&(h=this.data("_jqs_vcanvas")))return h;if(d.fn.sparkline.canvas===!1)return!1;if(d.fn.sparkline.canvas===c){var j=a.createElement("canvas");if(!j.getContext||!j.getContext("2d")){if(!a.namespaces||!!a.namespaces.v)return d.fn.sparkline.canvas=!1,!1;a.namespaces.add("v","urn:schemas-microsoft-com:vml","#default#VML"),d.fn.sparkline.canvas=function(a,b,c,d){return new J(a,b,c)}}else d.fn.sparkline.canvas=function(a,b,c,d){return new I(a,b,c,d)}}return b===c&&(b=d(this).innerWidth()),e===c&&(e=d(this).innerHeight()),h=d.fn.sparkline.canvas(b,e,this,g),i=d(this).data("_jqs_mhandler"),i&&i.registerCanvas(h),h},d.fn.cleardraw=function(){var a=this.data("_jqs_vcanvas");a&&a.reset()},d.RangeMapClass=t=g({init:function(a){var b,c,d=[];for(b in a)a.hasOwnProperty(b)&&typeof b=="string"&&b.indexOf(":")>-1&&(c=b.split(":"),c[0]=c[0].length===0?-Infinity:parseFloat(c[0]),c[1]=c[1].length===0?Infinity:parseFloat(c[1]),c[2]=a[b],d.push(c));this.map=a,this.rangelist=d||!1},get:function(a){var b=this.rangelist,d,e,f;if((f=this.map[a])!==c)return f;if(b)for(d=b.length;d--;){e=b[d];if(e[0]<=a&&e[1]>=a)return e[2]}return c}}),d.range_map=function(a){return new t(a)},u=g({init:function(a,b){var c=d(a);this.$el=c,this.options=b,this.currentPageX=0,this.currentPageY=0,this.el=a,this.splist=[],this.tooltip=null,this.over=!1,this.displayTooltips=!b.get("disableTooltips"),this.highlightEnabled=!b.get("disableHighlight")},registerSparkline:function(a){this.splist.push(a),this.over&&this.updateDisplay()},registerCanvas:function(a){var b=d(a.canvas);this.canvas=a,this.$canvas=b,b.mouseenter(d.proxy(this.mouseenter,this)),b.mouseleave(d.proxy(this.mouseleave,this)),b.click(d.proxy(this.mouseclick,this))},reset:function(a){this.splist=[],this.tooltip&&a&&(this.tooltip.remove(),this.tooltip=c)},mouseclick:function(a){var b=d.Event("sparklineClick");b.originalEvent=a,b.sparklines=this.splist,this.$el.trigger(b)},mouseenter:function(b){d(a.body).unbind("mousemove.jqs"),d(a.body).bind("mousemove.jqs",d.proxy(this.mousemove,this)),this.over=!0,this.currentPageX=b.pageX,this.currentPageY=b.pageY,this.currentEl=b.target,!this.tooltip&&this.displayTooltips&&(this.tooltip=new v(this.options),this.tooltip.updatePosition(b.pageX,b.pageY)),this.updateDisplay()},mouseleave:function(){d(a.body).unbind("mousemove.jqs");var b=this.splist,c=b.length,e=!1,f,g;this.over=!1,this.currentEl=null,this.tooltip&&(this.tooltip.remove(),this.tooltip=null);for(g=0;g<c;g++)f=b[g],f.clearRegionHighlight()&&(e=!0);e&&this.canvas.render()},mousemove:function(a){this.currentPageX=a.pageX,this.currentPageY=a.pageY,this.currentEl=a.target,this.tooltip&&this.tooltip.updatePosition(a.pageX,a.pageY),this.updateDisplay()},updateDisplay:function(){var a=this.splist,b=a.length,c=!1,e=this.$canvas.offset(),f=this.currentPageX-e.left,g=this.currentPageY-e.top,h,i,j,k,l;if(!this.over)return;for(j=0;j<b;j++)i=a[j],k=i.setRegionHighlight(this.currentEl,f,g),k&&(c=!0);if(c){l=d.Event("sparklineRegionChange"),l.sparklines=this.splist,this.$el.trigger(l);if(this.tooltip){h="";for(j=0;j<b;j++)i=a[j],h+=i.getCurrentRegionTooltip();this.tooltip.setContent(h)}this.disableHighlight||this.canvas.render()}k===null&&this.mouseleave()}}),v=g({sizeStyle:"position: static !important;display: block !important;visibility: hidden !important;float: left !important;",init:function(b){var c=b.get("tooltipClassname","jqstooltip"),e=this.sizeStyle,f;this.container=b.get("tooltipContainer")||a.body,this.tooltipOffsetX=b.get("tooltipOffsetX",10),this.tooltipOffsetY=b.get("tooltipOffsetY",12),d("#jqssizetip").remove(),d("#jqstooltip").remove(),this.sizetip=d("<div/>",{id:"jqssizetip",style:e,"class":c}),this.tooltip=d("<div/>",{id:"jqstooltip","class":c}).appendTo(this.container),f=this.tooltip.offset(),this.offsetLeft=f.left,this.offsetTop=f.top,this.hidden=!0,d(window).unbind("resize.jqs scroll.jqs"),d(window).bind("resize.jqs scroll.jqs",d.proxy(this.updateWindowDims,this)),this.updateWindowDims()},updateWindowDims:function(){this.scrollTop=d(window).scrollTop(),this.scrollLeft=d(window).scrollLeft(),this.scrollRight=this.scrollLeft+d(window).width(),this.updatePosition()},getSize:function(a){this.sizetip.html(a).appendTo(this.container),this.width=this.sizetip.width()+1,this.height=this.sizetip.height(),this.sizetip.remove()},setContent:function(a){if(!a){this.tooltip.css("visibility","hidden"),this.hidden=!0;return}this.getSize(a),this.tooltip.html(a).css({width:this.width,height:this.height,visibility:"visible"}),this.hidden&&(this.hidden=!1,this.updatePosition())},updatePosition:function(a,b){if(a===c){if(this.mousex===c)return;a=this.mousex-this.offsetLeft,b=this.mousey-this.offsetTop}else this.mousex=a-=this.offsetLeft,this.mousey=b-=this.offsetTop;if(!this.height||!this.width||this.hidden)return;b-=this.height+this.tooltipOffsetY,a+=this.tooltipOffsetX,b<this.scrollTop&&(b=this.scrollTop),a<this.scrollLeft?a=this.scrollLeft:a+this.width>this.scrollRight&&(a=this.scrollRight-this.width),this.tooltip.css({left:a,top:b})},remove:function(){this.tooltip.remove(),this.sizetip.remove(),this.sizetip=this.tooltip=c,d(window).unbind("resize.jqs scroll.jqs")}}),F=function(){q(E)},d(F),K=[],d.fn.sparkline=function(b,e){return this.each(function(){var f=new d.fn.sparkline.options(this,e),g=d(this),h,i;h=function(){var e,h,i,j,k,l,m;if(b==="html"||b===c){m=this.getAttribute(f.get("tagValuesAttribute"));if(m===c||m===null)m=g.html();e=m.replace(/(^\s*<!--)|(-->\s*$)|\s+/g,"").split(",")}else e=b;h=f.get("width")==="auto"?e.length*f.get("defaultPixelsPerValue"):f.get("width");if(f.get("height")==="auto"){if(!f.get("composite")||!d.data(this,"_jqs_vcanvas"))j=a.createElement("span"),j.innerHTML="a",g.html(j),i=d(j).innerHeight()||d(j).height(),d(j).remove(),j=null}else i=f.get("height");f.get("disableInteraction")?k=!1:(k=d.data(this,"_jqs_mhandler"),k?f.get("composite")||k.reset():(k=new u(this,f),d.data(this,"_jqs_mhandler",k)));if(f.get("composite")&&!d.data(this,"_jqs_vcanvas")){d.data(this,"_jqs_errnotify")||(alert("Attempted to attach a composite sparkline to an element with no existing sparkline"),d.data(this,"_jqs_errnotify",!0));return}l=new(d.fn.sparkline[f.get("type")])(this,e,f,h,i),l.render(),k&&k.registerSparkline(l)};if(d(this).html()&&!f.get("disableHiddenCheck")&&d(this).is(":hidden")||!d(this).parents("body").length){if(!f.get("composite")&&d.data(this,"_jqs_pending"))for(i=K.length;i;i--)K[i-1][0]==this&&K.splice(i-1,1);K.push([this,h]),d.data(this,"_jqs_pending",!0)}else h.call(this)})},d.fn.sparkline.defaults=f(),d.sparkline_display_visible=function(){var a,b,c,e=[];for(b=0,c=K.length;b<c;b++)a=K[b][0],d(a).is(":visible")&&!d(a).parents().is(":hidden")?(K[b][1].call(a),d.data(K[b][0],"_jqs_pending",!1),e.push(b)):!d(a).closest("html").length&&!d.data(a,"_jqs_pending")&&(d.data(K[b][0],"_jqs_pending",!1),e.push(b));for(b=e.length;b;b--)K.splice(e[b-1],1)},d.fn.sparkline.options=g({init:function(a,b){var c,f,g,h;this.userOptions=b=b||{},this.tag=a,this.tagValCache={},f=d.fn.sparkline.defaults,g=f.common,this.tagOptionsPrefix=b.enableTagOptions&&(b.tagOptionsPrefix||g.tagOptionsPrefix),h=this.getTagSetting("type"),h===e?c=f[b.type||g.type]:c=f[h],this.mergedOptions=d.extend({},g,c,b)},getTagSetting:function(a){var b=this.tagOptionsPrefix,d,f,g,h;if(b===!1||b===c)return e;if(this.tagValCache.hasOwnProperty(a))d=this.tagValCache.key;else{d=this.tag.getAttribute(b+a);if(d===c||d===null)d=e;else if(d.substr(0,1)==="["){d=d.substr(1,d.length-2).split(",");for(f=d.length;f--;)d[f]=k(d[f].replace(/(^\s*)|(\s*$)/g,""))}else if(d.substr(0,1)==="{"){g=d.substr(1,d.length-2).split(","),d={};for(f=g.length;f--;)h=g[f].split(":",2),d[h[0].replace(/(^\s*)|(\s*$)/g,"")]=k(h[1].replace(/(^\s*)|(\s*$)/g,""))}else d=k(d);this.tagValCache.key=d}return d},get:function(a,b){var d=this.getTagSetting(a),f;return d!==e?d:(f=this.mergedOptions[a])===c?b:f}}),d.fn.sparkline._base=g({disabled:!1,init:function(a,b,e,f,g){this.el=a,this.$el=d(a),this.values=b,this.options=e,this.width=f,this.height=g,this.currentRegion=c},initTarget:function(){var a=!this.options.get("disableInteraction");(this.target=this.$el.simpledraw(this.width,this.height,this.options.get("composite"),a))?(this.canvasWidth=this.target.pixelWidth,this.canvasHeight=this.target.pixelHeight):this.disabled=!0},render:function(){return this.disabled?(this.el.innerHTML="",!1):!0},getRegion:function(a,b){},setRegionHighlight:function(a,b,d){var e=this.currentRegion,f=!this.options.get("disableHighlight"),g;return b>this.canvasWidth||d>this.canvasHeight||b<0||d<0?null:(g=this.getRegion(a,b,d),e!==g?(e!==c&&f&&this.removeHighlight(),this.currentRegion=g,g!==c&&f&&this.renderHighlight(),!0):!1)},clearRegionHighlight:function(){return this.currentRegion!==c?(this.removeHighlight(),this.currentRegion=c,!0):!1},renderHighlight:function(){this.changeHighlight(!0)},removeHighlight:function(){this.changeHighlight(!1)},changeHighlight:function(a){},getCurrentRegionTooltip:function(){var a=this.options,b="",e=[],f,g,i,j,k,l,m,n,o,p,q,r,s,t;if(this.currentRegion===c)return"";f=this.getCurrentRegionFields(),q=a.get("tooltipFormatter");if(q)return q(this,a,f);a.get("tooltipChartTitle")&&(b+='<div class="jqs jqstitle">'+a.get("tooltipChartTitle")+"</div>\n"),g=this.options.get("tooltipFormat");if(!g)return"";d.isArray(g)||(g=[g]),d.isArray(f)||(f=[f]),m=this.options.get("tooltipFormatFieldlist"),n=this.options.get("tooltipFormatFieldlistKey");if(m&&n){o=[];for(l=f.length;l--;)p=f[l][n],(t=d.inArray(p,m))!=-1&&(o[t]=f[l]);f=o}i=g.length,s=f.length;for(l=0;l<i;l++){r=g[l],typeof r=="string"&&(r=new h(r)),j=r.fclass||"jqsfield";for(t=0;t<s;t++)if(!f[t].isNull||!a.get("tooltipSkipNull"))d.extend(f[t],{prefix:a.get("tooltipPrefix"),suffix:a.get("tooltipSuffix")}),k=r.render(f[t],a.get("tooltipValueLookups"),a),e.push('<div class="'+j+'">'+k+"</div>")}return e.length?b+e.join("\n"):""},getCurrentRegionFields:function(){},calcHighlightColor:function(a,c){var d=c.get("highlightColor"),e=c.get("highlightLighten"),f,g,h,j;if(d)return d;if(e){f=/^#([0-9a-f])([0-9a-f])([0-9a-f])$/i.exec(a)||/^#([0-9a-f]{2})([0-9a-f]{2})([0-9a-f]{2})$/i.exec(a);if(f){h=[],g=a.length===4?16:1;for(j=0;j<3;j++)h[j]=i(b.round(parseInt(f[j+1],16)*g*e),0,255);return"rgb("+h.join(",")+")"}}return a}}),w={changeHighlight:function(a){var b=this.currentRegion,c=this.target,e=this.regionShapes[b],f;e&&(f=this.renderRegion(b,a),d.isArray(f)||d.isArray(e)?(c.replaceWithShapes(e,f),this.regionShapes[b]=d.map(f,function(a){return a.id})):(c.replaceWithShape(e,f),this.regionShapes[b]=f.id))},render:function(){var a=this.values,b=this.target,c=this.regionShapes,e,f,g,h;if(!this.cls._super.render.call(this))return;for(g=a.length;g--;){e=this.renderRegion(g);if(e)if(d.isArray(e)){f=[];for(h=e.length;h--;)e[h].append(),f.push(e[h].id);c[g]=f}else e.append(),c[g]=e.id;else c[g]=null}b.render()}},d.fn.sparkline.line=x=g(d.fn.sparkline._base,{type:"line",init:function(a,b,c,d,e){x._super.init.call(this,a,b,c,d,e),this.vertices=[],this.regionMap=[],this.xvalues=[],this.yvalues=[],this.yminmax=[],this.hightlightSpotId=null,this.lastShapeId=null,this.initTarget()},getRegion:function(a,b,d){var e,f=this.regionMap;for(e=f.length;e--;)if(f[e]!==null&&b>=f[e][0]&&b<=f[e][1])return f[e][2];return c},getCurrentRegionFields:function(){var a=this.currentRegion;return{isNull:this.yvalues[a]===null,x:this.xvalues[a],y:this.yvalues[a],color:this.options.get("lineColor"),fillColor:this.options.get("fillColor"),offset:a}},renderHighlight:function(){var a=this.currentRegion,b=this.target,d=this.vertices[a],e=this.options,f=e.get("spotRadius"),g=e.get("highlightSpotColor"),h=e.get("highlightLineColor"),i,j;if(!d)return;f&&g&&(i=b.drawCircle(d[0],d[1],f,c,g),this.highlightSpotId=i.id,b.insertAfterShape(this.lastShapeId,i)),h&&(j=b.drawLine(d[0],this.canvasTop,d[0],this.canvasTop+this.canvasHeight,h),this.highlightLineId=j.id,b.insertAfterShape(this.lastShapeId,j))},removeHighlight:function(){var a=this.target;this.highlightSpotId&&(a.removeShapeId(this.highlightSpotId),this.highlightSpotId=null),this.highlightLineId&&(a.removeShapeId(this.highlightLineId),this.highlightLineId=null)},scanValues:function(){var a=this.values,c=a.length,d=this.xvalues,e=this.yvalues,f=this.yminmax,g,h,i,j,k;for(g=0;g<c;g++)h=a[g],i=typeof a[g]=="string",j=typeof a[g]=="object"&&a[g]instanceof Array,k=i&&a[g].split(":"),i&&k.length===2?(d.push(Number(k[0])),e.push(Number(k[1])),f.push(Number(k[1]))):j?(d.push(h[0]),e.push(h[1]),f.push(h[1])):(d.push(g),a[g]===null||a[g]==="null"?e.push(null):(e.push(Number(h)),f.push(Number(h))));this.options.get("xvalues")&&(d=this.options.get("xvalues")),this.maxy=this.maxyorg=b.max.apply(b,f),this.miny=this.minyorg=b.min.apply(b,f),this.maxx=b.max.apply(b,d),this.minx=b.min.apply(b,d),this.xvalues=d,this.yvalues=e,this.yminmax=f},processRangeOptions:function(){var a=this.options,b=a.get("normalRangeMin"),d=a.get("normalRangeMax");b!==c&&(b<this.miny&&(this.miny=b),d>this.maxy&&(this.maxy=d)),a.get("chartRangeMin")!==c&&(a.get("chartRangeClip")||a.get("chartRangeMin")<this.miny)&&(this.miny=a.get("chartRangeMin")),a.get("chartRangeMax")!==c&&(a.get("chartRangeClip")||a.get("chartRangeMax")>this.maxy)&&(this.maxy=a.get("chartRangeMax")),a.get("chartRangeMinX")!==c&&(a.get("chartRangeClipX")||a.get("chartRangeMinX")<this.minx)&&(this.minx=a.get("chartRangeMinX")),a.get("chartRangeMaxX")!==c&&(a.get("chartRangeClipX")||a.get("chartRangeMaxX")>this.maxx)&&(this.maxx=a.get("chartRangeMaxX"))},drawNormalRange:function(a,d,e,f,g){var h=this.options.get("normalRangeMin"),i=this.options.get("normalRangeMax"),j=d+b.round(e-e*((i-this.miny)/g)),k=b.round(e*(i-h)/g);this.target.drawRect(a,j,f,k,c,this.options.get("normalRangeColor")).append()},render:function(){var a=this.options,e=this.target,f=this.canvasWidth,g=this.canvasHeight,h=this.vertices,i=a.get("spotRadius"),j=this.regionMap,k,l,m,n,o,p,q,r,s,u,v,w,y,z,A,B,C,D,E,F,G,H,I,J,K;if(!x._super.render.call(this))return;this.scanValues(),this.processRangeOptions(),I=this.xvalues,J=this.yvalues;if(!this.yminmax.length||this.yvalues.length<2)return;n=o=0,k=this.maxx-this.minx===0?1:this.maxx-this.minx,l=this.maxy-this.miny===0?1:this.maxy-this.miny,m=this.yvalues.length-1,i&&(f<i*4||g<i*4)&&(i=0);if(i){G=a.get("highlightSpotColor")&&!a.get("disableInteraction");if(G||a.get("minSpotColor")||a.get("spotColor")&&J[m]===this.miny)g-=b.ceil(i);if(G||a.get("maxSpotColor")||a.get("spotColor")&&J[m]===this.maxy)g-=b.ceil(i),n+=b.ceil(i);if(G||(a.get("minSpotColor")||a.get("maxSpotColor"))&&(J[0]===this.miny||J[0]===this.maxy))o+=b.ceil(i),f-=b.ceil(i);if(G||a.get("spotColor")||a.get("minSpotColor")||a.get("maxSpotColor")&&(J[m]===this.miny||J[m]===this.maxy))f-=b.ceil(i)}g--,a.get("normalRangeMin")!==c&&!a.get("drawNormalOnTop")&&this.drawNormalRange(o,n,g,f,l),q=[],r=[q],z=A=null,B=J.length;for(K=0;K<B;K++)s=I[K],v=I[K+1],u=J[K],w=o+b.round((s-this.minx)*(f/k)),y=K<B-1?o+b.round((v-this.minx)*(f/k)):f,A=w+(y-w)/2,j[K]=[z||0,A,K],z=A,u===null?K&&(J[K-1]!==null&&(q=[],r.push(q)),h.push(null)):(u<this.miny&&(u=this.miny),u>this.maxy&&(u=this.maxy),q.length||q.push([w,n+g]),p=[w,n+b.round(g-g*((u-this.miny)/l))],q.push(p),h.push(p));C=[],D=[],E=r.length;for(K=0;K<E;K++)q=r[K],q.length&&(a.get("fillColor")&&(q.push([q[q.length-1][0],n+g]),D.push(q.slice(0)),q.pop()),q.length>2&&(q[0]=[q[0][0],q[1][1]]),C.push(q));E=D.length;for(K=0;K<E;K++)e.drawShape(D[K],a.get("fillColor"),a.get("fillColor")).append();a.get("normalRangeMin")!==c&&a.get("drawNormalOnTop")&&this.drawNormalRange(o,n,g,f,l),E=C.length;for(K=0;K<E;K++)e.drawShape(C[K],a.get("lineColor"),c,a.get("lineWidth")).append();if(i&&a.get("valueSpots")){F=a.get("valueSpots"),F.get===c&&(F=new t(F));for(K=0;K<B;K++)H=F.get(J[K]),H&&e.drawCircle(o+b.round((I[K]-this.minx)*(f/k)),n+b.round(g-g*((J[K]-this.miny)/l)),i,c,H).append()}i&&a.get("spotColor")&&J[m]!==null&&e.drawCircle(o+b.round((I[I.length-1]-this.minx)*(f/k)),n+b.round(g-g*((J[m]-this.miny)/l)),i,c,a.get("spotColor")).append(),this.maxy!==this.minyorg&&(i&&a.get("minSpotColor")&&(s=I[d.inArray(this.minyorg,J)],e.drawCircle(o+b.round((s-this.minx)*(f/k)),n+b.round(g-g*((this.minyorg-this.miny)/l)),i,c,a.get("minSpotColor")).append()),i&&a.get("maxSpotColor")&&(s=I[d.inArray(this.maxyorg,J)],e.drawCircle(o+b.round((s-this.minx)*(f/k)),n+b.round(g-g*((this.maxyorg-this.miny)/l)),i,c,a.get("maxSpotColor")).append())),this.lastShapeId=e.getLastShapeId(),this.canvasTop=n,e.render()}}),d.fn.sparkline.bar=y=g(d.fn.sparkline._base,w,{type:"bar",init:function(a,e,f,g,h){var j=parseInt(f.get("barWidth"),10),n=parseInt(f.get("barSpacing"),10),o=f.get("chartRangeMin"),p=f.get("chartRangeMax"),q=f.get("chartRangeClip"),r=Infinity,s=-Infinity,u,v,w,x,z,A,B,C,D,E,F,G,H,I,J,K,L,M,N,O,P,Q,R;y._super.init.call(this,a,e,f,g,h);for(A=0,B=e.length;A<B;A++){O=e[A],u=typeof O=="string"&&O.indexOf(":")>-1;if(u||d.isArray(O))J=!0,u&&(O=e[A]=l(O.split(":"))),O=m(O,null),v=b.min.apply(b,O),w=b.max.apply(b,O),v<r&&(r=v),w>s&&(s=w)}this.stacked=J,this.regionShapes={},this.barWidth=j,this.barSpacing=n,this.totalBarWidth=j+n,this.width=g=e.length*j+(e.length-1)*n,this.initTarget(),q&&(H=o===c?-Infinity:o,I=p===c?Infinity:p),z=[],x=J?[]:z;var S=[],T=[];for(A=0,B=e.length;A<B;A++)if(J){K=e[A],e[A]=N=[],S[A]=0,x[A]=T[A]=0;for(L=0,M=K.length;L<M;L++)O=N[L]=q?i(K[L],H,I):K[L],O!==null&&(O>0&&(S[A]+=O),r<0&&s>0?O<0?T[A]+=b.abs(O):x[A]+=O:x[A]+=b.abs(O-(O<0?s:r)),z.push(O))}else O=q?i(e[A],H,I):e[A],O=e[A]=k(O),O!==null&&z.push(O);this.max=G=b.max.apply(b,z),this.min=F=b.min.apply(b,z),this.stackMax=s=J?b.max.apply(b,S):G,this.stackMin=r=J?b.min.apply(b,z):F,f.get("chartRangeMin")!==c&&(f.get("chartRangeClip")||f.get("chartRangeMin")<F)&&(F=f.get("chartRangeMin")),f.get("chartRangeMax")!==c&&(f.get("chartRangeClip")||f.get("chartRangeMax")>G)&&(G=f.get("chartRangeMax")),this.zeroAxis=D=f.get("zeroAxis",!0),F<=0&&G>=0&&D?E=0:D==0?E=F:F>0?E=F:E=G,this.xaxisOffset=E,C=J?b.max.apply(b,x)+b.max.apply(b,T):G-F,this.canvasHeightEf=D&&F<0?this.canvasHeight-2:this.canvasHeight-1,F<E?(Q=J&&G>=0?s:G,P=(Q-E)/C*this.canvasHeight,P!==b.ceil(P)&&(this.canvasHeightEf-=2,P=b.ceil(P))):P=this.canvasHeight,this.yoffset=P,d.isArray(f.get("colorMap"))?(this.colorMapByIndex=f.get("colorMap"),this.colorMapByValue=null):(this.colorMapByIndex=null,this.colorMapByValue=f.get("colorMap"),this.colorMapByValue&&this.colorMapByValue.get===c&&(this.colorMapByValue=new t(this.colorMapByValue))),this.range=C},getRegion:function(a,d,e){var f=b.floor(d/this.totalBarWidth);return f<0||f>=this.values.length?c:f},getCurrentRegionFields:function(){var a=this.currentRegion,b=r(this.values[a]),c=[],d,e;for(e=b.length;e--;)d=b[e],c.push({isNull:d===null,value:d,color:this.calcColor(e,d,a),offset:a});return c},calcColor:function(a,b,e){var f=this.colorMapByIndex,g=this.colorMapByValue,h=this.options,i,j;return this.stacked?i=h.get("stackedBarColor"):i=b<0?h.get("negBarColor"):h.get("barColor"),b===0&&h.get("zeroColor")!==c&&(i=h.get("zeroColor")),g&&(j=g.get(b))?i=j:f&&f.length>e&&(i=f[e]),d.isArray(i)?i[a%i.length]:i},renderRegion:function(a,e){var f=this.values[a],g=this.options,h=this.xaxisOffset,i=[],j=this.range,k=this.stacked,l=this.target,m=a*this.totalBarWidth,n=this.canvasHeightEf,p=this.yoffset,q,r,s,t,u,v,w,x,y,z;f=d.isArray(f)?f:[f],w=f.length,x=f[0],t=o(null,f),z=o(h,f,!0);if(t)return g.get("nullColor")?(s=e?g.get("nullColor"):this.calcHighlightColor(g.get("nullColor"),g),q=p>0?p-1:p,l.drawRect(m,q,this.barWidth-1,0,s,s)):c;u=p;for(v=0;v<w;v++){x=f[v];if(k&&x===h){if(!z||y)continue;y=!0}j>0?r=b.floor(n*(b.abs(x-h)/j))+1:r=1,x<h||x===h&&p===0?(q=u,u+=r):(q=p-r,p-=r),s=this.calcColor(v,x,a),e&&(s=this.calcHighlightColor(s,g)),i.push(l.drawRect(m,q,this.barWidth-1,r-1,s,s))}return i.length===1?i[0]:i}}),d.fn.sparkline.tristate=z=g(d.fn.sparkline._base,w,{type:"tristate",init:function(a,b,e,f,g){var h=parseInt(e.get("barWidth"),10),i=parseInt(e.get("barSpacing"),10);z._super.init.call(this,a,b,e,f,g),this.regionShapes={},this.barWidth=h,this.barSpacing=i,this.totalBarWidth=h+i,this.values=d.map(b,Number),this.width=f=b.length*h+(b.length-1)*i,d.isArray(e.get("colorMap"))?(this.colorMapByIndex=e.get("colorMap"),this.colorMapByValue=null):(this.colorMapByIndex=null,this.colorMapByValue=e.get("colorMap"),this.colorMapByValue&&this.colorMapByValue.get===c&&(this.colorMapByValue=new t(this.colorMapByValue))),this.initTarget()},getRegion:function(a,c,d){return b.floor(c/this.totalBarWidth)},getCurrentRegionFields:function(){var a=this.currentRegion;return{isNull:this.values[a]===c,value:this.values[a],color:this.calcColor(this.values[a],a),offset:a}},calcColor:function(a,b){var c=this.values,d=this.options,e=this.colorMapByIndex,f=this.colorMapByValue,g,h;return f&&(h=f.get(a))?g=h:e&&e.length>b?g=e[b]:c[b]<0?g=d.get("negBarColor"):c[b]>0?g=d.get("posBarColor"):g=d.get("zeroBarColor"),g},renderRegion:function(a,c){var d=this.values,e=this.options,f=this.target,g,h,i,j,k,l;g=f.pixelHeight,i=b.round(g/2),j=a*this.totalBarWidth,d[a]<0?(k=i,h=i-1):d[a]>0?(k=0,h=i-1):(k=i-1,h=2),l=this.calcColor(d[a],a);if(l===null)return;return c&&(l=this.calcHighlightColor(l,e)),f.drawRect(j,k,this.barWidth-1,h-1,l,l)}}),d.fn.sparkline.discrete=A=g(d.fn.sparkline._base,w,{type:"discrete",init:function(a,e,f,g,h){A._super.init.call(this,a,e,f,g,h),this.regionShapes={},this.values=e=d.map(e,Number),this.min=b.min.apply(b,e),this.max=b.max.apply(b,e),this.range=this.max-this.min,this.width=g=f.get("width")==="auto"?e.length*2:this.width,this.interval=b.floor(g/e.length),this.itemWidth=g/e.length,f.get("chartRangeMin")!==c&&(f.get("chartRangeClip")||f.get("chartRangeMin")<this.min)&&(this.min=f.get("chartRangeMin")),f.get("chartRangeMax")!==c&&(f.get("chartRangeClip")||f.get("chartRangeMax")>this.max)&&(this.max=f.get("chartRangeMax")),this.initTarget(),this.target&&(this.lineHeight=f.get("lineHeight")==="auto"?b.round(this.canvasHeight*.3):f.get("lineHeight"))},getRegion:function(a,c,d){return b.floor(c/this.itemWidth)},getCurrentRegionFields:function(){var a=this.currentRegion;return{isNull:this.values[a]===c,value:this.values[a],offset:a}},renderRegion:function(a,c){var d=this.values,e=this.options,f=this.min,g=this.max,h=this.range,j=this.interval,k=this.target,l=this.canvasHeight,m=this.lineHeight,n=l-m,o,p,q,r;return p=i(d[a],f,g),r=a*j,o=b.round(n-n*((p-f)/h)),q=e.get("thresholdColor")&&p<e.get("thresholdValue")?e.get("thresholdColor"):e.get("lineColor"),c&&(q=this.calcHighlightColor(q,e)),k.drawLine(r,o,r,o+m,q)}}),d.fn.sparkline.bullet=B=g(d.fn.sparkline._base,{type:"bullet",init:function(a,d,e,f,g){var h,i,j;B._super.init.call(this,a,d,e,f,g),this.values=d=l(d),j=d.slice(),j[0]=j[0]===null?j[2]:j[0],j[1]=d[1]===null?j[2]:j[1],h=b.min.apply(b,d),i=b.max.apply(b,d),e.get("base")===c?h=h<0?h:0:h=e.get("base"),this.min=h,this.max=i,this.range=i-h,this.shapes={},this.valueShapes={},this.regiondata={},this.width=f=e.get("width")==="auto"?"4.0em":f,this.target=this.$el.simpledraw(f,g,e.get("composite")),d.length||(this.disabled=!0),this.initTarget()},getRegion:function(a,b,d){var e=this.target.getShapeAt(a,b,d);return e!==c&&this.shapes[e]!==c?this.shapes[e]:c},getCurrentRegionFields:function(){var a=this.currentRegion;return{fieldkey:a.substr(0,1),value:this.values[a.substr(1)],region:a}},changeHighlight:function(a){var b=this.currentRegion,c=this.valueShapes[b],d;delete this.shapes[c];switch(b.substr(0,1)){case"r":d=this.renderRange(b.substr(1),a);break;case"p":d=this.renderPerformance(a);break;case"t":d=this.renderTarget(a)}this.valueShapes[b]=d.id,this.shapes[d.id]=b,this.target.replaceWithShape(c,d)},renderRange:function(a,c){var d=this.values[a],e=b.round(this.canvasWidth*((d-this.min)/this.range)),f=this.options.get("rangeColors")[a-2];return c&&(f=this.calcHighlightColor(f,this.options)),this.target.drawRect(0,0,e-1,this.canvasHeight-1,f,f)},renderPerformance:function(a){var c=this.values[1],d=b.round(this.canvasWidth*((c-this.min)/this.range)),e=this.options.get("performanceColor");return a&&(e=this.calcHighlightColor(e,this.options)),this.target.drawRect(0,b.round(this.canvasHeight*.3),d-1,b.round(this.canvasHeight*.4)-1,e,e)},renderTarget:function(a){var c=this.values[0],d=b.round(this.canvasWidth*((c-this.min)/this.range)-this.options.get("targetWidth")/2),e=b.round(this.canvasHeight*.1),f=this.canvasHeight-e*2,g=this.options.get("targetColor");return a&&(g=this.calcHighlightColor(g,this.options)),this.target.drawRect(d,e,this.options.get("targetWidth")-1,f-1,g,g)},render:function(){var a=this.values.length,b=this.target,c,d;if(!B._super.render.call(this))return;for(c=2;c<a;c++)d=this.renderRange(c).append(),this.shapes[d.id]="r"+c,this.valueShapes["r"+c]=d.id;this.values[1]!==null&&(d=this.renderPerformance().append(),this.shapes[d.id]="p1",this.valueShapes.p1=d.id),this.values[0]!==null&&(d=this.renderTarget().append(),this.shapes[d.id]="t0",this.valueShapes.t0=d.id),b.render()}}),d.fn.sparkline.pie=C=g(d.fn.sparkline._base,{type:"pie",init:function(a,c,e,f,g){var h=0,i;C._super.init.call(this,a,c,e,f,g),this.shapes={},this.valueShapes={},this.values=c=d.map(c,Number),e.get("width")==="auto"&&(this.width=this.height);if(c.length>0)for(i=c.length;i--;)h+=c[i];this.total=h,this.initTarget(),this.radius=b.floor(b.min(this.canvasWidth,this.canvasHeight)/2)},getRegion:function(a,b,d){var e=this.target.getShapeAt(a,b,d);return e!==c&&this.shapes[e]!==c?this.shapes[e]:c},getCurrentRegionFields:function(){var a=this.currentRegion;return{isNull:this.values[a]===c,value:this.values[a],percent:this.values[a]/this.total*100,color:this.options.get("sliceColors")[a%this.options.get("sliceColors").length],offset:a}},changeHighlight:function(a){var b=this.currentRegion,c=this.renderSlice(b,a),d=this.valueShapes[b];delete this.shapes[d],this.target.replaceWithShape(d,c),this.valueShapes[b]=c.id,this.shapes[c.id]=b},renderSlice:function(a,d){var e=this.target,f=this.options,g=this.radius,h=f.get("borderWidth"),i=f.get("offset"),j=2*b.PI,k=this.values,l=this.total,m=i?2*b.PI*(i/360):0,n,o,p,q,r;q=k.length;for(p=0;p<q;p++){n=m,o=m,l>0&&(o=m+j*(k[p]/l));if(a===p)return r=f.get("sliceColors")[p%f.get("sliceColors").length],d&&(r=this.calcHighlightColor(r,f)),e.drawPieSlice(g,g,g-h,n,o,c,r);m=o}},render:function(){var a=this.target,d=this.values,e=this.options,f=this.radius,g=e.get("borderWidth"),h,i;if(!C._super.render.call(this))return;g&&a.drawCircle(f,f,b.floor(f-g/2),e.get("borderColor"),c,g).append();for(i=d.length;i--;)d[i]&&(h=this.renderSlice(i).append(),this.valueShapes[i]=h.id,this.shapes[h.id]=i);a.render()}}),d.fn.sparkline.box=D=g(d.fn.sparkline._base,{type:"box",init:function(a,b,c,e,f){D._super.init.call(this,a,b,c,e,f),this.values=d.map(b,Number),this.width=c.get("width")==="auto"?"4.0em":e,this.initTarget(),this.values.length||(this.disabled=1)},getRegion:function(){return 1},getCurrentRegionFields:function(){var a=[{field:"lq",value:this.quartiles[0]},{field:"med",value:this.quartiles
+ [1]},{field:"uq",value:this.quartiles[2]}];return this.loutlier!==c&&a.push({field:"lo",value:this.loutlier}),this.routlier!==c&&a.push({field:"ro",value:this.routlier}),this.lwhisker!==c&&a.push({field:"lw",value:this.lwhisker}),this.rwhisker!==c&&a.push({field:"rw",value:this.rwhisker}),a},render:function(){var a=this.target,d=this.values,e=d.length,f=this.options,g=this.canvasWidth,h=this.canvasHeight,i=f.get("chartRangeMin")===c?b.min.apply(b,d):f.get("chartRangeMin"),k=f.get("chartRangeMax")===c?b.max.apply(b,d):f.get("chartRangeMax"),l=0,m,n,o,p,q,r,s,t,u,v,w;if(!D._super.render.call(this))return;if(f.get("raw"))f.get("showOutliers")&&d.length>5?(n=d[0],m=d[1],p=d[2],q=d[3],r=d[4],s=d[5],t=d[6]):(m=d[0],p=d[1],q=d[2],r=d[3],s=d[4]);else{d.sort(function(a,b){return a-b}),p=j(d,1),q=j(d,2),r=j(d,3),o=r-p;if(f.get("showOutliers")){m=s=c;for(u=0;u<e;u++)m===c&&d[u]>p-o*f.get("outlierIQR")&&(m=d[u]),d[u]<r+o*f.get("outlierIQR")&&(s=d[u]);n=d[0],t=d[e-1]}else m=d[0],s=d[e-1]}this.quartiles=[p,q,r],this.lwhisker=m,this.rwhisker=s,this.loutlier=n,this.routlier=t,w=g/(k-i+1),f.get("showOutliers")&&(l=b.ceil(f.get("spotRadius")),g-=2*b.ceil(f.get("spotRadius")),w=g/(k-i+1),n<m&&a.drawCircle((n-i)*w+l,h/2,f.get("spotRadius"),f.get("outlierLineColor"),f.get("outlierFillColor")).append(),t>s&&a.drawCircle((t-i)*w+l,h/2,f.get("spotRadius"),f.get("outlierLineColor"),f.get("outlierFillColor")).append()),a.drawRect(b.round((p-i)*w+l),b.round(h*.1),b.round((r-p)*w),b.round(h*.8),f.get("boxLineColor"),f.get("boxFillColor")).append(),a.drawLine(b.round((m-i)*w+l),b.round(h/2),b.round((p-i)*w+l),b.round(h/2),f.get("lineColor")).append(),a.drawLine(b.round((m-i)*w+l),b.round(h/4),b.round((m-i)*w+l),b.round(h-h/4),f.get("whiskerColor")).append(),a.drawLine(b.round((s-i)*w+l),b.round(h/2),b.round((r-i)*w+l),b.round(h/2),f.get("lineColor")).append(),a.drawLine(b.round((s-i)*w+l),b.round(h/4),b.round((s-i)*w+l),b.round(h-h/4),f.get("whiskerColor")).append(),a.drawLine(b.round((q-i)*w+l),b.round(h*.1),b.round((q-i)*w+l),b.round(h*.9),f.get("medianColor")).append(),f.get("target")&&(v=b.ceil(f.get("spotRadius")),a.drawLine(b.round((f.get("target")-i)*w+l),b.round(h/2-v),b.round((f.get("target")-i)*w+l),b.round(h/2+v),f.get("targetColor")).append(),a.drawLine(b.round((f.get("target")-i)*w+l-v),b.round(h/2),b.round((f.get("target")-i)*w+l+v),b.round(h/2),f.get("targetColor")).append()),a.render()}}),G=g({init:function(a,b,c,d){this.target=a,this.id=b,this.type=c,this.args=d},append:function(){return this.target.appendShape(this),this}}),H=g({_pxregex:/(\d+)(px)?\s*$/i,init:function(a,b,c){if(!a)return;this.width=a,this.height=b,this.target=c,this.lastShapeId=null,c[0]&&(c=c[0]),d.data(c,"_jqs_vcanvas",this)},drawLine:function(a,b,c,d,e,f){return this.drawShape([[a,b],[c,d]],e,f)},drawShape:function(a,b,c,d){return this._genShape("Shape",[a,b,c,d])},drawCircle:function(a,b,c,d,e,f){return this._genShape("Circle",[a,b,c,d,e,f])},drawPieSlice:function(a,b,c,d,e,f,g){return this._genShape("PieSlice",[a,b,c,d,e,f,g])},drawRect:function(a,b,c,d,e,f){return this._genShape("Rect",[a,b,c,d,e,f])},getElement:function(){return this.canvas},getLastShapeId:function(){return this.lastShapeId},reset:function(){alert("reset not implemented")},_insert:function(a,b){d(b).html(a)},_calculatePixelDims:function(a,b,c){var e;e=this._pxregex.exec(b),e?this.pixelHeight=e[1]:this.pixelHeight=d(c).height(),e=this._pxregex.exec(a),e?this.pixelWidth=e[1]:this.pixelWidth=d(c).width()},_genShape:function(a,b){var c=L++;return b.unshift(c),new G(this,c,a,b)},appendShape:function(a){alert("appendShape not implemented")},replaceWithShape:function(a,b){alert("replaceWithShape not implemented")},insertAfterShape:function(a,b){alert("insertAfterShape not implemented")},removeShapeId:function(a){alert("removeShapeId not implemented")},getShapeAt:function(a,b,c){alert("getShapeAt not implemented")},render:function(){alert("render not implemented")}}),I=g(H,{init:function(b,e,f,g){I._super.init.call(this,b,e,f),this.canvas=a.createElement("canvas"),f[0]&&(f=f[0]),d.data(f,"_jqs_vcanvas",this),d(this.canvas).css({display:"inline-block",width:b,height:e,verticalAlign:"top"}),this._insert(this.canvas,f),this._calculatePixelDims(b,e,this.canvas),this.canvas.width=this.pixelWidth,this.canvas.height=this.pixelHeight,this.interact=g,this.shapes={},this.shapeseq=[],this.currentTargetShapeId=c,d(this.canvas).css({width:this.pixelWidth,height:this.pixelHeight})},_getContext:function(a,b,d){var e=this.canvas.getContext("2d");return a!==c&&(e.strokeStyle=a),e.lineWidth=d===c?1:d,b!==c&&(e.fillStyle=b),e},reset:function(){var a=this._getContext();a.clearRect(0,0,this.pixelWidth,this.pixelHeight),this.shapes={},this.shapeseq=[],this.currentTargetShapeId=c},_drawShape:function(a,b,d,e,f){var g=this._getContext(d,e,f),h,i;g.beginPath(),g.moveTo(b[0][0]+.5,b[0][1]+.5);for(h=1,i=b.length;h<i;h++)g.lineTo(b[h][0]+.5,b[h][1]+.5);d!==c&&g.stroke(),e!==c&&g.fill(),this.targetX!==c&&this.targetY!==c&&g.isPointInPath(this.targetX,this.targetY)&&(this.currentTargetShapeId=a)},_drawCircle:function(a,d,e,f,g,h,i){var j=this._getContext(g,h,i);j.beginPath(),j.arc(d,e,f,0,2*b.PI,!1),this.targetX!==c&&this.targetY!==c&&j.isPointInPath(this.targetX,this.targetY)&&(this.currentTargetShapeId=a),g!==c&&j.stroke(),h!==c&&j.fill()},_drawPieSlice:function(a,b,d,e,f,g,h,i){var j=this._getContext(h,i);j.beginPath(),j.moveTo(b,d),j.arc(b,d,e,f,g,!1),j.lineTo(b,d),j.closePath(),h!==c&&j.stroke(),i&&j.fill(),this.targetX!==c&&this.targetY!==c&&j.isPointInPath(this.targetX,this.targetY)&&(this.currentTargetShapeId=a)},_drawRect:function(a,b,c,d,e,f,g){return this._drawShape(a,[[b,c],[b+d,c],[b+d,c+e],[b,c+e],[b,c]],f,g)},appendShape:function(a){return this.shapes[a.id]=a,this.shapeseq.push(a.id),this.lastShapeId=a.id,a.id},replaceWithShape:function(a,b){var c=this.shapeseq,d;this.shapes[b.id]=b;for(d=c.length;d--;)c[d]==a&&(c[d]=b.id);delete this.shapes[a]},replaceWithShapes:function(a,b){var c=this.shapeseq,d={},e,f,g;for(f=a.length;f--;)d[a[f]]=!0;for(f=c.length;f--;)e=c[f],d[e]&&(c.splice(f,1),delete this.shapes[e],g=f);for(f=b.length;f--;)c.splice(g,0,b[f].id),this.shapes[b[f].id]=b[f]},insertAfterShape:function(a,b){var c=this.shapeseq,d;for(d=c.length;d--;)if(c[d]===a){c.splice(d+1,0,b.id),this.shapes[b.id]=b;return}},removeShapeId:function(a){var b=this.shapeseq,c;for(c=b.length;c--;)if(b[c]===a){b.splice(c,1);break}delete this.shapes[a]},getShapeAt:function(a,b,c){return this.targetX=b,this.targetY=c,this.render(),this.currentTargetShapeId},render:function(){var a=this.shapeseq,b=this.shapes,c=a.length,d=this._getContext(),e,f,g;d.clearRect(0,0,this.pixelWidth,this.pixelHeight);for(g=0;g<c;g++)e=a[g],f=b[e],this["_draw"+f.type].apply(this,f.args);this.interact||(this.shapes={},this.shapeseq=[])}}),J=g(H,{init:function(b,c,e){var f;J._super.init.call(this,b,c,e),e[0]&&(e=e[0]),d.data(e,"_jqs_vcanvas",this),this.canvas=a.createElement("span"),d(this.canvas).css({display:"inline-block",position:"relative",overflow:"hidden",width:b,height:c,margin:"0px",padding:"0px",verticalAlign:"top"}),this._insert(this.canvas,e),this._calculatePixelDims(b,c,this.canvas),this.canvas.width=this.pixelWidth,this.canvas.height=this.pixelHeight,f='<v:group coordorigin="0 0" coordsize="'+this.pixelWidth+" "+this.pixelHeight+'"'+' style="position:absolute;top:0;left:0;width:'+this.pixelWidth+"px;height="+this.pixelHeight+'px;"></v:group>',this.canvas.insertAdjacentHTML("beforeEnd",f),this.group=d(this.canvas).children()[0],this.rendered=!1,this.prerender=""},_drawShape:function(a,b,d,e,f){var g=[],h,i,j,k,l,m,n;for(n=0,m=b.length;n<m;n++)g[n]=""+b[n][0]+","+b[n][1];return h=g.splice(0,1),f=f===c?1:f,i=d===c?' stroked="false" ':' strokeWeight="'+f+'px" strokeColor="'+d+'" ',j=e===c?' filled="false"':' fillColor="'+e+'" filled="true" ',k=g[0]===g[g.length-1]?"x ":"",l='<v:shape coordorigin="0 0" coordsize="'+this.pixelWidth+" "+this.pixelHeight+'" '+' id="jqsshape'+a+'" '+i+j+' style="position:absolute;left:0px;top:0px;height:'+this.pixelHeight+"px;width:"+this.pixelWidth+'px;padding:0px;margin:0px;" '+' path="m '+h+" l "+g.join(", ")+" "+k+'e">'+" </v:shape>",l},_drawCircle:function(a,b,d,e,f,g,h){var i,j,k;return b-=e,d-=e,i=f===c?' stroked="false" ':' strokeWeight="'+h+'px" strokeColor="'+f+'" ',j=g===c?' filled="false"':' fillColor="'+g+'" filled="true" ',k='<v:oval id="jqsshape'+a+'" '+i+j+' style="position:absolute;top:'+d+"px; left:"+b+"px; width:"+e*2+"px; height:"+e*2+'px"></v:oval>',k},_drawPieSlice:function(a,d,e,f,g,h,i,j){var k,l,m,n,o,p,q,r;if(g===h)return"";h-g===2*b.PI&&(g=0,h=2*b.PI),l=d+b.round(b.cos(g)*f),m=e+b.round(b.sin(g)*f),n=d+b.round(b.cos(h)*f),o=e+b.round(b.sin(h)*f);if(l===n&&m===o){if(h-g<b.PI)return"";l=n=d+f,m=o=e}return l===n&&m===o&&h-g<b.PI?"":(k=[d-f,e-f,d+f,e+f,l,m,n,o],p=i===c?' stroked="false" ':' strokeWeight="1px" strokeColor="'+i+'" ',q=j===c?' filled="false"':' fillColor="'+j+'" filled="true" ',r='<v:shape coordorigin="0 0" coordsize="'+this.pixelWidth+" "+this.pixelHeight+'" '+' id="jqsshape'+a+'" '+p+q+' style="position:absolute;left:0px;top:0px;height:'+this.pixelHeight+"px;width:"+this.pixelWidth+'px;padding:0px;margin:0px;" '+' path="m '+d+","+e+" wa "+k.join(", ")+' x e">'+" </v:shape>",r)},_drawRect:function(a,b,c,d,e,f,g){return this._drawShape(a,[[b,c],[b,c+e],[b+d,c+e],[b+d,c],[b,c]],f,g)},reset:function(){this.group.innerHTML=""},appendShape:function(a){var b=this["_draw"+a.type].apply(this,a.args);return this.rendered?this.group.insertAdjacentHTML("beforeEnd",b):this.prerender+=b,this.lastShapeId=a.id,a.id},replaceWithShape:function(a,b){var c=d("#jqsshape"+a),e=this["_draw"+b.type].apply(this,b.args);c[0].outerHTML=e},replaceWithShapes:function(a,b){var c=d("#jqsshape"+a[0]),e="",f=b.length,g;for(g=0;g<f;g++)e+=this["_draw"+b[g].type].apply(this,b[g].args);c[0].outerHTML=e;for(g=1;g<a.length;g++)d("#jqsshape"+a[g]).remove()},insertAfterShape:function(a,b){var c=d("#jqsshape"+a),e=this["_draw"+b.type].apply(this,b.args);c[0].insertAdjacentHTML("afterEnd",e)},removeShapeId:function(a){var b=d("#jqsshape"+a);this.group.removeChild(b[0])},getShapeAt:function(a,b,c){var d=a.id.substr(8);return d},render:function(){this.rendered||(this.group.innerHTML=this.prerender,this.rendered=!0)}})})})(document,Math);
\ No newline at end of file
diff --git a/management/guns-admin/src/main/webapp/static/js/md5.js b/management/guns-admin/src/main/webapp/static/js/md5.js
new file mode 100644
index 0000000..46d2aab
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/static/js/md5.js
@@ -0,0 +1,256 @@
+/*
+ * A JavaScript implementation of the RSA Data Security, Inc. MD5 Message
+ * Digest Algorithm, as defined in RFC 1321.
+ * Version 2.1 Copyright (C) Paul Johnston 1999 - 2002.
+ * Other contributors: Greg Holt, Andrew Kepert, Ydnar, Lostinet
+ * Distributed under the BSD License
+ * See http://pajhome.org.uk/crypt/md5 for more info.
+ */
+
+/*
+ * Configurable variables. You may need to tweak these to be compatible with
+ * the server-side, but the defaults work in most cases.
+ */
+var hexcase = 0; /* hex output format. 0 - lowercase; 1 - uppercase */
+var b64pad = ""; /* base-64 pad character. "=" for strict RFC compliance */
+var chrsz = 8; /* bits per input character. 8 - ASCII; 16 - Unicode */
+
+/*
+ * These are the functions you'll usually want to call
+ * They take string arguments and return either hex or base-64 encoded strings
+ */
+function hex_md5(s){ return binl2hex(core_md5(str2binl(s), s.length * chrsz));}
+function b64_md5(s){ return binl2b64(core_md5(str2binl(s), s.length * chrsz));}
+function str_md5(s){ return binl2str(core_md5(str2binl(s), s.length * chrsz));}
+function hex_hmac_md5(key, data) { return binl2hex(core_hmac_md5(key, data)); }
+function b64_hmac_md5(key, data) { return binl2b64(core_hmac_md5(key, data)); }
+function str_hmac_md5(key, data) { return binl2str(core_hmac_md5(key, data)); }
+
+/*
+ * Perform a simple self-test to see if the VM is working
+ */
+function md5_vm_test()
+{
+ return hex_md5("abc") == "900150983cd24fb0d6963f7d28e17f72";
+}
+
+/*
+ * Calculate the MD5 of an array of little-endian words, and a bit length
+ */
+function core_md5(x, len)
+{
+ /* append padding */
+ x[len >> 5] |= 0x80 << ((len) % 32);
+ x[(((len + 64) >>> 9) << 4) + 14] = len;
+
+ var a = 1732584193;
+ var b = -271733879;
+ var c = -1732584194;
+ var d = 271733878;
+
+ for(var i = 0; i < x.length; i += 16)
+ {
+ var olda = a;
+ var oldb = b;
+ var oldc = c;
+ var oldd = d;
+
+ a = md5_ff(a, b, c, d, x[i+ 0], 7 , -680876936);
+ d = md5_ff(d, a, b, c, x[i+ 1], 12, -389564586);
+ c = md5_ff(c, d, a, b, x[i+ 2], 17, 606105819);
+ b = md5_ff(b, c, d, a, x[i+ 3], 22, -1044525330);
+ a = md5_ff(a, b, c, d, x[i+ 4], 7 , -176418897);
+ d = md5_ff(d, a, b, c, x[i+ 5], 12, 1200080426);
+ c = md5_ff(c, d, a, b, x[i+ 6], 17, -1473231341);
+ b = md5_ff(b, c, d, a, x[i+ 7], 22, -45705983);
+ a = md5_ff(a, b, c, d, x[i+ 8], 7 , 1770035416);
+ d = md5_ff(d, a, b, c, x[i+ 9], 12, -1958414417);
+ c = md5_ff(c, d, a, b, x[i+10], 17, -42063);
+ b = md5_ff(b, c, d, a, x[i+11], 22, -1990404162);
+ a = md5_ff(a, b, c, d, x[i+12], 7 , 1804603682);
+ d = md5_ff(d, a, b, c, x[i+13], 12, -40341101);
+ c = md5_ff(c, d, a, b, x[i+14], 17, -1502002290);
+ b = md5_ff(b, c, d, a, x[i+15], 22, 1236535329);
+
+ a = md5_gg(a, b, c, d, x[i+ 1], 5 , -165796510);
+ d = md5_gg(d, a, b, c, x[i+ 6], 9 , -1069501632);
+ c = md5_gg(c, d, a, b, x[i+11], 14, 643717713);
+ b = md5_gg(b, c, d, a, x[i+ 0], 20, -373897302);
+ a = md5_gg(a, b, c, d, x[i+ 5], 5 , -701558691);
+ d = md5_gg(d, a, b, c, x[i+10], 9 , 38016083);
+ c = md5_gg(c, d, a, b, x[i+15], 14, -660478335);
+ b = md5_gg(b, c, d, a, x[i+ 4], 20, -405537848);
+ a = md5_gg(a, b, c, d, x[i+ 9], 5 , 568446438);
+ d = md5_gg(d, a, b, c, x[i+14], 9 , -1019803690);
+ c = md5_gg(c, d, a, b, x[i+ 3], 14, -187363961);
+ b = md5_gg(b, c, d, a, x[i+ 8], 20, 1163531501);
+ a = md5_gg(a, b, c, d, x[i+13], 5 , -1444681467);
+ d = md5_gg(d, a, b, c, x[i+ 2], 9 , -51403784);
+ c = md5_gg(c, d, a, b, x[i+ 7], 14, 1735328473);
+ b = md5_gg(b, c, d, a, x[i+12], 20, -1926607734);
+
+ a = md5_hh(a, b, c, d, x[i+ 5], 4 , -378558);
+ d = md5_hh(d, a, b, c, x[i+ 8], 11, -2022574463);
+ c = md5_hh(c, d, a, b, x[i+11], 16, 1839030562);
+ b = md5_hh(b, c, d, a, x[i+14], 23, -35309556);
+ a = md5_hh(a, b, c, d, x[i+ 1], 4 , -1530992060);
+ d = md5_hh(d, a, b, c, x[i+ 4], 11, 1272893353);
+ c = md5_hh(c, d, a, b, x[i+ 7], 16, -155497632);
+ b = md5_hh(b, c, d, a, x[i+10], 23, -1094730640);
+ a = md5_hh(a, b, c, d, x[i+13], 4 , 681279174);
+ d = md5_hh(d, a, b, c, x[i+ 0], 11, -358537222);
+ c = md5_hh(c, d, a, b, x[i+ 3], 16, -722521979);
+ b = md5_hh(b, c, d, a, x[i+ 6], 23, 76029189);
+ a = md5_hh(a, b, c, d, x[i+ 9], 4 , -640364487);
+ d = md5_hh(d, a, b, c, x[i+12], 11, -421815835);
+ c = md5_hh(c, d, a, b, x[i+15], 16, 530742520);
+ b = md5_hh(b, c, d, a, x[i+ 2], 23, -995338651);
+
+ a = md5_ii(a, b, c, d, x[i+ 0], 6 , -198630844);
+ d = md5_ii(d, a, b, c, x[i+ 7], 10, 1126891415);
+ c = md5_ii(c, d, a, b, x[i+14], 15, -1416354905);
+ b = md5_ii(b, c, d, a, x[i+ 5], 21, -57434055);
+ a = md5_ii(a, b, c, d, x[i+12], 6 , 1700485571);
+ d = md5_ii(d, a, b, c, x[i+ 3], 10, -1894986606);
+ c = md5_ii(c, d, a, b, x[i+10], 15, -1051523);
+ b = md5_ii(b, c, d, a, x[i+ 1], 21, -2054922799);
+ a = md5_ii(a, b, c, d, x[i+ 8], 6 , 1873313359);
+ d = md5_ii(d, a, b, c, x[i+15], 10, -30611744);
+ c = md5_ii(c, d, a, b, x[i+ 6], 15, -1560198380);
+ b = md5_ii(b, c, d, a, x[i+13], 21, 1309151649);
+ a = md5_ii(a, b, c, d, x[i+ 4], 6 , -145523070);
+ d = md5_ii(d, a, b, c, x[i+11], 10, -1120210379);
+ c = md5_ii(c, d, a, b, x[i+ 2], 15, 718787259);
+ b = md5_ii(b, c, d, a, x[i+ 9], 21, -343485551);
+
+ a = safe_add(a, olda);
+ b = safe_add(b, oldb);
+ c = safe_add(c, oldc);
+ d = safe_add(d, oldd);
+ }
+ return Array(a, b, c, d);
+
+}
+
+/*
+ * These functions implement the four basic operations the algorithm uses.
+ */
+function md5_cmn(q, a, b, x, s, t)
+{
+ return safe_add(bit_rol(safe_add(safe_add(a, q), safe_add(x, t)), s),b);
+}
+function md5_ff(a, b, c, d, x, s, t)
+{
+ return md5_cmn((b & c) | ((~b) & d), a, b, x, s, t);
+}
+function md5_gg(a, b, c, d, x, s, t)
+{
+ return md5_cmn((b & d) | (c & (~d)), a, b, x, s, t);
+}
+function md5_hh(a, b, c, d, x, s, t)
+{
+ return md5_cmn(b ^ c ^ d, a, b, x, s, t);
+}
+function md5_ii(a, b, c, d, x, s, t)
+{
+ return md5_cmn(c ^ (b | (~d)), a, b, x, s, t);
+}
+
+/*
+ * Calculate the HMAC-MD5, of a key and some data
+ */
+function core_hmac_md5(key, data)
+{
+ var bkey = str2binl(key);
+ if(bkey.length > 16) bkey = core_md5(bkey, key.length * chrsz);
+
+ var ipad = Array(16), opad = Array(16);
+ for(var i = 0; i < 16; i++)
+ {
+ ipad[i] = bkey[i] ^ 0x36363636;
+ opad[i] = bkey[i] ^ 0x5C5C5C5C;
+ }
+
+ var hash = core_md5(ipad.concat(str2binl(data)), 512 + data.length * chrsz);
+ return core_md5(opad.concat(hash), 512 + 128);
+}
+
+/*
+ * Add integers, wrapping at 2^32. This uses 16-bit operations internally
+ * to work around bugs in some JS interpreters.
+ */
+function safe_add(x, y)
+{
+ var lsw = (x & 0xFFFF) + (y & 0xFFFF);
+ var msw = (x >> 16) + (y >> 16) + (lsw >> 16);
+ return (msw << 16) | (lsw & 0xFFFF);
+}
+
+/*
+ * Bitwise rotate a 32-bit number to the left.
+ */
+function bit_rol(num, cnt)
+{
+ return (num << cnt) | (num >>> (32 - cnt));
+}
+
+/*
+ * Convert a string to an array of little-endian words
+ * If chrsz is ASCII, characters >255 have their hi-byte silently ignored.
+ */
+function str2binl(str)
+{
+ var bin = Array();
+ var mask = (1 << chrsz) - 1;
+ for(var i = 0; i < str.length * chrsz; i += chrsz)
+ bin[i>>5] |= (str.charCodeAt(i / chrsz) & mask) << (i%32);
+ return bin;
+}
+
+/*
+ * Convert an array of little-endian words to a string
+ */
+function binl2str(bin)
+{
+ var str = "";
+ var mask = (1 << chrsz) - 1;
+ for(var i = 0; i < bin.length * 32; i += chrsz)
+ str += String.fromCharCode((bin[i>>5] >>> (i % 32)) & mask);
+ return str;
+}
+
+/*
+ * Convert an array of little-endian words to a hex string.
+ */
+function binl2hex(binarray)
+{
+ var hex_tab = hexcase ? "0123456789ABCDEF" : "0123456789abcdef";
+ var str = "";
+ for(var i = 0; i < binarray.length * 4; i++)
+ {
+ str += hex_tab.charAt((binarray[i>>2] >> ((i%4)*8+4)) & 0xF) +
+ hex_tab.charAt((binarray[i>>2] >> ((i%4)*8 )) & 0xF);
+ }
+ return str;
+}
+
+/*
+ * Convert an array of little-endian words to a base-64 string
+ */
+function binl2b64(binarray)
+{
+ var tab = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
+ var str = "";
+ for(var i = 0; i < binarray.length * 4; i += 3)
+ {
+ var triplet = (((binarray[i >> 2] >> 8 * ( i %4)) & 0xFF) << 16)
+ | (((binarray[i+1 >> 2] >> 8 * ((i+1)%4)) & 0xFF) << 8 )
+ | ((binarray[i+2 >> 2] >> 8 * ((i+2)%4)) & 0xFF);
+ for(var j = 0; j < 4; j++)
+ {
+ if(i * 8 + j * 6 > binarray.length * 32) str += b64pad;
+ else str += tab.charAt((triplet >> 6*(3-j)) & 0x3F);
+ }
+ }
+ return str;
+}
diff --git a/management/guns-admin/src/main/webapp/static/js/plugins/bootstrap-table/bootstrap-table-mobile.min.js b/management/guns-admin/src/main/webapp/static/js/plugins/bootstrap-table/bootstrap-table-mobile.min.js
new file mode 100644
index 0000000..606b062
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/static/js/plugins/bootstrap-table/bootstrap-table-mobile.min.js
@@ -0,0 +1,7 @@
+/*
+* bootstrap-table - v1.11.1 - 2017-02-22
+* https://github.com/wenzhixin/bootstrap-table
+* Copyright (c) 2017 zhixin wen
+* Licensed MIT License
+*/
+!function(a){"use strict";var b=function(b,c){b.options.columnsHidden.length>0&&a.each(b.columns,function(d,e){-1!==b.options.columnsHidden.indexOf(e.field)&&e.visible!==c&&b.toggleColumn(a.fn.bootstrapTable.utils.getFieldIndex(b.columns,e.field),c,!0)})},c=function(a){(a.options.height||a.options.showFooter)&&setTimeout(function(){a.resetView.call(a)},1)},d=function(a,b,d){a.options.minHeight?b<=a.options.minWidth&&d<=a.options.minHeight?e(a):b>a.options.minWidth&&d>a.options.minHeight&&f(a):b<=a.options.minWidth?e(a):b>a.options.minWidth&&f(a),c(a)},e=function(a){g(a,!1),b(a,!1)},f=function(a){g(a,!0),b(a,!0)},g=function(a,b){a.options.cardView=b,a.toggleView()},h=function(a,b){var c;return function(){var d=this,e=arguments,f=function(){c=null,a.apply(d,e)};clearTimeout(c),c=setTimeout(f,b)}};a.extend(a.fn.bootstrapTable.defaults,{mobileResponsive:!1,minWidth:562,minHeight:void 0,heightThreshold:100,checkOnInit:!0,columnsHidden:[]});var i=a.fn.bootstrapTable.Constructor,j=i.prototype.init;i.prototype.init=function(){if(j.apply(this,Array.prototype.slice.apply(arguments)),this.options.mobileResponsive&&this.options.minWidth){this.options.minWidth<100&&this.options.resizable&&(console.log("The minWidth when the resizable extension is active should be greater or equal than 100"),this.options.minWidth=100);var b=this,c={width:a(window).width(),height:a(window).height()};if(a(window).on("resize orientationchange",h(function(){var e=a(this).height(),f=a(this).width();(Math.abs(c.height-e)>b.options.heightThreshold||c.width!=f)&&(d(b,f,e),c={width:f,height:e})},200)),this.options.checkOnInit){var e=a(window).height(),f=a(window).width();d(this,f,e),c={width:f,height:e}}}}}(jQuery);
\ No newline at end of file
diff --git a/management/guns-admin/src/main/webapp/static/js/plugins/bootstrap-table/bootstrap-table.min.js b/management/guns-admin/src/main/webapp/static/js/plugins/bootstrap-table/bootstrap-table.min.js
new file mode 100644
index 0000000..e03a0a4
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/static/js/plugins/bootstrap-table/bootstrap-table.min.js
@@ -0,0 +1,8 @@
+/*
+* bootstrap-table - v1.11.1 - 2017-02-22
+* https://github.com/wenzhixin/bootstrap-table
+* Copyright (c) 2017 zhixin wen
+* Licensed MIT License
+*/
+!function(a){"use strict";var b=null,c=function(a){var b=arguments,c=!0,d=1;return a=a.replace(/%s/g,function(){var a=b[d++];return"undefined"==typeof a?(c=!1,""):a}),c?a:""},d=function(b,c,d,e){var f="";return a.each(b,function(a,b){return b[c]===e?(f=b[d],!1):!0}),f},e=function(b,c){var d=-1;return a.each(b,function(a,b){return b.field===c?(d=a,!1):!0}),d},f=function(b){var c,d,e,f=0,g=[];for(c=0;c<b[0].length;c++)f+=b[0][c].colspan||1;for(c=0;c<b.length;c++)for(g[c]=[],d=0;f>d;d++)g[c][d]=!1;for(c=0;c<b.length;c++)for(d=0;d<b[c].length;d++){var h=b[c][d],i=h.rowspan||1,j=h.colspan||1,k=a.inArray(!1,g[c]);for(1===j&&(h.fieldIndex=k,"undefined"==typeof h.field&&(h.field=k)),e=0;i>e;e++)g[c+e][k]=!0;for(e=0;j>e;e++)g[c][k+e]=!0}},g=function(){if(null===b){var c,d,e=a("<p/>").addClass("fixed-table-scroll-inner"),f=a("<div/>").addClass("fixed-table-scroll-outer");f.append(e),a("body").append(f),c=e[0].offsetWidth,f.css("overflow","scroll"),d=e[0].offsetWidth,c===d&&(d=f[0].clientWidth),f.remove(),b=c-d}return b},h=function(b,d,e,f){var g=d;if("string"==typeof d){var h=d.split(".");h.length>1?(g=window,a.each(h,function(a,b){g=g[b]})):g=window[d]}return"object"==typeof g?g:"function"==typeof g?g.apply(b,e||[]):!g&&"string"==typeof d&&c.apply(this,[d].concat(e))?c.apply(this,[d].concat(e)):f},i=function(b,c,d){var e=Object.getOwnPropertyNames(b),f=Object.getOwnPropertyNames(c),g="";if(d&&e.length!==f.length)return!1;for(var h=0;h<e.length;h++)if(g=e[h],a.inArray(g,f)>-1&&b[g]!==c[g])return!1;return!0},j=function(a){return"string"==typeof a?a.replace(/&/g,"&").replace(/</g,"<").replace(/>/g,">").replace(/"/g,""").replace(/'/g,"'").replace(/`/g,"`"):a},k=function(a){for(var b in a){var c=b.split(/(?=[A-Z])/).join("-").toLowerCase();c!==b&&(a[c]=a[b],delete a[b])}return a},l=function(a,b,c){var d=a;if("string"!=typeof b||a.hasOwnProperty(b))return c?j(a[b]):a[b];var e=b.split(".");for(var f in e)e.hasOwnProperty(f)&&(d=d&&d[e[f]]);return c?j(d):d},m=function(){return!!(navigator.userAgent.indexOf("MSIE ")>0||navigator.userAgent.match(/Trident.*rv\:11\./))},n=function(){Object.keys||(Object.keys=function(){var a=Object.prototype.hasOwnProperty,b=!{toString:null}.propertyIsEnumerable("toString"),c=["toString","toLocaleString","valueOf","hasOwnProperty","isPrototypeOf","propertyIsEnumerable","constructor"],d=c.length;return function(e){if("object"!=typeof e&&("function"!=typeof e||null===e))throw new TypeError("Object.keys called on non-object");var f,g,h=[];for(f in e)a.call(e,f)&&h.push(f);if(b)for(g=0;d>g;g++)a.call(e,c[g])&&h.push(c[g]);return h}}())},o=function(b,c){this.options=c,this.$el=a(b),this.$el_=this.$el.clone(),this.timeoutId_=0,this.timeoutFooter_=0,this.init()};o.DEFAULTS={classes:"table table-hover",sortClass:void 0,locale:void 0,height:void 0,undefinedText:"-",sortName:void 0,sortOrder:"asc",sortStable:!1,striped:!1,columns:[[]],data:[],totalField:"total",dataField:"rows",method:"get",url:void 0,ajax:void 0,cache:!0,contentType:"application/json",dataType:"json",ajaxOptions:{},queryParams:function(a){return a},queryParamsType:"limit",responseHandler:function(a){return a},pagination:!1,onlyInfoPagination:!1,paginationLoop:!0,sidePagination:"client",totalRows:0,pageNumber:1,pageSize:10,pageList:[10,25,50,100],paginationHAlign:"right",paginationVAlign:"bottom",paginationDetailHAlign:"left",paginationPreText:"‹",paginationNextText:"›",search:!1,searchOnEnterKey:!1,strictSearch:!1,searchAlign:"right",selectItemName:"btSelectItem",showHeader:!0,showFooter:!1,showColumns:!1,showPaginationSwitch:!1,showRefresh:!1,showToggle:!1,buttonsAlign:"right",smartDisplay:!0,escape:!1,minimumCountColumns:1,idField:void 0,uniqueId:void 0,cardView:!1,detailView:!1,detailFormatter:function(){return""},trimOnSearch:!0,clickToSelect:!1,singleSelect:!1,toolbar:void 0,toolbarAlign:"left",checkboxHeader:!0,sortable:!0,silentSort:!0,maintainSelected:!1,searchTimeOut:500,searchText:"",iconSize:void 0,buttonsClass:"default",iconsPrefix:"glyphicon",icons:{paginationSwitchDown:"glyphicon-collapse-down icon-chevron-down",paginationSwitchUp:"glyphicon-collapse-up icon-chevron-up",refresh:"glyphicon-refresh icon-refresh",toggle:"glyphicon-list-alt icon-list-alt",columns:"glyphicon-th icon-th",detailOpen:"glyphicon-plus icon-plus",detailClose:"glyphicon-minus icon-minus"},customSearch:a.noop,customSort:a.noop,rowStyle:function(){return{}},rowAttributes:function(){return{}},footerStyle:function(){return{}},onAll:function(){return!1},onClickCell:function(){return!1},onDblClickCell:function(){return!1},onClickRow:function(){return!1},onDblClickRow:function(){return!1},onSort:function(){return!1},onCheck:function(){return!1},onUncheck:function(){return!1},onCheckAll:function(){return!1},onUncheckAll:function(){return!1},onCheckSome:function(){return!1},onUncheckSome:function(){return!1},onLoadSuccess:function(){return!1},onLoadError:function(){return!1},onColumnSwitch:function(){return!1},onPageChange:function(){return!1},onSearch:function(){return!1},onToggle:function(){return!1},onPreBody:function(){return!1},onPostBody:function(){return!1},onPostHeader:function(){return!1},onExpandRow:function(){return!1},onCollapseRow:function(){return!1},onRefreshOptions:function(){return!1},onRefresh:function(){return!1},onResetView:function(){return!1}},o.LOCALES={},o.LOCALES["en-US"]=o.LOCALES.en={formatLoadingMessage:function(){return"Loading, please wait..."},formatRecordsPerPage:function(a){return c("%s rows per page",a)},formatShowingRows:function(a,b,d){return c("Showing %s to %s of %s rows",a,b,d)},formatDetailPagination:function(a){return c("Showing %s rows",a)},formatSearch:function(){return"Search"},formatNoMatches:function(){return"No matching records found"},formatPaginationSwitch:function(){return"Hide/Show pagination"},formatRefresh:function(){return"Refresh"},formatToggle:function(){return"Toggle"},formatColumns:function(){return"Columns"},formatAllRows:function(){return"All"}},a.extend(o.DEFAULTS,o.LOCALES["en-US"]),o.COLUMN_DEFAULTS={radio:!1,checkbox:!1,checkboxEnabled:!0,field:void 0,title:void 0,titleTooltip:void 0,"class":void 0,align:void 0,halign:void 0,falign:void 0,valign:void 0,width:void 0,sortable:!1,order:"asc",visible:!0,switchable:!0,clickToSelect:!0,formatter:void 0,footerFormatter:void 0,events:void 0,sorter:void 0,sortName:void 0,cellStyle:void 0,searchable:!0,searchFormatter:!0,cardVisible:!0,escape:!1},o.EVENTS={"all.bs.table":"onAll","click-cell.bs.table":"onClickCell","dbl-click-cell.bs.table":"onDblClickCell","click-row.bs.table":"onClickRow","dbl-click-row.bs.table":"onDblClickRow","sort.bs.table":"onSort","check.bs.table":"onCheck","uncheck.bs.table":"onUncheck","check-all.bs.table":"onCheckAll","uncheck-all.bs.table":"onUncheckAll","check-some.bs.table":"onCheckSome","uncheck-some.bs.table":"onUncheckSome","load-success.bs.table":"onLoadSuccess","load-error.bs.table":"onLoadError","column-switch.bs.table":"onColumnSwitch","page-change.bs.table":"onPageChange","search.bs.table":"onSearch","toggle.bs.table":"onToggle","pre-body.bs.table":"onPreBody","post-body.bs.table":"onPostBody","post-header.bs.table":"onPostHeader","expand-row.bs.table":"onExpandRow","collapse-row.bs.table":"onCollapseRow","refresh-options.bs.table":"onRefreshOptions","reset-view.bs.table":"onResetView","refresh.bs.table":"onRefresh"},o.prototype.init=function(){this.initLocale(),this.initContainer(),this.initTable(),this.initHeader(),this.initData(),this.initHiddenRows(),this.initFooter(),this.initToolbar(),this.initPagination(),this.initBody(),this.initSearchText(),this.initServer()},o.prototype.initLocale=function(){if(this.options.locale){var b=this.options.locale.split(/-|_/);b[0].toLowerCase(),b[1]&&b[1].toUpperCase(),a.fn.bootstrapTable.locales[this.options.locale]?a.extend(this.options,a.fn.bootstrapTable.locales[this.options.locale]):a.fn.bootstrapTable.locales[b.join("-")]?a.extend(this.options,a.fn.bootstrapTable.locales[b.join("-")]):a.fn.bootstrapTable.locales[b[0]]&&a.extend(this.options,a.fn.bootstrapTable.locales[b[0]])}},o.prototype.initContainer=function(){this.$container=a(['<div class="bootstrap-table">','<div class="fixed-table-toolbar"></div>',"top"===this.options.paginationVAlign||"both"===this.options.paginationVAlign?'<div class="fixed-table-pagination" style="clear: both;"></div>':"",'<div class="fixed-table-container">','<div class="fixed-table-header"><table></table></div>','<div class="fixed-table-body">','<div class="fixed-table-loading">',this.options.formatLoadingMessage(),"</div>","</div>",'<div class="fixed-table-footer"><table><tr></tr></table></div>',"bottom"===this.options.paginationVAlign||"both"===this.options.paginationVAlign?'<div class="fixed-table-pagination"></div>':"","</div>","</div>"].join("")),this.$container.insertAfter(this.$el),this.$tableContainer=this.$container.find(".fixed-table-container"),this.$tableHeader=this.$container.find(".fixed-table-header"),this.$tableBody=this.$container.find(".fixed-table-body"),this.$tableLoading=this.$container.find(".fixed-table-loading"),this.$tableFooter=this.$container.find(".fixed-table-footer"),this.$toolbar=this.$container.find(".fixed-table-toolbar"),this.$pagination=this.$container.find(".fixed-table-pagination"),this.$tableBody.append(this.$el),this.$container.after('<div class="clearfix"></div>'),this.$el.addClass(this.options.classes),this.options.striped&&this.$el.addClass("table-striped"),-1!==a.inArray("table-no-bordered",this.options.classes.split(" "))&&this.$tableContainer.addClass("table-no-bordered")},o.prototype.initTable=function(){var b=this,c=[],d=[];if(this.$header=this.$el.find(">thead"),this.$header.length||(this.$header=a("<thead></thead>").appendTo(this.$el)),this.$header.find("tr").each(function(){var b=[];a(this).find("th").each(function(){"undefined"!=typeof a(this).data("field")&&a(this).data("field",a(this).data("field")+""),b.push(a.extend({},{title:a(this).html(),"class":a(this).attr("class"),titleTooltip:a(this).attr("title"),rowspan:a(this).attr("rowspan")?+a(this).attr("rowspan"):void 0,colspan:a(this).attr("colspan")?+a(this).attr("colspan"):void 0},a(this).data()))}),c.push(b)}),a.isArray(this.options.columns[0])||(this.options.columns=[this.options.columns]),this.options.columns=a.extend(!0,[],c,this.options.columns),this.columns=[],f(this.options.columns),a.each(this.options.columns,function(c,d){a.each(d,function(d,e){e=a.extend({},o.COLUMN_DEFAULTS,e),"undefined"!=typeof e.fieldIndex&&(b.columns[e.fieldIndex]=e),b.options.columns[c][d]=e})}),!this.options.data.length){var e=[];this.$el.find(">tbody>tr").each(function(c){var f={};f._id=a(this).attr("id"),f._class=a(this).attr("class"),f._data=k(a(this).data()),a(this).find(">td").each(function(d){for(var g,h,i=a(this),j=+i.attr("colspan")||1,l=+i.attr("rowspan")||1;e[c]&&e[c][d];d++);for(g=d;d+j>g;g++)for(h=c;c+l>h;h++)e[h]||(e[h]=[]),e[h][g]=!0;var m=b.columns[d].field;f[m]=a(this).html(),f["_"+m+"_id"]=a(this).attr("id"),f["_"+m+"_class"]=a(this).attr("class"),f["_"+m+"_rowspan"]=a(this).attr("rowspan"),f["_"+m+"_colspan"]=a(this).attr("colspan"),f["_"+m+"_title"]=a(this).attr("title"),f["_"+m+"_data"]=k(a(this).data())}),d.push(f)}),this.options.data=d,d.length&&(this.fromHtml=!0)}},o.prototype.initHeader=function(){var b=this,d={},e=[];this.header={fields:[],styles:[],classes:[],formatters:[],events:[],sorters:[],sortNames:[],cellStyles:[],searchables:[]},a.each(this.options.columns,function(f,g){e.push("<tr>"),0===f&&!b.options.cardView&&b.options.detailView&&e.push(c('<th class="detail" rowspan="%s"><div class="fht-cell"></div></th>',b.options.columns.length)),a.each(g,function(a,f){var g="",h="",i="",k="",l=c(' class="%s"',f["class"]),m=(b.options.sortOrder||f.order,"px"),n=f.width;if(void 0===f.width||b.options.cardView||"string"==typeof f.width&&-1!==f.width.indexOf("%")&&(m="%"),f.width&&"string"==typeof f.width&&(n=f.width.replace("%","").replace("px","")),h=c("text-align: %s; ",f.halign?f.halign:f.align),i=c("text-align: %s; ",f.align),k=c("vertical-align: %s; ",f.valign),k+=c("width: %s; ",!f.checkbox&&!f.radio||n?n?n+m:void 0:"36px"),"undefined"!=typeof f.fieldIndex){if(b.header.fields[f.fieldIndex]=f.field,b.header.styles[f.fieldIndex]=i+k,b.header.classes[f.fieldIndex]=l,b.header.formatters[f.fieldIndex]=f.formatter,b.header.events[f.fieldIndex]=f.events,b.header.sorters[f.fieldIndex]=f.sorter,b.header.sortNames[f.fieldIndex]=f.sortName,b.header.cellStyles[f.fieldIndex]=f.cellStyle,b.header.searchables[f.fieldIndex]=f.searchable,!f.visible)return;if(b.options.cardView&&!f.cardVisible)return;d[f.field]=f}e.push("<th"+c(' title="%s"',f.titleTooltip),f.checkbox||f.radio?c(' class="bs-checkbox %s"',f["class"]||""):l,c(' style="%s"',h+k),c(' rowspan="%s"',f.rowspan),c(' colspan="%s"',f.colspan),c(' data-field="%s"',f.field),">"),e.push(c('<div class="th-inner %s">',b.options.sortable&&f.sortable?"sortable both":"")),g=b.options.escape?j(f.title):f.title,f.checkbox&&(!b.options.singleSelect&&b.options.checkboxHeader&&(g='<input name="btSelectAll" type="checkbox" />'),b.header.stateField=f.field),f.radio&&(g="",b.header.stateField=f.field,b.options.singleSelect=!0),e.push(g),e.push("</div>"),e.push('<div class="fht-cell"></div>'),e.push("</div>"),e.push("</th>")}),e.push("</tr>")}),this.$header.html(e.join("")),this.$header.find("th[data-field]").each(function(){a(this).data(d[a(this).data("field")])}),this.$container.off("click",".th-inner").on("click",".th-inner",function(c){var d=a(this);return b.options.detailView&&d.closest(".bootstrap-table")[0]!==b.$container[0]?!1:void(b.options.sortable&&d.parent().data().sortable&&b.onSort(c))}),this.$header.children().children().off("keypress").on("keypress",function(c){if(b.options.sortable&&a(this).data().sortable){var d=c.keyCode||c.which;13==d&&b.onSort(c)}}),a(window).off("resize.bootstrap-table"),!this.options.showHeader||this.options.cardView?(this.$header.hide(),this.$tableHeader.hide(),this.$tableLoading.css("top",0)):(this.$header.show(),this.$tableHeader.show(),this.$tableLoading.css("top",this.$header.outerHeight()+1),this.getCaret(),a(window).on("resize.bootstrap-table",a.proxy(this.resetWidth,this))),this.$selectAll=this.$header.find('[name="btSelectAll"]'),this.$selectAll.off("click").on("click",function(){var c=a(this).prop("checked");b[c?"checkAll":"uncheckAll"](),b.updateSelected()})},o.prototype.initFooter=function(){!this.options.showFooter||this.options.cardView?this.$tableFooter.hide():this.$tableFooter.show()},o.prototype.initData=function(a,b){this.data="append"===b?this.data.concat(a):"prepend"===b?[].concat(a).concat(this.data):a||this.options.data,this.options.data="append"===b?this.options.data.concat(a):"prepend"===b?[].concat(a).concat(this.options.data):this.data,"server"!==this.options.sidePagination&&this.initSort()},o.prototype.initSort=function(){var b=this,d=this.options.sortName,e="desc"===this.options.sortOrder?-1:1,f=a.inArray(this.options.sortName,this.header.fields),g=0;return this.options.customSort!==a.noop?void this.options.customSort.apply(this,[this.options.sortName,this.options.sortOrder]):void(-1!==f&&(this.options.sortStable&&a.each(this.data,function(a,b){b.hasOwnProperty("_position")||(b._position=a)}),this.data.sort(function(c,g){b.header.sortNames[f]&&(d=b.header.sortNames[f]);var i=l(c,d,b.options.escape),j=l(g,d,b.options.escape),k=h(b.header,b.header.sorters[f],[i,j]);return void 0!==k?e*k:((void 0===i||null===i)&&(i=""),(void 0===j||null===j)&&(j=""),b.options.sortStable&&i===j&&(i=c._position,j=g._position),a.isNumeric(i)&&a.isNumeric(j)?(i=parseFloat(i),j=parseFloat(j),j>i?-1*e:e):i===j?0:("string"!=typeof i&&(i=i.toString()),-1===i.localeCompare(j)?-1*e:e))}),void 0!==this.options.sortClass&&(clearTimeout(g),g=setTimeout(function(){b.$el.removeClass(b.options.sortClass);var a=b.$header.find(c('[data-field="%s"]',b.options.sortName).index()+1);b.$el.find(c("tr td:nth-child(%s)",a)).addClass(b.options.sortClass)},250))))},o.prototype.onSort=function(b){var c="keypress"===b.type?a(b.currentTarget):a(b.currentTarget).parent(),d=this.$header.find("th").eq(c.index());return this.$header.add(this.$header_).find("span.order").remove(),this.options.sortName===c.data("field")?this.options.sortOrder="asc"===this.options.sortOrder?"desc":"asc":(this.options.sortName=c.data("field"),this.options.sortOrder="asc"===c.data("order")?"desc":"asc"),this.trigger("sort",this.options.sortName,this.options.sortOrder),c.add(d).data("order",this.options.sortOrder),this.getCaret(),"server"===this.options.sidePagination?void this.initServer(this.options.silentSort):(this.initSort(),void this.initBody())},o.prototype.initToolbar=function(){var b,d,e=this,f=[],g=0,i=0;this.$toolbar.find(".bs-bars").children().length&&a("body").append(a(this.options.toolbar)),this.$toolbar.html(""),("string"==typeof this.options.toolbar||"object"==typeof this.options.toolbar)&&a(c('<div class="bs-bars pull-%s"></div>',this.options.toolbarAlign)).appendTo(this.$toolbar).append(a(this.options.toolbar)),f=[c('<div class="columns columns-%s btn-group pull-%s">',this.options.buttonsAlign,this.options.buttonsAlign)],"string"==typeof this.options.icons&&(this.options.icons=h(null,this.options.icons)),this.options.showPaginationSwitch&&f.push(c('<button class="btn'+c(" btn-%s",this.options.buttonsClass)+c(" btn-%s",this.options.iconSize)+'" type="button" name="paginationSwitch" aria-label="pagination Switch" title="%s">',this.options.formatPaginationSwitch()),c('<i class="%s %s"></i>',this.options.iconsPrefix,this.options.icons.paginationSwitchDown),"</button>"),this.options.showRefresh&&f.push(c('<button class="btn'+c(" btn-%s",this.options.buttonsClass)+c(" btn-%s",this.options.iconSize)+'" type="button" name="refresh" aria-label="refresh" title="%s">',this.options.formatRefresh()),c('<i class="%s %s"></i>',this.options.iconsPrefix,this.options.icons.refresh),"</button>"),this.options.showToggle&&f.push(c('<button class="btn'+c(" btn-%s",this.options.buttonsClass)+c(" btn-%s",this.options.iconSize)+'" type="button" name="toggle" aria-label="toggle" title="%s">',this.options.formatToggle()),c('<i class="%s %s"></i>',this.options.iconsPrefix,this.options.icons.toggle),"</button>"),this.options.showColumns&&(f.push(c('<div class="keep-open btn-group" title="%s">',this.options.formatColumns()),'<button type="button" aria-label="columns" class="btn'+c(" btn-%s",this.options.buttonsClass)+c(" btn-%s",this.options.iconSize)+' dropdown-toggle" data-toggle="dropdown">',c('<i class="%s %s"></i>',this.options.iconsPrefix,this.options.icons.columns),' <span class="caret"></span>',"</button>",'<ul class="dropdown-menu" role="menu">'),a.each(this.columns,function(a,b){if(!(b.radio||b.checkbox||e.options.cardView&&!b.cardVisible)){var d=b.visible?' checked="checked"':"";b.switchable&&(f.push(c('<li role="menuitem"><label><input type="checkbox" data-field="%s" value="%s"%s> %s</label></li>',b.field,a,d,b.title)),i++)}}),f.push("</ul>","</div>")),f.push("</div>"),(this.showToolbar||f.length>2)&&this.$toolbar.append(f.join("")),this.options.showPaginationSwitch&&this.$toolbar.find('button[name="paginationSwitch"]').off("click").on("click",a.proxy(this.togglePagination,this)),this.options.showRefresh&&this.$toolbar.find('button[name="refresh"]').off("click").on("click",a.proxy(this.refresh,this)),this.options.showToggle&&this.$toolbar.find('button[name="toggle"]').off("click").on("click",function(){e.toggleView()}),this.options.showColumns&&(b=this.$toolbar.find(".keep-open"),i<=this.options.minimumCountColumns&&b.find("input").prop("disabled",!0),b.find("li").off("click").on("click",function(a){a.stopImmediatePropagation()}),b.find("input").off("click").on("click",function(){var b=a(this);e.toggleColumn(a(this).val(),b.prop("checked"),!1),e.trigger("column-switch",a(this).data("field"),b.prop("checked"))})),this.options.search&&(f=[],f.push('<div class="pull-'+this.options.searchAlign+' search">',c('<input class="form-control'+c(" input-%s",this.options.iconSize)+'" type="text" placeholder="%s">',this.options.formatSearch()),"</div>"),this.$toolbar.append(f.join("")),d=this.$toolbar.find(".search input"),d.off("keyup drop blur").on("keyup drop blur",function(b){e.options.searchOnEnterKey&&13!==b.keyCode||a.inArray(b.keyCode,[37,38,39,40])>-1||(clearTimeout(g),g=setTimeout(function(){e.onSearch(b)},e.options.searchTimeOut))}),m()&&d.off("mouseup").on("mouseup",function(a){clearTimeout(g),g=setTimeout(function(){e.onSearch(a)},e.options.searchTimeOut)}))},o.prototype.onSearch=function(b){var c=a.trim(a(b.currentTarget).val());this.options.trimOnSearch&&a(b.currentTarget).val()!==c&&a(b.currentTarget).val(c),c!==this.searchText&&(this.searchText=c,this.options.searchText=c,this.options.pageNumber=1,this.initSearch(),this.updatePagination(),this.trigger("search",c))},o.prototype.initSearch=function(){var b=this;if("server"!==this.options.sidePagination){if(this.options.customSearch!==a.noop)return void this.options.customSearch.apply(this,[this.searchText]);var c=this.searchText&&(this.options.escape?j(this.searchText):this.searchText).toLowerCase(),d=a.isEmptyObject(this.filterColumns)?null:this.filterColumns;this.data=d?a.grep(this.options.data,function(b){for(var c in d)if(a.isArray(d[c])&&-1===a.inArray(b[c],d[c])||!a.isArray(d[c])&&b[c]!==d[c])return!1;return!0}):this.options.data,this.data=c?a.grep(this.data,function(d,f){for(var g=0;g<b.header.fields.length;g++)if(b.header.searchables[g]){var i,j=a.isNumeric(b.header.fields[g])?parseInt(b.header.fields[g],10):b.header.fields[g],k=b.columns[e(b.columns,j)];if("string"==typeof j){i=d;for(var l=j.split("."),m=0;m<l.length;m++)i=i[l[m]];k&&k.searchFormatter&&(i=h(k,b.header.formatters[g],[i,d,f],i))}else i=d[j];if("string"==typeof i||"number"==typeof i)if(b.options.strictSearch){if((i+"").toLowerCase()===c)return!0}else if(-1!==(i+"").toLowerCase().indexOf(c))return!0}return!1}):this.data}},o.prototype.initPagination=function(){if(!this.options.pagination)return void this.$pagination.hide();this.$pagination.show();var b,d,e,f,g,h,i,j,k,l=this,m=[],n=!1,o=this.getData(),p=this.options.pageList;if("server"!==this.options.sidePagination&&(this.options.totalRows=o.length),this.totalPages=0,this.options.totalRows){if(this.options.pageSize===this.options.formatAllRows())this.options.pageSize=this.options.totalRows,n=!0;else if(this.options.pageSize===this.options.totalRows){var q="string"==typeof this.options.pageList?this.options.pageList.replace("[","").replace("]","").replace(/ /g,"").toLowerCase().split(","):this.options.pageList;a.inArray(this.options.formatAllRows().toLowerCase(),q)>-1&&(n=!0)}this.totalPages=~~((this.options.totalRows-1)/this.options.pageSize)+1,this.options.totalPages=this.totalPages}if(this.totalPages>0&&this.options.pageNumber>this.totalPages&&(this.options.pageNumber=this.totalPages),this.pageFrom=(this.options.pageNumber-1)*this.options.pageSize+1,this.pageTo=this.options.pageNumber*this.options.pageSize,this.pageTo>this.options.totalRows&&(this.pageTo=this.options.totalRows),m.push('<div class="pull-'+this.options.paginationDetailHAlign+' pagination-detail">','<span class="pagination-info">',this.options.onlyInfoPagination?this.options.formatDetailPagination(this.options.totalRows):this.options.formatShowingRows(this.pageFrom,this.pageTo,this.options.totalRows),"</span>"),!this.options.onlyInfoPagination){m.push('<span class="page-list">');var r=[c('<span class="btn-group %s">',"top"===this.options.paginationVAlign||"both"===this.options.paginationVAlign?"dropdown":"dropup"),'<button type="button" class="btn'+c(" btn-%s",this.options.buttonsClass)+c(" btn-%s",this.options.iconSize)+' dropdown-toggle" data-toggle="dropdown">','<span class="page-size">',n?this.options.formatAllRows():this.options.pageSize,"</span>",' <span class="caret"></span>',"</button>",'<ul class="dropdown-menu" role="menu">'];if("string"==typeof this.options.pageList){var s=this.options.pageList.replace("[","").replace("]","").replace(/ /g,"").split(",");p=[],a.each(s,function(a,b){p.push(b.toUpperCase()===l.options.formatAllRows().toUpperCase()?l.options.formatAllRows():+b)})}for(a.each(p,function(a,b){if(!l.options.smartDisplay||0===a||p[a-1]<l.options.totalRows){var d;d=n?b===l.options.formatAllRows()?' class="active"':"":b===l.options.pageSize?' class="active"':"",r.push(c('<li role="menuitem"%s><a href="#">%s</a></li>',d,b))}}),r.push("</ul></span>"),m.push(this.options.formatRecordsPerPage(r.join(""))),m.push("</span>"),m.push("</div>",'<div class="pull-'+this.options.paginationHAlign+' pagination">','<ul class="pagination'+c(" pagination-%s",this.options.iconSize)+'">','<li class="page-pre"><a href="#">'+this.options.paginationPreText+"</a></li>"),this.totalPages<5?(d=1,e=this.totalPages):(d=this.options.pageNumber-2,e=d+4,1>d&&(d=1,e=5),e>this.totalPages&&(e=this.totalPages,d=e-4)),this.totalPages>=6&&(this.options.pageNumber>=3&&(m.push('<li class="page-first'+(1===this.options.pageNumber?" active":"")+'">','<a href="#">',1,"</a>","</li>"),d++),this.options.pageNumber>=4&&(4==this.options.pageNumber||6==this.totalPages||7==this.totalPages?d--:m.push('<li class="page-first-separator disabled">','<a href="#">...</a>',"</li>"),e--)),this.totalPages>=7&&this.options.pageNumber>=this.totalPages-2&&d--,6==this.totalPages?this.options.pageNumber>=this.totalPages-2&&e++:this.totalPages>=7&&(7==this.totalPages||this.options.pageNumber>=this.totalPages-3)&&e++,b=d;e>=b;b++)m.push('<li class="page-number'+(b===this.options.pageNumber?" active":"")+'">','<a href="#">',b,"</a>","</li>");this.totalPages>=8&&this.options.pageNumber<=this.totalPages-4&&m.push('<li class="page-last-separator disabled">','<a href="#">...</a>',"</li>"),this.totalPages>=6&&this.options.pageNumber<=this.totalPages-3&&m.push('<li class="page-last'+(this.totalPages===this.options.pageNumber?" active":"")+'">','<a href="#">',this.totalPages,"</a>","</li>"),m.push('<li class="page-next"><a href="#">'+this.options.paginationNextText+"</a></li>","</ul>","</div>")}this.$pagination.html(m.join("")),this.options.onlyInfoPagination||(f=this.$pagination.find(".page-list a"),g=this.$pagination.find(".page-first"),h=this.$pagination.find(".page-pre"),i=this.$pagination.find(".page-next"),j=this.$pagination.find(".page-last"),k=this.$pagination.find(".page-number"),this.options.smartDisplay&&(this.totalPages<=1&&this.$pagination.find("div.pagination").hide(),(p.length<2||this.options.totalRows<=p[0])&&this.$pagination.find("span.page-list").hide(),this.$pagination[this.getData().length?"show":"hide"]()),this.options.paginationLoop||(1===this.options.pageNumber&&h.addClass("disabled"),this.options.pageNumber===this.totalPages&&i.addClass("disabled")),n&&(this.options.pageSize=this.options.formatAllRows()),f.off("click").on("click",a.proxy(this.onPageListChange,this)),g.off("click").on("click",a.proxy(this.onPageFirst,this)),h.off("click").on("click",a.proxy(this.onPagePre,this)),i.off("click").on("click",a.proxy(this.onPageNext,this)),j.off("click").on("click",a.proxy(this.onPageLast,this)),k.off("click").on("click",a.proxy(this.onPageNumber,this)))},o.prototype.updatePagination=function(b){b&&a(b.currentTarget).hasClass("disabled")||(this.options.maintainSelected||this.resetRows(),this.initPagination(),"server"===this.options.sidePagination?this.initServer():this.initBody(),this.trigger("page-change",this.options.pageNumber,this.options.pageSize))},o.prototype.onPageListChange=function(b){var c=a(b.currentTarget);return c.parent().addClass("active").siblings().removeClass("active"),this.options.pageSize=c.text().toUpperCase()===this.options.formatAllRows().toUpperCase()?this.options.formatAllRows():+c.text(),this.$toolbar.find(".page-size").text(this.options.pageSize),this.updatePagination(b),!1},o.prototype.onPageFirst=function(a){return this.options.pageNumber=1,this.updatePagination(a),!1},o.prototype.onPagePre=function(a){return this.options.pageNumber-1===0?this.options.pageNumber=this.options.totalPages:this.options.pageNumber--,this.updatePagination(a),!1},o.prototype.onPageNext=function(a){return this.options.pageNumber+1>this.options.totalPages?this.options.pageNumber=1:this.options.pageNumber++,this.updatePagination(a),!1},o.prototype.onPageLast=function(a){return this.options.pageNumber=this.totalPages,this.updatePagination(a),!1},o.prototype.onPageNumber=function(b){return this.options.pageNumber!==+a(b.currentTarget).text()?(this.options.pageNumber=+a(b.currentTarget).text(),this.updatePagination(b),!1):void 0},o.prototype.initRow=function(b,e){var f,g=this,i=[],k={},m=[],n="",o={},p=[];if(!(a.inArray(b,this.hiddenRows)>-1)){if(k=h(this.options,this.options.rowStyle,[b,e],k),k&&k.css)for(f in k.css)m.push(f+": "+k.css[f]);if(o=h(this.options,this.options.rowAttributes,[b,e],o))for(f in o)p.push(c('%s="%s"',f,j(o[f])));return b._data&&!a.isEmptyObject(b._data)&&a.each(b._data,function(a,b){"index"!==a&&(n+=c(' data-%s="%s"',a,b))}),i.push("<tr",c(" %s",p.join(" ")),c(' id="%s"',a.isArray(b)?void 0:b._id),c(' class="%s"',k.classes||(a.isArray(b)?void 0:b._class)),c(' data-index="%s"',e),c(' data-uniqueid="%s"',b[this.options.uniqueId]),c("%s",n),">"),this.options.cardView&&i.push(c('<td colspan="%s"><div class="card-views">',this.header.fields.length)),!this.options.cardView&&this.options.detailView&&i.push("<td>",'<a class="detail-icon" href="#">',c('<i class="%s %s"></i>',this.options.iconsPrefix,this.options.icons.detailOpen),"</a>","</td>"),a.each(this.header.fields,function(f,n){var o="",p=l(b,n,g.options.escape),q="",r="",s={},t="",u=g.header.classes[f],v="",w="",x="",y="",z=g.columns[f];if(!(g.fromHtml&&"undefined"==typeof p||!z.visible||g.options.cardView&&!z.cardVisible)){if(z.escape&&(p=j(p)),k=c('style="%s"',m.concat(g.header.styles[f]).join("; ")),b["_"+n+"_id"]&&(t=c(' id="%s"',b["_"+n+"_id"])),b["_"+n+"_class"]&&(u=c(' class="%s"',b["_"+n+"_class"])),b["_"+n+"_rowspan"]&&(w=c(' rowspan="%s"',b["_"+n+"_rowspan"])),b["_"+n+"_colspan"]&&(x=c(' colspan="%s"',b["_"+n+"_colspan"])),b["_"+n+"_title"]&&(y=c(' title="%s"',b["_"+n+"_title"])),s=h(g.header,g.header.cellStyles[f],[p,b,e,n],s),s.classes&&(u=c(' class="%s"',s.classes)),s.css){var A=[];for(var B in s.css)A.push(B+": "+s.css[B]);k=c('style="%s"',A.concat(g.header.styles[f]).join("; "))}q=h(z,g.header.formatters[f],[p,b,e],p),b["_"+n+"_data"]&&!a.isEmptyObject(b["_"+n+"_data"])&&a.each(b["_"+n+"_data"],function(a,b){"index"!==a&&(v+=c(' data-%s="%s"',a,b))}),z.checkbox||z.radio?(r=z.checkbox?"checkbox":r,r=z.radio?"radio":r,o=[c(g.options.cardView?'<div class="card-view %s">':'<td class="bs-checkbox %s">',z["class"]||""),"<input"+c(' data-index="%s"',e)+c(' name="%s"',g.options.selectItemName)+c(' type="%s"',r)+c(' value="%s"',b[g.options.idField])+c(' checked="%s"',q===!0||p||q&&q.checked?"checked":void 0)+c(' disabled="%s"',!z.checkboxEnabled||q&&q.disabled?"disabled":void 0)+" />",g.header.formatters[f]&&"string"==typeof q?q:"",g.options.cardView?"</div>":"</td>"].join(""),b[g.header.stateField]=q===!0||q&&q.checked):(q="undefined"==typeof q||null===q?g.options.undefinedText:q,o=g.options.cardView?['<div class="card-view">',g.options.showHeader?c('<span class="title" %s>%s</span>',k,d(g.columns,"field","title",n)):"",c('<span class="value">%s</span>',q),"</div>"].join(""):[c("<td%s %s %s %s %s %s %s>",t,u,k,v,w,x,y),q,"</td>"].join(""),g.options.cardView&&g.options.smartDisplay&&""===q&&(o='<div class="card-view"></div>')),i.push(o)}}),this.options.cardView&&i.push("</div></td>"),i.push("</tr>"),i.join(" ")}},o.prototype.initBody=function(b){var d=this,f=this.getData();this.trigger("pre-body",f),this.$body=this.$el.find(">tbody"),this.$body.length||(this.$body=a("<tbody></tbody>").appendTo(this.$el)),this.options.pagination&&"server"!==this.options.sidePagination||(this.pageFrom=1,this.pageTo=f.length);for(var g,i=a(document.createDocumentFragment()),j=this.pageFrom-1;j<this.pageTo;j++){
+var k=f[j],m=this.initRow(k,j,f,i);g=g||!!m,m&&m!==!0&&i.append(m)}g||i.append('<tr class="no-records-found">'+c('<td colspan="%s">%s</td>',this.$header.find("th").length,this.options.formatNoMatches())+"</tr>"),this.$body.html(i),b||this.scrollTo(0),this.$body.find("> tr[data-index] > td").off("click dblclick").on("click dblclick",function(b){var f=a(this),g=f.parent(),h=d.data[g.data("index")],i=f[0].cellIndex,j=d.getVisibleFields(),k=j[d.options.detailView&&!d.options.cardView?i-1:i],m=d.columns[e(d.columns,k)],n=l(h,k,d.options.escape);if(!f.find(".detail-icon").length&&(d.trigger("click"===b.type?"click-cell":"dbl-click-cell",k,n,h,f),d.trigger("click"===b.type?"click-row":"dbl-click-row",h,g,k),"click"===b.type&&d.options.clickToSelect&&m.clickToSelect)){var o=g.find(c('[name="%s"]',d.options.selectItemName));o.length&&o[0].click()}}),this.$body.find("> tr[data-index] > td > .detail-icon").off("click").on("click",function(){var b=a(this),e=b.parent().parent(),g=e.data("index"),i=f[g];if(e.next().is("tr.detail-view"))b.find("i").attr("class",c("%s %s",d.options.iconsPrefix,d.options.icons.detailOpen)),d.trigger("collapse-row",g,i),e.next().remove();else{b.find("i").attr("class",c("%s %s",d.options.iconsPrefix,d.options.icons.detailClose)),e.after(c('<tr class="detail-view"><td colspan="%s"></td></tr>',e.find("td").length));var j=e.next().find("td"),k=h(d.options,d.options.detailFormatter,[g,i,j],"");1===j.length&&j.append(k),d.trigger("expand-row",g,i,j)}return d.resetView(),!1}),this.$selectItem=this.$body.find(c('[name="%s"]',this.options.selectItemName)),this.$selectItem.off("click").on("click",function(b){b.stopImmediatePropagation();var c=a(this),e=c.prop("checked"),f=d.data[c.data("index")];d.options.maintainSelected&&a(this).is(":radio")&&a.each(d.options.data,function(a,b){b[d.header.stateField]=!1}),f[d.header.stateField]=e,d.options.singleSelect&&(d.$selectItem.not(this).each(function(){d.data[a(this).data("index")][d.header.stateField]=!1}),d.$selectItem.filter(":checked").not(this).prop("checked",!1)),d.updateSelected(),d.trigger(e?"check":"uncheck",f,c)}),a.each(this.header.events,function(b,c){if(c){"string"==typeof c&&(c=h(null,c));var e=d.header.fields[b],f=a.inArray(e,d.getVisibleFields());d.options.detailView&&!d.options.cardView&&(f+=1);for(var g in c)d.$body.find(">tr:not(.no-records-found)").each(function(){var b=a(this),h=b.find(d.options.cardView?".card-view":"td").eq(f),i=g.indexOf(" "),j=g.substring(0,i),k=g.substring(i+1),l=c[g];h.find(k).off(j).on(j,function(a){var c=b.data("index"),f=d.data[c],g=f[e];l.apply(this,[a,g,f,c])})})}}),this.updateSelected(),this.resetView(),this.trigger("post-body",f)},o.prototype.initServer=function(b,c,d){var e,f=this,g={},i={searchText:this.searchText,sortName:this.options.sortName,sortOrder:this.options.sortOrder};this.options.pagination&&(i.pageSize=this.options.pageSize===this.options.formatAllRows()?this.options.totalRows:this.options.pageSize,i.pageNumber=this.options.pageNumber),(d||this.options.url||this.options.ajax)&&("limit"===this.options.queryParamsType&&(i={search:i.searchText,sort:i.sortName,order:i.sortOrder},this.options.pagination&&(i.offset=this.options.pageSize===this.options.formatAllRows()?0:this.options.pageSize*(this.options.pageNumber-1),i.limit=this.options.pageSize===this.options.formatAllRows()?this.options.totalRows:this.options.pageSize)),a.isEmptyObject(this.filterColumnsPartial)||(i.filter=JSON.stringify(this.filterColumnsPartial,null)),g=h(this.options,this.options.queryParams,[i],g),a.extend(g,c||{}),g!==!1&&(b||this.$tableLoading.show(),e=a.extend({},h(null,this.options.ajaxOptions),{type:this.options.method,url:d||this.options.url,data:"application/json"===this.options.contentType&&"post"===this.options.method?JSON.stringify(g):g,cache:this.options.cache,contentType:this.options.contentType,dataType:this.options.dataType,success:function(a){a=h(f.options,f.options.responseHandler,[a],a),f.load(a),f.trigger("load-success",a),b||f.$tableLoading.hide()},error:function(a){f.trigger("load-error",a.status,a),b||f.$tableLoading.hide()}}),this.options.ajax?h(this,this.options.ajax,[e],null):(this._xhr&&4!==this._xhr.readyState&&this._xhr.abort(),this._xhr=a.ajax(e))))},o.prototype.initSearchText=function(){if(this.options.search&&""!==this.options.searchText){var a=this.$toolbar.find(".search input");a.val(this.options.searchText),this.onSearch({currentTarget:a})}},o.prototype.getCaret=function(){var b=this;a.each(this.$header.find("th"),function(c,d){a(d).find(".sortable").removeClass("desc asc").addClass(a(d).data("field")===b.options.sortName?b.options.sortOrder:"both")})},o.prototype.updateSelected=function(){var b=this.$selectItem.filter(":enabled").length&&this.$selectItem.filter(":enabled").length===this.$selectItem.filter(":enabled").filter(":checked").length;this.$selectAll.add(this.$selectAll_).prop("checked",b),this.$selectItem.each(function(){a(this).closest("tr")[a(this).prop("checked")?"addClass":"removeClass"]("selected")})},o.prototype.updateRows=function(){var b=this;this.$selectItem.each(function(){b.data[a(this).data("index")][b.header.stateField]=a(this).prop("checked")})},o.prototype.resetRows=function(){var b=this;a.each(this.data,function(a,c){b.$selectAll.prop("checked",!1),b.$selectItem.prop("checked",!1),b.header.stateField&&(c[b.header.stateField]=!1)}),this.initHiddenRows()},o.prototype.trigger=function(b){var c=Array.prototype.slice.call(arguments,1);b+=".bs.table",this.options[o.EVENTS[b]].apply(this.options,c),this.$el.trigger(a.Event(b),c),this.options.onAll(b,c),this.$el.trigger(a.Event("all.bs.table"),[b,c])},o.prototype.resetHeader=function(){clearTimeout(this.timeoutId_),this.timeoutId_=setTimeout(a.proxy(this.fitHeader,this),this.$el.is(":hidden")?100:0)},o.prototype.fitHeader=function(){var b,d,e,f,h=this;if(h.$el.is(":hidden"))return void(h.timeoutId_=setTimeout(a.proxy(h.fitHeader,h),100));if(b=this.$tableBody.get(0),d=b.scrollWidth>b.clientWidth&&b.scrollHeight>b.clientHeight+this.$header.outerHeight()?g():0,this.$el.css("margin-top",-this.$header.outerHeight()),e=a(":focus"),e.length>0){var i=e.parents("th");if(i.length>0){var j=i.attr("data-field");if(void 0!==j){var k=this.$header.find("[data-field='"+j+"']");k.length>0&&k.find(":input").addClass("focus-temp")}}}this.$header_=this.$header.clone(!0,!0),this.$selectAll_=this.$header_.find('[name="btSelectAll"]'),this.$tableHeader.css({"margin-right":d}).find("table").css("width",this.$el.outerWidth()).html("").attr("class",this.$el.attr("class")).append(this.$header_),f=a(".focus-temp:visible:eq(0)"),f.length>0&&(f.focus(),this.$header.find(".focus-temp").removeClass("focus-temp")),this.$header.find("th[data-field]").each(function(){h.$header_.find(c('th[data-field="%s"]',a(this).data("field"))).data(a(this).data())});var l=this.getVisibleFields(),m=this.$header_.find("th");this.$body.find(">tr:first-child:not(.no-records-found) > *").each(function(b){var d=a(this),e=b;h.options.detailView&&!h.options.cardView&&(0===b&&h.$header_.find("th.detail").find(".fht-cell").width(d.innerWidth()),e=b-1);var f=h.$header_.find(c('th[data-field="%s"]',l[e]));f.length>1&&(f=a(m[d[0].cellIndex])),f.find(".fht-cell").width(d.innerWidth())}),this.$tableBody.off("scroll").on("scroll",function(){h.$tableHeader.scrollLeft(a(this).scrollLeft()),h.options.showFooter&&!h.options.cardView&&h.$tableFooter.scrollLeft(a(this).scrollLeft())}),h.trigger("post-header")},o.prototype.resetFooter=function(){var b=this,d=b.getData(),e=[];this.options.showFooter&&!this.options.cardView&&(!this.options.cardView&&this.options.detailView&&e.push('<td><div class="th-inner"> </div><div class="fht-cell"></div></td>'),a.each(this.columns,function(a,f){var g,i="",j="",k=[],l={},m=c(' class="%s"',f["class"]);if(f.visible&&(!b.options.cardView||f.cardVisible)){if(i=c("text-align: %s; ",f.falign?f.falign:f.align),j=c("vertical-align: %s; ",f.valign),l=h(null,b.options.footerStyle),l&&l.css)for(g in l.css)k.push(g+": "+l.css[g]);e.push("<td",m,c(' style="%s"',i+j+k.concat().join("; ")),">"),e.push('<div class="th-inner">'),e.push(h(f,f.footerFormatter,[d]," ")||" "),e.push("</div>"),e.push('<div class="fht-cell"></div>'),e.push("</div>"),e.push("</td>")}}),this.$tableFooter.find("tr").html(e.join("")),this.$tableFooter.show(),clearTimeout(this.timeoutFooter_),this.timeoutFooter_=setTimeout(a.proxy(this.fitFooter,this),this.$el.is(":hidden")?100:0))},o.prototype.fitFooter=function(){var b,c,d;return clearTimeout(this.timeoutFooter_),this.$el.is(":hidden")?void(this.timeoutFooter_=setTimeout(a.proxy(this.fitFooter,this),100)):(c=this.$el.css("width"),d=c>this.$tableBody.width()?g():0,this.$tableFooter.css({"margin-right":d}).find("table").css("width",c).attr("class",this.$el.attr("class")),b=this.$tableFooter.find("td"),void this.$body.find(">tr:first-child:not(.no-records-found) > *").each(function(c){var d=a(this);b.eq(c).find(".fht-cell").width(d.innerWidth())}))},o.prototype.toggleColumn=function(a,b,d){if(-1!==a&&(this.columns[a].visible=b,this.initHeader(),this.initSearch(),this.initPagination(),this.initBody(),this.options.showColumns)){var e=this.$toolbar.find(".keep-open input").prop("disabled",!1);d&&e.filter(c('[value="%s"]',a)).prop("checked",b),e.filter(":checked").length<=this.options.minimumCountColumns&&e.filter(":checked").prop("disabled",!0)}},o.prototype.getVisibleFields=function(){var b=this,c=[];return a.each(this.header.fields,function(a,d){var f=b.columns[e(b.columns,d)];f.visible&&c.push(d)}),c},o.prototype.resetView=function(a){var b=0;if(a&&a.height&&(this.options.height=a.height),this.$selectAll.prop("checked",this.$selectItem.length>0&&this.$selectItem.length===this.$selectItem.filter(":checked").length),this.options.height){var c=this.$toolbar.outerHeight(!0),d=this.$pagination.outerHeight(!0),e=this.options.height-c-d;this.$tableContainer.css("height",e+"px")}return this.options.cardView?(this.$el.css("margin-top","0"),this.$tableContainer.css("padding-bottom","0"),void this.$tableFooter.hide()):(this.options.showHeader&&this.options.height?(this.$tableHeader.show()/*,this.resetHeader(),b+=this.$header.outerHeight()*/):(this.$tableHeader.hide(),this.trigger("post-header")),this.options.showFooter&&(this.resetFooter(),this.options.height&&(b+=this.$tableFooter.outerHeight()+1)),this.getCaret(),this.$tableContainer.css("padding-bottom",b+"px"),void this.trigger("reset-view"))},o.prototype.getData=function(b){return!this.searchText&&a.isEmptyObject(this.filterColumns)&&a.isEmptyObject(this.filterColumnsPartial)?b?this.options.data.slice(this.pageFrom-1,this.pageTo):this.options.data:b?this.data.slice(this.pageFrom-1,this.pageTo):this.data},o.prototype.load=function(b){var c=!1;"server"===this.options.sidePagination?(this.options.totalRows=b[this.options.totalField],c=b.fixedScroll,b=b[this.options.dataField]):a.isArray(b)||(c=b.fixedScroll,b=b.data),this.initData(b),this.initSearch(),this.initPagination(),this.initBody(c)},o.prototype.append=function(a){this.initData(a,"append"),this.initSearch(),this.initPagination(),this.initSort(),this.initBody(!0)},o.prototype.prepend=function(a){this.initData(a,"prepend"),this.initSearch(),this.initPagination(),this.initSort(),this.initBody(!0)},o.prototype.remove=function(b){var c,d,e=this.options.data.length;if(b.hasOwnProperty("field")&&b.hasOwnProperty("values")){for(c=e-1;c>=0;c--)d=this.options.data[c],d.hasOwnProperty(b.field)&&-1!==a.inArray(d[b.field],b.values)&&(this.options.data.splice(c,1),"server"===this.options.sidePagination&&(this.options.totalRows-=1));e!==this.options.data.length&&(this.initSearch(),this.initPagination(),this.initSort(),this.initBody(!0))}},o.prototype.removeAll=function(){this.options.data.length>0&&(this.options.data.splice(0,this.options.data.length),this.initSearch(),this.initPagination(),this.initBody(!0))},o.prototype.getRowByUniqueId=function(a){var b,c,d,e=this.options.uniqueId,f=this.options.data.length,g=null;for(b=f-1;b>=0;b--){if(c=this.options.data[b],c.hasOwnProperty(e))d=c[e];else{if(!c._data.hasOwnProperty(e))continue;d=c._data[e]}if("string"==typeof d?a=a.toString():"number"==typeof d&&(Number(d)===d&&d%1===0?a=parseInt(a):d===Number(d)&&0!==d&&(a=parseFloat(a))),d===a){g=c;break}}return g},o.prototype.removeByUniqueId=function(a){var b=this.options.data.length,c=this.getRowByUniqueId(a);c&&this.options.data.splice(this.options.data.indexOf(c),1),b!==this.options.data.length&&(this.initSearch(),this.initPagination(),this.initBody(!0))},o.prototype.updateByUniqueId=function(b){var c=this,d=a.isArray(b)?b:[b];a.each(d,function(b,d){var e;d.hasOwnProperty("id")&&d.hasOwnProperty("row")&&(e=a.inArray(c.getRowByUniqueId(d.id),c.options.data),-1!==e&&a.extend(c.options.data[e],d.row))}),this.initSearch(),this.initPagination(),this.initSort(),this.initBody(!0)},o.prototype.insertRow=function(a){a.hasOwnProperty("index")&&a.hasOwnProperty("row")&&(this.data.splice(a.index,0,a.row),this.initSearch(),this.initPagination(),this.initSort(),this.initBody(!0))},o.prototype.updateRow=function(b){var c=this,d=a.isArray(b)?b:[b];a.each(d,function(b,d){d.hasOwnProperty("index")&&d.hasOwnProperty("row")&&a.extend(c.options.data[d.index],d.row)}),this.initSearch(),this.initPagination(),this.initSort(),this.initBody(!0)},o.prototype.initHiddenRows=function(){this.hiddenRows=[]},o.prototype.showRow=function(a){this.toggleRow(a,!0)},o.prototype.hideRow=function(a){this.toggleRow(a,!1)},o.prototype.toggleRow=function(b,c){var d,e;b.hasOwnProperty("index")?d=this.getData()[b.index]:b.hasOwnProperty("uniqueId")&&(d=this.getRowByUniqueId(b.uniqueId)),d&&(e=a.inArray(d,this.hiddenRows),c||-1!==e?c&&e>-1&&this.hiddenRows.splice(e,1):this.hiddenRows.push(d),this.initBody(!0))},o.prototype.getHiddenRows=function(){var b=this,c=this.getData(),d=[];return a.each(c,function(c,e){a.inArray(e,b.hiddenRows)>-1&&d.push(e)}),this.hiddenRows=d,d},o.prototype.mergeCells=function(b){var c,d,e,f=b.index,g=a.inArray(b.field,this.getVisibleFields()),h=b.rowspan||1,i=b.colspan||1,j=this.$body.find(">tr");if(this.options.detailView&&!this.options.cardView&&(g+=1),e=j.eq(f).find(">td").eq(g),!(0>f||0>g||f>=this.data.length)){for(c=f;f+h>c;c++)for(d=g;g+i>d;d++)j.eq(c).find(">td").eq(d).hide();e.attr("rowspan",h).attr("colspan",i).show()}},o.prototype.updateCell=function(a){a.hasOwnProperty("index")&&a.hasOwnProperty("field")&&a.hasOwnProperty("value")&&(this.data[a.index][a.field]=a.value,a.reinit!==!1&&(this.initSort(),this.initBody(!0)))},o.prototype.getOptions=function(){return this.options},o.prototype.getSelections=function(){var b=this;return a.grep(this.options.data,function(a){return a[b.header.stateField]===!0})},o.prototype.getAllSelections=function(){var b=this;return a.grep(this.options.data,function(a){return a[b.header.stateField]})},o.prototype.checkAll=function(){this.checkAll_(!0)},o.prototype.uncheckAll=function(){this.checkAll_(!1)},o.prototype.checkInvert=function(){var b=this,c=b.$selectItem.filter(":enabled"),d=c.filter(":checked");c.each(function(){a(this).prop("checked",!a(this).prop("checked"))}),b.updateRows(),b.updateSelected(),b.trigger("uncheck-some",d),d=b.getSelections(),b.trigger("check-some",d)},o.prototype.checkAll_=function(a){var b;a||(b=this.getSelections()),this.$selectAll.add(this.$selectAll_).prop("checked",a),this.$selectItem.filter(":enabled").prop("checked",a),this.updateRows(),a&&(b=this.getSelections()),this.trigger(a?"check-all":"uncheck-all",b)},o.prototype.check=function(a){this.check_(!0,a)},o.prototype.uncheck=function(a){this.check_(!1,a)},o.prototype.check_=function(a,b){var d=this.$selectItem.filter(c('[data-index="%s"]',b)).prop("checked",a);this.data[b][this.header.stateField]=a,this.updateSelected(),this.trigger(a?"check":"uncheck",this.data[b],d)},o.prototype.checkBy=function(a){this.checkBy_(!0,a)},o.prototype.uncheckBy=function(a){this.checkBy_(!1,a)},o.prototype.checkBy_=function(b,d){if(d.hasOwnProperty("field")&&d.hasOwnProperty("values")){var e=this,f=[];a.each(this.options.data,function(g,h){if(!h.hasOwnProperty(d.field))return!1;if(-1!==a.inArray(h[d.field],d.values)){var i=e.$selectItem.filter(":enabled").filter(c('[data-index="%s"]',g)).prop("checked",b);h[e.header.stateField]=b,f.push(h),e.trigger(b?"check":"uncheck",h,i)}}),this.updateSelected(),this.trigger(b?"check-some":"uncheck-some",f)}},o.prototype.destroy=function(){this.$el.insertBefore(this.$container),a(this.options.toolbar).insertBefore(this.$el),this.$container.next().remove(),this.$container.remove(),this.$el.html(this.$el_.html()).css("margin-top","0").attr("class",this.$el_.attr("class")||"")},o.prototype.showLoading=function(){this.$tableLoading.show()},o.prototype.hideLoading=function(){this.$tableLoading.hide()},o.prototype.togglePagination=function(){this.options.pagination=!this.options.pagination;var a=this.$toolbar.find('button[name="paginationSwitch"] i');this.options.pagination?a.attr("class",this.options.iconsPrefix+" "+this.options.icons.paginationSwitchDown):a.attr("class",this.options.iconsPrefix+" "+this.options.icons.paginationSwitchUp),this.updatePagination()},o.prototype.refresh=function(a){a&&a.url&&(this.options.url=a.url),a&&a.pageNumber&&(this.options.pageNumber=a.pageNumber),a&&a.pageSize&&(this.options.pageSize=a.pageSize),this.initServer(a&&a.silent,a&&a.query,a&&a.url),this.trigger("refresh",a)},o.prototype.resetWidth=function(){this.options.showHeader&&this.options.height&&this.fitHeader(),this.options.showFooter&&this.fitFooter()},o.prototype.showColumn=function(a){this.toggleColumn(e(this.columns,a),!0,!0)},o.prototype.hideColumn=function(a){this.toggleColumn(e(this.columns,a),!1,!0)},o.prototype.getHiddenColumns=function(){return a.grep(this.columns,function(a){return!a.visible})},o.prototype.getVisibleColumns=function(){return a.grep(this.columns,function(a){return a.visible})},o.prototype.toggleAllColumns=function(b){if(a.each(this.columns,function(a){this.columns[a].visible=b}),this.initHeader(),this.initSearch(),this.initPagination(),this.initBody(),this.options.showColumns){var c=this.$toolbar.find(".keep-open input").prop("disabled",!1);c.filter(":checked").length<=this.options.minimumCountColumns&&c.filter(":checked").prop("disabled",!0)}},o.prototype.showAllColumns=function(){this.toggleAllColumns(!0)},o.prototype.hideAllColumns=function(){this.toggleAllColumns(!1)},o.prototype.filterBy=function(b){this.filterColumns=a.isEmptyObject(b)?{}:b,this.options.pageNumber=1,this.initSearch(),this.updatePagination()},o.prototype.scrollTo=function(a){return"string"==typeof a&&(a="bottom"===a?this.$tableBody[0].scrollHeight:0),"number"==typeof a&&this.$tableBody.scrollTop(a),"undefined"==typeof a?this.$tableBody.scrollTop():void 0},o.prototype.getScrollPosition=function(){return this.scrollTo()},o.prototype.selectPage=function(a){a>0&&a<=this.options.totalPages&&(this.options.pageNumber=a,this.updatePagination())},o.prototype.prevPage=function(){this.options.pageNumber>1&&(this.options.pageNumber--,this.updatePagination())},o.prototype.nextPage=function(){this.options.pageNumber<this.options.totalPages&&(this.options.pageNumber++,this.updatePagination())},o.prototype.toggleView=function(){this.options.cardView=!this.options.cardView,this.initHeader(),this.initBody(),this.trigger("toggle",this.options.cardView)},o.prototype.refreshOptions=function(b){i(this.options,b,!0)||(this.options=a.extend(this.options,b),this.trigger("refresh-options",this.options),this.destroy(),this.init())},o.prototype.resetSearch=function(a){var b=this.$toolbar.find(".search input");b.val(a||""),this.onSearch({currentTarget:b})},o.prototype.expandRow_=function(a,b){var d=this.$body.find(c('> tr[data-index="%s"]',b));d.next().is("tr.detail-view")===(a?!1:!0)&&d.find("> td > .detail-icon").click()},o.prototype.expandRow=function(a){this.expandRow_(!0,a)},o.prototype.collapseRow=function(a){this.expandRow_(!1,a)},o.prototype.expandAllRows=function(b){if(b){var d=this.$body.find(c('> tr[data-index="%s"]',0)),e=this,f=null,g=!1,h=-1;if(d.next().is("tr.detail-view")?d.next().next().is("tr.detail-view")||(d.next().find(".detail-icon").click(),g=!0):(d.find("> td > .detail-icon").click(),g=!0),g)try{h=setInterval(function(){f=e.$body.find("tr.detail-view").last().find(".detail-icon"),f.length>0?f.click():clearInterval(h)},1)}catch(i){clearInterval(h)}}else for(var j=this.$body.children(),k=0;k<j.length;k++)this.expandRow_(!0,a(j[k]).data("index"))},o.prototype.collapseAllRows=function(b){if(b)this.expandRow_(!1,0);else for(var c=this.$body.children(),d=0;d<c.length;d++)this.expandRow_(!1,a(c[d]).data("index"))},o.prototype.updateFormatText=function(a,b){this.options[c("format%s",a)]&&("string"==typeof b?this.options[c("format%s",a)]=function(){return b}:"function"==typeof b&&(this.options[c("format%s",a)]=b)),this.initToolbar(),this.initPagination(),this.initBody()};var p=["getOptions","getSelections","getAllSelections","getData","load","append","prepend","remove","removeAll","insertRow","updateRow","updateCell","updateByUniqueId","removeByUniqueId","getRowByUniqueId","showRow","hideRow","getHiddenRows","mergeCells","checkAll","uncheckAll","checkInvert","check","uncheck","checkBy","uncheckBy","refresh","resetView","resetWidth","destroy","showLoading","hideLoading","showColumn","hideColumn","getHiddenColumns","getVisibleColumns","showAllColumns","hideAllColumns","filterBy","scrollTo","getScrollPosition","selectPage","prevPage","nextPage","togglePagination","toggleView","refreshOptions","resetSearch","expandRow","collapseRow","expandAllRows","collapseAllRows","updateFormatText"];a.fn.bootstrapTable=function(b){var c,d=Array.prototype.slice.call(arguments,1);return this.each(function(){var e=a(this),f=e.data("bootstrap.table"),g=a.extend({},o.DEFAULTS,e.data(),"object"==typeof b&&b);if("string"==typeof b){if(a.inArray(b,p)<0)throw new Error("Unknown method: "+b);if(!f)return;c=f[b].apply(f,d),"destroy"===b&&e.removeData("bootstrap.table")}f||e.data("bootstrap.table",f=new o(this,g))}),"undefined"==typeof c?this:c},a.fn.bootstrapTable.Constructor=o,a.fn.bootstrapTable.defaults=o.DEFAULTS,a.fn.bootstrapTable.columnDefaults=o.COLUMN_DEFAULTS,a.fn.bootstrapTable.locales=o.LOCALES,a.fn.bootstrapTable.methods=p,a.fn.bootstrapTable.utils={sprintf:c,getFieldIndex:e,compareObjects:i,calculateObjectValue:h,getItemField:l,objectKeys:n,isIEBrowser:m},a(function(){a('[data-toggle="table"]').bootstrapTable()})}(jQuery);
\ No newline at end of file
diff --git a/management/guns-admin/src/main/webapp/static/js/plugins/bootstrap-table/locale/bootstrap-table-zh-CN.js b/management/guns-admin/src/main/webapp/static/js/plugins/bootstrap-table/locale/bootstrap-table-zh-CN.js
new file mode 100644
index 0000000..874f340
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/static/js/plugins/bootstrap-table/locale/bootstrap-table-zh-CN.js
@@ -0,0 +1,46 @@
+/**
+ * Bootstrap Table Chinese translation
+ * Author: Zhixin Wen<wenzhixin2010@gmail.com>
+ */
+(function ($) {
+ 'use strict';
+
+ $.fn.bootstrapTable.locales['zh-CN'] = {
+ formatLoadingMessage: function () {
+ return '正在努力地加载数据中，请稍候……';
+ },
+ formatRecordsPerPage: function (pageNumber) {
+ return '每页显示 ' + pageNumber + ' 条记录';
+ },
+ formatShowingRows: function (pageFrom, pageTo, totalRows) {
+ return '显示第 ' + pageFrom + ' 到第 ' + pageTo + ' 条记录，总共 ' + totalRows + ' 条记录';
+ },
+ formatSearch: function () {
+ return '搜索';
+ },
+ formatNoMatches: function () {
+ return '没有找到匹配的记录';
+ },
+ formatPaginationSwitch: function () {
+ return '隐藏/显示分页';
+ },
+ formatRefresh: function () {
+ return '刷新';
+ },
+ formatToggle: function () {
+ return '切换';
+ },
+ formatColumns: function () {
+ return '列';
+ },
+ formatExport: function () {
+ return '导出数据';
+ },
+ formatClearFilters: function () {
+ return '清空过滤';
+ }
+ };
+
+ $.extend($.fn.bootstrapTable.defaults, $.fn.bootstrapTable.locales['zh-CN']);
+
+})(jQuery);
diff --git a/management/guns-admin/src/main/webapp/static/js/plugins/bootstrap-table/locale/bootstrap-table-zh-CN.min.js b/management/guns-admin/src/main/webapp/static/js/plugins/bootstrap-table/locale/bootstrap-table-zh-CN.min.js
new file mode 100644
index 0000000..2fcd8d4
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/static/js/plugins/bootstrap-table/locale/bootstrap-table-zh-CN.min.js
@@ -0,0 +1,7 @@
+/*
+* bootstrap-table - v1.11.1 - 2017-02-22
+* https://github.com/wenzhixin/bootstrap-table
+* Copyright (c) 2017 zhixin wen
+* Licensed MIT License
+*/
+!function(a){"use strict";a.fn.bootstrapTable.locales["zh-CN"]={formatLoadingMessage:function(){return"正在努力地加载数据中，请稍候……"},formatRecordsPerPage:function(a){return"每页显示 "+a+" 条记录"},formatShowingRows:function(a,b,c){return"显示第 "+a+" 到第 "+b+" 条记录，总共 "+c+" 条记录"},formatSearch:function(){return"搜索"},formatNoMatches:function(){return"没有找到匹配的记录"},formatPaginationSwitch:function(){return"隐藏/显示分页"},formatRefresh:function(){return"刷新"},formatToggle:function(){return"切换"},formatColumns:function(){return"列"},formatExport:function(){return"导出数据"},formatClearFilters:function(){return"清空过滤"}},a.extend(a.fn.bootstrapTable.defaults,a.fn.bootstrapTable.locales["zh-CN"])}(jQuery);
\ No newline at end of file
diff --git a/management/guns-admin/src/main/webapp/static/js/plugins/bootstrap-treetable/bootstrap-treetable.js b/management/guns-admin/src/main/webapp/static/js/plugins/bootstrap-treetable/bootstrap-treetable.js
new file mode 100644
index 0000000..8f090d9
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/static/js/plugins/bootstrap-treetable/bootstrap-treetable.js
@@ -0,0 +1,353 @@
+/**
+ * 查找当前这个节点的所有节点(包含子节点)，并进行折叠或者展开操作
+ *
+ * @param item 被点击条目的子一级条目
+ * @param target 整个bootstrap tree table实例
+ * @param globalCollapsedFlag 如果为true，则表示当前操作是收缩（折叠），如果是false，表示当前操作是展开
+ * @param options 存放了一些常量，例如展开和收缩的class
+ */
+function extracted($, item, target, globalCollapsedFlag, options) {
+ var itemCodeName = $(item).find("td[name='code']").text();
+ var subItems = target.find("tbody").find(".tg-" + itemCodeName);//下一级，改为下所有级别
+
+ if (subItems.size() > 0) {
+ $.each(subItems, function (nIndex, nItem) {
+ extracted($, nItem, target, globalCollapsedFlag, options);
+ });
+ }
+ $.each(subItems, function (pIndex, pItem) {
+
+ //如果是展开,判断当前箭头是开启还是关闭
+ var expander = $(item).find("td[name='name']").find(".treetable-expander");
+ if (!globalCollapsedFlag) {
+ var hasExpander = expander.hasClass(options.expanderExpandedClass);
+ if (hasExpander) {
+ $(pItem).css("display", "table");
+ } else {
+ $(pItem).css("display", "none");
+ }
+ } else {
+ //如果是折叠，就把当前开着的都折叠掉
+ $(pItem).css("display", "none");
+ expander.removeClass(options.expanderExpandedClass);
+ expander.addClass(options.expanderCollapsedClass);
+ }
+ });
+}
+
+(function ($) {
+ "use strict";
+
+ $.fn.bootstrapTreeTable = function (options, param) {
+ var allData = null;//用于存放格式化后的数据
+ // 如果是调用方法
+ if (typeof options == 'string') {
+ return $.fn.bootstrapTreeTable.methods[options](this, param);
+ }
+ // 如果是初始化组件
+ options = $.extend({}, $.fn.bootstrapTreeTable.defaults, options || {});
+ // 是否有radio或checkbox
+ var hasSelectItem = false;
+ var target = $(this);
+ // 在外层包装一下div，样式用的bootstrap-table的
+ var _main_div = $("<div class='bootstrap-tree-table fixed-table-container'></div>");
+ target.before(_main_div);
+ _main_div.append(target);
+ target.addClass("table table-hover treetable-table table-bordered");
+ if (options.striped) {
+ target.addClass('table-striped');
+ }
+ // 工具条在外层包装一下div，样式用的bootstrap-table的
+ if (options.toolbar) {
+ var _tool_div = $("<div class='fixed-table-toolbar'></div>");
+ var _tool_left_div = $("<div class='bs-bars pull-left'></div>");
+ _tool_left_div.append($(options.toolbar));
+ _tool_div.append(_tool_left_div);
+ _main_div.before(_tool_div);
+ }
+ // 格式化数据，优化性能
+ target.formatData = function (data) {
+ var _root = options.rootCodeValue ? options.rootCodeValue : null
+ $.each(data, function (index, item) {
+ // 添加一个默认属性，用来判断当前节点有没有被显示
+ item.isShow = false;
+ // 这里兼容几种常见Root节点写法
+ // 默认的几种判断
+ var _defaultRootFlag = item[options.parentCode] == '0'
+ || item[options.parentCode] == 0
+ || item[options.parentCode] == null
+ || item[options.parentCode] == '';
+ if (!item[options.parentCode] || (_root ? (item[options.parentCode] == options.rootCodeValue) : _defaultRootFlag)) {
+ if (!allData["_root_"]) {
+ allData["_root_"] = [];
+ }
+ allData["_root_"].push(item);
+ } else {
+ if (!allData["_n_" + item[options.parentCode]]) {
+ allData["_n_" + item[options.parentCode]] = [];
+ }
+ allData["_n_" + item[options.parentCode]].push(item);
+ }
+ });
+ }
+ // 得到根节点
+ target.getRootNodes = function () {
+ return allData["_root_"];
+ };
+ // 递归获取子节点并且设置子节点
+ target.handleNode = function (parentNode, lv, tbody) {
+ var _ls = allData["_n_" + parentNode[options.code]];
+ var tr = target.renderRow(parentNode, _ls ? true : false, lv);
+ tbody.append(tr);
+ if (_ls) {
+ $.each(_ls, function (i, item) {
+ target.handleNode(item, (lv + 1), tbody)
+ });
+ }
+ };
+ // 绘制行
+ target.renderRow = function (item, isP, lv) {
+ // 标记已显示
+ item.isShow = true;
+ var tr = $('<tr class="tg-' + item[options.parentCode] + '"></tr>');
+ var _icon = options.expanderCollapsedClass;
+ if (options.expandAll) {
+ tr.css("display", "table");
+ _icon = options.expanderExpandedClass;
+ } else if (options.expandFirst && lv <= 2) {
+ tr.css("display", "table");
+ _icon = (lv == 1) ? options.expanderExpandedClass : options.expanderCollapsedClass;
+ } else {
+ tr.css("display", "none");
+ _icon = options.expanderCollapsedClass;
+ }
+ $.each(options.columns, function (index, column) {
+ // 判断有没有选择列
+ if (index == 0 && column.field == 'selectItem') {
+ hasSelectItem = true;
+ var td = $('<td style="text-align:center;width:36px"></td>');
+ if (column.radio) {
+ var _ipt = $('<input name="select_item" type="radio" value="' + item[options.id] + '"></input>');
+ td.append(_ipt);
+ }
+ if (column.checkbox) {
+ var _ipt = $('<input name="select_item" type="checkbox" value="' + item[options.id] + '"></input>');
+ td.append(_ipt);
+ }
+ tr.append(td);
+ } else {
+ var td = $('<td title="' + item[column.field] + '" name="' + column.field + '" style="' + ((column.width) ? ('width:' + column.width) : '') + '"></td>');
+ // 增加formatter渲染
+ if (column.formatter) {
+ td.html(column.formatter.call(this, item[column.field], item, index));
+ } else {
+ td.text(item[column.field]);
+ }
+ if (options.expandColumn == index) {
+ if (!isP) {
+ td.prepend('<span class="treetable-expander"></span>')
+ } else {
+ td.prepend('<span class="treetable-expander ' + _icon + '"></span>')
+ }
+ for (var int = 0; int < (lv - 1); int++) {
+ td.prepend('<span class="treetable-indent"></span>')
+ }
+ }
+ tr.append(td);
+ }
+ });
+ return tr;
+ }
+ // 加载数据
+ target.load = function (parms) {
+ // 加载数据前先清空
+ allData = {};
+ // 加载数据前先清空
+ target.html("");
+ // 构造表头
+ var thr = $('<tr></tr>');
+ $.each(options.columns, function (i, item) {
+ var th = null;
+ // 判断有没有选择列
+ if (i == 0 && item.field == 'selectItem') {
+ hasSelectItem = true;
+ th = $('<th style="width:36px"></th>');
+ } else {
+ th = $('<th style="' + ((item.width) ? ('width:' + item.width) : '') + '"></th>');
+ }
+ th.text(item.title);
+ thr.append(th);
+ });
+ var thead = $('<thead class="treetable-thead"></thead>');
+ thead.append(thr);
+ target.append(thead);
+ // 构造表体
+ var tbody = $('<tbody class="treetable-tbody"></tbody>');
+ target.append(tbody);
+ // 添加加载loading
+ var _loading = '<tr><td colspan="' + options.columns.length + '"><div style="display: block;text-align: center;">正在努力地加载数据中，请稍候……</div></td></tr>'
+ tbody.html(_loading);
+ // 默认高度
+ if (options.height) {
+ tbody.css("height", options.height);
+ }
+ $.ajax({
+ type: options.type,
+ url: options.url,
+ data: parms ? parms : options.ajaxParams,
+ dataType: "JSON",
+ success: function (data, textStatus, jqXHR) {
+ // 加载完数据先清空
+ tbody.html("");
+ if (!data || data.length <= 0) {
+ var _empty = '<tr><td colspan="' + options.columns.length + '"><div style="display: block;text-align: center;">没有找到匹配的记录</div></td></tr>'
+ tbody.html(_empty);
+ return;
+ }
+ // 格式化数据
+ target.formatData(data);
+ // 开始绘制
+ var rootNode = target.getRootNodes();
+ if (rootNode) {
+ $.each(rootNode, function (i, item) {
+ target.handleNode(item, 1, tbody);
+ });
+ }
+ // 下边的操作主要是为了查询时让一些没有根节点的节点显示
+ $.each(data, function (i, item) {
+ if (!item.isShow) {
+ var tr = target.renderRow(item, false, 1);
+ tbody.append(tr);
+ }
+ });
+ target.append(tbody);
+ //动态设置表头宽度
+ thead.css("width", tbody.children(":first").css("width"));
+ // 行点击选中事件
+ target.find("tbody").find("tr").click(function () {
+ if (hasSelectItem) {
+ var _ipt = $(this).find("input[name='select_item']");
+ if (_ipt.attr("type") == "radio") {
+ _ipt.prop('checked', true);
+ target.find("tbody").find("tr").removeClass("treetable-selected");
+ $(this).addClass("treetable-selected");
+ } else {
+ if (_ipt.prop('checked')) {
+ _ipt.prop('checked', false);
+ $(this).removeClass("treetable-selected");
+ } else {
+ _ipt.prop('checked', true);
+ $(this).addClass("treetable-selected");
+ }
+ }
+ }
+ });
+ // 小图标点击事件--展开缩起
+ target.find("tbody").find("tr").find(".treetable-expander").click(function () {
+ var tr = $(this).parent().parent();
+ var _code = tr.find("input[name='select_item']").val();
+ if (options.id == options.code) {
+ _code = tr.find("input[name='select_item']").val();
+ } else {
+ _code = tr.find("td[name='" + options.code + "']").text();
+ }
+ var _ls = target.find("tbody").find(".tg-" + _code);//下一级，改为下所有级别
+ if (_ls && _ls.length > 0) {
+ var _flag = $(this).hasClass(options.expanderExpandedClass);
+ $.each(_ls, function (index, item) {
+
+ //查找当前这个节点的所有节点(包含子节点)，如果是折叠都显示为不显示，如果是展开，则根据当前节点的状态
+ extracted($, item, target, _flag, options);
+
+ $(item).css("display", _flag ? "none" : "table");
+ });
+ if (_flag) {
+ $(this).removeClass(options.expanderExpandedClass)
+ $(this).addClass(options.expanderCollapsedClass)
+ } else {
+ $(this).removeClass(options.expanderCollapsedClass)
+ $(this).addClass(options.expanderExpandedClass)
+ }
+ }
+ });
+ },
+ error: function (xhr, textStatus) {
+ var _errorMsg = '<tr><td colspan="' + options.columns.length + '"><div style="display: block;text-align: center;">' + xhr.responseText + '</div></td></tr>'
+ tbody.html(_errorMsg);
+ debugger;
+ },
+ });
+ }
+ if (options.url) {
+ target.load();
+ } else {
+ // 也可以通过defaults里面的data属性通过传递一个数据集合进来对组件进行初始化....有兴趣可以自己实现，思路和上述类似
+ }
+
+ return target;
+ };
+
+ // 组件方法封装........
+ $.fn.bootstrapTreeTable.methods = {
+ // 返回选中记录的id（返回的id由配置中的id属性指定）
+ // 为了兼容bootstrap-table的写法，统一返回数组，这里只返回了指定的id
+ getSelections: function (target, data) {
+ // 所有被选中的记录input
+ var _ipt = target.find("tbody").find("tr").find("input[name='select_item']:checked");
+ var chk_value = [];
+ // 如果是radio
+ if (_ipt.attr("type") == "radio") {
+ var _data = {id: _ipt.val()};
+ var _tds = _ipt.parent().parent().find("td");
+ _tds.each(function (_i, _item) {
+ if (_i != 0) {
+ _data[$(_item).attr("name")] = $(_item).text();
+ }
+ });
+ chk_value.push(_data);
+ } else {
+ _ipt.each(function (_i, _item) {
+ var _data = {id: $(_item).val()};
+ var _tds = $(_item).parent().parent().find("td");
+ _tds.each(function (_ii, _iitem) {
+ if (_ii != 0) {
+ _data[$(_iitem).attr("name")] = $(_iitem).text();
+ }
+ });
+ chk_value.push(_data);
+ });
+ }
+ return chk_value;
+ },
+ // 刷新记录
+ refresh: function (target, parms) {
+ if (parms) {
+ target.load(parms);
+ } else {
+ target.load();
+ }
+ },
+ // 组件的其他方法也可以进行类似封装........
+ };
+
+ $.fn.bootstrapTreeTable.defaults = {
+ id: 'id',// 选取记录返回的值
+ code: 'id',// 用于设置父子关系
+ parentCode: 'parentId',// 用于设置父子关系
+ rootCodeValue: null,//设置根节点code值----可指定根节点，默认为null,"",0,"0"
+ data: [], // 构造table的数据集合
+ type: "GET", // 请求数据的ajax类型
+ url: null, // 请求数据的ajax的url
+ ajaxParams: {}, // 请求数据的ajax的data属性
+ expandColumn: null,// 在哪一列上面显示展开按钮
+ expandAll: true, // 是否全部展开
+ expandFirst: false, // 是否默认第一级展开--expandAll为false时生效
+ striped: false, // 是否各行渐变色
+ columns: [],
+ toolbar: null,//顶部工具条
+ height: 0,
+ expanderExpandedClass: 'glyphicon glyphicon-chevron-down',// 展开的按钮的图标
+ expanderCollapsedClass: 'glyphicon glyphicon-chevron-right'// 缩起的按钮的图标
+
+ };
+})(jQuery);
\ No newline at end of file
diff --git a/management/guns-admin/src/main/webapp/static/js/plugins/chartJs/Chart.min.js b/management/guns-admin/src/main/webapp/static/js/plugins/chartJs/Chart.min.js
new file mode 100644
index 0000000..644e7ad
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/static/js/plugins/chartJs/Chart.min.js
@@ -0,0 +1,11 @@
+/*!
+ * Chart.js
+ * http://chartjs.org/
+ * Version: 1.0.1-beta.4
+ *
+ * Copyright 2014 Nick Downie
+ * Released under the MIT license
+ * https://github.com/nnnick/Chart.js/blob/master/LICENSE.md
+ */
+(function(){"use strict";var t=this,i=t.Chart,e=function(t){this.canvas=t.canvas,this.ctx=t;this.width=t.canvas.width,this.height=t.canvas.height;return this.aspectRatio=this.width/this.height,s.retinaScale(this),this};e.defaults={global:{animation:!0,animationSteps:60,animationEasing:"easeOutQuart",showScale:!0,scaleOverride:!1,scaleSteps:null,scaleStepWidth:null,scaleStartValue:null,scaleLineColor:"rgba(0,0,0,.1)",scaleLineWidth:1,scaleShowLabels:!0,scaleLabel:"<%=value%>",scaleIntegersOnly:!0,scaleBeginAtZero:!1,scaleFontFamily:"'Helvetica Neue', 'Helvetica', 'Arial', sans-serif",scaleFontSize:12,scaleFontStyle:"normal",scaleFontColor:"#666",responsive:!1,maintainAspectRatio:!0,showTooltips:!0,tooltipEvents:["mousemove","touchstart","touchmove","mouseout"],tooltipFillColor:"rgba(0,0,0,0.8)",tooltipFontFamily:"'Helvetica Neue', 'Helvetica', 'Arial', sans-serif",tooltipFontSize:14,tooltipFontStyle:"normal",tooltipFontColor:"#fff",tooltipTitleFontFamily:"'Helvetica Neue', 'Helvetica', 'Arial', sans-serif",tooltipTitleFontSize:14,tooltipTitleFontStyle:"bold",tooltipTitleFontColor:"#fff",tooltipYPadding:6,tooltipXPadding:6,tooltipCaretSize:8,tooltipCornerRadius:6,tooltipXOffset:10,tooltipTemplate:"<%if (label){%><%=label%>: <%}%><%= value %>",multiTooltipTemplate:"<%= value %>",multiTooltipKeyBackground:"#fff",onAnimationProgress:function(){},onAnimationComplete:function(){}}},e.types={};var s=e.helpers={},n=s.each=function(t,i,e){var s=Array.prototype.slice.call(arguments,3);if(t)if(t.length===+t.length){var n;for(n=0;n<t.length;n++)i.apply(e,[t[n],n].concat(s))}else for(var o in t)i.apply(e,[t[o],o].concat(s))},o=s.clone=function(t){var i={};return n(t,function(e,s){t.hasOwnProperty(s)&&(i[s]=e)}),i},a=s.extend=function(t){return n(Array.prototype.slice.call(arguments,1),function(i){n(i,function(e,s){i.hasOwnProperty(s)&&(t[s]=e)})}),t},h=s.merge=function(){var t=Array.prototype.slice.call(arguments,0);return t.unshift({}),a.apply(null,t)},l=s.indexOf=function(t,i){if(Array.prototype.indexOf)return t.indexOf(i);for(var e=0;e<t.length;e++)if(t[e]===i)return e;return-1},r=(s.where=function(t,i){var e=[];return s.each(t,function(t){i(t)&&e.push(t)}),e},s.findNextWhere=function(t,i,e){e||(e=-1);for(var s=e+1;s<t.length;s++){var n=t[s];if(i(n))return n}},s.findPreviousWhere=function(t,i,e){e||(e=t.length);for(var s=e-1;s>=0;s--){var n=t[s];if(i(n))return n}},s.inherits=function(t){var i=this,e=t&&t.hasOwnProperty("constructor")?t.constructor:function(){return i.apply(this,arguments)},s=function(){this.constructor=e};return s.prototype=i.prototype,e.prototype=new s,e.extend=r,t&&a(e.prototype,t),e.__super__=i.prototype,e}),c=s.noop=function(){},u=s.uid=function(){var t=0;return function(){return"chart-"+t++}}(),d=s.warn=function(t){window.console&&"function"==typeof window.console.warn&&console.warn(t)},p=s.amd="function"==typeof t.define&&t.define.amd,f=s.isNumber=function(t){return!isNaN(parseFloat(t))&&isFinite(t)},g=s.max=function(t){return Math.max.apply(Math,t)},m=s.min=function(t){return Math.min.apply(Math,t)},v=(s.cap=function(t,i,e){if(f(i)){if(t>i)return i}else if(f(e)&&e>t)return e;return t},s.getDecimalPlaces=function(t){return t%1!==0&&f(t)?t.toString().split(".")[1].length:0}),x=s.radians=function(t){return t*(Math.PI/180)},S=(s.getAngleFromPoint=function(t,i){var e=i.x-t.x,s=i.y-t.y,n=Math.sqrt(e*e+s*s),o=2*Math.PI+Math.atan2(s,e);return 0>e&&0>s&&(o+=2*Math.PI),{angle:o,distance:n}},s.aliasPixel=function(t){return t%2===0?0:.5}),y=(s.splineCurve=function(t,i,e,s){var n=Math.sqrt(Math.pow(i.x-t.x,2)+Math.pow(i.y-t.y,2)),o=Math.sqrt(Math.pow(e.x-i.x,2)+Math.pow(e.y-i.y,2)),a=s*n/(n+o),h=s*o/(n+o);return{inner:{x:i.x-a*(e.x-t.x),y:i.y-a*(e.y-t.y)},outer:{x:i.x+h*(e.x-t.x),y:i.y+h*(e.y-t.y)}}},s.calculateOrderOfMagnitude=function(t){return Math.floor(Math.log(t)/Math.LN10)}),C=(s.calculateScaleRange=function(t,i,e,s,n){var o=2,a=Math.floor(i/(1.5*e)),h=o>=a,l=g(t),r=m(t);l===r&&(l+=.5,r>=.5&&!s?r-=.5:l+=.5);for(var c=Math.abs(l-r),u=y(c),d=Math.ceil(l/(1*Math.pow(10,u)))*Math.pow(10,u),p=s?0:Math.floor(r/(1*Math.pow(10,u)))*Math.pow(10,u),f=d-p,v=Math.pow(10,u),x=Math.round(f/v);(x>a||a>2*x)&&!h;)if(x>a)v*=2,x=Math.round(f/v),x%1!==0&&(h=!0);else if(n&&u>=0){if(v/2%1!==0)break;v/=2,x=Math.round(f/v)}else v/=2,x=Math.round(f/v);return h&&(x=o,v=f/x),{steps:x,stepValue:v,min:p,max:p+x*v}},s.template=function(t,i){function e(t,i){var e=/\W/.test(t)?new Function("obj","var p=[],print=function(){p.push.apply(p,arguments);};with(obj){p.push('"+t.replace(/[\r\t\n]/g," ").split("<%").join(" ").replace(/((^|%>)[^\t]*)'/g,"$1\r").replace(/\t=(.*?)%>/g,"',$1,'").split(" ").join("');").split("%>").join("p.push('").split("\r").join("\\'")+"');}return p.join('');"):s[t]=s[t];return i?e(i):e}if(t instanceof Function)return t(i);var s={};return e(t,i)}),b=(s.generateLabels=function(t,i,e,s){var o=new Array(i);return labelTemplateString&&n(o,function(i,n){o[n]=C(t,{value:e+s*(n+1)})}),o},s.easingEffects={linear:function(t){return t},easeInQuad:function(t){return t*t},easeOutQuad:function(t){return-1*t*(t-2)},easeInOutQuad:function(t){return(t/=.5)<1?.5*t*t:-0.5*(--t*(t-2)-1)},easeInCubic:function(t){return t*t*t},easeOutCubic:function(t){return 1*((t=t/1-1)*t*t+1)},easeInOutCubic:function(t){return(t/=.5)<1?.5*t*t*t:.5*((t-=2)*t*t+2)},easeInQuart:function(t){return t*t*t*t},easeOutQuart:function(t){return-1*((t=t/1-1)*t*t*t-1)},easeInOutQuart:function(t){return(t/=.5)<1?.5*t*t*t*t:-0.5*((t-=2)*t*t*t-2)},easeInQuint:function(t){return 1*(t/=1)*t*t*t*t},easeOutQuint:function(t){return 1*((t=t/1-1)*t*t*t*t+1)},easeInOutQuint:function(t){return(t/=.5)<1?.5*t*t*t*t*t:.5*((t-=2)*t*t*t*t+2)},easeInSine:function(t){return-1*Math.cos(t/1*(Math.PI/2))+1},easeOutSine:function(t){return 1*Math.sin(t/1*(Math.PI/2))},easeInOutSine:function(t){return-0.5*(Math.cos(Math.PI*t/1)-1)},easeInExpo:function(t){return 0===t?1:1*Math.pow(2,10*(t/1-1))},easeOutExpo:function(t){return 1===t?1:1*(-Math.pow(2,-10*t/1)+1)},easeInOutExpo:function(t){return 0===t?0:1===t?1:(t/=.5)<1?.5*Math.pow(2,10*(t-1)):.5*(-Math.pow(2,-10*--t)+2)},easeInCirc:function(t){return t>=1?t:-1*(Math.sqrt(1-(t/=1)*t)-1)},easeOutCirc:function(t){return 1*Math.sqrt(1-(t=t/1-1)*t)},easeInOutCirc:function(t){return(t/=.5)<1?-0.5*(Math.sqrt(1-t*t)-1):.5*(Math.sqrt(1-(t-=2)*t)+1)},easeInElastic:function(t){var i=1.70158,e=0,s=1;return 0===t?0:1==(t/=1)?1:(e||(e=.3),s<Math.abs(1)?(s=1,i=e/4):i=e/(2*Math.PI)*Math.asin(1/s),-(s*Math.pow(2,10*(t-=1))*Math.sin(2*(1*t-i)*Math.PI/e)))},easeOutElastic:function(t){var i=1.70158,e=0,s=1;return 0===t?0:1==(t/=1)?1:(e||(e=.3),s<Math.abs(1)?(s=1,i=e/4):i=e/(2*Math.PI)*Math.asin(1/s),s*Math.pow(2,-10*t)*Math.sin(2*(1*t-i)*Math.PI/e)+1)},easeInOutElastic:function(t){var i=1.70158,e=0,s=1;return 0===t?0:2==(t/=.5)?1:(e||(e=.3*1.5),s<Math.abs(1)?(s=1,i=e/4):i=e/(2*Math.PI)*Math.asin(1/s),1>t?-.5*s*Math.pow(2,10*(t-=1))*Math.sin(2*(1*t-i)*Math.PI/e):s*Math.pow(2,-10*(t-=1))*Math.sin(2*(1*t-i)*Math.PI/e)*.5+1)},easeInBack:function(t){var i=1.70158;return 1*(t/=1)*t*((i+1)*t-i)},easeOutBack:function(t){var i=1.70158;return 1*((t=t/1-1)*t*((i+1)*t+i)+1)},easeInOutBack:function(t){var i=1.70158;return(t/=.5)<1?.5*t*t*(((i*=1.525)+1)*t-i):.5*((t-=2)*t*(((i*=1.525)+1)*t+i)+2)},easeInBounce:function(t){return 1-b.easeOutBounce(1-t)},easeOutBounce:function(t){return(t/=1)<1/2.75?7.5625*t*t:2/2.75>t?1*(7.5625*(t-=1.5/2.75)*t+.75):2.5/2.75>t?1*(7.5625*(t-=2.25/2.75)*t+.9375):1*(7.5625*(t-=2.625/2.75)*t+.984375)},easeInOutBounce:function(t){return.5>t?.5*b.easeInBounce(2*t):.5*b.easeOutBounce(2*t-1)+.5}}),w=s.requestAnimFrame=function(){return window.requestAnimationFrame||window.webkitRequestAnimationFrame||window.mozRequestAnimationFrame||window.oRequestAnimationFrame||window.msRequestAnimationFrame||function(t){return window.setTimeout(t,1e3/60)}}(),P=(s.cancelAnimFrame=function(){return window.cancelAnimationFrame||window.webkitCancelAnimationFrame||window.mozCancelAnimationFrame||window.oCancelAnimationFrame||window.msCancelAnimationFrame||function(t){return window.clearTimeout(t,1e3/60)}}(),s.animationLoop=function(t,i,e,s,n,o){var a=0,h=b[e]||b.linear,l=function(){a++;var e=a/i,r=h(e);t.call(o,r,e,a),s.call(o,r,e),i>a?o.animationFrame=w(l):n.apply(o)};w(l)},s.getRelativePosition=function(t){var i,e,s=t.originalEvent||t,n=t.currentTarget||t.srcElement,o=n.getBoundingClientRect();return s.touches?(i=s.touches[0].clientX-o.left,e=s.touches[0].clientY-o.top):(i=s.clientX-o.left,e=s.clientY-o.top),{x:i,y:e}},s.addEvent=function(t,i,e){t.addEventListener?t.addEventListener(i,e):t.attachEvent?t.attachEvent("on"+i,e):t["on"+i]=e}),L=s.removeEvent=function(t,i,e){t.removeEventListener?t.removeEventListener(i,e,!1):t.detachEvent?t.detachEvent("on"+i,e):t["on"+i]=c},k=(s.bindEvents=function(t,i,e){t.events||(t.events={}),n(i,function(i){t.events[i]=function(){e.apply(t,arguments)},P(t.chart.canvas,i,t.events[i])})},s.unbindEvents=function(t,i){n(i,function(i,e){L(t.chart.canvas,e,i)})}),F=s.getMaximumWidth=function(t){var i=t.parentNode;return i.clientWidth},R=s.getMaximumHeight=function(t){var i=t.parentNode;return i.clientHeight},A=(s.getMaximumSize=s.getMaximumWidth,s.retinaScale=function(t){var i=t.ctx,e=t.canvas.width,s=t.canvas.height;window.devicePixelRatio&&(i.canvas.style.width=e+"px",i.canvas.style.height=s+"px",i.canvas.height=s*window.devicePixelRatio,i.canvas.width=e*window.devicePixelRatio,i.scale(window.devicePixelRatio,window.devicePixelRatio))}),T=s.clear=function(t){t.ctx.clearRect(0,0,t.width,t.height)},M=s.fontString=function(t,i,e){return i+" "+t+"px "+e},W=s.longestText=function(t,i,e){t.font=i;var s=0;return n(e,function(i){var e=t.measureText(i).width;s=e>s?e:s}),s},z=s.drawRoundedRectangle=function(t,i,e,s,n,o){t.beginPath(),t.moveTo(i+o,e),t.lineTo(i+s-o,e),t.quadraticCurveTo(i+s,e,i+s,e+o),t.lineTo(i+s,e+n-o),t.quadraticCurveTo(i+s,e+n,i+s-o,e+n),t.lineTo(i+o,e+n),t.quadraticCurveTo(i,e+n,i,e+n-o),t.lineTo(i,e+o),t.quadraticCurveTo(i,e,i+o,e),t.closePath()};e.instances={},e.Type=function(t,i,s){this.options=i,this.chart=s,this.id=u(),e.instances[this.id]=this,i.responsive&&this.resize(),this.initialize.call(this,t)},a(e.Type.prototype,{initialize:function(){return this},clear:function(){return T(this.chart),this},stop:function(){return s.cancelAnimFrame.call(t,this.animationFrame),this},resize:function(t){this.stop();var i=this.chart.canvas,e=F(this.chart.canvas),s=this.options.maintainAspectRatio?e/this.chart.aspectRatio:R(this.chart.canvas);return i.width=this.chart.width=e,i.height=this.chart.height=s,A(this.chart),"function"==typeof t&&t.apply(this,Array.prototype.slice.call(arguments,1)),this},reflow:c,render:function(t){return t&&this.reflow(),this.options.animation&&!t?s.animationLoop(this.draw,this.options.animationSteps,this.options.animationEasing,this.options.onAnimationProgress,this.options.onAnimationComplete,this):(this.draw(),this.options.onAnimationComplete.call(this)),this},generateLegend:function(){return C(this.options.legendTemplate,this)},destroy:function(){this.clear(),k(this,this.events),delete e.instances[this.id]},showTooltip:function(t,i){"undefined"==typeof this.activeElements&&(this.activeElements=[]);var o=function(t){var i=!1;return t.length!==this.activeElements.length?i=!0:(n(t,function(t,e){t!==this.activeElements[e]&&(i=!0)},this),i)}.call(this,t);if(o||i){if(this.activeElements=t,this.draw(),t.length>0)if(this.datasets&&this.datasets.length>1){for(var a,h,r=this.datasets.length-1;r>=0&&(a=this.datasets[r].points||this.datasets[r].bars||this.datasets[r].segments,h=l(a,t[0]),-1===h);r--);var c=[],u=[],d=function(){var t,i,e,n,o,a=[],l=[],r=[];return s.each(this.datasets,function(i){t=i.points||i.bars||i.segments,t[h]&&t[h].hasValue()&&a.push(t[h])}),s.each(a,function(t){l.push(t.x),r.push(t.y),c.push(s.template(this.options.multiTooltipTemplate,t)),u.push({fill:t._saved.fillColor||t.fillColor,stroke:t._saved.strokeColor||t.strokeColor})},this),o=m(r),e=g(r),n=m(l),i=g(l),{x:n>this.chart.width/2?n:i,y:(o+e)/2}}.call(this,h);new e.MultiTooltip({x:d.x,y:d.y,xPadding:this.options.tooltipXPadding,yPadding:this.options.tooltipYPadding,xOffset:this.options.tooltipXOffset,fillColor:this.options.tooltipFillColor,textColor:this.options.tooltipFontColor,fontFamily:this.options.tooltipFontFamily,fontStyle:this.options.tooltipFontStyle,fontSize:this.options.tooltipFontSize,titleTextColor:this.options.tooltipTitleFontColor,titleFontFamily:this.options.tooltipTitleFontFamily,titleFontStyle:this.options.tooltipTitleFontStyle,titleFontSize:this.options.tooltipTitleFontSize,cornerRadius:this.options.tooltipCornerRadius,labels:c,legendColors:u,legendColorBackground:this.options.multiTooltipKeyBackground,title:t[0].label,chart:this.chart,ctx:this.chart.ctx}).draw()}else n(t,function(t){var i=t.tooltipPosition();new e.Tooltip({x:Math.round(i.x),y:Math.round(i.y),xPadding:this.options.tooltipXPadding,yPadding:this.options.tooltipYPadding,fillColor:this.options.tooltipFillColor,textColor:this.options.tooltipFontColor,fontFamily:this.options.tooltipFontFamily,fontStyle:this.options.tooltipFontStyle,fontSize:this.options.tooltipFontSize,caretHeight:this.options.tooltipCaretSize,cornerRadius:this.options.tooltipCornerRadius,text:C(this.options.tooltipTemplate,t),chart:this.chart}).draw()},this);return this}},toBase64Image:function(){return this.chart.canvas.toDataURL.apply(this.chart.canvas,arguments)}}),e.Type.extend=function(t){var i=this,s=function(){return i.apply(this,arguments)};if(s.prototype=o(i.prototype),a(s.prototype,t),s.extend=e.Type.extend,t.name||i.prototype.name){var n=t.name||i.prototype.name,l=e.defaults[i.prototype.name]?o(e.defaults[i.prototype.name]):{};e.defaults[n]=a(l,t.defaults),e.types[n]=s,e.prototype[n]=function(t,i){var o=h(e.defaults.global,e.defaults[n],i||{});return new s(t,o,this)}}else d("Name not provided for this chart, so it hasn't been registered");return i},e.Element=function(t){a(this,t),this.initialize.apply(this,arguments),this.save()},a(e.Element.prototype,{initialize:function(){},restore:function(t){return t?n(t,function(t){this[t]=this._saved[t]},this):a(this,this._saved),this},save:function(){return this._saved=o(this),delete this._saved._saved,this},update:function(t){return n(t,function(t,i){this._saved[i]=this[i],this[i]=t},this),this},transition:function(t,i){return n(t,function(t,e){this[e]=(t-this._saved[e])*i+this._saved[e]},this),this},tooltipPosition:function(){return{x:this.x,y:this.y}},hasValue:function(){return f(this.value)}}),e.Element.extend=r,e.Point=e.Element.extend({display:!0,inRange:function(t,i){var e=this.hitDetectionRadius+this.radius;return Math.pow(t-this.x,2)+Math.pow(i-this.y,2)<Math.pow(e,2)},draw:function(){if(this.display){var t=this.ctx;t.beginPath(),t.arc(this.x,this.y,this.radius,0,2*Math.PI),t.closePath(),t.strokeStyle=this.strokeColor,t.lineWidth=this.strokeWidth,t.fillStyle=this.fillColor,t.fill(),t.stroke()}}}),e.Arc=e.Element.extend({inRange:function(t,i){var e=s.getAngleFromPoint(this,{x:t,y:i}),n=e.angle>=this.startAngle&&e.angle<=this.endAngle,o=e.distance>=this.innerRadius&&e.distance<=this.outerRadius;return n&&o},tooltipPosition:function(){var t=this.startAngle+(this.endAngle-this.startAngle)/2,i=(this.outerRadius-this.innerRadius)/2+this.innerRadius;return{x:this.x+Math.cos(t)*i,y:this.y+Math.sin(t)*i}},draw:function(t){var i=this.ctx;i.beginPath(),i.arc(this.x,this.y,this.outerRadius,this.startAngle,this.endAngle),i.arc(this.x,this.y,this.innerRadius,this.endAngle,this.startAngle,!0),i.closePath(),i.strokeStyle=this.strokeColor,i.lineWidth=this.strokeWidth,i.fillStyle=this.fillColor,i.fill(),i.lineJoin="bevel",this.showStroke&&i.stroke()}}),e.Rectangle=e.Element.extend({draw:function(){var t=this.ctx,i=this.width/2,e=this.x-i,s=this.x+i,n=this.base-(this.base-this.y),o=this.strokeWidth/2;this.showStroke&&(e+=o,s-=o,n+=o),t.beginPath(),t.fillStyle=this.fillColor,t.strokeStyle=this.strokeColor,t.lineWidth=this.strokeWidth,t.moveTo(e,this.base),t.lineTo(e,n),t.lineTo(s,n),t.lineTo(s,this.base),t.fill(),this.showStroke&&t.stroke()},height:function(){return this.base-this.y},inRange:function(t,i){return t>=this.x-this.width/2&&t<=this.x+this.width/2&&i>=this.y&&i<=this.base}}),e.Tooltip=e.Element.extend({draw:function(){var t=this.chart.ctx;t.font=M(this.fontSize,this.fontStyle,this.fontFamily),this.xAlign="center",this.yAlign="above";var i=2,e=t.measureText(this.text).width+2*this.xPadding,s=this.fontSize+2*this.yPadding,n=s+this.caretHeight+i;this.x+e/2>this.chart.width?this.xAlign="left":this.x-e/2<0&&(this.xAlign="right"),this.y-n<0&&(this.yAlign="below");var o=this.x-e/2,a=this.y-n;switch(t.fillStyle=this.fillColor,this.yAlign){case"above":t.beginPath(),t.moveTo(this.x,this.y-i),t.lineTo(this.x+this.caretHeight,this.y-(i+this.caretHeight)),t.lineTo(this.x-this.caretHeight,this.y-(i+this.caretHeight)),t.closePath(),t.fill();break;case"below":a=this.y+i+this.caretHeight,t.beginPath(),t.moveTo(this.x,this.y+i),t.lineTo(this.x+this.caretHeight,this.y+i+this.caretHeight),t.lineTo(this.x-this.caretHeight,this.y+i+this.caretHeight),t.closePath(),t.fill()}switch(this.xAlign){case"left":o=this.x-e+(this.cornerRadius+this.caretHeight);break;case"right":o=this.x-(this.cornerRadius+this.caretHeight)}z(t,o,a,e,s,this.cornerRadius),t.fill(),t.fillStyle=this.textColor,t.textAlign="center",t.textBaseline="middle",t.fillText(this.text,o+e/2,a+s/2)}}),e.MultiTooltip=e.Element.extend({initialize:function(){this.font=M(this.fontSize,this.fontStyle,this.fontFamily),this.titleFont=M(this.titleFontSize,this.titleFontStyle,this.titleFontFamily),this.height=this.labels.length*this.fontSize+(this.labels.length-1)*(this.fontSize/2)+2*this.yPadding+1.5*this.titleFontSize,this.ctx.font=this.titleFont;var t=this.ctx.measureText(this.title).width,i=W(this.ctx,this.font,this.labels)+this.fontSize+3,e=g([i,t]);this.width=e+2*this.xPadding;var s=this.height/2;this.y-s<0?this.y=s:this.y+s>this.chart.height&&(this.y=this.chart.height-s),this.x>this.chart.width/2?this.x-=this.xOffset+this.width:this.x+=this.xOffset},getLineHeight:function(t){var i=this.y-this.height/2+this.yPadding,e=t-1;return 0===t?i+this.titleFontSize/2:i+(1.5*this.fontSize*e+this.fontSize/2)+1.5*this.titleFontSize},draw:function(){z(this.ctx,this.x,this.y-this.height/2,this.width,this.height,this.cornerRadius);var t=this.ctx;t.fillStyle=this.fillColor,t.fill(),t.closePath(),t.textAlign="left",t.textBaseline="middle",t.fillStyle=this.titleTextColor,t.font=this.titleFont,t.fillText(this.title,this.x+this.xPadding,this.getLineHeight(0)),t.font=this.font,s.each(this.labels,function(i,e){t.fillStyle=this.textColor,t.fillText(i,this.x+this.xPadding+this.fontSize+3,this.getLineHeight(e+1)),t.fillStyle=this.legendColorBackground,t.fillRect(this.x+this.xPadding,this.getLineHeight(e+1)-this.fontSize/2,this.fontSize,this.fontSize),t.fillStyle=this.legendColors[e].fill,t.fillRect(this.x+this.xPadding,this.getLineHeight(e+1)-this.fontSize/2,this.fontSize,this.fontSize)},this)}}),e.Scale=e.Element.extend({initialize:function(){this.fit()},buildYLabels:function(){this.yLabels=[];for(var t=v(this.stepValue),i=0;i<=this.steps;i++)this.yLabels.push(C(this.templateString,{value:(this.min+i*this.stepValue).toFixed(t)}));this.yLabelWidth=this.display&&this.showLabels?W(this.ctx,this.font,this.yLabels):0},addXLabel:function(t){this.xLabels.push(t),this.valuesCount++,this.fit()},removeXLabel:function(){this.xLabels.shift(),this.valuesCount--,this.fit()},fit:function(){this.startPoint=this.display?this.fontSize:0,this.endPoint=this.display?this.height-1.5*this.fontSize-5:this.height,this.startPoint+=this.padding,this.endPoint-=this.padding;var t,i=this.endPoint-this.startPoint;for(this.calculateYRange(i),this.buildYLabels(),this.calculateXLabelRotation();i>this.endPoint-this.startPoint;)i=this.endPoint-this.startPoint,t=this.yLabelWidth,this.calculateYRange(i),this.buildYLabels(),t<this.yLabelWidth&&this.calculateXLabelRotation()},calculateXLabelRotation:function(){this.ctx.font=this.font;var t,i,e=this.ctx.measureText(this.xLabels[0]).width,s=this.ctx.measureText(this.xLabels[this.xLabels.length-1]).width;if(this.xScalePaddingRight=s/2+3,this.xScalePaddingLeft=e/2>this.yLabelWidth+10?e/2:this.yLabelWidth+10,this.xLabelRotation=0,this.display){var n,o=W(this.ctx,this.font,this.xLabels);this.xLabelWidth=o;for(var a=Math.floor(this.calculateX(1)-this.calculateX(0))-6;this.xLabelWidth>a&&0===this.xLabelRotation||this.xLabelWidth>a&&this.xLabelRotation<=90&&this.xLabelRotation>0;)n=Math.cos(x(this.xLabelRotation)),t=n*e,i=n*s,t+this.fontSize/2>this.yLabelWidth+8&&(this.xScalePaddingLeft=t+this.fontSize/2),this.xScalePaddingRight=this.fontSize/2,this.xLabelRotation++,this.xLabelWidth=n*o;this.xLabelRotation>0&&(this.endPoint-=Math.sin(x(this.xLabelRotation))*o+3)}else this.xLabelWidth=0,this.xScalePaddingRight=this.padding,this.xScalePaddingLeft=this.padding},calculateYRange:c,drawingArea:function(){return this.startPoint-this.endPoint},calculateY:function(t){var i=this.drawingArea()/(this.min-this.max);return this.endPoint-i*(t-this.min)},calculateX:function(t){var i=(this.xLabelRotation>0,this.width-(this.xScalePaddingLeft+this.xScalePaddingRight)),e=i/(this.valuesCount-(this.offsetGridLines?0:1)),s=e*t+this.xScalePaddingLeft;return this.offsetGridLines&&(s+=e/2),Math.round(s)},update:function(t){s.extend(this,t),this.fit()},draw:function(){var t=this.ctx,i=(this.endPoint-this.startPoint)/this.steps,e=Math.round(this.xScalePaddingLeft);this.display&&(t.fillStyle=this.textColor,t.font=this.font,n(this.yLabels,function(n,o){var a=this.endPoint-i*o,h=Math.round(a);t.textAlign="right",t.textBaseline="middle",this.showLabels&&t.fillText(n,e-10,a),t.beginPath(),o>0?(t.lineWidth=this.gridLineWidth,t.strokeStyle=this.gridLineColor):(t.lineWidth=this.lineWidth,t.strokeStyle=this.lineColor),h+=s.aliasPixel(t.lineWidth),t.moveTo(e,h),t.lineTo(this.width,h),t.stroke(),t.closePath(),t.lineWidth=this.lineWidth,t.strokeStyle=this.lineColor,t.beginPath(),t.moveTo(e-5,h),t.lineTo(e,h),t.stroke(),t.closePath()},this),n(this.xLabels,function(i,e){var s=this.calculateX(e)+S(this.lineWidth),n=this.calculateX(e-(this.offsetGridLines?.5:0))+S(this.lineWidth),o=this.xLabelRotation>0;t.beginPath(),e>0?(t.lineWidth=this.gridLineWidth,t.strokeStyle=this.gridLineColor):(t.lineWidth=this.lineWidth,t.strokeStyle=this.lineColor),t.moveTo(n,this.endPoint),t.lineTo(n,this.startPoint-3),t.stroke(),t.closePath(),t.lineWidth=this.lineWidth,t.strokeStyle=this.lineColor,t.beginPath(),t.moveTo(n,this.endPoint),t.lineTo(n,this.endPoint+5),t.stroke(),t.closePath(),t.save(),t.translate(s,o?this.endPoint+12:this.endPoint+8),t.rotate(-1*x(this.xLabelRotation)),t.font=this.font,t.textAlign=o?"right":"center",t.textBaseline=o?"middle":"top",t.fillText(i,0,0),t.restore()},this))}}),e.RadialScale=e.Element.extend({initialize:function(){this.size=m([this.height,this.width]),this.drawingArea=this.display?this.size/2-(this.fontSize/2+this.backdropPaddingY):this.size/2},calculateCenterOffset:function(t){var i=this.drawingArea/(this.max-this.min);return(t-this.min)*i},update:function(){this.lineArc?this.drawingArea=this.display?this.size/2-(this.fontSize/2+this.backdropPaddingY):this.size/2:this.setScaleSize(),this.buildYLabels()},buildYLabels:function(){this.yLabels=[];for(var t=v(this.stepValue),i=0;i<=this.steps;i++)this.yLabels.push(C(this.templateString,{value:(this.min+i*this.stepValue).toFixed(t)}))},getCircumference:function(){return 2*Math.PI/this.valuesCount},setScaleSize:function(){var t,i,e,s,n,o,a,h,l,r,c,u,d=m([this.height/2-this.pointLabelFontSize-5,this.width/2]),p=this.width,g=0;for(this.ctx.font=M(this.pointLabelFontSize,this.pointLabelFontStyle,this.pointLabelFontFamily),i=0;i<this.valuesCount;i++)t=this.getPointPosition(i,d),e=this.ctx.measureText(C(this.templateString,{value:this.labels[i]})).width+5,0===i||i===this.valuesCount/2?(s=e/2,t.x+s>p&&(p=t.x+s,n=i),t.x-s<g&&(g=t.x-s,a=i)):i<this.valuesCount/2?t.x+e>p&&(p=t.x+e,n=i):i>this.valuesCount/2&&t.x-e<g&&(g=t.x-e,a=i);l=g,r=Math.ceil(p-this.width),o=this.getIndexAngle(n),h=this.getIndexAngle(a),c=r/Math.sin(o+Math.PI/2),u=l/Math.sin(h+Math.PI/2),c=f(c)?c:0,u=f(u)?u:0,this.drawingArea=d-(u+c)/2,this.setCenterPoint(u,c)},setCenterPoint:function(t,i){var e=this.width-i-this.drawingArea,s=t+this.drawingArea;this.xCenter=(s+e)/2,this.yCenter=this.height/2},getIndexAngle:function(t){var i=2*Math.PI/this.valuesCount;return t*i-Math.PI/2},getPointPosition:function(t,i){var e=this.getIndexAngle(t);return{x:Math.cos(e)*i+this.xCenter,y:Math.sin(e)*i+this.yCenter}},draw:function(){if(this.display){var t=this.ctx;if(n(this.yLabels,function(i,e){if(e>0){var s,n=e*(this.drawingArea/this.steps),o=this.yCenter-n;if(this.lineWidth>0)if(t.strokeStyle=this.lineColor,t.lineWidth=this.lineWidth,this.lineArc)t.beginPath(),t.arc(this.xCenter,this.yCenter,n,0,2*Math.PI),t.closePath(),t.stroke();else{t.beginPath();for(var a=0;a<this.valuesCount;a++)s=this.getPointPosition(a,this.calculateCenterOffset(this.min+e*this.stepValue)),0===a?t.moveTo(s.x,s.y):t.lineTo(s.x,s.y);t.closePath(),t.stroke()}if(this.showLabels){if(t.font=M(this.fontSize,this.fontStyle,this.fontFamily),this.showLabelBackdrop){var h=t.measureText(i).width;t.fillStyle=this.backdropColor,t.fillRect(this.xCenter-h/2-this.backdropPaddingX,o-this.fontSize/2-this.backdropPaddingY,h+2*this.backdropPaddingX,this.fontSize+2*this.backdropPaddingY)}t.textAlign="center",t.textBaseline="middle",t.fillStyle=this.fontColor,t.fillText(i,this.xCenter,o)}}},this),!this.lineArc){t.lineWidth=this.angleLineWidth,t.strokeStyle=this.angleLineColor;for(var i=this.valuesCount-1;i>=0;i--){if(this.angleLineWidth>0){var e=this.getPointPosition(i,this.calculateCenterOffset(this.max));t.beginPath(),t.moveTo(this.xCenter,this.yCenter),t.lineTo(e.x,e.y),t.stroke(),t.closePath()}var s=this.getPointPosition(i,this.calculateCenterOffset(this.max)+5);t.font=M(this.pointLabelFontSize,this.pointLabelFontStyle,this.pointLabelFontFamily),t.fillStyle=this.pointLabelFontColor;var o=this.labels.length,a=this.labels.length/2,h=a/2,l=h>i||i>o-h,r=i===h||i===o-h;t.textAlign=0===i?"center":i===a?"center":a>i?"left":"right",t.textBaseline=r?"middle":l?"bottom":"top",t.fillText(this.labels[i],s.x,s.y)}}}}}),s.addEvent(window,"resize",function(){var t;return function(){clearTimeout(t),t=setTimeout(function(){n(e.instances,function(t){t.options.responsive&&t.resize(t.render,!0)})},50)}}()),p?define(function(){return e}):"object"==typeof module&&module.exports&&(module.exports=e),t.Chart=e,e.noConflict=function(){return t.Chart=i,e}}).call(this),function(){"use strict";var t=this,i=t.Chart,e=i.helpers,s={scaleBeginAtZero:!0,scaleShowGridLines:!0,scaleGridLineColor:"rgba(0,0,0,.05)",scaleGridLineWidth:1,barShowStroke:!0,barStrokeWidth:2,barValueSpacing:5,barDatasetSpacing:1,legendTemplate:'<ul class="<%=name.toLowerCase()%>-legend"><% for (var i=0; i<datasets.length; i++){%><li><span style="background-color:<%=datasets[i].fillColor%>"></span><%if(datasets[i].label){%><%=datasets[i].label%><%}%></li><%}%></ul>'};i.Type.extend({name:"Bar",defaults:s,initialize:function(t){var s=this.options;this.ScaleClass=i.Scale.extend({offsetGridLines:!0,calculateBarX:function(t,i,e){var n=this.calculateBaseWidth(),o=this.calculateX(e)-n/2,a=this.calculateBarWidth(t);return o+a*i+i*s.barDatasetSpacing+a/2},calculateBaseWidth:function(){return this.calculateX(1)-this.calculateX(0)-2*s.barValueSpacing},calculateBarWidth:function(t){var i=this.calculateBaseWidth()-(t-1)*s.barDatasetSpacing;return i/t}}),this.datasets=[],this.options.showTooltips&&e.bindEvents(this,this.options.tooltipEvents,function(t){var i="mouseout"!==t.type?this.getBarsAtEvent(t):[];this.eachBars(function(t){t.restore(["fillColor","strokeColor"])}),e.each(i,function(t){t.fillColor=t.highlightFill,t.strokeColor=t.highlightStroke}),this.showTooltip(i)}),this.BarClass=i.Rectangle.extend({strokeWidth:this.options.barStrokeWidth,showStroke:this.options.barShowStroke,ctx:this.chart.ctx}),e.each(t.datasets,function(i){var s={label:i.label||null,fillColor:i.fillColor,strokeColor:i.strokeColor,bars:[]};this.datasets.push(s),e.each(i.data,function(e,n){s.bars.push(new this.BarClass({value:e,label:t.labels[n],datasetLabel:i.label,strokeColor:i.strokeColor,fillColor:i.fillColor,highlightFill:i.highlightFill||i.fillColor,highlightStroke:i.highlightStroke||i.strokeColor}))},this)},this),this.buildScale(t.labels),this.BarClass.prototype.base=this.scale.endPoint,this.eachBars(function(t,i,s){e.extend(t,{width:this.scale.calculateBarWidth(this.datasets.length),x:this.scale.calculateBarX(this.datasets.length,s,i),y:this.scale.endPoint}),t.save()},this),this.render()},update:function(){this.scale.update(),e.each(this.activeElements,function(t){t.restore(["fillColor","strokeColor"])}),this.eachBars(function(t){t.save()}),this.render()},eachBars:function(t){e.each(this.datasets,function(i,s){e.each(i.bars,t,this,s)},this)},getBarsAtEvent:function(t){for(var i,s=[],n=e.getRelativePosition(t),o=function(t){s.push(t.bars[i])},a=0;a<this.datasets.length;a++)for(i=0;i<this.datasets[a].bars.length;i++)if(this.datasets[a].bars[i].inRange(n.x,n.y))return e.each(this.datasets,o),s;return s},buildScale:function(t){var i=this,s=function(){var t=[];return i.eachBars(function(i){t.push(i.value)}),t},n={templateString:this.options.scaleLabel,height:this.chart.height,width:this.chart.width,ctx:this.chart.ctx,textColor:this.options.scaleFontColor,fontSize:this.options.scaleFontSize,fontStyle:this.options.scaleFontStyle,fontFamily:this.options.scaleFontFamily,valuesCount:t.length,beginAtZero:this.options.scaleBeginAtZero,integersOnly:this.options.scaleIntegersOnly,calculateYRange:function(t){var i=e.calculateScaleRange(s(),t,this.fontSize,this.beginAtZero,this.integersOnly);e.extend(this,i)},xLabels:t,font:e.fontString(this.options.scaleFontSize,this.options.scaleFontStyle,this.options.scaleFontFamily),lineWidth:this.options.scaleLineWidth,lineColor:this.options.scaleLineColor,gridLineWidth:this.options.scaleShowGridLines?this.options.scaleGridLineWidth:0,gridLineColor:this.options.scaleShowGridLines?this.options.scaleGridLineColor:"rgba(0,0,0,0)",padding:this.options.showScale?0:this.options.barShowStroke?this.options.barStrokeWidth:0,showLabels:this.options.scaleShowLabels,display:this.options.showScale};this.options.scaleOverride&&e.extend(n,{calculateYRange:e.noop,steps:this.options.scaleSteps,stepValue:this.options.scaleStepWidth,min:this.options.scaleStartValue,max:this.options.scaleStartValue+this.options.scaleSteps*this.options.scaleStepWidth}),this.scale=new this.ScaleClass(n)},addData:function(t,i){e.each(t,function(t,e){this.datasets[e].bars.push(new this.BarClass({value:t,label:i,x:this.scale.calculateBarX(this.datasets.length,e,this.scale.valuesCount+1),y:this.scale.endPoint,width:this.scale.calculateBarWidth(this.datasets.length),base:this.scale.endPoint,strokeColor:this.datasets[e].strokeColor,fillColor:this.datasets[e].fillColor}))},this),this.scale.addXLabel(i),this.update()},removeData:function(){this.scale.removeXLabel(),e.each(this.datasets,function(t){t.bars.shift()},this),this.update()},reflow:function(){e.extend(this.BarClass.prototype,{y:this.scale.endPoint,base:this.scale.endPoint});var t=e.extend({height:this.chart.height,width:this.chart.width});this.scale.update(t)},draw:function(t){var i=t||1;this.clear();this.chart.ctx;this.scale.draw(i),e.each(this.datasets,function(t,s){e.each(t.bars,function(t,e){t.hasValue()&&(t.base=this.scale.endPoint,t.transition({x:this.scale.calculateBarX(this.datasets.length,s,e),y:this.scale.calculateY(t.value),width:this.scale.calculateBarWidth(this.datasets.length)},i).draw())},this)},this)}})}.call(this),function(){"use strict";var t=this,i=t.Chart,e=i.helpers,s={segmentShowStroke:!0,segmentStrokeColor:"#fff",segmentStrokeWidth:2,percentageInnerCutout:50,animationSteps:100,animationEasing:"easeOutBounce",animateRotate:!0,animateScale:!1,legendTemplate:'<ul class="<%=name.toLowerCase()%>-legend"><% for (var i=0; i<segments.length; i++){%><li><span style="background-color:<%=segments[i].fillColor%>"></span><%if(segments[i].label){%><%=segments[i].label%><%}%></li><%}%></ul>'};
+ i.Type.extend({name:"Doughnut",defaults:s,initialize:function(t){this.segments=[],this.outerRadius=(e.min([this.chart.width,this.chart.height])-this.options.segmentStrokeWidth/2)/2,this.SegmentArc=i.Arc.extend({ctx:this.chart.ctx,x:this.chart.width/2,y:this.chart.height/2}),this.options.showTooltips&&e.bindEvents(this,this.options.tooltipEvents,function(t){var i="mouseout"!==t.type?this.getSegmentsAtEvent(t):[];e.each(this.segments,function(t){t.restore(["fillColor"])}),e.each(i,function(t){t.fillColor=t.highlightColor}),this.showTooltip(i)}),this.calculateTotal(t),e.each(t,function(t,i){this.addData(t,i,!0)},this),this.render()},getSegmentsAtEvent:function(t){var i=[],s=e.getRelativePosition(t);return e.each(this.segments,function(t){t.inRange(s.x,s.y)&&i.push(t)},this),i},addData:function(t,i,e){var s=i||this.segments.length;this.segments.splice(s,0,new this.SegmentArc({value:t.value,outerRadius:this.options.animateScale?0:this.outerRadius,innerRadius:this.options.animateScale?0:this.outerRadius/100*this.options.percentageInnerCutout,fillColor:t.color,highlightColor:t.highlight||t.color,showStroke:this.options.segmentShowStroke,strokeWidth:this.options.segmentStrokeWidth,strokeColor:this.options.segmentStrokeColor,startAngle:1.5*Math.PI,circumference:this.options.animateRotate?0:this.calculateCircumference(t.value),label:t.label})),e||(this.reflow(),this.update())},calculateCircumference:function(t){return 2*Math.PI*(t/this.total)},calculateTotal:function(t){this.total=0,e.each(t,function(t){this.total+=t.value},this)},update:function(){this.calculateTotal(this.segments),e.each(this.activeElements,function(t){t.restore(["fillColor"])}),e.each(this.segments,function(t){t.save()}),this.render()},removeData:function(t){var i=e.isNumber(t)?t:this.segments.length-1;this.segments.splice(i,1),this.reflow(),this.update()},reflow:function(){e.extend(this.SegmentArc.prototype,{x:this.chart.width/2,y:this.chart.height/2}),this.outerRadius=(e.min([this.chart.width,this.chart.height])-this.options.segmentStrokeWidth/2)/2,e.each(this.segments,function(t){t.update({outerRadius:this.outerRadius,innerRadius:this.outerRadius/100*this.options.percentageInnerCutout})},this)},draw:function(t){var i=t?t:1;this.clear(),e.each(this.segments,function(t,e){t.transition({circumference:this.calculateCircumference(t.value),outerRadius:this.outerRadius,innerRadius:this.outerRadius/100*this.options.percentageInnerCutout},i),t.endAngle=t.startAngle+t.circumference,t.draw(),0===e&&(t.startAngle=1.5*Math.PI),e<this.segments.length-1&&(this.segments[e+1].startAngle=t.endAngle)},this)}}),i.types.Doughnut.extend({name:"Pie",defaults:e.merge(s,{percentageInnerCutout:0})})}.call(this),function(){"use strict";var t=this,i=t.Chart,e=i.helpers,s={scaleShowGridLines:!0,scaleGridLineColor:"rgba(0,0,0,.05)",scaleGridLineWidth:1,bezierCurve:!0,bezierCurveTension:.4,pointDot:!0,pointDotRadius:4,pointDotStrokeWidth:1,pointHitDetectionRadius:20,datasetStroke:!0,datasetStrokeWidth:2,datasetFill:!0,legendTemplate:'<ul class="<%=name.toLowerCase()%>-legend"><% for (var i=0; i<datasets.length; i++){%><li><span style="background-color:<%=datasets[i].strokeColor%>"></span><%if(datasets[i].label){%><%=datasets[i].label%><%}%></li><%}%></ul>'};i.Type.extend({name:"Line",defaults:s,initialize:function(t){this.PointClass=i.Point.extend({strokeWidth:this.options.pointDotStrokeWidth,radius:this.options.pointDotRadius,display:this.options.pointDot,hitDetectionRadius:this.options.pointHitDetectionRadius,ctx:this.chart.ctx,inRange:function(t){return Math.pow(t-this.x,2)<Math.pow(this.radius+this.hitDetectionRadius,2)}}),this.datasets=[],this.options.showTooltips&&e.bindEvents(this,this.options.tooltipEvents,function(t){var i="mouseout"!==t.type?this.getPointsAtEvent(t):[];this.eachPoints(function(t){t.restore(["fillColor","strokeColor"])}),e.each(i,function(t){t.fillColor=t.highlightFill,t.strokeColor=t.highlightStroke}),this.showTooltip(i)}),e.each(t.datasets,function(i){var s={label:i.label||null,fillColor:i.fillColor,strokeColor:i.strokeColor,pointColor:i.pointColor,pointStrokeColor:i.pointStrokeColor,points:[]};this.datasets.push(s),e.each(i.data,function(e,n){s.points.push(new this.PointClass({value:e,label:t.labels[n],datasetLabel:i.label,strokeColor:i.pointStrokeColor,fillColor:i.pointColor,highlightFill:i.pointHighlightFill||i.pointColor,highlightStroke:i.pointHighlightStroke||i.pointStrokeColor}))},this),this.buildScale(t.labels),this.eachPoints(function(t,i){e.extend(t,{x:this.scale.calculateX(i),y:this.scale.endPoint}),t.save()},this)},this),this.render()},update:function(){this.scale.update(),e.each(this.activeElements,function(t){t.restore(["fillColor","strokeColor"])}),this.eachPoints(function(t){t.save()}),this.render()},eachPoints:function(t){e.each(this.datasets,function(i){e.each(i.points,t,this)},this)},getPointsAtEvent:function(t){var i=[],s=e.getRelativePosition(t);return e.each(this.datasets,function(t){e.each(t.points,function(t){t.inRange(s.x,s.y)&&i.push(t)})},this),i},buildScale:function(t){var s=this,n=function(){var t=[];return s.eachPoints(function(i){t.push(i.value)}),t},o={templateString:this.options.scaleLabel,height:this.chart.height,width:this.chart.width,ctx:this.chart.ctx,textColor:this.options.scaleFontColor,fontSize:this.options.scaleFontSize,fontStyle:this.options.scaleFontStyle,fontFamily:this.options.scaleFontFamily,valuesCount:t.length,beginAtZero:this.options.scaleBeginAtZero,integersOnly:this.options.scaleIntegersOnly,calculateYRange:function(t){var i=e.calculateScaleRange(n(),t,this.fontSize,this.beginAtZero,this.integersOnly);e.extend(this,i)},xLabels:t,font:e.fontString(this.options.scaleFontSize,this.options.scaleFontStyle,this.options.scaleFontFamily),lineWidth:this.options.scaleLineWidth,lineColor:this.options.scaleLineColor,gridLineWidth:this.options.scaleShowGridLines?this.options.scaleGridLineWidth:0,gridLineColor:this.options.scaleShowGridLines?this.options.scaleGridLineColor:"rgba(0,0,0,0)",padding:this.options.showScale?0:this.options.pointDotRadius+this.options.pointDotStrokeWidth,showLabels:this.options.scaleShowLabels,display:this.options.showScale};this.options.scaleOverride&&e.extend(o,{calculateYRange:e.noop,steps:this.options.scaleSteps,stepValue:this.options.scaleStepWidth,min:this.options.scaleStartValue,max:this.options.scaleStartValue+this.options.scaleSteps*this.options.scaleStepWidth}),this.scale=new i.Scale(o)},addData:function(t,i){e.each(t,function(t,e){this.datasets[e].points.push(new this.PointClass({value:t,label:i,x:this.scale.calculateX(this.scale.valuesCount+1),y:this.scale.endPoint,strokeColor:this.datasets[e].pointStrokeColor,fillColor:this.datasets[e].pointColor}))},this),this.scale.addXLabel(i),this.update()},removeData:function(){this.scale.removeXLabel(),e.each(this.datasets,function(t){t.points.shift()},this),this.update()},reflow:function(){var t=e.extend({height:this.chart.height,width:this.chart.width});this.scale.update(t)},draw:function(t){var i=t||1;this.clear();var s=this.chart.ctx,n=function(t){return null!==t.value},o=function(t,i,s){return e.findNextWhere(i,n,s)||t},a=function(t,i,s){return e.findPreviousWhere(i,n,s)||t};this.scale.draw(i),e.each(this.datasets,function(t){var h=e.where(t.points,n);e.each(t.points,function(t,e){t.hasValue()&&t.transition({y:this.scale.calculateY(t.value),x:this.scale.calculateX(e)},i)},this),this.options.bezierCurve&&e.each(h,function(t,i){var s=i>0&&i<h.length-1?this.options.bezierCurveTension:0;t.controlPoints=e.splineCurve(a(t,h,i),t,o(t,h,i),s),t.controlPoints.outer.y>this.scale.endPoint?t.controlPoints.outer.y=this.scale.endPoint:t.controlPoints.outer.y<this.scale.startPoint&&(t.controlPoints.outer.y=this.scale.startPoint),t.controlPoints.inner.y>this.scale.endPoint?t.controlPoints.inner.y=this.scale.endPoint:t.controlPoints.inner.y<this.scale.startPoint&&(t.controlPoints.inner.y=this.scale.startPoint)},this),s.lineWidth=this.options.datasetStrokeWidth,s.strokeStyle=t.strokeColor,s.beginPath(),e.each(h,function(t,i){if(0===i)s.moveTo(t.x,t.y);else if(this.options.bezierCurve){var e=a(t,h,i);s.bezierCurveTo(e.controlPoints.outer.x,e.controlPoints.outer.y,t.controlPoints.inner.x,t.controlPoints.inner.y,t.x,t.y)}else s.lineTo(t.x,t.y)},this),s.stroke(),this.options.datasetFill&&h.length>0&&(s.lineTo(h[h.length-1].x,this.scale.endPoint),s.lineTo(h[0].x,this.scale.endPoint),s.fillStyle=t.fillColor,s.closePath(),s.fill()),e.each(h,function(t){t.draw()})},this)}})}.call(this),function(){"use strict";var t=this,i=t.Chart,e=i.helpers,s={scaleShowLabelBackdrop:!0,scaleBackdropColor:"rgba(255,255,255,0.75)",scaleBeginAtZero:!0,scaleBackdropPaddingY:2,scaleBackdropPaddingX:2,scaleShowLine:!0,segmentShowStroke:!0,segmentStrokeColor:"#fff",segmentStrokeWidth:2,animationSteps:100,animationEasing:"easeOutBounce",animateRotate:!0,animateScale:!1,legendTemplate:'<ul class="<%=name.toLowerCase()%>-legend"><% for (var i=0; i<segments.length; i++){%><li><span style="background-color:<%=segments[i].fillColor%>"></span><%if(segments[i].label){%><%=segments[i].label%><%}%></li><%}%></ul>'};i.Type.extend({name:"PolarArea",defaults:s,initialize:function(t){this.segments=[],this.SegmentArc=i.Arc.extend({showStroke:this.options.segmentShowStroke,strokeWidth:this.options.segmentStrokeWidth,strokeColor:this.options.segmentStrokeColor,ctx:this.chart.ctx,innerRadius:0,x:this.chart.width/2,y:this.chart.height/2}),this.scale=new i.RadialScale({display:this.options.showScale,fontStyle:this.options.scaleFontStyle,fontSize:this.options.scaleFontSize,fontFamily:this.options.scaleFontFamily,fontColor:this.options.scaleFontColor,showLabels:this.options.scaleShowLabels,showLabelBackdrop:this.options.scaleShowLabelBackdrop,backdropColor:this.options.scaleBackdropColor,backdropPaddingY:this.options.scaleBackdropPaddingY,backdropPaddingX:this.options.scaleBackdropPaddingX,lineWidth:this.options.scaleShowLine?this.options.scaleLineWidth:0,lineColor:this.options.scaleLineColor,lineArc:!0,width:this.chart.width,height:this.chart.height,xCenter:this.chart.width/2,yCenter:this.chart.height/2,ctx:this.chart.ctx,templateString:this.options.scaleLabel,valuesCount:t.length}),this.updateScaleRange(t),this.scale.update(),e.each(t,function(t,i){this.addData(t,i,!0)},this),this.options.showTooltips&&e.bindEvents(this,this.options.tooltipEvents,function(t){var i="mouseout"!==t.type?this.getSegmentsAtEvent(t):[];e.each(this.segments,function(t){t.restore(["fillColor"])}),e.each(i,function(t){t.fillColor=t.highlightColor}),this.showTooltip(i)}),this.render()},getSegmentsAtEvent:function(t){var i=[],s=e.getRelativePosition(t);return e.each(this.segments,function(t){t.inRange(s.x,s.y)&&i.push(t)},this),i},addData:function(t,i,e){var s=i||this.segments.length;this.segments.splice(s,0,new this.SegmentArc({fillColor:t.color,highlightColor:t.highlight||t.color,label:t.label,value:t.value,outerRadius:this.options.animateScale?0:this.scale.calculateCenterOffset(t.value),circumference:this.options.animateRotate?0:this.scale.getCircumference(),startAngle:1.5*Math.PI})),e||(this.reflow(),this.update())},removeData:function(t){var i=e.isNumber(t)?t:this.segments.length-1;this.segments.splice(i,1),this.reflow(),this.update()},calculateTotal:function(t){this.total=0,e.each(t,function(t){this.total+=t.value},this),this.scale.valuesCount=this.segments.length},updateScaleRange:function(t){var i=[];e.each(t,function(t){i.push(t.value)});var s=this.options.scaleOverride?{steps:this.options.scaleSteps,stepValue:this.options.scaleStepWidth,min:this.options.scaleStartValue,max:this.options.scaleStartValue+this.options.scaleSteps*this.options.scaleStepWidth}:e.calculateScaleRange(i,e.min([this.chart.width,this.chart.height])/2,this.options.scaleFontSize,this.options.scaleBeginAtZero,this.options.scaleIntegersOnly);e.extend(this.scale,s,{size:e.min([this.chart.width,this.chart.height]),xCenter:this.chart.width/2,yCenter:this.chart.height/2})},update:function(){this.calculateTotal(this.segments),e.each(this.segments,function(t){t.save()}),this.render()},reflow:function(){e.extend(this.SegmentArc.prototype,{x:this.chart.width/2,y:this.chart.height/2}),this.updateScaleRange(this.segments),this.scale.update(),e.extend(this.scale,{xCenter:this.chart.width/2,yCenter:this.chart.height/2}),e.each(this.segments,function(t){t.update({outerRadius:this.scale.calculateCenterOffset(t.value)})},this)},draw:function(t){var i=t||1;this.clear(),e.each(this.segments,function(t,e){t.transition({circumference:this.scale.getCircumference(),outerRadius:this.scale.calculateCenterOffset(t.value)},i),t.endAngle=t.startAngle+t.circumference,0===e&&(t.startAngle=1.5*Math.PI),e<this.segments.length-1&&(this.segments[e+1].startAngle=t.endAngle),t.draw()},this),this.scale.draw()}})}.call(this),function(){"use strict";var t=this,i=t.Chart,e=i.helpers;i.Type.extend({name:"Radar",defaults:{scaleShowLine:!0,angleShowLineOut:!0,scaleShowLabels:!1,scaleBeginAtZero:!0,angleLineColor:"rgba(0,0,0,.1)",angleLineWidth:1,pointLabelFontFamily:"'Arial'",pointLabelFontStyle:"normal",pointLabelFontSize:10,pointLabelFontColor:"#666",pointDot:!0,pointDotRadius:3,pointDotStrokeWidth:1,pointHitDetectionRadius:20,datasetStroke:!0,datasetStrokeWidth:2,datasetFill:!0,legendTemplate:'<ul class="<%=name.toLowerCase()%>-legend"><% for (var i=0; i<datasets.length; i++){%><li><span style="background-color:<%=datasets[i].strokeColor%>"></span><%if(datasets[i].label){%><%=datasets[i].label%><%}%></li><%}%></ul>'},initialize:function(t){this.PointClass=i.Point.extend({strokeWidth:this.options.pointDotStrokeWidth,radius:this.options.pointDotRadius,display:this.options.pointDot,hitDetectionRadius:this.options.pointHitDetectionRadius,ctx:this.chart.ctx}),this.datasets=[],this.buildScale(t),this.options.showTooltips&&e.bindEvents(this,this.options.tooltipEvents,function(t){var i="mouseout"!==t.type?this.getPointsAtEvent(t):[];this.eachPoints(function(t){t.restore(["fillColor","strokeColor"])}),e.each(i,function(t){t.fillColor=t.highlightFill,t.strokeColor=t.highlightStroke}),this.showTooltip(i)}),e.each(t.datasets,function(i){var s={label:i.label||null,fillColor:i.fillColor,strokeColor:i.strokeColor,pointColor:i.pointColor,pointStrokeColor:i.pointStrokeColor,points:[]};this.datasets.push(s),e.each(i.data,function(e,n){var o;this.scale.animation||(o=this.scale.getPointPosition(n,this.scale.calculateCenterOffset(e))),s.points.push(new this.PointClass({value:e,label:t.labels[n],datasetLabel:i.label,x:this.options.animation?this.scale.xCenter:o.x,y:this.options.animation?this.scale.yCenter:o.y,strokeColor:i.pointStrokeColor,fillColor:i.pointColor,highlightFill:i.pointHighlightFill||i.pointColor,highlightStroke:i.pointHighlightStroke||i.pointStrokeColor}))},this)},this),this.render()},eachPoints:function(t){e.each(this.datasets,function(i){e.each(i.points,t,this)},this)},getPointsAtEvent:function(t){var i=e.getRelativePosition(t),s=e.getAngleFromPoint({x:this.scale.xCenter,y:this.scale.yCenter},i),n=2*Math.PI/this.scale.valuesCount,o=Math.round((s.angle-1.5*Math.PI)/n),a=[];return(o>=this.scale.valuesCount||0>o)&&(o=0),s.distance<=this.scale.drawingArea&&e.each(this.datasets,function(t){a.push(t.points[o])}),a},buildScale:function(t){this.scale=new i.RadialScale({display:this.options.showScale,fontStyle:this.options.scaleFontStyle,fontSize:this.options.scaleFontSize,fontFamily:this.options.scaleFontFamily,fontColor:this.options.scaleFontColor,showLabels:this.options.scaleShowLabels,showLabelBackdrop:this.options.scaleShowLabelBackdrop,backdropColor:this.options.scaleBackdropColor,backdropPaddingY:this.options.scaleBackdropPaddingY,backdropPaddingX:this.options.scaleBackdropPaddingX,lineWidth:this.options.scaleShowLine?this.options.scaleLineWidth:0,lineColor:this.options.scaleLineColor,angleLineColor:this.options.angleLineColor,angleLineWidth:this.options.angleShowLineOut?this.options.angleLineWidth:0,pointLabelFontColor:this.options.pointLabelFontColor,pointLabelFontSize:this.options.pointLabelFontSize,pointLabelFontFamily:this.options.pointLabelFontFamily,pointLabelFontStyle:this.options.pointLabelFontStyle,height:this.chart.height,width:this.chart.width,xCenter:this.chart.width/2,yCenter:this.chart.height/2,ctx:this.chart.ctx,templateString:this.options.scaleLabel,labels:t.labels,valuesCount:t.datasets[0].data.length}),this.scale.setScaleSize(),this.updateScaleRange(t.datasets),this.scale.buildYLabels()},updateScaleRange:function(t){var i=function(){var i=[];return e.each(t,function(t){t.data?i=i.concat(t.data):e.each(t.points,function(t){i.push(t.value)})}),i}(),s=this.options.scaleOverride?{steps:this.options.scaleSteps,stepValue:this.options.scaleStepWidth,min:this.options.scaleStartValue,max:this.options.scaleStartValue+this.options.scaleSteps*this.options.scaleStepWidth}:e.calculateScaleRange(i,e.min([this.chart.width,this.chart.height])/2,this.options.scaleFontSize,this.options.scaleBeginAtZero,this.options.scaleIntegersOnly);e.extend(this.scale,s)},addData:function(t,i){this.scale.valuesCount++,e.each(t,function(t,e){var s=this.scale.getPointPosition(this.scale.valuesCount,this.scale.calculateCenterOffset(t));this.datasets[e].points.push(new this.PointClass({value:t,label:i,x:s.x,y:s.y,strokeColor:this.datasets[e].pointStrokeColor,fillColor:this.datasets[e].pointColor}))},this),this.scale.labels.push(i),this.reflow(),this.update()},removeData:function(){this.scale.valuesCount--,this.scale.labels.shift(),e.each(this.datasets,function(t){t.points.shift()},this),this.reflow(),this.update()},update:function(){this.eachPoints(function(t){t.save()}),this.reflow(),this.render()},reflow:function(){e.extend(this.scale,{width:this.chart.width,height:this.chart.height,size:e.min([this.chart.width,this.chart.height]),xCenter:this.chart.width/2,yCenter:this.chart.height/2}),this.updateScaleRange(this.datasets),this.scale.setScaleSize(),this.scale.buildYLabels()},draw:function(t){var i=t||1,s=this.chart.ctx;this.clear(),this.scale.draw(),e.each(this.datasets,function(t){e.each(t.points,function(t,e){t.hasValue()&&t.transition(this.scale.getPointPosition(e,this.scale.calculateCenterOffset(t.value)),i)},this),s.lineWidth=this.options.datasetStrokeWidth,s.strokeStyle=t.strokeColor,s.beginPath(),e.each(t.points,function(t,i){0===i?s.moveTo(t.x,t.y):s.lineTo(t.x,t.y)},this),s.closePath(),s.stroke(),s.fillStyle=t.fillColor,s.fill(),e.each(t.points,function(t){t.hasValue()&&t.draw()})},this)}})}.call(this);
diff --git a/management/guns-admin/src/main/webapp/static/js/plugins/chartJs/echarts.min.js b/management/guns-admin/src/main/webapp/static/js/plugins/chartJs/echarts.min.js
new file mode 100644
index 0000000..f902db9
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/static/js/plugins/chartJs/echarts.min.js
@@ -0,0 +1 @@
+!function(t,e){"object"==typeof exports&&"undefined"!=typeof module?e(exports):"function"==typeof define&&define.amd?define(["exports"],e):e(t.echarts={})}(this,function(t){"use strict";function e(t,e){"createCanvas"===t&&(Ox=null),kx[t]=e}function i(t){if(null==t||"object"!=typeof t)return t;var e=t,n=Mx.call(t);if("[object Array]"===n){if(!N(t)){e=[];for(var o=0,a=t.length;o<a;o++)e[o]=i(t[o])}}else if(Sx[n]){if(!N(t)){var r=t.constructor;if(t.constructor.from)e=r.from(t);else{e=new r(t.length);for(var o=0,a=t.length;o<a;o++)e[o]=i(t[o])}}}else if(!bx[n]&&!N(t)&&!M(t)){e={};for(var s in t)t.hasOwnProperty(s)&&(e[s]=i(t[s]))}return e}function n(t,e,o){if(!w(e)||!w(t))return o?i(e):t;for(var a in e)if(e.hasOwnProperty(a)){var r=t[a],s=e[a];!w(s)||!w(r)||y(s)||y(r)||M(s)||M(r)||b(s)||b(r)||N(s)||N(r)?!o&&a in t||(t[a]=i(e[a],!0)):n(r,s,o)}return t}function o(t,e){for(var i=t[0],o=1,a=t.length;o<a;o++)i=n(i,t[o],e);return i}function a(t,e){for(var i in e)e.hasOwnProperty(i)&&(t[i]=e[i]);return t}function r(t,e,i){for(var n in e)e.hasOwnProperty(n)&&(i?null!=e[n]:null==t[n])&&(t[n]=e[n]);return t}function s(){return Ox||(Ox=Px().getContext("2d")),Ox}function l(t,e){if(t){if(t.indexOf)return t.indexOf(e);for(var i=0,n=t.length;i<n;i++)if(t[i]===e)return i}return-1}function h(t,e){function i(){}var n=t.prototype;i.prototype=e.prototype,t.prototype=new i;for(var o in n)t.prototype[o]=n[o];t.prototype.constructor=t,t.superClass=e}function u(t,e,i){r(t="prototype"in t?t.prototype:t,e="prototype"in e?e.prototype:e,i)}function c(t){if(t)return"string"!=typeof t&&"number"==typeof t.length}function d(t,e,i){if(t&&e)if(t.forEach&&t.forEach===Tx)t.forEach(e,i);else if(t.length===+t.length)for(var n=0,o=t.length;n<o;n++)e.call(i,t[n],n,t);else for(var a in t)t.hasOwnProperty(a)&&e.call(i,t[a],a,t)}function f(t,e,i){if(t&&e){if(t.map&&t.map===Cx)return t.map(e,i);for(var n=[],o=0,a=t.length;o<a;o++)n.push(e.call(i,t[o],o,t));return n}}function p(t,e,i,n){if(t&&e){if(t.reduce&&t.reduce===Lx)return t.reduce(e,i,n);for(var o=0,a=t.length;o<a;o++)i=e.call(n,i,t[o],o,t);return i}}function g(t,e,i){if(t&&e){if(t.filter&&t.filter===Ax)return t.filter(e,i);for(var n=[],o=0,a=t.length;o<a;o++)e.call(i,t[o],o,t)&&n.push(t[o]);return n}}function m(t,e){var i=Dx.call(arguments,2);return function(){return t.apply(e,i.concat(Dx.call(arguments)))}}function v(t){var e=Dx.call(arguments,1);return function(){return t.apply(this,e.concat(Dx.call(arguments)))}}function y(t){return"[object Array]"===Mx.call(t)}function x(t){return"function"==typeof t}function _(t){return"[object String]"===Mx.call(t)}function w(t){var e=typeof t;return"function"===e||!!t&&"object"==e}function b(t){return!!bx[Mx.call(t)]}function S(t){return!!Sx[Mx.call(t)]}function M(t){return"object"==typeof t&&"number"==typeof t.nodeType&&"object"==typeof t.ownerDocument}function I(t){return t!==t}function T(t){for(var e=0,i=arguments.length;e<i;e++)if(null!=arguments[e])return arguments[e]}function A(t,e){return null!=t?t:e}function D(t,e,i){return null!=t?t:null!=e?e:i}function C(){return Function.call.apply(Dx,arguments)}function L(t){if("number"==typeof t)return[t,t,t,t];var e=t.length;return 2===e?[t[0],t[1],t[0],t[1]]:3===e?[t[0],t[1],t[2],t[1]]:t}function k(t,e){if(!t)throw new Error(e)}function P(t){return null==t?null:"function"==typeof t.trim?t.trim():t.replace(/^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g,"")}function O(t){t[Nx]=!0}function N(t){return t[Nx]}function E(t){function e(t,e){i?n.set(t,e):n.set(e,t)}var i=y(t),n=this;t instanceof E?t.each(e):t&&d(t,e)}function z(t){return new E(t)}function R(t,e){for(var i=new t.constructor(t.length+e.length),n=0;n<t.length;n++)i[n]=t[n];var o=t.length;for(n=0;n<e.length;n++)i[n+o]=e[n];return i}function B(){}function V(t,e){var i=new zx(2);return null==t&&(t=0),null==e&&(e=0),i[0]=t,i[1]=e,i}function G(t,e){return t[0]=e[0],t[1]=e[1],t}function W(t){var e=new zx(2);return e[0]=t[0],e[1]=t[1],e}function F(t,e,i){return t[0]=e,t[1]=i,t}function H(t,e,i){return t[0]=e[0]+i[0],t[1]=e[1]+i[1],t}function Z(t,e,i,n){return t[0]=e[0]+i[0]*n,t[1]=e[1]+i[1]*n,t}function U(t,e,i){return t[0]=e[0]-i[0],t[1]=e[1]-i[1],t}function j(t){return Math.sqrt(X(t))}function X(t){return t[0]*t[0]+t[1]*t[1]}function Y(t,e,i){return t[0]=e[0]*i,t[1]=e[1]*i,t}function q(t,e){var i=j(e);return 0===i?(t[0]=0,t[1]=0):(t[0]=e[0]/i,t[1]=e[1]/i),t}function $(t,e){return Math.sqrt((t[0]-e[0])*(t[0]-e[0])+(t[1]-e[1])*(t[1]-e[1]))}function K(t,e){return(t[0]-e[0])*(t[0]-e[0])+(t[1]-e[1])*(t[1]-e[1])}function J(t,e,i,n){return t[0]=e[0]+n*(i[0]-e[0]),t[1]=e[1]+n*(i[1]-e[1]),t}function Q(t,e,i){var n=e[0],o=e[1];return t[0]=i[0]*n+i[2]*o+i[4],t[1]=i[1]*n+i[3]*o+i[5],t}function tt(t,e,i){return t[0]=Math.min(e[0],i[0]),t[1]=Math.min(e[1],i[1]),t}function et(t,e,i){return t[0]=Math.max(e[0],i[0]),t[1]=Math.max(e[1],i[1]),t}function it(){this.on("mousedown",this._dragStart,this),this.on("mousemove",this._drag,this),this.on("mouseup",this._dragEnd,this),this.on("globalout",this._dragEnd,this)}function nt(t,e){return{target:t,topTarget:e&&e.topTarget}}function ot(t,e,i){return{type:t,event:i,target:e.target,topTarget:e.topTarget,cancelBubble:!1,offsetX:i.zrX,offsetY:i.zrY,gestureEvent:i.gestureEvent,pinchX:i.pinchX,pinchY:i.pinchY,pinchScale:i.pinchScale,wheelDelta:i.zrDelta,zrByTouch:i.zrByTouch,which:i.which}}function at(){}function rt(t,e,i){if(t[t.rectHover?"rectContain":"contain"](e,i)){for(var n,o=t;o;){if(o.clipPath&&!o.clipPath.contain(e,i))return!1;o.silent&&(n=!0),o=o.parent}return!n||Zx}return!1}function st(){var t=new Xx(6);return lt(t),t}function lt(t){return t[0]=1,t[1]=0,t[2]=0,t[3]=1,t[4]=0,t[5]=0,t}function ht(t,e){return t[0]=e[0],t[1]=e[1],t[2]=e[2],t[3]=e[3],t[4]=e[4],t[5]=e[5],t}function ut(t,e,i){var n=e[0]*i[0]+e[2]*i[1],o=e[1]*i[0]+e[3]*i[1],a=e[0]*i[2]+e[2]*i[3],r=e[1]*i[2]+e[3]*i[3],s=e[0]*i[4]+e[2]*i[5]+e[4],l=e[1]*i[4]+e[3]*i[5]+e[5];return t[0]=n,t[1]=o,t[2]=a,t[3]=r,t[4]=s,t[5]=l,t}function ct(t,e,i){return t[0]=e[0],t[1]=e[1],t[2]=e[2],t[3]=e[3],t[4]=e[4]+i[0],t[5]=e[5]+i[1],t}function dt(t,e,i){var n=e[0],o=e[2],a=e[4],r=e[1],s=e[3],l=e[5],h=Math.sin(i),u=Math.cos(i);return t[0]=n*u+r*h,t[1]=-n*h+r*u,t[2]=o*u+s*h,t[3]=-o*h+u*s,t[4]=u*a+h*l,t[5]=u*l-h*a,t}function ft(t,e,i){var n=i[0],o=i[1];return t[0]=e[0]*n,t[1]=e[1]*o,t[2]=e[2]*n,t[3]=e[3]*o,t[4]=e[4]*n,t[5]=e[5]*o,t}function pt(t,e){var i=e[0],n=e[2],o=e[4],a=e[1],r=e[3],s=e[5],l=i*r-a*n;return l?(l=1/l,t[0]=r*l,t[1]=-a*l,t[2]=-n*l,t[3]=i*l,t[4]=(n*s-r*o)*l,t[5]=(a*o-i*s)*l,t):null}function gt(t){var e=st();return ht(e,t),e}function mt(t){return t>$x||t<-$x}function vt(t){this._target=t.target,this._life=t.life||1e3,this._delay=t.delay||0,this._initialized=!1,this.loop=null!=t.loop&&t.loop,this.gap=t.gap||0,this.easing=t.easing||"Linear",this.onframe=t.onframe,this.ondestroy=t.ondestroy,this.onrestart=t.onrestart,this._pausedTime=0,this._paused=!1}function yt(t){return(t=Math.round(t))<0?0:t>255?255:t}function xt(t){return(t=Math.round(t))<0?0:t>360?360:t}function _t(t){return t<0?0:t>1?1:t}function wt(t){return yt(t.length&&"%"===t.charAt(t.length-1)?parseFloat(t)/100*255:parseInt(t,10))}function bt(t){return _t(t.length&&"%"===t.charAt(t.length-1)?parseFloat(t)/100:parseFloat(t))}function St(t,e,i){return i<0?i+=1:i>1&&(i-=1),6*i<1?t+(e-t)*i*6:2*i<1?e:3*i<2?t+(e-t)*(2/3-i)*6:t}function Mt(t,e,i){return t+(e-t)*i}function It(t,e,i,n,o){return t[0]=e,t[1]=i,t[2]=n,t[3]=o,t}function Tt(t,e){return t[0]=e[0],t[1]=e[1],t[2]=e[2],t[3]=e[3],t}function At(t,e){l_&&Tt(l_,e),l_=s_.put(t,l_||e.slice())}function Dt(t,e){if(t){e=e||[];var i=s_.get(t);if(i)return Tt(e,i);var n=(t+="").replace(/ /g,"").toLowerCase();if(n in r_)return Tt(e,r_[n]),At(t,e),e;if("#"!==n.charAt(0)){var o=n.indexOf("("),a=n.indexOf(")");if(-1!==o&&a+1===n.length){var r=n.substr(0,o),s=n.substr(o+1,a-(o+1)).split(","),l=1;switch(r){case"rgba":if(4!==s.length)return void It(e,0,0,0,1);l=bt(s.pop());case"rgb":return 3!==s.length?void It(e,0,0,0,1):(It(e,wt(s[0]),wt(s[1]),wt(s[2]),l),At(t,e),e);case"hsla":return 4!==s.length?void It(e,0,0,0,1):(s[3]=bt(s[3]),Ct(s,e),At(t,e),e);case"hsl":return 3!==s.length?void It(e,0,0,0,1):(Ct(s,e),At(t,e),e);default:return}}It(e,0,0,0,1)}else{if(4===n.length)return(h=parseInt(n.substr(1),16))>=0&&h<=4095?(It(e,(3840&h)>>4|(3840&h)>>8,240&h|(240&h)>>4,15&h|(15&h)<<4,1),At(t,e),e):void It(e,0,0,0,1);if(7===n.length){var h=parseInt(n.substr(1),16);return h>=0&&h<=16777215?(It(e,(16711680&h)>>16,(65280&h)>>8,255&h,1),At(t,e),e):void It(e,0,0,0,1)}}}}function Ct(t,e){var i=(parseFloat(t[0])%360+360)%360/360,n=bt(t[1]),o=bt(t[2]),a=o<=.5?o*(n+1):o+n-o*n,r=2*o-a;return e=e||[],It(e,yt(255*St(r,a,i+1/3)),yt(255*St(r,a,i)),yt(255*St(r,a,i-1/3)),1),4===t.length&&(e[3]=t[3]),e}function Lt(t){if(t){var e,i,n=t[0]/255,o=t[1]/255,a=t[2]/255,r=Math.min(n,o,a),s=Math.max(n,o,a),l=s-r,h=(s+r)/2;if(0===l)e=0,i=0;else{i=h<.5?l/(s+r):l/(2-s-r);var u=((s-n)/6+l/2)/l,c=((s-o)/6+l/2)/l,d=((s-a)/6+l/2)/l;n===s?e=d-c:o===s?e=1/3+u-d:a===s&&(e=2/3+c-u),e<0&&(e+=1),e>1&&(e-=1)}var f=[360*e,i,h];return null!=t[3]&&f.push(t[3]),f}}function kt(t,e){var i=Dt(t);if(i){for(var n=0;n<3;n++)i[n]=e<0?i[n]*(1-e)|0:(255-i[n])*e+i[n]|0;return Rt(i,4===i.length?"rgba":"rgb")}}function Pt(t){var e=Dt(t);if(e)return((1<<24)+(e[0]<<16)+(e[1]<<8)+ +e[2]).toString(16).slice(1)}function Ot(t,e,i){if(e&&e.length&&t>=0&&t<=1){i=i||[];var n=t*(e.length-1),o=Math.floor(n),a=Math.ceil(n),r=e[o],s=e[a],l=n-o;return i[0]=yt(Mt(r[0],s[0],l)),i[1]=yt(Mt(r[1],s[1],l)),i[2]=yt(Mt(r[2],s[2],l)),i[3]=_t(Mt(r[3],s[3],l)),i}}function Nt(t,e,i){if(e&&e.length&&t>=0&&t<=1){var n=t*(e.length-1),o=Math.floor(n),a=Math.ceil(n),r=Dt(e[o]),s=Dt(e[a]),l=n-o,h=Rt([yt(Mt(r[0],s[0],l)),yt(Mt(r[1],s[1],l)),yt(Mt(r[2],s[2],l)),_t(Mt(r[3],s[3],l))],"rgba");return i?{color:h,leftIndex:o,rightIndex:a,value:n}:h}}function Et(t,e,i,n){if(t=Dt(t))return t=Lt(t),null!=e&&(t[0]=xt(e)),null!=i&&(t[1]=bt(i)),null!=n&&(t[2]=bt(n)),Rt(Ct(t),"rgba")}function zt(t,e){if((t=Dt(t))&&null!=e)return t[3]=_t(e),Rt(t,"rgba")}function Rt(t,e){if(t&&t.length){var i=t[0]+","+t[1]+","+t[2];return"rgba"!==e&&"hsva"!==e&&"hsla"!==e||(i+=","+t[3]),e+"("+i+")"}}function Bt(t,e){return t[e]}function Vt(t,e,i){t[e]=i}function Gt(t,e,i){return(e-t)*i+t}function Wt(t,e,i){return i>.5?e:t}function Ft(t,e,i,n,o){var a=t.length;if(1==o)for(s=0;s<a;s++)n[s]=Gt(t[s],e[s],i);else for(var r=a&&t[0].length,s=0;s<a;s++)for(var l=0;l<r;l++)n[s][l]=Gt(t[s][l],e[s][l],i)}function Ht(t,e,i){var n=t.length,o=e.length;if(n!==o)if(n>o)t.length=o;else for(r=n;r<o;r++)t.push(1===i?e[r]:d_.call(e[r]));for(var a=t[0]&&t[0].length,r=0;r<t.length;r++)if(1===i)isNaN(t[r])&&(t[r]=e[r]);else for(var s=0;s<a;s++)isNaN(t[r][s])&&(t[r][s]=e[r][s])}function Zt(t,e,i){if(t===e)return!0;var n=t.length;if(n!==e.length)return!1;if(1===i){for(a=0;a<n;a++)if(t[a]!==e[a])return!1}else for(var o=t[0].length,a=0;a<n;a++)for(var r=0;r<o;r++)if(t[a][r]!==e[a][r])return!1;return!0}function Ut(t,e,i,n,o,a,r,s,l){var h=t.length;if(1==l)for(c=0;c<h;c++)s[c]=jt(t[c],e[c],i[c],n[c],o,a,r);else for(var u=t[0].length,c=0;c<h;c++)for(var d=0;d<u;d++)s[c][d]=jt(t[c][d],e[c][d],i[c][d],n[c][d],o,a,r)}function jt(t,e,i,n,o,a,r){var s=.5*(i-t),l=.5*(n-e);return(2*(e-i)+s+l)*r+(-3*(e-i)-2*s-l)*a+s*o+e}function Xt(t){if(c(t)){var e=t.length;if(c(t[0])){for(var i=[],n=0;n<e;n++)i.push(d_.call(t[n]));return i}return d_.call(t)}return t}function Yt(t){return t[0]=Math.floor(t[0]),t[1]=Math.floor(t[1]),t[2]=Math.floor(t[2]),"rgba("+t.join(",")+")"}function qt(t){var e=t[t.length-1].value;return c(e&&e[0])?2:1}function $t(t,e,i,n,o,a){var r=t._getter,s=t._setter,l="spline"===e,h=n.length;if(h){var u,d=c(n[0].value),f=!1,p=!1,g=d?qt(n):0;n.sort(function(t,e){return t.time-e.time}),u=n[h-1].time;for(var m=[],v=[],y=n[0].value,x=!0,_=0;_<h;_++){m.push(n[_].time/u);var w=n[_].value;if(d&&Zt(w,y,g)||!d&&w===y||(x=!1),y=w,"string"==typeof w){var b=Dt(w);b?(w=b,f=!0):p=!0}v.push(w)}if(a||!x){for(var S=v[h-1],_=0;_<h-1;_++)d?Ht(v[_],S,g):!isNaN(v[_])||isNaN(S)||p||f||(v[_]=S);d&&Ht(r(t._target,o),S,g);var M,I,T,A,D,C,L=0,k=0;if(f)var P=[0,0,0,0];var O=new vt({target:t._target,life:u,loop:t._loop,delay:t._delay,onframe:function(t,e){var i;if(e<0)i=0;else if(e<k){for(i=M=Math.min(L+1,h-1);i>=0&&!(m[i]<=e);i--);i=Math.min(i,h-2)}else{for(i=L;i<h&&!(m[i]>e);i++);i=Math.min(i-1,h-2)}L=i,k=e;var n=m[i+1]-m[i];if(0!==n)if(I=(e-m[i])/n,l)if(A=v[i],T=v[0===i?i:i-1],D=v[i>h-2?h-1:i+1],C=v[i>h-3?h-1:i+2],d)Ut(T,A,D,C,I,I*I,I*I*I,r(t,o),g);else{if(f)a=Ut(T,A,D,C,I,I*I,I*I*I,P,1),a=Yt(P);else{if(p)return Wt(A,D,I);a=jt(T,A,D,C,I,I*I,I*I*I)}s(t,o,a)}else if(d)Ft(v[i],v[i+1],I,r(t,o),g);else{var a;if(f)Ft(v[i],v[i+1],I,P,1),a=Yt(P);else{if(p)return Wt(v[i],v[i+1],I);a=Gt(v[i],v[i+1],I)}s(t,o,a)}},ondestroy:i});return e&&"spline"!==e&&(O.easing=e),O}}}function Kt(t,e,i,n){i<0&&(t+=i,i=-i),n<0&&(e+=n,n=-n),this.x=t,this.y=e,this.width=i,this.height=n}function Jt(t){for(var e=0;t>=M_;)e|=1&t,t>>=1;return t+e}function Qt(t,e,i,n){var o=e+1;if(o===i)return 1;if(n(t[o++],t[e])<0){for(;o<i&&n(t[o],t[o-1])<0;)o++;te(t,e,o)}else for(;o<i&&n(t[o],t[o-1])>=0;)o++;return o-e}function te(t,e,i){for(i--;e<i;){var n=t[e];t[e++]=t[i],t[i--]=n}}function ee(t,e,i,n,o){for(n===e&&n++;n<i;n++){for(var a,r=t[n],s=e,l=n;s<l;)o(r,t[a=s+l>>>1])<0?l=a:s=a+1;var h=n-s;switch(h){case 3:t[s+3]=t[s+2];case 2:t[s+2]=t[s+1];case 1:t[s+1]=t[s];break;default:for(;h>0;)t[s+h]=t[s+h-1],h--}t[s]=r}}function ie(t,e,i,n,o,a){var r=0,s=0,l=1;if(a(t,e[i+o])>0){for(s=n-o;l<s&&a(t,e[i+o+l])>0;)r=l,(l=1+(l<<1))<=0&&(l=s);l>s&&(l=s),r+=o,l+=o}else{for(s=o+1;l<s&&a(t,e[i+o-l])<=0;)r=l,(l=1+(l<<1))<=0&&(l=s);l>s&&(l=s);var h=r;r=o-l,l=o-h}for(r++;r<l;){var u=r+(l-r>>>1);a(t,e[i+u])>0?r=u+1:l=u}return l}function ne(t,e,i,n,o,a){var r=0,s=0,l=1;if(a(t,e[i+o])<0){for(s=o+1;l<s&&a(t,e[i+o-l])<0;)r=l,(l=1+(l<<1))<=0&&(l=s);l>s&&(l=s);var h=r;r=o-l,l=o-h}else{for(s=n-o;l<s&&a(t,e[i+o+l])>=0;)r=l,(l=1+(l<<1))<=0&&(l=s);l>s&&(l=s),r+=o,l+=o}for(r++;r<l;){var u=r+(l-r>>>1);a(t,e[i+u])<0?l=u:r=u+1}return l}function oe(t,e){function i(i){var s=a[i],h=r[i],u=a[i+1],c=r[i+1];r[i]=h+c,i===l-3&&(a[i+1]=a[i+2],r[i+1]=r[i+2]),l--;var d=ne(t[u],t,s,h,0,e);s+=d,0!==(h-=d)&&0!==(c=ie(t[s+h-1],t,u,c,c-1,e))&&(h<=c?n(s,h,u,c):o(s,h,u,c))}function n(i,n,o,a){var r=0;for(r=0;r<n;r++)h[r]=t[i+r];var l=0,u=o,c=i;if(t[c++]=t[u++],0!=--a)if(1!==n){for(var d,f,p,g=s;;){d=0,f=0,p=!1;do{if(e(t[u],h[l])<0){if(t[c++]=t[u++],f++,d=0,0==--a){p=!0;break}}else if(t[c++]=h[l++],d++,f=0,1==--n){p=!0;break}}while((d|f)<g);if(p)break;do{if(0!==(d=ne(t[u],h,l,n,0,e))){for(r=0;r<d;r++)t[c+r]=h[l+r];if(c+=d,l+=d,(n-=d)<=1){p=!0;break}}if(t[c++]=t[u++],0==--a){p=!0;break}if(0!==(f=ie(h[l],t,u,a,0,e))){for(r=0;r<f;r++)t[c+r]=t[u+r];if(c+=f,u+=f,0===(a-=f)){p=!0;break}}if(t[c++]=h[l++],1==--n){p=!0;break}g--}while(d>=I_||f>=I_);if(p)break;g<0&&(g=0),g+=2}if((s=g)<1&&(s=1),1===n){for(r=0;r<a;r++)t[c+r]=t[u+r];t[c+a]=h[l]}else{if(0===n)throw new Error;for(r=0;r<n;r++)t[c+r]=h[l+r]}}else{for(r=0;r<a;r++)t[c+r]=t[u+r];t[c+a]=h[l]}else for(r=0;r<n;r++)t[c+r]=h[l+r]}function o(i,n,o,a){var r=0;for(r=0;r<a;r++)h[r]=t[o+r];var l=i+n-1,u=a-1,c=o+a-1,d=0,f=0;if(t[c--]=t[l--],0!=--n)if(1!==a){for(var p=s;;){var g=0,m=0,v=!1;do{if(e(h[u],t[l])<0){if(t[c--]=t[l--],g++,m=0,0==--n){v=!0;break}}else if(t[c--]=h[u--],m++,g=0,1==--a){v=!0;break}}while((g|m)<p);if(v)break;do{if(0!=(g=n-ne(h[u],t,i,n,n-1,e))){for(n-=g,f=(c-=g)+1,d=(l-=g)+1,r=g-1;r>=0;r--)t[f+r]=t[d+r];if(0===n){v=!0;break}}if(t[c--]=h[u--],1==--a){v=!0;break}if(0!=(m=a-ie(t[l],h,0,a,a-1,e))){for(a-=m,f=(c-=m)+1,d=(u-=m)+1,r=0;r<m;r++)t[f+r]=h[d+r];if(a<=1){v=!0;break}}if(t[c--]=t[l--],0==--n){v=!0;break}p--}while(g>=I_||m>=I_);if(v)break;p<0&&(p=0),p+=2}if((s=p)<1&&(s=1),1===a){for(f=(c-=n)+1,d=(l-=n)+1,r=n-1;r>=0;r--)t[f+r]=t[d+r];t[c]=h[u]}else{if(0===a)throw new Error;for(d=c-(a-1),r=0;r<a;r++)t[d+r]=h[r]}}else{for(f=(c-=n)+1,d=(l-=n)+1,r=n-1;r>=0;r--)t[f+r]=t[d+r];t[c]=h[u]}else for(d=c-(a-1),r=0;r<a;r++)t[d+r]=h[r]}var a,r,s=I_,l=0,h=[];a=[],r=[],this.mergeRuns=function(){for(;l>1;){var t=l-2;if(t>=1&&r[t-1]<=r[t]+r[t+1]||t>=2&&r[t-2]<=r[t]+r[t-1])r[t-1]<r[t+1]&&t--;else if(r[t]>r[t+1])break;i(t)}},this.forceMergeRuns=function(){for(;l>1;){var t=l-2;t>0&&r[t-1]<r[t+1]&&t--,i(t)}},this.pushRun=function(t,e){a[l]=t,r[l]=e,l+=1}}function ae(t,e,i,n){i||(i=0),n||(n=t.length);var o=n-i;if(!(o<2)){var a=0;if(o<M_)return a=Qt(t,i,n,e),void ee(t,i,n,i+a,e);var r=new oe(t,e),s=Jt(o);do{if((a=Qt(t,i,n,e))<s){var l=o;l>s&&(l=s),ee(t,i,i+l,i+a,e),a=l}r.pushRun(i,a),r.mergeRuns(),o-=a,i+=a}while(0!==o);r.forceMergeRuns()}}function re(t,e){return t.zlevel===e.zlevel?t.z===e.z?t.z2-e.z2:t.z-e.z:t.zlevel-e.zlevel}function se(t,e,i){var n=null==e.x?0:e.x,o=null==e.x2?1:e.x2,a=null==e.y?0:e.y,r=null==e.y2?0:e.y2;return e.global||(n=n*i.width+i.x,o=o*i.width+i.x,a=a*i.height+i.y,r=r*i.height+i.y),t.createLinearGradient(n,a,o,r)}function le(t,e,i){var n=i.width,o=i.height,a=Math.min(n,o),r=null==e.x?.5:e.x,s=null==e.y?.5:e.y,l=null==e.r?.5:e.r;return e.global||(r=r*n+i.x,s=s*o+i.y,l*=a),t.createRadialGradient(r,s,0,r,s,l)}function he(){return!1}function ue(t,e,i){var n=Px(),o=e.getWidth(),a=e.getHeight(),r=n.style;return r&&(r.position="absolute",r.left=0,r.top=0,r.width=o+"px",r.height=a+"px",n.setAttribute("data-zr-dom-id",t)),n.width=o*i,n.height=a*i,n}function ce(t){if("string"==typeof t){var e=R_.get(t);return e&&e.image}return t}function de(t,e,i,n,o){if(t){if("string"==typeof t){if(e&&e.__zrImageSrc===t||!i)return e;var a=R_.get(t),r={hostEl:i,cb:n,cbPayload:o};return a?!pe(e=a.image)&&a.pending.push(r):(!e&&(e=new Image),e.onload=fe,R_.put(t,e.__cachedImgObj={image:e,pending:[r]}),e.src=e.__zrImageSrc=t),e}return t}return e}function fe(){var t=this.__cachedImgObj;this.onload=this.__cachedImgObj=null;for(var e=0;e<t.pending.length;e++){var i=t.pending[e],n=i.cb;n&&n(this,i.cbPayload),i.hostEl.dirty()}t.pending.length=0}function pe(t){return t&&t.width&&t.height}function ge(t,e){var i=t+":"+(e=e||F_);if(B_[i])return B_[i];for(var n=(t+"").split("\n"),o=0,a=0,r=n.length;a<r;a++)o=Math.max(Ae(n[a],e).width,o);return V_>G_&&(V_=0,B_={}),V_++,B_[i]=o,o}function me(t,e,i,n,o,a,r){return a?ye(t,e,i,n,o,a,r):ve(t,e,i,n,o,r)}function ve(t,e,i,n,o,a){var r=De(t,e,o,a),s=ge(t,e);o&&(s+=o[1]+o[3]);var l=r.outerHeight,h=new Kt(xe(0,s,i),_e(0,l,n),s,l);return h.lineHeight=r.lineHeight,h}function ye(t,e,i,n,o,a,r){var s=Ce(t,{rich:a,truncate:r,font:e,textAlign:i,textPadding:o}),l=s.outerWidth,h=s.outerHeight;return new Kt(xe(0,l,i),_e(0,h,n),l,h)}function xe(t,e,i){return"right"===i?t-=e:"center"===i&&(t-=e/2),t}function _e(t,e,i){return"middle"===i?t-=e/2:"bottom"===i&&(t-=e),t}function we(t,e,i){var n=e.x,o=e.y,a=e.height,r=e.width,s=a/2,l="left",h="top";switch(t){case"left":n-=i,o+=s,l="right",h="middle";break;case"right":n+=i+r,o+=s,h="middle";break;case"top":n+=r/2,o-=i,l="center",h="bottom";break;case"bottom":n+=r/2,o+=a+i,l="center";break;case"inside":n+=r/2,o+=s,l="center",h="middle";break;case"insideLeft":n+=i,o+=s,h="middle";break;case"insideRight":n+=r-i,o+=s,l="right",h="middle";break;case"insideTop":n+=r/2,o+=i,l="center";break;case"insideBottom":n+=r/2,o+=a-i,l="center",h="bottom";break;case"insideTopLeft":n+=i,o+=i;break;case"insideTopRight":n+=r-i,o+=i,l="right";break;case"insideBottomLeft":n+=i,o+=a-i,h="bottom";break;case"insideBottomRight":n+=r-i,o+=a-i,l="right",h="bottom"}return{x:n,y:o,textAlign:l,textVerticalAlign:h}}function be(t,e,i,n,o){if(!e)return"";var a=(t+"").split("\n");o=Se(e,i,n,o);for(var r=0,s=a.length;r<s;r++)a[r]=Me(a[r],o);return a.join("\n")}function Se(t,e,i,n){(n=a({},n)).font=e;var i=A(i,"...");n.maxIterations=A(n.maxIterations,2);var o=n.minChar=A(n.minChar,0);n.cnCharWidth=ge("国",e);var r=n.ascCharWidth=ge("a",e);n.placeholder=A(n.placeholder,"");for(var s=t=Math.max(0,t-1),l=0;l<o&&s>=r;l++)s-=r;var h=ge(i);return h>s&&(i="",h=0),s=t-h,n.ellipsis=i,n.ellipsisWidth=h,n.contentWidth=s,n.containerWidth=t,n}function Me(t,e){var i=e.containerWidth,n=e.font,o=e.contentWidth;if(!i)return"";var a=ge(t,n);if(a<=i)return t;for(var r=0;;r++){if(a<=o||r>=e.maxIterations){t+=e.ellipsis;break}var s=0===r?Ie(t,o,e.ascCharWidth,e.cnCharWidth):a>0?Math.floor(t.length*o/a):0;a=ge(t=t.substr(0,s),n)}return""===t&&(t=e.placeholder),t}function Ie(t,e,i,n){for(var o=0,a=0,r=t.length;a<r&&o<e;a++){var s=t.charCodeAt(a);o+=0<=s&&s<=127?i:n}return a}function Te(t){return ge("国",t)}function Ae(t,e){return H_.measureText(t,e)}function De(t,e,i,n){null!=t&&(t+="");var o=Te(e),a=t?t.split("\n"):[],r=a.length*o,s=r;if(i&&(s+=i[0]+i[2]),t&&n){var l=n.outerHeight,h=n.outerWidth;if(null!=l&&s>l)t="",a=[];else if(null!=h)for(var u=Se(h-(i?i[1]+i[3]:0),e,n.ellipsis,{minChar:n.minChar,placeholder:n.placeholder}),c=0,d=a.length;c<d;c++)a[c]=Me(a[c],u)}return{lines:a,height:r,outerHeight:s,lineHeight:o}}function Ce(t,e){var i={lines:[],width:0,height:0};if(null!=t&&(t+=""),!t)return i;for(var n,o=W_.lastIndex=0;null!=(n=W_.exec(t));){var a=n.index;a>o&&Le(i,t.substring(o,a)),Le(i,n[2],n[1]),o=W_.lastIndex}o<t.length&&Le(i,t.substring(o,t.length));var r=i.lines,s=0,l=0,h=[],u=e.textPadding,c=e.truncate,d=c&&c.outerWidth,f=c&&c.outerHeight;u&&(null!=d&&(d-=u[1]+u[3]),null!=f&&(f-=u[0]+u[2]));for(L=0;L<r.length;L++){for(var p=r[L],g=0,m=0,v=0;v<p.tokens.length;v++){var y=(k=p.tokens[v]).styleName&&e.rich[k.styleName]||{},x=k.textPadding=y.textPadding,_=k.font=y.font||e.font,w=k.textHeight=A(y.textHeight,Te(_));if(x&&(w+=x[0]+x[2]),k.height=w,k.lineHeight=D(y.textLineHeight,e.textLineHeight,w),k.textAlign=y&&y.textAlign||e.textAlign,k.textVerticalAlign=y&&y.textVerticalAlign||"middle",null!=f&&s+k.lineHeight>f)return{lines:[],width:0,height:0};k.textWidth=ge(k.text,_);var b=y.textWidth,S=null==b||"auto"===b;if("string"==typeof b&&"%"===b.charAt(b.length-1))k.percentWidth=b,h.push(k),b=0;else{if(S){b=k.textWidth;var M=y.textBackgroundColor,I=M&&M.image;I&&pe(I=ce(I))&&(b=Math.max(b,I.width*w/I.height))}var T=x?x[1]+x[3]:0;b+=T;var C=null!=d?d-m:null;null!=C&&C<b&&(!S||C<T?(k.text="",k.textWidth=b=0):(k.text=be(k.text,C-T,_,c.ellipsis,{minChar:c.minChar}),k.textWidth=ge(k.text,_),b=k.textWidth+T))}m+=k.width=b,y&&(g=Math.max(g,k.lineHeight))}p.width=m,p.lineHeight=g,s+=g,l=Math.max(l,m)}i.outerWidth=i.width=A(e.textWidth,l),i.outerHeight=i.height=A(e.textHeight,s),u&&(i.outerWidth+=u[1]+u[3],i.outerHeight+=u[0]+u[2]);for(var L=0;L<h.length;L++){var k=h[L],P=k.percentWidth;k.width=parseInt(P,10)/100*l}return i}function Le(t,e,i){for(var n=""===e,o=e.split("\n"),a=t.lines,r=0;r<o.length;r++){var s=o[r],l={styleName:i,text:s,isLineHolder:!s&&!n};if(r)a.push({tokens:[l]});else{var h=(a[a.length-1]||(a[0]={tokens:[]})).tokens,u=h.length;1===u&&h[0].isLineHolder?h[0]=l:(s||!u||n)&&h.push(l)}}}function ke(t){var e=(t.fontSize||t.fontFamily)&&[t.fontStyle,t.fontWeight,(t.fontSize||12)+"px",t.fontFamily||"sans-serif"].join(" ");return e&&P(e)||t.textFont||t.font}function Pe(t,e){var i,n,o,a,r=e.x,s=e.y,l=e.width,h=e.height,u=e.r;l<0&&(r+=l,l=-l),h<0&&(s+=h,h=-h),"number"==typeof u?i=n=o=a=u:u instanceof Array?1===u.length?i=n=o=a=u[0]:2===u.length?(i=o=u[0],n=a=u[1]):3===u.length?(i=u[0],n=a=u[1],o=u[2]):(i=u[0],n=u[1],o=u[2],a=u[3]):i=n=o=a=0;var c;i+n>l&&(i*=l/(c=i+n),n*=l/c),o+a>l&&(o*=l/(c=o+a),a*=l/c),n+o>h&&(n*=h/(c=n+o),o*=h/c),i+a>h&&(i*=h/(c=i+a),a*=h/c),t.moveTo(r+i,s),t.lineTo(r+l-n,s),0!==n&&t.quadraticCurveTo(r+l,s,r+l,s+n),t.lineTo(r+l,s+h-o),0!==o&&t.quadraticCurveTo(r+l,s+h,r+l-o,s+h),t.lineTo(r+a,s+h),0!==a&&t.quadraticCurveTo(r,s+h,r,s+h-a),t.lineTo(r,s+i),0!==i&&t.quadraticCurveTo(r,s,r+i,s)}function Oe(t){return Ne(t),d(t.rich,Ne),t}function Ne(t){if(t){t.font=ke(t);var e=t.textAlign;"middle"===e&&(e="center"),t.textAlign=null==e||Z_[e]?e:"left";var i=t.textVerticalAlign||t.textBaseline;"center"===i&&(i="middle"),t.textVerticalAlign=null==i||U_[i]?i:"top",t.textPadding&&(t.textPadding=L(t.textPadding))}}function Ee(t,e,i,n,o){n.rich?Re(t,e,i,n,o):ze(t,e,i,n,o)}function ze(t,e,i,n,o){var a=Ue(e,"font",n.font||F_),r=n.textPadding,s=t.__textCotentBlock;s&&!t.__dirty||(s=t.__textCotentBlock=De(i,a,r,n.truncate));var l=s.outerHeight,h=s.lines,u=s.lineHeight,c=Ze(l,n,o),d=c.baseX,f=c.baseY,p=c.textAlign,g=c.textVerticalAlign;Ve(e,n,o,d,f);var m=_e(f,l,g),v=d,y=m,x=We(n);if(x||r){var _=ge(i,a);r&&(_+=r[1]+r[3]);var w=xe(d,_,p);x&&Fe(t,e,n,w,m,_,l),r&&(v=qe(d,p,r),y+=r[0])}Ue(e,"textAlign",p||"left"),Ue(e,"textBaseline","middle"),Ue(e,"shadowBlur",n.textShadowBlur||0),Ue(e,"shadowColor",n.textShadowColor||"transparent"),Ue(e,"shadowOffsetX",n.textShadowOffsetX||0),Ue(e,"shadowOffsetY",n.textShadowOffsetY||0),y+=u/2;var b=n.textStrokeWidth,S=je(n.textStroke,b),M=Xe(n.textFill);S&&(Ue(e,"lineWidth",b),Ue(e,"strokeStyle",S)),M&&Ue(e,"fillStyle",M);for(var I=0;I<h.length;I++)S&&e.strokeText(h[I],v,y),M&&e.fillText(h[I],v,y),y+=u}function Re(t,e,i,n,o){var a=t.__textCotentBlock;a&&!t.__dirty||(a=t.__textCotentBlock=Ce(i,n)),Be(t,e,a,n,o)}function Be(t,e,i,n,o){var a=i.width,r=i.outerWidth,s=i.outerHeight,l=n.textPadding,h=Ze(s,n,o),u=h.baseX,c=h.baseY,d=h.textAlign,f=h.textVerticalAlign;Ve(e,n,o,u,c);var p=xe(u,r,d),g=_e(c,s,f),m=p,v=g;l&&(m+=l[3],v+=l[0]);var y=m+a;We(n)&&Fe(t,e,n,p,g,r,s);for(var x=0;x<i.lines.length;x++){for(var _,w=i.lines[x],b=w.tokens,S=b.length,M=w.lineHeight,I=w.width,T=0,A=m,D=y,C=S-1;T<S&&(!(_=b[T]).textAlign||"left"===_.textAlign);)Ge(t,e,_,n,M,v,A,"left"),I-=_.width,A+=_.width,T++;for(;C>=0&&"right"===(_=b[C]).textAlign;)Ge(t,e,_,n,M,v,D,"right"),I-=_.width,D-=_.width,C--;for(A+=(a-(A-m)-(y-D)-I)/2;T<=C;)Ge(t,e,_=b[T],n,M,v,A+_.width/2,"center"),A+=_.width,T++;v+=M}}function Ve(t,e,i,n,o){if(i&&e.textRotation){var a=e.textOrigin;"center"===a?(n=i.width/2+i.x,o=i.height/2+i.y):a&&(n=a[0]+i.x,o=a[1]+i.y),t.translate(n,o),t.rotate(-e.textRotation),t.translate(-n,-o)}}function Ge(t,e,i,n,o,a,r,s){var l=n.rich[i.styleName]||{},h=i.textVerticalAlign,u=a+o/2;"top"===h?u=a+i.height/2:"bottom"===h&&(u=a+o-i.height/2),!i.isLineHolder&&We(l)&&Fe(t,e,l,"right"===s?r-i.width:"center"===s?r-i.width/2:r,u-i.height/2,i.width,i.height);var c=i.textPadding;c&&(r=qe(r,s,c),u-=i.height/2-c[2]-i.textHeight/2),Ue(e,"shadowBlur",D(l.textShadowBlur,n.textShadowBlur,0)),Ue(e,"shadowColor",l.textShadowColor||n.textShadowColor||"transparent"),Ue(e,"shadowOffsetX",D(l.textShadowOffsetX,n.textShadowOffsetX,0)),Ue(e,"shadowOffsetY",D(l.textShadowOffsetY,n.textShadowOffsetY,0)),Ue(e,"textAlign",s),Ue(e,"textBaseline","middle"),Ue(e,"font",i.font||F_);var d=je(l.textStroke||n.textStroke,p),f=Xe(l.textFill||n.textFill),p=A(l.textStrokeWidth,n.textStrokeWidth);d&&(Ue(e,"lineWidth",p),Ue(e,"strokeStyle",d),e.strokeText(i.text,r,u)),f&&(Ue(e,"fillStyle",f),e.fillText(i.text,r,u))}function We(t){return t.textBackgroundColor||t.textBorderWidth&&t.textBorderColor}function Fe(t,e,i,n,o,a,r){var s=i.textBackgroundColor,l=i.textBorderWidth,h=i.textBorderColor,u=_(s);if(Ue(e,"shadowBlur",i.textBoxShadowBlur||0),Ue(e,"shadowColor",i.textBoxShadowColor||"transparent"),Ue(e,"shadowOffsetX",i.textBoxShadowOffsetX||0),Ue(e,"shadowOffsetY",i.textBoxShadowOffsetY||0),u||l&&h){e.beginPath();var c=i.textBorderRadius;c?Pe(e,{x:n,y:o,width:a,height:r,r:c}):e.rect(n,o,a,r),e.closePath()}if(u)Ue(e,"fillStyle",s),e.fill();else if(w(s)){var d=s.image;(d=de(d,null,t,He,s))&&pe(d)&&e.drawImage(d,n,o,a,r)}l&&h&&(Ue(e,"lineWidth",l),Ue(e,"strokeStyle",h),e.stroke())}function He(t,e){e.image=t}function Ze(t,e,i){var n=e.x||0,o=e.y||0,a=e.textAlign,r=e.textVerticalAlign;if(i){var s=e.textPosition;if(s instanceof Array)n=i.x+Ye(s[0],i.width),o=i.y+Ye(s[1],i.height);else{var l=we(s,i,e.textDistance);n=l.x,o=l.y,a=a||l.textAlign,r=r||l.textVerticalAlign}var h=e.textOffset;h&&(n+=h[0],o+=h[1])}return{baseX:n,baseY:o,textAlign:a,textVerticalAlign:r}}function Ue(t,e,i){return t[e]=D_(t,e,i),t[e]}function je(t,e){return null==t||e<=0||"transparent"===t||"none"===t?null:t.image||t.colorStops?"#000":t}function Xe(t){return null==t||"none"===t?null:t.image||t.colorStops?"#000":t}function Ye(t,e){return"string"==typeof t?t.lastIndexOf("%")>=0?parseFloat(t)/100*e:parseFloat(t):t}function qe(t,e,i){return"right"===e?t-i[1]:"center"===e?t+i[3]/2-i[1]/2:t+i[3]}function $e(t,e){return null!=t&&(t||e.textBackgroundColor||e.textBorderWidth&&e.textBorderColor||e.textPadding)}function Ke(t){t=t||{},x_.call(this,t);for(var e in t)t.hasOwnProperty(e)&&"style"!==e&&(this[e]=t[e]);this.style=new L_(t.style,this),this._rect=null,this.__clipPaths=[]}function Je(t){Ke.call(this,t)}function Qe(t){return parseInt(t,10)}function ti(t){return!!t&&(!!t.__builtin__||"function"==typeof t.resize&&"function"==typeof t.refresh)}function ei(t,e,i){return Y_.copy(t.getBoundingRect()),t.transform&&Y_.applyTransform(t.transform),q_.width=e,q_.height=i,!Y_.intersect(q_)}function ii(t,e){if(t==e)return!1;if(!t||!e||t.length!==e.length)return!0;for(var i=0;i<t.length;i++)if(t[i]!==e[i])return!0}function ni(t,e){for(var i=0;i<t.length;i++){var n=t[i];n.setTransform(e),e.beginPath(),n.buildPath(e,n.shape),e.clip(),n.restoreTransform(e)}}function oi(t,e){var i=document.createElement("div");return i.style.cssText=["position:relative","overflow:hidden","width:"+t+"px","height:"+e+"px","padding:0","margin:0","border-width:0"].join(";")+";",i}function ai(t){return t.getBoundingClientRect?t.getBoundingClientRect():{left:0,top:0}}function ri(t,e,i,n){return i=i||{},n||!_x.canvasSupported?si(t,e,i):_x.browser.firefox&&null!=e.layerX&&e.layerX!==e.offsetX?(i.zrX=e.layerX,i.zrY=e.layerY):null!=e.offsetX?(i.zrX=e.offsetX,i.zrY=e.offsetY):si(t,e,i),i}function si(t,e,i){var n=ai(t);i.zrX=e.clientX-n.left,i.zrY=e.clientY-n.top}function li(t,e,i){if(null!=(e=e||window.event).zrX)return e;var n=e.type;if(n&&n.indexOf("touch")>=0){var o="touchend"!=n?e.targetTouches[0]:e.changedTouches[0];o&&ri(t,o,e,i)}else ri(t,e,e,i),e.zrDelta=e.wheelDelta?e.wheelDelta/120:-(e.detail||0)/3;var a=e.button;return null==e.which&&void 0!==a&&J_.test(e.type)&&(e.which=1&a?1:2&a?3:4&a?2:0),e}function hi(t,e,i){K_?t.addEventListener(e,i):t.attachEvent("on"+e,i)}function ui(t,e,i){K_?t.removeEventListener(e,i):t.detachEvent("on"+e,i)}function ci(t){return t.which>1}function di(t){var e=t[1][0]-t[0][0],i=t[1][1]-t[0][1];return Math.sqrt(e*e+i*i)}function fi(t){return[(t[0][0]+t[1][0])/2,(t[0][1]+t[1][1])/2]}function pi(t){return"mousewheel"===t&&_x.browser.firefox?"DOMMouseScroll":t}function gi(t,e,i){var n=t._gestureMgr;"start"===i&&n.clear();var o=n.recognize(e,t.handler.findHover(e.zrX,e.zrY,null).target,t.dom);if("end"===i&&n.clear(),o){var a=o.type;e.gestureEvent=a,t.handler.dispatchToElement({target:o.target},a,o.event)}}function mi(t){t._touching=!0,clearTimeout(t._touchTimer),t._touchTimer=setTimeout(function(){t._touching=!1},700)}function vi(t){var e=t.pointerType;return"pen"===e||"touch"===e}function yi(t){function e(t,e){return function(){if(!e._touching)return t.apply(e,arguments)}}d(ow,function(e){t._handlers[e]=m(sw[e],t)}),d(rw,function(e){t._handlers[e]=m(sw[e],t)}),d(nw,function(i){t._handlers[i]=e(sw[i],t)})}function xi(t){function e(e,i){d(e,function(e){hi(t,pi(e),i._handlers[e])},i)}Hx.call(this),this.dom=t,this._touching=!1,this._touchTimer,this._gestureMgr=new ew,this._handlers={},yi(this),_x.pointerEventsSupported?e(rw,this):(_x.touchEventsSupported&&e(ow,this),e(nw,this))}function _i(t,e){var i=new dw(yx(),t,e);return cw[i.id]=i,i}function wi(t,e){uw[t]=e}function bi(t){delete cw[t]}function Si(t){return t instanceof Array?t:null==t?[]:[t]}function Mi(t,e,i){if(t){t[e]=t[e]||{},t.emphasis=t.emphasis||{},t.emphasis[e]=t.emphasis[e]||{};for(var n=0,o=i.length;n<o;n++){var a=i[n];!t.emphasis[e].hasOwnProperty(a)&&t[e].hasOwnProperty(a)&&(t.emphasis[e][a]=t[e][a])}}}function Ii(t){return!gw(t)||mw(t)||t instanceof Date?t:t.value}function Ti(t){return gw(t)&&!(t instanceof Array)}function Ai(t,e){e=(e||[]).slice();var i=f(t||[],function(t,e){return{exist:t}});return pw(e,function(t,n){if(gw(t)){for(o=0;o<i.length;o++)if(!i[o].option&&null!=t.id&&i[o].exist.id===t.id+"")return i[o].option=t,void(e[n]=null);for(var o=0;o<i.length;o++){var a=i[o].exist;if(!(i[o].option||null!=a.id&&null!=t.id||null==t.name||Ci(t)||Ci(a)||a.name!==t.name+""))return i[o].option=t,void(e[n]=null)}}}),pw(e,function(t,e){if(gw(t)){for(var n=0;n<i.length;n++){var o=i[n].exist;if(!i[n].option&&!Ci(o)&&null==t.id){i[n].option=t;break}}n>=i.length&&i.push({option:t})}}),i}function Di(t){var e=z();pw(t,function(t,i){var n=t.exist;n&&e.set(n.id,t)}),pw(t,function(t,i){var n=t.option;k(!n||null==n.id||!e.get(n.id)||e.get(n.id)===t,"id duplicates: "+(n&&n.id)),n&&null!=n.id&&e.set(n.id,t),!t.keyInfo&&(t.keyInfo={})}),pw(t,function(t,i){var n=t.exist,o=t.option,a=t.keyInfo;if(gw(o)){if(a.name=null!=o.name?o.name+"":n?n.name:vw,n)a.id=n.id;else if(null!=o.id)a.id=o.id+"";else{var r=0;do{a.id="\0"+a.name+"\0"+r++}while(e.get(a.id))}e.set(a.id,t)}})}function Ci(t){return gw(t)&&t.id&&0===(t.id+"").indexOf("\0_ec_\0")}function Li(t,e){function i(t,e,i){for(var n=0,o=t.length;n<o;n++)for(var a=t[n].seriesId,r=Si(t[n].dataIndex),s=i&&i[a],l=0,h=r.length;l<h;l++){var u=r[l];s&&s[u]?s[u]=null:(e[a]||(e[a]={}))[u]=1}}function n(t,e){var i=[];for(var o in t)if(t.hasOwnProperty(o)&&null!=t[o])if(e)i.push(+o);else{var a=n(t[o],!0);a.length&&i.push({seriesId:o,dataIndex:a})}return i}var o={},a={};return i(t||[],o),i(e||[],a,o),[n(o),n(a)]}function ki(t,e){return null!=e.dataIndexInside?e.dataIndexInside:null!=e.dataIndex?y(e.dataIndex)?f(e.dataIndex,function(e){return t.indexOfRawIndex(e)}):t.indexOfRawIndex(e.dataIndex):null!=e.name?y(e.name)?f(e.name,function(e){return t.indexOfName(e)}):t.indexOfName(e.name):void 0}function Pi(){var t="__\0ec_inner_"+xw+++"_"+Math.random().toFixed(5);return function(e){return e[t]||(e[t]={})}}function Oi(t,e,i){if(_(e)){var n={};n[e+"Index"]=0,e=n}var o=i&&i.defaultMainType;!o||Ni(e,o+"Index")||Ni(e,o+"Id")||Ni(e,o+"Name")||(e[o+"Index"]=0);var a={};return pw(e,function(n,o){var n=e[o];if("dataIndex"!==o&&"dataIndexInside"!==o){var r=o.match(/^(\w+)(Index|Id|Name)$/)||[],s=r[1],h=(r[2]||"").toLowerCase();if(!(!s||!h||null==n||"index"===h&&"none"===n||i&&i.includeMainTypes&&l(i.includeMainTypes,s)<0)){var u={mainType:s};"index"===h&&"all"===n||(u[h]=n);var c=t.queryComponents(u);a[s+"Models"]=c,a[s+"Model"]=c[0]}}else a[o]=n}),a}function Ni(t,e){return t&&t.hasOwnProperty(e)}function Ei(t,e,i){t.setAttribute?t.setAttribute(e,i):t[e]=i}function zi(t,e){return t.getAttribute?t.getAttribute(e):t[e]}function Ri(t){var e={main:"",sub:""};return t&&(t=t.split(_w),e.main=t[0]||"",e.sub=t[1]||""),e}function Bi(t){k(/^[a-zA-Z0-9_]+([.][a-zA-Z0-9_]+)?$/.test(t),'componentType "'+t+'" illegal')}function Vi(t,e){t.$constructor=t,t.extend=function(t){var e=this,i=function(){t.$constructor?t.$constructor.apply(this,arguments):e.apply(this,arguments)};return a(i.prototype,t),i.extend=this.extend,i.superCall=Wi,i.superApply=Fi,h(i,this),i.superClass=e,i}}function Gi(t){var e=["__\0is_clz",bw++,Math.random().toFixed(3)].join("_");t.prototype[e]=!0,t.isInstance=function(t){return!(!t||!t[e])}}function Wi(t,e){var i=C(arguments,2);return this.superClass.prototype[e].apply(t,i)}function Fi(t,e,i){return this.superClass.prototype[e].apply(t,i)}function Hi(t,e){function i(t){var e=n[t.main];return e&&e[ww]||((e=n[t.main]={})[ww]=!0),e}e=e||{};var n={};if(t.registerClass=function(t,e){return e&&(Bi(e),(e=Ri(e)).sub?e.sub!==ww&&(i(e)[e.sub]=t):n[e.main]=t),t},t.getClass=function(t,e,i){var o=n[t];if(o&&o[ww]&&(o=e?o[e]:null),i&&!o)throw new Error(e?"Component "+t+"."+(e||"")+" not exists. Load it first.":t+".type should be specified.");return o},t.getClassesByMainType=function(t){t=Ri(t);var e=[],i=n[t.main];return i&&i[ww]?d(i,function(t,i){i!==ww&&e.push(t)}):e.push(i),e},t.hasClass=function(t){return t=Ri(t),!!n[t.main]},t.getAllClassMainTypes=function(){var t=[];return d(n,function(e,i){t.push(i)}),t},t.hasSubTypes=function(t){t=Ri(t);var e=n[t.main];return e&&e[ww]},t.parseClassType=Ri,e.registerWhenExtend){var o=t.extend;o&&(t.extend=function(e){var i=o.call(this,e);return t.registerClass(i,e.type)})}return t}function Zi(t){return t>-Lw&&t<Lw}function Ui(t){return t>Lw||t<-Lw}function ji(t,e,i,n,o){var a=1-o;return a*a*(a*t+3*o*e)+o*o*(o*n+3*a*i)}function Xi(t,e,i,n,o){var a=1-o;return 3*(((e-t)*a+2*(i-e)*o)*a+(n-i)*o*o)}function Yi(t,e,i,n,o,a){var r=n+3*(e-i)-t,s=3*(i-2*e+t),l=3*(e-t),h=t-o,u=s*s-3*r*l,c=s*l-9*r*h,d=l*l-3*s*h,f=0;if(Zi(u)&&Zi(c))Zi(s)?a[0]=0:(M=-l/s)>=0&&M<=1&&(a[f++]=M);else{var p=c*c-4*u*d;if(Zi(p)){var g=c/u,m=-g/2;(M=-s/r+g)>=0&&M<=1&&(a[f++]=M),m>=0&&m<=1&&(a[f++]=m)}else if(p>0){var v=Cw(p),y=u*s+1.5*r*(-c+v),x=u*s+1.5*r*(-c-v);(M=(-s-((y=y<0?-Dw(-y,Ow):Dw(y,Ow))+(x=x<0?-Dw(-x,Ow):Dw(x,Ow))))/(3*r))>=0&&M<=1&&(a[f++]=M)}else{var _=(2*u*s-3*r*c)/(2*Cw(u*u*u)),w=Math.acos(_)/3,b=Cw(u),S=Math.cos(w),M=(-s-2*b*S)/(3*r),m=(-s+b*(S+Pw*Math.sin(w)))/(3*r),I=(-s+b*(S-Pw*Math.sin(w)))/(3*r);M>=0&&M<=1&&(a[f++]=M),m>=0&&m<=1&&(a[f++]=m),I>=0&&I<=1&&(a[f++]=I)}}return f}function qi(t,e,i,n,o){var a=6*i-12*e+6*t,r=9*e+3*n-3*t-9*i,s=3*e-3*t,l=0;if(Zi(r))Ui(a)&&(c=-s/a)>=0&&c<=1&&(o[l++]=c);else{var h=a*a-4*r*s;if(Zi(h))o[0]=-a/(2*r);else if(h>0){var u=Cw(h),c=(-a+u)/(2*r),d=(-a-u)/(2*r);c>=0&&c<=1&&(o[l++]=c),d>=0&&d<=1&&(o[l++]=d)}}return l}function $i(t,e,i,n,o,a){var r=(e-t)*o+t,s=(i-e)*o+e,l=(n-i)*o+i,h=(s-r)*o+r,u=(l-s)*o+s,c=(u-h)*o+h;a[0]=t,a[1]=r,a[2]=h,a[3]=c,a[4]=c,a[5]=u,a[6]=l,a[7]=n}function Ki(t,e,i,n,o,a,r,s,l,h,u){var c,d,f,p,g,m=.005,v=1/0;Nw[0]=l,Nw[1]=h;for(var y=0;y<1;y+=.05)Ew[0]=ji(t,i,o,r,y),Ew[1]=ji(e,n,a,s,y),(p=Gx(Nw,Ew))<v&&(c=y,v=p);v=1/0;for(var x=0;x<32&&!(m<kw);x++)d=c-m,f=c+m,Ew[0]=ji(t,i,o,r,d),Ew[1]=ji(e,n,a,s,d),p=Gx(Ew,Nw),d>=0&&p<v?(c=d,v=p):(zw[0]=ji(t,i,o,r,f),zw[1]=ji(e,n,a,s,f),g=Gx(zw,Nw),f<=1&&g<v?(c=f,v=g):m*=.5);return u&&(u[0]=ji(t,i,o,r,c),u[1]=ji(e,n,a,s,c)),Cw(v)}function Ji(t,e,i,n){var o=1-n;return o*(o*t+2*n*e)+n*n*i}function Qi(t,e,i,n){return 2*((1-n)*(e-t)+n*(i-e))}function tn(t,e,i,n,o){var a=t-2*e+i,r=2*(e-t),s=t-n,l=0;if(Zi(a))Ui(r)&&(c=-s/r)>=0&&c<=1&&(o[l++]=c);else{var h=r*r-4*a*s;if(Zi(h))(c=-r/(2*a))>=0&&c<=1&&(o[l++]=c);else if(h>0){var u=Cw(h),c=(-r+u)/(2*a),d=(-r-u)/(2*a);c>=0&&c<=1&&(o[l++]=c),d>=0&&d<=1&&(o[l++]=d)}}return l}function en(t,e,i){var n=t+i-2*e;return 0===n?.5:(t-e)/n}function nn(t,e,i,n,o){var a=(e-t)*n+t,r=(i-e)*n+e,s=(r-a)*n+a;o[0]=t,o[1]=a,o[2]=s,o[3]=s,o[4]=r,o[5]=i}function on(t,e,i,n,o,a,r,s,l){var h,u=.005,c=1/0;Nw[0]=r,Nw[1]=s;for(var d=0;d<1;d+=.05)Ew[0]=Ji(t,i,o,d),Ew[1]=Ji(e,n,a,d),(m=Gx(Nw,Ew))<c&&(h=d,c=m);c=1/0;for(var f=0;f<32&&!(u<kw);f++){var p=h-u,g=h+u;Ew[0]=Ji(t,i,o,p),Ew[1]=Ji(e,n,a,p);var m=Gx(Ew,Nw);if(p>=0&&m<c)h=p,c=m;else{zw[0]=Ji(t,i,o,g),zw[1]=Ji(e,n,a,g);var v=Gx(zw,Nw);g<=1&&v<c?(h=g,c=v):u*=.5}}return l&&(l[0]=Ji(t,i,o,h),l[1]=Ji(e,n,a,h)),Cw(c)}function an(t,e,i){if(0!==t.length){var n,o=t[0],a=o[0],r=o[0],s=o[1],l=o[1];for(n=1;n<t.length;n++)o=t[n],a=Rw(a,o[0]),r=Bw(r,o[0]),s=Rw(s,o[1]),l=Bw(l,o[1]);e[0]=a,e[1]=s,i[0]=r,i[1]=l}}function rn(t,e,i,n,o,a){o[0]=Rw(t,i),o[1]=Rw(e,n),a[0]=Bw(t,i),a[1]=Bw(e,n)}function sn(t,e,i,n,o,a,r,s,l,h){var u,c=qi,d=ji,f=c(t,i,o,r,Uw);for(l[0]=1/0,l[1]=1/0,h[0]=-1/0,h[1]=-1/0,u=0;u<f;u++){var p=d(t,i,o,r,Uw[u]);l[0]=Rw(p,l[0]),h[0]=Bw(p,h[0])}for(f=c(e,n,a,s,jw),u=0;u<f;u++){var g=d(e,n,a,s,jw[u]);l[1]=Rw(g,l[1]),h[1]=Bw(g,h[1])}l[0]=Rw(t,l[0]),h[0]=Bw(t,h[0]),l[0]=Rw(r,l[0]),h[0]=Bw(r,h[0]),l[1]=Rw(e,l[1]),h[1]=Bw(e,h[1]),l[1]=Rw(s,l[1]),h[1]=Bw(s,h[1])}function ln(t,e,i,n,o,a,r,s){var l=en,h=Ji,u=Bw(Rw(l(t,i,o),1),0),c=Bw(Rw(l(e,n,a),1),0),d=h(t,i,o,u),f=h(e,n,a,c);r[0]=Rw(t,o,d),r[1]=Rw(e,a,f),s[0]=Bw(t,o,d),s[1]=Bw(e,a,f)}function hn(t,e,i,n,o,a,r,s,l){var h=tt,u=et,c=Math.abs(o-a);if(c%Ww<1e-4&&c>1e-4)return s[0]=t-i,s[1]=e-n,l[0]=t+i,void(l[1]=e+n);if(Fw[0]=Gw(o)*i+t,Fw[1]=Vw(o)*n+e,Hw[0]=Gw(a)*i+t,Hw[1]=Vw(a)*n+e,h(s,Fw,Hw),u(l,Fw,Hw),(o%=Ww)<0&&(o+=Ww),(a%=Ww)<0&&(a+=Ww),o>a&&!r?a+=Ww:o<a&&r&&(o+=Ww),r){var d=a;a=o,o=d}for(var f=0;f<a;f+=Math.PI/2)f>o&&(Zw[0]=Gw(f)*i+t,Zw[1]=Vw(f)*n+e,h(s,Zw,s),u(l,Zw,l))}function un(t,e,i,n,o,a,r){if(0===o)return!1;var s=o,l=0,h=t;if(r>e+s&&r>n+s||r<e-s&&r<n-s||a>t+s&&a>i+s||a<t-s&&a<i-s)return!1;if(t===i)return Math.abs(a-t)<=s/2;var u=(l=(e-n)/(t-i))*a-r+(h=(t*n-i*e)/(t-i));return u*u/(l*l+1)<=s/2*s/2}function cn(t,e,i,n,o,a,r,s,l,h,u){if(0===l)return!1;var c=l;return!(u>e+c&&u>n+c&&u>a+c&&u>s+c||u<e-c&&u<n-c&&u<a-c&&u<s-c||h>t+c&&h>i+c&&h>o+c&&h>r+c||h<t-c&&h<i-c&&h<o-c&&h<r-c)&&Ki(t,e,i,n,o,a,r,s,h,u,null)<=c/2}function dn(t,e,i,n,o,a,r,s,l){if(0===r)return!1;var h=r;return!(l>e+h&&l>n+h&&l>a+h||l<e-h&&l<n-h&&l<a-h||s>t+h&&s>i+h&&s>o+h||s<t-h&&s<i-h&&s<o-h)&&on(t,e,i,n,o,a,s,l,null)<=h/2}function fn(t){return(t%=rb)<0&&(t+=rb),t}function pn(t,e,i,n,o,a,r,s,l){if(0===r)return!1;var h=r;s-=t,l-=e;var u=Math.sqrt(s*s+l*l);if(u-h>i||u+h<i)return!1;if(Math.abs(n-o)%sb<1e-4)return!0;if(a){var c=n;n=fn(o),o=fn(c)}else n=fn(n),o=fn(o);n>o&&(o+=sb);var d=Math.atan2(l,s);return d<0&&(d+=sb),d>=n&&d<=o||d+sb>=n&&d+sb<=o}function gn(t,e,i,n,o,a){if(a>e&&a>n||a<e&&a<n)return 0;if(n===e)return 0;var r=n<e?1:-1,s=(a-e)/(n-e);return 1!==s&&0!==s||(r=n<e?.5:-.5),s*(i-t)+t>o?r:0}function mn(t,e){return Math.abs(t-e)<ub}function vn(){var t=db[0];db[0]=db[1],db[1]=t}function yn(t,e,i,n,o,a,r,s,l,h){if(h>e&&h>n&&h>a&&h>s||h<e&&h<n&&h<a&&h<s)return 0;var u=Yi(e,n,a,s,h,cb);if(0===u)return 0;for(var c,d,f=0,p=-1,g=0;g<u;g++){var m=cb[g],v=0===m||1===m?.5:1;ji(t,i,o,r,m)<l||(p<0&&(p=qi(e,n,a,s,db),db[1]<db[0]&&p>1&&vn(),c=ji(e,n,a,s,db[0]),p>1&&(d=ji(e,n,a,s,db[1]))),2==p?m<db[0]?f+=c<e?v:-v:m<db[1]?f+=d<c?v:-v:f+=s<d?v:-v:m<db[0]?f+=c<e?v:-v:f+=s<c?v:-v)}return f}function xn(t,e,i,n,o,a,r,s){if(s>e&&s>n&&s>a||s<e&&s<n&&s<a)return 0;var l=tn(e,n,a,s,cb);if(0===l)return 0;var h=en(e,n,a);if(h>=0&&h<=1){for(var u=0,c=Ji(e,n,a,h),d=0;d<l;d++){f=0===cb[d]||1===cb[d]?.5:1;(p=Ji(t,i,o,cb[d]))<r||(cb[d]<h?u+=c<e?f:-f:u+=a<c?f:-f)}return u}var f=0===cb[0]||1===cb[0]?.5:1,p=Ji(t,i,o,cb[0]);return p<r?0:a<e?f:-f}function _n(t,e,i,n,o,a,r,s){if((s-=e)>i||s<-i)return 0;h=Math.sqrt(i*i-s*s);cb[0]=-h,cb[1]=h;var l=Math.abs(n-o);if(l<1e-4)return 0;if(l%hb<1e-4){n=0,o=hb;p=a?1:-1;return r>=cb[0]+t&&r<=cb[1]+t?p:0}if(a){var h=n;n=fn(o),o=fn(h)}else n=fn(n),o=fn(o);n>o&&(o+=hb);for(var u=0,c=0;c<2;c++){var d=cb[c];if(d+t>r){var f=Math.atan2(s,d),p=a?1:-1;f<0&&(f=hb+f),(f>=n&&f<=o||f+hb>=n&&f+hb<=o)&&(f>Math.PI/2&&f<1.5*Math.PI&&(p=-p),u+=p)}}return u}function wn(t,e,i,n,o){for(var a=0,r=0,s=0,l=0,h=0,u=0;u<t.length;){var c=t[u++];switch(c===lb.M&&u>1&&(i||(a+=gn(r,s,l,h,n,o))),1==u&&(l=r=t[u],h=s=t[u+1]),c){case lb.M:r=l=t[u++],s=h=t[u++];break;case lb.L:if(i){if(un(r,s,t[u],t[u+1],e,n,o))return!0}else a+=gn(r,s,t[u],t[u+1],n,o)||0;r=t[u++],s=t[u++];break;case lb.C:if(i){if(cn(r,s,t[u++],t[u++],t[u++],t[u++],t[u],t[u+1],e,n,o))return!0}else a+=yn(r,s,t[u++],t[u++],t[u++],t[u++],t[u],t[u+1],n,o)||0;r=t[u++],s=t[u++];break;case lb.Q:if(i){if(dn(r,s,t[u++],t[u++],t[u],t[u+1],e,n,o))return!0}else a+=xn(r,s,t[u++],t[u++],t[u],t[u+1],n,o)||0;r=t[u++],s=t[u++];break;case lb.A:var d=t[u++],f=t[u++],p=t[u++],g=t[u++],m=t[u++],v=t[u++],y=(t[u++],1-t[u++]),x=Math.cos(m)*p+d,_=Math.sin(m)*g+f;u>1?a+=gn(r,s,x,_,n,o):(l=x,h=_);var w=(n-d)*g/p+d;if(i){if(pn(d,f,g,m,m+v,y,e,w,o))return!0}else a+=_n(d,f,g,m,m+v,y,w,o);r=Math.cos(m+v)*p+d,s=Math.sin(m+v)*g+f;break;case lb.R:l=r=t[u++],h=s=t[u++];var x=l+t[u++],_=h+t[u++];if(i){if(un(l,h,x,h,e,n,o)||un(x,h,x,_,e,n,o)||un(x,_,l,_,e,n,o)||un(l,_,l,h,e,n,o))return!0}else a+=gn(x,h,x,_,n,o),a+=gn(l,_,l,h,n,o);break;case lb.Z:if(i){if(un(r,s,l,h,e,n,o))return!0}else a+=gn(r,s,l,h,n,o);r=l,s=h}}return i||mn(s,h)||(a+=gn(r,s,l,h,n,o)||0),0!==a}function bn(t,e,i){return wn(t,0,!1,e,i)}function Sn(t,e,i,n){return wn(t,e,!0,i,n)}function Mn(t){Ke.call(this,t),this.path=null}function In(t,e,i,n,o,a,r,s,l,h,u){var c=l*(Ib/180),d=Mb(c)*(t-i)/2+Sb(c)*(e-n)/2,f=-1*Sb(c)*(t-i)/2+Mb(c)*(e-n)/2,p=d*d/(r*r)+f*f/(s*s);p>1&&(r*=bb(p),s*=bb(p));var g=(o===a?-1:1)*bb((r*r*(s*s)-r*r*(f*f)-s*s*(d*d))/(r*r*(f*f)+s*s*(d*d)))||0,m=g*r*f/s,v=g*-s*d/r,y=(t+i)/2+Mb(c)*m-Sb(c)*v,x=(e+n)/2+Sb(c)*m+Mb(c)*v,_=Db([1,0],[(d-m)/r,(f-v)/s]),w=[(d-m)/r,(f-v)/s],b=[(-1*d-m)/r,(-1*f-v)/s],S=Db(w,b);Ab(w,b)<=-1&&(S=Ib),Ab(w,b)>=1&&(S=0),0===a&&S>0&&(S-=2*Ib),1===a&&S<0&&(S+=2*Ib),u.addData(h,y,x,r,s,_,S,c,a)}function Tn(t){if(!t)return[];var e,i=t.replace(/-/g," -").replace(/ /g," ").replace(/ /g,",").replace(/,,/g,",");for(e=0;e<wb.length;e++)i=i.replace(new RegExp(wb[e],"g"),"|"+wb[e]);var n,o=i.split("|"),a=0,r=0,s=new ab,l=ab.CMD;for(e=1;e<o.length;e++){var h,u=o[e],c=u.charAt(0),d=0,f=u.slice(1).replace(/e,-/g,"e-").split(",");f.length>0&&""===f[0]&&f.shift();for(var p=0;p<f.length;p++)f[p]=parseFloat(f[p]);for(;d<f.length&&!isNaN(f[d])&&!isNaN(f[0]);){var g,m,v,y,x,_,w,b=a,S=r;switch(c){case"l":a+=f[d++],r+=f[d++],h=l.L,s.addData(h,a,r);break;case"L":a=f[d++],r=f[d++],h=l.L,s.addData(h,a,r);break;case"m":a+=f[d++],r+=f[d++],h=l.M,s.addData(h,a,r),c="l";break;case"M":a=f[d++],r=f[d++],h=l.M,s.addData(h,a,r),c="L";break;case"h":a+=f[d++],h=l.L,s.addData(h,a,r);break;case"H":a=f[d++],h=l.L,s.addData(h,a,r);break;case"v":r+=f[d++],h=l.L,s.addData(h,a,r);break;case"V":r=f[d++],h=l.L,s.addData(h,a,r);break;case"C":h=l.C,s.addData(h,f[d++],f[d++],f[d++],f[d++],f[d++],f[d++]),a=f[d-2],r=f[d-1];break;case"c":h=l.C,s.addData(h,f[d++]+a,f[d++]+r,f[d++]+a,f[d++]+r,f[d++]+a,f[d++]+r),a+=f[d-2],r+=f[d-1];break;case"S":g=a,m=r;var M=s.len(),I=s.data;n===l.C&&(g+=a-I[M-4],m+=r-I[M-3]),h=l.C,b=f[d++],S=f[d++],a=f[d++],r=f[d++],s.addData(h,g,m,b,S,a,r);break;case"s":g=a,m=r;var M=s.len(),I=s.data;n===l.C&&(g+=a-I[M-4],m+=r-I[M-3]),h=l.C,b=a+f[d++],S=r+f[d++],a+=f[d++],r+=f[d++],s.addData(h,g,m,b,S,a,r);break;case"Q":b=f[d++],S=f[d++],a=f[d++],r=f[d++],h=l.Q,s.addData(h,b,S,a,r);break;case"q":b=f[d++]+a,S=f[d++]+r,a+=f[d++],r+=f[d++],h=l.Q,s.addData(h,b,S,a,r);break;case"T":g=a,m=r;var M=s.len(),I=s.data;n===l.Q&&(g+=a-I[M-4],m+=r-I[M-3]),a=f[d++],r=f[d++],h=l.Q,s.addData(h,g,m,a,r);break;case"t":g=a,m=r;var M=s.len(),I=s.data;n===l.Q&&(g+=a-I[M-4],m+=r-I[M-3]),a+=f[d++],r+=f[d++],h=l.Q,s.addData(h,g,m,a,r);break;case"A":v=f[d++],y=f[d++],x=f[d++],_=f[d++],w=f[d++],In(b=a,S=r,a=f[d++],r=f[d++],_,w,v,y,x,h=l.A,s);break;case"a":v=f[d++],y=f[d++],x=f[d++],_=f[d++],w=f[d++],In(b=a,S=r,a+=f[d++],r+=f[d++],_,w,v,y,x,h=l.A,s)}}"z"!==c&&"Z"!==c||(h=l.Z,s.addData(h)),n=h}return s.toStatic(),s}function An(t,e){var i=Tn(t);return e=e||{},e.buildPath=function(t){if(t.setData)t.setData(i.data),(e=t.getContext())&&t.rebuildPath(e);else{var e=t;i.rebuildPath(e)}},e.applyTransform=function(t){_b(i,t),this.dirty(!0)},e}function Dn(t,e){return new Mn(An(t,e))}function Cn(t,e){return Mn.extend(An(t,e))}function Ln(t,e,i,n,o,a,r){var s=.5*(i-t),l=.5*(n-e);return(2*(e-i)+s+l)*r+(-3*(e-i)-2*s-l)*a+s*o+e}function kn(t,e,i){var n=e.points,o=e.smooth;if(n&&n.length>=2){if(o&&"spline"!==o){var a=zb(n,o,i,e.smoothConstraint);t.moveTo(n[0][0],n[0][1]);for(var r=n.length,s=0;s<(i?r:r-1);s++){var l=a[2*s],h=a[2*s+1],u=n[(s+1)%r];t.bezierCurveTo(l[0],l[1],h[0],h[1],u[0],u[1])}}else{"spline"===o&&(n=Eb(n,i)),t.moveTo(n[0][0],n[0][1]);for(var s=1,c=n.length;s<c;s++)t.lineTo(n[s][0],n[s][1])}i&&t.closePath()}}function Pn(t,e,i){var n=t.cpx2,o=t.cpy2;return null===n||null===o?[(i?Xi:ji)(t.x1,t.cpx1,t.cpx2,t.x2,e),(i?Xi:ji)(t.y1,t.cpy1,t.cpy2,t.y2,e)]:[(i?Qi:Ji)(t.x1,t.cpx1,t.x2,e),(i?Qi:Ji)(t.y1,t.cpy1,t.y2,e)]}function On(t){Ke.call(this,t),this._displayables=[],this._temporaryDisplayables=[],this._cursor=0,this.notClear=!0}function Nn(t){return Mn.extend(t)}function En(t,e,i,n){var o=Dn(t,e),a=o.getBoundingRect();return i&&("center"===n&&(i=Rn(i,a)),Bn(o,i)),o}function zn(t,e,i){var n=new Je({style:{image:t,x:e.x,y:e.y,width:e.width,height:e.height},onload:function(t){if("center"===i){var o={width:t.width,height:t.height};n.setStyle(Rn(e,o))}}});return n}function Rn(t,e){var i,n=e.width/e.height,o=t.height*n;return i=o<=t.width?t.height:(o=t.width)/n,{x:t.x+t.width/2-o/2,y:t.y+t.height/2-i/2,width:o,height:i}}function Bn(t,e){if(t.applyTransform){var i=t.getBoundingRect().calculateTransform(e);t.applyTransform(i)}}function Vn(t){var e=t.shape,i=t.style.lineWidth;return qb(2*e.x1)===qb(2*e.x2)&&(e.x1=e.x2=Wn(e.x1,i,!0)),qb(2*e.y1)===qb(2*e.y2)&&(e.y1=e.y2=Wn(e.y1,i,!0)),t}function Gn(t){var e=t.shape,i=t.style.lineWidth,n=e.x,o=e.y,a=e.width,r=e.height;return e.x=Wn(e.x,i,!0),e.y=Wn(e.y,i,!0),e.width=Math.max(Wn(n+a,i,!1)-e.x,0===a?0:1),e.height=Math.max(Wn(o+r,i,!1)-e.y,0===r?0:1),t}function Wn(t,e,i){var n=qb(2*t);return(n+qb(e))%2==0?n/2:(n+(i?1:-1))/2}function Fn(t){return null!=t&&"none"!=t}function Hn(t){return"string"==typeof t?kt(t,-.1):t}function Zn(t){if(t.__hoverStlDirty){var e=t.style.stroke,i=t.style.fill,n=t.__hoverStl;n.fill=n.fill||(Fn(i)?Hn(i):null),n.stroke=n.stroke||(Fn(e)?Hn(e):null);var o={};for(var a in n)null!=n[a]&&(o[a]=t.style[a]);t.__normalStl=o,t.__hoverStlDirty=!1}}function Un(t){if(!t.__isHover){if(Zn(t),t.useHoverLayer)t.__zr&&t.__zr.addHover(t,t.__hoverStl);else{var e=t.style,i=e.insideRollbackOpt;i&&lo(e),e.extendFrom(t.__hoverStl),i&&(so(e,e.insideOriginalTextPosition,i),null==e.textFill&&(e.textFill=i.autoColor)),t.dirty(!1),t.z2+=1}t.__isHover=!0}}function jn(t){if(t.__isHover){var e=t.__normalStl;t.useHoverLayer?t.__zr&&t.__zr.removeHover(t):(e&&t.setStyle(e),t.z2-=1),t.__isHover=!1}}function Xn(t){"group"===t.type?t.traverse(function(t){"group"!==t.type&&Un(t)}):Un(t)}function Yn(t){"group"===t.type?t.traverse(function(t){"group"!==t.type&&jn(t)}):jn(t)}function qn(t,e){t.__hoverStl=t.hoverStyle||e||{},t.__hoverStlDirty=!0,t.__isHover&&Zn(t)}function $n(t){this.__hoverSilentOnTouch&&t.zrByTouch||!this.__isEmphasis&&Xn(this)}function Kn(t){this.__hoverSilentOnTouch&&t.zrByTouch||!this.__isEmphasis&&Yn(this)}function Jn(){this.__isEmphasis=!0,Xn(this)}function Qn(){this.__isEmphasis=!1,Yn(this)}function to(t,e,i){t.__hoverSilentOnTouch=i&&i.hoverSilentOnTouch,"group"===t.type?t.traverse(function(t){"group"!==t.type&&qn(t,e)}):qn(t,e),t.on("mouseover",$n).on("mouseout",Kn),t.on("emphasis",Jn).on("normal",Qn)}function eo(t,e,i,n,o,a,r){var s,l=(o=o||Jb).labelFetcher,h=o.labelDataIndex,u=o.labelDimIndex,c=i.getShallow("show"),d=n.getShallow("show");(c||d)&&(l&&(s=l.getFormattedLabel(h,"normal",null,u)),null==s&&(s=x(o.defaultText)?o.defaultText(h,o):o.defaultText));var f=c?s:null,p=d?A(l?l.getFormattedLabel(h,"emphasis",null,u):null,s):null;null==f&&null==p||(io(t,i,a,o),io(e,n,r,o,!0)),t.text=f,e.text=p}function io(t,e,i,n,o){return no(t,e,n,o),i&&a(t,i),t.host&&t.host.dirty&&t.host.dirty(!1),t}function no(t,e,i,n){if((i=i||Jb).isRectText){var o=e.getShallow("position")||(n?null:"inside");"outside"===o&&(o="top"),t.textPosition=o,t.textOffset=e.getShallow("offset");var a=e.getShallow("rotate");null!=a&&(a*=Math.PI/180),t.textRotation=a,t.textDistance=A(e.getShallow("distance"),n?null:5)}var r,s=e.ecModel,l=s&&s.option.textStyle,h=oo(e);if(h){r={};for(var u in h)if(h.hasOwnProperty(u)){var c=e.getModel(["rich",u]);ao(r[u]={},c,l,i,n)}}return t.rich=r,ao(t,e,l,i,n,!0),i.forceRich&&!i.textStyle&&(i.textStyle={}),t}function oo(t){for(var e;t&&t!==t.ecModel;){var i=(t.option||Jb).rich;if(i){e=e||{};for(var n in i)i.hasOwnProperty(n)&&(e[n]=1)}t=t.parentModel}return e}function ao(t,e,i,n,o,a){if(i=!o&&i||Jb,t.textFill=ro(e.getShallow("color"),n)||i.color,t.textStroke=ro(e.getShallow("textBorderColor"),n)||i.textBorderColor,t.textStrokeWidth=A(e.getShallow("textBorderWidth"),i.textBorderWidth),!o){if(a){var r=t.textPosition;t.insideRollback=so(t,r,n),t.insideOriginalTextPosition=r,t.insideRollbackOpt=n}null==t.textFill&&(t.textFill=n.autoColor)}t.fontStyle=e.getShallow("fontStyle")||i.fontStyle,t.fontWeight=e.getShallow("fontWeight")||i.fontWeight,t.fontSize=e.getShallow("fontSize")||i.fontSize,t.fontFamily=e.getShallow("fontFamily")||i.fontFamily,t.textAlign=e.getShallow("align"),t.textVerticalAlign=e.getShallow("verticalAlign")||e.getShallow("baseline"),t.textLineHeight=e.getShallow("lineHeight"),t.textWidth=e.getShallow("width"),t.textHeight=e.getShallow("height"),t.textTag=e.getShallow("tag"),a&&n.disableBox||(t.textBackgroundColor=ro(e.getShallow("backgroundColor"),n),t.textPadding=e.getShallow("padding"),t.textBorderColor=ro(e.getShallow("borderColor"),n),t.textBorderWidth=e.getShallow("borderWidth"),t.textBorderRadius=e.getShallow("borderRadius"),t.textBoxShadowColor=e.getShallow("shadowColor"),t.textBoxShadowBlur=e.getShallow("shadowBlur"),t.textBoxShadowOffsetX=e.getShallow("shadowOffsetX"),t.textBoxShadowOffsetY=e.getShallow("shadowOffsetY")),t.textShadowColor=e.getShallow("textShadowColor")||i.textShadowColor,t.textShadowBlur=e.getShallow("textShadowBlur")||i.textShadowBlur,t.textShadowOffsetX=e.getShallow("textShadowOffsetX")||i.textShadowOffsetX,t.textShadowOffsetY=e.getShallow("textShadowOffsetY")||i.textShadowOffsetY}function ro(t,e){return"auto"!==t?t:e&&e.autoColor?e.autoColor:null}function so(t,e,i){var n,o=i.useInsideStyle;return null==t.textFill&&!1!==o&&(!0===o||i.isRectText&&e&&"string"==typeof e&&e.indexOf("inside")>=0)&&(n={textFill:null,textStroke:t.textStroke,textStrokeWidth:t.textStrokeWidth},t.textFill="#fff",null==t.textStroke&&(t.textStroke=i.autoColor,null==t.textStrokeWidth&&(t.textStrokeWidth=2))),n}function lo(t){var e=t.insideRollback;e&&(t.textFill=e.textFill,t.textStroke=e.textStroke,t.textStrokeWidth=e.textStrokeWidth)}function ho(t,e){var i=e||e.getModel("textStyle");return P([t.fontStyle||i&&i.getShallow("fontStyle")||"",t.fontWeight||i&&i.getShallow("fontWeight")||"",(t.fontSize||i&&i.getShallow("fontSize")||12)+"px",t.fontFamily||i&&i.getShallow("fontFamily")||"sans-serif"].join(" "))}function uo(t,e,i,n,o,a){if("function"==typeof o&&(a=o,o=null),n&&n.isAnimationEnabled()){var r=t?"Update":"",s=n.getShallow("animationDuration"+r),l=n.getShallow("animationEasing"+r),h=n.getShallow("animationDelay"+r);"function"==typeof h&&(h=h(o,n.getAnimationDelayParams?n.getAnimationDelayParams(e,o):null)),"function"==typeof s&&(s=s(o)),s>0?e.animateTo(i,s,h||0,l,a,!!a):(e.stopAnimation(),e.attr(i),a&&a())}else e.stopAnimation(),e.attr(i),a&&a()}function co(t,e,i,n,o){uo(!0,t,e,i,n,o)}function fo(t,e,i,n,o){uo(!1,t,e,i,n,o)}function po(t,e){for(var i=lt([]);t&&t!==e;)ut(i,t.getLocalTransform(),i),t=t.parent;return i}function go(t,e,i){return e&&!c(e)&&(e=Kx.getLocalTransform(e)),i&&(e=pt([],e)),Q([],t,e)}function mo(t,e,i){var n=0===e[4]||0===e[5]||0===e[0]?1:Math.abs(2*e[4]/e[0]),o=0===e[4]||0===e[5]||0===e[2]?1:Math.abs(2*e[4]/e[2]),a=["left"===t?-n:"right"===t?n:0,"top"===t?-o:"bottom"===t?o:0];return a=go(a,e,i),Math.abs(a[0])>Math.abs(a[1])?a[0]>0?"right":"left":a[1]>0?"bottom":"top"}function vo(t,e,i,n){function o(t){var e={position:W(t.position),rotation:t.rotation};return t.shape&&(e.shape=a({},t.shape)),e}if(t&&e){var r=function(t){var e={};return t.traverse(function(t){!t.isGroup&&t.anid&&(e[t.anid]=t)}),e}(t);e.traverse(function(t){if(!t.isGroup&&t.anid){var e=r[t.anid];if(e){var n=o(t);t.attr(o(e)),co(t,n,i,t.dataIndex)}}})}}function yo(t,e){return f(t,function(t){var i=t[0];i=$b(i,e.x),i=Kb(i,e.x+e.width);var n=t[1];return n=$b(n,e.y),n=Kb(n,e.y+e.height),[i,n]})}function xo(t,e,i){var n=(e=a({rectHover:!0},e)).style={strokeNoScale:!0};if(i=i||{x:-1,y:-1,width:2,height:2},t)return 0===t.indexOf("image://")?(n.image=t.slice(8),r(n,i),new Je(e)):En(t.replace("path://",""),e,i,"center")}function _o(t,e,i){this.parentModel=e,this.ecModel=i,this.option=t}function wo(t,e,i){for(var n=0;n<e.length&&(!e[n]||null!=(t=t&&"object"==typeof t?t[e[n]]:null));n++);return null==t&&i&&(t=i.get(e)),t}function bo(t,e){var i=rS(t).getParent;return i?i.call(t,e):t.parentModel}function So(t){return[t||"",sS++,Math.random().toFixed(5)].join("_")}function Mo(t){return t.replace(/^\s+/,"").replace(/\s+$/,"")}function Io(t,e,i,n){var o=e[1]-e[0],a=i[1]-i[0];if(0===o)return 0===a?i[0]:(i[0]+i[1])/2;if(n)if(o>0){if(t<=e[0])return i[0];if(t>=e[1])return i[1]}else{if(t>=e[0])return i[0];if(t<=e[1])return i[1]}else{if(t===e[0])return i[0];if(t===e[1])return i[1]}return(t-e[0])/o*a+i[0]}function To(t,e){switch(t){case"center":case"middle":t="50%";break;case"left":case"top":t="0%";break;case"right":case"bottom":t="100%"}return"string"==typeof t?Mo(t).match(/%$/)?parseFloat(t)/100*e:parseFloat(t):null==t?NaN:+t}function Ao(t,e,i){return null==e&&(e=10),e=Math.min(Math.max(0,e),20),t=(+t).toFixed(e),i?t:+t}function Do(t){return t.sort(function(t,e){return t-e}),t}function Co(t){if(t=+t,isNaN(t))return 0;for(var e=1,i=0;Math.round(t*e)/e!==t;)e*=10,i++;return i}function Lo(t){var e=t.toString(),i=e.indexOf("e");if(i>0){var n=+e.slice(i+1);return n<0?-n:0}var o=e.indexOf(".");return o<0?0:e.length-1-o}function ko(t,e){var i=Math.log,n=Math.LN10,o=Math.floor(i(t[1]-t[0])/n),a=Math.round(i(Math.abs(e[1]-e[0]))/n),r=Math.min(Math.max(-o+a,0),20);return isFinite(r)?r:20}function Po(t,e,i){if(!t[e])return 0;var n=p(t,function(t,e){return t+(isNaN(e)?0:e)},0);if(0===n)return 0;for(var o=Math.pow(10,i),a=f(t,function(t){return(isNaN(t)?0:t)/n*o*100}),r=100*o,s=f(a,function(t){return Math.floor(t)}),l=p(s,function(t,e){return t+e},0),h=f(a,function(t,e){return t-s[e]});l<r;){for(var u=Number.NEGATIVE_INFINITY,c=null,d=0,g=h.length;d<g;++d)h[d]>u&&(u=h[d],c=d);++s[c],h[c]=0,++l}return s[e]/o}function Oo(t){var e=2*Math.PI;return(t%e+e)%e}function No(t){return t>-lS&&t<lS}function Eo(t){if(t instanceof Date)return t;if("string"==typeof t){var e=uS.exec(t);if(!e)return new Date(NaN);if(e[8]){var i=+e[4]||0;return"Z"!==e[8].toUpperCase()&&(i-=e[8].slice(0,3)),new Date(Date.UTC(+e[1],+(e[2]||1)-1,+e[3]||1,i,+(e[5]||0),+e[6]||0,+e[7]||0))}return new Date(+e[1],+(e[2]||1)-1,+e[3]||1,+e[4]||0,+(e[5]||0),+e[6]||0,+e[7]||0)}return null==t?new Date(NaN):new Date(Math.round(t))}function zo(t){return Math.pow(10,Ro(t))}function Ro(t){return Math.floor(Math.log(t)/Math.LN10)}function Bo(t,e){var i,n=Ro(t),o=Math.pow(10,n),a=t/o;return i=e?a<1.5?1:a<2.5?2:a<4?3:a<7?5:10:a<1?1:a<2?2:a<3?3:a<5?5:10,t=i*o,n>=-20?+t.toFixed(n<0?-n:0):t}function Vo(t){function e(t,i,n){return t.interval[n]<i.interval[n]||t.interval[n]===i.interval[n]&&(t.close[n]-i.close[n]==(n?-1:1)||!n&&e(t,i,1))}t.sort(function(t,i){return e(t,i,0)?-1:1});for(var i=-1/0,n=1,o=0;o<t.length;){for(var a=t[o].interval,r=t[o].close,s=0;s<2;s++)a[s]<=i&&(a[s]=i,r[s]=s?1:1-n),i=a[s],n=r[s];a[0]===a[1]&&r[0]*r[1]!=1?t.splice(o,1):o++}return t}function Go(t){return t-parseFloat(t)>=0}function Wo(t){return isNaN(t)?"-":(t=(t+"").split("."))[0].replace(/(\d{1,3})(?=(?:\d{3})+(?!\d))/g,"$1,")+(t.length>1?"."+t[1]:"")}function Fo(t,e){return t=(t||"").toLowerCase().replace(/-(.)/g,function(t,e){return e.toUpperCase()}),e&&t&&(t=t.charAt(0).toUpperCase()+t.slice(1)),t}function Ho(t){return String(t).replace(/&/g,"&").replace(/</g,"<").replace(/>/g,">").replace(/"/g,""").replace(/'/g,"'")}function Zo(t,e,i){y(e)||(e=[e]);var n=e.length;if(!n)return"";for(var o=e[0].$vars||[],a=0;a<o.length;a++){var r=fS[a];t=t.replace(pS(r),pS(r,0))}for(var s=0;s<n;s++)for(var l=0;l<o.length;l++){var h=e[s][o[l]];t=t.replace(pS(fS[l],s),i?Ho(h):h)}return t}function Uo(t,e,i){return d(e,function(e,n){t=t.replace("{"+n+"}",i?Ho(e):e)}),t}function jo(t,e){var i=(t=_(t)?{color:t,extraCssText:e}:t||{}).color,n=t.type,e=t.extraCssText;return i?"subItem"===n?'<span style="display:inline-block;vertical-align:middle;margin-right:8px;margin-left:3px;border-radius:4px;width:4px;height:4px;background-color:'+Ho(i)+";"+(e||"")+'"></span>':'<span style="display:inline-block;margin-right:5px;border-radius:10px;width:10px;height:10px;background-color:'+Ho(i)+";"+(e||"")+'"></span>':""}function Xo(t,e,i){"week"!==t&&"month"!==t&&"quarter"!==t&&"half-year"!==t&&"year"!==t||(t="MM-dd\nyyyy");var n=Eo(e),o=i?"UTC":"",a=n["get"+o+"FullYear"](),r=n["get"+o+"Month"]()+1,s=n["get"+o+"Date"](),l=n["get"+o+"Hours"](),h=n["get"+o+"Minutes"](),u=n["get"+o+"Seconds"]();return t=t.replace("MM",gS(r)).replace("M",r).replace("yyyy",a).replace("yy",a%100).replace("dd",gS(s)).replace("d",s).replace("hh",gS(l)).replace("h",l).replace("mm",gS(h)).replace("m",h).replace("ss",gS(u)).replace("s",u)}function Yo(t){return t?t.charAt(0).toUpperCase()+t.substr(1):t}function qo(t,e,i,n,o){var a=0,r=0;null==n&&(n=1/0),null==o&&(o=1/0);var s=0;e.eachChild(function(l,h){var u,c,d=l.position,f=l.getBoundingRect(),p=e.childAt(h+1),g=p&&p.getBoundingRect();if("horizontal"===t){var m=f.width+(g?-g.x+f.x:0);(u=a+m)>n||l.newline?(a=0,u=m,r+=s+i,s=f.height):s=Math.max(s,f.height)}else{var v=f.height+(g?-g.y+f.y:0);(c=r+v)>o||l.newline?(a+=s+i,r=0,c=v,s=f.width):s=Math.max(s,f.width)}l.newline||(d[0]=a,d[1]=r,"horizontal"===t?a=u+i:r=c+i)})}function $o(t,e,i){var n=e.width,o=e.height,a=To(t.x,n),r=To(t.y,o),s=To(t.x2,n),l=To(t.y2,o);return(isNaN(a)||isNaN(parseFloat(t.x)))&&(a=0),(isNaN(s)||isNaN(parseFloat(t.x2)))&&(s=n),(isNaN(r)||isNaN(parseFloat(t.y)))&&(r=0),(isNaN(l)||isNaN(parseFloat(t.y2)))&&(l=o),i=dS(i||0),{width:Math.max(s-a-i[1]-i[3],0),height:Math.max(l-r-i[0]-i[2],0)}}function Ko(t,e,i){i=dS(i||0);var n=e.width,o=e.height,a=To(t.left,n),r=To(t.top,o),s=To(t.right,n),l=To(t.bottom,o),h=To(t.width,n),u=To(t.height,o),c=i[2]+i[0],d=i[1]+i[3],f=t.aspect;switch(isNaN(h)&&(h=n-s-d-a),isNaN(u)&&(u=o-l-c-r),null!=f&&(isNaN(h)&&isNaN(u)&&(f>n/o?h=.8*n:u=.8*o),isNaN(h)&&(h=f*u),isNaN(u)&&(u=h/f)),isNaN(a)&&(a=n-s-h-d),isNaN(r)&&(r=o-l-u-c),t.left||t.right){case"center":a=n/2-h/2-i[3];break;case"right":a=n-h-d}switch(t.top||t.bottom){case"middle":case"center":r=o/2-u/2-i[0];break;case"bottom":r=o-u-c}a=a||0,r=r||0,isNaN(h)&&(h=n-d-a-(s||0)),isNaN(u)&&(u=o-c-r-(l||0));var p=new Kt(a+i[3],r+i[0],h,u);return p.margin=i,p}function Jo(t,e,i,n,o){var a=!o||!o.hv||o.hv[0],s=!o||!o.hv||o.hv[1],l=o&&o.boundingMode||"all";if(a||s){var h;if("raw"===l)h="group"===t.type?new Kt(0,0,+e.width||0,+e.height||0):t.getBoundingRect();else if(h=t.getBoundingRect(),t.needLocalTransform()){var u=t.getLocalTransform();(h=h.clone()).applyTransform(u)}e=Ko(r({width:h.width,height:h.height},e),i,n);var c=t.position,d=a?e.x-h.x:0,f=s?e.y-h.y:0;t.attr("position","raw"===l?[d,f]:[c[0]+d,c[1]+f])}}function Qo(t,e){return null!=t[wS[e][0]]||null!=t[wS[e][1]]&&null!=t[wS[e][2]]}function ta(t,e,i){function n(i,n){var r={},l=0,h={},u=0;if(xS(i,function(e){h[e]=t[e]}),xS(i,function(t){o(e,t)&&(r[t]=h[t]=e[t]),a(r,t)&&l++,a(h,t)&&u++}),s[n])return a(e,i[1])?h[i[2]]=null:a(e,i[2])&&(h[i[1]]=null),h;if(2!==u&&l){if(l>=2)return r;for(var c=0;c<i.length;c++){var d=i[c];if(!o(r,d)&&o(t,d)){r[d]=t[d];break}}return r}return h}function o(t,e){return t.hasOwnProperty(e)}function a(t,e){return null!=t[e]&&"auto"!==t[e]}function r(t,e,i){xS(t,function(t){e[t]=i[t]})}!w(i)&&(i={});var s=i.ignoreSize;!y(s)&&(s=[s,s]);var l=n(wS[0],0),h=n(wS[1],1);r(wS[0],t,l),r(wS[1],t,h)}function ea(t){return ia({},t)}function ia(t,e){return e&&t&&xS(_S,function(i){e.hasOwnProperty(i)&&(t[i]=e[i])}),t}function na(t,e){for(var i=t.length,n=0;n<i;n++)if(t[n].length>e)return t[n];return t[i-1]}function oa(t){var e=t.get("coordinateSystem"),i={coordSysName:e,coordSysDims:[],axisMap:z(),categoryAxisMap:z()},n=LS[e];if(n)return n(t,i,i.axisMap,i.categoryAxisMap),i}function aa(t){return"category"===t.get("type")}function ra(t){this.fromDataset=t.fromDataset,this.data=t.data||(t.sourceFormat===NS?{}:[]),this.sourceFormat=t.sourceFormat||ES,this.seriesLayoutBy=t.seriesLayoutBy||RS,this.dimensionsDefine=t.dimensionsDefine,this.encodeDefine=t.encodeDefine&&z(t.encodeDefine),this.startIndex=t.startIndex||0,this.dimensionsDetectCount=t.dimensionsDetectCount}function sa(t){var e=t.option.source,i=ES;if(S(e))i=zS;else if(y(e))for(var n=0,o=e.length;n<o;n++){var a=e[n];if(null!=a){if(y(a)){i=PS;break}if(w(a)){i=OS;break}}}else if(w(e)){for(var r in e)if(e.hasOwnProperty(r)&&c(e[r])){i=NS;break}}else if(null!=e)throw new Error("Invalid data");VS(t).sourceFormat=i}function la(t){return VS(t).source}function ha(t){VS(t).datasetMap=z()}function ua(t){var e=t.option,i=e.data,n=S(i)?zS:kS,o=!1,a=e.seriesLayoutBy,r=e.sourceHeader,s=e.dimensions,l=ma(t);if(l){var h=l.option;i=h.source,n=VS(l).sourceFormat,o=!0,a=a||h.seriesLayoutBy,null==r&&(r=h.sourceHeader),s=s||h.dimensions}var u=ca(i,n,a,r,s),c=e.encode;!c&&l&&(c=ga(t,l,i,n,a,u)),VS(t).source=new ra({data:i,fromDataset:o,seriesLayoutBy:a,sourceFormat:n,dimensionsDefine:u.dimensionsDefine,startIndex:u.startIndex,dimensionsDetectCount:u.dimensionsDetectCount,encodeDefine:c})}function ca(t,e,i,n,o){if(!t)return{dimensionsDefine:da(o)};var a,r,s;if(e===PS)"auto"===n||null==n?fa(function(t){null!=t&&"-"!==t&&(_(t)?null==r&&(r=1):r=0)},i,t,10):r=n?1:0,o||1!==r||(o=[],fa(function(t,e){o[e]=null!=t?t:""},i,t)),a=o?o.length:i===BS?t.length:t[0]?t[0].length:null;else if(e===OS)o||(o=pa(t),s=!0);else if(e===NS)o||(o=[],s=!0,d(t,function(t,e){o.push(e)}));else if(e===kS){var l=Ii(t[0]);a=y(l)&&l.length||1}var h;return s&&d(o,function(t,e){"name"===(w(t)?t.name:t)&&(h=e)}),{startIndex:r,dimensionsDefine:da(o),dimensionsDetectCount:a,potentialNameDimIndex:h}}function da(t){if(t){var e=z();return f(t,function(t,i){if(null==(t=a({},w(t)?t:{name:t})).name)return t;t.name+="",null==t.displayName&&(t.displayName=t.name);var n=e.get(t.name);return n?t.name+="-"+n.count++:e.set(t.name,{count:1}),t})}}function fa(t,e,i,n){if(null==n&&(n=1/0),e===BS)for(a=0;a<i.length&&a<n;a++)t(i[a]?i[a][0]:null,a);else for(var o=i[0]||[],a=0;a<o.length&&a<n;a++)t(o[a],a)}function pa(t){for(var e,i=0;i<t.length&&!(e=t[i++]););if(e){var n=[];return d(e,function(t,e){n.push(e)}),n}}function ga(t,e,i,n,o,a){var r=oa(t),s={},l=[],h=[],u=t.subType,c=z(["pie","map","funnel"]),f=z(["line","bar","pictorialBar","scatter","effectScatter","candlestick","boxplot"]);if(r&&null!=f.get(u)){var p=t.ecModel,g=VS(p).datasetMap,m=e.uid+"_"+o,v=g.get(m)||g.set(m,{categoryWayDim:1,valueWayDim:0});d(r.coordSysDims,function(t){if(null==r.firstCategoryDimIndex){e=v.valueWayDim++;s[t]=e,h.push(e)}else if(r.categoryAxisMap.get(t))s[t]=0,l.push(0);else{var e=v.categoryWayDim++;s[t]=e,h.push(e)}})}else if(null!=c.get(u)){for(var y,x=0;x<5&&null==y;x++)ya(i,n,o,a.dimensionsDefine,a.startIndex,x)||(y=x);if(null!=y){s.value=y;var _=a.potentialNameDimIndex||Math.max(y-1,0);h.push(_),l.push(_)}}return l.length&&(s.itemName=l),h.length&&(s.seriesName=h),s}function ma(t){var e=t.option;if(!e.data)return t.ecModel.getComponent("dataset",e.datasetIndex||0)}function va(t,e){return ya(t.data,t.sourceFormat,t.seriesLayoutBy,t.dimensionsDefine,t.startIndex,e)}function ya(t,e,i,n,o,a){function r(t){return(null==t||!isFinite(t)||""===t)&&(!(!_(t)||"-"===t)||void 0)}var s;if(S(t))return!1;var l;if(n&&(l=w(l=n[a])?l.name:l),e===PS)if(i===BS){for(var h=t[a],u=0;u<(h||[]).length&&u<5;u++)if(null!=(s=r(h[o+u])))return s}else for(u=0;u<t.length&&u<5;u++){var c=t[o+u];if(c&&null!=(s=r(c[a])))return s}else if(e===OS){if(!l)return;for(u=0;u<t.length&&u<5;u++)if((d=t[u])&&null!=(s=r(d[l])))return s}else if(e===NS){if(!l)return;if(!(h=t[l])||S(h))return!1;for(u=0;u<h.length&&u<5;u++)if(null!=(s=r(h[u])))return s}else if(e===kS)for(u=0;u<t.length&&u<5;u++){var d=t[u],f=Ii(d);if(!y(f))return!1;if(null!=(s=r(f[a])))return s}return!1}function xa(t,e){if(e){var i=e.seiresIndex,n=e.seriesId,o=e.seriesName;return null!=i&&t.componentIndex!==i||null!=n&&t.id!==n||null!=o&&t.name!==o}}function _a(t,e){d(e,function(e,o){IS.hasClass(o)||("object"==typeof e?t[o]=t[o]?n(t[o],e,!1):i(e):null==t[o]&&(t[o]=e))})}function wa(t){t=t,this.option={},this.option[GS]=1,this._componentsMap=z({series:[]}),this._seriesIndices,this._seriesIndicesMap,_a(t,this._theme.option),n(t,AS,!1),this.mergeOption(t)}function ba(t,e){y(e)||(e=e?[e]:[]);var i={};return d(e,function(e){i[e]=(t.get(e)||[]).slice()}),i}function Sa(t,e,i){return e.type?e.type:i?i.subType:IS.determineSubType(t,e)}function Ma(t,e){t._seriesIndicesMap=z(t._seriesIndices=f(e,function(t){return t.componentIndex})||[])}function Ia(t,e){return e.hasOwnProperty("subType")?g(t,function(t){return t.subType===e.subType}):t}function Ta(t){d(FS,function(e){this[e]=m(t[e],t)},this)}function Aa(){this._coordinateSystems=[]}function Da(t){this._api=t,this._timelineOptions=[],this._mediaList=[],this._mediaDefault,this._currentMediaIndices=[],this._optionBackup,this._newBaseOption}function Ca(t,e,i){var n,o,a=[],r=[],s=t.timeline;if(t.baseOption&&(o=t.baseOption),(s||t.options)&&(o=o||{},a=(t.options||[]).slice()),t.media){o=o||{};var l=t.media;ZS(l,function(t){t&&t.option&&(t.query?r.push(t):n||(n=t))})}return o||(o=t),o.timeline||(o.timeline=s),ZS([o].concat(a).concat(f(r,function(t){return t.option})),function(t){ZS(e,function(e){e(t,i)})}),{baseOption:o,timelineOptions:a,mediaDefault:n,mediaList:r}}function La(t,e,i){var n={width:e,height:i,aspectratio:e/i},o=!0;return d(t,function(t,e){var i=e.match(YS);if(i&&i[1]&&i[2]){var a=i[1],r=i[2].toLowerCase();ka(n[r],t,a)||(o=!1)}}),o}function ka(t,e,i){return"min"===i?t>=e:"max"===i?t<=e:t===e}function Pa(t,e){return t.join(",")===e.join(",")}function Oa(t,e){ZS(e=e||{},function(e,i){if(null!=e){var n=t[i];if(IS.hasClass(i)){e=Si(e);var o=Ai(n=Si(n),e);t[i]=jS(o,function(t){return t.option&&t.exist?XS(t.exist,t.option,!0):t.exist||t.option})}else t[i]=XS(n,e,!0)}})}function Na(t){var e=t&&t.itemStyle;if(e)for(var i=0,o=KS.length;i<o;i++){var a=KS[i],r=e.normal,s=e.emphasis;r&&r[a]&&(t[a]=t[a]||{},t[a].normal?n(t[a].normal,r[a]):t[a].normal=r[a],r[a]=null),s&&s[a]&&(t[a]=t[a]||{},t[a].emphasis?n(t[a].emphasis,s[a]):t[a].emphasis=s[a],s[a]=null)}}function Ea(t,e,i){if(t&&t[e]&&(t[e].normal||t[e].emphasis)){var n=t[e].normal,o=t[e].emphasis;n&&(i?(t[e].normal=t[e].emphasis=null,r(t[e],n)):t[e]=n),o&&(t.emphasis=t.emphasis||{},t.emphasis[e]=o)}}function za(t){Ea(t,"itemStyle"),Ea(t,"lineStyle"),Ea(t,"areaStyle"),Ea(t,"label"),Ea(t,"labelLine"),Ea(t,"upperLabel"),Ea(t,"edgeLabel")}function Ra(t){var e=$S(t)&&t.textStyle;if(e)for(var i=0,n=yw.length;i<n;i++){var o=yw[i];e.hasOwnProperty(o)&&(t[o]=e[o])}}function Ba(t){t&&(za(t),Ra(t.label),t.emphasis&&Ra(t.emphasis.label))}function Va(t){if($S(t)){Na(t),za(t),Ra(t.label),Ra(t.upperLabel),Ra(t.edgeLabel),t.emphasis&&(Ra(t.emphasis.label),Ra(t.emphasis.upperLabel),Ra(t.emphasis.edgeLabel));var e=t.markPoint;e&&(Na(e),Ba(e));var i=t.markLine;i&&(Na(i),Ba(i));var n=t.markArea;n&&Ba(n);var o=t.data;if("graph"===t.type){o=o||t.nodes;var a=t.links||t.edges;if(a&&!S(a))for(s=0;s<a.length;s++)Ba(a[s]);d(t.categories,function(t){za(t)})}if(o&&!S(o))for(s=0;s<o.length;s++)Ba(o[s]);if((e=t.markPoint)&&e.data)for(var r=e.data,s=0;s<r.length;s++)Ba(r[s]);if((i=t.markLine)&&i.data)for(var l=i.data,s=0;s<l.length;s++)y(l[s])?(Ba(l[s][0]),Ba(l[s][1])):Ba(l[s]);"gauge"===t.type?(Ra(t,"axisLabel"),Ra(t,"title"),Ra(t,"detail")):"treemap"===t.type&&(Ea(t.breadcrumb,"itemStyle"),d(t.levels,function(t){za(t)}))}}function Ga(t){return y(t)?t:t?[t]:[]}function Wa(t){return(y(t)?t[0]:t)||{}}function Fa(t,e){e=e.split(",");for(var i=t,n=0;n<e.length&&null!=(i=i&&i[e[n]]);n++);return i}function Ha(t,e,i,n){e=e.split(",");for(var o,a=t,r=0;r<e.length-1;r++)null==a[o=e[r]]&&(a[o]={}),a=a[o];(n||null==a[e[r]])&&(a[e[r]]=i)}function Za(t){d(QS,function(e){e[0]in t&&!(e[1]in t)&&(t[e[1]]=t[e[0]])})}function Ua(t,e){ra.isInstance(t)||(t=ra.seriesDataToSource(t)),this._source=t;var i=this._data=t.data,n=t.sourceFormat;n===zS&&(this._offset=0,this._dimSize=e,this._data=i),a(this,nM[n===PS?n+"_"+t.seriesLayoutBy:n])}function ja(){return this._data.length}function Xa(t){return this._data[t]}function Ya(t){for(var e=0;e<t.length;e++)this._data.push(t[e])}function qa(t,e,i,n){return null!=i?t[i]:t}function $a(t,e,i,n){return Ka(t[n],this._dimensionInfos[e])}function Ka(t,e){var i=e&&e.type;if("ordinal"===i){var n=e&&e.ordinalMeta;return n?n.parseAndCollect(t):t}return"time"===i&&"number"!=typeof t&&null!=t&&"-"!==t&&(t=+Eo(t)),null==t||""===t?NaN:+t}function Ja(t,e,i){if(t){var n=t.getRawDataItem(e);if(null!=n){var o,a,r=t.getProvider().getSource().sourceFormat,s=t.getDimensionInfo(i);return s&&(o=s.name,a=s.index),oM[r](n,e,a,o)}}}function Qa(t,e,i){if(t){var n=t.getProvider().getSource().sourceFormat;if(n===kS||n===OS){var o=t.getRawDataItem(e);return n!==kS||w(o)||(o=null),o?o[i]:void 0}}}function tr(t){return new er(t)}function er(t){t=t||{},this._reset=t.reset,this._plan=t.plan,this._count=t.count,this._onDirty=t.onDirty,this._dirty=!0,this.context}function ir(t,e){t._dueIndex=t._outputDueEnd=t._dueEnd=0,t._settedOutputEnd=null,t._progress=!e&&t._reset&&t._reset(t.context);var i=t._downstream;i&&i.dirty()}function nr(t){var e=t.name;vw===e&&(t.name=or(t)||e)}function or(t){var e=t.getRawData(),i=[];return d(e.mapDimension("seriesName",!0),function(t){var n=e.getDimensionInfo(t);n.displayName&&i.push(n.displayName)}),i.join(" ")}function ar(t){return t.model.getRawData().count()}function rr(t){var e=t.model;return e.setData(e.getRawData().cloneShallow()),sr}function sr(t,e){t.end>e.outputData.count()&&e.model.getRawData().cloneShallow(e.outputData)}function lr(t,e){d(t.CHANGABLE_METHODS,function(i){t.wrapMethod(i,v(hr,e))})}function hr(t){var e=ur(t);e&&e.setOutputEnd(this.count())}function ur(t){var e=(t.ecModel||{}).scheduler,i=e&&e.getPipeline(t.uid);if(i){var n=i.currentTask;if(n){var o=n.agentStubMap;o&&(n=o.get(t.uid))}return n}}function cr(){this.group=new S_,this.uid=So("viewChart"),this.renderTask=tr({plan:pr,reset:gr}),this.renderTask.context={view:this}}function dr(t,e){if(t&&(t.trigger(e),"group"===t.type))for(var i=0;i<t.childCount();i++)dr(t.childAt(i),e)}function fr(t,e,i){var n=ki(t,e);null!=n?d(Si(n),function(e){dr(t.getItemGraphicEl(e),i)}):t.eachItemGraphicEl(function(t){dr(t,i)})}function pr(t){return gM(t.model)}function gr(t){var e=t.model,i=t.ecModel,n=t.api,o=t.payload,a=e.pipelineContext.incrementalRender,r=t.view,s=o&&pM(o).updateMethod;return r[a&&r.incrementalPrepareRender?"incrementalPrepareRender":s&&r[s]?s:"render"](e,i,n,o),a?mr:null}function mr(t,e){e.view.incrementalRender(t,e.model,e.ecModel,e.api,e.payload)}function vr(t,e,i){function n(){u=(new Date).getTime(),c=null,t.apply(r,s||[])}var o,a,r,s,l,h=0,u=0,c=null;e=e||0;var d=function(){o=(new Date).getTime(),r=this,s=arguments;var t=l||e,d=l||i;l=null,a=o-(d?h:u)-t,clearTimeout(c),d?c=setTimeout(n,t):a>=0?n():c=setTimeout(n,-a),h=o};return d.clear=function(){c&&(clearTimeout(c),c=null)},d.debounceNextCall=function(t){l=t},d}function yr(t,e,i,n){var o=t[e];if(o){var a=o[vM]||o,r=o[xM];if(o[yM]!==i||r!==n){if(null==i||!n)return t[e]=a;(o=t[e]=vr(a,i,"debounce"===n))[vM]=a,o[xM]=n,o[yM]=i}return o}}function xr(t,e){var i=t[e];i&&i[vM]&&(t[e]=i[vM])}function _r(t,e){this.ecInstance=t,this.api=e,this.unfinished,this._stageTaskMap=z()}function wr(t,e,i,n,o){function a(t,e){return t.setDirty&&(!t.dirtyMap||t.dirtyMap.get(e.__pipeline.id))}o=o||{};var r;d(e,function(e,s){if(!o.visualType||o.visualType===e.visualType){var l=t._stageTaskMap.get(e.uid),h=l.seriesTaskMap,u=l.overallTask;if(u){var c,d=u.agentStubMap;d.each(function(t){a(o,t)&&(t.dirty(),c=!0)}),c&&u.dirty(),IM(u,n);var f=t.getPerformArgs(u,o.block);d.each(function(t){t.perform(f)}),r|=u.perform(f)}else h&&h.each(function(s,l){a(o,s)&&s.dirty();var h=t.getPerformArgs(s,o.block);h.skip=!e.performRawSeries&&i.isSeriesFiltered(s.context.model),IM(s,n),r|=s.perform(h)})}}),t.unfinished|=r}function br(t,e,i,n,o){function a(i){var a=i.uid,s=r.get(a)||r.set(a,tr({plan:Dr,reset:Cr,count:kr}));s.context={model:i,ecModel:n,api:o,useClearVisual:e.isVisual&&!e.isLayout,plan:e.plan,reset:e.reset,scheduler:t},Pr(t,i,s)}var r=i.seriesTaskMap||(i.seriesTaskMap=z()),s=e.seriesType,l=e.getTargetSeries;e.createOnAllSeries?n.eachRawSeries(a):s?n.eachRawSeriesByType(s,a):l&&l(n,o).each(a);var h=t._pipelineMap;r.each(function(t,e){h.get(e)||(t.dispose(),r.removeKey(e))})}function Sr(t,e,i,n,o){function a(e){var i=e.uid,n=s.get(i)||s.set(i,tr({reset:Ir,onDirty:Ar}));n.context={model:e,overallProgress:u,isOverallFilter:c},n.agent=r,n.__block=u,Pr(t,e,n)}var r=i.overallTask=i.overallTask||tr({reset:Mr});r.context={ecModel:n,api:o,overallReset:e.overallReset,scheduler:t};var s=r.agentStubMap=r.agentStubMap||z(),l=e.seriesType,h=e.getTargetSeries,u=!0,c=e.isOverallFilter;l?n.eachRawSeriesByType(l,a):h?h(n,o).each(a):(u=!1,d(n.getSeries(),a));var f=t._pipelineMap;s.each(function(t,e){f.get(e)||(t.dispose(),s.removeKey(e))})}function Mr(t){t.overallReset(t.ecModel,t.api,t.payload)}function Ir(t,e){return t.overallProgress&&Tr}function Tr(){this.agent.dirty(),this.getDownstream().dirty()}function Ar(){this.agent&&this.agent.dirty()}function Dr(t){return t.plan&&t.plan(t.model,t.ecModel,t.api,t.payload)}function Cr(t){if(t.useClearVisual&&t.data.clearAllVisual(),(t.resetDefines=Si(t.reset(t.model,t.ecModel,t.api,t.payload))).length)return Lr}function Lr(t,e){for(var i=e.data,n=e.resetDefines,o=0;o<n.length;o++){var a=n[o];if(a&&a.dataEach)for(var r=t.start;r<t.end;r++)a.dataEach(i,r);else a&&a.progress&&a.progress(t,i)}}function kr(t){return t.data.count()}function Pr(t,e,i){var n=e.uid,o=t._pipelineMap.get(n);!o.head&&(o.head=i),o.tail&&o.tail.pipe(i),o.tail=i,i.__idxInPipeline=o.count++,i.__pipeline=o}function Or(t){TM=null;try{t(AM,DM)}catch(t){}return TM}function Nr(t,e){for(var i in e.prototype)t[i]=B}function Er(t){return function(e,i,n){e=e&&e.toLowerCase(),Hx.prototype[t].call(this,e,i,n)}}function zr(){Hx.call(this)}function Rr(t,e,n){function o(t,e){return t.__prio-e.__prio}n=n||{},"string"==typeof e&&(e=eI[e]),this.id,this.group,this._dom=t;var a=this._zr=_i(t,{renderer:n.renderer||"canvas",devicePixelRatio:n.devicePixelRatio,width:n.width,height:n.height});this._throttledZrFlush=vr(m(a.flush,a),17),(e=i(e))&&eM(e,!0),this._theme=e,this._chartsViews=[],this._chartsMap={},this._componentsViews=[],this._componentsMap={},this._coordSysMgr=new Aa;var r=this._api=is(this);this._scheduler=new _r(this,r),Hx.call(this),this._messageCenter=new zr,this._initEvents(),this.resize=m(this.resize,this),this._pendingActions=[],ae(tI,o),ae(KM,o),a.animation.on("frame",this._onframe,this),O(this)}function Br(t,e,i){var n,o=this._model,a=this._coordSysMgr.getCoordinateSystems();e=Oi(o,e);for(var r=0;r<a.length;r++){var s=a[r];if(s[t]&&null!=(n=s[t](o,e,i)))return n}}function Vr(t){var e=t._model,i=t._scheduler;i.restorePipelines(e),i.prepareStageTasks(KM),i.prepareStageTasks(tI),jr(t,"component",e,i),jr(t,"chart",e,i),i.plan()}function Gr(t,e,i,n,o){function a(n){n&&n.__alive&&n[e]&&n[e](n.__model,r,t._api,i)}var r=t._model;if(n){var s={};s[n+"Id"]=i[n+"Id"],s[n+"Index"]=i[n+"Index"],s[n+"Name"]=i[n+"Name"];var l={mainType:n,query:s};o&&(l.subType=o),r&&r.eachComponent(l,function(e,i){a(t["series"===n?"_chartsMap":"_componentsMap"][e.__viewId])},t)}else NM(t._componentsViews.concat(t._chartsViews),a)}function Wr(t,e,i){t[HM]=!0,e&&Vr(t),XM.update.call(t),t[HM]=!1,Zr.call(t,i),Ur.call(t,i)}function Fr(t,e){var i=t._chartsMap,n=t._scheduler;e.eachSeries(function(t){n.updateStreamModes(t,i[t.__viewId])})}function Hr(t,e){var i=t.type,n=t.escapeConnect,o=qM[i],s=o.actionInfo,l=(s.update||"update").split(":"),h=l.pop();l=null!=l[0]&&RM(l[0]),this[HM]=!0;var u=[t],c=!1;t.batch&&(c=!0,u=f(t.batch,function(e){return e=r(a({},e),t),e.batch=null,e}));var d,p=[],g="highlight"===i||"downplay"===i;NM(u,function(t){d=o.action(t,this._model,this._api),(d=d||a({},t)).type=s.event||d.type,p.push(d),g?Gr(this,h,t,"series"):l&&Gr(this,h,t,l.main,l.sub)},this),"none"===h||g||l||(this[ZM]?(Vr(this),XM.update.call(this,t),this[ZM]=!1):XM[h].call(this,t)),d=c?{type:s.event||i,escapeConnect:n,batch:p}:p[0],this[HM]=!1,!e&&this._messageCenter.trigger(d.type,d)}function Zr(t){for(var e=this._pendingActions;e.length;){var i=e.shift();Hr.call(this,i,t)}}function Ur(t){!t&&this.trigger("updated")}function jr(t,e,i,n){function o(t){var e="_ec_"+t.id+"_"+t.type,o=s[e];if(!o){var u=RM(t.type);(o=new(a?cM.getClass(u.main,u.sub):cr.getClass(u.sub))).init(i,h),s[e]=o,r.push(o),l.add(o.group)}t.__viewId=o.__id=e,o.__alive=!0,o.__model=t,o.group.__ecComponentInfo={mainType:t.mainType,index:t.componentIndex},!a&&n.prepareView(o,t,i,h)}for(var a="component"===e,r=a?t._componentsViews:t._chartsViews,s=a?t._componentsMap:t._chartsMap,l=t._zr,h=t._api,u=0;u<r.length;u++)r[u].__alive=!1;a?i.eachComponent(function(t,e){"series"!==t&&o(e)}):i.eachSeries(o);for(u=0;u<r.length;){var c=r[u];c.__alive?u++:(!a&&c.renderTask.dispose(),l.remove(c.group),c.dispose(i,h),r.splice(u,1),delete s[c.__id],c.__id=c.group.__ecComponentInfo=null)}}function Xr(t){var e={};t.eachSeries(function(t){var i=t.get("stack"),n=t.getData();if(i&&"list"===n.type){var o=e[i];e.hasOwnProperty(i)&&o&&(n.stackedOn=o),e[i]=n}})}function Yr(t){t.clearColorPalette(),t.eachSeries(function(t){t.clearColorPalette()})}function qr(t,e,i,n){$r(t,e,i,n),NM(t._chartsViews,function(t){t.__alive=!1}),Kr(t,e,i,n),NM(t._chartsViews,function(t){t.__alive||t.remove(e,i)})}function $r(t,e,i,n,o){NM(o||t._componentsViews,function(t){var o=t.__model;t.render(o,e,i,n),es(o,t)})}function Kr(t,e,i,n,o){var a,r=t._scheduler;e.eachSeries(function(e){var i=t._chartsMap[e.__viewId];i.__alive=!0;var s=i.renderTask;r.updatePayload(s,n),o&&o.get(e.uid)&&s.dirty(),a|=s.perform(r.getPerformArgs(s)),i.group.silent=!!e.get("silent"),es(e,i),ts(e,i)}),r.unfinished|=a,Qr(t._zr,e),bM(t._zr.dom,e)}function Jr(t,e){NM(QM,function(i){i(t,e)})}function Qr(t,e){var i=t.storage,n=0;i.traverse(function(t){t.isGroup||n++}),n>e.get("hoverLayerThreshold")&&!_x.node&&i.traverse(function(t){t.isGroup||(t.useHoverLayer=!0)})}function ts(t,e){var i=t.get("blendMode")||null;e.group.traverse(function(t){t.isGroup||t.style.blend!==i&&t.setStyle("blend",i),t.eachPendingDisplayable&&t.eachPendingDisplayable(function(t){t.setStyle("blend",i)})})}function es(t,e){var i=t.get("z"),n=t.get("zlevel");e.group.traverse(function(t){"group"!==t.type&&(null!=i&&(t.z=i),null!=n&&(t.zlevel=n))})}function is(t){var e=t._coordSysMgr;return a(new Ta(t),{getCoordinateSystems:m(e.getCoordinateSystems,e),getComponentByElement:function(e){for(;e;){var i=e.__ecComponentInfo;if(null!=i)return t._model.getComponent(i.mainType,i.index);e=e.parent}}})}function ns(t){function e(t,e){for(var n=0;n<t.length;n++)t[n][i]=e}var i="__connectUpdateStatus";NM($M,function(n,o){t._messageCenter.on(o,function(n){if(oI[t.group]&&0!==t[i]){if(n&&n.escapeConnect)return;var o=t.makeActionFromEvent(n),a=[];NM(nI,function(e){e!==t&&e.group===t.group&&a.push(e)}),e(a,0),NM(a,function(t){1!==t[i]&&t.dispatchAction(o)}),e(a,2)}})})}function os(t){oI[t]=!1}function as(t){return nI[zi(t,sI)]}function rs(t,e){eI[t]=e}function ss(t){JM.push(t)}function ls(t,e){fs(KM,t,e,VM)}function hs(t,e,i){"function"==typeof e&&(i=e,e="");var n=zM(t)?t.type:[t,t={event:e}][0];t.event=(t.event||n).toLowerCase(),e=t.event,OM(UM.test(n)&&UM.test(e)),qM[n]||(qM[n]={action:i,actionInfo:t}),$M[e]=n}function us(t,e){Aa.register(t,e)}function cs(t,e){fs(tI,t,e,GM,"layout")}function ds(t,e){fs(tI,t,e,WM,"visual")}function fs(t,e,i,n,o){(EM(e)||zM(e))&&(i=e,e=n);var a=_r.wrapStageHandler(i,o);return a.__prio=e,a.__raw=i,t.push(a),a}function ps(t,e){iI[t]=e}function gs(t){return IS.extend(t)}function ms(t){return cM.extend(t)}function vs(t){return uM.extend(t)}function ys(t){return cr.extend(t)}function xs(t){return lI[t]}function _s(t){return t}function ws(t,e,i,n,o){this._old=t,this._new=e,this._oldKeyGetter=i||_s,this._newKeyGetter=n||_s,this.context=o}function bs(t,e,i,n,o){for(var a=0;a<t.length;a++){var r="_ec_"+o[n](t[a],a),s=e[r];null==s?(i.push(r),e[r]=a):(s.length||(e[r]=s=[s]),s.push(a))}}function Ss(t){var e={},i=e.encode={},n=e.coordDimMap=z(),o=[];d(t.dimensions,function(e){var a=t.getDimensionInfo(e),r=a.coordDim;if(r){var s=i[r];i.hasOwnProperty(r)||(s=i[r]=[]),s[a.coordDimIndex]=e,a.isSysCoord&&Is(a.type)&&(o[0]=e),n.set(r,1)}cI.each(function(t,e){var n=i[e];i.hasOwnProperty(e)||(n=i[e]=[]);var o=a.otherDims[e];null!=o&&!1!==o&&(n[o]=a.name)})});var a=[];n.each(function(t,e){a=a.concat(i[e])}),e.dataDimsOnCoord=a;var r=i.label;r&&r.length&&(o=r.slice());var s=o.slice(),l=i.tooltip;return l&&l.length&&(s=l.slice()),i.defaultedLabel=o,i.defaultedTooltip=s,e}function Ms(t){return"category"===t?"ordinal":"time"===t?"time":"float"}function Is(t){return!("ordinal"===t||"time"===t)}function Ts(t){var e=typeof pI.Uint32Array===fI?Array:pI.Uint32Array,i=typeof pI.Uint16Array===fI?Array:pI.Uint16Array;return t._rawCount>65535?e:i}function As(t){var e=t.constructor;return e===Array?t.slice():new e(t)}function Ds(t,e){d(vI.concat(e.__wrappedMethods||[]),function(i){e.hasOwnProperty(i)&&(t[i]=e[i])}),t.__wrappedMethods=e.__wrappedMethods}function Cs(t){return t}function Ls(t){return t<this._count&&t>=0?this._indices[t]:-1}function ks(t,e){var i=t._idList[e];return null==i&&(i=t._getIdFromStore(e)),null==i&&(i=gI+e),i}function Ps(t){return y(t)||(t=[t]),t}function Os(t,e){var i=t.dimensions,n=new yI(f(i,t.getDimensionInfo,t),t.hostModel);Ds(n,t);for(var o=n._storage={},a=t._storage,r=0;r<i.length;r++){var s=i[r];a[s]&&(o[s]=l(e,s)>=0?Ns(a[s]):a[s])}return n}function Ns(t){for(var e=new Array(t.length),i=0;i<t.length;i++)e[i]=As(t[i]);return e}function Es(t,e,n){function o(t,e,i){null!=cI.get(e)?t.otherDims[e]=i:(t.coordDim=e,t.coordDimIndex=i,u.set(e,!0))}ra.isInstance(e)||(e=ra.seriesDataToSource(e)),n=n||{},t=(t||[]).slice();for(var s=(n.dimsDef||[]).slice(),l=z(n.encodeDef),h=z(),u=z(),c=[],f=zs(e,t,s,n.dimCount),p=0;p<f;p++){var g=s[p]=a({},w(s[p])?s[p]:{name:s[p]}),m=g.name,v=c[p]={otherDims:{}};null!=m&&null==h.get(m)&&(v.name=v.displayName=m,h.set(m,p)),null!=g.type&&(v.type=g.type),null!=g.displayName&&(v.displayName=g.displayName)}l.each(function(t,e){t=Si(t).slice();var i=l.set(e,[]);d(t,function(t,n){_(t)&&(t=h.get(t)),null!=t&&t<f&&(i[n]=t,o(c[t],e,n))})});var y=0;d(t,function(t,e){var n,t,a,s;if(_(t))n=t,t={};else{n=t.name;var h=t.ordinalMeta;t.ordinalMeta=null,(t=i(t)).ordinalMeta=h,a=t.dimsDef,s=t.otherDims,t.name=t.coordDim=t.coordDimIndex=t.dimsDef=t.otherDims=null}var u=Si(l.get(n));if(!u.length)for(var f=0;f<(a&&a.length||1);f++){for(;y<c.length&&null!=c[y].coordDim;)y++;y<c.length&&u.push(y++)}d(u,function(e,i){var l=c[e];o(r(l,t),n,i),null==l.name&&a&&(l.name=l.displayName=a[i]),l.isSysCoord=!0,s&&r(l.otherDims,s)})});for(var x=n.extraPrefix||"value",b=0;b<f;b++)null==(v=c[b]=c[b]||{}).coordDim&&(v.coordDim=Rs(x,u,n.extraFromZero),v.coordDimIndex=0,v.isExtraCoord=!0),null==v.name&&(v.name=Rs(v.coordDim,h)),null==v.type&&va(e,b,v.name)&&(v.type="ordinal");return c}function zs(t,e,i,n){return null==n&&(n=Math.max(t.dimensionsDetectCount||1,e.length,i.length),d(e,function(t){var e=t.dimsDef;e&&(n=Math.max(n,e.length))})),n}function Rs(t,e,i){if(i||null!=e.get(t)){for(var n=0;null!=e.get(t+n);)n++;t+=n}return e.set(t,!0),t}function Bs(t,e){ra.isInstance(t)||(t=ra.seriesDataToSource(t));var i,n=e.get("coordinateSystem"),o=Aa.get(n),a=oa(e);a&&(i=f(a.coordSysDims,function(t){var e={name:t},i=a.axisMap.get(t);if(i){var n=i.get("type");e.type=Ms(n),e.stackable=Vs(n)}return e})),i||(i=o&&(o.getDimensionsInfo?o.getDimensionsInfo():o.dimensions.slice())||["x","y"]);var r,s,l=wI(t,{coordDimensions:i});a&&d(l,function(t,e){var i=t.coordDim,n=a.categoryAxisMap.get(i);n&&(null==r&&(r=e),t.ordinalMeta=n.getOrdinalMeta()),null!=t.otherDims.itemName&&(s=!0)}),s||null==r||(l[r].otherDims.itemName=0);var h=new yI(l,e),u=null!=r&&Gs(t)?function(t,e,i,n){return n===r?i:this.defaultDimValueGetter(t,e,i,n)}:null;return h.hasItemOption=!1,h.initData(t,null,u),h}function Vs(t){return"category"!==t&&"time"!==t}function Gs(t){if(t.sourceFormat===kS){var e=Ws(t.data||[]);return null!=e&&!y(Ii(e))}}function Ws(t){for(var e=0;e<t.length&&null==t[e];)e++;return t[e]}function Fs(t){this._setting=t||{},this._extent=[1/0,-1/0],this._interval=0,this.init&&this.init.apply(this,arguments)}function Hs(t){this.categories=t.categories||[],this._needCollect=t.needCollect,this._deduplication=t.deduplication,this._map}function Zs(t){return t._map||(t._map=z(t.categories))}function Us(t){return w(t)&&null!=t.value?t.value:t+""}function js(t,e,i,n){var o={},a=t[1]-t[0],r=o.interval=Bo(a/e,!0);null!=i&&r<i&&(r=o.interval=i),null!=n&&r>n&&(r=o.interval=n);var s=o.intervalPrecision=Xs(r);return qs(o.niceTickExtent=[II(Math.ceil(t[0]/r)*r,s),II(Math.floor(t[1]/r)*r,s)],t),o}function Xs(t){return Lo(t)+2}function Ys(t,e,i){t[e]=Math.max(Math.min(t[e],i[1]),i[0])}function qs(t,e){!isFinite(t[0])&&(t[0]=e[0]),!isFinite(t[1])&&(t[1]=e[1]),Ys(t,0,e),Ys(t,1,e),t[0]>t[1]&&(t[0]=t[1])}function $s(t,e,i,n){var o=[];if(!t)return o;e[0]<i[0]&&o.push(e[0]);for(var a=i[0];a<=i[1]&&(o.push(a),(a=II(a+t,n))!==o[o.length-1]);)if(o.length>1e4)return[];return e[1]>(o.length?o[o.length-1]:i[1])&&o.push(e[1]),o}function Ks(t){return t.get("stack")||DI+t.seriesIndex}function Js(t){return t.dim+t.index}function Qs(t,e){var i=[],n=t.axis;if("category"===n.type){for(var o=n.getBandWidth(),a=0;a<t.count;a++)i.push(r({bandWidth:o,axisKey:"axis0",stackId:DI+a},t));for(var s=el(i,e),l=[],a=0;a<t.count;a++){var h=s.axis0[DI+a];h.offsetCenter=h.offset+h.width/2,l.push(h)}return l}}function tl(t,e){return el(f(t,function(t){var e=t.getData(),i=t.coordinateSystem.getBaseAxis(),n=i.getExtent(),o="category"===i.type?i.getBandWidth():Math.abs(n[1]-n[0])/e.count();return{bandWidth:o,barWidth:To(t.get("barWidth"),o),barMaxWidth:To(t.get("barMaxWidth"),o),barGap:t.get("barGap"),barCategoryGap:t.get("barCategoryGap"),axisKey:Js(i),stackId:Ks(t)}}),e)}function el(t,e){var i={};d(t,function(t,e){var n=t.axisKey,o=t.bandWidth,a=i[n]||{bandWidth:o,remainedWidth:o,autoWidthCount:0,categoryGap:"20%",gap:"30%",stacks:{}},r=a.stacks;i[n]=a;var s=t.stackId;r[s]||a.autoWidthCount++,r[s]=r[s]||{width:0,maxWidth:0};var l=t.barWidth;l&&!r[s].width&&(r[s].width=l,l=Math.min(a.remainedWidth,l),a.remainedWidth-=l);var h=t.barMaxWidth;h&&(r[s].maxWidth=h);var u=t.barGap;null!=u&&(a.gap=u);var c=t.barCategoryGap;null!=c&&(a.categoryGap=c)});var n={};return d(i,function(t,e){n[e]={};var i=t.stacks,o=t.bandWidth,a=To(t.categoryGap,o),r=To(t.gap,1),s=t.remainedWidth,l=t.autoWidthCount,h=(s-a)/(l+(l-1)*r);h=Math.max(h,0),d(i,function(t,e){var i=t.maxWidth;i&&i<h&&(i=Math.min(i,s),t.width&&(i=Math.min(i,t.width)),s-=i,t.width=i,l--)}),h=(s-a)/(l+(l-1)*r),h=Math.max(h,0);var u,c=0;d(i,function(t,e){t.width||(t.width=h),u=t,c+=t.width*(1+r)}),u&&(c-=u.width*r);var f=-c/2;d(i,function(t,i){n[e][i]=n[e][i]||{offset:f,width:t.width},f+=t.width*(1+r)})}),n}function il(t,e,i){var n=tl(g(e.getSeriesByType(t),function(t){return!e.isSeriesFiltered(t)&&t.coordinateSystem&&"cartesian2d"===t.coordinateSystem.type})),o={},a={};e.eachSeriesByType(t,function(t){if("cartesian2d"===t.coordinateSystem.type){var e=t.getData(),i=t.coordinateSystem,r=i.getBaseAxis(),s=Ks(t),l=n[Js(r)][s],h=l.offset,u=l.width,c=i.getOtherAxis(r),d=t.get("barMinHeight")||0,f=r.onZero?c.toGlobalCoord(c.dataToCoord(0)):c.getGlobalExtent()[0],p=[e.mapDimension("x"),e.mapDimension("y")],g=e.mapArray(p,function(t,e){return i.dataToPoint([t,e])},!0);o[s]=o[s]||[],a[s]=a[s]||[],e.setLayout({offset:h,size:u}),e.each(e.mapDimension(c.dim),function(t,i){if(!isNaN(t)){o[s][i]||(o[s][i]={p:f,n:f},a[s][i]={p:f,n:f});var n,r,l,p,m=t>=0?"p":"n",v=g[i],y=o[s][i][m],x=a[s][i][m];c.isHorizontal()?(n=y,r=v[1]+h,l=v[0]-x,p=u,a[s][i][m]+=l,Math.abs(l)<d&&(l=(l<0?-1:1)*d),o[s][i][m]+=l):(n=v[0]+h,r=y,l=u,p=v[1]-x,a[s][i][m]+=p,Math.abs(p)<d&&(p=(p<=0?-1:1)*d),o[s][i][m]+=p),e.setItemLayout(i,{x:n,y:r,width:l,height:p})}},!0)}},this)}function nl(t,e){return BI(t,RI(e))}function ol(t,e){var i,n,o,a=t.type,r=e.getMin(),s=e.getMax(),l=null!=r,h=null!=s,u=t.getExtent();"ordinal"===a?i=e.getCategories().length:(y(n=e.get("boundaryGap"))||(n=[n||0,n||0]),"boolean"==typeof n[0]&&(n=[0,0]),n[0]=To(n[0],1),n[1]=To(n[1],1),o=u[1]-u[0]||Math.abs(u[0])),null==r&&(r="ordinal"===a?i?0:NaN:u[0]-n[0]*o),null==s&&(s="ordinal"===a?i?i-1:NaN:u[1]+n[1]*o),"dataMin"===r?r=u[0]:"function"==typeof r&&(r=r({min:u[0],max:u[1]})),"dataMax"===s?s=u[1]:"function"==typeof s&&(s=s({min:u[0],max:u[1]})),(null==r||!isFinite(r))&&(r=NaN),(null==s||!isFinite(s))&&(s=NaN),t.setBlank(I(r)||I(s)),e.getNeedCrossZero()&&(r>0&&s>0&&!l&&(r=0),r<0&&s<0&&!h&&(s=0));var c=e.ecModel;if(c){var d=g(c.getSeriesByType("bar"),function(t){return t.getBaseAxis()===e.axis}).length>0;if(("time"===a||"interval"===a)&&d){var f=al(r,s,e);r=f.min,s=f.max}}return[r,s]}function al(t,e,i){var n=i.ecModel,o=i.axis.getExtent(),a=o[1]-o[0],r=tl(g(n.getSeriesByType("bar"),function(t){return!n.isSeriesFiltered(t)&&t.coordinateSystem&&"cartesian2d"===t.coordinateSystem.type}))[i.axis.dim+i.axis.index];if(void 0===r)return{min:t,max:e};var s=1/0;d(r,function(t){s=Math.min(t.offset,s)});var l=-1/0;d(r,function(t){l=Math.max(t.offset+t.width,l)});var h=Math.abs(s)+l,u=e-t,c=u/(1-(s+l)/a)-u;return e+=c*(l/h),t-=c*(s/h),{min:t,max:e}}function rl(t,e){var i=ol(t,e),n=null!=e.getMin(),o=null!=e.getMax(),a=e.get("splitNumber");"log"===t.type&&(t.base=e.get("logBase"));var r=t.type;t.setExtent(i[0],i[1]),t.niceExtent({splitNumber:a,fixMin:n,fixMax:o,minInterval:"interval"===r||"time"===r?e.get("minInterval"):null,maxInterval:"interval"===r||"time"===r?e.get("maxInterval"):null});var s=e.get("interval");null!=s&&t.setInterval&&t.setInterval(s)}function sl(t,e){if(e=e||t.get("type"))switch(e){case"category":return new MI(t.getOrdinalMeta?t.getOrdinalMeta():t.getCategories(),[1/0,-1/0]);case"value":return new AI;default:return(Fs.getClass(e)||AI).create(t)}}function ll(t,e,i,n,o){var a,r=0,s=0,l=(n-o)/180*Math.PI,h=1;e.length>40&&(h=Math.floor(e.length/40));for(var u=0;u<t.length;u+=h){var c=t[u],d=me(e[u],i,"center","top");d.x+=c*Math.cos(l),d.y+=c*Math.sin(l),d.width*=1.3,d.height*=1.3,a?a.intersect(d)?(s++,r=Math.max(r,s)):(a.union(d),s=0):a=d.clone()}return 0===r&&h>1?h:(r+1)*h-1}function hl(t,e){var i=t.scale,n=i.getTicksLabels(),o=i.getTicks();return"string"==typeof e?(e=function(t){return function(e){return t.replace("{value}",null!=e?e:"")}}(e),f(n,e)):"function"==typeof e?f(o,function(i,n){return e(ul(t,i),n)},this):n}function ul(t,e){return"category"===t.type?t.scale.getLabel(e):e}function cl(t,e){if("image"!==this.type){var i=this.style,n=this.shape;n&&"line"===n.symbolType?i.stroke=t:this.__isEmptyBrush?(i.stroke=t,i.fill=e||"#fff"):(i.fill&&(i.fill=t),i.stroke&&(i.stroke=t)),this.dirty(!1)}}function dl(t,e,i,n,o,a,r){var s=0===t.indexOf("empty");s&&(t=t.substr(5,1).toLowerCase()+t.substr(6));var l;return l=0===t.indexOf("image://")?zn(t.slice(8),new Kt(e,i,n,o),r?"center":"cover"):0===t.indexOf("path://")?En(t.slice(7),{},new Kt(e,i,n,o),r?"center":"cover"):new KI({shape:{symbolType:t,x:e,y:i,width:n,height:o}}),l.__isEmptyBrush=s,l.setColor=cl,l.setColor(a),l}function fl(t,e){return Math.abs(t-e)<QI}function pl(t,e,i){var n=0,o=t[0];if(!o)return!1;for(var a=1;a<t.length;a++){var r=t[a];n+=gn(o[0],o[1],r[0],r[1],e,i),o=r}var s=t[0];return fl(o[0],s[0])&&fl(o[1],s[1])||(n+=gn(o[0],o[1],s[0],s[1],e,i)),0!==n}function gl(t,e,i){if(this.name=t,this.geometries=e,i)i=[i[0],i[1]];else{var n=this.getBoundingRect();i=[n.x+n.width/2,n.y+n.height/2]}this.center=i}function ml(t){if(!t.UTF8Encoding)return t;var e=t.UTF8Scale;null==e&&(e=1024);for(var i=t.features,n=0;n<i.length;n++)for(var o=i[n].geometry,a=o.coordinates,r=o.encodeOffsets,s=0;s<a.length;s++){var l=a[s];if("Polygon"===o.type)a[s]=vl(l,r[s],e);else if("MultiPolygon"===o.type)for(var h=0;h<l.length;h++){var u=l[h];l[h]=vl(u,r[s][h],e)}}return t.UTF8Encoding=!1,t}function vl(t,e,i){for(var n=[],o=e[0],a=e[1],r=0;r<t.length;r+=2){var s=t.charCodeAt(r)-64,l=t.charCodeAt(r+1)-64;s=s>>1^-(1&s),l=l>>1^-(1&l),o=s+=o,a=l+=a,n.push([s/i,l/i])}return n}function yl(t,e){var i=(t[1]-t[0])/e/2;t[0]+=i,t[1]-=i}function xl(t,e){var i=t.mapDimension("defaultedLabel",!0),n=i.length;if(1===n)return Ja(t,e,i[0]);if(n){for(var o=[],a=0;a<i.length;a++){var r=Ja(t,e,i[a]);o.push(r)}return o.join(" ")}}function _l(t,e){var i=t.getItemVisual(e,"symbolSize");return i instanceof Array?i.slice():[+i,+i]}function wl(t){return[t[0]/2,t[1]/2]}function bl(t,e,i){S_.call(this),this.updateData(t,e,i)}function Sl(t,e){this.parent.drift(t,e)}function Ml(t){this.group=new S_,this._symbolCtor=t||bl}function Il(t,e,i,n){return e&&!isNaN(e[0])&&!isNaN(e[1])&&!(n&&n(i))&&"none"!==t.getItemVisual(i,"symbol")}function Tl(t){var e=t.hostModel;return{itemStyle:e.getModel("itemStyle").getItemStyle(["color"]),hoverItemStyle:e.getModel("emphasis.itemStyle").getItemStyle(),symbolRotate:e.get("symbolRotate"),symbolOffset:e.get("symbolOffset"),hoverAnimation:e.get("hoverAnimation"),labelModel:e.getModel("label"),hoverLabelModel:e.getModel("emphasis.label"),cursorStyle:e.get("cursor")}}function Al(t){return t>=0?1:-1}function Dl(t,e,i){for(var n,o=t.getBaseAxis(),a=t.getOtherAxis(o),r=o.onZero?0:a.scale.getExtent()[0],s=a.dim,l="x"===s||"radius"===s?1:0,h=e.stackedOn,u=e.get(s,i);h&&Al(h.get(s,i))===Al(u);){n=h;break}var c=[];return c[l]=e.get(o.dim,i),c[1-l]=n?n.get(s,i,!0):r,t.dataToPoint(c)}function Cl(t,e){var i=[];return e.diff(t).add(function(t){i.push({cmd:"+",idx:t})}).update(function(t,e){i.push({cmd:"=",idx:e,idx1:t})}).remove(function(t){i.push({cmd:"-",idx:t})}).execute(),i}function Ll(t){return isNaN(t[0])||isNaN(t[1])}function kl(t,e,i,n,o,a,r,s,l,h,u){for(var c=0,d=i,f=0;f<n;f++){var p=e[d];if(d>=o||d<0)break;if(Ll(p)){if(u){d+=a;continue}break}if(d===i)t[a>0?"moveTo":"lineTo"](p[0],p[1]),mT(yT,p);else if(l>0){var g=d+a,m=e[g];if(u)for(;m&&Ll(e[g]);)m=e[g+=a];var v=.5,y=e[c];if(!(m=e[g])||Ll(m))mT(xT,p);else{Ll(m)&&!u&&(m=p),U(vT,m,y);var x,_;if("x"===h||"y"===h){var w="x"===h?0:1;x=Math.abs(p[w]-y[w]),_=Math.abs(p[w]-m[w])}else x=Vx(p,y),_=Vx(p,m);gT(xT,p,vT,-l*(1-(v=_/(_+x))))}fT(yT,yT,s),pT(yT,yT,r),fT(xT,xT,s),pT(xT,xT,r),t.bezierCurveTo(yT[0],yT[1],xT[0],xT[1],p[0],p[1]),gT(yT,p,vT,l*v)}else t.lineTo(p[0],p[1]);c=d,d+=a}return f}function Pl(t,e){var i=[1/0,1/0],n=[-1/0,-1/0];if(e)for(var o=0;o<t.length;o++){var a=t[o];a[0]<i[0]&&(i[0]=a[0]),a[1]<i[1]&&(i[1]=a[1]),a[0]>n[0]&&(n[0]=a[0]),a[1]>n[1]&&(n[1]=a[1])}return{min:e?i:n,max:e?n:i}}function Ol(t,e){if(t.length===e.length){for(var i=0;i<t.length;i++){var n=t[i],o=e[i];if(n[0]!==o[0]||n[1]!==o[1])return}return!0}}function Nl(t){return"number"==typeof t?t:t?.3:0}function El(t){var e=t.getGlobalExtent();if(t.onBand){var i=t.getBandWidth()/2-1,n=e[1]>e[0]?1:-1;e[0]+=n*i,e[1]-=n*i}return e}function zl(t){return t>=0?1:-1}function Rl(t,e,i,n){var o=e.getBaseAxis(),a=e.getOtherAxis(o),r=0,s=a.scale.getExtent();"start"===n?r=s[0]:"end"===n?r=s[1]:(s=a.scale.getExtent())[0]>0?r=s[0]:s[1]<0&&(r=s[1]);var l=a.dim,h="x"===l||"radius"===l?1:0,u=i.mapDimension(l);return i.mapArray(u?[u]:[],function(t,n){for(var a,s=i.stackedOn;s&&zl(s.get(u,n))===zl(t);){a=s;break}var l=[];return l[h]=i.get(o.dim,n),l[1-h]=a?a.get(u,n,!0):r,e.dataToPoint(l)},!0)}function Bl(t,e,i){var n=El(t.getAxis("x")),o=El(t.getAxis("y")),a=t.getBaseAxis().isHorizontal(),r=Math.min(n[0],n[1]),s=Math.min(o[0],o[1]),l=Math.max(n[0],n[1])-r,h=Math.max(o[0],o[1])-s,u=i.get("lineStyle.width")||2,c=i.get("clipOverflow")?u/2:Math.max(l,h);a?(s-=c,h+=2*c):(r-=c,l+=2*c);var d=new Vb({shape:{x:r,y:s,width:l,height:h}});return e&&(d.shape[a?"width":"height"]=0,fo(d,{shape:{width:l,height:h}},i)),d}function Vl(t,e,i){var n=t.getAngleAxis(),o=t.getRadiusAxis().getExtent(),a=n.getExtent(),r=Math.PI/180,s=new Ob({shape:{cx:t.cx,cy:t.cy,r0:o[0],r:o[1],startAngle:-a[0]*r,endAngle:-a[1]*r,clockwise:n.inverse}});return e&&(s.shape.endAngle=-a[0]*r,fo(s,{shape:{endAngle:-a[1]*r}},i)),s}function Gl(t,e,i){return"polar"===t.type?Vl(t,e,i):Bl(t,e,i)}function Wl(t,e,i){for(var n=e.getBaseAxis(),o="x"===n.dim||"radius"===n.dim?0:1,a=[],r=0;r<t.length-1;r++){var s=t[r+1],l=t[r];a.push(l);var h=[];switch(i){case"end":h[o]=s[o],h[1-o]=l[1-o],a.push(h);break;case"middle":var u=(l[o]+s[o])/2,c=[];h[o]=c[o]=u,h[1-o]=l[1-o],c[1-o]=s[1-o],a.push(h),a.push(c);break;default:h[o]=l[o],h[1-o]=s[1-o],a.push(h)}}return t[r]&&a.push(t[r]),a}function Fl(t,e){var i=t.getVisual("visualMeta");if(i&&i.length&&t.count()){for(var n,o=i.length-1;o>=0;o--)if(i[o].dimension<2){n=i[o];break}if(n&&"cartesian2d"===e.type){var a=n.dimension,r=t.dimensions[a],s=e.getAxis(r),l=f(n.stops,function(t){return{coord:s.toGlobalCoord(s.dataToCoord(t.value)),color:t.color}}),h=l.length,u=n.outerColors.slice();h&&l[0].coord>l[h-1].coord&&(l.reverse(),u.reverse());var c=l[0].coord-10,p=l[h-1].coord+10,g=p-c;if(g<.001)return"transparent";d(l,function(t){t.offset=(t.coord-c)/g}),l.push({offset:h?l[h-1].offset:.5,color:u[1]||"transparent"}),l.unshift({offset:h?l[0].offset:.5,color:u[0]||"transparent"});var m=new jb(0,0,0,0,l,!0);return m[r]=c,m[r+"2"]=p,m}}}function Hl(t){return this._axes[t]}function Zl(t){TT.call(this,t)}function Ul(t,e){return e.type||(e.data?"category":"value")}function jl(t,e,i){return t.getCoordSysModel()===e}function Xl(t,e){var i=e*Math.PI/180,n=t.plain(),o=n.width,a=n.height,r=o*Math.cos(i)+a*Math.sin(i),s=o*Math.sin(i)+a*Math.cos(i);return new Kt(n.x,n.y,r,s)}function Yl(t){var e,i=t.model,n=i.get("axisLabel.show")?i.getFormattedLabels():[],o=i.getModel("axisLabel"),a=1,r=n.length;r>40&&(a=Math.ceil(r/40));for(var s=0;s<r;s+=a)if(!t.isLabelIgnored(s)){var l=Xl(o.getTextRect(n[s]),o.get("rotate")||0);e?e.union(l):e=l}return e}function ql(t,e,i){this._coordsMap={},this._coordsList=[],this._axesMap={},this._axesList=[],this._initCartesian(t,e,i),this.model=t}function $l(t,e,i){var n=t[e];if(i.onZero){var o=i.onZeroAxisIndex;if(null==o){for(var a in n)if(n.hasOwnProperty(a)){var r=n[a];if(r&&!Kl(r)){o=+a;break}}null==o&&(i.onZero=!1),i.onZeroAxisIndex=o}else(r=n[o])&&Kl(r)&&(i.onZero=!1)}}function Kl(t){return"category"===t.type||"time"===t.type||!ET(t)}function Jl(t,e){var i=t.getExtent(),n=i[0]+i[1];t.toGlobalCoord="x"===t.dim?function(t){return t+e}:function(t){return n-t+e},t.toLocalCoord="x"===t.dim?function(t){return t-e}:function(t){return n-t+e}}function Ql(t,e){return f(BT,function(e){return t.getReferringComponents(e)[0]})}function th(t){return"cartesian2d"===t.get("coordinateSystem")}function eh(t){var e={componentType:t.mainType};return e[t.mainType+"Index"]=t.componentIndex,e}function ih(t,e,i,n){var o,a,r=Oo(i-t.rotation),s=n[0]>n[1],l="start"===e&&!s||"start"!==e&&s;return No(r-VT/2)?(a=l?"bottom":"top",o="center"):No(r-1.5*VT)?(a=l?"top":"bottom",o="center"):(a="middle",o=r<1.5*VT&&r>VT/2?l?"left":"right":l?"right":"left"),{rotation:r,textAlign:o,textVerticalAlign:a}}function nh(t){var e=t.get("tooltip");return t.get("silent")||!(t.get("triggerEvent")||e&&e.show)}function oh(t,e,i){var n=t.get("axisLabel.showMinLabel"),o=t.get("axisLabel.showMaxLabel");e=e||[],i=i||[];var a=e[0],r=e[1],s=e[e.length-1],l=e[e.length-2],h=i[0],u=i[1],c=i[i.length-1],d=i[i.length-2];!1===n?(ah(a),ah(h)):rh(a,r)&&(n?(ah(r),ah(u)):(ah(a),ah(h))),!1===o?(ah(s),ah(c)):rh(l,s)&&(o?(ah(l),ah(d)):(ah(s),ah(c)))}function ah(t){t&&(t.ignore=!0)}function rh(t,e,i){var n=t&&t.getBoundingRect().clone(),o=e&&e.getBoundingRect().clone();if(n&&o){var a=lt([]);return dt(a,a,-t.rotation),n.applyTransform(ut([],a,t.getLocalTransform())),o.applyTransform(ut([],a,e.getLocalTransform())),n.intersect(o)}}function sh(t){return"middle"===t||"center"===t}function lh(t,e,i){var n=e.axis;if(e.get("axisTick.show")&&!n.scale.isBlank()){for(var o=e.getModel("axisTick"),a=o.getModel("lineStyle"),s=o.get("length"),l=ZT(o,i.labelInterval),h=n.getTicksCoords(o.get("alignWithLabel")),u=n.scale.getTicks(),c=e.get("axisLabel.showMinLabel"),d=e.get("axisLabel.showMaxLabel"),f=[],p=[],g=t._transform,m=[],v=h.length,y=0;y<v;y++)if(!HT(n,y,l,v,c,d)){var x=h[y];f[0]=x,f[1]=0,p[0]=x,p[1]=i.tickDirection*s,g&&(Q(f,f,g),Q(p,p,g));var _=new Gb(Vn({anid:"tick_"+u[y],shape:{x1:f[0],y1:f[1],x2:p[0],y2:p[1]},style:r(a.getLineStyle(),{stroke:e.get("axisLine.lineStyle.color")}),z2:2,silent:!0}));t.group.add(_),m.push(_)}return m}}function hh(t,e,i){var n=e.axis;if(T(i.axisLabelShow,e.get("axisLabel.show"))&&!n.scale.isBlank()){var o=e.getModel("axisLabel"),a=o.get("margin"),r=n.scale.getTicks(),s=e.getFormattedLabels(),l=(T(i.labelRotate,o.get("rotate"))||0)*VT/180,h=FT(i.rotation,l,i.labelDirection),u=e.getCategories(),c=[],f=nh(e),p=e.get("triggerEvent"),g=e.get("axisLabel.showMinLabel"),m=e.get("axisLabel.showMaxLabel");return d(r,function(l,d){if(!HT(n,d,i.labelInterval,r.length,g,m)){var v=o;u&&u[l]&&u[l].textStyle&&(v=new _o(u[l].textStyle,o,e.ecModel));var y=v.getTextColor()||e.get("axisLine.lineStyle.color"),x=[n.dataToCoord(l),i.labelOffset+i.labelDirection*a],_=n.scale.getLabel(l),w=new Cb({anid:"label_"+l,position:x,rotation:h.rotation,silent:f,z2:10});io(w.style,v,{text:s[d],textAlign:v.getShallow("align",!0)||h.textAlign,textVerticalAlign:v.getShallow("verticalAlign",!0)||v.getShallow("baseline",!0)||h.textVerticalAlign,textFill:"function"==typeof y?y("category"===n.type?_:"value"===n.type?l+"":l,d):y}),p&&(w.eventData=eh(e),w.eventData.targetType="axisLabel",w.eventData.value=_),t._dumbGroup.add(w),w.updateTransform(),c.push(w),t.group.add(w),w.decomposeTransform()}}),c}}function uh(t,e){var i={axesInfo:{},seriesInvolved:!1,coordSysAxesInfo:{},coordSysMap:{}};return ch(i,t,e),i.seriesInvolved&&fh(i,t),i}function ch(t,e,i){var n=e.getComponent("tooltip"),o=e.getComponent("axisPointer"),a=o.get("link",!0)||[],r=[];UT(i.getCoordinateSystems(),function(i){function s(n,s,l){var c=l.model.getModel("axisPointer",o),d=c.get("show");if(d&&("auto"!==d||n||xh(c))){null==s&&(s=c.get("triggerTooltip"));var f=(c=n?dh(l,u,o,e,n,s):c).get("snap"),p=_h(l.model),g=s||f||"category"===l.type,m=t.axesInfo[p]={key:p,axis:l,coordSys:i,axisPointerModel:c,triggerTooltip:s,involveSeries:g,snap:f,useHandle:xh(c),seriesModels:[]};h[p]=m,t.seriesInvolved|=g;var v=ph(a,l);if(null!=v){var y=r[v]||(r[v]={axesInfo:{}});y.axesInfo[p]=m,y.mapper=a[v].mapper,m.linkGroup=y}}}if(i.axisPointerEnabled){var l=_h(i.model),h=t.coordSysAxesInfo[l]={};t.coordSysMap[l]=i;var u=i.model.getModel("tooltip",n);if(UT(i.getAxes(),jT(s,!1,null)),i.getTooltipAxes&&n&&u.get("show")){var c="axis"===u.get("trigger"),d="cross"===u.get("axisPointer.type"),f=i.getTooltipAxes(u.get("axisPointer.axis"));(c||d)&&UT(f.baseAxes,jT(s,!d||"cross",c)),d&&UT(f.otherAxes,jT(s,"cross",!1))}}})}function dh(t,e,n,o,a,s){var l=e.getModel("axisPointer"),h={};UT(["type","snap","lineStyle","shadowStyle","label","animation","animationDurationUpdate","animationEasingUpdate","z"],function(t){h[t]=i(l.get(t))}),h.snap="category"!==t.type&&!!s,"cross"===l.get("type")&&(h.type="line");var u=h.label||(h.label={});if(null==u.show&&(u.show=!1),"cross"===a&&(u.show=!0,!s)){var c=h.lineStyle=l.get("crossStyle");c&&r(u,c.textStyle)}return t.model.getModel("axisPointer",new _o(h,n,o))}function fh(t,e){e.eachSeries(function(e){var i=e.coordinateSystem,n=e.get("tooltip.trigger",!0),o=e.get("tooltip.show",!0);i&&"none"!==n&&!1!==n&&"item"!==n&&!1!==o&&!1!==e.get("axisPointer.show",!0)&&UT(t.coordSysAxesInfo[_h(i.model)],function(t){var n=t.axis;i.getAxis(n.dim)===n&&(t.seriesModels.push(e),null==t.seriesDataCount&&(t.seriesDataCount=0),t.seriesDataCount+=e.getData().count())})},this)}function ph(t,e){for(var i=e.model,n=e.dim,o=0;o<t.length;o++){var a=t[o]||{};if(gh(a[n+"AxisId"],i.id)||gh(a[n+"AxisIndex"],i.componentIndex)||gh(a[n+"AxisName"],i.name))return o}}function gh(t,e){return"all"===t||y(t)&&l(t,e)>=0||t===e}function mh(t){var e=vh(t);if(e){var i=e.axisPointerModel,n=e.axis.scale,o=i.option,a=i.get("status"),r=i.get("value");null!=r&&(r=n.parse(r));var s=xh(i);null==a&&(o.status=s?"show":"hide");var l=n.getExtent().slice();l[0]>l[1]&&l.reverse(),(null==r||r>l[1])&&(r=l[1]),r<l[0]&&(r=l[0]),o.value=r,s&&(o.status=e.axis.scale.isBlank()?"hide":"show")}}function vh(t){var e=(t.ecModel.getComponent("axisPointer")||{}).coordSysAxesInfo;return e&&e.axesInfo[_h(t)]}function yh(t){var e=vh(t);return e&&e.axisPointerModel}function xh(t){return!!t.get("handle.show")}function _h(t){return t.type+"||"+t.id}function wh(t,e,i,n,o,a){var r=XT.getAxisPointerClass(t.axisPointerClass);if(r){var s=yh(e);s?(t._axisPointer||(t._axisPointer=new r)).render(e,s,n,a):bh(t,n)}}function bh(t,e,i){var n=t._axisPointer;n&&n.dispose(e,i),t._axisPointer=null}function Sh(t,e,i){i=i||{};var n=t.coordinateSystem,o=e.axis,a={},r=o.position,s=o.onZero?"onZero":r,l=o.dim,h=n.getRect(),u=[h.x,h.x+h.width,h.y,h.y+h.height],c={left:0,right:1,top:0,bottom:1,onZero:2},d=e.get("offset")||0,f="x"===l?[u[2]-d,u[3]+d]:[u[0]-d,u[1]+d];if(o.onZero){var p=n.getAxis("x"===l?"y":"x",o.onZeroAxisIndex),g=p.toGlobalCoord(p.dataToCoord(0));f[c.onZero]=Math.max(Math.min(g,f[1]),f[0])}a.position=["y"===l?f[c[s]]:u[0],"x"===l?f[c[s]]:u[3]],a.rotation=Math.PI/2*("x"===l?0:1);var m={top:-1,bottom:1,left:-1,right:1};a.labelDirection=a.tickDirection=a.nameDirection=m[r],a.labelOffset=o.onZero?f[c[r]]-f[c.onZero]:0,e.get("axisTick.inside")&&(a.tickDirection=-a.tickDirection),T(i.labelInside,e.get("axisLabel.inside"))&&(a.labelDirection=-a.labelDirection);var v=e.get("axisLabel.rotate");return a.labelRotate="top"===s?-v:v,a.labelInterval=o.getLabelInterval(),a.z2=1,a}function Mh(t,e,i,n,o,a,r){eo(t,e,i.getModel("label"),i.getModel("emphasis.label"),{labelFetcher:o,labelDataIndex:a,defaultText:xl(o.getData(),a),isRectText:!0,autoColor:n}),Ih(t),Ih(e)}function Ih(t,e){"outside"===t.textPosition&&(t.textPosition=e)}function Th(t,e,i){i.style.text=null,co(i,{shape:{width:0}},e,t,function(){i.parent&&i.parent.remove(i)})}function Ah(t,e,i){i.style.text=null,co(i,{shape:{r:i.shape.r0}},e,t,function(){i.parent&&i.parent.remove(i)})}function Dh(t,e,i,n,o,a,s,l){var h=e.getItemVisual(i,"color"),u=e.getItemVisual(i,"opacity"),c=n.getModel("itemStyle"),d=n.getModel("emphasis.itemStyle").getBarItemStyle();l||t.setShape("r",c.get("barBorderRadius")||0),t.useStyle(r({fill:h,opacity:u},c.getBarItemStyle()));var f=n.getShallow("cursor");f&&t.attr("cursor",f);var p=s?o.height>0?"bottom":"top":o.width>0?"left":"right";l||Mh(t.style,d,n,h,a,i,p),to(t,d)}function Ch(t,e){var i=t.get(nA)||0;return Math.min(i,Math.abs(e.width),Math.abs(e.height))}function Lh(t,e,i,n){var o=e.getData(),a=this.dataIndex,r=o.getName(a),s=e.get("selectedOffset");n.dispatchAction({type:"pieToggleSelect",from:t,name:r,seriesId:e.id}),o.each(function(t){kh(o.getItemGraphicEl(t),o.getItemLayout(t),e.isSelected(o.getName(t)),s,i)})}function kh(t,e,i,n,o){var a=(e.startAngle+e.endAngle)/2,r=Math.cos(a),s=Math.sin(a),l=i?n:0,h=[r*l,s*l];o?t.animate().when(200,{position:h}).start("bounceOut"):t.attr("position",h)}function Ph(t,e){function i(){a.ignore=a.hoverIgnore,r.ignore=r.hoverIgnore}function n(){a.ignore=a.normalIgnore,r.ignore=r.normalIgnore}S_.call(this);var o=new Ob({z2:2}),a=new Bb,r=new Cb;this.add(o),this.add(a),this.add(r),this.updateData(t,e,!0),this.on("emphasis",i).on("normal",n).on("mouseover",i).on("mouseout",n)}function Oh(t,e,i,n,o,a,r){function s(e,i){for(var n=e;n>=0&&(t[n].y-=i,!(n>0&&t[n].y>t[n-1].y+t[n-1].height));n--);}function l(t,e,i,n,o,a){for(var r=e?Number.MAX_VALUE:0,s=0,l=t.length;s<l;s++)if("center"!==t[s].position){var h=Math.abs(t[s].y-n),u=t[s].len,c=t[s].len2,d=h<o+u?Math.sqrt((o+u+c)*(o+u+c)-h*h):Math.abs(t[s].x-i);e&&d>=r&&(d=r-10),!e&&d<=r&&(d=r+10),t[s].x=i+d*a,r=d}}t.sort(function(t,e){return t.y-e.y});for(var h,u=0,c=t.length,d=[],f=[],p=0;p<c;p++)(h=t[p].y-u)<0&&function(e,i,n,o){for(var a=e;a<i;a++)if(t[a].y+=n,a>e&&a+1<i&&t[a+1].y>t[a].y+t[a].height)return void s(a,n/2);s(i-1,n/2)}(p,c,-h),u=t[p].y+t[p].height;r-u<0&&s(c-1,u-r);for(p=0;p<c;p++)t[p].y>=i?f.push(t[p]):d.push(t[p]);l(d,!1,e,i,n,o),l(f,!0,e,i,n,o)}function Nh(t,e,i,n,o,a){for(var r=[],s=[],l=0;l<t.length;l++)t[l].x<e?r.push(t[l]):s.push(t[l]);Oh(s,e,i,n,1,o,a),Oh(r,e,i,n,-1,o,a);for(l=0;l<t.length;l++){var h=t[l].linePoints;if(h){var u=h[1][0]-h[2][0];t[l].x<e?h[2][0]=t[l].x+3:h[2][0]=t[l].x-3,h[1][1]=h[2][1]=t[l].y,h[1][0]=h[2][0]+u}}}function Eh(){this.group=new S_}function zh(t,e,i){nT.call(this,t,e,i),this.type="value",this.angle=0,this.name="",this.model}function Rh(t,e,i){this._model=t,this.dimensions=[],this._indicatorAxes=f(t.getIndicatorModels(),function(t,e){var i="indicator_"+e,n=new zh(i,new AI);return n.name=t.get("name"),n.model=t,t.axis=n,this.dimensions.push(i),n},this),this.resize(t,i),this.cx,this.cy,this.r,this.startAngle}function Bh(t,e){return r({show:e},t)}function Vh(t){return y(t)||(t=[+t,+t]),t}function Gh(t,e,i){Hh(t)[e]=i}function Wh(t,e,i){var n=Hh(t);n[e]===i&&(n[e]=null)}function Fh(t,e){return!!Hh(t)[e]}function Hh(t){return t[bA]||(t[bA]={})}function Zh(t){this.pointerChecker,this._zr=t,this._opt={};var e=m,n=e(Uh,this),o=e(jh,this),a=e(Xh,this),s=e(Yh,this),l=e(qh,this);Hx.call(this),this.setPointerChecker=function(t){this.pointerChecker=t},this.enable=function(e,h){this.disable(),this._opt=r(i(h)||{},{zoomOnMouseWheel:!0,moveOnMouseMove:!0,preventDefaultMouseMove:!0}),null==e&&(e=!0),!0!==e&&"move"!==e&&"pan"!==e||(t.on("mousedown",n),t.on("mousemove",o),t.on("mouseup",a)),!0!==e&&"scale"!==e&&"zoom"!==e||(t.on("mousewheel",s),t.on("pinch",l))},this.disable=function(){t.off("mousedown",n),t.off("mousemove",o),t.off("mouseup",a),t.off("mousewheel",s),t.off("pinch",l)},this.dispose=this.disable,this.isDragging=function(){return this._dragging},this.isPinching=function(){return this._pinching}}function Uh(t){if(!(ci(t)||t.target&&t.target.draggable)){var e=t.offsetX,i=t.offsetY;this.pointerChecker&&this.pointerChecker(t,e,i)&&(this._x=e,this._y=i,this._dragging=!0)}}function jh(t){if(!ci(t)&&Kh(this,"moveOnMouseMove",t)&&this._dragging&&"pinch"!==t.gestureEvent&&!Fh(this._zr,"globalPan")){var e=t.offsetX,i=t.offsetY,n=this._x,o=this._y,a=e-n,r=i-o;this._x=e,this._y=i,this._opt.preventDefaultMouseMove&&Q_(t.event),this.trigger("pan",a,r,n,o,e,i)}}function Xh(t){ci(t)||(this._dragging=!1)}function Yh(t){if(Kh(this,"zoomOnMouseWheel",t)&&0!==t.wheelDelta){var e=t.wheelDelta>0?1.1:1/1.1;$h.call(this,t,e,t.offsetX,t.offsetY)}}function qh(t){if(!Fh(this._zr,"globalPan")){var e=t.pinchScale>1?1.1:1/1.1;$h.call(this,t,e,t.pinchX,t.pinchY)}}function $h(t,e,i,n){this.pointerChecker&&this.pointerChecker(t,i,n)&&(Q_(t.event),this.trigger("zoom",e,i,n))}function Kh(t,e,i){var n=t._opt[e];return n&&(!_(n)||i.event[n+"Key"])}function Jh(t,e,i){var n=t.target,o=n.position;o[0]+=e,o[1]+=i,n.dirty()}function Qh(t,e,i,n){var o=t.target,a=t.zoomLimit,r=o.position,s=o.scale,l=t.zoom=t.zoom||1;if(l*=e,a){var h=a.min||0,u=a.max||1/0;l=Math.max(Math.min(u,l),h)}var c=l/t.zoom;t.zoom=l,r[0]-=(i-r[0])*(c-1),r[1]-=(n-r[1])*(c-1),s[0]*=c,s[1]*=c,o.dirty()}function tu(t,e,i){var n=e.getComponentByElement(t.topTarget),o=n&&n.coordinateSystem;return n&&n!==i&&!SA[n.mainType]&&o&&o.model!==i}function eu(t,e){var i=t.getItemStyle(),n=t.get("areaColor");return null!=n&&(i.fill=n),i}function iu(t,e,i,n,o){i.off("click"),i.off("mousedown"),e.get("selectedMode")&&(i.on("mousedown",function(){t._mouseDownFlag=!0}),i.on("click",function(a){if(t._mouseDownFlag){t._mouseDownFlag=!1;for(var r=a.target;!r.__regions;)r=r.parent;if(r){var s={type:("geo"===e.mainType?"geo":"map")+"ToggleSelect",batch:f(r.__regions,function(t){return{name:t.name,from:o.uid}})};s[e.mainType+"Id"]=e.id,n.dispatchAction(s),nu(e,i)}}}))}function nu(t,e){e.eachChild(function(e){d(e.__regions,function(i){e.trigger(t.isSelected(i.name)?"emphasis":"normal")})})}function ou(t,e){var i=new S_;this._controller=new Zh(t.getZr()),this._controllerHost={target:e?i:null},this.group=i,this._updateGroup=e,this._mouseDownFlag}function au(t,e,i){var n=t.getZoom(),o=t.getCenter(),a=e.zoom,r=t.dataToPoint(o);if(null!=e.dx&&null!=e.dy){r[0]-=e.dx,r[1]-=e.dy;o=t.pointToData(r);t.setCenter(o)}if(null!=a){if(i){var s=i.min||0,l=i.max||1/0;a=Math.max(Math.min(n*a,l),s)/n}t.scale[0]*=a,t.scale[1]*=a;var h=t.position,u=(e.originX-h[0])*(a-1),c=(e.originY-h[1])*(a-1);h[0]-=u,h[1]-=c,t.updateTransform();o=t.pointToData(r);t.setCenter(o),t.setZoom(a*n)}return{center:t.getCenter(),zoom:t.getZoom()}}function ru(){Kx.call(this)}function su(t){this.name=t,this.zoomLimit,Kx.call(this),this._roamTransformable=new ru,this._rawTransformable=new ru,this._center,this._zoom}function lu(t,e,i,n){var o=i.seriesModel,a=o?o.coordinateSystem:null;return a===this?a[t](n):null}function hu(t,e,i,n,o){su.call(this,t),this.map=e,this._nameCoordMap=z(),this.loadGeoJson(i,n,o)}function uu(t,e,i,n){var o=i.geoModel,a=i.seriesModel,r=o?o.coordinateSystem:a?a.coordinateSystem||(a.getReferringComponents("geo")[0]||{}).coordinateSystem:null;return r===this?r[t](n):null}function cu(t,e){var i=t.get("boundingCoords");if(null!=i){var n=i[0],o=i[1];isNaN(n[0])||isNaN(n[1])||isNaN(o[0])||isNaN(o[1])||this.setBoundingRect(n[0],n[1],o[0]-n[0],o[1]-n[1])}var a,r=this.getBoundingRect(),s=t.get("layoutCenter"),l=t.get("layoutSize"),h=e.getWidth(),u=e.getHeight(),c=t.get("aspectScale")||.75,d=r.width/r.height*c,f=!1;s&&l&&(s=[To(s[0],h),To(s[1],u)],l=To(l,Math.min(h,u)),isNaN(s[0])||isNaN(s[1])||isNaN(l)||(f=!0));if(f){var p={};d>1?(p.width=l,p.height=l/d):(p.height=l,p.width=l*d),p.y=s[1]-p.height/2,p.x=s[0]-p.width/2}else(a=t.getBoxLayoutParams()).aspect=d,p=Ko(a,{width:h,height:u});this.setViewRect(p.x,p.y,p.width,p.height),this.setCenter(t.get("center")),this.setZoom(t.get("zoom"))}function du(t,e){d(e.get("geoCoord"),function(e,i){t.addGeoCoord(i,e)})}function fu(t,e){var i={};return d(t,function(t){t.each(t.mapDimension("value"),function(e,n){var o="ec-"+t.getName(n);i[o]=i[o]||[],isNaN(e)||i[o].push(e)})}),t[0].map(t[0].mapDimension("value"),function(n,o){for(var a="ec-"+t[0].getName(o),r=0,s=1/0,l=-1/0,h=i[a].length,u=0;u<h;u++)s=Math.min(s,i[a][u]),l=Math.max(l,i[a][u]),r+=i[a][u];var c;return c="min"===e?s:"max"===e?l:"average"===e?r/h:r,0===h?NaN:c})}function pu(t){var e=t.mainData,i=t.datas;i||(i={main:e},t.datasAttr={main:"data"}),t.datas=t.mainData=null,_u(e,i,t),NA(i,function(i){NA(e.TRANSFERABLE_METHODS,function(e){i.wrapMethod(e,v(gu,t))})}),e.wrapMethod("cloneShallow",v(vu,t)),NA(e.CHANGABLE_METHODS,function(i){e.wrapMethod(i,v(mu,t))}),k(i[e.dataType]===e)}function gu(t,e){if(xu(this)){var i=a({},this[EA]);i[this.dataType]=e,_u(e,i,t)}else wu(e,this.dataType,this[zA],t);return e}function mu(t,e){return t.struct&&t.struct.update(this),e}function vu(t,e){return NA(e[EA],function(i,n){i!==e&&wu(i.cloneShallow(),n,e,t)}),e}function yu(t){var e=this[zA];return null==t||null==e?e:e[EA][t]}function xu(t){return t[zA]===t}function _u(t,e,i){t[EA]={},NA(e,function(e,n){wu(e,n,t,i)})}function wu(t,e,i,n){i[EA][e]=t,t[zA]=i,t.dataType=e,n.struct&&(t[n.structAttr]=n.struct,n.struct[n.datasAttr[e]]=t),t.getLinkedData=yu}function bu(t,e,i){this.root,this.data,this._nodes=[],this.hostModel=t,this.levelModels=f(e||[],function(e){return new _o(e,t,t.ecModel)}),this.leavesModel=new _o(i||{},t,t.ecModel)}function Su(t,e){var i=e.children;t.parentNode!==e&&(i.push(t),t.parentNode=e)}function Mu(t){t.hierNode={defaultAncestor:null,ancestor:t,prelim:0,modifier:0,change:0,shift:0,i:0,thread:null};for(var e,i,n=[t];e=n.pop();)if(i=e.children,e.isExpand&&i.length)for(var o=i.length-1;o>=0;o--){var a=i[o];a.hierNode={defaultAncestor:null,ancestor:a,prelim:0,modifier:0,change:0,shift:0,i:o,thread:null},n.push(a)}}function Iu(t,e){var i=t.isExpand?t.children:[],n=t.parentNode.children,o=t.hierNode.i?n[t.hierNode.i-1]:null;if(i.length){Lu(t);var a=(i[0].hierNode.prelim+i[i.length-1].hierNode.prelim)/2;o?(t.hierNode.prelim=o.hierNode.prelim+e(t,o),t.hierNode.modifier=t.hierNode.prelim-a):t.hierNode.prelim=a}else o&&(t.hierNode.prelim=o.hierNode.prelim+e(t,o));t.parentNode.hierNode.defaultAncestor=ku(t,o,t.parentNode.hierNode.defaultAncestor||n[0],e)}function Tu(t){var e=t.hierNode.prelim+t.parentNode.hierNode.modifier;t.setLayout({x:e},!0),t.hierNode.modifier+=t.parentNode.hierNode.modifier}function Au(t){return arguments.length?t:zu}function Du(t,e){var i={};return t-=Math.PI/2,i.x=e*Math.cos(t),i.y=e*Math.sin(t),i}function Cu(t,e){return Ko(t.getBoxLayoutParams(),{width:e.getWidth(),height:e.getHeight()})}function Lu(t){for(var e=t.children,i=e.length,n=0,o=0;--i>=0;){var a=e[i];a.hierNode.prelim+=n,a.hierNode.modifier+=n,o+=a.hierNode.change,n+=a.hierNode.shift+o}}function ku(t,e,i,n){if(e){for(var o=t,a=t,r=a.parentNode.children[0],s=e,l=o.hierNode.modifier,h=a.hierNode.modifier,u=r.hierNode.modifier,c=s.hierNode.modifier;s=Pu(s),a=Ou(a),s&&a;){o=Pu(o),r=Ou(r),o.hierNode.ancestor=t;var d=s.hierNode.prelim+c-a.hierNode.prelim-h+n(s,a);d>0&&(Eu(Nu(s,t,i),t,d),h+=d,l+=d),c+=s.hierNode.modifier,h+=a.hierNode.modifier,l+=o.hierNode.modifier,u+=r.hierNode.modifier}s&&!Pu(o)&&(o.hierNode.thread=s,o.hierNode.modifier+=c-l),a&&!Ou(r)&&(r.hierNode.thread=a,r.hierNode.modifier+=h-u,i=t)}return i}function Pu(t){var e=t.children;return e.length&&t.isExpand?e[e.length-1]:t.hierNode.thread}function Ou(t){var e=t.children;return e.length&&t.isExpand?e[0]:t.hierNode.thread}function Nu(t,e,i){return t.hierNode.ancestor.parentNode===e.parentNode?t.hierNode.ancestor:i}function Eu(t,e,i){var n=i/(e.hierNode.i-t.hierNode.i);e.hierNode.change-=n,e.hierNode.shift+=i,e.hierNode.modifier+=i,e.hierNode.prelim+=i,t.hierNode.change+=n}function zu(t,e){return t.parentNode===e.parentNode?1:2}function Ru(t,e){var i=t.getItemLayout(e);return i&&!isNaN(i.x)&&!isNaN(i.y)&&"none"!==t.getItemVisual(e,"symbol")}function Bu(t,e,i){return i.itemModel=e,i.itemStyle=e.getModel("itemStyle").getItemStyle(),i.hoverItemStyle=e.getModel("emphasis.itemStyle").getItemStyle(),i.lineStyle=e.getModel("lineStyle").getLineStyle(),i.labelModel=e.getModel("label"),i.hoverLabelModel=e.getModel("emphasis.label"),!1===t.isExpand&&0!==t.children.length?i.symbolInnerColor=i.itemStyle.fill:i.symbolInnerColor="#fff",i}function Vu(t,e,i,n,o,a){var s=!i,l=t.tree.getNodeByDataIndex(e),a=Bu(l,l.getModel(),a),h=t.tree.root,u=l.parentNode===h?l:l.parentNode||l,c=t.getItemGraphicEl(u.dataIndex),d=u.getLayout(),f=c?{x:c.position[0],y:c.position[1],rawX:c.__radialOldRawX,rawY:c.__radialOldRawY}:d,p=l.getLayout();s?(i=new bl(t,e,a)).attr("position",[f.x,f.y]):i.updateData(t,e,a),i.__radialOldRawX=i.__radialRawX,i.__radialOldRawY=i.__radialRawY,i.__radialRawX=p.rawX,i.__radialRawY=p.rawY,n.add(i),t.setItemGraphicEl(e,i),co(i,{position:[p.x,p.y]},o);var g=i.getSymbolPath();if("radial"===a.layout){var m,v,y=h.children[0],x=y.getLayout(),_=y.children.length;if(p.x===x.x&&!0===l.isExpand){var w={};w.x=(y.children[0].getLayout().x+y.children[_-1].getLayout().x)/2,w.y=(y.children[0].getLayout().y+y.children[_-1].getLayout().y)/2,(m=Math.atan2(w.y-x.y,w.x-x.x))<0&&(m=2*Math.PI+m),(v=w.x<x.x)&&(m-=Math.PI)}else(m=Math.atan2(p.y-x.y,p.x-x.x))<0&&(m=2*Math.PI+m),0===l.children.length||0!==l.children.length&&!1===l.isExpand?(v=p.x<x.x)&&(m-=Math.PI):(v=p.x>x.x)||(m-=Math.PI);var b=v?"left":"right";g.setStyle({textPosition:b,textRotation:-m,textOrigin:"center",verticalAlign:"middle"})}if(l.parentNode&&l.parentNode!==h){var S=i.__edge;S||(S=i.__edge=new Fb({shape:Wu(a,f,f),style:r({opacity:0},a.lineStyle)})),co(S,{shape:Wu(a,d,p),style:{opacity:1}},o),n.add(S)}}function Gu(t,e,i,n,o,a){for(var r,s=t.tree.getNodeByDataIndex(e),l=t.tree.root,a=Bu(s,s.getModel(),a),h=s.parentNode===l?s:s.parentNode||s;null==(r=h.getLayout());)h=h.parentNode===l?h:h.parentNode||h;co(i,{position:[r.x+1,r.y+1]},o,function(){n.remove(i),t.setItemGraphicEl(e,null)}),i.fadeOut(null,{keepLabel:!0});var u=i.__edge;u&&co(u,{shape:Wu(a,r,r),style:{opacity:0}},o,function(){n.remove(u)})}function Wu(t,e,i){var n,o,a,r,s=t.orient;if("radial"===t.layout){var l=e.rawX,h=e.rawY,u=i.rawX,c=i.rawY,d=Du(l,h),f=Du(l,h+(c-h)*t.curvature),p=Du(u,c+(h-c)*t.curvature),g=Du(u,c);return{x1:d.x,y1:d.y,x2:g.x,y2:g.y,cpx1:f.x,cpy1:f.y,cpx2:p.x,cpy2:p.y}}var l=e.x,h=e.y,u=i.x,c=i.y;return"horizontal"===s&&(n=l+(u-l)*t.curvature,o=h,a=u+(l-u)*t.curvature,r=c),"vertical"===s&&(n=l,o=h+(c-h)*t.curvature,a=u,r=c+(h-c)*t.curvature),{x1:l,y1:h,x2:u,y2:c,cpx1:n,cpy1:o,cpx2:a,cpy2:r}}function Fu(t,e,i){for(var n,o=[t],a=[];n=o.pop();)if(a.push(n),n.isExpand){var r=n.children;if(r.length)for(var s=0;s<r.length;s++)o.push(r[s])}for(;n=a.pop();)e(n,i)}function Hu(t,e){for(var i,n=[t];i=n.pop();)if(e(i),i.isExpand){var o=i.children;if(o.length)for(var a=o.length-1;a>=0;a--)n.push(o[a])}}function Zu(t,e,i){if(t&&l(e,t.type)>=0){var n=i.getData().tree.root,o=t.targetNode;if(o&&n.contains(o))return{node:o};var a=t.targetNodeId;if(null!=a&&(o=n.getNodeById(a)))return{node:o}}}function Uu(t){for(var e=[];t;)(t=t.parentNode)&&e.push(t);return e.reverse()}function ju(t,e){return l(Uu(t),e)>=0}function Xu(t,e){for(var i=[];t;){var n=t.dataIndex;i.push({name:t.name,dataIndex:n,value:e.getRawValue(n)}),t=t.parentNode}return i.reverse(),i}function Yu(t){var e=0;d(t.children,function(t){Yu(t);var i=t.value;y(i)&&(i=i[0]),e+=i});var i=t.value;y(i)&&(i=i[0]),(null==i||isNaN(i))&&(i=e),i<0&&(i=0),y(t.value)?t.value[0]=i:t.value=i}function qu(t,e){var i=e.get("color");if(i){var n;return d(t=t||[],function(t){var e=new _o(t),i=e.get("color");(e.get("itemStyle.color")||i&&"none"!==i)&&(n=!0)}),n||((t[0]||(t[0]={})).color=i.slice()),t}}function $u(t){this.group=new S_,t.add(this.group)}function Ku(t,e,i,n,o,a){var r=[[o?t:t-VA,e],[t+i,e],[t+i,e+n],[o?t:t-VA,e+n]];return!a&&r.splice(2,0,[t+i+VA,e+n/2]),!o&&r.push([t,e+n/2]),r}function Ju(t,e,i){t.eventData={componentType:"series",componentSubType:"treemap",seriesIndex:e.componentIndex,seriesName:e.name,seriesType:"treemap",selfType:"breadcrumb",nodeData:{dataIndex:i&&i.dataIndex,name:i&&i.name},treePathInfo:i&&Xu(i,e)}}function Qu(){var t,e=[],i={};return{add:function(t,n,o,a,r){return _(a)&&(r=a,a=0),!i[t.id]&&(i[t.id]=1,e.push({el:t,target:n,time:o,delay:a,easing:r}),!0)},done:function(e){return t=e,this},start:function(){for(var n=e.length,o=0,a=e.length;o<a;o++){var r=e[o];r.el.animateTo(r.target,r.time,r.delay,r.easing,function(){--n||(e.length=0,i={},t&&t())})}return this}}}function tc(t,e,n,o,r,s,l,h,u,c){function d(t,e){w?!t.invisible&&s.push(t):(e(),t.__tmWillVisible||(t.invisible=!1))}function f(e,n,o,a,r,s){var h=l.getModel(),u=T(t.getFormattedLabel(l.dataIndex,"normal",null,null,s?"upperLabel":"label"),h.get("name"));if(!s&&v.isLeafRoot){var c=t.get("drillDownIcon",!0);u=c?c+" "+u:u}var d=h.getModel(s?jA:ZA),f=h.getModel(s?XA:UA),p=d.getShallow("show");eo(e,n,d,f,{defaultText:p?u:null,autoColor:o,isRectText:!0}),s&&(e.textRect=i(s)),e.truncate=p&&d.get("ellipsis")?{outerWidth:a,outerHeight:r,minChar:2}:null}function p(t,i,o,a){var s=null!=S&&n[t][S],l=r[t];return s?(n[t][S]=null,g(l,s,t)):w||((s=new i({z:ec(o,a)})).__tmDepth=o,s.__tmStorageName=t,m(l,s,t)),e[t][b]=s}function g(t,e,i){(t[b]={}).old="nodeGroup"===i?e.position.slice():a({},e.shape)}function m(t,e,i){var n=t[b]={},a=l.parentNode;if(a&&(!o||"drillDown"===o.direction)){var s=0,h=0,u=r.background[a.getRawIndex()];!o&&u&&u.old&&(s=u.old.width,h=u.old.height),n.old="nodeGroup"===i?[0,h]:{x:s,y:h,width:0,height:0}}n.fadein="nodeGroup"!==i}if(l){var v=l.getLayout();if(v&&v.isInView){var y=v.width,x=v.height,_=v.borderWidth,w=v.invisible,b=l.getRawIndex(),S=h&&h.getRawIndex(),M=l.viewChildren,I=v.upperHeight,A=M&&M.length,D=l.getModel("itemStyle"),C=l.getModel("emphasis.itemStyle"),L=p("nodeGroup",WA);if(L){if(u.add(L),L.attr("position",[v.x||0,v.y||0]),L.__tmNodeWidth=y,L.__tmNodeHeight=x,v.isAboveViewRoot)return L;var k=p("background",FA,c,qA);if(k&&function(e,i,n){i.dataIndex=l.dataIndex,i.seriesIndex=t.seriesIndex,i.setShape({x:0,y:0,width:y,height:x});var o=l.getVisual("borderColor",!0),a=C.get("borderColor");d(i,function(){var t=JA(D);t.fill=o;var e=KA(C);if(e.fill=a,n){var r=y-2*_;f(t,e,o,r,I,{x:_,y:0,width:r,height:I})}else t.text=e.text=null;i.setStyle(t),to(i,e)}),e.add(i)}(L,k,A&&v.upperHeight),!A){var P=p("content",FA,c,$A);P&&function(e,i){i.dataIndex=l.dataIndex,i.seriesIndex=t.seriesIndex;var n=Math.max(y-2*_,0),o=Math.max(x-2*_,0);i.culling=!0,i.setShape({x:_,y:_,width:n,height:o});var a=l.getVisual("color",!0);d(i,function(){var t=JA(D);t.fill=a;var e=KA(C);f(t,e,a,n,o),i.setStyle(t),to(i,e)}),e.add(i)}(L,P)}return L}}}}function ec(t,e){var i=t*YA+e;return(i-1)/i}function ic(t){var e=t.pieceList;t.hasSpecialVisual=!1,d(e,function(e,i){e.originIndex=i,null!=e.visual&&(t.hasSpecialVisual=!0)})}function nc(t){var e=t.categories,i=t.visual,n=t.categoryMap={};if(eD(e,function(t,e){n[t]=e}),!y(i)){var o=[];w(i)?eD(i,function(t,e){var i=n[e];o[null!=i?i:nD]=t}):o[nD]=i,i=dc(t,o)}for(var a=e.length-1;a>=0;a--)null==i[a]&&(delete n[e[a]],e.pop())}function oc(t,e){var i=t.visual,n=[];w(i)?eD(i,function(t){n.push(t)}):null!=i&&n.push(i);var o={color:1,symbol:1};e||1!==n.length||o.hasOwnProperty(t.type)||(n[1]=n[0]),dc(t,n)}function ac(t){return{applyVisual:function(e,i,n){e=this.mapValueToVisual(e),n("color",t(i("color"),e))},_doMap:uc([0,1])}}function rc(t){var e=this.option.visual;return e[Math.round(Io(t,[0,1],[0,e.length-1],!0))]||{}}function sc(t){return function(e,i,n){n(t,this.mapValueToVisual(e))}}function lc(t){var e=this.option.visual;return e[this.option.loop&&t!==nD?t%e.length:t]}function hc(){return this.option.visual[0]}function uc(t){return{linear:function(e){return Io(e,t,this.option.visual,!0)},category:lc,piecewise:function(e,i){var n=cc.call(this,i);return null==n&&(n=Io(e,t,this.option.visual,!0)),n},fixed:hc}}function cc(t){var e=this.option,i=e.pieceList;if(e.hasSpecialVisual){var n=i[oD.findPieceIndex(t,i)];if(n&&n.visual)return n.visual[this.type]}}function dc(t,e){return t.visual=e,"color"===t.type&&(t.parsedVisual=f(e,function(t){return Dt(t)})),e}function fc(t,e,i){return t?e<=i:e<i}function pc(t,e,i,n,o,a){var r=t.getModel(),s=t.getLayout();if(s&&!s.invisible&&s.isInView){var l,h=t.getModel(lD),u=gc(h,e,i[t.depth],n),c=h.get("borderColor"),f=h.get("borderColorSaturation");null!=f&&(c=vc(f,l=mc(u))),t.setVisual("borderColor",c);var p=t.viewChildren;if(p&&p.length){var g=xc(t,r,s,h,u,p);d(p,function(t,e){(t.depth>=o.length||t===o[t.depth])&&pc(t,wc(r,u,t,e,g,a),i,n,o,a)})}else l=mc(u),t.setVisual("color",l)}}function gc(t,e,i,n){var o=a({},e);return d(["color","colorAlpha","colorSaturation"],function(a){var r=t.get(a,!0);null==r&&i&&(r=i[a]),null==r&&(r=e[a]),null==r&&(r=n.get(a)),null!=r&&(o[a]=r)}),o}function mc(t){var e=yc(t,"color");if(e){var i=yc(t,"colorAlpha"),n=yc(t,"colorSaturation");return n&&(e=Et(e,null,null,n)),i&&(e=zt(e,i)),e}}function vc(t,e){return null!=e?Et(e,null,null,t):null}function yc(t,e){var i=t[e];if(null!=i&&"none"!==i)return i}function xc(t,e,i,n,o,a){if(a&&a.length){var r=_c(e,"color")||null!=o.color&&"none"!==o.color&&(_c(e,"colorAlpha")||_c(e,"colorSaturation"));if(r){var s=e.get("visualMin"),l=e.get("visualMax"),h=i.dataExtent.slice();null!=s&&s<h[0]&&(h[0]=s),null!=l&&l>h[1]&&(h[1]=l);var u=e.get("colorMappingBy"),c={type:r.name,dataExtent:h,visual:r.range};"color"!==c.type||"index"!==u&&"id"!==u?c.mappingMethod="linear":(c.mappingMethod="category",c.loop=!0);var d=new oD(c);return d.__drColorMappingBy=u,d}}}function _c(t,e){var i=t.get(e);return sD(i)&&i.length?{name:e,range:i}:null}function wc(t,e,i,n,o,r){var s=a({},e);if(o){var l=o.type,h="color"===l&&o.__drColorMappingBy,u="index"===h?n:"id"===h?r.mapIdToIndex(i.getId()):i.getValue(t.get("visualDimension"));s[l]=o.mapValueToVisual(u)}return s}function bc(t,e,i,n){var o,a;if(!t.isRemoved()){var r=t.getLayout();o=r.width,a=r.height;var s=(f=t.getModel()).get(pD),l=f.get(gD)/2,h=Pc(f),u=Math.max(s,h),c=s-l,d=u-l,f=t.getModel();t.setLayout({borderWidth:s,upperHeight:u,upperLabelHeight:h},!0);var p=(o=uD(o-2*c,0))*(a=uD(a-c-d,0)),g=Sc(t,f,p,e,i,n);if(g.length){var m={x:c,y:d,width:o,height:a},v=cD(o,a),y=1/0,x=[];x.area=0;for(var _=0,w=g.length;_<w;){var b=g[_];x.push(b),x.area+=b.getLayout().area;var S=Ac(x,v,e.squareRatio);S<=y?(_++,y=S):(x.area-=x.pop().getLayout().area,Dc(x,v,m,l,!1),v=cD(m.width,m.height),x.length=x.area=0,y=1/0)}if(x.length&&Dc(x,v,m,l,!0),!i){var M=f.get("childrenVisibleMin");null!=M&&p<M&&(i=!0)}for(var _=0,w=g.length;_<w;_++)bc(g[_],e,i,n+1)}}}function Sc(t,e,i,n,o,a){var r=t.children||[],s=n.sort;"asc"!==s&&"desc"!==s&&(s=null);var l=null!=n.leafDepth&&n.leafDepth<=a;if(o&&!l)return t.viewChildren=[];Ic(r=g(r,function(t){return!t.isRemoved()}),s);var h=Tc(e,r,s);if(0===h.sum)return t.viewChildren=[];if(h.sum=Mc(e,i,h.sum,s,r),0===h.sum)return t.viewChildren=[];for(var u=0,c=r.length;u<c;u++){var d=r[u].getValue()/h.sum*i;r[u].setLayout({area:d})}return l&&(r.length&&t.setLayout({isLeafRoot:!0},!0),r.length=0),t.viewChildren=r,t.setLayout({dataExtent:h.dataExtent},!0),r}function Mc(t,e,i,n,o){if(!n)return i;for(var a=t.get("visibleMin"),r=o.length,s=r,l=r-1;l>=0;l--){var h=o["asc"===n?r-l-1:l].getValue();h/i*e<a&&(s=l,i-=h)}return"asc"===n?o.splice(0,r-s):o.splice(s,r-s),i}function Ic(t,e){return e&&t.sort(function(t,i){var n="asc"===e?t.getValue()-i.getValue():i.getValue()-t.getValue();return 0===n?"asc"===e?t.dataIndex-i.dataIndex:i.dataIndex-t.dataIndex:n}),t}function Tc(t,e,i){for(var n=0,o=0,a=e.length;o<a;o++)n+=e[o].getValue();var r=t.get("visualDimension");if(e&&e.length)if("value"===r&&i)s=[e[e.length-1].getValue(),e[0].getValue()],"asc"===i&&s.reverse();else{var s=[1/0,-1/0];fD(e,function(t){var e=t.getValue(r);e<s[0]&&(s[0]=e),e>s[1]&&(s[1]=e)})}else s=[NaN,NaN];return{sum:n,dataExtent:s}}function Ac(t,e,i){for(var n,o=0,a=1/0,r=0,s=t.length;r<s;r++)(n=t[r].getLayout().area)&&(n<a&&(a=n),n>o&&(o=n));var l=t.area*t.area,h=e*e*i;return l?uD(h*o/l,l/(h*a)):1/0}function Dc(t,e,i,n,o){var a=e===i.width?0:1,r=1-a,s=["x","y"],l=["width","height"],h=i[s[a]],u=e?t.area/e:0;(o||u>i[l[r]])&&(u=i[l[r]]);for(var c=0,d=t.length;c<d;c++){var f=t[c],p={},g=u?f.getLayout().area/u:0,m=p[l[r]]=uD(u-2*n,0),v=i[s[a]]+i[l[a]]-h,y=c===d-1||v<g?v:g,x=p[l[a]]=uD(y-2*n,0);p[s[r]]=i[s[r]]+cD(n,m/2),p[s[a]]=h+cD(n,x/2),h+=y,f.setLayout(p,!0)}i[s[r]]+=u,i[l[r]]-=u}function Cc(t,e,i,n,o){var a=(e||{}).node,r=[n,o];if(!a||a===i)return r;for(var s,l=n*o,h=l*t.option.zoomToNodeRatio;s=a.parentNode;){for(var u=0,c=s.children,d=0,f=c.length;d<f;d++)u+=c[d].getValue();var p=a.getValue();if(0===p)return r;h*=u/p;var g=s.getModel(),m=g.get(pD);(h+=4*m*m+(3*m+Math.max(m,Pc(g)))*Math.pow(h,.5))>hS&&(h=hS),a=s}h<l&&(h=l);var v=Math.pow(h/l,.5);return[n*v,o*v]}function Lc(t,e,i){if(e)return{x:e.x,y:e.y};var n={x:0,y:0};if(!i)return n;var o=i.node,a=o.getLayout();if(!a)return n;for(var r=[a.width/2,a.height/2],s=o;s;){var l=s.getLayout();r[0]+=l.x,r[1]+=l.y,s=s.parentNode}return{x:t.width/2-r[0],y:t.height/2-r[1]}}function kc(t,e,i,n,o){var a=t.getLayout(),r=i[o],s=r&&r===t;if(!(r&&!s||o===i.length&&t!==n)){t.setLayout({isInView:!0,invisible:!s&&!e.intersect(a),isAboveViewRoot:s},!0);var l=new Kt(e.x-a.x,e.y-a.y,e.width,e.height);fD(t.viewChildren||[],function(t){kc(t,l,i,n,o+1)})}}function Pc(t){return t.get(mD)?t.get(vD):0}function Oc(t){return"_EC_"+t}function Nc(t,e){this.id=null==t?"":t,this.inEdges=[],this.outEdges=[],this.edges=[],this.hostGraph,this.dataIndex=null==e?-1:e}function Ec(t,e,i){this.node1=t,this.node2=e,this.dataIndex=null==i?-1:i}function zc(t){return isNaN(+t.cpx1)||isNaN(+t.cpy1)}function Rc(t){return"_"+t+"Type"}function Bc(t,e,i){var n=e.getItemVisual(i,"color"),o=e.getItemVisual(i,t),a=e.getItemVisual(i,t+"Size");if(o&&"none"!==o){y(a)||(a=[a,a]);var r=dl(o,-a[0]/2,-a[1]/2,a[0],a[1],n);return r.name=t,r}}function Vc(t){var e=new TD({name:"line"});return Gc(e.shape,t),e}function Gc(t,e){var i=e[0],n=e[1],o=e[2];t.x1=i[0],t.y1=i[1],t.x2=n[0],t.y2=n[1],t.percent=1,o?(t.cpx1=o[0],t.cpy1=o[1]):(t.cpx1=NaN,t.cpy1=NaN)}function Wc(t,e,i){S_.call(this),this._createLine(t,e,i)}function Fc(t){this._ctor=t||Wc,this.group=new S_}function Hc(t,e,i,n){if(Xc(e.getItemLayout(i))){var o=new t._ctor(e,i,n);e.setItemGraphicEl(i,o),t.group.add(o)}}function Zc(t,e,i,n,o,a){var r=e.getItemGraphicEl(n);Xc(i.getItemLayout(o))?(r?r.updateData(i,o,a):r=new t._ctor(i,o,a),i.setItemGraphicEl(o,r),t.group.add(r)):t.group.remove(r)}function Uc(t){var e=t.hostModel;return{lineStyle:e.getModel("lineStyle").getLineStyle(),hoverLineStyle:e.getModel("emphasis.lineStyle").getLineStyle(),labelModel:e.getModel("label"),hoverLabelModel:e.getModel("emphasis.label")}}function jc(t){return isNaN(t[0])||isNaN(t[1])}function Xc(t){return!jc(t[0])&&!jc(t[1])}function Yc(t,e,i){for(var n,o=t[0],a=t[1],r=t[2],s=1/0,l=i*i,h=.1,u=.1;u<=.9;u+=.1)LD[0]=OD(o[0],a[0],r[0],u),LD[1]=OD(o[1],a[1],r[1],u),(f=ED(ND(LD,e)-l))<s&&(s=f,n=u);for(var c=0;c<32;c++){var d=n+h;kD[0]=OD(o[0],a[0],r[0],n),kD[1]=OD(o[1],a[1],r[1],n),PD[0]=OD(o[0],a[0],r[0],d),PD[1]=OD(o[1],a[1],r[1],d);var f=ND(kD,e)-l;if(ED(f)<.01)break;var p=ND(PD,e)-l;h/=2,f<0?p>=0?n+=h:n-=h:p>=0?n-=h:n+=h}return n}function qc(t,e){return t.getVisual("opacity")||t.getModel().get(e)}function $c(t,e,i){var n=t.getGraphicEl(),o=qc(t,e);null!=i&&(null==o&&(o=1),o*=i),n.downplay&&n.downplay(),n.traverse(function(t){"group"!==t.type&&t.setStyle("opacity",o)})}function Kc(t,e){var i=qc(t,e),n=t.getGraphicEl();n.highlight&&n.highlight(),n.traverse(function(t){"group"!==t.type&&t.setStyle("opacity",i)})}function Jc(t){return t instanceof Array||(t=[t,t]),t}function Qc(t){var e=t.coordinateSystem;if(!e||"view"===e.type){var i=t.getGraph();i.eachNode(function(t){var e=t.getModel();t.setLayout([+e.get("x"),+e.get("y")])}),td(i)}}function td(t){t.eachEdge(function(t){var e=t.getModel().get("lineStyle.curveness")||0,i=W(t.node1.getLayout()),n=W(t.node2.getLayout()),o=[i,n];+e&&o.push([(i[0]+n[0])/2-(i[1]-n[1])*e,(i[1]+n[1])/2-(n[0]-i[0])*e]),t.setLayout(o)})}function ed(t){var e=t.coordinateSystem;if(!e||"view"===e.type){var i=e.getBoundingRect(),n=t.getData(),o=n.graph,a=0,r=n.getSum("value"),s=2*Math.PI/(r||n.count()),l=i.width/2+i.x,h=i.height/2+i.y,u=Math.min(i.width,i.height)/2;o.eachNode(function(t){var e=t.getValue("value");a+=s*(r?e:1)/2,t.setLayout([u*Math.cos(a)+l,u*Math.sin(a)+h]),a+=s*(r?e:1)/2}),n.setLayout({cx:l,cy:h}),o.eachEdge(function(t){var e,i=t.getModel().get("lineStyle.curveness")||0,n=W(t.node1.getLayout()),o=W(t.node2.getLayout()),a=(n[0]+o[0])/2,r=(n[1]+o[1])/2;+i&&(e=[l*(i*=3)+a*(1-i),h*i+r*(1-i)]),t.setLayout([n,o,e])})}}function id(t,e,i){for(var n=i.rect,o=n.width,a=n.height,r=[n.x+o/2,n.y+a/2],s=null==i.gravity?.1:i.gravity,l=0;l<t.length;l++){var h=t[l];h.p||(h.p=V(o*(Math.random()-.5)+r[0],a*(Math.random()-.5)+r[1])),h.pp=W(h.p),h.edges=null}var u=.6;return{warmUp:function(){u=.5},setFixed:function(e){t[e].fixed=!0},setUnfixed:function(e){t[e].fixed=!1},step:function(i){for(var n=[],o=t.length,a=0;a<e.length;a++){var l=e[a],h=l.n1;U(n,(p=l.n2).p,h.p);var c=j(n)-l.d,d=p.w/(h.w+p.w);isNaN(d)&&(d=0),q(n,n),!h.fixed&&VD(h.p,h.p,n,d*c*u),!p.fixed&&VD(p.p,p.p,n,-(1-d)*c*u)}for(a=0;a<o;a++)(v=t[a]).fixed||(U(n,r,v.p),VD(v.p,v.p,n,s*u));for(a=0;a<o;a++)for(var h=t[a],f=a+1;f<o;f++){var p=t[f];U(n,p.p,h.p),0===(c=j(n))&&(F(n,Math.random()-.5,Math.random()-.5),c=1);var g=(h.rep+p.rep)/c/c;!h.fixed&&VD(h.pp,h.pp,n,g),!p.fixed&&VD(p.pp,p.pp,n,-g)}for(var m=[],a=0;a<o;a++){var v=t[a];v.fixed||(U(m,v.p,v.pp),VD(v.p,v.p,m,u),G(v.pp,v.p))}u*=.992,i&&i(t,e,u<.01)}}}function nd(t,e,i){var n=t.getBoxLayoutParams();return n.aspect=i,Ko(n,{width:e.getWidth(),height:e.getHeight()})}function od(t,e){var i=t.get("center"),n=e.getWidth(),o=e.getHeight(),a=Math.min(n,o);return{cx:To(i[0],e.getWidth()),cy:To(i[1],e.getHeight()),r:To(t.get("radius"),a/2)}}function ad(t,e){return e&&("string"==typeof e?t=e.replace("{value}",null!=t?t:""):"function"==typeof e&&(t=e(t))),t}function rd(t,e){function i(){a.ignore=a.hoverIgnore,r.ignore=r.hoverIgnore}function n(){a.ignore=a.normalIgnore,r.ignore=r.normalIgnore}S_.call(this);var o=new Rb,a=new Bb,r=new Cb;this.add(o),this.add(a),this.add(r),this.updateData(t,e,!0),this.on("emphasis",i).on("normal",n).on("mouseover",i).on("mouseout",n)}function sd(t,e){return Ko(t.getBoxLayoutParams(),{width:e.getWidth(),height:e.getHeight()})}function ld(t,e){for(var i=t.mapDimension("value"),n=t.mapArray(i,function(t){return t}),o=[],a="ascending"===e,r=0,s=t.count();r<s;r++)o[r]=r;return"function"==typeof e?o.sort(e):"none"!==e&&o.sort(function(t,e){return a?n[t]-n[e]:n[e]-n[t]}),o}function hd(t){t.each(function(e){var i,n,o,a,r=t.getItemModel(e),s=r.getModel("label").get("position"),l=r.getModel("labelLine"),h=t.getItemLayout(e),u=h.points,c="inner"===s||"inside"===s||"center"===s;if(c)i="center",a=[[n=(u[0][0]+u[1][0]+u[2][0]+u[3][0])/4,o=(u[0][1]+u[1][1]+u[2][1]+u[3][1])/4],[n,o]];else{var d,f,p,g=l.get("length");"left"===s?(d=(u[3][0]+u[0][0])/2,f=(u[3][1]+u[0][1])/2,n=(p=d-g)-5,i="right"):(d=(u[1][0]+u[2][0])/2,f=(u[1][1]+u[2][1])/2,n=(p=d+g)+5,i="left");var m=f;a=[[d,f],[p,m]],o=m}h.label={linePoints:a,x:n,y:o,verticalAlign:"middle",textAlign:i,inside:c}})}function ud(t){if(!t.parallel){var e=!1;d(t.series,function(t){t&&"parallel"===t.type&&(e=!0)}),e&&(t.parallel=[{}])}}function cd(t){d(Si(t.parallelAxis),function(e){if(w(e)){var i=e.parallelIndex||0,o=Si(t.parallel)[i];o&&o.parallelAxisDefault&&n(e,o.parallelAxisDefault,!1)}})}function dd(t,e){var i=t[e]-t[1-e];return{span:Math.abs(i),sign:i>0?-1:i<0?1:e?-1:1}}function fd(t,e){return Math.min(e[1],Math.max(e[0],t))}function pd(t,e,i){this._axesMap=z(),this._axesLayout={},this.dimensions=t.dimensions,this._rect,this._model=t,this._init(t,e,i)}function gd(t,e){return YD(qD(t,e[0]),e[1])}function md(t,e){var i=e.layoutLength/(e.axisCount-1);return{position:i*t,axisNameAvailableWidth:i,axisLabelShow:!0}}function vd(t,e){var i,n,o=e.layoutLength,a=e.axisExpandWidth,r=e.axisCount,s=e.axisCollapseWidth,l=e.winInnerIndices,h=s,u=!1;return t<l[0]?(i=t*s,n=s):t<=l[1]?(i=e.axisExpandWindow0Pos+t*a-e.axisExpandWindow[0],h=a,u=!0):(i=o-(r-1-t)*s,n=s),{position:i,axisNameAvailableWidth:h,axisLabelShow:u,nameTruncateMaxWidth:n}}function yd(t){Hx.call(this),this._zr=t,this.group=new S_,this._brushType,this._brushOption,this._panels,this._track=[],this._dragging,this._covers=[],this._creatingCover,this._creatingPanel,this._enableGlobalPan,this._uid="brushController_"+gC++,this._handlers={},nC(mC,function(t,e){this._handlers[e]=m(t,this)},this)}function xd(t,e){var o=t._zr;t._enableGlobalPan||Gh(o,cC,t._uid),nC(t._handlers,function(t,e){o.on(e,t)}),t._brushType=e.brushType,t._brushOption=n(i(pC),e,!0)}function _d(t){var e=t._zr;Wh(e,cC,t._uid),nC(t._handlers,function(t,i){e.off(i,t)}),t._brushType=t._brushOption=null}function wd(t,e){var i=vC[e.brushType].createCover(t,e);return i.__brushOption=e,Md(i,e),t.group.add(i),i}function bd(t,e){var i=Td(e);return i.endCreating&&(i.endCreating(t,e),Md(e,e.__brushOption)),e}function Sd(t,e){var i=e.__brushOption;Td(e).updateCoverShape(t,e,i.range,i)}function Md(t,e){var i=e.z;null==i&&(i=lC),t.traverse(function(t){t.z=i,t.z2=i})}function Id(t,e){Td(e).updateCommon(t,e),Sd(t,e)}function Td(t){return vC[t.__brushOption.brushType]}function Ad(t,e,i){var n=t._panels;if(!n)return!0;var o,a=t._transform;return nC(n,function(t){t.isTargetByCursor(e,i,a)&&(o=t)}),o}function Dd(t,e){var i=t._panels;if(!i)return!0;var n=e.__brushOption.panelId;return null==n||i[n]}function Cd(t){var e=t._covers,i=e.length;return nC(e,function(e){t.group.remove(e)},t),e.length=0,!!i}function Ld(t,e){var n=oC(t._covers,function(t){var e=t.__brushOption,n=i(e.range);return{brushType:e.brushType,panelId:e.panelId,range:n}});t.trigger("brush",n,{isEnd:!!e.isEnd,removeOnClick:!!e.removeOnClick})}function kd(t){var e=t._track;if(!e.length)return!1;var i=e[e.length-1],n=e[0],o=i[0]-n[0],a=i[1]-n[1];return sC(o*o+a*a,.5)>hC}function Pd(t){var e=t.length-1;return e<0&&(e=0),[t[0],t[e]]}function Od(t,e,i,n){var o=new S_;return o.add(new Vb({name:"main",style:Rd(i),silent:!0,draggable:!0,cursor:"move",drift:iC(t,e,o,"nswe"),ondragend:iC(Ld,e,{isEnd:!0})})),nC(n,function(i){o.add(new Vb({name:i,style:{opacity:0},draggable:!0,silent:!0,invisible:!0,drift:iC(t,e,o,i),ondragend:iC(Ld,e,{isEnd:!0})}))}),o}function Nd(t,e,i,n){var o=n.brushStyle.lineWidth||0,a=rC(o,uC),r=i[0][0],s=i[1][0],l=r-o/2,h=s-o/2,u=i[0][1],c=i[1][1],d=u-a+o/2,f=c-a+o/2,p=u-r,g=c-s,m=p+o,v=g+o;zd(t,e,"main",r,s,p,g),n.transformable&&(zd(t,e,"w",l,h,a,v),zd(t,e,"e",d,h,a,v),zd(t,e,"n",l,h,m,a),zd(t,e,"s",l,f,m,a),zd(t,e,"nw",l,h,a,a),zd(t,e,"ne",d,h,a,a),zd(t,e,"sw",l,f,a,a),zd(t,e,"se",d,f,a,a))}function Ed(t,e){var i=e.__brushOption,n=i.transformable,o=e.childAt(0);o.useStyle(Rd(i)),o.attr({silent:!n,cursor:n?"move":"default"}),nC(["w","e","n","s","se","sw","ne","nw"],function(i){var o=e.childOfName(i),a=Gd(t,i);o&&o.attr({silent:!n,invisible:!n,cursor:n?fC[a]+"-resize":null})})}function zd(t,e,i,n,o,a,r){var s=e.childOfName(i);s&&s.setShape(Ud(Zd(t,e,[[n,o],[n+a,o+r]])))}function Rd(t){return r({strokeNoScale:!0},t.brushStyle)}function Bd(t,e,i,n){var o=[aC(t,i),aC(e,n)],a=[rC(t,i),rC(e,n)];return[[o[0],a[0]],[o[1],a[1]]]}function Vd(t){return po(t.group)}function Gd(t,e){if(e.length>1)return("e"===(n=[Gd(t,(e=e.split(""))[0]),Gd(t,e[1])])[0]||"w"===n[0])&&n.reverse(),n.join("");var i={left:"w",right:"e",top:"n",bottom:"s"},n=mo({w:"left",e:"right",n:"top",s:"bottom"}[e],Vd(t));return i[n]}function Wd(t,e,i,n,o,a,r,s){var l=n.__brushOption,h=t(l.range),u=Hd(i,a,r);nC(o.split(""),function(t){var e=dC[t];h[e[0]][e[1]]+=u[e[0]]}),l.range=e(Bd(h[0][0],h[1][0],h[0][1],h[1][1])),Id(i,n),Ld(i,{isEnd:!1})}function Fd(t,e,i,n,o){var a=e.__brushOption.range,r=Hd(t,i,n);nC(a,function(t){t[0]+=r[0],t[1]+=r[1]}),Id(t,e),Ld(t,{isEnd:!1})}function Hd(t,e,i){var n=t.group,o=n.transformCoordToLocal(e,i),a=n.transformCoordToLocal(0,0);return[o[0]-a[0],o[1]-a[1]]}function Zd(t,e,n){var o=Dd(t,e);return o&&!0!==o?o.clipPath(n,t._transform):i(n)}function Ud(t){var e=aC(t[0][0],t[1][0]),i=aC(t[0][1],t[1][1]);return{x:e,y:i,width:rC(t[0][0],t[1][0])-e,height:rC(t[0][1],t[1][1])-i}}function jd(t,e,i){if(t._brushType){var n=t._zr,o=t._covers,a=Ad(t,e,i);if(!t._dragging)for(var r=0;r<o.length;r++){var s=o[r].__brushOption;if(a&&(!0===a||s.panelId===a.panelId)&&vC[s.brushType].contain(o[r],i[0],i[1]))return}a&&n.setCursorStyle("crosshair")}}function Xd(t){var e=t.event;e.preventDefault&&e.preventDefault()}function Yd(t,e,i){return t.childOfName("main").contain(e,i)}function qd(t,e,n,o){var a,r=t._creatingCover,s=t._creatingPanel,l=t._brushOption;if(t._track.push(n.slice()),kd(t)||r){if(s&&!r){"single"===l.brushMode&&Cd(t);var h=i(l);h.brushType=$d(h.brushType,s),h.panelId=!0===s?null:s.panelId,r=t._creatingCover=wd(t,h),t._covers.push(r)}if(r){var u=vC[$d(t._brushType,s)];r.__brushOption.range=u.getCreatingRange(Zd(t,r,t._track)),o&&(bd(t,r),u.updateCommon(t,r)),Sd(t,r),a={isEnd:o}}}else o&&"single"===l.brushMode&&l.removeOnClick&&Ad(t,e,n)&&Cd(t)&&(a={isEnd:o,removeOnClick:!0});return a}function $d(t,e){return"auto"===t?e.defaultBrushType:t}function Kd(t){if(this._dragging){Xd(t);var e=qd(this,t,this.group.transformCoordToLocal(t.offsetX,t.offsetY),!0);this._dragging=!1,this._track=[],this._creatingCover=null,e&&Ld(this,e)}}function Jd(t){return{createCover:function(e,i){return Od(iC(Wd,function(e){var i=[e,[0,100]];return t&&i.reverse(),i},function(e){return e[t]}),e,i,[["w","e"],["n","s"]][t])},getCreatingRange:function(e){var i=Pd(e);return[aC(i[0][t],i[1][t]),rC(i[0][t],i[1][t])]},updateCoverShape:function(e,i,n,o){var a,r=Dd(e,i);if(!0!==r&&r.getLinearBrushOtherExtent)a=r.getLinearBrushOtherExtent(t,e._transform);else{var s=e._zr;a=[0,[s.getWidth(),s.getHeight()][1-t]]}var l=[n,a];t&&l.reverse(),Nd(e,i,l,o)},updateCommon:Ed,contain:Yd}}function Qd(t){return t=nf(t),function(e,i){return yo(e,t)}}function tf(t,e){return t=nf(t),function(i){var n=null!=e?e:i,o=n?t.width:t.height,a=n?t.x:t.y;return[a,a+(o||0)]}}function ef(t,e,i){return t=nf(t),function(n,o,a){return t.contain(o[0],o[1])&&!tu(n,e,i)}}function nf(t){return Kt.create(t)}function of(t,e,i){return i&&"axisAreaSelect"===i.type&&e.findComponents({mainType:"parallelAxis",query:i})[0]===t}function af(t){var e=t.axis;return f(t.activeIntervals,function(t){return{brushType:"lineX",panelId:"pl",range:[e.dataToCoord(t[0],!0),e.dataToCoord(t[1],!0)]}})}function rf(t,e){return e.getComponent("parallel",t.get("parallelIndex"))}function sf(t,e){var i=t._model;return i.get("axisExpandable")&&i.get("axisExpandTriggerOn")===e}function lf(t,e){if(!t.encodeDefine){var i=e.ecModel.getComponent("parallel",e.get("parallelIndex"));if(i){var n=t.encodeDefine=z();d(i.dimensions,function(t){var e=hf(t);n.set(t,e)})}}}function hf(t){return+t.replace("dim","")}function uf(t,e,i){var n=t.model,o=t.getRect(),a=new Vb({shape:{x:o.x,y:o.y,width:o.width,height:o.height}}),r="horizontal"===n.get("layout")?"width":"height";return a.setShape(r,0),fo(a,{shape:{width:o.width,height:o.height}},e,i),a}function cf(t,e,i,n){for(var o=[],a=0;a<i.length;a++){var r=i[a],s=t.get(t.mapDimension(r),e);pf(s,n.getAxis(r).type)||o.push(n.dataToPoint(s,r))}return o}function df(t,e,i,n,o){var a=cf(t,i,n,o),r=new Bb({shape:{points:a},silent:!0,z2:10});e.add(r),t.setItemGraphicEl(i,r)}function ff(t,e){var i=t.hostModel.getModel("lineStyle"),n=i.getLineStyle();t.eachItemGraphicEl(function(o,r){if(t.hasItemOption){var s=t.getItemModel(r).getModel("lineStyle",i);n=s.getLineStyle(["color","stroke"])}o.useStyle(a(n,{fill:null,stroke:t.getItemVisual(r,"color"),opacity:t.getItemVisual(r,"opacity")})),o.shape.smooth=e})}function pf(t,e){return"category"===e?null==t:null==t||isNaN(t)}function gf(t,e,i){var n=new Vb({shape:{x:t.x-10,y:t.y-10,width:0,height:t.height+20}});return fo(n,{shape:{width:t.width+20,height:t.height+20}},e,i),n}function mf(){function t(e,n){if(n>=i.length)return e;for(var o=-1,a=e.length,r=i[n++],s={},l={};++o<a;){var h=r(e[o]),u=l[h];u?u.push(e[o]):l[h]=[e[o]]}return d(l,function(e,i){s[i]=t(e,n)}),s}function e(t,o){if(o>=i.length)return t;var a=[],r=n[o++];return d(t,function(t,i){a.push({key:i,values:e(t,o)})}),r?a.sort(function(t,e){return r(t.key,e.key)}):a}var i=[],n=[];return{key:function(t){return i.push(t),this},sortKeys:function(t){return n[i.length-1]=t,this},entries:function(i){return e(t(i,0),0)}}}function vf(t,e){return Ko(t.getBoxLayoutParams(),{width:e.getWidth(),height:e.getHeight()})}function yf(t,e,i,n,o,a,r){_f(t,i,o),Sf(t,e,a,n,r),Lf(t)}function xf(t){d(t,function(t){var e=Of(t.outEdges,Rf),i=Of(t.inEdges,Rf),n=Math.max(e,i);t.setLayout({value:n},!0)})}function _f(t,e,i){for(var n=t,o=null,a=0;n.length;){o=[];for(var r=0,s=n.length;r<s;r++){var l=n[r];l.setLayout({x:a},!0),l.setLayout({dx:e},!0);for(var h=0,u=l.outEdges.length;h<u;h++)o.push(l.outEdges[h].node2)}n=o,++a}wf(t,a),bf(t,(i-e)/(a-1))}function wf(t,e){d(t,function(t){t.outEdges.length||t.setLayout({x:e-1},!0)})}function bf(t,e){d(t,function(t){var i=t.getLayout().x*e;t.setLayout({x:i},!0)})}function Sf(t,e,i,n,o){var a=mf().key(function(t){return t.getLayout().x}).sortKeys(zf).entries(t).map(function(t){return t.values});Mf(t,a,e,i,n),If(a,n,i);for(var r=1;o>0;o--)Tf(a,r*=.99),If(a,n,i),Df(a,r),If(a,n,i)}function Mf(t,e,i,n,o){var a=[];d(e,function(t){var e=t.length,i=0;d(t,function(t){i+=t.getLayout().value});var r=(n-(e-1)*o)/i;a.push(r)}),a.sort(function(t,e){return t-e});var r=a[0];d(e,function(t){d(t,function(t,e){t.setLayout({y:e},!0);var i=t.getLayout().value*r;t.setLayout({dy:i},!0)})}),d(i,function(t){var e=+t.getValue()*r;t.setLayout({dy:e},!0)})}function If(t,e,i){d(t,function(t){var n,o,a,r=0,s=t.length;for(t.sort(Ef),a=0;a<s;a++){if(n=t[a],(o=r-n.getLayout().y)>0){l=n.getLayout().y+o;n.setLayout({y:l},!0)}r=n.getLayout().y+n.getLayout().dy+e}if((o=r-e-i)>0){var l=n.getLayout().y-o;for(n.setLayout({y:l},!0),r=n.getLayout().y,a=s-2;a>=0;--a)(o=(n=t[a]).getLayout().y+n.getLayout().dy+e-r)>0&&(l=n.getLayout().y-o,n.setLayout({y:l},!0)),r=n.getLayout().y}})}function Tf(t,e){d(t.slice().reverse(),function(t){d(t,function(t){if(t.outEdges.length){var i=Of(t.outEdges,Af)/Of(t.outEdges,Rf),n=t.getLayout().y+(i-Nf(t))*e;t.setLayout({y:n},!0)}})})}function Af(t){return Nf(t.node2)*t.getValue()}function Df(t,e){d(t,function(t){d(t,function(t){if(t.inEdges.length){var i=Of(t.inEdges,Cf)/Of(t.inEdges,Rf),n=t.getLayout().y+(i-Nf(t))*e;t.setLayout({y:n},!0)}})})}function Cf(t){return Nf(t.node1)*t.getValue()}function Lf(t){d(t,function(t){t.outEdges.sort(kf),t.inEdges.sort(Pf)}),d(t,function(t){var e=0,i=0;d(t.outEdges,function(t){t.setLayout({sy:e},!0),e+=t.getLayout().dy}),d(t.inEdges,function(t){t.setLayout({ty:i},!0),i+=t.getLayout().dy})})}function kf(t,e){return t.node2.getLayout().y-e.node2.getLayout().y}function Pf(t,e){return t.node1.getLayout().y-e.node1.getLayout().y}function Of(t,e){for(var i=0,n=t.length,o=-1;++o<n;){var a=+e.call(t,t[o],o);isNaN(a)||(i+=a)}return i}function Nf(t){return t.getLayout().y+t.getLayout().dy/2}function Ef(t,e){return t.getLayout().y-e.getLayout().y}function zf(t,e){return t<e?-1:t>e?1:t===e?0:NaN}function Rf(t){return t.getValue()}function Bf(t,e,i,n){S_.call(this),this.bodyIndex,this.whiskerIndex,this.styleUpdater=i,this._createContent(t,e,n),this.updateData(t,e,n),this._seriesModel}function Vf(t,e,i){return f(t,function(t){return t=t.slice(),t[e]=i.initBaseline,t})}function Gf(t){var e={};return d(t,function(t,i){e["ends"+i]=t}),e}function Wf(t){this.group=new S_,this.styleUpdater=t}function Ff(t,e,i){var n=e.getItemModel(i),o=n.getModel(CC),a=e.getItemVisual(i,"color"),r=o.getItemStyle(["borderColor"]),s=t.childAt(t.whiskerIndex);s.style.set(r),s.style.stroke=a,s.dirty();var l=t.childAt(t.bodyIndex);l.style.set(r),l.style.stroke=a,l.dirty(),to(t,n.getModel(LC).getItemStyle())}function Hf(t){var e=[],i=[];return t.eachSeriesByType("boxplot",function(t){var n=t.getBaseAxis(),o=l(i,n);o<0&&(o=i.length,i[o]=n,e[o]={axis:n,seriesModels:[]}),e[o].seriesModels.push(t)}),e}function Zf(t){var e,i,n=t.axis,o=t.seriesModels,a=o.length,r=t.boxWidthList=[],s=t.boxOffsetList=[],l=[];if("category"===n.type)i=n.getBandWidth();else{var h=0;PC(o,function(t){h=Math.max(h,t.getData().count())}),e=n.getExtent(),Math.abs(e[1]-e[0])}PC(o,function(t){var e=t.get("boxWidth");y(e)||(e=[e,e]),l.push([To(e[0],i)||0,To(e[1],i)||0])});var u=.8*i-2,c=u/a*.3,d=(u-c*(a-1))/a,f=d/2-u/2;PC(o,function(t,e){s.push(f),f+=c+d,r.push(Math.min(Math.max(d,l[e][0]),l[e][1]))})}function Uf(t,e,i){var n,o=t.coordinateSystem,a=t.getData(),r=i/2,s=t.get("layout"),l="horizontal"===s?0:1,h=1-l,u=["x","y"],c=[];d(a.dimensions,function(t){var e=a.getDimensionInfo(t).coordDim;e===u[h]?c.push(t):e===u[l]&&(n=t)}),null==n||c.length<5||a.each([n].concat(c),function(){function t(t){var i=[];i[l]=d,i[h]=t;var n;return isNaN(d)||isNaN(t)?n=[NaN,NaN]:(n=o.dataToPoint(i))[l]+=e,n}function i(t,e){var i=t.slice(),n=t.slice();i[l]+=r,n[l]-=r,e?y.push(i,n):y.push(n,i)}function n(t){var e=[t.slice(),t.slice()];e[0][l]-=r,e[1][l]+=r,v.push(e)}var u=arguments,d=u[0],f=u[c.length+1],p=t(u[3]),g=t(u[1]),m=t(u[5]),v=[[g,t(u[2])],[m,t(u[4])]];n(g),n(m),n(p);var y=[];i(v[0][1],0),i(v[1][1],1),a.setItemLayout(f,{chartLayout:s,initBaseline:p[h],median:p,bodyEnds:y,whiskerEnds:v})})}function jf(t,e,i){var n=e.getItemModel(i),o=n.getModel(OC),a=e.getItemVisual(i,"color"),r=e.getItemVisual(i,"borderColor")||a,s=o.getItemStyle(["color","color0","borderColor","borderColor0"]),l=t.childAt(t.whiskerIndex);l.useStyle(s),l.style.stroke=r;var h=t.childAt(t.bodyIndex);h.useStyle(s),h.style.fill=a,h.style.stroke=r,to(t,n.getModel(NC).getItemStyle())}function Xf(t,e){var i,n=t.getBaseAxis(),o="category"===n.type?n.getBandWidth():(i=n.getExtent(),Math.abs(i[1]-i[0])/e.count()),a=To(VC(t.get("barMaxWidth"),o),o),r=To(VC(t.get("barMinWidth"),1),o),s=t.get("barWidth");return null!=s?To(s,o):Math.max(Math.min(o/2,a),r)}function Yf(t){return y(t)||(t=[+t,+t]),t}function qf(t,e){t.eachChild(function(t){t.attr({z:e.z,zlevel:e.zlevel,style:{stroke:"stroke"===e.brushType?e.color:null,fill:"fill"===e.brushType?e.color:null}})})}function $f(t,e){S_.call(this);var i=new bl(t,e),n=new S_;this.add(i),this.add(n),n.beforeUpdate=function(){this.attr(i.getScale())},this.updateData(t,e)}function Kf(t){var e=t.data;e&&e[0]&&e[0][0]&&e[0][0].coord&&(t.data=f(e,function(t){var e={coords:[t[0].coord,t[1].coord]};return t[0].name&&(e.fromName=t[0].name),t[1].name&&(e.toName=t[1].name),o([e,t[0],t[1]])}))}function Jf(t,e,i){S_.call(this),this.add(this.createLine(t,e,i)),this._updateEffectSymbol(t,e)}function Qf(t,e,i){S_.call(this),this._createPolyline(t,e,i)}function tp(t,e,i){Jf.call(this,t,e,i),this._lastFrame=0,this._lastFramePercent=0}function ep(){this.group=new S_}function ip(t){return t instanceof Array||(t=[t,t]),t}function np(){var t=Px();this.canvas=t,this.blurSize=30,this.pointSize=20,this.maxOpacity=1,this.minOpacity=0,this._gradientPixels={}}function op(t,e,i){var n=t[1]-t[0],o=(e=f(e,function(e){return{interval:[(e.interval[0]-t[0])/n,(e.interval[1]-t[0])/n]}})).length,a=0;return function(t){for(n=a;n<o;n++)if((r=e[n].interval)[0]<=t&&t<=r[1]){a=n;break}if(n===o)for(var n=a-1;n>=0;n--){var r=e[n].interval;if(r[0]<=t&&t<=r[1]){a=n;break}}return n>=0&&n<o&&i[n]}}function ap(t,e){var i=t[1]-t[0];return e=[(e[0]-t[0])/i,(e[1]-t[0])/i],function(t){return t>=e[0]&&t<=e[1]}}function rp(t){var e=t.dimensions;return"lng"===e[0]&&"lat"===e[1]}function sp(t,e,i,n){var o=t.getItemLayout(e),a=i.get("symbolRepeat"),r=i.get("symbolClip"),s=i.get("symbolPosition")||"start",l=(i.get("symbolRotate")||0)*Math.PI/180||0,h=i.get("symbolPatternSize")||2,u=i.isAnimationEnabled(),c={dataIndex:e,layout:o,itemModel:i,symbolType:t.getItemVisual(e,"symbol")||"circle",color:t.getItemVisual(e,"color"),symbolClip:r,symbolRepeat:a,symbolRepeatDirection:i.get("symbolRepeatDirection"),symbolPatternSize:h,rotation:l,animationModel:u?i:null,hoverAnimation:u&&i.get("hoverAnimation"),z2:i.getShallow("z",!0)||0};lp(i,a,o,n,c),up(t,e,o,a,r,c.boundingLength,c.pxSign,h,n,c),cp(i,c.symbolScale,l,n,c);var d=c.symbolSize,f=i.get("symbolOffset");return y(f)&&(f=[To(f[0],d[0]),To(f[1],d[1])]),dp(i,d,o,a,r,f,s,c.valueLineWidth,c.boundingLength,c.repeatCutLength,n,c),c}function lp(t,e,i,n,o){var a,r=n.valueDim,s=t.get("symbolBoundingData"),l=n.coordSys.getOtherAxis(n.coordSys.getBaseAxis()),h=l.toGlobalCoord(l.dataToCoord(0)),u=1-+(i[r.wh]<=0);if(y(s)){var c=[hp(l,s[0])-h,hp(l,s[1])-h];c[1]<c[0]&&c.reverse(),a=c[u]}else a=null!=s?hp(l,s)-h:e?n.coordSysExtent[r.index][u]-h:i[r.wh];o.boundingLength=a,e&&(o.repeatCutLength=i[r.wh]),o.pxSign=a>0?1:a<0?-1:0}function hp(t,e){return t.toGlobalCoord(t.dataToCoord(t.scale.parse(e)))}function up(t,e,i,n,o,a,r,s,l,h){var u=l.valueDim,c=l.categoryDim,d=Math.abs(i[c.wh]),f=t.getItemVisual(e,"symbolSize");y(f)?f=f.slice():(null==f&&(f="100%"),f=[f,f]),f[c.index]=To(f[c.index],d),f[u.index]=To(f[u.index],n?d:Math.abs(a)),h.symbolSize=f,(h.symbolScale=[f[0]/s,f[1]/s])[u.index]*=(l.isHorizontal?-1:1)*r}function cp(t,e,i,n,o){var a=t.get(tL)||0;a&&(iL.attr({scale:e.slice(),rotation:i}),iL.updateTransform(),a/=iL.getLineScale(),a*=e[n.valueDim.index]),o.valueLineWidth=a}function dp(t,e,i,n,o,r,s,l,h,u,c,d){var f=c.categoryDim,p=c.valueDim,g=d.pxSign,m=Math.max(e[p.index]+l,0),v=m;if(n){var y=Math.abs(h),x=T(t.get("symbolMargin"),"15%")+"",_=!1;x.lastIndexOf("!")===x.length-1&&(_=!0,x=x.slice(0,x.length-1)),x=To(x,e[p.index]);var w=Math.max(m+2*x,0),b=_?0:2*x,S=Go(n),M=S?n:Cp((y+b)/w);w=m+2*(x=(y-M*m)/2/(_?M:M-1)),b=_?0:2*x,S||"fixed"===n||(M=u?Cp((Math.abs(u)+b)/w):0),v=M*w-b,d.repeatTimes=M,d.symbolMargin=x}var I=g*(v/2),A=d.pathPosition=[];A[f.index]=i[f.wh]/2,A[p.index]="start"===s?I:"end"===s?h-I:h/2,r&&(A[0]+=r[0],A[1]+=r[1]);var D=d.bundlePosition=[];D[f.index]=i[f.xy],D[p.index]=i[p.xy];var C=d.barRectShape=a({},i);C[p.wh]=g*Math.max(Math.abs(i[p.wh]),Math.abs(A[p.index]+I)),C[f.wh]=i[f.wh];var L=d.clipShape={};L[f.xy]=-i[f.xy],L[f.wh]=c.ecSize[f.wh],L[p.xy]=0,L[p.wh]=i[p.wh]}function fp(t){var e=t.symbolPatternSize,i=dl(t.symbolType,-e/2,-e/2,e,e,t.color);return i.attr({culling:!0}),"image"!==i.type&&i.setStyle({strokeNoScale:!0}),i}function pp(t,e,i,n){function o(t){var e=l.slice(),n=i.pxSign,o=t;return("start"===i.symbolRepeatDirection?n>0:n<0)&&(o=u-1-t),e[h.index]=d*(o-u/2+.5)+l[h.index],{position:e,scale:i.symbolScale.slice(),rotation:i.rotation}}var a=t.__pictorialBundle,r=i.symbolSize,s=i.valueLineWidth,l=i.pathPosition,h=e.valueDim,u=i.repeatTimes||0,c=0,d=r[e.valueDim.index]+s+2*i.symbolMargin;for(Tp(t,function(t){t.__pictorialAnimationIndex=c,t.__pictorialRepeatTimes=u,c<u?Ap(t,null,o(c),i,n):Ap(t,null,{scale:[0,0]},i,n,function(){a.remove(t)}),wp(t,i),c++});c<u;c++){var f=fp(i);f.__pictorialAnimationIndex=c,f.__pictorialRepeatTimes=u,a.add(f);var p=o(c);Ap(f,{position:p.position,scale:[0,0]},{scale:p.scale,rotation:p.rotation},i,n),f.on("mouseover",function(){Tp(t,function(t){t.trigger("emphasis")})}).on("mouseout",function(){Tp(t,function(t){t.trigger("normal")})}),wp(f,i)}}function gp(t,e,i,n){var o=t.__pictorialBundle,a=t.__pictorialMainPath;a?Ap(a,null,{position:i.pathPosition.slice(),scale:i.symbolScale.slice(),rotation:i.rotation},i,n):(a=t.__pictorialMainPath=fp(i),o.add(a),Ap(a,{position:i.pathPosition.slice(),scale:[0,0],rotation:i.rotation},{scale:i.symbolScale.slice()},i,n),a.on("mouseover",function(){this.trigger("emphasis")}).on("mouseout",function(){this.trigger("normal")})),wp(a,i)}function mp(t,e,i){var n=a({},e.barRectShape),o=t.__pictorialBarRect;o?Ap(o,null,{shape:n},e,i):(o=t.__pictorialBarRect=new Vb({z2:2,shape:n,silent:!0,style:{stroke:"transparent",fill:"transparent",lineWidth:0}}),t.add(o))}function vp(t,e,i,n){if(i.symbolClip){var o=t.__pictorialClipPath,r=a({},i.clipShape),s=e.valueDim,l=i.animationModel,h=i.dataIndex;if(o)co(o,{shape:r},l,h);else{r[s.wh]=0,o=new Vb({shape:r}),t.__pictorialBundle.setClipPath(o),t.__pictorialClipPath=o;var u={};u[s.wh]=i.clipShape[s.wh],tS[n?"updateProps":"initProps"](o,{shape:u},l,h)}}}function yp(t,e){var i=t.getItemModel(e);return i.getAnimationDelayParams=xp,i.isAnimationEnabled=_p,i}function xp(t){return{index:t.__pictorialAnimationIndex,count:t.__pictorialRepeatTimes}}function _p(){return this.parentModel.isAnimationEnabled()&&!!this.getShallow("animation")}function wp(t,e){t.off("emphasis").off("normal");var i=e.symbolScale.slice();e.hoverAnimation&&t.on("emphasis",function(){this.animateTo({scale:[1.1*i[0],1.1*i[1]]},400,"elasticOut")}).on("normal",function(){this.animateTo({scale:i.slice()},400,"elasticOut")})}function bp(t,e,i,n){var o=new S_,a=new S_;return o.add(a),o.__pictorialBundle=a,a.attr("position",i.bundlePosition.slice()),i.symbolRepeat?pp(o,e,i):gp(o,e,i),mp(o,i,n),vp(o,e,i,n),o.__pictorialShapeStr=Ip(t,i),o.__pictorialSymbolMeta=i,o}function Sp(t,e,i){var n=i.animationModel,o=i.dataIndex;co(t.__pictorialBundle,{position:i.bundlePosition.slice()},n,o),i.symbolRepeat?pp(t,e,i,!0):gp(t,e,i,!0),mp(t,i,!0),vp(t,e,i,!0)}function Mp(t,e,i,n){var o=n.__pictorialBarRect;o&&(o.style.text=null);var a=[];Tp(n,function(t){a.push(t)}),n.__pictorialMainPath&&a.push(n.__pictorialMainPath),n.__pictorialClipPath&&(i=null),d(a,function(t){co(t,{scale:[0,0]},i,e,function(){n.parent&&n.parent.remove(n)})}),t.setItemGraphicEl(e,null)}function Ip(t,e){return[t.getItemVisual(e.dataIndex,"symbol")||"none",!!e.symbolRepeat,!!e.symbolClip].join(":")}function Tp(t,e,i){d(t.__pictorialBundle.children(),function(n){n!==t.__pictorialBarRect&&e.call(i,n)})}function Ap(t,e,i,n,o,a){e&&t.attr(e),n.symbolClip&&!o?i&&t.attr(i):i&&tS[o?"updateProps":"initProps"](t,i,n.animationModel,n.dataIndex,a)}function Dp(t,e,i){var n=i.color,o=i.dataIndex,a=i.itemModel,s=a.getModel("itemStyle").getItemStyle(["color"]),l=a.getModel("emphasis.itemStyle").getItemStyle(),h=a.getShallow("cursor");Tp(t,function(t){t.setColor(n),t.setStyle(r({fill:n,opacity:i.opacity},s)),to(t,l),h&&(t.cursor=h),t.z2=i.z2});var u={},c=e.valueDim.posDesc[+(i.boundingLength>0)],d=t.__pictorialBarRect;Mh(d.style,u,a,n,e.seriesModel,o,c),to(d,u)}function Cp(t){var e=Math.round(t);return Math.abs(t-e)<1e-4?e:Math.ceil(t)}function Lp(t,e,i){this.dimension="single",this.dimensions=["single"],this._axis=null,this._rect,this._init(t,e,i),this.model=t}function kp(t,e){e=e||{};var i=t.coordinateSystem,n=t.axis,o={},a=n.position,r=n.orient,s=i.getRect(),l=[s.x,s.x+s.width,s.y,s.y+s.height],h={horizontal:{top:l[2],bottom:l[3]},vertical:{left:l[0],right:l[1]}};o.position=["vertical"===r?h.vertical[a]:l[0],"horizontal"===r?h.horizontal[a]:l[3]];var u={horizontal:0,vertical:1};o.rotation=Math.PI/2*u[r];var c={top:-1,bottom:1,right:1,left:-1};o.labelDirection=o.tickDirection=o.nameDirection=c[a],t.get("axisTick.inside")&&(o.tickDirection=-o.tickDirection),T(e.labelInside,t.get("axisLabel.inside"))&&(o.labelDirection=-o.labelDirection);var d=e.rotate;return null==d&&(d=t.get("axisLabel.rotate")),o.labelRotation="top"===a?-d:d,o.labelInterval=n.getLabelInterval(),o.z2=1,o}function Pp(t,e,i,n,o){var r=t.axis;if(!r.scale.isBlank()&&r.containData(e))if(t.involveSeries){var s=Op(e,t),l=s.payloadBatch,h=s.snapToValue;l[0]&&null==o.seriesIndex&&a(o,l[0]),!n&&t.snap&&r.containData(h)&&null!=h&&(e=h),i.showPointer(t,e,l,o),i.showTooltip(t,s,h)}else i.showPointer(t,e)}function Op(t,e){var i=e.axis,n=i.dim,o=t,a=[],r=Number.MAX_VALUE,s=-1;return cL(e.seriesModels,function(e,l){var h,u,c=e.getData().mapDimension(n,!0);if(e.getAxisTooltipData){var d=e.getAxisTooltipData(c,t,i);u=d.dataIndices,h=d.nestestValue}else{if(!(u=e.getData().indicesOfNearest(c[0],t,!1,"category"===i.type?.5:null)).length)return;h=e.getData().get(c[0],u[0])}if(null!=h&&isFinite(h)){var f=t-h,p=Math.abs(f);p<=r&&((p<r||f>=0&&s<0)&&(r=p,s=f,o=h,a.length=0),cL(u,function(t){a.push({seriesIndex:e.seriesIndex,dataIndexInside:t,dataIndex:e.getData().getRawIndex(t)})}))}}),{payloadBatch:a,snapToValue:o}}function Np(t,e,i,n){t[e.key]={value:i,payloadBatch:n}}function Ep(t,e,i,n){var o=i.payloadBatch,a=e.axis,r=a.model,s=e.axisPointerModel;if(e.triggerTooltip&&o.length){var l=e.coordSys.model,h=_h(l),u=t.map[h];u||(u=t.map[h]={coordSysId:l.id,coordSysIndex:l.componentIndex,coordSysType:l.type,coordSysMainType:l.mainType,dataByAxis:[]},t.list.push(u)),u.dataByAxis.push({axisDim:a.dim,axisIndex:r.componentIndex,axisType:r.type,axisId:r.id,value:n,valueLabelOpt:{precision:s.get("label.precision"),formatter:s.get("label.formatter")},seriesDataIndices:o.slice()})}}function zp(t,e,i){var n=i.axesInfo=[];cL(e,function(e,i){var o=e.axisPointerModel.option,a=t[i];a?(!e.useHandle&&(o.status="show"),o.value=a.value,o.seriesDataIndices=(a.payloadBatch||[]).slice()):!e.useHandle&&(o.status="hide"),"show"===o.status&&n.push({axisDim:e.axis.dim,axisIndex:e.axis.model.componentIndex,value:o.value})})}function Rp(t,e,i,n){if(!Wp(e)&&t.list.length){var o=((t.list[0].dataByAxis[0]||{}).seriesDataIndices||[])[0]||{};n({type:"showTip",escapeConnect:!0,x:e[0],y:e[1],tooltipOption:i.tooltipOption,position:i.position,dataIndexInside:o.dataIndexInside,dataIndex:o.dataIndex,seriesIndex:o.seriesIndex,dataByCoordSys:t.list})}else n({type:"hideTip"})}function Bp(t,e,i){var n=i.getZr(),o=fL(n).axisPointerLastHighlights||{},a=fL(n).axisPointerLastHighlights={};cL(t,function(t,e){var i=t.axisPointerModel.option;"show"===i.status&&cL(i.seriesDataIndices,function(t){var e=t.seriesIndex+" | "+t.dataIndex;a[e]=t})});var r=[],s=[];d(o,function(t,e){!a[e]&&s.push(t)}),d(a,function(t,e){!o[e]&&r.push(t)}),s.length&&i.dispatchAction({type:"downplay",escapeConnect:!0,batch:s}),r.length&&i.dispatchAction({type:"highlight",escapeConnect:!0,batch:r})}function Vp(t,e){for(var i=0;i<(t||[]).length;i++){var n=t[i];if(e.axis.dim===n.axisDim&&e.axis.model.componentIndex===n.axisIndex)return n}}function Gp(t){var e=t.axis.model,i={},n=i.axisDim=t.axis.dim;return i.axisIndex=i[n+"AxisIndex"]=e.componentIndex,i.axisName=i[n+"AxisName"]=e.name,i.axisId=i[n+"AxisId"]=e.id,i}function Wp(t){return!t||null==t[0]||isNaN(t[0])||null==t[1]||isNaN(t[1])}function Fp(t,e,i){if(!_x.node){var n=e.getZr();pL(n).records||(pL(n).records={}),Hp(n,e),(pL(n).records[t]||(pL(n).records[t]={})).handler=i}}function Hp(t,e){function i(i,n){t.on(i,function(i){var o=Xp(e);gL(pL(t).records,function(t){t&&n(t,i,o.dispatchAction)}),Zp(o.pendings,e)})}pL(t).initialized||(pL(t).initialized=!0,i("click",v(jp,"click")),i("mousemove",v(jp,"mousemove")),i("globalout",Up))}function Zp(t,e){var i,n=t.showTip.length,o=t.hideTip.length;n?i=t.showTip[n-1]:o&&(i=t.hideTip[o-1]),i&&(i.dispatchAction=null,e.dispatchAction(i))}function Up(t,e,i){t.handler("leave",null,i)}function jp(t,e,i,n){e.handler(t,i,n)}function Xp(t){var e={showTip:[],hideTip:[]},i=function(n){var o=e[n.type];o?o.push(n):(n.dispatchAction=i,t.dispatchAction(n))};return{dispatchAction:i,pendings:e}}function Yp(t,e){if(!_x.node){var i=e.getZr();(pL(i).records||{})[t]&&(pL(i).records[t]=null)}}function qp(){}function $p(t,e,i,n){Kp(vL(i).lastProp,n)||(vL(i).lastProp=n,e?co(i,n,t):(i.stopAnimation(),i.attr(n)))}function Kp(t,e){if(w(t)&&w(e)){var i=!0;return d(e,function(e,n){i=i&&Kp(t[n],e)}),!!i}return t===e}function Jp(t,e){t[e.get("label.show")?"show":"hide"]()}function Qp(t){return{position:t.position.slice(),rotation:t.rotation||0}}function tg(t,e,i){var n=e.get("z"),o=e.get("zlevel");t&&t.traverse(function(t){"group"!==t.type&&(null!=n&&(t.z=n),null!=o&&(t.zlevel=o),t.silent=i)})}function eg(t){var e,i=t.get("type"),n=t.getModel(i+"Style");return"line"===i?(e=n.getLineStyle()).fill=null:"shadow"===i&&((e=n.getAreaStyle()).stroke=null),e}function ig(t,e,i,n,o){var a=og(i.get("value"),e.axis,e.ecModel,i.get("seriesDataIndices"),{precision:i.get("label.precision"),formatter:i.get("label.formatter")}),r=i.getModel("label"),s=dS(r.get("padding")||0),l=r.getFont(),h=me(a,l),u=o.position,c=h.width+s[1]+s[3],d=h.height+s[0]+s[2],f=o.align;"right"===f&&(u[0]-=c),"center"===f&&(u[0]-=c/2);var p=o.verticalAlign;"bottom"===p&&(u[1]-=d),"middle"===p&&(u[1]-=d/2),ng(u,c,d,n);var g=r.get("backgroundColor");g&&"auto"!==g||(g=e.get("axisLine.lineStyle.color")),t.label={shape:{x:0,y:0,width:c,height:d,r:r.get("borderRadius")},position:u.slice(),style:{text:a,textFont:l,textFill:r.getTextColor(),textPosition:"inside",fill:g,stroke:r.get("borderColor")||"transparent",lineWidth:r.get("borderWidth")||0,shadowBlur:r.get("shadowBlur"),shadowColor:r.get("shadowColor"),shadowOffsetX:r.get("shadowOffsetX"),shadowOffsetY:r.get("shadowOffsetY")},z2:10}}function ng(t,e,i,n){var o=n.getWidth(),a=n.getHeight();t[0]=Math.min(t[0]+e,o)-e,t[1]=Math.min(t[1]+i,a)-i,t[0]=Math.max(t[0],0),t[1]=Math.max(t[1],0)}function og(t,e,i,n,o){var a=e.scale.getLabel(t,{precision:o.precision}),r=o.formatter;if(r){var s={value:ul(e,t),seriesData:[]};d(n,function(t){var e=i.getSeriesByIndex(t.seriesIndex),n=t.dataIndexInside,o=e&&e.getDataParams(n);o&&s.seriesData.push(o)}),_(r)?a=r.replace("{value}",a):x(r)&&(a=r(s))}return a}function ag(t,e,i){var n=st();return dt(n,n,i.rotation),ct(n,n,i.position),go([t.dataToCoord(e),(i.labelOffset||0)+(i.labelDirection||1)*(i.labelMargin||0)],n)}function rg(t,e,i,n,o,a){var r=GT.innerTextLayout(i.rotation,0,i.labelDirection);i.labelMargin=o.get("label.margin"),ig(e,n,o,a,{position:ag(n.axis,t,i),align:r.textAlign,verticalAlign:r.textVerticalAlign})}function sg(t,e,i){return i=i||0,{x1:t[i],y1:t[1-i],x2:e[i],y2:e[1-i]}}function lg(t,e,i){return i=i||0,{x:t[i],y:t[1-i],width:e[i],height:e[1-i]}}function hg(t,e,i,n,o,a){return{cx:t,cy:e,r0:i,r:n,startAngle:o,endAngle:a,clockwise:!0}}function ug(t,e){var i={};return i[e.dim+"AxisIndex"]=e.index,t.getCartesian(i)}function cg(t){return"x"===t.dim?0:1}function dg(t){return t.isHorizontal()?0:1}function fg(t,e){var i=t.getRect();return[i[bL[e]],i[bL[e]]+i[SL[e]]]}function pg(t,e,i){var n=new Vb({shape:{x:t.x-10,y:t.y-10,width:0,height:t.height+20}});return fo(n,{shape:{width:t.width+20,height:t.height+20}},e,i),n}function gg(t,e,i){if(t.count())for(var n,o=e.coordinateSystem,a=e.getLayerSeries(),r=t.mapDimension("single"),s=t.mapDimension("value"),l=f(a,function(e){return f(e.indices,function(e){var i=o.dataToPoint(t.get(r,e));return i[1]=t.get(s,e),i})}),h=mg(l),u=h.y0,c=i/h.max,d=a.length,p=a[0].indices.length,g=0;g<p;++g){n=u[g]*c,t.setItemLayout(a[0].indices[g],{layerIndex:0,x:l[0][g][0],y0:n,y:l[0][g][1]*c});for(var m=1;m<d;++m)n+=l[m-1][g][1]*c,t.setItemLayout(a[m].indices[g],{layerIndex:m,x:l[m][g][0],y0:n,y:l[m][g][1]*c})}}function mg(t){for(var e=t.length,i=t[0].length,n=[],o=[],a=0,r={},s=0;s<i;++s){for(var l=0,h=0;l<e;++l)h+=t[l][s][1];h>a&&(a=h),n.push(h)}for(var u=0;u<i;++u)o[u]=(a-n[u])/2;a=0;for(var c=0;c<i;++c){var d=n[c]+o[c];d>a&&(a=d)}return r.y0=o,r.max=a,r}function vg(t){var e=0;d(t.children,function(t){vg(t);var i=t.value;y(i)&&(i=i[0]),e+=i});var i=t.value;y(i)&&(i=i[0]),(null==i||isNaN(i))&&(i=e),i<0&&(i=0),y(t.value)?t.value[0]=i:t.value=i}function yg(t,e,i){function n(){r.ignore=r.hoverIgnore}function o(){r.ignore=r.normalIgnore}S_.call(this);var a=new Ob({z2:DL}),r=new Cb({z2:CL,silent:t.getModel("label").get("silent")});this.add(a),this.add(r),this.updateData(!0,t,"normal",e,i),this.on("emphasis",n).on("normal",o).on("mouseover",n).on("mouseout",o)}function xg(t,e,i){var n=t.getVisual("color");0===t.getVisual("visualMeta").length&&(n=null);var o=t.getModel("itemStyle").get("color");if(o)return o;if(n)return n;if(0===t.depth)return i.option.color[0];var a=i.option.color.length;return o=i.option.color[_g(t)%a]}function _g(t){for(var e=t;e.depth>1;)e=e.parentNode;return l(t.getAncestors()[0].children,e)}function wg(t,e,i){return i!==AL.NONE&&(i===AL.SELF?t===e:i===AL.ANCESTOR?t===e||t.isAncestorOf(e):t===e||t.isDescendantOf(e))}function bg(t,e){var i=t.children||[];t.children=Sg(i,e),i.length&&d(t.children,function(t){bg(t,e)})}function Sg(t,e){if("function"==typeof e)return t.sort(e);var i="asc"===e;return t.sort(function(t,e){var n=(t.getValue()-e.getValue())*(i?1:-1);return 0===n?(t.dataIndex-e.dataIndex)*(i?-1:1):n})}function Mg(t,e){return e=e||[0,0],f(["x","y"],function(i,n){var o=this.getAxis(i),a=e[n],r=t[n]/2;return"category"===o.type?o.getBandWidth():Math.abs(o.dataToCoord(a-r)-o.dataToCoord(a+r))},this)}function Ig(t,e){return e=e||[0,0],f([0,1],function(i){var n=e[i],o=t[i]/2,a=[],r=[];return a[i]=n-o,r[i]=n+o,a[1-i]=r[1-i]=e[1-i],Math.abs(this.dataToPoint(a)[i]-this.dataToPoint(r)[i])},this)}function Tg(t,e){var i=this.getAxis(),n=e instanceof Array?e[0]:e,o=(t instanceof Array?t[0]:t)/2;return"category"===i.type?i.getBandWidth():Math.abs(i.dataToCoord(n-o)-i.dataToCoord(n+o))}function Ag(t,e){return f(["Radius","Angle"],function(i,n){var o=this["get"+i+"Axis"](),a=e[n],r=t[n]/2,s="dataTo"+i,l="category"===o.type?o.getBandWidth():Math.abs(o[s](a-r)-o[s](a+r));return"Angle"===i&&(l=l*Math.PI/180),l},this)}function Dg(t){var e,i=t.type;if("path"===i){var n=t.shape;(e=En(n.pathData,null,{x:n.x||0,y:n.y||0,width:n.width||0,height:n.height||0},"center")).__customPathData=t.pathData}else"image"===i?(e=new Je({})).__customImagePath=t.style.image:"text"===i?(e=new Cb({})).__customText=t.style.text:e=new(0,tS[i.charAt(0).toUpperCase()+i.slice(1)]);return e.__customGraphicType=i,e.name=t.name,e}function Cg(t,e,n,o,a,r){var s={},l=n.style||{};if(n.shape&&(s.shape=i(n.shape)),n.position&&(s.position=n.position.slice()),n.scale&&(s.scale=n.scale.slice()),n.origin&&(s.origin=n.origin.slice()),n.rotation&&(s.rotation=n.rotation),"image"===t.type&&n.style){h=s.style={};d(["x","y","width","height"],function(e){Lg(e,h,l,t.style,r)})}if("text"===t.type&&n.style){var h=s.style={};d(["x","y"],function(e){Lg(e,h,l,t.style,r)}),!l.hasOwnProperty("textFill")&&l.fill&&(l.textFill=l.fill),!l.hasOwnProperty("textStroke")&&l.stroke&&(l.textStroke=l.stroke)}if("group"!==t.type&&(t.useStyle(l),r)){t.style.opacity=0;var u=l.opacity;null==u&&(u=1),fo(t,{style:{opacity:u}},o,e)}r?t.attr(s):co(t,s,o,e),t.attr({z2:n.z2||0,silent:n.silent}),!1!==n.styleEmphasis&&to(t,n.styleEmphasis)}function Lg(t,e,i,n,o){null==i[t]||o||(e[t]=i[t],i[t]=n[t])}function kg(t,e,i,n){function o(t){null==t&&(t=u),v&&(c=e.getItemModel(t),d=c.getModel(zL),f=c.getModel(RL),p=e.getItemVisual(t,"color"),v=!1)}var s=t.get("renderItem"),l=t.coordinateSystem,h={};l&&(h=l.prepareCustoms?l.prepareCustoms():VL[l.type](l));var u,c,d,f,p,g=r({getWidth:n.getWidth,getHeight:n.getHeight,getZr:n.getZr,getDevicePixelRatio:n.getDevicePixelRatio,value:function(t,i){return null==i&&(i=u),e.get(e.getDimension(t||0),i)},style:function(i,n){null==n&&(n=u),o(n);var r=c.getModel(NL).getItemStyle();null!=p&&(r.fill=p);var s=e.getItemVisual(n,"opacity");return null!=s&&(r.opacity=s),io(r,d,null,{autoColor:p,isRectText:!0}),r.text=d.getShallow("show")?A(t.getFormattedLabel(n,"normal"),xl(e,n)):null,i&&a(r,i),r},styleEmphasis:function(i,n){null==n&&(n=u),o(n);var r=c.getModel(EL).getItemStyle();return io(r,f,null,{isRectText:!0},!0),r.text=f.getShallow("show")?D(t.getFormattedLabel(n,"emphasis"),t.getFormattedLabel(n,"normal"),xl(e,n)):null,i&&a(r,i),r},visual:function(t,i){return null==i&&(i=u),e.getItemVisual(i,t)},barLayout:function(t){if(l.getBaseAxis)return Qs(r({axis:l.getBaseAxis()},t),n)},currentSeriesIndices:function(){return i.getCurrentSeriesIndices()},font:function(t){return ho(t,i)}},h.api||{}),m={context:{},seriesId:t.id,seriesName:t.name,seriesIndex:t.seriesIndex,coordSys:h.coordSys,dataInsideLength:e.count(),encode:Pg(t.getData())},v=!0;return function(t){return u=t,v=!0,s&&s(r({dataIndexInside:t,dataIndex:e.getRawIndex(t)},m),g)||{}}}function Pg(t){var e={};return d(t.dimensions,function(i,n){var o=t.getDimensionInfo(i);if(!o.isExtraCoord){var a=o.coordDim;(e[a]=e[a]||[])[o.coordDimIndex]=n}}),e}function Og(t,e,i,n,o,a){return(t=Ng(t,e,i,n,o,a))&&a.setItemGraphicEl(e,t),t}function Ng(t,e,i,n,o,a){var r=i.type;if(!t||r===t.__customGraphicType||"path"===r&&i.pathData===t.__customPathData||"image"===r&&i.style.image===t.__customImagePath||"text"===r&&i.style.text===t.__customText||(o.remove(t),t=null),null!=r){var s=!t;if(!t&&(t=Dg(i)),Cg(t,e,i,n,a,s),"group"===r){var l=t.children()||[],h=i.children||[];if(i.diffChildrenByName)Eg({oldChildren:l,newChildren:h,dataIndex:e,animatableModel:n,group:t,data:a});else{for(var u=0;u<h.length;u++)Ng(t.childAt(u),e,h[u],n,t,a);for(;u<l.length;u++)l[u]&&t.remove(l[u])}}return o.add(t),t}}function Eg(t){new ws(t.oldChildren,t.newChildren,zg,zg,t).add(Rg).update(Rg).remove(Bg).execute()}function zg(t,e){var i=t&&t.name;return null!=i?i:BL+e}function Rg(t,e){var i=this.context,n=null!=t?i.newChildren[t]:null;Ng(null!=e?i.oldChildren[e]:null,i.dataIndex,n,i.animatableModel,i.group,i.data)}function Bg(t){var e=this.context,i=e.oldChildren[t];i&&e.group.remove(i)}function Vg(t,e,i,n){var o=i.type,a=new(0,tS[o.charAt(0).toUpperCase()+o.slice(1)])(i);e.add(a),n.set(t,a),a.__ecGraphicId=t}function Gg(t,e){var i=t&&t.parent;i&&("group"===t.type&&t.traverse(function(t){Gg(t,e)}),e.removeKey(t.__ecGraphicId),i.remove(t))}function Wg(t){return t=a({},t),d(["id","parentId","$action","hv","bounding"].concat(_S),function(e){delete t[e]}),t}function Fg(t,e){var i;return d(e,function(e){null!=t[e]&&"auto"!==t[e]&&(i=!0)}),i}function Hg(t,e){var i=t.exist;if(e.id=t.keyInfo.id,!e.type&&i&&(e.type=i.type),null==e.parentId){var n=e.parentOption;n?e.parentId=n.id:i&&(e.parentId=i.parentId)}e.parentOption=null}function Zg(t,e,i){var o=a({},i),r=t[e],s=i.$action||"merge";"merge"===s?r?(n(r,o,!0),ta(r,o,{ignoreSize:!0}),ia(i,r)):t[e]=o:"replace"===s?t[e]=o:"remove"===s&&r&&(t[e]=null)}function Ug(t,e){t&&(t.hv=e.hv=[Fg(e,["left","right"]),Fg(e,["top","bottom"])],"group"===t.type&&(null==t.width&&(t.width=e.width=0),null==t.height&&(t.height=e.height=0)))}function jg(t,e,i){var n,o={},a="toggleSelected"===t;return i.eachComponent("legend",function(i){a&&null!=n?i[n?"select":"unSelect"](e.name):(i[t](e.name),n=i.isSelected(e.name)),d(i.getData(),function(t){var e=t.get("name");if("\n"!==e&&""!==e){var n=i.isSelected(e);o.hasOwnProperty(e)?o[e]=o[e]&&n:o[e]=n}})}),{name:e.name,selected:o}}function Xg(t,e,i){var n=e.getBoxLayoutParams(),o=e.get("padding"),a={width:i.getWidth(),height:i.getHeight()},r=Ko(n,a,o);bS(e.get("orient"),t,e.get("itemGap"),r.width,r.height),Jo(t,n,a,o)}function Yg(t,e){var i=dS(e.get("padding")),n=e.getItemStyle(["color","opacity"]);return n.fill=e.get("backgroundColor"),t=new Vb({shape:{x:t.x-i[3],y:t.y-i[0],width:t.width+i[1]+i[3],height:t.height+i[0]+i[2],r:e.get("borderRadius")},style:n,silent:!0,z2:-1})}function qg(t,e){e.dispatchAction({type:"legendToggleSelect",name:t})}function $g(t,e,i){var n=i.getZr().storage.getDisplayList()[0];n&&n.useHoverLayer||t.get("legendHoverLink")&&i.dispatchAction({type:"highlight",seriesName:t.name,name:e})}function Kg(t,e,i){var n=i.getZr().storage.getDisplayList()[0];n&&n.useHoverLayer||t.get("legendHoverLink")&&i.dispatchAction({type:"downplay",seriesName:t.name,name:e})}function Jg(t,e,i){var n=[1,1];n[t.getOrient().index]=0,ta(e,i,{type:"box",ignoreSize:n})}function Qg(t){var e="left "+t+"s cubic-bezier(0.23, 1, 0.32, 1),top "+t+"s cubic-bezier(0.23, 1, 0.32, 1)";return f(QL,function(t){return t+"transition:"+e}).join(";")}function tm(t){var e=[],i=t.get("fontSize"),n=t.getTextColor();return n&&e.push("color:"+n),e.push("font:"+t.getFont()),i&&e.push("line-height:"+Math.round(3*i/2)+"px"),KL(["decoration","align"],function(i){var n=t.get(i);n&&e.push("text-"+i+":"+n)}),e.join(";")}function em(t){var e=[],i=t.get("transitionDuration"),n=t.get("backgroundColor"),o=t.getModel("textStyle"),a=t.get("padding");return i&&e.push(Qg(i)),n&&(_x.canvasSupported?e.push("background-Color:"+n):(e.push("background-Color:#"+Pt(n)),e.push("filter:alpha(opacity=70)"))),KL(["width","color","radius"],function(i){var n="border-"+i,o=JL(n),a=t.get(o);null!=a&&e.push(n+":"+a+("color"===i?"":"px"))}),e.push(tm(o)),null!=a&&e.push("padding:"+dS(a).join("px ")+"px"),e.join(";")+";"}function im(t,e){if(_x.wxa)return null;var i=document.createElement("div"),n=this._zr=e.getZr();this.el=i,this._x=e.getWidth()/2,this._y=e.getHeight()/2,t.appendChild(i),this._container=t,this._show=!1,this._hideTimeout;var o=this;i.onmouseenter=function(){o._enterable&&(clearTimeout(o._hideTimeout),o._show=!0),o._inContent=!0},i.onmousemove=function(e){if(e=e||window.event,!o._enterable){var i=n.handler;li(t,e,!0),i.dispatch("mousemove",e)}},i.onmouseleave=function(){o._enterable&&o._show&&o.hideLater(o._hideDelay),o._inContent=!1}}function nm(t){for(var e=t.pop();t.length;){var i=t.pop();i&&(_o.isInstance(i)&&(i=i.get("tooltip",!0)),"string"==typeof i&&(i={formatter:i}),e=new _o(i,e,e.ecModel))}return e}function om(t,e){return t.dispatchAction||m(e.dispatchAction,e)}function am(t,e,i,n,o,a,r){var s=sm(i),l=s.width,h=s.height;return null!=a&&(t+l+a>n?t-=l+a:t+=a),null!=r&&(e+h+r>o?e-=h+r:e+=r),[t,e]}function rm(t,e,i,n,o){var a=sm(i),r=a.width,s=a.height;return t=Math.min(t+r,n)-r,e=Math.min(e+s,o)-s,t=Math.max(t,0),e=Math.max(e,0),[t,e]}function sm(t){var e=t.clientWidth,i=t.clientHeight;if(document.defaultView&&document.defaultView.getComputedStyle){var n=document.defaultView.getComputedStyle(t);n&&(e+=parseInt(n.paddingLeft,10)+parseInt(n.paddingRight,10)+parseInt(n.borderLeftWidth,10)+parseInt(n.borderRightWidth,10),i+=parseInt(n.paddingTop,10)+parseInt(n.paddingBottom,10)+parseInt(n.borderTopWidth,10)+parseInt(n.borderBottomWidth,10))}return{width:e,height:i}}function lm(t,e,i){var n=i[0],o=i[1],a=0,r=0,s=e.width,l=e.height;switch(t){case"inside":a=e.x+s/2-n/2,r=e.y+l/2-o/2;break;case"top":a=e.x+s/2-n/2,r=e.y-o-5;break;case"bottom":a=e.x+s/2-n/2,r=e.y+l+5;break;case"left":a=e.x-n-5,r=e.y+l/2-o/2;break;case"right":a=e.x+s+5,r=e.y+l/2-o/2}return[a,r]}function hm(t){return"center"===t||"middle"===t}function um(t){return t.get("stack")||"__ec_stack_"+t.seriesIndex}function cm(t){return t.dim}function dm(t,e){var i={};d(t,function(t,e){var n=t.getData(),o=t.coordinateSystem.getBaseAxis(),a=o.getExtent(),r="category"===o.type?o.getBandWidth():Math.abs(a[1]-a[0])/n.count(),s=i[cm(o)]||{bandWidth:r,remainedWidth:r,autoWidthCount:0,categoryGap:"20%",gap:"30%",stacks:{}},l=s.stacks;i[cm(o)]=s;var h=um(t);l[h]||s.autoWidthCount++,l[h]=l[h]||{width:0,maxWidth:0};var u=To(t.get("barWidth"),r),c=To(t.get("barMaxWidth"),r),d=t.get("barGap"),f=t.get("barCategoryGap");u&&!l[h].width&&(u=Math.min(s.remainedWidth,u),l[h].width=u,s.remainedWidth-=u),c&&(l[h].maxWidth=c),null!=d&&(s.gap=d),null!=f&&(s.categoryGap=f)});var n={};return d(i,function(t,e){n[e]={};var i=t.stacks,o=t.bandWidth,a=To(t.categoryGap,o),r=To(t.gap,1),s=t.remainedWidth,l=t.autoWidthCount,h=(s-a)/(l+(l-1)*r);h=Math.max(h,0),d(i,function(t,e){var i=t.maxWidth;i&&i<h&&(i=Math.min(i,s),t.width&&(i=Math.min(i,t.width)),s-=i,t.width=i,l--)}),h=(s-a)/(l+(l-1)*r),h=Math.max(h,0);var u,c=0;d(i,function(t,e){t.width||(t.width=h),u=t,c+=t.width*(1+r)}),u&&(c-=u.width*r);var f=-c/2;d(i,function(t,i){n[e][i]=n[e][i]||{offset:f,width:t.width},f+=t.width*(1+r)})}),n}function fm(t,e){nT.call(this,"radius",t,e),this.type="category"}function pm(t,e){e=e||[0,360],nT.call(this,"angle",t,e),this.type="category"}function gm(t,e){return e.type||(e.data?"category":"value")}function mm(t,e,i){var n=e.get("center"),o=i.getWidth(),a=i.getHeight();t.cx=To(n[0],o),t.cy=To(n[1],a);var r=t.getRadiusAxis(),s=Math.min(o,a)/2,l=To(e.get("radius"),s);r.inverse?r.setExtent(l,0):r.setExtent(0,l)}function vm(t,e){var i=this,n=i.getAngleAxis(),o=i.getRadiusAxis();if(n.scale.setExtent(1/0,-1/0),o.scale.setExtent(1/0,-1/0),t.eachSeries(function(t){if(t.coordinateSystem===i){var e=t.getData();d(e.mapDimension("radius",!0),function(t){o.scale.unionExtentFromData(e,t)}),d(e.mapDimension("angle",!0),function(t){n.scale.unionExtentFromData(e,t)})}}),rl(n.scale,n.model),rl(o.scale,o.model),"category"===n.type&&!n.onBand){var a=n.getExtent(),r=360/n.scale.count();n.inverse?a[1]+=r:a[1]-=r,n.setExtent(a[0],a[1])}}function ym(t,e){if(t.type=e.get("type"),t.scale=sl(e),t.onBand=e.get("boundaryGap")&&"category"===t.type,t.inverse=e.get("inverse"),"angleAxis"===e.mainType){t.inverse^=e.get("clockwise");var i=e.get("startAngle");t.setExtent(i,i+(t.inverse?-360:360))}e.axis=t,t.model=e}function xm(t,e,i){e[1]>e[0]&&(e=e.slice().reverse());var n=t.coordToPoint([e[0],i]),o=t.coordToPoint([e[1],i]);return{x1:n[0],y1:n[1],x2:o[0],y2:o[1]}}function _m(t){return t.getRadiusAxis().inverse?0:1}function wm(t,e,i){return{position:[t.cx,t.cy],rotation:i/180*Math.PI,labelDirection:-1,tickDirection:-1,nameDirection:1,labelRotate:e.getModel("axisLabel").get("rotate"),z2:1}}function bm(t,e,i,n,o){var a=e.axis,r=a.dataToCoord(t),s=n.getAngleAxis().getExtent()[0];s=s/180*Math.PI;var l,h,u,c=n.getRadiusAxis().getExtent();if("radius"===a.dim){var d=st();dt(d,d,s),ct(d,d,[n.cx,n.cy]),l=go([r,-o],d);var f=e.getModel("axisLabel").get("rotate")||0,p=GT.innerTextLayout(s,f*Math.PI/180,-1);h=p.textAlign,u=p.textVerticalAlign}else{var g=c[1];l=n.coordToPoint([g+o,r]);var m=n.cx,v=n.cy;h=Math.abs(l[0]-m)/g<.3?"center":l[0]>m?"left":"right",u=Math.abs(l[1]-v)/g<.3?"middle":l[1]>v?"top":"bottom"}return{position:l,align:h,verticalAlign:u}}function Sm(t,e){e.update="updateView",hs(e,function(e,i){var n={};return i.eachComponent({mainType:"geo",query:e},function(i){i[t](e.name),d(i.coordinateSystem.regions,function(t){n[t.name]=i.isSelected(t.name)||!1})}),{selected:n,name:e.name}})}function Mm(t){var e={};d(t,function(t){e[t]=1}),t.length=0,d(e,function(e,i){t.push(i)})}function Im(t){if(t)for(var e in t)if(t.hasOwnProperty(e))return!0}function Tm(t,e,n){function o(){var t=function(){};return t.prototype.__hidden=t.prototype,new t}var a={};return pk(e,function(e){var r=a[e]=o();pk(t[e],function(t,o){if(oD.isValidType(o)){var a={type:o,visual:t};n&&n(a,e),r[o]=new oD(a),"opacity"===o&&((a=i(a)).type="colorAlpha",r.__hidden.__alphaForOpacity=new oD(a))}})}),a}function Am(t,e,n){var o;d(n,function(t){e.hasOwnProperty(t)&&Im(e[t])&&(o=!0)}),o&&d(n,function(n){e.hasOwnProperty(n)&&Im(e[n])?t[n]=i(e[n]):delete t[n]})}function Dm(t,e,i,n,o,a){function r(t){return i.getItemVisual(u,t)}function s(t,e){i.setItemVisual(u,t,e)}function l(t,l){u=null==a?t:l;var c=i.getRawDataItem(u);if(!c||!1!==c.visualMap)for(var d=n.call(o,t),f=e[d],p=h[d],g=0,m=p.length;g<m;g++){var v=p[g];f[v]&&f[v].applyVisual(t,r,s)}}var h={};d(t,function(t){var i=oD.prepareVisualTypes(e[t]);h[t]=i});var u;null==a?i.each(l,!0):i.each([a],l,!0)}function Cm(t,e,i,n){var o={};return d(t,function(t){var i=oD.prepareVisualTypes(e[t]);o[t]=i}),{progress:function(t,a){null!=n&&(n=a.getDimension(n));for(var r=t.start;r<t.end;r++){var s=a.getRawDataItem(r);if(s&&!1===s.visualMap)return;for(var l=null!=n?a.get(n,r,!0):r,h=i(l),u=e[h],c=o[h],d=0,f=c.length;d<f;d++){var p=c[d];u[p]&&u[p].applyVisual(l,function(t){return a.getItemVisual(r,t)},function(t,e){a.setItemVisual(r,t,e)})}}}}}function Lm(t){var e=["x","y"],i=["width","height"];return{point:function(e,i,n){if(e){var o=n.range;return km(e[t],o)}},rect:function(n,o,a){if(n){var r=a.range,s=[n[e[t]],n[e[t]]+n[i[t]]];return s[1]<s[0]&&s.reverse(),km(s[0],r)||km(s[1],r)||km(r[0],s)||km(r[1],s)}}}}function km(t,e){return e[0]<=t&&t<=e[1]}function Pm(t,e,i,n,o){for(var a=0,r=o[o.length-1];a<o.length;a++){var s=o[a];if(Om(t,e,i,n,s[0],s[1],r[0],r[1]))return!0;r=s}}function Om(t,e,i,n,o,a,r,s){var l=Em(i-t,o-r,n-e,a-s);if(Nm(l))return!1;var h=Em(o-t,o-r,a-e,a-s)/l;if(h<0||h>1)return!1;var u=Em(i-t,o-t,n-e,a-e)/l;return!(u<0||u>1)}function Nm(t){return t<=1e-6&&t>=-1e-6}function Em(t,e,i,n){return t*n-e*i}function zm(t,e,i){var n=this._targetInfoList=[],o={},a=Bm(e,t);mk(bk,function(t,e){(!i||!i.include||vk(i.include,e)>=0)&&t(a,n,o)})}function Rm(t){return t[0]>t[1]&&t.reverse(),t}function Bm(t,e){return Oi(t,e,{includeMainTypes:_k})}function Vm(t,e,i,n){var o=i.getAxis(["x","y"][t]),a=Rm(f([0,1],function(t){return e?o.coordToData(o.toLocalCoord(n[t])):o.toGlobalCoord(o.dataToCoord(n[t]))})),r=[];return r[t]=a,r[1-t]=[NaN,NaN],{values:a,xyMinMax:r}}function Gm(t,e,i,n){return[e[0]-n[t]*i[0],e[1]-n[t]*i[1]]}function Wm(t,e){var i=Fm(t),n=Fm(e),o=[i[0]/n[0],i[1]/n[1]];return isNaN(o[0])&&(o[0]=1),isNaN(o[1])&&(o[1]=1),o}function Fm(t){return t?[t[0][1]-t[0][0],t[1][1]-t[1][0]]:[NaN,NaN]}function Hm(t,e,i,n,o){if(o){var a=t.getZr();a[Ck]||(a[Dk]||(a[Dk]=Zm),yr(a,Dk,i,e)(t,n))}}function Zm(t,e){if(!t.isDisposed()){var i=t.getZr();i[Ck]=!0,t.dispatchAction({type:"brushSelect",batch:e}),i[Ck]=!1}}function Um(t,e,i,n){for(var o=0,a=e.length;o<a;o++){var r=e[o];if(t[r.brushType](n,i,r.selectors,r))return!0}}function jm(t){var e=t.brushSelector;if(_(e)){var i=[];return d(gk,function(t,n){i[n]=function(i,n,o,a){var r=n.getItemLayout(i);return t[e](r,o,a)}}),i}if(x(e)){var n={};return d(gk,function(t,i){n[i]=e}),n}return e}function Xm(t,e){var i=t.option.seriesIndex;return null!=i&&"all"!==i&&(y(i)?l(i,e)<0:e!==i)}function Ym(t){var e=t.selectors={};return d(gk[t.brushType],function(i,n){e[n]=function(n){return i(n,e,t)}}),t}function qm(t){return new Kt(t[0][0],t[1][0],t[0][1]-t[0][0],t[1][1]-t[1][0])}function $m(t,e){return n({brushType:t.brushType,brushMode:t.brushMode,transformable:t.transformable,brushStyle:new _o(t.brushStyle).getItemStyle(),removeOnClick:t.removeOnClick,z:t.z},e,!0)}function Km(t,e,i,n){(!n||n.$from!==t.id)&&this._brushController.setPanels(t.brushTargetManager.makePanelOpts(i)).enableBrush(t.brushOption).updateCovers(t.areas.slice())}function Jm(t,e){Ok[t]=e}function Qm(t){return Ok[t]}function tv(t,e,i){this.model=t,this.ecModel=e,this.api=i,this._brushType,this._brushMode}function ev(t,e,i){this._model=t}function iv(t,e,i,n){var o=i.calendarModel,a=i.seriesModel,r=o?o.coordinateSystem:a?a.coordinateSystem:null;return r===this?r[t](n):null}function nv(t,e){var i=t.cellSize;y(i)?1===i.length&&(i[1]=i[0]):i=t.cellSize=[i,i];var n=f([0,1],function(t){return Qo(e,t)&&(i[t]="auto"),null!=i[t]&&"auto"!==i[t]});ta(t,e,{type:"box",ignoreSize:n})}function ov(t){return l(Vk,t)>=0}function av(t,e,i){function n(t,e){return l(e.nodes,t)>=0}function o(t,n){var o=!1;return e(function(e){d(i(t,e)||[],function(t){n.records[e.name][t]&&(o=!0)})}),o}function a(t,n){n.nodes.push(t),e(function(e){d(i(t,e)||[],function(t){n.records[e.name][t]=!0})})}return function(i){var r={nodes:[],records:{}};if(e(function(t){r.records[t.name]={}}),!i)return r;a(i,r);var s;do{s=!1,t(function(t){!n(t,r)&&o(t,r)&&(a(t,r),s=!0)})}while(s);return r}}function rv(t,e,i){var n=[1/0,-1/0];return Wk(i,function(t){var i=t.getData();i&&Wk(i.mapDimension(e,!0),function(t){var e=i.getApproximateExtent(t);e[0]<n[0]&&(n[0]=e[0]),e[1]>n[1]&&(n[1]=e[1])})}),n[1]<n[0]&&(n=[NaN,NaN]),sv(t,n),n}function sv(t,e){var i=t.getAxisModel(),n=i.getMin(!0),o="category"===i.get("type"),a=o&&i.getCategories().length;null!=n&&"dataMin"!==n&&"function"!=typeof n?e[0]=n:o&&(e[0]=a>0?0:NaN);var r=i.getMax(!0);return null!=r&&"dataMax"!==r&&"function"!=typeof r?e[1]=r:o&&(e[1]=a>0?a-1:NaN),i.get("scale",!0)||(e[0]>0&&(e[0]=0),e[1]<0&&(e[1]=0)),e}function lv(t,e){var i=t.getAxisModel(),n=t._percentWindow,o=t._valueWindow;if(n){var a=ko(o,[0,500]);a=Math.min(a,20);var r=e||0===n[0]&&100===n[1];i.setRange(r?null:+o[0].toFixed(a),r?null:+o[1].toFixed(a))}}function hv(t){var e=t._minMaxSpan={},i=t._dataZoomModel;Wk(["min","max"],function(n){e[n+"Span"]=i.get(n+"Span");var o=i.get(n+"ValueSpan");if(null!=o&&(e[n+"ValueSpan"]=o,null!=(o=t.getAxisModel().axis.scale.parse(o)))){var a=t._dataExtent;e[n+"Span"]=Io(a[0]+o,a,[0,100],!0)}})}function uv(t){var e={};return Zk(["start","end","startValue","endValue","throttle"],function(i){t.hasOwnProperty(i)&&(e[i]=t[i])}),e}function cv(t,e){var i=t._rangePropMode,n=t.get("rangeMode");Zk([["start","startValue"],["end","endValue"]],function(t,o){var a=null!=e[t[0]],r=null!=e[t[1]];a&&!r?i[o]="percent":!a&&r?i[o]="value":n?i[o]=n[o]:a&&(i[o]="percent")})}function dv(t){return{x:"y",y:"x",radius:"angle",angle:"radius"}[t]}function fv(t){return"vertical"===t?"ns-resize":"ew-resize"}function pv(t,e){var i=yv(t),n=e.dataZoomId,o=e.coordId;d(i,function(t,i){var a=t.dataZoomInfos;a[n]&&l(e.allCoordIds,o)<0&&(delete a[n],t.count--)}),_v(i);var a=i[o];a||((a=i[o]={coordId:o,dataZoomInfos:{},count:0}).controller=xv(t,a),a.dispatchAction=v(Mv,t)),!a.dataZoomInfos[n]&&a.count++,a.dataZoomInfos[n]=e;var r=Iv(a.dataZoomInfos);a.controller.enable(r.controlType,r.opt),a.controller.setPointerChecker(e.containsPoint),yr(a,"dispatchAction",e.throttleRate,"fixRate")}function gv(t,e){var i=yv(t);d(i,function(t){t.controller.dispose();var i=t.dataZoomInfos;i[e]&&(delete i[e],t.count--)}),_v(i)}function mv(t,e){if(t&&"dataZoom"===t.type&&t.batch)for(var i=0,n=t.batch.length;i<n;i++)if(t.batch[i].dataZoomId===e)return!1;return!0}function vv(t){return t.type+"\0_"+t.id}function yv(t){var e=t.getZr();return e[oP]||(e[oP]={})}function xv(t,e){var i=new Zh(t.getZr());return i.on("pan",nP(wv,e)),i.on("zoom",nP(bv,e)),i}function _v(t){d(t,function(e,i){e.count||(e.controller.dispose(),delete t[i])})}function wv(t,e,i,n,o,a,r){Sv(t,function(s){return s.panGetRange(t.controller,e,i,n,o,a,r)})}function bv(t,e,i,n){Sv(t,function(o){return o.zoomGetRange(t.controller,e,i,n)})}function Sv(t,e){var i=[];d(t.dataZoomInfos,function(t){var n=e(t);!t.disabled&&n&&i.push({dataZoomId:t.dataZoomId,start:n[0],end:n[1]})}),t.dispatchAction(i)}function Mv(t,e){t.dispatchAction({type:"dataZoom",batch:e})}function Iv(t){var e,i={},n={type_true:2,type_move:1,type_false:0,type_undefined:-1};return d(t,function(t){var o=!t.disabled&&(!t.zoomLock||"move");n["type_"+o]>n["type_"+e]&&(e=o),a(i,t.roamControllerOpt)}),{controlType:e,opt:i}}function Tv(t,e){return t&&t.hasOwnProperty&&t.hasOwnProperty(e)}function Av(t,e,i,n){for(var o=e.targetVisuals[n],a=oD.prepareVisualTypes(o),r={color:t.getData().getVisual("color")},s=0,l=a.length;s<l;s++){var h=a[s],u=o["opacity"===h?"__alphaForOpacity":h];u&&u.applyVisual(i,function(t){return r[t]},function(t,e){r[t]=e})}return r.color}function Dv(t,e,i){if(i[0]===i[1])return i.slice();for(var n=(i[1]-i[0])/200,o=i[0],a=[],r=0;r<=200&&o<i[1];r++)a.push(o),o+=n;return a.push(i[1]),a}function Cv(t,e,i){var n=t.option,o=n.align;if(null!=o&&"auto"!==o)return o;for(var a={width:e.getWidth(),height:e.getHeight()},r="horizontal"===n.orient?1:0,s=[["left","right","width"],["top","bottom","height"]],l=s[r],h=[0,null,10],u={},c=0;c<3;c++)u[s[1-r][c]]=h[c],u[l[c]]=2===c?i[0]:n[l[c]];var d=[["x","width",3],["y","height",0]][r],f=Ko(u,a,n.padding);return l[(f.margin[d[2]]||0)+f[d[0]]+.5*f[d[1]]<.5*a[d[1]]?0:1]}function Lv(t){return d(t||[],function(e){null!=t.dataIndex&&(t.dataIndexInside=t.dataIndex,t.dataIndex=null)}),t}function kv(t,e,i,n){return new Rb({shape:{points:t},draggable:!!i,cursor:e,drift:i,onmousemove:function(t){Q_(t.event)},ondragend:n})}function Pv(t,e){return 0===t?[[0,0],[e,0],[e,-e]]:[[0,0],[e,0],[e,e]]}function Ov(t,e,i,n){return t?[[0,-TP(e,AP(i,0))],[CP,0],[0,TP(e,AP(n-i,0))]]:[[0,0],[5,-5],[5,5]]}function Nv(t,e,i){var n=DP/2,o=t.get("hoverLinkDataSize");return o&&(n=MP(o,e,i,!0)/2),n}function Ev(t){var e=t.get("hoverLinkOnHandle");return!!(null==e?t.get("realtime"):e)}function zv(t){return"vertical"===t?"ns-resize":"ew-resize"}function Rv(t,e){var i=t.inverse;("vertical"===t.orient?!i:i)&&e.reverse()}function Bv(t){Mi(t,"label",["show"])}function Vv(t){return!(isNaN(parseFloat(t.x))&&isNaN(parseFloat(t.y)))}function Gv(t){return!isNaN(parseFloat(t.x))&&!isNaN(parseFloat(t.y))}function Wv(t,e,i){var n=-1;do{n=Math.max(Co(t.get(e,i)),n),t=t.stackedOn}while(t);return n}function Fv(t,e,i,n,o,a){var r=[],s=Yv(e,n,t),l=e.indicesOfNearest(n,s,!0)[0];r[o]=e.get(i,l,!0),r[a]=e.get(n,l,!0);var h=Wv(e,n,l);return(h=Math.min(h,20))>=0&&(r[a]=+r[a].toFixed(h)),r}function Hv(t,e){var n=t.getData(),o=t.coordinateSystem;if(e&&!Gv(e)&&!y(e.coord)&&o){var a=o.dimensions,r=Zv(e,n,o,t);if((e=i(e)).type&&BP[e.type]&&r.baseAxis&&r.valueAxis){var s=zP(a,r.baseAxis.dim),l=zP(a,r.valueAxis.dim);e.coord=BP[e.type](n,r.baseDataDim,r.valueDataDim,s,l),e.value=e.coord[l]}else{for(var h=[null!=e.xAxis?e.xAxis:e.radiusAxis,null!=e.yAxis?e.yAxis:e.angleAxis],u=0;u<2;u++)BP[h[u]]&&(h[u]=Yv(n,n.mapDimension(a[u]),h[u]));e.coord=h}}return e}function Zv(t,e,i,n){var o={};return null!=t.valueIndex||null!=t.valueDim?(o.valueDataDim=null!=t.valueIndex?e.getDimension(t.valueIndex):t.valueDim,o.valueAxis=i.getAxis(Uv(n,o.valueDataDim)),o.baseAxis=i.getOtherAxis(o.valueAxis),o.baseDataDim=e.mapDimension(o.baseAxis.dim)):(o.baseAxis=n.getBaseAxis(),o.valueAxis=i.getOtherAxis(o.baseAxis),o.baseDataDim=e.mapDimension(o.baseAxis.dim),o.valueDataDim=e.mapDimension(o.valueAxis.dim)),o}function Uv(t,e){var i=t.getData(),n=i.dimensions;e=i.getDimension(e);for(var o=0;o<n.length;o++){var a=i.getDimensionInfo(n[o]);if(a.name===e)return a.coordDim}}function jv(t,e){return!(t&&t.containData&&e.coord&&!Vv(e))||t.containData(e.coord)}function Xv(t,e,i,n){return n<2?t.coord&&t.coord[n]:t.value}function Yv(t,e,i){if("average"===i){var n=0,o=0;return t.each(e,function(t,e){isNaN(t)||(n+=t,o++)},!0),n/o}return t.getDataExtent(e,!0)["max"===i?1:0]}function qv(t,e,i){var n=e.coordinateSystem;t.each(function(o){var a,r=t.getItemModel(o),s=To(r.get("x"),i.getWidth()),l=To(r.get("y"),i.getHeight());if(isNaN(s)||isNaN(l)){if(e.getMarkerPosition)a=e.getMarkerPosition(t.getValues(t.dimensions,o));else if(n){var h=t.get(n.dimensions[0],o),u=t.get(n.dimensions[1],o);a=n.dataToPoint([h,u])}}else a=[s,l];isNaN(s)||(a[0]=s),isNaN(l)||(a[1]=l),t.setItemLayout(o,a)})}function $v(t,e,i){var n;n=t?f(t&&t.dimensions,function(t){return r({name:t,isSysCoord:!0},e.getData().getDimensionInfo(e.getData().mapDimension(t))||{})}):[{name:"value",type:"float",isSysCoord:!0}];var o=new yI(n,i),a=f(i.get("data"),v(Hv,e));return t&&(a=g(a,v(jv,t))),o.initData(a,null,t?Xv:function(t){return t.value}),o}function Kv(t){return!isNaN(t)&&!isFinite(t)}function Jv(t,e,i,n){var o=1-t,a=n.dimensions[t];return Kv(e[o])&&Kv(i[o])&&e[t]===i[t]&&n.getAxis(a).containData(e[t])}function Qv(t,e){if("cartesian2d"===t.type){var i=e[0].coord,n=e[1].coord;if(i&&n&&(Jv(1,i,n,t)||Jv(0,i,n,t)))return!0}return jv(t,e[0])&&jv(t,e[1])}function ty(t,e,i,n,o){var a,r=n.coordinateSystem,s=t.getItemModel(e),l=To(s.get("x"),o.getWidth()),h=To(s.get("y"),o.getHeight());if(isNaN(l)||isNaN(h)){if(n.getMarkerPosition)a=n.getMarkerPosition(t.getValues(t.dimensions,e));else{var u=r.dimensions,c=t.get(u[0],e),d=t.get(u[1],e);a=r.dataToPoint([c,d])}if("cartesian2d"===r.type){var f=r.getAxis("x"),p=r.getAxis("y"),u=r.dimensions;Kv(t.get(u[0],e))?a[0]=f.toGlobalCoord(f.getExtent()[i?0:1]):Kv(t.get(u[1],e))&&(a[1]=p.toGlobalCoord(p.getExtent()[i?0:1]))}isNaN(l)||(a[0]=l),isNaN(h)||(a[1]=h)}else a=[l,h];t.setItemLayout(e,a)}function ey(t,e,i){var n;n=t?f(t&&t.dimensions,function(t){return r({name:t},e.getData().getDimensionInfo(e.getData().mapDimension(t))||{})}):[{name:"value",type:"float"}];var o=new yI(n,i),a=new yI(n,i),s=new yI([],i),l=f(i.get("data"),v(GP,e,t,i));t&&(l=g(l,v(Qv,t)));var h=t?Xv:function(t){return t.value};return o.initData(f(l,function(t){return t[0]}),null,h),a.initData(f(l,function(t){return t[1]}),null,h),s.initData(f(l,function(t){return t[2]})),s.hasItemOption=!0,{from:o,to:a,line:s}}function iy(t){return!isNaN(t)&&!isFinite(t)}function ny(t,e,i,n){var o=1-t;return iy(e[o])&&iy(i[o])}function oy(t,e){var i=e.coord[0],n=e.coord[1];return!("cartesian2d"!==t.type||!i||!n||!ny(1,i,n,t)&&!ny(0,i,n,t))||(jv(t,{coord:i,x:e.x0,y:e.y0})||jv(t,{coord:n,x:e.x1,y:e.y1}))}function ay(t,e,i,n,o){var a,r=n.coordinateSystem,s=t.getItemModel(e),l=To(s.get(i[0]),o.getWidth()),h=To(s.get(i[1]),o.getHeight());if(isNaN(l)||isNaN(h)){if(n.getMarkerPosition)a=n.getMarkerPosition(t.getValues(i,e));else{var u=[f=t.get(i[0],e),p=t.get(i[1],e)];r.clampData&&r.clampData(u,u),a=r.dataToPoint(u,!0)}if("cartesian2d"===r.type){var c=r.getAxis("x"),d=r.getAxis("y"),f=t.get(i[0],e),p=t.get(i[1],e);iy(f)?a[0]=c.toGlobalCoord(c.getExtent()["x0"===i[0]?0:1]):iy(p)&&(a[1]=d.toGlobalCoord(d.getExtent()["y0"===i[1]?0:1]))}isNaN(l)||(a[0]=l),isNaN(h)||(a[1]=h)}else a=[l,h];return a}function ry(t,e,i){var n,o,a=["x0","y0","x1","y1"];t?(n=f(t&&t.dimensions,function(t){var i=e.getData();return r({name:t},i.getDimensionInfo(i.mapDimension(t))||{})}),o=new yI(f(a,function(t,e){return{name:t,type:n[e%2].type}}),i)):o=new yI(n=[{name:"value",type:"float"}],i);var s=f(i.get("data"),v(WP,e,t,i));t&&(s=g(s,v(oy,t)));var l=t?function(t,e,i,n){return t.coord[Math.floor(n/2)][n%2]}:function(t){return t.value};return o.initData(s,null,l),o.hasItemOption=!0,o}function sy(t){var e=t.type,i={number:"value",time:"time"};if(i[e]&&(t.axisType=i[e],delete t.type),ly(t),hy(t,"controlPosition")){var n=t.controlStyle||(t.controlStyle={});hy(n,"position")||(n.position=t.controlPosition),"none"!==n.position||hy(n,"show")||(n.show=!1,delete n.position),delete t.controlPosition}d(t.data||[],function(t){w(t)&&!y(t)&&(!hy(t,"value")&&hy(t,"name")&&(t.value=t.name),ly(t))})}function ly(t){var e=t.itemStyle||(t.itemStyle={}),i=e.emphasis||(e.emphasis={}),n=t.label||t.label||{},o=n.normal||(n.normal={}),a={normal:1,emphasis:1};d(n,function(t,e){a[e]||hy(o,e)||(o[e]=t)}),i.label&&!hy(n,"emphasis")&&(n.emphasis=i.label,delete i.label)}function hy(t,e){return t.hasOwnProperty(e)}function uy(t,e){return Ko(t.getBoxLayoutParams(),{width:e.getWidth(),height:e.getHeight()},t.get("padding"))}function cy(t,e,n,o){return En(t.get(e).replace(/^path:\/\//,""),i(o||{}),new Kt(n[0],n[1],n[2],n[3]),"center")}function dy(t,e,i,o,a,r){var s=e.get("color");a?(a.setColor(s),i.add(a),r&&r.onUpdate(a)):((a=dl(t.get("symbol"),-1,-1,2,2,s)).setStyle("strokeNoScale",!0),i.add(a),r&&r.onCreate(a));var l=e.getItemStyle(["color","symbol","symbolSize"]);a.setStyle(l),o=n({rectHover:!0,z2:100},o,!0);var h=t.get("symbolSize");(h=h instanceof Array?h.slice():[+h,+h])[0]/=2,h[1]/=2,o.scale=h;var u=t.get("symbolOffset");if(u){var c=o.position=o.position||[0,0];c[0]+=To(u[0],h[0]),c[1]+=To(u[1],h[1])}var d=t.get("symbolRotate");return o.rotation=(d||0)*Math.PI/180||0,a.attr(o),a.updateTransform(),a}function fy(t,e,i,n,o){if(!t.dragging){var a=n.getModel("checkpointStyle"),r=i.dataToCoord(n.getData().get(["value"],e));o||!a.get("animation",!0)?t.attr({position:[r,0]}):(t.stopAnimation(!0),t.animateTo({position:[r,0]},a.get("animationDuration",!0),a.get("animationEasing",!0)))}}function py(t){return 0===t.indexOf("my")}function gy(t){this.model=t}function my(t){this.model=t}function vy(t){var e={},i=[],n=[];return t.eachRawSeries(function(t){var o=t.coordinateSystem;if(!o||"cartesian2d"!==o.type&&"polar"!==o.type)i.push(t);else{var a=o.getBaseAxis();if("category"===a.type){var r=a.dim+"_"+a.index;e[r]||(e[r]={categoryAxis:a,valueAxis:o.getOtherAxis(a),series:[]},n.push({axisDim:a.dim,axisIndex:a.index})),e[r].series.push(t)}else i.push(t)}}),{seriesGroupByCategoryAxis:e,other:i,meta:n}}function yy(t){var e=[];return d(t,function(t,i){var n=t.categoryAxis,o=t.valueAxis.dim,a=[" "].concat(f(t.series,function(t){return t.name})),r=[n.model.getCategories()];d(t.series,function(t){r.push(t.getRawData().mapArray(o,function(t){return t}))});for(var s=[a.join(nO)],l=0;l<r[0].length;l++){for(var h=[],u=0;u<r.length;u++)h.push(r[u][l]);s.push(h.join(nO))}e.push(s.join("\n"))}),e.join("\n\n"+iO+"\n\n")}function xy(t){return f(t,function(t){var e=t.getRawData(),i=[t.name],n=[];return e.each(e.dimensions,function(){for(var t=arguments.length,o=arguments[t-1],a=e.getName(o),r=0;r<t-1;r++)n[r]=arguments[r];i.push((a?a+nO:"")+n.join(nO))}),i.join("\n")}).join("\n\n"+iO+"\n\n")}function _y(t){var e=vy(t);return{value:g([yy(e.seriesGroupByCategoryAxis),xy(e.other)],function(t){return t.replace(/[\n\t\s]/g,"")}).join("\n\n"+iO+"\n\n"),meta:e.meta}}function wy(t){return t.replace(/^\s\s*/,"").replace(/\s\s*$/,"")}function by(t){if(t.slice(0,t.indexOf("\n")).indexOf(nO)>=0)return!0}function Sy(t){for(var e=t.split(/\n+/g),i=[],n=f(wy(e.shift()).split(oO),function(t){return{name:t,data:[]}}),o=0;o<e.length;o++){var a=wy(e[o]).split(oO);i.push(a.shift());for(var r=0;r<a.length;r++)n[r]&&(n[r].data[o]=a[r])}return{series:n,categories:i}}function My(t){for(var e=t.split(/\n+/g),i=wy(e.shift()),n=[],o=0;o<e.length;o++){var a,r=wy(e[o]).split(oO),s="",l=!1;isNaN(r[0])?(l=!0,s=r[0],r=r.slice(1),n[o]={name:s,value:[]},a=n[o].value):a=n[o]=[];for(var h=0;h<r.length;h++)a.push(+r[h]);1===a.length&&(l?n[o].value=a[0]:n[o]=a[0])}return{name:i,data:n}}function Iy(t,e){var i={series:[]};return d(t.split(new RegExp("\n*"+iO+"\n*","g")),function(t,n){if(by(t)){var o=Sy(t),a=e[n],r=a.axisDim+"Axis";a&&(i[r]=i[r]||[],i[r][a.axisIndex]={data:o.categories},i.series=i.series.concat(o.series))}else{o=My(t);i.series.push(o)}}),i}function Ty(t){this._dom=null,this.model=t}function Ay(t,e){return f(t,function(t,i){var n=e&&e[i];return w(n)&&!y(n)?(w(t)&&!y(t)&&(t=t.value),r({value:t},n)):t})}function Dy(t,e){var i=Py(t);aO(e,function(e,n){for(var o=i.length-1;o>=0&&!i[o][n];o--);if(o<0){var a=t.queryComponents({mainType:"dataZoom",subType:"select",id:n})[0];if(a){var r=a.getPercentRange();i[0][n]={dataZoomId:n,start:r[0],end:r[1]}}}}),i.push(e)}function Cy(t){var e=Py(t),i=e[e.length-1];e.length>1&&e.pop();var n={};return aO(i,function(t,i){for(var o=e.length-1;o>=0;o--)if(t=e[o][i]){n[i]=t;break}}),n}function Ly(t){t[rO]=null}function ky(t){return Py(t).length}function Py(t){var e=t[rO];return e||(e=t[rO]=[{}]),e}function Oy(t,e,i){(this._brushController=new yd(i.getZr())).on("brush",m(this._onBrush,this)).mount(),this._isZoomActive}function Ny(t){var e={};return d(["xAxisIndex","yAxisIndex"],function(i){e[i]=t[i],null==e[i]&&(e[i]="all"),(!1===e[i]||"none"===e[i])&&(e[i]=[])}),e}function Ey(t,e){t.setIconStatus("back",ky(e)>1?"emphasis":"normal")}function zy(t,e,i,n,o){var a=i._isZoomActive;n&&"takeGlobalCursor"===n.type&&(a="dataZoomSelect"===n.key&&n.dataZoomSelectActive),i._isZoomActive=a,t.setIconStatus("zoom",a?"emphasis":"normal");var r=new zm(Ny(t.option),e,{include:["grid"]});i._brushController.setPanels(r.makePanelOpts(o,function(t){return t.xAxisDeclared&&!t.yAxisDeclared?"lineX":!t.xAxisDeclared&&t.yAxisDeclared?"lineY":"rect"})).enableBrush(!!a&&{brushType:"auto",brushStyle:{lineWidth:0,fill:"rgba(0,0,0,0.2)"}})}function Ry(t){this.model=t}function By(t){return fO(t)}function Vy(){if(!mO&&vO){mO=!0;var t=vO.styleSheets;t.length<31?vO.createStyleSheet().addRule(".zrvml","behavior:url(#default#VML)"):t[0].addRule(".zrvml","behavior:url(#default#VML)")}}function Gy(t){return parseInt(t,10)}function Wy(t,e){Vy(),this.root=t,this.storage=e;var i=document.createElement("div"),n=document.createElement("div");i.style.cssText="display:inline-block;overflow:hidden;position:relative;width:300px;height:150px;",n.style.cssText="position:absolute;left:0;top:0;",t.appendChild(i),this._vmlRoot=n,this._vmlViewport=i,this.resize();var o=e.delFromStorage,a=e.addToStorage;e.delFromStorage=function(t){o.call(e,t),t&&t.onRemove&&t.onRemove(n)},e.addToStorage=function(t){t.onAdd&&t.onAdd(n),a.call(e,t)},this._firstPaint=!0}function Fy(t){return function(){v_('In IE8.0 VML mode painter not support method "'+t+'"')}}function Hy(t){return document.createElementNS(KO,t)}function Zy(t){return eN(1e4*t)/1e4}function Uy(t){return t<sN&&t>-sN}function jy(t,e){var i=e?t.textFill:t.fill;return null!=i&&i!==tN}function Xy(t,e){var i=e?t.textStroke:t.stroke;return null!=i&&i!==tN}function Yy(t,e){e&&qy(t,"transform","matrix("+QO.call(e,",")+")")}function qy(t,e,i){(!i||"linear"!==i.type&&"radial"!==i.type)&&t.setAttribute(e,i)}function $y(t,e,i){t.setAttributeNS("http://www.w3.org/1999/xlink",e,i)}function Ky(t,e,i){if(jy(e,i)){var n=i?e.textFill:e.fill;n="transparent"===n?tN:n,"none"!==t.getAttribute("clip-path")&&n===tN&&(n="rgba(0, 0, 0, 0.002)"),qy(t,"fill",n),qy(t,"fill-opacity",e.opacity)}else qy(t,"fill",tN);if(Xy(e,i)){var o=i?e.textStroke:e.stroke;qy(t,"stroke",o="transparent"===o?tN:o),qy(t,"stroke-width",(i?e.textStrokeWidth:e.lineWidth)/(!i&&e.strokeNoScale?e.host.getLineScale():1)),qy(t,"paint-order",i?"stroke":"fill"),qy(t,"stroke-opacity",e.opacity),e.lineDash?(qy(t,"stroke-dasharray",e.lineDash.join(",")),qy(t,"stroke-dashoffset",eN(e.lineDashOffset||0))):qy(t,"stroke-dasharray",""),e.lineCap&&qy(t,"stroke-linecap",e.lineCap),e.lineJoin&&qy(t,"stroke-linejoin",e.lineJoin),e.miterLimit&&qy(t,"stroke-miterlimit",e.miterLimit)}else qy(t,"stroke",tN)}function Jy(t){for(var e=[],i=t.data,n=t.len(),o=0;o<n;){var a="",r=0;switch(i[o++]){case JO.M:a="M",r=2;break;case JO.L:a="L",r=2;break;case JO.Q:a="Q",r=4;break;case JO.C:a="C",r=6;break;case JO.A:var s=i[o++],l=i[o++],h=i[o++],u=i[o++],c=i[o++],d=i[o++],f=i[o++],p=i[o++],g=Math.abs(d),m=Uy(g-aN)&&!Uy(g),v=!1;v=g>=aN||!Uy(g)&&(d>-oN&&d<0||d>oN)==!!p;var y=Zy(s+h*nN(c)),x=Zy(l+u*iN(c));m&&(d=p?aN-1e-4:1e-4-aN,v=!0,9===o&&e.push("M",y,x));var _=Zy(s+h*nN(c+d)),w=Zy(l+u*iN(c+d));e.push("A",Zy(h),Zy(u),eN(f*rN),+v,+p,_,w);break;case JO.Z:a="Z";break;case JO.R:var _=Zy(i[o++]),w=Zy(i[o++]),b=Zy(i[o++]),S=Zy(i[o++]);e.push("M",_,w,"L",_+b,w,"L",_+b,w+S,"L",_,w+S,"L",_,w)}a&&e.push(a);for(var M=0;M<r;M++)e.push(Zy(i[o++]))}return e.join(" ")}function Qy(t){return"middle"===t?"middle":"bottom"===t?"baseline":"hanging"}function tx(){}function ex(t,e,i,n){for(var o=0,a=e.length,r=0,s=0;o<a;o++){var l=e[o];if(l.removed){for(var h=[],u=s;u<s+l.count;u++)h.push(u);l.indices=h,s+=l.count}else{for(var h=[],u=r;u<r+l.count;u++)h.push(u);l.indices=h,r+=l.count,l.added||(s+=l.count)}}return e}function ix(t){return{newPos:t.newPos,components:t.components.slice(0)}}function nx(t,e,i,n,o){this._zrId=t,this._svgRoot=e,this._tagNames="string"==typeof i?[i]:i,this._markLabel=n,this._domName=o||"_dom",this.nextId=0}function ox(t,e){nx.call(this,t,e,["linearGradient","radialGradient"],"__gradient_in_use__")}function ax(t,e){nx.call(this,t,e,"clipPath","__clippath_in_use__")}function rx(t,e){nx.call(this,t,e,["filter"],"__filter_in_use__","_shadowDom")}function sx(t){return t&&(t.shadowBlur||t.shadowOffsetX||t.shadowOffsetY||t.textShadowBlur||t.textShadowOffsetX||t.textShadowOffsetY)}function lx(t){return parseInt(t,10)}function hx(t){return t instanceof Mn?lN:t instanceof Je?hN:t instanceof Cb?uN:lN}function ux(t,e){return e&&t&&e.parentNode!==t}function cx(t,e,i){if(ux(t,e)&&i){var n=i.nextSibling;n?t.insertBefore(e,n):t.appendChild(e)}}function dx(t,e){if(ux(t,e)){var i=t.firstChild;i?t.insertBefore(e,i):t.appendChild(e)}}function fx(t,e){e&&t&&e.parentNode===t&&t.removeChild(e)}function px(t){return t.__textSvgEl}function gx(t){return t.__svgEl}function mx(t){return function(){v_('In SVG mode painter not support method "'+t+'"')}}var vx=2311,yx=function(){return vx++},xx={},_x=xx="undefined"!=typeof wx?{browser:{},os:{},node:!1,wxa:!0,canvasSupported:!0,svgSupported:!1,touchEventsSupported:!0}:"undefined"==typeof document&&"undefined"!=typeof self?{browser:{},os:{},node:!1,worker:!0,canvasSupported:!0}:"undefined"==typeof navigator?{browser:{},os:{},node:!0,worker:!1,canvasSupported:!0,svgSupported:!0}:function(t){var e={},i={},n=t.match(/Firefox\/([\d.]+)/),o=t.match(/MSIE\s([\d.]+)/)||t.match(/Trident\/.+?rv:(([\d.]+))/),a=t.match(/Edge\/([\d.]+)/),r=/micromessenger/i.test(t);return n&&(i.firefox=!0,i.version=n[1]),o&&(i.ie=!0,i.version=o[1]),a&&(i.edge=!0,i.version=a[1]),r&&(i.weChat=!0),{browser:i,os:e,node:!1,canvasSupported:!!document.createElement("canvas").getContext,svgSupported:"undefined"!=typeof SVGRect,touchEventsSupported:"ontouchstart"in window&&!i.ie&&!i.edge,pointerEventsSupported:"onpointerdown"in window&&(i.edge||i.ie&&i.version>=11)}}(navigator.userAgent),bx={"[object Function]":1,"[object RegExp]":1,"[object Date]":1,"[object Error]":1,"[object CanvasGradient]":1,"[object CanvasPattern]":1,"[object Image]":1,"[object Canvas]":1},Sx={"[object Int8Array]":1,"[object Uint8Array]":1,"[object Uint8ClampedArray]":1,"[object Int16Array]":1,"[object Uint16Array]":1,"[object Int32Array]":1,"[object Uint32Array]":1,"[object Float32Array]":1,"[object Float64Array]":1},Mx=Object.prototype.toString,Ix=Array.prototype,Tx=Ix.forEach,Ax=Ix.filter,Dx=Ix.slice,Cx=Ix.map,Lx=Ix.reduce,kx={},Px=function(){return kx.createCanvas()};kx.createCanvas=function(){return document.createElement("canvas")};var Ox,Nx="__ec_primitive__";E.prototype={constructor:E,get:function(t){return this.hasOwnProperty(t)?this[t]:null},set:function(t,e){return this[t]=e},each:function(t,e){void 0!==e&&(t=m(t,e));for(var i in this)this.hasOwnProperty(i)&&t(this[i],i)},removeKey:function(t){delete this[t]}};var Ex=(Object.freeze||Object)({$override:e,clone:i,merge:n,mergeAll:o,extend:a,defaults:r,createCanvas:Px,getContext:s,indexOf:l,inherits:h,mixin:u,isArrayLike:c,each:d,map:f,reduce:p,filter:g,find:function(t,e,i){if(t&&e)for(var n=0,o=t.length;n<o;n++)if(e.call(i,t[n],n,t))return t[n]},bind:m,curry:v,isArray:y,isFunction:x,isString:_,isObject:w,isBuiltInObject:b,isTypedArray:S,isDom:M,eqNaN:I,retrieve:T,retrieve2:A,retrieve3:D,slice:C,normalizeCssArray:L,assert:k,trim:P,setAsPrimitive:O,isPrimitive:N,createHashMap:z,concatArray:R,noop:B}),zx="undefined"==typeof Float32Array?Array:Float32Array,Rx=j,Bx=X,Vx=$,Gx=K,Wx=(Object.freeze||Object)({create:V,copy:G,clone:W,set:F,add:H,scaleAndAdd:Z,sub:U,len:j,length:Rx,lenSquare:X,lengthSquare:Bx,mul:function(t,e,i){return t[0]=e[0]*i[0],t[1]=e[1]*i[1],t},div:function(t,e,i){return t[0]=e[0]/i[0],t[1]=e[1]/i[1],t},dot:function(t,e){return t[0]*e[0]+t[1]*e[1]},scale:Y,normalize:q,distance:$,dist:Vx,distanceSquare:K,distSquare:Gx,negate:function(t,e){return t[0]=-e[0],t[1]=-e[1],t},lerp:J,applyTransform:Q,min:tt,max:et});it.prototype={constructor:it,_dragStart:function(t){var e=t.target;e&&e.draggable&&(this._draggingTarget=e,e.dragging=!0,this._x=t.offsetX,this._y=t.offsetY,this.dispatchToElement(nt(e,t),"dragstart",t.event))},_drag:function(t){var e=this._draggingTarget;if(e){var i=t.offsetX,n=t.offsetY,o=i-this._x,a=n-this._y;this._x=i,this._y=n,e.drift(o,a,t),this.dispatchToElement(nt(e,t),"drag",t.event);var r=this.findHover(i,n,e).target,s=this._dropTarget;this._dropTarget=r,e!==r&&(s&&r!==s&&this.dispatchToElement(nt(s,t),"dragleave",t.event),r&&r!==s&&this.dispatchToElement(nt(r,t),"dragenter",t.event))}},_dragEnd:function(t){var e=this._draggingTarget;e&&(e.dragging=!1),this.dispatchToElement(nt(e,t),"dragend",t.event),this._dropTarget&&this.dispatchToElement(nt(this._dropTarget,t),"drop",t.event),this._draggingTarget=null,this._dropTarget=null}};var Fx=Array.prototype.slice,Hx=function(){this._$handlers={}};Hx.prototype={constructor:Hx,one:function(t,e,i){var n=this._$handlers;if(!e||!t)return this;n[t]||(n[t]=[]);for(var o=0;o<n[t].length;o++)if(n[t][o].h===e)return this;return n[t].push({h:e,one:!0,ctx:i||this}),this},on:function(t,e,i){var n=this._$handlers;if(!e||!t)return this;n[t]||(n[t]=[]);for(var o=0;o<n[t].length;o++)if(n[t][o].h===e)return this;return n[t].push({h:e,one:!1,ctx:i||this}),this},isSilent:function(t){var e=this._$handlers;return e[t]&&e[t].length},off:function(t,e){var i=this._$handlers;if(!t)return this._$handlers={},this;if(e){if(i[t]){for(var n=[],o=0,a=i[t].length;o<a;o++)i[t][o].h!=e&&n.push(i[t][o]);i[t]=n}i[t]&&0===i[t].length&&delete i[t]}else delete i[t];return this},trigger:function(t){if(this._$handlers[t]){var e=arguments,i=e.length;i>3&&(e=Fx.call(e,1));for(var n=this._$handlers[t],o=n.length,a=0;a<o;){switch(i){case 1:n[a].h.call(n[a].ctx);break;case 2:n[a].h.call(n[a].ctx,e[1]);break;case 3:n[a].h.call(n[a].ctx,e[1],e[2]);break;default:n[a].h.apply(n[a].ctx,e)}n[a].one?(n.splice(a,1),o--):a++}}return this},triggerWithContext:function(t){if(this._$handlers[t]){var e=arguments,i=e.length;i>4&&(e=Fx.call(e,1,e.length-1));for(var n=e[e.length-1],o=this._$handlers[t],a=o.length,r=0;r<a;){switch(i){case 1:o[r].h.call(n);break;case 2:o[r].h.call(n,e[1]);break;case 3:o[r].h.call(n,e[1],e[2]);break;default:o[r].h.apply(n,e)}o[r].one?(o.splice(r,1),a--):r++}}return this}};var Zx="silent";at.prototype.dispose=function(){};var Ux=["click","dblclick","mousewheel","mouseout","mouseup","mousedown","mousemove","contextmenu"],jx=function(t,e,i,n){Hx.call(this),this.storage=t,this.painter=e,this.painterRoot=n,i=i||new at,this.proxy=null,this._hovered={},this._lastTouchMoment,this._lastX,this._lastY,it.call(this),this.setHandlerProxy(i)};jx.prototype={constructor:jx,setHandlerProxy:function(t){this.proxy&&this.proxy.dispose(),t&&(d(Ux,function(e){t.on&&t.on(e,this[e],this)},this),t.handler=this),this.proxy=t},mousemove:function(t){var e=t.zrX,i=t.zrY,n=this._hovered,o=n.target;o&&!o.__zr&&(o=(n=this.findHover(n.x,n.y)).target);var a=this._hovered=this.findHover(e,i),r=a.target,s=this.proxy;s.setCursor&&s.setCursor(r?r.cursor:"default"),o&&r!==o&&this.dispatchToElement(n,"mouseout",t),this.dispatchToElement(a,"mousemove",t),r&&r!==o&&this.dispatchToElement(a,"mouseover",t)},mouseout:function(t){this.dispatchToElement(this._hovered,"mouseout",t);var e,i=t.toElement||t.relatedTarget;do{i=i&&i.parentNode}while(i&&9!=i.nodeType&&!(e=i===this.painterRoot));!e&&this.trigger("globalout",{event:t})},resize:function(t){this._hovered={}},dispatch:function(t,e){var i=this[t];i&&i.call(this,e)},dispose:function(){this.proxy.dispose(),this.storage=this.proxy=this.painter=null},setCursorStyle:function(t){var e=this.proxy;e.setCursor&&e.setCursor(t)},dispatchToElement:function(t,e,i){var n=(t=t||{}).target;if(!n||!n.silent){for(var o="on"+e,a=ot(e,t,i);n&&(n[o]&&(a.cancelBubble=n[o].call(n,a)),n.trigger(e,a),n=n.parent,!a.cancelBubble););a.cancelBubble||(this.trigger(e,a),this.painter&&this.painter.eachOtherLayer(function(t){"function"==typeof t[o]&&t[o].call(t,a),t.trigger&&t.trigger(e,a)}))}},findHover:function(t,e,i){for(var n=this.storage.getDisplayList(),o={x:t,y:e},a=n.length-1;a>=0;a--){var r;if(n[a]!==i&&!n[a].ignore&&(r=rt(n[a],t,e))&&(!o.topTarget&&(o.topTarget=n[a]),r!==Zx)){o.target=n[a];break}}return o}},d(["click","mousedown","mouseup","mousewheel","dblclick","contextmenu"],function(t){jx.prototype[t]=function(e){var i=this.findHover(e.zrX,e.zrY),n=i.target;if("mousedown"===t)this._downEl=n,this._downPoint=[e.zrX,e.zrY],this._upEl=n;else if("mouseup"===t)this._upEl=n;else if("click"===t){if(this._downEl!==this._upEl||!this._downPoint||Vx(this._downPoint,[e.zrX,e.zrY])>4)return;this._downPoint=null}this.dispatchToElement(i,t,e)}}),u(jx,Hx),u(jx,it);var Xx="undefined"==typeof Float32Array?Array:Float32Array,Yx=(Object.freeze||Object)({create:st,identity:lt,copy:ht,mul:ut,translate:ct,rotate:dt,scale:ft,invert:pt,clone:gt}),qx=lt,$x=5e-5,Kx=function(t){(t=t||{}).position||(this.position=[0,0]),null==t.rotation&&(this.rotation=0),t.scale||(this.scale=[1,1]),this.origin=this.origin||null},Jx=Kx.prototype;Jx.transform=null,Jx.needLocalTransform=function(){return mt(this.rotation)||mt(this.position[0])||mt(this.position[1])||mt(this.scale[0]-1)||mt(this.scale[1]-1)},Jx.updateTransform=function(){var t=this.parent,e=t&&t.transform,i=this.needLocalTransform(),n=this.transform;i||e?(n=n||st(),i?this.getLocalTransform(n):qx(n),e&&(i?ut(n,t.transform,n):ht(n,t.transform)),this.transform=n,this.invTransform=this.invTransform||st(),pt(this.invTransform,n)):n&&qx(n)},Jx.getLocalTransform=function(t){return Kx.getLocalTransform(this,t)},Jx.setTransform=function(t){var e=this.transform,i=t.dpr||1;e?t.setTransform(i*e[0],i*e[1],i*e[2],i*e[3],i*e[4],i*e[5]):t.setTransform(i,0,0,i,0,0)},Jx.restoreTransform=function(t){var e=t.dpr||1;t.setTransform(e,0,0,e,0,0)};var Qx=[];Jx.decomposeTransform=function(){if(this.transform){var t=this.parent,e=this.transform;t&&t.transform&&(ut(Qx,t.invTransform,e),e=Qx);var i=e[0]*e[0]+e[1]*e[1],n=e[2]*e[2]+e[3]*e[3],o=this.position,a=this.scale;mt(i-1)&&(i=Math.sqrt(i)),mt(n-1)&&(n=Math.sqrt(n)),e[0]<0&&(i=-i),e[3]<0&&(n=-n),o[0]=e[4],o[1]=e[5],a[0]=i,a[1]=n,this.rotation=Math.atan2(-e[1]/n,e[0]/i)}},Jx.getGlobalScale=function(){var t=this.transform;if(!t)return[1,1];var e=Math.sqrt(t[0]*t[0]+t[1]*t[1]),i=Math.sqrt(t[2]*t[2]+t[3]*t[3]);return t[0]<0&&(e=-e),t[3]<0&&(i=-i),[e,i]},Jx.transformCoordToLocal=function(t,e){var i=[t,e],n=this.invTransform;return n&&Q(i,i,n),i},Jx.transformCoordToGlobal=function(t,e){var i=[t,e],n=this.transform;return n&&Q(i,i,n),i},Kx.getLocalTransform=function(t,e){qx(e=e||[]);var i=t.origin,n=t.scale||[1,1],o=t.rotation||0,a=t.position||[0,0];return i&&(e[4]-=i[0],e[5]-=i[1]),ft(e,e,n),o&&dt(e,e,o),i&&(e[4]+=i[0],e[5]+=i[1]),e[4]+=a[0],e[5]+=a[1],e};var t_={linear:function(t){return t},quadraticIn:function(t){return t*t},quadraticOut:function(t){return t*(2-t)},quadraticInOut:function(t){return(t*=2)<1?.5*t*t:-.5*(--t*(t-2)-1)},cubicIn:function(t){return t*t*t},cubicOut:function(t){return--t*t*t+1},cubicInOut:function(t){return(t*=2)<1?.5*t*t*t:.5*((t-=2)*t*t+2)},quarticIn:function(t){return t*t*t*t},quarticOut:function(t){return 1- --t*t*t*t},quarticInOut:function(t){return(t*=2)<1?.5*t*t*t*t:-.5*((t-=2)*t*t*t-2)},quinticIn:function(t){return t*t*t*t*t},quinticOut:function(t){return--t*t*t*t*t+1},quinticInOut:function(t){return(t*=2)<1?.5*t*t*t*t*t:.5*((t-=2)*t*t*t*t+2)},sinusoidalIn:function(t){return 1-Math.cos(t*Math.PI/2)},sinusoidalOut:function(t){return Math.sin(t*Math.PI/2)},sinusoidalInOut:function(t){return.5*(1-Math.cos(Math.PI*t))},exponentialIn:function(t){return 0===t?0:Math.pow(1024,t-1)},exponentialOut:function(t){return 1===t?1:1-Math.pow(2,-10*t)},exponentialInOut:function(t){return 0===t?0:1===t?1:(t*=2)<1?.5*Math.pow(1024,t-1):.5*(2-Math.pow(2,-10*(t-1)))},circularIn:function(t){return 1-Math.sqrt(1-t*t)},circularOut:function(t){return Math.sqrt(1- --t*t)},circularInOut:function(t){return(t*=2)<1?-.5*(Math.sqrt(1-t*t)-1):.5*(Math.sqrt(1-(t-=2)*t)+1)},elasticIn:function(t){var e,i=.1;return 0===t?0:1===t?1:(!i||i<1?(i=1,e=.1):e=.4*Math.asin(1/i)/(2*Math.PI),-i*Math.pow(2,10*(t-=1))*Math.sin((t-e)*(2*Math.PI)/.4))},elasticOut:function(t){var e,i=.1;return 0===t?0:1===t?1:(!i||i<1?(i=1,e=.1):e=.4*Math.asin(1/i)/(2*Math.PI),i*Math.pow(2,-10*t)*Math.sin((t-e)*(2*Math.PI)/.4)+1)},elasticInOut:function(t){var e,i=.1;return 0===t?0:1===t?1:(!i||i<1?(i=1,e=.1):e=.4*Math.asin(1/i)/(2*Math.PI),(t*=2)<1?i*Math.pow(2,10*(t-=1))*Math.sin((t-e)*(2*Math.PI)/.4)*-.5:i*Math.pow(2,-10*(t-=1))*Math.sin((t-e)*(2*Math.PI)/.4)*.5+1)},backIn:function(t){var e=1.70158;return t*t*((e+1)*t-e)},backOut:function(t){var e=1.70158;return--t*t*((e+1)*t+e)+1},backInOut:function(t){var e=2.5949095;return(t*=2)<1?t*t*((e+1)*t-e)*.5:.5*((t-=2)*t*((e+1)*t+e)+2)},bounceIn:function(t){return 1-t_.bounceOut(1-t)},bounceOut:function(t){return t<1/2.75?7.5625*t*t:t<2/2.75?7.5625*(t-=1.5/2.75)*t+.75:t<2.5/2.75?7.5625*(t-=2.25/2.75)*t+.9375:7.5625*(t-=2.625/2.75)*t+.984375},bounceInOut:function(t){return t<.5?.5*t_.bounceIn(2*t):.5*t_.bounceOut(2*t-1)+.5}};vt.prototype={constructor:vt,step:function(t,e){if(this._initialized||(this._startTime=t+this._delay,this._initialized=!0),this._paused)this._pausedTime+=e;else{var i=(t-this._startTime-this._pausedTime)/this._life;if(!(i<0)){i=Math.min(i,1);var n=this.easing,o="string"==typeof n?t_[n]:n,a="function"==typeof o?o(i):i;return this.fire("frame",a),1==i?this.loop?(this.restart(t),"restart"):(this._needsRemove=!0,"destroy"):null}}},restart:function(t){var e=(t-this._startTime-this._pausedTime)%this._life;this._startTime=t-e+this.gap,this._pausedTime=0,this._needsRemove=!1},fire:function(t,e){this[t="on"+t]&&this[t](this._target,e)},pause:function(){this._paused=!0},resume:function(){this._paused=!1}};var e_=function(){this.head=null,this.tail=null,this._len=0},i_=e_.prototype;i_.insert=function(t){var e=new n_(t);return this.insertEntry(e),e},i_.insertEntry=function(t){this.head?(this.tail.next=t,t.prev=this.tail,t.next=null,this.tail=t):this.head=this.tail=t,this._len++},i_.remove=function(t){var e=t.prev,i=t.next;e?e.next=i:this.head=i,i?i.prev=e:this.tail=e,t.next=t.prev=null,this._len--},i_.len=function(){return this._len},i_.clear=function(){this.head=this.tail=null,this._len=0};var n_=function(t){this.value=t,this.next,this.prev},o_=function(t){this._list=new e_,this._map={},this._maxSize=t||10,this._lastRemovedEntry=null},a_=o_.prototype;a_.put=function(t,e){var i=this._list,n=this._map,o=null;if(null==n[t]){var a=i.len(),r=this._lastRemovedEntry;if(a>=this._maxSize&&a>0){var s=i.head;i.remove(s),delete n[s.key],o=s.value,this._lastRemovedEntry=s}r?r.value=e:r=new n_(e),r.key=t,i.insertEntry(r),n[t]=r}return o},a_.get=function(t){var e=this._map[t],i=this._list;if(null!=e)return e!==i.tail&&(i.remove(e),i.insertEntry(e)),e.value},a_.clear=function(){this._list.clear(),this._map={}};var r_={transparent:[0,0,0,0],aliceblue:[240,248,255,1],antiquewhite:[250,235,215,1],aqua:[0,255,255,1],aquamarine:[127,255,212,1],azure:[240,255,255,1],beige:[245,245,220,1],bisque:[255,228,196,1],black:[0,0,0,1],blanchedalmond:[255,235,205,1],blue:[0,0,255,1],blueviolet:[138,43,226,1],brown:[165,42,42,1],burlywood:[222,184,135,1],cadetblue:[95,158,160,1],chartreuse:[127,255,0,1],chocolate:[210,105,30,1],coral:[255,127,80,1],cornflowerblue:[100,149,237,1],cornsilk:[255,248,220,1],crimson:[220,20,60,1],cyan:[0,255,255,1],darkblue:[0,0,139,1],darkcyan:[0,139,139,1],darkgoldenrod:[184,134,11,1],darkgray:[169,169,169,1],darkgreen:[0,100,0,1],darkgrey:[169,169,169,1],darkkhaki:[189,183,107,1],darkmagenta:[139,0,139,1],darkolivegreen:[85,107,47,1],darkorange:[255,140,0,1],darkorchid:[153,50,204,1],darkred:[139,0,0,1],darksalmon:[233,150,122,1],darkseagreen:[143,188,143,1],darkslateblue:[72,61,139,1],darkslategray:[47,79,79,1],darkslategrey:[47,79,79,1],darkturquoise:[0,206,209,1],darkviolet:[148,0,211,1],deeppink:[255,20,147,1],deepskyblue:[0,191,255,1],dimgray:[105,105,105,1],dimgrey:[105,105,105,1],dodgerblue:[30,144,255,1],firebrick:[178,34,34,1],floralwhite:[255,250,240,1],forestgreen:[34,139,34,1],fuchsia:[255,0,255,1],gainsboro:[220,220,220,1],ghostwhite:[248,248,255,1],gold:[255,215,0,1],goldenrod:[218,165,32,1],gray:[128,128,128,1],green:[0,128,0,1],greenyellow:[173,255,47,1],grey:[128,128,128,1],honeydew:[240,255,240,1],hotpink:[255,105,180,1],indianred:[205,92,92,1],indigo:[75,0,130,1],ivory:[255,255,240,1],khaki:[240,230,140,1],lavender:[230,230,250,1],lavenderblush:[255,240,245,1],lawngreen:[124,252,0,1],lemonchiffon:[255,250,205,1],lightblue:[173,216,230,1],lightcoral:[240,128,128,1],lightcyan:[224,255,255,1],lightgoldenrodyellow:[250,250,210,1],lightgray:[211,211,211,1],lightgreen:[144,238,144,1],lightgrey:[211,211,211,1],lightpink:[255,182,193,1],lightsalmon:[255,160,122,1],lightseagreen:[32,178,170,1],lightskyblue:[135,206,250,1],lightslategray:[119,136,153,1],lightslategrey:[119,136,153,1],lightsteelblue:[176,196,222,1],lightyellow:[255,255,224,1],lime:[0,255,0,1],limegreen:[50,205,50,1],linen:[250,240,230,1],magenta:[255,0,255,1],maroon:[128,0,0,1],mediumaquamarine:[102,205,170,1],mediumblue:[0,0,205,1],mediumorchid:[186,85,211,1],mediumpurple:[147,112,219,1],mediumseagreen:[60,179,113,1],mediumslateblue:[123,104,238,1],mediumspringgreen:[0,250,154,1],mediumturquoise:[72,209,204,1],mediumvioletred:[199,21,133,1],midnightblue:[25,25,112,1],mintcream:[245,255,250,1],mistyrose:[255,228,225,1],moccasin:[255,228,181,1],navajowhite:[255,222,173,1],navy:[0,0,128,1],oldlace:[253,245,230,1],olive:[128,128,0,1],olivedrab:[107,142,35,1],orange:[255,165,0,1],orangered:[255,69,0,1],orchid:[218,112,214,1],palegoldenrod:[238,232,170,1],palegreen:[152,251,152,1],paleturquoise:[175,238,238,1],palevioletred:[219,112,147,1],papayawhip:[255,239,213,1],peachpuff:[255,218,185,1],peru:[205,133,63,1],pink:[255,192,203,1],plum:[221,160,221,1],powderblue:[176,224,230,1],purple:[128,0,128,1],red:[255,0,0,1],rosybrown:[188,143,143,1],royalblue:[65,105,225,1],saddlebrown:[139,69,19,1],salmon:[250,128,114,1],sandybrown:[244,164,96,1],seagreen:[46,139,87,1],seashell:[255,245,238,1],sienna:[160,82,45,1],silver:[192,192,192,1],skyblue:[135,206,235,1],slateblue:[106,90,205,1],slategray:[112,128,144,1],slategrey:[112,128,144,1],snow:[255,250,250,1],springgreen:[0,255,127,1],steelblue:[70,130,180,1],tan:[210,180,140,1],teal:[0,128,128,1],thistle:[216,191,216,1],tomato:[255,99,71,1],turquoise:[64,224,208,1],violet:[238,130,238,1],wheat:[245,222,179,1],white:[255,255,255,1],whitesmoke:[245,245,245,1],yellow:[255,255,0,1],yellowgreen:[154,205,50,1]},s_=new o_(20),l_=null,h_=Ot,u_=Nt,c_=(Object.freeze||Object)({parse:Dt,lift:kt,toHex:Pt,fastLerp:Ot,fastMapToColor:h_,lerp:Nt,mapToColor:u_,modifyHSL:Et,modifyAlpha:zt,stringify:Rt}),d_=Array.prototype.slice,f_=function(t,e,i,n){this._tracks={},this._target=t,this._loop=e||!1,this._getter=i||Bt,this._setter=n||Vt,this._clipCount=0,this._delay=0,this._doneList=[],this._onframeList=[],this._clipList=[]};f_.prototype={when:function(t,e){var i=this._tracks;for(var n in e)if(e.hasOwnProperty(n)){if(!i[n]){i[n]=[];var o=this._getter(this._target,n);if(null==o)continue;0!==t&&i[n].push({time:0,value:Xt(o)})}i[n].push({time:t,value:e[n]})}return this},during:function(t){return this._onframeList.push(t),this},pause:function(){for(var t=0;t<this._clipList.length;t++)this._clipList[t].pause();this._paused=!0},resume:function(){for(var t=0;t<this._clipList.length;t++)this._clipList[t].resume();this._paused=!1},isPaused:function(){return!!this._paused},_doneCallback:function(){this._tracks={},this._clipList.length=0;for(var t=this._doneList,e=t.length,i=0;i<e;i++)t[i].call(this)},start:function(t,e){var i,n=this,o=0;for(var a in this._tracks)if(this._tracks.hasOwnProperty(a)){var r=$t(this,t,function(){--o||n._doneCallback()},this._tracks[a],a,e);r&&(this._clipList.push(r),o++,this.animation&&this.animation.addClip(r),i=r)}if(i){var s=i.onframe;i.onframe=function(t,e){s(t,e);for(var i=0;i<n._onframeList.length;i++)n._onframeList[i](t,e)}}return o||this._doneCallback(),this},stop:function(t){for(var e=this._clipList,i=this.animation,n=0;n<e.length;n++){var o=e[n];t&&o.onframe(this._target,1),i&&i.removeClip(o)}e.length=0},delay:function(t){return this._delay=t,this},done:function(t){return t&&this._doneList.push(t),this},getClips:function(){return this._clipList}};var p_=1;"undefined"!=typeof window&&(p_=Math.max(window.devicePixelRatio||1,1));var g_=p_,m_=function(){},v_=m_,y_=function(){this.animators=[]};y_.prototype={constructor:y_,animate:function(t,e){var i,n=!1,o=this,a=this.__zr;if(t){var r=t.split("."),s=o;n="shape"===r[0];for(var h=0,u=r.length;h<u;h++)s&&(s=s[r[h]]);s&&(i=s)}else i=o;if(i){var c=o.animators,d=new f_(i,e);return d.during(function(t){o.dirty(n)}).done(function(){c.splice(l(c,d),1)}),c.push(d),a&&a.animation.addAnimator(d),d}v_('Property "'+t+'" is not existed in element '+o.id)},stopAnimation:function(t){for(var e=this.animators,i=e.length,n=0;n<i;n++)e[n].stop(t);return e.length=0,this},animateTo:function(t,e,i,n,o,a){_(i)?(o=n,n=i,i=0):x(n)?(o=n,n="linear",i=0):x(i)?(o=i,i=0):x(e)?(o=e,e=500):e||(e=500),this.stopAnimation(),this._animateToShallow("",this,t,e,i);var r=this.animators.slice(),s=r.length;s||o&&o();for(var l=0;l<r.length;l++)r[l].done(function(){--s||o&&o()}).start(n,a)},_animateToShallow:function(t,e,i,n,o){var a={},r=0;for(var s in i)if(i.hasOwnProperty(s))if(null!=e[s])w(i[s])&&!c(i[s])?this._animateToShallow(t?t+"."+s:s,e[s],i[s],n,o):(a[s]=i[s],r++);else if(null!=i[s])if(t){var l={};l[t]={},l[t][s]=i[s],this.attr(l)}else this.attr(s,i[s]);return r>0&&this.animate(t,!1).when(null==n?500:n,a).delay(o||0),this}};var x_=function(t){Kx.call(this,t),Hx.call(this,t),y_.call(this,t),this.id=t.id||yx()};x_.prototype={type:"element",name:"",__zr:null,ignore:!1,clipPath:null,isGroup:!1,drift:function(t,e){switch(this.draggable){case"horizontal":e=0;break;case"vertical":t=0}var i=this.transform;i||(i=this.transform=[1,0,0,1,0,0]),i[4]+=t,i[5]+=e,this.decomposeTransform(),this.dirty(!1)},beforeUpdate:function(){},afterUpdate:function(){},update:function(){this.updateTransform()},traverse:function(t,e){},attrKV:function(t,e){if("position"===t||"scale"===t||"origin"===t){if(e){var i=this[t];i||(i=this[t]=[]),i[0]=e[0],i[1]=e[1]}}else this[t]=e},hide:function(){this.ignore=!0,this.__zr&&this.__zr.refresh()},show:function(){this.ignore=!1,this.__zr&&this.__zr.refresh()},attr:function(t,e){if("string"==typeof t)this.attrKV(t,e);else if(w(t))for(var i in t)t.hasOwnProperty(i)&&this.attrKV(i,t[i]);return this.dirty(!1),this},setClipPath:function(t){var e=this.__zr;e&&t.addSelfToZr(e),this.clipPath&&this.clipPath!==t&&this.removeClipPath(),this.clipPath=t,t.__zr=e,t.__clipTarget=this,this.dirty(!1)},removeClipPath:function(){var t=this.clipPath;t&&(t.__zr&&t.removeSelfFromZr(t.__zr),t.__zr=null,t.__clipTarget=null,this.clipPath=null,this.dirty(!1))},addSelfToZr:function(t){this.__zr=t;var e=this.animators;if(e)for(var i=0;i<e.length;i++)t.animation.addAnimator(e[i]);this.clipPath&&this.clipPath.addSelfToZr(t)},removeSelfFromZr:function(t){this.__zr=null;var e=this.animators;if(e)for(var i=0;i<e.length;i++)t.animation.removeAnimator(e[i]);this.clipPath&&this.clipPath.removeSelfFromZr(t)}},u(x_,y_),u(x_,Kx),u(x_,Hx);var __=Q,w_=Math.min,b_=Math.max;Kt.prototype={constructor:Kt,union:function(t){var e=w_(t.x,this.x),i=w_(t.y,this.y);this.width=b_(t.x+t.width,this.x+this.width)-e,this.height=b_(t.y+t.height,this.y+this.height)-i,this.x=e,this.y=i},applyTransform:function(){var t=[],e=[],i=[],n=[];return function(o){if(o){t[0]=i[0]=this.x,t[1]=n[1]=this.y,e[0]=n[0]=this.x+this.width,e[1]=i[1]=this.y+this.height,__(t,t,o),__(e,e,o),__(i,i,o),__(n,n,o),this.x=w_(t[0],e[0],i[0],n[0]),this.y=w_(t[1],e[1],i[1],n[1]);var a=b_(t[0],e[0],i[0],n[0]),r=b_(t[1],e[1],i[1],n[1]);this.width=a-this.x,this.height=r-this.y}}}(),calculateTransform:function(t){var e=this,i=t.width/e.width,n=t.height/e.height,o=st();return ct(o,o,[-e.x,-e.y]),ft(o,o,[i,n]),ct(o,o,[t.x,t.y]),o},intersect:function(t){if(!t)return!1;t instanceof Kt||(t=Kt.create(t));var e=this,i=e.x,n=e.x+e.width,o=e.y,a=e.y+e.height,r=t.x,s=t.x+t.width,l=t.y,h=t.y+t.height;return!(n<r||s<i||a<l||h<o)},contain:function(t,e){var i=this;return t>=i.x&&t<=i.x+i.width&&e>=i.y&&e<=i.y+i.height},clone:function(){return new Kt(this.x,this.y,this.width,this.height)},copy:function(t){this.x=t.x,this.y=t.y,this.width=t.width,this.height=t.height},plain:function(){return{x:this.x,y:this.y,width:this.width,height:this.height}}},Kt.create=function(t){return new Kt(t.x,t.y,t.width,t.height)};var S_=function(t){t=t||{},x_.call(this,t);for(var e in t)t.hasOwnProperty(e)&&(this[e]=t[e]);this._children=[],this.__storage=null,this.__dirty=!0};S_.prototype={constructor:S_,isGroup:!0,type:"group",silent:!1,children:function(){return this._children.slice()},childAt:function(t){return this._children[t]},childOfName:function(t){for(var e=this._children,i=0;i<e.length;i++)if(e[i].name===t)return e[i]},childCount:function(){return this._children.length},add:function(t){return t&&t!==this&&t.parent!==this&&(this._children.push(t),this._doAdd(t)),this},addBefore:function(t,e){if(t&&t!==this&&t.parent!==this&&e&&e.parent===this){var i=this._children,n=i.indexOf(e);n>=0&&(i.splice(n,0,t),this._doAdd(t))}return this},_doAdd:function(t){t.parent&&t.parent.remove(t),t.parent=this;var e=this.__storage,i=this.__zr;e&&e!==t.__storage&&(e.addToStorage(t),t instanceof S_&&t.addChildrenToStorage(e)),i&&i.refresh()},remove:function(t){var e=this.__zr,i=this.__storage,n=this._children,o=l(n,t);return o<0?this:(n.splice(o,1),t.parent=null,i&&(i.delFromStorage(t),t instanceof S_&&t.delChildrenFromStorage(i)),e&&e.refresh(),this)},removeAll:function(){var t,e,i=this._children,n=this.__storage;for(e=0;e<i.length;e++)t=i[e],n&&(n.delFromStorage(t),t instanceof S_&&t.delChildrenFromStorage(n)),t.parent=null;return i.length=0,this},eachChild:function(t,e){for(var i=this._children,n=0;n<i.length;n++){var o=i[n];t.call(e,o,n)}return this},traverse:function(t,e){for(var i=0;i<this._children.length;i++){var n=this._children[i];t.call(e,n),"group"===n.type&&n.traverse(t,e)}return this},addChildrenToStorage:function(t){for(var e=0;e<this._children.length;e++){var i=this._children[e];t.addToStorage(i),i instanceof S_&&i.addChildrenToStorage(t)}},delChildrenFromStorage:function(t){for(var e=0;e<this._children.length;e++){var i=this._children[e];t.delFromStorage(i),i instanceof S_&&i.delChildrenFromStorage(t)}},dirty:function(){return this.__dirty=!0,this.__zr&&this.__zr.refresh(),this},getBoundingRect:function(t){for(var e=null,i=new Kt(0,0,0,0),n=t||this._children,o=[],a=0;a<n.length;a++){var r=n[a];if(!r.ignore&&!r.invisible){var s=r.getBoundingRect(),l=r.getLocalTransform(o);l?(i.copy(s),i.applyTransform(l),(e=e||i.clone()).union(i)):(e=e||s.clone()).union(s)}}return e||i}},h(S_,x_);var M_=32,I_=7,T_=function(){this._roots=[],this._displayList=[],this._displayListLen=0};T_.prototype={constructor:T_,traverse:function(t,e){for(var i=0;i<this._roots.length;i++)this._roots[i].traverse(t,e)},getDisplayList:function(t,e){return e=e||!1,t&&this.updateDisplayList(e),this._displayList},updateDisplayList:function(t){this._displayListLen=0;for(var e=this._roots,i=this._displayList,n=0,o=e.length;n<o;n++)this._updateAndAddDisplayable(e[n],null,t);i.length=this._displayListLen,_x.canvasSupported&&ae(i,re)},_updateAndAddDisplayable:function(t,e,i){if(!t.ignore||i){t.beforeUpdate(),t.__dirty&&t.update(),t.afterUpdate();var n=t.clipPath;if(n){e=e?e.slice():[];for(var o=n,a=t;o;)o.parent=a,o.updateTransform(),e.push(o),a=o,o=o.clipPath}if(t.isGroup){for(var r=t._children,s=0;s<r.length;s++){var l=r[s];t.__dirty&&(l.__dirty=!0),this._updateAndAddDisplayable(l,e,i)}t.__dirty=!1}else t.__clipPaths=e,this._displayList[this._displayListLen++]=t}},addRoot:function(t){t.__storage!==this&&(t instanceof S_&&t.addChildrenToStorage(this),this.addToStorage(t),this._roots.push(t))},delRoot:function(t){if(null==t){for(i=0;i<this._roots.length;i++){var e=this._roots[i];e instanceof S_&&e.delChildrenFromStorage(this)}return this._roots=[],this._displayList=[],void(this._displayListLen=0)}if(t instanceof Array)for(var i=0,n=t.length;i<n;i++)this.delRoot(t[i]);else{var o=l(this._roots,t);o>=0&&(this.delFromStorage(t),this._roots.splice(o,1),t instanceof S_&&t.delChildrenFromStorage(this))}},addToStorage:function(t){return t&&(t.__storage=this,t.dirty(!1)),this},delFromStorage:function(t){return t&&(t.__storage=null),this},dispose:function(){this._renderList=this._roots=null},displayableSortFunc:re};var A_={shadowBlur:1,shadowOffsetX:1,shadowOffsetY:1,textShadowBlur:1,textShadowOffsetX:1,textShadowOffsetY:1,textBoxShadowBlur:1,textBoxShadowOffsetX:1,textBoxShadowOffsetY:1},D_=function(t,e,i){return A_.hasOwnProperty(e)?i*=t.dpr:i},C_=[["shadowBlur",0],["shadowOffsetX",0],["shadowOffsetY",0],["shadowColor","#000"],["lineCap","butt"],["lineJoin","miter"],["miterLimit",10]],L_=function(t,e){this.extendFrom(t,!1),this.host=e};L_.prototype={constructor:L_,host:null,fill:"#000",stroke:null,opacity:1,lineDash:null,lineDashOffset:0,shadowBlur:0,shadowOffsetX:0,shadowOffsetY:0,lineWidth:1,strokeNoScale:!1,text:null,font:null,textFont:null,fontStyle:null,fontWeight:null,fontSize:null,fontFamily:null,textTag:null,textFill:"#000",textStroke:null,textWidth:null,textHeight:null,textStrokeWidth:0,textLineHeight:null,textPosition:"inside",textRect:null,textOffset:null,textAlign:null,textVerticalAlign:null,textDistance:5,textShadowColor:"transparent",textShadowBlur:0,textShadowOffsetX:0,textShadowOffsetY:0,textBoxShadowColor:"transparent",textBoxShadowBlur:0,textBoxShadowOffsetX:0,textBoxShadowOffsetY:0,transformText:!1,textRotation:0,textOrigin:null,textBackgroundColor:null,textBorderColor:null,textBorderWidth:0,textBorderRadius:0,textPadding:null,rich:null,truncate:null,blend:null,bind:function(t,e,i){for(var n=this,o=i&&i.style,a=!o,r=0;r<C_.length;r++){var s=C_[r],l=s[0];(a||n[l]!==o[l])&&(t[l]=D_(t,l,n[l]||s[1]))}if((a||n.fill!==o.fill)&&(t.fillStyle=n.fill),(a||n.stroke!==o.stroke)&&(t.strokeStyle=n.stroke),(a||n.opacity!==o.opacity)&&(t.globalAlpha=null==n.opacity?1:n.opacity),(a||n.blend!==o.blend)&&(t.globalCompositeOperation=n.blend||"source-over"),this.hasStroke()){var h=n.lineWidth;t.lineWidth=h/(this.strokeNoScale&&e&&e.getLineScale?e.getLineScale():1)}},hasFill:function(){var t=this.fill;return null!=t&&"none"!==t},hasStroke:function(){var t=this.stroke;return null!=t&&"none"!==t&&this.lineWidth>0},extendFrom:function(t,e){if(t)for(var i in t)!t.hasOwnProperty(i)||!0!==e&&(!1===e?this.hasOwnProperty(i):null==t[i])||(this[i]=t[i])},set:function(t,e){"string"==typeof t?this[t]=e:this.extendFrom(t,!0)},clone:function(){var t=new this.constructor;return t.extendFrom(this,!0),t},getGradient:function(t,e,i){for(var n=("radial"===e.type?le:se)(t,e,i),o=e.colorStops,a=0;a<o.length;a++)n.addColorStop(o[a].offset,o[a].color);return n}};for(var k_=L_.prototype,P_=0;P_<C_.length;P_++){var O_=C_[P_];O_[0]in k_||(k_[O_[0]]=O_[1])}L_.getGradient=k_.getGradient;var N_=function(t,e){this.image=t,this.repeat=e,this.type="pattern"};N_.prototype.getCanvasPattern=function(t){return t.createPattern(this.image,this.repeat||"repeat")};var E_=function(t,e,i){var n;i=i||g_,"string"==typeof t?n=ue(t,e,i):w(t)&&(t=(n=t).id),this.id=t,this.dom=n;var o=n.style;o&&(n.onselectstart=he,o["-webkit-user-select"]="none",o["user-select"]="none",o["-webkit-touch-callout"]="none",o["-webkit-tap-highlight-color"]="rgba(0,0,0,0)",o.padding=0,o.margin=0,o["border-width"]=0),this.domBack=null,this.ctxBack=null,this.painter=e,this.config=null,this.clearColor=0,this.motionBlur=!1,this.lastFrameAlpha=.7,this.dpr=i};E_.prototype={constructor:E_,__dirty:!0,__used:!1,__drawIndex:0,__startIndex:0,__endIndex:0,incremental:!1,getElementCount:function(){return this.__endIndex-this.__startIndex},initContext:function(){this.ctx=this.dom.getContext("2d"),this.ctx.dpr=this.dpr},createBackBuffer:function(){var t=this.dpr;this.domBack=ue("back-"+this.id,this.painter,t),this.ctxBack=this.domBack.getContext("2d"),1!=t&&this.ctxBack.scale(t,t)},resize:function(t,e){var i=this.dpr,n=this.dom,o=n.style,a=this.domBack;o.width=t+"px",o.height=e+"px",n.width=t*i,n.height=e*i,a&&(a.width=t*i,a.height=e*i,1!=i&&this.ctxBack.scale(i,i))},clear:function(t){var e=this.dom,i=this.ctx,n=e.width,o=e.height,a=this.clearColor,r=this.motionBlur&&!t,s=this.lastFrameAlpha,l=this.dpr;if(r&&(this.domBack||this.createBackBuffer(),this.ctxBack.globalCompositeOperation="copy",this.ctxBack.drawImage(e,0,0,n/l,o/l)),i.clearRect(0,0,n,o),a){var h;a.colorStops?(h=a.__canvasGradient||L_.getGradient(i,a,{x:0,y:0,width:n,height:o}),a.__canvasGradient=h):a.image&&(h=N_.prototype.getCanvasPattern.call(a,i)),i.save(),i.fillStyle=h||a,i.fillRect(0,0,n,o),i.restore()}if(r){var u=this.domBack;i.save(),i.globalAlpha=s,i.drawImage(u,0,0,n,o),i.restore()}}};var z_="undefined"!=typeof window&&(window.requestAnimationFrame&&window.requestAnimationFrame.bind(window)||window.msRequestAnimationFrame&&window.msRequestAnimationFrame.bind(window)||window.mozRequestAnimationFrame||window.webkitRequestAnimationFrame)||function(t){setTimeout(t,16)},R_=new o_(50),B_={},V_=0,G_=5e3,W_=/\{([a-zA-Z0-9_]+)\|([^}]*)\}/g,F_="12px sans-serif",H_={};H_.measureText=function(t,e){var i=s();return i.font=e||F_,i.measureText(t)};var Z_={left:1,right:1,center:1},U_={top:1,bottom:1,middle:1},j_=new Kt,X_=function(){};X_.prototype={constructor:X_,drawRectText:function(t,e){var i=this.style;e=i.textRect||e,this.__dirty&&Oe(i);var n=i.text;if(null!=n&&(n+=""),$e(n,i)){t.save();var o=this.transform;i.transformText?this.setTransform(t):o&&(j_.copy(e),j_.applyTransform(o),e=j_),Ee(this,t,n,i,e),t.restore()}}},Ke.prototype={constructor:Ke,type:"displayable",__dirty:!0,invisible:!1,z:0,z2:0,zlevel:0,draggable:!1,dragging:!1,silent:!1,culling:!1,cursor:"pointer",rectHover:!1,progressive:!1,incremental:!1,inplace:!1,beforeBrush:function(t){},afterBrush:function(t){},brush:function(t,e){},getBoundingRect:function(){},contain:function(t,e){return this.rectContain(t,e)},traverse:function(t,e){t.call(e,this)},rectContain:function(t,e){var i=this.transformCoordToLocal(t,e);return this.getBoundingRect().contain(i[0],i[1])},dirty:function(){this.__dirty=!0,this._rect=null,this.__zr&&this.__zr.refresh()},animateStyle:function(t){return this.animate("style",t)},attrKV:function(t,e){"style"!==t?x_.prototype.attrKV.call(this,t,e):this.style.set(e)},setStyle:function(t,e){return this.style.set(t,e),this.dirty(!1),this},useStyle:function(t){return this.style=new L_(t,this),this.dirty(!1),this}},h(Ke,x_),u(Ke,X_),Je.prototype={constructor:Je,type:"image",brush:function(t,e){var i=this.style,n=i.image;i.bind(t,this,e);var o=this._image=de(n,this._image,this,this.onload);if(o&&pe(o)){var a=i.x||0,r=i.y||0,s=i.width,l=i.height,h=o.width/o.height;if(null==s&&null!=l?s=l*h:null==l&&null!=s?l=s/h:null==s&&null==l&&(s=o.width,l=o.height),this.setTransform(t),i.sWidth&&i.sHeight){var u=i.sx||0,c=i.sy||0;t.drawImage(o,u,c,i.sWidth,i.sHeight,a,r,s,l)}else if(i.sx&&i.sy){var d=s-(u=i.sx),f=l-(c=i.sy);t.drawImage(o,u,c,d,f,a,r,s,l)}else t.drawImage(o,a,r,s,l);null!=i.text&&(this.restoreTransform(t),this.drawRectText(t,this.getBoundingRect()))}},getBoundingRect:function(){var t=this.style;return this._rect||(this._rect=new Kt(t.x||0,t.y||0,t.width||0,t.height||0)),this._rect}},h(Je,Ke);var Y_=new Kt(0,0,0,0),q_=new Kt(0,0,0,0),$_=function(t,e,i){this.type="canvas";var n=!t.nodeName||"CANVAS"===t.nodeName.toUpperCase();this._opts=i=a({},i||{}),this.dpr=i.devicePixelRatio||g_,this._singleCanvas=n,this.root=t;var o=t.style;o&&(o["-webkit-tap-highlight-color"]="transparent",o["-webkit-user-select"]=o["user-select"]=o["-webkit-touch-callout"]="none",t.innerHTML=""),this.storage=e;var r=this._zlevelList=[],s=this._layers={};if(this._layerConfig={},this._needsManuallyCompositing=!1,n){null!=i.width&&(t.width=i.width),null!=i.height&&(t.height=i.height);var l=t.width,h=t.height;this._width=l,this._height=h;var u=new E_(t,this,1);u.__builtin__=!0,u.initContext(),s[314159]=u,r.push(314159),this._domRoot=t}else{this._width=this._getSize(0),this._height=this._getSize(1);var c=this._domRoot=oi(this._width,this._height);t.appendChild(c)}this._hoverlayer=null,this._hoverElements=[]};$_.prototype={constructor:$_,getType:function(){return"canvas"},isSingleCanvas:function(){return this._singleCanvas},getViewportRoot:function(){return this._domRoot},getViewportRootOffset:function(){var t=this.getViewportRoot();if(t)return{offsetLeft:t.offsetLeft||0,offsetTop:t.offsetTop||0}},refresh:function(t){var e=this.storage.getDisplayList(!0),i=this._zlevelList;this._redrawId=Math.random(),this._paintList(e,t,this._redrawId);for(var n=0;n<i.length;n++){var o=i[n],a=this._layers[o];!a.__builtin__&&a.refresh&&a.refresh()}return this.refreshHover(),this},addHover:function(t,e){if(!t.__hoverMir){var i=new t.constructor({style:t.style,shape:t.shape});i.__from=t,t.__hoverMir=i,i.setStyle(e),this._hoverElements.push(i)}},removeHover:function(t){var e=t.__hoverMir,i=this._hoverElements,n=l(i,e);n>=0&&i.splice(n,1),t.__hoverMir=null},clearHover:function(t){for(var e=this._hoverElements,i=0;i<e.length;i++){var n=e[i].__from;n&&(n.__hoverMir=null)}e.length=0},refreshHover:function(){var t=this._hoverElements,e=t.length,i=this._hoverlayer;if(i&&i.clear(),e){ae(t,this.storage.displayableSortFunc),i||(i=this._hoverlayer=this.getLayer(1e5));var n={};i.ctx.save();for(var o=0;o<e;){var a=t[o],r=a.__from;r&&r.__zr?(o++,r.invisible||(a.transform=r.transform,a.invTransform=r.invTransform,a.__clipPaths=r.__clipPaths,this._doPaintEl(a,i,!0,n))):(t.splice(o,1),r.__hoverMir=null,e--)}i.ctx.restore()}},getHoverLayer:function(){return this.getLayer(1e5)},_paintList:function(t,e,i){if(this._redrawId===i){e=e||!1,this._updateLayerStatus(t);var n=this._doPaintList(t,e);if(this._needsManuallyCompositing&&this._compositeManually(),!n){var o=this;z_(function(){o._paintList(t,e,i)})}}},_compositeManually:function(){var t=this.getLayer(314159).ctx,e=this._domRoot.width,i=this._domRoot.height;t.clearRect(0,0,e,i),this.eachBuiltinLayer(function(n){n.virtual&&t.drawImage(n.dom,0,0,e,i)})},_doPaintList:function(t,e){for(var i=[],n=0;n<this._zlevelList.length;n++){var o=this._zlevelList[n];(s=this._layers[o]).__builtin__&&s!==this._hoverlayer&&(s.__dirty||e)&&i.push(s)}for(var a=!0,r=0;r<i.length;r++){var s=i[r],l=s.ctx,h={};l.save();var u=e?s.__startIndex:s.__drawIndex,c=!e&&s.incremental&&Date.now,f=c&&Date.now();if(s.__startIndex===s.__endIndex)s.clear();else if(u===s.__startIndex){var p=t[u];p.incremental&&p.notClear&&!e||s.clear()}-1===u&&(console.error("For some unknown reason. drawIndex is -1"),u=s.__startIndex);for(var g=u;g<s.__endIndex;g++){var m=t[g];if(this._doPaintEl(m,s,e,h),m.__dirty=!1,c&&Date.now()-f>15)break}s.__drawIndex=g,s.__drawIndex<s.__endIndex&&(a=!1),h.prevElClipPaths&&l.restore(),l.restore()}return _x.wxa&&d(this._layers,function(t){t&&t.ctx&&t.ctx.draw&&t.ctx.draw()}),a},_doPaintEl:function(t,e,i,n){var o=e.ctx,a=t.transform;if((e.__dirty||i)&&!t.invisible&&0!==t.style.opacity&&(!a||a[0]||a[3])&&(!t.culling||!ei(t,this._width,this._height))){var r=t.__clipPaths;n.prevElClipPaths&&!ii(r,n.prevElClipPaths)||(n.prevElClipPaths&&(e.ctx.restore(),n.prevElClipPaths=null,n.prevEl=null),r&&(o.save(),ni(r,o),n.prevElClipPaths=r)),t.beforeBrush&&t.beforeBrush(o),t.brush(o,n.prevEl||null),n.prevEl=t,t.afterBrush&&t.afterBrush(o)}},getLayer:function(t,e){this._singleCanvas&&!this._needsManuallyCompositing&&(t=314159);var i=this._layers[t];return i||((i=new E_("zr_"+t,this,this.dpr)).zlevel=t,i.__builtin__=!0,this._layerConfig[t]&&n(i,this._layerConfig[t],!0),e&&(i.virtual=e),this.insertLayer(t,i),i.initContext()),i},insertLayer:function(t,e){var i=this._layers,n=this._zlevelList,o=n.length,a=null,r=-1,s=this._domRoot;if(i[t])v_("ZLevel "+t+" has been used already");else if(ti(e)){if(o>0&&t>n[0]){for(r=0;r<o-1&&!(n[r]<t&&n[r+1]>t);r++);a=i[n[r]]}if(n.splice(r+1,0,t),i[t]=e,!e.virtual)if(a){var l=a.dom;l.nextSibling?s.insertBefore(e.dom,l.nextSibling):s.appendChild(e.dom)}else s.firstChild?s.insertBefore(e.dom,s.firstChild):s.appendChild(e.dom)}else v_("Layer of zlevel "+t+" is not valid")},eachLayer:function(t,e){var i,n,o=this._zlevelList;for(n=0;n<o.length;n++)i=o[n],t.call(e,this._layers[i],i)},eachBuiltinLayer:function(t,e){var i,n,o,a=this._zlevelList;for(o=0;o<a.length;o++)n=a[o],(i=this._layers[n]).__builtin__&&t.call(e,i,n)},eachOtherLayer:function(t,e){var i,n,o,a=this._zlevelList;for(o=0;o<a.length;o++)n=a[o],(i=this._layers[n]).__builtin__||t.call(e,i,n)},getLayers:function(){return this._layers},_updateLayerStatus:function(t){function e(t){i&&(i.__endIndex!==t&&(i.__dirty=!0),i.__endIndex=t)}if(this.eachBuiltinLayer(function(t,e){t.__dirty=t.__used=!1}),this._singleCanvas)for(o=1;o<t.length;o++)if((r=t[o]).zlevel!==t[o-1].zlevel||r.incremental){this._needsManuallyCompositing=!0;break}for(var i=null,n=0,o=0;o<t.length;o++){var a,r=t[o],s=r.zlevel;r.incremental?((a=this.getLayer(s+.001,this._needsManuallyCompositing)).incremental=!0,n=1):a=this.getLayer(s+(n>0?.01:0),this._needsManuallyCompositing),a.__builtin__||v_("ZLevel "+s+" has been used by unkown layer "+a.id),a!==i&&(a.__used=!0,a.__startIndex!==o&&(a.__dirty=!0),a.__startIndex=o,a.incremental?a.__drawIndex=-1:a.__drawIndex=o,e(o),i=a),r.__dirty&&(a.__dirty=!0,a.incremental&&a.__drawIndex<0&&(a.__drawIndex=o))}e(o),this.eachBuiltinLayer(function(t,e){!t.__used&&t.getElementCount()>0&&(t.__dirty=!0,t.__startIndex=t.__endIndex=t.__drawIndex=0),t.__dirty&&t.__drawIndex<0&&(t.__drawIndex=t.__startIndex)})},clear:function(){return this.eachBuiltinLayer(this._clearLayer),this},_clearLayer:function(t){t.clear()},configLayer:function(t,e){if(e){var i=this._layerConfig;i[t]?n(i[t],e,!0):i[t]=e;for(var o=0;o<this._zlevelList.length;o++){var a=this._zlevelList[o];a!==t&&a!==t+.01||n(this._layers[a],i[t],!0)}}},delLayer:function(t){var e=this._layers,i=this._zlevelList,n=e[t];n&&(n.dom.parentNode.removeChild(n.dom),delete e[t],i.splice(l(i,t),1))},resize:function(t,e){if(this._domRoot.style){var i=this._domRoot;i.style.display="none";var n=this._opts;if(null!=t&&(n.width=t),null!=e&&(n.height=e),t=this._getSize(0),e=this._getSize(1),i.style.display="",this._width!=t||e!=this._height){i.style.width=t+"px",i.style.height=e+"px";for(var o in this._layers)this._layers.hasOwnProperty(o)&&this._layers[o].resize(t,e);d(this._progressiveLayers,function(i){i.resize(t,e)}),this.refresh(!0)}this._width=t,this._height=e}else{if(null==t||null==e)return;this._width=t,this._height=e,this.getLayer(314159).resize(t,e)}return this},clearLayer:function(t){var e=this._layers[t];e&&e.clear()},dispose:function(){this.root.innerHTML="",this.root=this.storage=this._domRoot=this._layers=null},getRenderedCanvas:function(t){if(t=t||{},this._singleCanvas&&!this._compositeManually)return this._layers[314159].dom;var e=new E_("image",this,t.pixelRatio||this.dpr);if(e.initContext(),e.clearColor=t.backgroundColor,e.clear(),t.pixelRatio<=this.dpr){this.refresh();var i=e.dom.width,n=e.dom.height,o=e.ctx;this.eachLayer(function(t){t.__builtin__?o.drawImage(t.dom,0,0,i,n):t.renderToCanvas&&(e.ctx.save(),t.renderToCanvas(e.ctx),e.ctx.restore())})}else for(var a={},r=this.storage.getDisplayList(!0),s=0;s<r.length;s++){var l=r[s];this._doPaintEl(l,e,!0,a)}return e.dom},getWidth:function(){return this._width},getHeight:function(){return this._height},_getSize:function(t){var e=this._opts,i=["width","height"][t],n=["clientWidth","clientHeight"][t],o=["paddingLeft","paddingTop"][t],a=["paddingRight","paddingBottom"][t];if(null!=e[i]&&"auto"!==e[i])return parseFloat(e[i]);var r=this.root,s=document.defaultView.getComputedStyle(r);return(r[n]||Qe(s[i])||Qe(r.style[i]))-(Qe(s[o])||0)-(Qe(s[a])||0)|0},pathToImage:function(t,e){e=e||this.dpr;var i=document.createElement("canvas"),n=i.getContext("2d"),o=t.getBoundingRect(),a=t.style,r=a.shadowBlur*e,s=a.shadowOffsetX*e,l=a.shadowOffsetY*e,h=a.hasStroke()?a.lineWidth:0,u=Math.max(h/2,-s+r),c=Math.max(h/2,s+r),d=Math.max(h/2,-l+r),f=Math.max(h/2,l+r),p=o.width+u+c,g=o.height+d+f;i.width=p*e,i.height=g*e,n.scale(e,e),n.clearRect(0,0,p,g),n.dpr=e;var m={position:t.position,rotation:t.rotation,scale:t.scale};t.position=[u-o.x,d-o.y],t.rotation=0,t.scale=[1,1],t.updateTransform(),t&&t.brush(n);var v=new Je({style:{x:0,y:0,image:i}});return null!=m.position&&(v.position=t.position=m.position),null!=m.rotation&&(v.rotation=t.rotation=m.rotation),null!=m.scale&&(v.scale=t.scale=m.scale),v}};var K_="undefined"!=typeof window&&!!window.addEventListener,J_=/^(?:mouse|pointer|contextmenu|drag|drop)|click/,Q_=K_?function(t){t.preventDefault(),t.stopPropagation(),t.cancelBubble=!0}:function(t){t.returnValue=!1,t.cancelBubble=!0},tw=function(t){t=t||{},this.stage=t.stage||{},this.onframe=t.onframe||function(){},this._clips=[],this._running=!1,this._time,this._pausedTime,this._pauseStart,this._paused=!1,Hx.call(this)};tw.prototype={constructor:tw,addClip:function(t){this._clips.push(t)},addAnimator:function(t){t.animation=this;for(var e=t.getClips(),i=0;i<e.length;i++)this.addClip(e[i])},removeClip:function(t){var e=l(this._clips,t);e>=0&&this._clips.splice(e,1)},removeAnimator:function(t){for(var e=t.getClips(),i=0;i<e.length;i++)this.removeClip(e[i]);t.animation=null},_update:function(){for(var t=(new Date).getTime()-this._pausedTime,e=t-this._time,i=this._clips,n=i.length,o=[],a=[],r=0;r<n;r++){var s=i[r],l=s.step(t,e);l&&(o.push(l),a.push(s))}for(r=0;r<n;)i[r]._needsRemove?(i[r]=i[n-1],i.pop(),n--):r++;n=o.length;for(r=0;r<n;r++)a[r].fire(o[r]);this._time=t,this.onframe(e),this.trigger("frame",e),this.stage.update&&this.stage.update()},_startLoop:function(){function t(){e._running&&(z_(t),!e._paused&&e._update())}var e=this;this._running=!0,z_(t)},start:function(){this._time=(new Date).getTime(),this._pausedTime=0,this._startLoop()},stop:function(){this._running=!1},pause:function(){this._paused||(this._pauseStart=(new Date).getTime(),this._paused=!0)},resume:function(){this._paused&&(this._pausedTime+=(new Date).getTime()-this._pauseStart,this._paused=!1)},clear:function(){this._clips=[]},animate:function(t,e){var i=new f_(t,(e=e||{}).loop,e.getter,e.setter);return this.addAnimator(i),i}},u(tw,Hx);var ew=function(){this._track=[]};ew.prototype={constructor:ew,recognize:function(t,e,i){return this._doTrack(t,e,i),this._recognize(t)},clear:function(){return this._track.length=0,this},_doTrack:function(t,e,i){var n=t.touches;if(n){for(var o={points:[],touches:[],target:e,event:t},a=0,r=n.length;a<r;a++){var s=n[a],l=ri(i,s,{});o.points.push([l.zrX,l.zrY]),o.touches.push(s)}this._track.push(o)}},_recognize:function(t){for(var e in iw)if(iw.hasOwnProperty(e)){var i=iw[e](this._track,t);if(i)return i}}};var iw={pinch:function(t,e){var i=t.length;if(i){var n=(t[i-1]||{}).points,o=(t[i-2]||{}).points||n;if(o&&o.length>1&&n&&n.length>1){var a=di(n)/di(o);!isFinite(a)&&(a=1),e.pinchScale=a;var r=fi(n);return e.pinchX=r[0],e.pinchY=r[1],{type:"pinch",target:t[0].target,event:e}}}}},nw=["click","dblclick","mousewheel","mouseout","mouseup","mousedown","mousemove","contextmenu"],ow=["touchstart","touchend","touchmove"],aw={pointerdown:1,pointerup:1,pointermove:1,pointerout:1},rw=f(nw,function(t){var e=t.replace("mouse","pointer");return aw[e]?e:t}),sw={mousemove:function(t){t=li(this.dom,t),this.trigger("mousemove",t)},mouseout:function(t){var e=(t=li(this.dom,t)).toElement||t.relatedTarget;if(e!=this.dom)for(;e&&9!=e.nodeType;){if(e===this.dom)return;e=e.parentNode}this.trigger("mouseout",t)},touchstart:function(t){(t=li(this.dom,t)).zrByTouch=!0,this._lastTouchMoment=new Date,gi(this,t,"start"),sw.mousemove.call(this,t),sw.mousedown.call(this,t),mi(this)},touchmove:function(t){(t=li(this.dom,t)).zrByTouch=!0,gi(this,t,"change"),sw.mousemove.call(this,t),mi(this)},touchend:function(t){(t=li(this.dom,t)).zrByTouch=!0,gi(this,t,"end"),sw.mouseup.call(this,t),+new Date-this._lastTouchMoment<300&&sw.click.call(this,t),mi(this)},pointerdown:function(t){sw.mousedown.call(this,t)},pointermove:function(t){vi(t)||sw.mousemove.call(this,t)},pointerup:function(t){sw.mouseup.call(this,t)},pointerout:function(t){vi(t)||sw.mouseout.call(this,t)}};d(["click","mousedown","mouseup","mousewheel","dblclick","contextmenu"],function(t){sw[t]=function(e){e=li(this.dom,e),this.trigger(t,e)}});var lw=xi.prototype;lw.dispose=function(){for(var t=nw.concat(ow),e=0;e<t.length;e++){var i=t[e];ui(this.dom,pi(i),this._handlers[i])}},lw.setCursor=function(t){this.dom.style&&(this.dom.style.cursor=t||"default")},u(xi,Hx);var hw=!_x.canvasSupported,uw={canvas:$_},cw={},dw=function(t,e,i){i=i||{},this.dom=e,this.id=t;var n=this,o=new T_,a=i.renderer;if(hw){if(!uw.vml)throw new Error("You need to require 'zrender/vml/vml' to support IE8");a="vml"}else a&&uw[a]||(a="canvas");var r=new uw[a](e,o,i,t);this.storage=o,this.painter=r;var s=_x.node||_x.worker?null:new xi(r.getViewportRoot());this.handler=new jx(o,r,s,r.root),this.animation=new tw({stage:{update:m(this.flush,this)}}),this.animation.start(),this._needsRefresh;var l=o.delFromStorage,h=o.addToStorage;o.delFromStorage=function(t){l.call(o,t),t&&t.removeSelfFromZr(n)},o.addToStorage=function(t){h.call(o,t),t.addSelfToZr(n)}};dw.prototype={constructor:dw,getId:function(){return this.id},add:function(t){this.storage.addRoot(t),this._needsRefresh=!0},remove:function(t){this.storage.delRoot(t),this._needsRefresh=!0},configLayer:function(t,e){this.painter.configLayer(t,e),this._needsRefresh=!0},refreshImmediately:function(){this._needsRefresh=!1,this.painter.refresh(),this._needsRefresh=!1},refresh:function(){this._needsRefresh=!0},flush:function(){this._needsRefresh&&this.refreshImmediately(),this._needsRefreshHover&&this.refreshHoverImmediately()},addHover:function(t,e){this.painter.addHover&&(this.painter.addHover(t,e),this.refreshHover())},removeHover:function(t){this.painter.removeHover&&(this.painter.removeHover(t),this.refreshHover())},clearHover:function(){this.painter.clearHover&&(this.painter.clearHover(),this.refreshHover())},refreshHover:function(){this._needsRefreshHover=!0},refreshHoverImmediately:function(){this._needsRefreshHover=!1,this.painter.refreshHover&&this.painter.refreshHover()},resize:function(t){t=t||{},this.painter.resize(t.width,t.height),this.handler.resize()},clearAnimation:function(){this.animation.clear()},getWidth:function(){return this.painter.getWidth()},getHeight:function(){return this.painter.getHeight()},pathToImage:function(t,e){return this.painter.pathToImage(t,e)},setCursorStyle:function(t){this.handler.setCursorStyle(t)},findHover:function(t,e){return this.handler.findHover(t,e)},on:function(t,e,i){this.handler.on(t,e,i)},off:function(t,e){this.handler.off(t,e)},trigger:function(t,e){this.handler.trigger(t,e)},clear:function(){this.storage.delRoot(),this.painter.clear()},dispose:function(){this.animation.stop(),this.clear(),this.storage.dispose(),this.painter.dispose(),this.handler.dispose(),this.animation=this.storage=this.painter=this.handler=null,bi(this.id)}};var fw=(Object.freeze||Object)({version:"4.0.1",init:_i,dispose:function(t){if(t)t.dispose();else{for(var e in cw)cw.hasOwnProperty(e)&&cw[e].dispose();cw={}}return this},getInstance:function(t){return cw[t]},registerPainter:wi}),pw=d,gw=w,mw=y,vw="\0-",yw=["fontStyle","fontWeight","fontSize","fontFamily","rich","tag","color","textBorderColor","textBorderWidth","width","height","lineHeight","align","verticalAlign","baseline","shadowColor","shadowBlur","shadowOffsetX","shadowOffsetY","textShadowColor","textShadowBlur","textShadowOffsetX","textShadowOffsetY","backgroundColor","borderColor","borderWidth","borderRadius","padding"],xw=0,_w=".",ww="___EC__COMPONENT__CONTAINER___",bw=0,Sw=function(t){for(var e=0;e<t.length;e++)t[e][1]||(t[e][1]=t[e][0]);return function(e,i,n){for(var o={},a=0;a<t.length;a++){var r=t[a][1];if(!(i&&l(i,r)>=0||n&&l(n,r)<0)){var s=e.getShallow(r);null!=s&&(o[t[a][0]]=s)}}return o}},Mw=Sw([["lineWidth","width"],["stroke","color"],["opacity"],["shadowBlur"],["shadowOffsetX"],["shadowOffsetY"],["shadowColor"]]),Iw={getLineStyle:function(t){var e=Mw(this,t),i=this.getLineDash(e.lineWidth);return i&&(e.lineDash=i),e},getLineDash:function(t){null==t&&(t=1);var e=this.get("type"),i=Math.max(t,2),n=4*t;return"solid"===e||null==e?null:"dashed"===e?[n,n]:[i,i]}},Tw=Sw([["fill","color"],["shadowBlur"],["shadowOffsetX"],["shadowOffsetY"],["opacity"],["shadowColor"]]),Aw={getAreaStyle:function(t,e){return Tw(this,t,e)}},Dw=Math.pow,Cw=Math.sqrt,Lw=1e-8,kw=1e-4,Pw=Cw(3),Ow=1/3,Nw=V(),Ew=V(),zw=V(),Rw=Math.min,Bw=Math.max,Vw=Math.sin,Gw=Math.cos,Ww=2*Math.PI,Fw=V(),Hw=V(),Zw=V(),Uw=[],jw=[],Xw={M:1,L:2,C:3,Q:4,A:5,Z:6,R:7},Yw=[],qw=[],$w=[],Kw=[],Jw=Math.min,Qw=Math.max,tb=Math.cos,eb=Math.sin,ib=Math.sqrt,nb=Math.abs,ob="undefined"!=typeof Float32Array,ab=function(t){this._saveData=!t,this._saveData&&(this.data=[]),this._ctx=null};ab.prototype={constructor:ab,_xi:0,_yi:0,_x0:0,_y0:0,_ux:0,_uy:0,_len:0,_lineDash:null,_dashOffset:0,_dashIdx:0,_dashSum:0,setScale:function(t,e){this._ux=nb(1/g_/t)||0,this._uy=nb(1/g_/e)||0},getContext:function(){return this._ctx},beginPath:function(t){return this._ctx=t,t&&t.beginPath(),t&&(this.dpr=t.dpr),this._saveData&&(this._len=0),this._lineDash&&(this._lineDash=null,this._dashOffset=0),this},moveTo:function(t,e){return this.addData(Xw.M,t,e),this._ctx&&this._ctx.moveTo(t,e),this._x0=t,this._y0=e,this._xi=t,this._yi=e,this},lineTo:function(t,e){var i=nb(t-this._xi)>this._ux||nb(e-this._yi)>this._uy||this._len<5;return this.addData(Xw.L,t,e),this._ctx&&i&&(this._needsDash()?this._dashedLineTo(t,e):this._ctx.lineTo(t,e)),i&&(this._xi=t,this._yi=e),this},bezierCurveTo:function(t,e,i,n,o,a){return this.addData(Xw.C,t,e,i,n,o,a),this._ctx&&(this._needsDash()?this._dashedBezierTo(t,e,i,n,o,a):this._ctx.bezierCurveTo(t,e,i,n,o,a)),this._xi=o,this._yi=a,this},quadraticCurveTo:function(t,e,i,n){return this.addData(Xw.Q,t,e,i,n),this._ctx&&(this._needsDash()?this._dashedQuadraticTo(t,e,i,n):this._ctx.quadraticCurveTo(t,e,i,n)),this._xi=i,this._yi=n,this},arc:function(t,e,i,n,o,a){return this.addData(Xw.A,t,e,i,i,n,o-n,0,a?0:1),this._ctx&&this._ctx.arc(t,e,i,n,o,a),this._xi=tb(o)*i+t,this._yi=eb(o)*i+t,this},arcTo:function(t,e,i,n,o){return this._ctx&&this._ctx.arcTo(t,e,i,n,o),this},rect:function(t,e,i,n){return this._ctx&&this._ctx.rect(t,e,i,n),this.addData(Xw.R,t,e,i,n),this},closePath:function(){this.addData(Xw.Z);var t=this._ctx,e=this._x0,i=this._y0;return t&&(this._needsDash()&&this._dashedLineTo(e,i),t.closePath()),this._xi=e,this._yi=i,this},fill:function(t){t&&t.fill(),this.toStatic()},stroke:function(t){t&&t.stroke(),this.toStatic()},setLineDash:function(t){if(t instanceof Array){this._lineDash=t,this._dashIdx=0;for(var e=0,i=0;i<t.length;i++)e+=t[i];this._dashSum=e}return this},setLineDashOffset:function(t){return this._dashOffset=t,this},len:function(){return this._len},setData:function(t){var e=t.length;this.data&&this.data.length==e||!ob||(this.data=new Float32Array(e));for(var i=0;i<e;i++)this.data[i]=t[i];this._len=e},appendPath:function(t){t instanceof Array||(t=[t]);for(var e=t.length,i=0,n=this._len,o=0;o<e;o++)i+=t[o].len();ob&&this.data instanceof Float32Array&&(this.data=new Float32Array(n+i));for(o=0;o<e;o++)for(var a=t[o].data,r=0;r<a.length;r++)this.data[n++]=a[r];this._len=n},addData:function(t){if(this._saveData){var e=this.data;this._len+arguments.length>e.length&&(this._expandData(),e=this.data);for(var i=0;i<arguments.length;i++)e[this._len++]=arguments[i];this._prevCmd=t}},_expandData:function(){if(!(this.data instanceof Array)){for(var t=[],e=0;e<this._len;e++)t[e]=this.data[e];this.data=t}},_needsDash:function(){return this._lineDash},_dashedLineTo:function(t,e){var i,n,o=this._dashSum,a=this._dashOffset,r=this._lineDash,s=this._ctx,l=this._xi,h=this._yi,u=t-l,c=e-h,d=ib(u*u+c*c),f=l,p=h,g=r.length;for(u/=d,c/=d,a<0&&(a=o+a),f-=(a%=o)*u,p-=a*c;u>0&&f<=t||u<0&&f>=t||0==u&&(c>0&&p<=e||c<0&&p>=e);)f+=u*(i=r[n=this._dashIdx]),p+=c*i,this._dashIdx=(n+1)%g,u>0&&f<l||u<0&&f>l||c>0&&p<h||c<0&&p>h||s[n%2?"moveTo":"lineTo"](u>=0?Jw(f,t):Qw(f,t),c>=0?Jw(p,e):Qw(p,e));u=f-t,c=p-e,this._dashOffset=-ib(u*u+c*c)},_dashedBezierTo:function(t,e,i,n,o,a){var r,s,l,h,u,c=this._dashSum,d=this._dashOffset,f=this._lineDash,p=this._ctx,g=this._xi,m=this._yi,v=ji,y=0,x=this._dashIdx,_=f.length,w=0;for(d<0&&(d=c+d),d%=c,r=0;r<1;r+=.1)s=v(g,t,i,o,r+.1)-v(g,t,i,o,r),l=v(m,e,n,a,r+.1)-v(m,e,n,a,r),y+=ib(s*s+l*l);for(;x<_&&!((w+=f[x])>d);x++);for(r=(w-d)/y;r<=1;)h=v(g,t,i,o,r),u=v(m,e,n,a,r),x%2?p.moveTo(h,u):p.lineTo(h,u),r+=f[x]/y,x=(x+1)%_;x%2!=0&&p.lineTo(o,a),s=o-h,l=a-u,this._dashOffset=-ib(s*s+l*l)},_dashedQuadraticTo:function(t,e,i,n){var o=i,a=n;i=(i+2*t)/3,n=(n+2*e)/3,t=(this._xi+2*t)/3,e=(this._yi+2*e)/3,this._dashedBezierTo(t,e,i,n,o,a)},toStatic:function(){var t=this.data;t instanceof Array&&(t.length=this._len,ob&&(this.data=new Float32Array(t)))},getBoundingRect:function(){Yw[0]=Yw[1]=$w[0]=$w[1]=Number.MAX_VALUE,qw[0]=qw[1]=Kw[0]=Kw[1]=-Number.MAX_VALUE;for(var t=this.data,e=0,i=0,n=0,o=0,a=0;a<t.length;){var r=t[a++];switch(1==a&&(n=e=t[a],o=i=t[a+1]),r){case Xw.M:e=n=t[a++],i=o=t[a++],$w[0]=n,$w[1]=o,Kw[0]=n,Kw[1]=o;break;case Xw.L:rn(e,i,t[a],t[a+1],$w,Kw),e=t[a++],i=t[a++];break;case Xw.C:sn(e,i,t[a++],t[a++],t[a++],t[a++],t[a],t[a+1],$w,Kw),e=t[a++],i=t[a++];break;case Xw.Q:ln(e,i,t[a++],t[a++],t[a],t[a+1],$w,Kw),e=t[a++],i=t[a++];break;case Xw.A:var s=t[a++],l=t[a++],h=t[a++],u=t[a++],c=t[a++],d=t[a++]+c,f=(t[a++],1-t[a++]);1==a&&(n=tb(c)*h+s,o=eb(c)*u+l),hn(s,l,h,u,c,d,f,$w,Kw),e=tb(d)*h+s,i=eb(d)*u+l;break;case Xw.R:rn(n=e=t[a++],o=i=t[a++],n+t[a++],o+t[a++],$w,Kw);break;case Xw.Z:e=n,i=o}tt(Yw,Yw,$w),et(qw,qw,Kw)}return 0===a&&(Yw[0]=Yw[1]=qw[0]=qw[1]=0),new Kt(Yw[0],Yw[1],qw[0]-Yw[0],qw[1]-Yw[1])},rebuildPath:function(t){for(var e,i,n,o,a,r,s=this.data,l=this._ux,h=this._uy,u=this._len,c=0;c<u;){var d=s[c++];switch(1==c&&(e=n=s[c],i=o=s[c+1]),d){case Xw.M:e=n=s[c++],i=o=s[c++],t.moveTo(n,o);break;case Xw.L:a=s[c++],r=s[c++],(nb(a-n)>l||nb(r-o)>h||c===u-1)&&(t.lineTo(a,r),n=a,o=r);break;case Xw.C:t.bezierCurveTo(s[c++],s[c++],s[c++],s[c++],s[c++],s[c++]),n=s[c-2],o=s[c-1];break;case Xw.Q:t.quadraticCurveTo(s[c++],s[c++],s[c++],s[c++]),n=s[c-2],o=s[c-1];break;case Xw.A:var f=s[c++],p=s[c++],g=s[c++],m=s[c++],v=s[c++],y=s[c++],x=s[c++],_=s[c++],w=g>m?g:m,b=g>m?1:g/m,S=g>m?m/g:1,M=v+y;Math.abs(g-m)>.001?(t.translate(f,p),t.rotate(x),t.scale(b,S),t.arc(0,0,w,v,M,1-_),t.scale(1/b,1/S),t.rotate(-x),t.translate(-f,-p)):t.arc(f,p,w,v,M,1-_),1==c&&(e=tb(v)*g+f,i=eb(v)*m+p),n=tb(M)*g+f,o=eb(M)*m+p;break;case Xw.R:e=n=s[c],i=o=s[c+1],t.rect(s[c++],s[c++],s[c++],s[c++]);break;case Xw.Z:t.closePath(),n=e,o=i}}}},ab.CMD=Xw;var rb=2*Math.PI,sb=2*Math.PI,lb=ab.CMD,hb=2*Math.PI,ub=1e-4,cb=[-1,-1,-1],db=[-1,-1],fb=N_.prototype.getCanvasPattern,pb=Math.abs,gb=new ab(!0);Mn.prototype={constructor:Mn,type:"path",__dirtyPath:!0,strokeContainThreshold:5,brush:function(t,e){var i=this.style,n=this.path||gb,o=i.hasStroke(),a=i.hasFill(),r=i.fill,s=i.stroke,l=a&&!!r.colorStops,h=o&&!!s.colorStops,u=a&&!!r.image,c=o&&!!s.image;if(i.bind(t,this,e),this.setTransform(t),this.__dirty){var d;l&&(d=d||this.getBoundingRect(),this._fillGradient=i.getGradient(t,r,d)),h&&(d=d||this.getBoundingRect(),this._strokeGradient=i.getGradient(t,s,d))}l?t.fillStyle=this._fillGradient:u&&(t.fillStyle=fb.call(r,t)),h?t.strokeStyle=this._strokeGradient:c&&(t.strokeStyle=fb.call(s,t));var f=i.lineDash,p=i.lineDashOffset,g=!!t.setLineDash,m=this.getGlobalScale();n.setScale(m[0],m[1]),this.__dirtyPath||f&&!g&&o?(n.beginPath(t),f&&!g&&(n.setLineDash(f),n.setLineDashOffset(p)),this.buildPath(n,this.shape,!1),this.path&&(this.__dirtyPath=!1)):(t.beginPath(),this.path.rebuildPath(t)),a&&n.fill(t),f&&g&&(t.setLineDash(f),t.lineDashOffset=p),o&&n.stroke(t),f&&g&&t.setLineDash([]),null!=i.text&&(this.restoreTransform(t),this.drawRectText(t,this.getBoundingRect()))},buildPath:function(t,e,i){},createPathProxy:function(){this.path=new ab},getBoundingRect:function(){var t=this._rect,e=this.style,i=!t;if(i){var n=this.path;n||(n=this.path=new ab),this.__dirtyPath&&(n.beginPath(),this.buildPath(n,this.shape,!1)),t=n.getBoundingRect()}if(this._rect=t,e.hasStroke()){var o=this._rectWithStroke||(this._rectWithStroke=t.clone());if(this.__dirty||i){o.copy(t);var a=e.lineWidth,r=e.strokeNoScale?this.getLineScale():1;e.hasFill()||(a=Math.max(a,this.strokeContainThreshold||4)),r>1e-10&&(o.width+=a/r,o.height+=a/r,o.x-=a/r/2,o.y-=a/r/2)}return o}return t},contain:function(t,e){var i=this.transformCoordToLocal(t,e),n=this.getBoundingRect(),o=this.style;if(t=i[0],e=i[1],n.contain(t,e)){var a=this.path.data;if(o.hasStroke()){var r=o.lineWidth,s=o.strokeNoScale?this.getLineScale():1;if(s>1e-10&&(o.hasFill()||(r=Math.max(r,this.strokeContainThreshold)),Sn(a,r/s,t,e)))return!0}if(o.hasFill())return bn(a,t,e)}return!1},dirty:function(t){null==t&&(t=!0),t&&(this.__dirtyPath=t,this._rect=null),this.__dirty=!0,this.__zr&&this.__zr.refresh(),this.__clipTarget&&this.__clipTarget.dirty()},animateShape:function(t){return this.animate("shape",t)},attrKV:function(t,e){"shape"===t?(this.setShape(e),this.__dirtyPath=!0,this._rect=null):Ke.prototype.attrKV.call(this,t,e)},setShape:function(t,e){var i=this.shape;if(i){if(w(t))for(var n in t)t.hasOwnProperty(n)&&(i[n]=t[n]);else i[t]=e;this.dirty(!0)}return this},getLineScale:function(){var t=this.transform;return t&&pb(t[0]-1)>1e-10&&pb(t[3]-1)>1e-10?Math.sqrt(pb(t[0]*t[3]-t[2]*t[1])):1}},Mn.extend=function(t){var e=function(e){Mn.call(this,e),t.style&&this.style.extendFrom(t.style,!1);var i=t.shape;if(i){this.shape=this.shape||{};var n=this.shape;for(var o in i)!n.hasOwnProperty(o)&&i.hasOwnProperty(o)&&(n[o]=i[o])}t.init&&t.init.call(this,e)};h(e,Mn);for(var i in t)"style"!==i&&"shape"!==i&&(e.prototype[i]=t[i]);return e},h(Mn,Ke);var mb=ab.CMD,vb=[[],[],[]],yb=Math.sqrt,xb=Math.atan2,_b=function(t,e){var i,n,o,a,r,s,l=t.data,h=mb.M,u=mb.C,c=mb.L,d=mb.R,f=mb.A,p=mb.Q;for(o=0,a=0;o<l.length;){switch(i=l[o++],a=o,n=0,i){case h:case c:n=1;break;case u:n=3;break;case p:n=2;break;case f:var g=e[4],m=e[5],v=yb(e[0]*e[0]+e[1]*e[1]),y=yb(e[2]*e[2]+e[3]*e[3]),x=xb(-e[1]/y,e[0]/v);l[o]*=v,l[o++]+=g,l[o]*=y,l[o++]+=m,l[o++]*=v,l[o++]*=y,l[o++]+=x,l[o++]+=x,a=o+=2;break;case d:s[0]=l[o++],s[1]=l[o++],Q(s,s,e),l[a++]=s[0],l[a++]=s[1],s[0]+=l[o++],s[1]+=l[o++],Q(s,s,e),l[a++]=s[0],l[a++]=s[1]}for(r=0;r<n;r++)(s=vb[r])[0]=l[o++],s[1]=l[o++],Q(s,s,e),l[a++]=s[0],l[a++]=s[1]}},wb=["m","M","l","L","v","V","h","H","z","Z","c","C","q","Q","t","T","s","S","a","A"],bb=Math.sqrt,Sb=Math.sin,Mb=Math.cos,Ib=Math.PI,Tb=function(t){return Math.sqrt(t[0]*t[0]+t[1]*t[1])},Ab=function(t,e){return(t[0]*e[0]+t[1]*e[1])/(Tb(t)*Tb(e))},Db=function(t,e){return(t[0]*e[1]<t[1]*e[0]?-1:1)*Math.acos(Ab(t,e))},Cb=function(t){Ke.call(this,t)};Cb.prototype={constructor:Cb,type:"text",brush:function(t,e){var i=this.style;this.__dirty&&Oe(i),i.fill=i.stroke=i.shadowBlur=i.shadowColor=i.shadowOffsetX=i.shadowOffsetY=null;var n=i.text;null!=n&&(n+=""),i.bind(t,this,e),$e(n,i)&&(this.setTransform(t),Ee(this,t,n,i),this.restoreTransform(t))},getBoundingRect:function(){var t=this.style;if(this.__dirty&&Oe(t),!this._rect){var e=t.text;null!=e?e+="":e="";var i=me(t.text+"",t.font,t.textAlign,t.textVerticalAlign,t.textPadding,t.rich);if(i.x+=t.x||0,i.y+=t.y||0,je(t.textStroke,t.textStrokeWidth)){var n=t.textStrokeWidth;i.x-=n/2,i.y-=n/2,i.width+=n,i.height+=n}this._rect=i}return this._rect}},h(Cb,Ke);var Lb=Mn.extend({type:"circle",shape:{cx:0,cy:0,r:0},buildPath:function(t,e,i){i&&t.moveTo(e.cx+e.r,e.cy),t.arc(e.cx,e.cy,e.r,0,2*Math.PI,!0)}}),kb=[["shadowBlur",0],["shadowColor","#000"],["shadowOffsetX",0],["shadowOffsetY",0]],Pb=function(t){return _x.browser.ie&&_x.browser.version>=11?function(){var e,i=this.__clipPaths,n=this.style;if(i)for(var o=0;o<i.length;o++){var a=i[o],r=a&&a.shape,s=a&&a.type;if(r&&("sector"===s&&r.startAngle===r.endAngle||"rect"===s&&(!r.width||!r.height))){for(l=0;l<kb.length;l++)kb[l][2]=n[kb[l][0]],n[kb[l][0]]=kb[l][1];e=!0;break}}if(t.apply(this,arguments),e)for(var l=0;l<kb.length;l++)n[kb[l][0]]=kb[l][2]}:t},Ob=Mn.extend({type:"sector",shape:{cx:0,cy:0,r0:0,r:0,startAngle:0,endAngle:2*Math.PI,clockwise:!0},brush:Pb(Mn.prototype.brush),buildPath:function(t,e){var i=e.cx,n=e.cy,o=Math.max(e.r0||0,0),a=Math.max(e.r,0),r=e.startAngle,s=e.endAngle,l=e.clockwise,h=Math.cos(r),u=Math.sin(r);t.moveTo(h*o+i,u*o+n),t.lineTo(h*a+i,u*a+n),t.arc(i,n,a,r,s,!l),t.lineTo(Math.cos(s)*o+i,Math.sin(s)*o+n),0!==o&&t.arc(i,n,o,s,r,l),t.closePath()}}),Nb=Mn.extend({type:"ring",shape:{cx:0,cy:0,r:0,r0:0},buildPath:function(t,e){var i=e.cx,n=e.cy,o=2*Math.PI;t.moveTo(i+e.r,n),t.arc(i,n,e.r,0,o,!1),t.moveTo(i+e.r0,n),t.arc(i,n,e.r0,0,o,!0)}}),Eb=function(t,e){for(var i=t.length,n=[],o=0,a=1;a<i;a++)o+=$(t[a-1],t[a]);var r=o/2;r=r<i?i:r;for(a=0;a<r;a++){var s,l,h,u=a/(r-1)*(e?i:i-1),c=Math.floor(u),d=u-c,f=t[c%i];e?(s=t[(c-1+i)%i],l=t[(c+1)%i],h=t[(c+2)%i]):(s=t[0===c?c:c-1],l=t[c>i-2?i-1:c+1],h=t[c>i-3?i-1:c+2]);var p=d*d,g=d*p;n.push([Ln(s[0],f[0],l[0],h[0],d,p,g),Ln(s[1],f[1],l[1],h[1],d,p,g)])}return n},zb=function(t,e,i,n){var o,a,r,s,l=[],h=[],u=[],c=[];if(n){r=[1/0,1/0],s=[-1/0,-1/0];for(var d=0,f=t.length;d<f;d++)tt(r,r,t[d]),et(s,s,t[d]);tt(r,r,n[0]),et(s,s,n[1])}for(var d=0,f=t.length;d<f;d++){var p=t[d];if(i)o=t[d?d-1:f-1],a=t[(d+1)%f];else{if(0===d||d===f-1){l.push(W(t[d]));continue}o=t[d-1],a=t[d+1]}U(h,a,o),Y(h,h,e);var g=$(p,o),m=$(p,a),v=g+m;0!==v&&(g/=v,m/=v),Y(u,h,-g),Y(c,h,m);var y=H([],p,u),x=H([],p,c);n&&(et(y,y,r),tt(y,y,s),et(x,x,r),tt(x,x,s)),l.push(y),l.push(x)}return i&&l.push(l.shift()),l},Rb=Mn.extend({type:"polygon",shape:{points:null,smooth:!1,smoothConstraint:null},buildPath:function(t,e){kn(t,e,!0)}}),Bb=Mn.extend({type:"polyline",shape:{points:null,smooth:!1,smoothConstraint:null},style:{stroke:"#000",fill:null},buildPath:function(t,e){kn(t,e,!1)}}),Vb=Mn.extend({type:"rect",shape:{r:0,x:0,y:0,width:0,height:0},buildPath:function(t,e){var i=e.x,n=e.y,o=e.width,a=e.height;e.r?Pe(t,e):t.rect(i,n,o,a),t.closePath()}}),Gb=Mn.extend({type:"line",shape:{x1:0,y1:0,x2:0,y2:0,percent:1},style:{stroke:"#000",fill:null},buildPath:function(t,e){var i=e.x1,n=e.y1,o=e.x2,a=e.y2,r=e.percent;0!==r&&(t.moveTo(i,n),r<1&&(o=i*(1-r)+o*r,a=n*(1-r)+a*r),t.lineTo(o,a))},pointAt:function(t){var e=this.shape;return[e.x1*(1-t)+e.x2*t,e.y1*(1-t)+e.y2*t]}}),Wb=[],Fb=Mn.extend({type:"bezier-curve",shape:{x1:0,y1:0,x2:0,y2:0,cpx1:0,cpy1:0,percent:1},style:{stroke:"#000",fill:null},buildPath:function(t,e){var i=e.x1,n=e.y1,o=e.x2,a=e.y2,r=e.cpx1,s=e.cpy1,l=e.cpx2,h=e.cpy2,u=e.percent;0!==u&&(t.moveTo(i,n),null==l||null==h?(u<1&&(nn(i,r,o,u,Wb),r=Wb[1],o=Wb[2],nn(n,s,a,u,Wb),s=Wb[1],a=Wb[2]),t.quadraticCurveTo(r,s,o,a)):(u<1&&($i(i,r,l,o,u,Wb),r=Wb[1],l=Wb[2],o=Wb[3],$i(n,s,h,a,u,Wb),s=Wb[1],h=Wb[2],a=Wb[3]),t.bezierCurveTo(r,s,l,h,o,a)))},pointAt:function(t){return Pn(this.shape,t,!1)},tangentAt:function(t){var e=Pn(this.shape,t,!0);return q(e,e)}}),Hb=Mn.extend({type:"arc",shape:{cx:0,cy:0,r:0,startAngle:0,endAngle:2*Math.PI,clockwise:!0},style:{stroke:"#000",fill:null},buildPath:function(t,e){var i=e.cx,n=e.cy,o=Math.max(e.r,0),a=e.startAngle,r=e.endAngle,s=e.clockwise,l=Math.cos(a),h=Math.sin(a);t.moveTo(l*o+i,h*o+n),t.arc(i,n,o,a,r,!s)}}),Zb=Mn.extend({type:"compound",shape:{paths:null},_updatePathDirty:function(){for(var t=this.__dirtyPath,e=this.shape.paths,i=0;i<e.length;i++)t=t||e[i].__dirtyPath;this.__dirtyPath=t,this.__dirty=this.__dirty||t},beforeBrush:function(){this._updatePathDirty();for(var t=this.shape.paths||[],e=this.getGlobalScale(),i=0;i<t.length;i++)t[i].path||t[i].createPathProxy(),t[i].path.setScale(e[0],e[1])},buildPath:function(t,e){for(var i=e.paths||[],n=0;n<i.length;n++)i[n].buildPath(t,i[n].shape,!0)},afterBrush:function(){for(var t=this.shape.paths||[],e=0;e<t.length;e++)t[e].__dirtyPath=!1},getBoundingRect:function(){return this._updatePathDirty(),Mn.prototype.getBoundingRect.call(this)}}),Ub=function(t){this.colorStops=t||[]};Ub.prototype={constructor:Ub,addColorStop:function(t,e){this.colorStops.push({offset:t,color:e})}};var jb=function(t,e,i,n,o,a){this.x=null==t?0:t,this.y=null==e?0:e,this.x2=null==i?1:i,this.y2=null==n?0:n,this.type="linear",this.global=a||!1,Ub.call(this,o)};jb.prototype={constructor:jb},h(jb,Ub);var Xb=function(t,e,i,n,o){this.x=null==t?.5:t,this.y=null==e?.5:e,this.r=null==i?.5:i,this.type="radial",this.global=o||!1,Ub.call(this,n)};Xb.prototype={constructor:Xb},h(Xb,Ub),On.prototype.incremental=!0,On.prototype.clearDisplaybles=function(){this._displayables=[],this._temporaryDisplayables=[],this._cursor=0,this.dirty(),this.notClear=!1},On.prototype.addDisplayable=function(t,e){e?this._temporaryDisplayables.push(t):this._displayables.push(t),this.dirty()},On.prototype.addDisplayables=function(t,e){e=e||!1;for(var i=0;i<t.length;i++)this.addDisplayable(t[i],e)},On.prototype.eachPendingDisplayable=function(t){for(e=this._cursor;e<this._displayables.length;e++)t&&t(this._displayables[e]);for(var e=0;e<this._temporaryDisplayables.length;e++)t&&t(this._temporaryDisplayables[e])},On.prototype.update=function(){this.updateTransform();for(t=this._cursor;t<this._displayables.length;t++)(e=this._displayables[t]).parent=this,e.update(),e.parent=null;for(var t=0;t<this._temporaryDisplayables.length;t++){var e=this._temporaryDisplayables[t];e.parent=this,e.update(),e.parent=null}},On.prototype.brush=function(t,e){for(i=this._cursor;i<this._displayables.length;i++)(n=this._temporaryDisplayables[i]).beforeBrush&&n.beforeBrush(t),n.brush(t,i===this._cursor?null:this._displayables[i-1]),n.afterBrush&&n.afterBrush(t);this._cursor=i;for(var i=0;i<this._temporaryDisplayables.length;i++){var n=this._temporaryDisplayables[i];n.beforeBrush&&n.beforeBrush(t),n.brush(t,0===i?null:this._temporaryDisplayables[i-1]),n.afterBrush&&n.afterBrush(t)}this._temporaryDisplayables=[],this.notClear=!0};var Yb=[];On.prototype.getBoundingRect=function(){if(!this._rect){for(var t=new Kt(1/0,1/0,-1/0,-1/0),e=0;e<this._displayables.length;e++){var i=this._displayables[e],n=i.getBoundingRect().clone();i.needLocalTransform()&&n.applyTransform(i.getLocalTransform(Yb)),t.union(n)}this._rect=t}return this._rect},On.prototype.contain=function(t,e){var i=this.transformCoordToLocal(t,e);if(this.getBoundingRect().contain(i[0],i[1]))for(var n=0;n<this._displayables.length;n++)if(this._displayables[n].contain(t,e))return!0;return!1},h(On,Ke);var qb=Math.round,$b=Math.max,Kb=Math.min,Jb={},Qb=function(t,e){for(var i=[],n=t.length,o=0;o<n;o++){var a=t[o];a.path||a.createPathProxy(),a.__dirtyPath&&a.buildPath(a.path,a.shape,!0),i.push(a.path)}var r=new Mn(e);return r.createPathProxy(),r.buildPath=function(t){t.appendPath(i);var e=t.getContext();e&&t.rebuildPath(e)},r},tS=(Object.freeze||Object)({extendShape:Nn,extendPath:function(t,e){return Cn(t,e)},makePath:En,makeImage:zn,mergePath:Qb,resizePath:Bn,subPixelOptimizeLine:Vn,subPixelOptimizeRect:Gn,subPixelOptimize:Wn,setHoverStyle:to,setLabelStyle:eo,setTextStyle:io,setText:function(t,e,i){var n,o={isRectText:!0};!1===i?n=!0:o.autoColor=i,no(t,e,o,n),t.host&&t.host.dirty&&t.host.dirty(!1)},getFont:ho,updateProps:co,initProps:fo,getTransform:po,applyTransform:go,transformDirection:mo,groupTransition:vo,clipPointsByRect:yo,clipRectByRect:function(t,e){var i=$b(t.x,e.x),n=Kb(t.x+t.width,e.x+e.width),o=$b(t.y,e.y),a=Kb(t.y+t.height,e.y+e.height);if(n>=i&&a>=o)return{x:i,y:o,width:n-i,height:a-o}},createIcon:xo,Group:S_,Image:Je,Text:Cb,Circle:Lb,Sector:Ob,Ring:Nb,Polygon:Rb,Polyline:Bb,Rect:Vb,Line:Gb,BezierCurve:Fb,Arc:Hb,IncrementalDisplayable:On,CompoundPath:Zb,LinearGradient:jb,RadialGradient:Xb,BoundingRect:Kt}),eS=["textStyle","color"],iS={getTextColor:function(t){var e=this.ecModel;return this.getShallow("color")||(!t&&e?e.get(eS):null)},getFont:function(){return ho({fontStyle:this.getShallow("fontStyle"),fontWeight:this.getShallow("fontWeight"),fontSize:this.getShallow("fontSize"),fontFamily:this.getShallow("fontFamily")},this.ecModel)},getTextRect:function(t){return me(t,this.getFont(),this.getShallow("align"),this.getShallow("verticalAlign")||this.getShallow("baseline"),this.getShallow("padding"),this.getShallow("rich"),this.getShallow("truncateText"))}},nS=Sw([["fill","color"],["stroke","borderColor"],["lineWidth","borderWidth"],["opacity"],["shadowBlur"],["shadowOffsetX"],["shadowOffsetY"],["shadowColor"],["textPosition"],["textAlign"]]),oS={getItemStyle:function(t,e){var i=nS(this,t,e),n=this.getBorderLineDash();return n&&(i.lineDash=n),i},getBorderLineDash:function(){var t=this.get("borderType");return"solid"===t||null==t?null:"dashed"===t?[5,5]:[1,1]}},aS=u,rS=Pi();_o.prototype={constructor:_o,init:null,mergeOption:function(t){n(this.option,t,!0)},get:function(t,e){return null==t?this.option:wo(this.option,this.parsePath(t),!e&&bo(this,t))},getShallow:function(t,e){var i=this.option,n=null==i?i:i[t],o=!e&&bo(this,t);return null==n&&o&&(n=o.getShallow(t)),n},getModel:function(t,e){var i,n=null==t?this.option:wo(this.option,t=this.parsePath(t));return e=e||(i=bo(this,t))&&i.getModel(t),new _o(n,e,this.ecModel)},isEmpty:function(){return null==this.option},restoreData:function(){},clone:function(){return new(0,this.constructor)(i(this.option))},setReadOnly:function(t){},parsePath:function(t){return"string"==typeof t&&(t=t.split(".")),t},customizeGetParent:function(t){rS(this).getParent=t},isAnimationEnabled:function(){if(!_x.node){if(null!=this.option.animation)return!!this.option.animation;if(this.parentModel)return this.parentModel.isAnimationEnabled()}}},Vi(_o),Gi(_o),aS(_o,Iw),aS(_o,Aw),aS(_o,iS),aS(_o,oS);var sS=0,lS=1e-4,hS=9007199254740991,uS=/^(?:(\d{4})(?:[-\/](\d{1,2})(?:[-\/](\d{1,2})(?:[T ](\d{1,2})(?::(\d\d)(?::(\d\d)(?:[.,](\d+))?)?)?(Z|[\+\-]\d\d:?\d\d)?)?)?)?)?$/,cS=(Object.freeze||Object)({linearMap:Io,parsePercent:To,round:Ao,asc:Do,getPrecision:Co,getPrecisionSafe:Lo,getPixelPrecision:ko,getPercentWithPrecision:Po,MAX_SAFE_INTEGER:hS,remRadian:Oo,isRadianAroundZero:No,parseDate:Eo,quantity:zo,nice:Bo,reformIntervals:Vo,isNumeric:Go}),dS=L,fS=["a","b","c","d","e","f","g"],pS=function(t,e){return"{"+t+(null==e?"":e)+"}"},gS=function(t){return t<10?"0"+t:t},mS=be,vS=me,yS=(Object.freeze||Object)({addCommas:Wo,toCamelCase:Fo,normalizeCssArray:dS,encodeHTML:Ho,formatTpl:Zo,formatTplSimple:Uo,getTooltipMarker:jo,formatTime:Xo,capitalFirst:Yo,truncateText:mS,getTextRect:vS}),xS=d,_S=["left","right","top","bottom","width","height"],wS=[["width","left","right"],["height","top","bottom"]],bS=qo,SS=(v(qo,"vertical"),v(qo,"horizontal"),{getBoxLayoutParams:function(){return{left:this.get("left"),top:this.get("top"),right:this.get("right"),bottom:this.get("bottom"),width:this.get("width"),height:this.get("height")}}}),MS=Pi(),IS=_o.extend({type:"component",id:"",name:"",mainType:"",subType:"",componentIndex:0,defaultOption:null,ecModel:null,dependentModels:[],uid:null,layoutMode:null,$constructor:function(t,e,i,n){_o.call(this,t,e,i,n),this.uid=So("ec_cpt_model")},init:function(t,e,i,n){this.mergeDefaultAndTheme(t,i)},mergeDefaultAndTheme:function(t,e){var i=this.layoutMode,o=i?ea(t):{};n(t,e.getTheme().get(this.mainType)),n(t,this.getDefaultOption()),i&&ta(t,o,i)},mergeOption:function(t,e){n(this.option,t,!0);var i=this.layoutMode;i&&ta(this.option,t,i)},optionUpdated:function(t,e){},getDefaultOption:function(){var t=MS(this);if(!t.defaultOption){for(var e=[],i=this.constructor;i;){var o=i.prototype.defaultOption;o&&e.push(o),i=i.superClass}for(var a={},r=e.length-1;r>=0;r--)a=n(a,e[r],!0);t.defaultOption=a}return t.defaultOption},getReferringComponents:function(t){return this.ecModel.queryComponents({mainType:t,index:this.get(t+"Index",!0),id:this.get(t+"Id",!0)})}});Hi(IS,{registerWhenExtend:!0}),function(t){var e={};t.registerSubTypeDefaulter=function(t,i){t=Ri(t),e[t.main]=i},t.determineSubType=function(i,n){var o=n.type;if(!o){var a=Ri(i).main;t.hasSubTypes(i)&&e[a]&&(o=e[a](n))}return o}}(IS),function(t,e){function i(t){var i={},a=[];return d(t,function(r){var s=n(i,r),h=o(s.originalDeps=e(r),t);s.entryCount=h.length,0===s.entryCount&&a.push(r),d(h,function(t){l(s.predecessor,t)<0&&s.predecessor.push(t);var e=n(i,t);l(e.successor,t)<0&&e.successor.push(r)})}),{graph:i,noEntryList:a}}function n(t,e){return t[e]||(t[e]={predecessor:[],successor:[]}),t[e]}function o(t,e){var i=[];return d(t,function(t){l(e,t)>=0&&i.push(t)}),i}t.topologicalTravel=function(t,e,n,o){function a(t){s[t].entryCount--,0===s[t].entryCount&&l.push(t)}if(t.length){var r=i(e),s=r.graph,l=r.noEntryList,h={};for(d(t,function(t){h[t]=!0});l.length;){var u=l.pop(),c=s[u],f=!!h[u];f&&(n.call(o,u,c.originalDeps.slice()),delete h[u]),d(c.successor,f?function(t){h[t]=!0,a(t)}:a)}d(h,function(){throw new Error("Circle dependency may exists")})}}}(IS,function(t){var e=[];return d(IS.getClassesByMainType(t),function(t){e=e.concat(t.prototype.dependencies||[])}),e=f(e,function(t){return Ri(t).main}),"dataset"!==t&&l(e,"dataset")<=0&&e.unshift("dataset"),e}),u(IS,SS);var TS="";"undefined"!=typeof navigator&&(TS=navigator.platform||"");var AS={color:["#c23531","#2f4554","#61a0a8","#d48265","#91c7ae","#749f83","#ca8622","#bda29a","#6e7074","#546570","#c4ccd3"],gradientColor:["#f6efa6","#d88273","#bf444c"],textStyle:{fontFamily:TS.match(/^Win/)?"Microsoft YaHei":"sans-serif",fontSize:12,fontStyle:"normal",fontWeight:"normal"},blendMode:null,animation:"auto",animationDuration:1e3,animationDurationUpdate:300,animationEasing:"exponentialOut",animationEasingUpdate:"cubicOut",animationThreshold:2e3,progressiveThreshold:3e3,progressive:400,hoverLayerThreshold:3e3,useUTC:!1},DS=Pi(),CS={clearColorPalette:function(){DS(this).colorIdx=0,DS(this).colorNameMap={}},getColorFromPalette:function(t,e,i){var n=DS(e=e||this),o=n.colorIdx||0,a=n.colorNameMap=n.colorNameMap||{};if(a.hasOwnProperty(t))return a[t];var r=Si(this.get("color",!0)),s=this.get("colorLayer",!0),l=null!=i&&s?na(s,i):r;if((l=l||r)&&l.length){var h=l[o];return t&&(a[t]=h),n.colorIdx=(o+1)%l.length,h}}},LS={cartesian2d:function(t,e,i,n){var o=t.getReferringComponents("xAxis")[0],a=t.getReferringComponents("yAxis")[0];e.coordSysDims=["x","y"],i.set("x",o),i.set("y",a),aa(o)&&(n.set("x",o),e.firstCategoryDimIndex=0),aa(a)&&(n.set("y",a),e.firstCategoryDimIndex=1)},singleAxis:function(t,e,i,n){var o=t.getReferringComponents("singleAxis")[0];e.coordSysDims=["single"],i.set("single",o),aa(o)&&(n.set("single",o),e.firstCategoryDimIndex=0)},polar:function(t,e,i,n){var o=t.getReferringComponents("polar")[0],a=o.findAxisModel("radiusAxis"),r=o.findAxisModel("angleAxis");e.coordSysDims=["radius","angle"],i.set("radius",a),i.set("angle",r),aa(a)&&(n.set("radius",a),e.firstCategoryDimIndex=0),aa(r)&&(n.set("angle",r),e.firstCategoryDimIndex=1)},geo:function(t,e,i,n){e.coordSysDims=["lng","lat"]},parallel:function(t,e,i,n){var o=t.ecModel,a=o.getComponent("parallel",t.get("parallelIndex")),r=e.coordSysDims=a.dimensions.slice();d(a.parallelAxisIndex,function(t,a){var s=o.getComponent("parallelAxis",t),l=r[a];i.set(l,s),aa(s)&&null==e.firstCategoryDimIndex&&(n.set(l,s),e.firstCategoryDimIndex=a)})}},kS="original",PS="arrayRows",OS="objectRows",NS="keyedColumns",ES="unknown",zS="typedArray",RS="column",BS="row";ra.seriesDataToSource=function(t){return new ra({data:t,sourceFormat:S(t)?zS:kS,fromDataset:!1})},Gi(ra);var VS=Pi(),GS="\0_ec_inner",WS=_o.extend({constructor:WS,init:function(t,e,i,n){i=i||{},this.option=null,this._theme=new _o(i),this._optionManager=n},setOption:function(t,e){k(!(GS in t),"please use chart.getOption()"),this._optionManager.setOption(t,e),this.resetOption(null)},resetOption:function(t){var e=!1,i=this._optionManager;if(!t||"recreate"===t){var n=i.mountOption("recreate"===t);this.option&&"recreate"!==t?(this.restoreData(),this.mergeOption(n)):wa.call(this,n),e=!0}if("timeline"!==t&&"media"!==t||this.restoreData(),!t||"recreate"===t||"timeline"===t){var o=i.getTimelineOption(this);o&&(this.mergeOption(o),e=!0)}if(!t||"recreate"===t||"media"===t){var a=i.getMediaOption(this,this._api);a.length&&d(a,function(t){this.mergeOption(t,e=!0)},this)}return e},mergeOption:function(t){var e=this.option,o=this._componentsMap,r=[];ha(this),d(t,function(t,o){null!=t&&(IS.hasClass(o)?o&&r.push(o):e[o]=null==e[o]?i(t):n(e[o],t,!0))}),IS.topologicalTravel(r,IS.getAllClassMainTypes(),function(i,n){var r=Si(t[i]),s=Ai(o.get(i),r);Di(s),d(s,function(t,e){var n=t.option;w(n)&&(t.keyInfo.mainType=i,t.keyInfo.subType=Sa(i,n,t.exist))});var l=ba(o,n);e[i]=[],o.set(i,[]),d(s,function(t,n){var r=t.exist,s=t.option;if(k(w(s)||r,"Empty component definition"),s){var h=IS.getClass(i,t.keyInfo.subType,!0);if(r&&r instanceof h)r.name=t.keyInfo.name,r.mergeOption(s,this),r.optionUpdated(s,!1);else{var u=a({dependentModels:l,componentIndex:n},t.keyInfo);a(r=new h(s,this,this,u),u),r.init(s,this,this,u),r.optionUpdated(null,!0)}}else r.mergeOption({},this),r.optionUpdated({},!1);o.get(i)[n]=r,e[i][n]=r.option},this),"series"===i&&Ma(this,o.get("series"))},this),this._seriesIndicesMap=z(this._seriesIndices=this._seriesIndices||[])},getOption:function(){var t=i(this.option);return d(t,function(e,i){if(IS.hasClass(i)){for(var n=(e=Si(e)).length-1;n>=0;n--)Ci(e[n])&&e.splice(n,1);t[i]=e}}),delete t[GS],t},getTheme:function(){return this._theme},getComponent:function(t,e){var i=this._componentsMap.get(t);if(i)return i[e||0]},queryComponents:function(t){var e=t.mainType;if(!e)return[];var i=t.index,n=t.id,o=t.name,a=this._componentsMap.get(e);if(!a||!a.length)return[];var r;if(null!=i)y(i)||(i=[i]),r=g(f(i,function(t){return a[t]}),function(t){return!!t});else if(null!=n){var s=y(n);r=g(a,function(t){return s&&l(n,t.id)>=0||!s&&t.id===n})}else if(null!=o){var h=y(o);r=g(a,function(t){return h&&l(o,t.name)>=0||!h&&t.name===o})}else r=a.slice();return Ia(r,t)},findComponents:function(t){var e=t.query,i=t.mainType,n=function(t){var e=i+"Index",n=i+"Id",o=i+"Name";return!t||null==t[e]&&null==t[n]&&null==t[o]?null:{mainType:i,index:t[e],id:t[n],name:t[o]}}(e);return function(e){return t.filter?g(e,t.filter):e}(Ia(n?this.queryComponents(n):this._componentsMap.get(i),t))},eachComponent:function(t,e,i){var n=this._componentsMap;"function"==typeof t?(i=e,e=t,n.each(function(t,n){d(t,function(t,o){e.call(i,n,t,o)})})):_(t)?d(n.get(t),e,i):w(t)&&d(this.findComponents(t),e,i)},getSeriesByName:function(t){return g(this._componentsMap.get("series"),function(e){return e.name===t})},getSeriesByIndex:function(t){return this._componentsMap.get("series")[t]},getSeriesByType:function(t){return g(this._componentsMap.get("series"),function(e){return e.subType===t})},getSeries:function(){return this._componentsMap.get("series").slice()},getSeriesCount:function(){return this._componentsMap.get("series").length},eachSeries:function(t,e){d(this._seriesIndices,function(i){var n=this._componentsMap.get("series")[i];t.call(e,n,i)},this)},eachRawSeries:function(t,e){d(this._componentsMap.get("series"),t,e)},eachSeriesByType:function(t,e,i){d(this._seriesIndices,function(n){var o=this._componentsMap.get("series")[n];o.subType===t&&e.call(i,o,n)},this)},eachRawSeriesByType:function(t,e,i){return d(this.getSeriesByType(t),e,i)},isSeriesFiltered:function(t){return null==this._seriesIndicesMap.get(t.componentIndex)},getCurrentSeriesIndices:function(){return(this._seriesIndices||[]).slice()},filterSeries:function(t,e){Ma(this,g(this._componentsMap.get("series"),t,e))},restoreData:function(t){var e=this._componentsMap;Ma(this,e.get("series"));var i=[];e.each(function(t,e){i.push(e)}),IS.topologicalTravel(i,IS.getAllClassMainTypes(),function(i,n){d(e.get(i),function(e){("series"!==i||!xa(e,t))&&e.restoreData()})})}});u(WS,CS);var FS=["getDom","getZr","getWidth","getHeight","getDevicePixelRatio","dispatchAction","isDisposed","on","off","getDataURL","getConnectedDataURL","getModel","getOption","getViewOfComponentModel","getViewOfSeriesModel"],HS={};Aa.prototype={constructor:Aa,create:function(t,e){var i=[];d(HS,function(n,o){var a=n.create(t,e);i=i.concat(a||[])}),this._coordinateSystems=i},update:function(t,e){d(this._coordinateSystems,function(i){i.update&&i.update(t,e)})},getCoordinateSystems:function(){return this._coordinateSystems.slice()}},Aa.register=function(t,e){HS[t]=e},Aa.get=function(t){return HS[t]};var ZS=d,US=i,jS=f,XS=n,YS=/^(min|max)?(.+)$/;Da.prototype={constructor:Da,setOption:function(t,e){t&&d(Si(t.series),function(t){t&&t.data&&S(t.data)&&O(t.data)}),t=US(t,!0);var i=this._optionBackup,n=Ca.call(this,t,e,!i);this._newBaseOption=n.baseOption,i?(Oa(i.baseOption,n.baseOption),n.timelineOptions.length&&(i.timelineOptions=n.timelineOptions),n.mediaList.length&&(i.mediaList=n.mediaList),n.mediaDefault&&(i.mediaDefault=n.mediaDefault)):this._optionBackup=n},mountOption:function(t){var e=this._optionBackup;return this._timelineOptions=jS(e.timelineOptions,US),this._mediaList=jS(e.mediaList,US),this._mediaDefault=US(e.mediaDefault),this._currentMediaIndices=[],US(t?e.baseOption:this._newBaseOption)},getTimelineOption:function(t){var e,i=this._timelineOptions;if(i.length){var n=t.getComponent("timeline");n&&(e=US(i[n.getCurrentIndex()],!0))}return e},getMediaOption:function(t){var e=this._api.getWidth(),i=this._api.getHeight(),n=this._mediaList,o=this._mediaDefault,a=[],r=[];if(!n.length&&!o)return r;for(var s=0,l=n.length;s<l;s++)La(n[s].query,e,i)&&a.push(s);return!a.length&&o&&(a=[-1]),a.length&&!Pa(a,this._currentMediaIndices)&&(r=jS(a,function(t){return US(-1===t?o.option:n[t].option)})),this._currentMediaIndices=a,r}};var qS=d,$S=w,KS=["areaStyle","lineStyle","nodeStyle","linkStyle","chordStyle","label","labelLine"],JS=function(t,e){qS(Ga(t.series),function(t){$S(t)&&Va(t)});var i=["xAxis","yAxis","radiusAxis","angleAxis","singleAxis","parallelAxis","radar"];e&&i.push("valueAxis","categoryAxis","logAxis","timeAxis"),qS(i,function(e){qS(Ga(t[e]),function(t){t&&(Ra(t,"axisLabel"),Ra(t.axisPointer,"label"))})}),qS(Ga(t.parallel),function(t){var e=t&&t.parallelAxisDefault;Ra(e,"axisLabel"),Ra(e&&e.axisPointer,"label")}),qS(Ga(t.calendar),function(t){Ea(t,"itemStyle"),Ra(t,"dayLabel"),Ra(t,"monthLabel"),Ra(t,"yearLabel")}),qS(Ga(t.radar),function(t){Ra(t,"name")}),qS(Ga(t.geo),function(t){$S(t)&&(Ba(t),qS(Ga(t.regions),function(t){Ba(t)}))}),qS(Ga(t.timeline),function(t){Ba(t),Ea(t,"label"),Ea(t,"itemStyle"),Ea(t,"controlStyle",!0),Ea(t,"checkpointStyle");var e=t.data;y(e)&&d(e,function(t){w(t)&&(Ea(t,"label"),Ea(t,"itemStyle"))})}),qS(Ga(t.toolbox),function(t){Ea(t,"iconStyle"),qS(t.feature,function(t){Ea(t,"iconStyle")})}),Ra(Wa(t.axisPointer),"label"),Ra(Wa(t.tooltip).axisPointer,"label")},QS=[["x","left"],["y","top"],["x2","right"],["y2","bottom"]],tM=["grid","geo","parallel","legend","toolbox","title","visualMap","dataZoom","timeline"],eM=function(t,e){JS(t,e),t.series=Si(t.series),d(t.series,function(t){if(w(t)){var e=t.type;if("pie"!==e&&"gauge"!==e||null!=t.clockWise&&(t.clockwise=t.clockWise),"gauge"===e){var i=Fa(t,"pointer.color");null!=i&&Ha(t,"itemStyle.normal.color",i)}Za(t)}}),t.dataRange&&(t.visualMap=t.dataRange),d(tM,function(e){var i=t[e];i&&(y(i)||(i=[i]),d(i,function(t){Za(t)}))})},iM=Ua.prototype;iM.pure=!1,iM.persistent=!0,iM.getSource=function(){return this._source};var nM={arrayRows_column:{pure:!0,count:function(){return Math.max(0,this._data.length-this._source.startIndex)},getItem:function(t){return this._data[t+this._source.startIndex]},appendData:Ya},arrayRows_row:{pure:!0,count:function(){var t=this._data[0];return t?Math.max(0,t.length-this._source.startIndex):0},getItem:function(t){t+=this._source.startIndex;for(var e=[],i=this._data,n=0;n<i.length;n++){var o=i[n];e.push(o?o[t]:null)}return e},appendData:function(){throw new Error('Do not support appendData when set seriesLayoutBy: "row".')}},objectRows:{pure:!0,count:ja,getItem:Xa,appendData:Ya},keyedColumns:{pure:!0,count:function(){var t=this._source.dimensionsDefine[0].name,e=this._data[t];return e?e.length:0},getItem:function(t){for(var e=[],i=this._source.dimensionsDefine,n=0;n<i.length;n++){var o=this._data[i[n].name];e.push(o?o[t]:null)}return e},appendData:function(t){var e=this._data;d(t,function(t,i){for(var n=e[i]||(e[i]=[]),o=0;o<(t||[]).length;o++)n.push(t[o])})}},original:{count:ja,getItem:Xa,appendData:Ya},typedArray:{persistent:!1,pure:!0,count:function(){return this._data?this._data.length/this._dimSize:0},getItem:function(t){t-=this._offset;for(var e=[],i=this._dimSize*t,n=0;n<this._dimSize;n++)e[n]=this._data[i+n];return e},appendData:function(t){this._data=t},clean:function(){this._offset+=this.count(),this._data=null}}},oM={arrayRows:qa,objectRows:function(t,e,i,n){return null!=i?t[n]:t},keyedColumns:qa,original:function(t,e,i,n){var o=Ii(t);return null!=i&&o instanceof Array?o[i]:o},typedArray:qa},aM={arrayRows:$a,objectRows:function(t,e,i,n){return Ka(t[e],this._dimensionInfos[e])},keyedColumns:$a,original:function(t,e,i,n){var o=t&&(null==t.value?t:t.value);return!this._rawData.pure&&Ti(t)&&(this.hasItemOption=!0),Ka(o instanceof Array?o[n]:o,this._dimensionInfos[e])},typedArray:function(t,e,i,n){return t[n]}},rM=/\{@(.+?)\}/g,sM={getDataParams:function(t,e){var i=this.getData(e),n=this.getRawValue(t,e),o=i.getRawIndex(t),a=i.getName(t,!0),r=i.getRawDataItem(t),s=i.getItemVisual(t,"color");return{componentType:this.mainType,componentSubType:this.subType,seriesType:"series"===this.mainType?this.subType:null,seriesIndex:this.seriesIndex,seriesId:this.id,seriesName:this.name,name:a,dataIndex:o,data:r,dataType:e,value:n,color:s,marker:jo(s),$vars:["seriesName","name","value"]}},getFormattedLabel:function(t,e,i,n,o){e=e||"normal";var a=this.getData(i),r=a.getItemModel(t),s=this.getDataParams(t,i);null!=n&&s.value instanceof Array&&(s.value=s.value[n]);var l=r.get("normal"===e?[o||"label","formatter"]:[e,o||"label","formatter"]);return"function"==typeof l?(s.status=e,l(s)):"string"==typeof l?Zo(l,s).replace(rM,function(e,i){var n=i.length;return"["===i.charAt(0)&&"]"===i.charAt(n-1)&&(i=+i.slice(1,n-1)),Ja(a,t,i)}):void 0},getRawValue:function(t,e){return Ja(this.getData(e),t)},formatTooltip:function(){}},lM=er.prototype;lM.perform=function(t){var e=this._upstream,i=t&&t.skip;if(this._dirty&&e){var n=this.context;n.data=n.outputData=e.context.outputData}this.__pipeline&&(this.__pipeline.currentTask=this);var o;this._plan&&!i&&(o=this._plan(this.context)),(this._dirty||"reset"===o)&&(this._dirty=!1,ir(this,i));var a=t&&t.step;if(this._dueEnd=e?e._outputDueEnd:this._count?this._count(this.context):1/0,this._progress){var r=this._dueIndex,s=Math.min(null!=a?this._dueIndex+a:1/0,this._dueEnd);!i&&r<s&&this._progress({start:r,end:s},this.context),this._dueIndex=s;var l=null!=this._settedOutputEnd?this._settedOutputEnd:s;this._outputDueEnd=l}else this._dueIndex=this._outputDueEnd=null!=this._settedOutputEnd?this._settedOutputEnd:this._dueEnd;return this.unfinished()},lM.dirty=function(){this._dirty=!0,this._onDirty&&this._onDirty(this.context)},lM.unfinished=function(){return this._progress&&this._dueIndex<this._dueEnd},lM.pipe=function(t){(this._downstream!==t||this._dirty)&&(this._downstream=t,t._upstream=this,t.dirty())},lM.dispose=function(){this._disposed||(this._upstream&&(this._upstream._downstream=null),this._downstream&&(this._downstream._upstream=null),this._dirty=!1,this._disposed=!0)},lM.getUpstream=function(){return this._upstream},lM.getDownstream=function(){return this._downstream},lM.setOutputEnd=function(t){this._outputDueEnd=this._settedOutputEnd=t};var hM=Pi(),uM=IS.extend({type:"series.__base__",seriesIndex:0,coordinateSystem:null,defaultOption:null,legendDataProvider:null,visualColorAccessPath:"itemStyle.color",layoutMode:null,init:function(t,e,i,n){this.seriesIndex=this.componentIndex,this.dataTask=tr({count:ar,reset:rr}),this.dataTask.context={model:this},this.mergeDefaultAndTheme(t,i),ua(this);var o=this.getInitialData(t,i);lr(o,this),this.dataTask.context.data=o,hM(this).dataBeforeProcessed=o,nr(this)},mergeDefaultAndTheme:function(t,e){var i=this.layoutMode,o=i?ea(t):{},a=this.subType;IS.hasClass(a)&&(a+="Series"),n(t,e.getTheme().get(this.subType)),n(t,this.getDefaultOption()),Mi(t,"label",["show"]),this.fillDataTextStyle(t.data),i&&ta(t,o,i)},mergeOption:function(t,e){t=n(this.option,t,!0),this.fillDataTextStyle(t.data);var i=this.layoutMode;i&&ta(this.option,t,i),ua(this);var o=this.getInitialData(t,e);lr(o,this),this.dataTask.dirty(),this.dataTask.context.data=o,hM(this).dataBeforeProcessed=o,nr(this)},fillDataTextStyle:function(t){if(t)for(var e=["show"],i=0;i<t.length;i++)t[i]&&t[i].label&&Mi(t[i],"label",e)},getInitialData:function(){},appendData:function(t){this.getRawData().appendData(t.data)},getData:function(t){var e=ur(this);if(e){var i=e.context.data;return null==t?i:i.getLinkedData(t)}return hM(this).data},setData:function(t){var e=ur(this);if(e){var i=e.context;i.data!==t&&e.isOverallFilter&&e.setOutputEnd(t.count()),i.outputData=t,e!==this.dataTask&&(i.data=t)}hM(this).data=t},getSource:function(){return la(this)},getRawData:function(){return hM(this).dataBeforeProcessed},getBaseAxis:function(){var t=this.coordinateSystem;return t&&t.getBaseAxis&&t.getBaseAxis()},formatTooltip:function(t,e,i){function n(t){return Ho(Wo(t))}var o=this.getData(),a=o.mapDimension("defaultedTooltip",!0),r=a.length,s=this.getRawValue(t),l=y(s),h=o.getItemVisual(t,"color");w(h)&&h.colorStops&&(h=(h.colorStops[0]||{}).color),h=h||"transparent";var u=r>1||l&&!r?function(i){function n(t,i){var n=o.getDimensionInfo(i);if(n&&!1!==n.otherDims.tooltip){var a=n.type,l=jo({color:h,type:"subItem"}),u=(r?l+Ho(n.displayName||"-")+": ":"")+Ho("ordinal"===a?t+"":"time"===a?e?"":Xo("yyyy/MM/dd hh:mm:ss",t):Wo(t));u&&s.push(u)}}var r=p(i,function(t,e,i){var n=o.getDimensionInfo(i);return t|=n&&!1!==n.tooltip&&null!=n.displayName},0),s=[];return a.length?d(a,function(e){n(Ja(o,t,e),e)}):d(i,n),(r?"<br/>":"")+s.join(r?"<br/>":", ")}(s):n(r?Ja(o,t,a[0]):l?s[0]:s),c=jo(h),f=o.getName(t),g=this.name;return g===vw&&(g=""),g=g?Ho(g)+(e?": ":"<br/>"):"",e?c+g+u:g+c+(f?Ho(f)+": "+u:u)},isAnimationEnabled:function(){if(_x.node)return!1;var t=this.getShallow("animation");return t&&this.getData().count()>this.getShallow("animationThreshold")&&(t=!1),t},restoreData:function(){this.dataTask.dirty()},getColorFromPalette:function(t,e,i){var n=this.ecModel,o=CS.getColorFromPalette.call(this,t,e,i);return o||(o=n.getColorFromPalette(t,e,i)),o},coordDimToDataDim:function(t){return this.getRawData().mapDimension(t,!0)},getProgressive:function(){return this.get("progressive")},getProgressiveThreshold:function(){return this.get("progressiveThreshold")},getAxisTooltipData:null,getTooltipPosition:null,pipeTask:null,preventIncremental:null,pipelineContext:null});u(uM,sM),u(uM,CS);var cM=function(){this.group=new S_,this.uid=So("viewComponent")};cM.prototype={constructor:cM,init:function(t,e){},render:function(t,e,i,n){},dispose:function(){}};var dM=cM.prototype;dM.updateView=dM.updateLayout=dM.updateVisual=function(t,e,i,n){},Vi(cM),Hi(cM,{registerWhenExtend:!0});var fM=function(){var t=Pi();return function(e){var i=t(e),n=e.pipelineContext,o=i.large,a=i.incrementalRender,r=i.large=n.large,s=i.incrementalRender=n.incrementalRender;return(o^r||a^s)&&"reset"}},pM=Pi(),gM=fM();cr.prototype={type:"chart",init:function(t,e){},render:function(t,e,i,n){},highlight:function(t,e,i,n){fr(t.getData(),n,"emphasis")},downplay:function(t,e,i,n){fr(t.getData(),n,"normal")},remove:function(t,e){this.group.removeAll()},dispose:function(){},incrementalPrepareRender:null,incrementalRender:null,updateTransform:null};var mM=cr.prototype;mM.updateView=mM.updateLayout=mM.updateVisual=function(t,e,i,n){this.render(t,e,i,n)},Vi(cr),Hi(cr,{registerWhenExtend:!0}),cr.markUpdateMethod=function(t,e){pM(t).updateMethod=e};var vM="\0__throttleOriginMethod",yM="\0__throttleRate",xM="\0__throttleType",_M={createOnAllSeries:!0,performRawSeries:!0,reset:function(t,e){var i=t.getData(),n=(t.visualColorAccessPath||"itemStyle.color").split("."),o=t.get(n)||t.getColorFromPalette(t.get("name"),null,e.getSeriesCount());if(i.setVisual("color",o),!e.isSeriesFiltered(t)){"function"!=typeof o||o instanceof Ub||i.each(function(e){i.setItemVisual(e,"color",o(t.getDataParams(e)))});return{dataEach:i.hasItemOption?function(t,e){var i=t.getItemModel(e).get(n,!0);null!=i&&t.setItemVisual(e,"color",i)}:null}}}},wM={toolbox:{brush:{title:{rect:"矩形选择",polygon:"圈选",lineX:"横向选择",lineY:"纵向选择",keep:"保持选择",clear:"清除选择"}},dataView:{title:"数据视图",lang:["数据视图","关闭","刷新"]},dataZoom:{title:{zoom:"区域缩放",back:"区域缩放还原"}},magicType:{title:{line:"切换为折线图",bar:"切换为柱状图",stack:"切换为堆叠",tiled:"切换为平铺"}},restore:{title:"还原"},saveAsImage:{title:"保存为图片",lang:["右键另存为图片"]}},series:{typeNames:{pie:"饼图",bar:"柱状图",line:"折线图",scatter:"散点图",effectScatter:"涟漪散点图",radar:"雷达图",tree:"树图",treemap:"矩形树图",boxplot:"箱型图",candlestick:"K线图",k:"K线图",heatmap:"热力图",map:"地图",parallel:"平行坐标图",lines:"线图",graph:"关系图",sankey:"桑基图",funnel:"漏斗图",gauge:"仪表盘图",pictorialBar:"象形柱图",themeRiver:"主题河流图",sunburst:"旭日图"}},aria:{general:{withTitle:"这是一个关于“{title}”的图表。",withoutTitle:"这是一个图表，"},series:{single:{prefix:"",withName:"图表类型是{seriesType}，表示{seriesName}。",withoutName:"图表类型是{seriesType}。"},multiple:{prefix:"它由{seriesCount}个图表系列组成。",withName:"第{seriesId}个系列是一个表示{seriesName}的{seriesType}，",withoutName:"第{seriesId}个系列是一个{seriesType}，",separator:{middle:"；",end:"。"}}},data:{allData:"其数据是——",partialData:"其中，前{displayCnt}项是——",withName:"{name}的数据是{value}",withoutName:"{value}",separator:{middle:"，",end:""}}}},bM=function(t,e){function i(t,e){if("string"!=typeof t)return t;var i=t;return d(e,function(t,e){i=i.replace(new RegExp("\\{\\s*"+e+"\\s*\\}","g"),t)}),i}function n(t){var e=a.get(t);if(null==e){for(var i=t.split("."),n=wM.aria,o=0;o<i.length;++o)n=n[i[o]];return n}return e}function o(t){return wM.series.typeNames[t]||"自定义图"}var a=e.getModel("aria");if(a.get("show"))if(a.get("description"))t.setAttribute("aria-label",a.get("description"));else{var r=0;e.eachSeries(function(t,e){++r},this);var s,l=a.get("data.maxCount")||10,h=a.get("series.maxCount")||10,u=Math.min(r,h);if(!(r<1)){var c=function(){var t=e.getModel("title").option;return t&&t.length&&(t=t[0]),t&&t.text}();s=c?i(n("general.withTitle"),{title:c}):n("general.withoutTitle");var f=[];s+=i(n(r>1?"series.multiple.prefix":"series.single.prefix"),{seriesCount:r}),e.eachSeries(function(t,e){if(e<u){var a,s=t.get("name"),h="series."+(r>1?"multiple":"single")+".";a=i(a=n(s?h+"withName":h+"withoutName"),{seriesId:t.seriesIndex,seriesName:t.get("name"),seriesType:o(t.subType)});var c=t.getData();window.data=c,c.count()>l?a+=i(n("data.partialData"),{displayCnt:l}):a+=n("data.allData");for(var d=[],p=0;p<c.count();p++)if(p<l){var g=c.getName(p),m=Ja(c,p);d.push(i(n(g?"data.withName":"data.withoutName"),{name:g,value:m}))}a+=d.join(n("data.separator.middle"))+n("data.separator.end"),f.push(a)}}),s+=f.join(n("series.multiple.separator.middle"))+n("series.multiple.separator.end"),t.setAttribute("aria-label",s)}}},SM=Math.PI,MM=_r.prototype;MM.getPerformArgs=function(t,e){if(t.__pipeline){var i=this._pipelineMap.get(t.__pipeline.id),n=i.context;return{step:!e&&i.progressiveEnabled&&(!n||n.incrementalRender)&&t.__idxInPipeline>i.bockIndex?i.step:null}}},MM.getPipeline=function(t){return this._pipelineMap.get(t)},MM.updateStreamModes=function(t,e){var i=this._pipelineMap.get(t.uid),n=t.getData().count(),o=i.progressiveEnabled&&e.incrementalPrepareRender&&n>=i.threshold,a=t.get("large")&&n>=t.get("largeThreshold");t.pipelineContext=i.context={incrementalRender:o,large:a}},MM.restorePipelines=function(t){var e=this,i=e._pipelineMap=z();t.eachSeries(function(t){var n=t.getProgressive(),o=t.uid;i.set(o,{id:o,head:null,tail:null,threshold:t.getProgressiveThreshold(),progressiveEnabled:n&&!(t.preventIncremental&&t.preventIncremental()),bockIndex:-1,step:n||700,count:0}),Pr(e,t,t.dataTask)})},MM.prepareStageTasks=function(t,e){var i=this._stageTaskMap,n=this.ecInstance.getModel(),o=this.api;d(t,function(t){var e=i.get(t.uid)||i.set(t.uid,[]);t.reset&&br(this,t,e,n,o),t.overallReset&&Sr(this,t,e,n,o)},this)},MM.prepareView=function(t,e,i,n){var o=t.renderTask,a=o.context;a.model=e,a.ecModel=i,a.api=n,o.__block=!t.incrementalPrepareRender,Pr(this,e,o)},MM.performDataProcessorTasks=function(t,e,i){wr(this,t,e,i,{block:!0})},MM.performVisualTasks=function(t,e,i,n){wr(this,t,e,i,n)},MM.performSeriesTasks=function(t){var e;t.eachSeries(function(t){e|=t.dataTask.perform()}),this.unfinished|=e},MM.plan=function(){this._pipelineMap.each(function(t){var e=t.tail;do{if(e.__block){t.bockIndex=e.__idxInPipeline;break}e=e.getUpstream()}while(e)})};var IM=MM.updatePayload=function(t,e){"remain"!==e&&(t.context.payload=e)};_r.wrapStageHandler=function(t,e){return x(t)&&(t={overallReset:t,seriesType:Or(t)}),t.uid=So("stageHandler"),e&&(t.visualType=e),t};var TM,AM={},DM={};Nr(AM,WS),Nr(DM,Ta),AM.eachSeriesByType=AM.eachRawSeriesByType=function(t){TM=t},AM.eachComponent=function(t){"series"===t.mainType&&t.subType&&(TM=t.subType)};var CM=["#37A2DA","#32C5E9","#67E0E3","#9FE6B8","#FFDB5C","#ff9f7f","#fb7293","#E062AE","#E690D1","#e7bcf3","#9d96f5","#8378EA","#96BFFF"],LM={color:CM,colorLayer:[["#37A2DA","#ffd85c","#fd7b5f"],["#37A2DA","#67E0E3","#FFDB5C","#ff9f7f","#E062AE","#9d96f5"],["#37A2DA","#32C5E9","#9FE6B8","#FFDB5C","#ff9f7f","#fb7293","#e7bcf3","#8378EA","#96BFFF"],CM]},kM=["#dd6b66","#759aa0","#e69d87","#8dc1a9","#ea7e53","#eedd78","#73a373","#73b9bc","#7289ab","#91ca8c","#f49f42"],PM={color:kM,backgroundColor:"#333",tooltip:{axisPointer:{lineStyle:{color:"#eee"},crossStyle:{color:"#eee"}}},legend:{textStyle:{color:"#eee"}},textStyle:{color:"#eee"},title:{textStyle:{color:"#eee"}},toolbox:{iconStyle:{normal:{borderColor:"#eee"}}},dataZoom:{textStyle:{color:"#eee"}},visualMap:{textStyle:{color:"#eee"}},timeline:{lineStyle:{color:"#eee"},itemStyle:{normal:{color:kM[1]}},label:{normal:{textStyle:{color:"#eee"}}},controlStyle:{normal:{color:"#eee",borderColor:"#eee"}}},timeAxis:{axisLine:{lineStyle:{color:"#eee"}},axisTick:{lineStyle:{color:"#eee"}},axisLabel:{textStyle:{color:"#eee"}},splitLine:{lineStyle:{type:"dashed",color:"#aaa"}},splitArea:{areaStyle:{color:"#eee"}}},logAxis:{axisLine:{lineStyle:{color:"#eee"}},axisTick:{lineStyle:{color:"#eee"}},axisLabel:{textStyle:{color:"#eee"}},splitLine:{lineStyle:{type:"dashed",color:"#aaa"}},splitArea:{areaStyle:{color:"#eee"}}},valueAxis:{axisLine:{lineStyle:{color:"#eee"}},axisTick:{lineStyle:{color:"#eee"}},axisLabel:{textStyle:{color:"#eee"}},splitLine:{lineStyle:{type:"dashed",color:"#aaa"}},splitArea:{areaStyle:{color:"#eee"}}},categoryAxis:{axisLine:{lineStyle:{color:"#eee"}},axisTick:{lineStyle:{color:"#eee"}},axisLabel:{textStyle:{color:"#eee"}},splitLine:{lineStyle:{type:"dashed",color:"#aaa"}},splitArea:{areaStyle:{color:"#eee"}}},line:{symbol:"circle"},graph:{color:kM},gauge:{title:{textStyle:{color:"#eee"}}},candlestick:{itemStyle:{normal:{color:"#FD1050",color0:"#0CF49B",borderColor:"#FD1050",borderColor0:"#0CF49B"}}}};PM.categoryAxis.splitLine.show=!1;var OM=k,NM=d,EM=x,zM=w,RM=IS.parseClassType,BM={zrender:"4.0.1"},VM=1e3,GM=1e3,WM=3e3,FM={PROCESSOR:{FILTER:VM,STATISTIC:5e3},VISUAL:{LAYOUT:GM,GLOBAL:2e3,CHART:WM,COMPONENT:4e3,BRUSH:5e3}},HM="__flagInMainProcess",ZM="__optionUpdated",UM=/^[a-zA-Z0-9_]+$/;zr.prototype.on=Er("on"),zr.prototype.off=Er("off"),zr.prototype.one=Er("one"),u(zr,Hx);var jM=Rr.prototype;jM._onframe=function(){if(!this._disposed){var t=this._scheduler;if(this[ZM]){var e=this[ZM].silent;this[HM]=!0,Vr(this),XM.update.call(this),this[HM]=!1,this[ZM]=!1,Zr.call(this,e),Ur.call(this,e)}else if(t.unfinished){var i=1,n=this._model;this._api;t.unfinished=!1;do{var o=+new Date;t.performSeriesTasks(n),t.performDataProcessorTasks(KM,n),Fr(this,n),t.performVisualTasks(tI,n),Kr(this,this._model,0,"remain"),i-=+new Date-o}while(i>0&&t.unfinished);t.unfinished||(this._zr&&this._zr.flush(),this.trigger("finished"))}}},jM.getDom=function(){return this._dom},jM.getZr=function(){return this._zr},jM.setOption=function(t,e,i){var n;if(zM(e)&&(i=e.lazyUpdate,n=e.silent,e=e.notMerge),this[HM]=!0,!this._model||e){var o=new Da(this._api),a=this._theme,r=this._model=new WS(null,null,a,o);r.scheduler=this._scheduler,r.init(null,null,a,o)}this._model.setOption(t,JM),i?(this[ZM]={silent:n},this[HM]=!1):(Vr(this),XM.update.call(this),this._zr.flush(),this[ZM]=!1,this[HM]=!1,Zr.call(this,n),Ur.call(this,n))},jM.setTheme=function(){console.log("ECharts#setTheme() is DEPRECATED in ECharts 3.0")},jM.getModel=function(){return this._model},jM.getOption=function(){return this._model&&this._model.getOption()},jM.getWidth=function(){return this._zr.getWidth()},jM.getHeight=function(){return this._zr.getHeight()},jM.getDevicePixelRatio=function(){return this._zr.painter.dpr||window.devicePixelRatio||1},jM.getRenderedCanvas=function(t){if(_x.canvasSupported){(t=t||{}).pixelRatio=t.pixelRatio||1,t.backgroundColor=t.backgroundColor||this._model.get("backgroundColor");var e=this._zr;return d(e.storage.getDisplayList(),function(t){t.stopAnimation(!0)}),e.painter.getRenderedCanvas(t)}},jM.getSvgDataUrl=function(){if(_x.svgSupported){var t=this._zr;return d(t.storage.getDisplayList(),function(t){t.stopAnimation(!0)}),t.painter.pathToSvg()}},jM.getDataURL=function(t){var e=(t=t||{}).excludeComponents,i=this._model,n=[],o=this;NM(e,function(t){i.eachComponent({mainType:t},function(t){var e=o._componentsMap[t.__viewId];e.group.ignore||(n.push(e),e.group.ignore=!0)})});var a="svg"===this._zr.painter.getType()?this.getSvgDataUrl():this.getRenderedCanvas(t).toDataURL("image/"+(t&&t.type||"png"));return NM(n,function(t){t.group.ignore=!1}),a},jM.getConnectedDataURL=function(t){if(_x.canvasSupported){var e=this.group,n=Math.min,o=Math.max;if(oI[e]){var a=1/0,r=1/0,s=-1/0,l=-1/0,h=[],u=t&&t.pixelRatio||1;d(nI,function(u,c){if(u.group===e){var d=u.getRenderedCanvas(i(t)),f=u.getDom().getBoundingClientRect();a=n(f.left,a),r=n(f.top,r),s=o(f.right,s),l=o(f.bottom,l),h.push({dom:d,left:f.left,top:f.top})}});var c=(s*=u)-(a*=u),f=(l*=u)-(r*=u),p=Px();p.width=c,p.height=f;var g=_i(p);return NM(h,function(t){var e=new Je({style:{x:t.left*u-a,y:t.top*u-r,image:t.dom}});g.add(e)}),g.refreshImmediately(),p.toDataURL("image/"+(t&&t.type||"png"))}return this.getDataURL(t)}},jM.convertToPixel=v(Br,"convertToPixel"),jM.convertFromPixel=v(Br,"convertFromPixel"),jM.containPixel=function(t,e){var i;return t=Oi(this._model,t),d(t,function(t,n){n.indexOf("Models")>=0&&d(t,function(t){var o=t.coordinateSystem;if(o&&o.containPoint)i|=!!o.containPoint(e);else if("seriesModels"===n){var a=this._chartsMap[t.__viewId];a&&a.containPoint&&(i|=a.containPoint(e,t))}},this)},this),!!i},jM.getVisual=function(t,e){var i=(t=Oi(this._model,t,{defaultMainType:"series"})).seriesModel.getData(),n=t.hasOwnProperty("dataIndexInside")?t.dataIndexInside:t.hasOwnProperty("dataIndex")?i.indexOfRawIndex(t.dataIndex):null;return null!=n?i.getItemVisual(n,e):i.getVisual(e)},jM.getViewOfComponentModel=function(t){return this._componentsMap[t.__viewId]},jM.getViewOfSeriesModel=function(t){return this._chartsMap[t.__viewId]};var XM={prepareAndUpdate:function(t){Vr(this),XM.update.call(this,t)},update:function(t){var e=this._model,i=this._api,n=this._zr,o=this._coordSysMgr,a=this._scheduler;if(e){e.restoreData(t),a.performSeriesTasks(e),o.create(e,i),a.performDataProcessorTasks(KM,e,t),Fr(this,e),Xr(e),o.update(e,i),Yr(e),a.performVisualTasks(tI,e,t),qr(this,e,i,t);var r=e.get("backgroundColor")||"transparent",s=n.painter;if(s.isSingleCanvas&&s.isSingleCanvas())n.configLayer(0,{clearColor:r});else{if(!_x.canvasSupported){var l=Dt(r);r=Rt(l,"rgb"),0===l[3]&&(r="transparent")}r.colorStops||r.image?(n.configLayer(0,{clearColor:r}),this.__hasGradientOrPatternBg=!0,this._dom.style.background="transparent"):(this.__hasGradientOrPatternBg&&n.configLayer(0,{clearColor:null}),this.__hasGradientOrPatternBg=!1,this._dom.style.background=r)}Jr(e,i)}},updateTransform:function(t){var e=this._model,i=this,n=this._api;if(e){var o=[];e.eachComponent(function(a,r){var s=i.getViewOfComponentModel(r);if(s&&s.__alive)if(s.updateTransform){var l=s.updateTransform(r,e,n,t);l&&l.update&&o.push(s)}else o.push(s)});var a=z();e.eachSeries(function(o){var r=i._chartsMap[o.__viewId];if(r.updateTransform){var s=r.updateTransform(o,e,n,t);s&&s.update&&a.set(o.uid,1)}else a.set(o.uid,1)}),Yr(e),this._scheduler.performVisualTasks(tI,e,t,{setDirty:!0,dirtyMap:a}),Kr(i,e,0,t,a),Jr(e,this._api)}},updateView:function(t){var e=this._model;e&&(cr.markUpdateMethod(t,"updateView"),Yr(e),this._scheduler.performVisualTasks(tI,e,t,{setDirty:!0}),qr(this,this._model,this._api,t),Jr(e,this._api))},updateVisual:function(t){XM.update.call(this,t)},updateLayout:function(t){XM.update.call(this,t)}};jM.resize=function(t){this._zr.resize(t);var e=this._model;this._loadingFX&&this._loadingFX.resize(),e&&Wr(this,e.resetOption("media"),t&&t.silent)},jM.showLoading=function(t,e){if(zM(t)&&(e=t,t=""),t=t||"default",this.hideLoading(),iI[t]){var i=iI[t](this._api,e),n=this._zr;this._loadingFX=i,n.add(i)}},jM.hideLoading=function(){this._loadingFX&&this._zr.remove(this._loadingFX),this._loadingFX=null},jM.makeActionFromEvent=function(t){var e=a({},t);return e.type=$M[t.type],e},jM.dispatchAction=function(t,e){zM(e)||(e={silent:!!e}),qM[t.type]&&this._model&&(this[HM]?this._pendingActions.push(t):(Hr.call(this,t,e.silent),e.flush?this._zr.flush(!0):!1!==e.flush&&_x.browser.weChat&&this._throttledZrFlush(),Zr.call(this,e.silent),Ur.call(this,e.silent)))},jM.appendData=function(t){var e=t.seriesIndex;this.getModel().getSeriesByIndex(e).appendData(t),this._scheduler.unfinished=!0},jM.on=Er("on"),jM.off=Er("off"),jM.one=Er("one");var YM=["click","dblclick","mouseover","mouseout","mousemove","mousedown","mouseup","globalout","contextmenu"];jM._initEvents=function(){NM(YM,function(t){this._zr.on(t,function(e){var i,n=this.getModel(),o=e.target;if("globalout"===t)i={};else if(o&&null!=o.dataIndex){var r=o.dataModel||n.getSeriesByIndex(o.seriesIndex);i=r&&r.getDataParams(o.dataIndex,o.dataType)||{}}else o&&o.eventData&&(i=a({},o.eventData));i&&(i.event=e,i.type=t,this.trigger(t,i))},this)},this),NM($M,function(t,e){this._messageCenter.on(e,function(t){this.trigger(e,t)},this)},this)},jM.isDisposed=function(){return this._disposed},jM.clear=function(){this.setOption({series:[]},!0)},jM.dispose=function(){if(!this._disposed){this._disposed=!0,Ei(this.getDom(),sI,"");var t=this._api,e=this._model;NM(this._componentsViews,function(i){i.dispose(e,t)}),NM(this._chartsViews,function(i){i.dispose(e,t)}),this._zr.dispose(),delete nI[this.id]}},u(Rr,Hx);var qM={},$M={},KM=[],JM=[],QM=[],tI=[],eI={},iI={},nI={},oI={},aI=new Date-0,rI=new Date-0,sI="_echarts_instance_",lI={},hI=os;ds(2e3,_M),ss(eM),ps("default",function(t,e){r(e=e||{},{text:"loading",color:"#c23531",textColor:"#000",maskColor:"rgba(255, 255, 255, 0.8)",zlevel:0});var i=new Vb({style:{fill:e.maskColor},zlevel:e.zlevel,z:1e4}),n=new Hb({shape:{startAngle:-SM/2,endAngle:-SM/2+.1,r:10},style:{stroke:e.color,lineCap:"round",lineWidth:5},zlevel:e.zlevel,z:10001}),o=new Vb({style:{fill:"none",text:e.text,textPosition:"right",textDistance:10,textFill:e.textColor},zlevel:e.zlevel,z:10001});n.animateShape(!0).when(1e3,{endAngle:3*SM/2}).start("circularInOut"),n.animateShape(!0).when(1e3,{startAngle:3*SM/2}).delay(300).start("circularInOut");var a=new S_;return a.add(n),a.add(o),a.add(i),a.resize=function(){var e=t.getWidth()/2,a=t.getHeight()/2;n.setShape({cx:e,cy:a});var r=n.shape.r;o.setShape({x:e-r,y:a-r,width:2*r,height:2*r}),i.setShape({x:0,y:0,width:t.getWidth(),height:t.getHeight()})},a.resize(),a}),hs({type:"highlight",event:"highlight",update:"highlight"},B),hs({type:"downplay",event:"downplay",update:"downplay"},B),rs("light",LM),rs("dark",PM);var uI={};ws.prototype={constructor:ws,add:function(t){return this._add=t,this},update:function(t){return this._update=t,this},remove:function(t){return this._remove=t,this},execute:function(){var t=this._old,e=this._new,i={},n=[],o=[];for(bs(t,{},n,"_oldKeyGetter",this),bs(e,i,o,"_newKeyGetter",this),a=0;a<t.length;a++)null!=(s=i[r=n[a]])?((h=s.length)?(1===h&&(i[r]=null),s=s.unshift()):i[r]=null,this._update&&this._update(s,a)):this._remove&&this._remove(a);for(var a=0;a<o.length;a++){var r=o[a];if(i.hasOwnProperty(r)){var s=i[r];if(null==s)continue;if(s.length)for(var l=0,h=s.length;l<h;l++)this._add&&this._add(s[l]);else this._add&&this._add(s)}}}};var cI=z(["tooltip","label","itemName","itemId","seriesName"]),dI=w,fI="undefined",pI=typeof window===fI?global:window,gI="e\0\0",mI={float:typeof pI.Float64Array===fI?Array:pI.Float64Array,int:typeof pI.Int32Array===fI?Array:pI.Int32Array,ordinal:Array,number:Array,time:Array},vI=["stackedOn","hasItemOption","_nameList","_idList","_rawData","_rawExtent","_chunkSize","_chunkCount","_dimValueGetter","_count","_rawCount","_nameDimIdx","_idDimIdx"],yI=function(t,e){t=t||["x","y"];for(var i={},n=[],o=0;o<t.length;o++){var a,r={};"string"==typeof t[o]?r={name:a=t[o],coordDim:a,coordDimIndex:0,stackable:!1,type:"float"}:(a=(r=t[o]).name,r.type=r.type||"float",r.coordDim||(r.coordDim=a,r.coordDimIndex=0)),r.otherDims=r.otherDims||{},n.push(a),i[a]=r,r.index=o}this.dimensions=n,this._dimensionInfos=i,this.hostModel=e,this.dataType,this._indices=null,this._count=0,this._rawCount=0,this._storage={},this._nameList=[],this._idList=[],this._optionModels=[],this.stackedOn=null,this._visual={},this._layout={},this._itemVisuals=[],this.hasItemVisual={},this._itemLayouts=[],this._graphicEls=[],this._chunkSize=1e5,this._chunkCount=0,this._rawData,this._rawExtent={},this._extent={},this._approximateExtent={},this._dimensionsSummary=Ss(this)},xI=yI.prototype;xI.type="list",xI.hasItemOption=!0,xI.getDimension=function(t){return isNaN(t)||(t=this.dimensions[t]||t),t},xI.getDimensionInfo=function(t){return this._dimensionInfos[this.getDimension(t)]},xI.getDimensionsOnCoord=function(){return this._dimensionsSummary.dataDimsOnCoord.slice()},xI.mapDimension=function(t,e){var i=this._dimensionsSummary.encode[t];return!0===e?i&&i.slice()||[]:i?i[e||0]:null},xI.initData=function(t,e,i){(ra.isInstance(t)||c(t))&&(t=new Ua(t,this.dimensions.length)),this._rawData=t,this._storage={},this._indices=null,this._nameList=e||[],this._idList=[],this._nameRepeatCount={},i||(this.hasItemOption=!1),this.defaultDimValueGetter=aM[this._rawData.getSource().sourceFormat],this._dimValueGetter=i=i||this.defaultDimValueGetter,this._rawExtent={},this._initDataFromProvider(0,t.count()),t.pure&&(this.hasItemOption=!1)},xI.getProvider=function(){return this._rawData},xI.appendData=function(t){var e=this._rawData,i=this.count();e.appendData(t);var n=e.count();e.persistent||(n+=i),this._initDataFromProvider(i,n)},xI._initDataFromProvider=function(t,e){if(!(t>=e)){for(var i,n=this._chunkSize,o=this._rawData,a=this._storage,r=this.dimensions,s=this._dimensionInfos,l=this._nameList,h=this._idList,u=this._rawExtent,c=this._nameRepeatCount={},d=this._chunkCount,f=d-1,p=0;p<r.length;p++){u[I=r[p]]||(u[I]=[1/0,-1/0]);var g=s[I];0===g.otherDims.itemName&&(i=this._nameDimIdx=p),0===g.otherDims.itemId&&(this._idDimIdx=p);var m=mI[g.type];a[I]||(a[I]=[]);var v=a[I][f];if(v&&v.length<n){for(var y=new m(Math.min(e-f*n,n)),x=0;x<v.length;x++)y[x]=v[x];a[I][f]=y}for(M=d*n;M<e;M+=n)a[I].push(new m(Math.min(e-M,n)));this._chunkCount=a[I].length}for(var _=t;_<e;_++){for(var w=o.getItem(_),b=Math.floor(_/n),S=_%n,M=0;M<r.length;M++){var I=r[M],T=a[I][b],A=this._dimValueGetter(w,I,_,M);T[S]=A,A<u[I][0]&&(u[I][0]=A),A>u[I][1]&&(u[I][1]=A)}if(!o.pure){var D=l[_];w&&!D&&(null!=i?D=this._getNameFromStore(_):null!=w.name&&(l[_]=D=w.name));var C=null==w?null:w.id;null==C&&null!=D&&(c[D]=c[D]||0,C=D,c[D]>0&&(C+="__ec__"+c[D]),c[D]++),null!=C&&(h[_]=C)}}!o.persistent&&o.clean&&o.clean(),this._rawCount=this._count=e,this._extent={}}},xI._getNameFromStore=function(t){var e=this._nameDimIdx;if(null!=e){var i=this._chunkSize,n=Math.floor(t/i),o=t%i,a=this.dimensions[e],r=this._dimensionInfos[a].ordinalMeta;if(r)return r.categories[t];var s=this._storage[a][n];return s&&s[o]}},xI._getIdFromStore=function(t){var e=this._idDimIdx;if(null!=e){var i=this._chunkSize,n=Math.floor(t/i),o=t%i,a=this.dimensions[e],r=this._dimensionInfos[a].ordinalMeta;if(r)return r.categories[t];var s=this._storage[a][n];return s&&s[o]}},xI.count=function(){return this._count},xI.getIndices=function(){if(this._indices)return new(t=this._indices.constructor)(this._indices.buffer,0,this._count);for(var t=Ts(this),e=new t(this.count()),i=0;i<e.length;i++)e[i]=i;return e},xI.get=function(t,e,i){if(!(e>=0&&e<this._count))return NaN;var n=this._storage;if(!n[t])return NaN;e=this.getRawIndex(e);var o=Math.floor(e/this._chunkSize),a=e%this._chunkSize,r=n[t][o][a];if(i){var s=this._dimensionInfos[t];if(s&&s.stackable)for(var l=this.stackedOn;l;){var h=l.get(t,e);(r>=0&&h>0||r<=0&&h<0)&&(r+=h),l=l.stackedOn}}return r},xI._getFast=function(t,e){var i=Math.floor(e/this._chunkSize),n=e%this._chunkSize;return this._storage[t][i][n]},xI.getValues=function(t,e,i){var n=[];y(t)||(i=e,e=t,t=this.dimensions);for(var o=0,a=t.length;o<a;o++)n.push(this.get(t[o],e,i));return n},xI.hasValue=function(t){for(var e=this._dimensionsSummary.dataDimsOnCoord,i=this._dimensionInfos,n=0,o=e.length;n<o;n++)if("ordinal"!==i[e[n]].type&&isNaN(this.get(e[n],t)))return!1;return!0},xI.getDataExtent=function(t,e){t=this.getDimension(t);var i=this._storage[t],n=[1/0,-1/0];if(e=(e||!1)&&this.isStacked(t),!i)return n;var o,a=this.count(),r=[t,!!e].join("_");if(!this._indices&&!e)return this._rawExtent[t].slice();if(o=this._extent[r])return o.slice();for(var s=(o=n)[0],l=o[1],h=0;h<a;h++){var u=e?this.get(t,h,!0):this._getFast(t,this.getRawIndex(h));u<s&&(s=u),u>l&&(l=u)}return o=[s,l],this._extent[r]=o,o},xI.getApproximateExtent=function(t,e){return t=this.getDimension(t),this._approximateExtent[t]||this.getDataExtent(t,e)},xI.setApproximateExtent=function(t,e,i){e=this.getDimension(e),this._approximateExtent[e]=t.slice()},xI.isStacked=function(t){var e=this._dimensionInfos[t];return e&&e.stackable&&this.stackedOn},xI.getSum=function(t,e){var i=0;if(this._storage[t])for(var n=0,o=this.count();n<o;n++){var a=this.get(t,n,e);isNaN(a)||(i+=a)}return i},xI.indexOf=function(t,e){var i=this._storage[t],n=this._chunkSize;if(i)for(var o=0,a=this.count();o<a;o++){var r=o%n;if(i[Math.floor(o/n)][r]===e)return o}return-1},xI.indexOfName=function(t){for(var e=0,i=this.count();e<i;e++)if(this.getName(e)===t)return e;return-1},xI.indexOfRawIndex=function(t){if(!this._indices)return t;if(t>=this._rawCount||t<0)return-1;var e=this._indices,i=e[t];if(null!=i&&i<this._count&&i===t)return t;for(var n=0,o=this._count-1;n<=o;){var a=(n+o)/2|0;if(e[a]<t)n=a+1;else{if(!(e[a]>t))return a;o=a-1}}return-1},xI.indicesOfNearest=function(t,e,i,n){var o=[];if(!this._storage[t])return o;null==n&&(n=1/0);for(var a=Number.MAX_VALUE,r=-1,s=0,l=this.count();s<l;s++){var h=e-this.get(t,s,i),u=Math.abs(h);h<=n&&u<=a&&((u<a||h>=0&&r<0)&&(a=u,r=h,o.length=0),o.push(s))}return o},xI.getRawIndex=Cs,xI.getRawDataItem=function(t){if(this._rawData.persistent)return this._rawData.getItem(this.getRawIndex(t));for(var e=[],i=0;i<this.dimensions.length;i++){var n=this.dimensions[i];e.push(this.get(n,t))}return e},xI.getName=function(t){var e=this.getRawIndex(t);return this._nameList[e]||this._getNameFromStore(e)||""},xI.getId=function(t){return ks(this,this.getRawIndex(t))},xI.each=function(t,e,i,n){if(this._count){"function"==typeof t&&(n=i,i=e,e=t,t=[]);var o=(t=f(Ps(t),this.getDimension,this)).length;n=n||this;for(var a=0;a<this.count();a++)switch(o){case 0:e.call(n,a);break;case 1:e.call(n,this.get(t[0],a,i),a);break;case 2:e.call(n,this.get(t[0],a,i),this.get(t[1],a,i),a);break;default:for(var r=0,s=[];r<o;r++)s[r]=this.get(t[r],a,i);s[r]=a,e.apply(n,s)}}},xI.filterSelf=function(t,e,i,n){if(this._count){"function"==typeof t&&(n=i,i=e,e=t,t=[]),i=i||!1,n=n||this,t=f(Ps(t),this.getDimension,this);for(var o=this.count(),a=new(Ts(this))(o),r=[],s=t.length,l=0,h=t[0],u=0;u<o;u++){var c,d=this.getRawIndex(u);if(0===s)c=e.call(n,u);else if(1===s){var p=i?this.get(h,u,!0):this._getFast(h,d);c=e.call(n,p,u)}else{for(var g=0;g<s;g++)r[g]=i?this.get(t[g],u,!0):this._getFast(h,d);r[g]=u,c=e.apply(n,r)}c&&(a[l++]=d)}return l<o&&(this._indices=a),this._count=l,this._extent={},this.getRawIndex=this._indices?Ls:Cs,this}},xI.selectRange=function(t,e){if(this._count){e=e||!1;var i=[];for(var n in t)t.hasOwnProperty(n)&&i.push(n);var o=i.length;if(o){var a=this.count(),r=new(Ts(this))(a),s=0,l=i[0],h=t[l][0],u=t[l][1],c=!1;if(!this._indices&&!e){var d=0;if(1===o){for(var f=this._storage[i[0]],p=0;p<this._chunkCount;p++)for(var g=f[p],m=Math.min(this._count-p*this._chunkSize,this._chunkSize),v=0;v<m;v++)(b=g[v])>=h&&b<=u&&(r[s++]=d),d++;c=!0}else if(2===o){for(var f=this._storage[l],y=this._storage[i[1]],x=t[i[1]][0],_=t[i[1]][1],p=0;p<this._chunkCount;p++)for(var g=f[p],w=y[p],m=Math.min(this._count-p*this._chunkSize,this._chunkSize),v=0;v<m;v++){var b=g[v],S=w[v];b>=h&&b<=u&&S>=x&&S<=_&&(r[s++]=d),d++}c=!0}}if(!c)if(1===o){e=e||this.isStacked(l);for(v=0;v<a;v++){I=this.getRawIndex(v);(b=e?this.get(l,v,!0):this._getFast(l,I))>=h&&b<=u&&(r[s++]=I)}}else for(v=0;v<a;v++){for(var M=!0,I=this.getRawIndex(v),p=0;p<o;p++){var T=i[p];((b=e?this.get(T,v,!0):this._getFast(n,I))<t[T][0]||b>t[T][1])&&(M=!1)}M&&(r[s++]=this.getRawIndex(v))}return s<a&&(this._indices=r),this._count=s,this._extent={},this.getRawIndex=this._indices?Ls:Cs,this}}},xI.mapArray=function(t,e,i,n){"function"==typeof t&&(n=i,i=e,e=t,t=[]);var o=[];return this.each(t,function(){o.push(e&&e.apply(this,arguments))},i,n),o},xI.map=function(t,e,i,n){var o=Os(this,t=f(Ps(t),this.getDimension,this));o._indices=this._indices,o.getRawIndex=o._indices?Ls:Cs;for(var a=o._storage,r=[],s=this._chunkSize,l=t.length,h=this.count(),u=[],c=0;c<h;c++){for(var d=0;d<l;d++)u[d]=this.get(t[d],c,i);u[l]=c;var p=e&&e.apply(n,u);if(null!=p){"object"!=typeof p&&(r[0]=p,p=r);for(var g=this.getRawIndex(c),m=Math.floor(g/s),v=g%s,y=0;y<p.length;y++){var x=a[t[y]];x&&(x[m][v]=p[y])}}}return o},xI.downSample=function(t,e,i,n){for(var o=Os(this,[t]),a=o._storage,r=[],s=Math.floor(1/e),l=a[t],h=this.count(),u=this._chunkSize,c=new(Ts(this))(h),d=0,f=0;f<h;f+=s){s>h-f&&(s=h-f,r.length=s);for(var p=0;p<s;p++){var g=this.getRawIndex(f+p),m=Math.floor(g/u),v=g%u;r[p]=l[m][v]}var y=i(r),x=this.getRawIndex(Math.min(f+n(r,y)||0,h-1)),_=x%u;l[Math.floor(x/u)][_]=y,c[d++]=x}return o._count=d,o._indices=c,o.getRawIndex=Ls,o},xI.getItemModel=function(t){var e=this.hostModel;return new _o(this.getRawDataItem(t),e,e&&e.ecModel)},xI.diff=function(t){var e=this;return new ws(t?t.getIndices():[],this.getIndices(),function(e){return ks(t,e)},function(t){return ks(e,t)})},xI.getVisual=function(t){var e=this._visual;return e&&e[t]},xI.setVisual=function(t,e){if(dI(t))for(var i in t)t.hasOwnProperty(i)&&this.setVisual(i,t[i]);else this._visual=this._visual||{},this._visual[t]=e},xI.setLayout=function(t,e){if(dI(t))for(var i in t)t.hasOwnProperty(i)&&this.setLayout(i,t[i]);else this._layout[t]=e},xI.getLayout=function(t){return this._layout[t]},xI.getItemLayout=function(t){return this._itemLayouts[t]},xI.setItemLayout=function(t,e,i){this._itemLayouts[t]=i?a(this._itemLayouts[t]||{},e):e},xI.clearItemLayouts=function(){this._itemLayouts.length=0},xI.getItemVisual=function(t,e,i){var n=this._itemVisuals[t],o=n&&n[e];return null!=o||i?o:this.getVisual(e)},xI.setItemVisual=function(t,e,i){var n=this._itemVisuals[t]||{},o=this.hasItemVisual;if(this._itemVisuals[t]=n,dI(e))for(var a in e)e.hasOwnProperty(a)&&(n[a]=e[a],o[a]=!0);else n[e]=i,o[e]=!0},xI.clearAllVisual=function(){this._visual={},this._itemVisuals=[],this.hasItemVisual={}};var _I=function(t){t.seriesIndex=this.seriesIndex,t.dataIndex=this.dataIndex,t.dataType=this.dataType};xI.setItemGraphicEl=function(t,e){var i=this.hostModel;e&&(e.dataIndex=t,e.dataType=this.dataType,e.seriesIndex=i&&i.seriesIndex,"group"===e.type&&e.traverse(_I,e)),this._graphicEls[t]=e},xI.getItemGraphicEl=function(t){return this._graphicEls[t]},xI.eachItemGraphicEl=function(t,e){d(this._graphicEls,function(i,n){i&&t&&t.call(e,i,n)})},xI.cloneShallow=function(t){if(!t){var e=f(this.dimensions,this.getDimensionInfo,this);t=new yI(e,this.hostModel)}if(t._storage=this._storage,Ds(t,this),this._indices){var n=this._indices.constructor;t._indices=new n(this._indices)}else t._indices=null;return t.getRawIndex=t._indices?Ls:Cs,t._extent=i(this._extent),t._approximateExtent=i(this._approximateExtent),t},xI.wrapMethod=function(t,e){var i=this[t];"function"==typeof i&&(this.__wrappedMethods=this.__wrappedMethods||[],this.__wrappedMethods.push(t),this[t]=function(){var t=i.apply(this,arguments);return e.apply(this,[t].concat(C(arguments)))})},xI.TRANSFERABLE_METHODS=["cloneShallow","downSample","map"],xI.CHANGABLE_METHODS=["filterSelf","selectRange"];var wI=function(t,e){return e=e||{},Es(e.coordDimensions||[],t,{dimsDef:e.dimensionsDefine||t.dimensionsDefine,encodeDef:e.encodeDefine||t.encodeDefine,dimCount:e.dimensionsCount,extraPrefix:e.extraPrefix,extraFromZero:e.extraFromZero})};Fs.prototype.parse=function(t){return t},Fs.prototype.getSetting=function(t){return this._setting[t]},Fs.prototype.contain=function(t){var e=this._extent;return t>=e[0]&&t<=e[1]},Fs.prototype.normalize=function(t){var e=this._extent;return e[1]===e[0]?.5:(t-e[0])/(e[1]-e[0])},Fs.prototype.scale=function(t){var e=this._extent;return t*(e[1]-e[0])+e[0]},Fs.prototype.unionExtent=function(t){var e=this._extent;t[0]<e[0]&&(e[0]=t[0]),t[1]>e[1]&&(e[1]=t[1])},Fs.prototype.unionExtentFromData=function(t,e){this.unionExtent(t.getApproximateExtent(e,!0))},Fs.prototype.getExtent=function(){return this._extent.slice()},Fs.prototype.setExtent=function(t,e){var i=this._extent;isNaN(t)||(i[0]=t),isNaN(e)||(i[1]=e)},Fs.prototype.getTicksLabels=function(){for(var t=[],e=this.getTicks(),i=0;i<e.length;i++)t.push(this.getLabel(e[i]));return t},Fs.prototype.isBlank=function(){return this._isBlank},Fs.prototype.setBlank=function(t){this._isBlank=t},Vi(Fs),Hi(Fs,{registerWhenExtend:!0}),Hs.createByAxisModel=function(t){var e=t.option,i=e.data,n=i&&f(i,Us);return new Hs({categories:n,needCollect:!n,deduplication:!1!==e.dedplication})};var bI=Hs.prototype;bI.getOrdinal=function(t){return Zs(this).get(t)},bI.parseAndCollect=function(t){var e,i=this._needCollect;if("string"!=typeof t&&!i)return t;if(i&&!this._deduplication)return e=this.categories.length,this.categories[e]=t,e;var n=Zs(this);return null==(e=n.get(t))&&(i?(e=this.categories.length,this.categories[e]=t,n.set(t,e)):e=NaN),e};var SI=Fs.prototype,MI=Fs.extend({type:"ordinal",init:function(t,e){t&&!y(t)||(t=new Hs({categories:t})),this._ordinalMeta=t,this._extent=e||[0,t.categories.length-1]},parse:function(t){return"string"==typeof t?this._ordinalMeta.getOrdinal(t):Math.round(t)},contain:function(t){return t=this.parse(t),SI.contain.call(this,t)&&null!=this._ordinalMeta.categories[t]},normalize:function(t){return SI.normalize.call(this,this.parse(t))},scale:function(t){return Math.round(SI.scale.call(this,t))},getTicks:function(){for(var t=[],e=this._extent,i=e[0];i<=e[1];)t.push(i),i++;return t},getLabel:function(t){return this._ordinalMeta.categories[t]},count:function(){return this._extent[1]-this._extent[0]+1},unionExtentFromData:function(t,e){this.unionExtent(t.getApproximateExtent(e,!1))},niceTicks:B,niceExtent:B});MI.create=function(){return new MI};var II=Ao,TI=Ao,AI=Fs.extend({type:"interval",_interval:0,_intervalPrecision:2,setExtent:function(t,e){var i=this._extent;isNaN(t)||(i[0]=parseFloat(t)),isNaN(e)||(i[1]=parseFloat(e))},unionExtent:function(t){var e=this._extent;t[0]<e[0]&&(e[0]=t[0]),t[1]>e[1]&&(e[1]=t[1]),AI.prototype.setExtent.call(this,e[0],e[1])},getInterval:function(){return this._interval},setInterval:function(t){this._interval=t,this._niceExtent=this._extent.slice(),this._intervalPrecision=Xs(t)},getTicks:function(){return $s(this._interval,this._extent,this._niceExtent,this._intervalPrecision)},getTicksLabels:function(){for(var t=[],e=this.getTicks(),i=0;i<e.length;i++)t.push(this.getLabel(e[i]));return t},getLabel:function(t,e){if(null==t)return"";var i=e&&e.precision;return null==i?i=Lo(t)||0:"auto"===i&&(i=this._intervalPrecision),t=TI(t,i,!0),Wo(t)},niceTicks:function(t,e,i){t=t||5;var n=this._extent,o=n[1]-n[0];if(isFinite(o)){o<0&&(o=-o,n.reverse());var a=js(n,t,e,i);this._intervalPrecision=a.intervalPrecision,this._interval=a.interval,this._niceExtent=a.niceTickExtent}},niceExtent:function(t){var e=this._extent;if(e[0]===e[1])if(0!==e[0]){var i=e[0];t.fixMax?e[0]-=i/2:(e[1]+=i/2,e[0]-=i/2)}else e[1]=1;var n=e[1]-e[0];isFinite(n)||(e[0]=0,e[1]=1),this.niceTicks(t.splitNumber,t.minInterval,t.maxInterval);var o=this._interval;t.fixMin||(e[0]=TI(Math.floor(e[0]/o)*o)),t.fixMax||(e[1]=TI(Math.ceil(e[1]/o)*o))}});AI.create=function(){return new AI};var DI="__ec_stack_",CI=AI.prototype,LI=Math.ceil,kI=Math.floor,PI=function(t,e,i,n){for(;i<n;){var o=i+n>>>1;t[o][1]<e?i=o+1:n=o}return i},OI=AI.extend({type:"time",getLabel:function(t){var e=this._stepLvl,i=new Date(t);return Xo(e[0],i,this.getSetting("useUTC"))},niceExtent:function(t){var e=this._extent;if(e[0]===e[1]&&(e[0]-=864e5,e[1]+=864e5),e[1]===-1/0&&e[0]===1/0){var i=new Date;e[1]=+new Date(i.getFullYear(),i.getMonth(),i.getDate()),e[0]=e[1]-864e5}this.niceTicks(t.splitNumber,t.minInterval,t.maxInterval);var n=this._interval;t.fixMin||(e[0]=Ao(kI(e[0]/n)*n)),t.fixMax||(e[1]=Ao(LI(e[1]/n)*n))},niceTicks:function(t,e,i){t=t||10;var n=this._extent,o=n[1]-n[0],a=o/t;null!=e&&a<e&&(a=e),null!=i&&a>i&&(a=i);var r=NI.length,s=PI(NI,a,0,r),l=NI[Math.min(s,r-1)],h=l[1];"year"===l[0]&&(h*=Bo(o/h/t,!0));var u=this.getSetting("useUTC")?0:60*new Date(+n[0]||+n[1]).getTimezoneOffset()*1e3,c=[Math.round(LI((n[0]-u)/h)*h+u),Math.round(kI((n[1]-u)/h)*h+u)];qs(c,n),this._stepLvl=l,this._interval=h,this._niceExtent=c},parse:function(t){return+Eo(t)}});d(["contain","normalize"],function(t){OI.prototype[t]=function(e){return CI[t].call(this,this.parse(e))}});var NI=[["hh:mm:ss",1e3],["hh:mm:ss",5e3],["hh:mm:ss",1e4],["hh:mm:ss",15e3],["hh:mm:ss",3e4],["hh:mm\nMM-dd",6e4],["hh:mm\nMM-dd",3e5],["hh:mm\nMM-dd",6e5],["hh:mm\nMM-dd",9e5],["hh:mm\nMM-dd",18e5],["hh:mm\nMM-dd",36e5],["hh:mm\nMM-dd",72e5],["hh:mm\nMM-dd",216e5],["hh:mm\nMM-dd",432e5],["MM-dd\nyyyy",864e5],["MM-dd\nyyyy",1728e5],["MM-dd\nyyyy",2592e5],["MM-dd\nyyyy",3456e5],["MM-dd\nyyyy",432e6],["MM-dd\nyyyy",5184e5],["week",6048e5],["MM-dd\nyyyy",864e6],["week",12096e5],["week",18144e5],["month",26784e5],["week",36288e5],["month",53568e5],["week",36288e5],["quarter",8208e6],["month",107136e5],["month",13392e6],["half-year",16416e6],["month",214272e5],["month",26784e6],["year",32832e6]];OI.create=function(t){return new OI({useUTC:t.ecModel.get("useUTC")})};var EI=Fs.prototype,zI=AI.prototype,RI=Lo,BI=Ao,VI=Math.floor,GI=Math.ceil,WI=Math.pow,FI=Math.log,HI=Fs.extend({type:"log",base:10,$constructor:function(){Fs.apply(this,arguments),this._originalScale=new AI},getTicks:function(){var t=this._originalScale,e=this._extent,i=t.getExtent();return f(zI.getTicks.call(this),function(n){var o=Ao(WI(this.base,n));return o=n===e[0]&&t.__fixMin?nl(o,i[0]):o,o=n===e[1]&&t.__fixMax?nl(o,i[1]):o},this)},getLabel:zI.getLabel,scale:function(t){return t=EI.scale.call(this,t),WI(this.base,t)},setExtent:function(t,e){var i=this.base;t=FI(t)/FI(i),e=FI(e)/FI(i),zI.setExtent.call(this,t,e)},getExtent:function(){var t=this.base,e=EI.getExtent.call(this);e[0]=WI(t,e[0]),e[1]=WI(t,e[1]);var i=this._originalScale,n=i.getExtent();return i.__fixMin&&(e[0]=nl(e[0],n[0])),i.__fixMax&&(e[1]=nl(e[1],n[1])),e},unionExtent:function(t){this._originalScale.unionExtent(t);var e=this.base;t[0]=FI(t[0])/FI(e),t[1]=FI(t[1])/FI(e),EI.unionExtent.call(this,t)},unionExtentFromData:function(t,e){this.unionExtent(t.getApproximateExtent(e,!0,function(t){return t>0}))},niceTicks:function(t){t=t||10;var e=this._extent,i=e[1]-e[0];if(!(i===1/0||i<=0)){var n=zo(i);for(t/i*n<=.5&&(n*=10);!isNaN(n)&&Math.abs(n)<1&&Math.abs(n)>0;)n*=10;var o=[Ao(GI(e[0]/n)*n),Ao(VI(e[1]/n)*n)];this._interval=n,this._niceExtent=o}},niceExtent:function(t){zI.niceExtent.call(this,t);var e=this._originalScale;e.__fixMin=t.fixMin,e.__fixMax=t.fixMax}});d(["contain","normalize"],function(t){HI.prototype[t]=function(e){return e=FI(e)/FI(this.base),EI[t].call(this,e)}}),HI.create=function(){return new HI};var ZI={getFormattedLabels:function(){return hl(this.axis,this.get("axisLabel.formatter"))},getMin:function(t){var e=this.option,i=t||null==e.rangeStart?e.min:e.rangeStart;return this.axis&&null!=i&&"dataMin"!==i&&"function"!=typeof i&&!I(i)&&(i=this.axis.scale.parse(i)),i},getMax:function(t){var e=this.option,i=t||null==e.rangeEnd?e.max:e.rangeEnd;return this.axis&&null!=i&&"dataMax"!==i&&"function"!=typeof i&&!I(i)&&(i=this.axis.scale.parse(i)),i},getNeedCrossZero:function(){var t=this.option;return null==t.rangeStart&&null==t.rangeEnd&&!t.scale},getCoordSysModel:B,setRange:function(t,e){this.option.rangeStart=t,this.option.rangeEnd=e},resetRange:function(){this.option.rangeStart=this.option.rangeEnd=null}},UI=Nn({type:"triangle",shape:{cx:0,cy:0,width:0,height:0},buildPath:function(t,e){var i=e.cx,n=e.cy,o=e.width/2,a=e.height/2;t.moveTo(i,n-a),t.lineTo(i+o,n+a),t.lineTo(i-o,n+a),t.closePath()}}),jI=Nn({type:"diamond",shape:{cx:0,cy:0,width:0,height:0},buildPath:function(t,e){var i=e.cx,n=e.cy,o=e.width/2,a=e.height/2;t.moveTo(i,n-a),t.lineTo(i+o,n),t.lineTo(i,n+a),t.lineTo(i-o,n),t.closePath()}}),XI=Nn({type:"pin",shape:{x:0,y:0,width:0,height:0},buildPath:function(t,e){var i=e.x,n=e.y,o=e.width/5*3,a=Math.max(o,e.height),r=o/2,s=r*r/(a-r),l=n-a+r+s,h=Math.asin(s/r),u=Math.cos(h)*r,c=Math.sin(h),d=Math.cos(h),f=.6*r,p=.7*r;t.moveTo(i-u,l+s),t.arc(i,l,r,Math.PI-h,2*Math.PI+h),t.bezierCurveTo(i+u-c*f,l+s+d*f,i,n-p,i,n),t.bezierCurveTo(i,n-p,i-u+c*f,l+s+d*f,i-u,l+s),t.closePath()}}),YI=Nn({type:"arrow",shape:{x:0,y:0,width:0,height:0},buildPath:function(t,e){var i=e.height,n=e.width,o=e.x,a=e.y,r=n/3*2;t.moveTo(o,a),t.lineTo(o+r,a+i),t.lineTo(o,a+i/4*3),t.lineTo(o-r,a+i),t.lineTo(o,a),t.closePath()}}),qI={line:function(t,e,i,n,o){o.x1=t,o.y1=e+n/2,o.x2=t+i,o.y2=e+n/2},rect:function(t,e,i,n,o){o.x=t,o.y=e,o.width=i,o.height=n},roundRect:function(t,e,i,n,o){o.x=t,o.y=e,o.width=i,o.height=n,o.r=Math.min(i,n)/4},square:function(t,e,i,n,o){var a=Math.min(i,n);o.x=t,o.y=e,o.width=a,o.height=a},circle:function(t,e,i,n,o){o.cx=t+i/2,o.cy=e+n/2,o.r=Math.min(i,n)/2},diamond:function(t,e,i,n,o){o.cx=t+i/2,o.cy=e+n/2,o.width=i,o.height=n},pin:function(t,e,i,n,o){o.x=t+i/2,o.y=e+n/2,o.width=i,o.height=n},arrow:function(t,e,i,n,o){o.x=t+i/2,o.y=e+n/2,o.width=i,o.height=n},triangle:function(t,e,i,n,o){o.cx=t+i/2,o.cy=e+n/2,o.width=i,o.height=n}},$I={};d({line:Gb,rect:Vb,roundRect:Vb,square:Vb,circle:Lb,diamond:jI,pin:XI,arrow:YI,triangle:UI},function(t,e){$I[e]=new t});var KI=Nn({type:"symbol",shape:{symbolType:"",x:0,y:0,width:0,height:0},beforeBrush:function(){var t=this.style;"pin"===this.shape.symbolType&&"inside"===t.textPosition&&(t.textPosition=["50%","40%"],t.textAlign="center",t.textVerticalAlign="middle")},buildPath:function(t,e,i){var n=e.symbolType,o=$I[n];"none"!==e.symbolType&&(o||(o=$I[n="rect"]),qI[n](e.x,e.y,e.width,e.height,o.shape),o.buildPath(t,o.shape,i))}}),JI=(Object.freeze||Object)({createList:function(t){return Bs(t.getSource(),t)},getLayoutRect:Ko,createScale:function(t,e){var i=e;_o.isInstance(e)||u(i=new _o(e),ZI);var n=sl(i);return n.setExtent(t[0],t[1]),rl(n,i),n},mixinAxisModelCommonMethods:function(t){u(t,ZI)},completeDimensions:Es,createDimensions:wI,createSymbol:dl}),QI=1e-8;gl.prototype={constructor:gl,properties:null,getBoundingRect:function(){var t=this._rect;if(t)return t;for(var e=Number.MAX_VALUE,i=[e,e],n=[-e,-e],o=[],a=[],r=this.geometries,s=0;s<r.length;s++)"polygon"===r[s].type&&(an(r[s].exterior,o,a),tt(i,i,o),et(n,n,a));return 0===s&&(i[0]=i[1]=n[0]=n[1]=0),this._rect=new Kt(i[0],i[1],n[0]-i[0],n[1]-i[1])},contain:function(t){var e=this.getBoundingRect(),i=this.geometries;if(!e.contain(t[0],t[1]))return!1;t:for(var n=0,o=i.length;n<o;n++)if("polygon"===i[n].type){var a=i[n].exterior,r=i[n].interiors;if(pl(a,t[0],t[1])){for(var s=0;s<(r?r.length:0);s++)if(pl(r[s]))continue t;return!0}}return!1},transformTo:function(t,e,i,n){var o=this.getBoundingRect(),a=o.width/o.height;i?n||(n=i/a):i=a*n;for(var r=new Kt(t,e,i,n),s=o.calculateTransform(r),l=this.geometries,h=0;h<l.length;h++)if("polygon"===l[h].type){for(var u=l[h].exterior,c=l[h].interiors,d=0;d<u.length;d++)Q(u[d],u[d],s);for(var f=0;f<(c?c.length:0);f++)for(d=0;d<c[f].length;d++)Q(c[f][d],c[f][d],s)}(o=this._rect).copy(r),this.center=[o.x+o.width/2,o.y+o.height/2]}};var tT=function(t){return ml(t),f(g(t.features,function(t){return t.geometry&&t.properties&&t.geometry.coordinates.length>0}),function(t){var e=t.properties,i=t.geometry,n=i.coordinates,o=[];"Polygon"===i.type&&o.push({type:"polygon",exterior:n[0],interiors:n.slice(1)}),"MultiPolygon"===i.type&&d(n,function(t){t[0]&&o.push({type:"polygon",exterior:t[0],interiors:t.slice(1)})});var a=new gl(e.name,o,e.cp);return a.properties=e,a})},eT=Io,iT=[0,1],nT=function(t,e,i){this.dim=t,this.scale=e,this._extent=i||[0,0],this.inverse=!1,this.onBand=!1,this._labelInterval};nT.prototype={constructor:nT,contain:function(t){var e=this._extent,i=Math.min(e[0],e[1]),n=Math.max(e[0],e[1]);return t>=i&&t<=n},containData:function(t){return this.contain(this.dataToCoord(t))},getExtent:function(){return this._extent.slice()},getPixelPrecision:function(t){return ko(t||this.scale.getExtent(),this._extent)},setExtent:function(t,e){var i=this._extent;i[0]=t,i[1]=e},dataToCoord:function(t,e){var i=this._extent,n=this.scale;return t=n.normalize(t),this.onBand&&"ordinal"===n.type&&yl(i=i.slice(),n.count()),eT(t,iT,i,e)},coordToData:function(t,e){var i=this._extent,n=this.scale;this.onBand&&"ordinal"===n.type&&yl(i=i.slice(),n.count());var o=eT(t,i,iT,e);return this.scale.scale(o)},pointToData:function(t,e){},getTicksCoords:function(t){if(this.onBand&&!t){for(var e=this.getBands(),i=[],n=0;n<e.length;n++)i.push(e[n][0]);return e[n-1]&&i.push(e[n-1][1]),i}return f(this.scale.getTicks(),this.dataToCoord,this)},getLabelsCoords:function(){return f(this.scale.getTicks(),this.dataToCoord,this)},getBands:function(){for(var t=this.getExtent(),e=[],i=this.scale.count(),n=t[0],o=t[1]-n,a=0;a<i;a++)e.push([o*a/i+n,o*(a+1)/i+n]);return e},getBandWidth:function(){var t=this._extent,e=this.scale.getExtent(),i=e[1]-e[0]+(this.onBand?1:0);0===i&&(i=1);var n=Math.abs(t[1]-t[0]);return Math.abs(n)/i},isHorizontal:null,getRotate:null,getLabelInterval:function(){var t=this._labelInterval;if(!t){var e=this.model,i=e.getModel("axisLabel");t=i.get("interval"),"category"!==this.type||null!=t&&"auto"!==t||(t=ll(f(this.scale.getTicks(),this.dataToCoord,this),e.getFormattedLabels(),i.getFont(),this.getRotate?this.getRotate():this.isHorizontal&&!this.isHorizontal()?90:0,i.get("rotate"))),this._labelInterval=t}return t}};var oT=tT,aT={};d(["map","each","filter","indexOf","inherits","reduce","filter","bind","curry","isArray","isString","isObject","isFunction","extend","defaults","clone","merge"],function(t){aT[t]=Ex[t]});gs({type:"dataset",defaultOption:{seriesLayoutBy:RS,sourceHeader:null,dimensions:null,source:null},optionUpdated:function(){sa(this)}});ms({type:"dataset"}),uM.extend({type:"series.line",dependencies:["grid","polar"],getInitialData:function(t,e){return Bs(this.getSource(),this)},defaultOption:{zlevel:0,z:2,coordinateSystem:"cartesian2d",legendHoverLink:!0,hoverAnimation:!0,clipOverflow:!0,label:{position:"top"},lineStyle:{width:2,type:"solid"},step:!1,smooth:!1,smoothMonotone:null,symbol:"emptyCircle",symbolSize:4,symbolRotate:null,showSymbol:!0,showAllSymbol:!1,connectNulls:!1,sampling:"none",animationEasing:"linear",progressive:0,hoverLayerThreshold:1/0}});var rT=bl.prototype;rT._createSymbol=function(t,e,i,n){this.removeAll();var o=dl(t,-1,-1,2,2,e.getItemVisual(i,"color"));o.attr({z2:100,culling:!0,scale:wl(n)}),o.drift=Sl,this._symbolType=t,this.add(o)},rT.stopSymbolAnimation=function(t){this.childAt(0).stopAnimation(t)},rT.getSymbolPath=function(){return this.childAt(0)},rT.getScale=function(){return this.childAt(0).scale},rT.highlight=function(){this.childAt(0).trigger("emphasis")},rT.downplay=function(){this.childAt(0).trigger("normal")},rT.setZ=function(t,e){var i=this.childAt(0);i.zlevel=t,i.z=e},rT.setDraggable=function(t){var e=this.childAt(0);e.draggable=t,e.cursor=t?"move":"pointer"},rT.updateData=function(t,e,i){this.silent=!1;var n=t.getItemVisual(e,"symbol")||"circle",o=t.hostModel,a=_l(t,e),r=n!==this._symbolType;if(r?this._createSymbol(n,t,e,a):((s=this.childAt(0)).silent=!1,co(s,{scale:wl(a)},o,e)),this._updateCommon(t,e,a,i),r){var s=this.childAt(0),l=i&&i.fadeIn,h={scale:s.scale.slice()};l&&(h.style={opacity:s.style.opacity}),s.scale=[0,0],l&&(s.style.opacity=0),fo(s,h,o,e)}this._seriesModel=o};var sT=["itemStyle"],lT=["emphasis","itemStyle"],hT=["label"],uT=["emphasis","label"];rT._updateCommon=function(t,e,i,n){var o=this.childAt(0),r=t.hostModel,s=t.getItemVisual(e,"color");"image"!==o.type&&o.useStyle({strokeNoScale:!0});var l=n&&n.itemStyle,h=n&&n.hoverItemStyle,u=n&&n.symbolRotate,c=n&&n.symbolOffset,d=n&&n.labelModel,f=n&&n.hoverLabelModel,p=n&&n.hoverAnimation,g=n&&n.cursorStyle;if(!n||t.hasItemOption){var m=n&&n.itemModel?n.itemModel:t.getItemModel(e);l=m.getModel(sT).getItemStyle(["color"]),h=m.getModel(lT).getItemStyle(),u=m.getShallow("symbolRotate"),c=m.getShallow("symbolOffset"),d=m.getModel(hT),f=m.getModel(uT),p=m.getShallow("hoverAnimation"),g=m.getShallow("cursor")}else h=a({},h);var v=o.style;o.attr("rotation",(u||0)*Math.PI/180||0),c&&o.attr("position",[To(c[0],i[0]),To(c[1],i[1])]),g&&o.attr("cursor",g),o.setColor(s,n&&n.symbolInnerColor),o.setStyle(l);var y=t.getItemVisual(e,"opacity");null!=y&&(v.opacity=y);var x=n&&n.useNameLabel;eo(v,h,d,f,{labelFetcher:r,labelDataIndex:e,defaultText:function(e,i){return x?t.getName(e):xl(t,e)},isRectText:!0,autoColor:s}),o.off("mouseover").off("mouseout").off("emphasis").off("normal"),o.hoverStyle=h,to(o);var _=wl(i);if(p&&r.isAnimationEnabled()){var w=function(){var t=_[1]/_[0];this.animateTo({scale:[Math.max(1.1*_[0],_[0]+3),Math.max(1.1*_[1],_[1]+3*t)]},400,"elasticOut")},b=function(){this.animateTo({scale:_},400,"elasticOut")};o.on("mouseover",w).on("mouseout",b).on("emphasis",w).on("normal",b)}},rT.fadeOut=function(t,e){var i=this.childAt(0);this.silent=i.silent=!0,!(e&&e.keepLabel)&&(i.style.text=null),co(i,{style:{opacity:0},scale:[0,0]},this._seriesModel,this.dataIndex,t)},h(bl,S_);var cT=Ml.prototype;cT.updateData=function(t,e){var i=this.group,n=t.hostModel,o=this._data,a=this._symbolCtor,r=Tl(t);o||i.removeAll(),t.diff(o).add(function(n){var o=t.getItemLayout(n);if(Il(t,o,n,e)){var s=new a(t,n,r);s.attr("position",o),t.setItemGraphicEl(n,s),i.add(s)}}).update(function(s,l){var h=o.getItemGraphicEl(l),u=t.getItemLayout(s);Il(t,u,s,e)?(h?(h.updateData(t,s,r),co(h,{position:u},n)):(h=new a(t,s)).attr("position",u),i.add(h),t.setItemGraphicEl(s,h)):i.remove(h)}).remove(function(t){var e=o.getItemGraphicEl(t);e&&e.fadeOut(function(){i.remove(e)})}).execute(),this._data=t},cT.isPersistent=function(){return!0},cT.updateLayout=function(){var t=this._data;t&&t.eachItemGraphicEl(function(e,i){var n=t.getItemLayout(i);e.attr("position",n)})},cT.incrementalPrepareUpdate=function(t){this._seriesScope=Tl(t),this._data=null,this.group.removeAll()},cT.incrementalUpdate=function(t,e,i){for(var n=t.start;n<t.end;n++){var o=e.getItemLayout(n);if(Il(e,o,n,i)){var a=new this._symbolCtor(e,n,this._seriesScope);a.traverse(function(t){t.isGroup||(t.incremental=t.useHoverLayer=!0)}),a.attr("position",o),this.group.add(a),e.setItemGraphicEl(n,a)}}},cT.remove=function(t){var e=this.group,i=this._data;i&&(t?i.eachItemGraphicEl(function(t){t.fadeOut(function(){e.remove(t)})}):e.removeAll())};var dT=function(t,e,i,n,o,a){for(var r=Cl(t,e),s=[],l=[],h=[],u=[],c=[],d=[],f=[],p=a.dimensions,g=0;g<r.length;g++){var m=r[g],v=!0;switch(m.cmd){case"=":var y=t.getItemLayout(m.idx),x=e.getItemLayout(m.idx1);(isNaN(y[0])||isNaN(y[1]))&&(y=x.slice()),s.push(y),l.push(x),h.push(i[m.idx]),u.push(n[m.idx1]),f.push(e.getRawIndex(m.idx1));break;case"+":_=m.idx;s.push(o.dataToPoint([e.get(p[0],_,!0),e.get(p[1],_,!0)])),l.push(e.getItemLayout(_).slice()),h.push(Dl(o,e,_)),u.push(n[_]),f.push(e.getRawIndex(_));break;case"-":var _=m.idx,w=t.getRawIndex(_);w!==_?(s.push(t.getItemLayout(_)),l.push(a.dataToPoint([t.get(p[0],_,!0),t.get(p[1],_,!0)])),h.push(i[_]),u.push(Dl(a,t,_)),f.push(w)):v=!1}v&&(c.push(m),d.push(d.length))}d.sort(function(t,e){return f[t]-f[e]});for(var b=[],S=[],M=[],I=[],T=[],g=0;g<d.length;g++){_=d[g];b[g]=s[_],S[g]=l[_],M[g]=h[_],I[g]=u[_],T[g]=c[_]}return{current:b,next:S,stackedOnCurrent:M,stackedOnNext:I,status:T}},fT=tt,pT=et,gT=Z,mT=G,vT=[],yT=[],xT=[],_T=Mn.extend({type:"ec-polyline",shape:{points:[],smooth:0,smoothConstraint:!0,smoothMonotone:null,connectNulls:!1},style:{fill:null,stroke:"#000"},brush:Pb(Mn.prototype.brush),buildPath:function(t,e){var i=e.points,n=0,o=i.length,a=Pl(i,e.smoothConstraint);if(e.connectNulls){for(;o>0&&Ll(i[o-1]);o--);for(;n<o&&Ll(i[n]);n++);}for(;n<o;)n+=kl(t,i,n,o,o,1,a.min,a.max,e.smooth,e.smoothMonotone,e.connectNulls)+1}}),wT=Mn.extend({type:"ec-polygon",shape:{points:[],stackedOnPoints:[],smooth:0,stackedOnSmooth:0,smoothConstraint:!0,smoothMonotone:null,connectNulls:!1},brush:Pb(Mn.prototype.brush),buildPath:function(t,e){var i=e.points,n=e.stackedOnPoints,o=0,a=i.length,r=e.smoothMonotone,s=Pl(i,e.smoothConstraint),l=Pl(n,e.smoothConstraint);if(e.connectNulls){for(;a>0&&Ll(i[a-1]);a--);for(;o<a&&Ll(i[o]);o++);}for(;o<a;){var h=kl(t,i,o,a,a,1,s.min,s.max,e.smooth,r,e.connectNulls);kl(t,n,o+h-1,h,a,-1,l.min,l.max,e.stackedOnSmooth,r,e.connectNulls),o+=h+1,t.closePath()}}});cr.extend({type:"line",init:function(){var t=new S_,e=new Ml;this.group.add(e.group),this._symbolDraw=e,this._lineGroup=t},render:function(t,e,i){var n=t.coordinateSystem,o=this.group,a=t.getData(),s=t.getModel("lineStyle"),l=t.getModel("areaStyle"),h=a.mapArray(a.getItemLayout,!0),u="polar"===n.type,c=this._coordSys,d=this._symbolDraw,f=this._polyline,p=this._polygon,g=this._lineGroup,m=t.get("animation"),v=!l.isEmpty(),y=Rl(0,n,a,l.get("origin")),x=t.get("showSymbol"),_=x&&!u&&!t.get("showAllSymbol")&&this._getSymbolIgnoreFunc(a,n),w=this._data;w&&w.eachItemGraphicEl(function(t,e){t.__temp&&(o.remove(t),w.setItemGraphicEl(e,null))}),x||d.remove(),o.add(g);var b=!u&&t.get("step");f&&c.type===n.type&&b===this._step?(v&&!p?p=this._newPolygon(h,y,n,m):p&&!v&&(g.remove(p),p=this._polygon=null),g.setClipPath(Gl(n,!1,t)),x&&d.updateData(a,_),a.eachItemGraphicEl(function(t){t.stopAnimation(!0)}),Ol(this._stackedOnPoints,y)&&Ol(this._points,h)||(m?this._updateAnimation(a,y,n,i,b):(b&&(h=Wl(h,n,b),y=Wl(y,n,b)),f.setShape({points:h}),p&&p.setShape({points:h,stackedOnPoints:y})))):(x&&d.updateData(a,_),b&&(h=Wl(h,n,b),y=Wl(y,n,b)),f=this._newPolyline(h,n,m),v&&(p=this._newPolygon(h,y,n,m)),g.setClipPath(Gl(n,!0,t)));var S=Fl(a,n)||a.getVisual("color");f.useStyle(r(s.getLineStyle(),{fill:"none",stroke:S,lineJoin:"bevel"}));var M=t.get("smooth");if(M=Nl(t.get("smooth")),f.setShape({smooth:M,smoothMonotone:t.get("smoothMonotone"),connectNulls:t.get("connectNulls")}),p){var I=a.stackedOn,T=0;p.useStyle(r(l.getAreaStyle(),{fill:S,opacity:.7,lineJoin:"bevel"})),I&&(T=Nl(I.hostModel.get("smooth"))),p.setShape({smooth:M,stackedOnSmooth:T,smoothMonotone:t.get("smoothMonotone"),connectNulls:t.get("connectNulls")})}this._data=a,this._coordSys=n,this._stackedOnPoints=y,this._points=h,this._step=b},dispose:function(){},highlight:function(t,e,i,n){var o=t.getData(),a=ki(o,n);if(!(a instanceof Array)&&null!=a&&a>=0){var r=o.getItemGraphicEl(a);if(!r){var s=o.getItemLayout(a);if(!s)return;(r=new bl(o,a)).position=s,r.setZ(t.get("zlevel"),t.get("z")),r.ignore=isNaN(s[0])||isNaN(s[1]),r.__temp=!0,o.setItemGraphicEl(a,r),r.stopSymbolAnimation(!0),this.group.add(r)}r.highlight()}else cr.prototype.highlight.call(this,t,e,i,n)},downplay:function(t,e,i,n){var o=t.getData(),a=ki(o,n);if(null!=a&&a>=0){var r=o.getItemGraphicEl(a);r&&(r.__temp?(o.setItemGraphicEl(a,null),this.group.remove(r)):r.downplay())}else cr.prototype.downplay.call(this,t,e,i,n)},_newPolyline:function(t){var e=this._polyline;return e&&this._lineGroup.remove(e),e=new _T({shape:{points:t},silent:!0,z2:10}),this._lineGroup.add(e),this._polyline=e,e},_newPolygon:function(t,e){var i=this._polygon;return i&&this._lineGroup.remove(i),i=new wT({shape:{points:t,stackedOnPoints:e},silent:!0}),this._lineGroup.add(i),this._polygon=i,i},_getSymbolIgnoreFunc:function(t,e){var i=e.getAxesByScale("ordinal")[0];if(i&&i.isLabelIgnored)return m(i.isLabelIgnored,i)},_updateAnimation:function(t,e,i,n,o){var a=this._polyline,r=this._polygon,s=t.hostModel,l=dT(this._data,t,this._stackedOnPoints,e,this._coordSys,i),h=l.current,u=l.stackedOnCurrent,c=l.next,d=l.stackedOnNext;o&&(h=Wl(l.current,i,o),u=Wl(l.stackedOnCurrent,i,o),c=Wl(l.next,i,o),d=Wl(l.stackedOnNext,i,o)),a.shape.__points=l.current,a.shape.points=h,co(a,{shape:{points:c}},s),r&&(r.setShape({points:h,stackedOnPoints:u}),co(r,{shape:{points:c,stackedOnPoints:d}},s));for(var f=[],p=l.status,g=0;g<p.length;g++)if("="===p[g].cmd){var m=t.getItemGraphicEl(p[g].idx1);m&&f.push({el:m,ptIdx:g})}a.animators&&a.animators.length&&a.animators[0].during(function(){for(var t=0;t<f.length;t++)f[t].el.attr("position",a.shape.__points[f[t].ptIdx])})},remove:function(t){var e=this.group,i=this._data;this._lineGroup.removeAll(),this._symbolDraw.remove(!0),i&&i.eachItemGraphicEl(function(t,n){t.__temp&&(e.remove(t),i.setItemGraphicEl(n,null))}),this._polyline=this._polygon=this._coordSys=this._points=this._stackedOnPoints=this._data=null}});var bT=function(t,e,i){return{seriesType:t,performRawSeries:!0,reset:function(t,n,o){var a=t.getData(),r=t.get("symbol")||e,s=t.get("symbolSize");if(a.setVisual({legendSymbol:i||r,symbol:r,symbolSize:s}),!n.isSeriesFiltered(t)){var l="function"==typeof s;return{dataEach:a.hasItemOption||l?function(e,i){if("function"==typeof s){var n=t.getRawValue(i),o=t.getDataParams(i);e.setItemVisual(i,"symbolSize",s(n,o))}if(e.hasItemOption){var a=e.getItemModel(i),r=a.getShallow("symbol",!0),l=a.getShallow("symbolSize",!0);null!=r&&e.setItemVisual(i,"symbol",r),null!=l&&e.setItemVisual(i,"symbolSize",l)}}:null}}}}},ST=function(t){return{seriesType:t,plan:fM(),reset:function(t){var e=t.getData(),i=t.coordinateSystem,n=t.pipelineContext.large;if(i){var o=f(i.dimensions,function(t){return e.getDimension(e.mapDimension(t))}).slice(0,2),a=o.length;return a&&{progress:function(t,e){for(var r=t.end-t.start,s=n&&new Float32Array(r*a),l=t.start,h=0,u=[],c=[];l<t.end;l++){var d;if(1===a)f=e.get(o[0],l,!0),d=!isNaN(f)&&i.dataToPoint(f,null,c);else{var f=u[0]=e.get(o[0],l,!0),p=u[1]=e.get(o[1],l,!0);d=!isNaN(f)&&!isNaN(p)&&i.dataToPoint(u,null,c)}n?(s[h++]=d?d[0]:NaN,s[h++]=d?d[1]:NaN):e.setItemLayout(l,d&&d.slice()||[NaN,NaN])}n&&e.setLayout("symbolPoints",s)}}}}}},MT={average:function(t){for(var e=0,i=0,n=0;n<t.length;n++)isNaN(t[n])||(e+=t[n],i++);return 0===i?NaN:e/i},sum:function(t){for(var e=0,i=0;i<t.length;i++)e+=t[i]||0;return e},max:function(t){for(var e=-1/0,i=0;i<t.length;i++)t[i]>e&&(e=t[i]);return e},min:function(t){for(var e=1/0,i=0;i<t.length;i++)t[i]<e&&(e=t[i]);return e},nearest:function(t){return t[0]}},IT=function(t,e){return Math.round(t.length/2)},TT=function(t){this._axes={},this._dimList=[],this.name=t||""};TT.prototype={constructor:TT,type:"cartesian",getAxis:function(t){return this._axes[t]},getAxes:function(){return f(this._dimList,Hl,this)},getAxesByScale:function(t){return t=t.toLowerCase(),g(this.getAxes(),function(e){return e.scale.type===t})},addAxis:function(t){var e=t.dim;this._axes[e]=t,this._dimList.push(e)},dataToCoord:function(t){return this._dataCoordConvert(t,"dataToCoord")},coordToData:function(t){return this._dataCoordConvert(t,"coordToData")},_dataCoordConvert:function(t,e){for(var i=this._dimList,n=t instanceof Array?[]:{},o=0;o<i.length;o++){var a=i[o],r=this._axes[a];n[a]=r[e](t[a])}return n}},Zl.prototype={constructor:Zl,type:"cartesian2d",dimensions:["x","y"],getBaseAxis:function(){return this.getAxesByScale("ordinal")[0]||this.getAxesByScale("time")[0]||this.getAxis("x")},containPoint:function(t){var e=this.getAxis("x"),i=this.getAxis("y");return e.contain(e.toLocalCoord(t[0]))&&i.contain(i.toLocalCoord(t[1]))},containData:function(t){return this.getAxis("x").containData(t[0])&&this.getAxis("y").containData(t[1])},dataToPoint:function(t,e,i){var n=this.getAxis("x"),o=this.getAxis("y");return i=i||[],i[0]=n.toGlobalCoord(n.dataToCoord(t[0])),i[1]=o.toGlobalCoord(o.dataToCoord(t[1])),i},clampData:function(t,e){var i=this.getAxis("x").scale.getExtent(),n=this.getAxis("y").scale.getExtent();return e=e||[],e[0]=Math.min(Math.max(Math.min(i[0],i[1]),t[0]),Math.max(i[0],i[1])),e[1]=Math.min(Math.max(Math.min(n[0],n[1]),t[1]),Math.max(n[0],n[1])),e},pointToData:function(t,e){var i=this.getAxis("x"),n=this.getAxis("y");return e=e||[],e[0]=i.coordToData(i.toLocalCoord(t[0])),e[1]=n.coordToData(n.toLocalCoord(t[1])),e},getOtherAxis:function(t){return this.getAxis("x"===t.dim?"y":"x")}},h(Zl,TT);var AT=function(t,e,i,n,o){nT.call(this,t,e,i),this.type=n||"value",this.position=o||"bottom"};AT.prototype={constructor:AT,index:0,onZero:!1,model:null,isHorizontal:function(){var t=this.position;return"top"===t||"bottom"===t},getGlobalExtent:function(t){var e=this.getExtent();return e[0]=this.toGlobalCoord(e[0]),e[1]=this.toGlobalCoord(e[1]),t&&e[0]>e[1]&&e.reverse(),e},getOtherAxis:function(){this.grid.getOtherAxis()},isLabelIgnored:function(t){if("category"===this.type){var e=this.getLabelInterval();return"function"==typeof e&&!e(t,this.scale.getLabel(t))||t%(e+1)}},pointToData:function(t,e){return this.coordToData(this.toLocalCoord(t["x"===this.dim?0:1]),e)},toLocalCoord:null,toGlobalCoord:null},h(AT,nT);var DT={show:!0,zlevel:0,z:0,inverse:!1,name:"",nameLocation:"end",nameRotate:null,nameTruncate:{maxWidth:null,ellipsis:"...",placeholder:"."},nameTextStyle:{},nameGap:15,silent:!1,triggerEvent:!1,tooltip:{show:!1},axisPointer:{},axisLine:{show:!0,onZero:!0,onZeroAxisIndex:null,lineStyle:{color:"#333",width:1,type:"solid"},symbol:["none","none"],symbolSize:[10,15]},axisTick:{show:!0,inside:!1,length:5,lineStyle:{width:1}},axisLabel:{show:!0,inside:!1,rotate:0,showMinLabel:null,showMaxLabel:null,margin:8,fontSize:12},splitLine:{show:!0,lineStyle:{color:["#ccc"],width:1,type:"solid"}},splitArea:{show:!1,areaStyle:{color:["rgba(250,250,250,0.3)","rgba(200,200,200,0.3)"]}}},CT={};CT.categoryAxis=n({boundaryGap:!0,deduplication:null,splitLine:{show:!1},axisTick:{alignWithLabel:!1,interval:"auto"},axisLabel:{interval:"auto"}},DT),CT.valueAxis=n({boundaryGap:[0,0],splitNumber:5},DT),CT.timeAxis=r({scale:!0,min:"dataMin",max:"dataMax"},CT.valueAxis),CT.logAxis=r({scale:!0,logBase:10},CT.valueAxis);var LT=["value","category","time","log"],kT=function(t,e,i,a){d(LT,function(r){e.extend({type:t+"Axis."+r,mergeDefaultAndTheme:function(e,o){var a=this.layoutMode,s=a?ea(e):{};n(e,o.getTheme().get(r+"Axis")),n(e,this.getDefaultOption()),e.type=i(t,e),a&&ta(e,s,a)},optionUpdated:function(){"category"===this.option.type&&(this.__ordinalMeta=Hs.createByAxisModel(this))},getCategories:function(){if("category"===this.option.type)return this.__ordinalMeta.categories},getOrdinalMeta:function(){return this.__ordinalMeta},defaultOption:o([{},CT[r+"Axis"],a],!0)})}),IS.registerSubTypeDefaulter(t+"Axis",v(i,t))},PT=IS.extend({type:"cartesian2dAxis",axis:null,init:function(){PT.superApply(this,"init",arguments),this.resetRange()},mergeOption:function(){PT.superApply(this,"mergeOption",arguments),this.resetRange()},restoreData:function(){PT.superApply(this,"restoreData",arguments),this.resetRange()},getCoordSysModel:function(){return this.ecModel.queryComponents({mainType:"grid",index:this.option.gridIndex,id:this.option.gridId})[0]}});n(PT.prototype,ZI);var OT={offset:0};kT("x",PT,Ul,OT),kT("y",PT,Ul,OT),IS.extend({type:"grid",dependencies:["xAxis","yAxis"],layoutMode:"box",coordinateSystem:null,defaultOption:{show:!1,zlevel:0,z:0,left:"10%",top:60,right:"10%",bottom:60,containLabel:!1,backgroundColor:"rgba(0,0,0,0)",borderWidth:1,borderColor:"#ccc"}});var NT=d,ET=function(t){var e=t.scale.getExtent(),i=e[0],n=e[1];return!(i>0&&n>0||i<0&&n<0)},zT=rl,RT=ql.prototype;RT.type="grid",RT.axisPointerEnabled=!0,RT.getRect=function(){return this._rect},RT.update=function(t,e){var i=this._axesMap;this._updateScale(t,this.model),NT(i.x,function(t){zT(t.scale,t.model)}),NT(i.y,function(t){zT(t.scale,t.model)}),NT(i.x,function(t){$l(i,"y",t)}),NT(i.y,function(t){$l(i,"x",t)}),this.resize(this.model,e)},RT.resize=function(t,e,i){function n(){NT(a,function(t){var e=t.isHorizontal(),i=e?[0,o.width]:[0,o.height],n=t.inverse?1:0;t.setExtent(i[n],i[1-n]),Jl(t,e?o.x:o.y)})}var o=Ko(t.getBoxLayoutParams(),{width:e.getWidth(),height:e.getHeight()});this._rect=o;var a=this._axesList;n(),!i&&t.get("containLabel")&&(NT(a,function(t){if(!t.model.get("axisLabel.inside")){var e=Yl(t);if(e){var i=t.isHorizontal()?"height":"width",n=t.model.get("axisLabel.margin");o[i]-=e[i]+n,"top"===t.position?o.y+=e.height+n:"left"===t.position&&(o.x+=e.width+n)}}}),n())},RT.getAxis=function(t,e){var i=this._axesMap[t];if(null!=i){if(null==e)for(var n in i)if(i.hasOwnProperty(n))return i[n];return i[e]}},RT.getAxes=function(){return this._axesList.slice()},RT.getCartesian=function(t,e){if(null!=t&&null!=e){var i="x"+t+"y"+e;return this._coordsMap[i]}w(t)&&(e=t.yAxisIndex,t=t.xAxisIndex);for(var n=0,o=this._coordsList;n<o.length;n++)if(o[n].getAxis("x").index===t||o[n].getAxis("y").index===e)return o[n]},RT.getCartesians=function(){return this._coordsList.slice()},RT.convertToPixel=function(t,e,i){var n=this._findConvertTarget(t,e);return n.cartesian?n.cartesian.dataToPoint(i):n.axis?n.axis.toGlobalCoord(n.axis.dataToCoord(i)):null},RT.convertFromPixel=function(t,e,i){var n=this._findConvertTarget(t,e);return n.cartesian?n.cartesian.pointToData(i):n.axis?n.axis.coordToData(n.axis.toLocalCoord(i)):null},RT._findConvertTarget=function(t,e){var i,n,o=e.seriesModel,a=e.xAxisModel||o&&o.getReferringComponents("xAxis")[0],r=e.yAxisModel||o&&o.getReferringComponents("yAxis")[0],s=e.gridModel,h=this._coordsList;return o?l(h,i=o.coordinateSystem)<0&&(i=null):a&&r?i=this.getCartesian(a.componentIndex,r.componentIndex):a?n=this.getAxis("x",a.componentIndex):r?n=this.getAxis("y",r.componentIndex):s&&s.coordinateSystem===this&&(i=this._coordsList[0]),{cartesian:i,axis:n}},RT.containPoint=function(t){var e=this._coordsList[0];if(e)return e.containPoint(t)},RT._initCartesian=function(t,e,i){function n(i){return function(n,s){if(jl(n,t,e)){var l=n.get("position");"x"===i?"top"!==l&&"bottom"!==l&&o[l="bottom"]&&(l="top"===l?"bottom":"top"):"left"!==l&&"right"!==l&&o[l="left"]&&(l="left"===l?"right":"left"),o[l]=!0;var h=new AT(i,sl(n),[0,0],n.get("type"),l),u="category"===h.type;h.onBand=u&&n.get("boundaryGap"),h.inverse=n.get("inverse"),h.onZero=n.get("axisLine.onZero"),h.onZeroAxisIndex=n.get("axisLine.onZeroAxisIndex"),n.axis=h,h.model=n,h.grid=this,h.index=s,this._axesList.push(h),a[i][s]=h,r[i]++}}}var o={left:!1,right:!1,top:!1,bottom:!1},a={x:{},y:{}},r={x:0,y:0};if(e.eachComponent("xAxis",n("x"),this),e.eachComponent("yAxis",n("y"),this),!r.x||!r.y)return this._axesMap={},void(this._axesList=[]);this._axesMap=a,NT(a.x,function(e,i){NT(a.y,function(n,o){var a="x"+i+"y"+o,r=new Zl(a);r.grid=this,r.model=t,this._coordsMap[a]=r,this._coordsList.push(r),r.addAxis(e),r.addAxis(n)},this)},this)},RT._updateScale=function(t,e){function i(t,e,i){NT(t.mapDimension(e.dim,!0),function(i){e.scale.unionExtentFromData(t,i)})}d(this._axesList,function(t){t.scale.setExtent(1/0,-1/0)}),t.eachSeries(function(n){if(th(n)){var o=Ql(n),a=o[0],r=o[1];if(!jl(a,e,t)||!jl(r,e,t))return;var s=this.getCartesian(a.componentIndex,r.componentIndex),l=n.getData(),h=s.getAxis("x"),u=s.getAxis("y");"list"===l.type&&(i(l,h),i(l,u))}},this)},RT.getTooltipAxes=function(t){var e=[],i=[];return NT(this.getCartesians(),function(n){var o=null!=t&&"auto"!==t?n.getAxis(t):n.getBaseAxis(),a=n.getOtherAxis(o);l(e,o)<0&&e.push(o),l(i,a)<0&&i.push(a)}),{baseAxes:e,otherAxes:i}};var BT=["xAxis","yAxis"];ql.create=function(t,e){var i=[];return t.eachComponent("grid",function(n,o){var a=new ql(n,t,e);a.name="grid_"+o,a.resize(n,e,!0),n.coordinateSystem=a,i.push(a)}),t.eachSeries(function(t){if(th(t)){var e=Ql(t),i=e[0],n=e[1],o=i.getCoordSysModel().coordinateSystem;t.coordinateSystem=o.getCartesian(i.componentIndex,n.componentIndex)}}),i},ql.dimensions=ql.prototype.dimensions=Zl.prototype.dimensions,Aa.register("cartesian2d",ql);var VT=Math.PI,GT=function(t,e){this.opt=e,this.axisModel=t,r(e,{labelOffset:0,nameDirection:1,tickDirection:1,labelDirection:1,silent:!0}),this.group=new S_;var i=new S_({position:e.position.slice(),rotation:e.rotation});i.updateTransform(),this._transform=i.transform,this._dumbGroup=i};GT.prototype={constructor:GT,hasBuilder:function(t){return!!WT[t]},add:function(t){WT[t].call(this)},getGroup:function(){return this.group}};var WT={axisLine:function(){var t=this.opt,e=this.axisModel;if(e.get("axisLine.show")){var i=this.axisModel.axis.getExtent(),n=this._transform,o=[i[0],0],r=[i[1],0];n&&(Q(o,o,n),Q(r,r,n));var s=a({lineCap:"round"},e.getModel("axisLine.lineStyle").getLineStyle());this.group.add(new Gb(Vn({anid:"line",shape:{x1:o[0],y1:o[1],x2:r[0],y2:r[1]},style:s,strokeContainThreshold:t.strokeContainThreshold||5,silent:!0,z2:1})));var l=e.get("axisLine.symbol"),h=e.get("axisLine.symbolSize");if(null!=l){"string"==typeof l&&(l=[l,l]),"string"!=typeof h&&"number"!=typeof h||(h=[h,h]);var u=h[0],c=h[1];d([[t.rotation+Math.PI/2,o],[t.rotation-Math.PI/2,r]],function(t,e){if("none"!==l[e]&&null!=l[e]){var i=dl(l[e],-u/2,-c/2,u,c,s.stroke,!0);i.attr({rotation:t[0],position:t[1],silent:!0}),this.group.add(i)}},this)}}},axisTickLabel:function(){var t=this.axisModel,e=this.opt,i=lh(this,t,e);oh(t,hh(this,t,e),i)},axisName:function(){var t=this.opt,e=this.axisModel,i=T(t.axisName,e.get("name"));if(i){var n,o=e.get("nameLocation"),r=t.nameDirection,s=e.getModel("nameTextStyle"),l=e.get("nameGap")||0,h=this.axisModel.axis.getExtent(),u=h[0]>h[1]?-1:1,c=["start"===o?h[0]-u*l:"end"===o?h[1]+u*l:(h[0]+h[1])/2,sh(o)?t.labelOffset+r*l:0],d=e.get("nameRotate");null!=d&&(d=d*VT/180);var f;sh(o)?n=FT(t.rotation,null!=d?d:t.rotation,r):(n=ih(t,o,d||0,h),null!=(f=t.axisNameAvailableWidth)&&(f=Math.abs(f/Math.sin(n.rotation)),!isFinite(f)&&(f=null)));var p=s.getFont(),g=e.get("nameTruncate",!0)||{},m=g.ellipsis,v=T(t.nameTruncateMaxWidth,g.maxWidth,f),y=null!=m&&null!=v?mS(i,v,p,m,{minChar:2,placeholder:g.placeholder}):i,x=e.get("tooltip",!0),_=e.mainType,w={componentType:_,name:i,$vars:["name"]};w[_+"Index"]=e.componentIndex;var b=new Cb({anid:"name",__fullText:i,__truncatedText:y,position:c,rotation:n.rotation,silent:nh(e),z2:1,tooltip:x&&x.show?a({content:i,formatter:function(){return i},formatterParams:w},x):null});io(b.style,s,{text:y,textFont:p,textFill:s.getTextColor()||e.get("axisLine.lineStyle.color"),textAlign:n.textAlign,textVerticalAlign:n.textVerticalAlign}),e.get("triggerEvent")&&(b.eventData=eh(e),b.eventData.targetType="axisName",b.eventData.name=i),this._dumbGroup.add(b),b.updateTransform(),this.group.add(b),b.decomposeTransform()}}},FT=GT.innerTextLayout=function(t,e,i){var n,o,a=Oo(e-t);return No(a)?(o=i>0?"top":"bottom",n="center"):No(a-VT)?(o=i>0?"bottom":"top",n="center"):(o="middle",n=a>0&&a<VT?i>0?"right":"left":i>0?"left":"right"),{rotation:a,textAlign:n,textVerticalAlign:o}},HT=GT.ifIgnoreOnTick=function(t,e,i,n,o,a){if(0===e&&o||e===n-1&&a)return!1;var r,s=t.scale;return"ordinal"===s.type&&("function"==typeof i?(r=s.getTicks()[e],!i(r,s.getLabel(r))):e%(i+1))},ZT=GT.getInterval=function(t,e){var i=t.get("interval");return null!=i&&"auto"!=i||(i=e),i},UT=d,jT=v,XT=ms({type:"axis",_axisPointer:null,axisPointerClass:null,render:function(t,e,i,n){this.axisPointerClass&&mh(t),XT.superApply(this,"render",arguments),wh(this,t,0,i,0,!0)},updateAxisPointer:function(t,e,i,n,o){wh(this,t,0,i,0,!1)},remove:function(t,e){var i=this._axisPointer;i&&i.remove(e),XT.superApply(this,"remove",arguments)},dispose:function(t,e){bh(this,e),XT.superApply(this,"dispose",arguments)}}),YT=[];XT.registerAxisPointerClass=function(t,e){YT[t]=e},XT.getAxisPointerClass=function(t){return t&&YT[t]};var qT=GT.ifIgnoreOnTick,$T=GT.getInterval,KT=["axisLine","axisTickLabel","axisName"],JT=["splitArea","splitLine"],QT=XT.extend({type:"cartesianAxis",axisPointerClass:"CartesianAxisPointer",render:function(t,e,i,n){this.group.removeAll();var o=this._axisGroup;if(this._axisGroup=new S_,this.group.add(this._axisGroup),t.get("show")){var a=t.getCoordSysModel(),r=Sh(a,t),s=new GT(t,r);d(KT,s.add,s),this._axisGroup.add(s.getGroup()),d(JT,function(e){t.get(e+".show")&&this["_"+e](t,a,r.labelInterval)},this),vo(o,this._axisGroup,t),QT.superCall(this,"render",t,e,i,n)}},_splitLine:function(t,e,i){var n=t.axis;if(!n.scale.isBlank()){var o=t.getModel("splitLine"),a=o.getModel("lineStyle"),s=a.get("color"),l=$T(o,i);s=y(s)?s:[s];for(var h=e.coordinateSystem.getRect(),u=n.isHorizontal(),c=0,d=n.getTicksCoords(),f=n.scale.getTicks(),p=t.get("axisLabel.showMinLabel"),g=t.get("axisLabel.showMaxLabel"),m=[],v=[],x=a.getLineStyle(),_=0;_<d.length;_++)if(!qT(n,_,l,d.length,p,g)){var w=n.toGlobalCoord(d[_]);u?(m[0]=w,m[1]=h.y,v[0]=w,v[1]=h.y+h.height):(m[0]=h.x,m[1]=w,v[0]=h.x+h.width,v[1]=w);var b=c++%s.length;this._axisGroup.add(new Gb(Vn({anid:"line_"+f[_],shape:{x1:m[0],y1:m[1],x2:v[0],y2:v[1]},style:r({stroke:s[b]},x),silent:!0})))}}},_splitArea:function(t,e,i){var n=t.axis;if(!n.scale.isBlank()){var o=t.getModel("splitArea"),a=o.getModel("areaStyle"),s=a.get("color"),l=e.coordinateSystem.getRect(),h=n.getTicksCoords(),u=n.scale.getTicks(),c=n.toGlobalCoord(h[0]),d=n.toGlobalCoord(h[0]),f=0,p=$T(o,i),g=a.getAreaStyle();s=y(s)?s:[s];for(var m=t.get("axisLabel.showMinLabel"),v=t.get("axisLabel.showMaxLabel"),x=1;x<h.length;x++)if(!qT(n,x,p,h.length,m,v)){var _,w,b,S,M=n.toGlobalCoord(h[x]);n.isHorizontal()?(_=c,w=l.y,b=M-_,S=l.height):(_=l.x,w=d,b=l.width,S=M-w);var I=f++%s.length;this._axisGroup.add(new Vb({anid:"area_"+u[x],shape:{x:_,y:w,width:b,height:S},style:r({fill:s[I]},g),silent:!0})),c=_+b,d=w+S}}}});QT.extend({type:"xAxis"}),QT.extend({type:"yAxis"}),ms({type:"grid",render:function(t,e){this.group.removeAll(),t.get("show")&&this.group.add(new Vb({shape:t.coordinateSystem.getRect(),style:r({fill:t.get("backgroundColor")},t.getItemStyle()),silent:!0,z2:-1}))}}),ss(function(t){t.xAxis&&t.yAxis&&!t.grid&&(t.grid={})}),ds(bT("line","circle","line")),cs(ST("line")),ls(FM.PROCESSOR.STATISTIC,function(t){return{seriesType:t,reset:function(t,e,i){var n=t.getData(),o=t.get("sampling"),a=t.coordinateSystem;if("cartesian2d"===a.type&&o){var r=a.getBaseAxis(),s=a.getOtherAxis(r),l=r.getExtent(),h=l[1]-l[0],u=Math.round(n.count()/h);if(u>1){var c;"string"==typeof o?c=MT[o]:"function"==typeof o&&(c=o),c&&t.setData(n.downSample(s.dim,1/u,c,IT))}}}}}("line"));var tA=uM.extend({type:"series.__base_bar__",getInitialData:function(t,e){return Bs(this.getSource(),this)},getMarkerPosition:function(t){var e=this.coordinateSystem;if(e){var i=e.dataToPoint(e.clampData(t)),n=this.getData(),o=n.getLayout("offset"),a=n.getLayout("size");return i[e.getBaseAxis().isHorizontal()?0:1]+=o+a/2,i}return[NaN,NaN]},defaultOption:{zlevel:0,z:2,coordinateSystem:"cartesian2d",legendHoverLink:!0,barMinHeight:0,barMinAngle:0,itemStyle:{},emphasis:{}}});tA.extend({type:"series.bar",dependencies:["grid","polar"],brushSelector:"rect"});var eA=Sw([["fill","color"],["stroke","borderColor"],["lineWidth","borderWidth"],["stroke","barBorderColor"],["lineWidth","barBorderWidth"],["opacity"],["shadowBlur"],["shadowOffsetX"],["shadowOffsetY"],["shadowColor"]]),iA={getBarItemStyle:function(t){var e=eA(this,t);if(this.getBorderLineDash){var i=this.getBorderLineDash();i&&(e.lineDash=i)}return e}},nA=["itemStyle","barBorderWidth"];a(_o.prototype,iA),ys({type:"bar",render:function(t,e,i){var n=t.get("coordinateSystem");return"cartesian2d"!==n&&"polar"!==n||this._render(t,e,i),this.group},dispose:B,_render:function(t,e,i){var n,o=this.group,a=t.getData(),r=this._data,s=t.coordinateSystem,l=s.getBaseAxis();"cartesian2d"===s.type?n=l.isHorizontal():"polar"===s.type&&(n="angle"===l.dim);var h=t.isAnimationEnabled()?t:null;a.diff(r).add(function(e){if(a.hasValue(e)){var i=a.getItemModel(e),r=aA[s.type](a,e,i),l=oA[s.type](a,e,i,r,n,h);a.setItemGraphicEl(e,l),o.add(l),Dh(l,a,e,i,r,t,n,"polar"===s.type)}}).update(function(e,i){var l=r.getItemGraphicEl(i);if(a.hasValue(e)){var u=a.getItemModel(e),c=aA[s.type](a,e,u);l?co(l,{shape:c},h,e):l=oA[s.type](a,e,u,c,n,h,!0),a.setItemGraphicEl(e,l),o.add(l),Dh(l,a,e,u,c,t,n,"polar"===s.type)}else o.remove(l)}).remove(function(t){var e=r.getItemGraphicEl(t);"cartesian2d"===s.type?e&&Th(t,h,e):e&&Ah(t,h,e)}).execute(),this._data=a},remove:function(t,e){var i=this.group,n=this._data;t.get("animation")?n&&n.eachItemGraphicEl(function(e){"sector"===e.type?Ah(e.dataIndex,t,e):Th(e.dataIndex,t,e)}):i.removeAll()}});var oA={cartesian2d:function(t,e,i,n,o,r,s){var l=new Vb({shape:a({},n)});if(r){var h=l.shape,u=o?"height":"width",c={};h[u]=0,c[u]=n[u],tS[s?"updateProps":"initProps"](l,{shape:c},r,e)}return l},polar:function(t,e,i,n,o,r,s){var l=new Ob({shape:a({},n)});if(r){var h=l.shape,u=o?"r":"endAngle",c={};h[u]=o?0:n.startAngle,c[u]=n[u],tS[s?"updateProps":"initProps"](l,{shape:c},r,e)}return l}},aA={cartesian2d:function(t,e,i){var n=t.getItemLayout(e),o=Ch(i,n),a=n.width>0?1:-1,r=n.height>0?1:-1;return{x:n.x+a*o/2,y:n.y+r*o/2,width:n.width-a*o,height:n.height-r*o}},polar:function(t,e,i){var n=t.getItemLayout(e);return{cx:n.cx,cy:n.cy,r0:n.r0,r:n.r,startAngle:n.startAngle,endAngle:n.endAngle}}};cs(v(il,"bar")),ds(function(t){t.eachSeriesByType("bar",function(t){t.getData().setVisual("legendSymbol","roundRect")})});var rA=function(t,e,i){e=y(e)&&{coordDimensions:e}||a({},e);var n=t.getSource(),o=wI(n,e),r=new yI(o,t);return r.initData(n,i),r},sA={updateSelectedMap:function(t){if(y(t))this._targetList=t.slice();else for(var e=t,i=e.mapDimension("value"),t=this._targetList=[],n=0,o=e.count();n<o;n++)t.push({name:e.getName(n),value:e.get(i,n),selected:Qa(e,n,"selected")});this._selectTargetMap=p(t||[],function(t,e){return t.set(e.name,e),t},z())},select:function(t,e){var i=null!=e?this._targetList[e]:this._selectTargetMap.get(t);"single"===this.get("selectedMode")&&this._selectTargetMap.each(function(t){t.selected=!1}),i&&(i.selected=!0)},unSelect:function(t,e){var i=null!=e?this._targetList[e]:this._selectTargetMap.get(t);i&&(i.selected=!1)},toggleSelected:function(t,e){var i=null!=e?this._targetList[e]:this._selectTargetMap.get(t);if(null!=i)return this[i.selected?"unSelect":"select"](t,e),i.selected},isSelected:function(t,e){var i=null!=e?this._targetList[e]:this._selectTargetMap.get(t);return i&&i.selected}},lA=vs({type:"series.pie",init:function(t){lA.superApply(this,"init",arguments),this.legendDataProvider=function(){return this.getRawData()},this.updateSelectedMap(this.getRawData()),this._defaultLabelLine(t)},mergeOption:function(t){lA.superCall(this,"mergeOption",t),this.updateSelectedMap(this.getRawData())},getInitialData:function(t,e){return rA(this,["value"])},getDataParams:function(t){var e=this.getData(),i=lA.superCall(this,"getDataParams",t),n=[];return e.each(e.mapDimension("value"),function(t){n.push(t)}),i.percent=Po(n,t,e.hostModel.get("percentPrecision")),i.$vars.push("percent"),i},_defaultLabelLine:function(t){Mi(t,"labelLine",["show"]);var e=t.labelLine,i=t.emphasis.labelLine;e.show=e.show&&t.label.show,i.show=i.show&&t.emphasis.label.show},defaultOption:{zlevel:0,z:2,legendHoverLink:!0,hoverAnimation:!0,center:["50%","50%"],radius:[0,"75%"],clockwise:!0,startAngle:90,minAngle:0,selectedOffset:10,hoverOffset:10,avoidLabelOverlap:!0,percentPrecision:2,stillShowZeroSum:!0,label:{rotate:!1,show:!0,position:"outer"},labelLine:{show:!0,length:15,length2:15,smooth:!1,lineStyle:{width:1,type:"solid"}},itemStyle:{borderWidth:1},animationType:"expansion",animationEasing:"cubicOut"}});u(lA,sA);var hA=Ph.prototype;hA.updateData=function(t,e,i){function n(){s.stopAnimation(!0),s.animateTo({shape:{r:u.r+l.get("hoverOffset")}},300,"elasticOut")}function o(){s.stopAnimation(!0),s.animateTo({shape:{r:u.r}},300,"elasticOut")}var s=this.childAt(0),l=t.hostModel,h=t.getItemModel(e),u=t.getItemLayout(e),c=a({},u);c.label=null,i?(s.setShape(c),"scale"===l.getShallow("animationType")?(s.shape.r=u.r0,fo(s,{shape:{r:u.r}},l,e)):(s.shape.endAngle=u.startAngle,co(s,{shape:{endAngle:u.endAngle}},l,e))):co(s,{shape:c},l,e);var d=t.getItemVisual(e,"color");s.useStyle(r({lineJoin:"bevel",fill:d},h.getModel("itemStyle").getItemStyle())),s.hoverStyle=h.getModel("emphasis.itemStyle").getItemStyle();var f=h.getShallow("cursor");f&&s.attr("cursor",f),kh(this,t.getItemLayout(e),l.isSelected(null,e),l.get("selectedOffset"),l.get("animation")),s.off("mouseover").off("mouseout").off("emphasis").off("normal"),h.get("hoverAnimation")&&l.isAnimationEnabled()&&s.on("mouseover",n).on("mouseout",o).on("emphasis",n).on("normal",o),this._updateLabel(t,e),to(this)},hA._updateLabel=function(t,e){var i=this.childAt(1),n=this.childAt(2),o=t.hostModel,a=t.getItemModel(e),r=t.getItemLayout(e).label,s=t.getItemVisual(e,"color");co(i,{shape:{points:r.linePoints||[[r.x,r.y],[r.x,r.y],[r.x,r.y]]}},o,e),co(n,{style:{x:r.x,y:r.y}},o,e),n.attr({rotation:r.rotation,origin:[r.x,r.y],z2:10});var l=a.getModel("label"),h=a.getModel("emphasis.label"),u=a.getModel("labelLine"),c=a.getModel("emphasis.labelLine"),s=t.getItemVisual(e,"color");eo(n.style,n.hoverStyle={},l,h,{labelFetcher:t.hostModel,labelDataIndex:e,defaultText:t.getName(e),autoColor:s,useInsideStyle:!!r.inside},{textAlign:r.textAlign,textVerticalAlign:r.verticalAlign,opacity:t.getItemVisual(e,"opacity")}),n.ignore=n.normalIgnore=!l.get("show"),n.hoverIgnore=!h.get("show"),i.ignore=i.normalIgnore=!u.get("show"),i.hoverIgnore=!c.get("show"),i.setStyle({stroke:s,opacity:t.getItemVisual(e,"opacity")}),i.setStyle(u.getModel("lineStyle").getLineStyle()),i.hoverStyle=c.getModel("lineStyle").getLineStyle();var d=u.get("smooth");d&&!0===d&&(d=.4),i.setShape({smooth:d})},h(Ph,S_);cr.extend({type:"pie",init:function(){var t=new S_;this._sectorGroup=t},render:function(t,e,i,n){if(!n||n.from!==this.uid){var o=t.getData(),a=this._data,r=this.group,s=e.get("animation"),l=!a,h=t.get("animationType"),u=v(Lh,this.uid,t,s,i),c=t.get("selectedMode");if(o.diff(a).add(function(t){var e=new Ph(o,t);l&&"scale"!==h&&e.eachChild(function(t){t.stopAnimation(!0)}),c&&e.on("click",u),o.setItemGraphicEl(t,e),r.add(e)}).update(function(t,e){var i=a.getItemGraphicEl(e);i.updateData(o,t),i.off("click"),c&&i.on("click",u),r.add(i),o.setItemGraphicEl(t,i)}).remove(function(t){var e=a.getItemGraphicEl(t);r.remove(e)}).execute(),s&&l&&o.count()>0&&"scale"!==h){var d=o.getItemLayout(0),f=Math.max(i.getWidth(),i.getHeight())/2,p=m(r.removeClipPath,r);r.setClipPath(this._createClipPath(d.cx,d.cy,f,d.startAngle,d.clockwise,p,t))}this._data=o}},dispose:function(){},_createClipPath:function(t,e,i,n,o,a,r){var s=new Ob({shape:{cx:t,cy:e,r0:0,r:i,startAngle:n,endAngle:n,clockwise:o}});return fo(s,{shape:{endAngle:n+(o?1:-1)*Math.PI*2}},r,a),s},containPoint:function(t,e){var i=e.getData().getItemLayout(0);if(i){var n=t[0]-i.cx,o=t[1]-i.cy,a=Math.sqrt(n*n+o*o);return a<=i.r&&a>=i.r0}}});var uA=function(t,e){d(e,function(e){e.update="updateView",hs(e,function(i,n){var o={};return n.eachComponent({mainType:"series",subType:t,query:i},function(t){t[e.method]&&t[e.method](i.name,i.dataIndex);var n=t.getData();n.each(function(e){var i=n.getName(e);o[i]=t.isSelected(i)||!1})}),{name:i.name,selected:o}})})},cA=function(t){return{getTargetSeries:function(e){var i={},n=z();return e.eachSeriesByType(t,function(t){t.__paletteScope=i,n.set(t.uid,t)}),n},reset:function(t,e){var i=t.getRawData(),n={},o=t.getData();o.each(function(t){var e=o.getRawIndex(t);n[e]=t}),i.each(function(e){var a=n[e],r=null!=a&&o.getItemVisual(a,"color",!0);if(r)i.setItemVisual(e,"color",r);else{var s=i.getItemModel(e).get("itemStyle.color")||t.getColorFromPalette(i.getName(e),t.__paletteScope,i.count());i.setItemVisual(e,"color",s),null!=a&&o.setItemVisual(a,"color",s)}})}}},dA=function(t,e,i,n){var o,a,r=t.getData(),s=[],l=!1;r.each(function(i){var n,h,u,c,d=r.getItemLayout(i),f=r.getItemModel(i),p=f.getModel("label"),g=p.get("position")||f.get("emphasis.label.position"),m=f.getModel("labelLine"),v=m.get("length"),y=m.get("length2"),x=(d.startAngle+d.endAngle)/2,_=Math.cos(x),w=Math.sin(x);o=d.cx,a=d.cy;var b="inside"===g||"inner"===g;if("center"===g)n=d.cx,h=d.cy,c="center";else{var S=(b?(d.r+d.r0)/2*_:d.r*_)+o,M=(b?(d.r+d.r0)/2*w:d.r*w)+a;if(n=S+3*_,h=M+3*w,!b){var I=S+_*(v+e-d.r),T=M+w*(v+e-d.r),A=I+(_<0?-1:1)*y,D=T;n=A+(_<0?-5:5),h=D,u=[[S,M],[I,T],[A,D]]}c=b?"center":_>0?"left":"right"}var C=p.getFont(),L=p.get("rotate")?_<0?-x+Math.PI:-x:0,k=me(t.getFormattedLabel(i,"normal")||r.getName(i),C,c,"top");l=!!L,d.label={x:n,y:h,position:g,height:k.height,len:v,len2:y,linePoints:u,textAlign:c,verticalAlign:"middle",rotation:L,inside:b},b||s.push(d.label)}),!l&&t.get("avoidLabelOverlap")&&Nh(s,o,a,e,i,n)},fA=2*Math.PI,pA=Math.PI/180,gA=function(t){return{seriesType:t,reset:function(t,e){var i=e.findComponents({mainType:"legend"});if(i&&i.length){var n=t.getData();n.filterSelf(function(t){for(var e=n.getName(t),o=0;o<i.length;o++)if(!i[o].isSelected(e))return!1;return!0},this)}}}};uA("pie",[{type:"pieToggleSelect",event:"pieselectchanged",method:"toggleSelected"},{type:"pieSelect",event:"pieselected",method:"select"},{type:"pieUnSelect",event:"pieunselected",method:"unSelect"}]),ds(cA("pie")),cs(v(function(t,e,i,n){e.eachSeriesByType(t,function(t){var e=t.getData(),n=e.mapDimension("value"),o=t.get("center"),a=t.get("radius");y(a)||(a=[0,a]),y(o)||(o=[o,o]);var r=i.getWidth(),s=i.getHeight(),l=Math.min(r,s),h=To(o[0],r),u=To(o[1],s),c=To(a[0],l/2),d=To(a[1],l/2),f=-t.get("startAngle")*pA,p=t.get("minAngle")*pA,g=0;e.each(n,function(t){!isNaN(t)&&g++});var m=e.getSum(n),v=Math.PI/(m||g)*2,x=t.get("clockwise"),_=t.get("roseType"),w=t.get("stillShowZeroSum"),b=e.getDataExtent(n);b[0]=0;var S=fA,M=0,I=f,T=x?1:-1;if(e.each(n,function(t,i){var n;if(isNaN(t))e.setItemLayout(i,{angle:NaN,startAngle:NaN,endAngle:NaN,clockwise:x,cx:h,cy:u,r0:c,r:_?NaN:d});else{(n="area"!==_?0===m&&w?v:t*v:fA/g)<p?(n=p,S-=p):M+=t;var o=I+T*n;e.setItemLayout(i,{angle:n,startAngle:I,endAngle:o,clockwise:x,cx:h,cy:u,r0:c,r:_?Io(t,b,[c,d]):d}),I=o}},!0),S<fA&&g)if(S<=.001){var A=fA/g;e.each(n,function(t,i){if(!isNaN(t)){var n=e.getItemLayout(i);n.angle=A,n.startAngle=f+T*i*A,n.endAngle=f+T*(i+1)*A}})}else v=S/M,I=f,e.each(n,function(t,i){if(!isNaN(t)){var n=e.getItemLayout(i),o=n.angle===p?p:t*v;n.startAngle=I,n.endAngle=I+T*o,I+=T*o}});dA(t,d,r,s)})},"pie")),ls(gA("pie")),uM.extend({type:"series.scatter",dependencies:["grid","polar","geo","singleAxis","calendar"],getInitialData:function(t,e){return Bs(this.getSource(),this)},brushSelector:"point",getProgressive:function(){var t=this.option.progressive;return null==t?this.option.large?5e3:this.get("progressive"):t},getProgressiveThreshold:function(){var t=this.option.progressiveThreshold;return null==t?this.option.large?1e4:this.get("progressiveThreshold"):t},defaultOption:{coordinateSystem:"cartesian2d",zlevel:0,z:2,legendHoverLink:!0,hoverAnimation:!0,symbolSize:10,large:!1,largeThreshold:2e3,itemStyle:{opacity:.8},progressive:null}});var mA=Nn({shape:{points:null},symbolProxy:null,buildPath:function(t,e){var i=e.points,n=e.size,o=this.symbolProxy,a=o.shape;if(!((t.getContext?t.getContext():t)&&n[0]<4))for(var r=0;r<i.length;){var s=i[r++],l=i[r++];isNaN(s)||isNaN(l)||(a.x=s-n[0]/2,a.y=l-n[1]/2,a.width=n[0],a.height=n[1],o.buildPath(t,a,!0))}},afterBrush:function(t){var e=this.shape,i=e.points,n=e.size;if(n[0]<4){this.setTransform(t);for(var o=0;o<i.length;){var a=i[o++],r=i[o++];isNaN(a)||isNaN(r)||t.fillRect(a-n[0]/2,r-n[1]/2,n[0],n[1])}this.restoreTransform(t)}},findDataIndex:function(t,e){for(var i=this.shape,n=i.points,o=i.size,a=Math.max(o[0],4),r=Math.max(o[1],4),s=n.length/2-1;s>=0;s--){var l=2*s,h=n[l]-a/2,u=n[l+1]-r/2;if(t>=h&&e>=u&&t<=h+a&&e<=u+r)return s}return-1}}),vA=Eh.prototype;vA.isPersistent=function(){return!this._incremental},vA.updateData=function(t){this.group.removeAll();var e=new mA({rectHover:!0,cursor:"default"});e.setShape({points:t.getLayout("symbolPoints")}),this._setCommon(e,t),this.group.add(e),this._incremental=null},vA.updateLayout=function(t){if(!this._incremental){var e=t.getLayout("symbolPoints");this.group.eachChild(function(t){if(null!=t.startIndex){var i=2*(t.endIndex-t.startIndex),n=4*t.startIndex*2;e=new Float32Array(e.buffer,n,i)}t.setShape("points",e)})}},vA.incrementalPrepareUpdate=function(t){this.group.removeAll(),this._clearIncremental(),t.count()>2e6?(this._incremental||(this._incremental=new On({silent:!0})),this.group.add(this._incremental)):this._incremental=null},vA.incrementalUpdate=function(t,e){var i;this._incremental?(i=new mA,this._incremental.addDisplayable(i,!0)):((i=new mA({rectHover:!0,cursor:"default",startIndex:t.start,endIndex:t.end})).incremental=!0,this.group.add(i)),i.setShape({points:e.getLayout("symbolPoints")}),this._setCommon(i,e,!!this._incremental)},vA._setCommon=function(t,e,i){var n=e.hostModel,o=e.getVisual("symbolSize");t.setShape("size",o instanceof Array?o:[o,o]),t.symbolProxy=dl(e.getVisual("symbol"),0,0,0,0),t.setColor=t.symbolProxy.setColor;var a=t.shape.size[0]<4;t.useStyle(n.getModel("itemStyle").getItemStyle(a?["color","shadowBlur","shadowColor"]:["color"]));var r=e.getVisual("color");r&&t.setColor(r),i||(t.seriesIndex=n.seriesIndex,t.on("mousemove",function(e){t.dataIndex=null;var i=t.findDataIndex(e.offsetX,e.offsetY);i>=0&&(t.dataIndex=i+(t.startIndex||0))}))},vA.remove=function(){this._clearIncremental(),this._incremental=null,this.group.removeAll()},vA._clearIncremental=function(){var t=this._incremental;t&&t.clearDisplaybles()},ys({type:"scatter",render:function(t,e,i){var n=t.getData();this._updateSymbolDraw(n,t).updateData(n),this._finished=!0},incrementalPrepareRender:function(t,e,i){var n=t.getData();this._updateSymbolDraw(n,t).incrementalPrepareUpdate(n),this._finished=!1},incrementalRender:function(t,e,i){this._symbolDraw.incrementalUpdate(t,e.getData()),this._finished=t.end===e.getData().count()},updateTransform:function(t,e,i){var n=t.getData();if(this.group.dirty(),!this._finished||n.count()>1e4||!this._symbolDraw.isPersistent())return{update:!0};var o=ST().reset(t);o.progress&&o.progress({start:0,end:n.count()},n),this._symbolDraw.updateLayout(n)},_updateSymbolDraw:function(t,e){var i=this._symbolDraw,n=e.pipelineContext.large;return i&&n===this._isLargeDraw||(i&&i.remove(),i=this._symbolDraw=n?new Eh:new Ml,this._isLargeDraw=n,this.group.removeAll()),this.group.add(i.group),i},remove:function(t,e){this._symbolDraw&&this._symbolDraw.remove(!0),this._symbolDraw=null},dispose:function(){}}),ds(bT("scatter","circle")),cs(ST("scatter")),h(zh,nT),Rh.prototype.getIndicatorAxes=function(){return this._indicatorAxes},Rh.prototype.dataToPoint=function(t,e){var i=this._indicatorAxes[e];return this.coordToPoint(i.dataToCoord(t),e)},Rh.prototype.coordToPoint=function(t,e){var i=this._indicatorAxes[e].angle;return[this.cx+t*Math.cos(i),this.cy-t*Math.sin(i)]},Rh.prototype.pointToData=function(t){var e=t[0]-this.cx,i=t[1]-this.cy,n=Math.sqrt(e*e+i*i);e/=n,i/=n;for(var o,a=Math.atan2(-i,e),r=1/0,s=-1,l=0;l<this._indicatorAxes.length;l++){var h=this._indicatorAxes[l],u=Math.abs(a-h.angle);u<r&&(o=h,s=l,r=u)}return[s,+(o&&o.coodToData(n))]},Rh.prototype.resize=function(t,e){var i=t.get("center"),n=e.getWidth(),o=e.getHeight(),a=Math.min(n,o)/2;this.cx=To(i[0],n),this.cy=To(i[1],o),this.startAngle=t.get("startAngle")*Math.PI/180,this.r=To(t.get("radius"),a),d(this._indicatorAxes,function(t,e){t.setExtent(0,this.r);var i=this.startAngle+e*Math.PI*2/this._indicatorAxes.length;i=Math.atan2(Math.sin(i),Math.cos(i)),t.angle=i},this)},Rh.prototype.update=function(t,e){function i(t){var e=Math.pow(10,Math.floor(Math.log(t)/Math.LN10)),i=t/e;return 2===i?i=5:i*=2,i*e}var n=this._indicatorAxes,o=this._model;d(n,function(t){t.scale.setExtent(1/0,-1/0)}),t.eachSeriesByType("radar",function(e,i){if("radar"===e.get("coordinateSystem")&&t.getComponent("radar",e.get("radarIndex"))===o){var a=e.getData();d(n,function(t){t.scale.unionExtentFromData(a,a.mapDimension(t.dim))})}},this);var a=o.get("splitNumber");d(n,function(t,e){var n=ol(t.scale,t.model);rl(t.scale,t.model);var o=t.model,r=t.scale,s=o.getMin(),l=o.getMax(),h=r.getInterval();if(null!=s&&null!=l)r.setExtent(+s,+l),r.setInterval((l-s)/a);else if(null!=s){var u;do{u=s+h*a,r.setExtent(+s,u),r.setInterval(h),h=i(h)}while(u<n[1]&&isFinite(u)&&isFinite(n[1]))}else if(null!=l){var c;do{c=l-h*a,r.setExtent(c,+l),r.setInterval(h),h=i(h)}while(c>n[0]&&isFinite(c)&&isFinite(n[0]))}else{r.getTicks().length-1>a&&(h=i(h));var d=Math.round((n[0]+n[1])/2/h)*h,f=Math.round(a/2);r.setExtent(Ao(d-f*h),Ao(d+(a-f)*h)),r.setInterval(h)}})},Rh.dimensions=[],Rh.create=function(t,e){var i=[];return t.eachComponent("radar",function(n){var o=new Rh(n,t,e);i.push(o),n.coordinateSystem=o}),t.eachSeriesByType("radar",function(t){"radar"===t.get("coordinateSystem")&&(t.coordinateSystem=i[t.get("radarIndex")||0])}),i},Aa.register("radar",Rh);var yA=CT.valueAxis,xA=(gs({type:"radar",optionUpdated:function(){var t=this.get("boundaryGap"),e=this.get("splitNumber"),o=this.get("scale"),s=this.get("axisLine"),l=this.get("axisTick"),h=this.get("axisLabel"),u=this.get("name"),c=this.get("name.show"),d=this.get("name.formatter"),p=this.get("nameGap"),g=this.get("triggerEvent"),m=f(this.get("indicator")||[],function(f){null!=f.max&&f.max>0&&!f.min?f.min=0:null!=f.min&&f.min<0&&!f.max&&(f.max=0);var m=u;if(null!=f.color&&(m=r({color:f.color},u)),f=n(i(f),{boundaryGap:t,splitNumber:e,scale:o,axisLine:s,axisTick:l,axisLabel:h,name:f.text,nameLocation:"end",nameGap:p,nameTextStyle:m,triggerEvent:g},!1),c||(f.name=""),"string"==typeof d){var v=f.name;f.name=d.replace("{value}",null!=v?v:"")}else"function"==typeof d&&(f.name=d(f.name,f));var y=a(new _o(f,null,this.ecModel),ZI);return y.mainType="radar",y.componentIndex=this.componentIndex,y},this);this.getIndicatorModels=function(){return m}},defaultOption:{zlevel:0,z:0,center:["50%","50%"],radius:"75%",startAngle:90,name:{show:!0},boundaryGap:[0,0],splitNumber:5,nameGap:15,scale:!1,shape:"polygon",axisLine:n({lineStyle:{color:"#bbb"}},yA.axisLine),axisLabel:Bh(yA.axisLabel,!1),axisTick:Bh(yA.axisTick,!1),splitLine:Bh(yA.splitLine,!0),splitArea:Bh(yA.splitArea,!0),indicator:[]}}),["axisLine","axisTickLabel","axisName"]);ms({type:"radar",render:function(t,e,i){this.group.removeAll(),this._buildAxes(t),this._buildSplitLineAndArea(t)},_buildAxes:function(t){var e=t.coordinateSystem;d(f(e.getIndicatorAxes(),function(t){return new GT(t.model,{position:[e.cx,e.cy],rotation:t.angle,labelDirection:-1,tickDirection:-1,nameDirection:1})}),function(t){d(xA,t.add,t),this.group.add(t.getGroup())},this)},_buildSplitLineAndArea:function(t){function e(t,e,i){var n=i%e.length;return t[n]=t[n]||[],n}var i=t.coordinateSystem,n=i.getIndicatorAxes();if(n.length){var o=t.get("shape"),a=t.getModel("splitLine"),s=t.getModel("splitArea"),l=a.getModel("lineStyle"),h=s.getModel("areaStyle"),u=a.get("show"),c=s.get("show"),p=l.get("color"),g=h.get("color");p=y(p)?p:[p],g=y(g)?g:[g];var m=[],v=[];if("circle"===o)for(var x=n[0].getTicksCoords(),_=i.cx,w=i.cy,b=0;b<x.length;b++)u&&m[D=e(m,p,b)].push(new Lb({shape:{cx:_,cy:w,r:x[b]}})),c&&b<x.length-1&&v[D=e(v,g,b)].push(new Nb({shape:{cx:_,cy:w,r0:x[b],r:x[b+1]}}));else for(var S,M=f(n,function(t,e){var n=t.getTicksCoords();return S=null==S?n.length-1:Math.min(n.length-1,S),f(n,function(t){return i.coordToPoint(t,e)})}),I=[],b=0;b<=S;b++){for(var T=[],A=0;A<n.length;A++)T.push(M[A][b]);if(T[0]&&T.push(T[0].slice()),u&&m[D=e(m,p,b)].push(new Bb({shape:{points:T}})),c&&I){var D=e(v,g,b-1);v[D].push(new Rb({shape:{points:T.concat(I)}}))}I=T.slice().reverse()}var C=l.getLineStyle(),L=h.getAreaStyle();d(v,function(t,e){this.group.add(Qb(t,{style:r({stroke:"none",fill:g[e%g.length]},L),silent:!0}))},this),d(m,function(t,e){this.group.add(Qb(t,{style:r({fill:"none",stroke:p[e%p.length]},C),silent:!0}))},this)}}});var _A=uM.extend({type:"series.radar",dependencies:["radar"],init:function(t){_A.superApply(this,"init",arguments),this.legendDataProvider=function(){return this.getRawData()}},getInitialData:function(t,e){return rA(this,{extraPrefix:"indicator_",extraFromZero:!0})},formatTooltip:function(t){var e=this.getData(),i=this.coordinateSystem.getIndicatorAxes(),n=this.getData().getName(t);return Ho(""===n?this.name:n)+"<br/>"+f(i,function(i,n){var o=e.get(e.mapDimension(i.dim),t);return Ho(i.name+" : "+o)}).join("<br />")},defaultOption:{zlevel:0,z:2,coordinateSystem:"radar",legendHoverLink:!0,radarIndex:0,lineStyle:{width:2,type:"solid"},label:{position:"top"},symbol:"emptyCircle",symbolSize:4}});ys({type:"radar",render:function(t,e,n){function o(t,e){var i=t.getItemVisual(e,"symbol")||"circle",n=t.getItemVisual(e,"color");if("none"!==i){var o=Vh(t.getItemVisual(e,"symbolSize")),a=dl(i,-1,-1,2,2,n);return a.attr({style:{strokeNoScale:!0},z2:100,scale:[o[0]/2,o[1]/2]}),a}}function a(e,i,n,a,r,s){n.removeAll();for(var l=0;l<i.length-1;l++){var h=o(a,r);h&&(h.__dimIdx=l,e[l]?(h.attr("position",e[l]),tS[s?"initProps":"updateProps"](h,{position:i[l]},t,r)):h.attr("position",i[l]),n.add(h))}}function s(t){return f(t,function(t){return[l.cx,l.cy]})}var l=t.coordinateSystem,h=this.group,u=t.getData(),c=this._data;u.diff(c).add(function(e){var i=u.getItemLayout(e);if(i){var n=new Rb,o=new Bb,r={shape:{points:i}};n.shape.points=s(i),o.shape.points=s(i),fo(n,r,t,e),fo(o,r,t,e);var l=new S_,h=new S_;l.add(o),l.add(n),l.add(h),a(o.shape.points,i,h,u,e,!0),u.setItemGraphicEl(e,l)}}).update(function(e,i){var n=c.getItemGraphicEl(i),o=n.childAt(0),r=n.childAt(1),s=n.childAt(2),l={shape:{points:u.getItemLayout(e)}};l.shape.points&&(a(o.shape.points,l.shape.points,s,u,e,!1),co(o,l,t),co(r,l,t),u.setItemGraphicEl(e,n))}).remove(function(t){h.remove(c.getItemGraphicEl(t))}).execute(),u.eachItemGraphicEl(function(t,e){function n(){l.attr("ignore",m)}function o(){l.attr("ignore",g)}var a=u.getItemModel(e),s=t.childAt(0),l=t.childAt(1),c=t.childAt(2),d=u.getItemVisual(e,"color");h.add(t),s.useStyle(r(a.getModel("lineStyle").getLineStyle(),{fill:"none",stroke:d})),s.hoverStyle=a.getModel("emphasis.lineStyle").getLineStyle();var f=a.getModel("areaStyle"),p=a.getModel("emphasis.areaStyle"),g=f.isEmpty()&&f.parentModel.isEmpty(),m=p.isEmpty()&&p.parentModel.isEmpty();m=m&&g,l.ignore=g,l.useStyle(r(f.getAreaStyle(),{fill:d,opacity:.7})),l.hoverStyle=p.getAreaStyle();var v=a.getModel("itemStyle").getItemStyle(["color"]),y=a.getModel("emphasis.itemStyle").getItemStyle(),x=a.getModel("label"),_=a.getModel("emphasis.label");c.eachChild(function(t){t.setStyle(v),t.hoverStyle=i(y),eo(t.style,t.hoverStyle,x,_,{labelFetcher:u.hostModel,labelDataIndex:e,labelDimIndex:t.__dimIdx,defaultText:u.get(u.dimensions[t.__dimIdx],e),autoColor:d,isRectText:!0})}),t.off("mouseover").off("mouseout").off("normal").off("emphasis"),t.on("emphasis",n).on("mouseover",n).on("normal",o).on("mouseout",o),to(t)}),this._data=u},remove:function(){this.group.removeAll(),this._data=null},dispose:function(){}});ds(cA("radar")),ds(bT("radar","circle")),cs(function(t){t.eachSeriesByType("radar",function(t){var e=t.getData(),i=[],n=t.coordinateSystem;if(n){for(var o=n.getIndicatorAxes(),a=0;a<n.getIndicatorAxes().length;a++)e.each(e.mapDimension(o[a].dim),function(t,e){i[e]=i[e]||[],i[e][a]=n.dataToPoint(t,a)});e.each(function(t){i[t][0]&&i[t].push(i[t][0].slice()),e.setItemLayout(t,i[t])})}})}),ls(gA("radar")),ss(function(t){var e=t.polar;if(e){y(e)||(e=[e]);var i=[];d(e,function(e,n){e.indicator?(e.type&&!e.shape&&(e.shape=e.type),t.radar=t.radar||[],y(t.radar)||(t.radar=[t.radar]),t.radar.push(e)):i.push(e)}),t.polar=i}d(t.series,function(t){t&&"radar"===t.type&&t.polarIndex&&(t.radarIndex=t.polarIndex)})});var wA=uM.extend({type:"series.map",dependencies:["geo"],layoutMode:"box",needsDrawMap:!1,seriesGroup:[],init:function(t){this._fillOption(t,this.getMapType()),wA.superApply(this,"init",arguments),this.updateSelectedMap(this.getRawData())},getInitialData:function(t){return rA(this,["value"])},mergeOption:function(t){this._fillOption(t,this.getMapType()),wA.superApply(this,"mergeOption",arguments),this.updateSelectedMap(this.getRawData())},getHostGeoModel:function(){var t=this.option.geoIndex;return null!=t?this.dependentModels.geo[t]:null},getMapType:function(){return(this.getHostGeoModel()||this).option.map},_fillOption:function(t,e){},getRawValue:function(t){var e=this.getData();return e.get(e.mapDimension("value"),t)},getRegionModel:function(t){var e=this.getData();return e.getItemModel(e.indexOfName(t))},formatTooltip:function(t){for(var e=this.getData(),i=Wo(this.getRawValue(t)),n=e.getName(t),o=this.seriesGroup,a=[],r=0;r<o.length;r++){var s=o[r].originalData.indexOfName(n),l=e.mapDimension("value");isNaN(o[r].originalData.get(l,s))||a.push(Ho(o[r].name))}return a.join(", ")+"<br />"+Ho(n+" : "+i)},getTooltipPosition:function(t){if(null!=t){var e=this.getData().getName(t),i=this.coordinateSystem,n=i.getRegion(e);return n&&i.dataToPoint(n.center)}},setZoom:function(t){this.option.zoom=t},setCenter:function(t){this.option.center=t},defaultOption:{zlevel:0,z:2,coordinateSystem:"geo",map:"",left:"center",top:"center",aspectScale:.75,showLegendSymbol:!0,dataRangeHoverLink:!0,boundingCoords:null,center:null,zoom:1,scaleLimit:null,label:{show:!1,color:"#000"},itemStyle:{borderWidth:.5,borderColor:"#444",areaColor:"#eee"},emphasis:{label:{show:!0,color:"rgb(100,0,0)"},itemStyle:{areaColor:"rgba(255,215,0,0.8)"}}}});u(wA,sA);var bA="\0_ec_interaction_mutex";hs({type:"takeGlobalCursor",event:"globalCursorTaken",update:"update"},function(){}),u(Zh,Hx);var SA={axisPointer:1,tooltip:1,brush:1};ou.prototype={constructor:ou,draw:function(t,e,i,n,o){var a="geo"===t.mainType,r=t.getData&&t.getData();a&&e.eachComponent({mainType:"series",subType:"map"},function(e){r||e.getHostGeoModel()!==t||(r=e.getData())});var s=t.coordinateSystem,l=this.group,h=s.scale,u={position:s.position,scale:h};!l.childAt(0)||o?l.attr(u):co(l,u,t),l.removeAll();var c=["itemStyle"],f=["emphasis","itemStyle"],p=["label"],g=["emphasis","label"],m=z();d(s.regions,function(e){var i=m.get(e.name)||m.set(e.name,new S_),n=new Zb({shape:{paths:[]}});i.add(n);var o,s=(C=t.getRegionModel(e.name)||t).getModel(c),u=C.getModel(f),v=eu(s),y=eu(u),x=C.getModel(p),_=C.getModel(g);if(r){o=r.indexOfName(e.name);var w=r.getItemVisual(o,"color",!0);w&&(v.fill=w)}d(e.geometries,function(t){if("polygon"===t.type){n.shape.paths.push(new Rb({shape:{points:t.exterior}}));for(var e=0;e<(t.interiors?t.interiors.length:0);e++)n.shape.paths.push(new Rb({shape:{points:t.interiors[e]}}))}}),n.setStyle(v),n.style.strokeNoScale=!0,n.culling=!0;var b=x.get("show"),S=_.get("show"),M=r&&isNaN(r.get(r.mapDimension("value"),o)),I=r&&r.getItemLayout(o);if(a||M&&(b||S)||I&&I.showLabel){var T,A=a?e.name:o;(!r||o>=0)&&(T=t);var D=new Cb({position:e.center.slice(),scale:[1/h[0],1/h[1]],z2:10,silent:!0});eo(D.style,D.hoverStyle={},x,_,{labelFetcher:T,labelDataIndex:A,defaultText:e.name,useInsideStyle:!1},{textAlign:"center",textVerticalAlign:"middle"}),i.add(D)}if(r)r.setItemGraphicEl(o,i);else{var C=t.getRegionModel(e.name);n.eventData={componentType:"geo",geoIndex:t.componentIndex,name:e.name,region:C&&C.option||{}}}(i.__regions||(i.__regions=[])).push(e),to(i,y,{hoverSilentOnTouch:!!t.get("selectedMode")}),l.add(i)}),this._updateController(t,e,i),iu(this,t,l,i,n),nu(t,l)},remove:function(){this.group.removeAll(),this._controller.dispose(),this._controllerHost={}},_updateController:function(t,e,i){function n(){var e={type:"geoRoam",componentType:l};return e[l+"Id"]=t.id,e}var o=t.coordinateSystem,r=this._controller,s=this._controllerHost;s.zoomLimit=t.get("scaleLimit"),s.zoom=o.getZoom(),r.enable(t.get("roam")||!1);var l=t.mainType;r.off("pan").on("pan",function(t,e){this._mouseDownFlag=!1,Jh(s,t,e),i.dispatchAction(a(n(),{dx:t,dy:e}))},this),r.off("zoom").on("zoom",function(t,e,o){if(this._mouseDownFlag=!1,Qh(s,t,e,o),i.dispatchAction(a(n(),{zoom:t,originX:e,originY:o})),this._updateGroup){var r=this.group,l=r.scale;r.traverse(function(t){"text"===t.type&&t.attr("scale",[1/l[0],1/l[1]])})}},this),r.setPointerChecker(function(e,n,a){return o.getViewRectAfterRoam().contain(n,a)&&!tu(e,i,t)})}},ys({type:"map",render:function(t,e,i,n){if(!n||"mapToggleSelect"!==n.type||n.from!==this.uid){var o=this.group;if(o.removeAll(),!t.getHostGeoModel()){if(n&&"geoRoam"===n.type&&"series"===n.componentType&&n.seriesId===t.id)(a=this._mapDraw)&&o.add(a.group);else if(t.needsDrawMap){var a=this._mapDraw||new ou(i,!0);o.add(a.group),a.draw(t,e,i,this,n),this._mapDraw=a}else this._mapDraw&&this._mapDraw.remove(),this._mapDraw=null;t.get("showLegendSymbol")&&e.getComponent("legend")&&this._renderSymbols(t,e,i)}}},remove:function(){this._mapDraw&&this._mapDraw.remove(),this._mapDraw=null,this.group.removeAll()},dispose:function(){this._mapDraw&&this._mapDraw.remove(),this._mapDraw=null},_renderSymbols:function(t,e,i){var n=t.originalData,o=this.group;n.each(n.mapDimension("value"),function(e,i){if(!isNaN(e)){var a=n.getItemLayout(i);if(a&&a.point){var r=a.point,s=a.offset,l=new Lb({style:{fill:t.getData().getVisual("color")},shape:{cx:r[0]+9*s,cy:r[1],r:3},silent:!0,z2:s?8:10});if(!s){var h=t.mainSeries.getData(),u=n.getName(i),c=h.indexOfName(u),d=n.getItemModel(i),f=d.getModel("label"),p=d.getModel("emphasis.label"),g=h.getItemGraphicEl(c),m=A(t.getFormattedLabel(i,"normal"),u),v=A(t.getFormattedLabel(i,"emphasis"),m),y=function(){var t=io({},p,{text:p.get("show")?v:null},{isRectText:!0,useInsideStyle:!1},!0);l.style.extendFrom(t),l.__mapOriginalZ2=l.z2,l.z2+=1},x=function(){io(l.style,f,{text:f.get("show")?m:null,textPosition:f.getShallow("position")||"bottom"},{isRectText:!0,useInsideStyle:!1}),null!=l.__mapOriginalZ2&&(l.z2=l.__mapOriginalZ2,l.__mapOriginalZ2=null)};g.on("mouseover",y).on("mouseout",x).on("emphasis",y).on("normal",x),x()}o.add(l)}}})}}),hs({type:"geoRoam",event:"geoRoam",update:"updateTransform"},function(t,e){var i=t.componentType||"series";e.eachComponent({mainType:i,query:t},function(e){var n=e.coordinateSystem;if("geo"===n.type){var o=au(n,t,e.get("scaleLimit"));e.setCenter&&e.setCenter(o.center),e.setZoom&&e.setZoom(o.zoom),"series"===i&&d(e.seriesGroup,function(t){t.setCenter(o.center),t.setZoom(o.zoom)})}})});var MA=Q;u(ru,Kx),su.prototype={constructor:su,type:"view",dimensions:["x","y"],setBoundingRect:function(t,e,i,n){return this._rect=new Kt(t,e,i,n),this._rect},getBoundingRect:function(){return this._rect},setViewRect:function(t,e,i,n){this.transformTo(t,e,i,n),this._viewRect=new Kt(t,e,i,n)},transformTo:function(t,e,i,n){var o=this.getBoundingRect(),a=this._rawTransformable;a.transform=o.calculateTransform(new Kt(t,e,i,n)),a.decomposeTransform(),this._updateTransform()},setCenter:function(t){t&&(this._center=t,this._updateCenterAndZoom())},setZoom:function(t){t=t||1;var e=this.zoomLimit;e&&(null!=e.max&&(t=Math.min(e.max,t)),null!=e.min&&(t=Math.max(e.min,t))),this._zoom=t,this._updateCenterAndZoom()},getDefaultCenter:function(){var t=this.getBoundingRect();return[t.x+t.width/2,t.y+t.height/2]},getCenter:function(){return this._center||this.getDefaultCenter()},getZoom:function(){return this._zoom||1},getRoamTransform:function(){return this._roamTransformable.getLocalTransform()},_updateCenterAndZoom:function(){var t=this._rawTransformable.getLocalTransform(),e=this._roamTransformable,i=this.getDefaultCenter(),n=this.getCenter(),o=this.getZoom();n=Q([],n,t),i=Q([],i,t),e.origin=n,e.position=[i[0]-n[0],i[1]-n[1]],e.scale=[o,o],this._updateTransform()},_updateTransform:function(){var t=this._roamTransformable,e=this._rawTransformable;e.parent=t,t.updateTransform(),e.updateTransform(),ht(this.transform||(this.transform=[]),e.transform||st()),this._rawTransform=e.getLocalTransform(),this.invTransform=this.invTransform||[],pt(this.invTransform,this.transform),this.decomposeTransform()},getViewRect:function(){return this._viewRect},getViewRectAfterRoam:function(){var t=this.getBoundingRect().clone();return t.applyTransform(this.transform),t},dataToPoint:function(t,e,i){var n=e?this._rawTransform:this.transform;return i=i||[],n?MA(i,t,n):G(i,t)},pointToData:function(t){var e=this.invTransform;return e?MA([],t,e):[t[0],t[1]]},convertToPixel:v(lu,"dataToPoint"),convertFromPixel:v(lu,"pointToData"),containPoint:function(t){return this.getViewRectAfterRoam().contain(t[0],t[1])}},u(su,Kx);for(var IA=[126,25],TA=[[[0,3.5],[7,11.2],[15,11.9],[30,7],[42,.7],[52,.7],[56,7.7],[59,.7],[64,.7],[64,0],[5,0],[0,3.5]],[[13,16.1],[19,14.7],[16,21.7],[11,23.1],[13,16.1]],[[12,32.2],[14,38.5],[15,38.5],[13,32.2],[12,32.2]],[[16,47.6],[12,53.2],[13,53.2],[18,47.6],[16,47.6]],[[6,64.4],[8,70],[9,70],[8,64.4],[6,64.4]],[[23,82.6],[29,79.8],[30,79.8],[25,82.6],[23,82.6]],[[37,70.7],[43,62.3],[44,62.3],[39,70.7],[37,70.7]],[[48,51.1],[51,45.5],[53,45.5],[50,51.1],[48,51.1]],[[51,35],[51,28.7],[53,28.7],[53,35],[51,35]],[[52,22.4],[55,17.5],[56,17.5],[53,22.4],[52,22.4]],[[58,12.6],[62,7],[63,7],[60,12.6],[58,12.6]],[[0,3.5],[0,93.1],[64,93.1],[64,0],[63,0],[63,92.4],[1,92.4],[1,3.5],[0,3.5]]],AA=0;AA<TA.length;AA++)for(var DA=0;DA<TA[AA].length;DA++)TA[AA][DA][0]/=10.5,TA[AA][DA][1]/=-14,TA[AA][DA][0]+=IA[0],TA[AA][DA][1]+=IA[1];var CA={"南海诸岛":[32,80],"广东":[0,-10],"香港":[10,5],"澳门":[-10,10],"天津":[5,5]},LA={Russia:[100,60],"United States":[-99,38],"United States of America":[-99,38]},kA=[[[123.45165252685547,25.73527164402261],[123.49731445312499,25.73527164402261],[123.49731445312499,25.750734064600884],[123.45165252685547,25.750734064600884],[123.45165252685547,25.73527164402261]]],PA=[function(t){"china"===t.map&&t.regions.push(new gl("南海诸岛",f(TA,function(t){return{type:"polygon",exterior:t}}),IA))},function(t){d(t.regions,function(t){var e=CA[t.name];if(e){var i=t.center;i[0]+=e[0]/10.5,i[1]+=-e[1]/14}})},function(t){d(t.regions,function(t){var e=LA[t.name];if(e){var i=t.center;i[0]=e[0],i[1]=e[1]}})},function(t){if("china"===t.map)for(var e=0,i=t.regions.length;e<i;++e)"台湾"===t.regions[e].name&&t.regions[e].geometries.push({type:"polygon",exterior:kA[0]})}];hu.prototype={constructor:hu,type:"geo",dimensions:["lng","lat"],containCoord:function(t){for(var e=this.regions,i=0;i<e.length;i++)if(e[i].contain(t))return!0;return!1},loadGeoJson:function(t,e,i){try{this.regions=t?tT(t):[]}catch(t){throw"Invalid geoJson format\n"+t.message}e=e||{},i=i||{};for(var n=this.regions,o=z(),a=0;a<n.length;a++){var r=n[a].name;r=i.hasOwnProperty(r)?i[r]:r,n[a].name=r,o.set(r,n[a]),this.addGeoCoord(r,n[a].center);var s=e[r];s&&n[a].transformTo(s.left,s.top,s.width,s.height)}this._regionsMap=o,this._rect=null,d(PA,function(t){t(this)},this)},transformTo:function(t,e,i,n){var o=this.getBoundingRect();(o=o.clone()).y=-o.y-o.height;var a=this._rawTransformable;a.transform=o.calculateTransform(new Kt(t,e,i,n)),a.decomposeTransform();var r=a.scale;r[1]=-r[1],a.updateTransform(),this._updateTransform()},getRegion:function(t){return this._regionsMap.get(t)},getRegionByCoord:function(t){for(var e=this.regions,i=0;i<e.length;i++)if(e[i].contain(t))return e[i]},addGeoCoord:function(t,e){this._nameCoordMap.set(t,e)},getGeoCoord:function(t){return this._nameCoordMap.get(t)},getBoundingRect:function(){if(this._rect)return this._rect;for(var t,e=this.regions,i=0;i<e.length;i++){var n=e[i].getBoundingRect();(t=t||n.clone()).union(n)}return this._rect=t||new Kt(0,0,0,0)},dataToPoint:function(t,e,i){if("string"==typeof t&&(t=this.getGeoCoord(t)),t)return su.prototype.dataToPoint.call(this,t,e,i)},convertToPixel:v(uu,"dataToPoint"),convertFromPixel:v(uu,"pointToData")},u(hu,su);var OA={dimensions:hu.prototype.dimensions,create:function(t,e){var i=[];t.eachComponent("geo",function(t,n){var o=t.get("map"),a=xs(o),r=new hu(o+n,o,a&&a.geoJson,a&&a.specialAreas,t.get("nameMap"));r.zoomLimit=t.get("scaleLimit"),i.push(r),du(r,t),t.coordinateSystem=r,r.model=t,r.resize=cu,r.resize(t,e)}),t.eachSeries(function(t){if("geo"===t.get("coordinateSystem")){var e=t.get("geoIndex")||0;t.coordinateSystem=i[e]}});var n={};return t.eachSeriesByType("map",function(t){if(!t.getHostGeoModel()){var e=t.getMapType();n[e]=n[e]||[],n[e].push(t)}}),d(n,function(t,n){var a=xs(n),r=f(t,function(t){return t.get("nameMap")}),s=new hu(n,n,a&&a.geoJson,a&&a.specialAreas,o(r));s.zoomLimit=T.apply(null,f(t,function(t){return t.get("scaleLimit")})),i.push(s),s.resize=cu,s.resize(t[0],e),d(t,function(t){t.coordinateSystem=s,du(s,t)})}),i},getFilledRegions:function(t,e,i){var n=(t||[]).slice();i=i||{};var o=xs(e),a=o&&o.geoJson;if(!a)return t;for(var r=z(),s=a.features,l=0;l<n.length;l++)r.set(n[l].name,n[l]);for(l=0;l<s.length;l++){var h=s[l].properties.name;r.get(h)||(i.hasOwnProperty(h)&&(h=i[h]),n.push({name:h}))}return n}};us("geo",OA);cs(function(t){var e={};t.eachSeriesByType("map",function(i){var n=i.getMapType();if(!i.getHostGeoModel()&&!e[n]){var o={};d(i.seriesGroup,function(e){var i=e.coordinateSystem,n=e.originalData;e.get("showLegendSymbol")&&t.getComponent("legend")&&n.each(n.mapDimension("value"),function(t,e){var a=n.getName(e),r=i.getRegion(a);if(r&&!isNaN(t)){var s=o[a]||0,l=i.dataToPoint(r.center);o[a]=s+1,n.setItemLayout(e,{point:l,offset:s})}})});var a=i.getData();a.each(function(t){var e=a.getName(t),i=a.getItemLayout(t)||{};i.showLabel=!o[e],a.setItemLayout(t,i)}),e[n]=!0}})}),ds(function(t){t.eachSeriesByType("map",function(t){var e=t.get("color"),i=t.getModel("itemStyle"),n=i.get("areaColor"),o=i.get("color")||e[t.seriesIndex%e.length];t.getData().setVisual({areaColor:n,color:o})})}),ls(FM.PROCESSOR.STATISTIC,function(t){var e={};t.eachSeriesByType("map",function(t){var i=t.getHostGeoModel(),n=i?"o"+i.id:"i"+t.getMapType();(e[n]=e[n]||[]).push(t)}),d(e,function(t,e){for(var i=fu(f(t,function(t){return t.getData()}),t[0].get("mapValueCalculation")),n=0;n<t.length;n++)t[n].originalData=t[n].getData();for(n=0;n<t.length;n++)t[n].seriesGroup=t,t[n].needsDrawMap=0===n&&!t[n].getHostGeoModel(),t[n].setData(i.cloneShallow()),t[n].mainSeries=t[0]})}),ss(function(t){var e=[];d(t.series,function(t){t&&"map"===t.type&&(e.push(t),t.map=t.map||t.mapType,r(t,t.mapLocation))})}),uA("map",[{type:"mapToggleSelect",event:"mapselectchanged",method:"toggleSelected"},{type:"mapSelect",event:"mapselected",method:"select"},{type:"mapUnSelect",event:"mapunselected",method:"unSelect"}]);var NA=d,EA="\0__link_datas",zA="\0__link_mainData",RA=function(t,e){this.name=t||"",this.depth=0,this.height=0,this.parentNode=null,this.dataIndex=-1,this.children=[],this.viewChildren=[],this.hostTree=e};RA.prototype={constructor:RA,isRemoved:function(){return this.dataIndex<0},eachNode:function(t,e,i){"function"==typeof t&&(i=e,e=t,t=null),_(t=t||{})&&(t={order:t});var n,o=t.order||"preorder",a=this[t.attr||"children"];"preorder"===o&&(n=e.call(i,this));for(var r=0;!n&&r<a.length;r++)a[r].eachNode(t,e,i);"postorder"===o&&e.call(i,this)},updateDepthAndHeight:function(t){var e=0;this.depth=t;for(var i=0;i<this.children.length;i++){var n=this.children[i];n.updateDepthAndHeight(t+1),n.height>e&&(e=n.height)}this.height=e+1},getNodeById:function(t){if(this.getId()===t)return this;for(var e=0,i=this.children,n=i.length;e<n;e++){var o=i[e].getNodeById(t);if(o)return o}},contains:function(t){if(t===this)return!0;for(var e=0,i=this.children,n=i.length;e<n;e++){var o=i[e].contains(t);if(o)return o}},getAncestors:function(t){for(var e=[],i=t?this:this.parentNode;i;)e.push(i),i=i.parentNode;return e.reverse(),e},getValue:function(t){var e=this.hostTree.data;return e.get(e.getDimension(t||"value"),this.dataIndex)},setLayout:function(t,e){this.dataIndex>=0&&this.hostTree.data.setItemLayout(this.dataIndex,t,e)},getLayout:function(){return this.hostTree.data.getItemLayout(this.dataIndex)},getModel:function(t){if(!(this.dataIndex<0)){var e,i=this.hostTree,n=i.data.getItemModel(this.dataIndex),o=this.getLevelModel();return o||0!==this.children.length&&(0===this.children.length||!1!==this.isExpand)||(e=this.getLeavesModel()),n.getModel(t,(o||e||i.hostModel).getModel(t))}},getLevelModel:function(){return(this.hostTree.levelModels||[])[this.depth]},getLeavesModel:function(){return this.hostTree.leavesModel},setVisual:function(t,e){this.dataIndex>=0&&this.hostTree.data.setItemVisual(this.dataIndex,t,e)},getVisual:function(t,e){return this.hostTree.data.getItemVisual(this.dataIndex,t,e)},getRawIndex:function(){return this.hostTree.data.getRawIndex(this.dataIndex)},getId:function(){return this.hostTree.data.getId(this.dataIndex)},isAncestorOf:function(t){for(var e=t.parentNode;e;){if(e===this)return!0;e=e.parentNode}return!1},isDescendantOf:function(t){return t!==this&&t.isAncestorOf(this)}},bu.prototype={constructor:bu,type:"tree",eachNode:function(t,e,i){this.root.eachNode(t,e,i)},getNodeByDataIndex:function(t){var e=this.data.getRawIndex(t);return this._nodes[e]},getNodeByName:function(t){return this.root.getNodeByName(t)},update:function(){for(var t=this.data,e=this._nodes,i=0,n=e.length;i<n;i++)e[i].dataIndex=-1;for(var i=0,n=t.count();i<n;i++)e[t.getRawIndex(i)].dataIndex=i},clearLayouts:function(){this.data.clearItemLayouts()}},bu.createTree=function(t,e,i){function n(t,e){var i=t.value;r=Math.max(r,y(i)?i.length:1),a.push(t);var s=new RA(t.name,o);e?Su(s,e):o.root=s,o._nodes.push(s);var l=t.children;if(l)for(var h=0;h<l.length;h++)n(l[h],s)}var o=new bu(e,i.levels,i.leaves),a=[],r=1;n(t),o.root.updateDepthAndHeight(0);var s=wI(a,{coordDimensions:["value"],dimensionsCount:r}),l=new yI(s,e);return l.initData(a),pu({mainData:l,struct:o,structAttr:"tree"}),o.update(),o},uM.extend({type:"series.tree",layoutInfo:null,layoutMode:"box",getInitialData:function(t){var e={name:t.name,children:t.data},i=t.leaves||{},n={};n.leaves=i;var o=bu.createTree(e,this,n),a=0;o.eachNode("preorder",function(t){t.depth>a&&(a=t.depth)});var r=t.expandAndCollapse&&t.initialTreeDepth>=0?t.initialTreeDepth:a;return o.root.eachNode("preorder",function(t){var e=t.hostTree.data.getRawDataItem(t.dataIndex);t.isExpand=e&&null!=e.collapsed?!e.collapsed:t.depth<=r}),o.data},formatTooltip:function(t){for(var e=this.getData().tree,i=e.root.children[0],n=e.getNodeByDataIndex(t),o=n.getValue(),a=n.name;n&&n!==i;)a=n.parentNode.name+"."+a,n=n.parentNode;return Ho(a+(isNaN(o)||null==o?"":" : "+o))},defaultOption:{zlevel:0,z:2,left:"12%",top:"12%",right:"12%",bottom:"12%",layout:"orthogonal",orient:"horizontal",symbol:"emptyCircle",symbolSize:7,expandAndCollapse:!0,initialTreeDepth:2,lineStyle:{color:"#ccc",width:1.5,curveness:.5},itemStyle:{color:"lightsteelblue",borderColor:"#c23531",borderWidth:1.5},label:{show:!0,color:"#555"},leaves:{label:{show:!0}},animationEasing:"linear",animationDuration:700,animationDurationUpdate:1e3}}),ys({type:"tree",init:function(t,e){this._oldTree,this._mainGroup=new S_,this.group.add(this._mainGroup)},render:function(t,e,i,n){var o=t.getData(),a=t.layoutInfo,r=this._mainGroup,s=t.get("layout");"radial"===s?r.attr("position",[a.x+a.width/2,a.y+a.height/2]):r.attr("position",[a.x,a.y]);var l=this._data,h={expandAndCollapse:t.get("expandAndCollapse"),layout:s,orient:t.get("orient"),curvature:t.get("lineStyle.curveness"),symbolRotate:t.get("symbolRotate"),symbolOffset:t.get("symbolOffset"),hoverAnimation:t.get("hoverAnimation"),useNameLabel:!0,fadeIn:!0};o.diff(l).add(function(e){Ru(o,e)&&Vu(o,e,null,r,t,h)}).update(function(e,i){var n=l.getItemGraphicEl(i);Ru(o,e)?Vu(o,e,n,r,t,h):n&&Gu(o,e,n,r,t,h)}).remove(function(e){var i=l.getItemGraphicEl(e);Gu(o,e,i,r,t,h)}).execute(),!0===h.expandAndCollapse&&o.eachItemGraphicEl(function(e,n){e.off("click").on("click",function(){i.dispatchAction({type:"treeExpandAndCollapse",seriesId:t.id,dataIndex:n})})}),this._data=o},dispose:function(){},remove:function(){this._mainGroup.removeAll(),this._data=null}}),hs({type:"treeExpandAndCollapse",event:"treeExpandAndCollapse",update:"update"},function(t,e){e.eachComponent({mainType:"series",subType:"tree",query:t},function(e){var i=t.dataIndex,n=e.getData().tree.getNodeByDataIndex(i);n.isExpand=!n.isExpand})});var BA=function(t,e){var i=Cu(t,e);t.layoutInfo=i;var n=t.get("layout"),o=0,a=0,r=null;"radial"===n?(o=2*Math.PI,a=Math.min(i.height,i.width)/2,r=Au(function(t,e){return(t.parentNode===e.parentNode?1:2)/t.depth})):(o=i.width,a=i.height,r=Au());var s=t.getData().tree.root,l=s.children[0];Mu(s),Fu(l,Iu,r),s.hierNode.modifier=-l.hierNode.prelim,Hu(l,Tu);var h=l,u=l,c=l;Hu(l,function(t){var e=t.getLayout().x;e<h.getLayout().x&&(h=t),e>u.getLayout().x&&(u=t),t.depth>c.depth&&(c=t)});var d=h===u?1:r(h,u)/2,f=d-h.getLayout().x,p=0,g=0,m=0,v=0;"radial"===n?(p=o/(u.getLayout().x+d+f),g=a/(c.depth-1||1),Hu(l,function(t){m=(t.getLayout().x+f)*p,v=(t.depth-1)*g;var e=Du(m,v);t.setLayout({x:e.x,y:e.y,rawX:m,rawY:v},!0)})):"horizontal"===t.get("orient")?(g=a/(u.getLayout().x+d+f),p=o/(c.depth-1||1),Hu(l,function(t){v=(t.getLayout().x+f)*g,m=(t.depth-1)*p,t.setLayout({x:m,y:v},!0)})):(p=o/(u.getLayout().x+d+f),g=a/(c.depth-1||1),Hu(l,function(t){m=(t.getLayout().x+f)*p,v=(t.depth-1)*g,t.setLayout({x:m,y:v},!0)}))};ds(bT("tree","circle")),cs(function(t,e){t.eachSeriesByType("tree",function(t){BA(t,e)})}),cs(function(t,e){t.eachSeriesByType("tree",function(t){BA(t,e)})}),uM.extend({type:"series.treemap",layoutMode:"box",dependencies:["grid","polar"],_viewRoot:null,defaultOption:{progressive:0,hoverLayerThreshold:1/0,left:"center",top:"middle",right:null,bottom:null,width:"80%",height:"80%",sort:!0,clipWindow:"origin",squareRatio:.5*(1+Math.sqrt(5)),leafDepth:null,drillDownIcon:"▶",zoomToNodeRatio:.1024,roam:!0,nodeClick:"zoomToNode",animation:!0,animationDurationUpdate:900,animationEasing:"quinticInOut",breadcrumb:{show:!0,height:22,left:"center",top:"bottom",emptyItemWidth:25,itemStyle:{color:"rgba(0,0,0,0.7)",borderColor:"rgba(255,255,255,0.7)",borderWidth:1,shadowColor:"rgba(150,150,150,1)",shadowBlur:3,shadowOffsetX:0,shadowOffsetY:0,textStyle:{color:"#fff"}},emphasis:{textStyle:{}}},label:{show:!0,distance:0,padding:5,position:"inside",color:"#fff",ellipsis:!0},upperLabel:{show:!1,position:[0,"50%"],height:20,color:"#fff",ellipsis:!0,verticalAlign:"middle"},itemStyle:{color:null,colorAlpha:null,colorSaturation:null,borderWidth:0,gapWidth:0,borderColor:"#fff",borderColorSaturation:null},emphasis:{upperLabel:{show:!0,position:[0,"50%"],color:"#fff",ellipsis:!0,verticalAlign:"middle"}},visualDimension:0,visualMin:null,visualMax:null,color:[],colorAlpha:null,colorSaturation:null,colorMappingBy:"index",visibleMin:10,childrenVisibleMin:null,levels:[]},getInitialData:function(t,e){var i={name:t.name,children:t.data};Yu(i);var n=t.levels||[];n=t.levels=qu(n,e);var o={};return o.levels=n,bu.createTree(i,this,o).data},optionUpdated:function(){this.resetViewRoot()},formatTooltip:function(t){var e=this.getData(),i=this.getRawValue(t),n=Wo(y(i)?i[0]:i);return Ho(e.getName(t)+": "+n)},getDataParams:function(t){var e=uM.prototype.getDataParams.apply(this,arguments),i=this.getData().tree.getNodeByDataIndex(t);return e.treePathInfo=Xu(i,this),e},setLayoutInfo:function(t){this.layoutInfo=this.layoutInfo||{},a(this.layoutInfo,t)},mapIdToIndex:function(t){var e=this._idIndexMap;e||(e=this._idIndexMap=z(),this._idIndexMapCount=0);var i=e.get(t);return null==i&&e.set(t,i=this._idIndexMapCount++),i},getViewRoot:function(){return this._viewRoot},resetViewRoot:function(t){t?this._viewRoot=t:t=this._viewRoot;var e=this.getRawData().tree.root;t&&(t===e||e.contains(t))||(this._viewRoot=e)}});var VA=5;$u.prototype={constructor:$u,render:function(t,e,i,n){var o=t.getModel("breadcrumb"),a=this.group;if(a.removeAll(),o.get("show")&&i){var r=o.getModel("itemStyle"),s=r.getModel("textStyle"),l={pos:{left:o.get("left"),right:o.get("right"),top:o.get("top"),bottom:o.get("bottom")},box:{width:e.getWidth(),height:e.getHeight()},emptyItemWidth:o.get("emptyItemWidth"),totalWidth:0,renderList:[]};this._prepare(i,l,s),this._renderContent(t,l,r,s,n),Jo(a,l.pos,l.box)}},_prepare:function(t,e,i){for(var n=t;n;n=n.parentNode){var o=n.getModel().get("name"),a=i.getTextRect(o),r=Math.max(a.width+16,e.emptyItemWidth);e.totalWidth+=r+8,e.renderList.push({node:n,text:o,width:r})}},_renderContent:function(t,e,i,n,o){for(var a=0,s=e.emptyItemWidth,l=t.get("breadcrumb.height"),h=$o(e.pos,e.box),u=e.totalWidth,c=e.renderList,d=c.length-1;d>=0;d--){var f=c[d],p=f.node,g=f.width,m=f.text;u>h.width&&(u-=g-s,g=s,m=null);var y=new Rb({shape:{points:Ku(a,0,g,l,d===c.length-1,0===d)},style:r(i.getItemStyle(),{lineJoin:"bevel",text:m,textFill:n.getTextColor(),textFont:n.getFont()}),z:10,onclick:v(o,p)});this.group.add(y),Ju(y,t,p),a+=g+8}},remove:function(){this.group.removeAll()}};var GA=m,WA=S_,FA=Vb,HA=d,ZA=["label"],UA=["emphasis","label"],jA=["upperLabel"],XA=["emphasis","upperLabel"],YA=10,qA=1,$A=2,KA=Sw([["fill","color"],["stroke","strokeColor"],["lineWidth","strokeWidth"],["shadowBlur"],["shadowOffsetX"],["shadowOffsetY"],["shadowColor"]]),JA=function(t){var e=KA(t);return e.stroke=e.fill=e.lineWidth=null,e};ys({type:"treemap",init:function(t,e){this._containerGroup,this._storage={nodeGroup:[],background:[],content:[]},this._oldTree,this._breadcrumb,this._controller,this._state="ready"},render:function(t,e,i,n){if(!(l(e.findComponents({mainType:"series",subType:"treemap",query:n}),t)<0)){this.seriesModel=t,this.api=i,this.ecModel=e;var o=Zu(n,["treemapZoomToNode","treemapRootToNode"],t),a=n&&n.type,r=t.layoutInfo,s=!this._oldTree,h=this._storage,u="treemapRootToNode"===a&&o&&h?{rootNodeGroup:h.nodeGroup[o.node.getRawIndex()],direction:n.direction}:null,c=this._giveContainerGroup(r),d=this._doRender(c,t,u);s||a&&"treemapZoomToNode"!==a&&"treemapRootToNode"!==a?d.renderFinally():this._doAnimation(c,d,t,u),this._resetController(i),this._renderBreadcrumb(t,i,o)}},_giveContainerGroup:function(t){var e=this._containerGroup;return e||(e=this._containerGroup=new WA,this._initEvents(e),this.group.add(e)),e.attr("position",[t.x,t.y]),e},_doRender:function(t,e,i){function n(t,e,i,o,a){function r(t){return t.getId()}function s(r,s){var l=null!=r?t[r]:null,h=null!=s?e[s]:null,c=u(l,h,i,a);c&&n(l&&l.viewChildren||[],h&&h.viewChildren||[],c,o,a+1)}o?(e=t,HA(t,function(t,e){!t.isRemoved()&&s(e,e)})):new ws(e,t,r,r).add(s).update(s).remove(v(s,null)).execute()}var o=e.getData().tree,a=this._oldTree,r={nodeGroup:[],background:[],content:[]},s={nodeGroup:[],background:[],content:[]},l=this._storage,h=[],u=v(tc,e,s,l,i,r,h);n(o.root?[o.root]:[],a&&a.root?[a.root]:[],t,o===a||!a,0);var c=function(t){var e={nodeGroup:[],background:[],content:[]};return t&&HA(t,function(t,i){var n=e[i];HA(t,function(t){t&&(n.push(t),t.__tmWillDelete=1)})}),e}(l);return this._oldTree=o,this._storage=s,{lastsForAnimation:r,willDeleteEls:c,renderFinally:function(){HA(c,function(t){HA(t,function(t){t.parent&&t.parent.remove(t)})}),HA(h,function(t){t.invisible=!0,t.dirty()})}}},_doAnimation:function(t,e,i,n){if(i.get("animation")){var o=i.get("animationDurationUpdate"),r=i.get("animationEasing"),s=Qu();HA(e.willDeleteEls,function(t,e){HA(t,function(t,i){if(!t.invisible){var a,l=t.parent;if(n&&"drillDown"===n.direction)a=l===n.rootNodeGroup?{shape:{x:0,y:0,width:l.__tmNodeWidth,height:l.__tmNodeHeight},style:{opacity:0}}:{style:{opacity:0}};else{var h=0,u=0;l.__tmWillDelete||(h=l.__tmNodeWidth/2,u=l.__tmNodeHeight/2),a="nodeGroup"===e?{position:[h,u],style:{opacity:0}}:{shape:{x:h,y:u,width:0,height:0},style:{opacity:0}}}a&&s.add(t,a,o,r)}})}),HA(this._storage,function(t,i){HA(t,function(t,n){var l=e.lastsForAnimation[i][n],h={};l&&("nodeGroup"===i?l.old&&(h.position=t.position.slice(),t.attr("position",l.old)):(l.old&&(h.shape=a({},t.shape),t.setShape(l.old)),l.fadein?(t.setStyle("opacity",0),h.style={opacity:1}):1!==t.style.opacity&&(h.style={opacity:1})),s.add(t,h,o,r))})},this),this._state="animating",s.done(GA(function(){this._state="ready",e.renderFinally()},this)).start()}},_resetController:function(t){var e=this._controller;e||((e=this._controller=new Zh(t.getZr())).enable(this.seriesModel.get("roam")),e.on("pan",GA(this._onPan,this)),e.on("zoom",GA(this._onZoom,this)));var i=new Kt(0,0,t.getWidth(),t.getHeight());e.setPointerChecker(function(t,e,n){return i.contain(e,n)})},_clearController:function(){var t=this._controller;t&&(t.dispose(),t=null)},_onPan:function(t,e){if("animating"!==this._state&&(Math.abs(t)>3||Math.abs(e)>3)){var i=this.seriesModel.getData().tree.root;if(!i)return;var n=i.getLayout();if(!n)return;this.api.dispatchAction({type:"treemapMove",from:this.uid,seriesId:this.seriesModel.id,rootRect:{x:n.x+t,y:n.y+e,width:n.width,height:n.height}})}},_onZoom:function(t,e,i){if("animating"!==this._state){var n=this.seriesModel.getData().tree.root;if(!n)return;var o=n.getLayout();if(!o)return;var a=new Kt(o.x,o.y,o.width,o.height),r=this.seriesModel.layoutInfo;e-=r.x,i-=r.y;var s=st();ct(s,s,[-e,-i]),ft(s,s,[t,t]),ct(s,s,[e,i]),a.applyTransform(s),this.api.dispatchAction({type:"treemapRender",from:this.uid,seriesId:this.seriesModel.id,rootRect:{x:a.x,y:a.y,width:a.width,height:a.height}})}},_initEvents:function(t){t.on("click",function(t){if("ready"===this._state){var e=this.seriesModel.get("nodeClick",!0);if(e){var i=this.findTarget(t.offsetX,t.offsetY);if(i){var n=i.node;if(n.getLayout().isLeafRoot)this._rootToNode(i);else if("zoomToNode"===e)this._zoomToNode(i);else if("link"===e){var o=n.hostTree.data.getItemModel(n.dataIndex),a=o.get("link",!0),r=o.get("target",!0)||"blank";a&&window.open(a,r)}}}}},this)},_renderBreadcrumb:function(t,e,i){i||(i=null!=t.get("leafDepth",!0)?{node:t.getViewRoot()}:this.findTarget(e.getWidth()/2,e.getHeight()/2))||(i={node:t.getData().tree.root}),(this._breadcrumb||(this._breadcrumb=new $u(this.group))).render(t,e,i.node,GA(function(e){"animating"!==this._state&&(ju(t.getViewRoot(),e)?this._rootToNode({node:e}):this._zoomToNode({node:e}))},this))},remove:function(){this._clearController(),this._containerGroup&&this._containerGroup.removeAll(),this._storage={nodeGroup:[],background:[],content:[]},this._state="ready",this._breadcrumb&&this._breadcrumb.remove()},dispose:function(){this._clearController()},_zoomToNode:function(t){this.api.dispatchAction({type:"treemapZoomToNode",from:this.uid,seriesId:this.seriesModel.id,targetNode:t.node})},_rootToNode:function(t){this.api.dispatchAction({type:"treemapRootToNode",from:this.uid,seriesId:this.seriesModel.id,targetNode:t.node})},findTarget:function(t,e){var i;return this.seriesModel.getViewRoot().eachNode({attr:"viewChildren",order:"preorder"},function(n){var o=this._storage.background[n.getRawIndex()];if(o){var a=o.transformCoordToLocal(t,e),r=o.shape;if(!(r.x<=a[0]&&a[0]<=r.x+r.width&&r.y<=a[1]&&a[1]<=r.y+r.height))return!1;i={node:n,offsetX:a[0],offsetY:a[1]}}},this),i}});for(var QA=["treemapZoomToNode","treemapRender","treemapMove"],tD=0;tD<QA.length;tD++)hs({type:QA[tD],update:"updateView"},function(){});hs({type:"treemapRootToNode",update:"updateView"},function(t,e){e.eachComponent({mainType:"series",subType:"treemap",query:t},function(e,i){var n=Zu(t,["treemapZoomToNode","treemapRootToNode"],e);if(n){var o=e.getViewRoot();o&&(t.direction=ju(o,n.node)?"rollUp":"drillDown"),e.resetViewRoot(n.node)}})});var eD=d,iD=w,nD=-1,oD=function(t){var e=t.mappingMethod,n=t.type,o=this.option=i(t);this.type=n,this.mappingMethod=e,this._normalizeData=rD[e];var a=aD[n];this.applyVisual=a.applyVisual,this.getColorMapper=a.getColorMapper,this._doMap=a._doMap[e],"piecewise"===e?(oc(o),ic(o)):"category"===e?o.categories?nc(o):oc(o,!0):(k("linear"!==e||o.dataExtent),oc(o))};oD.prototype={constructor:oD,mapValueToVisual:function(t){var e=this._normalizeData(t);return this._doMap(e,t)},getNormalizer:function(){return m(this._normalizeData,this)}};var aD=oD.visualHandlers={color:{applyVisual:sc("color"),getColorMapper:function(){var t=this.option;return m("category"===t.mappingMethod?function(t,e){return!e&&(t=this._normalizeData(t)),lc.call(this,t)}:function(e,i,n){var o=!!n;return!i&&(e=this._normalizeData(e)),n=Ot(e,t.parsedVisual,n),o?n:Rt(n,"rgba")},this)},_doMap:{linear:function(t){return Rt(Ot(t,this.option.parsedVisual),"rgba")},category:lc,piecewise:function(t,e){var i=cc.call(this,e);return null==i&&(i=Rt(Ot(t,this.option.parsedVisual),"rgba")),i},fixed:hc}},colorHue:ac(function(t,e){return Et(t,e)}),colorSaturation:ac(function(t,e){return Et(t,null,e)}),colorLightness:ac(function(t,e){return Et(t,null,null,e)}),colorAlpha:ac(function(t,e){return zt(t,e)}),opacity:{applyVisual:sc("opacity"),_doMap:uc([0,1])},symbol:{applyVisual:function(t,e,i){var n=this.mapValueToVisual(t);if(_(n))i("symbol",n);else if(iD(n))for(var o in n)n.hasOwnProperty(o)&&i(o,n[o])},_doMap:{linear:rc,category:lc,piecewise:function(t,e){var i=cc.call(this,e);return null==i&&(i=rc.call(this,t)),i},fixed:hc}},symbolSize:{applyVisual:sc("symbolSize"),_doMap:uc([0,1])}},rD={linear:function(t){return Io(t,this.option.dataExtent,[0,1],!0)},piecewise:function(t){var e=this.option.pieceList,i=oD.findPieceIndex(t,e,!0);if(null!=i)return Io(i,[0,e.length-1],[0,1],!0)},category:function(t){var e=this.option.categories?this.option.categoryMap[t]:t;return null==e?nD:e},fixed:B};oD.listVisualTypes=function(){var t=[];return d(aD,function(e,i){t.push(i)}),t},oD.addVisualHandler=function(t,e){aD[t]=e},oD.isValidType=function(t){return aD.hasOwnProperty(t)},oD.eachVisual=function(t,e,i){w(t)?d(t,e,i):e.call(i,t)},oD.mapVisual=function(t,e,i){var n,o=y(t)?[]:w(t)?{}:(n=!0,null);return oD.eachVisual(t,function(t,a){var r=e.call(i,t,a);n?o=r:o[a]=r}),o},oD.retrieveVisuals=function(t){var e,i={};return t&&eD(aD,function(n,o){t.hasOwnProperty(o)&&(i[o]=t[o],e=!0)}),e?i:null},oD.prepareVisualTypes=function(t){if(iD(t)){var e=[];eD(t,function(t,i){e.push(i)}),t=e}else{if(!y(t))return[];t=t.slice()}return t.sort(function(t,e){return"color"===e&&"color"!==t&&0===t.indexOf("color")?1:-1}),t},oD.dependsOn=function(t,e){return"color"===e?!(!t||0!==t.indexOf(e)):t===e},oD.findPieceIndex=function(t,e,i){function n(e,i){var n=Math.abs(e-t);n<a&&(a=n,o=i)}for(var o,a=1/0,r=0,s=e.length;r<s;r++){var l=e[r].value;if(null!=l){if(l===t||"string"==typeof l&&l===t+"")return r;i&&n(l,r)}}for(var r=0,s=e.length;r<s;r++){var h=e[r],u=h.interval,c=h.close;if(u){if(u[0]===-1/0){if(fc(c[1],t,u[1]))return r}else if(u[1]===1/0){if(fc(c[0],u[0],t))return r}else if(fc(c[0],u[0],t)&&fc(c[1],t,u[1]))return r;i&&n(u[0],r),i&&n(u[1],r)}}if(i)return t===1/0?e.length-1:t===-1/0?0:o};var sD=y,lD="itemStyle",hD={seriesType:"treemap",reset:function(t,e,i,n){var o=t.getData().tree,a=o.root,r=t.getModel(lD);a.isRemoved()||pc(a,{},f(o.levelModels,function(t){return t?t.get(lD):null}),r,t.getViewRoot().getAncestors(),t)}},uD=Math.max,cD=Math.min,dD=T,fD=d,pD=["itemStyle","borderWidth"],gD=["itemStyle","gapWidth"],mD=["upperLabel","show"],vD=["upperLabel","height"],yD={seriesType:"treemap",reset:function(t,e,i,n){var o=i.getWidth(),r=i.getHeight(),s=t.option,l=Ko(t.getBoxLayoutParams(),{width:i.getWidth(),height:i.getHeight()}),h=s.size||[],u=To(dD(l.width,h[0]),o),c=To(dD(l.height,h[1]),r),d=n&&n.type,f=Zu(n,["treemapZoomToNode","treemapRootToNode"],t),p="treemapRender"===d||"treemapMove"===d?n.rootRect:null,g=t.getViewRoot(),m=Uu(g);if("treemapMove"!==d){var v="treemapZoomToNode"===d?Cc(t,f,g,u,c):p?[p.width,p.height]:[u,c],y=s.sort;y&&"asc"!==y&&"desc"!==y&&(y="desc");var x={squareRatio:s.squareRatio,sort:y,leafDepth:s.leafDepth};g.hostTree.clearLayouts();_={x:0,y:0,width:v[0],height:v[1],area:v[0]*v[1]};g.setLayout(_),bc(g,x,!1,0);var _=g.getLayout();fD(m,function(t,e){var i=(m[e+1]||g).getValue();t.setLayout(a({dataExtent:[i,i],borderWidth:0,upperHeight:0},_))})}var w=t.getData().tree.root;w.setLayout(Lc(l,p,f),!0),t.setLayoutInfo(l),kc(w,new Kt(-l.x,-l.y,o,r),m,g,0)}};ds(hD),cs(yD);var xD=function(t){this._directed=t||!1,this.nodes=[],this.edges=[],this._nodesMap={},this._edgesMap={},this.data,this.edgeData},_D=xD.prototype;_D.type="graph",_D.isDirected=function(){return this._directed},_D.addNode=function(t,e){t=t||""+e;var i=this._nodesMap;if(!i[Oc(t)]){var n=new Nc(t,e);return n.hostGraph=this,this.nodes.push(n),i[Oc(t)]=n,n}},_D.getNodeByIndex=function(t){var e=this.data.getRawIndex(t);return this.nodes[e]},_D.getNodeById=function(t){return this._nodesMap[Oc(t)]},_D.addEdge=function(t,e,i){var n=this._nodesMap,o=this._edgesMap;if("number"==typeof t&&(t=this.nodes[t]),"number"==typeof e&&(e=this.nodes[e]),Nc.isInstance(t)||(t=n[Oc(t)]),Nc.isInstance(e)||(e=n[Oc(e)]),t&&e){var a=t.id+"-"+e.id;if(!o[a]){var r=new Ec(t,e,i);return r.hostGraph=this,this._directed&&(t.outEdges.push(r),e.inEdges.push(r)),t.edges.push(r),t!==e&&e.edges.push(r),this.edges.push(r),o[a]=r,r}}},_D.getEdgeByIndex=function(t){var e=this.edgeData.getRawIndex(t);return this.edges[e]},_D.getEdge=function(t,e){Nc.isInstance(t)&&(t=t.id),Nc.isInstance(e)&&(e=e.id);var i=this._edgesMap;return this._directed?i[t+"-"+e]:i[t+"-"+e]||i[e+"-"+t]},_D.eachNode=function(t,e){for(var i=this.nodes,n=i.length,o=0;o<n;o++)i[o].dataIndex>=0&&t.call(e,i[o],o)},_D.eachEdge=function(t,e){for(var i=this.edges,n=i.length,o=0;o<n;o++)i[o].dataIndex>=0&&i[o].node1.dataIndex>=0&&i[o].node2.dataIndex>=0&&t.call(e,i[o],o)},_D.breadthFirstTraverse=function(t,e,i,n){if(Nc.isInstance(e)||(e=this._nodesMap[Oc(e)]),e){for(var o="out"===i?"outEdges":"in"===i?"inEdges":"edges",a=0;a<this.nodes.length;a++)this.nodes[a].__visited=!1;if(!t.call(n,e,null))for(var r=[e];r.length;)for(var s=r.shift(),l=s[o],a=0;a<l.length;a++){var h=l[a],u=h.node1===s?h.node2:h.node1;if(!u.__visited){if(t.call(n,u,s))return;r.push(u),u.__visited=!0}}}},_D.update=function(){for(var t=this.data,e=this.edgeData,i=this.nodes,n=this.edges,o=0,a=i.length;o<a;o++)i[o].dataIndex=-1;for(var o=0,a=t.count();o<a;o++)i[t.getRawIndex(o)].dataIndex=o;e.filterSelf(function(t){var i=n[e.getRawIndex(t)];return i.node1.dataIndex>=0&&i.node2.dataIndex>=0});for(var o=0,a=n.length;o<a;o++)n[o].dataIndex=-1;for(var o=0,a=e.count();o<a;o++)n[e.getRawIndex(o)].dataIndex=o},_D.clone=function(){for(var t=new xD(this._directed),e=this.nodes,i=this.edges,n=0;n<e.length;n++)t.addNode(e[n].id,e[n].dataIndex);for(n=0;n<i.length;n++){var o=i[n];t.addEdge(o.node1.id,o.node2.id,o.dataIndex)}return t},Nc.prototype={constructor:Nc,degree:function(){return this.edges.length},inDegree:function(){return this.inEdges.length},outDegree:function(){return this.outEdges.length},getModel:function(t){if(!(this.dataIndex<0))return this.hostGraph.data.getItemModel(this.dataIndex).getModel(t)}},Ec.prototype.getModel=function(t){if(!(this.dataIndex<0))return this.hostGraph.edgeData.getItemModel(this.dataIndex).getModel(t)};var wD=function(t,e){return{getValue:function(i){var n=this[t][e];return n.get(n.getDimension(i||"value"),this.dataIndex)},setVisual:function(i,n){this.dataIndex>=0&&this[t][e].setItemVisual(this.dataIndex,i,n)},getVisual:function(i,n){return this[t][e].getItemVisual(this.dataIndex,i,n)},setLayout:function(i,n){this.dataIndex>=0&&this[t][e].setItemLayout(this.dataIndex,i,n)},getLayout:function(){return this[t][e].getItemLayout(this.dataIndex)},getGraphicEl:function(){return this[t][e].getItemGraphicEl(this.dataIndex)},getRawIndex:function(){return this[t][e].getRawIndex(this.dataIndex)}}};u(Nc,wD("hostGraph","data")),u(Ec,wD("hostGraph","edgeData")),xD.Node=Nc,xD.Edge=Ec,Gi(Nc),Gi(Ec);var bD=function(t,e,i,n,o){for(var a=new xD(n),r=0;r<t.length;r++)a.addNode(T(t[r].id,t[r].name,r),r);for(var s=[],l=[],h=0,r=0;r<e.length;r++){var u=e[r],c=u.source,d=u.target;a.addEdge(c,d,h)&&(l.push(u),s.push(T(u.id,c+" > "+d)),h++)}var f,p=i.get("coordinateSystem");if("cartesian2d"===p||"polar"===p)f=Bs(t,i);else{var g=Aa.get(p),m=wI(t,{coordDimensions:(g&&"view"!==g.type?g.dimensions||[]:[]).concat(["value"])});(f=new yI(m,i)).initData(t)}var v=new yI(["value"],i);return v.initData(l,s),o&&o(f,v),pu({mainData:f,struct:a,structAttr:"graph",datas:{node:f,edge:v},datasAttr:{node:"data",edge:"edgeData"}}),a.update(),a},SD=vs({type:"series.graph",init:function(t){SD.superApply(this,"init",arguments),this.legendDataProvider=function(){return this._categoriesData},this.fillDataTextStyle(t.edges||t.links),this._updateCategoriesData()},mergeOption:function(t){SD.superApply(this,"mergeOption",arguments),this.fillDataTextStyle(t.edges||t.links),this._updateCategoriesData()},mergeDefaultAndTheme:function(t){SD.superApply(this,"mergeDefaultAndTheme",arguments),Mi(t,["edgeLabel"],["show"])},getInitialData:function(t,e){var i=t.edges||t.links||[],n=t.data||t.nodes||[],o=this;if(n&&i)return bD(n,i,this,!0,function(t,i){function n(t){return(t=this.parsePath(t))&&"label"===t[0]?r:this.parentModel}t.wrapMethod("getItemModel",function(t){var e=o._categoriesModels[t.getShallow("category")];return e&&(e.parentModel=t.parentModel,t.parentModel=e),t});var a=o.getModel("edgeLabel"),r=new _o({label:a.option},a.parentModel,e);i.wrapMethod("getItemModel",function(t){return t.customizeGetParent(n),t})}).data},getGraph:function(){return this.getData().graph},getEdgeData:function(){return this.getGraph().edgeData},getCategoriesData:function(){return this._categoriesData},formatTooltip:function(t,e,i){if("edge"===i){var n=this.getData(),o=this.getDataParams(t,i),a=n.graph.getEdgeByIndex(t),r=n.getName(a.node1.dataIndex),s=n.getName(a.node2.dataIndex),l=[];return null!=r&&l.push(r),null!=s&&l.push(s),l=Ho(l.join(" > ")),o.value&&(l+=" : "+Ho(o.value)),l}return SD.superApply(this,"formatTooltip",arguments)},_updateCategoriesData:function(){var t=f(this.option.categories||[],function(t){return null!=t.value?t:a({value:0},t)}),e=new yI(["value"],this);e.initData(t),this._categoriesData=e,this._categoriesModels=e.mapArray(function(t){return e.getItemModel(t,!0)})},setZoom:function(t){this.option.zoom=t},setCenter:function(t){this.option.center=t},isAnimationEnabled:function(){return SD.superCall(this,"isAnimationEnabled")&&!("force"===this.get("layout")&&this.get("force.layoutAnimation"))},defaultOption:{zlevel:0,z:2,coordinateSystem:"view",legendHoverLink:!0,hoverAnimation:!0,layout:null,focusNodeAdjacency:!1,circular:{rotateLabel:!1},force:{initLayout:null,repulsion:[0,50],gravity:.1,edgeLength:30,layoutAnimation:!0},left:"center",top:"center",symbol:"circle",symbolSize:10,edgeSymbol:["none","none"],edgeSymbolSize:10,edgeLabel:{position:"middle"},draggable:!1,roam:!1,center:null,zoom:1,nodeScaleRatio:.6,label:{show:!1,formatter:"{b}"},itemStyle:{},lineStyle:{color:"#aaa",width:1,curveness:0,opacity:.5},emphasis:{label:{show:!0}}}}),MD=Gb.prototype,ID=Fb.prototype,TD=Nn({type:"ec-line",style:{stroke:"#000",fill:null},shape:{x1:0,y1:0,x2:0,y2:0,percent:1,cpx1:null,cpy1:null},buildPath:function(t,e){(zc(e)?MD:ID).buildPath(t,e)},pointAt:function(t){return zc(this.shape)?MD.pointAt.call(this,t):ID.pointAt.call(this,t)},tangentAt:function(t){var e=this.shape,i=zc(e)?[e.x2-e.x1,e.y2-e.y1]:ID.tangentAt.call(this,t);return q(i,i)}}),AD=["fromSymbol","toSymbol"],DD=Wc.prototype;DD.beforeUpdate=function(){var t=this,e=t.childOfName("fromSymbol"),i=t.childOfName("toSymbol"),n=t.childOfName("label");if(e||i||!n.ignore){for(var o=1,a=this.parent;a;)a.scale&&(o/=a.scale[0]),a=a.parent;var r=t.childOfName("line");if(this.__dirty||r.__dirty){var s=r.shape.percent,l=r.pointAt(0),h=r.pointAt(s),u=U([],h,l);if(q(u,u),e&&(e.attr("position",l),c=r.tangentAt(0),e.attr("rotation",Math.PI/2-Math.atan2(c[1],c[0])),e.attr("scale",[o*s,o*s])),i){i.attr("position",h);var c=r.tangentAt(1);i.attr("rotation",-Math.PI/2-Math.atan2(c[1],c[0])),i.attr("scale",[o*s,o*s])}if(!n.ignore){n.attr("position",h);var d,f,p,g=5*o;if("end"===n.__position)d=[u[0]*g+h[0],u[1]*g+h[1]],f=u[0]>.8?"left":u[0]<-.8?"right":"center",p=u[1]>.8?"top":u[1]<-.8?"bottom":"middle";else if("middle"===n.__position){var m=s/2,v=[(c=r.tangentAt(m))[1],-c[0]],y=r.pointAt(m);v[1]>0&&(v[0]=-v[0],v[1]=-v[1]),d=[y[0]+v[0]*g,y[1]+v[1]*g],f="center",p="bottom";var x=-Math.atan2(c[1],c[0]);h[0]<l[0]&&(x=Math.PI+x),n.attr("rotation",x)}else d=[-u[0]*g+l[0],-u[1]*g+l[1]],f=u[0]>.8?"right":u[0]<-.8?"left":"center",p=u[1]>.8?"bottom":u[1]<-.8?"top":"middle";n.attr({style:{textVerticalAlign:n.__verticalAlign||p,textAlign:n.__textAlign||f},position:d,scale:[o,o]})}}}},DD._createLine=function(t,e,i){var n=t.hostModel,o=Vc(t.getItemLayout(e));o.shape.percent=0,fo(o,{shape:{percent:1}},n,e),this.add(o);var a=new Cb({name:"label"});this.add(a),d(AD,function(i){var n=Bc(i,t,e);this.add(n),this[Rc(i)]=t.getItemVisual(e,i)},this),this._updateCommonStl(t,e,i)},DD.updateData=function(t,e,i){var n=t.hostModel,o=this.childOfName("line"),a=t.getItemLayout(e),r={shape:{}};Gc(r.shape,a),co(o,r,n,e),d(AD,function(i){var n=t.getItemVisual(e,i),o=Rc(i);if(this[o]!==n){this.remove(this.childOfName(i));var a=Bc(i,t,e);this.add(a)}this[o]=n},this),this._updateCommonStl(t,e,i)},DD._updateCommonStl=function(t,e,i){var n=t.hostModel,o=this.childOfName("line"),a=i&&i.lineStyle,s=i&&i.hoverLineStyle,l=i&&i.labelModel,h=i&&i.hoverLabelModel;if(!i||t.hasItemOption){var u=t.getItemModel(e);a=u.getModel("lineStyle").getLineStyle(),s=u.getModel("emphasis.lineStyle").getLineStyle(),l=u.getModel("label"),h=u.getModel("emphasis.label")}var c=t.getItemVisual(e,"color"),f=D(t.getItemVisual(e,"opacity"),a.opacity,1);o.useStyle(r({strokeNoScale:!0,fill:"none",stroke:c,opacity:f},a)),o.hoverStyle=s,d(AD,function(t){var e=this.childOfName(t);e&&(e.setColor(c),e.setStyle({opacity:f}))},this);var p,g,m,v=l.getShallow("show"),y=h.getShallow("show"),x=this.childOfName("label");if(v||y){if(p=c||"#000",null==(g=n.getFormattedLabel(e,"normal",t.dataType))){var _=n.getRawValue(e);g=null==_?t.getName(e):isFinite(_)?Ao(_):_}m=A(n.getFormattedLabel(e,"emphasis",t.dataType),g)}if(v){var w=io(x.style,l,{text:g},{autoColor:p});x.__textAlign=w.textAlign,x.__verticalAlign=w.textVerticalAlign,x.__position=l.get("position")||"middle"}else x.setStyle("text",null);x.hoverStyle=y?{text:m,textFill:h.getTextColor(!0),fontStyle:h.getShallow("fontStyle"),fontWeight:h.getShallow("fontWeight"),fontSize:h.getShallow("fontSize"),fontFamily:h.getShallow("fontFamily")}:{text:null},x.ignore=!v&&!y,to(this)},DD.highlight=function(){this.trigger("emphasis")},DD.downplay=function(){this.trigger("normal")},DD.updateLayout=function(t,e){this.setLinePoints(t.getItemLayout(e))},DD.setLinePoints=function(t){var e=this.childOfName("line");Gc(e.shape,t),e.dirty()},h(Wc,S_);var CD=Fc.prototype;CD.isPersistent=function(){return!0},CD.updateData=function(t){var e=this,i=e.group,n=e._lineData;e._lineData=t,n||i.removeAll();var o=Uc(t);t.diff(n).add(function(i){Hc(e,t,i,o)}).update(function(i,a){Zc(e,n,t,a,i,o)}).remove(function(t){i.remove(n.getItemGraphicEl(t))}).execute()},CD.updateLayout=function(){var t=this._lineData;t.eachItemGraphicEl(function(e,i){e.updateLayout(t,i)},this)},CD.incrementalPrepareUpdate=function(t){this._seriesScope=Uc(t),this._lineData=null,this.group.removeAll()},CD.incrementalUpdate=function(t,e){for(var i=t.start;i<t.end;i++)if(Xc(e.getItemLayout(i))){var n=new this._ctor(e,i,this._seriesScope);n.traverse(function(t){t.isGroup||(t.incremental=t.useHoverLayer=!0)}),this.group.add(n)}},CD.remove=function(){this._clearIncremental(),this._incremental=null,this.group.removeAll()},CD._clearIncremental=function(){var t=this._incremental;t&&t.clearDisplaybles()};var LD=[],kD=[],PD=[],OD=Ji,ND=Gx,ED=Math.abs,zD=function(t,e){function i(t){var e=t.getVisual("symbolSize");return e instanceof Array&&(e=(e[0]+e[1])/2),e}var n=[],o=nn,a=[[],[],[]],r=[[],[]],s=[];e/=2,t.eachEdge(function(t,l){var h=t.getLayout(),u=t.getVisual("fromSymbol"),c=t.getVisual("toSymbol");h.__original||(h.__original=[W(h[0]),W(h[1])],h[2]&&h.__original.push(W(h[2])));var d=h.__original;if(null!=h[2]){if(G(a[0],d[0]),G(a[1],d[2]),G(a[2],d[1]),u&&"none"!=u){var f=i(t.node1),p=Yc(a,d[0],f*e);o(a[0][0],a[1][0],a[2][0],p,n),a[0][0]=n[3],a[1][0]=n[4],o(a[0][1],a[1][1],a[2][1],p,n),a[0][1]=n[3],a[1][1]=n[4]}if(c&&"none"!=c){var f=i(t.node2),p=Yc(a,d[1],f*e);o(a[0][0],a[1][0],a[2][0],p,n),a[1][0]=n[1],a[2][0]=n[2],o(a[0][1],a[1][1],a[2][1],p,n),a[1][1]=n[1],a[2][1]=n[2]}G(h[0],a[0]),G(h[1],a[2]),G(h[2],a[1])}else{if(G(r[0],d[0]),G(r[1],d[1]),U(s,r[1],r[0]),q(s,s),u&&"none"!=u){f=i(t.node1);Z(r[0],r[0],s,f*e)}if(c&&"none"!=c){f=i(t.node2);Z(r[1],r[1],s,-f*e)}G(h[0],r[0]),G(h[1],r[1])}})},RD=["itemStyle","opacity"],BD=["lineStyle","opacity"];ys({type:"graph",init:function(t,e){var i=new Ml,n=new Fc,o=this.group;this._controller=new Zh(e.getZr()),this._controllerHost={target:o},o.add(i.group),o.add(n.group),this._symbolDraw=i,this._lineDraw=n,this._firstRender=!0},render:function(t,e,i){var n=t.coordinateSystem;this._model=t,this._nodeScaleRatio=t.get("nodeScaleRatio");var o=this._symbolDraw,a=this._lineDraw,r=this.group;if("view"===n.type){var s={position:n.position,scale:n.scale};this._firstRender?r.attr(s):co(r,s,t)}zD(t.getGraph(),this._getNodeGlobalScale(t));var l=t.getData();o.updateData(l);var h=t.getEdgeData();a.updateData(h),this._updateNodeAndLinkScale(),this._updateController(t,e,i),clearTimeout(this._layoutTimeout);var u=t.forceLayout,c=t.get("force.layoutAnimation");u&&this._startForceLayoutIteration(u,c),l.eachItemGraphicEl(function(e,n){var o=l.getItemModel(n);e.off("drag").off("dragend");var a=l.getItemModel(n).get("draggable");a&&e.on("drag",function(){u&&(u.warmUp(),!this._layouting&&this._startForceLayoutIteration(u,c),u.setFixed(n),l.setItemLayout(n,e.position))},this).on("dragend",function(){u&&u.setUnfixed(n)},this),e.setDraggable(a&&u),e.off("mouseover",e.__focusNodeAdjacency),e.off("mouseout",e.__unfocusNodeAdjacency),o.get("focusNodeAdjacency")&&(e.on("mouseover",e.__focusNodeAdjacency=function(){i.dispatchAction({type:"focusNodeAdjacency",seriesId:t.id,dataIndex:e.dataIndex})}),e.on("mouseout",e.__unfocusNodeAdjacency=function(){i.dispatchAction({type:"unfocusNodeAdjacency",seriesId:t.id})}))},this),l.graph.eachEdge(function(e){var n=e.getGraphicEl();n.off("mouseover",n.__focusNodeAdjacency),n.off("mouseout",n.__unfocusNodeAdjacency),e.getModel().get("focusNodeAdjacency")&&(n.on("mouseover",n.__focusNodeAdjacency=function(){i.dispatchAction({type:"focusNodeAdjacency",seriesId:t.id,edgeDataIndex:e.dataIndex})}),n.on("mouseout",n.__unfocusNodeAdjacency=function(){i.dispatchAction({type:"unfocusNodeAdjacency",seriesId:t.id})}))});var d="circular"===t.get("layout")&&t.get("circular.rotateLabel"),f=l.getLayout("cx"),p=l.getLayout("cy");l.eachItemGraphicEl(function(t,e){var i=t.getSymbolPath();if(d){var n=l.getItemLayout(e),o=Math.atan2(n[1]-p,n[0]-f);o<0&&(o=2*Math.PI+o);var a=n[0]<f;a&&(o-=Math.PI);var r=a?"left":"right";i.setStyle({textRotation:-o,textPosition:r,textOrigin:"center"}),i.hoverStyle&&(i.hoverStyle.textPosition=r)}else i.setStyle({textRotation:0})}),this._firstRender=!1},dispose:function(){this._controller&&this._controller.dispose(),this._controllerHost={}},focusNodeAdjacency:function(t,e,i,n){var o=this._model.getData().graph,a=n.dataIndex,r=n.edgeDataIndex,s=o.getNodeByIndex(a),l=o.getEdgeByIndex(r);(s||l)&&(o.eachNode(function(t){$c(t,RD,.1)}),o.eachEdge(function(t){$c(t,BD,.1)}),s&&(Kc(s,RD),d(s.edges,function(t){t.dataIndex<0||(Kc(t,BD),Kc(t.node1,RD),Kc(t.node2,RD))})),l&&(Kc(l,BD),Kc(l.node1,RD),Kc(l.node2,RD)))},unfocusNodeAdjacency:function(t,e,i,n){var o=this._model.getData().graph;o.eachNode(function(t){$c(t,RD)}),o.eachEdge(function(t){$c(t,BD)})},_startForceLayoutIteration:function(t,e){var i=this;!function n(){t.step(function(t){i.updateLayout(i._model),(i._layouting=!t)&&(e?i._layoutTimeout=setTimeout(n,16):n())})}()},_updateController:function(t,e,i){var n=this._controller,o=this._controllerHost,a=this.group;n.setPointerChecker(function(e,n,o){var r=a.getBoundingRect();return r.applyTransform(a.transform),r.contain(n,o)&&!tu(e,i,t)}),"view"===t.coordinateSystem.type?(n.enable(t.get("roam")),o.zoomLimit=t.get("scaleLimit"),o.zoom=t.coordinateSystem.getZoom(),n.off("pan").off("zoom").on("pan",function(e,n){Jh(o,e,n),i.dispatchAction({seriesId:t.id,type:"graphRoam",dx:e,dy:n})}).on("zoom",function(e,n,a){Qh(o,e,n,a),i.dispatchAction({seriesId:t.id,type:"graphRoam",zoom:e,originX:n,originY:a}),this._updateNodeAndLinkScale(),zD(t.getGraph(),this._getNodeGlobalScale(t)),this._lineDraw.updateLayout()},this)):n.disable()},_updateNodeAndLinkScale:function(){var t=this._model,e=t.getData(),i=this._getNodeGlobalScale(t),n=[i,i];e.eachItemGraphicEl(function(t,e){t.attr("scale",n)})},_getNodeGlobalScale:function(t){var e=t.coordinateSystem;if("view"!==e.type)return 1;var i=this._nodeScaleRatio,n=e.scale,o=n&&n[0]||1;return((e.getZoom()-1)*i+1)/o},updateLayout:function(t){zD(t.getGraph(),this._getNodeGlobalScale(t)),this._symbolDraw.updateLayout(),this._lineDraw.updateLayout()},remove:function(t,e){this._symbolDraw&&this._symbolDraw.remove(),this._lineDraw&&this._lineDraw.remove()}}),hs({type:"graphRoam",event:"graphRoam",update:"none"},function(t,e){e.eachComponent({mainType:"series",query:t},function(e){var i=au(e.coordinateSystem,t);e.setCenter&&e.setCenter(i.center),e.setZoom&&e.setZoom(i.zoom)})}),hs({type:"focusNodeAdjacency",event:"focusNodeAdjacency",update:"series.graph:focusNodeAdjacency"},function(){}),hs({type:"unfocusNodeAdjacency",event:"unfocusNodeAdjacency",update:"series.graph:unfocusNodeAdjacency"},function(){});var VD=Z;ls(function(t){var e=t.findComponents({mainType:"legend"});e&&e.length&&t.eachSeriesByType("graph",function(t){var i=t.getCategoriesData(),n=t.getGraph().data,o=i.mapArray(i.getName);n.filterSelf(function(t){var i=n.getItemModel(t).getShallow("category");if(null!=i){"number"==typeof i&&(i=o[i]);for(var a=0;a<e.length;a++)if(!e[a].isSelected(i))return!1}return!0})},this)}),ds(bT("graph","circle",null)),ds(function(t){var e={};t.eachSeriesByType("graph",function(t){var i=t.getCategoriesData(),n=t.getData(),o={};i.each(function(n){var a=i.getName(n);o["ec-"+a]=n;var r=i.getItemModel(n).get("itemStyle.color")||t.getColorFromPalette(a,e);i.setItemVisual(n,"color",r)}),i.count()&&n.each(function(t){var e=n.getItemModel(t).getShallow("category");null!=e&&("string"==typeof e&&(e=o["ec-"+e]),n.getItemVisual(t,"color",!0)||n.setItemVisual(t,"color",i.getItemVisual(e,"color")))})})}),ds(function(t){t.eachSeriesByType("graph",function(t){var e=t.getGraph(),i=t.getEdgeData(),n=Jc(t.get("edgeSymbol")),o=Jc(t.get("edgeSymbolSize")),a="lineStyle.color".split("."),r="lineStyle.opacity".split(".");i.setVisual("fromSymbol",n&&n[0]),i.setVisual("toSymbol",n&&n[1]),i.setVisual("fromSymbolSize",o&&o[0]),i.setVisual("toSymbolSize",o&&o[1]),i.setVisual("color",t.get(a)),i.setVisual("opacity",t.get(r)),i.each(function(t){var n=i.getItemModel(t),o=e.getEdgeByIndex(t),s=Jc(n.getShallow("symbol",!0)),l=Jc(n.getShallow("symbolSize",!0)),h=n.get(a),u=n.get(r);switch(h){case"source":h=o.node1.getVisual("color");break;case"target":h=o.node2.getVisual("color")}s[0]&&o.setVisual("fromSymbol",s[0]),s[1]&&o.setVisual("toSymbol",s[1]),l[0]&&o.setVisual("fromSymbolSize",l[0]),l[1]&&o.setVisual("toSymbolSize",l[1]),o.setVisual("color",h),o.setVisual("opacity",u)})})}),cs(function(t,e){t.eachSeriesByType("graph",function(t){var e=t.get("layout"),i=t.coordinateSystem;if(i&&"view"!==i.type){var n=t.getData(),o=[];d(i.dimensions,function(t){o=o.concat(n.mapDimension(t,!0))});for(var a=0;a<n.count();a++){for(var r=[],s=!1,l=0;l<o.length;l++){var h=n.get(o[l],a);isNaN(h)||(s=!0),r.push(h)}s?n.setItemLayout(a,i.dataToPoint(r)):n.setItemLayout(a,[NaN,NaN])}td(n.graph)}else e&&"none"!==e||Qc(t)})}),cs(function(t){t.eachSeriesByType("graph",function(t){"circular"===t.get("layout")&&ed(t)})}),cs(function(t){t.eachSeriesByType("graph",function(t){var e=t.coordinateSystem;if(!e||"view"===e.type)if("force"===t.get("layout")){var i=t.preservedPoints||{},n=t.getGraph(),o=n.data,a=n.edgeData,r=t.getModel("force"),s=r.get("initLayout");t.preservedPoints?o.each(function(t){var e=o.getId(t);o.setItemLayout(t,i[e]||[NaN,NaN])}):s&&"none"!==s?"circular"===s&&ed(t):Qc(t);var l=o.getDataExtent("value"),h=a.getDataExtent("value"),u=r.get("repulsion"),c=r.get("edgeLength");y(u)||(u=[u,u]),y(c)||(c=[c,c]),c=[c[1],c[0]];var d=o.mapArray("value",function(t,e){var i=o.getItemLayout(e),n=Io(t,l,u);return isNaN(n)&&(n=(u[0]+u[1])/2),{w:n,rep:n,fixed:o.getItemModel(e).get("fixed"),p:!i||isNaN(i[0])||isNaN(i[1])?null:i}}),f=a.mapArray("value",function(t,e){var i=n.getEdgeByIndex(e),o=Io(t,h,c);return isNaN(o)&&(o=(c[0]+c[1])/2),{n1:d[i.node1.dataIndex],n2:d[i.node2.dataIndex],d:o,curveness:i.getModel().get("lineStyle.curveness")||0}}),p=(e=t.coordinateSystem).getBoundingRect(),g=id(d,f,{rect:p,gravity:r.get("gravity")}),m=g.step;g.step=function(t){for(var e=0,a=d.length;e<a;e++)d[e].fixed&&G(d[e].p,n.getNodeByIndex(e).getLayout());m(function(e,a,r){for(var s=0,l=e.length;s<l;s++)e[s].fixed||n.getNodeByIndex(s).setLayout(e[s].p),i[o.getId(s)]=e[s].p;for(var s=0,l=a.length;s<l;s++){var h=a[s],u=n.getEdgeByIndex(s),c=h.n1.p,d=h.n2.p,f=u.getLayout();(f=f?f.slice():[])[0]=f[0]||[],f[1]=f[1]||[],G(f[0],c),G(f[1],d),+h.curveness&&(f[2]=[(c[0]+d[0])/2-(c[1]-d[1])*h.curveness,(c[1]+d[1])/2-(d[0]-c[0])*h.curveness]),u.setLayout(f)}t&&t(r)})},t.forceLayout=g,t.preservedPoints=i,g.step()}else t.forceLayout=null})}),us("graphView",{create:function(t,e){var i=[];return t.eachSeriesByType("graph",function(t){var n=t.get("coordinateSystem");if(!n||"view"===n){var o=t.getData(),a=[],r=[];an(o.mapArray(function(t){var e=o.getItemModel(t);return[+e.get("x"),+e.get("y")]}),a,r),r[0]-a[0]==0&&(r[0]+=1,a[0]-=1),r[1]-a[1]==0&&(r[1]+=1,a[1]-=1);var s=(r[0]-a[0])/(r[1]-a[1]),l=nd(t,e,s);isNaN(s)&&(a=[l.x,l.y],r=[l.x+l.width,l.y+l.height]);var h=r[0]-a[0],u=r[1]-a[1],c=l.width,d=l.height,f=t.coordinateSystem=new su;f.zoomLimit=t.get("scaleLimit"),f.setBoundingRect(a[0],a[1],h,u),f.setViewRect(l.x,l.y,c,d),f.setCenter(t.get("center")),f.setZoom(t.get("zoom")),i.push(f)}}),i}});uM.extend({type:"series.gauge",getInitialData:function(t,e){var i=t.data||[];return y(i)||(i=[i]),t.data=i,rA(this,["value"])},defaultOption:{zlevel:0,z:2,center:["50%","50%"],legendHoverLink:!0,radius:"75%",startAngle:225,endAngle:-45,clockwise:!0,min:0,max:100,splitNumber:10,axisLine:{show:!0,lineStyle:{color:[[.2,"#91c7ae"],[.8,"#63869e"],[1,"#c23531"]],width:30}},splitLine:{show:!0,length:30,lineStyle:{color:"#eee",width:2,type:"solid"}},axisTick:{show:!0,splitNumber:5,length:8,lineStyle:{color:"#eee",width:1,type:"solid"}},axisLabel:{show:!0,distance:5,color:"auto"},pointer:{show:!0,length:"80%",width:8},itemStyle:{color:"auto"},title:{show:!0,offsetCenter:[0,"-40%"],color:"#333",fontSize:15},detail:{show:!0,backgroundColor:"rgba(0,0,0,0)",borderWidth:0,borderColor:"#ccc",width:100,height:null,padding:[5,10],offsetCenter:[0,"40%"],color:"auto",fontSize:30}}});var GD=Mn.extend({type:"echartsGaugePointer",shape:{angle:0,width:10,r:10,x:0,y:0},buildPath:function(t,e){var i=Math.cos,n=Math.sin,o=e.r,a=e.width,r=e.angle,s=e.x-i(r)*a*(a>=o/3?1:2),l=e.y-n(r)*a*(a>=o/3?1:2);r=e.angle-Math.PI/2,t.moveTo(s,l),t.lineTo(e.x+i(r)*a,e.y+n(r)*a),t.lineTo(e.x+i(e.angle)*o,e.y+n(e.angle)*o),t.lineTo(e.x-i(r)*a,e.y-n(r)*a),t.lineTo(s,l)}}),WD=2*Math.PI,FD=(cr.extend({type:"gauge",render:function(t,e,i){this.group.removeAll();var n=t.get("axisLine.lineStyle.color"),o=od(t,i);this._renderMain(t,e,i,n,o)},dispose:function(){},_renderMain:function(t,e,i,n,o){for(var a=this.group,r=t.getModel("axisLine").getModel("lineStyle"),s=t.get("clockwise"),l=-t.get("startAngle")/180*Math.PI,h=-t.get("endAngle")/180*Math.PI,u=(h-l)%WD,c=l,d=r.get("width"),f=0;f<n.length;f++){var p=Math.min(Math.max(n[f][0],0),1),g=new Ob({shape:{startAngle:c,endAngle:h=l+u*p,cx:o.cx,cy:o.cy,clockwise:s,r0:o.r-d,r:o.r},silent:!0});g.setStyle({fill:n[f][1]}),g.setStyle(r.getLineStyle(["color","borderWidth","borderColor"])),a.add(g),c=h}var m=function(t){if(t<=0)return n[0][1];for(var e=0;e<n.length;e++)if(n[e][0]>=t&&(0===e?0:n[e-1][0])<t)return n[e][1];return n[e-1][1]};if(!s){var v=l;l=h,h=v}this._renderTicks(t,e,i,m,o,l,h,s),this._renderPointer(t,e,i,m,o,l,h,s),this._renderTitle(t,e,i,m,o),this._renderDetail(t,e,i,m,o)},_renderTicks:function(t,e,i,n,o,a,r,s){for(var l=this.group,h=o.cx,u=o.cy,c=o.r,d=+t.get("min"),f=+t.get("max"),p=t.getModel("splitLine"),g=t.getModel("axisTick"),m=t.getModel("axisLabel"),v=t.get("splitNumber"),y=g.get("splitNumber"),x=To(p.get("length"),c),_=To(g.get("length"),c),w=a,b=(r-a)/v,S=b/y,M=p.getModel("lineStyle").getLineStyle(),I=g.getModel("lineStyle").getLineStyle(),T=0;T<=v;T++){var A=Math.cos(w),D=Math.sin(w);if(p.get("show")){var C=new Gb({shape:{x1:A*c+h,y1:D*c+u,x2:A*(c-x)+h,y2:D*(c-x)+u},style:M,silent:!0});"auto"===M.stroke&&C.setStyle({stroke:n(T/v)}),l.add(C)}if(m.get("show")){var L=ad(Ao(T/v*(f-d)+d),m.get("formatter")),k=m.get("distance"),P=n(T/v);l.add(new Cb({style:io({},m,{text:L,x:A*(c-x-k)+h,y:D*(c-x-k)+u,textVerticalAlign:D<-.4?"top":D>.4?"bottom":"middle",textAlign:A<-.4?"left":A>.4?"right":"center"},{autoColor:P}),silent:!0}))}if(g.get("show")&&T!==v){for(var O=0;O<=y;O++){var A=Math.cos(w),D=Math.sin(w),N=new Gb({shape:{x1:A*c+h,y1:D*c+u,x2:A*(c-_)+h,y2:D*(c-_)+u},silent:!0,style:I});"auto"===I.stroke&&N.setStyle({stroke:n((T+O/y)/v)}),l.add(N),w+=S}w-=S}else w+=b}},_renderPointer:function(t,e,i,n,o,a,r,s){var l=this.group,h=this._data;if(t.get("pointer.show")){var u=[+t.get("min"),+t.get("max")],c=[a,r],d=t.getData(),f=d.mapDimension("value");d.diff(h).add(function(e){var i=new GD({shape:{angle:a}});fo(i,{shape:{angle:Io(d.get(f,e),u,c,!0)}},t),l.add(i),d.setItemGraphicEl(e,i)}).update(function(e,i){var n=h.getItemGraphicEl(i);co(n,{shape:{angle:Io(d.get(f,e),u,c,!0)}},t),l.add(n),d.setItemGraphicEl(e,n)}).remove(function(t){var e=h.getItemGraphicEl(t);l.remove(e)}).execute(),d.eachItemGraphicEl(function(t,e){var i=d.getItemModel(e),a=i.getModel("pointer");t.setShape({x:o.cx,y:o.cy,width:To(a.get("width"),o.r),r:To(a.get("length"),o.r)}),t.useStyle(i.getModel("itemStyle").getItemStyle()),"auto"===t.style.fill&&t.setStyle("fill",n(Io(d.get(f,e),u,[0,1],!0))),to(t,i.getModel("emphasis.itemStyle").getItemStyle())}),this._data=d}else h&&h.eachItemGraphicEl(function(t){l.remove(t)})},_renderTitle:function(t,e,i,n,o){var a=t.getData(),r=a.mapDimension("value"),s=t.getModel("title");if(s.get("show")){var l=s.get("offsetCenter"),h=o.cx+To(l[0],o.r),u=o.cy+To(l[1],o.r),c=+t.get("min"),d=+t.get("max"),f=n(Io(t.getData().get(r,0),[c,d],[0,1],!0));this.group.add(new Cb({silent:!0,style:io({},s,{x:h,y:u,text:a.getName(0),textAlign:"center",textVerticalAlign:"middle"},{autoColor:f,forceRich:!0})}))}},_renderDetail:function(t,e,i,n,o){var a=t.getModel("detail"),r=+t.get("min"),s=+t.get("max");if(a.get("show")){var l=a.get("offsetCenter"),h=o.cx+To(l[0],o.r),u=o.cy+To(l[1],o.r),c=To(a.get("width"),o.r),d=To(a.get("height"),o.r),f=t.getData(),p=f.get(f.mapDimension("value"),0),g=n(Io(p,[r,s],[0,1],!0));this.group.add(new Cb({silent:!0,style:io({},a,{x:h,y:u,text:ad(p,a.get("formatter")),textWidth:isNaN(c)?null:c,textHeight:isNaN(d)?null:d,textAlign:"center",textVerticalAlign:"middle"},{autoColor:g,forceRich:!0})}))}}}),vs({type:"series.funnel",init:function(t){FD.superApply(this,"init",arguments),this.legendDataProvider=function(){return this.getRawData()},this._defaultLabelLine(t)},getInitialData:function(t,e){return rA(this,["value"])},_defaultLabelLine:function(t){Mi(t,"labelLine",["show"]);var e=t.labelLine,i=t.emphasis.labelLine;e.show=e.show&&t.label.show,i.show=i.show&&t.emphasis.label.show},getDataParams:function(t){var e=this.getData(),i=FD.superCall(this,"getDataParams",t),n=e.mapDimension("value"),o=e.getSum(n);return i.percent=o?+(e.get(n,t)/o*100).toFixed(2):0,i.$vars.push("percent"),i},defaultOption:{zlevel:0,z:2,legendHoverLink:!0,left:80,top:60,right:80,bottom:60,minSize:"0%",maxSize:"100%",sort:"descending",gap:0,funnelAlign:"center",label:{show:!0,position:"outer"},labelLine:{show:!0,length:20,lineStyle:{width:1,type:"solid"}},itemStyle:{borderColor:"#fff",borderWidth:1},emphasis:{label:{show:!0}}}})),HD=rd.prototype,ZD=["itemStyle","opacity"];HD.updateData=function(t,e,i){var n=this.childAt(0),o=t.hostModel,a=t.getItemModel(e),s=t.getItemLayout(e),l=t.getItemModel(e).get(ZD);l=null==l?1:l,n.useStyle({}),i?(n.setShape({points:s.points}),n.setStyle({opacity:0}),fo(n,{style:{opacity:l}},o,e)):co(n,{style:{opacity:l},shape:{points:s.points}},o,e);var h=a.getModel("itemStyle"),u=t.getItemVisual(e,"color");n.setStyle(r({lineJoin:"round",fill:u},h.getItemStyle(["opacity"]))),n.hoverStyle=h.getModel("emphasis").getItemStyle(),this._updateLabel(t,e),to(this)},HD._updateLabel=function(t,e){var i=this.childAt(1),n=this.childAt(2),o=t.hostModel,a=t.getItemModel(e),r=t.getItemLayout(e).label,s=t.getItemVisual(e,"color");co(i,{shape:{points:r.linePoints||r.linePoints}},o,e),co(n,{style:{x:r.x,y:r.y}},o,e),n.attr({rotation:r.rotation,origin:[r.x,r.y],z2:10});var l=a.getModel("label"),h=a.getModel("emphasis.label"),u=a.getModel("labelLine"),c=a.getModel("emphasis.labelLine"),s=t.getItemVisual(e,"color");eo(n.style,n.hoverStyle={},l,h,{labelFetcher:t.hostModel,labelDataIndex:e,defaultText:t.getName(e),autoColor:s,useInsideStyle:!!r.inside},{textAlign:r.textAlign,textVerticalAlign:r.verticalAlign}),n.ignore=n.normalIgnore=!l.get("show"),n.hoverIgnore=!h.get("show"),i.ignore=i.normalIgnore=!u.get("show"),i.hoverIgnore=!c.get("show"),i.setStyle({stroke:s}),i.setStyle(u.getModel("lineStyle").getLineStyle()),i.hoverStyle=c.getModel("lineStyle").getLineStyle()},h(rd,S_);cr.extend({type:"funnel",render:function(t,e,i){var n=t.getData(),o=this._data,a=this.group;n.diff(o).add(function(t){var e=new rd(n,t);n.setItemGraphicEl(t,e),a.add(e)}).update(function(t,e){var i=o.getItemGraphicEl(e);i.updateData(n,t),a.add(i),n.setItemGraphicEl(t,i)}).remove(function(t){var e=o.getItemGraphicEl(t);a.remove(e)}).execute(),this._data=n},remove:function(){this.group.removeAll(),this._data=null},dispose:function(){}});ds(cA("funnel")),cs(function(t,e,i){t.eachSeriesByType("funnel",function(t){var i=t.getData(),n=i.mapDimension("value"),o=t.get("sort"),a=sd(t,e),r=ld(i,o),s=[To(t.get("minSize"),a.width),To(t.get("maxSize"),a.width)],l=i.getDataExtent(n),h=t.get("min"),u=t.get("max");null==h&&(h=Math.min(l[0],0)),null==u&&(u=l[1]);var c=t.get("funnelAlign"),d=t.get("gap"),f=(a.height-d*(i.count()-1))/i.count(),p=a.y,g=function(t,e){var o,r=Io(i.get(n,t)||0,[h,u],s,!0);switch(c){case"left":o=a.x;break;case"center":o=a.x+(a.width-r)/2;break;case"right":o=a.x+a.width-r}return[[o,e],[o+r,e]]};"ascending"===o&&(f=-f,d=-d,p+=a.height,r=r.reverse());for(var m=0;m<r.length;m++){var v=r[m],y=r[m+1],x=i.getItemModel(v).get("itemStyle.height");null==x?x=f:(x=To(x,a.height),"ascending"===o&&(x=-x));var _=g(v,p),w=g(y,p+x);p+=x+d,i.setItemLayout(v,{points:_.concat(w.slice().reverse())})}hd(i)})}),ls(gA("funnel"));var UD=function(t,e,i,n,o){nT.call(this,t,e,i),this.type=n||"value",this.axisIndex=o};UD.prototype={constructor:UD,model:null,isHorizontal:function(){return"horizontal"!==this.coordinateSystem.getModel().get("layout")}},h(UD,nT);var jD=function(t,e,i,n,o,a){e[0]=fd(e[0],i),e[1]=fd(e[1],i),t=t||0;var r=i[1]-i[0];null!=o&&(o=fd(o,[0,r])),null!=a&&(a=Math.max(a,null!=o?o:0)),"all"===n&&(o=a=Math.abs(e[1]-e[0]),n=0);var s=dd(e,n);e[n]+=t;var l=o||0,h=i.slice();s.sign<0?h[0]+=l:h[1]-=l,e[n]=fd(e[n],h);u=dd(e,n);null!=o&&(u.sign!==s.sign||u.span<o)&&(e[1-n]=e[n]+s.sign*o);var u=dd(e,n);return null!=a&&u.span>a&&(e[1-n]=e[n]+u.sign*a),e},XD=d,YD=Math.min,qD=Math.max,$D=Math.floor,KD=Math.ceil,JD=Ao,QD=Math.PI;pd.prototype={type:"parallel",constructor:pd,_init:function(t,e,i){var n=t.dimensions,o=t.parallelAxisIndex;XD(n,function(t,i){var n=o[i],a=e.getComponent("parallelAxis",n),r=this._axesMap.set(t,new UD(t,sl(a),[0,0],a.get("type"),n)),s="category"===r.type;r.onBand=s&&a.get("boundaryGap"),r.inverse=a.get("inverse"),a.axis=r,r.model=a,r.coordinateSystem=a.coordinateSystem=this},this)},update:function(t,e){this._updateAxesFromSeries(this._model,t)},containPoint:function(t){var e=this._makeLayoutInfo(),i=e.axisBase,n=e.layoutBase,o=e.pixelDimIndex,a=t[1-o],r=t[o];return a>=i&&a<=i+e.axisLength&&r>=n&&r<=n+e.layoutLength},getModel:function(){return this._model},_updateAxesFromSeries:function(t,e){e.eachSeries(function(i){if(t.contains(i,e)){var n=i.getData();XD(this.dimensions,function(t){var e=this._axesMap.get(t);e.scale.unionExtentFromData(n,n.mapDimension(t)),rl(e.scale,e.model)},this)}},this)},resize:function(t,e){this._rect=Ko(t.getBoxLayoutParams(),{width:e.getWidth(),height:e.getHeight()}),this._layoutAxes()},getRect:function(){return this._rect},_makeLayoutInfo:function(){var t,e=this._model,i=this._rect,n=["x","y"],o=["width","height"],a=e.get("layout"),r="horizontal"===a?0:1,s=i[o[r]],l=[0,s],h=this.dimensions.length,u=gd(e.get("axisExpandWidth"),l),c=gd(e.get("axisExpandCount")||0,[0,h]),d=e.get("axisExpandable")&&h>3&&h>c&&c>1&&u>0&&s>0,f=e.get("axisExpandWindow");f?(t=gd(f[1]-f[0],l),f[1]=f[0]+t):(t=gd(u*(c-1),l),(f=[u*(e.get("axisExpandCenter")||$D(h/2))-t/2])[1]=f[0]+t);var p=(s-t)/(h-c);p<3&&(p=0);var g=[$D(JD(f[0]/u,1))+1,KD(JD(f[1]/u,1))-1],m=p/u*f[0];return{layout:a,pixelDimIndex:r,layoutBase:i[n[r]],layoutLength:s,axisBase:i[n[1-r]],axisLength:i[o[1-r]],axisExpandable:d,axisExpandWidth:u,axisCollapseWidth:p,axisExpandWindow:f,axisCount:h,winInnerIndices:g,axisExpandWindow0Pos:m}},_layoutAxes:function(){var t=this._rect,e=this._axesMap,i=this.dimensions,n=this._makeLayoutInfo(),o=n.layout;e.each(function(t){var e=[0,n.axisLength],i=t.inverse?1:0;t.setExtent(e[i],e[1-i])}),XD(i,function(i,a){var r=(n.axisExpandable?vd:md)(a,n),s={horizontal:{x:r.position,y:n.axisLength},vertical:{x:0,y:r.position}},l={horizontal:QD/2,vertical:0},h=[s[o].x+t.x,s[o].y+t.y],u=l[o],c=st();dt(c,c,u),ct(c,c,h),this._axesLayout[i]={position:h,rotation:u,transform:c,axisNameAvailableWidth:r.axisNameAvailableWidth,axisLabelShow:r.axisLabelShow,nameTruncateMaxWidth:r.nameTruncateMaxWidth,tickDirection:1,labelDirection:1,labelInterval:e.get(i).getLabelInterval()}},this)},getAxis:function(t){return this._axesMap.get(t)},dataToPoint:function(t,e){return this.axisCoordToPoint(this._axesMap.get(e).dataToCoord(t),e)},eachActiveState:function(t,e,i){for(var n=this.dimensions,o=f(n,function(e){return t.mapDimension(e)}),a=this._axesMap,r=this.hasAxisBrushed(),s=0,l=t.count();s<l;s++){var h,u=t.getValues(o,s);if(r){h="active";for(var c=0,d=n.length;c<d;c++){var p=n[c];if("inactive"===a.get(p).model.getActiveState(u[c],c)){h="inactive";break}}}else h="normal";e.call(i,h,s)}},hasAxisBrushed:function(){for(var t=this.dimensions,e=this._axesMap,i=!1,n=0,o=t.length;n<o;n++)"normal"!==e.get(t[n]).model.getActiveState()&&(i=!0);return i},axisCoordToPoint:function(t,e){return go([t,0],this._axesLayout[e].transform)},getAxisLayout:function(t){return i(this._axesLayout[t])},getSlidedAxisExpandWindow:function(t){var e=this._makeLayoutInfo(),i=e.pixelDimIndex,n=e.axisExpandWindow.slice(),o=n[1]-n[0],a=[0,e.axisExpandWidth*(e.axisCount-1)];if(!this.containPoint(t))return{behavior:"none",axisExpandWindow:n};var r,s=t[i]-e.layoutBase-e.axisExpandWindow0Pos,l="slide",h=e.axisCollapseWidth,u=this._model.get("axisExpandSlideTriggerArea"),c=null!=u[0];if(h)c&&h&&s<o*u[0]?(l="jump",r=s-o*u[2]):c&&h&&s>o*(1-u[0])?(l="jump",r=s-o*(1-u[2])):(r=s-o*u[1])>=0&&(r=s-o*(1-u[1]))<=0&&(r=0),(r*=e.axisExpandWidth/h)?jD(r,n,a,"all"):l="none";else{o=n[1]-n[0];(n=[qD(0,a[1]*s/o-o/2)])[1]=YD(a[1],n[0]+o),n[0]=n[1]-o}return{axisExpandWindow:n,behavior:l}}},Aa.register("parallel",{create:function(t,e){var i=[];return t.eachComponent("parallel",function(n,o){var a=new pd(n,t,e);a.name="parallel_"+o,a.resize(n,e),n.coordinateSystem=a,a.model=n,i.push(a)}),t.eachSeries(function(e){if("parallel"===e.get("coordinateSystem")){var i=t.queryComponents({mainType:"parallel",index:e.get("parallelIndex"),id:e.get("parallelId")})[0];e.coordinateSystem=i.coordinateSystem}}),i}});var tC=IS.extend({type:"baseParallelAxis",axis:null,activeIntervals:[],getAreaSelectStyle:function(){return Sw([["fill","color"],["lineWidth","borderWidth"],["stroke","borderColor"],["width","width"],["opacity","opacity"]])(this.getModel("areaSelectStyle"))},setActiveIntervals:function(t){var e=this.activeIntervals=i(t);if(e)for(var n=e.length-1;n>=0;n--)Do(e[n])},getActiveState:function(t){var e=this.activeIntervals;if(!e.length)return"normal";if(null==t)return"inactive";for(var i=0,n=e.length;i<n;i++)if(e[i][0]<=t&&t<=e[i][1])return"active";return"inactive"}}),eC={type:"value",dim:null,areaSelectStyle:{width:20,borderWidth:1,borderColor:"rgba(160,197,232)",color:"rgba(160,197,232)",opacity:.3},realtime:!0,z:10};n(tC.prototype,ZI),kT("parallel",tC,function(t,e){return e.type||(e.data?"category":"value")},eC),IS.extend({type:"parallel",dependencies:["parallelAxis"],coordinateSystem:null,dimensions:null,parallelAxisIndex:null,layoutMode:"box",defaultOption:{zlevel:0,z:0,left:80,top:60,right:80,bottom:60,layout:"horizontal",axisExpandable:!1,axisExpandCenter:null,axisExpandCount:0,axisExpandWidth:50,axisExpandRate:17,axisExpandDebounce:50,axisExpandSlideTriggerArea:[-.15,.05,.4],axisExpandTriggerOn:"click",parallelAxisDefault:null},init:function(){IS.prototype.init.apply(this,arguments),this.mergeOption({})},mergeOption:function(t){var e=this.option;t&&n(e,t,!0),this._initDimensions()},contains:function(t,e){var i=t.get("parallelIndex");return null!=i&&e.getComponent("parallel",i)===this},setAxisExpand:function(t){d(["axisExpandable","axisExpandCenter","axisExpandCount","axisExpandWidth","axisExpandWindow"],function(e){t.hasOwnProperty(e)&&(this.option[e]=t[e])},this)},_initDimensions:function(){var t=this.dimensions=[],e=this.parallelAxisIndex=[];d(g(this.dependentModels.parallelAxis,function(t){return(t.get("parallelIndex")||0)===this.componentIndex},this),function(i){t.push("dim"+i.get("dim")),e.push(i.componentIndex)})}}),hs({type:"axisAreaSelect",event:"axisAreaSelected"},function(t,e){e.eachComponent({mainType:"parallelAxis",query:t},function(e){e.axis.model.setActiveIntervals(t.intervals)})}),hs("parallelAxisExpand",function(t,e){e.eachComponent({mainType:"parallel",query:t},function(e){e.setAxisExpand(t)})});var iC=v,nC=d,oC=f,aC=Math.min,rC=Math.max,sC=Math.pow,lC=1e4,hC=6,uC=6,cC="globalPan",dC={w:[0,0],e:[0,1],n:[1,0],s:[1,1]},fC={w:"ew",e:"ew",n:"ns",s:"ns",ne:"nesw",sw:"nesw",nw:"nwse",se:"nwse"},pC={brushStyle:{lineWidth:2,stroke:"rgba(0,0,0,0.3)",fill:"rgba(0,0,0,0.1)"},transformable:!0,brushMode:"single",removeOnClick:!1},gC=0;yd.prototype={constructor:yd,enableBrush:function(t){return this._brushType&&_d(this),t.brushType&&xd(this,t),this},setPanels:function(t){if(t&&t.length){var e=this._panels={};d(t,function(t){e[t.panelId]=i(t)})}else this._panels=null;return this},mount:function(t){t=t||{},this._enableGlobalPan=t.enableGlobalPan;var e=this.group;return this._zr.add(e),e.attr({position:t.position||[0,0],rotation:t.rotation||0,scale:t.scale||[1,1]}),this._transform=e.getLocalTransform(),this},eachCover:function(t,e){nC(this._covers,t,e)},updateCovers:function(t){function e(t,e){return(null!=t.id?t.id:a+e)+"-"+t.brushType}function o(e,i){var n=t[e];if(null!=i&&r[i]===h)s[e]=r[i];else{var o=s[e]=null!=i?(r[i].__brushOption=n,r[i]):bd(l,wd(l,n));Id(l,o)}}t=f(t,function(t){return n(i(pC),t,!0)});var a="\0-brush-index-",r=this._covers,s=this._covers=[],l=this,h=this._creatingCover;return new ws(r,t,function(t,i){return e(t.__brushOption,i)},e).add(o).update(o).remove(function(t){r[t]!==h&&l.group.remove(r[t])}).execute(),this},unmount:function(){return this.enableBrush(!1),Cd(this),this._zr.remove(this.group),this},dispose:function(){this.unmount(),this.off()}},u(yd,Hx);var mC={mousedown:function(t){if(this._dragging)Kd.call(this,t);else if(!t.target||!t.target.draggable){Xd(t);var e=this.group.transformCoordToLocal(t.offsetX,t.offsetY);this._creatingCover=null,(this._creatingPanel=Ad(this,t,e))&&(this._dragging=!0,this._track=[e.slice()])}},mousemove:function(t){var e=this.group.transformCoordToLocal(t.offsetX,t.offsetY);if(jd(this,t,e),this._dragging){Xd(t);var i=qd(this,t,e,!1);i&&Ld(this,i)}},mouseup:Kd},vC={lineX:Jd(0),lineY:Jd(1),rect:{createCover:function(t,e){return Od(iC(Wd,function(t){return t},function(t){return t}),t,e,["w","e","n","s","se","sw","ne","nw"])},getCreatingRange:function(t){var e=Pd(t);return Bd(e[1][0],e[1][1],e[0][0],e[0][1])},updateCoverShape:function(t,e,i,n){Nd(t,e,i,n)},updateCommon:Ed,contain:Yd},polygon:{createCover:function(t,e){var i=new S_;return i.add(new Bb({name:"main",style:Rd(e),silent:!0})),i},getCreatingRange:function(t){return t},endCreating:function(t,e){e.remove(e.childAt(0)),e.add(new Rb({name:"main",draggable:!0,drift:iC(Fd,t,e),ondragend:iC(Ld,t,{isEnd:!0})}))},updateCoverShape:function(t,e,i,n){e.childAt(0).setShape({points:Zd(t,e,i)})},updateCommon:Ed,contain:Yd}},yC=["axisLine","axisTickLabel","axisName"],xC=ms({type:"parallelAxis",init:function(t,e){xC.superApply(this,"init",arguments),(this._brushController=new yd(e.getZr())).on("brush",m(this._onBrush,this))},render:function(t,e,i,n){if(!of(t,e,n)){this.axisModel=t,this.api=i,this.group.removeAll();var o=this._axisGroup;if(this._axisGroup=new S_,this.group.add(this._axisGroup),t.get("show")){var r=rf(t,e),s=r.coordinateSystem,l=t.getAreaSelectStyle(),h=l.width,u=t.axis.dim,c=a({strokeContainThreshold:h},s.getAxisLayout(u)),f=new GT(t,c);d(yC,f.add,f),this._axisGroup.add(f.getGroup()),this._refreshBrushController(c,l,t,r,h,i);var p=n&&!1===n.animation?null:t;vo(o,this._axisGroup,p)}}},_refreshBrushController:function(t,e,i,n,o,a){var r=i.axis.getExtent(),s=r[1]-r[0],l=Math.min(30,.1*Math.abs(s)),h=Kt.create({x:r[0],y:-o/2,width:s,height:o});h.x-=l,h.width+=2*l,this._brushController.mount({enableGlobalPan:!0,rotation:t.rotation,position:t.position}).setPanels([{panelId:"pl",clipPath:Qd(h),isTargetByCursor:ef(h,a,n),getLinearBrushOtherExtent:tf(h,0)}]).enableBrush({brushType:"lineX",brushStyle:e,removeOnClick:!0}).updateCovers(af(i))},_onBrush:function(t,e){var i=this.axisModel,n=i.axis,o=f(t,function(t){return[n.coordToData(t.range[0],!0),n.coordToData(t.range[1],!0)]});(!i.option.realtime===e.isEnd||e.removeOnClick)&&this.api.dispatchAction({type:"axisAreaSelect",parallelAxisId:i.id,intervals:o})},dispose:function(){this._brushController.dispose()}});ms({type:"parallel",render:function(t,e,i){this._model=t,this._api=i,this._handlers||(this._handlers={},d(_C,function(t,e){i.getZr().on(e,this._handlers[e]=m(t,this))},this)),yr(this,"_throttledDispatchExpand",t.get("axisExpandRate"),"fixRate")},dispose:function(t,e){d(this._handlers,function(t,i){e.getZr().off(i,t)}),this._handlers=null},_throttledDispatchExpand:function(t){this._dispatchExpand(t)},_dispatchExpand:function(t){t&&this._api.dispatchAction(a({type:"parallelAxisExpand"},t))}});var _C={mousedown:function(t){sf(this,"click")&&(this._mouseDownPoint=[t.offsetX,t.offsetY])},mouseup:function(t){var e=this._mouseDownPoint;if(sf(this,"click")&&e){var i=[t.offsetX,t.offsetY];if(Math.pow(e[0]-i[0],2)+Math.pow(e[1]-i[1],2)>5)return;var n=this._model.coordinateSystem.getSlidedAxisExpandWindow([t.offsetX,t.offsetY]);"none"!==n.behavior&&this._dispatchExpand({axisExpandWindow:n.axisExpandWindow})}this._mouseDownPoint=null},mousemove:function(t){if(!this._mouseDownPoint&&sf(this,"mousemove")){var e=this._model,i=e.coordinateSystem.getSlidedAxisExpandWindow([t.offsetX,t.offsetY]),n=i.behavior;"jump"===n&&this._throttledDispatchExpand.debounceNextCall(e.get("axisExpandDebounce")),this._throttledDispatchExpand("none"===n?null:{axisExpandWindow:i.axisExpandWindow,animation:"jump"===n&&null})}}};ss(function(t){ud(t),cd(t)}),uM.extend({type:"series.parallel",dependencies:["parallel"],visualColorAccessPath:"lineStyle.color",getInitialData:function(t,e){this.option.progressive&&(this.option.animation=!1);var i=this.getSource();return lf(i,this),Bs(i,this)},getRawIndicesByActiveState:function(t){var e=this.coordinateSystem,i=this.getData(),n=[];return e.eachActiveState(i,function(e,o){t===e&&n.push(i.getRawIndex(o))}),n},defaultOption:{zlevel:0,z:2,coordinateSystem:"parallel",parallelIndex:0,label:{show:!1},inactiveOpacity:.05,activeOpacity:1,lineStyle:{width:1,opacity:.45,type:"solid"},emphasis:{label:{show:!1}},progressive:!1,smooth:!1,animationEasing:"linear"}});cr.extend({type:"parallel",init:function(){this._dataGroup=new S_,this.group.add(this._dataGroup),this._data},render:function(t,e,i,n){this._renderForNormal(t,n)},dispose:function(){},_renderForNormal:function(t,e){var i=this._dataGroup,n=t.getData(),o=this._data,a=t.coordinateSystem,r=a.dimensions,s=t.option.smooth?.3:null;if(n.diff(o).add(function(t){df(n,i,t,r,a)}).update(function(i,s){var l=o.getItemGraphicEl(s),h=cf(n,i,r,a);n.setItemGraphicEl(i,l),co(l,{shape:{points:h}},e&&!1===e.animation?null:t,i)}).remove(function(t){var e=o.getItemGraphicEl(t);i.remove(e)}).execute(),ff(n,s),!this._data){var l=uf(a,t,function(){setTimeout(function(){i.removeClipPath()})});i.setClipPath(l)}this._data=n},remove:function(){this._dataGroup&&this._dataGroup.removeAll(),this._data=null}});var wC=["lineStyle","normal","opacity"];ds(function(t){t.eachSeriesByType("parallel",function(e){var i=e.getModel("itemStyle"),n=e.getModel("lineStyle"),o=t.get("color"),a=n.get("color")||i.get("color")||o[e.seriesIndex%o.length],r=e.get("inactiveOpacity"),s=e.get("activeOpacity"),l=e.getModel("lineStyle").getLineStyle(),h=e.coordinateSystem,u=e.getData(),c={normal:l.opacity,active:s,inactive:r};h.eachActiveState(u,function(t,e){var i=u.getItemModel(e),n=c[t];if("normal"===t){var o=i.get(wC,!0);null!=o&&(n=o)}u.setItemVisual(e,"opacity",n)}),u.setVisual("color",a)})});var bC=uM.extend({type:"series.sankey",layoutInfo:null,getInitialData:function(t){var e=t.edges||t.links,i=t.data||t.nodes;if(i&&e)return bD(i,e,this,!0).data},getGraph:function(){return this.getData().graph},getEdgeData:function(){return this.getGraph().edgeData},formatTooltip:function(t,e,i){if("edge"===i){var n=this.getDataParams(t,i),o=n.data,a=o.source+" -- "+o.target;return n.value&&(a+=" : "+n.value),Ho(a)}return bC.superCall(this,"formatTooltip",t,e)},defaultOption:{zlevel:0,z:2,coordinateSystem:"view",layout:null,left:"5%",top:"5%",right:"20%",bottom:"5%",nodeWidth:20,nodeGap:8,layoutIterations:32,label:{show:!0,position:"right",color:"#000",fontSize:12},itemStyle:{borderWidth:1,borderColor:"#333"},lineStyle:{color:"#314656",opacity:.2,curveness:.5},emphasis:{label:{show:!0},lineStyle:{opacity:.6}},animationEasing:"linear",animationDuration:1e3}}),SC=Nn({shape:{x1:0,y1:0,x2:0,y2:0,cpx1:0,cpy1:0,cpx2:0,cpy2:0,extent:0},buildPath:function(t,e){var i=e.extent/2;t.moveTo(e.x1,e.y1-i),t.bezierCurveTo(e.cpx1,e.cpy1-i,e.cpx2,e.cpy2-i,e.x2,e.y2-i),t.lineTo(e.x2,e.y2+i),t.bezierCurveTo(e.cpx2,e.cpy2+i,e.cpx1,e.cpy1+i,e.x1,e.y1+i),t.closePath()}});ys({type:"sankey",_model:null,render:function(t,e,i){var n=t.getGraph(),o=this.group,a=t.layoutInfo,r=t.getData(),s=t.getData("edge");this._model=t,o.removeAll(),o.attr("position",[a.x,a.y]),n.eachEdge(function(e){var i=new SC;i.dataIndex=e.dataIndex,i.seriesIndex=t.seriesIndex,i.dataType="edge";var n=e.getModel("lineStyle"),a=n.get("curveness"),r=e.node1.getLayout(),l=e.node2.getLayout(),h=e.getLayout();i.shape.extent=Math.max(1,h.dy);var u=r.x+r.dx,c=r.y+h.sy+h.dy/2,d=l.x,f=l.y+h.ty+h.dy/2,p=u*(1-a)+d*a,g=c,m=u*a+d*(1-a),v=f;switch(i.setShape({x1:u,y1:c,x2:d,y2:f,cpx1:p,cpy1:g,cpx2:m,cpy2:v}),i.setStyle(n.getItemStyle()),i.style.fill){case"source":i.style.fill=e.node1.getVisual("color");break;case"target":i.style.fill=e.node2.getVisual("color")}to(i,e.getModel("emphasis.lineStyle").getItemStyle()),o.add(i),s.setItemGraphicEl(e.dataIndex,i)}),n.eachNode(function(e){var i=e.getLayout(),n=e.getModel(),a=n.getModel("label"),s=n.getModel("emphasis.label"),l=new Vb({shape:{x:i.x,y:i.y,width:e.getLayout().dx,height:e.getLayout().dy},style:n.getModel("itemStyle").getItemStyle()}),h=e.getModel("emphasis.itemStyle").getItemStyle();eo(l.style,h,a,s,{labelFetcher:t,labelDataIndex:e.dataIndex,defaultText:e.id,isRectText:!0}),l.setStyle("fill",e.getVisual("color")),to(l,h),o.add(l),r.setItemGraphicEl(e.dataIndex,l),l.dataType="node"}),!this._data&&t.get("animation")&&o.setClipPath(gf(o.getBoundingRect(),t,function(){o.removeClipPath()})),this._data=t.getData()},dispose:function(){}});cs(function(t,e,i){t.eachSeriesByType("sankey",function(t){var i=t.get("nodeWidth"),n=t.get("nodeGap"),o=vf(t,e);t.layoutInfo=o;var a=o.width,r=o.height,s=t.getGraph(),l=s.nodes,h=s.edges;xf(l),yf(l,h,i,n,a,r,0!==g(l,function(t){return 0===t.getLayout().value}).length?0:t.get("layoutIterations"))})}),ds(function(t,e){t.eachSeriesByType("sankey",function(t){var e=t.getGraph().nodes;e.sort(function(t,e){return t.getLayout().value-e.getLayout().value});var i=e[0].getLayout().value,n=e[e.length-1].getLayout().value;d(e,function(e){var o=new oD({type:"color",mappingMethod:"linear",dataExtent:[i,n],visual:t.get("color")}).mapValueToVisual(e.getLayout().value);e.setVisual("color",o);var a=e.getModel().get("itemStyle.color");null!=a&&e.setVisual("color",a)})})});var MC=Mn.extend({type:"whiskerInBox",shape:{},buildPath:function(t,e){for(var i in e)if(e.hasOwnProperty(i)&&0===i.indexOf("ends")){var n=e[i];t.moveTo(n[0][0],n[0][1]),t.lineTo(n[1][0],n[1][1])}}}),IC=Bf.prototype;IC._createContent=function(t,e,i){var n=t.getItemLayout(e),o="horizontal"===n.chartLayout?1:0,a=0;this.add(new Rb({shape:{points:i?Vf(n.bodyEnds,o,n):n.bodyEnds},style:{strokeNoScale:!0},z2:100})),this.bodyIndex=a++;var r=f(n.whiskerEnds,function(t){return i?Vf(t,o,n):t});this.add(new MC({shape:Gf(r),style:{strokeNoScale:!0},z2:100})),this.whiskerIndex=a++},IC.updateData=function(t,e,i){var n=this._seriesModel=t.hostModel,o=t.getItemLayout(e),a=tS[i?"initProps":"updateProps"];a(this.childAt(this.bodyIndex),{shape:{points:o.bodyEnds}},n,e),a(this.childAt(this.whiskerIndex),{shape:Gf(o.whiskerEnds)},n,e),this.styleUpdater.call(null,this,t,e)},h(Bf,S_);var TC=Wf.prototype;TC.updateData=function(t){var e=this.group,i=this._data,n=this.styleUpdater;t.diff(i).add(function(i){if(t.hasValue(i)){var o=new Bf(t,i,n,!0);t.setItemGraphicEl(i,o),e.add(o)}}).update(function(o,a){var r=i.getItemGraphicEl(a);t.hasValue(o)?(r?r.updateData(t,o):r=new Bf(t,o,n),e.add(r),t.setItemGraphicEl(o,r)):e.remove(r)}).remove(function(t){var n=i.getItemGraphicEl(t);n&&e.remove(n)}).execute(),this._data=t},TC.remove=function(){var t=this.group,e=this._data;this._data=null,e&&e.eachItemGraphicEl(function(e){e&&t.remove(e)})};var AC={_baseAxisDim:null,getInitialData:function(t,e){var i,n,o=e.getComponent("xAxis",this.get("xAxisIndex")),a=e.getComponent("yAxis",this.get("yAxisIndex")),r=o.get("type"),s=a.get("type");"category"===r?(t.layout="horizontal",i=o.getOrdinalMeta(),n=!0):"category"===s?(t.layout="vertical",i=a.getOrdinalMeta(),n=!0):t.layout=t.layout||"horizontal";var l=["x","y"],h="horizontal"===t.layout?0:1,u=this._baseAxisDim=l[h],c=l[1-h],f=[o,a],p=f[h].get("type"),g=f[1-h].get("type"),m=t.data;if(m&&n){var v=[];d(m,function(t,e){var i;t.value&&y(t.value)?(i=t.value.slice(),t.value.unshift(e)):y(t)?(i=t.slice(),t.unshift(e)):i=t,v.push(i)}),t.data=v}var x=this.defaultValueDimensions;return rA(this,{coordDimensions:[{name:u,type:Ms(p),ordinalMeta:i,otherDims:{tooltip:!1,itemName:0},dimsDef:["base"]},{name:c,type:Ms(g),dimsDef:x.slice()}],dimensionsCount:x.length+1})},getBaseAxis:function(){var t=this._baseAxisDim;return this.ecModel.getComponent(t+"Axis",this.get(t+"AxisIndex")).axis}},DC={init:function(){var t=this._whiskerBoxDraw=new Wf(this.getStyleUpdater());this.group.add(t.group)},render:function(t,e,i){this._whiskerBoxDraw.updateData(t.getData())},remove:function(t){this._whiskerBoxDraw.remove()}};u(uM.extend({type:"series.boxplot",dependencies:["xAxis","yAxis","grid"],defaultValueDimensions:["min","Q1","median","Q3","max"],dimensions:null,defaultOption:{zlevel:0,z:2,coordinateSystem:"cartesian2d",legendHoverLink:!0,hoverAnimation:!0,layout:null,boxWidth:[7,50],itemStyle:{color:"#fff",borderWidth:1},emphasis:{itemStyle:{borderWidth:2,shadowBlur:5,shadowOffsetX:2,shadowOffsetY:2,shadowColor:"rgba(0,0,0,0.4)"}},animationEasing:"elasticOut",animationDuration:800}}),AC,!0),u(cr.extend({type:"boxplot",getStyleUpdater:function(){return Ff},dispose:B}),DC,!0);var CC=["itemStyle"],LC=["emphasis","itemStyle"],kC=["itemStyle","borderColor"],PC=d;ds(function(t,e){var i=t.get("color");t.eachRawSeriesByType("boxplot",function(e){var n=i[e.seriesIndex%i.length],o=e.getData();o.setVisual({legendSymbol:"roundRect",color:e.get(kC)||n}),t.isSeriesFiltered(e)||o.each(function(t){var e=o.getItemModel(t);o.setItemVisual(t,{color:e.get(kC,!0)})})})}),cs(function(t){var e=Hf(t);PC(e,function(t){var e=t.seriesModels;e.length&&(Zf(t),PC(e,function(e,i){Uf(e,t.boxOffsetList[i],t.boxWidthList[i])}))})}),u(uM.extend({type:"series.candlestick",dependencies:["xAxis","yAxis","grid"],defaultValueDimensions:["open","close","lowest","highest"],dimensions:null,defaultOption:{zlevel:0,z:2,coordinateSystem:"cartesian2d",legendHoverLink:!0,hoverAnimation:!0,layout:null,itemStyle:{color:"#c23531",color0:"#314656",borderWidth:1,borderColor:"#c23531",borderColor0:"#314656"},emphasis:{itemStyle:{borderWidth:2}},barMaxWidth:null,barMinWidth:null,barWidth:null,animationUpdate:!1,animationEasing:"linear",animationDuration:300},getShadowDim:function(){return"open"},brushSelector:function(t,e,i){var n=e.getItemLayout(t);return i.rect(n.brushRect)}}),AC,!0),u(cr.extend({type:"candlestick",getStyleUpdater:function(){return jf},dispose:B}),DC,!0);var OC=["itemStyle"],NC=["emphasis","itemStyle"],EC=["itemStyle","borderColor"],zC=["itemStyle","borderColor0"],RC=["itemStyle","color"],BC=["itemStyle","color0"],VC=A;ss(function(t){t&&y(t.series)&&d(t.series,function(t){w(t)&&"k"===t.type&&(t.type="candlestick")})}),ds(function(t,e){t.eachRawSeriesByType("candlestick",function(e){var i=e.getData();i.setVisual({legendSymbol:"roundRect"}),t.isSeriesFiltered(e)||i.each(function(t){var e=i.getItemModel(t),n=i.getItemLayout(t).sign;i.setItemVisual(t,{color:e.get(n>0?RC:BC),borderColor:e.get(n>0?EC:zC)})})})}),cs(function(t){t.eachSeriesByType("candlestick",function(t){var e,i=t.coordinateSystem,n=t.getData(),o=Xf(t,n),a=t.get("layout"),r="horizontal"===a?0:1,s=1-r,l=["x","y"],h=[];if(d(n.dimensions,function(t){var i=n.getDimensionInfo(t).coordDim;i===l[s]?h.push(t):i===l[r]&&(e=t)}),!(null==e||h.length<4)){var u=0;n.each([e].concat(h),function(){function t(t){var e=[];return e[r]=d,e[s]=t,isNaN(d)||isNaN(t)?[NaN,NaN]:i.dataToPoint(e)}function e(t,e){var i=t.slice(),n=t.slice();i[r]=Wn(i[r]+o/2,1,!1),n[r]=Wn(n[r]-o/2,1,!0),e?M.push(i,n):M.push(n,i)}function l(t){return t[r]=Wn(t[r],1),t}var c=arguments,d=c[0],f=c[h.length+1],p=c[1],g=c[2],m=c[3],v=c[4],y=Math.min(p,g),x=Math.max(p,g),_=t(y),w=t(x),b=t(m),S=[[l(t(v)),l(w)],[l(b),l(_)]],M=[];e(w,0),e(_,1);var I;I=p>g?-1:p<g?1:u>0?n.getItemModel(u-1).get()[2]<=g?1:-1:1,n.setItemLayout(f,{chartLayout:a,sign:I,initBaseline:p>g?w[s]:_[s],bodyEnds:M,whiskerEnds:S,brushRect:function(){var e=t(Math.min(p,g,m,v)),i=t(Math.max(p,g,m,v));return e[r]-=o/2,i[r]-=o/2,{x:e[0],y:e[1],width:s?o:i[0]-e[0],height:s?i[1]-e[1]:o}}()}),++u},!0)}})}),uM.extend({type:"series.effectScatter",dependencies:["grid","polar"],getInitialData:function(t,e){return Bs(this.getSource(),this)},brushSelector:"point",defaultOption:{coordinateSystem:"cartesian2d",zlevel:0,z:2,legendHoverLink:!0,effectType:"ripple",progressive:0,showEffectOn:"render",rippleEffect:{period:4,scale:2.5,brushType:"fill"},symbolSize:10}});var GC=$f.prototype;GC.stopEffectAnimation=function(){this.childAt(1).removeAll()},GC.startEffectAnimation=function(t){for(var e=t.symbolType,i=t.color,n=this.childAt(1),o=0;o<3;o++){var a=dl(e,-1,-1,2,2,i);a.attr({style:{strokeNoScale:!0},z2:99,silent:!0,scale:[.5,.5]});var r=-o/3*t.period+t.effectOffset;a.animate("",!0).when(t.period,{scale:[t.rippleScale/2,t.rippleScale/2]}).delay(r).start(),a.animateStyle(!0).when(t.period,{opacity:0}).delay(r).start(),n.add(a)}qf(n,t)},GC.updateEffectAnimation=function(t){for(var e=this._effectCfg,i=this.childAt(1),n=["symbolType","period","rippleScale"],o=0;o<n.length;o++){var a=n[o];if(e[a]!==t[a])return this.stopEffectAnimation(),void this.startEffectAnimation(t)}qf(i,t)},GC.highlight=function(){this.trigger("emphasis")},GC.downplay=function(){this.trigger("normal")},GC.updateData=function(t,e){var i=t.hostModel;this.childAt(0).updateData(t,e);var n=this.childAt(1),o=t.getItemModel(e),a=t.getItemVisual(e,"symbol"),r=Yf(t.getItemVisual(e,"symbolSize")),s=t.getItemVisual(e,"color");n.attr("scale",r),n.traverse(function(t){t.attr({fill:s})});var l=o.getShallow("symbolOffset");if(l){var h=n.position;h[0]=To(l[0],r[0]),h[1]=To(l[1],r[1])}n.rotation=(o.getShallow("symbolRotate")||0)*Math.PI/180||0;var u={};if(u.showEffectOn=i.get("showEffectOn"),u.rippleScale=o.get("rippleEffect.scale"),u.brushType=o.get("rippleEffect.brushType"),u.period=1e3*o.get("rippleEffect.period"),u.effectOffset=e/t.count(),u.z=o.getShallow("z")||0,u.zlevel=o.getShallow("zlevel")||0,u.symbolType=a,u.color=s,this.off("mouseover").off("mouseout").off("emphasis").off("normal"),"render"===u.showEffectOn)this._effectCfg?this.updateEffectAnimation(u):this.startEffectAnimation(u),this._effectCfg=u;else{this._effectCfg=null,this.stopEffectAnimation();var c=this.childAt(0),d=function(){c.highlight(),"render"!==u.showEffectOn&&this.startEffectAnimation(u)},f=function(){c.downplay(),"render"!==u.showEffectOn&&this.stopEffectAnimation()};this.on("mouseover",d,this).on("mouseout",f,this).on("emphasis",d,this).on("normal",f,this)}this._effectCfg=u},GC.fadeOut=function(t){this.off("mouseover").off("mouseout").off("emphasis").off("normal"),t&&t()},h($f,S_),ys({type:"effectScatter",init:function(){this._symbolDraw=new Ml($f)},render:function(t,e,i){var n=t.getData(),o=this._symbolDraw;o.updateData(n),this.group.add(o.group)},updateTransform:function(t,e,i){var n=t.getData();this.group.dirty();var o=ST().reset(t);o.progress&&o.progress({start:0,end:n.count()},n),this._symbolDraw.updateLayout(n)},_updateGroupTransform:function(t){var e=t.coordinateSystem;e&&e.getRoamTransform&&(this.group.transform=gt(e.getRoamTransform()),this.group.decomposeTransform())},remove:function(t,e){this._symbolDraw&&this._symbolDraw.remove(e)},dispose:function(){}}),ds(bT("effectScatter","circle")),cs(ST("effectScatter"));var WC="undefined"==typeof window?global:window,FC=WC.Uint32Array||Array,HC=WC.Float64Array||Array,ZC=uM.extend({type:"series.lines",dependencies:["grid","polar"],visualColorAccessPath:"lineStyle.color",init:function(t){Kf(t);var e=this._processFlatCoordsArray(t.data);this._flatCoords=e.flatCoords,this._flatCoordsOffset=e.flatCoordsOffset,e.flatCoords&&(t.data=new Float32Array(e.count)),ZC.superApply(this,"init",arguments)},mergeOption:function(t){if(Kf(t),t.data){var e=this._processFlatCoordsArray(t.data);this._flatCoords=e.flatCoords,this._flatCoordsOffset=e.flatCoordsOffset,e.flatCoords&&(t.data=new Float32Array(e.count))}ZC.superApply(this,"mergeOption",arguments)},appendData:function(t){var e=this._processFlatCoordsArray(t.data);e.flatCoords&&(this._flatCoords?(this._flatCoords=R(this._flatCoords,e.flatCoords),this._flatCoordsOffset=R(this._flatCoordsOffset,e.flatCoordsOffset)):(this._flatCoords=e.flatCoords,this._flatCoordsOffset=e.flatCoordsOffset),t.data=new Float32Array(e.count)),this.getRawData().appendData(t.data)},_getCoordsFromItemModel:function(t){var e=this.getData().getItemModel(t);return e.option instanceof Array?e.option:e.getShallow("coords")},getLineCoordsCount:function(t){return this._flatCoordsOffset?this._flatCoordsOffset[2*t+1]:this._getCoordsFromItemModel(t).length},getLineCoords:function(t,e){if(this._flatCoordsOffset){for(var i=this._flatCoordsOffset[2*t],n=this._flatCoordsOffset[2*t+1],o=0;o<n;o++)e[o]=e[o]||[],e[o][0]=this._flatCoords[i+2*o],e[o][1]=this._flatCoords[i+2*o+1];return n}for(var a=this._getCoordsFromItemModel(t),o=0;o<a.length;o++)e[o]=e[o]||[],e[o][0]=a[o][0],e[o][1]=a[o][1];return a.length},_processFlatCoordsArray:function(t){var e=0;if(this._flatCoords&&(e=this._flatCoords.length),"number"==typeof t[0]){for(var i=t.length,n=new FC(i),o=new HC(i),a=0,r=0,s=0,l=0;l<i;){s++;var h=t[l++];n[r++]=a+e,n[r++]=h;for(var u=0;u<h;u++){var c=t[l++],d=t[l++];o[a++]=c,o[a++]=d}}return{flatCoordsOffset:new Uint32Array(n.buffer,0,r),flatCoords:o,count:s}}return{flatCoordsOffset:null,flatCoords:null,count:t.length}},getInitialData:function(t,e){var i=new yI(["value"],this);return i.hasItemOption=!1,i.initData(t.data,[],function(t,e,n,o){if(t instanceof Array)return NaN;i.hasItemOption=!0;var a=t.value;return null!=a?a instanceof Array?a[o]:a:void 0}),i},formatTooltip:function(t){var e=this.getData().getItemModel(t),i=e.get("name");if(i)return i;var n=e.get("fromName"),o=e.get("toName"),a=[];return null!=n&&a.push(n),null!=o&&a.push(o),Ho(a.join(" > "))},preventIncremental:function(){return!!this.get("effect.show")},getProgressive:function(){var t=this.option.progressive;return null==t?this.option.large?1e4:this.get("progressive"):t},getProgressiveThreshold:function(){var t=this.option.progressiveThreshold;return null==t?this.option.large?2e4:this.get("progressiveThreshold"):t},defaultOption:{coordinateSystem:"geo",zlevel:0,z:2,legendHoverLink:!0,hoverAnimation:!0,xAxisIndex:0,yAxisIndex:0,symbol:["none","none"],symbolSize:[10,10],geoIndex:0,effect:{show:!1,period:4,constantSpeed:0,symbol:"circle",symbolSize:3,loop:!0,trailLength:.2},large:!1,largeThreshold:2e3,incremental:!1,incrementalThreshold:3e3,polyline:!1,label:{show:!1,position:"end"},lineStyle:{opacity:.5}}}),UC=Jf.prototype;UC.createLine=function(t,e,i){return new Wc(t,e,i)},UC._updateEffectSymbol=function(t,e){var i=t.getItemModel(e).getModel("effect"),n=i.get("symbolSize"),o=i.get("symbol");y(n)||(n=[n,n]);var a=i.get("color")||t.getItemVisual(e,"color"),r=this.childAt(1);this._symbolType!==o&&(this.remove(r),(r=dl(o,-.5,-.5,1,1,a)).z2=100,r.culling=!0,this.add(r)),r&&(r.setStyle("shadowColor",a),r.setStyle(i.getItemStyle(["color"])),r.attr("scale",n),r.setColor(a),r.attr("scale",n),this._symbolType=o,this._updateEffectAnimation(t,i,e))},UC._updateEffectAnimation=function(t,e,i){var n=this.childAt(1);if(n){var o=this,a=t.getItemLayout(i),r=1e3*e.get("period"),s=e.get("loop"),l=e.get("constantSpeed"),h=T(e.get("delay"),function(e){return e/t.count()*r/3}),u="function"==typeof h;if(n.ignore=!0,this.updateAnimationPoints(n,a),l>0&&(r=this.getLineLength(n)/l*1e3),r!==this._period||s!==this._loop){n.stopAnimation();var c=h;u&&(c=h(i)),n.__t>0&&(c=-r*n.__t),n.__t=0;var d=n.animate("",s).when(r,{__t:1}).delay(c).during(function(){o.updateSymbolPosition(n)});s||d.done(function(){o.remove(n)}),d.start()}this._period=r,this._loop=s}},UC.getLineLength=function(t){return Vx(t.__p1,t.__cp1)+Vx(t.__cp1,t.__p2)},UC.updateAnimationPoints=function(t,e){t.__p1=e[0],t.__p2=e[1],t.__cp1=e[2]||[(e[0][0]+e[1][0])/2,(e[0][1]+e[1][1])/2]},UC.updateData=function(t,e,i){this.childAt(0).updateData(t,e,i),this._updateEffectSymbol(t,e)},UC.updateSymbolPosition=function(t){var e=t.__p1,i=t.__p2,n=t.__cp1,o=t.__t,a=t.position,r=Ji,s=Qi;a[0]=r(e[0],n[0],i[0],o),a[1]=r(e[1],n[1],i[1],o);var l=s(e[0],n[0],i[0],o),h=s(e[1],n[1],i[1],o);t.rotation=-Math.atan2(h,l)-Math.PI/2,t.ignore=!1},UC.updateLayout=function(t,e){this.childAt(0).updateLayout(t,e);var i=t.getItemModel(e).getModel("effect");this._updateEffectAnimation(t,i,e)},h(Jf,S_);var jC=Qf.prototype;jC._createPolyline=function(t,e,i){var n=t.getItemLayout(e),o=new Bb({shape:{points:n}});this.add(o),this._updateCommonStl(t,e,i)},jC.updateData=function(t,e,i){var n=t.hostModel;co(this.childAt(0),{shape:{points:t.getItemLayout(e)}},n,e),this._updateCommonStl(t,e,i)},jC._updateCommonStl=function(t,e,i){var n=this.childAt(0),o=t.getItemModel(e),a=t.getItemVisual(e,"color"),s=i&&i.lineStyle,l=i&&i.hoverLineStyle;i&&!t.hasItemOption||(s=o.getModel("lineStyle").getLineStyle(),l=o.getModel("emphasis.lineStyle").getLineStyle()),n.useStyle(r({strokeNoScale:!0,fill:"none",stroke:a},s)),n.hoverStyle=l,to(this)},jC.updateLayout=function(t,e){this.childAt(0).setShape("points",t.getItemLayout(e))},h(Qf,S_);var XC=tp.prototype;XC.createLine=function(t,e,i){return new Qf(t,e,i)},XC.updateAnimationPoints=function(t,e){this._points=e;for(var i=[0],n=0,o=1;o<e.length;o++){var a=e[o-1],r=e[o];n+=Vx(a,r),i.push(n)}if(0!==n){for(o=0;o<i.length;o++)i[o]/=n;this._offsets=i,this._length=n}},XC.getLineLength=function(t){return this._length},XC.updateSymbolPosition=function(t){var e=t.__t,i=this._points,n=this._offsets,o=i.length;if(n){var a=this._lastFrame;if(e<this._lastFramePercent){for(r=Math.min(a+1,o-1);r>=0&&!(n[r]<=e);r--);r=Math.min(r,o-2)}else{for(var r=a;r<o&&!(n[r]>e);r++);r=Math.min(r-1,o-2)}J(t.position,i[r],i[r+1],(e-n[r])/(n[r+1]-n[r]));var s=i[r+1][0]-i[r][0],l=i[r+1][1]-i[r][1];t.rotation=-Math.atan2(l,s)-Math.PI/2,this._lastFrame=r,this._lastFramePercent=e,t.ignore=!1}},h(tp,Jf);var YC=Nn({shape:{polyline:!1,curveness:0,segs:[]},buildPath:function(t,e){var i=e.segs,n=e.curveness;if(e.polyline)for(r=0;r<i.length;){var o=i[r++];if(o>0){t.moveTo(i[r++],i[r++]);for(var a=1;a<o;a++)t.lineTo(i[r++],i[r++])}}else for(var r=0;r<i.length;){var s=i[r++],l=i[r++],h=i[r++],u=i[r++];if(t.moveTo(s,l),n>0){var c=(s+h)/2-(l-u)*n,d=(l+u)/2-(h-s)*n;t.quadraticCurveTo(c,d,h,u)}else t.lineTo(h,u)}},findDataIndex:function(t,e){var i=this.shape,n=i.segs,o=i.curveness;if(i.polyline)for(var a=0,r=0;r<n.length;){var s=n[r++];if(s>0)for(var l=n[r++],h=n[r++],u=1;u<s;u++)if(un(l,h,c=n[r++],d=n[r++]))return a;a++}else for(var a=0,r=0;r<n.length;){var l=n[r++],h=n[r++],c=n[r++],d=n[r++];if(o>0){if(dn(l,h,(l+c)/2-(h-d)*o,(h+d)/2-(c-l)*o,c,d))return a}else if(un(l,h,c,d))return a;a++}return-1}}),qC=ep.prototype;qC.isPersistent=function(){return!this._incremental},qC.updateData=function(t){this.group.removeAll();var e=new YC({rectHover:!0,cursor:"default"});e.setShape({segs:t.getLayout("linesPoints")}),this._setCommon(e,t),this.group.add(e),this._incremental=null},qC.incrementalPrepareUpdate=function(t){this.group.removeAll(),this._clearIncremental(),t.count()>5e5?(this._incremental||(this._incremental=new On({silent:!0})),this.group.add(this._incremental)):this._incremental=null},qC.incrementalUpdate=function(t,e){var i=new YC;i.setShape({segs:e.getLayout("linesPoints")}),this._setCommon(i,e,!!this._incremental),this._incremental?this._incremental.addDisplayable(i,!0):(i.rectHover=!0,i.cursor="default",i.__startIndex=t.start,this.group.add(i))},qC.remove=function(){this._clearIncremental(),this._incremental=null,this.group.removeAll()},qC._setCommon=function(t,e,i){var n=e.hostModel;t.setShape({polyline:n.get("polyline"),curveness:n.get("lineStyle.curveness")}),t.useStyle(n.getModel("lineStyle").getLineStyle()),t.style.strokeNoScale=!0;var o=e.getVisual("color");o&&t.setStyle("stroke",o),t.setStyle("fill"),i||(t.seriesIndex=n.seriesIndex,t.on("mousemove",function(e){t.dataIndex=null;var i=t.findDataIndex(e.offsetX,e.offsetY);i>0&&(t.dataIndex=i+t.__startIndex)}))},qC._clearIncremental=function(){var t=this._incremental;t&&t.clearDisplaybles()};var $C={seriesType:"lines",plan:fM(),reset:function(t){var e=t.coordinateSystem,i=t.get("polyline"),n=t.pipelineContext.large;return{progress:function(o,a){var r=[];if(n){var s,l=o.end-o.start;if(i){for(var h=0,u=o.start;u<o.end;u++)h+=t.getLineCoordsCount(u);s=new Float32Array(l+2*h)}else s=new Float32Array(2*l);for(var c=0,d=[],u=o.start;u<o.end;u++){g=t.getLineCoords(u,r),i&&(s[c++]=g);for(var f=0;f<g;f++)d=e.dataToPoint(r[f],!1,d),s[c++]=d[0],s[c++]=d[1]}a.setLayout("linesPoints",s)}else for(u=o.start;u<o.end;u++){var p=a.getItemModel(u),g=t.getLineCoords(u,r),m=[];if(i)for(var v=0;v<g;v++)m.push(e.dataToPoint(r[v]));else{m[0]=e.dataToPoint(r[0]),m[1]=e.dataToPoint(r[1]);var y=p.get("lineStyle.curveness");+y&&(m[2]=[(m[0][0]+m[1][0])/2-(m[0][1]-m[1][1])*y,(m[0][1]+m[1][1])/2-(m[1][0]-m[0][0])*y])}a.setItemLayout(u,m)}}}}};ys({type:"lines",init:function(){},render:function(t,e,i){var n=t.getData(),o=this._updateLineDraw(n,t),a=t.get("zlevel"),r=t.get("effect.trailLength"),s=i.getZr(),l="svg"===s.painter.getType();l||s.painter.getLayer(a).clear(!0),null==this._lastZlevel||l||s.configLayer(this._lastZlevel,{motionBlur:!1}),this._showEffect(t)&&r&&(l||s.configLayer(a,{motionBlur:!0,lastFrameAlpha:Math.max(Math.min(r/10+.9,1),0)})),o.updateData(n),this._lastZlevel=a,this._finished=!0},incrementalPrepareRender:function(t,e,i){var n=t.getData();this._updateLineDraw(n,t).incrementalPrepareUpdate(n),this._clearLayer(i),this._finished=!1},incrementalRender:function(t,e,i){this._lineDraw.incrementalUpdate(t,e.getData()),this._finished=t.end===e.getData().count()},updateTransform:function(t,e,i){var n=t.getData();if(!this._finished||t.pipelineContext.large)return{update:!0};var o=$C.reset(t);o.progress&&o.progress({start:0,end:n.count()},n),this._lineDraw.updateLayout(),this._clearLayer(i)},_updateLineDraw:function(t,e){var i=this._lineDraw,n=this._showEffect(e),o=!!e.get("polyline"),a=e.pipelineContext.large;return i&&n===this._hasEffet&&o===this._isPolyline&&a===this._isLargeDraw||(i&&i.remove(),i=this._lineDraw=a?new ep:new Fc(o?n?tp:Qf:n?Jf:Wc),this._hasEffet=n,this._isPolyline=o,this._isLargeDraw=a,this.group.removeAll()),this.group.add(i.group),i},_showEffect:function(t){return!!t.get("effect.show")},_clearLayer:function(t){var e=t.getZr();"svg"===e.painter.getType()||null==this._lastZlevel||e.painter.getLayer(this._lastZlevel).clear(!0)},remove:function(t,e){this._lineDraw&&this._lineDraw.remove(),this._lineDraw=null,this._clearLayer(e)},dispose:function(){}});var KC="lineStyle.opacity".split("."),JC={seriesType:"lines",reset:function(t,e,i){var n=ip(t.get("symbol")),o=ip(t.get("symbolSize")),a=t.getData();return a.setVisual("fromSymbol",n&&n[0]),a.setVisual("toSymbol",n&&n[1]),a.setVisual("fromSymbolSize",o&&o[0]),a.setVisual("toSymbolSize",o&&o[1]),a.setVisual("opacity",t.get(KC)),{dataEach:a.hasItemOption?function(t,e){var i=t.getItemModel(e),n=ip(i.getShallow("symbol",!0)),o=ip(i.getShallow("symbolSize",!0)),a=i.get(KC);n[0]&&t.setItemVisual(e,"fromSymbol",n[0]),n[1]&&t.setItemVisual(e,"toSymbol",n[1]),o[0]&&t.setItemVisual(e,"fromSymbolSize",o[0]),o[1]&&t.setItemVisual(e,"toSymbolSize",o[1]),t.setItemVisual(e,"opacity",a)}:null}}};cs($C),ds(JC),uM.extend({type:"series.heatmap",getInitialData:function(t,e){return Bs(this.getSource(),this)},preventIncremental:function(){var t=Aa.get(this.get("coordinateSystem"));if(t&&t.dimensions)return"lng"===t.dimensions[0]&&"lat"===t.dimensions[1]},defaultOption:{coordinateSystem:"cartesian2d",zlevel:0,z:2,geoIndex:0,blurSize:30,pointSize:20,maxOpacity:1,minOpacity:0}});np.prototype={update:function(t,e,i,n,o,a){var r=this._getBrush(),s=this._getGradient(t,o,"inRange"),l=this._getGradient(t,o,"outOfRange"),h=this.pointSize+this.blurSize,u=this.canvas,c=u.getContext("2d"),d=t.length;u.width=e,u.height=i;for(var f=0;f<d;++f){var p=t[f],g=p[0],m=p[1],v=n(p[2]);c.globalAlpha=v,c.drawImage(r,g-h,m-h)}if(!u.width||!u.height)return u;for(var y=c.getImageData(0,0,u.width,u.height),x=y.data,_=0,w=x.length,b=this.minOpacity,S=this.maxOpacity-b;_<w;){var v=x[_+3]/256,M=4*Math.floor(255*v);if(v>0){var I=a(v)?s:l;v>0&&(v=v*S+b),x[_++]=I[M],x[_++]=I[M+1],x[_++]=I[M+2],x[_++]=I[M+3]*v*256}else _+=4}return c.putImageData(y,0,0),u},_getBrush:function(){var t=this._brushCanvas||(this._brushCanvas=Px()),e=this.pointSize+this.blurSize,i=2*e;t.width=i,t.height=i;var n=t.getContext("2d");return n.clearRect(0,0,i,i),n.shadowOffsetX=i,n.shadowBlur=this.blurSize,n.shadowColor="#000",n.beginPath(),n.arc(-e,e,this.pointSize,0,2*Math.PI,!0),n.closePath(),n.fill(),t},_getGradient:function(t,e,i){for(var n=this._gradientPixels,o=n[i]||(n[i]=new Uint8ClampedArray(1024)),a=[0,0,0,0],r=0,s=0;s<256;s++)e[i](s/255,!0,a),o[r++]=a[0],o[r++]=a[1],o[r++]=a[2],o[r++]=a[3];return o}},ys({type:"heatmap",render:function(t,e,i){var n;e.eachComponent("visualMap",function(e){e.eachTargetSeries(function(i){i===t&&(n=e)})}),this.group.removeAll(),this._incrementalDisplayable=null;var o=t.coordinateSystem;"cartesian2d"===o.type||"calendar"===o.type?this._renderOnCartesianAndCalendar(t,i,0,t.getData().count()):rp(o)&&this._renderOnGeo(o,t,n,i)},incrementalPrepareRender:function(t,e,i){this.group.removeAll()},incrementalRender:function(t,e,i,n){e.coordinateSystem&&this._renderOnCartesianAndCalendar(e,n,t.start,t.end,!0)},_renderOnCartesianAndCalendar:function(t,e,i,n,o){var r,s,l=t.coordinateSystem;if("cartesian2d"===l.type){var h=l.getAxis("x"),u=l.getAxis("y");r=h.getBandWidth(),s=u.getBandWidth()}for(var c=this.group,d=t.getData(),f=t.getModel("itemStyle").getItemStyle(["color"]),p=t.getModel("emphasis.itemStyle").getItemStyle(),g=t.getModel("label"),m=t.getModel("emphasis.label"),v=l.type,y="cartesian2d"===v?[d.mapDimension("x"),d.mapDimension("y"),d.mapDimension("value")]:[d.mapDimension("time"),d.mapDimension("value")],x=i;x<n;x++){var _;if("cartesian2d"===v){if(isNaN(d.get(y[2],x)))continue;var w=l.dataToPoint([d.get(y[0],x),d.get(y[1],x)]);_=new Vb({shape:{x:w[0]-r/2,y:w[1]-s/2,width:r,height:s},style:{fill:d.getItemVisual(x,"color"),opacity:d.getItemVisual(x,"opacity")}})}else{if(isNaN(d.get(y[1],x)))continue;_=new Vb({z2:1,shape:l.dataToRect([d.get(y[0],x)]).contentShape,style:{fill:d.getItemVisual(x,"color"),opacity:d.getItemVisual(x,"opacity")}})}var b=d.getItemModel(x);d.hasItemOption&&(f=b.getModel("itemStyle").getItemStyle(["color"]),p=b.getModel("emphasis.itemStyle").getItemStyle(),g=b.getModel("label"),m=b.getModel("emphasis.label"));var S=t.getRawValue(x),M="-";S&&null!=S[2]&&(M=S[2]),eo(f,p,g,m,{labelFetcher:t,labelDataIndex:x,defaultText:M,isRectText:!0}),_.setStyle(f),to(_,d.hasItemOption?p:a({},p)),_.incremental=o,o&&(_.useHoverLayer=!0),c.add(_),d.setItemGraphicEl(x,_)}},_renderOnGeo:function(t,e,i,n){var o=i.targetVisuals.inRange,a=i.targetVisuals.outOfRange,r=e.getData(),s=this._hmLayer||this._hmLayer||new np;s.blurSize=e.get("blurSize"),s.pointSize=e.get("pointSize"),s.minOpacity=e.get("minOpacity"),s.maxOpacity=e.get("maxOpacity");var l=t.getViewRect().clone(),h=t.getRoamTransform();l.applyTransform(h);var u=Math.max(l.x,0),c=Math.max(l.y,0),d=Math.min(l.width+l.x,n.getWidth()),f=Math.min(l.height+l.y,n.getHeight()),p=d-u,g=f-c,m=[r.mapDimension("lng"),r.mapDimension("lat"),r.mapDimension("value")],v=r.mapArray(m,function(e,i,n){var o=t.dataToPoint([e,i]);return o[0]-=u,o[1]-=c,o.push(n),o}),y=i.getExtent(),x="visualMap.continuous"===i.type?ap(y,i.option.range):op(y,i.getPieceList(),i.option.selected);s.update(v,p,g,o.color.getNormalizer(),{inRange:o.color.getColorMapper(),outOfRange:a.color.getColorMapper()},x);var _=new Je({style:{width:p,height:g,x:u,y:c,image:s.canvas},silent:!0});this.group.add(_)},dispose:function(){}});var QC=tA.extend({type:"series.pictorialBar",dependencies:["grid"],defaultOption:{symbol:"circle",symbolSize:null,symbolRotate:null,symbolPosition:null,symbolOffset:null,symbolMargin:null,symbolRepeat:!1,symbolRepeatDirection:"end",symbolClip:!1,symbolBoundingData:null,symbolPatternSize:400,barGap:"-100%",progressive:0,hoverAnimation:!1},getInitialData:function(t){return t.stack=null,QC.superApply(this,"getInitialData",arguments)}}),tL=["itemStyle","borderWidth"],eL=[{xy:"x",wh:"width",index:0,posDesc:["left","right"]},{xy:"y",wh:"height",index:1,posDesc:["top","bottom"]}],iL=new Lb;ys({type:"pictorialBar",render:function(t,e,i){var n=this.group,o=t.getData(),a=this._data,r=t.coordinateSystem,s=!!r.getBaseAxis().isHorizontal(),l=r.grid.getRect(),h={ecSize:{width:i.getWidth(),height:i.getHeight()},seriesModel:t,coordSys:r,coordSysExtent:[[l.x,l.x+l.width],[l.y,l.y+l.height]],isHorizontal:s,valueDim:eL[+s],categoryDim:eL[1-s]};return o.diff(a).add(function(t){if(o.hasValue(t)){var e=yp(o,t),i=sp(o,t,e,h),a=bp(o,h,i);o.setItemGraphicEl(t,a),n.add(a),Dp(a,h,i)}}).update(function(t,e){var i=a.getItemGraphicEl(e);if(o.hasValue(t)){var r=yp(o,t),s=sp(o,t,r,h),l=Ip(o,s);i&&l!==i.__pictorialShapeStr&&(n.remove(i),o.setItemGraphicEl(t,null),i=null),i?Sp(i,h,s):i=bp(o,h,s,!0),o.setItemGraphicEl(t,i),i.__pictorialSymbolMeta=s,n.add(i),Dp(i,h,s)}else n.remove(i)}).remove(function(t){var e=a.getItemGraphicEl(t);e&&Mp(a,t,e.__pictorialSymbolMeta.animationModel,e)}).execute(),this._data=o,this.group},dispose:B,remove:function(t,e){var i=this.group,n=this._data;t.get("animation")?n&&n.eachItemGraphicEl(function(e){Mp(n,e.dataIndex,t,e)}):i.removeAll()}});cs(v(il,"pictorialBar")),ds(bT("pictorialBar","roundRect"));var nL=function(t,e,i,n,o){nT.call(this,t,e,i),this.type=n||"value",this.position=o||"bottom",this.orient=null,this._labelInterval=null};nL.prototype={constructor:nL,model:null,isHorizontal:function(){var t=this.position;return"top"===t||"bottom"===t},pointToData:function(t,e){return this.coordinateSystem.pointToData(t,e)[0]},toGlobalCoord:null,toLocalCoord:null},h(nL,nT),Lp.prototype={type:"singleAxis",axisPointerEnabled:!0,constructor:Lp,_init:function(t,e,i){var n=this.dimension,o=new nL(n,sl(t),[0,0],t.get("type"),t.get("position")),a="category"===o.type;o.onBand=a&&t.get("boundaryGap"),o.inverse=t.get("inverse"),o.orient=t.get("orient"),t.axis=o,o.model=t,o.coordinateSystem=this,this._axis=o},update:function(t,e){t.eachSeries(function(t){if(t.coordinateSystem===this){var e=t.getData();d(e.mapDimension(this.dimension,!0),function(t){this._axis.scale.unionExtentFromData(e,t)},this),rl(this._axis.scale,this._axis.model)}},this)},resize:function(t,e){this._rect=Ko({left:t.get("left"),top:t.get("top"),right:t.get("right"),bottom:t.get("bottom"),width:t.get("width"),height:t.get("height")},{width:e.getWidth(),height:e.getHeight()}),this._adjustAxis()},getRect:function(){return this._rect},_adjustAxis:function(){var t=this._rect,e=this._axis,i=e.isHorizontal(),n=i?[0,t.width]:[0,t.height],o=e.reverse?1:0;e.setExtent(n[o],n[1-o]),this._updateAxisTransform(e,i?t.x:t.y)},_updateAxisTransform:function(t,e){var i=t.getExtent(),n=i[0]+i[1],o=t.isHorizontal();t.toGlobalCoord=o?function(t){return t+e}:function(t){return n-t+e},t.toLocalCoord=o?function(t){return t-e}:function(t){return n-t+e}},getAxis:function(){return this._axis},getBaseAxis:function(){return this._axis},getAxes:function(){return[this._axis]},getTooltipAxes:function(){return{baseAxes:[this.getAxis()]}},containPoint:function(t){var e=this.getRect(),i=this.getAxis();return"horizontal"===i.orient?i.contain(i.toLocalCoord(t[0]))&&t[1]>=e.y&&t[1]<=e.y+e.height:i.contain(i.toLocalCoord(t[1]))&&t[0]>=e.y&&t[0]<=e.y+e.height},pointToData:function(t){var e=this.getAxis();return[e.coordToData(e.toLocalCoord(t["horizontal"===e.orient?0:1]))]},dataToPoint:function(t){var e=this.getAxis(),i=this.getRect(),n=[],o="horizontal"===e.orient?0:1;return t instanceof Array&&(t=t[0]),n[o]=e.toGlobalCoord(e.dataToCoord(+t)),n[1-o]=0===o?i.y+i.height/2:i.x+i.width/2,n}},Aa.register("single",{create:function(t,e){var i=[];return t.eachComponent("singleAxis",function(n,o){var a=new Lp(n,t,e);a.name="single_"+o,a.resize(n,e),n.coordinateSystem=a,i.push(a)}),t.eachSeries(function(e){if("singleAxis"===e.get("coordinateSystem")){var i=t.queryComponents({mainType:"singleAxis",index:e.get("singleAxisIndex"),id:e.get("singleAxisId")})[0];e.coordinateSystem=i&&i.coordinateSystem}}),i},dimensions:Lp.prototype.dimensions});var oL=GT.getInterval,aL=GT.ifIgnoreOnTick,rL=["axisLine","axisTickLabel","axisName"],sL=XT.extend({type:"singleAxis",axisPointerClass:"SingleAxisPointer",render:function(t,e,i,n){var o=this.group;o.removeAll();var a=kp(t),r=new GT(t,a);d(rL,r.add,r),o.add(r.getGroup()),t.get("splitLine.show")&&this._splitLine(t,a.labelInterval),sL.superCall(this,"render",t,e,i,n)},_splitLine:function(t,e){var i=t.axis;if(!i.scale.isBlank()){var n=t.getModel("splitLine"),o=n.getModel("lineStyle"),a=o.get("width"),r=o.get("color"),s=oL(n,e);r=r instanceof Array?r:[r];for(var l=t.coordinateSystem.getRect(),h=i.isHorizontal(),u=[],c=0,d=i.getTicksCoords(),f=[],p=[],g=t.get("axisLabel.showMinLabel"),m=t.get("axisLabel.showMaxLabel"),v=0;v<d.length;++v)if(!aL(i,v,s,d.length,g,m)){var y=i.toGlobalCoord(d[v]);h?(f[0]=y,f[1]=l.y,p[0]=y,p[1]=l.y+l.height):(f[0]=l.x,f[1]=y,p[0]=l.x+l.width,p[1]=y);var x=c++%r.length;u[x]=u[x]||[],u[x].push(new Gb(Vn({shape:{x1:f[0],y1:f[1],x2:p[0],y2:p[1]},style:{lineWidth:a},silent:!0})))}for(v=0;v<u.length;++v)this.group.add(Qb(u[v],{style:{stroke:r[v%r.length],lineDash:o.getLineDash(a),lineWidth:a},silent:!0}))}}}),lL=IS.extend({type:"singleAxis",layoutMode:"box",axis:null,coordinateSystem:null,getCoordSysModel:function(){return this}}),hL={left:"5%",top:"5%",right:"5%",bottom:"5%",type:"value",position:"bottom",orient:"horizontal",axisLine:{show:!0,lineStyle:{width:2,type:"solid"}},tooltip:{show:!0},axisTick:{show:!0,length:6,lineStyle:{width:2}},axisLabel:{show:!0,interval:"auto"},splitLine:{show:!0,lineStyle:{type:"dashed",opacity:.2}}};n(lL.prototype,ZI),kT("single",lL,function(t,e){return e.type||(e.data?"category":"value")},hL);var uL=function(t,e){var i,n=[],o=t.seriesIndex;if(null==o||!(i=e.getSeriesByIndex(o)))return{point:[]};var a=i.getData(),r=ki(a,t);if(null==r||r<0||y(r))return{point:[]};var s=a.getItemGraphicEl(r),l=i.coordinateSystem;if(i.getTooltipPosition)n=i.getTooltipPosition(r)||[];else if(l&&l.dataToPoint)n=l.dataToPoint(a.getValues(f(l.dimensions,function(t){return a.mapDimension(t)}),r,!0))||[];else if(s){var h=s.getBoundingRect().clone();h.applyTransform(s.transform),n=[h.x+h.width/2,h.y+h.height/2]}return{point:n,el:s}},cL=d,dL=v,fL=Pi(),pL=(gs({type:"axisPointer",coordSysAxesInfo:null,defaultOption:{show:"auto",triggerOn:null,zlevel:0,z:50,type:"line",snap:!1,triggerTooltip:!0,value:null,status:null,link:[],animation:null,animationDurationUpdate:200,lineStyle:{color:"#aaa",width:1,type:"solid"},shadowStyle:{color:"rgba(150,150,150,0.3)"},label:{show:!0,formatter:null,precision:"auto",margin:3,color:"#fff",padding:[5,7,5,7],backgroundColor:"auto",borderColor:null,borderWidth:0,shadowBlur:3,shadowColor:"#aaa"},handle:{show:!1,icon:"M10.7,11.9v-1.3H9.3v1.3c-4.9,0.3-8.8,4.4-8.8,9.4c0,5,3.9,9.1,8.8,9.4h1.3c4.9-0.3,8.8-4.4,8.8-9.4C19.5,16.3,15.6,12.2,10.7,11.9z M13.3,24.4H6.7v-1.2h6.6z M13.3,22H6.7v-1.2h6.6z M13.3,19.6H6.7v-1.2h6.6z",size:45,margin:50,color:"#333",shadowBlur:3,shadowColor:"#aaa",shadowOffsetX:0,shadowOffsetY:2,throttle:40}}}),Pi()),gL=d,mL=ms({type:"axisPointer",render:function(t,e,i){var n=e.getComponent("tooltip"),o=t.get("triggerOn")||n&&n.get("triggerOn")||"mousemove|click";Fp("axisPointer",i,function(t,e,i){"none"!==o&&("leave"===t||o.indexOf(t)>=0)&&i({type:"updateAxisPointer",currTrigger:t,x:e&&e.offsetX,y:e&&e.offsetY})})},remove:function(t,e){Yp(e.getZr(),"axisPointer"),mL.superApply(this._model,"remove",arguments)},dispose:function(t,e){Yp("axisPointer",e),mL.superApply(this._model,"dispose",arguments)}}),vL=Pi(),yL=i,xL=m;(qp.prototype={_group:null,_lastGraphicKey:null,_handle:null,_dragging:!1,_lastValue:null,_lastStatus:null,_payloadInfo:null,animationThreshold:15,render:function(t,e,i,n){var o=e.get("value"),a=e.get("status");if(this._axisModel=t,this._axisPointerModel=e,this._api=i,n||this._lastValue!==o||this._lastStatus!==a){this._lastValue=o,this._lastStatus=a;var r=this._group,s=this._handle;if(!a||"hide"===a)return r&&r.hide(),void(s&&s.hide());r&&r.show(),s&&s.show();var l={};this.makeElOption(l,o,t,e,i);var h=l.graphicKey;h!==this._lastGraphicKey&&this.clear(i),this._lastGraphicKey=h;var u=this._moveAnimation=this.determineAnimation(t,e);if(r){var c=v($p,e,u);this.updatePointerEl(r,l,c,e),this.updateLabelEl(r,l,c,e)}else r=this._group=new S_,this.createPointerEl(r,l,t,e),this.createLabelEl(r,l,t,e),i.getZr().add(r);tg(r,e,!0),this._renderHandle(o)}},remove:function(t){this.clear(t)},dispose:function(t){this.clear(t)},determineAnimation:function(t,e){var i=e.get("animation"),n=t.axis,o="category"===n.type,a=e.get("snap");if(!a&&!o)return!1;if("auto"===i||null==i){var r=this.animationThreshold;if(o&&n.getBandWidth()>r)return!0;if(a){var s=vh(t).seriesDataCount,l=n.getExtent();return Math.abs(l[0]-l[1])/s>r}return!1}return!0===i},makeElOption:function(t,e,i,n,o){},createPointerEl:function(t,e,i,n){var o=e.pointer;if(o){var a=vL(t).pointerEl=new tS[o.type](yL(e.pointer));t.add(a)}},createLabelEl:function(t,e,i,n){if(e.label){var o=vL(t).labelEl=new Vb(yL(e.label));t.add(o),Jp(o,n)}},updatePointerEl:function(t,e,i){var n=vL(t).pointerEl;n&&(n.setStyle(e.pointer.style),i(n,{shape:e.pointer.shape}))},updateLabelEl:function(t,e,i,n){var o=vL(t).labelEl;o&&(o.setStyle(e.label.style),i(o,{shape:e.label.shape,position:e.label.position}),Jp(o,n))},_renderHandle:function(t){if(!this._dragging&&this.updateHandleTransform){var e=this._axisPointerModel,i=this._api.getZr(),n=this._handle,o=e.getModel("handle"),a=e.get("status");if(!o.get("show")||!a||"hide"===a)return n&&i.remove(n),void(this._handle=null);var r;this._handle||(r=!0,n=this._handle=xo(o.get("icon"),{cursor:"move",draggable:!0,onmousemove:function(t){Q_(t.event)},onmousedown:xL(this._onHandleDragMove,this,0,0),drift:xL(this._onHandleDragMove,this),ondragend:xL(this._onHandleDragEnd,this)}),i.add(n)),tg(n,e,!1);var s=["color","borderColor","borderWidth","opacity","shadowColor","shadowBlur","shadowOffsetX","shadowOffsetY"];n.setStyle(o.getItemStyle(null,s));var l=o.get("size");y(l)||(l=[l,l]),n.attr("scale",[l[0]/2,l[1]/2]),yr(this,"_doDispatchAxisPointer",o.get("throttle")||0,"fixRate"),this._moveHandleToValue(t,r)}},_moveHandleToValue:function(t,e){$p(this._axisPointerModel,!e&&this._moveAnimation,this._handle,Qp(this.getHandleTransform(t,this._axisModel,this._axisPointerModel)))},_onHandleDragMove:function(t,e){var i=this._handle;if(i){this._dragging=!0;var n=this.updateHandleTransform(Qp(i),[t,e],this._axisModel,this._axisPointerModel);this._payloadInfo=n,i.stopAnimation(),i.attr(Qp(n)),vL(i).lastProp=null,this._doDispatchAxisPointer()}},_doDispatchAxisPointer:function(){if(this._handle){var t=this._payloadInfo,e=this._axisModel;this._api.dispatchAction({type:"updateAxisPointer",x:t.cursorPoint[0],y:t.cursorPoint[1],tooltipOption:t.tooltipOption,axesInfo:[{axisDim:e.axis.dim,axisIndex:e.componentIndex}]})}},_onHandleDragEnd:function(t){if(this._dragging=!1,this._handle){var e=this._axisPointerModel.get("value");this._moveHandleToValue(e),this._api.dispatchAction({type:"hideTip"})}},getHandleTransform:null,updateHandleTransform:null,clear:function(t){this._lastValue=null,this._lastStatus=null;var e=t.getZr(),i=this._group,n=this._handle;e&&i&&(this._lastGraphicKey=null,i&&e.remove(i),n&&e.remove(n),this._group=null,this._handle=null,this._payloadInfo=null)},doClear:function(){},buildLabel:function(t,e,i){return i=i||0,{x:t[i],y:t[1-i],width:e[i],height:e[1-i]}}}).constructor=qp,Vi(qp);var _L=qp.extend({makeElOption:function(t,e,i,n,o){var a=i.axis,r=a.grid,s=n.get("type"),l=ug(r,a).getOtherAxis(a).getGlobalExtent(),h=a.toGlobalCoord(a.dataToCoord(e,!0));if(s&&"none"!==s){var u=eg(n),c=wL[s](a,h,l,u);c.style=u,t.graphicKey=c.type,t.pointer=c}rg(e,t,Sh(r.model,i),i,n,o)},getHandleTransform:function(t,e,i){var n=Sh(e.axis.grid.model,e,{labelInside:!1});return n.labelMargin=i.get("handle.margin"),{position:ag(e.axis,t,n),rotation:n.rotation+(n.labelDirection<0?Math.PI:0)}},updateHandleTransform:function(t,e,i,n){var o=i.axis,a=o.grid,r=o.getGlobalExtent(!0),s=ug(a,o).getOtherAxis(o).getGlobalExtent(),l="x"===o.dim?0:1,h=t.position;h[l]+=e[l],h[l]=Math.min(r[1],h[l]),h[l]=Math.max(r[0],h[l]);var u=(s[1]+s[0])/2,c=[u,u];c[l]=h[l];var d=[{verticalAlign:"middle"},{align:"center"}];return{position:h,rotation:t.rotation,cursorPoint:c,tooltipOption:d[l]}}}),wL={line:function(t,e,i,n){var o=sg([e,i[0]],[e,i[1]],cg(t));return Vn({shape:o,style:n}),{type:"Line",shape:o}},shadow:function(t,e,i,n){var o=t.getBandWidth(),a=i[1]-i[0];return{type:"Rect",shape:lg([e-o/2,i[0]],[o,a],cg(t))}}};XT.registerAxisPointerClass("CartesianAxisPointer",_L),ss(function(t){if(t){(!t.axisPointer||0===t.axisPointer.length)&&(t.axisPointer={});var e=t.axisPointer.link;e&&!y(e)&&(t.axisPointer.link=[e])}}),ls(FM.PROCESSOR.STATISTIC,function(t,e){t.getComponent("axisPointer").coordSysAxesInfo=uh(t,e)}),hs({type:"updateAxisPointer",event:"updateAxisPointer",update:":updateAxisPointer"},function(t,e,i){var n=t.currTrigger,o=[t.x,t.y],a=t,r=t.dispatchAction||m(i.dispatchAction,i),s=e.getComponent("axisPointer").coordSysAxesInfo;if(s){Wp(o)&&(o=uL({seriesIndex:a.seriesIndex,dataIndex:a.dataIndex},e).point);var l=Wp(o),h=a.axesInfo,u=s.axesInfo,c="leave"===n||Wp(o),d={},f={},p={list:[],map:{}},g={showPointer:dL(Np,f),showTooltip:dL(Ep,p)};cL(s.coordSysMap,function(t,e){var i=l||t.containPoint(o);cL(s.coordSysAxesInfo[e],function(t,e){var n=t.axis,a=Vp(h,t);if(!c&&i&&(!h||a)){var r=a&&a.value;null!=r||l||(r=n.pointToData(o)),null!=r&&Pp(t,r,g,!1,d)}})});var v={};return cL(u,function(t,e){var i=t.linkGroup;i&&!f[e]&&cL(i.axesInfo,function(e,n){var o=f[n];if(e!==t&&o){var a=o.value;i.mapper&&(a=t.axis.scale.parse(i.mapper(a,Gp(e),Gp(t)))),v[t.key]=a}})}),cL(v,function(t,e){Pp(u[e],t,g,!0,d)}),zp(f,u,d),Rp(p,o,t,r),Bp(u,0,i),d}});var bL=["x","y"],SL=["width","height"],ML=qp.extend({makeElOption:function(t,e,i,n,o){var a=i.axis,r=a.coordinateSystem,s=fg(r,1-dg(a)),l=r.dataToPoint(e)[0],h=n.get("type");if(h&&"none"!==h){var u=eg(n),c=IL[h](a,l,s,u);c.style=u,t.graphicKey=c.type,t.pointer=c}rg(e,t,kp(i),i,n,o)},getHandleTransform:function(t,e,i){var n=kp(e,{labelInside:!1});return n.labelMargin=i.get("handle.margin"),{position:ag(e.axis,t,n),rotation:n.rotation+(n.labelDirection<0?Math.PI:0)}},updateHandleTransform:function(t,e,i,n){var o=i.axis,a=o.coordinateSystem,r=dg(o),s=fg(a,r),l=t.position;l[r]+=e[r],l[r]=Math.min(s[1],l[r]),l[r]=Math.max(s[0],l[r]);var h=fg(a,1-r),u=(h[1]+h[0])/2,c=[u,u];return c[r]=l[r],{position:l,rotation:t.rotation,cursorPoint:c,tooltipOption:{verticalAlign:"middle"}}}}),IL={line:function(t,e,i,n){var o=sg([e,i[0]],[e,i[1]],dg(t));return Vn({shape:o,style:n}),{type:"Line",shape:o}},shadow:function(t,e,i,n){var o=t.getBandWidth(),a=i[1]-i[0];return{type:"Rect",shape:lg([e-o/2,i[0]],[o,a],dg(t))}}};XT.registerAxisPointerClass("SingleAxisPointer",ML),ms({type:"single"});var TL=uM.extend({type:"series.themeRiver",dependencies:["singleAxis"],nameMap:null,init:function(t){TL.superApply(this,"init",arguments),this.legendDataProvider=function(){return this.getRawData()}},fixData:function(t){for(var e=t.length,i=f(mf().key(function(t){return t[2]}).entries(t),function(t){return{name:t.key,dataList:t.values}}),n=i.length,o=-1,a=-1,r=0;r<n;++r){var s=i[r].dataList.length;s>o&&(o=s,a=r)}for(var l=0;l<n;++l)if(l!==a)for(var h=i[l].name,u=0;u<o;++u){for(var c=i[a].dataList[u][0],d=i[l].dataList.length,p=-1,g=0;g<d;++g)if(i[l].dataList[g][0]===c){p=g;break}-1===p&&(t[e]=[],t[e][0]=c,t[e][1]=0,t[e][2]=h,e++)}return t},getInitialData:function(t,e){for(var i=e.queryComponents({mainType:"singleAxis",index:this.get("singleAxisIndex"),id:this.get("singleAxisId")})[0].get("type"),n=g(t.data,function(t){return void 0!==t[2]}),o=this.fixData(n||[]),a=[],r=this.nameMap=z(),s=0,l=0;l<o.length;++l)a.push(o[l][2]),r.get(o[l][2])||(r.set(o[l][2],s),s++);var h=wI(o,{coordDimensions:["single"],dimensionsDefine:[{name:"time",type:Ms(i)},{name:"value",type:"float"},{name:"name",type:"ordinal"}],encodeDefine:{single:0,value:1,itemName:2}}),u=new yI(h,this);return u.initData(o),u},getLayerSeries:function(){for(var t=this.getData(),e=t.count(),i=[],n=0;n<e;++n)i[n]=n;for(var o=f(mf().key(function(e){return t.get("name",e)}).entries(i),function(t){return{name:t.key,indices:t.values}}),a=t.mapDimension("single"),r=0;r<o.length;++r)o[r].indices.sort(function(e,i){return t.get(a,e)-t.get(a,i)});return o},getAxisTooltipData:function(t,e,i){y(t)||(t=t?[t]:[]);for(var n,o=this.getData(),a=this.getLayerSeries(),r=[],s=a.length,l=0;l<s;++l){for(var h=Number.MAX_VALUE,u=-1,c=a[l].indices.length,d=0;d<c;++d){var f=o.get(t[0],a[l].indices[d]),p=Math.abs(f-e);p<=h&&(n=f,h=p,u=a[l].indices[d])}r.push(u)}return{dataIndices:r,nestestValue:n}},formatTooltip:function(t){var e=this.getData(),i=e.getName(t),n=e.get(e.mapDimension("value"),t);return(isNaN(n)||null==n)&&(n="-"),Ho(i+" : "+n)},defaultOption:{zlevel:0,z:2,coordinateSystem:"singleAxis",boundaryGap:["10%","10%"],singleAxisIndex:0,animationEasing:"linear",label:{margin:4,textAlign:"right",show:!0,position:"left",color:"#000",fontSize:11},emphasis:{label:{show:!0}}}});ys({type:"themeRiver",init:function(){this._layers=[]},render:function(t,e,i){function n(t){return t.name}function o(e,i,n){var o=this._layers;if("remove"!==e){for(var h,u=[],c=[],f=l[i].indices,p=0;p<f.length;p++){var g=r.getItemLayout(f[p]),m=g.x,v=g.y0,y=g.y;u.push([m,v]),c.push([m,v+y]),h=r.getItemVisual(f[p],"color")}var x,_,w=r.getItemLayout(f[0]),b=r.getItemModel(f[p-1]),S=b.getModel("label"),M=S.get("margin");if("add"===e){I=d[i]=new S_;x=new wT({shape:{points:u,stackedOnPoints:c,smooth:.4,stackedOnSmooth:.4,smoothConstraint:!1},z2:0}),_=new Cb({style:{x:w.x-M,y:w.y0+w.y/2}}),I.add(x),I.add(_),s.add(I),x.setClipPath(pg(x.getBoundingRect(),t,function(){x.removeClipPath()}))}else{var I=o[n];x=I.childAt(0),_=I.childAt(1),s.add(I),d[i]=I,co(x,{shape:{points:u,stackedOnPoints:c}},t),co(_,{style:{x:w.x-M,y:w.y0+w.y/2}},t)}var T=b.getModel("emphasis.itemStyle"),A=b.getModel("itemStyle");io(_.style,S,{text:S.get("show")?t.getFormattedLabel(f[p-1],"normal")||r.getName(f[p-1]):null,textVerticalAlign:"middle"}),x.setStyle(a({fill:h},A.getItemStyle(["color"]))),to(x,T.getItemStyle())}else s.remove(o[i])}var r=t.getData(),s=this.group,l=t.getLayerSeries(),h=r.getLayout("layoutInfo"),u=h.rect,c=h.boundaryGap;s.attr("position",[0,u.y+c[0]]);var d={};new ws(this._layersSeries||[],l,n,n).add(m(o,this,"add")).update(m(o,this,"update")).remove(m(o,this,"remove")).execute(),this._layersSeries=l,this._layers=d},dispose:function(){}});cs(function(t,e){t.eachSeriesByType("themeRiver",function(t){var e=t.getData(),i=t.coordinateSystem,n={},o=i.getRect();n.rect=o;var a=t.get("boundaryGap"),r=i.getAxis();n.boundaryGap=a,"horizontal"===r.orient?(a[0]=To(a[0],o.height),a[1]=To(a[1],o.height),gg(e,t,o.height-a[0]-a[1])):(a[0]=To(a[0],o.width),a[1]=To(a[1],o.width),gg(e,t,o.width-a[0]-a[1])),e.setLayout("layoutInfo",n)})}),ds(function(t){t.eachSeriesByType("themeRiver",function(t){var e=t.getData(),i=t.getRawData(),n=t.get("color"),o=z();e.each(function(t){o.set(e.getRawIndex(t),t)}),i.each(function(a){var r=i.getName(a),s=n[(t.nameMap.get(r)-1)%n.length];i.setItemVisual(a,"color",s);var l=o.get(a);null!=l&&e.setItemVisual(l,"color",s)})})}),ls(gA("themeRiver")),uM.extend({type:"series.sunburst",_viewRoot:null,getInitialData:function(t,e){var i={name:t.name,children:t.data};vg(i);var n=t.levels||[],o={};return o.levels=n,bu.createTree(i,this,o).data},optionUpdated:function(){this.resetViewRoot()},getDataParams:function(t){var e=uM.prototype.getDataParams.apply(this,arguments),i=this.getData().tree.getNodeByDataIndex(t);return e.treePathInfo=Xu(i,this),e},defaultOption:{zlevel:0,z:2,center:["50%","50%"],radius:[0,"75%"],clockwise:!0,startAngle:90,minAngle:0,percentPrecision:2,stillShowZeroSum:!0,highlightPolicy:"descendant",nodeClick:"rootToNode",renderLabelForZeroData:!1,label:{rotate:"radial",show:!0,opacity:1,align:"center",position:"inside",distance:5,silent:!0,emphasis:{}},itemStyle:{borderWidth:1,borderColor:"white",opacity:1,emphasis:{},highlight:{opacity:1},downplay:{opacity:.9}},animationType:"expansion",animationDuration:1e3,animationDurationUpdate:500,animationEasing:"cubicOut",data:[],levels:[],sort:"desc"},getViewRoot:function(){return this._viewRoot},resetViewRoot:function(t){t?this._viewRoot=t:t=this._viewRoot;var e=this.getRawData().tree.root;t&&(t===e||e.contains(t))||(this._viewRoot=e)}});var AL={NONE:"none",DESCENDANT:"descendant",ANCESTOR:"ancestor",SELF:"self"},DL=2,CL=4,LL=yg.prototype;LL.updateData=function(t,e,i,o,s){this.node=e,e.piece=this,o=o||this._seriesModel,s=s||this._ecModel;var l=this.childAt(0);l.dataIndex=e.dataIndex;var h=e.getModel(),u=e.getLayout(),c=a({},u);c.label=null;var d,f=xg(e,0,s),p=h.getModel("itemStyle").getItemStyle();d=r({lineJoin:"bevel",fill:(d="normal"===i?p:n(h.getModel(i+".itemStyle").getItemStyle(),p)).fill||f},d),t?(l.setShape(c),l.shape.r=u.r0,co(l,{shape:{r:u.r}},o,e.dataIndex),l.useStyle(d)):co(l,{shape:c,style:d},o),"normal"===i&&(l.hoverStyle=h.getModel("emphasis.itemStyle").getItemStyle(),to(this)),this._updateLabel(o,s,f);var g=h.getShallow("cursor");if(g&&l.attr("cursor",g),t){var m=o.getShallow("highlightPolicy");this._initEvents(l,e,o,m)}this._seriesModel=o||this._seriesModel,this._ecModel=s||this._ecModel},LL.onEmphasis=function(t){var e=this;this.node.hostTree.root.eachNode(function(i){i.piece&&(e.node===i?i.piece.updateData(!1,i,"emphasis"):wg(i,e.node,t)?i.piece.childAt(0).trigger("highlight"):t!==AL.NONE&&i.piece.childAt(0).trigger("downplay"))})},LL.onNormal=function(){this.node.hostTree.root.eachNode(function(t){t.piece&&t.piece.updateData(!1,t,"normal")})},LL.onHighlight=function(){this.updateData(!1,this.node,"highlight")},LL.onDownplay=function(){this.updateData(!1,this.node,"downplay")},LL._updateLabel=function(t,e,i){var n=this.node.getModel(),o=n.getModel("label"),a=n.getModel("label.emphasis"),r=T(t.getFormattedLabel(this.node.dataIndex,"normal",null,null,"label"),this.node.name);o.get("show")||(r="");var s=this.childAt(1);eo(s.style,s.hoverStyle={},o,a,{defaultText:o.getShallow("show")?r:null,autoColor:i,useInsideStyle:!0});var l,h=this.node.getLayout(),u=(h.startAngle+h.endAngle)/2,c=Math.cos(u),d=Math.sin(u),f=o.get("position"),p=o.get("distance")||0,g=o.get("align");"outside"===f?(l=h.r+p,g=u>Math.PI/2?"right":"left"):g&&"center"!==g?"left"===g?(l=h.r0+p,u>Math.PI/2&&(g="right")):"right"===g&&(l=h.r-p,u>Math.PI/2&&(g="left")):(l=(h.r+h.r0)/2,g="center"),s.attr("style",{text:r,textAlign:g,textVerticalAlign:o.get("verticalAlign")||"middle",opacity:o.get("opacity")});var m=l*c+h.cx,v=l*d+h.cy;s.attr("position",[m,v]);var y=o.getShallow("rotate"),x=0;"radial"===y?(x=-u)<-Math.PI/2&&(x+=Math.PI):"tangential"===y?(x=Math.PI/2-u)>Math.PI/2?x-=Math.PI:x<-Math.PI/2&&(x+=Math.PI):"number"==typeof y&&(x=y*Math.PI/180),s.attr("rotation",x)},LL._initEvents=function(t,e,i,n){t.off("mouseover").off("mouseout").off("emphasis").off("normal");var o=this,a=function(){o.onEmphasis(n)},r=function(){o.onNormal()};i.isAnimationEnabled()&&t.on("mouseover",a).on("mouseout",r).on("emphasis",a).on("normal",r).on("downplay",function(){o.onDownplay()}).on("highlight",function(){o.onHighlight()})},h(yg,S_);cr.extend({type:"sunburst",init:function(){},render:function(t,e,i,n){function o(i,n){if(u||!i||i.getValue()||(i=null),i!==s&&n!==s)if(n&&n.piece)i?n.piece.updateData(!1,i,"normal",t,e):a(n);else if(i){var o=new yg(i,t,e);h.add(o)}}function a(t){t&&t.piece&&(h.remove(t.piece),t.piece=null)}var r=this;this.seriesModel=t,this.api=i,this.ecModel=e;var s=t.getData().tree.root,l=t.getViewRoot(),h=this.group,u=t.get("renderLabelForZeroData"),c=[];l.eachNode(function(t){c.push(t)});var d=this._oldChildren||[];if(function(t,e){function i(t){return t.getId()}function n(i,n){o(null==i?null:t[i],null==n?null:e[n])}0===t.length&&0===e.length||new ws(e,t,i,i).add(n).update(n).remove(v(n,null)).execute()}(c,d),function(i,n){if(n.depth>0){i.piece?i.piece.updateData(!1,i,"normal",t,e):(i.piece=new yg(i,t,e),h.add(i.piece)),n.piece._onclickEvent&&n.piece.off("click",n.piece._onclickEvent);var o=function(t){r._rootToNode(n.parentNode)};n.piece._onclickEvent=o,i.piece.on("click",o)}else i.piece&&(h.remove(i.piece),i.piece=null)}(s,l),n&&n.highlight&&n.highlight.piece){var f=t.getShallow("highlightPolicy");n.highlight.piece.onEmphasis(f)}else if(n&&n.unhighlight){var p=s.piece;!p&&s.children.length&&(p=s.children[0].piece),p&&p.onNormal()}this._initEvents(),this._oldChildren=c},dispose:function(){},_initEvents:function(){var t=this,e=function(e){var i=t.seriesModel.get("nodeClick",!0);if(i){var n=!1;t.seriesModel.getViewRoot().eachNode(function(o){if(!n&&o.piece&&o.piece.childAt(0)===e.target){if("rootToNode"===i)t._rootToNode(o);else if("link"===i){var a=o.getModel(),r=a.get("link",!0);if(r){var s=a.get("target",!0)||"_blank";r&&window.open(r,s)}}n=!0}})}};this.group._onclickEvent&&this.group.off("click",this.group._onclickEvent),this.group.on("click",e),this.group._onclickEvent=e},_rootToNode:function(t){t!==this.seriesModel.getViewRoot()&&this.api.dispatchAction({type:"sunburstRootToNode",from:this.uid,seriesId:this.seriesModel.id,targetNode:t})},containPoint:function(t,e){var i=e.getData().getItemLayout(0);if(i){var n=t[0]-i.cx,o=t[1]-i.cy,a=Math.sqrt(n*n+o*o);return a<=i.r&&a>=i.r0}}});var kL="sunburstRootToNode";hs({type:kL,update:"updateView"},function(t,e){e.eachComponent({mainType:"series",subType:"sunburst",query:t},function(e,i){var n=Zu(t,[kL],e);if(n){var o=e.getViewRoot();o&&(t.direction=ju(o,n.node)?"rollUp":"drillDown"),e.resetViewRoot(n.node)}})});var PL="sunburstHighlight";hs({type:PL,update:"updateView"},function(t,e){e.eachComponent({mainType:"series",subType:"sunburst",query:t},function(e,i){var n=Zu(t,[PL],e);n&&(t.highlight=n.node)})});hs({type:"sunburstUnhighlight",update:"updateView"},function(t,e){e.eachComponent({mainType:"series",subType:"sunburst",query:t},function(e,i){t.unhighlight=!0})});var OL=Math.PI/180;ds(v(cA,"sunburst")),cs(v(function(t,e,i,n){e.eachSeriesByType(t,function(t){var e=t.get("center"),n=t.get("radius");y(n)||(n=[0,n]),y(e)||(e=[e,e]);var o=i.getWidth(),a=i.getHeight(),r=Math.min(o,a),s=To(e[0],o),l=To(e[1],a),h=To(n[0],r/2),u=To(n[1],r/2),c=-t.get("startAngle")*OL,f=t.get("minAngle")*OL,p=t.getData().tree.root,g=t.getViewRoot(),m=g.depth,v=t.get("sort");null!=v&&bg(g,v);var x=0;d(g.children,function(t){!isNaN(t.getValue())&&x++});var _=g.getValue(),w=Math.PI/(_||x)*2,b=g.depth>0,S=g.height-(b?-1:1),M=(u-h)/(S||1),I=t.get("clockwise"),T=t.get("stillShowZeroSum"),A=I?1:-1,D=function(t,e){if(t){var i=e;if(t!==p){var n=t.getValue(),o=0===_&&T?w:n*w;o<f&&(o=f),i=e+A*o;var a=t.depth-m-(b?-1:1),u=h+M*a,c=h+M*(a+1),g=t.getModel();null!=g.get("r0")&&(u=To(g.get("r0"),r/2)),null!=g.get("r")&&(c=To(g.get("r"),r/2)),t.setLayout({angle:o,startAngle:e,endAngle:i,clockwise:I,cx:s,cy:l,r0:u,r:c})}if(t.children&&t.children.length){var v=0;d(t.children,function(t){v+=D(t,e+v)})}return i-e}};if(b){var C=h,L=h+M,k=2*Math.PI;p.setLayout({angle:k,startAngle:c,endAngle:c+k,clockwise:I,cx:s,cy:l,r0:C,r:L})}D(g,c)})},"sunburst")),ls(v(gA,"sunburst"));var NL=["itemStyle"],EL=["emphasis","itemStyle"],zL=["label"],RL=["emphasis","label"],BL="e\0\0",VL={cartesian2d:function(t){var e=t.grid.getRect();return{coordSys:{type:"cartesian2d",x:e.x,y:e.y,width:e.width,height:e.height},api:{coord:function(e){return t.dataToPoint(e)},size:m(Mg,t)}}},geo:function(t){var e=t.getBoundingRect();return{coordSys:{type:"geo",x:e.x,y:e.y,width:e.width,height:e.height},api:{coord:function(e,i){return t.dataToPoint(e,i)},size:m(Ig,t)}}},singleAxis:function(t){var e=t.getRect();return{coordSys:{type:"singleAxis",x:e.x,y:e.y,width:e.width,height:e.height},api:{coord:function(e){return t.dataToPoint(e)},size:m(Tg,t)}}},polar:function(t){var e=t.getRadiusAxis(),i=t.getAngleAxis(),n=e.getExtent();return n[0]>n[1]&&n.reverse(),{coordSys:{type:"polar",cx:t.cx,cy:t.cy,r:n[1],r0:n[0]},api:{coord:m(function(n){var o=e.dataToRadius(n[0]),a=i.dataToAngle(n[1]),r=t.coordToPoint([o,a]);return r.push(o,a*Math.PI/180),r}),size:m(Ag,t)}}},calendar:function(t){var e=t.getRect(),i=t.getRangeInfo();return{coordSys:{type:"calendar",x:e.x,y:e.y,width:e.width,height:e.height,cellWidth:t.getCellWidth(),cellHeight:t.getCellHeight(),rangeInfo:{start:i.start,end:i.end,weeks:i.weeks,dayCount:i.allDay}},api:{coord:function(e,i){return t.dataToPoint(e,i)}}}}};vs({type:"series.custom",dependencies:["grid","polar","geo","singleAxis","calendar"],defaultOption:{coordinateSystem:"cartesian2d",zlevel:0,z:2,legendHoverLink:!0},getInitialData:function(t,e){return Bs(this.getSource(),this)}}),ys({type:"custom",_data:null,render:function(t,e,i){var n=this._data,o=t.getData(),a=this.group,r=kg(t,o,e,i);this.group.removeAll(),o.diff(n).add(function(e){o.hasValue(e)&&Og(null,e,r(e),t,a,o)}).update(function(e,i){var s=n.getItemGraphicEl(i);o.hasValue(e)?Og(s,e,r(e),t,a,o):s&&a.remove(s)}).remove(function(t){var e=n.getItemGraphicEl(t);e&&a.remove(e)}).execute(),this._data=o},incrementalPrepareRender:function(t,e,i){this.group.removeAll(),this._data=null},incrementalRender:function(t,e,i,n){for(var o=e.getData(),a=kg(e,o,i,n),r=t.start;r<t.end;r++)Og(null,r,a(r),e,this.group,o).traverse(function(t){t.isGroup||(t.incremental=!0,t.useHoverLayer=!0)})},dispose:B}),ss(function(t){var e=t.graphic;y(e)?e[0]&&e[0].elements?t.graphic=[t.graphic[0]]:t.graphic=[{elements:e}]:e&&!e.elements&&(t.graphic=[{elements:[e]}])});var GL=gs({type:"graphic",defaultOption:{elements:[],parentId:null},_elOptionsToUpdate:null,mergeOption:function(t){var e=this.option.elements;this.option.elements=null,GL.superApply(this,"mergeOption",arguments),this.option.elements=e},optionUpdated:function(t,e){var i=this.option,n=(e?i:t).elements,o=i.elements=e?[]:i.elements,a=[];this._flatten(n,a);var r=Ai(o,a);Di(r);var s=this._elOptionsToUpdate=[];d(r,function(t,e){var i=t.option;i&&(s.push(i),Hg(t,i),Zg(o,e,i),Ug(o[e],i))},this);for(var l=o.length-1;l>=0;l--)null==o[l]?o.splice(l,1):delete o[l].$action},_flatten:function(t,e,i){d(t,function(t){if(t){i&&(t.parentOption=i),e.push(t);var n=t.children;"group"===t.type&&n&&this._flatten(n,e,t),delete t.children}},this)},useElOptionsToUpdate:function(){var t=this._elOptionsToUpdate;return this._elOptionsToUpdate=null,t}});ms({type:"graphic",init:function(t,e){this._elMap=z(),this._lastGraphicModel},render:function(t,e,i){t!==this._lastGraphicModel&&this._clear(),this._lastGraphicModel=t,this._updateElements(t,i),this._relocate(t,i)},_updateElements:function(t,e){var i=t.useElOptionsToUpdate();if(i){var n=this._elMap,o=this.group;d(i,function(t){var e=t.$action,i=t.id,a=n.get(i),r=t.parentId,s=null!=r?n.get(r):o;if("text"===t.type){var l=t.style;t.hv&&t.hv[1]&&(l.textVerticalAlign=l.textBaseline=null),!l.hasOwnProperty("textFill")&&l.fill&&(l.textFill=l.fill),!l.hasOwnProperty("textStroke")&&l.stroke&&(l.textStroke=l.stroke)}var h=Wg(t);e&&"merge"!==e?"replace"===e?(Gg(a,n),Vg(i,s,h,n)):"remove"===e&&Gg(a,n):a?a.attr(h):Vg(i,s,h,n);var u=n.get(i);u&&(u.__ecGraphicWidth=t.width,u.__ecGraphicHeight=t.height)})}},_relocate:function(t,e){for(var i=t.option.elements,n=this.group,o=this._elMap,a=i.length-1;a>=0;a--){var r=i[a],s=o.get(r.id);if(s){var l=s.parent;Jo(s,r,l===n?{width:e.getWidth(),height:e.getHeight()}:{width:l.__ecGraphicWidth||0,height:l.__ecGraphicHeight||0},null,{hv:r.hv,boundingMode:r.bounding})}}},_clear:function(){var t=this._elMap;t.each(function(e){Gg(e,t)}),this._elMap=z()},dispose:function(){this._clear()}});var WL=gs({type:"legend.plain",dependencies:["series"],layoutMode:{type:"box",ignoreSize:!0},init:function(t,e,i){this.mergeDefaultAndTheme(t,i),t.selected=t.selected||{}},mergeOption:function(t){WL.superCall(this,"mergeOption",t)},optionUpdated:function(){this._updateData(this.ecModel);var t=this._data;if(t[0]&&"single"===this.get("selectedMode")){for(var e=!1,i=0;i<t.length;i++){var n=t[i].get("name");if(this.isSelected(n)){this.select(n),e=!0;break}}!e&&this.select(t[0].get("name"))}},_updateData:function(t){var e=[],i=[];t.eachRawSeries(function(n){var o=n.name;i.push(o);var a;if(n.legendDataProvider){var r=n.legendDataProvider(),s=r.mapArray(r.getName);t.isSeriesFiltered(n)||(i=i.concat(s)),s.length?e=e.concat(s):a=o}else a=o;a&&a!==vw&&e.push(a)}),this._availableNames=i;var n=f(this.get("data")||e,function(t){return"string"!=typeof t&&"number"!=typeof t||(t={name:t}),new _o(t,this,this.ecModel)},this);this._data=n},getData:function(){return this._data},select:function(t){var e=this.option.selected;"single"===this.get("selectedMode")&&d(this._data,function(t){e[t.get("name")]=!1}),e[t]=!0},unSelect:function(t){"single"!==this.get("selectedMode")&&(this.option.selected[t]=!1)},toggleSelected:function(t){var e=this.option.selected;e.hasOwnProperty(t)||(e[t]=!0),this[e[t]?"unSelect":"select"](t)},isSelected:function(t){var e=this.option.selected;return!(e.hasOwnProperty(t)&&!e[t])&&l(this._availableNames,t)>=0},defaultOption:{zlevel:0,z:4,show:!0,orient:"horizontal",left:"center",top:0,align:"auto",backgroundColor:"rgba(0,0,0,0)",borderColor:"#ccc",borderRadius:0,borderWidth:0,padding:5,itemGap:10,itemWidth:25,itemHeight:14,inactiveColor:"#ccc",textStyle:{color:"#333"},selectedMode:!0,tooltip:{show:!1}}});hs("legendToggleSelect","legendselectchanged",v(jg,"toggleSelected")),hs("legendSelect","legendselected",v(jg,"select")),hs("legendUnSelect","legendunselected",v(jg,"unSelect"));var FL=v,HL=d,ZL=S_,UL=ms({type:"legend.plain",newlineDisabled:!1,init:function(){this.group.add(this._contentGroup=new ZL),this._backgroundEl},getContentGroup:function(){return this._contentGroup},render:function(t,e,i){if(this.resetInner(),t.get("show",!0)){var n=t.get("align");n&&"auto"!==n||(n="right"===t.get("left")&&"vertical"===t.get("orient")?"right":"left"),this.renderInner(n,t,e,i);var o=t.getBoxLayoutParams(),a={width:i.getWidth(),height:i.getHeight()},s=t.get("padding"),l=Ko(o,a,s),h=this.layoutInner(t,n,l),u=Ko(r({width:h.width,height:h.height},o),a,s);this.group.attr("position",[u.x-h.x,u.y-h.y]),this.group.add(this._backgroundEl=Yg(h,t))}},resetInner:function(){this.getContentGroup().removeAll(),this._backgroundEl&&this.group.remove(this._backgroundEl)},renderInner:function(t,e,i,n){var o=this.getContentGroup(),a=z(),r=e.get("selectedMode");HL(e.getData(),function(s,l){var h=s.get("name");if(this.newlineDisabled||""!==h&&"\n"!==h){var u=i.getSeriesByName(h)[0];if(!a.get(h))if(u){var c=u.getData(),d=c.getVisual("color");"function"==typeof d&&(d=d(u.getDataParams(0)));var f=c.getVisual("legendSymbol")||"roundRect",p=c.getVisual("symbol");this._createItem(h,l,s,e,f,p,t,d,r).on("click",FL(qg,h,n)).on("mouseover",FL($g,u,null,n)).on("mouseout",FL(Kg,u,null,n)),a.set(h,!0)}else i.eachRawSeries(function(i){if(!a.get(h)&&i.legendDataProvider){var o=i.legendDataProvider(),u=o.indexOfName(h);if(u<0)return;var c=o.getItemVisual(u,"color");this._createItem(h,l,s,e,"roundRect",null,t,c,r).on("click",FL(qg,h,n)).on("mouseover",FL($g,i,h,n)).on("mouseout",FL(Kg,i,h,n)),a.set(h,!0)}},this)}else o.add(new ZL({newline:!0}))},this)},_createItem:function(t,e,i,n,o,r,s,l,h){var u=n.get("itemWidth"),c=n.get("itemHeight"),d=n.get("inactiveColor"),f=n.isSelected(t),p=new ZL,g=i.getModel("textStyle"),m=i.get("icon"),v=i.getModel("tooltip"),y=v.parentModel;if(o=m||o,p.add(dl(o,0,0,u,c,f?l:d,!0)),!m&&r&&(r!==o||"none"==r)){var x=.8*c;"none"===r&&(r="circle"),p.add(dl(r,(u-x)/2,(c-x)/2,x,x,f?l:d))}var _="left"===s?u+5:-5,w=s,b=n.get("formatter"),S=t;"string"==typeof b&&b?S=b.replace("{name}",null!=t?t:""):"function"==typeof b&&(S=b(t)),p.add(new Cb({style:io({},g,{text:S,x:_,y:c/2,textFill:f?g.getTextColor():d,textAlign:w,textVerticalAlign:"middle"})}));var M=new Vb({shape:p.getBoundingRect(),invisible:!0,tooltip:v.get("show")?a({content:t,formatter:y.get("formatter",!0)||function(){return t},formatterParams:{componentType:"legend",legendIndex:n.componentIndex,name:t,$vars:["name"]}},v.option):null});return p.add(M),p.eachChild(function(t){t.silent=!0}),M.silent=!h,this.getContentGroup().add(p),to(p),p.__legendDataIndex=e,p},layoutInner:function(t,e,i){var n=this.getContentGroup();bS(t.get("orient"),n,t.get("itemGap"),i.width,i.height);var o=n.getBoundingRect();return n.attr("position",[-o.x,-o.y]),this.group.getBoundingRect()}});ls(function(t){var e=t.findComponents({mainType:"legend"});e&&e.length&&t.filterSeries(function(t){for(var i=0;i<e.length;i++)if(!e[i].isSelected(t.name))return!1;return!0})}),IS.registerSubTypeDefaulter("legend",function(){return"plain"});var jL=WL.extend({type:"legend.scroll",setScrollDataIndex:function(t){this.option.scrollDataIndex=t},defaultOption:{scrollDataIndex:0,pageButtonItemGap:5,pageButtonGap:null,pageButtonPosition:"end",pageFormatter:"{current}/{total}",pageIcons:{horizontal:["M0,0L12,-10L12,10z","M0,0L-12,-10L-12,10z"],vertical:["M0,0L20,0L10,-20z","M0,0L20,0L10,20z"]},pageIconColor:"#2f4554",pageIconInactiveColor:"#aaa",pageIconSize:15,pageTextStyle:{color:"#333"},animationDurationUpdate:800},init:function(t,e,i,n){var o=ea(t);jL.superCall(this,"init",t,e,i,n),Jg(this,t,o)},mergeOption:function(t,e){jL.superCall(this,"mergeOption",t,e),Jg(this,this.option,t)},getOrient:function(){return"vertical"===this.get("orient")?{index:1,name:"vertical"}:{index:0,name:"horizontal"}}}),XL=S_,YL=["width","height"],qL=["x","y"],$L=UL.extend({type:"legend.scroll",newlineDisabled:!0,init:function(){$L.superCall(this,"init"),this._currentIndex=0,this.group.add(this._containerGroup=new XL),this._containerGroup.add(this.getContentGroup()),this.group.add(this._controllerGroup=new XL),this._showController},resetInner:function(){$L.superCall(this,"resetInner"),this._controllerGroup.removeAll(),this._containerGroup.removeClipPath(),this._containerGroup.__rectSize=null},renderInner:function(t,e,i,n){function o(t,i){var o=t+"DataIndex",l=xo(e.get("pageIcons",!0)[e.getOrient().name][i],{onclick:m(a._pageGo,a,o,e,n)},{x:-s[0]/2,y:-s[1]/2,width:s[0],height:s[1]});l.name=t,r.add(l)}var a=this;$L.superCall(this,"renderInner",t,e,i,n);var r=this._controllerGroup,s=e.get("pageIconSize",!0);y(s)||(s=[s,s]),o("pagePrev",0);var l=e.getModel("pageTextStyle");r.add(new Cb({name:"pageText",style:{textFill:l.getTextColor(),font:l.getFont(),textVerticalAlign:"middle",textAlign:"center"},silent:!0})),o("pageNext",1)},layoutInner:function(t,e,i){var n=this.getContentGroup(),o=this._containerGroup,a=this._controllerGroup,r=t.getOrient().index,s=YL[r],l=YL[1-r],h=qL[1-r];bS(t.get("orient"),n,t.get("itemGap"),r?i.width:null,r?null:i.height),bS("horizontal",a,t.get("pageButtonItemGap",!0));var u=n.getBoundingRect(),c=a.getBoundingRect(),d=this._showController=u[s]>i[s],f=[-u.x,-u.y];f[r]=n.position[r];var p=[0,0],g=[-c.x,-c.y],m=A(t.get("pageButtonGap",!0),t.get("itemGap",!0));d&&("end"===t.get("pageButtonPosition",!0)?g[r]+=i[s]-c[s]:p[r]+=c[s]+m),g[1-r]+=u[l]/2-c[l]/2,n.attr("position",f),o.attr("position",p),a.attr("position",g);var v=this.group.getBoundingRect();if((v={x:0,y:0})[s]=d?i[s]:u[s],v[l]=Math.max(u[l],c[l]),v[h]=Math.min(0,c[h]+g[1-r]),o.__rectSize=i[s],d){var y={x:0,y:0};y[s]=Math.max(i[s]-c[s]-m,0),y[l]=v[l],o.setClipPath(new Vb({shape:y})),o.__rectSize=y[s]}else a.eachChild(function(t){t.attr({invisible:!0,silent:!0})});var x=this._getPageInfo(t);return null!=x.pageIndex&&co(n,{position:x.contentPosition},!!d&&t),this._updatePageInfoView(t,x),v},_pageGo:function(t,e,i){var n=this._getPageInfo(e)[t];null!=n&&i.dispatchAction({type:"legendScroll",scrollDataIndex:n,legendId:e.id})},_updatePageInfoView:function(t,e){var i=this._controllerGroup;d(["pagePrev","pageNext"],function(n){var o=null!=e[n+"DataIndex"],a=i.childOfName(n);a&&(a.setStyle("fill",o?t.get("pageIconColor",!0):t.get("pageIconInactiveColor",!0)),a.cursor=o?"pointer":"default")});var n=i.childOfName("pageText"),o=t.get("pageFormatter"),a=e.pageIndex,r=null!=a?a+1:0,s=e.pageCount;n&&o&&n.setStyle("text",_(o)?o.replace("{current}",r).replace("{total}",s):o({current:r,total:s}))},_getPageInfo:function(t){function e(t){var e=t.getBoundingRect().clone();return e[f]+=t.position[u],e}var i,n,o,a,r=t.get("scrollDataIndex",!0),s=this.getContentGroup(),l=s.getBoundingRect(),h=this._containerGroup.__rectSize,u=t.getOrient().index,c=YL[u],d=YL[1-u],f=qL[u],p=s.position.slice();this._showController?s.eachChild(function(t){t.__legendDataIndex===r&&(a=t)}):a=s.childAt(0);var g=h?Math.ceil(l[c]/h):0;if(a){var m=a.getBoundingRect(),v=a.position[u]+m[f];p[u]=-v-l[f],i=Math.floor(g*(v+m[f]+h/2)/l[c]),i=l[c]&&g?Math.max(0,Math.min(g-1,i)):-1;var y={x:0,y:0};y[c]=h,y[d]=l[d],y[f]=-p[u]-l[f];var x,_=s.children();if(s.eachChild(function(t,i){var n=e(t);n.intersect(y)&&(null==x&&(x=i),o=t.__legendDataIndex),i===_.length-1&&n[f]+n[c]<=y[f]+y[c]&&(o=null)}),null!=x){var w=e(_[x]);if(y[f]=w[f]+w[c]-y[c],x<=0&&w[f]>=y[f])n=null;else{for(;x>0&&e(_[x-1]).intersect(y);)x--;n=_[x].__legendDataIndex}}}return{contentPosition:p,pageIndex:i,pageCount:g,pagePrevDataIndex:n,pageNextDataIndex:o}}});hs("legendScroll","legendscroll",function(t,e){var i=t.scrollDataIndex;null!=i&&e.eachComponent({mainType:"legend",subType:"scroll",query:t},function(t){t.setScrollDataIndex(i)})}),gs({type:"tooltip",dependencies:["axisPointer"],defaultOption:{zlevel:0,z:8,show:!0,showContent:!0,trigger:"item",triggerOn:"mousemove|click",alwaysShowContent:!1,displayMode:"single",confine:!1,showDelay:0,hideDelay:100,transitionDuration:.4,enterable:!1,backgroundColor:"rgba(50,50,50,0.7)",borderColor:"#333",borderRadius:4,borderWidth:0,padding:5,extraCssText:"",axisPointer:{type:"line",axis:"auto",animation:"auto",animationDurationUpdate:200,animationEasingUpdate:"exponentialOut",crossStyle:{color:"#999",width:1,type:"dashed",textStyle:{}}},textStyle:{color:"#fff",fontSize:14}}});var KL=d,JL=Fo,QL=["","-webkit-","-moz-","-o-"];im.prototype={constructor:im,_enterable:!0,update:function(){var t=this._container,e=t.currentStyle||document.defaultView.getComputedStyle(t),i=t.style;"absolute"!==i.position&&"absolute"!==e.position&&(i.position="relative")},show:function(t){clearTimeout(this._hideTimeout);var e=this.el;e.style.cssText="position:absolute;display:block;border-style:solid;white-space:nowrap;z-index:9999999;"+em(t)+";left:"+this._x+"px;top:"+this._y+"px;"+(t.get("extraCssText")||""),e.style.display=e.innerHTML?"block":"none",this._show=!0},setContent:function(t){this.el.innerHTML=null==t?"":t},setEnterable:function(t){this._enterable=t},getSize:function(){var t=this.el;return[t.clientWidth,t.clientHeight]},moveTo:function(t,e){var i,n=this._zr;n&&n.painter&&(i=n.painter.getViewportRootOffset())&&(t+=i.offsetLeft,e+=i.offsetTop);var o=this.el.style;o.left=t+"px",o.top=e+"px",this._x=t,this._y=e},hide:function(){this.el.style.display="none",this._show=!1},hideLater:function(t){!this._show||this._inContent&&this._enterable||(t?(this._hideDelay=t,this._show=!1,this._hideTimeout=setTimeout(m(this.hide,this),t)):this.hide())},isShow:function(){return this._show}};var tk=m,ek=d,ik=To,nk=new Vb({shape:{x:-1,y:-1,width:2,height:2}});ms({type:"tooltip",init:function(t,e){if(!_x.node){var i=new im(e.getDom(),e);this._tooltipContent=i}},render:function(t,e,i){if(!_x.node&&!_x.wxa){this.group.removeAll(),this._tooltipModel=t,this._ecModel=e,this._api=i,this._lastDataByCoordSys=null,this._alwaysShowContent=t.get("alwaysShowContent");var n=this._tooltipContent;n.update(),n.setEnterable(t.get("enterable")),this._initGlobalListener(),this._keepShow()}},_initGlobalListener:function(){var t=this._tooltipModel.get("triggerOn");Fp("itemTooltip",this._api,tk(function(e,i,n){"none"!==t&&(t.indexOf(e)>=0?this._tryShow(i,n):"leave"===e&&this._hide(n))},this))},_keepShow:function(){var t=this._tooltipModel,e=this._ecModel,i=this._api;if(null!=this._lastX&&null!=this._lastY&&"none"!==t.get("triggerOn")){var n=this;clearTimeout(this._refreshUpdateTimeout),this._refreshUpdateTimeout=setTimeout(function(){n.manuallyShowTip(t,e,i,{x:n._lastX,y:n._lastY})})}},manuallyShowTip:function(t,e,i,n){if(n.from!==this.uid&&!_x.node){var o=om(n,i);this._ticket="";var a=n.dataByCoordSys;if(n.tooltip&&null!=n.x&&null!=n.y){var r=nk;r.position=[n.x,n.y],r.update(),r.tooltip=n.tooltip,this._tryShow({offsetX:n.x,offsetY:n.y,target:r},o)}else if(a)this._tryShow({offsetX:n.x,offsetY:n.y,position:n.position,event:{},dataByCoordSys:n.dataByCoordSys,tooltipOption:n.tooltipOption},o);else if(null!=n.seriesIndex){if(this._manuallyAxisShowTip(t,e,i,n))return;var s=uL(n,e),l=s.point[0],h=s.point[1];null!=l&&null!=h&&this._tryShow({offsetX:l,offsetY:h,position:n.position,target:s.el,event:{}},o)}else null!=n.x&&null!=n.y&&(i.dispatchAction({type:"updateAxisPointer",x:n.x,y:n.y}),this._tryShow({offsetX:n.x,offsetY:n.y,position:n.position,target:i.getZr().findHover(n.x,n.y).target,event:{}},o))}},manuallyHideTip:function(t,e,i,n){var o=this._tooltipContent;!this._alwaysShowContent&&this._tooltipModel&&o.hideLater(this._tooltipModel.get("hideDelay")),this._lastX=this._lastY=null,n.from!==this.uid&&this._hide(om(n,i))},_manuallyAxisShowTip:function(t,e,i,n){var o=n.seriesIndex,a=n.dataIndex,r=e.getComponent("axisPointer").coordSysAxesInfo;if(null!=o&&null!=a&&null!=r){var s=e.getSeriesByIndex(o);if(s&&"axis"===(t=nm([s.getData().getItemModel(a),s,(s.coordinateSystem||{}).model,t])).get("trigger"))return i.dispatchAction({type:"updateAxisPointer",seriesIndex:o,dataIndex:a,position:n.position}),!0}},_tryShow:function(t,e){var i=t.target;if(this._tooltipModel){this._lastX=t.offsetX,this._lastY=t.offsetY;var n=t.dataByCoordSys;n&&n.length?this._showAxisTooltip(n,t):i&&null!=i.dataIndex?(this._lastDataByCoordSys=null,this._showSeriesItemTooltip(t,i,e)):i&&i.tooltip?(this._lastDataByCoordSys=null,this._showComponentItemTooltip(t,i,e)):(this._lastDataByCoordSys=null,this._hide(e))}},_showOrMove:function(t,e){var i=t.get("showDelay");e=m(e,this),clearTimeout(this._showTimout),i>0?this._showTimout=setTimeout(e,i):e()},_showAxisTooltip:function(t,e){var i=this._ecModel,n=this._tooltipModel,o=[e.offsetX,e.offsetY],a=[],r=[],s=nm([e.tooltipOption,n]);ek(t,function(t){ek(t.dataByAxis,function(t){var e=i.getComponent(t.axisDim+"Axis",t.axisIndex),n=t.value,o=[];if(e&&null!=n){var s=og(n,e.axis,i,t.seriesDataIndices,t.valueLabelOpt);d(t.seriesDataIndices,function(a){var l=i.getSeriesByIndex(a.seriesIndex),h=a.dataIndexInside,u=l&&l.getDataParams(h);u.axisDim=t.axisDim,u.axisIndex=t.axisIndex,u.axisType=t.axisType,u.axisId=t.axisId,u.axisValue=ul(e.axis,n),u.axisValueLabel=s,u&&(r.push(u),o.push(l.formatTooltip(h,!0)))});var l=s;a.push((l?Ho(l)+"<br />":"")+o.join("<br />"))}})},this),a.reverse(),a=a.join("<br /><br />");var l=e.position;this._showOrMove(s,function(){this._updateContentNotChangedOnAxis(t)?this._updatePosition(s,l,o[0],o[1],this._tooltipContent,r):this._showTooltipContent(s,a,r,Math.random(),o[0],o[1],l)})},_showSeriesItemTooltip:function(t,e,i){var n=this._ecModel,o=e.seriesIndex,a=n.getSeriesByIndex(o),r=e.dataModel||a,s=e.dataIndex,l=e.dataType,h=r.getData(),u=nm([h.getItemModel(s),r,a&&(a.coordinateSystem||{}).model,this._tooltipModel]),c=u.get("trigger");if(null==c||"item"===c){var d=r.getDataParams(s,l),f=r.formatTooltip(s,!1,l),p="item_"+r.name+"_"+s;this._showOrMove(u,function(){this._showTooltipContent(u,f,d,p,t.offsetX,t.offsetY,t.position,t.target)}),i({type:"showTip",dataIndexInside:s,dataIndex:h.getRawIndex(s),seriesIndex:o,from:this.uid})}},_showComponentItemTooltip:function(t,e,i){var n=e.tooltip;if("string"==typeof n){var o=n;n={content:o,formatter:o}}var a=new _o(n,this._tooltipModel,this._ecModel),r=a.get("content"),s=Math.random();this._showOrMove(a,function(){this._showTooltipContent(a,r,a.get("formatterParams")||{},s,t.offsetX,t.offsetY,t.position,e)}),i({type:"showTip",from:this.uid})},_showTooltipContent:function(t,e,i,n,o,a,r,s){if(this._ticket="",t.get("showContent")&&t.get("show")){var l=this._tooltipContent,h=t.get("formatter");r=r||t.get("position");var u=e;if(h&&"string"==typeof h)u=Zo(h,i,!0);else if("function"==typeof h){var c=tk(function(e,n){e===this._ticket&&(l.setContent(n),this._updatePosition(t,r,o,a,l,i,s))},this);this._ticket=n,u=h(i,n,c)}l.setContent(u),l.show(t),this._updatePosition(t,r,o,a,l,i,s)}},_updatePosition:function(t,e,i,n,o,a,r){var s=this._api.getWidth(),l=this._api.getHeight();e=e||t.get("position");var h=o.getSize(),u=t.get("align"),c=t.get("verticalAlign"),d=r&&r.getBoundingRect().clone();if(r&&d.applyTransform(r.transform),"function"==typeof e&&(e=e([i,n],a,o.el,d,{viewSize:[s,l],contentSize:h.slice()})),y(e))i=ik(e[0],s),n=ik(e[1],l);else if(w(e)){e.width=h[0],e.height=h[1];var f=Ko(e,{width:s,height:l});i=f.x,n=f.y,u=null,c=null}else"string"==typeof e&&r?(i=(p=lm(e,d,h))[0],n=p[1]):(i=(p=am(i,n,o.el,s,l,u?null:20,c?null:20))[0],n=p[1]);if(u&&(i-=hm(u)?h[0]/2:"right"===u?h[0]:0),c&&(n-=hm(c)?h[1]/2:"bottom"===c?h[1]:0),t.get("confine")){var p=rm(i,n,o.el,s,l);i=p[0],n=p[1]}o.moveTo(i,n)},_updateContentNotChangedOnAxis:function(t){var e=this._lastDataByCoordSys,i=!!e&&e.length===t.length;return i&&ek(e,function(e,n){var o=e.dataByAxis||{},a=(t[n]||{}).dataByAxis||[];(i&=o.length===a.length)&&ek(o,function(t,e){var n=a[e]||{},o=t.seriesDataIndices||[],r=n.seriesDataIndices||[];(i&=t.value===n.value&&t.axisType===n.axisType&&t.axisId===n.axisId&&o.length===r.length)&&ek(o,function(t,e){var n=r[e];i&=t.seriesIndex===n.seriesIndex&&t.dataIndex===n.dataIndex})})}),this._lastDataByCoordSys=t,!!i},_hide:function(t){this._lastDataByCoordSys=null,t({type:"hideTip",from:this.uid})},dispose:function(t,e){_x.node||(this._tooltipContent.hide(),Yp("itemTooltip",e))}}),hs({type:"showTip",event:"showTip",update:"tooltip:manuallyShowTip"},function(){}),hs({type:"hideTip",event:"hideTip",update:"tooltip:manuallyHideTip"},function(){}),fm.prototype={constructor:fm,pointToData:function(t,e){return this.polar.pointToData(t,e)["radius"===this.dim?0:1]},dataToRadius:nT.prototype.dataToCoord,radiusToData:nT.prototype.coordToData},h(fm,nT),pm.prototype={constructor:pm,pointToData:function(t,e){return this.polar.pointToData(t,e)["radius"===this.dim?0:1]},dataToAngle:nT.prototype.dataToCoord,angleToData:nT.prototype.coordToData},h(pm,nT);var ok=function(t){this.name=t||"",this.cx=0,this.cy=0,this._radiusAxis=new fm,this._angleAxis=new pm,this._radiusAxis.polar=this._angleAxis.polar=this};ok.prototype={type:"polar",axisPointerEnabled:!0,constructor:ok,dimensions:["radius","angle"],model:null,containPoint:function(t){var e=this.pointToCoord(t);return this._radiusAxis.contain(e[0])&&this._angleAxis.contain(e[1])},containData:function(t){return this._radiusAxis.containData(t[0])&&this._angleAxis.containData(t[1])},getAxis:function(t){return this["_"+t+"Axis"]},getAxes:function(){return[this._radiusAxis,this._angleAxis]},getAxesByScale:function(t){var e=[],i=this._angleAxis,n=this._radiusAxis;return i.scale.type===t&&e.push(i),n.scale.type===t&&e.push(n),e},getAngleAxis:function(){return this._angleAxis},getRadiusAxis:function(){return this._radiusAxis},getOtherAxis:function(t){var e=this._angleAxis;return t===e?this._radiusAxis:e},getBaseAxis:function(){return this.getAxesByScale("ordinal")[0]||this.getAxesByScale("time")[0]||this.getAngleAxis()},getTooltipAxes:function(t){var e=null!=t&&"auto"!==t?this.getAxis(t):this.getBaseAxis();return{baseAxes:[e],otherAxes:[this.getOtherAxis(e)]}},dataToPoint:function(t,e){return this.coordToPoint([this._radiusAxis.dataToRadius(t[0],e),this._angleAxis.dataToAngle(t[1],e)])},pointToData:function(t,e){var i=this.pointToCoord(t);return[this._radiusAxis.radiusToData(i[0],e),this._angleAxis.angleToData(i[1],e)]},pointToCoord:function(t){var e=t[0]-this.cx,i=t[1]-this.cy,n=this.getAngleAxis(),o=n.getExtent(),a=Math.min(o[0],o[1]),r=Math.max(o[0],o[1]);n.inverse?a=r-360:r=a+360;var s=Math.sqrt(e*e+i*i);e/=s,i/=s;for(var l=Math.atan2(-i,e)/Math.PI*180,h=l<a?1:-1;l<a||l>r;)l+=360*h;return[s,l]},coordToPoint:function(t){var e=t[0],i=t[1]/180*Math.PI;return[Math.cos(i)*e+this.cx,-Math.sin(i)*e+this.cy]}};var ak=IS.extend({type:"polarAxis",axis:null,getCoordSysModel:function(){return this.ecModel.queryComponents({mainType:"polar",index:this.option.polarIndex,id:this.option.polarId})[0]}});n(ak.prototype,ZI);var rk={angle:{startAngle:90,clockwise:!0,splitNumber:12,axisLabel:{rotate:!1}},radius:{splitNumber:5}};kT("angle",ak,gm,rk.angle),kT("radius",ak,gm,rk.radius),gs({type:"polar",dependencies:["polarAxis","angleAxis"],coordinateSystem:null,findAxisModel:function(t){var e;return this.ecModel.eachComponent(t,function(t){t.getCoordSysModel()===this&&(e=t)},this),e},defaultOption:{zlevel:0,z:0,center:["50%","50%"],radius:"80%"}});var sk={dimensions:ok.prototype.dimensions,create:function(t,e){var i=[];return t.eachComponent("polar",function(t,n){var o=new ok(n);o.update=vm;var a=o.getRadiusAxis(),r=o.getAngleAxis(),s=t.findAxisModel("radiusAxis"),l=t.findAxisModel("angleAxis");ym(a,s),ym(r,l),mm(o,t,e),i.push(o),t.coordinateSystem=o,o.model=t}),t.eachSeries(function(e){if("polar"===e.get("coordinateSystem")){var i=t.queryComponents({mainType:"polar",index:e.get("polarIndex"),id:e.get("polarId")})[0];e.coordinateSystem=i.coordinateSystem}}),i}};Aa.register("polar",sk);var lk=["axisLine","axisLabel","axisTick","splitLine","splitArea"];XT.extend({type:"angleAxis",axisPointerClass:"PolarAxisPointer",render:function(t,e){if(this.group.removeAll(),t.get("show")){var i=t.axis,n=i.polar,o=n.getRadiusAxis().getExtent(),a=i.getTicksCoords();"category"!==i.type&&a.pop(),d(lk,function(e){!t.get(e+".show")||i.scale.isBlank()&&"axisLine"!==e||this["_"+e](t,n,a,o)},this)}},_axisLine:function(t,e,i,n){var o=t.getModel("axisLine.lineStyle"),a=new Lb({shape:{cx:e.cx,cy:e.cy,r:n[_m(e)]},style:o.getLineStyle(),z2:1,silent:!0});a.style.fill=null,this.group.add(a)},_axisTick:function(t,e,i,n){var o=t.getModel("axisTick"),a=(o.get("inside")?-1:1)*o.get("length"),s=n[_m(e)],l=f(i,function(t){return new Gb({shape:xm(e,[s,s+a],t)})});this.group.add(Qb(l,{style:r(o.getModel("lineStyle").getLineStyle(),{stroke:t.get("axisLine.lineStyle.color")})}))},_axisLabel:function(t,e,i,n){for(var o=t.axis,a=t.getCategories(),r=t.getModel("axisLabel"),s=t.getFormattedLabels(),l=r.get("margin"),h=o.getLabelsCoords(),u=0;u<i.length;u++){var c=n[_m(e)],d=e.coordToPoint([c+l,h[u]]),f=e.cx,p=e.cy,g=Math.abs(d[0]-f)/c<.3?"center":d[0]>f?"left":"right",m=Math.abs(d[1]-p)/c<.3?"middle":d[1]>p?"top":"bottom";a&&a[u]&&a[u].textStyle&&(r=new _o(a[u].textStyle,r,r.ecModel));var v=new Cb({silent:!0});this.group.add(v),io(v.style,r,{x:d[0],y:d[1],textFill:r.getTextColor()||t.get("axisLine.lineStyle.color"),text:s[u],textAlign:g,textVerticalAlign:m})}},_splitLine:function(t,e,i,n){var o=t.getModel("splitLine").getModel("lineStyle"),a=o.get("color"),s=0;a=a instanceof Array?a:[a];for(var l=[],h=0;h<i.length;h++){var u=s++%a.length;l[u]=l[u]||[],l[u].push(new Gb({shape:xm(e,n,i[h])}))}for(h=0;h<l.length;h++)this.group.add(Qb(l[h],{style:r({stroke:a[h%a.length]},o.getLineStyle()),silent:!0,z:t.get("z")}))},_splitArea:function(t,e,i,n){var o=t.getModel("splitArea").getModel("areaStyle"),a=o.get("color"),s=0;a=a instanceof Array?a:[a];for(var l=[],h=Math.PI/180,u=-i[0]*h,c=Math.min(n[0],n[1]),d=Math.max(n[0],n[1]),f=t.get("clockwise"),p=1;p<i.length;p++){var g=s++%a.length;l[g]=l[g]||[],l[g].push(new Ob({shape:{cx:e.cx,cy:e.cy,r0:c,r:d,startAngle:u,endAngle:-i[p]*h,clockwise:f},silent:!0})),u=-i[p]*h}for(p=0;p<l.length;p++)this.group.add(Qb(l[p],{style:r({fill:a[p%a.length]},o.getAreaStyle()),silent:!0}))}});var hk=["axisLine","axisTickLabel","axisName"],uk=["splitLine","splitArea"];XT.extend({type:"radiusAxis",axisPointerClass:"PolarAxisPointer",render:function(t,e){if(this.group.removeAll(),t.get("show")){var i=t.axis,n=i.polar,o=n.getAngleAxis(),a=i.getTicksCoords(),r=o.getExtent()[0],s=i.getExtent(),l=wm(n,t,r),h=new GT(t,l);d(hk,h.add,h),this.group.add(h.getGroup()),d(uk,function(e){t.get(e+".show")&&!i.scale.isBlank()&&this["_"+e](t,n,r,s,a)},this)}},_splitLine:function(t,e,i,n,o){var a=t.getModel("splitLine").getModel("lineStyle"),s=a.get("color"),l=0;s=s instanceof Array?s:[s];for(var h=[],u=0;u<o.length;u++){var c=l++%s.length;h[c]=h[c]||[],h[c].push(new Lb({shape:{cx:e.cx,cy:e.cy,r:o[u]},silent:!0}))}for(u=0;u<h.length;u++)this.group.add(Qb(h[u],{style:r({stroke:s[u%s.length],fill:null},a.getLineStyle()),silent:!0}))},_splitArea:function(t,e,i,n,o){var a=t.getModel("splitArea").getModel("areaStyle"),s=a.get("color"),l=0;s=s instanceof Array?s:[s];for(var h=[],u=o[0],c=1;c<o.length;c++){var d=l++%s.length;h[d]=h[d]||[],h[d].push(new Ob({shape:{cx:e.cx,cy:e.cy,r0:u,r:o[c],startAngle:0,endAngle:2*Math.PI},silent:!0})),u=o[c]}for(c=0;c<h.length;c++)this.group.add(Qb(h[c],{style:r({fill:s[c%s.length]},a.getAreaStyle()),silent:!0}))}});var ck=qp.extend({makeElOption:function(t,e,i,n,o){var a=i.axis;"angle"===a.dim&&(this.animationThreshold=Math.PI/18);var r,s=a.polar,l=s.getOtherAxis(a).getExtent();r=a["dataTo"+Yo(a.dim)](e);var h=n.get("type");if(h&&"none"!==h){var u=eg(n),c=dk[h](a,s,r,l,u);c.style=u,t.graphicKey=c.type,t.pointer=c}ig(t,i,n,o,bm(e,i,0,s,n.get("label.margin")))}}),dk={line:function(t,e,i,n,o){return"angle"===t.dim?{type:"Line",shape:sg(e.coordToPoint([n[0],i]),e.coordToPoint([n[1],i]))}:{type:"Circle",shape:{cx:e.cx,cy:e.cy,r:i}}},shadow:function(t,e,i,n,o){var a=t.getBandWidth(),r=Math.PI/180;return"angle"===t.dim?{type:"Sector",shape:hg(e.cx,e.cy,n[0],n[1],(-i-a/2)*r,(a/2-i)*r)}:{type:"Sector",shape:hg(e.cx,e.cy,i-a/2,i+a/2,0,2*Math.PI)}}};XT.registerAxisPointerClass("PolarAxisPointer",ck),cs(v(function(t,e,i){var n=i.getWidth(),o=i.getHeight(),a={},r={},s=dm(g(e.getSeriesByType(t),function(t){return!e.isSeriesFiltered(t)&&t.coordinateSystem&&"polar"===t.coordinateSystem.type}));e.eachSeriesByType(t,function(t){if("polar"===t.coordinateSystem.type){var e=t.getData(),i=t.coordinateSystem,l=i.getAngleAxis(),h=i.getBaseAxis(),u=um(t),c=s[cm(h)][u],d=c.offset,f=c.width,p=i.getOtherAxis(h),g=t.get("center")||["50%","50%"],m=To(g[0],n),v=To(g[1],o),y=t.get("barMinHeight")||0,x=t.get("barMinAngle")||0,_=p.getExtent()[0],w=p.model.get("max"),b=p.model.get("min"),S=[e.mapDimension("radius"),e.mapDimension("angle")],M=e.mapArray(S,function(t,e){return i.dataToPoint([t,e])},!0);a[u]=a[u]||[],r[u]=r[u]||[],e.each(e.mapDimension(p.dim),function(t,n){if(!isNaN(t)){a[u][n]||(a[u][n]={p:_,n:_},r[u][n]={p:_,n:_});var o,s,h,c,g=t>=0?"p":"n",S=i.pointToCoord(M[n]),I=r[u][n][g];if("radius"===p.dim)o=I,s=S[0],c=(h=(-S[1]+d)*Math.PI/180)+f*Math.PI/180,Math.abs(s)<y&&(s=o+(s<0?-1:1)*y),r[u][n][g]=s;else{s=(o=S[0]+d)+f,null!=w&&(t=Math.min(t,w)),null!=b&&(t=Math.max(t,b));var T=l.dataToAngle(t);Math.abs(T-I)<x&&(T=I-(t<0?-1:1)*x),h=-I*Math.PI/180,c=-T*Math.PI/180;var A=l.getExtent(),D=T;D===A[0]&&t>0?D=A[1]:D===A[1]&&t<0&&(D=A[0]),r[u][n][g]=D}e.setItemLayout(n,{cx:m,cy:v,r0:o,r:s,startAngle:h,endAngle:c})}},!0)}},this)},"bar")),ms({type:"polar"}),u(IS.extend({type:"geo",coordinateSystem:null,layoutMode:"box",init:function(t){IS.prototype.init.apply(this,arguments),Mi(t,"label",["show"])},optionUpdated:function(){var t=this.option,e=this;t.regions=OA.getFilledRegions(t.regions,t.map,t.nameMap),this._optionModelMap=p(t.regions||[],function(t,i){return i.name&&t.set(i.name,new _o(i,e)),t},z()),this.updateSelectedMap(t.regions)},defaultOption:{zlevel:0,z:0,show:!0,left:"center",top:"center",aspectScale:.75,silent:!1,map:"",boundingCoords:null,center:null,zoom:1,scaleLimit:null,label:{show:!1,color:"#000"},itemStyle:{borderWidth:.5,borderColor:"#444",color:"#eee"},emphasis:{label:{show:!0,color:"rgb(100,0,0)"},itemStyle:{color:"rgba(255,215,0,0.8)"}},regions:[]},getRegionModel:function(t){return this._optionModelMap.get(t)||new _o(null,this,this.ecModel)},getFormattedLabel:function(t,e){var i=this.getRegionModel(t).get("label."+e+".formatter"),n={name:t};return"function"==typeof i?(n.status=e,i(n)):"string"==typeof i?i.replace("{a}",null!=t?t:""):void 0},setZoom:function(t){this.option.zoom=t},setCenter:function(t){this.option.center=t}}),sA),ms({type:"geo",init:function(t,e){var i=new ou(e,!0);this._mapDraw=i,this.group.add(i.group)},render:function(t,e,i,n){if(!n||"geoToggleSelect"!==n.type||n.from!==this.uid){var o=this._mapDraw;t.get("show")?o.draw(t,e,i,this,n):this._mapDraw.group.removeAll(),this.group.silent=t.get("silent")}},dispose:function(){this._mapDraw&&this._mapDraw.remove()}}),Sm("toggleSelected",{type:"geoToggleSelect",event:"geoselectchanged"}),Sm("select",{type:"geoSelect",event:"geoselected"}),Sm("unSelect",{type:"geoUnSelect",event:"geounselected"});var fk=["rect","polygon","keep","clear"],pk=d,gk={lineX:Lm(0),lineY:Lm(1),rect:{point:function(t,e,i){return t&&i.boundingRect.contain(t[0],t[1])},rect:function(t,e,i){return t&&i.boundingRect.intersect(t)}},polygon:{point:function(t,e,i){return t&&i.boundingRect.contain(t[0],t[1])&&pl(i.range,t[0],t[1])},rect:function(t,e,i){var n=i.range;if(!t||n.length<=1)return!1;var o=t.x,a=t.y,r=t.width,s=t.height,l=n[0];return!!(pl(n,o,a)||pl(n,o+r,a)||pl(n,o,a+s)||pl(n,o+r,a+s)||Kt.create(t).contain(l[0],l[1])||Pm(o,a,o+r,a,n)||Pm(o,a,o,a+s,n)||Pm(o+r,a,o+r,a+s,n)||Pm(o,a+s,o+r,a+s,n))||void 0}}},mk=d,vk=l,yk=v,xk=["dataToPoint","pointToData"],_k=["grid","xAxis","yAxis","geo","graph","polar","radiusAxis","angleAxis","bmap"],wk=zm.prototype;wk.setOutputRanges=function(t,e){this.matchOutputRanges(t,e,function(t,e,i){if((t.coordRanges||(t.coordRanges=[])).push(e),!t.coordRange){t.coordRange=e;var n=Ik[t.brushType](0,i,e);t.__rangeOffset={offset:Tk[t.brushType](n.values,t.range,[1,1]),xyMinMax:n.xyMinMax}}})},wk.matchOutputRanges=function(t,e,i){mk(t,function(t){var n=this.findTargetInfo(t,e);n&&!0!==n&&d(n.coordSyses,function(n){var o=Ik[t.brushType](1,n,t.range);i(t,o.values,n,e)})},this)},wk.setInputRanges=function(t,e){mk(t,function(t){var i=this.findTargetInfo(t,e);if(t.range=t.range||[],i&&!0!==i){t.panelId=i.panelId;var n=Ik[t.brushType](0,i.coordSys,t.coordRange),o=t.__rangeOffset;t.range=o?Tk[t.brushType](n.values,o.offset,Wm(n.xyMinMax,o.xyMinMax)):n.values}},this)},wk.makePanelOpts=function(t,e){return f(this._targetInfoList,function(i){var n=i.getPanelRect();return{panelId:i.panelId,defaultBrushType:e&&e(i),clipPath:Qd(n),isTargetByCursor:ef(n,t,i.coordSysModel),getLinearBrushOtherExtent:tf(n)}})},wk.controlSeries=function(t,e,i){var n=this.findTargetInfo(t,i);return!0===n||n&&vk(n.coordSyses,e.coordinateSystem)>=0},wk.findTargetInfo=function(t,e){for(var i=this._targetInfoList,n=Bm(e,t),o=0;o<i.length;o++){var a=i[o],r=t.panelId;if(r){if(a.panelId===r)return a}else for(o=0;o<Sk.length;o++)if(Sk[o](n,a))return a}return!0};var bk={grid:function(t,e){var i=t.xAxisModels,n=t.yAxisModels,o=t.gridModels,a=z(),r={},s={};(i||n||o)&&(mk(i,function(t){var e=t.axis.grid.model;a.set(e.id,e),r[e.id]=!0}),mk(n,function(t){var e=t.axis.grid.model;a.set(e.id,e),s[e.id]=!0}),mk(o,function(t){a.set(t.id,t),r[t.id]=!0,s[t.id]=!0}),a.each(function(t){var o=t.coordinateSystem,a=[];mk(o.getCartesians(),function(t,e){(vk(i,t.getAxis("x").model)>=0||vk(n,t.getAxis("y").model)>=0)&&a.push(t)}),e.push({panelId:"grid--"+t.id,gridModel:t,coordSysModel:t,coordSys:a[0],coordSyses:a,getPanelRect:Mk.grid,xAxisDeclared:r[t.id],yAxisDeclared:s[t.id]})}))},geo:function(t,e){mk(t.geoModels,function(t){var i=t.coordinateSystem;e.push({panelId:"geo--"+t.id,geoModel:t,coordSysModel:t,coordSys:i,coordSyses:[i],getPanelRect:Mk.geo})})}},Sk=[function(t,e){var i=t.xAxisModel,n=t.yAxisModel,o=t.gridModel;return!o&&i&&(o=i.axis.grid.model),!o&&n&&(o=n.axis.grid.model),o&&o===e.gridModel},function(t,e){var i=t.geoModel;return i&&i===e.geoModel}],Mk={grid:function(){return this.coordSys.grid.getRect().clone()},geo:function(){var t=this.coordSys,e=t.getBoundingRect().clone();return e.applyTransform(po(t)),e}},Ik={lineX:yk(Vm,0),lineY:yk(Vm,1),rect:function(t,e,i){var n=e[xk[t]]([i[0][0],i[1][0]]),o=e[xk[t]]([i[0][1],i[1][1]]),a=[Rm([n[0],o[0]]),Rm([n[1],o[1]])];return{values:a,xyMinMax:a}},polygon:function(t,e,i){var n=[[1/0,-1/0],[1/0,-1/0]];return{values:f(i,function(i){var o=e[xk[t]](i);return n[0][0]=Math.min(n[0][0],o[0]),n[1][0]=Math.min(n[1][0],o[1]),n[0][1]=Math.max(n[0][1],o[0]),n[1][1]=Math.max(n[1][1],o[1]),o}),xyMinMax:n}}},Tk={lineX:yk(Gm,0),lineY:yk(Gm,1),rect:function(t,e,i){return[[t[0][0]-i[0]*e[0][0],t[0][1]-i[0]*e[0][1]],[t[1][0]-i[1]*e[1][0],t[1][1]-i[1]*e[1][1]]]},polygon:function(t,e,i){return f(t,function(t,n){return[t[0]-i[0]*e[n][0],t[1]-i[1]*e[n][1]]})}},Ak=["inBrush","outOfBrush"],Dk="__ecBrushSelect",Ck="__ecInBrushSelectEvent",Lk=FM.VISUAL.BRUSH;cs(Lk,function(t,e,i){t.eachComponent({mainType:"brush"},function(e){i&&"takeGlobalCursor"===i.type&&e.setBrushOption("brush"===i.key?i.brushOption:{brushType:!1}),(e.brushTargetManager=new zm(e.option,t)).setInputRanges(e.areas,t)})}),ds(Lk,function(t,e,n){var o,a,s=[];t.eachComponent({mainType:"brush"},function(e,n){function l(t){return"all"===m||v[t]}function h(t){return!!t.length}function u(t,e){var i=t.coordinateSystem;w|=i.hasAxisBrushed(),l(e)&&i.eachActiveState(t.getData(),function(t,e){"active"===t&&(x[e]=1)})}function c(i,n,o){var a=jm(i);if(a&&!Xm(e,n)&&(d(b,function(n){a[n.brushType]&&e.brushTargetManager.controlSeries(n,i,t)&&o.push(n),w|=h(o)}),l(n)&&h(o))){var r=i.getData();r.each(function(t){Um(a,o,r,t)&&(x[t]=1)})}}var p={brushId:e.id,brushIndex:n,brushName:e.name,areas:i(e.areas),selected:[]};s.push(p);var g=e.option,m=g.brushLink,v=[],x=[],_=[],w=0;n||(o=g.throttleType,a=g.throttleDelay);var b=f(e.areas,function(t){return Ym(r({boundingRect:kk[t.brushType](t)},t))}),S=Tm(e.option,Ak,function(t){t.mappingMethod="fixed"});y(m)&&d(m,function(t){v[t]=1}),t.eachSeries(function(t,e){var i=_[e]=[];"parallel"===t.subType?u(t,e):c(t,e,i)}),t.eachSeries(function(t,e){var i={seriesId:t.id,seriesIndex:e,seriesName:t.name,dataIndex:[]};p.selected.push(i);var n=jm(t),o=_[e],a=t.getData(),r=l(e)?function(t){return x[t]?(i.dataIndex.push(a.getRawIndex(t)),"inBrush"):"outOfBrush"}:function(t){return Um(n,o,a,t)?(i.dataIndex.push(a.getRawIndex(t)),"inBrush"):"outOfBrush"};(l(e)?w:h(o))&&Dm(Ak,S,a,r)})}),Hm(e,o,a,s,n)});var kk={lineX:B,lineY:B,rect:function(t){return qm(t.range)},polygon:function(t){for(var e,i=t.range,n=0,o=i.length;n<o;n++){e=e||[[1/0,-1/0],[1/0,-1/0]];var a=i[n];a[0]<e[0][0]&&(e[0][0]=a[0]),a[0]>e[0][1]&&(e[0][1]=a[0]),a[1]<e[1][0]&&(e[1][0]=a[1]),a[1]>e[1][1]&&(e[1][1]=a[1])}return e&&qm(e)}},Pk=["#ddd"];gs({type:"brush",dependencies:["geo","grid","xAxis","yAxis","parallel","series"],defaultOption:{toolbox:null,brushLink:null,seriesIndex:"all",geoIndex:null,xAxisIndex:null,yAxisIndex:null,brushType:"rect",brushMode:"single",transformable:!0,brushStyle:{borderWidth:1,color:"rgba(120,140,180,0.3)",borderColor:"rgba(120,140,180,0.8)"},throttleType:"fixRate",throttleDelay:0,removeOnClick:!0,z:1e4},areas:[],brushType:null,brushOption:{},coordInfoList:[],optionUpdated:function(t,e){var i=this.option;!e&&Am(i,t,["inBrush","outOfBrush"]),i.inBrush=i.inBrush||{},i.outOfBrush=i.outOfBrush||{color:Pk}},setAreas:function(t){t&&(this.areas=f(t,function(t){return $m(this.option,t)},this))},setBrushOption:function(t){this.brushOption=$m(this.option,t),this.brushType=this.brushOption.brushType}});ms({type:"brush",init:function(t,e){this.ecModel=t,this.api=e,this.model,(this._brushController=new yd(e.getZr())).on("brush",m(this._onBrush,this)).mount()},render:function(t){return this.model=t,Km.apply(this,arguments)},updateView:Km,dispose:function(){this._brushController.dispose()},_onBrush:function(t,e){var n=this.model.id;this.model.brushTargetManager.setOutputRanges(t,this.ecModel),(!e.isEnd||e.removeOnClick)&&this.api.dispatchAction({type:"brush",brushId:n,areas:i(t),$from:n})}}),hs({type:"brush",event:"brush"},function(t,e){e.eachComponent({mainType:"brush",query:t},function(e){e.setAreas(t.areas)})}),hs({type:"brushSelect",event:"brushSelected",update:"none"},function(){});var Ok={},Nk=wM.toolbox.brush;tv.defaultOption={show:!0,type:["rect","polygon","lineX","lineY","keep","clear"],icon:{rect:"M7.3,34.7 M0.4,10V-0.2h9.8 M89.6,10V-0.2h-9.8 M0.4,60v10.2h9.8 M89.6,60v10.2h-9.8 M12.3,22.4V10.5h13.1 M33.6,10.5h7.8 M49.1,10.5h7.8 M77.5,22.4V10.5h-13 M12.3,31.1v8.2 M77.7,31.1v8.2 M12.3,47.6v11.9h13.1 M33.6,59.5h7.6 M49.1,59.5 h7.7 M77.5,47.6v11.9h-13",polygon:"M55.2,34.9c1.7,0,3.1,1.4,3.1,3.1s-1.4,3.1-3.1,3.1 s-3.1-1.4-3.1-3.1S53.5,34.9,55.2,34.9z M50.4,51c1.7,0,3.1,1.4,3.1,3.1c0,1.7-1.4,3.1-3.1,3.1c-1.7,0-3.1-1.4-3.1-3.1 C47.3,52.4,48.7,51,50.4,51z M55.6,37.1l1.5-7.8 M60.1,13.5l1.6-8.7l-7.8,4 M59,19l-1,5.3 M24,16.1l6.4,4.9l6.4-3.3 M48.5,11.6 l-5.9,3.1 M19.1,12.8L9.7,5.1l1.1,7.7 M13.4,29.8l1,7.3l6.6,1.6 M11.6,18.4l1,6.1 M32.8,41.9 M26.6,40.4 M27.3,40.2l6.1,1.6 M49.9,52.1l-5.6-7.6l-4.9-1.2",lineX:"M15.2,30 M19.7,15.6V1.9H29 M34.8,1.9H40.4 M55.3,15.6V1.9H45.9 M19.7,44.4V58.1H29 M34.8,58.1H40.4 M55.3,44.4 V58.1H45.9 M12.5,20.3l-9.4,9.6l9.6,9.8 M3.1,29.9h16.5 M62.5,20.3l9.4,9.6L62.3,39.7 M71.9,29.9H55.4",lineY:"M38.8,7.7 M52.7,12h13.2v9 M65.9,26.6V32 M52.7,46.3h13.2v-9 M24.9,12H11.8v9 M11.8,26.6V32 M24.9,46.3H11.8v-9 M48.2,5.1l-9.3-9l-9.4,9.2 M38.9-3.9V12 M48.2,53.3l-9.3,9l-9.4-9.2 M38.9,62.3V46.4",keep:"M4,10.5V1h10.3 M20.7,1h6.1 M33,1h6.1 M55.4,10.5V1H45.2 M4,17.3v6.6 M55.6,17.3v6.6 M4,30.5V40h10.3 M20.7,40 h6.1 M33,40h6.1 M55.4,30.5V40H45.2 M21,18.9h62.9v48.6H21V18.9z",clear:"M22,14.7l30.9,31 M52.9,14.7L22,45.7 M4.7,16.8V4.2h13.1 M26,4.2h7.8 M41.6,4.2h7.8 M70.3,16.8V4.2H57.2 M4.7,25.9v8.6 M70.3,25.9v8.6 M4.7,43.2v12.6h13.1 M26,55.8h7.8 M41.6,55.8h7.8 M70.3,43.2v12.6H57.2"},title:i(Nk.title)};var Ek=tv.prototype;Ek.render=Ek.updateView=function(t,e,i){var n,o,a;e.eachComponent({mainType:"brush"},function(t){n=t.brushType,o=t.brushOption.brushMode||"single",a|=t.areas.length}),this._brushType=n,this._brushMode=o,d(t.get("type",!0),function(e){t.setIconStatus(e,("keep"===e?"multiple"===o:"clear"===e?a:e===n)?"emphasis":"normal")})},Ek.getIcons=function(){var t=this.model,e=t.get("icon",!0),i={};return d(t.get("type",!0),function(t){e[t]&&(i[t]=e[t])}),i},Ek.onclick=function(t,e,i){var n=this._brushType,o=this._brushMode;"clear"===i?(e.dispatchAction({type:"axisAreaSelect",intervals:[]}),e.dispatchAction({type:"brush",command:"clear",areas:[]})):e.dispatchAction({type:"takeGlobalCursor",key:"brush",brushOption:{brushType:"keep"===i?n:n!==i&&i,brushMode:"keep"===i?"multiple"===o?"single":"multiple":o}})},Jm("brush",tv),ss(function(t,e){var i=t&&t.brush;if(y(i)||(i=i?[i]:[]),i.length){var n=[];d(i,function(t){var e=t.hasOwnProperty("toolbox")?t.toolbox:[];e instanceof Array&&(n=n.concat(e))});var o=t&&t.toolbox;y(o)&&(o=o[0]),o||(o={feature:{}},t.toolbox=[o]);var a=o.feature||(o.feature={}),r=a.brush||(a.brush={}),s=r.type||(r.type=[]);s.push.apply(s,n),Mm(s),e&&!s.length&&s.push.apply(s,fk)}});ev.prototype={constructor:ev,type:"calendar",dimensions:["time","value"],getDimensionsInfo:function(){return[{name:"time",type:"time"}]},getRangeInfo:function(){return this._rangeInfo},getModel:function(){return this._model},getRect:function(){return this._rect},getCellWidth:function(){return this._sw},getCellHeight:function(){return this._sh},getOrient:function(){return this._orient},getFirstDayOfWeek:function(){return this._firstDayOfWeek},getDateInfo:function(t){var e=(t=Eo(t)).getFullYear(),i=t.getMonth()+1;i=i<10?"0"+i:i;var n=t.getDate();n=n<10?"0"+n:n;var o=t.getDay();return o=Math.abs((o+7-this.getFirstDayOfWeek())%7),{y:e,m:i,d:n,day:o,time:t.getTime(),formatedDate:e+"-"+i+"-"+n,date:t}},getNextNDay:function(t,e){return 0===(e=e||0)?this.getDateInfo(t):((t=new Date(this.getDateInfo(t).time)).setDate(t.getDate()+e),this.getDateInfo(t))},update:function(t,e){function i(t,e){return null!=t[e]&&"auto"!==t[e]}this._firstDayOfWeek=+this._model.getModel("dayLabel").get("firstDay"),this._orient=this._model.get("orient"),this._lineWidth=this._model.getModel("itemStyle").getItemStyle().lineWidth||0,this._rangeInfo=this._getRangeInfo(this._initRangeOption());var n=this._rangeInfo.weeks||1,o=["width","height"],a=this._model.get("cellSize").slice(),r=this._model.getBoxLayoutParams(),s="horizontal"===this._orient?[n,7]:[7,n];d([0,1],function(t){i(a,t)&&(r[o[t]]=a[t]*s[t])});var l={width:e.getWidth(),height:e.getHeight()},h=this._rect=Ko(r,l);d([0,1],function(t){i(a,t)||(a[t]=h[o[t]]/s[t])}),this._sw=a[0],this._sh=a[1]},dataToPoint:function(t,e){y(t)&&(t=t[0]),null==e&&(e=!0);var i=this.getDateInfo(t),n=this._rangeInfo,o=i.formatedDate;if(e&&!(i.time>=n.start.time&&i.time<=n.end.time))return[NaN,NaN];var a=i.day,r=this._getRangeInfo([n.start.time,o]).nthWeek;return"vertical"===this._orient?[this._rect.x+a*this._sw+this._sw/2,this._rect.y+r*this._sh+this._sh/2]:[this._rect.x+r*this._sw+this._sw/2,this._rect.y+a*this._sh+this._sh/2]},pointToData:function(t){var e=this.pointToDate(t);return e&&e.time},dataToRect:function(t,e){var i=this.dataToPoint(t,e);return{contentShape:{x:i[0]-(this._sw-this._lineWidth)/2,y:i[1]-(this._sh-this._lineWidth)/2,width:this._sw-this._lineWidth,height:this._sh-this._lineWidth},center:i,tl:[i[0]-this._sw/2,i[1]-this._sh/2],tr:[i[0]+this._sw/2,i[1]-this._sh/2],br:[i[0]+this._sw/2,i[1]+this._sh/2],bl:[i[0]-this._sw/2,i[1]+this._sh/2]}},pointToDate:function(t){var e=Math.floor((t[0]-this._rect.x)/this._sw)+1,i=Math.floor((t[1]-this._rect.y)/this._sh)+1,n=this._rangeInfo.range;return"vertical"===this._orient?this._getDateByWeeksAndDay(i,e-1,n):this._getDateByWeeksAndDay(e,i-1,n)},convertToPixel:v(iv,"dataToPoint"),convertFromPixel:v(iv,"pointToData"),_initRangeOption:function(){var t=this._model.get("range"),e=t;if(y(e)&&1===e.length&&(e=e[0]),/^\d{4}$/.test(e)&&(t=[e+"-01-01",e+"-12-31"]),/^\d{4}[\/|-]\d{1,2}$/.test(e)){var i=this.getDateInfo(e),n=i.date;n.setMonth(n.getMonth()+1);var o=this.getNextNDay(n,-1);t=[i.formatedDate,o.formatedDate]}/^\d{4}[\/|-]\d{1,2}[\/|-]\d{1,2}$/.test(e)&&(t=[e,e]);var a=this._getRangeInfo(t);return a.start.time>a.end.time&&t.reverse(),t},_getRangeInfo:function(t){var e;(t=[this.getDateInfo(t[0]),this.getDateInfo(t[1])])[0].time>t[1].time&&(e=!0,t.reverse());var i=Math.floor(t[1].time/864e5)-Math.floor(t[0].time/864e5)+1,n=new Date(t[0].time),o=n.getDate(),a=t[1].date.getDate();if(n.setDate(o+i-1),n.getDate()!==a)for(var r=n.getTime()-t[1].time>0?1:-1;n.getDate()!==a&&(n.getTime()-t[1].time)*r>0;)i-=r,n.setDate(o+i-1);var s=Math.floor((i+t[0].day+6)/7),l=e?1-s:s-1;return e&&t.reverse(),{range:[t[0].formatedDate,t[1].formatedDate],start:t[0],end:t[1],allDay:i,weeks:s,nthWeek:l,fweek:t[0].day,lweek:t[1].day}},_getDateByWeeksAndDay:function(t,e,i){var n=this._getRangeInfo(i);if(t>n.weeks||0===t&&e<n.fweek||t===n.weeks&&e>n.lweek)return!1;var o=7*(t-1)-n.fweek+e,a=new Date(n.start.time);return a.setDate(n.start.d+o),this.getDateInfo(a)}},ev.dimensions=ev.prototype.dimensions,ev.getDimensionsInfo=ev.prototype.getDimensionsInfo,ev.create=function(t,e){var i=[];return t.eachComponent("calendar",function(n){var o=new ev(n,t,e);i.push(o),n.coordinateSystem=o}),t.eachSeries(function(t){"calendar"===t.get("coordinateSystem")&&(t.coordinateSystem=i[t.get("calendarIndex")||0])}),i},Aa.register("calendar",ev);var zk=IS.extend({type:"calendar",coordinateSystem:null,defaultOption:{zlevel:0,z:2,left:80,top:60,cellSize:20,orient:"horizontal",splitLine:{show:!0,lineStyle:{color:"#000",width:1,type:"solid"}},itemStyle:{color:"#fff",borderWidth:1,borderColor:"#ccc"},dayLabel:{show:!0,firstDay:0,position:"start",margin:"50%",nameMap:"en",color:"#000"},monthLabel:{show:!0,position:"start",margin:5,align:"center",nameMap:"en",formatter:null,color:"#000"},yearLabel:{show:!0,position:null,margin:30,formatter:null,color:"#ccc",fontFamily:"sans-serif",fontWeight:"bolder",fontSize:20}},init:function(t,e,i,n){var o=ea(t);zk.superApply(this,"init",arguments),nv(t,o)},mergeOption:function(t,e){zk.superApply(this,"mergeOption",arguments),nv(this.option,t)}}),Rk={EN:["Jan","Feb","Mar","Apr","May","Jun","Jul","Aug","Sep","Oct","Nov","Dec"],CN:["一月","二月","三月","四月","五月","六月","七月","八月","九月","十月","十一月","十二月"]},Bk={EN:["S","M","T","W","T","F","S"],CN:["日","一","二","三","四","五","六"]};ms({type:"calendar",_tlpoints:null,_blpoints:null,_firstDayOfMonth:null,_firstDayPoints:null,render:function(t,e,i){var n=this.group;n.removeAll();var o=t.coordinateSystem,a=o.getRangeInfo(),r=o.getOrient();this._renderDayRect(t,a,n),this._renderLines(t,a,r,n),this._renderYearText(t,a,r,n),this._renderMonthText(t,r,n),this._renderWeekText(t,a,r,n)},_renderDayRect:function(t,e,i){for(var n=t.coordinateSystem,o=t.getModel("itemStyle").getItemStyle(),a=n.getCellWidth(),r=n.getCellHeight(),s=e.start.time;s<=e.end.time;s=n.getNextNDay(s,1).time){var l=n.dataToRect([s],!1).tl,h=new Vb({shape:{x:l[0],y:l[1],width:a,height:r},cursor:"default",style:o});i.add(h)}},_renderLines:function(t,e,i,n){function o(e){a._firstDayOfMonth.push(r.getDateInfo(e)),a._firstDayPoints.push(r.dataToRect([e],!1).tl);var o=a._getLinePointsOfOneWeek(t,e,i);a._tlpoints.push(o[0]),a._blpoints.push(o[o.length-1]),l&&a._drawSplitline(o,s,n)}var a=this,r=t.coordinateSystem,s=t.getModel("splitLine.lineStyle").getLineStyle(),l=t.get("splitLine.show"),h=s.lineWidth;this._tlpoints=[],this._blpoints=[],this._firstDayOfMonth=[],this._firstDayPoints=[];for(var u=e.start,c=0;u.time<=e.end.time;c++){o(u.formatedDate),0===c&&(u=r.getDateInfo(e.start.y+"-"+e.start.m));var d=u.date;d.setMonth(d.getMonth()+1),u=r.getDateInfo(d)}o(r.getNextNDay(e.end.time,1).formatedDate),l&&this._drawSplitline(a._getEdgesPoints(a._tlpoints,h,i),s,n),l&&this._drawSplitline(a._getEdgesPoints(a._blpoints,h,i),s,n)},_getEdgesPoints:function(t,e,i){var n=[t[0].slice(),t[t.length-1].slice()],o="horizontal"===i?0:1;return n[0][o]=n[0][o]-e/2,n[1][o]=n[1][o]+e/2,n},_drawSplitline:function(t,e,i){var n=new Bb({z2:20,shape:{points:t},style:e});i.add(n)},_getLinePointsOfOneWeek:function(t,e,i){var n=t.coordinateSystem;e=n.getDateInfo(e);for(var o=[],a=0;a<7;a++){var r=n.getNextNDay(e.time,a),s=n.dataToRect([r.time],!1);o[2*r.day]=s.tl,o[2*r.day+1]=s["horizontal"===i?"bl":"tr"]}return o},_formatterLabel:function(t,e){return"string"==typeof t&&t?Uo(t,e):"function"==typeof t?t(e):e.nameMap},_yearTextPositionControl:function(t,e,i,n,o){e=e.slice();var a=["center","bottom"];"bottom"===n?(e[1]+=o,a=["center","top"]):"left"===n?e[0]-=o:"right"===n?(e[0]+=o,a=["center","top"]):e[1]-=o;var r=0;return"left"!==n&&"right"!==n||(r=Math.PI/2),{rotation:r,position:e,style:{textAlign:a[0],textVerticalAlign:a[1]}}},_renderYearText:function(t,e,i,n){var o=t.getModel("yearLabel");if(o.get("show")){var a=o.get("margin"),r=o.get("position");r||(r="horizontal"!==i?"top":"left");var s=[this._tlpoints[this._tlpoints.length-1],this._blpoints[0]],l=(s[0][0]+s[1][0])/2,h=(s[0][1]+s[1][1])/2,u="horizontal"===i?0:1,c={top:[l,s[u][1]],bottom:[l,s[1-u][1]],left:[s[1-u][0],h],right:[s[u][0],h]},d=e.start.y;+e.end.y>+e.start.y&&(d=d+"-"+e.end.y);var f=o.get("formatter"),p={start:e.start.y,end:e.end.y,nameMap:d},g=this._formatterLabel(f,p),m=new Cb({z2:30});io(m.style,o,{text:g}),m.attr(this._yearTextPositionControl(m,c[r],i,r,a)),n.add(m)}},_monthTextPositionControl:function(t,e,i,n,o){var a="left",r="top",s=t[0],l=t[1];return"horizontal"===i?(l+=o,e&&(a="center"),"start"===n&&(r="bottom")):(s+=o,e&&(r="middle"),"start"===n&&(a="right")),{x:s,y:l,textAlign:a,textVerticalAlign:r}},_renderMonthText:function(t,e,i){var n=t.getModel("monthLabel");if(n.get("show")){var o=n.get("nameMap"),r=n.get("margin"),s=n.get("position"),l=n.get("align"),h=[this._tlpoints,this._blpoints];_(o)&&(o=Rk[o.toUpperCase()]||[]);var u="start"===s?0:1,c="horizontal"===e?0:1;r="start"===s?-r:r;for(var d="center"===l,f=0;f<h[u].length-1;f++){var p=h[u][f].slice(),g=this._firstDayOfMonth[f];if(d){var m=this._firstDayPoints[f];p[c]=(m[c]+h[0][f+1][c])/2}var v=n.get("formatter"),y=o[+g.m-1],x={yyyy:g.y,yy:(g.y+"").slice(2),MM:g.m,M:+g.m,nameMap:y},w=this._formatterLabel(v,x),b=new Cb({z2:30});a(io(b.style,n,{text:w}),this._monthTextPositionControl(p,d,e,s,r)),i.add(b)}}},_weekTextPositionControl:function(t,e,i,n,o){var a="center",r="middle",s=t[0],l=t[1],h="start"===i;return"horizontal"===e?(s=s+n+(h?1:-1)*o[0]/2,a=h?"right":"left"):(l=l+n+(h?1:-1)*o[1]/2,r=h?"bottom":"top"),{x:s,y:l,textAlign:a,textVerticalAlign:r}},_renderWeekText:function(t,e,i,n){var o=t.getModel("dayLabel");if(o.get("show")){var r=t.coordinateSystem,s=o.get("position"),l=o.get("nameMap"),h=o.get("margin"),u=r.getFirstDayOfWeek();_(l)&&(l=Bk[l.toUpperCase()]||[]);var c=r.getNextNDay(e.end.time,7-e.lweek).time,d=[r.getCellWidth(),r.getCellHeight()];h=To(h,d["horizontal"===i?0:1]),"start"===s&&(c=r.getNextNDay(e.start.time,-(7+e.fweek)).time,h=-h);for(var f=0;f<7;f++){var p=r.getNextNDay(c,f),g=r.dataToRect([p.time],!1).center,m=f;m=Math.abs((f+u)%7);var v=new Cb({z2:30});a(io(v.style,o,{text:l[m]}),this._weekTextPositionControl(g,i,s,h,d)),n.add(v)}}}}),gs({type:"title",layoutMode:{type:"box",ignoreSize:!0},defaultOption:{zlevel:0,z:6,show:!0,text:"",target:"blank",subtext:"",subtarget:"blank",left:0,top:0,backgroundColor:"rgba(0,0,0,0)",borderColor:"#ccc",borderWidth:0,padding:5,itemGap:10,textStyle:{fontSize:18,fontWeight:"bolder",color:"#333"},subtextStyle:{color:"#aaa"}}}),ms({type:"title",render:function(t,e,i){if(this.group.removeAll(),t.get("show")){var n=this.group,o=t.getModel("textStyle"),a=t.getModel("subtextStyle"),r=t.get("textAlign"),s=t.get("textBaseline"),l=new Cb({style:io({},o,{text:t.get("text"),textFill:o.getTextColor()},{disableBox:!0}),z2:10}),h=l.getBoundingRect(),u=t.get("subtext"),c=new Cb({style:io({},a,{text:u,textFill:a.getTextColor(),y:h.height+t.get("itemGap"),textVerticalAlign:"top"},{disableBox:!0}),z2:10}),d=t.get("link"),f=t.get("sublink");l.silent=!d,c.silent=!f,d&&l.on("click",function(){window.open(d,"_"+t.get("target"))}),f&&c.on("click",function(){window.open(f,"_"+t.get("subtarget"))}),n.add(l),u&&n.add(c);var p=n.getBoundingRect(),g=t.getBoxLayoutParams();g.width=p.width,g.height=p.height;var m=Ko(g,{width:i.getWidth(),height:i.getHeight()},t.get("padding"));r||("middle"===(r=t.get("left")||t.get("right"))&&(r="center"),"right"===r?m.x+=m.width:"center"===r&&(m.x+=m.width/2)),s||("center"===(s=t.get("top")||t.get("bottom"))&&(s="middle"),"bottom"===s?m.y+=m.height:"middle"===s&&(m.y+=m.height/2),s=s||"top"),n.attr("position",[m.x,m.y]);var v={textAlign:r,textVerticalAlign:s};l.setStyle(v),c.setStyle(v),p=n.getBoundingRect();var y=m.margin,x=t.getItemStyle(["color","opacity"]);x.fill=t.get("backgroundColor");var _=new Vb({shape:{x:p.x-y[3],y:p.y-y[0],width:p.width+y[1]+y[3],height:p.height+y[0]+y[2],r:t.get("borderRadius")},style:x,silent:!0});Gn(_),n.add(_)}}}),IS.registerSubTypeDefaulter("dataZoom",function(){return"slider"});var Vk=["cartesian2d","polar","singleAxis"],Gk=function(t,e){var i=f(t=t.slice(),Yo),n=f(e=(e||[]).slice(),Yo);return function(o,a){d(t,function(t,r){for(var s={name:t,capital:i[r]},l=0;l<e.length;l++)s[e[l]]=t+n[l];o.call(a,s)})}}(["x","y","z","radius","angle","single"],["axisIndex","axis","index","id"]),Wk=d,Fk=Do,Hk=function(t,e,i,n){this._dimName=t,this._axisIndex=e,this._valueWindow,this._percentWindow,this._dataExtent,this._minMaxSpan,this.ecModel=n,this._dataZoomModel=i,this.hasSeriesStacked};Hk.prototype={constructor:Hk,hostedBy:function(t){return this._dataZoomModel===t},getDataValueWindow:function(){return this._valueWindow.slice()},getDataPercentWindow:function(){return this._percentWindow.slice()},getTargetSeriesModels:function(){var t=[],e=this.ecModel;return e.eachSeries(function(i){if(ov(i.get("coordinateSystem"))){var n=this._dimName,o=e.queryComponents({mainType:n+"Axis",index:i.get(n+"AxisIndex"),id:i.get(n+"AxisId")})[0];this._axisIndex===(o&&o.componentIndex)&&t.push(i)}},this),t},getAxisModel:function(){return this.ecModel.getComponent(this._dimName+"Axis",this._axisIndex)},getOtherAxisModel:function(){var t,e,i=this._dimName,n=this.ecModel,o=this.getAxisModel();"x"===i||"y"===i?(e="gridIndex",t="x"===i?"y":"x"):(e="polarIndex",t="angle"===i?"radius":"angle");var a;return n.eachComponent(t+"Axis",function(t){(t.get(e)||0)===(o.get(e)||0)&&(a=t)}),a},getMinMaxSpan:function(){return i(this._minMaxSpan)},calculateDataWindow:function(t){var e=this._dataExtent,i=this.getAxisModel().axis.scale,n=this._dataZoomModel.getRangePropMode(),o=[0,100],a=[t.start,t.end],r=[];return Wk(["startValue","endValue"],function(e){r.push(null!=t[e]?i.parse(t[e]):null)}),Wk([0,1],function(t){var s=r[t],l=a[t];"percent"===n[t]?(null==l&&(l=o[t]),s=i.parse(Io(l,o,e,!0))):l=Io(s,e,o,!0),r[t]=s,a[t]=l}),{valueWindow:Fk(r),percentWindow:Fk(a)}},reset:function(t){if(t===this._dataZoomModel){var e=this.getTargetSeriesModels();this._dataExtent=rv(this,this._dimName,e),this.hasSeriesStacked=!1,Wk(e,function(t){var e=t.getData(),i=e.mapDimension(this._dimName);e.isStacked(i)&&(this.hasSeriesStacked=!0)},this);var i=this.calculateDataWindow(t.option);this._valueWindow=i.valueWindow,this._percentWindow=i.percentWindow,hv(this),lv(this)}},restore:function(t){t===this._dataZoomModel&&(this._valueWindow=this._percentWindow=null,lv(this,!0))},filterData:function(t,e){function i(t){return t>=r[0]&&t<=r[1]}if(t===this._dataZoomModel){var n=this._dimName,o=this.getTargetSeriesModels(),a=t.get("filterMode"),r=this._valueWindow;if("none"!==a){var s=this.getOtherAxisModel();t.get("$fromToolbox")&&s&&s.hasSeriesStacked&&(a="empty"),Wk(o,function(t){var e=t.getData(),o=e.mapDimension(n,!0);"weakFilter"===a?e.filterSelf(function(t){for(var i,n,a,s=0;s<o.length;s++){var l=e.get(o[s],t),h=!isNaN(l),u=l<r[0],c=l>r[1];if(h&&!u&&!c)return!0;h&&(a=!0),u&&(i=!0),c&&(n=!0)}return a&&i&&n}):Wk(o,function(n){if("empty"===a)t.setData(e.map(n,function(t){return i(t)?t:NaN}));else{var o={};o[n]=r,e.selectRange(o)}}),Wk(o,function(t){e.setApproximateExtent(r,t)})})}}}};var Zk=d,Uk=Gk,jk=gs({type:"dataZoom",dependencies:["xAxis","yAxis","zAxis","radiusAxis","angleAxis","singleAxis","series"],defaultOption:{zlevel:0,z:4,orient:null,xAxisIndex:null,yAxisIndex:null,filterMode:"filter",throttle:null,start:0,end:100,startValue:null,endValue:null,minSpan:null,maxSpan:null,minValueSpan:null,maxValueSpan:null,rangeMode:null},init:function(t,e,i){this._dataIntervalByAxis={},this._dataInfo={},this._axisProxies={},this.textStyleModel,this._autoThrottle=!0,this._rangePropMode=["percent","percent"];var n=uv(t);this.mergeDefaultAndTheme(t,i),this.doInit(n)},mergeOption:function(t){var e=uv(t);n(this.option,t,!0),this.doInit(e)},doInit:function(t){var e=this.option;_x.canvasSupported||(e.realtime=!1),this._setDefaultThrottle(t),cv(this,t),Zk([["start","startValue"],["end","endValue"]],function(t,i){"value"===this._rangePropMode[i]&&(e[t[0]]=null)},this),this.textStyleModel=this.getModel("textStyle"),this._resetTarget(),this._giveAxisProxies()},_giveAxisProxies:function(){var t=this._axisProxies;this.eachTargetAxis(function(e,i,n,o){var a=this.dependentModels[e.axis][i],r=a.__dzAxisProxy||(a.__dzAxisProxy=new Hk(e.name,i,this,o));t[e.name+"_"+i]=r},this)},_resetTarget:function(){var t=this.option,e=this._judgeAutoMode();Uk(function(e){var i=e.axisIndex;t[i]=Si(t[i])},this),"axisIndex"===e?this._autoSetAxisIndex():"orient"===e&&this._autoSetOrient()},_judgeAutoMode:function(){var t=this.option,e=!1;Uk(function(i){null!=t[i.axisIndex]&&(e=!0)},this);var i=t.orient;return null==i&&e?"orient":e?void 0:(null==i&&(t.orient="horizontal"),"axisIndex")},_autoSetAxisIndex:function(){var t=!0,e=this.get("orient",!0),i=this.option,n=this.dependentModels;if(t){var o="vertical"===e?"y":"x";n[o+"Axis"].length?(i[o+"AxisIndex"]=[0],t=!1):Zk(n.singleAxis,function(n){t&&n.get("orient",!0)===e&&(i.singleAxisIndex=[n.componentIndex],t=!1)})}t&&Uk(function(e){if(t){var n=[],o=this.dependentModels[e.axis];if(o.length&&!n.length)for(var a=0,r=o.length;a<r;a++)"category"===o[a].get("type")&&n.push(a);i[e.axisIndex]=n,n.length&&(t=!1)}},this),t&&this.ecModel.eachSeries(function(t){this._isSeriesHasAllAxesTypeOf(t,"value")&&Uk(function(e){var n=i[e.axisIndex],o=t.get(e.axisIndex),a=t.get(e.axisId);l(n,o=t.ecModel.queryComponents({mainType:e.axis,index:o,id:a})[0].componentIndex)<0&&n.push(o)})},this)},_autoSetOrient:function(){var t;this.eachTargetAxis(function(e){!t&&(t=e.name)},this),this.option.orient="y"===t?"vertical":"horizontal"},_isSeriesHasAllAxesTypeOf:function(t,e){var i=!0;return Uk(function(n){var o=t.get(n.axisIndex),a=this.dependentModels[n.axis][o];a&&a.get("type")===e||(i=!1)},this),i},_setDefaultThrottle:function(t){if(t.hasOwnProperty("throttle")&&(this._autoThrottle=!1),this._autoThrottle){var e=this.ecModel.option;this.option.throttle=e.animation&&e.animationDurationUpdate>0?100:20}},getFirstTargetAxisModel:function(){var t;return Uk(function(e){if(null==t){var i=this.get(e.axisIndex);i.length&&(t=this.dependentModels[e.axis][i[0]])}},this),t},eachTargetAxis:function(t,e){var i=this.ecModel;Uk(function(n){Zk(this.get(n.axisIndex),function(o){t.call(e,n,o,this,i)},this)},this)},getAxisProxy:function(t,e){return this._axisProxies[t+"_"+e]},getAxisModel:function(t,e){var i=this.getAxisProxy(t,e);return i&&i.getAxisModel()},setRawRange:function(t,e){var i=this.option;Zk([["start","startValue"],["end","endValue"]],function(e){null==t[e[0]]&&null==t[e[1]]||(i[e[0]]=t[e[0]],i[e[1]]=t[e[1]])},this),!e&&cv(this,t)},getPercentRange:function(){var t=this.findRepresentativeAxisProxy();if(t)return t.getDataPercentWindow()},getValueRange:function(t,e){if(null!=t||null!=e)return this.getAxisProxy(t,e).getDataValueWindow();var i=this.findRepresentativeAxisProxy();return i?i.getDataValueWindow():void 0},findRepresentativeAxisProxy:function(t){if(t)return t.__dzAxisProxy;var e=this._axisProxies;for(var i in e)if(e.hasOwnProperty(i)&&e[i].hostedBy(this))return e[i];for(var i in e)if(e.hasOwnProperty(i)&&!e[i].hostedBy(this))return e[i]},getRangePropMode:function(){return this._rangePropMode.slice()}}),Xk=cM.extend({type:"dataZoom",render:function(t,e,i,n){this.dataZoomModel=t,this.ecModel=e,this.api=i},getTargetCoordInfo:function(){function t(t,e,i,n){for(var o,a=0;a<i.length;a++)if(i[a].model===t){o=i[a];break}o||i.push(o={model:t,axisModels:[],coordIndex:n}),o.axisModels.push(e)}var e=this.dataZoomModel,i=this.ecModel,n={};return e.eachTargetAxis(function(e,o){var a=i.getComponent(e.axis,o);if(a){var r=a.getCoordSysModel();r&&t(r,a,n[r.mainType]||(n[r.mainType]=[]),r.componentIndex)}},this),n}}),Yk=(jk.extend({type:"dataZoom.slider",layoutMode:"box",defaultOption:{show:!0,right:"ph",top:"ph",width:"ph",height:"ph",left:null,bottom:null,backgroundColor:"rgba(47,69,84,0)",dataBackground:{lineStyle:{color:"#2f4554",width:.5,opacity:.3},areaStyle:{color:"rgba(47,69,84,0.3)",opacity:.3}},borderColor:"#ddd",fillerColor:"rgba(167,183,204,0.4)",handleIcon:"M8.2,13.6V3.9H6.3v9.7H3.1v14.9h3.3v9.7h1.8v-9.7h3.3V13.6H8.2z M9.7,24.4H4.8v-1.4h4.9V24.4z M9.7,19.1H4.8v-1.4h4.9V19.1z",handleSize:"100%",handleStyle:{color:"#a7b7cc"},labelPrecision:null,labelFormatter:null,showDetail:!0,showDataShadow:"auto",realtime:!0,zoomLock:!1,textStyle:{color:"#333"}}}),Vb),qk=Io,$k=Do,Kk=m,Jk=d,Qk="horizontal",tP=5,eP=["line","bar","candlestick","scatter"],iP=Xk.extend({type:"dataZoom.slider",init:function(t,e){this._displayables={},this._orient,this._range,this._handleEnds,this._size,this._handleWidth,this._handleHeight,this._location,this._dragging,this._dataShadowInfo,this.api=e},render:function(t,e,i,n){iP.superApply(this,"render",arguments),yr(this,"_dispatchZoomAction",this.dataZoomModel.get("throttle"),"fixRate"),this._orient=t.get("orient"),!1!==this.dataZoomModel.get("show")?(n&&"dataZoom"===n.type&&n.from===this.uid||this._buildView(),this._updateView()):this.group.removeAll()},remove:function(){iP.superApply(this,"remove",arguments),xr(this,"_dispatchZoomAction")},dispose:function(){iP.superApply(this,"dispose",arguments),xr(this,"_dispatchZoomAction")},_buildView:function(){var t=this.group;t.removeAll(),this._resetLocation(),this._resetInterval();var e=this._displayables.barGroup=new S_;this._renderBackground(),this._renderHandle(),this._renderDataShadow(),t.add(e),this._positionGroup()},_resetLocation:function(){var t=this.dataZoomModel,e=this.api,i=this._findCoordRect(),n={width:e.getWidth(),height:e.getHeight()},o=this._orient===Qk?{right:n.width-i.x-i.width,top:n.height-30-7,width:i.width,height:30}:{right:7,top:i.y,width:30,height:i.height},a=ea(t.option);d(["right","top","width","height"],function(t){"ph"===a[t]&&(a[t]=o[t])});var r=Ko(a,n,t.padding);this._location={x:r.x,y:r.y},this._size=[r.width,r.height],"vertical"===this._orient&&this._size.reverse()},_positionGroup:function(){var t=this.group,e=this._location,i=this._orient,n=this.dataZoomModel.getFirstTargetAxisModel(),o=n&&n.get("inverse"),a=this._displayables.barGroup,r=(this._dataShadowInfo||{}).otherAxisInverse;a.attr(i!==Qk||o?i===Qk&&o?{scale:r?[-1,1]:[-1,-1]}:"vertical"!==i||o?{scale:r?[-1,-1]:[-1,1],rotation:Math.PI/2}:{scale:r?[1,-1]:[1,1],rotation:Math.PI/2}:{scale:r?[1,1]:[1,-1]});var s=t.getBoundingRect([a]);t.attr("position",[e.x-s.x,e.y-s.y])},_getViewExtent:function(){return[0,this._size[0]]},_renderBackground:function(){var t=this.dataZoomModel,e=this._size,i=this._displayables.barGroup;i.add(new Yk({silent:!0,shape:{x:0,y:0,width:e[0],height:e[1]},style:{fill:t.get("backgroundColor")},z2:-40})),i.add(new Yk({shape:{x:0,y:0,width:e[0],height:e[1]},style:{fill:"transparent"},z2:0,onclick:m(this._onClickPanelClick,this)}))},_renderDataShadow:function(){var t=this._dataShadowInfo=this._prepareDataShadowInfo();if(t){var e=this._size,i=t.series,n=i.getRawData(),o=i.getShadowDim?i.getShadowDim():t.otherDim;if(null!=o){var a=n.getDataExtent(o),s=.3*(a[1]-a[0]);a=[a[0]-s,a[1]+s];var l,h=[0,e[1]],u=[0,e[0]],c=[[e[0],0],[0,0]],d=[],f=u[1]/(n.count()-1),p=0,g=Math.round(n.count()/e[0]);n.each([o],function(t,e){if(g>0&&e%g)p+=f;else{var i=null==t||isNaN(t)||""===t,n=i?0:qk(t,a,h,!0);i&&!l&&e?(c.push([c[c.length-1][0],0]),d.push([d[d.length-1][0],0])):!i&&l&&(c.push([p,0]),d.push([p,0])),c.push([p,n]),d.push([p,n]),p+=f,l=i}});var m=this.dataZoomModel;this._displayables.barGroup.add(new Rb({shape:{points:c},style:r({fill:m.get("dataBackgroundColor")},m.getModel("dataBackground.areaStyle").getAreaStyle()),silent:!0,z2:-20})),this._displayables.barGroup.add(new Bb({shape:{points:d},style:m.getModel("dataBackground.lineStyle").getLineStyle(),silent:!0,z2:-19}))}}},_prepareDataShadowInfo:function(){var t=this.dataZoomModel,e=t.get("showDataShadow");if(!1!==e){var i,n=this.ecModel;return t.eachTargetAxis(function(o,a){d(t.getAxisProxy(o.name,a).getTargetSeriesModels(),function(t){if(!(i||!0!==e&&l(eP,t.get("type"))<0)){var r,s=n.getComponent(o.axis,a).axis,h=dv(o.name),u=t.coordinateSystem;null!=h&&u.getOtherAxis&&(r=u.getOtherAxis(s).inverse),h=t.getData().mapDimension(h),i={thisAxis:s,series:t,thisDim:o.name,otherDim:h,otherAxisInverse:r}}},this)},this),i}},_renderHandle:function(){var t=this._displayables,e=t.handles=[],i=t.handleLabels=[],n=this._displayables.barGroup,o=this._size,a=this.dataZoomModel;n.add(t.filler=new Yk({draggable:!0,cursor:fv(this._orient),drift:Kk(this._onDragMove,this,"all"),onmousemove:function(t){Q_(t.event)},ondragstart:Kk(this._showDataInfo,this,!0),ondragend:Kk(this._onDragEnd,this),onmouseover:Kk(this._showDataInfo,this,!0),onmouseout:Kk(this._showDataInfo,this,!1),style:{fill:a.get("fillerColor"),textPosition:"inside"}})),n.add(new Yk(Gn({silent:!0,shape:{x:0,y:0,width:o[0],height:o[1]},style:{stroke:a.get("dataBackgroundColor")||a.get("borderColor"),lineWidth:1,fill:"rgba(0,0,0,0)"}}))),Jk([0,1],function(t){var o=xo(a.get("handleIcon"),{cursor:fv(this._orient),draggable:!0,drift:Kk(this._onDragMove,this,t),onmousemove:function(t){Q_(t.event)},ondragend:Kk(this._onDragEnd,this),onmouseover:Kk(this._showDataInfo,this,!0),onmouseout:Kk(this._showDataInfo,this,!1)},{x:-1,y:0,width:2,height:2}),r=o.getBoundingRect();this._handleHeight=To(a.get("handleSize"),this._size[1]),this._handleWidth=r.width/r.height*this._handleHeight,o.setStyle(a.getModel("handleStyle").getItemStyle());var s=a.get("handleColor");null!=s&&(o.style.fill=s),n.add(e[t]=o);var l=a.textStyleModel;this.group.add(i[t]=new Cb({silent:!0,invisible:!0,style:{x:0,y:0,text:"",textVerticalAlign:"middle",textAlign:"center",textFill:l.getTextColor(),textFont:l.getFont()},z2:10}))},this)},_resetInterval:function(){var t=this._range=this.dataZoomModel.getPercentRange(),e=this._getViewExtent();this._handleEnds=[qk(t[0],[0,100],e,!0),qk(t[1],[0,100],e,!0)]},_updateInterval:function(t,e){var i=this.dataZoomModel,n=this._handleEnds,o=this._getViewExtent(),a=i.findRepresentativeAxisProxy().getMinMaxSpan(),r=[0,100];jD(e,n,o,i.get("zoomLock")?"all":t,null!=a.minSpan?qk(a.minSpan,r,o,!0):null,null!=a.maxSpan?qk(a.maxSpan,r,o,!0):null),this._range=$k([qk(n[0],o,r,!0),qk(n[1],o,r,!0)])},_updateView:function(t){var e=this._displayables,i=this._handleEnds,n=$k(i.slice()),o=this._size;Jk([0,1],function(t){var n=e.handles[t],a=this._handleHeight;n.attr({scale:[a/2,a/2],position:[i[t],o[1]/2-a/2]})},this),e.filler.setShape({x:n[0],y:0,width:n[1]-n[0],height:o[1]}),this._updateDataInfo(t)},_updateDataInfo:function(t){function e(t){var e=po(n.handles[t].parent,this.group),i=mo(0===t?"right":"left",e),s=this._handleWidth/2+tP,l=go([c[t]+(0===t?-s:s),this._size[1]/2],e);o[t].setStyle({x:l[0],y:l[1],textVerticalAlign:a===Qk?"middle":i,textAlign:a===Qk?i:"center",text:r[t]})}var i=this.dataZoomModel,n=this._displayables,o=n.handleLabels,a=this._orient,r=["",""];if(i.get("showDetail")){var s=i.findRepresentativeAxisProxy();if(s){var l=s.getAxisModel().axis,h=this._range,u=t?s.calculateDataWindow({start:h[0],end:h[1]}).valueWindow:s.getDataValueWindow();r=[this._formatLabel(u[0],l),this._formatLabel(u[1],l)]}}var c=$k(this._handleEnds.slice());e.call(this,0),e.call(this,1)},_formatLabel:function(t,e){var i=this.dataZoomModel,n=i.get("labelFormatter"),o=i.get("labelPrecision");null!=o&&"auto"!==o||(o=e.getPixelPrecision());var a=null==t||isNaN(t)?"":"category"===e.type||"time"===e.type?e.scale.getLabel(Math.round(t)):t.toFixed(Math.min(o,20));return x(n)?n(t,a):_(n)?n.replace("{value}",a):a},_showDataInfo:function(t){t=this._dragging||t;var e=this._displayables.handleLabels;e[0].attr("invisible",!t),e[1].attr("invisible",!t)},_onDragMove:function(t,e,i){this._dragging=!0;var n=go([e,i],this._displayables.barGroup.getLocalTransform(),!0);this._updateInterval(t,n[0]);var o=this.dataZoomModel.get("realtime");this._updateView(!o),o&&this._dispatchZoomAction()},_onDragEnd:function(){this._dragging=!1,this._showDataInfo(!1),!this.dataZoomModel.get("realtime")&&this._dispatchZoomAction()},_onClickPanelClick:function(t){var e=this._size,i=this._displayables.barGroup.transformCoordToLocal(t.offsetX,t.offsetY);if(!(i[0]<0||i[0]>e[0]||i[1]<0||i[1]>e[1])){var n=this._handleEnds,o=(n[0]+n[1])/2;this._updateInterval("all",i[0]-o),this._updateView(),this._dispatchZoomAction()}},_dispatchZoomAction:function(){var t=this._range;this.api.dispatchAction({type:"dataZoom",from:this.uid,dataZoomId:this.dataZoomModel.id,start:t[0],end:t[1]})},_findCoordRect:function(){var t;if(Jk(this.getTargetCoordInfo(),function(e){if(!t&&e.length){var i=e[0].model.coordinateSystem;t=i.getRect&&i.getRect()}}),!t){var e=this.api.getWidth(),i=this.api.getHeight();t={x:.2*e,y:.2*i,width:.6*e,height:.6*i}}return t}});jk.extend({type:"dataZoom.inside",defaultOption:{disabled:!1,zoomLock:!1,zoomOnMouseWheel:!0,moveOnMouseMove:!0,preventDefaultMouseMove:!0}});var nP=v,oP="\0_ec_dataZoom_roams",aP=m,rP=Xk.extend({type:"dataZoom.inside",init:function(t,e){this._range},render:function(t,e,i,n){rP.superApply(this,"render",arguments),mv(n,t.id)&&(this._range=t.getPercentRange()),d(this.getTargetCoordInfo(),function(e,n){var o=f(e,function(t){return vv(t.model)});d(e,function(e){var a=e.model,r=t.option;pv(i,{coordId:vv(a),allCoordIds:o,containsPoint:function(t,e,i){return a.coordinateSystem.containPoint([e,i])},dataZoomId:t.id,throttleRate:t.get("throttle",!0),panGetRange:aP(this._onPan,this,e,n),zoomGetRange:aP(this._onZoom,this,e,n),zoomLock:r.zoomLock,disabled:r.disabled,roamControllerOpt:{zoomOnMouseWheel:r.zoomOnMouseWheel,moveOnMouseMove:r.moveOnMouseMove,preventDefaultMouseMove:r.preventDefaultMouseMove}})},this)},this)},dispose:function(){gv(this.api,this.dataZoomModel.id),rP.superApply(this,"dispose",arguments),this._range=null},_onPan:function(t,e,i,n,o,a,r,s,l){var h=this._range.slice(),u=t.axisModels[0];if(u){var c=sP[e]([a,r],[s,l],u,i,t),d=c.signal*(h[1]-h[0])*c.pixel/c.pixelLength;return jD(d,h,[0,100],"all"),this._range=h}},_onZoom:function(t,e,i,n,o,a){var r=this._range.slice(),s=t.axisModels[0];if(s){var l=sP[e](null,[o,a],s,i,t),h=(l.signal>0?l.pixelStart+l.pixelLength-l.pixel:l.pixel-l.pixelStart)/l.pixelLength*(r[1]-r[0])+r[0];n=Math.max(1/n,0),r[0]=(r[0]-h)*n+h,r[1]=(r[1]-h)*n+h;var u=this.dataZoomModel.findRepresentativeAxisProxy().getMinMaxSpan();return jD(0,r,[0,100],0,u.minSpan,u.maxSpan),this._range=r}}}),sP={grid:function(t,e,i,n,o){var a=i.axis,r={},s=o.model.coordinateSystem.getRect();return t=t||[0,0],"x"===a.dim?(r.pixel=e[0]-t[0],r.pixelLength=s.width,r.pixelStart=s.x,r.signal=a.inverse?1:-1):(r.pixel=e[1]-t[1],r.pixelLength=s.height,r.pixelStart=s.y,r.signal=a.inverse?-1:1),r},polar:function(t,e,i,n,o){var a=i.axis,r={},s=o.model.coordinateSystem,l=s.getRadiusAxis().getExtent(),h=s.getAngleAxis().getExtent();return t=t?s.pointToCoord(t):[0,0],e=s.pointToCoord(e),"radiusAxis"===i.mainType?(r.pixel=e[0]-t[0],r.pixelLength=l[1]-l[0],r.pixelStart=l[0],r.signal=a.inverse?1:-1):(r.pixel=e[1]-t[1],r.pixelLength=h[1]-h[0],r.pixelStart=h[0],r.signal=a.inverse?-1:1),r},singleAxis:function(t,e,i,n,o){var a=i.axis,r=o.model.coordinateSystem.getRect(),s={};return t=t||[0,0],"horizontal"===a.orient?(s.pixel=e[0]-t[0],s.pixelLength=r.width,s.pixelStart=r.x,s.signal=a.inverse?1:-1):(s.pixel=e[1]-t[1],s.pixelLength=r.height,s.pixelStart=r.y,s.signal=a.inverse?-1:1),s}};ls({getTargetSeries:function(t){var e=z();return t.eachComponent("dataZoom",function(t){t.eachTargetAxis(function(t,i,n){d(n.getAxisProxy(t.name,i).getTargetSeriesModels(),function(t){e.set(t.uid,t)})})}),e},isOverallFilter:!0,overallReset:function(t,e){t.eachComponent("dataZoom",function(t){t.eachTargetAxis(function(t,i,n){n.getAxisProxy(t.name,i).reset(n,e)}),t.eachTargetAxis(function(t,i,n){n.getAxisProxy(t.name,i).filterData(n,e)})}),t.eachComponent("dataZoom",function(t){var e=t.findRepresentativeAxisProxy(),i=e.getDataPercentWindow(),n=e.getDataValueWindow();t.setRawRange({start:i[0],end:i[1],startValue:n[0],endValue:n[1]},!0)})}}),hs("dataZoom",function(t,e){var i=av(m(e.eachComponent,e,"dataZoom"),Gk,function(t,e){return t.get(e.axisIndex)}),n=[];e.eachComponent({mainType:"dataZoom",query:t},function(t,e){n.push.apply(n,i(t).nodes)}),d(n,function(e,i){e.setRawRange({start:t.start,end:t.end,startValue:t.startValue,endValue:t.endValue})})});var lP=d,hP=function(t){var e=t&&t.visualMap;y(e)||(e=e?[e]:[]),lP(e,function(t){if(t){Tv(t,"splitList")&&!Tv(t,"pieces")&&(t.pieces=t.splitList,delete t.splitList);var e=t.pieces;e&&y(e)&&lP(e,function(t){w(t)&&(Tv(t,"start")&&!Tv(t,"min")&&(t.min=t.start),Tv(t,"end")&&!Tv(t,"max")&&(t.max=t.end))})}})};IS.registerSubTypeDefaulter("visualMap",function(t){return t.categories||(t.pieces?t.pieces.length>0:t.splitNumber>0)&&!t.calculable?"piecewise":"continuous"});var uP=FM.VISUAL.COMPONENT;ds(uP,{createOnAllSeries:!0,reset:function(t,e){var i=[];return e.eachComponent("visualMap",function(e){e.isTargetSeries(t)&&i.push(Cm(e.stateList,e.targetVisuals,m(e.getValueState,e),e.getDataDimension(t.getData())))}),i}}),ds(uP,{createOnAllSeries:!0,reset:function(t,e){var i=t.getData(),n=[];e.eachComponent("visualMap",function(e){if(e.isTargetSeries(t)){var o=e.getVisualMeta(m(Av,null,t,e))||{stops:[],outerColors:[]},a=e.getDataDimension(i),r=i.getDimensionInfo(a);null!=r&&(o.dimension=r.index,n.push(o))}}),t.getData().setVisual("visualMeta",n)}});var cP={get:function(t,e,n){var o=i((dP[t]||{})[e]);return n&&y(o)?o[o.length-1]:o}},dP={color:{active:["#006edd","#e0ffff"],inactive:["rgba(0,0,0,0)"]},colorHue:{active:[0,360],inactive:[0,0]},colorSaturation:{active:[.3,1],inactive:[0,0]},colorLightness:{active:[.9,.5],inactive:[0,0]},colorAlpha:{active:[.3,1],inactive:[0,0]},opacity:{active:[.3,1],inactive:[0,0]},symbol:{active:["circle","roundRect","diamond"],inactive:["none"]},symbolSize:{active:[10,50],inactive:[0,0]}},fP=oD.mapVisual,pP=oD.eachVisual,gP=y,mP=d,vP=Do,yP=Io,xP=B,_P=gs({type:"visualMap",dependencies:["series"],stateList:["inRange","outOfRange"],replacableOptionKeys:["inRange","outOfRange","target","controller","color"],dataBound:[-1/0,1/0],layoutMode:{type:"box",ignoreSize:!0},defaultOption:{show:!0,zlevel:0,z:4,seriesIndex:"all",min:0,max:200,dimension:null,inRange:null,outOfRange:null,left:0,right:null,top:null,bottom:0,itemWidth:null,itemHeight:null,inverse:!1,orient:"vertical",backgroundColor:"rgba(0,0,0,0)",borderColor:"#ccc",contentColor:"#5793f3",inactiveColor:"#aaa",borderWidth:0,padding:5,textGap:10,precision:0,color:null,formatter:null,text:null,textStyle:{color:"#333"}},init:function(t,e,i){this._dataExtent,this.targetVisuals={},this.controllerVisuals={},this.textStyleModel,this.itemSize,this.mergeDefaultAndTheme(t,i)},optionUpdated:function(t,e){var i=this.option;_x.canvasSupported||(i.realtime=!1),!e&&Am(i,t,this.replacableOptionKeys),this.textStyleModel=this.getModel("textStyle"),this.resetItemSize(),this.completeVisualOption()},resetVisual:function(t){var e=this.stateList;t=m(t,this),this.controllerVisuals=Tm(this.option.controller,e,t),this.targetVisuals=Tm(this.option.target,e,t)},getTargetSeriesIndices:function(){var t=this.option.seriesIndex,e=[];return null==t||"all"===t?this.ecModel.eachSeries(function(t,i){e.push(i)}):e=Si(t),e},eachTargetSeries:function(t,e){d(this.getTargetSeriesIndices(),function(i){t.call(e,this.ecModel.getSeriesByIndex(i))},this)},isTargetSeries:function(t){var e=!1;return this.eachTargetSeries(function(i){i===t&&(e=!0)}),e},formatValueText:function(t,e,i){function n(t){return t===l[0]?"min":t===l[1]?"max":(+t).toFixed(Math.min(s,20))}var o,a,r=this.option,s=r.precision,l=this.dataBound,h=r.formatter;return i=i||["<",">"],y(t)&&(t=t.slice(),o=!0),a=e?t:o?[n(t[0]),n(t[1])]:n(t),_(h)?h.replace("{value}",o?a[0]:a).replace("{value2}",o?a[1]:a):x(h)?o?h(t[0],t[1]):h(t):o?t[0]===l[0]?i[0]+" "+a[1]:t[1]===l[1]?i[1]+" "+a[0]:a[0]+" - "+a[1]:a},resetExtent:function(){var t=this.option,e=vP([t.min,t.max]);this._dataExtent=e},getDataDimension:function(t){var e=this.option.dimension,i=t.dimensions;if(null!=e||i.length)return t.getDimension(null!=e?e:i.length-1)},getExtent:function(){return this._dataExtent.slice()},completeVisualOption:function(){function t(t){gP(o.color)&&!t.inRange&&(t.inRange={color:o.color.slice().reverse()}),t.inRange=t.inRange||{color:e.get("gradientColor")},mP(this.stateList,function(e){var i=t[e];if(_(i)){var n=cP.get(i,"active",l);n?(t[e]={},t[e][i]=n):delete t[e]}},this)}var e=this.ecModel,o=this.option,a={inRange:o.inRange,outOfRange:o.outOfRange},r=o.target||(o.target={}),s=o.controller||(o.controller={});n(r,a),n(s,a);var l=this.isCategory();t.call(this,r),t.call(this,s),function(t,e,i){var n=t[e],o=t[i];n&&!o&&(o=t[i]={},mP(n,function(t,e){if(oD.isValidType(e)){var i=cP.get(e,"inactive",l);null!=i&&(o[e]=i,"color"!==e||o.hasOwnProperty("opacity")||o.hasOwnProperty("colorAlpha")||(o.opacity=[0,0]))}}))}.call(this,r,"inRange","outOfRange"),function(t){var e=(t.inRange||{}).symbol||(t.outOfRange||{}).symbol,n=(t.inRange||{}).symbolSize||(t.outOfRange||{}).symbolSize,o=this.get("inactiveColor");mP(this.stateList,function(a){var r=this.itemSize,s=t[a];s||(s=t[a]={color:l?o:[o]}),null==s.symbol&&(s.symbol=e&&i(e)||(l?"roundRect":["roundRect"])),null==s.symbolSize&&(s.symbolSize=n&&i(n)||(l?r[0]:[r[0],r[0]])),s.symbol=fP(s.symbol,function(t){return"none"===t||"square"===t?"roundRect":t});var h=s.symbolSize;if(null!=h){var u=-1/0;pP(h,function(t){t>u&&(u=t)}),s.symbolSize=fP(h,function(t){return yP(t,[0,u],[0,r[0]],!0)})}},this)}.call(this,s)},resetItemSize:function(){this.itemSize=[parseFloat(this.get("itemWidth")),parseFloat(this.get("itemHeight"))]},isCategory:function(){return!!this.option.categories},setSelected:xP,getValueState:xP,getVisualMeta:xP}),wP=[20,140],bP=_P.extend({type:"visualMap.continuous",defaultOption:{align:"auto",calculable:!1,range:null,realtime:!0,itemHeight:null,itemWidth:null,hoverLink:!0,hoverLinkDataSize:null,hoverLinkOnHandle:null},optionUpdated:function(t,e){bP.superApply(this,"optionUpdated",arguments),this.resetExtent(),this.resetVisual(function(t){t.mappingMethod="linear",t.dataExtent=this.getExtent()}),this._resetRange()},resetItemSize:function(){bP.superApply(this,"resetItemSize",arguments);var t=this.itemSize;"horizontal"===this._orient&&t.reverse(),(null==t[0]||isNaN(t[0]))&&(t[0]=wP[0]),(null==t[1]||isNaN(t[1]))&&(t[1]=wP[1])},_resetRange:function(){var t=this.getExtent(),e=this.option.range;!e||e.auto?(t.auto=1,this.option.range=t):y(e)&&(e[0]>e[1]&&e.reverse(),e[0]=Math.max(e[0],t[0]),e[1]=Math.min(e[1],t[1]))},completeVisualOption:function(){_P.prototype.completeVisualOption.apply(this,arguments),d(this.stateList,function(t){var e=this.option.controller[t].symbolSize;e&&e[0]!==e[1]&&(e[0]=0)},this)},setSelected:function(t){this.option.range=t.slice(),this._resetRange()},getSelected:function(){var t=this.getExtent(),e=Do((this.get("range")||[]).slice());return e[0]>t[1]&&(e[0]=t[1]),e[1]>t[1]&&(e[1]=t[1]),e[0]<t[0]&&(e[0]=t[0]),e[1]<t[0]&&(e[1]=t[0]),e},getValueState:function(t){var e=this.option.range,i=this.getExtent();return(e[0]<=i[0]||e[0]<=t)&&(e[1]>=i[1]||t<=e[1])?"inRange":"outOfRange"},findTargetDataIndices:function(t){var e=[];return this.eachTargetSeries(function(i){var n=[],o=i.getData();o.each(this.getDataDimension(o),function(e,i){t[0]<=e&&e<=t[1]&&n.push(i)},!0,this),e.push({seriesId:i.id,dataIndex:n})},this),e},getVisualMeta:function(t){function e(e,i){o.push({value:e,color:t(e,i)})}for(var i=Dv(0,0,this.getExtent()),n=Dv(0,0,this.option.range.slice()),o=[],a=0,r=0,s=n.length,l=i.length;r<l&&(!n.length||i[r]<=n[0]);r++)i[r]<n[a]&&e(i[r],"outOfRange");for(h=1;a<s;a++,h=0)h&&o.length&&e(n[a],"outOfRange"),e(n[a],"inRange");for(var h=1;r<l;r++)(!n.length||n[n.length-1]<i[r])&&(h&&(o.length&&e(o[o.length-1].value,"outOfRange"),h=0),e(i[r],"outOfRange"));var u=o.length;return{stops:o,outerColors:[u?o[0].color:"transparent",u?o[u-1].color:"transparent"]}}}),SP=ms({type:"visualMap",autoPositionValues:{left:1,right:1,top:1,bottom:1},init:function(t,e){this.ecModel=t,this.api=e,this.visualMapModel},render:function(t,e,i,n){this.visualMapModel=t,!1!==t.get("show")?this.doRender.apply(this,arguments):this.group.removeAll()},renderBackground:function(t){var e=this.visualMapModel,i=dS(e.get("padding")||0),n=t.getBoundingRect();t.add(new Vb({z2:-1,silent:!0,shape:{x:n.x-i[3],y:n.y-i[0],width:n.width+i[3]+i[1],height:n.height+i[0]+i[2]},style:{fill:e.get("backgroundColor"),stroke:e.get("borderColor"),lineWidth:e.get("borderWidth")}}))},getControllerVisual:function(t,e,i){function n(t){return s[t]}function o(t,e){s[t]=e}var a=(i=i||{}).forceState,r=this.visualMapModel,s={};if("symbol"===e&&(s.symbol=r.get("itemSymbol")),"color"===e){var l=r.get("contentColor");s.color=l}var h=r.controllerVisuals[a||r.getValueState(t)];return d(oD.prepareVisualTypes(h),function(a){var r=h[a];i.convertOpacityToAlpha&&"opacity"===a&&(a="colorAlpha",r=h.__alphaForOpacity),oD.dependsOn(a,e)&&r&&r.applyVisual(t,n,o)}),s[e]},positionGroup:function(t){var e=this.visualMapModel,i=this.api;Jo(t,e.getBoxLayoutParams(),{width:i.getWidth(),height:i.getHeight()})},doRender:B}),MP=Io,IP=d,TP=Math.min,AP=Math.max,DP=12,CP=6,LP=SP.extend({type:"visualMap.continuous",init:function(){LP.superApply(this,"init",arguments),this._shapes={},this._dataInterval=[],this._handleEnds=[],this._orient,this._useHandle,this._hoverLinkDataIndices=[],this._dragging,this._hovering},doRender:function(t,e,i,n){n&&"selectDataRange"===n.type&&n.from===this.uid||this._buildView()},_buildView:function(){this.group.removeAll();var t=this.visualMapModel,e=this.group;this._orient=t.get("orient"),this._useHandle=t.get("calculable"),this._resetInterval(),this._renderBar(e);var i=t.get("text");this._renderEndsText(e,i,0),this._renderEndsText(e,i,1),this._updateView(!0),this.renderBackground(e),this._updateView(),this._enableHoverLinkToSeries(),this._enableHoverLinkFromSeries(),this.positionGroup(e)},_renderEndsText:function(t,e,i){if(e){var n=e[1-i];n=null!=n?n+"":"";var o=this.visualMapModel,a=o.get("textGap"),r=o.itemSize,s=this._shapes.barGroup,l=this._applyTransform([r[0]/2,0===i?-a:r[1]+a],s),h=this._applyTransform(0===i?"bottom":"top",s),u=this._orient,c=this.visualMapModel.textStyleModel;this.group.add(new Cb({style:{x:l[0],y:l[1],textVerticalAlign:"horizontal"===u?"middle":h,textAlign:"horizontal"===u?h:"center",text:n,textFont:c.getFont(),textFill:c.getTextColor()}}))}},_renderBar:function(t){var e=this.visualMapModel,i=this._shapes,n=e.itemSize,o=this._orient,a=this._useHandle,r=Cv(e,this.api,n),s=i.barGroup=this._createBarGroup(r);s.add(i.outOfRange=kv()),s.add(i.inRange=kv(null,a?zv(this._orient):null,m(this._dragHandle,this,"all",!1),m(this._dragHandle,this,"all",!0)));var l=e.textStyleModel.getTextRect("国"),h=AP(l.width,l.height);a&&(i.handleThumbs=[],i.handleLabels=[],i.handleLabelPoints=[],this._createHandle(s,0,n,h,o,r),this._createHandle(s,1,n,h,o,r)),this._createIndicator(s,n,h,o),t.add(s)},_createHandle:function(t,e,i,n,o){var a=m(this._dragHandle,this,e,!1),r=m(this._dragHandle,this,e,!0),s=kv(Pv(e,n),zv(this._orient),a,r);s.position[0]=i[0],t.add(s);var l=this.visualMapModel.textStyleModel,h=new Cb({draggable:!0,drift:a,onmousemove:function(t){Q_(t.event)},ondragend:r,style:{x:0,y:0,text:"",textFont:l.getFont(),textFill:l.getTextColor()}});this.group.add(h);var u=["horizontal"===o?n/2:1.5*n,"horizontal"===o?0===e?-1.5*n:1.5*n:0===e?-n/2:n/2],c=this._shapes;c.handleThumbs[e]=s,c.handleLabelPoints[e]=u,c.handleLabels[e]=h},_createIndicator:function(t,e,i,n){var o=kv([[0,0]],"move");o.position[0]=e[0],o.attr({invisible:!0,silent:!0}),t.add(o);var a=this.visualMapModel.textStyleModel,r=new Cb({silent:!0,invisible:!0,style:{x:0,y:0,text:"",textFont:a.getFont(),textFill:a.getTextColor()}});this.group.add(r);var s=["horizontal"===n?i/2:CP+3,0],l=this._shapes;l.indicator=o,l.indicatorLabel=r,l.indicatorLabelPoint=s},_dragHandle:function(t,e,i,n){if(this._useHandle){if(this._dragging=!e,!e){var o=this._applyTransform([i,n],this._shapes.barGroup,!0);this._updateInterval(t,o[1]),this._updateView()}e===!this.visualMapModel.get("realtime")&&this.api.dispatchAction({type:"selectDataRange",from:this.uid,visualMapId:this.visualMapModel.id,selected:this._dataInterval.slice()}),e?!this._hovering&&this._clearHoverLinkToSeries():Ev(this.visualMapModel)&&this._doHoverLinkToSeries(this._handleEnds[t],!1)}},_resetInterval:function(){var t=this.visualMapModel,e=this._dataInterval=t.getSelected(),i=t.getExtent(),n=[0,t.itemSize[1]];this._handleEnds=[MP(e[0],i,n,!0),MP(e[1],i,n,!0)]},_updateInterval:function(t,e){e=e||0;var i=this.visualMapModel,n=this._handleEnds,o=[0,i.itemSize[1]];jD(e,n,o,t,0);var a=i.getExtent();this._dataInterval=[MP(n[0],o,a,!0),MP(n[1],o,a,!0)]},_updateView:function(t){var e=this.visualMapModel,i=e.getExtent(),n=this._shapes,o=[0,e.itemSize[1]],a=t?o:this._handleEnds,r=this._createBarVisual(this._dataInterval,i,a,"inRange"),s=this._createBarVisual(i,i,o,"outOfRange");n.inRange.setStyle({fill:r.barColor,opacity:r.opacity}).setShape("points",r.barPoints),n.outOfRange.setStyle({fill:s.barColor,opacity:s.opacity}).setShape("points",s.barPoints),this._updateHandle(a,r)},_createBarVisual:function(t,e,i,n){var o={forceState:n,convertOpacityToAlpha:!0},a=this._makeColorGradient(t,o),r=[this.getControllerVisual(t[0],"symbolSize",o),this.getControllerVisual(t[1],"symbolSize",o)],s=this._createBarPoints(i,r);return{barColor:new jb(0,0,0,1,a),barPoints:s,handlesColor:[a[0].color,a[a.length-1].color]}},_makeColorGradient:function(t,e){var i=[],n=(t[1]-t[0])/100;i.push({color:this.getControllerVisual(t[0],"color",e),offset:0});for(var o=1;o<100;o++){var a=t[0]+n*o;if(a>t[1])break;i.push({color:this.getControllerVisual(a,"color",e),offset:o/100})}return i.push({color:this.getControllerVisual(t[1],"color",e),offset:1}),i},_createBarPoints:function(t,e){var i=this.visualMapModel.itemSize;return[[i[0]-e[0],t[0]],[i[0],t[0]],[i[0],t[1]],[i[0]-e[1],t[1]]]},_createBarGroup:function(t){var e=this._orient,i=this.visualMapModel.get("inverse");return new S_("horizontal"!==e||i?"horizontal"===e&&i?{scale:"bottom"===t?[-1,1]:[1,1],rotation:-Math.PI/2}:"vertical"!==e||i?{scale:"left"===t?[1,1]:[-1,1]}:{scale:"left"===t?[1,-1]:[-1,-1]}:{scale:"bottom"===t?[1,1]:[-1,1],rotation:Math.PI/2})},_updateHandle:function(t,e){if(this._useHandle){var i=this._shapes,n=this.visualMapModel,o=i.handleThumbs,a=i.handleLabels;IP([0,1],function(r){var s=o[r];s.setStyle("fill",e.handlesColor[r]),s.position[1]=t[r];var l=go(i.handleLabelPoints[r],po(s,this.group));a[r].setStyle({x:l[0],y:l[1],text:n.formatValueText(this._dataInterval[r]),textVerticalAlign:"middle",textAlign:this._applyTransform("horizontal"===this._orient?0===r?"bottom":"top":"left",i.barGroup)})},this)}},_showIndicator:function(t,e,i,n){var o=this.visualMapModel,a=o.getExtent(),r=o.itemSize,s=[0,r[1]],l=MP(t,a,s,!0),h=this._shapes,u=h.indicator;if(u){u.position[1]=l,u.attr("invisible",!1),u.setShape("points",Ov(!!i,n,l,r[1]));var c={convertOpacityToAlpha:!0},d=this.getControllerVisual(t,"color",c);u.setStyle("fill",d);var f=go(h.indicatorLabelPoint,po(u,this.group)),p=h.indicatorLabel;p.attr("invisible",!1);var g=this._applyTransform("left",h.barGroup),m=this._orient;p.setStyle({text:(i||"")+o.formatValueText(e),textVerticalAlign:"horizontal"===m?g:"middle",textAlign:"horizontal"===m?"center":g,x:f[0],y:f[1]})}},_enableHoverLinkToSeries:function(){var t=this;this._shapes.barGroup.on("mousemove",function(e){if(t._hovering=!0,!t._dragging){var i=t.visualMapModel.itemSize,n=t._applyTransform([e.offsetX,e.offsetY],t._shapes.barGroup,!0,!0);n[1]=TP(AP(0,n[1]),i[1]),t._doHoverLinkToSeries(n[1],0<=n[0]&&n[0]<=i[0])}}).on("mouseout",function(){t._hovering=!1,!t._dragging&&t._clearHoverLinkToSeries()})},_enableHoverLinkFromSeries:function(){var t=this.api.getZr();this.visualMapModel.option.hoverLink?(t.on("mouseover",this._hoverLinkFromSeriesMouseOver,this),t.on("mouseout",this._hideIndicator,this)):this._clearHoverLinkFromSeries()},_doHoverLinkToSeries:function(t,e){var i=this.visualMapModel,n=i.itemSize;if(i.option.hoverLink){var o=[0,n[1]],a=i.getExtent();t=TP(AP(o[0],t),o[1]);var r=Nv(i,a,o),s=[t-r,t+r],l=MP(t,o,a,!0),h=[MP(s[0],o,a,!0),MP(s[1],o,a,!0)];s[0]<o[0]&&(h[0]=-1/0),s[1]>o[1]&&(h[1]=1/0),e&&(h[0]===-1/0?this._showIndicator(l,h[1],"< ",r):h[1]===1/0?this._showIndicator(l,h[0],"> ",r):this._showIndicator(l,l,"≈ ",r));var u=this._hoverLinkDataIndices,c=[];(e||Ev(i))&&(c=this._hoverLinkDataIndices=i.findTargetDataIndices(h));var d=Li(u,c);this._dispatchHighDown("downplay",Lv(d[0])),this._dispatchHighDown("highlight",Lv(d[1]))}},_hoverLinkFromSeriesMouseOver:function(t){var e=t.target,i=this.visualMapModel;if(e&&null!=e.dataIndex){var n=this.ecModel.getSeriesByIndex(e.seriesIndex);if(i.isTargetSeries(n)){var o=n.getData(e.dataType),a=o.get(i.getDataDimension(o),e.dataIndex,!0);isNaN(a)||this._showIndicator(a,a)}}},_hideIndicator:function(){var t=this._shapes;t.indicator&&t.indicator.attr("invisible",!0),t.indicatorLabel&&t.indicatorLabel.attr("invisible",!0)},_clearHoverLinkToSeries:function(){this._hideIndicator();var t=this._hoverLinkDataIndices;this._dispatchHighDown("downplay",Lv(t)),t.length=0},_clearHoverLinkFromSeries:function(){this._hideIndicator();var t=this.api.getZr();t.off("mouseover",this._hoverLinkFromSeriesMouseOver),t.off("mouseout",this._hideIndicator)},_applyTransform:function(t,e,i,n){var o=po(e,n?null:this.group);return tS[y(t)?"applyTransform":"transformDirection"](t,o,i)},_dispatchHighDown:function(t,e){e&&e.length&&this.api.dispatchAction({type:t,batch:e})},dispose:function(){this._clearHoverLinkFromSeries(),this._clearHoverLinkToSeries()},remove:function(){this._clearHoverLinkFromSeries(),this._clearHoverLinkToSeries()}});hs({type:"selectDataRange",event:"dataRangeSelected",update:"update"},function(t,e){e.eachComponent({mainType:"visualMap",query:t},function(e){e.setSelected(t.selected)})}),ss(hP);var kP=_P.extend({type:"visualMap.piecewise",defaultOption:{selected:null,minOpen:!1,maxOpen:!1,align:"auto",itemWidth:20,itemHeight:14,itemSymbol:"roundRect",pieceList:null,categories:null,splitNumber:5,selectedMode:"multiple",itemGap:10,hoverLink:!0,showLabel:null},optionUpdated:function(t,e){kP.superApply(this,"optionUpdated",arguments),this._pieceList=[],this.resetExtent();var n=this._mode=this._determineMode();PP[this._mode].call(this),this._resetSelected(t,e);var o=this.option.categories;this.resetVisual(function(t,e){"categories"===n?(t.mappingMethod="category",t.categories=i(o)):(t.dataExtent=this.getExtent(),t.mappingMethod="piecewise",t.pieceList=f(this._pieceList,function(t){var t=i(t);return"inRange"!==e&&(t.visual=null),t}))})},completeVisualOption:function(){function t(t,e,i){return t&&t[e]&&(w(t[e])?t[e].hasOwnProperty(i):t[e]===i)}var e=this.option,i={},n=oD.listVisualTypes(),o=this.isCategory();d(e.pieces,function(t){d(n,function(e){t.hasOwnProperty(e)&&(i[e]=1)})}),d(i,function(i,n){var a=0;d(this.stateList,function(i){a|=t(e,i,n)||t(e.target,i,n)},this),!a&&d(this.stateList,function(t){(e[t]||(e[t]={}))[n]=cP.get(n,"inRange"===t?"active":"inactive",o)})},this),_P.prototype.completeVisualOption.apply(this,arguments)},_resetSelected:function(t,e){var i=this.option,n=this._pieceList,o=(e?i:t).selected||{};if(i.selected=o,d(n,function(t,e){var i=this.getSelectedMapKey(t);o.hasOwnProperty(i)||(o[i]=!0)},this),"single"===i.selectedMode){var a=!1;d(n,function(t,e){var i=this.getSelectedMapKey(t);o[i]&&(a?o[i]=!1:a=!0)},this)}},getSelectedMapKey:function(t){return"categories"===this._mode?t.value+"":t.index+""},getPieceList:function(){return this._pieceList},_determineMode:function(){var t=this.option;return t.pieces&&t.pieces.length>0?"pieces":this.option.categories?"categories":"splitNumber"},setSelected:function(t){this.option.selected=i(t)},getValueState:function(t){var e=oD.findPieceIndex(t,this._pieceList);return null!=e&&this.option.selected[this.getSelectedMapKey(this._pieceList[e])]?"inRange":"outOfRange"},findTargetDataIndices:function(t){var e=[];return this.eachTargetSeries(function(i){var n=[],o=i.getData();o.each(this.getDataDimension(o),function(e,i){oD.findPieceIndex(e,this._pieceList)===t&&n.push(i)},!0,this),e.push({seriesId:i.id,dataIndex:n})},this),e},getRepresentValue:function(t){var e;if(this.isCategory())e=t.value;else if(null!=t.value)e=t.value;else{var i=t.interval||[];e=i[0]===-1/0&&i[1]===1/0?0:(i[0]+i[1])/2}return e},getVisualMeta:function(t){function e(e,a){var r=o.getRepresentValue({interval:e});a||(a=o.getValueState(r));var s=t(r,a);e[0]===-1/0?n[0]=s:e[1]===1/0?n[1]=s:i.push({value:e[0],color:s},{value:e[1],color:s})}if(!this.isCategory()){var i=[],n=[],o=this,a=this._pieceList.slice();if(a.length){var r=a[0].interval[0];r!==-1/0&&a.unshift({interval:[-1/0,r]}),(r=a[a.length-1].interval[1])!==1/0&&a.push({interval:[r,1/0]})}else a.push({interval:[-1/0,1/0]});var s=-1/0;return d(a,function(t){var i=t.interval;i&&(i[0]>s&&e([s,i[0]],"outOfRange"),e(i.slice()),s=i[1])},this),{stops:i,outerColors:n}}}}),PP={splitNumber:function(){var t=this.option,e=this._pieceList,i=Math.min(t.precision,20),n=this.getExtent(),o=t.splitNumber;o=Math.max(parseInt(o,10),1),t.splitNumber=o;for(var a=(n[1]-n[0])/o;+a.toFixed(i)!==a&&i<5;)i++;t.precision=i,a=+a.toFixed(i);var r=0;t.minOpen&&e.push({index:r++,interval:[-1/0,n[0]],close:[0,0]});for(var s=n[0],l=r+o;r<l;s+=a){var h=r===o-1?n[1]:s+a;e.push({index:r++,interval:[s,h],close:[1,1]})}t.maxOpen&&e.push({index:r++,interval:[n[1],1/0],close:[0,0]}),Vo(e),d(e,function(t){t.text=this.formatValueText(t.interval)},this)},categories:function(){var t=this.option;d(t.categories,function(t){this._pieceList.push({text:this.formatValueText(t,!0),value:t})},this),Rv(t,this._pieceList)},pieces:function(){var t=this.option,e=this._pieceList;d(t.pieces,function(t,i){w(t)||(t={value:t});var n={text:"",index:i};if(null!=t.label&&(n.text=t.label),t.hasOwnProperty("value")){var o=n.value=t.value;n.interval=[o,o],n.close=[1,1]}else{for(var a=n.interval=[],r=n.close=[0,0],s=[1,0,1],l=[-1/0,1/0],h=[],u=0;u<2;u++){for(var c=[["gte","gt","min"],["lte","lt","max"]][u],d=0;d<3&&null==a[u];d++)a[u]=t[c[d]],r[u]=s[d],h[u]=2===d;null==a[u]&&(a[u]=l[u])}h[0]&&a[1]===1/0&&(r[0]=0),h[1]&&a[0]===-1/0&&(r[1]=0),a[0]===a[1]&&r[0]&&r[1]&&(n.value=a[0])}n.visual=oD.retrieveVisuals(t),e.push(n)},this),Rv(t,e),Vo(e),d(e,function(t){var e=t.close,i=[["<","≤"][e[1]],[">","≥"][e[0]]];t.text=t.text||this.formatValueText(null!=t.value?t.value:t.interval,!1,i)},this)}};SP.extend({type:"visualMap.piecewise",doRender:function(){var t=this.group;t.removeAll();var e=this.visualMapModel,i=e.get("textGap"),n=e.textStyleModel,o=n.getFont(),a=n.getTextColor(),r=this._getItemAlign(),s=e.itemSize,l=this._getViewData(),h=l.endsText,u=T(e.get("showLabel",!0),!h);h&&this._renderEndsText(t,h[0],s,u,r),d(l.viewPieceList,function(n){var l=n.piece,h=new S_;h.onclick=m(this._onItemClick,this,l),this._enableHoverLink(h,n.indexInModelPieceList);var c=e.getRepresentValue(l);if(this._createItemSymbol(h,c,[0,0,s[0],s[1]]),u){var d=this.visualMapModel.getValueState(c);h.add(new Cb({style:{x:"right"===r?-i:s[0]+i,y:s[1]/2,text:l.text,textVerticalAlign:"middle",textAlign:r,textFont:o,textFill:a,opacity:"outOfRange"===d?.5:1}}))}t.add(h)},this),h&&this._renderEndsText(t,h[1],s,u,r),bS(e.get("orient"),t,e.get("itemGap")),this.renderBackground(t),this.positionGroup(t)},_enableHoverLink:function(t,e){function i(t){var i=this.visualMapModel;i.option.hoverLink&&this.api.dispatchAction({type:t,batch:Lv(i.findTargetDataIndices(e))})}t.on("mouseover",m(i,this,"highlight")).on("mouseout",m(i,this,"downplay"))},_getItemAlign:function(){var t=this.visualMapModel,e=t.option;if("vertical"===e.orient)return Cv(t,this.api,t.itemSize);var i=e.align;return i&&"auto"!==i||(i="left"),i},_renderEndsText:function(t,e,i,n,o){if(e){var a=new S_,r=this.visualMapModel.textStyleModel;a.add(new Cb({style:{x:n?"right"===o?i[0]:0:i[0]/2,y:i[1]/2,textVerticalAlign:"middle",textAlign:n?o:"center",text:e,textFont:r.getFont(),textFill:r.getTextColor()}})),t.add(a)}},_getViewData:function(){var t=this.visualMapModel,e=f(t.getPieceList(),function(t,e){return{piece:t,indexInModelPieceList:e}}),i=t.get("text"),n=t.get("orient"),o=t.get("inverse");return("horizontal"===n?o:!o)?e.reverse():i&&(i=i.slice().reverse()),{viewPieceList:e,endsText:i}},_createItemSymbol:function(t,e,i){t.add(dl(this.getControllerVisual(e,"symbol"),i[0],i[1],i[2],i[3],this.getControllerVisual(e,"color")))},_onItemClick:function(t){var e=this.visualMapModel,n=e.option,o=i(n.selected),a=e.getSelectedMapKey(t);"single"===n.selectedMode?(o[a]=!0,d(o,function(t,e){o[e]=e===a})):o[a]=!o[a],this.api.dispatchAction({type:"selectDataRange",from:this.uid,visualMapId:this.visualMapModel.id,selected:o})}});ss(hP);var OP=Wo,NP=Ho,EP=gs({type:"marker",dependencies:["series","grid","polar","geo"],init:function(t,e,i,n){this.mergeDefaultAndTheme(t,i),this.mergeOption(t,i,n.createdBySelf,!0)},isAnimationEnabled:function(){if(_x.node)return!1;var t=this.__hostSeries;return this.getShallow("animation")&&t&&t.isAnimationEnabled()},mergeOption:function(t,e,i,n){var o=this.constructor,r=this.mainType+"Model";i||e.eachSeries(function(t){var i=t.get(this.mainType),s=t[r];i&&i.data?(s?s.mergeOption(i,e,!0):(n&&Bv(i),d(i.data,function(t){t instanceof Array?(Bv(t[0]),Bv(t[1])):Bv(t)}),a(s=new o(i,this,e),{mainType:this.mainType,seriesIndex:t.seriesIndex,name:t.name,createdBySelf:!0}),s.__hostSeries=t),t[r]=s):t[r]=null},this)},formatTooltip:function(t){var e=this.getData(),i=this.getRawValue(t),n=y(i)?f(i,OP).join(", "):OP(i),o=e.getName(t),a=NP(this.name);return(null!=i||o)&&(a+="<br />"),o&&(a+=NP(o),null!=i&&(a+=" : ")),null!=i&&(a+=NP(n)),a},getData:function(){return this._data},setData:function(t){this._data=t}});u(EP,sM),EP.extend({type:"markPoint",defaultOption:{zlevel:0,z:5,symbol:"pin",symbolSize:50,tooltip:{trigger:"item"},label:{show:!0,position:"inside"},itemStyle:{borderWidth:2},emphasis:{label:{show:!0}}}});var zP=l,RP=v,BP={min:RP(Fv,"min"),max:RP(Fv,"max"),average:RP(Fv,"average")},VP=ms({type:"marker",init:function(){this.markerGroupMap=z()},render:function(t,e,i){var n=this.markerGroupMap;n.each(function(t){t.__keep=!1});var o=this.type+"Model";e.eachSeries(function(t){var n=t[o];n&&this.renderSeries(t,n,e,i)},this),n.each(function(t){!t.__keep&&this.group.remove(t.group)},this)},renderSeries:function(){}});VP.extend({type:"markPoint",updateTransform:function(t,e,i){e.eachSeries(function(t){var e=t.markPointModel;e&&(qv(e.getData(),t,i),this.markerGroupMap.get(t.id).updateLayout(e))},this)},renderSeries:function(t,e,i,n){var o=t.coordinateSystem,a=t.id,r=t.getData(),s=this.markerGroupMap,l=s.get(a)||s.set(a,new Ml),h=$v(o,t,e);e.setData(h),qv(e.getData(),t,n),h.each(function(t){var i=h.getItemModel(t),n=i.getShallow("symbolSize");"function"==typeof n&&(n=n(e.getRawValue(t),e.getDataParams(t))),h.setItemVisual(t,{symbolSize:n,color:i.get("itemStyle.color")||r.getVisual("color"),symbol:i.getShallow("symbol")})}),l.updateData(h),this.group.add(l.group),h.eachItemGraphicEl(function(t){t.traverse(function(t){t.dataModel=e})}),l.__keep=!0,l.group.silent=e.get("silent")||t.get("silent")}}),ss(function(t){t.markPoint=t.markPoint||{}}),EP.extend({type:"markLine",defaultOption:{zlevel:0,z:5,symbol:["circle","arrow"],symbolSize:[8,16],precision:2,tooltip:{trigger:"item"},label:{show:!0,position:"end"},lineStyle:{type:"dashed"},emphasis:{label:{show:!0},lineStyle:{width:3}},animationEasing:"linear"}});var GP=function(t,e,o,r){var s=t.getData(),l=r.type;if(!y(r)&&("min"===l||"max"===l||"average"===l||null!=r.xAxis||null!=r.yAxis)){var h,u;if(null!=r.yAxis||null!=r.xAxis)h=null!=r.yAxis?"y":"x",e.getAxis(h),u=T(r.yAxis,r.xAxis);else{var c=Zv(r,s,e,t);h=c.valueDataDim,c.valueAxis,u=Yv(s,h,l)}var d="x"===h?0:1,f=1-d,p=i(r),g={};p.type=null,p.coord=[],g.coord=[],p.coord[f]=-1/0,g.coord[f]=1/0;var m=o.get("precision");m>=0&&"number"==typeof u&&(u=+u.toFixed(Math.min(m,20))),p.coord[d]=g.coord[d]=u,r=[p,g,{type:l,valueIndex:r.valueIndex,value:u}]}return r=[Hv(t,r[0]),Hv(t,r[1]),a({},r[2])],r[2].type=r[2].type||"",n(r[2],r[0]),n(r[2],r[1]),r};VP.extend({type:"markLine",updateTransform:function(t,e,i){e.eachSeries(function(t){var e=t.markLineModel;if(e){var n=e.getData(),o=e.__from,a=e.__to;o.each(function(e){ty(o,e,!0,t,i),ty(a,e,!1,t,i)}),n.each(function(t){n.setItemLayout(t,[o.getItemLayout(t),a.getItemLayout(t)])}),this.markerGroupMap.get(t.id).updateLayout()}},this)},renderSeries:function(t,e,i,n){function o(e,i,o){var a=e.getItemModel(i);ty(e,i,o,t,n),e.setItemVisual(i,{symbolSize:a.get("symbolSize")||g[o?0:1],symbol:a.get("symbol",!0)||p[o?0:1],color:a.get("itemStyle.color")||s.getVisual("color")})}var a=t.coordinateSystem,r=t.id,s=t.getData(),l=this.markerGroupMap,h=l.get(r)||l.set(r,new Fc);this.group.add(h.group);var u=ey(a,t,e),c=u.from,d=u.to,f=u.line;e.__from=c,e.__to=d,e.setData(f);var p=e.get("symbol"),g=e.get("symbolSize");y(p)||(p=[p,p]),"number"==typeof g&&(g=[g,g]),u.from.each(function(t){o(c,t,!0),o(d,t,!1)}),f.each(function(t){var e=f.getItemModel(t).get("lineStyle.color");f.setItemVisual(t,{color:e||c.getItemVisual(t,"color")}),f.setItemLayout(t,[c.getItemLayout(t),d.getItemLayout(t)]),f.setItemVisual(t,{fromSymbolSize:c.getItemVisual(t,"symbolSize"),fromSymbol:c.getItemVisual(t,"symbol"),toSymbolSize:d.getItemVisual(t,"symbolSize"),toSymbol:d.getItemVisual(t,"symbol")})}),h.updateData(f),u.line.eachItemGraphicEl(function(t,i){t.traverse(function(t){t.dataModel=e})}),h.__keep=!0,h.group.silent=e.get("silent")||t.get("silent")}}),ss(function(t){t.markLine=t.markLine||{}}),EP.extend({type:"markArea",defaultOption:{zlevel:0,z:1,tooltip:{trigger:"item"},animation:!1,label:{show:!0,position:"top"},itemStyle:{borderWidth:0},emphasis:{label:{show:!0,position:"top"}}}});var WP=function(t,e,i,n){var a=Hv(t,n[0]),r=Hv(t,n[1]),s=T,l=a.coord,h=r.coord;l[0]=s(l[0],-1/0),l[1]=s(l[1],-1/0),h[0]=s(h[0],1/0),h[1]=s(h[1],1/0);var u=o([{},a,r]);return u.coord=[a.coord,r.coord],u.x0=a.x,u.y0=a.y,u.x1=r.x,u.y1=r.y,u},FP=[["x0","y0"],["x1","y0"],["x1","y1"],["x0","y1"]];VP.extend({type:"markArea",updateTransform:function(t,e,i){e.eachSeries(function(t){var e=t.markAreaModel;if(e){var n=e.getData();n.each(function(e){var o=f(FP,function(o){return ay(n,e,o,t,i)});n.setItemLayout(e,o),n.getItemGraphicEl(e).setShape("points",o)})}},this)},renderSeries:function(t,e,i,n){var o=t.coordinateSystem,a=t.name,s=t.getData(),l=this.markerGroupMap,h=l.get(a)||l.set(a,{group:new S_});this.group.add(h.group),h.__keep=!0;var u=ry(o,t,e);e.setData(u),u.each(function(e){u.setItemLayout(e,f(FP,function(i){return ay(u,e,i,t,n)})),u.setItemVisual(e,{color:s.getVisual("color")})}),u.diff(h.__data).add(function(t){var e=new Rb({shape:{points:u.getItemLayout(t)}});u.setItemGraphicEl(t,e),h.group.add(e)}).update(function(t,i){var n=h.__data.getItemGraphicEl(i);co(n,{shape:{points:u.getItemLayout(t)}},e,t),h.group.add(n),u.setItemGraphicEl(t,n)}).remove(function(t){var e=h.__data.getItemGraphicEl(t);h.group.remove(e)}).execute(),u.eachItemGraphicEl(function(t,i){var n=u.getItemModel(i),o=n.getModel("label"),a=n.getModel("emphasis.label"),s=u.getItemVisual(i,"color");t.useStyle(r(n.getModel("itemStyle").getItemStyle(),{fill:zt(s,.4),stroke:s})),t.hoverStyle=n.getModel("emphasis.itemStyle").getItemStyle(),eo(t.style,t.hoverStyle,o,a,{labelFetcher:e,labelDataIndex:i,defaultText:u.getName(i)||"",isRectText:!0,autoColor:s}),to(t,{}),t.dataModel=e}),h.__data=u,h.group.silent=e.get("silent")||t.get("silent")}}),ss(function(t){t.markArea=t.markArea||{}});IS.registerSubTypeDefaulter("timeline",function(){return"slider"}),hs({type:"timelineChange",event:"timelineChanged",update:"prepareAndUpdate"},function(t,e){var i=e.getComponent("timeline");return i&&null!=t.currentIndex&&(i.setCurrentIndex(t.currentIndex),!i.get("loop",!0)&&i.isIndexMax()&&i.setPlayState(!1)),e.resetOption("timeline"),r({currentIndex:i.option.currentIndex},t)}),hs({type:"timelinePlayChange",event:"timelinePlayChanged",update:"update"},function(t,e){var i=e.getComponent("timeline");i&&null!=t.playState&&i.setPlayState(t.playState)});var HP=IS.extend({type:"timeline",layoutMode:"box",defaultOption:{zlevel:0,z:4,show:!0,axisType:"time",realtime:!0,left:"20%",top:null,right:"20%",bottom:0,width:null,height:40,padding:5,controlPosition:"left",autoPlay:!1,rewind:!1,loop:!0,playInterval:2e3,currentIndex:0,itemStyle:{},label:{color:"#000"},data:[]},init:function(t,e,i){this._data,this._names,this.mergeDefaultAndTheme(t,i),this._initData()},mergeOption:function(t){HP.superApply(this,"mergeOption",arguments),this._initData()},setCurrentIndex:function(t){null==t&&(t=this.option.currentIndex);var e=this._data.count();this.option.loop?t=(t%e+e)%e:(t>=e&&(t=e-1),t<0&&(t=0)),this.option.currentIndex=t},getCurrentIndex:function(){return this.option.currentIndex},isIndexMax:function(){return this.getCurrentIndex()>=this._data.count()-1},setPlayState:function(t){this.option.autoPlay=!!t},getPlayState:function(){return!!this.option.autoPlay},_initData:function(){var t=this.option,e=t.data||[],n=t.axisType,o=this._names=[];if("category"===n){var a=[];d(e,function(t,e){var n,r=Ii(t);w(t)?(n=i(t)).value=e:n=e,a.push(n),_(r)||null!=r&&!isNaN(r)||(r=""),o.push(r+"")}),e=a}var r={category:"ordinal",time:"time"}[n]||"number";(this._data=new yI([{name:"value",type:r}],this)).initData(e,o)},getData:function(){return this._data},getCategories:function(){if("category"===this.get("axisType"))return this._names.slice()}});u(HP.extend({type:"timeline.slider",defaultOption:{backgroundColor:"rgba(0,0,0,0)",borderColor:"#ccc",borderWidth:0,orient:"horizontal",inverse:!1,tooltip:{trigger:"item"},symbol:"emptyCircle",symbolSize:10,lineStyle:{show:!0,width:2,color:"#304654"},label:{position:"auto",show:!0,interval:"auto",rotate:0,color:"#304654"},itemStyle:{color:"#304654",borderWidth:1},checkpointStyle:{symbol:"circle",symbolSize:13,color:"#c23531",borderWidth:5,borderColor:"rgba(194,53,49, 0.5)",animation:!0,animationDuration:300,animationEasing:"quinticInOut"},controlStyle:{show:!0,showPlayBtn:!0,showPrevBtn:!0,showNextBtn:!0,itemSize:22,itemGap:12,position:"left",playIcon:"path://M31.6,53C17.5,53,6,41.5,6,27.4S17.5,1.8,31.6,1.8C45.7,1.8,57.2,13.3,57.2,27.4S45.7,53,31.6,53z M31.6,3.3 C18.4,3.3,7.5,14.1,7.5,27.4c0,13.3,10.8,24.1,24.1,24.1C44.9,51.5,55.7,40.7,55.7,27.4C55.7,14.1,44.9,3.3,31.6,3.3z M24.9,21.3 c0-2.2,1.6-3.1,3.5-2l10.5,6.1c1.899,1.1,1.899,2.9,0,4l-10.5,6.1c-1.9,1.1-3.5,0.2-3.5-2V21.3z",stopIcon:"path://M30.9,53.2C16.8,53.2,5.3,41.7,5.3,27.6S16.8,2,30.9,2C45,2,56.4,13.5,56.4,27.6S45,53.2,30.9,53.2z M30.9,3.5C17.6,3.5,6.8,14.4,6.8,27.6c0,13.3,10.8,24.1,24.101,24.1C44.2,51.7,55,40.9,55,27.6C54.9,14.4,44.1,3.5,30.9,3.5z M36.9,35.8c0,0.601-0.4,1-0.9,1h-1.3c-0.5,0-0.9-0.399-0.9-1V19.5c0-0.6,0.4-1,0.9-1H36c0.5,0,0.9,0.4,0.9,1V35.8z M27.8,35.8 c0,0.601-0.4,1-0.9,1h-1.3c-0.5,0-0.9-0.399-0.9-1V19.5c0-0.6,0.4-1,0.9-1H27c0.5,0,0.9,0.4,0.9,1L27.8,35.8L27.8,35.8z",nextIcon:"path://M18.6,50.8l22.5-22.5c0.2-0.2,0.3-0.4,0.3-0.7c0-0.3-0.1-0.5-0.3-0.7L18.7,4.4c-0.1-0.1-0.2-0.3-0.2-0.5 c0-0.4,0.3-0.8,0.8-0.8c0.2,0,0.5,0.1,0.6,0.3l23.5,23.5l0,0c0.2,0.2,0.3,0.4,0.3,0.7c0,0.3-0.1,0.5-0.3,0.7l-0.1,0.1L19.7,52 c-0.1,0.1-0.3,0.2-0.5,0.2c-0.4,0-0.8-0.3-0.8-0.8C18.4,51.2,18.5,51,18.6,50.8z",prevIcon:"path://M43,52.8L20.4,30.3c-0.2-0.2-0.3-0.4-0.3-0.7c0-0.3,0.1-0.5,0.3-0.7L42.9,6.4c0.1-0.1,0.2-0.3,0.2-0.5 c0-0.4-0.3-0.8-0.8-0.8c-0.2,0-0.5,0.1-0.6,0.3L18.3,28.8l0,0c-0.2,0.2-0.3,0.4-0.3,0.7c0,0.3,0.1,0.5,0.3,0.7l0.1,0.1L41.9,54 c0.1,0.1,0.3,0.2,0.5,0.2c0.4,0,0.8-0.3,0.8-0.8C43.2,53.2,43.1,53,43,52.8z",color:"#304654",borderColor:"#304654",borderWidth:1},emphasis:{label:{show:!0,color:"#c23531"},itemStyle:{color:"#c23531"},controlStyle:{color:"#c23531",borderColor:"#c23531",borderWidth:2}},data:[]}}),sM);var ZP=cM.extend({type:"timeline"}),UP=function(t,e,i,n){nT.call(this,t,e,i),this.type=n||"value",this._autoLabelInterval,this.model=null};UP.prototype={constructor:UP,getLabelInterval:function(){var t=this.model,e=t.getModel("label"),i=e.get("interval");return null!=i&&"auto"!=i?i:((i=this._autoLabelInterval)||(i=this._autoLabelInterval=ll(f(this.scale.getTicks(),this.dataToCoord,this),hl(this,e.get("formatter")),e.getFont(),"horizontal"===t.get("orient")?0:90,e.get("rotate"))),i)},isLabelIgnored:function(t){if("category"===this.type){var e=this.getLabelInterval();return"function"==typeof e&&!e(t,this.scale.getLabel(t))||t%(e+1)}}},h(UP,nT);var jP=m,XP=d,YP=Math.PI;ZP.extend({type:"timeline.slider",init:function(t,e){this.api=e,this._axis,this._viewRect,this._timer,this._currentPointer,this._mainGroup,this._labelGroup},render:function(t,e,i,n){if(this.model=t,this.api=i,this.ecModel=e,this.group.removeAll(),t.get("show",!0)){var o=this._layout(t,i),a=this._createGroup("mainGroup"),r=this._createGroup("labelGroup"),s=this._axis=this._createAxis(o,t);t.formatTooltip=function(t){return Ho(s.scale.getLabel(t))},XP(["AxisLine","AxisTick","Control","CurrentPointer"],function(e){this["_render"+e](o,a,s,t)},this),this._renderAxisLabel(o,r,s,t),this._position(o,t)}this._doPlayStop()},remove:function(){this._clearTimer(),this.group.removeAll()},dispose:function(){this._clearTimer()},_layout:function(t,e){var i=t.get("label.position"),n=t.get("orient"),o=uy(t,e);null==i||"auto"===i?i="horizontal"===n?o.y+o.height/2<e.getHeight()/2?"-":"+":o.x+o.width/2<e.getWidth()/2?"+":"-":isNaN(i)&&(i={horizontal:{top:"-",bottom:"+"},vertical:{left:"-",right:"+"}}[n][i]);var a={horizontal:"center",vertical:i>=0||"+"===i?"left":"right"},r={horizontal:i>=0||"+"===i?"top":"bottom",vertical:"middle"},s={horizontal:0,vertical:YP/2},l="vertical"===n?o.height:o.width,h=t.getModel("controlStyle"),u=h.get("show",!0),c=u?h.get("itemSize"):0,d=u?h.get("itemGap"):0,f=c+d,p=t.get("label.rotate")||0;p=p*YP/180;var g,m,v,y,x=h.get("position",!0),_=u&&h.get("showPlayBtn",!0),w=u&&h.get("showPrevBtn",!0),b=u&&h.get("showNextBtn",!0),S=0,M=l;return"left"===x||"bottom"===x?(_&&(g=[0,0],S+=f),w&&(m=[S,0],S+=f),b&&(v=[M-c,0],M-=f)):(_&&(g=[M-c,0],M-=f),w&&(m=[0,0],S+=f),b&&(v=[M-c,0],M-=f)),y=[S,M],t.get("inverse")&&y.reverse(),{viewRect:o,mainLength:l,orient:n,rotation:s[n],labelRotation:p,labelPosOpt:i,labelAlign:t.get("label.align")||a[n],labelBaseline:t.get("label.verticalAlign")||t.get("label.baseline")||r[n],playPosition:g,prevBtnPosition:m,nextBtnPosition:v,axisExtent:y,controlSize:c,controlGap:d}},_position:function(t,e){function i(t){var e=t.position;t.origin=[c[0][0]-e[0],c[1][0]-e[1]]}function n(t){return[[t.x,t.x+t.width],[t.y,t.y+t.height]]}function o(t,e,i,n,o){t[n]+=i[n][o]-e[n][o]}var a=this._mainGroup,r=this._labelGroup,s=t.viewRect;if("vertical"===t.orient){var l=st(),h=s.x,u=s.y+s.height;ct(l,l,[-h,-u]),dt(l,l,-YP/2),ct(l,l,[h,u]),(s=s.clone()).applyTransform(l)}var c=n(s),d=n(a.getBoundingRect()),f=n(r.getBoundingRect()),p=a.position,g=r.position;g[0]=p[0]=c[0][0];var m=t.labelPosOpt;if(isNaN(m))o(p,d,c,1,v="+"===m?0:1),o(g,f,c,1,1-v);else{var v=m>=0?0:1;o(p,d,c,1,v),g[1]=p[1]+m}a.attr("position",p),r.attr("position",g),a.rotation=r.rotation=t.rotation,i(a),i(r)},_createAxis:function(t,e){var i=e.getData(),n=e.get("axisType"),o=sl(e,n),a=i.getDataExtent("value");o.setExtent(a[0],a[1]),this._customizeScale(o,i),o.niceTicks();var r=new UP("value",o,t.axisExtent,n);return r.model=e,r},_customizeScale:function(t,e){t.getTicks=function(){return e.mapArray(["value"],function(t){return t})},t.getTicksLabels=function(){return f(this.getTicks(),t.getLabel,t)}},_createGroup:function(t){var e=this["_"+t]=new S_;return this.group.add(e),e},_renderAxisLine:function(t,e,i,n){var o=i.getExtent();n.get("lineStyle.show")&&e.add(new Gb({shape:{x1:o[0],y1:0,x2:o[1],y2:0},style:a({lineCap:"round"},n.getModel("lineStyle").getLineStyle()),silent:!0,z2:1}))},_renderAxisTick:function(t,e,i,n){var o=n.getData(),a=i.scale.getTicks();XP(a,function(t,a){var r=i.dataToCoord(t),s=o.getItemModel(a),l=s.getModel("itemStyle"),h=s.getModel("emphasis.itemStyle"),u={position:[r,0],onclick:jP(this._changeTimeline,this,a)},c=dy(s,l,e,u);to(c,h.getItemStyle()),s.get("tooltip")?(c.dataIndex=a,c.dataModel=n):c.dataIndex=c.dataModel=null},this)},_renderAxisLabel:function(t,e,i,n){var o=n.getModel("label");if(o.get("show")){var a=n.getData(),r=i.scale.getTicks(),s=hl(i,o.get("formatter")),l=i.getLabelInterval();XP(r,function(n,o){if(!i.isLabelIgnored(o,l)){var r=a.getItemModel(o),h=r.getModel("label"),u=r.getModel("emphasis.label"),c=i.dataToCoord(n),d=new Cb({position:[c,0],rotation:t.labelRotation-t.rotation,onclick:jP(this._changeTimeline,this,o),silent:!1});io(d.style,h,{text:s[o],textAlign:t.labelAlign,textVerticalAlign:t.labelBaseline}),e.add(d),to(d,io({},u))}},this)}},_renderControl:function(t,e,i,n){function o(t,i,o,u){if(t){var c=cy(n,i,h,{position:t,origin:[a/2,0],rotation:u?-r:0,rectHover:!0,style:s,onclick:o});e.add(c),to(c,l)}}var a=t.controlSize,r=t.rotation,s=n.getModel("controlStyle").getItemStyle(),l=n.getModel("emphasis.controlStyle").getItemStyle(),h=[0,-a/2,a,a],u=n.getPlayState(),c=n.get("inverse",!0);o(t.nextBtnPosition,"controlStyle.nextIcon",jP(this._changeTimeline,this,c?"-":"+")),o(t.prevBtnPosition,"controlStyle.prevIcon",jP(this._changeTimeline,this,c?"+":"-")),o(t.playPosition,"controlStyle."+(u?"stopIcon":"playIcon"),jP(this._handlePlayClick,this,!u),!0)},_renderCurrentPointer:function(t,e,i,n){var o=n.getData(),a=n.getCurrentIndex(),r=o.getItemModel(a).getModel("checkpointStyle"),s=this,l={onCreate:function(t){t.draggable=!0,t.drift=jP(s._handlePointerDrag,s),t.ondragend=jP(s._handlePointerDragend,s),fy(t,a,i,n,!0)},onUpdate:function(t){fy(t,a,i,n)}};this._currentPointer=dy(r,r,this._mainGroup,{},this._currentPointer,l)},_handlePlayClick:function(t){this._clearTimer(),this.api.dispatchAction({type:"timelinePlayChange",playState:t,from:this.uid})},_handlePointerDrag:function(t,e,i){this._clearTimer(),this._pointerChangeTimeline([i.offsetX,i.offsetY])},_handlePointerDragend:function(t){this._pointerChangeTimeline([t.offsetX,t.offsetY],!0)},_pointerChangeTimeline:function(t,e){var i=this._toAxisCoord(t)[0],n=Do(this._axis.getExtent().slice());i>n[1]&&(i=n[1]),i<n[0]&&(i=n[0]),this._currentPointer.position[0]=i,this._currentPointer.dirty();var o=this._findNearestTick(i),a=this.model;(e||o!==a.getCurrentIndex()&&a.get("realtime"))&&this._changeTimeline(o)},_doPlayStop:function(){this._clearTimer(),this.model.getPlayState()&&(this._timer=setTimeout(jP(function(){var t=this.model;this._changeTimeline(t.getCurrentIndex()+(t.get("rewind",!0)?-1:1))},this),this.model.get("playInterval")))},_toAxisCoord:function(t){return go(t,this._mainGroup.getLocalTransform(),!0)},_findNearestTick:function(t){var e,i=this.model.getData(),n=1/0,o=this._axis;return i.each(["value"],function(i,a){var r=o.dataToCoord(i),s=Math.abs(r-t);s<n&&(n=s,e=a)}),e},_clearTimer:function(){this._timer&&(clearTimeout(this._timer),this._timer=null)},_changeTimeline:function(t){var e=this.model.getCurrentIndex();"+"===t?t=e+1:"-"===t&&(t=e-1),this.api.dispatchAction({type:"timelineChange",currentIndex:t,from:this.uid})}}),ss(function(t){var e=t&&t.timeline;y(e)||(e=e?[e]:[]),d(e,function(t){t&&sy(t)})});var qP=gs({type:"toolbox",layoutMode:{type:"box",ignoreSize:!0},mergeDefaultAndTheme:function(t){qP.superApply(this,"mergeDefaultAndTheme",arguments),d(this.option.feature,function(t,e){var i=Qm(e);i&&n(t,i.defaultOption)})},defaultOption:{show:!0,z:6,zlevel:0,orient:"horizontal",left:"right",top:"top",backgroundColor:"transparent",borderColor:"#ccc",borderRadius:0,borderWidth:0,padding:5,itemSize:15,itemGap:8,showTitle:!0,iconStyle:{borderColor:"#666",color:"none"},emphasis:{iconStyle:{borderColor:"#3E98C5"}}}});ms({type:"toolbox",render:function(t,e,i,n){function o(o,r){var s,c=u[o],d=u[r],f=new _o(l[c],t,t.ecModel);if(c&&!d){if(py(c))s={model:f,onclick:f.option.onclick,featureName:c};else{var p=Qm(c);if(!p)return;s=new p(f,e,i)}h[c]=s}else{if(!(s=h[d]))return;s.model=f,s.ecModel=e,s.api=i}c||!d?f.get("show")&&!s.unusable?(a(f,s,c),f.setIconStatus=function(t,e){var i=this.option,n=this.iconPaths;i.iconStatus=i.iconStatus||{},i.iconStatus[t]=e,n[t]&&n[t].trigger(e)},s.render&&s.render(f,e,i,n)):s.remove&&s.remove(e,i):s.dispose&&s.dispose(e,i)}function a(n,o,a){var l=n.getModel("iconStyle"),h=n.getModel("emphasis.iconStyle"),u=o.getIcons?o.getIcons():n.get("icon"),c=n.get("title")||{};if("string"==typeof u){var f=u,p=c;c={},(u={})[a]=f,c[a]=p}var g=n.iconPaths={};d(u,function(a,u){var d=xo(a,{},{x:-s/2,y:-s/2,width:s,height:s});d.setStyle(l.getItemStyle()),d.hoverStyle=h.getItemStyle(),to(d),t.get("showTitle")&&(d.__title=c[u],d.on("mouseover",function(){var t=h.getItemStyle();d.setStyle({text:c[u],textPosition:t.textPosition||"bottom",textFill:t.fill||t.stroke||"#000",textAlign:t.textAlign||"center"})}).on("mouseout",function(){d.setStyle({textFill:null})})),d.trigger(n.get("iconStatus."+u)||"normal"),r.add(d),d.on("click",m(o.onclick,o,e,i,u)),g[u]=d})}var r=this.group;if(r.removeAll(),t.get("show")){var s=+t.get("itemSize"),l=t.get("feature")||{},h=this._features||(this._features={}),u=[];d(l,function(t,e){u.push(e)}),new ws(this._featureNames||[],u).add(o).update(o).remove(v(o,null)).execute(),this._featureNames=u,Xg(r,t,i),r.add(Yg(r.getBoundingRect(),t)),r.eachChild(function(t){var e=t.__title,n=t.hoverStyle;if(n&&e){var o=me(e,ke(n)),a=t.position[0]+r.position[0],l=!1;t.position[1]+r.position[1]+s+o.height>i.getHeight()&&(n.textPosition="top",l=!0);var h=l?-5-o.height:s+8;a+o.width/2>i.getWidth()?(n.textPosition=["100%",h],n.textAlign="right"):a-o.width/2<0&&(n.textPosition=[0,h],n.textAlign="left")}})}},updateView:function(t,e,i,n){d(this._features,function(t){t.updateView&&t.updateView(t.model,e,i,n)})},remove:function(t,e){d(this._features,function(i){i.remove&&i.remove(t,e)}),this.group.removeAll()},dispose:function(t,e){d(this._features,function(i){i.dispose&&i.dispose(t,e)})}});var $P=wM.toolbox.saveAsImage;gy.defaultOption={show:!0,icon:"M4.7,22.9L29.3,45.5L54.7,23.4M4.6,43.6L4.6,58L53.8,58L53.8,43.6M29.2,45.1L29.2,0",title:$P.title,type:"png",name:"",excludeComponents:["toolbox"],pixelRatio:1,lang:$P.lang.slice()},gy.prototype.unusable=!_x.canvasSupported,gy.prototype.onclick=function(t,e){var i=this.model,n=i.get("name")||t.get("title.0.text")||"echarts",o=document.createElement("a"),a=i.get("type",!0)||"png";o.download=n+"."+a,o.target="_blank";var r=e.getConnectedDataURL({type:a,backgroundColor:i.get("backgroundColor",!0)||t.get("backgroundColor")||"#fff",excludeComponents:i.get("excludeComponents"),pixelRatio:i.get("pixelRatio")});if(o.href=r,"function"!=typeof MouseEvent||_x.browser.ie||_x.browser.edge)if(window.navigator.msSaveOrOpenBlob){for(var s=atob(r.split(",")[1]),l=s.length,h=new Uint8Array(l);l--;)h[l]=s.charCodeAt(l);var u=new Blob([h]);window.navigator.msSaveOrOpenBlob(u,n+"."+a)}else{var c=i.get("lang"),d='<body style="margin:0;"><img src="'+r+'" style="max-width:100%;" title="'+(c&&c[0]||"")+'" /></body>';window.open().document.write(d)}else{var f=new MouseEvent("click",{view:window,bubbles:!0,cancelable:!1});o.dispatchEvent(f)}},Jm("saveAsImage",gy);var KP=wM.toolbox.magicType;my.defaultOption={show:!0,type:[],icon:{line:"M4.1,28.9h7.1l9.3-22l7.4,38l9.7-19.7l3,12.8h14.9M4.1,58h51.4",bar:"M6.7,22.9h10V48h-10V22.9zM24.9,13h10v35h-10V13zM43.2,2h10v46h-10V2zM3.1,58h53.7",stack:"M8.2,38.4l-8.4,4.1l30.6,15.3L60,42.5l-8.1-4.1l-21.5,11L8.2,38.4z M51.9,30l-8.1,4.2l-13.4,6.9l-13.9-6.9L8.2,30l-8.4,4.2l8.4,4.2l22.2,11l21.5-11l8.1-4.2L51.9,30z M51.9,21.7l-8.1,4.2L35.7,30l-5.3,2.8L24.9,30l-8.4-4.1l-8.3-4.2l-8.4,4.2L8.2,30l8.3,4.2l13.9,6.9l13.4-6.9l8.1-4.2l8.1-4.1L51.9,21.7zM30.4,2.2L-0.2,17.5l8.4,4.1l8.3,4.2l8.4,4.2l5.5,2.7l5.3-2.7l8.1-4.2l8.1-4.2l8.1-4.1L30.4,2.2z",tiled:"M2.3,2.2h22.8V25H2.3V2.2z M35,2.2h22.8V25H35V2.2zM2.3,35h22.8v22.8H2.3V35z M35,35h22.8v22.8H35V35z"},title:i(KP.title),option:{},seriesIndex:{}};var JP=my.prototype;JP.getIcons=function(){var t=this.model,e=t.get("icon"),i={};return d(t.get("type"),function(t){e[t]&&(i[t]=e[t])}),i};var QP={line:function(t,e,i,o){if("bar"===t)return n({id:e,type:"line",data:i.get("data"),stack:i.get("stack"),markPoint:i.get("markPoint"),markLine:i.get("markLine")},o.get("option.line")||{},!0)},bar:function(t,e,i,o){if("line"===t)return n({id:e,type:"bar",data:i.get("data"),stack:i.get("stack"),markPoint:i.get("markPoint"),markLine:i.get("markLine")},o.get("option.bar")||{},!0)},stack:function(t,e,i,o){if("line"===t||"bar"===t)return n({id:e,stack:"__ec_magicType_stack__"},o.get("option.stack")||{},!0)},tiled:function(t,e,i,o){if("line"===t||"bar"===t)return n({id:e,stack:""},o.get("option.tiled")||{},!0)}},tO=[["line","bar"],["stack","tiled"]];JP.onclick=function(t,e,i){var n=this.model,o=n.get("seriesIndex."+i);if(QP[i]){var a={series:[]};d(tO,function(t){l(t,i)>=0&&d(t,function(t){n.setIconStatus(t,"normal")})}),n.setIconStatus(i,"emphasis"),t.eachComponent({mainType:"series",query:null==o?null:{seriesIndex:o}},function(e){var o=e.subType,s=e.id,l=QP[i](o,s,e,n);l&&(r(l,e.option),a.series.push(l));var h=e.coordinateSystem;if(h&&"cartesian2d"===h.type&&("line"===i||"bar"===i)){var u=h.getAxesByScale("ordinal")[0];if(u){var c=u.dim+"Axis",d=t.queryComponents({mainType:c,index:e.get(name+"Index"),id:e.get(name+"Id")})[0].componentIndex;a[c]=a[c]||[];for(var f=0;f<=d;f++)a[c][d]=a[c][d]||{};a[c][d].boundaryGap="bar"===i}}}),e.dispatchAction({type:"changeMagicType",currentType:i,newOption:a})}},hs({type:"changeMagicType",event:"magicTypeChanged",update:"prepareAndUpdate"},function(t,e){e.mergeOption(t.newOption)}),Jm("magicType",my);var eO=wM.toolbox.dataView,iO=new Array(60).join("-"),nO="\t",oO=new RegExp("["+nO+"]+","g");Ty.defaultOption={show:!0,readOnly:!1,optionToContent:null,contentToOption:null,icon:"M17.5,17.3H33 M17.5,17.3H33 M45.4,29.5h-28 M11.5,2v56H51V14.8L38.4,2H11.5z M38.4,2.2v12.7H51 M45.4,41.7h-28",title:i(eO.title),lang:i(eO.lang),backgroundColor:"#fff",textColor:"#000",textareaColor:"#fff",textareaBorderColor:"#333",buttonColor:"#c23531",buttonTextColor:"#fff"},Ty.prototype.onclick=function(t,e){function i(){n.removeChild(a),x._dom=null}var n=e.getDom(),o=this.model;this._dom&&n.removeChild(this._dom);var a=document.createElement("div");a.style.cssText="position:absolute;left:5px;top:5px;bottom:5px;right:5px;",a.style.backgroundColor=o.get("backgroundColor")||"#fff";var r=document.createElement("h4"),s=o.get("lang")||[];r.innerHTML=s[0]||o.get("title"),r.style.cssText="margin: 10px 20px;",r.style.color=o.get("textColor");var l=document.createElement("div"),h=document.createElement("textarea");l.style.cssText="display:block;width:100%;overflow:auto;";var u=o.get("optionToContent"),c=o.get("contentToOption"),d=_y(t);if("function"==typeof u){var f=u(e.getOption());"string"==typeof f?l.innerHTML=f:M(f)&&l.appendChild(f)}else l.appendChild(h),h.readOnly=o.get("readOnly"),h.style.cssText="width:100%;height:100%;font-family:monospace;font-size:14px;line-height:1.6rem;",h.style.color=o.get("textColor"),h.style.borderColor=o.get("textareaBorderColor"),h.style.backgroundColor=o.get("textareaColor"),h.value=d.value;var p=d.meta,g=document.createElement("div");g.style.cssText="position:absolute;bottom:0;left:0;right:0;";var m="float:right;margin-right:20px;border:none;cursor:pointer;padding:2px 5px;font-size:12px;border-radius:3px",v=document.createElement("div"),y=document.createElement("div");m+=";background-color:"+o.get("buttonColor"),m+=";color:"+o.get("buttonTextColor");var x=this;hi(v,"click",i),hi(y,"click",function(){var t;try{t="function"==typeof c?c(l,e.getOption()):Iy(h.value,p)}catch(t){throw i(),new Error("Data view format error "+t)}t&&e.dispatchAction({type:"changeDataView",newOption:t}),i()}),v.innerHTML=s[1],y.innerHTML=s[2],y.style.cssText=m,v.style.cssText=m,!o.get("readOnly")&&g.appendChild(y),g.appendChild(v),hi(h,"keydown",function(t){if(9===(t.keyCode||t.which)){var e=this.value,i=this.selectionStart,n=this.selectionEnd;this.value=e.substring(0,i)+nO+e.substring(n),this.selectionStart=this.selectionEnd=i+1,Q_(t)}}),a.appendChild(r),a.appendChild(l),a.appendChild(g),l.style.height=n.clientHeight-80+"px",n.appendChild(a),this._dom=a},Ty.prototype.remove=function(t,e){this._dom&&e.getDom().removeChild(this._dom)},Ty.prototype.dispose=function(t,e){this.remove(t,e)},Jm("dataView",Ty),hs({type:"changeDataView",event:"dataViewChanged",update:"prepareAndUpdate"},function(t,e){var i=[];d(t.newOption.series,function(t){var n=e.getSeriesByName(t.name)[0];if(n){var o=n.get("data");i.push({name:t.name,data:Ay(t.data,o)})}else i.push(a({type:"scatter"},t))}),e.mergeOption(r({series:i},t.newOption))});var aO=d,rO="\0_ec_hist_store";jk.extend({type:"dataZoom.select"}),Xk.extend({type:"dataZoom.select"});var sO=wM.toolbox.dataZoom,lO=d,hO="\0_ec_\0toolbox-dataZoom_";Oy.defaultOption={show:!0,icon:{zoom:"M0,13.5h26.9 M13.5,26.9V0 M32.1,13.5H58V58H13.5 V32.1",back:"M22,1.4L9.9,13.5l12.3,12.3 M10.3,13.5H54.9v44.6 H10.3v-26"},title:i(sO.title)};var uO=Oy.prototype;uO.render=function(t,e,i,n){this.model=t,this.ecModel=e,this.api=i,zy(t,e,this,n,i),Ey(t,e)},uO.onclick=function(t,e,i){cO[i].call(this)},uO.remove=function(t,e){this._brushController.unmount()},uO.dispose=function(t,e){this._brushController.dispose()};var cO={zoom:function(){var t=!this._isZoomActive;this.api.dispatchAction({type:"takeGlobalCursor",key:"dataZoomSelect",dataZoomSelectActive:t})},back:function(){this._dispatchZoomAction(Cy(this.ecModel))}};uO._onBrush=function(t,e){function i(t,e,i){var r=e.getAxis(t),s=r.model,l=n(t,s,a),h=l.findRepresentativeAxisProxy(s).getMinMaxSpan();null==h.minValueSpan&&null==h.maxValueSpan||(i=jD(0,i.slice(),r.scale.getExtent(),0,h.minValueSpan,h.maxValueSpan)),l&&(o[l.id]={dataZoomId:l.id,startValue:i[0],endValue:i[1]})}function n(t,e,i){var n;return i.eachComponent({mainType:"dataZoom",subType:"select"},function(i){i.getAxisModel(t,e.componentIndex)&&(n=i)}),n}if(e.isEnd&&t.length){var o={},a=this.ecModel;this._brushController.updateCovers([]),new zm(Ny(this.model.option),a,{include:["grid"]}).matchOutputRanges(t,a,function(t,e,n){if("cartesian2d"===n.type){var o=t.brushType;"rect"===o?(i("x",n,e[0]),i("y",n,e[1])):i({lineX:"x",lineY:"y"}[o],n,e)}}),Dy(a,o),this._dispatchZoomAction(o)}},uO._dispatchZoomAction=function(t){var e=[];lO(t,function(t,n){e.push(i(t))}),e.length&&this.api.dispatchAction({type:"dataZoom",from:this.uid,batch:e})},Jm("dataZoom",Oy),ss(function(t){function e(t,e){if(e){var o=t+"Index",a=e[o];null==a||"all"==a||y(a)||(a=!1===a||"none"===a?[]:[a]),i(t,function(e,i){if(null==a||"all"==a||-1!==l(a,i)){var r={type:"select",$fromToolbox:!0,id:hO+t+i};r[o]=i,n.push(r)}})}}function i(e,i){var n=t[e];y(n)||(n=n?[n]:[]),lO(n,i)}if(t){var n=t.dataZoom||(t.dataZoom=[]);y(n)||(t.dataZoom=n=[n]);var o=t.toolbox;if(o&&(y(o)&&(o=o[0]),o&&o.feature)){var a=o.feature.dataZoom;e("xAxis",a),e("yAxis",a)}}});var dO=wM.toolbox.restore;Ry.defaultOption={show:!0,icon:"M3.8,33.4 M47,18.9h9.8V8.7 M56.3,20.1 C52.1,9,40.5,0.6,26.8,2.1C12.6,3.7,1.6,16.2,2.1,30.6 M13,41.1H3.1v10.2 M3.7,39.9c4.2,11.1,15.8,19.5,29.5,18 c14.2-1.6,25.2-14.1,24.7-28.5",title:dO.title},Ry.prototype.onclick=function(t,e,i){Ly(t),e.dispatchAction({type:"restore",from:this.uid})},Jm("restore",Ry),hs({type:"restore",event:"restore",update:"prepareAndUpdate"},function(t,e){e.resetOption("recreate")});var fO,pO="urn:schemas-microsoft-com:vml",gO="undefined"==typeof window?null:window,mO=!1,vO=gO&&gO.document;if(vO&&!_x.canvasSupported)try{!vO.namespaces.zrvml&&vO.namespaces.add("zrvml",pO),fO=function(t){return vO.createElement("<zrvml:"+t+' class="zrvml">')}}catch(t){fO=function(t){return vO.createElement("<"+t+' xmlns="'+pO+'" class="zrvml">')}}var yO=ab.CMD,xO=Math.round,_O=Math.sqrt,wO=Math.abs,bO=Math.cos,SO=Math.sin,MO=Math.max;if(!_x.canvasSupported){var IO=21600,TO=IO/2,AO=function(t){t.style.cssText="position:absolute;left:0;top:0;width:1px;height:1px;",t.coordsize=IO+","+IO,t.coordorigin="0,0"},DO=function(t){return String(t).replace(/&/g,"&").replace(/"/g,""")},CO=function(t,e,i){return"rgb("+[t,e,i].join(",")+")"},LO=function(t,e){e&&t&&e.parentNode!==t&&t.appendChild(e)},kO=function(t,e){e&&t&&e.parentNode===t&&t.removeChild(e)},PO=function(t,e,i){return 1e5*(parseFloat(t)||0)+1e3*(parseFloat(e)||0)+i},OO=function(t,e){return"string"==typeof t?t.lastIndexOf("%")>=0?parseFloat(t)/100*e:parseFloat(t):t},NO=function(t,e,i){var n=Dt(e);i=+i,isNaN(i)&&(i=1),n&&(t.color=CO(n[0],n[1],n[2]),t.opacity=i*n[3])},EO=function(t){var e=Dt(t);return[CO(e[0],e[1],e[2]),e[3]]},zO=function(t,e,i){var n=e.fill;if(null!=n)if(n instanceof Ub){var o,a=0,r=[0,0],s=0,l=1,h=i.getBoundingRect(),u=h.width,c=h.height;if("linear"===n.type){o="gradient";var d=i.transform,f=[n.x*u,n.y*c],p=[n.x2*u,n.y2*c];d&&(Q(f,f,d),Q(p,p,d));var g=p[0]-f[0],m=p[1]-f[1];(a=180*Math.atan2(g,m)/Math.PI)<0&&(a+=360),a<1e-6&&(a=0)}else{o="gradientradial";var f=[n.x*u,n.y*c],d=i.transform,v=i.scale,y=u,x=c;r=[(f[0]-h.x)/y,(f[1]-h.y)/x],d&&Q(f,f,d),y/=v[0]*IO,x/=v[1]*IO;var _=MO(y,x);s=0/_,l=2*n.r/_-s}var w=n.colorStops.slice();w.sort(function(t,e){return t.offset-e.offset});for(var b=w.length,S=[],M=[],I=0;I<b;I++){var T=w[I],A=EO(T.color);M.push(T.offset*l+s+" "+A[0]),0!==I&&I!==b-1||S.push(A)}if(b>=2){var D=S[0][0],C=S[1][0],L=S[0][1]*e.opacity,k=S[1][1]*e.opacity;t.type=o,t.method="none",t.focus="100%",t.angle=a,t.color=D,t.color2=C,t.colors=M.join(","),t.opacity=k,t.opacity2=L}"radial"===o&&(t.focusposition=r.join(","))}else NO(t,n,e.opacity)},RO=function(t,e){null!=e.lineDash&&(t.dashstyle=e.lineDash.join(" ")),null==e.stroke||e.stroke instanceof Ub||NO(t,e.stroke,e.opacity)},BO=function(t,e,i,n){var o="fill"==e,a=t.getElementsByTagName(e)[0];null!=i[e]&&"none"!==i[e]&&(o||!o&&i.lineWidth)?(t[o?"filled":"stroked"]="true",i[e]instanceof Ub&&kO(t,a),a||(a=By(e)),o?zO(a,i,n):RO(a,i),LO(t,a)):(t[o?"filled":"stroked"]="false",kO(t,a))},VO=[[],[],[]],GO=function(t,e){var i,n,o,a,r,s,l=yO.M,h=yO.C,u=yO.L,c=yO.A,d=yO.Q,f=[],p=t.data,g=t.len();for(a=0;a<g;){switch(o=p[a++],n="",i=0,o){case l:n=" m ",i=1,r=p[a++],s=p[a++],VO[0][0]=r,VO[0][1]=s;break;case u:n=" l ",i=1,r=p[a++],s=p[a++],VO[0][0]=r,VO[0][1]=s;break;case d:case h:n=" c ",i=3;var m,v,y=p[a++],x=p[a++],_=p[a++],w=p[a++];o===d?(m=_,v=w,_=(_+2*y)/3,w=(w+2*x)/3,y=(r+2*y)/3,x=(s+2*x)/3):(m=p[a++],v=p[a++]),VO[0][0]=y,VO[0][1]=x,VO[1][0]=_,VO[1][1]=w,VO[2][0]=m,VO[2][1]=v,r=m,s=v;break;case c:var b=0,S=0,M=1,I=1,T=0;e&&(b=e[4],S=e[5],M=_O(e[0]*e[0]+e[1]*e[1]),I=_O(e[2]*e[2]+e[3]*e[3]),T=Math.atan2(-e[1]/I,e[0]/M));var A=p[a++],D=p[a++],C=p[a++],L=p[a++],k=p[a++]+T,P=p[a++]+k+T;a++;var O=p[a++],N=A+bO(k)*C,E=D+SO(k)*L,y=A+bO(P)*C,x=D+SO(P)*L,z=O?" wa ":" at ";Math.abs(N-y)<1e-4&&(Math.abs(P-k)>.01?O&&(N+=.0125):Math.abs(E-D)<1e-4?O&&N<A||!O&&N>A?x-=.0125:x+=.0125:O&&E<D||!O&&E>D?y+=.0125:y-=.0125),f.push(z,xO(((A-C)*M+b)*IO-TO),",",xO(((D-L)*I+S)*IO-TO),",",xO(((A+C)*M+b)*IO-TO),",",xO(((D+L)*I+S)*IO-TO),",",xO((N*M+b)*IO-TO),",",xO((E*I+S)*IO-TO),",",xO((y*M+b)*IO-TO),",",xO((x*I+S)*IO-TO)),r=y,s=x;break;case yO.R:var R=VO[0],B=VO[1];R[0]=p[a++],R[1]=p[a++],B[0]=R[0]+p[a++],B[1]=R[1]+p[a++],e&&(Q(R,R,e),Q(B,B,e)),R[0]=xO(R[0]*IO-TO),B[0]=xO(B[0]*IO-TO),R[1]=xO(R[1]*IO-TO),B[1]=xO(B[1]*IO-TO),f.push(" m ",R[0],",",R[1]," l ",B[0],",",R[1]," l ",B[0],",",B[1]," l ",R[0],",",B[1]);break;case yO.Z:f.push(" x ")}if(i>0){f.push(n);for(var V=0;V<i;V++){var G=VO[V];e&&Q(G,G,e),f.push(xO(G[0]*IO-TO),",",xO(G[1]*IO-TO),V<i-1?",":"")}}}return f.join("")};Mn.prototype.brushVML=function(t){var e=this.style,i=this._vmlEl;i||(i=By("shape"),AO(i),this._vmlEl=i),BO(i,"fill",e,this),BO(i,"stroke",e,this);var n=this.transform,o=null!=n,a=i.getElementsByTagName("stroke")[0];if(a){var r=e.lineWidth;if(o&&!e.strokeNoScale){var s=n[0]*n[3]-n[1]*n[2];r*=_O(wO(s))}a.weight=r+"px"}var l=this.path||(this.path=new ab);this.__dirtyPath&&(l.beginPath(),this.buildPath(l,this.shape),l.toStatic(),this.__dirtyPath=!1),i.path=GO(l,this.transform),i.style.zIndex=PO(this.zlevel,this.z,this.z2),LO(t,i),null!=e.text?this.drawRectText(t,this.getBoundingRect()):this.removeRectText(t)},Mn.prototype.onRemove=function(t){kO(t,this._vmlEl),this.removeRectText(t)},Mn.prototype.onAdd=function(t){LO(t,this._vmlEl),this.appendRectText(t)};var WO=function(t){return"object"==typeof t&&t.tagName&&"IMG"===t.tagName.toUpperCase()};Je.prototype.brushVML=function(t){var e,i,n=this.style,o=n.image;if(WO(o)){var a=o.src;if(a===this._imageSrc)e=this._imageWidth,i=this._imageHeight;else{var r=o.runtimeStyle,s=r.width,l=r.height;r.width="auto",r.height="auto",e=o.width,i=o.height,r.width=s,r.height=l,this._imageSrc=a,this._imageWidth=e,this._imageHeight=i}o=a}else o===this._imageSrc&&(e=this._imageWidth,i=this._imageHeight);if(o){var h=n.x||0,u=n.y||0,c=n.width,d=n.height,f=n.sWidth,p=n.sHeight,g=n.sx||0,m=n.sy||0,v=f&&p,y=this._vmlEl;y||(y=vO.createElement("div"),AO(y),this._vmlEl=y);var x,_=y.style,w=!1,b=1,S=1;if(this.transform&&(x=this.transform,b=_O(x[0]*x[0]+x[1]*x[1]),S=_O(x[2]*x[2]+x[3]*x[3]),w=x[1]||x[2]),w){var M=[h,u],I=[h+c,u],T=[h,u+d],A=[h+c,u+d];Q(M,M,x),Q(I,I,x),Q(T,T,x),Q(A,A,x);var D=MO(M[0],I[0],T[0],A[0]),C=MO(M[1],I[1],T[1],A[1]),L=[];L.push("M11=",x[0]/b,",","M12=",x[2]/S,",","M21=",x[1]/b,",","M22=",x[3]/S,",","Dx=",xO(h*b+x[4]),",","Dy=",xO(u*S+x[5])),_.padding="0 "+xO(D)+"px "+xO(C)+"px 0",_.filter="progid:DXImageTransform.Microsoft.Matrix("+L.join("")+", SizingMethod=clip)"}else x&&(h=h*b+x[4],u=u*S+x[5]),_.filter="",_.left=xO(h)+"px",_.top=xO(u)+"px";var k=this._imageEl,P=this._cropEl;k||(k=vO.createElement("div"),this._imageEl=k);var O=k.style;if(v){if(e&&i)O.width=xO(b*e*c/f)+"px",O.height=xO(S*i*d/p)+"px";else{var N=new Image,E=this;N.onload=function(){N.onload=null,e=N.width,i=N.height,O.width=xO(b*e*c/f)+"px",O.height=xO(S*i*d/p)+"px",E._imageWidth=e,E._imageHeight=i,E._imageSrc=o},N.src=o}P||((P=vO.createElement("div")).style.overflow="hidden",this._cropEl=P);var z=P.style;z.width=xO((c+g*c/f)*b),z.height=xO((d+m*d/p)*S),z.filter="progid:DXImageTransform.Microsoft.Matrix(Dx="+-g*c/f*b+",Dy="+-m*d/p*S+")",P.parentNode||y.appendChild(P),k.parentNode!=P&&P.appendChild(k)}else O.width=xO(b*c)+"px",O.height=xO(S*d)+"px",y.appendChild(k),P&&P.parentNode&&(y.removeChild(P),this._cropEl=null);var R="",B=n.opacity;B<1&&(R+=".Alpha(opacity="+xO(100*B)+") "),R+="progid:DXImageTransform.Microsoft.AlphaImageLoader(src="+o+", SizingMethod=scale)",O.filter=R,y.style.zIndex=PO(this.zlevel,this.z,this.z2),LO(t,y),null!=n.text&&this.drawRectText(t,this.getBoundingRect())}},Je.prototype.onRemove=function(t){kO(t,this._vmlEl),this._vmlEl=null,this._cropEl=null,this._imageEl=null,this.removeRectText(t)},Je.prototype.onAdd=function(t){LO(t,this._vmlEl),this.appendRectText(t)};var FO,HO={},ZO=0,UO=document.createElement("div"),jO=function(t){var e=HO[t];if(!e){ZO>100&&(ZO=0,HO={});var i,n=UO.style;try{n.font=t,i=n.fontFamily.split(",")[0]}catch(t){}e={style:n.fontStyle||"normal",variant:n.fontVariant||"normal",weight:n.fontWeight||"normal",size:0|parseFloat(n.fontSize||12),family:i||"Microsoft YaHei"},HO[t]=e,ZO++}return e};!function(t,e){H_[t]=e}("measureText",function(t,e){var i=vO;FO||((FO=i.createElement("div")).style.cssText="position:absolute;top:-20000px;left:0;padding:0;margin:0;border:none;white-space:pre;",vO.body.appendChild(FO));try{FO.style.font=e}catch(t){}return FO.innerHTML="",FO.appendChild(i.createTextNode(t)),{width:FO.offsetWidth}});for(var XO=new Kt,YO=[X_,Ke,Je,Mn,Cb],qO=0;qO<YO.length;qO++){var $O=YO[qO].prototype;$O.drawRectText=function(t,e,i,n){var o=this.style;this.__dirty&&Oe(o);var a=o.text;if(null!=a&&(a+=""),a){if(o.rich){var r=Ce(a,o);a=[];for(var s=0;s<r.lines.length;s++){for(var l=r.lines[s].tokens,h=[],u=0;u<l.length;u++)h.push(l[u].text);a.push(h.join(""))}a=a.join("\n")}var c,d,f=o.textAlign,p=o.textVerticalAlign,g=jO(o.font),m=g.style+" "+g.variant+" "+g.weight+" "+g.size+'px "'+g.family+'"';i=i||me(a,m,f,p);var v=this.transform;if(v&&!n&&(XO.copy(e),XO.applyTransform(v),e=XO),n)c=e.x,d=e.y;else{var y=o.textPosition,x=o.textDistance;if(y instanceof Array)c=e.x+OO(y[0],e.width),d=e.y+OO(y[1],e.height),f=f||"left";else{var _=we(y,e,x);c=_.x,d=_.y,f=f||_.textAlign,p=p||_.textVerticalAlign}}c=xe(c,i.width,f),d=_e(d,i.height,p),d+=i.height/2;var w,b,S,M=By,I=this._textVmlEl;I?b=(w=(S=I.firstChild).nextSibling).nextSibling:(I=M("line"),w=M("path"),b=M("textpath"),S=M("skew"),b.style["v-text-align"]="left",AO(I),w.textpathok=!0,b.on=!0,I.from="0 0",I.to="1000 0.05",LO(I,S),LO(I,w),LO(I,b),this._textVmlEl=I);var T=[c,d],A=I.style;v&&n?(Q(T,T,v),S.on=!0,S.matrix=v[0].toFixed(3)+","+v[2].toFixed(3)+","+v[1].toFixed(3)+","+v[3].toFixed(3)+",0,0",S.offset=(xO(T[0])||0)+","+(xO(T[1])||0),S.origin="0 0",A.left="0px",A.top="0px"):(S.on=!1,A.left=xO(c)+"px",A.top=xO(d)+"px"),b.string=DO(a);try{b.style.font=m}catch(t){}BO(I,"fill",{fill:o.textFill,opacity:o.opacity},this),BO(I,"stroke",{stroke:o.textStroke,opacity:o.opacity,lineDash:o.lineDash},this),I.style.zIndex=PO(this.zlevel,this.z,this.z2),LO(t,I)}},$O.removeRectText=function(t){kO(t,this._textVmlEl),this._textVmlEl=null},$O.appendRectText=function(t){LO(t,this._textVmlEl)}}Cb.prototype.brushVML=function(t){var e=this.style;null!=e.text?this.drawRectText(t,{x:e.x||0,y:e.y||0,width:0,height:0},this.getBoundingRect(),!0):this.removeRectText(t)},Cb.prototype.onRemove=function(t){this.removeRectText(t)},Cb.prototype.onAdd=function(t){this.appendRectText(t)}}Wy.prototype={constructor:Wy,getType:function(){return"vml"},getViewportRoot:function(){return this._vmlViewport},getViewportRootOffset:function(){var t=this.getViewportRoot();if(t)return{offsetLeft:t.offsetLeft||0,offsetTop:t.offsetTop||0}},refresh:function(){var t=this.storage.getDisplayList(!0,!0);this._paintList(t)},_paintList:function(t){for(var e=this._vmlRoot,i=0;i<t.length;i++){var n=t[i];n.invisible||n.ignore?(n.__alreadyNotVisible||n.onRemove(e),n.__alreadyNotVisible=!0):(n.__alreadyNotVisible&&n.onAdd(e),n.__alreadyNotVisible=!1,n.__dirty&&(n.beforeBrush&&n.beforeBrush(),(n.brushVML||n.brush).call(n,e),n.afterBrush&&n.afterBrush())),n.__dirty=!1}this._firstPaint&&(this._vmlViewport.appendChild(e),this._firstPaint=!1)},resize:function(t,e){var t=null==t?this._getWidth():t,e=null==e?this._getHeight():e;if(this._width!=t||this._height!=e){this._width=t,this._height=e;var i=this._vmlViewport.style;i.width=t+"px",i.height=e+"px"}},dispose:function(){this.root.innerHTML="",this._vmlRoot=this._vmlViewport=this.storage=null},getWidth:function(){return this._width},getHeight:function(){return this._height},clear:function(){this._vmlViewport&&this.root.removeChild(this._vmlViewport)},_getWidth:function(){var t=this.root,e=t.currentStyle;return(t.clientWidth||Gy(e.width))-Gy(e.paddingLeft)-Gy(e.paddingRight)|0},_getHeight:function(){var t=this.root,e=t.currentStyle;return(t.clientHeight||Gy(e.height))-Gy(e.paddingTop)-Gy(e.paddingBottom)|0}},d(["getLayer","insertLayer","eachLayer","eachBuiltinLayer","eachOtherLayer","getLayers","modLayer","delLayer","clearLayer","toDataURL","pathToImage"],function(t){Wy.prototype[t]=Fy(t)}),wi("vml",Wy);var KO="http://www.w3.org/2000/svg",JO=ab.CMD,QO=Array.prototype.join,tN="none",eN=Math.round,iN=Math.sin,nN=Math.cos,oN=Math.PI,aN=2*Math.PI,rN=180/oN,sN=1e-4,lN={};lN.brush=function(t){var e=t.style,i=t.__svgEl;i||(i=Hy("path"),t.__svgEl=i),t.path||t.createPathProxy();var n=t.path;if(t.__dirtyPath){n.beginPath(),t.buildPath(n,t.shape),t.__dirtyPath=!1;var o=Jy(n);o.indexOf("NaN")<0&&qy(i,"d",o)}Ky(i,e),Yy(i,t.transform),null!=e.text&&dN(t,t.getBoundingRect())};var hN={};hN.brush=function(t){var e=t.style,i=e.image;if(i instanceof HTMLImageElement&&(i=i.src),i){var n=e.x||0,o=e.y||0,a=e.width,r=e.height,s=t.__svgEl;s||(s=Hy("image"),t.__svgEl=s),i!==t.__imageSrc&&($y(s,"href",i),t.__imageSrc=i),qy(s,"width",a),qy(s,"height",r),qy(s,"x",n),qy(s,"y",o),Yy(s,t.transform),null!=e.text&&dN(t,t.getBoundingRect())}};var uN={},cN=new Kt,dN=function(t,e,i){var n=t.style;t.__dirty&&Oe(n);var o=n.text;if(null!=o){o+="";var a=t.__textSvgEl;if(a||(a=Hy("text"),t.__textSvgEl=a),Ky(a,n,!0),t instanceof Cb||t.style.transformText)Yy(a,t.transform);else if(t.transform)cN.copy(e),cN.applyTransform(t.transform),e=cN;else{var r=t.transformCoordToGlobal(e.x,e.y);e.x=r[0],e.y=r[1]}var s,l,h=n.textPosition,u=n.textDistance,c=n.textAlign||"left";"number"==typeof n.fontSize&&(n.fontSize+="px");var d=n.font||[n.fontStyle||"",n.fontWeight||"",n.fontSize||"",n.fontFamily||""].join(" ")||F_,f=Qy(n.textVerticalAlign),p=(i=me(o,d,c,f)).lineHeight;if(h instanceof Array)s=e.x+h[0],l=e.y+h[1];else{var g=we(h,e,u);s=g.x,l=g.y,f=Qy(g.textVerticalAlign),c=g.textAlign}qy(a,"alignment-baseline",f),d&&(a.style.font=d);var m=n.textPadding;qy(a,"x",s),qy(a,"y",l);var v=o.split("\n"),y=v.length,x=c;"left"===x?(x="start",m&&(s+=m[3])):"right"===x?(x="end",m&&(s-=m[1])):"center"===x&&(x="middle",m&&(s+=(m[3]-m[1])/2));var _=0;if("baseline"===f?(_=-i.height+p,m&&(_-=m[2])):"middle"===f?(_=(-i.height+p)/2,m&&(l+=(m[0]-m[2])/2)):m&&(_+=m[0]),t.__text!==o||t.__textFont!==d){var w=t.__tspanList||[];t.__tspanList=w;for(S=0;S<y;S++)(M=w[S])?M.innerHTML="":(M=w[S]=Hy("tspan"),a.appendChild(M),qy(M,"alignment-baseline",f),qy(M,"text-anchor",x)),qy(M,"x",s),qy(M,"y",l+S*p+_),M.appendChild(document.createTextNode(v[S]));for(;S<w.length;S++)a.removeChild(w[S]);w.length=y,t.__text=o,t.__textFont=d}else if(t.__tspanList.length)for(var b=t.__tspanList.length,S=0;S<b;++S){var M=t.__tspanList[S];M&&(qy(M,"x",s),qy(M,"y",l+S*p+_))}}};uN.drawRectText=dN,uN.brush=function(t){var e=t.style;null!=e.text&&(e.textPosition=[0,0],dN(t,{x:e.x||0,y:e.y||0,width:0,height:0},t.getBoundingRect()))},tx.prototype={diff:function(t,e,i){i||(i=function(t,e){return t===e}),this.equals=i;var n=this;t=t.slice();var o=(e=e.slice()).length,a=t.length,r=1,s=o+a,l=[{newPos:-1,components:[]}],h=this.extractCommon(l[0],e,t,0);if(l[0].newPos+1>=o&&h+1>=a){for(var u=[],c=0;c<e.length;c++)u.push(c);return[{indices:u,count:e.length}]}for(;r<=s;){var d=function(){for(var i=-1*r;i<=r;i+=2){var s,h=l[i-1],u=l[i+1],c=(u?u.newPos:0)-i;h&&(l[i-1]=void 0);var d=h&&h.newPos+1<o,f=u&&0<=c&&c<a;if(d||f){if(!d||f&&h.newPos<u.newPos?(s=ix(u),n.pushComponent(s.components,void 0,!0)):((s=h).newPos++,n.pushComponent(s.components,!0,void 0)),c=n.extractCommon(s,e,t,i),s.newPos+1>=o&&c+1>=a)return ex(0,s.components);l[i]=s}else l[i]=void 0}r++}();if(d)return d}},pushComponent:function(t,e,i){var n=t[t.length-1];n&&n.added===e&&n.removed===i?t[t.length-1]={count:n.count+1,added:e,removed:i}:t.push({count:1,added:e,removed:i})},extractCommon:function(t,e,i,n){for(var o=e.length,a=i.length,r=t.newPos,s=r-n,l=0;r+1<o&&s+1<a&&this.equals(e[r+1],i[s+1]);)r++,s++,l++;return l&&t.components.push({count:l}),t.newPos=r,s},tokenize:function(t){return t.slice()},join:function(t){return t.slice()}};var fN=new tx,pN=function(t,e,i){return fN.diff(t,e,i)};nx.prototype.createElement=Hy,nx.prototype.getDefs=function(t){var e=this._svgRoot,i=this._svgRoot.getElementsByTagName("defs");return 0===i.length?t?((i=e.insertBefore(this.createElement("defs"),e.firstChild)).contains||(i.contains=function(t){var e=i.children;if(!e)return!1;for(var n=e.length-1;n>=0;--n)if(e[n]===t)return!0;return!1}),i):null:i[0]},nx.prototype.update=function(t,e){if(t){var i=this.getDefs(!1);if(t[this._domName]&&i.contains(t[this._domName]))"function"==typeof e&&e(t);else{var n=this.add(t);n&&(t[this._domName]=n)}}},nx.prototype.addDom=function(t){this.getDefs(!0).appendChild(t)},nx.prototype.removeDom=function(t){var e=this.getDefs(!1);e&&t[this._domName]&&(e.removeChild(t[this._domName]),t[this._domName]=null)},nx.prototype.getDoms=function(){var t=this.getDefs(!1);if(!t)return[];var e=[];return d(this._tagNames,function(i){var n=t.getElementsByTagName(i);e=e.concat([].slice.call(n))}),e},nx.prototype.markAllUnused=function(){var t=this;d(this.getDoms(),function(e){e[t._markLabel]="0"})},nx.prototype.markUsed=function(t){t&&(t[this._markLabel]="1")},nx.prototype.removeUnused=function(){var t=this.getDefs(!1);if(t){var e=this;d(this.getDoms(),function(i){"1"!==i[e._markLabel]&&t.removeChild(i)})}},nx.prototype.getSvgProxy=function(t){return t instanceof Mn?lN:t instanceof Je?hN:t instanceof Cb?uN:lN},nx.prototype.getTextSvgElement=function(t){return t.__textSvgEl},nx.prototype.getSvgElement=function(t){return t.__svgEl},h(ox,nx),ox.prototype.addWithoutUpdate=function(t,e){if(e&&e.style){var i=this;d(["fill","stroke"],function(n){if(e.style[n]&&("linear"===e.style[n].type||"radial"===e.style[n].type)){var o,a=e.style[n],r=i.getDefs(!0);a._dom?(o=a._dom,r.contains(a._dom)||i.addDom(o)):o=i.add(a),i.markUsed(e);var s=o.getAttribute("id");t.setAttribute(n,"url(#"+s+")")}})}},ox.prototype.add=function(t){var e;if("linear"===t.type)e=this.createElement("linearGradient");else{if("radial"!==t.type)return v_("Illegal gradient type."),null;e=this.createElement("radialGradient")}return t.id=t.id||this.nextId++,e.setAttribute("id","zr"+this._zrId+"-gradient-"+t.id),this.updateDom(t,e),this.addDom(e),e},ox.prototype.update=function(t){var e=this;nx.prototype.update.call(this,t,function(){var i=t.type,n=t._dom.tagName;"linear"===i&&"linearGradient"===n||"radial"===i&&"radialGradient"===n?e.updateDom(t,t._dom):(e.removeDom(t),e.add(t))})},ox.prototype.updateDom=function(t,e){if("linear"===t.type)e.setAttribute("x1",t.x),e.setAttribute("y1",t.y),e.setAttribute("x2",t.x2),e.setAttribute("y2",t.y2);else{if("radial"!==t.type)return void v_("Illegal gradient type.");e.setAttribute("cx",t.x),e.setAttribute("cy",t.y),e.setAttribute("r",t.r)}t.global?e.setAttribute("gradientUnits","userSpaceOnUse"):e.setAttribute("gradientUnits","objectBoundingBox"),e.innerHTML="";for(var i=t.colorStops,n=0,o=i.length;n<o;++n){var a=this.createElement("stop");a.setAttribute("offset",100*i[n].offset+"%"),a.setAttribute("stop-color",i[n].color),e.appendChild(a)}t._dom=e},ox.prototype.markUsed=function(t){if(t.style){var e=t.style.fill;e&&e._dom&&nx.prototype.markUsed.call(this,e._dom),(e=t.style.stroke)&&e._dom&&nx.prototype.markUsed.call(this,e._dom)}},h(ax,nx),ax.prototype.update=function(t){var e=this.getSvgElement(t);e&&this.updateDom(e,t.__clipPaths,!1);var i=this.getTextSvgElement(t);i&&this.updateDom(i,t.__clipPaths,!0),this.markUsed(t)},ax.prototype.updateDom=function(t,e,i){if(e&&e.length>0){var n,o,a=this.getDefs(!0),r=e[0],s=i?"_textDom":"_dom";r[s]?(o=r[s].getAttribute("id"),n=r[s],a.contains(n)||a.appendChild(n)):(o="zr"+this._zrId+"-clip-"+this.nextId,++this.nextId,(n=this.createElement("clipPath")).setAttribute("id",o),a.appendChild(n),r[s]=n);var l=this.getSvgProxy(r);if(r.transform&&r.parent.invTransform&&!i){var h=Array.prototype.slice.call(r.transform);ut(r.transform,r.parent.invTransform,r.transform),l.brush(r),r.transform=h}else l.brush(r);var u=this.getSvgElement(r);n.innerHTML="",n.appendChild(u.cloneNode()),t.setAttribute("clip-path","url(#"+o+")"),e.length>1&&this.updateDom(n,e.slice(1),i)}else t&&t.setAttribute("clip-path","none")},ax.prototype.markUsed=function(t){var e=this;t.__clipPaths&&t.__clipPaths.length>0&&d(t.__clipPaths,function(t){t._dom&&nx.prototype.markUsed.call(e,t._dom),t._textDom&&nx.prototype.markUsed.call(e,t._textDom)})},h(rx,nx),rx.prototype.addWithoutUpdate=function(t,e){if(e&&sx(e.style)){var i,n=e.style;n._shadowDom?(i=n._shadowDom,this.getDefs(!0).contains(n._shadowDom)||this.addDom(i)):i=this.add(e),this.markUsed(e);var o=i.getAttribute("id");t.style.filter="url(#"+o+")"}},rx.prototype.add=function(t){var e=this.createElement("filter"),i=t.style;return i._shadowDomId=i._shadowDomId||this.nextId++,e.setAttribute("id","zr"+this._zrId+"-shadow-"+i._shadowDomId),this.updateDom(t,e),this.addDom(e),e},rx.prototype.update=function(t,e){var i=e.style;if(sx(i)){var n=this;nx.prototype.update.call(this,e,function(t){n.updateDom(e,t._shadowDom)})}else this.remove(t,i)},rx.prototype.remove=function(t,e){null!=e._shadowDomId&&(this.removeDom(e),t.style.filter="")},rx.prototype.updateDom=function(t,e){var i=e.getElementsByTagName("feDropShadow");i=0===i.length?this.createElement("feDropShadow"):i[0];var n,o,a,r,s=t.style,l=t.scale?t.scale[0]||1:1,h=t.scale?t.scale[1]||1:1;if(s.shadowBlur||s.shadowOffsetX||s.shadowOffsetY)n=s.shadowOffsetX||0,o=s.shadowOffsetY||0,a=s.shadowBlur,r=s.shadowColor;else{if(!s.textShadowBlur)return void this.removeDom(e,s);n=s.textShadowOffsetX||0,o=s.textShadowOffsetY||0,a=s.textShadowBlur,r=s.textShadowColor}i.setAttribute("dx",n/l),i.setAttribute("dy",o/h),i.setAttribute("flood-color",r);var u=a/2/l+" "+a/2/h;i.setAttribute("stdDeviation",u),e.setAttribute("x","-100%"),e.setAttribute("y","-100%"),e.setAttribute("width",Math.ceil(a/2*200)+"%"),e.setAttribute("height",Math.ceil(a/2*200)+"%"),e.appendChild(i),s._shadowDom=e},rx.prototype.markUsed=function(t){var e=t.style;e&&e._shadowDom&&nx.prototype.markUsed.call(this,e._shadowDom)};var gN=function(t,e,i,n){this.root=t,this.storage=e,this._opts=i=a({},i||{});var o=Hy("svg");o.setAttribute("xmlns","http://www.w3.org/2000/svg"),o.setAttribute("version","1.1"),o.setAttribute("baseProfile","full"),o.style.cssText="user-select:none;position:absolute;left:0;top:0;",this.gradientManager=new ox(n,o),this.clipPathManager=new ax(n,o),this.shadowManager=new rx(n,o);var r=document.createElement("div");r.style.cssText="overflow:hidden;position:relative",this._svgRoot=o,this._viewport=r,t.appendChild(r),r.appendChild(o),this.resize(i.width,i.height),this._visibleList=[]};gN.prototype={constructor:gN,getType:function(){return"svg"},getViewportRoot:function(){return this._viewport},getViewportRootOffset:function(){var t=this.getViewportRoot();if(t)return{offsetLeft:t.offsetLeft||0,offsetTop:t.offsetTop||0}},refresh:function(){var t=this.storage.getDisplayList(!0);this._paintList(t)},_paintList:function(t){this.gradientManager.markAllUnused(),this.clipPathManager.markAllUnused(),this.shadowManager.markAllUnused();var e,i=this._svgRoot,n=this._visibleList,o=t.length,a=[];for(e=0;e<o;e++){var r=hx(f=t[e]),s=gx(f)||px(f);f.invisible||(f.__dirty&&(r&&r.brush(f),this.clipPathManager.update(f),f.style&&(this.gradientManager.update(f.style.fill),this.gradientManager.update(f.style.stroke),this.shadowManager.update(s,f)),f.__dirty=!1),a.push(f))}var l,h=pN(n,a);for(e=0;e<h.length;e++)if((c=h[e]).removed)for(d=0;d<c.count;d++){var s=gx(f=n[c.indices[d]]),u=px(f);fx(i,s),fx(i,u)}for(e=0;e<h.length;e++){var c=h[e];if(c.added)for(d=0;d<c.count;d++){var s=gx(f=a[c.indices[d]]),u=px(f);l?cx(i,s,l):dx(i,s),s?cx(i,u,s):l?cx(i,u,l):dx(i,u),cx(i,u,s),l=u||s||l,this.gradientManager.addWithoutUpdate(s,f),this.shadowManager.addWithoutUpdate(l,f),this.clipPathManager.markUsed(f)}else if(!c.removed)for(var d=0;d<c.count;d++){var f=a[c.indices[d]];l=s=px(f)||gx(f)||l,this.gradientManager.markUsed(f),this.gradientManager.addWithoutUpdate(s,f),this.shadowManager.markUsed(f),this.shadowManager.addWithoutUpdate(s,f),this.clipPathManager.markUsed(f)}}this.gradientManager.removeUnused(),this.clipPathManager.removeUnused(),this.shadowManager.removeUnused(),this._visibleList=a},_getDefs:function(t){var e=this._svgRoot,i=this._svgRoot.getElementsByTagName("defs");return 0===i.length?t?((i=e.insertBefore(Hy("defs"),e.firstChild)).contains||(i.contains=function(t){var e=i.children;if(!e)return!1;for(var n=e.length-1;n>=0;--n)if(e[n]===t)return!0;return!1}),i):null:i[0]},resize:function(t,e){var i=this._viewport;i.style.display="none";var n=this._opts;if(null!=t&&(n.width=t),null!=e&&(n.height=e),t=this._getSize(0),e=this._getSize(1),i.style.display="",this._width!==t||this._height!==e){this._width=t,this._height=e;var o=i.style;o.width=t+"px",o.height=e+"px";var a=this._svgRoot;a.setAttribute("width",t),a.setAttribute("height",e)}},getWidth:function(){return this._width},getHeight:function(){return this._height},_getSize:function(t){var e=this._opts,i=["width","height"][t],n=["clientWidth","clientHeight"][t],o=["paddingLeft","paddingTop"][t],a=["paddingRight","paddingBottom"][t];if(null!=e[i]&&"auto"!==e[i])return parseFloat(e[i]);var r=this.root,s=document.defaultView.getComputedStyle(r);return(r[n]||lx(s[i])||lx(r.style[i]))-(lx(s[o])||0)-(lx(s[a])||0)|0},dispose:function(){this.root.innerHTML="",this._svgRoot=this._viewport=this.storage=null},clear:function(){this._viewport&&this.root.removeChild(this._viewport)},pathToSvg:function(){this.refresh();var t=this._svgRoot.outerHTML;return"data:img/svg+xml;utf-8,"+unescape(t)}},d(["getLayer","insertLayer","eachLayer","eachBuiltinLayer","eachOtherLayer","getLayers","modLayer","delLayer","clearLayer","toDataURL","pathToImage"],function(t){gN.prototype[t]=mx(t)}),wi("svg",gN),t.version="4.0.2",t.dependencies=BM,t.PRIORITY=FM,t.init=function(t,e,i){var n=as(t);if(n)return n;var o=new Rr(t,e,i);return o.id="ec_"+aI++,nI[o.id]=o,Ei(t,sI,o.id),ns(o),o},t.connect=function(t){if(y(t)){var e=t;t=null,NM(e,function(e){null!=e.group&&(t=e.group)}),t=t||"g_"+rI++,NM(e,function(e){e.group=t})}return oI[t]=!0,t},t.disConnect=os,t.disconnect=hI,t.dispose=function(t){"string"==typeof t?t=nI[t]:t instanceof Rr||(t=as(t)),t instanceof Rr&&!t.isDisposed()&&t.dispose()},t.getInstanceByDom=as,t.getInstanceById=function(t){return nI[t]},t.registerTheme=rs,t.registerPreprocessor=ss,t.registerProcessor=ls,t.registerPostUpdate=function(t){QM.push(t)},t.registerAction=hs,t.registerCoordinateSystem=us,t.getCoordinateSystemDimensions=function(t){var e=Aa.get(t);if(e)return e.getDimensionsInfo?e.getDimensionsInfo():e.dimensions.slice()},t.registerLayout=cs,t.registerVisual=ds,t.registerLoading=ps,t.extendComponentModel=gs,t.extendComponentView=ms,t.extendSeriesModel=vs,t.extendChartView=ys,t.setCanvasCreator=function(t){e("createCanvas",t)},t.registerMap=function(t,e,i){e.geoJson&&!e.features&&(i=e.specialAreas,e=e.geoJson),"string"==typeof e&&(e="undefined"!=typeof JSON&&JSON.parse?JSON.parse(e):new Function("return ("+e+");")()),lI[t]={geoJson:e,specialAreas:i}},t.getMap=xs,t.dataTool=uI,t.zrender=fw,t.graphic=tS,t.number=cS,t.format=yS,t.throttle=vr,t.helper=JI,t.matrix=Yx,t.vector=Wx,t.color=c_,t.parseGeoJSON=tT,t.parseGeoJson=oT,t.util=aT,t.List=yI,t.Model=_o,t.Axis=nT,t.env=_x});
diff --git a/management/guns-admin/src/main/webapp/static/js/plugins/chartJs/echarts.simple.min.js b/management/guns-admin/src/main/webapp/static/js/plugins/chartJs/echarts.simple.min.js
new file mode 100644
index 0000000..daa6c6d
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/static/js/plugins/chartJs/echarts.simple.min.js
@@ -0,0 +1 @@
+!function(t,e){"object"==typeof exports&&"undefined"!=typeof module?e(exports):"function"==typeof define&&define.amd?define(["exports"],e):e(t.echarts={})}(this,function(t){"use strict";function e(t,e){"createCanvas"===t&&(Kl=null),jl[t]=e}function n(t){if(null==t||"object"!=typeof t)return t;var e=t,i=Hl.call(t);if("[object Array]"===i){if(!E(t)){e=[];for(var r=0,a=t.length;r<a;r++)e[r]=n(t[r])}}else if(Wl[i]){if(!E(t)){var o=t.constructor;if(t.constructor.from)e=o.from(t);else{e=new o(t.length);for(var r=0,a=t.length;r<a;r++)e[r]=n(t[r])}}}else if(!Vl[i]&&!E(t)&&!M(t)){e={};for(var s in t)t.hasOwnProperty(s)&&(e[s]=n(t[s]))}return e}function i(t,e,r){if(!w(e)||!w(t))return r?n(e):t;for(var a in e)if(e.hasOwnProperty(a)){var o=t[a],s=e[a];!w(s)||!w(o)||y(s)||y(o)||M(s)||M(o)||b(s)||b(o)||E(s)||E(o)?!r&&a in t||(t[a]=n(e[a],!0)):i(o,s,r)}return t}function r(t,e){for(var n=t[0],r=1,a=t.length;r<a;r++)n=i(n,t[r],e);return n}function a(t,e){for(var n in e)e.hasOwnProperty(n)&&(t[n]=e[n]);return t}function o(t,e,n){for(var i in e)e.hasOwnProperty(i)&&(n?null!=e[i]:null==t[i])&&(t[i]=e[i]);return t}function s(){return Kl||(Kl=$l().getContext("2d")),Kl}function l(t,e){if(t){if(t.indexOf)return t.indexOf(e);for(var n=0,i=t.length;n<i;n++)if(t[n]===e)return n}return-1}function h(t,e){function n(){}var i=t.prototype;n.prototype=e.prototype,t.prototype=new n;for(var r in i)t.prototype[r]=i[r];t.prototype.constructor=t,t.superClass=e}function u(t,e,n){o(t="prototype"in t?t.prototype:t,e="prototype"in e?e.prototype:e,n)}function c(t){if(t)return"string"!=typeof t&&"number"==typeof t.length}function f(t,e,n){if(t&&e)if(t.forEach&&t.forEach===ql)t.forEach(e,n);else if(t.length===+t.length)for(var i=0,r=t.length;i<r;i++)e.call(n,t[i],i,t);else for(var a in t)t.hasOwnProperty(a)&&e.call(n,t[a],a,t)}function d(t,e,n){if(t&&e){if(t.map&&t.map===Yl)return t.map(e,n);for(var i=[],r=0,a=t.length;r<a;r++)i.push(e.call(n,t[r],r,t));return i}}function p(t,e,n,i){if(t&&e){if(t.reduce&&t.reduce===Ul)return t.reduce(e,n,i);for(var r=0,a=t.length;r<a;r++)n=e.call(i,n,t[r],r,t);return n}}function g(t,e,n){if(t&&e){if(t.filter&&t.filter===Xl)return t.filter(e,n);for(var i=[],r=0,a=t.length;r<a;r++)e.call(n,t[r],r,t)&&i.push(t[r]);return i}}function m(t,e){var n=Zl.call(arguments,2);return function(){return t.apply(e,n.concat(Zl.call(arguments)))}}function v(t){var e=Zl.call(arguments,1);return function(){return t.apply(this,e.concat(Zl.call(arguments)))}}function y(t){return"[object Array]"===Hl.call(t)}function _(t){return"function"==typeof t}function x(t){return"[object String]"===Hl.call(t)}function w(t){var e=typeof t;return"function"===e||!!t&&"object"==e}function b(t){return!!Vl[Hl.call(t)]}function S(t){return!!Wl[Hl.call(t)]}function M(t){return"object"==typeof t&&"number"==typeof t.nodeType&&"object"==typeof t.ownerDocument}function T(t){return t!==t}function I(t){for(var e=0,n=arguments.length;e<n;e++)if(null!=arguments[e])return arguments[e]}function C(t,e){return null!=t?t:e}function k(t,e,n){return null!=t?t:null!=e?e:n}function D(){return Function.call.apply(Zl,arguments)}function A(t){if("number"==typeof t)return[t,t,t,t];var e=t.length;return 2===e?[t[0],t[1],t[0],t[1]]:3===e?[t[0],t[1],t[2],t[1]]:t}function L(t,e){if(!t)throw new Error(e)}function P(t){return null==t?null:"function"==typeof t.trim?t.trim():t.replace(/^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g,"")}function O(t){t[Ql]=!0}function E(t){return t[Ql]}function B(t){function e(t,e){n?i.set(t,e):i.set(e,t)}var n=y(t),i=this;t instanceof B?t.each(e):t&&f(t,e)}function R(t){return new B(t)}function z(){}function N(t,e){var n=new Jl(2);return null==t&&(t=0),null==e&&(e=0),n[0]=t,n[1]=e,n}function F(t){var e=new Jl(2);return e[0]=t[0],e[1]=t[1],e}function V(t,e,n){return t[0]=e[0]+n[0],t[1]=e[1]+n[1],t}function W(t,e,n){return t[0]=e[0]-n[0],t[1]=e[1]-n[1],t}function H(t){return Math.sqrt(G(t))}function G(t){return t[0]*t[0]+t[1]*t[1]}function q(t,e,n){return t[0]=e[0]*n,t[1]=e[1]*n,t}function X(t,e){var n=H(e);return 0===n?(t[0]=0,t[1]=0):(t[0]=e[0]/n,t[1]=e[1]/n),t}function Z(t,e){return Math.sqrt((t[0]-e[0])*(t[0]-e[0])+(t[1]-e[1])*(t[1]-e[1]))}function Y(t,e,n){var i=e[0],r=e[1];return t[0]=n[0]*i+n[2]*r+n[4],t[1]=n[1]*i+n[3]*r+n[5],t}function U(t,e,n){return t[0]=Math.min(e[0],n[0]),t[1]=Math.min(e[1],n[1]),t}function j(t,e,n){return t[0]=Math.max(e[0],n[0]),t[1]=Math.max(e[1],n[1]),t}function $(){this.on("mousedown",this._dragStart,this),this.on("mousemove",this._drag,this),this.on("mouseup",this._dragEnd,this),this.on("globalout",this._dragEnd,this)}function K(t,e){return{target:t,topTarget:e&&e.topTarget}}function Q(t,e,n){return{type:t,event:n,target:e.target,topTarget:e.topTarget,cancelBubble:!1,offsetX:n.zrX,offsetY:n.zrY,gestureEvent:n.gestureEvent,pinchX:n.pinchX,pinchY:n.pinchY,pinchScale:n.pinchScale,wheelDelta:n.zrDelta,zrByTouch:n.zrByTouch,which:n.which}}function J(){}function tt(t,e,n){if(t[t.rectHover?"rectContain":"contain"](e,n)){for(var i,r=t;r;){if(r.clipPath&&!r.clipPath.contain(e,n))return!1;r.silent&&(i=!0),r=r.parent}return!i||rh}return!1}function et(){var t=new sh(6);return nt(t),t}function nt(t){return t[0]=1,t[1]=0,t[2]=0,t[3]=1,t[4]=0,t[5]=0,t}function it(t,e){return t[0]=e[0],t[1]=e[1],t[2]=e[2],t[3]=e[3],t[4]=e[4],t[5]=e[5],t}function rt(t,e,n){var i=e[0]*n[0]+e[2]*n[1],r=e[1]*n[0]+e[3]*n[1],a=e[0]*n[2]+e[2]*n[3],o=e[1]*n[2]+e[3]*n[3],s=e[0]*n[4]+e[2]*n[5]+e[4],l=e[1]*n[4]+e[3]*n[5]+e[5];return t[0]=i,t[1]=r,t[2]=a,t[3]=o,t[4]=s,t[5]=l,t}function at(t,e,n){return t[0]=e[0],t[1]=e[1],t[2]=e[2],t[3]=e[3],t[4]=e[4]+n[0],t[5]=e[5]+n[1],t}function ot(t,e,n){var i=e[0],r=e[2],a=e[4],o=e[1],s=e[3],l=e[5],h=Math.sin(n),u=Math.cos(n);return t[0]=i*u+o*h,t[1]=-i*h+o*u,t[2]=r*u+s*h,t[3]=-r*h+u*s,t[4]=u*a+h*l,t[5]=u*l-h*a,t}function st(t,e,n){var i=n[0],r=n[1];return t[0]=e[0]*i,t[1]=e[1]*r,t[2]=e[2]*i,t[3]=e[3]*r,t[4]=e[4]*i,t[5]=e[5]*r,t}function lt(t,e){var n=e[0],i=e[2],r=e[4],a=e[1],o=e[3],s=e[5],l=n*o-a*i;return l?(l=1/l,t[0]=o*l,t[1]=-a*l,t[2]=-i*l,t[3]=n*l,t[4]=(i*s-o*r)*l,t[5]=(a*r-n*s)*l,t):null}function ht(t){return t>hh||t<-hh}function ut(t){this._target=t.target,this._life=t.life||1e3,this._delay=t.delay||0,this._initialized=!1,this.loop=null!=t.loop&&t.loop,this.gap=t.gap||0,this.easing=t.easing||"Linear",this.onframe=t.onframe,this.ondestroy=t.ondestroy,this.onrestart=t.onrestart,this._pausedTime=0,this._paused=!1}function ct(t){return(t=Math.round(t))<0?0:t>255?255:t}function ft(t){return t<0?0:t>1?1:t}function dt(t){return ct(t.length&&"%"===t.charAt(t.length-1)?parseFloat(t)/100*255:parseInt(t,10))}function pt(t){return ft(t.length&&"%"===t.charAt(t.length-1)?parseFloat(t)/100:parseFloat(t))}function gt(t,e,n){return n<0?n+=1:n>1&&(n-=1),6*n<1?t+(e-t)*n*6:2*n<1?e:3*n<2?t+(e-t)*(2/3-n)*6:t}function mt(t,e,n,i,r){return t[0]=e,t[1]=n,t[2]=i,t[3]=r,t}function vt(t,e){return t[0]=e[0],t[1]=e[1],t[2]=e[2],t[3]=e[3],t}function yt(t,e){wh&&vt(wh,e),wh=xh.put(t,wh||e.slice())}function _t(t,e){if(t){e=e||[];var n=xh.get(t);if(n)return vt(e,n);var i=(t+="").replace(/ /g,"").toLowerCase();if(i in _h)return vt(e,_h[i]),yt(t,e),e;if("#"!==i.charAt(0)){var r=i.indexOf("("),a=i.indexOf(")");if(-1!==r&&a+1===i.length){var o=i.substr(0,r),s=i.substr(r+1,a-(r+1)).split(","),l=1;switch(o){case"rgba":if(4!==s.length)return void mt(e,0,0,0,1);l=pt(s.pop());case"rgb":return 3!==s.length?void mt(e,0,0,0,1):(mt(e,dt(s[0]),dt(s[1]),dt(s[2]),l),yt(t,e),e);case"hsla":return 4!==s.length?void mt(e,0,0,0,1):(s[3]=pt(s[3]),xt(s,e),yt(t,e),e);case"hsl":return 3!==s.length?void mt(e,0,0,0,1):(xt(s,e),yt(t,e),e);default:return}}mt(e,0,0,0,1)}else{if(4===i.length)return(h=parseInt(i.substr(1),16))>=0&&h<=4095?(mt(e,(3840&h)>>4|(3840&h)>>8,240&h|(240&h)>>4,15&h|(15&h)<<4,1),yt(t,e),e):void mt(e,0,0,0,1);if(7===i.length){var h=parseInt(i.substr(1),16);return h>=0&&h<=16777215?(mt(e,(16711680&h)>>16,(65280&h)>>8,255&h,1),yt(t,e),e):void mt(e,0,0,0,1)}}}}function xt(t,e){var n=(parseFloat(t[0])%360+360)%360/360,i=pt(t[1]),r=pt(t[2]),a=r<=.5?r*(i+1):r+i-r*i,o=2*r-a;return e=e||[],mt(e,ct(255*gt(o,a,n+1/3)),ct(255*gt(o,a,n)),ct(255*gt(o,a,n-1/3)),1),4===t.length&&(e[3]=t[3]),e}function wt(t,e){var n=_t(t);if(n){for(var i=0;i<3;i++)n[i]=e<0?n[i]*(1-e)|0:(255-n[i])*e+n[i]|0;return bt(n,4===n.length?"rgba":"rgb")}}function bt(t,e){if(t&&t.length){var n=t[0]+","+t[1]+","+t[2];return"rgba"!==e&&"hsva"!==e&&"hsla"!==e||(n+=","+t[3]),e+"("+n+")"}}function St(t,e){return t[e]}function Mt(t,e,n){t[e]=n}function Tt(t,e,n){return(e-t)*n+t}function It(t,e,n){return n>.5?e:t}function Ct(t,e,n,i,r){var a=t.length;if(1==r)for(s=0;s<a;s++)i[s]=Tt(t[s],e[s],n);else for(var o=a&&t[0].length,s=0;s<a;s++)for(var l=0;l<o;l++)i[s][l]=Tt(t[s][l],e[s][l],n)}function kt(t,e,n){var i=t.length,r=e.length;if(i!==r)if(i>r)t.length=r;else for(o=i;o<r;o++)t.push(1===n?e[o]:bh.call(e[o]));for(var a=t[0]&&t[0].length,o=0;o<t.length;o++)if(1===n)isNaN(t[o])&&(t[o]=e[o]);else for(var s=0;s<a;s++)isNaN(t[o][s])&&(t[o][s]=e[o][s])}function Dt(t,e,n){if(t===e)return!0;var i=t.length;if(i!==e.length)return!1;if(1===n){for(a=0;a<i;a++)if(t[a]!==e[a])return!1}else for(var r=t[0].length,a=0;a<i;a++)for(var o=0;o<r;o++)if(t[a][o]!==e[a][o])return!1;return!0}function At(t,e,n,i,r,a,o,s,l){var h=t.length;if(1==l)for(c=0;c<h;c++)s[c]=Lt(t[c],e[c],n[c],i[c],r,a,o);else for(var u=t[0].length,c=0;c<h;c++)for(var f=0;f<u;f++)s[c][f]=Lt(t[c][f],e[c][f],n[c][f],i[c][f],r,a,o)}function Lt(t,e,n,i,r,a,o){var s=.5*(n-t),l=.5*(i-e);return(2*(e-n)+s+l)*o+(-3*(e-n)-2*s-l)*a+s*r+e}function Pt(t){if(c(t)){var e=t.length;if(c(t[0])){for(var n=[],i=0;i<e;i++)n.push(bh.call(t[i]));return n}return bh.call(t)}return t}function Ot(t){return t[0]=Math.floor(t[0]),t[1]=Math.floor(t[1]),t[2]=Math.floor(t[2]),"rgba("+t.join(",")+")"}function Et(t){var e=t[t.length-1].value;return c(e&&e[0])?2:1}function Bt(t,e,n,i,r,a){var o=t._getter,s=t._setter,l="spline"===e,h=i.length;if(h){var u,f=c(i[0].value),d=!1,p=!1,g=f?Et(i):0;i.sort(function(t,e){return t.time-e.time}),u=i[h-1].time;for(var m=[],v=[],y=i[0].value,_=!0,x=0;x<h;x++){m.push(i[x].time/u);var w=i[x].value;if(f&&Dt(w,y,g)||!f&&w===y||(_=!1),y=w,"string"==typeof w){var b=_t(w);b?(w=b,d=!0):p=!0}v.push(w)}if(a||!_){for(var S=v[h-1],x=0;x<h-1;x++)f?kt(v[x],S,g):!isNaN(v[x])||isNaN(S)||p||d||(v[x]=S);f&&kt(o(t._target,r),S,g);var M,T,I,C,k,D,A=0,L=0;if(d)var P=[0,0,0,0];var O=new ut({target:t._target,life:u,loop:t._loop,delay:t._delay,onframe:function(t,e){var n;if(e<0)n=0;else if(e<L){for(n=M=Math.min(A+1,h-1);n>=0&&!(m[n]<=e);n--);n=Math.min(n,h-2)}else{for(n=A;n<h&&!(m[n]>e);n++);n=Math.min(n-1,h-2)}A=n,L=e;var i=m[n+1]-m[n];if(0!==i)if(T=(e-m[n])/i,l)if(C=v[n],I=v[0===n?n:n-1],k=v[n>h-2?h-1:n+1],D=v[n>h-3?h-1:n+2],f)At(I,C,k,D,T,T*T,T*T*T,o(t,r),g);else{if(d)a=At(I,C,k,D,T,T*T,T*T*T,P,1),a=Ot(P);else{if(p)return It(C,k,T);a=Lt(I,C,k,D,T,T*T,T*T*T)}s(t,r,a)}else if(f)Ct(v[n],v[n+1],T,o(t,r),g);else{var a;if(d)Ct(v[n],v[n+1],T,P,1),a=Ot(P);else{if(p)return It(v[n],v[n+1],T);a=Tt(v[n],v[n+1],T)}s(t,r,a)}},ondestroy:n});return e&&"spline"!==e&&(O.easing=e),O}}}function Rt(t,e,n,i){n<0&&(t+=n,n=-n),i<0&&(e+=i,i=-i),this.x=t,this.y=e,this.width=n,this.height=i}function zt(t){for(var e=0;t>=Eh;)e|=1&t,t>>=1;return t+e}function Nt(t,e,n,i){var r=e+1;if(r===n)return 1;if(i(t[r++],t[e])<0){for(;r<n&&i(t[r],t[r-1])<0;)r++;Ft(t,e,r)}else for(;r<n&&i(t[r],t[r-1])>=0;)r++;return r-e}function Ft(t,e,n){for(n--;e<n;){var i=t[e];t[e++]=t[n],t[n--]=i}}function Vt(t,e,n,i,r){for(i===e&&i++;i<n;i++){for(var a,o=t[i],s=e,l=i;s<l;)r(o,t[a=s+l>>>1])<0?l=a:s=a+1;var h=i-s;switch(h){case 3:t[s+3]=t[s+2];case 2:t[s+2]=t[s+1];case 1:t[s+1]=t[s];break;default:for(;h>0;)t[s+h]=t[s+h-1],h--}t[s]=o}}function Wt(t,e,n,i,r,a){var o=0,s=0,l=1;if(a(t,e[n+r])>0){for(s=i-r;l<s&&a(t,e[n+r+l])>0;)o=l,(l=1+(l<<1))<=0&&(l=s);l>s&&(l=s),o+=r,l+=r}else{for(s=r+1;l<s&&a(t,e[n+r-l])<=0;)o=l,(l=1+(l<<1))<=0&&(l=s);l>s&&(l=s);var h=o;o=r-l,l=r-h}for(o++;o<l;){var u=o+(l-o>>>1);a(t,e[n+u])>0?o=u+1:l=u}return l}function Ht(t,e,n,i,r,a){var o=0,s=0,l=1;if(a(t,e[n+r])<0){for(s=r+1;l<s&&a(t,e[n+r-l])<0;)o=l,(l=1+(l<<1))<=0&&(l=s);l>s&&(l=s);var h=o;o=r-l,l=r-h}else{for(s=i-r;l<s&&a(t,e[n+r+l])>=0;)o=l,(l=1+(l<<1))<=0&&(l=s);l>s&&(l=s),o+=r,l+=r}for(o++;o<l;){var u=o+(l-o>>>1);a(t,e[n+u])<0?l=u:o=u+1}return l}function Gt(t,e){function n(n){var s=a[n],h=o[n],u=a[n+1],c=o[n+1];o[n]=h+c,n===l-3&&(a[n+1]=a[n+2],o[n+1]=o[n+2]),l--;var f=Ht(t[u],t,s,h,0,e);s+=f,0!==(h-=f)&&0!==(c=Wt(t[s+h-1],t,u,c,c-1,e))&&(h<=c?i(s,h,u,c):r(s,h,u,c))}function i(n,i,r,a){var o=0;for(o=0;o<i;o++)h[o]=t[n+o];var l=0,u=r,c=n;if(t[c++]=t[u++],0!=--a)if(1!==i){for(var f,d,p,g=s;;){f=0,d=0,p=!1;do{if(e(t[u],h[l])<0){if(t[c++]=t[u++],d++,f=0,0==--a){p=!0;break}}else if(t[c++]=h[l++],f++,d=0,1==--i){p=!0;break}}while((f|d)<g);if(p)break;do{if(0!==(f=Ht(t[u],h,l,i,0,e))){for(o=0;o<f;o++)t[c+o]=h[l+o];if(c+=f,l+=f,(i-=f)<=1){p=!0;break}}if(t[c++]=t[u++],0==--a){p=!0;break}if(0!==(d=Wt(h[l],t,u,a,0,e))){for(o=0;o<d;o++)t[c+o]=t[u+o];if(c+=d,u+=d,0===(a-=d)){p=!0;break}}if(t[c++]=h[l++],1==--i){p=!0;break}g--}while(f>=Bh||d>=Bh);if(p)break;g<0&&(g=0),g+=2}if((s=g)<1&&(s=1),1===i){for(o=0;o<a;o++)t[c+o]=t[u+o];t[c+a]=h[l]}else{if(0===i)throw new Error;for(o=0;o<i;o++)t[c+o]=h[l+o]}}else{for(o=0;o<a;o++)t[c+o]=t[u+o];t[c+a]=h[l]}else for(o=0;o<i;o++)t[c+o]=h[l+o]}function r(n,i,r,a){var o=0;for(o=0;o<a;o++)h[o]=t[r+o];var l=n+i-1,u=a-1,c=r+a-1,f=0,d=0;if(t[c--]=t[l--],0!=--i)if(1!==a){for(var p=s;;){var g=0,m=0,v=!1;do{if(e(h[u],t[l])<0){if(t[c--]=t[l--],g++,m=0,0==--i){v=!0;break}}else if(t[c--]=h[u--],m++,g=0,1==--a){v=!0;break}}while((g|m)<p);if(v)break;do{if(0!=(g=i-Ht(h[u],t,n,i,i-1,e))){for(i-=g,d=(c-=g)+1,f=(l-=g)+1,o=g-1;o>=0;o--)t[d+o]=t[f+o];if(0===i){v=!0;break}}if(t[c--]=h[u--],1==--a){v=!0;break}if(0!=(m=a-Wt(t[l],h,0,a,a-1,e))){for(a-=m,d=(c-=m)+1,f=(u-=m)+1,o=0;o<m;o++)t[d+o]=h[f+o];if(a<=1){v=!0;break}}if(t[c--]=t[l--],0==--i){v=!0;break}p--}while(g>=Bh||m>=Bh);if(v)break;p<0&&(p=0),p+=2}if((s=p)<1&&(s=1),1===a){for(d=(c-=i)+1,f=(l-=i)+1,o=i-1;o>=0;o--)t[d+o]=t[f+o];t[c]=h[u]}else{if(0===a)throw new Error;for(f=c-(a-1),o=0;o<a;o++)t[f+o]=h[o]}}else{for(d=(c-=i)+1,f=(l-=i)+1,o=i-1;o>=0;o--)t[d+o]=t[f+o];t[c]=h[u]}else for(f=c-(a-1),o=0;o<a;o++)t[f+o]=h[o]}var a,o,s=Bh,l=0,h=[];a=[],o=[],this.mergeRuns=function(){for(;l>1;){var t=l-2;if(t>=1&&o[t-1]<=o[t]+o[t+1]||t>=2&&o[t-2]<=o[t]+o[t-1])o[t-1]<o[t+1]&&t--;else if(o[t]>o[t+1])break;n(t)}},this.forceMergeRuns=function(){for(;l>1;){var t=l-2;t>0&&o[t-1]<o[t+1]&&t--,n(t)}},this.pushRun=function(t,e){a[l]=t,o[l]=e,l+=1}}function qt(t,e,n,i){n||(n=0),i||(i=t.length);var r=i-n;if(!(r<2)){var a=0;if(r<Eh)return a=Nt(t,n,i,e),void Vt(t,n,i,n+a,e);var o=new Gt(t,e),s=zt(r);do{if((a=Nt(t,n,i,e))<s){var l=r;l>s&&(l=s),Vt(t,n,n+l,n+a,e),a=l}o.pushRun(n,a),o.mergeRuns(),r-=a,n+=a}while(0!==r);o.forceMergeRuns()}}function Xt(t,e){return t.zlevel===e.zlevel?t.z===e.z?t.z2-e.z2:t.z-e.z:t.zlevel-e.zlevel}function Zt(t,e,n){var i=null==e.x?0:e.x,r=null==e.x2?1:e.x2,a=null==e.y?0:e.y,o=null==e.y2?0:e.y2;return e.global||(i=i*n.width+n.x,r=r*n.width+n.x,a=a*n.height+n.y,o=o*n.height+n.y),t.createLinearGradient(i,a,r,o)}function Yt(t,e,n){var i=n.width,r=n.height,a=Math.min(i,r),o=null==e.x?.5:e.x,s=null==e.y?.5:e.y,l=null==e.r?.5:e.r;return e.global||(o=o*i+n.x,s=s*r+n.y,l*=a),t.createRadialGradient(o,s,0,o,s,l)}function Ut(){return!1}function jt(t,e,n){var i=$l(),r=e.getWidth(),a=e.getHeight(),o=i.style;return o&&(o.position="absolute",o.left=0,o.top=0,o.width=r+"px",o.height=a+"px",i.setAttribute("data-zr-dom-id",t)),i.width=r*n,i.height=a*n,i}function $t(t){if("string"==typeof t){var e=Yh.get(t);return e&&e.image}return t}function Kt(t,e,n,i,r){if(t){if("string"==typeof t){if(e&&e.__zrImageSrc===t||!n)return e;var a=Yh.get(t),o={hostEl:n,cb:i,cbPayload:r};return a?!Jt(e=a.image)&&a.pending.push(o):(!e&&(e=new Image),e.onload=Qt,Yh.put(t,e.__cachedImgObj={image:e,pending:[o]}),e.src=e.__zrImageSrc=t),e}return t}return e}function Qt(){var t=this.__cachedImgObj;this.onload=this.__cachedImgObj=null;for(var e=0;e<t.pending.length;e++){var n=t.pending[e],i=n.cb;i&&i(this,n.cbPayload),n.hostEl.dirty()}t.pending.length=0}function Jt(t){return t&&t.width&&t.height}function te(t,e){var n=t+":"+(e=e||Qh);if(Uh[n])return Uh[n];for(var i=(t+"").split("\n"),r=0,a=0,o=i.length;a<o;a++)r=Math.max(fe(i[a],e).width,r);return jh>$h&&(jh=0,Uh={}),jh++,Uh[n]=r,r}function ee(t,e,n,i,r,a,o){return a?ie(t,e,n,i,r,a,o):ne(t,e,n,i,r,o)}function ne(t,e,n,i,r,a){var o=de(t,e,r,a),s=te(t,e);r&&(s+=r[1]+r[3]);var l=o.outerHeight,h=new Rt(re(0,s,n),ae(0,l,i),s,l);return h.lineHeight=o.lineHeight,h}function ie(t,e,n,i,r,a,o){var s=pe(t,{rich:a,truncate:o,font:e,textAlign:n,textPadding:r}),l=s.outerWidth,h=s.outerHeight;return new Rt(re(0,l,n),ae(0,h,i),l,h)}function re(t,e,n){return"right"===n?t-=e:"center"===n&&(t-=e/2),t}function ae(t,e,n){return"middle"===n?t-=e/2:"bottom"===n&&(t-=e),t}function oe(t,e,n){var i=e.x,r=e.y,a=e.height,o=e.width,s=a/2,l="left",h="top";switch(t){case"left":i-=n,r+=s,l="right",h="middle";break;case"right":i+=n+o,r+=s,h="middle";break;case"top":i+=o/2,r-=n,l="center",h="bottom";break;case"bottom":i+=o/2,r+=a+n,l="center";break;case"inside":i+=o/2,r+=s,l="center",h="middle";break;case"insideLeft":i+=n,r+=s,h="middle";break;case"insideRight":i+=o-n,r+=s,l="right",h="middle";break;case"insideTop":i+=o/2,r+=n,l="center";break;case"insideBottom":i+=o/2,r+=a-n,l="center",h="bottom";break;case"insideTopLeft":i+=n,r+=n;break;case"insideTopRight":i+=o-n,r+=n,l="right";break;case"insideBottomLeft":i+=n,r+=a-n,h="bottom";break;case"insideBottomRight":i+=o-n,r+=a-n,l="right",h="bottom"}return{x:i,y:r,textAlign:l,textVerticalAlign:h}}function se(t,e,n,i,r){if(!e)return"";var a=(t+"").split("\n");r=le(e,n,i,r);for(var o=0,s=a.length;o<s;o++)a[o]=he(a[o],r);return a.join("\n")}function le(t,e,n,i){(i=a({},i)).font=e;var n=C(n,"...");i.maxIterations=C(i.maxIterations,2);var r=i.minChar=C(i.minChar,0);i.cnCharWidth=te("国",e);var o=i.ascCharWidth=te("a",e);i.placeholder=C(i.placeholder,"");for(var s=t=Math.max(0,t-1),l=0;l<r&&s>=o;l++)s-=o;var h=te(n);return h>s&&(n="",h=0),s=t-h,i.ellipsis=n,i.ellipsisWidth=h,i.contentWidth=s,i.containerWidth=t,i}function he(t,e){var n=e.containerWidth,i=e.font,r=e.contentWidth;if(!n)return"";var a=te(t,i);if(a<=n)return t;for(var o=0;;o++){if(a<=r||o>=e.maxIterations){t+=e.ellipsis;break}var s=0===o?ue(t,r,e.ascCharWidth,e.cnCharWidth):a>0?Math.floor(t.length*r/a):0;a=te(t=t.substr(0,s),i)}return""===t&&(t=e.placeholder),t}function ue(t,e,n,i){for(var r=0,a=0,o=t.length;a<o&&r<e;a++){var s=t.charCodeAt(a);r+=0<=s&&s<=127?n:i}return a}function ce(t){return te("国",t)}function fe(t,e){return Jh.measureText(t,e)}function de(t,e,n,i){null!=t&&(t+="");var r=ce(e),a=t?t.split("\n"):[],o=a.length*r,s=o;if(n&&(s+=n[0]+n[2]),t&&i){var l=i.outerHeight,h=i.outerWidth;if(null!=l&&s>l)t="",a=[];else if(null!=h)for(var u=le(h-(n?n[1]+n[3]:0),e,i.ellipsis,{minChar:i.minChar,placeholder:i.placeholder}),c=0,f=a.length;c<f;c++)a[c]=he(a[c],u)}return{lines:a,height:o,outerHeight:s,lineHeight:r}}function pe(t,e){var n={lines:[],width:0,height:0};if(null!=t&&(t+=""),!t)return n;for(var i,r=Kh.lastIndex=0;null!=(i=Kh.exec(t));){var a=i.index;a>r&&ge(n,t.substring(r,a)),ge(n,i[2],i[1]),r=Kh.lastIndex}r<t.length&&ge(n,t.substring(r,t.length));var o=n.lines,s=0,l=0,h=[],u=e.textPadding,c=e.truncate,f=c&&c.outerWidth,d=c&&c.outerHeight;u&&(null!=f&&(f-=u[1]+u[3]),null!=d&&(d-=u[0]+u[2]));for(A=0;A<o.length;A++){for(var p=o[A],g=0,m=0,v=0;v<p.tokens.length;v++){var y=(L=p.tokens[v]).styleName&&e.rich[L.styleName]||{},_=L.textPadding=y.textPadding,x=L.font=y.font||e.font,w=L.textHeight=C(y.textHeight,ce(x));if(_&&(w+=_[0]+_[2]),L.height=w,L.lineHeight=k(y.textLineHeight,e.textLineHeight,w),L.textAlign=y&&y.textAlign||e.textAlign,L.textVerticalAlign=y&&y.textVerticalAlign||"middle",null!=d&&s+L.lineHeight>d)return{lines:[],width:0,height:0};L.textWidth=te(L.text,x);var b=y.textWidth,S=null==b||"auto"===b;if("string"==typeof b&&"%"===b.charAt(b.length-1))L.percentWidth=b,h.push(L),b=0;else{if(S){b=L.textWidth;var M=y.textBackgroundColor,T=M&&M.image;T&&Jt(T=$t(T))&&(b=Math.max(b,T.width*w/T.height))}var I=_?_[1]+_[3]:0;b+=I;var D=null!=f?f-m:null;null!=D&&D<b&&(!S||D<I?(L.text="",L.textWidth=b=0):(L.text=se(L.text,D-I,x,c.ellipsis,{minChar:c.minChar}),L.textWidth=te(L.text,x),b=L.textWidth+I))}m+=L.width=b,y&&(g=Math.max(g,L.lineHeight))}p.width=m,p.lineHeight=g,s+=g,l=Math.max(l,m)}n.outerWidth=n.width=C(e.textWidth,l),n.outerHeight=n.height=C(e.textHeight,s),u&&(n.outerWidth+=u[1]+u[3],n.outerHeight+=u[0]+u[2]);for(var A=0;A<h.length;A++){var L=h[A],P=L.percentWidth;L.width=parseInt(P,10)/100*l}return n}function ge(t,e,n){for(var i=""===e,r=e.split("\n"),a=t.lines,o=0;o<r.length;o++){var s=r[o],l={styleName:n,text:s,isLineHolder:!s&&!i};if(o)a.push({tokens:[l]});else{var h=(a[a.length-1]||(a[0]={tokens:[]})).tokens,u=h.length;1===u&&h[0].isLineHolder?h[0]=l:(s||!u||i)&&h.push(l)}}}function me(t){var e=(t.fontSize||t.fontFamily)&&[t.fontStyle,t.fontWeight,(t.fontSize||12)+"px",t.fontFamily||"sans-serif"].join(" ");return e&&P(e)||t.textFont||t.font}function ve(t,e){var n,i,r,a,o=e.x,s=e.y,l=e.width,h=e.height,u=e.r;l<0&&(o+=l,l=-l),h<0&&(s+=h,h=-h),"number"==typeof u?n=i=r=a=u:u instanceof Array?1===u.length?n=i=r=a=u[0]:2===u.length?(n=r=u[0],i=a=u[1]):3===u.length?(n=u[0],i=a=u[1],r=u[2]):(n=u[0],i=u[1],r=u[2],a=u[3]):n=i=r=a=0;var c;n+i>l&&(n*=l/(c=n+i),i*=l/c),r+a>l&&(r*=l/(c=r+a),a*=l/c),i+r>h&&(i*=h/(c=i+r),r*=h/c),n+a>h&&(n*=h/(c=n+a),a*=h/c),t.moveTo(o+n,s),t.lineTo(o+l-i,s),0!==i&&t.quadraticCurveTo(o+l,s,o+l,s+i),t.lineTo(o+l,s+h-r),0!==r&&t.quadraticCurveTo(o+l,s+h,o+l-r,s+h),t.lineTo(o+a,s+h),0!==a&&t.quadraticCurveTo(o,s+h,o,s+h-a),t.lineTo(o,s+n),0!==n&&t.quadraticCurveTo(o,s,o+n,s)}function ye(t){return _e(t),f(t.rich,_e),t}function _e(t){if(t){t.font=me(t);var e=t.textAlign;"middle"===e&&(e="center"),t.textAlign=null==e||tu[e]?e:"left";var n=t.textVerticalAlign||t.textBaseline;"center"===n&&(n="middle"),t.textVerticalAlign=null==n||eu[n]?n:"top",t.textPadding&&(t.textPadding=A(t.textPadding))}}function xe(t,e,n,i,r){i.rich?be(t,e,n,i,r):we(t,e,n,i,r)}function we(t,e,n,i,r){var a=Ae(e,"font",i.font||Qh),o=i.textPadding,s=t.__textCotentBlock;s&&!t.__dirty||(s=t.__textCotentBlock=de(n,a,o,i.truncate));var l=s.outerHeight,h=s.lines,u=s.lineHeight,c=De(l,i,r),f=c.baseX,d=c.baseY,p=c.textAlign,g=c.textVerticalAlign;Me(e,i,r,f,d);var m=ae(d,l,g),v=f,y=m,_=Ie(i);if(_||o){var x=te(n,a);o&&(x+=o[1]+o[3]);var w=re(f,x,p);_&&Ce(t,e,i,w,m,x,l),o&&(v=Ee(f,p,o),y+=o[0])}Ae(e,"textAlign",p||"left"),Ae(e,"textBaseline","middle"),Ae(e,"shadowBlur",i.textShadowBlur||0),Ae(e,"shadowColor",i.textShadowColor||"transparent"),Ae(e,"shadowOffsetX",i.textShadowOffsetX||0),Ae(e,"shadowOffsetY",i.textShadowOffsetY||0),y+=u/2;var b=i.textStrokeWidth,S=Le(i.textStroke,b),M=Pe(i.textFill);S&&(Ae(e,"lineWidth",b),Ae(e,"strokeStyle",S)),M&&Ae(e,"fillStyle",M);for(var T=0;T<h.length;T++)S&&e.strokeText(h[T],v,y),M&&e.fillText(h[T],v,y),y+=u}function be(t,e,n,i,r){var a=t.__textCotentBlock;a&&!t.__dirty||(a=t.__textCotentBlock=pe(n,i)),Se(t,e,a,i,r)}function Se(t,e,n,i,r){var a=n.width,o=n.outerWidth,s=n.outerHeight,l=i.textPadding,h=De(s,i,r),u=h.baseX,c=h.baseY,f=h.textAlign,d=h.textVerticalAlign;Me(e,i,r,u,c);var p=re(u,o,f),g=ae(c,s,d),m=p,v=g;l&&(m+=l[3],v+=l[0]);var y=m+a;Ie(i)&&Ce(t,e,i,p,g,o,s);for(var _=0;_<n.lines.length;_++){for(var x,w=n.lines[_],b=w.tokens,S=b.length,M=w.lineHeight,T=w.width,I=0,C=m,k=y,D=S-1;I<S&&(!(x=b[I]).textAlign||"left"===x.textAlign);)Te(t,e,x,i,M,v,C,"left"),T-=x.width,C+=x.width,I++;for(;D>=0&&"right"===(x=b[D]).textAlign;)Te(t,e,x,i,M,v,k,"right"),T-=x.width,k-=x.width,D--;for(C+=(a-(C-m)-(y-k)-T)/2;I<=D;)Te(t,e,x=b[I],i,M,v,C+x.width/2,"center"),C+=x.width,I++;v+=M}}function Me(t,e,n,i,r){if(n&&e.textRotation){var a=e.textOrigin;"center"===a?(i=n.width/2+n.x,r=n.height/2+n.y):a&&(i=a[0]+n.x,r=a[1]+n.y),t.translate(i,r),t.rotate(-e.textRotation),t.translate(-i,-r)}}function Te(t,e,n,i,r,a,o,s){var l=i.rich[n.styleName]||{},h=n.textVerticalAlign,u=a+r/2;"top"===h?u=a+n.height/2:"bottom"===h&&(u=a+r-n.height/2),!n.isLineHolder&&Ie(l)&&Ce(t,e,l,"right"===s?o-n.width:"center"===s?o-n.width/2:o,u-n.height/2,n.width,n.height);var c=n.textPadding;c&&(o=Ee(o,s,c),u-=n.height/2-c[2]-n.textHeight/2),Ae(e,"shadowBlur",k(l.textShadowBlur,i.textShadowBlur,0)),Ae(e,"shadowColor",l.textShadowColor||i.textShadowColor||"transparent"),Ae(e,"shadowOffsetX",k(l.textShadowOffsetX,i.textShadowOffsetX,0)),Ae(e,"shadowOffsetY",k(l.textShadowOffsetY,i.textShadowOffsetY,0)),Ae(e,"textAlign",s),Ae(e,"textBaseline","middle"),Ae(e,"font",n.font||Qh);var f=Le(l.textStroke||i.textStroke,p),d=Pe(l.textFill||i.textFill),p=C(l.textStrokeWidth,i.textStrokeWidth);f&&(Ae(e,"lineWidth",p),Ae(e,"strokeStyle",f),e.strokeText(n.text,o,u)),d&&(Ae(e,"fillStyle",d),e.fillText(n.text,o,u))}function Ie(t){return t.textBackgroundColor||t.textBorderWidth&&t.textBorderColor}function Ce(t,e,n,i,r,a,o){var s=n.textBackgroundColor,l=n.textBorderWidth,h=n.textBorderColor,u=x(s);if(Ae(e,"shadowBlur",n.textBoxShadowBlur||0),Ae(e,"shadowColor",n.textBoxShadowColor||"transparent"),Ae(e,"shadowOffsetX",n.textBoxShadowOffsetX||0),Ae(e,"shadowOffsetY",n.textBoxShadowOffsetY||0),u||l&&h){e.beginPath();var c=n.textBorderRadius;c?ve(e,{x:i,y:r,width:a,height:o,r:c}):e.rect(i,r,a,o),e.closePath()}if(u)Ae(e,"fillStyle",s),e.fill();else if(w(s)){var f=s.image;(f=Kt(f,null,t,ke,s))&&Jt(f)&&e.drawImage(f,i,r,a,o)}l&&h&&(Ae(e,"lineWidth",l),Ae(e,"strokeStyle",h),e.stroke())}function ke(t,e){e.image=t}function De(t,e,n){var i=e.x||0,r=e.y||0,a=e.textAlign,o=e.textVerticalAlign;if(n){var s=e.textPosition;if(s instanceof Array)i=n.x+Oe(s[0],n.width),r=n.y+Oe(s[1],n.height);else{var l=oe(s,n,e.textDistance);i=l.x,r=l.y,a=a||l.textAlign,o=o||l.textVerticalAlign}var h=e.textOffset;h&&(i+=h[0],r+=h[1])}return{baseX:i,baseY:r,textAlign:a,textVerticalAlign:o}}function Ae(t,e,n){return t[e]=Nh(t,e,n),t[e]}function Le(t,e){return null==t||e<=0||"transparent"===t||"none"===t?null:t.image||t.colorStops?"#000":t}function Pe(t){return null==t||"none"===t?null:t.image||t.colorStops?"#000":t}function Oe(t,e){return"string"==typeof t?t.lastIndexOf("%")>=0?parseFloat(t)/100*e:parseFloat(t):t}function Ee(t,e,n){return"right"===e?t-n[1]:"center"===e?t+n[3]/2-n[1]/2:t+n[3]}function Be(t,e){return null!=t&&(t||e.textBackgroundColor||e.textBorderWidth&&e.textBorderColor||e.textPadding)}function Re(t){t=t||{},Dh.call(this,t);for(var e in t)t.hasOwnProperty(e)&&"style"!==e&&(this[e]=t[e]);this.style=new Vh(t.style,this),this._rect=null,this.__clipPaths=[]}function ze(t){Re.call(this,t)}function Ne(t){return parseInt(t,10)}function Fe(t){return!!t&&(!!t.__builtin__||"function"==typeof t.resize&&"function"==typeof t.refresh)}function Ve(t,e,n){return ru.copy(t.getBoundingRect()),t.transform&&ru.applyTransform(t.transform),au.width=e,au.height=n,!ru.intersect(au)}function We(t,e){if(t==e)return!1;if(!t||!e||t.length!==e.length)return!0;for(var n=0;n<t.length;n++)if(t[n]!==e[n])return!0}function He(t,e){for(var n=0;n<t.length;n++){var i=t[n];i.setTransform(e),e.beginPath(),i.buildPath(e,i.shape),e.clip(),i.restoreTransform(e)}}function Ge(t,e){var n=document.createElement("div");return n.style.cssText=["position:relative","overflow:hidden","width:"+t+"px","height:"+e+"px","padding:0","margin:0","border-width:0"].join(";")+";",n}function qe(t){return t.getBoundingClientRect?t.getBoundingClientRect():{left:0,top:0}}function Xe(t,e,n,i){return n=n||{},i||!Fl.canvasSupported?Ze(t,e,n):Fl.browser.firefox&&null!=e.layerX&&e.layerX!==e.offsetX?(n.zrX=e.layerX,n.zrY=e.layerY):null!=e.offsetX?(n.zrX=e.offsetX,n.zrY=e.offsetY):Ze(t,e,n),n}function Ze(t,e,n){var i=qe(t);n.zrX=e.clientX-i.left,n.zrY=e.clientY-i.top}function Ye(t,e,n){if(null!=(e=e||window.event).zrX)return e;var i=e.type;if(i&&i.indexOf("touch")>=0){var r="touchend"!=i?e.targetTouches[0]:e.changedTouches[0];r&&Xe(t,r,e,n)}else Xe(t,e,e,n),e.zrDelta=e.wheelDelta?e.wheelDelta/120:-(e.detail||0)/3;var a=e.button;return null==e.which&&void 0!==a&&lu.test(e.type)&&(e.which=1&a?1:2&a?3:4&a?2:0),e}function Ue(t,e,n){su?t.addEventListener(e,n):t.attachEvent("on"+e,n)}function je(t,e,n){su?t.removeEventListener(e,n):t.detachEvent("on"+e,n)}function $e(t){var e=t[1][0]-t[0][0],n=t[1][1]-t[0][1];return Math.sqrt(e*e+n*n)}function Ke(t){return[(t[0][0]+t[1][0])/2,(t[0][1]+t[1][1])/2]}function Qe(t){return"mousewheel"===t&&Fl.browser.firefox?"DOMMouseScroll":t}function Je(t,e,n){var i=t._gestureMgr;"start"===n&&i.clear();var r=i.recognize(e,t.handler.findHover(e.zrX,e.zrY,null).target,t.dom);if("end"===n&&i.clear(),r){var a=r.type;e.gestureEvent=a,t.handler.dispatchToElement({target:r.target},a,r.event)}}function tn(t){t._touching=!0,clearTimeout(t._touchTimer),t._touchTimer=setTimeout(function(){t._touching=!1},700)}function en(t){var e=t.pointerType;return"pen"===e||"touch"===e}function nn(t){function e(t,e){return function(){if(!e._touching)return t.apply(e,arguments)}}f(du,function(e){t._handlers[e]=m(mu[e],t)}),f(gu,function(e){t._handlers[e]=m(mu[e],t)}),f(fu,function(n){t._handlers[n]=e(mu[n],t)})}function rn(t){function e(e,n){f(e,function(e){Ue(t,Qe(e),n._handlers[e])},n)}ih.call(this),this.dom=t,this._touching=!1,this._touchTimer,this._gestureMgr=new uu,this._handlers={},nn(this),Fl.pointerEventsSupported?e(gu,this):(Fl.touchEventsSupported&&e(du,this),e(fu,this))}function an(t,e){return new xu(zl(),t,e)}function on(t){return t instanceof Array?t:null==t?[]:[t]}function sn(t,e,n){if(t){t[e]=t[e]||{},t.emphasis=t.emphasis||{},t.emphasis[e]=t.emphasis[e]||{};for(var i=0,r=n.length;i<r;i++){var a=n[i];!t.emphasis[e].hasOwnProperty(a)&&t[e].hasOwnProperty(a)&&(t.emphasis[e][a]=t[e][a])}}}function ln(t){return!bu(t)||Su(t)||t instanceof Date?t:t.value}function hn(t){return bu(t)&&!(t instanceof Array)}function un(t,e){e=(e||[]).slice();var n=d(t||[],function(t,e){return{exist:t}});return wu(e,function(t,i){if(bu(t)){for(r=0;r<n.length;r++)if(!n[r].option&&null!=t.id&&n[r].exist.id===t.id+"")return n[r].option=t,void(e[i]=null);for(var r=0;r<n.length;r++){var a=n[r].exist;if(!(n[r].option||null!=a.id&&null!=t.id||null==t.name||fn(t)||fn(a)||a.name!==t.name+""))return n[r].option=t,void(e[i]=null)}}}),wu(e,function(t,e){if(bu(t)){for(var i=0;i<n.length;i++){var r=n[i].exist;if(!n[i].option&&!fn(r)&&null==t.id){n[i].option=t;break}}i>=n.length&&n.push({option:t})}}),n}function cn(t){var e=R();wu(t,function(t,n){var i=t.exist;i&&e.set(i.id,t)}),wu(t,function(t,n){var i=t.option;L(!i||null==i.id||!e.get(i.id)||e.get(i.id)===t,"id duplicates: "+(i&&i.id)),i&&null!=i.id&&e.set(i.id,t),!t.keyInfo&&(t.keyInfo={})}),wu(t,function(t,n){var i=t.exist,r=t.option,a=t.keyInfo;if(bu(r)){if(a.name=null!=r.name?r.name+"":i?i.name:Mu,i)a.id=i.id;else if(null!=r.id)a.id=r.id+"";else{var o=0;do{a.id="\0"+a.name+"\0"+o++}while(e.get(a.id))}e.set(a.id,t)}})}function fn(t){return bu(t)&&t.id&&0===(t.id+"").indexOf("\0_ec_\0")}function dn(t,e){return null!=e.dataIndexInside?e.dataIndexInside:null!=e.dataIndex?y(e.dataIndex)?d(e.dataIndex,function(e){return t.indexOfRawIndex(e)}):t.indexOfRawIndex(e.dataIndex):null!=e.name?y(e.name)?d(e.name,function(e){return t.indexOfName(e)}):t.indexOfName(e.name):void 0}function pn(){var t="__\0ec_inner_"+Iu+++"_"+Math.random().toFixed(5);return function(e){return e[t]||(e[t]={})}}function gn(t,e,n){if(x(e)){var i={};i[e+"Index"]=0,e=i}var r=n&&n.defaultMainType;!r||mn(e,r+"Index")||mn(e,r+"Id")||mn(e,r+"Name")||(e[r+"Index"]=0);var a={};return wu(e,function(i,r){var i=e[r];if("dataIndex"!==r&&"dataIndexInside"!==r){var o=r.match(/^(\w+)(Index|Id|Name)$/)||[],s=o[1],h=(o[2]||"").toLowerCase();if(!(!s||!h||null==i||"index"===h&&"none"===i||n&&n.includeMainTypes&&l(n.includeMainTypes,s)<0)){var u={mainType:s};"index"===h&&"all"===i||(u[h]=i);var c=t.queryComponents(u);a[s+"Models"]=c,a[s+"Model"]=c[0]}}else a[r]=i}),a}function mn(t,e){return t&&t.hasOwnProperty(e)}function vn(t,e,n){t.setAttribute?t.setAttribute(e,n):t[e]=n}function yn(t,e){return t.getAttribute?t.getAttribute(e):t[e]}function _n(t){var e={main:"",sub:""};return t&&(t=t.split(Cu),e.main=t[0]||"",e.sub=t[1]||""),e}function xn(t){L(/^[a-zA-Z0-9_]+([.][a-zA-Z0-9_]+)?$/.test(t),'componentType "'+t+'" illegal')}function wn(t,e){t.$constructor=t,t.extend=function(t){var e=this,n=function(){t.$constructor?t.$constructor.apply(this,arguments):e.apply(this,arguments)};return a(n.prototype,t),n.extend=this.extend,n.superCall=Sn,n.superApply=Mn,h(n,this),n.superClass=e,n}}function bn(t){var e=["__\0is_clz",Du++,Math.random().toFixed(3)].join("_");t.prototype[e]=!0,t.isInstance=function(t){return!(!t||!t[e])}}function Sn(t,e){var n=D(arguments,2);return this.superClass.prototype[e].apply(t,n)}function Mn(t,e,n){return this.superClass.prototype[e].apply(t,n)}function Tn(t,e){function n(t){var e=i[t.main];return e&&e[ku]||((e=i[t.main]={})[ku]=!0),e}e=e||{};var i={};if(t.registerClass=function(t,e){return e&&(xn(e),(e=_n(e)).sub?e.sub!==ku&&(n(e)[e.sub]=t):i[e.main]=t),t},t.getClass=function(t,e,n){var r=i[t];if(r&&r[ku]&&(r=e?r[e]:null),n&&!r)throw new Error(e?"Component "+t+"."+(e||"")+" not exists. Load it first.":t+".type should be specified.");return r},t.getClassesByMainType=function(t){t=_n(t);var e=[],n=i[t.main];return n&&n[ku]?f(n,function(t,n){n!==ku&&e.push(t)}):e.push(n),e},t.hasClass=function(t){return t=_n(t),!!i[t.main]},t.getAllClassMainTypes=function(){var t=[];return f(i,function(e,n){t.push(n)}),t},t.hasSubTypes=function(t){t=_n(t);var e=i[t.main];return e&&e[ku]},t.parseClassType=_n,e.registerWhenExtend){var r=t.extend;r&&(t.extend=function(e){var n=r.call(this,e);return t.registerClass(n,e.type)})}return t}function In(t){return t>-zu&&t<zu}function Cn(t){return t>zu||t<-zu}function kn(t,e,n,i,r){var a=1-r;return a*a*(a*t+3*r*e)+r*r*(r*i+3*a*n)}function Dn(t,e,n,i,r){var a=1-r;return 3*(((e-t)*a+2*(n-e)*r)*a+(i-n)*r*r)}function An(t,e,n,i,r,a){var o=i+3*(e-n)-t,s=3*(n-2*e+t),l=3*(e-t),h=t-r,u=s*s-3*o*l,c=s*l-9*o*h,f=l*l-3*s*h,d=0;if(In(u)&&In(c))In(s)?a[0]=0:(M=-l/s)>=0&&M<=1&&(a[d++]=M);else{var p=c*c-4*u*f;if(In(p)){var g=c/u,m=-g/2;(M=-s/o+g)>=0&&M<=1&&(a[d++]=M),m>=0&&m<=1&&(a[d++]=m)}else if(p>0){var v=Ru(p),y=u*s+1.5*o*(-c+v),_=u*s+1.5*o*(-c-v);(M=(-s-((y=y<0?-Bu(-y,Vu):Bu(y,Vu))+(_=_<0?-Bu(-_,Vu):Bu(_,Vu))))/(3*o))>=0&&M<=1&&(a[d++]=M)}else{var x=(2*u*s-3*o*c)/(2*Ru(u*u*u)),w=Math.acos(x)/3,b=Ru(u),S=Math.cos(w),M=(-s-2*b*S)/(3*o),m=(-s+b*(S+Fu*Math.sin(w)))/(3*o),T=(-s+b*(S-Fu*Math.sin(w)))/(3*o);M>=0&&M<=1&&(a[d++]=M),m>=0&&m<=1&&(a[d++]=m),T>=0&&T<=1&&(a[d++]=T)}}return d}function Ln(t,e,n,i,r){var a=6*n-12*e+6*t,o=9*e+3*i-3*t-9*n,s=3*e-3*t,l=0;if(In(o))Cn(a)&&(c=-s/a)>=0&&c<=1&&(r[l++]=c);else{var h=a*a-4*o*s;if(In(h))r[0]=-a/(2*o);else if(h>0){var u=Ru(h),c=(-a+u)/(2*o),f=(-a-u)/(2*o);c>=0&&c<=1&&(r[l++]=c),f>=0&&f<=1&&(r[l++]=f)}}return l}function Pn(t,e,n,i,r,a){var o=(e-t)*r+t,s=(n-e)*r+e,l=(i-n)*r+n,h=(s-o)*r+o,u=(l-s)*r+s,c=(u-h)*r+h;a[0]=t,a[1]=o,a[2]=h,a[3]=c,a[4]=c,a[5]=u,a[6]=l,a[7]=i}function On(t,e,n,i,r,a,o,s,l,h,u){var c,f,d,p,g,m=.005,v=1/0;Wu[0]=l,Wu[1]=h;for(var y=0;y<1;y+=.05)Hu[0]=kn(t,n,r,o,y),Hu[1]=kn(e,i,a,s,y),(p=eh(Wu,Hu))<v&&(c=y,v=p);v=1/0;for(var _=0;_<32&&!(m<Nu);_++)f=c-m,d=c+m,Hu[0]=kn(t,n,r,o,f),Hu[1]=kn(e,i,a,s,f),p=eh(Hu,Wu),f>=0&&p<v?(c=f,v=p):(Gu[0]=kn(t,n,r,o,d),Gu[1]=kn(e,i,a,s,d),g=eh(Gu,Wu),d<=1&&g<v?(c=d,v=g):m*=.5);return u&&(u[0]=kn(t,n,r,o,c),u[1]=kn(e,i,a,s,c)),Ru(v)}function En(t,e,n,i){var r=1-i;return r*(r*t+2*i*e)+i*i*n}function Bn(t,e,n,i){return 2*((1-i)*(e-t)+i*(n-e))}function Rn(t,e,n,i,r){var a=t-2*e+n,o=2*(e-t),s=t-i,l=0;if(In(a))Cn(o)&&(c=-s/o)>=0&&c<=1&&(r[l++]=c);else{var h=o*o-4*a*s;if(In(h))(c=-o/(2*a))>=0&&c<=1&&(r[l++]=c);else if(h>0){var u=Ru(h),c=(-o+u)/(2*a),f=(-o-u)/(2*a);c>=0&&c<=1&&(r[l++]=c),f>=0&&f<=1&&(r[l++]=f)}}return l}function zn(t,e,n){var i=t+n-2*e;return 0===i?.5:(t-e)/i}function Nn(t,e,n,i,r){var a=(e-t)*i+t,o=(n-e)*i+e,s=(o-a)*i+a;r[0]=t,r[1]=a,r[2]=s,r[3]=s,r[4]=o,r[5]=n}function Fn(t,e,n,i,r,a,o,s,l){var h,u=.005,c=1/0;Wu[0]=o,Wu[1]=s;for(var f=0;f<1;f+=.05)Hu[0]=En(t,n,r,f),Hu[1]=En(e,i,a,f),(m=eh(Wu,Hu))<c&&(h=f,c=m);c=1/0;for(var d=0;d<32&&!(u<Nu);d++){var p=h-u,g=h+u;Hu[0]=En(t,n,r,p),Hu[1]=En(e,i,a,p);var m=eh(Hu,Wu);if(p>=0&&m<c)h=p,c=m;else{Gu[0]=En(t,n,r,g),Gu[1]=En(e,i,a,g);var v=eh(Gu,Wu);g<=1&&v<c?(h=g,c=v):u*=.5}}return l&&(l[0]=En(t,n,r,h),l[1]=En(e,i,a,h)),Ru(c)}function Vn(t,e,n,i,r,a){r[0]=qu(t,n),r[1]=qu(e,i),a[0]=Xu(t,n),a[1]=Xu(e,i)}function Wn(t,e,n,i,r,a,o,s,l,h){var u,c=Ln,f=kn,d=c(t,n,r,o,Qu);for(l[0]=1/0,l[1]=1/0,h[0]=-1/0,h[1]=-1/0,u=0;u<d;u++){var p=f(t,n,r,o,Qu[u]);l[0]=qu(p,l[0]),h[0]=Xu(p,h[0])}for(d=c(e,i,a,s,Ju),u=0;u<d;u++){var g=f(e,i,a,s,Ju[u]);l[1]=qu(g,l[1]),h[1]=Xu(g,h[1])}l[0]=qu(t,l[0]),h[0]=Xu(t,h[0]),l[0]=qu(o,l[0]),h[0]=Xu(o,h[0]),l[1]=qu(e,l[1]),h[1]=Xu(e,h[1]),l[1]=qu(s,l[1]),h[1]=Xu(s,h[1])}function Hn(t,e,n,i,r,a,o,s){var l=zn,h=En,u=Xu(qu(l(t,n,r),1),0),c=Xu(qu(l(e,i,a),1),0),f=h(t,n,r,u),d=h(e,i,a,c);o[0]=qu(t,r,f),o[1]=qu(e,a,d),s[0]=Xu(t,r,f),s[1]=Xu(e,a,d)}function Gn(t,e,n,i,r,a,o,s,l){var h=U,u=j,c=Math.abs(r-a);if(c%Uu<1e-4&&c>1e-4)return s[0]=t-n,s[1]=e-i,l[0]=t+n,void(l[1]=e+i);if(ju[0]=Yu(r)*n+t,ju[1]=Zu(r)*i+e,$u[0]=Yu(a)*n+t,$u[1]=Zu(a)*i+e,h(s,ju,$u),u(l,ju,$u),(r%=Uu)<0&&(r+=Uu),(a%=Uu)<0&&(a+=Uu),r>a&&!o?a+=Uu:r<a&&o&&(r+=Uu),o){var f=a;a=r,r=f}for(var d=0;d<a;d+=Math.PI/2)d>r&&(Ku[0]=Yu(d)*n+t,Ku[1]=Zu(d)*i+e,h(s,Ku,s),u(l,Ku,l))}function qn(t,e,n,i,r,a,o){if(0===r)return!1;var s=r,l=0,h=t;if(o>e+s&&o>i+s||o<e-s&&o<i-s||a>t+s&&a>n+s||a<t-s&&a<n-s)return!1;if(t===n)return Math.abs(a-t)<=s/2;var u=(l=(e-i)/(t-n))*a-o+(h=(t*i-n*e)/(t-n));return u*u/(l*l+1)<=s/2*s/2}function Xn(t,e,n,i,r,a,o,s,l,h,u){if(0===l)return!1;var c=l;return!(u>e+c&&u>i+c&&u>a+c&&u>s+c||u<e-c&&u<i-c&&u<a-c&&u<s-c||h>t+c&&h>n+c&&h>r+c&&h>o+c||h<t-c&&h<n-c&&h<r-c&&h<o-c)&&On(t,e,n,i,r,a,o,s,h,u,null)<=c/2}function Zn(t,e,n,i,r,a,o,s,l){if(0===o)return!1;var h=o;return!(l>e+h&&l>i+h&&l>a+h||l<e-h&&l<i-h&&l<a-h||s>t+h&&s>n+h&&s>r+h||s<t-h&&s<n-h&&s<r-h)&&Fn(t,e,n,i,r,a,s,l,null)<=h/2}function Yn(t){return(t%=dc)<0&&(t+=dc),t}function Un(t,e,n,i,r,a,o,s,l){if(0===o)return!1;var h=o;s-=t,l-=e;var u=Math.sqrt(s*s+l*l);if(u-h>n||u+h<n)return!1;if(Math.abs(i-r)%pc<1e-4)return!0;if(a){var c=i;i=Yn(r),r=Yn(c)}else i=Yn(i),r=Yn(r);i>r&&(r+=pc);var f=Math.atan2(l,s);return f<0&&(f+=pc),f>=i&&f<=r||f+pc>=i&&f+pc<=r}function jn(t,e,n,i,r,a){if(a>e&&a>i||a<e&&a<i)return 0;if(i===e)return 0;var o=i<e?1:-1,s=(a-e)/(i-e);return 1!==s&&0!==s||(o=i<e?.5:-.5),s*(n-t)+t>r?o:0}function $n(t,e){return Math.abs(t-e)<vc}function Kn(){var t=_c[0];_c[0]=_c[1],_c[1]=t}function Qn(t,e,n,i,r,a,o,s,l,h){if(h>e&&h>i&&h>a&&h>s||h<e&&h<i&&h<a&&h<s)return 0;var u=An(e,i,a,s,h,yc);if(0===u)return 0;for(var c,f,d=0,p=-1,g=0;g<u;g++){var m=yc[g],v=0===m||1===m?.5:1;kn(t,n,r,o,m)<l||(p<0&&(p=Ln(e,i,a,s,_c),_c[1]<_c[0]&&p>1&&Kn(),c=kn(e,i,a,s,_c[0]),p>1&&(f=kn(e,i,a,s,_c[1]))),2==p?m<_c[0]?d+=c<e?v:-v:m<_c[1]?d+=f<c?v:-v:d+=s<f?v:-v:m<_c[0]?d+=c<e?v:-v:d+=s<c?v:-v)}return d}function Jn(t,e,n,i,r,a,o,s){if(s>e&&s>i&&s>a||s<e&&s<i&&s<a)return 0;var l=Rn(e,i,a,s,yc);if(0===l)return 0;var h=zn(e,i,a);if(h>=0&&h<=1){for(var u=0,c=En(e,i,a,h),f=0;f<l;f++){d=0===yc[f]||1===yc[f]?.5:1;(p=En(t,n,r,yc[f]))<o||(yc[f]<h?u+=c<e?d:-d:u+=a<c?d:-d)}return u}var d=0===yc[0]||1===yc[0]?.5:1,p=En(t,n,r,yc[0]);return p<o?0:a<e?d:-d}function ti(t,e,n,i,r,a,o,s){if((s-=e)>n||s<-n)return 0;h=Math.sqrt(n*n-s*s);yc[0]=-h,yc[1]=h;var l=Math.abs(i-r);if(l<1e-4)return 0;if(l%mc<1e-4){i=0,r=mc;p=a?1:-1;return o>=yc[0]+t&&o<=yc[1]+t?p:0}if(a){var h=i;i=Yn(r),r=Yn(h)}else i=Yn(i),r=Yn(r);i>r&&(r+=mc);for(var u=0,c=0;c<2;c++){var f=yc[c];if(f+t>o){var d=Math.atan2(s,f),p=a?1:-1;d<0&&(d=mc+d),(d>=i&&d<=r||d+mc>=i&&d+mc<=r)&&(d>Math.PI/2&&d<1.5*Math.PI&&(p=-p),u+=p)}}return u}function ei(t,e,n,i,r){for(var a=0,o=0,s=0,l=0,h=0,u=0;u<t.length;){var c=t[u++];switch(c===gc.M&&u>1&&(n||(a+=jn(o,s,l,h,i,r))),1==u&&(l=o=t[u],h=s=t[u+1]),c){case gc.M:o=l=t[u++],s=h=t[u++];break;case gc.L:if(n){if(qn(o,s,t[u],t[u+1],e,i,r))return!0}else a+=jn(o,s,t[u],t[u+1],i,r)||0;o=t[u++],s=t[u++];break;case gc.C:if(n){if(Xn(o,s,t[u++],t[u++],t[u++],t[u++],t[u],t[u+1],e,i,r))return!0}else a+=Qn(o,s,t[u++],t[u++],t[u++],t[u++],t[u],t[u+1],i,r)||0;o=t[u++],s=t[u++];break;case gc.Q:if(n){if(Zn(o,s,t[u++],t[u++],t[u],t[u+1],e,i,r))return!0}else a+=Jn(o,s,t[u++],t[u++],t[u],t[u+1],i,r)||0;o=t[u++],s=t[u++];break;case gc.A:var f=t[u++],d=t[u++],p=t[u++],g=t[u++],m=t[u++],v=t[u++],y=(t[u++],1-t[u++]),_=Math.cos(m)*p+f,x=Math.sin(m)*g+d;u>1?a+=jn(o,s,_,x,i,r):(l=_,h=x);var w=(i-f)*g/p+f;if(n){if(Un(f,d,g,m,m+v,y,e,w,r))return!0}else a+=ti(f,d,g,m,m+v,y,w,r);o=Math.cos(m+v)*p+f,s=Math.sin(m+v)*g+d;break;case gc.R:l=o=t[u++],h=s=t[u++];var _=l+t[u++],x=h+t[u++];if(n){if(qn(l,h,_,h,e,i,r)||qn(_,h,_,x,e,i,r)||qn(_,x,l,x,e,i,r)||qn(l,x,l,h,e,i,r))return!0}else a+=jn(_,h,_,x,i,r),a+=jn(l,x,l,h,i,r);break;case gc.Z:if(n){if(qn(o,s,l,h,e,i,r))return!0}else a+=jn(o,s,l,h,i,r);o=l,s=h}}return n||$n(s,h)||(a+=jn(o,s,l,h,i,r)||0),0!==a}function ni(t,e,n){return ei(t,0,!1,e,n)}function ii(t,e,n,i){return ei(t,e,!0,n,i)}function ri(t){Re.call(this,t),this.path=null}function ai(t,e,n,i,r,a,o,s,l,h,u){var c=l*(Pc/180),f=Lc(c)*(t-n)/2+Ac(c)*(e-i)/2,d=-1*Ac(c)*(t-n)/2+Lc(c)*(e-i)/2,p=f*f/(o*o)+d*d/(s*s);p>1&&(o*=Dc(p),s*=Dc(p));var g=(r===a?-1:1)*Dc((o*o*(s*s)-o*o*(d*d)-s*s*(f*f))/(o*o*(d*d)+s*s*(f*f)))||0,m=g*o*d/s,v=g*-s*f/o,y=(t+n)/2+Lc(c)*m-Ac(c)*v,_=(e+i)/2+Ac(c)*m+Lc(c)*v,x=Bc([1,0],[(f-m)/o,(d-v)/s]),w=[(f-m)/o,(d-v)/s],b=[(-1*f-m)/o,(-1*d-v)/s],S=Bc(w,b);Ec(w,b)<=-1&&(S=Pc),Ec(w,b)>=1&&(S=0),0===a&&S>0&&(S-=2*Pc),1===a&&S<0&&(S+=2*Pc),u.addData(h,y,_,o,s,x,S,c,a)}function oi(t){if(!t)return[];var e,n=t.replace(/-/g," -").replace(/ /g," ").replace(/ /g,",").replace(/,,/g,",");for(e=0;e<kc.length;e++)n=n.replace(new RegExp(kc[e],"g"),"|"+kc[e]);var i,r=n.split("|"),a=0,o=0,s=new fc,l=fc.CMD;for(e=1;e<r.length;e++){var h,u=r[e],c=u.charAt(0),f=0,d=u.slice(1).replace(/e,-/g,"e-").split(",");d.length>0&&""===d[0]&&d.shift();for(var p=0;p<d.length;p++)d[p]=parseFloat(d[p]);for(;f<d.length&&!isNaN(d[f])&&!isNaN(d[0]);){var g,m,v,y,_,x,w,b=a,S=o;switch(c){case"l":a+=d[f++],o+=d[f++],h=l.L,s.addData(h,a,o);break;case"L":a=d[f++],o=d[f++],h=l.L,s.addData(h,a,o);break;case"m":a+=d[f++],o+=d[f++],h=l.M,s.addData(h,a,o),c="l";break;case"M":a=d[f++],o=d[f++],h=l.M,s.addData(h,a,o),c="L";break;case"h":a+=d[f++],h=l.L,s.addData(h,a,o);break;case"H":a=d[f++],h=l.L,s.addData(h,a,o);break;case"v":o+=d[f++],h=l.L,s.addData(h,a,o);break;case"V":o=d[f++],h=l.L,s.addData(h,a,o);break;case"C":h=l.C,s.addData(h,d[f++],d[f++],d[f++],d[f++],d[f++],d[f++]),a=d[f-2],o=d[f-1];break;case"c":h=l.C,s.addData(h,d[f++]+a,d[f++]+o,d[f++]+a,d[f++]+o,d[f++]+a,d[f++]+o),a+=d[f-2],o+=d[f-1];break;case"S":g=a,m=o;var M=s.len(),T=s.data;i===l.C&&(g+=a-T[M-4],m+=o-T[M-3]),h=l.C,b=d[f++],S=d[f++],a=d[f++],o=d[f++],s.addData(h,g,m,b,S,a,o);break;case"s":g=a,m=o;var M=s.len(),T=s.data;i===l.C&&(g+=a-T[M-4],m+=o-T[M-3]),h=l.C,b=a+d[f++],S=o+d[f++],a+=d[f++],o+=d[f++],s.addData(h,g,m,b,S,a,o);break;case"Q":b=d[f++],S=d[f++],a=d[f++],o=d[f++],h=l.Q,s.addData(h,b,S,a,o);break;case"q":b=d[f++]+a,S=d[f++]+o,a+=d[f++],o+=d[f++],h=l.Q,s.addData(h,b,S,a,o);break;case"T":g=a,m=o;var M=s.len(),T=s.data;i===l.Q&&(g+=a-T[M-4],m+=o-T[M-3]),a=d[f++],o=d[f++],h=l.Q,s.addData(h,g,m,a,o);break;case"t":g=a,m=o;var M=s.len(),T=s.data;i===l.Q&&(g+=a-T[M-4],m+=o-T[M-3]),a+=d[f++],o+=d[f++],h=l.Q,s.addData(h,g,m,a,o);break;case"A":v=d[f++],y=d[f++],_=d[f++],x=d[f++],w=d[f++],ai(b=a,S=o,a=d[f++],o=d[f++],x,w,v,y,_,h=l.A,s);break;case"a":v=d[f++],y=d[f++],_=d[f++],x=d[f++],w=d[f++],ai(b=a,S=o,a+=d[f++],o+=d[f++],x,w,v,y,_,h=l.A,s)}}"z"!==c&&"Z"!==c||(h=l.Z,s.addData(h)),i=h}return s.toStatic(),s}function si(t,e){var n=oi(t);return e=e||{},e.buildPath=function(t){if(t.setData)t.setData(n.data),(e=t.getContext())&&t.rebuildPath(e);else{var e=t;n.rebuildPath(e)}},e.applyTransform=function(t){Cc(n,t),this.dirty(!0)},e}function li(t,e){return new ri(si(t,e))}function hi(t,e){return ri.extend(si(t,e))}function ui(t,e,n,i,r,a,o){var s=.5*(n-t),l=.5*(i-e);return(2*(e-n)+s+l)*o+(-3*(e-n)-2*s-l)*a+s*r+e}function ci(t,e,n){var i=e.points,r=e.smooth;if(i&&i.length>=2){if(r&&"spline"!==r){var a=Gc(i,r,n,e.smoothConstraint);t.moveTo(i[0][0],i[0][1]);for(var o=i.length,s=0;s<(n?o:o-1);s++){var l=a[2*s],h=a[2*s+1],u=i[(s+1)%o];t.bezierCurveTo(l[0],l[1],h[0],h[1],u[0],u[1])}}else{"spline"===r&&(i=Hc(i,n)),t.moveTo(i[0][0],i[0][1]);for(var s=1,c=i.length;s<c;s++)t.lineTo(i[s][0],i[s][1])}n&&t.closePath()}}function fi(t,e,n){var i=t.cpx2,r=t.cpy2;return null===i||null===r?[(n?Dn:kn)(t.x1,t.cpx1,t.cpx2,t.x2,e),(n?Dn:kn)(t.y1,t.cpy1,t.cpy2,t.y2,e)]:[(n?Bn:En)(t.x1,t.cpx1,t.x2,e),(n?Bn:En)(t.y1,t.cpy1,t.y2,e)]}function di(t){Re.call(this,t),this._displayables=[],this._temporaryDisplayables=[],this._cursor=0,this.notClear=!0}function pi(t){return ri.extend(t)}function gi(t,e,n,i){var r=li(t,e),a=r.getBoundingRect();return n&&("center"===i&&(n=vi(n,a)),yi(r,n)),r}function mi(t,e,n){var i=new ze({style:{image:t,x:e.x,y:e.y,width:e.width,height:e.height},onload:function(t){if("center"===n){var r={width:t.width,height:t.height};i.setStyle(vi(e,r))}}});return i}function vi(t,e){var n,i=e.width/e.height,r=t.height*i;return n=r<=t.width?t.height:(r=t.width)/i,{x:t.x+t.width/2-r/2,y:t.y+t.height/2-n/2,width:r,height:n}}function yi(t,e){if(t.applyTransform){var n=t.getBoundingRect().calculateTransform(e);t.applyTransform(n)}}function _i(t){var e=t.shape,n=t.style.lineWidth;return nf(2*e.x1)===nf(2*e.x2)&&(e.x1=e.x2=xi(e.x1,n,!0)),nf(2*e.y1)===nf(2*e.y2)&&(e.y1=e.y2=xi(e.y1,n,!0)),t}function xi(t,e,n){var i=nf(2*t);return(i+nf(e))%2==0?i/2:(i+(n?1:-1))/2}function wi(t){return null!=t&&"none"!=t}function bi(t){return"string"==typeof t?wt(t,-.1):t}function Si(t){if(t.__hoverStlDirty){var e=t.style.stroke,n=t.style.fill,i=t.__hoverStl;i.fill=i.fill||(wi(n)?bi(n):null),i.stroke=i.stroke||(wi(e)?bi(e):null);var r={};for(var a in i)null!=i[a]&&(r[a]=t.style[a]);t.__normalStl=r,t.__hoverStlDirty=!1}}function Mi(t){if(!t.__isHover){if(Si(t),t.useHoverLayer)t.__zr&&t.__zr.addHover(t,t.__hoverStl);else{var e=t.style,n=e.insideRollbackOpt;n&&Wi(e),e.extendFrom(t.__hoverStl),n&&(Vi(e,e.insideOriginalTextPosition,n),null==e.textFill&&(e.textFill=n.autoColor)),t.dirty(!1),t.z2+=1}t.__isHover=!0}}function Ti(t){if(t.__isHover){var e=t.__normalStl;t.useHoverLayer?t.__zr&&t.__zr.removeHover(t):(e&&t.setStyle(e),t.z2-=1),t.__isHover=!1}}function Ii(t){"group"===t.type?t.traverse(function(t){"group"!==t.type&&Mi(t)}):Mi(t)}function Ci(t){"group"===t.type?t.traverse(function(t){"group"!==t.type&&Ti(t)}):Ti(t)}function ki(t,e){t.__hoverStl=t.hoverStyle||e||{},t.__hoverStlDirty=!0,t.__isHover&&Si(t)}function Di(t){this.__hoverSilentOnTouch&&t.zrByTouch||!this.__isEmphasis&&Ii(this)}function Ai(t){this.__hoverSilentOnTouch&&t.zrByTouch||!this.__isEmphasis&&Ci(this)}function Li(){this.__isEmphasis=!0,Ii(this)}function Pi(){this.__isEmphasis=!1,Ci(this)}function Oi(t,e,n){t.__hoverSilentOnTouch=n&&n.hoverSilentOnTouch,"group"===t.type?t.traverse(function(t){"group"!==t.type&&ki(t,e)}):ki(t,e),t.on("mouseover",Di).on("mouseout",Ai),t.on("emphasis",Li).on("normal",Pi)}function Ei(t,e,n,i,r,a,o){var s,l=(r=r||of).labelFetcher,h=r.labelDataIndex,u=r.labelDimIndex,c=n.getShallow("show"),f=i.getShallow("show");(c||f)&&(l&&(s=l.getFormattedLabel(h,"normal",null,u)),null==s&&(s=_(r.defaultText)?r.defaultText(h,r):r.defaultText));var d=c?s:null,p=f?C(l?l.getFormattedLabel(h,"emphasis",null,u):null,s):null;null==d&&null==p||(Bi(t,n,a,r),Bi(e,i,o,r,!0)),t.text=d,e.text=p}function Bi(t,e,n,i,r){return Ri(t,e,i,r),n&&a(t,n),t.host&&t.host.dirty&&t.host.dirty(!1),t}function Ri(t,e,n,i){if((n=n||of).isRectText){var r=e.getShallow("position")||(i?null:"inside");"outside"===r&&(r="top"),t.textPosition=r,t.textOffset=e.getShallow("offset");var a=e.getShallow("rotate");null!=a&&(a*=Math.PI/180),t.textRotation=a,t.textDistance=C(e.getShallow("distance"),i?null:5)}var o,s=e.ecModel,l=s&&s.option.textStyle,h=zi(e);if(h){o={};for(var u in h)if(h.hasOwnProperty(u)){var c=e.getModel(["rich",u]);Ni(o[u]={},c,l,n,i)}}return t.rich=o,Ni(t,e,l,n,i,!0),n.forceRich&&!n.textStyle&&(n.textStyle={}),t}function zi(t){for(var e;t&&t!==t.ecModel;){var n=(t.option||of).rich;if(n){e=e||{};for(var i in n)n.hasOwnProperty(i)&&(e[i]=1)}t=t.parentModel}return e}function Ni(t,e,n,i,r,a){if(n=!r&&n||of,t.textFill=Fi(e.getShallow("color"),i)||n.color,t.textStroke=Fi(e.getShallow("textBorderColor"),i)||n.textBorderColor,t.textStrokeWidth=C(e.getShallow("textBorderWidth"),n.textBorderWidth),!r){if(a){var o=t.textPosition;t.insideRollback=Vi(t,o,i),t.insideOriginalTextPosition=o,t.insideRollbackOpt=i}null==t.textFill&&(t.textFill=i.autoColor)}t.fontStyle=e.getShallow("fontStyle")||n.fontStyle,t.fontWeight=e.getShallow("fontWeight")||n.fontWeight,t.fontSize=e.getShallow("fontSize")||n.fontSize,t.fontFamily=e.getShallow("fontFamily")||n.fontFamily,t.textAlign=e.getShallow("align"),t.textVerticalAlign=e.getShallow("verticalAlign")||e.getShallow("baseline"),t.textLineHeight=e.getShallow("lineHeight"),t.textWidth=e.getShallow("width"),t.textHeight=e.getShallow("height"),t.textTag=e.getShallow("tag"),a&&i.disableBox||(t.textBackgroundColor=Fi(e.getShallow("backgroundColor"),i),t.textPadding=e.getShallow("padding"),t.textBorderColor=Fi(e.getShallow("borderColor"),i),t.textBorderWidth=e.getShallow("borderWidth"),t.textBorderRadius=e.getShallow("borderRadius"),t.textBoxShadowColor=e.getShallow("shadowColor"),t.textBoxShadowBlur=e.getShallow("shadowBlur"),t.textBoxShadowOffsetX=e.getShallow("shadowOffsetX"),t.textBoxShadowOffsetY=e.getShallow("shadowOffsetY")),t.textShadowColor=e.getShallow("textShadowColor")||n.textShadowColor,t.textShadowBlur=e.getShallow("textShadowBlur")||n.textShadowBlur,t.textShadowOffsetX=e.getShallow("textShadowOffsetX")||n.textShadowOffsetX,t.textShadowOffsetY=e.getShallow("textShadowOffsetY")||n.textShadowOffsetY}function Fi(t,e){return"auto"!==t?t:e&&e.autoColor?e.autoColor:null}function Vi(t,e,n){var i,r=n.useInsideStyle;return null==t.textFill&&!1!==r&&(!0===r||n.isRectText&&e&&"string"==typeof e&&e.indexOf("inside")>=0)&&(i={textFill:null,textStroke:t.textStroke,textStrokeWidth:t.textStrokeWidth},t.textFill="#fff",null==t.textStroke&&(t.textStroke=n.autoColor,null==t.textStrokeWidth&&(t.textStrokeWidth=2))),i}function Wi(t){var e=t.insideRollback;e&&(t.textFill=e.textFill,t.textStroke=e.textStroke,t.textStrokeWidth=e.textStrokeWidth)}function Hi(t,e){var n=e||e.getModel("textStyle");return P([t.fontStyle||n&&n.getShallow("fontStyle")||"",t.fontWeight||n&&n.getShallow("fontWeight")||"",(t.fontSize||n&&n.getShallow("fontSize")||12)+"px",t.fontFamily||n&&n.getShallow("fontFamily")||"sans-serif"].join(" "))}function Gi(t,e,n,i,r,a){if("function"==typeof r&&(a=r,r=null),i&&i.isAnimationEnabled()){var o=t?"Update":"",s=i.getShallow("animationDuration"+o),l=i.getShallow("animationEasing"+o),h=i.getShallow("animationDelay"+o);"function"==typeof h&&(h=h(r,i.getAnimationDelayParams?i.getAnimationDelayParams(e,r):null)),"function"==typeof s&&(s=s(r)),s>0?e.animateTo(n,s,h||0,l,a,!!a):(e.stopAnimation(),e.attr(n),a&&a())}else e.stopAnimation(),e.attr(n),a&&a()}function qi(t,e,n,i,r){Gi(!0,t,e,n,i,r)}function Xi(t,e,n,i,r){Gi(!1,t,e,n,i,r)}function Zi(t,e,n){return e&&!c(e)&&(e=uh.getLocalTransform(e)),n&&(e=lt([],e)),Y([],t,e)}function Yi(t,e,n,i){function r(t){var e={position:F(t.position),rotation:t.rotation};return t.shape&&(e.shape=a({},t.shape)),e}if(t&&e){var o=function(t){var e={};return t.traverse(function(t){!t.isGroup&&t.anid&&(e[t.anid]=t)}),e}(t);e.traverse(function(t){if(!t.isGroup&&t.anid){var e=o[t.anid];if(e){var i=r(t);t.attr(r(e)),qi(t,i,n,t.dataIndex)}}})}}function Ui(t,e,n){this.parentModel=e,this.ecModel=n,this.option=t}function ji(t,e,n){for(var i=0;i<e.length&&(!e[i]||null!=(t=t&&"object"==typeof t?t[e[i]]:null));i++);return null==t&&n&&(t=n.get(e)),t}function $i(t,e){var n=df(t).getParent;return n?n.call(t,e):t.parentModel}function Ki(t){return[t||"",pf++,Math.random().toFixed(5)].join("_")}function Qi(t){return t.replace(/^\s+/,"").replace(/\s+$/,"")}function Ji(t,e,n,i){var r=e[1]-e[0],a=n[1]-n[0];if(0===r)return 0===a?n[0]:(n[0]+n[1])/2;if(i)if(r>0){if(t<=e[0])return n[0];if(t>=e[1])return n[1]}else{if(t>=e[0])return n[0];if(t<=e[1])return n[1]}else{if(t===e[0])return n[0];if(t===e[1])return n[1]}return(t-e[0])/r*a+n[0]}function tr(t,e){switch(t){case"center":case"middle":t="50%";break;case"left":case"top":t="0%";break;case"right":case"bottom":t="100%"}return"string"==typeof t?Qi(t).match(/%$/)?parseFloat(t)/100*e:parseFloat(t):null==t?NaN:+t}function er(t,e,n){return null==e&&(e=10),e=Math.min(Math.max(0,e),20),t=(+t).toFixed(e),n?t:+t}function nr(t){var e=t.toString(),n=e.indexOf("e");if(n>0){var i=+e.slice(n+1);return i<0?-i:0}var r=e.indexOf(".");return r<0?0:e.length-1-r}function ir(t,e){var n=Math.log,i=Math.LN10,r=Math.floor(n(t[1]-t[0])/i),a=Math.round(n(Math.abs(e[1]-e[0]))/i),o=Math.min(Math.max(-r+a,0),20);return isFinite(o)?o:20}function rr(t,e,n){if(!t[e])return 0;var i=p(t,function(t,e){return t+(isNaN(e)?0:e)},0);if(0===i)return 0;for(var r=Math.pow(10,n),a=d(t,function(t){return(isNaN(t)?0:t)/i*r*100}),o=100*r,s=d(a,function(t){return Math.floor(t)}),l=p(s,function(t,e){return t+e},0),h=d(a,function(t,e){return t-s[e]});l<o;){for(var u=Number.NEGATIVE_INFINITY,c=null,f=0,g=h.length;f<g;++f)h[f]>u&&(u=h[f],c=f);++s[c],h[c]=0,++l}return s[e]/r}function ar(t){var e=2*Math.PI;return(t%e+e)%e}function or(t){return t>-gf&&t<gf}function sr(t){if(t instanceof Date)return t;if("string"==typeof t){var e=mf.exec(t);if(!e)return new Date(NaN);if(e[8]){var n=+e[4]||0;return"Z"!==e[8].toUpperCase()&&(n-=e[8].slice(0,3)),new Date(Date.UTC(+e[1],+(e[2]||1)-1,+e[3]||1,n,+(e[5]||0),+e[6]||0,+e[7]||0))}return new Date(+e[1],+(e[2]||1)-1,+e[3]||1,+e[4]||0,+(e[5]||0),+e[6]||0,+e[7]||0)}return null==t?new Date(NaN):new Date(Math.round(t))}function lr(t){return Math.pow(10,hr(t))}function hr(t){return Math.floor(Math.log(t)/Math.LN10)}function ur(t,e){var n,i=hr(t),r=Math.pow(10,i),a=t/r;return n=e?a<1.5?1:a<2.5?2:a<4?3:a<7?5:10:a<1?1:a<2?2:a<3?3:a<5?5:10,t=n*r,i>=-20?+t.toFixed(i<0?-i:0):t}function cr(t){return isNaN(t)?"-":(t=(t+"").split("."))[0].replace(/(\d{1,3})(?=(?:\d{3})+(?!\d))/g,"$1,")+(t.length>1?"."+t[1]:"")}function fr(t){return String(t).replace(/&/g,"&").replace(/</g,"<").replace(/>/g,">").replace(/"/g,""").replace(/'/g,"'")}function dr(t,e,n){y(e)||(e=[e]);var i=e.length;if(!i)return"";for(var r=e[0].$vars||[],a=0;a<r.length;a++){var o=yf[a];t=t.replace(_f(o),_f(o,0))}for(var s=0;s<i;s++)for(var l=0;l<r.length;l++){var h=e[s][r[l]];t=t.replace(_f(yf[l],s),n?fr(h):h)}return t}function pr(t,e){var n=(t=x(t)?{color:t,extraCssText:e}:t||{}).color,i=t.type,e=t.extraCssText;return n?"subItem"===i?'<span style="display:inline-block;vertical-align:middle;margin-right:8px;margin-left:3px;border-radius:4px;width:4px;height:4px;background-color:'+fr(n)+";"+(e||"")+'"></span>':'<span style="display:inline-block;margin-right:5px;border-radius:10px;width:10px;height:10px;background-color:'+fr(n)+";"+(e||"")+'"></span>':""}function gr(t,e,n){"week"!==t&&"month"!==t&&"quarter"!==t&&"half-year"!==t&&"year"!==t||(t="MM-dd\nyyyy");var i=sr(e),r=n?"UTC":"",a=i["get"+r+"FullYear"](),o=i["get"+r+"Month"]()+1,s=i["get"+r+"Date"](),l=i["get"+r+"Hours"](),h=i["get"+r+"Minutes"](),u=i["get"+r+"Seconds"]();return t=t.replace("MM",xf(o)).replace("M",o).replace("yyyy",a).replace("yy",a%100).replace("dd",xf(s)).replace("d",s).replace("hh",xf(l)).replace("h",l).replace("mm",xf(h)).replace("m",h).replace("ss",xf(u)).replace("s",u)}function mr(t,e,n,i,r){var a=0,o=0;null==i&&(i=1/0),null==r&&(r=1/0);var s=0;e.eachChild(function(l,h){var u,c,f=l.position,d=l.getBoundingRect(),p=e.childAt(h+1),g=p&&p.getBoundingRect();if("horizontal"===t){var m=d.width+(g?-g.x+d.x:0);(u=a+m)>i||l.newline?(a=0,u=m,o+=s+n,s=d.height):s=Math.max(s,d.height)}else{var v=d.height+(g?-g.y+d.y:0);(c=o+v)>r||l.newline?(a+=s+n,o=0,c=v,s=d.width):s=Math.max(s,d.width)}l.newline||(f[0]=a,f[1]=o,"horizontal"===t?a=u+n:o=c+n)})}function vr(t,e,n){n=vf(n||0);var i=e.width,r=e.height,a=tr(t.left,i),o=tr(t.top,r),s=tr(t.right,i),l=tr(t.bottom,r),h=tr(t.width,i),u=tr(t.height,r),c=n[2]+n[0],f=n[1]+n[3],d=t.aspect;switch(isNaN(h)&&(h=i-s-f-a),isNaN(u)&&(u=r-l-c-o),null!=d&&(isNaN(h)&&isNaN(u)&&(d>i/r?h=.8*i:u=.8*r),isNaN(h)&&(h=d*u),isNaN(u)&&(u=h/d)),isNaN(a)&&(a=i-s-h-f),isNaN(o)&&(o=r-l-u-c),t.left||t.right){case"center":a=i/2-h/2-n[3];break;case"right":a=i-h-f}switch(t.top||t.bottom){case"middle":case"center":o=r/2-u/2-n[0];break;case"bottom":o=r-u-c}a=a||0,o=o||0,isNaN(h)&&(h=i-f-a-(s||0)),isNaN(u)&&(u=r-c-o-(l||0));var p=new Rt(a+n[3],o+n[0],h,u);return p.margin=n,p}function yr(t,e,n){function i(n,i){var o={},l=0,h={},u=0;if(bf(n,function(e){h[e]=t[e]}),bf(n,function(t){r(e,t)&&(o[t]=h[t]=e[t]),a(o,t)&&l++,a(h,t)&&u++}),s[i])return a(e,n[1])?h[n[2]]=null:a(e,n[2])&&(h[n[1]]=null),h;if(2!==u&&l){if(l>=2)return o;for(var c=0;c<n.length;c++){var f=n[c];if(!r(o,f)&&r(t,f)){o[f]=t[f];break}}return o}return h}function r(t,e){return t.hasOwnProperty(e)}function a(t,e){return null!=t[e]&&"auto"!==t[e]}function o(t,e,n){bf(t,function(t){e[t]=n[t]})}!w(n)&&(n={});var s=n.ignoreSize;!y(s)&&(s=[s,s]);var l=i(Mf[0],0),h=i(Mf[1],1);o(Mf[0],t,l),o(Mf[1],t,h)}function _r(t){return xr({},t)}function xr(t,e){return e&&t&&bf(Sf,function(n){e.hasOwnProperty(n)&&(t[n]=e[n])}),t}function wr(t,e){for(var n=t.length,i=0;i<n;i++)if(t[i].length>e)return t[i];return t[n-1]}function br(t){var e=t.get("coordinateSystem"),n={coordSysName:e,coordSysDims:[],axisMap:R(),categoryAxisMap:R()},i=Pf[e];if(i)return i(t,n,n.axisMap,n.categoryAxisMap),n}function Sr(t){return"category"===t.get("type")}function Mr(t){this.fromDataset=t.fromDataset,this.data=t.data||(t.sourceFormat===Rf?{}:[]),this.sourceFormat=t.sourceFormat||zf,this.seriesLayoutBy=t.seriesLayoutBy||Ff,this.dimensionsDefine=t.dimensionsDefine,this.encodeDefine=t.encodeDefine&&R(t.encodeDefine),this.startIndex=t.startIndex||0,this.dimensionsDetectCount=t.dimensionsDetectCount}function Tr(t){var e=t.option.source,n=zf;if(S(e))n=Nf;else if(y(e))for(var i=0,r=e.length;i<r;i++){var a=e[i];if(null!=a){if(y(a)){n=Ef;break}if(w(a)){n=Bf;break}}}else if(w(e)){for(var o in e)if(e.hasOwnProperty(o)&&c(e[o])){n=Rf;break}}else if(null!=e)throw new Error("Invalid data");Wf(t).sourceFormat=n}function Ir(t){return Wf(t).source}function Cr(t){Wf(t).datasetMap=R()}function kr(t){var e=t.option,n=e.data,i=S(n)?Nf:Of,r=!1,a=e.seriesLayoutBy,o=e.sourceHeader,s=e.dimensions,l=Er(t);if(l){var h=l.option;n=h.source,i=Wf(l).sourceFormat,r=!0,a=a||h.seriesLayoutBy,null==o&&(o=h.sourceHeader),s=s||h.dimensions}var u=Dr(n,i,a,o,s),c=e.encode;!c&&l&&(c=Or(t,l,n,i,a,u)),Wf(t).source=new Mr({data:n,fromDataset:r,seriesLayoutBy:a,sourceFormat:i,dimensionsDefine:u.dimensionsDefine,startIndex:u.startIndex,dimensionsDetectCount:u.dimensionsDetectCount,encodeDefine:c})}function Dr(t,e,n,i,r){if(!t)return{dimensionsDefine:Ar(r)};var a,o,s;if(e===Ef)"auto"===i||null==i?Lr(function(t){null!=t&&"-"!==t&&(x(t)?null==o&&(o=1):o=0)},n,t,10):o=i?1:0,r||1!==o||(r=[],Lr(function(t,e){r[e]=null!=t?t:""},n,t)),a=r?r.length:n===Vf?t.length:t[0]?t[0].length:null;else if(e===Bf)r||(r=Pr(t),s=!0);else if(e===Rf)r||(r=[],s=!0,f(t,function(t,e){r.push(e)}));else if(e===Of){var l=ln(t[0]);a=y(l)&&l.length||1}var h;return s&&f(r,function(t,e){"name"===(w(t)?t.name:t)&&(h=e)}),{startIndex:o,dimensionsDefine:Ar(r),dimensionsDetectCount:a,potentialNameDimIndex:h}}function Ar(t){if(t){var e=R();return d(t,function(t,n){if(null==(t=a({},w(t)?t:{name:t})).name)return t;t.name+="",null==t.displayName&&(t.displayName=t.name);var i=e.get(t.name);return i?t.name+="-"+i.count++:e.set(t.name,{count:1}),t})}}function Lr(t,e,n,i){if(null==i&&(i=1/0),e===Vf)for(a=0;a<n.length&&a<i;a++)t(n[a]?n[a][0]:null,a);else for(var r=n[0]||[],a=0;a<r.length&&a<i;a++)t(r[a],a)}function Pr(t){for(var e,n=0;n<t.length&&!(e=t[n++]););if(e){var i=[];return f(e,function(t,e){i.push(e)}),i}}function Or(t,e,n,i,r,a){var o=br(t),s={},l=[],h=[],u=t.subType,c=R(["pie","map","funnel"]),d=R(["line","bar","pictorialBar","scatter","effectScatter","candlestick","boxplot"]);if(o&&null!=d.get(u)){var p=t.ecModel,g=Wf(p).datasetMap,m=e.uid+"_"+r,v=g.get(m)||g.set(m,{categoryWayDim:1,valueWayDim:0});f(o.coordSysDims,function(t){if(null==o.firstCategoryDimIndex){e=v.valueWayDim++;s[t]=e,h.push(e)}else if(o.categoryAxisMap.get(t))s[t]=0,l.push(0);else{var e=v.categoryWayDim++;s[t]=e,h.push(e)}})}else if(null!=c.get(u)){for(var y,_=0;_<5&&null==y;_++)Rr(n,i,r,a.dimensionsDefine,a.startIndex,_)||(y=_);if(null!=y){s.value=y;var x=a.potentialNameDimIndex||Math.max(y-1,0);h.push(x),l.push(x)}}return l.length&&(s.itemName=l),h.length&&(s.seriesName=h),s}function Er(t){var e=t.option;if(!e.data)return t.ecModel.getComponent("dataset",e.datasetIndex||0)}function Br(t,e){return Rr(t.data,t.sourceFormat,t.seriesLayoutBy,t.dimensionsDefine,t.startIndex,e)}function Rr(t,e,n,i,r,a){function o(t){return(null==t||!isFinite(t)||""===t)&&(!(!x(t)||"-"===t)||void 0)}var s;if(S(t))return!1;var l;if(i&&(l=w(l=i[a])?l.name:l),e===Ef)if(n===Vf){for(var h=t[a],u=0;u<(h||[]).length&&u<5;u++)if(null!=(s=o(h[r+u])))return s}else for(u=0;u<t.length&&u<5;u++){var c=t[r+u];if(c&&null!=(s=o(c[a])))return s}else if(e===Bf){if(!l)return;for(u=0;u<t.length&&u<5;u++)if((f=t[u])&&null!=(s=o(f[l])))return s}else if(e===Rf){if(!l)return;if(!(h=t[l])||S(h))return!1;for(u=0;u<h.length&&u<5;u++)if(null!=(s=o(h[u])))return s}else if(e===Of)for(u=0;u<t.length&&u<5;u++){var f=t[u],d=ln(f);if(!y(d))return!1;if(null!=(s=o(d[a])))return s}return!1}function zr(t,e){if(e){var n=e.seiresIndex,i=e.seriesId,r=e.seriesName;return null!=n&&t.componentIndex!==n||null!=i&&t.id!==i||null!=r&&t.name!==r}}function Nr(t,e){f(e,function(e,r){Cf.hasClass(r)||("object"==typeof e?t[r]=t[r]?i(t[r],e,!1):n(e):null==t[r]&&(t[r]=e))})}function Fr(t){t=t,this.option={},this.option[Hf]=1,this._componentsMap=R({series:[]}),this._seriesIndices,this._seriesIndicesMap,Nr(t,this._theme.option),i(t,Df,!1),this.mergeOption(t)}function Vr(t,e){y(e)||(e=e?[e]:[]);var n={};return f(e,function(e){n[e]=(t.get(e)||[]).slice()}),n}function Wr(t,e,n){return e.type?e.type:n?n.subType:Cf.determineSubType(t,e)}function Hr(t,e){t._seriesIndicesMap=R(t._seriesIndices=d(e,function(t){return t.componentIndex})||[])}function Gr(t,e){return e.hasOwnProperty("subType")?g(t,function(t){return t.subType===e.subType}):t}function qr(t){f(qf,function(e){this[e]=m(t[e],t)},this)}function Xr(){this._coordinateSystems=[]}function Zr(t){this._api=t,this._timelineOptions=[],this._mediaList=[],this._mediaDefault,this._currentMediaIndices=[],this._optionBackup,this._newBaseOption}function Yr(t,e,n){var i,r,a=[],o=[],s=t.timeline;if(t.baseOption&&(r=t.baseOption),(s||t.options)&&(r=r||{},a=(t.options||[]).slice()),t.media){r=r||{};var l=t.media;Zf(l,function(t){t&&t.option&&(t.query?o.push(t):i||(i=t))})}return r||(r=t),r.timeline||(r.timeline=s),Zf([r].concat(a).concat(d(o,function(t){return t.option})),function(t){Zf(e,function(e){e(t,n)})}),{baseOption:r,timelineOptions:a,mediaDefault:i,mediaList:o}}function Ur(t,e,n){var i={width:e,height:n,aspectratio:e/n},r=!0;return f(t,function(t,e){var n=e.match($f);if(n&&n[1]&&n[2]){var a=n[1],o=n[2].toLowerCase();jr(i[o],t,a)||(r=!1)}}),r}function jr(t,e,n){return"min"===n?t>=e:"max"===n?t<=e:t===e}function $r(t,e){return t.join(",")===e.join(",")}function Kr(t,e){Zf(e=e||{},function(e,n){if(null!=e){var i=t[n];if(Cf.hasClass(n)){e=on(e);var r=un(i=on(i),e);t[n]=Uf(r,function(t){return t.option&&t.exist?jf(t.exist,t.option,!0):t.exist||t.option})}else t[n]=jf(i,e,!0)}})}function Qr(t){var e=t&&t.itemStyle;if(e)for(var n=0,r=Jf.length;n<r;n++){var a=Jf[n],o=e.normal,s=e.emphasis;o&&o[a]&&(t[a]=t[a]||{},t[a].normal?i(t[a].normal,o[a]):t[a].normal=o[a],o[a]=null),s&&s[a]&&(t[a]=t[a]||{},t[a].emphasis?i(t[a].emphasis,s[a]):t[a].emphasis=s[a],s[a]=null)}}function Jr(t,e,n){if(t&&t[e]&&(t[e].normal||t[e].emphasis)){var i=t[e].normal,r=t[e].emphasis;i&&(n?(t[e].normal=t[e].emphasis=null,o(t[e],i)):t[e]=i),r&&(t.emphasis=t.emphasis||{},t.emphasis[e]=r)}}function ta(t){Jr(t,"itemStyle"),Jr(t,"lineStyle"),Jr(t,"areaStyle"),Jr(t,"label"),Jr(t,"labelLine"),Jr(t,"upperLabel"),Jr(t,"edgeLabel")}function ea(t){var e=Qf(t)&&t.textStyle;if(e)for(var n=0,i=Tu.length;n<i;n++){var r=Tu[n];e.hasOwnProperty(r)&&(t[r]=e[r])}}function na(t){t&&(ta(t),ea(t.label),t.emphasis&&ea(t.emphasis.label))}function ia(t){if(Qf(t)){Qr(t),ta(t),ea(t.label),ea(t.upperLabel),ea(t.edgeLabel),t.emphasis&&(ea(t.emphasis.label),ea(t.emphasis.upperLabel),ea(t.emphasis.edgeLabel));var e=t.markPoint;e&&(Qr(e),na(e));var n=t.markLine;n&&(Qr(n),na(n));var i=t.markArea;i&&na(i);var r=t.data;if("graph"===t.type){r=r||t.nodes;var a=t.links||t.edges;if(a&&!S(a))for(s=0;s<a.length;s++)na(a[s]);f(t.categories,function(t){ta(t)})}if(r&&!S(r))for(s=0;s<r.length;s++)na(r[s]);if((e=t.markPoint)&&e.data)for(var o=e.data,s=0;s<o.length;s++)na(o[s]);if((n=t.markLine)&&n.data)for(var l=n.data,s=0;s<l.length;s++)y(l[s])?(na(l[s][0]),na(l[s][1])):na(l[s]);"gauge"===t.type?(ea(t,"axisLabel"),ea(t,"title"),ea(t,"detail")):"treemap"===t.type&&(Jr(t.breadcrumb,"itemStyle"),f(t.levels,function(t){ta(t)}))}}function ra(t){return y(t)?t:t?[t]:[]}function aa(t){return(y(t)?t[0]:t)||{}}function oa(t,e){e=e.split(",");for(var n=t,i=0;i<e.length&&null!=(n=n&&n[e[i]]);i++);return n}function sa(t,e,n,i){e=e.split(",");for(var r,a=t,o=0;o<e.length-1;o++)null==a[r=e[o]]&&(a[r]={}),a=a[r];(i||null==a[e[o]])&&(a[e[o]]=n)}function la(t){f(ed,function(e){e[0]in t&&!(e[1]in t)&&(t[e[1]]=t[e[0]])})}function ha(t,e){Mr.isInstance(t)||(t=Mr.seriesDataToSource(t)),this._source=t;var n=this._data=t.data,i=t.sourceFormat;i===Nf&&(this._offset=0,this._dimSize=e,this._data=n),a(this,ad[i===Ef?i+"_"+t.seriesLayoutBy:i])}function ua(){return this._data.length}function ca(t){return this._data[t]}function fa(t){for(var e=0;e<t.length;e++)this._data.push(t[e])}function da(t,e,n,i){return null!=n?t[n]:t}function pa(t,e,n,i){return ga(t[i],this._dimensionInfos[e])}function ga(t,e){var n=e&&e.type;if("ordinal"===n){var i=e&&e.ordinalMeta;return i?i.parseAndCollect(t):t}return"time"===n&&"number"!=typeof t&&null!=t&&"-"!==t&&(t=+sr(t)),null==t||""===t?NaN:+t}function ma(t,e,n){if(t){var i=t.getRawDataItem(e);if(null!=i){var r,a,o=t.getProvider().getSource().sourceFormat,s=t.getDimensionInfo(n);return s&&(r=s.name,a=s.index),od[o](i,e,a,r)}}}function va(t,e,n){if(t){var i=t.getProvider().getSource().sourceFormat;if(i===Of||i===Bf){var r=t.getRawDataItem(e);return i!==Of||w(r)||(r=null),r?r[n]:void 0}}}function ya(t){return new _a(t)}function _a(t){t=t||{},this._reset=t.reset,this._plan=t.plan,this._count=t.count,this._onDirty=t.onDirty,this._dirty=!0,this.context}function xa(t,e){t._dueIndex=t._outputDueEnd=t._dueEnd=0,t._settedOutputEnd=null,t._progress=!e&&t._reset&&t._reset(t.context);var n=t._downstream;n&&n.dirty()}function wa(t){var e=t.name;Mu===e&&(t.name=ba(t)||e)}function ba(t){var e=t.getRawData(),n=[];return f(e.mapDimension("seriesName",!0),function(t){var i=e.getDimensionInfo(t);i.displayName&&n.push(i.displayName)}),n.join(" ")}function Sa(t){return t.model.getRawData().count()}function Ma(t){var e=t.model;return e.setData(e.getRawData().cloneShallow()),Ta}function Ta(t,e){t.end>e.outputData.count()&&e.model.getRawData().cloneShallow(e.outputData)}function Ia(t,e){f(t.CHANGABLE_METHODS,function(n){t.wrapMethod(n,v(Ca,e))})}function Ca(t){var e=ka(t);e&&e.setOutputEnd(this.count())}function ka(t){var e=(t.ecModel||{}).scheduler,n=e&&e.getPipeline(t.uid);if(n){var i=n.currentTask;if(i){var r=i.agentStubMap;r&&(i=r.get(t.uid))}return i}}function Da(){this.group=new Oh,this.uid=Ki("viewChart"),this.renderTask=ya({plan:Pa,reset:Oa}),this.renderTask.context={view:this}}function Aa(t,e){if(t&&(t.trigger(e),"group"===t.type))for(var n=0;n<t.childCount();n++)Aa(t.childAt(n),e)}function La(t,e,n){var i=dn(t,e);null!=i?f(on(i),function(e){Aa(t.getItemGraphicEl(e),n)}):t.eachItemGraphicEl(function(t){Aa(t,n)})}function Pa(t){return vd(t.model)}function Oa(t){var e=t.model,n=t.ecModel,i=t.api,r=t.payload,a=e.pipelineContext.incrementalRender,o=t.view,s=r&&md(r).updateMethod;return o[a&&o.incrementalPrepareRender?"incrementalPrepareRender":s&&o[s]?s:"render"](e,n,i,r),a?Ea:null}function Ea(t,e){e.view.incrementalRender(t,e.model,e.ecModel,e.api,e.payload)}function Ba(t,e,n){function i(){u=(new Date).getTime(),c=null,t.apply(o,s||[])}var r,a,o,s,l,h=0,u=0,c=null;e=e||0;var f=function(){r=(new Date).getTime(),o=this,s=arguments;var t=l||e,f=l||n;l=null,a=r-(f?h:u)-t,clearTimeout(c),f?c=setTimeout(i,t):a>=0?i():c=setTimeout(i,-a),h=r};return f.clear=function(){c&&(clearTimeout(c),c=null)},f.debounceNextCall=function(t){l=t},f}function Ra(t,e){this.ecInstance=t,this.api=e,this.unfinished,this._stageTaskMap=R()}function za(t,e,n,i,r){function a(t,e){return t.setDirty&&(!t.dirtyMap||t.dirtyMap.get(e.__pipeline.id))}r=r||{};var o;f(e,function(e,s){if(!r.visualType||r.visualType===e.visualType){var l=t._stageTaskMap.get(e.uid),h=l.seriesTaskMap,u=l.overallTask;if(u){var c,f=u.agentStubMap;f.each(function(t){a(r,t)&&(t.dirty(),c=!0)}),c&&u.dirty(),Md(u,i);var d=t.getPerformArgs(u,r.block);f.each(function(t){t.perform(d)}),o|=u.perform(d)}else h&&h.each(function(s,l){a(r,s)&&s.dirty();var h=t.getPerformArgs(s,r.block);h.skip=!e.performRawSeries&&n.isSeriesFiltered(s.context.model),Md(s,i),o|=s.perform(h)})}}),t.unfinished|=o}function Na(t,e,n,i,r){function a(n){var a=n.uid,s=o.get(a)||o.set(a,ya({plan:qa,reset:Xa,count:Ya}));s.context={model:n,ecModel:i,api:r,useClearVisual:e.isVisual&&!e.isLayout,plan:e.plan,reset:e.reset,scheduler:t},Ua(t,n,s)}var o=n.seriesTaskMap||(n.seriesTaskMap=R()),s=e.seriesType,l=e.getTargetSeries;e.createOnAllSeries?i.eachRawSeries(a):s?i.eachRawSeriesByType(s,a):l&&l(i,r).each(a);var h=t._pipelineMap;o.each(function(t,e){h.get(e)||(t.dispose(),o.removeKey(e))})}function Fa(t,e,n,i,r){function a(e){var n=e.uid,i=s.get(n)||s.set(n,ya({reset:Wa,onDirty:Ga}));i.context={model:e,overallProgress:u,isOverallFilter:c},i.agent=o,i.__block=u,Ua(t,e,i)}var o=n.overallTask=n.overallTask||ya({reset:Va});o.context={ecModel:i,api:r,overallReset:e.overallReset,scheduler:t};var s=o.agentStubMap=o.agentStubMap||R(),l=e.seriesType,h=e.getTargetSeries,u=!0,c=e.isOverallFilter;l?i.eachRawSeriesByType(l,a):h?h(i,r).each(a):(u=!1,f(i.getSeries(),a));var d=t._pipelineMap;s.each(function(t,e){d.get(e)||(t.dispose(),s.removeKey(e))})}function Va(t){t.overallReset(t.ecModel,t.api,t.payload)}function Wa(t,e){return t.overallProgress&&Ha}function Ha(){this.agent.dirty(),this.getDownstream().dirty()}function Ga(){this.agent&&this.agent.dirty()}function qa(t){return t.plan&&t.plan(t.model,t.ecModel,t.api,t.payload)}function Xa(t){if(t.useClearVisual&&t.data.clearAllVisual(),(t.resetDefines=on(t.reset(t.model,t.ecModel,t.api,t.payload))).length)return Za}function Za(t,e){for(var n=e.data,i=e.resetDefines,r=0;r<i.length;r++){var a=i[r];if(a&&a.dataEach)for(var o=t.start;o<t.end;o++)a.dataEach(n,o);else a&&a.progress&&a.progress(t,n)}}function Ya(t){return t.data.count()}function Ua(t,e,n){var i=e.uid,r=t._pipelineMap.get(i);!r.head&&(r.head=n),r.tail&&r.tail.pipe(n),r.tail=n,n.__idxInPipeline=r.count++,n.__pipeline=r}function ja(t){Td=null;try{t(Id,Cd)}catch(t){}return Td}function $a(t,e){for(var n in e.prototype)t[n]=z}function Ka(t){return function(e,n,i){e=e&&e.toLowerCase(),ih.prototype[t].call(this,e,n,i)}}function Qa(){ih.call(this)}function Ja(t,e,i){function r(t,e){return t.__prio-e.__prio}i=i||{},"string"==typeof e&&(e=tp[e]),this.id,this.group,this._dom=t;var a=this._zr=an(t,{renderer:i.renderer||"canvas",devicePixelRatio:i.devicePixelRatio,width:i.width,height:i.height});this._throttledZrFlush=Ba(m(a.flush,a),17),(e=n(e))&&id(e,!0),this._theme=e,this._chartsViews=[],this._chartsMap={},this._componentsViews=[],this._componentsMap={},this._coordSysMgr=new Xr;var o=this._api=_o(this);this._scheduler=new Ra(this,o),ih.call(this),this._messageCenter=new Qa,this._initEvents(),this.resize=m(this.resize,this),this._pendingActions=[],qt(Jd,r),qt($d,r),a.animation.on("frame",this._onframe,this),O(this)}function to(t,e,n){var i,r=this._model,a=this._coordSysMgr.getCoordinateSystems();e=gn(r,e);for(var o=0;o<a.length;o++){var s=a[o];if(s[t]&&null!=(i=s[t](r,e,n)))return i}}function eo(t){var e=t._model,n=t._scheduler;n.restorePipelines(e),n.prepareStageTasks($d),n.prepareStageTasks(Jd),lo(t,"component",e,n),lo(t,"chart",e,n),n.plan()}function no(t,e,n,i,r){function a(i){i&&i.__alive&&i[e]&&i[e](i.__model,o,t._api,n)}var o=t._model;if(i){var s={};s[i+"Id"]=n[i+"Id"],s[i+"Index"]=n[i+"Index"],s[i+"Name"]=n[i+"Name"];var l={mainType:i,query:s};r&&(l.subType=r),o&&o.eachComponent(l,function(e,n){a(t["series"===i?"_chartsMap":"_componentsMap"][e.__viewId])},t)}else Od(t._componentsViews.concat(t._chartsViews),a)}function io(t,e,n){t[Hd]=!0,e&&eo(t),Zd.update.call(t),t[Hd]=!1,oo.call(t,n),so.call(t,n)}function ro(t,e){var n=t._chartsMap,i=t._scheduler;e.eachSeries(function(t){i.updateStreamModes(t,n[t.__viewId])})}function ao(t,e){var n=t.type,i=t.escapeConnect,r=Ud[n],s=r.actionInfo,l=(s.update||"update").split(":"),h=l.pop();l=null!=l[0]&&Rd(l[0]),this[Hd]=!0;var u=[t],c=!1;t.batch&&(c=!0,u=d(t.batch,function(e){return e=o(a({},e),t),e.batch=null,e}));var f,p=[],g="highlight"===n||"downplay"===n;Od(u,function(t){f=r.action(t,this._model,this._api),(f=f||a({},t)).type=s.event||f.type,p.push(f),g?no(this,h,t,"series"):l&&no(this,h,t,l.main,l.sub)},this),"none"===h||g||l||(this[Gd]?(eo(this),Zd.update.call(this,t),this[Gd]=!1):Zd[h].call(this,t)),f=c?{type:s.event||n,escapeConnect:i,batch:p}:p[0],this[Hd]=!1,!e&&this._messageCenter.trigger(f.type,f)}function oo(t){for(var e=this._pendingActions;e.length;){var n=e.shift();ao.call(this,n,t)}}function so(t){!t&&this.trigger("updated")}function lo(t,e,n,i){function r(t){var e="_ec_"+t.id+"_"+t.type,r=s[e];if(!r){var u=Rd(t.type);(r=new(a?dd.getClass(u.main,u.sub):Da.getClass(u.sub))).init(n,h),s[e]=r,o.push(r),l.add(r.group)}t.__viewId=r.__id=e,r.__alive=!0,r.__model=t,r.group.__ecComponentInfo={mainType:t.mainType,index:t.componentIndex},!a&&i.prepareView(r,t,n,h)}for(var a="component"===e,o=a?t._componentsViews:t._chartsViews,s=a?t._componentsMap:t._chartsMap,l=t._zr,h=t._api,u=0;u<o.length;u++)o[u].__alive=!1;a?n.eachComponent(function(t,e){"series"!==t&&r(e)}):n.eachSeries(r);for(u=0;u<o.length;){var c=o[u];c.__alive?u++:(!a&&c.renderTask.dispose(),l.remove(c.group),c.dispose(n,h),o.splice(u,1),delete s[c.__id],c.__id=c.group.__ecComponentInfo=null)}}function ho(t){var e={};t.eachSeries(function(t){var n=t.get("stack"),i=t.getData();if(n&&"list"===i.type){var r=e[n];e.hasOwnProperty(n)&&r&&(i.stackedOn=r),e[n]=i}})}function uo(t){t.clearColorPalette(),t.eachSeries(function(t){t.clearColorPalette()})}function co(t,e,n,i){fo(t,e,n,i),Od(t._chartsViews,function(t){t.__alive=!1}),po(t,e,n,i),Od(t._chartsViews,function(t){t.__alive||t.remove(e,n)})}function fo(t,e,n,i,r){Od(r||t._componentsViews,function(t){var r=t.__model;t.render(r,e,n,i),yo(r,t)})}function po(t,e,n,i,r){var a,o=t._scheduler;e.eachSeries(function(e){var n=t._chartsMap[e.__viewId];n.__alive=!0;var s=n.renderTask;o.updatePayload(s,i),r&&r.get(e.uid)&&s.dirty(),a|=s.perform(o.getPerformArgs(s)),n.group.silent=!!e.get("silent"),yo(e,n),vo(e,n)}),o.unfinished|=a,mo(t._zr,e),wd(t._zr.dom,e)}function go(t,e){Od(Qd,function(n){n(t,e)})}function mo(t,e){var n=t.storage,i=0;n.traverse(function(t){t.isGroup||i++}),i>e.get("hoverLayerThreshold")&&!Fl.node&&n.traverse(function(t){t.isGroup||(t.useHoverLayer=!0)})}function vo(t,e){var n=t.get("blendMode")||null;e.group.traverse(function(t){t.isGroup||t.style.blend!==n&&t.setStyle("blend",n),t.eachPendingDisplayable&&t.eachPendingDisplayable(function(t){t.setStyle("blend",n)})})}function yo(t,e){var n=t.get("z"),i=t.get("zlevel");e.group.traverse(function(t){"group"!==t.type&&(null!=n&&(t.z=n),null!=i&&(t.zlevel=i))})}function _o(t){var e=t._coordSysMgr;return a(new qr(t),{getCoordinateSystems:m(e.getCoordinateSystems,e),getComponentByElement:function(e){for(;e;){var n=e.__ecComponentInfo;if(null!=n)return t._model.getComponent(n.mainType,n.index);e=e.parent}}})}function xo(t){function e(t,e){for(var i=0;i<t.length;i++)t[i][n]=e}var n="__connectUpdateStatus";Od(jd,function(i,r){t._messageCenter.on(r,function(i){if(ip[t.group]&&0!==t[n]){if(i&&i.escapeConnect)return;var r=t.makeActionFromEvent(i),a=[];Od(np,function(e){e!==t&&e.group===t.group&&a.push(e)}),e(a,0),Od(a,function(t){1!==t[n]&&t.dispatchAction(r)}),e(a,2)}})})}function wo(t){ip[t]=!1}function bo(t){return np[yn(t,op)]}function So(t,e){tp[t]=e}function Mo(t){Kd.push(t)}function To(t,e){Do($d,t,e,Nd)}function Io(t,e,n){"function"==typeof e&&(n=e,e="");var i=Bd(t)?t.type:[t,t={event:e}][0];t.event=(t.event||i).toLowerCase(),e=t.event,Pd(qd.test(i)&&qd.test(e)),Ud[i]||(Ud[i]={action:n,actionInfo:t}),jd[e]=i}function Co(t,e){Do(Jd,t,e,Fd,"layout")}function ko(t,e){Do(Jd,t,e,Vd,"visual")}function Do(t,e,n,i,r){(Ed(e)||Bd(e))&&(n=e,e=i);var a=Ra.wrapStageHandler(n,r);return a.__prio=e,a.__raw=n,t.push(a),a}function Ao(t,e){ep[t]=e}function Lo(t){return Cf.extend(t)}function Po(t){return dd.extend(t)}function Oo(t){return fd.extend(t)}function Eo(t){return Da.extend(t)}function Bo(t){return t}function Ro(t,e,n,i,r){this._old=t,this._new=e,this._oldKeyGetter=n||Bo,this._newKeyGetter=i||Bo,this.context=r}function zo(t,e,n,i,r){for(var a=0;a<t.length;a++){var o="_ec_"+r[i](t[a],a),s=e[o];null==s?(n.push(o),e[o]=a):(s.length||(e[o]=s=[s]),s.push(a))}}function No(t){var e={},n=e.encode={},i=e.coordDimMap=R(),r=[];f(t.dimensions,function(e){var a=t.getDimensionInfo(e),o=a.coordDim;if(o){var s=n[o];n.hasOwnProperty(o)||(s=n[o]=[]),s[a.coordDimIndex]=e,a.isSysCoord&&Vo(a.type)&&(r[0]=e),i.set(o,1)}up.each(function(t,e){var i=n[e];n.hasOwnProperty(e)||(i=n[e]=[]);var r=a.otherDims[e];null!=r&&!1!==r&&(i[r]=a.name)})});var a=[];i.each(function(t,e){a=a.concat(n[e])}),e.dataDimsOnCoord=a;var o=n.label;o&&o.length&&(r=o.slice());var s=r.slice(),l=n.tooltip;return l&&l.length&&(s=l.slice()),n.defaultedLabel=r,n.defaultedTooltip=s,e}function Fo(t){return"category"===t?"ordinal":"time"===t?"time":"float"}function Vo(t){return!("ordinal"===t||"time"===t)}function Wo(t){var e=typeof dp.Uint32Array===fp?Array:dp.Uint32Array,n=typeof dp.Uint16Array===fp?Array:dp.Uint16Array;return t._rawCount>65535?e:n}function Ho(t){var e=t.constructor;return e===Array?t.slice():new e(t)}function Go(t,e){f(mp.concat(e.__wrappedMethods||[]),function(n){e.hasOwnProperty(n)&&(t[n]=e[n])}),t.__wrappedMethods=e.__wrappedMethods}function qo(t){return t}function Xo(t){return t<this._count&&t>=0?this._indices[t]:-1}function Zo(t,e){var n=t._idList[e];return null==n&&(n=t._getIdFromStore(e)),null==n&&(n=pp+e),n}function Yo(t){return y(t)||(t=[t]),t}function Uo(t,e){var n=t.dimensions,i=new vp(d(n,t.getDimensionInfo,t),t.hostModel);Go(i,t);for(var r=i._storage={},a=t._storage,o=0;o<n.length;o++){var s=n[o];a[s]&&(r[s]=l(e,s)>=0?jo(a[s]):a[s])}return i}function jo(t){for(var e=new Array(t.length),n=0;n<t.length;n++)e[n]=Ho(t[n]);return e}function $o(t,e,i){function r(t,e,n){null!=up.get(e)?t.otherDims[e]=n:(t.coordDim=e,t.coordDimIndex=n,u.set(e,!0))}Mr.isInstance(e)||(e=Mr.seriesDataToSource(e)),i=i||{},t=(t||[]).slice();for(var s=(i.dimsDef||[]).slice(),l=R(i.encodeDef),h=R(),u=R(),c=[],d=Ko(e,t,s,i.dimCount),p=0;p<d;p++){var g=s[p]=a({},w(s[p])?s[p]:{name:s[p]}),m=g.name,v=c[p]={otherDims:{}};null!=m&&null==h.get(m)&&(v.name=v.displayName=m,h.set(m,p)),null!=g.type&&(v.type=g.type),null!=g.displayName&&(v.displayName=g.displayName)}l.each(function(t,e){t=on(t).slice();var n=l.set(e,[]);f(t,function(t,i){x(t)&&(t=h.get(t)),null!=t&&t<d&&(n[i]=t,r(c[t],e,i))})});var y=0;f(t,function(t,e){var i,t,a,s;if(x(t))i=t,t={};else{i=t.name;var h=t.ordinalMeta;t.ordinalMeta=null,(t=n(t)).ordinalMeta=h,a=t.dimsDef,s=t.otherDims,t.name=t.coordDim=t.coordDimIndex=t.dimsDef=t.otherDims=null}var u=on(l.get(i));if(!u.length)for(var d=0;d<(a&&a.length||1);d++){for(;y<c.length&&null!=c[y].coordDim;)y++;y<c.length&&u.push(y++)}f(u,function(e,n){var l=c[e];r(o(l,t),i,n),null==l.name&&a&&(l.name=l.displayName=a[n]),l.isSysCoord=!0,s&&o(l.otherDims,s)})});for(var _=i.extraPrefix||"value",b=0;b<d;b++)null==(v=c[b]=c[b]||{}).coordDim&&(v.coordDim=Qo(_,u,i.extraFromZero),v.coordDimIndex=0,v.isExtraCoord=!0),null==v.name&&(v.name=Qo(v.coordDim,h)),null==v.type&&Br(e,b,v.name)&&(v.type="ordinal");return c}function Ko(t,e,n,i){return null==i&&(i=Math.max(t.dimensionsDetectCount||1,e.length,n.length),f(e,function(t){var e=t.dimsDef;e&&(i=Math.max(i,e.length))})),i}function Qo(t,e,n){if(n||null!=e.get(t)){for(var i=0;null!=e.get(t+i);)i++;t+=i}return e.set(t,!0),t}function Jo(t,e){Mr.isInstance(t)||(t=Mr.seriesDataToSource(t));var n,i=e.get("coordinateSystem"),r=Xr.get(i),a=br(e);a&&(n=d(a.coordSysDims,function(t){var e={name:t},n=a.axisMap.get(t);if(n){var i=n.get("type");e.type=Fo(i),e.stackable=ts(i)}return e})),n||(n=r&&(r.getDimensionsInfo?r.getDimensionsInfo():r.dimensions.slice())||["x","y"]);var o,s,l=xp(t,{coordDimensions:n});a&&f(l,function(t,e){var n=t.coordDim,i=a.categoryAxisMap.get(n);i&&(null==o&&(o=e),t.ordinalMeta=i.getOrdinalMeta()),null!=t.otherDims.itemName&&(s=!0)}),s||null==o||(l[o].otherDims.itemName=0);var h=new vp(l,e),u=null!=o&&es(t)?function(t,e,n,i){return i===o?n:this.defaultDimValueGetter(t,e,n,i)}:null;return h.hasItemOption=!1,h.initData(t,null,u),h}function ts(t){return"category"!==t&&"time"!==t}function es(t){if(t.sourceFormat===Of){var e=ns(t.data||[]);return null!=e&&!y(ln(e))}}function ns(t){for(var e=0;e<t.length&&null==t[e];)e++;return t[e]}function is(t,e){if("image"!==this.type){var n=this.style,i=this.shape;i&&"line"===i.symbolType?n.stroke=t:this.__isEmptyBrush?(n.stroke=t,n.fill=e||"#fff"):(n.fill&&(n.fill=t),n.stroke&&(n.stroke=t)),this.dirty(!1)}}function rs(t,e,n,i,r,a,o){var s=0===t.indexOf("empty");s&&(t=t.substr(5,1).toLowerCase()+t.substr(6));var l;return l=0===t.indexOf("image://")?mi(t.slice(8),new Rt(e,n,i,r),o?"center":"cover"):0===t.indexOf("path://")?gi(t.slice(7),{},new Rt(e,n,i,r),o?"center":"cover"):new Cp({shape:{symbolType:t,x:e,y:n,width:i,height:r}}),l.__isEmptyBrush=s,l.setColor=is,l.setColor(a),l}function as(t,e){var n=t.mapDimension("defaultedLabel",!0),i=n.length;if(1===i)return ma(t,e,n[0]);if(i){for(var r=[],a=0;a<n.length;a++){var o=ma(t,e,n[a]);r.push(o)}return r.join(" ")}}function os(t,e){var n=t.getItemVisual(e,"symbolSize");return n instanceof Array?n.slice():[+n,+n]}function ss(t){return[t[0]/2,t[1]/2]}function ls(t,e,n){Oh.call(this),this.updateData(t,e,n)}function hs(t,e){this.parent.drift(t,e)}function us(t){this.group=new Oh,this._symbolCtor=t||ls}function cs(t,e,n,i){return e&&!isNaN(e[0])&&!isNaN(e[1])&&!(i&&i(n))&&"none"!==t.getItemVisual(n,"symbol")}function fs(t){var e=t.hostModel;return{itemStyle:e.getModel("itemStyle").getItemStyle(["color"]),hoverItemStyle:e.getModel("emphasis.itemStyle").getItemStyle(),symbolRotate:e.get("symbolRotate"),symbolOffset:e.get("symbolOffset"),hoverAnimation:e.get("hoverAnimation"),labelModel:e.getModel("label"),hoverLabelModel:e.getModel("emphasis.label"),cursorStyle:e.get("cursor")}}function ds(t){return t>=0?1:-1}function ps(t,e,n){for(var i,r=t.getBaseAxis(),a=t.getOtherAxis(r),o=r.onZero?0:a.scale.getExtent()[0],s=a.dim,l="x"===s||"radius"===s?1:0,h=e.stackedOn,u=e.get(s,n);h&&ds(h.get(s,n))===ds(u);){i=h;break}var c=[];return c[l]=e.get(r.dim,n),c[1-l]=i?i.get(s,n,!0):o,t.dataToPoint(c)}function gs(t,e){var n=[];return e.diff(t).add(function(t){n.push({cmd:"+",idx:t})}).update(function(t,e){n.push({cmd:"=",idx:e,idx1:t})}).remove(function(t){n.push({cmd:"-",idx:t})}).execute(),n}function ms(t){return isNaN(t[0])||isNaN(t[1])}function vs(t,e,n,i,r,a,o,s,l,h,u){for(var c=0,f=n,d=0;d<i;d++){var p=e[f];if(f>=r||f<0)break;if(ms(p)){if(u){f+=a;continue}break}if(f===n)t[a>0?"moveTo":"lineTo"](p[0],p[1]),Np(Vp,p);else if(l>0){var g=f+a,m=e[g];if(u)for(;m&&ms(e[g]);)m=e[g+=a];var v=.5,y=e[c];if(!(m=e[g])||ms(m))Np(Wp,p);else{ms(m)&&!u&&(m=p),W(Fp,m,y);var _,x;if("x"===h||"y"===h){var w="x"===h?0:1;_=Math.abs(p[w]-y[w]),x=Math.abs(p[w]-m[w])}else _=th(p,y),x=th(p,m);zp(Wp,p,Fp,-l*(1-(v=x/(x+_))))}Bp(Vp,Vp,s),Rp(Vp,Vp,o),Bp(Wp,Wp,s),Rp(Wp,Wp,o),t.bezierCurveTo(Vp[0],Vp[1],Wp[0],Wp[1],p[0],p[1]),zp(Vp,p,Fp,l*v)}else t.lineTo(p[0],p[1]);c=f,f+=a}return d}function ys(t,e){var n=[1/0,1/0],i=[-1/0,-1/0];if(e)for(var r=0;r<t.length;r++){var a=t[r];a[0]<n[0]&&(n[0]=a[0]),a[1]<n[1]&&(n[1]=a[1]),a[0]>i[0]&&(i[0]=a[0]),a[1]>i[1]&&(i[1]=a[1])}return{min:e?n:i,max:e?i:n}}function _s(t,e){if(t.length===e.length){for(var n=0;n<t.length;n++){var i=t[n],r=e[n];if(i[0]!==r[0]||i[1]!==r[1])return}return!0}}function xs(t){return"number"==typeof t?t:t?.3:0}function ws(t){var e=t.getGlobalExtent();if(t.onBand){var n=t.getBandWidth()/2-1,i=e[1]>e[0]?1:-1;e[0]+=i*n,e[1]-=i*n}return e}function bs(t){return t>=0?1:-1}function Ss(t,e,n,i){var r=e.getBaseAxis(),a=e.getOtherAxis(r),o=0,s=a.scale.getExtent();"start"===i?o=s[0]:"end"===i?o=s[1]:(s=a.scale.getExtent())[0]>0?o=s[0]:s[1]<0&&(o=s[1]);var l=a.dim,h="x"===l||"radius"===l?1:0,u=n.mapDimension(l);return n.mapArray(u?[u]:[],function(t,i){for(var a,s=n.stackedOn;s&&bs(s.get(u,i))===bs(t);){a=s;break}var l=[];return l[h]=n.get(r.dim,i),l[1-h]=a?a.get(u,i,!0):o,e.dataToPoint(l)},!0)}function Ms(t,e,n){var i=ws(t.getAxis("x")),r=ws(t.getAxis("y")),a=t.getBaseAxis().isHorizontal(),o=Math.min(i[0],i[1]),s=Math.min(r[0],r[1]),l=Math.max(i[0],i[1])-o,h=Math.max(r[0],r[1])-s,u=n.get("lineStyle.width")||2,c=n.get("clipOverflow")?u/2:Math.max(l,h);a?(s-=c,h+=2*c):(o-=c,l+=2*c);var f=new Zc({shape:{x:o,y:s,width:l,height:h}});return e&&(f.shape[a?"width":"height"]=0,Xi(f,{shape:{width:l,height:h}},n)),f}function Ts(t,e,n){var i=t.getAngleAxis(),r=t.getRadiusAxis().getExtent(),a=i.getExtent(),o=Math.PI/180,s=new Vc({shape:{cx:t.cx,cy:t.cy,r0:r[0],r:r[1],startAngle:-a[0]*o,endAngle:-a[1]*o,clockwise:i.inverse}});return e&&(s.shape.endAngle=-a[0]*o,Xi(s,{shape:{endAngle:-a[1]*o}},n)),s}function Is(t,e,n){return"polar"===t.type?Ts(t,e,n):Ms(t,e,n)}function Cs(t,e,n){for(var i=e.getBaseAxis(),r="x"===i.dim||"radius"===i.dim?0:1,a=[],o=0;o<t.length-1;o++){var s=t[o+1],l=t[o];a.push(l);var h=[];switch(n){case"end":h[r]=s[r],h[1-r]=l[1-r],a.push(h);break;case"middle":var u=(l[r]+s[r])/2,c=[];h[r]=c[r]=u,h[1-r]=l[1-r],c[1-r]=s[1-r],a.push(h),a.push(c);break;default:h[r]=l[r],h[1-r]=s[1-r],a.push(h)}}return t[o]&&a.push(t[o]),a}function ks(t,e){var n=t.getVisual("visualMeta");if(n&&n.length&&t.count()){for(var i,r=n.length-1;r>=0;r--)if(n[r].dimension<2){i=n[r];break}if(i&&"cartesian2d"===e.type){var a=i.dimension,o=t.dimensions[a],s=e.getAxis(o),l=d(i.stops,function(t){return{coord:s.toGlobalCoord(s.dataToCoord(t.value)),color:t.color}}),h=l.length,u=i.outerColors.slice();h&&l[0].coord>l[h-1].coord&&(l.reverse(),u.reverse());var c=l[0].coord-10,p=l[h-1].coord+10,g=p-c;if(g<.001)return"transparent";f(l,function(t){t.offset=(t.coord-c)/g}),l.push({offset:h?l[h-1].offset:.5,color:u[1]||"transparent"}),l.unshift({offset:h?l[0].offset:.5,color:u[0]||"transparent"});var m=new Jc(0,0,0,0,l,!0);return m[o]=c,m[o+"2"]=p,m}}}function Ds(t){this._setting=t||{},this._extent=[1/0,-1/0],this._interval=0,this.init&&this.init.apply(this,arguments)}function As(t){this.categories=t.categories||[],this._needCollect=t.needCollect,this._deduplication=t.deduplication,this._map}function Ls(t){return t._map||(t._map=R(t.categories))}function Ps(t){return w(t)&&null!=t.value?t.value:t+""}function Os(t,e,n,i){var r={},a=t[1]-t[0],o=r.interval=ur(a/e,!0);null!=n&&o<n&&(o=r.interval=n),null!=i&&o>i&&(o=r.interval=i);var s=r.intervalPrecision=Es(o);return Rs(r.niceTickExtent=[jp(Math.ceil(t[0]/o)*o,s),jp(Math.floor(t[1]/o)*o,s)],t),r}function Es(t){return nr(t)+2}function Bs(t,e,n){t[e]=Math.max(Math.min(t[e],n[1]),n[0])}function Rs(t,e){!isFinite(t[0])&&(t[0]=e[0]),!isFinite(t[1])&&(t[1]=e[1]),Bs(t,0,e),Bs(t,1,e),t[0]>t[1]&&(t[0]=t[1])}function zs(t,e,n,i){var r=[];if(!t)return r;e[0]<n[0]&&r.push(e[0]);for(var a=n[0];a<=n[1]&&(r.push(a),(a=jp(a+t,i))!==r[r.length-1]);)if(r.length>1e4)return[];return e[1]>(r.length?r[r.length-1]:n[1])&&r.push(e[1]),r}function Ns(t){return t.get("stack")||Qp+t.seriesIndex}function Fs(t){return t.dim+t.index}function Vs(t,e){return Ws(d(t,function(t){var e=t.getData(),n=t.coordinateSystem.getBaseAxis(),i=n.getExtent(),r="category"===n.type?n.getBandWidth():Math.abs(i[1]-i[0])/e.count();return{bandWidth:r,barWidth:tr(t.get("barWidth"),r),barMaxWidth:tr(t.get("barMaxWidth"),r),barGap:t.get("barGap"),barCategoryGap:t.get("barCategoryGap"),axisKey:Fs(n),stackId:Ns(t)}}),e)}function Ws(t,e){var n={};f(t,function(t,e){var i=t.axisKey,r=t.bandWidth,a=n[i]||{bandWidth:r,remainedWidth:r,autoWidthCount:0,categoryGap:"20%",gap:"30%",stacks:{}},o=a.stacks;n[i]=a;var s=t.stackId;o[s]||a.autoWidthCount++,o[s]=o[s]||{width:0,maxWidth:0};var l=t.barWidth;l&&!o[s].width&&(o[s].width=l,l=Math.min(a.remainedWidth,l),a.remainedWidth-=l);var h=t.barMaxWidth;h&&(o[s].maxWidth=h);var u=t.barGap;null!=u&&(a.gap=u);var c=t.barCategoryGap;null!=c&&(a.categoryGap=c)});var i={};return f(n,function(t,e){i[e]={};var n=t.stacks,r=t.bandWidth,a=tr(t.categoryGap,r),o=tr(t.gap,1),s=t.remainedWidth,l=t.autoWidthCount,h=(s-a)/(l+(l-1)*o);h=Math.max(h,0),f(n,function(t,e){var n=t.maxWidth;n&&n<h&&(n=Math.min(n,s),t.width&&(n=Math.min(n,t.width)),s-=n,t.width=n,l--)}),h=(s-a)/(l+(l-1)*o),h=Math.max(h,0);var u,c=0;f(n,function(t,e){t.width||(t.width=h),u=t,c+=t.width*(1+o)}),u&&(c-=u.width*o);var d=-c/2;f(n,function(t,n){i[e][n]=i[e][n]||{offset:d,width:t.width},d+=t.width*(1+o)})}),i}function Hs(t,e){return lg(t,sg(e))}function Gs(t,e){var n,i,r,a=t.type,o=e.getMin(),s=e.getMax(),l=null!=o,h=null!=s,u=t.getExtent();"ordinal"===a?n=e.getCategories().length:(y(i=e.get("boundaryGap"))||(i=[i||0,i||0]),"boolean"==typeof i[0]&&(i=[0,0]),i[0]=tr(i[0],1),i[1]=tr(i[1],1),r=u[1]-u[0]||Math.abs(u[0])),null==o&&(o="ordinal"===a?n?0:NaN:u[0]-i[0]*r),null==s&&(s="ordinal"===a?n?n-1:NaN:u[1]+i[1]*r),"dataMin"===o?o=u[0]:"function"==typeof o&&(o=o({min:u[0],max:u[1]})),"dataMax"===s?s=u[1]:"function"==typeof s&&(s=s({min:u[0],max:u[1]})),(null==o||!isFinite(o))&&(o=NaN),(null==s||!isFinite(s))&&(s=NaN),t.setBlank(T(o)||T(s)),e.getNeedCrossZero()&&(o>0&&s>0&&!l&&(o=0),o<0&&s<0&&!h&&(s=0));var c=e.ecModel;if(c){var f=g(c.getSeriesByType("bar"),function(t){return t.getBaseAxis()===e.axis}).length>0;if(("time"===a||"interval"===a)&&f){var d=qs(o,s,e);o=d.min,s=d.max}}return[o,s]}function qs(t,e,n){var i=n.ecModel,r=n.axis.getExtent(),a=r[1]-r[0],o=Vs(g(i.getSeriesByType("bar"),function(t){return!i.isSeriesFiltered(t)&&t.coordinateSystem&&"cartesian2d"===t.coordinateSystem.type}))[n.axis.dim+n.axis.index];if(void 0===o)return{min:t,max:e};var s=1/0;f(o,function(t){s=Math.min(t.offset,s)});var l=-1/0;f(o,function(t){l=Math.max(t.offset+t.width,l)});var h=Math.abs(s)+l,u=e-t,c=u/(1-(s+l)/a)-u;return e+=c*(l/h),t-=c*(s/h),{min:t,max:e}}function Xs(t,e){if(e=e||t.get("type"))switch(e){case"category":return new Up(t.getOrdinalMeta?t.getOrdinalMeta():t.getCategories(),[1/0,-1/0]);case"value":return new Kp;default:return(Ds.getClass(e)||Kp).create(t)}}function Zs(t,e,n,i,r){var a,o=0,s=0,l=(i-r)/180*Math.PI,h=1;e.length>40&&(h=Math.floor(e.length/40));for(var u=0;u<t.length;u+=h){var c=t[u],f=ee(e[u],n,"center","top");f.x+=c*Math.cos(l),f.y+=c*Math.sin(l),f.width*=1.3,f.height*=1.3,a?a.intersect(f)?(s++,o=Math.max(o,s)):(a.union(f),s=0):a=f.clone()}return 0===o&&h>1?h:(o+1)*h-1}function Ys(t,e){var n=t.scale,i=n.getTicksLabels(),r=n.getTicks();return"string"==typeof e?(e=function(t){return function(e){return t.replace("{value}",null!=e?e:"")}}(e),d(i,e)):"function"==typeof e?d(r,function(n,i){return e(Us(t,n),i)},this):i}function Us(t,e){return"category"===t.type?t.scale.getLabel(e):e}function js(t){return this._axes[t]}function $s(t){pg.call(this,t)}function Ks(t,e){var n=(t[1]-t[0])/e/2;t[0]+=n,t[1]-=n}function Qs(t,e){return e.type||(e.data?"category":"value")}function Js(t,e,n){return t.getCoordSysModel()===e}function tl(t,e){var n=e*Math.PI/180,i=t.plain(),r=i.width,a=i.height,o=r*Math.cos(n)+a*Math.sin(n),s=r*Math.sin(n)+a*Math.cos(n);return new Rt(i.x,i.y,o,s)}function el(t){var e,n=t.model,i=n.get("axisLabel.show")?n.getFormattedLabels():[],r=n.getModel("axisLabel"),a=1,o=i.length;o>40&&(a=Math.ceil(o/40));for(var s=0;s<o;s+=a)if(!t.isLabelIgnored(s)){var l=tl(r.getTextRect(i[s]),r.get("rotate")||0);e?e.union(l):e=l}return e}function nl(t,e,n){this._coordsMap={},this._coordsList=[],this._axesMap={},this._axesList=[],this._initCartesian(t,e,n),this.model=t}function il(t,e,n){var i=t[e];if(n.onZero){var r=n.onZeroAxisIndex;if(null==r){for(var a in i)if(i.hasOwnProperty(a)){var o=i[a];if(o&&!rl(o)){r=+a;break}}null==r&&(n.onZero=!1),n.onZeroAxisIndex=r}else(o=i[r])&&rl(o)&&(n.onZero=!1)}}function rl(t){return"category"===t.type||"time"===t.type||!Cg(t)}function al(t,e){var n=t.getExtent(),i=n[0]+n[1];t.toGlobalCoord="x"===t.dim?function(t){return t+e}:function(t){return i-t+e},t.toLocalCoord="x"===t.dim?function(t){return t-e}:function(t){return i-t+e}}function ol(t,e){return d(Ag,function(e){return t.getReferringComponents(e)[0]})}function sl(t){return"cartesian2d"===t.get("coordinateSystem")}function ll(t){var e={componentType:t.mainType};return e[t.mainType+"Index"]=t.componentIndex,e}function hl(t,e,n,i){var r,a,o=ar(n-t.rotation),s=i[0]>i[1],l="start"===e&&!s||"start"!==e&&s;return or(o-Lg/2)?(a=l?"bottom":"top",r="center"):or(o-1.5*Lg)?(a=l?"top":"bottom",r="center"):(a="middle",r=o<1.5*Lg&&o>Lg/2?l?"left":"right":l?"right":"left"),{rotation:o,textAlign:r,textVerticalAlign:a}}function ul(t){var e=t.get("tooltip");return t.get("silent")||!(t.get("triggerEvent")||e&&e.show)}function cl(t,e,n){var i=t.get("axisLabel.showMinLabel"),r=t.get("axisLabel.showMaxLabel");e=e||[],n=n||[];var a=e[0],o=e[1],s=e[e.length-1],l=e[e.length-2],h=n[0],u=n[1],c=n[n.length-1],f=n[n.length-2];!1===i?(fl(a),fl(h)):dl(a,o)&&(i?(fl(o),fl(u)):(fl(a),fl(h))),!1===r?(fl(s),fl(c)):dl(l,s)&&(r?(fl(l),fl(f)):(fl(s),fl(c)))}function fl(t){t&&(t.ignore=!0)}function dl(t,e,n){var i=t&&t.getBoundingRect().clone(),r=e&&e.getBoundingRect().clone();if(i&&r){var a=nt([]);return ot(a,a,-t.rotation),i.applyTransform(rt([],a,t.getLocalTransform())),r.applyTransform(rt([],a,e.getLocalTransform())),i.intersect(r)}}function pl(t){return"middle"===t||"center"===t}function gl(t,e,n){var i=e.axis;if(e.get("axisTick.show")&&!i.scale.isBlank()){for(var r=e.getModel("axisTick"),a=r.getModel("lineStyle"),s=r.get("length"),l=Rg(r,n.labelInterval),h=i.getTicksCoords(r.get("alignWithLabel")),u=i.scale.getTicks(),c=e.get("axisLabel.showMinLabel"),f=e.get("axisLabel.showMaxLabel"),d=[],p=[],g=t._transform,m=[],v=h.length,y=0;y<v;y++)if(!Bg(i,y,l,v,c,f)){var _=h[y];d[0]=_,d[1]=0,p[0]=_,p[1]=n.tickDirection*s,g&&(Y(d,d,g),Y(p,p,g));var x=new Yc(_i({anid:"tick_"+u[y],shape:{x1:d[0],y1:d[1],x2:p[0],y2:p[1]},style:o(a.getLineStyle(),{stroke:e.get("axisLine.lineStyle.color")}),z2:2,silent:!0}));t.group.add(x),m.push(x)}return m}}function ml(t,e,n){var i=e.axis;if(I(n.axisLabelShow,e.get("axisLabel.show"))&&!i.scale.isBlank()){var r=e.getModel("axisLabel"),a=r.get("margin"),o=i.scale.getTicks(),s=e.getFormattedLabels(),l=(I(n.labelRotate,r.get("rotate"))||0)*Lg/180,h=Eg(n.rotation,l,n.labelDirection),u=e.getCategories(),c=[],d=ul(e),p=e.get("triggerEvent"),g=e.get("axisLabel.showMinLabel"),m=e.get("axisLabel.showMaxLabel");return f(o,function(l,f){if(!Bg(i,f,n.labelInterval,o.length,g,m)){var v=r;u&&u[l]&&u[l].textStyle&&(v=new Ui(u[l].textStyle,r,e.ecModel));var y=v.getTextColor()||e.get("axisLine.lineStyle.color"),_=[i.dataToCoord(l),n.labelOffset+n.labelDirection*a],x=i.scale.getLabel(l),w=new Rc({anid:"label_"+l,position:_,rotation:h.rotation,silent:d,z2:10});Bi(w.style,v,{text:s[f],textAlign:v.getShallow("align",!0)||h.textAlign,textVerticalAlign:v.getShallow("verticalAlign",!0)||v.getShallow("baseline",!0)||h.textVerticalAlign,textFill:"function"==typeof y?y("category"===i.type?x:"value"===i.type?l+"":l,f):y}),p&&(w.eventData=ll(e),w.eventData.targetType="axisLabel",w.eventData.value=x),t._dumbGroup.add(w),w.updateTransform(),c.push(w),t.group.add(w),w.decomposeTransform()}}),c}}function vl(t){var e=yl(t);if(e){var n=e.axisPointerModel,i=e.axis.scale,r=n.option,a=n.get("status"),o=n.get("value");null!=o&&(o=i.parse(o));var s=xl(n);null==a&&(r.status=s?"show":"hide");var l=i.getExtent().slice();l[0]>l[1]&&l.reverse(),(null==o||o>l[1])&&(o=l[1]),o<l[0]&&(o=l[0]),r.value=o,s&&(r.status=e.axis.scale.isBlank()?"hide":"show")}}function yl(t){var e=(t.ecModel.getComponent("axisPointer")||{}).coordSysAxesInfo;return e&&e.axesInfo[wl(t)]}function _l(t){var e=yl(t);return e&&e.axisPointerModel}function xl(t){return!!t.get("handle.show")}function wl(t){return t.type+"||"+t.id}function bl(t,e,n,i,r,a){var o=zg.getAxisPointerClass(t.axisPointerClass);if(o){var s=_l(e);s?(t._axisPointer||(t._axisPointer=new o)).render(e,s,i,a):Sl(t,i)}}function Sl(t,e,n){var i=t._axisPointer;i&&i.dispose(e,n),t._axisPointer=null}function Ml(t,e,n){n=n||{};var i=t.coordinateSystem,r=e.axis,a={},o=r.position,s=r.onZero?"onZero":o,l=r.dim,h=i.getRect(),u=[h.x,h.x+h.width,h.y,h.y+h.height],c={left:0,right:1,top:0,bottom:1,onZero:2},f=e.get("offset")||0,d="x"===l?[u[2]-f,u[3]+f]:[u[0]-f,u[1]+f];if(r.onZero){var p=i.getAxis("x"===l?"y":"x",r.onZeroAxisIndex),g=p.toGlobalCoord(p.dataToCoord(0));d[c.onZero]=Math.max(Math.min(g,d[1]),d[0])}a.position=["y"===l?d[c[s]]:u[0],"x"===l?d[c[s]]:u[3]],a.rotation=Math.PI/2*("x"===l?0:1);var m={top:-1,bottom:1,left:-1,right:1};a.labelDirection=a.tickDirection=a.nameDirection=m[o],a.labelOffset=r.onZero?d[c[o]]-d[c.onZero]:0,e.get("axisTick.inside")&&(a.tickDirection=-a.tickDirection),I(n.labelInside,e.get("axisLabel.inside"))&&(a.labelDirection=-a.labelDirection);var v=e.get("axisLabel.rotate");return a.labelRotate="top"===s?-v:v,a.labelInterval=r.getLabelInterval(),a.z2=1,a}function Tl(t,e,n,i,r,a,o){Ei(t,e,n.getModel("label"),n.getModel("emphasis.label"),{labelFetcher:r,labelDataIndex:a,defaultText:as(r.getData(),a),isRectText:!0,autoColor:i}),Il(t),Il(e)}function Il(t,e){"outside"===t.textPosition&&(t.textPosition=e)}function Cl(t,e,n){n.style.text=null,qi(n,{shape:{width:0}},e,t,function(){n.parent&&n.parent.remove(n)})}function kl(t,e,n){n.style.text=null,qi(n,{shape:{r:n.shape.r0}},e,t,function(){n.parent&&n.parent.remove(n)})}function Dl(t,e,n,i,r,a,s,l){var h=e.getItemVisual(n,"color"),u=e.getItemVisual(n,"opacity"),c=i.getModel("itemStyle"),f=i.getModel("emphasis.itemStyle").getBarItemStyle();l||t.setShape("r",c.get("barBorderRadius")||0),t.useStyle(o({fill:h,opacity:u},c.getBarItemStyle()));var d=i.getShallow("cursor");d&&t.attr("cursor",d);var p=s?r.height>0?"bottom":"top":r.width>0?"left":"right";l||Tl(t.style,f,i,h,a,n,p),Oi(t,f)}function Al(t,e){var n=t.get(Zg)||0;return Math.min(n,Math.abs(e.width),Math.abs(e.height))}function Ll(t,e,n,i){var r=e.getData(),a=this.dataIndex,o=r.getName(a),s=e.get("selectedOffset");i.dispatchAction({type:"pieToggleSelect",from:t,name:o,seriesId:e.id}),r.each(function(t){Pl(r.getItemGraphicEl(t),r.getItemLayout(t),e.isSelected(r.getName(t)),s,n)})}function Pl(t,e,n,i,r){var a=(e.startAngle+e.endAngle)/2,o=Math.cos(a),s=Math.sin(a),l=n?i:0,h=[o*l,s*l];r?t.animate().when(200,{position:h}).start("bounceOut"):t.attr("position",h)}function Ol(t,e){function n(){a.ignore=a.hoverIgnore,o.ignore=o.hoverIgnore}function i(){a.ignore=a.normalIgnore,o.ignore=o.normalIgnore}Oh.call(this);var r=new Vc({z2:2}),a=new Xc,o=new Rc;this.add(r),this.add(a),this.add(o),this.updateData(t,e,!0),this.on("emphasis",n).on("normal",i).on("mouseover",n).on("mouseout",i)}function El(t,e,n,i,r,a,o){function s(e,n){for(var i=e;i>=0&&(t[i].y-=n,!(i>0&&t[i].y>t[i-1].y+t[i-1].height));i--);}function l(t,e,n,i,r,a){for(var o=e?Number.MAX_VALUE:0,s=0,l=t.length;s<l;s++)if("center"!==t[s].position){var h=Math.abs(t[s].y-i),u=t[s].len,c=t[s].len2,f=h<r+u?Math.sqrt((r+u+c)*(r+u+c)-h*h):Math.abs(t[s].x-n);e&&f>=o&&(f=o-10),!e&&f<=o&&(f=o+10),t[s].x=n+f*a,o=f}}t.sort(function(t,e){return t.y-e.y});for(var h,u=0,c=t.length,f=[],d=[],p=0;p<c;p++)(h=t[p].y-u)<0&&function(e,n,i,r){for(var a=e;a<n;a++)if(t[a].y+=i,a>e&&a+1<n&&t[a+1].y>t[a].y+t[a].height)return void s(a,i/2);s(n-1,i/2)}(p,c,-h),u=t[p].y+t[p].height;o-u<0&&s(c-1,u-o);for(p=0;p<c;p++)t[p].y>=n?d.push(t[p]):f.push(t[p]);l(f,!1,e,n,i,r),l(d,!0,e,n,i,r)}function Bl(t,e,n,i,r,a){for(var o=[],s=[],l=0;l<t.length;l++)t[l].x<e?o.push(t[l]):s.push(t[l]);El(s,e,n,i,1,r,a),El(o,e,n,i,-1,r,a);for(l=0;l<t.length;l++){var h=t[l].linePoints;if(h){var u=h[1][0]-h[2][0];t[l].x<e?h[2][0]=t[l].x+3:h[2][0]=t[l].x-3,h[1][1]=h[2][1]=t[l].y,h[1][0]=h[2][0]+u}}}var Rl=2311,zl=function(){return Rl++},Nl={},Fl=Nl="undefined"!=typeof wx?{browser:{},os:{},node:!1,wxa:!0,canvasSupported:!0,svgSupported:!1,touchEventsSupported:!0}:"undefined"==typeof document&&"undefined"!=typeof self?{browser:{},os:{},node:!1,worker:!0,canvasSupported:!0}:"undefined"==typeof navigator?{browser:{},os:{},node:!0,worker:!1,canvasSupported:!0,svgSupported:!0}:function(t){var e={},n={},i=t.match(/Firefox\/([\d.]+)/),r=t.match(/MSIE\s([\d.]+)/)||t.match(/Trident\/.+?rv:(([\d.]+))/),a=t.match(/Edge\/([\d.]+)/),o=/micromessenger/i.test(t);return i&&(n.firefox=!0,n.version=i[1]),r&&(n.ie=!0,n.version=r[1]),a&&(n.edge=!0,n.version=a[1]),o&&(n.weChat=!0),{browser:n,os:e,node:!1,canvasSupported:!!document.createElement("canvas").getContext,svgSupported:"undefined"!=typeof SVGRect,touchEventsSupported:"ontouchstart"in window&&!n.ie&&!n.edge,pointerEventsSupported:"onpointerdown"in window&&(n.edge||n.ie&&n.version>=11)}}(navigator.userAgent),Vl={"[object Function]":1,"[object RegExp]":1,"[object Date]":1,"[object Error]":1,"[object CanvasGradient]":1,"[object CanvasPattern]":1,"[object Image]":1,"[object Canvas]":1},Wl={"[object Int8Array]":1,"[object Uint8Array]":1,"[object Uint8ClampedArray]":1,"[object Int16Array]":1,"[object Uint16Array]":1,"[object Int32Array]":1,"[object Uint32Array]":1,"[object Float32Array]":1,"[object Float64Array]":1},Hl=Object.prototype.toString,Gl=Array.prototype,ql=Gl.forEach,Xl=Gl.filter,Zl=Gl.slice,Yl=Gl.map,Ul=Gl.reduce,jl={},$l=function(){return jl.createCanvas()};jl.createCanvas=function(){return document.createElement("canvas")};var Kl,Ql="__ec_primitive__";B.prototype={constructor:B,get:function(t){return this.hasOwnProperty(t)?this[t]:null},set:function(t,e){return this[t]=e},each:function(t,e){void 0!==e&&(t=m(t,e));for(var n in this)this.hasOwnProperty(n)&&t(this[n],n)},removeKey:function(t){delete this[t]}};var Jl="undefined"==typeof Float32Array?Array:Float32Array,th=Z,eh=function(t,e){return(t[0]-e[0])*(t[0]-e[0])+(t[1]-e[1])*(t[1]-e[1])};$.prototype={constructor:$,_dragStart:function(t){var e=t.target;e&&e.draggable&&(this._draggingTarget=e,e.dragging=!0,this._x=t.offsetX,this._y=t.offsetY,this.dispatchToElement(K(e,t),"dragstart",t.event))},_drag:function(t){var e=this._draggingTarget;if(e){var n=t.offsetX,i=t.offsetY,r=n-this._x,a=i-this._y;this._x=n,this._y=i,e.drift(r,a,t),this.dispatchToElement(K(e,t),"drag",t.event);var o=this.findHover(n,i,e).target,s=this._dropTarget;this._dropTarget=o,e!==o&&(s&&o!==s&&this.dispatchToElement(K(s,t),"dragleave",t.event),o&&o!==s&&this.dispatchToElement(K(o,t),"dragenter",t.event))}},_dragEnd:function(t){var e=this._draggingTarget;e&&(e.dragging=!1),this.dispatchToElement(K(e,t),"dragend",t.event),this._dropTarget&&this.dispatchToElement(K(this._dropTarget,t),"drop",t.event),this._draggingTarget=null,this._dropTarget=null}};var nh=Array.prototype.slice,ih=function(){this._$handlers={}};ih.prototype={constructor:ih,one:function(t,e,n){var i=this._$handlers;if(!e||!t)return this;i[t]||(i[t]=[]);for(var r=0;r<i[t].length;r++)if(i[t][r].h===e)return this;return i[t].push({h:e,one:!0,ctx:n||this}),this},on:function(t,e,n){var i=this._$handlers;if(!e||!t)return this;i[t]||(i[t]=[]);for(var r=0;r<i[t].length;r++)if(i[t][r].h===e)return this;return i[t].push({h:e,one:!1,ctx:n||this}),this},isSilent:function(t){var e=this._$handlers;return e[t]&&e[t].length},off:function(t,e){var n=this._$handlers;if(!t)return this._$handlers={},this;if(e){if(n[t]){for(var i=[],r=0,a=n[t].length;r<a;r++)n[t][r].h!=e&&i.push(n[t][r]);n[t]=i}n[t]&&0===n[t].length&&delete n[t]}else delete n[t];return this},trigger:function(t){if(this._$handlers[t]){var e=arguments,n=e.length;n>3&&(e=nh.call(e,1));for(var i=this._$handlers[t],r=i.length,a=0;a<r;){switch(n){case 1:i[a].h.call(i[a].ctx);break;case 2:i[a].h.call(i[a].ctx,e[1]);break;case 3:i[a].h.call(i[a].ctx,e[1],e[2]);break;default:i[a].h.apply(i[a].ctx,e)}i[a].one?(i.splice(a,1),r--):a++}}return this},triggerWithContext:function(t){if(this._$handlers[t]){var e=arguments,n=e.length;n>4&&(e=nh.call(e,1,e.length-1));for(var i=e[e.length-1],r=this._$handlers[t],a=r.length,o=0;o<a;){switch(n){case 1:r[o].h.call(i);break;case 2:r[o].h.call(i,e[1]);break;case 3:r[o].h.call(i,e[1],e[2]);break;default:r[o].h.apply(i,e)}r[o].one?(r.splice(o,1),a--):o++}}return this}};var rh="silent";J.prototype.dispose=function(){};var ah=["click","dblclick","mousewheel","mouseout","mouseup","mousedown","mousemove","contextmenu"],oh=function(t,e,n,i){ih.call(this),this.storage=t,this.painter=e,this.painterRoot=i,n=n||new J,this.proxy=null,this._hovered={},this._lastTouchMoment,this._lastX,this._lastY,$.call(this),this.setHandlerProxy(n)};oh.prototype={constructor:oh,setHandlerProxy:function(t){this.proxy&&this.proxy.dispose(),t&&(f(ah,function(e){t.on&&t.on(e,this[e],this)},this),t.handler=this),this.proxy=t},mousemove:function(t){var e=t.zrX,n=t.zrY,i=this._hovered,r=i.target;r&&!r.__zr&&(r=(i=this.findHover(i.x,i.y)).target);var a=this._hovered=this.findHover(e,n),o=a.target,s=this.proxy;s.setCursor&&s.setCursor(o?o.cursor:"default"),r&&o!==r&&this.dispatchToElement(i,"mouseout",t),this.dispatchToElement(a,"mousemove",t),o&&o!==r&&this.dispatchToElement(a,"mouseover",t)},mouseout:function(t){this.dispatchToElement(this._hovered,"mouseout",t);var e,n=t.toElement||t.relatedTarget;do{n=n&&n.parentNode}while(n&&9!=n.nodeType&&!(e=n===this.painterRoot));!e&&this.trigger("globalout",{event:t})},resize:function(t){this._hovered={}},dispatch:function(t,e){var n=this[t];n&&n.call(this,e)},dispose:function(){this.proxy.dispose(),this.storage=this.proxy=this.painter=null},setCursorStyle:function(t){var e=this.proxy;e.setCursor&&e.setCursor(t)},dispatchToElement:function(t,e,n){var i=(t=t||{}).target;if(!i||!i.silent){for(var r="on"+e,a=Q(e,t,n);i&&(i[r]&&(a.cancelBubble=i[r].call(i,a)),i.trigger(e,a),i=i.parent,!a.cancelBubble););a.cancelBubble||(this.trigger(e,a),this.painter&&this.painter.eachOtherLayer(function(t){"function"==typeof t[r]&&t[r].call(t,a),t.trigger&&t.trigger(e,a)}))}},findHover:function(t,e,n){for(var i=this.storage.getDisplayList(),r={x:t,y:e},a=i.length-1;a>=0;a--){var o;if(i[a]!==n&&!i[a].ignore&&(o=tt(i[a],t,e))&&(!r.topTarget&&(r.topTarget=i[a]),o!==rh)){r.target=i[a];break}}return r}},f(["click","mousedown","mouseup","mousewheel","dblclick","contextmenu"],function(t){oh.prototype[t]=function(e){var n=this.findHover(e.zrX,e.zrY),i=n.target;if("mousedown"===t)this._downEl=i,this._downPoint=[e.zrX,e.zrY],this._upEl=i;else if("mouseup"===t)this._upEl=i;else if("click"===t){if(this._downEl!==this._upEl||!this._downPoint||th(this._downPoint,[e.zrX,e.zrY])>4)return;this._downPoint=null}this.dispatchToElement(n,t,e)}}),u(oh,ih),u(oh,$);var sh="undefined"==typeof Float32Array?Array:Float32Array,lh=nt,hh=5e-5,uh=function(t){(t=t||{}).position||(this.position=[0,0]),null==t.rotation&&(this.rotation=0),t.scale||(this.scale=[1,1]),this.origin=this.origin||null},ch=uh.prototype;ch.transform=null,ch.needLocalTransform=function(){return ht(this.rotation)||ht(this.position[0])||ht(this.position[1])||ht(this.scale[0]-1)||ht(this.scale[1]-1)},ch.updateTransform=function(){var t=this.parent,e=t&&t.transform,n=this.needLocalTransform(),i=this.transform;n||e?(i=i||et(),n?this.getLocalTransform(i):lh(i),e&&(n?rt(i,t.transform,i):it(i,t.transform)),this.transform=i,this.invTransform=this.invTransform||et(),lt(this.invTransform,i)):i&&lh(i)},ch.getLocalTransform=function(t){return uh.getLocalTransform(this,t)},ch.setTransform=function(t){var e=this.transform,n=t.dpr||1;e?t.setTransform(n*e[0],n*e[1],n*e[2],n*e[3],n*e[4],n*e[5]):t.setTransform(n,0,0,n,0,0)},ch.restoreTransform=function(t){var e=t.dpr||1;t.setTransform(e,0,0,e,0,0)};var fh=[];ch.decomposeTransform=function(){if(this.transform){var t=this.parent,e=this.transform;t&&t.transform&&(rt(fh,t.invTransform,e),e=fh);var n=e[0]*e[0]+e[1]*e[1],i=e[2]*e[2]+e[3]*e[3],r=this.position,a=this.scale;ht(n-1)&&(n=Math.sqrt(n)),ht(i-1)&&(i=Math.sqrt(i)),e[0]<0&&(n=-n),e[3]<0&&(i=-i),r[0]=e[4],r[1]=e[5],a[0]=n,a[1]=i,this.rotation=Math.atan2(-e[1]/i,e[0]/n)}},ch.getGlobalScale=function(){var t=this.transform;if(!t)return[1,1];var e=Math.sqrt(t[0]*t[0]+t[1]*t[1]),n=Math.sqrt(t[2]*t[2]+t[3]*t[3]);return t[0]<0&&(e=-e),t[3]<0&&(n=-n),[e,n]},ch.transformCoordToLocal=function(t,e){var n=[t,e],i=this.invTransform;return i&&Y(n,n,i),n},ch.transformCoordToGlobal=function(t,e){var n=[t,e],i=this.transform;return i&&Y(n,n,i),n},uh.getLocalTransform=function(t,e){lh(e=e||[]);var n=t.origin,i=t.scale||[1,1],r=t.rotation||0,a=t.position||[0,0];return n&&(e[4]-=n[0],e[5]-=n[1]),st(e,e,i),r&&ot(e,e,r),n&&(e[4]+=n[0],e[5]+=n[1]),e[4]+=a[0],e[5]+=a[1],e};var dh={linear:function(t){return t},quadraticIn:function(t){return t*t},quadraticOut:function(t){return t*(2-t)},quadraticInOut:function(t){return(t*=2)<1?.5*t*t:-.5*(--t*(t-2)-1)},cubicIn:function(t){return t*t*t},cubicOut:function(t){return--t*t*t+1},cubicInOut:function(t){return(t*=2)<1?.5*t*t*t:.5*((t-=2)*t*t+2)},quarticIn:function(t){return t*t*t*t},quarticOut:function(t){return 1- --t*t*t*t},quarticInOut:function(t){return(t*=2)<1?.5*t*t*t*t:-.5*((t-=2)*t*t*t-2)},quinticIn:function(t){return t*t*t*t*t},quinticOut:function(t){return--t*t*t*t*t+1},quinticInOut:function(t){return(t*=2)<1?.5*t*t*t*t*t:.5*((t-=2)*t*t*t*t+2)},sinusoidalIn:function(t){return 1-Math.cos(t*Math.PI/2)},sinusoidalOut:function(t){return Math.sin(t*Math.PI/2)},sinusoidalInOut:function(t){return.5*(1-Math.cos(Math.PI*t))},exponentialIn:function(t){return 0===t?0:Math.pow(1024,t-1)},exponentialOut:function(t){return 1===t?1:1-Math.pow(2,-10*t)},exponentialInOut:function(t){return 0===t?0:1===t?1:(t*=2)<1?.5*Math.pow(1024,t-1):.5*(2-Math.pow(2,-10*(t-1)))},circularIn:function(t){return 1-Math.sqrt(1-t*t)},circularOut:function(t){return Math.sqrt(1- --t*t)},circularInOut:function(t){return(t*=2)<1?-.5*(Math.sqrt(1-t*t)-1):.5*(Math.sqrt(1-(t-=2)*t)+1)},elasticIn:function(t){var e,n=.1;return 0===t?0:1===t?1:(!n||n<1?(n=1,e=.1):e=.4*Math.asin(1/n)/(2*Math.PI),-n*Math.pow(2,10*(t-=1))*Math.sin((t-e)*(2*Math.PI)/.4))},elasticOut:function(t){var e,n=.1;return 0===t?0:1===t?1:(!n||n<1?(n=1,e=.1):e=.4*Math.asin(1/n)/(2*Math.PI),n*Math.pow(2,-10*t)*Math.sin((t-e)*(2*Math.PI)/.4)+1)},elasticInOut:function(t){var e,n=.1;return 0===t?0:1===t?1:(!n||n<1?(n=1,e=.1):e=.4*Math.asin(1/n)/(2*Math.PI),(t*=2)<1?n*Math.pow(2,10*(t-=1))*Math.sin((t-e)*(2*Math.PI)/.4)*-.5:n*Math.pow(2,-10*(t-=1))*Math.sin((t-e)*(2*Math.PI)/.4)*.5+1)},backIn:function(t){var e=1.70158;return t*t*((e+1)*t-e)},backOut:function(t){var e=1.70158;return--t*t*((e+1)*t+e)+1},backInOut:function(t){var e=2.5949095;return(t*=2)<1?t*t*((e+1)*t-e)*.5:.5*((t-=2)*t*((e+1)*t+e)+2)},bounceIn:function(t){return 1-dh.bounceOut(1-t)},bounceOut:function(t){return t<1/2.75?7.5625*t*t:t<2/2.75?7.5625*(t-=1.5/2.75)*t+.75:t<2.5/2.75?7.5625*(t-=2.25/2.75)*t+.9375:7.5625*(t-=2.625/2.75)*t+.984375},bounceInOut:function(t){return t<.5?.5*dh.bounceIn(2*t):.5*dh.bounceOut(2*t-1)+.5}};ut.prototype={constructor:ut,step:function(t,e){if(this._initialized||(this._startTime=t+this._delay,this._initialized=!0),this._paused)this._pausedTime+=e;else{var n=(t-this._startTime-this._pausedTime)/this._life;if(!(n<0)){n=Math.min(n,1);var i=this.easing,r="string"==typeof i?dh[i]:i,a="function"==typeof r?r(n):n;return this.fire("frame",a),1==n?this.loop?(this.restart(t),"restart"):(this._needsRemove=!0,"destroy"):null}}},restart:function(t){var e=(t-this._startTime-this._pausedTime)%this._life;this._startTime=t-e+this.gap,this._pausedTime=0,this._needsRemove=!1},fire:function(t,e){this[t="on"+t]&&this[t](this._target,e)},pause:function(){this._paused=!0},resume:function(){this._paused=!1}};var ph=function(){this.head=null,this.tail=null,this._len=0},gh=ph.prototype;gh.insert=function(t){var e=new mh(t);return this.insertEntry(e),e},gh.insertEntry=function(t){this.head?(this.tail.next=t,t.prev=this.tail,t.next=null,this.tail=t):this.head=this.tail=t,this._len++},gh.remove=function(t){var e=t.prev,n=t.next;e?e.next=n:this.head=n,n?n.prev=e:this.tail=e,t.next=t.prev=null,this._len--},gh.len=function(){return this._len},gh.clear=function(){this.head=this.tail=null,this._len=0};var mh=function(t){this.value=t,this.next,this.prev},vh=function(t){this._list=new ph,this._map={},this._maxSize=t||10,this._lastRemovedEntry=null},yh=vh.prototype;yh.put=function(t,e){var n=this._list,i=this._map,r=null;if(null==i[t]){var a=n.len(),o=this._lastRemovedEntry;if(a>=this._maxSize&&a>0){var s=n.head;n.remove(s),delete i[s.key],r=s.value,this._lastRemovedEntry=s}o?o.value=e:o=new mh(e),o.key=t,n.insertEntry(o),i[t]=o}return r},yh.get=function(t){var e=this._map[t],n=this._list;if(null!=e)return e!==n.tail&&(n.remove(e),n.insertEntry(e)),e.value},yh.clear=function(){this._list.clear(),this._map={}};var _h={transparent:[0,0,0,0],aliceblue:[240,248,255,1],antiquewhite:[250,235,215,1],aqua:[0,255,255,1],aquamarine:[127,255,212,1],azure:[240,255,255,1],beige:[245,245,220,1],bisque:[255,228,196,1],black:[0,0,0,1],blanchedalmond:[255,235,205,1],blue:[0,0,255,1],blueviolet:[138,43,226,1],brown:[165,42,42,1],burlywood:[222,184,135,1],cadetblue:[95,158,160,1],chartreuse:[127,255,0,1],chocolate:[210,105,30,1],coral:[255,127,80,1],cornflowerblue:[100,149,237,1],cornsilk:[255,248,220,1],crimson:[220,20,60,1],cyan:[0,255,255,1],darkblue:[0,0,139,1],darkcyan:[0,139,139,1],darkgoldenrod:[184,134,11,1],darkgray:[169,169,169,1],darkgreen:[0,100,0,1],darkgrey:[169,169,169,1],darkkhaki:[189,183,107,1],darkmagenta:[139,0,139,1],darkolivegreen:[85,107,47,1],darkorange:[255,140,0,1],darkorchid:[153,50,204,1],darkred:[139,0,0,1],darksalmon:[233,150,122,1],darkseagreen:[143,188,143,1],darkslateblue:[72,61,139,1],darkslategray:[47,79,79,1],darkslategrey:[47,79,79,1],darkturquoise:[0,206,209,1],darkviolet:[148,0,211,1],deeppink:[255,20,147,1],deepskyblue:[0,191,255,1],dimgray:[105,105,105,1],dimgrey:[105,105,105,1],dodgerblue:[30,144,255,1],firebrick:[178,34,34,1],floralwhite:[255,250,240,1],forestgreen:[34,139,34,1],fuchsia:[255,0,255,1],gainsboro:[220,220,220,1],ghostwhite:[248,248,255,1],gold:[255,215,0,1],goldenrod:[218,165,32,1],gray:[128,128,128,1],green:[0,128,0,1],greenyellow:[173,255,47,1],grey:[128,128,128,1],honeydew:[240,255,240,1],hotpink:[255,105,180,1],indianred:[205,92,92,1],indigo:[75,0,130,1],ivory:[255,255,240,1],khaki:[240,230,140,1],lavender:[230,230,250,1],lavenderblush:[255,240,245,1],lawngreen:[124,252,0,1],lemonchiffon:[255,250,205,1],lightblue:[173,216,230,1],lightcoral:[240,128,128,1],lightcyan:[224,255,255,1],lightgoldenrodyellow:[250,250,210,1],lightgray:[211,211,211,1],lightgreen:[144,238,144,1],lightgrey:[211,211,211,1],lightpink:[255,182,193,1],lightsalmon:[255,160,122,1],lightseagreen:[32,178,170,1],lightskyblue:[135,206,250,1],lightslategray:[119,136,153,1],lightslategrey:[119,136,153,1],lightsteelblue:[176,196,222,1],lightyellow:[255,255,224,1],lime:[0,255,0,1],limegreen:[50,205,50,1],linen:[250,240,230,1],magenta:[255,0,255,1],maroon:[128,0,0,1],mediumaquamarine:[102,205,170,1],mediumblue:[0,0,205,1],mediumorchid:[186,85,211,1],mediumpurple:[147,112,219,1],mediumseagreen:[60,179,113,1],mediumslateblue:[123,104,238,1],mediumspringgreen:[0,250,154,1],mediumturquoise:[72,209,204,1],mediumvioletred:[199,21,133,1],midnightblue:[25,25,112,1],mintcream:[245,255,250,1],mistyrose:[255,228,225,1],moccasin:[255,228,181,1],navajowhite:[255,222,173,1],navy:[0,0,128,1],oldlace:[253,245,230,1],olive:[128,128,0,1],olivedrab:[107,142,35,1],orange:[255,165,0,1],orangered:[255,69,0,1],orchid:[218,112,214,1],palegoldenrod:[238,232,170,1],palegreen:[152,251,152,1],paleturquoise:[175,238,238,1],palevioletred:[219,112,147,1],papayawhip:[255,239,213,1],peachpuff:[255,218,185,1],peru:[205,133,63,1],pink:[255,192,203,1],plum:[221,160,221,1],powderblue:[176,224,230,1],purple:[128,0,128,1],red:[255,0,0,1],rosybrown:[188,143,143,1],royalblue:[65,105,225,1],saddlebrown:[139,69,19,1],salmon:[250,128,114,1],sandybrown:[244,164,96,1],seagreen:[46,139,87,1],seashell:[255,245,238,1],sienna:[160,82,45,1],silver:[192,192,192,1],skyblue:[135,206,235,1],slateblue:[106,90,205,1],slategray:[112,128,144,1],slategrey:[112,128,144,1],snow:[255,250,250,1],springgreen:[0,255,127,1],steelblue:[70,130,180,1],tan:[210,180,140,1],teal:[0,128,128,1],thistle:[216,191,216,1],tomato:[255,99,71,1],turquoise:[64,224,208,1],violet:[238,130,238,1],wheat:[245,222,179,1],white:[255,255,255,1],whitesmoke:[245,245,245,1],yellow:[255,255,0,1],yellowgreen:[154,205,50,1]},xh=new vh(20),wh=null,bh=Array.prototype.slice,Sh=function(t,e,n,i){this._tracks={},this._target=t,this._loop=e||!1,this._getter=n||St,this._setter=i||Mt,this._clipCount=0,this._delay=0,this._doneList=[],this._onframeList=[],this._clipList=[]};Sh.prototype={when:function(t,e){var n=this._tracks;for(var i in e)if(e.hasOwnProperty(i)){if(!n[i]){n[i]=[];var r=this._getter(this._target,i);if(null==r)continue;0!==t&&n[i].push({time:0,value:Pt(r)})}n[i].push({time:t,value:e[i]})}return this},during:function(t){return this._onframeList.push(t),this},pause:function(){for(var t=0;t<this._clipList.length;t++)this._clipList[t].pause();this._paused=!0},resume:function(){for(var t=0;t<this._clipList.length;t++)this._clipList[t].resume();this._paused=!1},isPaused:function(){return!!this._paused},_doneCallback:function(){this._tracks={},this._clipList.length=0;for(var t=this._doneList,e=t.length,n=0;n<e;n++)t[n].call(this)},start:function(t,e){var n,i=this,r=0;for(var a in this._tracks)if(this._tracks.hasOwnProperty(a)){var o=Bt(this,t,function(){--r||i._doneCallback()},this._tracks[a],a,e);o&&(this._clipList.push(o),r++,this.animation&&this.animation.addClip(o),n=o)}if(n){var s=n.onframe;n.onframe=function(t,e){s(t,e);for(var n=0;n<i._onframeList.length;n++)i._onframeList[n](t,e)}}return r||this._doneCallback(),this},stop:function(t){for(var e=this._clipList,n=this.animation,i=0;i<e.length;i++){var r=e[i];t&&r.onframe(this._target,1),n&&n.removeClip(r)}e.length=0},delay:function(t){return this._delay=t,this},done:function(t){return t&&this._doneList.push(t),this},getClips:function(){return this._clipList}};var Mh=1;"undefined"!=typeof window&&(Mh=Math.max(window.devicePixelRatio||1,1));var Th=Mh,Ih=function(){},Ch=Ih,kh=function(){this.animators=[]};kh.prototype={constructor:kh,animate:function(t,e){var n,i=!1,r=this,a=this.__zr;if(t){var o=t.split("."),s=r;i="shape"===o[0];for(var h=0,u=o.length;h<u;h++)s&&(s=s[o[h]]);s&&(n=s)}else n=r;if(n){var c=r.animators,f=new Sh(n,e);return f.during(function(t){r.dirty(i)}).done(function(){c.splice(l(c,f),1)}),c.push(f),a&&a.animation.addAnimator(f),f}Ch('Property "'+t+'" is not existed in element '+r.id)},stopAnimation:function(t){for(var e=this.animators,n=e.length,i=0;i<n;i++)e[i].stop(t);return e.length=0,this},animateTo:function(t,e,n,i,r,a){x(n)?(r=i,i=n,n=0):_(i)?(r=i,i="linear",n=0):_(n)?(r=n,n=0):_(e)?(r=e,e=500):e||(e=500),this.stopAnimation(),this._animateToShallow("",this,t,e,n);var o=this.animators.slice(),s=o.length;s||r&&r();for(var l=0;l<o.length;l++)o[l].done(function(){--s||r&&r()}).start(i,a)},_animateToShallow:function(t,e,n,i,r){var a={},o=0;for(var s in n)if(n.hasOwnProperty(s))if(null!=e[s])w(n[s])&&!c(n[s])?this._animateToShallow(t?t+"."+s:s,e[s],n[s],i,r):(a[s]=n[s],o++);else if(null!=n[s])if(t){var l={};l[t]={},l[t][s]=n[s],this.attr(l)}else this.attr(s,n[s]);return o>0&&this.animate(t,!1).when(null==i?500:i,a).delay(r||0),this}};var Dh=function(t){uh.call(this,t),ih.call(this,t),kh.call(this,t),this.id=t.id||zl()};Dh.prototype={type:"element",name:"",__zr:null,ignore:!1,clipPath:null,isGroup:!1,drift:function(t,e){switch(this.draggable){case"horizontal":e=0;break;case"vertical":t=0}var n=this.transform;n||(n=this.transform=[1,0,0,1,0,0]),n[4]+=t,n[5]+=e,this.decomposeTransform(),this.dirty(!1)},beforeUpdate:function(){},afterUpdate:function(){},update:function(){this.updateTransform()},traverse:function(t,e){},attrKV:function(t,e){if("position"===t||"scale"===t||"origin"===t){if(e){var n=this[t];n||(n=this[t]=[]),n[0]=e[0],n[1]=e[1]}}else this[t]=e},hide:function(){this.ignore=!0,this.__zr&&this.__zr.refresh()},show:function(){this.ignore=!1,this.__zr&&this.__zr.refresh()},attr:function(t,e){if("string"==typeof t)this.attrKV(t,e);else if(w(t))for(var n in t)t.hasOwnProperty(n)&&this.attrKV(n,t[n]);return this.dirty(!1),this},setClipPath:function(t){var e=this.__zr;e&&t.addSelfToZr(e),this.clipPath&&this.clipPath!==t&&this.removeClipPath(),this.clipPath=t,t.__zr=e,t.__clipTarget=this,this.dirty(!1)},removeClipPath:function(){var t=this.clipPath;t&&(t.__zr&&t.removeSelfFromZr(t.__zr),t.__zr=null,t.__clipTarget=null,this.clipPath=null,this.dirty(!1))},addSelfToZr:function(t){this.__zr=t;var e=this.animators;if(e)for(var n=0;n<e.length;n++)t.animation.addAnimator(e[n]);this.clipPath&&this.clipPath.addSelfToZr(t)},removeSelfFromZr:function(t){this.__zr=null;var e=this.animators;if(e)for(var n=0;n<e.length;n++)t.animation.removeAnimator(e[n]);this.clipPath&&this.clipPath.removeSelfFromZr(t)}},u(Dh,kh),u(Dh,uh),u(Dh,ih);var Ah=Y,Lh=Math.min,Ph=Math.max;Rt.prototype={constructor:Rt,union:function(t){var e=Lh(t.x,this.x),n=Lh(t.y,this.y);this.width=Ph(t.x+t.width,this.x+this.width)-e,this.height=Ph(t.y+t.height,this.y+this.height)-n,this.x=e,this.y=n},applyTransform:function(){var t=[],e=[],n=[],i=[];return function(r){if(r){t[0]=n[0]=this.x,t[1]=i[1]=this.y,e[0]=i[0]=this.x+this.width,e[1]=n[1]=this.y+this.height,Ah(t,t,r),Ah(e,e,r),Ah(n,n,r),Ah(i,i,r),this.x=Lh(t[0],e[0],n[0],i[0]),this.y=Lh(t[1],e[1],n[1],i[1]);var a=Ph(t[0],e[0],n[0],i[0]),o=Ph(t[1],e[1],n[1],i[1]);this.width=a-this.x,this.height=o-this.y}}}(),calculateTransform:function(t){var e=this,n=t.width/e.width,i=t.height/e.height,r=et();return at(r,r,[-e.x,-e.y]),st(r,r,[n,i]),at(r,r,[t.x,t.y]),r},intersect:function(t){if(!t)return!1;t instanceof Rt||(t=Rt.create(t));var e=this,n=e.x,i=e.x+e.width,r=e.y,a=e.y+e.height,o=t.x,s=t.x+t.width,l=t.y,h=t.y+t.height;return!(i<o||s<n||a<l||h<r)},contain:function(t,e){var n=this;return t>=n.x&&t<=n.x+n.width&&e>=n.y&&e<=n.y+n.height},clone:function(){return new Rt(this.x,this.y,this.width,this.height)},copy:function(t){this.x=t.x,this.y=t.y,this.width=t.width,this.height=t.height},plain:function(){return{x:this.x,y:this.y,width:this.width,height:this.height}}},Rt.create=function(t){return new Rt(t.x,t.y,t.width,t.height)};var Oh=function(t){t=t||{},Dh.call(this,t);for(var e in t)t.hasOwnProperty(e)&&(this[e]=t[e]);this._children=[],this.__storage=null,this.__dirty=!0};Oh.prototype={constructor:Oh,isGroup:!0,type:"group",silent:!1,children:function(){return this._children.slice()},childAt:function(t){return this._children[t]},childOfName:function(t){for(var e=this._children,n=0;n<e.length;n++)if(e[n].name===t)return e[n]},childCount:function(){return this._children.length},add:function(t){return t&&t!==this&&t.parent!==this&&(this._children.push(t),this._doAdd(t)),this},addBefore:function(t,e){if(t&&t!==this&&t.parent!==this&&e&&e.parent===this){var n=this._children,i=n.indexOf(e);i>=0&&(n.splice(i,0,t),this._doAdd(t))}return this},_doAdd:function(t){t.parent&&t.parent.remove(t),t.parent=this;var e=this.__storage,n=this.__zr;e&&e!==t.__storage&&(e.addToStorage(t),t instanceof Oh&&t.addChildrenToStorage(e)),n&&n.refresh()},remove:function(t){var e=this.__zr,n=this.__storage,i=this._children,r=l(i,t);return r<0?this:(i.splice(r,1),t.parent=null,n&&(n.delFromStorage(t),t instanceof Oh&&t.delChildrenFromStorage(n)),e&&e.refresh(),this)},removeAll:function(){var t,e,n=this._children,i=this.__storage;for(e=0;e<n.length;e++)t=n[e],i&&(i.delFromStorage(t),t instanceof Oh&&t.delChildrenFromStorage(i)),t.parent=null;return n.length=0,this},eachChild:function(t,e){for(var n=this._children,i=0;i<n.length;i++){var r=n[i];t.call(e,r,i)}return this},traverse:function(t,e){for(var n=0;n<this._children.length;n++){var i=this._children[n];t.call(e,i),"group"===i.type&&i.traverse(t,e)}return this},addChildrenToStorage:function(t){for(var e=0;e<this._children.length;e++){var n=this._children[e];t.addToStorage(n),n instanceof Oh&&n.addChildrenToStorage(t)}},delChildrenFromStorage:function(t){for(var e=0;e<this._children.length;e++){var n=this._children[e];t.delFromStorage(n),n instanceof Oh&&n.delChildrenFromStorage(t)}},dirty:function(){return this.__dirty=!0,this.__zr&&this.__zr.refresh(),this},getBoundingRect:function(t){for(var e=null,n=new Rt(0,0,0,0),i=t||this._children,r=[],a=0;a<i.length;a++){var o=i[a];if(!o.ignore&&!o.invisible){var s=o.getBoundingRect(),l=o.getLocalTransform(r);l?(n.copy(s),n.applyTransform(l),(e=e||n.clone()).union(n)):(e=e||s.clone()).union(s)}}return e||n}},h(Oh,Dh);var Eh=32,Bh=7,Rh=function(){this._roots=[],this._displayList=[],this._displayListLen=0};Rh.prototype={constructor:Rh,traverse:function(t,e){for(var n=0;n<this._roots.length;n++)this._roots[n].traverse(t,e)},getDisplayList:function(t,e){return e=e||!1,t&&this.updateDisplayList(e),this._displayList},updateDisplayList:function(t){this._displayListLen=0;for(var e=this._roots,n=this._displayList,i=0,r=e.length;i<r;i++)this._updateAndAddDisplayable(e[i],null,t);n.length=this._displayListLen,Fl.canvasSupported&&qt(n,Xt)},_updateAndAddDisplayable:function(t,e,n){if(!t.ignore||n){t.beforeUpdate(),t.__dirty&&t.update(),t.afterUpdate();var i=t.clipPath;if(i){e=e?e.slice():[];for(var r=i,a=t;r;)r.parent=a,r.updateTransform(),e.push(r),a=r,r=r.clipPath}if(t.isGroup){for(var o=t._children,s=0;s<o.length;s++){var l=o[s];t.__dirty&&(l.__dirty=!0),this._updateAndAddDisplayable(l,e,n)}t.__dirty=!1}else t.__clipPaths=e,this._displayList[this._displayListLen++]=t}},addRoot:function(t){t.__storage!==this&&(t instanceof Oh&&t.addChildrenToStorage(this),this.addToStorage(t),this._roots.push(t))},delRoot:function(t){if(null==t){for(n=0;n<this._roots.length;n++){var e=this._roots[n];e instanceof Oh&&e.delChildrenFromStorage(this)}return this._roots=[],this._displayList=[],void(this._displayListLen=0)}if(t instanceof Array)for(var n=0,i=t.length;n<i;n++)this.delRoot(t[n]);else{var r=l(this._roots,t);r>=0&&(this.delFromStorage(t),this._roots.splice(r,1),t instanceof Oh&&t.delChildrenFromStorage(this))}},addToStorage:function(t){return t&&(t.__storage=this,t.dirty(!1)),this},delFromStorage:function(t){return t&&(t.__storage=null),this},dispose:function(){this._renderList=this._roots=null},displayableSortFunc:Xt};var zh={shadowBlur:1,shadowOffsetX:1,shadowOffsetY:1,textShadowBlur:1,textShadowOffsetX:1,textShadowOffsetY:1,textBoxShadowBlur:1,textBoxShadowOffsetX:1,textBoxShadowOffsetY:1},Nh=function(t,e,n){return zh.hasOwnProperty(e)?n*=t.dpr:n},Fh=[["shadowBlur",0],["shadowOffsetX",0],["shadowOffsetY",0],["shadowColor","#000"],["lineCap","butt"],["lineJoin","miter"],["miterLimit",10]],Vh=function(t,e){this.extendFrom(t,!1),this.host=e};Vh.prototype={constructor:Vh,host:null,fill:"#000",stroke:null,opacity:1,lineDash:null,lineDashOffset:0,shadowBlur:0,shadowOffsetX:0,shadowOffsetY:0,lineWidth:1,strokeNoScale:!1,text:null,font:null,textFont:null,fontStyle:null,fontWeight:null,fontSize:null,fontFamily:null,textTag:null,textFill:"#000",textStroke:null,textWidth:null,textHeight:null,textStrokeWidth:0,textLineHeight:null,textPosition:"inside",textRect:null,textOffset:null,textAlign:null,textVerticalAlign:null,textDistance:5,textShadowColor:"transparent",textShadowBlur:0,textShadowOffsetX:0,textShadowOffsetY:0,textBoxShadowColor:"transparent",textBoxShadowBlur:0,textBoxShadowOffsetX:0,textBoxShadowOffsetY:0,transformText:!1,textRotation:0,textOrigin:null,textBackgroundColor:null,textBorderColor:null,textBorderWidth:0,textBorderRadius:0,textPadding:null,rich:null,truncate:null,blend:null,bind:function(t,e,n){for(var i=this,r=n&&n.style,a=!r,o=0;o<Fh.length;o++){var s=Fh[o],l=s[0];(a||i[l]!==r[l])&&(t[l]=Nh(t,l,i[l]||s[1]))}if((a||i.fill!==r.fill)&&(t.fillStyle=i.fill),(a||i.stroke!==r.stroke)&&(t.strokeStyle=i.stroke),(a||i.opacity!==r.opacity)&&(t.globalAlpha=null==i.opacity?1:i.opacity),(a||i.blend!==r.blend)&&(t.globalCompositeOperation=i.blend||"source-over"),this.hasStroke()){var h=i.lineWidth;t.lineWidth=h/(this.strokeNoScale&&e&&e.getLineScale?e.getLineScale():1)}},hasFill:function(){var t=this.fill;return null!=t&&"none"!==t},hasStroke:function(){var t=this.stroke;return null!=t&&"none"!==t&&this.lineWidth>0},extendFrom:function(t,e){if(t)for(var n in t)!t.hasOwnProperty(n)||!0!==e&&(!1===e?this.hasOwnProperty(n):null==t[n])||(this[n]=t[n])},set:function(t,e){"string"==typeof t?this[t]=e:this.extendFrom(t,!0)},clone:function(){var t=new this.constructor;return t.extendFrom(this,!0),t},getGradient:function(t,e,n){for(var i=("radial"===e.type?Yt:Zt)(t,e,n),r=e.colorStops,a=0;a<r.length;a++)i.addColorStop(r[a].offset,r[a].color);return i}};for(var Wh=Vh.prototype,Hh=0;Hh<Fh.length;Hh++){var Gh=Fh[Hh];Gh[0]in Wh||(Wh[Gh[0]]=Gh[1])}Vh.getGradient=Wh.getGradient;var qh=function(t,e){this.image=t,this.repeat=e,this.type="pattern"};qh.prototype.getCanvasPattern=function(t){return t.createPattern(this.image,this.repeat||"repeat")};var Xh=function(t,e,n){var i;n=n||Th,"string"==typeof t?i=jt(t,e,n):w(t)&&(t=(i=t).id),this.id=t,this.dom=i;var r=i.style;r&&(i.onselectstart=Ut,r["-webkit-user-select"]="none",r["user-select"]="none",r["-webkit-touch-callout"]="none",r["-webkit-tap-highlight-color"]="rgba(0,0,0,0)",r.padding=0,r.margin=0,r["border-width"]=0),this.domBack=null,this.ctxBack=null,this.painter=e,this.config=null,this.clearColor=0,this.motionBlur=!1,this.lastFrameAlpha=.7,this.dpr=n};Xh.prototype={constructor:Xh,__dirty:!0,__used:!1,__drawIndex:0,__startIndex:0,__endIndex:0,incremental:!1,getElementCount:function(){return this.__endIndex-this.__startIndex},initContext:function(){this.ctx=this.dom.getContext("2d"),this.ctx.dpr=this.dpr},createBackBuffer:function(){var t=this.dpr;this.domBack=jt("back-"+this.id,this.painter,t),this.ctxBack=this.domBack.getContext("2d"),1!=t&&this.ctxBack.scale(t,t)},resize:function(t,e){var n=this.dpr,i=this.dom,r=i.style,a=this.domBack;r.width=t+"px",r.height=e+"px",i.width=t*n,i.height=e*n,a&&(a.width=t*n,a.height=e*n,1!=n&&this.ctxBack.scale(n,n))},clear:function(t){var e=this.dom,n=this.ctx,i=e.width,r=e.height,a=this.clearColor,o=this.motionBlur&&!t,s=this.lastFrameAlpha,l=this.dpr;if(o&&(this.domBack||this.createBackBuffer(),this.ctxBack.globalCompositeOperation="copy",this.ctxBack.drawImage(e,0,0,i/l,r/l)),n.clearRect(0,0,i,r),a){var h;a.colorStops?(h=a.__canvasGradient||Vh.getGradient(n,a,{x:0,y:0,width:i,height:r}),a.__canvasGradient=h):a.image&&(h=qh.prototype.getCanvasPattern.call(a,n)),n.save(),n.fillStyle=h||a,n.fillRect(0,0,i,r),n.restore()}if(o){var u=this.domBack;n.save(),n.globalAlpha=s,n.drawImage(u,0,0,i,r),n.restore()}}};var Zh="undefined"!=typeof window&&(window.requestAnimationFrame&&window.requestAnimationFrame.bind(window)||window.msRequestAnimationFrame&&window.msRequestAnimationFrame.bind(window)||window.mozRequestAnimationFrame||window.webkitRequestAnimationFrame)||function(t){setTimeout(t,16)},Yh=new vh(50),Uh={},jh=0,$h=5e3,Kh=/\{([a-zA-Z0-9_]+)\|([^}]*)\}/g,Qh="12px sans-serif",Jh={};Jh.measureText=function(t,e){var n=s();return n.font=e||Qh,n.measureText(t)};var tu={left:1,right:1,center:1},eu={top:1,bottom:1,middle:1},nu=new Rt,iu=function(){};iu.prototype={constructor:iu,drawRectText:function(t,e){var n=this.style;e=n.textRect||e,this.__dirty&&ye(n);var i=n.text;if(null!=i&&(i+=""),Be(i,n)){t.save();var r=this.transform;n.transformText?this.setTransform(t):r&&(nu.copy(e),nu.applyTransform(r),e=nu),xe(this,t,i,n,e),t.restore()}}},Re.prototype={constructor:Re,type:"displayable",__dirty:!0,invisible:!1,z:0,z2:0,zlevel:0,draggable:!1,dragging:!1,silent:!1,culling:!1,cursor:"pointer",rectHover:!1,progressive:!1,incremental:!1,inplace:!1,beforeBrush:function(t){},afterBrush:function(t){},brush:function(t,e){},getBoundingRect:function(){},contain:function(t,e){return this.rectContain(t,e)},traverse:function(t,e){t.call(e,this)},rectContain:function(t,e){var n=this.transformCoordToLocal(t,e);return this.getBoundingRect().contain(n[0],n[1])},dirty:function(){this.__dirty=!0,this._rect=null,this.__zr&&this.__zr.refresh()},animateStyle:function(t){return this.animate("style",t)},attrKV:function(t,e){"style"!==t?Dh.prototype.attrKV.call(this,t,e):this.style.set(e)},setStyle:function(t,e){return this.style.set(t,e),this.dirty(!1),this},useStyle:function(t){return this.style=new Vh(t,this),this.dirty(!1),this}},h(Re,Dh),u(Re,iu),ze.prototype={constructor:ze,type:"image",brush:function(t,e){var n=this.style,i=n.image;n.bind(t,this,e);var r=this._image=Kt(i,this._image,this,this.onload);if(r&&Jt(r)){var a=n.x||0,o=n.y||0,s=n.width,l=n.height,h=r.width/r.height;if(null==s&&null!=l?s=l*h:null==l&&null!=s?l=s/h:null==s&&null==l&&(s=r.width,l=r.height),this.setTransform(t),n.sWidth&&n.sHeight){var u=n.sx||0,c=n.sy||0;t.drawImage(r,u,c,n.sWidth,n.sHeight,a,o,s,l)}else if(n.sx&&n.sy){var f=s-(u=n.sx),d=l-(c=n.sy);t.drawImage(r,u,c,f,d,a,o,s,l)}else t.drawImage(r,a,o,s,l);null!=n.text&&(this.restoreTransform(t),this.drawRectText(t,this.getBoundingRect()))}},getBoundingRect:function(){var t=this.style;return this._rect||(this._rect=new Rt(t.x||0,t.y||0,t.width||0,t.height||0)),this._rect}},h(ze,Re);var ru=new Rt(0,0,0,0),au=new Rt(0,0,0,0),ou=function(t,e,n){this.type="canvas";var i=!t.nodeName||"CANVAS"===t.nodeName.toUpperCase();this._opts=n=a({},n||{}),this.dpr=n.devicePixelRatio||Th,this._singleCanvas=i,this.root=t;var r=t.style;r&&(r["-webkit-tap-highlight-color"]="transparent",r["-webkit-user-select"]=r["user-select"]=r["-webkit-touch-callout"]="none",t.innerHTML=""),this.storage=e;var o=this._zlevelList=[],s=this._layers={};if(this._layerConfig={},this._needsManuallyCompositing=!1,i){null!=n.width&&(t.width=n.width),null!=n.height&&(t.height=n.height);var l=t.width,h=t.height;this._width=l,this._height=h;var u=new Xh(t,this,1);u.__builtin__=!0,u.initContext(),s[314159]=u,o.push(314159),this._domRoot=t}else{this._width=this._getSize(0),this._height=this._getSize(1);var c=this._domRoot=Ge(this._width,this._height);t.appendChild(c)}this._hoverlayer=null,this._hoverElements=[]};ou.prototype={constructor:ou,getType:function(){return"canvas"},isSingleCanvas:function(){return this._singleCanvas},getViewportRoot:function(){return this._domRoot},getViewportRootOffset:function(){var t=this.getViewportRoot();if(t)return{offsetLeft:t.offsetLeft||0,offsetTop:t.offsetTop||0}},refresh:function(t){var e=this.storage.getDisplayList(!0),n=this._zlevelList;this._redrawId=Math.random(),this._paintList(e,t,this._redrawId);for(var i=0;i<n.length;i++){var r=n[i],a=this._layers[r];!a.__builtin__&&a.refresh&&a.refresh()}return this.refreshHover(),this},addHover:function(t,e){if(!t.__hoverMir){var n=new t.constructor({style:t.style,shape:t.shape});n.__from=t,t.__hoverMir=n,n.setStyle(e),this._hoverElements.push(n)}},removeHover:function(t){var e=t.__hoverMir,n=this._hoverElements,i=l(n,e);i>=0&&n.splice(i,1),t.__hoverMir=null},clearHover:function(t){for(var e=this._hoverElements,n=0;n<e.length;n++){var i=e[n].__from;i&&(i.__hoverMir=null)}e.length=0},refreshHover:function(){var t=this._hoverElements,e=t.length,n=this._hoverlayer;if(n&&n.clear(),e){qt(t,this.storage.displayableSortFunc),n||(n=this._hoverlayer=this.getLayer(1e5));var i={};n.ctx.save();for(var r=0;r<e;){var a=t[r],o=a.__from;o&&o.__zr?(r++,o.invisible||(a.transform=o.transform,a.invTransform=o.invTransform,a.__clipPaths=o.__clipPaths,this._doPaintEl(a,n,!0,i))):(t.splice(r,1),o.__hoverMir=null,e--)}n.ctx.restore()}},getHoverLayer:function(){return this.getLayer(1e5)},_paintList:function(t,e,n){if(this._redrawId===n){e=e||!1,this._updateLayerStatus(t);var i=this._doPaintList(t,e);if(this._needsManuallyCompositing&&this._compositeManually(),!i){var r=this;Zh(function(){r._paintList(t,e,n)})}}},_compositeManually:function(){var t=this.getLayer(314159).ctx,e=this._domRoot.width,n=this._domRoot.height;t.clearRect(0,0,e,n),this.eachBuiltinLayer(function(i){i.virtual&&t.drawImage(i.dom,0,0,e,n)})},_doPaintList:function(t,e){for(var n=[],i=0;i<this._zlevelList.length;i++){var r=this._zlevelList[i];(s=this._layers[r]).__builtin__&&s!==this._hoverlayer&&(s.__dirty||e)&&n.push(s)}for(var a=!0,o=0;o<n.length;o++){var s=n[o],l=s.ctx,h={};l.save();var u=e?s.__startIndex:s.__drawIndex,c=!e&&s.incremental&&Date.now,d=c&&Date.now();if(s.__startIndex===s.__endIndex)s.clear();else if(u===s.__startIndex){var p=t[u];p.incremental&&p.notClear&&!e||s.clear()}-1===u&&(console.error("For some unknown reason. drawIndex is -1"),u=s.__startIndex);for(var g=u;g<s.__endIndex;g++){var m=t[g];if(this._doPaintEl(m,s,e,h),m.__dirty=!1,c&&Date.now()-d>15)break}s.__drawIndex=g,s.__drawIndex<s.__endIndex&&(a=!1),h.prevElClipPaths&&l.restore(),l.restore()}return Fl.wxa&&f(this._layers,function(t){t&&t.ctx&&t.ctx.draw&&t.ctx.draw()}),a},_doPaintEl:function(t,e,n,i){var r=e.ctx,a=t.transform;if((e.__dirty||n)&&!t.invisible&&0!==t.style.opacity&&(!a||a[0]||a[3])&&(!t.culling||!Ve(t,this._width,this._height))){var o=t.__clipPaths;i.prevElClipPaths&&!We(o,i.prevElClipPaths)||(i.prevElClipPaths&&(e.ctx.restore(),i.prevElClipPaths=null,i.prevEl=null),o&&(r.save(),He(o,r),i.prevElClipPaths=o)),t.beforeBrush&&t.beforeBrush(r),t.brush(r,i.prevEl||null),i.prevEl=t,t.afterBrush&&t.afterBrush(r)}},getLayer:function(t,e){this._singleCanvas&&!this._needsManuallyCompositing&&(t=314159);var n=this._layers[t];return n||((n=new Xh("zr_"+t,this,this.dpr)).zlevel=t,n.__builtin__=!0,this._layerConfig[t]&&i(n,this._layerConfig[t],!0),e&&(n.virtual=e),this.insertLayer(t,n),n.initContext()),n},insertLayer:function(t,e){var n=this._layers,i=this._zlevelList,r=i.length,a=null,o=-1,s=this._domRoot;if(n[t])Ch("ZLevel "+t+" has been used already");else if(Fe(e)){if(r>0&&t>i[0]){for(o=0;o<r-1&&!(i[o]<t&&i[o+1]>t);o++);a=n[i[o]]}if(i.splice(o+1,0,t),n[t]=e,!e.virtual)if(a){var l=a.dom;l.nextSibling?s.insertBefore(e.dom,l.nextSibling):s.appendChild(e.dom)}else s.firstChild?s.insertBefore(e.dom,s.firstChild):s.appendChild(e.dom)}else Ch("Layer of zlevel "+t+" is not valid")},eachLayer:function(t,e){var n,i,r=this._zlevelList;for(i=0;i<r.length;i++)n=r[i],t.call(e,this._layers[n],n)},eachBuiltinLayer:function(t,e){var n,i,r,a=this._zlevelList;for(r=0;r<a.length;r++)i=a[r],(n=this._layers[i]).__builtin__&&t.call(e,n,i)},eachOtherLayer:function(t,e){var n,i,r,a=this._zlevelList;for(r=0;r<a.length;r++)i=a[r],(n=this._layers[i]).__builtin__||t.call(e,n,i)},getLayers:function(){return this._layers},_updateLayerStatus:function(t){function e(t){n&&(n.__endIndex!==t&&(n.__dirty=!0),n.__endIndex=t)}if(this.eachBuiltinLayer(function(t,e){t.__dirty=t.__used=!1}),this._singleCanvas)for(r=1;r<t.length;r++)if((o=t[r]).zlevel!==t[r-1].zlevel||o.incremental){this._needsManuallyCompositing=!0;break}for(var n=null,i=0,r=0;r<t.length;r++){var a,o=t[r],s=o.zlevel;o.incremental?((a=this.getLayer(s+.001,this._needsManuallyCompositing)).incremental=!0,i=1):a=this.getLayer(s+(i>0?.01:0),this._needsManuallyCompositing),a.__builtin__||Ch("ZLevel "+s+" has been used by unkown layer "+a.id),a!==n&&(a.__used=!0,a.__startIndex!==r&&(a.__dirty=!0),a.__startIndex=r,a.incremental?a.__drawIndex=-1:a.__drawIndex=r,e(r),n=a),o.__dirty&&(a.__dirty=!0,a.incremental&&a.__drawIndex<0&&(a.__drawIndex=r))}e(r),this.eachBuiltinLayer(function(t,e){!t.__used&&t.getElementCount()>0&&(t.__dirty=!0,t.__startIndex=t.__endIndex=t.__drawIndex=0),t.__dirty&&t.__drawIndex<0&&(t.__drawIndex=t.__startIndex)})},clear:function(){return this.eachBuiltinLayer(this._clearLayer),this},_clearLayer:function(t){t.clear()},configLayer:function(t,e){if(e){var n=this._layerConfig;n[t]?i(n[t],e,!0):n[t]=e;for(var r=0;r<this._zlevelList.length;r++){var a=this._zlevelList[r];a!==t&&a!==t+.01||i(this._layers[a],n[t],!0)}}},delLayer:function(t){var e=this._layers,n=this._zlevelList,i=e[t];i&&(i.dom.parentNode.removeChild(i.dom),delete e[t],n.splice(l(n,t),1))},resize:function(t,e){if(this._domRoot.style){var n=this._domRoot;n.style.display="none";var i=this._opts;if(null!=t&&(i.width=t),null!=e&&(i.height=e),t=this._getSize(0),e=this._getSize(1),n.style.display="",this._width!=t||e!=this._height){n.style.width=t+"px",n.style.height=e+"px";for(var r in this._layers)this._layers.hasOwnProperty(r)&&this._layers[r].resize(t,e);f(this._progressiveLayers,function(n){n.resize(t,e)}),this.refresh(!0)}this._width=t,this._height=e}else{if(null==t||null==e)return;this._width=t,this._height=e,this.getLayer(314159).resize(t,e)}return this},clearLayer:function(t){var e=this._layers[t];e&&e.clear()},dispose:function(){this.root.innerHTML="",this.root=this.storage=this._domRoot=this._layers=null},getRenderedCanvas:function(t){if(t=t||{},this._singleCanvas&&!this._compositeManually)return this._layers[314159].dom;var e=new Xh("image",this,t.pixelRatio||this.dpr);if(e.initContext(),e.clearColor=t.backgroundColor,e.clear(),t.pixelRatio<=this.dpr){this.refresh();var n=e.dom.width,i=e.dom.height,r=e.ctx;this.eachLayer(function(t){t.__builtin__?r.drawImage(t.dom,0,0,n,i):t.renderToCanvas&&(e.ctx.save(),t.renderToCanvas(e.ctx),e.ctx.restore())})}else for(var a={},o=this.storage.getDisplayList(!0),s=0;s<o.length;s++){var l=o[s];this._doPaintEl(l,e,!0,a)}return e.dom},getWidth:function(){return this._width},getHeight:function(){return this._height},_getSize:function(t){var e=this._opts,n=["width","height"][t],i=["clientWidth","clientHeight"][t],r=["paddingLeft","paddingTop"][t],a=["paddingRight","paddingBottom"][t];if(null!=e[n]&&"auto"!==e[n])return parseFloat(e[n]);var o=this.root,s=document.defaultView.getComputedStyle(o);return(o[i]||Ne(s[n])||Ne(o.style[n]))-(Ne(s[r])||0)-(Ne(s[a])||0)|0},pathToImage:function(t,e){e=e||this.dpr;var n=document.createElement("canvas"),i=n.getContext("2d"),r=t.getBoundingRect(),a=t.style,o=a.shadowBlur*e,s=a.shadowOffsetX*e,l=a.shadowOffsetY*e,h=a.hasStroke()?a.lineWidth:0,u=Math.max(h/2,-s+o),c=Math.max(h/2,s+o),f=Math.max(h/2,-l+o),d=Math.max(h/2,l+o),p=r.width+u+c,g=r.height+f+d;n.width=p*e,n.height=g*e,i.scale(e,e),i.clearRect(0,0,p,g),i.dpr=e;var m={position:t.position,rotation:t.rotation,scale:t.scale};t.position=[u-r.x,f-r.y],t.rotation=0,t.scale=[1,1],t.updateTransform(),t&&t.brush(i);var v=new ze({style:{x:0,y:0,image:n}});return null!=m.position&&(v.position=t.position=m.position),null!=m.rotation&&(v.rotation=t.rotation=m.rotation),null!=m.scale&&(v.scale=t.scale=m.scale),v}};var su="undefined"!=typeof window&&!!window.addEventListener,lu=/^(?:mouse|pointer|contextmenu|drag|drop)|click/,hu=function(t){t=t||{},this.stage=t.stage||{},this.onframe=t.onframe||function(){},this._clips=[],this._running=!1,this._time,this._pausedTime,this._pauseStart,this._paused=!1,ih.call(this)};hu.prototype={constructor:hu,addClip:function(t){this._clips.push(t)},addAnimator:function(t){t.animation=this;for(var e=t.getClips(),n=0;n<e.length;n++)this.addClip(e[n])},removeClip:function(t){var e=l(this._clips,t);e>=0&&this._clips.splice(e,1)},removeAnimator:function(t){for(var e=t.getClips(),n=0;n<e.length;n++)this.removeClip(e[n]);t.animation=null},_update:function(){for(var t=(new Date).getTime()-this._pausedTime,e=t-this._time,n=this._clips,i=n.length,r=[],a=[],o=0;o<i;o++){var s=n[o],l=s.step(t,e);l&&(r.push(l),a.push(s))}for(o=0;o<i;)n[o]._needsRemove?(n[o]=n[i-1],n.pop(),i--):o++;i=r.length;for(o=0;o<i;o++)a[o].fire(r[o]);this._time=t,this.onframe(e),this.trigger("frame",e),this.stage.update&&this.stage.update()},_startLoop:function(){function t(){e._running&&(Zh(t),!e._paused&&e._update())}var e=this;this._running=!0,Zh(t)},start:function(){this._time=(new Date).getTime(),this._pausedTime=0,this._startLoop()},stop:function(){this._running=!1},pause:function(){this._paused||(this._pauseStart=(new Date).getTime(),this._paused=!0)},resume:function(){this._paused&&(this._pausedTime+=(new Date).getTime()-this._pauseStart,this._paused=!1)},clear:function(){this._clips=[]},animate:function(t,e){var n=new Sh(t,(e=e||{}).loop,e.getter,e.setter);return this.addAnimator(n),n}},u(hu,ih);var uu=function(){this._track=[]};uu.prototype={constructor:uu,recognize:function(t,e,n){return this._doTrack(t,e,n),this._recognize(t)},clear:function(){return this._track.length=0,this},_doTrack:function(t,e,n){var i=t.touches;if(i){for(var r={points:[],touches:[],target:e,event:t},a=0,o=i.length;a<o;a++){var s=i[a],l=Xe(n,s,{});r.points.push([l.zrX,l.zrY]),r.touches.push(s)}this._track.push(r)}},_recognize:function(t){for(var e in cu)if(cu.hasOwnProperty(e)){var n=cu[e](this._track,t);if(n)return n}}};var cu={pinch:function(t,e){var n=t.length;if(n){var i=(t[n-1]||{}).points,r=(t[n-2]||{}).points||i;if(r&&r.length>1&&i&&i.length>1){var a=$e(i)/$e(r);!isFinite(a)&&(a=1),e.pinchScale=a;var o=Ke(i);return e.pinchX=o[0],e.pinchY=o[1],{type:"pinch",target:t[0].target,event:e}}}}},fu=["click","dblclick","mousewheel","mouseout","mouseup","mousedown","mousemove","contextmenu"],du=["touchstart","touchend","touchmove"],pu={pointerdown:1,pointerup:1,pointermove:1,pointerout:1},gu=d(fu,function(t){var e=t.replace("mouse","pointer");return pu[e]?e:t}),mu={mousemove:function(t){t=Ye(this.dom,t),this.trigger("mousemove",t)},mouseout:function(t){var e=(t=Ye(this.dom,t)).toElement||t.relatedTarget;if(e!=this.dom)for(;e&&9!=e.nodeType;){if(e===this.dom)return;e=e.parentNode}this.trigger("mouseout",t)},touchstart:function(t){(t=Ye(this.dom,t)).zrByTouch=!0,this._lastTouchMoment=new Date,Je(this,t,"start"),mu.mousemove.call(this,t),mu.mousedown.call(this,t),tn(this)},touchmove:function(t){(t=Ye(this.dom,t)).zrByTouch=!0,Je(this,t,"change"),mu.mousemove.call(this,t),tn(this)},touchend:function(t){(t=Ye(this.dom,t)).zrByTouch=!0,Je(this,t,"end"),mu.mouseup.call(this,t),+new Date-this._lastTouchMoment<300&&mu.click.call(this,t),tn(this)},pointerdown:function(t){mu.mousedown.call(this,t)},pointermove:function(t){en(t)||mu.mousemove.call(this,t)},pointerup:function(t){mu.mouseup.call(this,t)},pointerout:function(t){en(t)||mu.mouseout.call(this,t)}};f(["click","mousedown","mouseup","mousewheel","dblclick","contextmenu"],function(t){mu[t]=function(e){e=Ye(this.dom,e),this.trigger(t,e)}});var vu=rn.prototype;vu.dispose=function(){for(var t=fu.concat(du),e=0;e<t.length;e++){var n=t[e];je(this.dom,Qe(n),this._handlers[n])}},vu.setCursor=function(t){this.dom.style&&(this.dom.style.cursor=t||"default")},u(rn,ih);var yu=!Fl.canvasSupported,_u={canvas:ou},xu=function(t,e,n){n=n||{},this.dom=e,this.id=t;var i=this,r=new Rh,a=n.renderer;if(yu){if(!_u.vml)throw new Error("You need to require 'zrender/vml/vml' to support IE8");a="vml"}else a&&_u[a]||(a="canvas");var o=new _u[a](e,r,n,t);this.storage=r,this.painter=o;var s=Fl.node||Fl.worker?null:new rn(o.getViewportRoot());this.handler=new oh(r,o,s,o.root),this.animation=new hu({stage:{update:m(this.flush,this)}}),this.animation.start(),this._needsRefresh;var l=r.delFromStorage,h=r.addToStorage;r.delFromStorage=function(t){l.call(r,t),t&&t.removeSelfFromZr(i)},r.addToStorage=function(t){h.call(r,t),t.addSelfToZr(i)}};xu.prototype={constructor:xu,getId:function(){return this.id},add:function(t){this.storage.addRoot(t),this._needsRefresh=!0},remove:function(t){this.storage.delRoot(t),this._needsRefresh=!0},configLayer:function(t,e){this.painter.configLayer(t,e),this._needsRefresh=!0},refreshImmediately:function(){this._needsRefresh=!1,this.painter.refresh(),this._needsRefresh=!1},refresh:function(){this._needsRefresh=!0},flush:function(){this._needsRefresh&&this.refreshImmediately(),this._needsRefreshHover&&this.refreshHoverImmediately()},addHover:function(t,e){this.painter.addHover&&(this.painter.addHover(t,e),this.refreshHover())},removeHover:function(t){this.painter.removeHover&&(this.painter.removeHover(t),this.refreshHover())},clearHover:function(){this.painter.clearHover&&(this.painter.clearHover(),this.refreshHover())},refreshHover:function(){this._needsRefreshHover=!0},refreshHoverImmediately:function(){this._needsRefreshHover=!1,this.painter.refreshHover&&this.painter.refreshHover()},resize:function(t){t=t||{},this.painter.resize(t.width,t.height),this.handler.resize()},clearAnimation:function(){this.animation.clear()},getWidth:function(){return this.painter.getWidth()},getHeight:function(){return this.painter.getHeight()},pathToImage:function(t,e){return this.painter.pathToImage(t,e)},setCursorStyle:function(t){this.handler.setCursorStyle(t)},findHover:function(t,e){return this.handler.findHover(t,e)},on:function(t,e,n){this.handler.on(t,e,n)},off:function(t,e){this.handler.off(t,e)},trigger:function(t,e){this.handler.trigger(t,e)},clear:function(){this.storage.delRoot(),this.painter.clear()},dispose:function(){this.animation.stop(),this.clear(),this.storage.dispose(),this.painter.dispose(),this.handler.dispose(),this.animation=this.storage=this.painter=this.handler=null}};var wu=f,bu=w,Su=y,Mu="\0-",Tu=["fontStyle","fontWeight","fontSize","fontFamily","rich","tag","color","textBorderColor","textBorderWidth","width","height","lineHeight","align","verticalAlign","baseline","shadowColor","shadowBlur","shadowOffsetX","shadowOffsetY","textShadowColor","textShadowBlur","textShadowOffsetX","textShadowOffsetY","backgroundColor","borderColor","borderWidth","borderRadius","padding"],Iu=0,Cu=".",ku="___EC__COMPONENT__CONTAINER___",Du=0,Au=function(t){for(var e=0;e<t.length;e++)t[e][1]||(t[e][1]=t[e][0]);return function(e,n,i){for(var r={},a=0;a<t.length;a++){var o=t[a][1];if(!(n&&l(n,o)>=0||i&&l(i,o)<0)){var s=e.getShallow(o);null!=s&&(r[t[a][0]]=s)}}return r}},Lu=Au([["lineWidth","width"],["stroke","color"],["opacity"],["shadowBlur"],["shadowOffsetX"],["shadowOffsetY"],["shadowColor"]]),Pu={getLineStyle:function(t){var e=Lu(this,t),n=this.getLineDash(e.lineWidth);return n&&(e.lineDash=n),e},getLineDash:function(t){null==t&&(t=1);var e=this.get("type"),n=Math.max(t,2),i=4*t;return"solid"===e||null==e?null:"dashed"===e?[i,i]:[n,n]}},Ou=Au([["fill","color"],["shadowBlur"],["shadowOffsetX"],["shadowOffsetY"],["opacity"],["shadowColor"]]),Eu={getAreaStyle:function(t,e){return Ou(this,t,e)}},Bu=Math.pow,Ru=Math.sqrt,zu=1e-8,Nu=1e-4,Fu=Ru(3),Vu=1/3,Wu=N(),Hu=N(),Gu=N(),qu=Math.min,Xu=Math.max,Zu=Math.sin,Yu=Math.cos,Uu=2*Math.PI,ju=N(),$u=N(),Ku=N(),Qu=[],Ju=[],tc={M:1,L:2,C:3,Q:4,A:5,Z:6,R:7},ec=[],nc=[],ic=[],rc=[],ac=Math.min,oc=Math.max,sc=Math.cos,lc=Math.sin,hc=Math.sqrt,uc=Math.abs,cc="undefined"!=typeof Float32Array,fc=function(t){this._saveData=!t,this._saveData&&(this.data=[]),this._ctx=null};fc.prototype={constructor:fc,_xi:0,_yi:0,_x0:0,_y0:0,_ux:0,_uy:0,_len:0,_lineDash:null,_dashOffset:0,_dashIdx:0,_dashSum:0,setScale:function(t,e){this._ux=uc(1/Th/t)||0,this._uy=uc(1/Th/e)||0},getContext:function(){return this._ctx},beginPath:function(t){return this._ctx=t,t&&t.beginPath(),t&&(this.dpr=t.dpr),this._saveData&&(this._len=0),this._lineDash&&(this._lineDash=null,this._dashOffset=0),this},moveTo:function(t,e){return this.addData(tc.M,t,e),this._ctx&&this._ctx.moveTo(t,e),this._x0=t,this._y0=e,this._xi=t,this._yi=e,this},lineTo:function(t,e){var n=uc(t-this._xi)>this._ux||uc(e-this._yi)>this._uy||this._len<5;return this.addData(tc.L,t,e),this._ctx&&n&&(this._needsDash()?this._dashedLineTo(t,e):this._ctx.lineTo(t,e)),n&&(this._xi=t,this._yi=e),this},bezierCurveTo:function(t,e,n,i,r,a){return this.addData(tc.C,t,e,n,i,r,a),this._ctx&&(this._needsDash()?this._dashedBezierTo(t,e,n,i,r,a):this._ctx.bezierCurveTo(t,e,n,i,r,a)),this._xi=r,this._yi=a,this},quadraticCurveTo:function(t,e,n,i){return this.addData(tc.Q,t,e,n,i),this._ctx&&(this._needsDash()?this._dashedQuadraticTo(t,e,n,i):this._ctx.quadraticCurveTo(t,e,n,i)),this._xi=n,this._yi=i,this},arc:function(t,e,n,i,r,a){return this.addData(tc.A,t,e,n,n,i,r-i,0,a?0:1),this._ctx&&this._ctx.arc(t,e,n,i,r,a),this._xi=sc(r)*n+t,this._yi=lc(r)*n+t,this},arcTo:function(t,e,n,i,r){return this._ctx&&this._ctx.arcTo(t,e,n,i,r),this},rect:function(t,e,n,i){return this._ctx&&this._ctx.rect(t,e,n,i),this.addData(tc.R,t,e,n,i),this},closePath:function(){this.addData(tc.Z);var t=this._ctx,e=this._x0,n=this._y0;return t&&(this._needsDash()&&this._dashedLineTo(e,n),t.closePath()),this._xi=e,this._yi=n,this},fill:function(t){t&&t.fill(),this.toStatic()},stroke:function(t){t&&t.stroke(),this.toStatic()},setLineDash:function(t){if(t instanceof Array){this._lineDash=t,this._dashIdx=0;for(var e=0,n=0;n<t.length;n++)e+=t[n];this._dashSum=e}return this},setLineDashOffset:function(t){return this._dashOffset=t,this},len:function(){return this._len},setData:function(t){var e=t.length;this.data&&this.data.length==e||!cc||(this.data=new Float32Array(e));for(var n=0;n<e;n++)this.data[n]=t[n];this._len=e},appendPath:function(t){t instanceof Array||(t=[t]);for(var e=t.length,n=0,i=this._len,r=0;r<e;r++)n+=t[r].len();cc&&this.data instanceof Float32Array&&(this.data=new Float32Array(i+n));for(r=0;r<e;r++)for(var a=t[r].data,o=0;o<a.length;o++)this.data[i++]=a[o];this._len=i},addData:function(t){if(this._saveData){var e=this.data;this._len+arguments.length>e.length&&(this._expandData(),e=this.data);for(var n=0;n<arguments.length;n++)e[this._len++]=arguments[n];this._prevCmd=t}},_expandData:function(){if(!(this.data instanceof Array)){for(var t=[],e=0;e<this._len;e++)t[e]=this.data[e];this.data=t}},_needsDash:function(){return this._lineDash},_dashedLineTo:function(t,e){var n,i,r=this._dashSum,a=this._dashOffset,o=this._lineDash,s=this._ctx,l=this._xi,h=this._yi,u=t-l,c=e-h,f=hc(u*u+c*c),d=l,p=h,g=o.length;for(u/=f,c/=f,a<0&&(a=r+a),d-=(a%=r)*u,p-=a*c;u>0&&d<=t||u<0&&d>=t||0==u&&(c>0&&p<=e||c<0&&p>=e);)d+=u*(n=o[i=this._dashIdx]),p+=c*n,this._dashIdx=(i+1)%g,u>0&&d<l||u<0&&d>l||c>0&&p<h||c<0&&p>h||s[i%2?"moveTo":"lineTo"](u>=0?ac(d,t):oc(d,t),c>=0?ac(p,e):oc(p,e));u=d-t,c=p-e,this._dashOffset=-hc(u*u+c*c)},_dashedBezierTo:function(t,e,n,i,r,a){var o,s,l,h,u,c=this._dashSum,f=this._dashOffset,d=this._lineDash,p=this._ctx,g=this._xi,m=this._yi,v=kn,y=0,_=this._dashIdx,x=d.length,w=0;for(f<0&&(f=c+f),f%=c,o=0;o<1;o+=.1)s=v(g,t,n,r,o+.1)-v(g,t,n,r,o),l=v(m,e,i,a,o+.1)-v(m,e,i,a,o),y+=hc(s*s+l*l);for(;_<x&&!((w+=d[_])>f);_++);for(o=(w-f)/y;o<=1;)h=v(g,t,n,r,o),u=v(m,e,i,a,o),_%2?p.moveTo(h,u):p.lineTo(h,u),o+=d[_]/y,_=(_+1)%x;_%2!=0&&p.lineTo(r,a),s=r-h,l=a-u,this._dashOffset=-hc(s*s+l*l)},_dashedQuadraticTo:function(t,e,n,i){var r=n,a=i;n=(n+2*t)/3,i=(i+2*e)/3,t=(this._xi+2*t)/3,e=(this._yi+2*e)/3,this._dashedBezierTo(t,e,n,i,r,a)},toStatic:function(){var t=this.data;t instanceof Array&&(t.length=this._len,cc&&(this.data=new Float32Array(t)))},getBoundingRect:function(){ec[0]=ec[1]=ic[0]=ic[1]=Number.MAX_VALUE,nc[0]=nc[1]=rc[0]=rc[1]=-Number.MAX_VALUE;for(var t=this.data,e=0,n=0,i=0,r=0,a=0;a<t.length;){var o=t[a++];switch(1==a&&(i=e=t[a],r=n=t[a+1]),o){case tc.M:e=i=t[a++],n=r=t[a++],ic[0]=i,ic[1]=r,rc[0]=i,rc[1]=r;break;case tc.L:Vn(e,n,t[a],t[a+1],ic,rc),e=t[a++],n=t[a++];break;case tc.C:Wn(e,n,t[a++],t[a++],t[a++],t[a++],t[a],t[a+1],ic,rc),e=t[a++],n=t[a++];break;case tc.Q:Hn(e,n,t[a++],t[a++],t[a],t[a+1],ic,rc),e=t[a++],n=t[a++];break;case tc.A:var s=t[a++],l=t[a++],h=t[a++],u=t[a++],c=t[a++],f=t[a++]+c,d=(t[a++],1-t[a++]);1==a&&(i=sc(c)*h+s,r=lc(c)*u+l),Gn(s,l,h,u,c,f,d,ic,rc),e=sc(f)*h+s,n=lc(f)*u+l;break;case tc.R:Vn(i=e=t[a++],r=n=t[a++],i+t[a++],r+t[a++],ic,rc);break;case tc.Z:e=i,n=r}U(ec,ec,ic),j(nc,nc,rc)}return 0===a&&(ec[0]=ec[1]=nc[0]=nc[1]=0),new Rt(ec[0],ec[1],nc[0]-ec[0],nc[1]-ec[1])},rebuildPath:function(t){for(var e,n,i,r,a,o,s=this.data,l=this._ux,h=this._uy,u=this._len,c=0;c<u;){var f=s[c++];switch(1==c&&(e=i=s[c],n=r=s[c+1]),f){case tc.M:e=i=s[c++],n=r=s[c++],t.moveTo(i,r);break;case tc.L:a=s[c++],o=s[c++],(uc(a-i)>l||uc(o-r)>h||c===u-1)&&(t.lineTo(a,o),i=a,r=o);break;case tc.C:t.bezierCurveTo(s[c++],s[c++],s[c++],s[c++],s[c++],s[c++]),i=s[c-2],r=s[c-1];break;case tc.Q:t.quadraticCurveTo(s[c++],s[c++],s[c++],s[c++]),i=s[c-2],r=s[c-1];break;case tc.A:var d=s[c++],p=s[c++],g=s[c++],m=s[c++],v=s[c++],y=s[c++],_=s[c++],x=s[c++],w=g>m?g:m,b=g>m?1:g/m,S=g>m?m/g:1,M=v+y;Math.abs(g-m)>.001?(t.translate(d,p),t.rotate(_),t.scale(b,S),t.arc(0,0,w,v,M,1-x),t.scale(1/b,1/S),t.rotate(-_),t.translate(-d,-p)):t.arc(d,p,w,v,M,1-x),1==c&&(e=sc(v)*g+d,n=lc(v)*m+p),i=sc(M)*g+d,r=lc(M)*m+p;break;case tc.R:e=i=s[c],n=r=s[c+1],t.rect(s[c++],s[c++],s[c++],s[c++]);break;case tc.Z:t.closePath(),i=e,r=n}}}},fc.CMD=tc;var dc=2*Math.PI,pc=2*Math.PI,gc=fc.CMD,mc=2*Math.PI,vc=1e-4,yc=[-1,-1,-1],_c=[-1,-1],xc=qh.prototype.getCanvasPattern,wc=Math.abs,bc=new fc(!0);ri.prototype={constructor:ri,type:"path",__dirtyPath:!0,strokeContainThreshold:5,brush:function(t,e){var n=this.style,i=this.path||bc,r=n.hasStroke(),a=n.hasFill(),o=n.fill,s=n.stroke,l=a&&!!o.colorStops,h=r&&!!s.colorStops,u=a&&!!o.image,c=r&&!!s.image;if(n.bind(t,this,e),this.setTransform(t),this.__dirty){var f;l&&(f=f||this.getBoundingRect(),this._fillGradient=n.getGradient(t,o,f)),h&&(f=f||this.getBoundingRect(),this._strokeGradient=n.getGradient(t,s,f))}l?t.fillStyle=this._fillGradient:u&&(t.fillStyle=xc.call(o,t)),h?t.strokeStyle=this._strokeGradient:c&&(t.strokeStyle=xc.call(s,t));var d=n.lineDash,p=n.lineDashOffset,g=!!t.setLineDash,m=this.getGlobalScale();i.setScale(m[0],m[1]),this.__dirtyPath||d&&!g&&r?(i.beginPath(t),d&&!g&&(i.setLineDash(d),i.setLineDashOffset(p)),this.buildPath(i,this.shape,!1),this.path&&(this.__dirtyPath=!1)):(t.beginPath(),this.path.rebuildPath(t)),a&&i.fill(t),d&&g&&(t.setLineDash(d),t.lineDashOffset=p),r&&i.stroke(t),d&&g&&t.setLineDash([]),null!=n.text&&(this.restoreTransform(t),this.drawRectText(t,this.getBoundingRect()))},buildPath:function(t,e,n){},createPathProxy:function(){this.path=new fc},getBoundingRect:function(){var t=this._rect,e=this.style,n=!t;if(n){var i=this.path;i||(i=this.path=new fc),this.__dirtyPath&&(i.beginPath(),this.buildPath(i,this.shape,!1)),t=i.getBoundingRect()}if(this._rect=t,e.hasStroke()){var r=this._rectWithStroke||(this._rectWithStroke=t.clone());if(this.__dirty||n){r.copy(t);var a=e.lineWidth,o=e.strokeNoScale?this.getLineScale():1;e.hasFill()||(a=Math.max(a,this.strokeContainThreshold||4)),o>1e-10&&(r.width+=a/o,r.height+=a/o,r.x-=a/o/2,r.y-=a/o/2)}return r}return t},contain:function(t,e){var n=this.transformCoordToLocal(t,e),i=this.getBoundingRect(),r=this.style;if(t=n[0],e=n[1],i.contain(t,e)){var a=this.path.data;if(r.hasStroke()){var o=r.lineWidth,s=r.strokeNoScale?this.getLineScale():1;if(s>1e-10&&(r.hasFill()||(o=Math.max(o,this.strokeContainThreshold)),ii(a,o/s,t,e)))return!0}if(r.hasFill())return ni(a,t,e)}return!1},dirty:function(t){null==t&&(t=!0),t&&(this.__dirtyPath=t,this._rect=null),this.__dirty=!0,this.__zr&&this.__zr.refresh(),this.__clipTarget&&this.__clipTarget.dirty()},animateShape:function(t){return this.animate("shape",t)},attrKV:function(t,e){"shape"===t?(this.setShape(e),this.__dirtyPath=!0,this._rect=null):Re.prototype.attrKV.call(this,t,e)},setShape:function(t,e){var n=this.shape;if(n){if(w(t))for(var i in t)t.hasOwnProperty(i)&&(n[i]=t[i]);else n[t]=e;this.dirty(!0)}return this},getLineScale:function(){var t=this.transform;return t&&wc(t[0]-1)>1e-10&&wc(t[3]-1)>1e-10?Math.sqrt(wc(t[0]*t[3]-t[2]*t[1])):1}},ri.extend=function(t){var e=function(e){ri.call(this,e),t.style&&this.style.extendFrom(t.style,!1);var n=t.shape;if(n){this.shape=this.shape||{};var i=this.shape;for(var r in n)!i.hasOwnProperty(r)&&n.hasOwnProperty(r)&&(i[r]=n[r])}t.init&&t.init.call(this,e)};h(e,ri);for(var n in t)"style"!==n&&"shape"!==n&&(e.prototype[n]=t[n]);return e},h(ri,Re);var Sc=fc.CMD,Mc=[[],[],[]],Tc=Math.sqrt,Ic=Math.atan2,Cc=function(t,e){var n,i,r,a,o,s,l=t.data,h=Sc.M,u=Sc.C,c=Sc.L,f=Sc.R,d=Sc.A,p=Sc.Q;for(r=0,a=0;r<l.length;){switch(n=l[r++],a=r,i=0,n){case h:case c:i=1;break;case u:i=3;break;case p:i=2;break;case d:var g=e[4],m=e[5],v=Tc(e[0]*e[0]+e[1]*e[1]),y=Tc(e[2]*e[2]+e[3]*e[3]),_=Ic(-e[1]/y,e[0]/v);l[r]*=v,l[r++]+=g,l[r]*=y,l[r++]+=m,l[r++]*=v,l[r++]*=y,l[r++]+=_,l[r++]+=_,a=r+=2;break;case f:s[0]=l[r++],s[1]=l[r++],Y(s,s,e),l[a++]=s[0],l[a++]=s[1],s[0]+=l[r++],s[1]+=l[r++],Y(s,s,e),l[a++]=s[0],l[a++]=s[1]}for(o=0;o<i;o++)(s=Mc[o])[0]=l[r++],s[1]=l[r++],Y(s,s,e),l[a++]=s[0],l[a++]=s[1]}},kc=["m","M","l","L","v","V","h","H","z","Z","c","C","q","Q","t","T","s","S","a","A"],Dc=Math.sqrt,Ac=Math.sin,Lc=Math.cos,Pc=Math.PI,Oc=function(t){return Math.sqrt(t[0]*t[0]+t[1]*t[1])},Ec=function(t,e){return(t[0]*e[0]+t[1]*e[1])/(Oc(t)*Oc(e))},Bc=function(t,e){return(t[0]*e[1]<t[1]*e[0]?-1:1)*Math.acos(Ec(t,e))},Rc=function(t){Re.call(this,t)};Rc.prototype={constructor:Rc,type:"text",brush:function(t,e){var n=this.style;this.__dirty&&ye(n),n.fill=n.stroke=n.shadowBlur=n.shadowColor=n.shadowOffsetX=n.shadowOffsetY=null;var i=n.text;null!=i&&(i+=""),n.bind(t,this,e),Be(i,n)&&(this.setTransform(t),xe(this,t,i,n),this.restoreTransform(t))},getBoundingRect:function(){var t=this.style;if(this.__dirty&&ye(t),!this._rect){var e=t.text;null!=e?e+="":e="";var n=ee(t.text+"",t.font,t.textAlign,t.textVerticalAlign,t.textPadding,t.rich);if(n.x+=t.x||0,n.y+=t.y||0,Le(t.textStroke,t.textStrokeWidth)){var i=t.textStrokeWidth;n.x-=i/2,n.y-=i/2,n.width+=i,n.height+=i}this._rect=n}return this._rect}},h(Rc,Re);var zc=ri.extend({type:"circle",shape:{cx:0,cy:0,r:0},buildPath:function(t,e,n){n&&t.moveTo(e.cx+e.r,e.cy),t.arc(e.cx,e.cy,e.r,0,2*Math.PI,!0)}}),Nc=[["shadowBlur",0],["shadowColor","#000"],["shadowOffsetX",0],["shadowOffsetY",0]],Fc=function(t){return Fl.browser.ie&&Fl.browser.version>=11?function(){var e,n=this.__clipPaths,i=this.style;if(n)for(var r=0;r<n.length;r++){var a=n[r],o=a&&a.shape,s=a&&a.type;if(o&&("sector"===s&&o.startAngle===o.endAngle||"rect"===s&&(!o.width||!o.height))){for(l=0;l<Nc.length;l++)Nc[l][2]=i[Nc[l][0]],i[Nc[l][0]]=Nc[l][1];e=!0;break}}if(t.apply(this,arguments),e)for(var l=0;l<Nc.length;l++)i[Nc[l][0]]=Nc[l][2]}:t},Vc=ri.extend({type:"sector",shape:{cx:0,cy:0,r0:0,r:0,startAngle:0,endAngle:2*Math.PI,clockwise:!0},brush:Fc(ri.prototype.brush),buildPath:function(t,e){var n=e.cx,i=e.cy,r=Math.max(e.r0||0,0),a=Math.max(e.r,0),o=e.startAngle,s=e.endAngle,l=e.clockwise,h=Math.cos(o),u=Math.sin(o);t.moveTo(h*r+n,u*r+i),t.lineTo(h*a+n,u*a+i),t.arc(n,i,a,o,s,!l),t.lineTo(Math.cos(s)*r+n,Math.sin(s)*r+i),0!==r&&t.arc(n,i,r,s,o,l),t.closePath()}}),Wc=ri.extend({type:"ring",shape:{cx:0,cy:0,r:0,r0:0},buildPath:function(t,e){var n=e.cx,i=e.cy,r=2*Math.PI;t.moveTo(n+e.r,i),t.arc(n,i,e.r,0,r,!1),t.moveTo(n+e.r0,i),t.arc(n,i,e.r0,0,r,!0)}}),Hc=function(t,e){for(var n=t.length,i=[],r=0,a=1;a<n;a++)r+=Z(t[a-1],t[a]);var o=r/2;o=o<n?n:o;for(a=0;a<o;a++){var s,l,h,u=a/(o-1)*(e?n:n-1),c=Math.floor(u),f=u-c,d=t[c%n];e?(s=t[(c-1+n)%n],l=t[(c+1)%n],h=t[(c+2)%n]):(s=t[0===c?c:c-1],l=t[c>n-2?n-1:c+1],h=t[c>n-3?n-1:c+2]);var p=f*f,g=f*p;i.push([ui(s[0],d[0],l[0],h[0],f,p,g),ui(s[1],d[1],l[1],h[1],f,p,g)])}return i},Gc=function(t,e,n,i){var r,a,o,s,l=[],h=[],u=[],c=[];if(i){o=[1/0,1/0],s=[-1/0,-1/0];for(var f=0,d=t.length;f<d;f++)U(o,o,t[f]),j(s,s,t[f]);U(o,o,i[0]),j(s,s,i[1])}for(var f=0,d=t.length;f<d;f++){var p=t[f];if(n)r=t[f?f-1:d-1],a=t[(f+1)%d];else{if(0===f||f===d-1){l.push(F(t[f]));continue}r=t[f-1],a=t[f+1]}W(h,a,r),q(h,h,e);var g=Z(p,r),m=Z(p,a),v=g+m;0!==v&&(g/=v,m/=v),q(u,h,-g),q(c,h,m);var y=V([],p,u),_=V([],p,c);i&&(j(y,y,o),U(y,y,s),j(_,_,o),U(_,_,s)),l.push(y),l.push(_)}return n&&l.push(l.shift()),l},qc=ri.extend({type:"polygon",shape:{points:null,smooth:!1,smoothConstraint:null},buildPath:function(t,e){ci(t,e,!0)}}),Xc=ri.extend({type:"polyline",shape:{points:null,smooth:!1,smoothConstraint:null},style:{stroke:"#000",fill:null},buildPath:function(t,e){ci(t,e,!1)}}),Zc=ri.extend({type:"rect",shape:{r:0,x:0,y:0,width:0,height:0},buildPath:function(t,e){var n=e.x,i=e.y,r=e.width,a=e.height;e.r?ve(t,e):t.rect(n,i,r,a),t.closePath()}}),Yc=ri.extend({type:"line",shape:{x1:0,y1:0,x2:0,y2:0,percent:1},style:{stroke:"#000",fill:null},buildPath:function(t,e){var n=e.x1,i=e.y1,r=e.x2,a=e.y2,o=e.percent;0!==o&&(t.moveTo(n,i),o<1&&(r=n*(1-o)+r*o,a=i*(1-o)+a*o),t.lineTo(r,a))},pointAt:function(t){var e=this.shape;return[e.x1*(1-t)+e.x2*t,e.y1*(1-t)+e.y2*t]}}),Uc=[],jc=ri.extend({type:"bezier-curve",shape:{x1:0,y1:0,x2:0,y2:0,cpx1:0,cpy1:0,percent:1},style:{stroke:"#000",fill:null},buildPath:function(t,e){var n=e.x1,i=e.y1,r=e.x2,a=e.y2,o=e.cpx1,s=e.cpy1,l=e.cpx2,h=e.cpy2,u=e.percent;0!==u&&(t.moveTo(n,i),null==l||null==h?(u<1&&(Nn(n,o,r,u,Uc),o=Uc[1],r=Uc[2],Nn(i,s,a,u,Uc),s=Uc[1],a=Uc[2]),t.quadraticCurveTo(o,s,r,a)):(u<1&&(Pn(n,o,l,r,u,Uc),o=Uc[1],l=Uc[2],r=Uc[3],Pn(i,s,h,a,u,Uc),s=Uc[1],h=Uc[2],a=Uc[3]),t.bezierCurveTo(o,s,l,h,r,a)))},pointAt:function(t){return fi(this.shape,t,!1)},tangentAt:function(t){var e=fi(this.shape,t,!0);return X(e,e)}}),$c=ri.extend({type:"arc",shape:{cx:0,cy:0,r:0,startAngle:0,endAngle:2*Math.PI,clockwise:!0},style:{stroke:"#000",fill:null},buildPath:function(t,e){var n=e.cx,i=e.cy,r=Math.max(e.r,0),a=e.startAngle,o=e.endAngle,s=e.clockwise,l=Math.cos(a),h=Math.sin(a);t.moveTo(l*r+n,h*r+i),t.arc(n,i,r,a,o,!s)}}),Kc=ri.extend({type:"compound",shape:{paths:null},_updatePathDirty:function(){for(var t=this.__dirtyPath,e=this.shape.paths,n=0;n<e.length;n++)t=t||e[n].__dirtyPath;this.__dirtyPath=t,this.__dirty=this.__dirty||t},beforeBrush:function(){this._updatePathDirty();for(var t=this.shape.paths||[],e=this.getGlobalScale(),n=0;n<t.length;n++)t[n].path||t[n].createPathProxy(),t[n].path.setScale(e[0],e[1])},buildPath:function(t,e){for(var n=e.paths||[],i=0;i<n.length;i++)n[i].buildPath(t,n[i].shape,!0)},afterBrush:function(){for(var t=this.shape.paths||[],e=0;e<t.length;e++)t[e].__dirtyPath=!1},getBoundingRect:function(){return this._updatePathDirty(),ri.prototype.getBoundingRect.call(this)}}),Qc=function(t){this.colorStops=t||[]};Qc.prototype={constructor:Qc,addColorStop:function(t,e){this.colorStops.push({offset:t,color:e})}};var Jc=function(t,e,n,i,r,a){this.x=null==t?0:t,this.y=null==e?0:e,this.x2=null==n?1:n,this.y2=null==i?0:i,this.type="linear",this.global=a||!1,Qc.call(this,r)};Jc.prototype={constructor:Jc},h(Jc,Qc);var tf=function(t,e,n,i,r){this.x=null==t?.5:t,this.y=null==e?.5:e,this.r=null==n?.5:n,this.type="radial",this.global=r||!1,Qc.call(this,i)};tf.prototype={constructor:tf},h(tf,Qc),di.prototype.incremental=!0,di.prototype.clearDisplaybles=function(){this._displayables=[],this._temporaryDisplayables=[],this._cursor=0,this.dirty(),this.notClear=!1},di.prototype.addDisplayable=function(t,e){e?this._temporaryDisplayables.push(t):this._displayables.push(t),this.dirty()},di.prototype.addDisplayables=function(t,e){e=e||!1;for(var n=0;n<t.length;n++)this.addDisplayable(t[n],e)},di.prototype.eachPendingDisplayable=function(t){for(e=this._cursor;e<this._displayables.length;e++)t&&t(this._displayables[e]);for(var e=0;e<this._temporaryDisplayables.length;e++)t&&t(this._temporaryDisplayables[e])},di.prototype.update=function(){this.updateTransform();for(t=this._cursor;t<this._displayables.length;t++)(e=this._displayables[t]).parent=this,e.update(),e.parent=null;for(var t=0;t<this._temporaryDisplayables.length;t++){var e=this._temporaryDisplayables[t];e.parent=this,e.update(),e.parent=null}},di.prototype.brush=function(t,e){for(n=this._cursor;n<this._displayables.length;n++)(i=this._temporaryDisplayables[n]).beforeBrush&&i.beforeBrush(t),i.brush(t,n===this._cursor?null:this._displayables[n-1]),i.afterBrush&&i.afterBrush(t);this._cursor=n;for(var n=0;n<this._temporaryDisplayables.length;n++){var i=this._temporaryDisplayables[n];i.beforeBrush&&i.beforeBrush(t),i.brush(t,0===n?null:this._temporaryDisplayables[n-1]),i.afterBrush&&i.afterBrush(t)}this._temporaryDisplayables=[],this.notClear=!0};var ef=[];di.prototype.getBoundingRect=function(){if(!this._rect){for(var t=new Rt(1/0,1/0,-1/0,-1/0),e=0;e<this._displayables.length;e++){var n=this._displayables[e],i=n.getBoundingRect().clone();n.needLocalTransform()&&i.applyTransform(n.getLocalTransform(ef)),t.union(i)}this._rect=t}return this._rect},di.prototype.contain=function(t,e){var n=this.transformCoordToLocal(t,e);if(this.getBoundingRect().contain(n[0],n[1]))for(var i=0;i<this._displayables.length;i++)if(this._displayables[i].contain(t,e))return!0;return!1},h(di,Re);var nf=Math.round,rf=Math.max,af=Math.min,of={},sf=(Object.freeze||Object)({extendShape:pi,extendPath:function(t,e){return hi(t,e)},makePath:gi,makeImage:mi,mergePath:function(t,e){for(var n=[],i=t.length,r=0;r<i;r++){var a=t[r];a.path||a.createPathProxy(),a.__dirtyPath&&a.buildPath(a.path,a.shape,!0),n.push(a.path)}var o=new ri(e);return o.createPathProxy(),o.buildPath=function(t){t.appendPath(n);var e=t.getContext();e&&t.rebuildPath(e)},o},resizePath:yi,subPixelOptimizeLine:_i,subPixelOptimizeRect:function(t){var e=t.shape,n=t.style.lineWidth,i=e.x,r=e.y,a=e.width,o=e.height;return e.x=xi(e.x,n,!0),e.y=xi(e.y,n,!0),e.width=Math.max(xi(i+a,n,!1)-e.x,0===a?0:1),e.height=Math.max(xi(r+o,n,!1)-e.y,0===o?0:1),t},subPixelOptimize:xi,setHoverStyle:Oi,setLabelStyle:Ei,setTextStyle:Bi,setText:function(t,e,n){var i,r={isRectText:!0};!1===n?i=!0:r.autoColor=n,Ri(t,e,r,i),t.host&&t.host.dirty&&t.host.dirty(!1)},getFont:Hi,updateProps:qi,initProps:Xi,getTransform:function(t,e){for(var n=nt([]);t&&t!==e;)rt(n,t.getLocalTransform(),n),t=t.parent;return n},applyTransform:Zi,transformDirection:function(t,e,n){var i=0===e[4]||0===e[5]||0===e[0]?1:Math.abs(2*e[4]/e[0]),r=0===e[4]||0===e[5]||0===e[2]?1:Math.abs(2*e[4]/e[2]),a=["left"===t?-i:"right"===t?i:0,"top"===t?-r:"bottom"===t?r:0];return a=Zi(a,e,n),Math.abs(a[0])>Math.abs(a[1])?a[0]>0?"right":"left":a[1]>0?"bottom":"top"},groupTransition:Yi,clipPointsByRect:function(t,e){return d(t,function(t){var n=t[0];n=rf(n,e.x),n=af(n,e.x+e.width);var i=t[1];return i=rf(i,e.y),i=af(i,e.y+e.height),[n,i]})},clipRectByRect:function(t,e){var n=rf(t.x,e.x),i=af(t.x+t.width,e.x+e.width),r=rf(t.y,e.y),a=af(t.y+t.height,e.y+e.height);if(i>=n&&a>=r)return{x:n,y:r,width:i-n,height:a-r}},createIcon:function(t,e,n){var i=(e=a({rectHover:!0},e)).style={strokeNoScale:!0};if(n=n||{x:-1,y:-1,width:2,height:2},t)return 0===t.indexOf("image://")?(i.image=t.slice(8),o(i,n),new ze(e)):gi(t.replace("path://",""),e,n,"center")},Group:Oh,Image:ze,Text:Rc,Circle:zc,Sector:Vc,Ring:Wc,Polygon:qc,Polyline:Xc,Rect:Zc,Line:Yc,BezierCurve:jc,Arc:$c,IncrementalDisplayable:di,CompoundPath:Kc,LinearGradient:Jc,RadialGradient:tf,BoundingRect:Rt}),lf=["textStyle","color"],hf={getTextColor:function(t){var e=this.ecModel;return this.getShallow("color")||(!t&&e?e.get(lf):null)},getFont:function(){return Hi({fontStyle:this.getShallow("fontStyle"),fontWeight:this.getShallow("fontWeight"),fontSize:this.getShallow("fontSize"),fontFamily:this.getShallow("fontFamily")},this.ecModel)},getTextRect:function(t){return ee(t,this.getFont(),this.getShallow("align"),this.getShallow("verticalAlign")||this.getShallow("baseline"),this.getShallow("padding"),this.getShallow("rich"),this.getShallow("truncateText"))}},uf=Au([["fill","color"],["stroke","borderColor"],["lineWidth","borderWidth"],["opacity"],["shadowBlur"],["shadowOffsetX"],["shadowOffsetY"],["shadowColor"],["textPosition"],["textAlign"]]),cf={getItemStyle:function(t,e){var n=uf(this,t,e),i=this.getBorderLineDash();return i&&(n.lineDash=i),n},getBorderLineDash:function(){var t=this.get("borderType");return"solid"===t||null==t?null:"dashed"===t?[5,5]:[1,1]}},ff=u,df=pn();Ui.prototype={constructor:Ui,init:null,mergeOption:function(t){i(this.option,t,!0)},get:function(t,e){return null==t?this.option:ji(this.option,this.parsePath(t),!e&&$i(this,t))},getShallow:function(t,e){var n=this.option,i=null==n?n:n[t],r=!e&&$i(this,t);return null==i&&r&&(i=r.getShallow(t)),i},getModel:function(t,e){var n,i=null==t?this.option:ji(this.option,t=this.parsePath(t));return e=e||(n=$i(this,t))&&n.getModel(t),new Ui(i,e,this.ecModel)},isEmpty:function(){return null==this.option},restoreData:function(){},clone:function(){return new(0,this.constructor)(n(this.option))},setReadOnly:function(t){},parsePath:function(t){return"string"==typeof t&&(t=t.split(".")),t},customizeGetParent:function(t){df(this).getParent=t},isAnimationEnabled:function(){if(!Fl.node){if(null!=this.option.animation)return!!this.option.animation;if(this.parentModel)return this.parentModel.isAnimationEnabled()}}},wn(Ui),bn(Ui),ff(Ui,Pu),ff(Ui,Eu),ff(Ui,hf),ff(Ui,cf);var pf=0,gf=1e-4,mf=/^(?:(\d{4})(?:[-\/](\d{1,2})(?:[-\/](\d{1,2})(?:[T ](\d{1,2})(?::(\d\d)(?::(\d\d)(?:[.,](\d+))?)?)?(Z|[\+\-]\d\d:?\d\d)?)?)?)?)?$/,vf=A,yf=["a","b","c","d","e","f","g"],_f=function(t,e){return"{"+t+(null==e?"":e)+"}"},xf=function(t){return t<10?"0"+t:t},wf=se,bf=f,Sf=["left","right","top","bottom","width","height"],Mf=[["width","left","right"],["height","top","bottom"]],Tf=(v(mr,"vertical"),v(mr,"horizontal"),{getBoxLayoutParams:function(){return{left:this.get("left"),top:this.get("top"),right:this.get("right"),bottom:this.get("bottom"),width:this.get("width"),height:this.get("height")}}}),If=pn(),Cf=Ui.extend({type:"component",id:"",name:"",mainType:"",subType:"",componentIndex:0,defaultOption:null,ecModel:null,dependentModels:[],uid:null,layoutMode:null,$constructor:function(t,e,n,i){Ui.call(this,t,e,n,i),this.uid=Ki("ec_cpt_model")},init:function(t,e,n,i){this.mergeDefaultAndTheme(t,n)},mergeDefaultAndTheme:function(t,e){var n=this.layoutMode,r=n?_r(t):{};i(t,e.getTheme().get(this.mainType)),i(t,this.getDefaultOption()),n&&yr(t,r,n)},mergeOption:function(t,e){i(this.option,t,!0);var n=this.layoutMode;n&&yr(this.option,t,n)},optionUpdated:function(t,e){},getDefaultOption:function(){var t=If(this);if(!t.defaultOption){for(var e=[],n=this.constructor;n;){var r=n.prototype.defaultOption;r&&e.push(r),n=n.superClass}for(var a={},o=e.length-1;o>=0;o--)a=i(a,e[o],!0);t.defaultOption=a}return t.defaultOption},getReferringComponents:function(t){return this.ecModel.queryComponents({mainType:t,index:this.get(t+"Index",!0),id:this.get(t+"Id",!0)})}});Tn(Cf,{registerWhenExtend:!0}),function(t){var e={};t.registerSubTypeDefaulter=function(t,n){t=_n(t),e[t.main]=n},t.determineSubType=function(n,i){var r=i.type;if(!r){var a=_n(n).main;t.hasSubTypes(n)&&e[a]&&(r=e[a](i))}return r}}(Cf),function(t,e){function n(t){var n={},a=[];return f(t,function(o){var s=i(n,o),h=r(s.originalDeps=e(o),t);s.entryCount=h.length,0===s.entryCount&&a.push(o),f(h,function(t){l(s.predecessor,t)<0&&s.predecessor.push(t);var e=i(n,t);l(e.successor,t)<0&&e.successor.push(o)})}),{graph:n,noEntryList:a}}function i(t,e){return t[e]||(t[e]={predecessor:[],successor:[]}),t[e]}function r(t,e){var n=[];return f(t,function(t){l(e,t)>=0&&n.push(t)}),n}t.topologicalTravel=function(t,e,i,r){function a(t){s[t].entryCount--,0===s[t].entryCount&&l.push(t)}if(t.length){var o=n(e),s=o.graph,l=o.noEntryList,h={};for(f(t,function(t){h[t]=!0});l.length;){var u=l.pop(),c=s[u],d=!!h[u];d&&(i.call(r,u,c.originalDeps.slice()),delete h[u]),f(c.successor,d?function(t){h[t]=!0,a(t)}:a)}f(h,function(){throw new Error("Circle dependency may exists")})}}}(Cf,function(t){var e=[];return f(Cf.getClassesByMainType(t),function(t){e=e.concat(t.prototype.dependencies||[])}),e=d(e,function(t){return _n(t).main}),"dataset"!==t&&l(e,"dataset")<=0&&e.unshift("dataset"),e}),u(Cf,Tf);var kf="";"undefined"!=typeof navigator&&(kf=navigator.platform||"");var Df={color:["#c23531","#2f4554","#61a0a8","#d48265","#91c7ae","#749f83","#ca8622","#bda29a","#6e7074","#546570","#c4ccd3"],gradientColor:["#f6efa6","#d88273","#bf444c"],textStyle:{fontFamily:kf.match(/^Win/)?"Microsoft YaHei":"sans-serif",fontSize:12,fontStyle:"normal",fontWeight:"normal"},blendMode:null,animation:"auto",animationDuration:1e3,animationDurationUpdate:300,animationEasing:"exponentialOut",animationEasingUpdate:"cubicOut",animationThreshold:2e3,progressiveThreshold:3e3,progressive:400,hoverLayerThreshold:3e3,useUTC:!1},Af=pn(),Lf={clearColorPalette:function(){Af(this).colorIdx=0,Af(this).colorNameMap={}},getColorFromPalette:function(t,e,n){var i=Af(e=e||this),r=i.colorIdx||0,a=i.colorNameMap=i.colorNameMap||{};if(a.hasOwnProperty(t))return a[t];var o=on(this.get("color",!0)),s=this.get("colorLayer",!0),l=null!=n&&s?wr(s,n):o;if((l=l||o)&&l.length){var h=l[r];return t&&(a[t]=h),i.colorIdx=(r+1)%l.length,h}}},Pf={cartesian2d:function(t,e,n,i){var r=t.getReferringComponents("xAxis")[0],a=t.getReferringComponents("yAxis")[0];e.coordSysDims=["x","y"],n.set("x",r),n.set("y",a),Sr(r)&&(i.set("x",r),e.firstCategoryDimIndex=0),Sr(a)&&(i.set("y",a),e.firstCategoryDimIndex=1)},singleAxis:function(t,e,n,i){var r=t.getReferringComponents("singleAxis")[0];e.coordSysDims=["single"],n.set("single",r),Sr(r)&&(i.set("single",r),e.firstCategoryDimIndex=0)},polar:function(t,e,n,i){var r=t.getReferringComponents("polar")[0],a=r.findAxisModel("radiusAxis"),o=r.findAxisModel("angleAxis");e.coordSysDims=["radius","angle"],n.set("radius",a),n.set("angle",o),Sr(a)&&(i.set("radius",a),e.firstCategoryDimIndex=0),Sr(o)&&(i.set("angle",o),e.firstCategoryDimIndex=1)},geo:function(t,e,n,i){e.coordSysDims=["lng","lat"]},parallel:function(t,e,n,i){var r=t.ecModel,a=r.getComponent("parallel",t.get("parallelIndex")),o=e.coordSysDims=a.dimensions.slice();f(a.parallelAxisIndex,function(t,a){var s=r.getComponent("parallelAxis",t),l=o[a];n.set(l,s),Sr(s)&&null==e.firstCategoryDimIndex&&(i.set(l,s),e.firstCategoryDimIndex=a)})}},Of="original",Ef="arrayRows",Bf="objectRows",Rf="keyedColumns",zf="unknown",Nf="typedArray",Ff="column",Vf="row";Mr.seriesDataToSource=function(t){return new Mr({data:t,sourceFormat:S(t)?Nf:Of,fromDataset:!1})},bn(Mr);var Wf=pn(),Hf="\0_ec_inner",Gf=Ui.extend({constructor:Gf,init:function(t,e,n,i){n=n||{},this.option=null,this._theme=new Ui(n),this._optionManager=i},setOption:function(t,e){L(!(Hf in t),"please use chart.getOption()"),this._optionManager.setOption(t,e),this.resetOption(null)},resetOption:function(t){var e=!1,n=this._optionManager;if(!t||"recreate"===t){var i=n.mountOption("recreate"===t);this.option&&"recreate"!==t?(this.restoreData(),this.mergeOption(i)):Fr.call(this,i),e=!0}if("timeline"!==t&&"media"!==t||this.restoreData(),!t||"recreate"===t||"timeline"===t){var r=n.getTimelineOption(this);r&&(this.mergeOption(r),e=!0)}if(!t||"recreate"===t||"media"===t){var a=n.getMediaOption(this,this._api);a.length&&f(a,function(t){this.mergeOption(t,e=!0)},this)}return e},mergeOption:function(t){var e=this.option,r=this._componentsMap,o=[];Cr(this),f(t,function(t,r){null!=t&&(Cf.hasClass(r)?r&&o.push(r):e[r]=null==e[r]?n(t):i(e[r],t,!0))}),Cf.topologicalTravel(o,Cf.getAllClassMainTypes(),function(n,i){var o=on(t[n]),s=un(r.get(n),o);cn(s),f(s,function(t,e){var i=t.option;w(i)&&(t.keyInfo.mainType=n,t.keyInfo.subType=Wr(n,i,t.exist))});var l=Vr(r,i);e[n]=[],r.set(n,[]),f(s,function(t,i){var o=t.exist,s=t.option;if(L(w(s)||o,"Empty component definition"),s){var h=Cf.getClass(n,t.keyInfo.subType,!0);if(o&&o instanceof h)o.name=t.keyInfo.name,o.mergeOption(s,this),o.optionUpdated(s,!1);else{var u=a({dependentModels:l,componentIndex:i},t.keyInfo);a(o=new h(s,this,this,u),u),o.init(s,this,this,u),o.optionUpdated(null,!0)}}else o.mergeOption({},this),o.optionUpdated({},!1);r.get(n)[i]=o,e[n][i]=o.option},this),"series"===n&&Hr(this,r.get("series"))},this),this._seriesIndicesMap=R(this._seriesIndices=this._seriesIndices||[])},getOption:function(){var t=n(this.option);return f(t,function(e,n){if(Cf.hasClass(n)){for(var i=(e=on(e)).length-1;i>=0;i--)fn(e[i])&&e.splice(i,1);t[n]=e}}),delete t[Hf],t},getTheme:function(){return this._theme},getComponent:function(t,e){var n=this._componentsMap.get(t);if(n)return n[e||0]},queryComponents:function(t){var e=t.mainType;if(!e)return[];var n=t.index,i=t.id,r=t.name,a=this._componentsMap.get(e);if(!a||!a.length)return[];var o;if(null!=n)y(n)||(n=[n]),o=g(d(n,function(t){return a[t]}),function(t){return!!t});else if(null!=i){var s=y(i);o=g(a,function(t){return s&&l(i,t.id)>=0||!s&&t.id===i})}else if(null!=r){var h=y(r);o=g(a,function(t){return h&&l(r,t.name)>=0||!h&&t.name===r})}else o=a.slice();return Gr(o,t)},findComponents:function(t){var e=t.query,n=t.mainType,i=function(t){var e=n+"Index",i=n+"Id",r=n+"Name";return!t||null==t[e]&&null==t[i]&&null==t[r]?null:{mainType:n,index:t[e],id:t[i],name:t[r]}}(e);return function(e){return t.filter?g(e,t.filter):e}(Gr(i?this.queryComponents(i):this._componentsMap.get(n),t))},eachComponent:function(t,e,n){var i=this._componentsMap;"function"==typeof t?(n=e,e=t,i.each(function(t,i){f(t,function(t,r){e.call(n,i,t,r)})})):x(t)?f(i.get(t),e,n):w(t)&&f(this.findComponents(t),e,n)},getSeriesByName:function(t){return g(this._componentsMap.get("series"),function(e){return e.name===t})},getSeriesByIndex:function(t){return this._componentsMap.get("series")[t]},getSeriesByType:function(t){return g(this._componentsMap.get("series"),function(e){return e.subType===t})},getSeries:function(){return this._componentsMap.get("series").slice()},getSeriesCount:function(){return this._componentsMap.get("series").length},eachSeries:function(t,e){f(this._seriesIndices,function(n){var i=this._componentsMap.get("series")[n];t.call(e,i,n)},this)},eachRawSeries:function(t,e){f(this._componentsMap.get("series"),t,e)},eachSeriesByType:function(t,e,n){f(this._seriesIndices,function(i){var r=this._componentsMap.get("series")[i];r.subType===t&&e.call(n,r,i)},this)},eachRawSeriesByType:function(t,e,n){return f(this.getSeriesByType(t),e,n)},isSeriesFiltered:function(t){return null==this._seriesIndicesMap.get(t.componentIndex)},getCurrentSeriesIndices:function(){return(this._seriesIndices||[]).slice()},filterSeries:function(t,e){Hr(this,g(this._componentsMap.get("series"),t,e))},restoreData:function(t){var e=this._componentsMap;Hr(this,e.get("series"));var n=[];e.each(function(t,e){n.push(e)}),Cf.topologicalTravel(n,Cf.getAllClassMainTypes(),function(n,i){f(e.get(n),function(e){("series"!==n||!zr(e,t))&&e.restoreData()})})}});u(Gf,Lf);var qf=["getDom","getZr","getWidth","getHeight","getDevicePixelRatio","dispatchAction","isDisposed","on","off","getDataURL","getConnectedDataURL","getModel","getOption","getViewOfComponentModel","getViewOfSeriesModel"],Xf={};Xr.prototype={constructor:Xr,create:function(t,e){var n=[];f(Xf,function(i,r){var a=i.create(t,e);n=n.concat(a||[])}),this._coordinateSystems=n},update:function(t,e){f(this._coordinateSystems,function(n){n.update&&n.update(t,e)})},getCoordinateSystems:function(){return this._coordinateSystems.slice()}},Xr.register=function(t,e){Xf[t]=e},Xr.get=function(t){return Xf[t]};var Zf=f,Yf=n,Uf=d,jf=i,$f=/^(min|max)?(.+)$/;Zr.prototype={constructor:Zr,setOption:function(t,e){t&&f(on(t.series),function(t){t&&t.data&&S(t.data)&&O(t.data)}),t=Yf(t,!0);var n=this._optionBackup,i=Yr.call(this,t,e,!n);this._newBaseOption=i.baseOption,n?(Kr(n.baseOption,i.baseOption),i.timelineOptions.length&&(n.timelineOptions=i.timelineOptions),i.mediaList.length&&(n.mediaList=i.mediaList),i.mediaDefault&&(n.mediaDefault=i.mediaDefault)):this._optionBackup=i},mountOption:function(t){var e=this._optionBackup;return this._timelineOptions=Uf(e.timelineOptions,Yf),this._mediaList=Uf(e.mediaList,Yf),this._mediaDefault=Yf(e.mediaDefault),this._currentMediaIndices=[],Yf(t?e.baseOption:this._newBaseOption)},getTimelineOption:function(t){var e,n=this._timelineOptions;if(n.length){var i=t.getComponent("timeline");i&&(e=Yf(n[i.getCurrentIndex()],!0))}return e},getMediaOption:function(t){var e=this._api.getWidth(),n=this._api.getHeight(),i=this._mediaList,r=this._mediaDefault,a=[],o=[];if(!i.length&&!r)return o;for(var s=0,l=i.length;s<l;s++)Ur(i[s].query,e,n)&&a.push(s);return!a.length&&r&&(a=[-1]),a.length&&!$r(a,this._currentMediaIndices)&&(o=Uf(a,function(t){return Yf(-1===t?r.option:i[t].option)})),this._currentMediaIndices=a,o}};var Kf=f,Qf=w,Jf=["areaStyle","lineStyle","nodeStyle","linkStyle","chordStyle","label","labelLine"],td=function(t,e){Kf(ra(t.series),function(t){Qf(t)&&ia(t)});var n=["xAxis","yAxis","radiusAxis","angleAxis","singleAxis","parallelAxis","radar"];e&&n.push("valueAxis","categoryAxis","logAxis","timeAxis"),Kf(n,function(e){Kf(ra(t[e]),function(t){t&&(ea(t,"axisLabel"),ea(t.axisPointer,"label"))})}),Kf(ra(t.parallel),function(t){var e=t&&t.parallelAxisDefault;ea(e,"axisLabel"),ea(e&&e.axisPointer,"label")}),Kf(ra(t.calendar),function(t){Jr(t,"itemStyle"),ea(t,"dayLabel"),ea(t,"monthLabel"),ea(t,"yearLabel")}),Kf(ra(t.radar),function(t){ea(t,"name")}),Kf(ra(t.geo),function(t){Qf(t)&&(na(t),Kf(ra(t.regions),function(t){na(t)}))}),Kf(ra(t.timeline),function(t){na(t),Jr(t,"label"),Jr(t,"itemStyle"),Jr(t,"controlStyle",!0),Jr(t,"checkpointStyle");var e=t.data;y(e)&&f(e,function(t){w(t)&&(Jr(t,"label"),Jr(t,"itemStyle"))})}),Kf(ra(t.toolbox),function(t){Jr(t,"iconStyle"),Kf(t.feature,function(t){Jr(t,"iconStyle")})}),ea(aa(t.axisPointer),"label"),ea(aa(t.tooltip).axisPointer,"label")},ed=[["x","left"],["y","top"],["x2","right"],["y2","bottom"]],nd=["grid","geo","parallel","legend","toolbox","title","visualMap","dataZoom","timeline"],id=function(t,e){td(t,e),t.series=on(t.series),f(t.series,function(t){if(w(t)){var e=t.type;if("pie"!==e&&"gauge"!==e||null!=t.clockWise&&(t.clockwise=t.clockWise),"gauge"===e){var n=oa(t,"pointer.color");null!=n&&sa(t,"itemStyle.normal.color",n)}la(t)}}),t.dataRange&&(t.visualMap=t.dataRange),f(nd,function(e){var n=t[e];n&&(y(n)||(n=[n]),f(n,function(t){la(t)}))})},rd=ha.prototype;rd.pure=!1,rd.persistent=!0,rd.getSource=function(){return this._source};var ad={arrayRows_column:{pure:!0,count:function(){return Math.max(0,this._data.length-this._source.startIndex)},getItem:function(t){return this._data[t+this._source.startIndex]},appendData:fa},arrayRows_row:{pure:!0,count:function(){var t=this._data[0];return t?Math.max(0,t.length-this._source.startIndex):0},getItem:function(t){t+=this._source.startIndex;for(var e=[],n=this._data,i=0;i<n.length;i++){var r=n[i];e.push(r?r[t]:null)}return e},appendData:function(){throw new Error('Do not support appendData when set seriesLayoutBy: "row".')}},objectRows:{pure:!0,count:ua,getItem:ca,appendData:fa},keyedColumns:{pure:!0,count:function(){var t=this._source.dimensionsDefine[0].name,e=this._data[t];return e?e.length:0},getItem:function(t){for(var e=[],n=this._source.dimensionsDefine,i=0;i<n.length;i++){var r=this._data[n[i].name];e.push(r?r[t]:null)}return e},appendData:function(t){var e=this._data;f(t,function(t,n){for(var i=e[n]||(e[n]=[]),r=0;r<(t||[]).length;r++)i.push(t[r])})}},original:{count:ua,getItem:ca,appendData:fa},typedArray:{persistent:!1,pure:!0,count:function(){return this._data?this._data.length/this._dimSize:0},getItem:function(t){t-=this._offset;for(var e=[],n=this._dimSize*t,i=0;i<this._dimSize;i++)e[i]=this._data[n+i];return e},appendData:function(t){this._data=t},clean:function(){this._offset+=this.count(),this._data=null}}},od={arrayRows:da,objectRows:function(t,e,n,i){return null!=n?t[i]:t},keyedColumns:da,original:function(t,e,n,i){var r=ln(t);return null!=n&&r instanceof Array?r[n]:r},typedArray:da},sd={arrayRows:pa,objectRows:function(t,e,n,i){return ga(t[e],this._dimensionInfos[e])},keyedColumns:pa,original:function(t,e,n,i){var r=t&&(null==t.value?t:t.value);return!this._rawData.pure&&hn(t)&&(this.hasItemOption=!0),ga(r instanceof Array?r[i]:r,this._dimensionInfos[e])},typedArray:function(t,e,n,i){return t[i]}},ld=/\{@(.+?)\}/g,hd={getDataParams:function(t,e){var n=this.getData(e),i=this.getRawValue(t,e),r=n.getRawIndex(t),a=n.getName(t,!0),o=n.getRawDataItem(t),s=n.getItemVisual(t,"color");return{componentType:this.mainType,componentSubType:this.subType,seriesType:"series"===this.mainType?this.subType:null,seriesIndex:this.seriesIndex,seriesId:this.id,seriesName:this.name,name:a,dataIndex:r,data:o,dataType:e,value:i,color:s,marker:pr(s),$vars:["seriesName","name","value"]}},getFormattedLabel:function(t,e,n,i,r){e=e||"normal";var a=this.getData(n),o=a.getItemModel(t),s=this.getDataParams(t,n);null!=i&&s.value instanceof Array&&(s.value=s.value[i]);var l=o.get("normal"===e?[r||"label","formatter"]:[e,r||"label","formatter"]);return"function"==typeof l?(s.status=e,l(s)):"string"==typeof l?dr(l,s).replace(ld,function(e,n){var i=n.length;return"["===n.charAt(0)&&"]"===n.charAt(i-1)&&(n=+n.slice(1,i-1)),ma(a,t,n)}):void 0},getRawValue:function(t,e){return ma(this.getData(e),t)},formatTooltip:function(){}},ud=_a.prototype;ud.perform=function(t){var e=this._upstream,n=t&&t.skip;if(this._dirty&&e){var i=this.context;i.data=i.outputData=e.context.outputData}this.__pipeline&&(this.__pipeline.currentTask=this);var r;this._plan&&!n&&(r=this._plan(this.context)),(this._dirty||"reset"===r)&&(this._dirty=!1,xa(this,n));var a=t&&t.step;if(this._dueEnd=e?e._outputDueEnd:this._count?this._count(this.context):1/0,this._progress){var o=this._dueIndex,s=Math.min(null!=a?this._dueIndex+a:1/0,this._dueEnd);!n&&o<s&&this._progress({start:o,end:s},this.context),this._dueIndex=s;var l=null!=this._settedOutputEnd?this._settedOutputEnd:s;this._outputDueEnd=l}else this._dueIndex=this._outputDueEnd=null!=this._settedOutputEnd?this._settedOutputEnd:this._dueEnd;return this.unfinished()},ud.dirty=function(){this._dirty=!0,this._onDirty&&this._onDirty(this.context)},ud.unfinished=function(){return this._progress&&this._dueIndex<this._dueEnd},ud.pipe=function(t){(this._downstream!==t||this._dirty)&&(this._downstream=t,t._upstream=this,t.dirty())},ud.dispose=function(){this._disposed||(this._upstream&&(this._upstream._downstream=null),this._downstream&&(this._downstream._upstream=null),this._dirty=!1,this._disposed=!0)},ud.getUpstream=function(){return this._upstream},ud.getDownstream=function(){return this._downstream},ud.setOutputEnd=function(t){this._outputDueEnd=this._settedOutputEnd=t};var cd=pn(),fd=Cf.extend({type:"series.__base__",seriesIndex:0,coordinateSystem:null,defaultOption:null,legendDataProvider:null,visualColorAccessPath:"itemStyle.color",layoutMode:null,init:function(t,e,n,i){this.seriesIndex=this.componentIndex,this.dataTask=ya({count:Sa,reset:Ma}),this.dataTask.context={model:this},this.mergeDefaultAndTheme(t,n),kr(this);var r=this.getInitialData(t,n);Ia(r,this),this.dataTask.context.data=r,cd(this).dataBeforeProcessed=r,wa(this)},mergeDefaultAndTheme:function(t,e){var n=this.layoutMode,r=n?_r(t):{},a=this.subType;Cf.hasClass(a)&&(a+="Series"),i(t,e.getTheme().get(this.subType)),i(t,this.getDefaultOption()),sn(t,"label",["show"]),this.fillDataTextStyle(t.data),n&&yr(t,r,n)},mergeOption:function(t,e){t=i(this.option,t,!0),this.fillDataTextStyle(t.data);var n=this.layoutMode;n&&yr(this.option,t,n),kr(this);var r=this.getInitialData(t,e);Ia(r,this),this.dataTask.dirty(),this.dataTask.context.data=r,cd(this).dataBeforeProcessed=r,wa(this)},fillDataTextStyle:function(t){if(t)for(var e=["show"],n=0;n<t.length;n++)t[n]&&t[n].label&&sn(t[n],"label",e)},getInitialData:function(){},appendData:function(t){this.getRawData().appendData(t.data)},getData:function(t){var e=ka(this);if(e){var n=e.context.data;return null==t?n:n.getLinkedData(t)}return cd(this).data},setData:function(t){var e=ka(this);if(e){var n=e.context;n.data!==t&&e.isOverallFilter&&e.setOutputEnd(t.count()),n.outputData=t,e!==this.dataTask&&(n.data=t)}cd(this).data=t},getSource:function(){return Ir(this)},getRawData:function(){return cd(this).dataBeforeProcessed},getBaseAxis:function(){var t=this.coordinateSystem;return t&&t.getBaseAxis&&t.getBaseAxis()},formatTooltip:function(t,e,n){function i(t){return fr(cr(t))}var r=this.getData(),a=r.mapDimension("defaultedTooltip",!0),o=a.length,s=this.getRawValue(t),l=y(s),h=r.getItemVisual(t,"color");w(h)&&h.colorStops&&(h=(h.colorStops[0]||{}).color),h=h||"transparent";var u=o>1||l&&!o?function(n){function i(t,n){var i=r.getDimensionInfo(n);if(i&&!1!==i.otherDims.tooltip){var a=i.type,l=pr({color:h,type:"subItem"}),u=(o?l+fr(i.displayName||"-")+": ":"")+fr("ordinal"===a?t+"":"time"===a?e?"":gr("yyyy/MM/dd hh:mm:ss",t):cr(t));u&&s.push(u)}}var o=p(n,function(t,e,n){var i=r.getDimensionInfo(n);return t|=i&&!1!==i.tooltip&&null!=i.displayName},0),s=[];return a.length?f(a,function(e){i(ma(r,t,e),e)}):f(n,i),(o?"<br/>":"")+s.join(o?"<br/>":", ")}(s):i(o?ma(r,t,a[0]):l?s[0]:s),c=pr(h),d=r.getName(t),g=this.name;return g===Mu&&(g=""),g=g?fr(g)+(e?": ":"<br/>"):"",e?c+g+u:g+c+(d?fr(d)+": "+u:u)},isAnimationEnabled:function(){if(Fl.node)return!1;var t=this.getShallow("animation");return t&&this.getData().count()>this.getShallow("animationThreshold")&&(t=!1),t},restoreData:function(){this.dataTask.dirty()},getColorFromPalette:function(t,e,n){var i=this.ecModel,r=Lf.getColorFromPalette.call(this,t,e,n);return r||(r=i.getColorFromPalette(t,e,n)),r},coordDimToDataDim:function(t){return this.getRawData().mapDimension(t,!0)},getProgressive:function(){return this.get("progressive")},getProgressiveThreshold:function(){return this.get("progressiveThreshold")},getAxisTooltipData:null,getTooltipPosition:null,pipeTask:null,preventIncremental:null,pipelineContext:null});u(fd,hd),u(fd,Lf);var dd=function(){this.group=new Oh,this.uid=Ki("viewComponent")};dd.prototype={constructor:dd,init:function(t,e){},render:function(t,e,n,i){},dispose:function(){}};var pd=dd.prototype;pd.updateView=pd.updateLayout=pd.updateVisual=function(t,e,n,i){},wn(dd),Tn(dd,{registerWhenExtend:!0});var gd=function(){var t=pn();return function(e){var n=t(e),i=e.pipelineContext,r=n.large,a=n.incrementalRender,o=n.large=i.large,s=n.incrementalRender=i.incrementalRender;return(r^o||a^s)&&"reset"}},md=pn(),vd=gd();Da.prototype={type:"chart",init:function(t,e){},render:function(t,e,n,i){},highlight:function(t,e,n,i){La(t.getData(),i,"emphasis")},downplay:function(t,e,n,i){La(t.getData(),i,"normal")},remove:function(t,e){this.group.removeAll()},dispose:function(){},incrementalPrepareRender:null,incrementalRender:null,updateTransform:null};var yd=Da.prototype;yd.updateView=yd.updateLayout=yd.updateVisual=function(t,e,n,i){this.render(t,e,n,i)},wn(Da),Tn(Da,{registerWhenExtend:!0}),Da.markUpdateMethod=function(t,e){md(t).updateMethod=e};var _d={createOnAllSeries:!0,performRawSeries:!0,reset:function(t,e){var n=t.getData(),i=(t.visualColorAccessPath||"itemStyle.color").split("."),r=t.get(i)||t.getColorFromPalette(t.get("name"),null,e.getSeriesCount());if(n.setVisual("color",r),!e.isSeriesFiltered(t)){"function"!=typeof r||r instanceof Qc||n.each(function(e){n.setItemVisual(e,"color",r(t.getDataParams(e)))});return{dataEach:n.hasItemOption?function(t,e){var n=t.getItemModel(e).get(i,!0);null!=n&&t.setItemVisual(e,"color",n)}:null}}}},xd={toolbox:{brush:{title:{rect:"矩形选择",polygon:"圈选",lineX:"横向选择",lineY:"纵向选择",keep:"保持选择",clear:"清除选择"}},dataView:{title:"数据视图",lang:["数据视图","关闭","刷新"]},dataZoom:{title:{zoom:"区域缩放",back:"区域缩放还原"}},magicType:{title:{line:"切换为折线图",bar:"切换为柱状图",stack:"切换为堆叠",tiled:"切换为平铺"}},restore:{title:"还原"},saveAsImage:{title:"保存为图片",lang:["右键另存为图片"]}},series:{typeNames:{pie:"饼图",bar:"柱状图",line:"折线图",scatter:"散点图",effectScatter:"涟漪散点图",radar:"雷达图",tree:"树图",treemap:"矩形树图",boxplot:"箱型图",candlestick:"K线图",k:"K线图",heatmap:"热力图",map:"地图",parallel:"平行坐标图",lines:"线图",graph:"关系图",sankey:"桑基图",funnel:"漏斗图",gauge:"仪表盘图",pictorialBar:"象形柱图",themeRiver:"主题河流图",sunburst:"旭日图"}},aria:{general:{withTitle:"这是一个关于“{title}”的图表。",withoutTitle:"这是一个图表，"},series:{single:{prefix:"",withName:"图表类型是{seriesType}，表示{seriesName}。",withoutName:"图表类型是{seriesType}。"},multiple:{prefix:"它由{seriesCount}个图表系列组成。",withName:"第{seriesId}个系列是一个表示{seriesName}的{seriesType}，",withoutName:"第{seriesId}个系列是一个{seriesType}，",separator:{middle:"；",end:"。"}}},data:{allData:"其数据是——",partialData:"其中，前{displayCnt}项是——",withName:"{name}的数据是{value}",withoutName:"{value}",separator:{middle:"，",end:""}}}},wd=function(t,e){function n(t,e){if("string"!=typeof t)return t;var n=t;return f(e,function(t,e){n=n.replace(new RegExp("\\{\\s*"+e+"\\s*\\}","g"),t)}),n}function i(t){var e=a.get(t);if(null==e){for(var n=t.split("."),i=xd.aria,r=0;r<n.length;++r)i=i[n[r]];return i}return e}function r(t){return xd.series.typeNames[t]||"自定义图"}var a=e.getModel("aria");if(a.get("show"))if(a.get("description"))t.setAttribute("aria-label",a.get("description"));else{var o=0;e.eachSeries(function(t,e){++o},this);var s,l=a.get("data.maxCount")||10,h=a.get("series.maxCount")||10,u=Math.min(o,h);if(!(o<1)){var c=function(){var t=e.getModel("title").option;return t&&t.length&&(t=t[0]),t&&t.text}();s=c?n(i("general.withTitle"),{title:c}):i("general.withoutTitle");var d=[];s+=n(i(o>1?"series.multiple.prefix":"series.single.prefix"),{seriesCount:o}),e.eachSeries(function(t,e){if(e<u){var a,s=t.get("name"),h="series."+(o>1?"multiple":"single")+".";a=n(a=i(s?h+"withName":h+"withoutName"),{seriesId:t.seriesIndex,seriesName:t.get("name"),seriesType:r(t.subType)});var c=t.getData();window.data=c,c.count()>l?a+=n(i("data.partialData"),{displayCnt:l}):a+=i("data.allData");for(var f=[],p=0;p<c.count();p++)if(p<l){var g=c.getName(p),m=ma(c,p);f.push(n(i(g?"data.withName":"data.withoutName"),{name:g,value:m}))}a+=f.join(i("data.separator.middle"))+i("data.separator.end"),d.push(a)}}),s+=d.join(i("series.multiple.separator.middle"))+i("series.multiple.separator.end"),t.setAttribute("aria-label",s)}}},bd=Math.PI,Sd=Ra.prototype;Sd.getPerformArgs=function(t,e){if(t.__pipeline){var n=this._pipelineMap.get(t.__pipeline.id),i=n.context;return{step:!e&&n.progressiveEnabled&&(!i||i.incrementalRender)&&t.__idxInPipeline>n.bockIndex?n.step:null}}},Sd.getPipeline=function(t){return this._pipelineMap.get(t)},Sd.updateStreamModes=function(t,e){var n=this._pipelineMap.get(t.uid),i=t.getData().count(),r=n.progressiveEnabled&&e.incrementalPrepareRender&&i>=n.threshold,a=t.get("large")&&i>=t.get("largeThreshold");t.pipelineContext=n.context={incrementalRender:r,large:a}},Sd.restorePipelines=function(t){var e=this,n=e._pipelineMap=R();t.eachSeries(function(t){var i=t.getProgressive(),r=t.uid;n.set(r,{id:r,head:null,tail:null,threshold:t.getProgressiveThreshold(),progressiveEnabled:i&&!(t.preventIncremental&&t.preventIncremental()),bockIndex:-1,step:i||700,count:0}),Ua(e,t,t.dataTask)})},Sd.prepareStageTasks=function(t,e){var n=this._stageTaskMap,i=this.ecInstance.getModel(),r=this.api;f(t,function(t){var e=n.get(t.uid)||n.set(t.uid,[]);t.reset&&Na(this,t,e,i,r),t.overallReset&&Fa(this,t,e,i,r)},this)},Sd.prepareView=function(t,e,n,i){var r=t.renderTask,a=r.context;a.model=e,a.ecModel=n,a.api=i,r.__block=!t.incrementalPrepareRender,Ua(this,e,r)},Sd.performDataProcessorTasks=function(t,e,n){za(this,t,e,n,{block:!0})},Sd.performVisualTasks=function(t,e,n,i){za(this,t,e,n,i)},Sd.performSeriesTasks=function(t){var e;t.eachSeries(function(t){e|=t.dataTask.perform()}),this.unfinished|=e},Sd.plan=function(){this._pipelineMap.each(function(t){var e=t.tail;do{if(e.__block){t.bockIndex=e.__idxInPipeline;break}e=e.getUpstream()}while(e)})};var Md=Sd.updatePayload=function(t,e){"remain"!==e&&(t.context.payload=e)};Ra.wrapStageHandler=function(t,e){return _(t)&&(t={overallReset:t,seriesType:ja(t)}),t.uid=Ki("stageHandler"),e&&(t.visualType=e),t};var Td,Id={},Cd={};$a(Id,Gf),$a(Cd,qr),Id.eachSeriesByType=Id.eachRawSeriesByType=function(t){Td=t},Id.eachComponent=function(t){"series"===t.mainType&&t.subType&&(Td=t.subType)};var kd=["#37A2DA","#32C5E9","#67E0E3","#9FE6B8","#FFDB5C","#ff9f7f","#fb7293","#E062AE","#E690D1","#e7bcf3","#9d96f5","#8378EA","#96BFFF"],Dd={color:kd,colorLayer:[["#37A2DA","#ffd85c","#fd7b5f"],["#37A2DA","#67E0E3","#FFDB5C","#ff9f7f","#E062AE","#9d96f5"],["#37A2DA","#32C5E9","#9FE6B8","#FFDB5C","#ff9f7f","#fb7293","#e7bcf3","#8378EA","#96BFFF"],kd]},Ad=["#dd6b66","#759aa0","#e69d87","#8dc1a9","#ea7e53","#eedd78","#73a373","#73b9bc","#7289ab","#91ca8c","#f49f42"],Ld={color:Ad,backgroundColor:"#333",tooltip:{axisPointer:{lineStyle:{color:"#eee"},crossStyle:{color:"#eee"}}},legend:{textStyle:{color:"#eee"}},textStyle:{color:"#eee"},title:{textStyle:{color:"#eee"}},toolbox:{iconStyle:{normal:{borderColor:"#eee"}}},dataZoom:{textStyle:{color:"#eee"}},visualMap:{textStyle:{color:"#eee"}},timeline:{lineStyle:{color:"#eee"},itemStyle:{normal:{color:Ad[1]}},label:{normal:{textStyle:{color:"#eee"}}},controlStyle:{normal:{color:"#eee",borderColor:"#eee"}}},timeAxis:{axisLine:{lineStyle:{color:"#eee"}},axisTick:{lineStyle:{color:"#eee"}},axisLabel:{textStyle:{color:"#eee"}},splitLine:{lineStyle:{type:"dashed",color:"#aaa"}},splitArea:{areaStyle:{color:"#eee"}}},logAxis:{axisLine:{lineStyle:{color:"#eee"}},axisTick:{lineStyle:{color:"#eee"}},axisLabel:{textStyle:{color:"#eee"}},splitLine:{lineStyle:{type:"dashed",color:"#aaa"}},splitArea:{areaStyle:{color:"#eee"}}},valueAxis:{axisLine:{lineStyle:{color:"#eee"}},axisTick:{lineStyle:{color:"#eee"}},axisLabel:{textStyle:{color:"#eee"}},splitLine:{lineStyle:{type:"dashed",color:"#aaa"}},splitArea:{areaStyle:{color:"#eee"}}},categoryAxis:{axisLine:{lineStyle:{color:"#eee"}},axisTick:{lineStyle:{color:"#eee"}},axisLabel:{textStyle:{color:"#eee"}},splitLine:{lineStyle:{type:"dashed",color:"#aaa"}},splitArea:{areaStyle:{color:"#eee"}}},line:{symbol:"circle"},graph:{color:Ad},gauge:{title:{textStyle:{color:"#eee"}}},candlestick:{itemStyle:{normal:{color:"#FD1050",color0:"#0CF49B",borderColor:"#FD1050",borderColor0:"#0CF49B"}}}};Ld.categoryAxis.splitLine.show=!1;var Pd=L,Od=f,Ed=_,Bd=w,Rd=Cf.parseClassType,zd={zrender:"4.0.1"},Nd=1e3,Fd=1e3,Vd=3e3,Wd={PROCESSOR:{FILTER:Nd,STATISTIC:5e3},VISUAL:{LAYOUT:Fd,GLOBAL:2e3,CHART:Vd,COMPONENT:4e3,BRUSH:5e3}},Hd="__flagInMainProcess",Gd="__optionUpdated",qd=/^[a-zA-Z0-9_]+$/;Qa.prototype.on=Ka("on"),Qa.prototype.off=Ka("off"),Qa.prototype.one=Ka("one"),u(Qa,ih);var Xd=Ja.prototype;Xd._onframe=function(){if(!this._disposed){var t=this._scheduler;if(this[Gd]){var e=this[Gd].silent;this[Hd]=!0,eo(this),Zd.update.call(this),this[Hd]=!1,this[Gd]=!1,oo.call(this,e),so.call(this,e)}else if(t.unfinished){var n=1,i=this._model;this._api;t.unfinished=!1;do{var r=+new Date;t.performSeriesTasks(i),t.performDataProcessorTasks($d,i),ro(this,i),t.performVisualTasks(Jd,i),po(this,this._model,0,"remain"),n-=+new Date-r}while(n>0&&t.unfinished);t.unfinished||(this._zr&&this._zr.flush(),this.trigger("finished"))}}},Xd.getDom=function(){return this._dom},Xd.getZr=function(){return this._zr},Xd.setOption=function(t,e,n){var i;if(Bd(e)&&(n=e.lazyUpdate,i=e.silent,e=e.notMerge),this[Hd]=!0,!this._model||e){var r=new Zr(this._api),a=this._theme,o=this._model=new Gf(null,null,a,r);o.scheduler=this._scheduler,o.init(null,null,a,r)}this._model.setOption(t,Kd),n?(this[Gd]={silent:i},this[Hd]=!1):(eo(this),Zd.update.call(this),this._zr.flush(),this[Gd]=!1,this[Hd]=!1,oo.call(this,i),so.call(this,i))},Xd.setTheme=function(){console.log("ECharts#setTheme() is DEPRECATED in ECharts 3.0")},Xd.getModel=function(){return this._model},Xd.getOption=function(){return this._model&&this._model.getOption()},Xd.getWidth=function(){return this._zr.getWidth()},Xd.getHeight=function(){return this._zr.getHeight()},Xd.getDevicePixelRatio=function(){return this._zr.painter.dpr||window.devicePixelRatio||1},Xd.getRenderedCanvas=function(t){if(Fl.canvasSupported){(t=t||{}).pixelRatio=t.pixelRatio||1,t.backgroundColor=t.backgroundColor||this._model.get("backgroundColor");var e=this._zr;return f(e.storage.getDisplayList(),function(t){t.stopAnimation(!0)}),e.painter.getRenderedCanvas(t)}},Xd.getSvgDataUrl=function(){if(Fl.svgSupported){var t=this._zr;return f(t.storage.getDisplayList(),function(t){t.stopAnimation(!0)}),t.painter.pathToSvg()}},Xd.getDataURL=function(t){var e=(t=t||{}).excludeComponents,n=this._model,i=[],r=this;Od(e,function(t){n.eachComponent({mainType:t},function(t){var e=r._componentsMap[t.__viewId];e.group.ignore||(i.push(e),e.group.ignore=!0)})});var a="svg"===this._zr.painter.getType()?this.getSvgDataUrl():this.getRenderedCanvas(t).toDataURL("image/"+(t&&t.type||"png"));return Od(i,function(t){t.group.ignore=!1}),a},Xd.getConnectedDataURL=function(t){if(Fl.canvasSupported){var e=this.group,i=Math.min,r=Math.max;if(ip[e]){var a=1/0,o=1/0,s=-1/0,l=-1/0,h=[],u=t&&t.pixelRatio||1;f(np,function(u,c){if(u.group===e){var f=u.getRenderedCanvas(n(t)),d=u.getDom().getBoundingClientRect();a=i(d.left,a),o=i(d.top,o),s=r(d.right,s),l=r(d.bottom,l),h.push({dom:f,left:d.left,top:d.top})}});var c=(s*=u)-(a*=u),d=(l*=u)-(o*=u),p=$l();p.width=c,p.height=d;var g=an(p);return Od(h,function(t){var e=new ze({style:{x:t.left*u-a,y:t.top*u-o,image:t.dom}});g.add(e)}),g.refreshImmediately(),p.toDataURL("image/"+(t&&t.type||"png"))}return this.getDataURL(t)}},Xd.convertToPixel=v(to,"convertToPixel"),Xd.convertFromPixel=v(to,"convertFromPixel"),Xd.containPixel=function(t,e){var n;return t=gn(this._model,t),f(t,function(t,i){i.indexOf("Models")>=0&&f(t,function(t){var r=t.coordinateSystem;if(r&&r.containPoint)n|=!!r.containPoint(e);else if("seriesModels"===i){var a=this._chartsMap[t.__viewId];a&&a.containPoint&&(n|=a.containPoint(e,t))}},this)},this),!!n},Xd.getVisual=function(t,e){var n=(t=gn(this._model,t,{defaultMainType:"series"})).seriesModel.getData(),i=t.hasOwnProperty("dataIndexInside")?t.dataIndexInside:t.hasOwnProperty("dataIndex")?n.indexOfRawIndex(t.dataIndex):null;return null!=i?n.getItemVisual(i,e):n.getVisual(e)},Xd.getViewOfComponentModel=function(t){return this._componentsMap[t.__viewId]},Xd.getViewOfSeriesModel=function(t){return this._chartsMap[t.__viewId]};var Zd={prepareAndUpdate:function(t){eo(this),Zd.update.call(this,t)},update:function(t){var e=this._model,n=this._api,i=this._zr,r=this._coordSysMgr,a=this._scheduler;if(e){e.restoreData(t),a.performSeriesTasks(e),r.create(e,n),a.performDataProcessorTasks($d,e,t),ro(this,e),ho(e),r.update(e,n),uo(e),a.performVisualTasks(Jd,e,t),co(this,e,n,t);var o=e.get("backgroundColor")||"transparent",s=i.painter;if(s.isSingleCanvas&&s.isSingleCanvas())i.configLayer(0,{clearColor:o});else{if(!Fl.canvasSupported){var l=_t(o);o=bt(l,"rgb"),0===l[3]&&(o="transparent")}o.colorStops||o.image?(i.configLayer(0,{clearColor:o}),this.__hasGradientOrPatternBg=!0,this._dom.style.background="transparent"):(this.__hasGradientOrPatternBg&&i.configLayer(0,{clearColor:null}),this.__hasGradientOrPatternBg=!1,this._dom.style.background=o)}go(e,n)}},updateTransform:function(t){var e=this._model,n=this,i=this._api;if(e){var r=[];e.eachComponent(function(a,o){var s=n.getViewOfComponentModel(o);if(s&&s.__alive)if(s.updateTransform){var l=s.updateTransform(o,e,i,t);l&&l.update&&r.push(s)}else r.push(s)});var a=R();e.eachSeries(function(r){var o=n._chartsMap[r.__viewId];if(o.updateTransform){var s=o.updateTransform(r,e,i,t);s&&s.update&&a.set(r.uid,1)}else a.set(r.uid,1)}),uo(e),this._scheduler.performVisualTasks(Jd,e,t,{setDirty:!0,dirtyMap:a}),po(n,e,0,t,a),go(e,this._api)}},updateView:function(t){var e=this._model;e&&(Da.markUpdateMethod(t,"updateView"),uo(e),this._scheduler.performVisualTasks(Jd,e,t,{setDirty:!0}),co(this,this._model,this._api,t),go(e,this._api))},updateVisual:function(t){Zd.update.call(this,t)},updateLayout:function(t){Zd.update.call(this,t)}};Xd.resize=function(t){this._zr.resize(t);var e=this._model;this._loadingFX&&this._loadingFX.resize(),e&&io(this,e.resetOption("media"),t&&t.silent)},Xd.showLoading=function(t,e){if(Bd(t)&&(e=t,t=""),t=t||"default",this.hideLoading(),ep[t]){var n=ep[t](this._api,e),i=this._zr;this._loadingFX=n,i.add(n)}},Xd.hideLoading=function(){this._loadingFX&&this._zr.remove(this._loadingFX),this._loadingFX=null},Xd.makeActionFromEvent=function(t){var e=a({},t);return e.type=jd[t.type],e},Xd.dispatchAction=function(t,e){Bd(e)||(e={silent:!!e}),Ud[t.type]&&this._model&&(this[Hd]?this._pendingActions.push(t):(ao.call(this,t,e.silent),e.flush?this._zr.flush(!0):!1!==e.flush&&Fl.browser.weChat&&this._throttledZrFlush(),oo.call(this,e.silent),so.call(this,e.silent)))},Xd.appendData=function(t){var e=t.seriesIndex;this.getModel().getSeriesByIndex(e).appendData(t),this._scheduler.unfinished=!0},Xd.on=Ka("on"),Xd.off=Ka("off"),Xd.one=Ka("one");var Yd=["click","dblclick","mouseover","mouseout","mousemove","mousedown","mouseup","globalout","contextmenu"];Xd._initEvents=function(){Od(Yd,function(t){this._zr.on(t,function(e){var n,i=this.getModel(),r=e.target;if("globalout"===t)n={};else if(r&&null!=r.dataIndex){var o=r.dataModel||i.getSeriesByIndex(r.seriesIndex);n=o&&o.getDataParams(r.dataIndex,r.dataType)||{}}else r&&r.eventData&&(n=a({},r.eventData));n&&(n.event=e,n.type=t,this.trigger(t,n))},this)},this),Od(jd,function(t,e){this._messageCenter.on(e,function(t){this.trigger(e,t)},this)},this)},Xd.isDisposed=function(){return this._disposed},Xd.clear=function(){this.setOption({series:[]},!0)},Xd.dispose=function(){if(!this._disposed){this._disposed=!0,vn(this.getDom(),op,"");var t=this._api,e=this._model;Od(this._componentsViews,function(n){n.dispose(e,t)}),Od(this._chartsViews,function(n){n.dispose(e,t)}),this._zr.dispose(),delete np[this.id]}},u(Ja,ih);var Ud={},jd={},$d=[],Kd=[],Qd=[],Jd=[],tp={},ep={},np={},ip={},rp=new Date-0,ap=new Date-0,op="_echarts_instance_",sp={},lp=wo;ko(2e3,_d),Mo(id),Ao("default",function(t,e){o(e=e||{},{text:"loading",color:"#c23531",textColor:"#000",maskColor:"rgba(255, 255, 255, 0.8)",zlevel:0});var n=new Zc({style:{fill:e.maskColor},zlevel:e.zlevel,z:1e4}),i=new $c({shape:{startAngle:-bd/2,endAngle:-bd/2+.1,r:10},style:{stroke:e.color,lineCap:"round",lineWidth:5},zlevel:e.zlevel,z:10001}),r=new Zc({style:{fill:"none",text:e.text,textPosition:"right",textDistance:10,textFill:e.textColor},zlevel:e.zlevel,z:10001});i.animateShape(!0).when(1e3,{endAngle:3*bd/2}).start("circularInOut"),i.animateShape(!0).when(1e3,{startAngle:3*bd/2}).delay(300).start("circularInOut");var a=new Oh;return a.add(i),a.add(r),a.add(n),a.resize=function(){var e=t.getWidth()/2,a=t.getHeight()/2;i.setShape({cx:e,cy:a});var o=i.shape.r;r.setShape({x:e-o,y:a-o,width:2*o,height:2*o}),n.setShape({x:0,y:0,width:t.getWidth(),height:t.getHeight()})},a.resize(),a}),Io({type:"highlight",event:"highlight",update:"highlight"},z),Io({type:"downplay",event:"downplay",update:"downplay"},z),So("light",Dd),So("dark",Ld);var hp={};Lo({type:"dataset",defaultOption:{seriesLayoutBy:Ff,sourceHeader:null,dimensions:null,source:null},optionUpdated:function(){Tr(this)}});Po({type:"dataset"}),Ro.prototype={constructor:Ro,add:function(t){return this._add=t,this},update:function(t){return this._update=t,this},remove:function(t){return this._remove=t,this},execute:function(){var t=this._old,e=this._new,n={},i=[],r=[];for(zo(t,{},i,"_oldKeyGetter",this),zo(e,n,r,"_newKeyGetter",this),a=0;a<t.length;a++)null!=(s=n[o=i[a]])?((h=s.length)?(1===h&&(n[o]=null),s=s.unshift()):n[o]=null,this._update&&this._update(s,a)):this._remove&&this._remove(a);for(var a=0;a<r.length;a++){var o=r[a];if(n.hasOwnProperty(o)){var s=n[o];if(null==s)continue;if(s.length)for(var l=0,h=s.length;l<h;l++)this._add&&this._add(s[l]);else this._add&&this._add(s)}}}};var up=R(["tooltip","label","itemName","itemId","seriesName"]),cp=w,fp="undefined",dp=typeof window===fp?global:window,pp="e\0\0",gp={float:typeof dp.Float64Array===fp?Array:dp.Float64Array,int:typeof dp.Int32Array===fp?Array:dp.Int32Array,ordinal:Array,number:Array,time:Array},mp=["stackedOn","hasItemOption","_nameList","_idList","_rawData","_rawExtent","_chunkSize","_chunkCount","_dimValueGetter","_count","_rawCount","_nameDimIdx","_idDimIdx"],vp=function(t,e){t=t||["x","y"];for(var n={},i=[],r=0;r<t.length;r++){var a,o={};"string"==typeof t[r]?o={name:a=t[r],coordDim:a,coordDimIndex:0,stackable:!1,type:"float"}:(a=(o=t[r]).name,o.type=o.type||"float",o.coordDim||(o.coordDim=a,o.coordDimIndex=0)),o.otherDims=o.otherDims||{},i.push(a),n[a]=o,o.index=r}this.dimensions=i,this._dimensionInfos=n,this.hostModel=e,this.dataType,this._indices=null,this._count=0,this._rawCount=0,this._storage={},this._nameList=[],this._idList=[],this._optionModels=[],this.stackedOn=null,this._visual={},this._layout={},this._itemVisuals=[],this.hasItemVisual={},this._itemLayouts=[],this._graphicEls=[],this._chunkSize=1e5,this._chunkCount=0,this._rawData,this._rawExtent={},this._extent={},this._approximateExtent={},this._dimensionsSummary=No(this)},yp=vp.prototype;yp.type="list",yp.hasItemOption=!0,yp.getDimension=function(t){return isNaN(t)||(t=this.dimensions[t]||t),t},yp.getDimensionInfo=function(t){return this._dimensionInfos[this.getDimension(t)]},yp.getDimensionsOnCoord=function(){return this._dimensionsSummary.dataDimsOnCoord.slice()},yp.mapDimension=function(t,e){var n=this._dimensionsSummary.encode[t];return!0===e?n&&n.slice()||[]:n?n[e||0]:null},yp.initData=function(t,e,n){(Mr.isInstance(t)||c(t))&&(t=new ha(t,this.dimensions.length)),this._rawData=t,this._storage={},this._indices=null,this._nameList=e||[],this._idList=[],this._nameRepeatCount={},n||(this.hasItemOption=!1),this.defaultDimValueGetter=sd[this._rawData.getSource().sourceFormat],this._dimValueGetter=n=n||this.defaultDimValueGetter,this._rawExtent={},this._initDataFromProvider(0,t.count()),t.pure&&(this.hasItemOption=!1)},yp.getProvider=function(){return this._rawData},yp.appendData=function(t){var e=this._rawData,n=this.count();e.appendData(t);var i=e.count();e.persistent||(i+=n),this._initDataFromProvider(n,i)},yp._initDataFromProvider=function(t,e){if(!(t>=e)){for(var n,i=this._chunkSize,r=this._rawData,a=this._storage,o=this.dimensions,s=this._dimensionInfos,l=this._nameList,h=this._idList,u=this._rawExtent,c=this._nameRepeatCount={},f=this._chunkCount,d=f-1,p=0;p<o.length;p++){u[T=o[p]]||(u[T]=[1/0,-1/0]);var g=s[T];0===g.otherDims.itemName&&(n=this._nameDimIdx=p),0===g.otherDims.itemId&&(this._idDimIdx=p);var m=gp[g.type];a[T]||(a[T]=[]);var v=a[T][d];if(v&&v.length<i){for(var y=new m(Math.min(e-d*i,i)),_=0;_<v.length;_++)y[_]=v[_];a[T][d]=y}for(M=f*i;M<e;M+=i)a[T].push(new m(Math.min(e-M,i)));this._chunkCount=a[T].length}for(var x=t;x<e;x++){for(var w=r.getItem(x),b=Math.floor(x/i),S=x%i,M=0;M<o.length;M++){var T=o[M],I=a[T][b],C=this._dimValueGetter(w,T,x,M);I[S]=C,C<u[T][0]&&(u[T][0]=C),C>u[T][1]&&(u[T][1]=C)}if(!r.pure){var k=l[x];w&&!k&&(null!=n?k=this._getNameFromStore(x):null!=w.name&&(l[x]=k=w.name));var D=null==w?null:w.id;null==D&&null!=k&&(c[k]=c[k]||0,D=k,c[k]>0&&(D+="__ec__"+c[k]),c[k]++),null!=D&&(h[x]=D)}}!r.persistent&&r.clean&&r.clean(),this._rawCount=this._count=e,this._extent={}}},yp._getNameFromStore=function(t){var e=this._nameDimIdx;if(null!=e){var n=this._chunkSize,i=Math.floor(t/n),r=t%n,a=this.dimensions[e],o=this._dimensionInfos[a].ordinalMeta;if(o)return o.categories[t];var s=this._storage[a][i];return s&&s[r]}},yp._getIdFromStore=function(t){var e=this._idDimIdx;if(null!=e){var n=this._chunkSize,i=Math.floor(t/n),r=t%n,a=this.dimensions[e],o=this._dimensionInfos[a].ordinalMeta;if(o)return o.categories[t];var s=this._storage[a][i];return s&&s[r]}},yp.count=function(){return this._count},yp.getIndices=function(){if(this._indices)return new(t=this._indices.constructor)(this._indices.buffer,0,this._count);for(var t=Wo(this),e=new t(this.count()),n=0;n<e.length;n++)e[n]=n;return e},yp.get=function(t,e,n){if(!(e>=0&&e<this._count))return NaN;var i=this._storage;if(!i[t])return NaN;e=this.getRawIndex(e);var r=Math.floor(e/this._chunkSize),a=e%this._chunkSize,o=i[t][r][a];if(n){var s=this._dimensionInfos[t];if(s&&s.stackable)for(var l=this.stackedOn;l;){var h=l.get(t,e);(o>=0&&h>0||o<=0&&h<0)&&(o+=h),l=l.stackedOn}}return o},yp._getFast=function(t,e){var n=Math.floor(e/this._chunkSize),i=e%this._chunkSize;return this._storage[t][n][i]},yp.getValues=function(t,e,n){var i=[];y(t)||(n=e,e=t,t=this.dimensions);for(var r=0,a=t.length;r<a;r++)i.push(this.get(t[r],e,n));return i},yp.hasValue=function(t){for(var e=this._dimensionsSummary.dataDimsOnCoord,n=this._dimensionInfos,i=0,r=e.length;i<r;i++)if("ordinal"!==n[e[i]].type&&isNaN(this.get(e[i],t)))return!1;return!0},yp.getDataExtent=function(t,e){t=this.getDimension(t);var n=this._storage[t],i=[1/0,-1/0];if(e=(e||!1)&&this.isStacked(t),!n)return i;var r,a=this.count(),o=[t,!!e].join("_");if(!this._indices&&!e)return this._rawExtent[t].slice();if(r=this._extent[o])return r.slice();for(var s=(r=i)[0],l=r[1],h=0;h<a;h++){var u=e?this.get(t,h,!0):this._getFast(t,this.getRawIndex(h));u<s&&(s=u),u>l&&(l=u)}return r=[s,l],this._extent[o]=r,r},yp.getApproximateExtent=function(t,e){return t=this.getDimension(t),this._approximateExtent[t]||this.getDataExtent(t,e)},yp.setApproximateExtent=function(t,e,n){e=this.getDimension(e),this._approximateExtent[e]=t.slice()},yp.isStacked=function(t){var e=this._dimensionInfos[t];return e&&e.stackable&&this.stackedOn},yp.getSum=function(t,e){var n=0;if(this._storage[t])for(var i=0,r=this.count();i<r;i++){var a=this.get(t,i,e);isNaN(a)||(n+=a)}return n},yp.indexOf=function(t,e){var n=this._storage[t],i=this._chunkSize;if(n)for(var r=0,a=this.count();r<a;r++){var o=r%i;if(n[Math.floor(r/i)][o]===e)return r}return-1},yp.indexOfName=function(t){for(var e=0,n=this.count();e<n;e++)if(this.getName(e)===t)return e;return-1},yp.indexOfRawIndex=function(t){if(!this._indices)return t;if(t>=this._rawCount||t<0)return-1;var e=this._indices,n=e[t];if(null!=n&&n<this._count&&n===t)return t;for(var i=0,r=this._count-1;i<=r;){var a=(i+r)/2|0;if(e[a]<t)i=a+1;else{if(!(e[a]>t))return a;r=a-1}}return-1},yp.indicesOfNearest=function(t,e,n,i){var r=[];if(!this._storage[t])return r;null==i&&(i=1/0);for(var a=Number.MAX_VALUE,o=-1,s=0,l=this.count();s<l;s++){var h=e-this.get(t,s,n),u=Math.abs(h);h<=i&&u<=a&&((u<a||h>=0&&o<0)&&(a=u,o=h,r.length=0),r.push(s))}return r},yp.getRawIndex=qo,yp.getRawDataItem=function(t){if(this._rawData.persistent)return this._rawData.getItem(this.getRawIndex(t));for(var e=[],n=0;n<this.dimensions.length;n++){var i=this.dimensions[n];e.push(this.get(i,t))}return e},yp.getName=function(t){var e=this.getRawIndex(t);return this._nameList[e]||this._getNameFromStore(e)||""},yp.getId=function(t){return Zo(this,this.getRawIndex(t))},yp.each=function(t,e,n,i){if(this._count){"function"==typeof t&&(i=n,n=e,e=t,t=[]);var r=(t=d(Yo(t),this.getDimension,this)).length;i=i||this;for(var a=0;a<this.count();a++)switch(r){case 0:e.call(i,a);break;case 1:e.call(i,this.get(t[0],a,n),a);break;case 2:e.call(i,this.get(t[0],a,n),this.get(t[1],a,n),a);break;default:for(var o=0,s=[];o<r;o++)s[o]=this.get(t[o],a,n);s[o]=a,e.apply(i,s)}}},yp.filterSelf=function(t,e,n,i){if(this._count){"function"==typeof t&&(i=n,n=e,e=t,t=[]),n=n||!1,i=i||this,t=d(Yo(t),this.getDimension,this);for(var r=this.count(),a=new(Wo(this))(r),o=[],s=t.length,l=0,h=t[0],u=0;u<r;u++){var c,f=this.getRawIndex(u);if(0===s)c=e.call(i,u);else if(1===s){var p=n?this.get(h,u,!0):this._getFast(h,f);c=e.call(i,p,u)}else{for(var g=0;g<s;g++)o[g]=n?this.get(t[g],u,!0):this._getFast(h,f);o[g]=u,c=e.apply(i,o)}c&&(a[l++]=f)}return l<r&&(this._indices=a),this._count=l,this._extent={},this.getRawIndex=this._indices?Xo:qo,this}},yp.selectRange=function(t,e){if(this._count){e=e||!1;var n=[];for(var i in t)t.hasOwnProperty(i)&&n.push(i);var r=n.length;if(r){var a=this.count(),o=new(Wo(this))(a),s=0,l=n[0],h=t[l][0],u=t[l][1],c=!1;if(!this._indices&&!e){var f=0;if(1===r){for(var d=this._storage[n[0]],p=0;p<this._chunkCount;p++)for(var g=d[p],m=Math.min(this._count-p*this._chunkSize,this._chunkSize),v=0;v<m;v++)(b=g[v])>=h&&b<=u&&(o[s++]=f),f++;c=!0}else if(2===r){for(var d=this._storage[l],y=this._storage[n[1]],_=t[n[1]][0],x=t[n[1]][1],p=0;p<this._chunkCount;p++)for(var g=d[p],w=y[p],m=Math.min(this._count-p*this._chunkSize,this._chunkSize),v=0;v<m;v++){var b=g[v],S=w[v];b>=h&&b<=u&&S>=_&&S<=x&&(o[s++]=f),f++}c=!0}}if(!c)if(1===r){e=e||this.isStacked(l);for(v=0;v<a;v++){T=this.getRawIndex(v);(b=e?this.get(l,v,!0):this._getFast(l,T))>=h&&b<=u&&(o[s++]=T)}}else for(v=0;v<a;v++){for(var M=!0,T=this.getRawIndex(v),p=0;p<r;p++){var I=n[p];((b=e?this.get(I,v,!0):this._getFast(i,T))<t[I][0]||b>t[I][1])&&(M=!1)}M&&(o[s++]=this.getRawIndex(v))}return s<a&&(this._indices=o),this._count=s,this._extent={},this.getRawIndex=this._indices?Xo:qo,this}}},yp.mapArray=function(t,e,n,i){"function"==typeof t&&(i=n,n=e,e=t,t=[]);var r=[];return this.each(t,function(){r.push(e&&e.apply(this,arguments))},n,i),r},yp.map=function(t,e,n,i){var r=Uo(this,t=d(Yo(t),this.getDimension,this));r._indices=this._indices,r.getRawIndex=r._indices?Xo:qo;for(var a=r._storage,o=[],s=this._chunkSize,l=t.length,h=this.count(),u=[],c=0;c<h;c++){for(var f=0;f<l;f++)u[f]=this.get(t[f],c,n);u[l]=c;var p=e&&e.apply(i,u);if(null!=p){"object"!=typeof p&&(o[0]=p,p=o);for(var g=this.getRawIndex(c),m=Math.floor(g/s),v=g%s,y=0;y<p.length;y++){var _=a[t[y]];_&&(_[m][v]=p[y])}}}return r},yp.downSample=function(t,e,n,i){for(var r=Uo(this,[t]),a=r._storage,o=[],s=Math.floor(1/e),l=a[t],h=this.count(),u=this._chunkSize,c=new(Wo(this))(h),f=0,d=0;d<h;d+=s){s>h-d&&(s=h-d,o.length=s);for(var p=0;p<s;p++){var g=this.getRawIndex(d+p),m=Math.floor(g/u),v=g%u;o[p]=l[m][v]}var y=n(o),_=this.getRawIndex(Math.min(d+i(o,y)||0,h-1)),x=_%u;l[Math.floor(_/u)][x]=y,c[f++]=_}return r._count=f,r._indices=c,r.getRawIndex=Xo,r},yp.getItemModel=function(t){var e=this.hostModel;return new Ui(this.getRawDataItem(t),e,e&&e.ecModel)},yp.diff=function(t){var e=this;return new Ro(t?t.getIndices():[],this.getIndices(),function(e){return Zo(t,e)},function(t){return Zo(e,t)})},yp.getVisual=function(t){var e=this._visual;return e&&e[t]},yp.setVisual=function(t,e){if(cp(t))for(var n in t)t.hasOwnProperty(n)&&this.setVisual(n,t[n]);else this._visual=this._visual||{},this._visual[t]=e},yp.setLayout=function(t,e){if(cp(t))for(var n in t)t.hasOwnProperty(n)&&this.setLayout(n,t[n]);else this._layout[t]=e},yp.getLayout=function(t){return this._layout[t]},yp.getItemLayout=function(t){return this._itemLayouts[t]},yp.setItemLayout=function(t,e,n){this._itemLayouts[t]=n?a(this._itemLayouts[t]||{},e):e},yp.clearItemLayouts=function(){this._itemLayouts.length=0},yp.getItemVisual=function(t,e,n){var i=this._itemVisuals[t],r=i&&i[e];return null!=r||n?r:this.getVisual(e)},yp.setItemVisual=function(t,e,n){var i=this._itemVisuals[t]||{},r=this.hasItemVisual;if(this._itemVisuals[t]=i,cp(e))for(var a in e)e.hasOwnProperty(a)&&(i[a]=e[a],r[a]=!0);else i[e]=n,r[e]=!0},yp.clearAllVisual=function(){this._visual={},this._itemVisuals=[],this.hasItemVisual={}};var _p=function(t){t.seriesIndex=this.seriesIndex,t.dataIndex=this.dataIndex,t.dataType=this.dataType};yp.setItemGraphicEl=function(t,e){var n=this.hostModel;e&&(e.dataIndex=t,e.dataType=this.dataType,e.seriesIndex=n&&n.seriesIndex,"group"===e.type&&e.traverse(_p,e)),this._graphicEls[t]=e},yp.getItemGraphicEl=function(t){return this._graphicEls[t]},yp.eachItemGraphicEl=function(t,e){f(this._graphicEls,function(n,i){n&&t&&t.call(e,n,i)})},yp.cloneShallow=function(t){if(!t){var e=d(this.dimensions,this.getDimensionInfo,this);t=new vp(e,this.hostModel)}if(t._storage=this._storage,Go(t,this),this._indices){var i=this._indices.constructor;t._indices=new i(this._indices)}else t._indices=null;return t.getRawIndex=t._indices?Xo:qo,t._extent=n(this._extent),t._approximateExtent=n(this._approximateExtent),t},yp.wrapMethod=function(t,e){var n=this[t];"function"==typeof n&&(this.__wrappedMethods=this.__wrappedMethods||[],this.__wrappedMethods.push(t),this[t]=function(){var t=n.apply(this,arguments);return e.apply(this,[t].concat(D(arguments)))})},yp.TRANSFERABLE_METHODS=["cloneShallow","downSample","map"],yp.CHANGABLE_METHODS=["filterSelf","selectRange"];var xp=function(t,e){return e=e||{},$o(e.coordDimensions||[],t,{dimsDef:e.dimensionsDefine||t.dimensionsDefine,encodeDef:e.encodeDefine||t.encodeDefine,dimCount:e.dimensionsCount,extraPrefix:e.extraPrefix,extraFromZero:e.extraFromZero})};fd.extend({type:"series.line",dependencies:["grid","polar"],getInitialData:function(t,e){return Jo(this.getSource(),this)},defaultOption:{zlevel:0,z:2,coordinateSystem:"cartesian2d",legendHoverLink:!0,hoverAnimation:!0,clipOverflow:!0,label:{position:"top"},lineStyle:{width:2,type:"solid"},step:!1,smooth:!1,smoothMonotone:null,symbol:"emptyCircle",symbolSize:4,symbolRotate:null,showSymbol:!0,showAllSymbol:!1,connectNulls:!1,sampling:"none",animationEasing:"linear",progressive:0,hoverLayerThreshold:1/0}});var wp=pi({type:"triangle",shape:{cx:0,cy:0,width:0,height:0},buildPath:function(t,e){var n=e.cx,i=e.cy,r=e.width/2,a=e.height/2;t.moveTo(n,i-a),t.lineTo(n+r,i+a),t.lineTo(n-r,i+a),t.closePath()}}),bp=pi({type:"diamond",shape:{cx:0,cy:0,width:0,height:0},buildPath:function(t,e){var n=e.cx,i=e.cy,r=e.width/2,a=e.height/2;t.moveTo(n,i-a),t.lineTo(n+r,i),t.lineTo(n,i+a),t.lineTo(n-r,i),t.closePath()}}),Sp=pi({type:"pin",shape:{x:0,y:0,width:0,height:0},buildPath:function(t,e){var n=e.x,i=e.y,r=e.width/5*3,a=Math.max(r,e.height),o=r/2,s=o*o/(a-o),l=i-a+o+s,h=Math.asin(s/o),u=Math.cos(h)*o,c=Math.sin(h),f=Math.cos(h),d=.6*o,p=.7*o;t.moveTo(n-u,l+s),t.arc(n,l,o,Math.PI-h,2*Math.PI+h),t.bezierCurveTo(n+u-c*d,l+s+f*d,n,i-p,n,i),t.bezierCurveTo(n,i-p,n-u+c*d,l+s+f*d,n-u,l+s),t.closePath()}}),Mp=pi({type:"arrow",shape:{x:0,y:0,width:0,height:0},buildPath:function(t,e){var n=e.height,i=e.width,r=e.x,a=e.y,o=i/3*2;t.moveTo(r,a),t.lineTo(r+o,a+n),t.lineTo(r,a+n/4*3),t.lineTo(r-o,a+n),t.lineTo(r,a),t.closePath()}}),Tp={line:function(t,e,n,i,r){r.x1=t,r.y1=e+i/2,r.x2=t+n,r.y2=e+i/2},rect:function(t,e,n,i,r){r.x=t,r.y=e,r.width=n,r.height=i},roundRect:function(t,e,n,i,r){r.x=t,r.y=e,r.width=n,r.height=i,r.r=Math.min(n,i)/4},square:function(t,e,n,i,r){var a=Math.min(n,i);r.x=t,r.y=e,r.width=a,r.height=a},circle:function(t,e,n,i,r){r.cx=t+n/2,r.cy=e+i/2,r.r=Math.min(n,i)/2},diamond:function(t,e,n,i,r){r.cx=t+n/2,r.cy=e+i/2,r.width=n,r.height=i},pin:function(t,e,n,i,r){r.x=t+n/2,r.y=e+i/2,r.width=n,r.height=i},arrow:function(t,e,n,i,r){r.x=t+n/2,r.y=e+i/2,r.width=n,r.height=i},triangle:function(t,e,n,i,r){r.cx=t+n/2,r.cy=e+i/2,r.width=n,r.height=i}},Ip={};f({line:Yc,rect:Zc,roundRect:Zc,square:Zc,circle:zc,diamond:bp,pin:Sp,arrow:Mp,triangle:wp},function(t,e){Ip[e]=new t});var Cp=pi({type:"symbol",shape:{symbolType:"",x:0,y:0,width:0,height:0},beforeBrush:function(){var t=this.style;"pin"===this.shape.symbolType&&"inside"===t.textPosition&&(t.textPosition=["50%","40%"],t.textAlign="center",t.textVerticalAlign="middle")},buildPath:function(t,e,n){var i=e.symbolType,r=Ip[i];"none"!==e.symbolType&&(r||(r=Ip[i="rect"]),Tp[i](e.x,e.y,e.width,e.height,r.shape),r.buildPath(t,r.shape,n))}}),kp=ls.prototype;kp._createSymbol=function(t,e,n,i){this.removeAll();var r=rs(t,-1,-1,2,2,e.getItemVisual(n,"color"));r.attr({z2:100,culling:!0,scale:ss(i)}),r.drift=hs,this._symbolType=t,this.add(r)},kp.stopSymbolAnimation=function(t){this.childAt(0).stopAnimation(t)},kp.getSymbolPath=function(){return this.childAt(0)},kp.getScale=function(){return this.childAt(0).scale},kp.highlight=function(){this.childAt(0).trigger("emphasis")},kp.downplay=function(){this.childAt(0).trigger("normal")},kp.setZ=function(t,e){var n=this.childAt(0);n.zlevel=t,n.z=e},kp.setDraggable=function(t){var e=this.childAt(0);e.draggable=t,e.cursor=t?"move":"pointer"},kp.updateData=function(t,e,n){this.silent=!1;var i=t.getItemVisual(e,"symbol")||"circle",r=t.hostModel,a=os(t,e),o=i!==this._symbolType;if(o?this._createSymbol(i,t,e,a):((s=this.childAt(0)).silent=!1,qi(s,{scale:ss(a)},r,e)),this._updateCommon(t,e,a,n),o){var s=this.childAt(0),l=n&&n.fadeIn,h={scale:s.scale.slice()};l&&(h.style={opacity:s.style.opacity}),s.scale=[0,0],l&&(s.style.opacity=0),Xi(s,h,r,e)}this._seriesModel=r};var Dp=["itemStyle"],Ap=["emphasis","itemStyle"],Lp=["label"],Pp=["emphasis","label"];kp._updateCommon=function(t,e,n,i){var r=this.childAt(0),o=t.hostModel,s=t.getItemVisual(e,"color");"image"!==r.type&&r.useStyle({strokeNoScale:!0});var l=i&&i.itemStyle,h=i&&i.hoverItemStyle,u=i&&i.symbolRotate,c=i&&i.symbolOffset,f=i&&i.labelModel,d=i&&i.hoverLabelModel,p=i&&i.hoverAnimation,g=i&&i.cursorStyle;if(!i||t.hasItemOption){var m=i&&i.itemModel?i.itemModel:t.getItemModel(e);l=m.getModel(Dp).getItemStyle(["color"]),h=m.getModel(Ap).getItemStyle(),u=m.getShallow("symbolRotate"),c=m.getShallow("symbolOffset"),f=m.getModel(Lp),d=m.getModel(Pp),p=m.getShallow("hoverAnimation"),g=m.getShallow("cursor")}else h=a({},h);var v=r.style;r.attr("rotation",(u||0)*Math.PI/180||0),c&&r.attr("position",[tr(c[0],n[0]),tr(c[1],n[1])]),g&&r.attr("cursor",g),r.setColor(s,i&&i.symbolInnerColor),r.setStyle(l);var y=t.getItemVisual(e,"opacity");null!=y&&(v.opacity=y);var _=i&&i.useNameLabel;Ei(v,h,f,d,{labelFetcher:o,labelDataIndex:e,defaultText:function(e,n){return _?t.getName(e):as(t,e)},isRectText:!0,autoColor:s}),r.off("mouseover").off("mouseout").off("emphasis").off("normal"),r.hoverStyle=h,Oi(r);var x=ss(n);if(p&&o.isAnimationEnabled()){var w=function(){var t=x[1]/x[0];this.animateTo({scale:[Math.max(1.1*x[0],x[0]+3),Math.max(1.1*x[1],x[1]+3*t)]},400,"elasticOut")},b=function(){this.animateTo({scale:x},400,"elasticOut")};r.on("mouseover",w).on("mouseout",b).on("emphasis",w).on("normal",b)}},kp.fadeOut=function(t,e){var n=this.childAt(0);this.silent=n.silent=!0,!(e&&e.keepLabel)&&(n.style.text=null),qi(n,{style:{opacity:0},scale:[0,0]},this._seriesModel,this.dataIndex,t)},h(ls,Oh);var Op=us.prototype;Op.updateData=function(t,e){var n=this.group,i=t.hostModel,r=this._data,a=this._symbolCtor,o=fs(t);r||n.removeAll(),t.diff(r).add(function(i){var r=t.getItemLayout(i);if(cs(t,r,i,e)){var s=new a(t,i,o);s.attr("position",r),t.setItemGraphicEl(i,s),n.add(s)}}).update(function(s,l){var h=r.getItemGraphicEl(l),u=t.getItemLayout(s);cs(t,u,s,e)?(h?(h.updateData(t,s,o),qi(h,{position:u},i)):(h=new a(t,s)).attr("position",u),n.add(h),t.setItemGraphicEl(s,h)):n.remove(h)}).remove(function(t){var e=r.getItemGraphicEl(t);e&&e.fadeOut(function(){n.remove(e)})}).execute(),this._data=t},Op.isPersistent=function(){return!0},Op.updateLayout=function(){var t=this._data;t&&t.eachItemGraphicEl(function(e,n){var i=t.getItemLayout(n);e.attr("position",i)})},Op.incrementalPrepareUpdate=function(t){this._seriesScope=fs(t),this._data=null,this.group.removeAll()},Op.incrementalUpdate=function(t,e,n){for(var i=t.start;i<t.end;i++){var r=e.getItemLayout(i);if(cs(e,r,i,n)){var a=new this._symbolCtor(e,i,this._seriesScope);a.traverse(function(t){t.isGroup||(t.incremental=t.useHoverLayer=!0)}),a.attr("position",r),this.group.add(a),e.setItemGraphicEl(i,a)}}},Op.remove=function(t){var e=this.group,n=this._data;n&&(t?n.eachItemGraphicEl(function(t){t.fadeOut(function(){e.remove(t)})}):e.removeAll())};var Ep=function(t,e,n,i,r,a){for(var o=gs(t,e),s=[],l=[],h=[],u=[],c=[],f=[],d=[],p=a.dimensions,g=0;g<o.length;g++){var m=o[g],v=!0;switch(m.cmd){case"=":var y=t.getItemLayout(m.idx),_=e.getItemLayout(m.idx1);(isNaN(y[0])||isNaN(y[1]))&&(y=_.slice()),s.push(y),l.push(_),h.push(n[m.idx]),u.push(i[m.idx1]),d.push(e.getRawIndex(m.idx1));break;case"+":x=m.idx;s.push(r.dataToPoint([e.get(p[0],x,!0),e.get(p[1],x,!0)])),l.push(e.getItemLayout(x).slice()),h.push(ps(r,e,x)),u.push(i[x]),d.push(e.getRawIndex(x));break;case"-":var x=m.idx,w=t.getRawIndex(x);w!==x?(s.push(t.getItemLayout(x)),l.push(a.dataToPoint([t.get(p[0],x,!0),t.get(p[1],x,!0)])),h.push(n[x]),u.push(ps(a,t,x)),d.push(w)):v=!1}v&&(c.push(m),f.push(f.length))}f.sort(function(t,e){return d[t]-d[e]});for(var b=[],S=[],M=[],T=[],I=[],g=0;g<f.length;g++){x=f[g];b[g]=s[x],S[g]=l[x],M[g]=h[x],T[g]=u[x],I[g]=c[x]}return{current:b,next:S,stackedOnCurrent:M,stackedOnNext:T,status:I}},Bp=U,Rp=j,zp=function(t,e,n,i){return t[0]=e[0]+n[0]*i,t[1]=e[1]+n[1]*i,t},Np=function(t,e){return t[0]=e[0],t[1]=e[1],t},Fp=[],Vp=[],Wp=[],Hp=ri.extend({type:"ec-polyline",shape:{points:[],smooth:0,smoothConstraint:!0,smoothMonotone:null,connectNulls:!1},style:{fill:null,stroke:"#000"},brush:Fc(ri.prototype.brush),buildPath:function(t,e){var n=e.points,i=0,r=n.length,a=ys(n,e.smoothConstraint);if(e.connectNulls){for(;r>0&&ms(n[r-1]);r--);for(;i<r&&ms(n[i]);i++);}for(;i<r;)i+=vs(t,n,i,r,r,1,a.min,a.max,e.smooth,e.smoothMonotone,e.connectNulls)+1}}),Gp=ri.extend({type:"ec-polygon",shape:{points:[],stackedOnPoints:[],smooth:0,stackedOnSmooth:0,smoothConstraint:!0,smoothMonotone:null,connectNulls:!1},brush:Fc(ri.prototype.brush),buildPath:function(t,e){var n=e.points,i=e.stackedOnPoints,r=0,a=n.length,o=e.smoothMonotone,s=ys(n,e.smoothConstraint),l=ys(i,e.smoothConstraint);if(e.connectNulls){for(;a>0&&ms(n[a-1]);a--);for(;r<a&&ms(n[r]);r++);}for(;r<a;){var h=vs(t,n,r,a,a,1,s.min,s.max,e.smooth,o,e.connectNulls);vs(t,i,r+h-1,h,a,-1,l.min,l.max,e.stackedOnSmooth,o,e.connectNulls),r+=h+1,t.closePath()}}});Da.extend({type:"line",init:function(){var t=new Oh,e=new us;this.group.add(e.group),this._symbolDraw=e,this._lineGroup=t},render:function(t,e,n){var i=t.coordinateSystem,r=this.group,a=t.getData(),s=t.getModel("lineStyle"),l=t.getModel("areaStyle"),h=a.mapArray(a.getItemLayout,!0),u="polar"===i.type,c=this._coordSys,f=this._symbolDraw,d=this._polyline,p=this._polygon,g=this._lineGroup,m=t.get("animation"),v=!l.isEmpty(),y=Ss(0,i,a,l.get("origin")),_=t.get("showSymbol"),x=_&&!u&&!t.get("showAllSymbol")&&this._getSymbolIgnoreFunc(a,i),w=this._data;w&&w.eachItemGraphicEl(function(t,e){t.__temp&&(r.remove(t),w.setItemGraphicEl(e,null))}),_||f.remove(),r.add(g);var b=!u&&t.get("step");d&&c.type===i.type&&b===this._step?(v&&!p?p=this._newPolygon(h,y,i,m):p&&!v&&(g.remove(p),p=this._polygon=null),g.setClipPath(Is(i,!1,t)),_&&f.updateData(a,x),a.eachItemGraphicEl(function(t){t.stopAnimation(!0)}),_s(this._stackedOnPoints,y)&&_s(this._points,h)||(m?this._updateAnimation(a,y,i,n,b):(b&&(h=Cs(h,i,b),y=Cs(y,i,b)),d.setShape({points:h}),p&&p.setShape({points:h,stackedOnPoints:y})))):(_&&f.updateData(a,x),b&&(h=Cs(h,i,b),y=Cs(y,i,b)),d=this._newPolyline(h,i,m),v&&(p=this._newPolygon(h,y,i,m)),g.setClipPath(Is(i,!0,t)));var S=ks(a,i)||a.getVisual("color");d.useStyle(o(s.getLineStyle(),{fill:"none",stroke:S,lineJoin:"bevel"}));var M=t.get("smooth");if(M=xs(t.get("smooth")),d.setShape({smooth:M,smoothMonotone:t.get("smoothMonotone"),connectNulls:t.get("connectNulls")}),p){var T=a.stackedOn,I=0;p.useStyle(o(l.getAreaStyle(),{fill:S,opacity:.7,lineJoin:"bevel"})),T&&(I=xs(T.hostModel.get("smooth"))),p.setShape({smooth:M,stackedOnSmooth:I,smoothMonotone:t.get("smoothMonotone"),connectNulls:t.get("connectNulls")})}this._data=a,this._coordSys=i,this._stackedOnPoints=y,this._points=h,this._step=b},dispose:function(){},highlight:function(t,e,n,i){var r=t.getData(),a=dn(r,i);if(!(a instanceof Array)&&null!=a&&a>=0){var o=r.getItemGraphicEl(a);if(!o){var s=r.getItemLayout(a);if(!s)return;(o=new ls(r,a)).position=s,o.setZ(t.get("zlevel"),t.get("z")),o.ignore=isNaN(s[0])||isNaN(s[1]),o.__temp=!0,r.setItemGraphicEl(a,o),o.stopSymbolAnimation(!0),this.group.add(o)}o.highlight()}else Da.prototype.highlight.call(this,t,e,n,i)},downplay:function(t,e,n,i){var r=t.getData(),a=dn(r,i);if(null!=a&&a>=0){var o=r.getItemGraphicEl(a);o&&(o.__temp?(r.setItemGraphicEl(a,null),this.group.remove(o)):o.downplay())}else Da.prototype.downplay.call(this,t,e,n,i)},_newPolyline:function(t){var e=this._polyline;return e&&this._lineGroup.remove(e),e=new Hp({shape:{points:t},silent:!0,z2:10}),this._lineGroup.add(e),this._polyline=e,e},_newPolygon:function(t,e){var n=this._polygon;return n&&this._lineGroup.remove(n),n=new Gp({shape:{points:t,stackedOnPoints:e},silent:!0}),this._lineGroup.add(n),this._polygon=n,n},_getSymbolIgnoreFunc:function(t,e){var n=e.getAxesByScale("ordinal")[0];if(n&&n.isLabelIgnored)return m(n.isLabelIgnored,n)},_updateAnimation:function(t,e,n,i,r){var a=this._polyline,o=this._polygon,s=t.hostModel,l=Ep(this._data,t,this._stackedOnPoints,e,this._coordSys,n),h=l.current,u=l.stackedOnCurrent,c=l.next,f=l.stackedOnNext;r&&(h=Cs(l.current,n,r),u=Cs(l.stackedOnCurrent,n,r),c=Cs(l.next,n,r),f=Cs(l.stackedOnNext,n,r)),a.shape.__points=l.current,a.shape.points=h,qi(a,{shape:{points:c}},s),o&&(o.setShape({points:h,stackedOnPoints:u}),qi(o,{shape:{points:c,stackedOnPoints:f}},s));for(var d=[],p=l.status,g=0;g<p.length;g++)if("="===p[g].cmd){var m=t.getItemGraphicEl(p[g].idx1);m&&d.push({el:m,ptIdx:g})}a.animators&&a.animators.length&&a.animators[0].during(function(){for(var t=0;t<d.length;t++)d[t].el.attr("position",a.shape.__points[d[t].ptIdx])})},remove:function(t){var e=this.group,n=this._data;this._lineGroup.removeAll(),this._symbolDraw.remove(!0),n&&n.eachItemGraphicEl(function(t,i){t.__temp&&(e.remove(t),n.setItemGraphicEl(i,null))}),this._polyline=this._polygon=this._coordSys=this._points=this._stackedOnPoints=this._data=null}});var qp={average:function(t){for(var e=0,n=0,i=0;i<t.length;i++)isNaN(t[i])||(e+=t[i],n++);return 0===n?NaN:e/n},sum:function(t){for(var e=0,n=0;n<t.length;n++)e+=t[n]||0;return e},max:function(t){for(var e=-1/0,n=0;n<t.length;n++)t[n]>e&&(e=t[n]);return e},min:function(t){for(var e=1/0,n=0;n<t.length;n++)t[n]<e&&(e=t[n]);return e},nearest:function(t){return t[0]}},Xp=function(t,e){return Math.round(t.length/2)};Ds.prototype.parse=function(t){return t},Ds.prototype.getSetting=function(t){return this._setting[t]},Ds.prototype.contain=function(t){var e=this._extent;return t>=e[0]&&t<=e[1]},Ds.prototype.normalize=function(t){var e=this._extent;return e[1]===e[0]?.5:(t-e[0])/(e[1]-e[0])},Ds.prototype.scale=function(t){var e=this._extent;return t*(e[1]-e[0])+e[0]},Ds.prototype.unionExtent=function(t){var e=this._extent;t[0]<e[0]&&(e[0]=t[0]),t[1]>e[1]&&(e[1]=t[1])},Ds.prototype.unionExtentFromData=function(t,e){this.unionExtent(t.getApproximateExtent(e,!0))},Ds.prototype.getExtent=function(){return this._extent.slice()},Ds.prototype.setExtent=function(t,e){var n=this._extent;isNaN(t)||(n[0]=t),isNaN(e)||(n[1]=e)},Ds.prototype.getTicksLabels=function(){for(var t=[],e=this.getTicks(),n=0;n<e.length;n++)t.push(this.getLabel(e[n]));return t},Ds.prototype.isBlank=function(){return this._isBlank},Ds.prototype.setBlank=function(t){this._isBlank=t},wn(Ds),Tn(Ds,{registerWhenExtend:!0}),As.createByAxisModel=function(t){var e=t.option,n=e.data,i=n&&d(n,Ps);return new As({categories:i,needCollect:!i,deduplication:!1!==e.dedplication})};var Zp=As.prototype;Zp.getOrdinal=function(t){return Ls(this).get(t)},Zp.parseAndCollect=function(t){var e,n=this._needCollect;if("string"!=typeof t&&!n)return t;if(n&&!this._deduplication)return e=this.categories.length,this.categories[e]=t,e;var i=Ls(this);return null==(e=i.get(t))&&(n?(e=this.categories.length,this.categories[e]=t,i.set(t,e)):e=NaN),e};var Yp=Ds.prototype,Up=Ds.extend({type:"ordinal",init:function(t,e){t&&!y(t)||(t=new As({categories:t})),this._ordinalMeta=t,this._extent=e||[0,t.categories.length-1]},parse:function(t){return"string"==typeof t?this._ordinalMeta.getOrdinal(t):Math.round(t)},contain:function(t){return t=this.parse(t),Yp.contain.call(this,t)&&null!=this._ordinalMeta.categories[t]},normalize:function(t){return Yp.normalize.call(this,this.parse(t))},scale:function(t){return Math.round(Yp.scale.call(this,t))},getTicks:function(){for(var t=[],e=this._extent,n=e[0];n<=e[1];)t.push(n),n++;return t},getLabel:function(t){return this._ordinalMeta.categories[t]},count:function(){return this._extent[1]-this._extent[0]+1},unionExtentFromData:function(t,e){this.unionExtent(t.getApproximateExtent(e,!1))},niceTicks:z,niceExtent:z});Up.create=function(){return new Up};var jp=er,$p=er,Kp=Ds.extend({type:"interval",_interval:0,_intervalPrecision:2,setExtent:function(t,e){var n=this._extent;isNaN(t)||(n[0]=parseFloat(t)),isNaN(e)||(n[1]=parseFloat(e))},unionExtent:function(t){var e=this._extent;t[0]<e[0]&&(e[0]=t[0]),t[1]>e[1]&&(e[1]=t[1]),Kp.prototype.setExtent.call(this,e[0],e[1])},getInterval:function(){return this._interval},setInterval:function(t){this._interval=t,this._niceExtent=this._extent.slice(),this._intervalPrecision=Es(t)},getTicks:function(){return zs(this._interval,this._extent,this._niceExtent,this._intervalPrecision)},getTicksLabels:function(){for(var t=[],e=this.getTicks(),n=0;n<e.length;n++)t.push(this.getLabel(e[n]));return t},getLabel:function(t,e){if(null==t)return"";var n=e&&e.precision;return null==n?n=nr(t)||0:"auto"===n&&(n=this._intervalPrecision),t=$p(t,n,!0),cr(t)},niceTicks:function(t,e,n){t=t||5;var i=this._extent,r=i[1]-i[0];if(isFinite(r)){r<0&&(r=-r,i.reverse());var a=Os(i,t,e,n);this._intervalPrecision=a.intervalPrecision,this._interval=a.interval,this._niceExtent=a.niceTickExtent}},niceExtent:function(t){var e=this._extent;if(e[0]===e[1])if(0!==e[0]){var n=e[0];t.fixMax?e[0]-=n/2:(e[1]+=n/2,e[0]-=n/2)}else e[1]=1;var i=e[1]-e[0];isFinite(i)||(e[0]=0,e[1]=1),this.niceTicks(t.splitNumber,t.minInterval,t.maxInterval);var r=this._interval;t.fixMin||(e[0]=$p(Math.floor(e[0]/r)*r)),t.fixMax||(e[1]=$p(Math.ceil(e[1]/r)*r))}});Kp.create=function(){return new Kp};var Qp="__ec_stack_",Jp=Kp.prototype,tg=Math.ceil,eg=Math.floor,ng=function(t,e,n,i){for(;n<i;){var r=n+i>>>1;t[r][1]<e?n=r+1:i=r}return n},ig=Kp.extend({type:"time",getLabel:function(t){var e=this._stepLvl,n=new Date(t);return gr(e[0],n,this.getSetting("useUTC"))},niceExtent:function(t){var e=this._extent;if(e[0]===e[1]&&(e[0]-=864e5,e[1]+=864e5),e[1]===-1/0&&e[0]===1/0){var n=new Date;e[1]=+new Date(n.getFullYear(),n.getMonth(),n.getDate()),e[0]=e[1]-864e5}this.niceTicks(t.splitNumber,t.minInterval,t.maxInterval);var i=this._interval;t.fixMin||(e[0]=er(eg(e[0]/i)*i)),t.fixMax||(e[1]=er(tg(e[1]/i)*i))},niceTicks:function(t,e,n){t=t||10;var i=this._extent,r=i[1]-i[0],a=r/t;null!=e&&a<e&&(a=e),null!=n&&a>n&&(a=n);var o=rg.length,s=ng(rg,a,0,o),l=rg[Math.min(s,o-1)],h=l[1];"year"===l[0]&&(h*=ur(r/h/t,!0));var u=this.getSetting("useUTC")?0:60*new Date(+i[0]||+i[1]).getTimezoneOffset()*1e3,c=[Math.round(tg((i[0]-u)/h)*h+u),Math.round(eg((i[1]-u)/h)*h+u)];Rs(c,i),this._stepLvl=l,this._interval=h,this._niceExtent=c},parse:function(t){return+sr(t)}});f(["contain","normalize"],function(t){ig.prototype[t]=function(e){return Jp[t].call(this,this.parse(e))}});var rg=[["hh:mm:ss",1e3],["hh:mm:ss",5e3],["hh:mm:ss",1e4],["hh:mm:ss",15e3],["hh:mm:ss",3e4],["hh:mm\nMM-dd",6e4],["hh:mm\nMM-dd",3e5],["hh:mm\nMM-dd",6e5],["hh:mm\nMM-dd",9e5],["hh:mm\nMM-dd",18e5],["hh:mm\nMM-dd",36e5],["hh:mm\nMM-dd",72e5],["hh:mm\nMM-dd",216e5],["hh:mm\nMM-dd",432e5],["MM-dd\nyyyy",864e5],["MM-dd\nyyyy",1728e5],["MM-dd\nyyyy",2592e5],["MM-dd\nyyyy",3456e5],["MM-dd\nyyyy",432e6],["MM-dd\nyyyy",5184e5],["week",6048e5],["MM-dd\nyyyy",864e6],["week",12096e5],["week",18144e5],["month",26784e5],["week",36288e5],["month",53568e5],["week",36288e5],["quarter",8208e6],["month",107136e5],["month",13392e6],["half-year",16416e6],["month",214272e5],["month",26784e6],["year",32832e6]];ig.create=function(t){return new ig({useUTC:t.ecModel.get("useUTC")})};var ag=Ds.prototype,og=Kp.prototype,sg=nr,lg=er,hg=Math.floor,ug=Math.ceil,cg=Math.pow,fg=Math.log,dg=Ds.extend({type:"log",base:10,$constructor:function(){Ds.apply(this,arguments),this._originalScale=new Kp},getTicks:function(){var t=this._originalScale,e=this._extent,n=t.getExtent();return d(og.getTicks.call(this),function(i){var r=er(cg(this.base,i));return r=i===e[0]&&t.__fixMin?Hs(r,n[0]):r,r=i===e[1]&&t.__fixMax?Hs(r,n[1]):r},this)},getLabel:og.getLabel,scale:function(t){return t=ag.scale.call(this,t),cg(this.base,t)},setExtent:function(t,e){var n=this.base;t=fg(t)/fg(n),e=fg(e)/fg(n),og.setExtent.call(this,t,e)},getExtent:function(){var t=this.base,e=ag.getExtent.call(this);e[0]=cg(t,e[0]),e[1]=cg(t,e[1]);var n=this._originalScale,i=n.getExtent();return n.__fixMin&&(e[0]=Hs(e[0],i[0])),n.__fixMax&&(e[1]=Hs(e[1],i[1])),e},unionExtent:function(t){this._originalScale.unionExtent(t);var e=this.base;t[0]=fg(t[0])/fg(e),t[1]=fg(t[1])/fg(e),ag.unionExtent.call(this,t)},unionExtentFromData:function(t,e){this.unionExtent(t.getApproximateExtent(e,!0,function(t){return t>0}))},niceTicks:function(t){t=t||10;var e=this._extent,n=e[1]-e[0];if(!(n===1/0||n<=0)){var i=lr(n);for(t/n*i<=.5&&(i*=10);!isNaN(i)&&Math.abs(i)<1&&Math.abs(i)>0;)i*=10;var r=[er(ug(e[0]/i)*i),er(hg(e[1]/i)*i)];this._interval=i,this._niceExtent=r}},niceExtent:function(t){og.niceExtent.call(this,t);var e=this._originalScale;e.__fixMin=t.fixMin,e.__fixMax=t.fixMax}});f(["contain","normalize"],function(t){dg.prototype[t]=function(e){return e=fg(e)/fg(this.base),ag[t].call(this,e)}}),dg.create=function(){return new dg};var pg=function(t){this._axes={},this._dimList=[],this.name=t||""};pg.prototype={constructor:pg,type:"cartesian",getAxis:function(t){return this._axes[t]},getAxes:function(){return d(this._dimList,js,this)},getAxesByScale:function(t){return t=t.toLowerCase(),g(this.getAxes(),function(e){return e.scale.type===t})},addAxis:function(t){var e=t.dim;this._axes[e]=t,this._dimList.push(e)},dataToCoord:function(t){return this._dataCoordConvert(t,"dataToCoord")},coordToData:function(t){return this._dataCoordConvert(t,"coordToData")},_dataCoordConvert:function(t,e){for(var n=this._dimList,i=t instanceof Array?[]:{},r=0;r<n.length;r++){var a=n[r],o=this._axes[a];i[a]=o[e](t[a])}return i}},$s.prototype={constructor:$s,type:"cartesian2d",dimensions:["x","y"],getBaseAxis:function(){return this.getAxesByScale("ordinal")[0]||this.getAxesByScale("time")[0]||this.getAxis("x")},containPoint:function(t){var e=this.getAxis("x"),n=this.getAxis("y");return e.contain(e.toLocalCoord(t[0]))&&n.contain(n.toLocalCoord(t[1]))},containData:function(t){return this.getAxis("x").containData(t[0])&&this.getAxis("y").containData(t[1])},dataToPoint:function(t,e,n){var i=this.getAxis("x"),r=this.getAxis("y");return n=n||[],n[0]=i.toGlobalCoord(i.dataToCoord(t[0])),n[1]=r.toGlobalCoord(r.dataToCoord(t[1])),n},clampData:function(t,e){var n=this.getAxis("x").scale.getExtent(),i=this.getAxis("y").scale.getExtent();return e=e||[],e[0]=Math.min(Math.max(Math.min(n[0],n[1]),t[0]),Math.max(n[0],n[1])),e[1]=Math.min(Math.max(Math.min(i[0],i[1]),t[1]),Math.max(i[0],i[1])),e},pointToData:function(t,e){var n=this.getAxis("x"),i=this.getAxis("y");return e=e||[],e[0]=n.coordToData(n.toLocalCoord(t[0])),e[1]=i.coordToData(i.toLocalCoord(t[1])),e},getOtherAxis:function(t){return this.getAxis("x"===t.dim?"y":"x")}},h($s,pg);var gg=Ji,mg=[0,1],vg=function(t,e,n){this.dim=t,this.scale=e,this._extent=n||[0,0],this.inverse=!1,this.onBand=!1,this._labelInterval};vg.prototype={constructor:vg,contain:function(t){var e=this._extent,n=Math.min(e[0],e[1]),i=Math.max(e[0],e[1]);return t>=n&&t<=i},containData:function(t){return this.contain(this.dataToCoord(t))},getExtent:function(){return this._extent.slice()},getPixelPrecision:function(t){return ir(t||this.scale.getExtent(),this._extent)},setExtent:function(t,e){var n=this._extent;n[0]=t,n[1]=e},dataToCoord:function(t,e){var n=this._extent,i=this.scale;return t=i.normalize(t),this.onBand&&"ordinal"===i.type&&Ks(n=n.slice(),i.count()),gg(t,mg,n,e)},coordToData:function(t,e){var n=this._extent,i=this.scale;this.onBand&&"ordinal"===i.type&&Ks(n=n.slice(),i.count());var r=gg(t,n,mg,e);return this.scale.scale(r)},pointToData:function(t,e){},getTicksCoords:function(t){if(this.onBand&&!t){for(var e=this.getBands(),n=[],i=0;i<e.length;i++)n.push(e[i][0]);return e[i-1]&&n.push(e[i-1][1]),n}return d(this.scale.getTicks(),this.dataToCoord,this)},getLabelsCoords:function(){return d(this.scale.getTicks(),this.dataToCoord,this)},getBands:function(){for(var t=this.getExtent(),e=[],n=this.scale.count(),i=t[0],r=t[1]-i,a=0;a<n;a++)e.push([r*a/n+i,r*(a+1)/n+i]);return e},getBandWidth:function(){var t=this._extent,e=this.scale.getExtent(),n=e[1]-e[0]+(this.onBand?1:0);0===n&&(n=1);var i=Math.abs(t[1]-t[0]);return Math.abs(i)/n},isHorizontal:null,getRotate:null,getLabelInterval:function(){var t=this._labelInterval;if(!t){var e=this.model,n=e.getModel("axisLabel");t=n.get("interval"),"category"!==this.type||null!=t&&"auto"!==t||(t=Zs(d(this.scale.getTicks(),this.dataToCoord,this),e.getFormattedLabels(),n.getFont(),this.getRotate?this.getRotate():this.isHorizontal&&!this.isHorizontal()?90:0,n.get("rotate"))),this._labelInterval=t}return t}};var yg=function(t,e,n,i,r){vg.call(this,t,e,n),this.type=i||"value",this.position=r||"bottom"};yg.prototype={constructor:yg,index:0,onZero:!1,model:null,isHorizontal:function(){var t=this.position;return"top"===t||"bottom"===t},getGlobalExtent:function(t){var e=this.getExtent();return e[0]=this.toGlobalCoord(e[0]),e[1]=this.toGlobalCoord(e[1]),t&&e[0]>e[1]&&e.reverse(),e},getOtherAxis:function(){this.grid.getOtherAxis()},isLabelIgnored:function(t){if("category"===this.type){var e=this.getLabelInterval();return"function"==typeof e&&!e(t,this.scale.getLabel(t))||t%(e+1)}},pointToData:function(t,e){return this.coordToData(this.toLocalCoord(t["x"===this.dim?0:1]),e)},toLocalCoord:null,toGlobalCoord:null},h(yg,vg);var _g={show:!0,zlevel:0,z:0,inverse:!1,name:"",nameLocation:"end",nameRotate:null,nameTruncate:{maxWidth:null,ellipsis:"...",placeholder:"."},nameTextStyle:{},nameGap:15,silent:!1,triggerEvent:!1,tooltip:{show:!1},axisPointer:{},axisLine:{show:!0,onZero:!0,onZeroAxisIndex:null,lineStyle:{color:"#333",width:1,type:"solid"},symbol:["none","none"],symbolSize:[10,15]},axisTick:{show:!0,inside:!1,length:5,lineStyle:{width:1}},axisLabel:{show:!0,inside:!1,rotate:0,showMinLabel:null,showMaxLabel:null,margin:8,fontSize:12},splitLine:{show:!0,lineStyle:{color:["#ccc"],width:1,type:"solid"}},splitArea:{show:!1,areaStyle:{color:["rgba(250,250,250,0.3)","rgba(200,200,200,0.3)"]}}},xg={};xg.categoryAxis=i({boundaryGap:!0,deduplication:null,splitLine:{show:!1},axisTick:{alignWithLabel:!1,interval:"auto"},axisLabel:{interval:"auto"}},_g),xg.valueAxis=i({boundaryGap:[0,0],splitNumber:5},_g),xg.timeAxis=o({scale:!0,min:"dataMin",max:"dataMax"},xg.valueAxis),xg.logAxis=o({scale:!0,logBase:10},xg.valueAxis);var wg=["value","category","time","log"],bg=function(t,e,n,a){f(wg,function(o){e.extend({type:t+"Axis."+o,mergeDefaultAndTheme:function(e,r){var a=this.layoutMode,s=a?_r(e):{};i(e,r.getTheme().get(o+"Axis")),i(e,this.getDefaultOption()),e.type=n(t,e),a&&yr(e,s,a)},optionUpdated:function(){"category"===this.option.type&&(this.__ordinalMeta=As.createByAxisModel(this))},getCategories:function(){if("category"===this.option.type)return this.__ordinalMeta.categories},getOrdinalMeta:function(){return this.__ordinalMeta},defaultOption:r([{},xg[o+"Axis"],a],!0)})}),Cf.registerSubTypeDefaulter(t+"Axis",v(n,t))},Sg={getFormattedLabels:function(){return Ys(this.axis,this.get("axisLabel.formatter"))},getMin:function(t){var e=this.option,n=t||null==e.rangeStart?e.min:e.rangeStart;return this.axis&&null!=n&&"dataMin"!==n&&"function"!=typeof n&&!T(n)&&(n=this.axis.scale.parse(n)),n},getMax:function(t){var e=this.option,n=t||null==e.rangeEnd?e.max:e.rangeEnd;return this.axis&&null!=n&&"dataMax"!==n&&"function"!=typeof n&&!T(n)&&(n=this.axis.scale.parse(n)),n},getNeedCrossZero:function(){var t=this.option;return null==t.rangeStart&&null==t.rangeEnd&&!t.scale},getCoordSysModel:z,setRange:function(t,e){this.option.rangeStart=t,this.option.rangeEnd=e},resetRange:function(){this.option.rangeStart=this.option.rangeEnd=null}},Mg=Cf.extend({type:"cartesian2dAxis",axis:null,init:function(){Mg.superApply(this,"init",arguments),this.resetRange()},mergeOption:function(){Mg.superApply(this,"mergeOption",arguments),this.resetRange()},restoreData:function(){Mg.superApply(this,"restoreData",arguments),this.resetRange()},getCoordSysModel:function(){return this.ecModel.queryComponents({mainType:"grid",index:this.option.gridIndex,id:this.option.gridId})[0]}});i(Mg.prototype,Sg);var Tg={offset:0};bg("x",Mg,Qs,Tg),bg("y",Mg,Qs,Tg),Cf.extend({type:"grid",dependencies:["xAxis","yAxis"],layoutMode:"box",coordinateSystem:null,defaultOption:{show:!1,zlevel:0,z:0,left:"10%",top:60,right:"10%",bottom:60,containLabel:!1,backgroundColor:"rgba(0,0,0,0)",borderWidth:1,borderColor:"#ccc"}});var Ig=f,Cg=function(t){var e=t.scale.getExtent(),n=e[0],i=e[1];return!(n>0&&i>0||n<0&&i<0)},kg=function(t,e){var n=Gs(t,e),i=null!=e.getMin(),r=null!=e.getMax(),a=e.get("splitNumber");"log"===t.type&&(t.base=e.get("logBase"));var o=t.type;t.setExtent(n[0],n[1]),t.niceExtent({splitNumber:a,fixMin:i,fixMax:r,minInterval:"interval"===o||"time"===o?e.get("minInterval"):null,maxInterval:"interval"===o||"time"===o?e.get("maxInterval"):null});var s=e.get("interval");null!=s&&t.setInterval&&t.setInterval(s)},Dg=nl.prototype;Dg.type="grid",Dg.axisPointerEnabled=!0,Dg.getRect=function(){return this._rect},Dg.update=function(t,e){var n=this._axesMap;this._updateScale(t,this.model),Ig(n.x,function(t){kg(t.scale,t.model)}),Ig(n.y,function(t){kg(t.scale,t.model)}),Ig(n.x,function(t){il(n,"y",t)}),Ig(n.y,function(t){il(n,"x",t)}),this.resize(this.model,e)},Dg.resize=function(t,e,n){function i(){Ig(a,function(t){var e=t.isHorizontal(),n=e?[0,r.width]:[0,r.height],i=t.inverse?1:0;t.setExtent(n[i],n[1-i]),al(t,e?r.x:r.y)})}var r=vr(t.getBoxLayoutParams(),{width:e.getWidth(),height:e.getHeight()});this._rect=r;var a=this._axesList;i(),!n&&t.get("containLabel")&&(Ig(a,function(t){if(!t.model.get("axisLabel.inside")){var e=el(t);if(e){var n=t.isHorizontal()?"height":"width",i=t.model.get("axisLabel.margin");r[n]-=e[n]+i,"top"===t.position?r.y+=e.height+i:"left"===t.position&&(r.x+=e.width+i)}}}),i())},Dg.getAxis=function(t,e){var n=this._axesMap[t];if(null!=n){if(null==e)for(var i in n)if(n.hasOwnProperty(i))return n[i];return n[e]}},Dg.getAxes=function(){return this._axesList.slice()},Dg.getCartesian=function(t,e){if(null!=t&&null!=e){var n="x"+t+"y"+e;return this._coordsMap[n]}w(t)&&(e=t.yAxisIndex,t=t.xAxisIndex);for(var i=0,r=this._coordsList;i<r.length;i++)if(r[i].getAxis("x").index===t||r[i].getAxis("y").index===e)return r[i]},Dg.getCartesians=function(){return this._coordsList.slice()},Dg.convertToPixel=function(t,e,n){var i=this._findConvertTarget(t,e);return i.cartesian?i.cartesian.dataToPoint(n):i.axis?i.axis.toGlobalCoord(i.axis.dataToCoord(n)):null},Dg.convertFromPixel=function(t,e,n){var i=this._findConvertTarget(t,e);return i.cartesian?i.cartesian.pointToData(n):i.axis?i.axis.coordToData(i.axis.toLocalCoord(n)):null},Dg._findConvertTarget=function(t,e){var n,i,r=e.seriesModel,a=e.xAxisModel||r&&r.getReferringComponents("xAxis")[0],o=e.yAxisModel||r&&r.getReferringComponents("yAxis")[0],s=e.gridModel,h=this._coordsList;return r?l(h,n=r.coordinateSystem)<0&&(n=null):a&&o?n=this.getCartesian(a.componentIndex,o.componentIndex):a?i=this.getAxis("x",a.componentIndex):o?i=this.getAxis("y",o.componentIndex):s&&s.coordinateSystem===this&&(n=this._coordsList[0]),{cartesian:n,axis:i}},Dg.containPoint=function(t){var e=this._coordsList[0];if(e)return e.containPoint(t)},Dg._initCartesian=function(t,e,n){function i(n){return function(i,s){if(Js(i,t,e)){var l=i.get("position");"x"===n?"top"!==l&&"bottom"!==l&&r[l="bottom"]&&(l="top"===l?"bottom":"top"):"left"!==l&&"right"!==l&&r[l="left"]&&(l="left"===l?"right":"left"),r[l]=!0;var h=new yg(n,Xs(i),[0,0],i.get("type"),l),u="category"===h.type;h.onBand=u&&i.get("boundaryGap"),h.inverse=i.get("inverse"),h.onZero=i.get("axisLine.onZero"),h.onZeroAxisIndex=i.get("axisLine.onZeroAxisIndex"),i.axis=h,h.model=i,h.grid=this,h.index=s,this._axesList.push(h),a[n][s]=h,o[n]++}}}var r={left:!1,right:!1,top:!1,bottom:!1},a={x:{},y:{}},o={x:0,y:0};if(e.eachComponent("xAxis",i("x"),this),e.eachComponent("yAxis",i("y"),this),!o.x||!o.y)return this._axesMap={},void(this._axesList=[]);this._axesMap=a,Ig(a.x,function(e,n){Ig(a.y,function(i,r){var a="x"+n+"y"+r,o=new $s(a);o.grid=this,o.model=t,this._coordsMap[a]=o,this._coordsList.push(o),o.addAxis(e),o.addAxis(i)},this)},this)},Dg._updateScale=function(t,e){function n(t,e,n){Ig(t.mapDimension(e.dim,!0),function(n){e.scale.unionExtentFromData(t,n)})}f(this._axesList,function(t){t.scale.setExtent(1/0,-1/0)}),t.eachSeries(function(i){if(sl(i)){var r=ol(i),a=r[0],o=r[1];if(!Js(a,e,t)||!Js(o,e,t))return;var s=this.getCartesian(a.componentIndex,o.componentIndex),l=i.getData(),h=s.getAxis("x"),u=s.getAxis("y");"list"===l.type&&(n(l,h),n(l,u))}},this)},Dg.getTooltipAxes=function(t){var e=[],n=[];return Ig(this.getCartesians(),function(i){var r=null!=t&&"auto"!==t?i.getAxis(t):i.getBaseAxis(),a=i.getOtherAxis(r);l(e,r)<0&&e.push(r),l(n,a)<0&&n.push(a)}),{baseAxes:e,otherAxes:n}};var Ag=["xAxis","yAxis"];nl.create=function(t,e){var n=[];return t.eachComponent("grid",function(i,r){var a=new nl(i,t,e);a.name="grid_"+r,a.resize(i,e,!0),i.coordinateSystem=a,n.push(a)}),t.eachSeries(function(t){if(sl(t)){var e=ol(t),n=e[0],i=e[1],r=n.getCoordSysModel().coordinateSystem;t.coordinateSystem=r.getCartesian(n.componentIndex,i.componentIndex)}}),n},nl.dimensions=nl.prototype.dimensions=$s.prototype.dimensions,Xr.register("cartesian2d",nl);var Lg=Math.PI,Pg=function(t,e){this.opt=e,this.axisModel=t,o(e,{labelOffset:0,nameDirection:1,tickDirection:1,labelDirection:1,silent:!0}),this.group=new Oh;var n=new Oh({position:e.position.slice(),rotation:e.rotation});n.updateTransform(),this._transform=n.transform,this._dumbGroup=n};Pg.prototype={constructor:Pg,hasBuilder:function(t){return!!Og[t]},add:function(t){Og[t].call(this)},getGroup:function(){return this.group}};var Og={axisLine:function(){var t=this.opt,e=this.axisModel;if(e.get("axisLine.show")){var n=this.axisModel.axis.getExtent(),i=this._transform,r=[n[0],0],o=[n[1],0];i&&(Y(r,r,i),Y(o,o,i));var s=a({lineCap:"round"},e.getModel("axisLine.lineStyle").getLineStyle());this.group.add(new Yc(_i({anid:"line",shape:{x1:r[0],y1:r[1],x2:o[0],y2:o[1]},style:s,strokeContainThreshold:t.strokeContainThreshold||5,silent:!0,z2:1})));var l=e.get("axisLine.symbol"),h=e.get("axisLine.symbolSize");if(null!=l){"string"==typeof l&&(l=[l,l]),"string"!=typeof h&&"number"!=typeof h||(h=[h,h]);var u=h[0],c=h[1];f([[t.rotation+Math.PI/2,r],[t.rotation-Math.PI/2,o]],function(t,e){if("none"!==l[e]&&null!=l[e]){var n=rs(l[e],-u/2,-c/2,u,c,s.stroke,!0);n.attr({rotation:t[0],position:t[1],silent:!0}),this.group.add(n)}},this)}}},axisTickLabel:function(){var t=this.axisModel,e=this.opt,n=gl(this,t,e);cl(t,ml(this,t,e),n)},axisName:function(){var t=this.opt,e=this.axisModel,n=I(t.axisName,e.get("name"));if(n){var i,r=e.get("nameLocation"),o=t.nameDirection,s=e.getModel("nameTextStyle"),l=e.get("nameGap")||0,h=this.axisModel.axis.getExtent(),u=h[0]>h[1]?-1:1,c=["start"===r?h[0]-u*l:"end"===r?h[1]+u*l:(h[0]+h[1])/2,pl(r)?t.labelOffset+o*l:0],f=e.get("nameRotate");null!=f&&(f=f*Lg/180);var d;pl(r)?i=Eg(t.rotation,null!=f?f:t.rotation,o):(i=hl(t,r,f||0,h),null!=(d=t.axisNameAvailableWidth)&&(d=Math.abs(d/Math.sin(i.rotation)),!isFinite(d)&&(d=null)));var p=s.getFont(),g=e.get("nameTruncate",!0)||{},m=g.ellipsis,v=I(t.nameTruncateMaxWidth,g.maxWidth,d),y=null!=m&&null!=v?wf(n,v,p,m,{minChar:2,placeholder:g.placeholder}):n,_=e.get("tooltip",!0),x=e.mainType,w={componentType:x,name:n,$vars:["name"]};w[x+"Index"]=e.componentIndex;var b=new Rc({anid:"name",__fullText:n,__truncatedText:y,position:c,rotation:i.rotation,silent:ul(e),z2:1,tooltip:_&&_.show?a({content:n,formatter:function(){return n},formatterParams:w},_):null});Bi(b.style,s,{text:y,textFont:p,textFill:s.getTextColor()||e.get("axisLine.lineStyle.color"),textAlign:i.textAlign,textVerticalAlign:i.textVerticalAlign}),e.get("triggerEvent")&&(b.eventData=ll(e),b.eventData.targetType="axisName",b.eventData.name=n),this._dumbGroup.add(b),b.updateTransform(),this.group.add(b),b.decomposeTransform()}}},Eg=Pg.innerTextLayout=function(t,e,n){var i,r,a=ar(e-t);return or(a)?(r=n>0?"top":"bottom",i="center"):or(a-Lg)?(r=n>0?"bottom":"top",i="center"):(r="middle",i=a>0&&a<Lg?n>0?"right":"left":n>0?"left":"right"),{rotation:a,textAlign:i,textVerticalAlign:r}},Bg=Pg.ifIgnoreOnTick=function(t,e,n,i,r,a){if(0===e&&r||e===i-1&&a)return!1;var o,s=t.scale;return"ordinal"===s.type&&("function"==typeof n?(o=s.getTicks()[e],!n(o,s.getLabel(o))):e%(n+1))},Rg=Pg.getInterval=function(t,e){var n=t.get("interval");return null!=n&&"auto"!=n||(n=e),n},zg=Po({type:"axis",_axisPointer:null,axisPointerClass:null,render:function(t,e,n,i){this.axisPointerClass&&vl(t),zg.superApply(this,"render",arguments),bl(this,t,0,n,0,!0)},updateAxisPointer:function(t,e,n,i,r){bl(this,t,0,n,0,!1)},remove:function(t,e){var n=this._axisPointer;n&&n.remove(e),zg.superApply(this,"remove",arguments)},dispose:function(t,e){Sl(this,e),zg.superApply(this,"dispose",arguments)}}),Ng=[];zg.registerAxisPointerClass=function(t,e){Ng[t]=e},zg.getAxisPointerClass=function(t){return t&&Ng[t]};var Fg=Pg.ifIgnoreOnTick,Vg=Pg.getInterval,Wg=["axisLine","axisTickLabel","axisName"],Hg=["splitArea","splitLine"],Gg=zg.extend({type:"cartesianAxis",axisPointerClass:"CartesianAxisPointer",render:function(t,e,n,i){this.group.removeAll();var r=this._axisGroup;if(this._axisGroup=new Oh,this.group.add(this._axisGroup),t.get("show")){var a=t.getCoordSysModel(),o=Ml(a,t),s=new Pg(t,o);f(Wg,s.add,s),this._axisGroup.add(s.getGroup()),f(Hg,function(e){t.get(e+".show")&&this["_"+e](t,a,o.labelInterval)},this),Yi(r,this._axisGroup,t),Gg.superCall(this,"render",t,e,n,i)}},_splitLine:function(t,e,n){var i=t.axis;if(!i.scale.isBlank()){var r=t.getModel("splitLine"),a=r.getModel("lineStyle"),s=a.get("color"),l=Vg(r,n);s=y(s)?s:[s];for(var h=e.coordinateSystem.getRect(),u=i.isHorizontal(),c=0,f=i.getTicksCoords(),d=i.scale.getTicks(),p=t.get("axisLabel.showMinLabel"),g=t.get("axisLabel.showMaxLabel"),m=[],v=[],_=a.getLineStyle(),x=0;x<f.length;x++)if(!Fg(i,x,l,f.length,p,g)){var w=i.toGlobalCoord(f[x]);u?(m[0]=w,m[1]=h.y,v[0]=w,v[1]=h.y+h.height):(m[0]=h.x,m[1]=w,v[0]=h.x+h.width,v[1]=w);var b=c++%s.length;this._axisGroup.add(new Yc(_i({anid:"line_"+d[x],shape:{x1:m[0],y1:m[1],x2:v[0],y2:v[1]},style:o({stroke:s[b]},_),silent:!0})))}}},_splitArea:function(t,e,n){var i=t.axis;if(!i.scale.isBlank()){var r=t.getModel("splitArea"),a=r.getModel("areaStyle"),s=a.get("color"),l=e.coordinateSystem.getRect(),h=i.getTicksCoords(),u=i.scale.getTicks(),c=i.toGlobalCoord(h[0]),f=i.toGlobalCoord(h[0]),d=0,p=Vg(r,n),g=a.getAreaStyle();s=y(s)?s:[s];for(var m=t.get("axisLabel.showMinLabel"),v=t.get("axisLabel.showMaxLabel"),_=1;_<h.length;_++)if(!Fg(i,_,p,h.length,m,v)){var x,w,b,S,M=i.toGlobalCoord(h[_]);i.isHorizontal()?(x=c,w=l.y,b=M-x,S=l.height):(x=l.x,w=f,b=l.width,S=M-w);var T=d++%s.length;this._axisGroup.add(new Zc({anid:"area_"+u[_],shape:{x:x,y:w,width:b,height:S},style:o({fill:s[T]},g),silent:!0})),c=x+b,f=w+S}}}});Gg.extend({type:"xAxis"}),Gg.extend({type:"yAxis"}),Po({type:"grid",render:function(t,e){this.group.removeAll(),t.get("show")&&this.group.add(new Zc({shape:t.coordinateSystem.getRect(),style:o({fill:t.get("backgroundColor")},t.getItemStyle()),silent:!0,z2:-1}))}}),Mo(function(t){t.xAxis&&t.yAxis&&!t.grid&&(t.grid={})}),ko(function(t,e,n){return{seriesType:t,performRawSeries:!0,reset:function(t,i,r){var a=t.getData(),o=t.get("symbol")||e,s=t.get("symbolSize");if(a.setVisual({legendSymbol:n||o,symbol:o,symbolSize:s}),!i.isSeriesFiltered(t)){var l="function"==typeof s;return{dataEach:a.hasItemOption||l?function(e,n){if("function"==typeof s){var i=t.getRawValue(n),r=t.getDataParams(n);e.setItemVisual(n,"symbolSize",s(i,r))}if(e.hasItemOption){var a=e.getItemModel(n),o=a.getShallow("symbol",!0),l=a.getShallow("symbolSize",!0);null!=o&&e.setItemVisual(n,"symbol",o),null!=l&&e.setItemVisual(n,"symbolSize",l)}}:null}}}}}("line","circle","line")),Co(function(t){return{seriesType:t,plan:gd(),reset:function(t){var e=t.getData(),n=t.coordinateSystem,i=t.pipelineContext.large;if(n){var r=d(n.dimensions,function(t){return e.getDimension(e.mapDimension(t))}).slice(0,2),a=r.length;return a&&{progress:function(t,e){for(var o=t.end-t.start,s=i&&new Float32Array(o*a),l=t.start,h=0,u=[],c=[];l<t.end;l++){var f;if(1===a)d=e.get(r[0],l,!0),f=!isNaN(d)&&n.dataToPoint(d,null,c);else{var d=u[0]=e.get(r[0],l,!0),p=u[1]=e.get(r[1],l,!0);f=!isNaN(d)&&!isNaN(p)&&n.dataToPoint(u,null,c)}i?(s[h++]=f?f[0]:NaN,s[h++]=f?f[1]:NaN):e.setItemLayout(l,f&&f.slice()||[NaN,NaN])}i&&e.setLayout("symbolPoints",s)}}}}}}("line")),To(Wd.PROCESSOR.STATISTIC,function(t){return{seriesType:t,reset:function(t,e,n){var i=t.getData(),r=t.get("sampling"),a=t.coordinateSystem;if("cartesian2d"===a.type&&r){var o=a.getBaseAxis(),s=a.getOtherAxis(o),l=o.getExtent(),h=l[1]-l[0],u=Math.round(i.count()/h);if(u>1){var c;"string"==typeof r?c=qp[r]:"function"==typeof r&&(c=r),c&&t.setData(i.downSample(s.dim,1/u,c,Xp))}}}}}("line")),fd.extend({type:"series.__base_bar__",getInitialData:function(t,e){return Jo(this.getSource(),this)},getMarkerPosition:function(t){var e=this.coordinateSystem;if(e){var n=e.dataToPoint(e.clampData(t)),i=this.getData(),r=i.getLayout("offset"),a=i.getLayout("size");return n[e.getBaseAxis().isHorizontal()?0:1]+=r+a/2,n}return[NaN,NaN]},defaultOption:{zlevel:0,z:2,coordinateSystem:"cartesian2d",legendHoverLink:!0,barMinHeight:0,barMinAngle:0,itemStyle:{},emphasis:{}}}).extend({type:"series.bar",dependencies:["grid","polar"],brushSelector:"rect"});var qg=Au([["fill","color"],["stroke","borderColor"],["lineWidth","borderWidth"],["stroke","barBorderColor"],["lineWidth","barBorderWidth"],["opacity"],["shadowBlur"],["shadowOffsetX"],["shadowOffsetY"],["shadowColor"]]),Xg={getBarItemStyle:function(t){var e=qg(this,t);if(this.getBorderLineDash){var n=this.getBorderLineDash();n&&(e.lineDash=n)}return e}},Zg=["itemStyle","barBorderWidth"];a(Ui.prototype,Xg),Eo({type:"bar",render:function(t,e,n){var i=t.get("coordinateSystem");return"cartesian2d"!==i&&"polar"!==i||this._render(t,e,n),this.group},dispose:z,_render:function(t,e,n){var i,r=this.group,a=t.getData(),o=this._data,s=t.coordinateSystem,l=s.getBaseAxis();"cartesian2d"===s.type?i=l.isHorizontal():"polar"===s.type&&(i="angle"===l.dim);var h=t.isAnimationEnabled()?t:null;a.diff(o).add(function(e){if(a.hasValue(e)){var n=a.getItemModel(e),o=Ug[s.type](a,e,n),l=Yg[s.type](a,e,n,o,i,h);a.setItemGraphicEl(e,l),r.add(l),Dl(l,a,e,n,o,t,i,"polar"===s.type)}}).update(function(e,n){var l=o.getItemGraphicEl(n);if(a.hasValue(e)){var u=a.getItemModel(e),c=Ug[s.type](a,e,u);l?qi(l,{shape:c},h,e):l=Yg[s.type](a,e,u,c,i,h,!0),a.setItemGraphicEl(e,l),r.add(l),Dl(l,a,e,u,c,t,i,"polar"===s.type)}else r.remove(l)}).remove(function(t){var e=o.getItemGraphicEl(t);"cartesian2d"===s.type?e&&Cl(t,h,e):e&&kl(t,h,e)}).execute(),this._data=a},remove:function(t,e){var n=this.group,i=this._data;t.get("animation")?i&&i.eachItemGraphicEl(function(e){"sector"===e.type?kl(e.dataIndex,t,e):Cl(e.dataIndex,t,e)}):n.removeAll()}});var Yg={cartesian2d:function(t,e,n,i,r,o,s){var l=new Zc({shape:a({},i)});if(o){var h=l.shape,u=r?"height":"width",c={};h[u]=0,c[u]=i[u],sf[s?"updateProps":"initProps"](l,{shape:c},o,e)}return l},polar:function(t,e,n,i,r,o,s){var l=new Vc({shape:a({},i)});if(o){var h=l.shape,u=r?"r":"endAngle",c={};h[u]=r?0:i.startAngle,c[u]=i[u],sf[s?"updateProps":"initProps"](l,{shape:c},o,e)}return l}},Ug={cartesian2d:function(t,e,n){var i=t.getItemLayout(e),r=Al(n,i),a=i.width>0?1:-1,o=i.height>0?1:-1;return{x:i.x+a*r/2,y:i.y+o*r/2,width:i.width-a*r,height:i.height-o*r}},polar:function(t,e,n){var i=t.getItemLayout(e);return{cx:i.cx,cy:i.cy,r0:i.r0,r:i.r,startAngle:i.startAngle,endAngle:i.endAngle}}};Co(v(function(t,e,n){var i=Vs(g(e.getSeriesByType(t),function(t){return!e.isSeriesFiltered(t)&&t.coordinateSystem&&"cartesian2d"===t.coordinateSystem.type})),r={},a={};e.eachSeriesByType(t,function(t){if("cartesian2d"===t.coordinateSystem.type){var e=t.getData(),n=t.coordinateSystem,o=n.getBaseAxis(),s=Ns(t),l=i[Fs(o)][s],h=l.offset,u=l.width,c=n.getOtherAxis(o),f=t.get("barMinHeight")||0,d=o.onZero?c.toGlobalCoord(c.dataToCoord(0)):c.getGlobalExtent()[0],p=[e.mapDimension("x"),e.mapDimension("y")],g=e.mapArray(p,function(t,e){return n.dataToPoint([t,e])},!0);r[s]=r[s]||[],a[s]=a[s]||[],e.setLayout({offset:h,size:u}),e.each(e.mapDimension(c.dim),function(t,n){if(!isNaN(t)){r[s][n]||(r[s][n]={p:d,n:d},a[s][n]={p:d,n:d});var i,o,l,p,m=t>=0?"p":"n",v=g[n],y=r[s][n][m],_=a[s][n][m];c.isHorizontal()?(i=y,o=v[1]+h,l=v[0]-_,p=u,a[s][n][m]+=l,Math.abs(l)<f&&(l=(l<0?-1:1)*f),r[s][n][m]+=l):(i=v[0]+h,o=y,l=u,p=v[1]-_,a[s][n][m]+=p,Math.abs(p)<f&&(p=(p<=0?-1:1)*f),r[s][n][m]+=p),e.setItemLayout(n,{x:i,y:o,width:l,height:p})}},!0)}},this)},"bar")),ko(function(t){t.eachSeriesByType("bar",function(t){t.getData().setVisual("legendSymbol","roundRect")})});var jg=function(t,e,n){e=y(e)&&{coordDimensions:e}||a({},e);var i=t.getSource(),r=xp(i,e),o=new vp(r,t);return o.initData(i,n),o},$g={updateSelectedMap:function(t){if(y(t))this._targetList=t.slice();else for(var e=t,n=e.mapDimension("value"),t=this._targetList=[],i=0,r=e.count();i<r;i++)t.push({name:e.getName(i),value:e.get(n,i),selected:va(e,i,"selected")});this._selectTargetMap=p(t||[],function(t,e){return t.set(e.name,e),t},R())},select:function(t,e){var n=null!=e?this._targetList[e]:this._selectTargetMap.get(t);"single"===this.get("selectedMode")&&this._selectTargetMap.each(function(t){t.selected=!1}),n&&(n.selected=!0)},unSelect:function(t,e){var n=null!=e?this._targetList[e]:this._selectTargetMap.get(t);n&&(n.selected=!1)},toggleSelected:function(t,e){var n=null!=e?this._targetList[e]:this._selectTargetMap.get(t);if(null!=n)return this[n.selected?"unSelect":"select"](t,e),n.selected},isSelected:function(t,e){var n=null!=e?this._targetList[e]:this._selectTargetMap.get(t);return n&&n.selected}},Kg=Oo({type:"series.pie",init:function(t){Kg.superApply(this,"init",arguments),this.legendDataProvider=function(){return this.getRawData()},this.updateSelectedMap(this.getRawData()),this._defaultLabelLine(t)},mergeOption:function(t){Kg.superCall(this,"mergeOption",t),this.updateSelectedMap(this.getRawData())},getInitialData:function(t,e){return jg(this,["value"])},getDataParams:function(t){var e=this.getData(),n=Kg.superCall(this,"getDataParams",t),i=[];return e.each(e.mapDimension("value"),function(t){i.push(t)}),n.percent=rr(i,t,e.hostModel.get("percentPrecision")),n.$vars.push("percent"),n},_defaultLabelLine:function(t){sn(t,"labelLine",["show"]);var e=t.labelLine,n=t.emphasis.labelLine;e.show=e.show&&t.label.show,n.show=n.show&&t.emphasis.label.show},defaultOption:{zlevel:0,z:2,legendHoverLink:!0,hoverAnimation:!0,center:["50%","50%"],radius:[0,"75%"],clockwise:!0,startAngle:90,minAngle:0,selectedOffset:10,hoverOffset:10,avoidLabelOverlap:!0,percentPrecision:2,stillShowZeroSum:!0,label:{rotate:!1,show:!0,position:"outer"},labelLine:{show:!0,length:15,length2:15,smooth:!1,lineStyle:{width:1,type:"solid"}},itemStyle:{borderWidth:1},animationType:"expansion",animationEasing:"cubicOut"}});u(Kg,$g);var Qg=Ol.prototype;Qg.updateData=function(t,e,n){function i(){s.stopAnimation(!0),s.animateTo({shape:{r:u.r+l.get("hoverOffset")}},300,"elasticOut")}function r(){s.stopAnimation(!0),s.animateTo({shape:{r:u.r}},300,"elasticOut")}var s=this.childAt(0),l=t.hostModel,h=t.getItemModel(e),u=t.getItemLayout(e),c=a({},u);c.label=null,n?(s.setShape(c),"scale"===l.getShallow("animationType")?(s.shape.r=u.r0,Xi(s,{shape:{r:u.r}},l,e)):(s.shape.endAngle=u.startAngle,qi(s,{shape:{endAngle:u.endAngle}},l,e))):qi(s,{shape:c},l,e);var f=t.getItemVisual(e,"color");s.useStyle(o({lineJoin:"bevel",fill:f},h.getModel("itemStyle").getItemStyle())),s.hoverStyle=h.getModel("emphasis.itemStyle").getItemStyle();var d=h.getShallow("cursor");d&&s.attr("cursor",d),Pl(this,t.getItemLayout(e),l.isSelected(null,e),l.get("selectedOffset"),l.get("animation")),s.off("mouseover").off("mouseout").off("emphasis").off("normal"),h.get("hoverAnimation")&&l.isAnimationEnabled()&&s.on("mouseover",i).on("mouseout",r).on("emphasis",i).on("normal",r),this._updateLabel(t,e),Oi(this)},Qg._updateLabel=function(t,e){var n=this.childAt(1),i=this.childAt(2),r=t.hostModel,a=t.getItemModel(e),o=t.getItemLayout(e).label,s=t.getItemVisual(e,"color");qi(n,{shape:{points:o.linePoints||[[o.x,o.y],[o.x,o.y],[o.x,o.y]]}},r,e),qi(i,{style:{x:o.x,y:o.y}},r,e),i.attr({rotation:o.rotation,origin:[o.x,o.y],z2:10});var l=a.getModel("label"),h=a.getModel("emphasis.label"),u=a.getModel("labelLine"),c=a.getModel("emphasis.labelLine"),s=t.getItemVisual(e,"color");Ei(i.style,i.hoverStyle={},l,h,{labelFetcher:t.hostModel,labelDataIndex:e,defaultText:t.getName(e),autoColor:s,useInsideStyle:!!o.inside},{textAlign:o.textAlign,textVerticalAlign:o.verticalAlign,opacity:t.getItemVisual(e,"opacity")}),i.ignore=i.normalIgnore=!l.get("show"),i.hoverIgnore=!h.get("show"),n.ignore=n.normalIgnore=!u.get("show"),n.hoverIgnore=!c.get("show"),n.setStyle({stroke:s,opacity:t.getItemVisual(e,"opacity")}),n.setStyle(u.getModel("lineStyle").getLineStyle()),n.hoverStyle=c.getModel("lineStyle").getLineStyle();var f=u.get("smooth");f&&!0===f&&(f=.4),n.setShape({smooth:f})},h(Ol,Oh);Da.extend({type:"pie",init:function(){var t=new Oh;this._sectorGroup=t},render:function(t,e,n,i){if(!i||i.from!==this.uid){var r=t.getData(),a=this._data,o=this.group,s=e.get("animation"),l=!a,h=t.get("animationType"),u=v(Ll,this.uid,t,s,n),c=t.get("selectedMode");if(r.diff(a).add(function(t){var e=new Ol(r,t);l&&"scale"!==h&&e.eachChild(function(t){t.stopAnimation(!0)}),c&&e.on("click",u),r.setItemGraphicEl(t,e),o.add(e)}).update(function(t,e){var n=a.getItemGraphicEl(e);n.updateData(r,t),n.off("click"),c&&n.on("click",u),o.add(n),r.setItemGraphicEl(t,n)}).remove(function(t){var e=a.getItemGraphicEl(t);o.remove(e)}).execute(),s&&l&&r.count()>0&&"scale"!==h){var f=r.getItemLayout(0),d=Math.max(n.getWidth(),n.getHeight())/2,p=m(o.removeClipPath,o);o.setClipPath(this._createClipPath(f.cx,f.cy,d,f.startAngle,f.clockwise,p,t))}this._data=r}},dispose:function(){},_createClipPath:function(t,e,n,i,r,a,o){var s=new Vc({shape:{cx:t,cy:e,r0:0,r:n,startAngle:i,endAngle:i,clockwise:r}});return Xi(s,{shape:{endAngle:i+(r?1:-1)*Math.PI*2}},o,a),s},containPoint:function(t,e){var n=e.getData().getItemLayout(0);if(n){var i=t[0]-n.cx,r=t[1]-n.cy,a=Math.sqrt(i*i+r*r);return a<=n.r&&a>=n.r0}}});var Jg=function(t,e,n,i){var r,a,o=t.getData(),s=[],l=!1;o.each(function(n){var i,h,u,c,f=o.getItemLayout(n),d=o.getItemModel(n),p=d.getModel("label"),g=p.get("position")||d.get("emphasis.label.position"),m=d.getModel("labelLine"),v=m.get("length"),y=m.get("length2"),_=(f.startAngle+f.endAngle)/2,x=Math.cos(_),w=Math.sin(_);r=f.cx,a=f.cy;var b="inside"===g||"inner"===g;if("center"===g)i=f.cx,h=f.cy,c="center";else{var S=(b?(f.r+f.r0)/2*x:f.r*x)+r,M=(b?(f.r+f.r0)/2*w:f.r*w)+a;if(i=S+3*x,h=M+3*w,!b){var T=S+x*(v+e-f.r),I=M+w*(v+e-f.r),C=T+(x<0?-1:1)*y,k=I;i=C+(x<0?-5:5),h=k,u=[[S,M],[T,I],[C,k]]}c=b?"center":x>0?"left":"right"}var D=p.getFont(),A=p.get("rotate")?x<0?-_+Math.PI:-_:0,L=ee(t.getFormattedLabel(n,"normal")||o.getName(n),D,c,"top");l=!!A,f.label={x:i,y:h,position:g,height:L.height,len:v,len2:y,linePoints:u,textAlign:c,verticalAlign:"middle",rotation:A,inside:b},b||s.push(f.label)}),!l&&t.get("avoidLabelOverlap")&&Bl(s,r,a,e,n,i)},tm=2*Math.PI,em=Math.PI/180;!function(t,e){f(e,function(e){e.update="updateView",Io(e,function(n,i){var r={};return i.eachComponent({mainType:"series",subType:t,query:n},function(t){t[e.method]&&t[e.method](n.name,n.dataIndex);var i=t.getData();i.each(function(e){var n=i.getName(e);r[n]=t.isSelected(n)||!1})}),{name:n.name,selected:r}})})}("pie",[{type:"pieToggleSelect",event:"pieselectchanged",method:"toggleSelected"},{type:"pieSelect",event:"pieselected",method:"select"},{type:"pieUnSelect",event:"pieunselected",method:"unSelect"}]),ko(function(t){return{getTargetSeries:function(e){var n={},i=R();return e.eachSeriesByType(t,function(t){t.__paletteScope=n,i.set(t.uid,t)}),i},reset:function(t,e){var n=t.getRawData(),i={},r=t.getData();r.each(function(t){var e=r.getRawIndex(t);i[e]=t}),n.each(function(e){var a=i[e],o=null!=a&&r.getItemVisual(a,"color",!0);if(o)n.setItemVisual(e,"color",o);else{var s=n.getItemModel(e).get("itemStyle.color")||t.getColorFromPalette(n.getName(e),t.__paletteScope,n.count());n.setItemVisual(e,"color",s),null!=a&&r.setItemVisual(a,"color",s)}})}}}("pie")),Co(v(function(t,e,n,i){e.eachSeriesByType(t,function(t){var e=t.getData(),i=e.mapDimension("value"),r=t.get("center"),a=t.get("radius");y(a)||(a=[0,a]),y(r)||(r=[r,r]);var o=n.getWidth(),s=n.getHeight(),l=Math.min(o,s),h=tr(r[0],o),u=tr(r[1],s),c=tr(a[0],l/2),f=tr(a[1],l/2),d=-t.get("startAngle")*em,p=t.get("minAngle")*em,g=0;e.each(i,function(t){!isNaN(t)&&g++});var m=e.getSum(i),v=Math.PI/(m||g)*2,_=t.get("clockwise"),x=t.get("roseType"),w=t.get("stillShowZeroSum"),b=e.getDataExtent(i);b[0]=0;var S=tm,M=0,T=d,I=_?1:-1;if(e.each(i,function(t,n){var i;if(isNaN(t))e.setItemLayout(n,{angle:NaN,startAngle:NaN,endAngle:NaN,clockwise:_,cx:h,cy:u,r0:c,r:x?NaN:f});else{(i="area"!==x?0===m&&w?v:t*v:tm/g)<p?(i=p,S-=p):M+=t;var r=T+I*i;e.setItemLayout(n,{angle:i,startAngle:T,endAngle:r,clockwise:_,cx:h,cy:u,r0:c,r:x?Ji(t,b,[c,f]):f}),T=r}},!0),S<tm&&g)if(S<=.001){var C=tm/g;e.each(i,function(t,n){if(!isNaN(t)){var i=e.getItemLayout(n);i.angle=C,i.startAngle=d+I*n*C,i.endAngle=d+I*(n+1)*C}})}else v=S/M,T=d,e.each(i,function(t,n){if(!isNaN(t)){var i=e.getItemLayout(n),r=i.angle===p?p:t*v;i.startAngle=T,i.endAngle=T+I*r,T+=I*r}});Jg(t,f,o,s)})},"pie")),To(function(t){return{seriesType:t,reset:function(t,e){var n=e.findComponents({mainType:"legend"});if(n&&n.length){var i=t.getData();i.filterSelf(function(t){for(var e=i.getName(t),r=0;r<n.length;r++)if(!n[r].isSelected(e))return!1;return!0},this)}}}}("pie")),t.version="4.0.2",t.dependencies=zd,t.PRIORITY=Wd,t.init=function(t,e,n){var i=bo(t);if(i)return i;var r=new Ja(t,e,n);return r.id="ec_"+rp++,np[r.id]=r,vn(t,op,r.id),xo(r),r},t.connect=function(t){if(y(t)){var e=t;t=null,Od(e,function(e){null!=e.group&&(t=e.group)}),t=t||"g_"+ap++,Od(e,function(e){e.group=t})}return ip[t]=!0,t},t.disConnect=wo,t.disconnect=lp,t.dispose=function(t){"string"==typeof t?t=np[t]:t instanceof Ja||(t=bo(t)),t instanceof Ja&&!t.isDisposed()&&t.dispose()},t.getInstanceByDom=bo,t.getInstanceById=function(t){return np[t]},t.registerTheme=So,t.registerPreprocessor=Mo,t.registerProcessor=To,t.registerPostUpdate=function(t){Qd.push(t)},t.registerAction=Io,t.registerCoordinateSystem=function(t,e){Xr.register(t,e)},t.getCoordinateSystemDimensions=function(t){var e=Xr.get(t);if(e)return e.getDimensionsInfo?e.getDimensionsInfo():e.dimensions.slice()},t.registerLayout=Co,t.registerVisual=ko,t.registerLoading=Ao,t.extendComponentModel=Lo,t.extendComponentView=Po,t.extendSeriesModel=Oo,t.extendChartView=Eo,t.setCanvasCreator=function(t){e("createCanvas",t)},t.registerMap=function(t,e,n){e.geoJson&&!e.features&&(n=e.specialAreas,e=e.geoJson),"string"==typeof e&&(e="undefined"!=typeof JSON&&JSON.parse?JSON.parse(e):new Function("return ("+e+");")()),sp[t]={geoJson:e,specialAreas:n}},t.getMap=function(t){return sp[t]},t.dataTool=hp});
diff --git a/management/guns-admin/src/main/webapp/static/js/plugins/chosen/chosen.jquery.js b/management/guns-admin/src/main/webapp/static/js/plugins/chosen/chosen.jquery.js
new file mode 100644
index 0000000..e7181e9
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/static/js/plugins/chosen/chosen.jquery.js
@@ -0,0 +1,1211 @@
+/*!
+ Chosen, a Select Box Enhancer for jQuery and Prototype
+ by Patrick Filler for Harvest, http://getharvest.com
+
+ Version 1.1.0
+ Full source at https://github.com/harvesthq/chosen
+ Copyright (c) 2011 Harvest http://getharvest.com
+
+ MIT License, https://github.com/harvesthq/chosen/blob/master/LICENSE.md
+ This file is generated by `grunt build`, do not edit it by hand.
+ */
+
+(function() {
+ var $, AbstractChosen, Chosen, SelectParser, _ref,
+ __hasProp = {}.hasOwnProperty,
+ __extends = function(child, parent) { for (var key in parent) { if (__hasProp.call(parent, key)) child[key] = parent[key]; } function ctor() { this.constructor = child; } ctor.prototype = parent.prototype; child.prototype = new ctor(); child.__super__ = parent.prototype; return child; };
+
+ SelectParser = (function() {
+ function SelectParser() {
+ this.options_index = 0;
+ this.parsed = [];
+ }
+
+ SelectParser.prototype.add_node = function(child) {
+ if (child.nodeName.toUpperCase() === "OPTGROUP") {
+ return this.add_group(child);
+ } else {
+ return this.add_option(child);
+ }
+ };
+
+ SelectParser.prototype.add_group = function(group) {
+ var group_position, option, _i, _len, _ref, _results;
+ group_position = this.parsed.length;
+ this.parsed.push({
+ array_index: group_position,
+ group: true,
+ label: this.escapeExpression(group.label),
+ children: 0,
+ disabled: group.disabled
+ });
+ _ref = group.childNodes;
+ _results = [];
+ for (_i = 0, _len = _ref.length; _i < _len; _i++) {
+ option = _ref[_i];
+ _results.push(this.add_option(option, group_position, group.disabled));
+ }
+ return _results;
+ };
+
+ SelectParser.prototype.add_option = function(option, group_position, group_disabled) {
+ if (option.nodeName.toUpperCase() === "OPTION") {
+ if (option.text !== "") {
+ if (group_position != null) {
+ this.parsed[group_position].children += 1;
+ }
+ this.parsed.push({
+ array_index: this.parsed.length,
+ options_index: this.options_index,
+ value: option.value,
+ text: option.text,
+ html: option.innerHTML,
+ selected: option.selected,
+ disabled: group_disabled === true ? group_disabled : option.disabled,
+ group_array_index: group_position,
+ classes: option.className,
+ style: option.style.cssText
+ });
+ } else {
+ this.parsed.push({
+ array_index: this.parsed.length,
+ options_index: this.options_index,
+ empty: true
+ });
+ }
+ return this.options_index += 1;
+ }
+ };
+
+ SelectParser.prototype.escapeExpression = function(text) {
+ var map, unsafe_chars;
+ if ((text == null) || text === false) {
+ return "";
+ }
+ if (!/[\&\<\>\"\'\`]/.test(text)) {
+ return text;
+ }
+ map = {
+ "<": "<",
+ ">": ">",
+ '"': """,
+ "'": "'",
+ "`": "`"
+ };
+ unsafe_chars = /&(?!\w+;)|[\<\>\"\'\`]/g;
+ return text.replace(unsafe_chars, function(chr) {
+ return map[chr] || "&";
+ });
+ };
+
+ return SelectParser;
+
+ })();
+
+ SelectParser.select_to_array = function(select) {
+ var child, parser, _i, _len, _ref;
+ parser = new SelectParser();
+ _ref = select.childNodes;
+ for (_i = 0, _len = _ref.length; _i < _len; _i++) {
+ child = _ref[_i];
+ parser.add_node(child);
+ }
+ return parser.parsed;
+ };
+
+ AbstractChosen = (function() {
+ function AbstractChosen(form_field, options) {
+ this.form_field = form_field;
+ this.options = options != null ? options : {};
+ if (!AbstractChosen.browser_is_supported()) {
+ return;
+ }
+ this.is_multiple = this.form_field.multiple;
+ this.set_default_text();
+ this.set_default_values();
+ this.setup();
+ this.set_up_html();
+ this.register_observers();
+ }
+
+ AbstractChosen.prototype.set_default_values = function() {
+ var _this = this;
+ this.click_test_action = function(evt) {
+ return _this.test_active_click(evt);
+ };
+ this.activate_action = function(evt) {
+ return _this.activate_field(evt);
+ };
+ this.active_field = false;
+ this.mouse_on_container = false;
+ this.results_showing = false;
+ this.result_highlighted = null;
+ this.allow_single_deselect = (this.options.allow_single_deselect != null) && (this.form_field.options[0] != null) && this.form_field.options[0].text === "" ? this.options.allow_single_deselect : false;
+ this.disable_search_threshold = this.options.disable_search_threshold || 0;
+ this.disable_search = this.options.disable_search || false;
+ this.enable_split_word_search = this.options.enable_split_word_search != null ? this.options.enable_split_word_search : true;
+ this.group_search = this.options.group_search != null ? this.options.group_search : true;
+ this.search_contains = this.options.search_contains || false;
+ this.single_backstroke_delete = this.options.single_backstroke_delete != null ? this.options.single_backstroke_delete : true;
+ this.max_selected_options = this.options.max_selected_options || Infinity;
+ this.inherit_select_classes = this.options.inherit_select_classes || false;
+ this.display_selected_options = this.options.display_selected_options != null ? this.options.display_selected_options : true;
+ return this.display_disabled_options = this.options.display_disabled_options != null ? this.options.display_disabled_options : true;
+ };
+
+ AbstractChosen.prototype.set_default_text = function() {
+ if (this.form_field.getAttribute("data-placeholder")) {
+ this.default_text = this.form_field.getAttribute("data-placeholder");
+ } else if (this.is_multiple) {
+ this.default_text = this.options.placeholder_text_multiple || this.options.placeholder_text || AbstractChosen.default_multiple_text;
+ } else {
+ this.default_text = this.options.placeholder_text_single || this.options.placeholder_text || AbstractChosen.default_single_text;
+ }
+ return this.results_none_found = this.form_field.getAttribute("data-no_results_text") || this.options.no_results_text || AbstractChosen.default_no_result_text;
+ };
+
+ AbstractChosen.prototype.mouse_enter = function() {
+ return this.mouse_on_container = true;
+ };
+
+ AbstractChosen.prototype.mouse_leave = function() {
+ return this.mouse_on_container = false;
+ };
+
+ AbstractChosen.prototype.input_focus = function(evt) {
+ var _this = this;
+ if (this.is_multiple) {
+ if (!this.active_field) {
+ return setTimeout((function() {
+ return _this.container_mousedown();
+ }), 50);
+ }
+ } else {
+ if (!this.active_field) {
+ return this.activate_field();
+ }
+ }
+ };
+
+ AbstractChosen.prototype.input_blur = function(evt) {
+ var _this = this;
+ if (!this.mouse_on_container) {
+ this.active_field = false;
+ return setTimeout((function() {
+ return _this.blur_test();
+ }), 100);
+ }
+ };
+
+ AbstractChosen.prototype.results_option_build = function(options) {
+ var content, data, _i, _len, _ref;
+ content = '';
+ _ref = this.results_data;
+ for (_i = 0, _len = _ref.length; _i < _len; _i++) {
+ data = _ref[_i];
+ if (data.group) {
+ content += this.result_add_group(data);
+ } else {
+ content += this.result_add_option(data);
+ }
+ if (options != null ? options.first : void 0) {
+ if (data.selected && this.is_multiple) {
+ this.choice_build(data);
+ } else if (data.selected && !this.is_multiple) {
+ this.single_set_selected_text(data.text);
+ }
+ }
+ }
+ return content;
+ };
+
+ AbstractChosen.prototype.result_add_option = function(option) {
+ var classes, option_el;
+ if (!option.search_match) {
+ return '';
+ }
+ if (!this.include_option_in_results(option)) {
+ return '';
+ }
+ classes = [];
+ if (!option.disabled && !(option.selected && this.is_multiple)) {
+ classes.push("active-result");
+ }
+ if (option.disabled && !(option.selected && this.is_multiple)) {
+ classes.push("disabled-result");
+ }
+ if (option.selected) {
+ classes.push("result-selected");
+ }
+ if (option.group_array_index != null) {
+ classes.push("group-option");
+ }
+ if (option.classes !== "") {
+ classes.push(option.classes);
+ }
+ option_el = document.createElement("li");
+ option_el.className = classes.join(" ");
+ option_el.style.cssText = option.style;
+ option_el.setAttribute("data-option-array-index", option.array_index);
+ option_el.innerHTML = option.search_text;
+ return this.outerHTML(option_el);
+ };
+
+ AbstractChosen.prototype.result_add_group = function(group) {
+ var group_el;
+ if (!(group.search_match || group.group_match)) {
+ return '';
+ }
+ if (!(group.active_options > 0)) {
+ return '';
+ }
+ group_el = document.createElement("li");
+ group_el.className = "group-result";
+ group_el.innerHTML = group.search_text;
+ return this.outerHTML(group_el);
+ };
+
+ AbstractChosen.prototype.results_update_field = function() {
+ this.set_default_text();
+ if (!this.is_multiple) {
+ this.results_reset_cleanup();
+ }
+ this.result_clear_highlight();
+ this.results_build();
+ if (this.results_showing) {
+ return this.winnow_results();
+ }
+ };
+
+ AbstractChosen.prototype.reset_single_select_options = function() {
+ var result, _i, _len, _ref, _results;
+ _ref = this.results_data;
+ _results = [];
+ for (_i = 0, _len = _ref.length; _i < _len; _i++) {
+ result = _ref[_i];
+ if (result.selected) {
+ _results.push(result.selected = false);
+ } else {
+ _results.push(void 0);
+ }
+ }
+ return _results;
+ };
+
+ AbstractChosen.prototype.results_toggle = function() {
+ if (this.results_showing) {
+ return this.results_hide();
+ } else {
+ return this.results_show();
+ }
+ };
+
+ AbstractChosen.prototype.results_search = function(evt) {
+ if (this.results_showing) {
+ return this.winnow_results();
+ } else {
+ return this.results_show();
+ }
+ };
+
+ AbstractChosen.prototype.winnow_results = function() {
+ var escapedSearchText, option, regex, regexAnchor, results, results_group, searchText, startpos, text, zregex, _i, _len, _ref;
+ this.no_results_clear();
+ results = 0;
+ searchText = this.get_search_text();
+ escapedSearchText = searchText.replace(/[-[\]{}()*+?.,\\^$|#\s]/g, "\\$&");
+ regexAnchor = this.search_contains ? "" : "^";
+ regex = new RegExp(regexAnchor + escapedSearchText, 'i');
+ zregex = new RegExp(escapedSearchText, 'i');
+ _ref = this.results_data;
+ for (_i = 0, _len = _ref.length; _i < _len; _i++) {
+ option = _ref[_i];
+ option.search_match = false;
+ results_group = null;
+ if (this.include_option_in_results(option)) {
+ if (option.group) {
+ option.group_match = false;
+ option.active_options = 0;
+ }
+ if ((option.group_array_index != null) && this.results_data[option.group_array_index]) {
+ results_group = this.results_data[option.group_array_index];
+ if (results_group.active_options === 0 && results_group.search_match) {
+ results += 1;
+ }
+ results_group.active_options += 1;
+ }
+ if (!(option.group && !this.group_search)) {
+ option.search_text = option.group ? option.label : option.html;
+ option.search_match = this.search_string_match(option.search_text, regex);
+ if (option.search_match && !option.group) {
+ results += 1;
+ }
+ if (option.search_match) {
+ if (searchText.length) {
+ startpos = option.search_text.search(zregex);
+ text = option.search_text.substr(0, startpos + searchText.length) + '</em>' + option.search_text.substr(startpos + searchText.length);
+ option.search_text = text.substr(0, startpos) + '<em>' + text.substr(startpos);
+ }
+ if (results_group != null) {
+ results_group.group_match = true;
+ }
+ } else if ((option.group_array_index != null) && this.results_data[option.group_array_index].search_match) {
+ option.search_match = true;
+ }
+ }
+ }
+ }
+ this.result_clear_highlight();
+ if (results < 1 && searchText.length) {
+ this.update_results_content("");
+ return this.no_results(searchText);
+ } else {
+ this.update_results_content(this.results_option_build());
+ return this.winnow_results_set_highlight();
+ }
+ };
+
+ AbstractChosen.prototype.search_string_match = function(search_string, regex) {
+ var part, parts, _i, _len;
+ if (regex.test(search_string)) {
+ return true;
+ } else if (this.enable_split_word_search && (search_string.indexOf(" ") >= 0 || search_string.indexOf("[") === 0)) {
+ parts = search_string.replace(/\[|\]/g, "").split(" ");
+ if (parts.length) {
+ for (_i = 0, _len = parts.length; _i < _len; _i++) {
+ part = parts[_i];
+ if (regex.test(part)) {
+ return true;
+ }
+ }
+ }
+ }
+ };
+
+ AbstractChosen.prototype.choices_count = function() {
+ var option, _i, _len, _ref;
+ if (this.selected_option_count != null) {
+ return this.selected_option_count;
+ }
+ this.selected_option_count = 0;
+ _ref = this.form_field.options;
+ for (_i = 0, _len = _ref.length; _i < _len; _i++) {
+ option = _ref[_i];
+ if (option.selected) {
+ this.selected_option_count += 1;
+ }
+ }
+ return this.selected_option_count;
+ };
+
+ AbstractChosen.prototype.choices_click = function(evt) {
+ evt.preventDefault();
+ if (!(this.results_showing || this.is_disabled)) {
+ return this.results_show();
+ }
+ };
+
+ AbstractChosen.prototype.keyup_checker = function(evt) {
+ var stroke, _ref;
+ stroke = (_ref = evt.which) != null ? _ref : evt.keyCode;
+ this.search_field_scale();
+ switch (stroke) {
+ case 8:
+ if (this.is_multiple && this.backstroke_length < 1 && this.choices_count() > 0) {
+ return this.keydown_backstroke();
+ } else if (!this.pending_backstroke) {
+ this.result_clear_highlight();
+ return this.results_search();
+ }
+ break;
+ case 13:
+ evt.preventDefault();
+ if (this.results_showing) {
+ return this.result_select(evt);
+ }
+ break;
+ case 27:
+ if (this.results_showing) {
+ this.results_hide();
+ }
+ return true;
+ case 9:
+ case 38:
+ case 40:
+ case 16:
+ case 91:
+ case 17:
+ break;
+ default:
+ return this.results_search();
+ }
+ };
+
+ AbstractChosen.prototype.clipboard_event_checker = function(evt) {
+ var _this = this;
+ return setTimeout((function() {
+ return _this.results_search();
+ }), 50);
+ };
+
+ AbstractChosen.prototype.container_width = function() {
+ if (this.options.width != null) {
+ return this.options.width;
+ } else {
+ return "" + this.form_field.offsetWidth + "px";
+ }
+ };
+
+ AbstractChosen.prototype.include_option_in_results = function(option) {
+ if (this.is_multiple && (!this.display_selected_options && option.selected)) {
+ return false;
+ }
+ if (!this.display_disabled_options && option.disabled) {
+ return false;
+ }
+ if (option.empty) {
+ return false;
+ }
+ return true;
+ };
+
+ AbstractChosen.prototype.search_results_touchstart = function(evt) {
+ this.touch_started = true;
+ return this.search_results_mouseover(evt);
+ };
+
+ AbstractChosen.prototype.search_results_touchmove = function(evt) {
+ this.touch_started = false;
+ return this.search_results_mouseout(evt);
+ };
+
+ AbstractChosen.prototype.search_results_touchend = function(evt) {
+ if (this.touch_started) {
+ return this.search_results_mouseup(evt);
+ }
+ };
+
+ AbstractChosen.prototype.outerHTML = function(element) {
+ var tmp;
+ if (element.outerHTML) {
+ return element.outerHTML;
+ }
+ tmp = document.createElement("div");
+ tmp.appendChild(element);
+ return tmp.innerHTML;
+ };
+
+ AbstractChosen.browser_is_supported = function() {
+ if (window.navigator.appName === "Microsoft Internet Explorer") {
+ return document.documentMode >= 8;
+ }
+ if (/iP(od|hone)/i.test(window.navigator.userAgent)) {
+ return false;
+ }
+ if (/Android/i.test(window.navigator.userAgent)) {
+ if (/Mobile/i.test(window.navigator.userAgent)) {
+ return false;
+ }
+ }
+ return true;
+ };
+
+ AbstractChosen.default_multiple_text = "Select Some Options";
+
+ AbstractChosen.default_single_text = "Select an Option";
+
+ AbstractChosen.default_no_result_text = "No results match";
+
+ return AbstractChosen;
+
+ })();
+
+ $ = jQuery;
+
+ $.fn.extend({
+ chosen: function(options) {
+ if (!AbstractChosen.browser_is_supported()) {
+ return this;
+ }
+ return this.each(function(input_field) {
+ var $this, chosen;
+ $this = $(this);
+ chosen = $this.data('chosen');
+ if (options === 'destroy' && chosen) {
+ chosen.destroy();
+ } else if (!chosen) {
+ $this.data('chosen', new Chosen(this, options));
+ }
+ });
+ }
+ });
+
+ Chosen = (function(_super) {
+ __extends(Chosen, _super);
+
+ function Chosen() {
+ _ref = Chosen.__super__.constructor.apply(this, arguments);
+ return _ref;
+ }
+
+ Chosen.prototype.setup = function() {
+ this.form_field_jq = $(this.form_field);
+ this.current_selectedIndex = this.form_field.selectedIndex;
+ return this.is_rtl = this.form_field_jq.hasClass("chosen-rtl");
+ };
+
+ Chosen.prototype.set_up_html = function() {
+ var container_classes, container_props;
+ container_classes = ["chosen-container"];
+ container_classes.push("chosen-container-" + (this.is_multiple ? "multi" : "single"));
+ if (this.inherit_select_classes && this.form_field.className) {
+ container_classes.push(this.form_field.className);
+ }
+ if (this.is_rtl) {
+ container_classes.push("chosen-rtl");
+ }
+ container_props = {
+ 'class': container_classes.join(' '),
+ 'style': "width: " + (this.container_width()) + ";",
+ 'title': this.form_field.title
+ };
+ if (this.form_field.id.length) {
+ container_props.id = this.form_field.id.replace(/[^\w]/g, '_') + "_chosen";
+ }
+ this.container = $("<div />", container_props);
+ if (this.is_multiple) {
+ this.container.html('<ul class="chosen-choices"><li class="search-field"><input type="text" value="' + this.default_text + '" class="default" autocomplete="off" style="width:25px;" /></li></ul><div class="chosen-drop"><ul class="chosen-results"></ul></div>');
+ } else {
+ this.container.html('<a class="chosen-single chosen-default" tabindex="-1"><span>' + this.default_text + '</span><div><b></b></div></a><div class="chosen-drop"><div class="chosen-search"><input type="text" autocomplete="off" /></div><ul class="chosen-results"></ul></div>');
+ }
+ this.form_field_jq.hide().after(this.container);
+ this.dropdown = this.container.find('div.chosen-drop').first();
+ this.search_field = this.container.find('input').first();
+ this.search_results = this.container.find('ul.chosen-results').first();
+ this.search_field_scale();
+ this.search_no_results = this.container.find('li.no-results').first();
+ if (this.is_multiple) {
+ this.search_choices = this.container.find('ul.chosen-choices').first();
+ this.search_container = this.container.find('li.search-field').first();
+ } else {
+ this.search_container = this.container.find('div.chosen-search').first();
+ this.selected_item = this.container.find('.chosen-single').first();
+ }
+ this.results_build();
+ this.set_tab_index();
+ this.set_label_behavior();
+ return this.form_field_jq.trigger("chosen:ready", {
+ chosen: this
+ });
+ };
+
+ Chosen.prototype.register_observers = function() {
+ var _this = this;
+ this.container.bind('mousedown.chosen', function(evt) {
+ _this.container_mousedown(evt);
+ });
+ this.container.bind('mouseup.chosen', function(evt) {
+ _this.container_mouseup(evt);
+ });
+ this.container.bind('mouseenter.chosen', function(evt) {
+ _this.mouse_enter(evt);
+ });
+ this.container.bind('mouseleave.chosen', function(evt) {
+ _this.mouse_leave(evt);
+ });
+ this.search_results.bind('mouseup.chosen', function(evt) {
+ _this.search_results_mouseup(evt);
+ });
+ this.search_results.bind('mouseover.chosen', function(evt) {
+ _this.search_results_mouseover(evt);
+ });
+ this.search_results.bind('mouseout.chosen', function(evt) {
+ _this.search_results_mouseout(evt);
+ });
+ this.search_results.bind('mousewheel.chosen DOMMouseScroll.chosen', function(evt) {
+ _this.search_results_mousewheel(evt);
+ });
+ this.search_results.bind('touchstart.chosen', function(evt) {
+ _this.search_results_touchstart(evt);
+ });
+ this.search_results.bind('touchmove.chosen', function(evt) {
+ _this.search_results_touchmove(evt);
+ });
+ this.search_results.bind('touchend.chosen', function(evt) {
+ _this.search_results_touchend(evt);
+ });
+ this.form_field_jq.bind("chosen:updated.chosen", function(evt) {
+ _this.results_update_field(evt);
+ });
+ this.form_field_jq.bind("chosen:activate.chosen", function(evt) {
+ _this.activate_field(evt);
+ });
+ this.form_field_jq.bind("chosen:open.chosen", function(evt) {
+ _this.container_mousedown(evt);
+ });
+ this.form_field_jq.bind("chosen:close.chosen", function(evt) {
+ _this.input_blur(evt);
+ });
+ this.search_field.bind('blur.chosen', function(evt) {
+ _this.input_blur(evt);
+ });
+ this.search_field.bind('keyup.chosen', function(evt) {
+ _this.keyup_checker(evt);
+ });
+ this.search_field.bind('keydown.chosen', function(evt) {
+ _this.keydown_checker(evt);
+ });
+ this.search_field.bind('focus.chosen', function(evt) {
+ _this.input_focus(evt);
+ });
+ this.search_field.bind('cut.chosen', function(evt) {
+ _this.clipboard_event_checker(evt);
+ });
+ this.search_field.bind('paste.chosen', function(evt) {
+ _this.clipboard_event_checker(evt);
+ });
+ if (this.is_multiple) {
+ return this.search_choices.bind('click.chosen', function(evt) {
+ _this.choices_click(evt);
+ });
+ } else {
+ return this.container.bind('click.chosen', function(evt) {
+ evt.preventDefault();
+ });
+ }
+ };
+
+ Chosen.prototype.destroy = function() {
+ $(this.container[0].ownerDocument).unbind("click.chosen", this.click_test_action);
+ if (this.search_field[0].tabIndex) {
+ this.form_field_jq[0].tabIndex = this.search_field[0].tabIndex;
+ }
+ this.container.remove();
+ this.form_field_jq.removeData('chosen');
+ return this.form_field_jq.show();
+ };
+
+ Chosen.prototype.search_field_disabled = function() {
+ this.is_disabled = this.form_field_jq[0].disabled;
+ if (this.is_disabled) {
+ this.container.addClass('chosen-disabled');
+ this.search_field[0].disabled = true;
+ if (!this.is_multiple) {
+ this.selected_item.unbind("focus.chosen", this.activate_action);
+ }
+ return this.close_field();
+ } else {
+ this.container.removeClass('chosen-disabled');
+ this.search_field[0].disabled = false;
+ if (!this.is_multiple) {
+ return this.selected_item.bind("focus.chosen", this.activate_action);
+ }
+ }
+ };
+
+ Chosen.prototype.container_mousedown = function(evt) {
+ if (!this.is_disabled) {
+ if (evt && evt.type === "mousedown" && !this.results_showing) {
+ evt.preventDefault();
+ }
+ if (!((evt != null) && ($(evt.target)).hasClass("search-choice-close"))) {
+ if (!this.active_field) {
+ if (this.is_multiple) {
+ this.search_field.val("");
+ }
+ $(this.container[0].ownerDocument).bind('click.chosen', this.click_test_action);
+ this.results_show();
+ } else if (!this.is_multiple && evt && (($(evt.target)[0] === this.selected_item[0]) || $(evt.target).parents("a.chosen-single").length)) {
+ evt.preventDefault();
+ this.results_toggle();
+ }
+ return this.activate_field();
+ }
+ }
+ };
+
+ Chosen.prototype.container_mouseup = function(evt) {
+ if (evt.target.nodeName === "ABBR" && !this.is_disabled) {
+ return this.results_reset(evt);
+ }
+ };
+
+ Chosen.prototype.search_results_mousewheel = function(evt) {
+ var delta;
+ if (evt.originalEvent) {
+ delta = -evt.originalEvent.wheelDelta || evt.originalEvent.detail;
+ }
+ if (delta != null) {
+ evt.preventDefault();
+ if (evt.type === 'DOMMouseScroll') {
+ delta = delta * 40;
+ }
+ return this.search_results.scrollTop(delta + this.search_results.scrollTop());
+ }
+ };
+
+ Chosen.prototype.blur_test = function(evt) {
+ if (!this.active_field && this.container.hasClass("chosen-container-active")) {
+ return this.close_field();
+ }
+ };
+
+ Chosen.prototype.close_field = function() {
+ $(this.container[0].ownerDocument).unbind("click.chosen", this.click_test_action);
+ this.active_field = false;
+ this.results_hide();
+ this.container.removeClass("chosen-container-active");
+ this.clear_backstroke();
+ this.show_search_field_default();
+ return this.search_field_scale();
+ };
+
+ Chosen.prototype.activate_field = function() {
+ this.container.addClass("chosen-container-active");
+ this.active_field = true;
+ this.search_field.val(this.search_field.val());
+ return this.search_field.focus();
+ };
+
+ Chosen.prototype.test_active_click = function(evt) {
+ var active_container;
+ active_container = $(evt.target).closest('.chosen-container');
+ if (active_container.length && this.container[0] === active_container[0]) {
+ return this.active_field = true;
+ } else {
+ return this.close_field();
+ }
+ };
+
+ Chosen.prototype.results_build = function() {
+ this.parsing = true;
+ this.selected_option_count = null;
+ this.results_data = SelectParser.select_to_array(this.form_field);
+ if (this.is_multiple) {
+ this.search_choices.find("li.search-choice").remove();
+ } else if (!this.is_multiple) {
+ this.single_set_selected_text();
+ if (this.disable_search || this.form_field.options.length <= this.disable_search_threshold) {
+ this.search_field[0].readOnly = true;
+ this.container.addClass("chosen-container-single-nosearch");
+ } else {
+ this.search_field[0].readOnly = false;
+ this.container.removeClass("chosen-container-single-nosearch");
+ }
+ }
+ this.update_results_content(this.results_option_build({
+ first: true
+ }));
+ this.search_field_disabled();
+ this.show_search_field_default();
+ this.search_field_scale();
+ return this.parsing = false;
+ };
+
+ Chosen.prototype.result_do_highlight = function(el) {
+ var high_bottom, high_top, maxHeight, visible_bottom, visible_top;
+ if (el.length) {
+ this.result_clear_highlight();
+ this.result_highlight = el;
+ this.result_highlight.addClass("highlighted");
+ maxHeight = parseInt(this.search_results.css("maxHeight"), 10);
+ visible_top = this.search_results.scrollTop();
+ visible_bottom = maxHeight + visible_top;
+ high_top = this.result_highlight.position().top + this.search_results.scrollTop();
+ high_bottom = high_top + this.result_highlight.outerHeight();
+ if (high_bottom >= visible_bottom) {
+ return this.search_results.scrollTop((high_bottom - maxHeight) > 0 ? high_bottom - maxHeight : 0);
+ } else if (high_top < visible_top) {
+ return this.search_results.scrollTop(high_top);
+ }
+ }
+ };
+
+ Chosen.prototype.result_clear_highlight = function() {
+ if (this.result_highlight) {
+ this.result_highlight.removeClass("highlighted");
+ }
+ return this.result_highlight = null;
+ };
+
+ Chosen.prototype.results_show = function() {
+ if (this.is_multiple && this.max_selected_options <= this.choices_count()) {
+ this.form_field_jq.trigger("chosen:maxselected", {
+ chosen: this
+ });
+ return false;
+ }
+ this.container.addClass("chosen-with-drop");
+ this.results_showing = true;
+ this.search_field.focus();
+ this.search_field.val(this.search_field.val());
+ this.winnow_results();
+ return this.form_field_jq.trigger("chosen:showing_dropdown", {
+ chosen: this
+ });
+ };
+
+ Chosen.prototype.update_results_content = function(content) {
+ return this.search_results.html(content);
+ };
+
+ Chosen.prototype.results_hide = function() {
+ if (this.results_showing) {
+ this.result_clear_highlight();
+ this.container.removeClass("chosen-with-drop");
+ this.form_field_jq.trigger("chosen:hiding_dropdown", {
+ chosen: this
+ });
+ }
+ return this.results_showing = false;
+ };
+
+ Chosen.prototype.set_tab_index = function(el) {
+ var ti;
+ if (this.form_field.tabIndex) {
+ ti = this.form_field.tabIndex;
+ this.form_field.tabIndex = -1;
+ return this.search_field[0].tabIndex = ti;
+ }
+ };
+
+ Chosen.prototype.set_label_behavior = function() {
+ var _this = this;
+ this.form_field_label = this.form_field_jq.parents("label");
+ if (!this.form_field_label.length && this.form_field.id.length) {
+ this.form_field_label = $("label[for='" + this.form_field.id + "']");
+ }
+ if (this.form_field_label.length > 0) {
+ return this.form_field_label.bind('click.chosen', function(evt) {
+ if (_this.is_multiple) {
+ return _this.container_mousedown(evt);
+ } else {
+ return _this.activate_field();
+ }
+ });
+ }
+ };
+
+ Chosen.prototype.show_search_field_default = function() {
+ if (this.is_multiple && this.choices_count() < 1 && !this.active_field) {
+ this.search_field.val(this.default_text);
+ return this.search_field.addClass("default");
+ } else {
+ this.search_field.val("");
+ return this.search_field.removeClass("default");
+ }
+ };
+
+ Chosen.prototype.search_results_mouseup = function(evt) {
+ var target;
+ target = $(evt.target).hasClass("active-result") ? $(evt.target) : $(evt.target).parents(".active-result").first();
+ if (target.length) {
+ this.result_highlight = target;
+ this.result_select(evt);
+ return this.search_field.focus();
+ }
+ };
+
+ Chosen.prototype.search_results_mouseover = function(evt) {
+ var target;
+ target = $(evt.target).hasClass("active-result") ? $(evt.target) : $(evt.target).parents(".active-result").first();
+ if (target) {
+ return this.result_do_highlight(target);
+ }
+ };
+
+ Chosen.prototype.search_results_mouseout = function(evt) {
+ if ($(evt.target).hasClass("active-result" || $(evt.target).parents('.active-result').first())) {
+ return this.result_clear_highlight();
+ }
+ };
+
+ Chosen.prototype.choice_build = function(item) {
+ var choice, close_link,
+ _this = this;
+ choice = $('<li />', {
+ "class": "search-choice"
+ }).html("<span>" + item.html + "</span>");
+ if (item.disabled) {
+ choice.addClass('search-choice-disabled');
+ } else {
+ close_link = $('<a />', {
+ "class": 'search-choice-close',
+ 'data-option-array-index': item.array_index
+ });
+ close_link.bind('click.chosen', function(evt) {
+ return _this.choice_destroy_link_click(evt);
+ });
+ choice.append(close_link);
+ }
+ return this.search_container.before(choice);
+ };
+
+ Chosen.prototype.choice_destroy_link_click = function(evt) {
+ evt.preventDefault();
+ evt.stopPropagation();
+ if (!this.is_disabled) {
+ return this.choice_destroy($(evt.target));
+ }
+ };
+
+ Chosen.prototype.choice_destroy = function(link) {
+ if (this.result_deselect(link[0].getAttribute("data-option-array-index"))) {
+ this.show_search_field_default();
+ if (this.is_multiple && this.choices_count() > 0 && this.search_field.val().length < 1) {
+ this.results_hide();
+ }
+ link.parents('li').first().remove();
+ return this.search_field_scale();
+ }
+ };
+
+ Chosen.prototype.results_reset = function() {
+ this.reset_single_select_options();
+ this.form_field.options[0].selected = true;
+ this.single_set_selected_text();
+ this.show_search_field_default();
+ this.results_reset_cleanup();
+ this.form_field_jq.trigger("change");
+ if (this.active_field) {
+ return this.results_hide();
+ }
+ };
+
+ Chosen.prototype.results_reset_cleanup = function() {
+ this.current_selectedIndex = this.form_field.selectedIndex;
+ return this.selected_item.find("abbr").remove();
+ };
+
+ Chosen.prototype.result_select = function(evt) {
+ var high, item;
+ if (this.result_highlight) {
+ high = this.result_highlight;
+ this.result_clear_highlight();
+ if (this.is_multiple && this.max_selected_options <= this.choices_count()) {
+ this.form_field_jq.trigger("chosen:maxselected", {
+ chosen: this
+ });
+ return false;
+ }
+ if (this.is_multiple) {
+ high.removeClass("active-result");
+ } else {
+ this.reset_single_select_options();
+ }
+ item = this.results_data[high[0].getAttribute("data-option-array-index")];
+ item.selected = true;
+ this.form_field.options[item.options_index].selected = true;
+ this.selected_option_count = null;
+ if (this.is_multiple) {
+ this.choice_build(item);
+ } else {
+ this.single_set_selected_text(item.text);
+ }
+ if (!((evt.metaKey || evt.ctrlKey) && this.is_multiple)) {
+ this.results_hide();
+ }
+ this.search_field.val("");
+ if (this.is_multiple || this.form_field.selectedIndex !== this.current_selectedIndex) {
+ this.form_field_jq.trigger("change", {
+ 'selected': this.form_field.options[item.options_index].value
+ });
+ }
+ this.current_selectedIndex = this.form_field.selectedIndex;
+ return this.search_field_scale();
+ }
+ };
+
+ Chosen.prototype.single_set_selected_text = function(text) {
+ if (text == null) {
+ text = this.default_text;
+ }
+ if (text === this.default_text) {
+ this.selected_item.addClass("chosen-default");
+ } else {
+ this.single_deselect_control_build();
+ this.selected_item.removeClass("chosen-default");
+ }
+ return this.selected_item.find("span").text(text);
+ };
+
+ Chosen.prototype.result_deselect = function(pos) {
+ var result_data;
+ result_data = this.results_data[pos];
+ if (!this.form_field.options[result_data.options_index].disabled) {
+ result_data.selected = false;
+ this.form_field.options[result_data.options_index].selected = false;
+ this.selected_option_count = null;
+ this.result_clear_highlight();
+ if (this.results_showing) {
+ this.winnow_results();
+ }
+ this.form_field_jq.trigger("change", {
+ deselected: this.form_field.options[result_data.options_index].value
+ });
+ this.search_field_scale();
+ return true;
+ } else {
+ return false;
+ }
+ };
+
+ Chosen.prototype.single_deselect_control_build = function() {
+ if (!this.allow_single_deselect) {
+ return;
+ }
+ if (!this.selected_item.find("abbr").length) {
+ this.selected_item.find("span").first().after("<abbr class=\"search-choice-close\"></abbr>");
+ }
+ return this.selected_item.addClass("chosen-single-with-deselect");
+ };
+
+ Chosen.prototype.get_search_text = function() {
+ if (this.search_field.val() === this.default_text) {
+ return "";
+ } else {
+ return $('<div/>').text($.trim(this.search_field.val())).html();
+ }
+ };
+
+ Chosen.prototype.winnow_results_set_highlight = function() {
+ var do_high, selected_results;
+ selected_results = !this.is_multiple ? this.search_results.find(".result-selected.active-result") : [];
+ do_high = selected_results.length ? selected_results.first() : this.search_results.find(".active-result").first();
+ if (do_high != null) {
+ return this.result_do_highlight(do_high);
+ }
+ };
+
+ Chosen.prototype.no_results = function(terms) {
+ var no_results_html;
+ no_results_html = $('<li class="no-results">' + this.results_none_found + ' "<span></span>"</li>');
+ no_results_html.find("span").first().html(terms);
+ this.search_results.append(no_results_html);
+ return this.form_field_jq.trigger("chosen:no_results", {
+ chosen: this
+ });
+ };
+
+ Chosen.prototype.no_results_clear = function() {
+ return this.search_results.find(".no-results").remove();
+ };
+
+ Chosen.prototype.keydown_arrow = function() {
+ var next_sib;
+ if (this.results_showing && this.result_highlight) {
+ next_sib = this.result_highlight.nextAll("li.active-result").first();
+ if (next_sib) {
+ return this.result_do_highlight(next_sib);
+ }
+ } else {
+ return this.results_show();
+ }
+ };
+
+ Chosen.prototype.keyup_arrow = function() {
+ var prev_sibs;
+ if (!this.results_showing && !this.is_multiple) {
+ return this.results_show();
+ } else if (this.result_highlight) {
+ prev_sibs = this.result_highlight.prevAll("li.active-result");
+ if (prev_sibs.length) {
+ return this.result_do_highlight(prev_sibs.first());
+ } else {
+ if (this.choices_count() > 0) {
+ this.results_hide();
+ }
+ return this.result_clear_highlight();
+ }
+ }
+ };
+
+ Chosen.prototype.keydown_backstroke = function() {
+ var next_available_destroy;
+ if (this.pending_backstroke) {
+ this.choice_destroy(this.pending_backstroke.find("a").first());
+ return this.clear_backstroke();
+ } else {
+ next_available_destroy = this.search_container.siblings("li.search-choice").last();
+ if (next_available_destroy.length && !next_available_destroy.hasClass("search-choice-disabled")) {
+ this.pending_backstroke = next_available_destroy;
+ if (this.single_backstroke_delete) {
+ return this.keydown_backstroke();
+ } else {
+ return this.pending_backstroke.addClass("search-choice-focus");
+ }
+ }
+ }
+ };
+
+ Chosen.prototype.clear_backstroke = function() {
+ if (this.pending_backstroke) {
+ this.pending_backstroke.removeClass("search-choice-focus");
+ }
+ return this.pending_backstroke = null;
+ };
+
+ Chosen.prototype.keydown_checker = function(evt) {
+ var stroke, _ref1;
+ stroke = (_ref1 = evt.which) != null ? _ref1 : evt.keyCode;
+ this.search_field_scale();
+ if (stroke !== 8 && this.pending_backstroke) {
+ this.clear_backstroke();
+ }
+ switch (stroke) {
+ case 8:
+ this.backstroke_length = this.search_field.val().length;
+ break;
+ case 9:
+ if (this.results_showing && !this.is_multiple) {
+ this.result_select(evt);
+ }
+ this.mouse_on_container = false;
+ break;
+ case 13:
+ evt.preventDefault();
+ break;
+ case 38:
+ evt.preventDefault();
+ this.keyup_arrow();
+ break;
+ case 40:
+ evt.preventDefault();
+ this.keydown_arrow();
+ break;
+ }
+ };
+
+ Chosen.prototype.search_field_scale = function() {
+ var div, f_width, h, style, style_block, styles, w, _i, _len;
+ if (this.is_multiple) {
+ h = 0;
+ w = 0;
+ style_block = "position:absolute; left: -1000px; top: -1000px; display:none;";
+ styles = ['font-size', 'font-style', 'font-weight', 'font-family', 'line-height', 'text-transform', 'letter-spacing'];
+ for (_i = 0, _len = styles.length; _i < _len; _i++) {
+ style = styles[_i];
+ style_block += style + ":" + this.search_field.css(style) + ";";
+ }
+ div = $('<div />', {
+ 'style': style_block
+ });
+ div.text(this.search_field.val());
+ $('body').append(div);
+ w = div.width() + 25;
+ div.remove();
+ f_width = this.container.outerWidth();
+ if (w > f_width - 10) {
+ w = f_width - 10;
+ }
+ return this.search_field.css({
+ 'width': w + 'px'
+ });
+ }
+ };
+
+ return Chosen;
+
+ })(AbstractChosen);
+
+}).call(this);
diff --git a/management/guns-admin/src/main/webapp/static/js/plugins/highcharts/adapters/mootools-adapter.js b/management/guns-admin/src/main/webapp/static/js/plugins/highcharts/adapters/mootools-adapter.js
new file mode 100644
index 0000000..98446dd
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/static/js/plugins/highcharts/adapters/mootools-adapter.js
@@ -0,0 +1,13 @@
+/*
+ Highcharts JS v2.2.5 (2012-06-08)
+ MooTools adapter
+
+ (c) 2010-2011 Torstein H?nsi
+
+ License: www.highcharts.com/license
+*/
+(function(){var e=window,i=document,f=e.MooTools.version.substring(0,3),g=f==="1.2"||f==="1.1",j=g||f==="1.3",h=e.$extend||function(){return Object.append.apply(Object,arguments)};e.HighchartsAdapter={init:function(a){var b=Fx.prototype,c=b.start,d=Fx.Morph.prototype,e=d.compute;b.start=function(b,d){var e=this.element;if(b.d)this.paths=a.init(e,e.d,this.toD);c.apply(this,arguments);return this};d.compute=function(b,c,d){var f=this.paths;if(f)this.element.attr("d",a.step(f[0],f[1],d,this.toD));else return e.apply(this,
+arguments)}},adapterRun:function(a,b){return $(a).getStyle(b).toInt()},getScript:function(a,b){var c=i.getElementsByTagName("head")[0],d=i.createElement("script");d.type="text/javascript";d.src=a;d.onload=b;c.appendChild(d)},animate:function(a,b,c){var d=a.attr,f=c&&c.complete;if(d&&!a.setStyle)a.getStyle=a.attr,a.setStyle=function(){var b=arguments;a.attr.call(a,b[0],b[1][0])},a.$family=function(){return!0};e.HighchartsAdapter.stop(a);c=new Fx.Morph(d?a:$(a),h({transition:Fx.Transitions.Quad.easeInOut},
+c));if(d)c.element=a;if(b.d)c.toD=b.d;f&&c.addEvent("complete",f);c.start(b);a.fx=c},each:function(a,b){return g?$each(a,b):Array.each(a,b)},map:function(a,b){return a.map(b)},grep:function(a,b){return a.filter(b)},merge:function(){var a=arguments,b=[{}],c=a.length;if(g)a=$merge.apply(null,a);else{for(;c--;)typeof a[c]!=="boolean"&&(b[c+1]=a[c]);a=Object.merge.apply(Object,b)}return a},offset:function(a){a=$(a).getOffsets();return{left:a.x,top:a.y}},extendWithEvents:function(a){a.addEvent||(a.nodeName?
+$(a):h(a,new Events))},addEvent:function(a,b,c){typeof b==="string"&&(b==="unload"&&(b="beforeunload"),e.HighchartsAdapter.extendWithEvents(a),a.addEvent(b,c))},removeEvent:function(a,b,c){typeof a!=="string"&&(e.HighchartsAdapter.extendWithEvents(a),b?(b==="unload"&&(b="beforeunload"),c?a.removeEvent(b,c):a.removeEvents&&a.removeEvents(b)):a.removeEvents())},fireEvent:function(a,b,c,d){b={type:b,target:a};b=j?new Event(b):new DOMEvent(b);b=h(b,c);b.preventDefault=function(){d=null};a.fireEvent&&
+a.fireEvent(b.type,b);d&&d(b)},washMouseEvent:function(a){a.pageX=a.page.x;a.pageY=a.page.y;return a},stop:function(a){a.fx&&a.fx.cancel()}}})();
diff --git a/management/guns-admin/src/main/webapp/static/js/plugins/highcharts/adapters/mootools-adapter.src.js b/management/guns-admin/src/main/webapp/static/js/plugins/highcharts/adapters/mootools-adapter.src.js
new file mode 100644
index 0000000..a3caf93
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/static/js/plugins/highcharts/adapters/mootools-adapter.src.js
@@ -0,0 +1,321 @@
+/**
+ * @license Highcharts JS v2.2.5 (2012-06-08)
+ * MooTools adapter
+ *
+ * (c) 2010-2011 Torstein Hønsi
+ *
+ * License: www.highcharts.com/license
+ */
+
+// JSLint options:
+/*global Fx, $, $extend, $each, $merge, Events, Event, DOMEvent */
+
+(function () {
+
+var win = window,
+ doc = document,
+ mooVersion = win.MooTools.version.substring(0, 3), // Get the first three characters of the version number
+ legacy = mooVersion === '1.2' || mooVersion === '1.1', // 1.1 && 1.2 considered legacy, 1.3 is not.
+ legacyEvent = legacy || mooVersion === '1.3', // In versions 1.1 - 1.3 the event class is named Event, in newer versions it is named DOMEvent.
+ $extend = win.$extend || function () {
+ return Object.append.apply(Object, arguments);
+ };
+
+win.HighchartsAdapter = {
+ /**
+ * Initialize the adapter. This is run once as Highcharts is first run.
+ * @param {Object} pathAnim The helper object to do animations across adapters.
+ */
+ init: function (pathAnim) {
+ var fxProto = Fx.prototype,
+ fxStart = fxProto.start,
+ morphProto = Fx.Morph.prototype,
+ morphCompute = morphProto.compute;
+
+ // override Fx.start to allow animation of SVG element wrappers
+ /*jslint unparam: true*//* allow unused parameters in fx functions */
+ fxProto.start = function (from, to) {
+ var fx = this,
+ elem = fx.element;
+
+ // special for animating paths
+ if (from.d) {
+ //this.fromD = this.element.d.split(' ');
+ fx.paths = pathAnim.init(
+ elem,
+ elem.d,
+ fx.toD
+ );
+ }
+ fxStart.apply(fx, arguments);
+
+ return this; // chainable
+ };
+
+ // override Fx.step to allow animation of SVG element wrappers
+ morphProto.compute = function (from, to, delta) {
+ var fx = this,
+ paths = fx.paths;
+
+ if (paths) {
+ fx.element.attr(
+ 'd',
+ pathAnim.step(paths[0], paths[1], delta, fx.toD)
+ );
+ } else {
+ return morphCompute.apply(fx, arguments);
+ }
+ };
+ /*jslint unparam: false*/
+ },
+
+ /**
+ * Run a general method on the framework, following jQuery syntax
+ * @param {Object} el The HTML element
+ * @param {String} method Which method to run on the wrapped element
+ */
+ adapterRun: function (el, method) {
+
+ // This currently works for getting inner width and height. If adding
+ // more methods later, we need a conditional implementation for each.
+ return $(el).getStyle(method).toInt();
+
+ },
+
+ /**
+ * Downloads a script and executes a callback when done.
+ * @param {String} scriptLocation
+ * @param {Function} callback
+ */
+ getScript: function (scriptLocation, callback) {
+ // We cannot assume that Assets class from mootools-more is available so instead insert a script tag to download script.
+ var head = doc.getElementsByTagName('head')[0];
+ var script = doc.createElement('script');
+
+ script.type = 'text/javascript';
+ script.src = scriptLocation;
+ script.onload = callback;
+
+ head.appendChild(script);
+ },
+
+ /**
+ * Animate a HTML element or SVG element wrapper
+ * @param {Object} el
+ * @param {Object} params
+ * @param {Object} options jQuery-like animation options: duration, easing, callback
+ */
+ animate: function (el, params, options) {
+ var isSVGElement = el.attr,
+ effect,
+ complete = options && options.complete;
+
+ if (isSVGElement && !el.setStyle) {
+ // add setStyle and getStyle methods for internal use in Moo
+ el.getStyle = el.attr;
+ el.setStyle = function () { // property value is given as array in Moo - break it down
+ var args = arguments;
+ el.attr.call(el, args[0], args[1][0]);
+ };
+ // dirty hack to trick Moo into handling el as an element wrapper
+ el.$family = function () { return true; };
+ }
+
+ // stop running animations
+ win.HighchartsAdapter.stop(el);
+
+ // define and run the effect
+ effect = new Fx.Morph(
+ isSVGElement ? el : $(el),
+ $extend({
+ transition: Fx.Transitions.Quad.easeInOut
+ }, options)
+ );
+
+ // Make sure that the element reference is set when animating svg elements
+ if (isSVGElement) {
+ effect.element = el;
+ }
+
+ // special treatment for paths
+ if (params.d) {
+ effect.toD = params.d;
+ }
+
+ // jQuery-like events
+ if (complete) {
+ effect.addEvent('complete', complete);
+ }
+
+ // run
+ effect.start(params);
+
+ // record for use in stop method
+ el.fx = effect;
+ },
+
+ /**
+ * MooTool's each function
+ *
+ */
+ each: function (arr, fn) {
+ return legacy ?
+ $each(arr, fn) :
+ Array.each(arr, fn);
+ },
+
+ /**
+ * Map an array
+ * @param {Array} arr
+ * @param {Function} fn
+ */
+ map: function (arr, fn) {
+ return arr.map(fn);
+ },
+
+ /**
+ * Grep or filter an array
+ * @param {Array} arr
+ * @param {Function} fn
+ */
+ grep: function (arr, fn) {
+ return arr.filter(fn);
+ },
+
+ /**
+ * Deep merge two objects and return a third
+ */
+ merge: function () {
+ var args = arguments,
+ args13 = [{}], // MooTools 1.3+
+ i = args.length,
+ ret;
+
+ if (legacy) {
+ ret = $merge.apply(null, args);
+ } else {
+ while (i--) {
+ // Boolean argumens should not be merged.
+ // JQuery explicitly skips this, so we do it here as well.
+ if (typeof args[i] !== 'boolean') {
+ args13[i + 1] = args[i];
+ }
+ }
+ ret = Object.merge.apply(Object, args13);
+ }
+
+ return ret;
+ },
+
+ /**
+ * Get the offset of an element relative to the top left corner of the web page
+ */
+ offset: function (el) {
+ var offsets = $(el).getOffsets();
+ return {
+ left: offsets.x,
+ top: offsets.y
+ };
+ },
+
+ /**
+ * Extends an object with Events, if its not done
+ */
+ extendWithEvents: function (el) {
+ // if the addEvent method is not defined, el is a custom Highcharts object
+ // like series or point
+ if (!el.addEvent) {
+ if (el.nodeName) {
+ el = $(el); // a dynamically generated node
+ } else {
+ $extend(el, new Events()); // a custom object
+ }
+ }
+ },
+
+ /**
+ * Add an event listener
+ * @param {Object} el HTML element or custom object
+ * @param {String} type Event type
+ * @param {Function} fn Event handler
+ */
+ addEvent: function (el, type, fn) {
+ if (typeof type === 'string') { // chart broke due to el being string, type function
+
+ if (type === 'unload') { // Moo self destructs before custom unload events
+ type = 'beforeunload';
+ }
+
+ win.HighchartsAdapter.extendWithEvents(el);
+
+ el.addEvent(type, fn);
+ }
+ },
+
+ removeEvent: function (el, type, fn) {
+ if (typeof el === 'string') {
+ // el.removeEvents below apperantly calls this method again. Do not quite understand why, so for now just bail out.
+ return;
+ }
+
+ win.HighchartsAdapter.extendWithEvents(el);
+ if (type) {
+ if (type === 'unload') { // Moo self destructs before custom unload events
+ type = 'beforeunload';
+ }
+
+ if (fn) {
+ el.removeEvent(type, fn);
+ } else if (el.removeEvents) { // #958
+ el.removeEvents(type);
+ }
+ } else {
+ el.removeEvents();
+ }
+ },
+
+ fireEvent: function (el, event, eventArguments, defaultFunction) {
+ var eventArgs = {
+ type: event,
+ target: el
+ };
+ // create an event object that keeps all functions
+ event = legacyEvent ? new Event(eventArgs) : new DOMEvent(eventArgs);
+ event = $extend(event, eventArguments);
+ // override the preventDefault function to be able to use
+ // this for custom events
+ event.preventDefault = function () {
+ defaultFunction = null;
+ };
+ // if fireEvent is not available on the object, there hasn't been added
+ // any events to it above
+ if (el.fireEvent) {
+ el.fireEvent(event.type, event);
+ }
+
+ // fire the default if it is passed and it is not prevented above
+ if (defaultFunction) {
+ defaultFunction(event);
+ }
+ },
+
+ /**
+ * Set back e.pageX and e.pageY that MooTools has abstracted away
+ */
+ washMouseEvent: function (e) {
+ e.pageX = e.page.x;
+ e.pageY = e.page.y;
+ return e;
+ },
+
+ /**
+ * Stop running animations on the object
+ */
+ stop: function (el) {
+ if (el.fx) {
+ el.fx.cancel();
+ }
+ }
+};
+
+}());
diff --git a/management/guns-admin/src/main/webapp/static/js/plugins/highcharts/adapters/prototype-adapter.js b/management/guns-admin/src/main/webapp/static/js/plugins/highcharts/adapters/prototype-adapter.js
new file mode 100644
index 0000000..0a58d6b
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/static/js/plugins/highcharts/adapters/prototype-adapter.js
@@ -0,0 +1,16 @@
+/*
+ Highcharts JS v2.2.5 (2012-06-08)
+ Prototype adapter
+
+ @author Michael Nelson, Torstein H?nsi.
+
+ Feel free to use and modify this script.
+ Highcharts license: www.highcharts.com/license.
+*/
+var HighchartsAdapter=function(){var g=typeof Effect!=="undefined";return{init:function(c){if(g)Effect.HighchartsTransition=Class.create(Effect.Base,{initialize:function(a,b,d,e){var f;this.element=a;this.key=b;f=a.attr?a.attr(b):$(a).getStyle(b);if(b==="d")this.paths=c.init(a,a.d,d),this.toD=d,f=0,d=1;this.start(Object.extend(e||{},{from:f,to:d,attribute:b}))},setup:function(){HighchartsAdapter._extend(this.element);if(!this.element._highchart_animation)this.element._highchart_animation={};this.element._highchart_animation[this.key]=
+this},update:function(a){var b=this.paths,d=this.element;b&&(a=c.step(b[0],b[1],a,this.toD));d.attr?d.attr(this.options.attribute,a):(b={},b[this.options.attribute]=a,$(d).setStyle(b))},finish:function(){delete this.element._highchart_animation[this.key]}})},adapterRun:function(c,a){return parseInt($(c).getStyle(a),10)},getScript:function(c,a){var b=$$("head")[0];b&&b.appendChild((new Element("script",{type:"text/javascript",src:c})).observe("load",a))},addNS:function(c){var a=/^(?:click|mouse(?:down|up|over|move|out))$/;
+return/^(?:load|unload|abort|error|select|change|submit|reset|focus|blur|resize|scroll)$/.test(c)||a.test(c)?c:"h:"+c},addEvent:function(c,a,b){c.addEventListener||c.attachEvent?Event.observe($(c),HighchartsAdapter.addNS(a),b):(HighchartsAdapter._extend(c),c._highcharts_observe(a,b))},animate:function(c,a,b){var d,b=b||{};b.delay=0;b.duration=(b.duration||500)/1E3;b.afterFinish=b.complete;if(g)for(d in a)new Effect.HighchartsTransition($(c),d,a[d],b);else{if(c.attr)for(d in a)c.attr(d,a[d]);b.complete&&
+b.complete()}c.attr||$(c).setStyle(a)},stop:function(c){var a;if(c._highcharts_extended&&c._highchart_animation)for(a in c._highchart_animation)c._highchart_animation[a].cancel()},each:function(c,a){$A(c).each(a)},offset:function(c){return $(c).cumulativeOffset()},fireEvent:function(c,a,b,d){c.fire?c.fire(HighchartsAdapter.addNS(a),b):c._highcharts_extended&&(b=b||{},c._highcharts_fire(a,b));b&&b.defaultPrevented&&(d=null);d&&d(b)},removeEvent:function(c,a,b){$(c).stopObserving&&(a&&(a=HighchartsAdapter.addNS(a)),
+$(c).stopObserving(a,b));window===c?Event.stopObserving(c,a,b):(HighchartsAdapter._extend(c),c._highcharts_stop_observing(a,b))},washMouseEvent:function(c){return c},grep:function(c,a){return c.findAll(a)},map:function(c,a){return c.map(a)},merge:function(){function c(a,b){var d,e;for(e in b)d=b[e],a[e]=d&&typeof d==="object"&&d.constructor!==Array&&typeof d.nodeType!=="number"?c(a[e]||{},d):b[e];return a}return function(){var a=arguments,b,d={};for(b=0;b<a.length;b++)d=c(d,a[b]);return d}.apply(this,
+arguments)},_extend:function(c){c._highcharts_extended||Object.extend(c,{_highchart_events:{},_highchart_animation:null,_highcharts_extended:!0,_highcharts_observe:function(a,b){this._highchart_events[a]=[this._highchart_events[a],b].compact().flatten()},_highcharts_stop_observing:function(a,b){a?b?this._highchart_events[a]=[this._highchart_events[a]].compact().flatten().without(b):delete this._highchart_events[a]:this._highchart_events={}},_highcharts_fire:function(a,b){(this._highchart_events[a]||
+[]).each(function(a){if(!b.stopped)b.preventDefault=function(){b.defaultPrevented=!0},a.bind(this)(b)===!1&&b.preventDefault()}.bind(this))}})}}}();
diff --git a/management/guns-admin/src/main/webapp/static/js/plugins/highcharts/adapters/prototype-adapter.src.js b/management/guns-admin/src/main/webapp/static/js/plugins/highcharts/adapters/prototype-adapter.src.js
new file mode 100644
index 0000000..3bb27d4
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/static/js/plugins/highcharts/adapters/prototype-adapter.src.js
@@ -0,0 +1,381 @@
+/**
+ * @license Highcharts JS v2.2.5 (2012-06-08)
+ * Prototype adapter
+ *
+ * @author Michael Nelson, Torstein Hønsi.
+ *
+ * Feel free to use and modify this script.
+ * Highcharts license: www.highcharts.com/license.
+ */
+
+// JSLint options:
+/*global Effect, Class, Event, Element, $, $$, $A */
+
+// Adapter interface between prototype and the Highcharts charting library
+var HighchartsAdapter = (function () {
+
+var hasEffect = typeof Effect !== 'undefined';
+
+return {
+
+ /**
+ * Initialize the adapter. This is run once as Highcharts is first run.
+ * @param {Object} pathAnim The helper object to do animations across adapters.
+ */
+ init: function (pathAnim) {
+ if (hasEffect) {
+ /**
+ * Animation for Highcharts SVG element wrappers only
+ * @param {Object} element
+ * @param {Object} attribute
+ * @param {Object} to
+ * @param {Object} options
+ */
+ Effect.HighchartsTransition = Class.create(Effect.Base, {
+ initialize: function (element, attr, to, options) {
+ var from,
+ opts;
+
+ this.element = element;
+ this.key = attr;
+ from = element.attr ? element.attr(attr) : $(element).getStyle(attr);
+
+ // special treatment for paths
+ if (attr === 'd') {
+ this.paths = pathAnim.init(
+ element,
+ element.d,
+ to
+ );
+ this.toD = to;
+
+
+ // fake values in order to read relative position as a float in update
+ from = 0;
+ to = 1;
+ }
+
+ opts = Object.extend((options || {}), {
+ from: from,
+ to: to,
+ attribute: attr
+ });
+ this.start(opts);
+ },
+ setup: function () {
+ HighchartsAdapter._extend(this.element);
+ // If this is the first animation on this object, create the _highcharts_animation helper that
+ // contain pointers to the animation objects.
+ if (!this.element._highchart_animation) {
+ this.element._highchart_animation = {};
+ }
+
+ // Store a reference to this animation instance.
+ this.element._highchart_animation[this.key] = this;
+ },
+ update: function (position) {
+ var paths = this.paths,
+ element = this.element,
+ obj;
+
+ if (paths) {
+ position = pathAnim.step(paths[0], paths[1], position, this.toD);
+ }
+
+ if (element.attr) { // SVGElement
+ element.attr(this.options.attribute, position);
+
+ } else { // HTML, #409
+ obj = {};
+ obj[this.options.attribute] = position;
+ $(element).setStyle(obj);
+ }
+
+ },
+ finish: function () {
+ // Delete the property that holds this animation now that it is finished.
+ // Both canceled animations and complete ones gets a 'finish' call.
+ delete this.element._highchart_animation[this.key];
+ }
+ });
+ }
+ },
+
+ /**
+ * Run a general method on the framework, following jQuery syntax
+ * @param {Object} el The HTML element
+ * @param {String} method Which method to run on the wrapped element
+ */
+ adapterRun: function (el, method) {
+
+ // This currently works for getting inner width and height. If adding
+ // more methods later, we need a conditional implementation for each.
+ return parseInt($(el).getStyle(method), 10);
+
+ },
+
+ /**
+ * Downloads a script and executes a callback when done.
+ * @param {String} scriptLocation
+ * @param {Function} callback
+ */
+ getScript: function (scriptLocation, callback) {
+ var head = $$('head')[0]; // Returns an array, so pick the first element.
+ if (head) {
+ // Append a new 'script' element, set its type and src attributes, add a 'load' handler that calls the callback
+ head.appendChild(new Element('script', { type: 'text/javascript', src: scriptLocation}).observe('load', callback));
+ }
+ },
+
+ /**
+ * Custom events in prototype needs to be namespaced. This method adds a namespace 'h:' in front of
+ * events that are not recognized as native.
+ */
+ addNS: function (eventName) {
+ var HTMLEvents = /^(?:load|unload|abort|error|select|change|submit|reset|focus|blur|resize|scroll)$/,
+ MouseEvents = /^(?:click|mouse(?:down|up|over|move|out))$/;
+ return (HTMLEvents.test(eventName) || MouseEvents.test(eventName)) ?
+ eventName :
+ 'h:' + eventName;
+ },
+
+ // el needs an event to be attached. el is not necessarily a dom element
+ addEvent: function (el, event, fn) {
+ if (el.addEventListener || el.attachEvent) {
+ Event.observe($(el), HighchartsAdapter.addNS(event), fn);
+
+ } else {
+ HighchartsAdapter._extend(el);
+ el._highcharts_observe(event, fn);
+ }
+ },
+
+ // motion makes things pretty. use it if effects is loaded, if not... still get to the end result.
+ animate: function (el, params, options) {
+ var key,
+ fx;
+
+ // default options
+ options = options || {};
+ options.delay = 0;
+ options.duration = (options.duration || 500) / 1000;
+ options.afterFinish = options.complete;
+
+ // animate wrappers and DOM elements
+ if (hasEffect) {
+ for (key in params) {
+ // The fx variable is seemingly thrown away here, but the Effect.setup will add itself to the _highcharts_animation object
+ // on the element itself so its not really lost.
+ fx = new Effect.HighchartsTransition($(el), key, params[key], options);
+ }
+ } else {
+ if (el.attr) { // #409 without effects
+ for (key in params) {
+ el.attr(key, params[key]);
+ }
+ }
+ if (options.complete) {
+ options.complete();
+ }
+ }
+
+ if (!el.attr) { // HTML element, #409
+ $(el).setStyle(params);
+ }
+ },
+
+ // this only occurs in higcharts 2.0+
+ stop: function (el) {
+ var key;
+ if (el._highcharts_extended && el._highchart_animation) {
+ for (key in el._highchart_animation) {
+ // Cancel the animation
+ // The 'finish' function in the Effect object will remove the reference
+ el._highchart_animation[key].cancel();
+ }
+ }
+ },
+
+ // um.. each
+ each: function (arr, fn) {
+ $A(arr).each(fn);
+ },
+
+ /**
+ * Get the cumulative offset relative to the top left of the page. This method, unlike its
+ * jQuery and MooTools counterpart, still suffers from issue #208 regarding the position
+ * of a chart within a fixed container.
+ */
+ offset: function (el) {
+ return $(el).cumulativeOffset();
+ },
+
+ // fire an event based on an event name (event) and an object (el).
+ // again, el may not be a dom element
+ fireEvent: function (el, event, eventArguments, defaultFunction) {
+ if (el.fire) {
+ el.fire(HighchartsAdapter.addNS(event), eventArguments);
+ } else if (el._highcharts_extended) {
+ eventArguments = eventArguments || {};
+ el._highcharts_fire(event, eventArguments);
+ }
+
+ if (eventArguments && eventArguments.defaultPrevented) {
+ defaultFunction = null;
+ }
+
+ if (defaultFunction) {
+ defaultFunction(eventArguments);
+ }
+ },
+
+ removeEvent: function (el, event, handler) {
+ if ($(el).stopObserving) {
+ if (event) {
+ event = HighchartsAdapter.addNS(event);
+ }
+ $(el).stopObserving(event, handler);
+ } if (window === el) {
+ Event.stopObserving(el, event, handler);
+ } else {
+ HighchartsAdapter._extend(el);
+ el._highcharts_stop_observing(event, handler);
+ }
+ },
+
+ washMouseEvent: function (e) {
+ return e;
+ },
+
+ // um, grep
+ grep: function (arr, fn) {
+ return arr.findAll(fn);
+ },
+
+ // um, map
+ map: function (arr, fn) {
+ return arr.map(fn);
+ },
+
+ // deep merge. merge({a : 'a', b : {b1 : 'b1', b2 : 'b2'}}, {b : {b2 : 'b2_prime'}, c : 'c'}) => {a : 'a', b : {b1 : 'b1', b2 : 'b2_prime'}, c : 'c'}
+ /*merge: function(){
+ function doCopy(copy, original) {
+ var value,
+ key,
+ undef,
+ nil,
+ same,
+ obj,
+ arr,
+ node;
+
+ for (key in original) {
+ value = original[key];
+ undef = typeof(value) === 'undefined';
+ nil = value === null;
+ same = original === copy[key];
+
+ if (undef || nil || same) {
+ continue;
+ }
+
+ obj = typeof(value) === 'object';
+ arr = value && obj && value.constructor == Array;
+ node = !!value.nodeType;
+
+ if (obj && !arr && !node) {
+ copy[key] = doCopy(typeof copy[key] == 'object' ? copy[key] : {}, value);
+ }
+ else {
+ copy[key] = original[key];
+ }
+ }
+ return copy;
+ }
+
+ var args = arguments, retVal = {};
+
+ for (var i = 0; i < args.length; i++) {
+ retVal = doCopy(retVal, args[i]);
+ }
+
+ return retVal;
+ },*/
+ merge: function () { // the built-in prototype merge function doesn't do deep copy
+ function doCopy(copy, original) {
+ var value, key;
+
+ for (key in original) {
+ value = original[key];
+ if (value && typeof value === 'object' && value.constructor !== Array &&
+ typeof value.nodeType !== 'number') {
+ copy[key] = doCopy(copy[key] || {}, value); // copy
+
+ } else {
+ copy[key] = original[key];
+ }
+ }
+ return copy;
+ }
+
+ function merge() {
+ var args = arguments,
+ i,
+ retVal = {};
+
+ for (i = 0; i < args.length; i++) {
+ retVal = doCopy(retVal, args[i]);
+
+ }
+ return retVal;
+ }
+
+ return merge.apply(this, arguments);
+ },
+
+ // extend an object to handle highchart events (highchart objects, not svg elements).
+ // this is a very simple way of handling events but whatever, it works (i think)
+ _extend: function (object) {
+ if (!object._highcharts_extended) {
+ Object.extend(object, {
+ _highchart_events: {},
+ _highchart_animation: null,
+ _highcharts_extended: true,
+ _highcharts_observe: function (name, fn) {
+ this._highchart_events[name] = [this._highchart_events[name], fn].compact().flatten();
+ },
+ _highcharts_stop_observing: function (name, fn) {
+ if (name) {
+ if (fn) {
+ this._highchart_events[name] = [this._highchart_events[name]].compact().flatten().without(fn);
+ } else {
+ delete this._highchart_events[name];
+ }
+ } else {
+ this._highchart_events = {};
+ }
+ },
+ _highcharts_fire: function (name, args) {
+ (this._highchart_events[name] || []).each(function (fn) {
+ // args is never null here
+ if (args.stopped) {
+ return; // "throw $break" wasn't working. i think because of the scope of 'this'.
+ }
+
+ // Attach a simple preventDefault function to skip default handler if called
+ args.preventDefault = function () {
+ args.defaultPrevented = true;
+ };
+
+ // If the event handler return false, prevent the default handler from executing
+ if (fn.bind(this)(args) === false) {
+ args.preventDefault();
+ }
+ }
+.bind(this));
+ }
+ });
+ }
+ }
+};
+}());
diff --git a/management/guns-admin/src/main/webapp/static/js/plugins/highcharts/adapters/standalone-framework.js b/management/guns-admin/src/main/webapp/static/js/plugins/highcharts/adapters/standalone-framework.js
new file mode 100644
index 0000000..c3ff31b
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/static/js/plugins/highcharts/adapters/standalone-framework.js
@@ -0,0 +1,18 @@
+/*
+ Highcharts JS v4.0.3 (2014-07-03)
+
+ Standalone Highcharts Framework
+
+ License: MIT License
+*/
+var HighchartsAdapter=function(){function o(c){function b(b,a,d){b.removeEventListener(a,d,!1)}function d(b,a,d){d=b.HCProxiedMethods[d.toString()];b.detachEvent("on"+a,d)}function a(a,c){var f=a.HCEvents,i,g,k,j;if(a.removeEventListener)i=b;else if(a.attachEvent)i=d;else return;c?(g={},g[c]=!0):g=f;for(j in g)if(f[j])for(k=f[j].length;k--;)i(a,j,f[j][k])}c.HCExtended||Highcharts.extend(c,{HCExtended:!0,HCEvents:{},bind:function(b,a){var d=this,c=this.HCEvents,g;if(d.addEventListener)d.addEventListener(b,
+a,!1);else if(d.attachEvent){g=function(b){b.target=b.srcElement||window;a.call(d,b)};if(!d.HCProxiedMethods)d.HCProxiedMethods={};d.HCProxiedMethods[a.toString()]=g;d.attachEvent("on"+b,g)}c[b]===r&&(c[b]=[]);c[b].push(a)},unbind:function(c,h){var f,i;c?(f=this.HCEvents[c]||[],h?(i=HighchartsAdapter.inArray(h,f),i>-1&&(f.splice(i,1),this.HCEvents[c]=f),this.removeEventListener?b(this,c,h):this.attachEvent&&d(this,c,h)):(a(this,c),this.HCEvents[c]=[])):(a(this),this.HCEvents={})},trigger:function(b,
+a){var d=this.HCEvents[b]||[],c=d.length,g,k,j;k=function(){a.defaultPrevented=!0};for(g=0;g<c;g++){j=d[g];if(a.stopped)break;a.preventDefault=k;a.target=this;if(!a.type)a.type=b;j.call(this,a)===!1&&a.preventDefault()}}});return c}var r,l=document,p=[],m=[],q,n;Math.easeInOutSine=function(c,b,d,a){return-d/2*(Math.cos(Math.PI*c/a)-1)+b};return{init:function(c){if(!l.defaultView)this._getStyle=function(b,d){var a;return b.style[d]?b.style[d]:(d==="opacity"&&(d="filter"),a=b.currentStyle[d.replace(/\-(\w)/g,
+function(a,b){return b.toUpperCase()})],d==="filter"&&(a=a.replace(/alpha\(opacity=([0-9]+)\)/,function(b,a){return a/100})),a===""?1:a)},this.adapterRun=function(b,d){var a={width:"clientWidth",height:"clientHeight"}[d];if(a)return b.style.zoom=1,b[a]-2*parseInt(HighchartsAdapter._getStyle(b,"padding"),10)};if(!Array.prototype.forEach)this.each=function(b,d){for(var a=0,c=b.length;a<c;a++)if(d.call(b[a],b[a],a,b)===!1)return a};if(!Array.prototype.indexOf)this.inArray=function(b,d){var a,c=0;if(d)for(a=
+d.length;c<a;c++)if(d[c]===b)return c;return-1};if(!Array.prototype.filter)this.grep=function(b,d){for(var a=[],c=0,h=b.length;c<h;c++)d(b[c],c)&&a.push(b[c]);return a};n=function(b,c,a){this.options=c;this.elem=b;this.prop=a};n.prototype={update:function(){var b;b=this.paths;var d=this.elem,a=d.element;b&&a?d.attr("d",c.step(b[0],b[1],this.now,this.toD)):d.attr?a&&d.attr(this.prop,this.now):(b={},b[this.prop]=this.now+this.unit,Highcharts.css(d,b));this.options.step&&this.options.step.call(this.elem,
+this.now,this)},custom:function(b,c,a){var e=this,h=function(a){return e.step(a)},f;this.startTime=+new Date;this.start=b;this.end=c;this.unit=a;this.now=this.start;this.pos=this.state=0;h.elem=this.elem;h()&&m.push(h)===1&&(q=setInterval(function(){for(f=0;f<m.length;f++)m[f]()||m.splice(f--,1);m.length||clearInterval(q)},13))},step:function(b){var c=+new Date,a;a=this.options;var e=this.elem,h;if(e.stopAnimation||e.attr&&!e.element)a=!1;else if(b||c>=a.duration+this.startTime){this.now=this.end;
+this.pos=this.state=1;this.update();b=this.options.curAnim[this.prop]=!0;for(h in a.curAnim)a.curAnim[h]!==!0&&(b=!1);b&&a.complete&&a.complete.call(e);a=!1}else e=c-this.startTime,this.state=e/a.duration,this.pos=a.easing(e,0,1,a.duration),this.now=this.start+(this.end-this.start)*this.pos,this.update(),a=!0;return a}};this.animate=function(b,d,a){var e,h="",f,i,g;b.stopAnimation=!1;if(typeof a!=="object"||a===null)e=arguments,a={duration:e[2],easing:e[3],complete:e[4]};if(typeof a.duration!=="number")a.duration=
+400;a.easing=Math[a.easing]||Math.easeInOutSine;a.curAnim=Highcharts.extend({},d);for(g in d)i=new n(b,a,g),f=null,g==="d"?(i.paths=c.init(b,b.d,d.d),i.toD=d.d,e=0,f=1):b.attr?e=b.attr(g):(e=parseFloat(HighchartsAdapter._getStyle(b,g))||0,g!=="opacity"&&(h="px")),f||(f=parseFloat(d[g])),i.custom(e,f,h)}},_getStyle:function(c,b){return window.getComputedStyle(c,void 0).getPropertyValue(b)},getScript:function(c,b){var d=l.getElementsByTagName("head")[0],a=l.createElement("script");a.type="text/javascript";
+a.src=c;a.onload=b;d.appendChild(a)},inArray:function(c,b){return b.indexOf?b.indexOf(c):p.indexOf.call(b,c)},adapterRun:function(c,b){return parseInt(HighchartsAdapter._getStyle(c,b),10)},grep:function(c,b){return p.filter.call(c,b)},map:function(c,b){for(var d=[],a=0,e=c.length;a<e;a++)d[a]=b.call(c[a],c[a],a,c);return d},offset:function(c){var b=document.documentElement,c=c.getBoundingClientRect();return{top:c.top+(window.pageYOffset||b.scrollTop)-(b.clientTop||0),left:c.left+(window.pageXOffset||
+b.scrollLeft)-(b.clientLeft||0)}},addEvent:function(c,b,d){o(c).bind(b,d)},removeEvent:function(c,b,d){o(c).unbind(b,d)},fireEvent:function(c,b,d,a){var e;l.createEvent&&(c.dispatchEvent||c.fireEvent)?(e=l.createEvent("Events"),e.initEvent(b,!0,!0),e.target=c,Highcharts.extend(e,d),c.dispatchEvent?c.dispatchEvent(e):c.fireEvent(b,e)):c.HCExtended===!0&&(d=d||{},c.trigger(b,d));d&&d.defaultPrevented&&(a=null);a&&a(d)},washMouseEvent:function(c){return c},stop:function(c){c.stopAnimation=!0},each:function(c,
+b){return Array.prototype.forEach.call(c,b)}}}();
diff --git a/management/guns-admin/src/main/webapp/static/js/plugins/highcharts/adapters/standalone-framework.src.js b/management/guns-admin/src/main/webapp/static/js/plugins/highcharts/adapters/standalone-framework.src.js
new file mode 100644
index 0000000..bd7209a
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/static/js/plugins/highcharts/adapters/standalone-framework.src.js
@@ -0,0 +1,590 @@
+/**
+ * @license Highcharts JS v4.0.3 (2014-07-03)
+ *
+ * Standalone Highcharts Framework
+ *
+ * License: MIT License
+ */
+
+
+/*global Highcharts */
+var HighchartsAdapter = (function () {
+
+var UNDEFINED,
+ doc = document,
+ emptyArray = [],
+ timers = [],
+ timerId,
+ Fx;
+
+Math.easeInOutSine = function (t, b, c, d) {
+ return -c / 2 * (Math.cos(Math.PI * t / d) - 1) + b;
+};
+
+
+
+/**
+ * Extend given object with custom events
+ */
+function augment(obj) {
+ function removeOneEvent(el, type, fn) {
+ el.removeEventListener(type, fn, false);
+ }
+
+ function IERemoveOneEvent(el, type, fn) {
+ fn = el.HCProxiedMethods[fn.toString()];
+ el.detachEvent('on' + type, fn);
+ }
+
+ function removeAllEvents(el, type) {
+ var events = el.HCEvents,
+ remove,
+ types,
+ len,
+ n;
+
+ if (el.removeEventListener) {
+ remove = removeOneEvent;
+ } else if (el.attachEvent) {
+ remove = IERemoveOneEvent;
+ } else {
+ return; // break on non-DOM events
+ }
+
+
+ if (type) {
+ types = {};
+ types[type] = true;
+ } else {
+ types = events;
+ }
+
+ for (n in types) {
+ if (events[n]) {
+ len = events[n].length;
+ while (len--) {
+ remove(el, n, events[n][len]);
+ }
+ }
+ }
+ }
+
+ if (!obj.HCExtended) {
+ Highcharts.extend(obj, {
+ HCExtended: true,
+
+ HCEvents: {},
+
+ bind: function (name, fn) {
+ var el = this,
+ events = this.HCEvents,
+ wrappedFn;
+
+ // handle DOM events in modern browsers
+ if (el.addEventListener) {
+ el.addEventListener(name, fn, false);
+
+ // handle old IE implementation
+ } else if (el.attachEvent) {
+
+ wrappedFn = function (e) {
+ e.target = e.srcElement || window; // #2820
+ fn.call(el, e);
+ };
+
+ if (!el.HCProxiedMethods) {
+ el.HCProxiedMethods = {};
+ }
+
+ // link wrapped fn with original fn, so we can get this in removeEvent
+ el.HCProxiedMethods[fn.toString()] = wrappedFn;
+
+ el.attachEvent('on' + name, wrappedFn);
+ }
+
+
+ if (events[name] === UNDEFINED) {
+ events[name] = [];
+ }
+
+ events[name].push(fn);
+ },
+
+ unbind: function (name, fn) {
+ var events,
+ index;
+
+ if (name) {
+ events = this.HCEvents[name] || [];
+ if (fn) {
+ index = HighchartsAdapter.inArray(fn, events);
+ if (index > -1) {
+ events.splice(index, 1);
+ this.HCEvents[name] = events;
+ }
+ if (this.removeEventListener) {
+ removeOneEvent(this, name, fn);
+ } else if (this.attachEvent) {
+ IERemoveOneEvent(this, name, fn);
+ }
+ } else {
+ removeAllEvents(this, name);
+ this.HCEvents[name] = [];
+ }
+ } else {
+ removeAllEvents(this);
+ this.HCEvents = {};
+ }
+ },
+
+ trigger: function (name, args) {
+ var events = this.HCEvents[name] || [],
+ target = this,
+ len = events.length,
+ i,
+ preventDefault,
+ fn;
+
+ // Attach a simple preventDefault function to skip default handler if called
+ preventDefault = function () {
+ args.defaultPrevented = true;
+ };
+
+ for (i = 0; i < len; i++) {
+ fn = events[i];
+
+ // args is never null here
+ if (args.stopped) {
+ return;
+ }
+
+ args.preventDefault = preventDefault;
+ args.target = target;
+
+ // If the type is not set, we're running a custom event (#2297). If it is set,
+ // we're running a browser event, and setting it will cause en error in
+ // IE8 (#2465).
+ if (!args.type) {
+ args.type = name;
+ }
+
+
+
+ // If the event handler return false, prevent the default handler from executing
+ if (fn.call(this, args) === false) {
+ args.preventDefault();
+ }
+ }
+ }
+ });
+ }
+
+ return obj;
+}
+
+
+return {
+ /**
+ * Initialize the adapter. This is run once as Highcharts is first run.
+ */
+ init: function (pathAnim) {
+
+ /**
+ * Compatibility section to add support for legacy IE. This can be removed if old IE
+ * support is not needed.
+ */
+ if (!doc.defaultView) {
+ this._getStyle = function (el, prop) {
+ var val;
+ if (el.style[prop]) {
+ return el.style[prop];
+ } else {
+ if (prop === 'opacity') {
+ prop = 'filter';
+ }
+ /*jslint unparam: true*/
+ val = el.currentStyle[prop.replace(/\-(\w)/g, function (a, b) { return b.toUpperCase(); })];
+ if (prop === 'filter') {
+ val = val.replace(
+ /alpha\(opacity=([0-9]+)\)/,
+ function (a, b) {
+ return b / 100;
+ }
+ );
+ }
+ /*jslint unparam: false*/
+ return val === '' ? 1 : val;
+ }
+ };
+ this.adapterRun = function (elem, method) {
+ var alias = { width: 'clientWidth', height: 'clientHeight' }[method];
+
+ if (alias) {
+ elem.style.zoom = 1;
+ return elem[alias] - 2 * parseInt(HighchartsAdapter._getStyle(elem, 'padding'), 10);
+ }
+ };
+ }
+
+ if (!Array.prototype.forEach) {
+ this.each = function (arr, fn) { // legacy
+ var i = 0,
+ len = arr.length;
+ for (; i < len; i++) {
+ if (fn.call(arr[i], arr[i], i, arr) === false) {
+ return i;
+ }
+ }
+ };
+ }
+
+ if (!Array.prototype.indexOf) {
+ this.inArray = function (item, arr) {
+ var len,
+ i = 0;
+
+ if (arr) {
+ len = arr.length;
+
+ for (; i < len; i++) {
+ if (arr[i] === item) {
+ return i;
+ }
+ }
+ }
+
+ return -1;
+ };
+ }
+
+ if (!Array.prototype.filter) {
+ this.grep = function (elements, callback) {
+ var ret = [],
+ i = 0,
+ length = elements.length;
+
+ for (; i < length; i++) {
+ if (!!callback(elements[i], i)) {
+ ret.push(elements[i]);
+ }
+ }
+
+ return ret;
+ };
+ }
+
+ //--- End compatibility section ---
+
+
+ /**
+ * Start of animation specific code
+ */
+ Fx = function (elem, options, prop) {
+ this.options = options;
+ this.elem = elem;
+ this.prop = prop;
+ };
+ Fx.prototype = {
+
+ update: function () {
+ var styles,
+ paths = this.paths,
+ elem = this.elem,
+ elemelem = elem.element; // if destroyed, it is null
+
+ // Animating a path definition on SVGElement
+ if (paths && elemelem) {
+ elem.attr('d', pathAnim.step(paths[0], paths[1], this.now, this.toD));
+
+ // Other animations on SVGElement
+ } else if (elem.attr) {
+ if (elemelem) {
+ elem.attr(this.prop, this.now);
+ }
+
+ // HTML styles
+ } else {
+ styles = {};
+ styles[this.prop] = this.now + this.unit;
+ Highcharts.css(elem, styles);
+ }
+
+ if (this.options.step) {
+ this.options.step.call(this.elem, this.now, this);
+ }
+
+ },
+ custom: function (from, to, unit) {
+ var self = this,
+ t = function (gotoEnd) {
+ return self.step(gotoEnd);
+ },
+ i;
+
+ this.startTime = +new Date();
+ this.start = from;
+ this.end = to;
+ this.unit = unit;
+ this.now = this.start;
+ this.pos = this.state = 0;
+
+ t.elem = this.elem;
+
+ if (t() && timers.push(t) === 1) {
+ timerId = setInterval(function () {
+
+ for (i = 0; i < timers.length; i++) {
+ if (!timers[i]()) {
+ timers.splice(i--, 1);
+ }
+ }
+
+ if (!timers.length) {
+ clearInterval(timerId);
+ }
+ }, 13);
+ }
+ },
+
+ step: function (gotoEnd) {
+ var t = +new Date(),
+ ret,
+ done,
+ options = this.options,
+ elem = this.elem,
+ i;
+
+ if (elem.stopAnimation || (elem.attr && !elem.element)) { // #2616, element including flag is destroyed
+ ret = false;
+
+ } else if (gotoEnd || t >= options.duration + this.startTime) {
+ this.now = this.end;
+ this.pos = this.state = 1;
+ this.update();
+
+ this.options.curAnim[this.prop] = true;
+
+ done = true;
+ for (i in options.curAnim) {
+ if (options.curAnim[i] !== true) {
+ done = false;
+ }
+ }
+
+ if (done) {
+ if (options.complete) {
+ options.complete.call(elem);
+ }
+ }
+ ret = false;
+
+ } else {
+ var n = t - this.startTime;
+ this.state = n / options.duration;
+ this.pos = options.easing(n, 0, 1, options.duration);
+ this.now = this.start + ((this.end - this.start) * this.pos);
+ this.update();
+ ret = true;
+ }
+ return ret;
+ }
+ };
+
+ /**
+ * The adapter animate method
+ */
+ this.animate = function (el, prop, opt) {
+ var start,
+ unit = '',
+ end,
+ fx,
+ args,
+ name;
+
+ el.stopAnimation = false; // ready for new
+
+ if (typeof opt !== 'object' || opt === null) {
+ args = arguments;
+ opt = {
+ duration: args[2],
+ easing: args[3],
+ complete: args[4]
+ };
+ }
+ if (typeof opt.duration !== 'number') {
+ opt.duration = 400;
+ }
+ opt.easing = Math[opt.easing] || Math.easeInOutSine;
+ opt.curAnim = Highcharts.extend({}, prop);
+
+ for (name in prop) {
+ fx = new Fx(el, opt, name);
+ end = null;
+
+ if (name === 'd') {
+ fx.paths = pathAnim.init(
+ el,
+ el.d,
+ prop.d
+ );
+ fx.toD = prop.d;
+ start = 0;
+ end = 1;
+ } else if (el.attr) {
+ start = el.attr(name);
+ } else {
+ start = parseFloat(HighchartsAdapter._getStyle(el, name)) || 0;
+ if (name !== 'opacity') {
+ unit = 'px';
+ }
+ }
+
+ if (!end) {
+ end = parseFloat(prop[name]);
+ }
+ fx.custom(start, end, unit);
+ }
+ };
+ },
+
+ /**
+ * Internal method to return CSS value for given element and property
+ */
+ _getStyle: function (el, prop) {
+ return window.getComputedStyle(el, undefined).getPropertyValue(prop);
+ },
+
+ /**
+ * Downloads a script and executes a callback when done.
+ * @param {String} scriptLocation
+ * @param {Function} callback
+ */
+ getScript: function (scriptLocation, callback) {
+ // We cannot assume that Assets class from mootools-more is available so instead insert a script tag to download script.
+ var head = doc.getElementsByTagName('head')[0],
+ script = doc.createElement('script');
+
+ script.type = 'text/javascript';
+ script.src = scriptLocation;
+ script.onload = callback;
+
+ head.appendChild(script);
+ },
+
+ /**
+ * Return the index of an item in an array, or -1 if not found
+ */
+ inArray: function (item, arr) {
+ return arr.indexOf ? arr.indexOf(item) : emptyArray.indexOf.call(arr, item);
+ },
+
+
+ /**
+ * A direct link to adapter methods
+ */
+ adapterRun: function (elem, method) {
+ return parseInt(HighchartsAdapter._getStyle(elem, method), 10);
+ },
+
+ /**
+ * Filter an array
+ */
+ grep: function (elements, callback) {
+ return emptyArray.filter.call(elements, callback);
+ },
+
+ /**
+ * Map an array
+ */
+ map: function (arr, fn) {
+ var results = [], i = 0, len = arr.length;
+
+ for (; i < len; i++) {
+ results[i] = fn.call(arr[i], arr[i], i, arr);
+ }
+
+ return results;
+ },
+
+ /**
+ * Get the element's offset position, corrected by overflow:auto. Loosely based on jQuery's offset method.
+ */
+ offset: function (el) {
+ var docElem = document.documentElement,
+ box = el.getBoundingClientRect();
+
+ return {
+ top: box.top + (window.pageYOffset || docElem.scrollTop) - (docElem.clientTop || 0),
+ left: box.left + (window.pageXOffset || docElem.scrollLeft) - (docElem.clientLeft || 0)
+ };
+ },
+
+ /**
+ * Add an event listener
+ */
+ addEvent: function (el, type, fn) {
+ augment(el).bind(type, fn);
+ },
+
+ /**
+ * Remove event added with addEvent
+ */
+ removeEvent: function (el, type, fn) {
+ augment(el).unbind(type, fn);
+ },
+
+ /**
+ * Fire an event on a custom object
+ */
+ fireEvent: function (el, type, eventArguments, defaultFunction) {
+ var e;
+
+ if (doc.createEvent && (el.dispatchEvent || el.fireEvent)) {
+ e = doc.createEvent('Events');
+ e.initEvent(type, true, true);
+ e.target = el;
+
+ Highcharts.extend(e, eventArguments);
+
+ if (el.dispatchEvent) {
+ el.dispatchEvent(e);
+ } else {
+ el.fireEvent(type, e);
+ }
+
+ } else if (el.HCExtended === true) {
+ eventArguments = eventArguments || {};
+ el.trigger(type, eventArguments);
+ }
+
+ if (eventArguments && eventArguments.defaultPrevented) {
+ defaultFunction = null;
+ }
+
+ if (defaultFunction) {
+ defaultFunction(eventArguments);
+ }
+ },
+
+ washMouseEvent: function (e) {
+ return e;
+ },
+
+
+ /**
+ * Stop running animation
+ */
+ stop: function (el) {
+ el.stopAnimation = true;
+ },
+
+ /**
+ * Utility for iterating over an array. Parameters are reversed compared to jQuery.
+ * @param {Array} arr
+ * @param {Function} fn
+ */
+ each: function (arr, fn) { // modern browsers
+ return Array.prototype.forEach.call(arr, fn);
+ }
+};
+}());
diff --git a/management/guns-admin/src/main/webapp/static/js/plugins/highcharts/highcharts-3d.js b/management/guns-admin/src/main/webapp/static/js/plugins/highcharts/highcharts-3d.js
new file mode 100644
index 0000000..34680d1
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/static/js/plugins/highcharts/highcharts-3d.js
@@ -0,0 +1,44 @@
+/*
+ Highcharts JS v4.0.3 (2014-07-03)
+
+ (c) 2009-2013 Torstein Hønsi
+
+ License: www.highcharts.com/license
+*/
+(function(d){function x(g,a,b,c){var e,f,j;b*=t;a*=t;var i=[],h,k,o;b*=-1;h=c.x;k=c.y;o=(c.z===0?1.0E-4:c.z)*(c.vd||25);o=Math.max(500,o);var q=l(b),n=m(b),r=l(a),s=m(a),p,v,u;d.each(g,function(a){p=a.x-h;v=a.y-k;u=a.z||0;e=n*p-q*u;f=-q*r*p-n*r*u+s*v;j=q*s*p+n*s*u+r*v;e=e*((o-j)/o)+h;f=f*((o-j)/o)+k;i.push({x:A(e),y:A(f),z:A(j)})});return i}function w(g,a,b,c,e,f,d,i){var h=[];return f>e&&f-e>n/2+1.0E-4?(h=h.concat(w(g,a,b,c,e,e+n/2,d,i)),h=h.concat(w(g,a,b,c,e+n/2,f,d,i))):f<e&&e-f>n/2+1.0E-4?(h=
+h.concat(w(g,a,b,c,e,e-n/2,d,i)),h=h.concat(w(g,a,b,c,e-n/2,f,d,i))):(h=f-e,["C",g+b*m(e)-b*B*h*l(e)+d,a+c*l(e)+c*B*h*m(e)+i,g+b*m(f)+b*B*h*l(f)+d,a+c*l(f)-c*B*h*m(f)+i,g+b*m(f)+d,a+c*l(f)+i])}function C(g){if(this.chart.is3d()){var a=this.chart.options.plotOptions.column.grouping;a!==void 0&&!a&&this.group.zIndex!==void 0&&this.group.attr({zIndex:this.group.zIndex*10});var b=this.options,c=this.options.states;this.borderWidth=b.borderWidth=b.edgeWidth||1;d.each(this.data,function(a){a=a.pointAttr;
+this.borderColor=d.pick(b.edgeColor,a[""].fill);a[""].stroke=this.borderColor;a.hover.stroke=d.pick(c.hover.edgeColor,this.borderColor);a.select.stroke=d.pick(c.select.edgeColor,this.borderColor)})}g.apply(this,[].slice.call(arguments,1))}var n=Math.PI,t=n/180,l=Math.sin,m=Math.cos,A=Math.round,B=4*(Math.sqrt(2)-1)/3/(n/2);d.SVGRenderer.prototype.toLinePath=function(g,a){var b=[];d.each(g,function(a){b.push("L",a.x,a.y)});b[0]="M";a&&b.push("Z");return b};d.SVGRenderer.prototype.cuboid=function(g){var a=
+this.g(),g=this.cuboidPath(g);a.front=this.path(g[0]).attr({zIndex:g[3],"stroke-linejoin":"round"}).add(a);a.top=this.path(g[1]).attr({zIndex:g[4],"stroke-linejoin":"round"}).add(a);a.side=this.path(g[2]).attr({zIndex:g[5],"stroke-linejoin":"round"}).add(a);a.fillSetter=function(a){var c=d.Color(a).brighten(0.1).get(),e=d.Color(a).brighten(-0.1).get();this.front.attr({fill:a});this.top.attr({fill:c});this.side.attr({fill:e});this.color=a;return this};a.opacitySetter=function(a){this.front.attr({opacity:a});
+this.top.attr({opacity:a});this.side.attr({opacity:a});return this};a.attr=function(a){a.shapeArgs||a.x?(a=this.renderer.cuboidPath(a.shapeArgs||a),this.front.attr({d:a[0],zIndex:a[3]}),this.top.attr({d:a[1],zIndex:a[4]}),this.side.attr({d:a[2],zIndex:a[5]})):d.SVGElement.prototype.attr.call(this,a);return this};a.animate=function(a,c,e){a.x&&a.y?(a=this.renderer.cuboidPath(a),this.front.attr({zIndex:a[3]}).animate({d:a[0]},c,e),this.top.attr({zIndex:a[4]}).animate({d:a[1]},c,e),this.side.attr({zIndex:a[5]}).animate({d:a[2]},
+c,e)):a.opacity?(this.front.animate(a,c,e),this.top.animate(a,c,e),this.side.animate(a,c,e)):d.SVGElement.prototype.animate.call(this,a,c,e);return this};a.destroy=function(){this.front.destroy();this.top.destroy();this.side.destroy();return null};a.attr({zIndex:-g[3]});return a};d.SVGRenderer.prototype.cuboidPath=function(d){var a=d.x,b=d.y,c=d.z,e=d.height,f=d.width,j=d.depth,i=d.alpha,h=d.beta,a=[{x:a,y:b,z:c},{x:a+f,y:b,z:c},{x:a+f,y:b+e,z:c},{x:a,y:b+e,z:c},{x:a,y:b+e,z:c+j},{x:a+f,y:b+e,z:c+
+j},{x:a+f,y:b,z:c+j},{x:a,y:b,z:c+j}],a=x(a,i,h,d.origin),d=["M",a[0].x,a[0].y,"L",a[7].x,a[7].y,"L",a[6].x,a[6].y,"L",a[1].x,a[1].y,"Z"],b=["M",a[3].x,a[3].y,"L",a[2].x,a[2].y,"L",a[5].x,a[5].y,"L",a[4].x,a[4].y,"Z"],c=["M",a[1].x,a[1].y,"L",a[2].x,a[2].y,"L",a[5].x,a[5].y,"L",a[6].x,a[6].y,"Z"],e=["M",a[0].x,a[0].y,"L",a[7].x,a[7].y,"L",a[4].x,a[4].y,"L",a[3].x,a[3].y,"Z"];return[["M",a[0].x,a[0].y,"L",a[1].x,a[1].y,"L",a[2].x,a[2].y,"L",a[3].x,a[3].y,"Z"],a[7].y<a[1].y?d:a[4].y>a[2].y?b:[],a[6].x>
+a[1].x?c:a[7].x<a[0].x?e:[],(a[0].z+a[1].z+a[2].z+a[3].z)/4,h>0?(a[0].z+a[7].z+a[6].z+a[1].z)/4:(a[3].z+a[2].z+a[5].z+a[4].z)/4,i>0?(a[1].z+a[2].z+a[5].z+a[6].z)/4:(a[0].z+a[7].z+a[4].z+a[3].z)/4]};d.SVGRenderer.prototype.arc3d=function(g){g.alpha*=t;g.beta*=t;var a=this.g(),b=this.arc3dPath(g),c=a.renderer,e=b.zTop*100;a.shapeArgs=g;a.top=c.path(b.top).attr({zIndex:b.zTop}).add(a);a.side1=c.path(b.side2).attr({zIndex:b.zSide2});a.side2=c.path(b.side1).attr({zIndex:b.zSide1});a.inn=c.path(b.inn).attr({zIndex:b.zInn});
+a.out=c.path(b.out).attr({zIndex:b.zOut});a.fillSetter=function(a){this.color=a;var b=d.Color(a).brighten(-0.1).get();this.side1.attr({fill:b});this.side2.attr({fill:b});this.inn.attr({fill:b});this.out.attr({fill:b});this.top.attr({fill:a});return this};a.translateXSetter=function(a){this.out.attr({translateX:a});this.inn.attr({translateX:a});this.side1.attr({translateX:a});this.side2.attr({translateX:a});this.top.attr({translateX:a})};a.translateYSetter=function(a){this.out.attr({translateY:a});
+this.inn.attr({translateY:a});this.side1.attr({translateY:a});this.side2.attr({translateY:a});this.top.attr({translateY:a})};a.animate=function(a,b,c){a.end||a.start?(this._shapeArgs=this.shapeArgs,d.SVGElement.prototype.animate.call(this,{_args:a},{duration:b,step:function(){var a=arguments[1],b=a.elem,c=b._shapeArgs,e=a.end,a=a.pos,c=d.merge(c,{start:c.start+(e.start-c.start)*a,end:c.end+(e.end-c.end)*a}),e=b.renderer.arc3dPath(c);b.shapeArgs=c;b.top.attr({d:e.top,zIndex:e.zTop});b.inn.attr({d:e.inn,
+zIndex:e.zInn});b.out.attr({d:e.out,zIndex:e.zOut});b.side1.attr({d:e.side1,zIndex:e.zSide1});b.side2.attr({d:e.side2,zIndex:e.zSide2})}},c)):d.SVGElement.prototype.animate.call(this,a,b,c);return this};a.destroy=function(){this.top.destroy();this.out.destroy();this.inn.destroy();this.side1.destroy();this.side2.destroy();d.SVGElement.prototype.destroy.call(this)};a.hide=function(){this.top.hide();this.out.hide();this.inn.hide();this.side1.hide();this.side2.hide()};a.show=function(){this.top.show();
+this.out.show();this.inn.show();this.side1.show();this.side2.show()};a.zIndex=e;a.attr({zIndex:e});return a};d.SVGRenderer.prototype.arc3dPath=function(d){var a=d.x,b=d.y,c=d.start,e=d.end-1.0E-5,f=d.r,j=d.innerR,i=d.depth,h=d.alpha,k=d.beta,o=m(c),q=l(c),d=m(e),z=l(e),r=f*m(k),s=f*m(h),p=j*m(k);j*=m(h);var v=i*l(k),u=i*l(h),i=["M",a+r*o,b+s*q],i=i.concat(w(a,b,r,s,c,e,0,0)),i=i.concat(["L",a+p*d,b+j*z]),i=i.concat(w(a,b,p,j,e,c,0,0)),i=i.concat(["Z"]),k=k>0?n/2:0,h=h>0?0:n/2,k=c>-k?c:e>-k?-k:c,t=
+e<n-h?e:c<n-h?n-h:e,h=["M",a+r*m(k),b+s*l(k)],h=h.concat(w(a,b,r,s,k,t,0,0)),h=h.concat(["L",a+r*m(t)+v,b+s*l(t)+u]),h=h.concat(w(a,b,r,s,t,k,v,u)),h=h.concat(["Z"]),k=["M",a+p*o,b+j*q],k=k.concat(w(a,b,p,j,c,e,0,0)),k=k.concat(["L",a+p*m(e)+v,b+j*l(e)+u]),k=k.concat(w(a,b,p,j,e,c,v,u)),k=k.concat(["Z"]),o=["M",a+r*o,b+s*q,"L",a+r*o+v,b+s*q+u,"L",a+p*o+v,b+j*q+u,"L",a+p*o,b+j*q,"Z"],a=["M",a+r*d,b+s*z,"L",a+r*d+v,b+s*z+u,"L",a+p*d+v,b+j*z+u,"L",a+p*d,b+j*z,"Z"],b=l((c+e)/2),c=l(c),e=l(e);return{top:i,
+zTop:f,out:h,zOut:Math.max(b,c,e)*f,inn:k,zInn:Math.max(b,c,e)*f,side1:o,zSide1:c*f*0.99,side2:a,zSide2:e*f*0.99}};d.Chart.prototype.is3d=function(){return this.options.chart.options3d&&this.options.chart.options3d.enabled};d.wrap(d.Chart.prototype,"isInsidePlot",function(d){return this.is3d()?!0:d.apply(this,[].slice.call(arguments,1))});var y=d.getOptions();y.chart.options3d={enabled:!1,alpha:0,beta:0,depth:100,viewDistance:25,frame:{bottom:{size:1,color:"rgba(255,255,255,0)"},side:{size:1,color:"rgba(255,255,255,0)"},
+back:{size:1,color:"rgba(255,255,255,0)"}}};y.plotOptions.pie.borderColor=void 0;d.wrap(d.Chart.prototype,"setChartSize",function(d){d.apply(this,[].slice.call(arguments,1));if(this.is3d()){var a=this.inverted,b=this.clipBox,c=this.margin;b[a?"y":"x"]=-(c[3]||0);b[a?"x":"y"]=-(c[0]||0);b[a?"height":"width"]=this.chartWidth+(c[3]||0)+(c[1]||0);b[a?"width":"height"]=this.chartHeight+(c[0]||0)+(c[2]||0)}});d.wrap(d.Chart.prototype,"redraw",function(d){if(this.is3d())this.isDirtyBox=!0;d.apply(this,[].slice.call(arguments,
+1))});d.Chart.prototype.retrieveStacks=function(g,a){var b={},c=1;if(g||!a)return this.series;d.each(this.series,function(a){b[a.options.stack||0]?b[a.options.stack||0].series.push(a):(b[a.options.stack||0]={series:[a],position:c},c++)});b.totalStacks=c+1;return b};d.wrap(d.Axis.prototype,"init",function(g){var a=arguments;if(a[1].is3d())a[2].tickWidth=d.pick(a[2].tickWidth,0),a[2].gridLineWidth=d.pick(a[2].gridLineWidth,1);g.apply(this,[].slice.call(arguments,1))});d.wrap(d.Axis.prototype,"render",
+function(d){d.apply(this,[].slice.call(arguments,1));if(this.chart.is3d()){var a=this.chart,b=a.renderer,c=a.options.chart.options3d,e=c.alpha,f=c.beta*(a.yAxis[0].opposite?-1:1),j=c.frame,i=j.bottom,h=j.back,j=j.side,k=c.depth,o=this.height,q=this.width,l=this.left,m=this.top,c={x:a.plotLeft+a.plotWidth/2,y:a.plotTop+a.plotHeight/2,z:k,vd:c.viewDistance};if(this.horiz)this.axisLine&&this.axisLine.hide(),f={x:l,y:m+(a.yAxis[0].reversed?-i.size:o),z:0,width:q,height:i.size,depth:k,alpha:e,beta:f,origin:c},
+this.bottomFrame?this.bottomFrame.animate(f):this.bottomFrame=b.cuboid(f).attr({fill:i.color,zIndex:a.yAxis[0].reversed&&e>0?4:-1}).css({stroke:i.color}).add();else{var n={x:l,y:m,z:k+1,width:q,height:o+i.size,depth:h.size,alpha:e,beta:f,origin:c};this.backFrame?this.backFrame.animate(n):this.backFrame=b.cuboid(n).attr({fill:h.color,zIndex:-3}).css({stroke:h.color}).add();this.axisLine&&this.axisLine.hide();a={x:(a.yAxis[0].opposite?q:0)+l-j.size,y:m,z:0,width:j.size,height:o+i.size,depth:k+h.size,
+alpha:e,beta:f,origin:c};this.sideFrame?this.sideFrame.animate(a):this.sideFrame=b.cuboid(a).attr({fill:j.color,zIndex:-2}).css({stroke:j.color}).add()}}});d.wrap(d.Axis.prototype,"getPlotLinePath",function(d){var a=d.apply(this,[].slice.call(arguments,1));if(!this.chart.is3d())return a;if(a===null)return a;var b=this.chart,c=b.options.chart.options3d,e=c.depth;c.origin={x:b.plotLeft+b.plotWidth/2,y:b.plotTop+b.plotHeight/2,z:e,vd:c.viewDistance};var a=[{x:a[1],y:a[2],z:this.horiz||this.opposite?
+e:0},{x:a[1],y:a[2],z:e},{x:a[4],y:a[5],z:e},{x:a[4],y:a[5],z:this.horiz||this.opposite?0:e}],e=b.options.inverted?c.beta:c.alpha,f=b.options.inverted?c.alpha:c.beta;f*=b.yAxis[0].opposite?-1:1;a=x(a,e,f,c.origin);return a=this.chart.renderer.toLinePath(a,!1)});d.wrap(d.Axis.prototype,"getPlotBandPath",function(d){if(this.chart.is3d()){var a=arguments,b=a[1],a=this.getPlotLinePath(a[2]);(b=this.getPlotLinePath(b))&&a?b.push(a[7],a[8],a[4],a[5],a[1],a[2]):b=null;return b}else return d.apply(this,[].slice.call(arguments,
+1))});d.wrap(d.Tick.prototype,"getMarkPath",function(d){var a=d.apply(this,[].slice.call(arguments,1));if(!this.axis.chart.is3d())return a;var b=this.axis.chart,c=b.options.chart.options3d,e={x:b.plotLeft+b.plotWidth/2,y:b.plotTop+b.plotHeight/2,z:c.depth,vd:c.viewDistance},a=[{x:a[1],y:a[2],z:0},{x:a[4],y:a[5],z:0}],f=b.inverted?c.beta:c.alpha,c=b.inverted?c.alpha:c.beta;c*=b.yAxis[0].opposite?-1:1;a=x(a,f,c,e);return a=["M",a[0].x,a[0].y,"L",a[1].x,a[1].y]});d.wrap(d.Tick.prototype,"getLabelPosition",
+function(d){var a=d.apply(this,[].slice.call(arguments,1));if(!this.axis.chart.is3d())return a;var b=this.axis.chart,c=b.options.chart.options3d,e={x:b.plotLeft+b.plotWidth/2,y:b.plotTop+b.plotHeight/2,z:c.depth,vd:c.viewDistance},f=b.inverted?c.beta:c.alpha,c=b.inverted?c.alpha:c.beta;c*=b.yAxis[0].opposite?-1:1;return a=x([{x:a.x,y:a.y,z:0}],f,c,e)[0]});d.wrap(d.Axis.prototype,"drawCrosshair",function(d){var a=arguments;this.chart.is3d()&&a[2]&&(a[2]={plotX:a[2].plotXold||a[2].plotX,plotY:a[2].plotYold||
+a[2].plotY});d.apply(this,[].slice.call(a,1))});d.wrap(d.seriesTypes.column.prototype,"translate",function(g){g.apply(this,[].slice.call(arguments,1));if(this.chart.is3d()){var a=this.chart,b=this.options,c=a.options.chart.options3d,e=b.depth||25,f={x:a.plotWidth/2,y:a.plotHeight/2,z:c.depth,vd:c.viewDistance},j=c.alpha,i=c.beta*(a.yAxis[0].opposite?-1:1),h=(b.stacking?b.stack||0:this._i)*(e+(b.groupZPadding||1));b.grouping!==!1&&(h=0);h+=b.groupZPadding||1;d.each(this.data,function(a){var b=a.shapeArgs,
+c=a.tooltipPos;a.shapeType="cuboid";b.alpha=j;b.beta=i;b.z=h;b.origin=f;b.depth=e;c=x([{x:c[0],y:c[1],z:h}],j,i,f)[0];a.tooltipPos=[c.x,c.y]})}});d.wrap(d.seriesTypes.column.prototype,"animate",function(g){if(this.chart.is3d()){var a=arguments[1],b=this.yAxis,c=this,e=this.yAxis.reversed;if(d.svg)a?d.each(c.data,function(a){a.height=a.shapeArgs.height;a.shapey=a.shapeArgs.y;a.shapeArgs.height=1;if(!e)a.shapeArgs.y=a.stackY?a.plotY+b.translate(a.stackY):a.plotY+(a.negative?-a.height:a.height)}):(d.each(c.data,
+function(a){a.shapeArgs.height=a.height;a.shapeArgs.y=a.shapey;a.graphic&&a.graphic.animate(a.shapeArgs,c.options.animation)}),this.drawDataLabels(),c.animate=null)}else g.apply(this,[].slice.call(arguments,1))});d.wrap(d.seriesTypes.column.prototype,"init",function(d){d.apply(this,[].slice.call(arguments,1));if(this.chart.is3d()){var a=this.options,b=a.grouping,c=a.stacking,e=0;if((b===void 0||b)&&c){b=this.chart.retrieveStacks(b,c);c=a.stack||0;for(e=0;e<b[c].series.length;e++)if(b[c].series[e]===
+this)break;e=b.totalStacks*10-10*(b.totalStacks-b[c].position)-e}a.zIndex=e}});d.wrap(d.Series.prototype,"alignDataLabel",function(d){if(this.chart.is3d()&&(this.type==="column"||this.type==="columnrange")){var a=this.chart,b=a.options.chart.options3d,c=arguments[4],e={x:c.x,y:c.y,z:0},e=x([e],b.alpha,b.beta*(a.yAxis[0].opposite?-1:1),{x:a.plotWidth/2,y:a.plotHeight/2,z:b.depth,vd:b.viewDistance})[0];c.x=e.x;c.y=e.y}d.apply(this,[].slice.call(arguments,1))});d.seriesTypes.columnrange&&d.wrap(d.seriesTypes.columnrange.prototype,
+"drawPoints",C);d.wrap(d.seriesTypes.column.prototype,"drawPoints",C);y=d.getOptions();y.plotOptions.cylinder=d.merge(y.plotOptions.column);y=d.extendClass(d.seriesTypes.column,{type:"cylinder"});d.seriesTypes.cylinder=y;d.wrap(d.seriesTypes.cylinder.prototype,"translate",function(g){g.apply(this,[].slice.call(arguments,1));if(this.chart.is3d()){var a=this.chart,b=a.options,c=b.plotOptions.cylinder,b=b.chart.options3d,e=c.depth||0,f={x:a.inverted?a.plotHeight/2:a.plotWidth/2,y:a.inverted?a.plotWidth/
+2:a.plotHeight/2,z:b.depth,vd:b.viewDistance},j=b.alpha,i=c.stacking?(this.options.stack||0)*e:this._i*e;i+=e/2;c.grouping!==!1&&(i=0);d.each(this.data,function(a){var b=a.shapeArgs;a.shapeType="arc3d";b.x+=e/2;b.z=i;b.start=0;b.end=2*n;b.r=e*0.95;b.innerR=0;b.depth=b.height*(1/l((90-j)*t))-i;b.alpha=90-j;b.beta=0;b.origin=f})}});d.wrap(d.seriesTypes.pie.prototype,"translate",function(g){g.apply(this,[].slice.call(arguments,1));if(this.chart.is3d()){var a=this,b=a.chart,c=a.options,e=c.depth||0,f=
+b.options.chart.options3d,j={x:b.plotWidth/2,y:b.plotHeight/2,z:f.depth},i=f.alpha,h=f.beta,k=c.stacking?(c.stack||0)*e:a._i*e;k+=e/2;c.grouping!==!1&&(k=0);d.each(a.data,function(b){b.shapeType="arc3d";var c=b.shapeArgs;if(b.y)c.z=k,c.depth=e*0.75,c.origin=j,c.alpha=i,c.beta=h,c=(c.end+c.start)/2,b.slicedTranslation={translateX:A(m(c)*a.options.slicedOffset*m(i*t)),translateY:A(l(c)*a.options.slicedOffset*m(i*t))}})}});d.wrap(d.seriesTypes.pie.prototype.pointClass.prototype,"haloPath",function(d){return this.series.chart.is3d()?
+[]:d.call(this)});d.wrap(d.seriesTypes.pie.prototype,"drawPoints",function(g){if(this.chart.is3d()){var a=this.options,b=this.options.states;this.borderWidth=a.borderWidth=a.edgeWidth||1;b.hover.borderColor=d.pick(b.hover.edgeColor,this.borderColor);b.hover.borderWidth=d.pick(b.hover.edgeWidth,this.borderWidth);b.select.borderColor=d.pick(b.select.edgeColor,this.borderColor);b.select.borderWidth=d.pick(b.select.edgeWidth,this.borderWidth);d.each(this.data,function(a){var c=a.pointAttr;c[""].stroke=
+a.series.borderColor||a.color;c[""]["stroke-width"]=a.series.borderWidth;c.hover.stroke=b.hover.borderColor;c.hover["stroke-width"]=b.hover.borderWidth;c.select.stroke=b.select.borderColor;c.select["stroke-width"]=b.select.borderWidth})}g.apply(this,[].slice.call(arguments,1));if(this.chart.is3d()){var c=this.group;d.each(this.points,function(a){a.graphic.out.add(c);a.graphic.inn.add(c);a.graphic.side1.add(c);a.graphic.side2.add(c)})}});d.wrap(d.seriesTypes.pie.prototype,"drawDataLabels",function(g){this.chart.is3d()&&
+d.each(this.data,function(a){var b=a.shapeArgs,c=b.r,d=b.depth,f=b.alpha*t,b=(b.start+b.end)/2,a=a.labelPos;a[1]+=-c*(1-m(f))*l(b)+(l(b)>0?l(f)*d:0);a[3]+=-c*(1-m(f))*l(b)+(l(b)>0?l(f)*d:0);a[5]+=-c*(1-m(f))*l(b)+(l(b)>0?l(f)*d:0)});g.apply(this,[].slice.call(arguments,1))});d.wrap(d.seriesTypes.pie.prototype,"addPoint",function(d){d.apply(this,[].slice.call(arguments,1));this.chart.is3d()&&this.update()});d.wrap(d.seriesTypes.pie.prototype,"animate",function(g){if(this.chart.is3d()){var a=arguments[1],
+b=this.options.animation,c=this.center,e=this.group,f=this.markerGroup;if(d.svg)if(b===!0&&(b={}),a){if(e.oldtranslateX=e.translateX,e.oldtranslateY=e.translateY,a={translateX:c[0],translateY:c[1],scaleX:0.001,scaleY:0.001},e.attr(a),f)f.attrSetters=e.attrSetters,f.attr(a)}else a={translateX:e.oldtranslateX,translateY:e.oldtranslateY,scaleX:1,scaleY:1},e.animate(a,b),f&&f.animate(a,b),this.animate=null}else g.apply(this,[].slice.call(arguments,1))});d.wrap(d.seriesTypes.scatter.prototype,"translate",
+function(g){g.apply(this,[].slice.call(arguments,1));if(this.chart.is3d()){var a=this.chart,b=this.chart.options.chart.options3d,c=b.alpha,e=b.beta,f={x:a.inverted?a.plotHeight/2:a.plotWidth/2,y:a.inverted?a.plotWidth/2:a.plotHeight/2,z:b.depth,vd:b.viewDistance},b=b.depth,j=a.options.zAxis||{min:0,max:b},i=b/(j.max-j.min);d.each(this.data,function(a){var b={x:a.plotX,y:a.plotY,z:(a.z-j.min)*i},b=x([b],c,e,f)[0];a.plotXold=a.plotX;a.plotYold=a.plotY;a.plotX=b.x;a.plotY=b.y;a.plotZ=b.z})}});d.wrap(d.seriesTypes.scatter.prototype,
+"init",function(d){var a=d.apply(this,[].slice.call(arguments,1));if(this.chart.is3d())this.pointArrayMap=["x","y","z"],this.tooltipOptions.pointFormat=this.userOptions.tooltip?this.userOptions.tooltip.pointFormat||"x: <b>{point.x}</b><br/>y: <b>{point.y}</b><br/>z: <b>{point.z}</b><br/>":"x: <b>{point.x}</b><br/>y: <b>{point.y}</b><br/>z: <b>{point.z}</b><br/>";return a});if(d.VMLRenderer)d.setOptions({animate:!1}),d.VMLRenderer.prototype.cuboid=d.SVGRenderer.prototype.cuboid,d.VMLRenderer.prototype.cuboidPath=
+d.SVGRenderer.prototype.cuboidPath,d.VMLRenderer.prototype.toLinePath=d.SVGRenderer.prototype.toLinePath,d.VMLRenderer.prototype.createElement3D=d.SVGRenderer.prototype.createElement3D,d.VMLRenderer.prototype.arc3d=function(g){g=d.SVGRenderer.prototype.arc3d.call(this,g);g.css({zIndex:g.zIndex});return g},d.VMLRenderer.prototype.arc3dPath=d.SVGRenderer.prototype.arc3dPath,d.Chart.prototype.renderSeries=function(){for(var d,a=this.series.length;a--;)d=this.series[a],d.translate(),d.setTooltipPoints&&
+d.setTooltipPoints(),d.render()},d.wrap(d.Axis.prototype,"render",function(d){d.apply(this,[].slice.call(arguments,1));this.sideFrame&&(this.sideFrame.css({zIndex:0}),this.sideFrame.front.attr({fill:this.sideFrame.color}));this.bottomFrame&&(this.bottomFrame.css({zIndex:1}),this.bottomFrame.front.attr({fill:this.bottomFrame.color}));this.backFrame&&(this.backFrame.css({zIndex:0}),this.backFrame.front.attr({fill:this.backFrame.color}))})})(Highcharts);
diff --git a/management/guns-admin/src/main/webapp/static/js/plugins/highcharts/highcharts-3d.src.js b/management/guns-admin/src/main/webapp/static/js/plugins/highcharts/highcharts-3d.src.js
new file mode 100644
index 0000000..666b8a6
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/static/js/plugins/highcharts/highcharts-3d.src.js
@@ -0,0 +1,1352 @@
+// ==ClosureCompiler==
+// @compilation_level SIMPLE_OPTIMIZATIONS
+
+/**
+ * @license Highcharts JS v4.0.3 (2014-07-03)
+ *
+ * (c) 2009-2013 Torstein Hønsi
+ *
+ * License: www.highcharts.com/license
+ */
+
+// JSLint options:
+/*global Highcharts, HighchartsAdapter, document, window, navigator, setInterval, clearInterval, clearTimeout, setTimeout, location, jQuery, $, console */
+
+(function (Highcharts) {
+ /**
+ Shorthands for often used function
+*/
+/**
+ * Mathematical Functionility
+ */
+var PI = Math.PI,
+ deg2rad = (PI / 180), // degrees to radians
+ sin = Math.sin,
+ cos = Math.cos,
+
+ round = Math.round;
+
+function perspective(points, angle2, angle1, origin) {
+ angle1 *= deg2rad;
+ angle2 *= deg2rad;
+
+ var result = [],
+ xe,
+ ye,
+ ze;
+
+ angle1 *= -1;
+
+ xe = origin.x;
+ ye = origin.y;
+ ze = (origin.z === 0 ? 0.0001 : origin.z) * (origin.vd || 25);
+
+ // some kind of minimum?
+ ze = Math.max(500, ze);
+
+ var s1 = sin(angle1),
+ c1 = cos(angle1),
+ s2 = sin(angle2),
+ c2 = cos(angle2);
+
+ var x, y, z, p;
+
+ Highcharts.each(points, function (point) {
+ x = point.x - xe;
+ y = point.y - ye;
+ z = point.z || 0;
+
+ p = {
+ x: c1 * x - s1 * z,
+ y: -s1 * s2 * x - c1 * s2 * z + c2 * y,
+ z: s1 * c2 * x + c1 * c2 * z + s2 * y
+ };
+
+ p.x = p.x * ((ze - p.z) / ze) + xe;
+ p.y = p.y * ((ze - p.z) / ze) + ye;
+
+ result.push({x: round(p.x), y: round(p.y), z: round(p.z)});
+ });
+ return result;
+}
+/***
+ EXTENSION TO THE SVG-RENDERER TO ENABLE 3D SHAPES
+ ***/
+////// HELPER METHODS //////
+var dFactor = (4 * (Math.sqrt(2) - 1) / 3) / (PI / 2);
+
+function curveTo(cx, cy, rx, ry, start, end, dx, dy) {
+ var result = [];
+ if ((end > start) && (end - start > PI / 2 + 0.0001)) {
+ result = result.concat(curveTo(cx, cy, rx, ry, start, start + (PI / 2), dx, dy));
+ result = result.concat(curveTo(cx, cy, rx, ry, start + (PI / 2), end, dx, dy));
+ return result;
+ } else if ((end < start) && (start - end > PI / 2 + 0.0001)) {
+ result = result.concat(curveTo(cx, cy, rx, ry, start, start - (PI / 2), dx, dy));
+ result = result.concat(curveTo(cx, cy, rx, ry, start - (PI / 2), end, dx, dy));
+ return result;
+ } else {
+ var arcAngle = end - start;
+ return [
+ 'C',
+ cx + (rx * cos(start)) - ((rx * dFactor * arcAngle) * sin(start)) + dx,
+ cy + (ry * sin(start)) + ((ry * dFactor * arcAngle) * cos(start)) + dy,
+ cx + (rx * cos(end)) + ((rx * dFactor * arcAngle) * sin(end)) + dx,
+ cy + (ry * sin(end)) - ((ry * dFactor * arcAngle) * cos(end)) + dy,
+
+ cx + (rx * cos(end)) + dx,
+ cy + (ry * sin(end)) + dy
+ ];
+ }
+}
+
+Highcharts.SVGRenderer.prototype.toLinePath = function (points, closed) {
+ var result = [];
+
+ // Put "L x y" for each point
+ Highcharts.each(points, function (point) {
+ result.push('L', point.x, point.y);
+ });
+
+ // Set the first element to M
+ result[0] = 'M';
+
+ // If it is a closed line, add Z
+ if (closed) {
+ result.push('Z');
+ }
+
+ return result;
+};
+
+////// CUBOIDS //////
+Highcharts.SVGRenderer.prototype.cuboid = function (shapeArgs) {
+
+ var result = this.g(),
+ paths = this.cuboidPath(shapeArgs);
+
+ result.front = this.path(paths[0]).attr({zIndex: paths[3], 'stroke-linejoin': 'round'}).add(result);
+ result.top = this.path(paths[1]).attr({zIndex: paths[4], 'stroke-linejoin': 'round'}).add(result);
+ result.side = this.path(paths[2]).attr({zIndex: paths[5], 'stroke-linejoin': 'round'}).add(result);
+
+ result.fillSetter = function (color) {
+ var c0 = color,
+ c1 = Highcharts.Color(color).brighten(0.1).get(),
+ c2 = Highcharts.Color(color).brighten(-0.1).get();
+
+ this.front.attr({fill: c0});
+ this.top.attr({fill: c1});
+ this.side.attr({fill: c2});
+
+ this.color = color;
+ return this;
+ };
+
+ result.opacitySetter = function (opacity) {
+ this.front.attr({opacity: opacity});
+ this.top.attr({opacity: opacity});
+ this.side.attr({opacity: opacity});
+ return this;
+ };
+
+ result.attr = function (args) {
+ if (args.shapeArgs || args.x) {
+ var shapeArgs = args.shapeArgs || args;
+ var paths = this.renderer.cuboidPath(shapeArgs);
+ this.front.attr({d: paths[0], zIndex: paths[3]});
+ this.top.attr({d: paths[1], zIndex: paths[4]});
+ this.side.attr({d: paths[2], zIndex: paths[5]});
+ } else {
+ Highcharts.SVGElement.prototype.attr.call(this, args);
+ }
+
+ return this;
+ };
+
+ result.animate = function (args, duration, complete) {
+ if (args.x && args.y) {
+ var paths = this.renderer.cuboidPath(args);
+ this.front.attr({zIndex: paths[3]}).animate({d: paths[0]}, duration, complete);
+ this.top.attr({zIndex: paths[4]}).animate({d: paths[1]}, duration, complete);
+ this.side.attr({zIndex: paths[5]}).animate({d: paths[2]}, duration, complete);
+ } else if (args.opacity) {
+ this.front.animate(args, duration, complete);
+ this.top.animate(args, duration, complete);
+ this.side.animate(args, duration, complete);
+ } else {
+ Highcharts.SVGElement.prototype.animate.call(this, args, duration, complete);
+ }
+ return this;
+ };
+
+ result.destroy = function () {
+ this.front.destroy();
+ this.top.destroy();
+ this.side.destroy();
+
+ return null;
+ };
+
+ // Apply the Z index to the cuboid group
+ result.attr({ zIndex: -paths[3] });
+
+ return result;
+};
+
+
+Highcharts.SVGRenderer.prototype.cuboidPath = function (shapeArgs) {
+ var x = shapeArgs.x,
+ y = shapeArgs.y,
+ z = shapeArgs.z,
+ h = shapeArgs.height,
+ w = shapeArgs.width,
+ d = shapeArgs.depth,
+ alpha = shapeArgs.alpha,
+ beta = shapeArgs.beta,
+ origin = shapeArgs.origin;
+
+ var pArr = [
+ {x: x, y: y, z: z},
+ {x: x + w, y: y, z: z},
+ {x: x + w, y: y + h, z: z},
+ {x: x, y: y + h, z: z},
+ {x: x, y: y + h, z: z + d},
+ {x: x + w, y: y + h, z: z + d},
+ {x: x + w, y: y, z: z + d},
+ {x: x, y: y, z: z + d}
+ ];
+
+ pArr = perspective(pArr, alpha, beta, origin);
+
+ var path1, // FRONT
+ path2, // TOP OR BOTTOM
+ path3; // LEFT OR RIGHT
+
+ // front
+ path1 = [
+ 'M', pArr[0].x, pArr[0].y,
+ 'L', pArr[1].x, pArr[1].y,
+ 'L', pArr[2].x, pArr[2].y,
+ 'L', pArr[3].x, pArr[3].y,
+ 'Z'
+ ];
+ var z1 = (pArr[0].z + pArr[1].z + pArr[2].z + pArr[3].z) / 4;
+
+ // top or bottom
+ var top = [
+ 'M', pArr[0].x, pArr[0].y,
+ 'L', pArr[7].x, pArr[7].y,
+ 'L', pArr[6].x, pArr[6].y,
+ 'L', pArr[1].x, pArr[1].y,
+ 'Z'
+ ];
+ var bottom = [
+ 'M', pArr[3].x, pArr[3].y,
+ 'L', pArr[2].x, pArr[2].y,
+ 'L', pArr[5].x, pArr[5].y,
+ 'L', pArr[4].x, pArr[4].y,
+ 'Z'
+ ];
+ if (pArr[7].y < pArr[1].y) {
+ path2 = top;
+ } else if (pArr[4].y > pArr[2].y) {
+ path2 = bottom;
+ } else {
+ path2 = [];
+ }
+ var z2 = (beta > 0 ? (pArr[0].z + pArr[7].z + pArr[6].z + pArr[1].z) / 4 : (pArr[3].z + pArr[2].z + pArr[5].z + pArr[4].z) / 4);
+
+ // side
+ var right = [
+ 'M', pArr[1].x, pArr[1].y,
+ 'L', pArr[2].x, pArr[2].y,
+ 'L', pArr[5].x, pArr[5].y,
+ 'L', pArr[6].x, pArr[6].y,
+ 'Z'
+ ];
+ var left = [
+ 'M', pArr[0].x, pArr[0].y,
+ 'L', pArr[7].x, pArr[7].y,
+ 'L', pArr[4].x, pArr[4].y,
+ 'L', pArr[3].x, pArr[3].y,
+ 'Z'
+ ];
+ if (pArr[6].x > pArr[1].x) {
+ path3 = right;
+ } else if (pArr[7].x < pArr[0].x) {
+ path3 = left;
+ } else {
+ path3 = [];
+ }
+ var z3 = (alpha > 0 ? (pArr[1].z + pArr[2].z + pArr[5].z + pArr[6].z) / 4 : (pArr[0].z + pArr[7].z + pArr[4].z + pArr[3].z) / 4);
+
+ return [path1, path2, path3, z1, z2, z3];
+};
+
+////// SECTORS //////
+Highcharts.SVGRenderer.prototype.arc3d = function (shapeArgs) {
+
+ shapeArgs.alpha *= deg2rad;
+ shapeArgs.beta *= deg2rad;
+ var result = this.g(),
+ paths = this.arc3dPath(shapeArgs),
+ renderer = result.renderer;
+
+ var zIndex = paths.zTop * 100;
+
+ result.shapeArgs = shapeArgs; // Store for later use
+
+ result.top = renderer.path(paths.top).attr({zIndex: paths.zTop}).add(result);
+ result.side1 = renderer.path(paths.side2).attr({zIndex: paths.zSide2});
+ result.side2 = renderer.path(paths.side1).attr({zIndex: paths.zSide1});
+ result.inn = renderer.path(paths.inn).attr({zIndex: paths.zInn});
+ result.out = renderer.path(paths.out).attr({zIndex: paths.zOut});
+
+ result.fillSetter = function (color) {
+ this.color = color;
+
+ var c0 = color,
+ c2 = Highcharts.Color(color).brighten(-0.1).get();
+
+ this.side1.attr({fill: c2});
+ this.side2.attr({fill: c2});
+ this.inn.attr({fill: c2});
+ this.out.attr({fill: c2});
+ this.top.attr({fill: c0});
+ return this;
+ };
+
+ result.translateXSetter = function (value) {
+ this.out.attr({translateX: value});
+ this.inn.attr({translateX: value});
+ this.side1.attr({translateX: value});
+ this.side2.attr({translateX: value});
+ this.top.attr({translateX: value});
+ };
+
+ result.translateYSetter = function (value) {
+ this.out.attr({translateY: value});
+ this.inn.attr({translateY: value});
+ this.side1.attr({translateY: value});
+ this.side2.attr({translateY: value});
+ this.top.attr({translateY: value});
+ };
+
+ result.animate = function (args, duration, complete) {
+ if (args.end || args.start) {
+ this._shapeArgs = this.shapeArgs;
+
+ Highcharts.SVGElement.prototype.animate.call(this, {
+ _args: args
+ }, {
+ duration: duration,
+ step: function () {
+ var args = arguments,
+ fx = args[1],
+ result = fx.elem,
+ start = result._shapeArgs,
+ end = fx.end,
+ pos = fx.pos,
+ sA = Highcharts.merge(start, {
+ start: start.start + ((end.start - start.start) * pos),
+ end: start.end + ((end.end - start.end) * pos)
+ });
+
+ var paths = result.renderer.arc3dPath(sA);
+
+ result.shapeArgs = sA;
+
+ result.top.attr({d: paths.top, zIndex: paths.zTop});
+ result.inn.attr({d: paths.inn, zIndex: paths.zInn});
+ result.out.attr({d: paths.out, zIndex: paths.zOut});
+ result.side1.attr({d: paths.side1, zIndex: paths.zSide1});
+ result.side2.attr({d: paths.side2, zIndex: paths.zSide2});
+
+ }
+ }, complete);
+ } else {
+ Highcharts.SVGElement.prototype.animate.call(this, args, duration, complete);
+ }
+ return this;
+ };
+
+ result.destroy = function () {
+ this.top.destroy();
+ this.out.destroy();
+ this.inn.destroy();
+ this.side1.destroy();
+ this.side2.destroy();
+
+ Highcharts.SVGElement.prototype.destroy.call(this);
+ };
+ result.hide = function () {
+ this.top.hide();
+ this.out.hide();
+ this.inn.hide();
+ this.side1.hide();
+ this.side2.hide();
+ };
+ result.show = function () {
+ this.top.show();
+ this.out.show();
+ this.inn.show();
+ this.side1.show();
+ this.side2.show();
+ };
+
+ result.zIndex = zIndex;
+ result.attr({zIndex: zIndex});
+ return result;
+};
+
+
+Highcharts.SVGRenderer.prototype.arc3dPath = function (shapeArgs) {
+ var cx = shapeArgs.x,
+ cy = shapeArgs.y,
+ start = shapeArgs.start,
+ end = shapeArgs.end - 0.00001,
+ r = shapeArgs.r,
+ ir = shapeArgs.innerR,
+ d = shapeArgs.depth,
+ alpha = shapeArgs.alpha,
+ beta = shapeArgs.beta;
+
+ // Some Variables
+ var cs = cos(start),
+ ss = sin(start),
+ ce = cos(end),
+ se = sin(end),
+ rx = r * cos(beta),
+ ry = r * cos(alpha),
+ irx = ir * cos(beta),
+ iry = ir * cos(alpha),
+ dx = d * sin(beta),
+ dy = d * sin(alpha);
+
+ // TOP
+ var top = ['M', cx + (rx * cs), cy + (ry * ss)];
+ top = top.concat(curveTo(cx, cy, rx, ry, start, end, 0, 0));
+ top = top.concat([
+ 'L', cx + (irx * ce), cy + (iry * se)
+ ]);
+ top = top.concat(curveTo(cx, cy, irx, iry, end, start, 0, 0));
+ top = top.concat(['Z']);
+
+ // OUTSIDE
+ var b = (beta > 0 ? PI / 2 : 0),
+ a = (alpha > 0 ? 0 : PI / 2);
+
+ var start2 = start > -b ? start : (end > -b ? -b : start),
+ end2 = end < PI - a ? end : (start < PI - a ? PI - a : end);
+
+ var out = ['M', cx + (rx * cos(start2)), cy + (ry * sin(start2))];
+ out = out.concat(curveTo(cx, cy, rx, ry, start2, end2, 0, 0));
+ out = out.concat([
+ 'L', cx + (rx * cos(end2)) + dx, cy + (ry * sin(end2)) + dy
+ ]);
+ out = out.concat(curveTo(cx, cy, rx, ry, end2, start2, dx, dy));
+ out = out.concat(['Z']);
+
+ // INSIDE
+ var inn = ['M', cx + (irx * cs), cy + (iry * ss)];
+ inn = inn.concat(curveTo(cx, cy, irx, iry, start, end, 0, 0));
+ inn = inn.concat([
+ 'L', cx + (irx * cos(end)) + dx, cy + (iry * sin(end)) + dy
+ ]);
+ inn = inn.concat(curveTo(cx, cy, irx, iry, end, start, dx, dy));
+ inn = inn.concat(['Z']);
+
+ // SIDES
+ var side1 = [
+ 'M', cx + (rx * cs), cy + (ry * ss),
+ 'L', cx + (rx * cs) + dx, cy + (ry * ss) + dy,
+ 'L', cx + (irx * cs) + dx, cy + (iry * ss) + dy,
+ 'L', cx + (irx * cs), cy + (iry * ss),
+ 'Z'
+ ];
+ var side2 = [
+ 'M', cx + (rx * ce), cy + (ry * se),
+ 'L', cx + (rx * ce) + dx, cy + (ry * se) + dy,
+ 'L', cx + (irx * ce) + dx, cy + (iry * se) + dy,
+ 'L', cx + (irx * ce), cy + (iry * se),
+ 'Z'
+ ];
+
+ var a1 = sin((start + end) / 2),
+ a2 = sin(start),
+ a3 = sin(end);
+
+ return {
+ top: top,
+ zTop: r,
+ out: out,
+ zOut: Math.max(a1, a2, a3) * r,
+ inn: inn,
+ zInn: Math.max(a1, a2, a3) * r,
+ side1: side1,
+ zSide1: a2 * (r * 0.99),
+ side2: side2,
+ zSide2: a3 * (r * 0.99)
+ };
+};
+/***
+ EXTENSION FOR 3D CHARTS
+***/
+// Shorthand to check the is3d flag
+Highcharts.Chart.prototype.is3d = function () {
+ return this.options.chart.options3d && this.options.chart.options3d.enabled;
+};
+
+Highcharts.wrap(Highcharts.Chart.prototype, 'isInsidePlot', function (proceed) {
+ if (this.is3d()) {
+ return true;
+ } else {
+ return proceed.apply(this, [].slice.call(arguments, 1));
+ }
+});
+
+var defaultChartOptions = Highcharts.getOptions();
+defaultChartOptions.chart.options3d = {
+ enabled: false,
+ alpha: 0,
+ beta: 0,
+ depth: 100,
+ viewDistance: 25,
+ frame: {
+ bottom: { size: 1, color: 'rgba(255,255,255,0)' },
+ side: { size: 1, color: 'rgba(255,255,255,0)' },
+ back: { size: 1, color: 'rgba(255,255,255,0)' }
+ }
+};
+defaultChartOptions.plotOptions.pie.borderColor = undefined;
+
+Highcharts.wrap(Highcharts.Chart.prototype, 'setChartSize', function (proceed) {
+ proceed.apply(this, [].slice.call(arguments, 1));
+
+ if (this.is3d()) {
+ var inverted = this.inverted,
+ clipBox = this.clipBox,
+ margin = this.margin,
+ x = inverted ? 'y' : 'x',
+ y = inverted ? 'x' : 'y',
+ w = inverted ? 'height' : 'width',
+ h = inverted ? 'width' : 'height';
+
+ clipBox[x] = -(margin[3] || 0);
+ clipBox[y] = -(margin[0] || 0);
+ clipBox[w] = this.chartWidth + (margin[3] || 0) + (margin[1] || 0);
+ clipBox[h] = this.chartHeight + (margin[0] || 0) + (margin[2] || 0);
+ }
+});
+
+Highcharts.wrap(Highcharts.Chart.prototype, 'redraw', function (proceed) {
+ if (this.is3d()) {
+ // Set to force a redraw of all elements
+ this.isDirtyBox = true;
+ }
+ proceed.apply(this, [].slice.call(arguments, 1));
+});
+
+Highcharts.Chart.prototype.retrieveStacks = function (grouping, stacking) {
+
+ var stacks = {},
+ i = 1;
+
+ if (grouping || !stacking) { return this.series; }
+
+ Highcharts.each(this.series, function (S) {
+ if (!stacks[S.options.stack || 0]) {
+ stacks[S.options.stack || 0] = { series: [S], position: i};
+ i++;
+ } else {
+ stacks[S.options.stack || 0].series.push(S);
+ }
+ });
+ stacks.totalStacks = i + 1;
+ return stacks;
+};
+
+/***
+ EXTENSION TO THE AXIS
+***/
+Highcharts.wrap(Highcharts.Axis.prototype, 'init', function (proceed) {
+ var args = arguments;
+ if (args[1].is3d()) {
+ args[2].tickWidth = Highcharts.pick(args[2].tickWidth, 0);
+ args[2].gridLineWidth = Highcharts.pick(args[2].gridLineWidth, 1);
+ }
+
+ proceed.apply(this, [].slice.call(arguments, 1));
+});
+Highcharts.wrap(Highcharts.Axis.prototype, 'render', function (proceed) {
+ proceed.apply(this, [].slice.call(arguments, 1));
+
+ // Do not do this if the chart is not 3D
+ if (!this.chart.is3d()) {
+ return;
+ }
+
+ var chart = this.chart,
+ renderer = chart.renderer,
+ options3d = chart.options.chart.options3d,
+ alpha = options3d.alpha,
+ beta = options3d.beta * (chart.yAxis[0].opposite ? -1 : 1),
+ frame = options3d.frame,
+ fbottom = frame.bottom,
+ fback = frame.back,
+ fside = frame.side,
+ depth = options3d.depth,
+ height = this.height,
+ width = this.width,
+ left = this.left,
+ top = this.top;
+
+ var origin = {
+ x: chart.plotLeft + (chart.plotWidth / 2),
+ y: chart.plotTop + (chart.plotHeight / 2),
+ z: depth,
+ vd: options3d.viewDistance
+ };
+ if (this.horiz) {
+ /// BOTTOM
+ if (this.axisLine) {
+ this.axisLine.hide();
+ }
+ var bottomShape = {
+ x: left,
+ y: top + (chart.yAxis[0].reversed ? -fbottom.size : height),
+ z: 0,
+ width: width,
+ height: fbottom.size,
+ depth: depth,
+ alpha: alpha,
+ beta: beta,
+ origin: origin
+ };
+ if (!this.bottomFrame) {
+ this.bottomFrame = renderer.cuboid(bottomShape).attr({fill: fbottom.color, zIndex: (chart.yAxis[0].reversed && alpha > 0 ? 4 : -1)}).css({stroke: fbottom.color}).add();
+ } else {
+ this.bottomFrame.animate(bottomShape);
+ }
+ } else {
+ // BACK
+ var backShape = {
+ x: left,
+ y: top,
+ z: depth + 1,
+ width: width,
+ height: height + fbottom.size,
+ depth: fback.size,
+ alpha: alpha,
+ beta: beta,
+ origin: origin
+ };
+ if (!this.backFrame) {
+ this.backFrame = renderer.cuboid(backShape).attr({fill: fback.color, zIndex: -3}).css({stroke: fback.color}).add();
+ } else {
+ this.backFrame.animate(backShape);
+ }
+ // SIDE
+ if (this.axisLine) {
+ this.axisLine.hide();
+ }
+ var sideShape = {
+ x: (chart.yAxis[0].opposite ? width : 0) + left - fside.size,
+ y: top,
+ z: 0,
+ width: fside.size,
+ height: height + fbottom.size,
+ depth: depth + fback.size,
+ alpha: alpha,
+ beta: beta,
+ origin: origin
+ };
+ if (!this.sideFrame) {
+ this.sideFrame = renderer.cuboid(sideShape).attr({fill: fside.color, zIndex: -2}).css({stroke: fside.color}).add();
+ } else {
+ this.sideFrame.animate(sideShape);
+ }
+ }
+});
+
+Highcharts.wrap(Highcharts.Axis.prototype, 'getPlotLinePath', function (proceed) {
+ var path = proceed.apply(this, [].slice.call(arguments, 1));
+
+ // Do not do this if the chart is not 3D
+ if (!this.chart.is3d()) {
+ return path;
+ }
+
+ if (path === null) { return path; }
+
+ var chart = this.chart,
+ options3d = chart.options.chart.options3d;
+
+ var d = options3d.depth;
+
+ options3d.origin = {
+ x: chart.plotLeft + (chart.plotWidth / 2),
+ y: chart.plotTop + (chart.plotHeight / 2),
+ z: d,
+ vd: options3d.viewDistance
+ };
+
+ var pArr = [
+ { x: path[1], y: path[2], z : (this.horiz || this.opposite ? d : 0)},
+ { x: path[1], y: path[2], z : d },
+ { x: path[4], y: path[5], z : d },
+ { x: path[4], y: path[5], z : (this.horiz || this.opposite ? 0 : d)}
+ ];
+
+ var alpha = chart.options.inverted ? options3d.beta : options3d.alpha,
+ beta = chart.options.inverted ? options3d.alpha : options3d.beta;
+
+ beta *= (chart.yAxis[0].opposite ? -1 : 1);
+
+ pArr = perspective(pArr, alpha, beta, options3d.origin);
+ path = this.chart.renderer.toLinePath(pArr, false);
+
+ return path;
+});
+
+Highcharts.wrap(Highcharts.Axis.prototype, 'getPlotBandPath', function (proceed) {
+ // Do not do this if the chart is not 3D
+ if (!this.chart.is3d()) {
+ return proceed.apply(this, [].slice.call(arguments, 1));
+ } else {
+ var args = arguments,
+ from = args[1],
+ to = args[2];
+
+ var toPath = this.getPlotLinePath(to),
+ path = this.getPlotLinePath(from);
+
+ if (path && toPath) {
+ path.push(
+ toPath[7], // These two do not exist in the regular getPlotLine
+ toPath[8], // ---- # 3005
+ toPath[4],
+ toPath[5],
+ toPath[1],
+ toPath[2]
+ );
+ } else { // outside the axis area
+ path = null;
+ }
+
+ return path;
+ }
+});
+
+/***
+ EXTENSION TO THE TICKS
+***/
+
+Highcharts.wrap(Highcharts.Tick.prototype, 'getMarkPath', function (proceed) {
+ var path = proceed.apply(this, [].slice.call(arguments, 1));
+
+ // Do not do this if the chart is not 3D
+ if (!this.axis.chart.is3d()) {
+ return path;
+ }
+
+ var chart = this.axis.chart,
+ options3d = chart.options.chart.options3d;
+
+ var origin = {
+ x: chart.plotLeft + (chart.plotWidth / 2),
+ y: chart.plotTop + (chart.plotHeight / 2),
+ z: options3d.depth,
+ vd: options3d.viewDistance
+ };
+
+ var pArr = [
+ {x: path[1], y: path[2], z: 0},
+ {x: path[4], y: path[5], z: 0}
+ ];
+
+ var alpha = chart.inverted ? options3d.beta : options3d.alpha,
+ beta = chart.inverted ? options3d.alpha : options3d.beta;
+
+ beta *= (chart.yAxis[0].opposite ? -1 : 1);
+
+ pArr = perspective(pArr, alpha, beta, origin);
+ path = [
+ 'M', pArr[0].x, pArr[0].y,
+ 'L', pArr[1].x, pArr[1].y
+ ];
+ return path;
+});
+
+Highcharts.wrap(Highcharts.Tick.prototype, 'getLabelPosition', function (proceed) {
+ var pos = proceed.apply(this, [].slice.call(arguments, 1));
+
+ // Do not do this if the chart is not 3D
+ if (!this.axis.chart.is3d()) {
+ return pos;
+ }
+
+ var chart = this.axis.chart,
+ options3d = chart.options.chart.options3d;
+
+ var origin = {
+ x: chart.plotLeft + (chart.plotWidth / 2),
+ y: chart.plotTop + (chart.plotHeight / 2),
+ z: options3d.depth,
+ vd: options3d.viewDistance
+ };
+
+ var alpha = chart.inverted ? options3d.beta : options3d.alpha,
+ beta = chart.inverted ? options3d.alpha : options3d.beta;
+
+ beta *= (chart.yAxis[0].opposite ? -1 : 1);
+
+ pos = perspective([{x: pos.x, y: pos.y, z: 0}], alpha, beta, origin)[0];
+ return pos;
+});
+
+Highcharts.wrap(Highcharts.Axis.prototype, 'drawCrosshair', function (proceed) {
+ var args = arguments;
+ if (this.chart.is3d()) {
+ if (args[2]) {
+ args[2] = {
+ plotX: args[2].plotXold || args[2].plotX,
+ plotY: args[2].plotYold || args[2].plotY
+ };
+ }
+ }
+ proceed.apply(this, [].slice.call(args, 1));
+});/***
+ EXTENSION FOR 3D COLUMNS
+***/
+Highcharts.wrap(Highcharts.seriesTypes.column.prototype, 'translate', function (proceed) {
+ proceed.apply(this, [].slice.call(arguments, 1));
+
+ // Do not do this if the chart is not 3D
+ if (!this.chart.is3d()) {
+ return;
+ }
+
+ var series = this,
+ chart = series.chart,
+ options = chart.options,
+ seriesOptions = series.options,
+ options3d = options.chart.options3d,
+
+ depth = seriesOptions.depth || 25,
+ origin = {
+ x: chart.plotWidth / 2,
+ y: chart.plotHeight / 2,
+ z: options3d.depth,
+ vd: options3d.viewDistance
+ },
+ alpha = options3d.alpha,
+ beta = options3d.beta * (chart.yAxis[0].opposite ? -1 : 1);
+
+ var stack = seriesOptions.stacking ? (seriesOptions.stack || 0) : series._i;
+ var z = stack * (depth + (seriesOptions.groupZPadding || 1));
+
+ if (seriesOptions.grouping !== false) { z = 0; }
+
+ z += (seriesOptions.groupZPadding || 1);
+
+ Highcharts.each(series.data, function (point) {
+ var shapeArgs = point.shapeArgs,
+ tooltipPos = point.tooltipPos;
+
+ point.shapeType = 'cuboid';
+ shapeArgs.alpha = alpha;
+ shapeArgs.beta = beta;
+ shapeArgs.z = z;
+ shapeArgs.origin = origin;
+ shapeArgs.depth = depth;
+
+ // Translate the tooltip position in 3d space
+ tooltipPos = perspective([{ x: tooltipPos[0], y: tooltipPos[1], z: z }], alpha, beta, origin)[0];
+ point.tooltipPos = [tooltipPos.x, tooltipPos.y];
+
+ });
+});
+
+Highcharts.wrap(Highcharts.seriesTypes.column.prototype, 'animate', function (proceed) {
+ if (!this.chart.is3d()) {
+ proceed.apply(this, [].slice.call(arguments, 1));
+ } else {
+ var args = arguments,
+ init = args[1],
+ yAxis = this.yAxis,
+ series = this,
+ reversed = this.yAxis.reversed;
+
+ if (Highcharts.svg) { // VML is too slow anyway
+ if (init) {
+ Highcharts.each(series.data, function (point) {
+ point.height = point.shapeArgs.height;
+ point.shapey = point.shapeArgs.y; //#2968
+ point.shapeArgs.height = 1;
+ if (!reversed) {
+ if (point.stackY) {
+ point.shapeArgs.y = point.plotY + yAxis.translate(point.stackY);
+ } else {
+ point.shapeArgs.y = point.plotY + (point.negative ? -point.height : point.height);
+ }
+ }
+ });
+
+ } else { // run the animation
+ Highcharts.each(series.data, function (point) {
+ point.shapeArgs.height = point.height;
+ point.shapeArgs.y = point.shapey; //#2968
+ // null value do not have a graphic
+ if (point.graphic) {
+ point.graphic.animate(point.shapeArgs, series.options.animation);
+ }
+ });
+
+ // redraw datalabels to the correct position
+ this.drawDataLabels();
+
+ // delete this function to allow it only once
+ series.animate = null;
+ }
+ }
+ }
+});
+
+Highcharts.wrap(Highcharts.seriesTypes.column.prototype, 'init', function (proceed) {
+ proceed.apply(this, [].slice.call(arguments, 1));
+
+ if (this.chart.is3d()) {
+ var seriesOptions = this.options,
+ grouping = seriesOptions.grouping,
+ stacking = seriesOptions.stacking,
+ z = 0;
+
+ if (!(grouping !== undefined && !grouping) && stacking) {
+ var stacks = this.chart.retrieveStacks(grouping, stacking),
+ stack = seriesOptions.stack || 0,
+ i; // position within the stack
+ for (i = 0; i < stacks[stack].series.length; i++) {
+ if (stacks[stack].series[i] === this) {
+ break;
+ }
+ }
+ z = (stacks.totalStacks * 10) - (10 * (stacks.totalStacks - stacks[stack].position)) - i;
+ }
+
+ seriesOptions.zIndex = z;
+ }
+});
+function draw3DPoints(proceed) {
+ // Do not do this if the chart is not 3D
+ if (this.chart.is3d()) {
+ var grouping = this.chart.options.plotOptions.column.grouping;
+ if (grouping !== undefined && !grouping && this.group.zIndex !== undefined) {
+ this.group.attr({zIndex : (this.group.zIndex * 10)});
+ }
+
+ var options = this.options,
+ states = this.options.states;
+
+ this.borderWidth = options.borderWidth = options.edgeWidth || 1;
+
+ Highcharts.each(this.data, function (point) {
+ var pointAttr = point.pointAttr;
+
+ // Set the border color to the fill color to provide a smooth edge
+ this.borderColor = Highcharts.pick(options.edgeColor, pointAttr[''].fill);
+
+ pointAttr[''].stroke = this.borderColor;
+ pointAttr.hover.stroke = Highcharts.pick(states.hover.edgeColor, this.borderColor);
+ pointAttr.select.stroke = Highcharts.pick(states.select.edgeColor, this.borderColor);
+ });
+ }
+
+ proceed.apply(this, [].slice.call(arguments, 1));
+}
+
+Highcharts.wrap(Highcharts.Series.prototype, 'alignDataLabel', function (proceed) {
+
+ // Only do this for 3D columns and columnranges
+ if (this.chart.is3d() && (this.type === 'column' || this.type === 'columnrange')) {
+ var series = this,
+ chart = series.chart,
+ options = chart.options,
+ options3d = options.chart.options3d,
+ origin = {
+ x: chart.plotWidth / 2,
+ y: chart.plotHeight / 2,
+ z: options3d.depth,
+ vd: options3d.viewDistance
+ },
+ alpha = options3d.alpha,
+ beta = options3d.beta * (chart.yAxis[0].opposite ? -1 : 1);
+
+ var args = arguments,
+ alignTo = args[4];
+
+ var pos = ({x: alignTo.x, y: alignTo.y, z: 0});
+ pos = perspective([pos], alpha, beta, origin)[0];
+ alignTo.x = pos.x;
+ alignTo.y = pos.y;
+ }
+
+ proceed.apply(this, [].slice.call(arguments, 1));
+});
+
+if (Highcharts.seriesTypes.columnrange) {
+ Highcharts.wrap(Highcharts.seriesTypes.columnrange.prototype, 'drawPoints', draw3DPoints);
+}
+
+Highcharts.wrap(Highcharts.seriesTypes.column.prototype, 'drawPoints', draw3DPoints);
+
+/***
+ EXTENSION FOR 3D CYLINDRICAL COLUMNS
+ Not supported
+***/
+var defaultOptions = Highcharts.getOptions();
+defaultOptions.plotOptions.cylinder = Highcharts.merge(defaultOptions.plotOptions.column);
+var CylinderSeries = Highcharts.extendClass(Highcharts.seriesTypes.column, {
+ type: 'cylinder'
+});
+Highcharts.seriesTypes.cylinder = CylinderSeries;
+
+Highcharts.wrap(Highcharts.seriesTypes.cylinder.prototype, 'translate', function (proceed) {
+ proceed.apply(this, [].slice.call(arguments, 1));
+
+ // Do not do this if the chart is not 3D
+ if (!this.chart.is3d()) {
+ return;
+ }
+
+ var series = this,
+ chart = series.chart,
+ options = chart.options,
+ cylOptions = options.plotOptions.cylinder,
+ options3d = options.chart.options3d,
+ depth = cylOptions.depth || 0,
+ origin = {
+ x: chart.inverted ? chart.plotHeight / 2 : chart.plotWidth / 2,
+ y: chart.inverted ? chart.plotWidth / 2 : chart.plotHeight / 2,
+ z: options3d.depth,
+ vd: options3d.viewDistance
+ },
+ alpha = options3d.alpha;
+
+ var z = cylOptions.stacking ? (this.options.stack || 0) * depth : series._i * depth;
+ z += depth / 2;
+
+ if (cylOptions.grouping !== false) { z = 0; }
+
+ Highcharts.each(series.data, function (point) {
+ var shapeArgs = point.shapeArgs;
+ point.shapeType = 'arc3d';
+ shapeArgs.x += depth / 2;
+ shapeArgs.z = z;
+ shapeArgs.start = 0;
+ shapeArgs.end = 2 * PI;
+ shapeArgs.r = depth * 0.95;
+ shapeArgs.innerR = 0;
+ shapeArgs.depth = shapeArgs.height * (1 / sin((90 - alpha) * deg2rad)) - z;
+ shapeArgs.alpha = 90 - alpha;
+ shapeArgs.beta = 0;
+ shapeArgs.origin = origin;
+ });
+});
+/***
+ EXTENSION FOR 3D PIES
+***/
+
+Highcharts.wrap(Highcharts.seriesTypes.pie.prototype, 'translate', function (proceed) {
+ proceed.apply(this, [].slice.call(arguments, 1));
+
+ // Do not do this if the chart is not 3D
+ if (!this.chart.is3d()) {
+ return;
+ }
+
+ var series = this,
+ chart = series.chart,
+ options = chart.options,
+ seriesOptions = series.options,
+ depth = seriesOptions.depth || 0,
+ options3d = options.chart.options3d,
+ origin = {
+ x: chart.plotWidth / 2,
+ y: chart.plotHeight / 2,
+ z: options3d.depth
+ },
+ alpha = options3d.alpha,
+ beta = options3d.beta;
+
+ var z = seriesOptions.stacking ? (seriesOptions.stack || 0) * depth : series._i * depth;
+ z += depth / 2;
+
+ if (seriesOptions.grouping !== false) { z = 0; }
+
+ Highcharts.each(series.data, function (point) {
+ point.shapeType = 'arc3d';
+ var shapeArgs = point.shapeArgs;
+
+ if (point.y) { // will be false if null or 0 #3006
+ shapeArgs.z = z;
+ shapeArgs.depth = depth * 0.75;
+ shapeArgs.origin = origin;
+ shapeArgs.alpha = alpha;
+ shapeArgs.beta = beta;
+
+ var angle = (shapeArgs.end + shapeArgs.start) / 2;
+
+ point.slicedTranslation = {
+ translateX : round(cos(angle) * series.options.slicedOffset * cos(alpha * deg2rad)),
+ translateY : round(sin(angle) * series.options.slicedOffset * cos(alpha * deg2rad))
+ };
+ } else {
+ shapeArgs = null;
+ }
+ });
+});
+
+Highcharts.wrap(Highcharts.seriesTypes.pie.prototype.pointClass.prototype, 'haloPath', function (proceed) {
+ return this.series.chart.is3d() ? [] : proceed.call(this);
+});
+
+Highcharts.wrap(Highcharts.seriesTypes.pie.prototype, 'drawPoints', function (proceed) {
+ // Do not do this if the chart is not 3D
+ if (this.chart.is3d()) {
+ var options = this.options,
+ states = this.options.states;
+
+ // Set the border color to the fill color to provide a smooth edge
+ this.borderWidth = options.borderWidth = options.edgeWidth || 1;
+
+ states.hover.borderColor = Highcharts.pick(states.hover.edgeColor, this.borderColor);
+ states.hover.borderWidth = Highcharts.pick(states.hover.edgeWidth, this.borderWidth);
+ states.select.borderColor = Highcharts.pick(states.select.edgeColor, this.borderColor);
+ states.select.borderWidth = Highcharts.pick(states.select.edgeWidth, this.borderWidth);
+
+ Highcharts.each(this.data, function (point) {
+ var pointAttr = point.pointAttr;
+ pointAttr[''].stroke = point.series.borderColor || point.color;
+ pointAttr['']['stroke-width'] = point.series.borderWidth;
+ pointAttr.hover.stroke = states.hover.borderColor;
+ pointAttr.hover['stroke-width'] = states.hover.borderWidth;
+ pointAttr.select.stroke = states.select.borderColor;
+ pointAttr.select['stroke-width'] = states.select.borderWidth;
+ });
+ }
+
+ proceed.apply(this, [].slice.call(arguments, 1));
+
+ if (this.chart.is3d()) {
+ var seriesGroup = this.group;
+ Highcharts.each(this.points, function (point) {
+ point.graphic.out.add(seriesGroup);
+ point.graphic.inn.add(seriesGroup);
+ point.graphic.side1.add(seriesGroup);
+ point.graphic.side2.add(seriesGroup);
+ });
+ }
+});
+
+Highcharts.wrap(Highcharts.seriesTypes.pie.prototype, 'drawDataLabels', function (proceed) {
+ if (this.chart.is3d()) {
+ var series = this;
+ Highcharts.each(series.data, function (point) {
+ var shapeArgs = point.shapeArgs,
+ r = shapeArgs.r,
+ d = shapeArgs.depth,
+ a1 = shapeArgs.alpha * deg2rad,
+ a2 = (shapeArgs.start + shapeArgs.end) / 2,
+ labelPos = point.labelPos;
+
+ labelPos[1] += (-r * (1 - cos(a1)) * sin(a2)) + (sin(a2) > 0 ? sin(a1) * d : 0);
+ labelPos[3] += (-r * (1 - cos(a1)) * sin(a2)) + (sin(a2) > 0 ? sin(a1) * d : 0);
+ labelPos[5] += (-r * (1 - cos(a1)) * sin(a2)) + (sin(a2) > 0 ? sin(a1) * d : 0);
+ });
+ }
+
+ proceed.apply(this, [].slice.call(arguments, 1));
+});
+
+Highcharts.wrap(Highcharts.seriesTypes.pie.prototype, 'addPoint', function (proceed) {
+ proceed.apply(this, [].slice.call(arguments, 1));
+ if (this.chart.is3d()) {
+ // destroy (and rebuild) everything!!!
+ this.update();
+ }
+});
+
+Highcharts.wrap(Highcharts.seriesTypes.pie.prototype, 'animate', function (proceed) {
+ if (!this.chart.is3d()) {
+ proceed.apply(this, [].slice.call(arguments, 1));
+ } else {
+ var args = arguments,
+ init = args[1],
+ animation = this.options.animation,
+ attribs,
+ center = this.center,
+ group = this.group,
+ markerGroup = this.markerGroup;
+
+ if (Highcharts.svg) { // VML is too slow anyway
+
+ if (animation === true) {
+ animation = {};
+ }
+ // Initialize the animation
+ if (init) {
+
+ // Scale down the group and place it in the center
+ group.oldtranslateX = group.translateX;
+ group.oldtranslateY = group.translateY;
+ attribs = {
+ translateX: center[0],
+ translateY: center[1],
+ scaleX: 0.001, // #1499
+ scaleY: 0.001
+ };
+
+ group.attr(attribs);
+ if (markerGroup) {
+ markerGroup.attrSetters = group.attrSetters;
+ markerGroup.attr(attribs);
+ }
+
+ // Run the animation
+ } else {
+ attribs = {
+ translateX: group.oldtranslateX,
+ translateY: group.oldtranslateY,
+ scaleX: 1,
+ scaleY: 1
+ };
+ group.animate(attribs, animation);
+
+ if (markerGroup) {
+ markerGroup.animate(attribs, animation);
+ }
+
+ // Delete this function to allow it only once
+ this.animate = null;
+ }
+
+ }
+ }
+});/***
+ EXTENSION FOR 3D SCATTER CHART
+***/
+Highcharts.wrap(Highcharts.seriesTypes.scatter.prototype, 'translate', function (proceed) {
+//function translate3d(proceed) {
+ proceed.apply(this, [].slice.call(arguments, 1));
+
+ if (!this.chart.is3d()) {
+ return;
+ }
+
+ var series = this,
+ chart = series.chart,
+ options3d = series.chart.options.chart.options3d,
+ alpha = options3d.alpha,
+ beta = options3d.beta,
+ origin = {
+ x: chart.inverted ? chart.plotHeight / 2 : chart.plotWidth / 2,
+ y: chart.inverted ? chart.plotWidth / 2 : chart.plotHeight / 2,
+ z: options3d.depth,
+ vd: options3d.viewDistance
+ },
+ depth = options3d.depth,
+ zAxis = chart.options.zAxis || { min : 0, max: depth };
+
+ var rangeModifier = depth / (zAxis.max - zAxis.min);
+
+ Highcharts.each(series.data, function (point) {
+ var pCo = {
+ x: point.plotX,
+ y: point.plotY,
+ z: (point.z - zAxis.min) * rangeModifier
+ };
+
+ pCo = perspective([pCo], alpha, beta, origin)[0];
+
+ point.plotXold = point.plotX;
+ point.plotYold = point.plotY;
+
+ point.plotX = pCo.x;
+ point.plotY = pCo.y;
+ point.plotZ = pCo.z;
+ });
+});
+
+Highcharts.wrap(Highcharts.seriesTypes.scatter.prototype, 'init', function (proceed) {
+ var result = proceed.apply(this, [].slice.call(arguments, 1));
+
+ if (this.chart.is3d()) {
+ // Add a third coordinate
+ this.pointArrayMap = ['x', 'y', 'z'];
+
+ // Set a new default tooltip formatter
+ var default3dScatterTooltip = 'x: <b>{point.x}</b><br/>y: <b>{point.y}</b><br/>z: <b>{point.z}</b><br/>';
+ if (this.userOptions.tooltip) {
+ this.tooltipOptions.pointFormat = this.userOptions.tooltip.pointFormat || default3dScatterTooltip;
+ } else {
+ this.tooltipOptions.pointFormat = default3dScatterTooltip;
+ }
+ }
+ return result;
+});/**
+ * Extension to the VML Renderer
+ */
+if (Highcharts.VMLRenderer) {
+
+Highcharts.setOptions({animate: false});
+
+Highcharts.VMLRenderer.prototype.cuboid = Highcharts.SVGRenderer.prototype.cuboid;
+Highcharts.VMLRenderer.prototype.cuboidPath = Highcharts.SVGRenderer.prototype.cuboidPath;
+
+Highcharts.VMLRenderer.prototype.toLinePath = Highcharts.SVGRenderer.prototype.toLinePath;
+
+Highcharts.VMLRenderer.prototype.createElement3D = Highcharts.SVGRenderer.prototype.createElement3D;
+
+Highcharts.VMLRenderer.prototype.arc3d = function (shapeArgs) {
+ var result = Highcharts.SVGRenderer.prototype.arc3d.call(this, shapeArgs);
+ result.css({zIndex: result.zIndex});
+ return result;
+};
+
+Highcharts.VMLRenderer.prototype.arc3dPath = Highcharts.SVGRenderer.prototype.arc3dPath;
+
+// Draw the series in the reverse order
+Highcharts.Chart.prototype.renderSeries = function () {
+ var serie,
+ i = this.series.length;
+ while (i--) {
+ serie = this.series[i];
+ serie.translate();
+ if (serie.setTooltipPoints) {
+ serie.setTooltipPoints();
+ }
+ serie.render();
+ }
+};
+
+Highcharts.wrap(Highcharts.Axis.prototype, 'render', function (proceed) {
+ proceed.apply(this, [].slice.call(arguments, 1));
+ // VML doesn't support a negative z-index
+ if (this.sideFrame) {
+ this.sideFrame.css({zIndex: 0});
+ this.sideFrame.front.attr({fill: this.sideFrame.color});
+ }
+ if (this.bottomFrame) {
+ this.bottomFrame.css({zIndex: 1});
+ this.bottomFrame.front.attr({fill: this.bottomFrame.color});
+ }
+ if (this.backFrame) {
+ this.backFrame.css({zIndex: 0});
+ this.backFrame.front.attr({fill: this.backFrame.color});
+ }
+});
+
+}
+
+}(Highcharts));
diff --git a/management/guns-admin/src/main/webapp/static/js/plugins/highcharts/highcharts-all.js b/management/guns-admin/src/main/webapp/static/js/plugins/highcharts/highcharts-all.js
new file mode 100644
index 0000000..350db6e
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/static/js/plugins/highcharts/highcharts-all.js
@@ -0,0 +1,462 @@
+/*
+ Highcharts JS v4.0.3 (2014-07-03)
+
+ Standalone Highcharts Framework
+
+ License: MIT License
+*/
+var HighchartsAdapter=function(){function o(c){function b(b,a,d){b.removeEventListener(a,d,!1)}function d(b,a,d){d=b.HCProxiedMethods[d.toString()];b.detachEvent("on"+a,d)}function a(a,c){var f=a.HCEvents,i,g,k,j;if(a.removeEventListener)i=b;else if(a.attachEvent)i=d;else return;c?(g={},g[c]=!0):g=f;for(j in g)if(f[j])for(k=f[j].length;k--;)i(a,j,f[j][k])}c.HCExtended||Highcharts.extend(c,{HCExtended:!0,HCEvents:{},bind:function(b,a){var d=this,c=this.HCEvents,g;if(d.addEventListener)d.addEventListener(b,
+a,!1);else if(d.attachEvent){g=function(b){b.target=b.srcElement||window;a.call(d,b)};if(!d.HCProxiedMethods)d.HCProxiedMethods={};d.HCProxiedMethods[a.toString()]=g;d.attachEvent("on"+b,g)}c[b]===r&&(c[b]=[]);c[b].push(a)},unbind:function(c,h){var f,i;c?(f=this.HCEvents[c]||[],h?(i=HighchartsAdapter.inArray(h,f),i>-1&&(f.splice(i,1),this.HCEvents[c]=f),this.removeEventListener?b(this,c,h):this.attachEvent&&d(this,c,h)):(a(this,c),this.HCEvents[c]=[])):(a(this),this.HCEvents={})},trigger:function(b,
+a){var d=this.HCEvents[b]||[],c=d.length,g,k,j;k=function(){a.defaultPrevented=!0};for(g=0;g<c;g++){j=d[g];if(a.stopped)break;a.preventDefault=k;a.target=this;if(!a.type)a.type=b;j.call(this,a)===!1&&a.preventDefault()}}});return c}var r,l=document,p=[],m=[],q,n;Math.easeInOutSine=function(c,b,d,a){return-d/2*(Math.cos(Math.PI*c/a)-1)+b};return{init:function(c){if(!l.defaultView)this._getStyle=function(b,d){var a;return b.style[d]?b.style[d]:(d==="opacity"&&(d="filter"),a=b.currentStyle[d.replace(/\-(\w)/g,
+function(a,b){return b.toUpperCase()})],d==="filter"&&(a=a.replace(/alpha\(opacity=([0-9]+)\)/,function(b,a){return a/100})),a===""?1:a)},this.adapterRun=function(b,d){var a={width:"clientWidth",height:"clientHeight"}[d];if(a)return b.style.zoom=1,b[a]-2*parseInt(HighchartsAdapter._getStyle(b,"padding"),10)};if(!Array.prototype.forEach)this.each=function(b,d){for(var a=0,c=b.length;a<c;a++)if(d.call(b[a],b[a],a,b)===!1)return a};if(!Array.prototype.indexOf)this.inArray=function(b,d){var a,c=0;if(d)for(a=
+d.length;c<a;c++)if(d[c]===b)return c;return-1};if(!Array.prototype.filter)this.grep=function(b,d){for(var a=[],c=0,h=b.length;c<h;c++)d(b[c],c)&&a.push(b[c]);return a};n=function(b,c,a){this.options=c;this.elem=b;this.prop=a};n.prototype={update:function(){var b;b=this.paths;var d=this.elem,a=d.element;b&&a?d.attr("d",c.step(b[0],b[1],this.now,this.toD)):d.attr?a&&d.attr(this.prop,this.now):(b={},b[this.prop]=this.now+this.unit,Highcharts.css(d,b));this.options.step&&this.options.step.call(this.elem,
+this.now,this)},custom:function(b,c,a){var e=this,h=function(a){return e.step(a)},f;this.startTime=+new Date;this.start=b;this.end=c;this.unit=a;this.now=this.start;this.pos=this.state=0;h.elem=this.elem;h()&&m.push(h)===1&&(q=setInterval(function(){for(f=0;f<m.length;f++)m[f]()||m.splice(f--,1);m.length||clearInterval(q)},13))},step:function(b){var c=+new Date,a;a=this.options;var e=this.elem,h;if(e.stopAnimation||e.attr&&!e.element)a=!1;else if(b||c>=a.duration+this.startTime){this.now=this.end;
+this.pos=this.state=1;this.update();b=this.options.curAnim[this.prop]=!0;for(h in a.curAnim)a.curAnim[h]!==!0&&(b=!1);b&&a.complete&&a.complete.call(e);a=!1}else e=c-this.startTime,this.state=e/a.duration,this.pos=a.easing(e,0,1,a.duration),this.now=this.start+(this.end-this.start)*this.pos,this.update(),a=!0;return a}};this.animate=function(b,d,a){var e,h="",f,i,g;b.stopAnimation=!1;if(typeof a!=="object"||a===null)e=arguments,a={duration:e[2],easing:e[3],complete:e[4]};if(typeof a.duration!=="number")a.duration=
+400;a.easing=Math[a.easing]||Math.easeInOutSine;a.curAnim=Highcharts.extend({},d);for(g in d)i=new n(b,a,g),f=null,g==="d"?(i.paths=c.init(b,b.d,d.d),i.toD=d.d,e=0,f=1):b.attr?e=b.attr(g):(e=parseFloat(HighchartsAdapter._getStyle(b,g))||0,g!=="opacity"&&(h="px")),f||(f=parseFloat(d[g])),i.custom(e,f,h)}},_getStyle:function(c,b){return window.getComputedStyle(c,void 0).getPropertyValue(b)},getScript:function(c,b){var d=l.getElementsByTagName("head")[0],a=l.createElement("script");a.type="text/javascript";
+a.src=c;a.onload=b;d.appendChild(a)},inArray:function(c,b){return b.indexOf?b.indexOf(c):p.indexOf.call(b,c)},adapterRun:function(c,b){return parseInt(HighchartsAdapter._getStyle(c,b),10)},grep:function(c,b){return p.filter.call(c,b)},map:function(c,b){for(var d=[],a=0,e=c.length;a<e;a++)d[a]=b.call(c[a],c[a],a,c);return d},offset:function(c){var b=document.documentElement,c=c.getBoundingClientRect();return{top:c.top+(window.pageYOffset||b.scrollTop)-(b.clientTop||0),left:c.left+(window.pageXOffset||
+b.scrollLeft)-(b.clientLeft||0)}},addEvent:function(c,b,d){o(c).bind(b,d)},removeEvent:function(c,b,d){o(c).unbind(b,d)},fireEvent:function(c,b,d,a){var e;l.createEvent&&(c.dispatchEvent||c.fireEvent)?(e=l.createEvent("Events"),e.initEvent(b,!0,!0),e.target=c,Highcharts.extend(e,d),c.dispatchEvent?c.dispatchEvent(e):c.fireEvent(b,e)):c.HCExtended===!0&&(d=d||{},c.trigger(b,d));d&&d.defaultPrevented&&(a=null);a&&a(d)},washMouseEvent:function(c){return c},stop:function(c){c.stopAnimation=!0},each:function(c,
+b){return Array.prototype.forEach.call(c,b)}}}();
+/*
+ Highcharts JS v4.0.3 (2014-07-03)
+
+ (c) 2009-2014 Torstein Honsi
+
+ License: www.highcharts.com/license
+*/
+(function(){function r(a,b){var c;a||(a={});for(c in b)a[c]=b[c];return a}function w(){var a,b=arguments,c,d={},e=function(a,b){var c,d;typeof a!=="object"&&(a={});for(d in b)b.hasOwnProperty(d)&&(c=b[d],a[d]=c&&typeof c==="object"&&Object.prototype.toString.call(c)!=="[object Array]"&&d!=="renderTo"&&typeof c.nodeType!=="number"?e(a[d]||{},c):b[d]);return a};b[0]===!0&&(d=b[1],b=Array.prototype.slice.call(b,2));c=b.length;for(a=0;a<c;a++)d=e(d,b[a]);return d}function z(a,b){return parseInt(a,b||
+10)}function Fa(a){return typeof a==="string"}function da(a){return a&&typeof a==="object"}function La(a){return Object.prototype.toString.call(a)==="[object Array]"}function ia(a){return typeof a==="number"}function za(a){return V.log(a)/V.LN10}function ja(a){return V.pow(10,a)}function ka(a,b){for(var c=a.length;c--;)if(a[c]===b){a.splice(c,1);break}}function s(a){return a!==t&&a!==null}function F(a,b,c){var d,e;if(Fa(b))s(c)?a.setAttribute(b,c):a&&a.getAttribute&&(e=a.getAttribute(b));else if(s(b)&&
+da(b))for(d in b)a.setAttribute(d,b[d]);return e}function ra(a){return La(a)?a:[a]}function p(){var a=arguments,b,c,d=a.length;for(b=0;b<d;b++)if(c=a[b],c!==t&&c!==null)return c}function A(a,b){if(Aa&&!ba&&b&&b.opacity!==t)b.filter="alpha(opacity="+b.opacity*100+")";r(a.style,b)}function $(a,b,c,d,e){a=x.createElement(a);b&&r(a,b);e&&A(a,{padding:0,border:P,margin:0});c&&A(a,c);d&&d.appendChild(a);return a}function la(a,b){var c=function(){return t};c.prototype=new a;r(c.prototype,b);return c}function Ga(a,
+b,c,d){var e=L.lang,a=+a||0,f=b===-1?(a.toString().split(".")[1]||"").length:isNaN(b=Q(b))?2:b,b=c===void 0?e.decimalPoint:c,d=d===void 0?e.thousandsSep:d,e=a<0?"-":"",c=String(z(a=Q(a).toFixed(f))),g=c.length>3?c.length%3:0;return e+(g?c.substr(0,g)+d:"")+c.substr(g).replace(/(\d{3})(?=\d)/g,"$1"+d)+(f?b+Q(a-c).toFixed(f).slice(2):"")}function Ha(a,b){return Array((b||2)+1-String(a).length).join(0)+a}function Ma(a,b,c){var d=a[b];a[b]=function(){var a=Array.prototype.slice.call(arguments);a.unshift(d);
+return c.apply(this,a)}}function Ia(a,b){for(var c="{",d=!1,e,f,g,h,i,j=[];(c=a.indexOf(c))!==-1;){e=a.slice(0,c);if(d){f=e.split(":");g=f.shift().split(".");i=g.length;e=b;for(h=0;h<i;h++)e=e[g[h]];if(f.length)f=f.join(":"),g=/\.([0-9])/,h=L.lang,i=void 0,/f$/.test(f)?(i=(i=f.match(g))?i[1]:-1,e!==null&&(e=Ga(e,i,h.decimalPoint,f.indexOf(",")>-1?h.thousandsSep:""))):e=bb(f,e)}j.push(e);a=a.slice(c+1);c=(d=!d)?"}":"{"}j.push(a);return j.join("")}function lb(a){return V.pow(10,U(V.log(a)/V.LN10))}
+function mb(a,b,c,d){var e,c=p(c,1);e=a/c;b||(b=[1,2,2.5,5,10],d&&d.allowDecimals===!1&&(c===1?b=[1,2,5,10]:c<=0.1&&(b=[1/c])));for(d=0;d<b.length;d++)if(a=b[d],e<=(b[d]+(b[d+1]||b[d]))/2)break;a*=c;return a}function nb(a,b){var c=a.length,d,e;for(e=0;e<c;e++)a[e].ss_i=e;a.sort(function(a,c){d=b(a,c);return d===0?a.ss_i-c.ss_i:d});for(e=0;e<c;e++)delete a[e].ss_i}function Na(a){for(var b=a.length,c=a[0];b--;)a[b]<c&&(c=a[b]);return c}function Ba(a){for(var b=a.length,c=a[0];b--;)a[b]>c&&(c=a[b]);
+return c}function Oa(a,b){for(var c in a)a[c]&&a[c]!==b&&a[c].destroy&&a[c].destroy(),delete a[c]}function Pa(a){cb||(cb=$(Ja));a&&cb.appendChild(a);cb.innerHTML=""}function ea(a){return parseFloat(a.toPrecision(14))}function Qa(a,b){va=p(a,b.animation)}function Ab(){var a=L.global.useUTC,b=a?"getUTC":"get",c=a?"setUTC":"set";Ra=(a&&L.global.timezoneOffset||0)*6E4;db=a?Date.UTC:function(a,b,c,g,h,i){return(new Date(a,b,p(c,1),p(g,0),p(h,0),p(i,0))).getTime()};ob=b+"Minutes";pb=b+"Hours";qb=b+"Day";
+Wa=b+"Date";eb=b+"Month";fb=b+"FullYear";Bb=c+"Minutes";Cb=c+"Hours";rb=c+"Date";Db=c+"Month";Eb=c+"FullYear"}function G(){}function Sa(a,b,c,d){this.axis=a;this.pos=b;this.type=c||"";this.isNew=!0;!c&&!d&&this.addLabel()}function ma(){this.init.apply(this,arguments)}function Xa(){this.init.apply(this,arguments)}function Fb(a,b,c,d,e){var f=a.chart.inverted;this.axis=a;this.isNegative=c;this.options=b;this.x=d;this.total=null;this.points={};this.stack=e;this.alignOptions={align:b.align||(f?c?"left":
+"right":"center"),verticalAlign:b.verticalAlign||(f?"middle":c?"bottom":"top"),y:p(b.y,f?4:c?14:-6),x:p(b.x,f?c?-6:6:0)};this.textAlign=b.textAlign||(f?c?"right":"left":"center")}var t,x=document,H=window,V=Math,v=V.round,U=V.floor,Ka=V.ceil,u=V.max,C=V.min,Q=V.abs,aa=V.cos,fa=V.sin,na=V.PI,Ca=na*2/360,wa=navigator.userAgent,Gb=H.opera,Aa=/msie/i.test(wa)&&!Gb,gb=x.documentMode===8,sb=/AppleWebKit/.test(wa),Ta=/Firefox/.test(wa),Hb=/(Mobile|Android|Windows Phone)/.test(wa),xa="http://www.w3.org/2000/svg",
+ba=!!x.createElementNS&&!!x.createElementNS(xa,"svg").createSVGRect,Nb=Ta&&parseInt(wa.split("Firefox/")[1],10)<4,ga=!ba&&!Aa&&!!x.createElement("canvas").getContext,Ya,Za,Ib={},tb=0,cb,L,bb,va,ub,B,oa,sa=function(){return t},W=[],$a=0,Ja="div",P="none",Ob=/^[0-9]+$/,Pb="stroke-width",db,Ra,ob,pb,qb,Wa,eb,fb,Bb,Cb,rb,Db,Eb,J={},S;H.Highcharts?oa(16,!0):S=H.Highcharts={};bb=function(a,b,c){if(!s(b)||isNaN(b))return"Invalid date";var a=p(a,"%Y-%m-%d %H:%M:%S"),d=new Date(b-Ra),e,f=d[pb](),g=d[qb](),
+h=d[Wa](),i=d[eb](),j=d[fb](),k=L.lang,l=k.weekdays,d=r({a:l[g].substr(0,3),A:l[g],d:Ha(h),e:h,b:k.shortMonths[i],B:k.months[i],m:Ha(i+1),y:j.toString().substr(2,2),Y:j,H:Ha(f),I:Ha(f%12||12),l:f%12||12,M:Ha(d[ob]()),p:f<12?"AM":"PM",P:f<12?"am":"pm",S:Ha(d.getSeconds()),L:Ha(v(b%1E3),3)},S.dateFormats);for(e in d)for(;a.indexOf("%"+e)!==-1;)a=a.replace("%"+e,typeof d[e]==="function"?d[e](b):d[e]);return c?a.substr(0,1).toUpperCase()+a.substr(1):a};oa=function(a,b){var c="Highcharts error #"+a+": www.highcharts.com/errors/"+
+a;if(b)throw c;H.console&&console.log(c)};B={millisecond:1,second:1E3,minute:6E4,hour:36E5,day:864E5,week:6048E5,month:26784E5,year:31556952E3};ub={init:function(a,b,c){var b=b||"",d=a.shift,e=b.indexOf("C")>-1,f=e?7:3,g,b=b.split(" "),c=[].concat(c),h,i,j=function(a){for(g=a.length;g--;)a[g]==="M"&&a.splice(g+1,0,a[g+1],a[g+2],a[g+1],a[g+2])};e&&(j(b),j(c));a.isArea&&(h=b.splice(b.length-6,6),i=c.splice(c.length-6,6));if(d<=c.length/f&&b.length===c.length)for(;d--;)c=[].concat(c).splice(0,f).concat(c);
+a.shift=0;if(b.length)for(a=c.length;b.length<a;)d=[].concat(b).splice(b.length-f,f),e&&(d[f-6]=d[f-2],d[f-5]=d[f-1]),b=b.concat(d);h&&(b=b.concat(h),c=c.concat(i));return[b,c]},step:function(a,b,c,d){var e=[],f=a.length;if(c===1)e=d;else if(f===b.length&&c<1)for(;f--;)d=parseFloat(a[f]),e[f]=isNaN(d)?a[f]:c*parseFloat(b[f]-d)+d;else e=b;return e}};(function(a){H.HighchartsAdapter=H.HighchartsAdapter||a&&{init:function(b){var c=a.fx,d=c.step,e,f=a.Tween,g=f&&f.propHooks;e=a.cssHooks.opacity;a.extend(a.easing,
+{easeOutQuad:function(a,b,c,d,e){return-d*(b/=e)*(b-2)+c}});a.each(["cur","_default","width","height","opacity"],function(a,b){var e=d,k;b==="cur"?e=c.prototype:b==="_default"&&f&&(e=g[b],b="set");(k=e[b])&&(e[b]=function(c){var d,c=a?c:this;if(c.prop!=="align")return d=c.elem,d.attr?d.attr(c.prop,b==="cur"?t:c.now):k.apply(this,arguments)})});Ma(e,"get",function(a,b,c){return b.attr?b.opacity||0:a.call(this,b,c)});e=function(a){var c=a.elem,d;if(!a.started)d=b.init(c,c.d,c.toD),a.start=d[0],a.end=
+d[1],a.started=!0;c.attr("d",b.step(a.start,a.end,a.pos,c.toD))};f?g.d={set:e}:d.d=e;this.each=Array.prototype.forEach?function(a,b){return Array.prototype.forEach.call(a,b)}:function(a,b){var c,d=a.length;for(c=0;c<d;c++)if(b.call(a[c],a[c],c,a)===!1)return c};a.fn.highcharts=function(){var a="Chart",b=arguments,c,d;if(this[0]){Fa(b[0])&&(a=b[0],b=Array.prototype.slice.call(b,1));c=b[0];if(c!==t)c.chart=c.chart||{},c.chart.renderTo=this[0],new S[a](c,b[1]),d=this;c===t&&(d=W[F(this[0],"data-highcharts-chart")])}return d}},
+getScript:a.getScript,inArray:a.inArray,adapterRun:function(b,c){return a(b)[c]()},grep:a.grep,map:function(a,c){for(var d=[],e=0,f=a.length;e<f;e++)d[e]=c.call(a[e],a[e],e,a);return d},offset:function(b){return a(b).offset()},addEvent:function(b,c,d){a(b).bind(c,d)},removeEvent:function(b,c,d){var e=x.removeEventListener?"removeEventListener":"detachEvent";x[e]&&b&&!b[e]&&(b[e]=function(){});a(b).unbind(c,d)},fireEvent:function(b,c,d,e){var f=a.Event(c),g="detached"+c,h;!Aa&&d&&(delete d.layerX,
+delete d.layerY,delete d.returnValue);r(f,d);b[c]&&(b[g]=b[c],b[c]=null);a.each(["preventDefault","stopPropagation"],function(a,b){var c=f[b];f[b]=function(){try{c.call(f)}catch(a){b==="preventDefault"&&(h=!0)}}});a(b).trigger(f);b[g]&&(b[c]=b[g],b[g]=null);e&&!f.isDefaultPrevented()&&!h&&e(f)},washMouseEvent:function(a){var c=a.originalEvent||a;if(c.pageX===t)c.pageX=a.pageX,c.pageY=a.pageY;return c},animate:function(b,c,d){var e=a(b);if(!b.style)b.style={};if(c.d)b.toD=c.d,c.d=1;e.stop();c.opacity!==
+t&&b.attr&&(c.opacity+="px");e.animate(c,d)},stop:function(b){a(b).stop()}}})(H.jQuery);var T=H.HighchartsAdapter,M=T||{};T&&T.init.call(T,ub);var hb=M.adapterRun,Qb=M.getScript,Da=M.inArray,q=M.each,vb=M.grep,Rb=M.offset,Ua=M.map,N=M.addEvent,X=M.removeEvent,K=M.fireEvent,Sb=M.washMouseEvent,ib=M.animate,ab=M.stop,M={enabled:!0,x:0,y:15,style:{color:"#606060",cursor:"default",fontSize:"11px"}};L={colors:"#7cb5ec,#434348,#90ed7d,#f7a35c,#8085e9,#f15c80,#e4d354,#8085e8,#8d4653,#91e8e1".split(","),
+symbols:["circle","diamond","square","triangle","triangle-down"],lang:{loading:"Loading...",months:"January,February,March,April,May,June,July,August,September,October,November,December".split(","),shortMonths:"Jan,Feb,Mar,Apr,May,Jun,Jul,Aug,Sep,Oct,Nov,Dec".split(","),weekdays:"Sunday,Monday,Tuesday,Wednesday,Thursday,Friday,Saturday".split(","),decimalPoint:".",numericSymbols:"k,M,G,T,P,E".split(","),resetZoom:"Reset zoom",resetZoomTitle:"Reset zoom level 1:1",thousandsSep:","},global:{useUTC:!0,
+canvasToolsURL:"http://code.highcharts.com/4.0.3/modules/canvas-tools.js",VMLRadialGradientURL:"http://code.highcharts.com/4.0.3/gfx/vml-radial-gradient.png"},chart:{borderColor:"#4572A7",borderRadius:0,defaultSeriesType:"line",ignoreHiddenSeries:!0,spacing:[10,10,15,10],backgroundColor:"#FFFFFF",plotBorderColor:"#C0C0C0",resetZoomButton:{theme:{zIndex:20},position:{align:"right",x:-10,y:10}}},title:{text:"Chart title",align:"center",margin:15,style:{color:"#333333",fontSize:"18px"}},subtitle:{text:"",
+align:"center",style:{color:"#555555"}},plotOptions:{line:{allowPointSelect:!1,showCheckbox:!1,animation:{duration:1E3},events:{},lineWidth:2,marker:{lineWidth:0,radius:4,lineColor:"#FFFFFF",states:{hover:{enabled:!0,lineWidthPlus:1,radiusPlus:2},select:{fillColor:"#FFFFFF",lineColor:"#000000",lineWidth:2}}},point:{events:{}},dataLabels:w(M,{align:"center",enabled:!1,formatter:function(){return this.y===null?"":Ga(this.y,-1)},verticalAlign:"bottom",y:0}),cropThreshold:300,pointRange:0,states:{hover:{lineWidthPlus:1,
+marker:{},halo:{size:10,opacity:0.25}},select:{marker:{}}},stickyTracking:!0,turboThreshold:1E3}},labels:{style:{position:"absolute",color:"#3E576F"}},legend:{enabled:!0,align:"center",layout:"horizontal",labelFormatter:function(){return this.name},borderColor:"#909090",borderRadius:0,navigation:{activeColor:"#274b6d",inactiveColor:"#CCC"},shadow:!1,itemStyle:{color:"#333333",fontSize:"12px",fontWeight:"bold"},itemHoverStyle:{color:"#000"},itemHiddenStyle:{color:"#CCC"},itemCheckboxStyle:{position:"absolute",
+width:"13px",height:"13px"},symbolPadding:5,verticalAlign:"bottom",x:0,y:0,title:{style:{fontWeight:"bold"}}},loading:{labelStyle:{fontWeight:"bold",position:"relative",top:"45%"},style:{position:"absolute",backgroundColor:"white",opacity:0.5,textAlign:"center"}},tooltip:{enabled:!0,animation:ba,backgroundColor:"rgba(249, 249, 249, .85)",borderWidth:1,borderRadius:3,dateTimeLabelFormats:{millisecond:"%A, %b %e, %H:%M:%S.%L",second:"%A, %b %e, %H:%M:%S",minute:"%A, %b %e, %H:%M",hour:"%A, %b %e, %H:%M",
+day:"%A, %b %e, %Y",week:"Week from %A, %b %e, %Y",month:"%B %Y",year:"%Y"},headerFormat:'<span style="font-size: 10px">{point.key}</span><br/>',pointFormat:'<span style="color:{series.color}">●</span> {series.name}: <b>{point.y}</b><br/>',shadow:!0,snap:Hb?25:10,style:{color:"#333333",cursor:"default",fontSize:"12px",padding:"8px",whiteSpace:"nowrap"}},credits:{enabled:!0,text:"Highcharts.com",href:"http://www.highcharts.com",position:{align:"right",x:-10,verticalAlign:"bottom",y:-5},style:{cursor:"pointer",
+color:"#909090",fontSize:"9px"}}};var ca=L.plotOptions,T=ca.line;Ab();var Tb=/rgba\(\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*,\s*([0-9]?(?:\.[0-9]+)?)\s*\)/,Ub=/#([a-fA-F0-9]{2})([a-fA-F0-9]{2})([a-fA-F0-9]{2})/,Vb=/rgb\(\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*\)/,ya=function(a){var b=[],c,d;(function(a){a&&a.stops?d=Ua(a.stops,function(a){return ya(a[1])}):(c=Tb.exec(a))?b=[z(c[1]),z(c[2]),z(c[3]),parseFloat(c[4],10)]:(c=Ub.exec(a))?b=[z(c[1],16),z(c[2],16),z(c[3],
+16),1]:(c=Vb.exec(a))&&(b=[z(c[1]),z(c[2]),z(c[3]),1])})(a);return{get:function(c){var f;d?(f=w(a),f.stops=[].concat(f.stops),q(d,function(a,b){f.stops[b]=[f.stops[b][0],a.get(c)]})):f=b&&!isNaN(b[0])?c==="rgb"?"rgb("+b[0]+","+b[1]+","+b[2]+")":c==="a"?b[3]:"rgba("+b.join(",")+")":a;return f},brighten:function(a){if(d)q(d,function(b){b.brighten(a)});else if(ia(a)&&a!==0){var c;for(c=0;c<3;c++)b[c]+=z(a*255),b[c]<0&&(b[c]=0),b[c]>255&&(b[c]=255)}return this},rgba:b,setOpacity:function(a){b[3]=a;return this}}};
+G.prototype={opacity:1,textProps:"fontSize,fontWeight,fontFamily,color,lineHeight,width,textDecoration,textShadow,HcTextStroke".split(","),init:function(a,b){this.element=b==="span"?$(b):x.createElementNS(xa,b);this.renderer=a},animate:function(a,b,c){b=p(b,va,!0);ab(this);if(b){b=w(b,{});if(c)b.complete=c;ib(this,a,b)}else this.attr(a),c&&c();return this},colorGradient:function(a,b,c){var d=this.renderer,e,f,g,h,i,j,k,l,m,n,o=[];a.linearGradient?f="linearGradient":a.radialGradient&&(f="radialGradient");
+if(f){g=a[f];h=d.gradients;j=a.stops;m=c.radialReference;La(g)&&(a[f]=g={x1:g[0],y1:g[1],x2:g[2],y2:g[3],gradientUnits:"userSpaceOnUse"});f==="radialGradient"&&m&&!s(g.gradientUnits)&&(g=w(g,{cx:m[0]-m[2]/2+g.cx*m[2],cy:m[1]-m[2]/2+g.cy*m[2],r:g.r*m[2],gradientUnits:"userSpaceOnUse"}));for(n in g)n!=="id"&&o.push(n,g[n]);for(n in j)o.push(j[n]);o=o.join(",");h[o]?a=h[o].attr("id"):(g.id=a="highcharts-"+tb++,h[o]=i=d.createElement(f).attr(g).add(d.defs),i.stops=[],q(j,function(a){a[1].indexOf("rgba")===
+0?(e=ya(a[1]),k=e.get("rgb"),l=e.get("a")):(k=a[1],l=1);a=d.createElement("stop").attr({offset:a[0],"stop-color":k,"stop-opacity":l}).add(i);i.stops.push(a)}));c.setAttribute(b,"url("+d.url+"#"+a+")")}},attr:function(a,b){var c,d,e=this.element,f,g=this,h;typeof a==="string"&&b!==t&&(c=a,a={},a[c]=b);if(typeof a==="string")g=(this[a+"Getter"]||this._defaultGetter).call(this,a,e);else{for(c in a){d=a[c];h=!1;this.symbolName&&/^(x|y|width|height|r|start|end|innerR|anchorX|anchorY)/.test(c)&&(f||(this.symbolAttr(a),
+f=!0),h=!0);if(this.rotation&&(c==="x"||c==="y"))this.doTransform=!0;h||(this[c+"Setter"]||this._defaultSetter).call(this,d,c,e);this.shadows&&/^(width|height|visibility|x|y|d|transform|cx|cy|r)$/.test(c)&&this.updateShadows(c,d)}if(this.doTransform)this.updateTransform(),this.doTransform=!1}return g},updateShadows:function(a,b){for(var c=this.shadows,d=c.length;d--;)c[d].setAttribute(a,a==="height"?u(b-(c[d].cutHeight||0),0):a==="d"?this.d:b)},addClass:function(a){var b=this.element,c=F(b,"class")||
+"";c.indexOf(a)===-1&&F(b,"class",c+" "+a);return this},symbolAttr:function(a){var b=this;q("x,y,r,start,end,width,height,innerR,anchorX,anchorY".split(","),function(c){b[c]=p(a[c],b[c])});b.attr({d:b.renderer.symbols[b.symbolName](b.x,b.y,b.width,b.height,b)})},clip:function(a){return this.attr("clip-path",a?"url("+this.renderer.url+"#"+a.id+")":P)},crisp:function(a){var b,c={},d,e=a.strokeWidth||this.strokeWidth||0;d=v(e)%2/2;a.x=U(a.x||this.x||0)+d;a.y=U(a.y||this.y||0)+d;a.width=U((a.width||this.width||
+0)-2*d);a.height=U((a.height||this.height||0)-2*d);a.strokeWidth=e;for(b in a)this[b]!==a[b]&&(this[b]=c[b]=a[b]);return c},css:function(a){var b=this.styles,c={},d=this.element,e,f,g="";e=!b;if(a&&a.color)a.fill=a.color;if(b)for(f in a)a[f]!==b[f]&&(c[f]=a[f],e=!0);if(e){e=this.textWidth=a&&a.width&&d.nodeName.toLowerCase()==="text"&&z(a.width);b&&(a=r(b,c));this.styles=a;e&&(ga||!ba&&this.renderer.forExport)&&delete a.width;if(Aa&&!ba)A(this.element,a);else{b=function(a,b){return"-"+b.toLowerCase()};
+for(f in a)g+=f.replace(/([A-Z])/g,b)+":"+a[f]+";";F(d,"style",g)}e&&this.added&&this.renderer.buildText(this)}return this},on:function(a,b){var c=this,d=c.element;Za&&a==="click"?(d.ontouchstart=function(a){c.touchEventFired=Date.now();a.preventDefault();b.call(d,a)},d.onclick=function(a){(wa.indexOf("Android")===-1||Date.now()-(c.touchEventFired||0)>1100)&&b.call(d,a)}):d["on"+a]=b;return this},setRadialReference:function(a){this.element.radialReference=a;return this},translate:function(a,b){return this.attr({translateX:a,
+translateY:b})},invert:function(){this.inverted=!0;this.updateTransform();return this},updateTransform:function(){var a=this.translateX||0,b=this.translateY||0,c=this.scaleX,d=this.scaleY,e=this.inverted,f=this.rotation,g=this.element;e&&(a+=this.attr("width"),b+=this.attr("height"));a=["translate("+a+","+b+")"];e?a.push("rotate(90) scale(-1,1)"):f&&a.push("rotate("+f+" "+(g.getAttribute("x")||0)+" "+(g.getAttribute("y")||0)+")");(s(c)||s(d))&&a.push("scale("+p(c,1)+" "+p(d,1)+")");a.length&&g.setAttribute("transform",
+a.join(" "))},toFront:function(){var a=this.element;a.parentNode.appendChild(a);return this},align:function(a,b,c){var d,e,f,g,h={};e=this.renderer;f=e.alignedObjects;if(a){if(this.alignOptions=a,this.alignByTranslate=b,!c||Fa(c))this.alignTo=d=c||"renderer",ka(f,this),f.push(this),c=null}else a=this.alignOptions,b=this.alignByTranslate,d=this.alignTo;c=p(c,e[d],e);d=a.align;e=a.verticalAlign;f=(c.x||0)+(a.x||0);g=(c.y||0)+(a.y||0);if(d==="right"||d==="center")f+=(c.width-(a.width||0))/{right:1,center:2}[d];
+h[b?"translateX":"x"]=v(f);if(e==="bottom"||e==="middle")g+=(c.height-(a.height||0))/({bottom:1,middle:2}[e]||1);h[b?"translateY":"y"]=v(g);this[this.placed?"animate":"attr"](h);this.placed=!0;this.alignAttr=h;return this},getBBox:function(){var a=this.bBox,b=this.renderer,c,d,e=this.rotation;c=this.element;var f=this.styles,g=e*Ca;d=this.textStr;var h;if(d===""||Ob.test(d))h="num."+d.toString().length+(f?"|"+f.fontSize+"|"+f.fontFamily:"");h&&(a=b.cache[h]);if(!a){if(c.namespaceURI===xa||b.forExport){try{a=
+c.getBBox?r({},c.getBBox()):{width:c.offsetWidth,height:c.offsetHeight}}catch(i){}if(!a||a.width<0)a={width:0,height:0}}else a=this.htmlGetBBox();if(b.isSVG){c=a.width;d=a.height;if(Aa&&f&&f.fontSize==="11px"&&d.toPrecision(3)==="16.9")a.height=d=14;if(e)a.width=Q(d*fa(g))+Q(c*aa(g)),a.height=Q(d*aa(g))+Q(c*fa(g))}this.bBox=a;h&&(b.cache[h]=a)}return a},show:function(a){return a&&this.element.namespaceURI===xa?(this.element.removeAttribute("visibility"),this):this.attr({visibility:a?"inherit":"visible"})},
+hide:function(){return this.attr({visibility:"hidden"})},fadeOut:function(a){var b=this;b.animate({opacity:0},{duration:a||150,complete:function(){b.hide()}})},add:function(a){var b=this.renderer,c=a||b,d=c.element||b.box,e=this.element,f=this.zIndex,g,h;if(a)this.parentGroup=a;this.parentInverted=a&&a.inverted;this.textStr!==void 0&&b.buildText(this);if(f)c.handleZ=!0,f=z(f);if(c.handleZ){a=d.childNodes;for(g=0;g<a.length;g++)if(b=a[g],c=F(b,"zIndex"),b!==e&&(z(c)>f||!s(f)&&s(c))){d.insertBefore(e,
+b);h=!0;break}}h||d.appendChild(e);this.added=!0;if(this.onAdd)this.onAdd();return this},safeRemoveChild:function(a){var b=a.parentNode;b&&b.removeChild(a)},destroy:function(){var a=this,b=a.element||{},c=a.shadows,d=a.renderer.isSVG&&b.nodeName==="SPAN"&&a.parentGroup,e,f;b.onclick=b.onmouseout=b.onmouseover=b.onmousemove=b.point=null;ab(a);if(a.clipPath)a.clipPath=a.clipPath.destroy();if(a.stops){for(f=0;f<a.stops.length;f++)a.stops[f]=a.stops[f].destroy();a.stops=null}a.safeRemoveChild(b);for(c&&
+q(c,function(b){a.safeRemoveChild(b)});d&&d.div&&d.div.childNodes.length===0;)b=d.parentGroup,a.safeRemoveChild(d.div),delete d.div,d=b;a.alignTo&&ka(a.renderer.alignedObjects,a);for(e in a)delete a[e];return null},shadow:function(a,b,c){var d=[],e,f,g=this.element,h,i,j,k;if(a){i=p(a.width,3);j=(a.opacity||0.15)/i;k=this.parentInverted?"(-1,-1)":"("+p(a.offsetX,1)+", "+p(a.offsetY,1)+")";for(e=1;e<=i;e++){f=g.cloneNode(0);h=i*2+1-2*e;F(f,{isShadow:"true",stroke:a.color||"black","stroke-opacity":j*
+e,"stroke-width":h,transform:"translate"+k,fill:P});if(c)F(f,"height",u(F(f,"height")-h,0)),f.cutHeight=h;b?b.element.appendChild(f):g.parentNode.insertBefore(f,g);d.push(f)}this.shadows=d}return this},xGetter:function(a){this.element.nodeName==="circle"&&(a={x:"cx",y:"cy"}[a]||a);return this._defaultGetter(a)},_defaultGetter:function(a){a=p(this[a],this.element?this.element.getAttribute(a):null,0);/^[\-0-9\.]+$/.test(a)&&(a=parseFloat(a));return a},dSetter:function(a,b,c){a&&a.join&&(a=a.join(" "));
+/(NaN| {2}|^$)/.test(a)&&(a="M 0 0");c.setAttribute(b,a);this[b]=a},dashstyleSetter:function(a){var b;if(a=a&&a.toLowerCase()){a=a.replace("shortdashdotdot","3,1,1,1,1,1,").replace("shortdashdot","3,1,1,1").replace("shortdot","1,1,").replace("shortdash","3,1,").replace("longdash","8,3,").replace(/dot/g,"1,3,").replace("dash","4,3,").replace(/,$/,"").replace("solid",1).split(",");for(b=a.length;b--;)a[b]=z(a[b])*this["stroke-width"];a=a.join(",");this.element.setAttribute("stroke-dasharray",a)}},alignSetter:function(a){this.element.setAttribute("text-anchor",
+{left:"start",center:"middle",right:"end"}[a])},opacitySetter:function(a,b,c){this[b]=a;c.setAttribute(b,a)},titleSetter:function(a){var b=this.element.getElementsByTagName("title")[0];b||(b=x.createElementNS(xa,"title"),this.element.appendChild(b));b.textContent=a},textSetter:function(a){if(a!==this.textStr)delete this.bBox,this.textStr=a,this.added&&this.renderer.buildText(this)},fillSetter:function(a,b,c){typeof a==="string"?c.setAttribute(b,a):a&&this.colorGradient(a,b,c)},zIndexSetter:function(a,
+b,c){c.setAttribute(b,a);this[b]=a},_defaultSetter:function(a,b,c){c.setAttribute(b,a)}};G.prototype.yGetter=G.prototype.xGetter;G.prototype.translateXSetter=G.prototype.translateYSetter=G.prototype.rotationSetter=G.prototype.verticalAlignSetter=G.prototype.scaleXSetter=G.prototype.scaleYSetter=function(a,b){this[b]=a;this.doTransform=!0};G.prototype["stroke-widthSetter"]=G.prototype.strokeSetter=function(a,b,c){this[b]=a;if(this.stroke&&this["stroke-width"])this.strokeWidth=this["stroke-width"],
+G.prototype.fillSetter.call(this,this.stroke,"stroke",c),c.setAttribute("stroke-width",this["stroke-width"]),this.hasStroke=!0;else if(b==="stroke-width"&&a===0&&this.hasStroke)c.removeAttribute("stroke"),this.hasStroke=!1};var ta=function(){this.init.apply(this,arguments)};ta.prototype={Element:G,init:function(a,b,c,d,e){var f=location,g,d=this.createElement("svg").attr({version:"1.1"}).css(this.getStyle(d));g=d.element;a.appendChild(g);a.innerHTML.indexOf("xmlns")===-1&&F(g,"xmlns",xa);this.isSVG=
+!0;this.box=g;this.boxWrapper=d;this.alignedObjects=[];this.url=(Ta||sb)&&x.getElementsByTagName("base").length?f.href.replace(/#.*?$/,"").replace(/([\('\)])/g,"\\$1").replace(/ /g,"%20"):"";this.createElement("desc").add().element.appendChild(x.createTextNode("Created with Highcharts 4.0.3"));this.defs=this.createElement("defs").add();this.forExport=e;this.gradients={};this.cache={};this.setSize(b,c,!1);var h;if(Ta&&a.getBoundingClientRect)this.subPixelFix=b=function(){A(a,{left:0,top:0});h=a.getBoundingClientRect();
+A(a,{left:Ka(h.left)-h.left+"px",top:Ka(h.top)-h.top+"px"})},b(),N(H,"resize",b)},getStyle:function(a){return this.style=r({fontFamily:'"Lucida Grande", "Lucida Sans Unicode", Arial, Helvetica, sans-serif',fontSize:"12px"},a)},isHidden:function(){return!this.boxWrapper.getBBox().width},destroy:function(){var a=this.defs;this.box=null;this.boxWrapper=this.boxWrapper.destroy();Oa(this.gradients||{});this.gradients=null;if(a)this.defs=a.destroy();this.subPixelFix&&X(H,"resize",this.subPixelFix);return this.alignedObjects=
+null},createElement:function(a){var b=new this.Element;b.init(this,a);return b},draw:function(){},buildText:function(a){for(var b=a.element,c=this,d=c.forExport,e=p(a.textStr,"").toString(),f=e.indexOf("<")!==-1,g=b.childNodes,h,i,j=F(b,"x"),k=a.styles,l=a.textWidth,m=k&&k.lineHeight,n=k&&k.HcTextStroke,o=g.length,Y=function(a){return m?z(m):c.fontMetrics(/(px|em)$/.test(a&&a.style.fontSize)?a.style.fontSize:k&&k.fontSize||c.style.fontSize||12,a).h};o--;)b.removeChild(g[o]);!f&&!n&&e.indexOf(" ")===
+-1?b.appendChild(x.createTextNode(e)):(h=/<.*style="([^"]+)".*>/,i=/<.*href="(http[^"]+)".*>/,l&&!a.added&&this.box.appendChild(b),e=f?e.replace(/<(b|strong)>/g,'<span style="font-weight:bold">').replace(/<(i|em)>/g,'<span style="font-style:italic">').replace(/<a/g,"<span").replace(/<\/(b|strong|i|em|a)>/g,"</span>").split(/<br.*?>/g):[e],e[e.length-1]===""&&e.pop(),q(e,function(e,f){var g,m=0,e=e.replace(/<span/g,"|||<span").replace(/<\/span>/g,"</span>|||");g=e.split("|||");q(g,function(e){if(e!==
+""||g.length===1){var n={},o=x.createElementNS(xa,"tspan"),p;h.test(e)&&(p=e.match(h)[1].replace(/(;| |^)color([ :])/,"$1fill$2"),F(o,"style",p));i.test(e)&&!d&&(F(o,"onclick",'location.href="'+e.match(i)[1]+'"'),A(o,{cursor:"pointer"}));e=(e.replace(/<(.|\n)*?>/g,"")||" ").replace(/</g,"<").replace(/>/g,">");if(e!==" "){o.appendChild(x.createTextNode(e));if(m)n.dx=0;else if(f&&j!==null)n.x=j;F(o,n);b.appendChild(o);!m&&f&&(!ba&&d&&A(o,{display:"block"}),F(o,"dy",Y(o)));if(l)for(var e=e.replace(/([^\^])-/g,
+"$1- ").split(" "),n=g.length>1||e.length>1&&k.whiteSpace!=="nowrap",q,E,s=k.HcHeight,u=[],t=Y(o),Kb=1;n&&(e.length||u.length);)delete a.bBox,q=a.getBBox(),E=q.width,!ba&&c.forExport&&(E=c.measureSpanWidth(o.firstChild.data,a.styles)),q=E>l,!q||e.length===1?(e=u,u=[],e.length&&(Kb++,s&&Kb*t>s?(e=["..."],a.attr("title",a.textStr)):(o=x.createElementNS(xa,"tspan"),F(o,{dy:t,x:j}),p&&F(o,"style",p),b.appendChild(o))),E>l&&(l=E)):(o.removeChild(o.firstChild),u.unshift(e.pop())),e.length&&o.appendChild(x.createTextNode(e.join(" ").replace(/- /g,
+"-")));m++}}})}))},button:function(a,b,c,d,e,f,g,h,i){var j=this.label(a,b,c,i,null,null,null,null,"button"),k=0,l,m,n,o,p,q,a={x1:0,y1:0,x2:0,y2:1},e=w({"stroke-width":1,stroke:"#CCCCCC",fill:{linearGradient:a,stops:[[0,"#FEFEFE"],[1,"#F6F6F6"]]},r:2,padding:5,style:{color:"black"}},e);n=e.style;delete e.style;f=w(e,{stroke:"#68A",fill:{linearGradient:a,stops:[[0,"#FFF"],[1,"#ACF"]]}},f);o=f.style;delete f.style;g=w(e,{stroke:"#68A",fill:{linearGradient:a,stops:[[0,"#9BD"],[1,"#CDF"]]}},g);p=g.style;
+delete g.style;h=w(e,{style:{color:"#CCC"}},h);q=h.style;delete h.style;N(j.element,Aa?"mouseover":"mouseenter",function(){k!==3&&j.attr(f).css(o)});N(j.element,Aa?"mouseout":"mouseleave",function(){k!==3&&(l=[e,f,g][k],m=[n,o,p][k],j.attr(l).css(m))});j.setState=function(a){(j.state=k=a)?a===2?j.attr(g).css(p):a===3&&j.attr(h).css(q):j.attr(e).css(n)};return j.on("click",function(){k!==3&&d.call(j)}).attr(e).css(r({cursor:"default"},n))},crispLine:function(a,b){a[1]===a[4]&&(a[1]=a[4]=v(a[1])-b%
+2/2);a[2]===a[5]&&(a[2]=a[5]=v(a[2])+b%2/2);return a},path:function(a){var b={fill:P};La(a)?b.d=a:da(a)&&r(b,a);return this.createElement("path").attr(b)},circle:function(a,b,c){a=da(a)?a:{x:a,y:b,r:c};b=this.createElement("circle");b.xSetter=function(a){this.element.setAttribute("cx",a)};b.ySetter=function(a){this.element.setAttribute("cy",a)};return b.attr(a)},arc:function(a,b,c,d,e,f){if(da(a))b=a.y,c=a.r,d=a.innerR,e=a.start,f=a.end,a=a.x;a=this.symbol("arc",a||0,b||0,c||0,c||0,{innerR:d||0,start:e||
+0,end:f||0});a.r=c;return a},rect:function(a,b,c,d,e,f){var e=da(a)?a.r:e,g=this.createElement("rect"),a=da(a)?a:a===t?{}:{x:a,y:b,width:u(c,0),height:u(d,0)};if(f!==t)a.strokeWidth=f,a=g.crisp(a);if(e)a.r=e;g.rSetter=function(a){F(this.element,{rx:a,ry:a})};return g.attr(a)},setSize:function(a,b,c){var d=this.alignedObjects,e=d.length;this.width=a;this.height=b;for(this.boxWrapper[p(c,!0)?"animate":"attr"]({width:a,height:b});e--;)d[e].align()},g:function(a){var b=this.createElement("g");return s(a)?
+b.attr({"class":"highcharts-"+a}):b},image:function(a,b,c,d,e){var f={preserveAspectRatio:P};arguments.length>1&&r(f,{x:b,y:c,width:d,height:e});f=this.createElement("image").attr(f);f.element.setAttributeNS?f.element.setAttributeNS("http://www.w3.org/1999/xlink","href",a):f.element.setAttribute("hc-svg-href",a);return f},symbol:function(a,b,c,d,e,f){var g,h=this.symbols[a],h=h&&h(v(b),v(c),d,e,f),i=/^url\((.*?)\)$/,j,k;if(h)g=this.path(h),r(g,{symbolName:a,x:b,y:c,width:d,height:e}),f&&r(g,f);else if(i.test(a))k=
+function(a,b){a.element&&(a.attr({width:b[0],height:b[1]}),a.alignByTranslate||a.translate(v((d-b[0])/2),v((e-b[1])/2)))},j=a.match(i)[1],a=Ib[j],g=this.image(j).attr({x:b,y:c}),g.isImg=!0,a?k(g,a):(g.attr({width:0,height:0}),$("img",{onload:function(){k(g,Ib[j]=[this.width,this.height])},src:j}));return g},symbols:{circle:function(a,b,c,d){var e=0.166*c;return["M",a+c/2,b,"C",a+c+e,b,a+c+e,b+d,a+c/2,b+d,"C",a-e,b+d,a-e,b,a+c/2,b,"Z"]},square:function(a,b,c,d){return["M",a,b,"L",a+c,b,a+c,b+d,a,b+
+d,"Z"]},triangle:function(a,b,c,d){return["M",a+c/2,b,"L",a+c,b+d,a,b+d,"Z"]},"triangle-down":function(a,b,c,d){return["M",a,b,"L",a+c,b,a+c/2,b+d,"Z"]},diamond:function(a,b,c,d){return["M",a+c/2,b,"L",a+c,b+d/2,a+c/2,b+d,a,b+d/2,"Z"]},arc:function(a,b,c,d,e){var f=e.start,c=e.r||c||d,g=e.end-0.001,d=e.innerR,h=e.open,i=aa(f),j=fa(f),k=aa(g),g=fa(g),e=e.end-f<na?0:1;return["M",a+c*i,b+c*j,"A",c,c,0,e,1,a+c*k,b+c*g,h?"M":"L",a+d*k,b+d*g,"A",d,d,0,e,0,a+d*i,b+d*j,h?"":"Z"]},callout:function(a,b,c,d,
+e){var f=C(e&&e.r||0,c,d),g=f+6,h=e&&e.anchorX,i=e&&e.anchorY,e=v(e.strokeWidth||0)%2/2;a+=e;b+=e;e=["M",a+f,b,"L",a+c-f,b,"C",a+c,b,a+c,b,a+c,b+f,"L",a+c,b+d-f,"C",a+c,b+d,a+c,b+d,a+c-f,b+d,"L",a+f,b+d,"C",a,b+d,a,b+d,a,b+d-f,"L",a,b+f,"C",a,b,a,b,a+f,b];h&&h>c&&i>b+g&&i<b+d-g?e.splice(13,3,"L",a+c,i-6,a+c+6,i,a+c,i+6,a+c,b+d-f):h&&h<0&&i>b+g&&i<b+d-g?e.splice(33,3,"L",a,i+6,a-6,i,a,i-6,a,b+f):i&&i>d&&h>a+g&&h<a+c-g?e.splice(23,3,"L",h+6,b+d,h,b+d+6,h-6,b+d,a+f,b+d):i&&i<0&&h>a+g&&h<a+c-g&&e.splice(3,
+3,"L",h-6,b,h,b-6,h+6,b,c-f,b);return e}},clipRect:function(a,b,c,d){var e="highcharts-"+tb++,f=this.createElement("clipPath").attr({id:e}).add(this.defs),a=this.rect(a,b,c,d,0).add(f);a.id=e;a.clipPath=f;return a},text:function(a,b,c,d){var e=ga||!ba&&this.forExport,f={};if(d&&!this.forExport)return this.html(a,b,c);f.x=Math.round(b||0);if(c)f.y=Math.round(c);if(a||a===0)f.text=a;a=this.createElement("text").attr(f);e&&a.css({position:"absolute"});if(!d)a.xSetter=function(a,b,c){var d=c.getElementsByTagName("tspan"),
+e,f=c.getAttribute(b),m;for(m=0;m<d.length;m++)e=d[m],e.getAttribute(b)===f&&e.setAttribute(b,a);c.setAttribute(b,a)};return a},fontMetrics:function(a,b){a=a||this.style.fontSize;if(b&&H.getComputedStyle)b=b.element||b,a=H.getComputedStyle(b,"").fontSize;var a=/px/.test(a)?z(a):/em/.test(a)?parseFloat(a)*12:12,c=a<24?a+4:v(a*1.2),d=v(c*0.8);return{h:c,b:d,f:a}},label:function(a,b,c,d,e,f,g,h,i){function j(){var a,b;a=o.element.style;E=(u===void 0||wb===void 0||n.styles.textAlign)&&o.textStr&&o.getBBox();
+n.width=(u||E.width||0)+2*D+jb;n.height=(wb||E.height||0)+2*D;R=D+m.fontMetrics(a&&a.fontSize,o).b;if(z){if(!p)a=v(-I*D),b=h?-R:0,n.box=p=d?m.symbol(d,a,b,n.width,n.height,y):m.rect(a,b,n.width,n.height,0,y[Pb]),p.attr("fill",P).add(n);p.isImg||p.attr(r({width:v(n.width),height:v(n.height)},y));y=null}}function k(){var a=n.styles,a=a&&a.textAlign,b=jb+D*(1-I),c;c=h?0:R;if(s(u)&&E&&(a==="center"||a==="right"))b+={center:0.5,right:1}[a]*(u-E.width);if(b!==o.x||c!==o.y)o.attr("x",b),c!==t&&o.attr("y",
+c);o.x=b;o.y=c}function l(a,b){p?p.attr(a,b):y[a]=b}var m=this,n=m.g(i),o=m.text("",0,0,g).attr({zIndex:1}),p,E,I=0,D=3,jb=0,u,wb,xb,x,Jb=0,y={},R,z;n.onAdd=function(){o.add(n);n.attr({text:a||"",x:b,y:c});p&&s(e)&&n.attr({anchorX:e,anchorY:f})};n.widthSetter=function(a){u=a};n.heightSetter=function(a){wb=a};n.paddingSetter=function(a){s(a)&&a!==D&&(D=a,k())};n.paddingLeftSetter=function(a){s(a)&&a!==jb&&(jb=a,k())};n.alignSetter=function(a){I={left:0,center:0.5,right:1}[a]};n.textSetter=function(a){a!==
+t&&o.textSetter(a);j();k()};n["stroke-widthSetter"]=function(a,b){a&&(z=!0);Jb=a%2/2;l(b,a)};n.strokeSetter=n.fillSetter=n.rSetter=function(a,b){b==="fill"&&a&&(z=!0);l(b,a)};n.anchorXSetter=function(a,b){e=a;l(b,a+Jb-xb)};n.anchorYSetter=function(a,b){f=a;l(b,a-x)};n.xSetter=function(a){n.x=a;I&&(a-=I*((u||E.width)+D));xb=v(a);n.attr("translateX",xb)};n.ySetter=function(a){x=n.y=v(a);n.attr("translateY",x)};var C=n.css;return r(n,{css:function(a){if(a){var b={},a=w(a);q(n.textProps,function(c){a[c]!==
+t&&(b[c]=a[c],delete a[c])});o.css(b)}return C.call(n,a)},getBBox:function(){return{width:E.width+2*D,height:E.height+2*D,x:E.x-D,y:E.y-D}},shadow:function(a){p&&p.shadow(a);return n},destroy:function(){X(n.element,"mouseenter");X(n.element,"mouseleave");o&&(o=o.destroy());p&&(p=p.destroy());G.prototype.destroy.call(n);n=m=j=k=l=null}})}};Ya=ta;r(G.prototype,{htmlCss:function(a){var b=this.element;if(b=a&&b.tagName==="SPAN"&&a.width)delete a.width,this.textWidth=b,this.updateTransform();this.styles=
+r(this.styles,a);A(this.element,a);return this},htmlGetBBox:function(){var a=this.element,b=this.bBox;if(!b){if(a.nodeName==="text")a.style.position="absolute";b=this.bBox={x:a.offsetLeft,y:a.offsetTop,width:a.offsetWidth,height:a.offsetHeight}}return b},htmlUpdateTransform:function(){if(this.added){var a=this.renderer,b=this.element,c=this.translateX||0,d=this.translateY||0,e=this.x||0,f=this.y||0,g=this.textAlign||"left",h={left:0,center:0.5,right:1}[g],i=this.shadows;A(b,{marginLeft:c,marginTop:d});
+i&&q(i,function(a){A(a,{marginLeft:c+1,marginTop:d+1})});this.inverted&&q(b.childNodes,function(c){a.invertChild(c,b)});if(b.tagName==="SPAN"){var j=this.rotation,k,l=z(this.textWidth),m=[j,g,b.innerHTML,this.textWidth].join(",");if(m!==this.cTT){k=a.fontMetrics(b.style.fontSize).b;s(j)&&this.setSpanRotation(j,h,k);i=p(this.elemWidth,b.offsetWidth);if(i>l&&/[ \-]/.test(b.textContent||b.innerText))A(b,{width:l+"px",display:"block",whiteSpace:"normal"}),i=l;this.getSpanCorrection(i,k,h,j,g)}A(b,{left:e+
+(this.xCorr||0)+"px",top:f+(this.yCorr||0)+"px"});if(sb)k=b.offsetHeight;this.cTT=m}}else this.alignOnAdd=!0},setSpanRotation:function(a,b,c){var d={},e=Aa?"-ms-transform":sb?"-webkit-transform":Ta?"MozTransform":Gb?"-o-transform":"";d[e]=d.transform="rotate("+a+"deg)";d[e+(Ta?"Origin":"-origin")]=d.transformOrigin=b*100+"% "+c+"px";A(this.element,d)},getSpanCorrection:function(a,b,c){this.xCorr=-a*c;this.yCorr=-b}});r(ta.prototype,{html:function(a,b,c){var d=this.createElement("span"),e=d.element,
+f=d.renderer;d.textSetter=function(a){a!==e.innerHTML&&delete this.bBox;e.innerHTML=this.textStr=a};d.xSetter=d.ySetter=d.alignSetter=d.rotationSetter=function(a,b){b==="align"&&(b="textAlign");d[b]=a;d.htmlUpdateTransform()};d.attr({text:a,x:v(b),y:v(c)}).css({position:"absolute",whiteSpace:"nowrap",fontFamily:this.style.fontFamily,fontSize:this.style.fontSize});d.css=d.htmlCss;if(f.isSVG)d.add=function(a){var b,c=f.box.parentNode,j=[];if(this.parentGroup=a){if(b=a.div,!b){for(;a;)j.push(a),a=a.parentGroup;
+q(j.reverse(),function(a){var d;b=a.div=a.div||$(Ja,{className:F(a.element,"class")},{position:"absolute",left:(a.translateX||0)+"px",top:(a.translateY||0)+"px"},b||c);d=b.style;r(a,{translateXSetter:function(b,c){d.left=b+"px";a[c]=b;a.doTransform=!0},translateYSetter:function(b,c){d.top=b+"px";a[c]=b;a.doTransform=!0},visibilitySetter:function(a,b){d[b]=a}})})}}else b=c;b.appendChild(e);d.added=!0;d.alignOnAdd&&d.htmlUpdateTransform();return d};return d}});var Z;if(!ba&&!ga){Z={init:function(a,
+b){var c=["<",b,' filled="f" stroked="f"'],d=["position: ","absolute",";"],e=b===Ja;(b==="shape"||e)&&d.push("left:0;top:0;width:1px;height:1px;");d.push("visibility: ",e?"hidden":"visible");c.push(' style="',d.join(""),'"/>');if(b)c=e||b==="span"||b==="img"?c.join(""):a.prepVML(c),this.element=$(c);this.renderer=a},add:function(a){var b=this.renderer,c=this.element,d=b.box,d=a?a.element||a:d;a&&a.inverted&&b.invertChild(c,d);d.appendChild(c);this.added=!0;this.alignOnAdd&&!this.deferUpdateTransform&&
+this.updateTransform();if(this.onAdd)this.onAdd();return this},updateTransform:G.prototype.htmlUpdateTransform,setSpanRotation:function(){var a=this.rotation,b=aa(a*Ca),c=fa(a*Ca);A(this.element,{filter:a?["progid:DXImageTransform.Microsoft.Matrix(M11=",b,", M12=",-c,", M21=",c,", M22=",b,", sizingMethod='auto expand')"].join(""):P})},getSpanCorrection:function(a,b,c,d,e){var f=d?aa(d*Ca):1,g=d?fa(d*Ca):0,h=p(this.elemHeight,this.element.offsetHeight),i;this.xCorr=f<0&&-a;this.yCorr=g<0&&-h;i=f*g<
+0;this.xCorr+=g*b*(i?1-c:c);this.yCorr-=f*b*(d?i?c:1-c:1);e&&e!=="left"&&(this.xCorr-=a*c*(f<0?-1:1),d&&(this.yCorr-=h*c*(g<0?-1:1)),A(this.element,{textAlign:e}))},pathToVML:function(a){for(var b=a.length,c=[];b--;)if(ia(a[b]))c[b]=v(a[b]*10)-5;else if(a[b]==="Z")c[b]="x";else if(c[b]=a[b],a.isArc&&(a[b]==="wa"||a[b]==="at"))c[b+5]===c[b+7]&&(c[b+7]+=a[b+7]>a[b+5]?1:-1),c[b+6]===c[b+8]&&(c[b+8]+=a[b+8]>a[b+6]?1:-1);return c.join(" ")||"x"},clip:function(a){var b=this,c;a?(c=a.members,ka(c,b),c.push(b),
+b.destroyClip=function(){ka(c,b)},a=a.getCSS(b)):(b.destroyClip&&b.destroyClip(),a={clip:gb?"inherit":"rect(auto)"});return b.css(a)},css:G.prototype.htmlCss,safeRemoveChild:function(a){a.parentNode&&Pa(a)},destroy:function(){this.destroyClip&&this.destroyClip();return G.prototype.destroy.apply(this)},on:function(a,b){this.element["on"+a]=function(){var a=H.event;a.target=a.srcElement;b(a)};return this},cutOffPath:function(a,b){var c,a=a.split(/[ ,]/);c=a.length;if(c===9||c===11)a[c-4]=a[c-2]=z(a[c-
+2])-10*b;return a.join(" ")},shadow:function(a,b,c){var d=[],e,f=this.element,g=this.renderer,h,i=f.style,j,k=f.path,l,m,n,o;k&&typeof k.value!=="string"&&(k="x");m=k;if(a){n=p(a.width,3);o=(a.opacity||0.15)/n;for(e=1;e<=3;e++){l=n*2+1-2*e;c&&(m=this.cutOffPath(k.value,l+0.5));j=['<shape isShadow="true" strokeweight="',l,'" filled="false" path="',m,'" coordsize="10 10" style="',f.style.cssText,'" />'];h=$(g.prepVML(j),null,{left:z(i.left)+p(a.offsetX,1),top:z(i.top)+p(a.offsetY,1)});if(c)h.cutOff=
+l+1;j=['<stroke color="',a.color||"black",'" opacity="',o*e,'"/>'];$(g.prepVML(j),null,null,h);b?b.element.appendChild(h):f.parentNode.insertBefore(h,f);d.push(h)}this.shadows=d}return this},updateShadows:sa,setAttr:function(a,b){gb?this.element[a]=b:this.element.setAttribute(a,b)},classSetter:function(a){this.element.className=a},dashstyleSetter:function(a,b,c){(c.getElementsByTagName("stroke")[0]||$(this.renderer.prepVML(["<stroke/>"]),null,null,c))[b]=a||"solid";this[b]=a},dSetter:function(a,b,
+c){var d=this.shadows,a=a||[];this.d=a.join&&a.join(" ");c.path=a=this.pathToVML(a);if(d)for(c=d.length;c--;)d[c].path=d[c].cutOff?this.cutOffPath(a,d[c].cutOff):a;this.setAttr(b,a)},fillSetter:function(a,b,c){var d=c.nodeName;if(d==="SPAN")c.style.color=a;else if(d!=="IMG")c.filled=a!==P,this.setAttr("fillcolor",this.renderer.color(a,c,b,this))},opacitySetter:sa,rotationSetter:function(a,b,c){c=c.style;this[b]=c[b]=a;c.left=-v(fa(a*Ca)+1)+"px";c.top=v(aa(a*Ca))+"px"},strokeSetter:function(a,b,c){this.setAttr("strokecolor",
+this.renderer.color(a,c,b))},"stroke-widthSetter":function(a,b,c){c.stroked=!!a;this[b]=a;ia(a)&&(a+="px");this.setAttr("strokeweight",a)},titleSetter:function(a,b){this.setAttr(b,a)},visibilitySetter:function(a,b,c){a==="inherit"&&(a="visible");this.shadows&&q(this.shadows,function(c){c.style[b]=a});c.nodeName==="DIV"&&(a=a==="hidden"?"-999em":0,gb||(c.style[b]=a?"visible":"hidden"),b="top");c.style[b]=a},xSetter:function(a,b,c){this[b]=a;b==="x"?b="left":b==="y"&&(b="top");this.updateClipping?(this[b]=
+a,this.updateClipping()):c.style[b]=a},zIndexSetter:function(a,b,c){c.style[b]=a}};S.VMLElement=Z=la(G,Z);Z.prototype.ySetter=Z.prototype.widthSetter=Z.prototype.heightSetter=Z.prototype.xSetter;var ha={Element:Z,isIE8:wa.indexOf("MSIE 8.0")>-1,init:function(a,b,c,d){var e;this.alignedObjects=[];d=this.createElement(Ja).css(r(this.getStyle(d),{position:"relative"}));e=d.element;a.appendChild(d.element);this.isVML=!0;this.box=e;this.boxWrapper=d;this.cache={};this.setSize(b,c,!1);if(!x.namespaces.hcv){x.namespaces.add("hcv",
+"urn:schemas-microsoft-com:vml");try{x.createStyleSheet().cssText="hcv\\:fill, hcv\\:path, hcv\\:shape, hcv\\:stroke{ behavior:url(#default#VML); display: inline-block; } "}catch(f){x.styleSheets[0].cssText+="hcv\\:fill, hcv\\:path, hcv\\:shape, hcv\\:stroke{ behavior:url(#default#VML); display: inline-block; } "}}},isHidden:function(){return!this.box.offsetWidth},clipRect:function(a,b,c,d){var e=this.createElement(),f=da(a);return r(e,{members:[],left:(f?a.x:a)+1,top:(f?a.y:b)+1,width:(f?a.width:
+c)-1,height:(f?a.height:d)-1,getCSS:function(a){var b=a.element,c=b.nodeName,a=a.inverted,d=this.top-(c==="shape"?b.offsetTop:0),e=this.left,b=e+this.width,f=d+this.height,d={clip:"rect("+v(a?e:d)+"px,"+v(a?f:b)+"px,"+v(a?b:f)+"px,"+v(a?d:e)+"px)"};!a&&gb&&c==="DIV"&&r(d,{width:b+"px",height:f+"px"});return d},updateClipping:function(){q(e.members,function(a){a.element&&a.css(e.getCSS(a))})}})},color:function(a,b,c,d){var e=this,f,g=/^rgba/,h,i,j=P;a&&a.linearGradient?i="gradient":a&&a.radialGradient&&
+(i="pattern");if(i){var k,l,m=a.linearGradient||a.radialGradient,n,o,p,E,I,D="",a=a.stops,u,s=[],t=function(){h=['<fill colors="'+s.join(",")+'" opacity="',p,'" o:opacity2="',o,'" type="',i,'" ',D,'focus="100%" method="any" />'];$(e.prepVML(h),null,null,b)};n=a[0];u=a[a.length-1];n[0]>0&&a.unshift([0,n[1]]);u[0]<1&&a.push([1,u[1]]);q(a,function(a,b){g.test(a[1])?(f=ya(a[1]),k=f.get("rgb"),l=f.get("a")):(k=a[1],l=1);s.push(a[0]*100+"% "+k);b?(p=l,E=k):(o=l,I=k)});if(c==="fill")if(i==="gradient")c=
+m.x1||m[0]||0,a=m.y1||m[1]||0,n=m.x2||m[2]||0,m=m.y2||m[3]||0,D='angle="'+(90-V.atan((m-a)/(n-c))*180/na)+'"',t();else{var j=m.r,r=j*2,v=j*2,x=m.cx,y=m.cy,R=b.radialReference,w,j=function(){R&&(w=d.getBBox(),x+=(R[0]-w.x)/w.width-0.5,y+=(R[1]-w.y)/w.height-0.5,r*=R[2]/w.width,v*=R[2]/w.height);D='src="'+L.global.VMLRadialGradientURL+'" size="'+r+","+v+'" origin="0.5,0.5" position="'+x+","+y+'" color2="'+I+'" ';t()};d.added?j():d.onAdd=j;j=E}else j=k}else if(g.test(a)&&b.tagName!=="IMG")f=ya(a),h=
+["<",c,' opacity="',f.get("a"),'"/>'],$(this.prepVML(h),null,null,b),j=f.get("rgb");else{j=b.getElementsByTagName(c);if(j.length)j[0].opacity=1,j[0].type="solid";j=a}return j},prepVML:function(a){var b=this.isIE8,a=a.join("");b?(a=a.replace("/>",' xmlns="urn:schemas-microsoft-com:vml" />'),a=a.indexOf('style="')===-1?a.replace("/>",' style="display:inline-block;behavior:url(#default#VML);" />'):a.replace('style="','style="display:inline-block;behavior:url(#default#VML);')):a=a.replace("<","<hcv:");
+return a},text:ta.prototype.html,path:function(a){var b={coordsize:"10 10"};La(a)?b.d=a:da(a)&&r(b,a);return this.createElement("shape").attr(b)},circle:function(a,b,c){var d=this.symbol("circle");if(da(a))c=a.r,b=a.y,a=a.x;d.isCircle=!0;d.r=c;return d.attr({x:a,y:b})},g:function(a){var b;a&&(b={className:"highcharts-"+a,"class":"highcharts-"+a});return this.createElement(Ja).attr(b)},image:function(a,b,c,d,e){var f=this.createElement("img").attr({src:a});arguments.length>1&&f.attr({x:b,y:c,width:d,
+height:e});return f},createElement:function(a){return a==="rect"?this.symbol(a):ta.prototype.createElement.call(this,a)},invertChild:function(a,b){var c=this,d=b.style,e=a.tagName==="IMG"&&a.style;A(a,{flip:"x",left:z(d.width)-(e?z(e.top):1),top:z(d.height)-(e?z(e.left):1),rotation:-90});q(a.childNodes,function(b){c.invertChild(b,a)})},symbols:{arc:function(a,b,c,d,e){var f=e.start,g=e.end,h=e.r||c||d,c=e.innerR,d=aa(f),i=fa(f),j=aa(g),k=fa(g);if(g-f===0)return["x"];f=["wa",a-h,b-h,a+h,b+h,a+h*d,
+b+h*i,a+h*j,b+h*k];e.open&&!c&&f.push("e","M",a,b);f.push("at",a-c,b-c,a+c,b+c,a+c*j,b+c*k,a+c*d,b+c*i,"x","e");f.isArc=!0;return f},circle:function(a,b,c,d,e){e&&(c=d=2*e.r);e&&e.isCircle&&(a-=c/2,b-=d/2);return["wa",a,b,a+c,b+d,a+c,b+d/2,a+c,b+d/2,"e"]},rect:function(a,b,c,d,e){return ta.prototype.symbols[!s(e)||!e.r?"square":"callout"].call(0,a,b,c,d,e)}}};S.VMLRenderer=Z=function(){this.init.apply(this,arguments)};Z.prototype=w(ta.prototype,ha);Ya=Z}ta.prototype.measureSpanWidth=function(a,b){var c=
+x.createElement("span"),d;d=x.createTextNode(a);c.appendChild(d);A(c,b);this.box.appendChild(c);d=c.offsetWidth;Pa(c);return d};var Lb;if(ga)S.CanVGRenderer=Z=function(){xa="http://www.w3.org/1999/xhtml"},Z.prototype.symbols={},Lb=function(){function a(){var a=b.length,d;for(d=0;d<a;d++)b[d]();b=[]}var b=[];return{push:function(c,d){b.length===0&&Qb(d,a);b.push(c)}}}(),Ya=Z;Sa.prototype={addLabel:function(){var a=this.axis,b=a.options,c=a.chart,d=a.horiz,e=a.categories,f=a.names,g=this.pos,h=b.labels,
+i=h.rotation,j=a.tickPositions,d=d&&e&&!h.step&&!h.staggerLines&&!h.rotation&&c.plotWidth/j.length||!d&&(c.margin[3]||c.chartWidth*0.33),k=g===j[0],l=g===j[j.length-1],m,f=e?p(e[g],f[g],g):g,e=this.label,n=j.info;a.isDatetimeAxis&&n&&(m=b.dateTimeLabelFormats[n.higherRanks[g]||n.unitName]);this.isFirst=k;this.isLast=l;b=a.labelFormatter.call({axis:a,chart:c,isFirst:k,isLast:l,dateTimeLabelFormat:m,value:a.isLog?ea(ja(f)):f});g=d&&{width:u(1,v(d-2*(h.padding||10)))+"px"};g=r(g,h.style);if(s(e))e&&
+e.attr({text:b}).css(g);else{m={align:a.labelAlign};if(ia(i))m.rotation=i;if(d&&h.ellipsis)g.HcHeight=a.len/j.length;this.label=e=s(b)&&h.enabled?c.renderer.text(b,0,0,h.useHTML).attr(m).css(g).add(a.labelGroup):null;a.tickBaseline=c.renderer.fontMetrics(h.style.fontSize,e).b;i&&a.side===2&&(a.tickBaseline*=aa(i*Ca))}this.yOffset=e?p(h.y,a.tickBaseline+(a.side===2?8:-(e.getBBox().height/2))):0},getLabelSize:function(){var a=this.label,b=this.axis;return a?a.getBBox()[b.horiz?"height":"width"]:0},
+getLabelSides:function(){var a=this.label.getBBox(),b=this.axis,c=b.horiz,d=b.options.labels,a=c?a.width:a.height,b=c?d.x-a*{left:0,center:0.5,right:1}[b.labelAlign]:0;return[b,c?a+b:a]},handleOverflow:function(a,b){var c=!0,d=this.axis,e=this.isFirst,f=this.isLast,g=d.horiz?b.x:b.y,h=d.reversed,i=d.tickPositions,j=this.getLabelSides(),k=j[0],j=j[1],l,m,n,o=this.label.line||0;l=d.labelEdge;m=d.justifyLabels&&(e||f);l[o]===t||g+k>l[o]?l[o]=g+j:m||(c=!1);if(m){l=(m=d.justifyToPlot)?d.pos:0;m=m?l+d.len:
+d.chart.chartWidth;do a+=e?1:-1,n=d.ticks[i[a]];while(i[a]&&(!n||!n.label||n.label.line!==o));d=n&&n.label.xy&&n.label.xy.x+n.getLabelSides()[e?0:1];e&&!h||f&&h?g+k<l&&(g=l-k,n&&g+j>d&&(c=!1)):g+j>m&&(g=m-j,n&&g+k<d&&(c=!1));b.x=g}return c},getPosition:function(a,b,c,d){var e=this.axis,f=e.chart,g=d&&f.oldChartHeight||f.chartHeight;return{x:a?e.translate(b+c,null,null,d)+e.transB:e.left+e.offset+(e.opposite?(d&&f.oldChartWidth||f.chartWidth)-e.right-e.left:0),y:a?g-e.bottom+e.offset-(e.opposite?e.height:
+0):g-e.translate(b+c,null,null,d)-e.transB}},getLabelPosition:function(a,b,c,d,e,f,g,h){var i=this.axis,j=i.transA,k=i.reversed,l=i.staggerLines,a=a+e.x-(f&&d?f*j*(k?-1:1):0),b=b+this.yOffset-(f&&!d?f*j*(k?1:-1):0);if(l)c.line=g/(h||1)%l,b+=c.line*(i.labelOffset/l);return{x:a,y:b}},getMarkPath:function(a,b,c,d,e,f){return f.crispLine(["M",a,b,"L",a+(e?0:-c),b+(e?c:0)],d)},render:function(a,b,c){var d=this.axis,e=d.options,f=d.chart.renderer,g=d.horiz,h=this.type,i=this.label,j=this.pos,k=e.labels,
+l=this.gridLine,m=h?h+"Grid":"grid",n=h?h+"Tick":"tick",o=e[m+"LineWidth"],q=e[m+"LineColor"],E=e[m+"LineDashStyle"],I=e[n+"Length"],m=e[n+"Width"]||0,D=e[n+"Color"],u=e[n+"Position"],n=this.mark,s=k.step,r=!0,v=d.tickmarkOffset,w=this.getPosition(g,j,v,b),x=w.x,w=w.y,y=g&&x===d.pos+d.len||!g&&w===d.pos?-1:1,c=p(c,1);this.isActive=!0;if(o){j=d.getPlotLinePath(j+v,o*y,b,!0);if(l===t){l={stroke:q,"stroke-width":o};if(E)l.dashstyle=E;if(!h)l.zIndex=1;if(b)l.opacity=0;this.gridLine=l=o?f.path(j).attr(l).add(d.gridGroup):
+null}if(!b&&l&&j)l[this.isNew?"attr":"animate"]({d:j,opacity:c})}if(m&&I)u==="inside"&&(I=-I),d.opposite&&(I=-I),h=this.getMarkPath(x,w,I,m*y,g,f),n?n.animate({d:h,opacity:c}):this.mark=f.path(h).attr({stroke:D,"stroke-width":m,opacity:c}).add(d.axisGroup);if(i&&!isNaN(x))i.xy=w=this.getLabelPosition(x,w,i,g,k,v,a,s),this.isFirst&&!this.isLast&&!p(e.showFirstLabel,1)||this.isLast&&!this.isFirst&&!p(e.showLastLabel,1)?r=!1:!d.isRadial&&!k.step&&!k.rotation&&!b&&c!==0&&(r=this.handleOverflow(a,w)),
+s&&a%s&&(r=!1),r&&!isNaN(w.y)?(w.opacity=c,i[this.isNew?"attr":"animate"](w),this.isNew=!1):i.attr("y",-9999)},destroy:function(){Oa(this,this.axis)}};S.PlotLineOrBand=function(a,b){this.axis=a;if(b)this.options=b,this.id=b.id};S.PlotLineOrBand.prototype={render:function(){var a=this,b=a.axis,c=b.horiz,d=(b.pointRange||0)/2,e=a.options,f=e.label,g=a.label,h=e.width,i=e.to,j=e.from,k=s(j)&&s(i),l=e.value,m=e.dashStyle,n=a.svgElem,o=[],p,q=e.color,I=e.zIndex,D=e.events,r={},t=b.chart.renderer;b.isLog&&
+(j=za(j),i=za(i),l=za(l));if(h){if(o=b.getPlotLinePath(l,h),r={stroke:q,"stroke-width":h},m)r.dashstyle=m}else if(k){j=u(j,b.min-d);i=C(i,b.max+d);o=b.getPlotBandPath(j,i,e);if(q)r.fill=q;if(e.borderWidth)r.stroke=e.borderColor,r["stroke-width"]=e.borderWidth}else return;if(s(I))r.zIndex=I;if(n)if(o)n.animate({d:o},null,n.onGetPath);else{if(n.hide(),n.onGetPath=function(){n.show()},g)a.label=g=g.destroy()}else if(o&&o.length&&(a.svgElem=n=t.path(o).attr(r).add(),D))for(p in d=function(b){n.on(b,function(c){D[b].apply(a,
+[c])})},D)d(p);if(f&&s(f.text)&&o&&o.length&&b.width>0&&b.height>0){f=w({align:c&&k&&"center",x:c?!k&&4:10,verticalAlign:!c&&k&&"middle",y:c?k?16:10:k?6:-4,rotation:c&&!k&&90},f);if(!g){r={align:f.textAlign||f.align,rotation:f.rotation};if(s(I))r.zIndex=I;a.label=g=t.text(f.text,0,0,f.useHTML).attr(r).css(f.style).add()}b=[o[1],o[4],k?o[6]:o[1]];k=[o[2],o[5],k?o[7]:o[2]];o=Na(b);c=Na(k);g.align(f,!1,{x:o,y:c,width:Ba(b)-o,height:Ba(k)-c});g.show()}else g&&g.hide();return a},destroy:function(){ka(this.axis.plotLinesAndBands,
+this);delete this.axis;Oa(this)}};ma.prototype={defaultOptions:{dateTimeLabelFormats:{millisecond:"%H:%M:%S.%L",second:"%H:%M:%S",minute:"%H:%M",hour:"%H:%M",day:"%e. %b",week:"%e. %b",month:"%b '%y",year:"%Y"},endOnTick:!1,gridLineColor:"#C0C0C0",labels:M,lineColor:"#C0D0E0",lineWidth:1,minPadding:0.01,maxPadding:0.01,minorGridLineColor:"#E0E0E0",minorGridLineWidth:1,minorTickColor:"#A0A0A0",minorTickLength:2,minorTickPosition:"outside",startOfWeek:1,startOnTick:!1,tickColor:"#C0D0E0",tickLength:10,
+tickmarkPlacement:"between",tickPixelInterval:100,tickPosition:"outside",tickWidth:1,title:{align:"middle",style:{color:"#707070"}},type:"linear"},defaultYAxisOptions:{endOnTick:!0,gridLineWidth:1,tickPixelInterval:72,showLastLabel:!0,labels:{x:-8,y:3},lineWidth:0,maxPadding:0.05,minPadding:0.05,startOnTick:!0,tickWidth:0,title:{rotation:270,text:"Values"},stackLabels:{enabled:!1,formatter:function(){return Ga(this.total,-1)},style:M.style}},defaultLeftAxisOptions:{labels:{x:-15,y:null},title:{rotation:270}},
+defaultRightAxisOptions:{labels:{x:15,y:null},title:{rotation:90}},defaultBottomAxisOptions:{labels:{x:0,y:null},title:{rotation:0}},defaultTopAxisOptions:{labels:{x:0,y:-15},title:{rotation:0}},init:function(a,b){var c=b.isX;this.horiz=a.inverted?!c:c;this.coll=(this.isXAxis=c)?"xAxis":"yAxis";this.opposite=b.opposite;this.side=b.side||(this.horiz?this.opposite?0:2:this.opposite?1:3);this.setOptions(b);var d=this.options,e=d.type;this.labelFormatter=d.labels.formatter||this.defaultLabelFormatter;
+this.userOptions=b;this.minPixelPadding=0;this.chart=a;this.reversed=d.reversed;this.zoomEnabled=d.zoomEnabled!==!1;this.categories=d.categories||e==="category";this.names=[];this.isLog=e==="logarithmic";this.isDatetimeAxis=e==="datetime";this.isLinked=s(d.linkedTo);this.tickmarkOffset=this.categories&&d.tickmarkPlacement==="between"?0.5:0;this.ticks={};this.labelEdge=[];this.minorTicks={};this.plotLinesAndBands=[];this.alternateBands={};this.len=0;this.minRange=this.userMinRange=d.minRange||d.maxZoom;
+this.range=d.range;this.offset=d.offset||0;this.stacks={};this.oldStacks={};this.min=this.max=null;this.crosshair=p(d.crosshair,ra(a.options.tooltip.crosshairs)[c?0:1],!1);var f,d=this.options.events;Da(this,a.axes)===-1&&(c&&!this.isColorAxis?a.axes.splice(a.xAxis.length,0,this):a.axes.push(this),a[this.coll].push(this));this.series=this.series||[];if(a.inverted&&c&&this.reversed===t)this.reversed=!0;this.removePlotLine=this.removePlotBand=this.removePlotBandOrLine;for(f in d)N(this,f,d[f]);if(this.isLog)this.val2lin=
+za,this.lin2val=ja},setOptions:function(a){this.options=w(this.defaultOptions,this.isXAxis?{}:this.defaultYAxisOptions,[this.defaultTopAxisOptions,this.defaultRightAxisOptions,this.defaultBottomAxisOptions,this.defaultLeftAxisOptions][this.side],w(L[this.coll],a))},defaultLabelFormatter:function(){var a=this.axis,b=this.value,c=a.categories,d=this.dateTimeLabelFormat,e=L.lang.numericSymbols,f=e&&e.length,g,h=a.options.labels.format,a=a.isLog?b:a.tickInterval;if(h)g=Ia(h,this);else if(c)g=b;else if(d)g=
+bb(d,b);else if(f&&a>=1E3)for(;f--&&g===t;)c=Math.pow(1E3,f+1),a>=c&&e[f]!==null&&(g=Ga(b/c,-1)+e[f]);g===t&&(g=Q(b)>=1E4?Ga(b,0):Ga(b,-1,t,""));return g},getSeriesExtremes:function(){var a=this,b=a.chart;a.hasVisibleSeries=!1;a.dataMin=a.dataMax=null;a.buildStacks&&a.buildStacks();q(a.series,function(c){if(c.visible||!b.options.chart.ignoreHiddenSeries){var d;d=c.options.threshold;var e;a.hasVisibleSeries=!0;a.isLog&&d<=0&&(d=null);if(a.isXAxis){if(d=c.xData,d.length)a.dataMin=C(p(a.dataMin,d[0]),
+Na(d)),a.dataMax=u(p(a.dataMax,d[0]),Ba(d))}else{c.getExtremes();e=c.dataMax;c=c.dataMin;if(s(c)&&s(e))a.dataMin=C(p(a.dataMin,c),c),a.dataMax=u(p(a.dataMax,e),e);if(s(d))if(a.dataMin>=d)a.dataMin=d,a.ignoreMinPadding=!0;else if(a.dataMax<d)a.dataMax=d,a.ignoreMaxPadding=!0}}})},translate:function(a,b,c,d,e,f){var g=1,h=0,i=d?this.oldTransA:this.transA,d=d?this.oldMin:this.min,j=this.minPixelPadding,e=(this.options.ordinal||this.isLog&&e)&&this.lin2val;if(!i)i=this.transA;if(c)g*=-1,h=this.len;this.reversed&&
+(g*=-1,h-=g*(this.sector||this.len));b?(a=a*g+h,a-=j,a=a/i+d,e&&(a=this.lin2val(a))):(e&&(a=this.val2lin(a)),f==="between"&&(f=0.5),a=g*(a-d)*i+h+g*j+(ia(f)?i*f*this.pointRange:0));return a},toPixels:function(a,b){return this.translate(a,!1,!this.horiz,null,!0)+(b?0:this.pos)},toValue:function(a,b){return this.translate(a-(b?0:this.pos),!0,!this.horiz,null,!0)},getPlotLinePath:function(a,b,c,d,e){var f=this.chart,g=this.left,h=this.top,i,j,k=c&&f.oldChartHeight||f.chartHeight,l=c&&f.oldChartWidth||
+f.chartWidth,m;i=this.transB;e=p(e,this.translate(a,null,null,c));a=c=v(e+i);i=j=v(k-e-i);if(isNaN(e))m=!0;else if(this.horiz){if(i=h,j=k-this.bottom,a<g||a>g+this.width)m=!0}else if(a=g,c=l-this.right,i<h||i>h+this.height)m=!0;return m&&!d?null:f.renderer.crispLine(["M",a,i,"L",c,j],b||1)},getLinearTickPositions:function(a,b,c){var d,e=ea(U(b/a)*a),f=ea(Ka(c/a)*a),g=[];if(b===c&&ia(b))return[b];for(b=e;b<=f;){g.push(b);b=ea(b+a);if(b===d)break;d=b}return g},getMinorTickPositions:function(){var a=
+this.options,b=this.tickPositions,c=this.minorTickInterval,d=[],e;if(this.isLog){e=b.length;for(a=1;a<e;a++)d=d.concat(this.getLogTickPositions(c,b[a-1],b[a],!0))}else if(this.isDatetimeAxis&&a.minorTickInterval==="auto")d=d.concat(this.getTimeTicks(this.normalizeTimeTickInterval(c),this.min,this.max,a.startOfWeek)),d[0]<this.min&&d.shift();else for(b=this.min+(b[0]-this.min)%c;b<=this.max;b+=c)d.push(b);return d},adjustForMinRange:function(){var a=this.options,b=this.min,c=this.max,d,e=this.dataMax-
+this.dataMin>=this.minRange,f,g,h,i,j;if(this.isXAxis&&this.minRange===t&&!this.isLog)s(a.min)||s(a.max)?this.minRange=null:(q(this.series,function(a){i=a.xData;for(g=j=a.xIncrement?1:i.length-1;g>0;g--)if(h=i[g]-i[g-1],f===t||h<f)f=h}),this.minRange=C(f*5,this.dataMax-this.dataMin));if(c-b<this.minRange){var k=this.minRange;d=(k-c+b)/2;d=[b-d,p(a.min,b-d)];if(e)d[2]=this.dataMin;b=Ba(d);c=[b+k,p(a.max,b+k)];if(e)c[2]=this.dataMax;c=Na(c);c-b<k&&(d[0]=c-k,d[1]=p(a.min,c-k),b=Ba(d))}this.min=b;this.max=
+c},setAxisTranslation:function(a){var b=this,c=b.max-b.min,d=b.axisPointRange||0,e,f=0,g=0,h=b.linkedParent,i=!!b.categories,j=b.transA;if(b.isXAxis||i||d)h?(f=h.minPointOffset,g=h.pointRangePadding):q(b.series,function(a){var h=i?1:b.isXAxis?a.pointRange:b.axisPointRange||0,j=a.options.pointPlacement,n=a.closestPointRange;h>c&&(h=0);d=u(d,h);f=u(f,Fa(j)?0:h/2);g=u(g,j==="on"?0:h);!a.noSharedTooltip&&s(n)&&(e=s(e)?C(e,n):n)}),h=b.ordinalSlope&&e?b.ordinalSlope/e:1,b.minPointOffset=f*=h,b.pointRangePadding=
+g*=h,b.pointRange=C(d,c),b.closestPointRange=e;if(a)b.oldTransA=j;b.translationSlope=b.transA=j=b.len/(c+g||1);b.transB=b.horiz?b.left:b.bottom;b.minPixelPadding=j*f},setTickPositions:function(a){var b=this,c=b.chart,d=b.options,e=d.startOnTick,f=d.endOnTick,g=b.isLog,h=b.isDatetimeAxis,i=b.isXAxis,j=b.isLinked,k=b.options.tickPositioner,l=d.maxPadding,m=d.minPadding,n=d.tickInterval,o=d.minTickInterval,Y=d.tickPixelInterval,E,I=b.categories;j?(b.linkedParent=c[b.coll][d.linkedTo],c=b.linkedParent.getExtremes(),
+b.min=p(c.min,c.dataMin),b.max=p(c.max,c.dataMax),d.type!==b.linkedParent.options.type&&oa(11,1)):(b.min=p(b.userMin,d.min,b.dataMin),b.max=p(b.userMax,d.max,b.dataMax));if(g)!a&&C(b.min,p(b.dataMin,b.min))<=0&&oa(10,1),b.min=ea(za(b.min)),b.max=ea(za(b.max));if(b.range&&s(b.max))b.userMin=b.min=u(b.min,b.max-b.range),b.userMax=b.max,b.range=null;b.beforePadding&&b.beforePadding();b.adjustForMinRange();if(!I&&!b.axisPointRange&&!b.usePercentage&&!j&&s(b.min)&&s(b.max)&&(c=b.max-b.min)){if(!s(d.min)&&
+!s(b.userMin)&&m&&(b.dataMin<0||!b.ignoreMinPadding))b.min-=c*m;if(!s(d.max)&&!s(b.userMax)&&l&&(b.dataMax>0||!b.ignoreMaxPadding))b.max+=c*l}if(ia(d.floor))b.min=u(b.min,d.floor);if(ia(d.ceiling))b.max=C(b.max,d.ceiling);b.min===b.max||b.min===void 0||b.max===void 0?b.tickInterval=1:j&&!n&&Y===b.linkedParent.options.tickPixelInterval?b.tickInterval=b.linkedParent.tickInterval:(b.tickInterval=p(n,I?1:(b.max-b.min)*Y/u(b.len,Y)),!s(n)&&b.len<Y&&!this.isRadial&&!this.isLog&&!I&&e&&f&&(E=!0,b.tickInterval/=
+4));i&&!a&&q(b.series,function(a){a.processData(b.min!==b.oldMin||b.max!==b.oldMax)});b.setAxisTranslation(!0);b.beforeSetTickPositions&&b.beforeSetTickPositions();if(b.postProcessTickInterval)b.tickInterval=b.postProcessTickInterval(b.tickInterval);if(b.pointRange)b.tickInterval=u(b.pointRange,b.tickInterval);if(!n&&b.tickInterval<o)b.tickInterval=o;if(!h&&!g&&!n)b.tickInterval=mb(b.tickInterval,null,lb(b.tickInterval),d);b.minorTickInterval=d.minorTickInterval==="auto"&&b.tickInterval?b.tickInterval/
+5:d.minorTickInterval;b.tickPositions=a=d.tickPositions?[].concat(d.tickPositions):k&&k.apply(b,[b.min,b.max]);if(!a)!b.ordinalPositions&&(b.max-b.min)/b.tickInterval>u(2*b.len,200)&&oa(19,!0),a=h?b.getTimeTicks(b.normalizeTimeTickInterval(b.tickInterval,d.units),b.min,b.max,d.startOfWeek,b.ordinalPositions,b.closestPointRange,!0):g?b.getLogTickPositions(b.tickInterval,b.min,b.max):b.getLinearTickPositions(b.tickInterval,b.min,b.max),E&&a.splice(1,a.length-2),b.tickPositions=a;if(!j)d=a[0],g=a[a.length-
+1],h=b.minPointOffset||0,!e&&!f&&!I&&a.length===2&&a.splice(1,0,(g+d)/2),e?b.min=d:b.min-h>d&&a.shift(),f?b.max=g:b.max+h<g&&a.pop(),a.length===1&&(e=Q(b.max)>1E13?1:0.001,b.min-=e,b.max+=e)},setMaxTicks:function(){var a=this.chart,b=a.maxTicks||{},c=this.tickPositions,d=this._maxTicksKey=[this.coll,this.pos,this.len].join("-");if(!this.isLinked&&!this.isDatetimeAxis&&c&&c.length>(b[d]||0)&&this.options.alignTicks!==!1)b[d]=c.length;a.maxTicks=b},adjustTickAmount:function(){var a=this._maxTicksKey,
+b=this.tickPositions,c=this.chart.maxTicks;if(c&&c[a]&&!this.isDatetimeAxis&&!this.categories&&!this.isLinked&&this.options.alignTicks!==!1&&this.min!==t){var d=this.tickAmount,e=b.length;this.tickAmount=a=c[a];if(e<a){for(;b.length<a;)b.push(ea(b[b.length-1]+this.tickInterval));this.transA*=(e-1)/(a-1);this.max=b[b.length-1]}if(s(d)&&a!==d)this.isDirty=!0}},setScale:function(){var a=this.stacks,b,c,d,e;this.oldMin=this.min;this.oldMax=this.max;this.oldAxisLength=this.len;this.setAxisSize();e=this.len!==
+this.oldAxisLength;q(this.series,function(a){if(a.isDirtyData||a.isDirty||a.xAxis.isDirty)d=!0});if(e||d||this.isLinked||this.forceRedraw||this.userMin!==this.oldUserMin||this.userMax!==this.oldUserMax){if(!this.isXAxis)for(b in a)for(c in a[b])a[b][c].total=null,a[b][c].cum=0;this.forceRedraw=!1;this.getSeriesExtremes();this.setTickPositions();this.oldUserMin=this.userMin;this.oldUserMax=this.userMax;if(!this.isDirty)this.isDirty=e||this.min!==this.oldMin||this.max!==this.oldMax}else if(!this.isXAxis){if(this.oldStacks)a=
+this.stacks=this.oldStacks;for(b in a)for(c in a[b])a[b][c].cum=a[b][c].total}this.setMaxTicks()},setExtremes:function(a,b,c,d,e){var f=this,g=f.chart,c=p(c,!0),e=r(e,{min:a,max:b});K(f,"setExtremes",e,function(){f.userMin=a;f.userMax=b;f.eventArgs=e;f.isDirtyExtremes=!0;c&&g.redraw(d)})},zoom:function(a,b){var c=this.dataMin,d=this.dataMax,e=this.options;this.allowZoomOutside||(s(c)&&a<=C(c,p(e.min,c))&&(a=t),s(d)&&b>=u(d,p(e.max,d))&&(b=t));this.displayBtn=a!==t||b!==t;this.setExtremes(a,b,!1,t,
+{trigger:"zoom"});return!0},setAxisSize:function(){var a=this.chart,b=this.options,c=b.offsetLeft||0,d=this.horiz,e=p(b.width,a.plotWidth-c+(b.offsetRight||0)),f=p(b.height,a.plotHeight),g=p(b.top,a.plotTop),b=p(b.left,a.plotLeft+c),c=/%$/;c.test(f)&&(f=parseInt(f,10)/100*a.plotHeight);c.test(g)&&(g=parseInt(g,10)/100*a.plotHeight+a.plotTop);this.left=b;this.top=g;this.width=e;this.height=f;this.bottom=a.chartHeight-f-g;this.right=a.chartWidth-e-b;this.len=u(d?e:f,0);this.pos=d?b:g},getExtremes:function(){var a=
+this.isLog;return{min:a?ea(ja(this.min)):this.min,max:a?ea(ja(this.max)):this.max,dataMin:this.dataMin,dataMax:this.dataMax,userMin:this.userMin,userMax:this.userMax}},getThreshold:function(a){var b=this.isLog,c=b?ja(this.min):this.min,b=b?ja(this.max):this.max;c>a||a===null?a=c:b<a&&(a=b);return this.translate(a,0,1,0,1)},autoLabelAlign:function(a){a=(p(a,0)-this.side*90+720)%360;return a>15&&a<165?"right":a>195&&a<345?"left":"center"},getOffset:function(){var a=this,b=a.chart,c=b.renderer,d=a.options,
+e=a.tickPositions,f=a.ticks,g=a.horiz,h=a.side,i=b.inverted?[1,0,3,2][h]:h,j,k,l=0,m,n=0,o=d.title,Y=d.labels,E=0,I=b.axisOffset,b=b.clipOffset,D=[-1,1,1,-1][h],r,v=1,w=p(Y.maxStaggerLines,5),x,z,C,y,R;a.hasData=j=a.hasVisibleSeries||s(a.min)&&s(a.max)&&!!e;a.showAxis=k=j||p(d.showEmpty,!0);a.staggerLines=a.horiz&&Y.staggerLines;if(!a.axisGroup)a.gridGroup=c.g("grid").attr({zIndex:d.gridZIndex||1}).add(),a.axisGroup=c.g("axis").attr({zIndex:d.zIndex||2}).add(),a.labelGroup=c.g("axis-labels").attr({zIndex:Y.zIndex||
+7}).addClass("highcharts-"+a.coll.toLowerCase()+"-labels").add();if(j||a.isLinked){a.labelAlign=p(Y.align||a.autoLabelAlign(Y.rotation));q(e,function(b){f[b]?f[b].addLabel():f[b]=new Sa(a,b)});if(a.horiz&&!a.staggerLines&&w&&!Y.rotation){for(j=a.reversed?[].concat(e).reverse():e;v<w;){x=[];z=!1;for(r=0;r<j.length;r++)C=j[r],y=(y=f[C].label&&f[C].label.getBBox())?y.width:0,R=r%v,y&&(C=a.translate(C),x[R]!==t&&C<x[R]&&(z=!0),x[R]=C+y);if(z)v++;else break}if(v>1)a.staggerLines=v}q(e,function(b){if(h===
+0||h===2||{1:"left",3:"right"}[h]===a.labelAlign)E=u(f[b].getLabelSize(),E)});if(a.staggerLines)E*=a.staggerLines,a.labelOffset=E}else for(r in f)f[r].destroy(),delete f[r];if(o&&o.text&&o.enabled!==!1){if(!a.axisTitle)a.axisTitle=c.text(o.text,0,0,o.useHTML).attr({zIndex:7,rotation:o.rotation||0,align:o.textAlign||{low:"left",middle:"center",high:"right"}[o.align]}).addClass("highcharts-"+this.coll.toLowerCase()+"-title").css(o.style).add(a.axisGroup),a.axisTitle.isNew=!0;if(k)l=a.axisTitle.getBBox()[g?
+"height":"width"],m=o.offset,n=s(m)?0:p(o.margin,g?5:10);a.axisTitle[k?"show":"hide"]()}a.offset=D*p(d.offset,I[h]);c=h===2?a.tickBaseline:0;g=E+n+(E&&D*(g?p(Y.y,a.tickBaseline+8):Y.x)-c);a.axisTitleMargin=p(m,g);I[h]=u(I[h],a.axisTitleMargin+l+D*a.offset,g);b[i]=u(b[i],U(d.lineWidth/2)*2)},getLinePath:function(a){var b=this.chart,c=this.opposite,d=this.offset,e=this.horiz,f=this.left+(c?this.width:0)+d,d=b.chartHeight-this.bottom-(c?this.height:0)+d;c&&(a*=-1);return b.renderer.crispLine(["M",e?
+this.left:f,e?d:this.top,"L",e?b.chartWidth-this.right:f,e?d:b.chartHeight-this.bottom],a)},getTitlePosition:function(){var a=this.horiz,b=this.left,c=this.top,d=this.len,e=this.options.title,f=a?b:c,g=this.opposite,h=this.offset,i=z(e.style.fontSize||12),d={low:f+(a?0:d),middle:f+d/2,high:f+(a?d:0)}[e.align],b=(a?c+this.height:b)+(a?1:-1)*(g?-1:1)*this.axisTitleMargin+(this.side===2?i:0);return{x:a?d:b+(g?this.width:0)+h+(e.x||0),y:a?b-(g?this.height:0)+h:d+(e.y||0)}},render:function(){var a=this,
+b=a.horiz,c=a.reversed,d=a.chart,e=d.renderer,f=a.options,g=a.isLog,h=a.isLinked,i=a.tickPositions,j,k=a.axisTitle,l=a.ticks,m=a.minorTicks,n=a.alternateBands,o=f.stackLabels,p=f.alternateGridColor,E=a.tickmarkOffset,I=f.lineWidth,D=d.hasRendered&&s(a.oldMin)&&!isNaN(a.oldMin),r=a.hasData,u=a.showAxis,v,w=f.labels.overflow,x=a.justifyLabels=b&&w!==!1,z;a.labelEdge.length=0;a.justifyToPlot=w==="justify";q([l,m,n],function(a){for(var b in a)a[b].isActive=!1});if(r||h)if(a.minorTickInterval&&!a.categories&&
+q(a.getMinorTickPositions(),function(b){m[b]||(m[b]=new Sa(a,b,"minor"));D&&m[b].isNew&&m[b].render(null,!0);m[b].render(null,!1,1)}),i.length&&(j=i.slice(),(b&&c||!b&&!c)&&j.reverse(),x&&(j=j.slice(1).concat([j[0]])),q(j,function(b,c){x&&(c=c===j.length-1?0:c+1);if(!h||b>=a.min&&b<=a.max)l[b]||(l[b]=new Sa(a,b)),D&&l[b].isNew&&l[b].render(c,!0,0.1),l[b].render(c)}),E&&a.min===0&&(l[-1]||(l[-1]=new Sa(a,-1,null,!0)),l[-1].render(-1))),p&&q(i,function(b,c){if(c%2===0&&b<a.max)n[b]||(n[b]=new S.PlotLineOrBand(a)),
+v=b+E,z=i[c+1]!==t?i[c+1]+E:a.max,n[b].options={from:g?ja(v):v,to:g?ja(z):z,color:p},n[b].render(),n[b].isActive=!0}),!a._addedPlotLB)q((f.plotLines||[]).concat(f.plotBands||[]),function(b){a.addPlotBandOrLine(b)}),a._addedPlotLB=!0;q([l,m,n],function(a){var b,c,e=[],f=va?va.duration||500:0,g=function(){for(c=e.length;c--;)a[e[c]]&&!a[e[c]].isActive&&(a[e[c]].destroy(),delete a[e[c]])};for(b in a)if(!a[b].isActive)a[b].render(b,!1,0),a[b].isActive=!1,e.push(b);a===n||!d.hasRendered||!f?g():f&&setTimeout(g,
+f)});if(I)b=a.getLinePath(I),a.axisLine?a.axisLine.animate({d:b}):a.axisLine=e.path(b).attr({stroke:f.lineColor,"stroke-width":I,zIndex:7}).add(a.axisGroup),a.axisLine[u?"show":"hide"]();if(k&&u)k[k.isNew?"attr":"animate"](a.getTitlePosition()),k.isNew=!1;o&&o.enabled&&a.renderStackTotals();a.isDirty=!1},redraw:function(){this.render();q(this.plotLinesAndBands,function(a){a.render()});q(this.series,function(a){a.isDirty=!0})},destroy:function(a){var b=this,c=b.stacks,d,e=b.plotLinesAndBands;a||X(b);
+for(d in c)Oa(c[d]),c[d]=null;q([b.ticks,b.minorTicks,b.alternateBands],function(a){Oa(a)});for(a=e.length;a--;)e[a].destroy();q("stackTotalGroup,axisLine,axisTitle,axisGroup,cross,gridGroup,labelGroup".split(","),function(a){b[a]&&(b[a]=b[a].destroy())});this.cross&&this.cross.destroy()},drawCrosshair:function(a,b){if(this.crosshair)if((s(b)||!p(this.crosshair.snap,!0))===!1)this.hideCrosshair();else{var c,d=this.crosshair,e=d.animation;p(d.snap,!0)?s(b)&&(c=this.chart.inverted!=this.horiz?b.plotX:
+this.len-b.plotY):c=this.horiz?a.chartX-this.pos:this.len-a.chartY+this.pos;c=this.isRadial?this.getPlotLinePath(this.isXAxis?b.x:p(b.stackY,b.y)):this.getPlotLinePath(null,null,null,null,c);if(c===null)this.hideCrosshair();else if(this.cross)this.cross.attr({visibility:"visible"})[e?"animate":"attr"]({d:c},e);else{e={"stroke-width":d.width||1,stroke:d.color||"#C0C0C0",zIndex:d.zIndex||2};if(d.dashStyle)e.dashstyle=d.dashStyle;this.cross=this.chart.renderer.path(c).attr(e).add()}}},hideCrosshair:function(){this.cross&&
+this.cross.hide()}};r(ma.prototype,{getPlotBandPath:function(a,b){var c=this.getPlotLinePath(b),d=this.getPlotLinePath(a);d&&c?d.push(c[4],c[5],c[1],c[2]):d=null;return d},addPlotBand:function(a){return this.addPlotBandOrLine(a,"plotBands")},addPlotLine:function(a){return this.addPlotBandOrLine(a,"plotLines")},addPlotBandOrLine:function(a,b){var c=(new S.PlotLineOrBand(this,a)).render(),d=this.userOptions;c&&(b&&(d[b]=d[b]||[],d[b].push(a)),this.plotLinesAndBands.push(c));return c},removePlotBandOrLine:function(a){for(var b=
+this.plotLinesAndBands,c=this.options,d=this.userOptions,e=b.length;e--;)b[e].id===a&&b[e].destroy();q([c.plotLines||[],d.plotLines||[],c.plotBands||[],d.plotBands||[]],function(b){for(e=b.length;e--;)b[e].id===a&&ka(b,b[e])})}});ma.prototype.getTimeTicks=function(a,b,c,d){var e=[],f={},g=L.global.useUTC,h,i=new Date(b-Ra),j=a.unitRange,k=a.count;if(s(b)){j>=B.second&&(i.setMilliseconds(0),i.setSeconds(j>=B.minute?0:k*U(i.getSeconds()/k)));if(j>=B.minute)i[Bb](j>=B.hour?0:k*U(i[ob]()/k));if(j>=B.hour)i[Cb](j>=
+B.day?0:k*U(i[pb]()/k));if(j>=B.day)i[rb](j>=B.month?1:k*U(i[Wa]()/k));j>=B.month&&(i[Db](j>=B.year?0:k*U(i[eb]()/k)),h=i[fb]());j>=B.year&&(h-=h%k,i[Eb](h));if(j===B.week)i[rb](i[Wa]()-i[qb]()+p(d,1));b=1;Ra&&(i=new Date(i.getTime()+Ra));h=i[fb]();for(var d=i.getTime(),l=i[eb](),m=i[Wa](),n=g?Ra:(864E5+i.getTimezoneOffset()*6E4)%864E5;d<c;)e.push(d),j===B.year?d=db(h+b*k,0):j===B.month?d=db(h,l+b*k):!g&&(j===B.day||j===B.week)?d=db(h,l,m+b*k*(j===B.day?1:7)):d+=j*k,b++;e.push(d);q(vb(e,function(a){return j<=
+B.hour&&a%B.day===n}),function(a){f[a]="day"})}e.info=r(a,{higherRanks:f,totalRange:j*k});return e};ma.prototype.normalizeTimeTickInterval=function(a,b){var c=b||[["millisecond",[1,2,5,10,20,25,50,100,200,500]],["second",[1,2,5,10,15,30]],["minute",[1,2,5,10,15,30]],["hour",[1,2,3,4,6,8,12]],["day",[1,2]],["week",[1,2]],["month",[1,2,3,4,6]],["year",null]],d=c[c.length-1],e=B[d[0]],f=d[1],g;for(g=0;g<c.length;g++)if(d=c[g],e=B[d[0]],f=d[1],c[g+1]&&a<=(e*f[f.length-1]+B[c[g+1][0]])/2)break;e===B.year&&
+a<5*e&&(f=[1,2,5]);c=mb(a/e,f,d[0]==="year"?u(lb(a/e),1):1);return{unitRange:e,count:c,unitName:d[0]}};ma.prototype.getLogTickPositions=function(a,b,c,d){var e=this.options,f=this.len,g=[];if(!d)this._minorAutoInterval=null;if(a>=0.5)a=v(a),g=this.getLinearTickPositions(a,b,c);else if(a>=0.08)for(var f=U(b),h,i,j,k,l,e=a>0.3?[1,2,4]:a>0.15?[1,2,4,6,8]:[1,2,3,4,5,6,7,8,9];f<c+1&&!l;f++){i=e.length;for(h=0;h<i&&!l;h++)j=za(ja(f)*e[h]),j>b&&(!d||k<=c)&&k!==t&&g.push(k),k>c&&(l=!0),k=j}else if(b=ja(b),
+c=ja(c),a=e[d?"minorTickInterval":"tickInterval"],a=p(a==="auto"?null:a,this._minorAutoInterval,(c-b)*(e.tickPixelInterval/(d?5:1))/((d?f/this.tickPositions.length:f)||1)),a=mb(a,null,lb(a)),g=Ua(this.getLinearTickPositions(a,b,c),za),!d)this._minorAutoInterval=a/5;if(!d)this.tickInterval=a;return g};var Mb=S.Tooltip=function(){this.init.apply(this,arguments)};Mb.prototype={init:function(a,b){var c=b.borderWidth,d=b.style,e=z(d.padding);this.chart=a;this.options=b;this.crosshairs=[];this.now={x:0,
+y:0};this.isHidden=!0;this.label=a.renderer.label("",0,0,b.shape||"callout",null,null,b.useHTML,null,"tooltip").attr({padding:e,fill:b.backgroundColor,"stroke-width":c,r:b.borderRadius,zIndex:8}).css(d).css({padding:0}).add().attr({y:-9999});ga||this.label.shadow(b.shadow);this.shared=b.shared},destroy:function(){if(this.label)this.label=this.label.destroy();clearTimeout(this.hideTimer);clearTimeout(this.tooltipTimeout)},move:function(a,b,c,d){var e=this,f=e.now,g=e.options.animation!==!1&&!e.isHidden&&
+(Q(a-f.x)>1||Q(b-f.y)>1),h=e.followPointer||e.len>1;r(f,{x:g?(2*f.x+a)/3:a,y:g?(f.y+b)/2:b,anchorX:h?t:g?(2*f.anchorX+c)/3:c,anchorY:h?t:g?(f.anchorY+d)/2:d});e.label.attr(f);if(g)clearTimeout(this.tooltipTimeout),this.tooltipTimeout=setTimeout(function(){e&&e.move(a,b,c,d)},32)},hide:function(){var a=this,b;clearTimeout(this.hideTimer);if(!this.isHidden)b=this.chart.hoverPoints,this.hideTimer=setTimeout(function(){a.label.fadeOut();a.isHidden=!0},p(this.options.hideDelay,500)),b&&q(b,function(a){a.setState()}),
+this.chart.hoverPoints=null},getAnchor:function(a,b){var c,d=this.chart,e=d.inverted,f=d.plotTop,g=0,h=0,i,a=ra(a);c=a[0].tooltipPos;this.followPointer&&b&&(b.chartX===t&&(b=d.pointer.normalize(b)),c=[b.chartX-d.plotLeft,b.chartY-f]);c||(q(a,function(a){i=a.series.yAxis;g+=a.plotX;h+=(a.plotLow?(a.plotLow+a.plotHigh)/2:a.plotY)+(!e&&i?i.top-f:0)}),g/=a.length,h/=a.length,c=[e?d.plotWidth-h:g,this.shared&&!e&&a.length>1&&b?b.chartY-f:e?d.plotHeight-g:h]);return Ua(c,v)},getPosition:function(a,b,c){var d=
+this.chart,e=this.distance,f={},g,h=["y",d.chartHeight,b,c.plotY+d.plotTop],i=["x",d.chartWidth,a,c.plotX+d.plotLeft],j=c.ttBelow||d.inverted&&!c.negative||!d.inverted&&c.negative,k=function(a,b,c,d){var g=c<d-e,b=d+e+c<b,c=d-e-c;d+=e;if(j&&b)f[a]=d;else if(!j&&g)f[a]=c;else if(g)f[a]=c;else if(b)f[a]=d;else return!1},l=function(a,b,c,d){if(d<e||d>b-e)return!1;else f[a]=d<c/2?1:d>b-c/2?b-c-2:d-c/2},m=function(a){var b=h;h=i;i=b;g=a},n=function(){k.apply(0,h)!==!1?l.apply(0,i)===!1&&!g&&(m(!0),n()):
+g?f.x=f.y=0:(m(!0),n())};(d.inverted||this.len>1)&&m();n();return f},defaultFormatter:function(a){var b=this.points||ra(this),c=b[0].series,d;d=[a.tooltipHeaderFormatter(b[0])];q(b,function(a){c=a.series;d.push(c.tooltipFormatter&&c.tooltipFormatter(a)||a.point.tooltipFormatter(c.tooltipOptions.pointFormat))});d.push(a.options.footerFormat||"");return d.join("")},refresh:function(a,b){var c=this.chart,d=this.label,e=this.options,f,g,h={},i,j=[];i=e.formatter||this.defaultFormatter;var h=c.hoverPoints,
+k,l=this.shared;clearTimeout(this.hideTimer);this.followPointer=ra(a)[0].series.tooltipOptions.followPointer;g=this.getAnchor(a,b);f=g[0];g=g[1];l&&(!a.series||!a.series.noSharedTooltip)?(c.hoverPoints=a,h&&q(h,function(a){a.setState()}),q(a,function(a){a.setState("hover");j.push(a.getLabelConfig())}),h={x:a[0].category,y:a[0].y},h.points=j,this.len=j.length,a=a[0]):h=a.getLabelConfig();i=i.call(h,this);h=a.series;this.distance=p(h.tooltipOptions.distance,16);i===!1?this.hide():(this.isHidden&&(ab(d),
+d.attr("opacity",1).show()),d.attr({text:i}),k=e.borderColor||a.color||h.color||"#606060",d.attr({stroke:k}),this.updatePosition({plotX:f,plotY:g,negative:a.negative,ttBelow:a.ttBelow}),this.isHidden=!1);K(c,"tooltipRefresh",{text:i,x:f+c.plotLeft,y:g+c.plotTop,borderColor:k})},updatePosition:function(a){var b=this.chart,c=this.label,c=(this.options.positioner||this.getPosition).call(this,c.width,c.height,a);this.move(v(c.x),v(c.y),a.plotX+b.plotLeft,a.plotY+b.plotTop)},tooltipHeaderFormatter:function(a){var b=
+a.series,c=b.tooltipOptions,d=c.dateTimeLabelFormats,e=c.xDateFormat,f=b.xAxis,g=f&&f.options.type==="datetime"&&ia(a.key),c=c.headerFormat,f=f&&f.closestPointRange,h;if(g&&!e){if(f)for(h in B){if(B[h]>=f||B[h]<=B.day&&a.key%B[h]>0){e=d[h];break}}else e=d.day;e=e||d.year}g&&e&&(c=c.replace("{point.key}","{point.key:"+e+"}"));return Ia(c,{point:a,series:b})}};var pa;Za=x.documentElement.ontouchstart!==t;var Va=S.Pointer=function(a,b){this.init(a,b)};Va.prototype={init:function(a,b){var c=b.chart,d=
+c.events,e=ga?"":c.zoomType,c=a.inverted,f;this.options=b;this.chart=a;this.zoomX=f=/x/.test(e);this.zoomY=e=/y/.test(e);this.zoomHor=f&&!c||e&&c;this.zoomVert=e&&!c||f&&c;this.hasZoom=f||e;this.runChartClick=d&&!!d.click;this.pinchDown=[];this.lastValidTouch={};if(S.Tooltip&&b.tooltip.enabled)a.tooltip=new Mb(a,b.tooltip),this.followTouchMove=b.tooltip.followTouchMove;this.setDOMEvents()},normalize:function(a,b){var c,d,a=a||window.event,a=Sb(a);if(!a.target)a.target=a.srcElement;d=a.touches?a.touches.length?
+a.touches.item(0):a.changedTouches[0]:a;if(!b)this.chartPosition=b=Rb(this.chart.container);d.pageX===t?(c=u(a.x,a.clientX-b.left),d=a.y):(c=d.pageX-b.left,d=d.pageY-b.top);return r(a,{chartX:v(c),chartY:v(d)})},getCoordinates:function(a){var b={xAxis:[],yAxis:[]};q(this.chart.axes,function(c){b[c.isXAxis?"xAxis":"yAxis"].push({axis:c,value:c.toValue(a[c.horiz?"chartX":"chartY"])})});return b},getIndex:function(a){var b=this.chart;return b.inverted?b.plotHeight+b.plotTop-a.chartY:a.chartX-b.plotLeft},
+runPointActions:function(a){var b=this.chart,c=b.series,d=b.tooltip,e,f,g=b.hoverPoint,h=b.hoverSeries,i,j,k=b.chartWidth,l=this.getIndex(a);if(d&&this.options.tooltip.shared&&(!h||!h.noSharedTooltip)){f=[];i=c.length;for(j=0;j<i;j++)if(c[j].visible&&c[j].options.enableMouseTracking!==!1&&!c[j].noSharedTooltip&&c[j].singularTooltips!==!0&&c[j].tooltipPoints.length&&(e=c[j].tooltipPoints[l])&&e.series)e._dist=Q(l-e.clientX),k=C(k,e._dist),f.push(e);for(i=f.length;i--;)f[i]._dist>k&&f.splice(i,1);if(f.length&&
+f[0].clientX!==this.hoverX)d.refresh(f,a),this.hoverX=f[0].clientX}c=h&&h.tooltipOptions.followPointer;if(h&&h.tracker&&!c){if((e=h.tooltipPoints[l])&&e!==g)e.onMouseOver(a)}else d&&c&&!d.isHidden&&(h=d.getAnchor([{}],a),d.updatePosition({plotX:h[0],plotY:h[1]}));if(d&&!this._onDocumentMouseMove)this._onDocumentMouseMove=function(a){if(W[pa])W[pa].pointer.onDocumentMouseMove(a)},N(x,"mousemove",this._onDocumentMouseMove);q(b.axes,function(b){b.drawCrosshair(a,p(e,g))})},reset:function(a){var b=this.chart,
+c=b.hoverSeries,d=b.hoverPoint,e=b.tooltip,f=e&&e.shared?b.hoverPoints:d;(a=a&&e&&f)&&ra(f)[0].plotX===t&&(a=!1);if(a)e.refresh(f),d&&d.setState(d.state,!0);else{if(d)d.onMouseOut();if(c)c.onMouseOut();e&&e.hide();if(this._onDocumentMouseMove)X(x,"mousemove",this._onDocumentMouseMove),this._onDocumentMouseMove=null;q(b.axes,function(a){a.hideCrosshair()});this.hoverX=null}},scaleGroups:function(a,b){var c=this.chart,d;q(c.series,function(e){d=a||e.getPlotBox();e.xAxis&&e.xAxis.zoomEnabled&&(e.group.attr(d),
+e.markerGroup&&(e.markerGroup.attr(d),e.markerGroup.clip(b?c.clipRect:null)),e.dataLabelsGroup&&e.dataLabelsGroup.attr(d))});c.clipRect.attr(b||c.clipBox)},dragStart:function(a){var b=this.chart;b.mouseIsDown=a.type;b.cancelClick=!1;b.mouseDownX=this.mouseDownX=a.chartX;b.mouseDownY=this.mouseDownY=a.chartY},drag:function(a){var b=this.chart,c=b.options.chart,d=a.chartX,e=a.chartY,f=this.zoomHor,g=this.zoomVert,h=b.plotLeft,i=b.plotTop,j=b.plotWidth,k=b.plotHeight,l,m=this.mouseDownX,n=this.mouseDownY,
+o=c.panKey&&a[c.panKey+"Key"];d<h?d=h:d>h+j&&(d=h+j);e<i?e=i:e>i+k&&(e=i+k);this.hasDragged=Math.sqrt(Math.pow(m-d,2)+Math.pow(n-e,2));if(this.hasDragged>10){l=b.isInsidePlot(m-h,n-i);if(b.hasCartesianSeries&&(this.zoomX||this.zoomY)&&l&&!o&&!this.selectionMarker)this.selectionMarker=b.renderer.rect(h,i,f?1:j,g?1:k,0).attr({fill:c.selectionMarkerFill||"rgba(69,114,167,0.25)",zIndex:7}).add();this.selectionMarker&&f&&(d-=m,this.selectionMarker.attr({width:Q(d),x:(d>0?0:d)+m}));this.selectionMarker&&
+g&&(d=e-n,this.selectionMarker.attr({height:Q(d),y:(d>0?0:d)+n}));l&&!this.selectionMarker&&c.panning&&b.pan(a,c.panning)}},drop:function(a){var b=this.chart,c=this.hasPinched;if(this.selectionMarker){var d={xAxis:[],yAxis:[],originalEvent:a.originalEvent||a},e=this.selectionMarker,f=e.attr?e.attr("x"):e.x,g=e.attr?e.attr("y"):e.y,h=e.attr?e.attr("width"):e.width,i=e.attr?e.attr("height"):e.height,j;if(this.hasDragged||c)q(b.axes,function(b){if(b.zoomEnabled){var c=b.horiz,e=a.type==="touchend"?b.minPixelPadding:
+0,n=b.toValue((c?f:g)+e),c=b.toValue((c?f+h:g+i)-e);!isNaN(n)&&!isNaN(c)&&(d[b.coll].push({axis:b,min:C(n,c),max:u(n,c)}),j=!0)}}),j&&K(b,"selection",d,function(a){b.zoom(r(a,c?{animation:!1}:null))});this.selectionMarker=this.selectionMarker.destroy();c&&this.scaleGroups()}if(b)A(b.container,{cursor:b._cursor}),b.cancelClick=this.hasDragged>10,b.mouseIsDown=this.hasDragged=this.hasPinched=!1,this.pinchDown=[]},onContainerMouseDown:function(a){a=this.normalize(a);a.preventDefault&&a.preventDefault();
+this.dragStart(a)},onDocumentMouseUp:function(a){W[pa]&&W[pa].pointer.drop(a)},onDocumentMouseMove:function(a){var b=this.chart,c=this.chartPosition,d=b.hoverSeries,a=this.normalize(a,c);c&&d&&!this.inClass(a.target,"highcharts-tracker")&&!b.isInsidePlot(a.chartX-b.plotLeft,a.chartY-b.plotTop)&&this.reset()},onContainerMouseLeave:function(){var a=W[pa];if(a)a.pointer.reset(),a.pointer.chartPosition=null},onContainerMouseMove:function(a){var b=this.chart;pa=b.index;a=this.normalize(a);a.returnValue=
+!1;b.mouseIsDown==="mousedown"&&this.drag(a);(this.inClass(a.target,"highcharts-tracker")||b.isInsidePlot(a.chartX-b.plotLeft,a.chartY-b.plotTop))&&!b.openMenu&&this.runPointActions(a)},inClass:function(a,b){for(var c;a;){if(c=F(a,"class"))if(c.indexOf(b)!==-1)return!0;else if(c.indexOf("highcharts-container")!==-1)return!1;a=a.parentNode}},onTrackerMouseOut:function(a){var b=this.chart.hoverSeries,c=(a=a.relatedTarget||a.toElement)&&a.point&&a.point.series;if(b&&!b.options.stickyTracking&&!this.inClass(a,
+"highcharts-tooltip")&&c!==b)b.onMouseOut()},onContainerClick:function(a){var b=this.chart,c=b.hoverPoint,d=b.plotLeft,e=b.plotTop,a=this.normalize(a);a.cancelBubble=!0;b.cancelClick||(c&&this.inClass(a.target,"highcharts-tracker")?(K(c.series,"click",r(a,{point:c})),b.hoverPoint&&c.firePointEvent("click",a)):(r(a,this.getCoordinates(a)),b.isInsidePlot(a.chartX-d,a.chartY-e)&&K(b,"click",a)))},setDOMEvents:function(){var a=this,b=a.chart.container;b.onmousedown=function(b){a.onContainerMouseDown(b)};
+b.onmousemove=function(b){a.onContainerMouseMove(b)};b.onclick=function(b){a.onContainerClick(b)};N(b,"mouseleave",a.onContainerMouseLeave);$a===1&&N(x,"mouseup",a.onDocumentMouseUp);if(Za)b.ontouchstart=function(b){a.onContainerTouchStart(b)},b.ontouchmove=function(b){a.onContainerTouchMove(b)},$a===1&&N(x,"touchend",a.onDocumentTouchEnd)},destroy:function(){var a;X(this.chart.container,"mouseleave",this.onContainerMouseLeave);$a||(X(x,"mouseup",this.onDocumentMouseUp),X(x,"touchend",this.onDocumentTouchEnd));
+clearInterval(this.tooltipTimeout);for(a in this)this[a]=null}};r(S.Pointer.prototype,{pinchTranslate:function(a,b,c,d,e,f){(this.zoomHor||this.pinchHor)&&this.pinchTranslateDirection(!0,a,b,c,d,e,f);(this.zoomVert||this.pinchVert)&&this.pinchTranslateDirection(!1,a,b,c,d,e,f)},pinchTranslateDirection:function(a,b,c,d,e,f,g,h){var i=this.chart,j=a?"x":"y",k=a?"X":"Y",l="chart"+k,m=a?"width":"height",n=i["plot"+(a?"Left":"Top")],o,p,q=h||1,r=i.inverted,D=i.bounds[a?"h":"v"],u=b.length===1,s=b[0][l],
+v=c[0][l],t=!u&&b[1][l],w=!u&&c[1][l],x,c=function(){!u&&Q(s-t)>20&&(q=h||Q(v-w)/Q(s-t));p=(n-v)/q+s;o=i["plot"+(a?"Width":"Height")]/q};c();b=p;b<D.min?(b=D.min,x=!0):b+o>D.max&&(b=D.max-o,x=!0);x?(v-=0.8*(v-g[j][0]),u||(w-=0.8*(w-g[j][1])),c()):g[j]=[v,w];r||(f[j]=p-n,f[m]=o);f=r?1/q:q;e[m]=o;e[j]=b;d[r?a?"scaleY":"scaleX":"scale"+k]=q;d["translate"+k]=f*n+(v-f*s)},pinch:function(a){var b=this,c=b.chart,d=b.pinchDown,e=b.followTouchMove,f=a.touches,g=f.length,h=b.lastValidTouch,i=b.hasZoom,j=b.selectionMarker,
+k={},l=g===1&&(b.inClass(a.target,"highcharts-tracker")&&c.runTrackerClick||c.runChartClick),m={};(i||e)&&!l&&a.preventDefault();Ua(f,function(a){return b.normalize(a)});if(a.type==="touchstart")q(f,function(a,b){d[b]={chartX:a.chartX,chartY:a.chartY}}),h.x=[d[0].chartX,d[1]&&d[1].chartX],h.y=[d[0].chartY,d[1]&&d[1].chartY],q(c.axes,function(a){if(a.zoomEnabled){var b=c.bounds[a.horiz?"h":"v"],d=a.minPixelPadding,e=a.toPixels(p(a.options.min,a.dataMin)),f=a.toPixels(p(a.options.max,a.dataMax)),g=
+C(e,f),e=u(e,f);b.min=C(a.pos,g-d);b.max=u(a.pos+a.len,e+d)}});else if(d.length){if(!j)b.selectionMarker=j=r({destroy:sa},c.plotBox);b.pinchTranslate(d,f,k,j,m,h);b.hasPinched=i;b.scaleGroups(k,m);!i&&e&&g===1&&this.runPointActions(b.normalize(a))}},onContainerTouchStart:function(a){var b=this.chart;pa=b.index;a.touches.length===1?(a=this.normalize(a),b.isInsidePlot(a.chartX-b.plotLeft,a.chartY-b.plotTop)?(this.runPointActions(a),this.pinch(a)):this.reset()):a.touches.length===2&&this.pinch(a)},onContainerTouchMove:function(a){(a.touches.length===
+1||a.touches.length===2)&&this.pinch(a)},onDocumentTouchEnd:function(a){W[pa]&&W[pa].pointer.drop(a)}});if(H.PointerEvent||H.MSPointerEvent){var ua={},yb=!!H.PointerEvent,Wb=function(){var a,b=[];b.item=function(a){return this[a]};for(a in ua)ua.hasOwnProperty(a)&&b.push({pageX:ua[a].pageX,pageY:ua[a].pageY,target:ua[a].target});return b},zb=function(a,b,c,d){a=a.originalEvent||a;if((a.pointerType==="touch"||a.pointerType===a.MSPOINTER_TYPE_TOUCH)&&W[pa])d(a),d=W[pa].pointer,d[b]({type:c,target:a.currentTarget,
+preventDefault:sa,touches:Wb()})};r(Va.prototype,{onContainerPointerDown:function(a){zb(a,"onContainerTouchStart","touchstart",function(a){ua[a.pointerId]={pageX:a.pageX,pageY:a.pageY,target:a.currentTarget}})},onContainerPointerMove:function(a){zb(a,"onContainerTouchMove","touchmove",function(a){ua[a.pointerId]={pageX:a.pageX,pageY:a.pageY};if(!ua[a.pointerId].target)ua[a.pointerId].target=a.currentTarget})},onDocumentPointerUp:function(a){zb(a,"onContainerTouchEnd","touchend",function(a){delete ua[a.pointerId]})},
+batchMSEvents:function(a){a(this.chart.container,yb?"pointerdown":"MSPointerDown",this.onContainerPointerDown);a(this.chart.container,yb?"pointermove":"MSPointerMove",this.onContainerPointerMove);a(x,yb?"pointerup":"MSPointerUp",this.onDocumentPointerUp)}});Ma(Va.prototype,"init",function(a,b,c){a.call(this,b,c);(this.hasZoom||this.followTouchMove)&&A(b.container,{"-ms-touch-action":P,"touch-action":P})});Ma(Va.prototype,"setDOMEvents",function(a){a.apply(this);(this.hasZoom||this.followTouchMove)&&
+this.batchMSEvents(N)});Ma(Va.prototype,"destroy",function(a){this.batchMSEvents(X);a.call(this)})}var kb=S.Legend=function(a,b){this.init(a,b)};kb.prototype={init:function(a,b){var c=this,d=b.itemStyle,e=p(b.padding,8),f=b.itemMarginTop||0;this.options=b;if(b.enabled)c.itemStyle=d,c.itemHiddenStyle=w(d,b.itemHiddenStyle),c.itemMarginTop=f,c.padding=e,c.initialItemX=e,c.initialItemY=e-5,c.maxItemWidth=0,c.chart=a,c.itemHeight=0,c.lastLineHeight=0,c.symbolWidth=p(b.symbolWidth,16),c.pages=[],c.render(),
+N(c.chart,"endResize",function(){c.positionCheckboxes()})},colorizeItem:function(a,b){var c=this.options,d=a.legendItem,e=a.legendLine,f=a.legendSymbol,g=this.itemHiddenStyle.color,c=b?c.itemStyle.color:g,h=b?a.legendColor||a.color||"#CCC":g,g=a.options&&a.options.marker,i={fill:h},j;d&&d.css({fill:c,color:c});e&&e.attr({stroke:h});if(f){if(g&&f.isMarker)for(j in i.stroke=h,g=a.convertAttribs(g),g)d=g[j],d!==t&&(i[j]=d);f.attr(i)}},positionItem:function(a){var b=this.options,c=b.symbolPadding,b=!b.rtl,
+d=a._legendItemPos,e=d[0],d=d[1],f=a.checkbox;a.legendGroup&&a.legendGroup.translate(b?e:this.legendWidth-e-2*c-4,d);if(f)f.x=e,f.y=d},destroyItem:function(a){var b=a.checkbox;q(["legendItem","legendLine","legendSymbol","legendGroup"],function(b){a[b]&&(a[b]=a[b].destroy())});b&&Pa(a.checkbox)},destroy:function(){var a=this.group,b=this.box;if(b)this.box=b.destroy();if(a)this.group=a.destroy()},positionCheckboxes:function(a){var b=this.group.alignAttr,c,d=this.clipHeight||this.legendHeight;if(b)c=
+b.translateY,q(this.allItems,function(e){var f=e.checkbox,g;f&&(g=c+f.y+(a||0)+3,A(f,{left:b.translateX+e.checkboxOffset+f.x-20+"px",top:g+"px",display:g>c-6&&g<c+d-6?"":P}))})},renderTitle:function(){var a=this.padding,b=this.options.title,c=0;if(b.text){if(!this.title)this.title=this.chart.renderer.label(b.text,a-3,a-4,null,null,null,null,null,"legend-title").attr({zIndex:1}).css(b.style).add(this.group);a=this.title.getBBox();c=a.height;this.offsetWidth=a.width;this.contentGroup.attr({translateY:c})}this.titleHeight=
+c},renderItem:function(a){var b=this.chart,c=b.renderer,d=this.options,e=d.layout==="horizontal",f=this.symbolWidth,g=d.symbolPadding,h=this.itemStyle,i=this.itemHiddenStyle,j=this.padding,k=e?p(d.itemDistance,20):0,l=!d.rtl,m=d.width,n=d.itemMarginBottom||0,o=this.itemMarginTop,q=this.initialItemX,r=a.legendItem,s=a.series&&a.series.drawLegendSymbol?a.series:a,D=s.options,D=this.createCheckboxForItem&&D&&D.showCheckbox,t=d.useHTML;if(!r){a.legendGroup=c.g("legend-item").attr({zIndex:1}).add(this.scrollGroup);
+a.legendItem=r=c.text(d.labelFormat?Ia(d.labelFormat,a):d.labelFormatter.call(a),l?f+g:-g,this.baseline||0,t).css(w(a.visible?h:i)).attr({align:l?"left":"right",zIndex:2}).add(a.legendGroup);if(!this.baseline)this.baseline=c.fontMetrics(h.fontSize,r).f+3+o,r.attr("y",this.baseline);s.drawLegendSymbol(this,a);this.setItemEvents&&this.setItemEvents(a,r,t,h,i);this.colorizeItem(a,a.visible);D&&this.createCheckboxForItem(a)}c=r.getBBox();f=a.checkboxOffset=d.itemWidth||a.legendItemWidth||f+g+c.width+
+k+(D?20:0);this.itemHeight=g=v(a.legendItemHeight||c.height);if(e&&this.itemX-q+f>(m||b.chartWidth-2*j-q-d.x))this.itemX=q,this.itemY+=o+this.lastLineHeight+n,this.lastLineHeight=0;this.maxItemWidth=u(this.maxItemWidth,f);this.lastItemY=o+this.itemY+n;this.lastLineHeight=u(g,this.lastLineHeight);a._legendItemPos=[this.itemX,this.itemY];e?this.itemX+=f:(this.itemY+=o+g+n,this.lastLineHeight=g);this.offsetWidth=m||u((e?this.itemX-q-k:f)+j,this.offsetWidth)},getAllItems:function(){var a=[];q(this.chart.series,
+function(b){var c=b.options;if(p(c.showInLegend,!s(c.linkedTo)?t:!1,!0))a=a.concat(b.legendItems||(c.legendType==="point"?b.data:b))});return a},render:function(){var a=this,b=a.chart,c=b.renderer,d=a.group,e,f,g,h,i=a.box,j=a.options,k=a.padding,l=j.borderWidth,m=j.backgroundColor;a.itemX=a.initialItemX;a.itemY=a.initialItemY;a.offsetWidth=0;a.lastItemY=0;if(!d)a.group=d=c.g("legend").attr({zIndex:7}).add(),a.contentGroup=c.g().attr({zIndex:1}).add(d),a.scrollGroup=c.g().add(a.contentGroup);a.renderTitle();
+e=a.getAllItems();nb(e,function(a,b){return(a.options&&a.options.legendIndex||0)-(b.options&&b.options.legendIndex||0)});j.reversed&&e.reverse();a.allItems=e;a.display=f=!!e.length;q(e,function(b){a.renderItem(b)});g=j.width||a.offsetWidth;h=a.lastItemY+a.lastLineHeight+a.titleHeight;h=a.handleOverflow(h);if(l||m){g+=k;h+=k;if(i){if(g>0&&h>0)i[i.isNew?"attr":"animate"](i.crisp({width:g,height:h})),i.isNew=!1}else a.box=i=c.rect(0,0,g,h,j.borderRadius,l||0).attr({stroke:j.borderColor,"stroke-width":l||
+0,fill:m||P}).add(d).shadow(j.shadow),i.isNew=!0;i[f?"show":"hide"]()}a.legendWidth=g;a.legendHeight=h;q(e,function(b){a.positionItem(b)});f&&d.align(r({width:g,height:h},j),!0,"spacingBox");b.isResizing||this.positionCheckboxes()},handleOverflow:function(a){var b=this,c=this.chart,d=c.renderer,e=this.options,f=e.y,f=c.spacingBox.height+(e.verticalAlign==="top"?-f:f)-this.padding,g=e.maxHeight,h,i=this.clipRect,j=e.navigation,k=p(j.animation,!0),l=j.arrowSize||12,m=this.nav,n=this.pages,o,r=this.allItems;
+e.layout==="horizontal"&&(f/=2);g&&(f=C(f,g));n.length=0;if(a>f&&!e.useHTML){this.clipHeight=h=u(f-20-this.titleHeight-this.padding,0);this.currentPage=p(this.currentPage,1);this.fullHeight=a;q(r,function(a,b){var c=a._legendItemPos[1],d=v(a.legendItem.getBBox().height),e=n.length;if(!e||c-n[e-1]>h&&(o||c)!==n[e-1])n.push(o||c),e++;b===r.length-1&&c+d-n[e-1]>h&&n.push(c);c!==o&&(o=c)});if(!i)i=b.clipRect=d.clipRect(0,this.padding,9999,0),b.contentGroup.clip(i);i.attr({height:h});if(!m)this.nav=m=
+d.g().attr({zIndex:1}).add(this.group),this.up=d.symbol("triangle",0,0,l,l).on("click",function(){b.scroll(-1,k)}).add(m),this.pager=d.text("",15,10).css(j.style).add(m),this.down=d.symbol("triangle-down",0,0,l,l).on("click",function(){b.scroll(1,k)}).add(m);b.scroll(0);a=f}else if(m)i.attr({height:c.chartHeight}),m.hide(),this.scrollGroup.attr({translateY:1}),this.clipHeight=0;return a},scroll:function(a,b){var c=this.pages,d=c.length,e=this.currentPage+a,f=this.clipHeight,g=this.options.navigation,
+h=g.activeColor,g=g.inactiveColor,i=this.pager,j=this.padding;e>d&&(e=d);if(e>0)b!==t&&Qa(b,this.chart),this.nav.attr({translateX:j,translateY:f+this.padding+7+this.titleHeight,visibility:"visible"}),this.up.attr({fill:e===1?g:h}).css({cursor:e===1?"default":"pointer"}),i.attr({text:e+"/"+d}),this.down.attr({x:18+this.pager.getBBox().width,fill:e===d?g:h}).css({cursor:e===d?"default":"pointer"}),c=-c[e-1]+this.initialItemY,this.scrollGroup.animate({translateY:c}),this.currentPage=e,this.positionCheckboxes(c)}};
+M=S.LegendSymbolMixin={drawRectangle:function(a,b){var c=a.options.symbolHeight||12;b.legendSymbol=this.chart.renderer.rect(0,a.baseline-5-c/2,a.symbolWidth,c,a.options.symbolRadius||0).attr({zIndex:3}).add(b.legendGroup)},drawLineMarker:function(a){var b=this.options,c=b.marker,d;d=a.symbolWidth;var e=this.chart.renderer,f=this.legendGroup,a=a.baseline-v(e.fontMetrics(a.options.itemStyle.fontSize,this.legendItem).b*0.3),g;if(b.lineWidth){g={"stroke-width":b.lineWidth};if(b.dashStyle)g.dashstyle=
+b.dashStyle;this.legendLine=e.path(["M",0,a,"L",d,a]).attr(g).add(f)}if(c&&c.enabled!==!1)b=c.radius,this.legendSymbol=d=e.symbol(this.symbol,d/2-b,a-b,2*b,2*b).add(f),d.isMarker=!0}};(/Trident\/7\.0/.test(wa)||Ta)&&Ma(kb.prototype,"positionItem",function(a,b){var c=this,d=function(){b._legendItemPos&&a.call(c,b)};d();setTimeout(d)});Xa.prototype={init:function(a,b){var c,d=a.series;a.series=null;c=w(L,a);c.series=a.series=d;this.userOptions=a;d=c.chart;this.margin=this.splashArray("margin",d);this.spacing=
+this.splashArray("spacing",d);var e=d.events;this.bounds={h:{},v:{}};this.callback=b;this.isResizing=0;this.options=c;this.axes=[];this.series=[];this.hasCartesianSeries=d.showAxes;var f=this,g;f.index=W.length;W.push(f);$a++;d.reflow!==!1&&N(f,"load",function(){f.initReflow()});if(e)for(g in e)N(f,g,e[g]);f.xAxis=[];f.yAxis=[];f.animation=ga?!1:p(d.animation,!0);f.pointCount=f.colorCounter=f.symbolCounter=0;f.firstRender()},initSeries:function(a){var b=this.options.chart;(b=J[a.type||b.type||b.defaultSeriesType])||
+oa(17,!0);b=new b;b.init(this,a);return b},isInsidePlot:function(a,b,c){var d=c?b:a,a=c?a:b;return d>=0&&d<=this.plotWidth&&a>=0&&a<=this.plotHeight},adjustTickAmounts:function(){this.options.chart.alignTicks!==!1&&q(this.axes,function(a){a.adjustTickAmount()});this.maxTicks=null},redraw:function(a){var b=this.axes,c=this.series,d=this.pointer,e=this.legend,f=this.isDirtyLegend,g,h,i=this.hasCartesianSeries,j=this.isDirtyBox,k=c.length,l=k,m=this.renderer,n=m.isHidden(),o=[];Qa(a,this);n&&this.cloneRenderTo();
+for(this.layOutTitles();l--;)if(a=c[l],a.options.stacking&&(g=!0,a.isDirty)){h=!0;break}if(h)for(l=k;l--;)if(a=c[l],a.options.stacking)a.isDirty=!0;q(c,function(a){a.isDirty&&a.options.legendType==="point"&&(f=!0)});if(f&&e.options.enabled)e.render(),this.isDirtyLegend=!1;g&&this.getStacks();if(i){if(!this.isResizing)this.maxTicks=null,q(b,function(a){a.setScale()});this.adjustTickAmounts()}this.getMargins();i&&(q(b,function(a){a.isDirty&&(j=!0)}),q(b,function(a){if(a.isDirtyExtremes)a.isDirtyExtremes=
+!1,o.push(function(){K(a,"afterSetExtremes",r(a.eventArgs,a.getExtremes()));delete a.eventArgs});(j||g)&&a.redraw()}));j&&this.drawChartBox();q(c,function(a){a.isDirty&&a.visible&&(!a.isCartesian||a.xAxis)&&a.redraw()});d&&d.reset(!0);m.draw();K(this,"redraw");n&&this.cloneRenderTo(!0);q(o,function(a){a.call()})},get:function(a){var b=this.axes,c=this.series,d,e;for(d=0;d<b.length;d++)if(b[d].options.id===a)return b[d];for(d=0;d<c.length;d++)if(c[d].options.id===a)return c[d];for(d=0;d<c.length;d++){e=
+c[d].points||[];for(b=0;b<e.length;b++)if(e[b].id===a)return e[b]}return null},getAxes:function(){var a=this,b=this.options,c=b.xAxis=ra(b.xAxis||{}),b=b.yAxis=ra(b.yAxis||{});q(c,function(a,b){a.index=b;a.isX=!0});q(b,function(a,b){a.index=b});c=c.concat(b);q(c,function(b){new ma(a,b)});a.adjustTickAmounts()},getSelectedPoints:function(){var a=[];q(this.series,function(b){a=a.concat(vb(b.points||[],function(a){return a.selected}))});return a},getSelectedSeries:function(){return vb(this.series,function(a){return a.selected})},
+getStacks:function(){var a=this;q(a.yAxis,function(a){if(a.stacks&&a.hasVisibleSeries)a.oldStacks=a.stacks});q(a.series,function(b){if(b.options.stacking&&(b.visible===!0||a.options.chart.ignoreHiddenSeries===!1))b.stackKey=b.type+p(b.options.stack,"")})},setTitle:function(a,b,c){var g;var d=this,e=d.options,f;f=e.title=w(e.title,a);g=e.subtitle=w(e.subtitle,b),e=g;q([["title",a,f],["subtitle",b,e]],function(a){var b=a[0],c=d[b],e=a[1],a=a[2];c&&e&&(d[b]=c=c.destroy());a&&a.text&&!c&&(d[b]=d.renderer.text(a.text,
+0,0,a.useHTML).attr({align:a.align,"class":"highcharts-"+b,zIndex:a.zIndex||4}).css(a.style).add())});d.layOutTitles(c)},layOutTitles:function(a){var b=0,c=this.title,d=this.subtitle,e=this.options,f=e.title,e=e.subtitle,g=this.renderer,h=this.spacingBox.width-44;if(c&&(c.css({width:(f.width||h)+"px"}).align(r({y:g.fontMetrics(f.style.fontSize,c).b-3},f),!1,"spacingBox"),!f.floating&&!f.verticalAlign))b=c.getBBox().height;d&&(d.css({width:(e.width||h)+"px"}).align(r({y:b+(f.margin-13)+g.fontMetrics(f.style.fontSize,
+d).b},e),!1,"spacingBox"),!e.floating&&!e.verticalAlign&&(b=Ka(b+d.getBBox().height)));c=this.titleOffset!==b;this.titleOffset=b;if(!this.isDirtyBox&&c)this.isDirtyBox=c,this.hasRendered&&p(a,!0)&&this.isDirtyBox&&this.redraw()},getChartSize:function(){var a=this.options.chart,b=a.width,a=a.height,c=this.renderToClone||this.renderTo;if(!s(b))this.containerWidth=hb(c,"width");if(!s(a))this.containerHeight=hb(c,"height");this.chartWidth=u(0,b||this.containerWidth||600);this.chartHeight=u(0,p(a,this.containerHeight>
+19?this.containerHeight:400))},cloneRenderTo:function(a){var b=this.renderToClone,c=this.container;a?b&&(this.renderTo.appendChild(c),Pa(b),delete this.renderToClone):(c&&c.parentNode===this.renderTo&&this.renderTo.removeChild(c),this.renderToClone=b=this.renderTo.cloneNode(0),A(b,{position:"absolute",top:"-9999px",display:"block"}),b.style.setProperty&&b.style.setProperty("display","block","important"),x.body.appendChild(b),c&&b.appendChild(c))},getContainer:function(){var a,b=this.options.chart,
+c,d,e;this.renderTo=a=b.renderTo;e="highcharts-"+tb++;if(Fa(a))this.renderTo=a=x.getElementById(a);a||oa(13,!0);c=z(F(a,"data-highcharts-chart"));!isNaN(c)&&W[c]&&W[c].hasRendered&&W[c].destroy();F(a,"data-highcharts-chart",this.index);a.innerHTML="";!b.skipClone&&!a.offsetWidth&&this.cloneRenderTo();this.getChartSize();c=this.chartWidth;d=this.chartHeight;this.container=a=$(Ja,{className:"highcharts-container"+(b.className?" "+b.className:""),id:e},r({position:"relative",overflow:"hidden",width:c+
+"px",height:d+"px",textAlign:"left",lineHeight:"normal",zIndex:0,"-webkit-tap-highlight-color":"rgba(0,0,0,0)"},b.style),this.renderToClone||a);this._cursor=a.style.cursor;this.renderer=b.forExport?new ta(a,c,d,b.style,!0):new Ya(a,c,d,b.style);ga&&this.renderer.create(this,a,c,d)},getMargins:function(){var a=this.spacing,b,c=this.legend,d=this.margin,e=this.options.legend,f=p(e.margin,20),g=e.x,h=e.y,i=e.align,j=e.verticalAlign,k=this.titleOffset;this.resetMargins();b=this.axisOffset;if(k&&!s(d[0]))this.plotTop=
+u(this.plotTop,k+this.options.title.margin+a[0]);if(c.display&&!e.floating)if(i==="right"){if(!s(d[1]))this.marginRight=u(this.marginRight,c.legendWidth-g+f+a[1])}else if(i==="left"){if(!s(d[3]))this.plotLeft=u(this.plotLeft,c.legendWidth+g+f+a[3])}else if(j==="top"){if(!s(d[0]))this.plotTop=u(this.plotTop,c.legendHeight+h+f+a[0])}else if(j==="bottom"&&!s(d[2]))this.marginBottom=u(this.marginBottom,c.legendHeight-h+f+a[2]);this.extraBottomMargin&&(this.marginBottom+=this.extraBottomMargin);this.extraTopMargin&&
+(this.plotTop+=this.extraTopMargin);this.hasCartesianSeries&&q(this.axes,function(a){a.getOffset()});s(d[3])||(this.plotLeft+=b[3]);s(d[0])||(this.plotTop+=b[0]);s(d[2])||(this.marginBottom+=b[2]);s(d[1])||(this.marginRight+=b[1]);this.setChartSize()},reflow:function(a){var b=this,c=b.options.chart,d=b.renderTo,e=c.width||hb(d,"width"),f=c.height||hb(d,"height"),c=a?a.target:H,d=function(){if(b.container)b.setSize(e,f,!1),b.hasUserSize=null};if(!b.hasUserSize&&e&&f&&(c===H||c===x)){if(e!==b.containerWidth||
+f!==b.containerHeight)clearTimeout(b.reflowTimeout),a?b.reflowTimeout=setTimeout(d,100):d();b.containerWidth=e;b.containerHeight=f}},initReflow:function(){var a=this,b=function(b){a.reflow(b)};N(H,"resize",b);N(a,"destroy",function(){X(H,"resize",b)})},setSize:function(a,b,c){var d=this,e,f,g;d.isResizing+=1;g=function(){d&&K(d,"endResize",null,function(){d.isResizing-=1})};Qa(c,d);d.oldChartHeight=d.chartHeight;d.oldChartWidth=d.chartWidth;if(s(a))d.chartWidth=e=u(0,v(a)),d.hasUserSize=!!e;if(s(b))d.chartHeight=
+f=u(0,v(b));(va?ib:A)(d.container,{width:e+"px",height:f+"px"},va);d.setChartSize(!0);d.renderer.setSize(e,f,c);d.maxTicks=null;q(d.axes,function(a){a.isDirty=!0;a.setScale()});q(d.series,function(a){a.isDirty=!0});d.isDirtyLegend=!0;d.isDirtyBox=!0;d.layOutTitles();d.getMargins();d.redraw(c);d.oldChartHeight=null;K(d,"resize");va===!1?g():setTimeout(g,va&&va.duration||500)},setChartSize:function(a){var b=this.inverted,c=this.renderer,d=this.chartWidth,e=this.chartHeight,f=this.options.chart,g=this.spacing,
+h=this.clipOffset,i,j,k,l;this.plotLeft=i=v(this.plotLeft);this.plotTop=j=v(this.plotTop);this.plotWidth=k=u(0,v(d-i-this.marginRight));this.plotHeight=l=u(0,v(e-j-this.marginBottom));this.plotSizeX=b?l:k;this.plotSizeY=b?k:l;this.plotBorderWidth=f.plotBorderWidth||0;this.spacingBox=c.spacingBox={x:g[3],y:g[0],width:d-g[3]-g[1],height:e-g[0]-g[2]};this.plotBox=c.plotBox={x:i,y:j,width:k,height:l};d=2*U(this.plotBorderWidth/2);b=Ka(u(d,h[3])/2);c=Ka(u(d,h[0])/2);this.clipBox={x:b,y:c,width:U(this.plotSizeX-
+u(d,h[1])/2-b),height:u(0,U(this.plotSizeY-u(d,h[2])/2-c))};a||q(this.axes,function(a){a.setAxisSize();a.setAxisTranslation()})},resetMargins:function(){var a=this.spacing,b=this.margin;this.plotTop=p(b[0],a[0]);this.marginRight=p(b[1],a[1]);this.marginBottom=p(b[2],a[2]);this.plotLeft=p(b[3],a[3]);this.axisOffset=[0,0,0,0];this.clipOffset=[0,0,0,0]},drawChartBox:function(){var a=this.options.chart,b=this.renderer,c=this.chartWidth,d=this.chartHeight,e=this.chartBackground,f=this.plotBackground,g=
+this.plotBorder,h=this.plotBGImage,i=a.borderWidth||0,j=a.backgroundColor,k=a.plotBackgroundColor,l=a.plotBackgroundImage,m=a.plotBorderWidth||0,n,o=this.plotLeft,p=this.plotTop,q=this.plotWidth,r=this.plotHeight,u=this.plotBox,s=this.clipRect,v=this.clipBox;n=i+(a.shadow?8:0);if(i||j)if(e)e.animate(e.crisp({width:c-n,height:d-n}));else{e={fill:j||P};if(i)e.stroke=a.borderColor,e["stroke-width"]=i;this.chartBackground=b.rect(n/2,n/2,c-n,d-n,a.borderRadius,i).attr(e).addClass("highcharts-background").add().shadow(a.shadow)}if(k)f?
+f.animate(u):this.plotBackground=b.rect(o,p,q,r,0).attr({fill:k}).add().shadow(a.plotShadow);if(l)h?h.animate(u):this.plotBGImage=b.image(l,o,p,q,r).add();s?s.animate({width:v.width,height:v.height}):this.clipRect=b.clipRect(v);if(m)g?g.animate(g.crisp({x:o,y:p,width:q,height:r})):this.plotBorder=b.rect(o,p,q,r,0,-m).attr({stroke:a.plotBorderColor,"stroke-width":m,fill:P,zIndex:1}).add();this.isDirtyBox=!1},propFromSeries:function(){var a=this,b=a.options.chart,c,d=a.options.series,e,f;q(["inverted",
+"angular","polar"],function(g){c=J[b.type||b.defaultSeriesType];f=a[g]||b[g]||c&&c.prototype[g];for(e=d&&d.length;!f&&e--;)(c=J[d[e].type])&&c.prototype[g]&&(f=!0);a[g]=f})},linkSeries:function(){var a=this,b=a.series;q(b,function(a){a.linkedSeries.length=0});q(b,function(b){var d=b.options.linkedTo;if(Fa(d)&&(d=d===":previous"?a.series[b.index-1]:a.get(d)))d.linkedSeries.push(b),b.linkedParent=d})},renderSeries:function(){q(this.series,function(a){a.translate();a.setTooltipPoints&&a.setTooltipPoints();
+a.render()})},renderLabels:function(){var a=this,b=a.options.labels;b.items&&q(b.items,function(c){var d=r(b.style,c.style),e=z(d.left)+a.plotLeft,f=z(d.top)+a.plotTop+12;delete d.left;delete d.top;a.renderer.text(c.html,e,f).attr({zIndex:2}).css(d).add()})},render:function(){var a=this.axes,b=this.renderer,c=this.options;this.setTitle();this.legend=new kb(this,c.legend);this.getStacks();q(a,function(a){a.setScale()});this.getMargins();this.maxTicks=null;q(a,function(a){a.setTickPositions(!0);a.setMaxTicks()});
+this.adjustTickAmounts();this.getMargins();this.drawChartBox();this.hasCartesianSeries&&q(a,function(a){a.render()});if(!this.seriesGroup)this.seriesGroup=b.g("series-group").attr({zIndex:3}).add();this.renderSeries();this.renderLabels();this.showCredits(c.credits);this.hasRendered=!0},showCredits:function(a){if(a.enabled&&!this.credits)this.credits=this.renderer.text(a.text,0,0).on("click",function(){if(a.href)location.href=a.href}).attr({align:a.position.align,zIndex:8}).css(a.style).add().align(a.position)},
+destroy:function(){var a=this,b=a.axes,c=a.series,d=a.container,e,f=d&&d.parentNode;K(a,"destroy");W[a.index]=t;$a--;a.renderTo.removeAttribute("data-highcharts-chart");X(a);for(e=b.length;e--;)b[e]=b[e].destroy();for(e=c.length;e--;)c[e]=c[e].destroy();q("title,subtitle,chartBackground,plotBackground,plotBGImage,plotBorder,seriesGroup,clipRect,credits,pointer,scroller,rangeSelector,legend,resetZoomButton,tooltip,renderer".split(","),function(b){var c=a[b];c&&c.destroy&&(a[b]=c.destroy())});if(d)d.innerHTML=
+"",X(d),f&&Pa(d);for(e in a)delete a[e]},isReadyToRender:function(){var a=this;return!ba&&H==H.top&&x.readyState!=="complete"||ga&&!H.canvg?(ga?Lb.push(function(){a.firstRender()},a.options.global.canvasToolsURL):x.attachEvent("onreadystatechange",function(){x.detachEvent("onreadystatechange",a.firstRender);x.readyState==="complete"&&a.firstRender()}),!1):!0},firstRender:function(){var a=this,b=a.options,c=a.callback;if(a.isReadyToRender()){a.getContainer();K(a,"init");a.resetMargins();a.setChartSize();
+a.propFromSeries();a.getAxes();q(b.series||[],function(b){a.initSeries(b)});a.linkSeries();K(a,"beforeRender");if(S.Pointer)a.pointer=new Va(a,b);a.render();a.renderer.draw();c&&c.apply(a,[a]);q(a.callbacks,function(b){b.apply(a,[a])});a.cloneRenderTo(!0);K(a,"load")}},splashArray:function(a,b){var c=b[a],c=da(c)?c:[c,c,c,c];return[p(b[a+"Top"],c[0]),p(b[a+"Right"],c[1]),p(b[a+"Bottom"],c[2]),p(b[a+"Left"],c[3])]}};Xa.prototype.callbacks=[];Z=S.CenteredSeriesMixin={getCenter:function(){var a=this.options,
+b=this.chart,c=2*(a.slicedOffset||0),d,e=b.plotWidth-2*c,f=b.plotHeight-2*c,b=a.center,a=[p(b[0],"50%"),p(b[1],"50%"),a.size||"100%",a.innerSize||0],g=C(e,f),h;return Ua(a,function(a,b){h=/%$/.test(a);d=b<2||b===2&&h;return(h?[e,f,g,g][b]*z(a)/100:a)+(d?c:0)})}};var Ea=function(){};Ea.prototype={init:function(a,b,c){this.series=a;this.applyOptions(b,c);this.pointAttr={};if(a.options.colorByPoint&&(b=a.options.colors||a.chart.options.colors,this.color=this.color||b[a.colorCounter++],a.colorCounter===
+b.length))a.colorCounter=0;a.chart.pointCount++;return this},applyOptions:function(a,b){var c=this.series,d=c.options.pointValKey||c.pointValKey,a=Ea.prototype.optionsToObject.call(this,a);r(this,a);this.options=this.options?r(this.options,a):a;if(d)this.y=this[d];if(this.x===t&&c)this.x=b===t?c.autoIncrement():b;return this},optionsToObject:function(a){var b={},c=this.series,d=c.pointArrayMap||["y"],e=d.length,f=0,g=0;if(typeof a==="number"||a===null)b[d[0]]=a;else if(La(a)){if(a.length>e){c=typeof a[0];
+if(c==="string")b.name=a[0];else if(c==="number")b.x=a[0];f++}for(;g<e;)b[d[g++]]=a[f++]}else if(typeof a==="object"){b=a;if(a.dataLabels)c._hasPointLabels=!0;if(a.marker)c._hasPointMarkers=!0}return b},destroy:function(){var a=this.series.chart,b=a.hoverPoints,c;a.pointCount--;if(b&&(this.setState(),ka(b,this),!b.length))a.hoverPoints=null;if(this===a.hoverPoint)this.onMouseOut();if(this.graphic||this.dataLabel)X(this),this.destroyElements();this.legendItem&&a.legend.destroyItem(this);for(c in this)this[c]=
+null},destroyElements:function(){for(var a="graphic,dataLabel,dataLabelUpper,group,connector,shadowGroup".split(","),b,c=6;c--;)b=a[c],this[b]&&(this[b]=this[b].destroy())},getLabelConfig:function(){return{x:this.category,y:this.y,key:this.name||this.category,series:this.series,point:this,percentage:this.percentage,total:this.total||this.stackTotal}},tooltipFormatter:function(a){var b=this.series,c=b.tooltipOptions,d=p(c.valueDecimals,""),e=c.valuePrefix||"",f=c.valueSuffix||"";q(b.pointArrayMap||
+["y"],function(b){b="{point."+b;if(e||f)a=a.replace(b+"}",e+b+"}"+f);a=a.replace(b+"}",b+":,."+d+"f}")});return Ia(a,{point:this,series:this.series})},firePointEvent:function(a,b,c){var d=this,e=this.series.options;(e.point.events[a]||d.options&&d.options.events&&d.options.events[a])&&this.importEvents();a==="click"&&e.allowPointSelect&&(c=function(a){d.select(null,a.ctrlKey||a.metaKey||a.shiftKey)});K(this,a,b,c)}};var O=function(){};O.prototype={isCartesian:!0,type:"line",pointClass:Ea,sorted:!0,
+requireSorting:!0,pointAttrToOptions:{stroke:"lineColor","stroke-width":"lineWidth",fill:"fillColor",r:"radius"},axisTypes:["xAxis","yAxis"],colorCounter:0,parallelArrays:["x","y"],init:function(a,b){var c=this,d,e,f=a.series,g=function(a,b){return p(a.options.index,a._i)-p(b.options.index,b._i)};c.chart=a;c.options=b=c.setOptions(b);c.linkedSeries=[];c.bindAxes();r(c,{name:b.name,state:"",pointAttr:{},visible:b.visible!==!1,selected:b.selected===!0});if(ga)b.animation=!1;e=b.events;for(d in e)N(c,
+d,e[d]);if(e&&e.click||b.point&&b.point.events&&b.point.events.click||b.allowPointSelect)a.runTrackerClick=!0;c.getColor();c.getSymbol();q(c.parallelArrays,function(a){c[a+"Data"]=[]});c.setData(b.data,!1);if(c.isCartesian)a.hasCartesianSeries=!0;f.push(c);c._i=f.length-1;nb(f,g);this.yAxis&&nb(this.yAxis.series,g);q(f,function(a,b){a.index=b;a.name=a.name||"Series "+(b+1)})},bindAxes:function(){var a=this,b=a.options,c=a.chart,d;q(a.axisTypes||[],function(e){q(c[e],function(c){d=c.options;if(b[e]===
+d.index||b[e]!==t&&b[e]===d.id||b[e]===t&&d.index===0)c.series.push(a),a[e]=c,c.isDirty=!0});!a[e]&&a.optionalAxis!==e&&oa(18,!0)})},updateParallelArrays:function(a,b){var c=a.series,d=arguments;q(c.parallelArrays,typeof b==="number"?function(d){var f=d==="y"&&c.toYData?c.toYData(a):a[d];c[d+"Data"][b]=f}:function(a){Array.prototype[b].apply(c[a+"Data"],Array.prototype.slice.call(d,2))})},autoIncrement:function(){var a=this.options,b=this.xIncrement,b=p(b,a.pointStart,0);this.pointInterval=p(this.pointInterval,
+a.pointInterval,1);this.xIncrement=b+this.pointInterval;return b},getSegments:function(){var a=-1,b=[],c,d=this.points,e=d.length;if(e)if(this.options.connectNulls){for(c=e;c--;)d[c].y===null&&d.splice(c,1);d.length&&(b=[d])}else q(d,function(c,g){c.y===null?(g>a+1&&b.push(d.slice(a+1,g)),a=g):g===e-1&&b.push(d.slice(a+1,g+1))});this.segments=b},setOptions:function(a){var b=this.chart,c=b.options.plotOptions,b=b.userOptions||{},d=b.plotOptions||{},e=c[this.type];this.userOptions=a;c=w(e,c.series,
+a);this.tooltipOptions=w(L.tooltip,L.plotOptions[this.type].tooltip,b.tooltip,d.series&&d.series.tooltip,d[this.type]&&d[this.type].tooltip,a.tooltip);e.marker===null&&delete c.marker;return c},getCyclic:function(a,b,c){var d=this.userOptions,e="_"+a+"Index",f=a+"Counter";b||(s(d[e])?b=d[e]:(d[e]=b=this.chart[f]%c.length,this.chart[f]+=1),b=c[b]);this[a]=b},getColor:function(){this.options.colorByPoint||this.getCyclic("color",this.options.color||ca[this.type].color,this.chart.options.colors)},getSymbol:function(){var a=
+this.options.marker;this.getCyclic("symbol",a.symbol,this.chart.options.symbols);if(/^url/.test(this.symbol))a.radius=0},drawLegendSymbol:M.drawLineMarker,setData:function(a,b,c,d){var e=this,f=e.points,g=f&&f.length||0,h,i=e.options,j=e.chart,k=null,l=e.xAxis,m=l&&!!l.categories,n=e.tooltipPoints,o=i.turboThreshold,r=this.xData,u=this.yData,s=(h=e.pointArrayMap)&&h.length,a=a||[];h=a.length;b=p(b,!0);if(d!==!1&&h&&g===h&&!e.cropped&&!e.hasGroupedData)q(a,function(a,b){f[b].update(a,!1)});else{e.xIncrement=
+null;e.pointRange=m?1:i.pointRange;e.colorCounter=0;q(this.parallelArrays,function(a){e[a+"Data"].length=0});if(o&&h>o){for(c=0;k===null&&c<h;)k=a[c],c++;if(ia(k)){m=p(i.pointStart,0);i=p(i.pointInterval,1);for(c=0;c<h;c++)r[c]=m,u[c]=a[c],m+=i;e.xIncrement=m}else if(La(k))if(s)for(c=0;c<h;c++)i=a[c],r[c]=i[0],u[c]=i.slice(1,s+1);else for(c=0;c<h;c++)i=a[c],r[c]=i[0],u[c]=i[1];else oa(12)}else for(c=0;c<h;c++)if(a[c]!==t&&(i={series:e},e.pointClass.prototype.applyOptions.apply(i,[a[c]]),e.updateParallelArrays(i,
+c),m&&i.name))l.names[i.x]=i.name;Fa(u[0])&&oa(14,!0);e.data=[];e.options.data=a;for(c=g;c--;)f[c]&&f[c].destroy&&f[c].destroy();if(n)n.length=0;if(l)l.minRange=l.userMinRange;e.isDirty=e.isDirtyData=j.isDirtyBox=!0;c=!1}b&&j.redraw(c)},processData:function(a){var b=this.xData,c=this.yData,d=b.length,e;e=0;var f,g,h=this.xAxis,i=this.options,j=i.cropThreshold,k=0,l=this.isCartesian,m,n;if(l&&!this.isDirty&&!h.isDirty&&!this.yAxis.isDirty&&!a)return!1;if(l&&this.sorted&&(!j||d>j||this.forceCrop))if(m=
+h.getExtremes(),n=m.min,m=m.max,b[d-1]<n||b[0]>m)b=[],c=[];else if(b[0]<n||b[d-1]>m)e=this.cropData(this.xData,this.yData,n,m),b=e.xData,c=e.yData,e=e.start,f=!0,k=b.length;for(a=b.length-1;a>=0;a--)d=b[a]-b[a-1],!f&&b[a]>n&&b[a]<m&&k++,d>0&&(g===t||d<g)?g=d:d<0&&this.requireSorting&&oa(15);this.cropped=f;this.cropStart=e;this.processedXData=b;this.processedYData=c;this.activePointCount=k;if(i.pointRange===null)this.pointRange=g||1;this.closestPointRange=g},cropData:function(a,b,c,d){var e=a.length,
+f=0,g=e,h=p(this.cropShoulder,1),i;for(i=0;i<e;i++)if(a[i]>=c){f=u(0,i-h);break}for(;i<e;i++)if(a[i]>d){g=i+h;break}return{xData:a.slice(f,g),yData:b.slice(f,g),start:f,end:g}},generatePoints:function(){var a=this.options.data,b=this.data,c,d=this.processedXData,e=this.processedYData,f=this.pointClass,g=d.length,h=this.cropStart||0,i,j=this.hasGroupedData,k,l=[],m;if(!b&&!j)b=[],b.length=a.length,b=this.data=b;for(m=0;m<g;m++)i=h+m,j?l[m]=(new f).init(this,[d[m]].concat(ra(e[m]))):(b[i]?k=b[i]:a[i]!==
+t&&(b[i]=k=(new f).init(this,a[i],d[m])),l[m]=k);if(b&&(g!==(c=b.length)||j))for(m=0;m<c;m++)if(m===h&&!j&&(m+=g),b[m])b[m].destroyElements(),b[m].plotX=t;this.data=b;this.points=l},getExtremes:function(a){var b=this.yAxis,c=this.processedXData,d,e=[],f=0;d=this.xAxis.getExtremes();var g=d.min,h=d.max,i,j,k,l,a=a||this.stackedYData||this.processedYData;d=a.length;for(l=0;l<d;l++)if(j=c[l],k=a[l],i=k!==null&&k!==t&&(!b.isLog||k.length||k>0),j=this.getExtremesFromAll||this.cropped||(c[l+1]||j)>=g&&
+(c[l-1]||j)<=h,i&&j)if(i=k.length)for(;i--;)k[i]!==null&&(e[f++]=k[i]);else e[f++]=k;this.dataMin=p(void 0,Na(e));this.dataMax=p(void 0,Ba(e))},translate:function(){this.processedXData||this.processData();this.generatePoints();for(var a=this.options,b=a.stacking,c=this.xAxis,d=c.categories,e=this.yAxis,f=this.points,g=f.length,h=!!this.modifyValue,i=a.pointPlacement,j=i==="between"||ia(i),k=a.threshold,a=0;a<g;a++){var l=f[a],m=l.x,n=l.y,o=l.low,q=b&&e.stacks[(this.negStacks&&n<k?"-":"")+this.stackKey];
+if(e.isLog&&n<=0)l.y=n=null;l.plotX=c.translate(m,0,0,0,1,i,this.type==="flags");if(b&&this.visible&&q&&q[m])q=q[m],n=q.points[this.index+","+a],o=n[0],n=n[1],o===0&&(o=p(k,e.min)),e.isLog&&o<=0&&(o=null),l.total=l.stackTotal=q.total,l.percentage=q.total&&l.y/q.total*100,l.stackY=n,q.setOffset(this.pointXOffset||0,this.barW||0);l.yBottom=s(o)?e.translate(o,0,1,0,1):null;h&&(n=this.modifyValue(n,l));l.plotY=typeof n==="number"&&n!==Infinity?e.translate(n,0,1,0,1):t;l.clientX=j?c.translate(m,0,0,0,
+1):l.plotX;l.negative=l.y<(k||0);l.category=d&&d[l.x]!==t?d[l.x]:l.x}this.getSegments()},animate:function(a){var b=this.chart,c=b.renderer,d;d=this.options.animation;var e=this.clipBox||b.clipBox,f=b.inverted,g;if(d&&!da(d))d=ca[this.type].animation;g=["_sharedClip",d.duration,d.easing,e.height].join(",");a?(a=b[g],d=b[g+"m"],a||(b[g]=a=c.clipRect(r(e,{width:0})),b[g+"m"]=d=c.clipRect(-99,f?-b.plotLeft:-b.plotTop,99,f?b.chartWidth:b.chartHeight)),this.group.clip(a),this.markerGroup.clip(d),this.sharedClipKey=
+g):((a=b[g])&&a.animate({width:b.plotSizeX},d),b[g+"m"]&&b[g+"m"].animate({width:b.plotSizeX+99},d),this.animate=null)},afterAnimate:function(){var a=this.chart,b=this.sharedClipKey,c=this.group,d=this.clipBox;if(c&&this.options.clip!==!1){if(!b||!d)c.clip(d?a.renderer.clipRect(d):a.clipRect);this.markerGroup.clip()}K(this,"afterAnimate");setTimeout(function(){b&&a[b]&&(d||(a[b]=a[b].destroy()),a[b+"m"]&&(a[b+"m"]=a[b+"m"].destroy()))},100)},drawPoints:function(){var a,b=this.points,c=this.chart,
+d,e,f,g,h,i,j,k;d=this.options.marker;var l=this.pointAttr[""],m,n=this.markerGroup,o=p(d.enabled,this.activePointCount<0.5*this.xAxis.len/d.radius);if(d.enabled!==!1||this._hasPointMarkers)for(f=b.length;f--;)if(g=b[f],d=U(g.plotX),e=g.plotY,k=g.graphic,i=g.marker||{},a=o&&i.enabled===t||i.enabled,m=c.isInsidePlot(v(d),e,c.inverted),a&&e!==t&&!isNaN(e)&&g.y!==null)if(a=g.pointAttr[g.selected?"select":""]||l,h=a.r,i=p(i.symbol,this.symbol),j=i.indexOf("url")===0,k)k[m?"show":"hide"](!0).animate(r({x:d-
+h,y:e-h},k.symbolName?{width:2*h,height:2*h}:{}));else{if(m&&(h>0||j))g.graphic=c.renderer.symbol(i,d-h,e-h,2*h,2*h).attr(a).add(n)}else if(k)g.graphic=k.destroy()},convertAttribs:function(a,b,c,d){var e=this.pointAttrToOptions,f,g,h={},a=a||{},b=b||{},c=c||{},d=d||{};for(f in e)g=e[f],h[f]=p(a[g],b[f],c[f],d[f]);return h},getAttribs:function(){var a=this,b=a.options,c=ca[a.type].marker?b.marker:b,d=c.states,e=d.hover,f,g=a.color;f={stroke:g,fill:g};var h=a.points||[],i,j=[],k,l=a.pointAttrToOptions;
+k=a.hasPointSpecificOptions;var m=b.negativeColor,n=c.lineColor,o=c.fillColor;i=b.turboThreshold;var p;b.marker?(e.radius=e.radius||c.radius+e.radiusPlus,e.lineWidth=e.lineWidth||c.lineWidth+e.lineWidthPlus):e.color=e.color||ya(e.color||g).brighten(e.brightness).get();j[""]=a.convertAttribs(c,f);q(["hover","select"],function(b){j[b]=a.convertAttribs(d[b],j[""])});a.pointAttr=j;g=h.length;if(!i||g<i||k)for(;g--;){i=h[g];if((c=i.options&&i.options.marker||i.options)&&c.enabled===!1)c.radius=0;if(i.negative&&
+m)i.color=i.fillColor=m;k=b.colorByPoint||i.color;if(i.options)for(p in l)s(c[l[p]])&&(k=!0);if(k){c=c||{};k=[];d=c.states||{};f=d.hover=d.hover||{};if(!b.marker)f.color=f.color||!i.options.color&&e.color||ya(i.color).brighten(f.brightness||e.brightness).get();f={color:i.color};if(!o)f.fillColor=i.color;if(!n)f.lineColor=i.color;k[""]=a.convertAttribs(r(f,c),j[""]);k.hover=a.convertAttribs(d.hover,j.hover,k[""]);k.select=a.convertAttribs(d.select,j.select,k[""])}else k=j;i.pointAttr=k}},destroy:function(){var a=
+this,b=a.chart,c=/AppleWebKit\/533/.test(wa),d,e,f=a.data||[],g,h,i;K(a,"destroy");X(a);q(a.axisTypes||[],function(b){if(i=a[b])ka(i.series,a),i.isDirty=i.forceRedraw=!0});a.legendItem&&a.chart.legend.destroyItem(a);for(e=f.length;e--;)(g=f[e])&&g.destroy&&g.destroy();a.points=null;clearTimeout(a.animationTimeout);q("area,graph,dataLabelsGroup,group,markerGroup,tracker,graphNeg,areaNeg,posClip,negClip".split(","),function(b){a[b]&&(d=c&&b==="group"?"hide":"destroy",a[b][d]())});if(b.hoverSeries===
+a)b.hoverSeries=null;ka(b.series,a);for(h in a)delete a[h]},getSegmentPath:function(a){var b=this,c=[],d=b.options.step;q(a,function(e,f){var g=e.plotX,h=e.plotY,i;b.getPointSpline?c.push.apply(c,b.getPointSpline(a,e,f)):(c.push(f?"L":"M"),d&&f&&(i=a[f-1],d==="right"?c.push(i.plotX,h):d==="center"?c.push((i.plotX+g)/2,i.plotY,(i.plotX+g)/2,h):c.push(g,i.plotY)),c.push(e.plotX,e.plotY))});return c},getGraphPath:function(){var a=this,b=[],c,d=[];q(a.segments,function(e){c=a.getSegmentPath(e);e.length>
+1?b=b.concat(c):d.push(e[0])});a.singlePoints=d;return a.graphPath=b},drawGraph:function(){var a=this,b=this.options,c=[["graph",b.lineColor||this.color]],d=b.lineWidth,e=b.dashStyle,f=b.linecap!=="square",g=this.getGraphPath(),h=b.negativeColor;h&&c.push(["graphNeg",h]);q(c,function(c,h){var k=c[0],l=a[k];if(l)ab(l),l.animate({d:g});else if(d&&g.length)l={stroke:c[1],"stroke-width":d,fill:P,zIndex:1},e?l.dashstyle=e:f&&(l["stroke-linecap"]=l["stroke-linejoin"]="round"),a[k]=a.chart.renderer.path(g).attr(l).add(a.group).shadow(!h&&
+b.shadow)})},clipNeg:function(){var a=this.options,b=this.chart,c=b.renderer,d=a.negativeColor||a.negativeFillColor,e,f=this.graph,g=this.area,h=this.posClip,i=this.negClip;e=b.chartWidth;var j=b.chartHeight,k=u(e,j),l=this.yAxis;if(d&&(f||g)){d=v(l.toPixels(a.threshold||0,!0));d<0&&(k-=d);a={x:0,y:0,width:k,height:d};k={x:0,y:d,width:k,height:k};if(b.inverted)a.height=k.y=b.plotWidth-d,c.isVML&&(a={x:b.plotWidth-d-b.plotLeft,y:0,width:e,height:j},k={x:d+b.plotLeft-e,y:0,width:b.plotLeft+d,height:e});
+l.reversed?(b=k,e=a):(b=a,e=k);h?(h.animate(b),i.animate(e)):(this.posClip=h=c.clipRect(b),this.negClip=i=c.clipRect(e),f&&this.graphNeg&&(f.clip(h),this.graphNeg.clip(i)),g&&(g.clip(h),this.areaNeg.clip(i)))}},invertGroups:function(){function a(){var a={width:b.yAxis.len,height:b.xAxis.len};q(["group","markerGroup"],function(c){b[c]&&b[c].attr(a).invert()})}var b=this,c=b.chart;if(b.xAxis)N(c,"resize",a),N(b,"destroy",function(){X(c,"resize",a)}),a(),b.invertGroups=a},plotGroup:function(a,b,c,d,
+e){var f=this[a],g=!f;g&&(this[a]=f=this.chart.renderer.g(b).attr({visibility:c,zIndex:d||0.1}).add(e));f[g?"attr":"animate"](this.getPlotBox());return f},getPlotBox:function(){var a=this.chart,b=this.xAxis,c=this.yAxis;if(a.inverted)b=c,c=this.xAxis;return{translateX:b?b.left:a.plotLeft,translateY:c?c.top:a.plotTop,scaleX:1,scaleY:1}},render:function(){var a=this,b=a.chart,c,d=a.options,e=(c=d.animation)&&!!a.animate&&b.renderer.isSVG&&p(c.duration,500)||0,f=a.visible?"visible":"hidden",g=d.zIndex,
+h=a.hasRendered,i=b.seriesGroup;c=a.plotGroup("group","series",f,g,i);a.markerGroup=a.plotGroup("markerGroup","markers",f,g,i);e&&a.animate(!0);a.getAttribs();c.inverted=a.isCartesian?b.inverted:!1;a.drawGraph&&(a.drawGraph(),a.clipNeg());a.drawDataLabels&&a.drawDataLabels();a.visible&&a.drawPoints();a.drawTracker&&a.options.enableMouseTracking!==!1&&a.drawTracker();b.inverted&&a.invertGroups();d.clip!==!1&&!a.sharedClipKey&&!h&&c.clip(b.clipRect);e&&a.animate();if(!h)e?a.animationTimeout=setTimeout(function(){a.afterAnimate()},
+e):a.afterAnimate();a.isDirty=a.isDirtyData=!1;a.hasRendered=!0},redraw:function(){var a=this.chart,b=this.isDirtyData,c=this.group,d=this.xAxis,e=this.yAxis;c&&(a.inverted&&c.attr({width:a.plotWidth,height:a.plotHeight}),c.animate({translateX:p(d&&d.left,a.plotLeft),translateY:p(e&&e.top,a.plotTop)}));this.translate();this.setTooltipPoints&&this.setTooltipPoints(!0);this.render();b&&K(this,"updatedData")}};Fb.prototype={destroy:function(){Oa(this,this.axis)},render:function(a){var b=this.options,
+c=b.format,c=c?Ia(c,this):b.formatter.call(this);this.label?this.label.attr({text:c,visibility:"hidden"}):this.label=this.axis.chart.renderer.text(c,null,null,b.useHTML).css(b.style).attr({align:this.textAlign,rotation:b.rotation,visibility:"hidden"}).add(a)},setOffset:function(a,b){var c=this.axis,d=c.chart,e=d.inverted,f=this.isNegative,g=c.translate(c.usePercentage?100:this.total,0,0,0,1),c=c.translate(0),c=Q(g-c),h=d.xAxis[0].translate(this.x)+a,i=d.plotHeight,f={x:e?f?g:g-c:h,y:e?i-h-b:f?i-g-
+c:i-g,width:e?c:b,height:e?b:c};if(e=this.label)e.align(this.alignOptions,null,f),f=e.alignAttr,e[this.options.crop===!1||d.isInsidePlot(f.x,f.y)?"show":"hide"](!0)}};ma.prototype.buildStacks=function(){var a=this.series,b=p(this.options.reversedStacks,!0),c=a.length;if(!this.isXAxis){for(this.usePercentage=!1;c--;)a[b?c:a.length-c-1].setStackedPoints();if(this.usePercentage)for(c=0;c<a.length;c++)a[c].setPercentStacks()}};ma.prototype.renderStackTotals=function(){var a=this.chart,b=a.renderer,c=
+this.stacks,d,e,f=this.stackTotalGroup;if(!f)this.stackTotalGroup=f=b.g("stack-labels").attr({visibility:"visible",zIndex:6}).add();f.translate(a.plotLeft,a.plotTop);for(d in c)for(e in a=c[d],a)a[e].render(f)};O.prototype.setStackedPoints=function(){if(this.options.stacking&&!(this.visible!==!0&&this.chart.options.chart.ignoreHiddenSeries!==!1)){var a=this.processedXData,b=this.processedYData,c=[],d=b.length,e=this.options,f=e.threshold,g=e.stack,e=e.stacking,h=this.stackKey,i="-"+h,j=this.negStacks,
+k=this.yAxis,l=k.stacks,m=k.oldStacks,n,o,p,q,r,s;for(q=0;q<d;q++){r=a[q];s=b[q];p=this.index+","+q;o=(n=j&&s<f)?i:h;l[o]||(l[o]={});if(!l[o][r])m[o]&&m[o][r]?(l[o][r]=m[o][r],l[o][r].total=null):l[o][r]=new Fb(k,k.options.stackLabels,n,r,g);o=l[o][r];o.points[p]=[o.cum||0];e==="percent"?(n=n?h:i,j&&l[n]&&l[n][r]?(n=l[n][r],o.total=n.total=u(n.total,o.total)+Q(s)||0):o.total=ea(o.total+(Q(s)||0))):o.total=ea(o.total+(s||0));o.cum=(o.cum||0)+(s||0);o.points[p].push(o.cum);c[q]=o.cum}if(e==="percent")k.usePercentage=
+!0;this.stackedYData=c;k.oldStacks={}}};O.prototype.setPercentStacks=function(){var a=this,b=a.stackKey,c=a.yAxis.stacks,d=a.processedXData;q([b,"-"+b],function(b){var e;for(var f=d.length,g,h;f--;)if(g=d[f],e=(h=c[b]&&c[b][g])&&h.points[a.index+","+f],g=e)h=h.total?100/h.total:0,g[0]=ea(g[0]*h),g[1]=ea(g[1]*h),a.stackedYData[f]=g[1]})};r(Xa.prototype,{addSeries:function(a,b,c){var d,e=this;a&&(b=p(b,!0),K(e,"addSeries",{options:a},function(){d=e.initSeries(a);e.isDirtyLegend=!0;e.linkSeries();b&&
+e.redraw(c)}));return d},addAxis:function(a,b,c,d){var e=b?"xAxis":"yAxis",f=this.options;new ma(this,w(a,{index:this[e].length,isX:b}));f[e]=ra(f[e]||{});f[e].push(a);p(c,!0)&&this.redraw(d)},showLoading:function(a){var b=this,c=b.options,d=b.loadingDiv,e=c.loading,f=function(){d&&A(d,{left:b.plotLeft+"px",top:b.plotTop+"px",width:b.plotWidth+"px",height:b.plotHeight+"px"})};if(!d)b.loadingDiv=d=$(Ja,{className:"highcharts-loading"},r(e.style,{zIndex:10,display:P}),b.container),b.loadingSpan=$("span",
+null,e.labelStyle,d),N(b,"redraw",f);b.loadingSpan.innerHTML=a||c.lang.loading;if(!b.loadingShown)A(d,{opacity:0,display:""}),ib(d,{opacity:e.style.opacity},{duration:e.showDuration||0}),b.loadingShown=!0;f()},hideLoading:function(){var a=this.options,b=this.loadingDiv;b&&ib(b,{opacity:0},{duration:a.loading.hideDuration||100,complete:function(){A(b,{display:P})}});this.loadingShown=!1}});r(Ea.prototype,{update:function(a,b,c){var d=this,e=d.series,f=d.graphic,g,h=e.data,i=e.chart,j=e.options,b=p(b,
+!0);d.firePointEvent("update",{options:a},function(){d.applyOptions(a);if(da(a)){e.getAttribs();if(f)a&&a.marker&&a.marker.symbol?d.graphic=f.destroy():f.attr(d.pointAttr[d.state||""]);if(a&&a.dataLabels&&d.dataLabel)d.dataLabel=d.dataLabel.destroy()}g=Da(d,h);e.updateParallelArrays(d,g);j.data[g]=d.options;e.isDirty=e.isDirtyData=!0;if(!e.fixedBox&&e.hasCartesianSeries)i.isDirtyBox=!0;j.legendType==="point"&&i.legend.destroyItem(d);b&&i.redraw(c)})},remove:function(a,b){var c=this,d=c.series,e=d.points,
+f=d.chart,g,h=d.data;Qa(b,f);a=p(a,!0);c.firePointEvent("remove",null,function(){g=Da(c,h);h.length===e.length&&e.splice(g,1);h.splice(g,1);d.options.data.splice(g,1);d.updateParallelArrays(c,"splice",g,1);c.destroy();d.isDirty=!0;d.isDirtyData=!0;a&&f.redraw()})}});r(O.prototype,{addPoint:function(a,b,c,d){var e=this.options,f=this.data,g=this.graph,h=this.area,i=this.chart,j=this.xAxis&&this.xAxis.names,k=g&&g.shift||0,l=e.data,m,n=this.xData;Qa(d,i);c&&q([g,h,this.graphNeg,this.areaNeg],function(a){if(a)a.shift=
+k+1});if(h)h.isArea=!0;b=p(b,!0);d={series:this};this.pointClass.prototype.applyOptions.apply(d,[a]);g=d.x;h=n.length;if(this.requireSorting&&g<n[h-1])for(m=!0;h&&n[h-1]>g;)h--;this.updateParallelArrays(d,"splice",h,0,0);this.updateParallelArrays(d,h);if(j)j[g]=d.name;l.splice(h,0,a);m&&(this.data.splice(h,0,null),this.processData());e.legendType==="point"&&this.generatePoints();c&&(f[0]&&f[0].remove?f[0].remove(!1):(f.shift(),this.updateParallelArrays(d,"shift"),l.shift()));this.isDirtyData=this.isDirty=
+!0;b&&(this.getAttribs(),i.redraw())},remove:function(a,b){var c=this,d=c.chart,a=p(a,!0);if(!c.isRemoving)c.isRemoving=!0,K(c,"remove",null,function(){c.destroy();d.isDirtyLegend=d.isDirtyBox=!0;d.linkSeries();a&&d.redraw(b)});c.isRemoving=!1},update:function(a,b){var c=this,d=this.chart,e=this.userOptions,f=this.type,g=J[f].prototype,h=["group","markerGroup","dataLabelsGroup"],i;q(h,function(a){h[a]=c[a];delete c[a]});a=w(e,{animation:!1,index:this.index,pointStart:this.xData[0]},{data:this.options.data},
+a);this.remove(!1);for(i in g)g.hasOwnProperty(i)&&(this[i]=t);r(this,J[a.type||f].prototype);q(h,function(a){c[a]=h[a]});this.init(d,a);d.linkSeries();p(b,!0)&&d.redraw(!1)}});r(ma.prototype,{update:function(a,b){var c=this.chart,a=c.options[this.coll][this.options.index]=w(this.userOptions,a);this.destroy(!0);this._addedPlotLB=t;this.init(c,r(a,{events:t}));c.isDirtyBox=!0;p(b,!0)&&c.redraw()},remove:function(a){for(var b=this.chart,c=this.coll,d=this.series,e=d.length;e--;)d[e]&&d[e].remove(!1);
+ka(b.axes,this);ka(b[c],this);b.options[c].splice(this.options.index,1);q(b[c],function(a,b){a.options.index=b});this.destroy();b.isDirtyBox=!0;p(a,!0)&&b.redraw()},setTitle:function(a,b){this.update({title:a},b)},setCategories:function(a,b){this.update({categories:a},b)}});ha=la(O);J.line=ha;ca.area=w(T,{threshold:0});var qa=la(O,{type:"area",getSegments:function(){var a=this,b=[],c=[],d=[],e=this.xAxis,f=this.yAxis,g=f.stacks[this.stackKey],h={},i,j,k=this.points,l=this.options.connectNulls,m,n;
+if(this.options.stacking&&!this.cropped){for(m=0;m<k.length;m++)h[k[m].x]=k[m];for(n in g)g[n].total!==null&&d.push(+n);d.sort(function(a,b){return a-b});q(d,function(b){var d=0,k;if(!l||h[b]&&h[b].y!==null)if(h[b])c.push(h[b]);else{for(m=a.index;m<=f.series.length;m++)if(k=g[b].points[m+","+b]){d=k[1];break}i=e.translate(b);j=f.toPixels(d,!0);c.push({y:null,plotX:i,clientX:i,plotY:j,yBottom:j,onMouseOver:sa})}});c.length&&b.push(c)}else O.prototype.getSegments.call(this),b=this.segments;this.segments=
+b},getSegmentPath:function(a){var b=O.prototype.getSegmentPath.call(this,a),c=[].concat(b),d,e=this.options;d=b.length;var f=this.yAxis.getThreshold(e.threshold),g;d===3&&c.push("L",b[1],b[2]);if(e.stacking&&!this.closedStacks)for(d=a.length-1;d>=0;d--)g=p(a[d].yBottom,f),d<a.length-1&&e.step&&c.push(a[d+1].plotX,g),c.push(a[d].plotX,g);else this.closeSegment(c,a,f);this.areaPath=this.areaPath.concat(c);return b},closeSegment:function(a,b,c){a.push("L",b[b.length-1].plotX,c,"L",b[0].plotX,c)},drawGraph:function(){this.areaPath=
+[];O.prototype.drawGraph.apply(this);var a=this,b=this.areaPath,c=this.options,d=c.negativeColor,e=c.negativeFillColor,f=[["area",this.color,c.fillColor]];(d||e)&&f.push(["areaNeg",d,e]);q(f,function(d){var e=d[0],f=a[e];f?f.animate({d:b}):a[e]=a.chart.renderer.path(b).attr({fill:p(d[2],ya(d[1]).setOpacity(p(c.fillOpacity,0.75)).get()),zIndex:0}).add(a.group)})},drawLegendSymbol:M.drawRectangle});J.area=qa;ca.spline=w(T);ha=la(O,{type:"spline",getPointSpline:function(a,b,c){var d=b.plotX,e=b.plotY,
+f=a[c-1],g=a[c+1],h,i,j,k;if(f&&g){a=f.plotY;j=g.plotX;var g=g.plotY,l;h=(1.5*d+f.plotX)/2.5;i=(1.5*e+a)/2.5;j=(1.5*d+j)/2.5;k=(1.5*e+g)/2.5;l=(k-i)*(j-d)/(j-h)+e-k;i+=l;k+=l;i>a&&i>e?(i=u(a,e),k=2*e-i):i<a&&i<e&&(i=C(a,e),k=2*e-i);k>g&&k>e?(k=u(g,e),i=2*e-k):k<g&&k<e&&(k=C(g,e),i=2*e-k);b.rightContX=j;b.rightContY=k}c?(b=["C",f.rightContX||f.plotX,f.rightContY||f.plotY,h||d,i||e,d,e],f.rightContX=f.rightContY=null):b=["M",d,e];return b}});J.spline=ha;ca.areaspline=w(ca.area);qa=qa.prototype;ha=la(ha,
+{type:"areaspline",closedStacks:!0,getSegmentPath:qa.getSegmentPath,closeSegment:qa.closeSegment,drawGraph:qa.drawGraph,drawLegendSymbol:M.drawRectangle});J.areaspline=ha;ca.column=w(T,{borderColor:"#FFFFFF",borderRadius:0,groupPadding:0.2,marker:null,pointPadding:0.1,minPointLength:0,cropThreshold:50,pointRange:null,states:{hover:{brightness:0.1,shadow:!1,halo:!1},select:{color:"#C0C0C0",borderColor:"#000000",shadow:!1}},dataLabels:{align:null,verticalAlign:null,y:null},stickyTracking:!1,tooltip:{distance:6},
+threshold:0});ha=la(O,{type:"column",pointAttrToOptions:{stroke:"borderColor",fill:"color",r:"borderRadius"},cropShoulder:0,trackerGroups:["group","dataLabelsGroup"],negStacks:!0,init:function(){O.prototype.init.apply(this,arguments);var a=this,b=a.chart;b.hasRendered&&q(b.series,function(b){if(b.type===a.type)b.isDirty=!0})},getColumnMetrics:function(){var a=this,b=a.options,c=a.xAxis,d=a.yAxis,e=c.reversed,f,g={},h,i=0;b.grouping===!1?i=1:q(a.chart.series,function(b){var c=b.options,e=b.yAxis;if(b.type===
+a.type&&b.visible&&d.len===e.len&&d.pos===e.pos)c.stacking?(f=b.stackKey,g[f]===t&&(g[f]=i++),h=g[f]):c.grouping!==!1&&(h=i++),b.columnIndex=h});var c=C(Q(c.transA)*(c.ordinalSlope||b.pointRange||c.closestPointRange||c.tickInterval||1),c.len),j=c*b.groupPadding,k=(c-2*j)/i,l=b.pointWidth,b=s(l)?(k-l)/2:k*b.pointPadding,l=p(l,k-2*b);return a.columnMetrics={width:l,offset:b+(j+((e?i-(a.columnIndex||0):a.columnIndex)||0)*k-c/2)*(e?-1:1)}},translate:function(){var a=this,b=a.chart,c=a.options,d=a.borderWidth=
+p(c.borderWidth,a.activePointCount>0.5*a.xAxis.len?0:1),e=a.yAxis,f=a.translatedThreshold=e.getThreshold(c.threshold),g=p(c.minPointLength,5),h=a.getColumnMetrics(),i=h.width,j=a.barW=u(i,1+2*d),k=a.pointXOffset=h.offset,l=-(d%2?0.5:0),m=d%2?0.5:1;b.renderer.isVML&&b.inverted&&(m+=1);c.pointPadding&&(j=Ka(j));O.prototype.translate.apply(a);q(a.points,function(c){var d=p(c.yBottom,f),h=C(u(-999-d,c.plotY),e.len+999+d),q=c.plotX+k,r=j,s=C(h,d),t;t=u(h,d)-s;Q(t)<g&&g&&(t=g,s=v(Q(s-f)>g?d-g:f-(e.translate(c.y,
+0,1,0,1)<=f?g:0)));c.barX=q;c.pointWidth=i;c.tooltipPos=b.inverted?[e.len-h,a.xAxis.len-q-r/2]:[q+r/2,h];r=v(q+r)+l;q=v(q)+l;r-=q;d=Q(s)<0.5;t=v(s+t)+m;s=v(s)+m;t-=s;d&&(s-=1,t+=1);c.shapeType="rect";c.shapeArgs={x:q,y:s,width:r,height:t}})},getSymbol:sa,drawLegendSymbol:M.drawRectangle,drawGraph:sa,drawPoints:function(){var a=this,b=this.chart,c=a.options,d=b.renderer,e=c.animationLimit||250,f,g;q(a.points,function(h){var i=h.plotY,j=h.graphic;if(i!==t&&!isNaN(i)&&h.y!==null)f=h.shapeArgs,i=s(a.borderWidth)?
+{"stroke-width":a.borderWidth}:{},g=h.pointAttr[h.selected?"select":""]||a.pointAttr[""],j?(ab(j),j.attr(i)[b.pointCount<e?"animate":"attr"](w(f))):h.graphic=d[h.shapeType](f).attr(g).attr(i).add(a.group).shadow(c.shadow,null,c.stacking&&!c.borderRadius);else if(j)h.graphic=j.destroy()})},animate:function(a){var b=this.yAxis,c=this.options,d=this.chart.inverted,e={};if(ba)a?(e.scaleY=0.001,a=C(b.pos+b.len,u(b.pos,b.toPixels(c.threshold))),d?e.translateX=a-b.len:e.translateY=a,this.group.attr(e)):
+(e.scaleY=1,e[d?"translateX":"translateY"]=b.pos,this.group.animate(e,this.options.animation),this.animate=null)},remove:function(){var a=this,b=a.chart;b.hasRendered&&q(b.series,function(b){if(b.type===a.type)b.isDirty=!0});O.prototype.remove.apply(a,arguments)}});J.column=ha;ca.bar=w(ca.column);qa=la(ha,{type:"bar",inverted:!0});J.bar=qa;ca.scatter=w(T,{lineWidth:0,tooltip:{headerFormat:'<span style="color:{series.color}">●</span> <span style="font-size: 10px;"> {series.name}</span><br/>',pointFormat:"x: <b>{point.x}</b><br/>y: <b>{point.y}</b><br/>"},
+stickyTracking:!1});qa=la(O,{type:"scatter",sorted:!1,requireSorting:!1,noSharedTooltip:!0,trackerGroups:["markerGroup","dataLabelsGroup"],takeOrdinalPosition:!1,singularTooltips:!0,drawGraph:function(){this.options.lineWidth&&O.prototype.drawGraph.call(this)}});J.scatter=qa;ca.pie=w(T,{borderColor:"#FFFFFF",borderWidth:1,center:[null,null],clip:!1,colorByPoint:!0,dataLabels:{distance:30,enabled:!0,formatter:function(){return this.point.name}},ignoreHiddenPoint:!0,legendType:"point",marker:null,size:null,
+showInLegend:!1,slicedOffset:10,states:{hover:{brightness:0.1,shadow:!1}},stickyTracking:!1,tooltip:{followPointer:!0}});T={type:"pie",isCartesian:!1,pointClass:la(Ea,{init:function(){Ea.prototype.init.apply(this,arguments);var a=this,b;if(a.y<0)a.y=null;r(a,{visible:a.visible!==!1,name:p(a.name,"Slice")});b=function(b){a.slice(b.type==="select")};N(a,"select",b);N(a,"unselect",b);return a},setVisible:function(a){var b=this,c=b.series,d=c.chart;b.visible=b.options.visible=a=a===t?!b.visible:a;c.options.data[Da(b,
+c.data)]=b.options;q(["graphic","dataLabel","connector","shadowGroup"],function(c){if(b[c])b[c][a?"show":"hide"](!0)});b.legendItem&&d.legend.colorizeItem(b,a);if(!c.isDirty&&c.options.ignoreHiddenPoint)c.isDirty=!0,d.redraw()},slice:function(a,b,c){var d=this.series;Qa(c,d.chart);p(b,!0);this.sliced=this.options.sliced=a=s(a)?a:!this.sliced;d.options.data[Da(this,d.data)]=this.options;a=a?this.slicedTranslation:{translateX:0,translateY:0};this.graphic.animate(a);this.shadowGroup&&this.shadowGroup.animate(a)},
+haloPath:function(a){var b=this.shapeArgs,c=this.series.chart;return this.sliced||!this.visible?[]:this.series.chart.renderer.symbols.arc(c.plotLeft+b.x,c.plotTop+b.y,b.r+a,b.r+a,{innerR:this.shapeArgs.r,start:b.start,end:b.end})}}),requireSorting:!1,noSharedTooltip:!0,trackerGroups:["group","dataLabelsGroup"],axisTypes:[],pointAttrToOptions:{stroke:"borderColor","stroke-width":"borderWidth",fill:"color"},singularTooltips:!0,getColor:sa,animate:function(a){var b=this,c=b.points,d=b.startAngleRad;
+if(!a)q(c,function(a){var c=a.graphic,a=a.shapeArgs;c&&(c.attr({r:b.center[3]/2,start:d,end:d}),c.animate({r:a.r,start:a.start,end:a.end},b.options.animation))}),b.animate=null},setData:function(a,b,c,d){O.prototype.setData.call(this,a,!1,c,d);this.processData();this.generatePoints();p(b,!0)&&this.chart.redraw(c)},generatePoints:function(){var a,b=0,c,d,e,f=this.options.ignoreHiddenPoint;O.prototype.generatePoints.call(this);c=this.points;d=c.length;for(a=0;a<d;a++)e=c[a],b+=f&&!e.visible?0:e.y;this.total=
+b;for(a=0;a<d;a++)e=c[a],e.percentage=b>0?e.y/b*100:0,e.total=b},translate:function(a){this.generatePoints();var b=0,c=this.options,d=c.slicedOffset,e=d+c.borderWidth,f,g,h,i=c.startAngle||0,j=this.startAngleRad=na/180*(i-90),i=(this.endAngleRad=na/180*(p(c.endAngle,i+360)-90))-j,k=this.points,l=c.dataLabels.distance,c=c.ignoreHiddenPoint,m,n=k.length,o;if(!a)this.center=a=this.getCenter();this.getX=function(b,c){h=V.asin(C((b-a[1])/(a[2]/2+l),1));return a[0]+(c?-1:1)*aa(h)*(a[2]/2+l)};for(m=0;m<
+n;m++){o=k[m];f=j+b*i;if(!c||o.visible)b+=o.percentage/100;g=j+b*i;o.shapeType="arc";o.shapeArgs={x:a[0],y:a[1],r:a[2]/2,innerR:a[3]/2,start:v(f*1E3)/1E3,end:v(g*1E3)/1E3};h=(g+f)/2;h>1.5*na?h-=2*na:h<-na/2&&(h+=2*na);o.slicedTranslation={translateX:v(aa(h)*d),translateY:v(fa(h)*d)};f=aa(h)*a[2]/2;g=fa(h)*a[2]/2;o.tooltipPos=[a[0]+f*0.7,a[1]+g*0.7];o.half=h<-na/2||h>na/2?1:0;o.angle=h;e=C(e,l/2);o.labelPos=[a[0]+f+aa(h)*l,a[1]+g+fa(h)*l,a[0]+f+aa(h)*e,a[1]+g+fa(h)*e,a[0]+f,a[1]+g,l<0?"center":o.half?
+"right":"left",h]}},drawGraph:null,drawPoints:function(){var a=this,b=a.chart.renderer,c,d,e=a.options.shadow,f,g;if(e&&!a.shadowGroup)a.shadowGroup=b.g("shadow").add(a.group);q(a.points,function(h){d=h.graphic;g=h.shapeArgs;f=h.shadowGroup;if(e&&!f)f=h.shadowGroup=b.g("shadow").add(a.shadowGroup);c=h.sliced?h.slicedTranslation:{translateX:0,translateY:0};f&&f.attr(c);d?d.animate(r(g,c)):h.graphic=d=b[h.shapeType](g).setRadialReference(a.center).attr(h.pointAttr[h.selected?"select":""]).attr({"stroke-linejoin":"round"}).attr(c).add(a.group).shadow(e,
+f);h.visible!==void 0&&h.setVisible(h.visible)})},sortByAngle:function(a,b){a.sort(function(a,d){return a.angle!==void 0&&(d.angle-a.angle)*b})},drawLegendSymbol:M.drawRectangle,getCenter:Z.getCenter,getSymbol:sa};T=la(O,T);J.pie=T;O.prototype.drawDataLabels=function(){var a=this,b=a.options,c=b.cursor,d=b.dataLabels,e=a.points,f,g,h,i;if(d.enabled||a._hasPointLabels)a.dlProcessOptions&&a.dlProcessOptions(d),i=a.plotGroup("dataLabelsGroup","data-labels",d.defer?"hidden":"visible",d.zIndex||6),!a.hasRendered&&
+p(d.defer,!0)&&(i.attr({opacity:0}),N(a,"afterAnimate",function(){a.visible&&i.show();i[b.animation?"animate":"attr"]({opacity:1},{duration:200})})),g=d,q(e,function(b){var e,l=b.dataLabel,m,n,o=b.connector,q=!0;f=b.options&&b.options.dataLabels;e=p(f&&f.enabled,g.enabled);if(l&&!e)b.dataLabel=l.destroy();else if(e){d=w(g,f);e=d.rotation;m=b.getLabelConfig();h=d.format?Ia(d.format,m):d.formatter.call(m,d);d.style.color=p(d.color,d.style.color,a.color,"black");if(l)if(s(h))l.attr({text:h}),q=!1;else{if(b.dataLabel=
+l=l.destroy(),o)b.connector=o.destroy()}else if(s(h)){l={fill:d.backgroundColor,stroke:d.borderColor,"stroke-width":d.borderWidth,r:d.borderRadius||0,rotation:e,padding:d.padding,zIndex:1};for(n in l)l[n]===t&&delete l[n];l=b.dataLabel=a.chart.renderer[e?"text":"label"](h,0,-999,null,null,null,d.useHTML).attr(l).css(r(d.style,c&&{cursor:c})).add(i).shadow(d.shadow)}l&&a.alignDataLabel(b,l,d,null,q)}})};O.prototype.alignDataLabel=function(a,b,c,d,e){var f=this.chart,g=f.inverted,h=p(a.plotX,-999),
+i=p(a.plotY,-999),j=b.getBBox();if(a=this.visible&&(a.series.forceDL||f.isInsidePlot(h,v(i),g)||d&&f.isInsidePlot(h,g?d.x+1:d.y+d.height-1,g)))d=r({x:g?f.plotWidth-i:h,y:v(g?f.plotHeight-h:i),width:0,height:0},d),r(c,{width:j.width,height:j.height}),c.rotation?b[e?"attr":"animate"]({x:d.x+c.x+d.width/2,y:d.y+c.y+d.height/2}).attr({align:c.align}):(b.align(c,null,d),g=b.alignAttr,p(c.overflow,"justify")==="justify"?this.justifyDataLabel(b,c,g,j,d,e):p(c.crop,!0)&&(a=f.isInsidePlot(g.x,g.y)&&f.isInsidePlot(g.x+
+j.width,g.y+j.height)));if(!a)b.attr({y:-999}),b.placed=!1};O.prototype.justifyDataLabel=function(a,b,c,d,e,f){var g=this.chart,h=b.align,i=b.verticalAlign,j,k;j=c.x;if(j<0)h==="right"?b.align="left":b.x=-j,k=!0;j=c.x+d.width;if(j>g.plotWidth)h==="left"?b.align="right":b.x=g.plotWidth-j,k=!0;j=c.y;if(j<0)i==="bottom"?b.verticalAlign="top":b.y=-j,k=!0;j=c.y+d.height;if(j>g.plotHeight)i==="top"?b.verticalAlign="bottom":b.y=g.plotHeight-j,k=!0;if(k)a.placed=!f,a.align(b,null,e)};if(J.pie)J.pie.prototype.drawDataLabels=
+function(){var a=this,b=a.data,c,d=a.chart,e=a.options.dataLabels,f=p(e.connectorPadding,10),g=p(e.connectorWidth,1),h=d.plotWidth,i=d.plotHeight,j,k,l=p(e.softConnector,!0),m=e.distance,n=a.center,o=n[2]/2,r=n[1],s=m>0,t,w,x,z=[[],[]],B,A,K,J,y,R=[0,0,0,0],N=function(a,b){return b.y-a.y};if(a.visible&&(e.enabled||a._hasPointLabels)){O.prototype.drawDataLabels.apply(a);q(b,function(a){a.dataLabel&&a.visible&&z[a.half].push(a)});for(J=2;J--;){var H=[],M=[],F=z[J],L=F.length,G;if(L){a.sortByAngle(F,
+J-0.5);for(y=b=0;!b&&F[y];)b=F[y]&&F[y].dataLabel&&(F[y].dataLabel.getBBox().height||21),y++;if(m>0){w=C(r+o+m,d.plotHeight);for(y=u(0,r-o-m);y<=w;y+=b)H.push(y);w=H.length;if(L>w){c=[].concat(F);c.sort(N);for(y=L;y--;)c[y].rank=y;for(y=L;y--;)F[y].rank>=w&&F.splice(y,1);L=F.length}for(y=0;y<L;y++){c=F[y];x=c.labelPos;c=9999;var S,P;for(P=0;P<w;P++)S=Q(H[P]-x[1]),S<c&&(c=S,G=P);if(G<y&&H[y]!==null)G=y;else for(w<L-y+G&&H[y]!==null&&(G=w-L+y);H[G]===null;)G++;M.push({i:G,y:H[G]});H[G]=null}M.sort(N)}for(y=
+0;y<L;y++){c=F[y];x=c.labelPos;t=c.dataLabel;K=c.visible===!1?"hidden":"visible";c=x[1];if(m>0){if(w=M.pop(),G=w.i,A=w.y,c>A&&H[G+1]!==null||c<A&&H[G-1]!==null)A=C(u(0,c),d.plotHeight)}else A=c;B=e.justify?n[0]+(J?-1:1)*(o+m):a.getX(A===r-o-m||A===r+o+m?c:A,J);t._attr={visibility:K,align:x[6]};t._pos={x:B+e.x+({left:f,right:-f}[x[6]]||0),y:A+e.y-10};t.connX=B;t.connY=A;if(this.options.size===null)w=t.width,B-w<f?R[3]=u(v(w-B+f),R[3]):B+w>h-f&&(R[1]=u(v(B+w-h+f),R[1])),A-b/2<0?R[0]=u(v(-A+b/2),R[0]):
+A+b/2>i&&(R[2]=u(v(A+b/2-i),R[2]))}}}if(Ba(R)===0||this.verifyDataLabelOverflow(R))this.placeDataLabels(),s&&g&&q(this.points,function(b){j=b.connector;x=b.labelPos;if((t=b.dataLabel)&&t._pos)K=t._attr.visibility,B=t.connX,A=t.connY,k=l?["M",B+(x[6]==="left"?5:-5),A,"C",B,A,2*x[2]-x[4],2*x[3]-x[5],x[2],x[3],"L",x[4],x[5]]:["M",B+(x[6]==="left"?5:-5),A,"L",x[2],x[3],"L",x[4],x[5]],j?(j.animate({d:k}),j.attr("visibility",K)):b.connector=j=a.chart.renderer.path(k).attr({"stroke-width":g,stroke:e.connectorColor||
+b.color||"#606060",visibility:K}).add(a.dataLabelsGroup);else if(j)b.connector=j.destroy()})}},J.pie.prototype.placeDataLabels=function(){q(this.points,function(a){var a=a.dataLabel,b;if(a)(b=a._pos)?(a.attr(a._attr),a[a.moved?"animate":"attr"](b),a.moved=!0):a&&a.attr({y:-999})})},J.pie.prototype.alignDataLabel=sa,J.pie.prototype.verifyDataLabelOverflow=function(a){var b=this.center,c=this.options,d=c.center,e=c=c.minSize||80,f;d[0]!==null?e=u(b[2]-u(a[1],a[3]),c):(e=u(b[2]-a[1]-a[3],c),b[0]+=(a[3]-
+a[1])/2);d[1]!==null?e=u(C(e,b[2]-u(a[0],a[2])),c):(e=u(C(e,b[2]-a[0]-a[2]),c),b[1]+=(a[0]-a[2])/2);e<b[2]?(b[2]=e,this.translate(b),q(this.points,function(a){if(a.dataLabel)a.dataLabel._pos=null}),this.drawDataLabels&&this.drawDataLabels()):f=!0;return f};if(J.column)J.column.prototype.alignDataLabel=function(a,b,c,d,e){var f=this.chart,g=f.inverted,h=a.dlBox||a.shapeArgs,i=a.below||a.plotY>p(this.translatedThreshold,f.plotSizeY),j=p(c.inside,!!this.options.stacking);if(h&&(d=w(h),g&&(d={x:f.plotWidth-
+d.y-d.height,y:f.plotHeight-d.x-d.width,width:d.height,height:d.width}),!j))g?(d.x+=i?0:d.width,d.width=0):(d.y+=i?d.height:0,d.height=0);c.align=p(c.align,!g||j?"center":i?"right":"left");c.verticalAlign=p(c.verticalAlign,g||j?"middle":i?"top":"bottom");O.prototype.alignDataLabel.call(this,a,b,c,d,e)};T=S.TrackerMixin={drawTrackerPoint:function(){var a=this,b=a.chart,c=b.pointer,d=a.options.cursor,e=d&&{cursor:d},f=function(c){var d=c.target,e;if(b.hoverSeries!==a)a.onMouseOver();for(;d&&!e;)e=d.point,
+d=d.parentNode;if(e!==t&&e!==b.hoverPoint)e.onMouseOver(c)};q(a.points,function(a){if(a.graphic)a.graphic.element.point=a;if(a.dataLabel)a.dataLabel.element.point=a});if(!a._hasTracking)q(a.trackerGroups,function(b){if(a[b]&&(a[b].addClass("highcharts-tracker").on("mouseover",f).on("mouseout",function(a){c.onTrackerMouseOut(a)}).css(e),Za))a[b].on("touchstart",f)}),a._hasTracking=!0},drawTrackerGraph:function(){var a=this,b=a.options,c=b.trackByArea,d=[].concat(c?a.areaPath:a.graphPath),e=d.length,
+f=a.chart,g=f.pointer,h=f.renderer,i=f.options.tooltip.snap,j=a.tracker,k=b.cursor,l=k&&{cursor:k},k=a.singlePoints,m,n=function(){if(f.hoverSeries!==a)a.onMouseOver()},o="rgba(192,192,192,"+(ba?1.0E-4:0.002)+")";if(e&&!c)for(m=e+1;m--;)d[m]==="M"&&d.splice(m+1,0,d[m+1]-i,d[m+2],"L"),(m&&d[m]==="M"||m===e)&&d.splice(m,0,"L",d[m-2]+i,d[m-1]);for(m=0;m<k.length;m++)e=k[m],d.push("M",e.plotX-i,e.plotY,"L",e.plotX+i,e.plotY);j?j.attr({d:d}):(a.tracker=h.path(d).attr({"stroke-linejoin":"round",visibility:a.visible?
+"visible":"hidden",stroke:o,fill:c?o:P,"stroke-width":b.lineWidth+(c?0:2*i),zIndex:2}).add(a.group),q([a.tracker,a.markerGroup],function(a){a.addClass("highcharts-tracker").on("mouseover",n).on("mouseout",function(a){g.onTrackerMouseOut(a)}).css(l);if(Za)a.on("touchstart",n)}))}};if(J.column)ha.prototype.drawTracker=T.drawTrackerPoint;if(J.pie)J.pie.prototype.drawTracker=T.drawTrackerPoint;if(J.scatter)qa.prototype.drawTracker=T.drawTrackerPoint;r(kb.prototype,{setItemEvents:function(a,b,c,d,e){var f=
+this;(c?b:a.legendGroup).on("mouseover",function(){a.setState("hover");b.css(f.options.itemHoverStyle)}).on("mouseout",function(){b.css(a.visible?d:e);a.setState()}).on("click",function(b){var c=function(){a.setVisible()},b={browserEvent:b};a.firePointEvent?a.firePointEvent("legendItemClick",b,c):K(a,"legendItemClick",b,c)})},createCheckboxForItem:function(a){a.checkbox=$("input",{type:"checkbox",checked:a.selected,defaultChecked:a.selected},this.options.itemCheckboxStyle,this.chart.container);N(a.checkbox,
+"click",function(b){K(a,"checkboxClick",{checked:b.target.checked},function(){a.select()})})}});L.legend.itemStyle.cursor="pointer";r(Xa.prototype,{showResetZoom:function(){var a=this,b=L.lang,c=a.options.chart.resetZoomButton,d=c.theme,e=d.states,f=c.relativeTo==="chart"?null:"plotBox";this.resetZoomButton=a.renderer.button(b.resetZoom,null,null,function(){a.zoomOut()},d,e&&e.hover).attr({align:c.position.align,title:b.resetZoomTitle}).add().align(c.position,!1,f)},zoomOut:function(){var a=this;
+K(a,"selection",{resetSelection:!0},function(){a.zoom()})},zoom:function(a){var b,c=this.pointer,d=!1,e;!a||a.resetSelection?q(this.axes,function(a){b=a.zoom()}):q(a.xAxis.concat(a.yAxis),function(a){var e=a.axis,h=e.isXAxis;if(c[h?"zoomX":"zoomY"]||c[h?"pinchX":"pinchY"])b=e.zoom(a.min,a.max),e.displayBtn&&(d=!0)});e=this.resetZoomButton;if(d&&!e)this.showResetZoom();else if(!d&&da(e))this.resetZoomButton=e.destroy();b&&this.redraw(p(this.options.chart.animation,a&&a.animation,this.pointCount<100))},
+pan:function(a,b){var c=this,d=c.hoverPoints,e;d&&q(d,function(a){a.setState()});q(b==="xy"?[1,0]:[1],function(b){var d=a[b?"chartX":"chartY"],h=c[b?"xAxis":"yAxis"][0],i=c[b?"mouseDownX":"mouseDownY"],j=(h.pointRange||0)/2,k=h.getExtremes(),l=h.toValue(i-d,!0)+j,i=h.toValue(i+c[b?"plotWidth":"plotHeight"]-d,!0)-j;h.series.length&&l>C(k.dataMin,k.min)&&i<u(k.dataMax,k.max)&&(h.setExtremes(l,i,!1,!1,{trigger:"pan"}),e=!0);c[b?"mouseDownX":"mouseDownY"]=d});e&&c.redraw(!1);A(c.container,{cursor:"move"})}});
+r(Ea.prototype,{select:function(a,b){var c=this,d=c.series,e=d.chart,a=p(a,!c.selected);c.firePointEvent(a?"select":"unselect",{accumulate:b},function(){c.selected=c.options.selected=a;d.options.data[Da(c,d.data)]=c.options;c.setState(a&&"select");b||q(e.getSelectedPoints(),function(a){if(a.selected&&a!==c)a.selected=a.options.selected=!1,d.options.data[Da(a,d.data)]=a.options,a.setState(""),a.firePointEvent("unselect")})})},onMouseOver:function(a){var b=this.series,c=b.chart,d=c.tooltip,e=c.hoverPoint;
+if(e&&e!==this)e.onMouseOut();this.firePointEvent("mouseOver");d&&(!d.shared||b.noSharedTooltip)&&d.refresh(this,a);this.setState("hover");c.hoverPoint=this},onMouseOut:function(){var a=this.series.chart,b=a.hoverPoints;this.firePointEvent("mouseOut");if(!b||Da(this,b)===-1)this.setState(),a.hoverPoint=null},importEvents:function(){if(!this.hasImportedEvents){var a=w(this.series.options.point,this.options).events,b;this.events=a;for(b in a)N(this,b,a[b]);this.hasImportedEvents=!0}},setState:function(a,
+b){var c=this.plotX,d=this.plotY,e=this.series,f=e.options.states,g=ca[e.type].marker&&e.options.marker,h=g&&!g.enabled,i=g&&g.states[a],j=i&&i.enabled===!1,k=e.stateMarkerGraphic,l=this.marker||{},m=e.chart,n=e.halo,o,a=a||"";o=this.pointAttr[a]||e.pointAttr[a];if(!(a===this.state&&!b||this.selected&&a!=="select"||f[a]&&f[a].enabled===!1||a&&(j||h&&i.enabled===!1)||a&&l.states&&l.states[a]&&l.states[a].enabled===!1)){if(this.graphic)g=g&&this.graphic.symbolName&&o.r,this.graphic.attr(w(o,g?{x:c-
+g,y:d-g,width:2*g,height:2*g}:{})),k&&k.hide();else{if(a&&i)if(g=i.radius,l=l.symbol||e.symbol,k&&k.currentSymbol!==l&&(k=k.destroy()),k)k[b?"animate":"attr"]({x:c-g,y:d-g});else if(l)e.stateMarkerGraphic=k=m.renderer.symbol(l,c-g,d-g,2*g,2*g).attr(o).add(e.markerGroup),k.currentSymbol=l;if(k)k[a&&m.isInsidePlot(c,d,m.inverted)?"show":"hide"]()}if((c=f[a]&&f[a].halo)&&c.size){if(!n)e.halo=n=m.renderer.path().add(e.seriesGroup);n.attr(r({fill:ya(this.color||e.color).setOpacity(c.opacity).get()},c.attributes))[b?
+"animate":"attr"]({d:this.haloPath(c.size)})}else n&&n.attr({d:[]});this.state=a}},haloPath:function(a){var b=this.series,c=b.chart,d=b.getPlotBox(),e=c.inverted;return c.renderer.symbols.circle(d.translateX+(e?b.yAxis.len-this.plotY:this.plotX)-a,d.translateY+(e?b.xAxis.len-this.plotX:this.plotY)-a,a*2,a*2)}});r(O.prototype,{onMouseOver:function(){var a=this.chart,b=a.hoverSeries;if(b&&b!==this)b.onMouseOut();this.options.events.mouseOver&&K(this,"mouseOver");this.setState("hover");a.hoverSeries=
+this},onMouseOut:function(){var a=this.options,b=this.chart,c=b.tooltip,d=b.hoverPoint;if(d)d.onMouseOut();this&&a.events.mouseOut&&K(this,"mouseOut");c&&!a.stickyTracking&&(!c.shared||this.noSharedTooltip)&&c.hide();this.setState();b.hoverSeries=null},setState:function(a){var b=this.options,c=this.graph,d=this.graphNeg,e=b.states,b=b.lineWidth,a=a||"";if(this.state!==a)this.state=a,e[a]&&e[a].enabled===!1||(a&&(b=e[a].lineWidth||b+(e[a].lineWidthPlus||0)),c&&!c.dashstyle&&(a={"stroke-width":b},c.attr(a),
+d&&d.attr(a)))},setVisible:function(a,b){var c=this,d=c.chart,e=c.legendItem,f,g=d.options.chart.ignoreHiddenSeries,h=c.visible;f=(c.visible=a=c.userOptions.visible=a===t?!h:a)?"show":"hide";q(["group","dataLabelsGroup","markerGroup","tracker"],function(a){if(c[a])c[a][f]()});if(d.hoverSeries===c)c.onMouseOut();e&&d.legend.colorizeItem(c,a);c.isDirty=!0;c.options.stacking&&q(d.series,function(a){if(a.options.stacking&&a.visible)a.isDirty=!0});q(c.linkedSeries,function(b){b.setVisible(a,!1)});if(g)d.isDirtyBox=
+!0;b!==!1&&d.redraw();K(c,f)},setTooltipPoints:function(a){var b=[],c,d,e=this.xAxis,f=e&&e.getExtremes(),g=e?e.tooltipLen||e.len:this.chart.plotSizeX,h,i,j=[];if(!(this.options.enableMouseTracking===!1||this.singularTooltips)){if(a)this.tooltipPoints=null;q(this.segments||this.points,function(a){b=b.concat(a)});e&&e.reversed&&(b=b.reverse());this.orderTooltipPoints&&this.orderTooltipPoints(b);a=b.length;for(i=0;i<a;i++)if(e=b[i],c=e.x,c>=f.min&&c<=f.max){h=b[i+1];c=d===t?0:d+1;for(d=b[i+1]?C(u(0,
+U((e.clientX+(h?h.wrappedClientX||h.clientX:g))/2)),g):g;c>=0&&c<=d;)j[c++]=e}this.tooltipPoints=j}},show:function(){this.setVisible(!0)},hide:function(){this.setVisible(!1)},select:function(a){this.selected=a=a===t?!this.selected:a;if(this.checkbox)this.checkbox.checked=a;K(this,a?"select":"unselect")},drawTracker:T.drawTrackerGraph});r(S,{Axis:ma,Chart:Xa,Color:ya,Point:Ea,Tick:Sa,Renderer:Ya,Series:O,SVGElement:G,SVGRenderer:ta,arrayMin:Na,arrayMax:Ba,charts:W,dateFormat:bb,format:Ia,pathAnim:ub,
+getOptions:function(){return L},hasBidiBug:Nb,isTouchDevice:Hb,numberFormat:Ga,seriesTypes:J,setOptions:function(a){L=w(!0,L,a);Ab();return L},addEvent:N,removeEvent:X,createElement:$,discardElement:Pa,css:A,each:q,extend:r,map:Ua,merge:w,pick:p,splat:ra,extendClass:la,pInt:z,wrap:Ma,svg:ba,canvas:ga,vml:!ba&&!ga,product:"Highcharts",version:"4.0.3"})})();
+/*
+ Highcharts JS v4.0.3 (2014-07-03)
+
+ (c) 2009-2014 Torstein Honsi
+
+ License: www.highcharts.com/license
+*/
+(function(l,C){function K(a,b,c){this.init.call(this,a,b,c)}var P=l.arrayMin,Q=l.arrayMax,s=l.each,F=l.extend,q=l.merge,R=l.map,o=l.pick,x=l.pInt,p=l.getOptions().plotOptions,g=l.seriesTypes,v=l.extendClass,L=l.splat,r=l.wrap,M=l.Axis,y=l.Tick,H=l.Point,S=l.Pointer,T=l.CenteredSeriesMixin,z=l.TrackerMixin,t=l.Series,w=Math,D=w.round,A=w.floor,N=w.max,U=l.Color,u=function(){};F(K.prototype,{init:function(a,b,c){var d=this,e=d.defaultOptions;d.chart=b;if(b.angular)e.background={};d.options=a=q(e,a);
+(a=a.background)&&s([].concat(L(a)).reverse(),function(a){var b=a.backgroundColor,a=q(d.defaultBackgroundOptions,a);if(b)a.backgroundColor=b;a.color=a.backgroundColor;c.options.plotBands.unshift(a)})},defaultOptions:{center:["50%","50%"],size:"85%",startAngle:0},defaultBackgroundOptions:{shape:"circle",borderWidth:1,borderColor:"silver",backgroundColor:{linearGradient:{x1:0,y1:0,x2:0,y2:1},stops:[[0,"#FFF"],[1,"#DDD"]]},from:-Number.MAX_VALUE,innerRadius:0,to:Number.MAX_VALUE,outerRadius:"105%"}});
+var G=M.prototype,y=y.prototype,V={getOffset:u,redraw:function(){this.isDirty=!1},render:function(){this.isDirty=!1},setScale:u,setCategories:u,setTitle:u},O={isRadial:!0,defaultRadialGaugeOptions:{labels:{align:"center",x:0,y:null},minorGridLineWidth:0,minorTickInterval:"auto",minorTickLength:10,minorTickPosition:"inside",minorTickWidth:1,tickLength:10,tickPosition:"inside",tickWidth:2,title:{rotation:0},zIndex:2},defaultRadialXOptions:{gridLineWidth:1,labels:{align:null,distance:15,x:0,y:null},
+maxPadding:0,minPadding:0,showLastLabel:!1,tickLength:0},defaultRadialYOptions:{gridLineInterpolation:"circle",labels:{align:"right",x:-3,y:-2},showLastLabel:!1,title:{x:4,text:null,rotation:90}},setOptions:function(a){a=this.options=q(this.defaultOptions,this.defaultRadialOptions,a);if(!a.plotBands)a.plotBands=[]},getOffset:function(){G.getOffset.call(this);this.chart.axisOffset[this.side]=0;this.center=this.pane.center=T.getCenter.call(this.pane)},getLinePath:function(a,b){var c=this.center,b=o(b,
+c[2]/2-this.offset);return this.chart.renderer.symbols.arc(this.left+c[0],this.top+c[1],b,b,{start:this.startAngleRad,end:this.endAngleRad,open:!0,innerR:0})},setAxisTranslation:function(){G.setAxisTranslation.call(this);if(this.center)this.transA=this.isCircular?(this.endAngleRad-this.startAngleRad)/(this.max-this.min||1):this.center[2]/2/(this.max-this.min||1),this.minPixelPadding=this.isXAxis?this.transA*this.minPointOffset:0},beforeSetTickPositions:function(){this.autoConnect&&(this.max+=this.categories&&
+1||this.pointRange||this.closestPointRange||0)},setAxisSize:function(){G.setAxisSize.call(this);if(this.isRadial){this.center=this.pane.center=l.CenteredSeriesMixin.getCenter.call(this.pane);if(this.isCircular)this.sector=this.endAngleRad-this.startAngleRad;this.len=this.width=this.height=this.center[2]*o(this.sector,1)/2}},getPosition:function(a,b){return this.postTranslate(this.isCircular?this.translate(a):0,o(this.isCircular?b:this.translate(a),this.center[2]/2)-this.offset)},postTranslate:function(a,
+b){var c=this.chart,d=this.center,a=this.startAngleRad+a;return{x:c.plotLeft+d[0]+Math.cos(a)*b,y:c.plotTop+d[1]+Math.sin(a)*b}},getPlotBandPath:function(a,b,c){var d=this.center,e=this.startAngleRad,f=d[2]/2,h=[o(c.outerRadius,"100%"),c.innerRadius,o(c.thickness,10)],j=/%$/,k,m=this.isCircular;this.options.gridLineInterpolation==="polygon"?d=this.getPlotLinePath(a).concat(this.getPlotLinePath(b,!0)):(m||(h[0]=this.translate(a),h[1]=this.translate(b)),h=R(h,function(a){j.test(a)&&(a=x(a,10)*f/100);
+return a}),c.shape==="circle"||!m?(a=-Math.PI/2,b=Math.PI*1.5,k=!0):(a=e+this.translate(a),b=e+this.translate(b)),d=this.chart.renderer.symbols.arc(this.left+d[0],this.top+d[1],h[0],h[0],{start:a,end:b,innerR:o(h[1],h[0]-h[2]),open:k}));return d},getPlotLinePath:function(a,b){var c=this,d=c.center,e=c.chart,f=c.getPosition(a),h,j,k;c.isCircular?k=["M",d[0]+e.plotLeft,d[1]+e.plotTop,"L",f.x,f.y]:c.options.gridLineInterpolation==="circle"?(a=c.translate(a))&&(k=c.getLinePath(0,a)):(s(e.xAxis,function(a){a.pane===
+c.pane&&(h=a)}),k=[],a=c.translate(a),d=h.tickPositions,h.autoConnect&&(d=d.concat([d[0]])),b&&(d=[].concat(d).reverse()),s(d,function(f,c){j=h.getPosition(f,a);k.push(c?"L":"M",j.x,j.y)}));return k},getTitlePosition:function(){var a=this.center,b=this.chart,c=this.options.title;return{x:b.plotLeft+a[0]+(c.x||0),y:b.plotTop+a[1]-{high:0.5,middle:0.25,low:0}[c.align]*a[2]+(c.y||0)}}};r(G,"init",function(a,b,c){var i;var d=b.angular,e=b.polar,f=c.isX,h=d&&f,j,k;k=b.options;var m=c.pane||0;if(d){if(F(this,
+h?V:O),j=!f)this.defaultRadialOptions=this.defaultRadialGaugeOptions}else if(e)F(this,O),this.defaultRadialOptions=(j=f)?this.defaultRadialXOptions:q(this.defaultYAxisOptions,this.defaultRadialYOptions);a.call(this,b,c);if(!h&&(d||e)){a=this.options;if(!b.panes)b.panes=[];this.pane=(i=b.panes[m]=b.panes[m]||new K(L(k.pane)[m],b,this),m=i);m=m.options;b.inverted=!1;k.chart.zoomType=null;this.startAngleRad=b=(m.startAngle-90)*Math.PI/180;this.endAngleRad=k=(o(m.endAngle,m.startAngle+360)-90)*Math.PI/
+180;this.offset=a.offset||0;if((this.isCircular=j)&&c.max===C&&k-b===2*Math.PI)this.autoConnect=!0}});r(y,"getPosition",function(a,b,c,d,e){var f=this.axis;return f.getPosition?f.getPosition(c):a.call(this,b,c,d,e)});r(y,"getLabelPosition",function(a,b,c,d,e,f,h,j,k){var m=this.axis,i=f.y,n=f.align,g=(m.translate(this.pos)+m.startAngleRad+Math.PI/2)/Math.PI*180%360;m.isRadial?(a=m.getPosition(this.pos,m.center[2]/2+o(f.distance,-25)),f.rotation==="auto"?d.attr({rotation:g}):i===null&&(i=m.chart.renderer.fontMetrics(d.styles.fontSize).b-
+d.getBBox().height/2),n===null&&(n=m.isCircular?g>20&&g<160?"left":g>200&&g<340?"right":"center":"center",d.attr({align:n})),a.x+=f.x,a.y+=i):a=a.call(this,b,c,d,e,f,h,j,k);return a});r(y,"getMarkPath",function(a,b,c,d,e,f,h){var j=this.axis;j.isRadial?(a=j.getPosition(this.pos,j.center[2]/2+d),b=["M",b,c,"L",a.x,a.y]):b=a.call(this,b,c,d,e,f,h);return b});p.arearange=q(p.area,{lineWidth:1,marker:null,threshold:null,tooltip:{pointFormat:'<span style="color:{series.color}">●</span> {series.name}: <b>{point.low}</b> - <b>{point.high}</b><br/>'},
+trackByArea:!0,dataLabels:{align:null,verticalAlign:null,xLow:0,xHigh:0,yLow:0,yHigh:0},states:{hover:{halo:!1}}});g.arearange=v(g.area,{type:"arearange",pointArrayMap:["low","high"],toYData:function(a){return[a.low,a.high]},pointValKey:"low",getSegments:function(){var a=this;s(a.points,function(b){if(!a.options.connectNulls&&(b.low===null||b.high===null))b.y=null;else if(b.low===null&&b.high!==null)b.y=b.high});t.prototype.getSegments.call(this)},translate:function(){var a=this.yAxis;g.area.prototype.translate.apply(this);
+s(this.points,function(b){var c=b.low,d=b.high,e=b.plotY;d===null&&c===null?b.y=null:c===null?(b.plotLow=b.plotY=null,b.plotHigh=a.translate(d,0,1,0,1)):d===null?(b.plotLow=e,b.plotHigh=null):(b.plotLow=e,b.plotHigh=a.translate(d,0,1,0,1))})},getSegmentPath:function(a){var b,c=[],d=a.length,e=t.prototype.getSegmentPath,f,h;h=this.options;var j=h.step;for(b=HighchartsAdapter.grep(a,function(a){return a.plotLow!==null});d--;)f=a[d],f.plotHigh!==null&&c.push({plotX:f.plotX,plotY:f.plotHigh});a=e.call(this,
+b);if(j)j===!0&&(j="left"),h.step={left:"right",center:"center",right:"left"}[j];c=e.call(this,c);h.step=j;h=[].concat(a,c);c[0]="L";this.areaPath=this.areaPath.concat(a,c);return h},drawDataLabels:function(){var a=this.data,b=a.length,c,d=[],e=t.prototype,f=this.options.dataLabels,h=f.align,j,k=this.chart.inverted;if(f.enabled||this._hasPointLabels){for(c=b;c--;)if(j=a[c],j.y=j.high,j._plotY=j.plotY,j.plotY=j.plotHigh,d[c]=j.dataLabel,j.dataLabel=j.dataLabelUpper,j.below=!1,k){if(!h)f.align="left";
+f.x=f.xHigh}else f.y=f.yHigh;e.drawDataLabels&&e.drawDataLabels.apply(this,arguments);for(c=b;c--;)if(j=a[c],j.dataLabelUpper=j.dataLabel,j.dataLabel=d[c],j.y=j.low,j.plotY=j._plotY,j.below=!0,k){if(!h)f.align="right";f.x=f.xLow}else f.y=f.yLow;e.drawDataLabels&&e.drawDataLabels.apply(this,arguments)}f.align=h},alignDataLabel:function(){g.column.prototype.alignDataLabel.apply(this,arguments)},getSymbol:u,drawPoints:u});p.areasplinerange=q(p.arearange);g.areasplinerange=v(g.arearange,{type:"areasplinerange",
+getPointSpline:g.spline.prototype.getPointSpline});(function(){var a=g.column.prototype;p.columnrange=q(p.column,p.arearange,{lineWidth:1,pointRange:null});g.columnrange=v(g.arearange,{type:"columnrange",translate:function(){var b=this,c=b.yAxis,d;a.translate.apply(b);s(b.points,function(a){var f=a.shapeArgs,h=b.options.minPointLength,j;a.tooltipPos=null;a.plotHigh=d=c.translate(a.high,0,1,0,1);a.plotLow=a.plotY;j=d;a=a.plotY-d;a<h&&(h-=a,a+=h,j-=h/2);f.height=a;f.y=j})},trackerGroups:["group","dataLabelsGroup"],
+drawGraph:u,pointAttrToOptions:a.pointAttrToOptions,drawPoints:a.drawPoints,drawTracker:a.drawTracker,animate:a.animate,getColumnMetrics:a.getColumnMetrics})})();p.gauge=q(p.line,{dataLabels:{enabled:!0,defer:!1,y:15,borderWidth:1,borderColor:"silver",borderRadius:3,crop:!1,style:{fontWeight:"bold"},verticalAlign:"top",zIndex:2},dial:{},pivot:{},tooltip:{headerFormat:""},showInLegend:!1});z={type:"gauge",pointClass:v(H,{setState:function(a){this.state=a}}),angular:!0,drawGraph:u,fixedBox:!0,forceDL:!0,
+trackerGroups:["group","dataLabelsGroup"],translate:function(){var a=this.yAxis,b=this.options,c=a.center;this.generatePoints();s(this.points,function(d){var e=q(b.dial,d.dial),f=x(o(e.radius,80))*c[2]/200,h=x(o(e.baseLength,70))*f/100,j=x(o(e.rearLength,10))*f/100,k=e.baseWidth||3,m=e.topWidth||1,i=b.overshoot,n=a.startAngleRad+a.translate(d.y,null,null,null,!0);i&&typeof i==="number"?(i=i/180*Math.PI,n=Math.max(a.startAngleRad-i,Math.min(a.endAngleRad+i,n))):b.wrap===!1&&(n=Math.max(a.startAngleRad,
+Math.min(a.endAngleRad,n)));n=n*180/Math.PI;d.shapeType="path";d.shapeArgs={d:e.path||["M",-j,-k/2,"L",h,-k/2,f,-m/2,f,m/2,h,k/2,-j,k/2,"z"],translateX:c[0],translateY:c[1],rotation:n};d.plotX=c[0];d.plotY=c[1]})},drawPoints:function(){var a=this,b=a.yAxis.center,c=a.pivot,d=a.options,e=d.pivot,f=a.chart.renderer;s(a.points,function(c){var b=c.graphic,k=c.shapeArgs,e=k.d,i=q(d.dial,c.dial);b?(b.animate(k),k.d=e):c.graphic=f[c.shapeType](k).attr({stroke:i.borderColor||"none","stroke-width":i.borderWidth||
+0,fill:i.backgroundColor||"black",rotation:k.rotation}).add(a.group)});c?c.animate({translateX:b[0],translateY:b[1]}):a.pivot=f.circle(0,0,o(e.radius,5)).attr({"stroke-width":e.borderWidth||0,stroke:e.borderColor||"silver",fill:e.backgroundColor||"black"}).translate(b[0],b[1]).add(a.group)},animate:function(a){var b=this;if(!a)s(b.points,function(a){var d=a.graphic;d&&(d.attr({rotation:b.yAxis.startAngleRad*180/Math.PI}),d.animate({rotation:a.shapeArgs.rotation},b.options.animation))}),b.animate=
+null},render:function(){this.group=this.plotGroup("group","series",this.visible?"visible":"hidden",this.options.zIndex,this.chart.seriesGroup);t.prototype.render.call(this);this.group.clip(this.chart.clipRect)},setData:function(a,b){t.prototype.setData.call(this,a,!1);this.processData();this.generatePoints();o(b,!0)&&this.chart.redraw()},drawTracker:z&&z.drawTrackerPoint};g.gauge=v(g.line,z);p.boxplot=q(p.column,{fillColor:"#FFFFFF",lineWidth:1,medianWidth:2,states:{hover:{brightness:-0.3}},threshold:null,
+tooltip:{pointFormat:'<span style="color:{series.color}">●</span> <b> {series.name}</b><br/>Maximum: {point.high}<br/>Upper quartile: {point.q3}<br/>Median: {point.median}<br/>Lower quartile: {point.q1}<br/>Minimum: {point.low}<br/>'},whiskerLength:"50%",whiskerWidth:2});g.boxplot=v(g.column,{type:"boxplot",pointArrayMap:["low","q1","median","q3","high"],toYData:function(a){return[a.low,a.q1,a.median,a.q3,a.high]},pointValKey:"high",pointAttrToOptions:{fill:"fillColor",stroke:"color","stroke-width":"lineWidth"},
+drawDataLabels:u,translate:function(){var a=this.yAxis,b=this.pointArrayMap;g.column.prototype.translate.apply(this);s(this.points,function(c){s(b,function(b){c[b]!==null&&(c[b+"Plot"]=a.translate(c[b],0,1,0,1))})})},drawPoints:function(){var a=this,b=a.points,c=a.options,d=a.chart.renderer,e,f,h,j,k,m,i,n,g,l,p,I,r,q,J,u,v,t,w,x,z,y,E=a.doQuartiles!==!1,B=parseInt(a.options.whiskerLength,10)/100;s(b,function(b){g=b.graphic;z=b.shapeArgs;p={};q={};u={};y=b.color||a.color;if(b.plotY!==C)if(e=b.pointAttr[b.selected?
+"selected":""],v=z.width,t=A(z.x),w=t+v,x=D(v/2),f=A(E?b.q1Plot:b.lowPlot),h=A(E?b.q3Plot:b.lowPlot),j=A(b.highPlot),k=A(b.lowPlot),p.stroke=b.stemColor||c.stemColor||y,p["stroke-width"]=o(b.stemWidth,c.stemWidth,c.lineWidth),p.dashstyle=b.stemDashStyle||c.stemDashStyle,q.stroke=b.whiskerColor||c.whiskerColor||y,q["stroke-width"]=o(b.whiskerWidth,c.whiskerWidth,c.lineWidth),u.stroke=b.medianColor||c.medianColor||y,u["stroke-width"]=o(b.medianWidth,c.medianWidth,c.lineWidth),u["stroke-linecap"]="round",
+i=p["stroke-width"]%2/2,n=t+x+i,l=["M",n,h,"L",n,j,"M",n,f,"L",n,k],E&&(i=e["stroke-width"]%2/2,n=A(n)+i,f=A(f)+i,h=A(h)+i,t+=i,w+=i,I=["M",t,h,"L",t,f,"L",w,f,"L",w,h,"L",t,h,"z"]),B&&(i=q["stroke-width"]%2/2,j+=i,k+=i,r=["M",n-x*B,j,"L",n+x*B,j,"M",n-x*B,k,"L",n+x*B,k]),i=u["stroke-width"]%2/2,m=D(b.medianPlot)+i,J=["M",t,m,"L",w,m],g)b.stem.animate({d:l}),B&&b.whiskers.animate({d:r}),E&&b.box.animate({d:I}),b.medianShape.animate({d:J});else{b.graphic=g=d.g().add(a.group);b.stem=d.path(l).attr(p).add(g);
+if(B)b.whiskers=d.path(r).attr(q).add(g);if(E)b.box=d.path(I).attr(e).add(g);b.medianShape=d.path(J).attr(u).add(g)}})}});p.errorbar=q(p.boxplot,{color:"#000000",grouping:!1,linkedTo:":previous",tooltip:{pointFormat:'<span style="color:{series.color}">●</span> {series.name}: <b>{point.low}</b> - <b>{point.high}</b><br/>'},whiskerWidth:null});g.errorbar=v(g.boxplot,{type:"errorbar",pointArrayMap:["low","high"],toYData:function(a){return[a.low,a.high]},pointValKey:"high",doQuartiles:!1,drawDataLabels:g.arearange?
+g.arearange.prototype.drawDataLabels:u,getColumnMetrics:function(){return this.linkedParent&&this.linkedParent.columnMetrics||g.column.prototype.getColumnMetrics.call(this)}});p.waterfall=q(p.column,{lineWidth:1,lineColor:"#333",dashStyle:"dot",borderColor:"#333",states:{hover:{lineWidthPlus:0}}});g.waterfall=v(g.column,{type:"waterfall",upColorProp:"fill",pointArrayMap:["low","y"],pointValKey:"y",init:function(a,b){b.stacking=!0;g.column.prototype.init.call(this,a,b)},translate:function(){var a=
+this.yAxis,b,c,d,e,f,h,j,k,m,i;b=this.options.threshold;g.column.prototype.translate.apply(this);k=m=b;d=this.points;for(c=0,b=d.length;c<b;c++){e=d[c];f=e.shapeArgs;h=this.getStack(c);i=h.points[this.index+","+c];if(isNaN(e.y))e.y=this.yData[c];j=N(k,k+e.y)+i[0];f.y=a.translate(j,0,1);e.isSum?(f.y=a.translate(i[1],0,1),f.height=a.translate(i[0],0,1)-f.y):e.isIntermediateSum?(f.y=a.translate(i[1],0,1),f.height=a.translate(m,0,1)-f.y,m=i[1]):k+=h.total;f.height<0&&(f.y+=f.height,f.height*=-1);e.plotY=
+f.y=D(f.y)-this.borderWidth%2/2;f.height=N(D(f.height),0.001);e.yBottom=f.y+f.height;f=e.plotY+(e.negative?f.height:0);this.chart.inverted?e.tooltipPos[0]=a.len-f:e.tooltipPos[1]=f}},processData:function(a){var b=this.yData,c=this.points,d,e=b.length,f,h,j,k,m,i;h=f=j=k=this.options.threshold||0;for(i=0;i<e;i++)m=b[i],d=c&&c[i]?c[i]:{},m==="sum"||d.isSum?b[i]=h:m==="intermediateSum"||d.isIntermediateSum?b[i]=f:(h+=m,f+=m),j=Math.min(h,j),k=Math.max(h,k);t.prototype.processData.call(this,a);this.dataMin=
+j;this.dataMax=k},toYData:function(a){if(a.isSum)return"sum";else if(a.isIntermediateSum)return"intermediateSum";return a.y},getAttribs:function(){g.column.prototype.getAttribs.apply(this,arguments);var a=this.options,b=a.states,c=a.upColor||this.color,a=l.Color(c).brighten(0.1).get(),d=q(this.pointAttr),e=this.upColorProp;d[""][e]=c;d.hover[e]=b.hover.upColor||a;d.select[e]=b.select.upColor||c;s(this.points,function(a){if(a.y>0&&!a.color)a.pointAttr=d,a.color=c})},getGraphPath:function(){var a=this.data,
+b=a.length,c=D(this.options.lineWidth+this.borderWidth)%2/2,d=[],e,f,h;for(h=1;h<b;h++)f=a[h].shapeArgs,e=a[h-1].shapeArgs,f=["M",e.x+e.width,e.y+c,"L",f.x,e.y+c],a[h-1].y<0&&(f[2]+=e.height,f[5]+=e.height),d=d.concat(f);return d},getExtremes:u,getStack:function(a){var b=this.yAxis.stacks,c=this.stackKey;this.processedYData[a]<this.options.threshold&&(c="-"+c);return b[c][a]},drawGraph:t.prototype.drawGraph});p.bubble=q(p.scatter,{dataLabels:{formatter:function(){return this.point.z},inside:!0,style:{color:"white",
+textShadow:"0px 0px 3px black"},verticalAlign:"middle"},marker:{lineColor:null,lineWidth:1},minSize:8,maxSize:"20%",states:{hover:{halo:{size:5}}},tooltip:{pointFormat:"({point.x}, {point.y}), Size: {point.z}"},turboThreshold:0,zThreshold:0});z=v(H,{haloPath:function(){return H.prototype.haloPath.call(this,this.shapeArgs.r+this.series.options.states.hover.halo.size)}});g.bubble=v(g.scatter,{type:"bubble",pointClass:z,pointArrayMap:["y","z"],parallelArrays:["x","y","z"],trackerGroups:["group","dataLabelsGroup"],
+bubblePadding:!0,pointAttrToOptions:{stroke:"lineColor","stroke-width":"lineWidth",fill:"fillColor"},applyOpacity:function(a){var b=this.options.marker,c=o(b.fillOpacity,0.5),a=a||b.fillColor||this.color;c!==1&&(a=U(a).setOpacity(c).get("rgba"));return a},convertAttribs:function(){var a=t.prototype.convertAttribs.apply(this,arguments);a.fill=this.applyOpacity(a.fill);return a},getRadii:function(a,b,c,d){var e,f,h,j=this.zData,k=[],m=this.options.sizeBy!=="width";for(f=0,e=j.length;f<e;f++)h=b-a,h=
+h>0?(j[f]-a)/(b-a):0.5,m&&h>=0&&(h=Math.sqrt(h)),k.push(w.ceil(c+h*(d-c))/2);this.radii=k},animate:function(a){var b=this.options.animation;if(!a)s(this.points,function(a){var d=a.graphic,a=a.shapeArgs;d&&a&&(d.attr("r",1),d.animate({r:a.r},b))}),this.animate=null},translate:function(){var a,b=this.data,c,d,e=this.radii;g.scatter.prototype.translate.call(this);for(a=b.length;a--;)c=b[a],d=e?e[a]:0,c.negative=c.z<(this.options.zThreshold||0),d>=this.minPxSize/2?(c.shapeType="circle",c.shapeArgs={x:c.plotX,
+y:c.plotY,r:d},c.dlBox={x:c.plotX-d,y:c.plotY-d,width:2*d,height:2*d}):c.shapeArgs=c.plotY=c.dlBox=C},drawLegendSymbol:function(a,b){var c=x(a.itemStyle.fontSize)/2;b.legendSymbol=this.chart.renderer.circle(c,a.baseline-c,c).attr({zIndex:3}).add(b.legendGroup);b.legendSymbol.isMarker=!0},drawPoints:g.column.prototype.drawPoints,alignDataLabel:g.column.prototype.alignDataLabel});M.prototype.beforePadding=function(){var a=this,b=this.len,c=this.chart,d=0,e=b,f=this.isXAxis,h=f?"xData":"yData",j=this.min,
+k={},m=w.min(c.plotWidth,c.plotHeight),i=Number.MAX_VALUE,n=-Number.MAX_VALUE,g=this.max-j,l=b/g,p=[];this.tickPositions&&(s(this.series,function(b){var h=b.options;if(b.bubblePadding&&(b.visible||!c.options.chart.ignoreHiddenSeries))if(a.allowZoomOutside=!0,p.push(b),f)s(["minSize","maxSize"],function(a){var b=h[a],f=/%$/.test(b),b=x(b);k[a]=f?m*b/100:b}),b.minPxSize=k.minSize,b=b.zData,b.length&&(i=o(h.zMin,w.min(i,w.max(P(b),h.displayNegative===!1?h.zThreshold:-Number.MAX_VALUE))),n=o(h.zMax,w.max(n,
+Q(b))))}),s(p,function(a){var b=a[h],c=b.length,m;f&&a.getRadii(i,n,k.minSize,k.maxSize);if(g>0)for(;c--;)typeof b[c]==="number"&&(m=a.radii[c],d=Math.min((b[c]-j)*l-m,d),e=Math.max((b[c]-j)*l+m,e))}),p.length&&g>0&&o(this.options.min,this.userMin)===C&&o(this.options.max,this.userMax)===C&&(e-=b,l*=(b+d-e)/b,this.min+=d/l,this.max+=e/l))};(function(){function a(a,b,c){a.call(this,b,c);if(this.chart.polar)this.closeSegment=function(a){var b=this.xAxis.center;a.push("L",b[0],b[1])},this.closedStacks=
+!0}function b(a,b){var c=this.chart,d=this.options.animation,e=this.group,i=this.markerGroup,n=this.xAxis.center,g=c.plotLeft,l=c.plotTop;if(c.polar){if(c.renderer.isSVG)d===!0&&(d={}),b?(c={translateX:n[0]+g,translateY:n[1]+l,scaleX:0.001,scaleY:0.001},e.attr(c),i&&i.attr(c)):(c={translateX:g,translateY:l,scaleX:1,scaleY:1},e.animate(c,d),i&&i.animate(c,d),this.animate=null)}else a.call(this,b)}var c=t.prototype,d=S.prototype,e;c.toXY=function(a){var b,c=this.chart,d=a.plotX;b=a.plotY;a.rectPlotX=
+d;a.rectPlotY=b;d=(d/Math.PI*180+this.xAxis.pane.options.startAngle)%360;d<0&&(d+=360);a.clientX=d;b=this.xAxis.postTranslate(a.plotX,this.yAxis.len-b);a.plotX=a.polarPlotX=b.x-c.plotLeft;a.plotY=a.polarPlotY=b.y-c.plotTop};c.orderTooltipPoints=function(a){if(this.chart.polar&&(a.sort(function(a,b){return a.clientX-b.clientX}),a[0]))a[0].wrappedClientX=a[0].clientX+360,a.push(a[0])};g.area&&r(g.area.prototype,"init",a);g.areaspline&&r(g.areaspline.prototype,"init",a);g.spline&&r(g.spline.prototype,
+"getPointSpline",function(a,b,c,d){var e,i,n,g,l,p,o;if(this.chart.polar){e=c.plotX;i=c.plotY;a=b[d-1];n=b[d+1];this.connectEnds&&(a||(a=b[b.length-2]),n||(n=b[1]));if(a&&n)g=a.plotX,l=a.plotY,b=n.plotX,p=n.plotY,g=(1.5*e+g)/2.5,l=(1.5*i+l)/2.5,n=(1.5*e+b)/2.5,o=(1.5*i+p)/2.5,b=Math.sqrt(Math.pow(g-e,2)+Math.pow(l-i,2)),p=Math.sqrt(Math.pow(n-e,2)+Math.pow(o-i,2)),g=Math.atan2(l-i,g-e),l=Math.atan2(o-i,n-e),o=Math.PI/2+(g+l)/2,Math.abs(g-o)>Math.PI/2&&(o-=Math.PI),g=e+Math.cos(o)*b,l=i+Math.sin(o)*
+b,n=e+Math.cos(Math.PI+o)*p,o=i+Math.sin(Math.PI+o)*p,c.rightContX=n,c.rightContY=o;d?(c=["C",a.rightContX||a.plotX,a.rightContY||a.plotY,g||e,l||i,e,i],a.rightContX=a.rightContY=null):c=["M",e,i]}else c=a.call(this,b,c,d);return c});r(c,"translate",function(a){a.call(this);if(this.chart.polar&&!this.preventPostTranslate)for(var a=this.points,b=a.length;b--;)this.toXY(a[b])});r(c,"getSegmentPath",function(a,b){var c=this.points;if(this.chart.polar&&this.options.connectEnds!==!1&&b[b.length-1]===c[c.length-
+1]&&c[0].y!==null)this.connectEnds=!0,b=[].concat(b,[c[0]]);return a.call(this,b)});r(c,"animate",b);r(c,"setTooltipPoints",function(a,b){this.chart.polar&&F(this.xAxis,{tooltipLen:360});return a.call(this,b)});if(g.column)e=g.column.prototype,r(e,"animate",b),r(e,"translate",function(a){var b=this.xAxis,c=this.yAxis.len,d=b.center,e=b.startAngleRad,i=this.chart.renderer,g,l;this.preventPostTranslate=!0;a.call(this);if(b.isRadial){b=this.points;for(l=b.length;l--;)g=b[l],a=g.barX+e,g.shapeType="path",
+g.shapeArgs={d:i.symbols.arc(d[0],d[1],c-g.plotY,null,{start:a,end:a+g.pointWidth,innerR:c-o(g.yBottom,c)})},this.toXY(g),g.tooltipPos=[g.plotX,g.plotY],g.ttBelow=g.plotY>d[1]}}),r(e,"alignDataLabel",function(a,b,d,e,g,i){if(this.chart.polar){a=b.rectPlotX/Math.PI*180;if(e.align===null)e.align=a>20&&a<160?"left":a>200&&a<340?"right":"center";if(e.verticalAlign===null)e.verticalAlign=a<45||a>315?"bottom":a>135&&a<225?"top":"middle";c.alignDataLabel.call(this,b,d,e,g,i)}else a.call(this,b,d,e,g,i)});
+r(d,"getIndex",function(a,b){var c,d=this.chart,e;d.polar?(e=d.xAxis[0].center,c=b.chartX-e[0]-d.plotLeft,d=b.chartY-e[1]-d.plotTop,c=180-Math.round(Math.atan2(c,d)/Math.PI*180)):c=a.call(this,b);return c});r(d,"getCoordinates",function(a,b){var c=this.chart,d={xAxis:[],yAxis:[]};c.polar?s(c.axes,function(a){var e=a.isXAxis,f=a.center,g=b.chartX-f[0]-c.plotLeft,f=b.chartY-f[1]-c.plotTop;d[e?"xAxis":"yAxis"].push({axis:a,value:a.translate(e?Math.PI-Math.atan2(g,f):Math.sqrt(Math.pow(g,2)+Math.pow(f,
+2)),!0)})}):d=a.call(this,b);return d})})()})(Highcharts);
+/*
+ Highcharts JS v4.0.3 (2014-07-03)
+
+ (c) 2009-2013 Torstein Hønsi
+
+ License: www.highcharts.com/license
+*/
+(function(d){function x(g,a,b,c){var e,f,j;b*=t;a*=t;var i=[],h,k,o;b*=-1;h=c.x;k=c.y;o=(c.z===0?1.0E-4:c.z)*(c.vd||25);o=Math.max(500,o);var q=l(b),n=m(b),r=l(a),s=m(a),p,v,u;d.each(g,function(a){p=a.x-h;v=a.y-k;u=a.z||0;e=n*p-q*u;f=-q*r*p-n*r*u+s*v;j=q*s*p+n*s*u+r*v;e=e*((o-j)/o)+h;f=f*((o-j)/o)+k;i.push({x:A(e),y:A(f),z:A(j)})});return i}function w(g,a,b,c,e,f,d,i){var h=[];return f>e&&f-e>n/2+1.0E-4?(h=h.concat(w(g,a,b,c,e,e+n/2,d,i)),h=h.concat(w(g,a,b,c,e+n/2,f,d,i))):f<e&&e-f>n/2+1.0E-4?(h=
+h.concat(w(g,a,b,c,e,e-n/2,d,i)),h=h.concat(w(g,a,b,c,e-n/2,f,d,i))):(h=f-e,["C",g+b*m(e)-b*B*h*l(e)+d,a+c*l(e)+c*B*h*m(e)+i,g+b*m(f)+b*B*h*l(f)+d,a+c*l(f)-c*B*h*m(f)+i,g+b*m(f)+d,a+c*l(f)+i])}function C(g){if(this.chart.is3d()){var a=this.chart.options.plotOptions.column.grouping;a!==void 0&&!a&&this.group.zIndex!==void 0&&this.group.attr({zIndex:this.group.zIndex*10});var b=this.options,c=this.options.states;this.borderWidth=b.borderWidth=b.edgeWidth||1;d.each(this.data,function(a){a=a.pointAttr;
+this.borderColor=d.pick(b.edgeColor,a[""].fill);a[""].stroke=this.borderColor;a.hover.stroke=d.pick(c.hover.edgeColor,this.borderColor);a.select.stroke=d.pick(c.select.edgeColor,this.borderColor)})}g.apply(this,[].slice.call(arguments,1))}var n=Math.PI,t=n/180,l=Math.sin,m=Math.cos,A=Math.round,B=4*(Math.sqrt(2)-1)/3/(n/2);d.SVGRenderer.prototype.toLinePath=function(g,a){var b=[];d.each(g,function(a){b.push("L",a.x,a.y)});b[0]="M";a&&b.push("Z");return b};d.SVGRenderer.prototype.cuboid=function(g){var a=
+this.g(),g=this.cuboidPath(g);a.front=this.path(g[0]).attr({zIndex:g[3],"stroke-linejoin":"round"}).add(a);a.top=this.path(g[1]).attr({zIndex:g[4],"stroke-linejoin":"round"}).add(a);a.side=this.path(g[2]).attr({zIndex:g[5],"stroke-linejoin":"round"}).add(a);a.fillSetter=function(a){var c=d.Color(a).brighten(0.1).get(),e=d.Color(a).brighten(-0.1).get();this.front.attr({fill:a});this.top.attr({fill:c});this.side.attr({fill:e});this.color=a;return this};a.opacitySetter=function(a){this.front.attr({opacity:a});
+this.top.attr({opacity:a});this.side.attr({opacity:a});return this};a.attr=function(a){a.shapeArgs||a.x?(a=this.renderer.cuboidPath(a.shapeArgs||a),this.front.attr({d:a[0],zIndex:a[3]}),this.top.attr({d:a[1],zIndex:a[4]}),this.side.attr({d:a[2],zIndex:a[5]})):d.SVGElement.prototype.attr.call(this,a);return this};a.animate=function(a,c,e){a.x&&a.y?(a=this.renderer.cuboidPath(a),this.front.attr({zIndex:a[3]}).animate({d:a[0]},c,e),this.top.attr({zIndex:a[4]}).animate({d:a[1]},c,e),this.side.attr({zIndex:a[5]}).animate({d:a[2]},
+c,e)):a.opacity?(this.front.animate(a,c,e),this.top.animate(a,c,e),this.side.animate(a,c,e)):d.SVGElement.prototype.animate.call(this,a,c,e);return this};a.destroy=function(){this.front.destroy();this.top.destroy();this.side.destroy();return null};a.attr({zIndex:-g[3]});return a};d.SVGRenderer.prototype.cuboidPath=function(d){var a=d.x,b=d.y,c=d.z,e=d.height,f=d.width,j=d.depth,i=d.alpha,h=d.beta,a=[{x:a,y:b,z:c},{x:a+f,y:b,z:c},{x:a+f,y:b+e,z:c},{x:a,y:b+e,z:c},{x:a,y:b+e,z:c+j},{x:a+f,y:b+e,z:c+
+j},{x:a+f,y:b,z:c+j},{x:a,y:b,z:c+j}],a=x(a,i,h,d.origin),d=["M",a[0].x,a[0].y,"L",a[7].x,a[7].y,"L",a[6].x,a[6].y,"L",a[1].x,a[1].y,"Z"],b=["M",a[3].x,a[3].y,"L",a[2].x,a[2].y,"L",a[5].x,a[5].y,"L",a[4].x,a[4].y,"Z"],c=["M",a[1].x,a[1].y,"L",a[2].x,a[2].y,"L",a[5].x,a[5].y,"L",a[6].x,a[6].y,"Z"],e=["M",a[0].x,a[0].y,"L",a[7].x,a[7].y,"L",a[4].x,a[4].y,"L",a[3].x,a[3].y,"Z"];return[["M",a[0].x,a[0].y,"L",a[1].x,a[1].y,"L",a[2].x,a[2].y,"L",a[3].x,a[3].y,"Z"],a[7].y<a[1].y?d:a[4].y>a[2].y?b:[],a[6].x>
+a[1].x?c:a[7].x<a[0].x?e:[],(a[0].z+a[1].z+a[2].z+a[3].z)/4,h>0?(a[0].z+a[7].z+a[6].z+a[1].z)/4:(a[3].z+a[2].z+a[5].z+a[4].z)/4,i>0?(a[1].z+a[2].z+a[5].z+a[6].z)/4:(a[0].z+a[7].z+a[4].z+a[3].z)/4]};d.SVGRenderer.prototype.arc3d=function(g){g.alpha*=t;g.beta*=t;var a=this.g(),b=this.arc3dPath(g),c=a.renderer,e=b.zTop*100;a.shapeArgs=g;a.top=c.path(b.top).attr({zIndex:b.zTop}).add(a);a.side1=c.path(b.side2).attr({zIndex:b.zSide2});a.side2=c.path(b.side1).attr({zIndex:b.zSide1});a.inn=c.path(b.inn).attr({zIndex:b.zInn});
+a.out=c.path(b.out).attr({zIndex:b.zOut});a.fillSetter=function(a){this.color=a;var b=d.Color(a).brighten(-0.1).get();this.side1.attr({fill:b});this.side2.attr({fill:b});this.inn.attr({fill:b});this.out.attr({fill:b});this.top.attr({fill:a});return this};a.translateXSetter=function(a){this.out.attr({translateX:a});this.inn.attr({translateX:a});this.side1.attr({translateX:a});this.side2.attr({translateX:a});this.top.attr({translateX:a})};a.translateYSetter=function(a){this.out.attr({translateY:a});
+this.inn.attr({translateY:a});this.side1.attr({translateY:a});this.side2.attr({translateY:a});this.top.attr({translateY:a})};a.animate=function(a,b,c){a.end||a.start?(this._shapeArgs=this.shapeArgs,d.SVGElement.prototype.animate.call(this,{_args:a},{duration:b,step:function(){var a=arguments[1],b=a.elem,c=b._shapeArgs,e=a.end,a=a.pos,c=d.merge(c,{start:c.start+(e.start-c.start)*a,end:c.end+(e.end-c.end)*a}),e=b.renderer.arc3dPath(c);b.shapeArgs=c;b.top.attr({d:e.top,zIndex:e.zTop});b.inn.attr({d:e.inn,
+zIndex:e.zInn});b.out.attr({d:e.out,zIndex:e.zOut});b.side1.attr({d:e.side1,zIndex:e.zSide1});b.side2.attr({d:e.side2,zIndex:e.zSide2})}},c)):d.SVGElement.prototype.animate.call(this,a,b,c);return this};a.destroy=function(){this.top.destroy();this.out.destroy();this.inn.destroy();this.side1.destroy();this.side2.destroy();d.SVGElement.prototype.destroy.call(this)};a.hide=function(){this.top.hide();this.out.hide();this.inn.hide();this.side1.hide();this.side2.hide()};a.show=function(){this.top.show();
+this.out.show();this.inn.show();this.side1.show();this.side2.show()};a.zIndex=e;a.attr({zIndex:e});return a};d.SVGRenderer.prototype.arc3dPath=function(d){var a=d.x,b=d.y,c=d.start,e=d.end-1.0E-5,f=d.r,j=d.innerR,i=d.depth,h=d.alpha,k=d.beta,o=m(c),q=l(c),d=m(e),z=l(e),r=f*m(k),s=f*m(h),p=j*m(k);j*=m(h);var v=i*l(k),u=i*l(h),i=["M",a+r*o,b+s*q],i=i.concat(w(a,b,r,s,c,e,0,0)),i=i.concat(["L",a+p*d,b+j*z]),i=i.concat(w(a,b,p,j,e,c,0,0)),i=i.concat(["Z"]),k=k>0?n/2:0,h=h>0?0:n/2,k=c>-k?c:e>-k?-k:c,t=
+e<n-h?e:c<n-h?n-h:e,h=["M",a+r*m(k),b+s*l(k)],h=h.concat(w(a,b,r,s,k,t,0,0)),h=h.concat(["L",a+r*m(t)+v,b+s*l(t)+u]),h=h.concat(w(a,b,r,s,t,k,v,u)),h=h.concat(["Z"]),k=["M",a+p*o,b+j*q],k=k.concat(w(a,b,p,j,c,e,0,0)),k=k.concat(["L",a+p*m(e)+v,b+j*l(e)+u]),k=k.concat(w(a,b,p,j,e,c,v,u)),k=k.concat(["Z"]),o=["M",a+r*o,b+s*q,"L",a+r*o+v,b+s*q+u,"L",a+p*o+v,b+j*q+u,"L",a+p*o,b+j*q,"Z"],a=["M",a+r*d,b+s*z,"L",a+r*d+v,b+s*z+u,"L",a+p*d+v,b+j*z+u,"L",a+p*d,b+j*z,"Z"],b=l((c+e)/2),c=l(c),e=l(e);return{top:i,
+zTop:f,out:h,zOut:Math.max(b,c,e)*f,inn:k,zInn:Math.max(b,c,e)*f,side1:o,zSide1:c*f*0.99,side2:a,zSide2:e*f*0.99}};d.Chart.prototype.is3d=function(){return this.options.chart.options3d&&this.options.chart.options3d.enabled};d.wrap(d.Chart.prototype,"isInsidePlot",function(d){return this.is3d()?!0:d.apply(this,[].slice.call(arguments,1))});var y=d.getOptions();y.chart.options3d={enabled:!1,alpha:0,beta:0,depth:100,viewDistance:25,frame:{bottom:{size:1,color:"rgba(255,255,255,0)"},side:{size:1,color:"rgba(255,255,255,0)"},
+back:{size:1,color:"rgba(255,255,255,0)"}}};y.plotOptions.pie.borderColor=void 0;d.wrap(d.Chart.prototype,"setChartSize",function(d){d.apply(this,[].slice.call(arguments,1));if(this.is3d()){var a=this.inverted,b=this.clipBox,c=this.margin;b[a?"y":"x"]=-(c[3]||0);b[a?"x":"y"]=-(c[0]||0);b[a?"height":"width"]=this.chartWidth+(c[3]||0)+(c[1]||0);b[a?"width":"height"]=this.chartHeight+(c[0]||0)+(c[2]||0)}});d.wrap(d.Chart.prototype,"redraw",function(d){if(this.is3d())this.isDirtyBox=!0;d.apply(this,[].slice.call(arguments,
+1))});d.Chart.prototype.retrieveStacks=function(g,a){var b={},c=1;if(g||!a)return this.series;d.each(this.series,function(a){b[a.options.stack||0]?b[a.options.stack||0].series.push(a):(b[a.options.stack||0]={series:[a],position:c},c++)});b.totalStacks=c+1;return b};d.wrap(d.Axis.prototype,"init",function(g){var a=arguments;if(a[1].is3d())a[2].tickWidth=d.pick(a[2].tickWidth,0),a[2].gridLineWidth=d.pick(a[2].gridLineWidth,1);g.apply(this,[].slice.call(arguments,1))});d.wrap(d.Axis.prototype,"render",
+function(d){d.apply(this,[].slice.call(arguments,1));if(this.chart.is3d()){var a=this.chart,b=a.renderer,c=a.options.chart.options3d,e=c.alpha,f=c.beta*(a.yAxis[0].opposite?-1:1),j=c.frame,i=j.bottom,h=j.back,j=j.side,k=c.depth,o=this.height,q=this.width,l=this.left,m=this.top,c={x:a.plotLeft+a.plotWidth/2,y:a.plotTop+a.plotHeight/2,z:k,vd:c.viewDistance};if(this.horiz)this.axisLine&&this.axisLine.hide(),f={x:l,y:m+(a.yAxis[0].reversed?-i.size:o),z:0,width:q,height:i.size,depth:k,alpha:e,beta:f,origin:c},
+this.bottomFrame?this.bottomFrame.animate(f):this.bottomFrame=b.cuboid(f).attr({fill:i.color,zIndex:a.yAxis[0].reversed&&e>0?4:-1}).css({stroke:i.color}).add();else{var n={x:l,y:m,z:k+1,width:q,height:o+i.size,depth:h.size,alpha:e,beta:f,origin:c};this.backFrame?this.backFrame.animate(n):this.backFrame=b.cuboid(n).attr({fill:h.color,zIndex:-3}).css({stroke:h.color}).add();this.axisLine&&this.axisLine.hide();a={x:(a.yAxis[0].opposite?q:0)+l-j.size,y:m,z:0,width:j.size,height:o+i.size,depth:k+h.size,
+alpha:e,beta:f,origin:c};this.sideFrame?this.sideFrame.animate(a):this.sideFrame=b.cuboid(a).attr({fill:j.color,zIndex:-2}).css({stroke:j.color}).add()}}});d.wrap(d.Axis.prototype,"getPlotLinePath",function(d){var a=d.apply(this,[].slice.call(arguments,1));if(!this.chart.is3d())return a;if(a===null)return a;var b=this.chart,c=b.options.chart.options3d,e=c.depth;c.origin={x:b.plotLeft+b.plotWidth/2,y:b.plotTop+b.plotHeight/2,z:e,vd:c.viewDistance};var a=[{x:a[1],y:a[2],z:this.horiz||this.opposite?
+e:0},{x:a[1],y:a[2],z:e},{x:a[4],y:a[5],z:e},{x:a[4],y:a[5],z:this.horiz||this.opposite?0:e}],e=b.options.inverted?c.beta:c.alpha,f=b.options.inverted?c.alpha:c.beta;f*=b.yAxis[0].opposite?-1:1;a=x(a,e,f,c.origin);return a=this.chart.renderer.toLinePath(a,!1)});d.wrap(d.Axis.prototype,"getPlotBandPath",function(d){if(this.chart.is3d()){var a=arguments,b=a[1],a=this.getPlotLinePath(a[2]);(b=this.getPlotLinePath(b))&&a?b.push(a[7],a[8],a[4],a[5],a[1],a[2]):b=null;return b}else return d.apply(this,[].slice.call(arguments,
+1))});d.wrap(d.Tick.prototype,"getMarkPath",function(d){var a=d.apply(this,[].slice.call(arguments,1));if(!this.axis.chart.is3d())return a;var b=this.axis.chart,c=b.options.chart.options3d,e={x:b.plotLeft+b.plotWidth/2,y:b.plotTop+b.plotHeight/2,z:c.depth,vd:c.viewDistance},a=[{x:a[1],y:a[2],z:0},{x:a[4],y:a[5],z:0}],f=b.inverted?c.beta:c.alpha,c=b.inverted?c.alpha:c.beta;c*=b.yAxis[0].opposite?-1:1;a=x(a,f,c,e);return a=["M",a[0].x,a[0].y,"L",a[1].x,a[1].y]});d.wrap(d.Tick.prototype,"getLabelPosition",
+function(d){var a=d.apply(this,[].slice.call(arguments,1));if(!this.axis.chart.is3d())return a;var b=this.axis.chart,c=b.options.chart.options3d,e={x:b.plotLeft+b.plotWidth/2,y:b.plotTop+b.plotHeight/2,z:c.depth,vd:c.viewDistance},f=b.inverted?c.beta:c.alpha,c=b.inverted?c.alpha:c.beta;c*=b.yAxis[0].opposite?-1:1;return a=x([{x:a.x,y:a.y,z:0}],f,c,e)[0]});d.wrap(d.Axis.prototype,"drawCrosshair",function(d){var a=arguments;this.chart.is3d()&&a[2]&&(a[2]={plotX:a[2].plotXold||a[2].plotX,plotY:a[2].plotYold||
+a[2].plotY});d.apply(this,[].slice.call(a,1))});d.wrap(d.seriesTypes.column.prototype,"translate",function(g){g.apply(this,[].slice.call(arguments,1));if(this.chart.is3d()){var a=this.chart,b=this.options,c=a.options.chart.options3d,e=b.depth||25,f={x:a.plotWidth/2,y:a.plotHeight/2,z:c.depth,vd:c.viewDistance},j=c.alpha,i=c.beta*(a.yAxis[0].opposite?-1:1),h=(b.stacking?b.stack||0:this._i)*(e+(b.groupZPadding||1));b.grouping!==!1&&(h=0);h+=b.groupZPadding||1;d.each(this.data,function(a){var b=a.shapeArgs,
+c=a.tooltipPos;a.shapeType="cuboid";b.alpha=j;b.beta=i;b.z=h;b.origin=f;b.depth=e;c=x([{x:c[0],y:c[1],z:h}],j,i,f)[0];a.tooltipPos=[c.x,c.y]})}});d.wrap(d.seriesTypes.column.prototype,"animate",function(g){if(this.chart.is3d()){var a=arguments[1],b=this.yAxis,c=this,e=this.yAxis.reversed;if(d.svg)a?d.each(c.data,function(a){a.height=a.shapeArgs.height;a.shapey=a.shapeArgs.y;a.shapeArgs.height=1;if(!e)a.shapeArgs.y=a.stackY?a.plotY+b.translate(a.stackY):a.plotY+(a.negative?-a.height:a.height)}):(d.each(c.data,
+function(a){a.shapeArgs.height=a.height;a.shapeArgs.y=a.shapey;a.graphic&&a.graphic.animate(a.shapeArgs,c.options.animation)}),this.drawDataLabels(),c.animate=null)}else g.apply(this,[].slice.call(arguments,1))});d.wrap(d.seriesTypes.column.prototype,"init",function(d){d.apply(this,[].slice.call(arguments,1));if(this.chart.is3d()){var a=this.options,b=a.grouping,c=a.stacking,e=0;if((b===void 0||b)&&c){b=this.chart.retrieveStacks(b,c);c=a.stack||0;for(e=0;e<b[c].series.length;e++)if(b[c].series[e]===
+this)break;e=b.totalStacks*10-10*(b.totalStacks-b[c].position)-e}a.zIndex=e}});d.wrap(d.Series.prototype,"alignDataLabel",function(d){if(this.chart.is3d()&&(this.type==="column"||this.type==="columnrange")){var a=this.chart,b=a.options.chart.options3d,c=arguments[4],e={x:c.x,y:c.y,z:0},e=x([e],b.alpha,b.beta*(a.yAxis[0].opposite?-1:1),{x:a.plotWidth/2,y:a.plotHeight/2,z:b.depth,vd:b.viewDistance})[0];c.x=e.x;c.y=e.y}d.apply(this,[].slice.call(arguments,1))});d.seriesTypes.columnrange&&d.wrap(d.seriesTypes.columnrange.prototype,
+"drawPoints",C);d.wrap(d.seriesTypes.column.prototype,"drawPoints",C);y=d.getOptions();y.plotOptions.cylinder=d.merge(y.plotOptions.column);y=d.extendClass(d.seriesTypes.column,{type:"cylinder"});d.seriesTypes.cylinder=y;d.wrap(d.seriesTypes.cylinder.prototype,"translate",function(g){g.apply(this,[].slice.call(arguments,1));if(this.chart.is3d()){var a=this.chart,b=a.options,c=b.plotOptions.cylinder,b=b.chart.options3d,e=c.depth||0,f={x:a.inverted?a.plotHeight/2:a.plotWidth/2,y:a.inverted?a.plotWidth/
+2:a.plotHeight/2,z:b.depth,vd:b.viewDistance},j=b.alpha,i=c.stacking?(this.options.stack||0)*e:this._i*e;i+=e/2;c.grouping!==!1&&(i=0);d.each(this.data,function(a){var b=a.shapeArgs;a.shapeType="arc3d";b.x+=e/2;b.z=i;b.start=0;b.end=2*n;b.r=e*0.95;b.innerR=0;b.depth=b.height*(1/l((90-j)*t))-i;b.alpha=90-j;b.beta=0;b.origin=f})}});d.wrap(d.seriesTypes.pie.prototype,"translate",function(g){g.apply(this,[].slice.call(arguments,1));if(this.chart.is3d()){var a=this,b=a.chart,c=a.options,e=c.depth||0,f=
+b.options.chart.options3d,j={x:b.plotWidth/2,y:b.plotHeight/2,z:f.depth},i=f.alpha,h=f.beta,k=c.stacking?(c.stack||0)*e:a._i*e;k+=e/2;c.grouping!==!1&&(k=0);d.each(a.data,function(b){b.shapeType="arc3d";var c=b.shapeArgs;if(b.y)c.z=k,c.depth=e*0.75,c.origin=j,c.alpha=i,c.beta=h,c=(c.end+c.start)/2,b.slicedTranslation={translateX:A(m(c)*a.options.slicedOffset*m(i*t)),translateY:A(l(c)*a.options.slicedOffset*m(i*t))}})}});d.wrap(d.seriesTypes.pie.prototype.pointClass.prototype,"haloPath",function(d){return this.series.chart.is3d()?
+[]:d.call(this)});d.wrap(d.seriesTypes.pie.prototype,"drawPoints",function(g){if(this.chart.is3d()){var a=this.options,b=this.options.states;this.borderWidth=a.borderWidth=a.edgeWidth||1;b.hover.borderColor=d.pick(b.hover.edgeColor,this.borderColor);b.hover.borderWidth=d.pick(b.hover.edgeWidth,this.borderWidth);b.select.borderColor=d.pick(b.select.edgeColor,this.borderColor);b.select.borderWidth=d.pick(b.select.edgeWidth,this.borderWidth);d.each(this.data,function(a){var c=a.pointAttr;c[""].stroke=
+a.series.borderColor||a.color;c[""]["stroke-width"]=a.series.borderWidth;c.hover.stroke=b.hover.borderColor;c.hover["stroke-width"]=b.hover.borderWidth;c.select.stroke=b.select.borderColor;c.select["stroke-width"]=b.select.borderWidth})}g.apply(this,[].slice.call(arguments,1));if(this.chart.is3d()){var c=this.group;d.each(this.points,function(a){a.graphic.out.add(c);a.graphic.inn.add(c);a.graphic.side1.add(c);a.graphic.side2.add(c)})}});d.wrap(d.seriesTypes.pie.prototype,"drawDataLabels",function(g){this.chart.is3d()&&
+d.each(this.data,function(a){var b=a.shapeArgs,c=b.r,d=b.depth,f=b.alpha*t,b=(b.start+b.end)/2,a=a.labelPos;a[1]+=-c*(1-m(f))*l(b)+(l(b)>0?l(f)*d:0);a[3]+=-c*(1-m(f))*l(b)+(l(b)>0?l(f)*d:0);a[5]+=-c*(1-m(f))*l(b)+(l(b)>0?l(f)*d:0)});g.apply(this,[].slice.call(arguments,1))});d.wrap(d.seriesTypes.pie.prototype,"addPoint",function(d){d.apply(this,[].slice.call(arguments,1));this.chart.is3d()&&this.update()});d.wrap(d.seriesTypes.pie.prototype,"animate",function(g){if(this.chart.is3d()){var a=arguments[1],
+b=this.options.animation,c=this.center,e=this.group,f=this.markerGroup;if(d.svg)if(b===!0&&(b={}),a){if(e.oldtranslateX=e.translateX,e.oldtranslateY=e.translateY,a={translateX:c[0],translateY:c[1],scaleX:0.001,scaleY:0.001},e.attr(a),f)f.attrSetters=e.attrSetters,f.attr(a)}else a={translateX:e.oldtranslateX,translateY:e.oldtranslateY,scaleX:1,scaleY:1},e.animate(a,b),f&&f.animate(a,b),this.animate=null}else g.apply(this,[].slice.call(arguments,1))});d.wrap(d.seriesTypes.scatter.prototype,"translate",
+function(g){g.apply(this,[].slice.call(arguments,1));if(this.chart.is3d()){var a=this.chart,b=this.chart.options.chart.options3d,c=b.alpha,e=b.beta,f={x:a.inverted?a.plotHeight/2:a.plotWidth/2,y:a.inverted?a.plotWidth/2:a.plotHeight/2,z:b.depth,vd:b.viewDistance},b=b.depth,j=a.options.zAxis||{min:0,max:b},i=b/(j.max-j.min);d.each(this.data,function(a){var b={x:a.plotX,y:a.plotY,z:(a.z-j.min)*i},b=x([b],c,e,f)[0];a.plotXold=a.plotX;a.plotYold=a.plotY;a.plotX=b.x;a.plotY=b.y;a.plotZ=b.z})}});d.wrap(d.seriesTypes.scatter.prototype,
+"init",function(d){var a=d.apply(this,[].slice.call(arguments,1));if(this.chart.is3d())this.pointArrayMap=["x","y","z"],this.tooltipOptions.pointFormat=this.userOptions.tooltip?this.userOptions.tooltip.pointFormat||"x: <b>{point.x}</b><br/>y: <b>{point.y}</b><br/>z: <b>{point.z}</b><br/>":"x: <b>{point.x}</b><br/>y: <b>{point.y}</b><br/>z: <b>{point.z}</b><br/>";return a});if(d.VMLRenderer)d.setOptions({animate:!1}),d.VMLRenderer.prototype.cuboid=d.SVGRenderer.prototype.cuboid,d.VMLRenderer.prototype.cuboidPath=
+d.SVGRenderer.prototype.cuboidPath,d.VMLRenderer.prototype.toLinePath=d.SVGRenderer.prototype.toLinePath,d.VMLRenderer.prototype.createElement3D=d.SVGRenderer.prototype.createElement3D,d.VMLRenderer.prototype.arc3d=function(g){g=d.SVGRenderer.prototype.arc3d.call(this,g);g.css({zIndex:g.zIndex});return g},d.VMLRenderer.prototype.arc3dPath=d.SVGRenderer.prototype.arc3dPath,d.Chart.prototype.renderSeries=function(){for(var d,a=this.series.length;a--;)d=this.series[a],d.translate(),d.setTooltipPoints&&
+d.setTooltipPoints(),d.render()},d.wrap(d.Axis.prototype,"render",function(d){d.apply(this,[].slice.call(arguments,1));this.sideFrame&&(this.sideFrame.css({zIndex:0}),this.sideFrame.front.attr({fill:this.sideFrame.color}));this.bottomFrame&&(this.bottomFrame.css({zIndex:1}),this.bottomFrame.front.attr({fill:this.bottomFrame.color}));this.backFrame&&(this.backFrame.css({zIndex:0}),this.backFrame.front.attr({fill:this.backFrame.color}))})})(Highcharts);
+/*
+ Highcharts JS v4.0.3 (2014-07-03)
+ Exporting module
+
+ (c) 2010-2014 Torstein Honsi
+
+ License: www.highcharts.com/license
+*/
+(function(f){var A=f.Chart,t=f.addEvent,B=f.removeEvent,l=f.createElement,o=f.discardElement,v=f.css,k=f.merge,r=f.each,p=f.extend,D=Math.max,j=document,C=window,E=f.isTouchDevice,F=f.Renderer.prototype.symbols,s=f.getOptions(),y;p(s.lang,{printChart:"Print chart",downloadPNG:"Download PNG image",downloadJPEG:"Download JPEG image",downloadPDF:"Download PDF document",downloadSVG:"Download SVG vector image",contextButtonTitle:"Chart context menu"});s.navigation={menuStyle:{border:"1px solid #A0A0A0",
+background:"#FFFFFF",padding:"5px 0"},menuItemStyle:{padding:"0 10px",background:"none",color:"#303030",fontSize:E?"14px":"11px"},menuItemHoverStyle:{background:"#4572A5",color:"#FFFFFF"},buttonOptions:{symbolFill:"#E0E0E0",symbolSize:14,symbolStroke:"#666",symbolStrokeWidth:3,symbolX:12.5,symbolY:10.5,align:"right",buttonSpacing:3,height:22,theme:{fill:"white",stroke:"none"},verticalAlign:"top",width:24}};s.exporting={type:"image/png",url:"http://export.highcharts.com/",buttons:{contextButton:{menuClassName:"highcharts-contextmenu",
+symbol:"menu",_titleKey:"contextButtonTitle",menuItems:[{textKey:"printChart",onclick:function(){this.print()}},{separator:!0},{textKey:"downloadPNG",onclick:function(){this.exportChart()}},{textKey:"downloadJPEG",onclick:function(){this.exportChart({type:"image/jpeg"})}},{textKey:"downloadPDF",onclick:function(){this.exportChart({type:"application/pdf"})}},{textKey:"downloadSVG",onclick:function(){this.exportChart({type:"image/svg+xml"})}}]}}};f.post=function(b,a,d){var c,b=l("form",k({method:"post",
+action:b,enctype:"multipart/form-data"},d),{display:"none"},j.body);for(c in a)l("input",{type:"hidden",name:c,value:a[c]},null,b);b.submit();o(b)};p(A.prototype,{getSVG:function(b){var a=this,d,c,z,h,g=k(a.options,b);if(!j.createElementNS)j.createElementNS=function(a,b){return j.createElement(b)};b=l("div",null,{position:"absolute",top:"-9999em",width:a.chartWidth+"px",height:a.chartHeight+"px"},j.body);c=a.renderTo.style.width;h=a.renderTo.style.height;c=g.exporting.sourceWidth||g.chart.width||
+/px$/.test(c)&&parseInt(c,10)||600;h=g.exporting.sourceHeight||g.chart.height||/px$/.test(h)&&parseInt(h,10)||400;p(g.chart,{animation:!1,renderTo:b,forExport:!0,width:c,height:h});g.exporting.enabled=!1;g.series=[];r(a.series,function(a){z=k(a.options,{animation:!1,enableMouseTracking:!1,showCheckbox:!1,visible:a.visible});z.isInternal||g.series.push(z)});d=new f.Chart(g,a.callback);r(["xAxis","yAxis"],function(b){r(a[b],function(a,c){var g=d[b][c],f=a.getExtremes(),h=f.userMin,f=f.userMax;g&&(h!==
+void 0||f!==void 0)&&g.setExtremes(h,f,!0,!1)})});c=d.container.innerHTML;g=null;d.destroy();o(b);c=c.replace(/zIndex="[^"]+"/g,"").replace(/isShadow="[^"]+"/g,"").replace(/symbolName="[^"]+"/g,"").replace(/jQuery[0-9]+="[^"]+"/g,"").replace(/url\([^#]+#/g,"url(#").replace(/<svg /,'<svg xmlns:xlink="http://www.w3.org/1999/xlink" ').replace(/ href=/g," xlink:href=").replace(/\n/," ").replace(/<\/svg>.*?$/,"</svg>").replace(/(fill|stroke)="rgba\(([ 0-9]+,[ 0-9]+,[ 0-9]+),([ 0-9\.]+)\)"/g,'$1="rgb($2)" $1-opacity="$3"').replace(/ /g,
+" ").replace(/­/g,"").replace(/<IMG /g,"<image ").replace(/height=([^" ]+)/g,'height="$1"').replace(/width=([^" ]+)/g,'width="$1"').replace(/hc-svg-href="([^"]+)">/g,'xlink:href="$1"/>').replace(/id=([^" >]+)/g,'id="$1"').replace(/class=([^" >]+)/g,'class="$1"').replace(/ transform /g," ").replace(/:(path|rect)/g,"$1").replace(/style="([^"]+)"/g,function(a){return a.toLowerCase()});return c=c.replace(/(url\(#highcharts-[0-9]+)"/g,"$1").replace(/"/g,"'")},exportChart:function(b,a){var b=
+b||{},d=this.options.exporting,d=this.getSVG(k({chart:{borderRadius:0}},d.chartOptions,a,{exporting:{sourceWidth:b.sourceWidth||d.sourceWidth,sourceHeight:b.sourceHeight||d.sourceHeight}})),b=k(this.options.exporting,b);f.post(b.url,{filename:b.filename||"chart",type:b.type,width:b.width||0,scale:b.scale||2,svg:d},b.formAttributes)},print:function(){var b=this,a=b.container,d=[],c=a.parentNode,f=j.body,h=f.childNodes;if(!b.isPrinting)b.isPrinting=!0,r(h,function(a,b){if(a.nodeType===1)d[b]=a.style.display,
+a.style.display="none"}),f.appendChild(a),C.focus(),C.print(),setTimeout(function(){c.appendChild(a);r(h,function(a,b){if(a.nodeType===1)a.style.display=d[b]});b.isPrinting=!1},1E3)},contextMenu:function(b,a,d,c,f,h,g){var e=this,k=e.options.navigation,q=k.menuItemStyle,m=e.chartWidth,n=e.chartHeight,j="cache-"+b,i=e[j],u=D(f,h),w,x,o,s=function(a){e.pointer.inClass(a.target,b)||x()};if(!i)e[j]=i=l("div",{className:b},{position:"absolute",zIndex:1E3,padding:u+"px"},e.container),w=l("div",null,p({MozBoxShadow:"3px 3px 10px #888",
+WebkitBoxShadow:"3px 3px 10px #888",boxShadow:"3px 3px 10px #888"},k.menuStyle),i),x=function(){v(i,{display:"none"});g&&g.setState(0);e.openMenu=!1},t(i,"mouseleave",function(){o=setTimeout(x,500)}),t(i,"mouseenter",function(){clearTimeout(o)}),t(document,"mouseup",s),t(e,"destroy",function(){B(document,"mouseup",s)}),r(a,function(a){if(a){var b=a.separator?l("hr",null,null,w):l("div",{onmouseover:function(){v(this,k.menuItemHoverStyle)},onmouseout:function(){v(this,q)},onclick:function(){x();a.onclick.apply(e,
+arguments)},innerHTML:a.text||e.options.lang[a.textKey]},p({cursor:"pointer"},q),w);e.exportDivElements.push(b)}}),e.exportDivElements.push(w,i),e.exportMenuWidth=i.offsetWidth,e.exportMenuHeight=i.offsetHeight;a={display:"block"};d+e.exportMenuWidth>m?a.right=m-d-f-u+"px":a.left=d-u+"px";c+h+e.exportMenuHeight>n&&g.alignOptions.verticalAlign!=="top"?a.bottom=n-c-u+"px":a.top=c+h-u+"px";v(i,a);e.openMenu=!0},addButton:function(b){var a=this,d=a.renderer,c=k(a.options.navigation.buttonOptions,b),j=
+c.onclick,h=c.menuItems,g,e,l={stroke:c.symbolStroke,fill:c.symbolFill},q=c.symbolSize||12;if(!a.btnCount)a.btnCount=0;if(!a.exportDivElements)a.exportDivElements=[],a.exportSVGElements=[];if(c.enabled!==!1){var m=c.theme,n=m.states,o=n&&n.hover,n=n&&n.select,i;delete m.states;j?i=function(){j.apply(a,arguments)}:h&&(i=function(){a.contextMenu(e.menuClassName,h,e.translateX,e.translateY,e.width,e.height,e);e.setState(2)});c.text&&c.symbol?m.paddingLeft=f.pick(m.paddingLeft,25):c.text||p(m,{width:c.width,
+height:c.height,padding:0});e=d.button(c.text,0,0,i,m,o,n).attr({title:a.options.lang[c._titleKey],"stroke-linecap":"round"});e.menuClassName=b.menuClassName||"highcharts-menu-"+a.btnCount++;c.symbol&&(g=d.symbol(c.symbol,c.symbolX-q/2,c.symbolY-q/2,q,q).attr(p(l,{"stroke-width":c.symbolStrokeWidth||1,zIndex:1})).add(e));e.add().align(p(c,{width:e.width,x:f.pick(c.x,y)}),!0,"spacingBox");y+=(e.width+c.buttonSpacing)*(c.align==="right"?-1:1);a.exportSVGElements.push(e,g)}},destroyExport:function(b){var b=
+b.target,a,d;for(a=0;a<b.exportSVGElements.length;a++)if(d=b.exportSVGElements[a])d.onclick=d.ontouchstart=null,b.exportSVGElements[a]=d.destroy();for(a=0;a<b.exportDivElements.length;a++)d=b.exportDivElements[a],B(d,"mouseleave"),b.exportDivElements[a]=d.onmouseout=d.onmouseover=d.ontouchstart=d.onclick=null,o(d)}});F.menu=function(b,a,d,c){return["M",b,a+2.5,"L",b+d,a+2.5,"M",b,a+c/2+0.5,"L",b+d,a+c/2+0.5,"M",b,a+c-1.5,"L",b+d,a+c-1.5]};A.prototype.callbacks.push(function(b){var a,d=b.options.exporting,
+c=d.buttons;y=0;if(d.enabled!==!1){for(a in c)b.addButton(c[a]);t(b,"destroy",b.destroyExport)}})})(Highcharts);
+/*
+ Data plugin for Highcharts
+
+ (c) 2012-2014 Torstein Honsi
+
+ License: www.highcharts.com/license
+*/
+(function(j){var m=j.each,n=function(b,a){this.init(b,a)};j.extend(n.prototype,{init:function(b,a){this.options=b;this.chartOptions=a;this.columns=b.columns||this.rowsToColumns(b.rows)||[];this.columns.length?this.dataFound():(this.parseCSV(),this.parseTable(),this.parseGoogleSpreadsheet())},getColumnDistribution:function(){var b=this.chartOptions,a=b&&b.chart&&b.chart.type,c=[];m(b&&b.series||[],function(b){c.push((j.seriesTypes[b.type||a||"line"].prototype.pointArrayMap||[0]).length)});this.valueCount=
+{global:(j.seriesTypes[a||"line"].prototype.pointArrayMap||[0]).length,individual:c}},dataFound:function(){if(this.options.switchRowsAndColumns)this.columns=this.rowsToColumns(this.columns);this.parseTypes();this.findHeaderRow();this.parsed();this.complete()},parseCSV:function(){var b=this,a=this.options,c=a.csv,d=this.columns,e=a.startRow||0,f=a.endRow||Number.MAX_VALUE,i=a.startColumn||0,h=a.endColumn||Number.MAX_VALUE,g,k,o=0;c&&(k=c.replace(/\r\n/g,"\n").replace(/\r/g,"\n").split(a.lineDelimiter||
+"\n"),g=a.itemDelimiter||(c.indexOf("\t")!==-1?"\t":","),m(k,function(a,c){var k=b.trim(a),j=k.indexOf("#")===0;c>=e&&c<=f&&!j&&k!==""&&(k=a.split(g),m(k,function(b,a){a>=i&&a<=h&&(d[a-i]||(d[a-i]=[]),d[a-i][o]=b)}),o+=1)}),this.dataFound())},parseTable:function(){var b=this.options,a=b.table,c=this.columns,d=b.startRow||0,e=b.endRow||Number.MAX_VALUE,f=b.startColumn||0,i=b.endColumn||Number.MAX_VALUE;a&&(typeof a==="string"&&(a=document.getElementById(a)),m(a.getElementsByTagName("tr"),function(a,
+b){b>=d&&b<=e&&m(a.children,function(a,e){if((a.tagName==="TD"||a.tagName==="TH")&&e>=f&&e<=i)c[e-f]||(c[e-f]=[]),c[e-f][b-d]=a.innerHTML})}),this.dataFound())},parseGoogleSpreadsheet:function(){var b=this,a=this.options,c=a.googleSpreadsheetKey,d=this.columns,e=a.startRow||0,f=a.endRow||Number.MAX_VALUE,i=a.startColumn||0,h=a.endColumn||Number.MAX_VALUE,g,k;c&&jQuery.ajax({dataType:"json",url:"https://spreadsheets.google.com/feeds/cells/"+c+"/"+(a.googleSpreadsheetWorksheet||"od6")+"/public/values?alt=json-in-script&callback=?",
+error:a.error,success:function(a){var a=a.feed.entry,c,j=a.length,m=0,n=0,l;for(l=0;l<j;l++)c=a[l],m=Math.max(m,c.gs$cell.col),n=Math.max(n,c.gs$cell.row);for(l=0;l<m;l++)if(l>=i&&l<=h)d[l-i]=[],d[l-i].length=Math.min(n,f-e);for(l=0;l<j;l++)if(c=a[l],g=c.gs$cell.row-1,k=c.gs$cell.col-1,k>=i&&k<=h&&g>=e&&g<=f)d[k-i][g-e]=c.content.$t;b.dataFound()}})},findHeaderRow:function(){m(this.columns,function(){});this.headerRow=0},trim:function(b){return typeof b==="string"?b.replace(/^\s+|\s+$/g,""):b},parseTypes:function(){for(var b=
+this.columns,a=b.length,c,d,e,f;a--;)for(c=b[a].length;c--;)d=b[a][c],e=parseFloat(d),f=this.trim(d),f==e?(b[a][c]=e,e>31536E6?b[a].isDatetime=!0:b[a].isNumeric=!0):(d=this.parseDate(d),a===0&&typeof d==="number"&&!isNaN(d)?(b[a][c]=d,b[a].isDatetime=!0):b[a][c]=f===""?null:f)},dateFormats:{"YYYY-mm-dd":{regex:"^([0-9]{4})-([0-9]{2})-([0-9]{2})$",parser:function(b){return Date.UTC(+b[1],b[2]-1,+b[3])}}},parseDate:function(b){var a=this.options.parseDate,c,d,e;a&&(c=a(b));if(typeof b==="string")for(d in this.dateFormats)a=
+this.dateFormats[d],(e=b.match(a.regex))&&(c=a.parser(e));return c},rowsToColumns:function(b){var a,c,d,e,f;if(b){f=[];c=b.length;for(a=0;a<c;a++){e=b[a].length;for(d=0;d<e;d++)f[d]||(f[d]=[]),f[d][a]=b[a][d]}}return f},parsed:function(){this.options.parsed&&this.options.parsed.call(this,this.columns)},complete:function(){var b=this.columns,a,c,d=this.options,e,f,i,h,g,k;if(d.complete||d.afterComplete){this.getColumnDistribution();b.length>1&&(a=b.shift(),this.headerRow===0&&a.shift(),a.isDatetime?
+c="datetime":a.isNumeric||(c="category"));for(h=0;h<b.length;h++)if(this.headerRow===0)b[h].name=b[h].shift();f=[];for(h=0,k=0;h<b.length;k++){e=j.pick(this.valueCount.individual[k],this.valueCount.global);i=[];if(h+e<=b.length)for(g=0;g<b[h].length;g++)i[g]=[a[g],b[h][g]!==void 0?b[h][g]:null],e>1&&i[g].push(b[h+1][g]!==void 0?b[h+1][g]:null),e>2&&i[g].push(b[h+2][g]!==void 0?b[h+2][g]:null),e>3&&i[g].push(b[h+3][g]!==void 0?b[h+3][g]:null),e>4&&i[g].push(b[h+4][g]!==void 0?b[h+4][g]:null);f[k]=
+{name:b[h].name,data:i};h+=e}b={xAxis:{type:c},series:f};d.complete&&d.complete(b);d.afterComplete&&d.afterComplete(b)}}});j.Data=n;j.data=function(b,a){return new n(b,a)};j.wrap(j.Chart.prototype,"init",function(b,a,c){var d=this;a&&a.data?j.data(j.extend(a.data,{afterComplete:function(e){var f,i;if(a.hasOwnProperty("series"))if(typeof a.series==="object")for(f=Math.max(a.series.length,e.series.length);f--;)i=a.series[f]||{},a.series[f]=j.merge(i,e.series[f]);else delete a.series;a=j.merge(e,a);
+b.call(d,a,c)}}),a):b.call(d,a,c)})})(Highcharts);
diff --git a/management/guns-admin/src/main/webapp/static/js/plugins/highcharts/highcharts-more.js b/management/guns-admin/src/main/webapp/static/js/plugins/highcharts/highcharts-more.js
new file mode 100644
index 0000000..e3c5c69
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/static/js/plugins/highcharts/highcharts-more.js
@@ -0,0 +1,53 @@
+/*
+ Highcharts JS v4.0.3 (2014-07-03)
+
+ (c) 2009-2014 Torstein Honsi
+
+ License: www.highcharts.com/license
+*/
+(function(l,C){function K(a,b,c){this.init.call(this,a,b,c)}var P=l.arrayMin,Q=l.arrayMax,s=l.each,F=l.extend,q=l.merge,R=l.map,o=l.pick,x=l.pInt,p=l.getOptions().plotOptions,g=l.seriesTypes,v=l.extendClass,L=l.splat,r=l.wrap,M=l.Axis,y=l.Tick,H=l.Point,S=l.Pointer,T=l.CenteredSeriesMixin,z=l.TrackerMixin,t=l.Series,w=Math,D=w.round,A=w.floor,N=w.max,U=l.Color,u=function(){};F(K.prototype,{init:function(a,b,c){var d=this,e=d.defaultOptions;d.chart=b;if(b.angular)e.background={};d.options=a=q(e,a);
+(a=a.background)&&s([].concat(L(a)).reverse(),function(a){var b=a.backgroundColor,a=q(d.defaultBackgroundOptions,a);if(b)a.backgroundColor=b;a.color=a.backgroundColor;c.options.plotBands.unshift(a)})},defaultOptions:{center:["50%","50%"],size:"85%",startAngle:0},defaultBackgroundOptions:{shape:"circle",borderWidth:1,borderColor:"silver",backgroundColor:{linearGradient:{x1:0,y1:0,x2:0,y2:1},stops:[[0,"#FFF"],[1,"#DDD"]]},from:-Number.MAX_VALUE,innerRadius:0,to:Number.MAX_VALUE,outerRadius:"105%"}});
+var G=M.prototype,y=y.prototype,V={getOffset:u,redraw:function(){this.isDirty=!1},render:function(){this.isDirty=!1},setScale:u,setCategories:u,setTitle:u},O={isRadial:!0,defaultRadialGaugeOptions:{labels:{align:"center",x:0,y:null},minorGridLineWidth:0,minorTickInterval:"auto",minorTickLength:10,minorTickPosition:"inside",minorTickWidth:1,tickLength:10,tickPosition:"inside",tickWidth:2,title:{rotation:0},zIndex:2},defaultRadialXOptions:{gridLineWidth:1,labels:{align:null,distance:15,x:0,y:null},
+maxPadding:0,minPadding:0,showLastLabel:!1,tickLength:0},defaultRadialYOptions:{gridLineInterpolation:"circle",labels:{align:"right",x:-3,y:-2},showLastLabel:!1,title:{x:4,text:null,rotation:90}},setOptions:function(a){a=this.options=q(this.defaultOptions,this.defaultRadialOptions,a);if(!a.plotBands)a.plotBands=[]},getOffset:function(){G.getOffset.call(this);this.chart.axisOffset[this.side]=0;this.center=this.pane.center=T.getCenter.call(this.pane)},getLinePath:function(a,b){var c=this.center,b=o(b,
+c[2]/2-this.offset);return this.chart.renderer.symbols.arc(this.left+c[0],this.top+c[1],b,b,{start:this.startAngleRad,end:this.endAngleRad,open:!0,innerR:0})},setAxisTranslation:function(){G.setAxisTranslation.call(this);if(this.center)this.transA=this.isCircular?(this.endAngleRad-this.startAngleRad)/(this.max-this.min||1):this.center[2]/2/(this.max-this.min||1),this.minPixelPadding=this.isXAxis?this.transA*this.minPointOffset:0},beforeSetTickPositions:function(){this.autoConnect&&(this.max+=this.categories&&
+1||this.pointRange||this.closestPointRange||0)},setAxisSize:function(){G.setAxisSize.call(this);if(this.isRadial){this.center=this.pane.center=l.CenteredSeriesMixin.getCenter.call(this.pane);if(this.isCircular)this.sector=this.endAngleRad-this.startAngleRad;this.len=this.width=this.height=this.center[2]*o(this.sector,1)/2}},getPosition:function(a,b){return this.postTranslate(this.isCircular?this.translate(a):0,o(this.isCircular?b:this.translate(a),this.center[2]/2)-this.offset)},postTranslate:function(a,
+b){var c=this.chart,d=this.center,a=this.startAngleRad+a;return{x:c.plotLeft+d[0]+Math.cos(a)*b,y:c.plotTop+d[1]+Math.sin(a)*b}},getPlotBandPath:function(a,b,c){var d=this.center,e=this.startAngleRad,f=d[2]/2,h=[o(c.outerRadius,"100%"),c.innerRadius,o(c.thickness,10)],j=/%$/,k,m=this.isCircular;this.options.gridLineInterpolation==="polygon"?d=this.getPlotLinePath(a).concat(this.getPlotLinePath(b,!0)):(m||(h[0]=this.translate(a),h[1]=this.translate(b)),h=R(h,function(a){j.test(a)&&(a=x(a,10)*f/100);
+return a}),c.shape==="circle"||!m?(a=-Math.PI/2,b=Math.PI*1.5,k=!0):(a=e+this.translate(a),b=e+this.translate(b)),d=this.chart.renderer.symbols.arc(this.left+d[0],this.top+d[1],h[0],h[0],{start:a,end:b,innerR:o(h[1],h[0]-h[2]),open:k}));return d},getPlotLinePath:function(a,b){var c=this,d=c.center,e=c.chart,f=c.getPosition(a),h,j,k;c.isCircular?k=["M",d[0]+e.plotLeft,d[1]+e.plotTop,"L",f.x,f.y]:c.options.gridLineInterpolation==="circle"?(a=c.translate(a))&&(k=c.getLinePath(0,a)):(s(e.xAxis,function(a){a.pane===
+c.pane&&(h=a)}),k=[],a=c.translate(a),d=h.tickPositions,h.autoConnect&&(d=d.concat([d[0]])),b&&(d=[].concat(d).reverse()),s(d,function(f,c){j=h.getPosition(f,a);k.push(c?"L":"M",j.x,j.y)}));return k},getTitlePosition:function(){var a=this.center,b=this.chart,c=this.options.title;return{x:b.plotLeft+a[0]+(c.x||0),y:b.plotTop+a[1]-{high:0.5,middle:0.25,low:0}[c.align]*a[2]+(c.y||0)}}};r(G,"init",function(a,b,c){var i;var d=b.angular,e=b.polar,f=c.isX,h=d&&f,j,k;k=b.options;var m=c.pane||0;if(d){if(F(this,
+h?V:O),j=!f)this.defaultRadialOptions=this.defaultRadialGaugeOptions}else if(e)F(this,O),this.defaultRadialOptions=(j=f)?this.defaultRadialXOptions:q(this.defaultYAxisOptions,this.defaultRadialYOptions);a.call(this,b,c);if(!h&&(d||e)){a=this.options;if(!b.panes)b.panes=[];this.pane=(i=b.panes[m]=b.panes[m]||new K(L(k.pane)[m],b,this),m=i);m=m.options;b.inverted=!1;k.chart.zoomType=null;this.startAngleRad=b=(m.startAngle-90)*Math.PI/180;this.endAngleRad=k=(o(m.endAngle,m.startAngle+360)-90)*Math.PI/
+180;this.offset=a.offset||0;if((this.isCircular=j)&&c.max===C&&k-b===2*Math.PI)this.autoConnect=!0}});r(y,"getPosition",function(a,b,c,d,e){var f=this.axis;return f.getPosition?f.getPosition(c):a.call(this,b,c,d,e)});r(y,"getLabelPosition",function(a,b,c,d,e,f,h,j,k){var m=this.axis,i=f.y,n=f.align,g=(m.translate(this.pos)+m.startAngleRad+Math.PI/2)/Math.PI*180%360;m.isRadial?(a=m.getPosition(this.pos,m.center[2]/2+o(f.distance,-25)),f.rotation==="auto"?d.attr({rotation:g}):i===null&&(i=m.chart.renderer.fontMetrics(d.styles.fontSize).b-
+d.getBBox().height/2),n===null&&(n=m.isCircular?g>20&&g<160?"left":g>200&&g<340?"right":"center":"center",d.attr({align:n})),a.x+=f.x,a.y+=i):a=a.call(this,b,c,d,e,f,h,j,k);return a});r(y,"getMarkPath",function(a,b,c,d,e,f,h){var j=this.axis;j.isRadial?(a=j.getPosition(this.pos,j.center[2]/2+d),b=["M",b,c,"L",a.x,a.y]):b=a.call(this,b,c,d,e,f,h);return b});p.arearange=q(p.area,{lineWidth:1,marker:null,threshold:null,tooltip:{pointFormat:'<span style="color:{series.color}">●</span> {series.name}: <b>{point.low}</b> - <b>{point.high}</b><br/>'},
+trackByArea:!0,dataLabels:{align:null,verticalAlign:null,xLow:0,xHigh:0,yLow:0,yHigh:0},states:{hover:{halo:!1}}});g.arearange=v(g.area,{type:"arearange",pointArrayMap:["low","high"],toYData:function(a){return[a.low,a.high]},pointValKey:"low",getSegments:function(){var a=this;s(a.points,function(b){if(!a.options.connectNulls&&(b.low===null||b.high===null))b.y=null;else if(b.low===null&&b.high!==null)b.y=b.high});t.prototype.getSegments.call(this)},translate:function(){var a=this.yAxis;g.area.prototype.translate.apply(this);
+s(this.points,function(b){var c=b.low,d=b.high,e=b.plotY;d===null&&c===null?b.y=null:c===null?(b.plotLow=b.plotY=null,b.plotHigh=a.translate(d,0,1,0,1)):d===null?(b.plotLow=e,b.plotHigh=null):(b.plotLow=e,b.plotHigh=a.translate(d,0,1,0,1))})},getSegmentPath:function(a){var b,c=[],d=a.length,e=t.prototype.getSegmentPath,f,h;h=this.options;var j=h.step;for(b=HighchartsAdapter.grep(a,function(a){return a.plotLow!==null});d--;)f=a[d],f.plotHigh!==null&&c.push({plotX:f.plotX,plotY:f.plotHigh});a=e.call(this,
+b);if(j)j===!0&&(j="left"),h.step={left:"right",center:"center",right:"left"}[j];c=e.call(this,c);h.step=j;h=[].concat(a,c);c[0]="L";this.areaPath=this.areaPath.concat(a,c);return h},drawDataLabels:function(){var a=this.data,b=a.length,c,d=[],e=t.prototype,f=this.options.dataLabels,h=f.align,j,k=this.chart.inverted;if(f.enabled||this._hasPointLabels){for(c=b;c--;)if(j=a[c],j.y=j.high,j._plotY=j.plotY,j.plotY=j.plotHigh,d[c]=j.dataLabel,j.dataLabel=j.dataLabelUpper,j.below=!1,k){if(!h)f.align="left";
+f.x=f.xHigh}else f.y=f.yHigh;e.drawDataLabels&&e.drawDataLabels.apply(this,arguments);for(c=b;c--;)if(j=a[c],j.dataLabelUpper=j.dataLabel,j.dataLabel=d[c],j.y=j.low,j.plotY=j._plotY,j.below=!0,k){if(!h)f.align="right";f.x=f.xLow}else f.y=f.yLow;e.drawDataLabels&&e.drawDataLabels.apply(this,arguments)}f.align=h},alignDataLabel:function(){g.column.prototype.alignDataLabel.apply(this,arguments)},getSymbol:u,drawPoints:u});p.areasplinerange=q(p.arearange);g.areasplinerange=v(g.arearange,{type:"areasplinerange",
+getPointSpline:g.spline.prototype.getPointSpline});(function(){var a=g.column.prototype;p.columnrange=q(p.column,p.arearange,{lineWidth:1,pointRange:null});g.columnrange=v(g.arearange,{type:"columnrange",translate:function(){var b=this,c=b.yAxis,d;a.translate.apply(b);s(b.points,function(a){var f=a.shapeArgs,h=b.options.minPointLength,j;a.tooltipPos=null;a.plotHigh=d=c.translate(a.high,0,1,0,1);a.plotLow=a.plotY;j=d;a=a.plotY-d;a<h&&(h-=a,a+=h,j-=h/2);f.height=a;f.y=j})},trackerGroups:["group","dataLabelsGroup"],
+drawGraph:u,pointAttrToOptions:a.pointAttrToOptions,drawPoints:a.drawPoints,drawTracker:a.drawTracker,animate:a.animate,getColumnMetrics:a.getColumnMetrics})})();p.gauge=q(p.line,{dataLabels:{enabled:!0,defer:!1,y:15,borderWidth:1,borderColor:"silver",borderRadius:3,crop:!1,style:{fontWeight:"bold"},verticalAlign:"top",zIndex:2},dial:{},pivot:{},tooltip:{headerFormat:""},showInLegend:!1});z={type:"gauge",pointClass:v(H,{setState:function(a){this.state=a}}),angular:!0,drawGraph:u,fixedBox:!0,forceDL:!0,
+trackerGroups:["group","dataLabelsGroup"],translate:function(){var a=this.yAxis,b=this.options,c=a.center;this.generatePoints();s(this.points,function(d){var e=q(b.dial,d.dial),f=x(o(e.radius,80))*c[2]/200,h=x(o(e.baseLength,70))*f/100,j=x(o(e.rearLength,10))*f/100,k=e.baseWidth||3,m=e.topWidth||1,i=b.overshoot,n=a.startAngleRad+a.translate(d.y,null,null,null,!0);i&&typeof i==="number"?(i=i/180*Math.PI,n=Math.max(a.startAngleRad-i,Math.min(a.endAngleRad+i,n))):b.wrap===!1&&(n=Math.max(a.startAngleRad,
+Math.min(a.endAngleRad,n)));n=n*180/Math.PI;d.shapeType="path";d.shapeArgs={d:e.path||["M",-j,-k/2,"L",h,-k/2,f,-m/2,f,m/2,h,k/2,-j,k/2,"z"],translateX:c[0],translateY:c[1],rotation:n};d.plotX=c[0];d.plotY=c[1]})},drawPoints:function(){var a=this,b=a.yAxis.center,c=a.pivot,d=a.options,e=d.pivot,f=a.chart.renderer;s(a.points,function(c){var b=c.graphic,k=c.shapeArgs,e=k.d,i=q(d.dial,c.dial);b?(b.animate(k),k.d=e):c.graphic=f[c.shapeType](k).attr({stroke:i.borderColor||"none","stroke-width":i.borderWidth||
+0,fill:i.backgroundColor||"black",rotation:k.rotation}).add(a.group)});c?c.animate({translateX:b[0],translateY:b[1]}):a.pivot=f.circle(0,0,o(e.radius,5)).attr({"stroke-width":e.borderWidth||0,stroke:e.borderColor||"silver",fill:e.backgroundColor||"black"}).translate(b[0],b[1]).add(a.group)},animate:function(a){var b=this;if(!a)s(b.points,function(a){var d=a.graphic;d&&(d.attr({rotation:b.yAxis.startAngleRad*180/Math.PI}),d.animate({rotation:a.shapeArgs.rotation},b.options.animation))}),b.animate=
+null},render:function(){this.group=this.plotGroup("group","series",this.visible?"visible":"hidden",this.options.zIndex,this.chart.seriesGroup);t.prototype.render.call(this);this.group.clip(this.chart.clipRect)},setData:function(a,b){t.prototype.setData.call(this,a,!1);this.processData();this.generatePoints();o(b,!0)&&this.chart.redraw()},drawTracker:z&&z.drawTrackerPoint};g.gauge=v(g.line,z);p.boxplot=q(p.column,{fillColor:"#FFFFFF",lineWidth:1,medianWidth:2,states:{hover:{brightness:-0.3}},threshold:null,
+tooltip:{pointFormat:'<span style="color:{series.color}">●</span> <b> {series.name}</b><br/>Maximum: {point.high}<br/>Upper quartile: {point.q3}<br/>Median: {point.median}<br/>Lower quartile: {point.q1}<br/>Minimum: {point.low}<br/>'},whiskerLength:"50%",whiskerWidth:2});g.boxplot=v(g.column,{type:"boxplot",pointArrayMap:["low","q1","median","q3","high"],toYData:function(a){return[a.low,a.q1,a.median,a.q3,a.high]},pointValKey:"high",pointAttrToOptions:{fill:"fillColor",stroke:"color","stroke-width":"lineWidth"},
+drawDataLabels:u,translate:function(){var a=this.yAxis,b=this.pointArrayMap;g.column.prototype.translate.apply(this);s(this.points,function(c){s(b,function(b){c[b]!==null&&(c[b+"Plot"]=a.translate(c[b],0,1,0,1))})})},drawPoints:function(){var a=this,b=a.points,c=a.options,d=a.chart.renderer,e,f,h,j,k,m,i,n,g,l,p,I,r,q,J,u,v,t,w,x,z,y,E=a.doQuartiles!==!1,B=parseInt(a.options.whiskerLength,10)/100;s(b,function(b){g=b.graphic;z=b.shapeArgs;p={};q={};u={};y=b.color||a.color;if(b.plotY!==C)if(e=b.pointAttr[b.selected?
+"selected":""],v=z.width,t=A(z.x),w=t+v,x=D(v/2),f=A(E?b.q1Plot:b.lowPlot),h=A(E?b.q3Plot:b.lowPlot),j=A(b.highPlot),k=A(b.lowPlot),p.stroke=b.stemColor||c.stemColor||y,p["stroke-width"]=o(b.stemWidth,c.stemWidth,c.lineWidth),p.dashstyle=b.stemDashStyle||c.stemDashStyle,q.stroke=b.whiskerColor||c.whiskerColor||y,q["stroke-width"]=o(b.whiskerWidth,c.whiskerWidth,c.lineWidth),u.stroke=b.medianColor||c.medianColor||y,u["stroke-width"]=o(b.medianWidth,c.medianWidth,c.lineWidth),u["stroke-linecap"]="round",
+i=p["stroke-width"]%2/2,n=t+x+i,l=["M",n,h,"L",n,j,"M",n,f,"L",n,k],E&&(i=e["stroke-width"]%2/2,n=A(n)+i,f=A(f)+i,h=A(h)+i,t+=i,w+=i,I=["M",t,h,"L",t,f,"L",w,f,"L",w,h,"L",t,h,"z"]),B&&(i=q["stroke-width"]%2/2,j+=i,k+=i,r=["M",n-x*B,j,"L",n+x*B,j,"M",n-x*B,k,"L",n+x*B,k]),i=u["stroke-width"]%2/2,m=D(b.medianPlot)+i,J=["M",t,m,"L",w,m],g)b.stem.animate({d:l}),B&&b.whiskers.animate({d:r}),E&&b.box.animate({d:I}),b.medianShape.animate({d:J});else{b.graphic=g=d.g().add(a.group);b.stem=d.path(l).attr(p).add(g);
+if(B)b.whiskers=d.path(r).attr(q).add(g);if(E)b.box=d.path(I).attr(e).add(g);b.medianShape=d.path(J).attr(u).add(g)}})}});p.errorbar=q(p.boxplot,{color:"#000000",grouping:!1,linkedTo:":previous",tooltip:{pointFormat:'<span style="color:{series.color}">●</span> {series.name}: <b>{point.low}</b> - <b>{point.high}</b><br/>'},whiskerWidth:null});g.errorbar=v(g.boxplot,{type:"errorbar",pointArrayMap:["low","high"],toYData:function(a){return[a.low,a.high]},pointValKey:"high",doQuartiles:!1,drawDataLabels:g.arearange?
+g.arearange.prototype.drawDataLabels:u,getColumnMetrics:function(){return this.linkedParent&&this.linkedParent.columnMetrics||g.column.prototype.getColumnMetrics.call(this)}});p.waterfall=q(p.column,{lineWidth:1,lineColor:"#333",dashStyle:"dot",borderColor:"#333",states:{hover:{lineWidthPlus:0}}});g.waterfall=v(g.column,{type:"waterfall",upColorProp:"fill",pointArrayMap:["low","y"],pointValKey:"y",init:function(a,b){b.stacking=!0;g.column.prototype.init.call(this,a,b)},translate:function(){var a=
+this.yAxis,b,c,d,e,f,h,j,k,m,i;b=this.options.threshold;g.column.prototype.translate.apply(this);k=m=b;d=this.points;for(c=0,b=d.length;c<b;c++){e=d[c];f=e.shapeArgs;h=this.getStack(c);i=h.points[this.index+","+c];if(isNaN(e.y))e.y=this.yData[c];j=N(k,k+e.y)+i[0];f.y=a.translate(j,0,1);e.isSum?(f.y=a.translate(i[1],0,1),f.height=a.translate(i[0],0,1)-f.y):e.isIntermediateSum?(f.y=a.translate(i[1],0,1),f.height=a.translate(m,0,1)-f.y,m=i[1]):k+=h.total;f.height<0&&(f.y+=f.height,f.height*=-1);e.plotY=
+f.y=D(f.y)-this.borderWidth%2/2;f.height=N(D(f.height),0.001);e.yBottom=f.y+f.height;f=e.plotY+(e.negative?f.height:0);this.chart.inverted?e.tooltipPos[0]=a.len-f:e.tooltipPos[1]=f}},processData:function(a){var b=this.yData,c=this.points,d,e=b.length,f,h,j,k,m,i;h=f=j=k=this.options.threshold||0;for(i=0;i<e;i++)m=b[i],d=c&&c[i]?c[i]:{},m==="sum"||d.isSum?b[i]=h:m==="intermediateSum"||d.isIntermediateSum?b[i]=f:(h+=m,f+=m),j=Math.min(h,j),k=Math.max(h,k);t.prototype.processData.call(this,a);this.dataMin=
+j;this.dataMax=k},toYData:function(a){if(a.isSum)return"sum";else if(a.isIntermediateSum)return"intermediateSum";return a.y},getAttribs:function(){g.column.prototype.getAttribs.apply(this,arguments);var a=this.options,b=a.states,c=a.upColor||this.color,a=l.Color(c).brighten(0.1).get(),d=q(this.pointAttr),e=this.upColorProp;d[""][e]=c;d.hover[e]=b.hover.upColor||a;d.select[e]=b.select.upColor||c;s(this.points,function(a){if(a.y>0&&!a.color)a.pointAttr=d,a.color=c})},getGraphPath:function(){var a=this.data,
+b=a.length,c=D(this.options.lineWidth+this.borderWidth)%2/2,d=[],e,f,h;for(h=1;h<b;h++)f=a[h].shapeArgs,e=a[h-1].shapeArgs,f=["M",e.x+e.width,e.y+c,"L",f.x,e.y+c],a[h-1].y<0&&(f[2]+=e.height,f[5]+=e.height),d=d.concat(f);return d},getExtremes:u,getStack:function(a){var b=this.yAxis.stacks,c=this.stackKey;this.processedYData[a]<this.options.threshold&&(c="-"+c);return b[c][a]},drawGraph:t.prototype.drawGraph});p.bubble=q(p.scatter,{dataLabels:{formatter:function(){return this.point.z},inside:!0,style:{color:"white",
+textShadow:"0px 0px 3px black"},verticalAlign:"middle"},marker:{lineColor:null,lineWidth:1},minSize:8,maxSize:"20%",states:{hover:{halo:{size:5}}},tooltip:{pointFormat:"({point.x}, {point.y}), Size: {point.z}"},turboThreshold:0,zThreshold:0});z=v(H,{haloPath:function(){return H.prototype.haloPath.call(this,this.shapeArgs.r+this.series.options.states.hover.halo.size)}});g.bubble=v(g.scatter,{type:"bubble",pointClass:z,pointArrayMap:["y","z"],parallelArrays:["x","y","z"],trackerGroups:["group","dataLabelsGroup"],
+bubblePadding:!0,pointAttrToOptions:{stroke:"lineColor","stroke-width":"lineWidth",fill:"fillColor"},applyOpacity:function(a){var b=this.options.marker,c=o(b.fillOpacity,0.5),a=a||b.fillColor||this.color;c!==1&&(a=U(a).setOpacity(c).get("rgba"));return a},convertAttribs:function(){var a=t.prototype.convertAttribs.apply(this,arguments);a.fill=this.applyOpacity(a.fill);return a},getRadii:function(a,b,c,d){var e,f,h,j=this.zData,k=[],m=this.options.sizeBy!=="width";for(f=0,e=j.length;f<e;f++)h=b-a,h=
+h>0?(j[f]-a)/(b-a):0.5,m&&h>=0&&(h=Math.sqrt(h)),k.push(w.ceil(c+h*(d-c))/2);this.radii=k},animate:function(a){var b=this.options.animation;if(!a)s(this.points,function(a){var d=a.graphic,a=a.shapeArgs;d&&a&&(d.attr("r",1),d.animate({r:a.r},b))}),this.animate=null},translate:function(){var a,b=this.data,c,d,e=this.radii;g.scatter.prototype.translate.call(this);for(a=b.length;a--;)c=b[a],d=e?e[a]:0,c.negative=c.z<(this.options.zThreshold||0),d>=this.minPxSize/2?(c.shapeType="circle",c.shapeArgs={x:c.plotX,
+y:c.plotY,r:d},c.dlBox={x:c.plotX-d,y:c.plotY-d,width:2*d,height:2*d}):c.shapeArgs=c.plotY=c.dlBox=C},drawLegendSymbol:function(a,b){var c=x(a.itemStyle.fontSize)/2;b.legendSymbol=this.chart.renderer.circle(c,a.baseline-c,c).attr({zIndex:3}).add(b.legendGroup);b.legendSymbol.isMarker=!0},drawPoints:g.column.prototype.drawPoints,alignDataLabel:g.column.prototype.alignDataLabel});M.prototype.beforePadding=function(){var a=this,b=this.len,c=this.chart,d=0,e=b,f=this.isXAxis,h=f?"xData":"yData",j=this.min,
+k={},m=w.min(c.plotWidth,c.plotHeight),i=Number.MAX_VALUE,n=-Number.MAX_VALUE,g=this.max-j,l=b/g,p=[];this.tickPositions&&(s(this.series,function(b){var h=b.options;if(b.bubblePadding&&(b.visible||!c.options.chart.ignoreHiddenSeries))if(a.allowZoomOutside=!0,p.push(b),f)s(["minSize","maxSize"],function(a){var b=h[a],f=/%$/.test(b),b=x(b);k[a]=f?m*b/100:b}),b.minPxSize=k.minSize,b=b.zData,b.length&&(i=o(h.zMin,w.min(i,w.max(P(b),h.displayNegative===!1?h.zThreshold:-Number.MAX_VALUE))),n=o(h.zMax,w.max(n,
+Q(b))))}),s(p,function(a){var b=a[h],c=b.length,m;f&&a.getRadii(i,n,k.minSize,k.maxSize);if(g>0)for(;c--;)typeof b[c]==="number"&&(m=a.radii[c],d=Math.min((b[c]-j)*l-m,d),e=Math.max((b[c]-j)*l+m,e))}),p.length&&g>0&&o(this.options.min,this.userMin)===C&&o(this.options.max,this.userMax)===C&&(e-=b,l*=(b+d-e)/b,this.min+=d/l,this.max+=e/l))};(function(){function a(a,b,c){a.call(this,b,c);if(this.chart.polar)this.closeSegment=function(a){var b=this.xAxis.center;a.push("L",b[0],b[1])},this.closedStacks=
+!0}function b(a,b){var c=this.chart,d=this.options.animation,e=this.group,i=this.markerGroup,n=this.xAxis.center,g=c.plotLeft,l=c.plotTop;if(c.polar){if(c.renderer.isSVG)d===!0&&(d={}),b?(c={translateX:n[0]+g,translateY:n[1]+l,scaleX:0.001,scaleY:0.001},e.attr(c),i&&i.attr(c)):(c={translateX:g,translateY:l,scaleX:1,scaleY:1},e.animate(c,d),i&&i.animate(c,d),this.animate=null)}else a.call(this,b)}var c=t.prototype,d=S.prototype,e;c.toXY=function(a){var b,c=this.chart,d=a.plotX;b=a.plotY;a.rectPlotX=
+d;a.rectPlotY=b;d=(d/Math.PI*180+this.xAxis.pane.options.startAngle)%360;d<0&&(d+=360);a.clientX=d;b=this.xAxis.postTranslate(a.plotX,this.yAxis.len-b);a.plotX=a.polarPlotX=b.x-c.plotLeft;a.plotY=a.polarPlotY=b.y-c.plotTop};c.orderTooltipPoints=function(a){if(this.chart.polar&&(a.sort(function(a,b){return a.clientX-b.clientX}),a[0]))a[0].wrappedClientX=a[0].clientX+360,a.push(a[0])};g.area&&r(g.area.prototype,"init",a);g.areaspline&&r(g.areaspline.prototype,"init",a);g.spline&&r(g.spline.prototype,
+"getPointSpline",function(a,b,c,d){var e,i,n,g,l,p,o;if(this.chart.polar){e=c.plotX;i=c.plotY;a=b[d-1];n=b[d+1];this.connectEnds&&(a||(a=b[b.length-2]),n||(n=b[1]));if(a&&n)g=a.plotX,l=a.plotY,b=n.plotX,p=n.plotY,g=(1.5*e+g)/2.5,l=(1.5*i+l)/2.5,n=(1.5*e+b)/2.5,o=(1.5*i+p)/2.5,b=Math.sqrt(Math.pow(g-e,2)+Math.pow(l-i,2)),p=Math.sqrt(Math.pow(n-e,2)+Math.pow(o-i,2)),g=Math.atan2(l-i,g-e),l=Math.atan2(o-i,n-e),o=Math.PI/2+(g+l)/2,Math.abs(g-o)>Math.PI/2&&(o-=Math.PI),g=e+Math.cos(o)*b,l=i+Math.sin(o)*
+b,n=e+Math.cos(Math.PI+o)*p,o=i+Math.sin(Math.PI+o)*p,c.rightContX=n,c.rightContY=o;d?(c=["C",a.rightContX||a.plotX,a.rightContY||a.plotY,g||e,l||i,e,i],a.rightContX=a.rightContY=null):c=["M",e,i]}else c=a.call(this,b,c,d);return c});r(c,"translate",function(a){a.call(this);if(this.chart.polar&&!this.preventPostTranslate)for(var a=this.points,b=a.length;b--;)this.toXY(a[b])});r(c,"getSegmentPath",function(a,b){var c=this.points;if(this.chart.polar&&this.options.connectEnds!==!1&&b[b.length-1]===c[c.length-
+1]&&c[0].y!==null)this.connectEnds=!0,b=[].concat(b,[c[0]]);return a.call(this,b)});r(c,"animate",b);r(c,"setTooltipPoints",function(a,b){this.chart.polar&&F(this.xAxis,{tooltipLen:360});return a.call(this,b)});if(g.column)e=g.column.prototype,r(e,"animate",b),r(e,"translate",function(a){var b=this.xAxis,c=this.yAxis.len,d=b.center,e=b.startAngleRad,i=this.chart.renderer,g,l;this.preventPostTranslate=!0;a.call(this);if(b.isRadial){b=this.points;for(l=b.length;l--;)g=b[l],a=g.barX+e,g.shapeType="path",
+g.shapeArgs={d:i.symbols.arc(d[0],d[1],c-g.plotY,null,{start:a,end:a+g.pointWidth,innerR:c-o(g.yBottom,c)})},this.toXY(g),g.tooltipPos=[g.plotX,g.plotY],g.ttBelow=g.plotY>d[1]}}),r(e,"alignDataLabel",function(a,b,d,e,g,i){if(this.chart.polar){a=b.rectPlotX/Math.PI*180;if(e.align===null)e.align=a>20&&a<160?"left":a>200&&a<340?"right":"center";if(e.verticalAlign===null)e.verticalAlign=a<45||a>315?"bottom":a>135&&a<225?"top":"middle";c.alignDataLabel.call(this,b,d,e,g,i)}else a.call(this,b,d,e,g,i)});
+r(d,"getIndex",function(a,b){var c,d=this.chart,e;d.polar?(e=d.xAxis[0].center,c=b.chartX-e[0]-d.plotLeft,d=b.chartY-e[1]-d.plotTop,c=180-Math.round(Math.atan2(c,d)/Math.PI*180)):c=a.call(this,b);return c});r(d,"getCoordinates",function(a,b){var c=this.chart,d={xAxis:[],yAxis:[]};c.polar?s(c.axes,function(a){var e=a.isXAxis,f=a.center,g=b.chartX-f[0]-c.plotLeft,f=b.chartY-f[1]-c.plotTop;d[e?"xAxis":"yAxis"].push({axis:a,value:a.translate(e?Math.PI-Math.atan2(g,f):Math.sqrt(Math.pow(g,2)+Math.pow(f,
+2)),!0)})}):d=a.call(this,b);return d})})()})(Highcharts);
diff --git a/management/guns-admin/src/main/webapp/static/js/plugins/highcharts/highcharts-more.src.js b/management/guns-admin/src/main/webapp/static/js/plugins/highcharts/highcharts-more.src.js
new file mode 100644
index 0000000..255e2ac
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/static/js/plugins/highcharts/highcharts-more.src.js
@@ -0,0 +1,2576 @@
+// ==ClosureCompiler==
+// @compilation_level SIMPLE_OPTIMIZATIONS
+
+/**
+ * @license Highcharts JS v4.0.3 (2014-07-03)
+ *
+ * (c) 2009-2014 Torstein Honsi
+ *
+ * License: www.highcharts.com/license
+ */
+
+// JSLint options:
+/*global Highcharts, HighchartsAdapter, document, window, navigator, setInterval, clearInterval, clearTimeout, setTimeout, location, jQuery, $, console */
+
+(function (Highcharts, UNDEFINED) {
+var arrayMin = Highcharts.arrayMin,
+ arrayMax = Highcharts.arrayMax,
+ each = Highcharts.each,
+ extend = Highcharts.extend,
+ merge = Highcharts.merge,
+ map = Highcharts.map,
+ pick = Highcharts.pick,
+ pInt = Highcharts.pInt,
+ defaultPlotOptions = Highcharts.getOptions().plotOptions,
+ seriesTypes = Highcharts.seriesTypes,
+ extendClass = Highcharts.extendClass,
+ splat = Highcharts.splat,
+ wrap = Highcharts.wrap,
+ Axis = Highcharts.Axis,
+ Tick = Highcharts.Tick,
+ Point = Highcharts.Point,
+ Pointer = Highcharts.Pointer,
+ CenteredSeriesMixin = Highcharts.CenteredSeriesMixin,
+ TrackerMixin = Highcharts.TrackerMixin,
+ Series = Highcharts.Series,
+ math = Math,
+ mathRound = math.round,
+ mathFloor = math.floor,
+ mathMax = math.max,
+ Color = Highcharts.Color,
+ noop = function () {};/**
+ * The Pane object allows options that are common to a set of X and Y axes.
+ *
+ * In the future, this can be extended to basic Highcharts and Highstock.
+ */
+function Pane(options, chart, firstAxis) {
+ this.init.call(this, options, chart, firstAxis);
+}
+
+// Extend the Pane prototype
+extend(Pane.prototype, {
+
+ /**
+ * Initiate the Pane object
+ */
+ init: function (options, chart, firstAxis) {
+ var pane = this,
+ backgroundOption,
+ defaultOptions = pane.defaultOptions;
+
+ pane.chart = chart;
+
+ // Set options
+ if (chart.angular) { // gauges
+ defaultOptions.background = {}; // gets extended by this.defaultBackgroundOptions
+ }
+ pane.options = options = merge(defaultOptions, options);
+
+ backgroundOption = options.background;
+
+ // To avoid having weighty logic to place, update and remove the backgrounds,
+ // push them to the first axis' plot bands and borrow the existing logic there.
+ if (backgroundOption) {
+ each([].concat(splat(backgroundOption)).reverse(), function (config) {
+ var backgroundColor = config.backgroundColor; // if defined, replace the old one (specific for gradients)
+ config = merge(pane.defaultBackgroundOptions, config);
+ if (backgroundColor) {
+ config.backgroundColor = backgroundColor;
+ }
+ config.color = config.backgroundColor; // due to naming in plotBands
+ firstAxis.options.plotBands.unshift(config);
+ });
+ }
+ },
+
+ /**
+ * The default options object
+ */
+ defaultOptions: {
+ // background: {conditional},
+ center: ['50%', '50%'],
+ size: '85%',
+ startAngle: 0
+ //endAngle: startAngle + 360
+ },
+
+ /**
+ * The default background options
+ */
+ defaultBackgroundOptions: {
+ shape: 'circle',
+ borderWidth: 1,
+ borderColor: 'silver',
+ backgroundColor: {
+ linearGradient: { x1: 0, y1: 0, x2: 0, y2: 1 },
+ stops: [
+ [0, '#FFF'],
+ [1, '#DDD']
+ ]
+ },
+ from: -Number.MAX_VALUE, // corrected to axis min
+ innerRadius: 0,
+ to: Number.MAX_VALUE, // corrected to axis max
+ outerRadius: '105%'
+ }
+
+});
+var axisProto = Axis.prototype,
+ tickProto = Tick.prototype;
+
+/**
+ * Augmented methods for the x axis in order to hide it completely, used for the X axis in gauges
+ */
+var hiddenAxisMixin = {
+ getOffset: noop,
+ redraw: function () {
+ this.isDirty = false; // prevent setting Y axis dirty
+ },
+ render: function () {
+ this.isDirty = false; // prevent setting Y axis dirty
+ },
+ setScale: noop,
+ setCategories: noop,
+ setTitle: noop
+};
+
+/**
+ * Augmented methods for the value axis
+ */
+/*jslint unparam: true*/
+var radialAxisMixin = {
+ isRadial: true,
+
+ /**
+ * The default options extend defaultYAxisOptions
+ */
+ defaultRadialGaugeOptions: {
+ labels: {
+ align: 'center',
+ x: 0,
+ y: null // auto
+ },
+ minorGridLineWidth: 0,
+ minorTickInterval: 'auto',
+ minorTickLength: 10,
+ minorTickPosition: 'inside',
+ minorTickWidth: 1,
+ tickLength: 10,
+ tickPosition: 'inside',
+ tickWidth: 2,
+ title: {
+ rotation: 0
+ },
+ zIndex: 2 // behind dials, points in the series group
+ },
+
+ // Circular axis around the perimeter of a polar chart
+ defaultRadialXOptions: {
+ gridLineWidth: 1, // spokes
+ labels: {
+ align: null, // auto
+ distance: 15,
+ x: 0,
+ y: null // auto
+ },
+ maxPadding: 0,
+ minPadding: 0,
+ showLastLabel: false,
+ tickLength: 0
+ },
+
+ // Radial axis, like a spoke in a polar chart
+ defaultRadialYOptions: {
+ gridLineInterpolation: 'circle',
+ labels: {
+ align: 'right',
+ x: -3,
+ y: -2
+ },
+ showLastLabel: false,
+ title: {
+ x: 4,
+ text: null,
+ rotation: 90
+ }
+ },
+
+ /**
+ * Merge and set options
+ */
+ setOptions: function (userOptions) {
+
+ var options = this.options = merge(
+ this.defaultOptions,
+ this.defaultRadialOptions,
+ userOptions
+ );
+
+ // Make sure the plotBands array is instanciated for each Axis (#2649)
+ if (!options.plotBands) {
+ options.plotBands = [];
+ }
+
+ },
+
+ /**
+ * Wrap the getOffset method to return zero offset for title or labels in a radial
+ * axis
+ */
+ getOffset: function () {
+ // Call the Axis prototype method (the method we're in now is on the instance)
+ axisProto.getOffset.call(this);
+
+ // Title or label offsets are not counted
+ this.chart.axisOffset[this.side] = 0;
+
+ // Set the center array
+ this.center = this.pane.center = CenteredSeriesMixin.getCenter.call(this.pane);
+ },
+
+
+ /**
+ * Get the path for the axis line. This method is also referenced in the getPlotLinePath
+ * method.
+ */
+ getLinePath: function (lineWidth, radius) {
+ var center = this.center;
+ radius = pick(radius, center[2] / 2 - this.offset);
+
+ return this.chart.renderer.symbols.arc(
+ this.left + center[0],
+ this.top + center[1],
+ radius,
+ radius,
+ {
+ start: this.startAngleRad,
+ end: this.endAngleRad,
+ open: true,
+ innerR: 0
+ }
+ );
+ },
+
+ /**
+ * Override setAxisTranslation by setting the translation to the difference
+ * in rotation. This allows the translate method to return angle for
+ * any given value.
+ */
+ setAxisTranslation: function () {
+
+ // Call uber method
+ axisProto.setAxisTranslation.call(this);
+
+ // Set transA and minPixelPadding
+ if (this.center) { // it's not defined the first time
+ if (this.isCircular) {
+
+ this.transA = (this.endAngleRad - this.startAngleRad) /
+ ((this.max - this.min) || 1);
+
+
+ } else {
+ this.transA = (this.center[2] / 2) / ((this.max - this.min) || 1);
+ }
+
+ if (this.isXAxis) {
+ this.minPixelPadding = this.transA * this.minPointOffset;
+ } else {
+ // This is a workaround for regression #2593, but categories still don't position correctly.
+ // TODO: Implement true handling of Y axis categories on gauges.
+ this.minPixelPadding = 0;
+ }
+ }
+ },
+
+ /**
+ * In case of auto connect, add one closestPointRange to the max value right before
+ * tickPositions are computed, so that ticks will extend passed the real max.
+ */
+ beforeSetTickPositions: function () {
+ if (this.autoConnect) {
+ this.max += (this.categories && 1) || this.pointRange || this.closestPointRange || 0; // #1197, #2260
+ }
+ },
+
+ /**
+ * Override the setAxisSize method to use the arc's circumference as length. This
+ * allows tickPixelInterval to apply to pixel lengths along the perimeter
+ */
+ setAxisSize: function () {
+
+ axisProto.setAxisSize.call(this);
+
+ if (this.isRadial) {
+
+ // Set the center array
+ this.center = this.pane.center = Highcharts.CenteredSeriesMixin.getCenter.call(this.pane);
+
+ // The sector is used in Axis.translate to compute the translation of reversed axis points (#2570)
+ if (this.isCircular) {
+ this.sector = this.endAngleRad - this.startAngleRad;
+ }
+
+ // Axis len is used to lay out the ticks
+ this.len = this.width = this.height = this.center[2] * pick(this.sector, 1) / 2;
+
+
+ }
+ },
+
+ /**
+ * Returns the x, y coordinate of a point given by a value and a pixel distance
+ * from center
+ */
+ getPosition: function (value, length) {
+ return this.postTranslate(
+ this.isCircular ? this.translate(value) : 0, // #2848
+ pick(this.isCircular ? length : this.translate(value), this.center[2] / 2) - this.offset
+ );
+ },
+
+ /**
+ * Translate from intermediate plotX (angle), plotY (axis.len - radius) to final chart coordinates.
+ */
+ postTranslate: function (angle, radius) {
+
+ var chart = this.chart,
+ center = this.center;
+
+ angle = this.startAngleRad + angle;
+
+ return {
+ x: chart.plotLeft + center[0] + Math.cos(angle) * radius,
+ y: chart.plotTop + center[1] + Math.sin(angle) * radius
+ };
+
+ },
+
+ /**
+ * Find the path for plot bands along the radial axis
+ */
+ getPlotBandPath: function (from, to, options) {
+ var center = this.center,
+ startAngleRad = this.startAngleRad,
+ fullRadius = center[2] / 2,
+ radii = [
+ pick(options.outerRadius, '100%'),
+ options.innerRadius,
+ pick(options.thickness, 10)
+ ],
+ percentRegex = /%$/,
+ start,
+ end,
+ open,
+ isCircular = this.isCircular, // X axis in a polar chart
+ ret;
+
+ // Polygonal plot bands
+ if (this.options.gridLineInterpolation === 'polygon') {
+ ret = this.getPlotLinePath(from).concat(this.getPlotLinePath(to, true));
+
+ // Circular grid bands
+ } else {
+
+ // Plot bands on Y axis (radial axis) - inner and outer radius depend on to and from
+ if (!isCircular) {
+ radii[0] = this.translate(from);
+ radii[1] = this.translate(to);
+ }
+
+ // Convert percentages to pixel values
+ radii = map(radii, function (radius) {
+ if (percentRegex.test(radius)) {
+ radius = (pInt(radius, 10) * fullRadius) / 100;
+ }
+ return radius;
+ });
+
+ // Handle full circle
+ if (options.shape === 'circle' || !isCircular) {
+ start = -Math.PI / 2;
+ end = Math.PI * 1.5;
+ open = true;
+ } else {
+ start = startAngleRad + this.translate(from);
+ end = startAngleRad + this.translate(to);
+ }
+
+
+ ret = this.chart.renderer.symbols.arc(
+ this.left + center[0],
+ this.top + center[1],
+ radii[0],
+ radii[0],
+ {
+ start: start,
+ end: end,
+ innerR: pick(radii[1], radii[0] - radii[2]),
+ open: open
+ }
+ );
+ }
+
+ return ret;
+ },
+
+ /**
+ * Find the path for plot lines perpendicular to the radial axis.
+ */
+ getPlotLinePath: function (value, reverse) {
+ var axis = this,
+ center = axis.center,
+ chart = axis.chart,
+ end = axis.getPosition(value),
+ xAxis,
+ xy,
+ tickPositions,
+ ret;
+
+ // Spokes
+ if (axis.isCircular) {
+ ret = ['M', center[0] + chart.plotLeft, center[1] + chart.plotTop, 'L', end.x, end.y];
+
+ // Concentric circles
+ } else if (axis.options.gridLineInterpolation === 'circle') {
+ value = axis.translate(value);
+ if (value) { // a value of 0 is in the center
+ ret = axis.getLinePath(0, value);
+ }
+ // Concentric polygons
+ } else {
+ // Find the X axis in the same pane
+ each(chart.xAxis, function (a) {
+ if (a.pane === axis.pane) {
+ xAxis = a;
+ }
+ });
+ ret = [];
+ value = axis.translate(value);
+ tickPositions = xAxis.tickPositions;
+ if (xAxis.autoConnect) {
+ tickPositions = tickPositions.concat([tickPositions[0]]);
+ }
+ // Reverse the positions for concatenation of polygonal plot bands
+ if (reverse) {
+ tickPositions = [].concat(tickPositions).reverse();
+ }
+
+ each(tickPositions, function (pos, i) {
+ xy = xAxis.getPosition(pos, value);
+ ret.push(i ? 'L' : 'M', xy.x, xy.y);
+ });
+
+ }
+ return ret;
+ },
+
+ /**
+ * Find the position for the axis title, by default inside the gauge
+ */
+ getTitlePosition: function () {
+ var center = this.center,
+ chart = this.chart,
+ titleOptions = this.options.title;
+
+ return {
+ x: chart.plotLeft + center[0] + (titleOptions.x || 0),
+ y: chart.plotTop + center[1] - ({ high: 0.5, middle: 0.25, low: 0 }[titleOptions.align] *
+ center[2]) + (titleOptions.y || 0)
+ };
+ }
+
+};
+/*jslint unparam: false*/
+
+/**
+ * Override axisProto.init to mix in special axis instance functions and function overrides
+ */
+wrap(axisProto, 'init', function (proceed, chart, userOptions) {
+ var axis = this,
+ angular = chart.angular,
+ polar = chart.polar,
+ isX = userOptions.isX,
+ isHidden = angular && isX,
+ isCircular,
+ startAngleRad,
+ endAngleRad,
+ options,
+ chartOptions = chart.options,
+ paneIndex = userOptions.pane || 0,
+ pane,
+ paneOptions;
+
+ // Before prototype.init
+ if (angular) {
+ extend(this, isHidden ? hiddenAxisMixin : radialAxisMixin);
+ isCircular = !isX;
+ if (isCircular) {
+ this.defaultRadialOptions = this.defaultRadialGaugeOptions;
+ }
+
+ } else if (polar) {
+ //extend(this, userOptions.isX ? radialAxisMixin : radialAxisMixin);
+ extend(this, radialAxisMixin);
+ isCircular = isX;
+ this.defaultRadialOptions = isX ? this.defaultRadialXOptions : merge(this.defaultYAxisOptions, this.defaultRadialYOptions);
+
+ }
+
+ // Run prototype.init
+ proceed.call(this, chart, userOptions);
+
+ if (!isHidden && (angular || polar)) {
+ options = this.options;
+
+ // Create the pane and set the pane options.
+ if (!chart.panes) {
+ chart.panes = [];
+ }
+ this.pane = pane = chart.panes[paneIndex] = chart.panes[paneIndex] || new Pane(
+ splat(chartOptions.pane)[paneIndex],
+ chart,
+ axis
+ );
+ paneOptions = pane.options;
+
+
+ // Disable certain features on angular and polar axes
+ chart.inverted = false;
+ chartOptions.chart.zoomType = null;
+
+ // Start and end angle options are
+ // given in degrees relative to top, while internal computations are
+ // in radians relative to right (like SVG).
+ this.startAngleRad = startAngleRad = (paneOptions.startAngle - 90) * Math.PI / 180;
+ this.endAngleRad = endAngleRad = (pick(paneOptions.endAngle, paneOptions.startAngle + 360) - 90) * Math.PI / 180;
+ this.offset = options.offset || 0;
+
+ this.isCircular = isCircular;
+
+ // Automatically connect grid lines?
+ if (isCircular && userOptions.max === UNDEFINED && endAngleRad - startAngleRad === 2 * Math.PI) {
+ this.autoConnect = true;
+ }
+ }
+
+});
+
+/**
+ * Add special cases within the Tick class' methods for radial axes.
+ */
+wrap(tickProto, 'getPosition', function (proceed, horiz, pos, tickmarkOffset, old) {
+ var axis = this.axis;
+
+ return axis.getPosition ?
+ axis.getPosition(pos) :
+ proceed.call(this, horiz, pos, tickmarkOffset, old);
+});
+
+/**
+ * Wrap the getLabelPosition function to find the center position of the label
+ * based on the distance option
+ */
+wrap(tickProto, 'getLabelPosition', function (proceed, x, y, label, horiz, labelOptions, tickmarkOffset, index, step) {
+ var axis = this.axis,
+ optionsY = labelOptions.y,
+ ret,
+ align = labelOptions.align,
+ angle = ((axis.translate(this.pos) + axis.startAngleRad + Math.PI / 2) / Math.PI * 180) % 360;
+
+ if (axis.isRadial) {
+ ret = axis.getPosition(this.pos, (axis.center[2] / 2) + pick(labelOptions.distance, -25));
+
+ // Automatically rotated
+ if (labelOptions.rotation === 'auto') {
+ label.attr({
+ rotation: angle
+ });
+
+ // Vertically centered
+ } else if (optionsY === null) {
+ optionsY = axis.chart.renderer.fontMetrics(label.styles.fontSize).b - label.getBBox().height / 2;
+ }
+
+ // Automatic alignment
+ if (align === null) {
+ if (axis.isCircular) {
+ if (angle > 20 && angle < 160) {
+ align = 'left'; // right hemisphere
+ } else if (angle > 200 && angle < 340) {
+ align = 'right'; // left hemisphere
+ } else {
+ align = 'center'; // top or bottom
+ }
+ } else {
+ align = 'center';
+ }
+ label.attr({
+ align: align
+ });
+ }
+
+ ret.x += labelOptions.x;
+ ret.y += optionsY;
+
+ } else {
+ ret = proceed.call(this, x, y, label, horiz, labelOptions, tickmarkOffset, index, step);
+ }
+ return ret;
+});
+
+/**
+ * Wrap the getMarkPath function to return the path of the radial marker
+ */
+wrap(tickProto, 'getMarkPath', function (proceed, x, y, tickLength, tickWidth, horiz, renderer) {
+ var axis = this.axis,
+ endPoint,
+ ret;
+
+ if (axis.isRadial) {
+ endPoint = axis.getPosition(this.pos, axis.center[2] / 2 + tickLength);
+ ret = [
+ 'M',
+ x,
+ y,
+ 'L',
+ endPoint.x,
+ endPoint.y
+ ];
+ } else {
+ ret = proceed.call(this, x, y, tickLength, tickWidth, horiz, renderer);
+ }
+ return ret;
+});/*
+ * The AreaRangeSeries class
+ *
+ */
+
+/**
+ * Extend the default options with map options
+ */
+defaultPlotOptions.arearange = merge(defaultPlotOptions.area, {
+ lineWidth: 1,
+ marker: null,
+ threshold: null,
+ tooltip: {
+ pointFormat: '<span style="color:{series.color}">\u25CF</span> {series.name}: <b>{point.low}</b> - <b>{point.high}</b><br/>'
+ },
+ trackByArea: true,
+ dataLabels: {
+ align: null,
+ verticalAlign: null,
+ xLow: 0,
+ xHigh: 0,
+ yLow: 0,
+ yHigh: 0
+ },
+ states: {
+ hover: {
+ halo: false
+ }
+ }
+});
+
+/**
+ * Add the series type
+ */
+seriesTypes.arearange = extendClass(seriesTypes.area, {
+ type: 'arearange',
+ pointArrayMap: ['low', 'high'],
+ toYData: function (point) {
+ return [point.low, point.high];
+ },
+ pointValKey: 'low',
+
+ /**
+ * Extend getSegments to force null points if the higher value is null. #1703.
+ */
+ getSegments: function () {
+ var series = this;
+
+ each(series.points, function (point) {
+ if (!series.options.connectNulls && (point.low === null || point.high === null)) {
+ point.y = null;
+ } else if (point.low === null && point.high !== null) {
+ point.y = point.high;
+ }
+ });
+ Series.prototype.getSegments.call(this);
+ },
+
+ /**
+ * Translate data points from raw values x and y to plotX and plotY
+ */
+ translate: function () {
+ var series = this,
+ yAxis = series.yAxis;
+
+ seriesTypes.area.prototype.translate.apply(series);
+
+ // Set plotLow and plotHigh
+ each(series.points, function (point) {
+
+ var low = point.low,
+ high = point.high,
+ plotY = point.plotY;
+
+ if (high === null && low === null) {
+ point.y = null;
+ } else if (low === null) {
+ point.plotLow = point.plotY = null;
+ point.plotHigh = yAxis.translate(high, 0, 1, 0, 1);
+ } else if (high === null) {
+ point.plotLow = plotY;
+ point.plotHigh = null;
+ } else {
+ point.plotLow = plotY;
+ point.plotHigh = yAxis.translate(high, 0, 1, 0, 1);
+ }
+ });
+ },
+
+ /**
+ * Extend the line series' getSegmentPath method by applying the segment
+ * path to both lower and higher values of the range
+ */
+ getSegmentPath: function (segment) {
+
+ var lowSegment,
+ highSegment = [],
+ i = segment.length,
+ baseGetSegmentPath = Series.prototype.getSegmentPath,
+ point,
+ linePath,
+ lowerPath,
+ options = this.options,
+ step = options.step,
+ higherPath;
+
+ // Remove nulls from low segment
+ lowSegment = HighchartsAdapter.grep(segment, function (point) {
+ return point.plotLow !== null;
+ });
+
+ // Make a segment with plotX and plotY for the top values
+ while (i--) {
+ point = segment[i];
+ if (point.plotHigh !== null) {
+ highSegment.push({
+ plotX: point.plotX,
+ plotY: point.plotHigh
+ });
+ }
+ }
+
+ // Get the paths
+ lowerPath = baseGetSegmentPath.call(this, lowSegment);
+ if (step) {
+ if (step === true) {
+ step = 'left';
+ }
+ options.step = { left: 'right', center: 'center', right: 'left' }[step]; // swap for reading in getSegmentPath
+ }
+ higherPath = baseGetSegmentPath.call(this, highSegment);
+ options.step = step;
+
+ // Create a line on both top and bottom of the range
+ linePath = [].concat(lowerPath, higherPath);
+
+ // For the area path, we need to change the 'move' statement into 'lineTo' or 'curveTo'
+ higherPath[0] = 'L'; // this probably doesn't work for spline
+ this.areaPath = this.areaPath.concat(lowerPath, higherPath);
+
+ return linePath;
+ },
+
+ /**
+ * Extend the basic drawDataLabels method by running it for both lower and higher
+ * values.
+ */
+ drawDataLabels: function () {
+
+ var data = this.data,
+ length = data.length,
+ i,
+ originalDataLabels = [],
+ seriesProto = Series.prototype,
+ dataLabelOptions = this.options.dataLabels,
+ align = dataLabelOptions.align,
+ point,
+ inverted = this.chart.inverted;
+
+ if (dataLabelOptions.enabled || this._hasPointLabels) {
+
+ // Step 1: set preliminary values for plotY and dataLabel and draw the upper labels
+ i = length;
+ while (i--) {
+ point = data[i];
+
+ // Set preliminary values
+ point.y = point.high;
+ point._plotY = point.plotY;
+ point.plotY = point.plotHigh;
+
+ // Store original data labels and set preliminary label objects to be picked up
+ // in the uber method
+ originalDataLabels[i] = point.dataLabel;
+ point.dataLabel = point.dataLabelUpper;
+
+ // Set the default offset
+ point.below = false;
+ if (inverted) {
+ if (!align) {
+ dataLabelOptions.align = 'left';
+ }
+ dataLabelOptions.x = dataLabelOptions.xHigh;
+ } else {
+ dataLabelOptions.y = dataLabelOptions.yHigh;
+ }
+ }
+
+ if (seriesProto.drawDataLabels) {
+ seriesProto.drawDataLabels.apply(this, arguments); // #1209
+ }
+
+ // Step 2: reorganize and handle data labels for the lower values
+ i = length;
+ while (i--) {
+ point = data[i];
+
+ // Move the generated labels from step 1, and reassign the original data labels
+ point.dataLabelUpper = point.dataLabel;
+ point.dataLabel = originalDataLabels[i];
+
+ // Reset values
+ point.y = point.low;
+ point.plotY = point._plotY;
+
+ // Set the default offset
+ point.below = true;
+ if (inverted) {
+ if (!align) {
+ dataLabelOptions.align = 'right';
+ }
+ dataLabelOptions.x = dataLabelOptions.xLow;
+ } else {
+ dataLabelOptions.y = dataLabelOptions.yLow;
+ }
+ }
+ if (seriesProto.drawDataLabels) {
+ seriesProto.drawDataLabels.apply(this, arguments);
+ }
+ }
+
+ dataLabelOptions.align = align;
+
+ },
+
+ alignDataLabel: function () {
+ seriesTypes.column.prototype.alignDataLabel.apply(this, arguments);
+ },
+
+ getSymbol: noop,
+
+ drawPoints: noop
+});/**
+ * The AreaSplineRangeSeries class
+ */
+
+defaultPlotOptions.areasplinerange = merge(defaultPlotOptions.arearange);
+
+/**
+ * AreaSplineRangeSeries object
+ */
+seriesTypes.areasplinerange = extendClass(seriesTypes.arearange, {
+ type: 'areasplinerange',
+ getPointSpline: seriesTypes.spline.prototype.getPointSpline
+});
+
+(function () {
+
+ var colProto = seriesTypes.column.prototype;
+
+ /**
+ * The ColumnRangeSeries class
+ */
+ defaultPlotOptions.columnrange = merge(defaultPlotOptions.column, defaultPlotOptions.arearange, {
+ lineWidth: 1,
+ pointRange: null
+ });
+
+ /**
+ * ColumnRangeSeries object
+ */
+ seriesTypes.columnrange = extendClass(seriesTypes.arearange, {
+ type: 'columnrange',
+ /**
+ * Translate data points from raw values x and y to plotX and plotY
+ */
+ translate: function () {
+ var series = this,
+ yAxis = series.yAxis,
+ plotHigh;
+
+ colProto.translate.apply(series);
+
+ // Set plotLow and plotHigh
+ each(series.points, function (point) {
+ var shapeArgs = point.shapeArgs,
+ minPointLength = series.options.minPointLength,
+ heightDifference,
+ height,
+ y;
+
+ point.tooltipPos = null; // don't inherit from column
+ point.plotHigh = plotHigh = yAxis.translate(point.high, 0, 1, 0, 1);
+ point.plotLow = point.plotY;
+
+ // adjust shape
+ y = plotHigh;
+ height = point.plotY - plotHigh;
+
+ if (height < minPointLength) {
+ heightDifference = (minPointLength - height);
+ height += heightDifference;
+ y -= heightDifference / 2;
+ }
+ shapeArgs.height = height;
+ shapeArgs.y = y;
+ });
+ },
+ trackerGroups: ['group', 'dataLabelsGroup'],
+ drawGraph: noop,
+ pointAttrToOptions: colProto.pointAttrToOptions,
+ drawPoints: colProto.drawPoints,
+ drawTracker: colProto.drawTracker,
+ animate: colProto.animate,
+ getColumnMetrics: colProto.getColumnMetrics
+ });
+}());
+
+/*
+ * The GaugeSeries class
+ */
+
+
+
+/**
+ * Extend the default options
+ */
+defaultPlotOptions.gauge = merge(defaultPlotOptions.line, {
+ dataLabels: {
+ enabled: true,
+ defer: false,
+ y: 15,
+ borderWidth: 1,
+ borderColor: 'silver',
+ borderRadius: 3,
+ crop: false,
+ style: {
+ fontWeight: 'bold'
+ },
+ verticalAlign: 'top',
+ zIndex: 2
+ },
+ dial: {
+ // radius: '80%',
+ // backgroundColor: 'black',
+ // borderColor: 'silver',
+ // borderWidth: 0,
+ // baseWidth: 3,
+ // topWidth: 1,
+ // baseLength: '70%' // of radius
+ // rearLength: '10%'
+ },
+ pivot: {
+ //radius: 5,
+ //borderWidth: 0
+ //borderColor: 'silver',
+ //backgroundColor: 'black'
+ },
+ tooltip: {
+ headerFormat: ''
+ },
+ showInLegend: false
+});
+
+/**
+ * Extend the point object
+ */
+var GaugePoint = extendClass(Point, {
+ /**
+ * Don't do any hover colors or anything
+ */
+ setState: function (state) {
+ this.state = state;
+ }
+});
+
+
+/**
+ * Add the series type
+ */
+var GaugeSeries = {
+ type: 'gauge',
+ pointClass: GaugePoint,
+
+ // chart.angular will be set to true when a gauge series is present, and this will
+ // be used on the axes
+ angular: true,
+ drawGraph: noop,
+ fixedBox: true,
+ forceDL: true,
+ trackerGroups: ['group', 'dataLabelsGroup'],
+
+ /**
+ * Calculate paths etc
+ */
+ translate: function () {
+
+ var series = this,
+ yAxis = series.yAxis,
+ options = series.options,
+ center = yAxis.center;
+
+ series.generatePoints();
+
+ each(series.points, function (point) {
+
+ var dialOptions = merge(options.dial, point.dial),
+ radius = (pInt(pick(dialOptions.radius, 80)) * center[2]) / 200,
+ baseLength = (pInt(pick(dialOptions.baseLength, 70)) * radius) / 100,
+ rearLength = (pInt(pick(dialOptions.rearLength, 10)) * radius) / 100,
+ baseWidth = dialOptions.baseWidth || 3,
+ topWidth = dialOptions.topWidth || 1,
+ overshoot = options.overshoot,
+ rotation = yAxis.startAngleRad + yAxis.translate(point.y, null, null, null, true);
+
+ // Handle the wrap and overshoot options
+ if (overshoot && typeof overshoot === 'number') {
+ overshoot = overshoot / 180 * Math.PI;
+ rotation = Math.max(yAxis.startAngleRad - overshoot, Math.min(yAxis.endAngleRad + overshoot, rotation));
+
+ } else if (options.wrap === false) {
+ rotation = Math.max(yAxis.startAngleRad, Math.min(yAxis.endAngleRad, rotation));
+ }
+
+ rotation = rotation * 180 / Math.PI;
+
+ point.shapeType = 'path';
+ point.shapeArgs = {
+ d: dialOptions.path || [
+ 'M',
+ -rearLength, -baseWidth / 2,
+ 'L',
+ baseLength, -baseWidth / 2,
+ radius, -topWidth / 2,
+ radius, topWidth / 2,
+ baseLength, baseWidth / 2,
+ -rearLength, baseWidth / 2,
+ 'z'
+ ],
+ translateX: center[0],
+ translateY: center[1],
+ rotation: rotation
+ };
+
+ // Positions for data label
+ point.plotX = center[0];
+ point.plotY = center[1];
+ });
+ },
+
+ /**
+ * Draw the points where each point is one needle
+ */
+ drawPoints: function () {
+
+ var series = this,
+ center = series.yAxis.center,
+ pivot = series.pivot,
+ options = series.options,
+ pivotOptions = options.pivot,
+ renderer = series.chart.renderer;
+
+ each(series.points, function (point) {
+
+ var graphic = point.graphic,
+ shapeArgs = point.shapeArgs,
+ d = shapeArgs.d,
+ dialOptions = merge(options.dial, point.dial); // #1233
+
+ if (graphic) {
+ graphic.animate(shapeArgs);
+ shapeArgs.d = d; // animate alters it
+ } else {
+ point.graphic = renderer[point.shapeType](shapeArgs)
+ .attr({
+ stroke: dialOptions.borderColor || 'none',
+ 'stroke-width': dialOptions.borderWidth || 0,
+ fill: dialOptions.backgroundColor || 'black',
+ rotation: shapeArgs.rotation // required by VML when animation is false
+ })
+ .add(series.group);
+ }
+ });
+
+ // Add or move the pivot
+ if (pivot) {
+ pivot.animate({ // #1235
+ translateX: center[0],
+ translateY: center[1]
+ });
+ } else {
+ series.pivot = renderer.circle(0, 0, pick(pivotOptions.radius, 5))
+ .attr({
+ 'stroke-width': pivotOptions.borderWidth || 0,
+ stroke: pivotOptions.borderColor || 'silver',
+ fill: pivotOptions.backgroundColor || 'black'
+ })
+ .translate(center[0], center[1])
+ .add(series.group);
+ }
+ },
+
+ /**
+ * Animate the arrow up from startAngle
+ */
+ animate: function (init) {
+ var series = this;
+
+ if (!init) {
+ each(series.points, function (point) {
+ var graphic = point.graphic;
+
+ if (graphic) {
+ // start value
+ graphic.attr({
+ rotation: series.yAxis.startAngleRad * 180 / Math.PI
+ });
+
+ // animate
+ graphic.animate({
+ rotation: point.shapeArgs.rotation
+ }, series.options.animation);
+ }
+ });
+
+ // delete this function to allow it only once
+ series.animate = null;
+ }
+ },
+
+ render: function () {
+ this.group = this.plotGroup(
+ 'group',
+ 'series',
+ this.visible ? 'visible' : 'hidden',
+ this.options.zIndex,
+ this.chart.seriesGroup
+ );
+ Series.prototype.render.call(this);
+ this.group.clip(this.chart.clipRect);
+ },
+
+ /**
+ * Extend the basic setData method by running processData and generatePoints immediately,
+ * in order to access the points from the legend.
+ */
+ setData: function (data, redraw) {
+ Series.prototype.setData.call(this, data, false);
+ this.processData();
+ this.generatePoints();
+ if (pick(redraw, true)) {
+ this.chart.redraw();
+ }
+ },
+
+ /**
+ * If the tracking module is loaded, add the point tracker
+ */
+ drawTracker: TrackerMixin && TrackerMixin.drawTrackerPoint
+};
+seriesTypes.gauge = extendClass(seriesTypes.line, GaugeSeries);
+
+/* ****************************************************************************
+ * Start Box plot series code *
+ *****************************************************************************/
+
+// Set default options
+defaultPlotOptions.boxplot = merge(defaultPlotOptions.column, {
+ fillColor: '#FFFFFF',
+ lineWidth: 1,
+ //medianColor: null,
+ medianWidth: 2,
+ states: {
+ hover: {
+ brightness: -0.3
+ }
+ },
+ //stemColor: null,
+ //stemDashStyle: 'solid'
+ //stemWidth: null,
+ threshold: null,
+ tooltip: {
+ pointFormat: '<span style="color:{series.color}">\u25CF</span> <b> {series.name}</b><br/>' +
+ 'Maximum: {point.high}<br/>' +
+ 'Upper quartile: {point.q3}<br/>' +
+ 'Median: {point.median}<br/>' +
+ 'Lower quartile: {point.q1}<br/>' +
+ 'Minimum: {point.low}<br/>'
+
+ },
+ //whiskerColor: null,
+ whiskerLength: '50%',
+ whiskerWidth: 2
+});
+
+// Create the series object
+seriesTypes.boxplot = extendClass(seriesTypes.column, {
+ type: 'boxplot',
+ pointArrayMap: ['low', 'q1', 'median', 'q3', 'high'], // array point configs are mapped to this
+ toYData: function (point) { // return a plain array for speedy calculation
+ return [point.low, point.q1, point.median, point.q3, point.high];
+ },
+ pointValKey: 'high', // defines the top of the tracker
+
+ /**
+ * One-to-one mapping from options to SVG attributes
+ */
+ pointAttrToOptions: { // mapping between SVG attributes and the corresponding options
+ fill: 'fillColor',
+ stroke: 'color',
+ 'stroke-width': 'lineWidth'
+ },
+
+ /**
+ * Disable data labels for box plot
+ */
+ drawDataLabels: noop,
+
+ /**
+ * Translate data points from raw values x and y to plotX and plotY
+ */
+ translate: function () {
+ var series = this,
+ yAxis = series.yAxis,
+ pointArrayMap = series.pointArrayMap;
+
+ seriesTypes.column.prototype.translate.apply(series);
+
+ // do the translation on each point dimension
+ each(series.points, function (point) {
+ each(pointArrayMap, function (key) {
+ if (point[key] !== null) {
+ point[key + 'Plot'] = yAxis.translate(point[key], 0, 1, 0, 1);
+ }
+ });
+ });
+ },
+
+ /**
+ * Draw the data points
+ */
+ drawPoints: function () {
+ var series = this, //state = series.state,
+ points = series.points,
+ options = series.options,
+ chart = series.chart,
+ renderer = chart.renderer,
+ pointAttr,
+ q1Plot,
+ q3Plot,
+ highPlot,
+ lowPlot,
+ medianPlot,
+ crispCorr,
+ crispX,
+ graphic,
+ stemPath,
+ stemAttr,
+ boxPath,
+ whiskersPath,
+ whiskersAttr,
+ medianPath,
+ medianAttr,
+ width,
+ left,
+ right,
+ halfWidth,
+ shapeArgs,
+ color,
+ doQuartiles = series.doQuartiles !== false, // error bar inherits this series type but doesn't do quartiles
+ whiskerLength = parseInt(series.options.whiskerLength, 10) / 100;
+
+
+ each(points, function (point) {
+
+ graphic = point.graphic;
+ shapeArgs = point.shapeArgs; // the box
+ stemAttr = {};
+ whiskersAttr = {};
+ medianAttr = {};
+ color = point.color || series.color;
+
+ if (point.plotY !== UNDEFINED) {
+
+ pointAttr = point.pointAttr[point.selected ? 'selected' : ''];
+
+ // crisp vector coordinates
+ width = shapeArgs.width;
+ left = mathFloor(shapeArgs.x);
+ right = left + width;
+ halfWidth = mathRound(width / 2);
+ //crispX = mathRound(left + halfWidth) + crispCorr;
+ q1Plot = mathFloor(doQuartiles ? point.q1Plot : point.lowPlot);// + crispCorr;
+ q3Plot = mathFloor(doQuartiles ? point.q3Plot : point.lowPlot);// + crispCorr;
+ highPlot = mathFloor(point.highPlot);// + crispCorr;
+ lowPlot = mathFloor(point.lowPlot);// + crispCorr;
+
+ // Stem attributes
+ stemAttr.stroke = point.stemColor || options.stemColor || color;
+ stemAttr['stroke-width'] = pick(point.stemWidth, options.stemWidth, options.lineWidth);
+ stemAttr.dashstyle = point.stemDashStyle || options.stemDashStyle;
+
+ // Whiskers attributes
+ whiskersAttr.stroke = point.whiskerColor || options.whiskerColor || color;
+ whiskersAttr['stroke-width'] = pick(point.whiskerWidth, options.whiskerWidth, options.lineWidth);
+
+ // Median attributes
+ medianAttr.stroke = point.medianColor || options.medianColor || color;
+ medianAttr['stroke-width'] = pick(point.medianWidth, options.medianWidth, options.lineWidth);
+ medianAttr['stroke-linecap'] = 'round'; // #1638
+
+
+ // The stem
+ crispCorr = (stemAttr['stroke-width'] % 2) / 2;
+ crispX = left + halfWidth + crispCorr;
+ stemPath = [
+ // stem up
+ 'M',
+ crispX, q3Plot,
+ 'L',
+ crispX, highPlot,
+
+ // stem down
+ 'M',
+ crispX, q1Plot,
+ 'L',
+ crispX, lowPlot
+ ];
+
+ // The box
+ if (doQuartiles) {
+ crispCorr = (pointAttr['stroke-width'] % 2) / 2;
+ crispX = mathFloor(crispX) + crispCorr;
+ q1Plot = mathFloor(q1Plot) + crispCorr;
+ q3Plot = mathFloor(q3Plot) + crispCorr;
+ left += crispCorr;
+ right += crispCorr;
+ boxPath = [
+ 'M',
+ left, q3Plot,
+ 'L',
+ left, q1Plot,
+ 'L',
+ right, q1Plot,
+ 'L',
+ right, q3Plot,
+ 'L',
+ left, q3Plot,
+ 'z'
+ ];
+ }
+
+ // The whiskers
+ if (whiskerLength) {
+ crispCorr = (whiskersAttr['stroke-width'] % 2) / 2;
+ highPlot = highPlot + crispCorr;
+ lowPlot = lowPlot + crispCorr;
+ whiskersPath = [
+ // High whisker
+ 'M',
+ crispX - halfWidth * whiskerLength,
+ highPlot,
+ 'L',
+ crispX + halfWidth * whiskerLength,
+ highPlot,
+
+ // Low whisker
+ 'M',
+ crispX - halfWidth * whiskerLength,
+ lowPlot,
+ 'L',
+ crispX + halfWidth * whiskerLength,
+ lowPlot
+ ];
+ }
+
+ // The median
+ crispCorr = (medianAttr['stroke-width'] % 2) / 2;
+ medianPlot = mathRound(point.medianPlot) + crispCorr;
+ medianPath = [
+ 'M',
+ left,
+ medianPlot,
+ 'L',
+ right,
+ medianPlot
+ ];
+
+ // Create or update the graphics
+ if (graphic) { // update
+
+ point.stem.animate({ d: stemPath });
+ if (whiskerLength) {
+ point.whiskers.animate({ d: whiskersPath });
+ }
+ if (doQuartiles) {
+ point.box.animate({ d: boxPath });
+ }
+ point.medianShape.animate({ d: medianPath });
+
+ } else { // create new
+ point.graphic = graphic = renderer.g()
+ .add(series.group);
+
+ point.stem = renderer.path(stemPath)
+ .attr(stemAttr)
+ .add(graphic);
+
+ if (whiskerLength) {
+ point.whiskers = renderer.path(whiskersPath)
+ .attr(whiskersAttr)
+ .add(graphic);
+ }
+ if (doQuartiles) {
+ point.box = renderer.path(boxPath)
+ .attr(pointAttr)
+ .add(graphic);
+ }
+ point.medianShape = renderer.path(medianPath)
+ .attr(medianAttr)
+ .add(graphic);
+ }
+ }
+ });
+
+ }
+
+
+});
+
+/* ****************************************************************************
+ * End Box plot series code *
+ *****************************************************************************/
+/* ****************************************************************************
+ * Start error bar series code *
+ *****************************************************************************/
+
+// 1 - set default options
+defaultPlotOptions.errorbar = merge(defaultPlotOptions.boxplot, {
+ color: '#000000',
+ grouping: false,
+ linkedTo: ':previous',
+ tooltip: {
+ pointFormat: '<span style="color:{series.color}">\u25CF</span> {series.name}: <b>{point.low}</b> - <b>{point.high}</b><br/>'
+ },
+ whiskerWidth: null
+});
+
+// 2 - Create the series object
+seriesTypes.errorbar = extendClass(seriesTypes.boxplot, {
+ type: 'errorbar',
+ pointArrayMap: ['low', 'high'], // array point configs are mapped to this
+ toYData: function (point) { // return a plain array for speedy calculation
+ return [point.low, point.high];
+ },
+ pointValKey: 'high', // defines the top of the tracker
+ doQuartiles: false,
+ drawDataLabels: seriesTypes.arearange ? seriesTypes.arearange.prototype.drawDataLabels : noop,
+
+ /**
+ * Get the width and X offset, either on top of the linked series column
+ * or standalone
+ */
+ getColumnMetrics: function () {
+ return (this.linkedParent && this.linkedParent.columnMetrics) ||
+ seriesTypes.column.prototype.getColumnMetrics.call(this);
+ }
+});
+
+/* ****************************************************************************
+ * End error bar series code *
+ *****************************************************************************/
+/* ****************************************************************************
+ * Start Waterfall series code *
+ *****************************************************************************/
+
+// 1 - set default options
+defaultPlotOptions.waterfall = merge(defaultPlotOptions.column, {
+ lineWidth: 1,
+ lineColor: '#333',
+ dashStyle: 'dot',
+ borderColor: '#333',
+ states: {
+ hover: {
+ lineWidthPlus: 0 // #3126
+ }
+ }
+});
+
+
+// 2 - Create the series object
+seriesTypes.waterfall = extendClass(seriesTypes.column, {
+ type: 'waterfall',
+
+ upColorProp: 'fill',
+
+ pointArrayMap: ['low', 'y'],
+
+ pointValKey: 'y',
+
+ /**
+ * Init waterfall series, force stacking
+ */
+ init: function (chart, options) {
+ // force stacking
+ options.stacking = true;
+
+ seriesTypes.column.prototype.init.call(this, chart, options);
+ },
+
+
+ /**
+ * Translate data points from raw values
+ */
+ translate: function () {
+ var series = this,
+ options = series.options,
+ yAxis = series.yAxis,
+ len,
+ i,
+ points,
+ point,
+ shapeArgs,
+ stack,
+ y,
+ previousY,
+ previousIntermediate,
+ stackPoint,
+ threshold = options.threshold,
+ tooltipY;
+
+ // run column series translate
+ seriesTypes.column.prototype.translate.apply(this);
+
+ previousY = previousIntermediate = threshold;
+ points = series.points;
+
+ for (i = 0, len = points.length; i < len; i++) {
+ // cache current point object
+ point = points[i];
+ shapeArgs = point.shapeArgs;
+
+ // get current stack
+ stack = series.getStack(i);
+ stackPoint = stack.points[series.index + ',' + i];
+
+ // override point value for sums
+ if (isNaN(point.y)) {
+ point.y = series.yData[i];
+ }
+
+ // up points
+ y = mathMax(previousY, previousY + point.y) + stackPoint[0];
+ shapeArgs.y = yAxis.translate(y, 0, 1);
+
+
+ // sum points
+ if (point.isSum) {
+ shapeArgs.y = yAxis.translate(stackPoint[1], 0, 1);
+ shapeArgs.height = yAxis.translate(stackPoint[0], 0, 1) - shapeArgs.y;
+
+ } else if (point.isIntermediateSum) {
+ shapeArgs.y = yAxis.translate(stackPoint[1], 0, 1);
+ shapeArgs.height = yAxis.translate(previousIntermediate, 0, 1) - shapeArgs.y;
+ previousIntermediate = stackPoint[1];
+
+ // if it's not the sum point, update previous stack end position
+ } else {
+ previousY += stack.total;
+ }
+
+ // negative points
+ if (shapeArgs.height < 0) {
+ shapeArgs.y += shapeArgs.height;
+ shapeArgs.height *= -1;
+ }
+
+ point.plotY = shapeArgs.y = mathRound(shapeArgs.y) - (series.borderWidth % 2) / 2;
+ shapeArgs.height = mathMax(mathRound(shapeArgs.height), 0.001); // #3151
+ point.yBottom = shapeArgs.y + shapeArgs.height;
+
+ // Correct tooltip placement (#3014)
+ tooltipY = point.plotY + (point.negative ? shapeArgs.height : 0);
+ if (series.chart.inverted) {
+ point.tooltipPos[0] = yAxis.len - tooltipY;
+ } else {
+ point.tooltipPos[1] = tooltipY;
+ }
+
+ }
+ },
+
+ /**
+ * Call default processData then override yData to reflect waterfall's extremes on yAxis
+ */
+ processData: function (force) {
+ var series = this,
+ options = series.options,
+ yData = series.yData,
+ points = series.points,
+ point,
+ dataLength = yData.length,
+ threshold = options.threshold || 0,
+ subSum,
+ sum,
+ dataMin,
+ dataMax,
+ y,
+ i;
+
+ sum = subSum = dataMin = dataMax = threshold;
+
+ for (i = 0; i < dataLength; i++) {
+ y = yData[i];
+ point = points && points[i] ? points[i] : {};
+
+ if (y === "sum" || point.isSum) {
+ yData[i] = sum;
+ } else if (y === "intermediateSum" || point.isIntermediateSum) {
+ yData[i] = subSum;
+ } else {
+ sum += y;
+ subSum += y;
+ }
+ dataMin = Math.min(sum, dataMin);
+ dataMax = Math.max(sum, dataMax);
+ }
+
+ Series.prototype.processData.call(this, force);
+
+ // Record extremes
+ series.dataMin = dataMin;
+ series.dataMax = dataMax;
+ },
+
+ /**
+ * Return y value or string if point is sum
+ */
+ toYData: function (pt) {
+ if (pt.isSum) {
+ return "sum";
+ } else if (pt.isIntermediateSum) {
+ return "intermediateSum";
+ }
+
+ return pt.y;
+ },
+
+ /**
+ * Postprocess mapping between options and SVG attributes
+ */
+ getAttribs: function () {
+ seriesTypes.column.prototype.getAttribs.apply(this, arguments);
+
+ var series = this,
+ options = series.options,
+ stateOptions = options.states,
+ upColor = options.upColor || series.color,
+ hoverColor = Highcharts.Color(upColor).brighten(0.1).get(),
+ seriesDownPointAttr = merge(series.pointAttr),
+ upColorProp = series.upColorProp;
+
+ seriesDownPointAttr[''][upColorProp] = upColor;
+ seriesDownPointAttr.hover[upColorProp] = stateOptions.hover.upColor || hoverColor;
+ seriesDownPointAttr.select[upColorProp] = stateOptions.select.upColor || upColor;
+
+ each(series.points, function (point) {
+ if (point.y > 0 && !point.color) {
+ point.pointAttr = seriesDownPointAttr;
+ point.color = upColor;
+ }
+ });
+ },
+
+ /**
+ * Draw columns' connector lines
+ */
+ getGraphPath: function () {
+
+ var data = this.data,
+ length = data.length,
+ lineWidth = this.options.lineWidth + this.borderWidth,
+ normalizer = mathRound(lineWidth) % 2 / 2,
+ path = [],
+ M = 'M',
+ L = 'L',
+ prevArgs,
+ pointArgs,
+ i,
+ d;
+
+ for (i = 1; i < length; i++) {
+ pointArgs = data[i].shapeArgs;
+ prevArgs = data[i - 1].shapeArgs;
+
+ d = [
+ M,
+ prevArgs.x + prevArgs.width, prevArgs.y + normalizer,
+ L,
+ pointArgs.x, prevArgs.y + normalizer
+ ];
+
+ if (data[i - 1].y < 0) {
+ d[2] += prevArgs.height;
+ d[5] += prevArgs.height;
+ }
+
+ path = path.concat(d);
+ }
+
+ return path;
+ },
+
+ /**
+ * Extremes are recorded in processData
+ */
+ getExtremes: noop,
+
+ /**
+ * Return stack for given index
+ */
+ getStack: function (i) {
+ var axis = this.yAxis,
+ stacks = axis.stacks,
+ key = this.stackKey;
+
+ if (this.processedYData[i] < this.options.threshold) {
+ key = '-' + key;
+ }
+
+ return stacks[key][i];
+ },
+
+ drawGraph: Series.prototype.drawGraph
+});
+
+/* ****************************************************************************
+ * End Waterfall series code *
+ *****************************************************************************/
+/* ****************************************************************************
+ * Start Bubble series code *
+ *****************************************************************************/
+
+// 1 - set default options
+defaultPlotOptions.bubble = merge(defaultPlotOptions.scatter, {
+ dataLabels: {
+ formatter: function () { // #2945
+ return this.point.z;
+ },
+ inside: true,
+ style: {
+ color: 'white',
+ textShadow: '0px 0px 3px black'
+ },
+ verticalAlign: 'middle'
+ },
+ // displayNegative: true,
+ marker: {
+ // fillOpacity: 0.5,
+ lineColor: null, // inherit from series.color
+ lineWidth: 1
+ },
+ minSize: 8,
+ maxSize: '20%',
+ // negativeColor: null,
+ // sizeBy: 'area'
+ states: {
+ hover: {
+ halo: {
+ size: 5
+ }
+ }
+ },
+ tooltip: {
+ pointFormat: '({point.x}, {point.y}), Size: {point.z}'
+ },
+ turboThreshold: 0,
+ zThreshold: 0
+});
+
+var BubblePoint = extendClass(Point, {
+ haloPath: function () {
+ return Point.prototype.haloPath.call(this, this.shapeArgs.r + this.series.options.states.hover.halo.size);
+ }
+});
+
+// 2 - Create the series object
+seriesTypes.bubble = extendClass(seriesTypes.scatter, {
+ type: 'bubble',
+ pointClass: BubblePoint,
+ pointArrayMap: ['y', 'z'],
+ parallelArrays: ['x', 'y', 'z'],
+ trackerGroups: ['group', 'dataLabelsGroup'],
+ bubblePadding: true,
+
+ /**
+ * Mapping between SVG attributes and the corresponding options
+ */
+ pointAttrToOptions: {
+ stroke: 'lineColor',
+ 'stroke-width': 'lineWidth',
+ fill: 'fillColor'
+ },
+
+ /**
+ * Apply the fillOpacity to all fill positions
+ */
+ applyOpacity: function (fill) {
+ var markerOptions = this.options.marker,
+ fillOpacity = pick(markerOptions.fillOpacity, 0.5);
+
+ // When called from Legend.colorizeItem, the fill isn't predefined
+ fill = fill || markerOptions.fillColor || this.color;
+
+ if (fillOpacity !== 1) {
+ fill = Color(fill).setOpacity(fillOpacity).get('rgba');
+ }
+ return fill;
+ },
+
+ /**
+ * Extend the convertAttribs method by applying opacity to the fill
+ */
+ convertAttribs: function () {
+ var obj = Series.prototype.convertAttribs.apply(this, arguments);
+
+ obj.fill = this.applyOpacity(obj.fill);
+
+ return obj;
+ },
+
+ /**
+ * Get the radius for each point based on the minSize, maxSize and each point's Z value. This
+ * must be done prior to Series.translate because the axis needs to add padding in
+ * accordance with the point sizes.
+ */
+ getRadii: function (zMin, zMax, minSize, maxSize) {
+ var len,
+ i,
+ pos,
+ zData = this.zData,
+ radii = [],
+ sizeByArea = this.options.sizeBy !== 'width',
+ zRange;
+
+ // Set the shape type and arguments to be picked up in drawPoints
+ for (i = 0, len = zData.length; i < len; i++) {
+ zRange = zMax - zMin;
+ pos = zRange > 0 ? // relative size, a number between 0 and 1
+ (zData[i] - zMin) / (zMax - zMin) :
+ 0.5;
+ if (sizeByArea && pos >= 0) {
+ pos = Math.sqrt(pos);
+ }
+ radii.push(math.ceil(minSize + pos * (maxSize - minSize)) / 2);
+ }
+ this.radii = radii;
+ },
+
+ /**
+ * Perform animation on the bubbles
+ */
+ animate: function (init) {
+ var animation = this.options.animation;
+
+ if (!init) { // run the animation
+ each(this.points, function (point) {
+ var graphic = point.graphic,
+ shapeArgs = point.shapeArgs;
+
+ if (graphic && shapeArgs) {
+ // start values
+ graphic.attr('r', 1);
+
+ // animate
+ graphic.animate({
+ r: shapeArgs.r
+ }, animation);
+ }
+ });
+
+ // delete this function to allow it only once
+ this.animate = null;
+ }
+ },
+
+ /**
+ * Extend the base translate method to handle bubble size
+ */
+ translate: function () {
+
+ var i,
+ data = this.data,
+ point,
+ radius,
+ radii = this.radii;
+
+ // Run the parent method
+ seriesTypes.scatter.prototype.translate.call(this);
+
+ // Set the shape type and arguments to be picked up in drawPoints
+ i = data.length;
+
+ while (i--) {
+ point = data[i];
+ radius = radii ? radii[i] : 0; // #1737
+
+ // Flag for negativeColor to be applied in Series.js
+ point.negative = point.z < (this.options.zThreshold || 0);
+
+ if (radius >= this.minPxSize / 2) {
+ // Shape arguments
+ point.shapeType = 'circle';
+ point.shapeArgs = {
+ x: point.plotX,
+ y: point.plotY,
+ r: radius
+ };
+
+ // Alignment box for the data label
+ point.dlBox = {
+ x: point.plotX - radius,
+ y: point.plotY - radius,
+ width: 2 * radius,
+ height: 2 * radius
+ };
+ } else { // below zThreshold
+ point.shapeArgs = point.plotY = point.dlBox = UNDEFINED; // #1691
+ }
+ }
+ },
+
+ /**
+ * Get the series' symbol in the legend
+ *
+ * @param {Object} legend The legend object
+ * @param {Object} item The series (this) or point
+ */
+ drawLegendSymbol: function (legend, item) {
+ var radius = pInt(legend.itemStyle.fontSize) / 2;
+
+ item.legendSymbol = this.chart.renderer.circle(
+ radius,
+ legend.baseline - radius,
+ radius
+ ).attr({
+ zIndex: 3
+ }).add(item.legendGroup);
+ item.legendSymbol.isMarker = true;
+
+ },
+
+ drawPoints: seriesTypes.column.prototype.drawPoints,
+ alignDataLabel: seriesTypes.column.prototype.alignDataLabel
+});
+
+/**
+ * Add logic to pad each axis with the amount of pixels
+ * necessary to avoid the bubbles to overflow.
+ */
+Axis.prototype.beforePadding = function () {
+ var axis = this,
+ axisLength = this.len,
+ chart = this.chart,
+ pxMin = 0,
+ pxMax = axisLength,
+ isXAxis = this.isXAxis,
+ dataKey = isXAxis ? 'xData' : 'yData',
+ min = this.min,
+ extremes = {},
+ smallestSize = math.min(chart.plotWidth, chart.plotHeight),
+ zMin = Number.MAX_VALUE,
+ zMax = -Number.MAX_VALUE,
+ range = this.max - min,
+ transA = axisLength / range,
+ activeSeries = [];
+
+ // Handle padding on the second pass, or on redraw
+ if (this.tickPositions) {
+ each(this.series, function (series) {
+
+ var seriesOptions = series.options,
+ zData;
+
+ if (series.bubblePadding && (series.visible || !chart.options.chart.ignoreHiddenSeries)) {
+
+ // Correction for #1673
+ axis.allowZoomOutside = true;
+
+ // Cache it
+ activeSeries.push(series);
+
+ if (isXAxis) { // because X axis is evaluated first
+
+ // For each series, translate the size extremes to pixel values
+ each(['minSize', 'maxSize'], function (prop) {
+ var length = seriesOptions[prop],
+ isPercent = /%$/.test(length);
+
+ length = pInt(length);
+ extremes[prop] = isPercent ?
+ smallestSize * length / 100 :
+ length;
+
+ });
+ series.minPxSize = extremes.minSize;
+
+ // Find the min and max Z
+ zData = series.zData;
+ if (zData.length) { // #1735
+ zMin = pick(seriesOptions.zMin, math.min(
+ zMin,
+ math.max(
+ arrayMin(zData),
+ seriesOptions.displayNegative === false ? seriesOptions.zThreshold : -Number.MAX_VALUE
+ )
+ ));
+ zMax = pick(seriesOptions.zMax, math.max(zMax, arrayMax(zData)));
+ }
+ }
+ }
+ });
+
+ each(activeSeries, function (series) {
+
+ var data = series[dataKey],
+ i = data.length,
+ radius;
+
+ if (isXAxis) {
+ series.getRadii(zMin, zMax, extremes.minSize, extremes.maxSize);
+ }
+
+ if (range > 0) {
+ while (i--) {
+ if (typeof data[i] === 'number') {
+ radius = series.radii[i];
+ pxMin = Math.min(((data[i] - min) * transA) - radius, pxMin);
+ pxMax = Math.max(((data[i] - min) * transA) + radius, pxMax);
+ }
+ }
+ }
+ });
+
+ if (activeSeries.length && range > 0 && pick(this.options.min, this.userMin) === UNDEFINED && pick(this.options.max, this.userMax) === UNDEFINED) {
+ pxMax -= axisLength;
+ transA *= (axisLength + pxMin - pxMax) / axisLength;
+ this.min += pxMin / transA;
+ this.max += pxMax / transA;
+ }
+ }
+};
+
+/* ****************************************************************************
+ * End Bubble series code *
+ *****************************************************************************/
+
+(function () {
+
+ /**
+ * Extensions for polar charts. Additionally, much of the geometry required for polar charts is
+ * gathered in RadialAxes.js.
+ *
+ */
+
+ var seriesProto = Series.prototype,
+ pointerProto = Pointer.prototype,
+ colProto;
+
+ /**
+ * Translate a point's plotX and plotY from the internal angle and radius measures to
+ * true plotX, plotY coordinates
+ */
+ seriesProto.toXY = function (point) {
+ var xy,
+ chart = this.chart,
+ plotX = point.plotX,
+ plotY = point.plotY,
+ clientX;
+
+ // Save rectangular plotX, plotY for later computation
+ point.rectPlotX = plotX;
+ point.rectPlotY = plotY;
+
+ // Record the angle in degrees for use in tooltip
+ clientX = ((plotX / Math.PI * 180) + this.xAxis.pane.options.startAngle) % 360;
+ if (clientX < 0) { // #2665
+ clientX += 360;
+ }
+ point.clientX = clientX;
+
+
+ // Find the polar plotX and plotY
+ xy = this.xAxis.postTranslate(point.plotX, this.yAxis.len - plotY);
+ point.plotX = point.polarPlotX = xy.x - chart.plotLeft;
+ point.plotY = point.polarPlotY = xy.y - chart.plotTop;
+ };
+
+ /**
+ * Order the tooltip points to get the mouse capture ranges correct. #1915.
+ */
+ seriesProto.orderTooltipPoints = function (points) {
+ if (this.chart.polar) {
+ points.sort(function (a, b) {
+ return a.clientX - b.clientX;
+ });
+
+ // Wrap mouse tracking around to capture movement on the segment to the left
+ // of the north point (#1469, #2093).
+ if (points[0]) {
+ points[0].wrappedClientX = points[0].clientX + 360;
+ points.push(points[0]);
+ }
+ }
+ };
+
+
+ /**
+ * Add some special init logic to areas and areasplines
+ */
+ function initArea(proceed, chart, options) {
+ proceed.call(this, chart, options);
+ if (this.chart.polar) {
+
+ /**
+ * Overridden method to close a segment path. While in a cartesian plane the area
+ * goes down to the threshold, in the polar chart it goes to the center.
+ */
+ this.closeSegment = function (path) {
+ var center = this.xAxis.center;
+ path.push(
+ 'L',
+ center[0],
+ center[1]
+ );
+ };
+
+ // Instead of complicated logic to draw an area around the inner area in a stack,
+ // just draw it behind
+ this.closedStacks = true;
+ }
+ }
+
+ if (seriesTypes.area) {
+ wrap(seriesTypes.area.prototype, 'init', initArea);
+ }
+ if (seriesTypes.areaspline) {
+ wrap(seriesTypes.areaspline.prototype, 'init', initArea);
+ }
+
+ if (seriesTypes.spline) {
+ /**
+ * Overridden method for calculating a spline from one point to the next
+ */
+ wrap(seriesTypes.spline.prototype, 'getPointSpline', function (proceed, segment, point, i) {
+
+ var ret,
+ smoothing = 1.5, // 1 means control points midway between points, 2 means 1/3 from the point, 3 is 1/4 etc;
+ denom = smoothing + 1,
+ plotX,
+ plotY,
+ lastPoint,
+ nextPoint,
+ lastX,
+ lastY,
+ nextX,
+ nextY,
+ leftContX,
+ leftContY,
+ rightContX,
+ rightContY,
+ distanceLeftControlPoint,
+ distanceRightControlPoint,
+ leftContAngle,
+ rightContAngle,
+ jointAngle;
+
+
+ if (this.chart.polar) {
+
+ plotX = point.plotX;
+ plotY = point.plotY;
+ lastPoint = segment[i - 1];
+ nextPoint = segment[i + 1];
+
+ // Connect ends
+ if (this.connectEnds) {
+ if (!lastPoint) {
+ lastPoint = segment[segment.length - 2]; // not the last but the second last, because the segment is already connected
+ }
+ if (!nextPoint) {
+ nextPoint = segment[1];
+ }
+ }
+
+ // find control points
+ if (lastPoint && nextPoint) {
+
+ lastX = lastPoint.plotX;
+ lastY = lastPoint.plotY;
+ nextX = nextPoint.plotX;
+ nextY = nextPoint.plotY;
+ leftContX = (smoothing * plotX + lastX) / denom;
+ leftContY = (smoothing * plotY + lastY) / denom;
+ rightContX = (smoothing * plotX + nextX) / denom;
+ rightContY = (smoothing * plotY + nextY) / denom;
+ distanceLeftControlPoint = Math.sqrt(Math.pow(leftContX - plotX, 2) + Math.pow(leftContY - plotY, 2));
+ distanceRightControlPoint = Math.sqrt(Math.pow(rightContX - plotX, 2) + Math.pow(rightContY - plotY, 2));
+ leftContAngle = Math.atan2(leftContY - plotY, leftContX - plotX);
+ rightContAngle = Math.atan2(rightContY - plotY, rightContX - plotX);
+ jointAngle = (Math.PI / 2) + ((leftContAngle + rightContAngle) / 2);
+
+
+ // Ensure the right direction, jointAngle should be in the same quadrant as leftContAngle
+ if (Math.abs(leftContAngle - jointAngle) > Math.PI / 2) {
+ jointAngle -= Math.PI;
+ }
+
+ // Find the corrected control points for a spline straight through the point
+ leftContX = plotX + Math.cos(jointAngle) * distanceLeftControlPoint;
+ leftContY = plotY + Math.sin(jointAngle) * distanceLeftControlPoint;
+ rightContX = plotX + Math.cos(Math.PI + jointAngle) * distanceRightControlPoint;
+ rightContY = plotY + Math.sin(Math.PI + jointAngle) * distanceRightControlPoint;
+
+ // Record for drawing in next point
+ point.rightContX = rightContX;
+ point.rightContY = rightContY;
+
+ }
+
+
+ // moveTo or lineTo
+ if (!i) {
+ ret = ['M', plotX, plotY];
+ } else { // curve from last point to this
+ ret = [
+ 'C',
+ lastPoint.rightContX || lastPoint.plotX,
+ lastPoint.rightContY || lastPoint.plotY,
+ leftContX || plotX,
+ leftContY || plotY,
+ plotX,
+ plotY
+ ];
+ lastPoint.rightContX = lastPoint.rightContY = null; // reset for updating series later
+ }
+
+
+ } else {
+ ret = proceed.call(this, segment, point, i);
+ }
+ return ret;
+ });
+ }
+
+ /**
+ * Extend translate. The plotX and plotY values are computed as if the polar chart were a
+ * cartesian plane, where plotX denotes the angle in radians and (yAxis.len - plotY) is the pixel distance from
+ * center.
+ */
+ wrap(seriesProto, 'translate', function (proceed) {
+
+ // Run uber method
+ proceed.call(this);
+
+ // Postprocess plot coordinates
+ if (this.chart.polar && !this.preventPostTranslate) {
+ var points = this.points,
+ i = points.length;
+ while (i--) {
+ // Translate plotX, plotY from angle and radius to true plot coordinates
+ this.toXY(points[i]);
+ }
+ }
+ });
+
+ /**
+ * Extend getSegmentPath to allow connecting ends across 0 to provide a closed circle in
+ * line-like series.
+ */
+ wrap(seriesProto, 'getSegmentPath', function (proceed, segment) {
+
+ var points = this.points;
+
+ // Connect the path
+ if (this.chart.polar && this.options.connectEnds !== false &&
+ segment[segment.length - 1] === points[points.length - 1] && points[0].y !== null) {
+ this.connectEnds = true; // re-used in splines
+ segment = [].concat(segment, [points[0]]);
+ }
+
+ // Run uber method
+ return proceed.call(this, segment);
+
+ });
+
+
+ function polarAnimate(proceed, init) {
+ var chart = this.chart,
+ animation = this.options.animation,
+ group = this.group,
+ markerGroup = this.markerGroup,
+ center = this.xAxis.center,
+ plotLeft = chart.plotLeft,
+ plotTop = chart.plotTop,
+ attribs;
+
+ // Specific animation for polar charts
+ if (chart.polar) {
+
+ // Enable animation on polar charts only in SVG. In VML, the scaling is different, plus animation
+ // would be so slow it would't matter.
+ if (chart.renderer.isSVG) {
+
+ if (animation === true) {
+ animation = {};
+ }
+
+ // Initialize the animation
+ if (init) {
+
+ // Scale down the group and place it in the center
+ attribs = {
+ translateX: center[0] + plotLeft,
+ translateY: center[1] + plotTop,
+ scaleX: 0.001, // #1499
+ scaleY: 0.001
+ };
+
+ group.attr(attribs);
+ if (markerGroup) {
+ //markerGroup.attrSetters = group.attrSetters;
+ markerGroup.attr(attribs);
+ }
+
+ // Run the animation
+ } else {
+ attribs = {
+ translateX: plotLeft,
+ translateY: plotTop,
+ scaleX: 1,
+ scaleY: 1
+ };
+ group.animate(attribs, animation);
+ if (markerGroup) {
+ markerGroup.animate(attribs, animation);
+ }
+
+ // Delete this function to allow it only once
+ this.animate = null;
+ }
+ }
+
+ // For non-polar charts, revert to the basic animation
+ } else {
+ proceed.call(this, init);
+ }
+ }
+
+ // Define the animate method for regular series
+ wrap(seriesProto, 'animate', polarAnimate);
+
+ /**
+ * Throw in a couple of properties to let setTooltipPoints know we're indexing the points
+ * in degrees (0-360), not plot pixel width.
+ */
+ wrap(seriesProto, 'setTooltipPoints', function (proceed, renew) {
+
+ if (this.chart.polar) {
+ extend(this.xAxis, {
+ tooltipLen: 360 // degrees are the resolution unit of the tooltipPoints array
+ });
+ }
+ // Run uber method
+ return proceed.call(this, renew);
+ });
+
+
+ if (seriesTypes.column) {
+
+ colProto = seriesTypes.column.prototype;
+ /**
+ * Define the animate method for columnseries
+ */
+ wrap(colProto, 'animate', polarAnimate);
+
+
+ /**
+ * Extend the column prototype's translate method
+ */
+ wrap(colProto, 'translate', function (proceed) {
+
+ var xAxis = this.xAxis,
+ len = this.yAxis.len,
+ center = xAxis.center,
+ startAngleRad = xAxis.startAngleRad,
+ renderer = this.chart.renderer,
+ start,
+ points,
+ point,
+ i;
+
+ this.preventPostTranslate = true;
+
+ // Run uber method
+ proceed.call(this);
+
+ // Postprocess plot coordinates
+ if (xAxis.isRadial) {
+ points = this.points;
+ i = points.length;
+ while (i--) {
+ point = points[i];
+ start = point.barX + startAngleRad;
+ point.shapeType = 'path';
+ point.shapeArgs = {
+ d: renderer.symbols.arc(
+ center[0],
+ center[1],
+ len - point.plotY,
+ null,
+ {
+ start: start,
+ end: start + point.pointWidth,
+ innerR: len - pick(point.yBottom, len)
+ }
+ )
+ };
+ // Provide correct plotX, plotY for tooltip
+ this.toXY(point);
+ point.tooltipPos = [point.plotX, point.plotY];
+ point.ttBelow = point.plotY > center[1];
+ }
+ }
+ });
+
+
+ /**
+ * Align column data labels outside the columns. #1199.
+ */
+ wrap(colProto, 'alignDataLabel', function (proceed, point, dataLabel, options, alignTo, isNew) {
+
+ if (this.chart.polar) {
+ var angle = point.rectPlotX / Math.PI * 180,
+ align,
+ verticalAlign;
+
+ // Align nicely outside the perimeter of the columns
+ if (options.align === null) {
+ if (angle > 20 && angle < 160) {
+ align = 'left'; // right hemisphere
+ } else if (angle > 200 && angle < 340) {
+ align = 'right'; // left hemisphere
+ } else {
+ align = 'center'; // top or bottom
+ }
+ options.align = align;
+ }
+ if (options.verticalAlign === null) {
+ if (angle < 45 || angle > 315) {
+ verticalAlign = 'bottom'; // top part
+ } else if (angle > 135 && angle < 225) {
+ verticalAlign = 'top'; // bottom part
+ } else {
+ verticalAlign = 'middle'; // left or right
+ }
+ options.verticalAlign = verticalAlign;
+ }
+
+ seriesProto.alignDataLabel.call(this, point, dataLabel, options, alignTo, isNew);
+ } else {
+ proceed.call(this, point, dataLabel, options, alignTo, isNew);
+ }
+
+ });
+ }
+
+
+ /**
+ * Extend the mouse tracker to return the tooltip position index in terms of
+ * degrees rather than pixels
+ */
+ wrap(pointerProto, 'getIndex', function (proceed, e) {
+ var ret,
+ chart = this.chart,
+ center,
+ x,
+ y;
+
+ if (chart.polar) {
+ center = chart.xAxis[0].center;
+ x = e.chartX - center[0] - chart.plotLeft;
+ y = e.chartY - center[1] - chart.plotTop;
+
+ ret = 180 - Math.round(Math.atan2(x, y) / Math.PI * 180);
+
+ } else {
+
+ // Run uber method
+ ret = proceed.call(this, e);
+ }
+ return ret;
+ });
+
+ /**
+ * Extend getCoordinates to prepare for polar axis values
+ */
+ wrap(pointerProto, 'getCoordinates', function (proceed, e) {
+ var chart = this.chart,
+ ret = {
+ xAxis: [],
+ yAxis: []
+ };
+
+ if (chart.polar) {
+
+ each(chart.axes, function (axis) {
+ var isXAxis = axis.isXAxis,
+ center = axis.center,
+ x = e.chartX - center[0] - chart.plotLeft,
+ y = e.chartY - center[1] - chart.plotTop;
+
+ ret[isXAxis ? 'xAxis' : 'yAxis'].push({
+ axis: axis,
+ value: axis.translate(
+ isXAxis ?
+ Math.PI - Math.atan2(x, y) : // angle
+ Math.sqrt(Math.pow(x, 2) + Math.pow(y, 2)), // distance from center
+ true
+ )
+ });
+ });
+
+ } else {
+ ret = proceed.call(this, e);
+ }
+
+ return ret;
+ });
+
+}());
+
+}(Highcharts));
diff --git a/management/guns-admin/src/main/webapp/static/js/plugins/highcharts/highcharts.js b/management/guns-admin/src/main/webapp/static/js/plugins/highcharts/highcharts.js
new file mode 100644
index 0000000..5c86577
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/static/js/plugins/highcharts/highcharts.js
@@ -0,0 +1,307 @@
+/*
+ Highcharts JS v4.0.3 (2014-07-03)
+
+ (c) 2009-2014 Torstein Honsi
+
+ License: www.highcharts.com/license
+*/
+(function(){function r(a,b){var c;a||(a={});for(c in b)a[c]=b[c];return a}function w(){var a,b=arguments,c,d={},e=function(a,b){var c,d;typeof a!=="object"&&(a={});for(d in b)b.hasOwnProperty(d)&&(c=b[d],a[d]=c&&typeof c==="object"&&Object.prototype.toString.call(c)!=="[object Array]"&&d!=="renderTo"&&typeof c.nodeType!=="number"?e(a[d]||{},c):b[d]);return a};b[0]===!0&&(d=b[1],b=Array.prototype.slice.call(b,2));c=b.length;for(a=0;a<c;a++)d=e(d,b[a]);return d}function z(a,b){return parseInt(a,b||
+10)}function Fa(a){return typeof a==="string"}function da(a){return a&&typeof a==="object"}function La(a){return Object.prototype.toString.call(a)==="[object Array]"}function ia(a){return typeof a==="number"}function za(a){return V.log(a)/V.LN10}function ja(a){return V.pow(10,a)}function ka(a,b){for(var c=a.length;c--;)if(a[c]===b){a.splice(c,1);break}}function s(a){return a!==t&&a!==null}function F(a,b,c){var d,e;if(Fa(b))s(c)?a.setAttribute(b,c):a&&a.getAttribute&&(e=a.getAttribute(b));else if(s(b)&&
+da(b))for(d in b)a.setAttribute(d,b[d]);return e}function ra(a){return La(a)?a:[a]}function p(){var a=arguments,b,c,d=a.length;for(b=0;b<d;b++)if(c=a[b],c!==t&&c!==null)return c}function A(a,b){if(Aa&&!ba&&b&&b.opacity!==t)b.filter="alpha(opacity="+b.opacity*100+")";r(a.style,b)}function $(a,b,c,d,e){a=x.createElement(a);b&&r(a,b);e&&A(a,{padding:0,border:P,margin:0});c&&A(a,c);d&&d.appendChild(a);return a}function la(a,b){var c=function(){return t};c.prototype=new a;r(c.prototype,b);return c}function Ga(a,
+b,c,d){var e=L.lang,a=+a||0,f=b===-1?(a.toString().split(".")[1]||"").length:isNaN(b=Q(b))?2:b,b=c===void 0?e.decimalPoint:c,d=d===void 0?e.thousandsSep:d,e=a<0?"-":"",c=String(z(a=Q(a).toFixed(f))),g=c.length>3?c.length%3:0;return e+(g?c.substr(0,g)+d:"")+c.substr(g).replace(/(\d{3})(?=\d)/g,"$1"+d)+(f?b+Q(a-c).toFixed(f).slice(2):"")}function Ha(a,b){return Array((b||2)+1-String(a).length).join(0)+a}function Ma(a,b,c){var d=a[b];a[b]=function(){var a=Array.prototype.slice.call(arguments);a.unshift(d);
+return c.apply(this,a)}}function Ia(a,b){for(var c="{",d=!1,e,f,g,h,i,j=[];(c=a.indexOf(c))!==-1;){e=a.slice(0,c);if(d){f=e.split(":");g=f.shift().split(".");i=g.length;e=b;for(h=0;h<i;h++)e=e[g[h]];if(f.length)f=f.join(":"),g=/\.([0-9])/,h=L.lang,i=void 0,/f$/.test(f)?(i=(i=f.match(g))?i[1]:-1,e!==null&&(e=Ga(e,i,h.decimalPoint,f.indexOf(",")>-1?h.thousandsSep:""))):e=bb(f,e)}j.push(e);a=a.slice(c+1);c=(d=!d)?"}":"{"}j.push(a);return j.join("")}function lb(a){return V.pow(10,U(V.log(a)/V.LN10))}
+function mb(a,b,c,d){var e,c=p(c,1);e=a/c;b||(b=[1,2,2.5,5,10],d&&d.allowDecimals===!1&&(c===1?b=[1,2,5,10]:c<=0.1&&(b=[1/c])));for(d=0;d<b.length;d++)if(a=b[d],e<=(b[d]+(b[d+1]||b[d]))/2)break;a*=c;return a}function nb(a,b){var c=a.length,d,e;for(e=0;e<c;e++)a[e].ss_i=e;a.sort(function(a,c){d=b(a,c);return d===0?a.ss_i-c.ss_i:d});for(e=0;e<c;e++)delete a[e].ss_i}function Na(a){for(var b=a.length,c=a[0];b--;)a[b]<c&&(c=a[b]);return c}function Ba(a){for(var b=a.length,c=a[0];b--;)a[b]>c&&(c=a[b]);
+return c}function Oa(a,b){for(var c in a)a[c]&&a[c]!==b&&a[c].destroy&&a[c].destroy(),delete a[c]}function Pa(a){cb||(cb=$(Ja));a&&cb.appendChild(a);cb.innerHTML=""}function ea(a){return parseFloat(a.toPrecision(14))}function Qa(a,b){va=p(a,b.animation)}function Ab(){var a=L.global.useUTC,b=a?"getUTC":"get",c=a?"setUTC":"set";Ra=(a&&L.global.timezoneOffset||0)*6E4;db=a?Date.UTC:function(a,b,c,g,h,i){return(new Date(a,b,p(c,1),p(g,0),p(h,0),p(i,0))).getTime()};ob=b+"Minutes";pb=b+"Hours";qb=b+"Day";
+Wa=b+"Date";eb=b+"Month";fb=b+"FullYear";Bb=c+"Minutes";Cb=c+"Hours";rb=c+"Date";Db=c+"Month";Eb=c+"FullYear"}function G(){}function Sa(a,b,c,d){this.axis=a;this.pos=b;this.type=c||"";this.isNew=!0;!c&&!d&&this.addLabel()}function ma(){this.init.apply(this,arguments)}function Xa(){this.init.apply(this,arguments)}function Fb(a,b,c,d,e){var f=a.chart.inverted;this.axis=a;this.isNegative=c;this.options=b;this.x=d;this.total=null;this.points={};this.stack=e;this.alignOptions={align:b.align||(f?c?"left":
+"right":"center"),verticalAlign:b.verticalAlign||(f?"middle":c?"bottom":"top"),y:p(b.y,f?4:c?14:-6),x:p(b.x,f?c?-6:6:0)};this.textAlign=b.textAlign||(f?c?"right":"left":"center")}var t,x=document,H=window,V=Math,v=V.round,U=V.floor,Ka=V.ceil,u=V.max,C=V.min,Q=V.abs,aa=V.cos,fa=V.sin,na=V.PI,Ca=na*2/360,wa=navigator.userAgent,Gb=H.opera,Aa=/msie/i.test(wa)&&!Gb,gb=x.documentMode===8,sb=/AppleWebKit/.test(wa),Ta=/Firefox/.test(wa),Hb=/(Mobile|Android|Windows Phone)/.test(wa),xa="http://www.w3.org/2000/svg",
+ba=!!x.createElementNS&&!!x.createElementNS(xa,"svg").createSVGRect,Nb=Ta&&parseInt(wa.split("Firefox/")[1],10)<4,ga=!ba&&!Aa&&!!x.createElement("canvas").getContext,Ya,Za,Ib={},tb=0,cb,L,bb,va,ub,B,oa,sa=function(){return t},W=[],$a=0,Ja="div",P="none",Ob=/^[0-9]+$/,Pb="stroke-width",db,Ra,ob,pb,qb,Wa,eb,fb,Bb,Cb,rb,Db,Eb,J={},S;H.Highcharts?oa(16,!0):S=H.Highcharts={};bb=function(a,b,c){if(!s(b)||isNaN(b))return"Invalid date";var a=p(a,"%Y-%m-%d %H:%M:%S"),d=new Date(b-Ra),e,f=d[pb](),g=d[qb](),
+h=d[Wa](),i=d[eb](),j=d[fb](),k=L.lang,l=k.weekdays,d=r({a:l[g].substr(0,3),A:l[g],d:Ha(h),e:h,b:k.shortMonths[i],B:k.months[i],m:Ha(i+1),y:j.toString().substr(2,2),Y:j,H:Ha(f),I:Ha(f%12||12),l:f%12||12,M:Ha(d[ob]()),p:f<12?"AM":"PM",P:f<12?"am":"pm",S:Ha(d.getSeconds()),L:Ha(v(b%1E3),3)},S.dateFormats);for(e in d)for(;a.indexOf("%"+e)!==-1;)a=a.replace("%"+e,typeof d[e]==="function"?d[e](b):d[e]);return c?a.substr(0,1).toUpperCase()+a.substr(1):a};oa=function(a,b){var c="Highcharts error #"+a+": www.highcharts.com/errors/"+
+a;if(b)throw c;H.console&&console.log(c)};B={millisecond:1,second:1E3,minute:6E4,hour:36E5,day:864E5,week:6048E5,month:26784E5,year:31556952E3};ub={init:function(a,b,c){var b=b||"",d=a.shift,e=b.indexOf("C")>-1,f=e?7:3,g,b=b.split(" "),c=[].concat(c),h,i,j=function(a){for(g=a.length;g--;)a[g]==="M"&&a.splice(g+1,0,a[g+1],a[g+2],a[g+1],a[g+2])};e&&(j(b),j(c));a.isArea&&(h=b.splice(b.length-6,6),i=c.splice(c.length-6,6));if(d<=c.length/f&&b.length===c.length)for(;d--;)c=[].concat(c).splice(0,f).concat(c);
+a.shift=0;if(b.length)for(a=c.length;b.length<a;)d=[].concat(b).splice(b.length-f,f),e&&(d[f-6]=d[f-2],d[f-5]=d[f-1]),b=b.concat(d);h&&(b=b.concat(h),c=c.concat(i));return[b,c]},step:function(a,b,c,d){var e=[],f=a.length;if(c===1)e=d;else if(f===b.length&&c<1)for(;f--;)d=parseFloat(a[f]),e[f]=isNaN(d)?a[f]:c*parseFloat(b[f]-d)+d;else e=b;return e}};(function(a){H.HighchartsAdapter=H.HighchartsAdapter||a&&{init:function(b){var c=a.fx,d=c.step,e,f=a.Tween,g=f&&f.propHooks;e=a.cssHooks.opacity;a.extend(a.easing,
+{easeOutQuad:function(a,b,c,d,e){return-d*(b/=e)*(b-2)+c}});a.each(["cur","_default","width","height","opacity"],function(a,b){var e=d,k;b==="cur"?e=c.prototype:b==="_default"&&f&&(e=g[b],b="set");(k=e[b])&&(e[b]=function(c){var d,c=a?c:this;if(c.prop!=="align")return d=c.elem,d.attr?d.attr(c.prop,b==="cur"?t:c.now):k.apply(this,arguments)})});Ma(e,"get",function(a,b,c){return b.attr?b.opacity||0:a.call(this,b,c)});e=function(a){var c=a.elem,d;if(!a.started)d=b.init(c,c.d,c.toD),a.start=d[0],a.end=
+d[1],a.started=!0;c.attr("d",b.step(a.start,a.end,a.pos,c.toD))};f?g.d={set:e}:d.d=e;this.each=Array.prototype.forEach?function(a,b){return Array.prototype.forEach.call(a,b)}:function(a,b){var c,d=a.length;for(c=0;c<d;c++)if(b.call(a[c],a[c],c,a)===!1)return c};a.fn.highcharts=function(){var a="Chart",b=arguments,c,d;if(this[0]){Fa(b[0])&&(a=b[0],b=Array.prototype.slice.call(b,1));c=b[0];if(c!==t)c.chart=c.chart||{},c.chart.renderTo=this[0],new S[a](c,b[1]),d=this;c===t&&(d=W[F(this[0],"data-highcharts-chart")])}return d}},
+getScript:a.getScript,inArray:a.inArray,adapterRun:function(b,c){return a(b)[c]()},grep:a.grep,map:function(a,c){for(var d=[],e=0,f=a.length;e<f;e++)d[e]=c.call(a[e],a[e],e,a);return d},offset:function(b){return a(b).offset()},addEvent:function(b,c,d){a(b).bind(c,d)},removeEvent:function(b,c,d){var e=x.removeEventListener?"removeEventListener":"detachEvent";x[e]&&b&&!b[e]&&(b[e]=function(){});a(b).unbind(c,d)},fireEvent:function(b,c,d,e){var f=a.Event(c),g="detached"+c,h;!Aa&&d&&(delete d.layerX,
+delete d.layerY,delete d.returnValue);r(f,d);b[c]&&(b[g]=b[c],b[c]=null);a.each(["preventDefault","stopPropagation"],function(a,b){var c=f[b];f[b]=function(){try{c.call(f)}catch(a){b==="preventDefault"&&(h=!0)}}});a(b).trigger(f);b[g]&&(b[c]=b[g],b[g]=null);e&&!f.isDefaultPrevented()&&!h&&e(f)},washMouseEvent:function(a){var c=a.originalEvent||a;if(c.pageX===t)c.pageX=a.pageX,c.pageY=a.pageY;return c},animate:function(b,c,d){var e=a(b);if(!b.style)b.style={};if(c.d)b.toD=c.d,c.d=1;e.stop();c.opacity!==
+t&&b.attr&&(c.opacity+="px");e.animate(c,d)},stop:function(b){a(b).stop()}}})(H.jQuery);var T=H.HighchartsAdapter,M=T||{};T&&T.init.call(T,ub);var hb=M.adapterRun,Qb=M.getScript,Da=M.inArray,q=M.each,vb=M.grep,Rb=M.offset,Ua=M.map,N=M.addEvent,X=M.removeEvent,K=M.fireEvent,Sb=M.washMouseEvent,ib=M.animate,ab=M.stop,M={enabled:!0,x:0,y:15,style:{color:"#606060",cursor:"default",fontSize:"11px"}};L={colors:"#7cb5ec,#434348,#90ed7d,#f7a35c,#8085e9,#f15c80,#e4d354,#8085e8,#8d4653,#91e8e1".split(","),
+symbols:["circle","diamond","square","triangle","triangle-down"],lang:{loading:"Loading...",months:"January,February,March,April,May,June,July,August,September,October,November,December".split(","),shortMonths:"Jan,Feb,Mar,Apr,May,Jun,Jul,Aug,Sep,Oct,Nov,Dec".split(","),weekdays:"Sunday,Monday,Tuesday,Wednesday,Thursday,Friday,Saturday".split(","),decimalPoint:".",numericSymbols:"k,M,G,T,P,E".split(","),resetZoom:"Reset zoom",resetZoomTitle:"Reset zoom level 1:1",thousandsSep:","},global:{useUTC:!0,
+canvasToolsURL:"http://code.highcharts.com/4.0.3/modules/canvas-tools.js",VMLRadialGradientURL:"http://code.highcharts.com/4.0.3/gfx/vml-radial-gradient.png"},chart:{borderColor:"#4572A7",borderRadius:0,defaultSeriesType:"line",ignoreHiddenSeries:!0,spacing:[10,10,15,10],backgroundColor:"#FFFFFF",plotBorderColor:"#C0C0C0",resetZoomButton:{theme:{zIndex:20},position:{align:"right",x:-10,y:10}}},title:{text:"Chart title",align:"center",margin:15,style:{color:"#333333",fontSize:"18px"}},subtitle:{text:"",
+align:"center",style:{color:"#555555"}},plotOptions:{line:{allowPointSelect:!1,showCheckbox:!1,animation:{duration:1E3},events:{},lineWidth:2,marker:{lineWidth:0,radius:4,lineColor:"#FFFFFF",states:{hover:{enabled:!0,lineWidthPlus:1,radiusPlus:2},select:{fillColor:"#FFFFFF",lineColor:"#000000",lineWidth:2}}},point:{events:{}},dataLabels:w(M,{align:"center",enabled:!1,formatter:function(){return this.y===null?"":Ga(this.y,-1)},verticalAlign:"bottom",y:0}),cropThreshold:300,pointRange:0,states:{hover:{lineWidthPlus:1,
+marker:{},halo:{size:10,opacity:0.25}},select:{marker:{}}},stickyTracking:!0,turboThreshold:1E3}},labels:{style:{position:"absolute",color:"#3E576F"}},legend:{enabled:!0,align:"center",layout:"horizontal",labelFormatter:function(){return this.name},borderColor:"#909090",borderRadius:0,navigation:{activeColor:"#274b6d",inactiveColor:"#CCC"},shadow:!1,itemStyle:{color:"#333333",fontSize:"12px",fontWeight:"bold"},itemHoverStyle:{color:"#000"},itemHiddenStyle:{color:"#CCC"},itemCheckboxStyle:{position:"absolute",
+width:"13px",height:"13px"},symbolPadding:5,verticalAlign:"bottom",x:0,y:0,title:{style:{fontWeight:"bold"}}},loading:{labelStyle:{fontWeight:"bold",position:"relative",top:"45%"},style:{position:"absolute",backgroundColor:"white",opacity:0.5,textAlign:"center"}},tooltip:{enabled:!0,animation:ba,backgroundColor:"rgba(249, 249, 249, .85)",borderWidth:1,borderRadius:3,dateTimeLabelFormats:{millisecond:"%A, %b %e, %H:%M:%S.%L",second:"%A, %b %e, %H:%M:%S",minute:"%A, %b %e, %H:%M",hour:"%A, %b %e, %H:%M",
+day:"%A, %b %e, %Y",week:"Week from %A, %b %e, %Y",month:"%B %Y",year:"%Y"},headerFormat:'<span style="font-size: 10px">{point.key}</span><br/>',pointFormat:'<span style="color:{series.color}">●</span> {series.name}: <b>{point.y}</b><br/>',shadow:!0,snap:Hb?25:10,style:{color:"#333333",cursor:"default",fontSize:"12px",padding:"8px",whiteSpace:"nowrap"}},credits:{enabled:!0,text:"",href:"http://www.highcharts.com",position:{align:"right",x:-10,verticalAlign:"bottom",y:-5},style:{cursor:"pointer",
+color:"#909090",fontSize:"9px"}}};var ca=L.plotOptions,T=ca.line;Ab();var Tb=/rgba\(\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*,\s*([0-9]?(?:\.[0-9]+)?)\s*\)/,Ub=/#([a-fA-F0-9]{2})([a-fA-F0-9]{2})([a-fA-F0-9]{2})/,Vb=/rgb\(\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*\)/,ya=function(a){var b=[],c,d;(function(a){a&&a.stops?d=Ua(a.stops,function(a){return ya(a[1])}):(c=Tb.exec(a))?b=[z(c[1]),z(c[2]),z(c[3]),parseFloat(c[4],10)]:(c=Ub.exec(a))?b=[z(c[1],16),z(c[2],16),z(c[3],
+16),1]:(c=Vb.exec(a))&&(b=[z(c[1]),z(c[2]),z(c[3]),1])})(a);return{get:function(c){var f;d?(f=w(a),f.stops=[].concat(f.stops),q(d,function(a,b){f.stops[b]=[f.stops[b][0],a.get(c)]})):f=b&&!isNaN(b[0])?c==="rgb"?"rgb("+b[0]+","+b[1]+","+b[2]+")":c==="a"?b[3]:"rgba("+b.join(",")+")":a;return f},brighten:function(a){if(d)q(d,function(b){b.brighten(a)});else if(ia(a)&&a!==0){var c;for(c=0;c<3;c++)b[c]+=z(a*255),b[c]<0&&(b[c]=0),b[c]>255&&(b[c]=255)}return this},rgba:b,setOpacity:function(a){b[3]=a;return this}}};
+G.prototype={opacity:1,textProps:"fontSize,fontWeight,fontFamily,color,lineHeight,width,textDecoration,textShadow,HcTextStroke".split(","),init:function(a,b){this.element=b==="span"?$(b):x.createElementNS(xa,b);this.renderer=a},animate:function(a,b,c){b=p(b,va,!0);ab(this);if(b){b=w(b,{});if(c)b.complete=c;ib(this,a,b)}else this.attr(a),c&&c();return this},colorGradient:function(a,b,c){var d=this.renderer,e,f,g,h,i,j,k,l,m,n,o=[];a.linearGradient?f="linearGradient":a.radialGradient&&(f="radialGradient");
+if(f){g=a[f];h=d.gradients;j=a.stops;m=c.radialReference;La(g)&&(a[f]=g={x1:g[0],y1:g[1],x2:g[2],y2:g[3],gradientUnits:"userSpaceOnUse"});f==="radialGradient"&&m&&!s(g.gradientUnits)&&(g=w(g,{cx:m[0]-m[2]/2+g.cx*m[2],cy:m[1]-m[2]/2+g.cy*m[2],r:g.r*m[2],gradientUnits:"userSpaceOnUse"}));for(n in g)n!=="id"&&o.push(n,g[n]);for(n in j)o.push(j[n]);o=o.join(",");h[o]?a=h[o].attr("id"):(g.id=a="highcharts-"+tb++,h[o]=i=d.createElement(f).attr(g).add(d.defs),i.stops=[],q(j,function(a){a[1].indexOf("rgba")===
+0?(e=ya(a[1]),k=e.get("rgb"),l=e.get("a")):(k=a[1],l=1);a=d.createElement("stop").attr({offset:a[0],"stop-color":k,"stop-opacity":l}).add(i);i.stops.push(a)}));c.setAttribute(b,"url("+d.url+"#"+a+")")}},attr:function(a,b){var c,d,e=this.element,f,g=this,h;typeof a==="string"&&b!==t&&(c=a,a={},a[c]=b);if(typeof a==="string")g=(this[a+"Getter"]||this._defaultGetter).call(this,a,e);else{for(c in a){d=a[c];h=!1;this.symbolName&&/^(x|y|width|height|r|start|end|innerR|anchorX|anchorY)/.test(c)&&(f||(this.symbolAttr(a),
+f=!0),h=!0);if(this.rotation&&(c==="x"||c==="y"))this.doTransform=!0;h||(this[c+"Setter"]||this._defaultSetter).call(this,d,c,e);this.shadows&&/^(width|height|visibility|x|y|d|transform|cx|cy|r)$/.test(c)&&this.updateShadows(c,d)}if(this.doTransform)this.updateTransform(),this.doTransform=!1}return g},updateShadows:function(a,b){for(var c=this.shadows,d=c.length;d--;)c[d].setAttribute(a,a==="height"?u(b-(c[d].cutHeight||0),0):a==="d"?this.d:b)},addClass:function(a){var b=this.element,c=F(b,"class")||
+"";c.indexOf(a)===-1&&F(b,"class",c+" "+a);return this},symbolAttr:function(a){var b=this;q("x,y,r,start,end,width,height,innerR,anchorX,anchorY".split(","),function(c){b[c]=p(a[c],b[c])});b.attr({d:b.renderer.symbols[b.symbolName](b.x,b.y,b.width,b.height,b)})},clip:function(a){return this.attr("clip-path",a?"url("+this.renderer.url+"#"+a.id+")":P)},crisp:function(a){var b,c={},d,e=a.strokeWidth||this.strokeWidth||0;d=v(e)%2/2;a.x=U(a.x||this.x||0)+d;a.y=U(a.y||this.y||0)+d;a.width=U((a.width||this.width||
+0)-2*d);a.height=U((a.height||this.height||0)-2*d);a.strokeWidth=e;for(b in a)this[b]!==a[b]&&(this[b]=c[b]=a[b]);return c},css:function(a){var b=this.styles,c={},d=this.element,e,f,g="";e=!b;if(a&&a.color)a.fill=a.color;if(b)for(f in a)a[f]!==b[f]&&(c[f]=a[f],e=!0);if(e){e=this.textWidth=a&&a.width&&d.nodeName.toLowerCase()==="text"&&z(a.width);b&&(a=r(b,c));this.styles=a;e&&(ga||!ba&&this.renderer.forExport)&&delete a.width;if(Aa&&!ba)A(this.element,a);else{b=function(a,b){return"-"+b.toLowerCase()};
+for(f in a)g+=f.replace(/([A-Z])/g,b)+":"+a[f]+";";F(d,"style",g)}e&&this.added&&this.renderer.buildText(this)}return this},on:function(a,b){var c=this,d=c.element;Za&&a==="click"?(d.ontouchstart=function(a){c.touchEventFired=Date.now();a.preventDefault();b.call(d,a)},d.onclick=function(a){(wa.indexOf("Android")===-1||Date.now()-(c.touchEventFired||0)>1100)&&b.call(d,a)}):d["on"+a]=b;return this},setRadialReference:function(a){this.element.radialReference=a;return this},translate:function(a,b){return this.attr({translateX:a,
+translateY:b})},invert:function(){this.inverted=!0;this.updateTransform();return this},updateTransform:function(){var a=this.translateX||0,b=this.translateY||0,c=this.scaleX,d=this.scaleY,e=this.inverted,f=this.rotation,g=this.element;e&&(a+=this.attr("width"),b+=this.attr("height"));a=["translate("+a+","+b+")"];e?a.push("rotate(90) scale(-1,1)"):f&&a.push("rotate("+f+" "+(g.getAttribute("x")||0)+" "+(g.getAttribute("y")||0)+")");(s(c)||s(d))&&a.push("scale("+p(c,1)+" "+p(d,1)+")");a.length&&g.setAttribute("transform",
+a.join(" "))},toFront:function(){var a=this.element;a.parentNode.appendChild(a);return this},align:function(a,b,c){var d,e,f,g,h={};e=this.renderer;f=e.alignedObjects;if(a){if(this.alignOptions=a,this.alignByTranslate=b,!c||Fa(c))this.alignTo=d=c||"renderer",ka(f,this),f.push(this),c=null}else a=this.alignOptions,b=this.alignByTranslate,d=this.alignTo;c=p(c,e[d],e);d=a.align;e=a.verticalAlign;f=(c.x||0)+(a.x||0);g=(c.y||0)+(a.y||0);if(d==="right"||d==="center")f+=(c.width-(a.width||0))/{right:1,center:2}[d];
+h[b?"translateX":"x"]=v(f);if(e==="bottom"||e==="middle")g+=(c.height-(a.height||0))/({bottom:1,middle:2}[e]||1);h[b?"translateY":"y"]=v(g);this[this.placed?"animate":"attr"](h);this.placed=!0;this.alignAttr=h;return this},getBBox:function(){var a=this.bBox,b=this.renderer,c,d,e=this.rotation;c=this.element;var f=this.styles,g=e*Ca;d=this.textStr;var h;if(d===""||Ob.test(d))h="num."+d.toString().length+(f?"|"+f.fontSize+"|"+f.fontFamily:"");h&&(a=b.cache[h]);if(!a){if(c.namespaceURI===xa||b.forExport){try{a=
+c.getBBox?r({},c.getBBox()):{width:c.offsetWidth,height:c.offsetHeight}}catch(i){}if(!a||a.width<0)a={width:0,height:0}}else a=this.htmlGetBBox();if(b.isSVG){c=a.width;d=a.height;if(Aa&&f&&f.fontSize==="11px"&&d.toPrecision(3)==="16.9")a.height=d=14;if(e)a.width=Q(d*fa(g))+Q(c*aa(g)),a.height=Q(d*aa(g))+Q(c*fa(g))}this.bBox=a;h&&(b.cache[h]=a)}return a},show:function(a){return a&&this.element.namespaceURI===xa?(this.element.removeAttribute("visibility"),this):this.attr({visibility:a?"inherit":"visible"})},
+hide:function(){return this.attr({visibility:"hidden"})},fadeOut:function(a){var b=this;b.animate({opacity:0},{duration:a||150,complete:function(){b.hide()}})},add:function(a){var b=this.renderer,c=a||b,d=c.element||b.box,e=this.element,f=this.zIndex,g,h;if(a)this.parentGroup=a;this.parentInverted=a&&a.inverted;this.textStr!==void 0&&b.buildText(this);if(f)c.handleZ=!0,f=z(f);if(c.handleZ){a=d.childNodes;for(g=0;g<a.length;g++)if(b=a[g],c=F(b,"zIndex"),b!==e&&(z(c)>f||!s(f)&&s(c))){d.insertBefore(e,
+b);h=!0;break}}h||d.appendChild(e);this.added=!0;if(this.onAdd)this.onAdd();return this},safeRemoveChild:function(a){var b=a.parentNode;b&&b.removeChild(a)},destroy:function(){var a=this,b=a.element||{},c=a.shadows,d=a.renderer.isSVG&&b.nodeName==="SPAN"&&a.parentGroup,e,f;b.onclick=b.onmouseout=b.onmouseover=b.onmousemove=b.point=null;ab(a);if(a.clipPath)a.clipPath=a.clipPath.destroy();if(a.stops){for(f=0;f<a.stops.length;f++)a.stops[f]=a.stops[f].destroy();a.stops=null}a.safeRemoveChild(b);for(c&&
+q(c,function(b){a.safeRemoveChild(b)});d&&d.div&&d.div.childNodes.length===0;)b=d.parentGroup,a.safeRemoveChild(d.div),delete d.div,d=b;a.alignTo&&ka(a.renderer.alignedObjects,a);for(e in a)delete a[e];return null},shadow:function(a,b,c){var d=[],e,f,g=this.element,h,i,j,k;if(a){i=p(a.width,3);j=(a.opacity||0.15)/i;k=this.parentInverted?"(-1,-1)":"("+p(a.offsetX,1)+", "+p(a.offsetY,1)+")";for(e=1;e<=i;e++){f=g.cloneNode(0);h=i*2+1-2*e;F(f,{isShadow:"true",stroke:a.color||"black","stroke-opacity":j*
+e,"stroke-width":h,transform:"translate"+k,fill:P});if(c)F(f,"height",u(F(f,"height")-h,0)),f.cutHeight=h;b?b.element.appendChild(f):g.parentNode.insertBefore(f,g);d.push(f)}this.shadows=d}return this},xGetter:function(a){this.element.nodeName==="circle"&&(a={x:"cx",y:"cy"}[a]||a);return this._defaultGetter(a)},_defaultGetter:function(a){a=p(this[a],this.element?this.element.getAttribute(a):null,0);/^[\-0-9\.]+$/.test(a)&&(a=parseFloat(a));return a},dSetter:function(a,b,c){a&&a.join&&(a=a.join(" "));
+/(NaN| {2}|^$)/.test(a)&&(a="M 0 0");c.setAttribute(b,a);this[b]=a},dashstyleSetter:function(a){var b;if(a=a&&a.toLowerCase()){a=a.replace("shortdashdotdot","3,1,1,1,1,1,").replace("shortdashdot","3,1,1,1").replace("shortdot","1,1,").replace("shortdash","3,1,").replace("longdash","8,3,").replace(/dot/g,"1,3,").replace("dash","4,3,").replace(/,$/,"").replace("solid",1).split(",");for(b=a.length;b--;)a[b]=z(a[b])*this["stroke-width"];a=a.join(",");this.element.setAttribute("stroke-dasharray",a)}},alignSetter:function(a){this.element.setAttribute("text-anchor",
+{left:"start",center:"middle",right:"end"}[a])},opacitySetter:function(a,b,c){this[b]=a;c.setAttribute(b,a)},titleSetter:function(a){var b=this.element.getElementsByTagName("title")[0];b||(b=x.createElementNS(xa,"title"),this.element.appendChild(b));b.textContent=a},textSetter:function(a){if(a!==this.textStr)delete this.bBox,this.textStr=a,this.added&&this.renderer.buildText(this)},fillSetter:function(a,b,c){typeof a==="string"?c.setAttribute(b,a):a&&this.colorGradient(a,b,c)},zIndexSetter:function(a,
+b,c){c.setAttribute(b,a);this[b]=a},_defaultSetter:function(a,b,c){c.setAttribute(b,a)}};G.prototype.yGetter=G.prototype.xGetter;G.prototype.translateXSetter=G.prototype.translateYSetter=G.prototype.rotationSetter=G.prototype.verticalAlignSetter=G.prototype.scaleXSetter=G.prototype.scaleYSetter=function(a,b){this[b]=a;this.doTransform=!0};G.prototype["stroke-widthSetter"]=G.prototype.strokeSetter=function(a,b,c){this[b]=a;if(this.stroke&&this["stroke-width"])this.strokeWidth=this["stroke-width"],
+G.prototype.fillSetter.call(this,this.stroke,"stroke",c),c.setAttribute("stroke-width",this["stroke-width"]),this.hasStroke=!0;else if(b==="stroke-width"&&a===0&&this.hasStroke)c.removeAttribute("stroke"),this.hasStroke=!1};var ta=function(){this.init.apply(this,arguments)};ta.prototype={Element:G,init:function(a,b,c,d,e){var f=location,g,d=this.createElement("svg").attr({version:"1.1"}).css(this.getStyle(d));g=d.element;a.appendChild(g);a.innerHTML.indexOf("xmlns")===-1&&F(g,"xmlns",xa);this.isSVG=
+!0;this.box=g;this.boxWrapper=d;this.alignedObjects=[];this.url=(Ta||sb)&&x.getElementsByTagName("base").length?f.href.replace(/#.*?$/,"").replace(/([\('\)])/g,"\\$1").replace(/ /g,"%20"):"";this.createElement("desc").add().element.appendChild(x.createTextNode("Created with Highcharts 4.0.3"));this.defs=this.createElement("defs").add();this.forExport=e;this.gradients={};this.cache={};this.setSize(b,c,!1);var h;if(Ta&&a.getBoundingClientRect)this.subPixelFix=b=function(){A(a,{left:0,top:0});h=a.getBoundingClientRect();
+A(a,{left:Ka(h.left)-h.left+"px",top:Ka(h.top)-h.top+"px"})},b(),N(H,"resize",b)},getStyle:function(a){return this.style=r({fontFamily:'"Lucida Grande", "Lucida Sans Unicode", Arial, Helvetica, sans-serif',fontSize:"12px"},a)},isHidden:function(){return!this.boxWrapper.getBBox().width},destroy:function(){var a=this.defs;this.box=null;this.boxWrapper=this.boxWrapper.destroy();Oa(this.gradients||{});this.gradients=null;if(a)this.defs=a.destroy();this.subPixelFix&&X(H,"resize",this.subPixelFix);return this.alignedObjects=
+null},createElement:function(a){var b=new this.Element;b.init(this,a);return b},draw:function(){},buildText:function(a){for(var b=a.element,c=this,d=c.forExport,e=p(a.textStr,"").toString(),f=e.indexOf("<")!==-1,g=b.childNodes,h,i,j=F(b,"x"),k=a.styles,l=a.textWidth,m=k&&k.lineHeight,n=k&&k.HcTextStroke,o=g.length,Y=function(a){return m?z(m):c.fontMetrics(/(px|em)$/.test(a&&a.style.fontSize)?a.style.fontSize:k&&k.fontSize||c.style.fontSize||12,a).h};o--;)b.removeChild(g[o]);!f&&!n&&e.indexOf(" ")===
+-1?b.appendChild(x.createTextNode(e)):(h=/<.*style="([^"]+)".*>/,i=/<.*href="(http[^"]+)".*>/,l&&!a.added&&this.box.appendChild(b),e=f?e.replace(/<(b|strong)>/g,'<span style="font-weight:bold">').replace(/<(i|em)>/g,'<span style="font-style:italic">').replace(/<a/g,"<span").replace(/<\/(b|strong|i|em|a)>/g,"</span>").split(/<br.*?>/g):[e],e[e.length-1]===""&&e.pop(),q(e,function(e,f){var g,m=0,e=e.replace(/<span/g,"|||<span").replace(/<\/span>/g,"</span>|||");g=e.split("|||");q(g,function(e){if(e!==
+""||g.length===1){var n={},o=x.createElementNS(xa,"tspan"),p;h.test(e)&&(p=e.match(h)[1].replace(/(;| |^)color([ :])/,"$1fill$2"),F(o,"style",p));i.test(e)&&!d&&(F(o,"onclick",'location.href="'+e.match(i)[1]+'"'),A(o,{cursor:"pointer"}));e=(e.replace(/<(.|\n)*?>/g,"")||" ").replace(/</g,"<").replace(/>/g,">");if(e!==" "){o.appendChild(x.createTextNode(e));if(m)n.dx=0;else if(f&&j!==null)n.x=j;F(o,n);b.appendChild(o);!m&&f&&(!ba&&d&&A(o,{display:"block"}),F(o,"dy",Y(o)));if(l)for(var e=e.replace(/([^\^])-/g,
+"$1- ").split(" "),n=g.length>1||e.length>1&&k.whiteSpace!=="nowrap",q,E,s=k.HcHeight,u=[],t=Y(o),Kb=1;n&&(e.length||u.length);)delete a.bBox,q=a.getBBox(),E=q.width,!ba&&c.forExport&&(E=c.measureSpanWidth(o.firstChild.data,a.styles)),q=E>l,!q||e.length===1?(e=u,u=[],e.length&&(Kb++,s&&Kb*t>s?(e=["..."],a.attr("title",a.textStr)):(o=x.createElementNS(xa,"tspan"),F(o,{dy:t,x:j}),p&&F(o,"style",p),b.appendChild(o))),E>l&&(l=E)):(o.removeChild(o.firstChild),u.unshift(e.pop())),e.length&&o.appendChild(x.createTextNode(e.join(" ").replace(/- /g,
+"-")));m++}}})}))},button:function(a,b,c,d,e,f,g,h,i){var j=this.label(a,b,c,i,null,null,null,null,"button"),k=0,l,m,n,o,p,q,a={x1:0,y1:0,x2:0,y2:1},e=w({"stroke-width":1,stroke:"#CCCCCC",fill:{linearGradient:a,stops:[[0,"#FEFEFE"],[1,"#F6F6F6"]]},r:2,padding:5,style:{color:"black"}},e);n=e.style;delete e.style;f=w(e,{stroke:"#68A",fill:{linearGradient:a,stops:[[0,"#FFF"],[1,"#ACF"]]}},f);o=f.style;delete f.style;g=w(e,{stroke:"#68A",fill:{linearGradient:a,stops:[[0,"#9BD"],[1,"#CDF"]]}},g);p=g.style;
+delete g.style;h=w(e,{style:{color:"#CCC"}},h);q=h.style;delete h.style;N(j.element,Aa?"mouseover":"mouseenter",function(){k!==3&&j.attr(f).css(o)});N(j.element,Aa?"mouseout":"mouseleave",function(){k!==3&&(l=[e,f,g][k],m=[n,o,p][k],j.attr(l).css(m))});j.setState=function(a){(j.state=k=a)?a===2?j.attr(g).css(p):a===3&&j.attr(h).css(q):j.attr(e).css(n)};return j.on("click",function(){k!==3&&d.call(j)}).attr(e).css(r({cursor:"default"},n))},crispLine:function(a,b){a[1]===a[4]&&(a[1]=a[4]=v(a[1])-b%
+2/2);a[2]===a[5]&&(a[2]=a[5]=v(a[2])+b%2/2);return a},path:function(a){var b={fill:P};La(a)?b.d=a:da(a)&&r(b,a);return this.createElement("path").attr(b)},circle:function(a,b,c){a=da(a)?a:{x:a,y:b,r:c};b=this.createElement("circle");b.xSetter=function(a){this.element.setAttribute("cx",a)};b.ySetter=function(a){this.element.setAttribute("cy",a)};return b.attr(a)},arc:function(a,b,c,d,e,f){if(da(a))b=a.y,c=a.r,d=a.innerR,e=a.start,f=a.end,a=a.x;a=this.symbol("arc",a||0,b||0,c||0,c||0,{innerR:d||0,start:e||
+0,end:f||0});a.r=c;return a},rect:function(a,b,c,d,e,f){var e=da(a)?a.r:e,g=this.createElement("rect"),a=da(a)?a:a===t?{}:{x:a,y:b,width:u(c,0),height:u(d,0)};if(f!==t)a.strokeWidth=f,a=g.crisp(a);if(e)a.r=e;g.rSetter=function(a){F(this.element,{rx:a,ry:a})};return g.attr(a)},setSize:function(a,b,c){var d=this.alignedObjects,e=d.length;this.width=a;this.height=b;for(this.boxWrapper[p(c,!0)?"animate":"attr"]({width:a,height:b});e--;)d[e].align()},g:function(a){var b=this.createElement("g");return s(a)?
+b.attr({"class":"highcharts-"+a}):b},image:function(a,b,c,d,e){var f={preserveAspectRatio:P};arguments.length>1&&r(f,{x:b,y:c,width:d,height:e});f=this.createElement("image").attr(f);f.element.setAttributeNS?f.element.setAttributeNS("http://www.w3.org/1999/xlink","href",a):f.element.setAttribute("hc-svg-href",a);return f},symbol:function(a,b,c,d,e,f){var g,h=this.symbols[a],h=h&&h(v(b),v(c),d,e,f),i=/^url\((.*?)\)$/,j,k;if(h)g=this.path(h),r(g,{symbolName:a,x:b,y:c,width:d,height:e}),f&&r(g,f);else if(i.test(a))k=
+function(a,b){a.element&&(a.attr({width:b[0],height:b[1]}),a.alignByTranslate||a.translate(v((d-b[0])/2),v((e-b[1])/2)))},j=a.match(i)[1],a=Ib[j],g=this.image(j).attr({x:b,y:c}),g.isImg=!0,a?k(g,a):(g.attr({width:0,height:0}),$("img",{onload:function(){k(g,Ib[j]=[this.width,this.height])},src:j}));return g},symbols:{circle:function(a,b,c,d){var e=0.166*c;return["M",a+c/2,b,"C",a+c+e,b,a+c+e,b+d,a+c/2,b+d,"C",a-e,b+d,a-e,b,a+c/2,b,"Z"]},square:function(a,b,c,d){return["M",a,b,"L",a+c,b,a+c,b+d,a,b+
+d,"Z"]},triangle:function(a,b,c,d){return["M",a+c/2,b,"L",a+c,b+d,a,b+d,"Z"]},"triangle-down":function(a,b,c,d){return["M",a,b,"L",a+c,b,a+c/2,b+d,"Z"]},diamond:function(a,b,c,d){return["M",a+c/2,b,"L",a+c,b+d/2,a+c/2,b+d,a,b+d/2,"Z"]},arc:function(a,b,c,d,e){var f=e.start,c=e.r||c||d,g=e.end-0.001,d=e.innerR,h=e.open,i=aa(f),j=fa(f),k=aa(g),g=fa(g),e=e.end-f<na?0:1;return["M",a+c*i,b+c*j,"A",c,c,0,e,1,a+c*k,b+c*g,h?"M":"L",a+d*k,b+d*g,"A",d,d,0,e,0,a+d*i,b+d*j,h?"":"Z"]},callout:function(a,b,c,d,
+e){var f=C(e&&e.r||0,c,d),g=f+6,h=e&&e.anchorX,i=e&&e.anchorY,e=v(e.strokeWidth||0)%2/2;a+=e;b+=e;e=["M",a+f,b,"L",a+c-f,b,"C",a+c,b,a+c,b,a+c,b+f,"L",a+c,b+d-f,"C",a+c,b+d,a+c,b+d,a+c-f,b+d,"L",a+f,b+d,"C",a,b+d,a,b+d,a,b+d-f,"L",a,b+f,"C",a,b,a,b,a+f,b];h&&h>c&&i>b+g&&i<b+d-g?e.splice(13,3,"L",a+c,i-6,a+c+6,i,a+c,i+6,a+c,b+d-f):h&&h<0&&i>b+g&&i<b+d-g?e.splice(33,3,"L",a,i+6,a-6,i,a,i-6,a,b+f):i&&i>d&&h>a+g&&h<a+c-g?e.splice(23,3,"L",h+6,b+d,h,b+d+6,h-6,b+d,a+f,b+d):i&&i<0&&h>a+g&&h<a+c-g&&e.splice(3,
+3,"L",h-6,b,h,b-6,h+6,b,c-f,b);return e}},clipRect:function(a,b,c,d){var e="highcharts-"+tb++,f=this.createElement("clipPath").attr({id:e}).add(this.defs),a=this.rect(a,b,c,d,0).add(f);a.id=e;a.clipPath=f;return a},text:function(a,b,c,d){var e=ga||!ba&&this.forExport,f={};if(d&&!this.forExport)return this.html(a,b,c);f.x=Math.round(b||0);if(c)f.y=Math.round(c);if(a||a===0)f.text=a;a=this.createElement("text").attr(f);e&&a.css({position:"absolute"});if(!d)a.xSetter=function(a,b,c){var d=c.getElementsByTagName("tspan"),
+e,f=c.getAttribute(b),m;for(m=0;m<d.length;m++)e=d[m],e.getAttribute(b)===f&&e.setAttribute(b,a);c.setAttribute(b,a)};return a},fontMetrics:function(a,b){a=a||this.style.fontSize;if(b&&H.getComputedStyle)b=b.element||b,a=H.getComputedStyle(b,"").fontSize;var a=/px/.test(a)?z(a):/em/.test(a)?parseFloat(a)*12:12,c=a<24?a+4:v(a*1.2),d=v(c*0.8);return{h:c,b:d,f:a}},label:function(a,b,c,d,e,f,g,h,i){function j(){var a,b;a=o.element.style;E=(u===void 0||wb===void 0||n.styles.textAlign)&&o.textStr&&o.getBBox();
+n.width=(u||E.width||0)+2*D+jb;n.height=(wb||E.height||0)+2*D;R=D+m.fontMetrics(a&&a.fontSize,o).b;if(z){if(!p)a=v(-I*D),b=h?-R:0,n.box=p=d?m.symbol(d,a,b,n.width,n.height,y):m.rect(a,b,n.width,n.height,0,y[Pb]),p.attr("fill",P).add(n);p.isImg||p.attr(r({width:v(n.width),height:v(n.height)},y));y=null}}function k(){var a=n.styles,a=a&&a.textAlign,b=jb+D*(1-I),c;c=h?0:R;if(s(u)&&E&&(a==="center"||a==="right"))b+={center:0.5,right:1}[a]*(u-E.width);if(b!==o.x||c!==o.y)o.attr("x",b),c!==t&&o.attr("y",
+c);o.x=b;o.y=c}function l(a,b){p?p.attr(a,b):y[a]=b}var m=this,n=m.g(i),o=m.text("",0,0,g).attr({zIndex:1}),p,E,I=0,D=3,jb=0,u,wb,xb,x,Jb=0,y={},R,z;n.onAdd=function(){o.add(n);n.attr({text:a||"",x:b,y:c});p&&s(e)&&n.attr({anchorX:e,anchorY:f})};n.widthSetter=function(a){u=a};n.heightSetter=function(a){wb=a};n.paddingSetter=function(a){s(a)&&a!==D&&(D=a,k())};n.paddingLeftSetter=function(a){s(a)&&a!==jb&&(jb=a,k())};n.alignSetter=function(a){I={left:0,center:0.5,right:1}[a]};n.textSetter=function(a){a!==
+t&&o.textSetter(a);j();k()};n["stroke-widthSetter"]=function(a,b){a&&(z=!0);Jb=a%2/2;l(b,a)};n.strokeSetter=n.fillSetter=n.rSetter=function(a,b){b==="fill"&&a&&(z=!0);l(b,a)};n.anchorXSetter=function(a,b){e=a;l(b,a+Jb-xb)};n.anchorYSetter=function(a,b){f=a;l(b,a-x)};n.xSetter=function(a){n.x=a;I&&(a-=I*((u||E.width)+D));xb=v(a);n.attr("translateX",xb)};n.ySetter=function(a){x=n.y=v(a);n.attr("translateY",x)};var C=n.css;return r(n,{css:function(a){if(a){var b={},a=w(a);q(n.textProps,function(c){a[c]!==
+t&&(b[c]=a[c],delete a[c])});o.css(b)}return C.call(n,a)},getBBox:function(){return{width:E.width+2*D,height:E.height+2*D,x:E.x-D,y:E.y-D}},shadow:function(a){p&&p.shadow(a);return n},destroy:function(){X(n.element,"mouseenter");X(n.element,"mouseleave");o&&(o=o.destroy());p&&(p=p.destroy());G.prototype.destroy.call(n);n=m=j=k=l=null}})}};Ya=ta;r(G.prototype,{htmlCss:function(a){var b=this.element;if(b=a&&b.tagName==="SPAN"&&a.width)delete a.width,this.textWidth=b,this.updateTransform();this.styles=
+r(this.styles,a);A(this.element,a);return this},htmlGetBBox:function(){var a=this.element,b=this.bBox;if(!b){if(a.nodeName==="text")a.style.position="absolute";b=this.bBox={x:a.offsetLeft,y:a.offsetTop,width:a.offsetWidth,height:a.offsetHeight}}return b},htmlUpdateTransform:function(){if(this.added){var a=this.renderer,b=this.element,c=this.translateX||0,d=this.translateY||0,e=this.x||0,f=this.y||0,g=this.textAlign||"left",h={left:0,center:0.5,right:1}[g],i=this.shadows;A(b,{marginLeft:c,marginTop:d});
+i&&q(i,function(a){A(a,{marginLeft:c+1,marginTop:d+1})});this.inverted&&q(b.childNodes,function(c){a.invertChild(c,b)});if(b.tagName==="SPAN"){var j=this.rotation,k,l=z(this.textWidth),m=[j,g,b.innerHTML,this.textWidth].join(",");if(m!==this.cTT){k=a.fontMetrics(b.style.fontSize).b;s(j)&&this.setSpanRotation(j,h,k);i=p(this.elemWidth,b.offsetWidth);if(i>l&&/[ \-]/.test(b.textContent||b.innerText))A(b,{width:l+"px",display:"block",whiteSpace:"normal"}),i=l;this.getSpanCorrection(i,k,h,j,g)}A(b,{left:e+
+(this.xCorr||0)+"px",top:f+(this.yCorr||0)+"px"});if(sb)k=b.offsetHeight;this.cTT=m}}else this.alignOnAdd=!0},setSpanRotation:function(a,b,c){var d={},e=Aa?"-ms-transform":sb?"-webkit-transform":Ta?"MozTransform":Gb?"-o-transform":"";d[e]=d.transform="rotate("+a+"deg)";d[e+(Ta?"Origin":"-origin")]=d.transformOrigin=b*100+"% "+c+"px";A(this.element,d)},getSpanCorrection:function(a,b,c){this.xCorr=-a*c;this.yCorr=-b}});r(ta.prototype,{html:function(a,b,c){var d=this.createElement("span"),e=d.element,
+f=d.renderer;d.textSetter=function(a){a!==e.innerHTML&&delete this.bBox;e.innerHTML=this.textStr=a};d.xSetter=d.ySetter=d.alignSetter=d.rotationSetter=function(a,b){b==="align"&&(b="textAlign");d[b]=a;d.htmlUpdateTransform()};d.attr({text:a,x:v(b),y:v(c)}).css({position:"absolute",whiteSpace:"nowrap",fontFamily:this.style.fontFamily,fontSize:this.style.fontSize});d.css=d.htmlCss;if(f.isSVG)d.add=function(a){var b,c=f.box.parentNode,j=[];if(this.parentGroup=a){if(b=a.div,!b){for(;a;)j.push(a),a=a.parentGroup;
+q(j.reverse(),function(a){var d;b=a.div=a.div||$(Ja,{className:F(a.element,"class")},{position:"absolute",left:(a.translateX||0)+"px",top:(a.translateY||0)+"px"},b||c);d=b.style;r(a,{translateXSetter:function(b,c){d.left=b+"px";a[c]=b;a.doTransform=!0},translateYSetter:function(b,c){d.top=b+"px";a[c]=b;a.doTransform=!0},visibilitySetter:function(a,b){d[b]=a}})})}}else b=c;b.appendChild(e);d.added=!0;d.alignOnAdd&&d.htmlUpdateTransform();return d};return d}});var Z;if(!ba&&!ga){Z={init:function(a,
+b){var c=["<",b,' filled="f" stroked="f"'],d=["position: ","absolute",";"],e=b===Ja;(b==="shape"||e)&&d.push("left:0;top:0;width:1px;height:1px;");d.push("visibility: ",e?"hidden":"visible");c.push(' style="',d.join(""),'"/>');if(b)c=e||b==="span"||b==="img"?c.join(""):a.prepVML(c),this.element=$(c);this.renderer=a},add:function(a){var b=this.renderer,c=this.element,d=b.box,d=a?a.element||a:d;a&&a.inverted&&b.invertChild(c,d);d.appendChild(c);this.added=!0;this.alignOnAdd&&!this.deferUpdateTransform&&
+this.updateTransform();if(this.onAdd)this.onAdd();return this},updateTransform:G.prototype.htmlUpdateTransform,setSpanRotation:function(){var a=this.rotation,b=aa(a*Ca),c=fa(a*Ca);A(this.element,{filter:a?["progid:DXImageTransform.Microsoft.Matrix(M11=",b,", M12=",-c,", M21=",c,", M22=",b,", sizingMethod='auto expand')"].join(""):P})},getSpanCorrection:function(a,b,c,d,e){var f=d?aa(d*Ca):1,g=d?fa(d*Ca):0,h=p(this.elemHeight,this.element.offsetHeight),i;this.xCorr=f<0&&-a;this.yCorr=g<0&&-h;i=f*g<
+0;this.xCorr+=g*b*(i?1-c:c);this.yCorr-=f*b*(d?i?c:1-c:1);e&&e!=="left"&&(this.xCorr-=a*c*(f<0?-1:1),d&&(this.yCorr-=h*c*(g<0?-1:1)),A(this.element,{textAlign:e}))},pathToVML:function(a){for(var b=a.length,c=[];b--;)if(ia(a[b]))c[b]=v(a[b]*10)-5;else if(a[b]==="Z")c[b]="x";else if(c[b]=a[b],a.isArc&&(a[b]==="wa"||a[b]==="at"))c[b+5]===c[b+7]&&(c[b+7]+=a[b+7]>a[b+5]?1:-1),c[b+6]===c[b+8]&&(c[b+8]+=a[b+8]>a[b+6]?1:-1);return c.join(" ")||"x"},clip:function(a){var b=this,c;a?(c=a.members,ka(c,b),c.push(b),
+b.destroyClip=function(){ka(c,b)},a=a.getCSS(b)):(b.destroyClip&&b.destroyClip(),a={clip:gb?"inherit":"rect(auto)"});return b.css(a)},css:G.prototype.htmlCss,safeRemoveChild:function(a){a.parentNode&&Pa(a)},destroy:function(){this.destroyClip&&this.destroyClip();return G.prototype.destroy.apply(this)},on:function(a,b){this.element["on"+a]=function(){var a=H.event;a.target=a.srcElement;b(a)};return this},cutOffPath:function(a,b){var c,a=a.split(/[ ,]/);c=a.length;if(c===9||c===11)a[c-4]=a[c-2]=z(a[c-
+2])-10*b;return a.join(" ")},shadow:function(a,b,c){var d=[],e,f=this.element,g=this.renderer,h,i=f.style,j,k=f.path,l,m,n,o;k&&typeof k.value!=="string"&&(k="x");m=k;if(a){n=p(a.width,3);o=(a.opacity||0.15)/n;for(e=1;e<=3;e++){l=n*2+1-2*e;c&&(m=this.cutOffPath(k.value,l+0.5));j=['<shape isShadow="true" strokeweight="',l,'" filled="false" path="',m,'" coordsize="10 10" style="',f.style.cssText,'" />'];h=$(g.prepVML(j),null,{left:z(i.left)+p(a.offsetX,1),top:z(i.top)+p(a.offsetY,1)});if(c)h.cutOff=
+l+1;j=['<stroke color="',a.color||"black",'" opacity="',o*e,'"/>'];$(g.prepVML(j),null,null,h);b?b.element.appendChild(h):f.parentNode.insertBefore(h,f);d.push(h)}this.shadows=d}return this},updateShadows:sa,setAttr:function(a,b){gb?this.element[a]=b:this.element.setAttribute(a,b)},classSetter:function(a){this.element.className=a},dashstyleSetter:function(a,b,c){(c.getElementsByTagName("stroke")[0]||$(this.renderer.prepVML(["<stroke/>"]),null,null,c))[b]=a||"solid";this[b]=a},dSetter:function(a,b,
+c){var d=this.shadows,a=a||[];this.d=a.join&&a.join(" ");c.path=a=this.pathToVML(a);if(d)for(c=d.length;c--;)d[c].path=d[c].cutOff?this.cutOffPath(a,d[c].cutOff):a;this.setAttr(b,a)},fillSetter:function(a,b,c){var d=c.nodeName;if(d==="SPAN")c.style.color=a;else if(d!=="IMG")c.filled=a!==P,this.setAttr("fillcolor",this.renderer.color(a,c,b,this))},opacitySetter:sa,rotationSetter:function(a,b,c){c=c.style;this[b]=c[b]=a;c.left=-v(fa(a*Ca)+1)+"px";c.top=v(aa(a*Ca))+"px"},strokeSetter:function(a,b,c){this.setAttr("strokecolor",
+this.renderer.color(a,c,b))},"stroke-widthSetter":function(a,b,c){c.stroked=!!a;this[b]=a;ia(a)&&(a+="px");this.setAttr("strokeweight",a)},titleSetter:function(a,b){this.setAttr(b,a)},visibilitySetter:function(a,b,c){a==="inherit"&&(a="visible");this.shadows&&q(this.shadows,function(c){c.style[b]=a});c.nodeName==="DIV"&&(a=a==="hidden"?"-999em":0,gb||(c.style[b]=a?"visible":"hidden"),b="top");c.style[b]=a},xSetter:function(a,b,c){this[b]=a;b==="x"?b="left":b==="y"&&(b="top");this.updateClipping?(this[b]=
+a,this.updateClipping()):c.style[b]=a},zIndexSetter:function(a,b,c){c.style[b]=a}};S.VMLElement=Z=la(G,Z);Z.prototype.ySetter=Z.prototype.widthSetter=Z.prototype.heightSetter=Z.prototype.xSetter;var ha={Element:Z,isIE8:wa.indexOf("MSIE 8.0")>-1,init:function(a,b,c,d){var e;this.alignedObjects=[];d=this.createElement(Ja).css(r(this.getStyle(d),{position:"relative"}));e=d.element;a.appendChild(d.element);this.isVML=!0;this.box=e;this.boxWrapper=d;this.cache={};this.setSize(b,c,!1);if(!x.namespaces.hcv){x.namespaces.add("hcv",
+"urn:schemas-microsoft-com:vml");try{x.createStyleSheet().cssText="hcv\\:fill, hcv\\:path, hcv\\:shape, hcv\\:stroke{ behavior:url(#default#VML); display: inline-block; } "}catch(f){x.styleSheets[0].cssText+="hcv\\:fill, hcv\\:path, hcv\\:shape, hcv\\:stroke{ behavior:url(#default#VML); display: inline-block; } "}}},isHidden:function(){return!this.box.offsetWidth},clipRect:function(a,b,c,d){var e=this.createElement(),f=da(a);return r(e,{members:[],left:(f?a.x:a)+1,top:(f?a.y:b)+1,width:(f?a.width:
+c)-1,height:(f?a.height:d)-1,getCSS:function(a){var b=a.element,c=b.nodeName,a=a.inverted,d=this.top-(c==="shape"?b.offsetTop:0),e=this.left,b=e+this.width,f=d+this.height,d={clip:"rect("+v(a?e:d)+"px,"+v(a?f:b)+"px,"+v(a?b:f)+"px,"+v(a?d:e)+"px)"};!a&&gb&&c==="DIV"&&r(d,{width:b+"px",height:f+"px"});return d},updateClipping:function(){q(e.members,function(a){a.element&&a.css(e.getCSS(a))})}})},color:function(a,b,c,d){var e=this,f,g=/^rgba/,h,i,j=P;a&&a.linearGradient?i="gradient":a&&a.radialGradient&&
+(i="pattern");if(i){var k,l,m=a.linearGradient||a.radialGradient,n,o,p,E,I,D="",a=a.stops,u,s=[],t=function(){h=['<fill colors="'+s.join(",")+'" opacity="',p,'" o:opacity2="',o,'" type="',i,'" ',D,'focus="100%" method="any" />'];$(e.prepVML(h),null,null,b)};n=a[0];u=a[a.length-1];n[0]>0&&a.unshift([0,n[1]]);u[0]<1&&a.push([1,u[1]]);q(a,function(a,b){g.test(a[1])?(f=ya(a[1]),k=f.get("rgb"),l=f.get("a")):(k=a[1],l=1);s.push(a[0]*100+"% "+k);b?(p=l,E=k):(o=l,I=k)});if(c==="fill")if(i==="gradient")c=
+m.x1||m[0]||0,a=m.y1||m[1]||0,n=m.x2||m[2]||0,m=m.y2||m[3]||0,D='angle="'+(90-V.atan((m-a)/(n-c))*180/na)+'"',t();else{var j=m.r,r=j*2,v=j*2,x=m.cx,y=m.cy,R=b.radialReference,w,j=function(){R&&(w=d.getBBox(),x+=(R[0]-w.x)/w.width-0.5,y+=(R[1]-w.y)/w.height-0.5,r*=R[2]/w.width,v*=R[2]/w.height);D='src="'+L.global.VMLRadialGradientURL+'" size="'+r+","+v+'" origin="0.5,0.5" position="'+x+","+y+'" color2="'+I+'" ';t()};d.added?j():d.onAdd=j;j=E}else j=k}else if(g.test(a)&&b.tagName!=="IMG")f=ya(a),h=
+["<",c,' opacity="',f.get("a"),'"/>'],$(this.prepVML(h),null,null,b),j=f.get("rgb");else{j=b.getElementsByTagName(c);if(j.length)j[0].opacity=1,j[0].type="solid";j=a}return j},prepVML:function(a){var b=this.isIE8,a=a.join("");b?(a=a.replace("/>",' xmlns="urn:schemas-microsoft-com:vml" />'),a=a.indexOf('style="')===-1?a.replace("/>",' style="display:inline-block;behavior:url(#default#VML);" />'):a.replace('style="','style="display:inline-block;behavior:url(#default#VML);')):a=a.replace("<","<hcv:");
+return a},text:ta.prototype.html,path:function(a){var b={coordsize:"10 10"};La(a)?b.d=a:da(a)&&r(b,a);return this.createElement("shape").attr(b)},circle:function(a,b,c){var d=this.symbol("circle");if(da(a))c=a.r,b=a.y,a=a.x;d.isCircle=!0;d.r=c;return d.attr({x:a,y:b})},g:function(a){var b;a&&(b={className:"highcharts-"+a,"class":"highcharts-"+a});return this.createElement(Ja).attr(b)},image:function(a,b,c,d,e){var f=this.createElement("img").attr({src:a});arguments.length>1&&f.attr({x:b,y:c,width:d,
+height:e});return f},createElement:function(a){return a==="rect"?this.symbol(a):ta.prototype.createElement.call(this,a)},invertChild:function(a,b){var c=this,d=b.style,e=a.tagName==="IMG"&&a.style;A(a,{flip:"x",left:z(d.width)-(e?z(e.top):1),top:z(d.height)-(e?z(e.left):1),rotation:-90});q(a.childNodes,function(b){c.invertChild(b,a)})},symbols:{arc:function(a,b,c,d,e){var f=e.start,g=e.end,h=e.r||c||d,c=e.innerR,d=aa(f),i=fa(f),j=aa(g),k=fa(g);if(g-f===0)return["x"];f=["wa",a-h,b-h,a+h,b+h,a+h*d,
+b+h*i,a+h*j,b+h*k];e.open&&!c&&f.push("e","M",a,b);f.push("at",a-c,b-c,a+c,b+c,a+c*j,b+c*k,a+c*d,b+c*i,"x","e");f.isArc=!0;return f},circle:function(a,b,c,d,e){e&&(c=d=2*e.r);e&&e.isCircle&&(a-=c/2,b-=d/2);return["wa",a,b,a+c,b+d,a+c,b+d/2,a+c,b+d/2,"e"]},rect:function(a,b,c,d,e){return ta.prototype.symbols[!s(e)||!e.r?"square":"callout"].call(0,a,b,c,d,e)}}};S.VMLRenderer=Z=function(){this.init.apply(this,arguments)};Z.prototype=w(ta.prototype,ha);Ya=Z}ta.prototype.measureSpanWidth=function(a,b){var c=
+x.createElement("span"),d;d=x.createTextNode(a);c.appendChild(d);A(c,b);this.box.appendChild(c);d=c.offsetWidth;Pa(c);return d};var Lb;if(ga)S.CanVGRenderer=Z=function(){xa="http://www.w3.org/1999/xhtml"},Z.prototype.symbols={},Lb=function(){function a(){var a=b.length,d;for(d=0;d<a;d++)b[d]();b=[]}var b=[];return{push:function(c,d){b.length===0&&Qb(d,a);b.push(c)}}}(),Ya=Z;Sa.prototype={addLabel:function(){var a=this.axis,b=a.options,c=a.chart,d=a.horiz,e=a.categories,f=a.names,g=this.pos,h=b.labels,
+i=h.rotation,j=a.tickPositions,d=d&&e&&!h.step&&!h.staggerLines&&!h.rotation&&c.plotWidth/j.length||!d&&(c.margin[3]||c.chartWidth*0.33),k=g===j[0],l=g===j[j.length-1],m,f=e?p(e[g],f[g],g):g,e=this.label,n=j.info;a.isDatetimeAxis&&n&&(m=b.dateTimeLabelFormats[n.higherRanks[g]||n.unitName]);this.isFirst=k;this.isLast=l;b=a.labelFormatter.call({axis:a,chart:c,isFirst:k,isLast:l,dateTimeLabelFormat:m,value:a.isLog?ea(ja(f)):f});g=d&&{width:u(1,v(d-2*(h.padding||10)))+"px"};g=r(g,h.style);if(s(e))e&&
+e.attr({text:b}).css(g);else{m={align:a.labelAlign};if(ia(i))m.rotation=i;if(d&&h.ellipsis)g.HcHeight=a.len/j.length;this.label=e=s(b)&&h.enabled?c.renderer.text(b,0,0,h.useHTML).attr(m).css(g).add(a.labelGroup):null;a.tickBaseline=c.renderer.fontMetrics(h.style.fontSize,e).b;i&&a.side===2&&(a.tickBaseline*=aa(i*Ca))}this.yOffset=e?p(h.y,a.tickBaseline+(a.side===2?8:-(e.getBBox().height/2))):0},getLabelSize:function(){var a=this.label,b=this.axis;return a?a.getBBox()[b.horiz?"height":"width"]:0},
+getLabelSides:function(){var a=this.label.getBBox(),b=this.axis,c=b.horiz,d=b.options.labels,a=c?a.width:a.height,b=c?d.x-a*{left:0,center:0.5,right:1}[b.labelAlign]:0;return[b,c?a+b:a]},handleOverflow:function(a,b){var c=!0,d=this.axis,e=this.isFirst,f=this.isLast,g=d.horiz?b.x:b.y,h=d.reversed,i=d.tickPositions,j=this.getLabelSides(),k=j[0],j=j[1],l,m,n,o=this.label.line||0;l=d.labelEdge;m=d.justifyLabels&&(e||f);l[o]===t||g+k>l[o]?l[o]=g+j:m||(c=!1);if(m){l=(m=d.justifyToPlot)?d.pos:0;m=m?l+d.len:
+d.chart.chartWidth;do a+=e?1:-1,n=d.ticks[i[a]];while(i[a]&&(!n||!n.label||n.label.line!==o));d=n&&n.label.xy&&n.label.xy.x+n.getLabelSides()[e?0:1];e&&!h||f&&h?g+k<l&&(g=l-k,n&&g+j>d&&(c=!1)):g+j>m&&(g=m-j,n&&g+k<d&&(c=!1));b.x=g}return c},getPosition:function(a,b,c,d){var e=this.axis,f=e.chart,g=d&&f.oldChartHeight||f.chartHeight;return{x:a?e.translate(b+c,null,null,d)+e.transB:e.left+e.offset+(e.opposite?(d&&f.oldChartWidth||f.chartWidth)-e.right-e.left:0),y:a?g-e.bottom+e.offset-(e.opposite?e.height:
+0):g-e.translate(b+c,null,null,d)-e.transB}},getLabelPosition:function(a,b,c,d,e,f,g,h){var i=this.axis,j=i.transA,k=i.reversed,l=i.staggerLines,a=a+e.x-(f&&d?f*j*(k?-1:1):0),b=b+this.yOffset-(f&&!d?f*j*(k?1:-1):0);if(l)c.line=g/(h||1)%l,b+=c.line*(i.labelOffset/l);return{x:a,y:b}},getMarkPath:function(a,b,c,d,e,f){return f.crispLine(["M",a,b,"L",a+(e?0:-c),b+(e?c:0)],d)},render:function(a,b,c){var d=this.axis,e=d.options,f=d.chart.renderer,g=d.horiz,h=this.type,i=this.label,j=this.pos,k=e.labels,
+l=this.gridLine,m=h?h+"Grid":"grid",n=h?h+"Tick":"tick",o=e[m+"LineWidth"],q=e[m+"LineColor"],E=e[m+"LineDashStyle"],I=e[n+"Length"],m=e[n+"Width"]||0,D=e[n+"Color"],u=e[n+"Position"],n=this.mark,s=k.step,r=!0,v=d.tickmarkOffset,w=this.getPosition(g,j,v,b),x=w.x,w=w.y,y=g&&x===d.pos+d.len||!g&&w===d.pos?-1:1,c=p(c,1);this.isActive=!0;if(o){j=d.getPlotLinePath(j+v,o*y,b,!0);if(l===t){l={stroke:q,"stroke-width":o};if(E)l.dashstyle=E;if(!h)l.zIndex=1;if(b)l.opacity=0;this.gridLine=l=o?f.path(j).attr(l).add(d.gridGroup):
+null}if(!b&&l&&j)l[this.isNew?"attr":"animate"]({d:j,opacity:c})}if(m&&I)u==="inside"&&(I=-I),d.opposite&&(I=-I),h=this.getMarkPath(x,w,I,m*y,g,f),n?n.animate({d:h,opacity:c}):this.mark=f.path(h).attr({stroke:D,"stroke-width":m,opacity:c}).add(d.axisGroup);if(i&&!isNaN(x))i.xy=w=this.getLabelPosition(x,w,i,g,k,v,a,s),this.isFirst&&!this.isLast&&!p(e.showFirstLabel,1)||this.isLast&&!this.isFirst&&!p(e.showLastLabel,1)?r=!1:!d.isRadial&&!k.step&&!k.rotation&&!b&&c!==0&&(r=this.handleOverflow(a,w)),
+s&&a%s&&(r=!1),r&&!isNaN(w.y)?(w.opacity=c,i[this.isNew?"attr":"animate"](w),this.isNew=!1):i.attr("y",-9999)},destroy:function(){Oa(this,this.axis)}};S.PlotLineOrBand=function(a,b){this.axis=a;if(b)this.options=b,this.id=b.id};S.PlotLineOrBand.prototype={render:function(){var a=this,b=a.axis,c=b.horiz,d=(b.pointRange||0)/2,e=a.options,f=e.label,g=a.label,h=e.width,i=e.to,j=e.from,k=s(j)&&s(i),l=e.value,m=e.dashStyle,n=a.svgElem,o=[],p,q=e.color,I=e.zIndex,D=e.events,r={},t=b.chart.renderer;b.isLog&&
+(j=za(j),i=za(i),l=za(l));if(h){if(o=b.getPlotLinePath(l,h),r={stroke:q,"stroke-width":h},m)r.dashstyle=m}else if(k){j=u(j,b.min-d);i=C(i,b.max+d);o=b.getPlotBandPath(j,i,e);if(q)r.fill=q;if(e.borderWidth)r.stroke=e.borderColor,r["stroke-width"]=e.borderWidth}else return;if(s(I))r.zIndex=I;if(n)if(o)n.animate({d:o},null,n.onGetPath);else{if(n.hide(),n.onGetPath=function(){n.show()},g)a.label=g=g.destroy()}else if(o&&o.length&&(a.svgElem=n=t.path(o).attr(r).add(),D))for(p in d=function(b){n.on(b,function(c){D[b].apply(a,
+[c])})},D)d(p);if(f&&s(f.text)&&o&&o.length&&b.width>0&&b.height>0){f=w({align:c&&k&&"center",x:c?!k&&4:10,verticalAlign:!c&&k&&"middle",y:c?k?16:10:k?6:-4,rotation:c&&!k&&90},f);if(!g){r={align:f.textAlign||f.align,rotation:f.rotation};if(s(I))r.zIndex=I;a.label=g=t.text(f.text,0,0,f.useHTML).attr(r).css(f.style).add()}b=[o[1],o[4],k?o[6]:o[1]];k=[o[2],o[5],k?o[7]:o[2]];o=Na(b);c=Na(k);g.align(f,!1,{x:o,y:c,width:Ba(b)-o,height:Ba(k)-c});g.show()}else g&&g.hide();return a},destroy:function(){ka(this.axis.plotLinesAndBands,
+this);delete this.axis;Oa(this)}};ma.prototype={defaultOptions:{dateTimeLabelFormats:{millisecond:"%H:%M:%S.%L",second:"%H:%M:%S",minute:"%H:%M",hour:"%H:%M",day:"%e. %b",week:"%e. %b",month:"%b '%y",year:"%Y"},endOnTick:!1,gridLineColor:"#C0C0C0",labels:M,lineColor:"#C0D0E0",lineWidth:1,minPadding:0.01,maxPadding:0.01,minorGridLineColor:"#E0E0E0",minorGridLineWidth:1,minorTickColor:"#A0A0A0",minorTickLength:2,minorTickPosition:"outside",startOfWeek:1,startOnTick:!1,tickColor:"#C0D0E0",tickLength:10,
+tickmarkPlacement:"between",tickPixelInterval:100,tickPosition:"outside",tickWidth:1,title:{align:"middle",style:{color:"#707070"}},type:"linear"},defaultYAxisOptions:{endOnTick:!0,gridLineWidth:1,tickPixelInterval:72,showLastLabel:!0,labels:{x:-8,y:3},lineWidth:0,maxPadding:0.05,minPadding:0.05,startOnTick:!0,tickWidth:0,title:{rotation:270,text:"Values"},stackLabels:{enabled:!1,formatter:function(){return Ga(this.total,-1)},style:M.style}},defaultLeftAxisOptions:{labels:{x:-15,y:null},title:{rotation:270}},
+defaultRightAxisOptions:{labels:{x:15,y:null},title:{rotation:90}},defaultBottomAxisOptions:{labels:{x:0,y:null},title:{rotation:0}},defaultTopAxisOptions:{labels:{x:0,y:-15},title:{rotation:0}},init:function(a,b){var c=b.isX;this.horiz=a.inverted?!c:c;this.coll=(this.isXAxis=c)?"xAxis":"yAxis";this.opposite=b.opposite;this.side=b.side||(this.horiz?this.opposite?0:2:this.opposite?1:3);this.setOptions(b);var d=this.options,e=d.type;this.labelFormatter=d.labels.formatter||this.defaultLabelFormatter;
+this.userOptions=b;this.minPixelPadding=0;this.chart=a;this.reversed=d.reversed;this.zoomEnabled=d.zoomEnabled!==!1;this.categories=d.categories||e==="category";this.names=[];this.isLog=e==="logarithmic";this.isDatetimeAxis=e==="datetime";this.isLinked=s(d.linkedTo);this.tickmarkOffset=this.categories&&d.tickmarkPlacement==="between"?0.5:0;this.ticks={};this.labelEdge=[];this.minorTicks={};this.plotLinesAndBands=[];this.alternateBands={};this.len=0;this.minRange=this.userMinRange=d.minRange||d.maxZoom;
+this.range=d.range;this.offset=d.offset||0;this.stacks={};this.oldStacks={};this.min=this.max=null;this.crosshair=p(d.crosshair,ra(a.options.tooltip.crosshairs)[c?0:1],!1);var f,d=this.options.events;Da(this,a.axes)===-1&&(c&&!this.isColorAxis?a.axes.splice(a.xAxis.length,0,this):a.axes.push(this),a[this.coll].push(this));this.series=this.series||[];if(a.inverted&&c&&this.reversed===t)this.reversed=!0;this.removePlotLine=this.removePlotBand=this.removePlotBandOrLine;for(f in d)N(this,f,d[f]);if(this.isLog)this.val2lin=
+za,this.lin2val=ja},setOptions:function(a){this.options=w(this.defaultOptions,this.isXAxis?{}:this.defaultYAxisOptions,[this.defaultTopAxisOptions,this.defaultRightAxisOptions,this.defaultBottomAxisOptions,this.defaultLeftAxisOptions][this.side],w(L[this.coll],a))},defaultLabelFormatter:function(){var a=this.axis,b=this.value,c=a.categories,d=this.dateTimeLabelFormat,e=L.lang.numericSymbols,f=e&&e.length,g,h=a.options.labels.format,a=a.isLog?b:a.tickInterval;if(h)g=Ia(h,this);else if(c)g=b;else if(d)g=
+bb(d,b);else if(f&&a>=1E3)for(;f--&&g===t;)c=Math.pow(1E3,f+1),a>=c&&e[f]!==null&&(g=Ga(b/c,-1)+e[f]);g===t&&(g=Q(b)>=1E4?Ga(b,0):Ga(b,-1,t,""));return g},getSeriesExtremes:function(){var a=this,b=a.chart;a.hasVisibleSeries=!1;a.dataMin=a.dataMax=null;a.buildStacks&&a.buildStacks();q(a.series,function(c){if(c.visible||!b.options.chart.ignoreHiddenSeries){var d;d=c.options.threshold;var e;a.hasVisibleSeries=!0;a.isLog&&d<=0&&(d=null);if(a.isXAxis){if(d=c.xData,d.length)a.dataMin=C(p(a.dataMin,d[0]),
+Na(d)),a.dataMax=u(p(a.dataMax,d[0]),Ba(d))}else{c.getExtremes();e=c.dataMax;c=c.dataMin;if(s(c)&&s(e))a.dataMin=C(p(a.dataMin,c),c),a.dataMax=u(p(a.dataMax,e),e);if(s(d))if(a.dataMin>=d)a.dataMin=d,a.ignoreMinPadding=!0;else if(a.dataMax<d)a.dataMax=d,a.ignoreMaxPadding=!0}}})},translate:function(a,b,c,d,e,f){var g=1,h=0,i=d?this.oldTransA:this.transA,d=d?this.oldMin:this.min,j=this.minPixelPadding,e=(this.options.ordinal||this.isLog&&e)&&this.lin2val;if(!i)i=this.transA;if(c)g*=-1,h=this.len;this.reversed&&
+(g*=-1,h-=g*(this.sector||this.len));b?(a=a*g+h,a-=j,a=a/i+d,e&&(a=this.lin2val(a))):(e&&(a=this.val2lin(a)),f==="between"&&(f=0.5),a=g*(a-d)*i+h+g*j+(ia(f)?i*f*this.pointRange:0));return a},toPixels:function(a,b){return this.translate(a,!1,!this.horiz,null,!0)+(b?0:this.pos)},toValue:function(a,b){return this.translate(a-(b?0:this.pos),!0,!this.horiz,null,!0)},getPlotLinePath:function(a,b,c,d,e){var f=this.chart,g=this.left,h=this.top,i,j,k=c&&f.oldChartHeight||f.chartHeight,l=c&&f.oldChartWidth||
+f.chartWidth,m;i=this.transB;e=p(e,this.translate(a,null,null,c));a=c=v(e+i);i=j=v(k-e-i);if(isNaN(e))m=!0;else if(this.horiz){if(i=h,j=k-this.bottom,a<g||a>g+this.width)m=!0}else if(a=g,c=l-this.right,i<h||i>h+this.height)m=!0;return m&&!d?null:f.renderer.crispLine(["M",a,i,"L",c,j],b||1)},getLinearTickPositions:function(a,b,c){var d,e=ea(U(b/a)*a),f=ea(Ka(c/a)*a),g=[];if(b===c&&ia(b))return[b];for(b=e;b<=f;){g.push(b);b=ea(b+a);if(b===d)break;d=b}return g},getMinorTickPositions:function(){var a=
+this.options,b=this.tickPositions,c=this.minorTickInterval,d=[],e;if(this.isLog){e=b.length;for(a=1;a<e;a++)d=d.concat(this.getLogTickPositions(c,b[a-1],b[a],!0))}else if(this.isDatetimeAxis&&a.minorTickInterval==="auto")d=d.concat(this.getTimeTicks(this.normalizeTimeTickInterval(c),this.min,this.max,a.startOfWeek)),d[0]<this.min&&d.shift();else for(b=this.min+(b[0]-this.min)%c;b<=this.max;b+=c)d.push(b);return d},adjustForMinRange:function(){var a=this.options,b=this.min,c=this.max,d,e=this.dataMax-
+this.dataMin>=this.minRange,f,g,h,i,j;if(this.isXAxis&&this.minRange===t&&!this.isLog)s(a.min)||s(a.max)?this.minRange=null:(q(this.series,function(a){i=a.xData;for(g=j=a.xIncrement?1:i.length-1;g>0;g--)if(h=i[g]-i[g-1],f===t||h<f)f=h}),this.minRange=C(f*5,this.dataMax-this.dataMin));if(c-b<this.minRange){var k=this.minRange;d=(k-c+b)/2;d=[b-d,p(a.min,b-d)];if(e)d[2]=this.dataMin;b=Ba(d);c=[b+k,p(a.max,b+k)];if(e)c[2]=this.dataMax;c=Na(c);c-b<k&&(d[0]=c-k,d[1]=p(a.min,c-k),b=Ba(d))}this.min=b;this.max=
+c},setAxisTranslation:function(a){var b=this,c=b.max-b.min,d=b.axisPointRange||0,e,f=0,g=0,h=b.linkedParent,i=!!b.categories,j=b.transA;if(b.isXAxis||i||d)h?(f=h.minPointOffset,g=h.pointRangePadding):q(b.series,function(a){var h=i?1:b.isXAxis?a.pointRange:b.axisPointRange||0,j=a.options.pointPlacement,n=a.closestPointRange;h>c&&(h=0);d=u(d,h);f=u(f,Fa(j)?0:h/2);g=u(g,j==="on"?0:h);!a.noSharedTooltip&&s(n)&&(e=s(e)?C(e,n):n)}),h=b.ordinalSlope&&e?b.ordinalSlope/e:1,b.minPointOffset=f*=h,b.pointRangePadding=
+g*=h,b.pointRange=C(d,c),b.closestPointRange=e;if(a)b.oldTransA=j;b.translationSlope=b.transA=j=b.len/(c+g||1);b.transB=b.horiz?b.left:b.bottom;b.minPixelPadding=j*f},setTickPositions:function(a){var b=this,c=b.chart,d=b.options,e=d.startOnTick,f=d.endOnTick,g=b.isLog,h=b.isDatetimeAxis,i=b.isXAxis,j=b.isLinked,k=b.options.tickPositioner,l=d.maxPadding,m=d.minPadding,n=d.tickInterval,o=d.minTickInterval,Y=d.tickPixelInterval,E,I=b.categories;j?(b.linkedParent=c[b.coll][d.linkedTo],c=b.linkedParent.getExtremes(),
+b.min=p(c.min,c.dataMin),b.max=p(c.max,c.dataMax),d.type!==b.linkedParent.options.type&&oa(11,1)):(b.min=p(b.userMin,d.min,b.dataMin),b.max=p(b.userMax,d.max,b.dataMax));if(g)!a&&C(b.min,p(b.dataMin,b.min))<=0&&oa(10,1),b.min=ea(za(b.min)),b.max=ea(za(b.max));if(b.range&&s(b.max))b.userMin=b.min=u(b.min,b.max-b.range),b.userMax=b.max,b.range=null;b.beforePadding&&b.beforePadding();b.adjustForMinRange();if(!I&&!b.axisPointRange&&!b.usePercentage&&!j&&s(b.min)&&s(b.max)&&(c=b.max-b.min)){if(!s(d.min)&&
+!s(b.userMin)&&m&&(b.dataMin<0||!b.ignoreMinPadding))b.min-=c*m;if(!s(d.max)&&!s(b.userMax)&&l&&(b.dataMax>0||!b.ignoreMaxPadding))b.max+=c*l}if(ia(d.floor))b.min=u(b.min,d.floor);if(ia(d.ceiling))b.max=C(b.max,d.ceiling);b.min===b.max||b.min===void 0||b.max===void 0?b.tickInterval=1:j&&!n&&Y===b.linkedParent.options.tickPixelInterval?b.tickInterval=b.linkedParent.tickInterval:(b.tickInterval=p(n,I?1:(b.max-b.min)*Y/u(b.len,Y)),!s(n)&&b.len<Y&&!this.isRadial&&!this.isLog&&!I&&e&&f&&(E=!0,b.tickInterval/=
+4));i&&!a&&q(b.series,function(a){a.processData(b.min!==b.oldMin||b.max!==b.oldMax)});b.setAxisTranslation(!0);b.beforeSetTickPositions&&b.beforeSetTickPositions();if(b.postProcessTickInterval)b.tickInterval=b.postProcessTickInterval(b.tickInterval);if(b.pointRange)b.tickInterval=u(b.pointRange,b.tickInterval);if(!n&&b.tickInterval<o)b.tickInterval=o;if(!h&&!g&&!n)b.tickInterval=mb(b.tickInterval,null,lb(b.tickInterval),d);b.minorTickInterval=d.minorTickInterval==="auto"&&b.tickInterval?b.tickInterval/
+5:d.minorTickInterval;b.tickPositions=a=d.tickPositions?[].concat(d.tickPositions):k&&k.apply(b,[b.min,b.max]);if(!a)!b.ordinalPositions&&(b.max-b.min)/b.tickInterval>u(2*b.len,200)&&oa(19,!0),a=h?b.getTimeTicks(b.normalizeTimeTickInterval(b.tickInterval,d.units),b.min,b.max,d.startOfWeek,b.ordinalPositions,b.closestPointRange,!0):g?b.getLogTickPositions(b.tickInterval,b.min,b.max):b.getLinearTickPositions(b.tickInterval,b.min,b.max),E&&a.splice(1,a.length-2),b.tickPositions=a;if(!j)d=a[0],g=a[a.length-
+1],h=b.minPointOffset||0,!e&&!f&&!I&&a.length===2&&a.splice(1,0,(g+d)/2),e?b.min=d:b.min-h>d&&a.shift(),f?b.max=g:b.max+h<g&&a.pop(),a.length===1&&(e=Q(b.max)>1E13?1:0.001,b.min-=e,b.max+=e)},setMaxTicks:function(){var a=this.chart,b=a.maxTicks||{},c=this.tickPositions,d=this._maxTicksKey=[this.coll,this.pos,this.len].join("-");if(!this.isLinked&&!this.isDatetimeAxis&&c&&c.length>(b[d]||0)&&this.options.alignTicks!==!1)b[d]=c.length;a.maxTicks=b},adjustTickAmount:function(){var a=this._maxTicksKey,
+b=this.tickPositions,c=this.chart.maxTicks;if(c&&c[a]&&!this.isDatetimeAxis&&!this.categories&&!this.isLinked&&this.options.alignTicks!==!1&&this.min!==t){var d=this.tickAmount,e=b.length;this.tickAmount=a=c[a];if(e<a){for(;b.length<a;)b.push(ea(b[b.length-1]+this.tickInterval));this.transA*=(e-1)/(a-1);this.max=b[b.length-1]}if(s(d)&&a!==d)this.isDirty=!0}},setScale:function(){var a=this.stacks,b,c,d,e;this.oldMin=this.min;this.oldMax=this.max;this.oldAxisLength=this.len;this.setAxisSize();e=this.len!==
+this.oldAxisLength;q(this.series,function(a){if(a.isDirtyData||a.isDirty||a.xAxis.isDirty)d=!0});if(e||d||this.isLinked||this.forceRedraw||this.userMin!==this.oldUserMin||this.userMax!==this.oldUserMax){if(!this.isXAxis)for(b in a)for(c in a[b])a[b][c].total=null,a[b][c].cum=0;this.forceRedraw=!1;this.getSeriesExtremes();this.setTickPositions();this.oldUserMin=this.userMin;this.oldUserMax=this.userMax;if(!this.isDirty)this.isDirty=e||this.min!==this.oldMin||this.max!==this.oldMax}else if(!this.isXAxis){if(this.oldStacks)a=
+this.stacks=this.oldStacks;for(b in a)for(c in a[b])a[b][c].cum=a[b][c].total}this.setMaxTicks()},setExtremes:function(a,b,c,d,e){var f=this,g=f.chart,c=p(c,!0),e=r(e,{min:a,max:b});K(f,"setExtremes",e,function(){f.userMin=a;f.userMax=b;f.eventArgs=e;f.isDirtyExtremes=!0;c&&g.redraw(d)})},zoom:function(a,b){var c=this.dataMin,d=this.dataMax,e=this.options;this.allowZoomOutside||(s(c)&&a<=C(c,p(e.min,c))&&(a=t),s(d)&&b>=u(d,p(e.max,d))&&(b=t));this.displayBtn=a!==t||b!==t;this.setExtremes(a,b,!1,t,
+{trigger:"zoom"});return!0},setAxisSize:function(){var a=this.chart,b=this.options,c=b.offsetLeft||0,d=this.horiz,e=p(b.width,a.plotWidth-c+(b.offsetRight||0)),f=p(b.height,a.plotHeight),g=p(b.top,a.plotTop),b=p(b.left,a.plotLeft+c),c=/%$/;c.test(f)&&(f=parseInt(f,10)/100*a.plotHeight);c.test(g)&&(g=parseInt(g,10)/100*a.plotHeight+a.plotTop);this.left=b;this.top=g;this.width=e;this.height=f;this.bottom=a.chartHeight-f-g;this.right=a.chartWidth-e-b;this.len=u(d?e:f,0);this.pos=d?b:g},getExtremes:function(){var a=
+this.isLog;return{min:a?ea(ja(this.min)):this.min,max:a?ea(ja(this.max)):this.max,dataMin:this.dataMin,dataMax:this.dataMax,userMin:this.userMin,userMax:this.userMax}},getThreshold:function(a){var b=this.isLog,c=b?ja(this.min):this.min,b=b?ja(this.max):this.max;c>a||a===null?a=c:b<a&&(a=b);return this.translate(a,0,1,0,1)},autoLabelAlign:function(a){a=(p(a,0)-this.side*90+720)%360;return a>15&&a<165?"right":a>195&&a<345?"left":"center"},getOffset:function(){var a=this,b=a.chart,c=b.renderer,d=a.options,
+e=a.tickPositions,f=a.ticks,g=a.horiz,h=a.side,i=b.inverted?[1,0,3,2][h]:h,j,k,l=0,m,n=0,o=d.title,Y=d.labels,E=0,I=b.axisOffset,b=b.clipOffset,D=[-1,1,1,-1][h],r,v=1,w=p(Y.maxStaggerLines,5),x,z,C,y,R;a.hasData=j=a.hasVisibleSeries||s(a.min)&&s(a.max)&&!!e;a.showAxis=k=j||p(d.showEmpty,!0);a.staggerLines=a.horiz&&Y.staggerLines;if(!a.axisGroup)a.gridGroup=c.g("grid").attr({zIndex:d.gridZIndex||1}).add(),a.axisGroup=c.g("axis").attr({zIndex:d.zIndex||2}).add(),a.labelGroup=c.g("axis-labels").attr({zIndex:Y.zIndex||
+7}).addClass("highcharts-"+a.coll.toLowerCase()+"-labels").add();if(j||a.isLinked){a.labelAlign=p(Y.align||a.autoLabelAlign(Y.rotation));q(e,function(b){f[b]?f[b].addLabel():f[b]=new Sa(a,b)});if(a.horiz&&!a.staggerLines&&w&&!Y.rotation){for(j=a.reversed?[].concat(e).reverse():e;v<w;){x=[];z=!1;for(r=0;r<j.length;r++)C=j[r],y=(y=f[C].label&&f[C].label.getBBox())?y.width:0,R=r%v,y&&(C=a.translate(C),x[R]!==t&&C<x[R]&&(z=!0),x[R]=C+y);if(z)v++;else break}if(v>1)a.staggerLines=v}q(e,function(b){if(h===
+0||h===2||{1:"left",3:"right"}[h]===a.labelAlign)E=u(f[b].getLabelSize(),E)});if(a.staggerLines)E*=a.staggerLines,a.labelOffset=E}else for(r in f)f[r].destroy(),delete f[r];if(o&&o.text&&o.enabled!==!1){if(!a.axisTitle)a.axisTitle=c.text(o.text,0,0,o.useHTML).attr({zIndex:7,rotation:o.rotation||0,align:o.textAlign||{low:"left",middle:"center",high:"right"}[o.align]}).addClass("highcharts-"+this.coll.toLowerCase()+"-title").css(o.style).add(a.axisGroup),a.axisTitle.isNew=!0;if(k)l=a.axisTitle.getBBox()[g?
+"height":"width"],m=o.offset,n=s(m)?0:p(o.margin,g?5:10);a.axisTitle[k?"show":"hide"]()}a.offset=D*p(d.offset,I[h]);c=h===2?a.tickBaseline:0;g=E+n+(E&&D*(g?p(Y.y,a.tickBaseline+8):Y.x)-c);a.axisTitleMargin=p(m,g);I[h]=u(I[h],a.axisTitleMargin+l+D*a.offset,g);b[i]=u(b[i],U(d.lineWidth/2)*2)},getLinePath:function(a){var b=this.chart,c=this.opposite,d=this.offset,e=this.horiz,f=this.left+(c?this.width:0)+d,d=b.chartHeight-this.bottom-(c?this.height:0)+d;c&&(a*=-1);return b.renderer.crispLine(["M",e?
+this.left:f,e?d:this.top,"L",e?b.chartWidth-this.right:f,e?d:b.chartHeight-this.bottom],a)},getTitlePosition:function(){var a=this.horiz,b=this.left,c=this.top,d=this.len,e=this.options.title,f=a?b:c,g=this.opposite,h=this.offset,i=z(e.style.fontSize||12),d={low:f+(a?0:d),middle:f+d/2,high:f+(a?d:0)}[e.align],b=(a?c+this.height:b)+(a?1:-1)*(g?-1:1)*this.axisTitleMargin+(this.side===2?i:0);return{x:a?d:b+(g?this.width:0)+h+(e.x||0),y:a?b-(g?this.height:0)+h:d+(e.y||0)}},render:function(){var a=this,
+b=a.horiz,c=a.reversed,d=a.chart,e=d.renderer,f=a.options,g=a.isLog,h=a.isLinked,i=a.tickPositions,j,k=a.axisTitle,l=a.ticks,m=a.minorTicks,n=a.alternateBands,o=f.stackLabels,p=f.alternateGridColor,E=a.tickmarkOffset,I=f.lineWidth,D=d.hasRendered&&s(a.oldMin)&&!isNaN(a.oldMin),r=a.hasData,u=a.showAxis,v,w=f.labels.overflow,x=a.justifyLabels=b&&w!==!1,z;a.labelEdge.length=0;a.justifyToPlot=w==="justify";q([l,m,n],function(a){for(var b in a)a[b].isActive=!1});if(r||h)if(a.minorTickInterval&&!a.categories&&
+q(a.getMinorTickPositions(),function(b){m[b]||(m[b]=new Sa(a,b,"minor"));D&&m[b].isNew&&m[b].render(null,!0);m[b].render(null,!1,1)}),i.length&&(j=i.slice(),(b&&c||!b&&!c)&&j.reverse(),x&&(j=j.slice(1).concat([j[0]])),q(j,function(b,c){x&&(c=c===j.length-1?0:c+1);if(!h||b>=a.min&&b<=a.max)l[b]||(l[b]=new Sa(a,b)),D&&l[b].isNew&&l[b].render(c,!0,0.1),l[b].render(c)}),E&&a.min===0&&(l[-1]||(l[-1]=new Sa(a,-1,null,!0)),l[-1].render(-1))),p&&q(i,function(b,c){if(c%2===0&&b<a.max)n[b]||(n[b]=new S.PlotLineOrBand(a)),
+v=b+E,z=i[c+1]!==t?i[c+1]+E:a.max,n[b].options={from:g?ja(v):v,to:g?ja(z):z,color:p},n[b].render(),n[b].isActive=!0}),!a._addedPlotLB)q((f.plotLines||[]).concat(f.plotBands||[]),function(b){a.addPlotBandOrLine(b)}),a._addedPlotLB=!0;q([l,m,n],function(a){var b,c,e=[],f=va?va.duration||500:0,g=function(){for(c=e.length;c--;)a[e[c]]&&!a[e[c]].isActive&&(a[e[c]].destroy(),delete a[e[c]])};for(b in a)if(!a[b].isActive)a[b].render(b,!1,0),a[b].isActive=!1,e.push(b);a===n||!d.hasRendered||!f?g():f&&setTimeout(g,
+f)});if(I)b=a.getLinePath(I),a.axisLine?a.axisLine.animate({d:b}):a.axisLine=e.path(b).attr({stroke:f.lineColor,"stroke-width":I,zIndex:7}).add(a.axisGroup),a.axisLine[u?"show":"hide"]();if(k&&u)k[k.isNew?"attr":"animate"](a.getTitlePosition()),k.isNew=!1;o&&o.enabled&&a.renderStackTotals();a.isDirty=!1},redraw:function(){this.render();q(this.plotLinesAndBands,function(a){a.render()});q(this.series,function(a){a.isDirty=!0})},destroy:function(a){var b=this,c=b.stacks,d,e=b.plotLinesAndBands;a||X(b);
+for(d in c)Oa(c[d]),c[d]=null;q([b.ticks,b.minorTicks,b.alternateBands],function(a){Oa(a)});for(a=e.length;a--;)e[a].destroy();q("stackTotalGroup,axisLine,axisTitle,axisGroup,cross,gridGroup,labelGroup".split(","),function(a){b[a]&&(b[a]=b[a].destroy())});this.cross&&this.cross.destroy()},drawCrosshair:function(a,b){if(this.crosshair)if((s(b)||!p(this.crosshair.snap,!0))===!1)this.hideCrosshair();else{var c,d=this.crosshair,e=d.animation;p(d.snap,!0)?s(b)&&(c=this.chart.inverted!=this.horiz?b.plotX:
+this.len-b.plotY):c=this.horiz?a.chartX-this.pos:this.len-a.chartY+this.pos;c=this.isRadial?this.getPlotLinePath(this.isXAxis?b.x:p(b.stackY,b.y)):this.getPlotLinePath(null,null,null,null,c);if(c===null)this.hideCrosshair();else if(this.cross)this.cross.attr({visibility:"visible"})[e?"animate":"attr"]({d:c},e);else{e={"stroke-width":d.width||1,stroke:d.color||"#C0C0C0",zIndex:d.zIndex||2};if(d.dashStyle)e.dashstyle=d.dashStyle;this.cross=this.chart.renderer.path(c).attr(e).add()}}},hideCrosshair:function(){this.cross&&
+this.cross.hide()}};r(ma.prototype,{getPlotBandPath:function(a,b){var c=this.getPlotLinePath(b),d=this.getPlotLinePath(a);d&&c?d.push(c[4],c[5],c[1],c[2]):d=null;return d},addPlotBand:function(a){return this.addPlotBandOrLine(a,"plotBands")},addPlotLine:function(a){return this.addPlotBandOrLine(a,"plotLines")},addPlotBandOrLine:function(a,b){var c=(new S.PlotLineOrBand(this,a)).render(),d=this.userOptions;c&&(b&&(d[b]=d[b]||[],d[b].push(a)),this.plotLinesAndBands.push(c));return c},removePlotBandOrLine:function(a){for(var b=
+this.plotLinesAndBands,c=this.options,d=this.userOptions,e=b.length;e--;)b[e].id===a&&b[e].destroy();q([c.plotLines||[],d.plotLines||[],c.plotBands||[],d.plotBands||[]],function(b){for(e=b.length;e--;)b[e].id===a&&ka(b,b[e])})}});ma.prototype.getTimeTicks=function(a,b,c,d){var e=[],f={},g=L.global.useUTC,h,i=new Date(b-Ra),j=a.unitRange,k=a.count;if(s(b)){j>=B.second&&(i.setMilliseconds(0),i.setSeconds(j>=B.minute?0:k*U(i.getSeconds()/k)));if(j>=B.minute)i[Bb](j>=B.hour?0:k*U(i[ob]()/k));if(j>=B.hour)i[Cb](j>=
+B.day?0:k*U(i[pb]()/k));if(j>=B.day)i[rb](j>=B.month?1:k*U(i[Wa]()/k));j>=B.month&&(i[Db](j>=B.year?0:k*U(i[eb]()/k)),h=i[fb]());j>=B.year&&(h-=h%k,i[Eb](h));if(j===B.week)i[rb](i[Wa]()-i[qb]()+p(d,1));b=1;Ra&&(i=new Date(i.getTime()+Ra));h=i[fb]();for(var d=i.getTime(),l=i[eb](),m=i[Wa](),n=g?Ra:(864E5+i.getTimezoneOffset()*6E4)%864E5;d<c;)e.push(d),j===B.year?d=db(h+b*k,0):j===B.month?d=db(h,l+b*k):!g&&(j===B.day||j===B.week)?d=db(h,l,m+b*k*(j===B.day?1:7)):d+=j*k,b++;e.push(d);q(vb(e,function(a){return j<=
+B.hour&&a%B.day===n}),function(a){f[a]="day"})}e.info=r(a,{higherRanks:f,totalRange:j*k});return e};ma.prototype.normalizeTimeTickInterval=function(a,b){var c=b||[["millisecond",[1,2,5,10,20,25,50,100,200,500]],["second",[1,2,5,10,15,30]],["minute",[1,2,5,10,15,30]],["hour",[1,2,3,4,6,8,12]],["day",[1,2]],["week",[1,2]],["month",[1,2,3,4,6]],["year",null]],d=c[c.length-1],e=B[d[0]],f=d[1],g;for(g=0;g<c.length;g++)if(d=c[g],e=B[d[0]],f=d[1],c[g+1]&&a<=(e*f[f.length-1]+B[c[g+1][0]])/2)break;e===B.year&&
+a<5*e&&(f=[1,2,5]);c=mb(a/e,f,d[0]==="year"?u(lb(a/e),1):1);return{unitRange:e,count:c,unitName:d[0]}};ma.prototype.getLogTickPositions=function(a,b,c,d){var e=this.options,f=this.len,g=[];if(!d)this._minorAutoInterval=null;if(a>=0.5)a=v(a),g=this.getLinearTickPositions(a,b,c);else if(a>=0.08)for(var f=U(b),h,i,j,k,l,e=a>0.3?[1,2,4]:a>0.15?[1,2,4,6,8]:[1,2,3,4,5,6,7,8,9];f<c+1&&!l;f++){i=e.length;for(h=0;h<i&&!l;h++)j=za(ja(f)*e[h]),j>b&&(!d||k<=c)&&k!==t&&g.push(k),k>c&&(l=!0),k=j}else if(b=ja(b),
+c=ja(c),a=e[d?"minorTickInterval":"tickInterval"],a=p(a==="auto"?null:a,this._minorAutoInterval,(c-b)*(e.tickPixelInterval/(d?5:1))/((d?f/this.tickPositions.length:f)||1)),a=mb(a,null,lb(a)),g=Ua(this.getLinearTickPositions(a,b,c),za),!d)this._minorAutoInterval=a/5;if(!d)this.tickInterval=a;return g};var Mb=S.Tooltip=function(){this.init.apply(this,arguments)};Mb.prototype={init:function(a,b){var c=b.borderWidth,d=b.style,e=z(d.padding);this.chart=a;this.options=b;this.crosshairs=[];this.now={x:0,
+y:0};this.isHidden=!0;this.label=a.renderer.label("",0,0,b.shape||"callout",null,null,b.useHTML,null,"tooltip").attr({padding:e,fill:b.backgroundColor,"stroke-width":c,r:b.borderRadius,zIndex:8}).css(d).css({padding:0}).add().attr({y:-9999});ga||this.label.shadow(b.shadow);this.shared=b.shared},destroy:function(){if(this.label)this.label=this.label.destroy();clearTimeout(this.hideTimer);clearTimeout(this.tooltipTimeout)},move:function(a,b,c,d){var e=this,f=e.now,g=e.options.animation!==!1&&!e.isHidden&&
+(Q(a-f.x)>1||Q(b-f.y)>1),h=e.followPointer||e.len>1;r(f,{x:g?(2*f.x+a)/3:a,y:g?(f.y+b)/2:b,anchorX:h?t:g?(2*f.anchorX+c)/3:c,anchorY:h?t:g?(f.anchorY+d)/2:d});e.label.attr(f);if(g)clearTimeout(this.tooltipTimeout),this.tooltipTimeout=setTimeout(function(){e&&e.move(a,b,c,d)},32)},hide:function(){var a=this,b;clearTimeout(this.hideTimer);if(!this.isHidden)b=this.chart.hoverPoints,this.hideTimer=setTimeout(function(){a.label.fadeOut();a.isHidden=!0},p(this.options.hideDelay,500)),b&&q(b,function(a){a.setState()}),
+this.chart.hoverPoints=null},getAnchor:function(a,b){var c,d=this.chart,e=d.inverted,f=d.plotTop,g=0,h=0,i,a=ra(a);c=a[0].tooltipPos;this.followPointer&&b&&(b.chartX===t&&(b=d.pointer.normalize(b)),c=[b.chartX-d.plotLeft,b.chartY-f]);c||(q(a,function(a){i=a.series.yAxis;g+=a.plotX;h+=(a.plotLow?(a.plotLow+a.plotHigh)/2:a.plotY)+(!e&&i?i.top-f:0)}),g/=a.length,h/=a.length,c=[e?d.plotWidth-h:g,this.shared&&!e&&a.length>1&&b?b.chartY-f:e?d.plotHeight-g:h]);return Ua(c,v)},getPosition:function(a,b,c){var d=
+this.chart,e=this.distance,f={},g,h=["y",d.chartHeight,b,c.plotY+d.plotTop],i=["x",d.chartWidth,a,c.plotX+d.plotLeft],j=c.ttBelow||d.inverted&&!c.negative||!d.inverted&&c.negative,k=function(a,b,c,d){var g=c<d-e,b=d+e+c<b,c=d-e-c;d+=e;if(j&&b)f[a]=d;else if(!j&&g)f[a]=c;else if(g)f[a]=c;else if(b)f[a]=d;else return!1},l=function(a,b,c,d){if(d<e||d>b-e)return!1;else f[a]=d<c/2?1:d>b-c/2?b-c-2:d-c/2},m=function(a){var b=h;h=i;i=b;g=a},n=function(){k.apply(0,h)!==!1?l.apply(0,i)===!1&&!g&&(m(!0),n()):
+g?f.x=f.y=0:(m(!0),n())};(d.inverted||this.len>1)&&m();n();return f},defaultFormatter:function(a){var b=this.points||ra(this),c=b[0].series,d;d=[a.tooltipHeaderFormatter(b[0])];q(b,function(a){c=a.series;d.push(c.tooltipFormatter&&c.tooltipFormatter(a)||a.point.tooltipFormatter(c.tooltipOptions.pointFormat))});d.push(a.options.footerFormat||"");return d.join("")},refresh:function(a,b){var c=this.chart,d=this.label,e=this.options,f,g,h={},i,j=[];i=e.formatter||this.defaultFormatter;var h=c.hoverPoints,
+k,l=this.shared;clearTimeout(this.hideTimer);this.followPointer=ra(a)[0].series.tooltipOptions.followPointer;g=this.getAnchor(a,b);f=g[0];g=g[1];l&&(!a.series||!a.series.noSharedTooltip)?(c.hoverPoints=a,h&&q(h,function(a){a.setState()}),q(a,function(a){a.setState("hover");j.push(a.getLabelConfig())}),h={x:a[0].category,y:a[0].y},h.points=j,this.len=j.length,a=a[0]):h=a.getLabelConfig();i=i.call(h,this);h=a.series;this.distance=p(h.tooltipOptions.distance,16);i===!1?this.hide():(this.isHidden&&(ab(d),
+d.attr("opacity",1).show()),d.attr({text:i}),k=e.borderColor||a.color||h.color||"#606060",d.attr({stroke:k}),this.updatePosition({plotX:f,plotY:g,negative:a.negative,ttBelow:a.ttBelow}),this.isHidden=!1);K(c,"tooltipRefresh",{text:i,x:f+c.plotLeft,y:g+c.plotTop,borderColor:k})},updatePosition:function(a){var b=this.chart,c=this.label,c=(this.options.positioner||this.getPosition).call(this,c.width,c.height,a);this.move(v(c.x),v(c.y),a.plotX+b.plotLeft,a.plotY+b.plotTop)},tooltipHeaderFormatter:function(a){var b=
+a.series,c=b.tooltipOptions,d=c.dateTimeLabelFormats,e=c.xDateFormat,f=b.xAxis,g=f&&f.options.type==="datetime"&&ia(a.key),c=c.headerFormat,f=f&&f.closestPointRange,h;if(g&&!e){if(f)for(h in B){if(B[h]>=f||B[h]<=B.day&&a.key%B[h]>0){e=d[h];break}}else e=d.day;e=e||d.year}g&&e&&(c=c.replace("{point.key}","{point.key:"+e+"}"));return Ia(c,{point:a,series:b})}};var pa;Za=x.documentElement.ontouchstart!==t;var Va=S.Pointer=function(a,b){this.init(a,b)};Va.prototype={init:function(a,b){var c=b.chart,d=
+c.events,e=ga?"":c.zoomType,c=a.inverted,f;this.options=b;this.chart=a;this.zoomX=f=/x/.test(e);this.zoomY=e=/y/.test(e);this.zoomHor=f&&!c||e&&c;this.zoomVert=e&&!c||f&&c;this.hasZoom=f||e;this.runChartClick=d&&!!d.click;this.pinchDown=[];this.lastValidTouch={};if(S.Tooltip&&b.tooltip.enabled)a.tooltip=new Mb(a,b.tooltip),this.followTouchMove=b.tooltip.followTouchMove;this.setDOMEvents()},normalize:function(a,b){var c,d,a=a||window.event,a=Sb(a);if(!a.target)a.target=a.srcElement;d=a.touches?a.touches.length?
+a.touches.item(0):a.changedTouches[0]:a;if(!b)this.chartPosition=b=Rb(this.chart.container);d.pageX===t?(c=u(a.x,a.clientX-b.left),d=a.y):(c=d.pageX-b.left,d=d.pageY-b.top);return r(a,{chartX:v(c),chartY:v(d)})},getCoordinates:function(a){var b={xAxis:[],yAxis:[]};q(this.chart.axes,function(c){b[c.isXAxis?"xAxis":"yAxis"].push({axis:c,value:c.toValue(a[c.horiz?"chartX":"chartY"])})});return b},getIndex:function(a){var b=this.chart;return b.inverted?b.plotHeight+b.plotTop-a.chartY:a.chartX-b.plotLeft},
+runPointActions:function(a){var b=this.chart,c=b.series,d=b.tooltip,e,f,g=b.hoverPoint,h=b.hoverSeries,i,j,k=b.chartWidth,l=this.getIndex(a);if(d&&this.options.tooltip.shared&&(!h||!h.noSharedTooltip)){f=[];i=c.length;for(j=0;j<i;j++)if(c[j].visible&&c[j].options.enableMouseTracking!==!1&&!c[j].noSharedTooltip&&c[j].singularTooltips!==!0&&c[j].tooltipPoints.length&&(e=c[j].tooltipPoints[l])&&e.series)e._dist=Q(l-e.clientX),k=C(k,e._dist),f.push(e);for(i=f.length;i--;)f[i]._dist>k&&f.splice(i,1);if(f.length&&
+f[0].clientX!==this.hoverX)d.refresh(f,a),this.hoverX=f[0].clientX}c=h&&h.tooltipOptions.followPointer;if(h&&h.tracker&&!c){if((e=h.tooltipPoints[l])&&e!==g)e.onMouseOver(a)}else d&&c&&!d.isHidden&&(h=d.getAnchor([{}],a),d.updatePosition({plotX:h[0],plotY:h[1]}));if(d&&!this._onDocumentMouseMove)this._onDocumentMouseMove=function(a){if(W[pa])W[pa].pointer.onDocumentMouseMove(a)},N(x,"mousemove",this._onDocumentMouseMove);q(b.axes,function(b){b.drawCrosshair(a,p(e,g))})},reset:function(a){var b=this.chart,
+c=b.hoverSeries,d=b.hoverPoint,e=b.tooltip,f=e&&e.shared?b.hoverPoints:d;(a=a&&e&&f)&&ra(f)[0].plotX===t&&(a=!1);if(a)e.refresh(f),d&&d.setState(d.state,!0);else{if(d)d.onMouseOut();if(c)c.onMouseOut();e&&e.hide();if(this._onDocumentMouseMove)X(x,"mousemove",this._onDocumentMouseMove),this._onDocumentMouseMove=null;q(b.axes,function(a){a.hideCrosshair()});this.hoverX=null}},scaleGroups:function(a,b){var c=this.chart,d;q(c.series,function(e){d=a||e.getPlotBox();e.xAxis&&e.xAxis.zoomEnabled&&(e.group.attr(d),
+e.markerGroup&&(e.markerGroup.attr(d),e.markerGroup.clip(b?c.clipRect:null)),e.dataLabelsGroup&&e.dataLabelsGroup.attr(d))});c.clipRect.attr(b||c.clipBox)},dragStart:function(a){var b=this.chart;b.mouseIsDown=a.type;b.cancelClick=!1;b.mouseDownX=this.mouseDownX=a.chartX;b.mouseDownY=this.mouseDownY=a.chartY},drag:function(a){var b=this.chart,c=b.options.chart,d=a.chartX,e=a.chartY,f=this.zoomHor,g=this.zoomVert,h=b.plotLeft,i=b.plotTop,j=b.plotWidth,k=b.plotHeight,l,m=this.mouseDownX,n=this.mouseDownY,
+o=c.panKey&&a[c.panKey+"Key"];d<h?d=h:d>h+j&&(d=h+j);e<i?e=i:e>i+k&&(e=i+k);this.hasDragged=Math.sqrt(Math.pow(m-d,2)+Math.pow(n-e,2));if(this.hasDragged>10){l=b.isInsidePlot(m-h,n-i);if(b.hasCartesianSeries&&(this.zoomX||this.zoomY)&&l&&!o&&!this.selectionMarker)this.selectionMarker=b.renderer.rect(h,i,f?1:j,g?1:k,0).attr({fill:c.selectionMarkerFill||"rgba(69,114,167,0.25)",zIndex:7}).add();this.selectionMarker&&f&&(d-=m,this.selectionMarker.attr({width:Q(d),x:(d>0?0:d)+m}));this.selectionMarker&&
+g&&(d=e-n,this.selectionMarker.attr({height:Q(d),y:(d>0?0:d)+n}));l&&!this.selectionMarker&&c.panning&&b.pan(a,c.panning)}},drop:function(a){var b=this.chart,c=this.hasPinched;if(this.selectionMarker){var d={xAxis:[],yAxis:[],originalEvent:a.originalEvent||a},e=this.selectionMarker,f=e.attr?e.attr("x"):e.x,g=e.attr?e.attr("y"):e.y,h=e.attr?e.attr("width"):e.width,i=e.attr?e.attr("height"):e.height,j;if(this.hasDragged||c)q(b.axes,function(b){if(b.zoomEnabled){var c=b.horiz,e=a.type==="touchend"?b.minPixelPadding:
+0,n=b.toValue((c?f:g)+e),c=b.toValue((c?f+h:g+i)-e);!isNaN(n)&&!isNaN(c)&&(d[b.coll].push({axis:b,min:C(n,c),max:u(n,c)}),j=!0)}}),j&&K(b,"selection",d,function(a){b.zoom(r(a,c?{animation:!1}:null))});this.selectionMarker=this.selectionMarker.destroy();c&&this.scaleGroups()}if(b)A(b.container,{cursor:b._cursor}),b.cancelClick=this.hasDragged>10,b.mouseIsDown=this.hasDragged=this.hasPinched=!1,this.pinchDown=[]},onContainerMouseDown:function(a){a=this.normalize(a);a.preventDefault&&a.preventDefault();
+this.dragStart(a)},onDocumentMouseUp:function(a){W[pa]&&W[pa].pointer.drop(a)},onDocumentMouseMove:function(a){var b=this.chart,c=this.chartPosition,d=b.hoverSeries,a=this.normalize(a,c);c&&d&&!this.inClass(a.target,"highcharts-tracker")&&!b.isInsidePlot(a.chartX-b.plotLeft,a.chartY-b.plotTop)&&this.reset()},onContainerMouseLeave:function(){var a=W[pa];if(a)a.pointer.reset(),a.pointer.chartPosition=null},onContainerMouseMove:function(a){var b=this.chart;pa=b.index;a=this.normalize(a);a.returnValue=
+!1;b.mouseIsDown==="mousedown"&&this.drag(a);(this.inClass(a.target,"highcharts-tracker")||b.isInsidePlot(a.chartX-b.plotLeft,a.chartY-b.plotTop))&&!b.openMenu&&this.runPointActions(a)},inClass:function(a,b){for(var c;a;){if(c=F(a,"class"))if(c.indexOf(b)!==-1)return!0;else if(c.indexOf("highcharts-container")!==-1)return!1;a=a.parentNode}},onTrackerMouseOut:function(a){var b=this.chart.hoverSeries,c=(a=a.relatedTarget||a.toElement)&&a.point&&a.point.series;if(b&&!b.options.stickyTracking&&!this.inClass(a,
+"highcharts-tooltip")&&c!==b)b.onMouseOut()},onContainerClick:function(a){var b=this.chart,c=b.hoverPoint,d=b.plotLeft,e=b.plotTop,a=this.normalize(a);a.cancelBubble=!0;b.cancelClick||(c&&this.inClass(a.target,"highcharts-tracker")?(K(c.series,"click",r(a,{point:c})),b.hoverPoint&&c.firePointEvent("click",a)):(r(a,this.getCoordinates(a)),b.isInsidePlot(a.chartX-d,a.chartY-e)&&K(b,"click",a)))},setDOMEvents:function(){var a=this,b=a.chart.container;b.onmousedown=function(b){a.onContainerMouseDown(b)};
+b.onmousemove=function(b){a.onContainerMouseMove(b)};b.onclick=function(b){a.onContainerClick(b)};N(b,"mouseleave",a.onContainerMouseLeave);$a===1&&N(x,"mouseup",a.onDocumentMouseUp);if(Za)b.ontouchstart=function(b){a.onContainerTouchStart(b)},b.ontouchmove=function(b){a.onContainerTouchMove(b)},$a===1&&N(x,"touchend",a.onDocumentTouchEnd)},destroy:function(){var a;X(this.chart.container,"mouseleave",this.onContainerMouseLeave);$a||(X(x,"mouseup",this.onDocumentMouseUp),X(x,"touchend",this.onDocumentTouchEnd));
+clearInterval(this.tooltipTimeout);for(a in this)this[a]=null}};r(S.Pointer.prototype,{pinchTranslate:function(a,b,c,d,e,f){(this.zoomHor||this.pinchHor)&&this.pinchTranslateDirection(!0,a,b,c,d,e,f);(this.zoomVert||this.pinchVert)&&this.pinchTranslateDirection(!1,a,b,c,d,e,f)},pinchTranslateDirection:function(a,b,c,d,e,f,g,h){var i=this.chart,j=a?"x":"y",k=a?"X":"Y",l="chart"+k,m=a?"width":"height",n=i["plot"+(a?"Left":"Top")],o,p,q=h||1,r=i.inverted,D=i.bounds[a?"h":"v"],u=b.length===1,s=b[0][l],
+v=c[0][l],t=!u&&b[1][l],w=!u&&c[1][l],x,c=function(){!u&&Q(s-t)>20&&(q=h||Q(v-w)/Q(s-t));p=(n-v)/q+s;o=i["plot"+(a?"Width":"Height")]/q};c();b=p;b<D.min?(b=D.min,x=!0):b+o>D.max&&(b=D.max-o,x=!0);x?(v-=0.8*(v-g[j][0]),u||(w-=0.8*(w-g[j][1])),c()):g[j]=[v,w];r||(f[j]=p-n,f[m]=o);f=r?1/q:q;e[m]=o;e[j]=b;d[r?a?"scaleY":"scaleX":"scale"+k]=q;d["translate"+k]=f*n+(v-f*s)},pinch:function(a){var b=this,c=b.chart,d=b.pinchDown,e=b.followTouchMove,f=a.touches,g=f.length,h=b.lastValidTouch,i=b.hasZoom,j=b.selectionMarker,
+k={},l=g===1&&(b.inClass(a.target,"highcharts-tracker")&&c.runTrackerClick||c.runChartClick),m={};(i||e)&&!l&&a.preventDefault();Ua(f,function(a){return b.normalize(a)});if(a.type==="touchstart")q(f,function(a,b){d[b]={chartX:a.chartX,chartY:a.chartY}}),h.x=[d[0].chartX,d[1]&&d[1].chartX],h.y=[d[0].chartY,d[1]&&d[1].chartY],q(c.axes,function(a){if(a.zoomEnabled){var b=c.bounds[a.horiz?"h":"v"],d=a.minPixelPadding,e=a.toPixels(p(a.options.min,a.dataMin)),f=a.toPixels(p(a.options.max,a.dataMax)),g=
+C(e,f),e=u(e,f);b.min=C(a.pos,g-d);b.max=u(a.pos+a.len,e+d)}});else if(d.length){if(!j)b.selectionMarker=j=r({destroy:sa},c.plotBox);b.pinchTranslate(d,f,k,j,m,h);b.hasPinched=i;b.scaleGroups(k,m);!i&&e&&g===1&&this.runPointActions(b.normalize(a))}},onContainerTouchStart:function(a){var b=this.chart;pa=b.index;a.touches.length===1?(a=this.normalize(a),b.isInsidePlot(a.chartX-b.plotLeft,a.chartY-b.plotTop)?(this.runPointActions(a),this.pinch(a)):this.reset()):a.touches.length===2&&this.pinch(a)},onContainerTouchMove:function(a){(a.touches.length===
+1||a.touches.length===2)&&this.pinch(a)},onDocumentTouchEnd:function(a){W[pa]&&W[pa].pointer.drop(a)}});if(H.PointerEvent||H.MSPointerEvent){var ua={},yb=!!H.PointerEvent,Wb=function(){var a,b=[];b.item=function(a){return this[a]};for(a in ua)ua.hasOwnProperty(a)&&b.push({pageX:ua[a].pageX,pageY:ua[a].pageY,target:ua[a].target});return b},zb=function(a,b,c,d){a=a.originalEvent||a;if((a.pointerType==="touch"||a.pointerType===a.MSPOINTER_TYPE_TOUCH)&&W[pa])d(a),d=W[pa].pointer,d[b]({type:c,target:a.currentTarget,
+preventDefault:sa,touches:Wb()})};r(Va.prototype,{onContainerPointerDown:function(a){zb(a,"onContainerTouchStart","touchstart",function(a){ua[a.pointerId]={pageX:a.pageX,pageY:a.pageY,target:a.currentTarget}})},onContainerPointerMove:function(a){zb(a,"onContainerTouchMove","touchmove",function(a){ua[a.pointerId]={pageX:a.pageX,pageY:a.pageY};if(!ua[a.pointerId].target)ua[a.pointerId].target=a.currentTarget})},onDocumentPointerUp:function(a){zb(a,"onContainerTouchEnd","touchend",function(a){delete ua[a.pointerId]})},
+batchMSEvents:function(a){a(this.chart.container,yb?"pointerdown":"MSPointerDown",this.onContainerPointerDown);a(this.chart.container,yb?"pointermove":"MSPointerMove",this.onContainerPointerMove);a(x,yb?"pointerup":"MSPointerUp",this.onDocumentPointerUp)}});Ma(Va.prototype,"init",function(a,b,c){a.call(this,b,c);(this.hasZoom||this.followTouchMove)&&A(b.container,{"-ms-touch-action":P,"touch-action":P})});Ma(Va.prototype,"setDOMEvents",function(a){a.apply(this);(this.hasZoom||this.followTouchMove)&&
+this.batchMSEvents(N)});Ma(Va.prototype,"destroy",function(a){this.batchMSEvents(X);a.call(this)})}var kb=S.Legend=function(a,b){this.init(a,b)};kb.prototype={init:function(a,b){var c=this,d=b.itemStyle,e=p(b.padding,8),f=b.itemMarginTop||0;this.options=b;if(b.enabled)c.itemStyle=d,c.itemHiddenStyle=w(d,b.itemHiddenStyle),c.itemMarginTop=f,c.padding=e,c.initialItemX=e,c.initialItemY=e-5,c.maxItemWidth=0,c.chart=a,c.itemHeight=0,c.lastLineHeight=0,c.symbolWidth=p(b.symbolWidth,16),c.pages=[],c.render(),
+N(c.chart,"endResize",function(){c.positionCheckboxes()})},colorizeItem:function(a,b){var c=this.options,d=a.legendItem,e=a.legendLine,f=a.legendSymbol,g=this.itemHiddenStyle.color,c=b?c.itemStyle.color:g,h=b?a.legendColor||a.color||"#CCC":g,g=a.options&&a.options.marker,i={fill:h},j;d&&d.css({fill:c,color:c});e&&e.attr({stroke:h});if(f){if(g&&f.isMarker)for(j in i.stroke=h,g=a.convertAttribs(g),g)d=g[j],d!==t&&(i[j]=d);f.attr(i)}},positionItem:function(a){var b=this.options,c=b.symbolPadding,b=!b.rtl,
+d=a._legendItemPos,e=d[0],d=d[1],f=a.checkbox;a.legendGroup&&a.legendGroup.translate(b?e:this.legendWidth-e-2*c-4,d);if(f)f.x=e,f.y=d},destroyItem:function(a){var b=a.checkbox;q(["legendItem","legendLine","legendSymbol","legendGroup"],function(b){a[b]&&(a[b]=a[b].destroy())});b&&Pa(a.checkbox)},destroy:function(){var a=this.group,b=this.box;if(b)this.box=b.destroy();if(a)this.group=a.destroy()},positionCheckboxes:function(a){var b=this.group.alignAttr,c,d=this.clipHeight||this.legendHeight;if(b)c=
+b.translateY,q(this.allItems,function(e){var f=e.checkbox,g;f&&(g=c+f.y+(a||0)+3,A(f,{left:b.translateX+e.checkboxOffset+f.x-20+"px",top:g+"px",display:g>c-6&&g<c+d-6?"":P}))})},renderTitle:function(){var a=this.padding,b=this.options.title,c=0;if(b.text){if(!this.title)this.title=this.chart.renderer.label(b.text,a-3,a-4,null,null,null,null,null,"legend-title").attr({zIndex:1}).css(b.style).add(this.group);a=this.title.getBBox();c=a.height;this.offsetWidth=a.width;this.contentGroup.attr({translateY:c})}this.titleHeight=
+c},renderItem:function(a){var b=this.chart,c=b.renderer,d=this.options,e=d.layout==="horizontal",f=this.symbolWidth,g=d.symbolPadding,h=this.itemStyle,i=this.itemHiddenStyle,j=this.padding,k=e?p(d.itemDistance,20):0,l=!d.rtl,m=d.width,n=d.itemMarginBottom||0,o=this.itemMarginTop,q=this.initialItemX,r=a.legendItem,s=a.series&&a.series.drawLegendSymbol?a.series:a,D=s.options,D=this.createCheckboxForItem&&D&&D.showCheckbox,t=d.useHTML;if(!r){a.legendGroup=c.g("legend-item").attr({zIndex:1}).add(this.scrollGroup);
+a.legendItem=r=c.text(d.labelFormat?Ia(d.labelFormat,a):d.labelFormatter.call(a),l?f+g:-g,this.baseline||0,t).css(w(a.visible?h:i)).attr({align:l?"left":"right",zIndex:2}).add(a.legendGroup);if(!this.baseline)this.baseline=c.fontMetrics(h.fontSize,r).f+3+o,r.attr("y",this.baseline);s.drawLegendSymbol(this,a);this.setItemEvents&&this.setItemEvents(a,r,t,h,i);this.colorizeItem(a,a.visible);D&&this.createCheckboxForItem(a)}c=r.getBBox();f=a.checkboxOffset=d.itemWidth||a.legendItemWidth||f+g+c.width+
+k+(D?20:0);this.itemHeight=g=v(a.legendItemHeight||c.height);if(e&&this.itemX-q+f>(m||b.chartWidth-2*j-q-d.x))this.itemX=q,this.itemY+=o+this.lastLineHeight+n,this.lastLineHeight=0;this.maxItemWidth=u(this.maxItemWidth,f);this.lastItemY=o+this.itemY+n;this.lastLineHeight=u(g,this.lastLineHeight);a._legendItemPos=[this.itemX,this.itemY];e?this.itemX+=f:(this.itemY+=o+g+n,this.lastLineHeight=g);this.offsetWidth=m||u((e?this.itemX-q-k:f)+j,this.offsetWidth)},getAllItems:function(){var a=[];q(this.chart.series,
+function(b){var c=b.options;if(p(c.showInLegend,!s(c.linkedTo)?t:!1,!0))a=a.concat(b.legendItems||(c.legendType==="point"?b.data:b))});return a},render:function(){var a=this,b=a.chart,c=b.renderer,d=a.group,e,f,g,h,i=a.box,j=a.options,k=a.padding,l=j.borderWidth,m=j.backgroundColor;a.itemX=a.initialItemX;a.itemY=a.initialItemY;a.offsetWidth=0;a.lastItemY=0;if(!d)a.group=d=c.g("legend").attr({zIndex:7}).add(),a.contentGroup=c.g().attr({zIndex:1}).add(d),a.scrollGroup=c.g().add(a.contentGroup);a.renderTitle();
+e=a.getAllItems();nb(e,function(a,b){return(a.options&&a.options.legendIndex||0)-(b.options&&b.options.legendIndex||0)});j.reversed&&e.reverse();a.allItems=e;a.display=f=!!e.length;q(e,function(b){a.renderItem(b)});g=j.width||a.offsetWidth;h=a.lastItemY+a.lastLineHeight+a.titleHeight;h=a.handleOverflow(h);if(l||m){g+=k;h+=k;if(i){if(g>0&&h>0)i[i.isNew?"attr":"animate"](i.crisp({width:g,height:h})),i.isNew=!1}else a.box=i=c.rect(0,0,g,h,j.borderRadius,l||0).attr({stroke:j.borderColor,"stroke-width":l||
+0,fill:m||P}).add(d).shadow(j.shadow),i.isNew=!0;i[f?"show":"hide"]()}a.legendWidth=g;a.legendHeight=h;q(e,function(b){a.positionItem(b)});f&&d.align(r({width:g,height:h},j),!0,"spacingBox");b.isResizing||this.positionCheckboxes()},handleOverflow:function(a){var b=this,c=this.chart,d=c.renderer,e=this.options,f=e.y,f=c.spacingBox.height+(e.verticalAlign==="top"?-f:f)-this.padding,g=e.maxHeight,h,i=this.clipRect,j=e.navigation,k=p(j.animation,!0),l=j.arrowSize||12,m=this.nav,n=this.pages,o,r=this.allItems;
+e.layout==="horizontal"&&(f/=2);g&&(f=C(f,g));n.length=0;if(a>f&&!e.useHTML){this.clipHeight=h=u(f-20-this.titleHeight-this.padding,0);this.currentPage=p(this.currentPage,1);this.fullHeight=a;q(r,function(a,b){var c=a._legendItemPos[1],d=v(a.legendItem.getBBox().height),e=n.length;if(!e||c-n[e-1]>h&&(o||c)!==n[e-1])n.push(o||c),e++;b===r.length-1&&c+d-n[e-1]>h&&n.push(c);c!==o&&(o=c)});if(!i)i=b.clipRect=d.clipRect(0,this.padding,9999,0),b.contentGroup.clip(i);i.attr({height:h});if(!m)this.nav=m=
+d.g().attr({zIndex:1}).add(this.group),this.up=d.symbol("triangle",0,0,l,l).on("click",function(){b.scroll(-1,k)}).add(m),this.pager=d.text("",15,10).css(j.style).add(m),this.down=d.symbol("triangle-down",0,0,l,l).on("click",function(){b.scroll(1,k)}).add(m);b.scroll(0);a=f}else if(m)i.attr({height:c.chartHeight}),m.hide(),this.scrollGroup.attr({translateY:1}),this.clipHeight=0;return a},scroll:function(a,b){var c=this.pages,d=c.length,e=this.currentPage+a,f=this.clipHeight,g=this.options.navigation,
+h=g.activeColor,g=g.inactiveColor,i=this.pager,j=this.padding;e>d&&(e=d);if(e>0)b!==t&&Qa(b,this.chart),this.nav.attr({translateX:j,translateY:f+this.padding+7+this.titleHeight,visibility:"visible"}),this.up.attr({fill:e===1?g:h}).css({cursor:e===1?"default":"pointer"}),i.attr({text:e+"/"+d}),this.down.attr({x:18+this.pager.getBBox().width,fill:e===d?g:h}).css({cursor:e===d?"default":"pointer"}),c=-c[e-1]+this.initialItemY,this.scrollGroup.animate({translateY:c}),this.currentPage=e,this.positionCheckboxes(c)}};
+M=S.LegendSymbolMixin={drawRectangle:function(a,b){var c=a.options.symbolHeight||12;b.legendSymbol=this.chart.renderer.rect(0,a.baseline-5-c/2,a.symbolWidth,c,a.options.symbolRadius||0).attr({zIndex:3}).add(b.legendGroup)},drawLineMarker:function(a){var b=this.options,c=b.marker,d;d=a.symbolWidth;var e=this.chart.renderer,f=this.legendGroup,a=a.baseline-v(e.fontMetrics(a.options.itemStyle.fontSize,this.legendItem).b*0.3),g;if(b.lineWidth){g={"stroke-width":b.lineWidth};if(b.dashStyle)g.dashstyle=
+b.dashStyle;this.legendLine=e.path(["M",0,a,"L",d,a]).attr(g).add(f)}if(c&&c.enabled!==!1)b=c.radius,this.legendSymbol=d=e.symbol(this.symbol,d/2-b,a-b,2*b,2*b).add(f),d.isMarker=!0}};(/Trident\/7\.0/.test(wa)||Ta)&&Ma(kb.prototype,"positionItem",function(a,b){var c=this,d=function(){b._legendItemPos&&a.call(c,b)};d();setTimeout(d)});Xa.prototype={init:function(a,b){var c,d=a.series;a.series=null;c=w(L,a);c.series=a.series=d;this.userOptions=a;d=c.chart;this.margin=this.splashArray("margin",d);this.spacing=
+this.splashArray("spacing",d);var e=d.events;this.bounds={h:{},v:{}};this.callback=b;this.isResizing=0;this.options=c;this.axes=[];this.series=[];this.hasCartesianSeries=d.showAxes;var f=this,g;f.index=W.length;W.push(f);$a++;d.reflow!==!1&&N(f,"load",function(){f.initReflow()});if(e)for(g in e)N(f,g,e[g]);f.xAxis=[];f.yAxis=[];f.animation=ga?!1:p(d.animation,!0);f.pointCount=f.colorCounter=f.symbolCounter=0;f.firstRender()},initSeries:function(a){var b=this.options.chart;(b=J[a.type||b.type||b.defaultSeriesType])||
+oa(17,!0);b=new b;b.init(this,a);return b},isInsidePlot:function(a,b,c){var d=c?b:a,a=c?a:b;return d>=0&&d<=this.plotWidth&&a>=0&&a<=this.plotHeight},adjustTickAmounts:function(){this.options.chart.alignTicks!==!1&&q(this.axes,function(a){a.adjustTickAmount()});this.maxTicks=null},redraw:function(a){var b=this.axes,c=this.series,d=this.pointer,e=this.legend,f=this.isDirtyLegend,g,h,i=this.hasCartesianSeries,j=this.isDirtyBox,k=c.length,l=k,m=this.renderer,n=m.isHidden(),o=[];Qa(a,this);n&&this.cloneRenderTo();
+for(this.layOutTitles();l--;)if(a=c[l],a.options.stacking&&(g=!0,a.isDirty)){h=!0;break}if(h)for(l=k;l--;)if(a=c[l],a.options.stacking)a.isDirty=!0;q(c,function(a){a.isDirty&&a.options.legendType==="point"&&(f=!0)});if(f&&e.options.enabled)e.render(),this.isDirtyLegend=!1;g&&this.getStacks();if(i){if(!this.isResizing)this.maxTicks=null,q(b,function(a){a.setScale()});this.adjustTickAmounts()}this.getMargins();i&&(q(b,function(a){a.isDirty&&(j=!0)}),q(b,function(a){if(a.isDirtyExtremes)a.isDirtyExtremes=
+!1,o.push(function(){K(a,"afterSetExtremes",r(a.eventArgs,a.getExtremes()));delete a.eventArgs});(j||g)&&a.redraw()}));j&&this.drawChartBox();q(c,function(a){a.isDirty&&a.visible&&(!a.isCartesian||a.xAxis)&&a.redraw()});d&&d.reset(!0);m.draw();K(this,"redraw");n&&this.cloneRenderTo(!0);q(o,function(a){a.call()})},get:function(a){var b=this.axes,c=this.series,d,e;for(d=0;d<b.length;d++)if(b[d].options.id===a)return b[d];for(d=0;d<c.length;d++)if(c[d].options.id===a)return c[d];for(d=0;d<c.length;d++){e=
+c[d].points||[];for(b=0;b<e.length;b++)if(e[b].id===a)return e[b]}return null},getAxes:function(){var a=this,b=this.options,c=b.xAxis=ra(b.xAxis||{}),b=b.yAxis=ra(b.yAxis||{});q(c,function(a,b){a.index=b;a.isX=!0});q(b,function(a,b){a.index=b});c=c.concat(b);q(c,function(b){new ma(a,b)});a.adjustTickAmounts()},getSelectedPoints:function(){var a=[];q(this.series,function(b){a=a.concat(vb(b.points||[],function(a){return a.selected}))});return a},getSelectedSeries:function(){return vb(this.series,function(a){return a.selected})},
+getStacks:function(){var a=this;q(a.yAxis,function(a){if(a.stacks&&a.hasVisibleSeries)a.oldStacks=a.stacks});q(a.series,function(b){if(b.options.stacking&&(b.visible===!0||a.options.chart.ignoreHiddenSeries===!1))b.stackKey=b.type+p(b.options.stack,"")})},setTitle:function(a,b,c){var g;var d=this,e=d.options,f;f=e.title=w(e.title,a);g=e.subtitle=w(e.subtitle,b),e=g;q([["title",a,f],["subtitle",b,e]],function(a){var b=a[0],c=d[b],e=a[1],a=a[2];c&&e&&(d[b]=c=c.destroy());a&&a.text&&!c&&(d[b]=d.renderer.text(a.text,
+0,0,a.useHTML).attr({align:a.align,"class":"highcharts-"+b,zIndex:a.zIndex||4}).css(a.style).add())});d.layOutTitles(c)},layOutTitles:function(a){var b=0,c=this.title,d=this.subtitle,e=this.options,f=e.title,e=e.subtitle,g=this.renderer,h=this.spacingBox.width-44;if(c&&(c.css({width:(f.width||h)+"px"}).align(r({y:g.fontMetrics(f.style.fontSize,c).b-3},f),!1,"spacingBox"),!f.floating&&!f.verticalAlign))b=c.getBBox().height;d&&(d.css({width:(e.width||h)+"px"}).align(r({y:b+(f.margin-13)+g.fontMetrics(f.style.fontSize,
+d).b},e),!1,"spacingBox"),!e.floating&&!e.verticalAlign&&(b=Ka(b+d.getBBox().height)));c=this.titleOffset!==b;this.titleOffset=b;if(!this.isDirtyBox&&c)this.isDirtyBox=c,this.hasRendered&&p(a,!0)&&this.isDirtyBox&&this.redraw()},getChartSize:function(){var a=this.options.chart,b=a.width,a=a.height,c=this.renderToClone||this.renderTo;if(!s(b))this.containerWidth=hb(c,"width");if(!s(a))this.containerHeight=hb(c,"height");this.chartWidth=u(0,b||this.containerWidth||600);this.chartHeight=u(0,p(a,this.containerHeight>
+19?this.containerHeight:400))},cloneRenderTo:function(a){var b=this.renderToClone,c=this.container;a?b&&(this.renderTo.appendChild(c),Pa(b),delete this.renderToClone):(c&&c.parentNode===this.renderTo&&this.renderTo.removeChild(c),this.renderToClone=b=this.renderTo.cloneNode(0),A(b,{position:"absolute",top:"-9999px",display:"block"}),b.style.setProperty&&b.style.setProperty("display","block","important"),x.body.appendChild(b),c&&b.appendChild(c))},getContainer:function(){var a,b=this.options.chart,
+c,d,e;this.renderTo=a=b.renderTo;e="highcharts-"+tb++;if(Fa(a))this.renderTo=a=x.getElementById(a);a||oa(13,!0);c=z(F(a,"data-highcharts-chart"));!isNaN(c)&&W[c]&&W[c].hasRendered&&W[c].destroy();F(a,"data-highcharts-chart",this.index);a.innerHTML="";!b.skipClone&&!a.offsetWidth&&this.cloneRenderTo();this.getChartSize();c=this.chartWidth;d=this.chartHeight;this.container=a=$(Ja,{className:"highcharts-container"+(b.className?" "+b.className:""),id:e},r({position:"relative",overflow:"hidden",width:c+
+"px",height:d+"px",textAlign:"left",lineHeight:"normal",zIndex:0,"-webkit-tap-highlight-color":"rgba(0,0,0,0)"},b.style),this.renderToClone||a);this._cursor=a.style.cursor;this.renderer=b.forExport?new ta(a,c,d,b.style,!0):new Ya(a,c,d,b.style);ga&&this.renderer.create(this,a,c,d)},getMargins:function(){var a=this.spacing,b,c=this.legend,d=this.margin,e=this.options.legend,f=p(e.margin,20),g=e.x,h=e.y,i=e.align,j=e.verticalAlign,k=this.titleOffset;this.resetMargins();b=this.axisOffset;if(k&&!s(d[0]))this.plotTop=
+u(this.plotTop,k+this.options.title.margin+a[0]);if(c.display&&!e.floating)if(i==="right"){if(!s(d[1]))this.marginRight=u(this.marginRight,c.legendWidth-g+f+a[1])}else if(i==="left"){if(!s(d[3]))this.plotLeft=u(this.plotLeft,c.legendWidth+g+f+a[3])}else if(j==="top"){if(!s(d[0]))this.plotTop=u(this.plotTop,c.legendHeight+h+f+a[0])}else if(j==="bottom"&&!s(d[2]))this.marginBottom=u(this.marginBottom,c.legendHeight-h+f+a[2]);this.extraBottomMargin&&(this.marginBottom+=this.extraBottomMargin);this.extraTopMargin&&
+(this.plotTop+=this.extraTopMargin);this.hasCartesianSeries&&q(this.axes,function(a){a.getOffset()});s(d[3])||(this.plotLeft+=b[3]);s(d[0])||(this.plotTop+=b[0]);s(d[2])||(this.marginBottom+=b[2]);s(d[1])||(this.marginRight+=b[1]);this.setChartSize()},reflow:function(a){var b=this,c=b.options.chart,d=b.renderTo,e=c.width||hb(d,"width"),f=c.height||hb(d,"height"),c=a?a.target:H,d=function(){if(b.container)b.setSize(e,f,!1),b.hasUserSize=null};if(!b.hasUserSize&&e&&f&&(c===H||c===x)){if(e!==b.containerWidth||
+f!==b.containerHeight)clearTimeout(b.reflowTimeout),a?b.reflowTimeout=setTimeout(d,100):d();b.containerWidth=e;b.containerHeight=f}},initReflow:function(){var a=this,b=function(b){a.reflow(b)};N(H,"resize",b);N(a,"destroy",function(){X(H,"resize",b)})},setSize:function(a,b,c){var d=this,e,f,g;d.isResizing+=1;g=function(){d&&K(d,"endResize",null,function(){d.isResizing-=1})};Qa(c,d);d.oldChartHeight=d.chartHeight;d.oldChartWidth=d.chartWidth;if(s(a))d.chartWidth=e=u(0,v(a)),d.hasUserSize=!!e;if(s(b))d.chartHeight=
+f=u(0,v(b));(va?ib:A)(d.container,{width:e+"px",height:f+"px"},va);d.setChartSize(!0);d.renderer.setSize(e,f,c);d.maxTicks=null;q(d.axes,function(a){a.isDirty=!0;a.setScale()});q(d.series,function(a){a.isDirty=!0});d.isDirtyLegend=!0;d.isDirtyBox=!0;d.layOutTitles();d.getMargins();d.redraw(c);d.oldChartHeight=null;K(d,"resize");va===!1?g():setTimeout(g,va&&va.duration||500)},setChartSize:function(a){var b=this.inverted,c=this.renderer,d=this.chartWidth,e=this.chartHeight,f=this.options.chart,g=this.spacing,
+h=this.clipOffset,i,j,k,l;this.plotLeft=i=v(this.plotLeft);this.plotTop=j=v(this.plotTop);this.plotWidth=k=u(0,v(d-i-this.marginRight));this.plotHeight=l=u(0,v(e-j-this.marginBottom));this.plotSizeX=b?l:k;this.plotSizeY=b?k:l;this.plotBorderWidth=f.plotBorderWidth||0;this.spacingBox=c.spacingBox={x:g[3],y:g[0],width:d-g[3]-g[1],height:e-g[0]-g[2]};this.plotBox=c.plotBox={x:i,y:j,width:k,height:l};d=2*U(this.plotBorderWidth/2);b=Ka(u(d,h[3])/2);c=Ka(u(d,h[0])/2);this.clipBox={x:b,y:c,width:U(this.plotSizeX-
+u(d,h[1])/2-b),height:u(0,U(this.plotSizeY-u(d,h[2])/2-c))};a||q(this.axes,function(a){a.setAxisSize();a.setAxisTranslation()})},resetMargins:function(){var a=this.spacing,b=this.margin;this.plotTop=p(b[0],a[0]);this.marginRight=p(b[1],a[1]);this.marginBottom=p(b[2],a[2]);this.plotLeft=p(b[3],a[3]);this.axisOffset=[0,0,0,0];this.clipOffset=[0,0,0,0]},drawChartBox:function(){var a=this.options.chart,b=this.renderer,c=this.chartWidth,d=this.chartHeight,e=this.chartBackground,f=this.plotBackground,g=
+this.plotBorder,h=this.plotBGImage,i=a.borderWidth||0,j=a.backgroundColor,k=a.plotBackgroundColor,l=a.plotBackgroundImage,m=a.plotBorderWidth||0,n,o=this.plotLeft,p=this.plotTop,q=this.plotWidth,r=this.plotHeight,u=this.plotBox,s=this.clipRect,v=this.clipBox;n=i+(a.shadow?8:0);if(i||j)if(e)e.animate(e.crisp({width:c-n,height:d-n}));else{e={fill:j||P};if(i)e.stroke=a.borderColor,e["stroke-width"]=i;this.chartBackground=b.rect(n/2,n/2,c-n,d-n,a.borderRadius,i).attr(e).addClass("highcharts-background").add().shadow(a.shadow)}if(k)f?
+f.animate(u):this.plotBackground=b.rect(o,p,q,r,0).attr({fill:k}).add().shadow(a.plotShadow);if(l)h?h.animate(u):this.plotBGImage=b.image(l,o,p,q,r).add();s?s.animate({width:v.width,height:v.height}):this.clipRect=b.clipRect(v);if(m)g?g.animate(g.crisp({x:o,y:p,width:q,height:r})):this.plotBorder=b.rect(o,p,q,r,0,-m).attr({stroke:a.plotBorderColor,"stroke-width":m,fill:P,zIndex:1}).add();this.isDirtyBox=!1},propFromSeries:function(){var a=this,b=a.options.chart,c,d=a.options.series,e,f;q(["inverted",
+"angular","polar"],function(g){c=J[b.type||b.defaultSeriesType];f=a[g]||b[g]||c&&c.prototype[g];for(e=d&&d.length;!f&&e--;)(c=J[d[e].type])&&c.prototype[g]&&(f=!0);a[g]=f})},linkSeries:function(){var a=this,b=a.series;q(b,function(a){a.linkedSeries.length=0});q(b,function(b){var d=b.options.linkedTo;if(Fa(d)&&(d=d===":previous"?a.series[b.index-1]:a.get(d)))d.linkedSeries.push(b),b.linkedParent=d})},renderSeries:function(){q(this.series,function(a){a.translate();a.setTooltipPoints&&a.setTooltipPoints();
+a.render()})},renderLabels:function(){var a=this,b=a.options.labels;b.items&&q(b.items,function(c){var d=r(b.style,c.style),e=z(d.left)+a.plotLeft,f=z(d.top)+a.plotTop+12;delete d.left;delete d.top;a.renderer.text(c.html,e,f).attr({zIndex:2}).css(d).add()})},render:function(){var a=this.axes,b=this.renderer,c=this.options;this.setTitle();this.legend=new kb(this,c.legend);this.getStacks();q(a,function(a){a.setScale()});this.getMargins();this.maxTicks=null;q(a,function(a){a.setTickPositions(!0);a.setMaxTicks()});
+this.adjustTickAmounts();this.getMargins();this.drawChartBox();this.hasCartesianSeries&&q(a,function(a){a.render()});if(!this.seriesGroup)this.seriesGroup=b.g("series-group").attr({zIndex:3}).add();this.renderSeries();this.renderLabels();this.showCredits(c.credits);this.hasRendered=!0},showCredits:function(a){if(a.enabled&&!this.credits)this.credits=this.renderer.text(a.text,0,0).on("click",function(){if(a.href)location.href=a.href}).attr({align:a.position.align,zIndex:8}).css(a.style).add().align(a.position)},
+destroy:function(){var a=this,b=a.axes,c=a.series,d=a.container,e,f=d&&d.parentNode;K(a,"destroy");W[a.index]=t;$a--;a.renderTo.removeAttribute("data-highcharts-chart");X(a);for(e=b.length;e--;)b[e]=b[e].destroy();for(e=c.length;e--;)c[e]=c[e].destroy();q("title,subtitle,chartBackground,plotBackground,plotBGImage,plotBorder,seriesGroup,clipRect,credits,pointer,scroller,rangeSelector,legend,resetZoomButton,tooltip,renderer".split(","),function(b){var c=a[b];c&&c.destroy&&(a[b]=c.destroy())});if(d)d.innerHTML=
+"",X(d),f&&Pa(d);for(e in a)delete a[e]},isReadyToRender:function(){var a=this;return!ba&&H==H.top&&x.readyState!=="complete"||ga&&!H.canvg?(ga?Lb.push(function(){a.firstRender()},a.options.global.canvasToolsURL):x.attachEvent("onreadystatechange",function(){x.detachEvent("onreadystatechange",a.firstRender);x.readyState==="complete"&&a.firstRender()}),!1):!0},firstRender:function(){var a=this,b=a.options,c=a.callback;if(a.isReadyToRender()){a.getContainer();K(a,"init");a.resetMargins();a.setChartSize();
+a.propFromSeries();a.getAxes();q(b.series||[],function(b){a.initSeries(b)});a.linkSeries();K(a,"beforeRender");if(S.Pointer)a.pointer=new Va(a,b);a.render();a.renderer.draw();c&&c.apply(a,[a]);q(a.callbacks,function(b){b.apply(a,[a])});a.cloneRenderTo(!0);K(a,"load")}},splashArray:function(a,b){var c=b[a],c=da(c)?c:[c,c,c,c];return[p(b[a+"Top"],c[0]),p(b[a+"Right"],c[1]),p(b[a+"Bottom"],c[2]),p(b[a+"Left"],c[3])]}};Xa.prototype.callbacks=[];Z=S.CenteredSeriesMixin={getCenter:function(){var a=this.options,
+b=this.chart,c=2*(a.slicedOffset||0),d,e=b.plotWidth-2*c,f=b.plotHeight-2*c,b=a.center,a=[p(b[0],"50%"),p(b[1],"50%"),a.size||"100%",a.innerSize||0],g=C(e,f),h;return Ua(a,function(a,b){h=/%$/.test(a);d=b<2||b===2&&h;return(h?[e,f,g,g][b]*z(a)/100:a)+(d?c:0)})}};var Ea=function(){};Ea.prototype={init:function(a,b,c){this.series=a;this.applyOptions(b,c);this.pointAttr={};if(a.options.colorByPoint&&(b=a.options.colors||a.chart.options.colors,this.color=this.color||b[a.colorCounter++],a.colorCounter===
+b.length))a.colorCounter=0;a.chart.pointCount++;return this},applyOptions:function(a,b){var c=this.series,d=c.options.pointValKey||c.pointValKey,a=Ea.prototype.optionsToObject.call(this,a);r(this,a);this.options=this.options?r(this.options,a):a;if(d)this.y=this[d];if(this.x===t&&c)this.x=b===t?c.autoIncrement():b;return this},optionsToObject:function(a){var b={},c=this.series,d=c.pointArrayMap||["y"],e=d.length,f=0,g=0;if(typeof a==="number"||a===null)b[d[0]]=a;else if(La(a)){if(a.length>e){c=typeof a[0];
+if(c==="string")b.name=a[0];else if(c==="number")b.x=a[0];f++}for(;g<e;)b[d[g++]]=a[f++]}else if(typeof a==="object"){b=a;if(a.dataLabels)c._hasPointLabels=!0;if(a.marker)c._hasPointMarkers=!0}return b},destroy:function(){var a=this.series.chart,b=a.hoverPoints,c;a.pointCount--;if(b&&(this.setState(),ka(b,this),!b.length))a.hoverPoints=null;if(this===a.hoverPoint)this.onMouseOut();if(this.graphic||this.dataLabel)X(this),this.destroyElements();this.legendItem&&a.legend.destroyItem(this);for(c in this)this[c]=
+null},destroyElements:function(){for(var a="graphic,dataLabel,dataLabelUpper,group,connector,shadowGroup".split(","),b,c=6;c--;)b=a[c],this[b]&&(this[b]=this[b].destroy())},getLabelConfig:function(){return{x:this.category,y:this.y,key:this.name||this.category,series:this.series,point:this,percentage:this.percentage,total:this.total||this.stackTotal}},tooltipFormatter:function(a){var b=this.series,c=b.tooltipOptions,d=p(c.valueDecimals,""),e=c.valuePrefix||"",f=c.valueSuffix||"";q(b.pointArrayMap||
+["y"],function(b){b="{point."+b;if(e||f)a=a.replace(b+"}",e+b+"}"+f);a=a.replace(b+"}",b+":,."+d+"f}")});return Ia(a,{point:this,series:this.series})},firePointEvent:function(a,b,c){var d=this,e=this.series.options;(e.point.events[a]||d.options&&d.options.events&&d.options.events[a])&&this.importEvents();a==="click"&&e.allowPointSelect&&(c=function(a){d.select(null,a.ctrlKey||a.metaKey||a.shiftKey)});K(this,a,b,c)}};var O=function(){};O.prototype={isCartesian:!0,type:"line",pointClass:Ea,sorted:!0,
+requireSorting:!0,pointAttrToOptions:{stroke:"lineColor","stroke-width":"lineWidth",fill:"fillColor",r:"radius"},axisTypes:["xAxis","yAxis"],colorCounter:0,parallelArrays:["x","y"],init:function(a,b){var c=this,d,e,f=a.series,g=function(a,b){return p(a.options.index,a._i)-p(b.options.index,b._i)};c.chart=a;c.options=b=c.setOptions(b);c.linkedSeries=[];c.bindAxes();r(c,{name:b.name,state:"",pointAttr:{},visible:b.visible!==!1,selected:b.selected===!0});if(ga)b.animation=!1;e=b.events;for(d in e)N(c,
+d,e[d]);if(e&&e.click||b.point&&b.point.events&&b.point.events.click||b.allowPointSelect)a.runTrackerClick=!0;c.getColor();c.getSymbol();q(c.parallelArrays,function(a){c[a+"Data"]=[]});c.setData(b.data,!1);if(c.isCartesian)a.hasCartesianSeries=!0;f.push(c);c._i=f.length-1;nb(f,g);this.yAxis&&nb(this.yAxis.series,g);q(f,function(a,b){a.index=b;a.name=a.name||"Series "+(b+1)})},bindAxes:function(){var a=this,b=a.options,c=a.chart,d;q(a.axisTypes||[],function(e){q(c[e],function(c){d=c.options;if(b[e]===
+d.index||b[e]!==t&&b[e]===d.id||b[e]===t&&d.index===0)c.series.push(a),a[e]=c,c.isDirty=!0});!a[e]&&a.optionalAxis!==e&&oa(18,!0)})},updateParallelArrays:function(a,b){var c=a.series,d=arguments;q(c.parallelArrays,typeof b==="number"?function(d){var f=d==="y"&&c.toYData?c.toYData(a):a[d];c[d+"Data"][b]=f}:function(a){Array.prototype[b].apply(c[a+"Data"],Array.prototype.slice.call(d,2))})},autoIncrement:function(){var a=this.options,b=this.xIncrement,b=p(b,a.pointStart,0);this.pointInterval=p(this.pointInterval,
+a.pointInterval,1);this.xIncrement=b+this.pointInterval;return b},getSegments:function(){var a=-1,b=[],c,d=this.points,e=d.length;if(e)if(this.options.connectNulls){for(c=e;c--;)d[c].y===null&&d.splice(c,1);d.length&&(b=[d])}else q(d,function(c,g){c.y===null?(g>a+1&&b.push(d.slice(a+1,g)),a=g):g===e-1&&b.push(d.slice(a+1,g+1))});this.segments=b},setOptions:function(a){var b=this.chart,c=b.options.plotOptions,b=b.userOptions||{},d=b.plotOptions||{},e=c[this.type];this.userOptions=a;c=w(e,c.series,
+a);this.tooltipOptions=w(L.tooltip,L.plotOptions[this.type].tooltip,b.tooltip,d.series&&d.series.tooltip,d[this.type]&&d[this.type].tooltip,a.tooltip);e.marker===null&&delete c.marker;return c},getCyclic:function(a,b,c){var d=this.userOptions,e="_"+a+"Index",f=a+"Counter";b||(s(d[e])?b=d[e]:(d[e]=b=this.chart[f]%c.length,this.chart[f]+=1),b=c[b]);this[a]=b},getColor:function(){this.options.colorByPoint||this.getCyclic("color",this.options.color||ca[this.type].color,this.chart.options.colors)},getSymbol:function(){var a=
+this.options.marker;this.getCyclic("symbol",a.symbol,this.chart.options.symbols);if(/^url/.test(this.symbol))a.radius=0},drawLegendSymbol:M.drawLineMarker,setData:function(a,b,c,d){var e=this,f=e.points,g=f&&f.length||0,h,i=e.options,j=e.chart,k=null,l=e.xAxis,m=l&&!!l.categories,n=e.tooltipPoints,o=i.turboThreshold,r=this.xData,u=this.yData,s=(h=e.pointArrayMap)&&h.length,a=a||[];h=a.length;b=p(b,!0);if(d!==!1&&h&&g===h&&!e.cropped&&!e.hasGroupedData)q(a,function(a,b){f[b].update(a,!1)});else{e.xIncrement=
+null;e.pointRange=m?1:i.pointRange;e.colorCounter=0;q(this.parallelArrays,function(a){e[a+"Data"].length=0});if(o&&h>o){for(c=0;k===null&&c<h;)k=a[c],c++;if(ia(k)){m=p(i.pointStart,0);i=p(i.pointInterval,1);for(c=0;c<h;c++)r[c]=m,u[c]=a[c],m+=i;e.xIncrement=m}else if(La(k))if(s)for(c=0;c<h;c++)i=a[c],r[c]=i[0],u[c]=i.slice(1,s+1);else for(c=0;c<h;c++)i=a[c],r[c]=i[0],u[c]=i[1];else oa(12)}else for(c=0;c<h;c++)if(a[c]!==t&&(i={series:e},e.pointClass.prototype.applyOptions.apply(i,[a[c]]),e.updateParallelArrays(i,
+c),m&&i.name))l.names[i.x]=i.name;Fa(u[0])&&oa(14,!0);e.data=[];e.options.data=a;for(c=g;c--;)f[c]&&f[c].destroy&&f[c].destroy();if(n)n.length=0;if(l)l.minRange=l.userMinRange;e.isDirty=e.isDirtyData=j.isDirtyBox=!0;c=!1}b&&j.redraw(c)},processData:function(a){var b=this.xData,c=this.yData,d=b.length,e;e=0;var f,g,h=this.xAxis,i=this.options,j=i.cropThreshold,k=0,l=this.isCartesian,m,n;if(l&&!this.isDirty&&!h.isDirty&&!this.yAxis.isDirty&&!a)return!1;if(l&&this.sorted&&(!j||d>j||this.forceCrop))if(m=
+h.getExtremes(),n=m.min,m=m.max,b[d-1]<n||b[0]>m)b=[],c=[];else if(b[0]<n||b[d-1]>m)e=this.cropData(this.xData,this.yData,n,m),b=e.xData,c=e.yData,e=e.start,f=!0,k=b.length;for(a=b.length-1;a>=0;a--)d=b[a]-b[a-1],!f&&b[a]>n&&b[a]<m&&k++,d>0&&(g===t||d<g)?g=d:d<0&&this.requireSorting&&oa(15);this.cropped=f;this.cropStart=e;this.processedXData=b;this.processedYData=c;this.activePointCount=k;if(i.pointRange===null)this.pointRange=g||1;this.closestPointRange=g},cropData:function(a,b,c,d){var e=a.length,
+f=0,g=e,h=p(this.cropShoulder,1),i;for(i=0;i<e;i++)if(a[i]>=c){f=u(0,i-h);break}for(;i<e;i++)if(a[i]>d){g=i+h;break}return{xData:a.slice(f,g),yData:b.slice(f,g),start:f,end:g}},generatePoints:function(){var a=this.options.data,b=this.data,c,d=this.processedXData,e=this.processedYData,f=this.pointClass,g=d.length,h=this.cropStart||0,i,j=this.hasGroupedData,k,l=[],m;if(!b&&!j)b=[],b.length=a.length,b=this.data=b;for(m=0;m<g;m++)i=h+m,j?l[m]=(new f).init(this,[d[m]].concat(ra(e[m]))):(b[i]?k=b[i]:a[i]!==
+t&&(b[i]=k=(new f).init(this,a[i],d[m])),l[m]=k);if(b&&(g!==(c=b.length)||j))for(m=0;m<c;m++)if(m===h&&!j&&(m+=g),b[m])b[m].destroyElements(),b[m].plotX=t;this.data=b;this.points=l},getExtremes:function(a){var b=this.yAxis,c=this.processedXData,d,e=[],f=0;d=this.xAxis.getExtremes();var g=d.min,h=d.max,i,j,k,l,a=a||this.stackedYData||this.processedYData;d=a.length;for(l=0;l<d;l++)if(j=c[l],k=a[l],i=k!==null&&k!==t&&(!b.isLog||k.length||k>0),j=this.getExtremesFromAll||this.cropped||(c[l+1]||j)>=g&&
+(c[l-1]||j)<=h,i&&j)if(i=k.length)for(;i--;)k[i]!==null&&(e[f++]=k[i]);else e[f++]=k;this.dataMin=p(void 0,Na(e));this.dataMax=p(void 0,Ba(e))},translate:function(){this.processedXData||this.processData();this.generatePoints();for(var a=this.options,b=a.stacking,c=this.xAxis,d=c.categories,e=this.yAxis,f=this.points,g=f.length,h=!!this.modifyValue,i=a.pointPlacement,j=i==="between"||ia(i),k=a.threshold,a=0;a<g;a++){var l=f[a],m=l.x,n=l.y,o=l.low,q=b&&e.stacks[(this.negStacks&&n<k?"-":"")+this.stackKey];
+if(e.isLog&&n<=0)l.y=n=null;l.plotX=c.translate(m,0,0,0,1,i,this.type==="flags");if(b&&this.visible&&q&&q[m])q=q[m],n=q.points[this.index+","+a],o=n[0],n=n[1],o===0&&(o=p(k,e.min)),e.isLog&&o<=0&&(o=null),l.total=l.stackTotal=q.total,l.percentage=q.total&&l.y/q.total*100,l.stackY=n,q.setOffset(this.pointXOffset||0,this.barW||0);l.yBottom=s(o)?e.translate(o,0,1,0,1):null;h&&(n=this.modifyValue(n,l));l.plotY=typeof n==="number"&&n!==Infinity?e.translate(n,0,1,0,1):t;l.clientX=j?c.translate(m,0,0,0,
+1):l.plotX;l.negative=l.y<(k||0);l.category=d&&d[l.x]!==t?d[l.x]:l.x}this.getSegments()},animate:function(a){var b=this.chart,c=b.renderer,d;d=this.options.animation;var e=this.clipBox||b.clipBox,f=b.inverted,g;if(d&&!da(d))d=ca[this.type].animation;g=["_sharedClip",d.duration,d.easing,e.height].join(",");a?(a=b[g],d=b[g+"m"],a||(b[g]=a=c.clipRect(r(e,{width:0})),b[g+"m"]=d=c.clipRect(-99,f?-b.plotLeft:-b.plotTop,99,f?b.chartWidth:b.chartHeight)),this.group.clip(a),this.markerGroup.clip(d),this.sharedClipKey=
+g):((a=b[g])&&a.animate({width:b.plotSizeX},d),b[g+"m"]&&b[g+"m"].animate({width:b.plotSizeX+99},d),this.animate=null)},afterAnimate:function(){var a=this.chart,b=this.sharedClipKey,c=this.group,d=this.clipBox;if(c&&this.options.clip!==!1){if(!b||!d)c.clip(d?a.renderer.clipRect(d):a.clipRect);this.markerGroup.clip()}K(this,"afterAnimate");setTimeout(function(){b&&a[b]&&(d||(a[b]=a[b].destroy()),a[b+"m"]&&(a[b+"m"]=a[b+"m"].destroy()))},100)},drawPoints:function(){var a,b=this.points,c=this.chart,
+d,e,f,g,h,i,j,k;d=this.options.marker;var l=this.pointAttr[""],m,n=this.markerGroup,o=p(d.enabled,this.activePointCount<0.5*this.xAxis.len/d.radius);if(d.enabled!==!1||this._hasPointMarkers)for(f=b.length;f--;)if(g=b[f],d=U(g.plotX),e=g.plotY,k=g.graphic,i=g.marker||{},a=o&&i.enabled===t||i.enabled,m=c.isInsidePlot(v(d),e,c.inverted),a&&e!==t&&!isNaN(e)&&g.y!==null)if(a=g.pointAttr[g.selected?"select":""]||l,h=a.r,i=p(i.symbol,this.symbol),j=i.indexOf("url")===0,k)k[m?"show":"hide"](!0).animate(r({x:d-
+h,y:e-h},k.symbolName?{width:2*h,height:2*h}:{}));else{if(m&&(h>0||j))g.graphic=c.renderer.symbol(i,d-h,e-h,2*h,2*h).attr(a).add(n)}else if(k)g.graphic=k.destroy()},convertAttribs:function(a,b,c,d){var e=this.pointAttrToOptions,f,g,h={},a=a||{},b=b||{},c=c||{},d=d||{};for(f in e)g=e[f],h[f]=p(a[g],b[f],c[f],d[f]);return h},getAttribs:function(){var a=this,b=a.options,c=ca[a.type].marker?b.marker:b,d=c.states,e=d.hover,f,g=a.color;f={stroke:g,fill:g};var h=a.points||[],i,j=[],k,l=a.pointAttrToOptions;
+k=a.hasPointSpecificOptions;var m=b.negativeColor,n=c.lineColor,o=c.fillColor;i=b.turboThreshold;var p;b.marker?(e.radius=e.radius||c.radius+e.radiusPlus,e.lineWidth=e.lineWidth||c.lineWidth+e.lineWidthPlus):e.color=e.color||ya(e.color||g).brighten(e.brightness).get();j[""]=a.convertAttribs(c,f);q(["hover","select"],function(b){j[b]=a.convertAttribs(d[b],j[""])});a.pointAttr=j;g=h.length;if(!i||g<i||k)for(;g--;){i=h[g];if((c=i.options&&i.options.marker||i.options)&&c.enabled===!1)c.radius=0;if(i.negative&&
+m)i.color=i.fillColor=m;k=b.colorByPoint||i.color;if(i.options)for(p in l)s(c[l[p]])&&(k=!0);if(k){c=c||{};k=[];d=c.states||{};f=d.hover=d.hover||{};if(!b.marker)f.color=f.color||!i.options.color&&e.color||ya(i.color).brighten(f.brightness||e.brightness).get();f={color:i.color};if(!o)f.fillColor=i.color;if(!n)f.lineColor=i.color;k[""]=a.convertAttribs(r(f,c),j[""]);k.hover=a.convertAttribs(d.hover,j.hover,k[""]);k.select=a.convertAttribs(d.select,j.select,k[""])}else k=j;i.pointAttr=k}},destroy:function(){var a=
+this,b=a.chart,c=/AppleWebKit\/533/.test(wa),d,e,f=a.data||[],g,h,i;K(a,"destroy");X(a);q(a.axisTypes||[],function(b){if(i=a[b])ka(i.series,a),i.isDirty=i.forceRedraw=!0});a.legendItem&&a.chart.legend.destroyItem(a);for(e=f.length;e--;)(g=f[e])&&g.destroy&&g.destroy();a.points=null;clearTimeout(a.animationTimeout);q("area,graph,dataLabelsGroup,group,markerGroup,tracker,graphNeg,areaNeg,posClip,negClip".split(","),function(b){a[b]&&(d=c&&b==="group"?"hide":"destroy",a[b][d]())});if(b.hoverSeries===
+a)b.hoverSeries=null;ka(b.series,a);for(h in a)delete a[h]},getSegmentPath:function(a){var b=this,c=[],d=b.options.step;q(a,function(e,f){var g=e.plotX,h=e.plotY,i;b.getPointSpline?c.push.apply(c,b.getPointSpline(a,e,f)):(c.push(f?"L":"M"),d&&f&&(i=a[f-1],d==="right"?c.push(i.plotX,h):d==="center"?c.push((i.plotX+g)/2,i.plotY,(i.plotX+g)/2,h):c.push(g,i.plotY)),c.push(e.plotX,e.plotY))});return c},getGraphPath:function(){var a=this,b=[],c,d=[];q(a.segments,function(e){c=a.getSegmentPath(e);e.length>
+1?b=b.concat(c):d.push(e[0])});a.singlePoints=d;return a.graphPath=b},drawGraph:function(){var a=this,b=this.options,c=[["graph",b.lineColor||this.color]],d=b.lineWidth,e=b.dashStyle,f=b.linecap!=="square",g=this.getGraphPath(),h=b.negativeColor;h&&c.push(["graphNeg",h]);q(c,function(c,h){var k=c[0],l=a[k];if(l)ab(l),l.animate({d:g});else if(d&&g.length)l={stroke:c[1],"stroke-width":d,fill:P,zIndex:1},e?l.dashstyle=e:f&&(l["stroke-linecap"]=l["stroke-linejoin"]="round"),a[k]=a.chart.renderer.path(g).attr(l).add(a.group).shadow(!h&&
+b.shadow)})},clipNeg:function(){var a=this.options,b=this.chart,c=b.renderer,d=a.negativeColor||a.negativeFillColor,e,f=this.graph,g=this.area,h=this.posClip,i=this.negClip;e=b.chartWidth;var j=b.chartHeight,k=u(e,j),l=this.yAxis;if(d&&(f||g)){d=v(l.toPixels(a.threshold||0,!0));d<0&&(k-=d);a={x:0,y:0,width:k,height:d};k={x:0,y:d,width:k,height:k};if(b.inverted)a.height=k.y=b.plotWidth-d,c.isVML&&(a={x:b.plotWidth-d-b.plotLeft,y:0,width:e,height:j},k={x:d+b.plotLeft-e,y:0,width:b.plotLeft+d,height:e});
+l.reversed?(b=k,e=a):(b=a,e=k);h?(h.animate(b),i.animate(e)):(this.posClip=h=c.clipRect(b),this.negClip=i=c.clipRect(e),f&&this.graphNeg&&(f.clip(h),this.graphNeg.clip(i)),g&&(g.clip(h),this.areaNeg.clip(i)))}},invertGroups:function(){function a(){var a={width:b.yAxis.len,height:b.xAxis.len};q(["group","markerGroup"],function(c){b[c]&&b[c].attr(a).invert()})}var b=this,c=b.chart;if(b.xAxis)N(c,"resize",a),N(b,"destroy",function(){X(c,"resize",a)}),a(),b.invertGroups=a},plotGroup:function(a,b,c,d,
+e){var f=this[a],g=!f;g&&(this[a]=f=this.chart.renderer.g(b).attr({visibility:c,zIndex:d||0.1}).add(e));f[g?"attr":"animate"](this.getPlotBox());return f},getPlotBox:function(){var a=this.chart,b=this.xAxis,c=this.yAxis;if(a.inverted)b=c,c=this.xAxis;return{translateX:b?b.left:a.plotLeft,translateY:c?c.top:a.plotTop,scaleX:1,scaleY:1}},render:function(){var a=this,b=a.chart,c,d=a.options,e=(c=d.animation)&&!!a.animate&&b.renderer.isSVG&&p(c.duration,500)||0,f=a.visible?"visible":"hidden",g=d.zIndex,
+h=a.hasRendered,i=b.seriesGroup;c=a.plotGroup("group","series",f,g,i);a.markerGroup=a.plotGroup("markerGroup","markers",f,g,i);e&&a.animate(!0);a.getAttribs();c.inverted=a.isCartesian?b.inverted:!1;a.drawGraph&&(a.drawGraph(),a.clipNeg());a.drawDataLabels&&a.drawDataLabels();a.visible&&a.drawPoints();a.drawTracker&&a.options.enableMouseTracking!==!1&&a.drawTracker();b.inverted&&a.invertGroups();d.clip!==!1&&!a.sharedClipKey&&!h&&c.clip(b.clipRect);e&&a.animate();if(!h)e?a.animationTimeout=setTimeout(function(){a.afterAnimate()},
+e):a.afterAnimate();a.isDirty=a.isDirtyData=!1;a.hasRendered=!0},redraw:function(){var a=this.chart,b=this.isDirtyData,c=this.group,d=this.xAxis,e=this.yAxis;c&&(a.inverted&&c.attr({width:a.plotWidth,height:a.plotHeight}),c.animate({translateX:p(d&&d.left,a.plotLeft),translateY:p(e&&e.top,a.plotTop)}));this.translate();this.setTooltipPoints&&this.setTooltipPoints(!0);this.render();b&&K(this,"updatedData")}};Fb.prototype={destroy:function(){Oa(this,this.axis)},render:function(a){var b=this.options,
+c=b.format,c=c?Ia(c,this):b.formatter.call(this);this.label?this.label.attr({text:c,visibility:"hidden"}):this.label=this.axis.chart.renderer.text(c,null,null,b.useHTML).css(b.style).attr({align:this.textAlign,rotation:b.rotation,visibility:"hidden"}).add(a)},setOffset:function(a,b){var c=this.axis,d=c.chart,e=d.inverted,f=this.isNegative,g=c.translate(c.usePercentage?100:this.total,0,0,0,1),c=c.translate(0),c=Q(g-c),h=d.xAxis[0].translate(this.x)+a,i=d.plotHeight,f={x:e?f?g:g-c:h,y:e?i-h-b:f?i-g-
+c:i-g,width:e?c:b,height:e?b:c};if(e=this.label)e.align(this.alignOptions,null,f),f=e.alignAttr,e[this.options.crop===!1||d.isInsidePlot(f.x,f.y)?"show":"hide"](!0)}};ma.prototype.buildStacks=function(){var a=this.series,b=p(this.options.reversedStacks,!0),c=a.length;if(!this.isXAxis){for(this.usePercentage=!1;c--;)a[b?c:a.length-c-1].setStackedPoints();if(this.usePercentage)for(c=0;c<a.length;c++)a[c].setPercentStacks()}};ma.prototype.renderStackTotals=function(){var a=this.chart,b=a.renderer,c=
+this.stacks,d,e,f=this.stackTotalGroup;if(!f)this.stackTotalGroup=f=b.g("stack-labels").attr({visibility:"visible",zIndex:6}).add();f.translate(a.plotLeft,a.plotTop);for(d in c)for(e in a=c[d],a)a[e].render(f)};O.prototype.setStackedPoints=function(){if(this.options.stacking&&!(this.visible!==!0&&this.chart.options.chart.ignoreHiddenSeries!==!1)){var a=this.processedXData,b=this.processedYData,c=[],d=b.length,e=this.options,f=e.threshold,g=e.stack,e=e.stacking,h=this.stackKey,i="-"+h,j=this.negStacks,
+k=this.yAxis,l=k.stacks,m=k.oldStacks,n,o,p,q,r,s;for(q=0;q<d;q++){r=a[q];s=b[q];p=this.index+","+q;o=(n=j&&s<f)?i:h;l[o]||(l[o]={});if(!l[o][r])m[o]&&m[o][r]?(l[o][r]=m[o][r],l[o][r].total=null):l[o][r]=new Fb(k,k.options.stackLabels,n,r,g);o=l[o][r];o.points[p]=[o.cum||0];e==="percent"?(n=n?h:i,j&&l[n]&&l[n][r]?(n=l[n][r],o.total=n.total=u(n.total,o.total)+Q(s)||0):o.total=ea(o.total+(Q(s)||0))):o.total=ea(o.total+(s||0));o.cum=(o.cum||0)+(s||0);o.points[p].push(o.cum);c[q]=o.cum}if(e==="percent")k.usePercentage=
+!0;this.stackedYData=c;k.oldStacks={}}};O.prototype.setPercentStacks=function(){var a=this,b=a.stackKey,c=a.yAxis.stacks,d=a.processedXData;q([b,"-"+b],function(b){var e;for(var f=d.length,g,h;f--;)if(g=d[f],e=(h=c[b]&&c[b][g])&&h.points[a.index+","+f],g=e)h=h.total?100/h.total:0,g[0]=ea(g[0]*h),g[1]=ea(g[1]*h),a.stackedYData[f]=g[1]})};r(Xa.prototype,{addSeries:function(a,b,c){var d,e=this;a&&(b=p(b,!0),K(e,"addSeries",{options:a},function(){d=e.initSeries(a);e.isDirtyLegend=!0;e.linkSeries();b&&
+e.redraw(c)}));return d},addAxis:function(a,b,c,d){var e=b?"xAxis":"yAxis",f=this.options;new ma(this,w(a,{index:this[e].length,isX:b}));f[e]=ra(f[e]||{});f[e].push(a);p(c,!0)&&this.redraw(d)},showLoading:function(a){var b=this,c=b.options,d=b.loadingDiv,e=c.loading,f=function(){d&&A(d,{left:b.plotLeft+"px",top:b.plotTop+"px",width:b.plotWidth+"px",height:b.plotHeight+"px"})};if(!d)b.loadingDiv=d=$(Ja,{className:"highcharts-loading"},r(e.style,{zIndex:10,display:P}),b.container),b.loadingSpan=$("span",
+null,e.labelStyle,d),N(b,"redraw",f);b.loadingSpan.innerHTML=a||c.lang.loading;if(!b.loadingShown)A(d,{opacity:0,display:""}),ib(d,{opacity:e.style.opacity},{duration:e.showDuration||0}),b.loadingShown=!0;f()},hideLoading:function(){var a=this.options,b=this.loadingDiv;b&&ib(b,{opacity:0},{duration:a.loading.hideDuration||100,complete:function(){A(b,{display:P})}});this.loadingShown=!1}});r(Ea.prototype,{update:function(a,b,c){var d=this,e=d.series,f=d.graphic,g,h=e.data,i=e.chart,j=e.options,b=p(b,
+!0);d.firePointEvent("update",{options:a},function(){d.applyOptions(a);if(da(a)){e.getAttribs();if(f)a&&a.marker&&a.marker.symbol?d.graphic=f.destroy():f.attr(d.pointAttr[d.state||""]);if(a&&a.dataLabels&&d.dataLabel)d.dataLabel=d.dataLabel.destroy()}g=Da(d,h);e.updateParallelArrays(d,g);j.data[g]=d.options;e.isDirty=e.isDirtyData=!0;if(!e.fixedBox&&e.hasCartesianSeries)i.isDirtyBox=!0;j.legendType==="point"&&i.legend.destroyItem(d);b&&i.redraw(c)})},remove:function(a,b){var c=this,d=c.series,e=d.points,
+f=d.chart,g,h=d.data;Qa(b,f);a=p(a,!0);c.firePointEvent("remove",null,function(){g=Da(c,h);h.length===e.length&&e.splice(g,1);h.splice(g,1);d.options.data.splice(g,1);d.updateParallelArrays(c,"splice",g,1);c.destroy();d.isDirty=!0;d.isDirtyData=!0;a&&f.redraw()})}});r(O.prototype,{addPoint:function(a,b,c,d){var e=this.options,f=this.data,g=this.graph,h=this.area,i=this.chart,j=this.xAxis&&this.xAxis.names,k=g&&g.shift||0,l=e.data,m,n=this.xData;Qa(d,i);c&&q([g,h,this.graphNeg,this.areaNeg],function(a){if(a)a.shift=
+k+1});if(h)h.isArea=!0;b=p(b,!0);d={series:this};this.pointClass.prototype.applyOptions.apply(d,[a]);g=d.x;h=n.length;if(this.requireSorting&&g<n[h-1])for(m=!0;h&&n[h-1]>g;)h--;this.updateParallelArrays(d,"splice",h,0,0);this.updateParallelArrays(d,h);if(j)j[g]=d.name;l.splice(h,0,a);m&&(this.data.splice(h,0,null),this.processData());e.legendType==="point"&&this.generatePoints();c&&(f[0]&&f[0].remove?f[0].remove(!1):(f.shift(),this.updateParallelArrays(d,"shift"),l.shift()));this.isDirtyData=this.isDirty=
+!0;b&&(this.getAttribs(),i.redraw())},remove:function(a,b){var c=this,d=c.chart,a=p(a,!0);if(!c.isRemoving)c.isRemoving=!0,K(c,"remove",null,function(){c.destroy();d.isDirtyLegend=d.isDirtyBox=!0;d.linkSeries();a&&d.redraw(b)});c.isRemoving=!1},update:function(a,b){var c=this,d=this.chart,e=this.userOptions,f=this.type,g=J[f].prototype,h=["group","markerGroup","dataLabelsGroup"],i;q(h,function(a){h[a]=c[a];delete c[a]});a=w(e,{animation:!1,index:this.index,pointStart:this.xData[0]},{data:this.options.data},
+a);this.remove(!1);for(i in g)g.hasOwnProperty(i)&&(this[i]=t);r(this,J[a.type||f].prototype);q(h,function(a){c[a]=h[a]});this.init(d,a);d.linkSeries();p(b,!0)&&d.redraw(!1)}});r(ma.prototype,{update:function(a,b){var c=this.chart,a=c.options[this.coll][this.options.index]=w(this.userOptions,a);this.destroy(!0);this._addedPlotLB=t;this.init(c,r(a,{events:t}));c.isDirtyBox=!0;p(b,!0)&&c.redraw()},remove:function(a){for(var b=this.chart,c=this.coll,d=this.series,e=d.length;e--;)d[e]&&d[e].remove(!1);
+ka(b.axes,this);ka(b[c],this);b.options[c].splice(this.options.index,1);q(b[c],function(a,b){a.options.index=b});this.destroy();b.isDirtyBox=!0;p(a,!0)&&b.redraw()},setTitle:function(a,b){this.update({title:a},b)},setCategories:function(a,b){this.update({categories:a},b)}});ha=la(O);J.line=ha;ca.area=w(T,{threshold:0});var qa=la(O,{type:"area",getSegments:function(){var a=this,b=[],c=[],d=[],e=this.xAxis,f=this.yAxis,g=f.stacks[this.stackKey],h={},i,j,k=this.points,l=this.options.connectNulls,m,n;
+if(this.options.stacking&&!this.cropped){for(m=0;m<k.length;m++)h[k[m].x]=k[m];for(n in g)g[n].total!==null&&d.push(+n);d.sort(function(a,b){return a-b});q(d,function(b){var d=0,k;if(!l||h[b]&&h[b].y!==null)if(h[b])c.push(h[b]);else{for(m=a.index;m<=f.series.length;m++)if(k=g[b].points[m+","+b]){d=k[1];break}i=e.translate(b);j=f.toPixels(d,!0);c.push({y:null,plotX:i,clientX:i,plotY:j,yBottom:j,onMouseOver:sa})}});c.length&&b.push(c)}else O.prototype.getSegments.call(this),b=this.segments;this.segments=
+b},getSegmentPath:function(a){var b=O.prototype.getSegmentPath.call(this,a),c=[].concat(b),d,e=this.options;d=b.length;var f=this.yAxis.getThreshold(e.threshold),g;d===3&&c.push("L",b[1],b[2]);if(e.stacking&&!this.closedStacks)for(d=a.length-1;d>=0;d--)g=p(a[d].yBottom,f),d<a.length-1&&e.step&&c.push(a[d+1].plotX,g),c.push(a[d].plotX,g);else this.closeSegment(c,a,f);this.areaPath=this.areaPath.concat(c);return b},closeSegment:function(a,b,c){a.push("L",b[b.length-1].plotX,c,"L",b[0].plotX,c)},drawGraph:function(){this.areaPath=
+[];O.prototype.drawGraph.apply(this);var a=this,b=this.areaPath,c=this.options,d=c.negativeColor,e=c.negativeFillColor,f=[["area",this.color,c.fillColor]];(d||e)&&f.push(["areaNeg",d,e]);q(f,function(d){var e=d[0],f=a[e];f?f.animate({d:b}):a[e]=a.chart.renderer.path(b).attr({fill:p(d[2],ya(d[1]).setOpacity(p(c.fillOpacity,0.75)).get()),zIndex:0}).add(a.group)})},drawLegendSymbol:M.drawRectangle});J.area=qa;ca.spline=w(T);ha=la(O,{type:"spline",getPointSpline:function(a,b,c){var d=b.plotX,e=b.plotY,
+f=a[c-1],g=a[c+1],h,i,j,k;if(f&&g){a=f.plotY;j=g.plotX;var g=g.plotY,l;h=(1.5*d+f.plotX)/2.5;i=(1.5*e+a)/2.5;j=(1.5*d+j)/2.5;k=(1.5*e+g)/2.5;l=(k-i)*(j-d)/(j-h)+e-k;i+=l;k+=l;i>a&&i>e?(i=u(a,e),k=2*e-i):i<a&&i<e&&(i=C(a,e),k=2*e-i);k>g&&k>e?(k=u(g,e),i=2*e-k):k<g&&k<e&&(k=C(g,e),i=2*e-k);b.rightContX=j;b.rightContY=k}c?(b=["C",f.rightContX||f.plotX,f.rightContY||f.plotY,h||d,i||e,d,e],f.rightContX=f.rightContY=null):b=["M",d,e];return b}});J.spline=ha;ca.areaspline=w(ca.area);qa=qa.prototype;ha=la(ha,
+{type:"areaspline",closedStacks:!0,getSegmentPath:qa.getSegmentPath,closeSegment:qa.closeSegment,drawGraph:qa.drawGraph,drawLegendSymbol:M.drawRectangle});J.areaspline=ha;ca.column=w(T,{borderColor:"#FFFFFF",borderRadius:0,groupPadding:0.2,marker:null,pointPadding:0.1,minPointLength:0,cropThreshold:50,pointRange:null,states:{hover:{brightness:0.1,shadow:!1,halo:!1},select:{color:"#C0C0C0",borderColor:"#000000",shadow:!1}},dataLabels:{align:null,verticalAlign:null,y:null},stickyTracking:!1,tooltip:{distance:6},
+threshold:0});ha=la(O,{type:"column",pointAttrToOptions:{stroke:"borderColor",fill:"color",r:"borderRadius"},cropShoulder:0,trackerGroups:["group","dataLabelsGroup"],negStacks:!0,init:function(){O.prototype.init.apply(this,arguments);var a=this,b=a.chart;b.hasRendered&&q(b.series,function(b){if(b.type===a.type)b.isDirty=!0})},getColumnMetrics:function(){var a=this,b=a.options,c=a.xAxis,d=a.yAxis,e=c.reversed,f,g={},h,i=0;b.grouping===!1?i=1:q(a.chart.series,function(b){var c=b.options,e=b.yAxis;if(b.type===
+a.type&&b.visible&&d.len===e.len&&d.pos===e.pos)c.stacking?(f=b.stackKey,g[f]===t&&(g[f]=i++),h=g[f]):c.grouping!==!1&&(h=i++),b.columnIndex=h});var c=C(Q(c.transA)*(c.ordinalSlope||b.pointRange||c.closestPointRange||c.tickInterval||1),c.len),j=c*b.groupPadding,k=(c-2*j)/i,l=b.pointWidth,b=s(l)?(k-l)/2:k*b.pointPadding,l=p(l,k-2*b);return a.columnMetrics={width:l,offset:b+(j+((e?i-(a.columnIndex||0):a.columnIndex)||0)*k-c/2)*(e?-1:1)}},translate:function(){var a=this,b=a.chart,c=a.options,d=a.borderWidth=
+p(c.borderWidth,a.activePointCount>0.5*a.xAxis.len?0:1),e=a.yAxis,f=a.translatedThreshold=e.getThreshold(c.threshold),g=p(c.minPointLength,5),h=a.getColumnMetrics(),i=h.width,j=a.barW=u(i,1+2*d),k=a.pointXOffset=h.offset,l=-(d%2?0.5:0),m=d%2?0.5:1;b.renderer.isVML&&b.inverted&&(m+=1);c.pointPadding&&(j=Ka(j));O.prototype.translate.apply(a);q(a.points,function(c){var d=p(c.yBottom,f),h=C(u(-999-d,c.plotY),e.len+999+d),q=c.plotX+k,r=j,s=C(h,d),t;t=u(h,d)-s;Q(t)<g&&g&&(t=g,s=v(Q(s-f)>g?d-g:f-(e.translate(c.y,
+0,1,0,1)<=f?g:0)));c.barX=q;c.pointWidth=i;c.tooltipPos=b.inverted?[e.len-h,a.xAxis.len-q-r/2]:[q+r/2,h];r=v(q+r)+l;q=v(q)+l;r-=q;d=Q(s)<0.5;t=v(s+t)+m;s=v(s)+m;t-=s;d&&(s-=1,t+=1);c.shapeType="rect";c.shapeArgs={x:q,y:s,width:r,height:t}})},getSymbol:sa,drawLegendSymbol:M.drawRectangle,drawGraph:sa,drawPoints:function(){var a=this,b=this.chart,c=a.options,d=b.renderer,e=c.animationLimit||250,f,g;q(a.points,function(h){var i=h.plotY,j=h.graphic;if(i!==t&&!isNaN(i)&&h.y!==null)f=h.shapeArgs,i=s(a.borderWidth)?
+{"stroke-width":a.borderWidth}:{},g=h.pointAttr[h.selected?"select":""]||a.pointAttr[""],j?(ab(j),j.attr(i)[b.pointCount<e?"animate":"attr"](w(f))):h.graphic=d[h.shapeType](f).attr(g).attr(i).add(a.group).shadow(c.shadow,null,c.stacking&&!c.borderRadius);else if(j)h.graphic=j.destroy()})},animate:function(a){var b=this.yAxis,c=this.options,d=this.chart.inverted,e={};if(ba)a?(e.scaleY=0.001,a=C(b.pos+b.len,u(b.pos,b.toPixels(c.threshold))),d?e.translateX=a-b.len:e.translateY=a,this.group.attr(e)):
+(e.scaleY=1,e[d?"translateX":"translateY"]=b.pos,this.group.animate(e,this.options.animation),this.animate=null)},remove:function(){var a=this,b=a.chart;b.hasRendered&&q(b.series,function(b){if(b.type===a.type)b.isDirty=!0});O.prototype.remove.apply(a,arguments)}});J.column=ha;ca.bar=w(ca.column);qa=la(ha,{type:"bar",inverted:!0});J.bar=qa;ca.scatter=w(T,{lineWidth:0,tooltip:{headerFormat:'<span style="color:{series.color}">●</span> <span style="font-size: 10px;"> {series.name}</span><br/>',pointFormat:"x: <b>{point.x}</b><br/>y: <b>{point.y}</b><br/>"},
+stickyTracking:!1});qa=la(O,{type:"scatter",sorted:!1,requireSorting:!1,noSharedTooltip:!0,trackerGroups:["markerGroup","dataLabelsGroup"],takeOrdinalPosition:!1,singularTooltips:!0,drawGraph:function(){this.options.lineWidth&&O.prototype.drawGraph.call(this)}});J.scatter=qa;ca.pie=w(T,{borderColor:"#FFFFFF",borderWidth:1,center:[null,null],clip:!1,colorByPoint:!0,dataLabels:{distance:30,enabled:!0,formatter:function(){return this.point.name}},ignoreHiddenPoint:!0,legendType:"point",marker:null,size:null,
+showInLegend:!1,slicedOffset:10,states:{hover:{brightness:0.1,shadow:!1}},stickyTracking:!1,tooltip:{followPointer:!0}});T={type:"pie",isCartesian:!1,pointClass:la(Ea,{init:function(){Ea.prototype.init.apply(this,arguments);var a=this,b;if(a.y<0)a.y=null;r(a,{visible:a.visible!==!1,name:p(a.name,"Slice")});b=function(b){a.slice(b.type==="select")};N(a,"select",b);N(a,"unselect",b);return a},setVisible:function(a){var b=this,c=b.series,d=c.chart;b.visible=b.options.visible=a=a===t?!b.visible:a;c.options.data[Da(b,
+c.data)]=b.options;q(["graphic","dataLabel","connector","shadowGroup"],function(c){if(b[c])b[c][a?"show":"hide"](!0)});b.legendItem&&d.legend.colorizeItem(b,a);if(!c.isDirty&&c.options.ignoreHiddenPoint)c.isDirty=!0,d.redraw()},slice:function(a,b,c){var d=this.series;Qa(c,d.chart);p(b,!0);this.sliced=this.options.sliced=a=s(a)?a:!this.sliced;d.options.data[Da(this,d.data)]=this.options;a=a?this.slicedTranslation:{translateX:0,translateY:0};this.graphic.animate(a);this.shadowGroup&&this.shadowGroup.animate(a)},
+haloPath:function(a){var b=this.shapeArgs,c=this.series.chart;return this.sliced||!this.visible?[]:this.series.chart.renderer.symbols.arc(c.plotLeft+b.x,c.plotTop+b.y,b.r+a,b.r+a,{innerR:this.shapeArgs.r,start:b.start,end:b.end})}}),requireSorting:!1,noSharedTooltip:!0,trackerGroups:["group","dataLabelsGroup"],axisTypes:[],pointAttrToOptions:{stroke:"borderColor","stroke-width":"borderWidth",fill:"color"},singularTooltips:!0,getColor:sa,animate:function(a){var b=this,c=b.points,d=b.startAngleRad;
+if(!a)q(c,function(a){var c=a.graphic,a=a.shapeArgs;c&&(c.attr({r:b.center[3]/2,start:d,end:d}),c.animate({r:a.r,start:a.start,end:a.end},b.options.animation))}),b.animate=null},setData:function(a,b,c,d){O.prototype.setData.call(this,a,!1,c,d);this.processData();this.generatePoints();p(b,!0)&&this.chart.redraw(c)},generatePoints:function(){var a,b=0,c,d,e,f=this.options.ignoreHiddenPoint;O.prototype.generatePoints.call(this);c=this.points;d=c.length;for(a=0;a<d;a++)e=c[a],b+=f&&!e.visible?0:e.y;this.total=
+b;for(a=0;a<d;a++)e=c[a],e.percentage=b>0?e.y/b*100:0,e.total=b},translate:function(a){this.generatePoints();var b=0,c=this.options,d=c.slicedOffset,e=d+c.borderWidth,f,g,h,i=c.startAngle||0,j=this.startAngleRad=na/180*(i-90),i=(this.endAngleRad=na/180*(p(c.endAngle,i+360)-90))-j,k=this.points,l=c.dataLabels.distance,c=c.ignoreHiddenPoint,m,n=k.length,o;if(!a)this.center=a=this.getCenter();this.getX=function(b,c){h=V.asin(C((b-a[1])/(a[2]/2+l),1));return a[0]+(c?-1:1)*aa(h)*(a[2]/2+l)};for(m=0;m<
+n;m++){o=k[m];f=j+b*i;if(!c||o.visible)b+=o.percentage/100;g=j+b*i;o.shapeType="arc";o.shapeArgs={x:a[0],y:a[1],r:a[2]/2,innerR:a[3]/2,start:v(f*1E3)/1E3,end:v(g*1E3)/1E3};h=(g+f)/2;h>1.5*na?h-=2*na:h<-na/2&&(h+=2*na);o.slicedTranslation={translateX:v(aa(h)*d),translateY:v(fa(h)*d)};f=aa(h)*a[2]/2;g=fa(h)*a[2]/2;o.tooltipPos=[a[0]+f*0.7,a[1]+g*0.7];o.half=h<-na/2||h>na/2?1:0;o.angle=h;e=C(e,l/2);o.labelPos=[a[0]+f+aa(h)*l,a[1]+g+fa(h)*l,a[0]+f+aa(h)*e,a[1]+g+fa(h)*e,a[0]+f,a[1]+g,l<0?"center":o.half?
+"right":"left",h]}},drawGraph:null,drawPoints:function(){var a=this,b=a.chart.renderer,c,d,e=a.options.shadow,f,g;if(e&&!a.shadowGroup)a.shadowGroup=b.g("shadow").add(a.group);q(a.points,function(h){d=h.graphic;g=h.shapeArgs;f=h.shadowGroup;if(e&&!f)f=h.shadowGroup=b.g("shadow").add(a.shadowGroup);c=h.sliced?h.slicedTranslation:{translateX:0,translateY:0};f&&f.attr(c);d?d.animate(r(g,c)):h.graphic=d=b[h.shapeType](g).setRadialReference(a.center).attr(h.pointAttr[h.selected?"select":""]).attr({"stroke-linejoin":"round"}).attr(c).add(a.group).shadow(e,
+f);h.visible!==void 0&&h.setVisible(h.visible)})},sortByAngle:function(a,b){a.sort(function(a,d){return a.angle!==void 0&&(d.angle-a.angle)*b})},drawLegendSymbol:M.drawRectangle,getCenter:Z.getCenter,getSymbol:sa};T=la(O,T);J.pie=T;O.prototype.drawDataLabels=function(){var a=this,b=a.options,c=b.cursor,d=b.dataLabels,e=a.points,f,g,h,i;if(d.enabled||a._hasPointLabels)a.dlProcessOptions&&a.dlProcessOptions(d),i=a.plotGroup("dataLabelsGroup","data-labels",d.defer?"hidden":"visible",d.zIndex||6),!a.hasRendered&&
+p(d.defer,!0)&&(i.attr({opacity:0}),N(a,"afterAnimate",function(){a.visible&&i.show();i[b.animation?"animate":"attr"]({opacity:1},{duration:200})})),g=d,q(e,function(b){var e,l=b.dataLabel,m,n,o=b.connector,q=!0;f=b.options&&b.options.dataLabels;e=p(f&&f.enabled,g.enabled);if(l&&!e)b.dataLabel=l.destroy();else if(e){d=w(g,f);e=d.rotation;m=b.getLabelConfig();h=d.format?Ia(d.format,m):d.formatter.call(m,d);d.style.color=p(d.color,d.style.color,a.color,"black");if(l)if(s(h))l.attr({text:h}),q=!1;else{if(b.dataLabel=
+l=l.destroy(),o)b.connector=o.destroy()}else if(s(h)){l={fill:d.backgroundColor,stroke:d.borderColor,"stroke-width":d.borderWidth,r:d.borderRadius||0,rotation:e,padding:d.padding,zIndex:1};for(n in l)l[n]===t&&delete l[n];l=b.dataLabel=a.chart.renderer[e?"text":"label"](h,0,-999,null,null,null,d.useHTML).attr(l).css(r(d.style,c&&{cursor:c})).add(i).shadow(d.shadow)}l&&a.alignDataLabel(b,l,d,null,q)}})};O.prototype.alignDataLabel=function(a,b,c,d,e){var f=this.chart,g=f.inverted,h=p(a.plotX,-999),
+i=p(a.plotY,-999),j=b.getBBox();if(a=this.visible&&(a.series.forceDL||f.isInsidePlot(h,v(i),g)||d&&f.isInsidePlot(h,g?d.x+1:d.y+d.height-1,g)))d=r({x:g?f.plotWidth-i:h,y:v(g?f.plotHeight-h:i),width:0,height:0},d),r(c,{width:j.width,height:j.height}),c.rotation?b[e?"attr":"animate"]({x:d.x+c.x+d.width/2,y:d.y+c.y+d.height/2}).attr({align:c.align}):(b.align(c,null,d),g=b.alignAttr,p(c.overflow,"justify")==="justify"?this.justifyDataLabel(b,c,g,j,d,e):p(c.crop,!0)&&(a=f.isInsidePlot(g.x,g.y)&&f.isInsidePlot(g.x+
+j.width,g.y+j.height)));if(!a)b.attr({y:-999}),b.placed=!1};O.prototype.justifyDataLabel=function(a,b,c,d,e,f){var g=this.chart,h=b.align,i=b.verticalAlign,j,k;j=c.x;if(j<0)h==="right"?b.align="left":b.x=-j,k=!0;j=c.x+d.width;if(j>g.plotWidth)h==="left"?b.align="right":b.x=g.plotWidth-j,k=!0;j=c.y;if(j<0)i==="bottom"?b.verticalAlign="top":b.y=-j,k=!0;j=c.y+d.height;if(j>g.plotHeight)i==="top"?b.verticalAlign="bottom":b.y=g.plotHeight-j,k=!0;if(k)a.placed=!f,a.align(b,null,e)};if(J.pie)J.pie.prototype.drawDataLabels=
+function(){var a=this,b=a.data,c,d=a.chart,e=a.options.dataLabels,f=p(e.connectorPadding,10),g=p(e.connectorWidth,1),h=d.plotWidth,i=d.plotHeight,j,k,l=p(e.softConnector,!0),m=e.distance,n=a.center,o=n[2]/2,r=n[1],s=m>0,t,w,x,z=[[],[]],B,A,K,J,y,R=[0,0,0,0],N=function(a,b){return b.y-a.y};if(a.visible&&(e.enabled||a._hasPointLabels)){O.prototype.drawDataLabels.apply(a);q(b,function(a){a.dataLabel&&a.visible&&z[a.half].push(a)});for(J=2;J--;){var H=[],M=[],F=z[J],L=F.length,G;if(L){a.sortByAngle(F,
+J-0.5);for(y=b=0;!b&&F[y];)b=F[y]&&F[y].dataLabel&&(F[y].dataLabel.getBBox().height||21),y++;if(m>0){w=C(r+o+m,d.plotHeight);for(y=u(0,r-o-m);y<=w;y+=b)H.push(y);w=H.length;if(L>w){c=[].concat(F);c.sort(N);for(y=L;y--;)c[y].rank=y;for(y=L;y--;)F[y].rank>=w&&F.splice(y,1);L=F.length}for(y=0;y<L;y++){c=F[y];x=c.labelPos;c=9999;var S,P;for(P=0;P<w;P++)S=Q(H[P]-x[1]),S<c&&(c=S,G=P);if(G<y&&H[y]!==null)G=y;else for(w<L-y+G&&H[y]!==null&&(G=w-L+y);H[G]===null;)G++;M.push({i:G,y:H[G]});H[G]=null}M.sort(N)}for(y=
+0;y<L;y++){c=F[y];x=c.labelPos;t=c.dataLabel;K=c.visible===!1?"hidden":"visible";c=x[1];if(m>0){if(w=M.pop(),G=w.i,A=w.y,c>A&&H[G+1]!==null||c<A&&H[G-1]!==null)A=C(u(0,c),d.plotHeight)}else A=c;B=e.justify?n[0]+(J?-1:1)*(o+m):a.getX(A===r-o-m||A===r+o+m?c:A,J);t._attr={visibility:K,align:x[6]};t._pos={x:B+e.x+({left:f,right:-f}[x[6]]||0),y:A+e.y-10};t.connX=B;t.connY=A;if(this.options.size===null)w=t.width,B-w<f?R[3]=u(v(w-B+f),R[3]):B+w>h-f&&(R[1]=u(v(B+w-h+f),R[1])),A-b/2<0?R[0]=u(v(-A+b/2),R[0]):
+A+b/2>i&&(R[2]=u(v(A+b/2-i),R[2]))}}}if(Ba(R)===0||this.verifyDataLabelOverflow(R))this.placeDataLabels(),s&&g&&q(this.points,function(b){j=b.connector;x=b.labelPos;if((t=b.dataLabel)&&t._pos)K=t._attr.visibility,B=t.connX,A=t.connY,k=l?["M",B+(x[6]==="left"?5:-5),A,"C",B,A,2*x[2]-x[4],2*x[3]-x[5],x[2],x[3],"L",x[4],x[5]]:["M",B+(x[6]==="left"?5:-5),A,"L",x[2],x[3],"L",x[4],x[5]],j?(j.animate({d:k}),j.attr("visibility",K)):b.connector=j=a.chart.renderer.path(k).attr({"stroke-width":g,stroke:e.connectorColor||
+b.color||"#606060",visibility:K}).add(a.dataLabelsGroup);else if(j)b.connector=j.destroy()})}},J.pie.prototype.placeDataLabels=function(){q(this.points,function(a){var a=a.dataLabel,b;if(a)(b=a._pos)?(a.attr(a._attr),a[a.moved?"animate":"attr"](b),a.moved=!0):a&&a.attr({y:-999})})},J.pie.prototype.alignDataLabel=sa,J.pie.prototype.verifyDataLabelOverflow=function(a){var b=this.center,c=this.options,d=c.center,e=c=c.minSize||80,f;d[0]!==null?e=u(b[2]-u(a[1],a[3]),c):(e=u(b[2]-a[1]-a[3],c),b[0]+=(a[3]-
+a[1])/2);d[1]!==null?e=u(C(e,b[2]-u(a[0],a[2])),c):(e=u(C(e,b[2]-a[0]-a[2]),c),b[1]+=(a[0]-a[2])/2);e<b[2]?(b[2]=e,this.translate(b),q(this.points,function(a){if(a.dataLabel)a.dataLabel._pos=null}),this.drawDataLabels&&this.drawDataLabels()):f=!0;return f};if(J.column)J.column.prototype.alignDataLabel=function(a,b,c,d,e){var f=this.chart,g=f.inverted,h=a.dlBox||a.shapeArgs,i=a.below||a.plotY>p(this.translatedThreshold,f.plotSizeY),j=p(c.inside,!!this.options.stacking);if(h&&(d=w(h),g&&(d={x:f.plotWidth-
+d.y-d.height,y:f.plotHeight-d.x-d.width,width:d.height,height:d.width}),!j))g?(d.x+=i?0:d.width,d.width=0):(d.y+=i?d.height:0,d.height=0);c.align=p(c.align,!g||j?"center":i?"right":"left");c.verticalAlign=p(c.verticalAlign,g||j?"middle":i?"top":"bottom");O.prototype.alignDataLabel.call(this,a,b,c,d,e)};T=S.TrackerMixin={drawTrackerPoint:function(){var a=this,b=a.chart,c=b.pointer,d=a.options.cursor,e=d&&{cursor:d},f=function(c){var d=c.target,e;if(b.hoverSeries!==a)a.onMouseOver();for(;d&&!e;)e=d.point,
+d=d.parentNode;if(e!==t&&e!==b.hoverPoint)e.onMouseOver(c)};q(a.points,function(a){if(a.graphic)a.graphic.element.point=a;if(a.dataLabel)a.dataLabel.element.point=a});if(!a._hasTracking)q(a.trackerGroups,function(b){if(a[b]&&(a[b].addClass("highcharts-tracker").on("mouseover",f).on("mouseout",function(a){c.onTrackerMouseOut(a)}).css(e),Za))a[b].on("touchstart",f)}),a._hasTracking=!0},drawTrackerGraph:function(){var a=this,b=a.options,c=b.trackByArea,d=[].concat(c?a.areaPath:a.graphPath),e=d.length,
+f=a.chart,g=f.pointer,h=f.renderer,i=f.options.tooltip.snap,j=a.tracker,k=b.cursor,l=k&&{cursor:k},k=a.singlePoints,m,n=function(){if(f.hoverSeries!==a)a.onMouseOver()},o="rgba(192,192,192,"+(ba?1.0E-4:0.002)+")";if(e&&!c)for(m=e+1;m--;)d[m]==="M"&&d.splice(m+1,0,d[m+1]-i,d[m+2],"L"),(m&&d[m]==="M"||m===e)&&d.splice(m,0,"L",d[m-2]+i,d[m-1]);for(m=0;m<k.length;m++)e=k[m],d.push("M",e.plotX-i,e.plotY,"L",e.plotX+i,e.plotY);j?j.attr({d:d}):(a.tracker=h.path(d).attr({"stroke-linejoin":"round",visibility:a.visible?
+"visible":"hidden",stroke:o,fill:c?o:P,"stroke-width":b.lineWidth+(c?0:2*i),zIndex:2}).add(a.group),q([a.tracker,a.markerGroup],function(a){a.addClass("highcharts-tracker").on("mouseover",n).on("mouseout",function(a){g.onTrackerMouseOut(a)}).css(l);if(Za)a.on("touchstart",n)}))}};if(J.column)ha.prototype.drawTracker=T.drawTrackerPoint;if(J.pie)J.pie.prototype.drawTracker=T.drawTrackerPoint;if(J.scatter)qa.prototype.drawTracker=T.drawTrackerPoint;r(kb.prototype,{setItemEvents:function(a,b,c,d,e){var f=
+this;(c?b:a.legendGroup).on("mouseover",function(){a.setState("hover");b.css(f.options.itemHoverStyle)}).on("mouseout",function(){b.css(a.visible?d:e);a.setState()}).on("click",function(b){var c=function(){a.setVisible()},b={browserEvent:b};a.firePointEvent?a.firePointEvent("legendItemClick",b,c):K(a,"legendItemClick",b,c)})},createCheckboxForItem:function(a){a.checkbox=$("input",{type:"checkbox",checked:a.selected,defaultChecked:a.selected},this.options.itemCheckboxStyle,this.chart.container);N(a.checkbox,
+"click",function(b){K(a,"checkboxClick",{checked:b.target.checked},function(){a.select()})})}});L.legend.itemStyle.cursor="pointer";r(Xa.prototype,{showResetZoom:function(){var a=this,b=L.lang,c=a.options.chart.resetZoomButton,d=c.theme,e=d.states,f=c.relativeTo==="chart"?null:"plotBox";this.resetZoomButton=a.renderer.button(b.resetZoom,null,null,function(){a.zoomOut()},d,e&&e.hover).attr({align:c.position.align,title:b.resetZoomTitle}).add().align(c.position,!1,f)},zoomOut:function(){var a=this;
+K(a,"selection",{resetSelection:!0},function(){a.zoom()})},zoom:function(a){var b,c=this.pointer,d=!1,e;!a||a.resetSelection?q(this.axes,function(a){b=a.zoom()}):q(a.xAxis.concat(a.yAxis),function(a){var e=a.axis,h=e.isXAxis;if(c[h?"zoomX":"zoomY"]||c[h?"pinchX":"pinchY"])b=e.zoom(a.min,a.max),e.displayBtn&&(d=!0)});e=this.resetZoomButton;if(d&&!e)this.showResetZoom();else if(!d&&da(e))this.resetZoomButton=e.destroy();b&&this.redraw(p(this.options.chart.animation,a&&a.animation,this.pointCount<100))},
+pan:function(a,b){var c=this,d=c.hoverPoints,e;d&&q(d,function(a){a.setState()});q(b==="xy"?[1,0]:[1],function(b){var d=a[b?"chartX":"chartY"],h=c[b?"xAxis":"yAxis"][0],i=c[b?"mouseDownX":"mouseDownY"],j=(h.pointRange||0)/2,k=h.getExtremes(),l=h.toValue(i-d,!0)+j,i=h.toValue(i+c[b?"plotWidth":"plotHeight"]-d,!0)-j;h.series.length&&l>C(k.dataMin,k.min)&&i<u(k.dataMax,k.max)&&(h.setExtremes(l,i,!1,!1,{trigger:"pan"}),e=!0);c[b?"mouseDownX":"mouseDownY"]=d});e&&c.redraw(!1);A(c.container,{cursor:"move"})}});
+r(Ea.prototype,{select:function(a,b){var c=this,d=c.series,e=d.chart,a=p(a,!c.selected);c.firePointEvent(a?"select":"unselect",{accumulate:b},function(){c.selected=c.options.selected=a;d.options.data[Da(c,d.data)]=c.options;c.setState(a&&"select");b||q(e.getSelectedPoints(),function(a){if(a.selected&&a!==c)a.selected=a.options.selected=!1,d.options.data[Da(a,d.data)]=a.options,a.setState(""),a.firePointEvent("unselect")})})},onMouseOver:function(a){var b=this.series,c=b.chart,d=c.tooltip,e=c.hoverPoint;
+if(e&&e!==this)e.onMouseOut();this.firePointEvent("mouseOver");d&&(!d.shared||b.noSharedTooltip)&&d.refresh(this,a);this.setState("hover");c.hoverPoint=this},onMouseOut:function(){var a=this.series.chart,b=a.hoverPoints;this.firePointEvent("mouseOut");if(!b||Da(this,b)===-1)this.setState(),a.hoverPoint=null},importEvents:function(){if(!this.hasImportedEvents){var a=w(this.series.options.point,this.options).events,b;this.events=a;for(b in a)N(this,b,a[b]);this.hasImportedEvents=!0}},setState:function(a,
+b){var c=this.plotX,d=this.plotY,e=this.series,f=e.options.states,g=ca[e.type].marker&&e.options.marker,h=g&&!g.enabled,i=g&&g.states[a],j=i&&i.enabled===!1,k=e.stateMarkerGraphic,l=this.marker||{},m=e.chart,n=e.halo,o,a=a||"";o=this.pointAttr[a]||e.pointAttr[a];if(!(a===this.state&&!b||this.selected&&a!=="select"||f[a]&&f[a].enabled===!1||a&&(j||h&&i.enabled===!1)||a&&l.states&&l.states[a]&&l.states[a].enabled===!1)){if(this.graphic)g=g&&this.graphic.symbolName&&o.r,this.graphic.attr(w(o,g?{x:c-
+g,y:d-g,width:2*g,height:2*g}:{})),k&&k.hide();else{if(a&&i)if(g=i.radius,l=l.symbol||e.symbol,k&&k.currentSymbol!==l&&(k=k.destroy()),k)k[b?"animate":"attr"]({x:c-g,y:d-g});else if(l)e.stateMarkerGraphic=k=m.renderer.symbol(l,c-g,d-g,2*g,2*g).attr(o).add(e.markerGroup),k.currentSymbol=l;if(k)k[a&&m.isInsidePlot(c,d,m.inverted)?"show":"hide"]()}if((c=f[a]&&f[a].halo)&&c.size){if(!n)e.halo=n=m.renderer.path().add(e.seriesGroup);n.attr(r({fill:ya(this.color||e.color).setOpacity(c.opacity).get()},c.attributes))[b?
+"animate":"attr"]({d:this.haloPath(c.size)})}else n&&n.attr({d:[]});this.state=a}},haloPath:function(a){var b=this.series,c=b.chart,d=b.getPlotBox(),e=c.inverted;return c.renderer.symbols.circle(d.translateX+(e?b.yAxis.len-this.plotY:this.plotX)-a,d.translateY+(e?b.xAxis.len-this.plotX:this.plotY)-a,a*2,a*2)}});r(O.prototype,{onMouseOver:function(){var a=this.chart,b=a.hoverSeries;if(b&&b!==this)b.onMouseOut();this.options.events.mouseOver&&K(this,"mouseOver");this.setState("hover");a.hoverSeries=
+this},onMouseOut:function(){var a=this.options,b=this.chart,c=b.tooltip,d=b.hoverPoint;if(d)d.onMouseOut();this&&a.events.mouseOut&&K(this,"mouseOut");c&&!a.stickyTracking&&(!c.shared||this.noSharedTooltip)&&c.hide();this.setState();b.hoverSeries=null},setState:function(a){var b=this.options,c=this.graph,d=this.graphNeg,e=b.states,b=b.lineWidth,a=a||"";if(this.state!==a)this.state=a,e[a]&&e[a].enabled===!1||(a&&(b=e[a].lineWidth||b+(e[a].lineWidthPlus||0)),c&&!c.dashstyle&&(a={"stroke-width":b},c.attr(a),
+d&&d.attr(a)))},setVisible:function(a,b){var c=this,d=c.chart,e=c.legendItem,f,g=d.options.chart.ignoreHiddenSeries,h=c.visible;f=(c.visible=a=c.userOptions.visible=a===t?!h:a)?"show":"hide";q(["group","dataLabelsGroup","markerGroup","tracker"],function(a){if(c[a])c[a][f]()});if(d.hoverSeries===c)c.onMouseOut();e&&d.legend.colorizeItem(c,a);c.isDirty=!0;c.options.stacking&&q(d.series,function(a){if(a.options.stacking&&a.visible)a.isDirty=!0});q(c.linkedSeries,function(b){b.setVisible(a,!1)});if(g)d.isDirtyBox=
+!0;b!==!1&&d.redraw();K(c,f)},setTooltipPoints:function(a){var b=[],c,d,e=this.xAxis,f=e&&e.getExtremes(),g=e?e.tooltipLen||e.len:this.chart.plotSizeX,h,i,j=[];if(!(this.options.enableMouseTracking===!1||this.singularTooltips)){if(a)this.tooltipPoints=null;q(this.segments||this.points,function(a){b=b.concat(a)});e&&e.reversed&&(b=b.reverse());this.orderTooltipPoints&&this.orderTooltipPoints(b);a=b.length;for(i=0;i<a;i++)if(e=b[i],c=e.x,c>=f.min&&c<=f.max){h=b[i+1];c=d===t?0:d+1;for(d=b[i+1]?C(u(0,
+U((e.clientX+(h?h.wrappedClientX||h.clientX:g))/2)),g):g;c>=0&&c<=d;)j[c++]=e}this.tooltipPoints=j}},show:function(){this.setVisible(!0)},hide:function(){this.setVisible(!1)},select:function(a){this.selected=a=a===t?!this.selected:a;if(this.checkbox)this.checkbox.checked=a;K(this,a?"select":"unselect")},drawTracker:T.drawTrackerGraph});r(S,{Axis:ma,Chart:Xa,Color:ya,Point:Ea,Tick:Sa,Renderer:Ya,Series:O,SVGElement:G,SVGRenderer:ta,arrayMin:Na,arrayMax:Ba,charts:W,dateFormat:bb,format:Ia,pathAnim:ub,
+getOptions:function(){return L},hasBidiBug:Nb,isTouchDevice:Hb,numberFormat:Ga,seriesTypes:J,setOptions:function(a){L=w(!0,L,a);Ab();return L},addEvent:N,removeEvent:X,createElement:$,discardElement:Pa,css:A,each:q,extend:r,map:Ua,merge:w,pick:p,splat:ra,extendClass:la,pInt:z,wrap:Ma,svg:ba,canvas:ga,vml:!ba&&!ga,product:"Highcharts",version:"4.0.3"})})();
diff --git a/management/guns-admin/src/main/webapp/static/js/plugins/highcharts/highcharts.src.js b/management/guns-admin/src/main/webapp/static/js/plugins/highcharts/highcharts.src.js
new file mode 100644
index 0000000..d461476
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/static/js/plugins/highcharts/highcharts.src.js
@@ -0,0 +1,17696 @@
+// ==ClosureCompiler==
+// @compilation_level SIMPLE_OPTIMIZATIONS
+
+/**
+ * @license Highcharts JS v4.0.3 (2014-07-03)
+ *
+ * (c) 2009-2014 Torstein Honsi
+ *
+ * License: www.highcharts.com/license
+ */
+
+// JSLint options:
+/*global Highcharts, document, window, navigator, setInterval, clearInterval, clearTimeout, setTimeout, location, jQuery, $, console, each, grep */
+/*jslint ass: true, sloppy: true, forin: true, plusplus: true, nomen: true, vars: true, regexp: true, newcap: true, browser: true, continue: true, white: true */
+(function () {
+// encapsulated variables
+var UNDEFINED,
+ doc = document,
+ win = window,
+ math = Math,
+ mathRound = math.round,
+ mathFloor = math.floor,
+ mathCeil = math.ceil,
+ mathMax = math.max,
+ mathMin = math.min,
+ mathAbs = math.abs,
+ mathCos = math.cos,
+ mathSin = math.sin,
+ mathPI = math.PI,
+ deg2rad = mathPI * 2 / 360,
+
+
+ // some variables
+ userAgent = navigator.userAgent,
+ isOpera = win.opera,
+ isIE = /msie/i.test(userAgent) && !isOpera,
+ docMode8 = doc.documentMode === 8,
+ isWebKit = /AppleWebKit/.test(userAgent),
+ isFirefox = /Firefox/.test(userAgent),
+ isTouchDevice = /(Mobile|Android|Windows Phone)/.test(userAgent),
+ SVG_NS = 'http://www.w3.org/2000/svg',
+ hasSVG = !!doc.createElementNS && !!doc.createElementNS(SVG_NS, 'svg').createSVGRect,
+ hasBidiBug = isFirefox && parseInt(userAgent.split('Firefox/')[1], 10) < 4, // issue #38
+ useCanVG = !hasSVG && !isIE && !!doc.createElement('canvas').getContext,
+ Renderer,
+ hasTouch,
+ symbolSizes = {},
+ idCounter = 0,
+ garbageBin,
+ defaultOptions,
+ dateFormat, // function
+ globalAnimation,
+ pathAnim,
+ timeUnits,
+ error,
+ noop = function () { return UNDEFINED; },
+ charts = [],
+ chartCount = 0,
+ PRODUCT = 'Highcharts',
+ VERSION = '4.0.3',
+
+ // some constants for frequently used strings
+ DIV = 'div',
+ ABSOLUTE = 'absolute',
+ RELATIVE = 'relative',
+ HIDDEN = 'hidden',
+ PREFIX = 'highcharts-',
+ VISIBLE = 'visible',
+ PX = 'px',
+ NONE = 'none',
+ M = 'M',
+ L = 'L',
+ numRegex = /^[0-9]+$/,
+ NORMAL_STATE = '',
+ HOVER_STATE = 'hover',
+ SELECT_STATE = 'select',
+
+ // Object for extending Axis
+ AxisPlotLineOrBandExtension,
+
+ // constants for attributes
+ STROKE_WIDTH = 'stroke-width',
+
+ // time methods, changed based on whether or not UTC is used
+ makeTime,
+ timezoneOffset,
+ getMinutes,
+ getHours,
+ getDay,
+ getDate,
+ getMonth,
+ getFullYear,
+ setMinutes,
+ setHours,
+ setDate,
+ setMonth,
+ setFullYear,
+
+
+ // lookup over the types and the associated classes
+ seriesTypes = {},
+ Highcharts;
+
+// The Highcharts namespace
+if (win.Highcharts) {
+ error(16, true);
+} else {
+ Highcharts = win.Highcharts = {};
+}
+/**
+ * Extend an object with the members of another
+ * @param {Object} a The object to be extended
+ * @param {Object} b The object to add to the first one
+ */
+function extend(a, b) {
+ var n;
+ if (!a) {
+ a = {};
+ }
+ for (n in b) {
+ a[n] = b[n];
+ }
+ return a;
+}
+
+/**
+ * Deep merge two or more objects and return a third object. If the first argument is
+ * true, the contents of the second object is copied into the first object.
+ * Previously this function redirected to jQuery.extend(true), but this had two limitations.
+ * First, it deep merged arrays, which lead to workarounds in Highcharts. Second,
+ * it copied properties from extended prototypes.
+ */
+function merge() {
+ var i,
+ args = arguments,
+ len,
+ ret = {},
+ doCopy = function (copy, original) {
+ var value, key;
+
+ // An object is replacing a primitive
+ if (typeof copy !== 'object') {
+ copy = {};
+ }
+
+ for (key in original) {
+ if (original.hasOwnProperty(key)) {
+ value = original[key];
+
+ // Copy the contents of objects, but not arrays or DOM nodes
+ if (value && typeof value === 'object' && Object.prototype.toString.call(value) !== '[object Array]'
+ && key !== 'renderTo' && typeof value.nodeType !== 'number') {
+ copy[key] = doCopy(copy[key] || {}, value);
+
+ // Primitives and arrays are copied over directly
+ } else {
+ copy[key] = original[key];
+ }
+ }
+ }
+ return copy;
+ };
+
+ // If first argument is true, copy into the existing object. Used in setOptions.
+ if (args[0] === true) {
+ ret = args[1];
+ args = Array.prototype.slice.call(args, 2);
+ }
+
+ // For each argument, extend the return
+ len = args.length;
+ for (i = 0; i < len; i++) {
+ ret = doCopy(ret, args[i]);
+ }
+
+ return ret;
+}
+
+/**
+ * Shortcut for parseInt
+ * @param {Object} s
+ * @param {Number} mag Magnitude
+ */
+function pInt(s, mag) {
+ return parseInt(s, mag || 10);
+}
+
+/**
+ * Check for string
+ * @param {Object} s
+ */
+function isString(s) {
+ return typeof s === 'string';
+}
+
+/**
+ * Check for object
+ * @param {Object} obj
+ */
+function isObject(obj) {
+ return obj && typeof obj === 'object';
+}
+
+/**
+ * Check for array
+ * @param {Object} obj
+ */
+function isArray(obj) {
+ return Object.prototype.toString.call(obj) === '[object Array]';
+}
+
+/**
+ * Check for number
+ * @param {Object} n
+ */
+function isNumber(n) {
+ return typeof n === 'number';
+}
+
+function log2lin(num) {
+ return math.log(num) / math.LN10;
+}
+function lin2log(num) {
+ return math.pow(10, num);
+}
+
+/**
+ * Remove last occurence of an item from an array
+ * @param {Array} arr
+ * @param {Mixed} item
+ */
+function erase(arr, item) {
+ var i = arr.length;
+ while (i--) {
+ if (arr[i] === item) {
+ arr.splice(i, 1);
+ break;
+ }
+ }
+ //return arr;
+}
+
+/**
+ * Returns true if the object is not null or undefined. Like MooTools' $.defined.
+ * @param {Object} obj
+ */
+function defined(obj) {
+ return obj !== UNDEFINED && obj !== null;
+}
+
+/**
+ * Set or get an attribute or an object of attributes. Can't use jQuery attr because
+ * it attempts to set expando properties on the SVG element, which is not allowed.
+ *
+ * @param {Object} elem The DOM element to receive the attribute(s)
+ * @param {String|Object} prop The property or an abject of key-value pairs
+ * @param {String} value The value if a single property is set
+ */
+function attr(elem, prop, value) {
+ var key,
+ ret;
+
+ // if the prop is a string
+ if (isString(prop)) {
+ // set the value
+ if (defined(value)) {
+ elem.setAttribute(prop, value);
+
+ // get the value
+ } else if (elem && elem.getAttribute) { // elem not defined when printing pie demo...
+ ret = elem.getAttribute(prop);
+ }
+
+ // else if prop is defined, it is a hash of key/value pairs
+ } else if (defined(prop) && isObject(prop)) {
+ for (key in prop) {
+ elem.setAttribute(key, prop[key]);
+ }
+ }
+ return ret;
+}
+/**
+ * Check if an element is an array, and if not, make it into an array. Like
+ * MooTools' $.splat.
+ */
+function splat(obj) {
+ return isArray(obj) ? obj : [obj];
+}
+
+
+/**
+ * Return the first value that is defined. Like MooTools' $.pick.
+ */
+function pick() {
+ var args = arguments,
+ i,
+ arg,
+ length = args.length;
+ for (i = 0; i < length; i++) {
+ arg = args[i];
+ if (arg !== UNDEFINED && arg !== null) {
+ return arg;
+ }
+ }
+}
+
+/**
+ * Set CSS on a given element
+ * @param {Object} el
+ * @param {Object} styles Style object with camel case property names
+ */
+function css(el, styles) {
+ if (isIE && !hasSVG) { // #2686
+ if (styles && styles.opacity !== UNDEFINED) {
+ styles.filter = 'alpha(opacity=' + (styles.opacity * 100) + ')';
+ }
+ }
+ extend(el.style, styles);
+}
+
+/**
+ * Utility function to create element with attributes and styles
+ * @param {Object} tag
+ * @param {Object} attribs
+ * @param {Object} styles
+ * @param {Object} parent
+ * @param {Object} nopad
+ */
+function createElement(tag, attribs, styles, parent, nopad) {
+ var el = doc.createElement(tag);
+ if (attribs) {
+ extend(el, attribs);
+ }
+ if (nopad) {
+ css(el, {padding: 0, border: NONE, margin: 0});
+ }
+ if (styles) {
+ css(el, styles);
+ }
+ if (parent) {
+ parent.appendChild(el);
+ }
+ return el;
+}
+
+/**
+ * Extend a prototyped class by new members
+ * @param {Object} parent
+ * @param {Object} members
+ */
+function extendClass(parent, members) {
+ var object = function () { return UNDEFINED; };
+ object.prototype = new parent();
+ extend(object.prototype, members);
+ return object;
+}
+
+/**
+ * Format a number and return a string based on input settings
+ * @param {Number} number The input number to format
+ * @param {Number} decimals The amount of decimals
+ * @param {String} decPoint The decimal point, defaults to the one given in the lang options
+ * @param {String} thousandsSep The thousands separator, defaults to the one given in the lang options
+ */
+function numberFormat(number, decimals, decPoint, thousandsSep) {
+ var lang = defaultOptions.lang,
+ // http://kevin.vanzonneveld.net/techblog/article/javascript_equivalent_for_phps_number_format/
+ n = +number || 0,
+ c = decimals === -1 ?
+ (n.toString().split('.')[1] || '').length : // preserve decimals
+ (isNaN(decimals = mathAbs(decimals)) ? 2 : decimals),
+ d = decPoint === undefined ? lang.decimalPoint : decPoint,
+ t = thousandsSep === undefined ? lang.thousandsSep : thousandsSep,
+ s = n < 0 ? "-" : "",
+ i = String(pInt(n = mathAbs(n).toFixed(c))),
+ j = i.length > 3 ? i.length % 3 : 0;
+
+ return s + (j ? i.substr(0, j) + t : "") + i.substr(j).replace(/(\d{3})(?=\d)/g, "$1" + t) +
+ (c ? d + mathAbs(n - i).toFixed(c).slice(2) : "");
+}
+
+/**
+ * Pad a string to a given length by adding 0 to the beginning
+ * @param {Number} number
+ * @param {Number} length
+ */
+function pad(number, length) {
+ // Create an array of the remaining length +1 and join it with 0's
+ return new Array((length || 2) + 1 - String(number).length).join(0) + number;
+}
+
+/**
+ * Wrap a method with extended functionality, preserving the original function
+ * @param {Object} obj The context object that the method belongs to
+ * @param {String} method The name of the method to extend
+ * @param {Function} func A wrapper function callback. This function is called with the same arguments
+ * as the original function, except that the original function is unshifted and passed as the first
+ * argument.
+ */
+function wrap(obj, method, func) {
+ var proceed = obj[method];
+ obj[method] = function () {
+ var args = Array.prototype.slice.call(arguments);
+ args.unshift(proceed);
+ return func.apply(this, args);
+ };
+}
+
+/**
+ * Based on http://www.php.net/manual/en/function.strftime.php
+ * @param {String} format
+ * @param {Number} timestamp
+ * @param {Boolean} capitalize
+ */
+dateFormat = function (format, timestamp, capitalize) {
+ if (!defined(timestamp) || isNaN(timestamp)) {
+ return 'Invalid date';
+ }
+ format = pick(format, '%Y-%m-%d %H:%M:%S');
+
+ var date = new Date(timestamp - timezoneOffset),
+ key, // used in for constuct below
+ // get the basic time values
+ hours = date[getHours](),
+ day = date[getDay](),
+ dayOfMonth = date[getDate](),
+ month = date[getMonth](),
+ fullYear = date[getFullYear](),
+ lang = defaultOptions.lang,
+ langWeekdays = lang.weekdays,
+
+ // List all format keys. Custom formats can be added from the outside.
+ replacements = extend({
+
+ // Day
+ 'a': langWeekdays[day].substr(0, 3), // Short weekday, like 'Mon'
+ 'A': langWeekdays[day], // Long weekday, like 'Monday'
+ 'd': pad(dayOfMonth), // Two digit day of the month, 01 to 31
+ 'e': dayOfMonth, // Day of the month, 1 through 31
+
+ // Week (none implemented)
+ //'W': weekNumber(),
+
+ // Month
+ 'b': lang.shortMonths[month], // Short month, like 'Jan'
+ 'B': lang.months[month], // Long month, like 'January'
+ 'm': pad(month + 1), // Two digit month number, 01 through 12
+
+ // Year
+ 'y': fullYear.toString().substr(2, 2), // Two digits year, like 09 for 2009
+ 'Y': fullYear, // Four digits year, like 2009
+
+ // Time
+ 'H': pad(hours), // Two digits hours in 24h format, 00 through 23
+ 'I': pad((hours % 12) || 12), // Two digits hours in 12h format, 00 through 11
+ 'l': (hours % 12) || 12, // Hours in 12h format, 1 through 12
+ 'M': pad(date[getMinutes]()), // Two digits minutes, 00 through 59
+ 'p': hours < 12 ? 'AM' : 'PM', // Upper case AM or PM
+ 'P': hours < 12 ? 'am' : 'pm', // Lower case AM or PM
+ 'S': pad(date.getSeconds()), // Two digits seconds, 00 through 59
+ 'L': pad(mathRound(timestamp % 1000), 3) // Milliseconds (naming from Ruby)
+ }, Highcharts.dateFormats);
+
+
+ // do the replaces
+ for (key in replacements) {
+ while (format.indexOf('%' + key) !== -1) { // regex would do it in one line, but this is faster
+ format = format.replace('%' + key, typeof replacements[key] === 'function' ? replacements[key](timestamp) : replacements[key]);
+ }
+ }
+
+ // Optionally capitalize the string and return
+ return capitalize ? format.substr(0, 1).toUpperCase() + format.substr(1) : format;
+};
+
+/**
+ * Format a single variable. Similar to sprintf, without the % prefix.
+ */
+function formatSingle(format, val) {
+ var floatRegex = /f$/,
+ decRegex = /\.([0-9])/,
+ lang = defaultOptions.lang,
+ decimals;
+
+ if (floatRegex.test(format)) { // float
+ decimals = format.match(decRegex);
+ decimals = decimals ? decimals[1] : -1;
+ if (val !== null) {
+ val = numberFormat(
+ val,
+ decimals,
+ lang.decimalPoint,
+ format.indexOf(',') > -1 ? lang.thousandsSep : ''
+ );
+ }
+ } else {
+ val = dateFormat(format, val);
+ }
+ return val;
+}
+
+/**
+ * Format a string according to a subset of the rules of Python's String.format method.
+ */
+function format(str, ctx) {
+ var splitter = '{',
+ isInside = false,
+ segment,
+ valueAndFormat,
+ path,
+ i,
+ len,
+ ret = [],
+ val,
+ index;
+
+ while ((index = str.indexOf(splitter)) !== -1) {
+
+ segment = str.slice(0, index);
+ if (isInside) { // we're on the closing bracket looking back
+
+ valueAndFormat = segment.split(':');
+ path = valueAndFormat.shift().split('.'); // get first and leave format
+ len = path.length;
+ val = ctx;
+
+ // Assign deeper paths
+ for (i = 0; i < len; i++) {
+ val = val[path[i]];
+ }
+
+ // Format the replacement
+ if (valueAndFormat.length) {
+ val = formatSingle(valueAndFormat.join(':'), val);
+ }
+
+ // Push the result and advance the cursor
+ ret.push(val);
+
+ } else {
+ ret.push(segment);
+
+ }
+ str = str.slice(index + 1); // the rest
+ isInside = !isInside; // toggle
+ splitter = isInside ? '}' : '{'; // now look for next matching bracket
+ }
+ ret.push(str);
+ return ret.join('');
+}
+
+/**
+ * Get the magnitude of a number
+ */
+function getMagnitude(num) {
+ return math.pow(10, mathFloor(math.log(num) / math.LN10));
+}
+
+/**
+ * Take an interval and normalize it to multiples of 1, 2, 2.5 and 5
+ * @param {Number} interval
+ * @param {Array} multiples
+ * @param {Number} magnitude
+ * @param {Object} options
+ */
+function normalizeTickInterval(interval, multiples, magnitude, options) {
+ var normalized, i;
+
+ // round to a tenfold of 1, 2, 2.5 or 5
+ magnitude = pick(magnitude, 1);
+ normalized = interval / magnitude;
+
+ // multiples for a linear scale
+ if (!multiples) {
+ multiples = [1, 2, 2.5, 5, 10];
+
+ // the allowDecimals option
+ if (options && options.allowDecimals === false) {
+ if (magnitude === 1) {
+ multiples = [1, 2, 5, 10];
+ } else if (magnitude <= 0.1) {
+ multiples = [1 / magnitude];
+ }
+ }
+ }
+
+ // normalize the interval to the nearest multiple
+ for (i = 0; i < multiples.length; i++) {
+ interval = multiples[i];
+ if (normalized <= (multiples[i] + (multiples[i + 1] || multiples[i])) / 2) {
+ break;
+ }
+ }
+
+ // multiply back to the correct magnitude
+ interval *= magnitude;
+
+ return interval;
+}
+
+
+/**
+ * Utility method that sorts an object array and keeping the order of equal items.
+ * ECMA script standard does not specify the behaviour when items are equal.
+ */
+function stableSort(arr, sortFunction) {
+ var length = arr.length,
+ sortValue,
+ i;
+
+ // Add index to each item
+ for (i = 0; i < length; i++) {
+ arr[i].ss_i = i; // stable sort index
+ }
+
+ arr.sort(function (a, b) {
+ sortValue = sortFunction(a, b);
+ return sortValue === 0 ? a.ss_i - b.ss_i : sortValue;
+ });
+
+ // Remove index from items
+ for (i = 0; i < length; i++) {
+ delete arr[i].ss_i; // stable sort index
+ }
+}
+
+/**
+ * Non-recursive method to find the lowest member of an array. Math.min raises a maximum
+ * call stack size exceeded error in Chrome when trying to apply more than 150.000 points. This
+ * method is slightly slower, but safe.
+ */
+function arrayMin(data) {
+ var i = data.length,
+ min = data[0];
+
+ while (i--) {
+ if (data[i] < min) {
+ min = data[i];
+ }
+ }
+ return min;
+}
+
+/**
+ * Non-recursive method to find the lowest member of an array. Math.min raises a maximum
+ * call stack size exceeded error in Chrome when trying to apply more than 150.000 points. This
+ * method is slightly slower, but safe.
+ */
+function arrayMax(data) {
+ var i = data.length,
+ max = data[0];
+
+ while (i--) {
+ if (data[i] > max) {
+ max = data[i];
+ }
+ }
+ return max;
+}
+
+/**
+ * Utility method that destroys any SVGElement or VMLElement that are properties on the given object.
+ * It loops all properties and invokes destroy if there is a destroy method. The property is
+ * then delete'ed.
+ * @param {Object} The object to destroy properties on
+ * @param {Object} Exception, do not destroy this property, only delete it.
+ */
+function destroyObjectProperties(obj, except) {
+ var n;
+ for (n in obj) {
+ // If the object is non-null and destroy is defined
+ if (obj[n] && obj[n] !== except && obj[n].destroy) {
+ // Invoke the destroy
+ obj[n].destroy();
+ }
+
+ // Delete the property from the object.
+ delete obj[n];
+ }
+}
+
+
+/**
+ * Discard an element by moving it to the bin and delete
+ * @param {Object} The HTML node to discard
+ */
+function discardElement(element) {
+ // create a garbage bin element, not part of the DOM
+ if (!garbageBin) {
+ garbageBin = createElement(DIV);
+ }
+
+ // move the node and empty bin
+ if (element) {
+ garbageBin.appendChild(element);
+ }
+ garbageBin.innerHTML = '';
+}
+
+/**
+ * Provide error messages for debugging, with links to online explanation
+ */
+error = function (code, stop) {
+ var msg = 'Highcharts error #' + code + ': www.highcharts.com/errors/' + code;
+ if (stop) {
+ throw msg;
+ }
+ // else ...
+ if (win.console) {
+ console.log(msg);
+ }
+};
+
+/**
+ * Fix JS round off float errors
+ * @param {Number} num
+ */
+function correctFloat(num) {
+ return parseFloat(
+ num.toPrecision(14)
+ );
+}
+
+/**
+ * Set the global animation to either a given value, or fall back to the
+ * given chart's animation option
+ * @param {Object} animation
+ * @param {Object} chart
+ */
+function setAnimation(animation, chart) {
+ globalAnimation = pick(animation, chart.animation);
+}
+
+/**
+ * The time unit lookup
+ */
+timeUnits = {
+ millisecond: 1,
+ second: 1000,
+ minute: 60000,
+ hour: 3600000,
+ day: 24 * 3600000,
+ week: 7 * 24 * 3600000,
+ month: 31 * 24 * 3600000,
+ year: 31556952000
+};
+/**
+ * Path interpolation algorithm used across adapters
+ */
+pathAnim = {
+ /**
+ * Prepare start and end values so that the path can be animated one to one
+ */
+ init: function (elem, fromD, toD) {
+ fromD = fromD || '';
+ var shift = elem.shift,
+ bezier = fromD.indexOf('C') > -1,
+ numParams = bezier ? 7 : 3,
+ endLength,
+ slice,
+ i,
+ start = fromD.split(' '),
+ end = [].concat(toD), // copy
+ startBaseLine,
+ endBaseLine,
+ sixify = function (arr) { // in splines make move points have six parameters like bezier curves
+ i = arr.length;
+ while (i--) {
+ if (arr[i] === M) {
+ arr.splice(i + 1, 0, arr[i + 1], arr[i + 2], arr[i + 1], arr[i + 2]);
+ }
+ }
+ };
+
+ if (bezier) {
+ sixify(start);
+ sixify(end);
+ }
+
+ // pull out the base lines before padding
+ if (elem.isArea) {
+ startBaseLine = start.splice(start.length - 6, 6);
+ endBaseLine = end.splice(end.length - 6, 6);
+ }
+
+ // if shifting points, prepend a dummy point to the end path
+ if (shift <= end.length / numParams && start.length === end.length) {
+ while (shift--) {
+ end = [].concat(end).splice(0, numParams).concat(end);
+ }
+ }
+ elem.shift = 0; // reset for following animations
+
+ // copy and append last point until the length matches the end length
+ if (start.length) {
+ endLength = end.length;
+ while (start.length < endLength) {
+
+ //bezier && sixify(start);
+ slice = [].concat(start).splice(start.length - numParams, numParams);
+ if (bezier) { // disable first control point
+ slice[numParams - 6] = slice[numParams - 2];
+ slice[numParams - 5] = slice[numParams - 1];
+ }
+ start = start.concat(slice);
+ }
+ }
+
+ if (startBaseLine) { // append the base lines for areas
+ start = start.concat(startBaseLine);
+ end = end.concat(endBaseLine);
+ }
+ return [start, end];
+ },
+
+ /**
+ * Interpolate each value of the path and return the array
+ */
+ step: function (start, end, pos, complete) {
+ var ret = [],
+ i = start.length,
+ startVal;
+
+ if (pos === 1) { // land on the final path without adjustment points appended in the ends
+ ret = complete;
+
+ } else if (i === end.length && pos < 1) {
+ while (i--) {
+ startVal = parseFloat(start[i]);
+ ret[i] =
+ isNaN(startVal) ? // a letter instruction like M or L
+ start[i] :
+ pos * (parseFloat(end[i] - startVal)) + startVal;
+
+ }
+ } else { // if animation is finished or length not matching, land on right value
+ ret = end;
+ }
+ return ret;
+ }
+};
+
+(function ($) {
+ /**
+ * The default HighchartsAdapter for jQuery
+ */
+ win.HighchartsAdapter = win.HighchartsAdapter || ($ && {
+
+ /**
+ * Initialize the adapter by applying some extensions to jQuery
+ */
+ init: function (pathAnim) {
+
+ // extend the animate function to allow SVG animations
+ var Fx = $.fx,
+ Step = Fx.step,
+ dSetter,
+ Tween = $.Tween,
+ propHooks = Tween && Tween.propHooks,
+ opacityHook = $.cssHooks.opacity;
+
+ /*jslint unparam: true*//* allow unused param x in this function */
+ $.extend($.easing, {
+ easeOutQuad: function (x, t, b, c, d) {
+ return -c * (t /= d) * (t - 2) + b;
+ }
+ });
+ /*jslint unparam: false*/
+
+ // extend some methods to check for elem.attr, which means it is a Highcharts SVG object
+ $.each(['cur', '_default', 'width', 'height', 'opacity'], function (i, fn) {
+ var obj = Step,
+ base;
+
+ // Handle different parent objects
+ if (fn === 'cur') {
+ obj = Fx.prototype; // 'cur', the getter, relates to Fx.prototype
+
+ } else if (fn === '_default' && Tween) { // jQuery 1.8 model
+ obj = propHooks[fn];
+ fn = 'set';
+ }
+
+ // Overwrite the method
+ base = obj[fn];
+ if (base) { // step.width and step.height don't exist in jQuery < 1.7
+
+ // create the extended function replacement
+ obj[fn] = function (fx) {
+
+ var elem;
+
+ // Fx.prototype.cur does not use fx argument
+ fx = i ? fx : this;
+
+ // Don't run animations on textual properties like align (#1821)
+ if (fx.prop === 'align') {
+ return;
+ }
+
+ // shortcut
+ elem = fx.elem;
+
+ // Fx.prototype.cur returns the current value. The other ones are setters
+ // and returning a value has no effect.
+ return elem.attr ? // is SVG element wrapper
+ elem.attr(fx.prop, fn === 'cur' ? UNDEFINED : fx.now) : // apply the SVG wrapper's method
+ base.apply(this, arguments); // use jQuery's built-in method
+ };
+ }
+ });
+
+ // Extend the opacity getter, needed for fading opacity with IE9 and jQuery 1.10+
+ wrap(opacityHook, 'get', function (proceed, elem, computed) {
+ return elem.attr ? (elem.opacity || 0) : proceed.call(this, elem, computed);
+ });
+
+
+ // Define the setter function for d (path definitions)
+ dSetter = function (fx) {
+ var elem = fx.elem,
+ ends;
+
+ // Normally start and end should be set in state == 0, but sometimes,
+ // for reasons unknown, this doesn't happen. Perhaps state == 0 is skipped
+ // in these cases
+ if (!fx.started) {
+ ends = pathAnim.init(elem, elem.d, elem.toD);
+ fx.start = ends[0];
+ fx.end = ends[1];
+ fx.started = true;
+ }
+
+
+ // interpolate each value of the path
+ elem.attr('d', pathAnim.step(fx.start, fx.end, fx.pos, elem.toD));
+ };
+
+ // jQuery 1.8 style
+ if (Tween) {
+ propHooks.d = {
+ set: dSetter
+ };
+ // pre 1.8
+ } else {
+ // animate paths
+ Step.d = dSetter;
+ }
+
+ /**
+ * Utility for iterating over an array. Parameters are reversed compared to jQuery.
+ * @param {Array} arr
+ * @param {Function} fn
+ */
+ this.each = Array.prototype.forEach ?
+ function (arr, fn) { // modern browsers
+ return Array.prototype.forEach.call(arr, fn);
+
+ } :
+ function (arr, fn) { // legacy
+ var i,
+ len = arr.length;
+ for (i = 0; i < len; i++) {
+ if (fn.call(arr[i], arr[i], i, arr) === false) {
+ return i;
+ }
+ }
+ };
+
+ /**
+ * Register Highcharts as a plugin in the respective framework
+ */
+ $.fn.highcharts = function () {
+ var constr = 'Chart', // default constructor
+ args = arguments,
+ options,
+ ret,
+ chart;
+
+ if (this[0]) {
+
+ if (isString(args[0])) {
+ constr = args[0];
+ args = Array.prototype.slice.call(args, 1);
+ }
+ options = args[0];
+
+ // Create the chart
+ if (options !== UNDEFINED) {
+ /*jslint unused:false*/
+ options.chart = options.chart || {};
+ options.chart.renderTo = this[0];
+ chart = new Highcharts[constr](options, args[1]);
+ ret = this;
+ /*jslint unused:true*/
+ }
+
+ // When called without parameters or with the return argument, get a predefined chart
+ if (options === UNDEFINED) {
+ ret = charts[attr(this[0], 'data-highcharts-chart')];
+ }
+ }
+
+ return ret;
+ };
+
+ },
+
+
+ /**
+ * Downloads a script and executes a callback when done.
+ * @param {String} scriptLocation
+ * @param {Function} callback
+ */
+ getScript: $.getScript,
+
+ /**
+ * Return the index of an item in an array, or -1 if not found
+ */
+ inArray: $.inArray,
+
+ /**
+ * A direct link to jQuery methods. MooTools and Prototype adapters must be implemented for each case of method.
+ * @param {Object} elem The HTML element
+ * @param {String} method Which method to run on the wrapped element
+ */
+ adapterRun: function (elem, method) {
+ return $(elem)[method]();
+ },
+
+ /**
+ * Filter an array
+ */
+ grep: $.grep,
+
+ /**
+ * Map an array
+ * @param {Array} arr
+ * @param {Function} fn
+ */
+ map: function (arr, fn) {
+ //return jQuery.map(arr, fn);
+ var results = [],
+ i = 0,
+ len = arr.length;
+ for (; i < len; i++) {
+ results[i] = fn.call(arr[i], arr[i], i, arr);
+ }
+ return results;
+
+ },
+
+ /**
+ * Get the position of an element relative to the top left of the page
+ */
+ offset: function (el) {
+ return $(el).offset();
+ },
+
+ /**
+ * Add an event listener
+ * @param {Object} el A HTML element or custom object
+ * @param {String} event The event type
+ * @param {Function} fn The event handler
+ */
+ addEvent: function (el, event, fn) {
+ $(el).bind(event, fn);
+ },
+
+ /**
+ * Remove event added with addEvent
+ * @param {Object} el The object
+ * @param {String} eventType The event type. Leave blank to remove all events.
+ * @param {Function} handler The function to remove
+ */
+ removeEvent: function (el, eventType, handler) {
+ // workaround for jQuery issue with unbinding custom events:
+ // http://forum.jQuery.com/topic/javascript-error-when-unbinding-a-custom-event-using-jQuery-1-4-2
+ var func = doc.removeEventListener ? 'removeEventListener' : 'detachEvent';
+ if (doc[func] && el && !el[func]) {
+ el[func] = function () {};
+ }
+
+ $(el).unbind(eventType, handler);
+ },
+
+ /**
+ * Fire an event on a custom object
+ * @param {Object} el
+ * @param {String} type
+ * @param {Object} eventArguments
+ * @param {Function} defaultFunction
+ */
+ fireEvent: function (el, type, eventArguments, defaultFunction) {
+ var event = $.Event(type),
+ detachedType = 'detached' + type,
+ defaultPrevented;
+
+ // Remove warnings in Chrome when accessing returnValue (#2790), layerX and layerY. Although Highcharts
+ // never uses these properties, Chrome includes them in the default click event and
+ // raises the warning when they are copied over in the extend statement below.
+ //
+ // To avoid problems in IE (see #1010) where we cannot delete the properties and avoid
+ // testing if they are there (warning in chrome) the only option is to test if running IE.
+ if (!isIE && eventArguments) {
+ delete eventArguments.layerX;
+ delete eventArguments.layerY;
+ delete eventArguments.returnValue;
+ }
+
+ extend(event, eventArguments);
+
+ // Prevent jQuery from triggering the object method that is named the
+ // same as the event. For example, if the event is 'select', jQuery
+ // attempts calling el.select and it goes into a loop.
+ if (el[type]) {
+ el[detachedType] = el[type];
+ el[type] = null;
+ }
+
+ // Wrap preventDefault and stopPropagation in try/catch blocks in
+ // order to prevent JS errors when cancelling events on non-DOM
+ // objects. #615.
+ /*jslint unparam: true*/
+ $.each(['preventDefault', 'stopPropagation'], function (i, fn) {
+ var base = event[fn];
+ event[fn] = function () {
+ try {
+ base.call(event);
+ } catch (e) {
+ if (fn === 'preventDefault') {
+ defaultPrevented = true;
+ }
+ }
+ };
+ });
+ /*jslint unparam: false*/
+
+ // trigger it
+ $(el).trigger(event);
+
+ // attach the method
+ if (el[detachedType]) {
+ el[type] = el[detachedType];
+ el[detachedType] = null;
+ }
+
+ if (defaultFunction && !event.isDefaultPrevented() && !defaultPrevented) {
+ defaultFunction(event);
+ }
+ },
+
+ /**
+ * Extension method needed for MooTools
+ */
+ washMouseEvent: function (e) {
+ var ret = e.originalEvent || e;
+
+ // computed by jQuery, needed by IE8
+ if (ret.pageX === UNDEFINED) { // #1236
+ ret.pageX = e.pageX;
+ ret.pageY = e.pageY;
+ }
+
+ return ret;
+ },
+
+ /**
+ * Animate a HTML element or SVG element wrapper
+ * @param {Object} el
+ * @param {Object} params
+ * @param {Object} options jQuery-like animation options: duration, easing, callback
+ */
+ animate: function (el, params, options) {
+ var $el = $(el);
+ if (!el.style) {
+ el.style = {}; // #1881
+ }
+ if (params.d) {
+ el.toD = params.d; // keep the array form for paths, used in $.fx.step.d
+ params.d = 1; // because in jQuery, animating to an array has a different meaning
+ }
+
+ $el.stop();
+ if (params.opacity !== UNDEFINED && el.attr) {
+ params.opacity += 'px'; // force jQuery to use same logic as width and height (#2161)
+ }
+ $el.animate(params, options);
+
+ },
+ /**
+ * Stop running animation
+ */
+ stop: function (el) {
+ $(el).stop();
+ }
+ });
+}(win.jQuery));
+
+
+// check for a custom HighchartsAdapter defined prior to this file
+var globalAdapter = win.HighchartsAdapter,
+ adapter = globalAdapter || {};
+
+// Initialize the adapter
+if (globalAdapter) {
+ globalAdapter.init.call(globalAdapter, pathAnim);
+}
+
+
+// Utility functions. If the HighchartsAdapter is not defined, adapter is an empty object
+// and all the utility functions will be null. In that case they are populated by the
+// default adapters below.
+var adapterRun = adapter.adapterRun,
+ getScript = adapter.getScript,
+ inArray = adapter.inArray,
+ each = adapter.each,
+ grep = adapter.grep,
+ offset = adapter.offset,
+ map = adapter.map,
+ addEvent = adapter.addEvent,
+ removeEvent = adapter.removeEvent,
+ fireEvent = adapter.fireEvent,
+ washMouseEvent = adapter.washMouseEvent,
+ animate = adapter.animate,
+ stop = adapter.stop;
+
+
+
+/* ****************************************************************************
+ * Handle the options *
+ *****************************************************************************/
+var
+
+defaultLabelOptions = {
+ enabled: true,
+ // rotation: 0,
+ // align: 'center',
+ x: 0,
+ y: 15,
+ /*formatter: function () {
+ return this.value;
+ },*/
+ style: {
+ color: '#606060',
+ cursor: 'default',
+ fontSize: '11px'
+ }
+};
+
+defaultOptions = {
+ colors: ['#7cb5ec', '#434348', '#90ed7d', '#f7a35c',
+ '#8085e9', '#f15c80', '#e4d354', '#8085e8', '#8d4653', '#91e8e1'],
+ symbols: ['circle', 'diamond', 'square', 'triangle', 'triangle-down'],
+ lang: {
+ loading: 'Loading...',
+ months: ['January', 'February', 'March', 'April', 'May', 'June', 'July',
+ 'August', 'September', 'October', 'November', 'December'],
+ shortMonths: ['Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec'],
+ weekdays: ['Sunday', 'Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday'],
+ decimalPoint: '.',
+ numericSymbols: ['k', 'M', 'G', 'T', 'P', 'E'], // SI prefixes used in axis labels
+ resetZoom: 'Reset zoom',
+ resetZoomTitle: 'Reset zoom level 1:1',
+ thousandsSep: ','
+ },
+ global: {
+ useUTC: true,
+ //timezoneOffset: 0,
+ canvasToolsURL: 'http://code.highcharts.com/4.0.3/modules/canvas-tools.js',
+ VMLRadialGradientURL: 'http://code.highcharts.com/4.0.3/gfx/vml-radial-gradient.png'
+ },
+ chart: {
+ //animation: true,
+ //alignTicks: false,
+ //reflow: true,
+ //className: null,
+ //events: { load, selection },
+ //margin: [null],
+ //marginTop: null,
+ //marginRight: null,
+ //marginBottom: null,
+ //marginLeft: null,
+ borderColor: '#4572A7',
+ //borderWidth: 0,
+ borderRadius: 0,
+ defaultSeriesType: 'line',
+ ignoreHiddenSeries: true,
+ //inverted: false,
+ //shadow: false,
+ spacing: [10, 10, 15, 10],
+ //spacingTop: 10,
+ //spacingRight: 10,
+ //spacingBottom: 15,
+ //spacingLeft: 10,
+ //style: {
+ // fontFamily: '"Lucida Grande", "Lucida Sans Unicode", Verdana, Arial, Helvetica, sans-serif', // default font
+ // fontSize: '12px'
+ //},
+ backgroundColor: '#FFFFFF',
+ //plotBackgroundColor: null,
+ plotBorderColor: '#C0C0C0',
+ //plotBorderWidth: 0,
+ //plotShadow: false,
+ //zoomType: ''
+ resetZoomButton: {
+ theme: {
+ zIndex: 20
+ },
+ position: {
+ align: 'right',
+ x: -10,
+ //verticalAlign: 'top',
+ y: 10
+ }
+ // relativeTo: 'plot'
+ }
+ },
+ title: {
+ text: 'Chart title',
+ align: 'center',
+ // floating: false,
+ margin: 15,
+ // x: 0,
+ // verticalAlign: 'top',
+ // y: null,
+ style: {
+ color: '#333333',
+ fontSize: '18px'
+ }
+
+ },
+ subtitle: {
+ text: '',
+ align: 'center',
+ // floating: false
+ // x: 0,
+ // verticalAlign: 'top',
+ // y: null,
+ style: {
+ color: '#555555'
+ }
+ },
+
+ plotOptions: {
+ line: { // base series options
+ allowPointSelect: false,
+ showCheckbox: false,
+ animation: {
+ duration: 1000
+ },
+ //connectNulls: false,
+ //cursor: 'default',
+ //clip: true,
+ //dashStyle: null,
+ //enableMouseTracking: true,
+ events: {},
+ //legendIndex: 0,
+ //linecap: 'round',
+ lineWidth: 2,
+ //shadow: false,
+ // stacking: null,
+ marker: {
+ //enabled: true,
+ //symbol: null,
+ lineWidth: 0,
+ radius: 4,
+ lineColor: '#FFFFFF',
+ //fillColor: null,
+ states: { // states for a single point
+ hover: {
+ enabled: true,
+ lineWidthPlus: 1,
+ radiusPlus: 2
+ },
+ select: {
+ fillColor: '#FFFFFF',
+ lineColor: '#000000',
+ lineWidth: 2
+ }
+ }
+ },
+ point: {
+ events: {}
+ },
+ dataLabels: merge(defaultLabelOptions, {
+ align: 'center',
+ //defer: true,
+ enabled: false,
+ formatter: function () {
+ return this.y === null ? '' : numberFormat(this.y, -1);
+ },
+ verticalAlign: 'bottom', // above singular point
+ y: 0
+ // backgroundColor: undefined,
+ // borderColor: undefined,
+ // borderRadius: undefined,
+ // borderWidth: undefined,
+ // padding: 3,
+ // shadow: false
+ }),
+ cropThreshold: 300, // draw points outside the plot area when the number of points is less than this
+ pointRange: 0,
+ //pointStart: 0,
+ //pointInterval: 1,
+ //showInLegend: null, // auto: true for standalone series, false for linked series
+ states: { // states for the entire series
+ hover: {
+ //enabled: false,
+ lineWidthPlus: 1,
+ marker: {
+ // lineWidth: base + 1,
+ // radius: base + 1
+ },
+ halo: {
+ size: 10,
+ opacity: 0.25
+ }
+ },
+ select: {
+ marker: {}
+ }
+ },
+ stickyTracking: true,
+ //tooltip: {
+ //pointFormat: '<span style="color:{series.color}">\u25CF</span> {series.name}: <b>{point.y}</b>'
+ //valueDecimals: null,
+ //xDateFormat: '%A, %b %e, %Y',
+ //valuePrefix: '',
+ //ySuffix: ''
+ //}
+ turboThreshold: 1000
+ // zIndex: null
+ }
+ },
+ labels: {
+ //items: [],
+ style: {
+ //font: defaultFont,
+ position: ABSOLUTE,
+ color: '#3E576F'
+ }
+ },
+ legend: {
+ enabled: true,
+ align: 'center',
+ //floating: false,
+ layout: 'horizontal',
+ labelFormatter: function () {
+ return this.name;
+ },
+ //borderWidth: 0,
+ borderColor: '#909090',
+ borderRadius: 0,
+ navigation: {
+ // animation: true,
+ activeColor: '#274b6d',
+ // arrowSize: 12
+ inactiveColor: '#CCC'
+ // style: {} // text styles
+ },
+ // margin: 20,
+ // reversed: false,
+ shadow: false,
+ // backgroundColor: null,
+ /*style: {
+ padding: '5px'
+ },*/
+ itemStyle: {
+ color: '#333333',
+ fontSize: '12px',
+ fontWeight: 'bold'
+ },
+ itemHoverStyle: {
+ //cursor: 'pointer', removed as of #601
+ color: '#000'
+ },
+ itemHiddenStyle: {
+ color: '#CCC'
+ },
+ itemCheckboxStyle: {
+ position: ABSOLUTE,
+ width: '13px', // for IE precision
+ height: '13px'
+ },
+ // itemWidth: undefined,
+ // symbolRadius: 0,
+ // symbolWidth: 16,
+ symbolPadding: 5,
+ verticalAlign: 'bottom',
+ // width: undefined,
+ x: 0,
+ y: 0,
+ title: {
+ //text: null,
+ style: {
+ fontWeight: 'bold'
+ }
+ }
+ },
+
+ loading: {
+ // hideDuration: 100,
+ labelStyle: {
+ fontWeight: 'bold',
+ position: RELATIVE,
+ top: '45%'
+ },
+ // showDuration: 0,
+ style: {
+ position: ABSOLUTE,
+ backgroundColor: 'white',
+ opacity: 0.5,
+ textAlign: 'center'
+ }
+ },
+
+ tooltip: {
+ enabled: true,
+ animation: hasSVG,
+ //crosshairs: null,
+ backgroundColor: 'rgba(249, 249, 249, .85)',
+ borderWidth: 1,
+ borderRadius: 3,
+ dateTimeLabelFormats: {
+ millisecond: '%A, %b %e, %H:%M:%S.%L',
+ second: '%A, %b %e, %H:%M:%S',
+ minute: '%A, %b %e, %H:%M',
+ hour: '%A, %b %e, %H:%M',
+ day: '%A, %b %e, %Y',
+ week: 'Week from %A, %b %e, %Y',
+ month: '%B %Y',
+ year: '%Y'
+ },
+ //formatter: defaultFormatter,
+ headerFormat: '<span style="font-size: 10px">{point.key}</span><br/>',
+ pointFormat: '<span style="color:{series.color}">\u25CF</span> {series.name}: <b>{point.y}</b><br/>',
+ shadow: true,
+ //shape: 'callout',
+ //shared: false,
+ snap: isTouchDevice ? 25 : 10,
+ style: {
+ color: '#333333',
+ cursor: 'default',
+ fontSize: '12px',
+ padding: '8px',
+ whiteSpace: 'nowrap'
+ }
+ //xDateFormat: '%A, %b %e, %Y',
+ //valueDecimals: null,
+ //valuePrefix: '',
+ //valueSuffix: ''
+ },
+
+ credits: {
+ enabled: true,
+ text: 'Highcharts.com',
+ href: 'http://www.highcharts.com',
+ position: {
+ align: 'right',
+ x: -10,
+ verticalAlign: 'bottom',
+ y: -5
+ },
+ style: {
+ cursor: 'pointer',
+ color: '#909090',
+ fontSize: '9px'
+ }
+ }
+};
+
+
+
+
+// Series defaults
+var defaultPlotOptions = defaultOptions.plotOptions,
+ defaultSeriesOptions = defaultPlotOptions.line;
+
+// set the default time methods
+setTimeMethods();
+
+
+
+/**
+ * Set the time methods globally based on the useUTC option. Time method can be either
+ * local time or UTC (default).
+ */
+function setTimeMethods() {
+ var useUTC = defaultOptions.global.useUTC,
+ GET = useUTC ? 'getUTC' : 'get',
+ SET = useUTC ? 'setUTC' : 'set';
+
+
+ timezoneOffset = ((useUTC && defaultOptions.global.timezoneOffset) || 0) * 60000;
+ makeTime = useUTC ? Date.UTC : function (year, month, date, hours, minutes, seconds) {
+ return new Date(
+ year,
+ month,
+ pick(date, 1),
+ pick(hours, 0),
+ pick(minutes, 0),
+ pick(seconds, 0)
+ ).getTime();
+ };
+ getMinutes = GET + 'Minutes';
+ getHours = GET + 'Hours';
+ getDay = GET + 'Day';
+ getDate = GET + 'Date';
+ getMonth = GET + 'Month';
+ getFullYear = GET + 'FullYear';
+ setMinutes = SET + 'Minutes';
+ setHours = SET + 'Hours';
+ setDate = SET + 'Date';
+ setMonth = SET + 'Month';
+ setFullYear = SET + 'FullYear';
+
+}
+
+/**
+ * Merge the default options with custom options and return the new options structure
+ * @param {Object} options The new custom options
+ */
+function setOptions(options) {
+
+ // Copy in the default options
+ defaultOptions = merge(true, defaultOptions, options);
+
+ // Apply UTC
+ setTimeMethods();
+
+ return defaultOptions;
+}
+
+/**
+ * Get the updated default options. Until 3.0.7, merely exposing defaultOptions for outside modules
+ * wasn't enough because the setOptions method created a new object.
+ */
+function getOptions() {
+ return defaultOptions;
+}
+
+
+/**
+ * Handle color operations. The object methods are chainable.
+ * @param {String} input The input color in either rbga or hex format
+ */
+var rgbaRegEx = /rgba\(\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*,\s*([0-9]?(?:\.[0-9]+)?)\s*\)/,
+ hexRegEx = /#([a-fA-F0-9]{2})([a-fA-F0-9]{2})([a-fA-F0-9]{2})/,
+ rgbRegEx = /rgb\(\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*\)/;
+
+var Color = function (input) {
+ // declare variables
+ var rgba = [], result, stops;
+
+ /**
+ * Parse the input color to rgba array
+ * @param {String} input
+ */
+ function init(input) {
+
+ // Gradients
+ if (input && input.stops) {
+ stops = map(input.stops, function (stop) {
+ return Color(stop[1]);
+ });
+
+ // Solid colors
+ } else {
+ // rgba
+ result = rgbaRegEx.exec(input);
+ if (result) {
+ rgba = [pInt(result[1]), pInt(result[2]), pInt(result[3]), parseFloat(result[4], 10)];
+ } else {
+ // hex
+ result = hexRegEx.exec(input);
+ if (result) {
+ rgba = [pInt(result[1], 16), pInt(result[2], 16), pInt(result[3], 16), 1];
+ } else {
+ // rgb
+ result = rgbRegEx.exec(input);
+ if (result) {
+ rgba = [pInt(result[1]), pInt(result[2]), pInt(result[3]), 1];
+ }
+ }
+ }
+ }
+
+ }
+ /**
+ * Return the color a specified format
+ * @param {String} format
+ */
+ function get(format) {
+ var ret;
+
+ if (stops) {
+ ret = merge(input);
+ ret.stops = [].concat(ret.stops);
+ each(stops, function (stop, i) {
+ ret.stops[i] = [ret.stops[i][0], stop.get(format)];
+ });
+
+ // it's NaN if gradient colors on a column chart
+ } else if (rgba && !isNaN(rgba[0])) {
+ if (format === 'rgb') {
+ ret = 'rgb(' + rgba[0] + ',' + rgba[1] + ',' + rgba[2] + ')';
+ } else if (format === 'a') {
+ ret = rgba[3];
+ } else {
+ ret = 'rgba(' + rgba.join(',') + ')';
+ }
+ } else {
+ ret = input;
+ }
+ return ret;
+ }
+
+ /**
+ * Brighten the color
+ * @param {Number} alpha
+ */
+ function brighten(alpha) {
+ if (stops) {
+ each(stops, function (stop) {
+ stop.brighten(alpha);
+ });
+
+ } else if (isNumber(alpha) && alpha !== 0) {
+ var i;
+ for (i = 0; i < 3; i++) {
+ rgba[i] += pInt(alpha * 255);
+
+ if (rgba[i] < 0) {
+ rgba[i] = 0;
+ }
+ if (rgba[i] > 255) {
+ rgba[i] = 255;
+ }
+ }
+ }
+ return this;
+ }
+ /**
+ * Set the color's opacity to a given alpha value
+ * @param {Number} alpha
+ */
+ function setOpacity(alpha) {
+ rgba[3] = alpha;
+ return this;
+ }
+
+ // initialize: parse the input
+ init(input);
+
+ // public methods
+ return {
+ get: get,
+ brighten: brighten,
+ rgba: rgba,
+ setOpacity: setOpacity
+ };
+};
+
+
+/**
+ * A wrapper object for SVG elements
+ */
+function SVGElement() {}
+
+SVGElement.prototype = {
+
+ // Default base for animation
+ opacity: 1,
+ // For labels, these CSS properties are applied to the <text> node directly
+ textProps: ['fontSize', 'fontWeight', 'fontFamily', 'color',
+ 'lineHeight', 'width', 'textDecoration', 'textShadow', 'HcTextStroke'],
+
+ /**
+ * Initialize the SVG renderer
+ * @param {Object} renderer
+ * @param {String} nodeName
+ */
+ init: function (renderer, nodeName) {
+ var wrapper = this;
+ wrapper.element = nodeName === 'span' ?
+ createElement(nodeName) :
+ doc.createElementNS(SVG_NS, nodeName);
+ wrapper.renderer = renderer;
+ },
+
+ /**
+ * Animate a given attribute
+ * @param {Object} params
+ * @param {Number} options The same options as in jQuery animation
+ * @param {Function} complete Function to perform at the end of animation
+ */
+ animate: function (params, options, complete) {
+ var animOptions = pick(options, globalAnimation, true);
+ stop(this); // stop regardless of animation actually running, or reverting to .attr (#607)
+ if (animOptions) {
+ animOptions = merge(animOptions, {}); //#2625
+ if (complete) { // allows using a callback with the global animation without overwriting it
+ animOptions.complete = complete;
+ }
+ animate(this, params, animOptions);
+ } else {
+ this.attr(params);
+ if (complete) {
+ complete();
+ }
+ }
+ return this;
+ },
+
+ /**
+ * Build an SVG gradient out of a common JavaScript configuration object
+ */
+ colorGradient: function (color, prop, elem) {
+ var renderer = this.renderer,
+ colorObject,
+ gradName,
+ gradAttr,
+ gradients,
+ gradientObject,
+ stops,
+ stopColor,
+ stopOpacity,
+ radialReference,
+ n,
+ id,
+ key = [];
+
+ // Apply linear or radial gradients
+ if (color.linearGradient) {
+ gradName = 'linearGradient';
+ } else if (color.radialGradient) {
+ gradName = 'radialGradient';
+ }
+
+ if (gradName) {
+ gradAttr = color[gradName];
+ gradients = renderer.gradients;
+ stops = color.stops;
+ radialReference = elem.radialReference;
+
+ // Keep < 2.2 kompatibility
+ if (isArray(gradAttr)) {
+ color[gradName] = gradAttr = {
+ x1: gradAttr[0],
+ y1: gradAttr[1],
+ x2: gradAttr[2],
+ y2: gradAttr[3],
+ gradientUnits: 'userSpaceOnUse'
+ };
+ }
+
+ // Correct the radial gradient for the radial reference system
+ if (gradName === 'radialGradient' && radialReference && !defined(gradAttr.gradientUnits)) {
+ gradAttr = merge(gradAttr, {
+ cx: (radialReference[0] - radialReference[2] / 2) + gradAttr.cx * radialReference[2],
+ cy: (radialReference[1] - radialReference[2] / 2) + gradAttr.cy * radialReference[2],
+ r: gradAttr.r * radialReference[2],
+ gradientUnits: 'userSpaceOnUse'
+ });
+ }
+
+ // Build the unique key to detect whether we need to create a new element (#1282)
+ for (n in gradAttr) {
+ if (n !== 'id') {
+ key.push(n, gradAttr[n]);
+ }
+ }
+ for (n in stops) {
+ key.push(stops[n]);
+ }
+ key = key.join(',');
+
+ // Check if a gradient object with the same config object is created within this renderer
+ if (gradients[key]) {
+ id = gradients[key].attr('id');
+
+ } else {
+
+ // Set the id and create the element
+ gradAttr.id = id = PREFIX + idCounter++;
+ gradients[key] = gradientObject = renderer.createElement(gradName)
+ .attr(gradAttr)
+ .add(renderer.defs);
+
+
+ // The gradient needs to keep a list of stops to be able to destroy them
+ gradientObject.stops = [];
+ each(stops, function (stop) {
+ var stopObject;
+ if (stop[1].indexOf('rgba') === 0) {
+ colorObject = Color(stop[1]);
+ stopColor = colorObject.get('rgb');
+ stopOpacity = colorObject.get('a');
+ } else {
+ stopColor = stop[1];
+ stopOpacity = 1;
+ }
+ stopObject = renderer.createElement('stop').attr({
+ offset: stop[0],
+ 'stop-color': stopColor,
+ 'stop-opacity': stopOpacity
+ }).add(gradientObject);
+
+ // Add the stop element to the gradient
+ gradientObject.stops.push(stopObject);
+ });
+ }
+
+ // Set the reference to the gradient object
+ elem.setAttribute(prop, 'url(' + renderer.url + '#' + id + ')');
+ }
+ },
+
+ /**
+ * Set or get a given attribute
+ * @param {Object|String} hash
+ * @param {Mixed|Undefined} val
+ */
+ attr: function (hash, val) {
+ var key,
+ value,
+ element = this.element,
+ hasSetSymbolSize,
+ ret = this,
+ skipAttr;
+
+ // single key-value pair
+ if (typeof hash === 'string' && val !== UNDEFINED) {
+ key = hash;
+ hash = {};
+ hash[key] = val;
+ }
+
+ // used as a getter: first argument is a string, second is undefined
+ if (typeof hash === 'string') {
+ ret = (this[hash + 'Getter'] || this._defaultGetter).call(this, hash, element);
+
+ // setter
+ } else {
+
+ for (key in hash) {
+ value = hash[key];
+ skipAttr = false;
+
+
+
+ if (this.symbolName && /^(x|y|width|height|r|start|end|innerR|anchorX|anchorY)/.test(key)) {
+ if (!hasSetSymbolSize) {
+ this.symbolAttr(hash);
+ hasSetSymbolSize = true;
+ }
+ skipAttr = true;
+ }
+
+ if (this.rotation && (key === 'x' || key === 'y')) {
+ this.doTransform = true;
+ }
+
+ if (!skipAttr) {
+ (this[key + 'Setter'] || this._defaultSetter).call(this, value, key, element);
+ }
+
+ // Let the shadow follow the main element
+ if (this.shadows && /^(width|height|visibility|x|y|d|transform|cx|cy|r)$/.test(key)) {
+ this.updateShadows(key, value);
+ }
+ }
+
+ // Update transform. Do this outside the loop to prevent redundant updating for batch setting
+ // of attributes.
+ if (this.doTransform) {
+ this.updateTransform();
+ this.doTransform = false;
+ }
+
+ }
+
+ return ret;
+ },
+
+ updateShadows: function (key, value) {
+ var shadows = this.shadows,
+ i = shadows.length;
+ while (i--) {
+ shadows[i].setAttribute(
+ key,
+ key === 'height' ?
+ mathMax(value - (shadows[i].cutHeight || 0), 0) :
+ key === 'd' ? this.d : value
+ );
+ }
+ },
+
+ /**
+ * Add a class name to an element
+ */
+ addClass: function (className) {
+ var element = this.element,
+ currentClassName = attr(element, 'class') || '';
+
+ if (currentClassName.indexOf(className) === -1) {
+ attr(element, 'class', currentClassName + ' ' + className);
+ }
+ return this;
+ },
+ /* hasClass and removeClass are not (yet) needed
+ hasClass: function (className) {
+ return attr(this.element, 'class').indexOf(className) !== -1;
+ },
+ removeClass: function (className) {
+ attr(this.element, 'class', attr(this.element, 'class').replace(className, ''));
+ return this;
+ },
+ */
+
+ /**
+ * If one of the symbol size affecting parameters are changed,
+ * check all the others only once for each call to an element's
+ * .attr() method
+ * @param {Object} hash
+ */
+ symbolAttr: function (hash) {
+ var wrapper = this;
+
+ each(['x', 'y', 'r', 'start', 'end', 'width', 'height', 'innerR', 'anchorX', 'anchorY'], function (key) {
+ wrapper[key] = pick(hash[key], wrapper[key]);
+ });
+
+ wrapper.attr({
+ d: wrapper.renderer.symbols[wrapper.symbolName](
+ wrapper.x,
+ wrapper.y,
+ wrapper.width,
+ wrapper.height,
+ wrapper
+ )
+ });
+ },
+
+ /**
+ * Apply a clipping path to this object
+ * @param {String} id
+ */
+ clip: function (clipRect) {
+ return this.attr('clip-path', clipRect ? 'url(' + this.renderer.url + '#' + clipRect.id + ')' : NONE);
+ },
+
+ /**
+ * Calculate the coordinates needed for drawing a rectangle crisply and return the
+ * calculated attributes
+ * @param {Number} strokeWidth
+ * @param {Number} x
+ * @param {Number} y
+ * @param {Number} width
+ * @param {Number} height
+ */
+ crisp: function (rect) {
+
+ var wrapper = this,
+ key,
+ attribs = {},
+ normalizer,
+ strokeWidth = rect.strokeWidth || wrapper.strokeWidth || 0;
+
+ normalizer = mathRound(strokeWidth) % 2 / 2; // mathRound because strokeWidth can sometimes have roundoff errors
+
+ // normalize for crisp edges
+ rect.x = mathFloor(rect.x || wrapper.x || 0) + normalizer;
+ rect.y = mathFloor(rect.y || wrapper.y || 0) + normalizer;
+ rect.width = mathFloor((rect.width || wrapper.width || 0) - 2 * normalizer);
+ rect.height = mathFloor((rect.height || wrapper.height || 0) - 2 * normalizer);
+ rect.strokeWidth = strokeWidth;
+
+ for (key in rect) {
+ if (wrapper[key] !== rect[key]) { // only set attribute if changed
+ wrapper[key] = attribs[key] = rect[key];
+ }
+ }
+
+ return attribs;
+ },
+
+ /**
+ * Set styles for the element
+ * @param {Object} styles
+ */
+ css: function (styles) {
+ var elemWrapper = this,
+ oldStyles = elemWrapper.styles,
+ newStyles = {},
+ elem = elemWrapper.element,
+ textWidth,
+ n,
+ serializedCss = '',
+ hyphenate,
+ hasNew = !oldStyles;
+
+ // convert legacy
+ if (styles && styles.color) {
+ styles.fill = styles.color;
+ }
+
+ // Filter out existing styles to increase performance (#2640)
+ if (oldStyles) {
+ for (n in styles) {
+ if (styles[n] !== oldStyles[n]) {
+ newStyles[n] = styles[n];
+ hasNew = true;
+ }
+ }
+ }
+ if (hasNew) {
+ textWidth = elemWrapper.textWidth = styles && styles.width && elem.nodeName.toLowerCase() === 'text' && pInt(styles.width);
+
+ // Merge the new styles with the old ones
+ if (oldStyles) {
+ styles = extend(
+ oldStyles,
+ newStyles
+ );
+ }
+
+ // store object
+ elemWrapper.styles = styles;
+
+ if (textWidth && (useCanVG || (!hasSVG && elemWrapper.renderer.forExport))) {
+ delete styles.width;
+ }
+
+ // serialize and set style attribute
+ if (isIE && !hasSVG) {
+ css(elemWrapper.element, styles);
+ } else {
+ /*jslint unparam: true*/
+ hyphenate = function (a, b) { return '-' + b.toLowerCase(); };
+ /*jslint unparam: false*/
+ for (n in styles) {
+ serializedCss += n.replace(/([A-Z])/g, hyphenate) + ':' + styles[n] + ';';
+ }
+ attr(elem, 'style', serializedCss); // #1881
+ }
+
+
+ // re-build text
+ if (textWidth && elemWrapper.added) {
+ elemWrapper.renderer.buildText(elemWrapper);
+ }
+ }
+
+ return elemWrapper;
+ },
+
+ /**
+ * Add an event listener
+ * @param {String} eventType
+ * @param {Function} handler
+ */
+ on: function (eventType, handler) {
+ var svgElement = this,
+ element = svgElement.element;
+
+ // touch
+ if (hasTouch && eventType === 'click') {
+ element.ontouchstart = function (e) {
+ svgElement.touchEventFired = Date.now();
+ e.preventDefault();
+ handler.call(element, e);
+ };
+ element.onclick = function (e) {
+ if (userAgent.indexOf('Android') === -1 || Date.now() - (svgElement.touchEventFired || 0) > 1100) { // #2269
+ handler.call(element, e);
+ }
+ };
+ } else {
+ // simplest possible event model for internal use
+ element['on' + eventType] = handler;
+ }
+ return this;
+ },
+
+ /**
+ * Set the coordinates needed to draw a consistent radial gradient across
+ * pie slices regardless of positioning inside the chart. The format is
+ * [centerX, centerY, diameter] in pixels.
+ */
+ setRadialReference: function (coordinates) {
+ this.element.radialReference = coordinates;
+ return this;
+ },
+
+ /**
+ * Move an object and its children by x and y values
+ * @param {Number} x
+ * @param {Number} y
+ */
+ translate: function (x, y) {
+ return this.attr({
+ translateX: x,
+ translateY: y
+ });
+ },
+
+ /**
+ * Invert a group, rotate and flip
+ */
+ invert: function () {
+ var wrapper = this;
+ wrapper.inverted = true;
+ wrapper.updateTransform();
+ return wrapper;
+ },
+
+ /**
+ * Private method to update the transform attribute based on internal
+ * properties
+ */
+ updateTransform: function () {
+ var wrapper = this,
+ translateX = wrapper.translateX || 0,
+ translateY = wrapper.translateY || 0,
+ scaleX = wrapper.scaleX,
+ scaleY = wrapper.scaleY,
+ inverted = wrapper.inverted,
+ rotation = wrapper.rotation,
+ element = wrapper.element,
+ transform;
+
+ // flipping affects translate as adjustment for flipping around the group's axis
+ if (inverted) {
+ translateX += wrapper.attr('width');
+ translateY += wrapper.attr('height');
+ }
+
+ // Apply translate. Nearly all transformed elements have translation, so instead
+ // of checking for translate = 0, do it always (#1767, #1846).
+ transform = ['translate(' + translateX + ',' + translateY + ')'];
+
+ // apply rotation
+ if (inverted) {
+ transform.push('rotate(90) scale(-1,1)');
+ } else if (rotation) { // text rotation
+ transform.push('rotate(' + rotation + ' ' + (element.getAttribute('x') || 0) + ' ' + (element.getAttribute('y') || 0) + ')');
+ }
+
+ // apply scale
+ if (defined(scaleX) || defined(scaleY)) {
+ transform.push('scale(' + pick(scaleX, 1) + ' ' + pick(scaleY, 1) + ')');
+ }
+
+ if (transform.length) {
+ element.setAttribute('transform', transform.join(' '));
+ }
+ },
+ /**
+ * Bring the element to the front
+ */
+ toFront: function () {
+ var element = this.element;
+ element.parentNode.appendChild(element);
+ return this;
+ },
+
+
+ /**
+ * Break down alignment options like align, verticalAlign, x and y
+ * to x and y relative to the chart.
+ *
+ * @param {Object} alignOptions
+ * @param {Boolean} alignByTranslate
+ * @param {String[Object} box The box to align to, needs a width and height. When the
+ * box is a string, it refers to an object in the Renderer. For example, when
+ * box is 'spacingBox', it refers to Renderer.spacingBox which holds width, height
+ * x and y properties.
+ *
+ */
+ align: function (alignOptions, alignByTranslate, box) {
+ var align,
+ vAlign,
+ x,
+ y,
+ attribs = {},
+ alignTo,
+ renderer = this.renderer,
+ alignedObjects = renderer.alignedObjects;
+
+ // First call on instanciate
+ if (alignOptions) {
+ this.alignOptions = alignOptions;
+ this.alignByTranslate = alignByTranslate;
+ if (!box || isString(box)) { // boxes other than renderer handle this internally
+ this.alignTo = alignTo = box || 'renderer';
+ erase(alignedObjects, this); // prevent duplicates, like legendGroup after resize
+ alignedObjects.push(this);
+ box = null; // reassign it below
+ }
+
+ // When called on resize, no arguments are supplied
+ } else {
+ alignOptions = this.alignOptions;
+ alignByTranslate = this.alignByTranslate;
+ alignTo = this.alignTo;
+ }
+
+ box = pick(box, renderer[alignTo], renderer);
+
+ // Assign variables
+ align = alignOptions.align;
+ vAlign = alignOptions.verticalAlign;
+ x = (box.x || 0) + (alignOptions.x || 0); // default: left align
+ y = (box.y || 0) + (alignOptions.y || 0); // default: top align
+
+ // Align
+ if (align === 'right' || align === 'center') {
+ x += (box.width - (alignOptions.width || 0)) /
+ { right: 1, center: 2 }[align];
+ }
+ attribs[alignByTranslate ? 'translateX' : 'x'] = mathRound(x);
+
+
+ // Vertical align
+ if (vAlign === 'bottom' || vAlign === 'middle') {
+ y += (box.height - (alignOptions.height || 0)) /
+ ({ bottom: 1, middle: 2 }[vAlign] || 1);
+
+ }
+ attribs[alignByTranslate ? 'translateY' : 'y'] = mathRound(y);
+
+ // Animate only if already placed
+ this[this.placed ? 'animate' : 'attr'](attribs);
+ this.placed = true;
+ this.alignAttr = attribs;
+
+ return this;
+ },
+
+ /**
+ * Get the bounding box (width, height, x and y) for the element
+ */
+ getBBox: function () {
+ var wrapper = this,
+ bBox = wrapper.bBox,
+ renderer = wrapper.renderer,
+ width,
+ height,
+ rotation = wrapper.rotation,
+ element = wrapper.element,
+ styles = wrapper.styles,
+ rad = rotation * deg2rad,
+ textStr = wrapper.textStr,
+ cacheKey;
+
+ // Since numbers are monospaced, and numerical labels appear a lot in a chart,
+ // we assume that a label of n characters has the same bounding box as others
+ // of the same length.
+ if (textStr === '' || numRegex.test(textStr)) {
+ cacheKey = 'num.' + textStr.toString().length + (styles ? ('|' + styles.fontSize + '|' + styles.fontFamily) : '');
+
+ } //else { // This code block made demo/waterfall fail, related to buildText
+ // Caching all strings reduces rendering time by 4-5%.
+ // : Check how this affects places where bBox is found on the element
+ //cacheKey = textStr + (styles ? ('|' + styles.fontSize + '|' + styles.fontFamily) : '');
+ //}
+ if (cacheKey) {
+ bBox = renderer.cache[cacheKey];
+ }
+
+ // No cache found
+ if (!bBox) {
+
+ // SVG elements
+ if (element.namespaceURI === SVG_NS || renderer.forExport) {
+ try { // Fails in Firefox if the container has display: none.
+
+ bBox = element.getBBox ?
+ // SVG: use extend because IE9 is not allowed to change width and height in case
+ // of rotation (below)
+ extend({}, element.getBBox()) :
+ // Canvas renderer and legacy IE in export mode
+ {
+ width: element.offsetWidth,
+ height: element.offsetHeight
+ };
+ } catch (e) {}
+
+ // If the bBox is not set, the try-catch block above failed. The other condition
+ // is for Opera that returns a width of -Infinity on hidden elements.
+ if (!bBox || bBox.width < 0) {
+ bBox = { width: 0, height: 0 };
+ }
+
+
+ // VML Renderer or useHTML within SVG
+ } else {
+
+ bBox = wrapper.htmlGetBBox();
+
+ }
+
+ // True SVG elements as well as HTML elements in modern browsers using the .useHTML option
+ // need to compensated for rotation
+ if (renderer.isSVG) {
+ width = bBox.width;
+ height = bBox.height;
+
+ // Workaround for wrong bounding box in IE9 and IE10 (#1101, #1505, #1669, #2568)
+ if (isIE && styles && styles.fontSize === '11px' && height.toPrecision(3) === '16.9') {
+ bBox.height = height = 14;
+ }
+
+ // Adjust for rotated text
+ if (rotation) {
+ bBox.width = mathAbs(height * mathSin(rad)) + mathAbs(width * mathCos(rad));
+ bBox.height = mathAbs(height * mathCos(rad)) + mathAbs(width * mathSin(rad));
+ }
+ }
+
+ // Cache it
+ wrapper.bBox = bBox;
+ if (cacheKey) {
+ renderer.cache[cacheKey] = bBox;
+ }
+ }
+ return bBox;
+ },
+
+ /**
+ * Show the element
+ */
+ show: function (inherit) {
+ // IE9-11 doesn't handle visibilty:inherit well, so we remove the attribute instead (#2881)
+ if (inherit && this.element.namespaceURI === SVG_NS) {
+ this.element.removeAttribute('visibility');
+ return this;
+ } else {
+ return this.attr({ visibility: inherit ? 'inherit' : VISIBLE });
+ }
+ },
+
+ /**
+ * Hide the element
+ */
+ hide: function () {
+ return this.attr({ visibility: HIDDEN });
+ },
+
+ fadeOut: function (duration) {
+ var elemWrapper = this;
+ elemWrapper.animate({
+ opacity: 0
+ }, {
+ duration: duration || 150,
+ complete: function () {
+ elemWrapper.hide();
+ }
+ });
+ },
+
+ /**
+ * Add the element
+ * @param {Object|Undefined} parent Can be an element, an element wrapper or undefined
+ * to append the element to the renderer.box.
+ */
+ add: function (parent) {
+
+ var renderer = this.renderer,
+ parentWrapper = parent || renderer,
+ parentNode = parentWrapper.element || renderer.box,
+ childNodes,
+ element = this.element,
+ zIndex = this.zIndex,
+ otherElement,
+ otherZIndex,
+ i,
+ inserted;
+
+ if (parent) {
+ this.parentGroup = parent;
+ }
+
+ // mark as inverted
+ this.parentInverted = parent && parent.inverted;
+
+ // build formatted text
+ if (this.textStr !== undefined) {
+ renderer.buildText(this);
+ }
+
+ // mark the container as having z indexed children
+ if (zIndex) {
+ parentWrapper.handleZ = true;
+ zIndex = pInt(zIndex);
+ }
+
+ // insert according to this and other elements' zIndex
+ if (parentWrapper.handleZ) { // this element or any of its siblings has a z index
+ childNodes = parentNode.childNodes;
+ for (i = 0; i < childNodes.length; i++) {
+ otherElement = childNodes[i];
+ otherZIndex = attr(otherElement, 'zIndex');
+ if (otherElement !== element && (
+ // insert before the first element with a higher zIndex
+ pInt(otherZIndex) > zIndex ||
+ // if no zIndex given, insert before the first element with a zIndex
+ (!defined(zIndex) && defined(otherZIndex))
+
+ )) {
+ parentNode.insertBefore(element, otherElement);
+ inserted = true;
+ break;
+ }
+ }
+ }
+
+ // default: append at the end
+ if (!inserted) {
+ parentNode.appendChild(element);
+ }
+
+ // mark as added
+ this.added = true;
+
+ // fire an event for internal hooks
+ if (this.onAdd) {
+ this.onAdd();
+ }
+
+ return this;
+ },
+
+ /**
+ * Removes a child either by removeChild or move to garbageBin.
+ * Issue 490; in VML removeChild results in Orphaned nodes according to sIEve, discardElement does not.
+ */
+ safeRemoveChild: function (element) {
+ var parentNode = element.parentNode;
+ if (parentNode) {
+ parentNode.removeChild(element);
+ }
+ },
+
+ /**
+ * Destroy the element and element wrapper
+ */
+ destroy: function () {
+ var wrapper = this,
+ element = wrapper.element || {},
+ shadows = wrapper.shadows,
+ parentToClean = wrapper.renderer.isSVG && element.nodeName === 'SPAN' && wrapper.parentGroup,
+ grandParent,
+ key,
+ i;
+
+ // remove events
+ element.onclick = element.onmouseout = element.onmouseover = element.onmousemove = element.point = null;
+ stop(wrapper); // stop running animations
+
+ if (wrapper.clipPath) {
+ wrapper.clipPath = wrapper.clipPath.destroy();
+ }
+
+ // Destroy stops in case this is a gradient object
+ if (wrapper.stops) {
+ for (i = 0; i < wrapper.stops.length; i++) {
+ wrapper.stops[i] = wrapper.stops[i].destroy();
+ }
+ wrapper.stops = null;
+ }
+
+ // remove element
+ wrapper.safeRemoveChild(element);
+
+ // destroy shadows
+ if (shadows) {
+ each(shadows, function (shadow) {
+ wrapper.safeRemoveChild(shadow);
+ });
+ }
+
+ // In case of useHTML, clean up empty containers emulating SVG groups (#1960, #2393, #2697).
+ while (parentToClean && parentToClean.div && parentToClean.div.childNodes.length === 0) {
+ grandParent = parentToClean.parentGroup;
+ wrapper.safeRemoveChild(parentToClean.div);
+ delete parentToClean.div;
+ parentToClean = grandParent;
+ }
+
+ // remove from alignObjects
+ if (wrapper.alignTo) {
+ erase(wrapper.renderer.alignedObjects, wrapper);
+ }
+
+ for (key in wrapper) {
+ delete wrapper[key];
+ }
+
+ return null;
+ },
+
+ /**
+ * Add a shadow to the element. Must be done after the element is added to the DOM
+ * @param {Boolean|Object} shadowOptions
+ */
+ shadow: function (shadowOptions, group, cutOff) {
+ var shadows = [],
+ i,
+ shadow,
+ element = this.element,
+ strokeWidth,
+ shadowWidth,
+ shadowElementOpacity,
+
+ // compensate for inverted plot area
+ transform;
+
+
+ if (shadowOptions) {
+ shadowWidth = pick(shadowOptions.width, 3);
+ shadowElementOpacity = (shadowOptions.opacity || 0.15) / shadowWidth;
+ transform = this.parentInverted ?
+ '(-1,-1)' :
+ '(' + pick(shadowOptions.offsetX, 1) + ', ' + pick(shadowOptions.offsetY, 1) + ')';
+ for (i = 1; i <= shadowWidth; i++) {
+ shadow = element.cloneNode(0);
+ strokeWidth = (shadowWidth * 2) + 1 - (2 * i);
+ attr(shadow, {
+ 'isShadow': 'true',
+ 'stroke': shadowOptions.color || 'black',
+ 'stroke-opacity': shadowElementOpacity * i,
+ 'stroke-width': strokeWidth,
+ 'transform': 'translate' + transform,
+ 'fill': NONE
+ });
+ if (cutOff) {
+ attr(shadow, 'height', mathMax(attr(shadow, 'height') - strokeWidth, 0));
+ shadow.cutHeight = strokeWidth;
+ }
+
+ if (group) {
+ group.element.appendChild(shadow);
+ } else {
+ element.parentNode.insertBefore(shadow, element);
+ }
+
+ shadows.push(shadow);
+ }
+
+ this.shadows = shadows;
+ }
+ return this;
+
+ },
+
+ xGetter: function (key) {
+ if (this.element.nodeName === 'circle') {
+ key = { x: 'cx', y: 'cy' }[key] || key;
+ }
+ return this._defaultGetter(key);
+ },
+
+ /**
+ * Get the current value of an attribute or pseudo attribute, used mainly
+ * for animation.
+ */
+ _defaultGetter: function (key) {
+ var ret = pick(this[key], this.element ? this.element.getAttribute(key) : null, 0);
+
+ if (/^[\-0-9\.]+$/.test(ret)) { // is numerical
+ ret = parseFloat(ret);
+ }
+ return ret;
+ },
+
+
+ dSetter: function (value, key, element) {
+ if (value && value.join) { // join path
+ value = value.join(' ');
+ }
+ if (/(NaN| {2}|^$)/.test(value)) {
+ value = 'M 0 0';
+ }
+ element.setAttribute(key, value);
+
+ this[key] = value;
+ },
+ dashstyleSetter: function (value) {
+ var i;
+ value = value && value.toLowerCase();
+ if (value) {
+ value = value
+ .replace('shortdashdotdot', '3,1,1,1,1,1,')
+ .replace('shortdashdot', '3,1,1,1')
+ .replace('shortdot', '1,1,')
+ .replace('shortdash', '3,1,')
+ .replace('longdash', '8,3,')
+ .replace(/dot/g, '1,3,')
+ .replace('dash', '4,3,')
+ .replace(/,$/, '')
+ .replace('solid', 1)
+ .split(','); // ending comma
+
+ i = value.length;
+ while (i--) {
+ value[i] = pInt(value[i]) * this['stroke-width'];
+ }
+ value = value.join(',');
+ this.element.setAttribute('stroke-dasharray', value);
+ }
+ },
+ alignSetter: function (value) {
+ this.element.setAttribute('text-anchor', { left: 'start', center: 'middle', right: 'end' }[value]);
+ },
+ opacitySetter: function (value, key, element) {
+ this[key] = value;
+ element.setAttribute(key, value);
+ },
+ titleSetter: function (value) {
+ var titleNode = this.element.getElementsByTagName('title')[0];
+ if (!titleNode) {
+ titleNode = doc.createElementNS(SVG_NS, 'title');
+ this.element.appendChild(titleNode);
+ }
+ titleNode.textContent = value;
+ },
+ textSetter: function (value) {
+ if (value !== this.textStr) {
+ // Delete bBox memo when the text changes
+ delete this.bBox;
+
+ this.textStr = value;
+ if (this.added) {
+ this.renderer.buildText(this);
+ }
+ }
+ },
+ fillSetter: function (value, key, element) {
+ if (typeof value === 'string') {
+ element.setAttribute(key, value);
+ } else if (value) {
+ this.colorGradient(value, key, element);
+ }
+ },
+ zIndexSetter: function (value, key, element) {
+ element.setAttribute(key, value);
+ this[key] = value;
+ },
+ _defaultSetter: function (value, key, element) {
+ element.setAttribute(key, value);
+ }
+};
+
+// Some shared setters and getters
+SVGElement.prototype.yGetter = SVGElement.prototype.xGetter;
+SVGElement.prototype.translateXSetter = SVGElement.prototype.translateYSetter =
+ SVGElement.prototype.rotationSetter = SVGElement.prototype.verticalAlignSetter =
+ SVGElement.prototype.scaleXSetter = SVGElement.prototype.scaleYSetter = function (value, key) {
+ this[key] = value;
+ this.doTransform = true;
+};
+
+// WebKit and Batik have problems with a stroke-width of zero, so in this case we remove the
+// stroke attribute altogether. #1270, #1369, #3065, #3072.
+SVGElement.prototype['stroke-widthSetter'] = SVGElement.prototype.strokeSetter = function (value, key, element) {
+ this[key] = value;
+ // Only apply the stroke attribute if the stroke width is defined and larger than 0
+ if (this.stroke && this['stroke-width']) {
+ this.strokeWidth = this['stroke-width'];
+ SVGElement.prototype.fillSetter.call(this, this.stroke, 'stroke', element); // use prototype as instance may be overridden
+ element.setAttribute('stroke-width', this['stroke-width']);
+ this.hasStroke = true;
+ } else if (key === 'stroke-width' && value === 0 && this.hasStroke) {
+ element.removeAttribute('stroke');
+ this.hasStroke = false;
+ }
+};
+
+
+/**
+ * The default SVG renderer
+ */
+var SVGRenderer = function () {
+ this.init.apply(this, arguments);
+};
+SVGRenderer.prototype = {
+ Element: SVGElement,
+
+ /**
+ * Initialize the SVGRenderer
+ * @param {Object} container
+ * @param {Number} width
+ * @param {Number} height
+ * @param {Boolean} forExport
+ */
+ init: function (container, width, height, style, forExport) {
+ var renderer = this,
+ loc = location,
+ boxWrapper,
+ element,
+ desc;
+
+ boxWrapper = renderer.createElement('svg')
+ .attr({
+ version: '1.1'
+ })
+ .css(this.getStyle(style));
+ element = boxWrapper.element;
+ container.appendChild(element);
+
+ // For browsers other than IE, add the namespace attribute (#1978)
+ if (container.innerHTML.indexOf('xmlns') === -1) {
+ attr(element, 'xmlns', SVG_NS);
+ }
+
+ // object properties
+ renderer.isSVG = true;
+ renderer.box = element;
+ renderer.boxWrapper = boxWrapper;
+ renderer.alignedObjects = [];
+
+ // Page url used for internal references. #24, #672, #1070
+ renderer.url = (isFirefox || isWebKit) && doc.getElementsByTagName('base').length ?
+ loc.href
+ .replace(/#.*?$/, '') // remove the hash
+ .replace(/([\('\)])/g, '\\$1') // escape parantheses and quotes
+ .replace(/ /g, '%20') : // replace spaces (needed for Safari only)
+ '';
+
+ // Add description
+ desc = this.createElement('desc').add();
+ desc.element.appendChild(doc.createTextNode('Created with ' + PRODUCT + ' ' + VERSION));
+
+
+ renderer.defs = this.createElement('defs').add();
+ renderer.forExport = forExport;
+ renderer.gradients = {}; // Object where gradient SvgElements are stored
+ renderer.cache = {}; // Cache for numerical bounding boxes
+
+ renderer.setSize(width, height, false);
+
+
+
+ // Issue 110 workaround:
+ // In Firefox, if a div is positioned by percentage, its pixel position may land
+ // between pixels. The container itself doesn't display this, but an SVG element
+ // inside this container will be drawn at subpixel precision. In order to draw
+ // sharp lines, this must be compensated for. This doesn't seem to work inside
+ // iframes though (like in jsFiddle).
+ var subPixelFix, rect;
+ if (isFirefox && container.getBoundingClientRect) {
+ renderer.subPixelFix = subPixelFix = function () {
+ css(container, { left: 0, top: 0 });
+ rect = container.getBoundingClientRect();
+ css(container, {
+ left: (mathCeil(rect.left) - rect.left) + PX,
+ top: (mathCeil(rect.top) - rect.top) + PX
+ });
+ };
+
+ // run the fix now
+ subPixelFix();
+
+ // run it on resize
+ addEvent(win, 'resize', subPixelFix);
+ }
+ },
+
+ getStyle: function (style) {
+ return (this.style = extend({
+ fontFamily: '"Lucida Grande", "Lucida Sans Unicode", Arial, Helvetica, sans-serif', // default font
+ fontSize: '12px'
+ }, style));
+ },
+
+ /**
+ * Detect whether the renderer is hidden. This happens when one of the parent elements
+ * has display: none. #608.
+ */
+ isHidden: function () {
+ return !this.boxWrapper.getBBox().width;
+ },
+
+ /**
+ * Destroys the renderer and its allocated members.
+ */
+ destroy: function () {
+ var renderer = this,
+ rendererDefs = renderer.defs;
+ renderer.box = null;
+ renderer.boxWrapper = renderer.boxWrapper.destroy();
+
+ // Call destroy on all gradient elements
+ destroyObjectProperties(renderer.gradients || {});
+ renderer.gradients = null;
+
+ // Defs are null in VMLRenderer
+ // Otherwise, destroy them here.
+ if (rendererDefs) {
+ renderer.defs = rendererDefs.destroy();
+ }
+
+ // Remove sub pixel fix handler
+ // We need to check that there is a handler, otherwise all functions that are registered for event 'resize' are removed
+ // See issue #982
+ if (renderer.subPixelFix) {
+ removeEvent(win, 'resize', renderer.subPixelFix);
+ }
+
+ renderer.alignedObjects = null;
+
+ return null;
+ },
+
+ /**
+ * Create a wrapper for an SVG element
+ * @param {Object} nodeName
+ */
+ createElement: function (nodeName) {
+ var wrapper = new this.Element();
+ wrapper.init(this, nodeName);
+ return wrapper;
+ },
+
+ /**
+ * Dummy function for use in canvas renderer
+ */
+ draw: function () {},
+
+ /**
+ * Parse a simple HTML string into SVG tspans
+ *
+ * @param {Object} textNode The parent text SVG node
+ */
+ buildText: function (wrapper) {
+ var textNode = wrapper.element,
+ renderer = this,
+ forExport = renderer.forExport,
+ textStr = pick(wrapper.textStr, '').toString(),
+ hasMarkup = textStr.indexOf('<') !== -1,
+ lines,
+ childNodes = textNode.childNodes,
+ styleRegex,
+ hrefRegex,
+ parentX = attr(textNode, 'x'),
+ textStyles = wrapper.styles,
+ width = wrapper.textWidth,
+ textLineHeight = textStyles && textStyles.lineHeight,
+ textStroke = textStyles && textStyles.HcTextStroke,
+ i = childNodes.length,
+ getLineHeight = function (tspan) {
+ return textLineHeight ?
+ pInt(textLineHeight) :
+ renderer.fontMetrics(
+ /(px|em)$/.test(tspan && tspan.style.fontSize) ?
+ tspan.style.fontSize :
+ ((textStyles && textStyles.fontSize) || renderer.style.fontSize || 12),
+ tspan
+ ).h;
+ };
+
+ /// remove old text
+ while (i--) {
+ textNode.removeChild(childNodes[i]);
+ }
+
+ // Skip tspans, add text directly to text node. The forceTSpan is a hook
+ // used in text outline hack.
+ if (!hasMarkup && !textStroke && textStr.indexOf(' ') === -1) {
+ textNode.appendChild(doc.createTextNode(textStr));
+ return;
+
+ // Complex strings, add more logic
+ } else {
+
+ styleRegex = /<.*style="([^"]+)".*>/;
+ hrefRegex = /<.*href="(http[^"]+)".*>/;
+
+ if (width && !wrapper.added) {
+ this.box.appendChild(textNode); // attach it to the DOM to read offset width
+ }
+
+ if (hasMarkup) {
+ lines = textStr
+ .replace(/<(b|strong)>/g, '<span style="font-weight:bold">')
+ .replace(/<(i|em)>/g, '<span style="font-style:italic">')
+ .replace(/<a/g, '<span')
+ .replace(/<\/(b|strong|i|em|a)>/g, '</span>')
+ .split(/<br.*?>/g);
+
+ } else {
+ lines = [textStr];
+ }
+
+
+ // remove empty line at end
+ if (lines[lines.length - 1] === '') {
+ lines.pop();
+ }
+
+
+ // build the lines
+ each(lines, function (line, lineNo) {
+ var spans, spanNo = 0;
+
+ line = line.replace(/<span/g, '|||<span').replace(/<\/span>/g, '</span>|||');
+ spans = line.split('|||');
+
+ each(spans, function (span) {
+ if (span !== '' || spans.length === 1) {
+ var attributes = {},
+ tspan = doc.createElementNS(SVG_NS, 'tspan'),
+ spanStyle; // #390
+ if (styleRegex.test(span)) {
+ spanStyle = span.match(styleRegex)[1].replace(/(;| |^)color([ :])/, '$1fill$2');
+ attr(tspan, 'style', spanStyle);
+ }
+ if (hrefRegex.test(span) && !forExport) { // Not for export - #1529
+ attr(tspan, 'onclick', 'location.href=\"' + span.match(hrefRegex)[1] + '\"');
+ css(tspan, { cursor: 'pointer' });
+ }
+
+ span = (span.replace(/<(.|\n)*?>/g, '') || ' ')
+ .replace(/</g, '<')
+ .replace(/>/g, '>');
+
+ // Nested tags aren't supported, and cause crash in Safari (#1596)
+ if (span !== ' ') {
+
+ // add the text node
+ tspan.appendChild(doc.createTextNode(span));
+
+ if (!spanNo) { // first span in a line, align it to the left
+ if (lineNo && parentX !== null) {
+ attributes.x = parentX;
+ }
+ } else {
+ attributes.dx = 0; // #16
+ }
+
+ // add attributes
+ attr(tspan, attributes);
+
+ // Append it
+ textNode.appendChild(tspan);
+
+ // first span on subsequent line, add the line height
+ if (!spanNo && lineNo) {
+
+ // allow getting the right offset height in exporting in IE
+ if (!hasSVG && forExport) {
+ css(tspan, { display: 'block' });
+ }
+
+ // Set the line height based on the font size of either
+ // the text element or the tspan element
+ attr(
+ tspan,
+ 'dy',
+ getLineHeight(tspan)
+ );
+ }
+
+ // check width and apply soft breaks
+ if (width) {
+ var words = span.replace(/([^\^])-/g, '$1- ').split(' '), // #1273
+ hasWhiteSpace = spans.length > 1 || (words.length > 1 && textStyles.whiteSpace !== 'nowrap'),
+ tooLong,
+ actualWidth,
+ hcHeight = textStyles.HcHeight,
+ rest = [],
+ dy = getLineHeight(tspan),
+ softLineNo = 1,
+ bBox;
+
+ while (hasWhiteSpace && (words.length || rest.length)) {
+ delete wrapper.bBox; // delete cache
+ bBox = wrapper.getBBox();
+ actualWidth = bBox.width;
+
+ // Old IE cannot measure the actualWidth for SVG elements (#2314)
+ if (!hasSVG && renderer.forExport) {
+ actualWidth = renderer.measureSpanWidth(tspan.firstChild.data, wrapper.styles);
+ }
+
+ tooLong = actualWidth > width;
+ if (!tooLong || words.length === 1) { // new line needed
+ words = rest;
+ rest = [];
+ if (words.length) {
+ softLineNo++;
+ if (hcHeight && softLineNo * dy > hcHeight) {
+ words = ['...'];
+ wrapper.attr('title', wrapper.textStr);
+ } else {
+
+ tspan = doc.createElementNS(SVG_NS, 'tspan');
+ attr(tspan, {
+ dy: dy,
+ x: parentX
+ });
+ if (spanStyle) { // #390
+ attr(tspan, 'style', spanStyle);
+ }
+ textNode.appendChild(tspan);
+ }
+ }
+ if (actualWidth > width) { // a single word is pressing it out
+ width = actualWidth;
+ }
+ } else { // append to existing line tspan
+ tspan.removeChild(tspan.firstChild);
+ rest.unshift(words.pop());
+ }
+ if (words.length) {
+ tspan.appendChild(doc.createTextNode(words.join(' ').replace(/- /g, '-')));
+ }
+ }
+ }
+
+ spanNo++;
+ }
+ }
+ });
+ });
+ }
+ },
+
+ /**
+ * Create a button with preset states
+ * @param {String} text
+ * @param {Number} x
+ * @param {Number} y
+ * @param {Function} callback
+ * @param {Object} normalState
+ * @param {Object} hoverState
+ * @param {Object} pressedState
+ */
+ button: function (text, x, y, callback, normalState, hoverState, pressedState, disabledState, shape) {
+ var label = this.label(text, x, y, shape, null, null, null, null, 'button'),
+ curState = 0,
+ stateOptions,
+ stateStyle,
+ normalStyle,
+ hoverStyle,
+ pressedStyle,
+ disabledStyle,
+ verticalGradient = { x1: 0, y1: 0, x2: 0, y2: 1 };
+
+ // Normal state - prepare the attributes
+ normalState = merge({
+ 'stroke-width': 1,
+ stroke: '#CCCCCC',
+ fill: {
+ linearGradient: verticalGradient,
+ stops: [
+ [0, '#FEFEFE'],
+ [1, '#F6F6F6']
+ ]
+ },
+ r: 2,
+ padding: 5,
+ style: {
+ color: 'black'
+ }
+ }, normalState);
+ normalStyle = normalState.style;
+ delete normalState.style;
+
+ // Hover state
+ hoverState = merge(normalState, {
+ stroke: '#68A',
+ fill: {
+ linearGradient: verticalGradient,
+ stops: [
+ [0, '#FFF'],
+ [1, '#ACF']
+ ]
+ }
+ }, hoverState);
+ hoverStyle = hoverState.style;
+ delete hoverState.style;
+
+ // Pressed state
+ pressedState = merge(normalState, {
+ stroke: '#68A',
+ fill: {
+ linearGradient: verticalGradient,
+ stops: [
+ [0, '#9BD'],
+ [1, '#CDF']
+ ]
+ }
+ }, pressedState);
+ pressedStyle = pressedState.style;
+ delete pressedState.style;
+
+ // Disabled state
+ disabledState = merge(normalState, {
+ style: {
+ color: '#CCC'
+ }
+ }, disabledState);
+ disabledStyle = disabledState.style;
+ delete disabledState.style;
+
+ // Add the events. IE9 and IE10 need mouseover and mouseout to funciton (#667).
+ addEvent(label.element, isIE ? 'mouseover' : 'mouseenter', function () {
+ if (curState !== 3) {
+ label.attr(hoverState)
+ .css(hoverStyle);
+ }
+ });
+ addEvent(label.element, isIE ? 'mouseout' : 'mouseleave', function () {
+ if (curState !== 3) {
+ stateOptions = [normalState, hoverState, pressedState][curState];
+ stateStyle = [normalStyle, hoverStyle, pressedStyle][curState];
+ label.attr(stateOptions)
+ .css(stateStyle);
+ }
+ });
+
+ label.setState = function (state) {
+ label.state = curState = state;
+ if (!state) {
+ label.attr(normalState)
+ .css(normalStyle);
+ } else if (state === 2) {
+ label.attr(pressedState)
+ .css(pressedStyle);
+ } else if (state === 3) {
+ label.attr(disabledState)
+ .css(disabledStyle);
+ }
+ };
+
+ return label
+ .on('click', function () {
+ if (curState !== 3) {
+ callback.call(label);
+ }
+ })
+ .attr(normalState)
+ .css(extend({ cursor: 'default' }, normalStyle));
+ },
+
+ /**
+ * Make a straight line crisper by not spilling out to neighbour pixels
+ * @param {Array} points
+ * @param {Number} width
+ */
+ crispLine: function (points, width) {
+ // points format: [M, 0, 0, L, 100, 0]
+ // normalize to a crisp line
+ if (points[1] === points[4]) {
+ // Substract due to #1129. Now bottom and left axis gridlines behave the same.
+ points[1] = points[4] = mathRound(points[1]) - (width % 2 / 2);
+ }
+ if (points[2] === points[5]) {
+ points[2] = points[5] = mathRound(points[2]) + (width % 2 / 2);
+ }
+ return points;
+ },
+
+
+ /**
+ * Draw a path
+ * @param {Array} path An SVG path in array form
+ */
+ path: function (path) {
+ var attr = {
+ fill: NONE
+ };
+ if (isArray(path)) {
+ attr.d = path;
+ } else if (isObject(path)) { // attributes
+ extend(attr, path);
+ }
+ return this.createElement('path').attr(attr);
+ },
+
+ /**
+ * Draw and return an SVG circle
+ * @param {Number} x The x position
+ * @param {Number} y The y position
+ * @param {Number} r The radius
+ */
+ circle: function (x, y, r) {
+ var attr = isObject(x) ?
+ x :
+ {
+ x: x,
+ y: y,
+ r: r
+ },
+ wrapper = this.createElement('circle');
+
+ wrapper.xSetter = function (value) {
+ this.element.setAttribute('cx', value);
+ };
+ wrapper.ySetter = function (value) {
+ this.element.setAttribute('cy', value);
+ };
+ return wrapper.attr(attr);
+ },
+
+ /**
+ * Draw and return an arc
+ * @param {Number} x X position
+ * @param {Number} y Y position
+ * @param {Number} r Radius
+ * @param {Number} innerR Inner radius like used in donut charts
+ * @param {Number} start Starting angle
+ * @param {Number} end Ending angle
+ */
+ arc: function (x, y, r, innerR, start, end) {
+ var arc;
+
+ if (isObject(x)) {
+ y = x.y;
+ r = x.r;
+ innerR = x.innerR;
+ start = x.start;
+ end = x.end;
+ x = x.x;
+ }
+
+ // Arcs are defined as symbols for the ability to set
+ // attributes in attr and animate
+ arc = this.symbol('arc', x || 0, y || 0, r || 0, r || 0, {
+ innerR: innerR || 0,
+ start: start || 0,
+ end: end || 0
+ });
+ arc.r = r; // #959
+ return arc;
+ },
+
+ /**
+ * Draw and return a rectangle
+ * @param {Number} x Left position
+ * @param {Number} y Top position
+ * @param {Number} width
+ * @param {Number} height
+ * @param {Number} r Border corner radius
+ * @param {Number} strokeWidth A stroke width can be supplied to allow crisp drawing
+ */
+ rect: function (x, y, width, height, r, strokeWidth) {
+
+ r = isObject(x) ? x.r : r;
+
+ var wrapper = this.createElement('rect'),
+ attribs = isObject(x) ? x : x === UNDEFINED ? {} : {
+ x: x,
+ y: y,
+ width: mathMax(width, 0),
+ height: mathMax(height, 0)
+ };
+
+ if (strokeWidth !== UNDEFINED) {
+ attribs.strokeWidth = strokeWidth;
+ attribs = wrapper.crisp(attribs);
+ }
+
+ if (r) {
+ attribs.r = r;
+ }
+
+ wrapper.rSetter = function (value) {
+ attr(this.element, {
+ rx: value,
+ ry: value
+ });
+ };
+
+ return wrapper.attr(attribs);
+ },
+
+ /**
+ * Resize the box and re-align all aligned elements
+ * @param {Object} width
+ * @param {Object} height
+ * @param {Boolean} animate
+ *
+ */
+ setSize: function (width, height, animate) {
+ var renderer = this,
+ alignedObjects = renderer.alignedObjects,
+ i = alignedObjects.length;
+
+ renderer.width = width;
+ renderer.height = height;
+
+ renderer.boxWrapper[pick(animate, true) ? 'animate' : 'attr']({
+ width: width,
+ height: height
+ });
+
+ while (i--) {
+ alignedObjects[i].align();
+ }
+ },
+
+ /**
+ * Create a group
+ * @param {String} name The group will be given a class name of 'highcharts-{name}'.
+ * This can be used for styling and scripting.
+ */
+ g: function (name) {
+ var elem = this.createElement('g');
+ return defined(name) ? elem.attr({ 'class': PREFIX + name }) : elem;
+ },
+
+ /**
+ * Display an image
+ * @param {String} src
+ * @param {Number} x
+ * @param {Number} y
+ * @param {Number} width
+ * @param {Number} height
+ */
+ image: function (src, x, y, width, height) {
+ var attribs = {
+ preserveAspectRatio: NONE
+ },
+ elemWrapper;
+
+ // optional properties
+ if (arguments.length > 1) {
+ extend(attribs, {
+ x: x,
+ y: y,
+ width: width,
+ height: height
+ });
+ }
+
+ elemWrapper = this.createElement('image').attr(attribs);
+
+ // set the href in the xlink namespace
+ if (elemWrapper.element.setAttributeNS) {
+ elemWrapper.element.setAttributeNS('http://www.w3.org/1999/xlink',
+ 'href', src);
+ } else {
+ // could be exporting in IE
+ // using href throws "not supported" in ie7 and under, requries regex shim to fix later
+ elemWrapper.element.setAttribute('hc-svg-href', src);
+ }
+ return elemWrapper;
+ },
+
+ /**
+ * Draw a symbol out of pre-defined shape paths from the namespace 'symbol' object.
+ *
+ * @param {Object} symbol
+ * @param {Object} x
+ * @param {Object} y
+ * @param {Object} radius
+ * @param {Object} options
+ */
+ symbol: function (symbol, x, y, width, height, options) {
+
+ var obj,
+
+ // get the symbol definition function
+ symbolFn = this.symbols[symbol],
+
+ // check if there's a path defined for this symbol
+ path = symbolFn && symbolFn(
+ mathRound(x),
+ mathRound(y),
+ width,
+ height,
+ options
+ ),
+
+ imageElement,
+ imageRegex = /^url\((.*?)\)$/,
+ imageSrc,
+ imageSize,
+ centerImage;
+
+ if (path) {
+
+ obj = this.path(path);
+ // expando properties for use in animate and attr
+ extend(obj, {
+ symbolName: symbol,
+ x: x,
+ y: y,
+ width: width,
+ height: height
+ });
+ if (options) {
+ extend(obj, options);
+ }
+
+
+ // image symbols
+ } else if (imageRegex.test(symbol)) {
+
+ // On image load, set the size and position
+ centerImage = function (img, size) {
+ if (img.element) { // it may be destroyed in the meantime (#1390)
+ img.attr({
+ width: size[0],
+ height: size[1]
+ });
+
+ if (!img.alignByTranslate) { // #185
+ img.translate(
+ mathRound((width - size[0]) / 2), // #1378
+ mathRound((height - size[1]) / 2)
+ );
+ }
+ }
+ };
+
+ imageSrc = symbol.match(imageRegex)[1];
+ imageSize = symbolSizes[imageSrc];
+
+ // Ireate the image synchronously, add attribs async
+ obj = this.image(imageSrc)
+ .attr({
+ x: x,
+ y: y
+ });
+ obj.isImg = true;
+
+ if (imageSize) {
+ centerImage(obj, imageSize);
+ } else {
+ // Initialize image to be 0 size so export will still function if there's no cached sizes.
+ //
+ obj.attr({ width: 0, height: 0 });
+
+ // Create a dummy JavaScript image to get the width and height. Due to a bug in IE < 8,
+ // the created element must be assigned to a variable in order to load (#292).
+ imageElement = createElement('img', {
+ onload: function () {
+ centerImage(obj, symbolSizes[imageSrc] = [this.width, this.height]);
+ },
+ src: imageSrc
+ });
+ }
+ }
+
+ return obj;
+ },
+
+ /**
+ * An extendable collection of functions for defining symbol paths.
+ */
+ symbols: {
+ 'circle': function (x, y, w, h) {
+ var cpw = 0.166 * w;
+ return [
+ M, x + w / 2, y,
+ 'C', x + w + cpw, y, x + w + cpw, y + h, x + w / 2, y + h,
+ 'C', x - cpw, y + h, x - cpw, y, x + w / 2, y,
+ 'Z'
+ ];
+ },
+
+ 'square': function (x, y, w, h) {
+ return [
+ M, x, y,
+ L, x + w, y,
+ x + w, y + h,
+ x, y + h,
+ 'Z'
+ ];
+ },
+
+ 'triangle': function (x, y, w, h) {
+ return [
+ M, x + w / 2, y,
+ L, x + w, y + h,
+ x, y + h,
+ 'Z'
+ ];
+ },
+
+ 'triangle-down': function (x, y, w, h) {
+ return [
+ M, x, y,
+ L, x + w, y,
+ x + w / 2, y + h,
+ 'Z'
+ ];
+ },
+ 'diamond': function (x, y, w, h) {
+ return [
+ M, x + w / 2, y,
+ L, x + w, y + h / 2,
+ x + w / 2, y + h,
+ x, y + h / 2,
+ 'Z'
+ ];
+ },
+ 'arc': function (x, y, w, h, options) {
+ var start = options.start,
+ radius = options.r || w || h,
+ end = options.end - 0.001, // to prevent cos and sin of start and end from becoming equal on 360 arcs (related: #1561)
+ innerRadius = options.innerR,
+ open = options.open,
+ cosStart = mathCos(start),
+ sinStart = mathSin(start),
+ cosEnd = mathCos(end),
+ sinEnd = mathSin(end),
+ longArc = options.end - start < mathPI ? 0 : 1;
+
+ return [
+ M,
+ x + radius * cosStart,
+ y + radius * sinStart,
+ 'A', // arcTo
+ radius, // x radius
+ radius, // y radius
+ 0, // slanting
+ longArc, // long or short arc
+ 1, // clockwise
+ x + radius * cosEnd,
+ y + radius * sinEnd,
+ open ? M : L,
+ x + innerRadius * cosEnd,
+ y + innerRadius * sinEnd,
+ 'A', // arcTo
+ innerRadius, // x radius
+ innerRadius, // y radius
+ 0, // slanting
+ longArc, // long or short arc
+ 0, // clockwise
+ x + innerRadius * cosStart,
+ y + innerRadius * sinStart,
+
+ open ? '' : 'Z' // close
+ ];
+ },
+
+ /**
+ * Callout shape used for default tooltips, also used for rounded rectangles in VML
+ */
+ callout: function (x, y, w, h, options) {
+ var arrowLength = 6,
+ halfDistance = 6,
+ r = mathMin((options && options.r) || 0, w, h),
+ safeDistance = r + halfDistance,
+ anchorX = options && options.anchorX,
+ anchorY = options && options.anchorY,
+ path,
+ normalizer = mathRound(options.strokeWidth || 0) % 2 / 2; // mathRound because strokeWidth can sometimes have roundoff errors;
+
+ x += normalizer;
+ y += normalizer;
+ path = [
+ 'M', x + r, y,
+ 'L', x + w - r, y, // top side
+ 'C', x + w, y, x + w, y, x + w, y + r, // top-right corner
+ 'L', x + w, y + h - r, // right side
+ 'C', x + w, y + h, x + w, y + h, x + w - r, y + h, // bottom-right corner
+ 'L', x + r, y + h, // bottom side
+ 'C', x, y + h, x, y + h, x, y + h - r, // bottom-left corner
+ 'L', x, y + r, // left side
+ 'C', x, y, x, y, x + r, y // top-right corner
+ ];
+
+ if (anchorX && anchorX > w && anchorY > y + safeDistance && anchorY < y + h - safeDistance) { // replace right side
+ path.splice(13, 3,
+ 'L', x + w, anchorY - halfDistance,
+ x + w + arrowLength, anchorY,
+ x + w, anchorY + halfDistance,
+ x + w, y + h - r
+ );
+ } else if (anchorX && anchorX < 0 && anchorY > y + safeDistance && anchorY < y + h - safeDistance) { // replace left side
+ path.splice(33, 3,
+ 'L', x, anchorY + halfDistance,
+ x - arrowLength, anchorY,
+ x, anchorY - halfDistance,
+ x, y + r
+ );
+ } else if (anchorY && anchorY > h && anchorX > x + safeDistance && anchorX < x + w - safeDistance) { // replace bottom
+ path.splice(23, 3,
+ 'L', anchorX + halfDistance, y + h,
+ anchorX, y + h + arrowLength,
+ anchorX - halfDistance, y + h,
+ x + r, y + h
+ );
+ } else if (anchorY && anchorY < 0 && anchorX > x + safeDistance && anchorX < x + w - safeDistance) { // replace top
+ path.splice(3, 3,
+ 'L', anchorX - halfDistance, y,
+ anchorX, y - arrowLength,
+ anchorX + halfDistance, y,
+ w - r, y
+ );
+ }
+ return path;
+ }
+ },
+
+ /**
+ * Define a clipping rectangle
+ * @param {String} id
+ * @param {Number} x
+ * @param {Number} y
+ * @param {Number} width
+ * @param {Number} height
+ */
+ clipRect: function (x, y, width, height) {
+ var wrapper,
+ id = PREFIX + idCounter++,
+
+ clipPath = this.createElement('clipPath').attr({
+ id: id
+ }).add(this.defs);
+
+ wrapper = this.rect(x, y, width, height, 0).add(clipPath);
+ wrapper.id = id;
+ wrapper.clipPath = clipPath;
+
+ return wrapper;
+ },
+
+
+
+
+
+ /**
+ * Add text to the SVG object
+ * @param {String} str
+ * @param {Number} x Left position
+ * @param {Number} y Top position
+ * @param {Boolean} useHTML Use HTML to render the text
+ */
+ text: function (str, x, y, useHTML) {
+
+ // declare variables
+ var renderer = this,
+ fakeSVG = useCanVG || (!hasSVG && renderer.forExport),
+ wrapper,
+ attr = {};
+
+ if (useHTML && !renderer.forExport) {
+ return renderer.html(str, x, y);
+ }
+
+ attr.x = Math.round(x || 0); // X is always needed for line-wrap logic
+ if (y) {
+ attr.y = Math.round(y);
+ }
+ if (str || str === 0) {
+ attr.text = str;
+ }
+
+ wrapper = renderer.createElement('text')
+ .attr(attr);
+
+ // Prevent wrapping from creating false offsetWidths in export in legacy IE (#1079, #1063)
+ if (fakeSVG) {
+ wrapper.css({
+ position: ABSOLUTE
+ });
+ }
+
+ if (!useHTML) {
+ wrapper.xSetter = function (value, key, element) {
+ var tspans = element.getElementsByTagName('tspan'),
+ tspan,
+ parentVal = element.getAttribute(key),
+ i;
+ for (i = 0; i < tspans.length; i++) {
+ tspan = tspans[i];
+ // If the x values are equal, the tspan represents a linebreak
+ if (tspan.getAttribute(key) === parentVal) {
+ tspan.setAttribute(key, value);
+ }
+ }
+ element.setAttribute(key, value);
+ };
+ }
+
+ return wrapper;
+ },
+
+ /**
+ * Utility to return the baseline offset and total line height from the font size
+ */
+ fontMetrics: function (fontSize, elem) {
+ fontSize = fontSize || this.style.fontSize;
+ if (elem && win.getComputedStyle) {
+ elem = elem.element || elem; // SVGElement
+ fontSize = win.getComputedStyle(elem, "").fontSize;
+ }
+ fontSize = /px/.test(fontSize) ? pInt(fontSize) : /em/.test(fontSize) ? parseFloat(fontSize) * 12 : 12;
+
+ // Empirical values found by comparing font size and bounding box height.
+ // Applies to the default font family. http://jsfiddle.net/highcharts/7xvn7/
+ var lineHeight = fontSize < 24 ? fontSize + 4 : mathRound(fontSize * 1.2),
+ baseline = mathRound(lineHeight * 0.8);
+
+ return {
+ h: lineHeight,
+ b: baseline,
+ f: fontSize
+ };
+ },
+
+ /**
+ * Add a label, a text item that can hold a colored or gradient background
+ * as well as a border and shadow.
+ * @param {string} str
+ * @param {Number} x
+ * @param {Number} y
+ * @param {String} shape
+ * @param {Number} anchorX In case the shape has a pointer, like a flag, this is the
+ * coordinates it should be pinned to
+ * @param {Number} anchorY
+ * @param {Boolean} baseline Whether to position the label relative to the text baseline,
+ * like renderer.text, or to the upper border of the rectangle.
+ * @param {String} className Class name for the group
+ */
+ label: function (str, x, y, shape, anchorX, anchorY, useHTML, baseline, className) {
+
+ var renderer = this,
+ wrapper = renderer.g(className),
+ text = renderer.text('', 0, 0, useHTML)
+ .attr({
+ zIndex: 1
+ }),
+ //.add(wrapper),
+ box,
+ bBox,
+ alignFactor = 0,
+ padding = 3,
+ paddingLeft = 0,
+ width,
+ height,
+ wrapperX,
+ wrapperY,
+ crispAdjust = 0,
+ deferredAttr = {},
+ baselineOffset,
+ needsBox;
+
+ /**
+ * This function runs after the label is added to the DOM (when the bounding box is
+ * available), and after the text of the label is updated to detect the new bounding
+ * box and reflect it in the border box.
+ */
+ function updateBoxSize() {
+ var boxX,
+ boxY,
+ style = text.element.style;
+
+ bBox = (width === undefined || height === undefined || wrapper.styles.textAlign) && text.textStr &&
+ text.getBBox();
+ wrapper.width = (width || bBox.width || 0) + 2 * padding + paddingLeft;
+ wrapper.height = (height || bBox.height || 0) + 2 * padding;
+
+ // update the label-scoped y offset
+ baselineOffset = padding + renderer.fontMetrics(style && style.fontSize, text).b;
+
+
+ if (needsBox) {
+
+ // create the border box if it is not already present
+ if (!box) {
+ boxX = mathRound(-alignFactor * padding);
+ boxY = baseline ? -baselineOffset : 0;
+
+ wrapper.box = box = shape ?
+ renderer.symbol(shape, boxX, boxY, wrapper.width, wrapper.height, deferredAttr) :
+ renderer.rect(boxX, boxY, wrapper.width, wrapper.height, 0, deferredAttr[STROKE_WIDTH]);
+ box.attr('fill', NONE).add(wrapper);
+ }
+
+ // apply the box attributes
+ if (!box.isImg) { // #1630
+ box.attr(extend({
+ width: mathRound(wrapper.width),
+ height: mathRound(wrapper.height)
+ }, deferredAttr));
+ }
+ deferredAttr = null;
+ }
+ }
+
+ /**
+ * This function runs after setting text or padding, but only if padding is changed
+ */
+ function updateTextPadding() {
+ var styles = wrapper.styles,
+ textAlign = styles && styles.textAlign,
+ x = paddingLeft + padding * (1 - alignFactor),
+ y;
+
+ // determin y based on the baseline
+ y = baseline ? 0 : baselineOffset;
+
+ // compensate for alignment
+ if (defined(width) && bBox && (textAlign === 'center' || textAlign === 'right')) {
+ x += { center: 0.5, right: 1 }[textAlign] * (width - bBox.width);
+ }
+
+ // update if anything changed
+ if (x !== text.x || y !== text.y) {
+ text.attr('x', x);
+ if (y !== UNDEFINED) {
+ text.attr('y', y);
+ }
+ }
+
+ // record current values
+ text.x = x;
+ text.y = y;
+ }
+
+ /**
+ * Set a box attribute, or defer it if the box is not yet created
+ * @param {Object} key
+ * @param {Object} value
+ */
+ function boxAttr(key, value) {
+ if (box) {
+ box.attr(key, value);
+ } else {
+ deferredAttr[key] = value;
+ }
+ }
+
+ /**
+ * After the text element is added, get the desired size of the border box
+ * and add it before the text in the DOM.
+ */
+ wrapper.onAdd = function () {
+ text.add(wrapper);
+ wrapper.attr({
+ text: str || '', // alignment is available now
+ x: x,
+ y: y
+ });
+
+ if (box && defined(anchorX)) {
+ wrapper.attr({
+ anchorX: anchorX,
+ anchorY: anchorY
+ });
+ }
+ };
+
+ /*
+ * Add specific attribute setters.
+ */
+
+ // only change local variables
+ wrapper.widthSetter = function (value) {
+ width = value;
+ };
+ wrapper.heightSetter = function (value) {
+ height = value;
+ };
+ wrapper.paddingSetter = function (value) {
+ if (defined(value) && value !== padding) {
+ padding = value;
+ updateTextPadding();
+ }
+ };
+ wrapper.paddingLeftSetter = function (value) {
+ if (defined(value) && value !== paddingLeft) {
+ paddingLeft = value;
+ updateTextPadding();
+ }
+ };
+
+
+ // change local variable and prevent setting attribute on the group
+ wrapper.alignSetter = function (value) {
+ alignFactor = { left: 0, center: 0.5, right: 1 }[value];
+ };
+
+ // apply these to the box and the text alike
+ wrapper.textSetter = function (value) {
+ if (value !== UNDEFINED) {
+ text.textSetter(value);
+ }
+ updateBoxSize();
+ updateTextPadding();
+ };
+
+ // apply these to the box but not to the text
+ wrapper['stroke-widthSetter'] = function (value, key) {
+ if (value) {
+ needsBox = true;
+ }
+ crispAdjust = value % 2 / 2;
+ boxAttr(key, value);
+ };
+ wrapper.strokeSetter = wrapper.fillSetter = wrapper.rSetter = function (value, key) {
+ if (key === 'fill' && value) {
+ needsBox = true;
+ }
+ boxAttr(key, value);
+ };
+ wrapper.anchorXSetter = function (value, key) {
+ anchorX = value;
+ boxAttr(key, value + crispAdjust - wrapperX);
+ };
+ wrapper.anchorYSetter = function (value, key) {
+ anchorY = value;
+ boxAttr(key, value - wrapperY);
+ };
+
+ // rename attributes
+ wrapper.xSetter = function (value) {
+ wrapper.x = value; // for animation getter
+ if (alignFactor) {
+ value -= alignFactor * ((width || bBox.width) + padding);
+ }
+ wrapperX = mathRound(value);
+ wrapper.attr('translateX', wrapperX);
+ };
+ wrapper.ySetter = function (value) {
+ wrapperY = wrapper.y = mathRound(value);
+ wrapper.attr('translateY', wrapperY);
+ };
+
+ // Redirect certain methods to either the box or the text
+ var baseCss = wrapper.css;
+ return extend(wrapper, {
+ /**
+ * Pick up some properties and apply them to the text instead of the wrapper
+ */
+ css: function (styles) {
+ if (styles) {
+ var textStyles = {};
+ styles = merge(styles); // create a copy to avoid altering the original object (#537)
+ each(wrapper.textProps, function (prop) {
+ if (styles[prop] !== UNDEFINED) {
+ textStyles[prop] = styles[prop];
+ delete styles[prop];
+ }
+ });
+ text.css(textStyles);
+ }
+ return baseCss.call(wrapper, styles);
+ },
+ /**
+ * Return the bounding box of the box, not the group
+ */
+ getBBox: function () {
+ return {
+ width: bBox.width + 2 * padding,
+ height: bBox.height + 2 * padding,
+ x: bBox.x - padding,
+ y: bBox.y - padding
+ };
+ },
+ /**
+ * Apply the shadow to the box
+ */
+ shadow: function (b) {
+ if (box) {
+ box.shadow(b);
+ }
+ return wrapper;
+ },
+ /**
+ * Destroy and release memory.
+ */
+ destroy: function () {
+
+ // Added by button implementation
+ removeEvent(wrapper.element, 'mouseenter');
+ removeEvent(wrapper.element, 'mouseleave');
+
+ if (text) {
+ text = text.destroy();
+ }
+ if (box) {
+ box = box.destroy();
+ }
+ // Call base implementation to destroy the rest
+ SVGElement.prototype.destroy.call(wrapper);
+
+ // Release local pointers (#1298)
+ wrapper = renderer = updateBoxSize = updateTextPadding = boxAttr = null;
+ }
+ });
+ }
+}; // end SVGRenderer
+
+
+// general renderer
+Renderer = SVGRenderer;
+// extend SvgElement for useHTML option
+extend(SVGElement.prototype, {
+ /**
+ * Apply CSS to HTML elements. This is used in text within SVG rendering and
+ * by the VML renderer
+ */
+ htmlCss: function (styles) {
+ var wrapper = this,
+ element = wrapper.element,
+ textWidth = styles && element.tagName === 'SPAN' && styles.width;
+
+ if (textWidth) {
+ delete styles.width;
+ wrapper.textWidth = textWidth;
+ wrapper.updateTransform();
+ }
+
+ wrapper.styles = extend(wrapper.styles, styles);
+ css(wrapper.element, styles);
+
+ return wrapper;
+ },
+
+ /**
+ * VML and useHTML method for calculating the bounding box based on offsets
+ * @param {Boolean} refresh Whether to force a fresh value from the DOM or to
+ * use the cached value
+ *
+ * @return {Object} A hash containing values for x, y, width and height
+ */
+
+ htmlGetBBox: function () {
+ var wrapper = this,
+ element = wrapper.element,
+ bBox = wrapper.bBox;
+
+ // faking getBBox in exported SVG in legacy IE
+ if (!bBox) {
+ // faking getBBox in exported SVG in legacy IE (is this a duplicate of the fix for #1079?)
+ if (element.nodeName === 'text') {
+ element.style.position = ABSOLUTE;
+ }
+
+ bBox = wrapper.bBox = {
+ x: element.offsetLeft,
+ y: element.offsetTop,
+ width: element.offsetWidth,
+ height: element.offsetHeight
+ };
+ }
+
+ return bBox;
+ },
+
+ /**
+ * VML override private method to update elements based on internal
+ * properties based on SVG transform
+ */
+ htmlUpdateTransform: function () {
+ // aligning non added elements is expensive
+ if (!this.added) {
+ this.alignOnAdd = true;
+ return;
+ }
+
+ var wrapper = this,
+ renderer = wrapper.renderer,
+ elem = wrapper.element,
+ translateX = wrapper.translateX || 0,
+ translateY = wrapper.translateY || 0,
+ x = wrapper.x || 0,
+ y = wrapper.y || 0,
+ align = wrapper.textAlign || 'left',
+ alignCorrection = { left: 0, center: 0.5, right: 1 }[align],
+ shadows = wrapper.shadows;
+
+ // apply translate
+ css(elem, {
+ marginLeft: translateX,
+ marginTop: translateY
+ });
+ if (shadows) { // used in labels/tooltip
+ each(shadows, function (shadow) {
+ css(shadow, {
+ marginLeft: translateX + 1,
+ marginTop: translateY + 1
+ });
+ });
+ }
+
+ // apply inversion
+ if (wrapper.inverted) { // wrapper is a group
+ each(elem.childNodes, function (child) {
+ renderer.invertChild(child, elem);
+ });
+ }
+
+ if (elem.tagName === 'SPAN') {
+
+ var width,
+ rotation = wrapper.rotation,
+ baseline,
+ textWidth = pInt(wrapper.textWidth),
+ currentTextTransform = [rotation, align, elem.innerHTML, wrapper.textWidth].join(',');
+
+ if (currentTextTransform !== wrapper.cTT) { // do the calculations and DOM access only if properties changed
+
+
+ baseline = renderer.fontMetrics(elem.style.fontSize).b;
+
+ // Renderer specific handling of span rotation
+ if (defined(rotation)) {
+ wrapper.setSpanRotation(rotation, alignCorrection, baseline);
+ }
+
+ width = pick(wrapper.elemWidth, elem.offsetWidth);
+
+ // Update textWidth
+ if (width > textWidth && /[ \-]/.test(elem.textContent || elem.innerText)) { // #983, #1254
+ css(elem, {
+ width: textWidth + PX,
+ display: 'block',
+ whiteSpace: 'normal'
+ });
+ width = textWidth;
+ }
+
+ wrapper.getSpanCorrection(width, baseline, alignCorrection, rotation, align);
+ }
+
+ // apply position with correction
+ css(elem, {
+ left: (x + (wrapper.xCorr || 0)) + PX,
+ top: (y + (wrapper.yCorr || 0)) + PX
+ });
+
+ // force reflow in webkit to apply the left and top on useHTML element (#1249)
+ if (isWebKit) {
+ baseline = elem.offsetHeight; // assigned to baseline for JSLint purpose
+ }
+
+ // record current text transform
+ wrapper.cTT = currentTextTransform;
+ }
+ },
+
+ /**
+ * Set the rotation of an individual HTML span
+ */
+ setSpanRotation: function (rotation, alignCorrection, baseline) {
+ var rotationStyle = {},
+ cssTransformKey = isIE ? '-ms-transform' : isWebKit ? '-webkit-transform' : isFirefox ? 'MozTransform' : isOpera ? '-o-transform' : '';
+
+ rotationStyle[cssTransformKey] = rotationStyle.transform = 'rotate(' + rotation + 'deg)';
+ rotationStyle[cssTransformKey + (isFirefox ? 'Origin' : '-origin')] = rotationStyle.transformOrigin = (alignCorrection * 100) + '% ' + baseline + 'px';
+ css(this.element, rotationStyle);
+ },
+
+ /**
+ * Get the correction in X and Y positioning as the element is rotated.
+ */
+ getSpanCorrection: function (width, baseline, alignCorrection) {
+ this.xCorr = -width * alignCorrection;
+ this.yCorr = -baseline;
+ }
+});
+
+// Extend SvgRenderer for useHTML option.
+extend(SVGRenderer.prototype, {
+ /**
+ * Create HTML text node. This is used by the VML renderer as well as the SVG
+ * renderer through the useHTML option.
+ *
+ * @param {String} str
+ * @param {Number} x
+ * @param {Number} y
+ */
+ html: function (str, x, y) {
+ var wrapper = this.createElement('span'),
+ element = wrapper.element,
+ renderer = wrapper.renderer;
+
+ // Text setter
+ wrapper.textSetter = function (value) {
+ if (value !== element.innerHTML) {
+ delete this.bBox;
+ }
+ element.innerHTML = this.textStr = value;
+ };
+
+ // Various setters which rely on update transform
+ wrapper.xSetter = wrapper.ySetter = wrapper.alignSetter = wrapper.rotationSetter = function (value, key) {
+ if (key === 'align') {
+ key = 'textAlign'; // Do not overwrite the SVGElement.align method. Same as VML.
+ }
+ wrapper[key] = value;
+ wrapper.htmlUpdateTransform();
+ };
+
+ // Set the default attributes
+ wrapper.attr({
+ text: str,
+ x: mathRound(x),
+ y: mathRound(y)
+ })
+ .css({
+ position: ABSOLUTE,
+ whiteSpace: 'nowrap',
+ fontFamily: this.style.fontFamily,
+ fontSize: this.style.fontSize
+ });
+
+ // Use the HTML specific .css method
+ wrapper.css = wrapper.htmlCss;
+
+ // This is specific for HTML within SVG
+ if (renderer.isSVG) {
+ wrapper.add = function (svgGroupWrapper) {
+
+ var htmlGroup,
+ container = renderer.box.parentNode,
+ parentGroup,
+ parents = [];
+
+ this.parentGroup = svgGroupWrapper;
+
+ // Create a mock group to hold the HTML elements
+ if (svgGroupWrapper) {
+ htmlGroup = svgGroupWrapper.div;
+ if (!htmlGroup) {
+
+ // Read the parent chain into an array and read from top down
+ parentGroup = svgGroupWrapper;
+ while (parentGroup) {
+
+ parents.push(parentGroup);
+
+ // Move up to the next parent group
+ parentGroup = parentGroup.parentGroup;
+ }
+
+ // Ensure dynamically updating position when any parent is translated
+ each(parents.reverse(), function (parentGroup) {
+ var htmlGroupStyle;
+
+ // Create a HTML div and append it to the parent div to emulate
+ // the SVG group structure
+ htmlGroup = parentGroup.div = parentGroup.div || createElement(DIV, {
+ className: attr(parentGroup.element, 'class')
+ }, {
+ position: ABSOLUTE,
+ left: (parentGroup.translateX || 0) + PX,
+ top: (parentGroup.translateY || 0) + PX
+ }, htmlGroup || container); // the top group is appended to container
+
+ // Shortcut
+ htmlGroupStyle = htmlGroup.style;
+
+ // Set listeners to update the HTML div's position whenever the SVG group
+ // position is changed
+ extend(parentGroup, {
+ translateXSetter: function (value, key) {
+ htmlGroupStyle.left = value + PX;
+ parentGroup[key] = value;
+ parentGroup.doTransform = true;
+ },
+ translateYSetter: function (value, key) {
+ htmlGroupStyle.top = value + PX;
+ parentGroup[key] = value;
+ parentGroup.doTransform = true;
+ },
+ visibilitySetter: function (value, key) {
+ htmlGroupStyle[key] = value;
+ }
+ });
+ });
+
+ }
+ } else {
+ htmlGroup = container;
+ }
+
+ htmlGroup.appendChild(element);
+
+ // Shared with VML:
+ wrapper.added = true;
+ if (wrapper.alignOnAdd) {
+ wrapper.htmlUpdateTransform();
+ }
+
+ return wrapper;
+ };
+ }
+ return wrapper;
+ }
+});
+
+/* ****************************************************************************
+ * *
+ * START OF INTERNET EXPLORER <= 8 SPECIFIC CODE *
+ * *
+ * For applications and websites that don't need IE support, like platform *
+ * targeted mobile apps and web apps, this code can be removed. *
+ * *
+ *****************************************************************************/
+
+/**
+ * @constructor
+ */
+var VMLRenderer, VMLElement;
+if (!hasSVG && !useCanVG) {
+
+/**
+ * The VML element wrapper.
+ */
+VMLElement = {
+
+ /**
+ * Initialize a new VML element wrapper. It builds the markup as a string
+ * to minimize DOM traffic.
+ * @param {Object} renderer
+ * @param {Object} nodeName
+ */
+ init: function (renderer, nodeName) {
+ var wrapper = this,
+ markup = ['<', nodeName, ' filled="f" stroked="f"'],
+ style = ['position: ', ABSOLUTE, ';'],
+ isDiv = nodeName === DIV;
+
+ // divs and shapes need size
+ if (nodeName === 'shape' || isDiv) {
+ style.push('left:0;top:0;width:1px;height:1px;');
+ }
+ style.push('visibility: ', isDiv ? HIDDEN : VISIBLE);
+
+ markup.push(' style="', style.join(''), '"/>');
+
+ // create element with default attributes and style
+ if (nodeName) {
+ markup = isDiv || nodeName === 'span' || nodeName === 'img' ?
+ markup.join('')
+ : renderer.prepVML(markup);
+ wrapper.element = createElement(markup);
+ }
+
+ wrapper.renderer = renderer;
+ },
+
+ /**
+ * Add the node to the given parent
+ * @param {Object} parent
+ */
+ add: function (parent) {
+ var wrapper = this,
+ renderer = wrapper.renderer,
+ element = wrapper.element,
+ box = renderer.box,
+ inverted = parent && parent.inverted,
+
+ // get the parent node
+ parentNode = parent ?
+ parent.element || parent :
+ box;
+
+
+ // if the parent group is inverted, apply inversion on all children
+ if (inverted) { // only on groups
+ renderer.invertChild(element, parentNode);
+ }
+
+ // append it
+ parentNode.appendChild(element);
+
+ // align text after adding to be able to read offset
+ wrapper.added = true;
+ if (wrapper.alignOnAdd && !wrapper.deferUpdateTransform) {
+ wrapper.updateTransform();
+ }
+
+ // fire an event for internal hooks
+ if (wrapper.onAdd) {
+ wrapper.onAdd();
+ }
+
+ return wrapper;
+ },
+
+ /**
+ * VML always uses htmlUpdateTransform
+ */
+ updateTransform: SVGElement.prototype.htmlUpdateTransform,
+
+ /**
+ * Set the rotation of a span with oldIE's filter
+ */
+ setSpanRotation: function () {
+ // Adjust for alignment and rotation. Rotation of useHTML content is not yet implemented
+ // but it can probably be implemented for Firefox 3.5+ on user request. FF3.5+
+ // has support for CSS3 transform. The getBBox method also needs to be updated
+ // to compensate for the rotation, like it currently does for SVG.
+ // Test case: http://jsfiddle.net/highcharts/Ybt44/
+
+ var rotation = this.rotation,
+ costheta = mathCos(rotation * deg2rad),
+ sintheta = mathSin(rotation * deg2rad);
+
+ css(this.element, {
+ filter: rotation ? ['progid:DXImageTransform.Microsoft.Matrix(M11=', costheta,
+ ', M12=', -sintheta, ', M21=', sintheta, ', M22=', costheta,
+ ', sizingMethod=\'auto expand\')'].join('') : NONE
+ });
+ },
+
+ /**
+ * Get the positioning correction for the span after rotating.
+ */
+ getSpanCorrection: function (width, baseline, alignCorrection, rotation, align) {
+
+ var costheta = rotation ? mathCos(rotation * deg2rad) : 1,
+ sintheta = rotation ? mathSin(rotation * deg2rad) : 0,
+ height = pick(this.elemHeight, this.element.offsetHeight),
+ quad,
+ nonLeft = align && align !== 'left';
+
+ // correct x and y
+ this.xCorr = costheta < 0 && -width;
+ this.yCorr = sintheta < 0 && -height;
+
+ // correct for baseline and corners spilling out after rotation
+ quad = costheta * sintheta < 0;
+ this.xCorr += sintheta * baseline * (quad ? 1 - alignCorrection : alignCorrection);
+ this.yCorr -= costheta * baseline * (rotation ? (quad ? alignCorrection : 1 - alignCorrection) : 1);
+ // correct for the length/height of the text
+ if (nonLeft) {
+ this.xCorr -= width * alignCorrection * (costheta < 0 ? -1 : 1);
+ if (rotation) {
+ this.yCorr -= height * alignCorrection * (sintheta < 0 ? -1 : 1);
+ }
+ css(this.element, {
+ textAlign: align
+ });
+ }
+ },
+
+ /**
+ * Converts a subset of an SVG path definition to its VML counterpart. Takes an array
+ * as the parameter and returns a string.
+ */
+ pathToVML: function (value) {
+ // convert paths
+ var i = value.length,
+ path = [];
+
+ while (i--) {
+
+ // Multiply by 10 to allow subpixel precision.
+ // Substracting half a pixel seems to make the coordinates
+ // align with SVG, but this hasn't been tested thoroughly
+ if (isNumber(value[i])) {
+ path[i] = mathRound(value[i] * 10) - 5;
+ } else if (value[i] === 'Z') { // close the path
+ path[i] = 'x';
+ } else {
+ path[i] = value[i];
+
+ // When the start X and end X coordinates of an arc are too close,
+ // they are rounded to the same value above. In this case, substract or
+ // add 1 from the end X and Y positions. #186, #760, #1371, #1410.
+ if (value.isArc && (value[i] === 'wa' || value[i] === 'at')) {
+ // Start and end X
+ if (path[i + 5] === path[i + 7]) {
+ path[i + 7] += value[i + 7] > value[i + 5] ? 1 : -1;
+ }
+ // Start and end Y
+ if (path[i + 6] === path[i + 8]) {
+ path[i + 8] += value[i + 8] > value[i + 6] ? 1 : -1;
+ }
+ }
+ }
+ }
+
+
+ // Loop up again to handle path shortcuts (#2132)
+ /*while (i++ < path.length) {
+ if (path[i] === 'H') { // horizontal line to
+ path[i] = 'L';
+ path.splice(i + 2, 0, path[i - 1]);
+ } else if (path[i] === 'V') { // vertical line to
+ path[i] = 'L';
+ path.splice(i + 1, 0, path[i - 2]);
+ }
+ }*/
+ return path.join(' ') || 'x';
+ },
+
+ /**
+ * Set the element's clipping to a predefined rectangle
+ *
+ * @param {String} id The id of the clip rectangle
+ */
+ clip: function (clipRect) {
+ var wrapper = this,
+ clipMembers,
+ cssRet;
+
+ if (clipRect) {
+ clipMembers = clipRect.members;
+ erase(clipMembers, wrapper); // Ensure unique list of elements (#1258)
+ clipMembers.push(wrapper);
+ wrapper.destroyClip = function () {
+ erase(clipMembers, wrapper);
+ };
+ cssRet = clipRect.getCSS(wrapper);
+
+ } else {
+ if (wrapper.destroyClip) {
+ wrapper.destroyClip();
+ }
+ cssRet = { clip: docMode8 ? 'inherit' : 'rect(auto)' }; // #1214
+ }
+
+ return wrapper.css(cssRet);
+
+ },
+
+ /**
+ * Set styles for the element
+ * @param {Object} styles
+ */
+ css: SVGElement.prototype.htmlCss,
+
+ /**
+ * Removes a child either by removeChild or move to garbageBin.
+ * Issue 490; in VML removeChild results in Orphaned nodes according to sIEve, discardElement does not.
+ */
+ safeRemoveChild: function (element) {
+ // discardElement will detach the node from its parent before attaching it
+ // to the garbage bin. Therefore it is important that the node is attached and have parent.
+ if (element.parentNode) {
+ discardElement(element);
+ }
+ },
+
+ /**
+ * Extend element.destroy by removing it from the clip members array
+ */
+ destroy: function () {
+ if (this.destroyClip) {
+ this.destroyClip();
+ }
+
+ return SVGElement.prototype.destroy.apply(this);
+ },
+
+ /**
+ * Add an event listener. VML override for normalizing event parameters.
+ * @param {String} eventType
+ * @param {Function} handler
+ */
+ on: function (eventType, handler) {
+ // simplest possible event model for internal use
+ this.element['on' + eventType] = function () {
+ var evt = win.event;
+ evt.target = evt.srcElement;
+ handler(evt);
+ };
+ return this;
+ },
+
+ /**
+ * In stacked columns, cut off the shadows so that they don't overlap
+ */
+ cutOffPath: function (path, length) {
+
+ var len;
+
+ path = path.split(/[ ,]/);
+ len = path.length;
+
+ if (len === 9 || len === 11) {
+ path[len - 4] = path[len - 2] = pInt(path[len - 2]) - 10 * length;
+ }
+ return path.join(' ');
+ },
+
+ /**
+ * Apply a drop shadow by copying elements and giving them different strokes
+ * @param {Boolean|Object} shadowOptions
+ */
+ shadow: function (shadowOptions, group, cutOff) {
+ var shadows = [],
+ i,
+ element = this.element,
+ renderer = this.renderer,
+ shadow,
+ elemStyle = element.style,
+ markup,
+ path = element.path,
+ strokeWidth,
+ modifiedPath,
+ shadowWidth,
+ shadowElementOpacity;
+
+ // some times empty paths are not strings
+ if (path && typeof path.value !== 'string') {
+ path = 'x';
+ }
+ modifiedPath = path;
+
+ if (shadowOptions) {
+ shadowWidth = pick(shadowOptions.width, 3);
+ shadowElementOpacity = (shadowOptions.opacity || 0.15) / shadowWidth;
+ for (i = 1; i <= 3; i++) {
+
+ strokeWidth = (shadowWidth * 2) + 1 - (2 * i);
+
+ // Cut off shadows for stacked column items
+ if (cutOff) {
+ modifiedPath = this.cutOffPath(path.value, strokeWidth + 0.5);
+ }
+
+ markup = ['<shape isShadow="true" strokeweight="', strokeWidth,
+ '" filled="false" path="', modifiedPath,
+ '" coordsize="10 10" style="', element.style.cssText, '" />'];
+
+ shadow = createElement(renderer.prepVML(markup),
+ null, {
+ left: pInt(elemStyle.left) + pick(shadowOptions.offsetX, 1),
+ top: pInt(elemStyle.top) + pick(shadowOptions.offsetY, 1)
+ }
+ );
+ if (cutOff) {
+ shadow.cutOff = strokeWidth + 1;
+ }
+
+ // apply the opacity
+ markup = ['<stroke color="', shadowOptions.color || 'black', '" opacity="', shadowElementOpacity * i, '"/>'];
+ createElement(renderer.prepVML(markup), null, null, shadow);
+
+
+ // insert it
+ if (group) {
+ group.element.appendChild(shadow);
+ } else {
+ element.parentNode.insertBefore(shadow, element);
+ }
+
+ // record it
+ shadows.push(shadow);
+
+ }
+
+ this.shadows = shadows;
+ }
+ return this;
+ },
+ updateShadows: noop, // Used in SVG only
+
+ setAttr: function (key, value) {
+ if (docMode8) { // IE8 setAttribute bug
+ this.element[key] = value;
+ } else {
+ this.element.setAttribute(key, value);
+ }
+ },
+ classSetter: function (value) {
+ // IE8 Standards mode has problems retrieving the className unless set like this
+ this.element.className = value;
+ },
+ dashstyleSetter: function (value, key, element) {
+ var strokeElem = element.getElementsByTagName('stroke')[0] ||
+ createElement(this.renderer.prepVML(['<stroke/>']), null, null, element);
+ strokeElem[key] = value || 'solid';
+ this[key] = value; /* because changing stroke-width will change the dash length
+ and cause an epileptic effect */
+ },
+ dSetter: function (value, key, element) {
+ var i,
+ shadows = this.shadows;
+ value = value || [];
+ this.d = value.join && value.join(' '); // used in getter for animation
+
+ element.path = value = this.pathToVML(value);
+
+ // update shadows
+ if (shadows) {
+ i = shadows.length;
+ while (i--) {
+ shadows[i].path = shadows[i].cutOff ? this.cutOffPath(value, shadows[i].cutOff) : value;
+ }
+ }
+ this.setAttr(key, value);
+ },
+ fillSetter: function (value, key, element) {
+ var nodeName = element.nodeName;
+ if (nodeName === 'SPAN') { // text color
+ element.style.color = value;
+ } else if (nodeName !== 'IMG') { // #1336
+ element.filled = value !== NONE;
+ this.setAttr('fillcolor', this.renderer.color(value, element, key, this));
+ }
+ },
+ opacitySetter: noop, // Don't bother - animation is too slow and filters introduce artifacts
+ rotationSetter: function (value, key, element) {
+ var style = element.style;
+ this[key] = style[key] = value; // style is for #1873
+
+ // Correction for the 1x1 size of the shape container. Used in gauge needles.
+ style.left = -mathRound(mathSin(value * deg2rad) + 1) + PX;
+ style.top = mathRound(mathCos(value * deg2rad)) + PX;
+ },
+ strokeSetter: function (value, key, element) {
+ this.setAttr('strokecolor', this.renderer.color(value, element, key));
+ },
+ 'stroke-widthSetter': function (value, key, element) {
+ element.stroked = !!value; // VML "stroked" attribute
+ this[key] = value; // used in getter, issue #113
+ if (isNumber(value)) {
+ value += PX;
+ }
+ this.setAttr('strokeweight', value);
+ },
+ titleSetter: function (value, key) {
+ this.setAttr(key, value);
+ },
+ visibilitySetter: function (value, key, element) {
+
+ // Handle inherited visibility
+ if (value === 'inherit') {
+ value = VISIBLE;
+ }
+
+ // Let the shadow follow the main element
+ if (this.shadows) {
+ each(this.shadows, function (shadow) {
+ shadow.style[key] = value;
+ });
+ }
+
+ // Instead of toggling the visibility CSS property, move the div out of the viewport.
+ // This works around #61 and #586
+ if (element.nodeName === 'DIV') {
+ value = value === HIDDEN ? '-999em' : 0;
+
+ // In order to redraw, IE7 needs the div to be visible when tucked away
+ // outside the viewport. So the visibility is actually opposite of
+ // the expected value. This applies to the tooltip only.
+ if (!docMode8) {
+ element.style[key] = value ? VISIBLE : HIDDEN;
+ }
+ key = 'top';
+ }
+ element.style[key] = value;
+ },
+ xSetter: function (value, key, element) {
+ this[key] = value; // used in getter
+
+ if (key === 'x') {
+ key = 'left';
+ } else if (key === 'y') {
+ key = 'top';
+ }/* else {
+ value = mathMax(0, value); // don't set width or height below zero (#311)
+ }*/
+
+ // clipping rectangle special
+ if (this.updateClipping) {
+ this[key] = value; // the key is now 'left' or 'top' for 'x' and 'y'
+ this.updateClipping();
+ } else {
+ // normal
+ element.style[key] = value;
+ }
+ },
+ zIndexSetter: function (value, key, element) {
+ element.style[key] = value;
+ }
+};
+Highcharts.VMLElement = VMLElement = extendClass(SVGElement, VMLElement);
+
+// Some shared setters
+VMLElement.prototype.ySetter =
+ VMLElement.prototype.widthSetter =
+ VMLElement.prototype.heightSetter =
+ VMLElement.prototype.xSetter;
+
+
+/**
+ * The VML renderer
+ */
+var VMLRendererExtension = { // inherit SVGRenderer
+
+ Element: VMLElement,
+ isIE8: userAgent.indexOf('MSIE 8.0') > -1,
+
+
+ /**
+ * Initialize the VMLRenderer
+ * @param {Object} container
+ * @param {Number} width
+ * @param {Number} height
+ */
+ init: function (container, width, height, style) {
+ var renderer = this,
+ boxWrapper,
+ box,
+ css;
+
+ renderer.alignedObjects = [];
+
+ boxWrapper = renderer.createElement(DIV)
+ .css(extend(this.getStyle(style), { position: RELATIVE}));
+ box = boxWrapper.element;
+ container.appendChild(boxWrapper.element);
+
+
+ // generate the containing box
+ renderer.isVML = true;
+ renderer.box = box;
+ renderer.boxWrapper = boxWrapper;
+ renderer.cache = {};
+
+
+ renderer.setSize(width, height, false);
+
+ // The only way to make IE6 and IE7 print is to use a global namespace. However,
+ // with IE8 the only way to make the dynamic shapes visible in screen and print mode
+ // seems to be to add the xmlns attribute and the behaviour style inline.
+ if (!doc.namespaces.hcv) {
+
+ doc.namespaces.add('hcv', 'urn:schemas-microsoft-com:vml');
+
+ // Setup default CSS (#2153, #2368, #2384)
+ css = 'hcv\\:fill, hcv\\:path, hcv\\:shape, hcv\\:stroke' +
+ '{ behavior:url(#default#VML); display: inline-block; } ';
+ try {
+ doc.createStyleSheet().cssText = css;
+ } catch (e) {
+ doc.styleSheets[0].cssText += css;
+ }
+
+ }
+ },
+
+
+ /**
+ * Detect whether the renderer is hidden. This happens when one of the parent elements
+ * has display: none
+ */
+ isHidden: function () {
+ return !this.box.offsetWidth;
+ },
+
+ /**
+ * Define a clipping rectangle. In VML it is accomplished by storing the values
+ * for setting the CSS style to all associated members.
+ *
+ * @param {Number} x
+ * @param {Number} y
+ * @param {Number} width
+ * @param {Number} height
+ */
+ clipRect: function (x, y, width, height) {
+
+ // create a dummy element
+ var clipRect = this.createElement(),
+ isObj = isObject(x);
+
+ // mimic a rectangle with its style object for automatic updating in attr
+ return extend(clipRect, {
+ members: [],
+ left: (isObj ? x.x : x) + 1,
+ top: (isObj ? x.y : y) + 1,
+ width: (isObj ? x.width : width) - 1,
+ height: (isObj ? x.height : height) - 1,
+ getCSS: function (wrapper) {
+ var element = wrapper.element,
+ nodeName = element.nodeName,
+ isShape = nodeName === 'shape',
+ inverted = wrapper.inverted,
+ rect = this,
+ top = rect.top - (isShape ? element.offsetTop : 0),
+ left = rect.left,
+ right = left + rect.width,
+ bottom = top + rect.height,
+ ret = {
+ clip: 'rect(' +
+ mathRound(inverted ? left : top) + 'px,' +
+ mathRound(inverted ? bottom : right) + 'px,' +
+ mathRound(inverted ? right : bottom) + 'px,' +
+ mathRound(inverted ? top : left) + 'px)'
+ };
+
+ // issue 74 workaround
+ if (!inverted && docMode8 && nodeName === 'DIV') {
+ extend(ret, {
+ width: right + PX,
+ height: bottom + PX
+ });
+ }
+ return ret;
+ },
+
+ // used in attr and animation to update the clipping of all members
+ updateClipping: function () {
+ each(clipRect.members, function (member) {
+ if (member.element) { // Deleted series, like in stock/members/series-remove demo. Should be removed from members, but this will do.
+ member.css(clipRect.getCSS(member));
+ }
+ });
+ }
+ });
+
+ },
+
+
+ /**
+ * Take a color and return it if it's a string, make it a gradient if it's a
+ * gradient configuration object, and apply opacity.
+ *
+ * @param {Object} color The color or config object
+ */
+ color: function (color, elem, prop, wrapper) {
+ var renderer = this,
+ colorObject,
+ regexRgba = /^rgba/,
+ markup,
+ fillType,
+ ret = NONE;
+
+ // Check for linear or radial gradient
+ if (color && color.linearGradient) {
+ fillType = 'gradient';
+ } else if (color && color.radialGradient) {
+ fillType = 'pattern';
+ }
+
+
+ if (fillType) {
+
+ var stopColor,
+ stopOpacity,
+ gradient = color.linearGradient || color.radialGradient,
+ x1,
+ y1,
+ x2,
+ y2,
+ opacity1,
+ opacity2,
+ color1,
+ color2,
+ fillAttr = '',
+ stops = color.stops,
+ firstStop,
+ lastStop,
+ colors = [],
+ addFillNode = function () {
+ // Add the fill subnode. When colors attribute is used, the meanings of opacity and o:opacity2
+ // are reversed.
+ markup = ['<fill colors="' + colors.join(',') + '" opacity="', opacity2, '" o:opacity2="', opacity1,
+ '" type="', fillType, '" ', fillAttr, 'focus="100%" method="any" />'];
+ createElement(renderer.prepVML(markup), null, null, elem);
+ };
+
+ // Extend from 0 to 1
+ firstStop = stops[0];
+ lastStop = stops[stops.length - 1];
+ if (firstStop[0] > 0) {
+ stops.unshift([
+ 0,
+ firstStop[1]
+ ]);
+ }
+ if (lastStop[0] < 1) {
+ stops.push([
+ 1,
+ lastStop[1]
+ ]);
+ }
+
+ // Compute the stops
+ each(stops, function (stop, i) {
+ if (regexRgba.test(stop[1])) {
+ colorObject = Color(stop[1]);
+ stopColor = colorObject.get('rgb');
+ stopOpacity = colorObject.get('a');
+ } else {
+ stopColor = stop[1];
+ stopOpacity = 1;
+ }
+
+ // Build the color attribute
+ colors.push((stop[0] * 100) + '% ' + stopColor);
+
+ // Only start and end opacities are allowed, so we use the first and the last
+ if (!i) {
+ opacity1 = stopOpacity;
+ color2 = stopColor;
+ } else {
+ opacity2 = stopOpacity;
+ color1 = stopColor;
+ }
+ });
+
+ // Apply the gradient to fills only.
+ if (prop === 'fill') {
+
+ // Handle linear gradient angle
+ if (fillType === 'gradient') {
+ x1 = gradient.x1 || gradient[0] || 0;
+ y1 = gradient.y1 || gradient[1] || 0;
+ x2 = gradient.x2 || gradient[2] || 0;
+ y2 = gradient.y2 || gradient[3] || 0;
+ fillAttr = 'angle="' + (90 - math.atan(
+ (y2 - y1) / // y vector
+ (x2 - x1) // x vector
+ ) * 180 / mathPI) + '"';
+
+ addFillNode();
+
+ // Radial (circular) gradient
+ } else {
+
+ var r = gradient.r,
+ sizex = r * 2,
+ sizey = r * 2,
+ cx = gradient.cx,
+ cy = gradient.cy,
+ radialReference = elem.radialReference,
+ bBox,
+ applyRadialGradient = function () {
+ if (radialReference) {
+ bBox = wrapper.getBBox();
+ cx += (radialReference[0] - bBox.x) / bBox.width - 0.5;
+ cy += (radialReference[1] - bBox.y) / bBox.height - 0.5;
+ sizex *= radialReference[2] / bBox.width;
+ sizey *= radialReference[2] / bBox.height;
+ }
+ fillAttr = 'src="' + defaultOptions.global.VMLRadialGradientURL + '" ' +
+ 'size="' + sizex + ',' + sizey + '" ' +
+ 'origin="0.5,0.5" ' +
+ 'position="' + cx + ',' + cy + '" ' +
+ 'color2="' + color2 + '" ';
+
+ addFillNode();
+ };
+
+ // Apply radial gradient
+ if (wrapper.added) {
+ applyRadialGradient();
+ } else {
+ // We need to know the bounding box to get the size and position right
+ wrapper.onAdd = applyRadialGradient;
+ }
+
+ // The fill element's color attribute is broken in IE8 standards mode, so we
+ // need to set the parent shape's fillcolor attribute instead.
+ ret = color1;
+ }
+
+ // Gradients are not supported for VML stroke, return the first color. #722.
+ } else {
+ ret = stopColor;
+ }
+
+ // if the color is an rgba color, split it and add a fill node
+ // to hold the opacity component
+ } else if (regexRgba.test(color) && elem.tagName !== 'IMG') {
+
+ colorObject = Color(color);
+
+ markup = ['<', prop, ' opacity="', colorObject.get('a'), '"/>'];
+ createElement(this.prepVML(markup), null, null, elem);
+
+ ret = colorObject.get('rgb');
+
+
+ } else {
+ var propNodes = elem.getElementsByTagName(prop); // 'stroke' or 'fill' node
+ if (propNodes.length) {
+ propNodes[0].opacity = 1;
+ propNodes[0].type = 'solid';
+ }
+ ret = color;
+ }
+
+ return ret;
+ },
+
+ /**
+ * Take a VML string and prepare it for either IE8 or IE6/IE7.
+ * @param {Array} markup A string array of the VML markup to prepare
+ */
+ prepVML: function (markup) {
+ var vmlStyle = 'display:inline-block;behavior:url(#default#VML);',
+ isIE8 = this.isIE8;
+
+ markup = markup.join('');
+
+ if (isIE8) { // add xmlns and style inline
+ markup = markup.replace('/>', ' xmlns="urn:schemas-microsoft-com:vml" />');
+ if (markup.indexOf('style="') === -1) {
+ markup = markup.replace('/>', ' style="' + vmlStyle + '" />');
+ } else {
+ markup = markup.replace('style="', 'style="' + vmlStyle);
+ }
+
+ } else { // add namespace
+ markup = markup.replace('<', '<hcv:');
+ }
+
+ return markup;
+ },
+
+ /**
+ * Create rotated and aligned text
+ * @param {String} str
+ * @param {Number} x
+ * @param {Number} y
+ */
+ text: SVGRenderer.prototype.html,
+
+ /**
+ * Create and return a path element
+ * @param {Array} path
+ */
+ path: function (path) {
+ var attr = {
+ // subpixel precision down to 0.1 (width and height = 1px)
+ coordsize: '10 10'
+ };
+ if (isArray(path)) {
+ attr.d = path;
+ } else if (isObject(path)) { // attributes
+ extend(attr, path);
+ }
+ // create the shape
+ return this.createElement('shape').attr(attr);
+ },
+
+ /**
+ * Create and return a circle element. In VML circles are implemented as
+ * shapes, which is faster than v:oval
+ * @param {Number} x
+ * @param {Number} y
+ * @param {Number} r
+ */
+ circle: function (x, y, r) {
+ var circle = this.symbol('circle');
+ if (isObject(x)) {
+ r = x.r;
+ y = x.y;
+ x = x.x;
+ }
+ circle.isCircle = true; // Causes x and y to mean center (#1682)
+ circle.r = r;
+ return circle.attr({ x: x, y: y });
+ },
+
+ /**
+ * Create a group using an outer div and an inner v:group to allow rotating
+ * and flipping. A simple v:group would have problems with positioning
+ * child HTML elements and CSS clip.
+ *
+ * @param {String} name The name of the group
+ */
+ g: function (name) {
+ var wrapper,
+ attribs;
+
+ // set the class name
+ if (name) {
+ attribs = { 'className': PREFIX + name, 'class': PREFIX + name };
+ }
+
+ // the div to hold HTML and clipping
+ wrapper = this.createElement(DIV).attr(attribs);
+
+ return wrapper;
+ },
+
+ /**
+ * VML override to create a regular HTML image
+ * @param {String} src
+ * @param {Number} x
+ * @param {Number} y
+ * @param {Number} width
+ * @param {Number} height
+ */
+ image: function (src, x, y, width, height) {
+ var obj = this.createElement('img')
+ .attr({ src: src });
+
+ if (arguments.length > 1) {
+ obj.attr({
+ x: x,
+ y: y,
+ width: width,
+ height: height
+ });
+ }
+ return obj;
+ },
+
+ /**
+ * For rectangles, VML uses a shape for rect to overcome bugs and rotation problems
+ */
+ createElement: function (nodeName) {
+ return nodeName === 'rect' ? this.symbol(nodeName) : SVGRenderer.prototype.createElement.call(this, nodeName);
+ },
+
+ /**
+ * In the VML renderer, each child of an inverted div (group) is inverted
+ * @param {Object} element
+ * @param {Object} parentNode
+ */
+ invertChild: function (element, parentNode) {
+ var ren = this,
+ parentStyle = parentNode.style,
+ imgStyle = element.tagName === 'IMG' && element.style; // #1111
+
+ css(element, {
+ flip: 'x',
+ left: pInt(parentStyle.width) - (imgStyle ? pInt(imgStyle.top) : 1),
+ top: pInt(parentStyle.height) - (imgStyle ? pInt(imgStyle.left) : 1),
+ rotation: -90
+ });
+
+ // Recursively invert child elements, needed for nested composite shapes like box plots and error bars. #1680, #1806.
+ each(element.childNodes, function (child) {
+ ren.invertChild(child, element);
+ });
+ },
+
+ /**
+ * Symbol definitions that override the parent SVG renderer's symbols
+ *
+ */
+ symbols: {
+ // VML specific arc function
+ arc: function (x, y, w, h, options) {
+ var start = options.start,
+ end = options.end,
+ radius = options.r || w || h,
+ innerRadius = options.innerR,
+ cosStart = mathCos(start),
+ sinStart = mathSin(start),
+ cosEnd = mathCos(end),
+ sinEnd = mathSin(end),
+ ret;
+
+ if (end - start === 0) { // no angle, don't show it.
+ return ['x'];
+ }
+
+ ret = [
+ 'wa', // clockwise arc to
+ x - radius, // left
+ y - radius, // top
+ x + radius, // right
+ y + radius, // bottom
+ x + radius * cosStart, // start x
+ y + radius * sinStart, // start y
+ x + radius * cosEnd, // end x
+ y + radius * sinEnd // end y
+ ];
+
+ if (options.open && !innerRadius) {
+ ret.push(
+ 'e',
+ M,
+ x,// - innerRadius,
+ y// - innerRadius
+ );
+ }
+
+ ret.push(
+ 'at', // anti clockwise arc to
+ x - innerRadius, // left
+ y - innerRadius, // top
+ x + innerRadius, // right
+ y + innerRadius, // bottom
+ x + innerRadius * cosEnd, // start x
+ y + innerRadius * sinEnd, // start y
+ x + innerRadius * cosStart, // end x
+ y + innerRadius * sinStart, // end y
+ 'x', // finish path
+ 'e' // close
+ );
+
+ ret.isArc = true;
+ return ret;
+
+ },
+ // Add circle symbol path. This performs significantly faster than v:oval.
+ circle: function (x, y, w, h, wrapper) {
+
+ if (wrapper) {
+ w = h = 2 * wrapper.r;
+ }
+
+ // Center correction, #1682
+ if (wrapper && wrapper.isCircle) {
+ x -= w / 2;
+ y -= h / 2;
+ }
+
+ // Return the path
+ return [
+ 'wa', // clockwisearcto
+ x, // left
+ y, // top
+ x + w, // right
+ y + h, // bottom
+ x + w, // start x
+ y + h / 2, // start y
+ x + w, // end x
+ y + h / 2, // end y
+ //'x', // finish path
+ 'e' // close
+ ];
+ },
+ /**
+ * Add rectangle symbol path which eases rotation and omits arcsize problems
+ * compared to the built-in VML roundrect shape. When borders are not rounded,
+ * use the simpler square path, else use the callout path without the arrow.
+ */
+ rect: function (x, y, w, h, options) {
+ return SVGRenderer.prototype.symbols[
+ !defined(options) || !options.r ? 'square' : 'callout'
+ ].call(0, x, y, w, h, options);
+ }
+ }
+};
+Highcharts.VMLRenderer = VMLRenderer = function () {
+ this.init.apply(this, arguments);
+};
+VMLRenderer.prototype = merge(SVGRenderer.prototype, VMLRendererExtension);
+
+ // general renderer
+ Renderer = VMLRenderer;
+}
+
+// This method is used with exporting in old IE, when emulating SVG (see #2314)
+SVGRenderer.prototype.measureSpanWidth = function (text, styles) {
+ var measuringSpan = doc.createElement('span'),
+ offsetWidth,
+ textNode = doc.createTextNode(text);
+
+ measuringSpan.appendChild(textNode);
+ css(measuringSpan, styles);
+ this.box.appendChild(measuringSpan);
+ offsetWidth = measuringSpan.offsetWidth;
+ discardElement(measuringSpan); // #2463
+ return offsetWidth;
+};
+
+
+/* ****************************************************************************
+ * *
+ * END OF INTERNET EXPLORER <= 8 SPECIFIC CODE *
+ * *
+ *****************************************************************************/
+/* ****************************************************************************
+ * *
+ * START OF ANDROID < 3 SPECIFIC CODE. THIS CAN BE REMOVED IF YOU'RE NOT *
+ * TARGETING THAT SYSTEM. *
+ * *
+ *****************************************************************************/
+var CanVGRenderer,
+ CanVGController;
+
+if (useCanVG) {
+ /**
+ * The CanVGRenderer is empty from start to keep the source footprint small.
+ * When requested, the CanVGController downloads the rest of the source packaged
+ * together with the canvg library.
+ */
+ Highcharts.CanVGRenderer = CanVGRenderer = function () {
+ // Override the global SVG namespace to fake SVG/HTML that accepts CSS
+ SVG_NS = 'http://www.w3.org/1999/xhtml';
+ };
+
+ /**
+ * Start with an empty symbols object. This is needed when exporting is used (exporting.src.js will add a few symbols), but
+ * the implementation from SvgRenderer will not be merged in until first render.
+ */
+ CanVGRenderer.prototype.symbols = {};
+
+ /**
+ * Handles on demand download of canvg rendering support.
+ */
+ CanVGController = (function () {
+ // List of renderering calls
+ var deferredRenderCalls = [];
+
+ /**
+ * When downloaded, we are ready to draw deferred charts.
+ */
+ function drawDeferred() {
+ var callLength = deferredRenderCalls.length,
+ callIndex;
+
+ // Draw all pending render calls
+ for (callIndex = 0; callIndex < callLength; callIndex++) {
+ deferredRenderCalls[callIndex]();
+ }
+ // Clear the list
+ deferredRenderCalls = [];
+ }
+
+ return {
+ push: function (func, scriptLocation) {
+ // Only get the script once
+ if (deferredRenderCalls.length === 0) {
+ getScript(scriptLocation, drawDeferred);
+ }
+ // Register render call
+ deferredRenderCalls.push(func);
+ }
+ };
+ }());
+
+ Renderer = CanVGRenderer;
+} // end CanVGRenderer
+
+/* ****************************************************************************
+ * *
+ * END OF ANDROID < 3 SPECIFIC CODE *
+ * *
+ *****************************************************************************/
+
+/**
+ * The Tick class
+ */
+function Tick(axis, pos, type, noLabel) {
+ this.axis = axis;
+ this.pos = pos;
+ this.type = type || '';
+ this.isNew = true;
+
+ if (!type && !noLabel) {
+ this.addLabel();
+ }
+}
+
+Tick.prototype = {
+ /**
+ * Write the tick label
+ */
+ addLabel: function () {
+ var tick = this,
+ axis = tick.axis,
+ options = axis.options,
+ chart = axis.chart,
+ horiz = axis.horiz,
+ categories = axis.categories,
+ names = axis.names,
+ pos = tick.pos,
+ labelOptions = options.labels,
+ rotation = labelOptions.rotation,
+ str,
+ tickPositions = axis.tickPositions,
+ width = (horiz && categories &&
+ !labelOptions.step && !labelOptions.staggerLines &&
+ !labelOptions.rotation &&
+ chart.plotWidth / tickPositions.length) ||
+ (!horiz && (chart.margin[3] || chart.chartWidth * 0.33)), // #1580, #1931
+ isFirst = pos === tickPositions[0],
+ isLast = pos === tickPositions[tickPositions.length - 1],
+ css,
+ attr,
+ value = categories ?
+ pick(categories[pos], names[pos], pos) :
+ pos,
+ label = tick.label,
+ tickPositionInfo = tickPositions.info,
+ dateTimeLabelFormat;
+
+ // Set the datetime label format. If a higher rank is set for this position, use that. If not,
+ // use the general format.
+ if (axis.isDatetimeAxis && tickPositionInfo) {
+ dateTimeLabelFormat = options.dateTimeLabelFormats[tickPositionInfo.higherRanks[pos] || tickPositionInfo.unitName];
+ }
+ // set properties for access in render method
+ tick.isFirst = isFirst;
+ tick.isLast = isLast;
+
+ // get the string
+ str = axis.labelFormatter.call({
+ axis: axis,
+ chart: chart,
+ isFirst: isFirst,
+ isLast: isLast,
+ dateTimeLabelFormat: dateTimeLabelFormat,
+ value: axis.isLog ? correctFloat(lin2log(value)) : value
+ });
+
+ // prepare CSS
+ css = width && { width: mathMax(1, mathRound(width - 2 * (labelOptions.padding || 10))) + PX };
+ css = extend(css, labelOptions.style);
+
+ // first call
+ if (!defined(label)) {
+ attr = {
+ align: axis.labelAlign
+ };
+ if (isNumber(rotation)) {
+ attr.rotation = rotation;
+ }
+ if (width && labelOptions.ellipsis) {
+ css.HcHeight = axis.len / tickPositions.length;
+ }
+
+ tick.label = label =
+ defined(str) && labelOptions.enabled ?
+ chart.renderer.text(
+ str,
+ 0,
+ 0,
+ labelOptions.useHTML
+ )
+ .attr(attr)
+ // without position absolute, IE export sometimes is wrong
+ .css(css)
+ .add(axis.labelGroup) :
+ null;
+
+ // Set the tick baseline and correct for rotation (#1764)
+ axis.tickBaseline = chart.renderer.fontMetrics(labelOptions.style.fontSize, label).b;
+ if (rotation && axis.side === 2) {
+ axis.tickBaseline *= mathCos(rotation * deg2rad);
+ }
+
+
+ // update
+ } else if (label) {
+ label.attr({
+ text: str
+ })
+ .css(css);
+ }
+ tick.yOffset = label ? pick(labelOptions.y, axis.tickBaseline + (axis.side === 2 ? 8 : -(label.getBBox().height / 2))) : 0;
+ },
+
+ /**
+ * Get the offset height or width of the label
+ */
+ getLabelSize: function () {
+ var label = this.label,
+ axis = this.axis;
+ return label ?
+ label.getBBox()[axis.horiz ? 'height' : 'width'] :
+ 0;
+ },
+
+ /**
+ * Find how far the labels extend to the right and left of the tick's x position. Used for anti-collision
+ * detection with overflow logic.
+ */
+ getLabelSides: function () {
+ var bBox = this.label.getBBox(),
+ axis = this.axis,
+ horiz = axis.horiz,
+ options = axis.options,
+ labelOptions = options.labels,
+ size = horiz ? bBox.width : bBox.height,
+ leftSide = horiz ?
+ labelOptions.x - size * { left: 0, center: 0.5, right: 1 }[axis.labelAlign] :
+ 0,
+ rightSide = horiz ?
+ size + leftSide :
+ size;
+
+ return [leftSide, rightSide];
+ },
+
+ /**
+ * Handle the label overflow by adjusting the labels to the left and right edge, or
+ * hide them if they collide into the neighbour label.
+ */
+ handleOverflow: function (index, xy) {
+ var show = true,
+ axis = this.axis,
+ isFirst = this.isFirst,
+ isLast = this.isLast,
+ horiz = axis.horiz,
+ pxPos = horiz ? xy.x : xy.y,
+ reversed = axis.reversed,
+ tickPositions = axis.tickPositions,
+ sides = this.getLabelSides(),
+ leftSide = sides[0],
+ rightSide = sides[1],
+ axisLeft,
+ axisRight,
+ neighbour,
+ neighbourEdge,
+ line = this.label.line || 0,
+ labelEdge = axis.labelEdge,
+ justifyLabel = axis.justifyLabels && (isFirst || isLast),
+ justifyToPlot;
+
+ // Hide it if it now overlaps the neighbour label
+ if (labelEdge[line] === UNDEFINED || pxPos + leftSide > labelEdge[line]) {
+ labelEdge[line] = pxPos + rightSide;
+
+ } else if (!justifyLabel) {
+ show = false;
+ }
+
+ if (justifyLabel) {
+ justifyToPlot = axis.justifyToPlot;
+ axisLeft = justifyToPlot ? axis.pos : 0;
+ axisRight = justifyToPlot ? axisLeft + axis.len : axis.chart.chartWidth;
+
+ // Find the firsth neighbour on the same line
+ do {
+ index += (isFirst ? 1 : -1);
+ neighbour = axis.ticks[tickPositions[index]];
+ } while (tickPositions[index] && (!neighbour || !neighbour.label || neighbour.label.line !== line)); // #3044
+
+ neighbourEdge = neighbour && neighbour.label.xy && neighbour.label.xy.x + neighbour.getLabelSides()[isFirst ? 0 : 1];
+
+ if ((isFirst && !reversed) || (isLast && reversed)) {
+ // Is the label spilling out to the left of the plot area?
+ if (pxPos + leftSide < axisLeft) {
+
+ // Align it to plot left
+ pxPos = axisLeft - leftSide;
+
+ // Hide it if it now overlaps the neighbour label
+ if (neighbour && pxPos + rightSide > neighbourEdge) {
+ show = false;
+ }
+ }
+
+ } else {
+ // Is the label spilling out to the right of the plot area?
+ if (pxPos + rightSide > axisRight) {
+
+ // Align it to plot right
+ pxPos = axisRight - rightSide;
+
+ // Hide it if it now overlaps the neighbour label
+ if (neighbour && pxPos + leftSide < neighbourEdge) {
+ show = false;
+ }
+
+ }
+ }
+
+ // Set the modified x position of the label
+ xy.x = pxPos;
+ }
+ return show;
+ },
+
+ /**
+ * Get the x and y position for ticks and labels
+ */
+ getPosition: function (horiz, pos, tickmarkOffset, old) {
+ var axis = this.axis,
+ chart = axis.chart,
+ cHeight = (old && chart.oldChartHeight) || chart.chartHeight;
+
+ return {
+ x: horiz ?
+ axis.translate(pos + tickmarkOffset, null, null, old) + axis.transB :
+ axis.left + axis.offset + (axis.opposite ? ((old && chart.oldChartWidth) || chart.chartWidth) - axis.right - axis.left : 0),
+
+ y: horiz ?
+ cHeight - axis.bottom + axis.offset - (axis.opposite ? axis.height : 0) :
+ cHeight - axis.translate(pos + tickmarkOffset, null, null, old) - axis.transB
+ };
+
+ },
+
+ /**
+ * Get the x, y position of the tick label
+ */
+ getLabelPosition: function (x, y, label, horiz, labelOptions, tickmarkOffset, index, step) {
+ var axis = this.axis,
+ transA = axis.transA,
+ reversed = axis.reversed,
+ staggerLines = axis.staggerLines;
+
+ x = x + labelOptions.x - (tickmarkOffset && horiz ?
+ tickmarkOffset * transA * (reversed ? -1 : 1) : 0);
+ y = y + this.yOffset - (tickmarkOffset && !horiz ?
+ tickmarkOffset * transA * (reversed ? 1 : -1) : 0);
+
+ // Correct for staggered labels
+ if (staggerLines) {
+ label.line = (index / (step || 1) % staggerLines);
+ y += label.line * (axis.labelOffset / staggerLines);
+ }
+
+ return {
+ x: x,
+ y: y
+ };
+ },
+
+ /**
+ * Extendible method to return the path of the marker
+ */
+ getMarkPath: function (x, y, tickLength, tickWidth, horiz, renderer) {
+ return renderer.crispLine([
+ M,
+ x,
+ y,
+ L,
+ x + (horiz ? 0 : -tickLength),
+ y + (horiz ? tickLength : 0)
+ ], tickWidth);
+ },
+
+ /**
+ * Put everything in place
+ *
+ * @param index {Number}
+ * @param old {Boolean} Use old coordinates to prepare an animation into new position
+ */
+ render: function (index, old, opacity) {
+ var tick = this,
+ axis = tick.axis,
+ options = axis.options,
+ chart = axis.chart,
+ renderer = chart.renderer,
+ horiz = axis.horiz,
+ type = tick.type,
+ label = tick.label,
+ pos = tick.pos,
+ labelOptions = options.labels,
+ gridLine = tick.gridLine,
+ gridPrefix = type ? type + 'Grid' : 'grid',
+ tickPrefix = type ? type + 'Tick' : 'tick',
+ gridLineWidth = options[gridPrefix + 'LineWidth'],
+ gridLineColor = options[gridPrefix + 'LineColor'],
+ dashStyle = options[gridPrefix + 'LineDashStyle'],
+ tickLength = options[tickPrefix + 'Length'],
+ tickWidth = options[tickPrefix + 'Width'] || 0,
+ tickColor = options[tickPrefix + 'Color'],
+ tickPosition = options[tickPrefix + 'Position'],
+ gridLinePath,
+ mark = tick.mark,
+ markPath,
+ step = labelOptions.step,
+ attribs,
+ show = true,
+ tickmarkOffset = axis.tickmarkOffset,
+ xy = tick.getPosition(horiz, pos, tickmarkOffset, old),
+ x = xy.x,
+ y = xy.y,
+ reverseCrisp = ((horiz && x === axis.pos + axis.len) || (!horiz && y === axis.pos)) ? -1 : 1; // #1480, #1687
+
+ opacity = pick(opacity, 1);
+ this.isActive = true;
+
+ // create the grid line
+ if (gridLineWidth) {
+ gridLinePath = axis.getPlotLinePath(pos + tickmarkOffset, gridLineWidth * reverseCrisp, old, true);
+
+ if (gridLine === UNDEFINED) {
+ attribs = {
+ stroke: gridLineColor,
+ 'stroke-width': gridLineWidth
+ };
+ if (dashStyle) {
+ attribs.dashstyle = dashStyle;
+ }
+ if (!type) {
+ attribs.zIndex = 1;
+ }
+ if (old) {
+ attribs.opacity = 0;
+ }
+ tick.gridLine = gridLine =
+ gridLineWidth ?
+ renderer.path(gridLinePath)
+ .attr(attribs).add(axis.gridGroup) :
+ null;
+ }
+
+ // If the parameter 'old' is set, the current call will be followed
+ // by another call, therefore do not do any animations this time
+ if (!old && gridLine && gridLinePath) {
+ gridLine[tick.isNew ? 'attr' : 'animate']({
+ d: gridLinePath,
+ opacity: opacity
+ });
+ }
+ }
+
+ // create the tick mark
+ if (tickWidth && tickLength) {
+
+ // negate the length
+ if (tickPosition === 'inside') {
+ tickLength = -tickLength;
+ }
+ if (axis.opposite) {
+ tickLength = -tickLength;
+ }
+
+ markPath = tick.getMarkPath(x, y, tickLength, tickWidth * reverseCrisp, horiz, renderer);
+ if (mark) { // updating
+ mark.animate({
+ d: markPath,
+ opacity: opacity
+ });
+ } else { // first time
+ tick.mark = renderer.path(
+ markPath
+ ).attr({
+ stroke: tickColor,
+ 'stroke-width': tickWidth,
+ opacity: opacity
+ }).add(axis.axisGroup);
+ }
+ }
+
+ // the label is created on init - now move it into place
+ if (label && !isNaN(x)) {
+ label.xy = xy = tick.getLabelPosition(x, y, label, horiz, labelOptions, tickmarkOffset, index, step);
+
+ // Apply show first and show last. If the tick is both first and last, it is
+ // a single centered tick, in which case we show the label anyway (#2100).
+ if ((tick.isFirst && !tick.isLast && !pick(options.showFirstLabel, 1)) ||
+ (tick.isLast && !tick.isFirst && !pick(options.showLastLabel, 1))) {
+ show = false;
+
+ // Handle label overflow and show or hide accordingly
+ } else if (!axis.isRadial && !labelOptions.step && !labelOptions.rotation && !old && opacity !== 0) {
+ show = tick.handleOverflow(index, xy);
+ }
+
+ // apply step
+ if (step && index % step) {
+ // show those indices dividable by step
+ show = false;
+ }
+
+ // Set the new position, and show or hide
+ if (show && !isNaN(xy.y)) {
+ xy.opacity = opacity;
+ label[tick.isNew ? 'attr' : 'animate'](xy);
+ tick.isNew = false;
+ } else {
+ label.attr('y', -9999); // #1338
+ }
+ }
+ },
+
+ /**
+ * Destructor for the tick prototype
+ */
+ destroy: function () {
+ destroyObjectProperties(this, this.axis);
+ }
+};
+
+/**
+ * The object wrapper for plot lines and plot bands
+ * @param {Object} options
+ */
+Highcharts.PlotLineOrBand = function (axis, options) {
+ this.axis = axis;
+
+ if (options) {
+ this.options = options;
+ this.id = options.id;
+ }
+};
+
+Highcharts.PlotLineOrBand.prototype = {
+
+ /**
+ * Render the plot line or plot band. If it is already existing,
+ * move it.
+ */
+ render: function () {
+ var plotLine = this,
+ axis = plotLine.axis,
+ horiz = axis.horiz,
+ halfPointRange = (axis.pointRange || 0) / 2,
+ options = plotLine.options,
+ optionsLabel = options.label,
+ label = plotLine.label,
+ width = options.width,
+ to = options.to,
+ from = options.from,
+ isBand = defined(from) && defined(to),
+ value = options.value,
+ dashStyle = options.dashStyle,
+ svgElem = plotLine.svgElem,
+ path = [],
+ addEvent,
+ eventType,
+ xs,
+ ys,
+ x,
+ y,
+ color = options.color,
+ zIndex = options.zIndex,
+ events = options.events,
+ attribs = {},
+ renderer = axis.chart.renderer;
+
+ // logarithmic conversion
+ if (axis.isLog) {
+ from = log2lin(from);
+ to = log2lin(to);
+ value = log2lin(value);
+ }
+
+ // plot line
+ if (width) {
+ path = axis.getPlotLinePath(value, width);
+ attribs = {
+ stroke: color,
+ 'stroke-width': width
+ };
+ if (dashStyle) {
+ attribs.dashstyle = dashStyle;
+ }
+ } else if (isBand) { // plot band
+
+ // keep within plot area
+ from = mathMax(from, axis.min - halfPointRange);
+ to = mathMin(to, axis.max + halfPointRange);
+
+ path = axis.getPlotBandPath(from, to, options);
+ if (color) {
+ attribs.fill = color;
+ }
+ if (options.borderWidth) {
+ attribs.stroke = options.borderColor;
+ attribs['stroke-width'] = options.borderWidth;
+ }
+ } else {
+ return;
+ }
+ // zIndex
+ if (defined(zIndex)) {
+ attribs.zIndex = zIndex;
+ }
+
+ // common for lines and bands
+ if (svgElem) {
+ if (path) {
+ svgElem.animate({
+ d: path
+ }, null, svgElem.onGetPath);
+ } else {
+ svgElem.hide();
+ svgElem.onGetPath = function () {
+ svgElem.show();
+ };
+ if (label) {
+ plotLine.label = label = label.destroy();
+ }
+ }
+ } else if (path && path.length) {
+ plotLine.svgElem = svgElem = renderer.path(path)
+ .attr(attribs).add();
+
+ // events
+ if (events) {
+ addEvent = function (eventType) {
+ svgElem.on(eventType, function (e) {
+ events[eventType].apply(plotLine, [e]);
+ });
+ };
+ for (eventType in events) {
+ addEvent(eventType);
+ }
+ }
+ }
+
+ // the plot band/line label
+ if (optionsLabel && defined(optionsLabel.text) && path && path.length && axis.width > 0 && axis.height > 0) {
+ // apply defaults
+ optionsLabel = merge({
+ align: horiz && isBand && 'center',
+ x: horiz ? !isBand && 4 : 10,
+ verticalAlign : !horiz && isBand && 'middle',
+ y: horiz ? isBand ? 16 : 10 : isBand ? 6 : -4,
+ rotation: horiz && !isBand && 90
+ }, optionsLabel);
+
+ // add the SVG element
+ if (!label) {
+ attribs = {
+ align: optionsLabel.textAlign || optionsLabel.align,
+ rotation: optionsLabel.rotation
+ };
+ if (defined(zIndex)) {
+ attribs.zIndex = zIndex;
+ }
+ plotLine.label = label = renderer.text(
+ optionsLabel.text,
+ 0,
+ 0,
+ optionsLabel.useHTML
+ )
+ .attr(attribs)
+ .css(optionsLabel.style)
+ .add();
+ }
+
+ // get the bounding box and align the label
+ // #3000 changed to better handle choice between plotband or plotline
+ xs = [path[1], path[4], (isBand ? path[6] : path[1])];
+ ys = [path[2], path[5], (isBand ? path[7] : path[2])];
+ x = arrayMin(xs);
+ y = arrayMin(ys);
+
+ label.align(optionsLabel, false, {
+ x: x,
+ y: y,
+ width: arrayMax(xs) - x,
+ height: arrayMax(ys) - y
+ });
+ label.show();
+
+ } else if (label) { // move out of sight
+ label.hide();
+ }
+
+ // chainable
+ return plotLine;
+ },
+
+ /**
+ * Remove the plot line or band
+ */
+ destroy: function () {
+ // remove it from the lookup
+ erase(this.axis.plotLinesAndBands, this);
+
+ delete this.axis;
+ destroyObjectProperties(this);
+ }
+};
+
+/**
+ * Object with members for extending the Axis prototype
+ */
+
+AxisPlotLineOrBandExtension = {
+
+ /**
+ * Create the path for a plot band
+ */
+ getPlotBandPath: function (from, to) {
+ var toPath = this.getPlotLinePath(to),
+ path = this.getPlotLinePath(from);
+
+ if (path && toPath) {
+ path.push(
+ toPath[4],
+ toPath[5],
+ toPath[1],
+ toPath[2]
+ );
+ } else { // outside the axis area
+ path = null;
+ }
+
+ return path;
+ },
+
+ addPlotBand: function (options) {
+ return this.addPlotBandOrLine(options, 'plotBands');
+ },
+
+ addPlotLine: function (options) {
+ return this.addPlotBandOrLine(options, 'plotLines');
+ },
+
+ /**
+ * Add a plot band or plot line after render time
+ *
+ * @param options {Object} The plotBand or plotLine configuration object
+ */
+ addPlotBandOrLine: function (options, coll) {
+ var obj = new Highcharts.PlotLineOrBand(this, options).render(),
+ userOptions = this.userOptions;
+
+ if (obj) { // #2189
+ // Add it to the user options for exporting and Axis.update
+ if (coll) {
+ userOptions[coll] = userOptions[coll] || [];
+ userOptions[coll].push(options);
+ }
+ this.plotLinesAndBands.push(obj);
+ }
+
+ return obj;
+ },
+
+ /**
+ * Remove a plot band or plot line from the chart by id
+ * @param {Object} id
+ */
+ removePlotBandOrLine: function (id) {
+ var plotLinesAndBands = this.plotLinesAndBands,
+ options = this.options,
+ userOptions = this.userOptions,
+ i = plotLinesAndBands.length;
+ while (i--) {
+ if (plotLinesAndBands[i].id === id) {
+ plotLinesAndBands[i].destroy();
+ }
+ }
+ each([options.plotLines || [], userOptions.plotLines || [], options.plotBands || [], userOptions.plotBands || []], function (arr) {
+ i = arr.length;
+ while (i--) {
+ if (arr[i].id === id) {
+ erase(arr, arr[i]);
+ }
+ }
+ });
+ }
+};
+
+/**
+ * Create a new axis object
+ * @param {Object} chart
+ * @param {Object} options
+ */
+function Axis() {
+ this.init.apply(this, arguments);
+}
+
+Axis.prototype = {
+
+ /**
+ * Default options for the X axis - the Y axis has extended defaults
+ */
+ defaultOptions: {
+ // allowDecimals: null,
+ // alternateGridColor: null,
+ // categories: [],
+ dateTimeLabelFormats: {
+ millisecond: '%H:%M:%S.%L',
+ second: '%H:%M:%S',
+ minute: '%H:%M',
+ hour: '%H:%M',
+ day: '%e. %b',
+ week: '%e. %b',
+ month: '%b \'%y',
+ year: '%Y'
+ },
+ endOnTick: false,
+ gridLineColor: '#C0C0C0',
+ // gridLineDashStyle: 'solid',
+ // gridLineWidth: 0,
+ // reversed: false,
+
+ labels: defaultLabelOptions,
+ // { step: null },
+ lineColor: '#C0D0E0',
+ lineWidth: 1,
+ //linkedTo: null,
+ //max: undefined,
+ //min: undefined,
+ minPadding: 0.01,
+ maxPadding: 0.01,
+ //minRange: null,
+ minorGridLineColor: '#E0E0E0',
+ // minorGridLineDashStyle: null,
+ minorGridLineWidth: 1,
+ minorTickColor: '#A0A0A0',
+ //minorTickInterval: null,
+ minorTickLength: 2,
+ minorTickPosition: 'outside', // inside or outside
+ //minorTickWidth: 0,
+ //opposite: false,
+ //offset: 0,
+ //plotBands: [{
+ // events: {},
+ // zIndex: 1,
+ // labels: { align, x, verticalAlign, y, style, rotation, textAlign }
+ //}],
+ //plotLines: [{
+ // events: {}
+ // dashStyle: {}
+ // zIndex:
+ // labels: { align, x, verticalAlign, y, style, rotation, textAlign }
+ //}],
+ //reversed: false,
+ // showFirstLabel: true,
+ // showLastLabel: true,
+ startOfWeek: 1,
+ startOnTick: false,
+ tickColor: '#C0D0E0',
+ //tickInterval: null,
+ tickLength: 10,
+ tickmarkPlacement: 'between', // on or between
+ tickPixelInterval: 100,
+ tickPosition: 'outside',
+ tickWidth: 1,
+ title: {
+ //text: null,
+ align: 'middle', // low, middle or high
+ //margin: 0 for horizontal, 10 for vertical axes,
+ //rotation: 0,
+ //side: 'outside',
+ style: {
+ color: '#707070'
+ }
+ //x: 0,
+ //y: 0
+ },
+ type: 'linear' // linear, logarithmic or datetime
+ },
+
+ /**
+ * This options set extends the defaultOptions for Y axes
+ */
+ defaultYAxisOptions: {
+ endOnTick: true,
+ gridLineWidth: 1,
+ tickPixelInterval: 72,
+ showLastLabel: true,
+ labels: {
+ x: -8,
+ y: 3
+ },
+ lineWidth: 0,
+ maxPadding: 0.05,
+ minPadding: 0.05,
+ startOnTick: true,
+ tickWidth: 0,
+ title: {
+ rotation: 270,
+ text: 'Values'
+ },
+ stackLabels: {
+ enabled: false,
+ //align: dynamic,
+ //y: dynamic,
+ //x: dynamic,
+ //verticalAlign: dynamic,
+ //textAlign: dynamic,
+ //rotation: 0,
+ formatter: function () {
+ return numberFormat(this.total, -1);
+ },
+ style: defaultLabelOptions.style
+ }
+ },
+
+ /**
+ * These options extend the defaultOptions for left axes
+ */
+ defaultLeftAxisOptions: {
+ labels: {
+ x: -15,
+ y: null
+ },
+ title: {
+ rotation: 270
+ }
+ },
+
+ /**
+ * These options extend the defaultOptions for right axes
+ */
+ defaultRightAxisOptions: {
+ labels: {
+ x: 15,
+ y: null
+ },
+ title: {
+ rotation: 90
+ }
+ },
+
+ /**
+ * These options extend the defaultOptions for bottom axes
+ */
+ defaultBottomAxisOptions: {
+ labels: {
+ x: 0,
+ y: null // based on font size
+ // overflow: undefined,
+ // staggerLines: null
+ },
+ title: {
+ rotation: 0
+ }
+ },
+ /**
+ * These options extend the defaultOptions for left axes
+ */
+ defaultTopAxisOptions: {
+ labels: {
+ x: 0,
+ y: -15
+ // overflow: undefined
+ // staggerLines: null
+ },
+ title: {
+ rotation: 0
+ }
+ },
+
+ /**
+ * Initialize the axis
+ */
+ init: function (chart, userOptions) {
+
+
+ var isXAxis = userOptions.isX,
+ axis = this;
+
+ // Flag, is the axis horizontal
+ axis.horiz = chart.inverted ? !isXAxis : isXAxis;
+
+ // Flag, isXAxis
+ axis.isXAxis = isXAxis;
+ axis.coll = isXAxis ? 'xAxis' : 'yAxis';
+
+ axis.opposite = userOptions.opposite; // needed in setOptions
+ axis.side = userOptions.side || (axis.horiz ?
+ (axis.opposite ? 0 : 2) : // top : bottom
+ (axis.opposite ? 1 : 3)); // right : left
+
+ axis.setOptions(userOptions);
+
+
+ var options = this.options,
+ type = options.type,
+ isDatetimeAxis = type === 'datetime';
+
+ axis.labelFormatter = options.labels.formatter || axis.defaultLabelFormatter; // can be overwritten by dynamic format
+
+
+ // Flag, stagger lines or not
+ axis.userOptions = userOptions;
+
+ //axis.axisTitleMargin = UNDEFINED,// = options.title.margin,
+ axis.minPixelPadding = 0;
+ //axis.ignoreMinPadding = UNDEFINED; // can be set to true by a column or bar series
+ //axis.ignoreMaxPadding = UNDEFINED;
+
+ axis.chart = chart;
+ axis.reversed = options.reversed;
+ axis.zoomEnabled = options.zoomEnabled !== false;
+
+ // Initial categories
+ axis.categories = options.categories || type === 'category';
+ axis.names = [];
+
+ // Elements
+ //axis.axisGroup = UNDEFINED;
+ //axis.gridGroup = UNDEFINED;
+ //axis.axisTitle = UNDEFINED;
+ //axis.axisLine = UNDEFINED;
+
+ // Shorthand types
+ axis.isLog = type === 'logarithmic';
+ axis.isDatetimeAxis = isDatetimeAxis;
+
+ // Flag, if axis is linked to another axis
+ axis.isLinked = defined(options.linkedTo);
+ // Linked axis.
+ //axis.linkedParent = UNDEFINED;
+
+ // Tick positions
+ //axis.tickPositions = UNDEFINED; // array containing predefined positions
+ // Tick intervals
+ //axis.tickInterval = UNDEFINED;
+ //axis.minorTickInterval = UNDEFINED;
+
+ axis.tickmarkOffset = (axis.categories && options.tickmarkPlacement === 'between') ? 0.5 : 0;
+
+ // Major ticks
+ axis.ticks = {};
+ axis.labelEdge = [];
+ // Minor ticks
+ axis.minorTicks = {};
+ //axis.tickAmount = UNDEFINED;
+
+ // List of plotLines/Bands
+ axis.plotLinesAndBands = [];
+
+ // Alternate bands
+ axis.alternateBands = {};
+
+ // Axis metrics
+ //axis.left = UNDEFINED;
+ //axis.top = UNDEFINED;
+ //axis.width = UNDEFINED;
+ //axis.height = UNDEFINED;
+ //axis.bottom = UNDEFINED;
+ //axis.right = UNDEFINED;
+ //axis.transA = UNDEFINED;
+ //axis.transB = UNDEFINED;
+ //axis.oldTransA = UNDEFINED;
+ axis.len = 0;
+ //axis.oldMin = UNDEFINED;
+ //axis.oldMax = UNDEFINED;
+ //axis.oldUserMin = UNDEFINED;
+ //axis.oldUserMax = UNDEFINED;
+ //axis.oldAxisLength = UNDEFINED;
+ axis.minRange = axis.userMinRange = options.minRange || options.maxZoom;
+ axis.range = options.range;
+ axis.offset = options.offset || 0;
+
+
+ // Dictionary for stacks
+ axis.stacks = {};
+ axis.oldStacks = {};
+
+ // Min and max in the data
+ //axis.dataMin = UNDEFINED,
+ //axis.dataMax = UNDEFINED,
+
+ // The axis range
+ axis.max = null;
+ axis.min = null;
+
+ // User set min and max
+ //axis.userMin = UNDEFINED,
+ //axis.userMax = UNDEFINED,
+
+ // Crosshair options
+ axis.crosshair = pick(options.crosshair, splat(chart.options.tooltip.crosshairs)[isXAxis ? 0 : 1], false);
+ // Run Axis
+
+ var eventType,
+ events = axis.options.events;
+
+ // Register
+ if (inArray(axis, chart.axes) === -1) { // don't add it again on Axis.update()
+ if (isXAxis && !this.isColorAxis) { // #2713
+ chart.axes.splice(chart.xAxis.length, 0, axis);
+ } else {
+ chart.axes.push(axis);
+ }
+
+ chart[axis.coll].push(axis);
+ }
+
+ axis.series = axis.series || []; // populated by Series
+
+ // inverted charts have reversed xAxes as default
+ if (chart.inverted && isXAxis && axis.reversed === UNDEFINED) {
+ axis.reversed = true;
+ }
+
+ axis.removePlotBand = axis.removePlotBandOrLine;
+ axis.removePlotLine = axis.removePlotBandOrLine;
+
+
+ // register event listeners
+ for (eventType in events) {
+ addEvent(axis, eventType, events[eventType]);
+ }
+
+ // extend logarithmic axis
+ if (axis.isLog) {
+ axis.val2lin = log2lin;
+ axis.lin2val = lin2log;
+ }
+ },
+
+ /**
+ * Merge and set options
+ */
+ setOptions: function (userOptions) {
+ this.options = merge(
+ this.defaultOptions,
+ this.isXAxis ? {} : this.defaultYAxisOptions,
+ [this.defaultTopAxisOptions, this.defaultRightAxisOptions,
+ this.defaultBottomAxisOptions, this.defaultLeftAxisOptions][this.side],
+ merge(
+ defaultOptions[this.coll], // if set in setOptions (#1053)
+ userOptions
+ )
+ );
+ },
+
+ /**
+ * The default label formatter. The context is a special config object for the label.
+ */
+ defaultLabelFormatter: function () {
+ var axis = this.axis,
+ value = this.value,
+ categories = axis.categories,
+ dateTimeLabelFormat = this.dateTimeLabelFormat,
+ numericSymbols = defaultOptions.lang.numericSymbols,
+ i = numericSymbols && numericSymbols.length,
+ multi,
+ ret,
+ formatOption = axis.options.labels.format,
+
+ // make sure the same symbol is added for all labels on a linear axis
+ numericSymbolDetector = axis.isLog ? value : axis.tickInterval;
+
+ if (formatOption) {
+ ret = format(formatOption, this);
+
+ } else if (categories) {
+ ret = value;
+
+ } else if (dateTimeLabelFormat) { // datetime axis
+ ret = dateFormat(dateTimeLabelFormat, value);
+
+ } else if (i && numericSymbolDetector >= 1000) {
+ // Decide whether we should add a numeric symbol like k (thousands) or M (millions).
+ // If we are to enable this in tooltip or other places as well, we can move this
+ // logic to the numberFormatter and enable it by a parameter.
+ while (i-- && ret === UNDEFINED) {
+ multi = Math.pow(1000, i + 1);
+ if (numericSymbolDetector >= multi && numericSymbols[i] !== null) {
+ ret = numberFormat(value / multi, -1) + numericSymbols[i];
+ }
+ }
+ }
+
+ if (ret === UNDEFINED) {
+ if (mathAbs(value) >= 10000) { // add thousands separators
+ ret = numberFormat(value, 0);
+
+ } else { // small numbers
+ ret = numberFormat(value, -1, UNDEFINED, ''); // #2466
+ }
+ }
+
+ return ret;
+ },
+
+ /**
+ * Get the minimum and maximum for the series of each axis
+ */
+ getSeriesExtremes: function () {
+ var axis = this,
+ chart = axis.chart;
+
+ axis.hasVisibleSeries = false;
+
+ // reset dataMin and dataMax in case we're redrawing
+ axis.dataMin = axis.dataMax = null;
+
+ if (axis.buildStacks) {
+ axis.buildStacks();
+ }
+
+ // loop through this axis' series
+ each(axis.series, function (series) {
+
+ if (series.visible || !chart.options.chart.ignoreHiddenSeries) {
+
+ var seriesOptions = series.options,
+ xData,
+ threshold = seriesOptions.threshold,
+ seriesDataMin,
+ seriesDataMax;
+
+ axis.hasVisibleSeries = true;
+
+ // Validate threshold in logarithmic axes
+ if (axis.isLog && threshold <= 0) {
+ threshold = null;
+ }
+
+ // Get dataMin and dataMax for X axes
+ if (axis.isXAxis) {
+ xData = series.xData;
+ if (xData.length) {
+ axis.dataMin = mathMin(pick(axis.dataMin, xData[0]), arrayMin(xData));
+ axis.dataMax = mathMax(pick(axis.dataMax, xData[0]), arrayMax(xData));
+ }
+
+ // Get dataMin and dataMax for Y axes, as well as handle stacking and processed data
+ } else {
+
+ // Get this particular series extremes
+ series.getExtremes();
+ seriesDataMax = series.dataMax;
+ seriesDataMin = series.dataMin;
+
+ // Get the dataMin and dataMax so far. If percentage is used, the min and max are
+ // always 0 and 100. If seriesDataMin and seriesDataMax is null, then series
+ // doesn't have active y data, we continue with nulls
+ if (defined(seriesDataMin) && defined(seriesDataMax)) {
+ axis.dataMin = mathMin(pick(axis.dataMin, seriesDataMin), seriesDataMin);
+ axis.dataMax = mathMax(pick(axis.dataMax, seriesDataMax), seriesDataMax);
+ }
+
+ // Adjust to threshold
+ if (defined(threshold)) {
+ if (axis.dataMin >= threshold) {
+ axis.dataMin = threshold;
+ axis.ignoreMinPadding = true;
+ } else if (axis.dataMax < threshold) {
+ axis.dataMax = threshold;
+ axis.ignoreMaxPadding = true;
+ }
+ }
+ }
+ }
+ });
+ },
+
+ /**
+ * Translate from axis value to pixel position on the chart, or back
+ *
+ */
+ translate: function (val, backwards, cvsCoord, old, handleLog, pointPlacement) {
+ var axis = this,
+ sign = 1,
+ cvsOffset = 0,
+ localA = old ? axis.oldTransA : axis.transA,
+ localMin = old ? axis.oldMin : axis.min,
+ returnValue,
+ minPixelPadding = axis.minPixelPadding,
+ postTranslate = (axis.options.ordinal || (axis.isLog && handleLog)) && axis.lin2val;
+
+ if (!localA) {
+ localA = axis.transA;
+ }
+
+ // In vertical axes, the canvas coordinates start from 0 at the top like in
+ // SVG.
+ if (cvsCoord) {
+ sign *= -1; // canvas coordinates inverts the value
+ cvsOffset = axis.len;
+ }
+
+ // Handle reversed axis
+ if (axis.reversed) {
+ sign *= -1;
+ cvsOffset -= sign * (axis.sector || axis.len);
+ }
+
+ // From pixels to value
+ if (backwards) { // reverse translation
+
+ val = val * sign + cvsOffset;
+ val -= minPixelPadding;
+ returnValue = val / localA + localMin; // from chart pixel to value
+ if (postTranslate) { // log and ordinal axes
+ returnValue = axis.lin2val(returnValue);
+ }
+
+ // From value to pixels
+ } else {
+ if (postTranslate) { // log and ordinal axes
+ val = axis.val2lin(val);
+ }
+ if (pointPlacement === 'between') {
+ pointPlacement = 0.5;
+ }
+ returnValue = sign * (val - localMin) * localA + cvsOffset + (sign * minPixelPadding) +
+ (isNumber(pointPlacement) ? localA * pointPlacement * axis.pointRange : 0);
+ }
+
+ return returnValue;
+ },
+
+ /**
+ * Utility method to translate an axis value to pixel position.
+ * @param {Number} value A value in terms of axis units
+ * @param {Boolean} paneCoordinates Whether to return the pixel coordinate relative to the chart
+ * or just the axis/pane itself.
+ */
+ toPixels: function (value, paneCoordinates) {
+ return this.translate(value, false, !this.horiz, null, true) + (paneCoordinates ? 0 : this.pos);
+ },
+
+ /*
+ * Utility method to translate a pixel position in to an axis value
+ * @param {Number} pixel The pixel value coordinate
+ * @param {Boolean} paneCoordiantes Whether the input pixel is relative to the chart or just the
+ * axis/pane itself.
+ */
+ toValue: function (pixel, paneCoordinates) {
+ return this.translate(pixel - (paneCoordinates ? 0 : this.pos), true, !this.horiz, null, true);
+ },
+
+ /**
+ * Create the path for a plot line that goes from the given value on
+ * this axis, across the plot to the opposite side
+ * @param {Number} value
+ * @param {Number} lineWidth Used for calculation crisp line
+ * @param {Number] old Use old coordinates (for resizing and rescaling)
+ */
+ getPlotLinePath: function (value, lineWidth, old, force, translatedValue) {
+ var axis = this,
+ chart = axis.chart,
+ axisLeft = axis.left,
+ axisTop = axis.top,
+ x1,
+ y1,
+ x2,
+ y2,
+ cHeight = (old && chart.oldChartHeight) || chart.chartHeight,
+ cWidth = (old && chart.oldChartWidth) || chart.chartWidth,
+ skip,
+ transB = axis.transB;
+
+ translatedValue = pick(translatedValue, axis.translate(value, null, null, old));
+ x1 = x2 = mathRound(translatedValue + transB);
+ y1 = y2 = mathRound(cHeight - translatedValue - transB);
+
+ if (isNaN(translatedValue)) { // no min or max
+ skip = true;
+
+ } else if (axis.horiz) {
+ y1 = axisTop;
+ y2 = cHeight - axis.bottom;
+ if (x1 < axisLeft || x1 > axisLeft + axis.width) {
+ skip = true;
+ }
+ } else {
+ x1 = axisLeft;
+ x2 = cWidth - axis.right;
+
+ if (y1 < axisTop || y1 > axisTop + axis.height) {
+ skip = true;
+ }
+ }
+ return skip && !force ?
+ null :
+ chart.renderer.crispLine([M, x1, y1, L, x2, y2], lineWidth || 1);
+ },
+
+ /**
+ * Set the tick positions of a linear axis to round values like whole tens or every five.
+ */
+ getLinearTickPositions: function (tickInterval, min, max) {
+ var pos,
+ lastPos,
+ roundedMin = correctFloat(mathFloor(min / tickInterval) * tickInterval),
+ roundedMax = correctFloat(mathCeil(max / tickInterval) * tickInterval),
+ tickPositions = [];
+
+ // For single points, add a tick regardless of the relative position (#2662)
+ if (min === max && isNumber(min)) {
+ return [min];
+ }
+
+ // Populate the intermediate values
+ pos = roundedMin;
+ while (pos <= roundedMax) {
+
+ // Place the tick on the rounded value
+ tickPositions.push(pos);
+
+ // Always add the raw tickInterval, not the corrected one.
+ pos = correctFloat(pos + tickInterval);
+
+ // If the interval is not big enough in the current min - max range to actually increase
+ // the loop variable, we need to break out to prevent endless loop. Issue #619
+ if (pos === lastPos) {
+ break;
+ }
+
+ // Record the last value
+ lastPos = pos;
+ }
+ return tickPositions;
+ },
+
+ /**
+ * Return the minor tick positions. For logarithmic axes, reuse the same logic
+ * as for major ticks.
+ */
+ getMinorTickPositions: function () {
+ var axis = this,
+ options = axis.options,
+ tickPositions = axis.tickPositions,
+ minorTickInterval = axis.minorTickInterval,
+ minorTickPositions = [],
+ pos,
+ i,
+ len;
+
+ if (axis.isLog) {
+ len = tickPositions.length;
+ for (i = 1; i < len; i++) {
+ minorTickPositions = minorTickPositions.concat(
+ axis.getLogTickPositions(minorTickInterval, tickPositions[i - 1], tickPositions[i], true)
+ );
+ }
+ } else if (axis.isDatetimeAxis && options.minorTickInterval === 'auto') { // #1314
+ minorTickPositions = minorTickPositions.concat(
+ axis.getTimeTicks(
+ axis.normalizeTimeTickInterval(minorTickInterval),
+ axis.min,
+ axis.max,
+ options.startOfWeek
+ )
+ );
+ if (minorTickPositions[0] < axis.min) {
+ minorTickPositions.shift();
+ }
+ } else {
+ for (pos = axis.min + (tickPositions[0] - axis.min) % minorTickInterval; pos <= axis.max; pos += minorTickInterval) {
+ minorTickPositions.push(pos);
+ }
+ }
+ return minorTickPositions;
+ },
+
+ /**
+ * Adjust the min and max for the minimum range. Keep in mind that the series data is
+ * not yet processed, so we don't have information on data cropping and grouping, or
+ * updated axis.pointRange or series.pointRange. The data can't be processed until
+ * we have finally established min and max.
+ */
+ adjustForMinRange: function () {
+ var axis = this,
+ options = axis.options,
+ min = axis.min,
+ max = axis.max,
+ zoomOffset,
+ spaceAvailable = axis.dataMax - axis.dataMin >= axis.minRange,
+ closestDataRange,
+ i,
+ distance,
+ xData,
+ loopLength,
+ minArgs,
+ maxArgs;
+
+ // Set the automatic minimum range based on the closest point distance
+ if (axis.isXAxis && axis.minRange === UNDEFINED && !axis.isLog) {
+
+ if (defined(options.min) || defined(options.max)) {
+ axis.minRange = null; // don't do this again
+
+ } else {
+
+ // Find the closest distance between raw data points, as opposed to
+ // closestPointRange that applies to processed points (cropped and grouped)
+ each(axis.series, function (series) {
+ xData = series.xData;
+ loopLength = series.xIncrement ? 1 : xData.length - 1;
+ for (i = loopLength; i > 0; i--) {
+ distance = xData[i] - xData[i - 1];
+ if (closestDataRange === UNDEFINED || distance < closestDataRange) {
+ closestDataRange = distance;
+ }
+ }
+ });
+ axis.minRange = mathMin(closestDataRange * 5, axis.dataMax - axis.dataMin);
+ }
+ }
+
+ // if minRange is exceeded, adjust
+ if (max - min < axis.minRange) {
+ var minRange = axis.minRange;
+ zoomOffset = (minRange - max + min) / 2;
+
+ // if min and max options have been set, don't go beyond it
+ minArgs = [min - zoomOffset, pick(options.min, min - zoomOffset)];
+ if (spaceAvailable) { // if space is available, stay within the data range
+ minArgs[2] = axis.dataMin;
+ }
+ min = arrayMax(minArgs);
+
+ maxArgs = [min + minRange, pick(options.max, min + minRange)];
+ if (spaceAvailable) { // if space is availabe, stay within the data range
+ maxArgs[2] = axis.dataMax;
+ }
+
+ max = arrayMin(maxArgs);
+
+ // now if the max is adjusted, adjust the min back
+ if (max - min < minRange) {
+ minArgs[0] = max - minRange;
+ minArgs[1] = pick(options.min, max - minRange);
+ min = arrayMax(minArgs);
+ }
+ }
+
+ // Record modified extremes
+ axis.min = min;
+ axis.max = max;
+ },
+
+ /**
+ * Update translation information
+ */
+ setAxisTranslation: function (saveOld) {
+ var axis = this,
+ range = axis.max - axis.min,
+ pointRange = axis.axisPointRange || 0,
+ closestPointRange,
+ minPointOffset = 0,
+ pointRangePadding = 0,
+ linkedParent = axis.linkedParent,
+ ordinalCorrection,
+ hasCategories = !!axis.categories,
+ transA = axis.transA;
+
+ // Adjust translation for padding. Y axis with categories need to go through the same (#1784).
+ if (axis.isXAxis || hasCategories || pointRange) {
+ if (linkedParent) {
+ minPointOffset = linkedParent.minPointOffset;
+ pointRangePadding = linkedParent.pointRangePadding;
+
+ } else {
+ each(axis.series, function (series) {
+ var seriesPointRange = hasCategories ? 1 : (axis.isXAxis ? series.pointRange : (axis.axisPointRange || 0)), // #2806
+ pointPlacement = series.options.pointPlacement,
+ seriesClosestPointRange = series.closestPointRange;
+
+ if (seriesPointRange > range) { // #1446
+ seriesPointRange = 0;
+ }
+ pointRange = mathMax(pointRange, seriesPointRange);
+
+ // minPointOffset is the value padding to the left of the axis in order to make
+ // room for points with a pointRange, typically columns. When the pointPlacement option
+ // is 'between' or 'on', this padding does not apply.
+ minPointOffset = mathMax(
+ minPointOffset,
+ isString(pointPlacement) ? 0 : seriesPointRange / 2
+ );
+
+ // Determine the total padding needed to the length of the axis to make room for the
+ // pointRange. If the series' pointPlacement is 'on', no padding is added.
+ pointRangePadding = mathMax(
+ pointRangePadding,
+ pointPlacement === 'on' ? 0 : seriesPointRange
+ );
+
+ // Set the closestPointRange
+ if (!series.noSharedTooltip && defined(seriesClosestPointRange)) {
+ closestPointRange = defined(closestPointRange) ?
+ mathMin(closestPointRange, seriesClosestPointRange) :
+ seriesClosestPointRange;
+ }
+ });
+ }
+
+ // Record minPointOffset and pointRangePadding
+ ordinalCorrection = axis.ordinalSlope && closestPointRange ? axis.ordinalSlope / closestPointRange : 1; // #988, #1853
+ axis.minPointOffset = minPointOffset = minPointOffset * ordinalCorrection;
+ axis.pointRangePadding = pointRangePadding = pointRangePadding * ordinalCorrection;
+
+ // pointRange means the width reserved for each point, like in a column chart
+ axis.pointRange = mathMin(pointRange, range);
+
+ // closestPointRange means the closest distance between points. In columns
+ // it is mostly equal to pointRange, but in lines pointRange is 0 while closestPointRange
+ // is some other value
+ axis.closestPointRange = closestPointRange;
+ }
+
+ // Secondary values
+ if (saveOld) {
+ axis.oldTransA = transA;
+ }
+ axis.translationSlope = axis.transA = transA = axis.len / ((range + pointRangePadding) || 1);
+ axis.transB = axis.horiz ? axis.left : axis.bottom; // translation addend
+ axis.minPixelPadding = transA * minPointOffset;
+ },
+
+ /**
+ * Set the tick positions to round values and optionally extend the extremes
+ * to the nearest tick
+ */
+ setTickPositions: function (secondPass) {
+ var axis = this,
+ chart = axis.chart,
+ options = axis.options,
+ startOnTick = options.startOnTick,
+ endOnTick = options.endOnTick,
+ isLog = axis.isLog,
+ isDatetimeAxis = axis.isDatetimeAxis,
+ isXAxis = axis.isXAxis,
+ isLinked = axis.isLinked,
+ tickPositioner = axis.options.tickPositioner,
+ maxPadding = options.maxPadding,
+ minPadding = options.minPadding,
+ length,
+ linkedParentExtremes,
+ tickIntervalOption = options.tickInterval,
+ minTickIntervalOption = options.minTickInterval,
+ tickPixelIntervalOption = options.tickPixelInterval,
+ tickPositions,
+ keepTwoTicksOnly,
+ categories = axis.categories;
+
+ // linked axis gets the extremes from the parent axis
+ if (isLinked) {
+ axis.linkedParent = chart[axis.coll][options.linkedTo];
+ linkedParentExtremes = axis.linkedParent.getExtremes();
+ axis.min = pick(linkedParentExtremes.min, linkedParentExtremes.dataMin);
+ axis.max = pick(linkedParentExtremes.max, linkedParentExtremes.dataMax);
+ if (options.type !== axis.linkedParent.options.type) {
+ error(11, 1); // Can't link axes of different type
+ }
+ } else { // initial min and max from the extreme data values
+ axis.min = pick(axis.userMin, options.min, axis.dataMin);
+ axis.max = pick(axis.userMax, options.max, axis.dataMax);
+ }
+
+ if (isLog) {
+ if (!secondPass && mathMin(axis.min, pick(axis.dataMin, axis.min)) <= 0) { // #978
+ error(10, 1); // Can't plot negative values on log axis
+ }
+ axis.min = correctFloat(log2lin(axis.min)); // correctFloat cures #934
+ axis.max = correctFloat(log2lin(axis.max));
+ }
+
+ // handle zoomed range
+ if (axis.range && defined(axis.max)) {
+ axis.userMin = axis.min = mathMax(axis.min, axis.max - axis.range); // #618
+ axis.userMax = axis.max;
+
+ axis.range = null; // don't use it when running setExtremes
+ }
+
+ // Hook for adjusting this.min and this.max. Used by bubble series.
+ if (axis.beforePadding) {
+ axis.beforePadding();
+ }
+
+ // adjust min and max for the minimum range
+ axis.adjustForMinRange();
+
+ // Pad the values to get clear of the chart's edges. To avoid tickInterval taking the padding
+ // into account, we do this after computing tick interval (#1337).
+ if (!categories && !axis.axisPointRange && !axis.usePercentage && !isLinked && defined(axis.min) && defined(axis.max)) {
+ length = axis.max - axis.min;
+ if (length) {
+ if (!defined(options.min) && !defined(axis.userMin) && minPadding && (axis.dataMin < 0 || !axis.ignoreMinPadding)) {
+ axis.min -= length * minPadding;
+ }
+ if (!defined(options.max) && !defined(axis.userMax) && maxPadding && (axis.dataMax > 0 || !axis.ignoreMaxPadding)) {
+ axis.max += length * maxPadding;
+ }
+ }
+ }
+
+ // Stay within floor and ceiling
+ if (isNumber(options.floor)) {
+ axis.min = mathMax(axis.min, options.floor);
+ }
+ if (isNumber(options.ceiling)) {
+ axis.max = mathMin(axis.max, options.ceiling);
+ }
+
+ // get tickInterval
+ if (axis.min === axis.max || axis.min === undefined || axis.max === undefined) {
+ axis.tickInterval = 1;
+ } else if (isLinked && !tickIntervalOption &&
+ tickPixelIntervalOption === axis.linkedParent.options.tickPixelInterval) {
+ axis.tickInterval = axis.linkedParent.tickInterval;
+ } else {
+ axis.tickInterval = pick(
+ tickIntervalOption,
+ categories ? // for categoried axis, 1 is default, for linear axis use tickPix
+ 1 :
+ // don't let it be more than the data range
+ (axis.max - axis.min) * tickPixelIntervalOption / mathMax(axis.len, tickPixelIntervalOption)
+ );
+ // For squished axes, set only two ticks
+ if (!defined(tickIntervalOption) && axis.len < tickPixelIntervalOption && !this.isRadial &&
+ !this.isLog && !categories && startOnTick && endOnTick) {
+ keepTwoTicksOnly = true;
+ axis.tickInterval /= 4; // tick extremes closer to the real values
+ }
+ }
+
+ // Now we're finished detecting min and max, crop and group series data. This
+ // is in turn needed in order to find tick positions in ordinal axes.
+ if (isXAxis && !secondPass) {
+ each(axis.series, function (series) {
+ series.processData(axis.min !== axis.oldMin || axis.max !== axis.oldMax);
+ });
+ }
+
+ // set the translation factor used in translate function
+ axis.setAxisTranslation(true);
+
+ // hook for ordinal axes and radial axes
+ if (axis.beforeSetTickPositions) {
+ axis.beforeSetTickPositions();
+ }
+
+ // hook for extensions, used in Highstock ordinal axes
+ if (axis.postProcessTickInterval) {
+ axis.tickInterval = axis.postProcessTickInterval(axis.tickInterval);
+ }
+
+ // In column-like charts, don't cramp in more ticks than there are points (#1943)
+ if (axis.pointRange) {
+ axis.tickInterval = mathMax(axis.pointRange, axis.tickInterval);
+ }
+
+ // Before normalizing the tick interval, handle minimum tick interval. This applies only if tickInterval is not defined.
+ if (!tickIntervalOption && axis.tickInterval < minTickIntervalOption) {
+ axis.tickInterval = minTickIntervalOption;
+ }
+
+ // for linear axes, get magnitude and normalize the interval
+ if (!isDatetimeAxis && !isLog) { // linear
+ if (!tickIntervalOption) {
+ axis.tickInterval = normalizeTickInterval(axis.tickInterval, null, getMagnitude(axis.tickInterval), options);
+ }
+ }
+
+ // get minorTickInterval
+ axis.minorTickInterval = options.minorTickInterval === 'auto' && axis.tickInterval ?
+ axis.tickInterval / 5 : options.minorTickInterval;
+
+ // find the tick positions
+ axis.tickPositions = tickPositions = options.tickPositions ?
+ [].concat(options.tickPositions) : // Work on a copy (#1565)
+ (tickPositioner && tickPositioner.apply(axis, [axis.min, axis.max]));
+ if (!tickPositions) {
+
+ // Too many ticks
+ if (!axis.ordinalPositions && (axis.max - axis.min) / axis.tickInterval > mathMax(2 * axis.len, 200)) {
+ error(19, true);
+ }
+
+ if (isDatetimeAxis) {
+ tickPositions = axis.getTimeTicks(
+ axis.normalizeTimeTickInterval(axis.tickInterval, options.units),
+ axis.min,
+ axis.max,
+ options.startOfWeek,
+ axis.ordinalPositions,
+ axis.closestPointRange,
+ true
+ );
+ } else if (isLog) {
+ tickPositions = axis.getLogTickPositions(axis.tickInterval, axis.min, axis.max);
+ } else {
+ tickPositions = axis.getLinearTickPositions(axis.tickInterval, axis.min, axis.max);
+ }
+
+ if (keepTwoTicksOnly) {
+ tickPositions.splice(1, tickPositions.length - 2);
+ }
+
+ axis.tickPositions = tickPositions;
+ }
+
+ if (!isLinked) {
+
+ // reset min/max or remove extremes based on start/end on tick
+ var roundedMin = tickPositions[0],
+ roundedMax = tickPositions[tickPositions.length - 1],
+ minPointOffset = axis.minPointOffset || 0,
+ singlePad;
+
+ // Prevent all ticks from being removed (#3195)
+ if (!startOnTick && !endOnTick && !categories && tickPositions.length === 2) {
+ tickPositions.splice(1, 0, (roundedMax + roundedMin) / 2);
+ }
+
+ if (startOnTick) {
+ axis.min = roundedMin;
+ } else if (axis.min - minPointOffset > roundedMin) {
+ tickPositions.shift();
+ }
+
+ if (endOnTick) {
+ axis.max = roundedMax;
+ } else if (axis.max + minPointOffset < roundedMax) {
+ tickPositions.pop();
+ }
+
+ // When there is only one point, or all points have the same value on this axis, then min
+ // and max are equal and tickPositions.length is 0 or 1. In this case, add some padding
+ // in order to center the point, but leave it with one tick. #1337.
+ if (tickPositions.length === 1) {
+ singlePad = mathAbs(axis.max) > 10e12 ? 1 : 0.001; // The lowest possible number to avoid extra padding on columns (#2619, #2846)
+ axis.min -= singlePad;
+ axis.max += singlePad;
+ }
+ }
+ },
+
+ /**
+ * Set the max ticks of either the x and y axis collection
+ */
+ setMaxTicks: function () {
+
+ var chart = this.chart,
+ maxTicks = chart.maxTicks || {},
+ tickPositions = this.tickPositions,
+ key = this._maxTicksKey = [this.coll, this.pos, this.len].join('-');
+
+ if (!this.isLinked && !this.isDatetimeAxis && tickPositions && tickPositions.length > (maxTicks[key] || 0) && this.options.alignTicks !== false) {
+ maxTicks[key] = tickPositions.length;
+ }
+ chart.maxTicks = maxTicks;
+ },
+
+ /**
+ * When using multiple axes, adjust the number of ticks to match the highest
+ * number of ticks in that group
+ */
+ adjustTickAmount: function () {
+ var axis = this,
+ chart = axis.chart,
+ key = axis._maxTicksKey,
+ tickPositions = axis.tickPositions,
+ maxTicks = chart.maxTicks;
+
+ if (maxTicks && maxTicks[key] && !axis.isDatetimeAxis && !axis.categories && !axis.isLinked &&
+ axis.options.alignTicks !== false && this.min !== UNDEFINED) {
+ var oldTickAmount = axis.tickAmount,
+ calculatedTickAmount = tickPositions.length,
+ tickAmount;
+
+ // set the axis-level tickAmount to use below
+ axis.tickAmount = tickAmount = maxTicks[key];
+
+ if (calculatedTickAmount < tickAmount) {
+ while (tickPositions.length < tickAmount) {
+ tickPositions.push(correctFloat(
+ tickPositions[tickPositions.length - 1] + axis.tickInterval
+ ));
+ }
+ axis.transA *= (calculatedTickAmount - 1) / (tickAmount - 1);
+ axis.max = tickPositions[tickPositions.length - 1];
+
+ }
+ if (defined(oldTickAmount) && tickAmount !== oldTickAmount) {
+ axis.isDirty = true;
+ }
+ }
+ },
+
+ /**
+ * Set the scale based on data min and max, user set min and max or options
+ *
+ */
+ setScale: function () {
+ var axis = this,
+ stacks = axis.stacks,
+ type,
+ i,
+ isDirtyData,
+ isDirtyAxisLength;
+
+ axis.oldMin = axis.min;
+ axis.oldMax = axis.max;
+ axis.oldAxisLength = axis.len;
+
+ // set the new axisLength
+ axis.setAxisSize();
+ //axisLength = horiz ? axisWidth : axisHeight;
+ isDirtyAxisLength = axis.len !== axis.oldAxisLength;
+
+ // is there new data?
+ each(axis.series, function (series) {
+ if (series.isDirtyData || series.isDirty ||
+ series.xAxis.isDirty) { // when x axis is dirty, we need new data extremes for y as well
+ isDirtyData = true;
+ }
+ });
+
+ // do we really need to go through all this?
+ if (isDirtyAxisLength || isDirtyData || axis.isLinked || axis.forceRedraw ||
+ axis.userMin !== axis.oldUserMin || axis.userMax !== axis.oldUserMax) {
+
+ // reset stacks
+ if (!axis.isXAxis) {
+ for (type in stacks) {
+ for (i in stacks[type]) {
+ stacks[type][i].total = null;
+ stacks[type][i].cum = 0;
+ }
+ }
+ }
+
+ axis.forceRedraw = false;
+
+ // get data extremes if needed
+ axis.getSeriesExtremes();
+
+ // get fixed positions based on tickInterval
+ axis.setTickPositions();
+
+ // record old values to decide whether a rescale is necessary later on (#540)
+ axis.oldUserMin = axis.userMin;
+ axis.oldUserMax = axis.userMax;
+
+ // Mark as dirty if it is not already set to dirty and extremes have changed. #595.
+ if (!axis.isDirty) {
+ axis.isDirty = isDirtyAxisLength || axis.min !== axis.oldMin || axis.max !== axis.oldMax;
+ }
+ } else if (!axis.isXAxis) {
+ if (axis.oldStacks) {
+ stacks = axis.stacks = axis.oldStacks;
+ }
+
+ // reset stacks
+ for (type in stacks) {
+ for (i in stacks[type]) {
+ stacks[type][i].cum = stacks[type][i].total;
+ }
+ }
+ }
+
+ // Set the maximum tick amount
+ axis.setMaxTicks();
+ },
+
+ /**
+ * Set the extremes and optionally redraw
+ * @param {Number} newMin
+ * @param {Number} newMax
+ * @param {Boolean} redraw
+ * @param {Boolean|Object} animation Whether to apply animation, and optionally animation
+ * configuration
+ * @param {Object} eventArguments
+ *
+ */
+ setExtremes: function (newMin, newMax, redraw, animation, eventArguments) {
+ var axis = this,
+ chart = axis.chart;
+
+ redraw = pick(redraw, true); // defaults to true
+
+ // Extend the arguments with min and max
+ eventArguments = extend(eventArguments, {
+ min: newMin,
+ max: newMax
+ });
+
+ // Fire the event
+ fireEvent(axis, 'setExtremes', eventArguments, function () { // the default event handler
+
+ axis.userMin = newMin;
+ axis.userMax = newMax;
+ axis.eventArgs = eventArguments;
+
+ // Mark for running afterSetExtremes
+ axis.isDirtyExtremes = true;
+
+ // redraw
+ if (redraw) {
+ chart.redraw(animation);
+ }
+ });
+ },
+
+ /**
+ * Overridable method for zooming chart. Pulled out in a separate method to allow overriding
+ * in stock charts.
+ */
+ zoom: function (newMin, newMax) {
+ var dataMin = this.dataMin,
+ dataMax = this.dataMax,
+ options = this.options;
+
+ // Prevent pinch zooming out of range. Check for defined is for #1946. #1734.
+ if (!this.allowZoomOutside) {
+ if (defined(dataMin) && newMin <= mathMin(dataMin, pick(options.min, dataMin))) {
+ newMin = UNDEFINED;
+ }
+ if (defined(dataMax) && newMax >= mathMax(dataMax, pick(options.max, dataMax))) {
+ newMax = UNDEFINED;
+ }
+ }
+
+ // In full view, displaying the reset zoom button is not required
+ this.displayBtn = newMin !== UNDEFINED || newMax !== UNDEFINED;
+
+ // Do it
+ this.setExtremes(
+ newMin,
+ newMax,
+ false,
+ UNDEFINED,
+ { trigger: 'zoom' }
+ );
+ return true;
+ },
+
+ /**
+ * Update the axis metrics
+ */
+ setAxisSize: function () {
+ var chart = this.chart,
+ options = this.options,
+ offsetLeft = options.offsetLeft || 0,
+ offsetRight = options.offsetRight || 0,
+ horiz = this.horiz,
+ width = pick(options.width, chart.plotWidth - offsetLeft + offsetRight),
+ height = pick(options.height, chart.plotHeight),
+ top = pick(options.top, chart.plotTop),
+ left = pick(options.left, chart.plotLeft + offsetLeft),
+ percentRegex = /%$/;
+
+ // Check for percentage based input values
+ if (percentRegex.test(height)) {
+ height = parseInt(height, 10) / 100 * chart.plotHeight;
+ }
+ if (percentRegex.test(top)) {
+ top = parseInt(top, 10) / 100 * chart.plotHeight + chart.plotTop;
+ }
+
+ // Expose basic values to use in Series object and navigator
+ this.left = left;
+ this.top = top;
+ this.width = width;
+ this.height = height;
+ this.bottom = chart.chartHeight - height - top;
+ this.right = chart.chartWidth - width - left;
+
+ // Direction agnostic properties
+ this.len = mathMax(horiz ? width : height, 0); // mathMax fixes #905
+ this.pos = horiz ? left : top; // distance from SVG origin
+ },
+
+ /**
+ * Get the actual axis extremes
+ */
+ getExtremes: function () {
+ var axis = this,
+ isLog = axis.isLog;
+
+ return {
+ min: isLog ? correctFloat(lin2log(axis.min)) : axis.min,
+ max: isLog ? correctFloat(lin2log(axis.max)) : axis.max,
+ dataMin: axis.dataMin,
+ dataMax: axis.dataMax,
+ userMin: axis.userMin,
+ userMax: axis.userMax
+ };
+ },
+
+ /**
+ * Get the zero plane either based on zero or on the min or max value.
+ * Used in bar and area plots
+ */
+ getThreshold: function (threshold) {
+ var axis = this,
+ isLog = axis.isLog;
+
+ var realMin = isLog ? lin2log(axis.min) : axis.min,
+ realMax = isLog ? lin2log(axis.max) : axis.max;
+
+ if (realMin > threshold || threshold === null) {
+ threshold = realMin;
+ } else if (realMax < threshold) {
+ threshold = realMax;
+ }
+
+ return axis.translate(threshold, 0, 1, 0, 1);
+ },
+
+ /**
+ * Compute auto alignment for the axis label based on which side the axis is on
+ * and the given rotation for the label
+ */
+ autoLabelAlign: function (rotation) {
+ var ret,
+ angle = (pick(rotation, 0) - (this.side * 90) + 720) % 360;
+
+ if (angle > 15 && angle < 165) {
+ ret = 'right';
+ } else if (angle > 195 && angle < 345) {
+ ret = 'left';
+ } else {
+ ret = 'center';
+ }
+ return ret;
+ },
+
+ /**
+ * Render the tick labels to a preliminary position to get their sizes
+ */
+ getOffset: function () {
+ var axis = this,
+ chart = axis.chart,
+ renderer = chart.renderer,
+ options = axis.options,
+ tickPositions = axis.tickPositions,
+ ticks = axis.ticks,
+ horiz = axis.horiz,
+ side = axis.side,
+ invertedSide = chart.inverted ? [1, 0, 3, 2][side] : side,
+ hasData,
+ showAxis,
+ titleOffset = 0,
+ titleOffsetOption,
+ titleMargin = 0,
+ axisTitleOptions = options.title,
+ labelOptions = options.labels,
+ labelOffset = 0, // reset
+ labelOffsetPadded,
+ axisOffset = chart.axisOffset,
+ clipOffset = chart.clipOffset,
+ directionFactor = [-1, 1, 1, -1][side],
+ n,
+ i,
+ autoStaggerLines = 1,
+ maxStaggerLines = pick(labelOptions.maxStaggerLines, 5),
+ sortedPositions,
+ lastRight,
+ overlap,
+ pos,
+ bBox,
+ x,
+ w,
+ lineNo,
+ lineHeightCorrection;
+
+ // For reuse in Axis.render
+ axis.hasData = hasData = (axis.hasVisibleSeries || (defined(axis.min) && defined(axis.max) && !!tickPositions));
+ axis.showAxis = showAxis = hasData || pick(options.showEmpty, true);
+
+ // Set/reset staggerLines
+ axis.staggerLines = axis.horiz && labelOptions.staggerLines;
+
+ // Create the axisGroup and gridGroup elements on first iteration
+ if (!axis.axisGroup) {
+ axis.gridGroup = renderer.g('grid')
+ .attr({ zIndex: options.gridZIndex || 1 })
+ .add();
+ axis.axisGroup = renderer.g('axis')
+ .attr({ zIndex: options.zIndex || 2 })
+ .add();
+ axis.labelGroup = renderer.g('axis-labels')
+ .attr({ zIndex: labelOptions.zIndex || 7 })
+ .addClass(PREFIX + axis.coll.toLowerCase() + '-labels')
+ .add();
+ }
+
+ if (hasData || axis.isLinked) {
+
+ // Set the explicit or automatic label alignment
+ axis.labelAlign = pick(labelOptions.align || axis.autoLabelAlign(labelOptions.rotation));
+
+ // Generate ticks
+ each(tickPositions, function (pos) {
+ if (!ticks[pos]) {
+ ticks[pos] = new Tick(axis, pos);
+ } else {
+ ticks[pos].addLabel(); // update labels depending on tick interval
+ }
+ });
+
+ // Handle automatic stagger lines
+ if (axis.horiz && !axis.staggerLines && maxStaggerLines && !labelOptions.rotation) {
+ sortedPositions = axis.reversed ? [].concat(tickPositions).reverse() : tickPositions;
+ while (autoStaggerLines < maxStaggerLines) {
+ lastRight = [];
+ overlap = false;
+
+ for (i = 0; i < sortedPositions.length; i++) {
+ pos = sortedPositions[i];
+ bBox = ticks[pos].label && ticks[pos].label.getBBox();
+ w = bBox ? bBox.width : 0;
+ lineNo = i % autoStaggerLines;
+
+ if (w) {
+ x = axis.translate(pos); // don't handle log
+ if (lastRight[lineNo] !== UNDEFINED && x < lastRight[lineNo]) {
+ overlap = true;
+ }
+ lastRight[lineNo] = x + w;
+ }
+ }
+ if (overlap) {
+ autoStaggerLines++;
+ } else {
+ break;
+ }
+ }
+
+ if (autoStaggerLines > 1) {
+ axis.staggerLines = autoStaggerLines;
+ }
+ }
+
+
+ each(tickPositions, function (pos) {
+ // left side must be align: right and right side must have align: left for labels
+ if (side === 0 || side === 2 || { 1: 'left', 3: 'right' }[side] === axis.labelAlign) {
+
+ // get the highest offset
+ labelOffset = mathMax(
+ ticks[pos].getLabelSize(),
+ labelOffset
+ );
+ }
+ });
+
+ if (axis.staggerLines) {
+ labelOffset *= axis.staggerLines;
+ axis.labelOffset = labelOffset;
+ }
+
+
+ } else { // doesn't have data
+ for (n in ticks) {
+ ticks[n].destroy();
+ delete ticks[n];
+ }
+ }
+
+ if (axisTitleOptions && axisTitleOptions.text && axisTitleOptions.enabled !== false) {
+ if (!axis.axisTitle) {
+ axis.axisTitle = renderer.text(
+ axisTitleOptions.text,
+ 0,
+ 0,
+ axisTitleOptions.useHTML
+ )
+ .attr({
+ zIndex: 7,
+ rotation: axisTitleOptions.rotation || 0,
+ align:
+ axisTitleOptions.textAlign ||
+ { low: 'left', middle: 'center', high: 'right' }[axisTitleOptions.align]
+ })
+ .addClass(PREFIX + this.coll.toLowerCase() + '-title')
+ .css(axisTitleOptions.style)
+ .add(axis.axisGroup);
+ axis.axisTitle.isNew = true;
+ }
+
+ if (showAxis) {
+ titleOffset = axis.axisTitle.getBBox()[horiz ? 'height' : 'width'];
+ titleOffsetOption = axisTitleOptions.offset;
+ titleMargin = defined(titleOffsetOption) ? 0 : pick(axisTitleOptions.margin, horiz ? 5 : 10);
+ }
+
+ // hide or show the title depending on whether showEmpty is set
+ axis.axisTitle[showAxis ? 'show' : 'hide']();
+ }
+
+ // handle automatic or user set offset
+ axis.offset = directionFactor * pick(options.offset, axisOffset[side]);
+
+ lineHeightCorrection = side === 2 ? axis.tickBaseline : 0;
+ labelOffsetPadded = labelOffset + titleMargin +
+ (labelOffset && (directionFactor * (horiz ? pick(labelOptions.y, axis.tickBaseline + 8) : labelOptions.x) - lineHeightCorrection));
+ axis.axisTitleMargin = pick(titleOffsetOption, labelOffsetPadded);
+
+ axisOffset[side] = mathMax(
+ axisOffset[side],
+ axis.axisTitleMargin + titleOffset + directionFactor * axis.offset,
+ labelOffsetPadded // #3027
+ );
+ clipOffset[invertedSide] = mathMax(clipOffset[invertedSide], mathFloor(options.lineWidth / 2) * 2);
+ },
+
+ /**
+ * Get the path for the axis line
+ */
+ getLinePath: function (lineWidth) {
+ var chart = this.chart,
+ opposite = this.opposite,
+ offset = this.offset,
+ horiz = this.horiz,
+ lineLeft = this.left + (opposite ? this.width : 0) + offset,
+ lineTop = chart.chartHeight - this.bottom - (opposite ? this.height : 0) + offset;
+
+ if (opposite) {
+ lineWidth *= -1; // crispify the other way - #1480, #1687
+ }
+
+ return chart.renderer.crispLine([
+ M,
+ horiz ?
+ this.left :
+ lineLeft,
+ horiz ?
+ lineTop :
+ this.top,
+ L,
+ horiz ?
+ chart.chartWidth - this.right :
+ lineLeft,
+ horiz ?
+ lineTop :
+ chart.chartHeight - this.bottom
+ ], lineWidth);
+ },
+
+ /**
+ * Position the title
+ */
+ getTitlePosition: function () {
+ // compute anchor points for each of the title align options
+ var horiz = this.horiz,
+ axisLeft = this.left,
+ axisTop = this.top,
+ axisLength = this.len,
+ axisTitleOptions = this.options.title,
+ margin = horiz ? axisLeft : axisTop,
+ opposite = this.opposite,
+ offset = this.offset,
+ fontSize = pInt(axisTitleOptions.style.fontSize || 12),
+
+ // the position in the length direction of the axis
+ alongAxis = {
+ low: margin + (horiz ? 0 : axisLength),
+ middle: margin + axisLength / 2,
+ high: margin + (horiz ? axisLength : 0)
+ }[axisTitleOptions.align],
+
+ // the position in the perpendicular direction of the axis
+ offAxis = (horiz ? axisTop + this.height : axisLeft) +
+ (horiz ? 1 : -1) * // horizontal axis reverses the margin
+ (opposite ? -1 : 1) * // so does opposite axes
+ this.axisTitleMargin +
+ (this.side === 2 ? fontSize : 0);
+
+ return {
+ x: horiz ?
+ alongAxis :
+ offAxis + (opposite ? this.width : 0) + offset +
+ (axisTitleOptions.x || 0), // x
+ y: horiz ?
+ offAxis - (opposite ? this.height : 0) + offset :
+ alongAxis + (axisTitleOptions.y || 0) // y
+ };
+ },
+
+ /**
+ * Render the axis
+ */
+ render: function () {
+ var axis = this,
+ horiz = axis.horiz,
+ reversed = axis.reversed,
+ chart = axis.chart,
+ renderer = chart.renderer,
+ options = axis.options,
+ isLog = axis.isLog,
+ isLinked = axis.isLinked,
+ tickPositions = axis.tickPositions,
+ sortedPositions,
+ axisTitle = axis.axisTitle,
+ ticks = axis.ticks,
+ minorTicks = axis.minorTicks,
+ alternateBands = axis.alternateBands,
+ stackLabelOptions = options.stackLabels,
+ alternateGridColor = options.alternateGridColor,
+ tickmarkOffset = axis.tickmarkOffset,
+ lineWidth = options.lineWidth,
+ linePath,
+ hasRendered = chart.hasRendered,
+ slideInTicks = hasRendered && defined(axis.oldMin) && !isNaN(axis.oldMin),
+ hasData = axis.hasData,
+ showAxis = axis.showAxis,
+ from,
+ overflow = options.labels.overflow,
+ justifyLabels = axis.justifyLabels = horiz && overflow !== false,
+ to;
+
+ // Reset
+ axis.labelEdge.length = 0;
+ axis.justifyToPlot = overflow === 'justify';
+
+ // Mark all elements inActive before we go over and mark the active ones
+ each([ticks, minorTicks, alternateBands], function (coll) {
+ var pos;
+ for (pos in coll) {
+ coll[pos].isActive = false;
+ }
+ });
+
+ // If the series has data draw the ticks. Else only the line and title
+ if (hasData || isLinked) {
+
+ // minor ticks
+ if (axis.minorTickInterval && !axis.categories) {
+ each(axis.getMinorTickPositions(), function (pos) {
+ if (!minorTicks[pos]) {
+ minorTicks[pos] = new Tick(axis, pos, 'minor');
+ }
+
+ // render new ticks in old position
+ if (slideInTicks && minorTicks[pos].isNew) {
+ minorTicks[pos].render(null, true);
+ }
+
+ minorTicks[pos].render(null, false, 1);
+ });
+ }
+
+ // Major ticks. Pull out the first item and render it last so that
+ // we can get the position of the neighbour label. #808.
+ if (tickPositions.length) { // #1300
+ sortedPositions = tickPositions.slice();
+ if ((horiz && reversed) || (!horiz && !reversed)) {
+ sortedPositions.reverse();
+ }
+ if (justifyLabels) {
+ sortedPositions = sortedPositions.slice(1).concat([sortedPositions[0]]);
+ }
+ each(sortedPositions, function (pos, i) {
+
+ // Reorganize the indices
+ if (justifyLabels) {
+ i = (i === sortedPositions.length - 1) ? 0 : i + 1;
+ }
+
+ // linked axes need an extra check to find out if
+ if (!isLinked || (pos >= axis.min && pos <= axis.max)) {
+
+ if (!ticks[pos]) {
+ ticks[pos] = new Tick(axis, pos);
+ }
+
+ // render new ticks in old position
+ if (slideInTicks && ticks[pos].isNew) {
+ ticks[pos].render(i, true, 0.1);
+ }
+
+ ticks[pos].render(i);
+ }
+
+ });
+ // In a categorized axis, the tick marks are displayed between labels. So
+ // we need to add a tick mark and grid line at the left edge of the X axis.
+ if (tickmarkOffset && axis.min === 0) {
+ if (!ticks[-1]) {
+ ticks[-1] = new Tick(axis, -1, null, true);
+ }
+ ticks[-1].render(-1);
+ }
+
+ }
+
+ // alternate grid color
+ if (alternateGridColor) {
+ each(tickPositions, function (pos, i) {
+ if (i % 2 === 0 && pos < axis.max) {
+ if (!alternateBands[pos]) {
+ alternateBands[pos] = new Highcharts.PlotLineOrBand(axis);
+ }
+ from = pos + tickmarkOffset; // #949
+ to = tickPositions[i + 1] !== UNDEFINED ? tickPositions[i + 1] + tickmarkOffset : axis.max;
+ alternateBands[pos].options = {
+ from: isLog ? lin2log(from) : from,
+ to: isLog ? lin2log(to) : to,
+ color: alternateGridColor
+ };
+ alternateBands[pos].render();
+ alternateBands[pos].isActive = true;
+ }
+ });
+ }
+
+ // custom plot lines and bands
+ if (!axis._addedPlotLB) { // only first time
+ each((options.plotLines || []).concat(options.plotBands || []), function (plotLineOptions) {
+ axis.addPlotBandOrLine(plotLineOptions);
+ });
+ axis._addedPlotLB = true;
+ }
+
+ } // end if hasData
+
+ // Remove inactive ticks
+ each([ticks, minorTicks, alternateBands], function (coll) {
+ var pos,
+ i,
+ forDestruction = [],
+ delay = globalAnimation ? globalAnimation.duration || 500 : 0,
+ destroyInactiveItems = function () {
+ i = forDestruction.length;
+ while (i--) {
+ // When resizing rapidly, the same items may be destroyed in different timeouts,
+ // or the may be reactivated
+ if (coll[forDestruction[i]] && !coll[forDestruction[i]].isActive) {
+ coll[forDestruction[i]].destroy();
+ delete coll[forDestruction[i]];
+ }
+ }
+
+ };
+
+ for (pos in coll) {
+
+ if (!coll[pos].isActive) {
+ // Render to zero opacity
+ coll[pos].render(pos, false, 0);
+ coll[pos].isActive = false;
+ forDestruction.push(pos);
+ }
+ }
+
+ // When the objects are finished fading out, destroy them
+ if (coll === alternateBands || !chart.hasRendered || !delay) {
+ destroyInactiveItems();
+ } else if (delay) {
+ setTimeout(destroyInactiveItems, delay);
+ }
+ });
+
+ // Static items. As the axis group is cleared on subsequent calls
+ // to render, these items are added outside the group.
+ // axis line
+ if (lineWidth) {
+ linePath = axis.getLinePath(lineWidth);
+ if (!axis.axisLine) {
+ axis.axisLine = renderer.path(linePath)
+ .attr({
+ stroke: options.lineColor,
+ 'stroke-width': lineWidth,
+ zIndex: 7
+ })
+ .add(axis.axisGroup);
+ } else {
+ axis.axisLine.animate({ d: linePath });
+ }
+
+ // show or hide the line depending on options.showEmpty
+ axis.axisLine[showAxis ? 'show' : 'hide']();
+ }
+
+ if (axisTitle && showAxis) {
+
+ axisTitle[axisTitle.isNew ? 'attr' : 'animate'](
+ axis.getTitlePosition()
+ );
+ axisTitle.isNew = false;
+ }
+
+ // Stacked totals:
+ if (stackLabelOptions && stackLabelOptions.enabled) {
+ axis.renderStackTotals();
+ }
+ // End stacked totals
+
+ axis.isDirty = false;
+ },
+
+ /**
+ * Redraw the axis to reflect changes in the data or axis extremes
+ */
+ redraw: function () {
+
+ // render the axis
+ this.render();
+
+ // move plot lines and bands
+ each(this.plotLinesAndBands, function (plotLine) {
+ plotLine.render();
+ });
+
+ // mark associated series as dirty and ready for redraw
+ each(this.series, function (series) {
+ series.isDirty = true;
+ });
+
+ },
+
+ /**
+ * Destroys an Axis instance.
+ */
+ destroy: function (keepEvents) {
+ var axis = this,
+ stacks = axis.stacks,
+ stackKey,
+ plotLinesAndBands = axis.plotLinesAndBands,
+ i;
+
+ // Remove the events
+ if (!keepEvents) {
+ removeEvent(axis);
+ }
+
+ // Destroy each stack total
+ for (stackKey in stacks) {
+ destroyObjectProperties(stacks[stackKey]);
+
+ stacks[stackKey] = null;
+ }
+
+ // Destroy collections
+ each([axis.ticks, axis.minorTicks, axis.alternateBands], function (coll) {
+ destroyObjectProperties(coll);
+ });
+ i = plotLinesAndBands.length;
+ while (i--) { // #1975
+ plotLinesAndBands[i].destroy();
+ }
+
+ // Destroy local variables
+ each(['stackTotalGroup', 'axisLine', 'axisTitle', 'axisGroup', 'cross', 'gridGroup', 'labelGroup'], function (prop) {
+ if (axis[prop]) {
+ axis[prop] = axis[prop].destroy();
+ }
+ });
+
+ // Destroy crosshair
+ if (this.cross) {
+ this.cross.destroy();
+ }
+ },
+
+ /**
+ * Draw the crosshair
+ */
+ drawCrosshair: function (e, point) {
+ if (!this.crosshair) { return; }// Do not draw crosshairs if you don't have too.
+
+ if ((defined(point) || !pick(this.crosshair.snap, true)) === false) {
+ this.hideCrosshair();
+ return;
+ }
+
+ var path,
+ options = this.crosshair,
+ animation = options.animation,
+ pos;
+
+ // Get the path
+ if (!pick(options.snap, true)) {
+ pos = (this.horiz ? e.chartX - this.pos : this.len - e.chartY + this.pos);
+ } else if (defined(point)) {
+ /*jslint eqeq: true*/
+ pos = (this.chart.inverted != this.horiz) ? point.plotX : this.len - point.plotY;
+ /*jslint eqeq: false*/
+ }
+
+ if (this.isRadial) {
+ path = this.getPlotLinePath(this.isXAxis ? point.x : pick(point.stackY, point.y));
+ } else {
+ path = this.getPlotLinePath(null, null, null, null, pos);
+ }
+
+ if (path === null) {
+ this.hideCrosshair();
+ return;
+ }
+
+ // Draw the cross
+ if (this.cross) {
+ this.cross
+ .attr({ visibility: VISIBLE })[animation ? 'animate' : 'attr']({ d: path }, animation);
+ } else {
+ var attribs = {
+ 'stroke-width': options.width || 1,
+ stroke: options.color || '#C0C0C0',
+ zIndex: options.zIndex || 2
+ };
+ if (options.dashStyle) {
+ attribs.dashstyle = options.dashStyle;
+ }
+ this.cross = this.chart.renderer.path(path).attr(attribs).add();
+ }
+ },
+
+ /**
+ * Hide the crosshair.
+ */
+ hideCrosshair: function () {
+ if (this.cross) {
+ this.cross.hide();
+ }
+ }
+}; // end Axis
+
+extend(Axis.prototype, AxisPlotLineOrBandExtension);
+
+/**
+ * Set the tick positions to a time unit that makes sense, for example
+ * on the first of each month or on every Monday. Return an array
+ * with the time positions. Used in datetime axes as well as for grouping
+ * data on a datetime axis.
+ *
+ * @param {Object} normalizedInterval The interval in axis values (ms) and the count
+ * @param {Number} min The minimum in axis values
+ * @param {Number} max The maximum in axis values
+ * @param {Number} startOfWeek
+ */
+Axis.prototype.getTimeTicks = function (normalizedInterval, min, max, startOfWeek) {
+ var tickPositions = [],
+ i,
+ higherRanks = {},
+ useUTC = defaultOptions.global.useUTC,
+ minYear, // used in months and years as a basis for Date.UTC()
+ minDate = new Date(min - timezoneOffset),
+ interval = normalizedInterval.unitRange,
+ count = normalizedInterval.count;
+
+ if (defined(min)) { // #1300
+ if (interval >= timeUnits.second) { // second
+ minDate.setMilliseconds(0);
+ minDate.setSeconds(interval >= timeUnits.minute ? 0 :
+ count * mathFloor(minDate.getSeconds() / count));
+ }
+
+ if (interval >= timeUnits.minute) { // minute
+ minDate[setMinutes](interval >= timeUnits.hour ? 0 :
+ count * mathFloor(minDate[getMinutes]() / count));
+ }
+
+ if (interval >= timeUnits.hour) { // hour
+ minDate[setHours](interval >= timeUnits.day ? 0 :
+ count * mathFloor(minDate[getHours]() / count));
+ }
+
+ if (interval >= timeUnits.day) { // day
+ minDate[setDate](interval >= timeUnits.month ? 1 :
+ count * mathFloor(minDate[getDate]() / count));
+ }
+
+ if (interval >= timeUnits.month) { // month
+ minDate[setMonth](interval >= timeUnits.year ? 0 :
+ count * mathFloor(minDate[getMonth]() / count));
+ minYear = minDate[getFullYear]();
+ }
+
+ if (interval >= timeUnits.year) { // year
+ minYear -= minYear % count;
+ minDate[setFullYear](minYear);
+ }
+
+ // week is a special case that runs outside the hierarchy
+ if (interval === timeUnits.week) {
+ // get start of current week, independent of count
+ minDate[setDate](minDate[getDate]() - minDate[getDay]() +
+ pick(startOfWeek, 1));
+ }
+
+
+ // get tick positions
+ i = 1;
+ if (timezoneOffset) {
+ minDate = new Date(minDate.getTime() + timezoneOffset);
+ }
+ minYear = minDate[getFullYear]();
+ var time = minDate.getTime(),
+ minMonth = minDate[getMonth](),
+ minDateDate = minDate[getDate](),
+ localTimezoneOffset = useUTC ?
+ timezoneOffset :
+ (24 * 3600 * 1000 + minDate.getTimezoneOffset() * 60 * 1000) % (24 * 3600 * 1000); // #950
+
+ // iterate and add tick positions at appropriate values
+ while (time < max) {
+ tickPositions.push(time);
+
+ // if the interval is years, use Date.UTC to increase years
+ if (interval === timeUnits.year) {
+ time = makeTime(minYear + i * count, 0);
+
+ // if the interval is months, use Date.UTC to increase months
+ } else if (interval === timeUnits.month) {
+ time = makeTime(minYear, minMonth + i * count);
+
+ // if we're using global time, the interval is not fixed as it jumps
+ // one hour at the DST crossover
+ } else if (!useUTC && (interval === timeUnits.day || interval === timeUnits.week)) {
+ time = makeTime(minYear, minMonth, minDateDate +
+ i * count * (interval === timeUnits.day ? 1 : 7));
+
+ // else, the interval is fixed and we use simple addition
+ } else {
+ time += interval * count;
+ }
+
+ i++;
+ }
+
+ // push the last time
+ tickPositions.push(time);
+
+
+ // mark new days if the time is dividible by day (#1649, #1760)
+ each(grep(tickPositions, function (time) {
+ return interval <= timeUnits.hour && time % timeUnits.day === localTimezoneOffset;
+ }), function (time) {
+ higherRanks[time] = 'day';
+ });
+ }
+
+
+ // record information on the chosen unit - for dynamic label formatter
+ tickPositions.info = extend(normalizedInterval, {
+ higherRanks: higherRanks,
+ totalRange: interval * count
+ });
+
+ return tickPositions;
+};
+
+/**
+ * Get a normalized tick interval for dates. Returns a configuration object with
+ * unit range (interval), count and name. Used to prepare data for getTimeTicks.
+ * Previously this logic was part of getTimeTicks, but as getTimeTicks now runs
+ * of segments in stock charts, the normalizing logic was extracted in order to
+ * prevent it for running over again for each segment having the same interval.
+ * #662, #697.
+ */
+Axis.prototype.normalizeTimeTickInterval = function (tickInterval, unitsOption) {
+ var units = unitsOption || [[
+ 'millisecond', // unit name
+ [1, 2, 5, 10, 20, 25, 50, 100, 200, 500] // allowed multiples
+ ], [
+ 'second',
+ [1, 2, 5, 10, 15, 30]
+ ], [
+ 'minute',
+ [1, 2, 5, 10, 15, 30]
+ ], [
+ 'hour',
+ [1, 2, 3, 4, 6, 8, 12]
+ ], [
+ 'day',
+ [1, 2]
+ ], [
+ 'week',
+ [1, 2]
+ ], [
+ 'month',
+ [1, 2, 3, 4, 6]
+ ], [
+ 'year',
+ null
+ ]],
+ unit = units[units.length - 1], // default unit is years
+ interval = timeUnits[unit[0]],
+ multiples = unit[1],
+ count,
+ i;
+
+ // loop through the units to find the one that best fits the tickInterval
+ for (i = 0; i < units.length; i++) {
+ unit = units[i];
+ interval = timeUnits[unit[0]];
+ multiples = unit[1];
+
+
+ if (units[i + 1]) {
+ // lessThan is in the middle between the highest multiple and the next unit.
+ var lessThan = (interval * multiples[multiples.length - 1] +
+ timeUnits[units[i + 1][0]]) / 2;
+
+ // break and keep the current unit
+ if (tickInterval <= lessThan) {
+ break;
+ }
+ }
+ }
+
+ // prevent 2.5 years intervals, though 25, 250 etc. are allowed
+ if (interval === timeUnits.year && tickInterval < 5 * interval) {
+ multiples = [1, 2, 5];
+ }
+
+ // get the count
+ count = normalizeTickInterval(
+ tickInterval / interval,
+ multiples,
+ unit[0] === 'year' ? mathMax(getMagnitude(tickInterval / interval), 1) : 1 // #1913, #2360
+ );
+
+ return {
+ unitRange: interval,
+ count: count,
+ unitName: unit[0]
+ };
+};/**
+ * Methods defined on the Axis prototype
+ */
+
+/**
+ * Set the tick positions of a logarithmic axis
+ */
+Axis.prototype.getLogTickPositions = function (interval, min, max, minor) {
+ var axis = this,
+ options = axis.options,
+ axisLength = axis.len,
+ // Since we use this method for both major and minor ticks,
+ // use a local variable and return the result
+ positions = [];
+
+ // Reset
+ if (!minor) {
+ axis._minorAutoInterval = null;
+ }
+
+ // First case: All ticks fall on whole logarithms: 1, 10, 100 etc.
+ if (interval >= 0.5) {
+ interval = mathRound(interval);
+ positions = axis.getLinearTickPositions(interval, min, max);
+
+ // Second case: We need intermediary ticks. For example
+ // 1, 2, 4, 6, 8, 10, 20, 40 etc.
+ } else if (interval >= 0.08) {
+ var roundedMin = mathFloor(min),
+ intermediate,
+ i,
+ j,
+ len,
+ pos,
+ lastPos,
+ break2;
+
+ if (interval > 0.3) {
+ intermediate = [1, 2, 4];
+ } else if (interval > 0.15) { // 0.2 equals five minor ticks per 1, 10, 100 etc
+ intermediate = [1, 2, 4, 6, 8];
+ } else { // 0.1 equals ten minor ticks per 1, 10, 100 etc
+ intermediate = [1, 2, 3, 4, 5, 6, 7, 8, 9];
+ }
+
+ for (i = roundedMin; i < max + 1 && !break2; i++) {
+ len = intermediate.length;
+ for (j = 0; j < len && !break2; j++) {
+ pos = log2lin(lin2log(i) * intermediate[j]);
+ if (pos > min && (!minor || lastPos <= max) && lastPos !== UNDEFINED) { // #1670, lastPos is #3113
+ positions.push(lastPos);
+ }
+
+ if (lastPos > max) {
+ break2 = true;
+ }
+ lastPos = pos;
+ }
+ }
+
+ // Third case: We are so deep in between whole logarithmic values that
+ // we might as well handle the tick positions like a linear axis. For
+ // example 1.01, 1.02, 1.03, 1.04.
+ } else {
+ var realMin = lin2log(min),
+ realMax = lin2log(max),
+ tickIntervalOption = options[minor ? 'minorTickInterval' : 'tickInterval'],
+ filteredTickIntervalOption = tickIntervalOption === 'auto' ? null : tickIntervalOption,
+ tickPixelIntervalOption = options.tickPixelInterval / (minor ? 5 : 1),
+ totalPixelLength = minor ? axisLength / axis.tickPositions.length : axisLength;
+
+ interval = pick(
+ filteredTickIntervalOption,
+ axis._minorAutoInterval,
+ (realMax - realMin) * tickPixelIntervalOption / (totalPixelLength || 1)
+ );
+
+ interval = normalizeTickInterval(
+ interval,
+ null,
+ getMagnitude(interval)
+ );
+
+ positions = map(axis.getLinearTickPositions(
+ interval,
+ realMin,
+ realMax
+ ), log2lin);
+
+ if (!minor) {
+ axis._minorAutoInterval = interval / 5;
+ }
+ }
+
+ // Set the axis-level tickInterval variable
+ if (!minor) {
+ axis.tickInterval = interval;
+ }
+ return positions;
+};/**
+ * The tooltip object
+ * @param {Object} chart The chart instance
+ * @param {Object} options Tooltip options
+ */
+var Tooltip = Highcharts.Tooltip = function () {
+ this.init.apply(this, arguments);
+};
+
+Tooltip.prototype = {
+
+ init: function (chart, options) {
+
+ var borderWidth = options.borderWidth,
+ style = options.style,
+ padding = pInt(style.padding);
+
+ // Save the chart and options
+ this.chart = chart;
+ this.options = options;
+
+ // Keep track of the current series
+ //this.currentSeries = UNDEFINED;
+
+ // List of crosshairs
+ this.crosshairs = [];
+
+ // Current values of x and y when animating
+ this.now = { x: 0, y: 0 };
+
+ // The tooltip is initially hidden
+ this.isHidden = true;
+
+
+ // create the label
+ this.label = chart.renderer.label('', 0, 0, options.shape || 'callout', null, null, options.useHTML, null, 'tooltip')
+ .attr({
+ padding: padding,
+ fill: options.backgroundColor,
+ 'stroke-width': borderWidth,
+ r: options.borderRadius,
+ zIndex: 8
+ })
+ .css(style)
+ .css({ padding: 0 }) // Remove it from VML, the padding is applied as an attribute instead (#1117)
+ .add()
+ .attr({ y: -9999 }); // #2301, #2657
+
+ // When using canVG the shadow shows up as a gray circle
+ // even if the tooltip is hidden.
+ if (!useCanVG) {
+ this.label.shadow(options.shadow);
+ }
+
+ // Public property for getting the shared state.
+ this.shared = options.shared;
+ },
+
+ /**
+ * Destroy the tooltip and its elements.
+ */
+ destroy: function () {
+ // Destroy and clear local variables
+ if (this.label) {
+ this.label = this.label.destroy();
+ }
+ clearTimeout(this.hideTimer);
+ clearTimeout(this.tooltipTimeout);
+ },
+
+ /**
+ * Provide a soft movement for the tooltip
+ *
+ * @param {Number} x
+ * @param {Number} y
+ * @private
+ */
+ move: function (x, y, anchorX, anchorY) {
+ var tooltip = this,
+ now = tooltip.now,
+ animate = tooltip.options.animation !== false && !tooltip.isHidden &&
+ // When we get close to the target position, abort animation and land on the right place (#3056)
+ (mathAbs(x - now.x) > 1 || mathAbs(y - now.y) > 1),
+ skipAnchor = tooltip.followPointer || tooltip.len > 1;
+
+ // Get intermediate values for animation
+ extend(now, {
+ x: animate ? (2 * now.x + x) / 3 : x,
+ y: animate ? (now.y + y) / 2 : y,
+ anchorX: skipAnchor ? UNDEFINED : animate ? (2 * now.anchorX + anchorX) / 3 : anchorX,
+ anchorY: skipAnchor ? UNDEFINED : animate ? (now.anchorY + anchorY) / 2 : anchorY
+ });
+
+ // Move to the intermediate value
+ tooltip.label.attr(now);
+
+
+ // Run on next tick of the mouse tracker
+ if (animate) {
+
+ // Never allow two timeouts
+ clearTimeout(this.tooltipTimeout);
+
+ // Set the fixed interval ticking for the smooth tooltip
+ this.tooltipTimeout = setTimeout(function () {
+ // The interval function may still be running during destroy, so check that the chart is really there before calling.
+ if (tooltip) {
+ tooltip.move(x, y, anchorX, anchorY);
+ }
+ }, 32);
+
+ }
+ },
+
+ /**
+ * Hide the tooltip
+ */
+ hide: function () {
+ var tooltip = this,
+ hoverPoints;
+
+ clearTimeout(this.hideTimer); // disallow duplicate timers (#1728, #1766)
+ if (!this.isHidden) {
+ hoverPoints = this.chart.hoverPoints;
+
+ this.hideTimer = setTimeout(function () {
+ tooltip.label.fadeOut();
+ tooltip.isHidden = true;
+ }, pick(this.options.hideDelay, 500));
+
+ // hide previous hoverPoints and set new
+ if (hoverPoints) {
+ each(hoverPoints, function (point) {
+ point.setState();
+ });
+ }
+
+ this.chart.hoverPoints = null;
+ }
+ },
+
+ /**
+ * Extendable method to get the anchor position of the tooltip
+ * from a point or set of points
+ */
+ getAnchor: function (points, mouseEvent) {
+ var ret,
+ chart = this.chart,
+ inverted = chart.inverted,
+ plotTop = chart.plotTop,
+ plotX = 0,
+ plotY = 0,
+ yAxis;
+
+ points = splat(points);
+
+ // Pie uses a special tooltipPos
+ ret = points[0].tooltipPos;
+
+ // When tooltip follows mouse, relate the position to the mouse
+ if (this.followPointer && mouseEvent) {
+ if (mouseEvent.chartX === UNDEFINED) {
+ mouseEvent = chart.pointer.normalize(mouseEvent);
+ }
+ ret = [
+ mouseEvent.chartX - chart.plotLeft,
+ mouseEvent.chartY - plotTop
+ ];
+ }
+ // When shared, use the average position
+ if (!ret) {
+ each(points, function (point) {
+ yAxis = point.series.yAxis;
+ plotX += point.plotX;
+ plotY += (point.plotLow ? (point.plotLow + point.plotHigh) / 2 : point.plotY) +
+ (!inverted && yAxis ? yAxis.top - plotTop : 0); // #1151
+ });
+
+ plotX /= points.length;
+ plotY /= points.length;
+
+ ret = [
+ inverted ? chart.plotWidth - plotY : plotX,
+ this.shared && !inverted && points.length > 1 && mouseEvent ?
+ mouseEvent.chartY - plotTop : // place shared tooltip next to the mouse (#424)
+ inverted ? chart.plotHeight - plotX : plotY
+ ];
+ }
+
+ return map(ret, mathRound);
+ },
+
+ /**
+ * Place the tooltip in a chart without spilling over
+ * and not covering the point it self.
+ */
+ getPosition: function (boxWidth, boxHeight, point) {
+
+ var chart = this.chart,
+ distance = this.distance,
+ ret = {},
+ swapped,
+ first = ['y', chart.chartHeight, boxHeight, point.plotY + chart.plotTop],
+ second = ['x', chart.chartWidth, boxWidth, point.plotX + chart.plotLeft],
+ // The far side is right or bottom
+ preferFarSide = point.ttBelow || (chart.inverted && !point.negative) || (!chart.inverted && point.negative),
+ /**
+ * Handle the preferred dimension. When the preferred dimension is tooltip
+ * on top or bottom of the point, it will look for space there.
+ */
+ firstDimension = function (dim, outerSize, innerSize, point) {
+ var roomLeft = innerSize < point - distance,
+ roomRight = point + distance + innerSize < outerSize,
+ alignedLeft = point - distance - innerSize,
+ alignedRight = point + distance;
+
+ if (preferFarSide && roomRight) {
+ ret[dim] = alignedRight;
+ } else if (!preferFarSide && roomLeft) {
+ ret[dim] = alignedLeft;
+ } else if (roomLeft) {
+ ret[dim] = alignedLeft;
+ } else if (roomRight) {
+ ret[dim] = alignedRight;
+ } else {
+ return false;
+ }
+ },
+ /**
+ * Handle the secondary dimension. If the preferred dimension is tooltip
+ * on top or bottom of the point, the second dimension is to align the tooltip
+ * above the point, trying to align center but allowing left or right
+ * align within the chart box.
+ */
+ secondDimension = function (dim, outerSize, innerSize, point) {
+ // Too close to the edge, return false and swap dimensions
+ if (point < distance || point > outerSize - distance) {
+ return false;
+
+ // Align left/top
+ } else if (point < innerSize / 2) {
+ ret[dim] = 1;
+ // Align right/bottom
+ } else if (point > outerSize - innerSize / 2) {
+ ret[dim] = outerSize - innerSize - 2;
+ // Align center
+ } else {
+ ret[dim] = point - innerSize / 2;
+ }
+ },
+ /**
+ * Swap the dimensions
+ */
+ swap = function (count) {
+ var temp = first;
+ first = second;
+ second = temp;
+ swapped = count;
+ },
+ run = function () {
+ if (firstDimension.apply(0, first) !== false) {
+ if (secondDimension.apply(0, second) === false && !swapped) {
+ swap(true);
+ run();
+ }
+ } else if (!swapped) {
+ swap(true);
+ run();
+ } else {
+ ret.x = ret.y = 0;
+ }
+ };
+
+ // Under these conditions, prefer the tooltip on the side of the point
+ if (chart.inverted || this.len > 1) {
+ swap();
+ }
+ run();
+
+ return ret;
+
+ },
+
+ /**
+ * In case no user defined formatter is given, this will be used. Note that the context
+ * here is an object holding point, series, x, y etc.
+ */
+ defaultFormatter: function (tooltip) {
+ var items = this.points || splat(this),
+ series = items[0].series,
+ s;
+
+ // build the header
+ s = [tooltip.tooltipHeaderFormatter(items[0])];
+
+ // build the values
+ each(items, function (item) {
+ series = item.series;
+ s.push((series.tooltipFormatter && series.tooltipFormatter(item)) ||
+ item.point.tooltipFormatter(series.tooltipOptions.pointFormat));
+ });
+
+ // footer
+ s.push(tooltip.options.footerFormat || '');
+
+ return s.join('');
+ },
+
+ /**
+ * Refresh the tooltip's text and position.
+ * @param {Object} point
+ */
+ refresh: function (point, mouseEvent) {
+ var tooltip = this,
+ chart = tooltip.chart,
+ label = tooltip.label,
+ options = tooltip.options,
+ x,
+ y,
+ anchor,
+ textConfig = {},
+ text,
+ pointConfig = [],
+ formatter = options.formatter || tooltip.defaultFormatter,
+ hoverPoints = chart.hoverPoints,
+ borderColor,
+ shared = tooltip.shared,
+ currentSeries;
+
+ clearTimeout(this.hideTimer);
+
+ // get the reference point coordinates (pie charts use tooltipPos)
+ tooltip.followPointer = splat(point)[0].series.tooltipOptions.followPointer;
+ anchor = tooltip.getAnchor(point, mouseEvent);
+ x = anchor[0];
+ y = anchor[1];
+
+ // shared tooltip, array is sent over
+ if (shared && !(point.series && point.series.noSharedTooltip)) {
+
+ // hide previous hoverPoints and set new
+
+ chart.hoverPoints = point;
+ if (hoverPoints) {
+ each(hoverPoints, function (point) {
+ point.setState();
+ });
+ }
+
+ each(point, function (item) {
+ item.setState(HOVER_STATE);
+
+ pointConfig.push(item.getLabelConfig());
+ });
+
+ textConfig = {
+ x: point[0].category,
+ y: point[0].y
+ };
+ textConfig.points = pointConfig;
+ this.len = pointConfig.length;
+ point = point[0];
+
+ // single point tooltip
+ } else {
+ textConfig = point.getLabelConfig();
+ }
+ text = formatter.call(textConfig, tooltip);
+
+ // register the current series
+ currentSeries = point.series;
+ this.distance = pick(currentSeries.tooltipOptions.distance, 16);
+
+ // update the inner HTML
+ if (text === false) {
+ this.hide();
+ } else {
+
+ // show it
+ if (tooltip.isHidden) {
+ stop(label);
+ label.attr('opacity', 1).show();
+ }
+
+ // update text
+ label.attr({
+ text: text
+ });
+
+ // set the stroke color of the box
+ borderColor = options.borderColor || point.color || currentSeries.color || '#606060';
+ label.attr({
+ stroke: borderColor
+ });
+
+ tooltip.updatePosition({ plotX: x, plotY: y, negative: point.negative, ttBelow: point.ttBelow });
+
+ this.isHidden = false;
+ }
+ fireEvent(chart, 'tooltipRefresh', {
+ text: text,
+ x: x + chart.plotLeft,
+ y: y + chart.plotTop,
+ borderColor: borderColor
+ });
+ },
+
+ /**
+ * Find the new position and perform the move
+ */
+ updatePosition: function (point) {
+ var chart = this.chart,
+ label = this.label,
+ pos = (this.options.positioner || this.getPosition).call(
+ this,
+ label.width,
+ label.height,
+ point
+ );
+
+ // do the move
+ this.move(
+ mathRound(pos.x),
+ mathRound(pos.y),
+ point.plotX + chart.plotLeft,
+ point.plotY + chart.plotTop
+ );
+ },
+
+
+ /**
+ * Format the header of the tooltip
+ */
+ tooltipHeaderFormatter: function (point) {
+ var series = point.series,
+ tooltipOptions = series.tooltipOptions,
+ dateTimeLabelFormats = tooltipOptions.dateTimeLabelFormats,
+ xDateFormat = tooltipOptions.xDateFormat,
+ xAxis = series.xAxis,
+ isDateTime = xAxis && xAxis.options.type === 'datetime' && isNumber(point.key),
+ headerFormat = tooltipOptions.headerFormat,
+ closestPointRange = xAxis && xAxis.closestPointRange,
+ n;
+
+ // Guess the best date format based on the closest point distance (#568)
+ if (isDateTime && !xDateFormat) {
+ if (closestPointRange) {
+ for (n in timeUnits) {
+ if (timeUnits[n] >= closestPointRange ||
+ // If the point is placed every day at 23:59, we need to show
+ // the minutes as well. This logic only works for time units less than
+ // a day, since all higher time units are dividable by those. #2637.
+ (timeUnits[n] <= timeUnits.day && point.key % timeUnits[n] > 0)) {
+ xDateFormat = dateTimeLabelFormats[n];
+ break;
+ }
+ }
+ } else {
+ xDateFormat = dateTimeLabelFormats.day;
+ }
+
+ xDateFormat = xDateFormat || dateTimeLabelFormats.year; // #2546, 2581
+
+ }
+
+ // Insert the header date format if any
+ if (isDateTime && xDateFormat) {
+ headerFormat = headerFormat.replace('{point.key}', '{point.key:' + xDateFormat + '}');
+ }
+
+ return format(headerFormat, {
+ point: point,
+ series: series
+ });
+ }
+};
+
+var hoverChartIndex;
+
+// Global flag for touch support
+hasTouch = doc.documentElement.ontouchstart !== UNDEFINED;
+
+/**
+ * The mouse tracker object. All methods starting with "on" are primary DOM event handlers.
+ * Subsequent methods should be named differently from what they are doing.
+ * @param {Object} chart The Chart instance
+ * @param {Object} options The root options object
+ */
+var Pointer = Highcharts.Pointer = function (chart, options) {
+ this.init(chart, options);
+};
+
+Pointer.prototype = {
+ /**
+ * Initialize Pointer
+ */
+ init: function (chart, options) {
+
+ var chartOptions = options.chart,
+ chartEvents = chartOptions.events,
+ zoomType = useCanVG ? '' : chartOptions.zoomType,
+ inverted = chart.inverted,
+ zoomX,
+ zoomY;
+
+ // Store references
+ this.options = options;
+ this.chart = chart;
+
+ // Zoom status
+ this.zoomX = zoomX = /x/.test(zoomType);
+ this.zoomY = zoomY = /y/.test(zoomType);
+ this.zoomHor = (zoomX && !inverted) || (zoomY && inverted);
+ this.zoomVert = (zoomY && !inverted) || (zoomX && inverted);
+ this.hasZoom = zoomX || zoomY;
+
+ // Do we need to handle click on a touch device?
+ this.runChartClick = chartEvents && !!chartEvents.click;
+
+ this.pinchDown = [];
+ this.lastValidTouch = {};
+
+ if (Highcharts.Tooltip && options.tooltip.enabled) {
+ chart.tooltip = new Tooltip(chart, options.tooltip);
+ this.followTouchMove = options.tooltip.followTouchMove;
+ }
+
+ this.setDOMEvents();
+ },
+
+ /**
+ * Add crossbrowser support for chartX and chartY
+ * @param {Object} e The event object in standard browsers
+ */
+ normalize: function (e, chartPosition) {
+ var chartX,
+ chartY,
+ ePos;
+
+ // common IE normalizing
+ e = e || window.event;
+
+ // Framework specific normalizing (#1165)
+ e = washMouseEvent(e);
+
+ // More IE normalizing, needs to go after washMouseEvent
+ if (!e.target) {
+ e.target = e.srcElement;
+ }
+
+ // iOS (#2757)
+ ePos = e.touches ? (e.touches.length ? e.touches.item(0) : e.changedTouches[0]) : e;
+
+ // Get mouse position
+ if (!chartPosition) {
+ this.chartPosition = chartPosition = offset(this.chart.container);
+ }
+
+ // chartX and chartY
+ if (ePos.pageX === UNDEFINED) { // IE < 9. #886.
+ chartX = mathMax(e.x, e.clientX - chartPosition.left); // #2005, #2129: the second case is
+ // for IE10 quirks mode within framesets
+ chartY = e.y;
+ } else {
+ chartX = ePos.pageX - chartPosition.left;
+ chartY = ePos.pageY - chartPosition.top;
+ }
+
+ return extend(e, {
+ chartX: mathRound(chartX),
+ chartY: mathRound(chartY)
+ });
+ },
+
+ /**
+ * Get the click position in terms of axis values.
+ *
+ * @param {Object} e A pointer event
+ */
+ getCoordinates: function (e) {
+ var coordinates = {
+ xAxis: [],
+ yAxis: []
+ };
+
+ each(this.chart.axes, function (axis) {
+ coordinates[axis.isXAxis ? 'xAxis' : 'yAxis'].push({
+ axis: axis,
+ value: axis.toValue(e[axis.horiz ? 'chartX' : 'chartY'])
+ });
+ });
+ return coordinates;
+ },
+
+ /**
+ * Return the index in the tooltipPoints array, corresponding to pixel position in
+ * the plot area.
+ */
+ getIndex: function (e) {
+ var chart = this.chart;
+ return chart.inverted ?
+ chart.plotHeight + chart.plotTop - e.chartY :
+ e.chartX - chart.plotLeft;
+ },
+
+ /**
+ * With line type charts with a single tracker, get the point closest to the mouse.
+ * Run Point.onMouseOver and display tooltip for the point or points.
+ */
+ runPointActions: function (e) {
+ var pointer = this,
+ chart = pointer.chart,
+ series = chart.series,
+ tooltip = chart.tooltip,
+ followPointer,
+ point,
+ points,
+ hoverPoint = chart.hoverPoint,
+ hoverSeries = chart.hoverSeries,
+ i,
+ j,
+ distance = chart.chartWidth,
+ index = pointer.getIndex(e),
+ anchor;
+
+ // shared tooltip
+ if (tooltip && pointer.options.tooltip.shared && !(hoverSeries && hoverSeries.noSharedTooltip)) {
+ points = [];
+
+ // loop over all series and find the ones with points closest to the mouse
+ i = series.length;
+ for (j = 0; j < i; j++) {
+ if (series[j].visible &&
+ series[j].options.enableMouseTracking !== false &&
+ !series[j].noSharedTooltip && series[j].singularTooltips !== true && series[j].tooltipPoints.length) {
+ point = series[j].tooltipPoints[index];
+ if (point && point.series) { // not a dummy point, #1544
+ point._dist = mathAbs(index - point.clientX);
+ distance = mathMin(distance, point._dist);
+ points.push(point);
+ }
+ }
+ }
+ // remove furthest points
+ i = points.length;
+ while (i--) {
+ if (points[i]._dist > distance) {
+ points.splice(i, 1);
+ }
+ }
+ // refresh the tooltip if necessary
+ if (points.length && (points[0].clientX !== pointer.hoverX)) {
+ tooltip.refresh(points, e);
+ pointer.hoverX = points[0].clientX;
+ }
+ }
+
+ // Separate tooltip and general mouse events
+ followPointer = hoverSeries && hoverSeries.tooltipOptions.followPointer;
+ if (hoverSeries && hoverSeries.tracker && !followPointer) { // #2584, #2830
+
+ // get the point
+ point = hoverSeries.tooltipPoints[index];
+
+ // a new point is hovered, refresh the tooltip
+ if (point && point !== hoverPoint) {
+
+ // trigger the events
+ point.onMouseOver(e);
+
+ }
+
+ } else if (tooltip && followPointer && !tooltip.isHidden) {
+ anchor = tooltip.getAnchor([{}], e);
+ tooltip.updatePosition({ plotX: anchor[0], plotY: anchor[1] });
+ }
+
+ // Start the event listener to pick up the tooltip
+ if (tooltip && !pointer._onDocumentMouseMove) {
+ pointer._onDocumentMouseMove = function (e) {
+ if (charts[hoverChartIndex]) {
+ charts[hoverChartIndex].pointer.onDocumentMouseMove(e);
+ }
+ };
+ addEvent(doc, 'mousemove', pointer._onDocumentMouseMove);
+ }
+
+ // Draw independent crosshairs
+ each(chart.axes, function (axis) {
+ axis.drawCrosshair(e, pick(point, hoverPoint));
+ });
+ },
+
+
+
+ /**
+ * Reset the tracking by hiding the tooltip, the hover series state and the hover point
+ *
+ * @param allowMove {Boolean} Instead of destroying the tooltip altogether, allow moving it if possible
+ */
+ reset: function (allowMove) {
+ var pointer = this,
+ chart = pointer.chart,
+ hoverSeries = chart.hoverSeries,
+ hoverPoint = chart.hoverPoint,
+ tooltip = chart.tooltip,
+ tooltipPoints = tooltip && tooltip.shared ? chart.hoverPoints : hoverPoint;
+
+ // Narrow in allowMove
+ allowMove = allowMove && tooltip && tooltipPoints;
+
+ // Check if the points have moved outside the plot area, #1003
+ if (allowMove && splat(tooltipPoints)[0].plotX === UNDEFINED) {
+ allowMove = false;
+ }
+
+ // Just move the tooltip, #349
+ if (allowMove) {
+ tooltip.refresh(tooltipPoints);
+ if (hoverPoint) { // #2500
+ hoverPoint.setState(hoverPoint.state, true);
+ }
+
+ // Full reset
+ } else {
+
+ if (hoverPoint) {
+ hoverPoint.onMouseOut();
+ }
+
+ if (hoverSeries) {
+ hoverSeries.onMouseOut();
+ }
+
+ if (tooltip) {
+ tooltip.hide();
+ }
+
+ if (pointer._onDocumentMouseMove) {
+ removeEvent(doc, 'mousemove', pointer._onDocumentMouseMove);
+ pointer._onDocumentMouseMove = null;
+ }
+
+ // Remove crosshairs
+ each(chart.axes, function (axis) {
+ axis.hideCrosshair();
+ });
+
+ pointer.hoverX = null;
+
+ }
+ },
+
+ /**
+ * Scale series groups to a certain scale and translation
+ */
+ scaleGroups: function (attribs, clip) {
+
+ var chart = this.chart,
+ seriesAttribs;
+
+ // Scale each series
+ each(chart.series, function (series) {
+ seriesAttribs = attribs || series.getPlotBox(); // #1701
+ if (series.xAxis && series.xAxis.zoomEnabled) {
+ series.group.attr(seriesAttribs);
+ if (series.markerGroup) {
+ series.markerGroup.attr(seriesAttribs);
+ series.markerGroup.clip(clip ? chart.clipRect : null);
+ }
+ if (series.dataLabelsGroup) {
+ series.dataLabelsGroup.attr(seriesAttribs);
+ }
+ }
+ });
+
+ // Clip
+ chart.clipRect.attr(clip || chart.clipBox);
+ },
+
+ /**
+ * Start a drag operation
+ */
+ dragStart: function (e) {
+ var chart = this.chart;
+
+ // Record the start position
+ chart.mouseIsDown = e.type;
+ chart.cancelClick = false;
+ chart.mouseDownX = this.mouseDownX = e.chartX;
+ chart.mouseDownY = this.mouseDownY = e.chartY;
+ },
+
+ /**
+ * Perform a drag operation in response to a mousemove event while the mouse is down
+ */
+ drag: function (e) {
+
+ var chart = this.chart,
+ chartOptions = chart.options.chart,
+ chartX = e.chartX,
+ chartY = e.chartY,
+ zoomHor = this.zoomHor,
+ zoomVert = this.zoomVert,
+ plotLeft = chart.plotLeft,
+ plotTop = chart.plotTop,
+ plotWidth = chart.plotWidth,
+ plotHeight = chart.plotHeight,
+ clickedInside,
+ size,
+ mouseDownX = this.mouseDownX,
+ mouseDownY = this.mouseDownY,
+ panKey = chartOptions.panKey && e[chartOptions.panKey + 'Key'];
+
+ // If the mouse is outside the plot area, adjust to cooordinates
+ // inside to prevent the selection marker from going outside
+ if (chartX < plotLeft) {
+ chartX = plotLeft;
+ } else if (chartX > plotLeft + plotWidth) {
+ chartX = plotLeft + plotWidth;
+ }
+
+ if (chartY < plotTop) {
+ chartY = plotTop;
+ } else if (chartY > plotTop + plotHeight) {
+ chartY = plotTop + plotHeight;
+ }
+
+ // determine if the mouse has moved more than 10px
+ this.hasDragged = Math.sqrt(
+ Math.pow(mouseDownX - chartX, 2) +
+ Math.pow(mouseDownY - chartY, 2)
+ );
+
+ if (this.hasDragged > 10) {
+ clickedInside = chart.isInsidePlot(mouseDownX - plotLeft, mouseDownY - plotTop);
+
+ // make a selection
+ if (chart.hasCartesianSeries && (this.zoomX || this.zoomY) && clickedInside && !panKey) {
+ if (!this.selectionMarker) {
+ this.selectionMarker = chart.renderer.rect(
+ plotLeft,
+ plotTop,
+ zoomHor ? 1 : plotWidth,
+ zoomVert ? 1 : plotHeight,
+ 0
+ )
+ .attr({
+ fill: chartOptions.selectionMarkerFill || 'rgba(69,114,167,0.25)',
+ zIndex: 7
+ })
+ .add();
+ }
+ }
+
+ // adjust the width of the selection marker
+ if (this.selectionMarker && zoomHor) {
+ size = chartX - mouseDownX;
+ this.selectionMarker.attr({
+ width: mathAbs(size),
+ x: (size > 0 ? 0 : size) + mouseDownX
+ });
+ }
+ // adjust the height of the selection marker
+ if (this.selectionMarker && zoomVert) {
+ size = chartY - mouseDownY;
+ this.selectionMarker.attr({
+ height: mathAbs(size),
+ y: (size > 0 ? 0 : size) + mouseDownY
+ });
+ }
+
+ // panning
+ if (clickedInside && !this.selectionMarker && chartOptions.panning) {
+ chart.pan(e, chartOptions.panning);
+ }
+ }
+ },
+
+ /**
+ * On mouse up or touch end across the entire document, drop the selection.
+ */
+ drop: function (e) {
+ var chart = this.chart,
+ hasPinched = this.hasPinched;
+
+ if (this.selectionMarker) {
+ var selectionData = {
+ xAxis: [],
+ yAxis: [],
+ originalEvent: e.originalEvent || e
+ },
+ selectionBox = this.selectionMarker,
+ selectionLeft = selectionBox.attr ? selectionBox.attr('x') : selectionBox.x,
+ selectionTop = selectionBox.attr ? selectionBox.attr('y') : selectionBox.y,
+ selectionWidth = selectionBox.attr ? selectionBox.attr('width') : selectionBox.width,
+ selectionHeight = selectionBox.attr ? selectionBox.attr('height') : selectionBox.height,
+ runZoom;
+
+ // a selection has been made
+ if (this.hasDragged || hasPinched) {
+
+ // record each axis' min and max
+ each(chart.axes, function (axis) {
+ if (axis.zoomEnabled) {
+ var horiz = axis.horiz,
+ minPixelPadding = e.type === 'touchend' ? axis.minPixelPadding: 0, // #1207, #3075
+ selectionMin = axis.toValue((horiz ? selectionLeft : selectionTop) + minPixelPadding),
+ selectionMax = axis.toValue((horiz ? selectionLeft + selectionWidth : selectionTop + selectionHeight) - minPixelPadding);
+
+ if (!isNaN(selectionMin) && !isNaN(selectionMax)) { // #859
+ selectionData[axis.coll].push({
+ axis: axis,
+ min: mathMin(selectionMin, selectionMax), // for reversed axes,
+ max: mathMax(selectionMin, selectionMax)
+ });
+ runZoom = true;
+ }
+ }
+ });
+ if (runZoom) {
+ fireEvent(chart, 'selection', selectionData, function (args) {
+ chart.zoom(extend(args, hasPinched ? { animation: false } : null));
+ });
+ }
+
+ }
+ this.selectionMarker = this.selectionMarker.destroy();
+
+ // Reset scaling preview
+ if (hasPinched) {
+ this.scaleGroups();
+ }
+ }
+
+ // Reset all
+ if (chart) { // it may be destroyed on mouse up - #877
+ css(chart.container, { cursor: chart._cursor });
+ chart.cancelClick = this.hasDragged > 10; // #370
+ chart.mouseIsDown = this.hasDragged = this.hasPinched = false;
+ this.pinchDown = [];
+ }
+ },
+
+ onContainerMouseDown: function (e) {
+
+ e = this.normalize(e);
+
+ // issue #295, dragging not always working in Firefox
+ if (e.preventDefault) {
+ e.preventDefault();
+ }
+
+ this.dragStart(e);
+ },
+
+
+
+ onDocumentMouseUp: function (e) {
+ if (charts[hoverChartIndex]) {
+ charts[hoverChartIndex].pointer.drop(e);
+ }
+ },
+
+ /**
+ * Special handler for mouse move that will hide the tooltip when the mouse leaves the plotarea.
+ * Issue #149 workaround. The mouseleave event does not always fire.
+ */
+ onDocumentMouseMove: function (e) {
+ var chart = this.chart,
+ chartPosition = this.chartPosition,
+ hoverSeries = chart.hoverSeries;
+
+ e = this.normalize(e, chartPosition);
+
+ // If we're outside, hide the tooltip
+ if (chartPosition && hoverSeries && !this.inClass(e.target, 'highcharts-tracker') &&
+ !chart.isInsidePlot(e.chartX - chart.plotLeft, e.chartY - chart.plotTop)) {
+ this.reset();
+ }
+ },
+
+ /**
+ * When mouse leaves the container, hide the tooltip.
+ */
+ onContainerMouseLeave: function () {
+ var chart = charts[hoverChartIndex];
+ if (chart) {
+ chart.pointer.reset();
+ chart.pointer.chartPosition = null; // also reset the chart position, used in #149 fix
+ }
+ },
+
+ // The mousemove, touchmove and touchstart event handler
+ onContainerMouseMove: function (e) {
+
+ var chart = this.chart;
+
+ hoverChartIndex = chart.index;
+
+ e = this.normalize(e);
+ e.returnValue = false; // #2251, #3224
+
+ if (chart.mouseIsDown === 'mousedown') {
+ this.drag(e);
+ }
+
+ // Show the tooltip and run mouse over events (#977)
+ if ((this.inClass(e.target, 'highcharts-tracker') ||
+ chart.isInsidePlot(e.chartX - chart.plotLeft, e.chartY - chart.plotTop)) && !chart.openMenu) {
+ this.runPointActions(e);
+ }
+ },
+
+ /**
+ * Utility to detect whether an element has, or has a parent with, a specific
+ * class name. Used on detection of tracker objects and on deciding whether
+ * hovering the tooltip should cause the active series to mouse out.
+ */
+ inClass: function (element, className) {
+ var elemClassName;
+ while (element) {
+ elemClassName = attr(element, 'class');
+ if (elemClassName) {
+ if (elemClassName.indexOf(className) !== -1) {
+ return true;
+ } else if (elemClassName.indexOf(PREFIX + 'container') !== -1) {
+ return false;
+ }
+ }
+ element = element.parentNode;
+ }
+ },
+
+ onTrackerMouseOut: function (e) {
+ var series = this.chart.hoverSeries,
+ relatedTarget = e.relatedTarget || e.toElement,
+ relatedSeries = relatedTarget && relatedTarget.point && relatedTarget.point.series; // #2499
+
+ if (series && !series.options.stickyTracking && !this.inClass(relatedTarget, PREFIX + 'tooltip') &&
+ relatedSeries !== series) {
+ series.onMouseOut();
+ }
+ },
+
+ onContainerClick: function (e) {
+ var chart = this.chart,
+ hoverPoint = chart.hoverPoint,
+ plotLeft = chart.plotLeft,
+ plotTop = chart.plotTop;
+
+ e = this.normalize(e);
+ e.cancelBubble = true; // IE specific
+
+ if (!chart.cancelClick) {
+
+ // On tracker click, fire the series and point events. #783, #1583
+ if (hoverPoint && this.inClass(e.target, PREFIX + 'tracker')) {
+
+ // the series click event
+ fireEvent(hoverPoint.series, 'click', extend(e, {
+ point: hoverPoint
+ }));
+
+ // the point click event
+ if (chart.hoverPoint) { // it may be destroyed (#1844)
+ hoverPoint.firePointEvent('click', e);
+ }
+
+ // When clicking outside a tracker, fire a chart event
+ } else {
+ extend(e, this.getCoordinates(e));
+
+ // fire a click event in the chart
+ if (chart.isInsidePlot(e.chartX - plotLeft, e.chartY - plotTop)) {
+ fireEvent(chart, 'click', e);
+ }
+ }
+
+
+ }
+ },
+
+ /**
+ * Set the JS DOM events on the container and document. This method should contain
+ * a one-to-one assignment between methods and their handlers. Any advanced logic should
+ * be moved to the handler reflecting the event's name.
+ */
+ setDOMEvents: function () {
+
+ var pointer = this,
+ container = pointer.chart.container;
+
+ container.onmousedown = function (e) {
+ pointer.onContainerMouseDown(e);
+ };
+ container.onmousemove = function (e) {
+ pointer.onContainerMouseMove(e);
+ };
+ container.onclick = function (e) {
+ pointer.onContainerClick(e);
+ };
+ addEvent(container, 'mouseleave', pointer.onContainerMouseLeave);
+ if (chartCount === 1) {
+ addEvent(doc, 'mouseup', pointer.onDocumentMouseUp);
+ }
+ if (hasTouch) {
+ container.ontouchstart = function (e) {
+ pointer.onContainerTouchStart(e);
+ };
+ container.ontouchmove = function (e) {
+ pointer.onContainerTouchMove(e);
+ };
+ if (chartCount === 1) {
+ addEvent(doc, 'touchend', pointer.onDocumentTouchEnd);
+ }
+ }
+
+ },
+
+ /**
+ * Destroys the Pointer object and disconnects DOM events.
+ */
+ destroy: function () {
+ var prop;
+
+ removeEvent(this.chart.container, 'mouseleave', this.onContainerMouseLeave);
+ if (!chartCount) {
+ removeEvent(doc, 'mouseup', this.onDocumentMouseUp);
+ removeEvent(doc, 'touchend', this.onDocumentTouchEnd);
+ }
+
+ // memory and CPU leak
+ clearInterval(this.tooltipTimeout);
+
+ for (prop in this) {
+ this[prop] = null;
+ }
+ }
+};
+
+
+/* Support for touch devices */
+extend(Highcharts.Pointer.prototype, {
+
+ /**
+ * Run translation operations
+ */
+ pinchTranslate: function (pinchDown, touches, transform, selectionMarker, clip, lastValidTouch) {
+ if (this.zoomHor || this.pinchHor) {
+ this.pinchTranslateDirection(true, pinchDown, touches, transform, selectionMarker, clip, lastValidTouch);
+ }
+ if (this.zoomVert || this.pinchVert) {
+ this.pinchTranslateDirection(false, pinchDown, touches, transform, selectionMarker, clip, lastValidTouch);
+ }
+ },
+
+ /**
+ * Run translation operations for each direction (horizontal and vertical) independently
+ */
+ pinchTranslateDirection: function (horiz, pinchDown, touches, transform, selectionMarker, clip, lastValidTouch, forcedScale) {
+ var chart = this.chart,
+ xy = horiz ? 'x' : 'y',
+ XY = horiz ? 'X' : 'Y',
+ sChartXY = 'chart' + XY,
+ wh = horiz ? 'width' : 'height',
+ plotLeftTop = chart['plot' + (horiz ? 'Left' : 'Top')],
+ selectionWH,
+ selectionXY,
+ clipXY,
+ scale = forcedScale || 1,
+ inverted = chart.inverted,
+ bounds = chart.bounds[horiz ? 'h' : 'v'],
+ singleTouch = pinchDown.length === 1,
+ touch0Start = pinchDown[0][sChartXY],
+ touch0Now = touches[0][sChartXY],
+ touch1Start = !singleTouch && pinchDown[1][sChartXY],
+ touch1Now = !singleTouch && touches[1][sChartXY],
+ outOfBounds,
+ transformScale,
+ scaleKey,
+ setScale = function () {
+ if (!singleTouch && mathAbs(touch0Start - touch1Start) > 20) { // Don't zoom if fingers are too close on this axis
+ scale = forcedScale || mathAbs(touch0Now - touch1Now) / mathAbs(touch0Start - touch1Start);
+ }
+
+ clipXY = ((plotLeftTop - touch0Now) / scale) + touch0Start;
+ selectionWH = chart['plot' + (horiz ? 'Width' : 'Height')] / scale;
+ };
+
+ // Set the scale, first pass
+ setScale();
+
+ selectionXY = clipXY; // the clip position (x or y) is altered if out of bounds, the selection position is not
+
+ // Out of bounds
+ if (selectionXY < bounds.min) {
+ selectionXY = bounds.min;
+ outOfBounds = true;
+ } else if (selectionXY + selectionWH > bounds.max) {
+ selectionXY = bounds.max - selectionWH;
+ outOfBounds = true;
+ }
+
+ // Is the chart dragged off its bounds, determined by dataMin and dataMax?
+ if (outOfBounds) {
+
+ // Modify the touchNow position in order to create an elastic drag movement. This indicates
+ // to the user that the chart is responsive but can't be dragged further.
+ touch0Now -= 0.8 * (touch0Now - lastValidTouch[xy][0]);
+ if (!singleTouch) {
+ touch1Now -= 0.8 * (touch1Now - lastValidTouch[xy][1]);
+ }
+
+ // Set the scale, second pass to adapt to the modified touchNow positions
+ setScale();
+
+ } else {
+ lastValidTouch[xy] = [touch0Now, touch1Now];
+ }
+
+ // Set geometry for clipping, selection and transformation
+ if (!inverted) { // TODO: implement clipping for inverted charts
+ clip[xy] = clipXY - plotLeftTop;
+ clip[wh] = selectionWH;
+ }
+ scaleKey = inverted ? (horiz ? 'scaleY' : 'scaleX') : 'scale' + XY;
+ transformScale = inverted ? 1 / scale : scale;
+
+ selectionMarker[wh] = selectionWH;
+ selectionMarker[xy] = selectionXY;
+ transform[scaleKey] = scale;
+ transform['translate' + XY] = (transformScale * plotLeftTop) + (touch0Now - (transformScale * touch0Start));
+ },
+
+ /**
+ * Handle touch events with two touches
+ */
+ pinch: function (e) {
+
+ var self = this,
+ chart = self.chart,
+ pinchDown = self.pinchDown,
+ followTouchMove = self.followTouchMove,
+ touches = e.touches,
+ touchesLength = touches.length,
+ lastValidTouch = self.lastValidTouch,
+ hasZoom = self.hasZoom,
+ selectionMarker = self.selectionMarker,
+ transform = {},
+ fireClickEvent = touchesLength === 1 && ((self.inClass(e.target, PREFIX + 'tracker') &&
+ chart.runTrackerClick) || chart.runChartClick),
+ clip = {};
+
+ // On touch devices, only proceed to trigger click if a handler is defined
+ if ((hasZoom || followTouchMove) && !fireClickEvent) {
+ e.preventDefault();
+ }
+
+ // Normalize each touch
+ map(touches, function (e) {
+ return self.normalize(e);
+ });
+
+ // Register the touch start position
+ if (e.type === 'touchstart') {
+ each(touches, function (e, i) {
+ pinchDown[i] = { chartX: e.chartX, chartY: e.chartY };
+ });
+ lastValidTouch.x = [pinchDown[0].chartX, pinchDown[1] && pinchDown[1].chartX];
+ lastValidTouch.y = [pinchDown[0].chartY, pinchDown[1] && pinchDown[1].chartY];
+
+ // Identify the data bounds in pixels
+ each(chart.axes, function (axis) {
+ if (axis.zoomEnabled) {
+ var bounds = chart.bounds[axis.horiz ? 'h' : 'v'],
+ minPixelPadding = axis.minPixelPadding,
+ min = axis.toPixels(pick(axis.options.min, axis.dataMin)),
+ max = axis.toPixels(pick(axis.options.max, axis.dataMax)),
+ absMin = mathMin(min, max),
+ absMax = mathMax(min, max);
+
+ // Store the bounds for use in the touchmove handler
+ bounds.min = mathMin(axis.pos, absMin - minPixelPadding);
+ bounds.max = mathMax(axis.pos + axis.len, absMax + minPixelPadding);
+ }
+ });
+
+ // Event type is touchmove, handle panning and pinching
+ } else if (pinchDown.length) { // can be 0 when releasing, if touchend fires first
+
+
+ // Set the marker
+ if (!selectionMarker) {
+ self.selectionMarker = selectionMarker = extend({
+ destroy: noop
+ }, chart.plotBox);
+ }
+
+ self.pinchTranslate(pinchDown, touches, transform, selectionMarker, clip, lastValidTouch);
+
+ self.hasPinched = hasZoom;
+
+ // Scale and translate the groups to provide visual feedback during pinching
+ self.scaleGroups(transform, clip);
+
+ // Optionally move the tooltip on touchmove
+ if (!hasZoom && followTouchMove && touchesLength === 1) {
+ this.runPointActions(self.normalize(e));
+ }
+ }
+ },
+
+ onContainerTouchStart: function (e) {
+ var chart = this.chart;
+
+ hoverChartIndex = chart.index;
+
+ if (e.touches.length === 1) {
+
+ e = this.normalize(e);
+
+ if (chart.isInsidePlot(e.chartX - chart.plotLeft, e.chartY - chart.plotTop)) {
+
+ // Run mouse events and display tooltip etc
+ this.runPointActions(e);
+
+ this.pinch(e);
+
+ } else {
+ // Hide the tooltip on touching outside the plot area (#1203)
+ this.reset();
+ }
+
+ } else if (e.touches.length === 2) {
+ this.pinch(e);
+ }
+ },
+
+ onContainerTouchMove: function (e) {
+ if (e.touches.length === 1 || e.touches.length === 2) {
+ this.pinch(e);
+ }
+ },
+
+ onDocumentTouchEnd: function (e) {
+ if (charts[hoverChartIndex]) {
+ charts[hoverChartIndex].pointer.drop(e);
+ }
+ }
+
+});
+if (win.PointerEvent || win.MSPointerEvent) {
+
+ // The touches object keeps track of the points being touched at all times
+ var touches = {},
+ hasPointerEvent = !!win.PointerEvent,
+ getWebkitTouches = function () {
+ var key, fake = [];
+ fake.item = function (i) { return this[i]; };
+ for (key in touches) {
+ if (touches.hasOwnProperty(key)) {
+ fake.push({
+ pageX: touches[key].pageX,
+ pageY: touches[key].pageY,
+ target: touches[key].target
+ });
+ }
+ }
+ return fake;
+ },
+ translateMSPointer = function (e, method, wktype, callback) {
+ var p;
+ e = e.originalEvent || e;
+ if ((e.pointerType === 'touch' || e.pointerType === e.MSPOINTER_TYPE_TOUCH) && charts[hoverChartIndex]) {
+ callback(e);
+ p = charts[hoverChartIndex].pointer;
+ p[method]({
+ type: wktype,
+ target: e.currentTarget,
+ preventDefault: noop,
+ touches: getWebkitTouches()
+ });
+ }
+ };
+
+ /**
+ * Extend the Pointer prototype with methods for each event handler and more
+ */
+ extend(Pointer.prototype, {
+ onContainerPointerDown: function (e) {
+ translateMSPointer(e, 'onContainerTouchStart', 'touchstart', function (e) {
+ touches[e.pointerId] = { pageX: e.pageX, pageY: e.pageY, target: e.currentTarget };
+ });
+ },
+ onContainerPointerMove: function (e) {
+ translateMSPointer(e, 'onContainerTouchMove', 'touchmove', function (e) {
+ touches[e.pointerId] = { pageX: e.pageX, pageY: e.pageY };
+ if (!touches[e.pointerId].target) {
+ touches[e.pointerId].target = e.currentTarget;
+ }
+ });
+ },
+ onDocumentPointerUp: function (e) {
+ translateMSPointer(e, 'onContainerTouchEnd', 'touchend', function (e) {
+ delete touches[e.pointerId];
+ });
+ },
+
+ /**
+ * Add or remove the MS Pointer specific events
+ */
+ batchMSEvents: function (fn) {
+ fn(this.chart.container, hasPointerEvent ? 'pointerdown' : 'MSPointerDown', this.onContainerPointerDown);
+ fn(this.chart.container, hasPointerEvent ? 'pointermove' : 'MSPointerMove', this.onContainerPointerMove);
+ fn(doc, hasPointerEvent ? 'pointerup' : 'MSPointerUp', this.onDocumentPointerUp);
+ }
+ });
+
+ // Disable default IE actions for pinch and such on chart element
+ wrap(Pointer.prototype, 'init', function (proceed, chart, options) {
+ proceed.call(this, chart, options);
+ if (this.hasZoom || this.followTouchMove) {
+ css(chart.container, {
+ '-ms-touch-action': NONE,
+ 'touch-action': NONE
+ });
+ }
+ });
+
+ // Add IE specific touch events to chart
+ wrap(Pointer.prototype, 'setDOMEvents', function (proceed) {
+ proceed.apply(this);
+ if (this.hasZoom || this.followTouchMove) {
+ this.batchMSEvents(addEvent);
+ }
+ });
+ // Destroy MS events also
+ wrap(Pointer.prototype, 'destroy', function (proceed) {
+ this.batchMSEvents(removeEvent);
+ proceed.call(this);
+ });
+}
+/**
+ * The overview of the chart's series
+ */
+var Legend = Highcharts.Legend = function (chart, options) {
+ this.init(chart, options);
+};
+
+Legend.prototype = {
+
+ /**
+ * Initialize the legend
+ */
+ init: function (chart, options) {
+
+ var legend = this,
+ itemStyle = options.itemStyle,
+ padding = pick(options.padding, 8),
+ itemMarginTop = options.itemMarginTop || 0;
+
+ this.options = options;
+
+ if (!options.enabled) {
+ return;
+ }
+
+ legend.itemStyle = itemStyle;
+ legend.itemHiddenStyle = merge(itemStyle, options.itemHiddenStyle);
+ legend.itemMarginTop = itemMarginTop;
+ legend.padding = padding;
+ legend.initialItemX = padding;
+ legend.initialItemY = padding - 5; // 5 is the number of pixels above the text
+ legend.maxItemWidth = 0;
+ legend.chart = chart;
+ legend.itemHeight = 0;
+ legend.lastLineHeight = 0;
+ legend.symbolWidth = pick(options.symbolWidth, 16);
+ legend.pages = [];
+
+
+ // Render it
+ legend.render();
+
+ // move checkboxes
+ addEvent(legend.chart, 'endResize', function () {
+ legend.positionCheckboxes();
+ });
+
+ },
+
+ /**
+ * Set the colors for the legend item
+ * @param {Object} item A Series or Point instance
+ * @param {Object} visible Dimmed or colored
+ */
+ colorizeItem: function (item, visible) {
+ var legend = this,
+ options = legend.options,
+ legendItem = item.legendItem,
+ legendLine = item.legendLine,
+ legendSymbol = item.legendSymbol,
+ hiddenColor = legend.itemHiddenStyle.color,
+ textColor = visible ? options.itemStyle.color : hiddenColor,
+ symbolColor = visible ? (item.legendColor || item.color || '#CCC') : hiddenColor,
+ markerOptions = item.options && item.options.marker,
+ symbolAttr = { fill: symbolColor },
+ key,
+ val;
+
+ if (legendItem) {
+ legendItem.css({ fill: textColor, color: textColor }); // color for #1553, oldIE
+ }
+ if (legendLine) {
+ legendLine.attr({ stroke: symbolColor });
+ }
+
+ if (legendSymbol) {
+
+ // Apply marker options
+ if (markerOptions && legendSymbol.isMarker) { // #585
+ symbolAttr.stroke = symbolColor;
+ markerOptions = item.convertAttribs(markerOptions);
+ for (key in markerOptions) {
+ val = markerOptions[key];
+ if (val !== UNDEFINED) {
+ symbolAttr[key] = val;
+ }
+ }
+ }
+
+ legendSymbol.attr(symbolAttr);
+ }
+ },
+
+ /**
+ * Position the legend item
+ * @param {Object} item A Series or Point instance
+ */
+ positionItem: function (item) {
+ var legend = this,
+ options = legend.options,
+ symbolPadding = options.symbolPadding,
+ ltr = !options.rtl,
+ legendItemPos = item._legendItemPos,
+ itemX = legendItemPos[0],
+ itemY = legendItemPos[1],
+ checkbox = item.checkbox;
+
+ if (item.legendGroup) {
+ item.legendGroup.translate(
+ ltr ? itemX : legend.legendWidth - itemX - 2 * symbolPadding - 4,
+ itemY
+ );
+ }
+
+ if (checkbox) {
+ checkbox.x = itemX;
+ checkbox.y = itemY;
+ }
+ },
+
+ /**
+ * Destroy a single legend item
+ * @param {Object} item The series or point
+ */
+ destroyItem: function (item) {
+ var checkbox = item.checkbox;
+
+ // destroy SVG elements
+ each(['legendItem', 'legendLine', 'legendSymbol', 'legendGroup'], function (key) {
+ if (item[key]) {
+ item[key] = item[key].destroy();
+ }
+ });
+
+ if (checkbox) {
+ discardElement(item.checkbox);
+ }
+ },
+
+ /**
+ * Destroys the legend.
+ */
+ destroy: function () {
+ var legend = this,
+ legendGroup = legend.group,
+ box = legend.box;
+
+ if (box) {
+ legend.box = box.destroy();
+ }
+
+ if (legendGroup) {
+ legend.group = legendGroup.destroy();
+ }
+ },
+
+ /**
+ * Position the checkboxes after the width is determined
+ */
+ positionCheckboxes: function (scrollOffset) {
+ var alignAttr = this.group.alignAttr,
+ translateY,
+ clipHeight = this.clipHeight || this.legendHeight;
+
+ if (alignAttr) {
+ translateY = alignAttr.translateY;
+ each(this.allItems, function (item) {
+ var checkbox = item.checkbox,
+ top;
+
+ if (checkbox) {
+ top = (translateY + checkbox.y + (scrollOffset || 0) + 3);
+ css(checkbox, {
+ left: (alignAttr.translateX + item.checkboxOffset + checkbox.x - 20) + PX,
+ top: top + PX,
+ display: top > translateY - 6 && top < translateY + clipHeight - 6 ? '' : NONE
+ });
+ }
+ });
+ }
+ },
+
+ /**
+ * Render the legend title on top of the legend
+ */
+ renderTitle: function () {
+ var options = this.options,
+ padding = this.padding,
+ titleOptions = options.title,
+ titleHeight = 0,
+ bBox;
+
+ if (titleOptions.text) {
+ if (!this.title) {
+ this.title = this.chart.renderer.label(titleOptions.text, padding - 3, padding - 4, null, null, null, null, null, 'legend-title')
+ .attr({ zIndex: 1 })
+ .css(titleOptions.style)
+ .add(this.group);
+ }
+ bBox = this.title.getBBox();
+ titleHeight = bBox.height;
+ this.offsetWidth = bBox.width; // #1717
+ this.contentGroup.attr({ translateY: titleHeight });
+ }
+ this.titleHeight = titleHeight;
+ },
+
+ /**
+ * Render a single specific legend item
+ * @param {Object} item A series or point
+ */
+ renderItem: function (item) {
+ var legend = this,
+ chart = legend.chart,
+ renderer = chart.renderer,
+ options = legend.options,
+ horizontal = options.layout === 'horizontal',
+ symbolWidth = legend.symbolWidth,
+ symbolPadding = options.symbolPadding,
+ itemStyle = legend.itemStyle,
+ itemHiddenStyle = legend.itemHiddenStyle,
+ padding = legend.padding,
+ itemDistance = horizontal ? pick(options.itemDistance, 20) : 0,
+ ltr = !options.rtl,
+ itemHeight,
+ widthOption = options.width,
+ itemMarginBottom = options.itemMarginBottom || 0,
+ itemMarginTop = legend.itemMarginTop,
+ initialItemX = legend.initialItemX,
+ bBox,
+ itemWidth,
+ li = item.legendItem,
+ series = item.series && item.series.drawLegendSymbol ? item.series : item,
+ seriesOptions = series.options,
+ showCheckbox = legend.createCheckboxForItem && seriesOptions && seriesOptions.showCheckbox,
+ useHTML = options.useHTML;
+
+ if (!li) { // generate it once, later move it
+
+ // Generate the group box
+ // A group to hold the symbol and text. Text is to be appended in Legend class.
+ item.legendGroup = renderer.g('legend-item')
+ .attr({ zIndex: 1 })
+ .add(legend.scrollGroup);
+
+ // Generate the list item text and add it to the group
+ item.legendItem = li = renderer.text(
+ options.labelFormat ? format(options.labelFormat, item) : options.labelFormatter.call(item),
+ ltr ? symbolWidth + symbolPadding : -symbolPadding,
+ legend.baseline || 0,
+ useHTML
+ )
+ .css(merge(item.visible ? itemStyle : itemHiddenStyle)) // merge to prevent modifying original (#1021)
+ .attr({
+ align: ltr ? 'left' : 'right',
+ zIndex: 2
+ })
+ .add(item.legendGroup);
+
+ // Get the baseline for the first item - the font size is equal for all
+ if (!legend.baseline) {
+ legend.baseline = renderer.fontMetrics(itemStyle.fontSize, li).f + 3 + itemMarginTop;
+ li.attr('y', legend.baseline);
+ }
+
+ // Draw the legend symbol inside the group box
+ series.drawLegendSymbol(legend, item);
+
+ if (legend.setItemEvents) {
+ legend.setItemEvents(item, li, useHTML, itemStyle, itemHiddenStyle);
+ }
+
+ // Colorize the items
+ legend.colorizeItem(item, item.visible);
+
+ // add the HTML checkbox on top
+ if (showCheckbox) {
+ legend.createCheckboxForItem(item);
+ }
+ }
+
+ // calculate the positions for the next line
+ bBox = li.getBBox();
+
+ itemWidth = item.checkboxOffset =
+ options.itemWidth ||
+ item.legendItemWidth ||
+ symbolWidth + symbolPadding + bBox.width + itemDistance + (showCheckbox ? 20 : 0);
+ legend.itemHeight = itemHeight = mathRound(item.legendItemHeight || bBox.height);
+
+ // if the item exceeds the width, start a new line
+ if (horizontal && legend.itemX - initialItemX + itemWidth >
+ (widthOption || (chart.chartWidth - 2 * padding - initialItemX - options.x))) {
+ legend.itemX = initialItemX;
+ legend.itemY += itemMarginTop + legend.lastLineHeight + itemMarginBottom;
+ legend.lastLineHeight = 0; // reset for next line
+ }
+
+ // If the item exceeds the height, start a new column
+ /*if (!horizontal && legend.itemY + options.y + itemHeight > chart.chartHeight - spacingTop - spacingBottom) {
+ legend.itemY = legend.initialItemY;
+ legend.itemX += legend.maxItemWidth;
+ legend.maxItemWidth = 0;
+ }*/
+
+ // Set the edge positions
+ legend.maxItemWidth = mathMax(legend.maxItemWidth, itemWidth);
+ legend.lastItemY = itemMarginTop + legend.itemY + itemMarginBottom;
+ legend.lastLineHeight = mathMax(itemHeight, legend.lastLineHeight); // #915
+
+ // cache the position of the newly generated or reordered items
+ item._legendItemPos = [legend.itemX, legend.itemY];
+
+ // advance
+ if (horizontal) {
+ legend.itemX += itemWidth;
+
+ } else {
+ legend.itemY += itemMarginTop + itemHeight + itemMarginBottom;
+ legend.lastLineHeight = itemHeight;
+ }
+
+ // the width of the widest item
+ legend.offsetWidth = widthOption || mathMax(
+ (horizontal ? legend.itemX - initialItemX - itemDistance : itemWidth) + padding,
+ legend.offsetWidth
+ );
+ },
+
+ /**
+ * Get all items, which is one item per series for normal series and one item per point
+ * for pie series.
+ */
+ getAllItems: function () {
+ var allItems = [];
+ each(this.chart.series, function (series) {
+ var seriesOptions = series.options;
+
+ // Handle showInLegend. If the series is linked to another series, defaults to false.
+ if (!pick(seriesOptions.showInLegend, !defined(seriesOptions.linkedTo) ? UNDEFINED : false, true)) {
+ return;
+ }
+
+ // use points or series for the legend item depending on legendType
+ allItems = allItems.concat(
+ series.legendItems ||
+ (seriesOptions.legendType === 'point' ?
+ series.data :
+ series)
+ );
+ });
+ return allItems;
+ },
+
+ /**
+ * Render the legend. This method can be called both before and after
+ * chart.render. If called after, it will only rearrange items instead
+ * of creating new ones.
+ */
+ render: function () {
+ var legend = this,
+ chart = legend.chart,
+ renderer = chart.renderer,
+ legendGroup = legend.group,
+ allItems,
+ display,
+ legendWidth,
+ legendHeight,
+ box = legend.box,
+ options = legend.options,
+ padding = legend.padding,
+ legendBorderWidth = options.borderWidth,
+ legendBackgroundColor = options.backgroundColor;
+
+ legend.itemX = legend.initialItemX;
+ legend.itemY = legend.initialItemY;
+ legend.offsetWidth = 0;
+ legend.lastItemY = 0;
+
+ if (!legendGroup) {
+ legend.group = legendGroup = renderer.g('legend')
+ .attr({ zIndex: 7 })
+ .add();
+ legend.contentGroup = renderer.g()
+ .attr({ zIndex: 1 }) // above background
+ .add(legendGroup);
+ legend.scrollGroup = renderer.g()
+ .add(legend.contentGroup);
+ }
+
+ legend.renderTitle();
+
+ // add each series or point
+ allItems = legend.getAllItems();
+
+ // sort by legendIndex
+ stableSort(allItems, function (a, b) {
+ return ((a.options && a.options.legendIndex) || 0) - ((b.options && b.options.legendIndex) || 0);
+ });
+
+ // reversed legend
+ if (options.reversed) {
+ allItems.reverse();
+ }
+
+ legend.allItems = allItems;
+ legend.display = display = !!allItems.length;
+
+ // render the items
+ each(allItems, function (item) {
+ legend.renderItem(item);
+ });
+
+ // Draw the border
+ legendWidth = options.width || legend.offsetWidth;
+ legendHeight = legend.lastItemY + legend.lastLineHeight + legend.titleHeight;
+
+
+ legendHeight = legend.handleOverflow(legendHeight);
+
+ if (legendBorderWidth || legendBackgroundColor) {
+ legendWidth += padding;
+ legendHeight += padding;
+
+ if (!box) {
+ legend.box = box = renderer.rect(
+ 0,
+ 0,
+ legendWidth,
+ legendHeight,
+ options.borderRadius,
+ legendBorderWidth || 0
+ ).attr({
+ stroke: options.borderColor,
+ 'stroke-width': legendBorderWidth || 0,
+ fill: legendBackgroundColor || NONE
+ })
+ .add(legendGroup)
+ .shadow(options.shadow);
+ box.isNew = true;
+
+ } else if (legendWidth > 0 && legendHeight > 0) {
+ box[box.isNew ? 'attr' : 'animate'](
+ box.crisp({ width: legendWidth, height: legendHeight })
+ );
+ box.isNew = false;
+ }
+
+ // hide the border if no items
+ box[display ? 'show' : 'hide']();
+ }
+
+ legend.legendWidth = legendWidth;
+ legend.legendHeight = legendHeight;
+
+ // Now that the legend width and height are established, put the items in the
+ // final position
+ each(allItems, function (item) {
+ legend.positionItem(item);
+ });
+
+ // 1.x compatibility: positioning based on style
+ /*var props = ['left', 'right', 'top', 'bottom'],
+ prop,
+ i = 4;
+ while (i--) {
+ prop = props[i];
+ if (options.style[prop] && options.style[prop] !== 'auto') {
+ options[i < 2 ? 'align' : 'verticalAlign'] = prop;
+ options[i < 2 ? 'x' : 'y'] = pInt(options.style[prop]) * (i % 2 ? -1 : 1);
+ }
+ }*/
+
+ if (display) {
+ legendGroup.align(extend({
+ width: legendWidth,
+ height: legendHeight
+ }, options), true, 'spacingBox');
+ }
+
+ if (!chart.isResizing) {
+ this.positionCheckboxes();
+ }
+ },
+
+ /**
+ * Set up the overflow handling by adding navigation with up and down arrows below the
+ * legend.
+ */
+ handleOverflow: function (legendHeight) {
+ var legend = this,
+ chart = this.chart,
+ renderer = chart.renderer,
+ options = this.options,
+ optionsY = options.y,
+ alignTop = options.verticalAlign === 'top',
+ spaceHeight = chart.spacingBox.height + (alignTop ? -optionsY : optionsY) - this.padding,
+ maxHeight = options.maxHeight,
+ clipHeight,
+ clipRect = this.clipRect,
+ navOptions = options.navigation,
+ animation = pick(navOptions.animation, true),
+ arrowSize = navOptions.arrowSize || 12,
+ nav = this.nav,
+ pages = this.pages,
+ lastY,
+ allItems = this.allItems;
+
+ // Adjust the height
+ if (options.layout === 'horizontal') {
+ spaceHeight /= 2;
+ }
+ if (maxHeight) {
+ spaceHeight = mathMin(spaceHeight, maxHeight);
+ }
+
+ // Reset the legend height and adjust the clipping rectangle
+ pages.length = 0;
+ if (legendHeight > spaceHeight && !options.useHTML) {
+
+ this.clipHeight = clipHeight = mathMax(spaceHeight - 20 - this.titleHeight - this.padding, 0);
+ this.currentPage = pick(this.currentPage, 1);
+ this.fullHeight = legendHeight;
+
+ // Fill pages with Y positions so that the top of each a legend item defines
+ // the scroll top for each page (#2098)
+ each(allItems, function (item, i) {
+ var y = item._legendItemPos[1],
+ h = mathRound(item.legendItem.getBBox().height),
+ len = pages.length;
+
+ if (!len || (y - pages[len - 1] > clipHeight && (lastY || y) !== pages[len - 1])) {
+ pages.push(lastY || y);
+ len++;
+ }
+
+ if (i === allItems.length - 1 && y + h - pages[len - 1] > clipHeight) {
+ pages.push(y);
+ }
+ if (y !== lastY) {
+ lastY = y;
+ }
+ });
+
+ // Only apply clipping if needed. Clipping causes blurred legend in PDF export (#1787)
+ if (!clipRect) {
+ clipRect = legend.clipRect = renderer.clipRect(0, this.padding, 9999, 0);
+ legend.contentGroup.clip(clipRect);
+ }
+ clipRect.attr({
+ height: clipHeight
+ });
+
+ // Add navigation elements
+ if (!nav) {
+ this.nav = nav = renderer.g().attr({ zIndex: 1 }).add(this.group);
+ this.up = renderer.symbol('triangle', 0, 0, arrowSize, arrowSize)
+ .on('click', function () {
+ legend.scroll(-1, animation);
+ })
+ .add(nav);
+ this.pager = renderer.text('', 15, 10)
+ .css(navOptions.style)
+ .add(nav);
+ this.down = renderer.symbol('triangle-down', 0, 0, arrowSize, arrowSize)
+ .on('click', function () {
+ legend.scroll(1, animation);
+ })
+ .add(nav);
+ }
+
+ // Set initial position
+ legend.scroll(0);
+
+ legendHeight = spaceHeight;
+
+ } else if (nav) {
+ clipRect.attr({
+ height: chart.chartHeight
+ });
+ nav.hide();
+ this.scrollGroup.attr({
+ translateY: 1
+ });
+ this.clipHeight = 0; // #1379
+ }
+
+ return legendHeight;
+ },
+
+ /**
+ * Scroll the legend by a number of pages
+ * @param {Object} scrollBy
+ * @param {Object} animation
+ */
+ scroll: function (scrollBy, animation) {
+ var pages = this.pages,
+ pageCount = pages.length,
+ currentPage = this.currentPage + scrollBy,
+ clipHeight = this.clipHeight,
+ navOptions = this.options.navigation,
+ activeColor = navOptions.activeColor,
+ inactiveColor = navOptions.inactiveColor,
+ pager = this.pager,
+ padding = this.padding,
+ scrollOffset;
+
+ // When resizing while looking at the last page
+ if (currentPage > pageCount) {
+ currentPage = pageCount;
+ }
+
+ if (currentPage > 0) {
+
+ if (animation !== UNDEFINED) {
+ setAnimation(animation, this.chart);
+ }
+
+ this.nav.attr({
+ translateX: padding,
+ translateY: clipHeight + this.padding + 7 + this.titleHeight,
+ visibility: VISIBLE
+ });
+ this.up.attr({
+ fill: currentPage === 1 ? inactiveColor : activeColor
+ })
+ .css({
+ cursor: currentPage === 1 ? 'default' : 'pointer'
+ });
+ pager.attr({
+ text: currentPage + '/' + pageCount
+ });
+ this.down.attr({
+ x: 18 + this.pager.getBBox().width, // adjust to text width
+ fill: currentPage === pageCount ? inactiveColor : activeColor
+ })
+ .css({
+ cursor: currentPage === pageCount ? 'default' : 'pointer'
+ });
+
+ scrollOffset = -pages[currentPage - 1] + this.initialItemY;
+
+ this.scrollGroup.animate({
+ translateY: scrollOffset
+ });
+
+ this.currentPage = currentPage;
+ this.positionCheckboxes(scrollOffset);
+ }
+
+ }
+
+};
+
+/*
+ * LegendSymbolMixin
+ */
+
+var LegendSymbolMixin = Highcharts.LegendSymbolMixin = {
+
+ /**
+ * Get the series' symbol in the legend
+ *
+ * @param {Object} legend The legend object
+ * @param {Object} item The series (this) or point
+ */
+ drawRectangle: function (legend, item) {
+ var symbolHeight = legend.options.symbolHeight || 12;
+
+ item.legendSymbol = this.chart.renderer.rect(
+ 0,
+ legend.baseline - 5 - (symbolHeight / 2),
+ legend.symbolWidth,
+ symbolHeight,
+ legend.options.symbolRadius || 0
+ ).attr({
+ zIndex: 3
+ }).add(item.legendGroup);
+
+ },
+
+ /**
+ * Get the series' symbol in the legend. This method should be overridable to create custom
+ * symbols through Highcharts.seriesTypes[type].prototype.drawLegendSymbols.
+ *
+ * @param {Object} legend The legend object
+ */
+ drawLineMarker: function (legend) {
+
+ var options = this.options,
+ markerOptions = options.marker,
+ radius,
+ legendOptions = legend.options,
+ legendSymbol,
+ symbolWidth = legend.symbolWidth,
+ renderer = this.chart.renderer,
+ legendItemGroup = this.legendGroup,
+ verticalCenter = legend.baseline - mathRound(renderer.fontMetrics(legendOptions.itemStyle.fontSize, this.legendItem).b * 0.3),
+ attr;
+
+ // Draw the line
+ if (options.lineWidth) {
+ attr = {
+ 'stroke-width': options.lineWidth
+ };
+ if (options.dashStyle) {
+ attr.dashstyle = options.dashStyle;
+ }
+ this.legendLine = renderer.path([
+ M,
+ 0,
+ verticalCenter,
+ L,
+ symbolWidth,
+ verticalCenter
+ ])
+ .attr(attr)
+ .add(legendItemGroup);
+ }
+
+ // Draw the marker
+ if (markerOptions && markerOptions.enabled !== false) {
+ radius = markerOptions.radius;
+ this.legendSymbol = legendSymbol = renderer.symbol(
+ this.symbol,
+ (symbolWidth / 2) - radius,
+ verticalCenter - radius,
+ 2 * radius,
+ 2 * radius
+ )
+ .add(legendItemGroup);
+ legendSymbol.isMarker = true;
+ }
+ }
+};
+
+// Workaround for #2030, horizontal legend items not displaying in IE11 Preview,
+// and for #2580, a similar drawing flaw in Firefox 26.
+// TODO: Explore if there's a general cause for this. The problem may be related
+// to nested group elements, as the legend item texts are within 4 group elements.
+if (/Trident\/7\.0/.test(userAgent) || isFirefox) {
+ wrap(Legend.prototype, 'positionItem', function (proceed, item) {
+ var legend = this,
+ runPositionItem = function () { // If chart destroyed in sync, this is undefined (#2030)
+ if (item._legendItemPos) {
+ proceed.call(legend, item);
+ }
+ };
+
+ // Do it now, for export and to get checkbox placement
+ runPositionItem();
+
+ // Do it after to work around the core issue
+ setTimeout(runPositionItem);
+ });
+}
+/**
+ * The chart class
+ * @param {Object} options
+ * @param {Function} callback Function to run when the chart has loaded
+ */
+function Chart() {
+ this.init.apply(this, arguments);
+}
+
+Chart.prototype = {
+
+ /**
+ * Initialize the chart
+ */
+ init: function (userOptions, callback) {
+
+ // Handle regular options
+ var options,
+ seriesOptions = userOptions.series; // skip merging data points to increase performance
+
+ userOptions.series = null;
+ options = merge(defaultOptions, userOptions); // do the merge
+ options.series = userOptions.series = seriesOptions; // set back the series data
+ this.userOptions = userOptions;
+
+ var optionsChart = options.chart;
+
+ // Create margin & spacing array
+ this.margin = this.splashArray('margin', optionsChart);
+ this.spacing = this.splashArray('spacing', optionsChart);
+
+ var chartEvents = optionsChart.events;
+
+ //this.runChartClick = chartEvents && !!chartEvents.click;
+ this.bounds = { h: {}, v: {} }; // Pixel data bounds for touch zoom
+
+ this.callback = callback;
+ this.isResizing = 0;
+ this.options = options;
+ //chartTitleOptions = UNDEFINED;
+ //chartSubtitleOptions = UNDEFINED;
+
+ this.axes = [];
+ this.series = [];
+ this.hasCartesianSeries = optionsChart.showAxes;
+ //this.axisOffset = UNDEFINED;
+ //this.maxTicks = UNDEFINED; // handle the greatest amount of ticks on grouped axes
+ //this.inverted = UNDEFINED;
+ //this.loadingShown = UNDEFINED;
+ //this.container = UNDEFINED;
+ //this.chartWidth = UNDEFINED;
+ //this.chartHeight = UNDEFINED;
+ //this.marginRight = UNDEFINED;
+ //this.marginBottom = UNDEFINED;
+ //this.containerWidth = UNDEFINED;
+ //this.containerHeight = UNDEFINED;
+ //this.oldChartWidth = UNDEFINED;
+ //this.oldChartHeight = UNDEFINED;
+
+ //this.renderTo = UNDEFINED;
+ //this.renderToClone = UNDEFINED;
+
+ //this.spacingBox = UNDEFINED
+
+ //this.legend = UNDEFINED;
+
+ // Elements
+ //this.chartBackground = UNDEFINED;
+ //this.plotBackground = UNDEFINED;
+ //this.plotBGImage = UNDEFINED;
+ //this.plotBorder = UNDEFINED;
+ //this.loadingDiv = UNDEFINED;
+ //this.loadingSpan = UNDEFINED;
+
+ var chart = this,
+ eventType;
+
+ // Add the chart to the global lookup
+ chart.index = charts.length;
+ charts.push(chart);
+ chartCount++;
+
+ // Set up auto resize
+ if (optionsChart.reflow !== false) {
+ addEvent(chart, 'load', function () {
+ chart.initReflow();
+ });
+ }
+
+ // Chart event handlers
+ if (chartEvents) {
+ for (eventType in chartEvents) {
+ addEvent(chart, eventType, chartEvents[eventType]);
+ }
+ }
+
+ chart.xAxis = [];
+ chart.yAxis = [];
+
+ // Expose methods and variables
+ chart.animation = useCanVG ? false : pick(optionsChart.animation, true);
+ chart.pointCount = chart.colorCounter = chart.symbolCounter = 0;
+
+ chart.firstRender();
+ },
+
+ /**
+ * Initialize an individual series, called internally before render time
+ */
+ initSeries: function (options) {
+ var chart = this,
+ optionsChart = chart.options.chart,
+ type = options.type || optionsChart.type || optionsChart.defaultSeriesType,
+ series,
+ constr = seriesTypes[type];
+
+ // No such series type
+ if (!constr) {
+ error(17, true);
+ }
+
+ series = new constr();
+ series.init(this, options);
+ return series;
+ },
+
+ /**
+ * Check whether a given point is within the plot area
+ *
+ * @param {Number} plotX Pixel x relative to the plot area
+ * @param {Number} plotY Pixel y relative to the plot area
+ * @param {Boolean} inverted Whether the chart is inverted
+ */
+ isInsidePlot: function (plotX, plotY, inverted) {
+ var x = inverted ? plotY : plotX,
+ y = inverted ? plotX : plotY;
+
+ return x >= 0 &&
+ x <= this.plotWidth &&
+ y >= 0 &&
+ y <= this.plotHeight;
+ },
+
+ /**
+ * Adjust all axes tick amounts
+ */
+ adjustTickAmounts: function () {
+ if (this.options.chart.alignTicks !== false) {
+ each(this.axes, function (axis) {
+ axis.adjustTickAmount();
+ });
+ }
+ this.maxTicks = null;
+ },
+
+ /**
+ * Redraw legend, axes or series based on updated data
+ *
+ * @param {Boolean|Object} animation Whether to apply animation, and optionally animation
+ * configuration
+ */
+ redraw: function (animation) {
+ var chart = this,
+ axes = chart.axes,
+ series = chart.series,
+ pointer = chart.pointer,
+ legend = chart.legend,
+ redrawLegend = chart.isDirtyLegend,
+ hasStackedSeries,
+ hasDirtyStacks,
+ hasCartesianSeries = chart.hasCartesianSeries,
+ isDirtyBox = chart.isDirtyBox, // todo: check if it has actually changed?
+ seriesLength = series.length,
+ i = seriesLength,
+ serie,
+ renderer = chart.renderer,
+ isHiddenChart = renderer.isHidden(),
+ afterRedraw = [];
+
+ setAnimation(animation, chart);
+
+ if (isHiddenChart) {
+ chart.cloneRenderTo();
+ }
+
+ // Adjust title layout (reflow multiline text)
+ chart.layOutTitles();
+
+ // link stacked series
+ while (i--) {
+ serie = series[i];
+
+ if (serie.options.stacking) {
+ hasStackedSeries = true;
+
+ if (serie.isDirty) {
+ hasDirtyStacks = true;
+ break;
+ }
+ }
+ }
+ if (hasDirtyStacks) { // mark others as dirty
+ i = seriesLength;
+ while (i--) {
+ serie = series[i];
+ if (serie.options.stacking) {
+ serie.isDirty = true;
+ }
+ }
+ }
+
+ // handle updated data in the series
+ each(series, function (serie) {
+ if (serie.isDirty) { // prepare the data so axis can read it
+ if (serie.options.legendType === 'point') {
+ redrawLegend = true;
+ }
+ }
+ });
+
+ // handle added or removed series
+ if (redrawLegend && legend.options.enabled) { // series or pie points are added or removed
+ // draw legend graphics
+ legend.render();
+
+ chart.isDirtyLegend = false;
+ }
+
+ // reset stacks
+ if (hasStackedSeries) {
+ chart.getStacks();
+ }
+
+
+ if (hasCartesianSeries) {
+ if (!chart.isResizing) {
+
+ // reset maxTicks
+ chart.maxTicks = null;
+
+ // set axes scales
+ each(axes, function (axis) {
+ axis.setScale();
+ });
+ }
+
+ chart.adjustTickAmounts();
+ }
+
+ chart.getMargins(); // #3098
+
+ if (hasCartesianSeries) {
+ // If one axis is dirty, all axes must be redrawn (#792, #2169)
+ each(axes, function (axis) {
+ if (axis.isDirty) {
+ isDirtyBox = true;
+ }
+ });
+
+ // redraw axes
+ each(axes, function (axis) {
+
+ // Fire 'afterSetExtremes' only if extremes are set
+ if (axis.isDirtyExtremes) { // #821
+ axis.isDirtyExtremes = false;
+ afterRedraw.push(function () { // prevent a recursive call to chart.redraw() (#1119)
+ fireEvent(axis, 'afterSetExtremes', extend(axis.eventArgs, axis.getExtremes())); // #747, #751
+ delete axis.eventArgs;
+ });
+ }
+
+ if (isDirtyBox || hasStackedSeries) {
+ axis.redraw();
+ }
+ });
+ }
+
+ // the plot areas size has changed
+ if (isDirtyBox) {
+ chart.drawChartBox();
+ }
+
+
+ // redraw affected series
+ each(series, function (serie) {
+ if (serie.isDirty && serie.visible &&
+ (!serie.isCartesian || serie.xAxis)) { // issue #153
+ serie.redraw();
+ }
+ });
+
+ // move tooltip or reset
+ if (pointer) {
+ pointer.reset(true);
+ }
+
+ // redraw if canvas
+ renderer.draw();
+
+ // fire the event
+ fireEvent(chart, 'redraw'); // jQuery breaks this when calling it from addEvent. Overwrites chart.redraw
+
+ if (isHiddenChart) {
+ chart.cloneRenderTo(true);
+ }
+
+ // Fire callbacks that are put on hold until after the redraw
+ each(afterRedraw, function (callback) {
+ callback.call();
+ });
+ },
+
+ /**
+ * Get an axis, series or point object by id.
+ * @param id {String} The id as given in the configuration options
+ */
+ get: function (id) {
+ var chart = this,
+ axes = chart.axes,
+ series = chart.series;
+
+ var i,
+ j,
+ points;
+
+ // search axes
+ for (i = 0; i < axes.length; i++) {
+ if (axes[i].options.id === id) {
+ return axes[i];
+ }
+ }
+
+ // search series
+ for (i = 0; i < series.length; i++) {
+ if (series[i].options.id === id) {
+ return series[i];
+ }
+ }
+
+ // search points
+ for (i = 0; i < series.length; i++) {
+ points = series[i].points || [];
+ for (j = 0; j < points.length; j++) {
+ if (points[j].id === id) {
+ return points[j];
+ }
+ }
+ }
+ return null;
+ },
+
+ /**
+ * Create the Axis instances based on the config options
+ */
+ getAxes: function () {
+ var chart = this,
+ options = this.options,
+ xAxisOptions = options.xAxis = splat(options.xAxis || {}),
+ yAxisOptions = options.yAxis = splat(options.yAxis || {}),
+ optionsArray,
+ axis;
+
+ // make sure the options are arrays and add some members
+ each(xAxisOptions, function (axis, i) {
+ axis.index = i;
+ axis.isX = true;
+ });
+
+ each(yAxisOptions, function (axis, i) {
+ axis.index = i;
+ });
+
+ // concatenate all axis options into one array
+ optionsArray = xAxisOptions.concat(yAxisOptions);
+
+ each(optionsArray, function (axisOptions) {
+ axis = new Axis(chart, axisOptions);
+ });
+
+ chart.adjustTickAmounts();
+ },
+
+
+ /**
+ * Get the currently selected points from all series
+ */
+ getSelectedPoints: function () {
+ var points = [];
+ each(this.series, function (serie) {
+ points = points.concat(grep(serie.points || [], function (point) {
+ return point.selected;
+ }));
+ });
+ return points;
+ },
+
+ /**
+ * Get the currently selected series
+ */
+ getSelectedSeries: function () {
+ return grep(this.series, function (serie) {
+ return serie.selected;
+ });
+ },
+
+ /**
+ * Generate stacks for each series and calculate stacks total values
+ */
+ getStacks: function () {
+ var chart = this;
+
+ // reset stacks for each yAxis
+ each(chart.yAxis, function (axis) {
+ if (axis.stacks && axis.hasVisibleSeries) {
+ axis.oldStacks = axis.stacks;
+ }
+ });
+
+ each(chart.series, function (series) {
+ if (series.options.stacking && (series.visible === true || chart.options.chart.ignoreHiddenSeries === false)) {
+ series.stackKey = series.type + pick(series.options.stack, '');
+ }
+ });
+ },
+
+ /**
+ * Show the title and subtitle of the chart
+ *
+ * @param titleOptions {Object} New title options
+ * @param subtitleOptions {Object} New subtitle options
+ *
+ */
+ setTitle: function (titleOptions, subtitleOptions, redraw) {
+ var chart = this,
+ options = chart.options,
+ chartTitleOptions,
+ chartSubtitleOptions;
+
+ chartTitleOptions = options.title = merge(options.title, titleOptions);
+ chartSubtitleOptions = options.subtitle = merge(options.subtitle, subtitleOptions);
+
+ // add title and subtitle
+ each([
+ ['title', titleOptions, chartTitleOptions],
+ ['subtitle', subtitleOptions, chartSubtitleOptions]
+ ], function (arr) {
+ var name = arr[0],
+ title = chart[name],
+ titleOptions = arr[1],
+ chartTitleOptions = arr[2];
+
+ if (title && titleOptions) {
+ chart[name] = title = title.destroy(); // remove old
+ }
+
+ if (chartTitleOptions && chartTitleOptions.text && !title) {
+ chart[name] = chart.renderer.text(
+ chartTitleOptions.text,
+ 0,
+ 0,
+ chartTitleOptions.useHTML
+ )
+ .attr({
+ align: chartTitleOptions.align,
+ 'class': PREFIX + name,
+ zIndex: chartTitleOptions.zIndex || 4
+ })
+ .css(chartTitleOptions.style)
+ .add();
+ }
+ });
+ chart.layOutTitles(redraw);
+ },
+
+ /**
+ * Lay out the chart titles and cache the full offset height for use in getMargins
+ */
+ layOutTitles: function (redraw) {
+ var titleOffset = 0,
+ title = this.title,
+ subtitle = this.subtitle,
+ options = this.options,
+ titleOptions = options.title,
+ subtitleOptions = options.subtitle,
+ requiresDirtyBox,
+ renderer = this.renderer,
+ autoWidth = this.spacingBox.width - 44; // 44 makes room for default context button
+
+ if (title) {
+ title
+ .css({ width: (titleOptions.width || autoWidth) + PX })
+ .align(extend({
+ y: renderer.fontMetrics(titleOptions.style.fontSize, title).b - 3
+ }, titleOptions), false, 'spacingBox');
+
+ if (!titleOptions.floating && !titleOptions.verticalAlign) {
+ titleOffset = title.getBBox().height;
+ }
+ }
+ if (subtitle) {
+ subtitle
+ .css({ width: (subtitleOptions.width || autoWidth) + PX })
+ .align(extend({
+ y: titleOffset + (titleOptions.margin - 13) + renderer.fontMetrics(titleOptions.style.fontSize, subtitle).b
+ }, subtitleOptions), false, 'spacingBox');
+
+ if (!subtitleOptions.floating && !subtitleOptions.verticalAlign) {
+ titleOffset = mathCeil(titleOffset + subtitle.getBBox().height);
+ }
+ }
+
+ requiresDirtyBox = this.titleOffset !== titleOffset;
+ this.titleOffset = titleOffset; // used in getMargins
+
+ if (!this.isDirtyBox && requiresDirtyBox) {
+ this.isDirtyBox = requiresDirtyBox;
+ // Redraw if necessary (#2719, #2744)
+ if (this.hasRendered && pick(redraw, true) && this.isDirtyBox) {
+ this.redraw();
+ }
+ }
+ },
+
+ /**
+ * Get chart width and height according to options and container size
+ */
+ getChartSize: function () {
+ var chart = this,
+ optionsChart = chart.options.chart,
+ widthOption = optionsChart.width,
+ heightOption = optionsChart.height,
+ renderTo = chart.renderToClone || chart.renderTo;
+
+ // get inner width and height from jQuery (#824)
+ if (!defined(widthOption)) {
+ chart.containerWidth = adapterRun(renderTo, 'width');
+ }
+ if (!defined(heightOption)) {
+ chart.containerHeight = adapterRun(renderTo, 'height');
+ }
+
+ chart.chartWidth = mathMax(0, widthOption || chart.containerWidth || 600); // #1393, 1460
+ chart.chartHeight = mathMax(0, pick(heightOption,
+ // the offsetHeight of an empty container is 0 in standard browsers, but 19 in IE7:
+ chart.containerHeight > 19 ? chart.containerHeight : 400));
+ },
+
+ /**
+ * Create a clone of the chart's renderTo div and place it outside the viewport to allow
+ * size computation on chart.render and chart.redraw
+ */
+ cloneRenderTo: function (revert) {
+ var clone = this.renderToClone,
+ container = this.container;
+
+ // Destroy the clone and bring the container back to the real renderTo div
+ if (revert) {
+ if (clone) {
+ this.renderTo.appendChild(container);
+ discardElement(clone);
+ delete this.renderToClone;
+ }
+
+ // Set up the clone
+ } else {
+ if (container && container.parentNode === this.renderTo) {
+ this.renderTo.removeChild(container); // do not clone this
+ }
+ this.renderToClone = clone = this.renderTo.cloneNode(0);
+ css(clone, {
+ position: ABSOLUTE,
+ top: '-9999px',
+ display: 'block' // #833
+ });
+ if (clone.style.setProperty) { // #2631
+ clone.style.setProperty('display', 'block', 'important');
+ }
+ doc.body.appendChild(clone);
+ if (container) {
+ clone.appendChild(container);
+ }
+ }
+ },
+
+ /**
+ * Get the containing element, determine the size and create the inner container
+ * div to hold the chart
+ */
+ getContainer: function () {
+ var chart = this,
+ container,
+ optionsChart = chart.options.chart,
+ chartWidth,
+ chartHeight,
+ renderTo,
+ indexAttrName = 'data-highcharts-chart',
+ oldChartIndex,
+ containerId;
+
+ chart.renderTo = renderTo = optionsChart.renderTo;
+ containerId = PREFIX + idCounter++;
+
+ if (isString(renderTo)) {
+ chart.renderTo = renderTo = doc.getElementById(renderTo);
+ }
+
+ // Display an error if the renderTo is wrong
+ if (!renderTo) {
+ error(13, true);
+ }
+
+ // If the container already holds a chart, destroy it. The check for hasRendered is there
+ // because web pages that are saved to disk from the browser, will preserve the data-highcharts-chart
+ // attribute and the SVG contents, but not an interactive chart. So in this case,
+ // charts[oldChartIndex] will point to the wrong chart if any (#2609).
+ oldChartIndex = pInt(attr(renderTo, indexAttrName));
+ if (!isNaN(oldChartIndex) && charts[oldChartIndex] && charts[oldChartIndex].hasRendered) {
+ charts[oldChartIndex].destroy();
+ }
+
+ // Make a reference to the chart from the div
+ attr(renderTo, indexAttrName, chart.index);
+
+ // remove previous chart
+ renderTo.innerHTML = '';
+
+ // If the container doesn't have an offsetWidth, it has or is a child of a node
+ // that has display:none. We need to temporarily move it out to a visible
+ // state to determine the size, else the legend and tooltips won't render
+ // properly. The allowClone option is used in sparklines as a micro optimization,
+ // saving about 1-2 ms each chart.
+ if (!optionsChart.skipClone && !renderTo.offsetWidth) {
+ chart.cloneRenderTo();
+ }
+
+ // get the width and height
+ chart.getChartSize();
+ chartWidth = chart.chartWidth;
+ chartHeight = chart.chartHeight;
+
+ // create the inner container
+ chart.container = container = createElement(DIV, {
+ className: PREFIX + 'container' +
+ (optionsChart.className ? ' ' + optionsChart.className : ''),
+ id: containerId
+ }, extend({
+ position: RELATIVE,
+ overflow: HIDDEN, // needed for context menu (avoid scrollbars) and
+ // content overflow in IE
+ width: chartWidth + PX,
+ height: chartHeight + PX,
+ textAlign: 'left',
+ lineHeight: 'normal', // #427
+ zIndex: 0, // #1072
+ '-webkit-tap-highlight-color': 'rgba(0,0,0,0)'
+ }, optionsChart.style),
+ chart.renderToClone || renderTo
+ );
+
+ // cache the cursor (#1650)
+ chart._cursor = container.style.cursor;
+
+ // Initialize the renderer
+ chart.renderer =
+ optionsChart.forExport ? // force SVG, used for SVG export
+ new SVGRenderer(container, chartWidth, chartHeight, optionsChart.style, true) :
+ new Renderer(container, chartWidth, chartHeight, optionsChart.style);
+
+ if (useCanVG) {
+ // If we need canvg library, extend and configure the renderer
+ // to get the tracker for translating mouse events
+ chart.renderer.create(chart, container, chartWidth, chartHeight);
+ }
+ },
+
+ /**
+ * Calculate margins by rendering axis labels in a preliminary position. Title,
+ * subtitle and legend have already been rendered at this stage, but will be
+ * moved into their final positions
+ */
+ getMargins: function () {
+ var chart = this,
+ spacing = chart.spacing,
+ axisOffset,
+ legend = chart.legend,
+ margin = chart.margin,
+ legendOptions = chart.options.legend,
+ legendMargin = pick(legendOptions.margin, 20),
+ legendX = legendOptions.x,
+ legendY = legendOptions.y,
+ align = legendOptions.align,
+ verticalAlign = legendOptions.verticalAlign,
+ titleOffset = chart.titleOffset;
+
+ chart.resetMargins();
+ axisOffset = chart.axisOffset;
+
+ // Adjust for title and subtitle
+ if (titleOffset && !defined(margin[0])) {
+ chart.plotTop = mathMax(chart.plotTop, titleOffset + chart.options.title.margin + spacing[0]);
+ }
+
+ // Adjust for legend
+ if (legend.display && !legendOptions.floating) {
+ if (align === 'right') { // horizontal alignment handled first
+ if (!defined(margin[1])) {
+ chart.marginRight = mathMax(
+ chart.marginRight,
+ legend.legendWidth - legendX + legendMargin + spacing[1]
+ );
+ }
+ } else if (align === 'left') {
+ if (!defined(margin[3])) {
+ chart.plotLeft = mathMax(
+ chart.plotLeft,
+ legend.legendWidth + legendX + legendMargin + spacing[3]
+ );
+ }
+
+ } else if (verticalAlign === 'top') {
+ if (!defined(margin[0])) {
+ chart.plotTop = mathMax(
+ chart.plotTop,
+ legend.legendHeight + legendY + legendMargin + spacing[0]
+ );
+ }
+
+ } else if (verticalAlign === 'bottom') {
+ if (!defined(margin[2])) {
+ chart.marginBottom = mathMax(
+ chart.marginBottom,
+ legend.legendHeight - legendY + legendMargin + spacing[2]
+ );
+ }
+ }
+ }
+
+ // adjust for scroller
+ if (chart.extraBottomMargin) {
+ chart.marginBottom += chart.extraBottomMargin;
+ }
+ if (chart.extraTopMargin) {
+ chart.plotTop += chart.extraTopMargin;
+ }
+
+ // pre-render axes to get labels offset width
+ if (chart.hasCartesianSeries) {
+ each(chart.axes, function (axis) {
+ axis.getOffset();
+ });
+ }
+
+ if (!defined(margin[3])) {
+ chart.plotLeft += axisOffset[3];
+ }
+ if (!defined(margin[0])) {
+ chart.plotTop += axisOffset[0];
+ }
+ if (!defined(margin[2])) {
+ chart.marginBottom += axisOffset[2];
+ }
+ if (!defined(margin[1])) {
+ chart.marginRight += axisOffset[1];
+ }
+
+ chart.setChartSize();
+
+ },
+
+ /**
+ * Resize the chart to its container if size is not explicitly set
+ */
+ reflow: function (e) {
+ var chart = this,
+ optionsChart = chart.options.chart,
+ renderTo = chart.renderTo,
+ width = optionsChart.width || adapterRun(renderTo, 'width'),
+ height = optionsChart.height || adapterRun(renderTo, 'height'),
+ target = e ? e.target : win, // #805 - MooTools doesn't supply e
+ doReflow = function () {
+ if (chart.container) { // It may have been destroyed in the meantime (#1257)
+ chart.setSize(width, height, false);
+ chart.hasUserSize = null;
+ }
+ };
+
+ // Width and height checks for display:none. Target is doc in IE8 and Opera,
+ // win in Firefox, Chrome and IE9.
+ if (!chart.hasUserSize && width && height && (target === win || target === doc)) {
+ if (width !== chart.containerWidth || height !== chart.containerHeight) {
+ clearTimeout(chart.reflowTimeout);
+ if (e) { // Called from window.resize
+ chart.reflowTimeout = setTimeout(doReflow, 100);
+ } else { // Called directly (#2224)
+ doReflow();
+ }
+ }
+ chart.containerWidth = width;
+ chart.containerHeight = height;
+ }
+ },
+
+ /**
+ * Add the event handlers necessary for auto resizing
+ */
+ initReflow: function () {
+ var chart = this,
+ reflow = function (e) {
+ chart.reflow(e);
+ };
+
+
+ addEvent(win, 'resize', reflow);
+ addEvent(chart, 'destroy', function () {
+ removeEvent(win, 'resize', reflow);
+ });
+ },
+
+ /**
+ * Resize the chart to a given width and height
+ * @param {Number} width
+ * @param {Number} height
+ * @param {Object|Boolean} animation
+ */
+ setSize: function (width, height, animation) {
+ var chart = this,
+ chartWidth,
+ chartHeight,
+ fireEndResize;
+
+ // Handle the isResizing counter
+ chart.isResizing += 1;
+ fireEndResize = function () {
+ if (chart) {
+ fireEvent(chart, 'endResize', null, function () {
+ chart.isResizing -= 1;
+ });
+ }
+ };
+
+ // set the animation for the current process
+ setAnimation(animation, chart);
+
+ chart.oldChartHeight = chart.chartHeight;
+ chart.oldChartWidth = chart.chartWidth;
+ if (defined(width)) {
+ chart.chartWidth = chartWidth = mathMax(0, mathRound(width));
+ chart.hasUserSize = !!chartWidth;
+ }
+ if (defined(height)) {
+ chart.chartHeight = chartHeight = mathMax(0, mathRound(height));
+ }
+
+ // Resize the container with the global animation applied if enabled (#2503)
+ (globalAnimation ? animate : css)(chart.container, {
+ width: chartWidth + PX,
+ height: chartHeight + PX
+ }, globalAnimation);
+
+ chart.setChartSize(true);
+ chart.renderer.setSize(chartWidth, chartHeight, animation);
+
+ // handle axes
+ chart.maxTicks = null;
+ each(chart.axes, function (axis) {
+ axis.isDirty = true;
+ axis.setScale();
+ });
+
+ // make sure non-cartesian series are also handled
+ each(chart.series, function (serie) {
+ serie.isDirty = true;
+ });
+
+ chart.isDirtyLegend = true; // force legend redraw
+ chart.isDirtyBox = true; // force redraw of plot and chart border
+
+ chart.layOutTitles(); // #2857
+ chart.getMargins();
+
+ chart.redraw(animation);
+
+
+ chart.oldChartHeight = null;
+ fireEvent(chart, 'resize');
+
+ // fire endResize and set isResizing back
+ // If animation is disabled, fire without delay
+ if (globalAnimation === false) {
+ fireEndResize();
+ } else { // else set a timeout with the animation duration
+ setTimeout(fireEndResize, (globalAnimation && globalAnimation.duration) || 500);
+ }
+ },
+
+ /**
+ * Set the public chart properties. This is done before and after the pre-render
+ * to determine margin sizes
+ */
+ setChartSize: function (skipAxes) {
+ var chart = this,
+ inverted = chart.inverted,
+ renderer = chart.renderer,
+ chartWidth = chart.chartWidth,
+ chartHeight = chart.chartHeight,
+ optionsChart = chart.options.chart,
+ spacing = chart.spacing,
+ clipOffset = chart.clipOffset,
+ clipX,
+ clipY,
+ plotLeft,
+ plotTop,
+ plotWidth,
+ plotHeight,
+ plotBorderWidth;
+
+ chart.plotLeft = plotLeft = mathRound(chart.plotLeft);
+ chart.plotTop = plotTop = mathRound(chart.plotTop);
+ chart.plotWidth = plotWidth = mathMax(0, mathRound(chartWidth - plotLeft - chart.marginRight));
+ chart.plotHeight = plotHeight = mathMax(0, mathRound(chartHeight - plotTop - chart.marginBottom));
+
+ chart.plotSizeX = inverted ? plotHeight : plotWidth;
+ chart.plotSizeY = inverted ? plotWidth : plotHeight;
+
+ chart.plotBorderWidth = optionsChart.plotBorderWidth || 0;
+
+ // Set boxes used for alignment
+ chart.spacingBox = renderer.spacingBox = {
+ x: spacing[3],
+ y: spacing[0],
+ width: chartWidth - spacing[3] - spacing[1],
+ height: chartHeight - spacing[0] - spacing[2]
+ };
+ chart.plotBox = renderer.plotBox = {
+ x: plotLeft,
+ y: plotTop,
+ width: plotWidth,
+ height: plotHeight
+ };
+
+ plotBorderWidth = 2 * mathFloor(chart.plotBorderWidth / 2);
+ clipX = mathCeil(mathMax(plotBorderWidth, clipOffset[3]) / 2);
+ clipY = mathCeil(mathMax(plotBorderWidth, clipOffset[0]) / 2);
+ chart.clipBox = {
+ x: clipX,
+ y: clipY,
+ width: mathFloor(chart.plotSizeX - mathMax(plotBorderWidth, clipOffset[1]) / 2 - clipX),
+ height: mathMax(0, mathFloor(chart.plotSizeY - mathMax(plotBorderWidth, clipOffset[2]) / 2 - clipY))
+ };
+
+ if (!skipAxes) {
+ each(chart.axes, function (axis) {
+ axis.setAxisSize();
+ axis.setAxisTranslation();
+ });
+ }
+ },
+
+ /**
+ * Initial margins before auto size margins are applied
+ */
+ resetMargins: function () {
+ var chart = this,
+ spacing = chart.spacing,
+ margin = chart.margin;
+
+ chart.plotTop = pick(margin[0], spacing[0]);
+ chart.marginRight = pick(margin[1], spacing[1]);
+ chart.marginBottom = pick(margin[2], spacing[2]);
+ chart.plotLeft = pick(margin[3], spacing[3]);
+ chart.axisOffset = [0, 0, 0, 0]; // top, right, bottom, left
+ chart.clipOffset = [0, 0, 0, 0];
+ },
+
+ /**
+ * Draw the borders and backgrounds for chart and plot area
+ */
+ drawChartBox: function () {
+ var chart = this,
+ optionsChart = chart.options.chart,
+ renderer = chart.renderer,
+ chartWidth = chart.chartWidth,
+ chartHeight = chart.chartHeight,
+ chartBackground = chart.chartBackground,
+ plotBackground = chart.plotBackground,
+ plotBorder = chart.plotBorder,
+ plotBGImage = chart.plotBGImage,
+ chartBorderWidth = optionsChart.borderWidth || 0,
+ chartBackgroundColor = optionsChart.backgroundColor,
+ plotBackgroundColor = optionsChart.plotBackgroundColor,
+ plotBackgroundImage = optionsChart.plotBackgroundImage,
+ plotBorderWidth = optionsChart.plotBorderWidth || 0,
+ mgn,
+ bgAttr,
+ plotLeft = chart.plotLeft,
+ plotTop = chart.plotTop,
+ plotWidth = chart.plotWidth,
+ plotHeight = chart.plotHeight,
+ plotBox = chart.plotBox,
+ clipRect = chart.clipRect,
+ clipBox = chart.clipBox;
+
+ // Chart area
+ mgn = chartBorderWidth + (optionsChart.shadow ? 8 : 0);
+
+ if (chartBorderWidth || chartBackgroundColor) {
+ if (!chartBackground) {
+
+ bgAttr = {
+ fill: chartBackgroundColor || NONE
+ };
+ if (chartBorderWidth) { // #980
+ bgAttr.stroke = optionsChart.borderColor;
+ bgAttr['stroke-width'] = chartBorderWidth;
+ }
+ chart.chartBackground = renderer.rect(mgn / 2, mgn / 2, chartWidth - mgn, chartHeight - mgn,
+ optionsChart.borderRadius, chartBorderWidth)
+ .attr(bgAttr)
+ .addClass(PREFIX + 'background')
+ .add()
+ .shadow(optionsChart.shadow);
+
+ } else { // resize
+ chartBackground.animate(
+ chartBackground.crisp({ width: chartWidth - mgn, height: chartHeight - mgn })
+ );
+ }
+ }
+
+
+ // Plot background
+ if (plotBackgroundColor) {
+ if (!plotBackground) {
+ chart.plotBackground = renderer.rect(plotLeft, plotTop, plotWidth, plotHeight, 0)
+ .attr({
+ fill: plotBackgroundColor
+ })
+ .add()
+ .shadow(optionsChart.plotShadow);
+ } else {
+ plotBackground.animate(plotBox);
+ }
+ }
+ if (plotBackgroundImage) {
+ if (!plotBGImage) {
+ chart.plotBGImage = renderer.image(plotBackgroundImage, plotLeft, plotTop, plotWidth, plotHeight)
+ .add();
+ } else {
+ plotBGImage.animate(plotBox);
+ }
+ }
+
+ // Plot clip
+ if (!clipRect) {
+ chart.clipRect = renderer.clipRect(clipBox);
+ } else {
+ clipRect.animate({
+ width: clipBox.width,
+ height: clipBox.height
+ });
+ }
+
+ // Plot area border
+ if (plotBorderWidth) {
+ if (!plotBorder) {
+ chart.plotBorder = renderer.rect(plotLeft, plotTop, plotWidth, plotHeight, 0, -plotBorderWidth)
+ .attr({
+ stroke: optionsChart.plotBorderColor,
+ 'stroke-width': plotBorderWidth,
+ fill: NONE,
+ zIndex: 1
+ })
+ .add();
+ } else {
+ plotBorder.animate(
+ plotBorder.crisp({ x: plotLeft, y: plotTop, width: plotWidth, height: plotHeight })
+ );
+ }
+ }
+
+ // reset
+ chart.isDirtyBox = false;
+ },
+
+ /**
+ * Detect whether a certain chart property is needed based on inspecting its options
+ * and series. This mainly applies to the chart.invert property, and in extensions to
+ * the chart.angular and chart.polar properties.
+ */
+ propFromSeries: function () {
+ var chart = this,
+ optionsChart = chart.options.chart,
+ klass,
+ seriesOptions = chart.options.series,
+ i,
+ value;
+
+
+ each(['inverted', 'angular', 'polar'], function (key) {
+
+ // The default series type's class
+ klass = seriesTypes[optionsChart.type || optionsChart.defaultSeriesType];
+
+ // Get the value from available chart-wide properties
+ value = (
+ chart[key] || // 1. it is set before
+ optionsChart[key] || // 2. it is set in the options
+ (klass && klass.prototype[key]) // 3. it's default series class requires it
+ );
+
+ // 4. Check if any the chart's series require it
+ i = seriesOptions && seriesOptions.length;
+ while (!value && i--) {
+ klass = seriesTypes[seriesOptions[i].type];
+ if (klass && klass.prototype[key]) {
+ value = true;
+ }
+ }
+
+ // Set the chart property
+ chart[key] = value;
+ });
+
+ },
+
+ /**
+ * Link two or more series together. This is done initially from Chart.render,
+ * and after Chart.addSeries and Series.remove.
+ */
+ linkSeries: function () {
+ var chart = this,
+ chartSeries = chart.series;
+
+ // Reset links
+ each(chartSeries, function (series) {
+ series.linkedSeries.length = 0;
+ });
+
+ // Apply new links
+ each(chartSeries, function (series) {
+ var linkedTo = series.options.linkedTo;
+ if (isString(linkedTo)) {
+ if (linkedTo === ':previous') {
+ linkedTo = chart.series[series.index - 1];
+ } else {
+ linkedTo = chart.get(linkedTo);
+ }
+ if (linkedTo) {
+ linkedTo.linkedSeries.push(series);
+ series.linkedParent = linkedTo;
+ }
+ }
+ });
+ },
+
+ /**
+ * Render series for the chart
+ */
+ renderSeries: function () {
+ each(this.series, function (serie) {
+ serie.translate();
+ if (serie.setTooltipPoints) {
+ serie.setTooltipPoints();
+ }
+ serie.render();
+ });
+ },
+
+ /**
+ * Render labels for the chart
+ */
+ renderLabels: function () {
+ var chart = this,
+ labels = chart.options.labels;
+ if (labels.items) {
+ each(labels.items, function (label) {
+ var style = extend(labels.style, label.style),
+ x = pInt(style.left) + chart.plotLeft,
+ y = pInt(style.top) + chart.plotTop + 12;
+
+ // delete to prevent rewriting in IE
+ delete style.left;
+ delete style.top;
+
+ chart.renderer.text(
+ label.html,
+ x,
+ y
+ )
+ .attr({ zIndex: 2 })
+ .css(style)
+ .add();
+
+ });
+ }
+ },
+
+ /**
+ * Render all graphics for the chart
+ */
+ render: function () {
+ var chart = this,
+ axes = chart.axes,
+ renderer = chart.renderer,
+ options = chart.options;
+
+ // Title
+ chart.setTitle();
+
+
+ // Legend
+ chart.legend = new Legend(chart, options.legend);
+
+ chart.getStacks(); // render stacks
+
+ // Get margins by pre-rendering axes
+ // set axes scales
+ each(axes, function (axis) {
+ axis.setScale();
+ });
+
+ chart.getMargins();
+
+ chart.maxTicks = null; // reset for second pass
+ each(axes, function (axis) {
+ axis.setTickPositions(true); // update to reflect the new margins
+ axis.setMaxTicks();
+ });
+ chart.adjustTickAmounts();
+ chart.getMargins(); // second pass to check for new labels
+
+
+ // Draw the borders and backgrounds
+ chart.drawChartBox();
+
+
+ // Axes
+ if (chart.hasCartesianSeries) {
+ each(axes, function (axis) {
+ axis.render();
+ });
+ }
+
+ // The series
+ if (!chart.seriesGroup) {
+ chart.seriesGroup = renderer.g('series-group')
+ .attr({ zIndex: 3 })
+ .add();
+ }
+ chart.renderSeries();
+
+ // Labels
+ chart.renderLabels();
+
+ // Credits
+ chart.showCredits(options.credits);
+
+ // Set flag
+ chart.hasRendered = true;
+
+ },
+
+ /**
+ * Show chart credits based on config options
+ */
+ showCredits: function (credits) {
+ if (credits.enabled && !this.credits) {
+ this.credits = this.renderer.text(
+ credits.text,
+ 0,
+ 0
+ )
+ .on('click', function () {
+ if (credits.href) {
+ location.href = credits.href;
+ }
+ })
+ .attr({
+ align: credits.position.align,
+ zIndex: 8
+ })
+ .css(credits.style)
+ .add()
+ .align(credits.position);
+ }
+ },
+
+ /**
+ * Clean up memory usage
+ */
+ destroy: function () {
+ var chart = this,
+ axes = chart.axes,
+ series = chart.series,
+ container = chart.container,
+ i,
+ parentNode = container && container.parentNode;
+
+ // fire the chart.destoy event
+ fireEvent(chart, 'destroy');
+
+ // Delete the chart from charts lookup array
+ charts[chart.index] = UNDEFINED;
+ chartCount--;
+ chart.renderTo.removeAttribute('data-highcharts-chart');
+
+ // remove events
+ removeEvent(chart);
+
+ // ==== Destroy collections:
+ // Destroy axes
+ i = axes.length;
+ while (i--) {
+ axes[i] = axes[i].destroy();
+ }
+
+ // Destroy each series
+ i = series.length;
+ while (i--) {
+ series[i] = series[i].destroy();
+ }
+
+ // ==== Destroy chart properties:
+ each(['title', 'subtitle', 'chartBackground', 'plotBackground', 'plotBGImage',
+ 'plotBorder', 'seriesGroup', 'clipRect', 'credits', 'pointer', 'scroller',
+ 'rangeSelector', 'legend', 'resetZoomButton', 'tooltip', 'renderer'], function (name) {
+ var prop = chart[name];
+
+ if (prop && prop.destroy) {
+ chart[name] = prop.destroy();
+ }
+ });
+
+ // remove container and all SVG
+ if (container) { // can break in IE when destroyed before finished loading
+ container.innerHTML = '';
+ removeEvent(container);
+ if (parentNode) {
+ discardElement(container);
+ }
+
+ }
+
+ // clean it all up
+ for (i in chart) {
+ delete chart[i];
+ }
+
+ },
+
+
+ /**
+ * VML namespaces can't be added until after complete. Listening
+ * for Perini's doScroll hack is not enough.
+ */
+ isReadyToRender: function () {
+ var chart = this;
+
+ // Note: in spite of JSLint's complaints, win == win.top is required
+ /*jslint eqeq: true*/
+ if ((!hasSVG && (win == win.top && doc.readyState !== 'complete')) || (useCanVG && !win.canvg)) {
+ /*jslint eqeq: false*/
+ if (useCanVG) {
+ // Delay rendering until canvg library is downloaded and ready
+ CanVGController.push(function () { chart.firstRender(); }, chart.options.global.canvasToolsURL);
+ } else {
+ doc.attachEvent('onreadystatechange', function () {
+ doc.detachEvent('onreadystatechange', chart.firstRender);
+ if (doc.readyState === 'complete') {
+ chart.firstRender();
+ }
+ });
+ }
+ return false;
+ }
+ return true;
+ },
+
+ /**
+ * Prepare for first rendering after all data are loaded
+ */
+ firstRender: function () {
+ var chart = this,
+ options = chart.options,
+ callback = chart.callback;
+
+ // Check whether the chart is ready to render
+ if (!chart.isReadyToRender()) {
+ return;
+ }
+
+ // Create the container
+ chart.getContainer();
+
+ // Run an early event after the container and renderer are established
+ fireEvent(chart, 'init');
+
+
+ chart.resetMargins();
+ chart.setChartSize();
+
+ // Set the common chart properties (mainly invert) from the given series
+ chart.propFromSeries();
+
+ // get axes
+ chart.getAxes();
+
+ // Initialize the series
+ each(options.series || [], function (serieOptions) {
+ chart.initSeries(serieOptions);
+ });
+
+ chart.linkSeries();
+
+ // Run an event after axes and series are initialized, but before render. At this stage,
+ // the series data is indexed and cached in the xData and yData arrays, so we can access
+ // those before rendering. Used in Highstock.
+ fireEvent(chart, 'beforeRender');
+
+ // depends on inverted and on margins being set
+ if (Highcharts.Pointer) {
+ chart.pointer = new Pointer(chart, options);
+ }
+
+ chart.render();
+
+ // add canvas
+ chart.renderer.draw();
+ // run callbacks
+ if (callback) {
+ callback.apply(chart, [chart]);
+ }
+ each(chart.callbacks, function (fn) {
+ fn.apply(chart, [chart]);
+ });
+
+
+ // If the chart was rendered outside the top container, put it back in
+ chart.cloneRenderTo(true);
+
+ fireEvent(chart, 'load');
+
+ },
+
+ /**
+ * Creates arrays for spacing and margin from given options.
+ */
+ splashArray: function (target, options) {
+ var oVar = options[target],
+ tArray = isObject(oVar) ? oVar : [oVar, oVar, oVar, oVar];
+
+ return [pick(options[target + 'Top'], tArray[0]),
+ pick(options[target + 'Right'], tArray[1]),
+ pick(options[target + 'Bottom'], tArray[2]),
+ pick(options[target + 'Left'], tArray[3])];
+ }
+}; // end Chart
+
+// Hook for exporting module
+Chart.prototype.callbacks = [];
+
+var CenteredSeriesMixin = Highcharts.CenteredSeriesMixin = {
+ /**
+ * Get the center of the pie based on the size and center options relative to the
+ * plot area. Borrowed by the polar and gauge series types.
+ */
+ getCenter: function () {
+
+ var options = this.options,
+ chart = this.chart,
+ slicingRoom = 2 * (options.slicedOffset || 0),
+ handleSlicingRoom,
+ plotWidth = chart.plotWidth - 2 * slicingRoom,
+ plotHeight = chart.plotHeight - 2 * slicingRoom,
+ centerOption = options.center,
+ positions = [pick(centerOption[0], '50%'), pick(centerOption[1], '50%'), options.size || '100%', options.innerSize || 0],
+ smallestSize = mathMin(plotWidth, plotHeight),
+ isPercent;
+
+ return map(positions, function (length, i) {
+ isPercent = /%$/.test(length);
+ handleSlicingRoom = i < 2 || (i === 2 && isPercent);
+ return (isPercent ?
+ // i == 0: centerX, relative to width
+ // i == 1: centerY, relative to height
+ // i == 2: size, relative to smallestSize
+ // i == 4: innerSize, relative to smallestSize
+ [plotWidth, plotHeight, smallestSize, smallestSize][i] *
+ pInt(length) / 100 :
+ length) + (handleSlicingRoom ? slicingRoom : 0);
+ });
+ }
+};
+
+/**
+ * The Point object and prototype. Inheritable and used as base for PiePoint
+ */
+var Point = function () {};
+Point.prototype = {
+
+ /**
+ * Initialize the point
+ * @param {Object} series The series object containing this point
+ * @param {Object} options The data in either number, array or object format
+ */
+ init: function (series, options, x) {
+
+ var point = this,
+ colors;
+ point.series = series;
+ point.applyOptions(options, x);
+ point.pointAttr = {};
+
+ if (series.options.colorByPoint) {
+ colors = series.options.colors || series.chart.options.colors;
+ point.color = point.color || colors[series.colorCounter++];
+ // loop back to zero
+ if (series.colorCounter === colors.length) {
+ series.colorCounter = 0;
+ }
+ }
+
+ series.chart.pointCount++;
+ return point;
+ },
+ /**
+ * Apply the options containing the x and y data and possible some extra properties.
+ * This is called on point init or from point.update.
+ *
+ * @param {Object} options
+ */
+ applyOptions: function (options, x) {
+ var point = this,
+ series = point.series,
+ pointValKey = series.options.pointValKey || series.pointValKey;
+
+ options = Point.prototype.optionsToObject.call(this, options);
+
+ // copy options directly to point
+ extend(point, options);
+ point.options = point.options ? extend(point.options, options) : options;
+
+ // For higher dimension series types. For instance, for ranges, point.y is mapped to point.low.
+ if (pointValKey) {
+ point.y = point[pointValKey];
+ }
+
+ // If no x is set by now, get auto incremented value. All points must have an
+ // x value, however the y value can be null to create a gap in the series
+ if (point.x === UNDEFINED && series) {
+ point.x = x === UNDEFINED ? series.autoIncrement() : x;
+ }
+
+ return point;
+ },
+
+ /**
+ * Transform number or array configs into objects
+ */
+ optionsToObject: function (options) {
+ var ret = {},
+ series = this.series,
+ pointArrayMap = series.pointArrayMap || ['y'],
+ valueCount = pointArrayMap.length,
+ firstItemType,
+ i = 0,
+ j = 0;
+
+ if (typeof options === 'number' || options === null) {
+ ret[pointArrayMap[0]] = options;
+
+ } else if (isArray(options)) {
+ // with leading x value
+ if (options.length > valueCount) {
+ firstItemType = typeof options[0];
+ if (firstItemType === 'string') {
+ ret.name = options[0];
+ } else if (firstItemType === 'number') {
+ ret.x = options[0];
+ }
+ i++;
+ }
+ while (j < valueCount) {
+ ret[pointArrayMap[j++]] = options[i++];
+ }
+ } else if (typeof options === 'object') {
+ ret = options;
+
+ // This is the fastest way to detect if there are individual point dataLabels that need
+ // to be considered in drawDataLabels. These can only occur in object configs.
+ if (options.dataLabels) {
+ series._hasPointLabels = true;
+ }
+
+ // Same approach as above for markers
+ if (options.marker) {
+ series._hasPointMarkers = true;
+ }
+ }
+ return ret;
+ },
+
+ /**
+ * Destroy a point to clear memory. Its reference still stays in series.data.
+ */
+ destroy: function () {
+ var point = this,
+ series = point.series,
+ chart = series.chart,
+ hoverPoints = chart.hoverPoints,
+ prop;
+
+ chart.pointCount--;
+
+ if (hoverPoints) {
+ point.setState();
+ erase(hoverPoints, point);
+ if (!hoverPoints.length) {
+ chart.hoverPoints = null;
+ }
+
+ }
+ if (point === chart.hoverPoint) {
+ point.onMouseOut();
+ }
+
+ // remove all events
+ if (point.graphic || point.dataLabel) { // removeEvent and destroyElements are performance expensive
+ removeEvent(point);
+ point.destroyElements();
+ }
+
+ if (point.legendItem) { // pies have legend items
+ chart.legend.destroyItem(point);
+ }
+
+ for (prop in point) {
+ point[prop] = null;
+ }
+
+
+ },
+
+ /**
+ * Destroy SVG elements associated with the point
+ */
+ destroyElements: function () {
+ var point = this,
+ props = ['graphic', 'dataLabel', 'dataLabelUpper', 'group', 'connector', 'shadowGroup'],
+ prop,
+ i = 6;
+ while (i--) {
+ prop = props[i];
+ if (point[prop]) {
+ point[prop] = point[prop].destroy();
+ }
+ }
+ },
+
+ /**
+ * Return the configuration hash needed for the data label and tooltip formatters
+ */
+ getLabelConfig: function () {
+ var point = this;
+ return {
+ x: point.category,
+ y: point.y,
+ key: point.name || point.category,
+ series: point.series,
+ point: point,
+ percentage: point.percentage,
+ total: point.total || point.stackTotal
+ };
+ },
+
+ /**
+ * Extendable method for formatting each point's tooltip line
+ *
+ * @return {String} A string to be concatenated in to the common tooltip text
+ */
+ tooltipFormatter: function (pointFormat) {
+
+ // Insert options for valueDecimals, valuePrefix, and valueSuffix
+ var series = this.series,
+ seriesTooltipOptions = series.tooltipOptions,
+ valueDecimals = pick(seriesTooltipOptions.valueDecimals, ''),
+ valuePrefix = seriesTooltipOptions.valuePrefix || '',
+ valueSuffix = seriesTooltipOptions.valueSuffix || '';
+
+ // Loop over the point array map and replace unformatted values with sprintf formatting markup
+ each(series.pointArrayMap || ['y'], function (key) {
+ key = '{point.' + key; // without the closing bracket
+ if (valuePrefix || valueSuffix) {
+ pointFormat = pointFormat.replace(key + '}', valuePrefix + key + '}' + valueSuffix);
+ }
+ pointFormat = pointFormat.replace(key + '}', key + ':,.' + valueDecimals + 'f}');
+ });
+
+ return format(pointFormat, {
+ point: this,
+ series: this.series
+ });
+ },
+
+ /**
+ * Fire an event on the Point object. Must not be renamed to fireEvent, as this
+ * causes a name clash in MooTools
+ * @param {String} eventType
+ * @param {Object} eventArgs Additional event arguments
+ * @param {Function} defaultFunction Default event handler
+ */
+ firePointEvent: function (eventType, eventArgs, defaultFunction) {
+ var point = this,
+ series = this.series,
+ seriesOptions = series.options;
+
+ // load event handlers on demand to save time on mouseover/out
+ if (seriesOptions.point.events[eventType] || (point.options && point.options.events && point.options.events[eventType])) {
+ this.importEvents();
+ }
+
+ // add default handler if in selection mode
+ if (eventType === 'click' && seriesOptions.allowPointSelect) {
+ defaultFunction = function (event) {
+ // Control key is for Windows, meta (= Cmd key) for Mac, Shift for Opera
+ point.select(null, event.ctrlKey || event.metaKey || event.shiftKey);
+ };
+ }
+
+ fireEvent(this, eventType, eventArgs, defaultFunction);
+ }
+};/**
+ * @classDescription The base function which all other series types inherit from. The data in the series is stored
+ * in various arrays.
+ *
+ * - First, series.options.data contains all the original config options for
+ * each point whether added by options or methods like series.addPoint.
+ * - Next, series.data contains those values converted to points, but in case the series data length
+ * exceeds the cropThreshold, or if the data is grouped, series.data doesn't contain all the points. It
+ * only contains the points that have been created on demand.
+ * - Then there's series.points that contains all currently visible point objects. In case of cropping,
+ * the cropped-away points are not part of this array. The series.points array starts at series.cropStart
+ * compared to series.data and series.options.data. If however the series data is grouped, these can't
+ * be correlated one to one.
+ * - series.xData and series.processedXData contain clean x values, equivalent to series.data and series.points.
+ * - series.yData and series.processedYData contain clean x values, equivalent to series.data and series.points.
+ *
+ * @param {Object} chart
+ * @param {Object} options
+ */
+var Series = function () {};
+
+Series.prototype = {
+
+ isCartesian: true,
+ type: 'line',
+ pointClass: Point,
+ sorted: true, // requires the data to be sorted
+ requireSorting: true,
+ pointAttrToOptions: { // mapping between SVG attributes and the corresponding options
+ stroke: 'lineColor',
+ 'stroke-width': 'lineWidth',
+ fill: 'fillColor',
+ r: 'radius'
+ },
+ axisTypes: ['xAxis', 'yAxis'],
+ colorCounter: 0,
+ parallelArrays: ['x', 'y'], // each point's x and y values are stored in this.xData and this.yData
+ init: function (chart, options) {
+ var series = this,
+ eventType,
+ events,
+ chartSeries = chart.series,
+ sortByIndex = function (a, b) {
+ return pick(a.options.index, a._i) - pick(b.options.index, b._i);
+ };
+
+ series.chart = chart;
+ series.options = options = series.setOptions(options); // merge with plotOptions
+ series.linkedSeries = [];
+
+ // bind the axes
+ series.bindAxes();
+
+ // set some variables
+ extend(series, {
+ name: options.name,
+ state: NORMAL_STATE,
+ pointAttr: {},
+ visible: options.visible !== false, // true by default
+ selected: options.selected === true // false by default
+ });
+
+ // special
+ if (useCanVG) {
+ options.animation = false;
+ }
+
+ // register event listeners
+ events = options.events;
+ for (eventType in events) {
+ addEvent(series, eventType, events[eventType]);
+ }
+ if (
+ (events && events.click) ||
+ (options.point && options.point.events && options.point.events.click) ||
+ options.allowPointSelect
+ ) {
+ chart.runTrackerClick = true;
+ }
+
+ series.getColor();
+ series.getSymbol();
+
+ // Set the data
+ each(series.parallelArrays, function (key) {
+ series[key + 'Data'] = [];
+ });
+ series.setData(options.data, false);
+
+ // Mark cartesian
+ if (series.isCartesian) {
+ chart.hasCartesianSeries = true;
+ }
+
+ // Register it in the chart
+ chartSeries.push(series);
+ series._i = chartSeries.length - 1;
+
+ // Sort series according to index option (#248, #1123, #2456)
+ stableSort(chartSeries, sortByIndex);
+ if (this.yAxis) {
+ stableSort(this.yAxis.series, sortByIndex);
+ }
+
+ each(chartSeries, function (series, i) {
+ series.index = i;
+ series.name = series.name || 'Series ' + (i + 1);
+ });
+
+ },
+
+ /**
+ * Set the xAxis and yAxis properties of cartesian series, and register the series
+ * in the axis.series array
+ */
+ bindAxes: function () {
+ var series = this,
+ seriesOptions = series.options,
+ chart = series.chart,
+ axisOptions;
+
+ each(series.axisTypes || [], function (AXIS) { // repeat for xAxis and yAxis
+
+ each(chart[AXIS], function (axis) { // loop through the chart's axis objects
+ axisOptions = axis.options;
+
+ // apply if the series xAxis or yAxis option mathches the number of the
+ // axis, or if undefined, use the first axis
+ if ((seriesOptions[AXIS] === axisOptions.index) ||
+ (seriesOptions[AXIS] !== UNDEFINED && seriesOptions[AXIS] === axisOptions.id) ||
+ (seriesOptions[AXIS] === UNDEFINED && axisOptions.index === 0)) {
+
+ // register this series in the axis.series lookup
+ axis.series.push(series);
+
+ // set this series.xAxis or series.yAxis reference
+ series[AXIS] = axis;
+
+ // mark dirty for redraw
+ axis.isDirty = true;
+ }
+ });
+
+ // The series needs an X and an Y axis
+ if (!series[AXIS] && series.optionalAxis !== AXIS) {
+ error(18, true);
+ }
+
+ });
+ },
+
+ /**
+ * For simple series types like line and column, the data values are held in arrays like
+ * xData and yData for quick lookup to find extremes and more. For multidimensional series
+ * like bubble and map, this can be extended with arrays like zData and valueData by
+ * adding to the series.parallelArrays array.
+ */
+ updateParallelArrays: function (point, i) {
+ var series = point.series,
+ args = arguments,
+ fn = typeof i === 'number' ?
+ // Insert the value in the given position
+ function (key) {
+ var val = key === 'y' && series.toYData ? series.toYData(point) : point[key];
+ series[key + 'Data'][i] = val;
+ } :
+ // Apply the method specified in i with the following arguments as arguments
+ function (key) {
+ Array.prototype[i].apply(series[key + 'Data'], Array.prototype.slice.call(args, 2));
+ };
+
+ each(series.parallelArrays, fn);
+ },
+
+ /**
+ * Return an auto incremented x value based on the pointStart and pointInterval options.
+ * This is only used if an x value is not given for the point that calls autoIncrement.
+ */
+ autoIncrement: function () {
+ var series = this,
+ options = series.options,
+ xIncrement = series.xIncrement;
+
+ xIncrement = pick(xIncrement, options.pointStart, 0);
+
+ series.pointInterval = pick(series.pointInterval, options.pointInterval, 1);
+
+ series.xIncrement = xIncrement + series.pointInterval;
+ return xIncrement;
+ },
+
+ /**
+ * Divide the series data into segments divided by null values.
+ */
+ getSegments: function () {
+ var series = this,
+ lastNull = -1,
+ segments = [],
+ i,
+ points = series.points,
+ pointsLength = points.length;
+
+ if (pointsLength) { // no action required for []
+
+ // if connect nulls, just remove null points
+ if (series.options.connectNulls) {
+ i = pointsLength;
+ while (i--) {
+ if (points[i].y === null) {
+ points.splice(i, 1);
+ }
+ }
+ if (points.length) {
+ segments = [points];
+ }
+
+ // else, split on null points
+ } else {
+ each(points, function (point, i) {
+ if (point.y === null) {
+ if (i > lastNull + 1) {
+ segments.push(points.slice(lastNull + 1, i));
+ }
+ lastNull = i;
+ } else if (i === pointsLength - 1) { // last value
+ segments.push(points.slice(lastNull + 1, i + 1));
+ }
+ });
+ }
+ }
+
+ // register it
+ series.segments = segments;
+ },
+
+ /**
+ * Set the series options by merging from the options tree
+ * @param {Object} itemOptions
+ */
+ setOptions: function (itemOptions) {
+ var chart = this.chart,
+ chartOptions = chart.options,
+ plotOptions = chartOptions.plotOptions,
+ userOptions = chart.userOptions || {},
+ userPlotOptions = userOptions.plotOptions || {},
+ typeOptions = plotOptions[this.type],
+ options;
+
+ this.userOptions = itemOptions;
+
+ options = merge(
+ typeOptions,
+ plotOptions.series,
+ itemOptions
+ );
+
+ // The tooltip options are merged between global and series specific options
+ this.tooltipOptions = merge(
+ defaultOptions.tooltip,
+ defaultOptions.plotOptions[this.type].tooltip,
+ userOptions.tooltip,
+ userPlotOptions.series && userPlotOptions.series.tooltip,
+ userPlotOptions[this.type] && userPlotOptions[this.type].tooltip,
+ itemOptions.tooltip
+ );
+
+ // Delete marker object if not allowed (#1125)
+ if (typeOptions.marker === null) {
+ delete options.marker;
+ }
+
+ return options;
+
+ },
+
+ getCyclic: function (prop, value, defaults) {
+ var i,
+ userOptions = this.userOptions,
+ indexName = '_' + prop + 'Index',
+ counterName = prop + 'Counter';
+
+ if (!value) {
+ if (defined(userOptions[indexName])) { // after Series.update()
+ i = userOptions[indexName];
+ } else {
+ userOptions[indexName] = i = this.chart[counterName] % defaults.length;
+ this.chart[counterName] += 1;
+ }
+ value = defaults[i];
+ }
+ this[prop] = value;
+ },
+
+ /**
+ * Get the series' color
+ */
+ getColor: function () {
+ if (!this.options.colorByPoint) {
+ this.getCyclic('color', this.options.color || defaultPlotOptions[this.type].color, this.chart.options.colors);
+ }
+ },
+ /**
+ * Get the series' symbol
+ */
+ getSymbol: function () {
+ var seriesMarkerOption = this.options.marker;
+
+ this.getCyclic('symbol', seriesMarkerOption.symbol, this.chart.options.symbols);
+
+ // don't substract radius in image symbols (#604)
+ if (/^url/.test(this.symbol)) {
+ seriesMarkerOption.radius = 0;
+ }
+ },
+
+ drawLegendSymbol: LegendSymbolMixin.drawLineMarker,
+
+ /**
+ * Replace the series data with a new set of data
+ * @param {Object} data
+ * @param {Object} redraw
+ */
+ setData: function (data, redraw, animation, updatePoints) {
+ var series = this,
+ oldData = series.points,
+ oldDataLength = (oldData && oldData.length) || 0,
+ dataLength,
+ options = series.options,
+ chart = series.chart,
+ firstPoint = null,
+ xAxis = series.xAxis,
+ hasCategories = xAxis && !!xAxis.categories,
+ tooltipPoints = series.tooltipPoints,
+ i,
+ turboThreshold = options.turboThreshold,
+ pt,
+ xData = this.xData,
+ yData = this.yData,
+ pointArrayMap = series.pointArrayMap,
+ valueCount = pointArrayMap && pointArrayMap.length;
+
+ data = data || [];
+ dataLength = data.length;
+ redraw = pick(redraw, true);
+
+ // If the point count is the same as is was, just run Point.update which is
+ // cheaper, allows animation, and keeps references to points.
+ if (updatePoints !== false && dataLength && oldDataLength === dataLength && !series.cropped && !series.hasGroupedData) {
+ each(data, function (point, i) {
+ oldData[i].update(point, false);
+ });
+
+ } else {
+
+ // Reset properties
+ series.xIncrement = null;
+ series.pointRange = hasCategories ? 1 : options.pointRange;
+
+ series.colorCounter = 0; // for series with colorByPoint (#1547)
+
+ // Update parallel arrays
+ each(this.parallelArrays, function (key) {
+ series[key + 'Data'].length = 0;
+ });
+
+ // In turbo mode, only one- or twodimensional arrays of numbers are allowed. The
+ // first value is tested, and we assume that all the rest are defined the same
+ // way. Although the 'for' loops are similar, they are repeated inside each
+ // if-else conditional for max performance.
+ if (turboThreshold && dataLength > turboThreshold) {
+
+ // find the first non-null point
+ i = 0;
+ while (firstPoint === null && i < dataLength) {
+ firstPoint = data[i];
+ i++;
+ }
+
+
+ if (isNumber(firstPoint)) { // assume all points are numbers
+ var x = pick(options.pointStart, 0),
+ pointInterval = pick(options.pointInterval, 1);
+
+ for (i = 0; i < dataLength; i++) {
+ xData[i] = x;
+ yData[i] = data[i];
+ x += pointInterval;
+ }
+ series.xIncrement = x;
+ } else if (isArray(firstPoint)) { // assume all points are arrays
+ if (valueCount) { // [x, low, high] or [x, o, h, l, c]
+ for (i = 0; i < dataLength; i++) {
+ pt = data[i];
+ xData[i] = pt[0];
+ yData[i] = pt.slice(1, valueCount + 1);
+ }
+ } else { // [x, y]
+ for (i = 0; i < dataLength; i++) {
+ pt = data[i];
+ xData[i] = pt[0];
+ yData[i] = pt[1];
+ }
+ }
+ } else {
+ error(12); // Highcharts expects configs to be numbers or arrays in turbo mode
+ }
+ } else {
+ for (i = 0; i < dataLength; i++) {
+ if (data[i] !== UNDEFINED) { // stray commas in oldIE
+ pt = { series: series };
+ series.pointClass.prototype.applyOptions.apply(pt, [data[i]]);
+ series.updateParallelArrays(pt, i);
+ if (hasCategories && pt.name) {
+ xAxis.names[pt.x] = pt.name; // #2046
+ }
+ }
+ }
+ }
+
+ // Forgetting to cast strings to numbers is a common caveat when handling CSV or JSON
+ if (isString(yData[0])) {
+ error(14, true);
+ }
+
+ series.data = [];
+ series.options.data = data;
+ //series.zData = zData;
+
+ // destroy old points
+ i = oldDataLength;
+ while (i--) {
+ if (oldData[i] && oldData[i].destroy) {
+ oldData[i].destroy();
+ }
+ }
+ if (tooltipPoints) { // #2594
+ tooltipPoints.length = 0;
+ }
+
+ // reset minRange (#878)
+ if (xAxis) {
+ xAxis.minRange = xAxis.userMinRange;
+ }
+
+ // redraw
+ series.isDirty = series.isDirtyData = chart.isDirtyBox = true;
+ animation = false;
+ }
+
+ if (redraw) {
+ chart.redraw(animation);
+ }
+ },
+
+ /**
+ * Process the data by cropping away unused data points if the series is longer
+ * than the crop threshold. This saves computing time for lage series.
+ */
+ processData: function (force) {
+ var series = this,
+ processedXData = series.xData, // copied during slice operation below
+ processedYData = series.yData,
+ dataLength = processedXData.length,
+ croppedData,
+ cropStart = 0,
+ cropped,
+ distance,
+ closestPointRange,
+ xAxis = series.xAxis,
+ i, // loop variable
+ options = series.options,
+ cropThreshold = options.cropThreshold,
+ activePointCount = 0,
+ isCartesian = series.isCartesian,
+ xExtremes,
+ min,
+ max;
+
+ // If the series data or axes haven't changed, don't go through this. Return false to pass
+ // the message on to override methods like in data grouping.
+ if (isCartesian && !series.isDirty && !xAxis.isDirty && !series.yAxis.isDirty && !force) {
+ return false;
+ }
+
+
+ // optionally filter out points outside the plot area
+ if (isCartesian && series.sorted && (!cropThreshold || dataLength > cropThreshold || series.forceCrop)) {
+
+ xExtremes = xAxis.getExtremes(); // corrected for log axis (#3053)
+ min = xExtremes.min;
+ max = xExtremes.max;
+
+ // it's outside current extremes
+ if (processedXData[dataLength - 1] < min || processedXData[0] > max) {
+ processedXData = [];
+ processedYData = [];
+
+ // only crop if it's actually spilling out
+ } else if (processedXData[0] < min || processedXData[dataLength - 1] > max) {
+ croppedData = this.cropData(series.xData, series.yData, min, max);
+ processedXData = croppedData.xData;
+ processedYData = croppedData.yData;
+ cropStart = croppedData.start;
+ cropped = true;
+ activePointCount = processedXData.length;
+ }
+ }
+
+
+ // Find the closest distance between processed points
+ for (i = processedXData.length - 1; i >= 0; i--) {
+ distance = processedXData[i] - processedXData[i - 1];
+
+ if (!cropped && processedXData[i] > min && processedXData[i] < max) {
+ activePointCount++;
+ }
+ if (distance > 0 && (closestPointRange === UNDEFINED || distance < closestPointRange)) {
+ closestPointRange = distance;
+
+ // Unsorted data is not supported by the line tooltip, as well as data grouping and
+ // navigation in Stock charts (#725) and width calculation of columns (#1900)
+ } else if (distance < 0 && series.requireSorting) {
+ error(15);
+ }
+ }
+
+ // Record the properties
+ series.cropped = cropped; // undefined or true
+ series.cropStart = cropStart;
+ series.processedXData = processedXData;
+ series.processedYData = processedYData;
+ series.activePointCount = activePointCount;
+
+ if (options.pointRange === null) { // null means auto, as for columns, candlesticks and OHLC
+ series.pointRange = closestPointRange || 1;
+ }
+ series.closestPointRange = closestPointRange;
+
+ },
+
+ /**
+ * Iterate over xData and crop values between min and max. Returns object containing crop start/end
+ * cropped xData with corresponding part of yData, dataMin and dataMax within the cropped range
+ */
+ cropData: function (xData, yData, min, max) {
+ var dataLength = xData.length,
+ cropStart = 0,
+ cropEnd = dataLength,
+ cropShoulder = pick(this.cropShoulder, 1), // line-type series need one point outside
+ i;
+
+ // iterate up to find slice start
+ for (i = 0; i < dataLength; i++) {
+ if (xData[i] >= min) {
+ cropStart = mathMax(0, i - cropShoulder);
+ break;
+ }
+ }
+
+ // proceed to find slice end
+ for (; i < dataLength; i++) {
+ if (xData[i] > max) {
+ cropEnd = i + cropShoulder;
+ break;
+ }
+ }
+
+ return {
+ xData: xData.slice(cropStart, cropEnd),
+ yData: yData.slice(cropStart, cropEnd),
+ start: cropStart,
+ end: cropEnd
+ };
+ },
+
+
+ /**
+ * Generate the data point after the data has been processed by cropping away
+ * unused points and optionally grouped in Highcharts Stock.
+ */
+ generatePoints: function () {
+ var series = this,
+ options = series.options,
+ dataOptions = options.data,
+ data = series.data,
+ dataLength,
+ processedXData = series.processedXData,
+ processedYData = series.processedYData,
+ pointClass = series.pointClass,
+ processedDataLength = processedXData.length,
+ cropStart = series.cropStart || 0,
+ cursor,
+ hasGroupedData = series.hasGroupedData,
+ point,
+ points = [],
+ i;
+
+ if (!data && !hasGroupedData) {
+ var arr = [];
+ arr.length = dataOptions.length;
+ data = series.data = arr;
+ }
+
+ for (i = 0; i < processedDataLength; i++) {
+ cursor = cropStart + i;
+ if (!hasGroupedData) {
+ if (data[cursor]) {
+ point = data[cursor];
+ } else if (dataOptions[cursor] !== UNDEFINED) { // #970
+ data[cursor] = point = (new pointClass()).init(series, dataOptions[cursor], processedXData[i]);
+ }
+ points[i] = point;
+ } else {
+ // splat the y data in case of ohlc data array
+ points[i] = (new pointClass()).init(series, [processedXData[i]].concat(splat(processedYData[i])));
+ }
+ }
+
+ // Hide cropped-away points - this only runs when the number of points is above cropThreshold, or when
+ // swithching view from non-grouped data to grouped data (#637)
+ if (data && (processedDataLength !== (dataLength = data.length) || hasGroupedData)) {
+ for (i = 0; i < dataLength; i++) {
+ if (i === cropStart && !hasGroupedData) { // when has grouped data, clear all points
+ i += processedDataLength;
+ }
+ if (data[i]) {
+ data[i].destroyElements();
+ data[i].plotX = UNDEFINED; // #1003
+ }
+ }
+ }
+
+ series.data = data;
+ series.points = points;
+ },
+
+ /**
+ * Calculate Y extremes for visible data
+ */
+ getExtremes: function (yData) {
+ var xAxis = this.xAxis,
+ yAxis = this.yAxis,
+ xData = this.processedXData,
+ yDataLength,
+ activeYData = [],
+ activeCounter = 0,
+ xExtremes = xAxis.getExtremes(), // #2117, need to compensate for log X axis
+ xMin = xExtremes.min,
+ xMax = xExtremes.max,
+ validValue,
+ withinRange,
+ dataMin,
+ dataMax,
+ x,
+ y,
+ i,
+ j;
+
+ yData = yData || this.stackedYData || this.processedYData;
+ yDataLength = yData.length;
+
+ for (i = 0; i < yDataLength; i++) {
+
+ x = xData[i];
+ y = yData[i];
+
+ // For points within the visible range, including the first point outside the
+ // visible range, consider y extremes
+ validValue = y !== null && y !== UNDEFINED && (!yAxis.isLog || (y.length || y > 0));
+ withinRange = this.getExtremesFromAll || this.cropped || ((xData[i + 1] || x) >= xMin &&
+ (xData[i - 1] || x) <= xMax);
+
+ if (validValue && withinRange) {
+
+ j = y.length;
+ if (j) { // array, like ohlc or range data
+ while (j--) {
+ if (y[j] !== null) {
+ activeYData[activeCounter++] = y[j];
+ }
+ }
+ } else {
+ activeYData[activeCounter++] = y;
+ }
+ }
+ }
+ this.dataMin = pick(dataMin, arrayMin(activeYData));
+ this.dataMax = pick(dataMax, arrayMax(activeYData));
+ },
+
+ /**
+ * Translate data points from raw data values to chart specific positioning data
+ * needed later in drawPoints, drawGraph and drawTracker.
+ */
+ translate: function () {
+ if (!this.processedXData) { // hidden series
+ this.processData();
+ }
+ this.generatePoints();
+ var series = this,
+ options = series.options,
+ stacking = options.stacking,
+ xAxis = series.xAxis,
+ categories = xAxis.categories,
+ yAxis = series.yAxis,
+ points = series.points,
+ dataLength = points.length,
+ hasModifyValue = !!series.modifyValue,
+ i,
+ pointPlacement = options.pointPlacement,
+ dynamicallyPlaced = pointPlacement === 'between' || isNumber(pointPlacement),
+ threshold = options.threshold;
+
+ // Translate each point
+ for (i = 0; i < dataLength; i++) {
+ var point = points[i],
+ xValue = point.x,
+ yValue = point.y,
+ yBottom = point.low,
+ stack = stacking && yAxis.stacks[(series.negStacks && yValue < threshold ? '-' : '') + series.stackKey],
+ pointStack,
+ stackValues;
+
+ // Discard disallowed y values for log axes
+ if (yAxis.isLog && yValue <= 0) {
+ point.y = yValue = null;
+ }
+
+ // Get the plotX translation
+ point.plotX = xAxis.translate(xValue, 0, 0, 0, 1, pointPlacement, this.type === 'flags'); // Math.round fixes #591
+
+
+ // Calculate the bottom y value for stacked series
+ if (stacking && series.visible && stack && stack[xValue]) {
+
+ pointStack = stack[xValue];
+ stackValues = pointStack.points[series.index + ',' + i];
+ yBottom = stackValues[0];
+ yValue = stackValues[1];
+
+ if (yBottom === 0) {
+ yBottom = pick(threshold, yAxis.min);
+ }
+ if (yAxis.isLog && yBottom <= 0) { // #1200, #1232
+ yBottom = null;
+ }
+
+ point.total = point.stackTotal = pointStack.total;
+ point.percentage = pointStack.total && (point.y / pointStack.total * 100);
+ point.stackY = yValue;
+
+ // Place the stack label
+ pointStack.setOffset(series.pointXOffset || 0, series.barW || 0);
+
+ }
+
+ // Set translated yBottom or remove it
+ point.yBottom = defined(yBottom) ?
+ yAxis.translate(yBottom, 0, 1, 0, 1) :
+ null;
+
+ // general hook, used for Highstock compare mode
+ if (hasModifyValue) {
+ yValue = series.modifyValue(yValue, point);
+ }
+
+ // Set the the plotY value, reset it for redraws
+ point.plotY = (typeof yValue === 'number' && yValue !== Infinity) ?
+ //mathRound(yAxis.translate(yValue, 0, 1, 0, 1) * 10) / 10 : // Math.round fixes #591
+ yAxis.translate(yValue, 0, 1, 0, 1) :
+ UNDEFINED;
+
+ // Set client related positions for mouse tracking
+ point.clientX = dynamicallyPlaced ? xAxis.translate(xValue, 0, 0, 0, 1) : point.plotX; // #1514
+
+ point.negative = point.y < (threshold || 0);
+
+ // some API data
+ point.category = categories && categories[point.x] !== UNDEFINED ?
+ categories[point.x] : point.x;
+
+ }
+
+ // now that we have the cropped data, build the segments
+ series.getSegments();
+ },
+
+ /**
+ * Animate in the series
+ */
+ animate: function (init) {
+ var series = this,
+ chart = series.chart,
+ renderer = chart.renderer,
+ clipRect,
+ markerClipRect,
+ animation = series.options.animation,
+ clipBox = series.clipBox || chart.clipBox,
+ inverted = chart.inverted,
+ sharedClipKey;
+
+ // Animation option is set to true
+ if (animation && !isObject(animation)) {
+ animation = defaultPlotOptions[series.type].animation;
+ }
+ sharedClipKey = ['_sharedClip', animation.duration, animation.easing, clipBox.height].join(',');
+
+ // Initialize the animation. Set up the clipping rectangle.
+ if (init) {
+
+ // If a clipping rectangle with the same properties is currently present in the chart, use that.
+ clipRect = chart[sharedClipKey];
+ markerClipRect = chart[sharedClipKey + 'm'];
+ if (!clipRect) {
+ chart[sharedClipKey] = clipRect = renderer.clipRect(
+ extend(clipBox, { width: 0 })
+ );
+
+ chart[sharedClipKey + 'm'] = markerClipRect = renderer.clipRect(
+ -99, // include the width of the first marker
+ inverted ? -chart.plotLeft : -chart.plotTop,
+ 99,
+ inverted ? chart.chartWidth : chart.chartHeight
+ );
+ }
+ series.group.clip(clipRect);
+ series.markerGroup.clip(markerClipRect);
+ series.sharedClipKey = sharedClipKey;
+
+ // Run the animation
+ } else {
+ clipRect = chart[sharedClipKey];
+ if (clipRect) {
+ clipRect.animate({
+ width: chart.plotSizeX
+ }, animation);
+ }
+ if (chart[sharedClipKey + 'm']) {
+ chart[sharedClipKey + 'm'].animate({
+ width: chart.plotSizeX + 99
+ }, animation);
+ }
+
+ // Delete this function to allow it only once
+ series.animate = null;
+
+ }
+ },
+
+ /**
+ * This runs after animation to land on the final plot clipping
+ */
+ afterAnimate: function () {
+ var chart = this.chart,
+ sharedClipKey = this.sharedClipKey,
+ group = this.group,
+ clipBox = this.clipBox;
+
+ if (group && this.options.clip !== false) {
+ if (!sharedClipKey || !clipBox) {
+ group.clip(clipBox ? chart.renderer.clipRect(clipBox) : chart.clipRect);
+ }
+ this.markerGroup.clip(); // no clip
+ }
+
+ fireEvent(this, 'afterAnimate');
+
+ // Remove the shared clipping rectancgle when all series are shown
+ setTimeout(function () {
+ if (sharedClipKey && chart[sharedClipKey]) {
+ if (!clipBox) {
+ chart[sharedClipKey] = chart[sharedClipKey].destroy();
+ }
+ if (chart[sharedClipKey + 'm']) {
+ chart[sharedClipKey + 'm'] = chart[sharedClipKey + 'm'].destroy();
+ }
+ }
+ }, 100);
+ },
+
+ /**
+ * Draw the markers
+ */
+ drawPoints: function () {
+ var series = this,
+ pointAttr,
+ points = series.points,
+ chart = series.chart,
+ plotX,
+ plotY,
+ i,
+ point,
+ radius,
+ symbol,
+ isImage,
+ graphic,
+ options = series.options,
+ seriesMarkerOptions = options.marker,
+ seriesPointAttr = series.pointAttr[''],
+ pointMarkerOptions,
+ enabled,
+ isInside,
+ markerGroup = series.markerGroup,
+ globallyEnabled = pick(
+ seriesMarkerOptions.enabled,
+ series.activePointCount < (0.5 * series.xAxis.len / seriesMarkerOptions.radius)
+ );
+
+ if (seriesMarkerOptions.enabled !== false || series._hasPointMarkers) {
+
+ i = points.length;
+ while (i--) {
+ point = points[i];
+ plotX = mathFloor(point.plotX); // #1843
+ plotY = point.plotY;
+ graphic = point.graphic;
+ pointMarkerOptions = point.marker || {};
+ enabled = (globallyEnabled && pointMarkerOptions.enabled === UNDEFINED) || pointMarkerOptions.enabled;
+ isInside = chart.isInsidePlot(mathRound(plotX), plotY, chart.inverted); // #1858
+
+ // only draw the point if y is defined
+ if (enabled && plotY !== UNDEFINED && !isNaN(plotY) && point.y !== null) {
+
+ // shortcuts
+ pointAttr = point.pointAttr[point.selected ? SELECT_STATE : NORMAL_STATE] || seriesPointAttr;
+ radius = pointAttr.r;
+ symbol = pick(pointMarkerOptions.symbol, series.symbol);
+ isImage = symbol.indexOf('url') === 0;
+
+ if (graphic) { // update
+ graphic[isInside ? 'show' : 'hide'](true) // Since the marker group isn't clipped, each individual marker must be toggled
+ .animate(extend({
+ x: plotX - radius,
+ y: plotY - radius
+ }, graphic.symbolName ? { // don't apply to image symbols #507
+ width: 2 * radius,
+ height: 2 * radius
+ } : {}));
+ } else if (isInside && (radius > 0 || isImage)) {
+ point.graphic = graphic = chart.renderer.symbol(
+ symbol,
+ plotX - radius,
+ plotY - radius,
+ 2 * radius,
+ 2 * radius
+ )
+ .attr(pointAttr)
+ .add(markerGroup);
+ }
+
+ } else if (graphic) {
+ point.graphic = graphic.destroy(); // #1269
+ }
+ }
+ }
+
+ },
+
+ /**
+ * Convert state properties from API naming conventions to SVG attributes
+ *
+ * @param {Object} options API options object
+ * @param {Object} base1 SVG attribute object to inherit from
+ * @param {Object} base2 Second level SVG attribute object to inherit from
+ */
+ convertAttribs: function (options, base1, base2, base3) {
+ var conversion = this.pointAttrToOptions,
+ attr,
+ option,
+ obj = {};
+
+ options = options || {};
+ base1 = base1 || {};
+ base2 = base2 || {};
+ base3 = base3 || {};
+
+ for (attr in conversion) {
+ option = conversion[attr];
+ obj[attr] = pick(options[option], base1[attr], base2[attr], base3[attr]);
+ }
+ return obj;
+ },
+
+ /**
+ * Get the state attributes. Each series type has its own set of attributes
+ * that are allowed to change on a point's state change. Series wide attributes are stored for
+ * all series, and additionally point specific attributes are stored for all
+ * points with individual marker options. If such options are not defined for the point,
+ * a reference to the series wide attributes is stored in point.pointAttr.
+ */
+ getAttribs: function () {
+ var series = this,
+ seriesOptions = series.options,
+ normalOptions = defaultPlotOptions[series.type].marker ? seriesOptions.marker : seriesOptions,
+ stateOptions = normalOptions.states,
+ stateOptionsHover = stateOptions[HOVER_STATE],
+ pointStateOptionsHover,
+ seriesColor = series.color,
+ normalDefaults = {
+ stroke: seriesColor,
+ fill: seriesColor
+ },
+ points = series.points || [], // #927
+ i,
+ point,
+ seriesPointAttr = [],
+ pointAttr,
+ pointAttrToOptions = series.pointAttrToOptions,
+ hasPointSpecificOptions = series.hasPointSpecificOptions,
+ negativeColor = seriesOptions.negativeColor,
+ defaultLineColor = normalOptions.lineColor,
+ defaultFillColor = normalOptions.fillColor,
+ turboThreshold = seriesOptions.turboThreshold,
+ attr,
+ key;
+
+ // series type specific modifications
+ if (seriesOptions.marker) { // line, spline, area, areaspline, scatter
+
+ // if no hover radius is given, default to normal radius + 2
+ stateOptionsHover.radius = stateOptionsHover.radius || normalOptions.radius + stateOptionsHover.radiusPlus;
+ stateOptionsHover.lineWidth = stateOptionsHover.lineWidth || normalOptions.lineWidth + stateOptionsHover.lineWidthPlus;
+
+ } else { // column, bar, pie
+
+ // if no hover color is given, brighten the normal color
+ stateOptionsHover.color = stateOptionsHover.color ||
+ Color(stateOptionsHover.color || seriesColor)
+ .brighten(stateOptionsHover.brightness).get();
+ }
+
+ // general point attributes for the series normal state
+ seriesPointAttr[NORMAL_STATE] = series.convertAttribs(normalOptions, normalDefaults);
+
+ // HOVER_STATE and SELECT_STATE states inherit from normal state except the default radius
+ each([HOVER_STATE, SELECT_STATE], function (state) {
+ seriesPointAttr[state] =
+ series.convertAttribs(stateOptions[state], seriesPointAttr[NORMAL_STATE]);
+ });
+
+ // set it
+ series.pointAttr = seriesPointAttr;
+
+
+ // Generate the point-specific attribute collections if specific point
+ // options are given. If not, create a referance to the series wide point
+ // attributes
+ i = points.length;
+ if (!turboThreshold || i < turboThreshold || hasPointSpecificOptions) {
+ while (i--) {
+ point = points[i];
+ normalOptions = (point.options && point.options.marker) || point.options;
+ if (normalOptions && normalOptions.enabled === false) {
+ normalOptions.radius = 0;
+ }
+
+ if (point.negative && negativeColor) {
+ point.color = point.fillColor = negativeColor;
+ }
+
+ hasPointSpecificOptions = seriesOptions.colorByPoint || point.color; // #868
+
+ // check if the point has specific visual options
+ if (point.options) {
+ for (key in pointAttrToOptions) {
+ if (defined(normalOptions[pointAttrToOptions[key]])) {
+ hasPointSpecificOptions = true;
+ }
+ }
+ }
+
+ // a specific marker config object is defined for the individual point:
+ // create it's own attribute collection
+ if (hasPointSpecificOptions) {
+ normalOptions = normalOptions || {};
+ pointAttr = [];
+ stateOptions = normalOptions.states || {}; // reassign for individual point
+ pointStateOptionsHover = stateOptions[HOVER_STATE] = stateOptions[HOVER_STATE] || {};
+
+ // Handle colors for column and pies
+ if (!seriesOptions.marker) { // column, bar, point
+ // If no hover color is given, brighten the normal color. #1619, #2579
+ pointStateOptionsHover.color = pointStateOptionsHover.color || (!point.options.color && stateOptionsHover.color) ||
+ Color(point.color)
+ .brighten(pointStateOptionsHover.brightness || stateOptionsHover.brightness)
+ .get();
+ }
+
+ // normal point state inherits series wide normal state
+ attr = { color: point.color }; // #868
+ if (!defaultFillColor) { // Individual point color or negative color markers (#2219)
+ attr.fillColor = point.color;
+ }
+ if (!defaultLineColor) {
+ attr.lineColor = point.color; // Bubbles take point color, line markers use white
+ }
+ pointAttr[NORMAL_STATE] = series.convertAttribs(extend(attr, normalOptions), seriesPointAttr[NORMAL_STATE]);
+
+ // inherit from point normal and series hover
+ pointAttr[HOVER_STATE] = series.convertAttribs(
+ stateOptions[HOVER_STATE],
+ seriesPointAttr[HOVER_STATE],
+ pointAttr[NORMAL_STATE]
+ );
+
+ // inherit from point normal and series hover
+ pointAttr[SELECT_STATE] = series.convertAttribs(
+ stateOptions[SELECT_STATE],
+ seriesPointAttr[SELECT_STATE],
+ pointAttr[NORMAL_STATE]
+ );
+
+
+ // no marker config object is created: copy a reference to the series-wide
+ // attribute collection
+ } else {
+ pointAttr = seriesPointAttr;
+ }
+
+ point.pointAttr = pointAttr;
+ }
+ }
+ },
+
+ /**
+ * Clear DOM objects and free up memory
+ */
+ destroy: function () {
+ var series = this,
+ chart = series.chart,
+ issue134 = /AppleWebKit\/533/.test(userAgent),
+ destroy,
+ i,
+ data = series.data || [],
+ point,
+ prop,
+ axis;
+
+ // add event hook
+ fireEvent(series, 'destroy');
+
+ // remove all events
+ removeEvent(series);
+
+ // erase from axes
+ each(series.axisTypes || [], function (AXIS) {
+ axis = series[AXIS];
+ if (axis) {
+ erase(axis.series, series);
+ axis.isDirty = axis.forceRedraw = true;
+ }
+ });
+
+ // remove legend items
+ if (series.legendItem) {
+ series.chart.legend.destroyItem(series);
+ }
+
+ // destroy all points with their elements
+ i = data.length;
+ while (i--) {
+ point = data[i];
+ if (point && point.destroy) {
+ point.destroy();
+ }
+ }
+ series.points = null;
+
+ // Clear the animation timeout if we are destroying the series during initial animation
+ clearTimeout(series.animationTimeout);
+
+ // destroy all SVGElements associated to the series
+ each(['area', 'graph', 'dataLabelsGroup', 'group', 'markerGroup', 'tracker',
+ 'graphNeg', 'areaNeg', 'posClip', 'negClip'], function (prop) {
+ if (series[prop]) {
+
+ // issue 134 workaround
+ destroy = issue134 && prop === 'group' ?
+ 'hide' :
+ 'destroy';
+
+ series[prop][destroy]();
+ }
+ });
+
+ // remove from hoverSeries
+ if (chart.hoverSeries === series) {
+ chart.hoverSeries = null;
+ }
+ erase(chart.series, series);
+
+ // clear all members
+ for (prop in series) {
+ delete series[prop];
+ }
+ },
+
+ /**
+ * Return the graph path of a segment
+ */
+ getSegmentPath: function (segment) {
+ var series = this,
+ segmentPath = [],
+ step = series.options.step;
+
+ // build the segment line
+ each(segment, function (point, i) {
+
+ var plotX = point.plotX,
+ plotY = point.plotY,
+ lastPoint;
+
+ if (series.getPointSpline) { // generate the spline as defined in the SplineSeries object
+ segmentPath.push.apply(segmentPath, series.getPointSpline(segment, point, i));
+
+ } else {
+
+ // moveTo or lineTo
+ segmentPath.push(i ? L : M);
+
+ // step line?
+ if (step && i) {
+ lastPoint = segment[i - 1];
+ if (step === 'right') {
+ segmentPath.push(
+ lastPoint.plotX,
+ plotY
+ );
+
+ } else if (step === 'center') {
+ segmentPath.push(
+ (lastPoint.plotX + plotX) / 2,
+ lastPoint.plotY,
+ (lastPoint.plotX + plotX) / 2,
+ plotY
+ );
+
+ } else {
+ segmentPath.push(
+ plotX,
+ lastPoint.plotY
+ );
+ }
+ }
+
+ // normal line to next point
+ segmentPath.push(
+ point.plotX,
+ point.plotY
+ );
+ }
+ });
+
+ return segmentPath;
+ },
+
+ /**
+ * Get the graph path
+ */
+ getGraphPath: function () {
+ var series = this,
+ graphPath = [],
+ segmentPath,
+ singlePoints = []; // used in drawTracker
+
+ // Divide into segments and build graph and area paths
+ each(series.segments, function (segment) {
+
+ segmentPath = series.getSegmentPath(segment);
+
+ // add the segment to the graph, or a single point for tracking
+ if (segment.length > 1) {
+ graphPath = graphPath.concat(segmentPath);
+ } else {
+ singlePoints.push(segment[0]);
+ }
+ });
+
+ // Record it for use in drawGraph and drawTracker, and return graphPath
+ series.singlePoints = singlePoints;
+ series.graphPath = graphPath;
+
+ return graphPath;
+
+ },
+
+ /**
+ * Draw the actual graph
+ */
+ drawGraph: function () {
+ var series = this,
+ options = this.options,
+ props = [['graph', options.lineColor || this.color]],
+ lineWidth = options.lineWidth,
+ dashStyle = options.dashStyle,
+ roundCap = options.linecap !== 'square',
+ graphPath = this.getGraphPath(),
+ negativeColor = options.negativeColor;
+
+ if (negativeColor) {
+ props.push(['graphNeg', negativeColor]);
+ }
+
+ // draw the graph
+ each(props, function (prop, i) {
+ var graphKey = prop[0],
+ graph = series[graphKey],
+ attribs;
+
+ if (graph) {
+ stop(graph); // cancel running animations, #459
+ graph.animate({ d: graphPath });
+
+ } else if (lineWidth && graphPath.length) { // #1487
+ attribs = {
+ stroke: prop[1],
+ 'stroke-width': lineWidth,
+ fill: NONE,
+ zIndex: 1 // #1069
+ };
+ if (dashStyle) {
+ attribs.dashstyle = dashStyle;
+ } else if (roundCap) {
+ attribs['stroke-linecap'] = attribs['stroke-linejoin'] = 'round';
+ }
+
+ series[graphKey] = series.chart.renderer.path(graphPath)
+ .attr(attribs)
+ .add(series.group)
+ .shadow(!i && options.shadow);
+ }
+ });
+ },
+
+ /**
+ * Clip the graphs into the positive and negative coloured graphs
+ */
+ clipNeg: function () {
+ var options = this.options,
+ chart = this.chart,
+ renderer = chart.renderer,
+ negativeColor = options.negativeColor || options.negativeFillColor,
+ translatedThreshold,
+ posAttr,
+ negAttr,
+ graph = this.graph,
+ area = this.area,
+ posClip = this.posClip,
+ negClip = this.negClip,
+ chartWidth = chart.chartWidth,
+ chartHeight = chart.chartHeight,
+ chartSizeMax = mathMax(chartWidth, chartHeight),
+ yAxis = this.yAxis,
+ above,
+ below;
+
+ if (negativeColor && (graph || area)) {
+ translatedThreshold = mathRound(yAxis.toPixels(options.threshold || 0, true));
+ if (translatedThreshold < 0) {
+ chartSizeMax -= translatedThreshold; // #2534
+ }
+ above = {
+ x: 0,
+ y: 0,
+ width: chartSizeMax,
+ height: translatedThreshold
+ };
+ below = {
+ x: 0,
+ y: translatedThreshold,
+ width: chartSizeMax,
+ height: chartSizeMax
+ };
+
+ if (chart.inverted) {
+
+ above.height = below.y = chart.plotWidth - translatedThreshold;
+ if (renderer.isVML) {
+ above = {
+ x: chart.plotWidth - translatedThreshold - chart.plotLeft,
+ y: 0,
+ width: chartWidth,
+ height: chartHeight
+ };
+ below = {
+ x: translatedThreshold + chart.plotLeft - chartWidth,
+ y: 0,
+ width: chart.plotLeft + translatedThreshold,
+ height: chartWidth
+ };
+ }
+ }
+
+ if (yAxis.reversed) {
+ posAttr = below;
+ negAttr = above;
+ } else {
+ posAttr = above;
+ negAttr = below;
+ }
+
+ if (posClip) { // update
+ posClip.animate(posAttr);
+ negClip.animate(negAttr);
+ } else {
+
+ this.posClip = posClip = renderer.clipRect(posAttr);
+ this.negClip = negClip = renderer.clipRect(negAttr);
+
+ if (graph && this.graphNeg) {
+ graph.clip(posClip);
+ this.graphNeg.clip(negClip);
+ }
+
+ if (area) {
+ area.clip(posClip);
+ this.areaNeg.clip(negClip);
+ }
+ }
+ }
+ },
+
+ /**
+ * Initialize and perform group inversion on series.group and series.markerGroup
+ */
+ invertGroups: function () {
+ var series = this,
+ chart = series.chart;
+
+ // Pie, go away (#1736)
+ if (!series.xAxis) {
+ return;
+ }
+
+ // A fixed size is needed for inversion to work
+ function setInvert() {
+ var size = {
+ width: series.yAxis.len,
+ height: series.xAxis.len
+ };
+
+ each(['group', 'markerGroup'], function (groupName) {
+ if (series[groupName]) {
+ series[groupName].attr(size).invert();
+ }
+ });
+ }
+
+ addEvent(chart, 'resize', setInvert); // do it on resize
+ addEvent(series, 'destroy', function () {
+ removeEvent(chart, 'resize', setInvert);
+ });
+
+ // Do it now
+ setInvert(); // do it now
+
+ // On subsequent render and redraw, just do setInvert without setting up events again
+ series.invertGroups = setInvert;
+ },
+
+ /**
+ * General abstraction for creating plot groups like series.group, series.dataLabelsGroup and
+ * series.markerGroup. On subsequent calls, the group will only be adjusted to the updated plot size.
+ */
+ plotGroup: function (prop, name, visibility, zIndex, parent) {
+ var group = this[prop],
+ isNew = !group;
+
+ // Generate it on first call
+ if (isNew) {
+ this[prop] = group = this.chart.renderer.g(name)
+ .attr({
+ visibility: visibility,
+ zIndex: zIndex || 0.1 // IE8 needs this
+ })
+ .add(parent);
+ }
+ // Place it on first and subsequent (redraw) calls
+ group[isNew ? 'attr' : 'animate'](this.getPlotBox());
+ return group;
+ },
+
+ /**
+ * Get the translation and scale for the plot area of this series
+ */
+ getPlotBox: function () {
+ var chart = this.chart,
+ xAxis = this.xAxis,
+ yAxis = this.yAxis;
+
+ // Swap axes for inverted (#2339)
+ if (chart.inverted) {
+ xAxis = yAxis;
+ yAxis = this.xAxis;
+ }
+ return {
+ translateX: xAxis ? xAxis.left : chart.plotLeft,
+ translateY: yAxis ? yAxis.top : chart.plotTop,
+ scaleX: 1, // #1623
+ scaleY: 1
+ };
+ },
+
+ /**
+ * Render the graph and markers
+ */
+ render: function () {
+ var series = this,
+ chart = series.chart,
+ group,
+ options = series.options,
+ animation = options.animation,
+ // Animation doesn't work in IE8 quirks when the group div is hidden,
+ // and looks bad in other oldIE
+ animDuration = (animation && !!series.animate && chart.renderer.isSVG && pick(animation.duration, 500)) || 0,
+ visibility = series.visible ? VISIBLE : HIDDEN,
+ zIndex = options.zIndex,
+ hasRendered = series.hasRendered,
+ chartSeriesGroup = chart.seriesGroup;
+
+ // the group
+ group = series.plotGroup(
+ 'group',
+ 'series',
+ visibility,
+ zIndex,
+ chartSeriesGroup
+ );
+
+ series.markerGroup = series.plotGroup(
+ 'markerGroup',
+ 'markers',
+ visibility,
+ zIndex,
+ chartSeriesGroup
+ );
+
+ // initiate the animation
+ if (animDuration) {
+ series.animate(true);
+ }
+
+ // cache attributes for shapes
+ series.getAttribs();
+
+ // SVGRenderer needs to know this before drawing elements (#1089, #1795)
+ group.inverted = series.isCartesian ? chart.inverted : false;
+
+ // draw the graph if any
+ if (series.drawGraph) {
+ series.drawGraph();
+ series.clipNeg();
+ }
+
+ // draw the data labels (inn pies they go before the points)
+ if (series.drawDataLabels) {
+ series.drawDataLabels();
+ }
+
+ // draw the points
+ if (series.visible) {
+ series.drawPoints();
+ }
+
+
+ // draw the mouse tracking area
+ if (series.drawTracker && series.options.enableMouseTracking !== false) {
+ series.drawTracker();
+ }
+
+ // Handle inverted series and tracker groups
+ if (chart.inverted) {
+ series.invertGroups();
+ }
+
+ // Initial clipping, must be defined after inverting groups for VML
+ if (options.clip !== false && !series.sharedClipKey && !hasRendered) {
+ group.clip(chart.clipRect);
+ }
+
+ // Run the animation
+ if (animDuration) {
+ series.animate();
+ }
+
+ // Call the afterAnimate function on animation complete (but don't overwrite the animation.complete option
+ // which should be available to the user).
+ if (!hasRendered) {
+ if (animDuration) {
+ series.animationTimeout = setTimeout(function () {
+ series.afterAnimate();
+ }, animDuration);
+ } else {
+ series.afterAnimate();
+ }
+ }
+
+ series.isDirty = series.isDirtyData = false; // means data is in accordance with what you see
+ // (See #322) series.isDirty = series.isDirtyData = false; // means data is in accordance with what you see
+ series.hasRendered = true;
+ },
+
+ /**
+ * Redraw the series after an update in the axes.
+ */
+ redraw: function () {
+ var series = this,
+ chart = series.chart,
+ wasDirtyData = series.isDirtyData, // cache it here as it is set to false in render, but used after
+ group = series.group,
+ xAxis = series.xAxis,
+ yAxis = series.yAxis;
+
+ // reposition on resize
+ if (group) {
+ if (chart.inverted) {
+ group.attr({
+ width: chart.plotWidth,
+ height: chart.plotHeight
+ });
+ }
+
+ group.animate({
+ translateX: pick(xAxis && xAxis.left, chart.plotLeft),
+ translateY: pick(yAxis && yAxis.top, chart.plotTop)
+ });
+ }
+
+ series.translate();
+ if (series.setTooltipPoints) {
+ series.setTooltipPoints(true);
+ }
+ series.render();
+
+ if (wasDirtyData) {
+ fireEvent(series, 'updatedData');
+ }
+ }
+}; // end Series prototype
+
+/**
+ * The class for stack items
+ */
+function StackItem(axis, options, isNegative, x, stackOption) {
+
+ var inverted = axis.chart.inverted;
+
+ this.axis = axis;
+
+ // Tells if the stack is negative
+ this.isNegative = isNegative;
+
+ // Save the options to be able to style the label
+ this.options = options;
+
+ // Save the x value to be able to position the label later
+ this.x = x;
+
+ // Initialize total value
+ this.total = null;
+
+ // This will keep each points' extremes stored by series.index and point index
+ this.points = {};
+
+ // Save the stack option on the series configuration object, and whether to treat it as percent
+ this.stack = stackOption;
+
+ // The align options and text align varies on whether the stack is negative and
+ // if the chart is inverted or not.
+ // First test the user supplied value, then use the dynamic.
+ this.alignOptions = {
+ align: options.align || (inverted ? (isNegative ? 'left' : 'right') : 'center'),
+ verticalAlign: options.verticalAlign || (inverted ? 'middle' : (isNegative ? 'bottom' : 'top')),
+ y: pick(options.y, inverted ? 4 : (isNegative ? 14 : -6)),
+ x: pick(options.x, inverted ? (isNegative ? -6 : 6) : 0)
+ };
+
+ this.textAlign = options.textAlign || (inverted ? (isNegative ? 'right' : 'left') : 'center');
+}
+
+StackItem.prototype = {
+ destroy: function () {
+ destroyObjectProperties(this, this.axis);
+ },
+
+ /**
+ * Renders the stack total label and adds it to the stack label group.
+ */
+ render: function (group) {
+ var options = this.options,
+ formatOption = options.format,
+ str = formatOption ?
+ format(formatOption, this) :
+ options.formatter.call(this); // format the text in the label
+
+ // Change the text to reflect the new total and set visibility to hidden in case the serie is hidden
+ if (this.label) {
+ this.label.attr({text: str, visibility: HIDDEN});
+ // Create new label
+ } else {
+ this.label =
+ this.axis.chart.renderer.text(str, null, null, options.useHTML) // dummy positions, actual position updated with setOffset method in columnseries
+ .css(options.style) // apply style
+ .attr({
+ align: this.textAlign, // fix the text-anchor
+ rotation: options.rotation, // rotation
+ visibility: HIDDEN // hidden until setOffset is called
+ })
+ .add(group); // add to the labels-group
+ }
+ },
+
+ /**
+ * Sets the offset that the stack has from the x value and repositions the label.
+ */
+ setOffset: function (xOffset, xWidth) {
+ var stackItem = this,
+ axis = stackItem.axis,
+ chart = axis.chart,
+ inverted = chart.inverted,
+ neg = this.isNegative, // special treatment is needed for negative stacks
+ y = axis.translate(axis.usePercentage ? 100 : this.total, 0, 0, 0, 1), // stack value translated mapped to chart coordinates
+ yZero = axis.translate(0), // stack origin
+ h = mathAbs(y - yZero), // stack height
+ x = chart.xAxis[0].translate(this.x) + xOffset, // stack x position
+ plotHeight = chart.plotHeight,
+ stackBox = { // this is the box for the complete stack
+ x: inverted ? (neg ? y : y - h) : x,
+ y: inverted ? plotHeight - x - xWidth : (neg ? (plotHeight - y - h) : plotHeight - y),
+ width: inverted ? h : xWidth,
+ height: inverted ? xWidth : h
+ },
+ label = this.label,
+ alignAttr;
+
+ if (label) {
+ label.align(this.alignOptions, null, stackBox); // align the label to the box
+
+ // Set visibility (#678)
+ alignAttr = label.alignAttr;
+ label[this.options.crop === false || chart.isInsidePlot(alignAttr.x, alignAttr.y) ? 'show' : 'hide'](true);
+ }
+ }
+};
+
+
+// Stacking methods defined on the Axis prototype
+
+/**
+ * Build the stacks from top down
+ */
+Axis.prototype.buildStacks = function () {
+ var series = this.series,
+ reversedStacks = pick(this.options.reversedStacks, true),
+ i = series.length;
+ if (!this.isXAxis) {
+ this.usePercentage = false;
+ while (i--) {
+ series[reversedStacks ? i : series.length - i - 1].setStackedPoints();
+ }
+ // Loop up again to compute percent stack
+ if (this.usePercentage) {
+ for (i = 0; i < series.length; i++) {
+ series[i].setPercentStacks();
+ }
+ }
+ }
+};
+
+Axis.prototype.renderStackTotals = function () {
+ var axis = this,
+ chart = axis.chart,
+ renderer = chart.renderer,
+ stacks = axis.stacks,
+ stackKey,
+ oneStack,
+ stackCategory,
+ stackTotalGroup = axis.stackTotalGroup;
+
+ // Create a separate group for the stack total labels
+ if (!stackTotalGroup) {
+ axis.stackTotalGroup = stackTotalGroup =
+ renderer.g('stack-labels')
+ .attr({
+ visibility: VISIBLE,
+ zIndex: 6
+ })
+ .add();
+ }
+
+ // plotLeft/Top will change when y axis gets wider so we need to translate the
+ // stackTotalGroup at every render call. See bug #506 and #516
+ stackTotalGroup.translate(chart.plotLeft, chart.plotTop);
+
+ // Render each stack total
+ for (stackKey in stacks) {
+ oneStack = stacks[stackKey];
+ for (stackCategory in oneStack) {
+ oneStack[stackCategory].render(stackTotalGroup);
+ }
+ }
+};
+
+
+// Stacking methods defnied for Series prototype
+
+/**
+ * Adds series' points value to corresponding stack
+ */
+Series.prototype.setStackedPoints = function () {
+ if (!this.options.stacking || (this.visible !== true && this.chart.options.chart.ignoreHiddenSeries !== false)) {
+ return;
+ }
+
+ var series = this,
+ xData = series.processedXData,
+ yData = series.processedYData,
+ stackedYData = [],
+ yDataLength = yData.length,
+ seriesOptions = series.options,
+ threshold = seriesOptions.threshold,
+ stackOption = seriesOptions.stack,
+ stacking = seriesOptions.stacking,
+ stackKey = series.stackKey,
+ negKey = '-' + stackKey,
+ negStacks = series.negStacks,
+ yAxis = series.yAxis,
+ stacks = yAxis.stacks,
+ oldStacks = yAxis.oldStacks,
+ isNegative,
+ stack,
+ other,
+ key,
+ pointKey,
+ i,
+ x,
+ y;
+
+ // loop over the non-null y values and read them into a local array
+ for (i = 0; i < yDataLength; i++) {
+ x = xData[i];
+ y = yData[i];
+ pointKey = series.index + ',' + i;
+
+ // Read stacked values into a stack based on the x value,
+ // the sign of y and the stack key. Stacking is also handled for null values (#739)
+ isNegative = negStacks && y < threshold;
+ key = isNegative ? negKey : stackKey;
+
+ // Create empty object for this stack if it doesn't exist yet
+ if (!stacks[key]) {
+ stacks[key] = {};
+ }
+
+ // Initialize StackItem for this x
+ if (!stacks[key][x]) {
+ if (oldStacks[key] && oldStacks[key][x]) {
+ stacks[key][x] = oldStacks[key][x];
+ stacks[key][x].total = null;
+ } else {
+ stacks[key][x] = new StackItem(yAxis, yAxis.options.stackLabels, isNegative, x, stackOption);
+ }
+ }
+
+ // If the StackItem doesn't exist, create it first
+ stack = stacks[key][x];
+ stack.points[pointKey] = [stack.cum || 0];
+
+ // Add value to the stack total
+ if (stacking === 'percent') {
+
+ // Percent stacked column, totals are the same for the positive and negative stacks
+ other = isNegative ? stackKey : negKey;
+ if (negStacks && stacks[other] && stacks[other][x]) {
+ other = stacks[other][x];
+ stack.total = other.total = mathMax(other.total, stack.total) + mathAbs(y) || 0;
+
+ // Percent stacked areas
+ } else {
+ stack.total = correctFloat(stack.total + (mathAbs(y) || 0));
+ }
+ } else {
+ stack.total = correctFloat(stack.total + (y || 0));
+ }
+
+ stack.cum = (stack.cum || 0) + (y || 0);
+
+ stack.points[pointKey].push(stack.cum);
+ stackedYData[i] = stack.cum;
+
+ }
+
+ if (stacking === 'percent') {
+ yAxis.usePercentage = true;
+ }
+
+ this.stackedYData = stackedYData; // To be used in getExtremes
+
+ // Reset old stacks
+ yAxis.oldStacks = {};
+};
+
+/**
+ * Iterate over all stacks and compute the absolute values to percent
+ */
+Series.prototype.setPercentStacks = function () {
+ var series = this,
+ stackKey = series.stackKey,
+ stacks = series.yAxis.stacks,
+ processedXData = series.processedXData;
+
+ each([stackKey, '-' + stackKey], function (key) {
+ var i = processedXData.length,
+ x,
+ stack,
+ pointExtremes,
+ totalFactor;
+
+ while (i--) {
+ x = processedXData[i];
+ stack = stacks[key] && stacks[key][x];
+ pointExtremes = stack && stack.points[series.index + ',' + i];
+ if (pointExtremes) {
+ totalFactor = stack.total ? 100 / stack.total : 0;
+ pointExtremes[0] = correctFloat(pointExtremes[0] * totalFactor); // Y bottom value
+ pointExtremes[1] = correctFloat(pointExtremes[1] * totalFactor); // Y value
+ series.stackedYData[i] = pointExtremes[1];
+ }
+ }
+ });
+};
+
+// Extend the Chart prototype for dynamic methods
+extend(Chart.prototype, {
+
+ /**
+ * Add a series dynamically after time
+ *
+ * @param {Object} options The config options
+ * @param {Boolean} redraw Whether to redraw the chart after adding. Defaults to true.
+ * @param {Boolean|Object} animation Whether to apply animation, and optionally animation
+ * configuration
+ *
+ * @return {Object} series The newly created series object
+ */
+ addSeries: function (options, redraw, animation) {
+ var series,
+ chart = this;
+
+ if (options) {
+ redraw = pick(redraw, true); // defaults to true
+
+ fireEvent(chart, 'addSeries', { options: options }, function () {
+ series = chart.initSeries(options);
+
+ chart.isDirtyLegend = true; // the series array is out of sync with the display
+ chart.linkSeries();
+ if (redraw) {
+ chart.redraw(animation);
+ }
+ });
+ }
+
+ return series;
+ },
+
+ /**
+ * Add an axis to the chart
+ * @param {Object} options The axis option
+ * @param {Boolean} isX Whether it is an X axis or a value axis
+ */
+ addAxis: function (options, isX, redraw, animation) {
+ var key = isX ? 'xAxis' : 'yAxis',
+ chartOptions = this.options,
+ axis;
+
+ /*jslint unused: false*/
+ axis = new Axis(this, merge(options, {
+ index: this[key].length,
+ isX: isX
+ }));
+ /*jslint unused: true*/
+
+ // Push the new axis options to the chart options
+ chartOptions[key] = splat(chartOptions[key] || {});
+ chartOptions[key].push(options);
+
+ if (pick(redraw, true)) {
+ this.redraw(animation);
+ }
+ },
+
+ /**
+ * Dim the chart and show a loading text or symbol
+ * @param {String} str An optional text to show in the loading label instead of the default one
+ */
+ showLoading: function (str) {
+ var chart = this,
+ options = chart.options,
+ loadingDiv = chart.loadingDiv,
+ loadingOptions = options.loading,
+ setLoadingSize = function () {
+ if (loadingDiv) {
+ css(loadingDiv, {
+ left: chart.plotLeft + PX,
+ top: chart.plotTop + PX,
+ width: chart.plotWidth + PX,
+ height: chart.plotHeight + PX
+ });
+ }
+ };
+
+ // create the layer at the first call
+ if (!loadingDiv) {
+ chart.loadingDiv = loadingDiv = createElement(DIV, {
+ className: PREFIX + 'loading'
+ }, extend(loadingOptions.style, {
+ zIndex: 10,
+ display: NONE
+ }), chart.container);
+
+ chart.loadingSpan = createElement(
+ 'span',
+ null,
+ loadingOptions.labelStyle,
+ loadingDiv
+ );
+ addEvent(chart, 'redraw', setLoadingSize); // #1080
+ }
+
+ // update text
+ chart.loadingSpan.innerHTML = str || options.lang.loading;
+
+ // show it
+ if (!chart.loadingShown) {
+ css(loadingDiv, {
+ opacity: 0,
+ display: ''
+ });
+ animate(loadingDiv, {
+ opacity: loadingOptions.style.opacity
+ }, {
+ duration: loadingOptions.showDuration || 0
+ });
+ chart.loadingShown = true;
+ }
+ setLoadingSize();
+ },
+
+ /**
+ * Hide the loading layer
+ */
+ hideLoading: function () {
+ var options = this.options,
+ loadingDiv = this.loadingDiv;
+
+ if (loadingDiv) {
+ animate(loadingDiv, {
+ opacity: 0
+ }, {
+ duration: options.loading.hideDuration || 100,
+ complete: function () {
+ css(loadingDiv, { display: NONE });
+ }
+ });
+ }
+ this.loadingShown = false;
+ }
+});
+
+// extend the Point prototype for dynamic methods
+extend(Point.prototype, {
+ /**
+ * Update the point with new options (typically x/y data) and optionally redraw the series.
+ *
+ * @param {Object} options Point options as defined in the series.data array
+ * @param {Boolean} redraw Whether to redraw the chart or wait for an explicit call
+ * @param {Boolean|Object} animation Whether to apply animation, and optionally animation
+ * configuration
+ *
+ */
+ update: function (options, redraw, animation) {
+ var point = this,
+ series = point.series,
+ graphic = point.graphic,
+ i,
+ data = series.data,
+ chart = series.chart,
+ seriesOptions = series.options;
+
+ redraw = pick(redraw, true);
+
+ // fire the event with a default handler of doing the update
+ point.firePointEvent('update', { options: options }, function () {
+
+ point.applyOptions(options);
+
+ // update visuals
+ if (isObject(options)) {
+ series.getAttribs();
+ if (graphic) {
+ if (options && options.marker && options.marker.symbol) {
+ point.graphic = graphic.destroy();
+ } else {
+ graphic.attr(point.pointAttr[point.state || '']);
+ }
+ }
+ if (options && options.dataLabels && point.dataLabel) { // #2468
+ point.dataLabel = point.dataLabel.destroy();
+ }
+ }
+
+ // record changes in the parallel arrays
+ i = inArray(point, data);
+ series.updateParallelArrays(point, i);
+
+ seriesOptions.data[i] = point.options;
+
+ // redraw
+ series.isDirty = series.isDirtyData = true;
+ if (!series.fixedBox && series.hasCartesianSeries) { // #1906, #2320
+ chart.isDirtyBox = true;
+ }
+
+ if (seriesOptions.legendType === 'point') { // #1831, #1885
+ chart.legend.destroyItem(point);
+ }
+ if (redraw) {
+ chart.redraw(animation);
+ }
+ });
+ },
+
+ /**
+ * Remove a point and optionally redraw the series and if necessary the axes
+ * @param {Boolean} redraw Whether to redraw the chart or wait for an explicit call
+ * @param {Boolean|Object} animation Whether to apply animation, and optionally animation
+ * configuration
+ */
+ remove: function (redraw, animation) {
+ var point = this,
+ series = point.series,
+ points = series.points,
+ chart = series.chart,
+ i,
+ data = series.data;
+
+ setAnimation(animation, chart);
+ redraw = pick(redraw, true);
+
+ // fire the event with a default handler of removing the point
+ point.firePointEvent('remove', null, function () {
+
+ // splice all the parallel arrays
+ i = inArray(point, data);
+ if (data.length === points.length) {
+ points.splice(i, 1);
+ }
+ data.splice(i, 1);
+ series.options.data.splice(i, 1);
+ series.updateParallelArrays(point, 'splice', i, 1);
+
+ point.destroy();
+
+ // redraw
+ series.isDirty = true;
+ series.isDirtyData = true;
+ if (redraw) {
+ chart.redraw();
+ }
+ });
+ }
+});
+
+// Extend the series prototype for dynamic methods
+extend(Series.prototype, {
+ /**
+ * Add a point dynamically after chart load time
+ * @param {Object} options Point options as given in series.data
+ * @param {Boolean} redraw Whether to redraw the chart or wait for an explicit call
+ * @param {Boolean} shift If shift is true, a point is shifted off the start
+ * of the series as one is appended to the end.
+ * @param {Boolean|Object} animation Whether to apply animation, and optionally animation
+ * configuration
+ */
+ addPoint: function (options, redraw, shift, animation) {
+ var series = this,
+ seriesOptions = series.options,
+ data = series.data,
+ graph = series.graph,
+ area = series.area,
+ chart = series.chart,
+ names = series.xAxis && series.xAxis.names,
+ currentShift = (graph && graph.shift) || 0,
+ dataOptions = seriesOptions.data,
+ point,
+ isInTheMiddle,
+ xData = series.xData,
+ x,
+ i;
+
+ setAnimation(animation, chart);
+
+ // Make graph animate sideways
+ if (shift) {
+ each([graph, area, series.graphNeg, series.areaNeg], function (shape) {
+ if (shape) {
+ shape.shift = currentShift + 1;
+ }
+ });
+ }
+ if (area) {
+ area.isArea = true; // needed in animation, both with and without shift
+ }
+
+ // Optional redraw, defaults to true
+ redraw = pick(redraw, true);
+
+ // Get options and push the point to xData, yData and series.options. In series.generatePoints
+ // the Point instance will be created on demand and pushed to the series.data array.
+ point = { series: series };
+ series.pointClass.prototype.applyOptions.apply(point, [options]);
+ x = point.x;
+
+ // Get the insertion point
+ i = xData.length;
+ if (series.requireSorting && x < xData[i - 1]) {
+ isInTheMiddle = true;
+ while (i && xData[i - 1] > x) {
+ i--;
+ }
+ }
+
+ series.updateParallelArrays(point, 'splice', i, 0, 0); // insert undefined item
+ series.updateParallelArrays(point, i); // update it
+
+ if (names) {
+ names[x] = point.name;
+ }
+ dataOptions.splice(i, 0, options);
+
+ if (isInTheMiddle) {
+ series.data.splice(i, 0, null);
+ series.processData();
+ }
+
+ // Generate points to be added to the legend (#1329)
+ if (seriesOptions.legendType === 'point') {
+ series.generatePoints();
+ }
+
+ // Shift the first point off the parallel arrays
+ // todo: consider series.removePoint(i) method
+ if (shift) {
+ if (data[0] && data[0].remove) {
+ data[0].remove(false);
+ } else {
+ data.shift();
+ series.updateParallelArrays(point, 'shift');
+
+ dataOptions.shift();
+ }
+ }
+
+ // redraw
+ series.isDirty = true;
+ series.isDirtyData = true;
+ if (redraw) {
+ series.getAttribs(); // #1937
+ chart.redraw();
+ }
+ },
+
+ /**
+ * Remove a series and optionally redraw the chart
+ *
+ * @param {Boolean} redraw Whether to redraw the chart or wait for an explicit call
+ * @param {Boolean|Object} animation Whether to apply animation, and optionally animation
+ * configuration
+ */
+
+ remove: function (redraw, animation) {
+ var series = this,
+ chart = series.chart;
+ redraw = pick(redraw, true);
+
+ if (!series.isRemoving) { /* prevent triggering native event in jQuery
+ (calling the remove function from the remove event) */
+ series.isRemoving = true;
+
+ // fire the event with a default handler of removing the point
+ fireEvent(series, 'remove', null, function () {
+
+
+ // destroy elements
+ series.destroy();
+
+
+ // redraw
+ chart.isDirtyLegend = chart.isDirtyBox = true;
+ chart.linkSeries();
+
+ if (redraw) {
+ chart.redraw(animation);
+ }
+ });
+
+ }
+ series.isRemoving = false;
+ },
+
+ /**
+ * Update the series with a new set of options
+ */
+ update: function (newOptions, redraw) {
+ var series = this,
+ chart = this.chart,
+ // must use user options when changing type because this.options is merged
+ // in with type specific plotOptions
+ oldOptions = this.userOptions,
+ oldType = this.type,
+ proto = seriesTypes[oldType].prototype,
+ preserve = ['group', 'markerGroup', 'dataLabelsGroup'],
+ n;
+
+ // Make sure groups are not destroyed (#3094)
+ each(preserve, function (prop) {
+ preserve[prop] = series[prop];
+ delete series[prop];
+ });
+
+ // Do the merge, with some forced options
+ newOptions = merge(oldOptions, {
+ animation: false,
+ index: this.index,
+ pointStart: this.xData[0] // when updating after addPoint
+ }, { data: this.options.data }, newOptions);
+
+ // Destroy the series and reinsert methods from the type prototype
+ this.remove(false);
+ for (n in proto) { // Overwrite series-type specific methods (#2270)
+ if (proto.hasOwnProperty(n)) {
+ this[n] = UNDEFINED;
+ }
+ }
+ extend(this, seriesTypes[newOptions.type || oldType].prototype);
+
+ // Re-register groups (#3094)
+ each(preserve, function (prop) {
+ series[prop] = preserve[prop];
+ });
+
+
+ this.init(chart, newOptions);
+ chart.linkSeries(); // Links are lost in this.remove (#3028)
+ if (pick(redraw, true)) {
+ chart.redraw(false);
+ }
+ }
+});
+
+// Extend the Axis.prototype for dynamic methods
+extend(Axis.prototype, {
+
+ /**
+ * Update the axis with a new options structure
+ */
+ update: function (newOptions, redraw) {
+ var chart = this.chart;
+
+ newOptions = chart.options[this.coll][this.options.index] = merge(this.userOptions, newOptions);
+
+ this.destroy(true);
+ this._addedPlotLB = UNDEFINED; // #1611, #2887
+
+ this.init(chart, extend(newOptions, { events: UNDEFINED }));
+
+ chart.isDirtyBox = true;
+ if (pick(redraw, true)) {
+ chart.redraw();
+ }
+ },
+
+ /**
+ * Remove the axis from the chart
+ */
+ remove: function (redraw) {
+ var chart = this.chart,
+ key = this.coll, // xAxis or yAxis
+ axisSeries = this.series,
+ i = axisSeries.length;
+
+ // Remove associated series (#2687)
+ while (i--) {
+ if (axisSeries[i]) {
+ axisSeries[i].remove(false);
+ }
+ }
+
+ // Remove the axis
+ erase(chart.axes, this);
+ erase(chart[key], this);
+ chart.options[key].splice(this.options.index, 1);
+ each(chart[key], function (axis, i) { // Re-index, #1706
+ axis.options.index = i;
+ });
+ this.destroy();
+ chart.isDirtyBox = true;
+
+ if (pick(redraw, true)) {
+ chart.redraw();
+ }
+ },
+
+ /**
+ * Update the axis title by options
+ */
+ setTitle: function (newTitleOptions, redraw) {
+ this.update({ title: newTitleOptions }, redraw);
+ },
+
+ /**
+ * Set new axis categories and optionally redraw
+ * @param {Array} categories
+ * @param {Boolean} redraw
+ */
+ setCategories: function (categories, redraw) {
+ this.update({ categories: categories }, redraw);
+ }
+
+});
+
+
+/**
+ * LineSeries object
+ */
+var LineSeries = extendClass(Series);
+seriesTypes.line = LineSeries;
+
+/**
+ * Set the default options for area
+ */
+defaultPlotOptions.area = merge(defaultSeriesOptions, {
+ threshold: 0
+ // trackByArea: false,
+ // lineColor: null, // overrides color, but lets fillColor be unaltered
+ // fillOpacity: 0.75,
+ // fillColor: null
+});
+
+/**
+ * AreaSeries object
+ */
+var AreaSeries = extendClass(Series, {
+ type: 'area',
+ /**
+ * For stacks, don't split segments on null values. Instead, draw null values with
+ * no marker. Also insert dummy points for any X position that exists in other series
+ * in the stack.
+ */
+ getSegments: function () {
+ var series = this,
+ segments = [],
+ segment = [],
+ keys = [],
+ xAxis = this.xAxis,
+ yAxis = this.yAxis,
+ stack = yAxis.stacks[this.stackKey],
+ pointMap = {},
+ plotX,
+ plotY,
+ points = this.points,
+ connectNulls = this.options.connectNulls,
+ i,
+ x;
+
+ if (this.options.stacking && !this.cropped) { // cropped causes artefacts in Stock, and perf issue
+ // Create a map where we can quickly look up the points by their X value.
+ for (i = 0; i < points.length; i++) {
+ pointMap[points[i].x] = points[i];
+ }
+
+ // Sort the keys (#1651)
+ for (x in stack) {
+ if (stack[x].total !== null) { // nulled after switching between grouping and not (#1651, #2336)
+ keys.push(+x);
+ }
+ }
+ keys.sort(function (a, b) {
+ return a - b;
+ });
+
+ each(keys, function (x) {
+ var y = 0,
+ stackPoint;
+
+ if (connectNulls && (!pointMap[x] || pointMap[x].y === null)) { // #1836
+ return;
+
+ // The point exists, push it to the segment
+ } else if (pointMap[x]) {
+ segment.push(pointMap[x]);
+
+ // There is no point for this X value in this series, so we
+ // insert a dummy point in order for the areas to be drawn
+ // correctly.
+ } else {
+
+ // Loop down the stack to find the series below this one that has
+ // a value (#1991)
+ for (i = series.index; i <= yAxis.series.length; i++) {
+ stackPoint = stack[x].points[i + ',' + x];
+ if (stackPoint) {
+ y = stackPoint[1];
+ break;
+ }
+ }
+
+ plotX = xAxis.translate(x);
+ plotY = yAxis.toPixels(y, true);
+ segment.push({
+ y: null,
+ plotX: plotX,
+ clientX: plotX,
+ plotY: plotY,
+ yBottom: plotY,
+ onMouseOver: noop
+ });
+ }
+ });
+
+ if (segment.length) {
+ segments.push(segment);
+ }
+
+ } else {
+ Series.prototype.getSegments.call(this);
+ segments = this.segments;
+ }
+
+ this.segments = segments;
+ },
+
+ /**
+ * Extend the base Series getSegmentPath method by adding the path for the area.
+ * This path is pushed to the series.areaPath property.
+ */
+ getSegmentPath: function (segment) {
+
+ var segmentPath = Series.prototype.getSegmentPath.call(this, segment), // call base method
+ areaSegmentPath = [].concat(segmentPath), // work on a copy for the area path
+ i,
+ options = this.options,
+ segLength = segmentPath.length,
+ translatedThreshold = this.yAxis.getThreshold(options.threshold), // #2181
+ yBottom;
+
+ if (segLength === 3) { // for animation from 1 to two points
+ areaSegmentPath.push(L, segmentPath[1], segmentPath[2]);
+ }
+ if (options.stacking && !this.closedStacks) {
+
+ // Follow stack back. Todo: implement areaspline. A general solution could be to
+ // reverse the entire graphPath of the previous series, though may be hard with
+ // splines and with series with different extremes
+ for (i = segment.length - 1; i >= 0; i--) {
+
+ yBottom = pick(segment[i].yBottom, translatedThreshold);
+
+ // step line?
+ if (i < segment.length - 1 && options.step) {
+ areaSegmentPath.push(segment[i + 1].plotX, yBottom);
+ }
+
+ areaSegmentPath.push(segment[i].plotX, yBottom);
+ }
+
+ } else { // follow zero line back
+ this.closeSegment(areaSegmentPath, segment, translatedThreshold);
+ }
+ this.areaPath = this.areaPath.concat(areaSegmentPath);
+ return segmentPath;
+ },
+
+ /**
+ * Extendable method to close the segment path of an area. This is overridden in polar
+ * charts.
+ */
+ closeSegment: function (path, segment, translatedThreshold) {
+ path.push(
+ L,
+ segment[segment.length - 1].plotX,
+ translatedThreshold,
+ L,
+ segment[0].plotX,
+ translatedThreshold
+ );
+ },
+
+ /**
+ * Draw the graph and the underlying area. This method calls the Series base
+ * function and adds the area. The areaPath is calculated in the getSegmentPath
+ * method called from Series.prototype.drawGraph.
+ */
+ drawGraph: function () {
+
+ // Define or reset areaPath
+ this.areaPath = [];
+
+ // Call the base method
+ Series.prototype.drawGraph.apply(this);
+
+ // Define local variables
+ var series = this,
+ areaPath = this.areaPath,
+ options = this.options,
+ negativeColor = options.negativeColor,
+ negativeFillColor = options.negativeFillColor,
+ props = [['area', this.color, options.fillColor]]; // area name, main color, fill color
+
+ if (negativeColor || negativeFillColor) {
+ props.push(['areaNeg', negativeColor, negativeFillColor]);
+ }
+
+ each(props, function (prop) {
+ var areaKey = prop[0],
+ area = series[areaKey];
+
+ // Create or update the area
+ if (area) { // update
+ area.animate({ d: areaPath });
+
+ } else { // create
+ series[areaKey] = series.chart.renderer.path(areaPath)
+ .attr({
+ fill: pick(
+ prop[2],
+ Color(prop[1]).setOpacity(pick(options.fillOpacity, 0.75)).get()
+ ),
+ zIndex: 0 // #1069
+ }).add(series.group);
+ }
+ });
+ },
+
+ drawLegendSymbol: LegendSymbolMixin.drawRectangle
+});
+
+seriesTypes.area = AreaSeries;
+/**
+ * Set the default options for spline
+ */
+defaultPlotOptions.spline = merge(defaultSeriesOptions);
+
+/**
+ * SplineSeries object
+ */
+var SplineSeries = extendClass(Series, {
+ type: 'spline',
+
+ /**
+ * Get the spline segment from a given point's previous neighbour to the given point
+ */
+ getPointSpline: function (segment, point, i) {
+ var smoothing = 1.5, // 1 means control points midway between points, 2 means 1/3 from the point, 3 is 1/4 etc
+ denom = smoothing + 1,
+ plotX = point.plotX,
+ plotY = point.plotY,
+ lastPoint = segment[i - 1],
+ nextPoint = segment[i + 1],
+ leftContX,
+ leftContY,
+ rightContX,
+ rightContY,
+ ret;
+
+ // find control points
+ if (lastPoint && nextPoint) {
+
+ var lastX = lastPoint.plotX,
+ lastY = lastPoint.plotY,
+ nextX = nextPoint.plotX,
+ nextY = nextPoint.plotY,
+ correction;
+
+ leftContX = (smoothing * plotX + lastX) / denom;
+ leftContY = (smoothing * plotY + lastY) / denom;
+ rightContX = (smoothing * plotX + nextX) / denom;
+ rightContY = (smoothing * plotY + nextY) / denom;
+
+ // have the two control points make a straight line through main point
+ correction = ((rightContY - leftContY) * (rightContX - plotX)) /
+ (rightContX - leftContX) + plotY - rightContY;
+
+ leftContY += correction;
+ rightContY += correction;
+
+ // to prevent false extremes, check that control points are between
+ // neighbouring points' y values
+ if (leftContY > lastY && leftContY > plotY) {
+ leftContY = mathMax(lastY, plotY);
+ rightContY = 2 * plotY - leftContY; // mirror of left control point
+ } else if (leftContY < lastY && leftContY < plotY) {
+ leftContY = mathMin(lastY, plotY);
+ rightContY = 2 * plotY - leftContY;
+ }
+ if (rightContY > nextY && rightContY > plotY) {
+ rightContY = mathMax(nextY, plotY);
+ leftContY = 2 * plotY - rightContY;
+ } else if (rightContY < nextY && rightContY < plotY) {
+ rightContY = mathMin(nextY, plotY);
+ leftContY = 2 * plotY - rightContY;
+ }
+
+ // record for drawing in next point
+ point.rightContX = rightContX;
+ point.rightContY = rightContY;
+
+ }
+
+ // Visualize control points for debugging
+ /*
+ if (leftContX) {
+ this.chart.renderer.circle(leftContX + this.chart.plotLeft, leftContY + this.chart.plotTop, 2)
+ .attr({
+ stroke: 'red',
+ 'stroke-width': 1,
+ fill: 'none'
+ })
+ .add();
+ this.chart.renderer.path(['M', leftContX + this.chart.plotLeft, leftContY + this.chart.plotTop,
+ 'L', plotX + this.chart.plotLeft, plotY + this.chart.plotTop])
+ .attr({
+ stroke: 'red',
+ 'stroke-width': 1
+ })
+ .add();
+ this.chart.renderer.circle(rightContX + this.chart.plotLeft, rightContY + this.chart.plotTop, 2)
+ .attr({
+ stroke: 'green',
+ 'stroke-width': 1,
+ fill: 'none'
+ })
+ .add();
+ this.chart.renderer.path(['M', rightContX + this.chart.plotLeft, rightContY + this.chart.plotTop,
+ 'L', plotX + this.chart.plotLeft, plotY + this.chart.plotTop])
+ .attr({
+ stroke: 'green',
+ 'stroke-width': 1
+ })
+ .add();
+ }
+ */
+
+ // moveTo or lineTo
+ if (!i) {
+ ret = [M, plotX, plotY];
+ } else { // curve from last point to this
+ ret = [
+ 'C',
+ lastPoint.rightContX || lastPoint.plotX,
+ lastPoint.rightContY || lastPoint.plotY,
+ leftContX || plotX,
+ leftContY || plotY,
+ plotX,
+ plotY
+ ];
+ lastPoint.rightContX = lastPoint.rightContY = null; // reset for updating series later
+ }
+ return ret;
+ }
+});
+seriesTypes.spline = SplineSeries;
+
+/**
+ * Set the default options for areaspline
+ */
+defaultPlotOptions.areaspline = merge(defaultPlotOptions.area);
+
+/**
+ * AreaSplineSeries object
+ */
+var areaProto = AreaSeries.prototype,
+ AreaSplineSeries = extendClass(SplineSeries, {
+ type: 'areaspline',
+ closedStacks: true, // instead of following the previous graph back, follow the threshold back
+
+ // Mix in methods from the area series
+ getSegmentPath: areaProto.getSegmentPath,
+ closeSegment: areaProto.closeSegment,
+ drawGraph: areaProto.drawGraph,
+ drawLegendSymbol: LegendSymbolMixin.drawRectangle
+ });
+
+seriesTypes.areaspline = AreaSplineSeries;
+
+/**
+ * Set the default options for column
+ */
+defaultPlotOptions.column = merge(defaultSeriesOptions, {
+ borderColor: '#FFFFFF',
+ //borderWidth: 1,
+ borderRadius: 0,
+ //colorByPoint: undefined,
+ groupPadding: 0.2,
+ //grouping: true,
+ marker: null, // point options are specified in the base options
+ pointPadding: 0.1,
+ //pointWidth: null,
+ minPointLength: 0,
+ cropThreshold: 50, // when there are more points, they will not animate out of the chart on xAxis.setExtremes
+ pointRange: null, // null means auto, meaning 1 in a categorized axis and least distance between points if not categories
+ states: {
+ hover: {
+ brightness: 0.1,
+ shadow: false,
+ halo: false
+ },
+ select: {
+ color: '#C0C0C0',
+ borderColor: '#000000',
+ shadow: false
+ }
+ },
+ dataLabels: {
+ align: null, // auto
+ verticalAlign: null, // auto
+ y: null
+ },
+ stickyTracking: false,
+ tooltip: {
+ distance: 6
+ },
+ threshold: 0
+});
+
+/**
+ * ColumnSeries object
+ */
+var ColumnSeries = extendClass(Series, {
+ type: 'column',
+ pointAttrToOptions: { // mapping between SVG attributes and the corresponding options
+ stroke: 'borderColor',
+ fill: 'color',
+ r: 'borderRadius'
+ },
+ cropShoulder: 0,
+ trackerGroups: ['group', 'dataLabelsGroup'],
+ negStacks: true, // use separate negative stacks, unlike area stacks where a negative
+ // point is substracted from previous (#1910)
+
+ /**
+ * Initialize the series
+ */
+ init: function () {
+ Series.prototype.init.apply(this, arguments);
+
+ var series = this,
+ chart = series.chart;
+
+ // if the series is added dynamically, force redraw of other
+ // series affected by a new column
+ if (chart.hasRendered) {
+ each(chart.series, function (otherSeries) {
+ if (otherSeries.type === series.type) {
+ otherSeries.isDirty = true;
+ }
+ });
+ }
+ },
+
+ /**
+ * Return the width and x offset of the columns adjusted for grouping, groupPadding, pointPadding,
+ * pointWidth etc.
+ */
+ getColumnMetrics: function () {
+
+ var series = this,
+ options = series.options,
+ xAxis = series.xAxis,
+ yAxis = series.yAxis,
+ reversedXAxis = xAxis.reversed,
+ stackKey,
+ stackGroups = {},
+ columnIndex,
+ columnCount = 0;
+
+ // Get the total number of column type series.
+ // This is called on every series. Consider moving this logic to a
+ // chart.orderStacks() function and call it on init, addSeries and removeSeries
+ if (options.grouping === false) {
+ columnCount = 1;
+ } else {
+ each(series.chart.series, function (otherSeries) {
+ var otherOptions = otherSeries.options,
+ otherYAxis = otherSeries.yAxis;
+ if (otherSeries.type === series.type && otherSeries.visible &&
+ yAxis.len === otherYAxis.len && yAxis.pos === otherYAxis.pos) { // #642, #2086
+ if (otherOptions.stacking) {
+ stackKey = otherSeries.stackKey;
+ if (stackGroups[stackKey] === UNDEFINED) {
+ stackGroups[stackKey] = columnCount++;
+ }
+ columnIndex = stackGroups[stackKey];
+ } else if (otherOptions.grouping !== false) { // #1162
+ columnIndex = columnCount++;
+ }
+ otherSeries.columnIndex = columnIndex;
+ }
+ });
+ }
+
+ var categoryWidth = mathMin(
+ mathAbs(xAxis.transA) * (xAxis.ordinalSlope || options.pointRange || xAxis.closestPointRange || xAxis.tickInterval || 1), // #2610
+ xAxis.len // #1535
+ ),
+ groupPadding = categoryWidth * options.groupPadding,
+ groupWidth = categoryWidth - 2 * groupPadding,
+ pointOffsetWidth = groupWidth / columnCount,
+ optionPointWidth = options.pointWidth,
+ pointPadding = defined(optionPointWidth) ? (pointOffsetWidth - optionPointWidth) / 2 :
+ pointOffsetWidth * options.pointPadding,
+ pointWidth = pick(optionPointWidth, pointOffsetWidth - 2 * pointPadding), // exact point width, used in polar charts
+ colIndex = (reversedXAxis ?
+ columnCount - (series.columnIndex || 0) : // #1251
+ series.columnIndex) || 0,
+ pointXOffset = pointPadding + (groupPadding + colIndex *
+ pointOffsetWidth - (categoryWidth / 2)) *
+ (reversedXAxis ? -1 : 1);
+
+ // Save it for reading in linked series (Error bars particularly)
+ return (series.columnMetrics = {
+ width: pointWidth,
+ offset: pointXOffset
+ });
+
+ },
+
+ /**
+ * Translate each point to the plot area coordinate system and find shape positions
+ */
+ translate: function () {
+ var series = this,
+ chart = series.chart,
+ options = series.options,
+ borderWidth = series.borderWidth = pick(
+ options.borderWidth,
+ series.activePointCount > 0.5 * series.xAxis.len ? 0 : 1
+ ),
+ yAxis = series.yAxis,
+ threshold = options.threshold,
+ translatedThreshold = series.translatedThreshold = yAxis.getThreshold(threshold),
+ minPointLength = pick(options.minPointLength, 5),
+ metrics = series.getColumnMetrics(),
+ pointWidth = metrics.width,
+ seriesBarW = series.barW = mathMax(pointWidth, 1 + 2 * borderWidth), // postprocessed for border width
+ pointXOffset = series.pointXOffset = metrics.offset,
+ xCrisp = -(borderWidth % 2 ? 0.5 : 0),
+ yCrisp = borderWidth % 2 ? 0.5 : 1;
+
+ if (chart.renderer.isVML && chart.inverted) {
+ yCrisp += 1;
+ }
+
+ // When the pointPadding is 0, we want the columns to be packed tightly, so we allow individual
+ // columns to have individual sizes. When pointPadding is greater, we strive for equal-width
+ // columns (#2694).
+ if (options.pointPadding) {
+ seriesBarW = mathCeil(seriesBarW);
+ }
+
+ Series.prototype.translate.apply(series);
+
+ // Record the new values
+ each(series.points, function (point) {
+ var yBottom = pick(point.yBottom, translatedThreshold),
+ plotY = mathMin(mathMax(-999 - yBottom, point.plotY), yAxis.len + 999 + yBottom), // Don't draw too far outside plot area (#1303, #2241)
+ barX = point.plotX + pointXOffset,
+ barW = seriesBarW,
+ barY = mathMin(plotY, yBottom),
+ right,
+ bottom,
+ fromTop,
+ barH = mathMax(plotY, yBottom) - barY;
+
+ // Handle options.minPointLength
+ if (mathAbs(barH) < minPointLength) {
+ if (minPointLength) {
+ barH = minPointLength;
+ barY =
+ mathRound(mathAbs(barY - translatedThreshold) > minPointLength ? // stacked
+ yBottom - minPointLength : // keep position
+ translatedThreshold - (yAxis.translate(point.y, 0, 1, 0, 1) <= translatedThreshold ? minPointLength : 0)); // use exact yAxis.translation (#1485)
+ }
+ }
+
+ // Cache for access in polar
+ point.barX = barX;
+ point.pointWidth = pointWidth;
+
+ // Fix the tooltip on center of grouped columns (#1216)
+ point.tooltipPos = chart.inverted ? [yAxis.len - plotY, series.xAxis.len - barX - barW / 2] : [barX + barW / 2, plotY];
+
+ // Round off to obtain crisp edges and avoid overlapping with neighbours (#2694)
+ right = mathRound(barX + barW) + xCrisp;
+ barX = mathRound(barX) + xCrisp;
+ barW = right - barX;
+
+ fromTop = mathAbs(barY) < 0.5;
+ bottom = mathRound(barY + barH) + yCrisp;
+ barY = mathRound(barY) + yCrisp;
+ barH = bottom - barY;
+
+ // Top edges are exceptions
+ if (fromTop) {
+ barY -= 1;
+ barH += 1;
+ }
+
+ // Register shape type and arguments to be used in drawPoints
+ point.shapeType = 'rect';
+ point.shapeArgs = {
+ x: barX,
+ y: barY,
+ width: barW,
+ height: barH
+ };
+
+ });
+
+ },
+
+ getSymbol: noop,
+
+ /**
+ * Use a solid rectangle like the area series types
+ */
+ drawLegendSymbol: LegendSymbolMixin.drawRectangle,
+
+
+ /**
+ * Columns have no graph
+ */
+ drawGraph: noop,
+
+ /**
+ * Draw the columns. For bars, the series.group is rotated, so the same coordinates
+ * apply for columns and bars. This method is inherited by scatter series.
+ *
+ */
+ drawPoints: function () {
+ var series = this,
+ chart = this.chart,
+ options = series.options,
+ renderer = chart.renderer,
+ animationLimit = options.animationLimit || 250,
+ shapeArgs,
+ pointAttr;
+
+ // draw the columns
+ each(series.points, function (point) {
+ var plotY = point.plotY,
+ graphic = point.graphic,
+ borderAttr;
+
+ if (plotY !== UNDEFINED && !isNaN(plotY) && point.y !== null) {
+ shapeArgs = point.shapeArgs;
+
+ borderAttr = defined(series.borderWidth) ? {
+ 'stroke-width': series.borderWidth
+ } : {};
+
+ pointAttr = point.pointAttr[point.selected ? SELECT_STATE : NORMAL_STATE] || series.pointAttr[NORMAL_STATE];
+
+ if (graphic) { // update
+ stop(graphic);
+ graphic.attr(borderAttr)[chart.pointCount < animationLimit ? 'animate' : 'attr'](merge(shapeArgs));
+
+ } else {
+ point.graphic = graphic = renderer[point.shapeType](shapeArgs)
+ .attr(pointAttr)
+ .attr(borderAttr)
+ .add(series.group)
+ .shadow(options.shadow, null, options.stacking && !options.borderRadius);
+ }
+
+ } else if (graphic) {
+ point.graphic = graphic.destroy(); // #1269
+ }
+ });
+ },
+
+ /**
+ * Animate the column heights one by one from zero
+ * @param {Boolean} init Whether to initialize the animation or run it
+ */
+ animate: function (init) {
+ var series = this,
+ yAxis = this.yAxis,
+ options = series.options,
+ inverted = this.chart.inverted,
+ attr = {},
+ translatedThreshold;
+
+ if (hasSVG) { // VML is too slow anyway
+ if (init) {
+ attr.scaleY = 0.001;
+ translatedThreshold = mathMin(yAxis.pos + yAxis.len, mathMax(yAxis.pos, yAxis.toPixels(options.threshold)));
+ if (inverted) {
+ attr.translateX = translatedThreshold - yAxis.len;
+ } else {
+ attr.translateY = translatedThreshold;
+ }
+ series.group.attr(attr);
+
+ } else { // run the animation
+
+ attr.scaleY = 1;
+ attr[inverted ? 'translateX' : 'translateY'] = yAxis.pos;
+ series.group.animate(attr, series.options.animation);
+
+ // delete this function to allow it only once
+ series.animate = null;
+ }
+ }
+ },
+
+ /**
+ * Remove this series from the chart
+ */
+ remove: function () {
+ var series = this,
+ chart = series.chart;
+
+ // column and bar series affects other series of the same type
+ // as they are either stacked or grouped
+ if (chart.hasRendered) {
+ each(chart.series, function (otherSeries) {
+ if (otherSeries.type === series.type) {
+ otherSeries.isDirty = true;
+ }
+ });
+ }
+
+ Series.prototype.remove.apply(series, arguments);
+ }
+});
+seriesTypes.column = ColumnSeries;
+/**
+ * Set the default options for bar
+ */
+defaultPlotOptions.bar = merge(defaultPlotOptions.column);
+/**
+ * The Bar series class
+ */
+var BarSeries = extendClass(ColumnSeries, {
+ type: 'bar',
+ inverted: true
+});
+seriesTypes.bar = BarSeries;
+
+/**
+ * Set the default options for scatter
+ */
+defaultPlotOptions.scatter = merge(defaultSeriesOptions, {
+ lineWidth: 0,
+ tooltip: {
+ headerFormat: '<span style="color:{series.color}">\u25CF</span> <span style="font-size: 10px;"> {series.name}</span><br/>',
+ pointFormat: 'x: <b>{point.x}</b><br/>y: <b>{point.y}</b><br/>'
+ },
+ stickyTracking: false
+});
+
+/**
+ * The scatter series class
+ */
+var ScatterSeries = extendClass(Series, {
+ type: 'scatter',
+ sorted: false,
+ requireSorting: false,
+ noSharedTooltip: true,
+ trackerGroups: ['markerGroup', 'dataLabelsGroup'],
+ takeOrdinalPosition: false, // #2342
+ singularTooltips: true,
+ drawGraph: function () {
+ if (this.options.lineWidth) {
+ Series.prototype.drawGraph.call(this);
+ }
+ }
+});
+
+seriesTypes.scatter = ScatterSeries;
+
+/**
+ * Set the default options for pie
+ */
+defaultPlotOptions.pie = merge(defaultSeriesOptions, {
+ borderColor: '#FFFFFF',
+ borderWidth: 1,
+ center: [null, null],
+ clip: false,
+ colorByPoint: true, // always true for pies
+ dataLabels: {
+ // align: null,
+ // connectorWidth: 1,
+ // connectorColor: point.color,
+ // connectorPadding: 5,
+ distance: 30,
+ enabled: true,
+ formatter: function () { // #2945
+ return this.point.name;
+ }
+ // softConnector: true,
+ //y: 0
+ },
+ ignoreHiddenPoint: true,
+ //innerSize: 0,
+ legendType: 'point',
+ marker: null, // point options are specified in the base options
+ size: null,
+ showInLegend: false,
+ slicedOffset: 10,
+ states: {
+ hover: {
+ brightness: 0.1,
+ shadow: false
+ }
+ },
+ stickyTracking: false,
+ tooltip: {
+ followPointer: true
+ }
+});
+
+/**
+ * Extended point object for pies
+ */
+var PiePoint = extendClass(Point, {
+ /**
+ * Initiate the pie slice
+ */
+ init: function () {
+
+ Point.prototype.init.apply(this, arguments);
+
+ var point = this,
+ toggleSlice;
+
+ // Disallow negative values (#1530)
+ if (point.y < 0) {
+ point.y = null;
+ }
+
+ //visible: options.visible !== false,
+ extend(point, {
+ visible: point.visible !== false,
+ name: pick(point.name, 'Slice')
+ });
+
+ // add event listener for select
+ toggleSlice = function (e) {
+ point.slice(e.type === 'select');
+ };
+ addEvent(point, 'select', toggleSlice);
+ addEvent(point, 'unselect', toggleSlice);
+
+ return point;
+ },
+
+ /**
+ * Toggle the visibility of the pie slice
+ * @param {Boolean} vis Whether to show the slice or not. If undefined, the
+ * visibility is toggled
+ */
+ setVisible: function (vis) {
+ var point = this,
+ series = point.series,
+ chart = series.chart;
+
+ // if called without an argument, toggle visibility
+ point.visible = point.options.visible = vis = vis === UNDEFINED ? !point.visible : vis;
+ series.options.data[inArray(point, series.data)] = point.options; // update userOptions.data
+
+ // Show and hide associated elements
+ each(['graphic', 'dataLabel', 'connector', 'shadowGroup'], function (key) {
+ if (point[key]) {
+ point[key][vis ? 'show' : 'hide'](true);
+ }
+ });
+
+ if (point.legendItem) {
+ chart.legend.colorizeItem(point, vis);
+ }
+
+ // Handle ignore hidden slices
+ if (!series.isDirty && series.options.ignoreHiddenPoint) {
+ series.isDirty = true;
+ chart.redraw();
+ }
+ },
+
+ /**
+ * Set or toggle whether the slice is cut out from the pie
+ * @param {Boolean} sliced When undefined, the slice state is toggled
+ * @param {Boolean} redraw Whether to redraw the chart. True by default.
+ */
+ slice: function (sliced, redraw, animation) {
+ var point = this,
+ series = point.series,
+ chart = series.chart,
+ translation;
+
+ setAnimation(animation, chart);
+
+ // redraw is true by default
+ redraw = pick(redraw, true);
+
+ // if called without an argument, toggle
+ point.sliced = point.options.sliced = sliced = defined(sliced) ? sliced : !point.sliced;
+ series.options.data[inArray(point, series.data)] = point.options; // update userOptions.data
+
+ translation = sliced ? point.slicedTranslation : {
+ translateX: 0,
+ translateY: 0
+ };
+
+ point.graphic.animate(translation);
+
+ if (point.shadowGroup) {
+ point.shadowGroup.animate(translation);
+ }
+
+ },
+
+ haloPath: function (size) {
+ var shapeArgs = this.shapeArgs,
+ chart = this.series.chart;
+
+ return this.sliced || !this.visible ? [] : this.series.chart.renderer.symbols.arc(chart.plotLeft + shapeArgs.x, chart.plotTop + shapeArgs.y, shapeArgs.r + size, shapeArgs.r + size, {
+ innerR: this.shapeArgs.r,
+ start: shapeArgs.start,
+ end: shapeArgs.end
+ });
+ }
+});
+
+/**
+ * The Pie series class
+ */
+var PieSeries = {
+ type: 'pie',
+ isCartesian: false,
+ pointClass: PiePoint,
+ requireSorting: false,
+ noSharedTooltip: true,
+ trackerGroups: ['group', 'dataLabelsGroup'],
+ axisTypes: [],
+ pointAttrToOptions: { // mapping between SVG attributes and the corresponding options
+ stroke: 'borderColor',
+ 'stroke-width': 'borderWidth',
+ fill: 'color'
+ },
+ singularTooltips: true,
+
+ /**
+ * Pies have one color each point
+ */
+ getColor: noop,
+
+ /**
+ * Animate the pies in
+ */
+ animate: function (init) {
+ var series = this,
+ points = series.points,
+ startAngleRad = series.startAngleRad;
+
+ if (!init) {
+ each(points, function (point) {
+ var graphic = point.graphic,
+ args = point.shapeArgs;
+
+ if (graphic) {
+ // start values
+ graphic.attr({
+ r: series.center[3] / 2, // animate from inner radius (#779)
+ start: startAngleRad,
+ end: startAngleRad
+ });
+
+ // animate
+ graphic.animate({
+ r: args.r,
+ start: args.start,
+ end: args.end
+ }, series.options.animation);
+ }
+ });
+
+ // delete this function to allow it only once
+ series.animate = null;
+ }
+ },
+
+ /**
+ * Extend the basic setData method by running processData and generatePoints immediately,
+ * in order to access the points from the legend.
+ */
+ setData: function (data, redraw, animation, updatePoints) {
+ Series.prototype.setData.call(this, data, false, animation, updatePoints);
+ this.processData();
+ this.generatePoints();
+ if (pick(redraw, true)) {
+ this.chart.redraw(animation);
+ }
+ },
+
+ /**
+ * Extend the generatePoints method by adding total and percentage properties to each point
+ */
+ generatePoints: function () {
+ var i,
+ total = 0,
+ points,
+ len,
+ point,
+ ignoreHiddenPoint = this.options.ignoreHiddenPoint;
+
+ Series.prototype.generatePoints.call(this);
+
+ // Populate local vars
+ points = this.points;
+ len = points.length;
+
+ // Get the total sum
+ for (i = 0; i < len; i++) {
+ point = points[i];
+ total += (ignoreHiddenPoint && !point.visible) ? 0 : point.y;
+ }
+ this.total = total;
+
+ // Set each point's properties
+ for (i = 0; i < len; i++) {
+ point = points[i];
+ point.percentage = total > 0 ? (point.y / total) * 100 : 0;
+ point.total = total;
+ }
+
+ },
+
+ /**
+ * Do translation for pie slices
+ */
+ translate: function (positions) {
+ this.generatePoints();
+
+ var series = this,
+ cumulative = 0,
+ precision = 1000, // issue #172
+ options = series.options,
+ slicedOffset = options.slicedOffset,
+ connectorOffset = slicedOffset + options.borderWidth,
+ start,
+ end,
+ angle,
+ startAngle = options.startAngle || 0,
+ startAngleRad = series.startAngleRad = mathPI / 180 * (startAngle - 90),
+ endAngleRad = series.endAngleRad = mathPI / 180 * ((pick(options.endAngle, startAngle + 360)) - 90),
+ circ = endAngleRad - startAngleRad, //2 * mathPI,
+ points = series.points,
+ radiusX, // the x component of the radius vector for a given point
+ radiusY,
+ labelDistance = options.dataLabels.distance,
+ ignoreHiddenPoint = options.ignoreHiddenPoint,
+ i,
+ len = points.length,
+ point;
+
+ // Get positions - either an integer or a percentage string must be given.
+ // If positions are passed as a parameter, we're in a recursive loop for adjusting
+ // space for data labels.
+ if (!positions) {
+ series.center = positions = series.getCenter();
+ }
+
+ // utility for getting the x value from a given y, used for anticollision logic in data labels
+ series.getX = function (y, left) {
+
+ angle = math.asin(mathMin((y - positions[1]) / (positions[2] / 2 + labelDistance), 1));
+
+ return positions[0] +
+ (left ? -1 : 1) *
+ (mathCos(angle) * (positions[2] / 2 + labelDistance));
+ };
+
+ // Calculate the geometry for each point
+ for (i = 0; i < len; i++) {
+
+ point = points[i];
+
+ // set start and end angle
+ start = startAngleRad + (cumulative * circ);
+ if (!ignoreHiddenPoint || point.visible) {
+ cumulative += point.percentage / 100;
+ }
+ end = startAngleRad + (cumulative * circ);
+
+ // set the shape
+ point.shapeType = 'arc';
+ point.shapeArgs = {
+ x: positions[0],
+ y: positions[1],
+ r: positions[2] / 2,
+ innerR: positions[3] / 2,
+ start: mathRound(start * precision) / precision,
+ end: mathRound(end * precision) / precision
+ };
+
+ // The angle must stay within -90 and 270 (#2645)
+ angle = (end + start) / 2;
+ if (angle > 1.5 * mathPI) {
+ angle -= 2 * mathPI;
+ } else if (angle < -mathPI / 2) {
+ angle += 2 * mathPI;
+ }
+
+ // Center for the sliced out slice
+ point.slicedTranslation = {
+ translateX: mathRound(mathCos(angle) * slicedOffset),
+ translateY: mathRound(mathSin(angle) * slicedOffset)
+ };
+
+ // set the anchor point for tooltips
+ radiusX = mathCos(angle) * positions[2] / 2;
+ radiusY = mathSin(angle) * positions[2] / 2;
+ point.tooltipPos = [
+ positions[0] + radiusX * 0.7,
+ positions[1] + radiusY * 0.7
+ ];
+
+ point.half = angle < -mathPI / 2 || angle > mathPI / 2 ? 1 : 0;
+ point.angle = angle;
+
+ // set the anchor point for data labels
+ connectorOffset = mathMin(connectorOffset, labelDistance / 2); // #1678
+ point.labelPos = [
+ positions[0] + radiusX + mathCos(angle) * labelDistance, // first break of connector
+ positions[1] + radiusY + mathSin(angle) * labelDistance, // a/a
+ positions[0] + radiusX + mathCos(angle) * connectorOffset, // second break, right outside pie
+ positions[1] + radiusY + mathSin(angle) * connectorOffset, // a/a
+ positions[0] + radiusX, // landing point for connector
+ positions[1] + radiusY, // a/a
+ labelDistance < 0 ? // alignment
+ 'center' :
+ point.half ? 'right' : 'left', // alignment
+ angle // center angle
+ ];
+
+ }
+ },
+
+ drawGraph: null,
+
+ /**
+ * Draw the data points
+ */
+ drawPoints: function () {
+ var series = this,
+ chart = series.chart,
+ renderer = chart.renderer,
+ groupTranslation,
+ //center,
+ graphic,
+ //group,
+ shadow = series.options.shadow,
+ shadowGroup,
+ shapeArgs;
+
+ if (shadow && !series.shadowGroup) {
+ series.shadowGroup = renderer.g('shadow')
+ .add(series.group);
+ }
+
+ // draw the slices
+ each(series.points, function (point) {
+ graphic = point.graphic;
+ shapeArgs = point.shapeArgs;
+ shadowGroup = point.shadowGroup;
+
+ // put the shadow behind all points
+ if (shadow && !shadowGroup) {
+ shadowGroup = point.shadowGroup = renderer.g('shadow')
+ .add(series.shadowGroup);
+ }
+
+ // if the point is sliced, use special translation, else use plot area traslation
+ groupTranslation = point.sliced ? point.slicedTranslation : {
+ translateX: 0,
+ translateY: 0
+ };
+
+ //group.translate(groupTranslation[0], groupTranslation[1]);
+ if (shadowGroup) {
+ shadowGroup.attr(groupTranslation);
+ }
+
+ // draw the slice
+ if (graphic) {
+ graphic.animate(extend(shapeArgs, groupTranslation));
+ } else {
+ point.graphic = graphic = renderer[point.shapeType](shapeArgs)
+ .setRadialReference(series.center)
+ .attr(
+ point.pointAttr[point.selected ? SELECT_STATE : NORMAL_STATE]
+ )
+ .attr({
+ 'stroke-linejoin': 'round'
+ //zIndex: 1 // #2722 (reversed)
+ })
+ .attr(groupTranslation)
+ .add(series.group)
+ .shadow(shadow, shadowGroup);
+ }
+
+ // detect point specific visibility (#2430)
+ if (point.visible !== undefined) {
+ point.setVisible(point.visible);
+ }
+
+ });
+
+ },
+
+ /**
+ * Utility for sorting data labels
+ */
+ sortByAngle: function (points, sign) {
+ points.sort(function (a, b) {
+ return a.angle !== undefined && (b.angle - a.angle) * sign;
+ });
+ },
+
+ /**
+ * Use a simple symbol from LegendSymbolMixin
+ */
+ drawLegendSymbol: LegendSymbolMixin.drawRectangle,
+
+ /**
+ * Use the getCenter method from drawLegendSymbol
+ */
+ getCenter: CenteredSeriesMixin.getCenter,
+
+ /**
+ * Pies don't have point marker symbols
+ */
+ getSymbol: noop
+
+};
+PieSeries = extendClass(Series, PieSeries);
+seriesTypes.pie = PieSeries;
+
+/**
+ * Draw the data labels
+ */
+Series.prototype.drawDataLabels = function () {
+
+ var series = this,
+ seriesOptions = series.options,
+ cursor = seriesOptions.cursor,
+ options = seriesOptions.dataLabels,
+ points = series.points,
+ pointOptions,
+ generalOptions,
+ str,
+ dataLabelsGroup;
+
+ if (options.enabled || series._hasPointLabels) {
+
+ // Process default alignment of data labels for columns
+ if (series.dlProcessOptions) {
+ series.dlProcessOptions(options);
+ }
+
+ // Create a separate group for the data labels to avoid rotation
+ dataLabelsGroup = series.plotGroup(
+ 'dataLabelsGroup',
+ 'data-labels',
+ options.defer ? HIDDEN : VISIBLE,
+ options.zIndex || 6
+ );
+
+ if (!series.hasRendered && pick(options.defer, true)) {
+ dataLabelsGroup.attr({ opacity: 0 });
+ addEvent(series, 'afterAnimate', function () {
+ if (series.visible) { // #3023, #3024
+ dataLabelsGroup.show();
+ }
+ dataLabelsGroup[seriesOptions.animation ? 'animate' : 'attr']({ opacity: 1 }, { duration: 200 });
+ });
+ }
+
+ // Make the labels for each point
+ generalOptions = options;
+ each(points, function (point) {
+
+ var enabled,
+ dataLabel = point.dataLabel,
+ labelConfig,
+ attr,
+ name,
+ rotation,
+ connector = point.connector,
+ isNew = true;
+
+ // Determine if each data label is enabled
+ pointOptions = point.options && point.options.dataLabels;
+ enabled = pick(pointOptions && pointOptions.enabled, generalOptions.enabled); // #2282
+
+
+ // If the point is outside the plot area, destroy it. #678, #820
+ if (dataLabel && !enabled) {
+ point.dataLabel = dataLabel.destroy();
+
+ // Individual labels are disabled if the are explicitly disabled
+ // in the point options, or if they fall outside the plot area.
+ } else if (enabled) {
+
+ // Create individual options structure that can be extended without
+ // affecting others
+ options = merge(generalOptions, pointOptions);
+
+ rotation = options.rotation;
+
+ // Get the string
+ labelConfig = point.getLabelConfig();
+ str = options.format ?
+ format(options.format, labelConfig) :
+ options.formatter.call(labelConfig, options);
+
+ // Determine the color
+ options.style.color = pick(options.color, options.style.color, series.color, 'black');
+
+
+ // update existing label
+ if (dataLabel) {
+
+ if (defined(str)) {
+ dataLabel
+ .attr({
+ text: str
+ });
+ isNew = false;
+
+ } else { // #1437 - the label is shown conditionally
+ point.dataLabel = dataLabel = dataLabel.destroy();
+ if (connector) {
+ point.connector = connector.destroy();
+ }
+ }
+
+ // create new label
+ } else if (defined(str)) {
+ attr = {
+ //align: align,
+ fill: options.backgroundColor,
+ stroke: options.borderColor,
+ 'stroke-width': options.borderWidth,
+ r: options.borderRadius || 0,
+ rotation: rotation,
+ padding: options.padding,
+ zIndex: 1
+ };
+ // Remove unused attributes (#947)
+ for (name in attr) {
+ if (attr[name] === UNDEFINED) {
+ delete attr[name];
+ }
+ }
+
+ dataLabel = point.dataLabel = series.chart.renderer[rotation ? 'text' : 'label']( // labels don't support rotation
+ str,
+ 0,
+ -999,
+ null,
+ null,
+ null,
+ options.useHTML
+ )
+ .attr(attr)
+ .css(extend(options.style, cursor && { cursor: cursor }))
+ .add(dataLabelsGroup)
+ .shadow(options.shadow);
+
+ }
+
+ if (dataLabel) {
+ // Now the data label is created and placed at 0,0, so we need to align it
+ series.alignDataLabel(point, dataLabel, options, null, isNew);
+ }
+ }
+ });
+ }
+};
+
+/**
+ * Align each individual data label
+ */
+Series.prototype.alignDataLabel = function (point, dataLabel, options, alignTo, isNew) {
+ var chart = this.chart,
+ inverted = chart.inverted,
+ plotX = pick(point.plotX, -999),
+ plotY = pick(point.plotY, -999),
+ bBox = dataLabel.getBBox(),
+ // Math.round for rounding errors (#2683), alignTo to allow column labels (#2700)
+ visible = this.visible && (point.series.forceDL || chart.isInsidePlot(plotX, mathRound(plotY), inverted) ||
+ (alignTo && chart.isInsidePlot(plotX, inverted ? alignTo.x + 1 : alignTo.y + alignTo.height - 1, inverted))),
+ alignAttr; // the final position;
+
+ if (visible) {
+
+ // The alignment box is a singular point
+ alignTo = extend({
+ x: inverted ? chart.plotWidth - plotY : plotX,
+ y: mathRound(inverted ? chart.plotHeight - plotX : plotY),
+ width: 0,
+ height: 0
+ }, alignTo);
+
+ // Add the text size for alignment calculation
+ extend(options, {
+ width: bBox.width,
+ height: bBox.height
+ });
+
+ // Allow a hook for changing alignment in the last moment, then do the alignment
+ if (options.rotation) { // Fancy box alignment isn't supported for rotated text
+ dataLabel[isNew ? 'attr' : 'animate']({
+ x: alignTo.x + options.x + alignTo.width / 2,
+ y: alignTo.y + options.y + alignTo.height / 2
+ })
+ .attr({ // #3003
+ align: options.align
+ });
+ } else {
+ dataLabel.align(options, null, alignTo);
+ alignAttr = dataLabel.alignAttr;
+
+ // Handle justify or crop
+ if (pick(options.overflow, 'justify') === 'justify') {
+ this.justifyDataLabel(dataLabel, options, alignAttr, bBox, alignTo, isNew);
+
+ } else if (pick(options.crop, true)) {
+ // Now check that the data label is within the plot area
+ visible = chart.isInsidePlot(alignAttr.x, alignAttr.y) && chart.isInsidePlot(alignAttr.x + bBox.width, alignAttr.y + bBox.height);
+
+ }
+ }
+ }
+
+ // Show or hide based on the final aligned position
+ if (!visible) {
+ dataLabel.attr({ y: -999 });
+ dataLabel.placed = false; // don't animate back in
+ }
+
+};
+
+/**
+ * If data labels fall partly outside the plot area, align them back in, in a way that
+ * doesn't hide the point.
+ */
+Series.prototype.justifyDataLabel = function (dataLabel, options, alignAttr, bBox, alignTo, isNew) {
+ var chart = this.chart,
+ align = options.align,
+ verticalAlign = options.verticalAlign,
+ off,
+ justified;
+
+ // Off left
+ off = alignAttr.x;
+ if (off < 0) {
+ if (align === 'right') {
+ options.align = 'left';
+ } else {
+ options.x = -off;
+ }
+ justified = true;
+ }
+
+ // Off right
+ off = alignAttr.x + bBox.width;
+ if (off > chart.plotWidth) {
+ if (align === 'left') {
+ options.align = 'right';
+ } else {
+ options.x = chart.plotWidth - off;
+ }
+ justified = true;
+ }
+
+ // Off top
+ off = alignAttr.y;
+ if (off < 0) {
+ if (verticalAlign === 'bottom') {
+ options.verticalAlign = 'top';
+ } else {
+ options.y = -off;
+ }
+ justified = true;
+ }
+
+ // Off bottom
+ off = alignAttr.y + bBox.height;
+ if (off > chart.plotHeight) {
+ if (verticalAlign === 'top') {
+ options.verticalAlign = 'bottom';
+ } else {
+ options.y = chart.plotHeight - off;
+ }
+ justified = true;
+ }
+
+ if (justified) {
+ dataLabel.placed = !isNew;
+ dataLabel.align(options, null, alignTo);
+ }
+};
+
+/**
+ * Override the base drawDataLabels method by pie specific functionality
+ */
+if (seriesTypes.pie) {
+ seriesTypes.pie.prototype.drawDataLabels = function () {
+ var series = this,
+ data = series.data,
+ point,
+ chart = series.chart,
+ options = series.options.dataLabels,
+ connectorPadding = pick(options.connectorPadding, 10),
+ connectorWidth = pick(options.connectorWidth, 1),
+ plotWidth = chart.plotWidth,
+ plotHeight = chart.plotHeight,
+ connector,
+ connectorPath,
+ softConnector = pick(options.softConnector, true),
+ distanceOption = options.distance,
+ seriesCenter = series.center,
+ radius = seriesCenter[2] / 2,
+ centerY = seriesCenter[1],
+ outside = distanceOption > 0,
+ dataLabel,
+ dataLabelWidth,
+ labelPos,
+ labelHeight,
+ halves = [// divide the points into right and left halves for anti collision
+ [], // right
+ [] // left
+ ],
+ x,
+ y,
+ visibility,
+ rankArr,
+ i,
+ j,
+ overflow = [0, 0, 0, 0], // top, right, bottom, left
+ sort = function (a, b) {
+ return b.y - a.y;
+ };
+
+ // get out if not enabled
+ if (!series.visible || (!options.enabled && !series._hasPointLabels)) {
+ return;
+ }
+
+ // run parent method
+ Series.prototype.drawDataLabels.apply(series);
+
+ // arrange points for detection collision
+ each(data, function (point) {
+ if (point.dataLabel && point.visible) { // #407, #2510
+ halves[point.half].push(point);
+ }
+ });
+
+ /* Loop over the points in each half, starting from the top and bottom
+ * of the pie to detect overlapping labels.
+ */
+ i = 2;
+ while (i--) {
+
+ var slots = [],
+ slotsLength,
+ usedSlots = [],
+ points = halves[i],
+ pos,
+ bottom,
+ length = points.length,
+ slotIndex;
+
+ if (!length) {
+ continue;
+ }
+
+ // Sort by angle
+ series.sortByAngle(points, i - 0.5);
+
+ // Assume equal label heights on either hemisphere (#2630)
+ j = labelHeight = 0;
+ while (!labelHeight && points[j]) { // #1569
+ labelHeight = points[j] && points[j].dataLabel && (points[j].dataLabel.getBBox().height || 21); // 21 is for #968
+ j++;
+ }
+
+ // Only do anti-collision when we are outside the pie and have connectors (#856)
+ if (distanceOption > 0) {
+
+ // Build the slots
+ bottom = mathMin(centerY + radius + distanceOption, chart.plotHeight);
+ for (pos = mathMax(0, centerY - radius - distanceOption); pos <= bottom; pos += labelHeight) {
+ slots.push(pos);
+ }
+ slotsLength = slots.length;
+
+
+ /* Visualize the slots
+ if (!series.slotElements) {
+ series.slotElements = [];
+ }
+ if (i === 1) {
+ series.slotElements.forEach(function (elem) {
+ elem.destroy();
+ });
+ series.slotElements.length = 0;
+ }
+
+ slots.forEach(function (pos, no) {
+ var slotX = series.getX(pos, i) + chart.plotLeft - (i ? 100 : 0),
+ slotY = pos + chart.plotTop;
+
+ if (!isNaN(slotX)) {
+ series.slotElements.push(chart.renderer.rect(slotX, slotY - 7, 100, labelHeight, 1)
+ .attr({
+ 'stroke-width': 1,
+ stroke: 'silver',
+ fill: 'rgba(0,0,255,0.1)'
+ })
+ .add());
+ series.slotElements.push(chart.renderer.text('Slot '+ no, slotX, slotY + 4)
+ .attr({
+ fill: 'silver'
+ }).add());
+ }
+ });
+ // */
+
+ // if there are more values than available slots, remove lowest values
+ if (length > slotsLength) {
+ // create an array for sorting and ranking the points within each quarter
+ rankArr = [].concat(points);
+ rankArr.sort(sort);
+ j = length;
+ while (j--) {
+ rankArr[j].rank = j;
+ }
+ j = length;
+ while (j--) {
+ if (points[j].rank >= slotsLength) {
+ points.splice(j, 1);
+ }
+ }
+ length = points.length;
+ }
+
+ // The label goes to the nearest open slot, but not closer to the edge than
+ // the label's index.
+ for (j = 0; j < length; j++) {
+
+ point = points[j];
+ labelPos = point.labelPos;
+
+ var closest = 9999,
+ distance,
+ slotI;
+
+ // find the closest slot index
+ for (slotI = 0; slotI < slotsLength; slotI++) {
+ distance = mathAbs(slots[slotI] - labelPos[1]);
+ if (distance < closest) {
+ closest = distance;
+ slotIndex = slotI;
+ }
+ }
+
+ // if that slot index is closer to the edges of the slots, move it
+ // to the closest appropriate slot
+ if (slotIndex < j && slots[j] !== null) { // cluster at the top
+ slotIndex = j;
+ } else if (slotsLength < length - j + slotIndex && slots[j] !== null) { // cluster at the bottom
+ slotIndex = slotsLength - length + j;
+ while (slots[slotIndex] === null) { // make sure it is not taken
+ slotIndex++;
+ }
+ } else {
+ // Slot is taken, find next free slot below. In the next run, the next slice will find the
+ // slot above these, because it is the closest one
+ while (slots[slotIndex] === null) { // make sure it is not taken
+ slotIndex++;
+ }
+ }
+
+ usedSlots.push({ i: slotIndex, y: slots[slotIndex] });
+ slots[slotIndex] = null; // mark as taken
+ }
+ // sort them in order to fill in from the top
+ usedSlots.sort(sort);
+ }
+
+ // now the used slots are sorted, fill them up sequentially
+ for (j = 0; j < length; j++) {
+
+ var slot, naturalY;
+
+ point = points[j];
+ labelPos = point.labelPos;
+ dataLabel = point.dataLabel;
+ visibility = point.visible === false ? HIDDEN : VISIBLE;
+ naturalY = labelPos[1];
+
+ if (distanceOption > 0) {
+ slot = usedSlots.pop();
+ slotIndex = slot.i;
+
+ // if the slot next to currrent slot is free, the y value is allowed
+ // to fall back to the natural position
+ y = slot.y;
+ if ((naturalY > y && slots[slotIndex + 1] !== null) ||
+ (naturalY < y && slots[slotIndex - 1] !== null)) {
+ y = mathMin(mathMax(0, naturalY), chart.plotHeight);
+ }
+
+ } else {
+ y = naturalY;
+ }
+
+ // get the x - use the natural x position for first and last slot, to prevent the top
+ // and botton slice connectors from touching each other on either side
+ x = options.justify ?
+ seriesCenter[0] + (i ? -1 : 1) * (radius + distanceOption) :
+ series.getX(y === centerY - radius - distanceOption || y === centerY + radius + distanceOption ? naturalY : y, i);
+
+
+ // Record the placement and visibility
+ dataLabel._attr = {
+ visibility: visibility,
+ align: labelPos[6]
+ };
+ dataLabel._pos = {
+ x: x + options.x +
+ ({ left: connectorPadding, right: -connectorPadding }[labelPos[6]] || 0),
+ y: y + options.y - 10 // 10 is for the baseline (label vs text)
+ };
+ dataLabel.connX = x;
+ dataLabel.connY = y;
+
+
+ // Detect overflowing data labels
+ if (this.options.size === null) {
+ dataLabelWidth = dataLabel.width;
+ // Overflow left
+ if (x - dataLabelWidth < connectorPadding) {
+ overflow[3] = mathMax(mathRound(dataLabelWidth - x + connectorPadding), overflow[3]);
+
+ // Overflow right
+ } else if (x + dataLabelWidth > plotWidth - connectorPadding) {
+ overflow[1] = mathMax(mathRound(x + dataLabelWidth - plotWidth + connectorPadding), overflow[1]);
+ }
+
+ // Overflow top
+ if (y - labelHeight / 2 < 0) {
+ overflow[0] = mathMax(mathRound(-y + labelHeight / 2), overflow[0]);
+
+ // Overflow left
+ } else if (y + labelHeight / 2 > plotHeight) {
+ overflow[2] = mathMax(mathRound(y + labelHeight / 2 - plotHeight), overflow[2]);
+ }
+ }
+ } // for each point
+ } // for each half
+
+ // Do not apply the final placement and draw the connectors until we have verified
+ // that labels are not spilling over.
+ if (arrayMax(overflow) === 0 || this.verifyDataLabelOverflow(overflow)) {
+
+ // Place the labels in the final position
+ this.placeDataLabels();
+
+ // Draw the connectors
+ if (outside && connectorWidth) {
+ each(this.points, function (point) {
+ connector = point.connector;
+ labelPos = point.labelPos;
+ dataLabel = point.dataLabel;
+
+ if (dataLabel && dataLabel._pos) {
+ visibility = dataLabel._attr.visibility;
+ x = dataLabel.connX;
+ y = dataLabel.connY;
+ connectorPath = softConnector ? [
+ M,
+ x + (labelPos[6] === 'left' ? 5 : -5), y, // end of the string at the label
+ 'C',
+ x, y, // first break, next to the label
+ 2 * labelPos[2] - labelPos[4], 2 * labelPos[3] - labelPos[5],
+ labelPos[2], labelPos[3], // second break
+ L,
+ labelPos[4], labelPos[5] // base
+ ] : [
+ M,
+ x + (labelPos[6] === 'left' ? 5 : -5), y, // end of the string at the label
+ L,
+ labelPos[2], labelPos[3], // second break
+ L,
+ labelPos[4], labelPos[5] // base
+ ];
+
+ if (connector) {
+ connector.animate({ d: connectorPath });
+ connector.attr('visibility', visibility);
+
+ } else {
+ point.connector = connector = series.chart.renderer.path(connectorPath).attr({
+ 'stroke-width': connectorWidth,
+ stroke: options.connectorColor || point.color || '#606060',
+ visibility: visibility
+ //zIndex: 0 // #2722 (reversed)
+ })
+ .add(series.dataLabelsGroup);
+ }
+ } else if (connector) {
+ point.connector = connector.destroy();
+ }
+ });
+ }
+ }
+ };
+ /**
+ * Perform the final placement of the data labels after we have verified that they
+ * fall within the plot area.
+ */
+ seriesTypes.pie.prototype.placeDataLabels = function () {
+ each(this.points, function (point) {
+ var dataLabel = point.dataLabel,
+ _pos;
+
+ if (dataLabel) {
+ _pos = dataLabel._pos;
+ if (_pos) {
+ dataLabel.attr(dataLabel._attr);
+ dataLabel[dataLabel.moved ? 'animate' : 'attr'](_pos);
+ dataLabel.moved = true;
+ } else if (dataLabel) {
+ dataLabel.attr({ y: -999 });
+ }
+ }
+ });
+ };
+
+ seriesTypes.pie.prototype.alignDataLabel = noop;
+
+ /**
+ * Verify whether the data labels are allowed to draw, or we should run more translation and data
+ * label positioning to keep them inside the plot area. Returns true when data labels are ready
+ * to draw.
+ */
+ seriesTypes.pie.prototype.verifyDataLabelOverflow = function (overflow) {
+
+ var center = this.center,
+ options = this.options,
+ centerOption = options.center,
+ minSize = options.minSize || 80,
+ newSize = minSize,
+ ret;
+
+ // Handle horizontal size and center
+ if (centerOption[0] !== null) { // Fixed center
+ newSize = mathMax(center[2] - mathMax(overflow[1], overflow[3]), minSize);
+
+ } else { // Auto center
+ newSize = mathMax(
+ center[2] - overflow[1] - overflow[3], // horizontal overflow
+ minSize
+ );
+ center[0] += (overflow[3] - overflow[1]) / 2; // horizontal center
+ }
+
+ // Handle vertical size and center
+ if (centerOption[1] !== null) { // Fixed center
+ newSize = mathMax(mathMin(newSize, center[2] - mathMax(overflow[0], overflow[2])), minSize);
+
+ } else { // Auto center
+ newSize = mathMax(
+ mathMin(
+ newSize,
+ center[2] - overflow[0] - overflow[2] // vertical overflow
+ ),
+ minSize
+ );
+ center[1] += (overflow[0] - overflow[2]) / 2; // vertical center
+ }
+
+ // If the size must be decreased, we need to run translate and drawDataLabels again
+ if (newSize < center[2]) {
+ center[2] = newSize;
+ this.translate(center);
+ each(this.points, function (point) {
+ if (point.dataLabel) {
+ point.dataLabel._pos = null; // reset
+ }
+ });
+
+ if (this.drawDataLabels) {
+ this.drawDataLabels();
+ }
+ // Else, return true to indicate that the pie and its labels is within the plot area
+ } else {
+ ret = true;
+ }
+ return ret;
+ };
+}
+
+if (seriesTypes.column) {
+
+ /**
+ * Override the basic data label alignment by adjusting for the position of the column
+ */
+ seriesTypes.column.prototype.alignDataLabel = function (point, dataLabel, options, alignTo, isNew) {
+ var chart = this.chart,
+ inverted = chart.inverted,
+ dlBox = point.dlBox || point.shapeArgs, // data label box for alignment
+ below = point.below || (point.plotY > pick(this.translatedThreshold, chart.plotSizeY)),
+ inside = pick(options.inside, !!this.options.stacking); // draw it inside the box?
+
+ // Align to the column itself, or the top of it
+ if (dlBox) { // Area range uses this method but not alignTo
+ alignTo = merge(dlBox);
+
+ if (inverted) {
+ alignTo = {
+ x: chart.plotWidth - alignTo.y - alignTo.height,
+ y: chart.plotHeight - alignTo.x - alignTo.width,
+ width: alignTo.height,
+ height: alignTo.width
+ };
+ }
+
+ // Compute the alignment box
+ if (!inside) {
+ if (inverted) {
+ alignTo.x += below ? 0 : alignTo.width;
+ alignTo.width = 0;
+ } else {
+ alignTo.y += below ? alignTo.height : 0;
+ alignTo.height = 0;
+ }
+ }
+ }
+
+
+ // When alignment is undefined (typically columns and bars), display the individual
+ // point below or above the point depending on the threshold
+ options.align = pick(
+ options.align,
+ !inverted || inside ? 'center' : below ? 'right' : 'left'
+ );
+ options.verticalAlign = pick(
+ options.verticalAlign,
+ inverted || inside ? 'middle' : below ? 'top' : 'bottom'
+ );
+
+ // Call the parent method
+ Series.prototype.alignDataLabel.call(this, point, dataLabel, options, alignTo, isNew);
+ };
+}
+
+
+
+/**
+ * TrackerMixin for points and graphs
+ */
+
+var TrackerMixin = Highcharts.TrackerMixin = {
+
+ drawTrackerPoint: function () {
+ var series = this,
+ chart = series.chart,
+ pointer = chart.pointer,
+ cursor = series.options.cursor,
+ css = cursor && { cursor: cursor },
+ onMouseOver = function (e) {
+ var target = e.target,
+ point;
+
+ if (chart.hoverSeries !== series) {
+ series.onMouseOver();
+ }
+
+ while (target && !point) {
+ point = target.point;
+ target = target.parentNode;
+ }
+
+ if (point !== UNDEFINED && point !== chart.hoverPoint) { // undefined on graph in scatterchart
+ point.onMouseOver(e);
+ }
+ };
+
+ // Add reference to the point
+ each(series.points, function (point) {
+ if (point.graphic) {
+ point.graphic.element.point = point;
+ }
+ if (point.dataLabel) {
+ point.dataLabel.element.point = point;
+ }
+ });
+
+ // Add the event listeners, we need to do this only once
+ if (!series._hasTracking) {
+ each(series.trackerGroups, function (key) {
+ if (series[key]) { // we don't always have dataLabelsGroup
+ series[key]
+ .addClass(PREFIX + 'tracker')
+ .on('mouseover', onMouseOver)
+ .on('mouseout', function (e) { pointer.onTrackerMouseOut(e); })
+ .css(css);
+ if (hasTouch) {
+ series[key].on('touchstart', onMouseOver);
+ }
+ }
+ });
+ series._hasTracking = true;
+ }
+ },
+
+ /**
+ * Draw the tracker object that sits above all data labels and markers to
+ * track mouse events on the graph or points. For the line type charts
+ * the tracker uses the same graphPath, but with a greater stroke width
+ * for better control.
+ */
+ drawTrackerGraph: function () {
+ var series = this,
+ options = series.options,
+ trackByArea = options.trackByArea,
+ trackerPath = [].concat(trackByArea ? series.areaPath : series.graphPath),
+ trackerPathLength = trackerPath.length,
+ chart = series.chart,
+ pointer = chart.pointer,
+ renderer = chart.renderer,
+ snap = chart.options.tooltip.snap,
+ tracker = series.tracker,
+ cursor = options.cursor,
+ css = cursor && { cursor: cursor },
+ singlePoints = series.singlePoints,
+ singlePoint,
+ i,
+ onMouseOver = function () {
+ if (chart.hoverSeries !== series) {
+ series.onMouseOver();
+ }
+ },
+ /*
+ * Empirical lowest possible opacities for TRACKER_FILL for an element to stay invisible but clickable
+ * IE6: 0.002
+ * IE7: 0.002
+ * IE8: 0.002
+ * IE9: 0.00000000001 (unlimited)
+ * IE10: 0.0001 (exporting only)
+ * FF: 0.00000000001 (unlimited)
+ * Chrome: 0.000001
+ * Safari: 0.000001
+ * Opera: 0.00000000001 (unlimited)
+ */
+ TRACKER_FILL = 'rgba(192,192,192,' + (hasSVG ? 0.0001 : 0.002) + ')';
+
+ // Extend end points. A better way would be to use round linecaps,
+ // but those are not clickable in VML.
+ if (trackerPathLength && !trackByArea) {
+ i = trackerPathLength + 1;
+ while (i--) {
+ if (trackerPath[i] === M) { // extend left side
+ trackerPath.splice(i + 1, 0, trackerPath[i + 1] - snap, trackerPath[i + 2], L);
+ }
+ if ((i && trackerPath[i] === M) || i === trackerPathLength) { // extend right side
+ trackerPath.splice(i, 0, L, trackerPath[i - 2] + snap, trackerPath[i - 1]);
+ }
+ }
+ }
+
+ // handle single points
+ for (i = 0; i < singlePoints.length; i++) {
+ singlePoint = singlePoints[i];
+ trackerPath.push(M, singlePoint.plotX - snap, singlePoint.plotY,
+ L, singlePoint.plotX + snap, singlePoint.plotY);
+ }
+
+ // draw the tracker
+ if (tracker) {
+ tracker.attr({ d: trackerPath });
+ } else { // create
+
+ series.tracker = renderer.path(trackerPath)
+ .attr({
+ 'stroke-linejoin': 'round', // #1225
+ visibility: series.visible ? VISIBLE : HIDDEN,
+ stroke: TRACKER_FILL,
+ fill: trackByArea ? TRACKER_FILL : NONE,
+ 'stroke-width' : options.lineWidth + (trackByArea ? 0 : 2 * snap),
+ zIndex: 2
+ })
+ .add(series.group);
+
+ // The tracker is added to the series group, which is clipped, but is covered
+ // by the marker group. So the marker group also needs to capture events.
+ each([series.tracker, series.markerGroup], function (tracker) {
+ tracker.addClass(PREFIX + 'tracker')
+ .on('mouseover', onMouseOver)
+ .on('mouseout', function (e) { pointer.onTrackerMouseOut(e); })
+ .css(css);
+
+ if (hasTouch) {
+ tracker.on('touchstart', onMouseOver);
+ }
+ });
+ }
+ }
+};
+/* End TrackerMixin */
+
+
+/**
+ * Add tracking event listener to the series group, so the point graphics
+ * themselves act as trackers
+ */
+
+if (seriesTypes.column) {
+ ColumnSeries.prototype.drawTracker = TrackerMixin.drawTrackerPoint;
+}
+
+if (seriesTypes.pie) {
+ seriesTypes.pie.prototype.drawTracker = TrackerMixin.drawTrackerPoint;
+}
+
+if (seriesTypes.scatter) {
+ ScatterSeries.prototype.drawTracker = TrackerMixin.drawTrackerPoint;
+}
+
+/*
+ * Extend Legend for item events
+ */
+extend(Legend.prototype, {
+
+ setItemEvents: function (item, legendItem, useHTML, itemStyle, itemHiddenStyle) {
+ var legend = this;
+ // Set the events on the item group, or in case of useHTML, the item itself (#1249)
+ (useHTML ? legendItem : item.legendGroup).on('mouseover', function () {
+ item.setState(HOVER_STATE);
+ legendItem.css(legend.options.itemHoverStyle);
+ })
+ .on('mouseout', function () {
+ legendItem.css(item.visible ? itemStyle : itemHiddenStyle);
+ item.setState();
+ })
+ .on('click', function (event) {
+ var strLegendItemClick = 'legendItemClick',
+ fnLegendItemClick = function () {
+ item.setVisible();
+ };
+
+ // Pass over the click/touch event. #4.
+ event = {
+ browserEvent: event
+ };
+
+ // click the name or symbol
+ if (item.firePointEvent) { // point
+ item.firePointEvent(strLegendItemClick, event, fnLegendItemClick);
+ } else {
+ fireEvent(item, strLegendItemClick, event, fnLegendItemClick);
+ }
+ });
+ },
+
+ createCheckboxForItem: function (item) {
+ var legend = this;
+
+ item.checkbox = createElement('input', {
+ type: 'checkbox',
+ checked: item.selected,
+ defaultChecked: item.selected // required by IE7
+ }, legend.options.itemCheckboxStyle, legend.chart.container);
+
+ addEvent(item.checkbox, 'click', function (event) {
+ var target = event.target;
+ fireEvent(item, 'checkboxClick', {
+ checked: target.checked
+ },
+ function () {
+ item.select();
+ }
+ );
+ });
+ }
+});
+
+/*
+ * Add pointer cursor to legend itemstyle in defaultOptions
+ */
+defaultOptions.legend.itemStyle.cursor = 'pointer';
+
+
+/*
+ * Extend the Chart object with interaction
+ */
+
+extend(Chart.prototype, {
+ /**
+ * Display the zoom button
+ */
+ showResetZoom: function () {
+ var chart = this,
+ lang = defaultOptions.lang,
+ btnOptions = chart.options.chart.resetZoomButton,
+ theme = btnOptions.theme,
+ states = theme.states,
+ alignTo = btnOptions.relativeTo === 'chart' ? null : 'plotBox';
+
+ this.resetZoomButton = chart.renderer.button(lang.resetZoom, null, null, function () { chart.zoomOut(); }, theme, states && states.hover)
+ .attr({
+ align: btnOptions.position.align,
+ title: lang.resetZoomTitle
+ })
+ .add()
+ .align(btnOptions.position, false, alignTo);
+
+ },
+
+ /**
+ * Zoom out to 1:1
+ */
+ zoomOut: function () {
+ var chart = this;
+ fireEvent(chart, 'selection', { resetSelection: true }, function () {
+ chart.zoom();
+ });
+ },
+
+ /**
+ * Zoom into a given portion of the chart given by axis coordinates
+ * @param {Object} event
+ */
+ zoom: function (event) {
+ var chart = this,
+ hasZoomed,
+ pointer = chart.pointer,
+ displayButton = false,
+ resetZoomButton;
+
+ // If zoom is called with no arguments, reset the axes
+ if (!event || event.resetSelection) {
+ each(chart.axes, function (axis) {
+ hasZoomed = axis.zoom();
+ });
+ } else { // else, zoom in on all axes
+ each(event.xAxis.concat(event.yAxis), function (axisData) {
+ var axis = axisData.axis,
+ isXAxis = axis.isXAxis;
+
+ // don't zoom more than minRange
+ if (pointer[isXAxis ? 'zoomX' : 'zoomY'] || pointer[isXAxis ? 'pinchX' : 'pinchY']) {
+ hasZoomed = axis.zoom(axisData.min, axisData.max);
+ if (axis.displayBtn) {
+ displayButton = true;
+ }
+ }
+ });
+ }
+
+ // Show or hide the Reset zoom button
+ resetZoomButton = chart.resetZoomButton;
+ if (displayButton && !resetZoomButton) {
+ chart.showResetZoom();
+ } else if (!displayButton && isObject(resetZoomButton)) {
+ chart.resetZoomButton = resetZoomButton.destroy();
+ }
+
+
+ // Redraw
+ if (hasZoomed) {
+ chart.redraw(
+ pick(chart.options.chart.animation, event && event.animation, chart.pointCount < 100) // animation
+ );
+ }
+ },
+
+ /**
+ * Pan the chart by dragging the mouse across the pane. This function is called
+ * on mouse move, and the distance to pan is computed from chartX compared to
+ * the first chartX position in the dragging operation.
+ */
+ pan: function (e, panning) {
+
+ var chart = this,
+ hoverPoints = chart.hoverPoints,
+ doRedraw;
+
+ // remove active points for shared tooltip
+ if (hoverPoints) {
+ each(hoverPoints, function (point) {
+ point.setState();
+ });
+ }
+
+ each(panning === 'xy' ? [1, 0] : [1], function (isX) { // xy is used in maps
+ var mousePos = e[isX ? 'chartX' : 'chartY'],
+ axis = chart[isX ? 'xAxis' : 'yAxis'][0],
+ startPos = chart[isX ? 'mouseDownX' : 'mouseDownY'],
+ halfPointRange = (axis.pointRange || 0) / 2,
+ extremes = axis.getExtremes(),
+ newMin = axis.toValue(startPos - mousePos, true) + halfPointRange,
+ newMax = axis.toValue(startPos + chart[isX ? 'plotWidth' : 'plotHeight'] - mousePos, true) - halfPointRange;
+
+ if (axis.series.length && newMin > mathMin(extremes.dataMin, extremes.min) && newMax < mathMax(extremes.dataMax, extremes.max)) {
+ axis.setExtremes(newMin, newMax, false, false, { trigger: 'pan' });
+ doRedraw = true;
+ }
+
+ chart[isX ? 'mouseDownX' : 'mouseDownY'] = mousePos; // set new reference for next run
+ });
+
+ if (doRedraw) {
+ chart.redraw(false);
+ }
+ css(chart.container, { cursor: 'move' });
+ }
+});
+
+/*
+ * Extend the Point object with interaction
+ */
+extend(Point.prototype, {
+ /**
+ * Toggle the selection status of a point
+ * @param {Boolean} selected Whether to select or unselect the point.
+ * @param {Boolean} accumulate Whether to add to the previous selection. By default,
+ * this happens if the control key (Cmd on Mac) was pressed during clicking.
+ */
+ select: function (selected, accumulate) {
+ var point = this,
+ series = point.series,
+ chart = series.chart;
+
+ selected = pick(selected, !point.selected);
+
+ // fire the event with the defalut handler
+ point.firePointEvent(selected ? 'select' : 'unselect', { accumulate: accumulate }, function () {
+ point.selected = point.options.selected = selected;
+ series.options.data[inArray(point, series.data)] = point.options;
+
+ point.setState(selected && SELECT_STATE);
+
+ // unselect all other points unless Ctrl or Cmd + click
+ if (!accumulate) {
+ each(chart.getSelectedPoints(), function (loopPoint) {
+ if (loopPoint.selected && loopPoint !== point) {
+ loopPoint.selected = loopPoint.options.selected = false;
+ series.options.data[inArray(loopPoint, series.data)] = loopPoint.options;
+ loopPoint.setState(NORMAL_STATE);
+ loopPoint.firePointEvent('unselect');
+ }
+ });
+ }
+ });
+ },
+
+ /**
+ * Runs on mouse over the point
+ */
+ onMouseOver: function (e) {
+ var point = this,
+ series = point.series,
+ chart = series.chart,
+ tooltip = chart.tooltip,
+ hoverPoint = chart.hoverPoint;
+
+ // set normal state to previous series
+ if (hoverPoint && hoverPoint !== point) {
+ hoverPoint.onMouseOut();
+ }
+
+ // trigger the event
+ point.firePointEvent('mouseOver');
+
+ // update the tooltip
+ if (tooltip && (!tooltip.shared || series.noSharedTooltip)) {
+ tooltip.refresh(point, e);
+ }
+
+ // hover this
+ point.setState(HOVER_STATE);
+ chart.hoverPoint = point;
+ },
+
+ /**
+ * Runs on mouse out from the point
+ */
+ onMouseOut: function () {
+ var chart = this.series.chart,
+ hoverPoints = chart.hoverPoints;
+
+ this.firePointEvent('mouseOut');
+
+ if (!hoverPoints || inArray(this, hoverPoints) === -1) { // #887, #2240
+ this.setState();
+ chart.hoverPoint = null;
+ }
+ },
+
+ /**
+ * Import events from the series' and point's options. Only do it on
+ * demand, to save processing time on hovering.
+ */
+ importEvents: function () {
+ if (!this.hasImportedEvents) {
+ var point = this,
+ options = merge(point.series.options.point, point.options),
+ events = options.events,
+ eventType;
+
+ point.events = events;
+
+ for (eventType in events) {
+ addEvent(point, eventType, events[eventType]);
+ }
+ this.hasImportedEvents = true;
+
+ }
+ },
+
+ /**
+ * Set the point's state
+ * @param {String} state
+ */
+ setState: function (state, move) {
+ var point = this,
+ plotX = point.plotX,
+ plotY = point.plotY,
+ series = point.series,
+ stateOptions = series.options.states,
+ markerOptions = defaultPlotOptions[series.type].marker && series.options.marker,
+ normalDisabled = markerOptions && !markerOptions.enabled,
+ markerStateOptions = markerOptions && markerOptions.states[state],
+ stateDisabled = markerStateOptions && markerStateOptions.enabled === false,
+ stateMarkerGraphic = series.stateMarkerGraphic,
+ pointMarker = point.marker || {},
+ chart = series.chart,
+ radius,
+ halo = series.halo,
+ haloOptions,
+ newSymbol,
+ pointAttr;
+
+ state = state || NORMAL_STATE; // empty string
+ pointAttr = point.pointAttr[state] || series.pointAttr[state];
+
+ if (
+ // already has this state
+ (state === point.state && !move) ||
+ // selected points don't respond to hover
+ (point.selected && state !== SELECT_STATE) ||
+ // series' state options is disabled
+ (stateOptions[state] && stateOptions[state].enabled === false) ||
+ // general point marker's state options is disabled
+ (state && (stateDisabled || (normalDisabled && markerStateOptions.enabled === false))) ||
+ // individual point marker's state options is disabled
+ (state && pointMarker.states && pointMarker.states[state] && pointMarker.states[state].enabled === false) // #1610
+
+ ) {
+ return;
+ }
+
+ // apply hover styles to the existing point
+ if (point.graphic) {
+ radius = markerOptions && point.graphic.symbolName && pointAttr.r;
+ point.graphic.attr(merge(
+ pointAttr,
+ radius ? { // new symbol attributes (#507, #612)
+ x: plotX - radius,
+ y: plotY - radius,
+ width: 2 * radius,
+ height: 2 * radius
+ } : {}
+ ));
+
+ // Zooming in from a range with no markers to a range with markers
+ if (stateMarkerGraphic) {
+ stateMarkerGraphic.hide();
+ }
+ } else {
+ // if a graphic is not applied to each point in the normal state, create a shared
+ // graphic for the hover state
+ if (state && markerStateOptions) {
+ radius = markerStateOptions.radius;
+ newSymbol = pointMarker.symbol || series.symbol;
+
+ // If the point has another symbol than the previous one, throw away the
+ // state marker graphic and force a new one (#1459)
+ if (stateMarkerGraphic && stateMarkerGraphic.currentSymbol !== newSymbol) {
+ stateMarkerGraphic = stateMarkerGraphic.destroy();
+ }
+
+ // Add a new state marker graphic
+ if (!stateMarkerGraphic) {
+ if (newSymbol) {
+ series.stateMarkerGraphic = stateMarkerGraphic = chart.renderer.symbol(
+ newSymbol,
+ plotX - radius,
+ plotY - radius,
+ 2 * radius,
+ 2 * radius
+ )
+ .attr(pointAttr)
+ .add(series.markerGroup);
+ stateMarkerGraphic.currentSymbol = newSymbol;
+ }
+
+ // Move the existing graphic
+ } else {
+ stateMarkerGraphic[move ? 'animate' : 'attr']({ // #1054
+ x: plotX - radius,
+ y: plotY - radius
+ });
+ }
+ }
+
+ if (stateMarkerGraphic) {
+ stateMarkerGraphic[state && chart.isInsidePlot(plotX, plotY, chart.inverted) ? 'show' : 'hide'](); // #2450
+ }
+ }
+
+ // Show me your halo
+ haloOptions = stateOptions[state] && stateOptions[state].halo;
+ if (haloOptions && haloOptions.size) {
+ if (!halo) {
+ series.halo = halo = chart.renderer.path()
+ .add(series.seriesGroup);
+ }
+ halo.attr(extend({
+ fill: Color(point.color || series.color).setOpacity(haloOptions.opacity).get()
+ }, haloOptions.attributes))[move ? 'animate' : 'attr']({
+ d: point.haloPath(haloOptions.size)
+ });
+ } else if (halo) {
+ halo.attr({ d: [] });
+ }
+
+ point.state = state;
+ },
+
+ haloPath: function (size) {
+ var series = this.series,
+ chart = series.chart,
+ plotBox = series.getPlotBox(),
+ inverted = chart.inverted;
+
+ return chart.renderer.symbols.circle(
+ plotBox.translateX + (inverted ? series.yAxis.len - this.plotY : this.plotX) - size,
+ plotBox.translateY + (inverted ? series.xAxis.len - this.plotX : this.plotY) - size,
+ size * 2,
+ size * 2
+ );
+ }
+});
+
+/*
+ * Extend the Series object with interaction
+ */
+
+extend(Series.prototype, {
+ /**
+ * Series mouse over handler
+ */
+ onMouseOver: function () {
+ var series = this,
+ chart = series.chart,
+ hoverSeries = chart.hoverSeries;
+
+ // set normal state to previous series
+ if (hoverSeries && hoverSeries !== series) {
+ hoverSeries.onMouseOut();
+ }
+
+ // trigger the event, but to save processing time,
+ // only if defined
+ if (series.options.events.mouseOver) {
+ fireEvent(series, 'mouseOver');
+ }
+
+ // hover this
+ series.setState(HOVER_STATE);
+ chart.hoverSeries = series;
+ },
+
+ /**
+ * Series mouse out handler
+ */
+ onMouseOut: function () {
+ // trigger the event only if listeners exist
+ var series = this,
+ options = series.options,
+ chart = series.chart,
+ tooltip = chart.tooltip,
+ hoverPoint = chart.hoverPoint;
+
+ // trigger mouse out on the point, which must be in this series
+ if (hoverPoint) {
+ hoverPoint.onMouseOut();
+ }
+
+ // fire the mouse out event
+ if (series && options.events.mouseOut) {
+ fireEvent(series, 'mouseOut');
+ }
+
+
+ // hide the tooltip
+ if (tooltip && !options.stickyTracking && (!tooltip.shared || series.noSharedTooltip)) {
+ tooltip.hide();
+ }
+
+ // set normal state
+ series.setState();
+ chart.hoverSeries = null;
+ },
+
+ /**
+ * Set the state of the graph
+ */
+ setState: function (state) {
+ var series = this,
+ options = series.options,
+ graph = series.graph,
+ graphNeg = series.graphNeg,
+ stateOptions = options.states,
+ lineWidth = options.lineWidth,
+ attribs;
+
+ state = state || NORMAL_STATE;
+
+ if (series.state !== state) {
+ series.state = state;
+
+ if (stateOptions[state] && stateOptions[state].enabled === false) {
+ return;
+ }
+
+ if (state) {
+ lineWidth = stateOptions[state].lineWidth || lineWidth + (stateOptions[state].lineWidthPlus || 0);
+ }
+
+ if (graph && !graph.dashstyle) { // hover is turned off for dashed lines in VML
+ attribs = {
+ 'stroke-width': lineWidth
+ };
+ // use attr because animate will cause any other animation on the graph to stop
+ graph.attr(attribs);
+ if (graphNeg) {
+ graphNeg.attr(attribs);
+ }
+ }
+ }
+ },
+
+ /**
+ * Set the visibility of the graph
+ *
+ * @param vis {Boolean} True to show the series, false to hide. If UNDEFINED,
+ * the visibility is toggled.
+ */
+ setVisible: function (vis, redraw) {
+ var series = this,
+ chart = series.chart,
+ legendItem = series.legendItem,
+ showOrHide,
+ ignoreHiddenSeries = chart.options.chart.ignoreHiddenSeries,
+ oldVisibility = series.visible;
+
+ // if called without an argument, toggle visibility
+ series.visible = vis = series.userOptions.visible = vis === UNDEFINED ? !oldVisibility : vis;
+ showOrHide = vis ? 'show' : 'hide';
+
+ // show or hide elements
+ each(['group', 'dataLabelsGroup', 'markerGroup', 'tracker'], function (key) {
+ if (series[key]) {
+ series[key][showOrHide]();
+ }
+ });
+
+
+ // hide tooltip (#1361)
+ if (chart.hoverSeries === series) {
+ series.onMouseOut();
+ }
+
+
+ if (legendItem) {
+ chart.legend.colorizeItem(series, vis);
+ }
+
+
+ // rescale or adapt to resized chart
+ series.isDirty = true;
+ // in a stack, all other series are affected
+ if (series.options.stacking) {
+ each(chart.series, function (otherSeries) {
+ if (otherSeries.options.stacking && otherSeries.visible) {
+ otherSeries.isDirty = true;
+ }
+ });
+ }
+
+ // show or hide linked series
+ each(series.linkedSeries, function (otherSeries) {
+ otherSeries.setVisible(vis, false);
+ });
+
+ if (ignoreHiddenSeries) {
+ chart.isDirtyBox = true;
+ }
+ if (redraw !== false) {
+ chart.redraw();
+ }
+
+ fireEvent(series, showOrHide);
+ },
+
+ /**
+ * Memorize tooltip texts and positions
+ */
+ setTooltipPoints: function (renew) {
+ var series = this,
+ points = [],
+ pointsLength,
+ low,
+ high,
+ xAxis = series.xAxis,
+ xExtremes = xAxis && xAxis.getExtremes(),
+ axisLength = xAxis ? (xAxis.tooltipLen || xAxis.len) : series.chart.plotSizeX, // tooltipLen and tooltipPosName used in polar
+ point,
+ pointX,
+ nextPoint,
+ i,
+ tooltipPoints = []; // a lookup array for each pixel in the x dimension
+
+ // don't waste resources if tracker is disabled
+ if (series.options.enableMouseTracking === false || series.singularTooltips) {
+ return;
+ }
+
+ // renew
+ if (renew) {
+ series.tooltipPoints = null;
+ }
+
+ // concat segments to overcome null values
+ each(series.segments || series.points, function (segment) {
+ points = points.concat(segment);
+ });
+
+ // Reverse the points in case the X axis is reversed
+ if (xAxis && xAxis.reversed) {
+ points = points.reverse();
+ }
+
+ // Polar needs additional shaping
+ if (series.orderTooltipPoints) {
+ series.orderTooltipPoints(points);
+ }
+
+ // Assign each pixel position to the nearest point
+ pointsLength = points.length;
+ for (i = 0; i < pointsLength; i++) {
+ point = points[i];
+ pointX = point.x;
+ if (pointX >= xExtremes.min && pointX <= xExtremes.max) { // #1149
+ nextPoint = points[i + 1];
+
+ // Set this range's low to the last range's high plus one
+ low = high === UNDEFINED ? 0 : high + 1;
+ // Now find the new high
+ high = points[i + 1] ?
+ mathMin(mathMax(0, mathFloor( // #2070
+ (point.clientX + (nextPoint ? (nextPoint.wrappedClientX || nextPoint.clientX) : axisLength)) / 2
+ )), axisLength) :
+ axisLength;
+
+ while (low >= 0 && low <= high) {
+ tooltipPoints[low++] = point;
+ }
+ }
+ }
+ series.tooltipPoints = tooltipPoints;
+ },
+
+ /**
+ * Show the graph
+ */
+ show: function () {
+ this.setVisible(true);
+ },
+
+ /**
+ * Hide the graph
+ */
+ hide: function () {
+ this.setVisible(false);
+ },
+
+
+ /**
+ * Set the selected state of the graph
+ *
+ * @param selected {Boolean} True to select the series, false to unselect. If
+ * UNDEFINED, the selection state is toggled.
+ */
+ select: function (selected) {
+ var series = this;
+ // if called without an argument, toggle
+ series.selected = selected = (selected === UNDEFINED) ? !series.selected : selected;
+
+ if (series.checkbox) {
+ series.checkbox.checked = selected;
+ }
+
+ fireEvent(series, selected ? 'select' : 'unselect');
+ },
+
+ drawTracker: TrackerMixin.drawTrackerGraph
+});
+// global variables
+extend(Highcharts, {
+
+ // Constructors
+ Axis: Axis,
+ Chart: Chart,
+ Color: Color,
+ Point: Point,
+ Tick: Tick,
+ Renderer: Renderer,
+ Series: Series,
+ SVGElement: SVGElement,
+ SVGRenderer: SVGRenderer,
+
+ // Various
+ arrayMin: arrayMin,
+ arrayMax: arrayMax,
+ charts: charts,
+ dateFormat: dateFormat,
+ format: format,
+ pathAnim: pathAnim,
+ getOptions: getOptions,
+ hasBidiBug: hasBidiBug,
+ isTouchDevice: isTouchDevice,
+ numberFormat: numberFormat,
+ seriesTypes: seriesTypes,
+ setOptions: setOptions,
+ addEvent: addEvent,
+ removeEvent: removeEvent,
+ createElement: createElement,
+ discardElement: discardElement,
+ css: css,
+ each: each,
+ extend: extend,
+ map: map,
+ merge: merge,
+ pick: pick,
+ splat: splat,
+ extendClass: extendClass,
+ pInt: pInt,
+ wrap: wrap,
+ svg: hasSVG,
+ canvas: useCanVG,
+ vml: !hasSVG && !useCanVG,
+ product: PRODUCT,
+ version: VERSION
+});
+
+}());
diff --git a/management/guns-admin/src/main/webapp/static/js/plugins/highcharts/modules/canvas-tools.js b/management/guns-admin/src/main/webapp/static/js/plugins/highcharts/modules/canvas-tools.js
new file mode 100644
index 0000000..49e5188
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/static/js/plugins/highcharts/modules/canvas-tools.js
@@ -0,0 +1,133 @@
+/*
+ A class to parse color values
+ @author Stoyan Stefanov <sstoo@gmail.com>
+ @link http://www.phpied.com/rgb-color-parser-in-javascript/
+ Use it if you like it
+
+ canvg.js - Javascript SVG parser and renderer on Canvas
+ MIT Licensed
+ Gabe Lerner (gabelerner@gmail.com)
+ http://code.google.com/p/canvg/
+
+ Requires: rgbcolor.js - http://www.phpied.com/rgb-color-parser-in-javascript/
+
+ Highcharts JS v2.2.5 (2012-06-08)
+ CanVGRenderer Extension module
+
+ (c) 2011-2012 Torstein H?nsi, Erik Olsson
+
+ License: www.highcharts.com/license
+*/
+function RGBColor(m){this.ok=!1;m.charAt(0)=="#"&&(m=m.substr(1,6));var m=m.replace(/ /g,""),m=m.toLowerCase(),a={aliceblue:"f0f8ff",antiquewhite:"faebd7",aqua:"00ffff",aquamarine:"7fffd4",azure:"f0ffff",beige:"f5f5dc",bisque:"ffe4c4",black:"000000",blanchedalmond:"ffebcd",blue:"0000ff",blueviolet:"8a2be2",brown:"a52a2a",burlywood:"deb887",cadetblue:"5f9ea0",chartreuse:"7fff00",chocolate:"d2691e",coral:"ff7f50",cornflowerblue:"6495ed",cornsilk:"fff8dc",crimson:"dc143c",cyan:"00ffff",darkblue:"00008b",
+darkcyan:"008b8b",darkgoldenrod:"b8860b",darkgray:"a9a9a9",darkgreen:"006400",darkkhaki:"bdb76b",darkmagenta:"8b008b",darkolivegreen:"556b2f",darkorange:"ff8c00",darkorchid:"9932cc",darkred:"8b0000",darksalmon:"e9967a",darkseagreen:"8fbc8f",darkslateblue:"483d8b",darkslategray:"2f4f4f",darkturquoise:"00ced1",darkviolet:"9400d3",deeppink:"ff1493",deepskyblue:"00bfff",dimgray:"696969",dodgerblue:"1e90ff",feldspar:"d19275",firebrick:"b22222",floralwhite:"fffaf0",forestgreen:"228b22",fuchsia:"ff00ff",
+gainsboro:"dcdcdc",ghostwhite:"f8f8ff",gold:"ffd700",goldenrod:"daa520",gray:"808080",green:"008000",greenyellow:"adff2f",honeydew:"f0fff0",hotpink:"ff69b4",indianred:"cd5c5c",indigo:"4b0082",ivory:"fffff0",khaki:"f0e68c",lavender:"e6e6fa",lavenderblush:"fff0f5",lawngreen:"7cfc00",lemonchiffon:"fffacd",lightblue:"add8e6",lightcoral:"f08080",lightcyan:"e0ffff",lightgoldenrodyellow:"fafad2",lightgrey:"d3d3d3",lightgreen:"90ee90",lightpink:"ffb6c1",lightsalmon:"ffa07a",lightseagreen:"20b2aa",lightskyblue:"87cefa",
+lightslateblue:"8470ff",lightslategray:"778899",lightsteelblue:"b0c4de",lightyellow:"ffffe0",lime:"00ff00",limegreen:"32cd32",linen:"faf0e6",magenta:"ff00ff",maroon:"800000",mediumaquamarine:"66cdaa",mediumblue:"0000cd",mediumorchid:"ba55d3",mediumpurple:"9370d8",mediumseagreen:"3cb371",mediumslateblue:"7b68ee",mediumspringgreen:"00fa9a",mediumturquoise:"48d1cc",mediumvioletred:"c71585",midnightblue:"191970",mintcream:"f5fffa",mistyrose:"ffe4e1",moccasin:"ffe4b5",navajowhite:"ffdead",navy:"000080",
+oldlace:"fdf5e6",olive:"808000",olivedrab:"6b8e23",orange:"ffa500",orangered:"ff4500",orchid:"da70d6",palegoldenrod:"eee8aa",palegreen:"98fb98",paleturquoise:"afeeee",palevioletred:"d87093",papayawhip:"ffefd5",peachpuff:"ffdab9",peru:"cd853f",pink:"ffc0cb",plum:"dda0dd",powderblue:"b0e0e6",purple:"800080",red:"ff0000",rosybrown:"bc8f8f",royalblue:"4169e1",saddlebrown:"8b4513",salmon:"fa8072",sandybrown:"f4a460",seagreen:"2e8b57",seashell:"fff5ee",sienna:"a0522d",silver:"c0c0c0",skyblue:"87ceeb",slateblue:"6a5acd",
+slategray:"708090",snow:"fffafa",springgreen:"00ff7f",steelblue:"4682b4",tan:"d2b48c",teal:"008080",thistle:"d8bfd8",tomato:"ff6347",turquoise:"40e0d0",violet:"ee82ee",violetred:"d02090",wheat:"f5deb3",white:"ffffff",whitesmoke:"f5f5f5",yellow:"ffff00",yellowgreen:"9acd32"},c;for(c in a)m==c&&(m=a[c]);var d=[{re:/^rgb\((\d{1,3}),\s*(\d{1,3}),\s*(\d{1,3})\)$/,example:["rgb(123, 234, 45)","rgb(255,234,245)"],process:function(b){return[parseInt(b[1]),parseInt(b[2]),parseInt(b[3])]}},{re:/^(\w{2})(\w{2})(\w{2})$/,
+example:["#00ff00","336699"],process:function(b){return[parseInt(b[1],16),parseInt(b[2],16),parseInt(b[3],16)]}},{re:/^(\w{1})(\w{1})(\w{1})$/,example:["#fb0","f0f"],process:function(b){return[parseInt(b[1]+b[1],16),parseInt(b[2]+b[2],16),parseInt(b[3]+b[3],16)]}}];for(c=0;c<d.length;c++){var b=d[c].process,k=d[c].re.exec(m);if(k)channels=b(k),this.r=channels[0],this.g=channels[1],this.b=channels[2],this.ok=!0}this.r=this.r<0||isNaN(this.r)?0:this.r>255?255:this.r;this.g=this.g<0||isNaN(this.g)?0:
+this.g>255?255:this.g;this.b=this.b<0||isNaN(this.b)?0:this.b>255?255:this.b;this.toRGB=function(){return"rgb("+this.r+", "+this.g+", "+this.b+")"};this.toHex=function(){var b=this.r.toString(16),a=this.g.toString(16),d=this.b.toString(16);b.length==1&&(b="0"+b);a.length==1&&(a="0"+a);d.length==1&&(d="0"+d);return"#"+b+a+d};this.getHelpXML=function(){for(var b=[],k=0;k<d.length;k++)for(var c=d[k].example,j=0;j<c.length;j++)b[b.length]=c[j];for(var h in a)b[b.length]=h;c=document.createElement("ul");
+c.setAttribute("id","rgbcolor-examples");for(k=0;k<b.length;k++)try{var l=document.createElement("li"),o=new RGBColor(b[k]),n=document.createElement("div");n.style.cssText="margin: 3px; border: 1px solid black; background:"+o.toHex()+"; color:"+o.toHex();n.appendChild(document.createTextNode("test"));var q=document.createTextNode(" "+b[k]+" -> "+o.toRGB()+" -> "+o.toHex());l.appendChild(n);l.appendChild(q);c.appendChild(l)}catch(p){}return c}}
+if(!window.console)window.console={},window.console.log=function(){},window.console.dir=function(){};if(!Array.prototype.indexOf)Array.prototype.indexOf=function(m){for(var a=0;a<this.length;a++)if(this[a]==m)return a;return-1};
+(function(){function m(){var a={FRAMERATE:30,MAX_VIRTUAL_PIXELS:3E4};a.init=function(c){a.Definitions={};a.Styles={};a.Animations=[];a.Images=[];a.ctx=c;a.ViewPort=new function(){this.viewPorts=[];this.Clear=function(){this.viewPorts=[]};this.SetCurrent=function(a,b){this.viewPorts.push({width:a,height:b})};this.RemoveCurrent=function(){this.viewPorts.pop()};this.Current=function(){return this.viewPorts[this.viewPorts.length-1]};this.width=function(){return this.Current().width};this.height=function(){return this.Current().height};
+this.ComputeSize=function(a){return a!=null&&typeof a=="number"?a:a=="x"?this.width():a=="y"?this.height():Math.sqrt(Math.pow(this.width(),2)+Math.pow(this.height(),2))/Math.sqrt(2)}}};a.init();a.ImagesLoaded=function(){for(var c=0;c<a.Images.length;c++)if(!a.Images[c].loaded)return!1;return!0};a.trim=function(a){return a.replace(/^\s+|\s+$/g,"")};a.compressSpaces=function(a){return a.replace(/[\s\r\t\n]+/gm," ")};a.ajax=function(a){var d;return(d=window.XMLHttpRequest?new XMLHttpRequest:new ActiveXObject("Microsoft.XMLHTTP"))?
+(d.open("GET",a,!1),d.send(null),d.responseText):null};a.parseXml=function(a){if(window.DOMParser)return(new DOMParser).parseFromString(a,"text/xml");else{var a=a.replace(/<!DOCTYPE svg[^>]*>/,""),d=new ActiveXObject("Microsoft.XMLDOM");d.async="false";d.loadXML(a);return d}};a.Property=function(c,d){this.name=c;this.value=d;this.hasValue=function(){return this.value!=null&&this.value!==""};this.numValue=function(){if(!this.hasValue())return 0;var b=parseFloat(this.value);(this.value+"").match(/%$/)&&
+(b/=100);return b};this.valueOrDefault=function(b){return this.hasValue()?this.value:b};this.numValueOrDefault=function(b){return this.hasValue()?this.numValue():b};var b=this;this.Color={addOpacity:function(d){var c=b.value;if(d!=null&&d!=""){var f=new RGBColor(b.value);f.ok&&(c="rgba("+f.r+", "+f.g+", "+f.b+", "+d+")")}return new a.Property(b.name,c)}};this.Definition={getDefinition:function(){var d=b.value.replace(/^(url\()?#([^\)]+)\)?$/,"$2");return a.Definitions[d]},isUrl:function(){return b.value.indexOf("url(")==
+0},getFillStyle:function(b){var d=this.getDefinition();return d!=null&&d.createGradient?d.createGradient(a.ctx,b):d!=null&&d.createPattern?d.createPattern(a.ctx,b):null}};this.Length={DPI:function(){return 96},EM:function(b){var d=12,c=new a.Property("fontSize",a.Font.Parse(a.ctx.font).fontSize);c.hasValue()&&(d=c.Length.toPixels(b));return d},toPixels:function(d){if(!b.hasValue())return 0;var c=b.value+"";return c.match(/em$/)?b.numValue()*this.EM(d):c.match(/ex$/)?b.numValue()*this.EM(d)/2:c.match(/px$/)?
+b.numValue():c.match(/pt$/)?b.numValue()*1.25:c.match(/pc$/)?b.numValue()*15:c.match(/cm$/)?b.numValue()*this.DPI(d)/2.54:c.match(/mm$/)?b.numValue()*this.DPI(d)/25.4:c.match(/in$/)?b.numValue()*this.DPI(d):c.match(/%$/)?b.numValue()*a.ViewPort.ComputeSize(d):b.numValue()}};this.Time={toMilliseconds:function(){if(!b.hasValue())return 0;var a=b.value+"";if(a.match(/s$/))return b.numValue()*1E3;a.match(/ms$/);return b.numValue()}};this.Angle={toRadians:function(){if(!b.hasValue())return 0;var a=b.value+
+"";return a.match(/deg$/)?b.numValue()*(Math.PI/180):a.match(/grad$/)?b.numValue()*(Math.PI/200):a.match(/rad$/)?b.numValue():b.numValue()*(Math.PI/180)}}};a.Font=new function(){this.Styles=["normal","italic","oblique","inherit"];this.Variants=["normal","small-caps","inherit"];this.Weights="normal,bold,bolder,lighter,100,200,300,400,500,600,700,800,900,inherit".split(",");this.CreateFont=function(d,b,c,e,f,g){g=g!=null?this.Parse(g):this.CreateFont("","","","","",a.ctx.font);return{fontFamily:f||
+g.fontFamily,fontSize:e||g.fontSize,fontStyle:d||g.fontStyle,fontWeight:c||g.fontWeight,fontVariant:b||g.fontVariant,toString:function(){return[this.fontStyle,this.fontVariant,this.fontWeight,this.fontSize,this.fontFamily].join(" ")}}};var c=this;this.Parse=function(d){for(var b={},d=a.trim(a.compressSpaces(d||"")).split(" "),k=!1,e=!1,f=!1,g=!1,j="",h=0;h<d.length;h++)if(!e&&c.Styles.indexOf(d[h])!=-1){if(d[h]!="inherit")b.fontStyle=d[h];e=!0}else if(!g&&c.Variants.indexOf(d[h])!=-1){if(d[h]!="inherit")b.fontVariant=
+d[h];e=g=!0}else if(!f&&c.Weights.indexOf(d[h])!=-1){if(d[h]!="inherit")b.fontWeight=d[h];e=g=f=!0}else if(k)d[h]!="inherit"&&(j+=d[h]);else{if(d[h]!="inherit")b.fontSize=d[h].split("/")[0];e=g=f=k=!0}if(j!="")b.fontFamily=j;return b}};a.ToNumberArray=function(c){for(var c=a.trim(a.compressSpaces((c||"").replace(/,/g," "))).split(" "),d=0;d<c.length;d++)c[d]=parseFloat(c[d]);return c};a.Point=function(a,d){this.x=a;this.y=d;this.angleTo=function(b){return Math.atan2(b.y-this.y,b.x-this.x)};this.applyTransform=
+function(b){var a=this.x*b[1]+this.y*b[3]+b[5];this.x=this.x*b[0]+this.y*b[2]+b[4];this.y=a}};a.CreatePoint=function(c){c=a.ToNumberArray(c);return new a.Point(c[0],c[1])};a.CreatePath=function(c){for(var c=a.ToNumberArray(c),d=[],b=0;b<c.length;b+=2)d.push(new a.Point(c[b],c[b+1]));return d};a.BoundingBox=function(a,d,b,k){this.y2=this.x2=this.y1=this.x1=Number.NaN;this.x=function(){return this.x1};this.y=function(){return this.y1};this.width=function(){return this.x2-this.x1};this.height=function(){return this.y2-
+this.y1};this.addPoint=function(b,a){if(b!=null){if(isNaN(this.x1)||isNaN(this.x2))this.x2=this.x1=b;if(b<this.x1)this.x1=b;if(b>this.x2)this.x2=b}if(a!=null){if(isNaN(this.y1)||isNaN(this.y2))this.y2=this.y1=a;if(a<this.y1)this.y1=a;if(a>this.y2)this.y2=a}};this.addX=function(b){this.addPoint(b,null)};this.addY=function(b){this.addPoint(null,b)};this.addBoundingBox=function(b){this.addPoint(b.x1,b.y1);this.addPoint(b.x2,b.y2)};this.addQuadraticCurve=function(b,a,d,c,k,l){d=b+2/3*(d-b);c=a+2/3*(c-
+a);this.addBezierCurve(b,a,d,d+1/3*(k-b),c,c+1/3*(l-a),k,l)};this.addBezierCurve=function(b,a,d,c,k,l,o,n){var q=[b,a],p=[d,c],t=[k,l],m=[o,n];this.addPoint(q[0],q[1]);this.addPoint(m[0],m[1]);for(i=0;i<=1;i++)b=function(b){return Math.pow(1-b,3)*q[i]+3*Math.pow(1-b,2)*b*p[i]+3*(1-b)*Math.pow(b,2)*t[i]+Math.pow(b,3)*m[i]},a=6*q[i]-12*p[i]+6*t[i],d=-3*q[i]+9*p[i]-9*t[i]+3*m[i],c=3*p[i]-3*q[i],d==0?a!=0&&(a=-c/a,0<a&&a<1&&(i==0&&this.addX(b(a)),i==1&&this.addY(b(a)))):(c=Math.pow(a,2)-4*c*d,c<0||(k=
+(-a+Math.sqrt(c))/(2*d),0<k&&k<1&&(i==0&&this.addX(b(k)),i==1&&this.addY(b(k))),a=(-a-Math.sqrt(c))/(2*d),0<a&&a<1&&(i==0&&this.addX(b(a)),i==1&&this.addY(b(a)))))};this.isPointInBox=function(b,a){return this.x1<=b&&b<=this.x2&&this.y1<=a&&a<=this.y2};this.addPoint(a,d);this.addPoint(b,k)};a.Transform=function(c){var d=this;this.Type={};this.Type.translate=function(b){this.p=a.CreatePoint(b);this.apply=function(b){b.translate(this.p.x||0,this.p.y||0)};this.applyToPoint=function(b){b.applyTransform([1,
+0,0,1,this.p.x||0,this.p.y||0])}};this.Type.rotate=function(b){b=a.ToNumberArray(b);this.angle=new a.Property("angle",b[0]);this.cx=b[1]||0;this.cy=b[2]||0;this.apply=function(b){b.translate(this.cx,this.cy);b.rotate(this.angle.Angle.toRadians());b.translate(-this.cx,-this.cy)};this.applyToPoint=function(b){var a=this.angle.Angle.toRadians();b.applyTransform([1,0,0,1,this.p.x||0,this.p.y||0]);b.applyTransform([Math.cos(a),Math.sin(a),-Math.sin(a),Math.cos(a),0,0]);b.applyTransform([1,0,0,1,-this.p.x||
+0,-this.p.y||0])}};this.Type.scale=function(b){this.p=a.CreatePoint(b);this.apply=function(b){b.scale(this.p.x||1,this.p.y||this.p.x||1)};this.applyToPoint=function(b){b.applyTransform([this.p.x||0,0,0,this.p.y||0,0,0])}};this.Type.matrix=function(b){this.m=a.ToNumberArray(b);this.apply=function(b){b.transform(this.m[0],this.m[1],this.m[2],this.m[3],this.m[4],this.m[5])};this.applyToPoint=function(b){b.applyTransform(this.m)}};this.Type.SkewBase=function(b){this.base=d.Type.matrix;this.base(b);this.angle=
+new a.Property("angle",b)};this.Type.SkewBase.prototype=new this.Type.matrix;this.Type.skewX=function(b){this.base=d.Type.SkewBase;this.base(b);this.m=[1,0,Math.tan(this.angle.Angle.toRadians()),1,0,0]};this.Type.skewX.prototype=new this.Type.SkewBase;this.Type.skewY=function(b){this.base=d.Type.SkewBase;this.base(b);this.m=[1,Math.tan(this.angle.Angle.toRadians()),0,1,0,0]};this.Type.skewY.prototype=new this.Type.SkewBase;this.transforms=[];this.apply=function(b){for(var a=0;a<this.transforms.length;a++)this.transforms[a].apply(b)};
+this.applyToPoint=function(b){for(var a=0;a<this.transforms.length;a++)this.transforms[a].applyToPoint(b)};for(var c=a.trim(a.compressSpaces(c)).split(/\s(?=[a-z])/),b=0;b<c.length;b++){var k=c[b].split("(")[0],e=c[b].split("(")[1].replace(")","");this.transforms.push(new this.Type[k](e))}};a.AspectRatio=function(c,d,b,k,e,f,g,j,h,l){var d=a.compressSpaces(d),d=d.replace(/^defer\s/,""),o=d.split(" ")[0]||"xMidYMid",d=d.split(" ")[1]||"meet",n=b/k,q=e/f,p=Math.min(n,q),m=Math.max(n,q);d=="meet"&&(k*=
+p,f*=p);d=="slice"&&(k*=m,f*=m);h=new a.Property("refX",h);l=new a.Property("refY",l);h.hasValue()&&l.hasValue()?c.translate(-p*h.Length.toPixels("x"),-p*l.Length.toPixels("y")):(o.match(/^xMid/)&&(d=="meet"&&p==q||d=="slice"&&m==q)&&c.translate(b/2-k/2,0),o.match(/YMid$/)&&(d=="meet"&&p==n||d=="slice"&&m==n)&&c.translate(0,e/2-f/2),o.match(/^xMax/)&&(d=="meet"&&p==q||d=="slice"&&m==q)&&c.translate(b-k,0),o.match(/YMax$/)&&(d=="meet"&&p==n||d=="slice"&&m==n)&&c.translate(0,e-f));o=="none"?c.scale(n,
+q):d=="meet"?c.scale(p,p):d=="slice"&&c.scale(m,m);c.translate(g==null?0:-g,j==null?0:-j)};a.Element={};a.Element.ElementBase=function(c){this.attributes={};this.styles={};this.children=[];this.attribute=function(b,d){var c=this.attributes[b];if(c!=null)return c;c=new a.Property(b,"");d==!0&&(this.attributes[b]=c);return c};this.style=function(b,d){var c=this.styles[b];if(c!=null)return c;c=this.attribute(b);if(c!=null&&c.hasValue())return c;c=this.parent;if(c!=null&&(c=c.style(b),c!=null&&c.hasValue()))return c;
+c=new a.Property(b,"");d==!0&&(this.styles[b]=c);return c};this.render=function(b){if(this.style("display").value!="none"&&this.attribute("visibility").value!="hidden"){b.save();this.setContext(b);if(this.attribute("mask").hasValue()){var a=this.attribute("mask").Definition.getDefinition();a!=null&&a.apply(b,this)}else this.style("filter").hasValue()?(a=this.style("filter").Definition.getDefinition(),a!=null&&a.apply(b,this)):this.renderChildren(b);this.clearContext(b);b.restore()}};this.setContext=
+function(){};this.clearContext=function(){};this.renderChildren=function(b){for(var a=0;a<this.children.length;a++)this.children[a].render(b)};this.addChild=function(b,d){var c=b;d&&(c=a.CreateElement(b));c.parent=this;this.children.push(c)};if(c!=null&&c.nodeType==1){for(var d=0;d<c.childNodes.length;d++){var b=c.childNodes[d];b.nodeType==1&&this.addChild(b,!0)}for(d=0;d<c.attributes.length;d++)b=c.attributes[d],this.attributes[b.nodeName]=new a.Property(b.nodeName,b.nodeValue);b=a.Styles[c.nodeName];
+if(b!=null)for(var k in b)this.styles[k]=b[k];if(this.attribute("class").hasValue())for(var d=a.compressSpaces(this.attribute("class").value).split(" "),e=0;e<d.length;e++){b=a.Styles["."+d[e]];if(b!=null)for(k in b)this.styles[k]=b[k];b=a.Styles[c.nodeName+"."+d[e]];if(b!=null)for(k in b)this.styles[k]=b[k]}if(this.attribute("style").hasValue()){b=this.attribute("style").value.split(";");for(d=0;d<b.length;d++)a.trim(b[d])!=""&&(c=b[d].split(":"),k=a.trim(c[0]),c=a.trim(c[1]),this.styles[k]=new a.Property(k,
+c))}this.attribute("id").hasValue()&&a.Definitions[this.attribute("id").value]==null&&(a.Definitions[this.attribute("id").value]=this)}};a.Element.RenderedElementBase=function(c){this.base=a.Element.ElementBase;this.base(c);this.setContext=function(d){if(this.style("fill").Definition.isUrl()){var b=this.style("fill").Definition.getFillStyle(this);if(b!=null)d.fillStyle=b}else if(this.style("fill").hasValue())b=this.style("fill"),this.style("fill-opacity").hasValue()&&(b=b.Color.addOpacity(this.style("fill-opacity").value)),
+d.fillStyle=b.value=="none"?"rgba(0,0,0,0)":b.value;if(this.style("stroke").Definition.isUrl()){if(b=this.style("stroke").Definition.getFillStyle(this),b!=null)d.strokeStyle=b}else if(this.style("stroke").hasValue())b=this.style("stroke"),this.style("stroke-opacity").hasValue()&&(b=b.Color.addOpacity(this.style("stroke-opacity").value)),d.strokeStyle=b.value=="none"?"rgba(0,0,0,0)":b.value;if(this.style("stroke-width").hasValue())d.lineWidth=this.style("stroke-width").Length.toPixels();if(this.style("stroke-linecap").hasValue())d.lineCap=
+this.style("stroke-linecap").value;if(this.style("stroke-linejoin").hasValue())d.lineJoin=this.style("stroke-linejoin").value;if(this.style("stroke-miterlimit").hasValue())d.miterLimit=this.style("stroke-miterlimit").value;if(typeof d.font!="undefined")d.font=a.Font.CreateFont(this.style("font-style").value,this.style("font-variant").value,this.style("font-weight").value,this.style("font-size").hasValue()?this.style("font-size").Length.toPixels()+"px":"",this.style("font-family").value).toString();
+this.attribute("transform").hasValue()&&(new a.Transform(this.attribute("transform").value)).apply(d);this.attribute("clip-path").hasValue()&&(b=this.attribute("clip-path").Definition.getDefinition(),b!=null&&b.apply(d));if(this.style("opacity").hasValue())d.globalAlpha=this.style("opacity").numValue()}};a.Element.RenderedElementBase.prototype=new a.Element.ElementBase;a.Element.PathElementBase=function(c){this.base=a.Element.RenderedElementBase;this.base(c);this.path=function(d){d!=null&&d.beginPath();
+return new a.BoundingBox};this.renderChildren=function(d){this.path(d);a.Mouse.checkPath(this,d);d.fillStyle!=""&&d.fill();d.strokeStyle!=""&&d.stroke();var b=this.getMarkers();if(b!=null){if(this.style("marker-start").Definition.isUrl()){var c=this.style("marker-start").Definition.getDefinition();c.render(d,b[0][0],b[0][1])}if(this.style("marker-mid").Definition.isUrl())for(var c=this.style("marker-mid").Definition.getDefinition(),e=1;e<b.length-1;e++)c.render(d,b[e][0],b[e][1]);this.style("marker-end").Definition.isUrl()&&
+(c=this.style("marker-end").Definition.getDefinition(),c.render(d,b[b.length-1][0],b[b.length-1][1]))}};this.getBoundingBox=function(){return this.path()};this.getMarkers=function(){return null}};a.Element.PathElementBase.prototype=new a.Element.RenderedElementBase;a.Element.svg=function(c){this.base=a.Element.RenderedElementBase;this.base(c);this.baseClearContext=this.clearContext;this.clearContext=function(d){this.baseClearContext(d);a.ViewPort.RemoveCurrent()};this.baseSetContext=this.setContext;
+this.setContext=function(d){d.strokeStyle="rgba(0,0,0,0)";d.lineCap="butt";d.lineJoin="miter";d.miterLimit=4;this.baseSetContext(d);this.attribute("x").hasValue()&&this.attribute("y").hasValue()&&d.translate(this.attribute("x").Length.toPixels("x"),this.attribute("y").Length.toPixels("y"));var b=a.ViewPort.width(),c=a.ViewPort.height();if(typeof this.root=="undefined"&&this.attribute("width").hasValue()&&this.attribute("height").hasValue()){var b=this.attribute("width").Length.toPixels("x"),c=this.attribute("height").Length.toPixels("y"),
+e=0,f=0;this.attribute("refX").hasValue()&&this.attribute("refY").hasValue()&&(e=-this.attribute("refX").Length.toPixels("x"),f=-this.attribute("refY").Length.toPixels("y"));d.beginPath();d.moveTo(e,f);d.lineTo(b,f);d.lineTo(b,c);d.lineTo(e,c);d.closePath();d.clip()}a.ViewPort.SetCurrent(b,c);if(this.attribute("viewBox").hasValue()){var e=a.ToNumberArray(this.attribute("viewBox").value),f=e[0],g=e[1],b=e[2],c=e[3];a.AspectRatio(d,this.attribute("preserveAspectRatio").value,a.ViewPort.width(),b,a.ViewPort.height(),
+c,f,g,this.attribute("refX").value,this.attribute("refY").value);a.ViewPort.RemoveCurrent();a.ViewPort.SetCurrent(e[2],e[3])}}};a.Element.svg.prototype=new a.Element.RenderedElementBase;a.Element.rect=function(c){this.base=a.Element.PathElementBase;this.base(c);this.path=function(d){var b=this.attribute("x").Length.toPixels("x"),c=this.attribute("y").Length.toPixels("y"),e=this.attribute("width").Length.toPixels("x"),f=this.attribute("height").Length.toPixels("y"),g=this.attribute("rx").Length.toPixels("x"),
+j=this.attribute("ry").Length.toPixels("y");this.attribute("rx").hasValue()&&!this.attribute("ry").hasValue()&&(j=g);this.attribute("ry").hasValue()&&!this.attribute("rx").hasValue()&&(g=j);d!=null&&(d.beginPath(),d.moveTo(b+g,c),d.lineTo(b+e-g,c),d.quadraticCurveTo(b+e,c,b+e,c+j),d.lineTo(b+e,c+f-j),d.quadraticCurveTo(b+e,c+f,b+e-g,c+f),d.lineTo(b+g,c+f),d.quadraticCurveTo(b,c+f,b,c+f-j),d.lineTo(b,c+j),d.quadraticCurveTo(b,c,b+g,c),d.closePath());return new a.BoundingBox(b,c,b+e,c+f)}};a.Element.rect.prototype=
+new a.Element.PathElementBase;a.Element.circle=function(c){this.base=a.Element.PathElementBase;this.base(c);this.path=function(d){var b=this.attribute("cx").Length.toPixels("x"),c=this.attribute("cy").Length.toPixels("y"),e=this.attribute("r").Length.toPixels();d!=null&&(d.beginPath(),d.arc(b,c,e,0,Math.PI*2,!0),d.closePath());return new a.BoundingBox(b-e,c-e,b+e,c+e)}};a.Element.circle.prototype=new a.Element.PathElementBase;a.Element.ellipse=function(c){this.base=a.Element.PathElementBase;this.base(c);
+this.path=function(d){var b=4*((Math.sqrt(2)-1)/3),c=this.attribute("rx").Length.toPixels("x"),e=this.attribute("ry").Length.toPixels("y"),f=this.attribute("cx").Length.toPixels("x"),g=this.attribute("cy").Length.toPixels("y");d!=null&&(d.beginPath(),d.moveTo(f,g-e),d.bezierCurveTo(f+b*c,g-e,f+c,g-b*e,f+c,g),d.bezierCurveTo(f+c,g+b*e,f+b*c,g+e,f,g+e),d.bezierCurveTo(f-b*c,g+e,f-c,g+b*e,f-c,g),d.bezierCurveTo(f-c,g-b*e,f-b*c,g-e,f,g-e),d.closePath());return new a.BoundingBox(f-c,g-e,f+c,g+e)}};a.Element.ellipse.prototype=
+new a.Element.PathElementBase;a.Element.line=function(c){this.base=a.Element.PathElementBase;this.base(c);this.getPoints=function(){return[new a.Point(this.attribute("x1").Length.toPixels("x"),this.attribute("y1").Length.toPixels("y")),new a.Point(this.attribute("x2").Length.toPixels("x"),this.attribute("y2").Length.toPixels("y"))]};this.path=function(d){var b=this.getPoints();d!=null&&(d.beginPath(),d.moveTo(b[0].x,b[0].y),d.lineTo(b[1].x,b[1].y));return new a.BoundingBox(b[0].x,b[0].y,b[1].x,b[1].y)};
+this.getMarkers=function(){var a=this.getPoints(),b=a[0].angleTo(a[1]);return[[a[0],b],[a[1],b]]}};a.Element.line.prototype=new a.Element.PathElementBase;a.Element.polyline=function(c){this.base=a.Element.PathElementBase;this.base(c);this.points=a.CreatePath(this.attribute("points").value);this.path=function(d){var b=new a.BoundingBox(this.points[0].x,this.points[0].y);d!=null&&(d.beginPath(),d.moveTo(this.points[0].x,this.points[0].y));for(var c=1;c<this.points.length;c++)b.addPoint(this.points[c].x,
+this.points[c].y),d!=null&&d.lineTo(this.points[c].x,this.points[c].y);return b};this.getMarkers=function(){for(var a=[],b=0;b<this.points.length-1;b++)a.push([this.points[b],this.points[b].angleTo(this.points[b+1])]);a.push([this.points[this.points.length-1],a[a.length-1][1]]);return a}};a.Element.polyline.prototype=new a.Element.PathElementBase;a.Element.polygon=function(c){this.base=a.Element.polyline;this.base(c);this.basePath=this.path;this.path=function(a){var b=this.basePath(a);a!=null&&(a.lineTo(this.points[0].x,
+this.points[0].y),a.closePath());return b}};a.Element.polygon.prototype=new a.Element.polyline;a.Element.path=function(c){this.base=a.Element.PathElementBase;this.base(c);c=this.attribute("d").value;c=c.replace(/,/gm," ");c=c.replace(/([MmZzLlHhVvCcSsQqTtAa])([MmZzLlHhVvCcSsQqTtAa])/gm,"$1 $2");c=c.replace(/([MmZzLlHhVvCcSsQqTtAa])([MmZzLlHhVvCcSsQqTtAa])/gm,"$1 $2");c=c.replace(/([MmZzLlHhVvCcSsQqTtAa])([^\s])/gm,"$1 $2");c=c.replace(/([^\s])([MmZzLlHhVvCcSsQqTtAa])/gm,"$1 $2");c=c.replace(/([0-9])([+\-])/gm,
+"$1 $2");c=c.replace(/(\.[0-9]*)(\.)/gm,"$1 $2");c=c.replace(/([Aa](\s+[0-9]+){3})\s+([01])\s*([01])/gm,"$1 $3 $4 ");c=a.compressSpaces(c);c=a.trim(c);this.PathParser=new function(d){this.tokens=d.split(" ");this.reset=function(){this.i=-1;this.previousCommand=this.command="";this.start=new a.Point(0,0);this.control=new a.Point(0,0);this.current=new a.Point(0,0);this.points=[];this.angles=[]};this.isEnd=function(){return this.i>=this.tokens.length-1};this.isCommandOrEnd=function(){return this.isEnd()?
+!0:this.tokens[this.i+1].match(/^[A-Za-z]$/)!=null};this.isRelativeCommand=function(){return this.command==this.command.toLowerCase()};this.getToken=function(){this.i+=1;return this.tokens[this.i]};this.getScalar=function(){return parseFloat(this.getToken())};this.nextCommand=function(){this.previousCommand=this.command;this.command=this.getToken()};this.getPoint=function(){return this.makeAbsolute(new a.Point(this.getScalar(),this.getScalar()))};this.getAsControlPoint=function(){var b=this.getPoint();
+return this.control=b};this.getAsCurrentPoint=function(){var b=this.getPoint();return this.current=b};this.getReflectedControlPoint=function(){return this.previousCommand.toLowerCase()!="c"&&this.previousCommand.toLowerCase()!="s"?this.current:new a.Point(2*this.current.x-this.control.x,2*this.current.y-this.control.y)};this.makeAbsolute=function(b){if(this.isRelativeCommand())b.x=this.current.x+b.x,b.y=this.current.y+b.y;return b};this.addMarker=function(b,a,d){d!=null&&this.angles.length>0&&this.angles[this.angles.length-
+1]==null&&(this.angles[this.angles.length-1]=this.points[this.points.length-1].angleTo(d));this.addMarkerAngle(b,a==null?null:a.angleTo(b))};this.addMarkerAngle=function(b,a){this.points.push(b);this.angles.push(a)};this.getMarkerPoints=function(){return this.points};this.getMarkerAngles=function(){for(var b=0;b<this.angles.length;b++)if(this.angles[b]==null)for(var a=b+1;a<this.angles.length;a++)if(this.angles[a]!=null){this.angles[b]=this.angles[a];break}return this.angles}}(c);this.path=function(d){var b=
+this.PathParser;b.reset();var c=new a.BoundingBox;for(d!=null&&d.beginPath();!b.isEnd();)switch(b.nextCommand(),b.command.toUpperCase()){case "M":var e=b.getAsCurrentPoint();b.addMarker(e);c.addPoint(e.x,e.y);d!=null&&d.moveTo(e.x,e.y);for(b.start=b.current;!b.isCommandOrEnd();)e=b.getAsCurrentPoint(),b.addMarker(e,b.start),c.addPoint(e.x,e.y),d!=null&&d.lineTo(e.x,e.y);break;case "L":for(;!b.isCommandOrEnd();){var f=b.current,e=b.getAsCurrentPoint();b.addMarker(e,f);c.addPoint(e.x,e.y);d!=null&&
+d.lineTo(e.x,e.y)}break;case "H":for(;!b.isCommandOrEnd();)e=new a.Point((b.isRelativeCommand()?b.current.x:0)+b.getScalar(),b.current.y),b.addMarker(e,b.current),b.current=e,c.addPoint(b.current.x,b.current.y),d!=null&&d.lineTo(b.current.x,b.current.y);break;case "V":for(;!b.isCommandOrEnd();)e=new a.Point(b.current.x,(b.isRelativeCommand()?b.current.y:0)+b.getScalar()),b.addMarker(e,b.current),b.current=e,c.addPoint(b.current.x,b.current.y),d!=null&&d.lineTo(b.current.x,b.current.y);break;case "C":for(;!b.isCommandOrEnd();){var g=
+b.current,f=b.getPoint(),j=b.getAsControlPoint(),e=b.getAsCurrentPoint();b.addMarker(e,j,f);c.addBezierCurve(g.x,g.y,f.x,f.y,j.x,j.y,e.x,e.y);d!=null&&d.bezierCurveTo(f.x,f.y,j.x,j.y,e.x,e.y)}break;case "S":for(;!b.isCommandOrEnd();)g=b.current,f=b.getReflectedControlPoint(),j=b.getAsControlPoint(),e=b.getAsCurrentPoint(),b.addMarker(e,j,f),c.addBezierCurve(g.x,g.y,f.x,f.y,j.x,j.y,e.x,e.y),d!=null&&d.bezierCurveTo(f.x,f.y,j.x,j.y,e.x,e.y);break;case "Q":for(;!b.isCommandOrEnd();)g=b.current,j=b.getAsControlPoint(),
+e=b.getAsCurrentPoint(),b.addMarker(e,j,j),c.addQuadraticCurve(g.x,g.y,j.x,j.y,e.x,e.y),d!=null&&d.quadraticCurveTo(j.x,j.y,e.x,e.y);break;case "T":for(;!b.isCommandOrEnd();)g=b.current,j=b.getReflectedControlPoint(),b.control=j,e=b.getAsCurrentPoint(),b.addMarker(e,j,j),c.addQuadraticCurve(g.x,g.y,j.x,j.y,e.x,e.y),d!=null&&d.quadraticCurveTo(j.x,j.y,e.x,e.y);break;case "A":for(;!b.isCommandOrEnd();){var g=b.current,h=b.getScalar(),l=b.getScalar(),f=b.getScalar()*(Math.PI/180),o=b.getScalar(),j=b.getScalar(),
+e=b.getAsCurrentPoint(),n=new a.Point(Math.cos(f)*(g.x-e.x)/2+Math.sin(f)*(g.y-e.y)/2,-Math.sin(f)*(g.x-e.x)/2+Math.cos(f)*(g.y-e.y)/2),q=Math.pow(n.x,2)/Math.pow(h,2)+Math.pow(n.y,2)/Math.pow(l,2);q>1&&(h*=Math.sqrt(q),l*=Math.sqrt(q));o=(o==j?-1:1)*Math.sqrt((Math.pow(h,2)*Math.pow(l,2)-Math.pow(h,2)*Math.pow(n.y,2)-Math.pow(l,2)*Math.pow(n.x,2))/(Math.pow(h,2)*Math.pow(n.y,2)+Math.pow(l,2)*Math.pow(n.x,2)));isNaN(o)&&(o=0);var p=new a.Point(o*h*n.y/l,o*-l*n.x/h),g=new a.Point((g.x+e.x)/2+Math.cos(f)*
+p.x-Math.sin(f)*p.y,(g.y+e.y)/2+Math.sin(f)*p.x+Math.cos(f)*p.y),m=function(b,a){return(b[0]*a[0]+b[1]*a[1])/(Math.sqrt(Math.pow(b[0],2)+Math.pow(b[1],2))*Math.sqrt(Math.pow(a[0],2)+Math.pow(a[1],2)))},s=function(b,a){return(b[0]*a[1]<b[1]*a[0]?-1:1)*Math.acos(m(b,a))},o=s([1,0],[(n.x-p.x)/h,(n.y-p.y)/l]),q=[(n.x-p.x)/h,(n.y-p.y)/l],p=[(-n.x-p.x)/h,(-n.y-p.y)/l],n=s(q,p);if(m(q,p)<=-1)n=Math.PI;m(q,p)>=1&&(n=0);j==0&&n>0&&(n-=2*Math.PI);j==1&&n<0&&(n+=2*Math.PI);q=new a.Point(g.x-h*Math.cos((o+n)/
+2),g.y-l*Math.sin((o+n)/2));b.addMarkerAngle(q,(o+n)/2+(j==0?1:-1)*Math.PI/2);b.addMarkerAngle(e,n+(j==0?1:-1)*Math.PI/2);c.addPoint(e.x,e.y);d!=null&&(m=h>l?h:l,e=h>l?1:h/l,h=h>l?l/h:1,d.translate(g.x,g.y),d.rotate(f),d.scale(e,h),d.arc(0,0,m,o,o+n,1-j),d.scale(1/e,1/h),d.rotate(-f),d.translate(-g.x,-g.y))}break;case "Z":d!=null&&d.closePath(),b.current=b.start}return c};this.getMarkers=function(){for(var a=this.PathParser.getMarkerPoints(),b=this.PathParser.getMarkerAngles(),c=[],e=0;e<a.length;e++)c.push([a[e],
+b[e]]);return c}};a.Element.path.prototype=new a.Element.PathElementBase;a.Element.pattern=function(c){this.base=a.Element.ElementBase;this.base(c);this.createPattern=function(d){var b=new a.Element.svg;b.attributes.viewBox=new a.Property("viewBox",this.attribute("viewBox").value);b.attributes.x=new a.Property("x",this.attribute("x").value);b.attributes.y=new a.Property("y",this.attribute("y").value);b.attributes.width=new a.Property("width",this.attribute("width").value);b.attributes.height=new a.Property("height",
+this.attribute("height").value);b.children=this.children;var c=document.createElement("canvas");c.width=this.attribute("width").Length.toPixels("x");c.height=this.attribute("height").Length.toPixels("y");b.render(c.getContext("2d"));return d.createPattern(c,"repeat")}};a.Element.pattern.prototype=new a.Element.ElementBase;a.Element.marker=function(c){this.base=a.Element.ElementBase;this.base(c);this.baseRender=this.render;this.render=function(d,b,c){d.translate(b.x,b.y);this.attribute("orient").valueOrDefault("auto")==
+"auto"&&d.rotate(c);this.attribute("markerUnits").valueOrDefault("strokeWidth")=="strokeWidth"&&d.scale(d.lineWidth,d.lineWidth);d.save();var e=new a.Element.svg;e.attributes.viewBox=new a.Property("viewBox",this.attribute("viewBox").value);e.attributes.refX=new a.Property("refX",this.attribute("refX").value);e.attributes.refY=new a.Property("refY",this.attribute("refY").value);e.attributes.width=new a.Property("width",this.attribute("markerWidth").value);e.attributes.height=new a.Property("height",
+this.attribute("markerHeight").value);e.attributes.fill=new a.Property("fill",this.attribute("fill").valueOrDefault("black"));e.attributes.stroke=new a.Property("stroke",this.attribute("stroke").valueOrDefault("none"));e.children=this.children;e.render(d);d.restore();this.attribute("markerUnits").valueOrDefault("strokeWidth")=="strokeWidth"&&d.scale(1/d.lineWidth,1/d.lineWidth);this.attribute("orient").valueOrDefault("auto")=="auto"&&d.rotate(-c);d.translate(-b.x,-b.y)}};a.Element.marker.prototype=
+new a.Element.ElementBase;a.Element.defs=function(c){this.base=a.Element.ElementBase;this.base(c);this.render=function(){}};a.Element.defs.prototype=new a.Element.ElementBase;a.Element.GradientBase=function(c){this.base=a.Element.ElementBase;this.base(c);this.gradientUnits=this.attribute("gradientUnits").valueOrDefault("objectBoundingBox");this.stops=[];for(c=0;c<this.children.length;c++)this.stops.push(this.children[c]);this.getGradient=function(){};this.createGradient=function(d,b){var c=this;this.attribute("xlink:href").hasValue()&&
+(c=this.attribute("xlink:href").Definition.getDefinition());for(var e=this.getGradient(d,b),f=0;f<c.stops.length;f++)e.addColorStop(c.stops[f].offset,c.stops[f].color);if(this.attribute("gradientTransform").hasValue()){c=a.ViewPort.viewPorts[0];f=new a.Element.rect;f.attributes.x=new a.Property("x",-a.MAX_VIRTUAL_PIXELS/3);f.attributes.y=new a.Property("y",-a.MAX_VIRTUAL_PIXELS/3);f.attributes.width=new a.Property("width",a.MAX_VIRTUAL_PIXELS);f.attributes.height=new a.Property("height",a.MAX_VIRTUAL_PIXELS);
+var g=new a.Element.g;g.attributes.transform=new a.Property("transform",this.attribute("gradientTransform").value);g.children=[f];f=new a.Element.svg;f.attributes.x=new a.Property("x",0);f.attributes.y=new a.Property("y",0);f.attributes.width=new a.Property("width",c.width);f.attributes.height=new a.Property("height",c.height);f.children=[g];g=document.createElement("canvas");g.width=c.width;g.height=c.height;c=g.getContext("2d");c.fillStyle=e;f.render(c);return c.createPattern(g,"no-repeat")}return e}};
+a.Element.GradientBase.prototype=new a.Element.ElementBase;a.Element.linearGradient=function(c){this.base=a.Element.GradientBase;this.base(c);this.getGradient=function(a,b){var c=b.getBoundingBox(),e=this.gradientUnits=="objectBoundingBox"?c.x()+c.width()*this.attribute("x1").numValue():this.attribute("x1").Length.toPixels("x"),f=this.gradientUnits=="objectBoundingBox"?c.y()+c.height()*this.attribute("y1").numValue():this.attribute("y1").Length.toPixels("y"),g=this.gradientUnits=="objectBoundingBox"?
+c.x()+c.width()*this.attribute("x2").numValue():this.attribute("x2").Length.toPixels("x"),c=this.gradientUnits=="objectBoundingBox"?c.y()+c.height()*this.attribute("y2").numValue():this.attribute("y2").Length.toPixels("y");return a.createLinearGradient(e,f,g,c)}};a.Element.linearGradient.prototype=new a.Element.GradientBase;a.Element.radialGradient=function(c){this.base=a.Element.GradientBase;this.base(c);this.getGradient=function(a,b){var c=b.getBoundingBox(),e=this.gradientUnits=="objectBoundingBox"?
+c.x()+c.width()*this.attribute("cx").numValue():this.attribute("cx").Length.toPixels("x"),f=this.gradientUnits=="objectBoundingBox"?c.y()+c.height()*this.attribute("cy").numValue():this.attribute("cy").Length.toPixels("y"),g=e,j=f;this.attribute("fx").hasValue()&&(g=this.gradientUnits=="objectBoundingBox"?c.x()+c.width()*this.attribute("fx").numValue():this.attribute("fx").Length.toPixels("x"));this.attribute("fy").hasValue()&&(j=this.gradientUnits=="objectBoundingBox"?c.y()+c.height()*this.attribute("fy").numValue():
+this.attribute("fy").Length.toPixels("y"));c=this.gradientUnits=="objectBoundingBox"?(c.width()+c.height())/2*this.attribute("r").numValue():this.attribute("r").Length.toPixels();return a.createRadialGradient(g,j,0,e,f,c)}};a.Element.radialGradient.prototype=new a.Element.GradientBase;a.Element.stop=function(c){this.base=a.Element.ElementBase;this.base(c);this.offset=this.attribute("offset").numValue();c=this.style("stop-color");this.style("stop-opacity").hasValue()&&(c=c.Color.addOpacity(this.style("stop-opacity").value));
+this.color=c.value};a.Element.stop.prototype=new a.Element.ElementBase;a.Element.AnimateBase=function(c){this.base=a.Element.ElementBase;this.base(c);a.Animations.push(this);this.duration=0;this.begin=this.attribute("begin").Time.toMilliseconds();this.maxDuration=this.begin+this.attribute("dur").Time.toMilliseconds();this.getProperty=function(){var a=this.attribute("attributeType").value,b=this.attribute("attributeName").value;return a=="CSS"?this.parent.style(b,!0):this.parent.attribute(b,!0)};this.initialValue=
+null;this.removed=!1;this.calcValue=function(){return""};this.update=function(a){if(this.initialValue==null)this.initialValue=this.getProperty().value;if(this.duration>this.maxDuration)if(this.attribute("repeatCount").value=="indefinite")this.duration=0;else return this.attribute("fill").valueOrDefault("remove")=="remove"&&!this.removed?(this.removed=!0,this.getProperty().value=this.initialValue,!0):!1;this.duration+=a;a=!1;if(this.begin<this.duration)a=this.calcValue(),this.attribute("type").hasValue()&&
+(a=this.attribute("type").value+"("+a+")"),this.getProperty().value=a,a=!0;return a};this.progress=function(){return(this.duration-this.begin)/(this.maxDuration-this.begin)}};a.Element.AnimateBase.prototype=new a.Element.ElementBase;a.Element.animate=function(c){this.base=a.Element.AnimateBase;this.base(c);this.calcValue=function(){var a=this.attribute("from").numValue(),b=this.attribute("to").numValue();return a+(b-a)*this.progress()}};a.Element.animate.prototype=new a.Element.AnimateBase;a.Element.animateColor=
+function(c){this.base=a.Element.AnimateBase;this.base(c);this.calcValue=function(){var a=new RGBColor(this.attribute("from").value),b=new RGBColor(this.attribute("to").value);if(a.ok&&b.ok){var c=a.r+(b.r-a.r)*this.progress(),e=a.g+(b.g-a.g)*this.progress(),a=a.b+(b.b-a.b)*this.progress();return"rgb("+parseInt(c,10)+","+parseInt(e,10)+","+parseInt(a,10)+")"}return this.attribute("from").value}};a.Element.animateColor.prototype=new a.Element.AnimateBase;a.Element.animateTransform=function(c){this.base=
+a.Element.animate;this.base(c)};a.Element.animateTransform.prototype=new a.Element.animate;a.Element.font=function(c){this.base=a.Element.ElementBase;this.base(c);this.horizAdvX=this.attribute("horiz-adv-x").numValue();this.isArabic=this.isRTL=!1;this.missingGlyph=this.fontFace=null;this.glyphs=[];for(c=0;c<this.children.length;c++){var d=this.children[c];if(d.type=="font-face")this.fontFace=d,d.style("font-family").hasValue()&&(a.Definitions[d.style("font-family").value]=this);else if(d.type=="missing-glyph")this.missingGlyph=
+d;else if(d.type=="glyph")d.arabicForm!=""?(this.isArabic=this.isRTL=!0,typeof this.glyphs[d.unicode]=="undefined"&&(this.glyphs[d.unicode]=[]),this.glyphs[d.unicode][d.arabicForm]=d):this.glyphs[d.unicode]=d}};a.Element.font.prototype=new a.Element.ElementBase;a.Element.fontface=function(c){this.base=a.Element.ElementBase;this.base(c);this.ascent=this.attribute("ascent").value;this.descent=this.attribute("descent").value;this.unitsPerEm=this.attribute("units-per-em").numValue()};a.Element.fontface.prototype=
+new a.Element.ElementBase;a.Element.missingglyph=function(c){this.base=a.Element.path;this.base(c);this.horizAdvX=0};a.Element.missingglyph.prototype=new a.Element.path;a.Element.glyph=function(c){this.base=a.Element.path;this.base(c);this.horizAdvX=this.attribute("horiz-adv-x").numValue();this.unicode=this.attribute("unicode").value;this.arabicForm=this.attribute("arabic-form").value};a.Element.glyph.prototype=new a.Element.path;a.Element.text=function(c){this.base=a.Element.RenderedElementBase;
+this.base(c);if(c!=null){this.children=[];for(var d=0;d<c.childNodes.length;d++){var b=c.childNodes[d];b.nodeType==1?this.addChild(b,!0):b.nodeType==3&&this.addChild(new a.Element.tspan(b),!1)}}this.baseSetContext=this.setContext;this.setContext=function(b){this.baseSetContext(b);if(this.style("dominant-baseline").hasValue())b.textBaseline=this.style("dominant-baseline").value;if(this.style("alignment-baseline").hasValue())b.textBaseline=this.style("alignment-baseline").value};this.renderChildren=
+function(b){for(var a=this.style("text-anchor").valueOrDefault("start"),c=this.attribute("x").Length.toPixels("x"),d=this.attribute("y").Length.toPixels("y"),j=0;j<this.children.length;j++){var h=this.children[j];h.attribute("x").hasValue()?h.x=h.attribute("x").Length.toPixels("x"):(h.attribute("dx").hasValue()&&(c+=h.attribute("dx").Length.toPixels("x")),h.x=c);c=h.measureText(b);if(a!="start"&&(j==0||h.attribute("x").hasValue())){for(var l=c,o=j+1;o<this.children.length;o++){var n=this.children[o];
+if(n.attribute("x").hasValue())break;l+=n.measureText(b)}h.x-=a=="end"?l:l/2}c=h.x+c;h.attribute("y").hasValue()?h.y=h.attribute("y").Length.toPixels("y"):(h.attribute("dy").hasValue()&&(d+=h.attribute("dy").Length.toPixels("y")),h.y=d);d=h.y;h.render(b)}}};a.Element.text.prototype=new a.Element.RenderedElementBase;a.Element.TextElementBase=function(c){this.base=a.Element.RenderedElementBase;this.base(c);this.getGlyph=function(a,b,c){var e=b[c],f=null;if(a.isArabic){var g="isolated";if((c==0||b[c-
+1]==" ")&&c<b.length-2&&b[c+1]!=" ")g="terminal";c>0&&b[c-1]!=" "&&c<b.length-2&&b[c+1]!=" "&&(g="medial");if(c>0&&b[c-1]!=" "&&(c==b.length-1||b[c+1]==" "))g="initial";typeof a.glyphs[e]!="undefined"&&(f=a.glyphs[e][g],f==null&&a.glyphs[e].type=="glyph"&&(f=a.glyphs[e]))}else f=a.glyphs[e];if(f==null)f=a.missingGlyph;return f};this.renderChildren=function(c){var b=this.parent.style("font-family").Definition.getDefinition();if(b!=null){var k=this.parent.style("font-size").numValueOrDefault(a.Font.Parse(a.ctx.font).fontSize),
+e=this.parent.style("font-style").valueOrDefault(a.Font.Parse(a.ctx.font).fontStyle),f=this.getText();b.isRTL&&(f=f.split("").reverse().join(""));for(var g=a.ToNumberArray(this.parent.attribute("dx").value),j=0;j<f.length;j++){var h=this.getGlyph(b,f,j),l=k/b.fontFace.unitsPerEm;c.translate(this.x,this.y);c.scale(l,-l);var o=c.lineWidth;c.lineWidth=c.lineWidth*b.fontFace.unitsPerEm/k;e=="italic"&&c.transform(1,0,0.4,1,0,0);h.render(c);e=="italic"&&c.transform(1,0,-0.4,1,0,0);c.lineWidth=o;c.scale(1/
+l,-1/l);c.translate(-this.x,-this.y);this.x+=k*(h.horizAdvX||b.horizAdvX)/b.fontFace.unitsPerEm;typeof g[j]!="undefined"&&!isNaN(g[j])&&(this.x+=g[j])}}else c.strokeStyle!=""&&c.strokeText(a.compressSpaces(this.getText()),this.x,this.y),c.fillStyle!=""&&c.fillText(a.compressSpaces(this.getText()),this.x,this.y)};this.getText=function(){};this.measureText=function(c){var b=this.parent.style("font-family").Definition.getDefinition();if(b!=null){var c=this.parent.style("font-size").numValueOrDefault(a.Font.Parse(a.ctx.font).fontSize),
+k=0,e=this.getText();b.isRTL&&(e=e.split("").reverse().join(""));for(var f=a.ToNumberArray(this.parent.attribute("dx").value),g=0;g<e.length;g++){var j=this.getGlyph(b,e,g);k+=(j.horizAdvX||b.horizAdvX)*c/b.fontFace.unitsPerEm;typeof f[g]!="undefined"&&!isNaN(f[g])&&(k+=f[g])}return k}b=a.compressSpaces(this.getText());if(!c.measureText)return b.length*10;c.save();this.setContext(c);b=c.measureText(b).width;c.restore();return b}};a.Element.TextElementBase.prototype=new a.Element.RenderedElementBase;
+a.Element.tspan=function(c){this.base=a.Element.TextElementBase;this.base(c);this.text=c.nodeType==3?c.nodeValue:c.childNodes.length>0?c.childNodes[0].nodeValue:c.text;this.getText=function(){return this.text}};a.Element.tspan.prototype=new a.Element.TextElementBase;a.Element.tref=function(c){this.base=a.Element.TextElementBase;this.base(c);this.getText=function(){var a=this.attribute("xlink:href").Definition.getDefinition();if(a!=null)return a.children[0].getText()}};a.Element.tref.prototype=new a.Element.TextElementBase;
+a.Element.a=function(c){this.base=a.Element.TextElementBase;this.base(c);this.hasText=!0;for(var d=0;d<c.childNodes.length;d++)if(c.childNodes[d].nodeType!=3)this.hasText=!1;this.text=this.hasText?c.childNodes[0].nodeValue:"";this.getText=function(){return this.text};this.baseRenderChildren=this.renderChildren;this.renderChildren=function(b){if(this.hasText){this.baseRenderChildren(b);var c=new a.Property("fontSize",a.Font.Parse(a.ctx.font).fontSize);a.Mouse.checkBoundingBox(this,new a.BoundingBox(this.x,
+this.y-c.Length.toPixels("y"),this.x+this.measureText(b),this.y))}else c=new a.Element.g,c.children=this.children,c.parent=this,c.render(b)};this.onclick=function(){window.open(this.attribute("xlink:href").value)};this.onmousemove=function(){a.ctx.canvas.style.cursor="pointer"}};a.Element.a.prototype=new a.Element.TextElementBase;a.Element.image=function(c){this.base=a.Element.RenderedElementBase;this.base(c);a.Images.push(this);this.img=document.createElement("img");this.loaded=!1;var d=this;this.img.onload=
+function(){d.loaded=!0};this.img.src=this.attribute("xlink:href").value;this.renderChildren=function(b){var c=this.attribute("x").Length.toPixels("x"),d=this.attribute("y").Length.toPixels("y"),f=this.attribute("width").Length.toPixels("x"),g=this.attribute("height").Length.toPixels("y");f==0||g==0||(b.save(),b.translate(c,d),a.AspectRatio(b,this.attribute("preserveAspectRatio").value,f,this.img.width,g,this.img.height,0,0),b.drawImage(this.img,0,0),b.restore())}};a.Element.image.prototype=new a.Element.RenderedElementBase;
+a.Element.g=function(c){this.base=a.Element.RenderedElementBase;this.base(c);this.getBoundingBox=function(){for(var c=new a.BoundingBox,b=0;b<this.children.length;b++)c.addBoundingBox(this.children[b].getBoundingBox());return c}};a.Element.g.prototype=new a.Element.RenderedElementBase;a.Element.symbol=function(c){this.base=a.Element.RenderedElementBase;this.base(c);this.baseSetContext=this.setContext;this.setContext=function(c){this.baseSetContext(c);if(this.attribute("viewBox").hasValue()){var b=
+a.ToNumberArray(this.attribute("viewBox").value),k=b[0],e=b[1];width=b[2];height=b[3];a.AspectRatio(c,this.attribute("preserveAspectRatio").value,this.attribute("width").Length.toPixels("x"),width,this.attribute("height").Length.toPixels("y"),height,k,e);a.ViewPort.SetCurrent(b[2],b[3])}}};a.Element.symbol.prototype=new a.Element.RenderedElementBase;a.Element.style=function(c){this.base=a.Element.ElementBase;this.base(c);for(var c=c.childNodes[0].nodeValue+(c.childNodes.length>1?c.childNodes[1].nodeValue:
+""),c=c.replace(/(\/\*([^*]|[\r\n]|(\*+([^*\/]|[\r\n])))*\*+\/)|(^[\s]*\/\/.*)/gm,""),c=a.compressSpaces(c),c=c.split("}"),d=0;d<c.length;d++)if(a.trim(c[d])!="")for(var b=c[d].split("{"),k=b[0].split(","),b=b[1].split(";"),e=0;e<k.length;e++){var f=a.trim(k[e]);if(f!=""){for(var g={},j=0;j<b.length;j++){var h=b[j].indexOf(":"),l=b[j].substr(0,h),h=b[j].substr(h+1,b[j].length-h);l!=null&&h!=null&&(g[a.trim(l)]=new a.Property(a.trim(l),a.trim(h)))}a.Styles[f]=g;if(f=="@font-face"){f=g["font-family"].value.replace(/"/g,
+"");g=g.src.value.split(",");for(j=0;j<g.length;j++)if(g[j].indexOf('format("svg")')>0){l=g[j].indexOf("url");h=g[j].indexOf(")",l);l=g[j].substr(l+5,h-l-6);l=a.parseXml(a.ajax(l)).getElementsByTagName("font");for(h=0;h<l.length;h++){var o=a.CreateElement(l[h]);a.Definitions[f]=o}}}}}};a.Element.style.prototype=new a.Element.ElementBase;a.Element.use=function(c){this.base=a.Element.RenderedElementBase;this.base(c);this.baseSetContext=this.setContext;this.setContext=function(a){this.baseSetContext(a);
+this.attribute("x").hasValue()&&a.translate(this.attribute("x").Length.toPixels("x"),0);this.attribute("y").hasValue()&&a.translate(0,this.attribute("y").Length.toPixels("y"))};this.getDefinition=function(){var a=this.attribute("xlink:href").Definition.getDefinition();if(this.attribute("width").hasValue())a.attribute("width",!0).value=this.attribute("width").value;if(this.attribute("height").hasValue())a.attribute("height",!0).value=this.attribute("height").value;return a};this.path=function(a){var b=
+this.getDefinition();b!=null&&b.path(a)};this.renderChildren=function(a){var b=this.getDefinition();b!=null&&b.render(a)}};a.Element.use.prototype=new a.Element.RenderedElementBase;a.Element.mask=function(c){this.base=a.Element.ElementBase;this.base(c);this.apply=function(a,b){var c=this.attribute("x").Length.toPixels("x"),e=this.attribute("y").Length.toPixels("y"),f=this.attribute("width").Length.toPixels("x"),g=this.attribute("height").Length.toPixels("y"),j=b.attribute("mask").value;b.attribute("mask").value=
+"";var h=document.createElement("canvas");h.width=c+f;h.height=e+g;var l=h.getContext("2d");this.renderChildren(l);var o=document.createElement("canvas");o.width=c+f;o.height=e+g;var n=o.getContext("2d");b.render(n);n.globalCompositeOperation="destination-in";n.fillStyle=l.createPattern(h,"no-repeat");n.fillRect(0,0,c+f,e+g);a.fillStyle=n.createPattern(o,"no-repeat");a.fillRect(0,0,c+f,e+g);b.attribute("mask").value=j};this.render=function(){}};a.Element.mask.prototype=new a.Element.ElementBase;a.Element.clipPath=
+function(c){this.base=a.Element.ElementBase;this.base(c);this.apply=function(a){for(var b=0;b<this.children.length;b++)this.children[b].path&&(this.children[b].path(a),a.clip())};this.render=function(){}};a.Element.clipPath.prototype=new a.Element.ElementBase;a.Element.filter=function(c){this.base=a.Element.ElementBase;this.base(c);this.apply=function(a,b){var c=b.getBoundingBox(),e=this.attribute("x").Length.toPixels("x"),f=this.attribute("y").Length.toPixels("y");if(e==0||f==0)e=c.x1,f=c.y1;var g=
+this.attribute("width").Length.toPixels("x"),j=this.attribute("height").Length.toPixels("y");if(g==0||j==0)g=c.width(),j=c.height();c=b.style("filter").value;b.style("filter").value="";var h=0.2*g,l=0.2*j,o=document.createElement("canvas");o.width=g+2*h;o.height=j+2*l;var n=o.getContext("2d");n.translate(-e+h,-f+l);b.render(n);for(var q=0;q<this.children.length;q++)this.children[q].apply(n,0,0,g+2*h,j+2*l);a.drawImage(o,0,0,g+2*h,j+2*l,e-h,f-l,g+2*h,j+2*l);b.style("filter",!0).value=c};this.render=
+function(){}};a.Element.filter.prototype=new a.Element.ElementBase;a.Element.feGaussianBlur=function(c){function d(a,c,d,f,g){for(var j=0;j<g;j++)for(var h=0;h<f;h++)for(var l=a[j*f*4+h*4+3]/255,o=0;o<4;o++){for(var n=d[0]*(l==0?255:a[j*f*4+h*4+o])*(l==0||o==3?1:l),q=1;q<d.length;q++){var p=Math.max(h-q,0),m=a[j*f*4+p*4+3]/255,p=Math.min(h+q,f-1),p=a[j*f*4+p*4+3]/255,s=d[q],r;m==0?r=255:(r=Math.max(h-q,0),r=a[j*f*4+r*4+o]);m=r*(m==0||o==3?1:m);p==0?r=255:(r=Math.min(h+q,f-1),r=a[j*f*4+r*4+o]);n+=
+s*(m+r*(p==0||o==3?1:p))}c[h*g*4+j*4+o]=n}}this.base=a.Element.ElementBase;this.base(c);this.apply=function(a,c,e,f,g){var e=this.attribute("stdDeviation").numValue(),c=a.getImageData(0,0,f,g),e=Math.max(e,0.01),j=Math.ceil(e*4)+1;mask=[];for(var h=0;h<j;h++)mask[h]=Math.exp(-0.5*(h/e)*(h/e));e=mask;j=0;for(h=1;h<e.length;h++)j+=Math.abs(e[h]);j=2*j+Math.abs(e[0]);for(h=0;h<e.length;h++)e[h]/=j;tmp=[];d(c.data,tmp,e,f,g);d(tmp,c.data,e,g,f);a.clearRect(0,0,f,g);a.putImageData(c,0,0)}};a.Element.filter.prototype=
+new a.Element.feGaussianBlur;a.Element.title=function(){};a.Element.title.prototype=new a.Element.ElementBase;a.Element.desc=function(){};a.Element.desc.prototype=new a.Element.ElementBase;a.Element.MISSING=function(a){console.log("ERROR: Element '"+a.nodeName+"' not yet implemented.")};a.Element.MISSING.prototype=new a.Element.ElementBase;a.CreateElement=function(c){var d=c.nodeName.replace(/^[^:]+:/,""),d=d.replace(/\-/g,""),b=null,b=typeof a.Element[d]!="undefined"?new a.Element[d](c):new a.Element.MISSING(c);
+b.type=c.nodeName;return b};a.load=function(c,d){a.loadXml(c,a.ajax(d))};a.loadXml=function(c,d){a.loadXmlDoc(c,a.parseXml(d))};a.loadXmlDoc=function(c,d){a.init(c);var b=function(a){for(var b=c.canvas;b;)a.x-=b.offsetLeft,a.y-=b.offsetTop,b=b.offsetParent;window.scrollX&&(a.x+=window.scrollX);window.scrollY&&(a.y+=window.scrollY);return a};if(a.opts.ignoreMouse!=!0)c.canvas.onclick=function(c){c=b(new a.Point(c!=null?c.clientX:event.clientX,c!=null?c.clientY:event.clientY));a.Mouse.onclick(c.x,c.y)},
+c.canvas.onmousemove=function(c){c=b(new a.Point(c!=null?c.clientX:event.clientX,c!=null?c.clientY:event.clientY));a.Mouse.onmousemove(c.x,c.y)};var k=a.CreateElement(d.documentElement),e=k.root=!0,f=function(){a.ViewPort.Clear();c.canvas.parentNode&&a.ViewPort.SetCurrent(c.canvas.parentNode.clientWidth,c.canvas.parentNode.clientHeight);if(a.opts.ignoreDimensions!=!0){if(k.style("width").hasValue())c.canvas.width=k.style("width").Length.toPixels("x"),c.canvas.style.width=c.canvas.width+"px";if(k.style("height").hasValue())c.canvas.height=
+k.style("height").Length.toPixels("y"),c.canvas.style.height=c.canvas.height+"px"}var b=c.canvas.clientWidth||c.canvas.width,d=c.canvas.clientHeight||c.canvas.height;a.ViewPort.SetCurrent(b,d);if(a.opts!=null&&a.opts.offsetX!=null)k.attribute("x",!0).value=a.opts.offsetX;if(a.opts!=null&&a.opts.offsetY!=null)k.attribute("y",!0).value=a.opts.offsetY;if(a.opts!=null&&a.opts.scaleWidth!=null&&a.opts.scaleHeight!=null){var f=1,g=1;k.attribute("width").hasValue()&&(f=k.attribute("width").Length.toPixels("x")/
+a.opts.scaleWidth);k.attribute("height").hasValue()&&(g=k.attribute("height").Length.toPixels("y")/a.opts.scaleHeight);k.attribute("width",!0).value=a.opts.scaleWidth;k.attribute("height",!0).value=a.opts.scaleHeight;k.attribute("viewBox",!0).value="0 0 "+b*f+" "+d*g;k.attribute("preserveAspectRatio",!0).value="none"}a.opts.ignoreClear!=!0&&c.clearRect(0,0,b,d);k.render(c);e&&(e=!1,a.opts!=null&&typeof a.opts.renderCallback=="function"&&a.opts.renderCallback())},g=!0;a.ImagesLoaded()&&(g=!1,f());
+a.intervalID=setInterval(function(){var b=!1;g&&a.ImagesLoaded()&&(g=!1,b=!0);a.opts.ignoreMouse!=!0&&(b|=a.Mouse.hasEvents());if(a.opts.ignoreAnimation!=!0)for(var c=0;c<a.Animations.length;c++)b|=a.Animations[c].update(1E3/a.FRAMERATE);a.opts!=null&&typeof a.opts.forceRedraw=="function"&&a.opts.forceRedraw()==!0&&(b=!0);b&&(f(),a.Mouse.runEvents())},1E3/a.FRAMERATE)};a.stop=function(){a.intervalID&&clearInterval(a.intervalID)};a.Mouse=new function(){this.events=[];this.hasEvents=function(){return this.events.length!=
+0};this.onclick=function(a,d){this.events.push({type:"onclick",x:a,y:d,run:function(a){if(a.onclick)a.onclick()}})};this.onmousemove=function(a,d){this.events.push({type:"onmousemove",x:a,y:d,run:function(a){if(a.onmousemove)a.onmousemove()}})};this.eventElements=[];this.checkPath=function(a,d){for(var b=0;b<this.events.length;b++){var k=this.events[b];d.isPointInPath&&d.isPointInPath(k.x,k.y)&&(this.eventElements[b]=a)}};this.checkBoundingBox=function(a,d){for(var b=0;b<this.events.length;b++){var k=
+this.events[b];d.isPointInBox(k.x,k.y)&&(this.eventElements[b]=a)}};this.runEvents=function(){a.ctx.canvas.style.cursor="";for(var c=0;c<this.events.length;c++)for(var d=this.events[c],b=this.eventElements[c];b;)d.run(b),b=b.parent;this.events=[];this.eventElements=[]}};return a}this.canvg=function(a,c,d){if(a==null&&c==null&&d==null)for(var c=document.getElementsByTagName("svg"),b=0;b<c.length;b++){a=c[b];d=document.createElement("canvas");d.width=a.clientWidth;d.height=a.clientHeight;a.parentNode.insertBefore(d,
+a);a.parentNode.removeChild(a);var k=document.createElement("div");k.appendChild(a);canvg(d,k.innerHTML)}else d=d||{},typeof a=="string"&&(a=document.getElementById(a)),a.svg==null?(b=m(),a.svg=b):(b=a.svg,b.stop()),b.opts=d,a=a.getContext("2d"),typeof c.documentElement!="undefined"?b.loadXmlDoc(a,c):c.substr(0,1)=="<"?b.loadXml(a,c):b.load(a,c)}})();
+if(CanvasRenderingContext2D)CanvasRenderingContext2D.prototype.drawSvg=function(m,a,c,d,b){canvg(this.canvas,m,{ignoreMouse:!0,ignoreAnimation:!0,ignoreDimensions:!0,ignoreClear:!0,offsetX:a,offsetY:c,scaleWidth:d,scaleHeight:b})};
+(function(m){var a=m.css,c=m.CanVGRenderer,d=m.SVGRenderer,b=m.extend,k=m.merge,e=m.addEvent,f=m.createElement,g=m.discardElement;b(c.prototype,d.prototype);b(c.prototype,{create:function(a,b,c,d){this.setContainer(b,c,d);this.configure(a)},setContainer:function(a,b,c){var d=a.style,e=a.parentNode,g=d.left,d=d.top,k=a.offsetWidth,m=a.offsetHeight,s={visibility:"hidden",position:"absolute"};this.init.apply(this,[a,b,c]);this.canvas=f("canvas",{width:k,height:m},{position:"relative",left:g,top:d},a);
+this.ttLine=f("div",null,s,e);this.ttDiv=f("div",null,s,e);this.ttTimer=void 0;this.hiddenSvg=a=f("div",{width:k,height:m},{visibility:"hidden",left:g,top:d},e);a.appendChild(this.box)},configure:function(b){var c=this,d=b.options.tooltip,f=d.borderWidth,g=c.ttDiv,m=d.style,p=c.ttLine,t=parseInt(m.padding,10),m=k(m,{padding:t+"px","background-color":d.backgroundColor,"border-style":"solid","border-width":f+"px","border-radius":d.borderRadius+"px"});d.shadow&&(m=k(m,{"box-shadow":"1px 1px 3px gray",
+"-webkit-box-shadow":"1px 1px 3px gray"}));a(g,m);a(p,{"border-left":"1px solid darkgray"});e(b,"tooltipRefresh",function(d){var e=b.container,f=e.offsetLeft,e=e.offsetTop,k;g.innerHTML=d.text;k=b.tooltip.getPosition(g.offsetWidth,g.offsetHeight,{plotX:d.x,plotY:d.y});a(g,{visibility:"visible",left:k.x+"px",top:k.y+"px","border-color":d.borderColor});a(p,{visibility:"visible",left:f+d.x+"px",top:e+b.plotTop+"px",height:b.plotHeight+"px"});c.ttTimer!==void 0&&clearTimeout(c.ttTimer);c.ttTimer=setTimeout(function(){a(g,
+{visibility:"hidden"});a(p,{visibility:"hidden"})},3E3)})},destroy:function(){g(this.canvas);this.ttTimer!==void 0&&clearTimeout(this.ttTimer);g(this.ttLine);g(this.ttDiv);g(this.hiddenSvg);return d.prototype.destroy.apply(this)},color:function(a,b,c){a&&a.linearGradient&&(a=a.stops[a.stops.length-1][1]);return d.prototype.color.call(this,a,b,c)},draw:function(){window.canvg(this.canvas,this.hiddenSvg.innerHTML)}})})(Highcharts);
diff --git a/management/guns-admin/src/main/webapp/static/js/plugins/highcharts/modules/canvas-tools.src.js b/management/guns-admin/src/main/webapp/static/js/plugins/highcharts/modules/canvas-tools.src.js
new file mode 100644
index 0000000..2a5ed34
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/static/js/plugins/highcharts/modules/canvas-tools.src.js
@@ -0,0 +1,3113 @@
+/**
+ * @license A class to parse color values
+ * @author Stoyan Stefanov <sstoo@gmail.com>
+ * @link http://www.phpied.com/rgb-color-parser-in-javascript/
+ * Use it if you like it
+ *
+ */
+function RGBColor(color_string)
+{
+ this.ok = false;
+
+ // strip any leading #
+ if (color_string.charAt(0) == '#') { // remove # if any
+ color_string = color_string.substr(1,6);
+ }
+
+ color_string = color_string.replace(/ /g,'');
+ color_string = color_string.toLowerCase();
+
+ // before getting into regexps, try simple matches
+ // and overwrite the input
+ var simple_colors = {
+ aliceblue: 'f0f8ff',
+ antiquewhite: 'faebd7',
+ aqua: '00ffff',
+ aquamarine: '7fffd4',
+ azure: 'f0ffff',
+ beige: 'f5f5dc',
+ bisque: 'ffe4c4',
+ black: '000000',
+ blanchedalmond: 'ffebcd',
+ blue: '0000ff',
+ blueviolet: '8a2be2',
+ brown: 'a52a2a',
+ burlywood: 'deb887',
+ cadetblue: '5f9ea0',
+ chartreuse: '7fff00',
+ chocolate: 'd2691e',
+ coral: 'ff7f50',
+ cornflowerblue: '6495ed',
+ cornsilk: 'fff8dc',
+ crimson: 'dc143c',
+ cyan: '00ffff',
+ darkblue: '00008b',
+ darkcyan: '008b8b',
+ darkgoldenrod: 'b8860b',
+ darkgray: 'a9a9a9',
+ darkgreen: '006400',
+ darkkhaki: 'bdb76b',
+ darkmagenta: '8b008b',
+ darkolivegreen: '556b2f',
+ darkorange: 'ff8c00',
+ darkorchid: '9932cc',
+ darkred: '8b0000',
+ darksalmon: 'e9967a',
+ darkseagreen: '8fbc8f',
+ darkslateblue: '483d8b',
+ darkslategray: '2f4f4f',
+ darkturquoise: '00ced1',
+ darkviolet: '9400d3',
+ deeppink: 'ff1493',
+ deepskyblue: '00bfff',
+ dimgray: '696969',
+ dodgerblue: '1e90ff',
+ feldspar: 'd19275',
+ firebrick: 'b22222',
+ floralwhite: 'fffaf0',
+ forestgreen: '228b22',
+ fuchsia: 'ff00ff',
+ gainsboro: 'dcdcdc',
+ ghostwhite: 'f8f8ff',
+ gold: 'ffd700',
+ goldenrod: 'daa520',
+ gray: '808080',
+ green: '008000',
+ greenyellow: 'adff2f',
+ honeydew: 'f0fff0',
+ hotpink: 'ff69b4',
+ indianred : 'cd5c5c',
+ indigo : '4b0082',
+ ivory: 'fffff0',
+ khaki: 'f0e68c',
+ lavender: 'e6e6fa',
+ lavenderblush: 'fff0f5',
+ lawngreen: '7cfc00',
+ lemonchiffon: 'fffacd',
+ lightblue: 'add8e6',
+ lightcoral: 'f08080',
+ lightcyan: 'e0ffff',
+ lightgoldenrodyellow: 'fafad2',
+ lightgrey: 'd3d3d3',
+ lightgreen: '90ee90',
+ lightpink: 'ffb6c1',
+ lightsalmon: 'ffa07a',
+ lightseagreen: '20b2aa',
+ lightskyblue: '87cefa',
+ lightslateblue: '8470ff',
+ lightslategray: '778899',
+ lightsteelblue: 'b0c4de',
+ lightyellow: 'ffffe0',
+ lime: '00ff00',
+ limegreen: '32cd32',
+ linen: 'faf0e6',
+ magenta: 'ff00ff',
+ maroon: '800000',
+ mediumaquamarine: '66cdaa',
+ mediumblue: '0000cd',
+ mediumorchid: 'ba55d3',
+ mediumpurple: '9370d8',
+ mediumseagreen: '3cb371',
+ mediumslateblue: '7b68ee',
+ mediumspringgreen: '00fa9a',
+ mediumturquoise: '48d1cc',
+ mediumvioletred: 'c71585',
+ midnightblue: '191970',
+ mintcream: 'f5fffa',
+ mistyrose: 'ffe4e1',
+ moccasin: 'ffe4b5',
+ navajowhite: 'ffdead',
+ navy: '000080',
+ oldlace: 'fdf5e6',
+ olive: '808000',
+ olivedrab: '6b8e23',
+ orange: 'ffa500',
+ orangered: 'ff4500',
+ orchid: 'da70d6',
+ palegoldenrod: 'eee8aa',
+ palegreen: '98fb98',
+ paleturquoise: 'afeeee',
+ palevioletred: 'd87093',
+ papayawhip: 'ffefd5',
+ peachpuff: 'ffdab9',
+ peru: 'cd853f',
+ pink: 'ffc0cb',
+ plum: 'dda0dd',
+ powderblue: 'b0e0e6',
+ purple: '800080',
+ red: 'ff0000',
+ rosybrown: 'bc8f8f',
+ royalblue: '4169e1',
+ saddlebrown: '8b4513',
+ salmon: 'fa8072',
+ sandybrown: 'f4a460',
+ seagreen: '2e8b57',
+ seashell: 'fff5ee',
+ sienna: 'a0522d',
+ silver: 'c0c0c0',
+ skyblue: '87ceeb',
+ slateblue: '6a5acd',
+ slategray: '708090',
+ snow: 'fffafa',
+ springgreen: '00ff7f',
+ steelblue: '4682b4',
+ tan: 'd2b48c',
+ teal: '008080',
+ thistle: 'd8bfd8',
+ tomato: 'ff6347',
+ turquoise: '40e0d0',
+ violet: 'ee82ee',
+ violetred: 'd02090',
+ wheat: 'f5deb3',
+ white: 'ffffff',
+ whitesmoke: 'f5f5f5',
+ yellow: 'ffff00',
+ yellowgreen: '9acd32'
+ };
+ for (var key in simple_colors) {
+ if (color_string == key) {
+ color_string = simple_colors[key];
+ }
+ }
+ // emd of simple type-in colors
+
+ // array of color definition objects
+ var color_defs = [
+ {
+ re: /^rgb\((\d{1,3}),\s*(\d{1,3}),\s*(\d{1,3})\)$/,
+ example: ['rgb(123, 234, 45)', 'rgb(255,234,245)'],
+ process: function (bits){
+ return [
+ parseInt(bits[1]),
+ parseInt(bits[2]),
+ parseInt(bits[3])
+ ];
+ }
+ },
+ {
+ re: /^(\w{2})(\w{2})(\w{2})$/,
+ example: ['#00ff00', '336699'],
+ process: function (bits){
+ return [
+ parseInt(bits[1], 16),
+ parseInt(bits[2], 16),
+ parseInt(bits[3], 16)
+ ];
+ }
+ },
+ {
+ re: /^(\w{1})(\w{1})(\w{1})$/,
+ example: ['#fb0', 'f0f'],
+ process: function (bits){
+ return [
+ parseInt(bits[1] + bits[1], 16),
+ parseInt(bits[2] + bits[2], 16),
+ parseInt(bits[3] + bits[3], 16)
+ ];
+ }
+ }
+ ];
+
+ // search through the definitions to find a match
+ for (var i = 0; i < color_defs.length; i++) {
+ var re = color_defs[i].re;
+ var processor = color_defs[i].process;
+ var bits = re.exec(color_string);
+ if (bits) {
+ channels = processor(bits);
+ this.r = channels[0];
+ this.g = channels[1];
+ this.b = channels[2];
+ this.ok = true;
+ }
+
+ }
+
+ // validate/cleanup values
+ this.r = (this.r < 0 || isNaN(this.r)) ? 0 : ((this.r > 255) ? 255 : this.r);
+ this.g = (this.g < 0 || isNaN(this.g)) ? 0 : ((this.g > 255) ? 255 : this.g);
+ this.b = (this.b < 0 || isNaN(this.b)) ? 0 : ((this.b > 255) ? 255 : this.b);
+
+ // some getters
+ this.toRGB = function () {
+ return 'rgb(' + this.r + ', ' + this.g + ', ' + this.b + ')';
+ }
+ this.toHex = function () {
+ var r = this.r.toString(16);
+ var g = this.g.toString(16);
+ var b = this.b.toString(16);
+ if (r.length == 1) r = '0' + r;
+ if (g.length == 1) g = '0' + g;
+ if (b.length == 1) b = '0' + b;
+ return '#' + r + g + b;
+ }
+
+ // help
+ this.getHelpXML = function () {
+
+ var examples = new Array();
+ // add regexps
+ for (var i = 0; i < color_defs.length; i++) {
+ var example = color_defs[i].example;
+ for (var j = 0; j < example.length; j++) {
+ examples[examples.length] = example[j];
+ }
+ }
+ // add type-in colors
+ for (var sc in simple_colors) {
+ examples[examples.length] = sc;
+ }
+
+ var xml = document.createElement('ul');
+ xml.setAttribute('id', 'rgbcolor-examples');
+ for (var i = 0; i < examples.length; i++) {
+ try {
+ var list_item = document.createElement('li');
+ var list_color = new RGBColor(examples[i]);
+ var example_div = document.createElement('div');
+ example_div.style.cssText =
+ 'margin: 3px; '
+ + 'border: 1px solid black; '
+ + 'background:' + list_color.toHex() + '; '
+ + 'color:' + list_color.toHex()
+ ;
+ example_div.appendChild(document.createTextNode('test'));
+ var list_item_value = document.createTextNode(
+ ' ' + examples[i] + ' -> ' + list_color.toRGB() + ' -> ' + list_color.toHex()
+ );
+ list_item.appendChild(example_div);
+ list_item.appendChild(list_item_value);
+ xml.appendChild(list_item);
+
+ } catch(e){}
+ }
+ return xml;
+
+ }
+
+}
+
+/**
+ * @license canvg.js - Javascript SVG parser and renderer on Canvas
+ * MIT Licensed
+ * Gabe Lerner (gabelerner@gmail.com)
+ * http://code.google.com/p/canvg/
+ *
+ * Requires: rgbcolor.js - http://www.phpied.com/rgb-color-parser-in-javascript/
+ *
+ */
+if(!window.console) {
+ window.console = {};
+ window.console.log = function(str) {};
+ window.console.dir = function(str) {};
+}
+
+if(!Array.prototype.indexOf){
+ Array.prototype.indexOf = function(obj){
+ for(var i=0; i<this.length; i++){
+ if(this[i]==obj){
+ return i;
+ }
+ }
+ return -1;
+ }
+}
+
+(function(){
+ // canvg(target, s)
+ // empty parameters: replace all 'svg' elements on page with 'canvas' elements
+ // target: canvas element or the id of a canvas element
+ // s: svg string, url to svg file, or xml document
+ // opts: optional hash of options
+ // ignoreMouse: true => ignore mouse events
+ // ignoreAnimation: true => ignore animations
+ // ignoreDimensions: true => does not try to resize canvas
+ // ignoreClear: true => does not clear canvas
+ // offsetX: int => draws at a x offset
+ // offsetY: int => draws at a y offset
+ // scaleWidth: int => scales horizontally to width
+ // scaleHeight: int => scales vertically to height
+ // renderCallback: function => will call the function after the first render is completed
+ // forceRedraw: function => will call the function on every frame, if it returns true, will redraw
+ this.canvg = function (target, s, opts) {
+ // no parameters
+ if (target == null && s == null && opts == null) {
+ var svgTags = document.getElementsByTagName('svg');
+ for (var i=0; i<svgTags.length; i++) {
+ var svgTag = svgTags[i];
+ var c = document.createElement('canvas');
+ c.width = svgTag.clientWidth;
+ c.height = svgTag.clientHeight;
+ svgTag.parentNode.insertBefore(c, svgTag);
+ svgTag.parentNode.removeChild(svgTag);
+ var div = document.createElement('div');
+ div.appendChild(svgTag);
+ canvg(c, div.innerHTML);
+ }
+ return;
+ }
+ opts = opts || {};
+
+ if (typeof target == 'string') {
+ target = document.getElementById(target);
+ }
+
+ // reuse class per canvas
+ var svg;
+ if (target.svg == null) {
+ svg = build();
+ target.svg = svg;
+ }
+ else {
+ svg = target.svg;
+ svg.stop();
+ }
+ svg.opts = opts;
+
+ var ctx = target.getContext('2d');
+ if (typeof(s.documentElement) != 'undefined') {
+ // load from xml doc
+ svg.loadXmlDoc(ctx, s);
+ }
+ else if (s.substr(0,1) == '<') {
+ // load from xml string
+ svg.loadXml(ctx, s);
+ }
+ else {
+ // load from url
+ svg.load(ctx, s);
+ }
+ }
+
+ function build() {
+ var svg = { };
+
+ svg.FRAMERATE = 30;
+ svg.MAX_VIRTUAL_PIXELS = 30000;
+
+ // globals
+ svg.init = function(ctx) {
+ svg.Definitions = {};
+ svg.Styles = {};
+ svg.Animations = [];
+ svg.Images = [];
+ svg.ctx = ctx;
+ svg.ViewPort = new (function () {
+ this.viewPorts = [];
+ this.Clear = function() { this.viewPorts = []; }
+ this.SetCurrent = function(width, height) { this.viewPorts.push({ width: width, height: height }); }
+ this.RemoveCurrent = function() { this.viewPorts.pop(); }
+ this.Current = function() { return this.viewPorts[this.viewPorts.length - 1]; }
+ this.width = function() { return this.Current().width; }
+ this.height = function() { return this.Current().height; }
+ this.ComputeSize = function(d) {
+ if (d != null && typeof(d) == 'number') return d;
+ if (d == 'x') return this.width();
+ if (d == 'y') return this.height();
+ return Math.sqrt(Math.pow(this.width(), 2) + Math.pow(this.height(), 2)) / Math.sqrt(2);
+ }
+ });
+ }
+ svg.init();
+
+ // images loaded
+ svg.ImagesLoaded = function() {
+ for (var i=0; i<svg.Images.length; i++) {
+ if (!svg.Images[i].loaded) return false;
+ }
+ return true;
+ }
+
+ // trim
+ svg.trim = function(s) { return s.replace(/^\s+|\s+$/g, ''); }
+
+ // compress spaces
+ svg.compressSpaces = function(s) { return s.replace(/[\s\r\t\n]+/gm,' '); }
+
+ // ajax
+ svg.ajax = function(url) {
+ var AJAX;
+ if(window.XMLHttpRequest){AJAX=new XMLHttpRequest();}
+ else{AJAX=new ActiveXObject('Microsoft.XMLHTTP');}
+ if(AJAX){
+ AJAX.open('GET',url,false);
+ AJAX.send(null);
+ return AJAX.responseText;
+ }
+ return null;
+ }
+
+ // parse xml
+ svg.parseXml = function(xml) {
+ if (window.DOMParser)
+ {
+ var parser = new DOMParser();
+ return parser.parseFromString(xml, 'text/xml');
+ }
+ else
+ {
+ xml = xml.replace(/<!DOCTYPE svg[^>]*>/, '');
+ var xmlDoc = new ActiveXObject('Microsoft.XMLDOM');
+ xmlDoc.async = 'false';
+ xmlDoc.loadXML(xml);
+ return xmlDoc;
+ }
+ }
+
+ svg.Property = function(name, value) {
+ this.name = name;
+ this.value = value;
+
+ this.hasValue = function() {
+ return (this.value != null && this.value !== '');
+ }
+
+ // return the numerical value of the property
+ this.numValue = function() {
+ if (!this.hasValue()) return 0;
+
+ var n = parseFloat(this.value);
+ if ((this.value + '').match(/%$/)) {
+ n = n / 100.0;
+ }
+ return n;
+ }
+
+ this.valueOrDefault = function(def) {
+ if (this.hasValue()) return this.value;
+ return def;
+ }
+
+ this.numValueOrDefault = function(def) {
+ if (this.hasValue()) return this.numValue();
+ return def;
+ }
+
+ /* EXTENSIONS */
+ var that = this;
+
+ // color extensions
+ this.Color = {
+ // augment the current color value with the opacity
+ addOpacity: function(opacity) {
+ var newValue = that.value;
+ if (opacity != null && opacity != '') {
+ var color = new RGBColor(that.value);
+ if (color.ok) {
+ newValue = 'rgba(' + color.r + ', ' + color.g + ', ' + color.b + ', ' + opacity + ')';
+ }
+ }
+ return new svg.Property(that.name, newValue);
+ }
+ }
+
+ // definition extensions
+ this.Definition = {
+ // get the definition from the definitions table
+ getDefinition: function() {
+ var name = that.value.replace(/^(url\()?#([^\)]+)\)?$/, '$2');
+ return svg.Definitions[name];
+ },
+
+ isUrl: function() {
+ return that.value.indexOf('url(') == 0
+ },
+
+ getFillStyle: function(e) {
+ var def = this.getDefinition();
+
+ // gradient
+ if (def != null && def.createGradient) {
+ return def.createGradient(svg.ctx, e);
+ }
+
+ // pattern
+ if (def != null && def.createPattern) {
+ return def.createPattern(svg.ctx, e);
+ }
+
+ return null;
+ }
+ }
+
+ // length extensions
+ this.Length = {
+ DPI: function(viewPort) {
+ return 96.0; // : compute?
+ },
+
+ EM: function(viewPort) {
+ var em = 12;
+
+ var fontSize = new svg.Property('fontSize', svg.Font.Parse(svg.ctx.font).fontSize);
+ if (fontSize.hasValue()) em = fontSize.Length.toPixels(viewPort);
+
+ return em;
+ },
+
+ // get the length as pixels
+ toPixels: function(viewPort) {
+ if (!that.hasValue()) return 0;
+ var s = that.value+'';
+ if (s.match(/em$/)) return that.numValue() * this.EM(viewPort);
+ if (s.match(/ex$/)) return that.numValue() * this.EM(viewPort) / 2.0;
+ if (s.match(/px$/)) return that.numValue();
+ if (s.match(/pt$/)) return that.numValue() * 1.25;
+ if (s.match(/pc$/)) return that.numValue() * 15;
+ if (s.match(/cm$/)) return that.numValue() * this.DPI(viewPort) / 2.54;
+ if (s.match(/mm$/)) return that.numValue() * this.DPI(viewPort) / 25.4;
+ if (s.match(/in$/)) return that.numValue() * this.DPI(viewPort);
+ if (s.match(/%$/)) return that.numValue() * svg.ViewPort.ComputeSize(viewPort);
+ return that.numValue();
+ }
+ }
+
+ // time extensions
+ this.Time = {
+ // get the time as milliseconds
+ toMilliseconds: function() {
+ if (!that.hasValue()) return 0;
+ var s = that.value+'';
+ if (s.match(/s$/)) return that.numValue() * 1000;
+ if (s.match(/ms$/)) return that.numValue();
+ return that.numValue();
+ }
+ }
+
+ // angle extensions
+ this.Angle = {
+ // get the angle as radians
+ toRadians: function() {
+ if (!that.hasValue()) return 0;
+ var s = that.value+'';
+ if (s.match(/deg$/)) return that.numValue() * (Math.PI / 180.0);
+ if (s.match(/grad$/)) return that.numValue() * (Math.PI / 200.0);
+ if (s.match(/rad$/)) return that.numValue();
+ return that.numValue() * (Math.PI / 180.0);
+ }
+ }
+ }
+
+ // fonts
+ svg.Font = new (function() {
+ this.Styles = ['normal','italic','oblique','inherit'];
+ this.Variants = ['normal','small-caps','inherit'];
+ this.Weights = ['normal','bold','bolder','lighter','100','200','300','400','500','600','700','800','900','inherit'];
+
+ this.CreateFont = function(fontStyle, fontVariant, fontWeight, fontSize, fontFamily, inherit) {
+ var f = inherit != null ? this.Parse(inherit) : this.CreateFont('', '', '', '', '', svg.ctx.font);
+ return {
+ fontFamily: fontFamily || f.fontFamily,
+ fontSize: fontSize || f.fontSize,
+ fontStyle: fontStyle || f.fontStyle,
+ fontWeight: fontWeight || f.fontWeight,
+ fontVariant: fontVariant || f.fontVariant,
+ toString: function () { return [this.fontStyle, this.fontVariant, this.fontWeight, this.fontSize, this.fontFamily].join(' ') }
+ }
+ }
+
+ var that = this;
+ this.Parse = function(s) {
+ var f = {};
+ var d = svg.trim(svg.compressSpaces(s || '')).split(' ');
+ var set = { fontSize: false, fontStyle: false, fontWeight: false, fontVariant: false }
+ var ff = '';
+ for (var i=0; i<d.length; i++) {
+ if (!set.fontStyle && that.Styles.indexOf(d[i]) != -1) { if (d[i] != 'inherit') f.fontStyle = d[i]; set.fontStyle = true; }
+ else if (!set.fontVariant && that.Variants.indexOf(d[i]) != -1) { if (d[i] != 'inherit') f.fontVariant = d[i]; set.fontStyle = set.fontVariant = true; }
+ else if (!set.fontWeight && that.Weights.indexOf(d[i]) != -1) { if (d[i] != 'inherit') f.fontWeight = d[i]; set.fontStyle = set.fontVariant = set.fontWeight = true; }
+ else if (!set.fontSize) { if (d[i] != 'inherit') f.fontSize = d[i].split('/')[0]; set.fontStyle = set.fontVariant = set.fontWeight = set.fontSize = true; }
+ else { if (d[i] != 'inherit') ff += d[i]; }
+ } if (ff != '') f.fontFamily = ff;
+ return f;
+ }
+ });
+
+ // points and paths
+ svg.ToNumberArray = function(s) {
+ var a = svg.trim(svg.compressSpaces((s || '').replace(/,/g, ' '))).split(' ');
+ for (var i=0; i<a.length; i++) {
+ a[i] = parseFloat(a[i]);
+ }
+ return a;
+ }
+ svg.Point = function(x, y) {
+ this.x = x;
+ this.y = y;
+
+ this.angleTo = function(p) {
+ return Math.atan2(p.y - this.y, p.x - this.x);
+ }
+
+ this.applyTransform = function(v) {
+ var xp = this.x * v[0] + this.y * v[2] + v[4];
+ var yp = this.x * v[1] + this.y * v[3] + v[5];
+ this.x = xp;
+ this.y = yp;
+ }
+ }
+ svg.CreatePoint = function(s) {
+ var a = svg.ToNumberArray(s);
+ return new svg.Point(a[0], a[1]);
+ }
+ svg.CreatePath = function(s) {
+ var a = svg.ToNumberArray(s);
+ var path = [];
+ for (var i=0; i<a.length; i+=2) {
+ path.push(new svg.Point(a[i], a[i+1]));
+ }
+ return path;
+ }
+
+ // bounding box
+ svg.BoundingBox = function(x1, y1, x2, y2) { // pass in initial points if you want
+ this.x1 = Number.NaN;
+ this.y1 = Number.NaN;
+ this.x2 = Number.NaN;
+ this.y2 = Number.NaN;
+
+ this.x = function() { return this.x1; }
+ this.y = function() { return this.y1; }
+ this.width = function() { return this.x2 - this.x1; }
+ this.height = function() { return this.y2 - this.y1; }
+
+ this.addPoint = function(x, y) {
+ if (x != null) {
+ if (isNaN(this.x1) || isNaN(this.x2)) {
+ this.x1 = x;
+ this.x2 = x;
+ }
+ if (x < this.x1) this.x1 = x;
+ if (x > this.x2) this.x2 = x;
+ }
+
+ if (y != null) {
+ if (isNaN(this.y1) || isNaN(this.y2)) {
+ this.y1 = y;
+ this.y2 = y;
+ }
+ if (y < this.y1) this.y1 = y;
+ if (y > this.y2) this.y2 = y;
+ }
+ }
+ this.addX = function(x) { this.addPoint(x, null); }
+ this.addY = function(y) { this.addPoint(null, y); }
+
+ this.addBoundingBox = function(bb) {
+ this.addPoint(bb.x1, bb.y1);
+ this.addPoint(bb.x2, bb.y2);
+ }
+
+ this.addQuadraticCurve = function(p0x, p0y, p1x, p1y, p2x, p2y) {
+ var cp1x = p0x + 2/3 * (p1x - p0x); // CP1 = QP0 + 2/3 *(QP1-QP0)
+ var cp1y = p0y + 2/3 * (p1y - p0y); // CP1 = QP0 + 2/3 *(QP1-QP0)
+ var cp2x = cp1x + 1/3 * (p2x - p0x); // CP2 = CP1 + 1/3 *(QP2-QP0)
+ var cp2y = cp1y + 1/3 * (p2y - p0y); // CP2 = CP1 + 1/3 *(QP2-QP0)
+ this.addBezierCurve(p0x, p0y, cp1x, cp2x, cp1y, cp2y, p2x, p2y);
+ }
+
+ this.addBezierCurve = function(p0x, p0y, p1x, p1y, p2x, p2y, p3x, p3y) {
+ // from http://blog.hackers-cafe.net/2009/06/how-to-calculate-bezier-curves-bounding.html
+ var p0 = [p0x, p0y], p1 = [p1x, p1y], p2 = [p2x, p2y], p3 = [p3x, p3y];
+ this.addPoint(p0[0], p0[1]);
+ this.addPoint(p3[0], p3[1]);
+
+ for (i=0; i<=1; i++) {
+ var f = function(t) {
+ return Math.pow(1-t, 3) * p0[i]
+ + 3 * Math.pow(1-t, 2) * t * p1[i]
+ + 3 * (1-t) * Math.pow(t, 2) * p2[i]
+ + Math.pow(t, 3) * p3[i];
+ }
+
+ var b = 6 * p0[i] - 12 * p1[i] + 6 * p2[i];
+ var a = -3 * p0[i] + 9 * p1[i] - 9 * p2[i] + 3 * p3[i];
+ var c = 3 * p1[i] - 3 * p0[i];
+
+ if (a == 0) {
+ if (b == 0) continue;
+ var t = -c / b;
+ if (0 < t && t < 1) {
+ if (i == 0) this.addX(f(t));
+ if (i == 1) this.addY(f(t));
+ }
+ continue;
+ }
+
+ var b2ac = Math.pow(b, 2) - 4 * c * a;
+ if (b2ac < 0) continue;
+ var t1 = (-b + Math.sqrt(b2ac)) / (2 * a);
+ if (0 < t1 && t1 < 1) {
+ if (i == 0) this.addX(f(t1));
+ if (i == 1) this.addY(f(t1));
+ }
+ var t2 = (-b - Math.sqrt(b2ac)) / (2 * a);
+ if (0 < t2 && t2 < 1) {
+ if (i == 0) this.addX(f(t2));
+ if (i == 1) this.addY(f(t2));
+ }
+ }
+ }
+
+ this.isPointInBox = function(x, y) {
+ return (this.x1 <= x && x <= this.x2 && this.y1 <= y && y <= this.y2);
+ }
+
+ this.addPoint(x1, y1);
+ this.addPoint(x2, y2);
+ }
+
+ // transforms
+ svg.Transform = function(v) {
+ var that = this;
+ this.Type = {}
+
+ // translate
+ this.Type.translate = function(s) {
+ this.p = svg.CreatePoint(s);
+ this.apply = function(ctx) {
+ ctx.translate(this.p.x || 0.0, this.p.y || 0.0);
+ }
+ this.applyToPoint = function(p) {
+ p.applyTransform([1, 0, 0, 1, this.p.x || 0.0, this.p.y || 0.0]);
+ }
+ }
+
+ // rotate
+ this.Type.rotate = function(s) {
+ var a = svg.ToNumberArray(s);
+ this.angle = new svg.Property('angle', a[0]);
+ this.cx = a[1] || 0;
+ this.cy = a[2] || 0;
+ this.apply = function(ctx) {
+ ctx.translate(this.cx, this.cy);
+ ctx.rotate(this.angle.Angle.toRadians());
+ ctx.translate(-this.cx, -this.cy);
+ }
+ this.applyToPoint = function(p) {
+ var a = this.angle.Angle.toRadians();
+ p.applyTransform([1, 0, 0, 1, this.p.x || 0.0, this.p.y || 0.0]);
+ p.applyTransform([Math.cos(a), Math.sin(a), -Math.sin(a), Math.cos(a), 0, 0]);
+ p.applyTransform([1, 0, 0, 1, -this.p.x || 0.0, -this.p.y || 0.0]);
+ }
+ }
+
+ this.Type.scale = function(s) {
+ this.p = svg.CreatePoint(s);
+ this.apply = function(ctx) {
+ ctx.scale(this.p.x || 1.0, this.p.y || this.p.x || 1.0);
+ }
+ this.applyToPoint = function(p) {
+ p.applyTransform([this.p.x || 0.0, 0, 0, this.p.y || 0.0, 0, 0]);
+ }
+ }
+
+ this.Type.matrix = function(s) {
+ this.m = svg.ToNumberArray(s);
+ this.apply = function(ctx) {
+ ctx.transform(this.m[0], this.m[1], this.m[2], this.m[3], this.m[4], this.m[5]);
+ }
+ this.applyToPoint = function(p) {
+ p.applyTransform(this.m);
+ }
+ }
+
+ this.Type.SkewBase = function(s) {
+ this.base = that.Type.matrix;
+ this.base(s);
+ this.angle = new svg.Property('angle', s);
+ }
+ this.Type.SkewBase.prototype = new this.Type.matrix;
+
+ this.Type.skewX = function(s) {
+ this.base = that.Type.SkewBase;
+ this.base(s);
+ this.m = [1, 0, Math.tan(this.angle.Angle.toRadians()), 1, 0, 0];
+ }
+ this.Type.skewX.prototype = new this.Type.SkewBase;
+
+ this.Type.skewY = function(s) {
+ this.base = that.Type.SkewBase;
+ this.base(s);
+ this.m = [1, Math.tan(this.angle.Angle.toRadians()), 0, 1, 0, 0];
+ }
+ this.Type.skewY.prototype = new this.Type.SkewBase;
+
+ this.transforms = [];
+
+ this.apply = function(ctx) {
+ for (var i=0; i<this.transforms.length; i++) {
+ this.transforms[i].apply(ctx);
+ }
+ }
+
+ this.applyToPoint = function(p) {
+ for (var i=0; i<this.transforms.length; i++) {
+ this.transforms[i].applyToPoint(p);
+ }
+ }
+
+ var data = svg.trim(svg.compressSpaces(v)).split(/\s(?=[a-z])/);
+ for (var i=0; i<data.length; i++) {
+ var type = data[i].split('(')[0];
+ var s = data[i].split('(')[1].replace(')','');
+ var transform = new this.Type[type](s);
+ this.transforms.push(transform);
+ }
+ }
+
+ // aspect ratio
+ svg.AspectRatio = function(ctx, aspectRatio, width, desiredWidth, height, desiredHeight, minX, minY, refX, refY) {
+ // aspect ratio - http://www.w3.org/TR/SVG/coords.html#PreserveAspectRatioAttribute
+ aspectRatio = svg.compressSpaces(aspectRatio);
+ aspectRatio = aspectRatio.replace(/^defer\s/,''); // ignore defer
+ var align = aspectRatio.split(' ')[0] || 'xMidYMid';
+ var meetOrSlice = aspectRatio.split(' ')[1] || 'meet';
+
+ // calculate scale
+ var scaleX = width / desiredWidth;
+ var scaleY = height / desiredHeight;
+ var scaleMin = Math.min(scaleX, scaleY);
+ var scaleMax = Math.max(scaleX, scaleY);
+ if (meetOrSlice == 'meet') { desiredWidth *= scaleMin; desiredHeight *= scaleMin; }
+ if (meetOrSlice == 'slice') { desiredWidth *= scaleMax; desiredHeight *= scaleMax; }
+
+ refX = new svg.Property('refX', refX);
+ refY = new svg.Property('refY', refY);
+ if (refX.hasValue() && refY.hasValue()) {
+ ctx.translate(-scaleMin * refX.Length.toPixels('x'), -scaleMin * refY.Length.toPixels('y'));
+ }
+ else {
+ // align
+ if (align.match(/^xMid/) && ((meetOrSlice == 'meet' && scaleMin == scaleY) || (meetOrSlice == 'slice' && scaleMax == scaleY))) ctx.translate(width / 2.0 - desiredWidth / 2.0, 0);
+ if (align.match(/YMid$/) && ((meetOrSlice == 'meet' && scaleMin == scaleX) || (meetOrSlice == 'slice' && scaleMax == scaleX))) ctx.translate(0, height / 2.0 - desiredHeight / 2.0);
+ if (align.match(/^xMax/) && ((meetOrSlice == 'meet' && scaleMin == scaleY) || (meetOrSlice == 'slice' && scaleMax == scaleY))) ctx.translate(width - desiredWidth, 0);
+ if (align.match(/YMax$/) && ((meetOrSlice == 'meet' && scaleMin == scaleX) || (meetOrSlice == 'slice' && scaleMax == scaleX))) ctx.translate(0, height - desiredHeight);
+ }
+
+ // scale
+ if (align == 'none') ctx.scale(scaleX, scaleY);
+ else if (meetOrSlice == 'meet') ctx.scale(scaleMin, scaleMin);
+ else if (meetOrSlice == 'slice') ctx.scale(scaleMax, scaleMax);
+
+ // translate
+ ctx.translate(minX == null ? 0 : -minX, minY == null ? 0 : -minY);
+ }
+
+ // elements
+ svg.Element = {}
+
+ svg.Element.ElementBase = function(node) {
+ this.attributes = {};
+ this.styles = {};
+ this.children = [];
+
+ // get or create attribute
+ this.attribute = function(name, createIfNotExists) {
+ var a = this.attributes[name];
+ if (a != null) return a;
+
+ a = new svg.Property(name, '');
+ if (createIfNotExists == true) this.attributes[name] = a;
+ return a;
+ }
+
+ // get or create style, crawls up node tree
+ this.style = function(name, createIfNotExists) {
+ var s = this.styles[name];
+ if (s != null) return s;
+
+ var a = this.attribute(name);
+ if (a != null && a.hasValue()) {
+ return a;
+ }
+
+ var p = this.parent;
+ if (p != null) {
+ var ps = p.style(name);
+ if (ps != null && ps.hasValue()) {
+ return ps;
+ }
+ }
+
+ s = new svg.Property(name, '');
+ if (createIfNotExists == true) this.styles[name] = s;
+ return s;
+ }
+
+ // base render
+ this.render = function(ctx) {
+ // don't render display=none
+ if (this.style('display').value == 'none') return;
+
+ // don't render visibility=hidden
+ if (this.attribute('visibility').value == 'hidden') return;
+
+ ctx.save();
+ this.setContext(ctx);
+ // mask
+ if (this.attribute('mask').hasValue()) {
+ var mask = this.attribute('mask').Definition.getDefinition();
+ if (mask != null) mask.apply(ctx, this);
+ }
+ else if (this.style('filter').hasValue()) {
+ var filter = this.style('filter').Definition.getDefinition();
+ if (filter != null) filter.apply(ctx, this);
+ }
+ else this.renderChildren(ctx);
+ this.clearContext(ctx);
+ ctx.restore();
+ }
+
+ // base set context
+ this.setContext = function(ctx) {
+ // OVERRIDE ME!
+ }
+
+ // base clear context
+ this.clearContext = function(ctx) {
+ // OVERRIDE ME!
+ }
+
+ // base render children
+ this.renderChildren = function(ctx) {
+ for (var i=0; i<this.children.length; i++) {
+ this.children[i].render(ctx);
+ }
+ }
+
+ this.addChild = function(childNode, create) {
+ var child = childNode;
+ if (create) child = svg.CreateElement(childNode);
+ child.parent = this;
+ this.children.push(child);
+ }
+
+ if (node != null && node.nodeType == 1) { //ELEMENT_NODE
+ // add children
+ for (var i=0; i<node.childNodes.length; i++) {
+ var childNode = node.childNodes[i];
+ if (childNode.nodeType == 1) this.addChild(childNode, true); //ELEMENT_NODE
+ }
+
+ // add attributes
+ for (var i=0; i<node.attributes.length; i++) {
+ var attribute = node.attributes[i];
+ this.attributes[attribute.nodeName] = new svg.Property(attribute.nodeName, attribute.nodeValue);
+ }
+
+ // add tag styles
+ var styles = svg.Styles[node.nodeName];
+ if (styles != null) {
+ for (var name in styles) {
+ this.styles[name] = styles[name];
+ }
+ }
+
+ // add class styles
+ if (this.attribute('class').hasValue()) {
+ var classes = svg.compressSpaces(this.attribute('class').value).split(' ');
+ for (var j=0; j<classes.length; j++) {
+ styles = svg.Styles['.'+classes[j]];
+ if (styles != null) {
+ for (var name in styles) {
+ this.styles[name] = styles[name];
+ }
+ }
+ styles = svg.Styles[node.nodeName+'.'+classes[j]];
+ if (styles != null) {
+ for (var name in styles) {
+ this.styles[name] = styles[name];
+ }
+ }
+ }
+ }
+
+ // add inline styles
+ if (this.attribute('style').hasValue()) {
+ var styles = this.attribute('style').value.split(';');
+ for (var i=0; i<styles.length; i++) {
+ if (svg.trim(styles[i]) != '') {
+ var style = styles[i].split(':');
+ var name = svg.trim(style[0]);
+ var value = svg.trim(style[1]);
+ this.styles[name] = new svg.Property(name, value);
+ }
+ }
+ }
+
+ // add id
+ if (this.attribute('id').hasValue()) {
+ if (svg.Definitions[this.attribute('id').value] == null) {
+ svg.Definitions[this.attribute('id').value] = this;
+ }
+ }
+ }
+ }
+
+ svg.Element.RenderedElementBase = function(node) {
+ this.base = svg.Element.ElementBase;
+ this.base(node);
+
+ this.setContext = function(ctx) {
+ // fill
+ if (this.style('fill').Definition.isUrl()) {
+ var fs = this.style('fill').Definition.getFillStyle(this);
+ if (fs != null) ctx.fillStyle = fs;
+ }
+ else if (this.style('fill').hasValue()) {
+ var fillStyle = this.style('fill');
+ if (this.style('fill-opacity').hasValue()) fillStyle = fillStyle.Color.addOpacity(this.style('fill-opacity').value);
+ ctx.fillStyle = (fillStyle.value == 'none' ? 'rgba(0,0,0,0)' : fillStyle.value);
+ }
+
+ // stroke
+ if (this.style('stroke').Definition.isUrl()) {
+ var fs = this.style('stroke').Definition.getFillStyle(this);
+ if (fs != null) ctx.strokeStyle = fs;
+ }
+ else if (this.style('stroke').hasValue()) {
+ var strokeStyle = this.style('stroke');
+ if (this.style('stroke-opacity').hasValue()) strokeStyle = strokeStyle.Color.addOpacity(this.style('stroke-opacity').value);
+ ctx.strokeStyle = (strokeStyle.value == 'none' ? 'rgba(0,0,0,0)' : strokeStyle.value);
+ }
+ if (this.style('stroke-width').hasValue()) ctx.lineWidth = this.style('stroke-width').Length.toPixels();
+ if (this.style('stroke-linecap').hasValue()) ctx.lineCap = this.style('stroke-linecap').value;
+ if (this.style('stroke-linejoin').hasValue()) ctx.lineJoin = this.style('stroke-linejoin').value;
+ if (this.style('stroke-miterlimit').hasValue()) ctx.miterLimit = this.style('stroke-miterlimit').value;
+
+ // font
+ if (typeof(ctx.font) != 'undefined') {
+ ctx.font = svg.Font.CreateFont(
+ this.style('font-style').value,
+ this.style('font-variant').value,
+ this.style('font-weight').value,
+ this.style('font-size').hasValue() ? this.style('font-size').Length.toPixels() + 'px' : '',
+ this.style('font-family').value).toString();
+ }
+
+ // transform
+ if (this.attribute('transform').hasValue()) {
+ var transform = new svg.Transform(this.attribute('transform').value);
+ transform.apply(ctx);
+ }
+
+ // clip
+ if (this.attribute('clip-path').hasValue()) {
+ var clip = this.attribute('clip-path').Definition.getDefinition();
+ if (clip != null) clip.apply(ctx);
+ }
+
+ // opacity
+ if (this.style('opacity').hasValue()) {
+ ctx.globalAlpha = this.style('opacity').numValue();
+ }
+ }
+ }
+ svg.Element.RenderedElementBase.prototype = new svg.Element.ElementBase;
+
+ svg.Element.PathElementBase = function(node) {
+ this.base = svg.Element.RenderedElementBase;
+ this.base(node);
+
+ this.path = function(ctx) {
+ if (ctx != null) ctx.beginPath();
+ return new svg.BoundingBox();
+ }
+
+ this.renderChildren = function(ctx) {
+ this.path(ctx);
+ svg.Mouse.checkPath(this, ctx);
+ if (ctx.fillStyle != '') ctx.fill();
+ if (ctx.strokeStyle != '') ctx.stroke();
+
+ var markers = this.getMarkers();
+ if (markers != null) {
+ if (this.style('marker-start').Definition.isUrl()) {
+ var marker = this.style('marker-start').Definition.getDefinition();
+ marker.render(ctx, markers[0][0], markers[0][1]);
+ }
+ if (this.style('marker-mid').Definition.isUrl()) {
+ var marker = this.style('marker-mid').Definition.getDefinition();
+ for (var i=1;i<markers.length-1;i++) {
+ marker.render(ctx, markers[i][0], markers[i][1]);
+ }
+ }
+ if (this.style('marker-end').Definition.isUrl()) {
+ var marker = this.style('marker-end').Definition.getDefinition();
+ marker.render(ctx, markers[markers.length-1][0], markers[markers.length-1][1]);
+ }
+ }
+ }
+
+ this.getBoundingBox = function() {
+ return this.path();
+ }
+
+ this.getMarkers = function() {
+ return null;
+ }
+ }
+ svg.Element.PathElementBase.prototype = new svg.Element.RenderedElementBase;
+
+ // svg element
+ svg.Element.svg = function(node) {
+ this.base = svg.Element.RenderedElementBase;
+ this.base(node);
+
+ this.baseClearContext = this.clearContext;
+ this.clearContext = function(ctx) {
+ this.baseClearContext(ctx);
+ svg.ViewPort.RemoveCurrent();
+ }
+
+ this.baseSetContext = this.setContext;
+ this.setContext = function(ctx) {
+ // initial values
+ ctx.strokeStyle = 'rgba(0,0,0,0)';
+ ctx.lineCap = 'butt';
+ ctx.lineJoin = 'miter';
+ ctx.miterLimit = 4;
+
+ this.baseSetContext(ctx);
+
+ // create new view port
+ if (this.attribute('x').hasValue() && this.attribute('y').hasValue()) {
+ ctx.translate(this.attribute('x').Length.toPixels('x'), this.attribute('y').Length.toPixels('y'));
+ }
+
+ var width = svg.ViewPort.width();
+ var height = svg.ViewPort.height();
+ if (typeof(this.root) == 'undefined' && this.attribute('width').hasValue() && this.attribute('height').hasValue()) {
+ width = this.attribute('width').Length.toPixels('x');
+ height = this.attribute('height').Length.toPixels('y');
+
+ var x = 0;
+ var y = 0;
+ if (this.attribute('refX').hasValue() && this.attribute('refY').hasValue()) {
+ x = -this.attribute('refX').Length.toPixels('x');
+ y = -this.attribute('refY').Length.toPixels('y');
+ }
+
+ ctx.beginPath();
+ ctx.moveTo(x, y);
+ ctx.lineTo(width, y);
+ ctx.lineTo(width, height);
+ ctx.lineTo(x, height);
+ ctx.closePath();
+ ctx.clip();
+ }
+ svg.ViewPort.SetCurrent(width, height);
+
+ // viewbox
+ if (this.attribute('viewBox').hasValue()) {
+ var viewBox = svg.ToNumberArray(this.attribute('viewBox').value);
+ var minX = viewBox[0];
+ var minY = viewBox[1];
+ width = viewBox[2];
+ height = viewBox[3];
+
+ svg.AspectRatio(ctx,
+ this.attribute('preserveAspectRatio').value,
+ svg.ViewPort.width(),
+ width,
+ svg.ViewPort.height(),
+ height,
+ minX,
+ minY,
+ this.attribute('refX').value,
+ this.attribute('refY').value);
+
+ svg.ViewPort.RemoveCurrent();
+ svg.ViewPort.SetCurrent(viewBox[2], viewBox[3]);
+ }
+ }
+ }
+ svg.Element.svg.prototype = new svg.Element.RenderedElementBase;
+
+ // rect element
+ svg.Element.rect = function(node) {
+ this.base = svg.Element.PathElementBase;
+ this.base(node);
+
+ this.path = function(ctx) {
+ var x = this.attribute('x').Length.toPixels('x');
+ var y = this.attribute('y').Length.toPixels('y');
+ var width = this.attribute('width').Length.toPixels('x');
+ var height = this.attribute('height').Length.toPixels('y');
+ var rx = this.attribute('rx').Length.toPixels('x');
+ var ry = this.attribute('ry').Length.toPixels('y');
+ if (this.attribute('rx').hasValue() && !this.attribute('ry').hasValue()) ry = rx;
+ if (this.attribute('ry').hasValue() && !this.attribute('rx').hasValue()) rx = ry;
+
+ if (ctx != null) {
+ ctx.beginPath();
+ ctx.moveTo(x + rx, y);
+ ctx.lineTo(x + width - rx, y);
+ ctx.quadraticCurveTo(x + width, y, x + width, y + ry)
+ ctx.lineTo(x + width, y + height - ry);
+ ctx.quadraticCurveTo(x + width, y + height, x + width - rx, y + height)
+ ctx.lineTo(x + rx, y + height);
+ ctx.quadraticCurveTo(x, y + height, x, y + height - ry)
+ ctx.lineTo(x, y + ry);
+ ctx.quadraticCurveTo(x, y, x + rx, y)
+ ctx.closePath();
+ }
+
+ return new svg.BoundingBox(x, y, x + width, y + height);
+ }
+ }
+ svg.Element.rect.prototype = new svg.Element.PathElementBase;
+
+ // circle element
+ svg.Element.circle = function(node) {
+ this.base = svg.Element.PathElementBase;
+ this.base(node);
+
+ this.path = function(ctx) {
+ var cx = this.attribute('cx').Length.toPixels('x');
+ var cy = this.attribute('cy').Length.toPixels('y');
+ var r = this.attribute('r').Length.toPixels();
+
+ if (ctx != null) {
+ ctx.beginPath();
+ ctx.arc(cx, cy, r, 0, Math.PI * 2, true);
+ ctx.closePath();
+ }
+
+ return new svg.BoundingBox(cx - r, cy - r, cx + r, cy + r);
+ }
+ }
+ svg.Element.circle.prototype = new svg.Element.PathElementBase;
+
+ // ellipse element
+ svg.Element.ellipse = function(node) {
+ this.base = svg.Element.PathElementBase;
+ this.base(node);
+
+ this.path = function(ctx) {
+ var KAPPA = 4 * ((Math.sqrt(2) - 1) / 3);
+ var rx = this.attribute('rx').Length.toPixels('x');
+ var ry = this.attribute('ry').Length.toPixels('y');
+ var cx = this.attribute('cx').Length.toPixels('x');
+ var cy = this.attribute('cy').Length.toPixels('y');
+
+ if (ctx != null) {
+ ctx.beginPath();
+ ctx.moveTo(cx, cy - ry);
+ ctx.bezierCurveTo(cx + (KAPPA * rx), cy - ry, cx + rx, cy - (KAPPA * ry), cx + rx, cy);
+ ctx.bezierCurveTo(cx + rx, cy + (KAPPA * ry), cx + (KAPPA * rx), cy + ry, cx, cy + ry);
+ ctx.bezierCurveTo(cx - (KAPPA * rx), cy + ry, cx - rx, cy + (KAPPA * ry), cx - rx, cy);
+ ctx.bezierCurveTo(cx - rx, cy - (KAPPA * ry), cx - (KAPPA * rx), cy - ry, cx, cy - ry);
+ ctx.closePath();
+ }
+
+ return new svg.BoundingBox(cx - rx, cy - ry, cx + rx, cy + ry);
+ }
+ }
+ svg.Element.ellipse.prototype = new svg.Element.PathElementBase;
+
+ // line element
+ svg.Element.line = function(node) {
+ this.base = svg.Element.PathElementBase;
+ this.base(node);
+
+ this.getPoints = function() {
+ return [
+ new svg.Point(this.attribute('x1').Length.toPixels('x'), this.attribute('y1').Length.toPixels('y')),
+ new svg.Point(this.attribute('x2').Length.toPixels('x'), this.attribute('y2').Length.toPixels('y'))];
+ }
+
+ this.path = function(ctx) {
+ var points = this.getPoints();
+
+ if (ctx != null) {
+ ctx.beginPath();
+ ctx.moveTo(points[0].x, points[0].y);
+ ctx.lineTo(points[1].x, points[1].y);
+ }
+
+ return new svg.BoundingBox(points[0].x, points[0].y, points[1].x, points[1].y);
+ }
+
+ this.getMarkers = function() {
+ var points = this.getPoints();
+ var a = points[0].angleTo(points[1]);
+ return [[points[0], a], [points[1], a]];
+ }
+ }
+ svg.Element.line.prototype = new svg.Element.PathElementBase;
+
+ // polyline element
+ svg.Element.polyline = function(node) {
+ this.base = svg.Element.PathElementBase;
+ this.base(node);
+
+ this.points = svg.CreatePath(this.attribute('points').value);
+ this.path = function(ctx) {
+ var bb = new svg.BoundingBox(this.points[0].x, this.points[0].y);
+ if (ctx != null) {
+ ctx.beginPath();
+ ctx.moveTo(this.points[0].x, this.points[0].y);
+ }
+ for (var i=1; i<this.points.length; i++) {
+ bb.addPoint(this.points[i].x, this.points[i].y);
+ if (ctx != null) ctx.lineTo(this.points[i].x, this.points[i].y);
+ }
+ return bb;
+ }
+
+ this.getMarkers = function() {
+ var markers = [];
+ for (var i=0; i<this.points.length - 1; i++) {
+ markers.push([this.points[i], this.points[i].angleTo(this.points[i+1])]);
+ }
+ markers.push([this.points[this.points.length-1], markers[markers.length-1][1]]);
+ return markers;
+ }
+ }
+ svg.Element.polyline.prototype = new svg.Element.PathElementBase;
+
+ // polygon element
+ svg.Element.polygon = function(node) {
+ this.base = svg.Element.polyline;
+ this.base(node);
+
+ this.basePath = this.path;
+ this.path = function(ctx) {
+ var bb = this.basePath(ctx);
+ if (ctx != null) {
+ ctx.lineTo(this.points[0].x, this.points[0].y);
+ ctx.closePath();
+ }
+ return bb;
+ }
+ }
+ svg.Element.polygon.prototype = new svg.Element.polyline;
+
+ // path element
+ svg.Element.path = function(node) {
+ this.base = svg.Element.PathElementBase;
+ this.base(node);
+
+ var d = this.attribute('d').value;
+ // TODO: convert to real lexer based on http://www.w3.org/TR/SVG11/paths.html#PathDataBNF
+ d = d.replace(/,/gm,' '); // get rid of all commas
+ d = d.replace(/([MmZzLlHhVvCcSsQqTtAa])([MmZzLlHhVvCcSsQqTtAa])/gm,'$1 $2'); // separate commands from commands
+ d = d.replace(/([MmZzLlHhVvCcSsQqTtAa])([MmZzLlHhVvCcSsQqTtAa])/gm,'$1 $2'); // separate commands from commands
+ d = d.replace(/([MmZzLlHhVvCcSsQqTtAa])([^\s])/gm,'$1 $2'); // separate commands from points
+ d = d.replace(/([^\s])([MmZzLlHhVvCcSsQqTtAa])/gm,'$1 $2'); // separate commands from points
+ d = d.replace(/([0-9])([+\-])/gm,'$1 $2'); // separate digits when no comma
+ d = d.replace(/(\.[0-9]*)(\.)/gm,'$1 $2'); // separate digits when no comma
+ d = d.replace(/([Aa](\s+[0-9]+){3})\s+([01])\s*([01])/gm,'$1 $3 $4 '); // shorthand elliptical arc path syntax
+ d = svg.compressSpaces(d); // compress multiple spaces
+ d = svg.trim(d);
+ this.PathParser = new (function(d) {
+ this.tokens = d.split(' ');
+
+ this.reset = function() {
+ this.i = -1;
+ this.command = '';
+ this.previousCommand = '';
+ this.start = new svg.Point(0, 0);
+ this.control = new svg.Point(0, 0);
+ this.current = new svg.Point(0, 0);
+ this.points = [];
+ this.angles = [];
+ }
+
+ this.isEnd = function() {
+ return this.i >= this.tokens.length - 1;
+ }
+
+ this.isCommandOrEnd = function() {
+ if (this.isEnd()) return true;
+ return this.tokens[this.i + 1].match(/^[A-Za-z]$/) != null;
+ }
+
+ this.isRelativeCommand = function() {
+ return this.command == this.command.toLowerCase();
+ }
+
+ this.getToken = function() {
+ this.i = this.i + 1;
+ return this.tokens[this.i];
+ }
+
+ this.getScalar = function() {
+ return parseFloat(this.getToken());
+ }
+
+ this.nextCommand = function() {
+ this.previousCommand = this.command;
+ this.command = this.getToken();
+ }
+
+ this.getPoint = function() {
+ var p = new svg.Point(this.getScalar(), this.getScalar());
+ return this.makeAbsolute(p);
+ }
+
+ this.getAsControlPoint = function() {
+ var p = this.getPoint();
+ this.control = p;
+ return p;
+ }
+
+ this.getAsCurrentPoint = function() {
+ var p = this.getPoint();
+ this.current = p;
+ return p;
+ }
+
+ this.getReflectedControlPoint = function() {
+ if (this.previousCommand.toLowerCase() != 'c' && this.previousCommand.toLowerCase() != 's') {
+ return this.current;
+ }
+
+ // reflect point
+ var p = new svg.Point(2 * this.current.x - this.control.x, 2 * this.current.y - this.control.y);
+ return p;
+ }
+
+ this.makeAbsolute = function(p) {
+ if (this.isRelativeCommand()) {
+ p.x = this.current.x + p.x;
+ p.y = this.current.y + p.y;
+ }
+ return p;
+ }
+
+ this.addMarker = function(p, from, priorTo) {
+ // if the last angle isn't filled in because we didn't have this point yet ...
+ if (priorTo != null && this.angles.length > 0 && this.angles[this.angles.length-1] == null) {
+ this.angles[this.angles.length-1] = this.points[this.points.length-1].angleTo(priorTo);
+ }
+ this.addMarkerAngle(p, from == null ? null : from.angleTo(p));
+ }
+
+ this.addMarkerAngle = function(p, a) {
+ this.points.push(p);
+ this.angles.push(a);
+ }
+
+ this.getMarkerPoints = function() { return this.points; }
+ this.getMarkerAngles = function() {
+ for (var i=0; i<this.angles.length; i++) {
+ if (this.angles[i] == null) {
+ for (var j=i+1; j<this.angles.length; j++) {
+ if (this.angles[j] != null) {
+ this.angles[i] = this.angles[j];
+ break;
+ }
+ }
+ }
+ }
+ return this.angles;
+ }
+ })(d);
+
+ this.path = function(ctx) {
+ var pp = this.PathParser;
+ pp.reset();
+
+ var bb = new svg.BoundingBox();
+ if (ctx != null) ctx.beginPath();
+ while (!pp.isEnd()) {
+ pp.nextCommand();
+ switch (pp.command.toUpperCase()) {
+ case 'M':
+ var p = pp.getAsCurrentPoint();
+ pp.addMarker(p);
+ bb.addPoint(p.x, p.y);
+ if (ctx != null) ctx.moveTo(p.x, p.y);
+ pp.start = pp.current;
+ while (!pp.isCommandOrEnd()) {
+ var p = pp.getAsCurrentPoint();
+ pp.addMarker(p, pp.start);
+ bb.addPoint(p.x, p.y);
+ if (ctx != null) ctx.lineTo(p.x, p.y);
+ }
+ break;
+ case 'L':
+ while (!pp.isCommandOrEnd()) {
+ var c = pp.current;
+ var p = pp.getAsCurrentPoint();
+ pp.addMarker(p, c);
+ bb.addPoint(p.x, p.y);
+ if (ctx != null) ctx.lineTo(p.x, p.y);
+ }
+ break;
+ case 'H':
+ while (!pp.isCommandOrEnd()) {
+ var newP = new svg.Point((pp.isRelativeCommand() ? pp.current.x : 0) + pp.getScalar(), pp.current.y);
+ pp.addMarker(newP, pp.current);
+ pp.current = newP;
+ bb.addPoint(pp.current.x, pp.current.y);
+ if (ctx != null) ctx.lineTo(pp.current.x, pp.current.y);
+ }
+ break;
+ case 'V':
+ while (!pp.isCommandOrEnd()) {
+ var newP = new svg.Point(pp.current.x, (pp.isRelativeCommand() ? pp.current.y : 0) + pp.getScalar());
+ pp.addMarker(newP, pp.current);
+ pp.current = newP;
+ bb.addPoint(pp.current.x, pp.current.y);
+ if (ctx != null) ctx.lineTo(pp.current.x, pp.current.y);
+ }
+ break;
+ case 'C':
+ while (!pp.isCommandOrEnd()) {
+ var curr = pp.current;
+ var p1 = pp.getPoint();
+ var cntrl = pp.getAsControlPoint();
+ var cp = pp.getAsCurrentPoint();
+ pp.addMarker(cp, cntrl, p1);
+ bb.addBezierCurve(curr.x, curr.y, p1.x, p1.y, cntrl.x, cntrl.y, cp.x, cp.y);
+ if (ctx != null) ctx.bezierCurveTo(p1.x, p1.y, cntrl.x, cntrl.y, cp.x, cp.y);
+ }
+ break;
+ case 'S':
+ while (!pp.isCommandOrEnd()) {
+ var curr = pp.current;
+ var p1 = pp.getReflectedControlPoint();
+ var cntrl = pp.getAsControlPoint();
+ var cp = pp.getAsCurrentPoint();
+ pp.addMarker(cp, cntrl, p1);
+ bb.addBezierCurve(curr.x, curr.y, p1.x, p1.y, cntrl.x, cntrl.y, cp.x, cp.y);
+ if (ctx != null) ctx.bezierCurveTo(p1.x, p1.y, cntrl.x, cntrl.y, cp.x, cp.y);
+ }
+ break;
+ case 'Q':
+ while (!pp.isCommandOrEnd()) {
+ var curr = pp.current;
+ var cntrl = pp.getAsControlPoint();
+ var cp = pp.getAsCurrentPoint();
+ pp.addMarker(cp, cntrl, cntrl);
+ bb.addQuadraticCurve(curr.x, curr.y, cntrl.x, cntrl.y, cp.x, cp.y);
+ if (ctx != null) ctx.quadraticCurveTo(cntrl.x, cntrl.y, cp.x, cp.y);
+ }
+ break;
+ case 'T':
+ while (!pp.isCommandOrEnd()) {
+ var curr = pp.current;
+ var cntrl = pp.getReflectedControlPoint();
+ pp.control = cntrl;
+ var cp = pp.getAsCurrentPoint();
+ pp.addMarker(cp, cntrl, cntrl);
+ bb.addQuadraticCurve(curr.x, curr.y, cntrl.x, cntrl.y, cp.x, cp.y);
+ if (ctx != null) ctx.quadraticCurveTo(cntrl.x, cntrl.y, cp.x, cp.y);
+ }
+ break;
+ case 'A':
+ while (!pp.isCommandOrEnd()) {
+ var curr = pp.current;
+ var rx = pp.getScalar();
+ var ry = pp.getScalar();
+ var xAxisRotation = pp.getScalar() * (Math.PI / 180.0);
+ var largeArcFlag = pp.getScalar();
+ var sweepFlag = pp.getScalar();
+ var cp = pp.getAsCurrentPoint();
+
+ // Conversion from endpoint to center parameterization
+ // http://www.w3.org/TR/SVG11/implnote.html#ArcImplementationNotes
+ // x1', y1'
+ var currp = new svg.Point(
+ Math.cos(xAxisRotation) * (curr.x - cp.x) / 2.0 + Math.sin(xAxisRotation) * (curr.y - cp.y) / 2.0,
+ -Math.sin(xAxisRotation) * (curr.x - cp.x) / 2.0 + Math.cos(xAxisRotation) * (curr.y - cp.y) / 2.0
+ );
+ // adjust radii
+ var l = Math.pow(currp.x,2)/Math.pow(rx,2)+Math.pow(currp.y,2)/Math.pow(ry,2);
+ if (l > 1) {
+ rx *= Math.sqrt(l);
+ ry *= Math.sqrt(l);
+ }
+ // cx', cy'
+ var s = (largeArcFlag == sweepFlag ? -1 : 1) * Math.sqrt(
+ ((Math.pow(rx,2)*Math.pow(ry,2))-(Math.pow(rx,2)*Math.pow(currp.y,2))-(Math.pow(ry,2)*Math.pow(currp.x,2))) /
+ (Math.pow(rx,2)*Math.pow(currp.y,2)+Math.pow(ry,2)*Math.pow(currp.x,2))
+ );
+ if (isNaN(s)) s = 0;
+ var cpp = new svg.Point(s * rx * currp.y / ry, s * -ry * currp.x / rx);
+ // cx, cy
+ var centp = new svg.Point(
+ (curr.x + cp.x) / 2.0 + Math.cos(xAxisRotation) * cpp.x - Math.sin(xAxisRotation) * cpp.y,
+ (curr.y + cp.y) / 2.0 + Math.sin(xAxisRotation) * cpp.x + Math.cos(xAxisRotation) * cpp.y
+ );
+ // vector magnitude
+ var m = function(v) { return Math.sqrt(Math.pow(v[0],2) + Math.pow(v[1],2)); }
+ // ratio between two vectors
+ var r = function(u, v) { return (u[0]*v[0]+u[1]*v[1]) / (m(u)*m(v)) }
+ // angle between two vectors
+ var a = function(u, v) { return (u[0]*v[1] < u[1]*v[0] ? -1 : 1) * Math.acos(r(u,v)); }
+ // initial angle
+ var a1 = a([1,0], [(currp.x-cpp.x)/rx,(currp.y-cpp.y)/ry]);
+ // angle delta
+ var u = [(currp.x-cpp.x)/rx,(currp.y-cpp.y)/ry];
+ var v = [(-currp.x-cpp.x)/rx,(-currp.y-cpp.y)/ry];
+ var ad = a(u, v);
+ if (r(u,v) <= -1) ad = Math.PI;
+ if (r(u,v) >= 1) ad = 0;
+
+ if (sweepFlag == 0 && ad > 0) ad = ad - 2 * Math.PI;
+ if (sweepFlag == 1 && ad < 0) ad = ad + 2 * Math.PI;
+
+ // for markers
+ var halfWay = new svg.Point(
+ centp.x - rx * Math.cos((a1 + ad) / 2),
+ centp.y - ry * Math.sin((a1 + ad) / 2)
+ );
+ pp.addMarkerAngle(halfWay, (a1 + ad) / 2 + (sweepFlag == 0 ? 1 : -1) * Math.PI / 2);
+ pp.addMarkerAngle(cp, ad + (sweepFlag == 0 ? 1 : -1) * Math.PI / 2);
+
+ bb.addPoint(cp.x, cp.y); // TODO: this is too naive, make it better
+ if (ctx != null) {
+ var r = rx > ry ? rx : ry;
+ var sx = rx > ry ? 1 : rx / ry;
+ var sy = rx > ry ? ry / rx : 1;
+
+ ctx.translate(centp.x, centp.y);
+ ctx.rotate(xAxisRotation);
+ ctx.scale(sx, sy);
+ ctx.arc(0, 0, r, a1, a1 + ad, 1 - sweepFlag);
+ ctx.scale(1/sx, 1/sy);
+ ctx.rotate(-xAxisRotation);
+ ctx.translate(-centp.x, -centp.y);
+ }
+ }
+ break;
+ case 'Z':
+ if (ctx != null) ctx.closePath();
+ pp.current = pp.start;
+ }
+ }
+
+ return bb;
+ }
+
+ this.getMarkers = function() {
+ var points = this.PathParser.getMarkerPoints();
+ var angles = this.PathParser.getMarkerAngles();
+
+ var markers = [];
+ for (var i=0; i<points.length; i++) {
+ markers.push([points[i], angles[i]]);
+ }
+ return markers;
+ }
+ }
+ svg.Element.path.prototype = new svg.Element.PathElementBase;
+
+ // pattern element
+ svg.Element.pattern = function(node) {
+ this.base = svg.Element.ElementBase;
+ this.base(node);
+
+ this.createPattern = function(ctx, element) {
+ // render me using a temporary svg element
+ var tempSvg = new svg.Element.svg();
+ tempSvg.attributes['viewBox'] = new svg.Property('viewBox', this.attribute('viewBox').value);
+ tempSvg.attributes['x'] = new svg.Property('x', this.attribute('x').value);
+ tempSvg.attributes['y'] = new svg.Property('y', this.attribute('y').value);
+ tempSvg.attributes['width'] = new svg.Property('width', this.attribute('width').value);
+ tempSvg.attributes['height'] = new svg.Property('height', this.attribute('height').value);
+ tempSvg.children = this.children;
+
+ var c = document.createElement('canvas');
+ c.width = this.attribute('width').Length.toPixels('x');
+ c.height = this.attribute('height').Length.toPixels('y');
+ tempSvg.render(c.getContext('2d'));
+ return ctx.createPattern(c, 'repeat');
+ }
+ }
+ svg.Element.pattern.prototype = new svg.Element.ElementBase;
+
+ // marker element
+ svg.Element.marker = function(node) {
+ this.base = svg.Element.ElementBase;
+ this.base(node);
+
+ this.baseRender = this.render;
+ this.render = function(ctx, point, angle) {
+ ctx.translate(point.x, point.y);
+ if (this.attribute('orient').valueOrDefault('auto') == 'auto') ctx.rotate(angle);
+ if (this.attribute('markerUnits').valueOrDefault('strokeWidth') == 'strokeWidth') ctx.scale(ctx.lineWidth, ctx.lineWidth);
+ ctx.save();
+
+ // render me using a temporary svg element
+ var tempSvg = new svg.Element.svg();
+ tempSvg.attributes['viewBox'] = new svg.Property('viewBox', this.attribute('viewBox').value);
+ tempSvg.attributes['refX'] = new svg.Property('refX', this.attribute('refX').value);
+ tempSvg.attributes['refY'] = new svg.Property('refY', this.attribute('refY').value);
+ tempSvg.attributes['width'] = new svg.Property('width', this.attribute('markerWidth').value);
+ tempSvg.attributes['height'] = new svg.Property('height', this.attribute('markerHeight').value);
+ tempSvg.attributes['fill'] = new svg.Property('fill', this.attribute('fill').valueOrDefault('black'));
+ tempSvg.attributes['stroke'] = new svg.Property('stroke', this.attribute('stroke').valueOrDefault('none'));
+ tempSvg.children = this.children;
+ tempSvg.render(ctx);
+
+ ctx.restore();
+ if (this.attribute('markerUnits').valueOrDefault('strokeWidth') == 'strokeWidth') ctx.scale(1/ctx.lineWidth, 1/ctx.lineWidth);
+ if (this.attribute('orient').valueOrDefault('auto') == 'auto') ctx.rotate(-angle);
+ ctx.translate(-point.x, -point.y);
+ }
+ }
+ svg.Element.marker.prototype = new svg.Element.ElementBase;
+
+ // definitions element
+ svg.Element.defs = function(node) {
+ this.base = svg.Element.ElementBase;
+ this.base(node);
+
+ this.render = function(ctx) {
+ // NOOP
+ }
+ }
+ svg.Element.defs.prototype = new svg.Element.ElementBase;
+
+ // base for gradients
+ svg.Element.GradientBase = function(node) {
+ this.base = svg.Element.ElementBase;
+ this.base(node);
+
+ this.gradientUnits = this.attribute('gradientUnits').valueOrDefault('objectBoundingBox');
+
+ this.stops = [];
+ for (var i=0; i<this.children.length; i++) {
+ var child = this.children[i];
+ this.stops.push(child);
+ }
+
+ this.getGradient = function() {
+ // OVERRIDE ME!
+ }
+
+ this.createGradient = function(ctx, element) {
+ var stopsContainer = this;
+ if (this.attribute('xlink:href').hasValue()) {
+ stopsContainer = this.attribute('xlink:href').Definition.getDefinition();
+ }
+
+ var g = this.getGradient(ctx, element);
+ for (var i=0; i<stopsContainer.stops.length; i++) {
+ g.addColorStop(stopsContainer.stops[i].offset, stopsContainer.stops[i].color);
+ }
+
+ if (this.attribute('gradientTransform').hasValue()) {
+ // render as transformed pattern on temporary canvas
+ var rootView = svg.ViewPort.viewPorts[0];
+
+ var rect = new svg.Element.rect();
+ rect.attributes['x'] = new svg.Property('x', -svg.MAX_VIRTUAL_PIXELS/3.0);
+ rect.attributes['y'] = new svg.Property('y', -svg.MAX_VIRTUAL_PIXELS/3.0);
+ rect.attributes['width'] = new svg.Property('width', svg.MAX_VIRTUAL_PIXELS);
+ rect.attributes['height'] = new svg.Property('height', svg.MAX_VIRTUAL_PIXELS);
+
+ var group = new svg.Element.g();
+ group.attributes['transform'] = new svg.Property('transform', this.attribute('gradientTransform').value);
+ group.children = [ rect ];
+
+ var tempSvg = new svg.Element.svg();
+ tempSvg.attributes['x'] = new svg.Property('x', 0);
+ tempSvg.attributes['y'] = new svg.Property('y', 0);
+ tempSvg.attributes['width'] = new svg.Property('width', rootView.width);
+ tempSvg.attributes['height'] = new svg.Property('height', rootView.height);
+ tempSvg.children = [ group ];
+
+ var c = document.createElement('canvas');
+ c.width = rootView.width;
+ c.height = rootView.height;
+ var tempCtx = c.getContext('2d');
+ tempCtx.fillStyle = g;
+ tempSvg.render(tempCtx);
+ return tempCtx.createPattern(c, 'no-repeat');
+ }
+
+ return g;
+ }
+ }
+ svg.Element.GradientBase.prototype = new svg.Element.ElementBase;
+
+ // linear gradient element
+ svg.Element.linearGradient = function(node) {
+ this.base = svg.Element.GradientBase;
+ this.base(node);
+
+ this.getGradient = function(ctx, element) {
+ var bb = element.getBoundingBox();
+
+ var x1 = (this.gradientUnits == 'objectBoundingBox'
+ ? bb.x() + bb.width() * this.attribute('x1').numValue()
+ : this.attribute('x1').Length.toPixels('x'));
+ var y1 = (this.gradientUnits == 'objectBoundingBox'
+ ? bb.y() + bb.height() * this.attribute('y1').numValue()
+ : this.attribute('y1').Length.toPixels('y'));
+ var x2 = (this.gradientUnits == 'objectBoundingBox'
+ ? bb.x() + bb.width() * this.attribute('x2').numValue()
+ : this.attribute('x2').Length.toPixels('x'));
+ var y2 = (this.gradientUnits == 'objectBoundingBox'
+ ? bb.y() + bb.height() * this.attribute('y2').numValue()
+ : this.attribute('y2').Length.toPixels('y'));
+
+ return ctx.createLinearGradient(x1, y1, x2, y2);
+ }
+ }
+ svg.Element.linearGradient.prototype = new svg.Element.GradientBase;
+
+ // radial gradient element
+ svg.Element.radialGradient = function(node) {
+ this.base = svg.Element.GradientBase;
+ this.base(node);
+
+ this.getGradient = function(ctx, element) {
+ var bb = element.getBoundingBox();
+
+ var cx = (this.gradientUnits == 'objectBoundingBox'
+ ? bb.x() + bb.width() * this.attribute('cx').numValue()
+ : this.attribute('cx').Length.toPixels('x'));
+ var cy = (this.gradientUnits == 'objectBoundingBox'
+ ? bb.y() + bb.height() * this.attribute('cy').numValue()
+ : this.attribute('cy').Length.toPixels('y'));
+
+ var fx = cx;
+ var fy = cy;
+ if (this.attribute('fx').hasValue()) {
+ fx = (this.gradientUnits == 'objectBoundingBox'
+ ? bb.x() + bb.width() * this.attribute('fx').numValue()
+ : this.attribute('fx').Length.toPixels('x'));
+ }
+ if (this.attribute('fy').hasValue()) {
+ fy = (this.gradientUnits == 'objectBoundingBox'
+ ? bb.y() + bb.height() * this.attribute('fy').numValue()
+ : this.attribute('fy').Length.toPixels('y'));
+ }
+
+ var r = (this.gradientUnits == 'objectBoundingBox'
+ ? (bb.width() + bb.height()) / 2.0 * this.attribute('r').numValue()
+ : this.attribute('r').Length.toPixels());
+
+ return ctx.createRadialGradient(fx, fy, 0, cx, cy, r);
+ }
+ }
+ svg.Element.radialGradient.prototype = new svg.Element.GradientBase;
+
+ // gradient stop element
+ svg.Element.stop = function(node) {
+ this.base = svg.Element.ElementBase;
+ this.base(node);
+
+ this.offset = this.attribute('offset').numValue();
+
+ var stopColor = this.style('stop-color');
+ if (this.style('stop-opacity').hasValue()) stopColor = stopColor.Color.addOpacity(this.style('stop-opacity').value);
+ this.color = stopColor.value;
+ }
+ svg.Element.stop.prototype = new svg.Element.ElementBase;
+
+ // animation base element
+ svg.Element.AnimateBase = function(node) {
+ this.base = svg.Element.ElementBase;
+ this.base(node);
+
+ svg.Animations.push(this);
+
+ this.duration = 0.0;
+ this.begin = this.attribute('begin').Time.toMilliseconds();
+ this.maxDuration = this.begin + this.attribute('dur').Time.toMilliseconds();
+
+ this.getProperty = function() {
+ var attributeType = this.attribute('attributeType').value;
+ var attributeName = this.attribute('attributeName').value;
+
+ if (attributeType == 'CSS') {
+ return this.parent.style(attributeName, true);
+ }
+ return this.parent.attribute(attributeName, true);
+ };
+
+ this.initialValue = null;
+ this.removed = false;
+
+ this.calcValue = function() {
+ // OVERRIDE ME!
+ return '';
+ }
+
+ this.update = function(delta) {
+ // set initial value
+ if (this.initialValue == null) {
+ this.initialValue = this.getProperty().value;
+ }
+
+ // if we're past the end time
+ if (this.duration > this.maxDuration) {
+ // loop for indefinitely repeating animations
+ if (this.attribute('repeatCount').value == 'indefinite') {
+ this.duration = 0.0
+ }
+ else if (this.attribute('fill').valueOrDefault('remove') == 'remove' && !this.removed) {
+ this.removed = true;
+ this.getProperty().value = this.initialValue;
+ return true;
+ }
+ else {
+ return false; // no updates made
+ }
+ }
+ this.duration = this.duration + delta;
+
+ // if we're past the begin time
+ var updated = false;
+ if (this.begin < this.duration) {
+ var newValue = this.calcValue(); // tween
+
+ if (this.attribute('type').hasValue()) {
+ // for transform, etc.
+ var type = this.attribute('type').value;
+ newValue = type + '(' + newValue + ')';
+ }
+
+ this.getProperty().value = newValue;
+ updated = true;
+ }
+
+ return updated;
+ }
+
+ // fraction of duration we've covered
+ this.progress = function() {
+ return ((this.duration - this.begin) / (this.maxDuration - this.begin));
+ }
+ }
+ svg.Element.AnimateBase.prototype = new svg.Element.ElementBase;
+
+ // animate element
+ svg.Element.animate = function(node) {
+ this.base = svg.Element.AnimateBase;
+ this.base(node);
+
+ this.calcValue = function() {
+ var from = this.attribute('from').numValue();
+ var to = this.attribute('to').numValue();
+
+ // tween value linearly
+ return from + (to - from) * this.progress();
+ };
+ }
+ svg.Element.animate.prototype = new svg.Element.AnimateBase;
+
+ // animate color element
+ svg.Element.animateColor = function(node) {
+ this.base = svg.Element.AnimateBase;
+ this.base(node);
+
+ this.calcValue = function() {
+ var from = new RGBColor(this.attribute('from').value);
+ var to = new RGBColor(this.attribute('to').value);
+
+ if (from.ok && to.ok) {
+ // tween color linearly
+ var r = from.r + (to.r - from.r) * this.progress();
+ var g = from.g + (to.g - from.g) * this.progress();
+ var b = from.b + (to.b - from.b) * this.progress();
+ return 'rgb('+parseInt(r,10)+','+parseInt(g,10)+','+parseInt(b,10)+')';
+ }
+ return this.attribute('from').value;
+ };
+ }
+ svg.Element.animateColor.prototype = new svg.Element.AnimateBase;
+
+ // animate transform element
+ svg.Element.animateTransform = function(node) {
+ this.base = svg.Element.animate;
+ this.base(node);
+ }
+ svg.Element.animateTransform.prototype = new svg.Element.animate;
+
+ // font element
+ svg.Element.font = function(node) {
+ this.base = svg.Element.ElementBase;
+ this.base(node);
+
+ this.horizAdvX = this.attribute('horiz-adv-x').numValue();
+
+ this.isRTL = false;
+ this.isArabic = false;
+ this.fontFace = null;
+ this.missingGlyph = null;
+ this.glyphs = [];
+ for (var i=0; i<this.children.length; i++) {
+ var child = this.children[i];
+ if (child.type == 'font-face') {
+ this.fontFace = child;
+ if (child.style('font-family').hasValue()) {
+ svg.Definitions[child.style('font-family').value] = this;
+ }
+ }
+ else if (child.type == 'missing-glyph') this.missingGlyph = child;
+ else if (child.type == 'glyph') {
+ if (child.arabicForm != '') {
+ this.isRTL = true;
+ this.isArabic = true;
+ if (typeof(this.glyphs[child.unicode]) == 'undefined') this.glyphs[child.unicode] = [];
+ this.glyphs[child.unicode][child.arabicForm] = child;
+ }
+ else {
+ this.glyphs[child.unicode] = child;
+ }
+ }
+ }
+ }
+ svg.Element.font.prototype = new svg.Element.ElementBase;
+
+ // font-face element
+ svg.Element.fontface = function(node) {
+ this.base = svg.Element.ElementBase;
+ this.base(node);
+
+ this.ascent = this.attribute('ascent').value;
+ this.descent = this.attribute('descent').value;
+ this.unitsPerEm = this.attribute('units-per-em').numValue();
+ }
+ svg.Element.fontface.prototype = new svg.Element.ElementBase;
+
+ // missing-glyph element
+ svg.Element.missingglyph = function(node) {
+ this.base = svg.Element.path;
+ this.base(node);
+
+ this.horizAdvX = 0;
+ }
+ svg.Element.missingglyph.prototype = new svg.Element.path;
+
+ // glyph element
+ svg.Element.glyph = function(node) {
+ this.base = svg.Element.path;
+ this.base(node);
+
+ this.horizAdvX = this.attribute('horiz-adv-x').numValue();
+ this.unicode = this.attribute('unicode').value;
+ this.arabicForm = this.attribute('arabic-form').value;
+ }
+ svg.Element.glyph.prototype = new svg.Element.path;
+
+ // text element
+ svg.Element.text = function(node) {
+ this.base = svg.Element.RenderedElementBase;
+ this.base(node);
+
+ if (node != null) {
+ // add children
+ this.children = [];
+ for (var i=0; i<node.childNodes.length; i++) {
+ var childNode = node.childNodes[i];
+ if (childNode.nodeType == 1) { // capture tspan and tref nodes
+ this.addChild(childNode, true);
+ }
+ else if (childNode.nodeType == 3) { // capture text
+ this.addChild(new svg.Element.tspan(childNode), false);
+ }
+ }
+ }
+
+ this.baseSetContext = this.setContext;
+ this.setContext = function(ctx) {
+ this.baseSetContext(ctx);
+ if (this.style('dominant-baseline').hasValue()) ctx.textBaseline = this.style('dominant-baseline').value;
+ if (this.style('alignment-baseline').hasValue()) ctx.textBaseline = this.style('alignment-baseline').value;
+ }
+
+ this.renderChildren = function(ctx) {
+ var textAnchor = this.style('text-anchor').valueOrDefault('start');
+ var x = this.attribute('x').Length.toPixels('x');
+ var y = this.attribute('y').Length.toPixels('y');
+ for (var i=0; i<this.children.length; i++) {
+ var child = this.children[i];
+
+ if (child.attribute('x').hasValue()) {
+ child.x = child.attribute('x').Length.toPixels('x');
+ }
+ else {
+ if (child.attribute('dx').hasValue()) x += child.attribute('dx').Length.toPixels('x');
+ child.x = x;
+ }
+
+ var childLength = child.measureText(ctx);
+ if (textAnchor != 'start' && (i==0 || child.attribute('x').hasValue())) { // new group?
+ // loop through rest of children
+ var groupLength = childLength;
+ for (var j=i+1; j<this.children.length; j++) {
+ var childInGroup = this.children[j];
+ if (childInGroup.attribute('x').hasValue()) break; // new group
+ groupLength += childInGroup.measureText(ctx);
+ }
+ child.x -= (textAnchor == 'end' ? groupLength : groupLength / 2.0);
+ }
+ x = child.x + childLength;
+
+ if (child.attribute('y').hasValue()) {
+ child.y = child.attribute('y').Length.toPixels('y');
+ }
+ else {
+ if (child.attribute('dy').hasValue()) y += child.attribute('dy').Length.toPixels('y');
+ child.y = y;
+ }
+ y = child.y;
+
+ child.render(ctx);
+ }
+ }
+ }
+ svg.Element.text.prototype = new svg.Element.RenderedElementBase;
+
+ // text base
+ svg.Element.TextElementBase = function(node) {
+ this.base = svg.Element.RenderedElementBase;
+ this.base(node);
+
+ this.getGlyph = function(font, text, i) {
+ var c = text[i];
+ var glyph = null;
+ if (font.isArabic) {
+ var arabicForm = 'isolated';
+ if ((i==0 || text[i-1]==' ') && i<text.length-2 && text[i+1]!=' ') arabicForm = 'terminal';
+ if (i>0 && text[i-1]!=' ' && i<text.length-2 && text[i+1]!=' ') arabicForm = 'medial';
+ if (i>0 && text[i-1]!=' ' && (i == text.length-1 || text[i+1]==' ')) arabicForm = 'initial';
+ if (typeof(font.glyphs[c]) != 'undefined') {
+ glyph = font.glyphs[c][arabicForm];
+ if (glyph == null && font.glyphs[c].type == 'glyph') glyph = font.glyphs[c];
+ }
+ }
+ else {
+ glyph = font.glyphs[c];
+ }
+ if (glyph == null) glyph = font.missingGlyph;
+ return glyph;
+ }
+
+ this.renderChildren = function(ctx) {
+ var customFont = this.parent.style('font-family').Definition.getDefinition();
+ if (customFont != null) {
+ var fontSize = this.parent.style('font-size').numValueOrDefault(svg.Font.Parse(svg.ctx.font).fontSize);
+ var fontStyle = this.parent.style('font-style').valueOrDefault(svg.Font.Parse(svg.ctx.font).fontStyle);
+ var text = this.getText();
+ if (customFont.isRTL) text = text.split("").reverse().join("");
+
+ var dx = svg.ToNumberArray(this.parent.attribute('dx').value);
+ for (var i=0; i<text.length; i++) {
+ var glyph = this.getGlyph(customFont, text, i);
+ var scale = fontSize / customFont.fontFace.unitsPerEm;
+ ctx.translate(this.x, this.y);
+ ctx.scale(scale, -scale);
+ var lw = ctx.lineWidth;
+ ctx.lineWidth = ctx.lineWidth * customFont.fontFace.unitsPerEm / fontSize;
+ if (fontStyle == 'italic') ctx.transform(1, 0, .4, 1, 0, 0);
+ glyph.render(ctx);
+ if (fontStyle == 'italic') ctx.transform(1, 0, -.4, 1, 0, 0);
+ ctx.lineWidth = lw;
+ ctx.scale(1/scale, -1/scale);
+ ctx.translate(-this.x, -this.y);
+
+ this.x += fontSize * (glyph.horizAdvX || customFont.horizAdvX) / customFont.fontFace.unitsPerEm;
+ if (typeof(dx[i]) != 'undefined' && !isNaN(dx[i])) {
+ this.x += dx[i];
+ }
+ }
+ return;
+ }
+
+ if (ctx.strokeStyle != '') ctx.strokeText(svg.compressSpaces(this.getText()), this.x, this.y);
+ if (ctx.fillStyle != '') ctx.fillText(svg.compressSpaces(this.getText()), this.x, this.y);
+ }
+
+ this.getText = function() {
+ // OVERRIDE ME
+ }
+
+ this.measureText = function(ctx) {
+ var customFont = this.parent.style('font-family').Definition.getDefinition();
+ if (customFont != null) {
+ var fontSize = this.parent.style('font-size').numValueOrDefault(svg.Font.Parse(svg.ctx.font).fontSize);
+ var measure = 0;
+ var text = this.getText();
+ if (customFont.isRTL) text = text.split("").reverse().join("");
+ var dx = svg.ToNumberArray(this.parent.attribute('dx').value);
+ for (var i=0; i<text.length; i++) {
+ var glyph = this.getGlyph(customFont, text, i);
+ measure += (glyph.horizAdvX || customFont.horizAdvX) * fontSize / customFont.fontFace.unitsPerEm;
+ if (typeof(dx[i]) != 'undefined' && !isNaN(dx[i])) {
+ measure += dx[i];
+ }
+ }
+ return measure;
+ }
+
+ var textToMeasure = svg.compressSpaces(this.getText());
+ if (!ctx.measureText) return textToMeasure.length * 10;
+
+ ctx.save();
+ this.setContext(ctx);
+ var width = ctx.measureText(textToMeasure).width;
+ ctx.restore();
+ return width;
+ }
+ }
+ svg.Element.TextElementBase.prototype = new svg.Element.RenderedElementBase;
+
+ // tspan
+ svg.Element.tspan = function(node) {
+ this.base = svg.Element.TextElementBase;
+ this.base(node);
+
+ this.text = node.nodeType == 3 ? node.nodeValue : // text
+ node.childNodes.length > 0 ? node.childNodes[0].nodeValue : // element
+ node.text;
+ this.getText = function() {
+ return this.text;
+ }
+ }
+ svg.Element.tspan.prototype = new svg.Element.TextElementBase;
+
+ // tref
+ svg.Element.tref = function(node) {
+ this.base = svg.Element.TextElementBase;
+ this.base(node);
+
+ this.getText = function() {
+ var element = this.attribute('xlink:href').Definition.getDefinition();
+ if (element != null) return element.children[0].getText();
+ }
+ }
+ svg.Element.tref.prototype = new svg.Element.TextElementBase;
+
+ // a element
+ svg.Element.a = function(node) {
+ this.base = svg.Element.TextElementBase;
+ this.base(node);
+
+ this.hasText = true;
+ for (var i=0; i<node.childNodes.length; i++) {
+ if (node.childNodes[i].nodeType != 3) this.hasText = false;
+ }
+
+ // this might contain text
+ this.text = this.hasText ? node.childNodes[0].nodeValue : '';
+ this.getText = function() {
+ return this.text;
+ }
+
+ this.baseRenderChildren = this.renderChildren;
+ this.renderChildren = function(ctx) {
+ if (this.hasText) {
+ // render as text element
+ this.baseRenderChildren(ctx);
+ var fontSize = new svg.Property('fontSize', svg.Font.Parse(svg.ctx.font).fontSize);
+ svg.Mouse.checkBoundingBox(this, new svg.BoundingBox(this.x, this.y - fontSize.Length.toPixels('y'), this.x + this.measureText(ctx), this.y));
+ }
+ else {
+ // render as temporary group
+ var g = new svg.Element.g();
+ g.children = this.children;
+ g.parent = this;
+ g.render(ctx);
+ }
+ }
+
+ this.onclick = function() {
+ window.open(this.attribute('xlink:href').value);
+ }
+
+ this.onmousemove = function() {
+ svg.ctx.canvas.style.cursor = 'pointer';
+ }
+ }
+ svg.Element.a.prototype = new svg.Element.TextElementBase;
+
+ // image element
+ svg.Element.image = function(node) {
+ this.base = svg.Element.RenderedElementBase;
+ this.base(node);
+
+ svg.Images.push(this);
+ this.img = document.createElement('img');
+ this.loaded = false;
+ var that = this;
+ this.img.onload = function() { that.loaded = true; }
+ this.img.src = this.attribute('xlink:href').value;
+
+ this.renderChildren = function(ctx) {
+ var x = this.attribute('x').Length.toPixels('x');
+ var y = this.attribute('y').Length.toPixels('y');
+
+ var width = this.attribute('width').Length.toPixels('x');
+ var height = this.attribute('height').Length.toPixels('y');
+ if (width == 0 || height == 0) return;
+
+ ctx.save();
+ ctx.translate(x, y);
+ svg.AspectRatio(ctx,
+ this.attribute('preserveAspectRatio').value,
+ width,
+ this.img.width,
+ height,
+ this.img.height,
+ 0,
+ 0);
+ ctx.drawImage(this.img, 0, 0);
+ ctx.restore();
+ }
+ }
+ svg.Element.image.prototype = new svg.Element.RenderedElementBase;
+
+ // group element
+ svg.Element.g = function(node) {
+ this.base = svg.Element.RenderedElementBase;
+ this.base(node);
+
+ this.getBoundingBox = function() {
+ var bb = new svg.BoundingBox();
+ for (var i=0; i<this.children.length; i++) {
+ bb.addBoundingBox(this.children[i].getBoundingBox());
+ }
+ return bb;
+ };
+ }
+ svg.Element.g.prototype = new svg.Element.RenderedElementBase;
+
+ // symbol element
+ svg.Element.symbol = function(node) {
+ this.base = svg.Element.RenderedElementBase;
+ this.base(node);
+
+ this.baseSetContext = this.setContext;
+ this.setContext = function(ctx) {
+ this.baseSetContext(ctx);
+
+ // viewbox
+ if (this.attribute('viewBox').hasValue()) {
+ var viewBox = svg.ToNumberArray(this.attribute('viewBox').value);
+ var minX = viewBox[0];
+ var minY = viewBox[1];
+ width = viewBox[2];
+ height = viewBox[3];
+
+ svg.AspectRatio(ctx,
+ this.attribute('preserveAspectRatio').value,
+ this.attribute('width').Length.toPixels('x'),
+ width,
+ this.attribute('height').Length.toPixels('y'),
+ height,
+ minX,
+ minY);
+
+ svg.ViewPort.SetCurrent(viewBox[2], viewBox[3]);
+ }
+ }
+ }
+ svg.Element.symbol.prototype = new svg.Element.RenderedElementBase;
+
+ // style element
+ svg.Element.style = function(node) {
+ this.base = svg.Element.ElementBase;
+ this.base(node);
+
+ // text, or spaces then CDATA
+ var css = node.childNodes[0].nodeValue + (node.childNodes.length > 1 ? node.childNodes[1].nodeValue : '');
+ css = css.replace(/(\/\*([^*]|[\r\n]|(\*+([^*\/]|[\r\n])))*\*+\/)|(^[\s]*\/\/.*)/gm, ''); // remove comments
+ css = svg.compressSpaces(css); // replace whitespace
+ var cssDefs = css.split('}');
+ for (var i=0; i<cssDefs.length; i++) {
+ if (svg.trim(cssDefs[i]) != '') {
+ var cssDef = cssDefs[i].split('{');
+ var cssClasses = cssDef[0].split(',');
+ var cssProps = cssDef[1].split(';');
+ for (var j=0; j<cssClasses.length; j++) {
+ var cssClass = svg.trim(cssClasses[j]);
+ if (cssClass != '') {
+ var props = {};
+ for (var k=0; k<cssProps.length; k++) {
+ var prop = cssProps[k].indexOf(':');
+ var name = cssProps[k].substr(0, prop);
+ var value = cssProps[k].substr(prop + 1, cssProps[k].length - prop);
+ if (name != null && value != null) {
+ props[svg.trim(name)] = new svg.Property(svg.trim(name), svg.trim(value));
+ }
+ }
+ svg.Styles[cssClass] = props;
+ if (cssClass == '@font-face') {
+ var fontFamily = props['font-family'].value.replace(/"/g,'');
+ var srcs = props['src'].value.split(',');
+ for (var s=0; s<srcs.length; s++) {
+ if (srcs[s].indexOf('format("svg")') > 0) {
+ var urlStart = srcs[s].indexOf('url');
+ var urlEnd = srcs[s].indexOf(')', urlStart);
+ var url = srcs[s].substr(urlStart + 5, urlEnd - urlStart - 6);
+ var doc = svg.parseXml(svg.ajax(url));
+ var fonts = doc.getElementsByTagName('font');
+ for (var f=0; f<fonts.length; f++) {
+ var font = svg.CreateElement(fonts[f]);
+ svg.Definitions[fontFamily] = font;
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+ svg.Element.style.prototype = new svg.Element.ElementBase;
+
+ // use element
+ svg.Element.use = function(node) {
+ this.base = svg.Element.RenderedElementBase;
+ this.base(node);
+
+ this.baseSetContext = this.setContext;
+ this.setContext = function(ctx) {
+ this.baseSetContext(ctx);
+ if (this.attribute('x').hasValue()) ctx.translate(this.attribute('x').Length.toPixels('x'), 0);
+ if (this.attribute('y').hasValue()) ctx.translate(0, this.attribute('y').Length.toPixels('y'));
+ }
+
+ this.getDefinition = function() {
+ var element = this.attribute('xlink:href').Definition.getDefinition();
+ if (this.attribute('width').hasValue()) element.attribute('width', true).value = this.attribute('width').value;
+ if (this.attribute('height').hasValue()) element.attribute('height', true).value = this.attribute('height').value;
+ return element;
+ }
+
+ this.path = function(ctx) {
+ var element = this.getDefinition();
+ if (element != null) element.path(ctx);
+ }
+
+ this.renderChildren = function(ctx) {
+ var element = this.getDefinition();
+ if (element != null) element.render(ctx);
+ }
+ }
+ svg.Element.use.prototype = new svg.Element.RenderedElementBase;
+
+ // mask element
+ svg.Element.mask = function(node) {
+ this.base = svg.Element.ElementBase;
+ this.base(node);
+
+ this.apply = function(ctx, element) {
+ // render as temp svg
+ var x = this.attribute('x').Length.toPixels('x');
+ var y = this.attribute('y').Length.toPixels('y');
+ var width = this.attribute('width').Length.toPixels('x');
+ var height = this.attribute('height').Length.toPixels('y');
+
+ // temporarily remove mask to avoid recursion
+ var mask = element.attribute('mask').value;
+ element.attribute('mask').value = '';
+
+ var cMask = document.createElement('canvas');
+ cMask.width = x + width;
+ cMask.height = y + height;
+ var maskCtx = cMask.getContext('2d');
+ this.renderChildren(maskCtx);
+
+ var c = document.createElement('canvas');
+ c.width = x + width;
+ c.height = y + height;
+ var tempCtx = c.getContext('2d');
+ element.render(tempCtx);
+ tempCtx.globalCompositeOperation = 'destination-in';
+ tempCtx.fillStyle = maskCtx.createPattern(cMask, 'no-repeat');
+ tempCtx.fillRect(0, 0, x + width, y + height);
+
+ ctx.fillStyle = tempCtx.createPattern(c, 'no-repeat');
+ ctx.fillRect(0, 0, x + width, y + height);
+
+ // reassign mask
+ element.attribute('mask').value = mask;
+ }
+
+ this.render = function(ctx) {
+ // NO RENDER
+ }
+ }
+ svg.Element.mask.prototype = new svg.Element.ElementBase;
+
+ // clip element
+ svg.Element.clipPath = function(node) {
+ this.base = svg.Element.ElementBase;
+ this.base(node);
+
+ this.apply = function(ctx) {
+ for (var i=0; i<this.children.length; i++) {
+ if (this.children[i].path) {
+ this.children[i].path(ctx);
+ ctx.clip();
+ }
+ }
+ }
+
+ this.render = function(ctx) {
+ // NO RENDER
+ }
+ }
+ svg.Element.clipPath.prototype = new svg.Element.ElementBase;
+
+ // filters
+ svg.Element.filter = function(node) {
+ this.base = svg.Element.ElementBase;
+ this.base(node);
+
+ this.apply = function(ctx, element) {
+ // render as temp svg
+ var bb = element.getBoundingBox();
+ var x = this.attribute('x').Length.toPixels('x');
+ var y = this.attribute('y').Length.toPixels('y');
+ if (x == 0 || y == 0) {
+ x = bb.x1;
+ y = bb.y1;
+ }
+ var width = this.attribute('width').Length.toPixels('x');
+ var height = this.attribute('height').Length.toPixels('y');
+ if (width == 0 || height == 0) {
+ width = bb.width();
+ height = bb.height();
+ }
+
+ // temporarily remove filter to avoid recursion
+ var filter = element.style('filter').value;
+ element.style('filter').value = '';
+
+ // max filter distance
+ var extraPercent = .20;
+ var px = extraPercent * width;
+ var py = extraPercent * height;
+
+ var c = document.createElement('canvas');
+ c.width = width + 2*px;
+ c.height = height + 2*py;
+ var tempCtx = c.getContext('2d');
+ tempCtx.translate(-x + px, -y + py);
+ element.render(tempCtx);
+
+ // apply filters
+ for (var i=0; i<this.children.length; i++) {
+ this.children[i].apply(tempCtx, 0, 0, width + 2*px, height + 2*py);
+ }
+
+ // render on me
+ ctx.drawImage(c, 0, 0, width + 2*px, height + 2*py, x - px, y - py, width + 2*px, height + 2*py);
+
+ // reassign filter
+ element.style('filter', true).value = filter;
+ }
+
+ this.render = function(ctx) {
+ // NO RENDER
+ }
+ }
+ svg.Element.filter.prototype = new svg.Element.ElementBase;
+
+ svg.Element.feGaussianBlur = function(node) {
+ this.base = svg.Element.ElementBase;
+ this.base(node);
+
+ function make_fgauss(sigma) {
+ sigma = Math.max(sigma, 0.01);
+ var len = Math.ceil(sigma * 4.0) + 1;
+ mask = [];
+ for (var i = 0; i < len; i++) {
+ mask[i] = Math.exp(-0.5 * (i / sigma) * (i / sigma));
+ }
+ return mask;
+ }
+
+ function normalize(mask) {
+ var sum = 0;
+ for (var i = 1; i < mask.length; i++) {
+ sum += Math.abs(mask[i]);
+ }
+ sum = 2 * sum + Math.abs(mask[0]);
+ for (var i = 0; i < mask.length; i++) {
+ mask[i] /= sum;
+ }
+ return mask;
+ }
+
+ function convolve_even(src, dst, mask, width, height) {
+ for (var y = 0; y < height; y++) {
+ for (var x = 0; x < width; x++) {
+ var a = imGet(src, x, y, width, height, 3)/255;
+ for (var rgba = 0; rgba < 4; rgba++) {
+ var sum = mask[0] * (a==0?255:imGet(src, x, y, width, height, rgba)) * (a==0||rgba==3?1:a);
+ for (var i = 1; i < mask.length; i++) {
+ var a1 = imGet(src, Math.max(x-i,0), y, width, height, 3)/255;
+ var a2 = imGet(src, Math.min(x+i, width-1), y, width, height, 3)/255;
+ sum += mask[i] *
+ ((a1==0?255:imGet(src, Math.max(x-i,0), y, width, height, rgba)) * (a1==0||rgba==3?1:a1) +
+ (a2==0?255:imGet(src, Math.min(x+i, width-1), y, width, height, rgba)) * (a2==0||rgba==3?1:a2));
+ }
+ imSet(dst, y, x, height, width, rgba, sum);
+ }
+ }
+ }
+ }
+
+ function imGet(img, x, y, width, height, rgba) {
+ return img[y*width*4 + x*4 + rgba];
+ }
+
+ function imSet(img, x, y, width, height, rgba, val) {
+ img[y*width*4 + x*4 + rgba] = val;
+ }
+
+ function blur(ctx, width, height, sigma)
+ {
+ var srcData = ctx.getImageData(0, 0, width, height);
+ var mask = make_fgauss(sigma);
+ mask = normalize(mask);
+ tmp = [];
+ convolve_even(srcData.data, tmp, mask, width, height);
+ convolve_even(tmp, srcData.data, mask, height, width);
+ ctx.clearRect(0, 0, width, height);
+ ctx.putImageData(srcData, 0, 0);
+ }
+
+ this.apply = function(ctx, x, y, width, height) {
+ // assuming x==0 && y==0 for now
+ blur(ctx, width, height, this.attribute('stdDeviation').numValue());
+ }
+ }
+ svg.Element.filter.prototype = new svg.Element.feGaussianBlur;
+
+ // title element, do nothing
+ svg.Element.title = function(node) {
+ }
+ svg.Element.title.prototype = new svg.Element.ElementBase;
+
+ // desc element, do nothing
+ svg.Element.desc = function(node) {
+ }
+ svg.Element.desc.prototype = new svg.Element.ElementBase;
+
+ svg.Element.MISSING = function(node) {
+ console.log('ERROR: Element \'' + node.nodeName + '\' not yet implemented.');
+ }
+ svg.Element.MISSING.prototype = new svg.Element.ElementBase;
+
+ // element factory
+ svg.CreateElement = function(node) {
+ var className = node.nodeName.replace(/^[^:]+:/,''); // remove namespace
+ className = className.replace(/\-/g,''); // remove dashes
+ var e = null;
+ if (typeof(svg.Element[className]) != 'undefined') {
+ e = new svg.Element[className](node);
+ }
+ else {
+ e = new svg.Element.MISSING(node);
+ }
+
+ e.type = node.nodeName;
+ return e;
+ }
+
+ // load from url
+ svg.load = function(ctx, url) {
+ svg.loadXml(ctx, svg.ajax(url));
+ }
+
+ // load from xml
+ svg.loadXml = function(ctx, xml) {
+ svg.loadXmlDoc(ctx, svg.parseXml(xml));
+ }
+
+ svg.loadXmlDoc = function(ctx, dom) {
+ svg.init(ctx);
+
+ var mapXY = function(p) {
+ var e = ctx.canvas;
+ while (e) {
+ p.x -= e.offsetLeft;
+ p.y -= e.offsetTop;
+ e = e.offsetParent;
+ }
+ if (window.scrollX) p.x += window.scrollX;
+ if (window.scrollY) p.y += window.scrollY;
+ return p;
+ }
+
+ // bind mouse
+ if (svg.opts['ignoreMouse'] != true) {
+ ctx.canvas.onclick = function(e) {
+ var p = mapXY(new svg.Point(e != null ? e.clientX : event.clientX, e != null ? e.clientY : event.clientY));
+ svg.Mouse.onclick(p.x, p.y);
+ };
+ ctx.canvas.onmousemove = function(e) {
+ var p = mapXY(new svg.Point(e != null ? e.clientX : event.clientX, e != null ? e.clientY : event.clientY));
+ svg.Mouse.onmousemove(p.x, p.y);
+ };
+ }
+
+ var e = svg.CreateElement(dom.documentElement);
+ e.root = true;
+
+ // render loop
+ var isFirstRender = true;
+ var draw = function() {
+ svg.ViewPort.Clear();
+ if (ctx.canvas.parentNode) svg.ViewPort.SetCurrent(ctx.canvas.parentNode.clientWidth, ctx.canvas.parentNode.clientHeight);
+
+ if (svg.opts['ignoreDimensions'] != true) {
+ // set canvas size
+ if (e.style('width').hasValue()) {
+ ctx.canvas.width = e.style('width').Length.toPixels('x');
+ ctx.canvas.style.width = ctx.canvas.width + 'px';
+ }
+ if (e.style('height').hasValue()) {
+ ctx.canvas.height = e.style('height').Length.toPixels('y');
+ ctx.canvas.style.height = ctx.canvas.height + 'px';
+ }
+ }
+ var cWidth = ctx.canvas.clientWidth || ctx.canvas.width;
+ var cHeight = ctx.canvas.clientHeight || ctx.canvas.height;
+ svg.ViewPort.SetCurrent(cWidth, cHeight);
+
+ if (svg.opts != null && svg.opts['offsetX'] != null) e.attribute('x', true).value = svg.opts['offsetX'];
+ if (svg.opts != null && svg.opts['offsetY'] != null) e.attribute('y', true).value = svg.opts['offsetY'];
+ if (svg.opts != null && svg.opts['scaleWidth'] != null && svg.opts['scaleHeight'] != null) {
+ var xRatio = 1, yRatio = 1;
+ if (e.attribute('width').hasValue()) xRatio = e.attribute('width').Length.toPixels('x') / svg.opts['scaleWidth'];
+ if (e.attribute('height').hasValue()) yRatio = e.attribute('height').Length.toPixels('y') / svg.opts['scaleHeight'];
+
+ e.attribute('width', true).value = svg.opts['scaleWidth'];
+ e.attribute('height', true).value = svg.opts['scaleHeight'];
+ e.attribute('viewBox', true).value = '0 0 ' + (cWidth * xRatio) + ' ' + (cHeight * yRatio);
+ e.attribute('preserveAspectRatio', true).value = 'none';
+ }
+
+ // clear and render
+ if (svg.opts['ignoreClear'] != true) {
+ ctx.clearRect(0, 0, cWidth, cHeight);
+ }
+ e.render(ctx);
+ if (isFirstRender) {
+ isFirstRender = false;
+ if (svg.opts != null && typeof(svg.opts['renderCallback']) == 'function') svg.opts['renderCallback']();
+ }
+ }
+
+ var waitingForImages = true;
+ if (svg.ImagesLoaded()) {
+ waitingForImages = false;
+ draw();
+ }
+ svg.intervalID = setInterval(function() {
+ var needUpdate = false;
+
+ if (waitingForImages && svg.ImagesLoaded()) {
+ waitingForImages = false;
+ needUpdate = true;
+ }
+
+ // need update from mouse events?
+ if (svg.opts['ignoreMouse'] != true) {
+ needUpdate = needUpdate | svg.Mouse.hasEvents();
+ }
+
+ // need update from animations?
+ if (svg.opts['ignoreAnimation'] != true) {
+ for (var i=0; i<svg.Animations.length; i++) {
+ needUpdate = needUpdate | svg.Animations[i].update(1000 / svg.FRAMERATE);
+ }
+ }
+
+ // need update from redraw?
+ if (svg.opts != null && typeof(svg.opts['forceRedraw']) == 'function') {
+ if (svg.opts['forceRedraw']() == true) needUpdate = true;
+ }
+
+ // render if needed
+ if (needUpdate) {
+ draw();
+ svg.Mouse.runEvents(); // run and clear our events
+ }
+ }, 1000 / svg.FRAMERATE);
+ }
+
+ svg.stop = function() {
+ if (svg.intervalID) {
+ clearInterval(svg.intervalID);
+ }
+ }
+
+ svg.Mouse = new (function() {
+ this.events = [];
+ this.hasEvents = function() { return this.events.length != 0; }
+
+ this.onclick = function(x, y) {
+ this.events.push({ type: 'onclick', x: x, y: y,
+ run: function(e) { if (e.onclick) e.onclick(); }
+ });
+ }
+
+ this.onmousemove = function(x, y) {
+ this.events.push({ type: 'onmousemove', x: x, y: y,
+ run: function(e) { if (e.onmousemove) e.onmousemove(); }
+ });
+ }
+
+ this.eventElements = [];
+
+ this.checkPath = function(element, ctx) {
+ for (var i=0; i<this.events.length; i++) {
+ var e = this.events[i];
+ if (ctx.isPointInPath && ctx.isPointInPath(e.x, e.y)) this.eventElements[i] = element;
+ }
+ }
+
+ this.checkBoundingBox = function(element, bb) {
+ for (var i=0; i<this.events.length; i++) {
+ var e = this.events[i];
+ if (bb.isPointInBox(e.x, e.y)) this.eventElements[i] = element;
+ }
+ }
+
+ this.runEvents = function() {
+ svg.ctx.canvas.style.cursor = '';
+
+ for (var i=0; i<this.events.length; i++) {
+ var e = this.events[i];
+ var element = this.eventElements[i];
+ while (element) {
+ e.run(element);
+ element = element.parent;
+ }
+ }
+
+ // done running, clear
+ this.events = [];
+ this.eventElements = [];
+ }
+ });
+
+ return svg;
+ }
+})();
+
+if (CanvasRenderingContext2D) {
+ CanvasRenderingContext2D.prototype.drawSvg = function(s, dx, dy, dw, dh) {
+ canvg(this.canvas, s, {
+ ignoreMouse: true,
+ ignoreAnimation: true,
+ ignoreDimensions: true,
+ ignoreClear: true,
+ offsetX: dx,
+ offsetY: dy,
+ scaleWidth: dw,
+ scaleHeight: dh
+ });
+ }
+}/**
+ * @license Highcharts JS v2.2.5 (2012-06-08)
+ * CanVGRenderer Extension module
+ *
+ * (c) 2011-2012 Torstein Hønsi, Erik Olsson
+ *
+ * License: www.highcharts.com/license
+ */
+
+// JSLint options:
+/*global Highcharts */
+
+(function (Highcharts) { // encapsulate
+ var UNDEFINED,
+ DIV = 'div',
+ ABSOLUTE = 'absolute',
+ RELATIVE = 'relative',
+ HIDDEN = 'hidden',
+ VISIBLE = 'visible',
+ PX = 'px',
+ css = Highcharts.css,
+ CanVGRenderer = Highcharts.CanVGRenderer,
+ SVGRenderer = Highcharts.SVGRenderer,
+ extend = Highcharts.extend,
+ merge = Highcharts.merge,
+ addEvent = Highcharts.addEvent,
+ createElement = Highcharts.createElement,
+ discardElement = Highcharts.discardElement;
+
+ // Extend CanVG renderer on demand, inherit from SVGRenderer
+ extend(CanVGRenderer.prototype, SVGRenderer.prototype);
+
+ // Add additional functionality:
+ extend(CanVGRenderer.prototype, {
+ create: function (chart, container, chartWidth, chartHeight) {
+ this.setContainer(container, chartWidth, chartHeight);
+ this.configure(chart);
+ },
+ setContainer: function (container, chartWidth, chartHeight) {
+ var containerStyle = container.style,
+ containerParent = container.parentNode,
+ containerLeft = containerStyle.left,
+ containerTop = containerStyle.top,
+ containerOffsetWidth = container.offsetWidth,
+ containerOffsetHeight = container.offsetHeight,
+ canvas,
+ initialHiddenStyle = { visibility: HIDDEN, position: ABSOLUTE };
+
+ this.init.apply(this, [container, chartWidth, chartHeight]);
+
+ // add the canvas above it
+ canvas = createElement('canvas', {
+ width: containerOffsetWidth,
+ height: containerOffsetHeight
+ }, {
+ position: RELATIVE,
+ left: containerLeft,
+ top: containerTop
+ }, container);
+ this.canvas = canvas;
+
+ // Create the tooltip line and div, they are placed as siblings to
+ // the container (and as direct childs to the div specified in the html page)
+ this.ttLine = createElement(DIV, null, initialHiddenStyle, containerParent);
+ this.ttDiv = createElement(DIV, null, initialHiddenStyle, containerParent);
+ this.ttTimer = UNDEFINED;
+
+ // Move away the svg node to a new div inside the container's parent so we can hide it.
+ var hiddenSvg = createElement(DIV, {
+ width: containerOffsetWidth,
+ height: containerOffsetHeight
+ }, {
+ visibility: HIDDEN,
+ left: containerLeft,
+ top: containerTop
+ }, containerParent);
+ this.hiddenSvg = hiddenSvg;
+ hiddenSvg.appendChild(this.box);
+ },
+
+ /**
+ * Configures the renderer with the chart. Attach a listener to the event tooltipRefresh.
+ **/
+ configure: function (chart) {
+ var renderer = this,
+ options = chart.options.tooltip,
+ borderWidth = options.borderWidth,
+ tooltipDiv = renderer.ttDiv,
+ tooltipDivStyle = options.style,
+ tooltipLine = renderer.ttLine,
+ padding = parseInt(tooltipDivStyle.padding, 10);
+
+ // Add border styling from options to the style
+ tooltipDivStyle = merge(tooltipDivStyle, {
+ padding: padding + PX,
+ 'background-color': options.backgroundColor,
+ 'border-style': 'solid',
+ 'border-width': borderWidth + PX,
+ 'border-radius': options.borderRadius + PX
+ });
+
+ // Optionally add shadow
+ if (options.shadow) {
+ tooltipDivStyle = merge(tooltipDivStyle, {
+ 'box-shadow': '1px 1px 3px gray', // w3c
+ '-webkit-box-shadow': '1px 1px 3px gray' // webkit
+ });
+ }
+ css(tooltipDiv, tooltipDivStyle);
+
+ // Set simple style on the line
+ css(tooltipLine, {
+ 'border-left': '1px solid darkgray'
+ });
+
+ // This event is triggered when a new tooltip should be shown
+ addEvent(chart, 'tooltipRefresh', function (args) {
+ var chartContainer = chart.container,
+ offsetLeft = chartContainer.offsetLeft,
+ offsetTop = chartContainer.offsetTop,
+ position;
+
+ // Set the content of the tooltip
+ tooltipDiv.innerHTML = args.text;
+
+ // Compute the best position for the tooltip based on the divs size and container size.
+ position = chart.tooltip.getPosition(tooltipDiv.offsetWidth, tooltipDiv.offsetHeight, {plotX: args.x, plotY: args.y});
+
+ css(tooltipDiv, {
+ visibility: VISIBLE,
+ left: position.x + PX,
+ top: position.y + PX,
+ 'border-color': args.borderColor
+ });
+
+ // Position the tooltip line
+ css(tooltipLine, {
+ visibility: VISIBLE,
+ left: offsetLeft + args.x + PX,
+ top: offsetTop + chart.plotTop + PX,
+ height: chart.plotHeight + PX
+ });
+
+ // This timeout hides the tooltip after 3 seconds
+ // First clear any existing timer
+ if (renderer.ttTimer !== UNDEFINED) {
+ clearTimeout(renderer.ttTimer);
+ }
+
+ // Start a new timer that hides tooltip and line
+ renderer.ttTimer = setTimeout(function () {
+ css(tooltipDiv, { visibility: HIDDEN });
+ css(tooltipLine, { visibility: HIDDEN });
+ }, 3000);
+ });
+ },
+
+ /**
+ * Extend SVGRenderer.destroy to also destroy the elements added by CanVGRenderer.
+ */
+ destroy: function () {
+ var renderer = this;
+
+ // Remove the canvas
+ discardElement(renderer.canvas);
+
+ // Kill the timer
+ if (renderer.ttTimer !== UNDEFINED) {
+ clearTimeout(renderer.ttTimer);
+ }
+
+ // Remove the divs for tooltip and line
+ discardElement(renderer.ttLine);
+ discardElement(renderer.ttDiv);
+ discardElement(renderer.hiddenSvg);
+
+ // Continue with base class
+ return SVGRenderer.prototype.destroy.apply(renderer);
+ },
+
+ /**
+ * Take a color and return it if it's a string, do not make it a gradient even if it is a
+ * gradient. Currently canvg cannot render gradients (turns out black),
+ * see: http://code.google.com/p/canvg/issues/detail?id=104
+ *
+ * @param {Object} color The color or config object
+ */
+ color: function (color, elem, prop) {
+ if (color && color.linearGradient) {
+ // Pick the end color and forward to base implementation
+ color = color.stops[color.stops.length - 1][1];
+ }
+ return SVGRenderer.prototype.color.call(this, color, elem, prop);
+ },
+
+ /**
+ * Draws the SVG on the canvas or adds a draw invokation to the deferred list.
+ */
+ draw: function () {
+ var renderer = this;
+ window.canvg(renderer.canvas, renderer.hiddenSvg.innerHTML);
+ }
+ });
+}(Highcharts));
diff --git a/management/guns-admin/src/main/webapp/static/js/plugins/highcharts/modules/data.js b/management/guns-admin/src/main/webapp/static/js/plugins/highcharts/modules/data.js
new file mode 100644
index 0000000..42a5fdb
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/static/js/plugins/highcharts/modules/data.js
@@ -0,0 +1,17 @@
+/*
+ Data plugin for Highcharts
+
+ (c) 2012-2014 Torstein Honsi
+
+ License: www.highcharts.com/license
+*/
+(function(j){var m=j.each,n=function(b,a){this.init(b,a)};j.extend(n.prototype,{init:function(b,a){this.options=b;this.chartOptions=a;this.columns=b.columns||this.rowsToColumns(b.rows)||[];this.columns.length?this.dataFound():(this.parseCSV(),this.parseTable(),this.parseGoogleSpreadsheet())},getColumnDistribution:function(){var b=this.chartOptions,a=b&&b.chart&&b.chart.type,c=[];m(b&&b.series||[],function(b){c.push((j.seriesTypes[b.type||a||"line"].prototype.pointArrayMap||[0]).length)});this.valueCount=
+{global:(j.seriesTypes[a||"line"].prototype.pointArrayMap||[0]).length,individual:c}},dataFound:function(){if(this.options.switchRowsAndColumns)this.columns=this.rowsToColumns(this.columns);this.parseTypes();this.findHeaderRow();this.parsed();this.complete()},parseCSV:function(){var b=this,a=this.options,c=a.csv,d=this.columns,e=a.startRow||0,f=a.endRow||Number.MAX_VALUE,i=a.startColumn||0,h=a.endColumn||Number.MAX_VALUE,g,k,o=0;c&&(k=c.replace(/\r\n/g,"\n").replace(/\r/g,"\n").split(a.lineDelimiter||
+"\n"),g=a.itemDelimiter||(c.indexOf("\t")!==-1?"\t":","),m(k,function(a,c){var k=b.trim(a),j=k.indexOf("#")===0;c>=e&&c<=f&&!j&&k!==""&&(k=a.split(g),m(k,function(b,a){a>=i&&a<=h&&(d[a-i]||(d[a-i]=[]),d[a-i][o]=b)}),o+=1)}),this.dataFound())},parseTable:function(){var b=this.options,a=b.table,c=this.columns,d=b.startRow||0,e=b.endRow||Number.MAX_VALUE,f=b.startColumn||0,i=b.endColumn||Number.MAX_VALUE;a&&(typeof a==="string"&&(a=document.getElementById(a)),m(a.getElementsByTagName("tr"),function(a,
+b){b>=d&&b<=e&&m(a.children,function(a,e){if((a.tagName==="TD"||a.tagName==="TH")&&e>=f&&e<=i)c[e-f]||(c[e-f]=[]),c[e-f][b-d]=a.innerHTML})}),this.dataFound())},parseGoogleSpreadsheet:function(){var b=this,a=this.options,c=a.googleSpreadsheetKey,d=this.columns,e=a.startRow||0,f=a.endRow||Number.MAX_VALUE,i=a.startColumn||0,h=a.endColumn||Number.MAX_VALUE,g,k;c&&jQuery.ajax({dataType:"json",url:"https://spreadsheets.google.com/feeds/cells/"+c+"/"+(a.googleSpreadsheetWorksheet||"od6")+"/public/values?alt=json-in-script&callback=?",
+error:a.error,success:function(a){var a=a.feed.entry,c,j=a.length,m=0,n=0,l;for(l=0;l<j;l++)c=a[l],m=Math.max(m,c.gs$cell.col),n=Math.max(n,c.gs$cell.row);for(l=0;l<m;l++)if(l>=i&&l<=h)d[l-i]=[],d[l-i].length=Math.min(n,f-e);for(l=0;l<j;l++)if(c=a[l],g=c.gs$cell.row-1,k=c.gs$cell.col-1,k>=i&&k<=h&&g>=e&&g<=f)d[k-i][g-e]=c.content.$t;b.dataFound()}})},findHeaderRow:function(){m(this.columns,function(){});this.headerRow=0},trim:function(b){return typeof b==="string"?b.replace(/^\s+|\s+$/g,""):b},parseTypes:function(){for(var b=
+this.columns,a=b.length,c,d,e,f;a--;)for(c=b[a].length;c--;)d=b[a][c],e=parseFloat(d),f=this.trim(d),f==e?(b[a][c]=e,e>31536E6?b[a].isDatetime=!0:b[a].isNumeric=!0):(d=this.parseDate(d),a===0&&typeof d==="number"&&!isNaN(d)?(b[a][c]=d,b[a].isDatetime=!0):b[a][c]=f===""?null:f)},dateFormats:{"YYYY-mm-dd":{regex:"^([0-9]{4})-([0-9]{2})-([0-9]{2})$",parser:function(b){return Date.UTC(+b[1],b[2]-1,+b[3])}}},parseDate:function(b){var a=this.options.parseDate,c,d,e;a&&(c=a(b));if(typeof b==="string")for(d in this.dateFormats)a=
+this.dateFormats[d],(e=b.match(a.regex))&&(c=a.parser(e));return c},rowsToColumns:function(b){var a,c,d,e,f;if(b){f=[];c=b.length;for(a=0;a<c;a++){e=b[a].length;for(d=0;d<e;d++)f[d]||(f[d]=[]),f[d][a]=b[a][d]}}return f},parsed:function(){this.options.parsed&&this.options.parsed.call(this,this.columns)},complete:function(){var b=this.columns,a,c,d=this.options,e,f,i,h,g,k;if(d.complete||d.afterComplete){this.getColumnDistribution();b.length>1&&(a=b.shift(),this.headerRow===0&&a.shift(),a.isDatetime?
+c="datetime":a.isNumeric||(c="category"));for(h=0;h<b.length;h++)if(this.headerRow===0)b[h].name=b[h].shift();f=[];for(h=0,k=0;h<b.length;k++){e=j.pick(this.valueCount.individual[k],this.valueCount.global);i=[];if(h+e<=b.length)for(g=0;g<b[h].length;g++)i[g]=[a[g],b[h][g]!==void 0?b[h][g]:null],e>1&&i[g].push(b[h+1][g]!==void 0?b[h+1][g]:null),e>2&&i[g].push(b[h+2][g]!==void 0?b[h+2][g]:null),e>3&&i[g].push(b[h+3][g]!==void 0?b[h+3][g]:null),e>4&&i[g].push(b[h+4][g]!==void 0?b[h+4][g]:null);f[k]=
+{name:b[h].name,data:i};h+=e}b={xAxis:{type:c},series:f};d.complete&&d.complete(b);d.afterComplete&&d.afterComplete(b)}}});j.Data=n;j.data=function(b,a){return new n(b,a)};j.wrap(j.Chart.prototype,"init",function(b,a,c){var d=this;a&&a.data?j.data(j.extend(a.data,{afterComplete:function(e){var f,i;if(a.hasOwnProperty("series"))if(typeof a.series==="object")for(f=Math.max(a.series.length,e.series.length);f--;)i=a.series[f]||{},a.series[f]=j.merge(i,e.series[f]);else delete a.series;a=j.merge(e,a);
+b.call(d,a,c)}}),a):b.call(d,a,c)})})(Highcharts);
diff --git a/management/guns-admin/src/main/webapp/static/js/plugins/highcharts/modules/data.src.js b/management/guns-admin/src/main/webapp/static/js/plugins/highcharts/modules/data.src.js
new file mode 100644
index 0000000..a8a0a70
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/static/js/plugins/highcharts/modules/data.src.js
@@ -0,0 +1,622 @@
+/**
+ * @license Data plugin for Highcharts
+ *
+ * (c) 2012-2014 Torstein Honsi
+ *
+ * License: www.highcharts.com/license
+ */
+
+/*
+ * The Highcharts Data plugin is a utility to ease parsing of input sources like
+ * CSV, HTML tables or grid views into basic configuration options for use
+ * directly in the Highcharts constructor.
+ *
+ * Demo: http://jsfiddle.net/highcharts/SnLFj/
+ *
+ * --- OPTIONS ---
+ *
+ * - columns : Array<Array<Mixed>>
+ * A two-dimensional array representing the input data on tabular form. This input can
+ * be used when the data is already parsed, for example from a grid view component.
+ * Each cell can be a string or number. If not switchRowsAndColumns is set, the columns
+ * are interpreted as series. See also the rows option.
+ *
+ * - complete : Function(chartOptions)
+ * The callback that is evaluated when the data is finished loading, optionally from an
+ * external source, and parsed. The first argument passed is a finished chart options
+ * object, containing the series. Thise options
+ * can be extended with additional options and passed directly to the chart constructor. This is
+ * related to the parsed callback, that goes in at an earlier stage.
+ *
+ * - csv : String
+ * A comma delimited string to be parsed. Related options are startRow, endRow, startColumn
+ * and endColumn to delimit what part of the table is used. The lineDelimiter and
+ * itemDelimiter options define the CSV delimiter formats.
+ *
+ * - endColumn : Integer
+ * In tabular input data, the first row (indexed by 0) to use. Defaults to the last
+ * column containing data.
+ *
+ * - endRow : Integer
+ * In tabular input data, the last row (indexed by 0) to use. Defaults to the last row
+ * containing data.
+ *
+ * - googleSpreadsheetKey : String
+ * A Google Spreadsheet key. See https://developers.google.com/gdata/samples/spreadsheet_sample
+ * for general information on GS.
+ *
+ * - googleSpreadsheetWorksheet : String
+ * The Google Spreadsheet worksheet. The available id's can be read from
+ * https://spreadsheets.google.com/feeds/worksheets/{key}/public/basic
+ *
+ * - itemDelimiter : String
+ * Item or cell delimiter for parsing CSV. Defaults to the tab character "\t" if a tab character
+ * is found in the CSV string, if not it defaults to ",".
+ *
+ * - lineDelimiter : String
+ * Line delimiter for parsing CSV. Defaults to "\n".
+ *
+ * - parsed : Function
+ * A callback function to access the parsed columns, the two-dimentional input data
+ * array directly, before they are interpreted into series data and categories. See also
+ * the complete callback, that goes in on a later stage where the raw columns are interpreted
+ * into a Highcharts option structure.
+ *
+ * - parseDate : Function
+ * A callback function to parse string representations of dates into JavaScript timestamps.
+ * Return an integer on success.
+ *
+ * - rows : Array<Array<Mixed>>
+ * The same as the columns input option, but defining rows intead of columns.
+ *
+ * - startColumn : Integer
+ * In tabular input data, the first column (indexed by 0) to use.
+ *
+ * - startRow : Integer
+ * In tabular input data, the first row (indexed by 0) to use.
+ *
+ * - switchRowsAndColumns : Boolean
+ * Switch rows and columns of the input data, so that this.columns effectively becomes the
+ * rows of the data set, and the rows are interpreted as series.
+ *
+ * - table : String|HTMLElement
+ * A HTML table or the id of such to be parsed as input data. Related options ara startRow,
+ * endRow, startColumn and endColumn to delimit what part of the table is used.
+ */
+
+// JSLint options:
+/*global jQuery */
+
+(function (Highcharts) { // docs
+
+ // Utilities
+ var each = Highcharts.each;
+
+
+ // The Data constructor
+ var Data = function (dataOptions, chartOptions) {
+ this.init(dataOptions, chartOptions);
+ };
+
+ // Set the prototype properties
+ Highcharts.extend(Data.prototype, {
+
+ /**
+ * Initialize the Data object with the given options
+ */
+ init: function (options, chartOptions) {
+ this.options = options;
+ this.chartOptions = chartOptions;
+ this.columns = options.columns || this.rowsToColumns(options.rows) || [];
+
+ // No need to parse or interpret anything
+ if (this.columns.length) {
+ this.dataFound();
+
+ // Parse and interpret
+ } else {
+
+ // Parse a CSV string if options.csv is given
+ this.parseCSV();
+
+ // Parse a HTML table if options.table is given
+ this.parseTable();
+
+ // Parse a Google Spreadsheet
+ this.parseGoogleSpreadsheet();
+ }
+
+ },
+
+ /**
+ * Get the column distribution. For example, a line series takes a single column for
+ * Y values. A range series takes two columns for low and high values respectively,
+ * and an OHLC series takes four columns.
+ */
+ getColumnDistribution: function () {
+ var chartOptions = this.chartOptions,
+ getValueCount = function (type) {
+ return (Highcharts.seriesTypes[type || 'line'].prototype.pointArrayMap || [0]).length;
+ },
+ globalType = chartOptions && chartOptions.chart && chartOptions.chart.type,
+ individualCounts = [];
+
+ each((chartOptions && chartOptions.series) || [], function (series) {
+ individualCounts.push(getValueCount(series.type || globalType));
+ });
+
+ this.valueCount = {
+ global: getValueCount(globalType),
+ individual: individualCounts
+ };
+ },
+
+ /**
+ * When the data is parsed into columns, either by CSV, table, GS or direct input,
+ * continue with other operations.
+ */
+ dataFound: function () {
+
+ if (this.options.switchRowsAndColumns) {
+ this.columns = this.rowsToColumns(this.columns);
+ }
+
+ // Interpret the values into right types
+ this.parseTypes();
+
+ // Use first row for series names?
+ this.findHeaderRow();
+
+ // Handle columns if a handleColumns callback is given
+ this.parsed();
+
+ // Complete if a complete callback is given
+ this.complete();
+
+ },
+
+ /**
+ * Parse a CSV input string
+ */
+ parseCSV: function () {
+ var self = this,
+ options = this.options,
+ csv = options.csv,
+ columns = this.columns,
+ startRow = options.startRow || 0,
+ endRow = options.endRow || Number.MAX_VALUE,
+ startColumn = options.startColumn || 0,
+ endColumn = options.endColumn || Number.MAX_VALUE,
+ itemDelimiter,
+ lines,
+ activeRowNo = 0;
+
+ if (csv) {
+
+ lines = csv
+ .replace(/\r\n/g, "\n") // Unix
+ .replace(/\r/g, "\n") // Mac
+ .split(options.lineDelimiter || "\n");
+
+ itemDelimiter = options.itemDelimiter || (csv.indexOf('\t') !== -1 ? '\t' : ',');
+
+ each(lines, function (line, rowNo) {
+ var trimmed = self.trim(line),
+ isComment = trimmed.indexOf('#') === 0,
+ isBlank = trimmed === '',
+ items;
+
+ if (rowNo >= startRow && rowNo <= endRow && !isComment && !isBlank) {
+ items = line.split(itemDelimiter);
+ each(items, function (item, colNo) {
+ if (colNo >= startColumn && colNo <= endColumn) {
+ if (!columns[colNo - startColumn]) {
+ columns[colNo - startColumn] = [];
+ }
+
+ columns[colNo - startColumn][activeRowNo] = item;
+ }
+ });
+ activeRowNo += 1;
+ }
+ });
+
+ this.dataFound();
+ }
+ },
+
+ /**
+ * Parse a HTML table
+ */
+ parseTable: function () {
+ var options = this.options,
+ table = options.table,
+ columns = this.columns,
+ startRow = options.startRow || 0,
+ endRow = options.endRow || Number.MAX_VALUE,
+ startColumn = options.startColumn || 0,
+ endColumn = options.endColumn || Number.MAX_VALUE;
+
+ if (table) {
+
+ if (typeof table === 'string') {
+ table = document.getElementById(table);
+ }
+
+ each(table.getElementsByTagName('tr'), function (tr, rowNo) {
+ if (rowNo >= startRow && rowNo <= endRow) {
+ each(tr.children, function (item, colNo) {
+ if ((item.tagName === 'TD' || item.tagName === 'TH') && colNo >= startColumn && colNo <= endColumn) {
+ if (!columns[colNo - startColumn]) {
+ columns[colNo - startColumn] = [];
+ }
+
+ columns[colNo - startColumn][rowNo - startRow] = item.innerHTML;
+ }
+ });
+ }
+ });
+
+ this.dataFound(); // continue
+ }
+ },
+
+ /**
+ */
+ parseGoogleSpreadsheet: function () {
+ var self = this,
+ options = this.options,
+ googleSpreadsheetKey = options.googleSpreadsheetKey,
+ columns = this.columns,
+ startRow = options.startRow || 0,
+ endRow = options.endRow || Number.MAX_VALUE,
+ startColumn = options.startColumn || 0,
+ endColumn = options.endColumn || Number.MAX_VALUE,
+ gr, // google row
+ gc; // google column
+
+ if (googleSpreadsheetKey) {
+ jQuery.ajax({
+ dataType: 'json',
+ url: 'https://spreadsheets.google.com/feeds/cells/' +
+ googleSpreadsheetKey + '/' + (options.googleSpreadsheetWorksheet || 'od6') +
+ '/public/values?alt=json-in-script&callback=?',
+ error: options.error,
+ success: function (json) {
+ // Prepare the data from the spreadsheat
+ var cells = json.feed.entry,
+ cell,
+ cellCount = cells.length,
+ colCount = 0,
+ rowCount = 0,
+ i;
+
+ // First, find the total number of columns and rows that
+ // are actually filled with data
+ for (i = 0; i < cellCount; i++) {
+ cell = cells[i];
+ colCount = Math.max(colCount, cell.gs$cell.col);
+ rowCount = Math.max(rowCount, cell.gs$cell.row);
+ }
+
+ // Set up arrays containing the column data
+ for (i = 0; i < colCount; i++) {
+ if (i >= startColumn && i <= endColumn) {
+ // Create new columns with the length of either end-start or rowCount
+ columns[i - startColumn] = [];
+
+ // Setting the length to avoid jslint warning
+ columns[i - startColumn].length = Math.min(rowCount, endRow - startRow);
+ }
+ }
+
+ // Loop over the cells and assign the value to the right
+ // place in the column arrays
+ for (i = 0; i < cellCount; i++) {
+ cell = cells[i];
+ gr = cell.gs$cell.row - 1; // rows start at 1
+ gc = cell.gs$cell.col - 1; // columns start at 1
+
+ // If both row and col falls inside start and end
+ // set the transposed cell value in the newly created columns
+ if (gc >= startColumn && gc <= endColumn &&
+ gr >= startRow && gr <= endRow) {
+ columns[gc - startColumn][gr - startRow] = cell.content.$t;
+ }
+ }
+ self.dataFound();
+ }
+ });
+ }
+ },
+
+ /**
+ * Find the header row. For now, we just check whether the first row contains
+ * numbers or strings. Later we could loop down and find the first row with
+ * numbers.
+ */
+ findHeaderRow: function () {
+ var headerRow = 0;
+ each(this.columns, function (column) {
+ if (typeof column[0] !== 'string') {
+ headerRow = null;
+ }
+ });
+ this.headerRow = 0;
+ },
+
+ /**
+ * Trim a string from whitespace
+ */
+ trim: function (str) {
+ return typeof str === 'string' ? str.replace(/^\s+|\s+$/g, '') : str;
+ },
+
+ /**
+ * Parse numeric cells in to number types and date types in to true dates.
+ */
+ parseTypes: function () {
+ var columns = this.columns,
+ col = columns.length,
+ row,
+ val,
+ floatVal,
+ trimVal,
+ dateVal;
+
+ while (col--) {
+ row = columns[col].length;
+ while (row--) {
+ val = columns[col][row];
+ floatVal = parseFloat(val);
+ trimVal = this.trim(val);
+
+ /*jslint eqeq: true*/
+ if (trimVal == floatVal) { // is numeric
+ /*jslint eqeq: false*/
+ columns[col][row] = floatVal;
+
+ // If the number is greater than milliseconds in a year, assume datetime
+ if (floatVal > 365 * 24 * 3600 * 1000) {
+ columns[col].isDatetime = true;
+ } else {
+ columns[col].isNumeric = true;
+ }
+
+ } else { // string, continue to determine if it is a date string or really a string
+ dateVal = this.parseDate(val);
+
+ if (col === 0 && typeof dateVal === 'number' && !isNaN(dateVal)) { // is date
+ columns[col][row] = dateVal;
+ columns[col].isDatetime = true;
+
+ } else { // string
+ columns[col][row] = trimVal === '' ? null : trimVal;
+ }
+ }
+
+ }
+ }
+ },
+
+ /**
+ * A collection of available date formats, extendable from the outside to support
+ * custom date formats.
+ */
+ dateFormats: {
+ 'YYYY-mm-dd': {
+ regex: '^([0-9]{4})-([0-9]{2})-([0-9]{2})$',
+ parser: function (match) {
+ return Date.UTC(+match[1], match[2] - 1, +match[3]);
+ }
+ }
+ },
+
+ /**
+ * Parse a date and return it as a number. Overridable through options.parseDate.
+ */
+ parseDate: function (val) {
+ var parseDate = this.options.parseDate,
+ ret,
+ key,
+ format,
+ match;
+
+ if (parseDate) {
+ ret = parseDate(val);
+ }
+
+ if (typeof val === 'string') {
+ for (key in this.dateFormats) {
+ format = this.dateFormats[key];
+ match = val.match(format.regex);
+ if (match) {
+ ret = format.parser(match);
+ }
+ }
+ }
+ return ret;
+ },
+
+ /**
+ * Reorganize rows into columns
+ */
+ rowsToColumns: function (rows) {
+ var row,
+ rowsLength,
+ col,
+ colsLength,
+ columns;
+
+ if (rows) {
+ columns = [];
+ rowsLength = rows.length;
+ for (row = 0; row < rowsLength; row++) {
+ colsLength = rows[row].length;
+ for (col = 0; col < colsLength; col++) {
+ if (!columns[col]) {
+ columns[col] = [];
+ }
+ columns[col][row] = rows[row][col];
+ }
+ }
+ }
+ return columns;
+ },
+
+ /**
+ * A hook for working directly on the parsed columns
+ */
+ parsed: function () {
+ if (this.options.parsed) {
+ this.options.parsed.call(this, this.columns);
+ }
+ },
+
+ /**
+ * If a complete callback function is provided in the options, interpret the
+ * columns into a Highcharts options object.
+ */
+ complete: function () {
+
+ var columns = this.columns,
+ firstCol,
+ type,
+ options = this.options,
+ valueCount,
+ series,
+ data,
+ i,
+ j,
+ seriesIndex,
+ chartOptions;
+
+
+ if (options.complete || options.afterComplete) {
+
+ this.getColumnDistribution();
+
+ // Use first column for X data or categories?
+ if (columns.length > 1) {
+ firstCol = columns.shift();
+ if (this.headerRow === 0) {
+ firstCol.shift(); // remove the first cell
+ }
+
+
+ if (firstCol.isDatetime) {
+ type = 'datetime';
+ } else if (!firstCol.isNumeric) {
+ type = 'category';
+ }
+ }
+
+ // Get the names and shift the top row
+ for (i = 0; i < columns.length; i++) {
+ if (this.headerRow === 0) {
+ columns[i].name = columns[i].shift();
+ }
+ }
+
+ // Use the next columns for series
+ series = [];
+ for (i = 0, seriesIndex = 0; i < columns.length; seriesIndex++) {
+
+ // This series' value count
+ valueCount = Highcharts.pick(this.valueCount.individual[seriesIndex], this.valueCount.global);
+
+ // Iterate down the cells of each column and add data to the series
+ data = [];
+
+ // Only loop and fill the data series if there are columns available.
+ // We need this check to avoid reading outside the array bounds.
+ if (i + valueCount <= columns.length) {
+ for (j = 0; j < columns[i].length; j++) {
+ data[j] = [
+ firstCol[j],
+ columns[i][j] !== undefined ? columns[i][j] : null
+ ];
+ if (valueCount > 1) {
+ data[j].push(columns[i + 1][j] !== undefined ? columns[i + 1][j] : null);
+ }
+ if (valueCount > 2) {
+ data[j].push(columns[i + 2][j] !== undefined ? columns[i + 2][j] : null);
+ }
+ if (valueCount > 3) {
+ data[j].push(columns[i + 3][j] !== undefined ? columns[i + 3][j] : null);
+ }
+ if (valueCount > 4) {
+ data[j].push(columns[i + 4][j] !== undefined ? columns[i + 4][j] : null);
+ }
+ }
+ }
+
+ // Add the series
+ series[seriesIndex] = {
+ name: columns[i].name,
+ data: data
+ };
+
+ i += valueCount;
+ }
+
+ // Do the callback
+ chartOptions = {
+ xAxis: {
+ type: type
+ },
+ series: series
+ };
+ if (options.complete) {
+ options.complete(chartOptions);
+ }
+ // The afterComplete hook is used internally to avoid conflict with the externally
+ // available complete option.
+ if (options.afterComplete) {
+ options.afterComplete(chartOptions);
+ }
+ }
+ }
+ });
+
+ // Register the Data prototype and data function on Highcharts
+ Highcharts.Data = Data;
+ Highcharts.data = function (options, chartOptions) {
+ return new Data(options, chartOptions);
+ };
+
+ // Extend Chart.init so that the Chart constructor accepts a new configuration
+ // option group, data.
+ Highcharts.wrap(Highcharts.Chart.prototype, 'init', function (proceed, userOptions, callback) {
+ var chart = this;
+
+ if (userOptions && userOptions.data) {
+ Highcharts.data(Highcharts.extend(userOptions.data, {
+ afterComplete: function (dataOptions) {
+ var i, series;
+
+ // Merge series configs
+ if (userOptions.hasOwnProperty('series')) {
+ if (typeof userOptions.series === 'object') {
+ i = Math.max(userOptions.series.length, dataOptions.series.length);
+ while (i--) {
+ series = userOptions.series[i] || {};
+ userOptions.series[i] = Highcharts.merge(series, dataOptions.series[i]);
+ }
+ } else { // Allow merging in dataOptions.series (#2856)
+ delete userOptions.series;
+ }
+ }
+
+ // Do the merge
+ userOptions = Highcharts.merge(dataOptions, userOptions);
+
+ proceed.call(chart, userOptions, callback);
+ }
+ }), userOptions);
+ } else {
+ proceed.call(chart, userOptions, callback);
+ }
+ });
+
+}(Highcharts));
diff --git a/management/guns-admin/src/main/webapp/static/js/plugins/highcharts/modules/drilldown.js b/management/guns-admin/src/main/webapp/static/js/plugins/highcharts/modules/drilldown.js
new file mode 100644
index 0000000..f8e3517
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/static/js/plugins/highcharts/modules/drilldown.js
@@ -0,0 +1,14 @@
+(function(g){function s(a,b,d){return"rgba("+[Math.round(a[0]+(b[0]-a[0])*d),Math.round(a[1]+(b[1]-a[1])*d),Math.round(a[2]+(b[2]-a[2])*d),a[3]+(b[3]-a[3])*d].join(",")+")"}var t=function(){},o=g.getOptions(),i=g.each,p=g.extend,x=g.format,y=g.pick,q=g.wrap,l=g.Chart,n=g.seriesTypes,u=n.pie,m=n.column,v=HighchartsAdapter.fireEvent,z=HighchartsAdapter.inArray;p(o.lang,{drillUpText:"◁ Back to {series.name}"});o.drilldown={activeAxisLabelStyle:{cursor:"pointer",color:"#0d233a",fontWeight:"bold",textDecoration:"underline"},
+activeDataLabelStyle:{cursor:"pointer",color:"#0d233a",fontWeight:"bold",textDecoration:"underline"},animation:{duration:500},drillUpButton:{position:{align:"right",x:-10,y:10}}};g.SVGRenderer.prototype.Element.prototype.fadeIn=function(a){this.attr({opacity:0.1,visibility:"inherit"}).animate({opacity:y(this.newOpacity,1)},a||{duration:250})};l.prototype.addSeriesAsDrilldown=function(a,b){this.addSingleSeriesAsDrilldown(a,b);this.applyDrilldown()};l.prototype.addSingleSeriesAsDrilldown=function(a,
+b){var d=a.series,c=d.xAxis,f=d.yAxis,h;h=a.color||d.color;var e,w=[],g=[],k;k=d.levelNumber||0;b=p({color:h},b);e=z(a,d.points);i(d.chart.series,function(a){if(a.xAxis===c)w.push(a),g.push(a.userOptions),a.levelNumber=a.levelNumber||0});h={levelNumber:k,seriesOptions:d.userOptions,levelSeriesOptions:g,levelSeries:w,shapeArgs:a.shapeArgs,bBox:a.graphic.getBBox(),color:h,lowerSeriesOptions:b,pointOptions:d.options.data[e],pointIndex:e,oldExtremes:{xMin:c&&c.userMin,xMax:c&&c.userMax,yMin:f&&f.userMin,
+yMax:f&&f.userMax}};if(!this.drilldownLevels)this.drilldownLevels=[];this.drilldownLevels.push(h);h=h.lowerSeries=this.addSeries(b,!1);h.levelNumber=k+1;if(c)c.oldPos=c.pos,c.userMin=c.userMax=null,f.userMin=f.userMax=null;if(d.type===h.type)h.animate=h.animateDrilldown||t,h.options.animation=!0};l.prototype.applyDrilldown=function(){var a=this.drilldownLevels,b=a[a.length-1].levelNumber;i(this.drilldownLevels,function(a){a.levelNumber===b&&i(a.levelSeries,function(a){a.levelNumber===b&&a.remove(!1)})});
+this.redraw();this.showDrillUpButton()};l.prototype.getDrilldownBackText=function(){var a=this.drilldownLevels[this.drilldownLevels.length-1];a.series=a.seriesOptions;return x(this.options.lang.drillUpText,a)};l.prototype.showDrillUpButton=function(){var a=this,b=this.getDrilldownBackText(),d=a.options.drilldown.drillUpButton,c,f;this.drillUpButton?this.drillUpButton.attr({text:b}).align():(f=(c=d.theme)&&c.states,this.drillUpButton=this.renderer.button(b,null,null,function(){a.drillUp()},c,f&&f.hover,
+f&&f.select).attr({align:d.position.align,zIndex:9}).add().align(d.position,!1,d.relativeTo||"plotBox"))};l.prototype.drillUp=function(){for(var a=this,b=a.drilldownLevels,d=b[b.length-1].levelNumber,c=b.length,f=a.series,h=f.length,e,g,j,k,l=function(b){var c;i(f,function(a){a.userOptions===b&&(c=a)});c=c||a.addSeries(b,!1);if(c.type===g.type&&c.animateDrillupTo)c.animate=c.animateDrillupTo;b===e.seriesOptions&&(j=c)};c--;)if(e=b[c],e.levelNumber===d){b.pop();g=e.lowerSeries;if(!g.chart)for(;h--;)if(f[h].options.id===
+e.lowerSeriesOptions.id){g=f[h];break}g.xData=[];i(e.levelSeriesOptions,l);v(a,"drillup",{seriesOptions:e.seriesOptions});if(j.type===g.type)j.drilldownLevel=e,j.options.animation=a.options.drilldown.animation,g.animateDrillupFrom&&g.animateDrillupFrom(e);j.levelNumber=d;g.remove(!1);if(j.xAxis)k=e.oldExtremes,j.xAxis.setExtremes(k.xMin,k.xMax,!1),j.yAxis.setExtremes(k.yMin,k.yMax,!1)}this.redraw();this.drilldownLevels.length===0?this.drillUpButton=this.drillUpButton.destroy():this.drillUpButton.attr({text:this.getDrilldownBackText()}).align()};
+m.prototype.supportsDrilldown=!0;m.prototype.animateDrillupTo=function(a){if(!a){var b=this,d=b.drilldownLevel;i(this.points,function(a){a.graphic.hide();a.dataLabel&&a.dataLabel.hide();a.connector&&a.connector.hide()});setTimeout(function(){i(b.points,function(a,b){var h=b===(d&&d.pointIndex)?"show":"fadeIn",e=h==="show"?!0:void 0;a.graphic[h](e);if(a.dataLabel)a.dataLabel[h](e);if(a.connector)a.connector[h](e)})},Math.max(this.chart.options.drilldown.animation.duration-50,0));this.animate=t}};m.prototype.animateDrilldown=
+function(a){var b=this,d=this.chart.drilldownLevels,c=this.chart.drilldownLevels[this.chart.drilldownLevels.length-1].shapeArgs,f=this.chart.options.drilldown.animation;if(!a)i(d,function(a){if(b.userOptions===a.lowerSeriesOptions)c=a.shapeArgs}),c.x+=this.xAxis.oldPos-this.xAxis.pos,i(this.points,function(a){a.graphic&&a.graphic.attr(c).animate(a.shapeArgs,f);a.dataLabel&&a.dataLabel.fadeIn(f)}),this.animate=null};m.prototype.animateDrillupFrom=function(a){var b=this.chart.options.drilldown.animation,
+d=this.group,c=this;i(c.trackerGroups,function(a){if(c[a])c[a].on("mouseover")});delete this.group;i(this.points,function(c){var h=c.graphic,e=g.Color(c.color).rgba,i=g.Color(a.color).rgba,j=function(){h.destroy();d&&(d=d.destroy())};h&&(delete c.graphic,b?h.animate(a.shapeArgs,g.merge(b,{step:function(a,b){b.prop==="start"&&e.length===4&&i.length===4&&this.attr({fill:s(e,i,b.pos)})},complete:j})):(h.attr(a.shapeArgs),j()))})};u&&p(u.prototype,{supportsDrilldown:!0,animateDrillupTo:m.prototype.animateDrillupTo,
+animateDrillupFrom:m.prototype.animateDrillupFrom,animateDrilldown:function(a){var b=this.chart.drilldownLevels[this.chart.drilldownLevels.length-1],d=this.chart.options.drilldown.animation,c=b.shapeArgs,f=c.start,h=(c.end-f)/this.points.length,e=g.Color(b.color).rgba;if(!a)i(this.points,function(a,b){var i=g.Color(a.color).rgba;a.graphic.attr(g.merge(c,{start:f+b*h,end:f+(b+1)*h}))[d?"animate":"attr"](a.shapeArgs,g.merge(d,{step:function(a,b){b.prop==="start"&&e.length===4&&i.length===4&&this.attr({fill:s(e,
+i,b.pos)})}}))}),this.animate=null}});g.Point.prototype.doDrilldown=function(a){for(var b=this.series.chart,d=b.options.drilldown,c=(d.series||[]).length,f;c--&&!f;)d.series[c].id===this.drilldown&&(f=d.series[c]);v(b,"drilldown",{point:this,seriesOptions:f});f&&(a?b.addSingleSeriesAsDrilldown(this,f):b.addSeriesAsDrilldown(this,f))};q(g.Point.prototype,"init",function(a,b,d,c){var f=a.call(this,b,d,c),h=b.chart,e=(a=b.xAxis&&b.xAxis.ticks[c])&&a.label;if(f.drilldown){if(g.addEvent(f,"click",function(){f.doDrilldown()}),
+e){if(!e._basicStyle)e._basicStyle=e.element.getAttribute("style");e.addClass("highcharts-drilldown-axis-label").css(h.options.drilldown.activeAxisLabelStyle).on("click",function(){i(e.ddPoints,function(a){a.doDrilldown&&a.doDrilldown(!0)});h.applyDrilldown()});if(!e.ddPoints)e.ddPoints=[];e.ddPoints.push(f)}}else e&&e._basicStyle&&e.element.setAttribute("style",e._basicStyle);return f});q(g.Series.prototype,"drawDataLabels",function(a){var b=this.chart.options.drilldown.activeDataLabelStyle;a.call(this);
+i(this.points,function(a){if(a.drilldown&&a.dataLabel)a.dataLabel.attr({"class":"highcharts-drilldown-data-label"}).css(b).on("click",function(){a.doDrilldown()})})});var r,o=function(a){a.call(this);i(this.points,function(a){a.drilldown&&a.graphic&&a.graphic.attr({"class":"highcharts-drilldown-point"}).css({cursor:"pointer"})})};for(r in n)n[r].prototype.supportsDrilldown&&q(n[r].prototype,"drawTracker",o)})(Highcharts);
diff --git a/management/guns-admin/src/main/webapp/static/js/plugins/highcharts/modules/drilldown.src.js b/management/guns-admin/src/main/webapp/static/js/plugins/highcharts/modules/drilldown.src.js
new file mode 100644
index 0000000..72aac35
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/static/js/plugins/highcharts/modules/drilldown.src.js
@@ -0,0 +1,586 @@
+/**
+ * Highcharts Drilldown plugin
+ *
+ * Author: Torstein Honsi
+ * License: MIT License
+ *
+ * Demo: http://jsfiddle.net/highcharts/Vf3yT/
+ */
+
+/*global HighchartsAdapter*/
+(function (H) {
+
+ "use strict";
+
+ var noop = function () {},
+ defaultOptions = H.getOptions(),
+ each = H.each,
+ extend = H.extend,
+ format = H.format,
+ pick = H.pick,
+ wrap = H.wrap,
+ Chart = H.Chart,
+ seriesTypes = H.seriesTypes,
+ PieSeries = seriesTypes.pie,
+ ColumnSeries = seriesTypes.column,
+ fireEvent = HighchartsAdapter.fireEvent,
+ inArray = HighchartsAdapter.inArray;
+
+ // Utilities
+ function tweenColors(startColor, endColor, pos) {
+ var rgba = [
+ Math.round(startColor[0] + (endColor[0] - startColor[0]) * pos),
+ Math.round(startColor[1] + (endColor[1] - startColor[1]) * pos),
+ Math.round(startColor[2] + (endColor[2] - startColor[2]) * pos),
+ startColor[3] + (endColor[3] - startColor[3]) * pos
+ ];
+ return 'rgba(' + rgba.join(',') + ')';
+ }
+
+ // Add language
+ extend(defaultOptions.lang, {
+ drillUpText: '◁ Back to {series.name}'
+ });
+ defaultOptions.drilldown = {
+ activeAxisLabelStyle: {
+ cursor: 'pointer',
+ color: '#0d233a',
+ fontWeight: 'bold',
+ textDecoration: 'underline'
+ },
+ activeDataLabelStyle: {
+ cursor: 'pointer',
+ color: '#0d233a',
+ fontWeight: 'bold',
+ textDecoration: 'underline'
+ },
+ animation: {
+ duration: 500
+ },
+ drillUpButton: {
+ position: {
+ align: 'right',
+ x: -10,
+ y: 10
+ }
+ // relativeTo: 'plotBox'
+ // theme
+ }
+ };
+
+ /**
+ * A general fadeIn method
+ */
+ H.SVGRenderer.prototype.Element.prototype.fadeIn = function (animation) {
+ this
+ .attr({
+ opacity: 0.1,
+ visibility: 'inherit'
+ })
+ .animate({
+ opacity: pick(this.newOpacity, 1) // newOpacity used in maps
+ }, animation || {
+ duration: 250
+ });
+ };
+
+ Chart.prototype.addSeriesAsDrilldown = function (point, ddOptions) {
+ this.addSingleSeriesAsDrilldown(point, ddOptions);
+ this.applyDrilldown();
+ };
+ Chart.prototype.addSingleSeriesAsDrilldown = function (point, ddOptions) {
+ var oldSeries = point.series,
+ xAxis = oldSeries.xAxis,
+ yAxis = oldSeries.yAxis,
+ newSeries,
+ color = point.color || oldSeries.color,
+ pointIndex,
+ levelSeries = [],
+ levelSeriesOptions = [],
+ level,
+ levelNumber;
+
+ levelNumber = oldSeries.levelNumber || 0;
+
+ ddOptions = extend({
+ color: color
+ }, ddOptions);
+ pointIndex = inArray(point, oldSeries.points);
+
+ // Record options for all current series
+ each(oldSeries.chart.series, function (series) {
+ if (series.xAxis === xAxis) {
+ levelSeries.push(series);
+ levelSeriesOptions.push(series.userOptions);
+ series.levelNumber = series.levelNumber || 0;
+ }
+ });
+
+ // Add a record of properties for each drilldown level
+ level = {
+ levelNumber: levelNumber,
+ seriesOptions: oldSeries.userOptions,
+ levelSeriesOptions: levelSeriesOptions,
+ levelSeries: levelSeries,
+ shapeArgs: point.shapeArgs,
+ bBox: point.graphic.getBBox(),
+ color: color,
+ lowerSeriesOptions: ddOptions,
+ pointOptions: oldSeries.options.data[pointIndex],
+ pointIndex: pointIndex,
+ oldExtremes: {
+ xMin: xAxis && xAxis.userMin,
+ xMax: xAxis && xAxis.userMax,
+ yMin: yAxis && yAxis.userMin,
+ yMax: yAxis && yAxis.userMax
+ }
+ };
+
+ // Generate and push it to a lookup array
+ if (!this.drilldownLevels) {
+ this.drilldownLevels = [];
+ }
+ this.drilldownLevels.push(level);
+
+ newSeries = level.lowerSeries = this.addSeries(ddOptions, false);
+ newSeries.levelNumber = levelNumber + 1;
+ if (xAxis) {
+ xAxis.oldPos = xAxis.pos;
+ xAxis.userMin = xAxis.userMax = null;
+ yAxis.userMin = yAxis.userMax = null;
+ }
+
+ // Run fancy cross-animation on supported and equal types
+ if (oldSeries.type === newSeries.type) {
+ newSeries.animate = newSeries.animateDrilldown || noop;
+ newSeries.options.animation = true;
+ }
+ };
+
+ Chart.prototype.applyDrilldown = function () {
+ var drilldownLevels = this.drilldownLevels,
+ levelToRemove = drilldownLevels[drilldownLevels.length - 1].levelNumber;
+
+ each(this.drilldownLevels, function (level) {
+ if (level.levelNumber === levelToRemove) {
+ each(level.levelSeries, function (series) {
+ if (series.levelNumber === levelToRemove) { // Not removed, not added as part of a multi-series drilldown
+ series.remove(false);
+ }
+ });
+ }
+ });
+
+ this.redraw();
+ this.showDrillUpButton();
+ };
+
+ Chart.prototype.getDrilldownBackText = function () {
+ var lastLevel = this.drilldownLevels[this.drilldownLevels.length - 1];
+ lastLevel.series = lastLevel.seriesOptions;
+ return format(this.options.lang.drillUpText, lastLevel);
+
+ };
+
+ Chart.prototype.showDrillUpButton = function () {
+ var chart = this,
+ backText = this.getDrilldownBackText(),
+ buttonOptions = chart.options.drilldown.drillUpButton,
+ attr,
+ states;
+
+
+ if (!this.drillUpButton) {
+ attr = buttonOptions.theme;
+ states = attr && attr.states;
+
+ this.drillUpButton = this.renderer.button(
+ backText,
+ null,
+ null,
+ function () {
+ chart.drillUp();
+ },
+ attr,
+ states && states.hover,
+ states && states.select
+ )
+ .attr({
+ align: buttonOptions.position.align,
+ zIndex: 9
+ })
+ .add()
+ .align(buttonOptions.position, false, buttonOptions.relativeTo || 'plotBox');
+ } else {
+ this.drillUpButton.attr({
+ text: backText
+ })
+ .align();
+ }
+ };
+
+ Chart.prototype.drillUp = function () {
+ var chart = this,
+ drilldownLevels = chart.drilldownLevels,
+ levelNumber = drilldownLevels[drilldownLevels.length - 1].levelNumber,
+ i = drilldownLevels.length,
+ chartSeries = chart.series,
+ seriesI = chartSeries.length,
+ level,
+ oldSeries,
+ newSeries,
+ oldExtremes,
+ addSeries = function (seriesOptions) {
+ var addedSeries;
+ each(chartSeries, function (series) {
+ if (series.userOptions === seriesOptions) {
+ addedSeries = series;
+ }
+ });
+
+ addedSeries = addedSeries || chart.addSeries(seriesOptions, false);
+ if (addedSeries.type === oldSeries.type && addedSeries.animateDrillupTo) {
+ addedSeries.animate = addedSeries.animateDrillupTo;
+ }
+ if (seriesOptions === level.seriesOptions) {
+ newSeries = addedSeries;
+ }
+ };
+
+ while (i--) {
+
+ level = drilldownLevels[i];
+ if (level.levelNumber === levelNumber) {
+ drilldownLevels.pop();
+
+ // Get the lower series by reference or id
+ oldSeries = level.lowerSeries;
+ if (!oldSeries.chart) { // #2786
+ while (seriesI--) {
+ if (chartSeries[seriesI].options.id === level.lowerSeriesOptions.id) {
+ oldSeries = chartSeries[seriesI];
+ break;
+ }
+ }
+ }
+ oldSeries.xData = []; // Overcome problems with minRange (#2898)
+
+ each(level.levelSeriesOptions, addSeries);
+
+ fireEvent(chart, 'drillup', { seriesOptions: level.seriesOptions });
+
+ if (newSeries.type === oldSeries.type) {
+ newSeries.drilldownLevel = level;
+ newSeries.options.animation = chart.options.drilldown.animation;
+
+ if (oldSeries.animateDrillupFrom) {
+ oldSeries.animateDrillupFrom(level);
+ }
+ }
+ newSeries.levelNumber = levelNumber;
+
+ oldSeries.remove(false);
+
+ // Reset the zoom level of the upper series
+ if (newSeries.xAxis) {
+ oldExtremes = level.oldExtremes;
+ newSeries.xAxis.setExtremes(oldExtremes.xMin, oldExtremes.xMax, false);
+ newSeries.yAxis.setExtremes(oldExtremes.yMin, oldExtremes.yMax, false);
+ }
+ }
+ }
+
+ this.redraw();
+
+ if (this.drilldownLevels.length === 0) {
+ this.drillUpButton = this.drillUpButton.destroy();
+ } else {
+ this.drillUpButton.attr({
+ text: this.getDrilldownBackText()
+ })
+ .align();
+ }
+ };
+
+
+ ColumnSeries.prototype.supportsDrilldown = true;
+
+ /**
+ * When drilling up, keep the upper series invisible until the lower series has
+ * moved into place
+ */
+ ColumnSeries.prototype.animateDrillupTo = function (init) {
+ if (!init) {
+ var newSeries = this,
+ level = newSeries.drilldownLevel;
+
+ each(this.points, function (point) {
+ point.graphic.hide();
+ if (point.dataLabel) {
+ point.dataLabel.hide();
+ }
+ if (point.connector) {
+ point.connector.hide();
+ }
+ });
+
+
+ // Do dummy animation on first point to get to complete
+ setTimeout(function () {
+ each(newSeries.points, function (point, i) {
+ // Fade in other points
+ var verb = i === (level && level.pointIndex) ? 'show' : 'fadeIn',
+ inherit = verb === 'show' ? true : undefined;
+ point.graphic[verb](inherit);
+ if (point.dataLabel) {
+ point.dataLabel[verb](inherit);
+ }
+ if (point.connector) {
+ point.connector[verb](inherit);
+ }
+ });
+ }, Math.max(this.chart.options.drilldown.animation.duration - 50, 0));
+
+ // Reset
+ this.animate = noop;
+ }
+
+ };
+
+ ColumnSeries.prototype.animateDrilldown = function (init) {
+ var series = this,
+ drilldownLevels = this.chart.drilldownLevels,
+ animateFrom = this.chart.drilldownLevels[this.chart.drilldownLevels.length - 1].shapeArgs,
+ animationOptions = this.chart.options.drilldown.animation;
+
+ if (!init) {
+ each(drilldownLevels, function (level) {
+ if (series.userOptions === level.lowerSeriesOptions) {
+ animateFrom = level.shapeArgs;
+ }
+ });
+
+ animateFrom.x += (this.xAxis.oldPos - this.xAxis.pos);
+
+ each(this.points, function (point) {
+ if (point.graphic) {
+ point.graphic
+ .attr(animateFrom)
+ .animate(point.shapeArgs, animationOptions);
+ }
+ if (point.dataLabel) {
+ point.dataLabel.fadeIn(animationOptions);
+ }
+ });
+ this.animate = null;
+ }
+
+ };
+
+ /**
+ * When drilling up, pull out the individual point graphics from the lower series
+ * and animate them into the origin point in the upper series.
+ */
+ ColumnSeries.prototype.animateDrillupFrom = function (level) {
+ var animationOptions = this.chart.options.drilldown.animation,
+ group = this.group,
+ series = this;
+
+ // Cancel mouse events on the series group (#2787)
+ each(series.trackerGroups, function (key) {
+ if (series[key]) { // we don't always have dataLabelsGroup
+ series[key].on('mouseover');
+ }
+ });
+
+
+ delete this.group;
+ each(this.points, function (point) {
+ var graphic = point.graphic,
+ startColor = H.Color(point.color).rgba,
+ endColor = H.Color(level.color).rgba,
+ complete = function () {
+ graphic.destroy();
+ if (group) {
+ group = group.destroy();
+ }
+ };
+
+ if (graphic) {
+
+ delete point.graphic;
+
+ if (animationOptions) {
+ /*jslint unparam: true*/
+ graphic.animate(level.shapeArgs, H.merge(animationOptions, {
+ step: function (val, fx) {
+ if (fx.prop === 'start' && startColor.length === 4 && endColor.length === 4) {
+ this.attr({
+ fill: tweenColors(startColor, endColor, fx.pos)
+ });
+ }
+ },
+ complete: complete
+ }));
+ /*jslint unparam: false*/
+ } else {
+ graphic.attr(level.shapeArgs);
+ complete();
+ }
+ }
+ });
+ };
+
+ if (PieSeries) {
+ extend(PieSeries.prototype, {
+ supportsDrilldown: true,
+ animateDrillupTo: ColumnSeries.prototype.animateDrillupTo,
+ animateDrillupFrom: ColumnSeries.prototype.animateDrillupFrom,
+
+ animateDrilldown: function (init) {
+ var level = this.chart.drilldownLevels[this.chart.drilldownLevels.length - 1],
+ animationOptions = this.chart.options.drilldown.animation,
+ animateFrom = level.shapeArgs,
+ start = animateFrom.start,
+ angle = animateFrom.end - start,
+ startAngle = angle / this.points.length,
+ startColor = H.Color(level.color).rgba;
+
+ if (!init) {
+ each(this.points, function (point, i) {
+ var endColor = H.Color(point.color).rgba;
+
+ /*jslint unparam: true*/
+ point.graphic
+ .attr(H.merge(animateFrom, {
+ start: start + i * startAngle,
+ end: start + (i + 1) * startAngle
+ }))[animationOptions ? 'animate' : 'attr'](point.shapeArgs, H.merge(animationOptions, {
+ step: function (val, fx) {
+ if (fx.prop === 'start' && startColor.length === 4 && endColor.length === 4) {
+ this.attr({
+ fill: tweenColors(startColor, endColor, fx.pos)
+ });
+ }
+ }
+ }));
+ /*jslint unparam: false*/
+ });
+ this.animate = null;
+ }
+ }
+ });
+ }
+
+ H.Point.prototype.doDrilldown = function (_holdRedraw) {
+ var series = this.series,
+ chart = series.chart,
+ drilldown = chart.options.drilldown,
+ i = (drilldown.series || []).length,
+ seriesOptions;
+
+ while (i-- && !seriesOptions) {
+ if (drilldown.series[i].id === this.drilldown) {
+ seriesOptions = drilldown.series[i];
+ }
+ }
+
+ // Fire the event. If seriesOptions is undefined, the implementer can check for
+ // seriesOptions, and call addSeriesAsDrilldown async if necessary.
+ fireEvent(chart, 'drilldown', {
+ point: this,
+ seriesOptions: seriesOptions
+ });
+
+ if (seriesOptions) {
+ if (_holdRedraw) {
+ chart.addSingleSeriesAsDrilldown(this, seriesOptions);
+ } else {
+ chart.addSeriesAsDrilldown(this, seriesOptions);
+ }
+ }
+
+ };
+
+ wrap(H.Point.prototype, 'init', function (proceed, series, options, x) {
+ var point = proceed.call(this, series, options, x),
+ chart = series.chart,
+ tick = series.xAxis && series.xAxis.ticks[x],
+ tickLabel = tick && tick.label;
+
+ if (point.drilldown) {
+
+ // Add the click event to the point label
+ H.addEvent(point, 'click', function () {
+ point.doDrilldown();
+ });
+
+ // Make axis labels clickable
+ if (tickLabel) {
+ if (!tickLabel._basicStyle) {
+ tickLabel._basicStyle = tickLabel.element.getAttribute('style');
+ }
+ tickLabel
+ .addClass('highcharts-drilldown-axis-label')
+ .css(chart.options.drilldown.activeAxisLabelStyle)
+ .on('click', function () {
+ each(tickLabel.ddPoints, function (point) {
+ if (point.doDrilldown) {
+ point.doDrilldown(true);
+ }
+ });
+ chart.applyDrilldown();
+ });
+ if (!tickLabel.ddPoints) {
+ tickLabel.ddPoints = [];
+ }
+ tickLabel.ddPoints.push(point);
+
+ }
+ } else if (tickLabel && tickLabel._basicStyle) {
+ tickLabel.element.setAttribute('style', tickLabel._basicStyle);
+ }
+
+ return point;
+ });
+
+ wrap(H.Series.prototype, 'drawDataLabels', function (proceed) {
+ var css = this.chart.options.drilldown.activeDataLabelStyle;
+
+ proceed.call(this);
+
+ each(this.points, function (point) {
+ if (point.drilldown && point.dataLabel) {
+ point.dataLabel
+ .attr({
+ 'class': 'highcharts-drilldown-data-label'
+ })
+ .css(css)
+ .on('click', function () {
+ point.doDrilldown();
+ });
+ }
+ });
+ });
+
+ // Mark the trackers with a pointer
+ var type,
+ drawTrackerWrapper = function (proceed) {
+ proceed.call(this);
+ each(this.points, function (point) {
+ if (point.drilldown && point.graphic) {
+ point.graphic
+ .attr({
+ 'class': 'highcharts-drilldown-point'
+ })
+ .css({ cursor: 'pointer' });
+ }
+ });
+ };
+ for (type in seriesTypes) {
+ if (seriesTypes[type].prototype.supportsDrilldown) {
+ wrap(seriesTypes[type].prototype, 'drawTracker', drawTrackerWrapper);
+ }
+ }
+
+}(Highcharts));
diff --git a/management/guns-admin/src/main/webapp/static/js/plugins/highcharts/modules/exporting.js b/management/guns-admin/src/main/webapp/static/js/plugins/highcharts/modules/exporting.js
new file mode 100644
index 0000000..83cb82e
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/static/js/plugins/highcharts/modules/exporting.js
@@ -0,0 +1,17 @@
+
+(function(){var HC=Highcharts,Chart=HC.Chart,addEvent=HC.addEvent,removeEvent=HC.removeEvent,createElement=HC.createElement,discardElement=HC.discardElement,css=HC.css,merge=HC.merge,each=HC.each,extend=HC.extend,math=Math,mathMax=math.max,doc=document,win=window,hasTouch=doc.documentElement.ontouchstart!==undefined,M='M',L='L',DIV='div',HIDDEN='hidden',NONE='none',PREFIX='highcharts-',ABSOLUTE='absolute',PX='px',UNDEFINED,defaultOptions=HC.getOptions();extend(defaultOptions.lang,{downloadPNG:'Download PNG image',downloadJPEG:'Download JPEG image',downloadPDF:'Download PDF document',downloadSVG:'Download SVG vector image',exportButtonTitle:'Export to raster or vector image',printButtonTitle:'Print the chart'});defaultOptions.navigation={menuStyle:{border:'1px solid #A0A0A0',background:'#FFFFFF'},menuItemStyle:{padding:'0 5px',background:NONE,color:'#303030',fontSize:hasTouch?'14px':'11px'},menuItemHoverStyle:{background:'#4572A5',color:'#FFFFFF'},buttonOptions:{align:'right',backgroundColor:{linearGradient:[0,0,0,20],stops:[[0.4,'#F7F7F7'],[0.6,'#E3E3E3']]},borderColor:'#B0B0B0',borderRadius:3,borderWidth:1,height:20,hoverBorderColor:'#909090',hoverSymbolFill:'#81A7CF',hoverSymbolStroke:'#4572A5',symbolFill:'#E0E0E0',symbolStroke:'#A0A0A0',symbolX:11.5,symbolY:10.5,verticalAlign:'top',width:24,y:10}};defaultOptions.exporting={type:'image/png',url:getPageDomain()+"/report/downloadHighcharts.action",width:800,buttons:{exportButton:{symbol:'exportIcon',x:-10,symbolFill:'#A8BF77',hoverSymbolFill:'#768F3E',_id:'exportButton',_titleKey:'exportButtonTitle',menuItems:[{textKey:'downloadPNG',onclick:function(){this.exportChart();}},{textKey:'downloadJPEG',onclick:function(){this.exportChart({type:'image/jpeg'});}},{textKey:'downloadPDF',onclick:function(){this.exportChart({type:'application/pdf'});}},{textKey:'downloadSVG',onclick:function(){this.exportChart({type:'image/svg+xml'});}}]},printButton:{symbol:'printIcon',x:-36,symbolFill:'#B5C9DF',hoverSymbolFill:'#779ABF',_id:'printButton',_titleKey:'printButtonTitle',onclick:function(){this.print();}}}};extend(Chart.prototype,{getSVG:function(additionalOptions){var chart=this,chartCopy,sandbox,svg,seriesOptions,options=merge(chart.options,additionalOptions);if(!doc.createElementNS){doc.createElementNS=function(ns,tagName){return doc.createElement(tagName);};}
+sandbox=createElement(DIV,null,{position:ABSOLUTE,top:'-9999em',width:chart.chartWidth+PX,height:chart.chartHeight+PX},doc.body);extend(options.chart,{renderTo:sandbox,forExport:true});options.exporting.enabled=false;options.chart.plotBackgroundImage=null;options.series=[];each(chart.series,function(serie){seriesOptions=merge(serie.options,{animation:false,showCheckbox:false,visible:serie.visible});if(!seriesOptions.isInternal){if(seriesOptions&&seriesOptions.marker&&/^url\(/.test(seriesOptions.marker.symbol)){seriesOptions.marker.symbol='circle';}
+options.series.push(seriesOptions);}});chartCopy=new Highcharts.Chart(options);each(['xAxis','yAxis'],function(axisType){each(chart[axisType],function(axis,i){var axisCopy=chartCopy[axisType][i],extremes=axis.getExtremes(),userMin=extremes.userMin,userMax=extremes.userMax;if(userMin!==UNDEFINED||userMax!==UNDEFINED){axisCopy.setExtremes(userMin,userMax,true,false);}});});svg=chartCopy.container.innerHTML;options=null;chartCopy.destroy();discardElement(sandbox);svg=svg.replace(/zIndex="[^"]+"/g,'').replace(/isShadow="[^"]+"/g,'').replace(/symbolName="[^"]+"/g,'').replace(/jQuery[0-9]+="[^"]+"/g,'').replace(/isTracker="[^"]+"/g,'').replace(/url\([^#]+#/g,'url(#').replace(/<svg /,'<svg xmlns:xlink="http://www.w3.org/1999/xlink" ').replace(/ href=/g,' xlink:href=').replace(/\n/,' ').replace(/<\/svg>.*?$/,'</svg>').replace(/ /g,'\u00A0').replace(/­/g,'\u00AD').replace(/<IMG /g,'<image ').replace(/height=([^" ]+)/g,'height="$1"').replace(/width=([^" ]+)/g,'width="$1"').replace(/hc-svg-href="([^"]+)">/g,'xlink:href="$1"/>').replace(/id=([^" >]+)/g,'id="$1"').replace(/class=([^" ]+)/g,'class="$1"').replace(/ transform /g,' ').replace(/:(path|rect)/g,'$1').replace(/style="([^"]+)"/g,function(s){return s.toLowerCase();});svg=svg.replace(/(url\(#highcharts-[0-9]+)"/g,'$1').replace(/"/g,"'");if(svg.match(/ xmlns="/g).length===2){svg=svg.replace(/xmlns="[^"]+"/,'');}
+return svg;},exportChart:function(options,chartOptions){var form,chart=this,svg=chart.getSVG(merge(chart.options.exporting.chartOptions,chartOptions));options=merge(chart.options.exporting,options);form=createElement('form',{method:'post',action:options.url},{display:NONE},doc.body);each(['filename','type','width','svg'],function(name){createElement('input',{type:HIDDEN,name:name,value:{filename:options.filename||'chart',type:options.type,width:options.width,svg:svg}[name]},null,form);});form.submit();discardElement(form);},getExportChart:function(options,chartOptions){var form,chart=this,svg=chart.getSVG(merge(chart.options.exporting.chartOptions,chartOptions));options=merge(chart.options.exporting,options);form=createElement('form',{method:'post',action:getPageDomain()+'/report/getExportChart.action'},{display:NONE},doc.body);each(['filename','type','width','svg'],function(name){var ele=createElement('input',{type:HIDDEN,name:name,value:{filename:options.filename||'chart',type:options.type,width:options.width,svg:svg}[name]},null,form);});$(form).ajaxFormSubmit({success:function(result){eval("var fn = "+options.callback);fn(result);}});discardElement(form);},print:function(){var chart=this,container=chart.container,origDisplay=[],origParent=container.parentNode,body=doc.body,childNodes=body.childNodes;if(chart.isPrinting){return;}
+chart.isPrinting=true;each(childNodes,function(node,i){if(node.nodeType===1){origDisplay[i]=node.style.display;node.style.display=NONE;}});body.appendChild(container);win.print();setTimeout(function(){origParent.appendChild(container);each(childNodes,function(node,i){if(node.nodeType===1){node.style.display=origDisplay[i];}});chart.isPrinting=false;},1000);},contextMenu:function(name,items,x,y,width,height){var chart=this,navOptions=chart.options.navigation,menuItemStyle=navOptions.menuItemStyle,chartWidth=chart.chartWidth,chartHeight=chart.chartHeight,cacheName='cache-'+name,menu=chart[cacheName],menuPadding=mathMax(width,height),boxShadow='3px 3px 10px #888',innerMenu,hide,menuStyle;if(!menu){chart[cacheName]=menu=createElement(DIV,{className:PREFIX+name},{position:ABSOLUTE,zIndex:1000,padding:menuPadding+PX},chart.container);innerMenu=createElement(DIV,null,extend({MozBoxShadow:boxShadow,WebkitBoxShadow:boxShadow,boxShadow:boxShadow},navOptions.menuStyle),menu);hide=function(){css(menu,{display:NONE});};addEvent(menu,'mouseleave',hide);each(items,function(item){if(item){var div=createElement(DIV,{onmouseover:function(){css(this,navOptions.menuItemHoverStyle);},onmouseout:function(){css(this,menuItemStyle);},innerHTML:item.text||chart.options.lang[item.textKey]},extend({cursor:'pointer'},menuItemStyle),innerMenu);div[hasTouch?'ontouchstart':'onclick']=function(){hide();item.onclick.apply(chart,arguments);};chart.exportDivElements.push(div);}});chart.exportDivElements.push(innerMenu,menu);chart.exportMenuWidth=menu.offsetWidth;chart.exportMenuHeight=menu.offsetHeight;}
+menuStyle={display:'block'};if(x+chart.exportMenuWidth>chartWidth){menuStyle.right=(chartWidth-x-width-menuPadding)+PX;}else{menuStyle.left=(x-menuPadding)+PX;}
+if(y+height+chart.exportMenuHeight>chartHeight){menuStyle.bottom=(chartHeight-y-menuPadding)+PX;}else{menuStyle.top=(y+height-menuPadding)+PX;}
+css(menu,menuStyle);},addButton:function(options){var chart=this,renderer=chart.renderer,btnOptions=merge(chart.options.navigation.buttonOptions,options),onclick=btnOptions.onclick,menuItems=btnOptions.menuItems,buttonWidth=btnOptions.width,buttonHeight=btnOptions.height,box,symbol,button,borderWidth=btnOptions.borderWidth,boxAttr={stroke:btnOptions.borderColor},symbolAttr={stroke:btnOptions.symbolStroke,fill:btnOptions.symbolFill},symbolSize=btnOptions.symbolSize||12;if(!chart.exportDivElements){chart.exportDivElements=[];chart.exportSVGElements=[];}
+if(btnOptions.enabled===false){return;}
+function revert(){symbol.attr(symbolAttr);box.attr(boxAttr);}
+box=renderer.rect(0,0,buttonWidth,buttonHeight,btnOptions.borderRadius,borderWidth).align(btnOptions,true).attr(extend({fill:btnOptions.backgroundColor,'stroke-width':borderWidth,zIndex:19},boxAttr)).add();button=renderer.rect(0,0,buttonWidth,buttonHeight,0).align(btnOptions).attr({id:btnOptions._id,fill:'rgba(255, 255, 255, 0.001)',title:chart.options.lang[btnOptions._titleKey],zIndex:21}).css({cursor:'pointer'}).on('mouseover',function(){symbol.attr({stroke:btnOptions.hoverSymbolStroke,fill:btnOptions.hoverSymbolFill});box.attr({stroke:btnOptions.hoverBorderColor});}).on('mouseout',revert).on('click',revert).add();if(menuItems){onclick=function(){revert();var bBox=button.getBBox();chart.contextMenu('export-menu',menuItems,bBox.x,bBox.y,buttonWidth,buttonHeight);};}
+button.on('click',function(){onclick.apply(chart,arguments);});symbol=renderer.symbol(btnOptions.symbol,btnOptions.symbolX-(symbolSize/2),btnOptions.symbolY-(symbolSize/2),symbolSize,symbolSize).align(btnOptions,true).attr(extend(symbolAttr,{'stroke-width':btnOptions.symbolStrokeWidth||1,zIndex:20})).add();chart.exportSVGElements.push(box,button,symbol);},destroyExport:function(){var i,chart=this,elem;for(i=0;i<chart.exportSVGElements.length;i++){elem=chart.exportSVGElements[i];elem.onclick=elem.ontouchstart=null;chart.exportSVGElements[i]=elem.destroy();}
+for(i=0;i<chart.exportDivElements.length;i++){elem=chart.exportDivElements[i];removeEvent(elem,'mouseleave');chart.exportDivElements[i]=elem.onmouseout=elem.onmouseover=elem.ontouchstart=elem.onclick=null;discardElement(elem);}}});function crisp(arr){var i=arr.length;while(i--){if(typeof arr[i]==='number'){arr[i]=Math.round(arr[i])-0.5;}}
+return arr;}
+HC.Renderer.prototype.symbols.exportIcon=function(x,y,width,height){return crisp([M,x,y+width,L,x+width,y+height,x+width,y+height*0.8,x,y+height*0.8,'Z',M,x+width*0.5,y+height*0.8,L,x+width*0.8,y+height*0.4,x+width*0.4,y+height*0.4,x+width*0.4,y,x+width*0.6,y,x+width*0.6,y+height*0.4,x+width*0.2,y+height*0.4,'Z']);};HC.Renderer.prototype.symbols.printIcon=function(x,y,width,height){return crisp([M,x,y+height*0.7,L,x+width,y+height*0.7,x+width,y+height*0.4,x,y+height*0.4,'Z',M,x+width*0.2,y+height*0.4,L,x+width*0.2,y,x+width*0.8,y,x+width*0.8,y+height*0.4,'Z',M,x+width*0.2,y+height*0.7,L,x,y+height,x+width,y+height,x+width*0.8,y+height*0.7,'Z']);};Chart.prototype.callbacks.push(function(chart){var n,exportingOptions=chart.options.exporting,buttons=exportingOptions.buttons;if(exportingOptions.enabled!==false){for(n in buttons){chart.addButton(buttons[n]);}
+addEvent(chart,'destroy',chart.destroyExport);}});}());
\ No newline at end of file
diff --git a/management/guns-admin/src/main/webapp/static/js/plugins/highcharts/modules/exporting.src.js b/management/guns-admin/src/main/webapp/static/js/plugins/highcharts/modules/exporting.src.js
new file mode 100644
index 0000000..e62861a
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/static/js/plugins/highcharts/modules/exporting.src.js
@@ -0,0 +1,775 @@
+/**
+ * @license Highcharts JS v2.2.5 (2012-06-08)
+ * Exporting module
+ *
+ * (c) 2010-2011 Torstein Hønsi
+ *
+ * License: www.highcharts.com/license
+ */
+
+// JSLint options:
+/*global Highcharts, document, window, Math, setTimeout */
+
+(function () { // encapsulate
+
+// create shortcuts
+var HC = Highcharts,
+ Chart = HC.Chart,
+ addEvent = HC.addEvent,
+ removeEvent = HC.removeEvent,
+ createElement = HC.createElement,
+ discardElement = HC.discardElement,
+ css = HC.css,
+ merge = HC.merge,
+ each = HC.each,
+ extend = HC.extend,
+ math = Math,
+ mathMax = math.max,
+ doc = document,
+ win = window,
+ hasTouch = doc.documentElement.ontouchstart !== undefined,
+ M = 'M',
+ L = 'L',
+ DIV = 'div',
+ HIDDEN = 'hidden',
+ NONE = 'none',
+ PREFIX = 'highcharts-',
+ ABSOLUTE = 'absolute',
+ PX = 'px',
+ UNDEFINED,
+ defaultOptions = HC.getOptions();
+
+ // Add language
+ extend(defaultOptions.lang, {
+ downloadPNG: 'Download PNG image',
+ downloadJPEG: 'Download JPEG image',
+ downloadPDF: 'Download PDF document',
+ downloadSVG: 'Download SVG vector image',
+ exportButtonTitle: 'Export to raster or vector image',
+ printButtonTitle: 'Print the chart'
+ });
+
+// Buttons and menus are collected in a separate config option set called 'navigation'.
+// This can be extended later to add control buttons like zoom and pan right click menus.
+defaultOptions.navigation = {
+ menuStyle: {
+ border: '1px solid #A0A0A0',
+ background: '#FFFFFF'
+ },
+ menuItemStyle: {
+ padding: '0 5px',
+ background: NONE,
+ color: '#303030',
+ fontSize: hasTouch ? '14px' : '11px'
+ },
+ menuItemHoverStyle: {
+ background: '#4572A5',
+ color: '#FFFFFF'
+ },
+
+ buttonOptions: {
+ align: 'right',
+ backgroundColor: {
+ linearGradient: [0, 0, 0, 20],
+ stops: [
+ [0.4, '#F7F7F7'],
+ [0.6, '#E3E3E3']
+ ]
+ },
+ borderColor: '#B0B0B0',
+ borderRadius: 3,
+ borderWidth: 1,
+ //enabled: true,
+ height: 20,
+ hoverBorderColor: '#909090',
+ hoverSymbolFill: '#81A7CF',
+ hoverSymbolStroke: '#4572A5',
+ symbolFill: '#E0E0E0',
+ //symbolSize: 12,
+ symbolStroke: '#A0A0A0',
+ //symbolStrokeWidth: 1,
+ symbolX: 11.5,
+ symbolY: 10.5,
+ verticalAlign: 'top',
+ width: 24,
+ y: 10
+ }
+};
+
+
+
+// Add the export related options
+defaultOptions.exporting = {
+ //enabled: true,
+ //filename: 'chart',
+ type: 'image/png',
+ url: getPageDomain()+"/report/downloadHighcharts.action",
+ width: 800,
+ buttons: {
+ exportButton: {
+ //enabled: true,
+ symbol: 'exportIcon',
+ x: -10,
+ symbolFill: '#A8BF77',
+ hoverSymbolFill: '#768F3E',
+ _id: 'exportButton',
+ _titleKey: 'exportButtonTitle',
+ menuItems: [{
+ textKey: 'downloadPNG',
+ onclick: function () {
+ this.exportChart();
+ }
+ }, {
+ textKey: 'downloadJPEG',
+ onclick: function () {
+ this.exportChart({
+ type: 'image/jpeg'
+ });
+ }
+ }, {
+ textKey: 'downloadPDF',
+ onclick: function () {
+ this.exportChart({
+ type: 'application/pdf'
+ });
+ }
+ }, {
+ textKey: 'downloadSVG',
+ onclick: function () {
+ this.exportChart({
+ type: 'image/svg+xml'
+ });
+ }
+ }
+ // Enable this block to add "View SVG" to the dropdown menu
+ /*
+ ,{
+
+ text: 'View SVG',
+ onclick: function () {
+ var svg = this.getSVG()
+ .replace(/</g, '\n<')
+ .replace(/>/g, '>');
+
+ doc.body.innerHTML = '<pre>' + svg + '</pre>';
+ }
+ } // */
+ ]
+
+ },
+ printButton: {
+ //enabled: true,
+ symbol: 'printIcon',
+ x: -36,
+ symbolFill: '#B5C9DF',
+ hoverSymbolFill: '#779ABF',
+ _id: 'printButton',
+ _titleKey: 'printButtonTitle',
+ onclick: function () {
+ this.print();
+ }
+ }
+ }
+};
+
+
+
+extend(Chart.prototype, {
+ /**
+ * Return an SVG representation of the chart
+ *
+ * @param additionalOptions {Object} Additional chart options for the generated SVG representation
+ */
+ getSVG: function (additionalOptions) {
+ var chart = this,
+ chartCopy,
+ sandbox,
+ svg,
+ seriesOptions,
+ options = merge(chart.options, additionalOptions); // copy the options and add extra options
+
+ // IE compatibility hack for generating SVG content that it doesn't really understand
+ if (!doc.createElementNS) {
+ /*jslint unparam: true*//* allow unused parameter ns in function below */
+ doc.createElementNS = function (ns, tagName) {
+ return doc.createElement(tagName);
+ };
+ /*jslint unparam: false*/
+ }
+
+ // create a sandbox where a new chart will be generated
+ sandbox = createElement(DIV, null, {
+ position: ABSOLUTE,
+ top: '-9999em',
+ width: chart.chartWidth + PX,
+ height: chart.chartHeight + PX
+ }, doc.body);
+
+ // override some options
+ extend(options.chart, {
+ renderTo: sandbox,
+ forExport: true
+ });
+ options.exporting.enabled = false; // hide buttons in print
+ options.chart.plotBackgroundImage = null; // the converter doesn't handle images
+
+ // prepare for replicating the chart
+ options.series = [];
+ each(chart.series, function (serie) {
+ seriesOptions = merge(serie.options, {
+ animation: false, // turn off animation
+ showCheckbox: false,
+ visible: serie.visible
+ });
+
+ if (!seriesOptions.isInternal) { // used for the navigator series that has its own option set
+
+ // remove image markers
+ if (seriesOptions && seriesOptions.marker && /^url\(/.test(seriesOptions.marker.symbol)) {
+ seriesOptions.marker.symbol = 'circle';
+ }
+
+ options.series.push(seriesOptions);
+ }
+ });
+
+ // generate the chart copy
+ chartCopy = new Highcharts.Chart(options);
+
+ // reflect axis extremes in the export
+ each(['xAxis', 'yAxis'], function (axisType) {
+ each(chart[axisType], function (axis, i) {
+ var axisCopy = chartCopy[axisType][i],
+ extremes = axis.getExtremes(),
+ userMin = extremes.userMin,
+ userMax = extremes.userMax;
+
+ if (userMin !== UNDEFINED || userMax !== UNDEFINED) {
+ axisCopy.setExtremes(userMin, userMax, true, false);
+ }
+ });
+ });
+
+ // get the SVG from the container's innerHTML
+ svg = chartCopy.container.innerHTML;
+
+ // free up memory
+ options = null;
+ chartCopy.destroy();
+ discardElement(sandbox);
+
+ // sanitize
+ svg = svg
+ .replace(/zIndex="[^"]+"/g, '')
+ .replace(/isShadow="[^"]+"/g, '')
+ .replace(/symbolName="[^"]+"/g, '')
+ .replace(/jQuery[0-9]+="[^"]+"/g, '')
+ .replace(/isTracker="[^"]+"/g, '')
+ .replace(/url\([^#]+#/g, 'url(#')
+ .replace(/<svg /, '<svg xmlns:xlink="http://www.w3.org/1999/xlink" ')
+ .replace(/ href=/g, ' xlink:href=')
+ .replace(/\n/, ' ')
+ .replace(/<\/svg>.*?$/, '</svg>') // any HTML added to the container after the SVG (#894)
+ /* This fails in IE < 8
+ .replace(/([0-9]+)\.([0-9]+)/g, function(s1, s2, s3) { // round off to save weight
+ return s2 +'.'+ s3[0];
+ })*/
+
+ // Replace HTML entities, issue #347
+ .replace(/ /g, '\u00A0') // no-break space
+ .replace(/­/g, '\u00AD') // soft hyphen
+
+ // IE specific
+ .replace(/<IMG /g, '<image ')
+ .replace(/height=([^" ]+)/g, 'height="$1"')
+ .replace(/width=([^" ]+)/g, 'width="$1"')
+ .replace(/hc-svg-href="([^"]+)">/g, 'xlink:href="$1"/>')
+ .replace(/id=([^" >]+)/g, 'id="$1"')
+ .replace(/class=([^" ]+)/g, 'class="$1"')
+ .replace(/ transform /g, ' ')
+ .replace(/:(path|rect)/g, '$1')
+ .replace(/style="([^"]+)"/g, function (s) {
+ return s.toLowerCase();
+ });
+
+ // IE9 beta bugs with innerHTML. Test again with final IE9.
+ svg = svg.replace(/(url\(#highcharts-[0-9]+)"/g, '$1')
+ .replace(/"/g, "'");
+ if (svg.match(/ xmlns="/g).length === 2) {
+ svg = svg.replace(/xmlns="[^"]+"/, '');
+ }
+ return svg;
+ },
+
+ /**
+ * Submit the SVG representation of the chart to the server
+ * @param {Object} options Exporting options. Possible members are url, type and width.
+ * @param {Object} chartOptions Additional chart options for the SVG representation of the chart
+ */
+ exportChart: function (options, chartOptions) {
+ var form,
+ chart = this,
+ svg = chart.getSVG(merge(chart.options.exporting.chartOptions, chartOptions)); // docs
+
+ // merge the options
+ options = merge(chart.options.exporting, options);
+
+ // create the form
+ form = createElement('form', {
+ method: 'post',
+ action: options.url
+ //enctype: 'multipart/form-data'
+ }, {
+ display: NONE
+ }, doc.body);
+
+ // add the values
+ each(['filename', 'type', 'width', 'svg'], function (name) {
+ createElement('input', {
+ type: HIDDEN,
+ name: name,
+ value: {
+ filename: options.filename || 'chart',
+ type: options.type,
+ width: options.width,
+ svg: svg
+ }[name]
+ }, null, form);
+ });
+
+ // submit
+ form.submit();
+
+ // clean up
+ discardElement(form);
+ },getExportChart: function (options, chartOptions) {
+ var form,
+ chart = this,
+ svg = chart.getSVG(merge(chart.options.exporting.chartOptions, chartOptions)); // docs
+
+ // merge the options
+ options = merge(chart.options.exporting, options);
+
+ // create the form
+ form = createElement('form', {
+ method: 'post',
+ action: getPageDomain()+'/report/getExportChart.action'
+ //enctype: 'multipart/form-data'
+ }, {
+ display: NONE
+ }, doc.body);
+ // add the values
+ each(['filename', 'type', 'width', 'svg'], function (name) {
+ var ele = createElement('input', {
+ type: HIDDEN,
+ name: name,
+ value: {
+ filename: options.filename || 'chart',
+ type: options.type,
+ width: options.width,
+ svg: svg
+ }[name]
+ }, null, form);
+ });
+
+ // submit
+ //form.submit();
+ $(form).ajaxFormSubmit({
+ success : function(result){
+ eval("var fn = "+options.callback);
+ fn(result);
+ }
+ });
+ // clean up
+ discardElement(form);
+ },
+
+ /**
+ * Print the chart
+ */
+ print: function () {
+
+ var chart = this,
+ container = chart.container,
+ origDisplay = [],
+ origParent = container.parentNode,
+ body = doc.body,
+ childNodes = body.childNodes;
+
+ if (chart.isPrinting) { // block the button while in printing mode
+ return;
+ }
+
+ chart.isPrinting = true;
+
+ // hide all body content
+ each(childNodes, function (node, i) {
+ if (node.nodeType === 1) {
+ origDisplay[i] = node.style.display;
+ node.style.display = NONE;
+ }
+ });
+
+ // pull out the chart
+ body.appendChild(container);
+
+ // print
+ win.print();
+
+ // allow the browser to prepare before reverting
+ setTimeout(function () {
+
+ // put the chart back in
+ origParent.appendChild(container);
+
+ // restore all body content
+ each(childNodes, function (node, i) {
+ if (node.nodeType === 1) {
+ node.style.display = origDisplay[i];
+ }
+ });
+
+ chart.isPrinting = false;
+
+ }, 1000);
+
+ },
+
+ /**
+ * Display a popup menu for choosing the export type
+ *
+ * @param {String} name An identifier for the menu
+ * @param {Array} items A collection with text and onclicks for the items
+ * @param {Number} x The x position of the opener button
+ * @param {Number} y The y position of the opener button
+ * @param {Number} width The width of the opener button
+ * @param {Number} height The height of the opener button
+ */
+ contextMenu: function (name, items, x, y, width, height) {
+ var chart = this,
+ navOptions = chart.options.navigation,
+ menuItemStyle = navOptions.menuItemStyle,
+ chartWidth = chart.chartWidth,
+ chartHeight = chart.chartHeight,
+ cacheName = 'cache-' + name,
+ menu = chart[cacheName],
+ menuPadding = mathMax(width, height), // for mouse leave detection
+ boxShadow = '3px 3px 10px #888',
+ innerMenu,
+ hide,
+ menuStyle;
+
+ // create the menu only the first time
+ if (!menu) {
+
+ // create a HTML element above the SVG
+ chart[cacheName] = menu = createElement(DIV, {
+ className: PREFIX + name
+ }, {
+ position: ABSOLUTE,
+ zIndex: 1000,
+ padding: menuPadding + PX
+ }, chart.container);
+
+ innerMenu = createElement(DIV, null,
+ extend({
+ MozBoxShadow: boxShadow,
+ WebkitBoxShadow: boxShadow,
+ boxShadow: boxShadow
+ }, navOptions.menuStyle), menu);
+
+ // hide on mouse out
+ hide = function () {
+ css(menu, { display: NONE });
+ };
+
+ addEvent(menu, 'mouseleave', hide);
+
+
+ // create the items
+ each(items, function (item) {
+ if (item) {
+ var div = createElement(DIV, {
+ onmouseover: function () {
+ css(this, navOptions.menuItemHoverStyle);
+ },
+ onmouseout: function () {
+ css(this, menuItemStyle);
+ },
+ innerHTML: item.text || chart.options.lang[item.textKey]
+ }, extend({
+ cursor: 'pointer'
+ }, menuItemStyle), innerMenu);
+
+ div[hasTouch ? 'ontouchstart' : 'onclick'] = function () {
+ hide();
+ item.onclick.apply(chart, arguments);
+ };
+
+ // Keep references to menu divs to be able to destroy them
+ chart.exportDivElements.push(div);
+ }
+ });
+
+ // Keep references to menu and innerMenu div to be able to destroy them
+ chart.exportDivElements.push(innerMenu, menu);
+
+ chart.exportMenuWidth = menu.offsetWidth;
+ chart.exportMenuHeight = menu.offsetHeight;
+ }
+
+ menuStyle = { display: 'block' };
+
+ // if outside right, right align it
+ if (x + chart.exportMenuWidth > chartWidth) {
+ menuStyle.right = (chartWidth - x - width - menuPadding) + PX;
+ } else {
+ menuStyle.left = (x - menuPadding) + PX;
+ }
+ // if outside bottom, bottom align it
+ if (y + height + chart.exportMenuHeight > chartHeight) {
+ menuStyle.bottom = (chartHeight - y - menuPadding) + PX;
+ } else {
+ menuStyle.top = (y + height - menuPadding) + PX;
+ }
+
+ css(menu, menuStyle);
+ },
+
+ /**
+ * Add the export button to the chart
+ */
+ addButton: function (options) {
+ var chart = this,
+ renderer = chart.renderer,
+ btnOptions = merge(chart.options.navigation.buttonOptions, options),
+ onclick = btnOptions.onclick,
+ menuItems = btnOptions.menuItems,
+ buttonWidth = btnOptions.width,
+ buttonHeight = btnOptions.height,
+ box,
+ symbol,
+ button,
+ borderWidth = btnOptions.borderWidth,
+ boxAttr = {
+ stroke: btnOptions.borderColor
+
+ },
+ symbolAttr = {
+ stroke: btnOptions.symbolStroke,
+ fill: btnOptions.symbolFill
+ },
+ symbolSize = btnOptions.symbolSize || 12;
+
+ // Keeps references to the button elements
+ if (!chart.exportDivElements) {
+ chart.exportDivElements = [];
+ chart.exportSVGElements = [];
+ }
+
+ if (btnOptions.enabled === false) {
+ return;
+ }
+
+ // element to capture the click
+ function revert() {
+ symbol.attr(symbolAttr);
+ box.attr(boxAttr);
+ }
+
+ // the box border
+ box = renderer.rect(
+ 0,
+ 0,
+ buttonWidth,
+ buttonHeight,
+ btnOptions.borderRadius,
+ borderWidth
+ )
+ //.translate(buttonLeft, buttonTop) // to allow gradients
+ .align(btnOptions, true)
+ .attr(extend({
+ fill: btnOptions.backgroundColor,
+ 'stroke-width': borderWidth,
+ zIndex: 19
+ }, boxAttr)).add();
+
+ // the invisible element to track the clicks
+ button = renderer.rect(
+ 0,
+ 0,
+ buttonWidth,
+ buttonHeight,
+ 0
+ )
+ .align(btnOptions)
+ .attr({
+ id: btnOptions._id,
+ fill: 'rgba(255, 255, 255, 0.001)',
+ title: chart.options.lang[btnOptions._titleKey],
+ zIndex: 21
+ }).css({
+ cursor: 'pointer'
+ })
+ .on('mouseover', function () {
+ symbol.attr({
+ stroke: btnOptions.hoverSymbolStroke,
+ fill: btnOptions.hoverSymbolFill
+ });
+ box.attr({
+ stroke: btnOptions.hoverBorderColor
+ });
+ })
+ .on('mouseout', revert)
+ .on('click', revert)
+ .add();
+
+ // add the click event
+ if (menuItems) {
+ onclick = function () {
+ revert();
+ var bBox = button.getBBox();
+ chart.contextMenu('export-menu', menuItems, bBox.x, bBox.y, buttonWidth, buttonHeight);
+ };
+ }
+ /*addEvent(button.element, 'click', function() {
+ onclick.apply(chart, arguments);
+ });*/
+ button.on('click', function () {
+ onclick.apply(chart, arguments);
+ });
+
+ // the icon
+ symbol = renderer.symbol(
+ btnOptions.symbol,
+ btnOptions.symbolX - (symbolSize / 2),
+ btnOptions.symbolY - (symbolSize / 2),
+ symbolSize,
+ symbolSize
+ )
+ .align(btnOptions, true)
+ .attr(extend(symbolAttr, {
+ 'stroke-width': btnOptions.symbolStrokeWidth || 1,
+ zIndex: 20
+ })).add();
+
+ // Keep references to the renderer element so to be able to destroy them later.
+ chart.exportSVGElements.push(box, button, symbol);
+ },
+
+ /**
+ * Destroy the buttons.
+ */
+ destroyExport: function () {
+ var i,
+ chart = this,
+ elem;
+
+ // Destroy the extra buttons added
+ for (i = 0; i < chart.exportSVGElements.length; i++) {
+ elem = chart.exportSVGElements[i];
+ // Destroy and null the svg/vml elements
+ elem.onclick = elem.ontouchstart = null;
+ chart.exportSVGElements[i] = elem.destroy();
+ }
+
+ // Destroy the divs for the menu
+ for (i = 0; i < chart.exportDivElements.length; i++) {
+ elem = chart.exportDivElements[i];
+
+ // Remove the event handler
+ removeEvent(elem, 'mouseleave');
+
+ // Remove inline events
+ chart.exportDivElements[i] = elem.onmouseout = elem.onmouseover = elem.ontouchstart = elem.onclick = null;
+
+ // Destroy the div by moving to garbage bin
+ discardElement(elem);
+ }
+ }
+});
+
+/**
+ * Crisp for 1px stroke width, which is default. In the future, consider a smarter,
+ * global function.
+ */
+function crisp(arr) {
+ var i = arr.length;
+ while (i--) {
+ if (typeof arr[i] === 'number') {
+ arr[i] = Math.round(arr[i]) - 0.5;
+ }
+ }
+ return arr;
+}
+
+// Create the export icon
+HC.Renderer.prototype.symbols.exportIcon = function (x, y, width, height) {
+ return crisp([
+ M, // the disk
+ x, y + width,
+ L,
+ x + width, y + height,
+ x + width, y + height * 0.8,
+ x, y + height * 0.8,
+ 'Z',
+ M, // the arrow
+ x + width * 0.5, y + height * 0.8,
+ L,
+ x + width * 0.8, y + height * 0.4,
+ x + width * 0.4, y + height * 0.4,
+ x + width * 0.4, y,
+ x + width * 0.6, y,
+ x + width * 0.6, y + height * 0.4,
+ x + width * 0.2, y + height * 0.4,
+ 'Z'
+ ]);
+};
+// Create the print icon
+HC.Renderer.prototype.symbols.printIcon = function (x, y, width, height) {
+ return crisp([
+ M, // the printer
+ x, y + height * 0.7,
+ L,
+ x + width, y + height * 0.7,
+ x + width, y + height * 0.4,
+ x, y + height * 0.4,
+ 'Z',
+ M, // the upper sheet
+ x + width * 0.2, y + height * 0.4,
+ L,
+ x + width * 0.2, y,
+ x + width * 0.8, y,
+ x + width * 0.8, y + height * 0.4,
+ 'Z',
+ M, // the lower sheet
+ x + width * 0.2, y + height * 0.7,
+ L,
+ x, y + height,
+ x + width, y + height,
+ x + width * 0.8, y + height * 0.7,
+ 'Z'
+ ]);
+};
+
+
+// Add the buttons on chart load
+Chart.prototype.callbacks.push(function (chart) {
+ var n,
+ exportingOptions = chart.options.exporting,
+ buttons = exportingOptions.buttons;
+
+ if (exportingOptions.enabled !== false) {
+
+ for (n in buttons) {
+ chart.addButton(buttons[n]);
+ }
+
+ // Destroy the export elements at chart destroy
+ addEvent(chart, 'destroy', chart.destroyExport);
+ }
+
+});
+
+
+}());
diff --git a/management/guns-admin/src/main/webapp/static/js/plugins/highcharts/modules/funnel.js b/management/guns-admin/src/main/webapp/static/js/plugins/highcharts/modules/funnel.js
new file mode 100644
index 0000000..8a8a192
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/static/js/plugins/highcharts/modules/funnel.js
@@ -0,0 +1,13 @@
+/*
+
+ Highcharts funnel module
+
+ (c) 2010-2014 Torstein Honsi
+
+ License: www.highcharts.com/license
+*/
+(function(b){var d=b.getOptions(),v=d.plotOptions,q=b.seriesTypes,E=b.merge,D=function(){},A=b.each;v.funnel=E(v.pie,{animation:!1,center:["50%","50%"],width:"90%",neckWidth:"30%",height:"100%",neckHeight:"25%",reversed:!1,dataLabels:{connectorWidth:1,connectorColor:"#606060"},size:!0,states:{select:{color:"#C0C0C0",borderColor:"#000000",shadow:!1}}});q.funnel=b.extendClass(q.pie,{type:"funnel",animate:D,singularTooltips:!0,translate:function(){var a=function(j,a){return/%$/.test(j)?a*parseInt(j,
+10)/100:parseInt(j,10)},B=0,f=this.chart,c=this.options,g=c.reversed,b=f.plotWidth,n=f.plotHeight,o=0,f=c.center,h=a(f[0],b),d=a(f[0],n),q=a(c.width,b),k,r,e=a(c.height,n),s=a(c.neckWidth,b),t=a(c.neckHeight,n),w=e-t,a=this.data,x,y,v=c.dataLabels.position==="left"?1:0,z,l,C,p,i,u,m;this.getWidthAt=r=function(j){return j>e-t||e===t?s:s+(q-s)*((e-t-j)/(e-t))};this.getX=function(j,a){return h+(a?-1:1)*(r(g?n-j:j)/2+c.dataLabels.distance)};this.center=[h,d,e];this.centerX=h;A(a,function(a){B+=a.y});
+A(a,function(a){m=null;y=B?a.y/B:0;l=d-e/2+o*e;i=l+y*e;k=r(l);z=h-k/2;C=z+k;k=r(i);p=h-k/2;u=p+k;l>w?(z=p=h-s/2,C=u=h+s/2):i>w&&(m=i,k=r(w),p=h-k/2,u=p+k,i=w);g&&(l=e-l,i=e-i,m=m?e-m:null);x=["M",z,l,"L",C,l,u,i];m&&x.push(u,m,p,m);x.push(p,i,"Z");a.shapeType="path";a.shapeArgs={d:x};a.percentage=y*100;a.plotX=h;a.plotY=(l+(m||i))/2;a.tooltipPos=[h,a.plotY];a.slice=D;a.half=v;o+=y})},drawPoints:function(){var a=this,b=a.options,f=a.chart.renderer;A(a.data,function(c){var g=c.graphic,d=c.shapeArgs;
+g?g.animate(d):c.graphic=f.path(d).attr({fill:c.color,stroke:b.borderColor,"stroke-width":b.borderWidth}).add(a.group)})},sortByAngle:function(a){a.sort(function(a,b){return a.plotY-b.plotY})},drawDataLabels:function(){var a=this.data,b=this.options.dataLabels.distance,f,c,g,d=a.length,n,o;for(this.center[2]-=2*b;d--;)g=a[d],c=(f=g.half)?1:-1,o=g.plotY,n=this.getX(o,f),g.labelPos=[0,o,n+(b-5)*c,o,n+b*c,o,f?"right":"left",0];q.pie.prototype.drawDataLabels.call(this)}});d.plotOptions.pyramid=b.merge(d.plotOptions.funnel,
+{neckWidth:"0%",neckHeight:"0%",reversed:!0});b.seriesTypes.pyramid=b.extendClass(b.seriesTypes.funnel,{type:"pyramid"})})(Highcharts);
diff --git a/management/guns-admin/src/main/webapp/static/js/plugins/highcharts/modules/funnel.src.js b/management/guns-admin/src/main/webapp/static/js/plugins/highcharts/modules/funnel.src.js
new file mode 100644
index 0000000..eb6ba9b
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/static/js/plugins/highcharts/modules/funnel.src.js
@@ -0,0 +1,310 @@
+/**
+ * @license
+ * Highcharts funnel module
+ *
+ * (c) 2010-2014 Torstein Honsi
+ *
+ * License: www.highcharts.com/license
+ */
+
+/*global Highcharts */
+(function (Highcharts) {
+
+'use strict';
+
+// create shortcuts
+var defaultOptions = Highcharts.getOptions(),
+ defaultPlotOptions = defaultOptions.plotOptions,
+ seriesTypes = Highcharts.seriesTypes,
+ merge = Highcharts.merge,
+ noop = function () {},
+ each = Highcharts.each;
+
+// set default options
+defaultPlotOptions.funnel = merge(defaultPlotOptions.pie, {
+ animation: false,
+ center: ['50%', '50%'],
+ width: '90%',
+ neckWidth: '30%',
+ height: '100%',
+ neckHeight: '25%',
+ reversed: false,
+ dataLabels: {
+ //position: 'right',
+ connectorWidth: 1,
+ connectorColor: '#606060'
+ },
+ size: true, // to avoid adapting to data label size in Pie.drawDataLabels
+ states: {
+ select: {
+ color: '#C0C0C0',
+ borderColor: '#000000',
+ shadow: false
+ }
+ }
+});
+
+
+seriesTypes.funnel = Highcharts.extendClass(seriesTypes.pie, {
+
+ type: 'funnel',
+ animate: noop,
+ singularTooltips: true,
+
+ /**
+ * Overrides the pie translate method
+ */
+ translate: function () {
+
+ var
+ // Get positions - either an integer or a percentage string must be given
+ getLength = function (length, relativeTo) {
+ return (/%$/).test(length) ?
+ relativeTo * parseInt(length, 10) / 100 :
+ parseInt(length, 10);
+ },
+
+ sum = 0,
+ series = this,
+ chart = series.chart,
+ options = series.options,
+ reversed = options.reversed,
+ plotWidth = chart.plotWidth,
+ plotHeight = chart.plotHeight,
+ cumulative = 0, // start at top
+ center = options.center,
+ centerX = getLength(center[0], plotWidth),
+ centerY = getLength(center[0], plotHeight),
+ width = getLength(options.width, plotWidth),
+ tempWidth,
+ getWidthAt,
+ height = getLength(options.height, plotHeight),
+ neckWidth = getLength(options.neckWidth, plotWidth),
+ neckHeight = getLength(options.neckHeight, plotHeight),
+ neckY = height - neckHeight,
+ data = series.data,
+ path,
+ fraction,
+ half = options.dataLabels.position === 'left' ? 1 : 0,
+
+ x1,
+ y1,
+ x2,
+ x3,
+ y3,
+ x4,
+ y5;
+
+ // Return the width at a specific y coordinate
+ series.getWidthAt = getWidthAt = function (y) {
+ return y > height - neckHeight || height === neckHeight ?
+ neckWidth :
+ neckWidth + (width - neckWidth) * ((height - neckHeight - y) / (height - neckHeight));
+ };
+ series.getX = function (y, half) {
+ return centerX + (half ? -1 : 1) * ((getWidthAt(reversed ? plotHeight - y : y) / 2) + options.dataLabels.distance);
+ };
+
+ // Expose
+ series.center = [centerX, centerY, height];
+ series.centerX = centerX;
+
+ /*
+ * Individual point coordinate naming:
+ *
+ * x1,y1 _________________ x2,y1
+ * \ /
+ * \ /
+ * \ /
+ * \ /
+ * \ /
+ * x3,y3 _________ x4,y3
+ *
+ * Additional for the base of the neck:
+ *
+ * | |
+ * | |
+ * | |
+ * x3,y5 _________ x4,y5
+ */
+
+
+
+
+ // get the total sum
+ each(data, function (point) {
+ sum += point.y;
+ });
+
+ each(data, function (point) {
+ // set start and end positions
+ y5 = null;
+ fraction = sum ? point.y / sum : 0;
+ y1 = centerY - height / 2 + cumulative * height;
+ y3 = y1 + fraction * height;
+ //tempWidth = neckWidth + (width - neckWidth) * ((height - neckHeight - y1) / (height - neckHeight));
+ tempWidth = getWidthAt(y1);
+ x1 = centerX - tempWidth / 2;
+ x2 = x1 + tempWidth;
+ tempWidth = getWidthAt(y3);
+ x3 = centerX - tempWidth / 2;
+ x4 = x3 + tempWidth;
+
+ // the entire point is within the neck
+ if (y1 > neckY) {
+ x1 = x3 = centerX - neckWidth / 2;
+ x2 = x4 = centerX + neckWidth / 2;
+
+ // the base of the neck
+ } else if (y3 > neckY) {
+ y5 = y3;
+
+ tempWidth = getWidthAt(neckY);
+ x3 = centerX - tempWidth / 2;
+ x4 = x3 + tempWidth;
+
+ y3 = neckY;
+ }
+
+ if (reversed) {
+ y1 = height - y1;
+ y3 = height - y3;
+ y5 = (y5 ? height - y5 : null);
+ }
+ // save the path
+ path = [
+ 'M',
+ x1, y1,
+ 'L',
+ x2, y1,
+ x4, y3
+ ];
+ if (y5) {
+ path.push(x4, y5, x3, y5);
+ }
+ path.push(x3, y3, 'Z');
+
+ // prepare for using shared dr
+ point.shapeType = 'path';
+ point.shapeArgs = { d: path };
+
+
+ // for tooltips and data labels
+ point.percentage = fraction * 100;
+ point.plotX = centerX;
+ point.plotY = (y1 + (y5 || y3)) / 2;
+
+ // Placement of tooltips and data labels
+ point.tooltipPos = [
+ centerX,
+ point.plotY
+ ];
+
+ // Slice is a noop on funnel points
+ point.slice = noop;
+
+ // Mimicking pie data label placement logic
+ point.half = half;
+
+ cumulative += fraction;
+ });
+ },
+ /**
+ * Draw a single point (wedge)
+ * @param {Object} point The point object
+ * @param {Object} color The color of the point
+ * @param {Number} brightness The brightness relative to the color
+ */
+ drawPoints: function () {
+ var series = this,
+ options = series.options,
+ chart = series.chart,
+ renderer = chart.renderer;
+
+ each(series.data, function (point) {
+
+ var graphic = point.graphic,
+ shapeArgs = point.shapeArgs;
+
+ if (!graphic) { // Create the shapes
+ point.graphic = renderer.path(shapeArgs).
+ attr({
+ fill: point.color,
+ stroke: options.borderColor,
+ 'stroke-width': options.borderWidth
+ }).
+ add(series.group);
+
+ } else { // Update the shapes
+ graphic.animate(shapeArgs);
+ }
+ });
+ },
+
+ /**
+ * Funnel items don't have angles (#2289)
+ */
+ sortByAngle: function (points) {
+ points.sort(function (a, b) {
+ return a.plotY - b.plotY;
+ });
+ },
+
+ /**
+ * Extend the pie data label method
+ */
+ drawDataLabels: function () {
+ var data = this.data,
+ labelDistance = this.options.dataLabels.distance,
+ leftSide,
+ sign,
+ point,
+ i = data.length,
+ x,
+ y;
+
+ // In the original pie label anticollision logic, the slots are distributed
+ // from one labelDistance above to one labelDistance below the pie. In funnels
+ // we don't want this.
+ this.center[2] -= 2 * labelDistance;
+
+ // Set the label position array for each point.
+ while (i--) {
+ point = data[i];
+ leftSide = point.half;
+ sign = leftSide ? 1 : -1;
+ y = point.plotY;
+ x = this.getX(y, leftSide);
+
+ // set the anchor point for data labels
+ point.labelPos = [
+ 0, // first break of connector
+ y, // a/a
+ x + (labelDistance - 5) * sign, // second break, right outside point shape
+ y, // a/a
+ x + labelDistance * sign, // landing point for connector
+ y, // a/a
+ leftSide ? 'right' : 'left', // alignment
+ 0 // center angle
+ ];
+ }
+
+ seriesTypes.pie.prototype.drawDataLabels.call(this);
+ }
+
+});
+
+/**
+ * Pyramid series type.
+ * A pyramid series is a special type of funnel, without neck and reversed by default.
+ */
+defaultOptions.plotOptions.pyramid = Highcharts.merge(defaultOptions.plotOptions.funnel, {
+ neckWidth: '0%',
+ neckHeight: '0%',
+ reversed: true
+});
+Highcharts.seriesTypes.pyramid = Highcharts.extendClass(Highcharts.seriesTypes.funnel, {
+ type: 'pyramid'
+});
+
+}(Highcharts));
diff --git a/management/guns-admin/src/main/webapp/static/js/plugins/highcharts/modules/heatmap.js b/management/guns-admin/src/main/webapp/static/js/plugins/highcharts/modules/heatmap.js
new file mode 100644
index 0000000..6d9705c
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/static/js/plugins/highcharts/modules/heatmap.js
@@ -0,0 +1,23 @@
+/*
+ Highcharts JS v4.0.3 (2014-07-03)
+
+ (c) 2011-2014 Torstein Honsi
+
+ License: www.highcharts.com/license
+*/
+(function(h){var j=h.Axis,y=h.Chart,p=h.Color,z=h.Legend,t=h.LegendSymbolMixin,u=h.Series,v=h.SVGRenderer,w=h.getOptions(),k=h.each,q=h.extend,A=h.extendClass,l=h.merge,m=h.pick,x=h.numberFormat,o=h.seriesTypes,r=h.wrap,n=function(){},s=h.ColorAxis=function(){this.isColorAxis=!0;this.init.apply(this,arguments)};q(s.prototype,j.prototype);q(s.prototype,{defaultColorAxisOptions:{lineWidth:0,gridLineWidth:1,tickPixelInterval:72,startOnTick:!0,endOnTick:!0,offset:0,marker:{animation:{duration:50},color:"gray",
+width:0.01},labels:{overflow:"justify"},minColor:"#EFEFFF",maxColor:"#003875",tickLength:5},init:function(b,a){var c=b.options.legend.layout!=="vertical",d;d=l(this.defaultColorAxisOptions,{side:c?2:1,reversed:!c},a,{isX:c,opposite:!c,showEmpty:!1,title:null,isColor:!0});j.prototype.init.call(this,b,d);a.dataClasses&&this.initDataClasses(a);this.initStops(a);this.isXAxis=!0;this.horiz=c;this.zoomEnabled=!1},tweenColors:function(b,a,c){var d=a.rgba[3]!==1||b.rgba[3]!==1;return(d?"rgba(":"rgb(")+Math.round(a.rgba[0]+
+(b.rgba[0]-a.rgba[0])*(1-c))+","+Math.round(a.rgba[1]+(b.rgba[1]-a.rgba[1])*(1-c))+","+Math.round(a.rgba[2]+(b.rgba[2]-a.rgba[2])*(1-c))+(d?","+(a.rgba[3]+(b.rgba[3]-a.rgba[3])*(1-c)):"")+")"},initDataClasses:function(b){var a=this,c=this.chart,d,e=0,f=this.options;this.dataClasses=d=[];this.legendItems=[];k(b.dataClasses,function(g,i){var h,g=l(g);d.push(g);if(!g.color)f.dataClassColor==="category"?(h=c.options.colors,g.color=h[e++],e===h.length&&(e=0)):g.color=a.tweenColors(p(f.minColor),p(f.maxColor),
+i/(b.dataClasses.length-1))})},initStops:function(b){this.stops=b.stops||[[0,this.options.minColor],[1,this.options.maxColor]];k(this.stops,function(a){a.color=p(a[1])})},setOptions:function(b){j.prototype.setOptions.call(this,b);this.options.crosshair=this.options.marker;this.coll="colorAxis"},setAxisSize:function(){var b=this.legendSymbol,a=this.chart,c,d,e;if(b)this.left=c=b.attr("x"),this.top=d=b.attr("y"),this.width=e=b.attr("width"),this.height=b=b.attr("height"),this.right=a.chartWidth-c-e,
+this.bottom=a.chartHeight-d-b,this.len=this.horiz?e:b,this.pos=this.horiz?c:d},toColor:function(b,a){var c,d=this.stops,e,f=this.dataClasses,g,i;if(f)for(i=f.length;i--;){if(g=f[i],e=g.from,d=g.to,(e===void 0||b>=e)&&(d===void 0||b<=d)){c=g.color;if(a)a.dataClass=i;break}}else{this.isLog&&(b=this.val2lin(b));c=1-(this.max-b)/(this.max-this.min||1);for(i=d.length;i--;)if(c>d[i][0])break;e=d[i]||d[i+1];d=d[i+1]||e;c=1-(d[0]-c)/(d[0]-e[0]||1);c=this.tweenColors(e.color,d.color,c)}return c},getOffset:function(){var b=
+this.legendGroup,a=this.chart.axisOffset[this.side];if(b){j.prototype.getOffset.call(this);if(!this.axisGroup.parentGroup)this.axisGroup.add(b),this.gridGroup.add(b),this.labelGroup.add(b),this.added=!0;this.chart.axisOffset[this.side]=a}},setLegendColor:function(){var b,a=this.options;b=this.horiz?[0,0,1,0]:[0,0,0,1];this.legendColor={linearGradient:{x1:b[0],y1:b[1],x2:b[2],y2:b[3]},stops:a.stops||[[0,a.minColor],[1,a.maxColor]]}},drawLegendSymbol:function(b,a){var c=b.padding,d=b.options,e=this.horiz,
+f=m(d.symbolWidth,e?200:12),g=m(d.symbolHeight,e?12:200),i=m(d.labelPadding,e?16:30),d=m(d.itemDistance,10);this.setLegendColor();a.legendSymbol=this.chart.renderer.rect(0,b.baseline-11,f,g).attr({zIndex:1}).add(a.legendGroup);a.legendSymbol.getBBox();this.legendItemWidth=f+c+(e?d:i);this.legendItemHeight=g+c+(e?i:0)},setState:n,visible:!0,setVisible:n,getSeriesExtremes:function(){var b;if(this.series.length)b=this.series[0],this.dataMin=b.valueMin,this.dataMax=b.valueMax},drawCrosshair:function(b,
+a){var c=!this.cross,d=a&&a.plotX,e=a&&a.plotY,f,g=this.pos,i=this.len;if(a)f=this.toPixels(a.value),f<g?f=g-2:f>g+i&&(f=g+i+2),a.plotX=f,a.plotY=this.len-f,j.prototype.drawCrosshair.call(this,b,a),a.plotX=d,a.plotY=e,!c&&this.cross&&this.cross.attr({fill:this.crosshair.color}).add(this.labelGroup)},getPlotLinePath:function(b,a,c,d,e){return e?this.horiz?["M",e-4,this.top-6,"L",e+4,this.top-6,e,this.top,"Z"]:["M",this.left,e,"L",this.left-6,e+6,this.left-6,e-6,"Z"]:j.prototype.getPlotLinePath.call(this,
+b,a,c,d)},update:function(b,a){k(this.series,function(a){a.isDirtyData=!0});j.prototype.update.call(this,b,a);this.legendItem&&(this.setLegendColor(),this.chart.legend.colorizeItem(this,!0))},getDataClassLegendSymbols:function(){var b=this,a=this.chart,c=this.legendItems,d=a.options.legend,e=d.valueDecimals,f=d.valueSuffix||"",g;c.length||k(this.dataClasses,function(d,h){var j=!0,l=d.from,m=d.to;g="";l===void 0?g="< ":m===void 0&&(g="> ");l!==void 0&&(g+=x(l,e)+f);l!==void 0&&m!==void 0&&(g+=" - ");
+m!==void 0&&(g+=x(m,e)+f);c.push(q({chart:a,name:g,options:{},drawLegendSymbol:t.drawRectangle,visible:!0,setState:n,setVisible:function(){j=this.visible=!j;k(b.series,function(a){k(a.points,function(a){a.dataClass===h&&a.setVisible(j)})});a.legend.colorizeItem(this,j)}},d))});return c},name:""});r(y.prototype,"getAxes",function(b){var a=this.options.colorAxis;b.call(this);this.colorAxis=[];a&&new s(this,a)});r(z.prototype,"getAllItems",function(b){var a=[],c=this.chart.colorAxis[0];c&&(c.options.dataClasses?
+a=a.concat(c.getDataClassLegendSymbols()):a.push(c),k(c.series,function(a){a.options.showInLegend=!1}));return a.concat(b.call(this))});h={pointAttrToOptions:{stroke:"borderColor","stroke-width":"borderWidth",fill:"color",dashstyle:"dashStyle"},pointArrayMap:["value"],axisTypes:["xAxis","yAxis","colorAxis"],optionalAxis:"colorAxis",trackerGroups:["group","markerGroup","dataLabelsGroup"],getSymbol:n,parallelArrays:["x","y","value"],colorKey:"value",translateColors:function(){var b=this,a=this.options.nullColor,
+c=this.colorAxis,d=this.colorKey;k(this.data,function(e){var f=e[d];if(f=f===null?a:c&&f!==void 0?c.toColor(f,e):e.color||b.color)e.color=f})}};r(v.prototype,"buildText",function(b,a){var c=a.styles&&a.styles.HcTextStroke;b.call(this,a);c&&a.applyTextStroke&&a.applyTextStroke(c)});v.prototype.Element.prototype.applyTextStroke=function(b){var a=this.element,c,d,b=b.split(" ");c=a.getElementsByTagName("tspan");d=a.firstChild;this.ySetter=this.xSetter;k([].slice.call(c),function(c,f){var g;f===0&&(c.setAttribute("x",
+a.getAttribute("x")),(f=a.getAttribute("y"))!==null&&c.setAttribute("y",f));g=c.cloneNode(1);g.setAttribute("stroke",b[1]);g.setAttribute("stroke-width",b[0]);g.setAttribute("stroke-linejoin","round");a.insertBefore(g,d)})};w.plotOptions.heatmap=l(w.plotOptions.scatter,{animation:!1,borderWidth:0,nullColor:"#F8F8F8",dataLabels:{formatter:function(){return this.point.value},verticalAlign:"middle",crop:!1,overflow:!1,style:{color:"white",fontWeight:"bold",HcTextStroke:"1px rgba(0,0,0,0.5)"}},marker:null,
+tooltip:{pointFormat:"{point.x}, {point.y}: {point.value}<br/>"},states:{normal:{animation:!0},hover:{brightness:0.2}}});o.heatmap=A(o.scatter,l(h,{type:"heatmap",pointArrayMap:["y","value"],hasPointSpecificOptions:!0,supportsDrilldown:!0,getExtremesFromAll:!0,init:function(){o.scatter.prototype.init.apply(this,arguments);this.pointRange=this.options.colsize||1;this.yAxis.axisPointRange=this.options.rowsize||1},translate:function(){var b=this.options,a=this.xAxis,c=this.yAxis;this.generatePoints();
+k(this.points,function(d){var e=(b.colsize||1)/2,f=(b.rowsize||1)/2,g=Math.round(a.len-a.translate(d.x-e,0,1,0,1)),e=Math.round(a.len-a.translate(d.x+e,0,1,0,1)),h=Math.round(c.translate(d.y-f,0,1,0,1)),f=Math.round(c.translate(d.y+f,0,1,0,1));d.plotX=(g+e)/2;d.plotY=(h+f)/2;d.shapeType="rect";d.shapeArgs={x:Math.min(g,e),y:Math.min(h,f),width:Math.abs(e-g),height:Math.abs(f-h)}});this.translateColors();this.chart.hasRendered&&k(this.points,function(a){a.shapeArgs.fill=a.color})},drawPoints:o.column.prototype.drawPoints,
+animate:n,getBox:n,drawLegendSymbol:t.drawRectangle,getExtremes:function(){u.prototype.getExtremes.call(this,this.valueData);this.valueMin=this.dataMin;this.valueMax=this.dataMax;u.prototype.getExtremes.call(this)}}))})(Highcharts);
diff --git a/management/guns-admin/src/main/webapp/static/js/plugins/highcharts/modules/heatmap.src.js b/management/guns-admin/src/main/webapp/static/js/plugins/highcharts/modules/heatmap.src.js
new file mode 100644
index 0000000..8273f5b
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/static/js/plugins/highcharts/modules/heatmap.src.js
@@ -0,0 +1,675 @@
+/**
+ * @license Highcharts JS v4.0.3 (2014-07-03)
+ *
+ * (c) 2011-2014 Torstein Honsi
+ *
+ * License: www.highcharts.com/license
+ */
+
+/*global HighchartsAdapter*/
+(function (Highcharts) {
+
+
+var UNDEFINED,
+ Axis = Highcharts.Axis,
+ Chart = Highcharts.Chart,
+ Color = Highcharts.Color,
+ Legend = Highcharts.Legend,
+ LegendSymbolMixin = Highcharts.LegendSymbolMixin,
+ Series = Highcharts.Series,
+ SVGRenderer = Highcharts.SVGRenderer,
+
+ defaultOptions = Highcharts.getOptions(),
+ each = Highcharts.each,
+ extend = Highcharts.extend,
+ extendClass = Highcharts.extendClass,
+ merge = Highcharts.merge,
+ pick = Highcharts.pick,
+ numberFormat = Highcharts.numberFormat,
+ seriesTypes = Highcharts.seriesTypes,
+ wrap = Highcharts.wrap,
+ noop = function () {};
+
+
+
+
+/**
+ * The ColorAxis object for inclusion in gradient legends
+ */
+var ColorAxis = Highcharts.ColorAxis = function () {
+ this.isColorAxis = true;
+ this.init.apply(this, arguments);
+};
+extend(ColorAxis.prototype, Axis.prototype);
+extend(ColorAxis.prototype, {
+ defaultColorAxisOptions: {
+ lineWidth: 0,
+ gridLineWidth: 1,
+ tickPixelInterval: 72,
+ startOnTick: true,
+ endOnTick: true,
+ offset: 0,
+ marker: {
+ animation: {
+ duration: 50
+ },
+ color: 'gray',
+ width: 0.01
+ },
+ labels: {
+ overflow: 'justify'
+ },
+ minColor: '#EFEFFF',
+ maxColor: '#003875',
+ tickLength: 5
+ },
+ init: function (chart, userOptions) {
+ var horiz = chart.options.legend.layout !== 'vertical',
+ options;
+
+ // Build the options
+ options = merge(this.defaultColorAxisOptions, {
+ side: horiz ? 2 : 1,
+ reversed: !horiz
+ }, userOptions, {
+ isX: horiz,
+ opposite: !horiz,
+ showEmpty: false,
+ title: null,
+ isColor: true
+ });
+
+ Axis.prototype.init.call(this, chart, options);
+
+ // Base init() pushes it to the xAxis array, now pop it again
+ //chart[this.isXAxis ? 'xAxis' : 'yAxis'].pop();
+
+ // Prepare data classes
+ if (userOptions.dataClasses) {
+ this.initDataClasses(userOptions);
+ }
+ this.initStops(userOptions);
+
+ // Override original axis properties
+ this.isXAxis = true;
+ this.horiz = horiz;
+ this.zoomEnabled = false;
+ },
+
+ /*
+ * Return an intermediate color between two colors, according to pos where 0
+ * is the from color and 1 is the to color
+ */
+ tweenColors: function (from, to, pos) {
+ // Check for has alpha, because rgba colors perform worse due to lack of
+ // support in WebKit.
+ var hasAlpha = (to.rgba[3] !== 1 || from.rgba[3] !== 1);
+ return (hasAlpha ? 'rgba(' : 'rgb(') +
+ Math.round(to.rgba[0] + (from.rgba[0] - to.rgba[0]) * (1 - pos)) + ',' +
+ Math.round(to.rgba[1] + (from.rgba[1] - to.rgba[1]) * (1 - pos)) + ',' +
+ Math.round(to.rgba[2] + (from.rgba[2] - to.rgba[2]) * (1 - pos)) +
+ (hasAlpha ? (',' + (to.rgba[3] + (from.rgba[3] - to.rgba[3]) * (1 - pos))) : '') + ')';
+ },
+
+ initDataClasses: function (userOptions) {
+ var axis = this,
+ chart = this.chart,
+ dataClasses,
+ colorCounter = 0,
+ options = this.options;
+ this.dataClasses = dataClasses = [];
+ this.legendItems = [];
+
+ each(userOptions.dataClasses, function (dataClass, i) {
+ var colors;
+
+ dataClass = merge(dataClass);
+ dataClasses.push(dataClass);
+ if (!dataClass.color) {
+ if (options.dataClassColor === 'category') {
+ colors = chart.options.colors;
+ dataClass.color = colors[colorCounter++];
+ // loop back to zero
+ if (colorCounter === colors.length) {
+ colorCounter = 0;
+ }
+ } else {
+ dataClass.color = axis.tweenColors(Color(options.minColor), Color(options.maxColor), i / (userOptions.dataClasses.length - 1));
+ }
+ }
+ });
+ },
+
+ initStops: function (userOptions) {
+ this.stops = userOptions.stops || [
+ [0, this.options.minColor],
+ [1, this.options.maxColor]
+ ];
+ each(this.stops, function (stop) {
+ stop.color = Color(stop[1]);
+ });
+ },
+
+ /**
+ * Extend the setOptions method to process extreme colors and color
+ * stops.
+ */
+ setOptions: function (userOptions) {
+ Axis.prototype.setOptions.call(this, userOptions);
+
+ this.options.crosshair = this.options.marker;
+ this.coll = 'colorAxis';
+ },
+
+ setAxisSize: function () {
+ var symbol = this.legendSymbol,
+ chart = this.chart,
+ x,
+ y,
+ width,
+ height;
+
+ if (symbol) {
+ this.left = x = symbol.attr('x');
+ this.top = y = symbol.attr('y');
+ this.width = width = symbol.attr('width');
+ this.height = height = symbol.attr('height');
+ this.right = chart.chartWidth - x - width;
+ this.bottom = chart.chartHeight - y - height;
+
+ this.len = this.horiz ? width : height;
+ this.pos = this.horiz ? x : y;
+ }
+ },
+
+ /**
+ * Translate from a value to a color
+ */
+ toColor: function (value, point) {
+ var pos,
+ stops = this.stops,
+ from,
+ to,
+ color,
+ dataClasses = this.dataClasses,
+ dataClass,
+ i;
+
+ if (dataClasses) {
+ i = dataClasses.length;
+ while (i--) {
+ dataClass = dataClasses[i];
+ from = dataClass.from;
+ to = dataClass.to;
+ if ((from === UNDEFINED || value >= from) && (to === UNDEFINED || value <= to)) {
+ color = dataClass.color;
+ if (point) {
+ point.dataClass = i;
+ }
+ break;
+ }
+ }
+
+ } else {
+
+ if (this.isLog) {
+ value = this.val2lin(value);
+ }
+ pos = 1 - ((this.max - value) / ((this.max - this.min) || 1));
+ i = stops.length;
+ while (i--) {
+ if (pos > stops[i][0]) {
+ break;
+ }
+ }
+ from = stops[i] || stops[i + 1];
+ to = stops[i + 1] || from;
+
+ // The position within the gradient
+ pos = 1 - (to[0] - pos) / ((to[0] - from[0]) || 1);
+
+ color = this.tweenColors(
+ from.color,
+ to.color,
+ pos
+ );
+ }
+ return color;
+ },
+
+ getOffset: function () {
+ var group = this.legendGroup,
+ sideOffset = this.chart.axisOffset[this.side];
+
+ if (group) {
+
+ Axis.prototype.getOffset.call(this);
+
+ if (!this.axisGroup.parentGroup) {
+
+ // Move the axis elements inside the legend group
+ this.axisGroup.add(group);
+ this.gridGroup.add(group);
+ this.labelGroup.add(group);
+
+ this.added = true;
+ }
+ // Reset it to avoid color axis reserving space
+ this.chart.axisOffset[this.side] = sideOffset;
+ }
+ },
+
+ /**
+ * Create the color gradient
+ */
+ setLegendColor: function () {
+ var grad,
+ horiz = this.horiz,
+ options = this.options;
+
+ grad = horiz ? [0, 0, 1, 0] : [0, 0, 0, 1];
+ this.legendColor = {
+ linearGradient: { x1: grad[0], y1: grad[1], x2: grad[2], y2: grad[3] },
+ stops: options.stops || [
+ [0, options.minColor],
+ [1, options.maxColor]
+ ]
+ };
+ },
+
+ /**
+ * The color axis appears inside the legend and has its own legend symbol
+ */
+ drawLegendSymbol: function (legend, item) {
+ var padding = legend.padding,
+ legendOptions = legend.options,
+ horiz = this.horiz,
+ box,
+ width = pick(legendOptions.symbolWidth, horiz ? 200 : 12),
+ height = pick(legendOptions.symbolHeight, horiz ? 12 : 200),
+ labelPadding = pick(legendOptions.labelPadding, horiz ? 16 : 30),
+ itemDistance = pick(legendOptions.itemDistance, 10);
+
+ this.setLegendColor();
+
+ // Create the gradient
+ item.legendSymbol = this.chart.renderer.rect(
+ 0,
+ legend.baseline - 11,
+ width,
+ height
+ ).attr({
+ zIndex: 1
+ }).add(item.legendGroup);
+ box = item.legendSymbol.getBBox();
+
+ // Set how much space this legend item takes up
+ this.legendItemWidth = width + padding + (horiz ? itemDistance : labelPadding);
+ this.legendItemHeight = height + padding + (horiz ? labelPadding : 0);
+ },
+ /**
+ * Fool the legend
+ */
+ setState: noop,
+ visible: true,
+ setVisible: noop,
+ getSeriesExtremes: function () {
+ var series;
+ if (this.series.length) {
+ series = this.series[0];
+ this.dataMin = series.valueMin;
+ this.dataMax = series.valueMax;
+ }
+ },
+ drawCrosshair: function (e, point) {
+ var newCross = !this.cross,
+ plotX = point && point.plotX,
+ plotY = point && point.plotY,
+ crossPos,
+ axisPos = this.pos,
+ axisLen = this.len;
+
+ if (point) {
+ crossPos = this.toPixels(point.value);
+ if (crossPos < axisPos) {
+ crossPos = axisPos - 2;
+ } else if (crossPos > axisPos + axisLen) {
+ crossPos = axisPos + axisLen + 2;
+ }
+
+ point.plotX = crossPos;
+ point.plotY = this.len - crossPos;
+ Axis.prototype.drawCrosshair.call(this, e, point);
+ point.plotX = plotX;
+ point.plotY = plotY;
+
+ if (!newCross && this.cross) {
+ this.cross
+ .attr({
+ fill: this.crosshair.color
+ })
+ .add(this.labelGroup);
+ }
+ }
+ },
+ getPlotLinePath: function (a, b, c, d, pos) {
+ if (pos) { // crosshairs only
+ return this.horiz ?
+ ['M', pos - 4, this.top - 6, 'L', pos + 4, this.top - 6, pos, this.top, 'Z'] :
+ ['M', this.left, pos, 'L', this.left - 6, pos + 6, this.left - 6, pos - 6, 'Z'];
+ } else {
+ return Axis.prototype.getPlotLinePath.call(this, a, b, c, d);
+ }
+ },
+
+ update: function (newOptions, redraw) {
+ each(this.series, function (series) {
+ series.isDirtyData = true; // Needed for Axis.update when choropleth colors change
+ });
+ Axis.prototype.update.call(this, newOptions, redraw);
+ if (this.legendItem) {
+ this.setLegendColor();
+ this.chart.legend.colorizeItem(this, true);
+ }
+ },
+
+ /**
+ * Get the legend item symbols for data classes
+ */
+ getDataClassLegendSymbols: function () {
+ var axis = this,
+ chart = this.chart,
+ legendItems = this.legendItems,
+ legendOptions = chart.options.legend,
+ valueDecimals = legendOptions.valueDecimals,
+ valueSuffix = legendOptions.valueSuffix || '',
+ name;
+
+ if (!legendItems.length) {
+ each(this.dataClasses, function (dataClass, i) {
+ var vis = true,
+ from = dataClass.from,
+ to = dataClass.to;
+
+ // Assemble the default name. This can be overridden by legend.options.labelFormatter
+ name = '';
+ if (from === UNDEFINED) {
+ name = '< ';
+ } else if (to === UNDEFINED) {
+ name = '> ';
+ }
+ if (from !== UNDEFINED) {
+ name += numberFormat(from, valueDecimals) + valueSuffix;
+ }
+ if (from !== UNDEFINED && to !== UNDEFINED) {
+ name += ' - ';
+ }
+ if (to !== UNDEFINED) {
+ name += numberFormat(to, valueDecimals) + valueSuffix;
+ }
+
+ // Add a mock object to the legend items
+ legendItems.push(extend({
+ chart: chart,
+ name: name,
+ options: {},
+ drawLegendSymbol: LegendSymbolMixin.drawRectangle,
+ visible: true,
+ setState: noop,
+ setVisible: function () {
+ vis = this.visible = !vis;
+ each(axis.series, function (series) {
+ each(series.points, function (point) {
+ if (point.dataClass === i) {
+ point.setVisible(vis);
+ }
+ });
+ });
+
+ chart.legend.colorizeItem(this, vis);
+ }
+ }, dataClass));
+ });
+ }
+ return legendItems;
+ },
+ name: '' // Prevents 'undefined' in legend in IE8
+});
+
+
+
+/**
+ * Extend the chart getAxes method to also get the color axis
+ */
+wrap(Chart.prototype, 'getAxes', function (proceed) {
+
+ var options = this.options,
+ colorAxisOptions = options.colorAxis;
+
+ proceed.call(this);
+
+ this.colorAxis = [];
+ if (colorAxisOptions) {
+ proceed = new ColorAxis(this, colorAxisOptions); // Fake assignment for jsLint
+ }
+});
+
+
+/**
+ * Wrap the legend getAllItems method to add the color axis. This also removes the
+ * axis' own series to prevent them from showing up individually.
+ */
+wrap(Legend.prototype, 'getAllItems', function (proceed) {
+ var allItems = [],
+ colorAxis = this.chart.colorAxis[0];
+
+ if (colorAxis) {
+
+ // Data classes
+ if (colorAxis.options.dataClasses) {
+ allItems = allItems.concat(colorAxis.getDataClassLegendSymbols());
+ // Gradient legend
+ } else {
+ // Add this axis on top
+ allItems.push(colorAxis);
+ }
+
+ // Don't add the color axis' series
+ each(colorAxis.series, function (series) {
+ series.options.showInLegend = false;
+ });
+ }
+
+ return allItems.concat(proceed.call(this));
+});/**
+ * Mixin for maps and heatmaps
+ */
+var colorSeriesMixin = {
+
+ pointAttrToOptions: { // mapping between SVG attributes and the corresponding options
+ stroke: 'borderColor',
+ 'stroke-width': 'borderWidth',
+ fill: 'color',
+ dashstyle: 'dashStyle'
+ },
+ pointArrayMap: ['value'],
+ axisTypes: ['xAxis', 'yAxis', 'colorAxis'],
+ optionalAxis: 'colorAxis',
+ trackerGroups: ['group', 'markerGroup', 'dataLabelsGroup'],
+ getSymbol: noop,
+ parallelArrays: ['x', 'y', 'value'],
+ colorKey: 'value',
+
+ /**
+ * In choropleth maps, the color is a result of the value, so this needs translation too
+ */
+ translateColors: function () {
+ var series = this,
+ nullColor = this.options.nullColor,
+ colorAxis = this.colorAxis,
+ colorKey = this.colorKey;
+
+ each(this.data, function (point) {
+ var value = point[colorKey],
+ color;
+
+ color = value === null ? nullColor : (colorAxis && value !== undefined) ? colorAxis.toColor(value, point) : point.color || series.color;
+
+ if (color) {
+ point.color = color;
+ }
+ });
+ }
+};
+
+
+/**
+ * Wrap the buildText method and add the hook for add text stroke
+ */
+wrap(SVGRenderer.prototype, 'buildText', function (proceed, wrapper) {
+
+ var textStroke = wrapper.styles && wrapper.styles.HcTextStroke;
+
+ proceed.call(this, wrapper);
+
+ // Apply the text stroke
+ if (textStroke && wrapper.applyTextStroke) {
+ wrapper.applyTextStroke(textStroke);
+ }
+});
+
+/**
+ * Apply an outside text stroke to data labels, based on the custom CSS property, HcTextStroke.
+ * Consider moving this to Highcharts core, also makes sense on stacked columns etc.
+ */
+SVGRenderer.prototype.Element.prototype.applyTextStroke = function (textStroke) {
+ var elem = this.element,
+ tspans,
+ firstChild;
+
+ textStroke = textStroke.split(' ');
+ tspans = elem.getElementsByTagName('tspan');
+ firstChild = elem.firstChild;
+
+ // In order to get the right y position of the clones,
+ // copy over the y setter
+ this.ySetter = this.xSetter;
+
+ each([].slice.call(tspans), function (tspan, y) {
+ var clone;
+ if (y === 0) {
+ tspan.setAttribute('x', elem.getAttribute('x'));
+ if ((y = elem.getAttribute('y')) !== null) {
+ tspan.setAttribute('y', y);
+ }
+ }
+ clone = tspan.cloneNode(1);
+ clone.setAttribute('stroke', textStroke[1]);
+ clone.setAttribute('stroke-width', textStroke[0]);
+ clone.setAttribute('stroke-linejoin', 'round');
+ elem.insertBefore(clone, firstChild);
+ });
+};
+/**
+ * Extend the default options with map options
+ */
+defaultOptions.plotOptions.heatmap = merge(defaultOptions.plotOptions.scatter, {
+ animation: false,
+ borderWidth: 0,
+ nullColor: '#F8F8F8',
+ dataLabels: {
+ formatter: function () { // #2945
+ return this.point.value;
+ },
+ verticalAlign: 'middle',
+ crop: false,
+ overflow: false,
+ style: {
+ color: 'white',
+ fontWeight: 'bold',
+ HcTextStroke: '1px rgba(0,0,0,0.5)'
+ }
+ },
+ marker: null,
+ tooltip: {
+ pointFormat: '{point.x}, {point.y}: {point.value}<br/>'
+ },
+ states: {
+ normal: {
+ animation: true
+ },
+ hover: {
+ brightness: 0.2
+ }
+ }
+});
+
+// The Heatmap series type
+seriesTypes.heatmap = extendClass(seriesTypes.scatter, merge(colorSeriesMixin, {
+ type: 'heatmap',
+ pointArrayMap: ['y', 'value'],
+ hasPointSpecificOptions: true,
+ supportsDrilldown: true,
+ getExtremesFromAll: true,
+ init: function () {
+ seriesTypes.scatter.prototype.init.apply(this, arguments);
+ this.pointRange = this.options.colsize || 1;
+ this.yAxis.axisPointRange = this.options.rowsize || 1; // general point range
+ },
+ translate: function () {
+ var series = this,
+ options = series.options,
+ xAxis = series.xAxis,
+ yAxis = series.yAxis;
+
+ series.generatePoints();
+
+ each(series.points, function (point) {
+ var xPad = (options.colsize || 1) / 2,
+ yPad = (options.rowsize || 1) / 2,
+ x1 = Math.round(xAxis.len - xAxis.translate(point.x - xPad, 0, 1, 0, 1)),
+ x2 = Math.round(xAxis.len - xAxis.translate(point.x + xPad, 0, 1, 0, 1)),
+ y1 = Math.round(yAxis.translate(point.y - yPad, 0, 1, 0, 1)),
+ y2 = Math.round(yAxis.translate(point.y + yPad, 0, 1, 0, 1));
+
+ // Set plotX and plotY for use in K-D-Tree and more
+ point.plotX = (x1 + x2) / 2;
+ point.plotY = (y1 + y2) / 2;
+
+ point.shapeType = 'rect';
+ point.shapeArgs = {
+ x: Math.min(x1, x2),
+ y: Math.min(y1, y2),
+ width: Math.abs(x2 - x1),
+ height: Math.abs(y2 - y1)
+ };
+ });
+
+ series.translateColors();
+
+ // Make sure colors are updated on colorAxis update (#2893)
+ if (this.chart.hasRendered) {
+ each(series.points, function (point) {
+ point.shapeArgs.fill = point.color;
+ });
+ }
+ },
+ drawPoints: seriesTypes.column.prototype.drawPoints,
+ animate: noop,
+ getBox: noop,
+ drawLegendSymbol: LegendSymbolMixin.drawRectangle,
+
+ getExtremes: function () {
+ // Get the extremes from the value data
+ Series.prototype.getExtremes.call(this, this.valueData);
+ this.valueMin = this.dataMin;
+ this.valueMax = this.dataMax;
+
+ // Get the extremes from the y data
+ Series.prototype.getExtremes.call(this);
+ }
+
+}));
+
+
+}(Highcharts));
diff --git a/management/guns-admin/src/main/webapp/static/js/plugins/highcharts/modules/no-data-to-display.js b/management/guns-admin/src/main/webapp/static/js/plugins/highcharts/modules/no-data-to-display.js
new file mode 100644
index 0000000..99ea2c1
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/static/js/plugins/highcharts/modules/no-data-to-display.js
@@ -0,0 +1,12 @@
+/*
+ Highcharts JS v4.0.3 (2014-07-03)
+ Plugin for displaying a message when there is no data visible in chart.
+
+ (c) 2010-2014 Highsoft AS
+ Author: Oystein Moseng
+
+ License: www.highcharts.com/license
+*/
+(function(c){function f(){return!!this.points.length}function g(){this.hasData()?this.hideNoData():this.showNoData()}var d=c.seriesTypes,e=c.Chart.prototype,h=c.getOptions(),i=c.extend;i(h.lang,{noData:"No data to display"});h.noData={position:{x:0,y:0,align:"center",verticalAlign:"middle"},attr:{},style:{fontWeight:"bold",fontSize:"12px",color:"#60606a"}};if(d.pie)d.pie.prototype.hasData=f;if(d.gauge)d.gauge.prototype.hasData=f;if(d.waterfall)d.waterfall.prototype.hasData=f;c.Series.prototype.hasData=
+function(){return this.dataMax!==void 0&&this.dataMin!==void 0};e.showNoData=function(a){var b=this.options,a=a||b.lang.noData,b=b.noData;if(!this.noDataLabel)this.noDataLabel=this.renderer.label(a,0,0,null,null,null,null,null,"no-data").attr(b.attr).css(b.style).add(),this.noDataLabel.align(i(this.noDataLabel.getBBox(),b.position),!1,"plotBox")};e.hideNoData=function(){if(this.noDataLabel)this.noDataLabel=this.noDataLabel.destroy()};e.hasData=function(){for(var a=this.series,b=a.length;b--;)if(a[b].hasData()&&
+!a[b].options.isInternal)return!0;return!1};e.callbacks.push(function(a){c.addEvent(a,"load",g);c.addEvent(a,"redraw",g)})})(Highcharts);
diff --git a/management/guns-admin/src/main/webapp/static/js/plugins/highcharts/modules/no-data-to-display.src.js b/management/guns-admin/src/main/webapp/static/js/plugins/highcharts/modules/no-data-to-display.src.js
new file mode 100644
index 0000000..b02b5be
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/static/js/plugins/highcharts/modules/no-data-to-display.src.js
@@ -0,0 +1,130 @@
+/**
+ * @license Highcharts JS v4.0.3 (2014-07-03)
+ * Plugin for displaying a message when there is no data visible in chart.
+ *
+ * (c) 2010-2014 Highsoft AS
+ * Author: Oystein Moseng
+ *
+ * License: www.highcharts.com/license
+ */
+
+(function (H) { // docs
+
+ var seriesTypes = H.seriesTypes,
+ chartPrototype = H.Chart.prototype,
+ defaultOptions = H.getOptions(),
+ extend = H.extend;
+
+ // Add language option
+ extend(defaultOptions.lang, {
+ noData: 'No data to display'
+ });
+
+ // Add default display options for message
+ defaultOptions.noData = {
+ position: {
+ x: 0,
+ y: 0,
+ align: 'center',
+ verticalAlign: 'middle'
+ },
+ attr: {
+ },
+ style: {
+ fontWeight: 'bold',
+ fontSize: '12px',
+ color: '#60606a'
+ }
+ };
+
+ /**
+ * Define hasData functions for series. These return true if there are data points on this series within the plot area
+ */
+ function hasDataPie() {
+ return !!this.points.length; /* != 0 */
+ }
+
+ if (seriesTypes.pie) {
+ seriesTypes.pie.prototype.hasData = hasDataPie;
+ }
+
+ if (seriesTypes.gauge) {
+ seriesTypes.gauge.prototype.hasData = hasDataPie;
+ }
+
+ if (seriesTypes.waterfall) {
+ seriesTypes.waterfall.prototype.hasData = hasDataPie;
+ }
+
+ H.Series.prototype.hasData = function () {
+ return this.dataMax !== undefined && this.dataMin !== undefined;
+ };
+
+ /**
+ * Display a no-data message.
+ *
+ * @param {String} str An optional message to show in place of the default one
+ */
+ chartPrototype.showNoData = function (str) {
+ var chart = this,
+ options = chart.options,
+ text = str || options.lang.noData,
+ noDataOptions = options.noData;
+
+ if (!chart.noDataLabel) {
+ chart.noDataLabel = chart.renderer.label(text, 0, 0, null, null, null, null, null, 'no-data')
+ .attr(noDataOptions.attr)
+ .css(noDataOptions.style)
+ .add();
+ chart.noDataLabel.align(extend(chart.noDataLabel.getBBox(), noDataOptions.position), false, 'plotBox');
+ }
+ };
+
+ /**
+ * Hide no-data message
+ */
+ chartPrototype.hideNoData = function () {
+ var chart = this;
+ if (chart.noDataLabel) {
+ chart.noDataLabel = chart.noDataLabel.destroy();
+ }
+ };
+
+ /**
+ * Returns true if there are data points within the plot area now
+ */
+ chartPrototype.hasData = function () {
+ var chart = this,
+ series = chart.series,
+ i = series.length;
+
+ while (i--) {
+ if (series[i].hasData() && !series[i].options.isInternal) {
+ return true;
+ }
+ }
+
+ return false;
+ };
+
+ /**
+ * Show no-data message if there is no data in sight. Otherwise, hide it.
+ */
+ function handleNoData() {
+ var chart = this;
+ if (chart.hasData()) {
+ chart.hideNoData();
+ } else {
+ chart.showNoData();
+ }
+ }
+
+ /**
+ * Add event listener to handle automatic display of no-data message
+ */
+ chartPrototype.callbacks.push(function (chart) {
+ H.addEvent(chart, 'load', handleNoData);
+ H.addEvent(chart, 'redraw', handleNoData);
+ });
+
+}(Highcharts));
diff --git a/management/guns-admin/src/main/webapp/static/js/plugins/highcharts/modules/solid-gauge.js b/management/guns-admin/src/main/webapp/static/js/plugins/highcharts/modules/solid-gauge.js
new file mode 100644
index 0000000..283ac42
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/static/js/plugins/highcharts/modules/solid-gauge.js
@@ -0,0 +1,13 @@
+/*
+ Highcharts JS v4.0.3 (2014-07-03)
+ Solid angular gauge module
+
+ (c) 2010-2014 Torstein Honsi
+
+ License: www.highcharts.com/license
+*/
+(function(a){var k=a.getOptions().plotOptions,q=a.pInt,r=a.pick,l=a.each,n;k.solidgauge=a.merge(k.gauge,{colorByPoint:!0});n={initDataClasses:function(b){var h=this,e=this.chart,c,m=0,f=this.options;this.dataClasses=c=[];l(b.dataClasses,function(g,d){var i,g=a.merge(g);c.push(g);if(!g.color)f.dataClassColor==="category"?(i=e.options.colors,g.color=i[m++],m===i.length&&(m=0)):g.color=h.tweenColors(a.Color(f.minColor),a.Color(f.maxColor),d/(b.dataClasses.length-1))})},initStops:function(b){this.stops=
+b.stops||[[0,this.options.minColor],[1,this.options.maxColor]];l(this.stops,function(b){b.color=a.Color(b[1])})},toColor:function(b,h){var e,c=this.stops,a,f=this.dataClasses,g,d;if(f)for(d=f.length;d--;){if(g=f[d],a=g.from,c=g.to,(a===void 0||b>=a)&&(c===void 0||b<=c)){e=g.color;if(h)h.dataClass=d;break}}else{this.isLog&&(b=this.val2lin(b));e=1-(this.max-b)/(this.max-this.min);for(d=c.length;d--;)if(e>c[d][0])break;a=c[d]||c[d+1];c=c[d+1]||a;e=1-(c[0]-e)/(c[0]-a[0]||1);e=this.tweenColors(a.color,
+c.color,e)}return e},tweenColors:function(b,a,e){var c=a.rgba[3]!==1||b.rgba[3]!==1;return b.rgba.length===0||a.rgba.length===0?"none":(c?"rgba(":"rgb(")+Math.round(a.rgba[0]+(b.rgba[0]-a.rgba[0])*(1-e))+","+Math.round(a.rgba[1]+(b.rgba[1]-a.rgba[1])*(1-e))+","+Math.round(a.rgba[2]+(b.rgba[2]-a.rgba[2])*(1-e))+(c?","+(a.rgba[3]+(b.rgba[3]-a.rgba[3])*(1-e)):"")+")"}};a.seriesTypes.solidgauge=a.extendClass(a.seriesTypes.gauge,{type:"solidgauge",bindAxes:function(){var b;a.seriesTypes.gauge.prototype.bindAxes.call(this);
+b=this.yAxis;a.extend(b,n);b.options.dataClasses&&b.initDataClasses(b.options);b.initStops(b.options)},drawPoints:function(){var b=this,h=b.yAxis,e=h.center,c=b.options,m=b.chart.renderer;a.each(b.points,function(f){var g=f.graphic,d=h.startAngleRad+h.translate(f.y,null,null,null,!0),i=q(r(c.radius,100))*e[2]/200,o=q(r(c.innerRadius,60))*e[2]/200,p=h.toColor(f.y,f),k;if(p!=="none")k=f.color,f.color=p;c.wrap===!1&&(d=Math.max(h.startAngleRad,Math.min(h.endAngleRad,d)));var d=d*180/Math.PI,j=d/(180/
+Math.PI),l=h.startAngleRad,d=Math.min(j,l),j=Math.max(j,l);j-d>2*Math.PI&&(j=d+2*Math.PI);i={x:e[0],y:e[1],r:i,innerR:o,start:d,end:j};g?(o=i.d,g.attr({fill:f.color}).animate(i,{step:function(b,c){g.attr("fill",n.tweenColors(a.Color(k),a.Color(p),c.pos))}}),i.d=o):f.graphic=m.arc(i).attr({stroke:c.borderColor||"none","stroke-width":c.borderWidth||0,fill:f.color,"sweep-flag":0}).add(b.group)})},animate:null})})(Highcharts);
diff --git a/management/guns-admin/src/main/webapp/static/js/plugins/highcharts/modules/solid-gauge.src.js b/management/guns-admin/src/main/webapp/static/js/plugins/highcharts/modules/solid-gauge.src.js
new file mode 100644
index 0000000..32af40a
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/static/js/plugins/highcharts/modules/solid-gauge.src.js
@@ -0,0 +1,234 @@
+/**
+ * @license Highcharts JS v4.0.3 (2014-07-03)
+ * Solid angular gauge module
+ *
+ * (c) 2010-2014 Torstein Honsi
+ *
+ * License: www.highcharts.com/license
+ */
+
+/*global Highcharts*/
+(function (H) {
+ "use strict";
+
+ var defaultPlotOptions = H.getOptions().plotOptions,
+ pInt = H.pInt,
+ pick = H.pick,
+ each = H.each,
+ colorAxisMethods,
+ UNDEFINED;
+
+ // The default options
+ defaultPlotOptions.solidgauge = H.merge(defaultPlotOptions.gauge, {
+ colorByPoint: true
+ });
+
+
+ // These methods are defined in the ColorAxis object, and copied here.
+ // If we implement an AMD system we should make ColorAxis a dependency.
+ colorAxisMethods = {
+
+
+ initDataClasses: function (userOptions) {
+ var axis = this,
+ chart = this.chart,
+ dataClasses,
+ colorCounter = 0,
+ options = this.options;
+ this.dataClasses = dataClasses = [];
+
+ each(userOptions.dataClasses, function (dataClass, i) {
+ var colors;
+
+ dataClass = H.merge(dataClass);
+ dataClasses.push(dataClass);
+ if (!dataClass.color) {
+ if (options.dataClassColor === 'category') {
+ colors = chart.options.colors;
+ dataClass.color = colors[colorCounter++];
+ // loop back to zero
+ if (colorCounter === colors.length) {
+ colorCounter = 0;
+ }
+ } else {
+ dataClass.color = axis.tweenColors(H.Color(options.minColor), H.Color(options.maxColor), i / (userOptions.dataClasses.length - 1));
+ }
+ }
+ });
+ },
+
+ initStops: function (userOptions) {
+ this.stops = userOptions.stops || [
+ [0, this.options.minColor],
+ [1, this.options.maxColor]
+ ];
+ each(this.stops, function (stop) {
+ stop.color = H.Color(stop[1]);
+ });
+ },
+ /**
+ * Translate from a value to a color
+ */
+ toColor: function (value, point) {
+ var pos,
+ stops = this.stops,
+ from,
+ to,
+ color,
+ dataClasses = this.dataClasses,
+ dataClass,
+ i;
+
+ if (dataClasses) {
+ i = dataClasses.length;
+ while (i--) {
+ dataClass = dataClasses[i];
+ from = dataClass.from;
+ to = dataClass.to;
+ if ((from === UNDEFINED || value >= from) && (to === UNDEFINED || value <= to)) {
+ color = dataClass.color;
+ if (point) {
+ point.dataClass = i;
+ }
+ break;
+ }
+ }
+
+ } else {
+
+ if (this.isLog) {
+ value = this.val2lin(value);
+ }
+ pos = 1 - ((this.max - value) / (this.max - this.min));
+ i = stops.length;
+ while (i--) {
+ if (pos > stops[i][0]) {
+ break;
+ }
+ }
+ from = stops[i] || stops[i + 1];
+ to = stops[i + 1] || from;
+
+ // The position within the gradient
+ pos = 1 - (to[0] - pos) / ((to[0] - from[0]) || 1);
+
+ color = this.tweenColors(
+ from.color,
+ to.color,
+ pos
+ );
+ }
+ return color;
+ },
+ tweenColors: function (from, to, pos) {
+ // Check for has alpha, because rgba colors perform worse due to lack of
+ // support in WebKit.
+ var hasAlpha = (to.rgba[3] !== 1 || from.rgba[3] !== 1);
+
+ if (from.rgba.length === 0 || to.rgba.length === 0) {
+ return 'none';
+ }
+ return (hasAlpha ? 'rgba(' : 'rgb(') +
+ Math.round(to.rgba[0] + (from.rgba[0] - to.rgba[0]) * (1 - pos)) + ',' +
+ Math.round(to.rgba[1] + (from.rgba[1] - to.rgba[1]) * (1 - pos)) + ',' +
+ Math.round(to.rgba[2] + (from.rgba[2] - to.rgba[2]) * (1 - pos)) +
+ (hasAlpha ? (',' + (to.rgba[3] + (from.rgba[3] - to.rgba[3]) * (1 - pos))) : '') + ')';
+ }
+ };
+
+ // The series prototype
+ H.seriesTypes.solidgauge = H.extendClass(H.seriesTypes.gauge, {
+ type: 'solidgauge',
+
+ bindAxes: function () {
+ var axis;
+ H.seriesTypes.gauge.prototype.bindAxes.call(this);
+
+ axis = this.yAxis;
+ H.extend(axis, colorAxisMethods);
+
+ // Prepare data classes
+ if (axis.options.dataClasses) {
+ axis.initDataClasses(axis.options);
+ }
+ axis.initStops(axis.options);
+ },
+
+ /**
+ * Draw the points where each point is one needle
+ */
+ drawPoints: function () {
+ var series = this,
+ yAxis = series.yAxis,
+ center = yAxis.center,
+ options = series.options,
+ renderer = series.chart.renderer;
+
+ H.each(series.points, function (point) {
+ var graphic = point.graphic,
+ rotation = yAxis.startAngleRad + yAxis.translate(point.y, null, null, null, true),
+ radius = (pInt(pick(options.radius, 100)) * center[2]) / 200,
+ innerRadius = (pInt(pick(options.innerRadius, 60)) * center[2]) / 200,
+ shapeArgs,
+ d,
+ toColor = yAxis.toColor(point.y, point),
+ fromColor;
+
+ if (toColor !== 'none') {
+ fromColor = point.color;
+ point.color = toColor;
+ }
+
+ // Handle the wrap option
+ if (options.wrap === false) {
+ rotation = Math.max(yAxis.startAngleRad, Math.min(yAxis.endAngleRad, rotation));
+ }
+ rotation = rotation * 180 / Math.PI;
+
+ var angle1 = rotation / (180 / Math.PI),
+ angle2 = yAxis.startAngleRad,
+ minAngle = Math.min(angle1, angle2),
+ maxAngle = Math.max(angle1, angle2);
+
+ if (maxAngle - minAngle > 2 * Math.PI) {
+ maxAngle = minAngle + 2 * Math.PI;
+ }
+
+ shapeArgs = {
+ x: center[0],
+ y: center[1],
+ r: radius,
+ innerR: innerRadius,
+ start: minAngle,
+ end: maxAngle
+ };
+
+ if (graphic) {
+ d = shapeArgs.d;
+
+ /*jslint unparam: true*/
+ graphic.attr({
+ fill: point.color
+ }).animate(shapeArgs, {
+ step: function (value, fx) {
+ graphic.attr('fill', colorAxisMethods.tweenColors(H.Color(fromColor), H.Color(toColor), fx.pos));
+ }
+ });
+ /*jslint unparam: false*/
+ shapeArgs.d = d; // animate alters it
+ } else {
+ point.graphic = renderer.arc(shapeArgs)
+ .attr({
+ stroke: options.borderColor || 'none',
+ 'stroke-width': options.borderWidth || 0,
+ fill: point.color,
+ 'sweep-flag': 0
+ })
+ .add(series.group);
+ }
+ });
+ },
+ animate: null
+ });
+
+}(Highcharts));
diff --git a/management/guns-admin/src/main/webapp/static/js/plugins/highcharts/themes/dark-blue.js b/management/guns-admin/src/main/webapp/static/js/plugins/highcharts/themes/dark-blue.js
new file mode 100644
index 0000000..7cf7138
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/static/js/plugins/highcharts/themes/dark-blue.js
@@ -0,0 +1,254 @@
+/**
+ * Dark blue theme for Highcharts JS
+ * @author Torstein Honsi
+ */
+
+Highcharts.theme = {
+ colors: ["#DDDF0D", "#55BF3B", "#DF5353", "#7798BF", "#aaeeee", "#ff0066", "#eeaaee",
+ "#55BF3B", "#DF5353", "#7798BF", "#aaeeee"],
+ chart: {
+ backgroundColor: {
+ linearGradient: { x1: 0, y1: 0, x2: 1, y2: 1 },
+ stops: [
+ [0, 'rgb(48, 48, 96)'],
+ [1, 'rgb(0, 0, 0)']
+ ]
+ },
+ borderColor: '#000000',
+ borderWidth: 2,
+ className: 'dark-container',
+ plotBackgroundColor: 'rgba(255, 255, 255, .1)',
+ plotBorderColor: '#CCCCCC',
+ plotBorderWidth: 1
+ },
+ title: {
+ style: {
+ color: '#C0C0C0',
+ font: 'bold 16px "Trebuchet MS", Verdana, sans-serif'
+ }
+ },
+ subtitle: {
+ style: {
+ color: '#666666',
+ font: 'bold 12px "Trebuchet MS", Verdana, sans-serif'
+ }
+ },
+ xAxis: {
+ gridLineColor: '#333333',
+ gridLineWidth: 1,
+ labels: {
+ style: {
+ color: '#A0A0A0'
+ }
+ },
+ lineColor: '#A0A0A0',
+ tickColor: '#A0A0A0',
+ title: {
+ style: {
+ color: '#CCC',
+ fontWeight: 'bold',
+ fontSize: '12px',
+ fontFamily: 'Trebuchet MS, Verdana, sans-serif'
+
+ }
+ }
+ },
+ yAxis: {
+ gridLineColor: '#333333',
+ labels: {
+ style: {
+ color: '#A0A0A0'
+ }
+ },
+ lineColor: '#A0A0A0',
+ minorTickInterval: null,
+ tickColor: '#A0A0A0',
+ tickWidth: 1,
+ title: {
+ style: {
+ color: '#CCC',
+ fontWeight: 'bold',
+ fontSize: '12px',
+ fontFamily: 'Trebuchet MS, Verdana, sans-serif'
+ }
+ }
+ },
+ tooltip: {
+ backgroundColor: 'rgba(0, 0, 0, 0.75)',
+ style: {
+ color: '#F0F0F0'
+ }
+ },
+ toolbar: {
+ itemStyle: {
+ color: 'silver'
+ }
+ },
+ plotOptions: {
+ line: {
+ dataLabels: {
+ color: '#CCC'
+ },
+ marker: {
+ lineColor: '#333'
+ }
+ },
+ spline: {
+ marker: {
+ lineColor: '#333'
+ }
+ },
+ scatter: {
+ marker: {
+ lineColor: '#333'
+ }
+ },
+ candlestick: {
+ lineColor: 'white'
+ }
+ },
+ legend: {
+ itemStyle: {
+ font: '9pt Trebuchet MS, Verdana, sans-serif',
+ color: '#A0A0A0'
+ },
+ itemHoverStyle: {
+ color: '#FFF'
+ },
+ itemHiddenStyle: {
+ color: '#444'
+ }
+ },
+ credits: {
+ style: {
+ color: '#666'
+ }
+ },
+ labels: {
+ style: {
+ color: '#CCC'
+ }
+ },
+
+ navigation: {
+ buttonOptions: {
+ symbolStroke: '#DDDDDD',
+ hoverSymbolStroke: '#FFFFFF',
+ theme: {
+ fill: {
+ linearGradient: { x1: 0, y1: 0, x2: 0, y2: 1 },
+ stops: [
+ [0.4, '#606060'],
+ [0.6, '#333333']
+ ]
+ },
+ stroke: '#000000'
+ }
+ }
+ },
+
+ // scroll charts
+ rangeSelector: {
+ buttonTheme: {
+ fill: {
+ linearGradient: { x1: 0, y1: 0, x2: 0, y2: 1 },
+ stops: [
+ [0.4, '#888'],
+ [0.6, '#555']
+ ]
+ },
+ stroke: '#000000',
+ style: {
+ color: '#CCC',
+ fontWeight: 'bold'
+ },
+ states: {
+ hover: {
+ fill: {
+ linearGradient: { x1: 0, y1: 0, x2: 0, y2: 1 },
+ stops: [
+ [0.4, '#BBB'],
+ [0.6, '#888']
+ ]
+ },
+ stroke: '#000000',
+ style: {
+ color: 'white'
+ }
+ },
+ select: {
+ fill: {
+ linearGradient: { x1: 0, y1: 0, x2: 0, y2: 1 },
+ stops: [
+ [0.1, '#000'],
+ [0.3, '#333']
+ ]
+ },
+ stroke: '#000000',
+ style: {
+ color: 'yellow'
+ }
+ }
+ }
+ },
+ inputStyle: {
+ backgroundColor: '#333',
+ color: 'silver'
+ },
+ labelStyle: {
+ color: 'silver'
+ }
+ },
+
+ navigator: {
+ handles: {
+ backgroundColor: '#666',
+ borderColor: '#AAA'
+ },
+ outlineColor: '#CCC',
+ maskFill: 'rgba(16, 16, 16, 0.5)',
+ series: {
+ color: '#7798BF',
+ lineColor: '#A6C7ED'
+ }
+ },
+
+ scrollbar: {
+ barBackgroundColor: {
+ linearGradient: { x1: 0, y1: 0, x2: 0, y2: 1 },
+ stops: [
+ [0.4, '#888'],
+ [0.6, '#555']
+ ]
+ },
+ barBorderColor: '#CCC',
+ buttonArrowColor: '#CCC',
+ buttonBackgroundColor: {
+ linearGradient: { x1: 0, y1: 0, x2: 0, y2: 1 },
+ stops: [
+ [0.4, '#888'],
+ [0.6, '#555']
+ ]
+ },
+ buttonBorderColor: '#CCC',
+ rifleColor: '#FFF',
+ trackBackgroundColor: {
+ linearGradient: { x1: 0, y1: 0, x2: 0, y2: 1 },
+ stops: [
+ [0, '#000'],
+ [1, '#333']
+ ]
+ },
+ trackBorderColor: '#666'
+ },
+
+ // special colors for some of the
+ legendBackgroundColor: 'rgba(0, 0, 0, 0.5)',
+ background2: 'rgb(35, 35, 70)',
+ dataLabelsColor: '#444',
+ textColor: '#C0C0C0',
+ maskColor: 'rgba(255,255,255,0.3)'
+};
+
+// Apply the theme
+var highchartsOptions = Highcharts.setOptions(Highcharts.theme);
diff --git a/management/guns-admin/src/main/webapp/static/js/plugins/highcharts/themes/dark-green.js b/management/guns-admin/src/main/webapp/static/js/plugins/highcharts/themes/dark-green.js
new file mode 100644
index 0000000..4a7ad58
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/static/js/plugins/highcharts/themes/dark-green.js
@@ -0,0 +1,255 @@
+/**
+ * Dark blue theme for Highcharts JS
+ * @author Torstein Honsi
+ */
+
+Highcharts.theme = {
+ colors: ["#DDDF0D", "#55BF3B", "#DF5353", "#7798BF", "#aaeeee", "#ff0066", "#eeaaee",
+ "#55BF3B", "#DF5353", "#7798BF", "#aaeeee"],
+ chart: {
+ backgroundColor: {
+ linearGradient: [0, 0, 250, 500],
+ stops: [
+ [0, 'rgb(48, 96, 48)'],
+ [1, 'rgb(0, 0, 0)']
+ ]
+ },
+ borderColor: '#000000',
+ borderWidth: 2,
+ className: 'dark-container',
+ plotBackgroundColor: 'rgba(255, 255, 255, .1)',
+ plotBorderColor: '#CCCCCC',
+ plotBorderWidth: 1
+ },
+ title: {
+ style: {
+ color: '#C0C0C0',
+ font: 'bold 16px "Trebuchet MS", Verdana, sans-serif'
+ }
+ },
+ subtitle: {
+ style: {
+ color: '#666666',
+ font: 'bold 12px "Trebuchet MS", Verdana, sans-serif'
+ }
+ },
+ xAxis: {
+ gridLineColor: '#333333',
+ gridLineWidth: 1,
+ labels: {
+ style: {
+ color: '#A0A0A0'
+ }
+ },
+ lineColor: '#A0A0A0',
+ tickColor: '#A0A0A0',
+ title: {
+ style: {
+ color: '#CCC',
+ fontWeight: 'bold',
+ fontSize: '12px',
+ fontFamily: 'Trebuchet MS, Verdana, sans-serif'
+
+ }
+ }
+ },
+ yAxis: {
+ gridLineColor: '#333333',
+ labels: {
+ style: {
+ color: '#A0A0A0'
+ }
+ },
+ lineColor: '#A0A0A0',
+ minorTickInterval: null,
+ tickColor: '#A0A0A0',
+ tickWidth: 1,
+ title: {
+ style: {
+ color: '#CCC',
+ fontWeight: 'bold',
+ fontSize: '12px',
+ fontFamily: 'Trebuchet MS, Verdana, sans-serif'
+ }
+ }
+ },
+ tooltip: {
+ backgroundColor: 'rgba(0, 0, 0, 0.75)',
+ style: {
+ color: '#F0F0F0'
+ }
+ },
+ toolbar: {
+ itemStyle: {
+ color: 'silver'
+ }
+ },
+ plotOptions: {
+ line: {
+ dataLabels: {
+ color: '#CCC'
+ },
+ marker: {
+ lineColor: '#333'
+ }
+ },
+ spline: {
+ marker: {
+ lineColor: '#333'
+ }
+ },
+ scatter: {
+ marker: {
+ lineColor: '#333'
+ }
+ },
+ candlestick: {
+ lineColor: 'white'
+ }
+ },
+ legend: {
+ itemStyle: {
+ font: '9pt Trebuchet MS, Verdana, sans-serif',
+ color: '#A0A0A0'
+ },
+ itemHoverStyle: {
+ color: '#FFF'
+ },
+ itemHiddenStyle: {
+ color: '#444'
+ }
+ },
+ credits: {
+ style: {
+ color: '#666'
+ }
+ },
+ labels: {
+ style: {
+ color: '#CCC'
+ }
+ },
+
+
+ navigation: {
+ buttonOptions: {
+ symbolStroke: '#DDDDDD',
+ hoverSymbolStroke: '#FFFFFF',
+ theme: {
+ fill: {
+ linearGradient: { x1: 0, y1: 0, x2: 0, y2: 1 },
+ stops: [
+ [0.4, '#606060'],
+ [0.6, '#333333']
+ ]
+ },
+ stroke: '#000000'
+ }
+ }
+ },
+
+ // scroll charts
+ rangeSelector: {
+ buttonTheme: {
+ fill: {
+ linearGradient: { x1: 0, y1: 0, x2: 0, y2: 1 },
+ stops: [
+ [0.4, '#888'],
+ [0.6, '#555']
+ ]
+ },
+ stroke: '#000000',
+ style: {
+ color: '#CCC',
+ fontWeight: 'bold'
+ },
+ states: {
+ hover: {
+ fill: {
+ linearGradient: { x1: 0, y1: 0, x2: 0, y2: 1 },
+ stops: [
+ [0.4, '#BBB'],
+ [0.6, '#888']
+ ]
+ },
+ stroke: '#000000',
+ style: {
+ color: 'white'
+ }
+ },
+ select: {
+ fill: {
+ linearGradient: { x1: 0, y1: 0, x2: 0, y2: 1 },
+ stops: [
+ [0.1, '#000'],
+ [0.3, '#333']
+ ]
+ },
+ stroke: '#000000',
+ style: {
+ color: 'yellow'
+ }
+ }
+ }
+ },
+ inputStyle: {
+ backgroundColor: '#333',
+ color: 'silver'
+ },
+ labelStyle: {
+ color: 'silver'
+ }
+ },
+
+ navigator: {
+ handles: {
+ backgroundColor: '#666',
+ borderColor: '#AAA'
+ },
+ outlineColor: '#CCC',
+ maskFill: 'rgba(16, 16, 16, 0.5)',
+ series: {
+ color: '#7798BF',
+ lineColor: '#A6C7ED'
+ }
+ },
+
+ scrollbar: {
+ barBackgroundColor: {
+ linearGradient: { x1: 0, y1: 0, x2: 0, y2: 1 },
+ stops: [
+ [0.4, '#888'],
+ [0.6, '#555']
+ ]
+ },
+ barBorderColor: '#CCC',
+ buttonArrowColor: '#CCC',
+ buttonBackgroundColor: {
+ linearGradient: { x1: 0, y1: 0, x2: 0, y2: 1 },
+ stops: [
+ [0.4, '#888'],
+ [0.6, '#555']
+ ]
+ },
+ buttonBorderColor: '#CCC',
+ rifleColor: '#FFF',
+ trackBackgroundColor: {
+ linearGradient: { x1: 0, y1: 0, x2: 0, y2: 1 },
+ stops: [
+ [0, '#000'],
+ [1, '#333']
+ ]
+ },
+ trackBorderColor: '#666'
+ },
+
+ // special colors for some of the
+ legendBackgroundColor: 'rgba(0, 0, 0, 0.5)',
+ background2: 'rgb(35, 35, 70)',
+ dataLabelsColor: '#444',
+ textColor: '#C0C0C0',
+ maskColor: 'rgba(255,255,255,0.3)'
+};
+
+// Apply the theme
+var highchartsOptions = Highcharts.setOptions(Highcharts.theme);
diff --git a/management/guns-admin/src/main/webapp/static/js/plugins/highcharts/themes/dark-unica.js b/management/guns-admin/src/main/webapp/static/js/plugins/highcharts/themes/dark-unica.js
new file mode 100644
index 0000000..4f1f8df
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/static/js/plugins/highcharts/themes/dark-unica.js
@@ -0,0 +1,213 @@
+/**
+ * Dark theme for Highcharts JS
+ * @author Torstein Honsi
+ */
+
+// Load the fonts
+Highcharts.createElement('link', {
+ href: 'http://fonts.googleapis.com/css?family=Unica+One',
+ rel: 'stylesheet',
+ type: 'text/css'
+}, null, document.getElementsByTagName('head')[0]);
+
+Highcharts.theme = {
+ colors: ["#2b908f", "#90ee7e", "#f45b5b", "#7798BF", "#aaeeee", "#ff0066", "#eeaaee",
+ "#55BF3B", "#DF5353", "#7798BF", "#aaeeee"],
+ chart: {
+ backgroundColor: {
+ linearGradient: { x1: 0, y1: 0, x2: 1, y2: 1 },
+ stops: [
+ [0, '#2a2a2b'],
+ [1, '#3e3e40']
+ ]
+ },
+ style: {
+ fontFamily: "'Unica One', sans-serif"
+ },
+ plotBorderColor: '#606063'
+ },
+ title: {
+ style: {
+ color: '#E0E0E3',
+ textTransform: 'uppercase',
+ fontSize: '20px'
+ }
+ },
+ subtitle: {
+ style: {
+ color: '#E0E0E3',
+ textTransform: 'uppercase'
+ }
+ },
+ xAxis: {
+ gridLineColor: '#707073',
+ labels: {
+ style: {
+ color: '#E0E0E3'
+ }
+ },
+ lineColor: '#707073',
+ minorGridLineColor: '#505053',
+ tickColor: '#707073',
+ title: {
+ style: {
+ color: '#A0A0A3'
+
+ }
+ }
+ },
+ yAxis: {
+ gridLineColor: '#707073',
+ labels: {
+ style: {
+ color: '#E0E0E3'
+ }
+ },
+ lineColor: '#707073',
+ minorGridLineColor: '#505053',
+ tickColor: '#707073',
+ tickWidth: 1,
+ title: {
+ style: {
+ color: '#A0A0A3'
+ }
+ }
+ },
+ tooltip: {
+ backgroundColor: 'rgba(0, 0, 0, 0.85)',
+ style: {
+ color: '#F0F0F0'
+ }
+ },
+ plotOptions: {
+ series: {
+ dataLabels: {
+ color: '#B0B0B3'
+ },
+ marker: {
+ lineColor: '#333'
+ }
+ },
+ boxplot: {
+ fillColor: '#505053'
+ },
+ candlestick: {
+ lineColor: 'white'
+ },
+ errorbar: {
+ color: 'white'
+ }
+ },
+ legend: {
+ itemStyle: {
+ color: '#E0E0E3'
+ },
+ itemHoverStyle: {
+ color: '#FFF'
+ },
+ itemHiddenStyle: {
+ color: '#606063'
+ }
+ },
+ credits: {
+ style: {
+ color: '#666'
+ }
+ },
+ labels: {
+ style: {
+ color: '#707073'
+ }
+ },
+
+ drilldown: {
+ activeAxisLabelStyle: {
+ color: '#F0F0F3'
+ },
+ activeDataLabelStyle: {
+ color: '#F0F0F3'
+ }
+ },
+
+ navigation: {
+ buttonOptions: {
+ symbolStroke: '#DDDDDD',
+ theme: {
+ fill: '#505053'
+ }
+ }
+ },
+
+ // scroll charts
+ rangeSelector: {
+ buttonTheme: {
+ fill: '#505053',
+ stroke: '#000000',
+ style: {
+ color: '#CCC'
+ },
+ states: {
+ hover: {
+ fill: '#707073',
+ stroke: '#000000',
+ style: {
+ color: 'white'
+ }
+ },
+ select: {
+ fill: '#000003',
+ stroke: '#000000',
+ style: {
+ color: 'white'
+ }
+ }
+ }
+ },
+ inputBoxBorderColor: '#505053',
+ inputStyle: {
+ backgroundColor: '#333',
+ color: 'silver'
+ },
+ labelStyle: {
+ color: 'silver'
+ }
+ },
+
+ navigator: {
+ handles: {
+ backgroundColor: '#666',
+ borderColor: '#AAA'
+ },
+ outlineColor: '#CCC',
+ maskFill: 'rgba(255,255,255,0.1)',
+ series: {
+ color: '#7798BF',
+ lineColor: '#A6C7ED'
+ },
+ xAxis: {
+ gridLineColor: '#505053'
+ }
+ },
+
+ scrollbar: {
+ barBackgroundColor: '#808083',
+ barBorderColor: '#808083',
+ buttonArrowColor: '#CCC',
+ buttonBackgroundColor: '#606063',
+ buttonBorderColor: '#606063',
+ rifleColor: '#FFF',
+ trackBackgroundColor: '#404043',
+ trackBorderColor: '#404043'
+ },
+
+ // special colors for some of the
+ legendBackgroundColor: 'rgba(0, 0, 0, 0.5)',
+ background2: '#505053',
+ dataLabelsColor: '#B0B0B3',
+ textColor: '#C0C0C0',
+ contrastTextColor: '#F0F0F3',
+ maskColor: 'rgba(255,255,255,0.3)'
+};
+
+// Apply the theme
+Highcharts.setOptions(Highcharts.theme);
diff --git a/management/guns-admin/src/main/webapp/static/js/plugins/highcharts/themes/gray.js b/management/guns-admin/src/main/webapp/static/js/plugins/highcharts/themes/gray.js
new file mode 100644
index 0000000..d9a4016
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/static/js/plugins/highcharts/themes/gray.js
@@ -0,0 +1,257 @@
+/**
+ * Gray theme for Highcharts JS
+ * @author Torstein Honsi
+ */
+
+Highcharts.theme = {
+ colors: ["#DDDF0D", "#7798BF", "#55BF3B", "#DF5353", "#aaeeee", "#ff0066", "#eeaaee",
+ "#55BF3B", "#DF5353", "#7798BF", "#aaeeee"],
+ chart: {
+ backgroundColor: {
+ linearGradient: { x1: 0, y1: 0, x2: 0, y2: 1 },
+ stops: [
+ [0, 'rgb(96, 96, 96)'],
+ [1, 'rgb(16, 16, 16)']
+ ]
+ },
+ borderWidth: 0,
+ borderRadius: 0,
+ plotBackgroundColor: null,
+ plotShadow: false,
+ plotBorderWidth: 0
+ },
+ title: {
+ style: {
+ color: '#FFF',
+ font: '16px Lucida Grande, Lucida Sans Unicode, Verdana, Arial, Helvetica, sans-serif'
+ }
+ },
+ subtitle: {
+ style: {
+ color: '#DDD',
+ font: '12px Lucida Grande, Lucida Sans Unicode, Verdana, Arial, Helvetica, sans-serif'
+ }
+ },
+ xAxis: {
+ gridLineWidth: 0,
+ lineColor: '#999',
+ tickColor: '#999',
+ labels: {
+ style: {
+ color: '#999',
+ fontWeight: 'bold'
+ }
+ },
+ title: {
+ style: {
+ color: '#AAA',
+ font: 'bold 12px Lucida Grande, Lucida Sans Unicode, Verdana, Arial, Helvetica, sans-serif'
+ }
+ }
+ },
+ yAxis: {
+ alternateGridColor: null,
+ minorTickInterval: null,
+ gridLineColor: 'rgba(255, 255, 255, .1)',
+ minorGridLineColor: 'rgba(255,255,255,0.07)',
+ lineWidth: 0,
+ tickWidth: 0,
+ labels: {
+ style: {
+ color: '#999',
+ fontWeight: 'bold'
+ }
+ },
+ title: {
+ style: {
+ color: '#AAA',
+ font: 'bold 12px Lucida Grande, Lucida Sans Unicode, Verdana, Arial, Helvetica, sans-serif'
+ }
+ }
+ },
+ legend: {
+ itemStyle: {
+ color: '#CCC'
+ },
+ itemHoverStyle: {
+ color: '#FFF'
+ },
+ itemHiddenStyle: {
+ color: '#333'
+ }
+ },
+ labels: {
+ style: {
+ color: '#CCC'
+ }
+ },
+ tooltip: {
+ backgroundColor: {
+ linearGradient: { x1: 0, y1: 0, x2: 0, y2: 1 },
+ stops: [
+ [0, 'rgba(96, 96, 96, .8)'],
+ [1, 'rgba(16, 16, 16, .8)']
+ ]
+ },
+ borderWidth: 0,
+ style: {
+ color: '#FFF'
+ }
+ },
+
+
+ plotOptions: {
+ series: {
+ nullColor: '#444444'
+ },
+ line: {
+ dataLabels: {
+ color: '#CCC'
+ },
+ marker: {
+ lineColor: '#333'
+ }
+ },
+ spline: {
+ marker: {
+ lineColor: '#333'
+ }
+ },
+ scatter: {
+ marker: {
+ lineColor: '#333'
+ }
+ },
+ candlestick: {
+ lineColor: 'white'
+ }
+ },
+
+ toolbar: {
+ itemStyle: {
+ color: '#CCC'
+ }
+ },
+
+ navigation: {
+ buttonOptions: {
+ symbolStroke: '#DDDDDD',
+ hoverSymbolStroke: '#FFFFFF',
+ theme: {
+ fill: {
+ linearGradient: { x1: 0, y1: 0, x2: 0, y2: 1 },
+ stops: [
+ [0.4, '#606060'],
+ [0.6, '#333333']
+ ]
+ },
+ stroke: '#000000'
+ }
+ }
+ },
+
+ // scroll charts
+ rangeSelector: {
+ buttonTheme: {
+ fill: {
+ linearGradient: { x1: 0, y1: 0, x2: 0, y2: 1 },
+ stops: [
+ [0.4, '#888'],
+ [0.6, '#555']
+ ]
+ },
+ stroke: '#000000',
+ style: {
+ color: '#CCC',
+ fontWeight: 'bold'
+ },
+ states: {
+ hover: {
+ fill: {
+ linearGradient: { x1: 0, y1: 0, x2: 0, y2: 1 },
+ stops: [
+ [0.4, '#BBB'],
+ [0.6, '#888']
+ ]
+ },
+ stroke: '#000000',
+ style: {
+ color: 'white'
+ }
+ },
+ select: {
+ fill: {
+ linearGradient: { x1: 0, y1: 0, x2: 0, y2: 1 },
+ stops: [
+ [0.1, '#000'],
+ [0.3, '#333']
+ ]
+ },
+ stroke: '#000000',
+ style: {
+ color: 'yellow'
+ }
+ }
+ }
+ },
+ inputStyle: {
+ backgroundColor: '#333',
+ color: 'silver'
+ },
+ labelStyle: {
+ color: 'silver'
+ }
+ },
+
+ navigator: {
+ handles: {
+ backgroundColor: '#666',
+ borderColor: '#AAA'
+ },
+ outlineColor: '#CCC',
+ maskFill: 'rgba(16, 16, 16, 0.5)',
+ series: {
+ color: '#7798BF',
+ lineColor: '#A6C7ED'
+ }
+ },
+
+ scrollbar: {
+ barBackgroundColor: {
+ linearGradient: { x1: 0, y1: 0, x2: 0, y2: 1 },
+ stops: [
+ [0.4, '#888'],
+ [0.6, '#555']
+ ]
+ },
+ barBorderColor: '#CCC',
+ buttonArrowColor: '#CCC',
+ buttonBackgroundColor: {
+ linearGradient: { x1: 0, y1: 0, x2: 0, y2: 1 },
+ stops: [
+ [0.4, '#888'],
+ [0.6, '#555']
+ ]
+ },
+ buttonBorderColor: '#CCC',
+ rifleColor: '#FFF',
+ trackBackgroundColor: {
+ linearGradient: { x1: 0, y1: 0, x2: 0, y2: 1 },
+ stops: [
+ [0, '#000'],
+ [1, '#333']
+ ]
+ },
+ trackBorderColor: '#666'
+ },
+
+ // special colors for some of the demo examples
+ legendBackgroundColor: 'rgba(48, 48, 48, 0.8)',
+ background2: 'rgb(70, 70, 70)',
+ dataLabelsColor: '#444',
+ textColor: '#E0E0E0',
+ maskColor: 'rgba(255,255,255,0.3)'
+};
+
+// Apply the theme
+var highchartsOptions = Highcharts.setOptions(Highcharts.theme);
diff --git a/management/guns-admin/src/main/webapp/static/js/plugins/highcharts/themes/grid-light.js b/management/guns-admin/src/main/webapp/static/js/plugins/highcharts/themes/grid-light.js
new file mode 100644
index 0000000..acf53ae
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/static/js/plugins/highcharts/themes/grid-light.js
@@ -0,0 +1,74 @@
+/**
+ * Grid-light theme for Highcharts JS
+ * @author Torstein Honsi
+ */
+
+// Load the fonts
+Highcharts.createElement('link', {
+ href: 'http://fonts.googleapis.com/css?family=Dosis:400,600',
+ rel: 'stylesheet',
+ type: 'text/css'
+}, null, document.getElementsByTagName('head')[0]);
+
+Highcharts.theme = {
+ colors: ["#7cb5ec", "#f7a35c", "#90ee7e", "#7798BF", "#aaeeee", "#ff0066", "#eeaaee",
+ "#55BF3B", "#DF5353", "#7798BF", "#aaeeee"],
+ chart: {
+ backgroundColor: null,
+ style: {
+ fontFamily: "Dosis, sans-serif"
+ }
+ },
+ title: {
+ style: {
+ fontSize: '16px',
+ fontWeight: 'bold',
+ textTransform: 'uppercase'
+ }
+ },
+ tooltip: {
+ borderWidth: 0,
+ backgroundColor: 'rgba(219,219,216,0.8)',
+ shadow: false
+ },
+ legend: {
+ itemStyle: {
+ fontWeight: 'bold',
+ fontSize: '13px'
+ }
+ },
+ xAxis: {
+ gridLineWidth: 1,
+ labels: {
+ style: {
+ fontSize: '12px'
+ }
+ }
+ },
+ yAxis: {
+ minorTickInterval: 'auto',
+ title: {
+ style: {
+ textTransform: 'uppercase'
+ }
+ },
+ labels: {
+ style: {
+ fontSize: '12px'
+ }
+ }
+ },
+ plotOptions: {
+ candlestick: {
+ lineColor: '#404048'
+ }
+ },
+
+
+ // General
+ background2: '#F0F0EA'
+
+};
+
+// Apply the theme
+Highcharts.setOptions(Highcharts.theme);
diff --git a/management/guns-admin/src/main/webapp/static/js/plugins/highcharts/themes/grid.js b/management/guns-admin/src/main/webapp/static/js/plugins/highcharts/themes/grid.js
new file mode 100644
index 0000000..70342f5
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/static/js/plugins/highcharts/themes/grid.js
@@ -0,0 +1,103 @@
+/**
+ * Grid theme for Highcharts JS
+ * @author Torstein Honsi
+ */
+
+Highcharts.theme = {
+ colors: ['#058DC7', '#50B432', '#ED561B', '#DDDF00', '#24CBE5', '#64E572', '#FF9655', '#FFF263', '#6AF9C4'],
+ chart: {
+ backgroundColor: {
+ linearGradient: { x1: 0, y1: 0, x2: 1, y2: 1 },
+ stops: [
+ [0, 'rgb(255, 255, 255)'],
+ [1, 'rgb(240, 240, 255)']
+ ]
+ },
+ borderWidth: 2,
+ plotBackgroundColor: 'rgba(255, 255, 255, .9)',
+ plotShadow: true,
+ plotBorderWidth: 1
+ },
+ title: {
+ style: {
+ color: '#000',
+ font: 'bold 16px "Trebuchet MS", Verdana, sans-serif'
+ }
+ },
+ subtitle: {
+ style: {
+ color: '#666666',
+ font: 'bold 12px "Trebuchet MS", Verdana, sans-serif'
+ }
+ },
+ xAxis: {
+ gridLineWidth: 1,
+ lineColor: '#000',
+ tickColor: '#000',
+ labels: {
+ style: {
+ color: '#000',
+ font: '11px Trebuchet MS, Verdana, sans-serif'
+ }
+ },
+ title: {
+ style: {
+ color: '#333',
+ fontWeight: 'bold',
+ fontSize: '12px',
+ fontFamily: 'Trebuchet MS, Verdana, sans-serif'
+
+ }
+ }
+ },
+ yAxis: {
+ minorTickInterval: 'auto',
+ lineColor: '#000',
+ lineWidth: 1,
+ tickWidth: 1,
+ tickColor: '#000',
+ labels: {
+ style: {
+ color: '#000',
+ font: '11px Trebuchet MS, Verdana, sans-serif'
+ }
+ },
+ title: {
+ style: {
+ color: '#333',
+ fontWeight: 'bold',
+ fontSize: '12px',
+ fontFamily: 'Trebuchet MS, Verdana, sans-serif'
+ }
+ }
+ },
+ legend: {
+ itemStyle: {
+ font: '9pt Trebuchet MS, Verdana, sans-serif',
+ color: 'black'
+
+ },
+ itemHoverStyle: {
+ color: '#039'
+ },
+ itemHiddenStyle: {
+ color: 'gray'
+ }
+ },
+ labels: {
+ style: {
+ color: '#99b'
+ }
+ },
+
+ navigation: {
+ buttonOptions: {
+ theme: {
+ stroke: '#CCCCCC'
+ }
+ }
+ }
+};
+
+// Apply the theme
+var highchartsOptions = Highcharts.setOptions(Highcharts.theme);
diff --git a/management/guns-admin/src/main/webapp/static/js/plugins/highcharts/themes/sand-signika.js b/management/guns-admin/src/main/webapp/static/js/plugins/highcharts/themes/sand-signika.js
new file mode 100644
index 0000000..2f1e34e
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/static/js/plugins/highcharts/themes/sand-signika.js
@@ -0,0 +1,104 @@
+/**
+ * Sand-Signika theme for Highcharts JS
+ * @author Torstein Honsi
+ */
+
+// Load the fonts
+Highcharts.createElement('link', {
+ href: 'http://fonts.googleapis.com/css?family=Signika:400,700',
+ rel: 'stylesheet',
+ type: 'text/css'
+}, null, document.getElementsByTagName('head')[0]);
+
+// Add the background image to the container
+Highcharts.wrap(Highcharts.Chart.prototype, 'getContainer', function (proceed) {
+ proceed.call(this);
+ this.container.style.background = 'url(http://www.highcharts.com/samples/graphics/sand.png)';
+});
+
+
+Highcharts.theme = {
+ colors: ["#f45b5b", "#8085e9", "#8d4654", "#7798BF", "#aaeeee", "#ff0066", "#eeaaee",
+ "#55BF3B", "#DF5353", "#7798BF", "#aaeeee"],
+ chart: {
+ backgroundColor: null,
+ style: {
+ fontFamily: "Signika, serif"
+ }
+ },
+ title: {
+ style: {
+ color: 'black',
+ fontSize: '16px',
+ fontWeight: 'bold'
+ }
+ },
+ subtitle: {
+ style: {
+ color: 'black'
+ }
+ },
+ tooltip: {
+ borderWidth: 0
+ },
+ legend: {
+ itemStyle: {
+ fontWeight: 'bold',
+ fontSize: '13px'
+ }
+ },
+ xAxis: {
+ labels: {
+ style: {
+ color: '#6e6e70'
+ }
+ }
+ },
+ yAxis: {
+ labels: {
+ style: {
+ color: '#6e6e70'
+ }
+ }
+ },
+ plotOptions: {
+ series: {
+ shadow: true
+ },
+ candlestick: {
+ lineColor: '#404048'
+ },
+ map: {
+ shadow: false
+ }
+ },
+
+ // Highstock specific
+ navigator: {
+ xAxis: {
+ gridLineColor: '#D0D0D8'
+ }
+ },
+ rangeSelector: {
+ buttonTheme: {
+ fill: 'white',
+ stroke: '#C0C0C8',
+ 'stroke-width': 1,
+ states: {
+ select: {
+ fill: '#D0D0D8'
+ }
+ }
+ }
+ },
+ scrollbar: {
+ trackBorderColor: '#C0C0C8'
+ },
+
+ // General
+ background2: '#E0E0E8'
+
+};
+
+// Apply the theme
+Highcharts.setOptions(Highcharts.theme);
diff --git a/management/guns-admin/src/main/webapp/static/js/plugins/highcharts/themes/skies.js b/management/guns-admin/src/main/webapp/static/js/plugins/highcharts/themes/skies.js
new file mode 100644
index 0000000..d58b1f2
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/static/js/plugins/highcharts/themes/skies.js
@@ -0,0 +1,89 @@
+/**
+ * Skies theme for Highcharts JS
+ * @author Torstein Honsi
+ */
+
+Highcharts.theme = {
+ colors: ["#514F78", "#42A07B", "#9B5E4A", "#72727F", "#1F949A", "#82914E", "#86777F", "#42A07B"],
+ chart: {
+ className: 'skies',
+ borderWidth: 0,
+ plotShadow: true,
+ plotBackgroundImage: 'http://www.highcharts.com/demo/gfx/skies.jpg',
+ plotBackgroundColor: {
+ linearGradient: [0, 0, 250, 500],
+ stops: [
+ [0, 'rgba(255, 255, 255, 1)'],
+ [1, 'rgba(255, 255, 255, 0)']
+ ]
+ },
+ plotBorderWidth: 1
+ },
+ title: {
+ style: {
+ color: '#3E576F',
+ font: '16px Lucida Grande, Lucida Sans Unicode, Verdana, Arial, Helvetica, sans-serif'
+ }
+ },
+ subtitle: {
+ style: {
+ color: '#6D869F',
+ font: '12px Lucida Grande, Lucida Sans Unicode, Verdana, Arial, Helvetica, sans-serif'
+ }
+ },
+ xAxis: {
+ gridLineWidth: 0,
+ lineColor: '#C0D0E0',
+ tickColor: '#C0D0E0',
+ labels: {
+ style: {
+ color: '#666',
+ fontWeight: 'bold'
+ }
+ },
+ title: {
+ style: {
+ color: '#666',
+ font: '12px Lucida Grande, Lucida Sans Unicode, Verdana, Arial, Helvetica, sans-serif'
+ }
+ }
+ },
+ yAxis: {
+ alternateGridColor: 'rgba(255, 255, 255, .5)',
+ lineColor: '#C0D0E0',
+ tickColor: '#C0D0E0',
+ tickWidth: 1,
+ labels: {
+ style: {
+ color: '#666',
+ fontWeight: 'bold'
+ }
+ },
+ title: {
+ style: {
+ color: '#666',
+ font: '12px Lucida Grande, Lucida Sans Unicode, Verdana, Arial, Helvetica, sans-serif'
+ }
+ }
+ },
+ legend: {
+ itemStyle: {
+ font: '9pt Trebuchet MS, Verdana, sans-serif',
+ color: '#3E576F'
+ },
+ itemHoverStyle: {
+ color: 'black'
+ },
+ itemHiddenStyle: {
+ color: 'silver'
+ }
+ },
+ labels: {
+ style: {
+ color: '#3E576F'
+ }
+ }
+};
+
+// Apply the theme
+var highchartsOptions = Highcharts.setOptions(Highcharts.theme);
diff --git a/management/guns-admin/src/main/webapp/static/js/plugins/iCheck/icheck.min.js b/management/guns-admin/src/main/webapp/static/js/plugins/iCheck/icheck.min.js
new file mode 100644
index 0000000..9b826fb
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/static/js/plugins/iCheck/icheck.min.js
@@ -0,0 +1,11 @@
+/*! iCheck v1.0.2 by Damir Sultanov, http://git.io/arlzeA, MIT Licensed */
+(function(f){function A(a,b,d){var c=a[0],g=/er/.test(d)?_indeterminate:/bl/.test(d)?n:k,e=d==_update?{checked:c[k],disabled:c[n],indeterminate:"true"==a.attr(_indeterminate)||"false"==a.attr(_determinate)}:c[g];if(/^(ch|di|in)/.test(d)&&!e)x(a,g);else if(/^(un|en|de)/.test(d)&&e)q(a,g);else if(d==_update)for(var f in e)e[f]?x(a,f,!0):q(a,f,!0);else if(!b||"toggle"==d){if(!b)a[_callback]("ifClicked");e?c[_type]!==r&&q(a,g):x(a,g)}}function x(a,b,d){var c=a[0],g=a.parent(),e=b==k,u=b==_indeterminate,
+ v=b==n,s=u?_determinate:e?y:"enabled",F=l(a,s+t(c[_type])),B=l(a,b+t(c[_type]));if(!0!==c[b]){if(!d&&b==k&&c[_type]==r&&c.name){var w=a.closest("form"),p='input[name="'+c.name+'"]',p=w.length?w.find(p):f(p);p.each(function(){this!==c&&f(this).data(m)&&q(f(this),b)})}u?(c[b]=!0,c[k]&&q(a,k,"force")):(d||(c[b]=!0),e&&c[_indeterminate]&&q(a,_indeterminate,!1));D(a,e,b,d)}c[n]&&l(a,_cursor,!0)&&g.find("."+C).css(_cursor,"default");g[_add](B||l(a,b)||"");g.attr("role")&&!u&&g.attr("aria-"+(v?n:k),"true");
+ g[_remove](F||l(a,s)||"")}function q(a,b,d){var c=a[0],g=a.parent(),e=b==k,f=b==_indeterminate,m=b==n,s=f?_determinate:e?y:"enabled",q=l(a,s+t(c[_type])),r=l(a,b+t(c[_type]));if(!1!==c[b]){if(f||!d||"force"==d)c[b]=!1;D(a,e,s,d)}!c[n]&&l(a,_cursor,!0)&&g.find("."+C).css(_cursor,"pointer");g[_remove](r||l(a,b)||"");g.attr("role")&&!f&&g.attr("aria-"+(m?n:k),"false");g[_add](q||l(a,s)||"")}function E(a,b){if(a.data(m)){a.parent().html(a.attr("style",a.data(m).s||""));if(b)a[_callback](b);a.off(".i").unwrap();
+ f(_label+'[for="'+a[0].id+'"]').add(a.closest(_label)).off(".i")}}function l(a,b,f){if(a.data(m))return a.data(m).o[b+(f?"":"Class")]}function t(a){return a.charAt(0).toUpperCase()+a.slice(1)}function D(a,b,f,c){if(!c){if(b)a[_callback]("ifToggled");a[_callback]("ifChanged")[_callback]("if"+t(f))}}var m="iCheck",C=m+"-helper",r="radio",k="checked",y="un"+k,n="disabled";_determinate="determinate";_indeterminate="in"+_determinate;_update="update";_type="type";_click="click";_touch="touchbegin.i touchend.i";
+ _add="addClass";_remove="removeClass";_callback="trigger";_label="label";_cursor="cursor";_mobile=/ipad|iphone|ipod|android|blackberry|windows phone|opera mini|silk/i.test(navigator.userAgent);f.fn[m]=function(a,b){var d='input[type="checkbox"], input[type="'+r+'"]',c=f(),g=function(a){a.each(function(){var a=f(this);c=a.is(d)?c.add(a):c.add(a.find(d))})};if(/^(check|uncheck|toggle|indeterminate|determinate|disable|enable|update|destroy)$/i.test(a))return a=a.toLowerCase(),g(this),c.each(function(){var c=
+ f(this);"destroy"==a?E(c,"ifDestroyed"):A(c,!0,a);f.isFunction(b)&&b()});if("object"!=typeof a&&a)return this;var e=f.extend({checkedClass:k,disabledClass:n,indeterminateClass:_indeterminate,labelHover:!0},a),l=e.handle,v=e.hoverClass||"hover",s=e.focusClass||"focus",t=e.activeClass||"active",B=!!e.labelHover,w=e.labelHoverClass||"hover",p=(""+e.increaseArea).replace("%","")|0;if("checkbox"==l||l==r)d='input[type="'+l+'"]';-50>p&&(p=-50);g(this);return c.each(function(){var a=f(this);E(a);var c=this,
+ b=c.id,g=-p+"%",d=100+2*p+"%",d={position:"absolute",top:g,left:g,display:"block",width:d,height:d,margin:0,padding:0,background:"#fff",border:0,opacity:0},g=_mobile?{position:"absolute",visibility:"hidden"}:p?d:{position:"absolute",opacity:0},l="checkbox"==c[_type]?e.checkboxClass||"icheckbox":e.radioClass||"i"+r,z=f(_label+'[for="'+b+'"]').add(a.closest(_label)),u=!!e.aria,y=m+"-"+Math.random().toString(36).substr(2,6),h='<div class="'+l+'" '+(u?'role="'+c[_type]+'" ':"");u&&z.each(function(){h+=
+ 'aria-labelledby="';this.id?h+=this.id:(this.id=y,h+=y);h+='"'});h=a.wrap(h+"/>")[_callback]("ifCreated").parent().append(e.insert);d=f('<ins class="'+C+'"/>').css(d).appendTo(h);a.data(m,{o:e,s:a.attr("style")}).css(g);e.inheritClass&&h[_add](c.className||"");e.inheritID&&b&&h.attr("id",m+"-"+b);"static"==h.css("position")&&h.css("position","relative");A(a,!0,_update);if(z.length)z.on(_click+".i mouseover.i mouseout.i "+_touch,function(b){var d=b[_type],e=f(this);if(!c[n]){if(d==_click){if(f(b.target).is("a"))return;
+ A(a,!1,!0)}else B&&(/ut|nd/.test(d)?(h[_remove](v),e[_remove](w)):(h[_add](v),e[_add](w)));if(_mobile)b.stopPropagation();else return!1}});a.on(_click+".i focus.i blur.i keyup.i keydown.i keypress.i",function(b){var d=b[_type];b=b.keyCode;if(d==_click)return!1;if("keydown"==d&&32==b)return c[_type]==r&&c[k]||(c[k]?q(a,k):x(a,k)),!1;if("keyup"==d&&c[_type]==r)!c[k]&&x(a,k);else if(/us|ur/.test(d))h["blur"==d?_remove:_add](s)});d.on(_click+" mousedown mouseup mouseover mouseout "+_touch,function(b){var d=
+ b[_type],e=/wn|up/.test(d)?t:v;if(!c[n]){if(d==_click)A(a,!1,!0);else{if(/wn|er|in/.test(d))h[_add](e);else h[_remove](e+" "+t);if(z.length&&B&&e==v)z[/ut|nd/.test(d)?_remove:_add](w)}if(_mobile)b.stopPropagation();else return!1}})})}})(window.jQuery||window.Zepto);
diff --git a/management/guns-admin/src/main/webapp/static/js/plugins/laydate/laydate.js b/management/guns-admin/src/main/webapp/static/js/plugins/laydate/laydate.js
new file mode 100644
index 0000000..83a12cb
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/static/js/plugins/laydate/laydate.js
@@ -0,0 +1,2 @@
+/*! laydate-v5.0.9 日期与时间组件 MIT License http://www.layui.com/laydate/ By 贤心 */
+ ;!function(){"use strict";var e=window.layui&&layui.define,t={getPath:function(){var e=document.currentScript?document.currentScript.src:function(){for(var e,t=document.scripts,n=t.length-1,a=n;a>0;a--)if("interactive"===t[a].readyState){e=t[a].src;break}return e||t[n].src}();return e.substring(0,e.lastIndexOf("/")+1)}(),getStyle:function(e,t){var n=e.currentStyle?e.currentStyle:window.getComputedStyle(e,null);return n[n.getPropertyValue?"getPropertyValue":"getAttribute"](t)},link:function(e,a,i){if(n.path){var r=document.getElementsByTagName("head")[0],o=document.createElement("link");"string"==typeof a&&(i=a);var s=(i||e).replace(/\.|\//g,""),l="layuicss-"+s,d=0;o.rel="stylesheet",o.href=n.path+e,o.id=l,document.getElementById(l)||r.appendChild(o),"function"==typeof a&&!function c(){return++d>80?window.console&&console.error("laydate.css: Invalid"):void(1989===parseInt(t.getStyle(document.getElementById(l),"width"))?a():setTimeout(c,100))}()}}},n={v:"5.0.9",config:{},index:window.laydate&&window.laydate.v?1e5:0,path:t.getPath,set:function(e){var t=this;return t.config=w.extend({},t.config,e),t},ready:function(a){var i="laydate",r="",o=(e?"modules/laydate/":"theme/")+"default/laydate.css?v="+n.v+r;return e?layui.addcss(o,a,i):t.link(o,a,i),this}},a=function(){var e=this;return{hint:function(t){e.hint.call(e,t)},config:e.config}},i="laydate",r=".layui-laydate",o="layui-this",s="laydate-disabled",l="开始日期超出了结束日期<br>建议重新选择",d=[100,2e5],c="layui-laydate-static",m="layui-laydate-list",u="laydate-selected",h="layui-laydate-hint",y="laydate-day-prev",f="laydate-day-next",p="layui-laydate-footer",g=".laydate-btns-confirm",v="laydate-time-text",D=".laydate-btns-time",T=function(e){var t=this;t.index=++n.index,t.config=w.extend({},t.config,n.config,e),n.ready(function(){t.init()})},w=function(e){return new C(e)},C=function(e){for(var t=0,n="object"==typeof e?[e]:(this.selector=e,document.querySelectorAll(e||null));t<n.length;t++)this.push(n[t])};C.prototype=[],C.prototype.constructor=C,w.extend=function(){var e=1,t=arguments,n=function(e,t){e=e||(t.constructor===Array?[]:{});for(var a in t)e[a]=t[a]&&t[a].constructor===Object?n(e[a],t[a]):t[a];return e};for(t[0]="object"==typeof t[0]?t[0]:{};e<t.length;e++)"object"==typeof t[e]&&n(t[0],t[e]);return t[0]},w.ie=function(){var e=navigator.userAgent.toLowerCase();return!!(window.ActiveXObject||"ActiveXObject"in window)&&((e.match(/msie\s(\d+)/)||[])[1]||"11")}(),w.stope=function(e){e=e||window.event,e.stopPropagation?e.stopPropagation():e.cancelBubble=!0},w.each=function(e,t){var n,a=this;if("function"!=typeof t)return a;if(e=e||[],e.constructor===Object){for(n in e)if(t.call(e[n],n,e[n]))break}else for(n=0;n<e.length&&!t.call(e[n],n,e[n]);n++);return a},w.digit=function(e,t,n){var a="";e=String(e),t=t||2;for(var i=e.length;i<t;i++)a+="0";return e<Math.pow(10,t)?a+(0|e):e},w.elem=function(e,t){var n=document.createElement(e);return w.each(t||{},function(e,t){n.setAttribute(e,t)}),n},C.addStr=function(e,t){return e=e.replace(/\s+/," "),t=t.replace(/\s+/," ").split(" "),w.each(t,function(t,n){new RegExp("\\b"+n+"\\b").test(e)||(e=e+" "+n)}),e.replace(/^\s|\s$/,"")},C.removeStr=function(e,t){return e=e.replace(/\s+/," "),t=t.replace(/\s+/," ").split(" "),w.each(t,function(t,n){var a=new RegExp("\\b"+n+"\\b");a.test(e)&&(e=e.replace(a,""))}),e.replace(/\s+/," ").replace(/^\s|\s$/,"")},C.prototype.find=function(e){var t=this,n=0,a=[],i="object"==typeof e;return this.each(function(r,o){for(var s=i?[e]:o.querySelectorAll(e||null);n<s.length;n++)a.push(s[n]);t.shift()}),i||(t.selector=(t.selector?t.selector+" ":"")+e),w.each(a,function(e,n){t.push(n)}),t},C.prototype.each=function(e){return w.each.call(this,this,e)},C.prototype.addClass=function(e,t){return this.each(function(n,a){a.className=C[t?"removeStr":"addStr"](a.className,e)})},C.prototype.removeClass=function(e){return this.addClass(e,!0)},C.prototype.hasClass=function(e){var t=!1;return this.each(function(n,a){new RegExp("\\b"+e+"\\b").test(a.className)&&(t=!0)}),t},C.prototype.attr=function(e,t){var n=this;return void 0===t?function(){if(n.length>0)return n[0].getAttribute(e)}():n.each(function(n,a){a.setAttribute(e,t)})},C.prototype.removeAttr=function(e){return this.each(function(t,n){n.removeAttribute(e)})},C.prototype.html=function(e){return this.each(function(t,n){n.innerHTML=e})},C.prototype.val=function(e){return this.each(function(t,n){n.value=e})},C.prototype.append=function(e){return this.each(function(t,n){"object"==typeof e?n.appendChild(e):n.innerHTML=n.innerHTML+e})},C.prototype.remove=function(e){return this.each(function(t,n){e?n.removeChild(e):n.parentNode.removeChild(n)})},C.prototype.on=function(e,t){return this.each(function(n,a){a.attachEvent?a.attachEvent("on"+e,function(e){e.target=e.srcElement,t.call(a,e)}):a.addEventListener(e,t,!1)})},C.prototype.off=function(e,t){return this.each(function(n,a){a.detachEvent?a.detachEvent("on"+e,t):a.removeEventListener(e,t,!1)})},T.isLeapYear=function(e){return e%4===0&&e%100!==0||e%400===0},T.prototype.config={type:"date",range:!1,format:"yyyy-MM-dd",value:null,min:"1900-1-1",max:"2099-12-31",trigger:"focus",show:!1,showBottom:!0,btns:["clear","now","confirm"],lang:"cn",theme:"default",position:null,calendar:!1,mark:{},zIndex:null,done:null,change:null},T.prototype.lang=function(){var e=this,t=e.config,n={cn:{weeks:["日","一","二","三","四","五","六"],time:["时","分","秒"],timeTips:"选择时间",startTime:"开始时间",endTime:"结束时间",dateTips:"返回日期",month:["一","二","三","四","五","六","七","八","九","十","十一","十二"],tools:{confirm:"确定",clear:"清空",now:"现在"}},en:{weeks:["Su","Mo","Tu","We","Th","Fr","Sa"],time:["Hours","Minutes","Seconds"],timeTips:"Select Time",startTime:"Start Time",endTime:"End Time",dateTips:"Select Date",month:["Jan","Feb","Mar","Apr","May","Jun","Jul","Aug","Sep","Oct","Nov","Dec"],tools:{confirm:"Confirm",clear:"Clear",now:"Now"}}};return n[t.lang]||n.cn},T.prototype.init=function(){var e=this,t=e.config,n="yyyy|y|MM|M|dd|d|HH|H|mm|m|ss|s",a="static"===t.position,i={year:"yyyy",month:"yyyy-MM",date:"yyyy-MM-dd",time:"HH:mm:ss",datetime:"yyyy-MM-dd HH:mm:ss"};t.elem=w(t.elem),t.eventElem=w(t.eventElem),t.elem[0]&&(t.range===!0&&(t.range="-"),t.format===i.date&&(t.format=i[t.type]),e.format=t.format.match(new RegExp(n+"|.","g"))||[],e.EXP_IF="",e.EXP_SPLIT="",w.each(e.format,function(t,a){var i=new RegExp(n).test(a)?"\\d{"+function(){return new RegExp(n).test(e.format[0===t?t+1:t-1]||"")?/^yyyy|y$/.test(a)?4:a.length:/^yyyy$/.test(a)?"1,4":/^y$/.test(a)?"1,308":"1,2"}()+"}":"\\"+a;e.EXP_IF=e.EXP_IF+i,e.EXP_SPLIT=e.EXP_SPLIT+"("+i+")"}),e.EXP_IF=new RegExp("^"+(t.range?e.EXP_IF+"\\s\\"+t.range+"\\s"+e.EXP_IF:e.EXP_IF)+"$"),e.EXP_SPLIT=new RegExp("^"+e.EXP_SPLIT+"$",""),e.isInput(t.elem[0])||"focus"===t.trigger&&(t.trigger="click"),t.elem.attr("lay-key")||(t.elem.attr("lay-key",e.index),t.eventElem.attr("lay-key",e.index)),t.mark=w.extend({},t.calendar&&"cn"===t.lang?{"0-1-1":"元旦","0-2-14":"情人","0-3-8":"妇女","0-3-12":"植树","0-4-1":"愚人","0-5-1":"劳动","0-5-4":"青年","0-6-1":"儿童","0-9-10":"教师","0-9-18":"国耻","0-10-1":"国庆","0-12-25":"圣诞"}:{},t.mark),w.each(["min","max"],function(e,n){var a=[],i=[];if("number"==typeof t[n]){var r=t[n],o=(new Date).getTime(),s=864e5,l=new Date(r?r<s?o+r*s:r:o);a=[l.getFullYear(),l.getMonth()+1,l.getDate()],r<s||(i=[l.getHours(),l.getMinutes(),l.getSeconds()])}else a=(t[n].match(/\d+-\d+-\d+/)||[""])[0].split("-"),i=(t[n].match(/\d+:\d+:\d+/)||[""])[0].split(":");t[n]={year:0|a[0]||(new Date).getFullYear(),month:a[1]?(0|a[1])-1:(new Date).getMonth(),date:0|a[2]||(new Date).getDate(),hours:0|i[0],minutes:0|i[1],seconds:0|i[2]}}),e.elemID="layui-laydate"+t.elem.attr("lay-key"),(t.show||a)&&e.render(),a||e.events(),t.value&&(t.value.constructor===Date?e.setValue(e.parse(0,e.systemDate(t.value))):e.setValue(t.value)))},T.prototype.render=function(){var e=this,t=e.config,n=e.lang(),a="static"===t.position,i=e.elem=w.elem("div",{id:e.elemID,"class":["layui-laydate",t.range?" layui-laydate-range":"",a?" "+c:"",t.theme&&"default"!==t.theme&&!/^#/.test(t.theme)?" laydate-theme-"+t.theme:""].join("")}),r=e.elemMain=[],o=e.elemHeader=[],s=e.elemCont=[],l=e.table=[],d=e.footer=w.elem("div",{"class":p});if(t.zIndex&&(i.style.zIndex=t.zIndex),w.each(new Array(2),function(e){if(!t.range&&e>0)return!0;var a=w.elem("div",{"class":"layui-laydate-header"}),i=[function(){var e=w.elem("i",{"class":"layui-icon laydate-icon laydate-prev-y"});return e.innerHTML="",e}(),function(){var e=w.elem("i",{"class":"layui-icon laydate-icon laydate-prev-m"});return e.innerHTML="",e}(),function(){var e=w.elem("div",{"class":"laydate-set-ym"}),t=w.elem("span"),n=w.elem("span");return e.appendChild(t),e.appendChild(n),e}(),function(){var e=w.elem("i",{"class":"layui-icon laydate-icon laydate-next-m"});return e.innerHTML="",e}(),function(){var e=w.elem("i",{"class":"layui-icon laydate-icon laydate-next-y"});return e.innerHTML="",e}()],d=w.elem("div",{"class":"layui-laydate-content"}),c=w.elem("table"),m=w.elem("thead"),u=w.elem("tr");w.each(i,function(e,t){a.appendChild(t)}),m.appendChild(u),w.each(new Array(6),function(e){var t=c.insertRow(0);w.each(new Array(7),function(a){if(0===e){var i=w.elem("th");i.innerHTML=n.weeks[a],u.appendChild(i)}t.insertCell(a)})}),c.insertBefore(m,c.children[0]),d.appendChild(c),r[e]=w.elem("div",{"class":"layui-laydate-main laydate-main-list-"+e}),r[e].appendChild(a),r[e].appendChild(d),o.push(i),s.push(d),l.push(c)}),w(d).html(function(){var e=[],i=[];return"datetime"===t.type&&e.push('<span lay-type="datetime" class="laydate-btns-time">'+n.timeTips+"</span>"),w.each(t.btns,function(e,r){var o=n.tools[r]||"btn";t.range&&"now"===r||(a&&"clear"===r&&(o="cn"===t.lang?"重置":"Reset"),i.push('<span lay-type="'+r+'" class="laydate-btns-'+r+'">'+o+"</span>"))}),e.push('<div class="laydate-footer-btns">'+i.join("")+"</div>"),e.join("")}()),w.each(r,function(e,t){i.appendChild(t)}),t.showBottom&&i.appendChild(d),/^#/.test(t.theme)){var m=w.elem("style"),u=["#{{id}} .layui-laydate-header{background-color:{{theme}};}","#{{id}} .layui-this{background-color:{{theme}} !important;}"].join("").replace(/{{id}}/g,e.elemID).replace(/{{theme}}/g,t.theme);"styleSheet"in m?(m.setAttribute("type","text/css"),m.styleSheet.cssText=u):m.innerHTML=u,w(i).addClass("laydate-theme-molv"),i.appendChild(m)}e.remove(T.thisElemDate),a?t.elem.append(i):(document.body.appendChild(i),e.position()),e.checkDate().calendar(),e.changeEvent(),T.thisElemDate=e.elemID,"function"==typeof t.ready&&t.ready(w.extend({},t.dateTime,{month:t.dateTime.month+1}))},T.prototype.remove=function(e){var t=this,n=(t.config,w("#"+(e||t.elemID)));return n.hasClass(c)||t.checkDate(function(){n.remove()}),t},T.prototype.position=function(){var e=this,t=e.config,n=e.bindElem||t.elem[0],a=n.getBoundingClientRect(),i=e.elem.offsetWidth,r=e.elem.offsetHeight,o=function(e){return e=e?"scrollLeft":"scrollTop",document.body[e]|document.documentElement[e]},s=function(e){return document.documentElement[e?"clientWidth":"clientHeight"]},l=5,d=a.left,c=a.bottom;d+i+l>s("width")&&(d=s("width")-i-l),c+r+l>s()&&(c=a.top>r?a.top-r:s()-r,c-=2*l),t.position&&(e.elem.style.position=t.position),e.elem.style.left=d+("fixed"===t.position?0:o(1))+"px",e.elem.style.top=c+("fixed"===t.position?0:o())+"px"},T.prototype.hint=function(e){var t=this,n=(t.config,w.elem("div",{"class":h}));n.innerHTML=e||"",w(t.elem).find("."+h).remove(),t.elem.appendChild(n),clearTimeout(t.hinTimer),t.hinTimer=setTimeout(function(){w(t.elem).find("."+h).remove()},3e3)},T.prototype.getAsYM=function(e,t,n){return n?t--:t++,t<0&&(t=11,e--),t>11&&(t=0,e++),[e,t]},T.prototype.systemDate=function(e){var t=e||new Date;return{year:t.getFullYear(),month:t.getMonth(),date:t.getDate(),hours:e?e.getHours():0,minutes:e?e.getMinutes():0,seconds:e?e.getSeconds():0}},T.prototype.checkDate=function(e){var t,a,i=this,r=(new Date,i.config),o=r.dateTime=r.dateTime||i.systemDate(),s=i.bindElem||r.elem[0],l=(i.isInput(s)?"val":"html",i.isInput(s)?s.value:"static"===r.position?"":s.innerHTML),c=function(e){e.year>d[1]&&(e.year=d[1],a=!0),e.month>11&&(e.month=11,a=!0),e.hours>23&&(e.hours=0,a=!0),e.minutes>59&&(e.minutes=0,e.hours++,a=!0),e.seconds>59&&(e.seconds=0,e.minutes++,a=!0),t=n.getEndDate(e.month+1,e.year),e.date>t&&(e.date=t,a=!0)},m=function(e,t,n){var o=["startTime","endTime"];t=(t.match(i.EXP_SPLIT)||[]).slice(1),n=n||0,r.range&&(i[o[n]]=i[o[n]]||{}),w.each(i.format,function(s,l){var c=parseFloat(t[s]);t[s].length<l.length&&(a=!0),/yyyy|y/.test(l)?(c<d[0]&&(c=d[0],a=!0),e.year=c):/MM|M/.test(l)?(c<1&&(c=1,a=!0),e.month=c-1):/dd|d/.test(l)?(c<1&&(c=1,a=!0),e.date=c):/HH|H/.test(l)?(c<1&&(c=0,a=!0),e.hours=c,r.range&&(i[o[n]].hours=c)):/mm|m/.test(l)?(c<1&&(c=0,a=!0),e.minutes=c,r.range&&(i[o[n]].minutes=c)):/ss|s/.test(l)&&(c<1&&(c=0,a=!0),e.seconds=c,r.range&&(i[o[n]].seconds=c))}),c(e)};return"limit"===e?(c(o),i):(l=l||r.value,"string"==typeof l&&(l=l.replace(/\s+/g," ").replace(/^\s|\s$/g,"")),i.startState&&!i.endState&&(delete i.startState,i.endState=!0),"string"==typeof l&&l?i.EXP_IF.test(l)?r.range?(l=l.split(" "+r.range+" "),i.startDate=i.startDate||i.systemDate(),i.endDate=i.endDate||i.systemDate(),r.dateTime=w.extend({},i.startDate),w.each([i.startDate,i.endDate],function(e,t){m(t,l[e],e)})):m(o,l):(i.hint("日期格式不合法<br>必须遵循下述格式：<br>"+(r.range?r.format+" "+r.range+" "+r.format:r.format)+"<br>已为你重置"),a=!0):l&&l.constructor===Date?r.dateTime=i.systemDate(l):(r.dateTime=i.systemDate(),delete i.startState,delete i.endState,delete i.startDate,delete i.endDate,delete i.startTime,delete i.endTime),c(o),a&&l&&i.setValue(r.range?i.endDate?i.parse():"":i.parse()),e&&e(),i)},T.prototype.mark=function(e,t){var n,a=this,i=a.config;return w.each(i.mark,function(e,a){var i=e.split("-");i[0]!=t[0]&&0!=i[0]||i[1]!=t[1]&&0!=i[1]||i[2]!=t[2]||(n=a||t[2])}),n&&e.html('<span class="laydate-day-mark">'+n+"</span>"),a},T.prototype.limit=function(e,t,n,a){var i,r=this,o=r.config,l={},d=o[n>41?"endDate":"dateTime"],c=w.extend({},d,t||{});return w.each({now:c,min:o.min,max:o.max},function(e,t){l[e]=r.newDate(w.extend({year:t.year,month:t.month,date:t.date},function(){var e={};return w.each(a,function(n,a){e[a]=t[a]}),e}())).getTime()}),i=l.now<l.min||l.now>l.max,e&&e[i?"addClass":"removeClass"](s),i},T.prototype.calendar=function(e){var t,a,i,r=this,s=r.config,l=e||s.dateTime,c=new Date,m=r.lang(),u="date"!==s.type&&"datetime"!==s.type,h=e?1:0,y=w(r.table[h]).find("td"),f=w(r.elemHeader[h][2]).find("span");if(l.year<d[0]&&(l.year=d[0],r.hint("最低只能支持到公元"+d[0]+"年")),l.year>d[1]&&(l.year=d[1],r.hint("最高只能支持到公元"+d[1]+"年")),r.firstDate||(r.firstDate=w.extend({},l)),c.setFullYear(l.year,l.month,1),t=c.getDay(),a=n.getEndDate(l.month||12,l.year),i=n.getEndDate(l.month+1,l.year),w.each(y,function(e,n){var d=[l.year,l.month],c=0;n=w(n),n.removeAttr("class"),e<t?(c=a-t+e,n.addClass("laydate-day-prev"),d=r.getAsYM(l.year,l.month,"sub")):e>=t&&e<i+t?(c=e-t,s.range||c+1===l.date&&n.addClass(o)):(c=e-i-t,n.addClass("laydate-day-next"),d=r.getAsYM(l.year,l.month)),d[1]++,d[2]=c+1,n.attr("lay-ymd",d.join("-")).html(d[2]),r.mark(n,d).limit(n,{year:d[0],month:d[1]-1,date:d[2]},e)}),w(f[0]).attr("lay-ym",l.year+"-"+(l.month+1)),w(f[1]).attr("lay-ym",l.year+"-"+(l.month+1)),"cn"===s.lang?(w(f[0]).attr("lay-type","year").html(l.year+"年"),w(f[1]).attr("lay-type","month").html(l.month+1+"月")):(w(f[0]).attr("lay-type","month").html(m.month[l.month]),w(f[1]).attr("lay-type","year").html(l.year)),u&&(s.range&&(e?r.endDate=r.endDate||{year:l.year+("year"===s.type?1:0),month:l.month+("month"===s.type?0:-1)}:r.startDate=r.startDate||{year:l.year,month:l.month},e&&(r.listYM=[[r.startDate.year,r.startDate.month+1],[r.endDate.year,r.endDate.month+1]],r.list(s.type,0).list(s.type,1),"time"===s.type?r.setBtnStatus("时间",w.extend({},r.systemDate(),r.startTime),w.extend({},r.systemDate(),r.endTime)):r.setBtnStatus(!0))),s.range||(r.listYM=[[l.year,l.month+1]],r.list(s.type,0))),s.range&&!e){var p=r.getAsYM(l.year,l.month);r.calendar(w.extend({},l,{year:p[0],month:p[1]}))}return s.range||r.limit(w(r.footer).find(g),null,0,["hours","minutes","seconds"]),s.range&&e&&!u&&r.stampRange(),r},T.prototype.list=function(e,t){var n=this,a=n.config,i=a.dateTime,r=n.lang(),l=a.range&&"date"!==a.type&&"datetime"!==a.type,d=w.elem("ul",{"class":m+" "+{year:"laydate-year-list",month:"laydate-month-list",time:"laydate-time-list"}[e]}),c=n.elemHeader[t],u=w(c[2]).find("span"),h=n.elemCont[t||0],y=w(h).find("."+m)[0],f="cn"===a.lang,p=f?"年":"",T=n.listYM[t]||{},C=["hours","minutes","seconds"],x=["startTime","endTime"][t];if(T[0]<1&&(T[0]=1),"year"===e){var M,b=M=T[0]-7;b<1&&(b=M=1),w.each(new Array(15),function(e){var i=w.elem("li",{"lay-ym":M}),r={year:M};M==T[0]&&w(i).addClass(o),i.innerHTML=M+p,d.appendChild(i),M<n.firstDate.year?(r.month=a.min.month,r.date=a.min.date):M>=n.firstDate.year&&(r.month=a.max.month,r.date=a.max.date),n.limit(w(i),r,t),M++}),w(u[f?0:1]).attr("lay-ym",M-8+"-"+T[1]).html(b+p+" - "+(M-1+p))}else if("month"===e)w.each(new Array(12),function(e){var i=w.elem("li",{"lay-ym":e}),s={year:T[0],month:e};e+1==T[1]&&w(i).addClass(o),i.innerHTML=r.month[e]+(f?"月":""),d.appendChild(i),T[0]<n.firstDate.year?s.date=a.min.date:T[0]>=n.firstDate.year&&(s.date=a.max.date),n.limit(w(i),s,t)}),w(u[f?0:1]).attr("lay-ym",T[0]+"-"+T[1]).html(T[0]+p);else if("time"===e){var E=function(){w(d).find("ol").each(function(e,a){w(a).find("li").each(function(a,i){n.limit(w(i),[{hours:a},{hours:n[x].hours,minutes:a},{hours:n[x].hours,minutes:n[x].minutes,seconds:a}][e],t,[["hours"],["hours","minutes"],["hours","minutes","seconds"]][e])})}),a.range||n.limit(w(n.footer).find(g),n[x],0,["hours","minutes","seconds"])};a.range?n[x]||(n[x]={hours:0,minutes:0,seconds:0}):n[x]=i,w.each([24,60,60],function(e,t){var a=w.elem("li"),i=["<p>"+r.time[e]+"</p><ol>"];w.each(new Array(t),function(t){i.push("<li"+(n[x][C[e]]===t?' class="'+o+'"':"")+">"+w.digit(t,2)+"</li>")}),a.innerHTML=i.join("")+"</ol>",d.appendChild(a)}),E()}if(y&&h.removeChild(y),h.appendChild(d),"year"===e||"month"===e)w(n.elemMain[t]).addClass("laydate-ym-show"),w(d).find("li").on("click",function(){var r=0|w(this).attr("lay-ym");if(!w(this).hasClass(s)){if(0===t)i[e]=r,l&&(n.startDate[e]=r),n.limit(w(n.footer).find(g),null,0);else if(l)n.endDate[e]=r;else{var c="year"===e?n.getAsYM(r,T[1]-1,"sub"):n.getAsYM(T[0],r,"sub");w.extend(i,{year:c[0],month:c[1]})}"year"===a.type||"month"===a.type?(w(d).find("."+o).removeClass(o),w(this).addClass(o),"month"===a.type&&"year"===e&&(n.listYM[t][0]=r,l&&(n[["startDate","endDate"][t]].year=r),n.list("month",t))):(n.checkDate("limit").calendar(),n.closeList()),n.setBtnStatus(),a.range||n.done(null,"change"),w(n.footer).find(D).removeClass(s)}});else{var S=w.elem("span",{"class":v}),k=function(){w(d).find("ol").each(function(e){var t=this,a=w(t).find("li");t.scrollTop=30*(n[x][C[e]]-2),t.scrollTop<=0&&a.each(function(e,n){if(!w(this).hasClass(s))return t.scrollTop=30*(e-2),!0})})},H=w(c[2]).find("."+v);k(),S.innerHTML=a.range?[r.startTime,r.endTime][t]:r.timeTips,w(n.elemMain[t]).addClass("laydate-time-show"),H[0]&&H.remove(),c[2].appendChild(S),w(d).find("ol").each(function(e){var t=this;w(t).find("li").on("click",function(){var r=0|this.innerHTML;w(this).hasClass(s)||(a.range?n[x][C[e]]=r:i[C[e]]=r,w(t).find("."+o).removeClass(o),w(this).addClass(o),E(),k(),(n.endDate||"time"===a.type)&&n.done(null,"change"),n.setBtnStatus())})})}return n},T.prototype.listYM=[],T.prototype.closeList=function(){var e=this;e.config;w.each(e.elemCont,function(t,n){w(this).find("."+m).remove(),w(e.elemMain[t]).removeClass("laydate-ym-show laydate-time-show")}),w(e.elem).find("."+v).remove()},T.prototype.setBtnStatus=function(e,t,n){var a,i=this,r=i.config,o=w(i.footer).find(g),d=r.range&&"date"!==r.type&&"time"!==r.type;d&&(t=t||i.startDate,n=n||i.endDate,a=i.newDate(t).getTime()>i.newDate(n).getTime(),i.limit(null,t)||i.limit(null,n)?o.addClass(s):o[a?"addClass":"removeClass"](s),e&&a&&i.hint("string"==typeof e?l.replace(/日期/g,e):l))},T.prototype.parse=function(e,t){var n=this,a=n.config,i=t||(e?w.extend({},n.endDate,n.endTime):a.range?w.extend({},n.startDate,n.startTime):a.dateTime),r=n.format.concat();return w.each(r,function(e,t){/yyyy|y/.test(t)?r[e]=w.digit(i.year,t.length):/MM|M/.test(t)?r[e]=w.digit(i.month+1,t.length):/dd|d/.test(t)?r[e]=w.digit(i.date,t.length):/HH|H/.test(t)?r[e]=w.digit(i.hours,t.length):/mm|m/.test(t)?r[e]=w.digit(i.minutes,t.length):/ss|s/.test(t)&&(r[e]=w.digit(i.seconds,t.length))}),a.range&&!e?r.join("")+" "+a.range+" "+n.parse(1):r.join("")},T.prototype.newDate=function(e){return e=e||{},new Date(e.year||1,e.month||0,e.date||1,e.hours||0,e.minutes||0,e.seconds||0)},T.prototype.setValue=function(e){var t=this,n=t.config,a=t.bindElem||n.elem[0],i=t.isInput(a)?"val":"html";return"static"===n.position||w(a)[i](e||""),this},T.prototype.stampRange=function(){var e,t,n=this,a=n.config,i=w(n.elem).find("td");if(a.range&&!n.endDate&&w(n.footer).find(g).addClass(s),n.endDate)return e=n.newDate({year:n.startDate.year,month:n.startDate.month,date:n.startDate.date}).getTime(),t=n.newDate({year:n.endDate.year,month:n.endDate.month,date:n.endDate.date}).getTime(),e>t?n.hint(l):void w.each(i,function(a,i){var r=w(i).attr("lay-ymd").split("-"),s=n.newDate({year:r[0],month:r[1]-1,date:r[2]}).getTime();w(i).removeClass(u+" "+o),s!==e&&s!==t||w(i).addClass(w(i).hasClass(y)||w(i).hasClass(f)?u:o),s>e&&s<t&&w(i).addClass(u)})},T.prototype.done=function(e,t){var n=this,a=n.config,i=w.extend({},n.startDate?w.extend(n.startDate,n.startTime):a.dateTime),r=w.extend({},w.extend(n.endDate,n.endTime));return w.each([i,r],function(e,t){"month"in t&&w.extend(t,{month:t.month+1})}),e=e||[n.parse(),i,r],"function"==typeof a[t||"done"]&&a[t||"done"].apply(a,e),n},T.prototype.choose=function(e){var t=this,n=t.config,a=n.dateTime,i=w(t.elem).find("td"),r=e.attr("lay-ymd").split("-"),l=function(e){new Date;e&&w.extend(a,r),n.range&&(t.startDate?w.extend(t.startDate,r):t.startDate=w.extend({},r,t.startTime),t.startYMD=r)};if(r={year:0|r[0],month:(0|r[1])-1,date:0|r[2]},!e.hasClass(s))if(n.range){if(w.each(["startTime","endTime"],function(e,n){t[n]=t[n]||{hours:0,minutes:0,seconds:0}}),t.endState)l(),delete t.endState,delete t.endDate,t.startState=!0,i.removeClass(o+" "+u),e.addClass(o);else if(t.startState){if(e.addClass(o),t.endDate?w.extend(t.endDate,r):t.endDate=w.extend({},r,t.endTime),t.newDate(r).getTime()<t.newDate(t.startYMD).getTime()){var d=w.extend({},t.endDate,{hours:t.startDate.hours,minutes:t.startDate.minutes,seconds:t.startDate.seconds});w.extend(t.endDate,t.startDate,{hours:t.endDate.hours,minutes:t.endDate.minutes,seconds:t.endDate.seconds}),t.startDate=d}n.showBottom||t.done(),t.stampRange(),t.endState=!0,t.done(null,"change")}else e.addClass(o),l(),t.startState=!0;w(t.footer).find(g)[t.endDate?"removeClass":"addClass"](s)}else"static"===n.position?(l(!0),t.calendar().done().done(null,"change")):"date"===n.type?(l(!0),t.setValue(t.parse()).remove().done()):"datetime"===n.type&&(l(!0),t.calendar().done(null,"change"))},T.prototype.tool=function(e,t){var n=this,a=n.config,i=a.dateTime,r="static"===a.position,o={datetime:function(){w(e).hasClass(s)||(n.list("time",0),a.range&&n.list("time",1),w(e).attr("lay-type","date").html(n.lang().dateTips))},date:function(){n.closeList(),w(e).attr("lay-type","datetime").html(n.lang().timeTips)},clear:function(){n.setValue("").remove(),r&&(w.extend(i,n.firstDate),n.calendar()),a.range&&(delete n.startState,delete n.endState,delete n.endDate,delete n.startTime,delete n.endTime),n.done(["",{},{}])},now:function(){var e=new Date;w.extend(i,n.systemDate(),{hours:e.getHours(),minutes:e.getMinutes(),seconds:e.getSeconds()}),n.setValue(n.parse()).remove(),r&&n.calendar(),n.done()},confirm:function(){if(a.range){if(!n.endDate)return n.hint("请先选择日期范围");if(w(e).hasClass(s))return n.hint("time"===a.type?l.replace(/日期/g,"时间"):l)}else if(w(e).hasClass(s))return n.hint("不在有效日期或时间范围内");n.done(),n.setValue(n.parse()).remove()}};o[t]&&o[t]()},T.prototype.change=function(e){var t=this,n=t.config,a=n.dateTime,i=n.range&&("year"===n.type||"month"===n.type),r=t.elemCont[e||0],o=t.listYM[e],s=function(s){var l=["startDate","endDate"][e],d=w(r).find(".laydate-year-list")[0],c=w(r).find(".laydate-month-list")[0];return d&&(o[0]=s?o[0]-15:o[0]+15,t.list("year",e)),c&&(s?o[0]--:o[0]++,t.list("month",e)),(d||c)&&(w.extend(a,{year:o[0]}),i&&(t[l].year=o[0]),n.range||t.done(null,"change"),t.setBtnStatus(),n.range||t.limit(w(t.footer).find(g),{year:o[0]})),d||c};return{prevYear:function(){s("sub")||(a.year--,t.checkDate("limit").calendar(),n.range||t.done(null,"change"))},prevMonth:function(){var e=t.getAsYM(a.year,a.month,"sub");w.extend(a,{year:e[0],month:e[1]}),t.checkDate("limit").calendar(),n.range||t.done(null,"change")},nextMonth:function(){var e=t.getAsYM(a.year,a.month);w.extend(a,{year:e[0],month:e[1]}),t.checkDate("limit").calendar(),n.range||t.done(null,"change")},nextYear:function(){s()||(a.year++,t.checkDate("limit").calendar(),n.range||t.done(null,"change"))}}},T.prototype.changeEvent=function(){var e=this;e.config;w(e.elem).on("click",function(e){w.stope(e)}),w.each(e.elemHeader,function(t,n){w(n[0]).on("click",function(n){e.change(t).prevYear()}),w(n[1]).on("click",function(n){e.change(t).prevMonth()}),w(n[2]).find("span").on("click",function(n){var a=w(this),i=a.attr("lay-ym"),r=a.attr("lay-type");i&&(i=i.split("-"),e.listYM[t]=[0|i[0],0|i[1]],e.list(r,t),w(e.footer).find(D).addClass(s))}),w(n[3]).on("click",function(n){e.change(t).nextMonth()}),w(n[4]).on("click",function(n){e.change(t).nextYear()})}),w.each(e.table,function(t,n){var a=w(n).find("td");a.on("click",function(){e.choose(w(this))})}),w(e.footer).find("span").on("click",function(){var t=w(this).attr("lay-type");e.tool(this,t)})},T.prototype.isInput=function(e){return/input|textarea/.test(e.tagName.toLocaleLowerCase())},T.prototype.events=function(){var e=this,t=e.config,n=function(n,a){n.on(t.trigger,function(){a&&(e.bindElem=this),e.render()})};t.elem[0]&&!t.elem[0].eventHandler&&(n(t.elem,"bind"),n(t.eventElem),w(document).on("click",function(n){n.target!==t.elem[0]&&n.target!==t.eventElem[0]&&n.target!==w(t.closeStop)[0]&&e.remove()}).on("keydown",function(t){13===t.keyCode&&w("#"+e.elemID)[0]&&e.elemID===T.thisElem&&(t.preventDefault(),w(e.footer).find(g)[0].click())}),w(window).on("resize",function(){return!(!e.elem||!w(r)[0])&&void e.position()}),t.elem[0].eventHandler=!0)},n.render=function(e){var t=new T(e);return a.call(t)},n.getEndDate=function(e,t){var n=new Date;return n.setFullYear(t||n.getFullYear(),e||n.getMonth()+1,1),new Date(n.getTime()-864e5).getDate()},window.lay=window.lay||w,e?(n.ready(),layui.define(function(e){n.path=layui.cache.dir,e(i,n)})):"function"==typeof define&&define.amd?define(function(){return n}):function(){n.ready(),window.laydate=n}()}();
\ No newline at end of file
diff --git a/management/guns-admin/src/main/webapp/static/js/plugins/laydate/theme/default/font/iconfont.eot b/management/guns-admin/src/main/webapp/static/js/plugins/laydate/theme/default/font/iconfont.eot
new file mode 100644
index 0000000..c861caa
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/static/js/plugins/laydate/theme/default/font/iconfont.eot
Binary files differ
diff --git a/management/guns-admin/src/main/webapp/static/js/plugins/laydate/theme/default/font/iconfont.svg b/management/guns-admin/src/main/webapp/static/js/plugins/laydate/theme/default/font/iconfont.svg
new file mode 100644
index 0000000..1e04218
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/static/js/plugins/laydate/theme/default/font/iconfont.svg
@@ -0,0 +1,45 @@
+<?xml version="1.0" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" >
+<!--
+2013-9-30: Created.
+-->
+<svg>
+<metadata>
+Created by iconfont
+</metadata>
+<defs>
+
+<font id="laydate-icon" horiz-adv-x="1024" >
+ <font-face
+ font-family="laydate-icon"
+ font-weight="500"
+ font-stretch="normal"
+ units-per-em="1024"
+ ascent="896"
+ descent="-128"
+ />
+ <missing-glyph />
+
+ <glyph glyph-name="x" unicode="x" horiz-adv-x="1001"
+d="M281 543q-27 -1 -53 -1h-83q-18 0 -36.5 -6t-32.5 -18.5t-23 -32t-9 -45.5v-76h912v41q0 16 -0.5 30t-0.5 18q0 13 -5 29t-17 29.5t-31.5 22.5t-49.5 9h-133v-97h-438v97zM955 310v-52q0 -23 0.5 -52t0.5 -58t-10.5 -47.5t-26 -30t-33 -16t-31.5 -4.5q-14 -1 -29.5 -0.5
+t-29.5 0.5h-32l-45 128h-439l-44 -128h-29h-34q-20 0 -45 1q-25 0 -41 9.5t-25.5 23t-13.5 29.5t-4 30v167h911zM163 247q-12 0 -21 -8.5t-9 -21.5t9 -21.5t21 -8.5q13 0 22 8.5t9 21.5t-9 21.5t-22 8.5zM316 123q-8 -26 -14 -48q-5 -19 -10.5 -37t-7.5 -25t-3 -15t1 -14.5
+t9.5 -10.5t21.5 -4h37h67h81h80h64h36q23 0 34 12t2 38q-5 13 -9.5 30.5t-9.5 34.5q-5 19 -11 39h-368zM336 498v228q0 11 2.5 23t10 21.5t20.5 15.5t34 6h188q31 0 51.5 -14.5t20.5 -52.5v-227h-327z" />
+
+
+
+ <glyph glyph-name="youyou" unicode="" d="M283.648 721.918976 340.873216 780.926976 740.352 383.997952 340.876288-12.925952 283.648 46.077952 619.52 383.997952Z" horiz-adv-x="1024" />
+
+
+ <glyph glyph-name="zuozuo" unicode="" d="M740.352 721.918976 683.126784 780.926976 283.648 383.997952 683.123712-12.925952 740.352 46.077952 404.48 383.997952Z" horiz-adv-x="1024" />
+
+
+ <glyph glyph-name="xiayiye" unicode="" d="M62.573 384.103l423.401 423.662c18.985 18.985 49.757 18.985 68.727 0 18.982-18.972 18.985-49.746 0-68.729l-355.058-355.067 356.796-356.796c18.977-18.971 18.976-49.746 0-68.727-18.982-18.976-49.751-18.976-68.727 0l-39.753 39.753 0.269 0.246-385.655 385.661zM451.365 384.103l423.407 423.662c18.985 18.985 49.757 18.985 68.727 0 18.982-18.972 18.985-49.746 0-68.729l-355.058-355.067 356.796-356.796c18.977-18.971 18.976-49.746 0-68.727-18.982-18.976-49.757-18.977-68.727 0l-39.762 39.754 0.273 0.249-385.662 385.661zM451.365 384.103z" horiz-adv-x="1024" />
+
+
+ <glyph glyph-name="xiayiye1" unicode="" d="M948.066926 382.958838l-411.990051-412.24426c-18.47333-18.47333-48.417689-18.47333-66.875207 0-18.47333 18.461167-18.47333 48.405526 0 66.875207L814.691135 383.088983 467.512212 730.269123c-18.466032 18.458735-18.466032 48.405526 0 66.873991 18.468465 18.464816 48.410391 18.464816 66.872774 0l38.682336-38.682336-0.261507-0.239614 375.259894-375.265975v0.003649m-378.312834 0L157.756743-29.285422c-18.47333-18.47333-48.415256-18.47333-66.872775 0-18.47333 18.461167-18.47333 48.405526 0 66.875207L436.369787 383.088983 89.19208 730.269123c-18.4636 18.458735-18.4636 48.405526 0 66.873991 18.470898 18.464816 48.415256 18.464816 66.872774 0l38.692067-38.682336-0.266372-0.239614 375.267191-375.265975-0.004865 0.003649m0 0z" horiz-adv-x="1024" />
+
+
+
+
+ </font>
+</defs></svg>
diff --git a/management/guns-admin/src/main/webapp/static/js/plugins/laydate/theme/default/font/iconfont.ttf b/management/guns-admin/src/main/webapp/static/js/plugins/laydate/theme/default/font/iconfont.ttf
new file mode 100644
index 0000000..0bd6c4a
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/static/js/plugins/laydate/theme/default/font/iconfont.ttf
Binary files differ
diff --git a/management/guns-admin/src/main/webapp/static/js/plugins/laydate/theme/default/font/iconfont.woff b/management/guns-admin/src/main/webapp/static/js/plugins/laydate/theme/default/font/iconfont.woff
new file mode 100644
index 0000000..bfe5599
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/static/js/plugins/laydate/theme/default/font/iconfont.woff
Binary files differ
diff --git a/management/guns-admin/src/main/webapp/static/js/plugins/laydate/theme/default/laydate.css b/management/guns-admin/src/main/webapp/static/js/plugins/laydate/theme/default/laydate.css
new file mode 100644
index 0000000..c7e1508
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/static/js/plugins/laydate/theme/default/laydate.css
@@ -0,0 +1,2 @@
+/*! laydate-v5.0.9 日期与时间组件 MIT License http://www.layui.com/laydate/ By 贤心 */
+.laydate-set-ym,.layui-laydate,.layui-laydate *,.layui-laydate-list{box-sizing:border-box}html #layuicss-laydate{display:none;position:absolute;width:1989px}.layui-laydate *{margin:0;padding:0}.layui-laydate{position:absolute;z-index:66666666;margin:5px 0;border-radius:2px;font-size:14px;-webkit-animation-duration:.3s;animation-duration:.3s;-webkit-animation-fill-mode:both;animation-fill-mode:both;-webkit-animation-name:laydate-upbit;animation-name:laydate-upbit}.layui-laydate-main{width:272px}.layui-laydate-content td,.layui-laydate-header *,.layui-laydate-list li{transition-duration:.3s;-webkit-transition-duration:.3s}@-webkit-keyframes laydate-upbit{from{-webkit-transform:translate3d(0,20px,0);opacity:.3}to{-webkit-transform:translate3d(0,0,0);opacity:1}}@keyframes laydate-upbit{from{transform:translate3d(0,20px,0);opacity:.3}to{transform:translate3d(0,0,0);opacity:1}}.layui-laydate-static{position:relative;z-index:0;display:inline-block;margin:0;-webkit-animation:none;animation:none}.laydate-ym-show .laydate-next-m,.laydate-ym-show .laydate-prev-m{display:none!important}.laydate-ym-show .laydate-next-y,.laydate-ym-show .laydate-prev-y{display:inline-block!important}.laydate-time-show .laydate-set-ym span[lay-type=month],.laydate-time-show .laydate-set-ym span[lay-type=year],.laydate-time-show .layui-laydate-header .layui-icon,.laydate-ym-show .laydate-set-ym span[lay-type=month]{display:none!important}.layui-laydate-header{position:relative;line-height:30px;padding:10px 70px 5px}.laydate-set-ym span,.layui-laydate-header i{padding:0 5px;cursor:pointer}.layui-laydate-header *{display:inline-block;vertical-align:bottom}.layui-laydate-header i{position:absolute;top:10px;color:#999;font-size:18px}.layui-laydate-header i.laydate-prev-y{left:15px}.layui-laydate-header i.laydate-prev-m{left:45px}.layui-laydate-header i.laydate-next-y{right:15px}.layui-laydate-header i.laydate-next-m{right:45px}.laydate-set-ym{width:100%;text-align:center;text-overflow:ellipsis;overflow:hidden;white-space:nowrap}.laydate-time-text{cursor:default!important}.layui-laydate-content{position:relative;padding:10px;-moz-user-select:none;-webkit-user-select:none;-ms-user-select:none}.layui-laydate-content table{border-collapse:collapse;border-spacing:0}.layui-laydate-content td,.layui-laydate-content th{width:36px;height:30px;padding:5px;text-align:center}.layui-laydate-content td{position:relative;cursor:pointer}.laydate-day-mark{position:absolute;left:0;top:0;width:100%;height:100%;line-height:30px;font-size:12px;overflow:hidden}.laydate-day-mark::after{position:absolute;content:'';right:2px;top:2px;width:5px;height:5px;border-radius:50%}.layui-laydate-footer{position:relative;height:46px;line-height:26px;padding:10px 20px}.layui-laydate-footer span{margin-right:15px;display:inline-block;cursor:pointer;font-size:12px}.layui-laydate-footer span:hover{color:#5FB878}.laydate-footer-btns{position:absolute;right:10px;top:10px}.laydate-footer-btns span{height:26px;line-height:26px;margin:0 0 0 -1px;padding:0 10px;border:1px solid #C9C9C9;background-color:#fff;white-space:nowrap;vertical-align:top;border-radius:2px}.layui-laydate-list>li,.layui-laydate-range .layui-laydate-main{display:inline-block;vertical-align:middle}.layui-laydate-list{position:absolute;left:0;top:0;width:100%;height:100%;padding:10px;background-color:#fff}.layui-laydate-list>li{position:relative;width:33.3%;height:36px;line-height:36px;margin:3px 0;text-align:center;cursor:pointer}.laydate-month-list>li{width:25%;margin:17px 0}.laydate-time-list>li{height:100%;margin:0;line-height:normal;cursor:default}.laydate-time-list p{position:relative;top:-4px;line-height:29px}.laydate-time-list ol{height:181px;overflow:hidden}.laydate-time-list>li:hover ol{overflow-y:auto}.laydate-time-list ol li{width:130%;padding-left:33px;line-height:30px;text-align:left;cursor:pointer}.layui-laydate-hint{position:absolute;top:115px;left:50%;width:250px;margin-left:-125px;line-height:20px;padding:15px;text-align:center;font-size:12px}.layui-laydate-range{width:546px}.layui-laydate-range .laydate-main-list-0 .laydate-next-m,.layui-laydate-range .laydate-main-list-0 .laydate-next-y,.layui-laydate-range .laydate-main-list-1 .laydate-prev-m,.layui-laydate-range .laydate-main-list-1 .laydate-prev-y{display:none}.layui-laydate-range .laydate-main-list-1 .layui-laydate-content{border-left:1px solid #e2e2e2}.layui-laydate,.layui-laydate-hint{border:1px solid #d2d2d2;box-shadow:0 2px 4px rgba(0,0,0,.12);background-color:#fff;color:#666}.layui-laydate-header{border-bottom:1px solid #e2e2e2}.layui-laydate-header i:hover,.layui-laydate-header span:hover{color:#5FB878}.layui-laydate-content{border-top:none 0;border-bottom:none 0}.layui-laydate-content th{font-weight:400;color:#333}.layui-laydate-content td{color:#666}.layui-laydate-content td.laydate-selected{background-color:#00F7DE}.laydate-selected:hover{background-color:#00F7DE!important}.layui-laydate-content td:hover,.layui-laydate-list li:hover{background-color:#eaeaea;color:#333}.laydate-time-list li ol{margin:0;padding:0;border:1px solid #e2e2e2;border-left-width:0}.laydate-time-list li:first-child ol{border-left-width:1px}.laydate-time-list>li:hover{background:0 0}.layui-laydate-content .laydate-day-next,.layui-laydate-content .laydate-day-prev{color:#d2d2d2}.laydate-selected.laydate-day-next,.laydate-selected.laydate-day-prev{background-color:#f8f8f8!important}.layui-laydate-footer{border-top:1px solid #e2e2e2}.layui-laydate-hint{color:#FF5722}.laydate-day-mark::after{background-color:#5FB878}.layui-laydate-content td.layui-this .laydate-day-mark::after{display:none}.layui-laydate-footer span[lay-type=date]{color:#5FB878}.layui-laydate .layui-this{background-color:#009688!important;color:#fff!important}.layui-laydate .laydate-disabled,.layui-laydate .laydate-disabled:hover{background:0 0!important;color:#d2d2d2!important;cursor:not-allowed!important;-moz-user-select:none;-webkit-user-select:none;-ms-user-select:none}.laydate-theme-molv{border:none}.laydate-theme-molv.layui-laydate-range{width:548px}.laydate-theme-molv .layui-laydate-main{width:274px}.laydate-theme-molv .layui-laydate-header{border:none;background-color:#009688}.laydate-theme-molv .layui-laydate-header i,.laydate-theme-molv .layui-laydate-header span{color:#f6f6f6}.laydate-theme-molv .layui-laydate-header i:hover,.laydate-theme-molv .layui-laydate-header span:hover{color:#fff}.laydate-theme-molv .layui-laydate-content{border:1px solid #e2e2e2;border-top:none;border-bottom:none}.laydate-theme-molv .laydate-main-list-1 .layui-laydate-content{border-left:none}.laydate-theme-grid .laydate-month-list>li,.laydate-theme-grid .laydate-year-list>li,.laydate-theme-grid .layui-laydate-content td,.laydate-theme-grid .layui-laydate-content thead,.laydate-theme-molv .layui-laydate-footer{border:1px solid #e2e2e2}.laydate-theme-grid .laydate-selected,.laydate-theme-grid .laydate-selected:hover{background-color:#f2f2f2!important;color:#009688!important}.laydate-theme-grid .laydate-selected.laydate-day-next,.laydate-theme-grid .laydate-selected.laydate-day-prev{color:#d2d2d2!important}.laydate-theme-grid .laydate-month-list,.laydate-theme-grid .laydate-year-list{margin:1px 0 0 1px}.laydate-theme-grid .laydate-month-list>li,.laydate-theme-grid .laydate-year-list>li{margin:0 -1px -1px 0}.laydate-theme-grid .laydate-year-list>li{height:43px;line-height:43px}.laydate-theme-grid .laydate-month-list>li{height:71px;line-height:71px}@font-face{font-family:laydate-icon;src:url(font/iconfont.eot);src:url(font/iconfont.eot#iefix) format('embedded-opentype'),url(font/iconfont.svg#iconfont) format('svg'),url(font/iconfont.woff) format('woff'),url(font/iconfont.ttf) format('truetype')}.laydate-icon{font-family:laydate-icon!important;font-size:16px;font-style:normal;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}
\ No newline at end of file
diff --git a/management/guns-admin/src/main/webapp/static/js/plugins/layer/extend/layer.ext.js b/management/guns-admin/src/main/webapp/static/js/plugins/layer/extend/layer.ext.js
new file mode 100644
index 0000000..ec9cf15
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/static/js/plugins/layer/extend/layer.ext.js
@@ -0,0 +1,2 @@
+/*! layer弹层组件拓展类 */
+;!function(){layer.use("skin/layer.ext.css",function(){layer.layui_layer_extendlayerextjs=!0});var a=layer.cache||{},b=function(b){return a.skin?" "+a.skin+" "+a.skin+"-"+b:""};layer.prompt=function(a,c){a=a||{},"function"==typeof a&&(c=a);var d,e=2==a.formType?'<textarea class="layui-layer-input">'+(a.value||"")+"</textarea>":function(){return'<input type="'+(1==a.formType?"password":"text")+'" class="layui-layer-input" value="'+(a.value||"")+'">'}();return layer.open($.extend({btn:["确定","取消"],content:e,skin:"layui-layer-prompt"+b("prompt"),success:function(a){d=a.find(".layui-layer-input"),d.focus()},yes:function(b){var e=d.val();""===e?d.focus():e.length>(a.maxlength||500)?layer.tips("最多输入"+(a.maxlength||500)+"个字数",d,{tips:1}):c&&c(e,b,d)}},a))},layer.tab=function(a){a=a||{};var c=a.tab||{};return layer.open($.extend({type:1,skin:"layui-layer-tab"+b("tab"),title:function(){var a=c.length,b=1,d="";if(a>0)for(d='<span class="layui-layer-tabnow">'+c[0].title+"</span>";a>b;b++)d+="<span>"+c[b].title+"</span>";return d}(),content:'<ul class="layui-layer-tabmain">'+function(){var a=c.length,b=1,d="";if(a>0)for(d='<li class="layui-layer-tabli xubox_tab_layer">'+(c[0].content||"no content")+"</li>";a>b;b++)d+='<li class="layui-layer-tabli">'+(c[b].content||"no content")+"</li>";return d}()+"</ul>",success:function(a){var b=a.find(".layui-layer-title").children(),c=a.find(".layui-layer-tabmain").children();b.on("mousedown",function(a){a.stopPropagation?a.stopPropagation():a.cancelBubble=!0;var b=$(this),d=b.index();b.addClass("layui-layer-tabnow").siblings().removeClass("layui-layer-tabnow"),c.eq(d).show().siblings().hide()})}},a))},layer.photos=function(a,c,d){function e(a,b,c){var d=new Image;d.onload=function(){d.onload=null,b(d)},d.onerror=function(a){d.onerror=null,c(a)},d.src=a}var f={};if(a=a||{},a.photos){var g=a.photos.constructor===Object,h=g?a.photos:{},i=h.data||[],j=h.start||0;if(f.imgIndex=j+1,g){if(0===i.length)return void layer.msg("没有图片")}else{var k=$(a.photos),l=k.find(a.img||"img");if(0===l.length)return;if(c||k.find(h.img||"img").each(function(b){var c=$(this);i.push({alt:c.attr("alt"),pid:c.attr("layer-pid"),src:c.attr("layer-src")||c.attr("src"),thumb:c.attr("src")}),c.on("click",function(){layer.photos($.extend(a,{photos:{start:b,data:i,tab:a.tab},full:a.full}),!0)})}),!c)return}f.imgprev=function(a){f.imgIndex--,f.imgIndex<1&&(f.imgIndex=i.length),f.tabimg(a)},f.imgnext=function(a,b){f.imgIndex++,f.imgIndex>i.length&&(f.imgIndex=1,b)||f.tabimg(a)},f.keyup=function(a){if(!f.end){var b=a.keyCode;a.preventDefault(),37===b?f.imgprev(!0):39===b?f.imgnext(!0):27===b&&layer.close(f.index)}},f.tabimg=function(b){i.length<=1||(h.start=f.imgIndex-1,layer.close(f.index),layer.photos(a,!0,b))},f.event=function(){f.bigimg.hover(function(){f.imgsee.show()},function(){f.imgsee.hide()}),f.bigimg.find(".layui-layer-imgprev").on("click",function(a){a.preventDefault(),f.imgprev()}),f.bigimg.find(".layui-layer-imgnext").on("click",function(a){a.preventDefault(),f.imgnext()}),$(document).on("keyup",f.keyup)},f.loadi=layer.load(1,{shade:"shade"in a?!1:.9,scrollbar:!1}),e(i[j].src,function(c){layer.close(f.loadi),f.index=layer.open($.extend({type:1,area:function(){var b=[c.width,c.height],d=[$(window).width()-100,$(window).height()-100];return!a.full&&b[0]>d[0]&&(b[0]=d[0],b[1]=b[0]*d[1]/b[0]),[b[0]+"px",b[1]+"px"]}(),title:!1,shade:.9,shadeClose:!0,closeBtn:!1,move:".layui-layer-phimg img",moveType:1,scrollbar:!1,moveOut:!0,shift:5*Math.random()|0,skin:"layui-layer-photos"+b("photos"),content:'<div class="layui-layer-phimg"><img src="'+i[j].src+'" alt="'+(i[j].alt||"")+'" layer-pid="'+i[j].pid+'"><div class="layui-layer-imgsee">'+(i.length>1?'<span class="layui-layer-imguide"><a href="javascript:;" class="layui-layer-iconext layui-layer-imgprev"></a><a href="javascript:;" class="layui-layer-iconext layui-layer-imgnext"></a></span>':"")+'<div class="layui-layer-imgbar" style="display:'+(d?"block":"")+'"><span class="layui-layer-imgtit"><a href="javascript:;">'+(i[j].alt||"")+"</a><em>"+f.imgIndex+"/"+i.length+"</em></span></div></div></div>",success:function(b,c){f.bigimg=b.find(".layui-layer-phimg"),f.imgsee=b.find(".layui-layer-imguide,.layui-layer-imgbar"),f.event(b),a.tab&&a.tab(i[j],b)},end:function(){f.end=!0,$(document).off("keyup",f.keyup)}},a))},function(){layer.close(f.loadi),layer.msg("当前图片地址异常<br>是否继续查看下一张？",{time:3e4,btn:["下一张","不看了"],yes:function(){i.length>1&&f.imgnext(!0,!0)}})})}}}();
diff --git a/management/guns-admin/src/main/webapp/static/js/plugins/layer/laydate/laydate.js b/management/guns-admin/src/main/webapp/static/js/plugins/layer/laydate/laydate.js
new file mode 100644
index 0000000..2da091b
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/static/js/plugins/layer/laydate/laydate.js
@@ -0,0 +1,11 @@
+/**
+
+ @Name : layDate v1.1 日期控件
+ @Author: 贤心
+ @Date: 2014-06-25
+ @QQ群：176047195
+ @Site：http://sentsin.com/layui/laydate
+
+ */
+
+;!function(a){var b={path:"",defSkin:"default",format:"YYYY-MM-DD",min:"1900-01-01 00:00:00",max:"2099-12-31 23:59:59",isv:!1},c={},d=document,e="createElement",f="getElementById",g="getElementsByTagName",h=["laydate_box","laydate_void","laydate_click","LayDateSkin","skins/","/laydate.css"];a.laydate=function(b){b=b||{};try{h.event=a.event?a.event:laydate.caller.arguments[0]}catch(d){}return c.run(b),laydate},laydate.v="1.1",c.getPath=function(){var a=document.scripts,c=a[a.length-1].src;return b.path?b.path:c.substring(0,c.lastIndexOf("/")+1)}(),c.use=function(a,b){var f=d[e]("link");f.type="text/css",f.rel="stylesheet",f.href=c.getPath+a+h[5],b&&(f.id=b),d[g]("head")[0].appendChild(f),f=null},c.trim=function(a){return a=a||"",a.replace(/^\s|\s$/g,"").replace(/\s+/g," ")},c.digit=function(a){return 10>a?"0"+(0|a):a},c.stopmp=function(b){return b=b||a.event,b.stopPropagation?b.stopPropagation():b.cancelBubble=!0,this},c.each=function(a,b){for(var c=0,d=a.length;d>c&&b(c,a[c])!==!1;c++);},c.hasClass=function(a,b){return a=a||{},new RegExp("\\b"+b+"\\b").test(a.className)},c.addClass=function(a,b){return a=a||{},c.hasClass(a,b)||(a.className+=" "+b),a.className=c.trim(a.className),this},c.removeClass=function(a,b){if(a=a||{},c.hasClass(a,b)){var d=new RegExp("\\b"+b+"\\b");a.className=a.className.replace(d,"")}return this},c.removeCssAttr=function(a,b){var c=a.style;c.removeProperty?c.removeProperty(b):c.removeAttribute(b)},c.shde=function(a,b){a.style.display=b?"none":"block"},c.query=function(a){var e,b,h,i,j;return a=c.trim(a).split(" "),b=d[f](a[0].substr(1)),b?a[1]?/^\./.test(a[1])?(i=a[1].substr(1),j=new RegExp("\\b"+i+"\\b"),e=[],h=d.getElementsByClassName?b.getElementsByClassName(i):b[g]("*"),c.each(h,function(a,b){j.test(b.className)&&e.push(b)}),e[0]?e:""):(e=b[g](a[1]),e[0]?b[g](a[1]):""):b:void 0},c.on=function(b,d,e){return b.attachEvent?b.attachEvent("on"+d,function(){e.call(b,a.even)}):b.addEventListener(d,e,!1),c},c.stopMosup=function(a,b){"mouseup"!==a&&c.on(b,"mouseup",function(a){c.stopmp(a)})},c.run=function(a){var d,e,g,b=c.query,f=h.event;try{g=f.target||f.srcElement||{}}catch(i){g={}}if(d=a.elem?b(a.elem):g,f&&g.tagName){if(!d||d===c.elem)return;c.stopMosup(f.type,d),c.stopmp(f),c.view(d,a),c.reshow()}else e=a.event||"click",c.each((0|d.length)>0?d:[d],function(b,d){c.stopMosup(e,d),c.on(d,e,function(b){c.stopmp(b),d!==c.elem&&(c.view(d,a),c.reshow())})})},c.scroll=function(a){return a=a?"scrollLeft":"scrollTop",d.body[a]|d.documentElement[a]},c.winarea=function(a){return document.documentElement[a?"clientWidth":"clientHeight"]},c.isleap=function(a){return 0===a%4&&0!==a%100||0===a%400},c.checkVoid=function(a,b,d){var e=[];return a=0|a,b=0|b,d=0|d,a<c.mins[0]?e=["y"]:a>c.maxs[0]?e=["y",1]:a>=c.mins[0]&&a<=c.maxs[0]&&(a==c.mins[0]&&(b<c.mins[1]?e=["m"]:b==c.mins[1]&&d<c.mins[2]&&(e=["d"])),a==c.maxs[0]&&(b>c.maxs[1]?e=["m",1]:b==c.maxs[1]&&d>c.maxs[2]&&(e=["d",1]))),e},c.timeVoid=function(a,b){if(c.ymd[1]+1==c.mins[1]&&c.ymd[2]==c.mins[2]){if(0===b&&a<c.mins[3])return 1;if(1===b&&a<c.mins[4])return 1;if(2===b&&a<c.mins[5])return 1}else if(c.ymd[1]+1==c.maxs[1]&&c.ymd[2]==c.maxs[2]){if(0===b&&a>c.maxs[3])return 1;if(1===b&&a>c.maxs[4])return 1;if(2===b&&a>c.maxs[5])return 1}return a>(b?59:23)?1:void 0},c.check=function(){var a=c.options.format.replace(/YYYY|MM|DD|hh|mm|ss/g,"\\d+\\").replace(/\\$/g,""),b=new RegExp(a),d=c.elem[h.elemv],e=d.match(/\d+/g)||[],f=c.checkVoid(e[0],e[1],e[2]);if(""!==d.replace(/\s/g,"")){if(!b.test(d))return c.elem[h.elemv]="",c.msg("日期不符合格式，请重新选择。"),1;if(f[0])return c.elem[h.elemv]="",c.msg("日期不在有效期内，请重新选择。"),1;f.value=c.elem[h.elemv].match(b).join(),e=f.value.match(/\d+/g),e[1]<1?(e[1]=1,f.auto=1):e[1]>12?(e[1]=12,f.auto=1):e[1].length<2&&(f.auto=1),e[2]<1?(e[2]=1,f.auto=1):e[2]>c.months[(0|e[1])-1]?(e[2]=31,f.auto=1):e[2].length<2&&(f.auto=1),e.length>3&&(c.timeVoid(e[3],0)&&(f.auto=1),c.timeVoid(e[4],1)&&(f.auto=1),c.timeVoid(e[5],2)&&(f.auto=1)),f.auto?c.creation([e[0],0|e[1],0|e[2]],1):f.value!==c.elem[h.elemv]&&(c.elem[h.elemv]=f.value)}},c.months=[31,null,31,30,31,30,31,31,30,31,30,31],c.viewDate=function(a,b,d){var f=(c.query,{}),g=new Date;a<(0|c.mins[0])&&(a=0|c.mins[0]),a>(0|c.maxs[0])&&(a=0|c.maxs[0]),g.setFullYear(a,b,d),f.ymd=[g.getFullYear(),g.getMonth(),g.getDate()],c.months[1]=c.isleap(f.ymd[0])?29:28,g.setFullYear(f.ymd[0],f.ymd[1],1),f.FDay=g.getDay(),f.PDay=c.months[0===b?11:b-1]-f.FDay+1,f.NDay=1,c.each(h.tds,function(a,b){var g,d=f.ymd[0],e=f.ymd[1]+1;b.className="",a<f.FDay?(b.innerHTML=g=a+f.PDay,c.addClass(b,"laydate_nothis"),1===e&&(d-=1),e=1===e?12:e-1):a>=f.FDay&&a<f.FDay+c.months[f.ymd[1]]?(b.innerHTML=g=a-f.FDay+1,a-f.FDay+1===f.ymd[2]&&(c.addClass(b,h[2]),f.thisDay=b)):(b.innerHTML=g=f.NDay++,c.addClass(b,"laydate_nothis"),12===e&&(d+=1),e=12===e?1:e+1),c.checkVoid(d,e,g)[0]&&c.addClass(b,h[1]),c.options.festival&&c.festival(b,e+"."+g),b.setAttribute("y",d),b.setAttribute("m",e),b.setAttribute("d",g),d=e=g=null}),c.valid=!c.hasClass(f.thisDay,h[1]),c.ymd=f.ymd,h.year.value=c.ymd[0]+"年",h.month.value=c.digit(c.ymd[1]+1)+"月",c.each(h.mms,function(a,b){var d=c.checkVoid(c.ymd[0],(0|b.getAttribute("m"))+1);"y"===d[0]||"m"===d[0]?c.addClass(b,h[1]):c.removeClass(b,h[1]),c.removeClass(b,h[2]),d=null}),c.addClass(h.mms[c.ymd[1]],h[2]),f.times=[0|c.inymd[3]||0,0|c.inymd[4]||0,0|c.inymd[5]||0],c.each(new Array(3),function(a){c.hmsin[a].value=c.digit(c.timeVoid(f.times[a],a)?0|c.mins[a+3]:0|f.times[a])}),c[c.valid?"removeClass":"addClass"](h.ok,h[1])},c.festival=function(a,b){var c;switch(b){case"1.1":c="元旦";break;case"3.8":c="妇女";break;case"4.5":c="清明";break;case"5.1":c="劳动";break;case"6.1":c="儿童";break;case"9.10":c="教师";break;case"10.1":c="国庆"}c&&(a.innerHTML=c),c=null},c.viewYears=function(a){var b=c.query,d="";c.each(new Array(14),function(b){d+=7===b?"<li "+(parseInt(h.year.value)===a?'class="'+h[2]+'"':"")+' y="'+a+'">'+a+"年</li>":'<li y="'+(a-7+b)+'">'+(a-7+b)+"年</li>"}),b("#laydate_ys").innerHTML=d,c.each(b("#laydate_ys li"),function(a,b){"y"===c.checkVoid(b.getAttribute("y"))[0]?c.addClass(b,h[1]):c.on(b,"click",function(a){c.stopmp(a).reshow(),c.viewDate(0|this.getAttribute("y"),c.ymd[1],c.ymd[2])})})},c.initDate=function(){var d=(c.query,new Date),e=c.elem[h.elemv].match(/\d+/g)||[];e.length<3&&(e=c.options.start.match(/\d+/g)||[],e.length<3&&(e=[d.getFullYear(),d.getMonth()+1,d.getDate()])),c.inymd=e,c.viewDate(e[0],e[1]-1,e[2])},c.iswrite=function(){var a=c.query,b={time:a("#laydate_hms")};c.shde(b.time,!c.options.istime),c.shde(h.oclear,!("isclear"in c.options?c.options.isclear:1)),c.shde(h.otoday,!("istoday"in c.options?c.options.istoday:1)),c.shde(h.ok,!("issure"in c.options?c.options.issure:1))},c.orien=function(a,b){var d,e=c.elem.getBoundingClientRect();a.style.left=e.left+(b?0:c.scroll(1))+"px",d=e.bottom+a.offsetHeight/1.5<=c.winarea()?e.bottom-1:e.top>a.offsetHeight/1.5?e.top-a.offsetHeight+1:c.winarea()-a.offsetHeight,a.style.top=d+(b?0:c.scroll())+"px"},c.follow=function(a){c.options.fixed?(a.style.position="fixed",c.orien(a,1)):(a.style.position="absolute",c.orien(a))},c.viewtb=function(){var a,b=[],f=["日","一","二","三","四","五","六"],h={},i=d[e]("table"),j=d[e]("thead");return j.appendChild(d[e]("tr")),h.creath=function(a){var b=d[e]("th");b.innerHTML=f[a],j[g]("tr")[0].appendChild(b),b=null},c.each(new Array(6),function(d){b.push([]),a=i.insertRow(0),c.each(new Array(7),function(c){b[d][c]=0,0===d&&h.creath(c),a.insertCell(c)})}),i.insertBefore(j,i.children[0]),i.id=i.className="laydate_table",a=b=null,i.outerHTML.toLowerCase()}(),c.view=function(a,f){var i,g=c.query,j={};f=f||a,c.elem=a,c.options=f,c.options.format||(c.options.format=b.format),c.options.start=c.options.start||"",c.mm=j.mm=[c.options.min||b.min,c.options.max||b.max],c.mins=j.mm[0].match(/\d+/g),c.maxs=j.mm[1].match(/\d+/g),h.elemv=/textarea|input/.test(c.elem.tagName.toLocaleLowerCase())?"value":"innerHTML",c.box?c.shde(c.box):(i=d[e]("div"),i.id=h[0],i.className=h[0],i.style.cssText="position: absolute;",i.setAttribute("name","laydate-v"+laydate.v),i.innerHTML=j.html='<div class="laydate_top"><div class="laydate_ym laydate_y" id="laydate_YY"><a class="laydate_choose laydate_chprev laydate_tab"><cite></cite></a><input id="laydate_y" readonly><label></label><a class="laydate_choose laydate_chnext laydate_tab"><cite></cite></a><div class="laydate_yms"><a class="laydate_tab laydate_chtop"><cite></cite></a><ul id="laydate_ys"></ul><a class="laydate_tab laydate_chdown"><cite></cite></a></div></div><div class="laydate_ym laydate_m" id="laydate_MM"><a class="laydate_choose laydate_chprev laydate_tab"><cite></cite></a><input id="laydate_m" readonly><label></label><a class="laydate_choose laydate_chnext laydate_tab"><cite></cite></a><div class="laydate_yms" id="laydate_ms">'+function(){var a="";return c.each(new Array(12),function(b){a+='<span m="'+b+'">'+c.digit(b+1)+"月</span>"}),a}()+"</div>"+"</div>"+"</div>"+c.viewtb+'<div class="laydate_bottom">'+'<ul id="laydate_hms">'+'<li class="laydate_sj">时间</li>'+"<li><input readonly>:</li>"+"<li><input readonly>:</li>"+"<li><input readonly></li>"+"</ul>"+'<div class="laydate_time" id="laydate_time"></div>'+'<div class="laydate_btn">'+'<a id="laydate_clear">清空</a>'+'<a id="laydate_today">今天</a>'+'<a id="laydate_ok">确认</a>'+"</div>"+(b.isv?'<a href="http://sentsin.com/layui/laydate/" class="laydate_v" target="_blank">laydate-v'+laydate.v+"</a>":"")+"</div>",d.body.appendChild(i),c.box=g("#"+h[0]),c.events(),i=null),c.follow(c.box),f.zIndex?c.box.style.zIndex=f.zIndex:c.removeCssAttr(c.box,"z-index"),c.stopMosup("click",c.box),c.initDate(),c.iswrite(),c.check()},c.reshow=function(){return c.each(c.query("#"+h[0]+" .laydate_show"),function(a,b){c.removeClass(b,"laydate_show")}),this},c.close=function(){c.reshow(),c.shde(c.query("#"+h[0]),1),c.elem=null},c.parse=function(a,d,e){return a=a.concat(d),e=e||(c.options?c.options.format:b.format),e.replace(/YYYY|MM|DD|hh|mm|ss/g,function(){return a.index=0|++a.index,c.digit(a[a.index])})},c.creation=function(a,b){var e=(c.query,c.hmsin),f=c.parse(a,[e[0].value,e[1].value,e[2].value]);c.elem[h.elemv]=f,b||(c.close(),"function"==typeof c.options.choose&&c.options.choose(f))},c.events=function(){var b=c.query,e={box:"#"+h[0]};c.addClass(d.body,"laydate_body"),h.tds=b("#laydate_table td"),h.mms=b("#laydate_ms span"),h.year=b("#laydate_y"),h.month=b("#laydate_m"),c.each(b(e.box+" .laydate_ym"),function(a,b){c.on(b,"click",function(b){c.stopmp(b).reshow(),c.addClass(this[g]("div")[0],"laydate_show"),a||(e.YY=parseInt(h.year.value),c.viewYears(e.YY))})}),c.on(b(e.box),"click",function(){c.reshow()}),e.tabYear=function(a){0===a?c.ymd[0]--:1===a?c.ymd[0]++:2===a?e.YY-=14:e.YY+=14,2>a?(c.viewDate(c.ymd[0],c.ymd[1],c.ymd[2]),c.reshow()):c.viewYears(e.YY)},c.each(b("#laydate_YY .laydate_tab"),function(a,b){c.on(b,"click",function(b){c.stopmp(b),e.tabYear(a)})}),e.tabMonth=function(a){a?(c.ymd[1]++,12===c.ymd[1]&&(c.ymd[0]++,c.ymd[1]=0)):(c.ymd[1]--,-1===c.ymd[1]&&(c.ymd[0]--,c.ymd[1]=11)),c.viewDate(c.ymd[0],c.ymd[1],c.ymd[2])},c.each(b("#laydate_MM .laydate_tab"),function(a,b){c.on(b,"click",function(b){c.stopmp(b).reshow(),e.tabMonth(a)})}),c.each(b("#laydate_ms span"),function(a,b){c.on(b,"click",function(a){c.stopmp(a).reshow(),c.hasClass(this,h[1])||c.viewDate(c.ymd[0],0|this.getAttribute("m"),c.ymd[2])})}),c.each(b("#laydate_table td"),function(a,b){c.on(b,"click",function(a){c.hasClass(this,h[1])||(c.stopmp(a),c.creation([0|this.getAttribute("y"),0|this.getAttribute("m"),0|this.getAttribute("d")]))})}),h.oclear=b("#laydate_clear"),c.on(h.oclear,"click",function(){c.elem[h.elemv]="",c.close()}),h.otoday=b("#laydate_today"),c.on(h.otoday,"click",function(){c.elem[h.elemv]=laydate.now(0,c.options.format),c.close()}),h.ok=b("#laydate_ok"),c.on(h.ok,"click",function(){c.valid&&c.creation([c.ymd[0],c.ymd[1]+1,c.ymd[2]])}),e.times=b("#laydate_time"),c.hmsin=e.hmsin=b("#laydate_hms input"),e.hmss=["小时","分钟","秒数"],e.hmsarr=[],c.msg=function(a,d){var f='<div class="laydte_hsmtex">'+(d||"提示")+"<span>×</span></div>";"string"==typeof a?(f+="<p>"+a+"</p>",c.shde(b("#"+h[0])),c.removeClass(e.times,"laydate_time1").addClass(e.times,"laydate_msg")):(e.hmsarr[a]?f=e.hmsarr[a]:(f+='<div id="laydate_hmsno" class="laydate_hmsno">',c.each(new Array(0===a?24:60),function(a){f+="<span>"+a+"</span>"}),f+="</div>",e.hmsarr[a]=f),c.removeClass(e.times,"laydate_msg"),c[0===a?"removeClass":"addClass"](e.times,"laydate_time1")),c.addClass(e.times,"laydate_show"),e.times.innerHTML=f},e.hmson=function(a,d){var e=b("#laydate_hmsno span"),f=c.valid?null:1;c.each(e,function(b,e){f?c.addClass(e,h[1]):c.timeVoid(b,d)?c.addClass(e,h[1]):c.on(e,"click",function(){c.hasClass(this,h[1])||(a.value=c.digit(0|this.innerHTML))})}),c.addClass(e[0|a.value],"laydate_click")},c.each(e.hmsin,function(a,b){c.on(b,"click",function(b){c.stopmp(b).reshow(),c.msg(a,e.hmss[a]),e.hmson(this,a)})}),c.on(d,"mouseup",function(){var a=b("#"+h[0]);a&&"none"!==a.style.display&&(c.check()||c.close())}).on(d,"keydown",function(b){b=b||a.event;var d=b.keyCode;13===d&&c.creation([c.ymd[0],c.ymd[1]+1,c.ymd[2]])})},c.init=function(){c.use("need"),c.use(h[4]+b.defSkin,h[3]),c.skinLink=c.query("#"+h[3])}(),laydate.reset=function(){c.box&&c.elem&&c.follow(c.box)},laydate.now=function(a,b){var d=new Date(0|a?function(a){return 864e5>a?+new Date+864e5*a:a}(parseInt(a)):+new Date);return c.parse([d.getFullYear(),d.getMonth()+1,d.getDate()],[d.getHours(),d.getMinutes(),d.getSeconds()],b)},laydate.skin=function(a){c.skinLink.href=c.getPath+h[4]+a+h[5]}}(window);
diff --git a/management/guns-admin/src/main/webapp/static/js/plugins/layer/laydate/need/laydate.css b/management/guns-admin/src/main/webapp/static/js/plugins/layer/laydate/need/laydate.css
new file mode 100644
index 0000000..91d4dbc
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/static/js/plugins/layer/laydate/need/laydate.css
@@ -0,0 +1,75 @@
+/**
+
+ @Name： laydate 核心样式
+ @Author：贤心
+ @Site：http://sentsin.com/layui/laydate
+
+**/
+
+html{_background-image:url(about:blank); _background-attachment:fixed;}
+.layer-date{display: inline-block!important;vertical-align:text-top;}
+.laydate_body .laydate_box, .laydate_body .laydate_box *{margin:0; padding:0;}
+.laydate-icon,
+.laydate-icon-default,
+.laydate-icon-danlan,
+.laydate-icon-dahong,
+.laydate-icon-molv{height:34px; padding-right:20px;min-width:34px;vertical-align: text-top;border:1px solid #C6C6C6; background-repeat:no-repeat; background-position:right center; background-color:#fff; outline:0;}
+.laydate-icon-default{ background-image:url(../skins/default/icon.png)}
+.laydate-icon-danlan{border:1px solid #B1D2EC; background-image:url(../skins/danlan/icon.png)}
+.laydate-icon-dahong{background-image:url(../skins/dahong/icon.png)}
+.laydate-icon-molv{background-image:url(../skins/molv/icon.png)}
+.laydate_body .laydate_box{width:240px; font:12px '\5B8B\4F53'; z-index:99999999; *margin:-2px 0 0 -2px; *overflow:hidden; _margin:0; _position:absolute!important; background-color:#fff;}
+.laydate_body .laydate_box li{list-style:none;}
+.laydate_body .laydate_box .laydate_void{cursor:text!important;}
+.laydate_body .laydate_box a, .laydate_body .laydate_box a:hover{text-decoration:none; blr:expression(this.onFocus=this.blur()); cursor:pointer;}
+.laydate_body .laydate_box a:hover{text-decoration:none;}
+.laydate_body .laydate_box cite, .laydate_body .laydate_box label{position:absolute; width:0; height:0; border-width:5px; border-style:dashed; border-color:transparent; overflow:hidden; cursor:pointer;}
+.laydate_body .laydate_box .laydate_yms, .laydate_body .laydate_box .laydate_time{display:none;}
+.laydate_body .laydate_box .laydate_show{display:block;}
+.laydate_body .laydate_box input{outline:0; font-size:14px; background-color:#fff;}
+.laydate_body .laydate_top{position:relative; height:26px; padding:5px; *width:100%; z-index:99;}
+.laydate_body .laydate_ym{position:relative; float:left; height:24px; cursor:pointer;}
+.laydate_body .laydate_ym input{float:left; height:24px; line-height:24px; text-align:center; border:none; cursor:pointer;}
+.laydate_body .laydate_ym .laydate_yms{position:absolute; left: -1px; top: 24px; height:181px;}
+.laydate_body .laydate_y{width:121px;}
+.laydate_body .laydate_y input{width:64px; margin-right:15px;}
+.laydate_body .laydate_y .laydate_yms{width:121px; text-align:center;}
+.laydate_body .laydate_y .laydate_yms a{position:relative; display:block; height:20px;}
+.laydate_body .laydate_y .laydate_yms ul{height:139px; padding:0; *overflow:hidden;}
+.laydate_body .laydate_y .laydate_yms ul li{float:left; width:60px; height:20px; line-height: 20px; text-overflow: ellipsis; overflow: hidden; white-space: nowrap;}
+.laydate_box *{box-sizing:content-box!important;}
+.laydate_body .laydate_m{width:99px;float: right;margin-right:-2px;}
+.laydate_body .laydate_m .laydate_yms{width:99px; padding:0;}
+.laydate_body .laydate_m input{width:42px; margin-right:15px;}
+.laydate_body .laydate_m .laydate_yms span{display:block; float:left; width:42px; margin: 5px 0 0 5px; line-height:24px; text-align:center; _display:inline;}
+.laydate_body .laydate_choose{display:block; float:left; position:relative; width:20px; height:24px;}
+.laydate_body .laydate_choose cite, .laydate_body .laydate_tab cite{left:50%; top:50%;}
+.laydate_body .laydate_chtop cite{margin:-7px 0 0 -5px; border-bottom-style:solid;}
+.laydate_body .laydate_chdown cite, .laydate_body .laydate_ym label{top:50%; margin:-2px 0 0 -5px; border-top-style:solid;}
+.laydate_body .laydate_chprev cite{margin:-5px 0 0 -7px;}
+.laydate_body .laydate_chnext cite{margin:-5px 0 0 -2px;}
+.laydate_body .laydate_ym label{right:28px;}
+.laydate_body .laydate_table{ width:230px; margin:0 5px; border-collapse:collapse; border-spacing:0px; }
+.laydate_body .laydate_table td{width:31px; height:19px; line-height:19px; text-align: center; cursor:pointer; font-size: 12px;}
+.laydate_body .laydate_table thead{height:22px; line-height:22px;}
+.laydate_body .laydate_table thead th{font-weight:400; font-size:12px; text-align:center;}
+.laydate_body .laydate_bottom{position:relative; height:22px; line-height:20px; padding:5px; font-size:12px;}
+.laydate_body .laydate_bottom #laydate_hms{position: relative; z-index: 1; float:left; }
+.laydate_body .laydate_time{ position:absolute; left:5px; bottom: 26px; width:129px; height:125px; *overflow:hidden;}
+.laydate_body .laydate_time .laydate_hmsno{ padding:5px 0 0 5px;}
+.laydate_body .laydate_time .laydate_hmsno span{display:block; float:left; width:24px; height:19px; line-height:19px; text-align:center; cursor:pointer; *margin-bottom:-5px;}
+.laydate_body .laydate_time1{width:228px; height:154px;}
+.laydate_body .laydate_time1 .laydate_hmsno{padding: 6px 0 0 8px;}
+.laydate_body .laydate_time1 .laydate_hmsno span{width:21px; height:20px; line-height:20px;}
+.laydate_body .laydate_msg{left:49px; bottom:67px; width:141px; height:auto; overflow: hidden;}
+.laydate_body .laydate_msg p{padding:5px 10px;}
+.laydate_body .laydate_bottom li{float:left; height:20px; line-height:20px; border-right:none; font-weight:900;}
+.laydate_body .laydate_bottom .laydate_sj{width:33px; text-align:center; font-weight:400;}
+.laydate_body .laydate_bottom input{float:left; width:21px; height:20px; line-height:20px; border:none; text-align:center; cursor:pointer; font-size:12px; font-weight:400;}
+.laydate_body .laydate_bottom .laydte_hsmtex{height:20px; line-height:20px; text-align:center;}
+.laydate_body .laydate_bottom .laydte_hsmtex span{position:absolute; width:20px; top:0; right:0px; cursor:pointer;}
+.laydate_body .laydate_bottom .laydte_hsmtex span:hover{font-size:14px;}
+.laydate_body .laydate_bottom .laydate_btn{position:absolute; right:5px; top:5px;}
+.laydate_body .laydate_bottom .laydate_btn a{float:left; height:20px; padding:0 6px; _padding:0 5px;}
+.laydate_body .laydate_bottom .laydate_v{position:absolute; left:10px; top:6px; font-family:Courier; z-index:0;}
+
diff --git a/management/guns-admin/src/main/webapp/static/js/plugins/layer/laydate/skins/default/icon.png b/management/guns-admin/src/main/webapp/static/js/plugins/layer/laydate/skins/default/icon.png
new file mode 100644
index 0000000..948660f
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/static/js/plugins/layer/laydate/skins/default/icon.png
Binary files differ
diff --git a/management/guns-admin/src/main/webapp/static/js/plugins/layer/laydate/skins/default/laydate.css b/management/guns-admin/src/main/webapp/static/js/plugins/layer/laydate/skins/default/laydate.css
new file mode 100644
index 0000000..a3ce4d4
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/static/js/plugins/layer/laydate/skins/default/laydate.css
@@ -0,0 +1,59 @@
+/**
+
+ @Name： laydate皮肤：墨绿
+ @Author：贤心
+ @Site：http://sentsin.com/layui/laydate
+
+**/
+
+.laydate-icon{border:1px solid #ccc; background-image:url(icon.png)}
+
+.laydate_body .laydate_bottom #laydate_hms,
+.laydate_body .laydate_time{border:1px solid #ccc;}
+
+.laydate_body .laydate_box,
+.laydate_body .laydate_ym .laydate_yms,
+.laydate_body .laydate_time{box-shadow: 2px 2px 5px rgba(0,0,0,.1);}
+
+.laydate_body .laydate_box{border-top:none; border-bottom:none; background-color:#fff; color:#00625A;}
+.laydate_body .laydate_box input{background:none!important; color:#fff;}
+.laydate_body .laydate_box .laydate_void{color:#00E8D7!important;}
+.laydate_body .laydate_box a, .laydate_body .laydate_box a:hover{color:#00625A;}
+.laydate_body .laydate_box a:hover{color:#666;}
+.laydate_body .laydate_click{background-color:#009F95!important; color:#fff!important;}
+.laydate_body .laydate_top{border-top:1px solid #009F95; background-color:#009F95}
+.laydate_body .laydate_ym{border:1px solid #009F95; background-color:#009F95;}
+.laydate_body .laydate_ym .laydate_yms{border:1px solid #009F95; background-color:#009F95; color:#fff;}
+.laydate_body .laydate_y .laydate_yms a{border-bottom:1px solid #009F95;}
+.laydate_body .laydate_y .laydate_yms .laydate_chdown{border-top:1px solid #009F95; border-bottom:none;}
+.laydate_body .laydate_choose{border-left:1px solid #009F95;}
+.laydate_body .laydate_chprev{border-left:none; border-right:1px solid #009F95;}
+.laydate_body .laydate_choose:hover,
+.laydate_body .laydate_y .laydate_yms a:hover{background-color:#00C1B3;}
+.laydate_body .laydate_chtop cite{border-bottom-color:#fff;}
+.laydate_body .laydate_chdown cite, .laydate_body .laydate_ym label{border-top-color:#fff;}
+.laydate_body .laydate_chprev cite{border-right-style:solid; border-right-color:#fff;}
+.laydate_body .laydate_chnext cite{border-left-style:solid; border-left-color:#fff;}
+.laydate_body .laydate_table{width: 240px!important; margin: 0!important; border:1px solid #ccc; border-top:none; border-bottom:none;}
+.laydate_body .laydate_table td{border:none; height:21px!important; line-height:21px!important; background-color:#fff; color:#00625A;}
+.laydate_body .laydate_table .laydate_nothis{color:#999;}
+.laydate_body .laydate_table thead{border-bottom:1px solid #ccc; height:21px!important; line-height:21px!important;}
+.laydate_body .laydate_table thead th{}
+.laydate_body .laydate_bottom{border:1px solid #ccc; border-top:none;}
+.laydate_body .laydate_bottom #laydate_hms{background-color:#fff;}
+.laydate_body .laydate_time{background-color:#fff;}
+.laydate_body .laydate_time1{width: 226px!important; height: 152px!important;}
+.laydate_body .laydate_bottom .laydate_sj{width:31px!important; border-right:1px solid #ccc; background-color:#fff;}
+.laydate_body .laydate_bottom input{background-color:#fff; color:#00625A;}
+.laydate_body .laydate_bottom .laydte_hsmtex{border-bottom:1px solid #ccc;}
+.laydate_body .laydate_bottom .laydate_btn{border-right:1px solid #ccc;}
+.laydate_body .laydate_bottom .laydate_v{color:#999}
+.laydate_body .laydate_bottom .laydate_btn a{border: 1px solid #ccc; border-right:none; background-color:#fff;}
+.laydate_body .laydate_bottom .laydate_btn a:hover{background-color:#F6F6F6; color:#00625A;}
+
+.laydate_body .laydate_m .laydate_yms span:hover,
+.laydate_body .laydate_time .laydate_hmsno span:hover,
+.laydate_body .laydate_y .laydate_yms ul li:hover,
+.laydate_body .laydate_table td:hover{background-color:#00C1B3; color:#fff;}
+
+
diff --git a/management/guns-admin/src/main/webapp/static/js/plugins/layer/layer.js b/management/guns-admin/src/main/webapp/static/js/plugins/layer/layer.js
new file mode 100644
index 0000000..12cb6b5
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/static/js/plugins/layer/layer.js
@@ -0,0 +1,2 @@
+/*! layer-v3.1.1 Web弹层组件 MIT License http://layer.layui.com/ By 贤心 */
+ ;!function(e,t){"use strict";var i,n,a=e.layui&&layui.define,o={getPath:function(){var e=document.currentScript?document.currentScript.src:function(){for(var e,t=document.scripts,i=t.length-1,n=i;n>0;n--)if("interactive"===t[n].readyState){e=t[n].src;break}return e||t[i].src}();return e.substring(0,e.lastIndexOf("/")+1)}(),config:{},end:{},minIndex:0,minLeft:[],btn:["确定","取消"],type:["dialog","page","iframe","loading","tips"],getStyle:function(t,i){var n=t.currentStyle?t.currentStyle:e.getComputedStyle(t,null);return n[n.getPropertyValue?"getPropertyValue":"getAttribute"](i)},link:function(t,i,n){if(r.path){var a=document.getElementsByTagName("head")[0],s=document.createElement("link");"string"==typeof i&&(n=i);var l=(n||t).replace(/\.|\//g,""),f="layuicss-"+l,c=0;s.rel="stylesheet",s.href=r.path+t,s.id=f,document.getElementById(f)||a.appendChild(s),"function"==typeof i&&!function u(){return++c>80?e.console&&console.error("layer.css: Invalid"):void(1989===parseInt(o.getStyle(document.getElementById(f),"width"))?i():setTimeout(u,100))}()}}},r={v:"3.1.1",ie:function(){var t=navigator.userAgent.toLowerCase();return!!(e.ActiveXObject||"ActiveXObject"in e)&&((t.match(/msie\s(\d+)/)||[])[1]||"11")}(),index:e.layer&&e.layer.v?1e5:0,path:o.getPath,config:function(e,t){return e=e||{},r.cache=o.config=i.extend({},o.config,e),r.path=o.config.path||r.path,"string"==typeof e.extend&&(e.extend=[e.extend]),o.config.path&&r.ready(),e.extend?(a?layui.addcss("modules/layer/"+e.extend):o.link("theme/"+e.extend),this):this},ready:function(e){var t="layer",i="",n=(a?"modules/layer/":"theme/")+"default/layer.css?v="+r.v+i;return a?layui.addcss(n,e,t):o.link(n,e,t),this},alert:function(e,t,n){var a="function"==typeof t;return a&&(n=t),r.open(i.extend({content:e,yes:n},a?{}:t))},confirm:function(e,t,n,a){var s="function"==typeof t;return s&&(a=n,n=t),r.open(i.extend({content:e,btn:o.btn,yes:n,btn2:a},s?{}:t))},msg:function(e,n,a){var s="function"==typeof n,f=o.config.skin,c=(f?f+" "+f+"-msg":"")||"layui-layer-msg",u=l.anim.length-1;return s&&(a=n),r.open(i.extend({content:e,time:3e3,shade:!1,skin:c,title:!1,closeBtn:!1,btn:!1,resize:!1,end:a},s&&!o.config.skin?{skin:c+" layui-layer-hui",anim:u}:function(){return n=n||{},(n.icon===-1||n.icon===t&&!o.config.skin)&&(n.skin=c+" "+(n.skin||"layui-layer-hui")),n}()))},load:function(e,t){return r.open(i.extend({type:3,icon:e||0,resize:!1,shade:.01},t))},tips:function(e,t,n){return r.open(i.extend({type:4,content:[e,t],closeBtn:!1,time:3e3,shade:!1,resize:!1,fixed:!1,maxWidth:210},n))}},s=function(e){var t=this;t.index=++r.index,t.config=i.extend({},t.config,o.config,e),document.body?t.creat():setTimeout(function(){t.creat()},30)};s.pt=s.prototype;var l=["layui-layer",".layui-layer-title",".layui-layer-main",".layui-layer-dialog","layui-layer-iframe","layui-layer-content","layui-layer-btn","layui-layer-close"];l.anim=["layer-anim-00","layer-anim-01","layer-anim-02","layer-anim-03","layer-anim-04","layer-anim-05","layer-anim-06"],s.pt.config={type:0,shade:.3,fixed:!0,move:l[1],title:"信息",offset:"auto",area:"auto",closeBtn:1,time:0,zIndex:19891014,maxWidth:360,anim:0,isOutAnim:!0,icon:-1,moveType:1,resize:!0,scrollbar:!0,tips:2},s.pt.vessel=function(e,t){var n=this,a=n.index,r=n.config,s=r.zIndex+a,f="object"==typeof r.title,c=r.maxmin&&(1===r.type||2===r.type),u=r.title?'<div class="layui-layer-title" style="'+(f?r.title[1]:"")+'">'+(f?r.title[0]:r.title)+"</div>":"";return r.zIndex=s,t([r.shade?'<div class="layui-layer-shade" id="layui-layer-shade'+a+'" times="'+a+'" style="'+("z-index:"+(s-1)+"; ")+'"></div>':"",'<div class="'+l[0]+(" layui-layer-"+o.type[r.type])+(0!=r.type&&2!=r.type||r.shade?"":" layui-layer-border")+" "+(r.skin||"")+'" id="'+l[0]+a+'" type="'+o.type[r.type]+'" times="'+a+'" showtime="'+r.time+'" conType="'+(e?"object":"string")+'" style="z-index: '+s+"; width:"+r.area[0]+";height:"+r.area[1]+(r.fixed?"":";position:absolute;")+'">'+(e&&2!=r.type?"":u)+'<div id="'+(r.id||"")+'" class="layui-layer-content'+(0==r.type&&r.icon!==-1?" layui-layer-padding":"")+(3==r.type?" layui-layer-loading"+r.icon:"")+'">'+(0==r.type&&r.icon!==-1?'<i class="layui-layer-ico layui-layer-ico'+r.icon+'"></i>':"")+(1==r.type&&e?"":r.content||"")+'</div><span class="layui-layer-setwin">'+function(){var e=c?'<a class="layui-layer-min" href="javascript:;"><cite></cite></a><a class="layui-layer-ico layui-layer-max" href="javascript:;"></a>':"";return r.closeBtn&&(e+='<a class="layui-layer-ico '+l[7]+" "+l[7]+(r.title?r.closeBtn:4==r.type?"1":"2")+'" href="javascript:;"></a>'),e}()+"</span>"+(r.btn?function(){var e="";"string"==typeof r.btn&&(r.btn=[r.btn]);for(var t=0,i=r.btn.length;t<i;t++)e+='<a class="'+l[6]+t+'">'+r.btn[t]+"</a>";return'<div class="'+l[6]+" layui-layer-btn-"+(r.btnAlign||"")+'">'+e+"</div>"}():"")+(r.resize?'<span class="layui-layer-resize"></span>':"")+"</div>"],u,i('<div class="layui-layer-move"></div>')),n},s.pt.creat=function(){var e=this,t=e.config,a=e.index,s=t.content,f="object"==typeof s,c=i("body");if(!t.id||!i("#"+t.id)[0]){switch("string"==typeof t.area&&(t.area="auto"===t.area?["",""]:[t.area,""]),t.shift&&(t.anim=t.shift),6==r.ie&&(t.fixed=!1),t.type){case 0:t.btn="btn"in t?t.btn:o.btn[0],r.closeAll("dialog");break;case 2:var s=t.content=f?t.content:[t.content||"http://layer.layui.com","auto"];t.content='<iframe scrolling="'+(t.content[1]||"auto")+'" allowtransparency="true" id="'+l[4]+a+'" name="'+l[4]+a+'" onload="this.className=\'\';" class="layui-layer-load" frameborder="0" src="'+t.content[0]+'"></iframe>';break;case 3:delete t.title,delete t.closeBtn,t.icon===-1&&0===t.icon,r.closeAll("loading");break;case 4:f||(t.content=[t.content,"body"]),t.follow=t.content[1],t.content=t.content[0]+'<i class="layui-layer-TipsG"></i>',delete t.title,t.tips="object"==typeof t.tips?t.tips:[t.tips,!0],t.tipsMore||r.closeAll("tips")}if(e.vessel(f,function(n,r,u){c.append(n[0]),f?function(){2==t.type||4==t.type?function(){i("body").append(n[1])}():function(){s.parents("."+l[0])[0]||(s.data("display",s.css("display")).show().addClass("layui-layer-wrap").wrap(n[1]),i("#"+l[0]+a).find("."+l[5]).before(r))}()}():c.append(n[1]),i(".layui-layer-move")[0]||c.append(o.moveElem=u),e.layero=i("#"+l[0]+a),t.scrollbar||l.html.css("overflow","hidden").attr("layer-full",a)}).auto(a),i("#layui-layer-shade"+e.index).css({"background-color":t.shade[1]||"#000",opacity:t.shade[0]||t.shade}),2==t.type&&6==r.ie&&e.layero.find("iframe").attr("src",s[0]),4==t.type?e.tips():e.offset(),t.fixed&&n.on("resize",function(){e.offset(),(/^\d+%$/.test(t.area[0])||/^\d+%$/.test(t.area[1]))&&e.auto(a),4==t.type&&e.tips()}),t.time<=0||setTimeout(function(){r.close(e.index)},t.time),e.move().callback(),l.anim[t.anim]){var u="layer-anim "+l.anim[t.anim];e.layero.addClass(u).one("webkitAnimationEnd mozAnimationEnd MSAnimationEnd oanimationend animationend",function(){i(this).removeClass(u)})}t.isOutAnim&&e.layero.data("isOutAnim",!0)}},s.pt.auto=function(e){var t=this,a=t.config,o=i("#"+l[0]+e);""===a.area[0]&&a.maxWidth>0&&(r.ie&&r.ie<8&&a.btn&&o.width(o.innerWidth()),o.outerWidth()>a.maxWidth&&o.width(a.maxWidth));var s=[o.innerWidth(),o.innerHeight()],f=o.find(l[1]).outerHeight()||0,c=o.find("."+l[6]).outerHeight()||0,u=function(e){e=o.find(e),e.height(s[1]-f-c-2*(0|parseFloat(e.css("padding-top"))))};switch(a.type){case 2:u("iframe");break;default:""===a.area[1]?a.maxHeight>0&&o.outerHeight()>a.maxHeight?(s[1]=a.maxHeight,u("."+l[5])):a.fixed&&s[1]>=n.height()&&(s[1]=n.height(),u("."+l[5])):u("."+l[5])}return t},s.pt.offset=function(){var e=this,t=e.config,i=e.layero,a=[i.outerWidth(),i.outerHeight()],o="object"==typeof t.offset;e.offsetTop=(n.height()-a[1])/2,e.offsetLeft=(n.width()-a[0])/2,o?(e.offsetTop=t.offset[0],e.offsetLeft=t.offset[1]||e.offsetLeft):"auto"!==t.offset&&("t"===t.offset?e.offsetTop=0:"r"===t.offset?e.offsetLeft=n.width()-a[0]:"b"===t.offset?e.offsetTop=n.height()-a[1]:"l"===t.offset?e.offsetLeft=0:"lt"===t.offset?(e.offsetTop=0,e.offsetLeft=0):"lb"===t.offset?(e.offsetTop=n.height()-a[1],e.offsetLeft=0):"rt"===t.offset?(e.offsetTop=0,e.offsetLeft=n.width()-a[0]):"rb"===t.offset?(e.offsetTop=n.height()-a[1],e.offsetLeft=n.width()-a[0]):e.offsetTop=t.offset),t.fixed||(e.offsetTop=/%$/.test(e.offsetTop)?n.height()*parseFloat(e.offsetTop)/100:parseFloat(e.offsetTop),e.offsetLeft=/%$/.test(e.offsetLeft)?n.width()*parseFloat(e.offsetLeft)/100:parseFloat(e.offsetLeft),e.offsetTop+=n.scrollTop(),e.offsetLeft+=n.scrollLeft()),i.attr("minLeft")&&(e.offsetTop=n.height()-(i.find(l[1]).outerHeight()||0),e.offsetLeft=i.css("left")),i.css({top:e.offsetTop,left:e.offsetLeft})},s.pt.tips=function(){var e=this,t=e.config,a=e.layero,o=[a.outerWidth(),a.outerHeight()],r=i(t.follow);r[0]||(r=i("body"));var s={width:r.outerWidth(),height:r.outerHeight(),top:r.offset().top,left:r.offset().left},f=a.find(".layui-layer-TipsG"),c=t.tips[0];t.tips[1]||f.remove(),s.autoLeft=function(){s.left+o[0]-n.width()>0?(s.tipLeft=s.left+s.width-o[0],f.css({right:12,left:"auto"})):s.tipLeft=s.left},s.where=[function(){s.autoLeft(),s.tipTop=s.top-o[1]-10,f.removeClass("layui-layer-TipsB").addClass("layui-layer-TipsT").css("border-right-color",t.tips[1])},function(){s.tipLeft=s.left+s.width+10,s.tipTop=s.top,f.removeClass("layui-layer-TipsL").addClass("layui-layer-TipsR").css("border-bottom-color",t.tips[1])},function(){s.autoLeft(),s.tipTop=s.top+s.height+10,f.removeClass("layui-layer-TipsT").addClass("layui-layer-TipsB").css("border-right-color",t.tips[1])},function(){s.tipLeft=s.left-o[0]-10,s.tipTop=s.top,f.removeClass("layui-layer-TipsR").addClass("layui-layer-TipsL").css("border-bottom-color",t.tips[1])}],s.where[c-1](),1===c?s.top-(n.scrollTop()+o[1]+16)<0&&s.where[2]():2===c?n.width()-(s.left+s.width+o[0]+16)>0||s.where[3]():3===c?s.top-n.scrollTop()+s.height+o[1]+16-n.height()>0&&s.where[0]():4===c&&o[0]+16-s.left>0&&s.where[1](),a.find("."+l[5]).css({"background-color":t.tips[1],"padding-right":t.closeBtn?"30px":""}),a.css({left:s.tipLeft-(t.fixed?n.scrollLeft():0),top:s.tipTop-(t.fixed?n.scrollTop():0)})},s.pt.move=function(){var e=this,t=e.config,a=i(document),s=e.layero,l=s.find(t.move),f=s.find(".layui-layer-resize"),c={};return t.move&&l.css("cursor","move"),l.on("mousedown",function(e){e.preventDefault(),t.move&&(c.moveStart=!0,c.offset=[e.clientX-parseFloat(s.css("left")),e.clientY-parseFloat(s.css("top"))],o.moveElem.css("cursor","move").show())}),f.on("mousedown",function(e){e.preventDefault(),c.resizeStart=!0,c.offset=[e.clientX,e.clientY],c.area=[s.outerWidth(),s.outerHeight()],o.moveElem.css("cursor","se-resize").show()}),a.on("mousemove",function(i){if(c.moveStart){var a=i.clientX-c.offset[0],o=i.clientY-c.offset[1],l="fixed"===s.css("position");if(i.preventDefault(),c.stX=l?0:n.scrollLeft(),c.stY=l?0:n.scrollTop(),!t.moveOut){var f=n.width()-s.outerWidth()+c.stX,u=n.height()-s.outerHeight()+c.stY;a<c.stX&&(a=c.stX),a>f&&(a=f),o<c.stY&&(o=c.stY),o>u&&(o=u)}s.css({left:a,top:o})}if(t.resize&&c.resizeStart){var a=i.clientX-c.offset[0],o=i.clientY-c.offset[1];i.preventDefault(),r.style(e.index,{width:c.area[0]+a,height:c.area[1]+o}),c.isResize=!0,t.resizing&&t.resizing(s)}}).on("mouseup",function(e){c.moveStart&&(delete c.moveStart,o.moveElem.hide(),t.moveEnd&&t.moveEnd(s)),c.resizeStart&&(delete c.resizeStart,o.moveElem.hide())}),e},s.pt.callback=function(){function e(){var e=a.cancel&&a.cancel(t.index,n);e===!1||r.close(t.index)}var t=this,n=t.layero,a=t.config;t.openLayer(),a.success&&(2==a.type?n.find("iframe").on("load",function(){a.success(n,t.index)}):a.success(n,t.index)),6==r.ie&&t.IE6(n),n.find("."+l[6]).children("a").on("click",function(){var e=i(this).index();if(0===e)a.yes?a.yes(t.index,n):a.btn1?a.btn1(t.index,n):r.close(t.index);else{var o=a["btn"+(e+1)]&&a["btn"+(e+1)](t.index,n);o===!1||r.close(t.index)}}),n.find("."+l[7]).on("click",e),a.shadeClose&&i("#layui-layer-shade"+t.index).on("click",function(){r.close(t.index)}),n.find(".layui-layer-min").on("click",function(){var e=a.min&&a.min(n);e===!1||r.min(t.index,a)}),n.find(".layui-layer-max").on("click",function(){i(this).hasClass("layui-layer-maxmin")?(r.restore(t.index),a.restore&&a.restore(n)):(r.full(t.index,a),setTimeout(function(){a.full&&a.full(n)},100))}),a.end&&(o.end[t.index]=a.end)},o.reselect=function(){i.each(i("select"),function(e,t){var n=i(this);n.parents("."+l[0])[0]||1==n.attr("layer")&&i("."+l[0]).length<1&&n.removeAttr("layer").show(),n=null})},s.pt.IE6=function(e){i("select").each(function(e,t){var n=i(this);n.parents("."+l[0])[0]||"none"===n.css("display")||n.attr({layer:"1"}).hide(),n=null})},s.pt.openLayer=function(){var e=this;r.zIndex=e.config.zIndex,r.setTop=function(e){var t=function(){r.zIndex++,e.css("z-index",r.zIndex+1)};return r.zIndex=parseInt(e[0].style.zIndex),e.on("mousedown",t),r.zIndex}},o.record=function(e){var t=[e.width(),e.height(),e.position().top,e.position().left+parseFloat(e.css("margin-left"))];e.find(".layui-layer-max").addClass("layui-layer-maxmin"),e.attr({area:t})},o.rescollbar=function(e){l.html.attr("layer-full")==e&&(l.html[0].style.removeProperty?l.html[0].style.removeProperty("overflow"):l.html[0].style.removeAttribute("overflow"),l.html.removeAttr("layer-full"))},e.layer=r,r.getChildFrame=function(e,t){return t=t||i("."+l[4]).attr("times"),i("#"+l[0]+t).find("iframe").contents().find(e)},r.getFrameIndex=function(e){return i("#"+e).parents("."+l[4]).attr("times")},r.iframeAuto=function(e){if(e){var t=r.getChildFrame("html",e).outerHeight(),n=i("#"+l[0]+e),a=n.find(l[1]).outerHeight()||0,o=n.find("."+l[6]).outerHeight()||0;n.css({height:t+a+o}),n.find("iframe").css({height:t})}},r.iframeSrc=function(e,t){i("#"+l[0]+e).find("iframe").attr("src",t)},r.style=function(e,t,n){var a=i("#"+l[0]+e),r=a.find(".layui-layer-content"),s=a.attr("type"),f=a.find(l[1]).outerHeight()||0,c=a.find("."+l[6]).outerHeight()||0;a.attr("minLeft");s!==o.type[3]&&s!==o.type[4]&&(n||(parseFloat(t.width)<=260&&(t.width=260),parseFloat(t.height)-f-c<=64&&(t.height=64+f+c)),a.css(t),c=a.find("."+l[6]).outerHeight(),s===o.type[2]?a.find("iframe").css({height:parseFloat(t.height)-f-c}):r.css({height:parseFloat(t.height)-f-c-parseFloat(r.css("padding-top"))-parseFloat(r.css("padding-bottom"))}))},r.min=function(e,t){var a=i("#"+l[0]+e),s=a.find(l[1]).outerHeight()||0,f=a.attr("minLeft")||181*o.minIndex+"px",c=a.css("position");o.record(a),o.minLeft[0]&&(f=o.minLeft[0],o.minLeft.shift()),a.attr("position",c),r.style(e,{width:180,height:s,left:f,top:n.height()-s,position:"fixed",overflow:"hidden"},!0),a.find(".layui-layer-min").hide(),"page"===a.attr("type")&&a.find(l[4]).hide(),o.rescollbar(e),a.attr("minLeft")||o.minIndex++,a.attr("minLeft",f)},r.restore=function(e){var t=i("#"+l[0]+e),n=t.attr("area").split(",");t.attr("type");r.style(e,{width:parseFloat(n[0]),height:parseFloat(n[1]),top:parseFloat(n[2]),left:parseFloat(n[3]),position:t.attr("position"),overflow:"visible"},!0),t.find(".layui-layer-max").removeClass("layui-layer-maxmin"),t.find(".layui-layer-min").show(),"page"===t.attr("type")&&t.find(l[4]).show(),o.rescollbar(e)},r.full=function(e){var t,a=i("#"+l[0]+e);o.record(a),l.html.attr("layer-full")||l.html.css("overflow","hidden").attr("layer-full",e),clearTimeout(t),t=setTimeout(function(){var t="fixed"===a.css("position");r.style(e,{top:t?0:n.scrollTop(),left:t?0:n.scrollLeft(),width:n.width(),height:n.height()},!0),a.find(".layui-layer-min").hide()},100)},r.title=function(e,t){var n=i("#"+l[0]+(t||r.index)).find(l[1]);n.html(e)},r.close=function(e){var t=i("#"+l[0]+e),n=t.attr("type"),a="layer-anim-close";if(t[0]){var s="layui-layer-wrap",f=function(){if(n===o.type[1]&&"object"===t.attr("conType")){t.children(":not(."+l[5]+")").remove();for(var a=t.find("."+s),r=0;r<2;r++)a.unwrap();a.css("display",a.data("display")).removeClass(s)}else{if(n===o.type[2])try{var f=i("#"+l[4]+e)[0];f.contentWindow.document.write(""),f.contentWindow.close(),t.find("."+l[5])[0].removeChild(f)}catch(c){}t[0].innerHTML="",t.remove()}"function"==typeof o.end[e]&&o.end[e](),delete o.end[e]};t.data("isOutAnim")&&t.addClass("layer-anim "+a),i("#layui-layer-moves, #layui-layer-shade"+e).remove(),6==r.ie&&o.reselect(),o.rescollbar(e),t.attr("minLeft")&&(o.minIndex--,o.minLeft.push(t.attr("minLeft"))),r.ie&&r.ie<10||!t.data("isOutAnim")?f():setTimeout(function(){f()},200)}},r.closeAll=function(e){i.each(i("."+l[0]),function(){var t=i(this),n=e?t.attr("type")===e:1;n&&r.close(t.attr("times")),n=null})};var f=r.cache||{},c=function(e){return f.skin?" "+f.skin+" "+f.skin+"-"+e:""};r.prompt=function(e,t){var a="";if(e=e||{},"function"==typeof e&&(t=e),e.area){var o=e.area;a='style="width: '+o[0]+"; height: "+o[1]+';"',delete e.area}var s,l=2==e.formType?'<textarea class="layui-layer-input"'+a+">"+(e.value||"")+"</textarea>":function(){return'<input type="'+(1==e.formType?"password":"text")+'" class="layui-layer-input" value="'+(e.value||"")+'">'}(),f=e.success;return delete e.success,r.open(i.extend({type:1,btn:["确定","取消"],content:l,skin:"layui-layer-prompt"+c("prompt"),maxWidth:n.width(),success:function(e){s=e.find(".layui-layer-input"),s.focus(),"function"==typeof f&&f(e)},resize:!1,yes:function(i){var n=s.val();""===n?s.focus():n.length>(e.maxlength||500)?r.tips("最多输入"+(e.maxlength||500)+"个字数",s,{tips:1}):t&&t(n,i,s)}},e))},r.tab=function(e){e=e||{};var t=e.tab||{},n="layui-this",a=e.success;return delete e.success,r.open(i.extend({type:1,skin:"layui-layer-tab"+c("tab"),resize:!1,title:function(){var e=t.length,i=1,a="";if(e>0)for(a='<span class="'+n+'">'+t[0].title+"</span>";i<e;i++)a+="<span>"+t[i].title+"</span>";return a}(),content:'<ul class="layui-layer-tabmain">'+function(){var e=t.length,i=1,a="";if(e>0)for(a='<li class="layui-layer-tabli '+n+'">'+(t[0].content||"no content")+"</li>";i<e;i++)a+='<li class="layui-layer-tabli">'+(t[i].content||"no content")+"</li>";return a}()+"</ul>",success:function(t){var o=t.find(".layui-layer-title").children(),r=t.find(".layui-layer-tabmain").children();o.on("mousedown",function(t){t.stopPropagation?t.stopPropagation():t.cancelBubble=!0;var a=i(this),o=a.index();a.addClass(n).siblings().removeClass(n),r.eq(o).show().siblings().hide(),"function"==typeof e.change&&e.change(o)}),"function"==typeof a&&a(t)}},e))},r.photos=function(t,n,a){function o(e,t,i){var n=new Image;return n.src=e,n.complete?t(n):(n.onload=function(){n.onload=null,t(n)},void(n.onerror=function(e){n.onerror=null,i(e)}))}var s={};if(t=t||{},t.photos){var l=t.photos.constructor===Object,f=l?t.photos:{},u=f.data||[],d=f.start||0;s.imgIndex=(0|d)+1,t.img=t.img||"img";var y=t.success;if(delete t.success,l){if(0===u.length)return r.msg("没有图片")}else{var p=i(t.photos),h=function(){u=[],p.find(t.img).each(function(e){var t=i(this);t.attr("layer-index",e),u.push({alt:t.attr("alt"),pid:t.attr("layer-pid"),src:t.attr("layer-src")||t.attr("src"),thumb:t.attr("src")})})};if(h(),0===u.length)return;if(n||p.on("click",t.img,function(){var e=i(this),n=e.attr("layer-index");r.photos(i.extend(t,{photos:{start:n,data:u,tab:t.tab},full:t.full}),!0),h()}),!n)return}s.imgprev=function(e){s.imgIndex--,s.imgIndex<1&&(s.imgIndex=u.length),s.tabimg(e)},s.imgnext=function(e,t){s.imgIndex++,s.imgIndex>u.length&&(s.imgIndex=1,t)||s.tabimg(e)},s.keyup=function(e){if(!s.end){var t=e.keyCode;e.preventDefault(),37===t?s.imgprev(!0):39===t?s.imgnext(!0):27===t&&r.close(s.index)}},s.tabimg=function(e){if(!(u.length<=1))return f.start=s.imgIndex-1,r.close(s.index),r.photos(t,!0,e)},s.event=function(){s.bigimg.hover(function(){s.imgsee.show()},function(){s.imgsee.hide()}),s.bigimg.find(".layui-layer-imgprev").on("click",function(e){e.preventDefault(),s.imgprev()}),s.bigimg.find(".layui-layer-imgnext").on("click",function(e){e.preventDefault(),s.imgnext()}),i(document).on("keyup",s.keyup)},s.loadi=r.load(1,{shade:!("shade"in t)&&.9,scrollbar:!1}),o(u[d].src,function(n){r.close(s.loadi),s.index=r.open(i.extend({type:1,id:"layui-layer-photos",area:function(){var a=[n.width,n.height],o=[i(e).width()-100,i(e).height()-100];if(!t.full&&(a[0]>o[0]||a[1]>o[1])){var r=[a[0]/o[0],a[1]/o[1]];r[0]>r[1]?(a[0]=a[0]/r[0],a[1]=a[1]/r[0]):r[0]<r[1]&&(a[0]=a[0]/r[1],a[1]=a[1]/r[1])}return[a[0]+"px",a[1]+"px"]}(),title:!1,shade:.9,shadeClose:!0,closeBtn:!1,move:".layui-layer-phimg img",moveType:1,scrollbar:!1,moveOut:!0,isOutAnim:!1,skin:"layui-layer-photos"+c("photos"),content:'<div class="layui-layer-phimg"><img src="'+u[d].src+'" alt="'+(u[d].alt||"")+'" layer-pid="'+u[d].pid+'"><div class="layui-layer-imgsee">'+(u.length>1?'<span class="layui-layer-imguide"><a href="javascript:;" class="layui-layer-iconext layui-layer-imgprev"></a><a href="javascript:;" class="layui-layer-iconext layui-layer-imgnext"></a></span>':"")+'<div class="layui-layer-imgbar" style="display:'+(a?"block":"")+'"><span class="layui-layer-imgtit"><a href="javascript:;">'+(u[d].alt||"")+"</a><em>"+s.imgIndex+"/"+u.length+"</em></span></div></div></div>",success:function(e,i){s.bigimg=e.find(".layui-layer-phimg"),s.imgsee=e.find(".layui-layer-imguide,.layui-layer-imgbar"),s.event(e),t.tab&&t.tab(u[d],e),"function"==typeof y&&y(e)},end:function(){s.end=!0,i(document).off("keyup",s.keyup)}},t))},function(){r.close(s.loadi),r.msg("当前图片地址异常<br>是否继续查看下一张？",{time:3e4,btn:["下一张","不看了"],yes:function(){u.length>1&&s.imgnext(!0,!0)}})})}},o.run=function(t){i=t,n=i(e),l.html=i("html"),r.open=function(e){var t=new s(e);return t.index}},e.layui&&layui.define?(r.ready(),layui.define("jquery",function(t){r.path=layui.cache.dir,o.run(layui.$),e.layer=r,t("layer",r)})):"function"==typeof define&&define.amd?define(["jquery"],function(){return o.run(e.jQuery),r}):function(){o.run(e.jQuery),r.ready()}()}(window);
\ No newline at end of file
diff --git a/management/guns-admin/src/main/webapp/static/js/plugins/layer/layer.min.js b/management/guns-admin/src/main/webapp/static/js/plugins/layer/layer.min.js
new file mode 100644
index 0000000..e70ee77
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/static/js/plugins/layer/layer.min.js
@@ -0,0 +1,2 @@
+/*! layer-v3.1.0 Web弹层组件 MIT License http://layer.layui.com/ By 贤心 */
+ ;!function(e,t){"use strict";var i,n,a=e.layui&&layui.define,o={getPath:function(){var e=document.scripts,t=e[e.length-1],i=t.src;if(!t.getAttribute("merge"))return i.substring(0,i.lastIndexOf("/")+1)}(),config:{},end:{},minIndex:0,minLeft:[],btn:["确定","取消"],type:["dialog","page","iframe","loading","tips"],getStyle:function(t,i){var n=t.currentStyle?t.currentStyle:e.getComputedStyle(t,null);return n[n.getPropertyValue?"getPropertyValue":"getAttribute"](i)},link:function(t,i,n){if(r.path){var a=document.getElementsByTagName("head")[0],s=document.createElement("link");"string"==typeof i&&(n=i);var l=(n||t).replace(/\.|\//g,""),f="layuicss-"+l,c=0;s.rel="stylesheet",s.href=r.path+t,s.id=f,document.getElementById(f)||a.appendChild(s),"function"==typeof i&&!function u(){return++c>80?e.console&&console.error("layer.css: Invalid"):void(1989===parseInt(o.getStyle(document.getElementById(f),"width"))?i():setTimeout(u,100))}()}}},r={v:"3.1.0",ie:function(){var t=navigator.userAgent.toLowerCase();return!!(e.ActiveXObject||"ActiveXObject"in e)&&((t.match(/msie\s(\d+)/)||[])[1]||"11")}(),index:e.layer&&e.layer.v?1e5:0,path:o.getPath,config:function(e,t){return e=e||{},r.cache=o.config=i.extend({},o.config,e),r.path=o.config.path||r.path,"string"==typeof e.extend&&(e.extend=[e.extend]),o.config.path&&r.ready(),e.extend?(a?layui.addcss("modules/layer/"+e.extend):o.link("theme/"+e.extend),this):this},ready:function(e){var t="layer",i="",n=(a?"modules/layer/":"theme/")+"default/layer.css?v="+r.v+i;return a?layui.addcss(n,e,t):o.link(n,e,t),this},alert:function(e,t,n){var a="function"==typeof t;return a&&(n=t),r.open(i.extend({content:e,yes:n},a?{}:t))},confirm:function(e,t,n,a){var s="function"==typeof t;return s&&(a=n,n=t),r.open(i.extend({content:e,btn:o.btn,yes:n,btn2:a},s?{}:t))},msg:function(e,n,a){var s="function"==typeof n,f=o.config.skin,c=(f?f+" "+f+"-msg":"")||"layui-layer-msg",u=l.anim.length-1;return s&&(a=n),r.open(i.extend({content:e,time:3e3,shade:!1,skin:c,title:!1,closeBtn:!1,btn:!1,resize:!1,end:a},s&&!o.config.skin?{skin:c+" layui-layer-hui",anim:u}:function(){return n=n||{},(n.icon===-1||n.icon===t&&!o.config.skin)&&(n.skin=c+" "+(n.skin||"layui-layer-hui")),n}()))},load:function(e,t){return r.open(i.extend({type:3,icon:e||0,resize:!1,shade:.01},t))},tips:function(e,t,n){return r.open(i.extend({type:4,content:[e,t],closeBtn:!1,time:3e3,shade:!1,resize:!1,fixed:!1,maxWidth:210},n))}},s=function(e){var t=this;t.index=++r.index,t.config=i.extend({},t.config,o.config,e),document.body?t.creat():setTimeout(function(){t.creat()},30)};s.pt=s.prototype;var l=["layui-layer",".layui-layer-title",".layui-layer-main",".layui-layer-dialog","layui-layer-iframe","layui-layer-content","layui-layer-btn","layui-layer-close"];l.anim=["layer-anim-00","layer-anim-01","layer-anim-02","layer-anim-03","layer-anim-04","layer-anim-05","layer-anim-06"],s.pt.config={type:0,shade:.3,fixed:!0,move:l[1],title:"信息",offset:"auto",area:"auto",closeBtn:1,time:0,zIndex:19891014,maxWidth:360,anim:0,isOutAnim:!0,icon:-1,moveType:1,resize:!0,scrollbar:!0,tips:2},s.pt.vessel=function(e,t){var n=this,a=n.index,r=n.config,s=r.zIndex+a,f="object"==typeof r.title,c=r.maxmin&&(1===r.type||2===r.type),u=r.title?'<div class="layui-layer-title" style="'+(f?r.title[1]:"")+'">'+(f?r.title[0]:r.title)+"</div>":"";return r.zIndex=s,t([r.shade?'<div class="layui-layer-shade" id="layui-layer-shade'+a+'" times="'+a+'" style="'+("z-index:"+(s-1)+"; ")+'"></div>':"",'<div class="'+l[0]+(" layui-layer-"+o.type[r.type])+(0!=r.type&&2!=r.type||r.shade?"":" layui-layer-border")+" "+(r.skin||"")+'" id="'+l[0]+a+'" type="'+o.type[r.type]+'" times="'+a+'" showtime="'+r.time+'" conType="'+(e?"object":"string")+'" style="z-index: '+s+"; width:"+r.area[0]+";height:"+r.area[1]+(r.fixed?"":";position:absolute;")+'">'+(e&&2!=r.type?"":u)+'<div id="'+(r.id||"")+'" class="layui-layer-content'+(0==r.type&&r.icon!==-1?" layui-layer-padding":"")+(3==r.type?" layui-layer-loading"+r.icon:"")+'">'+(0==r.type&&r.icon!==-1?'<i class="layui-layer-ico layui-layer-ico'+r.icon+'"></i>':"")+(1==r.type&&e?"":r.content||"")+'</div><span class="layui-layer-setwin">'+function(){var e=c?'<a class="layui-layer-min" href="javascript:;"><cite></cite></a><a class="layui-layer-ico layui-layer-max" href="javascript:;"></a>':"";return r.closeBtn&&(e+='<a class="layui-layer-ico '+l[7]+" "+l[7]+(r.title?r.closeBtn:4==r.type?"1":"2")+'" href="javascript:;"></a>'),e}()+"</span>"+(r.btn?function(){var e="";"string"==typeof r.btn&&(r.btn=[r.btn]);for(var t=0,i=r.btn.length;t<i;t++)e+='<a class="'+l[6]+t+'">'+r.btn[t]+"</a>";return'<div class="'+l[6]+" layui-layer-btn-"+(r.btnAlign||"")+'">'+e+"</div>"}():"")+(r.resize?'<span class="layui-layer-resize"></span>':"")+"</div>"],u,i('<div class="layui-layer-move"></div>')),n},s.pt.creat=function(){var e=this,t=e.config,a=e.index,s=t.content,f="object"==typeof s,c=i("body");if(!t.id||!i("#"+t.id)[0]){switch("string"==typeof t.area&&(t.area="auto"===t.area?["",""]:[t.area,""]),t.shift&&(t.anim=t.shift),6==r.ie&&(t.fixed=!1),t.type){case 0:t.btn="btn"in t?t.btn:o.btn[0],r.closeAll("dialog");break;case 2:var s=t.content=f?t.content:[t.content||"http://layer.layui.com","auto"];t.content='<iframe scrolling="'+(t.content[1]||"auto")+'" allowtransparency="true" id="'+l[4]+a+'" name="'+l[4]+a+'" onload="this.className=\'\';" class="layui-layer-load" frameborder="0" src="'+t.content[0]+'"></iframe>';break;case 3:delete t.title,delete t.closeBtn,t.icon===-1&&0===t.icon,r.closeAll("loading");break;case 4:f||(t.content=[t.content,"body"]),t.follow=t.content[1],t.content=t.content[0]+'<i class="layui-layer-TipsG"></i>',delete t.title,t.tips="object"==typeof t.tips?t.tips:[t.tips,!0],t.tipsMore||r.closeAll("tips")}if(e.vessel(f,function(n,r,u){c.append(n[0]),f?function(){2==t.type||4==t.type?function(){i("body").append(n[1])}():function(){s.parents("."+l[0])[0]||(s.data("display",s.css("display")).show().addClass("layui-layer-wrap").wrap(n[1]),i("#"+l[0]+a).find("."+l[5]).before(r))}()}():c.append(n[1]),i(".layui-layer-move")[0]||c.append(o.moveElem=u),e.layero=i("#"+l[0]+a),t.scrollbar||l.html.css("overflow","hidden").attr("layer-full",a)}).auto(a),i("#layui-layer-shade"+e.index).css({"background-color":"rgba(0,0,0,"+(t.shade[0]||t.shade)+")"}),2==t.type&&6==r.ie&&e.layero.find("iframe").attr("src",s[0]),4==t.type?e.tips():e.offset(),t.fixed&&n.on("resize",function(){e.offset(),(/^\d+%$/.test(t.area[0])||/^\d+%$/.test(t.area[1]))&&e.auto(a),4==t.type&&e.tips()}),t.time<=0||setTimeout(function(){r.close(e.index)},t.time),e.move().callback(),l.anim[t.anim]){var u="layer-anim "+l.anim[t.anim];e.layero.addClass(u).one("webkitAnimationEnd mozAnimationEnd MSAnimationEnd oanimationend animationend",function(){i(this).removeClass(u)})}t.isOutAnim&&e.layero.data("isOutAnim",!0)}},s.pt.auto=function(e){var t=this,a=t.config,o=i("#"+l[0]+e);""===a.area[0]&&a.maxWidth>0&&(r.ie&&r.ie<8&&a.btn&&o.width(o.innerWidth()),o.outerWidth()>a.maxWidth&&o.width(a.maxWidth));var s=[o.innerWidth(),o.innerHeight()],f=o.find(l[1]).outerHeight()||0,c=o.find("."+l[6]).outerHeight()||0,u=function(e){e=o.find(e),e.height(s[1]-f-c-2*(0|parseFloat(e.css("padding-top"))))};switch(a.type){case 2:u("iframe");break;default:""===a.area[1]?a.maxHeight>0&&o.outerHeight()>a.maxHeight?(s[1]=a.maxHeight,u("."+l[5])):a.fixed&&s[1]>=n.height()&&(s[1]=n.height(),u("."+l[5])):u("."+l[5])}return t},s.pt.offset=function(){var e=this,t=e.config,i=e.layero,a=[i.outerWidth(),i.outerHeight()],o="object"==typeof t.offset;e.offsetTop=(n.height()-a[1])/2,e.offsetLeft=(n.width()-a[0])/2,o?(e.offsetTop=t.offset[0],e.offsetLeft=t.offset[1]||e.offsetLeft):"auto"!==t.offset&&("t"===t.offset?e.offsetTop=0:"r"===t.offset?e.offsetLeft=n.width()-a[0]:"b"===t.offset?e.offsetTop=n.height()-a[1]:"l"===t.offset?e.offsetLeft=0:"lt"===t.offset?(e.offsetTop=0,e.offsetLeft=0):"lb"===t.offset?(e.offsetTop=n.height()-a[1],e.offsetLeft=0):"rt"===t.offset?(e.offsetTop=0,e.offsetLeft=n.width()-a[0]):"rb"===t.offset?(e.offsetTop=n.height()-a[1],e.offsetLeft=n.width()-a[0]):e.offsetTop=t.offset),t.fixed||(e.offsetTop=/%$/.test(e.offsetTop)?n.height()*parseFloat(e.offsetTop)/100:parseFloat(e.offsetTop),e.offsetLeft=/%$/.test(e.offsetLeft)?n.width()*parseFloat(e.offsetLeft)/100:parseFloat(e.offsetLeft),e.offsetTop+=n.scrollTop(),e.offsetLeft+=n.scrollLeft()),i.attr("minLeft")&&(e.offsetTop=n.height()-(i.find(l[1]).outerHeight()||0),e.offsetLeft=i.css("left")),i.css({top:e.offsetTop,left:e.offsetLeft})},s.pt.tips=function(){var e=this,t=e.config,a=e.layero,o=[a.outerWidth(),a.outerHeight()],r=i(t.follow);r[0]||(r=i("body"));var s={width:r.outerWidth(),height:r.outerHeight(),top:r.offset().top,left:r.offset().left},f=a.find(".layui-layer-TipsG"),c=t.tips[0];t.tips[1]||f.remove(),s.autoLeft=function(){s.left+o[0]-n.width()>0?(s.tipLeft=s.left+s.width-o[0],f.css({right:12,left:"auto"})):s.tipLeft=s.left},s.where=[function(){s.autoLeft(),s.tipTop=s.top-o[1]-10,f.removeClass("layui-layer-TipsB").addClass("layui-layer-TipsT").css("border-right-color",t.tips[1])},function(){s.tipLeft=s.left+s.width+10,s.tipTop=s.top,f.removeClass("layui-layer-TipsL").addClass("layui-layer-TipsR").css("border-bottom-color",t.tips[1])},function(){s.autoLeft(),s.tipTop=s.top+s.height+10,f.removeClass("layui-layer-TipsT").addClass("layui-layer-TipsB").css("border-right-color",t.tips[1])},function(){s.tipLeft=s.left-o[0]-10,s.tipTop=s.top,f.removeClass("layui-layer-TipsR").addClass("layui-layer-TipsL").css("border-bottom-color",t.tips[1])}],s.where[c-1](),1===c?s.top-(n.scrollTop()+o[1]+16)<0&&s.where[2]():2===c?n.width()-(s.left+s.width+o[0]+16)>0||s.where[3]():3===c?s.top-n.scrollTop()+s.height+o[1]+16-n.height()>0&&s.where[0]():4===c&&o[0]+16-s.left>0&&s.where[1](),a.find("."+l[5]).css({"background-color":t.tips[1],"padding-right":t.closeBtn?"30px":""}),a.css({left:s.tipLeft-(t.fixed?n.scrollLeft():0),top:s.tipTop-(t.fixed?n.scrollTop():0)})},s.pt.move=function(){var e=this,t=e.config,a=i(document),s=e.layero,l=s.find(t.move),f=s.find(".layui-layer-resize"),c={};return t.move&&l.css("cursor","move"),l.on("mousedown",function(e){e.preventDefault(),t.move&&(c.moveStart=!0,c.offset=[e.clientX-parseFloat(s.css("left")),e.clientY-parseFloat(s.css("top"))],o.moveElem.css("cursor","move").show())}),f.on("mousedown",function(e){e.preventDefault(),c.resizeStart=!0,c.offset=[e.clientX,e.clientY],c.area=[s.outerWidth(),s.outerHeight()],o.moveElem.css("cursor","se-resize").show()}),a.on("mousemove",function(i){if(c.moveStart){var a=i.clientX-c.offset[0],o=i.clientY-c.offset[1],l="fixed"===s.css("position");if(i.preventDefault(),c.stX=l?0:n.scrollLeft(),c.stY=l?0:n.scrollTop(),!t.moveOut){var f=n.width()-s.outerWidth()+c.stX,u=n.height()-s.outerHeight()+c.stY;a<c.stX&&(a=c.stX),a>f&&(a=f),o<c.stY&&(o=c.stY),o>u&&(o=u)}s.css({left:a,top:o})}if(t.resize&&c.resizeStart){var a=i.clientX-c.offset[0],o=i.clientY-c.offset[1];i.preventDefault(),r.style(e.index,{width:c.area[0]+a,height:c.area[1]+o}),c.isResize=!0,t.resizing&&t.resizing(s)}}).on("mouseup",function(e){c.moveStart&&(delete c.moveStart,o.moveElem.hide(),t.moveEnd&&t.moveEnd(s)),c.resizeStart&&(delete c.resizeStart,o.moveElem.hide())}),e},s.pt.callback=function(){function e(){var e=a.cancel&&a.cancel(t.index,n);e===!1||r.close(t.index)}var t=this,n=t.layero,a=t.config;t.openLayer(),a.success&&(2==a.type?n.find("iframe").on("load",function(){a.success(n,t.index)}):a.success(n,t.index)),6==r.ie&&t.IE6(n),n.find("."+l[6]).children("a").on("click",function(){var e=i(this).index();if(0===e)a.yes?a.yes(t.index,n):a.btn1?a.btn1(t.index,n):r.close(t.index);else{var o=a["btn"+(e+1)]&&a["btn"+(e+1)](t.index,n);o===!1||r.close(t.index)}}),n.find("."+l[7]).on("click",e),a.shadeClose&&i("#layui-layer-shade"+t.index).on("click",function(){r.close(t.index)}),n.find(".layui-layer-min").on("click",function(){var e=a.min&&a.min(n);e===!1||r.min(t.index,a)}),n.find(".layui-layer-max").on("click",function(){i(this).hasClass("layui-layer-maxmin")?(r.restore(t.index),a.restore&&a.restore(n)):(r.full(t.index,a),setTimeout(function(){a.full&&a.full(n)},100))}),a.end&&(o.end[t.index]=a.end)},o.reselect=function(){i.each(i("select"),function(e,t){var n=i(this);n.parents("."+l[0])[0]||1==n.attr("layer")&&i("."+l[0]).length<1&&n.removeAttr("layer").show(),n=null})},s.pt.IE6=function(e){i("select").each(function(e,t){var n=i(this);n.parents("."+l[0])[0]||"none"===n.css("display")||n.attr({layer:"1"}).hide(),n=null})},s.pt.openLayer=function(){var e=this;r.zIndex=e.config.zIndex,r.setTop=function(e){var t=function(){r.zIndex++,e.css("z-index",r.zIndex+1)};return r.zIndex=parseInt(e[0].style.zIndex),e.on("mousedown",t),r.zIndex}},o.record=function(e){var t=[e.width(),e.height(),e.position().top,e.position().left+parseFloat(e.css("margin-left"))];e.find(".layui-layer-max").addClass("layui-layer-maxmin"),e.attr({area:t})},o.rescollbar=function(e){l.html.attr("layer-full")==e&&(l.html[0].style.removeProperty?l.html[0].style.removeProperty("overflow"):l.html[0].style.removeAttribute("overflow"),l.html.removeAttr("layer-full"))},e.layer=r,r.getChildFrame=function(e,t){return t=t||i("."+l[4]).attr("times"),i("#"+l[0]+t).find("iframe").contents().find(e)},r.getFrameIndex=function(e){return i("#"+e).parents("."+l[4]).attr("times")},r.iframeAuto=function(e){if(e){var t=r.getChildFrame("html",e).outerHeight(),n=i("#"+l[0]+e),a=n.find(l[1]).outerHeight()||0,o=n.find("."+l[6]).outerHeight()||0;n.css({height:t+a+o}),n.find("iframe").css({height:t})}},r.iframeSrc=function(e,t){i("#"+l[0]+e).find("iframe").attr("src",t)},r.style=function(e,t,n){var a=i("#"+l[0]+e),r=a.find(".layui-layer-content"),s=a.attr("type"),f=a.find(l[1]).outerHeight()||0,c=a.find("."+l[6]).outerHeight()||0;a.attr("minLeft");s!==o.type[3]&&s!==o.type[4]&&(n||(parseFloat(t.width)<=260&&(t.width=260),parseFloat(t.height)-f-c<=64&&(t.height=64+f+c)),a.css(t),c=a.find("."+l[6]).outerHeight(),s===o.type[2]?a.find("iframe").css({height:parseFloat(t.height)-f-c}):r.css({height:parseFloat(t.height)-f-c-parseFloat(r.css("padding-top"))-parseFloat(r.css("padding-bottom"))}))},r.min=function(e,t){var a=i("#"+l[0]+e),s=a.find(l[1]).outerHeight()||0,f=a.attr("minLeft")||181*o.minIndex+"px",c=a.css("position");o.record(a),o.minLeft[0]&&(f=o.minLeft[0],o.minLeft.shift()),a.attr("position",c),r.style(e,{width:180,height:s,left:f,top:n.height()-s,position:"fixed",overflow:"hidden"},!0),a.find(".layui-layer-min").hide(),"page"===a.attr("type")&&a.find(l[4]).hide(),o.rescollbar(e),a.attr("minLeft")||o.minIndex++,a.attr("minLeft",f)},r.restore=function(e){var t=i("#"+l[0]+e),n=t.attr("area").split(",");t.attr("type");r.style(e,{width:parseFloat(n[0]),height:parseFloat(n[1]),top:parseFloat(n[2]),left:parseFloat(n[3]),position:t.attr("position"),overflow:"visible"},!0),t.find(".layui-layer-max").removeClass("layui-layer-maxmin"),t.find(".layui-layer-min").show(),"page"===t.attr("type")&&t.find(l[4]).show(),o.rescollbar(e)},r.full=function(e){var t,a=i("#"+l[0]+e);o.record(a),l.html.attr("layer-full")||l.html.css("overflow","hidden").attr("layer-full",e),clearTimeout(t),t=setTimeout(function(){var t="fixed"===a.css("position");r.style(e,{top:t?0:n.scrollTop(),left:t?0:n.scrollLeft(),width:n.width(),height:n.height()},!0),a.find(".layui-layer-min").hide()},100)},r.title=function(e,t){var n=i("#"+l[0]+(t||r.index)).find(l[1]);n.html(e)},r.close=function(e){var t=i("#"+l[0]+e),n=t.attr("type"),a="layer-anim-close";if(t[0]){var s="layui-layer-wrap",f=function(){if(n===o.type[1]&&"object"===t.attr("conType")){t.children(":not(."+l[5]+")").remove();for(var a=t.find("."+s),r=0;r<2;r++)a.unwrap();a.css("display",a.data("display")).removeClass(s)}else{if(n===o.type[2])try{var f=i("#"+l[4]+e)[0];f.contentWindow.document.write(""),f.contentWindow.close(),t.find("."+l[5])[0].removeChild(f)}catch(c){}t[0].innerHTML="",t.remove()}"function"==typeof o.end[e]&&o.end[e](),delete o.end[e]};t.data("isOutAnim")&&t.addClass("layer-anim "+a),i("#layui-layer-moves, #layui-layer-shade"+e).remove(),6==r.ie&&o.reselect(),o.rescollbar(e),t.attr("minLeft")&&(o.minIndex--,o.minLeft.push(t.attr("minLeft"))),r.ie&&r.ie<10||!t.data("isOutAnim")?f():setTimeout(function(){f()},200)}},r.closeAll=function(e){i.each(i("."+l[0]),function(){var t=i(this),n=e?t.attr("type")===e:1;n&&r.close(t.attr("times")),n=null})};var f=r.cache||{},c=function(e){return f.skin?" "+f.skin+" "+f.skin+"-"+e:""};r.prompt=function(e,t){var a="";if(e=e||{},"function"==typeof e&&(t=e),e.area){var o=e.area;a='style="width: '+o[0]+"; height: "+o[1]+';"',delete e.area}var s,l=2==e.formType?'<textarea class="layui-layer-input"'+a+">"+(e.value||"")+"</textarea>":function(){return'<input type="'+(1==e.formType?"password":"text")+'" class="layui-layer-input" value="'+(e.value||"")+'">'}(),f=e.success;return delete e.success,r.open(i.extend({type:1,btn:["确定","取消"],content:l,skin:"layui-layer-prompt"+c("prompt"),maxWidth:n.width(),success:function(e){s=e.find(".layui-layer-input"),s.focus(),"function"==typeof f&&f(e)},resize:!1,yes:function(i){var n=s.val();""===n?s.focus():n.length>(e.maxlength||500)?r.tips("最多输入"+(e.maxlength||500)+"个字数",s,{tips:1}):t&&t(n,i,s)}},e))},r.tab=function(e){e=e||{};var t=e.tab||{},n="layui-this",a=e.success;return delete e.success,r.open(i.extend({type:1,skin:"layui-layer-tab"+c("tab"),resize:!1,title:function(){var e=t.length,i=1,a="";if(e>0)for(a='<span class="'+n+'">'+t[0].title+"</span>";i<e;i++)a+="<span>"+t[i].title+"</span>";return a}(),content:'<ul class="layui-layer-tabmain">'+function(){var e=t.length,i=1,a="";if(e>0)for(a='<li class="layui-layer-tabli '+n+'">'+(t[0].content||"no content")+"</li>";i<e;i++)a+='<li class="layui-layer-tabli">'+(t[i].content||"no content")+"</li>";return a}()+"</ul>",success:function(t){var o=t.find(".layui-layer-title").children(),r=t.find(".layui-layer-tabmain").children();o.on("mousedown",function(t){t.stopPropagation?t.stopPropagation():t.cancelBubble=!0;var a=i(this),o=a.index();a.addClass(n).siblings().removeClass(n),r.eq(o).show().siblings().hide(),"function"==typeof e.change&&e.change(o)}),"function"==typeof a&&a(t)}},e))},r.photos=function(t,n,a){function o(e,t,i){var n=new Image;return n.src=e,n.complete?t(n):(n.onload=function(){n.onload=null,t(n)},void(n.onerror=function(e){n.onerror=null,i(e)}))}var s={};if(t=t||{},t.photos){var l=t.photos.constructor===Object,f=l?t.photos:{},u=f.data||[],d=f.start||0;s.imgIndex=(0|d)+1,t.img=t.img||"img";var y=t.success;if(delete t.success,l){if(0===u.length)return r.msg("没有图片")}else{var p=i(t.photos),h=function(){u=[],p.find(t.img).each(function(e){var t=i(this);t.attr("layer-index",e),u.push({alt:t.attr("alt"),pid:t.attr("layer-pid"),src:t.attr("layer-src")||t.attr("src"),thumb:t.attr("src")})})};if(h(),0===u.length)return;if(n||p.on("click",t.img,function(){var e=i(this),n=e.attr("layer-index");r.photos(i.extend(t,{photos:{start:n,data:u,tab:t.tab},full:t.full}),!0),h()}),!n)return}s.imgprev=function(e){s.imgIndex--,s.imgIndex<1&&(s.imgIndex=u.length),s.tabimg(e)},s.imgnext=function(e,t){s.imgIndex++,s.imgIndex>u.length&&(s.imgIndex=1,t)||s.tabimg(e)},s.keyup=function(e){if(!s.end){var t=e.keyCode;e.preventDefault(),37===t?s.imgprev(!0):39===t?s.imgnext(!0):27===t&&r.close(s.index)}},s.tabimg=function(e){if(!(u.length<=1))return f.start=s.imgIndex-1,r.close(s.index),r.photos(t,!0,e)},s.event=function(){s.bigimg.hover(function(){s.imgsee.show()},function(){s.imgsee.hide()}),s.bigimg.find(".layui-layer-imgprev").on("click",function(e){e.preventDefault(),s.imgprev()}),s.bigimg.find(".layui-layer-imgnext").on("click",function(e){e.preventDefault(),s.imgnext()}),i(document).on("keyup",s.keyup)},s.loadi=r.load(1,{shade:!("shade"in t)&&.9,scrollbar:!1}),o(u[d].src,function(n){r.close(s.loadi),s.index=r.open(i.extend({type:1,id:"layui-layer-photos",area:function(){var a=[n.width,n.height],o=[i(e).width()-100,i(e).height()-100];if(!t.full&&(a[0]>o[0]||a[1]>o[1])){var r=[a[0]/o[0],a[1]/o[1]];r[0]>r[1]?(a[0]=a[0]/r[0],a[1]=a[1]/r[0]):r[0]<r[1]&&(a[0]=a[0]/r[1],a[1]=a[1]/r[1])}return[a[0]+"px",a[1]+"px"]}(),title:!1,shade:.9,shadeClose:!0,closeBtn:!1,move:".layui-layer-phimg img",moveType:1,scrollbar:!1,moveOut:!0,isOutAnim:!1,skin:"layui-layer-photos"+c("photos"),content:'<div class="layui-layer-phimg"><img src="'+u[d].src+'" alt="'+(u[d].alt||"")+'" layer-pid="'+u[d].pid+'"><div class="layui-layer-imgsee">'+(u.length>1?'<span class="layui-layer-imguide"><a href="javascript:;" class="layui-layer-iconext layui-layer-imgprev"></a><a href="javascript:;" class="layui-layer-iconext layui-layer-imgnext"></a></span>':"")+'<div class="layui-layer-imgbar" style="display:'+(a?"block":"")+'"><span class="layui-layer-imgtit"><a href="javascript:;">'+(u[d].alt||"")+"</a><em>"+s.imgIndex+"/"+u.length+"</em></span></div></div></div>",success:function(e,i){s.bigimg=e.find(".layui-layer-phimg"),s.imgsee=e.find(".layui-layer-imguide,.layui-layer-imgbar"),s.event(e),t.tab&&t.tab(u[d],e),"function"==typeof y&&y(e)},end:function(){s.end=!0,i(document).off("keyup",s.keyup)}},t))},function(){r.close(s.loadi),r.msg("当前图片地址异常<br>是否继续查看下一张？",{time:3e4,btn:["下一张","不看了"],yes:function(){u.length>1&&s.imgnext(!0,!0)}})})}},o.run=function(t){i=t,n=i(e),l.html=i("html"),r.open=function(e){var t=new s(e);return t.index}},e.layui&&layui.define?(r.ready(),layui.define("jquery",function(t){r.path=layui.cache.dir,o.run(layui.$),e.layer=r,t("layer",r)})):"function"==typeof define&&define.amd?define(["jquery"],function(){return o.run(e.jQuery),r}):function(){o.run(e.jQuery),r.ready()}()}(window);
\ No newline at end of file
diff --git a/management/guns-admin/src/main/webapp/static/js/plugins/layer/layim/data/chatlog.json b/management/guns-admin/src/main/webapp/static/js/plugins/layer/layim/data/chatlog.json
new file mode 100644
index 0000000..13954d7
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/static/js/plugins/layer/layim/data/chatlog.json
@@ -0,0 +1,30 @@
+{
+ "status": 1,
+ "msg": "ok",
+ "data": [
+ {
+ "id": "100001",
+ "name": "Beaut-zihan",
+ "time": "10:23",
+ "face": "img/a1.jpg"
+ },
+ {
+ "id": "100002",
+ "name": "慕容晓晓",
+ "time": "昨天",
+ "face": "img/a2.jpg"
+ },
+ {
+ "id": "1000033",
+ "name": "乔峰",
+ "time": "2014-4.22",
+ "face": "img/a3.jpg"
+ },
+ {
+ "id": "10000333",
+ "name": "高圆圆",
+ "time": "2014-4.21",
+ "face": "img/a4.jpg"
+ }
+ ]
+}
diff --git a/management/guns-admin/src/main/webapp/static/js/plugins/layer/layim/data/friend.json b/management/guns-admin/src/main/webapp/static/js/plugins/layer/layim/data/friend.json
new file mode 100644
index 0000000..13a2b65
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/static/js/plugins/layer/layim/data/friend.json
@@ -0,0 +1,107 @@
+{
+ "status": 1,
+ "msg": "ok",
+ "data": [
+ {
+ "name": "销售部",
+ "nums": 36,
+ "id": 1,
+ "item": [
+ {
+ "id": "100001",
+ "name": "郭敬明",
+ "face": "img/a5.jpg"
+ },
+ {
+ "id": "100002",
+ "name": "作家崔成浩",
+ "face": "img/a6.jpg"
+ },
+ {
+ "id": "1000022",
+ "name": "韩寒",
+ "face": "img/a7.jpg"
+ },
+ {
+ "id": "10000222",
+ "name": "范爷",
+ "face": "img/a8.jpg"
+ },
+ {
+ "id": "100002222",
+ "name": "小马哥",
+ "face": "img/a9.jpg"
+ }
+ ]
+ },
+ {
+ "name": "大学同窗",
+ "nums": 16,
+ "id": 2,
+ "item": [
+ {
+ "id": "1000033",
+ "name": "苏醒",
+ "face": "img/a9.jpg"
+ },
+ {
+ "id": "10000333",
+ "name": "马云",
+ "face": "img/a8.jpg"
+ },
+ {
+ "id": "100003",
+ "name": "鬼脚七",
+ "face": "img/a7.jpg"
+ },
+ {
+ "id": "100004",
+ "name": "谢楠",
+ "face": "img/a6.jpg"
+ },
+ {
+ "id": "100005",
+ "name": "徐峥",
+ "face": "img/a5.jpg"
+ }
+ ]
+ },
+ {
+ "name": "H+后台主题",
+ "nums": 38,
+ "id": 3,
+ "item": [
+ {
+ "id": "100006",
+ "name": "柏雪近在它香",
+ "face": "img/a4.jpg"
+ },
+ {
+ "id": "100007",
+ "name": "罗昌平",
+ "face": "img/a3.jpg"
+ },
+ {
+ "id": "100008",
+ "name": "Crystal影子",
+ "face": "img/a2.jpg"
+ },
+ {
+ "id": "100009",
+ "name": "艺小想",
+ "face": "img/a1.jpg"
+ },
+ {
+ "id": "100010",
+ "name": "天猫",
+ "face": "img/a8.jpg"
+ },
+ {
+ "id": "100011",
+ "name": "张泉灵",
+ "face": "img/a7.jpg"
+ }
+ ]
+ }
+ ]
+}
diff --git a/management/guns-admin/src/main/webapp/static/js/plugins/layer/layim/data/group.json b/management/guns-admin/src/main/webapp/static/js/plugins/layer/layim/data/group.json
new file mode 100644
index 0000000..3352f65
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/static/js/plugins/layer/layim/data/group.json
@@ -0,0 +1,57 @@
+{
+ "status": 1,
+ "msg": "ok",
+ "data": [
+ {
+ "name": "H+交流群",
+ "nums": 36,
+ "id": 1,
+ "item": [
+ {
+ "id": "101",
+ "name": "H+ Bug反馈",
+ "face": "http://tp2.sinaimg.cn/2211874245/180/40050524279/0"
+ },
+ {
+ "id": "102",
+ "name": "H+ 技术交流",
+ "face": "http://tp3.sinaimg.cn/1820711170/180/1286855219/1"
+ }
+ ]
+ },
+ {
+ "name": "Bootstrap",
+ "nums": 16,
+ "id": 2,
+ "item": [
+ {
+ "id": "103",
+ "name": "Bootstrap中文",
+ "face": "http://tp2.sinaimg.cn/2211874245/180/40050524279/0"
+ },
+ {
+ "id": "104",
+ "name": "Bootstrap资源",
+ "face": "http://tp3.sinaimg.cn/1820711170/180/1286855219/1"
+ }
+ ]
+ },
+ {
+ "name": "WebApp",
+ "nums": 106,
+ "id": 3,
+ "item": [
+ {
+ "id": "105",
+ "name": "移动开发",
+ "face": "http://tp2.sinaimg.cn/2211874245/180/40050524279/0"
+ },
+ {
+ "id": "106",
+ "name": "H5前言",
+ "face": "http://tp3.sinaimg.cn/1820711170/180/1286855219/1"
+ }
+ ]
+ }
+ ]
+}
diff --git a/management/guns-admin/src/main/webapp/static/js/plugins/layer/layim/data/groups.json b/management/guns-admin/src/main/webapp/static/js/plugins/layer/layim/data/groups.json
new file mode 100644
index 0000000..fd0464a
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/static/js/plugins/layer/layim/data/groups.json
@@ -0,0 +1,56 @@
+{
+ "status": 1,
+ "msg": "ok",
+ "data": [
+ {
+ "id": "100001",
+ "name": "無言的蒁説",
+ "face": "img/a1.jpg"
+ },
+ {
+ "id": "100002",
+ "name": "婷宝奢侈品",
+ "face": "img/a2.jpg"
+ },
+ {
+ "id": "100003",
+ "name": "忆恨思爱",
+ "face": "img/a3.jpg"
+ },
+ {
+ "id": "100004",
+ "name": "天涯奥拓慢",
+ "face": "img/a4.jpg"
+ },
+ {
+ "id": "100005",
+ "name": "雨落无声的天空",
+ "face": "img/a5.jpg"
+ },
+ {
+ "id": "100006",
+ "name": "李越LycorisRadiate",
+ "face": "img/a6.jpg"
+ },
+ {
+ "id": "100007",
+ "name": "冯胖妞张直丑",
+ "face": "img/a7.jpg"
+ },
+ {
+ "id": "100008",
+ "name": "陈龙hmmm",
+ "face": "img/a8.jpg"
+ },
+ {
+ "id": "100009",
+ "name": "别闹哥胆儿小",
+ "face": "img/a9.jpg"
+ },
+ {
+ "id": "100010",
+ "name": "锅锅锅锅萌哒哒 ",
+ "face": "img/a10.jpg"
+ }
+ ]
+}
diff --git a/management/guns-admin/src/main/webapp/static/js/plugins/layer/layim/layim.css b/management/guns-admin/src/main/webapp/static/js/plugins/layer/layim/layim.css
new file mode 100644
index 0000000..a568a03
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/static/js/plugins/layer/layim/layim.css
@@ -0,0 +1,158 @@
+/*
+
+ @Name: layim WebIM 1.0.0
+ @Author：贤心（子涵修改）
+ @Date: 2014-04-25
+ @Blog: http://sentsin.com
+
+ */
+body,div,dl,dt,dd,ul,ol,li,h1,h2,h3,h4,h5,h6,input,button,textarea,p,blockquote,th,td,form{margin:0; padding:0;}
+input,button,textarea,select,optgroup,option{font-family:inherit; font-size:inherit; font-style:inherit; font-weight:inherit; outline: 0;}
+li{list-style:none;}
+.xxim_icon, .xxim_main i, .layim_chatbox i{position:absolute;}
+.loading{background:url(loading.gif) no-repeat center center;}
+.layim_chatbox a, .layim_chatbox a:hover{color:#343434; text-decoration:none; }
+.layim_zero{position:absolute; width:0; height:0; border-style:dashed; border-color:transparent; overflow:hidden;}
+
+.xxim_main{position:fixed; right:1px; bottom:1px; width:230px; border:1px solid #BEBEBE; background-color:#fff; font-size:12px; box-shadow: 0 0 10px rgba(0,0,0,.2); z-index:99999999}
+.layim_chatbox textarea{resize:none;}
+.xxim_main em, .xxim_main i, .layim_chatbox em, .layim_chatbox i{font-style:normal; font-weight:400;}
+.xxim_main h5{font-size:100%; font-weight:400;}
+
+/* 搜索栏 */
+.xxim_search{position:relative; padding-left:40px; height:40px; border-bottom:1px solid #DCDCDC; background-color:#fff;}
+.xxim_search i{left:10px; top:12px; width:16px; height:16px;font-size: 16px;color:#999;}
+.xxim_search input{border:none; background:none; width: 180px; margin-top:10px; line-height:20px;}
+.xxim_search span{display:none; position:absolute; right:10px; top:10px; height:18px; line-height:18px;width:18px;text-align: center;background-color:#AFAFAF; color:#fff; cursor:pointer; border-radius:2px; font-size:12px; font-weight:900;}
+.xxim_search span:hover{background-color:#FCBE00;}
+
+/* 主面板tab */
+.xxim_tabs{height:45px; border-bottom:1px solid #DBDBDB; background-color:#F4F4F4; font-size:0;}
+.xxim_tabs span{position:relative; display:inline-block; *display:inline; *zoom:1; vertical-align:top; width:76px; height:45px; border-right:1px solid #DBDBDB; cursor:pointer; font-size:12px;}
+.xxim_tabs span i{top:12px; left:50%; width:20px; margin-left:-10px; height:20px;font-size:20px;color:#ccc;}
+.xxim_tabs .xxim_tabnow{height:46px; background-color:#fff;}
+.xxim_tabs .xxim_tabnow i{color:#1ab394;}
+.xxim_tabs .xxim_latechat{border-right:none;}
+.xxim_tabs .xxim_tabfriend i{width:14px; margin-left:-7px;}
+
+/* 主面板列表 */
+.xxim_list{display:none; height:350px; padding:5px 0; overflow:hidden;}
+.xxim_list:hover{ overflow-y:auto;}
+.xxim_list h5{position:relative; padding-left:32px; height:26px; line-height:26px; cursor:pointer; color:#000; font-size:0;}
+.xxim_list h5 span{display:inline-block; *display:inline; *zoom:1; vertical-align:top; max-width:140px; overflow:hidden; text-overflow: ellipsis; white-space:nowrap; font-size:12px;}
+.xxim_list h5 i{left:15px; top:8px; width:10px; height:10px;font-size:10px;color:#666;}
+.xxim_list h5 *{font-size:12px;}
+.xxim_list .xxim_chatlist{display:none;}
+.xxim_list .xxim_liston h5 i{width:8px; height:7px;}
+.xxim_list .xxim_liston .xxim_chatlist{display:block;}
+.xxim_chatlist {}
+.xxim_chatlist li{position:relative; height:40px; line-height:30px; padding:5px 10px; font-size:0; cursor:pointer;}
+.xxim_chatlist li:hover{background-color:#F2F4F8}
+.xxim_chatlist li *{display:inline-block; *display:inline; *zoom:1; vertical-align:top; font-size:12px;}
+.xxim_chatlist li span{padding-left:10px; max-width:120px; overflow:hidden; text-overflow: ellipsis; white-space:nowrap;}
+.xxim_chatlist li img{width:30px; height:30px;}
+.xxim_chatlist li .xxim_time{position:absolute; right:10px; color:#999;}
+.xxim_list .xxim_errormsg{text-align:center; margin:50px 0; color:#999;}
+.xxim_searchmain{position:absolute; width:230px; height:491px; left:0; top:41px; z-index:10; background-color:#fff;}
+
+/* 主面板底部 */
+.xxim_bottom{height:34px; border-top:1px solid #D0DCF3; background-color:#F2F4F8;}
+.xxim_expend{border-left:1px solid #D0DCF3; border-bottom:1px solid #D0DCF3;}
+.xxim_bottom li{position:relative; width:50px; height:32px; line-height:32px; float:left; border-right:1px solid #D0DCF3; cursor:pointer;}
+.xxim_bottom li i{ top:9px;}
+.xxim_bottom .xxim_hide{border-right:none;}
+.xxim_bottom .xxim_online{width:72px; padding-left:35px;}
+.xxim_online i{left:13px; width:14px; height:14px;font-size:14px;color:#FFA00A;}
+.xxim_setonline{display:none; position:absolute; left:-79px; bottom:-1px; border:1px solid #DCDCDC; background-color:#fff;}
+.xxim_setonline span{position:relative; display:block; width:32px;width: 77px; padding:0 10px 0 35px;}
+.xxim_setonline span:hover{background-color:#F2F4F8;}
+.xxim_offline .xxim_nowstate, .xxim_setoffline i{color:#999;}
+.xxim_mymsg i{left:18px; width:14px; height:14px;font-size: 14px;}
+.xxim_mymsg a{position:absolute; left:0; top:0; width:50px; height:32px;}
+.xxim_seter i{left:18px; width:14px; height:14px;font-size: 14px;}
+.xxim_hide i{left:18px; width:14px; height:14px;font-size: 14px;}
+.xxim_show i{}
+.xxim_bottom .xxim_on{position:absolute; left:-17px; top:50%; width:16px;text-align: center;color:#999;line-height: 97px; height:97px; margin-top:-49px;border:solid 1px #BEBEBE;border-right: none; background:#F2F4F8;}
+.xxim_bottom .xxim_off{}
+
+/* 聊天窗口 */
+.layim_chatbox{width:620px; border:1px solid #BEBEBE; background-color:#fff; font-size:12px; box-shadow: 0 0 10px rgba(0,0,0,.2);}
+.layim_chatbox h6{position:relative; height:40px; border-bottom:1px solid #D9D9D9; background-color:#FCFDFA}
+.layim_move{position:absolute; height:40px; width: 620px; z-index:0;}
+.layim_face{position:absolute; bottom:-1px; left:10px; width:64px; height:64px;padding:1px;background: #fff; border:1px solid #ccc;}
+.layim_face img{width:60px; height:60px;}
+.layim_names{position:absolute; left:90px; max-width:300px; line-height:40px; color:#000; overflow:hidden; text-overflow: ellipsis; white-space:nowrap; font-size:14px;}
+.layim_rightbtn{position:absolute; right:15px; top:12px; font-size:20px;}
+.layim_rightbtn i{position:relative; width:16px; height:16px; display:inline-block; *display:inline; *zoom:1; vertical-align:top; cursor:pointer; transition: all .3s;text-align: center;line-height: 16px;}
+.layim_rightbtn .layim_close{background: #FFA00A;color:#fff;}
+.layim_rightbtn .layim_close:hover{-webkit-transform: rotate(180deg); -moz-transform: rotate(180deg);}
+.layim_rightbtn .layer_setmin{margin-right:5px;color:#999;font-size:14px;font-weight: 700;}
+.layim_chat, .layim_chatmore,.layim_groups{height:450px; overflow:hidden;}
+.layim_chatmore{display:none; float:left; width:135px; border-right:1px solid #BEBEBE; background-color:#F2F2F2}
+.layim_chatlist li, .layim_groups li{position:relative; height:30px; line-height:30px; padding:0 10px; overflow:hidden; text-overflow: ellipsis; white-space:nowrap; cursor:pointer;}
+.layim_chatlist li{padding:0 20px 0 10px;}
+.layim_chatlist li:hover{background-color:#E3E3E3;}
+.layim_chatlist li span{display:inline-block; *display:inline; *zoom:1; vertical-align:top; width:90px; overflow:hidden; text-overflow: ellipsis; white-space:nowrap;}
+.layim_chatlist li em{display:none; position:absolute; top:6px; right:10px; height:18px; line-height:18px;width:18px;text-align: center;font-size:14px;font-weight:900; border-radius:3px;}
+.layim_chatlist li em:hover{background-color: #FCBE00; color:#fff;}
+.layim_chatlist .layim_chatnow,.layim_chatlist .layim_chatnow:hover{/*border-top:1px solid #D9D9D9; border-bottom:1px solid #D9D9D9;*/ background-color:#fff;}
+.layim_chat{}
+.layim_chatarea{height:280px;}
+.layim_chatview{display:none; height:280px; overflow:hidden;}
+.layim_chatmore:hover, .layim_groups:hover, .layim_chatview:hover{overflow-y:auto;}
+.layim_chatview li{margin-bottom:10px; clear:both; *zoom:1;}
+.layim_chatview li:after{content:'\20'; clear:both; *zoom:1; display:block; height:0;}
+
+.layim_chatthis{display:block;}
+.layim_chatuser{float:left; padding:15px; font-size:0;}
+.layim_chatuser *{display:inline-block; *display:inline; *zoom:1; vertical-align:top; line-height:30px; font-size:12px; padding-right:10px;}
+.layim_chatuser img{width:30px; height:30px;padding-right: 0;margin-right: 15px;}
+.layim_chatuser .layim_chatname{max-width:230px; overflow:hidden; text-overflow: ellipsis; white-space:nowrap;}
+.layim_chatuser .layim_chattime{color:#999; padding-left:10px;}
+.layim_chatsay{position:relative; float:left; margin:0 15px; padding:10px; line-height:20px; background-color:#F3F3F3; border-radius:3px; clear:both;}
+.layim_chatsay .layim_zero{left:5px; top:-8px; border-width:8px; border-right-style:solid; border-right-color:#F3F3F3;}
+.layim_chateme .layim_chatuser{float:right;}
+.layim_chateme .layim_chatuser *{padding-right:0; padding-left:10px;}
+.layim_chateme .layim_chatuser img{margin-left:15px;padding-left: 0;}
+.layim_chateme .layim_chatsay .layim_zero{left:auto; right:10px;}
+.layim_chateme .layim_chatuser .layim_chattime{padding-left:0; padding-right:10px;}
+.layim_chateme .layim_chatsay{float:right; background-color:#EBFBE3}
+.layim_chateme .layim_zero{border-right-color:#EBFBE3;}
+.layim_groups{display:none; float:right; width:130px; border-left:1px solid #D9D9D9; background-color:#fff;}
+.layim_groups ul{display:none;}
+.layim_groups ul.layim_groupthis{display:block;}
+.layim_groups li *{display:inline-block; *display:inline; *zoom:1; vertical-align:top; margin-right:10px;}
+.layim_groups li img{width:20px; height:20px; margin-top:5px;}
+.layim_groups li span{max-width:80px; overflow:hidden; text-overflow: ellipsis; white-space:nowrap;}
+.layim_groups li:hover{background-color:#F3F3F3;}
+.layim_groups .layim_errors{text-align:center; color:#999;}
+.layim_tool{position:relative; height:35px; line-height:35px; padding-left:10px; background-color:#F3F3F3;}
+.layim_tool i{position:relative; top:10px; display:inline-block; *display:inline; *zoom:1; vertical-align:top; width:16px; height:16px; margin-right:10px; cursor:pointer;font-size:16px;color:#999;font-weight: 700;}
+.layim_tool i:hover{color:#FFA00A;}
+.layim_tool .layim_seechatlog{position:absolute; right:15px;}
+.layim_tool .layim_seechatlog i{}
+.layim_write{display:block; border:none; width:98%; height:90px; line-height:20px; margin:5px auto 0;}
+.layim_send{position:relative; height:40px; background-color:#F3F3F3;}
+.layim_sendbtn{position:absolute; height:26px; line-height:26px; right:10px; top:8px; padding:0 40px 0 20px; background-color:#FFA00A; color:#fff; border-radius:3px; cursor:pointer;}
+.layim_enter{position:absolute; right:0; border-left:1px solid #FFB94F; width:24px; height:26px;}
+.layim_enter:hover{background-color:#E68A00; border-radius:0 3px 3px 0;}
+.layim_enter .layim_zero{left:7px; top:11px; border-width:5px; border-top-style:solid; border-top-color:#FFE0B3;}
+.layim_sendtype{display:none; position:absolute; right:10px; bottom:37px; border:1px solid #D9D9D9; background-color:#fff; text-align:left;}
+.layim_sendtype span{display:block; line-height:24px; padding:0 10px 0 25px; cursor:pointer;}
+.layim_sendtype span:hover{background-color:#F3F3F3;}
+.layim_sendtype span i{left:5px;}
+
+.layim_min{display:none; position:absolute; left:-190px; bottom:-1px; width:160px; height:32px; line-height:32px; padding:0 10px; overflow:hidden; text-overflow: ellipsis; white-space:nowrap; border:1px solid #ccc; box-shadow: 0 0 5px rgba(0,0,75,.2); background-color:#FCFDFA; cursor:pointer;}
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/management/guns-admin/src/main/webapp/static/js/plugins/layer/layim/layim.js b/management/guns-admin/src/main/webapp/static/js/plugins/layer/layim/layim.js
new file mode 100644
index 0000000..52f0083
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/static/js/plugins/layer/layim/layim.js
@@ -0,0 +1,630 @@
+/*
+
+ @Name: layui WebIM 1.0.0
+ @Author：贤心
+ @Date: 2014-04-25
+ @Blog: http://sentsin.com
+
+ */
+
+;!function(win, undefined){
+
+var config = {
+ msgurl: 'mailbox.html?msg=',
+ chatlogurl: 'mailbox.html?user=',
+ aniTime: 200,
+ right: -232,
+ api: {
+ friend: 'js/plugins/layer/layim/data/friend.json', //好友列表接口
+ group: 'js/plugins/layer/layim/data/group.json', //群组列表接口
+ chatlog: 'js/plugins/layer/layim/data/chatlog.json', //聊天记录接口
+ groups: 'js/plugins/layer/layim/data/groups.json', //群组成员接口
+ sendurl: '' //发送消息接口
+ },
+ user: { //当前用户信息
+ name: '游客',
+ face: 'img/a1.jpg'
+ },
+
+ //自动回复内置文案，也可动态读取数据库配置
+ autoReplay: [
+ '您好，我现在有事不在，一会再和您联系。',
+ '你没发错吧？',
+ '洗澡中，请勿打扰，偷窥请购票，个体四十，团体八折，订票电话：一般人我不告诉他！',
+ '你好，我是主人的美女秘书，有什么事就跟我说吧，等他回来我会转告他的。',
+ '我正在拉磨，没法招呼您，因为我们家毛驴去动物保护协会把我告了，说我剥夺它休产假的权利。',
+ '<（@￣︶￣@）>',
+ '你要和我说话？你真的要和我说话？你确定自己想说吗？你一定非说不可吗？那你说吧，这是自动回复。',
+ '主人正在开机自检，键盘鼠标看好机会出去凉快去了，我是他的电冰箱，我打字比较慢，你慢慢说，别急……',
+ '(*^__^*) 嘻嘻，是贤心吗？'
+ ],
+
+
+ chating: {},
+ hosts: (function(){
+ var dk = location.href.match(/\:\d+/);
+ dk = dk ? dk[0] : '';
+ return 'http://' + document.domain + dk + '/';
+ })(),
+ json: function(url, data, callback, error){
+ return $.ajax({
+ type: 'POST',
+ url: url,
+ data: data,
+ dataType: 'json',
+ success: callback,
+ error: error
+ });
+ },
+ stopMP: function(e){
+ e ? e.stopPropagation() : e.cancelBubble = true;
+ }
+}, dom = [$(window), $(document), $('html'), $('body')], xxim = {};
+
+//主界面tab
+xxim.tabs = function(index){
+ var node = xxim.node;
+ node.tabs.eq(index).addClass('xxim_tabnow').siblings().removeClass('xxim_tabnow');
+ node.list.eq(index).show().siblings('.xxim_list').hide();
+ if(node.list.eq(index).find('li').length === 0){
+ xxim.getDates(index);
+ }
+};
+
+//节点
+xxim.renode = function(){
+ var node = xxim.node = {
+ tabs: $('#xxim_tabs>span'),
+ list: $('.xxim_list'),
+ online: $('.xxim_online'),
+ setonline: $('.xxim_setonline'),
+ onlinetex: $('#xxim_onlinetex'),
+ xximon: $('#xxim_on'),
+ layimFooter: $('#xxim_bottom'),
+ xximHide: $('#xxim_hide'),
+ xximSearch: $('#xxim_searchkey'),
+ searchMian: $('#xxim_searchmain'),
+ closeSearch: $('#xxim_closesearch'),
+ layimMin: $('#layim_min')
+ };
+};
+
+//主界面缩放
+xxim.expend = function(){
+ var node = xxim.node;
+ if(xxim.layimNode.attr('state') !== '1'){
+ xxim.layimNode.stop().animate({right: config.right}, config.aniTime, function(){
+ node.xximon.addClass('xxim_off');
+ try{
+ localStorage.layimState = 1;
+ }catch(e){}
+ xxim.layimNode.attr({state: 1});
+ node.layimFooter.addClass('xxim_expend').stop().animate({marginLeft: config.right}, config.aniTime/2);
+ node.xximHide.addClass('xxim_show');
+ });
+ } else {
+ xxim.layimNode.stop().animate({right: 1}, config.aniTime, function(){
+ node.xximon.removeClass('xxim_off');
+ try{
+ localStorage.layimState = 2;
+ }catch(e){}
+ xxim.layimNode.removeAttr('state');
+ node.layimFooter.removeClass('xxim_expend');
+ node.xximHide.removeClass('xxim_show');
+ });
+ node.layimFooter.stop().animate({marginLeft: 0}, config.aniTime);
+ }
+};
+
+//初始化窗口格局
+xxim.layinit = function(){
+ var node = xxim.node;
+
+ //主界面
+ try{
+ /*
+ if(!localStorage.layimState){
+ config.aniTime = 0;
+ localStorage.layimState = 1;
+ }
+ */
+ if(localStorage.layimState === '1'){
+ xxim.layimNode.attr({state: 1}).css({right: config.right});
+ node.xximon.addClass('xxim_off');
+ node.layimFooter.addClass('xxim_expend').css({marginLeft: config.right});
+ node.xximHide.addClass('xxim_show');
+ }
+ }catch(e){
+ //layer.msg(e.message, 5, -1);
+ }
+};
+
+//聊天窗口
+xxim.popchat = function(param){
+ var node = xxim.node, log = {};
+
+ log.success = function(layero){
+ layer.setMove();
+
+ xxim.chatbox = layero.find('#layim_chatbox');
+ log.chatlist = xxim.chatbox.find('.layim_chatmore>ul');
+
+ log.chatlist.html('<li data-id="'+ param.id +'" type="'+ param.type +'" id="layim_user'+ param.type + param.id +'"><span>'+ param.name +'</span><em>×</em></li>')
+ xxim.tabchat(param, xxim.chatbox);
+
+ //最小化聊天窗
+ xxim.chatbox.find('.layer_setmin').on('click', function(){
+ var indexs = layero.attr('times');
+ layero.hide();
+ node.layimMin.text(xxim.nowchat.name).show();
+ });
+
+ //关闭窗口
+ xxim.chatbox.find('.layim_close').on('click', function(){
+ var indexs = layero.attr('times');
+ layer.close(indexs);
+ xxim.chatbox = null;
+ config.chating = {};
+ config.chatings = 0;
+ });
+
+ //关闭某个聊天
+ log.chatlist.on('mouseenter', 'li', function(){
+ $(this).find('em').show();
+ }).on('mouseleave', 'li', function(){
+ $(this).find('em').hide();
+ });
+ log.chatlist.on('click', 'li em', function(e){
+ var parents = $(this).parent(), dataType = parents.attr('type');
+ var dataId = parents.attr('data-id'), index = parents.index();
+ var chatlist = log.chatlist.find('li'), indexs;
+
+ config.stopMP(e);
+
+ delete config.chating[dataType + dataId];
+ config.chatings--;
+
+ parents.remove();
+ $('#layim_area'+ dataType + dataId).remove();
+ if(dataType === 'group'){
+ $('#layim_group'+ dataType + dataId).remove();
+ }
+
+ if(parents.hasClass('layim_chatnow')){
+ if(index === config.chatings){
+ indexs = index - 1;
+ } else {
+ indexs = index + 1;
+ }
+ xxim.tabchat(config.chating[chatlist.eq(indexs).attr('type') + chatlist.eq(indexs).attr('data-id')]);
+ }
+
+ if(log.chatlist.find('li').length === 1){
+ log.chatlist.parent().hide();
+ }
+ });
+
+ //聊天选项卡
+ log.chatlist.on('click', 'li', function(){
+ var othis = $(this), dataType = othis.attr('type'), dataId = othis.attr('data-id');
+ xxim.tabchat(config.chating[dataType + dataId]);
+ });
+
+ //发送热键切换
+ log.sendType = $('#layim_sendtype'), log.sendTypes = log.sendType.find('span');
+ $('#layim_enter').on('click', function(e){
+ config.stopMP(e);
+ log.sendType.show();
+ });
+ log.sendTypes.on('click', function(){
+ log.sendTypes.find('i').text('')
+ $(this).find('i').text('√');
+ });
+
+ xxim.transmit();
+ };
+
+ log.html = '<div class="layim_chatbox" id="layim_chatbox">'
+ +'<h6>'
+ +'<span class="layim_move"></span>'
+ +' <a href="'+ param.url +'" class="layim_face" target="_blank"><img src="'+ param.face +'" ></a>'
+ +' <a href="'+ param.url +'" class="layim_names" target="_blank">'+ param.name +'</a>'
+ +' <span class="layim_rightbtn">'
+ +' <i class="layer_setmin">—</i>'
+ +' <i class="layim_close">×</i>'
+ +' </span>'
+ +'</h6>'
+ +'<div class="layim_chatmore" id="layim_chatmore">'
+ +' <ul class="layim_chatlist"></ul>'
+ +'</div>'
+ +'<div class="layim_groups" id="layim_groups"></div>'
+ +'<div class="layim_chat">'
+ +' <div class="layim_chatarea" id="layim_chatarea">'
+ +' <ul class="layim_chatview layim_chatthis" id="layim_area'+ param.type + param.id +'"></ul>'
+ +' </div>'
+ +' <div class="layim_tool">'
+ +' <i class="layim_addface fa fa-meh-o" title="发送表情"></i>'
+ +' <a href="javascript:;"><i class="layim_addimage fa fa-picture-o" title="上传图片"></i></a>'
+ +' <a href="javascript:;"><i class="layim_addfile fa fa-paperclip" title="上传附件"></i></a>'
+ +' <a href="" target="_blank" class="layim_seechatlog"><i class="fa fa-comment-o"></i>聊天记录</a>'
+ +' </div>'
+ +' <textarea class="layim_write" id="layim_write"></textarea>'
+ +' <div class="layim_send">'
+ +' <div class="layim_sendbtn" id="layim_sendbtn">发送<span class="layim_enter" id="layim_enter"><em class="layim_zero"></em></span></div>'
+ +' <div class="layim_sendtype" id="layim_sendtype">'
+ +' <span><i>√</i>按Enter键发送</span>'
+ +' <span><i></i>按Ctrl+Enter键发送</span>'
+ +' </div>'
+ +' </div>'
+ +'</div>'
+ +'</div>';
+
+ if(config.chatings < 1){
+ $.layer({
+ type: 1,
+ border: [0],
+ title: false,
+ shade: [0],
+ area: ['620px', '493px'],
+ move: '.layim_chatbox .layim_move',
+ moveType: 1,
+ closeBtn: false,
+ offset: [(($(window).height() - 493)/2)+'px', ''],
+ page: {
+ html: log.html
+ }, success: function(layero){
+ log.success(layero);
+ }
+ })
+ } else {
+ log.chatmore = xxim.chatbox.find('#layim_chatmore');
+ log.chatarea = xxim.chatbox.find('#layim_chatarea');
+
+ log.chatmore.show();
+
+ log.chatmore.find('ul>li').removeClass('layim_chatnow');
+ log.chatmore.find('ul').append('<li data-id="'+ param.id +'" type="'+ param.type +'" id="layim_user'+ param.type + param.id +'" class="layim_chatnow"><span>'+ param.name +'</span><em>×</em></li>');
+
+ log.chatarea.find('.layim_chatview').removeClass('layim_chatthis');
+ log.chatarea.append('<ul class="layim_chatview layim_chatthis" id="layim_area'+ param.type + param.id +'"></ul>');
+
+ xxim.tabchat(param);
+ }
+
+ //群组
+ log.chatgroup = xxim.chatbox.find('#layim_groups');
+ if(param.type === 'group'){
+ log.chatgroup.find('ul').removeClass('layim_groupthis');
+ log.chatgroup.append('<ul class="layim_groupthis" id="layim_group'+ param.type + param.id +'"></ul>');
+ xxim.getGroups(param);
+ }
+ //点击群员切换聊天窗
+ log.chatgroup.on('click', 'ul>li', function(){
+ xxim.popchatbox($(this));
+ });
+};
+
+//定位到某个聊天队列
+xxim.tabchat = function(param){
+ var node = xxim.node, log = {}, keys = param.type + param.id;
+ xxim.nowchat = param;
+
+ xxim.chatbox.find('#layim_user'+ keys).addClass('layim_chatnow').siblings().removeClass('layim_chatnow');
+ xxim.chatbox.find('#layim_area'+ keys).addClass('layim_chatthis').siblings().removeClass('layim_chatthis');
+ xxim.chatbox.find('#layim_group'+ keys).addClass('layim_groupthis').siblings().removeClass('layim_groupthis');
+
+ xxim.chatbox.find('.layim_face>img').attr('src', param.face);
+ xxim.chatbox.find('.layim_face, .layim_names').attr('href', param.href);
+ xxim.chatbox.find('.layim_names').text(param.name);
+
+ xxim.chatbox.find('.layim_seechatlog').attr('href', config.chatlogurl + param.id);
+
+ log.groups = xxim.chatbox.find('.layim_groups');
+ if(param.type === 'group'){
+ log.groups.show();
+ } else {
+ log.groups.hide();
+ }
+
+ $('#layim_write').focus();
+
+};
+
+//弹出聊天窗
+xxim.popchatbox = function(othis){
+ var node = xxim.node, dataId = othis.attr('data-id'), param = {
+ id: dataId, //用户ID
+ type: othis.attr('type'),
+ name: othis.find('.xxim_onename').text(), //用户名
+ face: othis.find('.xxim_oneface').attr('src'), //用户头像
+ href: 'profile.html?user=' + dataId //用户主页
+ }, key = param.type + dataId;
+ if(!config.chating[key]){
+ xxim.popchat(param);
+ config.chatings++;
+ } else {
+ xxim.tabchat(param);
+ }
+ config.chating[key] = param;
+
+ var chatbox = $('#layim_chatbox');
+ if(chatbox[0]){
+ node.layimMin.hide();
+ chatbox.parents('.xubox_layer').show();
+ }
+};
+
+//请求群员
+xxim.getGroups = function(param){
+ var keys = param.type + param.id, str = '',
+ groupss = xxim.chatbox.find('#layim_group'+ keys);
+ groupss.addClass('loading');
+ config.json(config.api.groups, {}, function(datas){
+ if(datas.status === 1){
+ var ii = 0, lens = datas.data.length;
+ if(lens > 0){
+ for(; ii < lens; ii++){
+ str += '<li data-id="'+ datas.data[ii].id +'" type="one"><img src="'+ datas.data[ii].face +'" class="xxim_oneface"><span class="xxim_onename">'+ datas.data[ii].name +'</span></li>';
+ }
+ } else {
+ str = '<li class="layim_errors">没有群员</li>';
+ }
+
+ } else {
+ str = '<li class="layim_errors">'+ datas.msg +'</li>';
+ }
+ groupss.removeClass('loading');
+ groupss.html(str);
+ }, function(){
+ groupss.removeClass('loading');
+ groupss.html('<li class="layim_errors">请求异常</li>');
+ });
+};
+
+//消息传输
+xxim.transmit = function(){
+ var node = xxim.node, log = {};
+ node.sendbtn = $('#layim_sendbtn');
+ node.imwrite = $('#layim_write');
+
+ //发送
+ log.send = function(){
+ var data = {
+ content: node.imwrite.val(),
+ id: xxim.nowchat.id,
+ sign_key: '', //密匙
+ _: +new Date
+ };
+
+ if(data.content.replace(/\s/g, '') === ''){
+ layer.tips('说点啥呗！', '#layim_write', 2);
+ node.imwrite.focus();
+ } else {
+ //此处皆为模拟
+ var keys = xxim.nowchat.type + xxim.nowchat.id;
+
+ //聊天模版
+ log.html = function(param, type){
+ return '<li class="'+ (type === 'me' ? 'layim_chateme' : '') +'">'
+ +'<div class="layim_chatuser">'
+ + function(){
+ if(type === 'me'){
+ return '<span class="layim_chattime">'+ param.time +'</span>'
+ +'<span class="layim_chatname">'+ param.name +'</span>'
+ +'<img src="'+ param.face +'" >';
+ } else {
+ return '<img src="'+ param.face +'" >'
+ +'<span class="layim_chatname">'+ param.name +'</span>'
+ +'<span class="layim_chattime">'+ param.time +'</span>';
+ }
+ }()
+ +'</div>'
+ +'<div class="layim_chatsay">'+ param.content +'<em class="layim_zero"></em></div>'
+ +'</li>';
+ };
+
+ log.imarea = xxim.chatbox.find('#layim_area'+ keys);
+
+ log.imarea.append(log.html({
+ time: '2014-04-26 0:37',
+ name: config.user.name,
+ face: config.user.face,
+ content: data.content
+ }, 'me'));
+ node.imwrite.val('').focus();
+ log.imarea.scrollTop(log.imarea[0].scrollHeight);
+
+ setTimeout(function(){
+ log.imarea.append(log.html({
+ time: '2014-04-26 0:38',
+ name: xxim.nowchat.name,
+ face: xxim.nowchat.face,
+ content: config.autoReplay[(Math.random()*config.autoReplay.length) | 0]
+ }));
+ log.imarea.scrollTop(log.imarea[0].scrollHeight);
+ }, 500);
+
+ /*
+ that.json(config.api.sendurl, data, function(datas){
+
+ });
+ */
+ }
+
+ };
+ node.sendbtn.on('click', log.send);
+
+ node.imwrite.keyup(function(e){
+ if(e.keyCode === 13){
+ log.send();
+ }
+ });
+};
+
+//事件
+xxim.event = function(){
+ var node = xxim.node;
+
+ //主界面tab
+ node.tabs.eq(0).addClass('xxim_tabnow');
+ node.tabs.on('click', function(){
+ var othis = $(this), index = othis.index();
+ xxim.tabs(index);
+ });
+
+ //列表展收
+ node.list.on('click', 'h5', function(){
+ var othis = $(this), chat = othis.siblings('.xxim_chatlist'), parentss = othis.find("i");
+ if(parentss.hasClass('fa-caret-down')){
+ chat.hide();
+ parentss.attr('class','fa fa-caret-right');
+ } else {
+ chat.show();
+ parentss.attr('class','fa fa-caret-down');
+ }
+ });
+
+ //设置在线隐身
+ node.online.on('click', function(e){
+ config.stopMP(e);
+ node.setonline.show();
+ });
+ node.setonline.find('span').on('click', function(e){
+ var index = $(this).index();
+ config.stopMP(e);
+ if(index === 0){
+ node.onlinetex.html('在线');
+ node.online.removeClass('xxim_offline');
+ } else if(index === 1) {
+ node.onlinetex.html('隐身');
+ node.online.addClass('xxim_offline');
+ }
+ node.setonline.hide();
+ });
+
+ node.xximon.on('click', xxim.expend);
+ node.xximHide.on('click', xxim.expend);
+
+ //搜索
+ node.xximSearch.keyup(function(){
+ var val = $(this).val().replace(/\s/g, '');
+ if(val !== ''){
+ node.searchMian.show();
+ node.closeSearch.show();
+ //此处的搜索ajax参考xxim.getDates
+ node.list.eq(3).html('<li class="xxim_errormsg">没有符合条件的结果</li>');
+ } else {
+ node.searchMian.hide();
+ node.closeSearch.hide();
+ }
+ });
+ node.closeSearch.on('click', function(){
+ $(this).hide();
+ node.searchMian.hide();
+ node.xximSearch.val('').focus();
+ });
+
+ //弹出聊天窗
+ config.chatings = 0;
+ node.list.on('click', '.xxim_childnode', function(){
+ var othis = $(this);
+ xxim.popchatbox(othis);
+ });
+
+ //点击最小化栏
+ node.layimMin.on('click', function(){
+ $(this).hide();
+ $('#layim_chatbox').parents('.xubox_layer').show();
+ });
+
+
+ //document事件
+ dom[1].on('click', function(){
+ node.setonline.hide();
+ $('#layim_sendtype').hide();
+ });
+};
+
+//请求列表数据
+xxim.getDates = function(index){
+ var api = [config.api.friend, config.api.group, config.api.chatlog],
+ node = xxim.node, myf = node.list.eq(index);
+ myf.addClass('loading');
+ config.json(api[index], {}, function(datas){
+ if(datas.status === 1){
+ var i = 0, myflen = datas.data.length, str = '', item;
+ if(myflen > 1){
+ if(index !== 2){
+ for(; i < myflen; i++){
+ str += '<li data-id="'+ datas.data[i].id +'" class="xxim_parentnode">'
+ +'<h5><i class="fa fa-caret-right"></i><span class="xxim_parentname">'+ datas.data[i].name +'</span><em class="xxim_nums">（'+ datas.data[i].nums +'）</em></h5>'
+ +'<ul class="xxim_chatlist">';
+ item = datas.data[i].item;
+ for(var j = 0; j < item.length; j++){
+ str += '<li data-id="'+ item[j].id +'" class="xxim_childnode" type="'+ (index === 0 ? 'one' : 'group') +'"><img src="'+ item[j].face +'" class="xxim_oneface"><span class="xxim_onename">'+ item[j].name +'</span></li>';
+ }
+ str += '</ul></li>';
+ }
+ } else {
+ str += '<li class="xxim_liston">'
+ +'<ul class="xxim_chatlist">';
+ for(; i < myflen; i++){
+ str += '<li data-id="'+ datas.data[i].id +'" class="xxim_childnode" type="one"><img src="'+ datas.data[i].face +'" class="xxim_oneface"><span class="xxim_onename">'+ datas.data[i].name +'</span><em class="xxim_time">'+ datas.data[i].time +'</em></li>';
+ }
+ str += '</ul></li>';
+ }
+ myf.html(str);
+ } else {
+ myf.html('<li class="xxim_errormsg">没有任何数据</li>');
+ }
+ myf.removeClass('loading');
+ } else {
+ myf.html('<li class="xxim_errormsg">'+ datas.msg +'</li>');
+ }
+ }, function(){
+ myf.html('<li class="xxim_errormsg">请求失败</li>');
+ myf.removeClass('loading');
+ });
+};
+
+//渲染骨架
+xxim.view = (function(){
+ var xximNode = xxim.layimNode = $('<div id="xximmm" class="xxim_main">'
+ +'<div class="xxim_top" id="xxim_top">'
+ +' <div class="xxim_search"><i class="fa fa-search"></i><input id="xxim_searchkey" /><span id="xxim_closesearch">×</span></div>'
+ +' <div class="xxim_tabs" id="xxim_tabs"><span class="xxim_tabfriend" title="好友"><i class="fa fa-user"></i></span><span class="xxim_tabgroup" title="群组"><i class="fa fa-users"></i></span><span class="xxim_latechat" title="最近聊天"><i class="fa fa-clock-o"></i></span></div>'
+ +' <ul class="xxim_list" style="display:block"></ul>'
+ +' <ul class="xxim_list"></ul>'
+ +' <ul class="xxim_list"></ul>'
+ +' <ul class="xxim_list xxim_searchmain" id="xxim_searchmain"></ul>'
+ +'</div>'
+ +'<ul class="xxim_bottom" id="xxim_bottom">'
+ +'<li class="xxim_online" id="xxim_online">'
+ +'<i class="xxim_nowstate fa fa-check-circle"></i><span id="xxim_onlinetex">在线</span>'
+ +'<div class="xxim_setonline">'
+ +'<span><i class="fa fa-check-circle"></i>在线</span>'
+ +'<span class="xxim_setoffline"><i class="fa fa-check-circle"></i>隐身</span>'
+ +'</div>'
+ +'</li>'
+ +'<li class="xxim_mymsg" id="xxim_mymsg" title="我的私信"><i class="fa fa-comment"></i><a href="'+ config.msgurl +'" target="_blank"></a></li>'
+ +'<li class="xxim_seter" id="xxim_seter" title="设置">'
+ +'<i class="fa fa-gear"></i>'
+ +'<div>'
+
+ +'</div>'
+ +'</li>'
+ +'<li class="xxim_hide" id="xxim_hide"><i class="fa fa-exchange"></i></li>'
+ +'<li id="xxim_on" class="xxim_icon xxim_on fa fa-ellipsis-v"></li>'
+ +'<div class="layim_min" id="layim_min"></div>'
+ +'</ul>'
+ +'</div>');
+ dom[3].append(xximNode);
+
+ xxim.renode();
+ xxim.getDates(0);
+ xxim.event();
+ xxim.layinit();
+}());
+
+}(window);
+
diff --git a/management/guns-admin/src/main/webapp/static/js/plugins/layer/layim/loading.gif b/management/guns-admin/src/main/webapp/static/js/plugins/layer/layim/loading.gif
new file mode 100644
index 0000000..059b1ac
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/static/js/plugins/layer/layim/loading.gif
Binary files differ
diff --git a/management/guns-admin/src/main/webapp/static/js/plugins/layer/mobile/layer.js b/management/guns-admin/src/main/webapp/static/js/plugins/layer/mobile/layer.js
new file mode 100644
index 0000000..f9cf693
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/static/js/plugins/layer/mobile/layer.js
@@ -0,0 +1,2 @@
+/*! layer mobile-v2.0.0 Web弹层组件 MIT License http://layer.layui.com/mobile By 贤心 */
+ ;!function(e){"use strict";var t=document,n="querySelectorAll",i="getElementsByClassName",a=function(e){return t[n](e)},s={type:0,shade:!0,shadeClose:!0,fixed:!0,anim:"scale"},l={extend:function(e){var t=JSON.parse(JSON.stringify(s));for(var n in e)t[n]=e[n];return t},timer:{},end:{}};l.touch=function(e,t){e.addEventListener("click",function(e){t.call(this,e)},!1)};var r=0,o=["layui-m-layer"],c=function(e){var t=this;t.config=l.extend(e),t.view()};c.prototype.view=function(){var e=this,n=e.config,s=t.createElement("div");e.id=s.id=o[0]+r,s.setAttribute("class",o[0]+" "+o[0]+(n.type||0)),s.setAttribute("index",r);var l=function(){var e="object"==typeof n.title;return n.title?'<h3 style="'+(e?n.title[1]:"")+'">'+(e?n.title[0]:n.title)+"</h3>":""}(),c=function(){"string"==typeof n.btn&&(n.btn=[n.btn]);var e,t=(n.btn||[]).length;return 0!==t&&n.btn?(e='<span yes type="1">'+n.btn[0]+"</span>",2===t&&(e='<span no type="0">'+n.btn[1]+"</span>"+e),'<div class="layui-m-layerbtn">'+e+"</div>"):""}();if(n.fixed||(n.top=n.hasOwnProperty("top")?n.top:100,n.style=n.style||"",n.style+=" top:"+(t.body.scrollTop+n.top)+"px"),2===n.type&&(n.content='<i></i><i class="layui-m-layerload"></i><i></i><p>'+(n.content||"")+"</p>"),n.skin&&(n.anim="up"),"msg"===n.skin&&(n.shade=!1),s.innerHTML=(n.shade?"<div "+("string"==typeof n.shade?'style="'+n.shade+'"':"")+' class="layui-m-layershade"></div>':"")+'<div class="layui-m-layermain" '+(n.fixed?"":'style="position:static;"')+'><div class="layui-m-layersection"><div class="layui-m-layerchild '+(n.skin?"layui-m-layer-"+n.skin+" ":"")+(n.className?n.className:"")+" "+(n.anim?"layui-m-anim-"+n.anim:"")+'" '+(n.style?'style="'+n.style+'"':"")+">"+l+'<div class="layui-m-layercont">'+n.content+"</div>"+c+"</div></div></div>",!n.type||2===n.type){var d=t[i](o[0]+n.type),y=d.length;y>=1&&layer.close(d[0].getAttribute("index"))}document.body.appendChild(s);var u=e.elem=a("#"+e.id)[0];n.success&&n.success(u),e.index=r++,e.action(n,u)},c.prototype.action=function(e,t){var n=this;e.time&&(l.timer[n.index]=setTimeout(function(){layer.close(n.index)},1e3*e.time));var a=function(){var t=this.getAttribute("type");0==t?(e.no&&e.no(),layer.close(n.index)):e.yes?e.yes(n.index):layer.close(n.index)};if(e.btn)for(var s=t[i]("layui-m-layerbtn")[0].children,r=s.length,o=0;o<r;o++)l.touch(s[o],a);if(e.shade&&e.shadeClose){var c=t[i]("layui-m-layershade")[0];l.touch(c,function(){layer.close(n.index,e.end)})}e.end&&(l.end[n.index]=e.end)},e.layer={v:"2.0",index:r,open:function(e){var t=new c(e||{});return t.index},close:function(e){var n=a("#"+o[0]+e)[0];n&&(n.innerHTML="",t.body.removeChild(n),clearTimeout(l.timer[e]),delete l.timer[e],"function"==typeof l.end[e]&&l.end[e](),delete l.end[e])},closeAll:function(){for(var e=t[i](o[0]),n=0,a=e.length;n<a;n++)layer.close(0|e[0].getAttribute("index"))}},"function"==typeof define?define(function(){return layer}):function(){var e=document.scripts,n=e[e.length-1],i=n.src,a=i.substring(0,i.lastIndexOf("/")+1);n.getAttribute("merge")||document.head.appendChild(function(){var e=t.createElement("link");return e.href=a+"need/layer.css?2.0",e.type="text/css",e.rel="styleSheet",e.id="layermcss",e}())}()}(window);
\ No newline at end of file
diff --git a/management/guns-admin/src/main/webapp/static/js/plugins/layer/mobile/need/layer.css b/management/guns-admin/src/main/webapp/static/js/plugins/layer/mobile/need/layer.css
new file mode 100644
index 0000000..b9dbf20
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/static/js/plugins/layer/mobile/need/layer.css
@@ -0,0 +1 @@
+.layui-m-layer{position:relative;z-index:19891014}.layui-m-layer *{-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box}.layui-m-layermain,.layui-m-layershade{position:fixed;left:0;top:0;width:100%;height:100%}.layui-m-layershade{background-color:rgba(0,0,0,.7);pointer-events:auto}.layui-m-layermain{display:table;font-family:Helvetica,arial,sans-serif;pointer-events:none}.layui-m-layermain .layui-m-layersection{display:table-cell;vertical-align:middle;text-align:center}.layui-m-layerchild{position:relative;display:inline-block;text-align:left;background-color:#fff;font-size:14px;border-radius:5px;box-shadow:0 0 8px rgba(0,0,0,.1);pointer-events:auto;-webkit-overflow-scrolling:touch;-webkit-animation-fill-mode:both;animation-fill-mode:both;-webkit-animation-duration:.2s;animation-duration:.2s}@-webkit-keyframes layui-m-anim-scale{0%{opacity:0;-webkit-transform:scale(.5);transform:scale(.5)}100%{opacity:1;-webkit-transform:scale(1);transform:scale(1)}}@keyframes layui-m-anim-scale{0%{opacity:0;-webkit-transform:scale(.5);transform:scale(.5)}100%{opacity:1;-webkit-transform:scale(1);transform:scale(1)}}.layui-m-anim-scale{animation-name:layui-m-anim-scale;-webkit-animation-name:layui-m-anim-scale}@-webkit-keyframes layui-m-anim-up{0%{opacity:0;-webkit-transform:translateY(800px);transform:translateY(800px)}100%{opacity:1;-webkit-transform:translateY(0);transform:translateY(0)}}@keyframes layui-m-anim-up{0%{opacity:0;-webkit-transform:translateY(800px);transform:translateY(800px)}100%{opacity:1;-webkit-transform:translateY(0);transform:translateY(0)}}.layui-m-anim-up{-webkit-animation-name:layui-m-anim-up;animation-name:layui-m-anim-up}.layui-m-layer0 .layui-m-layerchild{width:90%;max-width:640px}.layui-m-layer1 .layui-m-layerchild{border:none;border-radius:0}.layui-m-layer2 .layui-m-layerchild{width:auto;max-width:260px;min-width:40px;border:none;background:0 0;box-shadow:none;color:#fff}.layui-m-layerchild h3{padding:0 10px;height:60px;line-height:60px;font-size:16px;font-weight:400;border-radius:5px 5px 0 0;text-align:center}.layui-m-layerbtn span,.layui-m-layerchild h3{text-overflow:ellipsis;overflow:hidden;white-space:nowrap}.layui-m-layercont{padding:50px 30px;line-height:22px;text-align:center}.layui-m-layer1 .layui-m-layercont{padding:0;text-align:left}.layui-m-layer2 .layui-m-layercont{text-align:center;padding:0;line-height:0}.layui-m-layer2 .layui-m-layercont i{width:25px;height:25px;margin-left:8px;display:inline-block;background-color:#fff;border-radius:100%;-webkit-animation:layui-m-anim-loading 1.4s infinite ease-in-out;animation:layui-m-anim-loading 1.4s infinite ease-in-out;-webkit-animation-fill-mode:both;animation-fill-mode:both}.layui-m-layerbtn,.layui-m-layerbtn span{position:relative;text-align:center;border-radius:0 0 5px 5px}.layui-m-layer2 .layui-m-layercont p{margin-top:20px}@-webkit-keyframes layui-m-anim-loading{0%,100%,80%{transform:scale(0);-webkit-transform:scale(0)}40%{transform:scale(1);-webkit-transform:scale(1)}}@keyframes layui-m-anim-loading{0%,100%,80%{transform:scale(0);-webkit-transform:scale(0)}40%{transform:scale(1);-webkit-transform:scale(1)}}.layui-m-layer2 .layui-m-layercont i:first-child{margin-left:0;-webkit-animation-delay:-.32s;animation-delay:-.32s}.layui-m-layer2 .layui-m-layercont i.layui-m-layerload{-webkit-animation-delay:-.16s;animation-delay:-.16s}.layui-m-layer2 .layui-m-layercont>div{line-height:22px;padding-top:7px;margin-bottom:20px;font-size:14px}.layui-m-layerbtn{display:box;display:-moz-box;display:-webkit-box;width:100%;height:50px;line-height:50px;font-size:0;border-top:1px solid #D0D0D0;background-color:#F2F2F2}.layui-m-layerbtn span{display:block;-moz-box-flex:1;box-flex:1;-webkit-box-flex:1;font-size:14px;cursor:pointer}.layui-m-layerbtn span[yes]{color:#40AFFE}.layui-m-layerbtn span[no]{border-right:1px solid #D0D0D0;border-radius:0 0 0 5px}.layui-m-layerbtn span:active{background-color:#F6F6F6}.layui-m-layerend{position:absolute;right:7px;top:10px;width:30px;height:30px;border:0;font-weight:400;background:0 0;cursor:pointer;-webkit-appearance:none;font-size:30px}.layui-m-layerend::after,.layui-m-layerend::before{position:absolute;left:5px;top:15px;content:'';width:18px;height:1px;background-color:#999;transform:rotate(45deg);-webkit-transform:rotate(45deg);border-radius:3px}.layui-m-layerend::after{transform:rotate(-45deg);-webkit-transform:rotate(-45deg)}body .layui-m-layer .layui-m-layer-footer{position:fixed;width:95%;max-width:100%;margin:0 auto;left:0;right:0;bottom:10px;background:0 0}.layui-m-layer-footer .layui-m-layercont{padding:20px;border-radius:5px 5px 0 0;background-color:rgba(255,255,255,.8)}.layui-m-layer-footer .layui-m-layerbtn{display:block;height:auto;background:0 0;border-top:none}.layui-m-layer-footer .layui-m-layerbtn span{background-color:rgba(255,255,255,.8)}.layui-m-layer-footer .layui-m-layerbtn span[no]{color:#FD482C;border-top:1px solid #c2c2c2;border-radius:0 0 5px 5px}.layui-m-layer-footer .layui-m-layerbtn span[yes]{margin-top:10px;border-radius:5px}body .layui-m-layer .layui-m-layer-msg{width:auto;max-width:90%;margin:0 auto;bottom:-150px;background-color:rgba(0,0,0,.7);color:#fff}.layui-m-layer-msg .layui-m-layercont{padding:10px 20px}
\ No newline at end of file
diff --git a/management/guns-admin/src/main/webapp/static/js/plugins/layer/skin/default/icon-ext.png b/management/guns-admin/src/main/webapp/static/js/plugins/layer/skin/default/icon-ext.png
new file mode 100644
index 0000000..bbbb669
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/static/js/plugins/layer/skin/default/icon-ext.png
Binary files differ
diff --git a/management/guns-admin/src/main/webapp/static/js/plugins/layer/skin/default/icon.png b/management/guns-admin/src/main/webapp/static/js/plugins/layer/skin/default/icon.png
new file mode 100644
index 0000000..b5c8f1e
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/static/js/plugins/layer/skin/default/icon.png
Binary files differ
diff --git a/management/guns-admin/src/main/webapp/static/js/plugins/layer/skin/default/icon_ext.png b/management/guns-admin/src/main/webapp/static/js/plugins/layer/skin/default/icon_ext.png
new file mode 100644
index 0000000..8baee59
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/static/js/plugins/layer/skin/default/icon_ext.png
Binary files differ
diff --git a/management/guns-admin/src/main/webapp/static/js/plugins/layer/skin/default/loading-0.gif b/management/guns-admin/src/main/webapp/static/js/plugins/layer/skin/default/loading-0.gif
new file mode 100644
index 0000000..6f3c953
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/static/js/plugins/layer/skin/default/loading-0.gif
Binary files differ
diff --git a/management/guns-admin/src/main/webapp/static/js/plugins/layer/skin/default/loading-1.gif b/management/guns-admin/src/main/webapp/static/js/plugins/layer/skin/default/loading-1.gif
new file mode 100644
index 0000000..db3a483
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/static/js/plugins/layer/skin/default/loading-1.gif
Binary files differ
diff --git a/management/guns-admin/src/main/webapp/static/js/plugins/layer/skin/default/loading-2.gif b/management/guns-admin/src/main/webapp/static/js/plugins/layer/skin/default/loading-2.gif
new file mode 100644
index 0000000..5bb90fd
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/static/js/plugins/layer/skin/default/loading-2.gif
Binary files differ
diff --git a/management/guns-admin/src/main/webapp/static/js/plugins/layer/skin/default/textbg.png b/management/guns-admin/src/main/webapp/static/js/plugins/layer/skin/default/textbg.png
new file mode 100644
index 0000000..ad1040c
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/static/js/plugins/layer/skin/default/textbg.png
Binary files differ
diff --git a/management/guns-admin/src/main/webapp/static/js/plugins/layer/skin/default/xubox_ico0.png b/management/guns-admin/src/main/webapp/static/js/plugins/layer/skin/default/xubox_ico0.png
new file mode 100644
index 0000000..7754a47
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/static/js/plugins/layer/skin/default/xubox_ico0.png
Binary files differ
diff --git a/management/guns-admin/src/main/webapp/static/js/plugins/layer/skin/default/xubox_loading0.gif b/management/guns-admin/src/main/webapp/static/js/plugins/layer/skin/default/xubox_loading0.gif
new file mode 100644
index 0000000..6f3c953
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/static/js/plugins/layer/skin/default/xubox_loading0.gif
Binary files differ
diff --git a/management/guns-admin/src/main/webapp/static/js/plugins/layer/skin/default/xubox_loading1.gif b/management/guns-admin/src/main/webapp/static/js/plugins/layer/skin/default/xubox_loading1.gif
new file mode 100644
index 0000000..db3a483
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/static/js/plugins/layer/skin/default/xubox_loading1.gif
Binary files differ
diff --git a/management/guns-admin/src/main/webapp/static/js/plugins/layer/skin/default/xubox_loading2.gif b/management/guns-admin/src/main/webapp/static/js/plugins/layer/skin/default/xubox_loading2.gif
new file mode 100644
index 0000000..5bb90fd
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/static/js/plugins/layer/skin/default/xubox_loading2.gif
Binary files differ
diff --git a/management/guns-admin/src/main/webapp/static/js/plugins/layer/skin/default/xubox_loading3.gif b/management/guns-admin/src/main/webapp/static/js/plugins/layer/skin/default/xubox_loading3.gif
new file mode 100644
index 0000000..fbe57be
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/static/js/plugins/layer/skin/default/xubox_loading3.gif
Binary files differ
diff --git a/management/guns-admin/src/main/webapp/static/js/plugins/layer/skin/default/xubox_title0.png b/management/guns-admin/src/main/webapp/static/js/plugins/layer/skin/default/xubox_title0.png
new file mode 100644
index 0000000..4ffbe31
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/static/js/plugins/layer/skin/default/xubox_title0.png
Binary files differ
diff --git a/management/guns-admin/src/main/webapp/static/js/plugins/layer/skin/layer.css b/management/guns-admin/src/main/webapp/static/js/plugins/layer/skin/layer.css
new file mode 100644
index 0000000..c6bc000
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/static/js/plugins/layer/skin/layer.css
@@ -0,0 +1,7 @@
+/*!
+
+ @Name: layer's style
+ @Author: 贤心
+ @Blog： sentsin.com
+
+ */*html{background-image:url(about:blank);background-attachment:fixed}html #layui_layer_skinlayercss{display:none;position:absolute;width:1989px}.layui-layer,.layui-layer-shade{position:fixed;_position:absolute;pointer-events:auto}.layui-layer-shade{top:0;left:0;width:100%;height:100%;_height:expression(document.body.offsetHeight+"px")}.layui-layer{top:150px;left:50%;margin:0;padding:0;background-color:#fff;-webkit-background-clip:content;box-shadow:1px 1px 50px rgba(0,0,0,.3);border-radius:2px;-webkit-animation-fill-mode:both;animation-fill-mode:both;-webkit-animation-duration:.3s;animation-duration:.3s}.layui-layer-close{position:absolute}.layui-layer-content{position:relative}.layui-layer-border{border:1px solid #B2B2B2;border:1px solid rgba(0,0,0,.3);box-shadow:1px 1px 5px rgba(0,0,0,.2)}.layui-layer-moves{position:absolute;border:3px solid #666;border:3px solid rgba(0,0,0,.5);cursor:move;background-color:#fff;background-color:rgba(255,255,255,.3);filter:alpha(opacity=50)}.layui-layer-load{background:url(default/loading-0.gif) center center no-repeat #fff}.layui-layer-ico{background:url(default/icon.png) no-repeat}.layui-layer-btn a,.layui-layer-dialog .layui-layer-ico,.layui-layer-setwin a{display:inline-block;*display:inline;*zoom:1;vertical-align:top}@-webkit-keyframes bounceIn{0%{opacity:0;-webkit-transform:scale(.5);transform:scale(.5)}100%{opacity:1;-webkit-transform:scale(1);transform:scale(1)}}@keyframes bounceIn{0%{opacity:0;-webkit-transform:scale(.5);-ms-transform:scale(.5);transform:scale(.5)}100%{opacity:1;-webkit-transform:scale(1);-ms-transform:scale(1);transform:scale(1)}}.layui-anim{-webkit-animation-name:bounceIn;animation-name:bounceIn}@-webkit-keyframes bounceOut{100%{opacity:0;-webkit-transform:scale(.7);transform:scale(.7)}30%{-webkit-transform:scale(1.03);transform:scale(1.03)}0%{-webkit-transform:scale(1);transform:scale(1)}}@keyframes bounceOut{100%{opacity:0;-webkit-transform:scale(.7);-ms-transform:scale(.7);transform:scale(.7)}30%{-webkit-transform:scale(1.03);-ms-transform:scale(1.03);transform:scale(1.03)}0%{-webkit-transform:scale(1);-ms-transform:scale(1);transform:scale(1)}}.layui-anim-close{-webkit-animation-name:bounceOut;animation-name:bounceOut;-webkit-animation-duration:.2s;animation-duration:.2s}@-webkit-keyframes zoomInDown{0%{opacity:0;-webkit-transform:scale(.1) translateY(-2000px);transform:scale(.1) translateY(-2000px);-webkit-animation-timing-function:ease-in-out;animation-timing-function:ease-in-out}60%{opacity:1;-webkit-transform:scale(.475) translateY(60px);transform:scale(.475) translateY(60px);-webkit-animation-timing-function:ease-out;animation-timing-function:ease-out}}@keyframes zoomInDown{0%{opacity:0;-webkit-transform:scale(.1) translateY(-2000px);-ms-transform:scale(.1) translateY(-2000px);transform:scale(.1) translateY(-2000px);-webkit-animation-timing-function:ease-in-out;animation-timing-function:ease-in-out}60%{opacity:1;-webkit-transform:scale(.475) translateY(60px);-ms-transform:scale(.475) translateY(60px);transform:scale(.475) translateY(60px);-webkit-animation-timing-function:ease-out;animation-timing-function:ease-out}}.layui-anim-01{-webkit-animation-name:zoomInDown;animation-name:zoomInDown}@-webkit-keyframes fadeInUpBig{0%{opacity:0;-webkit-transform:translateY(2000px);transform:translateY(2000px)}100%{opacity:1;-webkit-transform:translateY(0);transform:translateY(0)}}@keyframes fadeInUpBig{0%{opacity:0;-webkit-transform:translateY(2000px);-ms-transform:translateY(2000px);transform:translateY(2000px)}100%{opacity:1;-webkit-transform:translateY(0);-ms-transform:translateY(0);transform:translateY(0)}}.layui-anim-02{-webkit-animation-name:fadeInUpBig;animation-name:fadeInUpBig}@-webkit-keyframes zoomInLeft{0%{opacity:0;-webkit-transform:scale(.1) translateX(-2000px);transform:scale(.1) translateX(-2000px);-webkit-animation-timing-function:ease-in-out;animation-timing-function:ease-in-out}60%{opacity:1;-webkit-transform:scale(.475) translateX(48px);transform:scale(.475) translateX(48px);-webkit-animation-timing-function:ease-out;animation-timing-function:ease-out}}@keyframes zoomInLeft{0%{opacity:0;-webkit-transform:scale(.1) translateX(-2000px);-ms-transform:scale(.1) translateX(-2000px);transform:scale(.1) translateX(-2000px);-webkit-animation-timing-function:ease-in-out;animation-timing-function:ease-in-out}60%{opacity:1;-webkit-transform:scale(.475) translateX(48px);-ms-transform:scale(.475) translateX(48px);transform:scale(.475) translateX(48px);-webkit-animation-timing-function:ease-out;animation-timing-function:ease-out}}.layui-anim-03{-webkit-animation-name:zoomInLeft;animation-name:zoomInLeft}@-webkit-keyframes rollIn{0%{opacity:0;-webkit-transform:translateX(-100%) rotate(-120deg);transform:translateX(-100%) rotate(-120deg)}100%{opacity:1;-webkit-transform:translateX(0) rotate(0);transform:translateX(0) rotate(0)}}@keyframes rollIn{0%{opacity:0;-webkit-transform:translateX(-100%) rotate(-120deg);-ms-transform:translateX(-100%) rotate(-120deg);transform:translateX(-100%) rotate(-120deg)}100%{opacity:1;-webkit-transform:translateX(0) rotate(0);-ms-transform:translateX(0) rotate(0);transform:translateX(0) rotate(0)}}.layui-anim-04{-webkit-animation-name:rollIn;animation-name:rollIn}@keyframes fadeIn{0%{opacity:0}100%{opacity:1}}.layui-anim-05{-webkit-animation-name:fadeIn;animation-name:fadeIn}@-webkit-keyframes shake{0%,100%{-webkit-transform:translateX(0);transform:translateX(0)}10%,30%,50%,70%,90%{-webkit-transform:translateX(-10px);transform:translateX(-10px)}20%,40%,60%,80%{-webkit-transform:translateX(10px);transform:translateX(10px)}}@keyframes shake{0%,100%{-webkit-transform:translateX(0);-ms-transform:translateX(0);transform:translateX(0)}10%,30%,50%,70%,90%{-webkit-transform:translateX(-10px);-ms-transform:translateX(-10px);transform:translateX(-10px)}20%,40%,60%,80%{-webkit-transform:translateX(10px);-ms-transform:translateX(10px);transform:translateX(10px)}}.layui-anim-06{-webkit-animation-name:shake;animation-name:shake}@-webkit-keyframes fadeIn{0%{opacity:0}100%{opacity:1}}.layui-layer-title{padding:0 80px 0 20px;height:42px;line-height:42px;border-bottom:1px solid #eee;font-size:14px;color:#333;overflow:hidden;text-overflow:ellipsis;white-space:nowrap;background-color:#F8F8F8}.layui-layer-setwin{position:absolute;right:15px;*right:0;top:15px;font-size:0;line-height:initial}.layui-layer-setwin a{position:relative;width:16px;height:16px;margin-left:10px;font-size:12px;_overflow:hidden}.layui-layer-setwin .layui-layer-min cite{position:absolute;width:14px;height:2px;left:0;top:50%;margin-top:-1px;background-color:#2E2D3C;cursor:pointer;_overflow:hidden}.layui-layer-setwin .layui-layer-min:hover cite{background-color:#2D93CA}.layui-layer-setwin .layui-layer-max{background-position:-32px -40px}.layui-layer-setwin .layui-layer-max:hover{background-position:-16px -40px}.layui-layer-setwin .layui-layer-maxmin{background-position:-65px -40px}.layui-layer-setwin .layui-layer-maxmin:hover{background-position:-49px -40px}.layui-layer-setwin .layui-layer-close1{background-position:0 -40px;cursor:pointer}.layui-layer-setwin .layui-layer-close1:hover{opacity:.7}.layui-layer-setwin .layui-layer-close2{position:absolute;right:-28px;top:-28px;width:30px;height:30px;margin-left:0;background-position:-150px -31px;*right:-18px;_display:none}.layui-layer-setwin .layui-layer-close2:hover{background-position:-181px -31px}.layui-layer-btn{text-align:right;padding:0 10px 12px;pointer-events:auto}.layui-layer-btn a{height:28px;line-height:28px;margin:0 6px;padding:0 15px;border:1px solid #dedede;background-color:#f1f1f1;color:#333;border-radius:2px;font-weight:400;cursor:pointer;text-decoration:none}.layui-layer-btn a:hover{opacity:.9;text-decoration:none}.layui-layer-btn a:active{opacity:.7}.layui-layer-btn .layui-layer-btn0{border-color:#4898d5;background-color:#2e8ded;color:#fff}.layui-layer-dialog{min-width:260px}.layui-layer-dialog .layui-layer-content{position:relative;padding:20px;line-height:24px;word-break:break-all;font-size:14px;overflow:auto}.layui-layer-dialog .layui-layer-content .layui-layer-ico{position:absolute;top:16px;left:15px;_left:-40px;width:30px;height:30px}.layui-layer-ico1{background-position:-30px 0}.layui-layer-ico2{background-position:-60px 0}.layui-layer-ico3{background-position:-90px 0}.layui-layer-ico4{background-position:-120px 0}.layui-layer-ico5{background-position:-150px 0}.layui-layer-ico6{background-position:-180px 0}.layui-layer-rim{border:6px solid #8D8D8D;border:6px solid rgba(0,0,0,.3);border-radius:5px;box-shadow:none}.layui-layer-msg{min-width:180px;border:1px solid #D3D4D3;box-shadow:none}.layui-layer-hui{min-width:100px;background-color:#000;filter:alpha(opacity=60);background-color:rgba(0,0,0,.6);color:#fff;border:none}.layui-layer-hui .layui-layer-content{padding:12px 25px;text-align:center}.layui-layer-dialog .layui-layer-padding{padding:20px 20px 20px 55px;text-align:left}.layui-layer-page .layui-layer-content{position:relative;overflow:auto}.layui-layer-iframe .layui-layer-btn,.layui-layer-page .layui-layer-btn{padding-top:10px}.layui-layer-nobg{background:0 0}.layui-layer-iframe .layui-layer-content{overflow:hidden}.layui-layer-iframe iframe{display:block;width:100%}.layui-layer-loading{border-radius:100%;background:0 0;box-shadow:none;border:none}.layui-layer-loading .layui-layer-content{width:60px;height:24px;background:url(default/loading-0.gif) no-repeat}.layui-layer-loading .layui-layer-loading1{width:37px;height:37px;background:url(default/loading-1.gif) no-repeat}.layui-layer-ico16,.layui-layer-loading .layui-layer-loading2{width:32px;height:32px;background:url(default/loading-2.gif) no-repeat}.layui-layer-tips{background:0 0;box-shadow:none;border:none}.layui-layer-tips .layui-layer-content{position:relative;line-height:22px;min-width:12px;padding:5px 10px;font-size:12px;_float:left;border-radius:3px;box-shadow:1px 1px 3px rgba(0,0,0,.3);background-color:#F90;color:#fff}.layui-layer-tips .layui-layer-close{right:-2px;top:-1px}.layui-layer-tips i.layui-layer-TipsG{position:absolute;width:0;height:0;border-width:8px;border-color:transparent;border-style:dashed;*overflow:hidden}.layui-layer-tips i.layui-layer-TipsB,.layui-layer-tips i.layui-layer-TipsT{left:5px;border-right-style:solid;border-right-color:#F90}.layui-layer-tips i.layui-layer-TipsT{bottom:-8px}.layui-layer-tips i.layui-layer-TipsB{top:-8px}.layui-layer-tips i.layui-layer-TipsL,.layui-layer-tips i.layui-layer-TipsR{top:1px;border-bottom-style:solid;border-bottom-color:#F90}.layui-layer-tips i.layui-layer-TipsR{left:-8px}.layui-layer-tips i.layui-layer-TipsL{right:-8px}.layui-layer-lan[type=dialog]{min-width:280px}.layui-layer-lan .layui-layer-title{background:#4476A7;color:#fff;border:none}.layui-layer-lan .layui-layer-lan .layui-layer-btn{padding:10px;text-align:right;border-top:1px solid #E9E7E7}.layui-layer-lan .layui-layer-btn a{background:#BBB5B5;border:none}.layui-layer-lan .layui-layer-btn .layui-layer-btn1{background:#C9C5C5}.layui-layer-molv .layui-layer-title{background:#009f95;color:#fff;border:none}.layui-layer-molv .layui-layer-btn a{background:#009f95}.layui-layer-molv .layui-layer-btn .layui-layer-btn1{background:#92B8B1}
diff --git a/management/guns-admin/src/main/webapp/static/js/plugins/layer/skin/layer.ext.css b/management/guns-admin/src/main/webapp/static/js/plugins/layer/skin/layer.ext.css
new file mode 100644
index 0000000..95c9bb4
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/static/js/plugins/layer/skin/layer.ext.css
@@ -0,0 +1,8 @@
+/*!
+
+ @Name: layer拓展样式
+ @Date: 2012.12.13
+ @Author: 贤心
+ @blog: sentsin.com
+
+ */.layui-layer-imgbar,.layui-layer-imgtit a,.layui-layer-tab .layui-layer-title span{text-overflow:ellipsis;white-space:nowrap}.layui-layer-iconext{background:url(default/icon-ext.png) no-repeat}html #layui_layer_skinlayerextcss{display:none;position:absolute;width:1989px}.layui-layer-prompt .layui-layer-input{display:block;width:220px;height:30px;margin:0 auto;line-height:30px;padding:0 5px;border:1px solid #ccc;box-shadow:1px 1px 5px rgba(0,0,0,.1) inset;color:#333}.layui-layer-prompt textarea.layui-layer-input{width:300px;height:100px;line-height:20px}.layui-layer-tab{box-shadow:1px 1px 50px rgba(0,0,0,.4)}.layui-layer-tab .layui-layer-title{padding-left:0;border-bottom:1px solid #ccc;background-color:#eee;overflow:visible}.layui-layer-tab .layui-layer-title span{position:relative;float:left;min-width:80px;max-width:260px;padding:0 20px;text-align:center;cursor:default;overflow:hidden}.layui-layer-tab .layui-layer-title span.layui-layer-tabnow{height:43px;border-left:1px solid #ccc;border-right:1px solid #ccc;background-color:#fff;z-index:10}.layui-layer-tab .layui-layer-title span:first-child{border-left:none}.layui-layer-tabmain{line-height:24px;clear:both}.layui-layer-tabmain .layui-layer-tabli{display:none}.layui-layer-tabmain .layui-layer-tabli.xubox_tab_layer{display:block}.xubox_tabclose{position:absolute;right:10px;top:5px;cursor:pointer}.layui-layer-photos{-webkit-animation-duration:1s;animation-duration:1s;background:url(default/xubox_loading1.gif) center center no-repeat #000}.layui-layer-photos .layui-layer-content{overflow:hidden;text-align:center}.layui-layer-photos .layui-layer-phimg img{position:relative;width:100%;display:inline-block;*display:inline;*zoom:1;vertical-align:top}.layui-layer-imgbar,.layui-layer-imguide{display:none}.layui-layer-imgnext,.layui-layer-imgprev{position:absolute;top:50%;width:27px;_width:44px;height:44px;margin-top:-22px;outline:0;blr:expression(this.onFocus=this.blur())}.layui-layer-imgprev{left:10px;background-position:-5px -5px;_background-position:-70px -5px}.layui-layer-imgprev:hover{background-position:-33px -5px;_background-position:-120px -5px}.layui-layer-imgnext{right:10px;_right:8px;background-position:-5px -50px;_background-position:-70px -50px}.layui-layer-imgnext:hover{background-position:-33px -50px;_background-position:-120px -50px}.layui-layer-imgbar{position:absolute;left:0;bottom:0;width:100%;height:32px;line-height:32px;background-color:rgba(0,0,0,.8);background-color:#000\9;filter:Alpha(opacity=80);color:#fff;overflow:hidden;font-size:0}.layui-layer-imgtit *{display:inline-block;*display:inline;*zoom:1;vertical-align:top;font-size:12px}.layui-layer-imgtit a{max-width:65%;overflow:hidden;color:#fff}.layui-layer-imgtit a:hover{color:#fff;text-decoration:underline}.layui-layer-imgtit em{padding-left:10px;font-style:normal}
diff --git a/management/guns-admin/src/main/webapp/static/js/plugins/layer/skin/moon/default.png b/management/guns-admin/src/main/webapp/static/js/plugins/layer/skin/moon/default.png
new file mode 100644
index 0000000..77dfaf3
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/static/js/plugins/layer/skin/moon/default.png
Binary files differ
diff --git a/management/guns-admin/src/main/webapp/static/js/plugins/layer/skin/moon/style.css b/management/guns-admin/src/main/webapp/static/js/plugins/layer/skin/moon/style.css
new file mode 100644
index 0000000..8a00dc3
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/static/js/plugins/layer/skin/moon/style.css
@@ -0,0 +1,141 @@
+/*
+ * layer皮肤
+ * 作者：一☆隐☆一
+ * QQ:9073194
+ * 请保留这里的信息 谢谢！虽然你不保留我也不能把你怎么样！
+ */
+
+html #layui_layer_skinmoonstylecss {
+ display: none;
+ position: absolute;
+ width: 1989px;
+}
+body .layer-ext-moon[type="dialog"] {
+ min-width: 320px;
+}
+body .layer-ext-moon-msg[type="dialog"]{min-width:200px;}
+body .layer-ext-moon .layui-layer-title {
+ background: #f6f6f6;
+ color: #212a31;
+ font-size: 16px;
+ font-weight: bold;
+ height: 46px;
+ line-height: 46px;
+}
+
+
+
+body .layer-ext-moon .layui-layer-content .layui-layer-ico {
+ height: 32px;
+ width: 32px;
+ top:18.5px;
+}
+body .layer-ext-moon .layui-layer-ico0 {
+ background: url(default.png) no-repeat -96px 0;
+ ;
+}
+body .layer-ext-moon .layui-layer-ico1 {
+ background: url(default.png) no-repeat -224px 0;
+ ;
+}
+body .layer-ext-moon .layui-layer-ico2 {
+ background: url(default.png) no-repeat -192px 0;
+}
+body .layer-ext-moon .layui-layer-ico3 {
+ background: url(default.png) no-repeat -160px 0;
+}
+body .layer-ext-moon .layui-layer-ico4 {
+ background: url(default.png) no-repeat -320px 0;
+}
+body .layer-ext-moon .layui-layer-ico5 {
+ background: url(default.png) no-repeat -288px 0;
+}
+body .layer-ext-moon .layui-layer-ico6 {
+ background: url(default.png) -256px 0;
+}
+body .layer-ext-moon .layui-layer-ico7 {
+ background: url(default.png) no-repeat -128px 0;
+}
+body .layer-ext-moon .layui-layer-setwin {
+ top: 15px;
+ right: 15px;
+}
+body .layer-ext-moon .layui-layer-setwin a {
+ width: 16px;
+ height: 16px;
+}
+body .layer-ext-moon .layui-layer-setwin .layui-layer-min cite:hover {
+ background-color: #56abe4;
+}
+body .layer-ext-moon .layui-layer-setwin .layui-layer-max {
+ background: url(default.png) no-repeat -80px 0;
+}
+body .layer-ext-moon .layui-layer-setwin .layui-layer-max:hover {
+ background: url(default.png) no-repeat -64px 0;
+}
+body .layer-ext-moon .layui-layer-setwin .layui-layer-maxmin {
+ background: url(default.png) no-repeat -32px 0;
+}
+body .layer-ext-moon .layui-layer-setwin .layui-layer-maxmin:hover {
+ background: url(default.png) no-repeat -16px 0;
+}
+body .layer-ext-moon .layui-layer-setwin .layui-layer-close1,body .layer-ext-moon .layui-layer-setwin .layui-layer-close2 {
+ background: url(default.png) 0 0;
+}
+body .layer-ext-moon .layui-layer-setwin .layui-layer-close1:hover,body .layer-ext-moon .layui-layer-setwin .layui-layer-close2:hover {
+ background: url(default.png) -48px 0;
+}
+body .layer-ext-moon .layui-layer-padding{padding-top: 24px;}
+body .layer-ext-moon .layui-layer-btn {
+ padding: 15px 0;
+ background: #f0f4f7;
+ border-top: 1px #c7c7c7 solid;
+}
+body .layer-ext-moon .layui-layer-btn a {
+ font-size: 12px;
+ font-weight: normal;
+ margin: 0 3px;
+ margin-right: 7px;
+ margin-left: 7px;
+ padding: 6px 20px;
+ color: #fff;
+ border: 1px solid #0064b6;
+ background: #0071ce;
+ border-radius: 3px;
+ display: inline-block;
+ height: 20px;
+ line-height: 20px;
+ text-align: center;
+ vertical-align: middle;
+ background-repeat: no-repeat;
+ text-decoration: none;
+ outline: none;
+ -moz-box-sizing: content-box;
+ -webkit-box-sizing: content-box;
+ box-sizing: content-box;
+}
+body .layer-ext-moon .layui-layer-btn .layui-layer-btn0 {
+ background: #0071ce;
+}
+body .layer-ext-moon .layui-layer-btn .layui-layer-btn1 {
+ background: #fff;
+ color: #404a58;
+ border: 1px solid #c0c4cd;
+ border-radius: 3px;
+}
+body .layer-ext-moon .layui-layer-btn .layui-layer-btn2 {
+ background: #f60;
+ color: #fff;
+ border: 1px solid #f60;
+ border-radius: 3px;
+}
+body .layer-ext-moon .layui-layer-btn .layui-layer-btn3 {
+ background: #f00;
+ color: #fff;
+ border: 1px solid #f00;
+ border-radius: 3px;
+}
+
+body .layer-ext-moon .layui-layer-title span.layui-layer-tabnow{
+ height:46px;
+}
diff --git a/management/guns-admin/src/main/webapp/static/js/plugins/layer/theme/default/icon-ext.png b/management/guns-admin/src/main/webapp/static/js/plugins/layer/theme/default/icon-ext.png
new file mode 100644
index 0000000..bbbb669
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/static/js/plugins/layer/theme/default/icon-ext.png
Binary files differ
diff --git a/management/guns-admin/src/main/webapp/static/js/plugins/layer/theme/default/icon.png b/management/guns-admin/src/main/webapp/static/js/plugins/layer/theme/default/icon.png
new file mode 100644
index 0000000..3e17da8
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/static/js/plugins/layer/theme/default/icon.png
Binary files differ
diff --git a/management/guns-admin/src/main/webapp/static/js/plugins/layer/theme/default/layer.css b/management/guns-admin/src/main/webapp/static/js/plugins/layer/theme/default/layer.css
new file mode 100644
index 0000000..820b4a9
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/static/js/plugins/layer/theme/default/layer.css
@@ -0,0 +1 @@
+.layui-layer-imgbar,.layui-layer-imgtit a,.layui-layer-tab .layui-layer-title span,.layui-layer-title{text-overflow:ellipsis;white-space:nowrap}html #layuicss-layer{display:none;position:absolute;width:1989px}.layui-layer,.layui-layer-shade{position:fixed;_position:absolute;pointer-events:auto}.layui-layer-shade{top:0;left:0;width:100%;height:100%;_height:expression(document.body.offsetHeight+"px")}.layui-layer{-webkit-overflow-scrolling:touch;top:150px;left:0;margin:0;padding:0;background-color:#fff;-webkit-background-clip:content;border-radius:2px;box-shadow:1px 1px 50px rgba(0,0,0,.3)}.layui-layer-close{position:absolute}.layui-layer-content{position:relative}.layui-layer-border{border:1px solid #B2B2B2;border:1px solid rgba(0,0,0,.1);box-shadow:1px 1px 5px rgba(0,0,0,.2)}.layui-layer-load{background:url(loading-1.gif) center center no-repeat #eee}.layui-layer-ico{background:url(icon.png) no-repeat}.layui-layer-btn a,.layui-layer-dialog .layui-layer-ico,.layui-layer-setwin a{display:inline-block;*display:inline;*zoom:1;vertical-align:top}.layui-layer-move{display:none;position:fixed;*position:absolute;left:0;top:0;width:100%;height:100%;cursor:move;opacity:0;filter:alpha(opacity=0);background-color:#fff;z-index:2147483647}.layui-layer-resize{position:absolute;width:15px;height:15px;right:0;bottom:0;cursor:se-resize}.layer-anim{-webkit-animation-fill-mode:both;animation-fill-mode:both;-webkit-animation-duration:.3s;animation-duration:.3s}@-webkit-keyframes layer-bounceIn{0%{opacity:0;-webkit-transform:scale(.5);transform:scale(.5)}100%{opacity:1;-webkit-transform:scale(1);transform:scale(1)}}@keyframes layer-bounceIn{0%{opacity:0;-webkit-transform:scale(.5);-ms-transform:scale(.5);transform:scale(.5)}100%{opacity:1;-webkit-transform:scale(1);-ms-transform:scale(1);transform:scale(1)}}.layer-anim-00{-webkit-animation-name:layer-bounceIn;animation-name:layer-bounceIn}@-webkit-keyframes layer-zoomInDown{0%{opacity:0;-webkit-transform:scale(.1) translateY(-2000px);transform:scale(.1) translateY(-2000px);-webkit-animation-timing-function:ease-in-out;animation-timing-function:ease-in-out}60%{opacity:1;-webkit-transform:scale(.475) translateY(60px);transform:scale(.475) translateY(60px);-webkit-animation-timing-function:ease-out;animation-timing-function:ease-out}}@keyframes layer-zoomInDown{0%{opacity:0;-webkit-transform:scale(.1) translateY(-2000px);-ms-transform:scale(.1) translateY(-2000px);transform:scale(.1) translateY(-2000px);-webkit-animation-timing-function:ease-in-out;animation-timing-function:ease-in-out}60%{opacity:1;-webkit-transform:scale(.475) translateY(60px);-ms-transform:scale(.475) translateY(60px);transform:scale(.475) translateY(60px);-webkit-animation-timing-function:ease-out;animation-timing-function:ease-out}}.layer-anim-01{-webkit-animation-name:layer-zoomInDown;animation-name:layer-zoomInDown}@-webkit-keyframes layer-fadeInUpBig{0%{opacity:0;-webkit-transform:translateY(2000px);transform:translateY(2000px)}100%{opacity:1;-webkit-transform:translateY(0);transform:translateY(0)}}@keyframes layer-fadeInUpBig{0%{opacity:0;-webkit-transform:translateY(2000px);-ms-transform:translateY(2000px);transform:translateY(2000px)}100%{opacity:1;-webkit-transform:translateY(0);-ms-transform:translateY(0);transform:translateY(0)}}.layer-anim-02{-webkit-animation-name:layer-fadeInUpBig;animation-name:layer-fadeInUpBig}@-webkit-keyframes layer-zoomInLeft{0%{opacity:0;-webkit-transform:scale(.1) translateX(-2000px);transform:scale(.1) translateX(-2000px);-webkit-animation-timing-function:ease-in-out;animation-timing-function:ease-in-out}60%{opacity:1;-webkit-transform:scale(.475) translateX(48px);transform:scale(.475) translateX(48px);-webkit-animation-timing-function:ease-out;animation-timing-function:ease-out}}@keyframes layer-zoomInLeft{0%{opacity:0;-webkit-transform:scale(.1) translateX(-2000px);-ms-transform:scale(.1) translateX(-2000px);transform:scale(.1) translateX(-2000px);-webkit-animation-timing-function:ease-in-out;animation-timing-function:ease-in-out}60%{opacity:1;-webkit-transform:scale(.475) translateX(48px);-ms-transform:scale(.475) translateX(48px);transform:scale(.475) translateX(48px);-webkit-animation-timing-function:ease-out;animation-timing-function:ease-out}}.layer-anim-03{-webkit-animation-name:layer-zoomInLeft;animation-name:layer-zoomInLeft}@-webkit-keyframes layer-rollIn{0%{opacity:0;-webkit-transform:translateX(-100%) rotate(-120deg);transform:translateX(-100%) rotate(-120deg)}100%{opacity:1;-webkit-transform:translateX(0) rotate(0);transform:translateX(0) rotate(0)}}@keyframes layer-rollIn{0%{opacity:0;-webkit-transform:translateX(-100%) rotate(-120deg);-ms-transform:translateX(-100%) rotate(-120deg);transform:translateX(-100%) rotate(-120deg)}100%{opacity:1;-webkit-transform:translateX(0) rotate(0);-ms-transform:translateX(0) rotate(0);transform:translateX(0) rotate(0)}}.layer-anim-04{-webkit-animation-name:layer-rollIn;animation-name:layer-rollIn}@keyframes layer-fadeIn{0%{opacity:0}100%{opacity:1}}.layer-anim-05{-webkit-animation-name:layer-fadeIn;animation-name:layer-fadeIn}@-webkit-keyframes layer-shake{0%,100%{-webkit-transform:translateX(0);transform:translateX(0)}10%,30%,50%,70%,90%{-webkit-transform:translateX(-10px);transform:translateX(-10px)}20%,40%,60%,80%{-webkit-transform:translateX(10px);transform:translateX(10px)}}@keyframes layer-shake{0%,100%{-webkit-transform:translateX(0);-ms-transform:translateX(0);transform:translateX(0)}10%,30%,50%,70%,90%{-webkit-transform:translateX(-10px);-ms-transform:translateX(-10px);transform:translateX(-10px)}20%,40%,60%,80%{-webkit-transform:translateX(10px);-ms-transform:translateX(10px);transform:translateX(10px)}}.layer-anim-06{-webkit-animation-name:layer-shake;animation-name:layer-shake}@-webkit-keyframes fadeIn{0%{opacity:0}100%{opacity:1}}.layui-layer-title{padding:0 80px 0 20px;height:42px;line-height:42px;border-bottom:1px solid #eee;font-size:14px;color:#333;overflow:hidden;background-color:#F8F8F8;border-radius:2px 2px 0 0}.layui-layer-setwin{position:absolute;right:15px;*right:0;top:15px;font-size:0;line-height:initial}.layui-layer-setwin a{position:relative;width:16px;height:16px;margin-left:10px;font-size:12px;_overflow:hidden}.layui-layer-setwin .layui-layer-min cite{position:absolute;width:14px;height:2px;left:0;top:50%;margin-top:-1px;background-color:#2E2D3C;cursor:pointer;_overflow:hidden}.layui-layer-setwin .layui-layer-min:hover cite{background-color:#2D93CA}.layui-layer-setwin .layui-layer-max{background-position:-32px -40px}.layui-layer-setwin .layui-layer-max:hover{background-position:-16px -40px}.layui-layer-setwin .layui-layer-maxmin{background-position:-65px -40px}.layui-layer-setwin .layui-layer-maxmin:hover{background-position:-49px -40px}.layui-layer-setwin .layui-layer-close1{background-position:1px -40px;cursor:pointer}.layui-layer-setwin .layui-layer-close1:hover{opacity:.7}.layui-layer-setwin .layui-layer-close2{position:absolute;right:-28px;top:-28px;width:30px;height:30px;margin-left:0;background-position:-149px -31px;*right:-18px;_display:none}.layui-layer-setwin .layui-layer-close2:hover{background-position:-180px -31px}.layui-layer-btn{text-align:right;padding:0 15px 12px;pointer-events:auto;user-select:none;-webkit-user-select:none}.layui-layer-btn a{height:28px;line-height:28px;margin:5px 5px 0;padding:0 15px;border:1px solid #dedede;background-color:#fff;color:#333;border-radius:2px;font-weight:400;cursor:pointer;text-decoration:none}.layui-layer-btn a:hover{opacity:.9;text-decoration:none}.layui-layer-btn a:active{opacity:.8}.layui-layer-btn .layui-layer-btn0{border-color:#1E9FFF;background-color:#1E9FFF;color:#fff}.layui-layer-btn-l{text-align:left}.layui-layer-btn-c{text-align:center}.layui-layer-dialog{min-width:260px}.layui-layer-dialog .layui-layer-content{position:relative;padding:20px;line-height:24px;word-break:break-all;overflow:hidden;font-size:14px;overflow-x:hidden;overflow-y:auto}.layui-layer-dialog .layui-layer-content .layui-layer-ico{position:absolute;top:16px;left:15px;_left:-40px;width:30px;height:30px}.layui-layer-ico1{background-position:-30px 0}.layui-layer-ico2{background-position:-60px 0}.layui-layer-ico3{background-position:-90px 0}.layui-layer-ico4{background-position:-120px 0}.layui-layer-ico5{background-position:-150px 0}.layui-layer-ico6{background-position:-180px 0}.layui-layer-rim{border:6px solid #8D8D8D;border:6px solid rgba(0,0,0,.3);border-radius:5px;box-shadow:none}.layui-layer-msg{min-width:180px;border:1px solid #D3D4D3;box-shadow:none}.layui-layer-hui{min-width:100px;background-color:#000;filter:alpha(opacity=60);background-color:rgba(0,0,0,.6);color:#fff;border:none}.layui-layer-hui .layui-layer-content{padding:12px 25px;text-align:center}.layui-layer-dialog .layui-layer-padding{padding:20px 20px 20px 55px;text-align:left}.layui-layer-page .layui-layer-content{position:relative;overflow:auto}.layui-layer-iframe .layui-layer-btn,.layui-layer-page .layui-layer-btn{padding-top:10px}.layui-layer-nobg{background:0 0}.layui-layer-iframe iframe{display:block;width:100%}.layui-layer-loading{border-radius:100%;background:0 0;box-shadow:none;border:none}.layui-layer-loading .layui-layer-content{width:60px;height:24px;background:url(loading-0.gif) no-repeat}.layui-layer-loading .layui-layer-loading1{width:37px;height:37px;background:url(loading-1.gif) no-repeat}.layui-layer-ico16,.layui-layer-loading .layui-layer-loading2{width:32px;height:32px;background:url(loading-2.gif) no-repeat}.layui-layer-tips{background:0 0;box-shadow:none;border:none}.layui-layer-tips .layui-layer-content{position:relative;line-height:22px;min-width:12px;padding:8px 15px;font-size:12px;_float:left;border-radius:2px;box-shadow:1px 1px 3px rgba(0,0,0,.2);background-color:#000;color:#fff}.layui-layer-tips .layui-layer-close{right:-2px;top:-1px}.layui-layer-tips i.layui-layer-TipsG{position:absolute;width:0;height:0;border-width:8px;border-color:transparent;border-style:dashed;*overflow:hidden}.layui-layer-tips i.layui-layer-TipsB,.layui-layer-tips i.layui-layer-TipsT{left:5px;border-right-style:solid;border-right-color:#000}.layui-layer-tips i.layui-layer-TipsT{bottom:-8px}.layui-layer-tips i.layui-layer-TipsB{top:-8px}.layui-layer-tips i.layui-layer-TipsL,.layui-layer-tips i.layui-layer-TipsR{top:5px;border-bottom-style:solid;border-bottom-color:#000}.layui-layer-tips i.layui-layer-TipsR{left:-8px}.layui-layer-tips i.layui-layer-TipsL{right:-8px}.layui-layer-lan[type=dialog]{min-width:280px}.layui-layer-lan .layui-layer-title{background:#4476A7;color:#fff;border:none}.layui-layer-lan .layui-layer-btn{padding:5px 10px 10px;text-align:right;border-top:1px solid #E9E7E7}.layui-layer-lan .layui-layer-btn a{background:#fff;border-color:#E9E7E7;color:#333}.layui-layer-lan .layui-layer-btn .layui-layer-btn1{background:#C9C5C5}.layui-layer-molv .layui-layer-title{background:#009f95;color:#fff;border:none}.layui-layer-molv .layui-layer-btn a{background:#009f95;border-color:#009f95}.layui-layer-molv .layui-layer-btn .layui-layer-btn1{background:#92B8B1}.layui-layer-iconext{background:url(icon-ext.png) no-repeat}.layui-layer-prompt .layui-layer-input{display:block;width:230px;height:36px;margin:0 auto;line-height:30px;padding-left:10px;border:1px solid #e6e6e6;color:#333}.layui-layer-prompt textarea.layui-layer-input{width:300px;height:100px;line-height:20px;padding:6px 10px}.layui-layer-prompt .layui-layer-content{padding:20px}.layui-layer-prompt .layui-layer-btn{padding-top:0}.layui-layer-tab{box-shadow:1px 1px 50px rgba(0,0,0,.4)}.layui-layer-tab .layui-layer-title{padding-left:0;overflow:visible}.layui-layer-tab .layui-layer-title span{position:relative;float:left;min-width:80px;max-width:260px;padding:0 20px;text-align:center;overflow:hidden;cursor:pointer}.layui-layer-tab .layui-layer-title span.layui-this{height:43px;border-left:1px solid #eee;border-right:1px solid #eee;background-color:#fff;z-index:10}.layui-layer-tab .layui-layer-title span:first-child{border-left:none}.layui-layer-tabmain{line-height:24px;clear:both}.layui-layer-tabmain .layui-layer-tabli{display:none}.layui-layer-tabmain .layui-layer-tabli.layui-this{display:block}.layui-layer-photos{-webkit-animation-duration:.8s;animation-duration:.8s}.layui-layer-photos .layui-layer-content{overflow:hidden;text-align:center}.layui-layer-photos .layui-layer-phimg img{position:relative;width:100%;display:inline-block;*display:inline;*zoom:1;vertical-align:top}.layui-layer-imgbar,.layui-layer-imguide{display:none}.layui-layer-imgnext,.layui-layer-imgprev{position:absolute;top:50%;width:27px;_width:44px;height:44px;margin-top:-22px;outline:0;blr:expression(this.onFocus=this.blur())}.layui-layer-imgprev{left:10px;background-position:-5px -5px;_background-position:-70px -5px}.layui-layer-imgprev:hover{background-position:-33px -5px;_background-position:-120px -5px}.layui-layer-imgnext{right:10px;_right:8px;background-position:-5px -50px;_background-position:-70px -50px}.layui-layer-imgnext:hover{background-position:-33px -50px;_background-position:-120px -50px}.layui-layer-imgbar{position:absolute;left:0;bottom:0;width:100%;height:32px;line-height:32px;background-color:rgba(0,0,0,.8);background-color:#000\9;filter:Alpha(opacity=80);color:#fff;overflow:hidden;font-size:0}.layui-layer-imgtit *{display:inline-block;*display:inline;*zoom:1;vertical-align:top;font-size:12px}.layui-layer-imgtit a{max-width:65%;overflow:hidden;color:#fff}.layui-layer-imgtit a:hover{color:#fff;text-decoration:underline}.layui-layer-imgtit em{padding-left:10px;font-style:normal}@-webkit-keyframes layer-bounceOut{100%{opacity:0;-webkit-transform:scale(.7);transform:scale(.7)}30%{-webkit-transform:scale(1.05);transform:scale(1.05)}0%{-webkit-transform:scale(1);transform:scale(1)}}@keyframes layer-bounceOut{100%{opacity:0;-webkit-transform:scale(.7);-ms-transform:scale(.7);transform:scale(.7)}30%{-webkit-transform:scale(1.05);-ms-transform:scale(1.05);transform:scale(1.05)}0%{-webkit-transform:scale(1);-ms-transform:scale(1);transform:scale(1)}}.layer-anim-close{-webkit-animation-name:layer-bounceOut;animation-name:layer-bounceOut;-webkit-animation-fill-mode:both;animation-fill-mode:both;-webkit-animation-duration:.2s;animation-duration:.2s}@media screen and (max-width:1100px){.layui-layer-iframe{overflow-y:auto;-webkit-overflow-scrolling:touch}}
\ No newline at end of file
diff --git a/management/guns-admin/src/main/webapp/static/js/plugins/layer/theme/default/loading-0.gif b/management/guns-admin/src/main/webapp/static/js/plugins/layer/theme/default/loading-0.gif
new file mode 100644
index 0000000..6f3c953
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/static/js/plugins/layer/theme/default/loading-0.gif
Binary files differ
diff --git a/management/guns-admin/src/main/webapp/static/js/plugins/layer/theme/default/loading-1.gif b/management/guns-admin/src/main/webapp/static/js/plugins/layer/theme/default/loading-1.gif
new file mode 100644
index 0000000..db3a483
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/static/js/plugins/layer/theme/default/loading-1.gif
Binary files differ
diff --git a/management/guns-admin/src/main/webapp/static/js/plugins/layer/theme/default/loading-2.gif b/management/guns-admin/src/main/webapp/static/js/plugins/layer/theme/default/loading-2.gif
new file mode 100644
index 0000000..5bb90fd
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/static/js/plugins/layer/theme/default/loading-2.gif
Binary files differ
diff --git a/management/guns-admin/src/main/webapp/static/js/plugins/metisMenu/jquery.metisMenu.js b/management/guns-admin/src/main/webapp/static/js/plugins/metisMenu/jquery.metisMenu.js
new file mode 100644
index 0000000..a04cdb0
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/static/js/plugins/metisMenu/jquery.metisMenu.js
@@ -0,0 +1,120 @@
+/*
+ * metismenu - v1.1.3
+ * Easy menu jQuery plugin for Twitter Bootstrap 3
+ * https://github.com/onokumus/metisMenu
+ *
+ * Made by Osman Nuri Okumus
+ * Under MIT License
+ */
+;(function($, window, document, undefined) {
+
+ var pluginName = "metisMenu",
+ defaults = {
+ toggle: true,
+ doubleTapToGo: false
+ };
+
+ function Plugin(element, options) {
+ this.element = $(element);
+ this.settings = $.extend({}, defaults, options);
+ this._defaults = defaults;
+ this._name = pluginName;
+ this.init();
+ }
+
+ Plugin.prototype = {
+ init: function() {
+
+ var $this = this.element,
+ $toggle = this.settings.toggle,
+ obj = this;
+
+ if (this.isIE() <= 9) {
+ $this.find("li.active").has("ul").children("ul").collapse("show");
+ $this.find("li").not(".active").has("ul").children("ul").collapse("hide");
+ } else {
+ $this.find("li.active").has("ul").children("ul").addClass("collapse in");
+ $this.find("li").not(".active").has("ul").children("ul").addClass("collapse");
+ }
+
+ //add the "doubleTapToGo" class to active items if needed
+ if (obj.settings.doubleTapToGo) {
+ $this.find("li.active").has("ul").children("a").addClass("doubleTapToGo");
+ }
+
+ $this.find("li").has("ul").children("a").on("click" + "." + pluginName, function(e) {
+ e.preventDefault();
+
+ //Do we need to enable the double tap
+ if (obj.settings.doubleTapToGo) {
+
+ //if we hit a second time on the link and the href is valid, navigate to that url
+ if (obj.doubleTapToGo($(this)) && $(this).attr("href") !== "#" && $(this).attr("href") !== "") {
+ e.stopPropagation();
+ document.location = $(this).attr("href");
+ return;
+ }
+ }
+
+ $(this).parent("li").toggleClass("active").children("ul").collapse("toggle");
+
+ if ($toggle) {
+ $(this).parent("li").siblings().removeClass("active").children("ul.in").collapse("hide");
+ }
+
+ });
+ },
+
+ isIE: function() { //https://gist.github.com/padolsey/527683
+ var undef,
+ v = 3,
+ div = document.createElement("div"),
+ all = div.getElementsByTagName("i");
+
+ while (
+ div.innerHTML = "<!--[if gt IE " + (++v) + "]><i></i><![endif]-->",
+ all[0]
+ ) {
+ return v > 4 ? v : undef;
+ }
+ },
+
+ //Enable the link on the second click.
+ doubleTapToGo: function(elem) {
+ var $this = this.element;
+
+ //if the class "doubleTapToGo" exists, remove it and return
+ if (elem.hasClass("doubleTapToGo")) {
+ elem.removeClass("doubleTapToGo");
+ return true;
+ }
+
+ //does not exists, add a new class and return false
+ if (elem.parent().children("ul").length) {
+ //first remove all other class
+ $this.find(".doubleTapToGo").removeClass("doubleTapToGo");
+ //add the class on the current element
+ elem.addClass("doubleTapToGo");
+ return false;
+ }
+ },
+
+ remove: function() {
+ this.element.off("." + pluginName);
+ this.element.removeData(pluginName);
+ }
+
+ };
+
+ $.fn[pluginName] = function(options) {
+ this.each(function () {
+ var el = $(this);
+ if (el.data(pluginName)) {
+ el.data(pluginName).remove();
+ }
+ el.data(pluginName, new Plugin(this, options));
+ });
+ return this;
+ };
+
+})(jQuery, window, document);
diff --git a/management/guns-admin/src/main/webapp/static/js/plugins/pace/pace.min.js b/management/guns-admin/src/main/webapp/static/js/plugins/pace/pace.min.js
new file mode 100644
index 0000000..134dcac
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/static/js/plugins/pace/pace.min.js
@@ -0,0 +1,2 @@
+/*! pace 0.5.1 */
+(function(){var a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z,A,B,C,D,E,F,G,H,I,J,K,L,M,N,O,P,Q,R,S,T,U,V,W=[].slice,X={}.hasOwnProperty,Y=function(a,b){function c(){this.constructor=a}for(var d in b)X.call(b,d)&&(a[d]=b[d]);return c.prototype=b.prototype,a.prototype=new c,a.__super__=b.prototype,a},Z=[].indexOf||function(a){for(var b=0,c=this.length;c>b;b++)if(b in this&&this[b]===a)return b;return-1};for(t={catchupTime:500,initialRate:.03,minTime:500,ghostTime:500,maxProgressPerFrame:10,easeFactor:1.25,startOnPageLoad:!0,restartOnPushState:!0,restartOnRequestAfter:500,target:"body",elements:{checkInterval:100,selectors:["body"]},eventLag:{minSamples:10,sampleCount:3,lagThreshold:3},ajax:{trackMethods:["GET"],trackWebSockets:!0,ignoreURLs:[]}},B=function(){var a;return null!=(a="undefined"!=typeof performance&&null!==performance?"function"==typeof performance.now?performance.now():void 0:void 0)?a:+new Date},D=window.requestAnimationFrame||window.mozRequestAnimationFrame||window.webkitRequestAnimationFrame||window.msRequestAnimationFrame,s=window.cancelAnimationFrame||window.mozCancelAnimationFrame,null==D&&(D=function(a){return setTimeout(a,50)},s=function(a){return clearTimeout(a)}),F=function(a){var b,c;return b=B(),(c=function(){var d;return d=B()-b,d>=33?(b=B(),a(d,function(){return D(c)})):setTimeout(c,33-d)})()},E=function(){var a,b,c;return c=arguments[0],b=arguments[1],a=3<=arguments.length?W.call(arguments,2):[],"function"==typeof c[b]?c[b].apply(c,a):c[b]},u=function(){var a,b,c,d,e,f,g;for(b=arguments[0],d=2<=arguments.length?W.call(arguments,1):[],f=0,g=d.length;g>f;f++)if(c=d[f])for(a in c)X.call(c,a)&&(e=c[a],null!=b[a]&&"object"==typeof b[a]&&null!=e&&"object"==typeof e?u(b[a],e):b[a]=e);return b},p=function(a){var b,c,d,e,f;for(c=b=0,e=0,f=a.length;f>e;e++)d=a[e],c+=Math.abs(d),b++;return c/b},w=function(a,b){var c,d,e;if(null==a&&(a="options"),null==b&&(b=!0),e=document.querySelector("[data-pace-"+a+"]")){if(c=e.getAttribute("data-pace-"+a),!b)return c;try{return JSON.parse(c)}catch(f){return d=f,"undefined"!=typeof console&&null!==console?console.error("Error parsing inline pace options",d):void 0}}},g=function(){function a(){}return a.prototype.on=function(a,b,c,d){var e;return null==d&&(d=!1),null==this.bindings&&(this.bindings={}),null==(e=this.bindings)[a]&&(e[a]=[]),this.bindings[a].push({handler:b,ctx:c,once:d})},a.prototype.once=function(a,b,c){return this.on(a,b,c,!0)},a.prototype.off=function(a,b){var c,d,e;if(null!=(null!=(d=this.bindings)?d[a]:void 0)){if(null==b)return delete this.bindings[a];for(c=0,e=[];c<this.bindings[a].length;)this.bindings[a][c].handler===b?e.push(this.bindings[a].splice(c,1)):e.push(c++);return e}},a.prototype.trigger=function(){var a,b,c,d,e,f,g,h,i;if(c=arguments[0],a=2<=arguments.length?W.call(arguments,1):[],null!=(g=this.bindings)?g[c]:void 0){for(e=0,i=[];e<this.bindings[c].length;)h=this.bindings[c][e],d=h.handler,b=h.ctx,f=h.once,d.apply(null!=b?b:this,a),f?i.push(this.bindings[c].splice(e,1)):i.push(e++);return i}},a}(),null==window.Pace&&(window.Pace={}),u(Pace,g.prototype),C=Pace.options=u({},t,window.paceOptions,w()),T=["ajax","document","eventLag","elements"],P=0,R=T.length;R>P;P++)J=T[P],C[J]===!0&&(C[J]=t[J]);i=function(a){function b(){return U=b.__super__.constructor.apply(this,arguments)}return Y(b,a),b}(Error),b=function(){function a(){this.progress=0}return a.prototype.getElement=function(){var a;if(null==this.el){if(a=document.querySelector(C.target),!a)throw new i;this.el=document.createElement("div"),this.el.className="pace pace-active",document.body.className=document.body.className.replace(/pace-done/g,""),document.body.className+=" pace-running",this.el.innerHTML='<div class="pace-progress">\n <div class="pace-progress-inner"></div>\n</div>\n<div class="pace-activity"></div>',null!=a.firstChild?a.insertBefore(this.el,a.firstChild):a.appendChild(this.el)}return this.el},a.prototype.finish=function(){var a;return a=this.getElement(),a.className=a.className.replace("pace-active",""),a.className+=" pace-inactive",document.body.className=document.body.className.replace("pace-running",""),document.body.className+=" pace-done"},a.prototype.update=function(a){return this.progress=a,this.render()},a.prototype.destroy=function(){try{this.getElement().parentNode.removeChild(this.getElement())}catch(a){i=a}return this.el=void 0},a.prototype.render=function(){var a,b;return null==document.querySelector(C.target)?!1:(a=this.getElement(),a.children[0].style.width=""+this.progress+"%",(!this.lastRenderedProgress||this.lastRenderedProgress|0!==this.progress|0)&&(a.children[0].setAttribute("data-progress-text",""+(0|this.progress)+"%"),this.progress>=100?b="99":(b=this.progress<10?"0":"",b+=0|this.progress),a.children[0].setAttribute("data-progress",""+b)),this.lastRenderedProgress=this.progress)},a.prototype.done=function(){return this.progress>=100},a}(),h=function(){function a(){this.bindings={}}return a.prototype.trigger=function(a,b){var c,d,e,f,g;if(null!=this.bindings[a]){for(f=this.bindings[a],g=[],d=0,e=f.length;e>d;d++)c=f[d],g.push(c.call(this,b));return g}},a.prototype.on=function(a,b){var c;return null==(c=this.bindings)[a]&&(c[a]=[]),this.bindings[a].push(b)},a}(),O=window.XMLHttpRequest,N=window.XDomainRequest,M=window.WebSocket,v=function(a,b){var c,d,e,f;f=[];for(d in b.prototype)try{e=b.prototype[d],null==a[d]&&"function"!=typeof e?f.push(a[d]=e):f.push(void 0)}catch(g){c=g}return f},z=[],Pace.ignore=function(){var a,b,c;return b=arguments[0],a=2<=arguments.length?W.call(arguments,1):[],z.unshift("ignore"),c=b.apply(null,a),z.shift(),c},Pace.track=function(){var a,b,c;return b=arguments[0],a=2<=arguments.length?W.call(arguments,1):[],z.unshift("track"),c=b.apply(null,a),z.shift(),c},I=function(a){var b;if(null==a&&(a="GET"),"track"===z[0])return"force";if(!z.length&&C.ajax){if("socket"===a&&C.ajax.trackWebSockets)return!0;if(b=a.toUpperCase(),Z.call(C.ajax.trackMethods,b)>=0)return!0}return!1},j=function(a){function b(){var a,c=this;b.__super__.constructor.apply(this,arguments),a=function(a){var b;return b=a.open,a.open=function(d,e){return I(d)&&c.trigger("request",{type:d,url:e,request:a}),b.apply(a,arguments)}},window.XMLHttpRequest=function(b){var c;return c=new O(b),a(c),c},v(window.XMLHttpRequest,O),null!=N&&(window.XDomainRequest=function(){var b;return b=new N,a(b),b},v(window.XDomainRequest,N)),null!=M&&C.ajax.trackWebSockets&&(window.WebSocket=function(a,b){var d;return d=null!=b?new M(a,b):new M(a),I("socket")&&c.trigger("request",{type:"socket",url:a,protocols:b,request:d}),d},v(window.WebSocket,M))}return Y(b,a),b}(h),Q=null,x=function(){return null==Q&&(Q=new j),Q},H=function(a){var b,c,d,e;for(e=C.ajax.ignoreURLs,c=0,d=e.length;d>c;c++)if(b=e[c],"string"==typeof b){if(-1!==a.indexOf(b))return!0}else if(b.test(a))return!0;return!1},x().on("request",function(b){var c,d,e,f,g;return f=b.type,e=b.request,g=b.url,H(g)?void 0:Pace.running||C.restartOnRequestAfter===!1&&"force"!==I(f)?void 0:(d=arguments,c=C.restartOnRequestAfter||0,"boolean"==typeof c&&(c=0),setTimeout(function(){var b,c,g,h,i,j;if(b="socket"===f?e.readyState<2:0<(h=e.readyState)&&4>h){for(Pace.restart(),i=Pace.sources,j=[],c=0,g=i.length;g>c;c++){if(J=i[c],J instanceof a){J.watch.apply(J,d);break}j.push(void 0)}return j}},c))}),a=function(){function a(){var a=this;this.elements=[],x().on("request",function(){return a.watch.apply(a,arguments)})}return a.prototype.watch=function(a){var b,c,d,e;return d=a.type,b=a.request,e=a.url,H(e)?void 0:(c="socket"===d?new m(b):new n(b),this.elements.push(c))},a}(),n=function(){function a(a){var b,c,d,e,f,g,h=this;if(this.progress=0,null!=window.ProgressEvent)for(c=null,a.addEventListener("progress",function(a){return h.progress=a.lengthComputable?100*a.loaded/a.total:h.progress+(100-h.progress)/2}),g=["load","abort","timeout","error"],d=0,e=g.length;e>d;d++)b=g[d],a.addEventListener(b,function(){return h.progress=100});else f=a.onreadystatechange,a.onreadystatechange=function(){var b;return 0===(b=a.readyState)||4===b?h.progress=100:3===a.readyState&&(h.progress=50),"function"==typeof f?f.apply(null,arguments):void 0}}return a}(),m=function(){function a(a){var b,c,d,e,f=this;for(this.progress=0,e=["error","open"],c=0,d=e.length;d>c;c++)b=e[c],a.addEventListener(b,function(){return f.progress=100})}return a}(),d=function(){function a(a){var b,c,d,f;for(null==a&&(a={}),this.elements=[],null==a.selectors&&(a.selectors=[]),f=a.selectors,c=0,d=f.length;d>c;c++)b=f[c],this.elements.push(new e(b))}return a}(),e=function(){function a(a){this.selector=a,this.progress=0,this.check()}return a.prototype.check=function(){var a=this;return document.querySelector(this.selector)?this.done():setTimeout(function(){return a.check()},C.elements.checkInterval)},a.prototype.done=function(){return this.progress=100},a}(),c=function(){function a(){var a,b,c=this;this.progress=null!=(b=this.states[document.readyState])?b:100,a=document.onreadystatechange,document.onreadystatechange=function(){return null!=c.states[document.readyState]&&(c.progress=c.states[document.readyState]),"function"==typeof a?a.apply(null,arguments):void 0}}return a.prototype.states={loading:0,interactive:50,complete:100},a}(),f=function(){function a(){var a,b,c,d,e,f=this;this.progress=0,a=0,e=[],d=0,c=B(),b=setInterval(function(){var g;return g=B()-c-50,c=B(),e.push(g),e.length>C.eventLag.sampleCount&&e.shift(),a=p(e),++d>=C.eventLag.minSamples&&a<C.eventLag.lagThreshold?(f.progress=100,clearInterval(b)):f.progress=100*(3/(a+3))},50)}return a}(),l=function(){function a(a){this.source=a,this.last=this.sinceLastUpdate=0,this.rate=C.initialRate,this.catchup=0,this.progress=this.lastProgress=0,null!=this.source&&(this.progress=E(this.source,"progress"))}return a.prototype.tick=function(a,b){var c;return null==b&&(b=E(this.source,"progress")),b>=100&&(this.done=!0),b===this.last?this.sinceLastUpdate+=a:(this.sinceLastUpdate&&(this.rate=(b-this.last)/this.sinceLastUpdate),this.catchup=(b-this.progress)/C.catchupTime,this.sinceLastUpdate=0,this.last=b),b>this.progress&&(this.progress+=this.catchup*a),c=1-Math.pow(this.progress/100,C.easeFactor),this.progress+=c*this.rate*a,this.progress=Math.min(this.lastProgress+C.maxProgressPerFrame,this.progress),this.progress=Math.max(0,this.progress),this.progress=Math.min(100,this.progress),this.lastProgress=this.progress,this.progress},a}(),K=null,G=null,q=null,L=null,o=null,r=null,Pace.running=!1,y=function(){return C.restartOnPushState?Pace.restart():void 0},null!=window.history.pushState&&(S=window.history.pushState,window.history.pushState=function(){return y(),S.apply(window.history,arguments)}),null!=window.history.replaceState&&(V=window.history.replaceState,window.history.replaceState=function(){return y(),V.apply(window.history,arguments)}),k={ajax:a,elements:d,document:c,eventLag:f},(A=function(){var a,c,d,e,f,g,h,i;for(Pace.sources=K=[],g=["ajax","elements","document","eventLag"],c=0,e=g.length;e>c;c++)a=g[c],C[a]!==!1&&K.push(new k[a](C[a]));for(i=null!=(h=C.extraSources)?h:[],d=0,f=i.length;f>d;d++)J=i[d],K.push(new J(C));return Pace.bar=q=new b,G=[],L=new l})(),Pace.stop=function(){return Pace.trigger("stop"),Pace.running=!1,q.destroy(),r=!0,null!=o&&("function"==typeof s&&s(o),o=null),A()},Pace.restart=function(){return Pace.trigger("restart"),Pace.stop(),Pace.start()},Pace.go=function(){var a;return Pace.running=!0,q.render(),a=B(),r=!1,o=F(function(b,c){var d,e,f,g,h,i,j,k,m,n,o,p,s,t,u,v;for(k=100-q.progress,e=o=0,f=!0,i=p=0,t=K.length;t>p;i=++p)for(J=K[i],n=null!=G[i]?G[i]:G[i]=[],h=null!=(v=J.elements)?v:[J],j=s=0,u=h.length;u>s;j=++s)g=h[j],m=null!=n[j]?n[j]:n[j]=new l(g),f&=m.done,m.done||(e++,o+=m.tick(b));return d=o/e,q.update(L.tick(b,d)),q.done()||f||r?(q.update(100),Pace.trigger("done"),setTimeout(function(){return q.finish(),Pace.running=!1,Pace.trigger("hide")},Math.max(C.ghostTime,Math.max(C.minTime-(B()-a),0)))):c()})},Pace.start=function(a){u(C,a),Pace.running=!0;try{q.render()}catch(b){i=b}return document.querySelector(".pace")?(Pace.trigger("start"),Pace.go()):setTimeout(Pace.start,50)},"function"==typeof define&&define.amd?define(function(){return Pace}):"object"==typeof exports?module.exports=Pace:C.startOnPageLoad&&Pace.start()}).call(this);
diff --git a/management/guns-admin/src/main/webapp/static/js/plugins/slimscroll/jquery.slimscroll.min.js b/management/guns-admin/src/main/webapp/static/js/plugins/slimscroll/jquery.slimscroll.min.js
new file mode 100644
index 0000000..ee047a1
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/static/js/plugins/slimscroll/jquery.slimscroll.min.js
@@ -0,0 +1,15 @@
+/*! Copyright (c) 2011 Piotr Rochala (http://rocha.la)
+ * Dual licensed under the MIT (http://www.opensource.org/licenses/mit-license.php)
+ * and GPL (http://www.opensource.org/licenses/gpl-license.php) licenses.
+ *
+ * Version: 1.3.0
+ *
+ */
+(function(f){jQuery.fn.extend({slimScroll:function(h){var a=f.extend({width:"auto",height:"250px",size:"3px",color:"#a7b1c2",position:"right",distance:"1px",start:"top",opacity:0.4,alwaysVisible:!1,disableFadeOut:!1,railVisible:!1,railColor:"#333",railOpacity:0.2,railDraggable:!0,railClass:"slimScrollRail",barClass:"slimScrollBar",wrapperClass:"slimScrollDiv",allowPageScroll:!1,wheelStep:20,touchScrollStep:200,borderRadius:"7px",railBorderRadius:"7px"},h);this.each(function(){function r(d){if(s){d=d||
+window.event;var c=0;d.wheelDelta&&(c=-d.wheelDelta/120);d.detail&&(c=d.detail/3);f(d.target||d.srcTarget||d.srcElement).closest("."+a.wrapperClass).is(b.parent())&&m(c,!0);d.preventDefault&&!k&&d.preventDefault();k||(d.returnValue=!1)}}function m(d,f,h){k=!1;var e=d,g=b.outerHeight()-c.outerHeight();f&&(e=parseInt(c.css("top"))+d*parseInt(a.wheelStep)/100*c.outerHeight(),e=Math.min(Math.max(e,0),g),e=0<d?Math.ceil(e):Math.floor(e),c.css({top:e+"px"}));l=parseInt(c.css("top"))/(b.outerHeight()-c.outerHeight());
+e=l*(b[0].scrollHeight-b.outerHeight());h&&(e=d,d=e/b[0].scrollHeight*b.outerHeight(),d=Math.min(Math.max(d,0),g),c.css({top:d+"px"}));b.scrollTop(e);b.trigger("slimscrolling",~~e);v();p()}function C(){window.addEventListener?(this.addEventListener("DOMMouseScroll",r,!1),this.addEventListener("mousewheel",r,!1),this.addEventListener("MozMousePixelScroll",r,!1)):document.attachEvent("onmousewheel",r)}function w(){u=Math.max(b.outerHeight()/b[0].scrollHeight*b.outerHeight(),D);c.css({height:u+"px"});
+var a=u==b.outerHeight()?"none":"block";c.css({display:a})}function v(){w();clearTimeout(A);l==~~l?(k=a.allowPageScroll,B!=l&&b.trigger("slimscroll",0==~~l?"top":"bottom")):k=!1;B=l;u>=b.outerHeight()?k=!0:(c.stop(!0,!0).fadeIn("fast"),a.railVisible&&g.stop(!0,!0).fadeIn("fast"))}function p(){a.alwaysVisible||(A=setTimeout(function(){a.disableFadeOut&&s||(x||y)||(c.fadeOut("slow"),g.fadeOut("slow"))},1E3))}var s,x,y,A,z,u,l,B,D=30,k=!1,b=f(this);if(b.parent().hasClass(a.wrapperClass)){var n=b.scrollTop(),
+c=b.parent().find("."+a.barClass),g=b.parent().find("."+a.railClass);w();if(f.isPlainObject(h)){if("height"in h&&"auto"==h.height){b.parent().css("height","auto");b.css("height","auto");var q=b.parent().parent().height();b.parent().css("height",q);b.css("height",q)}if("scrollTo"in h)n=parseInt(a.scrollTo);else if("scrollBy"in h)n+=parseInt(a.scrollBy);else if("destroy"in h){c.remove();g.remove();b.unwrap();return}m(n,!1,!0)}}else{a.height="auto"==a.height?b.parent().height():a.height;n=f("<div></div>").addClass(a.wrapperClass).css({position:"relative",width:a.width,height:a.height});b.css({width:a.width,height:a.height});var g=f("<div></div>").addClass(a.railClass).css({width:a.size,height:"100%",position:"absolute",top:0,display:a.alwaysVisible&&a.railVisible?"block":"none","border-radius":a.railBorderRadius,background:a.railColor,opacity:a.railOpacity,zIndex:90}),c=f("<div></div>").addClass(a.barClass).css({background:a.color,width:a.size,position:"absolute",top:0,opacity:a.opacity,display:a.alwaysVisible?
+"block":"none","border-radius":a.borderRadius,BorderRadius:a.borderRadius,MozBorderRadius:a.borderRadius,WebkitBorderRadius:a.borderRadius,zIndex:99}),q="right"==a.position?{right:a.distance}:{left:a.distance};g.css(q);c.css(q);b.wrap(n);b.parent().append(c);b.parent().append(g);a.railDraggable&&c.bind("mousedown",function(a){var b=f(document);y=!0;t=parseFloat(c.css("top"));pageY=a.pageY;b.bind("mousemove.slimscroll",function(a){currTop=t+a.pageY-pageY;c.css("top",currTop);m(0,c.position().top,!1)});
+b.bind("mouseup.slimscroll",function(a){y=!1;p();b.unbind(".slimscroll")});return!1}).bind("selectstart.slimscroll",function(a){a.stopPropagation();a.preventDefault();return!1});g.hover(function(){v()},function(){p()});c.hover(function(){x=!0},function(){x=!1});b.hover(function(){s=!0;v();p()},function(){s=!1;p()});b.bind("touchstart",function(a,b){a.originalEvent.touches.length&&(z=a.originalEvent.touches[0].pageY)});b.bind("touchmove",function(b){k||b.originalEvent.preventDefault();b.originalEvent.touches.length&&
+(m((z-b.originalEvent.touches[0].pageY)/a.touchScrollStep,!0),z=b.originalEvent.touches[0].pageY)});w();"bottom"===a.start?(c.css({top:b.outerHeight()-c.outerHeight()}),m(0,!0)):"top"!==a.start&&(m(f(a.start).position().top,null,!0),a.alwaysVisible||c.hide());C()}});return this}});jQuery.fn.extend({slimscroll:jQuery.fn.slimScroll})})(jQuery);
diff --git a/management/guns-admin/src/main/webapp/static/js/plugins/sweetalert/sweetalert.min.js b/management/guns-admin/src/main/webapp/static/js/plugins/sweetalert/sweetalert.min.js
new file mode 100644
index 0000000..c1e4b73
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/static/js/plugins/sweetalert/sweetalert.min.js
@@ -0,0 +1 @@
+!function(e,t,n){"use strict";!function o(e,t,n){function a(s,l){if(!t[s]){if(!e[s]){var i="function"==typeof require&&require;if(!l&&i)return i(s,!0);if(r)return r(s,!0);var u=new Error("Cannot find module '"+s+"'");throw u.code="MODULE_NOT_FOUND",u}var c=t[s]={exports:{}};e[s][0].call(c.exports,function(t){var n=e[s][1][t];return a(n?n:t)},c,c.exports,o,e,t,n)}return t[s].exports}for(var r="function"==typeof require&&require,s=0;s<n.length;s++)a(n[s]);return a}({1:[function(o){var a,r,s,l,i=function(e){return e&&e.__esModule?e:{"default":e}},u=o("./modules/handle-dom"),c=o("./modules/utils"),d=o("./modules/handle-swal-dom"),f=o("./modules/handle-click"),p=o("./modules/handle-key"),m=i(p),v=o("./modules/default-params"),y=i(v),h=o("./modules/set-params"),g=i(h);s=l=function(){function o(e){var t=s;return t[e]===n?y["default"][e]:t[e]}var s=arguments[0];if(u.addClass(t.body,"stop-scrolling"),d.resetInput(),s===n)return c.logStr("SweetAlert expects at least 1 attribute!"),!1;var l=c.extend({},y["default"]);switch(typeof s){case"string":l.title=s,l.text=arguments[1]||"",l.type=arguments[2]||"";break;case"object":if(s.title===n)return c.logStr('Missing "title" argument!'),!1;l.title=s.title;for(var i in y["default"])l[i]=o(i);l.confirmButtonText=l.showCancelButton?"Confirm":y["default"].confirmButtonText,l.confirmButtonText=o("confirmButtonText"),l.doneFunction=arguments[1]||null;break;default:return c.logStr('Unexpected type of argument! Expected "string" or "object", got '+typeof s),!1}g["default"](l),d.fixVerticalPosition(),d.openModal(arguments[1]);for(var p=d.getModal(),v=p.querySelectorAll("button"),h=["onclick","onmouseover","onmouseout","onmousedown","onmouseup","onfocus"],b=function(e){return f.handleButton(e,l,p)},w=0;w<v.length;w++)for(var C=0;C<h.length;C++){var S=h[C];v[w][S]=b}d.getOverlay().onclick=b,a=e.onkeydown;var x=function(e){return m["default"](e,l,p)};e.onkeydown=x,e.onfocus=function(){setTimeout(function(){r!==n&&(r.focus(),r=n)},0)}},s.setDefaults=l.setDefaults=function(e){if(!e)throw new Error("userParams is required");if("object"!=typeof e)throw new Error("userParams has to be a object");c.extend(y["default"],e)},s.close=l.close=function(){var o=d.getModal();u.fadeOut(d.getOverlay(),5),u.fadeOut(o,5),u.removeClass(o,"showSweetAlert"),u.addClass(o,"hideSweetAlert"),u.removeClass(o,"visible");var s=o.querySelector(".sa-icon.sa-success");u.removeClass(s,"animate"),u.removeClass(s.querySelector(".sa-tip"),"animateSuccessTip"),u.removeClass(s.querySelector(".sa-long"),"animateSuccessLong");var l=o.querySelector(".sa-icon.sa-error");u.removeClass(l,"animateErrorIcon"),u.removeClass(l.querySelector(".sa-x-mark"),"animateXMark");var i=o.querySelector(".sa-icon.sa-warning");return u.removeClass(i,"pulseWarning"),u.removeClass(i.querySelector(".sa-body"),"pulseWarningIns"),u.removeClass(i.querySelector(".sa-dot"),"pulseWarningIns"),setTimeout(function(){var e=o.getAttribute("data-custom-class");u.removeClass(o,e)},300),u.removeClass(t.body,"stop-scrolling"),e.onkeydown=a,e.previousActiveElement&&e.previousActiveElement.focus(),r=n,clearTimeout(o.timeout),!0},s.showInputError=l.showInputError=function(e){var t=d.getModal(),n=t.querySelector(".sa-input-error");u.addClass(n,"show");var o=t.querySelector(".sa-error-container");u.addClass(o,"show"),o.querySelector("p").innerHTML=e,t.querySelector("input").focus()},s.resetInputError=l.resetInputError=function(e){if(e&&13===e.keyCode)return!1;var t=d.getModal(),n=t.querySelector(".sa-input-error");u.removeClass(n,"show");var o=t.querySelector(".sa-error-container");u.removeClass(o,"show")},"undefined"!=typeof e?e.sweetAlert=e.swal=s:c.logStr("SweetAlert is a frontend module!")},{"./modules/default-params":2,"./modules/handle-click":3,"./modules/handle-dom":4,"./modules/handle-key":5,"./modules/handle-swal-dom":6,"./modules/set-params":8,"./modules/utils":9}],2:[function(e,t,n){Object.defineProperty(n,"__esModule",{value:!0});var o={title:"",text:"",type:null,allowOutsideClick:!1,showConfirmButton:!0,showCancelButton:!1,closeOnConfirm:!0,closeOnCancel:!0,confirmButtonText:"OK",confirmButtonColor:"#AEDEF4",cancelButtonText:"取消",imageUrl:null,imageSize:null,timer:null,customClass:"",html:!1,animation:!0,allowEscapeKey:!0,inputType:"text",inputPlaceholder:"",inputValue:""};n["default"]=o,t.exports=n["default"]},{}],3:[function(t,n,o){Object.defineProperty(o,"__esModule",{value:!0});var a=t("./utils"),r=(t("./handle-swal-dom"),t("./handle-dom")),s=function(t,n,o){function s(e){m&&n.confirmButtonColor&&(p.style.backgroundColor=e)}var u,c,d,f=t||e.event,p=f.target||f.srcElement,m=-1!==p.className.indexOf("confirm"),v=-1!==p.className.indexOf("sweet-overlay"),y=r.hasClass(o,"visible"),h=n.doneFunction&&"true"===o.getAttribute("data-has-done-function");switch(m&&n.confirmButtonColor&&(u=n.confirmButtonColor,c=a.colorLuminance(u,-.04),d=a.colorLuminance(u,-.14)),f.type){case"mouseover":s(c);break;case"mouseout":s(u);break;case"mousedown":s(d);break;case"mouseup":s(c);break;case"focus":var g=o.querySelector("button.confirm"),b=o.querySelector("button.cancel");m?b.style.boxShadow="none":g.style.boxShadow="none";break;case"click":var w=o===p,C=r.isDescendant(o,p);if(!w&&!C&&y&&!n.allowOutsideClick)break;m&&h&&y?l(o,n):h&&y||v?i(o,n):r.isDescendant(o,p)&&"BUTTON"===p.tagName&&sweetAlert.close()}},l=function(e,t){var n=!0;r.hasClass(e,"show-input")&&(n=e.querySelector("input").value,n||(n="")),t.doneFunction(n),t.closeOnConfirm&&sweetAlert.close()},i=function(e,t){var n=String(t.doneFunction).replace(/\s/g,""),o="function("===n.substring(0,9)&&")"!==n.substring(9,10);o&&t.doneFunction(!1),t.closeOnCancel&&sweetAlert.close()};o["default"]={handleButton:s,handleConfirm:l,handleCancel:i},n.exports=o["default"]},{"./handle-dom":4,"./handle-swal-dom":6,"./utils":9}],4:[function(n,o,a){Object.defineProperty(a,"__esModule",{value:!0});var r=function(e,t){return new RegExp(" "+t+" ").test(" "+e.className+" ")},s=function(e,t){r(e,t)||(e.className+=" "+t)},l=function(e,t){var n=" "+e.className.replace(/[\t\r\n]/g," ")+" ";if(r(e,t)){for(;n.indexOf(" "+t+" ")>=0;)n=n.replace(" "+t+" "," ");e.className=n.replace(/^\s+|\s+$/g,"")}},i=function(e){var n=t.createElement("div");return n.appendChild(t.createTextNode(e)),n.innerHTML},u=function(e){e.style.opacity="",e.style.display="block"},c=function(e){if(e&&!e.length)return u(e);for(var t=0;t<e.length;++t)u(e[t])},d=function(e){e.style.opacity="",e.style.display="none"},f=function(e){if(e&&!e.length)return d(e);for(var t=0;t<e.length;++t)d(e[t])},p=function(e,t){for(var n=t.parentNode;null!==n;){if(n===e)return!0;n=n.parentNode}return!1},m=function(e){e.style.left="-9999px",e.style.display="block";var t,n=e.clientHeight;return t="undefined"!=typeof getComputedStyle?parseInt(getComputedStyle(e).getPropertyValue("padding-top"),10):parseInt(e.currentStyle.padding),e.style.left="",e.style.display="none","-"+parseInt((n+t)/2)+"px"},v=function(e,t){if(+e.style.opacity<1){t=t||16,e.style.opacity=0,e.style.display="block";var n=+new Date,o=function(e){function t(){return e.apply(this,arguments)}return t.toString=function(){return e.toString()},t}(function(){e.style.opacity=+e.style.opacity+(new Date-n)/100,n=+new Date,+e.style.opacity<1&&setTimeout(o,t)});o()}e.style.display="block"},y=function(e,t){t=t||16,e.style.opacity=1;var n=+new Date,o=function(e){function t(){return e.apply(this,arguments)}return t.toString=function(){return e.toString()},t}(function(){e.style.opacity=+e.style.opacity-(new Date-n)/100,n=+new Date,+e.style.opacity>0?setTimeout(o,t):e.style.display="none"});o()},h=function(n){if("function"==typeof MouseEvent){var o=new MouseEvent("click",{view:e,bubbles:!1,cancelable:!0});n.dispatchEvent(o)}else if(t.createEvent){var a=t.createEvent("MouseEvents");a.initEvent("click",!1,!1),n.dispatchEvent(a)}else t.createEventObject?n.fireEvent("onclick"):"function"==typeof n.onclick&&n.onclick()},g=function(t){"function"==typeof t.stopPropagation?(t.stopPropagation(),t.preventDefault()):e.event&&e.event.hasOwnProperty("cancelBubble")&&(e.event.cancelBubble=!0)};a.hasClass=r,a.addClass=s,a.removeClass=l,a.escapeHtml=i,a._show=u,a.show=c,a._hide=d,a.hide=f,a.isDescendant=p,a.getTopMargin=m,a.fadeIn=v,a.fadeOut=y,a.fireClick=h,a.stopEventPropagation=g},{}],5:[function(t,o,a){Object.defineProperty(a,"__esModule",{value:!0});var r=t("./handle-dom"),s=t("./handle-swal-dom"),l=function(t,o,a){var l=t||e.event,i=l.keyCode||l.which,u=a.querySelector("button.confirm"),c=a.querySelector("button.cancel"),d=a.querySelectorAll("button[tabindex]");if(-1!==[9,13,32,27].indexOf(i)){for(var f=l.target||l.srcElement,p=-1,m=0;m<d.length;m++)if(f===d[m]){p=m;break}9===i?(f=-1===p?u:p===d.length-1?d[0]:d[p+1],r.stopEventPropagation(l),f.focus(),o.confirmButtonColor&&s.setFocusStyle(f,o.confirmButtonColor)):13===i?("INPUT"===f.tagName&&(f=u,u.focus()),f=-1===p?u:n):27===i&&o.allowEscapeKey===!0?(f=c,r.fireClick(f,l)):f=n}};a["default"]=l,o.exports=a["default"]},{"./handle-dom":4,"./handle-swal-dom":6}],6:[function(n,o,a){var r=function(e){return e&&e.__esModule?e:{"default":e}};Object.defineProperty(a,"__esModule",{value:!0});var s=n("./utils"),l=n("./handle-dom"),i=n("./default-params"),u=r(i),c=n("./injected-html"),d=r(c),f=".sweet-alert",p=".sweet-overlay",m=function(){var e=t.createElement("div");for(e.innerHTML=d["default"];e.firstChild;)t.body.appendChild(e.firstChild)},v=function(e){function t(){return e.apply(this,arguments)}return t.toString=function(){return e.toString()},t}(function(){var e=t.querySelector(f);return e||(m(),e=v()),e}),y=function(){var e=v();return e?e.querySelector("input"):void 0},h=function(){return t.querySelector(p)},g=function(e,t){var n=s.hexToRgb(t);e.style.boxShadow="0 0 2px rgba("+n+", 0.8), inset 0 0 0 1px rgba(0, 0, 0, 0.05)"},b=function(n){var o=v();l.fadeIn(h(),10),l.show(o),l.addClass(o,"showSweetAlert"),l.removeClass(o,"hideSweetAlert"),e.previousActiveElement=t.activeElement;var a=o.querySelector("button.confirm");a.focus(),setTimeout(function(){l.addClass(o,"visible")},500);var r=o.getAttribute("data-timer");if("null"!==r&&""!==r){var s=n;o.timeout=setTimeout(function(){var e=(s||null)&&"true"===o.getAttribute("data-has-done-function");e?s(null):sweetAlert.close()},r)}},w=function(){var e=v(),t=y();l.removeClass(e,"show-input"),t.value=u["default"].inputValue,t.setAttribute("type",u["default"].inputType),t.setAttribute("placeholder",u["default"].inputPlaceholder),C()},C=function(e){if(e&&13===e.keyCode)return!1;var t=v(),n=t.querySelector(".sa-input-error");l.removeClass(n,"show");var o=t.querySelector(".sa-error-container");l.removeClass(o,"show")},S=function(){var e=v();e.style.marginTop=l.getTopMargin(v())};a.sweetAlertInitialize=m,a.getModal=v,a.getOverlay=h,a.getInput=y,a.setFocusStyle=g,a.openModal=b,a.resetInput=w,a.resetInputError=C,a.fixVerticalPosition=S},{"./default-params":2,"./handle-dom":4,"./injected-html":7,"./utils":9}],7:[function(e,t,n){Object.defineProperty(n,"__esModule",{value:!0});var o='<div class="sweet-overlay" tabIndex="-1"></div><div class="sweet-alert"><div class="sa-icon sa-error">\n <span class="sa-x-mark">\n <span class="sa-line sa-left"></span>\n <span class="sa-line sa-right"></span>\n </span>\n </div><div class="sa-icon sa-warning">\n <span class="sa-body"></span>\n <span class="sa-dot"></span>\n </div><div class="sa-icon sa-info"></div><div class="sa-icon sa-success">\n <span class="sa-line sa-tip"></span>\n <span class="sa-line sa-long"></span>\n\n <div class="sa-placeholder"></div>\n <div class="sa-fix"></div>\n </div><div class="sa-icon sa-custom"></div><h2>Title</h2>\n <p>Text</p>\n <fieldset>\n <input type="text" tabIndex="3" />\n <div class="sa-input-error"></div>\n </fieldset><div class="sa-error-container">\n <div class="icon">!</div>\n <p>Not valid!</p>\n </div><div class="sa-button-container">\n <button class="cancel" tabIndex="2">Cancel</button>\n <button class="confirm" tabIndex="1">OK</button>\n </div></div>';n["default"]=o,t.exports=n["default"]},{}],8:[function(e,t,o){Object.defineProperty(o,"__esModule",{value:!0});var a=e("./utils"),r=e("./handle-swal-dom"),s=e("./handle-dom"),l=["error","warning","info","success","input","prompt"],i=function(e){var t=r.getModal(),o=t.querySelector("h2"),i=t.querySelector("p"),u=t.querySelector("button.cancel"),c=t.querySelector("button.confirm");if(o.innerHTML=e.html?e.title:s.escapeHtml(e.title).split("\n").join("<br>"),i.innerHTML=e.html?e.text:s.escapeHtml(e.text||"").split("\n").join("<br>"),e.text&&s.show(i),e.customClass)s.addClass(t,e.customClass),t.setAttribute("data-custom-class",e.customClass);else{var d=t.getAttribute("data-custom-class");s.removeClass(t,d),t.setAttribute("data-custom-class","")}if(s.hide(t.querySelectorAll(".sa-icon")),e.type&&!a.isIE8()){var f=function(){for(var o=!1,a=0;a<l.length;a++)if(e.type===l[a]){o=!0;break}if(!o)return logStr("Unknown alert type: "+e.type),{v:!1};var i=["success","error","warning","info"],u=n;-1!==i.indexOf(e.type)&&(u=t.querySelector(".sa-icon.sa-"+e.type),s.show(u));var c=r.getInput();switch(e.type){case"success":s.addClass(u,"animate"),s.addClass(u.querySelector(".sa-tip"),"animateSuccessTip"),s.addClass(u.querySelector(".sa-long"),"animateSuccessLong");break;case"error":s.addClass(u,"animateErrorIcon"),s.addClass(u.querySelector(".sa-x-mark"),"animateXMark");break;case"warning":s.addClass(u,"pulseWarning"),s.addClass(u.querySelector(".sa-body"),"pulseWarningIns"),s.addClass(u.querySelector(".sa-dot"),"pulseWarningIns");break;case"input":case"prompt":c.setAttribute("type",e.inputType),c.value=e.inputValue,c.setAttribute("placeholder",e.inputPlaceholder),s.addClass(t,"show-input"),setTimeout(function(){c.focus(),c.addEventListener("keyup",swal.resetInputError)},400)}}();if("object"==typeof f)return f.v}if(e.imageUrl){var p=t.querySelector(".sa-icon.sa-custom");p.style.backgroundImage="url("+e.imageUrl+")",s.show(p);var m=80,v=80;if(e.imageSize){var y=e.imageSize.toString().split("x"),h=y[0],g=y[1];h&&g?(m=h,v=g):logStr("Parameter imageSize expects value with format WIDTHxHEIGHT, got "+e.imageSize)}p.setAttribute("style",p.getAttribute("style")+"width:"+m+"px; height:"+v+"px")}t.setAttribute("data-has-cancel-button",e.showCancelButton),e.showCancelButton?u.style.display="inline-block":s.hide(u),t.setAttribute("data-has-confirm-button",e.showConfirmButton),e.showConfirmButton?c.style.display="inline-block":s.hide(c),e.cancelButtonText&&(u.innerHTML=s.escapeHtml(e.cancelButtonText)),e.confirmButtonText&&(c.innerHTML=s.escapeHtml(e.confirmButtonText)),e.confirmButtonColor&&(c.style.backgroundColor=e.confirmButtonColor,r.setFocusStyle(c,e.confirmButtonColor)),t.setAttribute("data-allow-outside-click",e.allowOutsideClick);var b=e.doneFunction?!0:!1;t.setAttribute("data-has-done-function",b),e.animation?"string"==typeof e.animation?t.setAttribute("data-animation",e.animation):t.setAttribute("data-animation","pop"):t.setAttribute("data-animation","none"),t.setAttribute("data-timer",e.timer)};o["default"]=i,t.exports=o["default"]},{"./handle-dom":4,"./handle-swal-dom":6,"./utils":9}],9:[function(t,n,o){Object.defineProperty(o,"__esModule",{value:!0});var a=function(e,t){for(var n in t)t.hasOwnProperty(n)&&(e[n]=t[n]);return e},r=function(e){var t=/^#?([a-f\d]{2})([a-f\d]{2})([a-f\d]{2})$/i.exec(e);return t?parseInt(t[1],16)+", "+parseInt(t[2],16)+", "+parseInt(t[3],16):null},s=function(){return e.attachEvent&&!e.addEventListener},l=function(t){e.console&&e.console.log("SweetAlert: "+t)},i=function(e,t){e=String(e).replace(/[^0-9a-f]/gi,""),e.length<6&&(e=e[0]+e[0]+e[1]+e[1]+e[2]+e[2]),t=t||0;var n,o,a="#";for(o=0;3>o;o++)n=parseInt(e.substr(2*o,2),16),n=Math.round(Math.min(Math.max(0,n+n*t),255)).toString(16),a+=("00"+n).substr(n.length);return a};o.extend=a,o.hexToRgb=r,o.isIE8=s,o.logStr=l,o.colorLuminance=i},{}]},{},[1]),"function"==typeof define&&define.amd?define(function(){return sweetAlert}):"undefined"!=typeof module&&module.exports&&(module.exports=sweetAlert)}(window,document);
diff --git a/management/guns-admin/src/main/webapp/static/js/plugins/switchery/switchery.js b/management/guns-admin/src/main/webapp/static/js/plugins/switchery/switchery.js
new file mode 100644
index 0000000..c6d8609
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/static/js/plugins/switchery/switchery.js
@@ -0,0 +1 @@
+(function(){function require(path,parent,orig){var resolved=require.resolve(path);if(null==resolved){orig=orig||path;parent=parent||"root";var err=new Error('Failed to require "'+orig+'" from "'+parent+'"');err.path=orig;err.parent=parent;err.require=true;throw err}var module=require.modules[resolved];if(!module._resolving&&!module.exports){var mod={};mod.exports={};mod.client=mod.component=true;module._resolving=true;module.call(this,mod.exports,require.relative(resolved),mod);delete module._resolving;module.exports=mod.exports}return module.exports}require.modules={};require.aliases={};require.resolve=function(path){if(path.charAt(0)==="/")path=path.slice(1);var paths=[path,path+".js",path+".json",path+"/index.js",path+"/index.json"];for(var i=0;i<paths.length;i++){var path=paths[i];if(require.modules.hasOwnProperty(path))return path;if(require.aliases.hasOwnProperty(path))return require.aliases[path]}};require.normalize=function(curr,path){var segs=[];if("."!=path.charAt(0))return path;curr=curr.split("/");path=path.split("/");for(var i=0;i<path.length;++i){if(".."==path[i]){curr.pop()}else if("."!=path[i]&&""!=path[i]){segs.push(path[i])}}return curr.concat(segs).join("/")};require.register=function(path,definition){require.modules[path]=definition};require.alias=function(from,to){if(!require.modules.hasOwnProperty(from)){throw new Error('Failed to alias "'+from+'", it does not exist')}require.aliases[to]=from};require.relative=function(parent){var p=require.normalize(parent,"..");function lastIndexOf(arr,obj){var i=arr.length;while(i--){if(arr[i]===obj)return i}return-1}function localRequire(path){var resolved=localRequire.resolve(path);return require(resolved,parent,path)}localRequire.resolve=function(path){var c=path.charAt(0);if("/"==c)return path.slice(1);if("."==c)return require.normalize(p,path);var segs=parent.split("/");var i=lastIndexOf(segs,"deps")+1;if(!i)i=0;path=segs.slice(0,i+1).join("/")+"/deps/"+path;return path};localRequire.exists=function(path){return require.modules.hasOwnProperty(localRequire.resolve(path))};return localRequire};require.register("abpetkov-transitionize/transitionize.js",function(exports,require,module){module.exports=Transitionize;function Transitionize(element,props){if(!(this instanceof Transitionize))return new Transitionize(element,props);this.element=element;this.props=props||{};this.init()}Transitionize.prototype.isSafari=function(){return/Safari/.test(navigator.userAgent)&&/Apple Computer/.test(navigator.vendor)};Transitionize.prototype.init=function(){var transitions=[];for(var key in this.props){transitions.push(key+" "+this.props[key])}this.element.style.transition=transitions.join(", ");if(this.isSafari())this.element.style.webkitTransition=transitions.join(", ")}});require.register("ftlabs-fastclick/lib/fastclick.js",function(exports,require,module){function FastClick(layer){"use strict";var oldOnClick,self=this;this.trackingClick=false;this.trackingClickStart=0;this.targetElement=null;this.touchStartX=0;this.touchStartY=0;this.lastTouchIdentifier=0;this.touchBoundary=10;this.layer=layer;if(!layer||!layer.nodeType){throw new TypeError("Layer must be a document node")}this.onClick=function(){return FastClick.prototype.onClick.apply(self,arguments)};this.onMouse=function(){return FastClick.prototype.onMouse.apply(self,arguments)};this.onTouchStart=function(){return FastClick.prototype.onTouchStart.apply(self,arguments)};this.onTouchMove=function(){return FastClick.prototype.onTouchMove.apply(self,arguments)};this.onTouchEnd=function(){return FastClick.prototype.onTouchEnd.apply(self,arguments)};this.onTouchCancel=function(){return FastClick.prototype.onTouchCancel.apply(self,arguments)};if(FastClick.notNeeded(layer)){return}if(this.deviceIsAndroid){layer.addEventListener("mouseover",this.onMouse,true);layer.addEventListener("mousedown",this.onMouse,true);layer.addEventListener("mouseup",this.onMouse,true)}layer.addEventListener("click",this.onClick,true);layer.addEventListener("touchstart",this.onTouchStart,false);layer.addEventListener("touchmove",this.onTouchMove,false);layer.addEventListener("touchend",this.onTouchEnd,false);layer.addEventListener("touchcancel",this.onTouchCancel,false);if(!Event.prototype.stopImmediatePropagation){layer.removeEventListener=function(type,callback,capture){var rmv=Node.prototype.removeEventListener;if(type==="click"){rmv.call(layer,type,callback.hijacked||callback,capture)}else{rmv.call(layer,type,callback,capture)}};layer.addEventListener=function(type,callback,capture){var adv=Node.prototype.addEventListener;if(type==="click"){adv.call(layer,type,callback.hijacked||(callback.hijacked=function(event){if(!event.propagationStopped){callback(event)}}),capture)}else{adv.call(layer,type,callback,capture)}}}if(typeof layer.onclick==="function"){oldOnClick=layer.onclick;layer.addEventListener("click",function(event){oldOnClick(event)},false);layer.onclick=null}}FastClick.prototype.deviceIsAndroid=navigator.userAgent.indexOf("Android")>0;FastClick.prototype.deviceIsIOS=/iP(ad|hone|od)/.test(navigator.userAgent);FastClick.prototype.deviceIsIOS4=FastClick.prototype.deviceIsIOS&&/OS 4_\d(_\d)?/.test(navigator.userAgent);FastClick.prototype.deviceIsIOSWithBadTarget=FastClick.prototype.deviceIsIOS&&/OS ([6-9]|\d{2})_\d/.test(navigator.userAgent);FastClick.prototype.needsClick=function(target){"use strict";switch(target.nodeName.toLowerCase()){case"button":case"select":case"textarea":if(target.disabled){return true}break;case"input":if(this.deviceIsIOS&&target.type==="file"||target.disabled){return true}break;case"label":case"video":return true}return/\bneedsclick\b/.test(target.className)};FastClick.prototype.needsFocus=function(target){"use strict";switch(target.nodeName.toLowerCase()){case"textarea":return true;case"select":return!this.deviceIsAndroid;case"input":switch(target.type){case"button":case"checkbox":case"file":case"image":case"radio":case"submit":return false}return!target.disabled&&!target.readOnly;default:return/\bneedsfocus\b/.test(target.className)}};FastClick.prototype.sendClick=function(targetElement,event){"use strict";var clickEvent,touch;if(document.activeElement&&document.activeElement!==targetElement){document.activeElement.blur()}touch=event.changedTouches[0];clickEvent=document.createEvent("MouseEvents");clickEvent.initMouseEvent(this.determineEventType(targetElement),true,true,window,1,touch.screenX,touch.screenY,touch.clientX,touch.clientY,false,false,false,false,0,null);clickEvent.forwardedTouchEvent=true;targetElement.dispatchEvent(clickEvent)};FastClick.prototype.determineEventType=function(targetElement){"use strict";if(this.deviceIsAndroid&&targetElement.tagName.toLowerCase()==="select"){return"mousedown"}return"click"};FastClick.prototype.focus=function(targetElement){"use strict";var length;if(this.deviceIsIOS&&targetElement.setSelectionRange&&targetElement.type.indexOf("date")!==0&&targetElement.type!=="time"){length=targetElement.value.length;targetElement.setSelectionRange(length,length)}else{targetElement.focus()}};FastClick.prototype.updateScrollParent=function(targetElement){"use strict";var scrollParent,parentElement;scrollParent=targetElement.fastClickScrollParent;if(!scrollParent||!scrollParent.contains(targetElement)){parentElement=targetElement;do{if(parentElement.scrollHeight>parentElement.offsetHeight){scrollParent=parentElement;targetElement.fastClickScrollParent=parentElement;break}parentElement=parentElement.parentElement}while(parentElement)}if(scrollParent){scrollParent.fastClickLastScrollTop=scrollParent.scrollTop}};FastClick.prototype.getTargetElementFromEventTarget=function(eventTarget){"use strict";if(eventTarget.nodeType===Node.TEXT_NODE){return eventTarget.parentNode}return eventTarget};FastClick.prototype.onTouchStart=function(event){"use strict";var targetElement,touch,selection;if(event.targetTouches.length>1){return true}targetElement=this.getTargetElementFromEventTarget(event.target);touch=event.targetTouches[0];if(this.deviceIsIOS){selection=window.getSelection();if(selection.rangeCount&&!selection.isCollapsed){return true}if(!this.deviceIsIOS4){if(touch.identifier===this.lastTouchIdentifier){event.preventDefault();return false}this.lastTouchIdentifier=touch.identifier;this.updateScrollParent(targetElement)}}this.trackingClick=true;this.trackingClickStart=event.timeStamp;this.targetElement=targetElement;this.touchStartX=touch.pageX;this.touchStartY=touch.pageY;if(event.timeStamp-this.lastClickTime<200){event.preventDefault()}return true};FastClick.prototype.touchHasMoved=function(event){"use strict";var touch=event.changedTouches[0],boundary=this.touchBoundary;if(Math.abs(touch.pageX-this.touchStartX)>boundary||Math.abs(touch.pageY-this.touchStartY)>boundary){return true}return false};FastClick.prototype.onTouchMove=function(event){"use strict";if(!this.trackingClick){return true}if(this.targetElement!==this.getTargetElementFromEventTarget(event.target)||this.touchHasMoved(event)){this.trackingClick=false;this.targetElement=null}return true};FastClick.prototype.findControl=function(labelElement){"use strict";if(labelElement.control!==undefined){return labelElement.control}if(labelElement.htmlFor){return document.getElementById(labelElement.htmlFor)}return labelElement.querySelector("button, input:not([type=hidden]), keygen, meter, output, progress, select, textarea")};FastClick.prototype.onTouchEnd=function(event){"use strict";var forElement,trackingClickStart,targetTagName,scrollParent,touch,targetElement=this.targetElement;if(!this.trackingClick){return true}if(event.timeStamp-this.lastClickTime<200){this.cancelNextClick=true;return true}this.cancelNextClick=false;this.lastClickTime=event.timeStamp;trackingClickStart=this.trackingClickStart;this.trackingClick=false;this.trackingClickStart=0;if(this.deviceIsIOSWithBadTarget){touch=event.changedTouches[0];targetElement=document.elementFromPoint(touch.pageX-window.pageXOffset,touch.pageY-window.pageYOffset)||targetElement;targetElement.fastClickScrollParent=this.targetElement.fastClickScrollParent}targetTagName=targetElement.tagName.toLowerCase();if(targetTagName==="label"){forElement=this.findControl(targetElement);if(forElement){this.focus(targetElement);if(this.deviceIsAndroid){return false}targetElement=forElement}}else if(this.needsFocus(targetElement)){if(event.timeStamp-trackingClickStart>100||this.deviceIsIOS&&window.top!==window&&targetTagName==="input"){this.targetElement=null;return false}this.focus(targetElement);if(!this.deviceIsIOS4||targetTagName!=="select"){this.targetElement=null;event.preventDefault()}return false}if(this.deviceIsIOS&&!this.deviceIsIOS4){scrollParent=targetElement.fastClickScrollParent;if(scrollParent&&scrollParent.fastClickLastScrollTop!==scrollParent.scrollTop){return true}}if(!this.needsClick(targetElement)){event.preventDefault();this.sendClick(targetElement,event)}return false};FastClick.prototype.onTouchCancel=function(){"use strict";this.trackingClick=false;this.targetElement=null};FastClick.prototype.onMouse=function(event){"use strict";if(!this.targetElement){return true}if(event.forwardedTouchEvent){return true}if(!event.cancelable){return true}if(!this.needsClick(this.targetElement)||this.cancelNextClick){if(event.stopImmediatePropagation){event.stopImmediatePropagation()}else{event.propagationStopped=true}event.stopPropagation();event.preventDefault();return false}return true};FastClick.prototype.onClick=function(event){"use strict";var permitted;if(this.trackingClick){this.targetElement=null;this.trackingClick=false;return true}if(event.target.type==="submit"&&event.detail===0){return true}permitted=this.onMouse(event);if(!permitted){this.targetElement=null}return permitted};FastClick.prototype.destroy=function(){"use strict";var layer=this.layer;if(this.deviceIsAndroid){layer.removeEventListener("mouseover",this.onMouse,true);layer.removeEventListener("mousedown",this.onMouse,true);layer.removeEventListener("mouseup",this.onMouse,true)}layer.removeEventListener("click",this.onClick,true);layer.removeEventListener("touchstart",this.onTouchStart,false);layer.removeEventListener("touchmove",this.onTouchMove,false);layer.removeEventListener("touchend",this.onTouchEnd,false);layer.removeEventListener("touchcancel",this.onTouchCancel,false)};FastClick.notNeeded=function(layer){"use strict";var metaViewport;var chromeVersion;if(typeof window.ontouchstart==="undefined"){return true}chromeVersion=+(/Chrome\/([0-9]+)/.exec(navigator.userAgent)||[,0])[1];if(chromeVersion){if(FastClick.prototype.deviceIsAndroid){metaViewport=document.querySelector("meta[name=viewport]");if(metaViewport){if(metaViewport.content.indexOf("user-scalable=no")!==-1){return true}if(chromeVersion>31&&window.innerWidth<=window.screen.width){return true}}}else{return true}}if(layer.style.msTouchAction==="none"){return true}return false};FastClick.attach=function(layer){"use strict";return new FastClick(layer)};if(typeof define!=="undefined"&&define.amd){define(function(){"use strict";return FastClick})}else if(typeof module!=="undefined"&&module.exports){module.exports=FastClick.attach;module.exports.FastClick=FastClick}else{window.FastClick=FastClick}});require.register("switchery/switchery.js",function(exports,require,module){var transitionize=require("transitionize"),fastclick=require("fastclick");module.exports=Switchery;var defaults={color:"#64bd63",secondaryColor:"#dfdfdf",className:"switchery",disabled:false,disabledOpacity:.5,speed:"0.4s"};function Switchery(element,options){if(!(this instanceof Switchery))return new Switchery(element,options);this.element=element;this.options=options||{};for(var i in defaults){if(this.options[i]==null){this.options[i]=defaults[i]}}if(this.element!=null&&this.element.type=="checkbox")this.init()}Switchery.prototype.hide=function(){this.element.style.display="none"};Switchery.prototype.show=function(){var switcher=this.create();this.insertAfter(this.element,switcher)};Switchery.prototype.create=function(){this.switcher=document.createElement("span");this.jack=document.createElement("small");this.switcher.appendChild(this.jack);this.switcher.className=this.options.className;return this.switcher};Switchery.prototype.insertAfter=function(reference,target){reference.parentNode.insertBefore(target,reference.nextSibling)};Switchery.prototype.isChecked=function(){return this.element.checked};Switchery.prototype.isDisabled=function(){return this.options.disabled||this.element.disabled};Switchery.prototype.setPosition=function(clicked){var checked=this.isChecked(),switcher=this.switcher,jack=this.jack;if(clicked&&checked)checked=false;else if(clicked&&!checked)checked=true;if(checked===true){this.element.checked=true;if(window.getComputedStyle)jack.style.left=parseInt(window.getComputedStyle(switcher).width)-parseInt(window.getComputedStyle(jack).width)+"px";else jack.style.left=parseInt(switcher.currentStyle["width"])-parseInt(jack.currentStyle["width"])+"px";if(this.options.color)this.colorize();this.setSpeed()}else{jack.style.left=0;this.element.checked=false;this.switcher.style.boxShadow="inset 0 0 0 0 "+this.options.secondaryColor;this.switcher.style.borderColor=this.options.secondaryColor;this.switcher.style.backgroundColor="";this.setSpeed()}};Switchery.prototype.setSpeed=function(){var switcherProp={},jackProp={left:this.options.speed.replace(/[a-z]/,"")/2+"s"};if(this.isChecked()){switcherProp={border:this.options.speed,"box-shadow":this.options.speed,"background-color":this.options.speed.replace(/[a-z]/,"")*3+"s"}}else{switcherProp={border:this.options.speed,"box-shadow":this.options.speed}}transitionize(this.switcher,switcherProp);transitionize(this.jack,jackProp)};Switchery.prototype.setAttributes=function(){var id=this.element.getAttribute("id"),name=this.element.getAttribute("name");if(id)this.switcher.setAttribute("id",id);if(name)this.switcher.setAttribute("name",name)};Switchery.prototype.colorize=function(){this.switcher.style.backgroundColor=this.options.color;this.switcher.style.borderColor=this.options.color;this.switcher.style.boxShadow="inset 0 0 0 16px "+this.options.color};Switchery.prototype.handleOnchange=function(state){if(typeof Event==="function"||!document.fireEvent){var event=document.createEvent("HTMLEvents");event.initEvent("change",true,true);this.element.dispatchEvent(event)}else{this.element.fireEvent("onchange")}};Switchery.prototype.handleChange=function(){var self=this,el=this.element;if(el.addEventListener){el.addEventListener("change",function(){self.setPosition()})}else{el.attachEvent("onchange",function(){self.setPosition()})}};Switchery.prototype.handleClick=function(){var self=this,switcher=this.switcher;if(this.isDisabled()===false){fastclick(switcher);if(switcher.addEventListener){switcher.addEventListener("click",function(){self.setPosition(true);self.handleOnchange(self.element.checked)})}else{switcher.attachEvent("onclick",function(){self.setPosition(true);self.handleOnchange(self.element.checked)})}}else{this.element.disabled=true;this.switcher.style.opacity=this.options.disabledOpacity}};Switchery.prototype.disableLabel=function(){var parent=this.element.parentNode,labels=document.getElementsByTagName("label"),attached=null;for(var i=0;i<labels.length;i++){if(labels[i].getAttribute("for")===this.element.id){attached=true}}if(attached===true||parent.tagName.toLowerCase()==="label"){if(parent.addEventListener){parent.addEventListener("click",function(e){e.preventDefault()})}else{parent.attachEvent("onclick",function(e){e.returnValue=false})}}};Switchery.prototype.markAsSwitched=function(){this.element.setAttribute("data-switchery",true)};Switchery.prototype.markedAsSwitched=function(){return this.element.getAttribute("data-switchery")};Switchery.prototype.init=function(){this.hide();this.show();this.setPosition();this.setAttributes();this.markAsSwitched();this.disableLabel();this.handleChange();this.handleClick()}});require.alias("abpetkov-transitionize/transitionize.js","switchery/deps/transitionize/transitionize.js");require.alias("abpetkov-transitionize/transitionize.js","switchery/deps/transitionize/index.js");require.alias("abpetkov-transitionize/transitionize.js","transitionize/index.js");require.alias("abpetkov-transitionize/transitionize.js","abpetkov-transitionize/index.js");require.alias("ftlabs-fastclick/lib/fastclick.js","switchery/deps/fastclick/lib/fastclick.js");require.alias("ftlabs-fastclick/lib/fastclick.js","switchery/deps/fastclick/index.js");require.alias("ftlabs-fastclick/lib/fastclick.js","fastclick/index.js");require.alias("ftlabs-fastclick/lib/fastclick.js","ftlabs-fastclick/index.js");require.alias("switchery/switchery.js","switchery/index.js");if(typeof exports=="object"){module.exports=require("switchery")}else if(typeof define=="function"&&define.amd){define(function(){return require("switchery")})}else{this["Switchery"]=require("switchery")}})();
diff --git a/management/guns-admin/src/main/webapp/static/js/plugins/umeditor/dialogs/emotion/emotion.css b/management/guns-admin/src/main/webapp/static/js/plugins/umeditor/dialogs/emotion/emotion.css
new file mode 100644
index 0000000..4fef67c
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/static/js/plugins/umeditor/dialogs/emotion/emotion.css
@@ -0,0 +1,87 @@
+.edui-popup-emotion .edui-emotion-jd img{
+ background:transparent url(images/jxface2.gif?v=1.1) no-repeat scroll left top;
+ cursor:pointer;width:35px;height:35px;display:block;
+}
+.edui-popup-emotion .edui-emotion-pp img{
+ background:transparent url(images/fface.gif?v=1.1) no-repeat scroll left top;
+ cursor:pointer;width:25px;height:25px;display:block;
+}
+
+.edui-popup-emotion .edui-emotion-ldw img{
+ background:transparent url(images/wface.gif?v=1.1) no-repeat scroll left top;
+ cursor:pointer;width:35px;height:35px;display:block;
+}
+
+.edui-popup-emotion .edui-emotion-tsj img{
+ background:transparent url(images/tface.gif?v=1.1) no-repeat scroll left top;
+ cursor:pointer;width:35px;height:35px;display:block;
+}
+
+.edui-popup-emotion .edui-emotion-cat img{
+ background:transparent url(images/cface.gif?v=1.1) no-repeat scroll left top;
+ cursor:pointer;width:35px;height:35px;display:block;
+}
+
+.edui-popup-emotion .edui-emotion-bb img{
+ background:transparent url(images/bface.gif?v=1.1) no-repeat scroll left top;
+ cursor:pointer;width:35px;height:35px;display:block;
+}
+
+.edui-popup-emotion .edui-emotion-youa img{
+ background:transparent url(images/yface.gif?v=1.1) no-repeat scroll left top;
+ cursor:pointer;width:35px;height:35px;display:block;
+}
+
+.edui-popup-emotion .edui-emotion-smileytable {
+ width: 100%;
+ border-spacing: 0;
+ border-collapse: collapse;
+ table-layout: fixed;
+}
+
+.edui-popup-emotion .edui-emotion-wrapper {
+ padding: 15px;
+}
+
+.edui-popup-emotion .edui-tab-nav{
+ height: auto;
+ *height: 31px;
+}
+.edui-popup-emotion .edui-emotion-tabs{
+ clear: both;
+ width: 0;
+ height: 0;
+}
+
+.edui-popup-emotion .edui-tab-content {
+ padding: 15px 0;
+}
+
+.edui-popup-emotion .edui-emotion-preview-box {
+ width:90px;
+ height:76px;
+ border:2px solid #9cb945;
+ background:#FFFFFF;
+ background-position:center;
+ background-repeat:no-repeat;
+ position: absolute;
+ top: 67px;
+ left: 494px;
+ display: none;
+}
+
+.edui-popup-emotion .edui-tab-text {
+ font-size: 12px;
+}
+
+.edui-popup-emotion .edui-emotion-preview-left {
+ left: 15px;
+}
+
+.edui-popup-emotion .edui-emotion-preview-img {
+ width: 100%;
+ height: 100%;
+ display: block;
+ background-repeat: no-repeat;
+ background-position: center center;
+}
diff --git a/management/guns-admin/src/main/webapp/static/js/plugins/umeditor/dialogs/emotion/emotion.js b/management/guns-admin/src/main/webapp/static/js/plugins/umeditor/dialogs/emotion/emotion.js
new file mode 100644
index 0000000..a74ddaf
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/static/js/plugins/umeditor/dialogs/emotion/emotion.js
@@ -0,0 +1,272 @@
+(function(){
+
+ var editor = null;
+
+ UM.registerWidget('emotion',{
+
+ tpl: "<link type=\"text/css\" rel=\"stylesheet\" href=\"<%=emotion_url%>emotion.css\">" +
+ "<div class=\"edui-emotion-tab-Jpanel edui-emotion-wrapper\">" +
+ "<ul class=\"edui-emotion-Jtabnav edui-tab-nav\">" +
+ "<li class=\"edui-tab-item\"><a data-context=\".edui-emotion-Jtab0\" hideFocus=\"true\" class=\"edui-tab-text\"><%=lang_input_choice%></a></li>" +
+ "<li class=\"edui-tab-item\"><a data-context=\".edui-emotion-Jtab1\" class=\"edui-tab-text\"><%=lang_input_Tuzki%></a></li>" +
+ "<li class=\"edui-tab-item\"><a data-context=\".edui-emotion-Jtab2\" hideFocus=\"true\" class=\"edui-tab-text\"><%=lang_input_lvdouwa%></a></li>" +
+ "<li class=\"edui-tab-item\"><a data-context=\".edui-emotion-Jtab3\" hideFocus=\"true\" class=\"edui-tab-text\"><%=lang_input_BOBO%></a></li>" +
+ "<li class=\"edui-tab-item\"><a data-context=\".edui-emotion-Jtab4\" hideFocus=\"true\" class=\"edui-tab-text\"><%=lang_input_babyCat%></a></li>" +
+ "<li class=\"edui-tab-item\"><a data-context=\".edui-emotion-Jtab5\" hideFocus=\"true\" class=\"edui-tab-text\"><%=lang_input_bubble%></a></li>" +
+ "<li class=\"edui-tab-item\"><a data-context=\".edui-emotion-Jtab6\" hideFocus=\"true\" class=\"edui-tab-text\"><%=lang_input_youa%></a></li>" +
+ "<li class=\"edui-emotion-tabs\"></li>" +
+ "</ul>" +
+ "<div class=\"edui-tab-content edui-emotion-JtabBodys\">" +
+ "<div class=\"edui-emotion-Jtab0 edui-tab-pane\"></div>" +
+ "<div class=\"edui-emotion-Jtab1 edui-tab-pane\"></div>" +
+ "<div class=\"edui-emotion-Jtab2 edui-tab-pane\"></div>" +
+ "<div class=\"edui-emotion-Jtab3 edui-tab-pane\"></div>" +
+ "<div class=\"edui-emotion-Jtab4 edui-tab-pane\"></div>" +
+ "<div class=\"edui-emotion-Jtab5 edui-tab-pane\"></div>" +
+ "<div class=\"edui-emotion-Jtab6 edui-tab-pane\"></div>" +
+ "</div>" +
+ "<div class=\"edui-emotion-JtabIconReview edui-emotion-preview-box\">" +
+ "<img src=\"<%=cover_img%>\" class=\'edui-emotion-JfaceReview edui-emotion-preview-img\'/>" +
+ "</div>",
+
+ sourceData: {
+ emotion: {
+ tabNum:7, //切换面板数量
+ SmilmgName:{ 'edui-emotion-Jtab0':['j_00', 84], 'edui-emotion-Jtab1':['t_00', 40], 'edui-emotion-Jtab2':['w_00', 52], 'edui-emotion-Jtab3':['B_00', 63], 'edui-emotion-Jtab4':['C_00', 20], 'edui-emotion-Jtab5':['i_f', 50], 'edui-emotion-Jtab6':['y_00', 40] }, //图片前缀名
+ imageFolders:{ 'edui-emotion-Jtab0':'jx2/', 'edui-emotion-Jtab1':'tsj/', 'edui-emotion-Jtab2':'ldw/', 'edui-emotion-Jtab3':'bobo/', 'edui-emotion-Jtab4':'babycat/', 'edui-emotion-Jtab5':'face/', 'edui-emotion-Jtab6':'youa/'}, //图片对应文件夹路径
+ imageCss:{'edui-emotion-Jtab0':'jd', 'edui-emotion-Jtab1':'tsj', 'edui-emotion-Jtab2':'ldw', 'edui-emotion-Jtab3':'bb', 'edui-emotion-Jtab4':'cat', 'edui-emotion-Jtab5':'pp', 'edui-emotion-Jtab6':'youa'}, //图片css类名
+ imageCssOffset:{'edui-emotion-Jtab0':35, 'edui-emotion-Jtab1':35, 'edui-emotion-Jtab2':35, 'edui-emotion-Jtab3':35, 'edui-emotion-Jtab4':35, 'edui-emotion-Jtab5':25, 'edui-emotion-Jtab6':35}, //图片偏移
+ SmileyInfor:{
+ 'edui-emotion-Jtab0':['Kiss', 'Love', 'Yeah', '啊！', '背扭', '顶', '抖胸', '88', '汗', '瞌睡', '鲁拉', '拍砖', '揉脸', '生日快乐', '大笑', '瀑布汗~', '惊讶', '臭美', '傻笑', '抛媚眼', '发怒', '打酱油', '俯卧撑', '气愤', '?', '吻', '怒', '胜利', 'HI', 'KISS', '不说', '不要', '扯花', '大心', '顶', '大惊', '飞吻', '鬼脸', '害羞', '口水', '狂哭', '来', '发财了', '吃西瓜', '套牢', '害羞', '庆祝', '我来了', '敲打', '晕了', '胜利', '臭美', '被打了', '贪吃', '迎接', '酷', '微笑', '亲吻', '调皮', '惊恐', '耍酷', '发火', '害羞', '汗水', '大哭', '', '加油', '困', '你NB', '晕倒', '开心', '偷笑', '大哭', '滴汗', '叹气', '超赞', '??', '飞吻', '天使', '撒花', '生气', '被砸', '吓傻', '随意吐'],
+ 'edui-emotion-Jtab1':['Kiss', 'Love', 'Yeah', '啊！', '背扭', '顶', '抖胸', '88', '汗', '瞌睡', '鲁拉', '拍砖', '揉脸', '生日快乐', '摊手', '睡觉', '瘫坐', '无聊', '星星闪', '旋转', '也不行', '郁闷', '正Music', '抓墙', '撞墙至死', '歪头', '戳眼', '飘过', '互相拍砖', '砍死你', '扔桌子', '少林寺', '什么？', '转头', '我爱牛奶', '我踢', '摇晃', '晕厥', '在笼子里', '震荡'],
+ 'edui-emotion-Jtab2':['大笑', '瀑布汗~', '惊讶', '臭美', '傻笑', '抛媚眼', '发怒', '我错了', 'money', '气愤', '挑逗', '吻', '怒', '胜利', '委屈', '受伤', '说啥呢？', '闭嘴', '不', '逗你玩儿', '飞吻', '眩晕', '魔法', '我来了', '睡了', '我打', '闭嘴', '打', '打晕了', '刷牙', '爆揍', '炸弹', '倒立', '刮胡子', '邪恶的笑', '不要不要', '爱恋中', '放大仔细看', '偷窥', '超高兴', '晕', '松口气', '我跑', '享受', '修养', '哭', '汗', '啊~', '热烈欢迎', '打酱油', '俯卧撑', '?'],
+ 'edui-emotion-Jtab3':['HI', 'KISS', '不说', '不要', '扯花', '大心', '顶', '大惊', '飞吻', '鬼脸', '害羞', '口水', '狂哭', '来', '泪眼', '流泪', '生气', '吐舌', '喜欢', '旋转', '再见', '抓狂', '汗', '鄙视', '拜', '吐血', '嘘', '打人', '蹦跳', '变脸', '扯肉', '吃To', '吃花', '吹泡泡糖', '大变身', '飞天舞', '回眸', '可怜', '猛抽', '泡泡', '苹果', '亲', '', '骚舞', '烧香', '睡', '套娃娃', '捅捅', '舞倒', '西红柿', '爱慕', '摇', '摇摆', '杂耍', '招财', '被殴', '被球闷', '大惊', '理想', '欧打', '呕吐', '碎', '吐痰'],
+ 'edui-emotion-Jtab4':['发财了', '吃西瓜', '套牢', '害羞', '庆祝', '我来了', '敲打', '晕了', '胜利', '臭美', '被打了', '贪吃', '迎接', '酷', '顶', '幸运', '爱心', '躲', '送花', '选择'],
+ 'edui-emotion-Jtab5':['微笑', '亲吻', '调皮', '惊讶', '耍酷', '发火', '害羞', '汗水', '大哭', '得意', '鄙视', '困', '夸奖', '晕倒', '疑问', '媒婆', '狂吐', '青蛙', '发愁', '亲吻', '', '爱心', '心碎', '玫瑰', '礼物', '哭', '奸笑', '可爱', '得意', '呲牙', '暴汗', '楚楚可怜', '困', '哭', '生气', '惊讶', '口水', '彩虹', '夜空', '太阳', '钱钱', '灯泡', '咖啡', '蛋糕', '音乐', '爱', '胜利', '赞', '鄙视', 'OK'],
+ 'edui-emotion-Jtab6':['男兜', '女兜', '开心', '乖乖', '偷笑', '大笑', '抽泣', '大哭', '无奈', '滴汗', '叹气', '狂晕', '委屈', '超赞', '??', '疑问', '飞吻', '天使', '撒花', '生气', '被砸', '口水', '泪奔', '吓傻', '吐舌头', '点头', '随意吐', '旋转', '困困', '鄙视', '狂顶', '篮球', '再见', '欢迎光临', '恭喜发财', '稍等', '我在线', '恕不议价', '库房有货', '货在路上']
+ }
+ }
+ },
+ initContent:function( _editor, $widget ){
+
+ var me = this,
+ emotion = me.sourceData.emotion,
+ lang = _editor.getLang( 'emotion' )['static'],
+ emotionUrl = UMEDITOR_CONFIG.UMEDITOR_HOME_URL + 'dialogs/emotion/',
+ options = $.extend( {}, lang, {
+ emotion_url: emotionUrl
+ }),
+ $root = me.root();
+
+ if( me.inited ) {
+ me.preventDefault();
+ this.switchToFirst();
+ return;
+ }
+
+ me.inited = true;
+
+ editor = _editor;
+ this.widget = $widget;
+
+ emotion.SmileyPath = _editor.options.emotionLocalization === true ? emotionUrl + 'images/' : "http://img.baidu.com/hi/";
+ emotion.SmileyBox = me.createTabList( emotion.tabNum );
+ emotion.tabExist = me.createArr( emotion.tabNum );
+
+ options['cover_img'] = emotion.SmileyPath + (editor.options.emotionLocalization ? '0.gif' : 'default/0.gif');
+
+ $root.html( $.parseTmpl( me.tpl, options ) );
+
+ me.tabs = $.eduitab({selector:".edui-emotion-tab-Jpanel"});
+
+ //缓存预览对象
+ me.previewBox = $root.find(".edui-emotion-JtabIconReview");
+ me.previewImg = $root.find(".edui-emotion-JfaceReview");
+
+ me.initImgName();
+
+ },
+ initEvent:function(){
+
+ var me = this;
+
+ //防止点击过后关闭popup
+ me.root().on('click', function(e){
+ return false;
+ });
+
+ //移动预览
+ me.root().delegate( 'td', 'mouseover mouseout', function( evt ){
+
+ var $td = $( this),
+ url = $td.attr('data-surl') || null;
+
+ if( url ) {
+ me[evt.type]( this, url , $td.attr('data-posflag') );
+ }
+
+ return false;
+
+ } );
+
+ //点击选中
+ me.root().delegate( 'td', 'click', function( evt ){
+
+ var $td = $( this),
+ realUrl = $td.attr('data-realurl') || null;
+
+ if( realUrl ) {
+ me.insertSmiley( realUrl.replace( /'/g, "\\'" ), evt );
+ }
+
+ return false;
+
+ } );
+
+ //更新模板
+ me.tabs.edui().on("beforeshow", function( evt ){
+
+ var contentId = $(evt.target).attr('data-context').replace( /^.*\.(?=[^\s]*$)/, '' );
+
+ evt.stopPropagation();
+
+ me.updateTab( contentId );
+
+ });
+
+ this.switchToFirst();
+
+ },
+ initImgName: function() {
+
+ var emotion = this.sourceData.emotion;
+
+ for ( var pro in emotion.SmilmgName ) {
+ var tempName = emotion.SmilmgName[pro],
+ tempBox = emotion.SmileyBox[pro],
+ tempStr = "";
+
+ if ( tempBox.length ) return;
+
+ for ( var i = 1; i <= tempName[1]; i++ ) {
+ tempStr = tempName[0];
+ if ( i < 10 ) tempStr = tempStr + '0';
+ tempStr = tempStr + i + '.gif';
+ tempBox.push( tempStr );
+ }
+ }
+
+ },
+ /**
+ * 切换到第一个tab
+ */
+ switchToFirst: function(){
+ this.root().find(".edui-emotion-Jtabnav .edui-tab-text:first").trigger('click');
+ },
+ updateTab: function( contentBoxId ) {
+
+ var me = this,
+ emotion = me.sourceData.emotion;
+
+ me.autoHeight( contentBoxId );
+
+ if ( !emotion.tabExist[ contentBoxId ] ) {
+
+ emotion.tabExist[ contentBoxId ] = true;
+ me.createTab( contentBoxId );
+
+ }
+
+ },
+ autoHeight: function( ) {
+ this.widget.height(this.root() + 2);
+ },
+ createTabList: function( tabNum ) {
+ var obj = {};
+ for ( var i = 0; i < tabNum; i++ ) {
+ obj["edui-emotion-Jtab" + i] = [];
+ }
+ return obj;
+ },
+ mouseover: function( td, srcPath, posFlag ) {
+
+ posFlag -= 0;
+
+ $(td).css( 'backgroundColor', '#ACCD3C' );
+
+ this.previewImg.css( "backgroundImage", "url(" + srcPath + ")" );
+ posFlag && this.previewBox.addClass('edui-emotion-preview-left');
+ this.previewBox.show();
+
+ },
+ mouseout: function( td ) {
+ $(td).css( 'backgroundColor', 'transparent' );
+ this.previewBox.removeClass('edui-emotion-preview-left').hide();
+ },
+ insertSmiley: function( url, evt ) {
+ var obj = {
+ src: url
+ };
+ obj._src = obj.src;
+ editor.execCommand( 'insertimage', obj );
+ if ( !evt.ctrlKey ) {
+ //关闭预览
+ this.previewBox.removeClass('edui-emotion-preview-left').hide();
+ this.widget.edui().hide();
+ }
+ },
+ createTab: function( contentBoxId ) {
+
+ var faceVersion = "?v=1.1", //版本号
+ me = this,
+ $contentBox = this.root().find("."+contentBoxId),
+ emotion = me.sourceData.emotion,
+ imagePath = emotion.SmileyPath + emotion.imageFolders[ contentBoxId ], //获取显示表情和预览表情的路径
+ positionLine = 11 / 2, //中间数
+ iWidth = iHeight = 35, //图片长宽
+ iColWidth = 3, //表格剩余空间的显示比例
+ tableCss = emotion.imageCss[ contentBoxId ],
+ cssOffset = emotion.imageCssOffset[ contentBoxId ],
+ textHTML = ['<table border="1" class="edui-emotion-smileytable">'],
+ i = 0, imgNum = emotion.SmileyBox[ contentBoxId ].length, imgColNum = 11, faceImage,
+ sUrl, realUrl, posflag, offset, infor;
+
+ for ( ; i < imgNum; ) {
+ textHTML.push( '<tr>' );
+ for ( var j = 0; j < imgColNum; j++, i++ ) {
+ faceImage = emotion.SmileyBox[ contentBoxId ][i];
+ if ( faceImage ) {
+ sUrl = imagePath + faceImage + faceVersion;
+ realUrl = imagePath + faceImage;
+ posflag = j < positionLine ? 0 : 1;
+ offset = cssOffset * i * (-1) - 1;
+ infor = emotion.SmileyInfor[ contentBoxId ][i];
+
+ textHTML.push( '<td class="edui-emotion-' + tableCss + '" data-surl="'+ sUrl +'" data-realurl="'+ realUrl +'" data-posflag="'+ posflag +'" align="center">' );
+ textHTML.push( '<span>' );
+ textHTML.push( '<img style="background-position:left ' + offset + 'px;" title="' + infor + '" src="' + emotion.SmileyPath + (editor.options.emotionLocalization ? '0.gif" width="' : 'default/0.gif" width="') + iWidth + '" height="' + iHeight + '"></img>' );
+ textHTML.push( '</span>' );
+ } else {
+ textHTML.push( '<td bgcolor="#FFFFFF">' );
+ }
+ textHTML.push( '</td>' );
+ }
+ textHTML.push( '</tr>' );
+ }
+ textHTML.push( '</table>' );
+ textHTML = textHTML.join( "" );
+ $contentBox.html( textHTML );
+ },
+ createArr: function( tabNum ) {
+ var arr = [];
+ for ( var i = 0; i < tabNum; i++ ) {
+ arr[i] = 0;
+ }
+ return arr;
+ },
+ width:603,
+ height:400
+ });
+
+})();
+
diff --git a/management/guns-admin/src/main/webapp/static/js/plugins/umeditor/dialogs/emotion/images/0.gif b/management/guns-admin/src/main/webapp/static/js/plugins/umeditor/dialogs/emotion/images/0.gif
new file mode 100644
index 0000000..6964168
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/static/js/plugins/umeditor/dialogs/emotion/images/0.gif
Binary files differ
diff --git a/management/guns-admin/src/main/webapp/static/js/plugins/umeditor/dialogs/emotion/images/bface.gif b/management/guns-admin/src/main/webapp/static/js/plugins/umeditor/dialogs/emotion/images/bface.gif
new file mode 100644
index 0000000..14fe618
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/static/js/plugins/umeditor/dialogs/emotion/images/bface.gif
Binary files differ
diff --git a/management/guns-admin/src/main/webapp/static/js/plugins/umeditor/dialogs/emotion/images/cface.gif b/management/guns-admin/src/main/webapp/static/js/plugins/umeditor/dialogs/emotion/images/cface.gif
new file mode 100644
index 0000000..bff947f
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/static/js/plugins/umeditor/dialogs/emotion/images/cface.gif
Binary files differ
diff --git a/management/guns-admin/src/main/webapp/static/js/plugins/umeditor/dialogs/emotion/images/fface.gif b/management/guns-admin/src/main/webapp/static/js/plugins/umeditor/dialogs/emotion/images/fface.gif
new file mode 100644
index 0000000..0d8a6af
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/static/js/plugins/umeditor/dialogs/emotion/images/fface.gif
Binary files differ
diff --git a/management/guns-admin/src/main/webapp/static/js/plugins/umeditor/dialogs/emotion/images/jxface2.gif b/management/guns-admin/src/main/webapp/static/js/plugins/umeditor/dialogs/emotion/images/jxface2.gif
new file mode 100644
index 0000000..a959c90
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/static/js/plugins/umeditor/dialogs/emotion/images/jxface2.gif
Binary files differ
diff --git a/management/guns-admin/src/main/webapp/static/js/plugins/umeditor/dialogs/emotion/images/neweditor-tab-bg.png b/management/guns-admin/src/main/webapp/static/js/plugins/umeditor/dialogs/emotion/images/neweditor-tab-bg.png
new file mode 100644
index 0000000..8f398b0
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/static/js/plugins/umeditor/dialogs/emotion/images/neweditor-tab-bg.png
Binary files differ
diff --git a/management/guns-admin/src/main/webapp/static/js/plugins/umeditor/dialogs/emotion/images/tface.gif b/management/guns-admin/src/main/webapp/static/js/plugins/umeditor/dialogs/emotion/images/tface.gif
new file mode 100644
index 0000000..1354f54
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/static/js/plugins/umeditor/dialogs/emotion/images/tface.gif
Binary files differ
diff --git a/management/guns-admin/src/main/webapp/static/js/plugins/umeditor/dialogs/emotion/images/wface.gif b/management/guns-admin/src/main/webapp/static/js/plugins/umeditor/dialogs/emotion/images/wface.gif
new file mode 100644
index 0000000..5667160
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/static/js/plugins/umeditor/dialogs/emotion/images/wface.gif
Binary files differ
diff --git a/management/guns-admin/src/main/webapp/static/js/plugins/umeditor/dialogs/emotion/images/yface.gif b/management/guns-admin/src/main/webapp/static/js/plugins/umeditor/dialogs/emotion/images/yface.gif
new file mode 100644
index 0000000..51608be
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/static/js/plugins/umeditor/dialogs/emotion/images/yface.gif
Binary files differ
diff --git a/management/guns-admin/src/main/webapp/static/js/plugins/umeditor/dialogs/formula/formula.css b/management/guns-admin/src/main/webapp/static/js/plugins/umeditor/dialogs/formula/formula.css
new file mode 100644
index 0000000..45d4865
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/static/js/plugins/umeditor/dialogs/formula/formula.css
@@ -0,0 +1,32 @@
+.edui-popup-formula .edui-formula-wrapper {
+ padding: 15px;
+}
+.edui-popup-formula .edui-formula-wrapper .edui-tab-nav{
+ height: auto;
+ *height: 31px;
+}
+.edui-popup-formula .edui-formula-wrapper .edui-tab-text {
+ font-size: 12px;
+}
+.edui-popup-formula .edui-formula-wrapper .edui-formula-clearboth {
+ clear: both;
+ width: 0;
+ height: 0;
+}
+.edui-popup-formula .edui-formula-wrapper .edui-tab-pane ul {
+ margin: 0px;
+ padding: 0px;
+}
+.edui-popup-formula .edui-formula-wrapper .edui-tab-content {
+ padding: 5px 0px 0px 0px;
+}
+.edui-popup-formula .edui-formula-wrapper .edui-tab-pane .edui-formula-latex-item {
+ display: block;
+ float: left;
+ margin: 0px 3px 3px 0px;
+ width: 30px;
+ height: 30px;
+ border:1px solid #cccccc;
+ background-image: url("images/formula.png");
+ cursor: pointer;
+}
\ No newline at end of file
diff --git a/management/guns-admin/src/main/webapp/static/js/plugins/umeditor/dialogs/formula/formula.html b/management/guns-admin/src/main/webapp/static/js/plugins/umeditor/dialogs/formula/formula.html
new file mode 100644
index 0000000..1271211
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/static/js/plugins/umeditor/dialogs/formula/formula.html
@@ -0,0 +1,212 @@
+<!doctype html>
+<html lang="en">
+<head>
+ <meta charset="UTF-8">
+ <title>Document</title>
+ <link rel="stylesheet" href="../../third-party/mathquill/mathquill.css"/>
+ <style>
+ html, body, .main{
+ margin: 0;
+ padding: 0;
+ overflow: hidden;
+ }
+ .main{
+ width:1024px;
+ height:1024px;
+ }
+ .mathquill-editable,
+ .mathquill-rendered-math{
+ border: 0px;
+ padding: 0px;
+ margin:4px;
+ }
+ </style>
+</head>
+<body>
+
+<div class="main">
+ <div class="mathquill-editable"></div>
+</div>
+
+<div>
+ <input id="blurHelper" />
+</div>
+
+<script src="../../third-party/jquery.min.js"></script>
+<script src="../../third-party/mathquill/mathquill.js"></script>
+<script>
+ $(function(){
+
+ var UM = parent.UM,
+ $iframe = $(getSelfIframe()),
+ editorId = $iframe.parents('.edui-body-container').attr('id'),
+ editor = UM.getEditor(editorId),
+ timer;
+
+ /* 获得当前公式所在的iframe节点 */
+ function getSelfIframe(){
+ var iframes = parent.document.getElementsByTagName('iframe');
+ for (var key in iframes) {
+ if (iframes[key].contentWindow == window) {
+ return iframes[key];
+ }
+ }
+ return null;
+ }
+ /* 获得当前url上的hash存储的参数值 */
+ function getLatex() {
+ return $iframe.attr('data-latex') || '';
+ }
+ /* 保存场景 */
+ function saveScene(){
+ timer && clearTimeout(timer);
+ timer = setTimeout(function(){
+ editor.fireEvent('savescene');
+ editor.fireEvent('contentchange');
+ editor.fireEvent('selectionchange');
+ timer = null;
+ }, 300);
+ }
+ /* 设置编辑器可编辑 */
+ function enableEditor(){
+ if(editor.body.contentEditable == 'false') {
+ editor.setEnabled();
+ }
+ }
+ /* 设置编辑器不可编辑 */
+ function disableEditor(){
+ if(editor.body.contentEditable == 'true') {
+ editor.setDisabled(['undo', 'redo', 'preview', 'formula'], true);
+ }
+ }
+
+ /* 公式 */
+ var Formula = function(){
+ var _this = this,
+ latex = getLatex();
+
+ this.isFocus = false;
+ this.isDisabled = false;
+
+ /* 加载公式内容 */
+ this.$mathquill = $('.mathquill-editable').mathquill('latex', latex);
+
+ /* 设置活动状态的公式iframe */
+ this.$mathquill.on('mousedown', function(){
+ /* 编辑器不可用时,公式也不可用 */
+ if(_this.disabled) return false;
+
+ /* 第一次点击当前公式,设置公式活动 */
+ if(!$iframe.hasClass('edui-formula-active')) {
+ disableEditor();
+ editor.blur();
+ editor.$body.find('iframe').not($iframe).each(function(k, v){
+ v.contentWindow.formula.blur();
+ });
+ if(_this.$mathquill.find('.cursor').css('display') == 'none') {
+ _this.refresh();
+ _this.$mathquill.addClass('hasCursor');
+ }
+ }
+ _this.focus();
+ });
+ editor.addListener('click', function(){
+ _this.blur();
+ enableEditor();
+ });
+
+ /* 里面focus,编辑器也判断为focus */
+ editor.addListener('isFocus', function(){
+ return _this.isFocus;
+ });
+ /* um不可用,公式也不可编辑 */
+ editor.addListener('setDisabled', function(type, except){
+ if (!(except && except.join(' ').indexOf('formula') != -1) && _this.isDisabled != true ) {
+ _this.setDisabled();
+ }
+ });
+ editor.addListener('setEnabled', function(){
+ if (_this.isDisabled != false) {
+ _this.setEnabled();
+ }
+ });
+
+ /* 设置更新外层iframe的大小和属性 */
+ $(document.body).on('keydown', function(){
+ _this.updateIframe();
+ }).on('keyup', function(){
+ _this.updateIframe();
+ });
+
+ /* 清除初始化的高亮状态 */
+ this.$mathquill.removeClass('hasCursor');
+
+ /* 初始化后延迟刷新外层iframe大小 */
+ setTimeout(function(){
+ _this.updateIframe();
+ }, 300);
+ };
+
+ Formula.prototype = {
+ focus:function(){
+ $iframe.addClass('edui-formula-active');
+ this.isFocus = true;
+ },
+ blur:function(){
+ $iframe.removeClass('edui-formula-active');
+ this.removeCursor();
+ this.isFocus = false;
+ },
+ removeCursor: function(){
+ this.$mathquill.find('span.cursor').hide();
+ this.$mathquill.parent().find('.hasCursor').removeClass('hasCursor');
+ },
+ updateIframe: function(){
+ $iframe.width(this.$mathquill.width()+8).height(this.$mathquill.height()+8);
+ var latex = $iframe.attr('data-latex'),
+ newLatex = this.getLatex();
+ if(latex != newLatex) {
+ $iframe.attr('data-latex', this.getLatex());
+ saveScene();
+ }
+ },
+ insertLatex: function(latex){
+ this.$mathquill.mathquill('write', latex);
+ this.updateIframe();
+ this.removeCursor();
+ },
+ setLatex: function(latex){
+ this.$mathquill.mathquill('latex', latex);
+ this.updateIframe();
+ },
+ getLatex: function(){
+ return this.$mathquill.mathquill('latex');
+ },
+ redraw: function(){
+ this.$mathquill.mathquill('redraw');
+ },
+ setDisabled: function(){
+ this.blur();
+ var latex = this.getLatex();
+ this.$mathquill.mathquill('revert').text(latex).mathquill();
+ this.updateIframe();
+ this.isDisabled = true;
+ },
+ setEnabled: function(){
+ this.$mathquill.removeClass('mathquill-rendered-math');
+ this.refresh();
+ this.isDisabled = false;
+ },
+ refresh: function(){
+ var latex = this.getLatex();
+ this.$mathquill.mathquill('revert').text(latex).mathquill('editable');
+ this.updateIframe();
+ }
+ };
+
+ /* 绑定到window上，给上级window调用 */
+ window.formula = new Formula();
+ });
+</script>
+</body>
+</html>
\ No newline at end of file
diff --git a/management/guns-admin/src/main/webapp/static/js/plugins/umeditor/dialogs/formula/formula.js b/management/guns-admin/src/main/webapp/static/js/plugins/umeditor/dialogs/formula/formula.js
new file mode 100644
index 0000000..ffa9e78
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/static/js/plugins/umeditor/dialogs/formula/formula.js
@@ -0,0 +1,124 @@
+(function () {
+
+ var editor = null;
+
+ UM.registerWidget('formula', {
+
+ tpl: "<link type=\"text/css\" rel=\"stylesheet\" href=\"<%=formula_url%>formula.css\">" +
+ "<div class=\"edui-formula-wrapper\">" +
+ "<ul class=\"edui-tab-nav\"></ul>" +
+ "<div class=\"edui-tab-content\"></div>" +
+ "</div>",
+
+ sourceData: {
+ formula: {
+ 'common': [
+ "{/}frac{ }{ }", "^{ }/_{ }", "x^{ }", "x_{ }", "x^{ }_{ }", "{/}bar{ }", "{/}sqrt{ }", "{/}nthroot{ }{ }",
+ "{/}sum^{ }_{n=}", "{/}sum", "{/}log_{ }", "{/}ln", "{/}int_{ }^{ }", "{/}oint_{ }^{ }"
+ ],
+ 'symbol': [
+ "+", "-", "{/}pm", "{/}times", "{/}ast", "{/}div", "/", "{/}bigtriangleup",
+ "=", "{/}ne", "{/}approx", ">", "<", "{/}ge", "{/}le", "{/}infty",
+ "{/}cap", "{/}cup", "{/}because", "{/}therefore", "{/}subset", "{/}supset", "{/}subseteq", "{/}supseteq",
+ "{/}nsubseteq", "{/}nsupseteq", "{/}in", "{/}ni", "{/}notin", "{/}mapsto", "{/}leftarrow", "{/}rightarrow",
+ "{/}Leftarrow", "{/}Rightarrow", "{/}leftrightarrow", "{/}Leftrightarrow"
+ ],
+ 'letter': [
+ "{/}alpha", "{/}beta", "{/}gamma", "{/}delta", "{/}varepsilon", "{/}varphi", "{/}lambda", "{/}mu",
+ "{/}rho", "{/}sigma", "{/}omega", "{/}Gamma", "{/}Delta", "{/}Theta", "{/}Lambda", "{/}Xi",
+ "{/}Pi", "{/}Sigma", "{/}Upsilon", "{/}Phi", "{/}Psi", "{/}Omega"
+ ]
+ }
+ },
+ initContent: function (_editor, $widget) {
+
+ var me = this,
+ formula = me.sourceData.formula,
+ lang = _editor.getLang('formula').static,
+ formulaUrl = UMEDITOR_CONFIG.UMEDITOR_HOME_URL + 'dialogs/formula/',
+ options = $.extend({}, lang, { 'formula_url': formulaUrl }),
+ $root = me.root();
+
+ if (me.inited) {
+ me.preventDefault();
+ return;
+ }
+ me.inited = true;
+
+ editor = _editor;
+ me.$widget = $widget;
+
+ $root.html($.parseTmpl(me.tpl, options));
+ me.tabs = $.eduitab({selector: "#edui-formula-tab-Jpanel"});
+
+ /* 初始化popup的内容 */
+ var headHtml = [], xMax = 0, yMax = 0,
+ $tabContent = me.root().find('.edui-tab-content');
+ $.each(formula, function (k, v) {
+ var contentHtml = [];
+ $.each(v, function (i, f) {
+ contentHtml.push('<li class="edui-formula-latex-item" data-latex="' + f + '" style="background-position:-' + (xMax * 30) + 'px -' + (yMax * 30) + 'px"></li>');
+ if (++xMax >=8) {
+ ++yMax; xMax = 0;
+ }
+ });
+ yMax++; xMax = 0;
+ $tabContent.append('<div class="edui-tab-pane"><ul>' + contentHtml.join('') + '</ul>');
+ headHtml.push('<li class="edui-tab-item"><a href="javascript:void(0);" class="edui-tab-text">' + lang['lang_tab_' + k] + '</a></li>');
+ });
+ headHtml.push('<li class="edui-formula-clearboth"></li>');
+ $root.find('.edui-tab-nav').html(headHtml.join(''));
+ $root.find('.edui-tab-content').append('<div class="edui-formula-clearboth"></div>');
+
+ /* 选中第一个tab */
+ me.switchTab(0);
+ },
+ initEvent: function () {
+ var me = this;
+
+ //防止点击过后关闭popup
+ me.root().on('click', function (e) {
+ return false;
+ });
+
+ //点击tab切换菜单
+ me.root().find('.edui-tab-nav').delegate('.edui-tab-item', 'click', function (evt) {
+ me.switchTab(this);
+ return false;
+ });
+
+ //点击选中公式
+ me.root().find('.edui-tab-pane').delegate('.edui-formula-latex-item', 'click', function (evt) {
+ var $item = $(this),
+ latex = $item.attr('data-latex') || '';
+
+ if (latex) {
+ me.insertLatex(latex.replace("{/}", "\\"));
+ }
+ me.$widget.edui().hide();
+ return false;
+ });
+ },
+ switchTab:function(index){
+ var me = this,
+ $root = me.root(),
+ index = $.isNumeric(index) ? index:$.inArray(index, $root.find('.edui-tab-nav .edui-tab-item'));
+
+ $root.find('.edui-tab-nav .edui-tab-item').removeClass('edui-active').eq(index).addClass('edui-active');
+ $root.find('.edui-tab-content .edui-tab-pane').removeClass('edui-active').eq(index).addClass('edui-active');
+
+ /* 自动长高 */
+ me.autoHeight(0);
+ },
+ autoHeight: function () {
+ this.$widget.height(this.root() + 2);
+ },
+ insertLatex: function (latex) {
+ editor.execCommand('formula', latex );
+ },
+ width: 350,
+ height: 400
+ });
+
+})();
+
diff --git a/management/guns-admin/src/main/webapp/static/js/plugins/umeditor/dialogs/formula/images/formula.png b/management/guns-admin/src/main/webapp/static/js/plugins/umeditor/dialogs/formula/images/formula.png
new file mode 100644
index 0000000..04cbb3b
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/static/js/plugins/umeditor/dialogs/formula/images/formula.png
Binary files differ
diff --git a/management/guns-admin/src/main/webapp/static/js/plugins/umeditor/dialogs/image/image.css b/management/guns-admin/src/main/webapp/static/js/plugins/umeditor/dialogs/image/image.css
new file mode 100644
index 0000000..5548391
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/static/js/plugins/umeditor/dialogs/image/image.css
@@ -0,0 +1,42 @@
+.edui-dialog-image .edui-image-wrapper{font-size: 12px;margin: 15px;}
+
+/*upload*/
+.edui-dialog-image .edui-image-upload1{position: absolute;top:50%;left:50%;width:44px;height:38px;margin-top:-19px; margin-left: -22px;}
+.edui-dialog-image .edui-image-upload2{position:relative;float:left;width:120px;height:120px;margin:5px 0 0 5px;}
+
+.edui-dialog-image .edui-image-form{position: absolute;left: 0px;top: 0px;width: 100%;height: 100%;opacity: 0;cursor: pointer;}
+.edui-dialog-image .edui-image-form .edui-image-file{width: 100%;height:100%;filter: alpha(opacity=0)}
+
+.edui-dialog-image .edui-image-upload1 .edui-image-icon{display: inline-block;width:44px;height:38px;background-image: url('images/upload1.png')}
+.edui-dialog-image .edui-image-upload1 .edui-image-icon.hover{background-position: -50px 0;}
+.edui-dialog-image .edui-image-upload2 .edui-image-icon{display: inline-block;width:120px;height:120px;background-image: url('images/upload2.png')}
+
+.edui-dialog-image .edui-image-dragTip{position: absolute;display:none;top:50%;left:50%;margin-top:30px;margin-left: -60px;
+ color: #222;font-size:14px;text-shadow: 0px 2px 3px #555;}
+
+.edui-dialog-image .edui-image-content{height:330px;width:100%;position: relative;}
+
+.edui-dialog-image .edui-image-mask{display: none;position: absolute;top:0;left:0;width: 100%; height: 100%;background-color:#fff;
+ text-align: center;line-height:300px;color:#000;font-size:14px;font-weight:bold;opacity: 0.6;filter: alpha(opacity=60);}
+.edui-dialog-image .edui-image-mask.edui-active{display: block;}
+
+/*network*/
+.edui-dialog-image .edui-image-searchBar{margin: 10px;}
+.edui-dialog-image .edui-image-searchBar .edui-image-searchTxt{display: inline-block !important;*display: inline !important;*zoom:1;width:400px; border: 1px solid #c5d2ff; height: 20px; line-height: 18px; font-size: 14px; padding: 3px; margin: 0;outline:0;}
+.edui-dialog-image .edui-image-searchBar .edui-image-searchAdd{display: inline-block !important;*display: inline !important;*zoom:1;
+ width:60px; text-align:center;height: 25px;text-align: center;line-height: 25px;
+ background-color: #ffffff;padding: 0; border: 1px solid #ababab;margin-left: 20px;cursor: pointer;
+}
+.edui-dialog-image .edui-image-searchBar .edui-image-searchAdd.hover{
+ background-color: #d5e1f2;
+ padding: 0;
+ border: 1px solid #a3bde3;
+}
+.edui-dialog-image .edui-image-searchRes{height:280px;overflow:auto;}
+
+
+/*common*/
+.edui-dialog-image .edui-image-item{position:relative;float:left;width:120px;height:120px;border: 1px solid #CCC;cursor: default;margin: 5px 0 0 5px;}
+.edui-dialog-image .edui-image-item .edui-image-pic{position: absolute;left:-9999px;}
+.edui-dialog-image .edui-image-item .edui-image-close{position:absolute;right:0;background: url('images/close.png');width:17px;height:17px;cursor:pointer;z-index:1}
+.edui-dialog-image .edui-image-item.hover .edui-image-close{display: block;}
diff --git a/management/guns-admin/src/main/webapp/static/js/plugins/umeditor/dialogs/image/image.js b/management/guns-admin/src/main/webapp/static/js/plugins/umeditor/dialogs/image/image.js
new file mode 100644
index 0000000..188f634
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/static/js/plugins/umeditor/dialogs/image/image.js
@@ -0,0 +1,445 @@
+(function () {
+
+ var utils = UM.utils,
+ browser = UM.browser,
+ Base = {
+ checkURL: function (url) {
+ if(!url) return false;
+ url = utils.trim(url);
+ if (url.length <= 0) {
+ return false;
+ }
+ if (url.search(/http:\/\/|https:\/\//) !== 0) {
+ url += 'http://';
+ }
+
+ url=url.replace(/\?[\s\S]*$/,"");
+
+ if (!/(.gif|.jpg|.jpeg|.png)$/i.test(url)) {
+ return false;
+ }
+ return url;
+ },
+ getAllPic: function (sel, $w, editor) {
+ var me = this,
+ arr = [],
+ $imgs = $(sel, $w);
+
+ $.each($imgs, function (index, node) {
+ $(node).removeAttr("width").removeAttr("height");
+
+// if (node.width > editor.options.initialFrameWidth) {
+// me.scale(node, editor.options.initialFrameWidth -
+// parseInt($(editor.body).css("padding-left")) -
+// parseInt($(editor.body).css("padding-right")));
+// }
+
+ return arr.push({
+ _src: node.src,
+ src: node.src
+ });
+ });
+
+ return arr;
+ },
+ scale: function (img, max, oWidth, oHeight) {
+ var width = 0, height = 0, percent, ow = img.width || oWidth, oh = img.height || oHeight;
+ if (ow > max || oh > max) {
+ if (ow >= oh) {
+ if (width = ow - max) {
+ percent = (width / ow).toFixed(2);
+ img.height = oh - oh * percent;
+ img.width = max;
+ }
+ } else {
+ if (height = oh - max) {
+ percent = (height / oh).toFixed(2);
+ img.width = ow - ow * percent;
+ img.height = max;
+ }
+ }
+ }
+
+ return this;
+ },
+ close: function ($img) {
+
+ $img.css({
+ top: ($img.parent().height() - $img.height()) / 2,
+ left: ($img.parent().width()-$img.width())/2
+ }).prev().on("click",function () {
+
+ if ( $(this).parent().remove().hasClass("edui-image-upload-item") ) {
+ //显示图片计数-1
+ Upload.showCount--;
+ Upload.updateView();
+ }
+
+ });
+
+ return this;
+ },
+ createImgBase64: function (img, file, $w) {
+ if (browser.webkit) {
+ //Chrome8+
+ img.src = window.webkitURL.createObjectURL(file);
+ } else if (browser.gecko) {
+ //FF4+
+ img.src = window.URL.createObjectURL(file);
+ } else {
+ //实例化file reader对象
+ var reader = new FileReader();
+ reader.onload = function (e) {
+ img.src = this.result;
+ $w.append(img);
+ };
+ reader.readAsDataURL(file);
+ }
+ },
+ callback: function (editor, $w, url, state) {
+
+ if (state == "SUCCESS") {
+ //显示图片计数+1
+ Upload.showCount++;
+ var $img = $("<img src='" + editor.options.imagePath + url + "' class='edui-image-pic' />"),
+ $item = $("<div class='edui-image-item edui-image-upload-item'><div class='edui-image-close'></div></div>").append($img);
+
+ if ($(".edui-image-upload2", $w).length < 1) {
+ $(".edui-image-content", $w).append($item);
+
+ Upload.render(".edui-image-content", 2)
+ .config(".edui-image-upload2");
+ } else {
+ $(".edui-image-upload2", $w).before($item).show();
+ }
+
+ $img.on("load", function () {
+ Base.scale(this, 120);
+ Base.close($(this));
+ $(".edui-image-content", $w).focus();
+ });
+
+ } else {
+ currentDialog.showTip( state );
+ window.setTimeout( function () {
+
+ currentDialog.hideTip();
+
+ }, 3000 );
+ }
+
+ Upload.toggleMask();
+
+ }
+ };
+
+ /*
+ * 本地上传
+ * */
+ var Upload = {
+ showCount: 0,
+ uploadTpl: '<div class="edui-image-upload%%">' +
+ '<span class="edui-image-icon"></span>' +
+ '<form class="edui-image-form" method="post" enctype="multipart/form-data" target="up">' +
+ '<input style=\"filter: alpha(opacity=0);\" class="edui-image-file" type="file" hidefocus name="upfile" accept="image/gif,image/jpeg,image/png,image/jpg,image/bmp"/>' +
+ '</form>' +
+
+ '</div>',
+ init: function (editor, $w) {
+ var me = this;
+
+ me.editor = editor;
+ me.dialog = $w;
+ me.render(".edui-image-local", 1);
+ me.config(".edui-image-upload1");
+ me.submit();
+ me.drag();
+
+ $(".edui-image-upload1").hover(function () {
+ $(".edui-image-icon", this).toggleClass("hover");
+ });
+
+ if (!(UM.browser.ie && UM.browser.version <= 9)) {
+ $(".edui-image-dragTip", me.dialog).css("display", "block");
+ }
+
+
+ return me;
+ },
+ render: function (sel, t) {
+ var me = this;
+
+ $(sel, me.dialog).append($(me.uploadTpl.replace(/%%/g, t)));
+
+ return me;
+ },
+ config: function (sel) {
+ var me = this,
+ url=me.editor.options.imageUrl;
+
+ url=url + (url.indexOf("?") == -1 ? "?" : "&") + "editorid="+me.editor.id;//初始form提交地址;
+
+ $("form", $(sel, me.dialog)).attr("action", url);
+
+ return me;
+ },
+ uploadComplete: function(r){
+ var me = this;
+ try{
+ var json = eval('('+r+')');
+ Base.callback(me.editor, me.dialog, json.url, json.state);
+ }catch (e){
+ var lang = me.editor.getLang('image');
+ Base.callback(me.editor, me.dialog, '', (lang && lang.uploadError) || 'Error!');
+ }
+ },
+ submit: function (callback) {
+
+ var me = this,
+ input = $( '<input style="filter: alpha(opacity=0);" class="edui-image-file" type="file" hidefocus="" name="upfile" accept="image/gif,image/jpeg,image/png,image/jpg,image/bmp">'),
+ input = input[0];
+
+ $(me.dialog).delegate( ".edui-image-file", "change", function ( e ) {
+
+ if ( !this.parentNode ) {
+ return;
+ }
+
+ $('<iframe name="up" style="display: none"></iframe>').insertBefore(me.dialog).on('load', function(){
+ var r = this.contentWindow.document.body.innerHTML;
+ if(r == '')return;
+ me.uploadComplete(r);
+ $(this).unbind('load');
+ $(this).remove();
+
+ });
+
+ $(this).parent()[0].submit();
+ Upload.updateInput( input );
+ me.toggleMask("Loading....");
+ callback && callback();
+
+ });
+
+ return me;
+ },
+ //更新input
+ updateInput: function ( inputField ) {
+
+ $( ".edui-image-file", this.dialog ).each( function ( index, ele ) {
+
+ ele.parentNode.replaceChild( inputField.cloneNode( true ), ele );
+
+ } );
+
+ },
+ //更新上传框
+ updateView: function () {
+
+ if ( Upload.showCount !== 0 ) {
+ return;
+ }
+
+ $(".edui-image-upload2", this.dialog).hide();
+ $(".edui-image-dragTip", this.dialog).show();
+ $(".edui-image-upload1", this.dialog).show();
+
+ },
+ drag: function () {
+ var me = this;
+ //做拽上传的支持
+ if (!UM.browser.ie9below) {
+ me.dialog.find('.edui-image-content').on('drop',function (e) {
+
+ //获取文件列表
+ var fileList = e.originalEvent.dataTransfer.files;
+ var img = document.createElement('img');
+ var hasImg = false;
+ $.each(fileList, function (i, f) {
+ if (/^image/.test(f.type)) {
+ //创建图片的base64
+ Base.createImgBase64(img, f, me.dialog);
+
+ var xhr = new XMLHttpRequest();
+ xhr.open("post", me.editor.getOpt('imageUrl') + "?type=ajax", true);
+ xhr.setRequestHeader("X-Requested-With", "XMLHttpRequest");
+
+ //模拟数据
+ var fd = new FormData();
+ fd.append(me.editor.getOpt('imageFieldName'), f);
+
+ xhr.send(fd);
+ xhr.addEventListener('load', function (e) {
+ var r = e.target.response, json;
+ me.uploadComplete(r);
+ if (i == fileList.length - 1) {
+ $(img).remove()
+ }
+ });
+ hasImg = true;
+ }
+ });
+ if (hasImg) {
+ e.preventDefault();
+ me.toggleMask("Loading....");
+ }
+
+ }).on('dragover', function (e) {
+ e.preventDefault();
+ });
+ }
+ },
+ toggleMask: function (html) {
+ var me = this;
+
+ var $mask = $(".edui-image-mask", me.dialog);
+ if (html) {
+ if (!(UM.browser.ie && UM.browser.version <= 9)) {
+ $(".edui-image-dragTip", me.dialog).css( "display", "none" );
+ }
+ $(".edui-image-upload1", me.dialog).css( "display", "none" );
+ $mask.addClass("edui-active").html(html);
+ } else {
+
+ $mask.removeClass("edui-active").html();
+
+ if ( Upload.showCount > 0 ) {
+ return me;
+ }
+
+ if (!(UM.browser.ie && UM.browser.version <= 9) ){
+ $(".edui-image-dragTip", me.dialog).css("display", "block");
+ }
+ $(".edui-image-upload1", me.dialog).css( "display", "block" );
+ }
+
+ return me;
+ }
+ };
+
+ /*
+ * 网络图片
+ * */
+ var NetWork = {
+ init: function (editor, $w) {
+ var me = this;
+
+ me.editor = editor;
+ me.dialog = $w;
+
+ me.initEvt();
+ },
+ initEvt: function () {
+ var me = this,
+ url,
+ $ele = $(".edui-image-searchTxt", me.dialog);
+
+ $(".edui-image-searchAdd", me.dialog).on("click", function () {
+ url = Base.checkURL($ele.val());
+
+ if (url) {
+
+ $("<img src='" + url + "' class='edui-image-pic' />").on("load", function () {
+
+
+
+ var $item = $("<div class='edui-image-item'><div class='edui-image-close'></div></div>").append(this);
+
+ $(".edui-image-searchRes", me.dialog).append($item);
+
+ Base.scale(this, 120);
+
+ $item.width($(this).width());
+
+ Base.close($(this));
+
+ $ele.val("");
+ });
+ }
+ })
+ .hover(function () {
+ $(this).toggleClass("hover");
+ });
+ }
+ };
+
+ var $tab = null,
+ currentDialog = null;
+
+ UM.registerWidget('image', {
+ tpl: "<link rel=\"stylesheet\" type=\"text/css\" href=\"<%=image_url%>image.css\">" +
+ "<div class=\"edui-image-wrapper\">" +
+ "<ul class=\"edui-tab-nav\">" +
+ "<li class=\"edui-tab-item edui-active\"><a data-context=\".edui-image-local\" class=\"edui-tab-text\"><%=lang_tab_local%></a></li>" +
+ "<li class=\"edui-tab-item\"><a data-context=\".edui-image-JimgSearch\" class=\"edui-tab-text\"><%=lang_tab_imgSearch%></a></li>" +
+ "</ul>" +
+ "<div class=\"edui-tab-content\">" +
+ "<div class=\"edui-image-local edui-tab-pane edui-active\">" +
+ "<div class=\"edui-image-content\"></div>" +
+ "<div class=\"edui-image-mask\"></div>" +
+ "<div class=\"edui-image-dragTip\"><%=lang_input_dragTip%></div>" +
+ "</div>" +
+ "<div class=\"edui-image-JimgSearch edui-tab-pane\">" +
+ "<div class=\"edui-image-searchBar\">" +
+ "<table style=\"table-layout: initial;\"><tr><td><input class=\"edui-image-searchTxt\" type=\"text\"></td>" +
+ "<td><div class=\"edui-image-searchAdd\"><%=lang_btn_add%></div></td></tr></table>" +
+ "</div>" +
+ "<div class=\"edui-image-searchRes\"></div>" +
+ "</div>" +
+ "</div>" +
+ "</div>",
+ initContent: function (editor, $dialog) {
+ var lang = editor.getLang('image')["static"],
+ opt = $.extend({}, lang, {
+ image_url: UMEDITOR_CONFIG.UMEDITOR_HOME_URL + 'dialogs/image/'
+ });
+
+ Upload.showCount = 0;
+
+ if (lang) {
+ var html = $.parseTmpl(this.tpl, opt);
+ }
+
+ currentDialog = $dialog.edui();
+
+ this.root().html(html);
+
+ },
+ initEvent: function (editor, $w) {
+ $tab = $.eduitab({selector: ".edui-image-wrapper"})
+ .edui().on("beforeshow", function (e) {
+ e.stopPropagation();
+ });
+
+ Upload.init(editor, $w);
+
+ NetWork.init(editor, $w);
+ },
+ buttons: {
+ 'ok': {
+ exec: function (editor, $w) {
+ var sel = "",
+ index = $tab.activate();
+
+ if (index == 0) {
+ sel = ".edui-image-content .edui-image-pic";
+ } else if (index == 1) {
+ sel = ".edui-image-searchRes .edui-image-pic";
+ }
+
+ var list = Base.getAllPic(sel, $w, editor);
+
+ if (index != -1) {
+ editor.execCommand('insertimage', list);
+ }
+ }
+ },
+ 'cancel': {}
+ },
+ width: 700,
+ height: 408
+ }, function (editor, $w, url, state) {
+ Base.callback(editor, $w, url, state)
+ })
+})();
+
diff --git a/management/guns-admin/src/main/webapp/static/js/plugins/umeditor/dialogs/image/images/close.png b/management/guns-admin/src/main/webapp/static/js/plugins/umeditor/dialogs/image/images/close.png
new file mode 100644
index 0000000..d368388
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/static/js/plugins/umeditor/dialogs/image/images/close.png
Binary files differ
diff --git a/management/guns-admin/src/main/webapp/static/js/plugins/umeditor/dialogs/image/images/upload1.png b/management/guns-admin/src/main/webapp/static/js/plugins/umeditor/dialogs/image/images/upload1.png
new file mode 100644
index 0000000..c9056ca
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/static/js/plugins/umeditor/dialogs/image/images/upload1.png
Binary files differ
diff --git a/management/guns-admin/src/main/webapp/static/js/plugins/umeditor/dialogs/image/images/upload2.png b/management/guns-admin/src/main/webapp/static/js/plugins/umeditor/dialogs/image/images/upload2.png
new file mode 100644
index 0000000..57ce63f
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/static/js/plugins/umeditor/dialogs/image/images/upload2.png
Binary files differ
diff --git a/management/guns-admin/src/main/webapp/static/js/plugins/umeditor/dialogs/link/link.js b/management/guns-admin/src/main/webapp/static/js/plugins/umeditor/dialogs/link/link.js
new file mode 100644
index 0000000..2d0a30c
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/static/js/plugins/umeditor/dialogs/link/link.js
@@ -0,0 +1,73 @@
+(function(){
+ var utils = UM.utils;
+ function hrefStartWith(href, arr) {
+ href = href.replace(/^\s+|\s+$/g, '');
+ for (var i = 0, ai; ai = arr[i++];) {
+ if (href.indexOf(ai) == 0) {
+ return true;
+ }
+ }
+ return false;
+ }
+
+ UM.registerWidget('link', {
+ tpl: "<style type=\"text/css\">" +
+ ".edui-dialog-link .edui-link-table{font-size: 12px;margin: 10px;line-height: 30px}" +
+ ".edui-dialog-link .edui-link-txt{width:300px;height:21px;line-height:21px;border:1px solid #d7d7d7;}" +
+ "</style>" +
+ "<table style=\"table-layout: initial;height: 75%;\" class=\"edui-link-table\">" +
+ "<tr>" +
+ "<td><label for=\"href\"><%=lang_input_url%></label></td>" +
+ "<td><input class=\"edui-link-txt\" id=\"edui-link-Jhref\" type=\"text\" /></td>" +
+ "</tr>" +
+ "<tr>" +
+ "<td><label for=\"title\"><%=lang_input_title%></label></td>" +
+ "<td><input class=\"edui-link-txt\" id=\"edui-link-Jtitle\" type=\"text\"/></td>" +
+ "</tr>" +
+ "<tr>" +
+ "<td colspan=\"2\">" +
+ "<label for=\"target\"><%=lang_input_target%></label>" +
+ "<input id=\"edui-link-Jtarget\" type=\"checkbox\"/>" +
+ "</td>" +
+ "</tr>" +
+// "<tr>" +
+// "<td colspan=\"2\" id=\"edui-link-Jmsg\"></td>" +
+// "</tr>" +
+ "</table>",
+ initContent: function (editor) {
+ var lang = editor.getLang('link');
+ if (lang) {
+ var html = $.parseTmpl(this.tpl, lang.static);
+ }
+ this.root().html(html);
+ },
+ initEvent: function (editor, $w) {
+ var link = editor.queryCommandValue('link');
+ if(link){
+ $('#edui-link-Jhref',$w).val(utils.html($(link).attr('href')));
+ $('#edui-link-Jtitle',$w).val($(link).attr('title'));
+ $(link).attr('target') == '_blank' && $('#edui-link-Jtarget').attr('checked',true)
+ }
+ $('#edui-link-Jhref',$w).focus();
+ },
+ buttons: {
+ 'ok': {
+ exec: function (editor, $w) {
+ var href = $('#edui-link-Jhref').val().replace(/^\s+|\s+$/g, '');
+
+ if (href) {
+ editor.execCommand('link', {
+ 'href': href,
+ 'target': $("#edui-link-Jtarget:checked").length ? "_blank" : '_self',
+ 'title': $("#edui-link-Jtitle").val().replace(/^\s+|\s+$/g, ''),
+ '_href': href
+ });
+ }
+ }
+ },
+ 'cancel':{}
+ },
+ width: 400
+ })
+})();
+
diff --git a/management/guns-admin/src/main/webapp/static/js/plugins/umeditor/dialogs/map/map.html b/management/guns-admin/src/main/webapp/static/js/plugins/umeditor/dialogs/map/map.html
new file mode 100644
index 0000000..be97a8c
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/static/js/plugins/umeditor/dialogs/map/map.html
@@ -0,0 +1,148 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+ <meta charset="utf-8"/>
+ <meta name="keywords" content="百度地图,百度地图API，百度地图自定义工具，百度地图所见即所得工具"/>
+ <meta name="description" content="百度地图API自定义地图，帮助用户在可视化操作下生成百度地图"/>
+ <title>百度地图API自定义地图</title>
+ <!--引用百度地图API-->
+ <style type="text/css">
+ html, body {
+ margin: 0;
+ padding: 0;
+ overflow: hidden;
+ }
+ </style>
+ <script type="text/javascript" src="http://api.map.baidu.com/api?key=&v=2.0&ak=6b6c1a67eaa7db1ca6d6da28e590e343&services=true"></script>
+</head>
+
+<body onload="initMap();">
+<!--百度地图容器-->
+<div style="width:697px;height:550px;border:#ccc solid 1px;" id="dituContent"></div>
+</body>
+<script type="text/javascript">
+ function getParam(name) {
+ return location.href.match(new RegExp('[?#&]' + name + '=([^?#&]+)', 'i')) ? RegExp.$1 : '';
+ }
+ var map, marker;
+ var centerParam = getParam('center');
+ var zoomParam = getParam('zoom');
+ var widthParam = getParam('width');
+ var heightParam = getParam('height');
+ var markersParam = getParam('markers');
+ var markerStylesParam = getParam('markerStyles');
+ var iframe = getSelfIframe();
+ var UM = parent.UM;
+ var editor = getEditor();
+
+ //创建和初始化地图函数：
+ function initMap() {
+ // [FF]切换模式后报错
+ if (!window.BMap) {
+ return;
+ }
+ var dituContent = document.getElementById('dituContent');
+ dituContent.style.width = widthParam + 'px';
+ dituContent.style.height = heightParam + 'px';
+
+ createMap();//创建地图
+ setMapEvent();//设置地图事件
+ addMapControl();//向地图添加控件
+
+ // 创建标注
+ var markersArr = markersParam.split(',');
+ var point = new BMap.Point(markersArr[0], markersArr[1]);
+ marker = new BMap.Marker(point);
+ marker.enableDragging();
+ map.addOverlay(marker); // 将标注添加到地图中
+
+ if(iframe && UM && editor) { //在编辑状态下
+ setMapListener();//地图改变修改外层的iframe标签src属性
+ } else {
+ document.focus();
+ }
+ }
+
+ //创建地图函数：
+ function createMap() {
+ map = new BMap.Map("dituContent");//在百度地图容器中创建一个地图
+ var centerArr = centerParam.split(',');
+ var point = new BMap.Point(parseFloat(centerArr[0]), parseFloat(centerArr[1]));//定义一个中心点坐标
+ map.centerAndZoom(point, parseInt(zoomParam));//设定地图的中心点和坐标并将地图显示在地图容器中
+ }
+
+ //地图事件设置函数：
+ function setMapEvent() {
+ map.enableDragging();//启用地图拖拽事件，默认启用(可不写)
+ map.enableScrollWheelZoom();//启用地图滚轮放大缩小
+ map.enableDoubleClickZoom();//启用鼠标双击放大，默认启用(可不写)
+ map.enableKeyboard();//启用键盘上下左右键移动地图
+ }
+
+ //地图控件添加函数：
+ function addMapControl() {
+ //向地图中添加缩放控件
+ var ctrl_nav = new BMap.NavigationControl({anchor: BMAP_ANCHOR_TOP_LEFT, type: BMAP_NAVIGATION_CONTROL_LARGE});
+ map.addControl(ctrl_nav);
+ //向地图中添加缩略图控件
+ var ctrl_ove = new BMap.OverviewMapControl({anchor: BMAP_ANCHOR_BOTTOM_RIGHT, isOpen: 1});
+ map.addControl(ctrl_ove);
+ //向地图中添加比例尺控件
+ var ctrl_sca = new BMap.ScaleControl({anchor: BMAP_ANCHOR_BOTTOM_LEFT});
+ map.addControl(ctrl_sca);
+ }
+
+ function setMapListener() {
+ var timer;
+
+ map.addEventListener('moveend', mapListenerHandler);
+ map.addEventListener('zoomend', mapListenerHandler);
+ marker.addEventListener('dragend', mapListenerHandler);
+
+ function mapListenerHandler() {
+ var zoom = map.getZoom(),
+ center = map.getCenter(),
+ marker = window.marker.P;
+
+ iframe.src = iframe.src.
+ replace(new RegExp('([?#&])center=([^?#&]+)', 'i'), '$1center=' + center.lng + ',' + center.lat).
+ replace(new RegExp('([?#&])markers=([^?#&]+)', 'i'), '$1markers=' + marker.lng + ',' + marker.lat).
+ replace(new RegExp('([?#&])zoom=([^?#&]+)', 'i'), '$1zoom=' + zoom);
+ editor.fireEvent('saveScene');
+ saveScene(editor);
+ }
+
+ function saveScene(){
+ if(!timer) {
+ timer = setTimeout(function(){
+ editor.fireEvent('savescene');
+ editor.fireEvent('contentchange');
+ timer = null;
+ }, 1000);
+ }
+ }
+ }
+
+ function getSelfIframe(){
+ var iframes = parent.document.getElementsByTagName('iframe');
+ for (var key in iframes) {
+ if (iframes[key].contentWindow == window) {
+ return iframes[key];
+ }
+ }
+ return null;
+ }
+
+ function getEditor(){
+ var parentNode = iframe.parentNode;
+ while (parentNode && parentNode.tagName && parentNode.tagName.toLowerCase() != 'body') {
+ if (parentNode.className && parentNode.className.indexOf('edui-body-container')!=-1) {
+ return UM.getEditor(parentNode.id);
+ }
+ parentNode = parentNode.parentNode;
+ }
+ return null;
+ }
+</script>
+</html>
\ No newline at end of file
diff --git a/management/guns-admin/src/main/webapp/static/js/plugins/umeditor/dialogs/map/map.js b/management/guns-admin/src/main/webapp/static/js/plugins/umeditor/dialogs/map/map.js
new file mode 100644
index 0000000..1775093
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/static/js/plugins/umeditor/dialogs/map/map.js
@@ -0,0 +1,263 @@
+(function () {
+
+ var widgetName = 'map';
+
+ UM.registerWidget(widgetName, {
+
+ tpl: "<style type=\"text/css\">" +
+ ".edui-dialog-map .edui-map-content{width:530px; height: 350px;margin: 10px auto;}" +
+ ".edui-dialog-map .edui-map-content table{width: 100%}" +
+ ".edui-dialog-map .edui-map-content table td{vertical-align: middle;}" +
+ ".edui-dialog-map .edui-map-button { border: 1px solid #ccc; float: left; cursor: default; height: 23px; width: 70px; cursor: pointer; margin: 0; font-size: 12px; line-height: 24px; text-align: center; }" +
+ ".edui-dialog-map .edui-map-button:hover {background:#eee;}" +
+ ".edui-dialog-map .edui-map-city,.edui-dialog-map .edui-map-address{height:21px;background: #FFF;border:1px solid #d7d7d7; line-height: 21px;}" +
+ ".edui-dialog-map .edui-map-city{width:90px}" +
+ ".edui-dialog-map .edui-map-address{width:150px}" +
+ ".edui-dialog-map .edui-map-dynamic-label span{vertical-align:middle;margin: 3px 0px 3px 3px;}" +
+ ".edui-dialog-map .edui-map-dynamic-label input{vertical-align:middle;margin: 3px;}" +
+ "</style>" +
+ "<div class=\"edui-map-content\">" +
+ "<table style=\"table-layout: initial;\">" +
+ "<tr>" +
+ "<td><%=lang_city%>:</td>" +
+ "<td><input class=\"edui-map-city\" type=\"text\" value=\"<%=city.value%>\"/></td>" +
+ "<td><%=lang_address%>:</td>" +
+ "<td><input class=\"edui-map-address\" type=\"text\" value=\"\" /></td>" +
+ "<td><a class=\"edui-map-button\"><%=lang_search%></a></td>" +
+ "<td><label class=\"edui-map-dynamic-label\"><input class=\"edui-map-dynamic\" type=\"checkbox\" name=\"edui-map-dynamic\" /><span><%=lang_dynamicmap%></span></label></td>"+
+ "</tr>" +
+ "</table>" +
+ "<div style=\"width:100%;height:340px;margin:5px auto;border:1px solid gray\" class=\"edui-map-container\"></div>" +
+ "</div>" +
+ "<script class=\"edui-tpl-container\" type=\"text/plain\">" +
+ "<!DOCTYPE html>" +
+ "<html>" +
+ "<head>" +
+ "<title></title>" +
+ "</head>" +
+ "<body>" +
+ "<scr_ipt>" +
+ "window.onload = function(){" +
+ "var scripts = document.scripts || document.getElementsByTagName(\"script\")," +
+ "src = [];" +
+ "for( var i = 1, len = scripts.length; i<len; i++ ) {" +
+ "src.push( scripts[i].src );" +
+ "}" +
+ "parent.UM.getEditor(<<id>>).getWidgetData(\'map\').requestMapApi( src );" +
+ "};" +
+ "function mapReadyStateChange ( state ) { " +
+ " if ( state === 'complete' || state === 'loaded' ) {" +
+ " document.close(); " +
+ " } }" +
+ "</scr_ipt>" +
+ "<scr_ipt onreadystatechange='mapReadyStateChange(this.readyState);' onload='mapReadyStateChange(\"loaded\");' src=\"http://api.map.baidu.com/api?v=2.0&ak=6b6c1a67eaa7db1ca6d6da28e590e343&services=true\"></scr_ipt>" +
+ "</body>" +
+ "</html>" +
+ "</script>",
+ initContent: function (editor, $widget) {
+
+ var me = this,
+ lang = editor.getLang(widgetName),
+ theme_url = editor.options.themePath + editor.options.theme;
+
+ if( me.inited ) {
+ me.preventDefault();
+ return false;
+ }
+
+ me.inited = true;
+
+ me.lang = lang;
+ me.editor = editor;
+
+ me.root().html($.parseTmpl(me.tpl, $.extend({}, lang['static'], {
+ 'theme_url': theme_url
+ })));
+
+ me.initRequestApi();
+
+ },
+ /**
+ * 初始化请求API
+ */
+ initRequestApi: function () {
+
+ var $ifr = null;
+
+ //已经初始化过， 不用再次初始化
+ if (window.BMap && window.BMap.Map) {
+ this.initBaiduMap();
+ } else {
+
+ $ifr = $('<iframe style="display: none;"></iframe>');
+ $ifr.appendTo( this.root() );
+
+ $ifr = $ifr[ 0 ].contentWindow.document;
+
+ $ifr.open();
+ $ifr.write( this.root().find(".edui-tpl-container").html().replace( /scr_ipt/g, 'script').replace('<<id>>',"'" + this.editor.id + "'") );
+
+ }
+
+ },
+ requestMapApi: function (src) {
+
+ var me = this;
+
+ if (src.length) {
+
+ var _src = src[0];
+
+ src = src.slice(1);
+
+ if (_src) {
+ $.getScript(_src, function () {
+ me.requestMapApi(src);
+ });
+ } else {
+ me.requestMapApi(src);
+ }
+
+ } else {
+
+ me.initBaiduMap();
+
+ }
+
+
+ },
+ initBaiduMap: function () {
+
+ var $root = this.root(),
+ map = new BMap.Map($root.find(".edui-map-container")[0]),
+ me = this,
+ marker,
+ point,
+ imgcss,
+ img = $(me.editor.selection.getRange().getClosedNode());
+
+ map.enableInertialDragging();
+ map.enableScrollWheelZoom();
+ map.enableContinuousZoom();
+
+ if (img.length && /api[.]map[.]baidu[.]com/ig.test(img.attr("src"))) {
+ var url = img.attr("src"),
+ centerPos = me.getPars(url, "center").split(","),
+ markerPos = me.getPars(url, "markers").split(",");
+ point = new BMap.Point(Number(centerPos[0]), Number(centerPos[1]));
+ marker = new BMap.Marker(new BMap.Point(Number(markerPos[0]), Number(markerPos[1])));
+ map.addControl(new BMap.NavigationControl());
+ map.centerAndZoom(point, Number(me.getPars(url, "zoom")));
+ imgcss = img.attr('style');
+ } else {
+ point = new BMap.Point(116.404, 39.915); // 创建点坐标
+ marker = new BMap.Marker(point);
+ map.addControl(new BMap.NavigationControl());
+ map.centerAndZoom(point, 10); // 初始化地图,设置中心点坐标和地图级别。
+ }
+ marker.enableDragging();
+ map.addOverlay(marker);
+
+ me.map = map;
+ me.marker = marker;
+ me.imgcss = imgcss;
+ },
+ doSearch: function () {
+ var me = this,
+ city = me.root().find('.edui-map-city').val(),
+ address = me.root().find('.edui-map-address').val();
+
+ if (!city) {
+ alert(me.lang.cityMsg);
+ return;
+ }
+ var search = new BMap.LocalSearch(city, {
+ onSearchComplete: function (results) {
+ if (results && results.getNumPois()) {
+ var points = [];
+ for (var i = 0; i < results.getCurrentNumPois(); i++) {
+ points.push(results.getPoi(i).point);
+ }
+ if (points.length > 1) {
+ me.map.setViewport(points);
+ } else {
+ me.map.centerAndZoom(points[0], 13);
+ }
+ point = me.map.getCenter();
+ me.marker.setPoint(point);
+ } else {
+ alert(me.lang.errorMsg);
+ }
+ }
+ });
+ search.search(address || city);
+ },
+ getPars: function (str, par) {
+ var reg = new RegExp(par + "=((\\d+|[.,])*)", "g");
+ return reg.exec(str)[1];
+ },
+ reset: function(){
+ this.map && this.map.reset();
+ },
+ initEvent: function () {
+ var me = this,
+ $root = me.root();
+
+ $root.find('.edui-map-address').on('keydown', function (evt) {
+ evt = evt || event;
+ if (evt.keyCode == 13) {
+ me.doSearch();
+ return false;
+ }
+ });
+
+ $root.find(".edui-map-button").on('click', function (evt) {
+ me.doSearch();
+ });
+
+ $root.find(".edui-map-address").focus();
+
+ $root.on( "mousewheel DOMMouseScroll", function ( e ) {
+ return false;
+ } );
+
+ },
+ width: 580,
+ height: 408,
+ buttons: {
+ ok: {
+ exec: function (editor) {
+ var widget = editor.getWidgetData(widgetName),
+ center = widget.map.getCenter(),
+ zoom = widget.map.getZoom(),
+ size = widget.map.getSize(),
+ point = widget.marker.P;
+
+ if (widget.root().find(".edui-map-dynamic")[0].checked) {
+ var URL = editor.getOpt('UMEDITOR_HOME_URL'),
+ url = [URL + (/\/$/.test(URL) ? '':'/') + "dialogs/map/map.html" +
+ '#center=' + center.lng + ',' + center.lat,
+ '&zoom=' + zoom,
+ '&width=' + size.width,
+ '&height=' + size.height,
+ '&markers=' + point.lng + ',' + point.lat].join('');
+ editor.execCommand('inserthtml', '<iframe class="ueditor_baidumap" src="' + url + '" frameborder="0" width="' + (size.width+4) + '" height="' + (size.height+4) + '"></iframe>');
+ } else {
+ url = "http://api.map.baidu.com/staticimage?center=" + center.lng + ',' + center.lat +
+ "&zoom=" + zoom + "&width=" + size.width + '&height=' + size.height + "&markers=" + point.lng + ',' + point.lat;
+ editor.execCommand('inserthtml', '<img width="' + size.width + '"height="' + size.height + '" src="' + url + '"' + (widget.imgcss ? ' style="' + widget.imgcss + '"' : '') + '/>', true);
+ }
+
+ widget.reset();
+ }
+ },
+ cancel: {
+ exec: function(editor){
+ editor.getWidgetData(widgetName).reset();
+ }
+ }
+ }
+ });
+
+})();
+
diff --git a/management/guns-admin/src/main/webapp/static/js/plugins/umeditor/dialogs/video/images/center_focus.jpg b/management/guns-admin/src/main/webapp/static/js/plugins/umeditor/dialogs/video/images/center_focus.jpg
new file mode 100644
index 0000000..262b029
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/static/js/plugins/umeditor/dialogs/video/images/center_focus.jpg
Binary files differ
diff --git a/management/guns-admin/src/main/webapp/static/js/plugins/umeditor/dialogs/video/images/left_focus.jpg b/management/guns-admin/src/main/webapp/static/js/plugins/umeditor/dialogs/video/images/left_focus.jpg
new file mode 100644
index 0000000..7886d27
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/static/js/plugins/umeditor/dialogs/video/images/left_focus.jpg
Binary files differ
diff --git a/management/guns-admin/src/main/webapp/static/js/plugins/umeditor/dialogs/video/images/none_focus.jpg b/management/guns-admin/src/main/webapp/static/js/plugins/umeditor/dialogs/video/images/none_focus.jpg
new file mode 100644
index 0000000..7c768dc
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/static/js/plugins/umeditor/dialogs/video/images/none_focus.jpg
Binary files differ
diff --git a/management/guns-admin/src/main/webapp/static/js/plugins/umeditor/dialogs/video/images/right_focus.jpg b/management/guns-admin/src/main/webapp/static/js/plugins/umeditor/dialogs/video/images/right_focus.jpg
new file mode 100644
index 0000000..173e10d
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/static/js/plugins/umeditor/dialogs/video/images/right_focus.jpg
Binary files differ
diff --git a/management/guns-admin/src/main/webapp/static/js/plugins/umeditor/dialogs/video/video.css b/management/guns-admin/src/main/webapp/static/js/plugins/umeditor/dialogs/video/video.css
new file mode 100644
index 0000000..e046d8c
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/static/js/plugins/umeditor/dialogs/video/video.css
@@ -0,0 +1,59 @@
+@charset "utf-8";
+.edui-dialog-video .edui-video-wrapper{ width: 570px;_width:575px;margin: 10px auto; zoom:1;position: relative}
+.edui-dialog-video .edui-video-tabbody{height:335px;}
+.edui-dialog-video .edui-video-panel { position: absolute;width:100%; height:100%;background: #fff;}
+.edui-dialog-video .edui-video-panel table td{vertical-align: middle;}
+.edui-dialog-video #eduiVideoUrl {
+ width: 470px;
+ height: 21px;
+ line-height: 21px;
+ margin: 8px 5px;
+ background: #FFF;
+ border: 1px solid #d7d7d7;
+}
+.edui-dialog-video #eduiVideoSearchTxt{margin-left:15px;background: #FFF;width:200px;height:21px;line-height:21px;border: 1px solid #d7d7d7;}
+.edui-dialog-video #searchList{width: 570px;overflow: auto;zoom:1;height: 270px;}
+.edui-dialog-video #searchList div{float: left;width: 120px;height: 135px;margin: 5px 15px;}
+.edui-dialog-video #searchList img{margin: 2px 8px;cursor: pointer;border: 2px solid #fff} /*不用缩略图*/
+.edui-dialog-video #searchList p{margin-left: 10px;}
+.edui-dialog-video #eduiVideoType{
+ width: 65px;
+ height: 23px;
+ line-height: 22px;
+ border: 1px solid #d7d7d7;
+}
+.edui-dialog-video #eduiVideoSearchBtn,.edui-dialog-video #eduiVideoSearchReset{
+ /*width: 80px;*/
+ height: 25px;
+ line-height: 25px;
+ background: #eee;
+ border: 1px solid #d7d7d7;
+ cursor: pointer;
+ padding: 0 5px;
+}
+
+
+
+.edui-dialog-video #eduiVideoPreview{width: 420px; margin-left: 10px; _margin-left:5px; height: 280px;background-color: #ddd;float: left}
+.edui-dialog-video #eduiVideoInfo {width: 120px;float: left;margin-left: 10px;_margin-left:7px;}
+.edui-dialog-video .edui-video-wrapper fieldset{
+ border: 1px solid #ddd;
+ padding-left: 5px;
+ margin-bottom: 20px;
+ padding-bottom: 5px;
+ width: 115px;
+}
+.edui-dialog-video .edui-video-wrapper fieldset legend{font-weight: bold;}
+.edui-dialog-video .edui-video-wrapper fieldset p{line-height: 30px;}
+.edui-dialog-video .edui-video-wrapper fieldset input.edui-video-txt{
+ width: 65px;
+ height: 21px;
+ line-height: 21px;
+ margin: 8px 5px;
+ background: #FFF;
+ border: 1px solid #d7d7d7;
+}
+.edui-dialog-video .edui-video-wrapper label.edui-video-url{font-weight: bold;margin-left: 5px;color: #06c;}
+.edui-dialog-video #eduiVideoFloat div{cursor:pointer;opacity: 0.5;filter: alpha(opacity = 50);margin:9px;_margin:5px;width:38px;height:36px;float:left;}
+.edui-dialog-video #eduiVideoFloat .edui-video-focus{opacity: 1;filter: alpha(opacity = 100)}
+.edui-dialog-video .edui-video-wrapper span.edui-video-view{display: inline-block;width: 30px;float: right;cursor: pointer;color: blue}
\ No newline at end of file
diff --git a/management/guns-admin/src/main/webapp/static/js/plugins/umeditor/dialogs/video/video.js b/management/guns-admin/src/main/webapp/static/js/plugins/umeditor/dialogs/video/video.js
new file mode 100644
index 0000000..a2d5ffd
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/static/js/plugins/umeditor/dialogs/video/video.js
@@ -0,0 +1,282 @@
+
+(function(){
+ var domUtils = UM.dom.domUtils;
+ var widgetName = 'video';
+
+ UM.registerWidget( widgetName,{
+
+ tpl: "<link rel=\"stylesheet\" type=\"text/css\" href=\"<%=video_url%>video.css\" />" +
+ "<div class=\"edui-video-wrapper\">" +
+ "<div id=\"eduiVideoTab\">" +
+ "<div id=\"eduiVideoTabHeads\" class=\"edui-video-tabhead\">" +
+ "<span tabSrc=\"video\" class=\"edui-video-focus\"><%=lang_tab_insertV%></span>" +
+ "</div>" +
+ "<div id=\"eduiVideoTabBodys\" class=\"edui-video-tabbody\">" +
+ "<div id=\"eduiVideoPanel\" class=\"edui-video-panel\">" +
+ "<table style=\"table-layout: initial;\"><tr><td><label for=\"eduiVideoUrl\" class=\"edui-video-url\"><%=lang_video_url%></label></td><td><input id=\"eduiVideoUrl\" type=\"text\"></td></tr></table>" +
+ "<div id=\"eduiVideoPreview\"></div>" +
+ "<div id=\"eduiVideoInfo\">" +
+ "<fieldset>" +
+ "<legend><%=lang_video_size%></legend>" +
+ "<table style=\"table-layout: initial;\">" +
+ "<tr><td><label for=\"eduiVideoWidth\"><%=lang_videoW%></label></td><td><input class=\"edui-video-txt\" id=\"eduiVideoWidth\" type=\"text\"/></td></tr>" +
+ "<tr><td><label for=\"eduiVideoHeight\"><%=lang_videoH%></label></td><td><input class=\"edui-video-txt\" id=\"eduiVideoHeight\" type=\"text\"/></td></tr>" +
+ "</table>" +
+ "</fieldset>" +
+ "<fieldset>" +
+ "<legend><%=lang_alignment%></legend>" +
+ "<div id=\"eduiVideoFloat\"></div>" +
+ "</fieldset>" +
+ "</div>" +
+ "</div>" +
+ "</div>" +
+ "</div>" +
+ "</div>",
+ initContent:function( editor, $widget ){
+
+ var me = this,
+ lang = editor.getLang( widgetName),
+ video_url = UMEDITOR_CONFIG.UMEDITOR_HOME_URL + 'dialogs/video/';
+
+ me.lang = lang;
+ me.editor = editor;
+ me.$widget = $widget;
+ me.root().html( $.parseTmpl( me.tpl, $.extend( { video_url: video_url }, lang['static'] ) ) );
+
+ me.initController( lang );
+
+ },
+ initEvent:function(){
+
+ var me = this,
+ url = $("#eduiVideoUrl", me.$widget)[0];
+
+ if( 'oninput' in url ) {
+ url.oninput = function(){
+ me.createPreviewVideo( this.value );
+ };
+ } else {
+ url.onpropertychange = function () {
+ me.createPreviewVideo( this.value );
+ }
+ }
+
+ },
+ initController: function( lang ){
+
+ var me = this,
+ img = me.editor.selection.getRange().getClosedNode(),
+ url;
+
+ me.createAlignButton( ["eduiVideoFloat"] );
+
+ //编辑视频时初始化相关信息
+ if(img && img.className == "edui-faked-video"){
+ $("#eduiVideoUrl", me.$widget)[0].value = url = img.getAttribute("_url");
+ $("#eduiVideoWidth", me.$widget)[0].value = img.width;
+ $("#eduiVideoHeight", me.$widget)[0].value = img.height;
+ var align = domUtils.getComputedStyle(img,"float"),
+ parentAlign = domUtils.getComputedStyle(img.parentNode,"text-align");
+ me.updateAlignButton(parentAlign==="center"?"center":align);
+ }
+ me.createPreviewVideo(url);
+
+ },
+ /**
+ * 根据url生成视频预览
+ */
+ createPreviewVideo: function(url){
+
+ if ( !url )return;
+
+ var me = this,
+ lang = me.lang,
+ conUrl = me.convert_url(url);
+
+ if(!me.endWith(conUrl,[".swf",".flv",".wmv"])){
+ $("#eduiVideoPreview", me.$widget).html( lang.urlError );
+ return;
+ }
+ $("#eduiVideoPreview", me.$widget)[0].innerHTML = '<embed type="application/x-shockwave-flash" pluginspage="http://www.macromedia.com/go/getflashplayer"' +
+ ' src="' + url + '"' +
+ ' width="' + 420 + '"' +
+ ' height="' + 280 + '"' +
+ ' wmode="transparent" play="true" loop="false" menu="false" allowscriptaccess="never" allowfullscreen="true" ></embed>';
+
+ },
+ /**
+ * 将单个视频信息插入编辑器中
+ */
+ insertSingle: function(){
+
+ var me = this,
+ width = $("#eduiVideoWidth", me.$widget)[0],
+ height = $("#eduiVideoHeight", me.$widget)[0],
+ url=$('#eduiVideoUrl', me.$widget)[0].value,
+ align = this.findFocus("eduiVideoFloat","name");
+
+ if(!url) return false;
+ if ( !me.checkNum( [width, height] ) ) return false;
+ this.editor.execCommand('insertvideo', {
+ url: me.convert_url(url),
+ width: width.value,
+ height: height.value,
+ align: align
+ });
+
+ },
+ /**
+ * URL转换
+ */
+ convert_url: function(url){
+ if ( !url ) return '';
+ var matches = url.match(/youtu.be\/(\w+)$/) ||
+ url.match(/youtube\.com\/watch\?v=(\w+)/) ||
+ url.match(/youtube.com\/v\/(\w+)/),
+ youku = url.match(/youku\.com\/v_show\/id_(\w+)/),
+ youkuPlay = /player\.youku\.com/ig.test(url);
+
+ if(youkuPlay){
+ url = url.replace(/\?f=.*/, "");
+ } else if (matches){
+ url = "https://www.youtube.com/v/" + matches[1] + "?version=3&feature=player_embedded";
+ }else if(youku){
+ url = "http://player.youku.com/player.php/sid/"+youku[1]+"/v.swf"
+ } else {
+ url = url.replace(/http:\/\/www\.tudou\.com\/programs\/view\/([\w\-]+)\/?/i, "http://www.tudou.com/v/$1")
+ .replace(/http:\/\/www\.youtube\.com\/watch\?v=([\w\-]+)/i, "http://www.youtube.com/v/$1")
+ .replace(/http:\/\/v\.youku\.com\/v_show\/id_([\w\-=]+)\.html/i, "http://player.youku.com/player.php/sid/$1")
+ .replace(/http:\/\/www\.56\.com\/u\d+\/v_([\w\-]+)\.html/i, "http://player.56.com/v_$1.swf")
+ .replace(/http:\/\/www.56.com\/w\d+\/play_album\-aid\-\d+_vid\-([^.]+)\.html/i, "http://player.56.com/v_$1.swf")
+ .replace(/http:\/\/v\.ku6\.com\/.+\/([^.]+)\.html/i, "http://player.ku6.com/refer/$1/v.swf")
+ .replace(/\?f=.*/, "");
+ }
+ return url;
+ },
+ /**
+ * 检测传入的所有input框中输入的长宽是否是正数
+ */
+ checkNum: function checkNum( nodes ) {
+
+ var me = this;
+
+ for ( var i = 0, ci; ci = nodes[i++]; ) {
+ var value = ci.value;
+ if ( !me.isNumber( value ) && value) {
+ alert( me.lang.numError );
+ ci.value = "";
+ ci.focus();
+ return false;
+ }
+ }
+ return true;
+ },
+ /**
+ * 数字判断
+ * @param value
+ */
+ isNumber: function( value ) {
+ return /(0|^[1-9]\d*$)/.test( value );
+ },
+ updateAlignButton: function( align ) {
+ var aligns = $( "#eduiVideoFloat", this.$widget )[0].children;
+
+ for ( var i = 0, ci; ci = aligns[i++]; ) {
+ if ( ci.getAttribute( "name" ) == align ) {
+ if ( ci.className !="edui-video-focus" ) {
+ ci.className = "edui-video-focus";
+ }
+ } else {
+ if ( ci.className =="edui-video-focus" ) {
+ ci.className = "";
+ }
+ }
+ }
+
+ },
+ /**
+ * 创建图片浮动选择按钮
+ * @param ids
+ */
+ createAlignButton: function( ids ) {
+ var lang = this.lang,
+ vidoe_home = UMEDITOR_CONFIG.UMEDITOR_HOME_URL + 'dialogs/video/';
+
+ for ( var i = 0, ci; ci = ids[i++]; ) {
+ var floatContainer = $( "#" + ci, this.$widget ) [0],
+ nameMaps = {"none":lang['default'], "left":lang.floatLeft, "right":lang.floatRight};
+ for ( var j in nameMaps ) {
+ var div = document.createElement( "div" );
+ div.setAttribute( "name", j );
+ if ( j == "none" ) div.className="edui-video-focus";
+ div.style.cssText = "background:url("+ vidoe_home +"images/" + j + "_focus.jpg);";
+ div.setAttribute( "title", nameMaps[j] );
+ floatContainer.appendChild( div );
+ }
+ this.switchSelect( ci );
+ }
+ },
+ /**
+ * 选择切换
+ */
+ switchSelect: function( selectParentId ) {
+ var selects = $( "#" + selectParentId, this.$widget )[0].children;
+ for ( var i = 0, ci; ci = selects[i++]; ) {
+ $(ci).on("click", function () {
+ for ( var j = 0, cj; cj = selects[j++]; ) {
+ cj.className = "";
+ cj.removeAttribute && cj.removeAttribute( "class" );
+ }
+ this.className = "edui-video-focus";
+ } )
+ }
+ },
+ /**
+ * 找到id下具有focus类的节点并返回该节点下的某个属性
+ * @param id
+ * @param returnProperty
+ */
+ findFocus: function( id, returnProperty ) {
+ var tabs = $( "#" + id , this.$widget)[0].children,
+ property;
+ for ( var i = 0, ci; ci = tabs[i++]; ) {
+ if ( ci.className=="edui-video-focus" ) {
+ property = ci.getAttribute( returnProperty );
+ break;
+ }
+ }
+ return property;
+ },
+ /**
+ * 末尾字符检测
+ */
+ endWith: function(str,endStrArr){
+ for(var i=0,len = endStrArr.length;i<len;i++){
+ var tmp = endStrArr[i];
+ if(str.length - tmp.length<0) return false;
+
+ if(str.substring(str.length-tmp.length)==tmp){
+ return true;
+ }
+ }
+ return false;
+ },
+ width:610,
+ height:498,
+ buttons: {
+ ok: {
+ exec: function( editor, $w ){
+ $("#eduiVideoPreview", $w).html("");
+ editor.getWidgetData(widgetName).insertSingle();
+ }
+ },
+ cancel: {
+ exec: function(){
+ //清除视频
+ $("#eduiVideoPreview").html("");
+ }
+ }
+ }
+ });
+
+})();
diff --git a/management/guns-admin/src/main/webapp/static/js/plugins/umeditor/index.html b/management/guns-admin/src/main/webapp/static/js/plugins/umeditor/index.html
new file mode 100644
index 0000000..71e71cc
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/static/js/plugins/umeditor/index.html
@@ -0,0 +1,277 @@
+<!DOCTYPE HTML>
+<html>
+<head>
+
+ <meta http-equiv="Content-Type" content="text/html;charset=utf-8"/>
+ <title>UMEDITOR 完整demo</title>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+ <link href="themes/default/css/umeditor.css" type="text/css" rel="stylesheet">
+ <script type="text/javascript" src="third-party/jquery.min.js"></script>
+ <script type="text/javascript" charset="utf-8" src="umeditor.config.js"></script>
+ <script type="text/javascript" charset="utf-8" src="umeditor.min.js"></script>
+ <script type="text/javascript" src="lang/zh-cn/zh-cn.js"></script>
+ <style type="text/css">
+ h1{
+ font-family: "微软雅黑";
+ font-weight: normal;
+ }
+ .btn {
+ display: inline-block;
+ *display: inline;
+ padding: 4px 12px;
+ margin-bottom: 0;
+ *margin-left: .3em;
+ font-size: 14px;
+ line-height: 20px;
+ color: #333333;
+ text-align: center;
+ text-shadow: 0 1px 1px rgba(255, 255, 255, 0.75);
+ vertical-align: middle;
+ cursor: pointer;
+ background-color: #f5f5f5;
+ *background-color: #e6e6e6;
+ background-image: -moz-linear-gradient(top, #ffffff, #e6e6e6);
+ background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), to(#e6e6e6));
+ background-image: -webkit-linear-gradient(top, #ffffff, #e6e6e6);
+ background-image: -o-linear-gradient(top, #ffffff, #e6e6e6);
+ background-image: linear-gradient(to bottom, #ffffff, #e6e6e6);
+ background-repeat: repeat-x;
+ border: 1px solid #cccccc;
+ *border: 0;
+ border-color: #e6e6e6 #e6e6e6 #bfbfbf;
+ border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
+ border-bottom-color: #b3b3b3;
+ -webkit-border-radius: 4px;
+ -moz-border-radius: 4px;
+ border-radius: 4px;
+ filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff', endColorstr='#ffe6e6e6', GradientType=0);
+ filter: progid:DXImageTransform.Microsoft.gradient(enabled=false);
+ *zoom: 1;
+ -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
+ -moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
+ box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
+ }
+
+ .btn:hover,
+ .btn:focus,
+ .btn:active,
+ .btn.active,
+ .btn.disabled,
+ .btn[disabled] {
+ color: #333333;
+ background-color: #e6e6e6;
+ *background-color: #d9d9d9;
+ }
+
+ .btn:active,
+ .btn.active {
+ background-color: #cccccc \9;
+ }
+
+ .btn:first-child {
+ *margin-left: 0;
+ }
+
+ .btn:hover,
+ .btn:focus {
+ color: #333333;
+ text-decoration: none;
+ background-position: 0 -15px;
+ -webkit-transition: background-position 0.1s linear;
+ -moz-transition: background-position 0.1s linear;
+ -o-transition: background-position 0.1s linear;
+ transition: background-position 0.1s linear;
+ }
+
+ .btn:focus {
+ outline: thin dotted #333;
+ outline: 5px auto -webkit-focus-ring-color;
+ outline-offset: -2px;
+ }
+
+ .btn.active,
+ .btn:active {
+ background-image: none;
+ outline: 0;
+ -webkit-box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05);
+ -moz-box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05);
+ box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05);
+ }
+
+ .btn.disabled,
+ .btn[disabled] {
+ cursor: default;
+ background-image: none;
+ opacity: 0.65;
+ filter: alpha(opacity=65);
+ -webkit-box-shadow: none;
+ -moz-box-shadow: none;
+ box-shadow: none;
+ }
+ </style>
+</head>
+<body>
+<h1>UMEDITOR 完整demo</h1>
+
+<!--style给定宽度可以影响编辑器的最终宽度-->
+<script type="text/plain" id="myEditor" style="width:1000px;height:240px;">
+ <p>这里我可以写一些输入提示</p>
+</script>
+
+
+<div class="clear"></div>
+<div id="btns">
+ <table>
+ <tr>
+ <td>
+ <button class="btn" unselected="on" onclick="getAllHtml()">获得整个html的内容</button>
+ <button class="btn" onclick="getContent()">获得内容</button>
+ <button class="btn" onclick="setContent()">写入内容</button>
+ <button class="btn" onclick="setContent(true)">追加内容</button>
+ <button class="btn" onclick="getContentTxt()">获得纯文本</button>
+ <button class="btn" onclick="getPlainTxt()">获得带格式的纯文本</button>
+ <button class="btn" onclick="hasContent()">判断是否有内容</button>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <button class="btn" onclick="setFocus()">编辑器获得焦点</button>
+ <button class="btn" onmousedown="isFocus();return false;">编辑器是否获得焦点</button>
+ <button class="btn" onclick="doBlur()">编辑器取消焦点</button>
+ <button class="btn" onclick="insertHtml()">插入给定的内容</button>
+ <button class="btn" onclick="getContentTxt()">获得纯文本</button>
+ <button class="btn" id="enable" onclick="setEnabled()">可以编辑</button>
+ <button class="btn" onclick="setDisabled()">不可编辑</button>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <button class="btn" onclick="UM.getEditor('myEditor').setHide()">隐藏编辑器</button>
+ <button class="btn" onclick="UM.getEditor('myEditor').setShow()">显示编辑器</button>
+ <button class="btn" onclick="UM.getEditor('myEditor').setHeight(300)">设置编辑器的高度为300</button>
+ <button class="btn" onclick="UM.getEditor('myEditor').setWidth(1200)">设置编辑器的宽度为1200</button>
+ </td>
+ </tr>
+
+ </table>
+</div>
+<table>
+ <tr>
+ <td>
+ <button class="btn" onclick="createEditor()"/>创建编辑器</button>
+ <button class="btn" onclick="deleteEditor()"/>删除编辑器</button>
+ </td>
+ </tr>
+</table>
+
+<div>
+ <h3 id="focush2"></h3>
+</div>
+<script type="text/javascript">
+ //实例化编辑器
+ var um = UM.getEditor('myEditor');
+ um.addListener('blur',function(){
+ $('#focush2').html('编辑器失去焦点了')
+ });
+ um.addListener('focus',function(){
+ $('#focush2').html('')
+ });
+ //按钮的操作
+ function insertHtml() {
+ var value = prompt('插入html代码', '');
+ um.execCommand('insertHtml', value)
+ }
+ function isFocus(){
+ alert(um.isFocus())
+ }
+ function doBlur(){
+ um.blur()
+ }
+ function createEditor() {
+ enableBtn();
+ um = UM.getEditor('myEditor');
+ }
+ function getAllHtml() {
+ alert(UM.getEditor('myEditor').getAllHtml())
+ }
+ function getContent() {
+ var arr = [];
+ arr.push("使用editor.getContent()方法可以获得编辑器的内容");
+ arr.push("内容为：");
+ arr.push(UM.getEditor('myEditor').getContent());
+ alert(arr.join("\n"));
+ }
+ function getPlainTxt() {
+ var arr = [];
+ arr.push("使用editor.getPlainTxt()方法可以获得编辑器的带格式的纯文本内容");
+ arr.push("内容为：");
+ arr.push(UM.getEditor('myEditor').getPlainTxt());
+ alert(arr.join('\n'))
+ }
+ function setContent(isAppendTo) {
+ var arr = [];
+ arr.push("使用editor.setContent('欢迎使用umeditor')方法可以设置编辑器的内容");
+ UM.getEditor('myEditor').setContent('欢迎使用umeditor', isAppendTo);
+ alert(arr.join("\n"));
+ }
+ function setDisabled() {
+ UM.getEditor('myEditor').setDisabled('fullscreen');
+ disableBtn("enable");
+ }
+
+ function setEnabled() {
+ UM.getEditor('myEditor').setEnabled();
+ enableBtn();
+ }
+
+ function getText() {
+ //当你点击按钮时编辑区域已经失去了焦点，如果直接用getText将不会得到内容，所以要在选回来，然后取得内容
+ var range = UM.getEditor('myEditor').selection.getRange();
+ range.select();
+ var txt = UM.getEditor('myEditor').selection.getText();
+ alert(txt)
+ }
+
+ function getContentTxt() {
+ var arr = [];
+ arr.push("使用editor.getContentTxt()方法可以获得编辑器的纯文本内容");
+ arr.push("编辑器的纯文本内容为：");
+ arr.push(UM.getEditor('myEditor').getContentTxt());
+ alert(arr.join("\n"));
+ }
+ function hasContent() {
+ var arr = [];
+ arr.push("使用editor.hasContents()方法判断编辑器里是否有内容");
+ arr.push("判断结果为：");
+ arr.push(UM.getEditor('myEditor').hasContents());
+ alert(arr.join("\n"));
+ }
+ function setFocus() {
+ UM.getEditor('myEditor').focus();
+ }
+ function deleteEditor() {
+ disableBtn();
+ UM.getEditor('myEditor').destroy();
+ }
+ function disableBtn(str) {
+ var div = document.getElementById('btns');
+ var btns = domUtils.getElementsByTagName(div, "button");
+ for (var i = 0, btn; btn = btns[i++];) {
+ if (btn.id == str) {
+ domUtils.removeAttributes(btn, ["disabled"]);
+ } else {
+ btn.setAttribute("disabled", "true");
+ }
+ }
+ }
+ function enableBtn() {
+ var div = document.getElementById('btns');
+ var btns = domUtils.getElementsByTagName(div, "button");
+ for (var i = 0, btn; btn = btns[i++];) {
+ domUtils.removeAttributes(btn, ["disabled"]);
+ }
+ }
+</script>
+
+</body>
+</html>
\ No newline at end of file
diff --git a/management/guns-admin/src/main/webapp/static/js/plugins/umeditor/lang/en/en.js b/management/guns-admin/src/main/webapp/static/js/plugins/umeditor/lang/en/en.js
new file mode 100644
index 0000000..45b2f1a
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/static/js/plugins/umeditor/lang/en/en.js
@@ -0,0 +1,150 @@
+/**
+ * English language package
+ */
+UM.I18N['en'] = {
+ 'labelMap':{
+ 'anchor':'Anchor', 'undo':'Undo', 'redo':'Redo', 'bold':'Bold', 'indent':'Indent', 'snapscreen':'SnapScreen',
+ 'italic':'Italic', 'underline':'Underline', 'strikethrough':'Strikethrough', 'subscript':'SubScript','fontborder':'text border',
+ 'superscript':'SuperScript', 'formatmatch':'Format Match', 'source':'Source', 'blockquote':'BlockQuote',
+ 'pasteplain':'PastePlain', 'selectall':'SelectAll', 'print':'Print', 'preview':'Preview',
+ 'horizontal':'Horizontal', 'removeformat':'RemoveFormat', 'time':'Time', 'date':'Date',
+ 'unlink':'Unlink', 'insertrow':'InsertRow', 'insertcol':'InsertCol', 'mergeright':'MergeRight', 'mergedown':'MergeDown',
+ 'deleterow':'DeleteRow', 'deletecol':'DeleteCol', 'splittorows':'SplitToRows','insertcode':'insert code',
+ 'splittocols':'SplitToCols', 'splittocells':'SplitToCells','deletecaption':'DeleteCaption','inserttitle':'InsertTitle',
+ 'mergecells':'MergeCells', 'deletetable':'DeleteTable', 'cleardoc':'Clear', 'insertparagraphbeforetable':"InsertParagraphBeforeTable",
+ 'fontfamily':'FontFamily', 'fontsize':'FontSize', 'paragraph':'Paragraph', 'image':'Image','edittable':'Edit Table', 'edittd':'Edit Td','link':'Link',
+ 'emotion':'Emotion', 'spechars':'Spechars', 'searchreplace':'SearchReplace', 'map':'BaiduMap', 'gmap':'GoogleMap',
+ 'video':'Video', 'help':'Help', 'justifyleft':'JustifyLeft', 'justifyright':'JustifyRight', 'justifycenter':'JustifyCenter',
+ 'justifyjustify':'Justify', 'forecolor':'FontColor', 'backcolor':'BackColor', 'insertorderedlist':'OL',
+ 'insertunorderedlist':'UL', 'fullscreen':'FullScreen', 'directionalityltr':'EnterFromLeft', 'directionalityrtl':'EnterFromRight',
+ 'rowspacingtop':'RowSpacingTop', 'rowspacingbottom':'RowSpacingBottom', 'highlightcode':'Code', 'pagebreak':'PageBreak', 'insertframe':'Iframe', 'imagenone':'Default',
+ 'imageleft':'ImageLeft', 'imageright':'ImageRight', 'attachment':'Attachment', 'imagecenter':'ImageCenter', 'wordimage':'WordImage',
+ 'lineheight':'LineHeight','edittip':'EditTip','customstyle':'CustomStyle', 'scrawl':'Scrawl', 'autotypeset':'AutoTypeset',
+ 'webapp':'WebAPP', 'touppercase':'UpperCase', 'tolowercase':'LowerCase','template':'Template','background':'Background','inserttable':'InsertTable',
+ 'drafts': 'drafts', 'formula':'formula'
+ },
+ 'paragraph':{'p':'Paragraph', 'h1':'Title 1', 'h2':'Title 2', 'h3':'Title 3', 'h4':'Title 4', 'h5':'Title 5', 'h6':'Title 6'},
+ 'fontfamily':{
+ 'songti':'Sim sun',
+ 'kaiti':'Sim kai',
+ 'heiti':'Sim hei',
+ 'lishu':'Sim li',
+ 'yahei': 'Microsoft yahei',
+ 'andaleMono':'Andale mono',
+ 'arial': 'Arial',
+ 'arialBlack':'Arial black',
+ 'comicSansMs':'Comic sans ms',
+ 'impact':'Impact',
+ 'timesNewRoman':'Times new roman'
+ },
+ 'ok':"OK",
+ 'cancel':"Cancel",
+ 'closeDialog':"closeDialog",
+ 'tableDrag':"You must import the file uiUtils.js before drag! ",
+ 'autofloatMsg':"The plugin AutoFloat depends on EditorUI!",
+ 'anthorMsg':"Link",
+ 'clearColor':'Clear',
+ 'standardColor':'Standard color',
+ 'themeColor':'Theme color',
+ 'property':'Property',
+ 'default':'Default',
+ 'modify':'Modify',
+ 'justifyleft':'Justify Left',
+ 'justifyright':'Justify Right',
+ 'justifycenter':'Justify Center',
+ 'justify':'Default',
+ 'clear':'Clear',
+ 'anchorMsg':'Anchor',
+ 'delete':'Delete',
+ 'clickToUpload':"Click to upload",
+ 'unset':"Language hasn't been set!",
+ 't_row':'row',
+ 't_col':'col',
+ 'more':'More',
+ 'pasteOpt':'Paste Option',
+ 'pasteSourceFormat':"Keep Source Formatting",
+ 'tagFormat':'Keep tag',
+ 'pasteTextFormat':'Keep Text only',
+
+ //===============dialog i18N=======================
+ 'image':{
+ 'static':{
+ 'lang_tab_local':"Local Upload",
+ 'lang_tab_imgSearch':"Network Pictures",
+ 'lang_input_dragTip':"Support drag upload",
+ 'lang_btn_add':"Add"
+ },
+ 'uploadError': 'Upload Error'
+ },
+ 'emotion':{
+ 'static':{
+ 'lang_input_choice':'Choice',
+ 'lang_input_Tuzki':'Tuzki',
+ 'lang_input_lvdouwa':'LvDouWa',
+ 'lang_input_BOBO':'BOBO',
+ 'lang_input_babyCat':'BabyCat',
+ 'lang_input_bubble':'Bubble',
+ 'lang_input_youa':'YouA'
+ }
+ },
+ 'gmap':{
+ 'static':{
+ 'lang_input_address':'Address:',
+ 'lang_input_search':'Search',
+ 'address':{'value':"Beijing"}
+ },
+ 'searchError':'Unable to locate the address!'
+ },
+ 'link':{
+ 'static':{
+ 'lang_input_text':'Text：',
+ 'lang_input_url':'URL：',
+ 'lang_input_title':'Title：',
+ 'lang_input_target':'open in new window：'
+ },
+ 'validLink':'Supports only effective when a link is selected',
+ 'httpPrompt':'The hyperlink you enter should start with "http|https|ftp://"!'
+ },
+ 'map':{
+ 'static':{
+ 'lang_city':"City",
+ 'lang_address':"Address",
+ 'city':{'value':"Beijing"},
+ 'lang_search':"Search",
+ 'lang_dynamicmap':"Dynamic map"
+ },
+ 'cityMsg':"Please enter the city name!",
+ 'errorMsg':"Can't find the place!"
+ },
+ 'video':{
+ 'static':{
+ 'lang_tab_insertV':"Video",
+ 'lang_video_url':" URL ",
+ 'lang_video_size':"Video Size",
+ 'lang_videoW':"Width",
+ 'lang_videoH':"Height",
+ 'lang_alignment':"Alignment",
+ 'videoSearchTxt':{'value':"Enter the search keyword!"},
+ 'videoType':{'options':["All", "Hot", "Entertainment", "Funny", "Sports", "Science", "variety"]},
+ 'videoSearchBtn':{'value':"Search in Baidu"},
+ 'videoSearchReset':{'value':"Clear result"}
+ },
+ 'numError':"Please enter the correct Num. e.g 123,400",
+ 'floatLeft':"Float left",
+ 'floatRight':"Float right",
+ 'default':"Default",
+ 'block':"Display in block",
+ 'urlError':"The video url format may be wrong!",
+ 'loading':" The video is loading, please wait…",
+ 'clickToSelect':"Click to select",
+ 'goToSource':'Visit source video ',
+ 'noVideo':" Sorry,can't find the video,please try again!"
+ },
+ 'formula':{
+ 'static':{
+ 'lang_tab_common':'Common',
+ 'lang_tab_symbol':'Symbol',
+ 'lang_tab_letter':'Letter'
+ }
+ }
+};
\ No newline at end of file
diff --git a/management/guns-admin/src/main/webapp/static/js/plugins/umeditor/lang/en/images/addimage.png b/management/guns-admin/src/main/webapp/static/js/plugins/umeditor/lang/en/images/addimage.png
new file mode 100644
index 0000000..3a2fd17
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/static/js/plugins/umeditor/lang/en/images/addimage.png
Binary files differ
diff --git a/management/guns-admin/src/main/webapp/static/js/plugins/umeditor/lang/en/images/alldeletebtnhoverskin.png b/management/guns-admin/src/main/webapp/static/js/plugins/umeditor/lang/en/images/alldeletebtnhoverskin.png
new file mode 100644
index 0000000..355eeab
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/static/js/plugins/umeditor/lang/en/images/alldeletebtnhoverskin.png
Binary files differ
diff --git a/management/guns-admin/src/main/webapp/static/js/plugins/umeditor/lang/en/images/alldeletebtnupskin.png b/management/guns-admin/src/main/webapp/static/js/plugins/umeditor/lang/en/images/alldeletebtnupskin.png
new file mode 100644
index 0000000..61658ce
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/static/js/plugins/umeditor/lang/en/images/alldeletebtnupskin.png
Binary files differ
diff --git a/management/guns-admin/src/main/webapp/static/js/plugins/umeditor/lang/en/images/background.png b/management/guns-admin/src/main/webapp/static/js/plugins/umeditor/lang/en/images/background.png
new file mode 100644
index 0000000..d5bf5fd
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/static/js/plugins/umeditor/lang/en/images/background.png
Binary files differ
diff --git a/management/guns-admin/src/main/webapp/static/js/plugins/umeditor/lang/en/images/button.png b/management/guns-admin/src/main/webapp/static/js/plugins/umeditor/lang/en/images/button.png
new file mode 100644
index 0000000..098874c
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/static/js/plugins/umeditor/lang/en/images/button.png
Binary files differ
diff --git a/management/guns-admin/src/main/webapp/static/js/plugins/umeditor/lang/en/images/copy.png b/management/guns-admin/src/main/webapp/static/js/plugins/umeditor/lang/en/images/copy.png
new file mode 100644
index 0000000..f982e8b
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/static/js/plugins/umeditor/lang/en/images/copy.png
Binary files differ
diff --git a/management/guns-admin/src/main/webapp/static/js/plugins/umeditor/lang/en/images/deletedisable.png b/management/guns-admin/src/main/webapp/static/js/plugins/umeditor/lang/en/images/deletedisable.png
new file mode 100644
index 0000000..c8ee750
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/static/js/plugins/umeditor/lang/en/images/deletedisable.png
Binary files differ
diff --git a/management/guns-admin/src/main/webapp/static/js/plugins/umeditor/lang/en/images/deleteenable.png b/management/guns-admin/src/main/webapp/static/js/plugins/umeditor/lang/en/images/deleteenable.png
new file mode 100644
index 0000000..26acc88
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/static/js/plugins/umeditor/lang/en/images/deleteenable.png
Binary files differ
diff --git a/management/guns-admin/src/main/webapp/static/js/plugins/umeditor/lang/en/images/imglabel.png b/management/guns-admin/src/main/webapp/static/js/plugins/umeditor/lang/en/images/imglabel.png
new file mode 100644
index 0000000..da401e6
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/static/js/plugins/umeditor/lang/en/images/imglabel.png
Binary files differ
diff --git a/management/guns-admin/src/main/webapp/static/js/plugins/umeditor/lang/en/images/listbackground.png b/management/guns-admin/src/main/webapp/static/js/plugins/umeditor/lang/en/images/listbackground.png
new file mode 100644
index 0000000..4f82ccd
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/static/js/plugins/umeditor/lang/en/images/listbackground.png
Binary files differ
diff --git a/management/guns-admin/src/main/webapp/static/js/plugins/umeditor/lang/en/images/localimage.png b/management/guns-admin/src/main/webapp/static/js/plugins/umeditor/lang/en/images/localimage.png
new file mode 100644
index 0000000..12c8e6a
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/static/js/plugins/umeditor/lang/en/images/localimage.png
Binary files differ
diff --git a/management/guns-admin/src/main/webapp/static/js/plugins/umeditor/lang/en/images/music.png b/management/guns-admin/src/main/webapp/static/js/plugins/umeditor/lang/en/images/music.png
new file mode 100644
index 0000000..2f495fe
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/static/js/plugins/umeditor/lang/en/images/music.png
Binary files differ
diff --git a/management/guns-admin/src/main/webapp/static/js/plugins/umeditor/lang/en/images/rotateleftdisable.png b/management/guns-admin/src/main/webapp/static/js/plugins/umeditor/lang/en/images/rotateleftdisable.png
new file mode 100644
index 0000000..741526e
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/static/js/plugins/umeditor/lang/en/images/rotateleftdisable.png
Binary files differ
diff --git a/management/guns-admin/src/main/webapp/static/js/plugins/umeditor/lang/en/images/rotateleftenable.png b/management/guns-admin/src/main/webapp/static/js/plugins/umeditor/lang/en/images/rotateleftenable.png
new file mode 100644
index 0000000..e164ddb
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/static/js/plugins/umeditor/lang/en/images/rotateleftenable.png
Binary files differ
diff --git a/management/guns-admin/src/main/webapp/static/js/plugins/umeditor/lang/en/images/rotaterightdisable.png b/management/guns-admin/src/main/webapp/static/js/plugins/umeditor/lang/en/images/rotaterightdisable.png
new file mode 100644
index 0000000..5a78c26
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/static/js/plugins/umeditor/lang/en/images/rotaterightdisable.png
Binary files differ
diff --git a/management/guns-admin/src/main/webapp/static/js/plugins/umeditor/lang/en/images/rotaterightenable.png b/management/guns-admin/src/main/webapp/static/js/plugins/umeditor/lang/en/images/rotaterightenable.png
new file mode 100644
index 0000000..d768531
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/static/js/plugins/umeditor/lang/en/images/rotaterightenable.png
Binary files differ
diff --git a/management/guns-admin/src/main/webapp/static/js/plugins/umeditor/lang/en/images/upload.png b/management/guns-admin/src/main/webapp/static/js/plugins/umeditor/lang/en/images/upload.png
new file mode 100644
index 0000000..7bb15b3
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/static/js/plugins/umeditor/lang/en/images/upload.png
Binary files differ
diff --git a/management/guns-admin/src/main/webapp/static/js/plugins/umeditor/lang/zh-cn/images/copy.png b/management/guns-admin/src/main/webapp/static/js/plugins/umeditor/lang/zh-cn/images/copy.png
new file mode 100644
index 0000000..b2536aa
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/static/js/plugins/umeditor/lang/zh-cn/images/copy.png
Binary files differ
diff --git a/management/guns-admin/src/main/webapp/static/js/plugins/umeditor/lang/zh-cn/images/imglabel.png b/management/guns-admin/src/main/webapp/static/js/plugins/umeditor/lang/zh-cn/images/imglabel.png
new file mode 100644
index 0000000..4fc3c88
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/static/js/plugins/umeditor/lang/zh-cn/images/imglabel.png
Binary files differ
diff --git a/management/guns-admin/src/main/webapp/static/js/plugins/umeditor/lang/zh-cn/images/localimage.png b/management/guns-admin/src/main/webapp/static/js/plugins/umeditor/lang/zh-cn/images/localimage.png
new file mode 100644
index 0000000..7303c36
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/static/js/plugins/umeditor/lang/zh-cn/images/localimage.png
Binary files differ
diff --git a/management/guns-admin/src/main/webapp/static/js/plugins/umeditor/lang/zh-cn/images/music.png b/management/guns-admin/src/main/webapp/static/js/plugins/umeditor/lang/zh-cn/images/music.png
new file mode 100644
index 0000000..354edeb
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/static/js/plugins/umeditor/lang/zh-cn/images/music.png
Binary files differ
diff --git a/management/guns-admin/src/main/webapp/static/js/plugins/umeditor/lang/zh-cn/images/upload.png b/management/guns-admin/src/main/webapp/static/js/plugins/umeditor/lang/zh-cn/images/upload.png
new file mode 100644
index 0000000..08d4d92
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/static/js/plugins/umeditor/lang/zh-cn/images/upload.png
Binary files differ
diff --git a/management/guns-admin/src/main/webapp/static/js/plugins/umeditor/lang/zh-cn/zh-cn.js b/management/guns-admin/src/main/webapp/static/js/plugins/umeditor/lang/zh-cn/zh-cn.js
new file mode 100644
index 0000000..13d8cba
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/static/js/plugins/umeditor/lang/zh-cn/zh-cn.js
@@ -0,0 +1,150 @@
+/**
+ * 中文语言包
+ */
+UM.I18N['zh-cn'] = {
+ 'labelMap':{
+ 'anchor':'锚点', 'undo':'撤销', 'redo':'重做', 'bold':'加粗', 'indent':'首行缩进', 'snapscreen':'截图',
+ 'italic':'斜体', 'underline':'下划线', 'strikethrough':'删除线', 'subscript':'下标','fontborder':'字符边框',
+ 'superscript':'上标', 'formatmatch':'格式刷', 'source':'源代码', 'blockquote':'引用',
+ 'pasteplain':'纯文本粘贴模式', 'selectall':'全选', 'print':'打印', 'preview':'预览',
+ 'horizontal':'分隔线', 'removeformat':'清除格式', 'time':'时间', 'date':'日期',
+ 'unlink':'取消链接', 'insertrow':'前插入行', 'insertcol':'前插入列', 'mergeright':'右合并单元格', 'mergedown':'下合并单元格',
+ 'deleterow':'删除行', 'deletecol':'删除列', 'splittorows':'拆分成行', 'splittocols':'拆分成列', 'splittocells':'完全拆分单元格',
+ 'mergecells':'合并多个单元格', 'deletetable':'删除表格', 'cleardoc':'清空文档','insertparagraphbeforetable':"表格前插入行",'insertcode':'代码语言','fontfamily':'字体', 'fontsize':'字号', 'paragraph':'段落格式', 'image':'图片',
+ 'edittable':'表格属性','edittd':'单元格属性', 'link':'超链接','emotion':'表情', 'spechars':'特殊字符', 'searchreplace':'查询替换', 'map':'百度地图',
+ 'video':'视频', 'help':'帮助', 'justifyleft':'居左对齐', 'justifyright':'居右对齐', 'justifycenter':'居中对齐',
+ 'justifyjustify':'两端对齐', 'forecolor':'字体颜色', 'backcolor':'背景色', 'insertorderedlist':'有序列表',
+ 'insertunorderedlist':'无序列表', 'fullscreen':'全屏', 'directionalityltr':'从左向右输入', 'directionalityrtl':'从右向左输入',
+ 'rowspacingtop':'段前距', 'rowspacingbottom':'段后距', 'highlightcode':'插入代码', 'pagebreak':'分页', 'insertframe':'插入Iframe', 'imagenone':'默认',
+ 'imageleft':'左浮动', 'imageright':'右浮动', 'attachment':'附件', 'imagecenter':'居中', 'wordimage':'图片转存',
+ 'lineheight':'行间距','edittip' :'编辑提示','customstyle':'自定义标题', 'autotypeset':'自动排版', 'webapp':'百度应用',
+ 'touppercase':'字母大写', 'tolowercase':'字母小写','background':'背景','template':'模板','scrawl':'涂鸦','music':'音乐','inserttable':'插入表格',
+ 'drafts': '草稿箱', 'formula':'数学公式'
+
+
+ },
+ 'paragraph':{'p':'段落', 'h1':'标题 1', 'h2':'标题 2', 'h3':'标题 3', 'h4':'标题 4', 'h5':'标题 5', 'h6':'标题 6'},
+ 'fontfamily':{
+ 'songti':'宋体',
+ 'kaiti':'楷体',
+ 'heiti':'黑体',
+ 'lishu':'隶书',
+ 'yahei':'微软雅黑',
+ 'andaleMono':'andale mono',
+ 'arial': 'arial',
+ 'arialBlack':'arial black',
+ 'comicSansMs':'comic sans ms',
+ 'impact':'impact',
+ 'timesNewRoman':'times new roman'
+ },
+ 'ok':"确认",
+ 'cancel':"取消",
+ 'closeDialog':"关闭对话框",
+ 'tableDrag':"表格拖动必须引入uiUtils.js文件！",
+ 'autofloatMsg':"工具栏浮动依赖编辑器UI，您首先需要引入UI文件!",
+ 'anthorMsg':"链接",
+ 'clearColor':'清空颜色',
+ 'standardColor':'标准颜色',
+ 'themeColor':'主题颜色',
+ 'property':'属性',
+ 'default':'默认',
+ 'modify':'修改',
+ 'justifyleft':'左对齐',
+ 'justifyright':'右对齐',
+ 'justifycenter':'居中',
+ 'justify':'默认',
+ 'clear':'清除',
+ 'anchorMsg':'锚点',
+ 'delete':'删除',
+ 'clickToUpload':"点击上传",
+ 'unset':'尚未设置语言文件',
+ 't_row':'行',
+ 't_col':'列',
+ 'more':'更多',
+ 'pasteOpt':'粘贴选项',
+ 'pasteSourceFormat':"保留源格式",
+ 'tagFormat':'只保留标签',
+ 'pasteTextFormat':'只保留文本',
+
+ //===============dialog i18N=======================
+ 'image':{
+ 'static':{
+ 'lang_tab_local':"本地上传",
+ 'lang_tab_imgSearch':"网络图片",
+ 'lang_input_dragTip':" 选择图片上传",
+ 'lang_btn_add':"添加"
+ },
+ 'uploadError': '上传出错'
+ },
+ 'emotion':{
+ 'static':{
+ 'lang_input_choice':'精选',
+ 'lang_input_Tuzki':'兔斯基',
+ 'lang_input_BOBO':'BOBO',
+ 'lang_input_lvdouwa':'绿豆蛙',
+ 'lang_input_babyCat':'baby猫',
+ 'lang_input_bubble':'泡泡',
+ 'lang_input_youa':'有啊'
+ }
+ },
+ 'gmap':{
+ 'static':{
+ 'lang_input_address':'地址',
+ 'lang_input_search':'搜索',
+ 'address':{'value':"北京"}
+ },
+ 'searchError':'无法定位到该地址!'
+ },
+ 'link':{
+ 'static':{
+ 'lang_input_text':'文本内容：',
+ 'lang_input_url':'链接地址：',
+ 'lang_input_title':'标题：',
+ 'lang_input_target':'是否在新窗口打开：'
+ },
+ 'validLink':'只支持选中一个链接时生效',
+ 'httpPrompt':'您输入的超链接中不包含http等协议名称，默认将为您添加http://前缀'
+ },
+ 'map':{
+ 'static':{
+ 'lang_city':"城市",
+ 'lang_address':"地址",
+ 'city':{'value':"北京"},
+ 'lang_search':"搜索",
+ 'lang_dynamicmap':"插入动态地图"
+ },
+ 'cityMsg':"请选择城市",
+ 'errorMsg':"抱歉，找不到该位置！"
+ },
+ 'video':{
+ 'static':{
+ 'lang_tab_insertV':"插入视频",
+ 'lang_video_url':"视频网址",
+ 'lang_video_size':"视频尺寸",
+ 'lang_videoW':"宽度",
+ 'lang_videoH':"高度",
+ 'lang_alignment':"对齐方式",
+ 'videoSearchTxt':{'value':"请输入搜索关键字！"},
+ 'videoType':{'options':["全部", "热门", "娱乐", "搞笑", "体育", "科技", "综艺"]},
+ 'videoSearchBtn':{'value':"百度一下"},
+ 'videoSearchReset':{'value':"清空结果"}
+ },
+ 'numError':"请输入正确的数值，如123,400",
+ 'floatLeft':"左浮动",
+ 'floatRight':"右浮动",
+ 'default':"默认",
+ 'block':"独占一行",
+ 'urlError':"输入的视频地址有误，请检查后再试！",
+ 'loading':" 视频加载中，请等待……",
+ 'clickToSelect':"点击选中",
+ 'goToSource':'访问源视频',
+ 'noVideo':" 抱歉，找不到对应的视频，请重试！"
+ },
+ 'formula':{
+ 'static':{
+ 'lang_tab_common':'常用公式',
+ 'lang_tab_symbol':'符号',
+ 'lang_tab_letter':'字母'
+ }
+ }
+};
\ No newline at end of file
diff --git a/management/guns-admin/src/main/webapp/static/js/plugins/umeditor/themes/default/css/umeditor.css b/management/guns-admin/src/main/webapp/static/js/plugins/umeditor/themes/default/css/umeditor.css
new file mode 100644
index 0000000..16590ae
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/static/js/plugins/umeditor/themes/default/css/umeditor.css
@@ -0,0 +1,777 @@
+.edui-container{
+ position: relative;
+ border: 1px solid #d4d4d4;
+ box-shadow: 2px 2px 5px #d3d6da;
+ background-color: #fff;
+}
+.edui-container .edui-toolbar{
+ position: relative;
+ width:auto;
+ border-bottom: 1px solid #e1e1e1;
+ box-shadow: 2px 2px 5px #d3d6da;
+ background-color: #fafafa;
+ z-index: 99999;
+}
+.edui-toolbar .edui-btn-toolbar{
+ position: relative;
+ padding: 5px;
+}
+.edui-container .edui-editor-body{
+ background-color: #fff;
+}
+.edui-editor-body .edui-body-container{
+}
+
+.edui-editor-body .edui-body-container p{margin:5px 0;}
+.edui-editor-body .edui-body-container{
+ border:0;
+ outline:none;
+ cursor:text;
+ padding:0 10px 0;
+ overflow:auto;
+ display:block;
+ word-wrap:break-word;
+ font-size:16px;
+ font-family:sans-serif;
+}
+.edui-editor-body.focus{border:1px solid #5c9dff}
+.edui-editor-body table{margin:10px 0 10px;border-collapse:collapse;display:table;}
+.edui-editor-body td{padding: 5px 10px;border: 1px solid #DDD;}
+.edui-editor-body iframe.mathquill-embedded-latex{
+ border: 0px;
+ padding: 0px;
+ display: inline;
+ margin: 0px;
+ background: none;
+ vertical-align: middle;
+ width: 0px;
+ height: 0px;
+}
+/*普通按钮*/
+.edui-btn-toolbar .edui-btn{
+ position: relative;
+ display: inline-block;
+ vertical-align: top;
+ *display: inline;
+ *zoom:1;
+ width:auto;
+ margin: 0 1px;
+ padding:1px;
+ border:none;
+ background: none;
+}
+.edui-btn-toolbar .edui-btn .edui-icon{
+ width: 20px;
+ height: 20px;
+ margin: 0;
+ padding:0;
+ background-repeat: no-repeat;
+ background-image: url(../images/icons.png);
+ background-image: url(../images/icons.gif) \9;
+}
+
+/*状态反射*/
+.edui-btn-toolbar .edui-btn.edui-hover,
+.edui-btn-toolbar .edui-btn.edui-active{
+ background-color: #d5e1f2;
+ padding: 0;
+ border: 1px solid #a3bde3;
+ _z-index: 1;
+}
+.edui-btn-toolbar .edui-btn.edui-disabled{
+ opacity: 0.3;
+ filter: alpha(opacity = 30);
+}
+.edui-btn-toolbar .edui-btn .edui-icon-source {
+ background-position:-260px -0px;
+}
+.edui-btn-toolbar .edui-btn .edui-icon-undo {
+ background-position: -160px 0;
+}
+.edui-btn-toolbar .edui-btn .edui-icon-redo {
+ background-position: -100px 0;
+}
+.edui-btn-toolbar .edui-btn .edui-icon-bold{
+ background-position: 0 0;
+}
+.edui-btn-toolbar .edui-btn .edui-icon-italic {
+ background-position: -60px 0;
+}
+.edui-btn-toolbar .edui-btn .edui-icon-underline {
+ background-position: -140px 0
+}
+.edui-btn-toolbar .edui-btn .edui-icon-strikethrough {
+ background-position: -120px 0;
+}
+
+.edui-btn-toolbar .edui-btn .edui-icon-superscript {
+ background-position: -620px 0;
+}
+.edui-btn-toolbar .edui-btn .edui-icon-subscript {
+ background-position: -600px 0;
+}
+.edui-btn-toolbar .edui-btn .edui-icon-font, .edui-btn-toolbar .edui-btn .edui-icon-forecolor {
+ background-position: -720px 0;
+}
+
+.edui-btn-toolbar .edui-btn .edui-icon-backcolor {
+ background-position: -760px 0;
+}
+
+.edui-btn-toolbar .edui-btn .edui-icon-insertorderedlist {
+ background-position: -80px 0;
+}
+.edui-btn-toolbar .edui-btn .edui-icon-insertunorderedlist {
+ background-position: -20px 0;
+}
+.edui-btn-toolbar .edui-btn .edui-icon-selectall {
+ background-position: -400px -20px;
+}
+.edui-btn-toolbar .edui-btn .edui-icon-cleardoc {
+ background-position: -520px 0;
+}
+.edui-btn-toolbar .edui-btn .edui-icon-paragraph {
+ background-position: -140px 0;
+}
+
+.edui-btn-toolbar .edui-btn .edui-icon-fontfamily {
+ background-position: -140px 0;
+}
+
+.edui-btn-toolbar .edui-btn .edui-icon-fontsize {
+ background-position: -140px 0;
+}
+
+.edui-btn-toolbar .edui-btn .edui-icon-justifyleft {
+ background-position: -460px 0;
+}
+
+.edui-btn-toolbar .edui-btn .edui-icon-justifycenter {
+ background-position: -420px 0;
+}
+
+.edui-btn-toolbar .edui-btn .edui-icon-justifyright {
+ background-position:-480px 0;
+}
+
+.edui-btn-toolbar .edui-btn .edui-icon-justifyjustify {
+ background-position: -440px 0;
+}
+
+.edui-btn-toolbar .edui-btn .edui-icon-link {
+ background-position: -500px 0;
+}
+
+.edui-btn-toolbar .edui-btn .edui-icon-unlink {
+ background-position: -640px 0;
+}
+
+.edui-btn-toolbar .edui-btn .edui-icon-image {
+ background-position: -380px 0;
+}
+
+.edui-btn-toolbar .edui-btn .edui-icon-emotion {
+ background-position: -60px -20px;
+}
+.edui-btn-toolbar .edui-btn .edui-icon-video {
+ background-position: -320px -20px;
+}
+
+.edui-btn-toolbar .edui-btn .edui-icon-map {
+ background-position: -40px -40px;
+}
+
+.edui-btn-toolbar .edui-btn .edui-icon-gmap {
+ background-position: -260px -40px;
+}
+.edui-btn-toolbar .edui-btn .edui-icon-horizontal {
+ background-position: -360px 0;
+}
+
+.edui-btn-toolbar .edui-btn .edui-icon-print {
+ background-position: -440px -20px;
+}
+.edui-btn-toolbar .edui-btn .edui-icon-preview {
+ background-position: -420px -20px;
+}
+
+.edui-btn-toolbar .edui-btn-fullscreen{
+ float:right;
+}
+.edui-btn-toolbar .edui-btn .edui-icon-fullscreen {
+ background-position: -100px -20px;
+}
+
+.edui-btn-toolbar .edui-btn .edui-icon-removeformat {
+ background-position: -580px 0;
+}
+.edui-btn-toolbar .edui-btn .edui-icon-drafts {
+ background-position: -560px 0;
+}
+.edui-btn-toolbar .edui-btn .edui-icon-formula {
+ background-position: -80px -20px;
+}
+.edui-btn-toolbar .edui-splitbutton{
+ position: relative;
+ display: inline-block ;
+ vertical-align: top;
+ *display: inline ;
+ *zoom:1;
+ margin:0 2px;
+}
+.edui-splitbutton .edui-btn{
+ margin: 0;
+}
+.edui-splitbutton .edui-caret{
+ position: relative;
+ display: inline-block ;
+ vertical-align: top;
+ *display: inline ;
+ *zoom:1;
+ width: 8px;
+ height: 20px;
+ background: url(../images/icons.png) -741px 0;
+ _background: url(../images/icons.gif) -741px 0;
+}
+
+.edui-btn-toolbar .edui-splitbutton,
+.edui-btn-toolbar .edui-splitbutton{
+ _border: none;
+}
+
+/*状态反射*/
+.edui-btn-toolbar .edui-splitbutton.edui-hover .edui-btn{
+ background-color: #d5e1f2;
+}
+
+.edui-btn-toolbar .edui-splitbutton.edui-disabled{
+ opacity: 0.3;
+ filter: alpha(opacity = 30);
+}
+.edui-btn-toolbar .edui-splitbutton.edui-disabled .edui-caret{
+ opacity: 0.3 \0;
+ filter: alpha(opacity = 30)\0;
+}
+
+
+.edui-btn-toolbar .edui-combobox{
+ border: 1px solid #CCC;
+ padding:0;
+ margin:0 2px;
+ line-height: 20px;
+}
+.edui-combobox .edui-button-label{
+ position: relative;
+ display: inline-block;
+ vertical-align: top;
+ *display: inline ;
+ *zoom:1;
+ width:60px;
+ height:20px;
+ line-height: 20px;
+ padding: 2px;
+ margin: 0;
+ font-size: 12px;
+ text-align: center;
+ cursor: default;
+}
+.edui-combobox .edui-button-spacing{
+ position: relative;
+ display: inline-block ;
+ vertical-align: top;
+ *display: inline ;
+ *zoom:1;
+ height:20px;
+ margin: 0;
+ padding:0 3px;
+}
+.edui-combobox .edui-caret{
+ position: relative;
+ display: inline-block ;
+ vertical-align: top;
+ *display: inline ;
+ *zoom:1;
+ height:20px;
+ width: 12px;
+ margin: 0;
+ padding: 0;
+ background: url(../images/icons.png) -741px 0;
+ _background: url(../images/icons.gif) -741px 0;
+}
+.edui-btn-toolbar .edui-combobox.edui-disabled{
+ opacity: 0.2;
+ filter: alpha(opacity = 20);
+}
+.edui-btn-toolbar .edui-combobox.edui-disabled .edui-button-label,
+.edui-btn-toolbar .edui-combobox.edui-disabled .edui-caret{
+ opacity: 0.2 \0;
+ filter: alpha(opacity = 20)\0;
+}
+.edui-combobox-menu{
+ position: absolute;
+ top: 100%;
+ left: 0;
+ display: none;
+ list-style: none;
+ text-decoration: none;
+ margin: 0;
+ padding:5px;
+ background-color: #ffffff;
+ border: 1px solid #ccc;
+ font-size: 12px;
+ box-shadow: 2px 2px 5px #d3d6da;
+ min-width: 160px;
+ _width: 160px;
+}
+
+.edui-combobox-menu .edui-combobox-item {
+ display: block;
+ border: 1px solid white;
+}
+
+.edui-combobox-menu .edui-combobox-item-label {
+ height: 25px;
+ line-height: 25px;
+ display: inline-block;
+ _display: inline;
+ _zoom: 1;
+ margin-left: 10px;
+}
+
+.edui-combobox-menu .edui-combobox-item:hover, .edui-combobox-menu .edui-combobox-stack-item:hover, .edui-combobox-menu .edui-combobox-item-hover {
+ background-color: #d5e1f2;
+ padding: 0;
+ border: 1px solid #a3bde3;
+}
+
+.edui-combobox-menu .edui-combobox-item .edui-combobox-icon {
+ display: inline-block;
+ *zoom: 1;
+ *display: inline;
+ width: 24px;
+ height: 25px;
+ background: red;
+ vertical-align: bottom;
+ background: url(../images/ok.gif) no-repeat 1000px 1000px;
+}
+
+.edui-combobox-menu .edui-combobox-checked .edui-combobox-icon {
+ background-position: 10px 7px;
+}
+
+
+.edui-combobox-menu .edui-combobox-item-separator {
+ min-width: 160px;
+ height: 1px;
+ line-height: 1px;
+ overflow: hidden;
+ background: #d3d3d3;
+ margin: 5px 0;
+ *margin-top: -8px;
+}
+
+/* 字体样式校正 */
+
+.edui-combobox-fontsize .edui-combobox-item-0.edui-combobox-checked .edui-combobox-icon {
+ background-position: 10px 7px;
+}
+
+.edui-combobox-fontsize .edui-combobox-item-1.edui-combobox-checked .edui-combobox-icon {
+ background-position: 10px 7px;
+}
+
+.edui-combobox-fontsize .edui-combobox-item-2.edui-combobox-checked .edui-combobox-icon {
+ background-position: 10px 7px;
+}
+
+.edui-combobox-fontsize .edui-combobox-item-3.edui-combobox-checked .edui-combobox-icon {
+ background-position: 10px 7px;
+}
+
+/* 24 */
+.edui-combobox-fontsize .edui-combobox-item-4 .edui-combobox-item-label {
+ height: 27px;
+ line-height: 27px;
+}
+
+.edui-combobox-fontsize .edui-combobox-item-4.edui-combobox-checked .edui-combobox-icon {
+ background-position: 10px 5px;
+}
+
+/* 32 */
+.edui-combobox-fontsize .edui-combobox-item-5 .edui-combobox-item-label {
+ height: 31px;
+ line-height: 31px;
+}
+
+.edui-combobox-fontsize .edui-combobox-item-5.edui-combobox-checked .edui-combobox-icon {
+ background-position: 10px 4px;
+}
+
+
+/* 48 */
+.edui-combobox-fontsize .edui-combobox-item-6 .edui-combobox-item-label {
+ height: 47px;
+ line-height: 47px;
+}
+
+/*.edui-combobox-fontsize .edui-combobox-item-6 .edui-combobox-icon {*/
+ /*height: 25px;*/
+ /*margin-bottom: 11px;*/
+/*}*/
+
+/*.edui-combobox-fontsize .edui-combobox-item-6.edui-combobox-checked .edui-combobox-icon {*/
+ /*background-position: 10px 7px;*/
+/*}*/
+
+
+/* 段落样式校正 */
+/* h1 */
+.edui-combobox-paragraph .edui-combobox-item-1 .edui-combobox-item-label {
+ font-size: 32px;
+ height: 36px;
+ line-height: 36px;
+}
+
+.edui-combobox-paragraph .edui-combobox-item-1 .edui-combobox-icon {
+ height: 25px;
+ margin-bottom: 5px;
+}
+
+.edui-combobox-paragraph .edui-combobox-item-1.edui-combobox-checked .edui-combobox-icon {
+ background-position: 10px 7px;
+}
+
+/* h2 */
+.edui-combobox-paragraph .edui-combobox-item-2 .edui-combobox-item-label {
+ font-size: 28px;
+ height: 27px;
+ line-height: 27px;
+}
+
+.edui-combobox-paragraph .edui-combobox-item-2 .edui-combobox-icon {
+ margin-bottom: 5px;
+}
+
+.edui-combobox-paragraph .edui-combobox-item-2.edui-combobox-checked .edui-combobox-icon {
+ background-position: 10px 10px;
+}
+
+/* h3 */
+.edui-combobox-paragraph .edui-combobox-item-3 .edui-combobox-item-label {
+ font-size: 24px;
+ height: 25px;
+ line-height: 25px;
+}
+
+.edui-combobox-paragraph .edui-combobox-item-3 .edui-combobox-icon {
+ height: 25px;
+ margin-bottom: 5px;
+}
+
+.edui-combobox-paragraph .edui-combobox-item-3.edui-combobox-checked .edui-combobox-icon {
+ background-position: 10px 11px;
+}
+
+/* h4 */
+.edui-combobox-paragraph .edui-combobox-item-4 .edui-combobox-item-label {
+ font-size: 18px;
+ height: 25px;
+ line-height: 25px;
+}
+
+.edui-combobox-paragraph .edui-combobox-item-4.edui-combobox-checked .edui-combobox-icon {
+ background-position: 10px 6px;
+}
+
+/* h5 */
+.edui-combobox-paragraph .edui-combobox-item-5 .edui-combobox-item-label {
+ font-size: 16px;
+}
+
+/* h6 */
+.edui-combobox-paragraph .edui-combobox-item-6 .edui-combobox-item-label {
+ font-size: 12px;
+}
+.edui-modal {
+ position: fixed;
+ _position: absolute;
+ top: 10%;
+ left: 50%;
+ border: 1px solid #acacac;
+ box-shadow: 2px 2px 5px #d3d6da;
+ background-color: #ffffff;
+ outline: 0;
+ /*新加*/
+ width:60%;
+ height:67%;
+ margin:auto;
+}
+.edui-modal-header {
+ padding: 5px 10px;
+ border-bottom: 1px solid #eee;
+}
+.edui-modal-header .edui-close {
+ float: right;
+ width:20px;
+ height:20px;
+ margin-top: 2px;
+ padding: 1px;
+ border: 0;
+ background: url("../images/close.png") no-repeat center center;
+ cursor: pointer;
+}
+.edui-modal-header .edui-close.edui-hover {
+ background-color: #d5e1f2;
+ padding:0;
+ border: 1px solid #a3bde3;
+}
+.edui-modal-header .edui-title {
+ margin: 0;
+ line-height: 25px;
+ font-size: 20px;
+}
+.edui-modal-body {
+ position: relative;
+ max-height: 400px;
+ font-size: 12px;
+ overflow-y: auto;
+}
+.edui-modal-footer {
+ float: right;
+ padding: 5px 15px 15px;
+ overflow: hidden;
+}
+.edui-modal-footer .edui-btn {
+ float: left;
+ height: 24px;
+ width: 96px;
+ margin: 0 10px;
+ background-color: #ffffff;
+ padding: 0;
+ border: 1px solid #ababab;
+ font-size: 12px;
+ line-height: 24px;
+ text-align: center;
+ cursor: pointer;
+}
+.edui-modal-footer .edui-btn.edui-hover{
+ background-color: #d5e1f2;
+ border: 1px solid #a3bde3;
+}
+.edui-modal-backdrop{
+ opacity: 0.5;
+ filter: alpha(opacity=50);
+ position: fixed;
+ top: 0;
+ right: 0;
+ bottom: 0;
+ left: 0;
+ background-color: #c6c6c6;
+}
+
+.edui-modal .edui-modal-tip {
+ color: red;
+ position: absolute;
+ bottom: 10px;
+ left: 10px;
+ height: 30px;
+ line-height: 30px;
+ display: none;
+}
+/*图片上传*/
+.edui-dialog-image-body {
+ width: 700px;
+ height: 400px;
+}
+/*插入视频*/
+.edui-dialog-video-body{
+ width: 600px;
+ height: 350px;
+}
+/*谷歌地图*/
+.edui-dialog-gmap-body{
+ width:550px;
+ height: 400px;
+}
+
+/*百度地图*/
+.edui-dialog-map-body{
+ width:580px;
+ height: 400px;
+}
+
+/*链接*/
+.edui-dialog-link-body{
+ width:400px;
+ height:200px;
+}
+.edui-popup{
+ display: none;
+ background: url('../images/pop-bg.png') repeat #fff;
+ padding: 2px;
+}
+.edui-popup .edui-popup-body{
+ border: 1px solid #bfbfbf;
+ background-color: #fff;
+}
+.edui-popup .edui-popup-caret{
+ width: 21px;
+ height: 11px;
+}
+.edui-popup .edui-popup-caret.up{
+ background:url('../images/caret.png') no-repeat 0 0;
+}
+.edui-popup .edui-popup-caret.down{
+ background:url('../images/caret.png') no-repeat 0 0;
+}
+
+
+.edui-tab-nav {
+ margin: 0;
+ padding:0;
+ border-bottom: 1px solid #ddd;
+ list-style: none;
+ height:30px;
+}
+.edui-tab-nav .edui-tab-item {
+ float:left;
+ margin-bottom: -1px;
+ margin-top: 1px;
+ margin-top: 0\9;
+}
+.edui-tab-nav .edui-tab-item .edui-tab-text{
+ display: block;
+ padding:8px 12px;
+ border: 1px solid transparent;
+ color: #0088cc;
+ text-decoration: none;
+ outline: 0;
+ _border:1px solid #fff ;
+ cursor: pointer;
+}
+.edui-tab-nav .edui-tab-item .edui-tab-text:FOCUS {
+ outline: none;
+}
+.edui-tab-nav .edui-tab-item.edui-active .edui-tab-text{
+ border: 1px solid #ddd;
+ border-bottom-color: transparent;
+ background-color: #fff;
+ padding:8px 12px;
+ color: #555555;
+ cursor: default;
+}
+.edui-tab-content .edui-tab-pane{
+ padding: 1px;
+ position: relative;
+ display: none;
+ background-color: #fff;
+ clear: both;
+}
+.edui-tab-content .edui-tab-pane.edui-active{
+ display: block;
+}
+
+
+.edui-btn-toolbar .edui-tooltip{
+ position: absolute;
+ padding: 5px 0;
+ display: none;
+ /*opacity: 0.8;*/
+ /*filter: alpha(opacity=80);*/
+ z-index: 99999;
+}
+.edui-tooltip .edui-tooltip-arrow{
+ position: absolute;
+ top: 0;
+ _top: -2px;
+ left: 50%;
+ width: 0;
+ height: 0;
+ padding: 0;
+ font-size:0;
+ margin-left: -5px;
+ border-color: transparent;
+ border-style: dashed dashed solid dashed;
+ border-bottom-color: #000000;
+ border-width: 0 5px 5px;
+ background: transparent;
+}
+.edui-tooltip .edui-tooltip-inner{
+ padding: 6px;
+ color: #ffffff;
+ text-align: center;
+ text-decoration: none;
+ font-size: 10px;
+ background-color: #000000;
+ white-space: nowrap;
+ line-height: 12px;
+}
+.edui-splitbutton-color-label {
+ width: 16px;
+ height: 3px;
+ position: absolute;
+ bottom: 2px;
+ left: 50%;
+ margin-left: -8px;
+ overflow: hidden;
+ line-height: 3px;
+}
+.edui-popup .edui-colorpicker {
+ margin: 10px;
+ font-size: 12px;
+}
+.edui-colorpicker .edui-colorpicker-topbar{
+ height: 27px;
+ width: 200px;
+ overflow: hidden;
+}
+.edui-colorpicker .edui-colorpicker-topbar .edui-colorpicker-preview{
+ height: 20px;
+ border: 1px inset black;
+ margin-left: 1px;
+ width: 128px;
+ float: left;
+}
+.edui-colorpicker .edui-colorpicker-topbar .edui-colorpicker-nocolor{
+ float: right;
+ margin-right: 1px;
+ font-size: 12px;
+ line-height: 14px;
+ height: 14px;
+ border: 1px solid #333;
+ padding: 3px 5px;
+ cursor: pointer;
+}
+.edui-colorpicker table{
+ border-collapse: collapse;
+ border-spacing: 2px;
+}
+.edui-colorpicker tr.edui-colorpicker-firstrow{
+ height: 30px;
+}
+.edui-colorpicker table td{
+ padding: 0 2px;
+}
+.edui-colorpicker table td .edui-colorpicker-colorcell{
+ display: block;
+ text-decoration: none;
+ color: black;
+ width: 14px;
+ height: 14px;
+ margin: 0;
+ cursor: pointer;
+}
+.edui-toolbar .edui-separator{
+ width: 2px;
+ height: 20px;
+ padding: 1px 2px;
+ background: url(../images/icons.png) -179px 1px;
+ background: url(../images/icons.gif) -179px 1px \9;
+ display: inline-block ;
+ vertical-align: top;
+ *display: inline ;
+ *zoom:1;
+ border:none;
+
+}
\ No newline at end of file
diff --git a/management/guns-admin/src/main/webapp/static/js/plugins/umeditor/themes/default/css/umeditor.min.css b/management/guns-admin/src/main/webapp/static/js/plugins/umeditor/themes/default/css/umeditor.min.css
new file mode 100644
index 0000000..cb7eb5f
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/static/js/plugins/umeditor/themes/default/css/umeditor.min.css
@@ -0,0 +1,8 @@
+/*!
+ * UEditor Mini版本
+ * version: 1.2.2
+ * build: Thu Dec 22 2016 16:36:28 GMT+0800 (CST)
+ */
+
+
+.edui-container{position:relative;border:1px solid #d4d4d4;box-shadow:2px 2px 5px #d3d6da;background-color:#fff}.edui-container .edui-toolbar{position:relative;width:auto;border-bottom:1px solid #e1e1e1;box-shadow:2px 2px 5px #d3d6da;background-color:#fafafa;z-index:99999}.edui-toolbar .edui-btn-toolbar{position:relative;padding:5px}.edui-container .edui-editor-body{background-color:#fff}.edui-editor-body .edui-body-container{}.edui-editor-body .edui-body-container p{margin:5px 0}.edui-editor-body .edui-body-container{border:0;outline:0;cursor:text;padding:0 10px;overflow:auto;display:block;word-wrap:break-word;font-size:16px;font-family:sans-serif}.edui-editor-body.focus{border:1px solid #5c9dff}.edui-editor-body table{margin:10px 0;border-collapse:collapse;display:table}.edui-editor-body td{padding:5px 10px;border:1px solid #DDD}.edui-editor-body iframe.mathquill-embedded-latex{border:0;padding:0;display:inline;margin:0;background:0 0;vertical-align:middle;width:0;height:0}.edui-btn-toolbar .edui-btn{position:relative;display:inline-block;vertical-align:top;*display:inline;*zoom:1;width:auto;margin:0 1px;padding:1px;border:0;background:0 0}.edui-btn-toolbar .edui-btn .edui-icon{width:20px;height:20px;margin:0;padding:0;background-repeat:no-repeat;background-image:url(../images/icons.png);background-image:url(../images/icons.gif) \9}.edui-btn-toolbar .edui-btn.edui-hover,.edui-btn-toolbar .edui-btn.edui-active{background-color:#d5e1f2;padding:0;border:1px solid #a3bde3;_z-index:1}.edui-btn-toolbar .edui-btn.edui-disabled{opacity:.3;filter:alpha(opacity=30)}.edui-btn-toolbar .edui-btn .edui-icon-source{background-position:-260px -0px}.edui-btn-toolbar .edui-btn .edui-icon-undo{background-position:-160px 0}.edui-btn-toolbar .edui-btn .edui-icon-redo{background-position:-100px 0}.edui-btn-toolbar .edui-btn .edui-icon-bold{background-position:0 0}.edui-btn-toolbar .edui-btn .edui-icon-italic{background-position:-60px 0}.edui-btn-toolbar .edui-btn .edui-icon-underline{background-position:-140px 0}.edui-btn-toolbar .edui-btn .edui-icon-strikethrough{background-position:-120px 0}.edui-btn-toolbar .edui-btn .edui-icon-superscript{background-position:-620px 0}.edui-btn-toolbar .edui-btn .edui-icon-subscript{background-position:-600px 0}.edui-btn-toolbar .edui-btn .edui-icon-font,.edui-btn-toolbar .edui-btn .edui-icon-forecolor{background-position:-720px 0}.edui-btn-toolbar .edui-btn .edui-icon-backcolor{background-position:-760px 0}.edui-btn-toolbar .edui-btn .edui-icon-insertorderedlist{background-position:-80px 0}.edui-btn-toolbar .edui-btn .edui-icon-insertunorderedlist{background-position:-20px 0}.edui-btn-toolbar .edui-btn .edui-icon-selectall{background-position:-400px -20px}.edui-btn-toolbar .edui-btn .edui-icon-cleardoc{background-position:-520px 0}.edui-btn-toolbar .edui-btn .edui-icon-paragraph{background-position:-140px 0}.edui-btn-toolbar .edui-btn .edui-icon-fontfamily{background-position:-140px 0}.edui-btn-toolbar .edui-btn .edui-icon-fontsize{background-position:-140px 0}.edui-btn-toolbar .edui-btn .edui-icon-justifyleft{background-position:-460px 0}.edui-btn-toolbar .edui-btn .edui-icon-justifycenter{background-position:-420px 0}.edui-btn-toolbar .edui-btn .edui-icon-justifyright{background-position:-480px 0}.edui-btn-toolbar .edui-btn .edui-icon-justifyjustify{background-position:-440px 0}.edui-btn-toolbar .edui-btn .edui-icon-link{background-position:-500px 0}.edui-btn-toolbar .edui-btn .edui-icon-unlink{background-position:-640px 0}.edui-btn-toolbar .edui-btn .edui-icon-image{background-position:-380px 0}.edui-btn-toolbar .edui-btn .edui-icon-emotion{background-position:-60px -20px}.edui-btn-toolbar .edui-btn .edui-icon-video{background-position:-320px -20px}.edui-btn-toolbar .edui-btn .edui-icon-map{background-position:-40px -40px}.edui-btn-toolbar .edui-btn .edui-icon-gmap{background-position:-260px -40px}.edui-btn-toolbar .edui-btn .edui-icon-horizontal{background-position:-360px 0}.edui-btn-toolbar .edui-btn .edui-icon-print{background-position:-440px -20px}.edui-btn-toolbar .edui-btn .edui-icon-preview{background-position:-420px -20px}.edui-btn-toolbar .edui-btn-fullscreen{float:right}.edui-btn-toolbar .edui-btn .edui-icon-fullscreen{background-position:-100px -20px}.edui-btn-toolbar .edui-btn .edui-icon-removeformat{background-position:-580px 0}.edui-btn-toolbar .edui-btn .edui-icon-drafts{background-position:-560px 0}.edui-btn-toolbar .edui-btn .edui-icon-formula{background-position:-80px -20px}.edui-btn-toolbar .edui-splitbutton{position:relative;display:inline-block;vertical-align:top;*display:inline;*zoom:1;margin:0 2px}.edui-splitbutton .edui-btn{margin:0}.edui-splitbutton .edui-caret{position:relative;display:inline-block;vertical-align:top;*display:inline;*zoom:1;width:8px;height:20px;background:url(../images/icons.png) -741px 0;_background:url(../images/icons.gif) -741px 0}.edui-btn-toolbar .edui-splitbutton,.edui-btn-toolbar .edui-splitbutton{_border:0}.edui-btn-toolbar .edui-splitbutton.edui-hover .edui-btn{background-color:#d5e1f2}.edui-btn-toolbar .edui-splitbutton.edui-disabled{opacity:.3;filter:alpha(opacity=30)}.edui-btn-toolbar .edui-splitbutton.edui-disabled .edui-caret{opacity:.3 \0;filter:alpha(opacity=30)\0}.edui-btn-toolbar .edui-combobox{border:1px solid #CCC;padding:0;margin:0 2px;line-height:20px}.edui-combobox .edui-button-label{position:relative;display:inline-block;vertical-align:top;*display:inline;*zoom:1;width:60px;height:20px;line-height:20px;padding:2px;margin:0;font-size:12px;text-align:center;cursor:default}.edui-combobox .edui-button-spacing{position:relative;display:inline-block;vertical-align:top;*display:inline;*zoom:1;height:20px;margin:0;padding:0 3px}.edui-combobox .edui-caret{position:relative;display:inline-block;vertical-align:top;*display:inline;*zoom:1;height:20px;width:12px;margin:0;padding:0;background:url(../images/icons.png) -741px 0;_background:url(../images/icons.gif) -741px 0}.edui-btn-toolbar .edui-combobox.edui-disabled{opacity:.2;filter:alpha(opacity=20)}.edui-btn-toolbar .edui-combobox.edui-disabled .edui-button-label,.edui-btn-toolbar .edui-combobox.edui-disabled .edui-caret{opacity:.2 \0;filter:alpha(opacity=20)\0}.edui-combobox-menu{position:absolute;top:100%;left:0;display:none;list-style:none;text-decoration:none;margin:0;padding:5px;background-color:#fff;border:1px solid #ccc;font-size:12px;box-shadow:2px 2px 5px #d3d6da;min-width:160px;_width:160px}.edui-combobox-menu .edui-combobox-item{display:block;border:1px solid #fff}.edui-combobox-menu .edui-combobox-item-label{height:25px;line-height:25px;display:inline-block;_display:inline;_zoom:1;margin-left:10px}.edui-combobox-menu .edui-combobox-item:hover,.edui-combobox-menu .edui-combobox-stack-item:hover,.edui-combobox-menu .edui-combobox-item-hover{background-color:#d5e1f2;padding:0;border:1px solid #a3bde3}.edui-combobox-menu .edui-combobox-item .edui-combobox-icon{display:inline-block;*zoom:1;*display:inline;width:24px;height:25px;background:red;vertical-align:bottom;background:url(../images/ok.gif) no-repeat 1000px 1000px}.edui-combobox-menu .edui-combobox-checked .edui-combobox-icon{background-position:10px 7px}.edui-combobox-menu .edui-combobox-item-separator{min-width:160px;height:1px;line-height:1px;overflow:hidden;background:#d3d3d3;margin:5px 0;*margin-top:-8px}.edui-combobox-fontsize .edui-combobox-item-0.edui-combobox-checked .edui-combobox-icon{background-position:10px 7px}.edui-combobox-fontsize .edui-combobox-item-1.edui-combobox-checked .edui-combobox-icon{background-position:10px 7px}.edui-combobox-fontsize .edui-combobox-item-2.edui-combobox-checked .edui-combobox-icon{background-position:10px 7px}.edui-combobox-fontsize .edui-combobox-item-3.edui-combobox-checked .edui-combobox-icon{background-position:10px 7px}.edui-combobox-fontsize .edui-combobox-item-4 .edui-combobox-item-label{height:27px;line-height:27px}.edui-combobox-fontsize .edui-combobox-item-4.edui-combobox-checked .edui-combobox-icon{background-position:10px 5px}.edui-combobox-fontsize .edui-combobox-item-5 .edui-combobox-item-label{height:31px;line-height:31px}.edui-combobox-fontsize .edui-combobox-item-5.edui-combobox-checked .edui-combobox-icon{background-position:10px 4px}.edui-combobox-fontsize .edui-combobox-item-6 .edui-combobox-item-label{height:47px;line-height:47px}.edui-combobox-paragraph .edui-combobox-item-1 .edui-combobox-item-label{font-size:32px;height:36px;line-height:36px}.edui-combobox-paragraph .edui-combobox-item-1 .edui-combobox-icon{height:25px;margin-bottom:5px}.edui-combobox-paragraph .edui-combobox-item-1.edui-combobox-checked .edui-combobox-icon{background-position:10px 7px}.edui-combobox-paragraph .edui-combobox-item-2 .edui-combobox-item-label{font-size:28px;height:27px;line-height:27px}.edui-combobox-paragraph .edui-combobox-item-2 .edui-combobox-icon{margin-bottom:5px}.edui-combobox-paragraph .edui-combobox-item-2.edui-combobox-checked .edui-combobox-icon{background-position:10px 10px}.edui-combobox-paragraph .edui-combobox-item-3 .edui-combobox-item-label{font-size:24px;height:25px;line-height:25px}.edui-combobox-paragraph .edui-combobox-item-3 .edui-combobox-icon{height:25px;margin-bottom:5px}.edui-combobox-paragraph .edui-combobox-item-3.edui-combobox-checked .edui-combobox-icon{background-position:10px 11px}.edui-combobox-paragraph .edui-combobox-item-4 .edui-combobox-item-label{font-size:18px;height:25px;line-height:25px}.edui-combobox-paragraph .edui-combobox-item-4.edui-combobox-checked .edui-combobox-icon{background-position:10px 6px}.edui-combobox-paragraph .edui-combobox-item-5 .edui-combobox-item-label{font-size:16px}.edui-combobox-paragraph .edui-combobox-item-6 .edui-combobox-item-label{font-size:12px}.edui-modal{position:fixed;_position:absolute;top:10%;left:50%;border:1px solid #acacac;box-shadow:2px 2px 5px #d3d6da;background-color:#fff;outline:0}.edui-modal-header{padding:5px 10px;border-bottom:1px solid #eee}.edui-modal-header .edui-close{float:right;width:20px;height:20px;margin-top:2px;padding:1px;border:0;background:url(../images/close.png) no-repeat center center;cursor:pointer}.edui-modal-header .edui-close.edui-hover{background-color:#d5e1f2;padding:0;border:1px solid #a3bde3}.edui-modal-header .edui-title{margin:0;line-height:25px;font-size:20px}.edui-modal-body{position:relative;max-height:400px;font-size:12px;overflow-y:auto}.edui-modal-footer{float:right;padding:5px 15px 15px;overflow:hidden}.edui-modal-footer .edui-btn{float:left;height:24px;width:96px;margin:0 10px;background-color:#fff;padding:0;border:1px solid #ababab;font-size:12px;line-height:24px;text-align:center;cursor:pointer}.edui-modal-footer .edui-btn.edui-hover{background-color:#d5e1f2;border:1px solid #a3bde3}.edui-modal-backdrop{opacity:.5;filter:alpha(opacity=50);position:fixed;top:0;right:0;bottom:0;left:0;background-color:#c6c6c6}.edui-modal .edui-modal-tip{color:red;position:absolute;bottom:10px;left:10px;height:30px;line-height:30px;display:none}.edui-dialog-image-body{width:700px;height:400px}.edui-dialog-video-body{width:600px;height:350px}.edui-dialog-gmap-body{width:550px;height:400px}.edui-dialog-map-body{width:580px;height:400px}.edui-dialog-link-body{width:400px;height:200px}.edui-popup{display:none;background:url(../images/pop-bg.png) repeat #fff;padding:2px}.edui-popup .edui-popup-body{border:1px solid #bfbfbf;background-color:#fff}.edui-popup .edui-popup-caret{width:21px;height:11px}.edui-popup .edui-popup-caret.up{background:url(../images/caret.png) no-repeat 0 0}.edui-popup .edui-popup-caret.down{background:url(../images/caret.png) no-repeat 0 0}.edui-tab-nav{margin:0;padding:0;border-bottom:1px solid #ddd;list-style:none;height:30px}.edui-tab-nav .edui-tab-item{float:left;margin-bottom:-1px;margin-top:1px;margin-top:0\9}.edui-tab-nav .edui-tab-item .edui-tab-text{display:block;padding:8px 12px;border:1px solid transparent;color:#08c;text-decoration:none;outline:0;_border:1px solid #fff;cursor:pointer}.edui-tab-nav .edui-tab-item .edui-tab-text:FOCUS{outline:0}.edui-tab-nav .edui-tab-item.edui-active .edui-tab-text{border:1px solid #ddd;border-bottom-color:transparent;background-color:#fff;padding:8px 12px;color:#555;cursor:default}.edui-tab-content .edui-tab-pane{padding:1px;position:relative;display:none;background-color:#fff;clear:both}.edui-tab-content .edui-tab-pane.edui-active{display:block}.edui-btn-toolbar .edui-tooltip{position:absolute;padding:5px 0;display:none;z-index:99999}.edui-tooltip .edui-tooltip-arrow{position:absolute;top:0;_top:-2px;left:50%;width:0;height:0;padding:0;font-size:0;margin-left:-5px;border-color:transparent;border-style:dashed dashed solid;border-bottom-color:#000;border-width:0 5px 5px;background:transparent}.edui-tooltip .edui-tooltip-inner{padding:6px;color:#fff;text-align:center;text-decoration:none;font-size:10px;background-color:#000;white-space:nowrap;line-height:12px}.edui-splitbutton-color-label{width:16px;height:3px;position:absolute;bottom:2px;left:50%;margin-left:-8px;overflow:hidden;line-height:3px}.edui-popup .edui-colorpicker{margin:10px;font-size:12px}.edui-colorpicker .edui-colorpicker-topbar{height:27px;width:200px;overflow:hidden}.edui-colorpicker .edui-colorpicker-topbar .edui-colorpicker-preview{height:20px;border:1px inset #000;margin-left:1px;width:128px;float:left}.edui-colorpicker .edui-colorpicker-topbar .edui-colorpicker-nocolor{float:right;margin-right:1px;font-size:12px;line-height:14px;height:14px;border:1px solid #333;padding:3px 5px;cursor:pointer}.edui-colorpicker table{border-collapse:collapse;border-spacing:2px}.edui-colorpicker tr.edui-colorpicker-firstrow{height:30px}.edui-colorpicker table td{padding:0 2px}.edui-colorpicker table td .edui-colorpicker-colorcell{display:block;text-decoration:none;color:#000;width:14px;height:14px;margin:0;cursor:pointer}.edui-toolbar .edui-separator{width:2px;height:20px;padding:1px 2px;background:url(../images/icons.png) -179px 1px;background:url(../images/icons.gif) -179px 1px \9;display:inline-block;vertical-align:top;*display:inline;*zoom:1;border:0}
\ No newline at end of file
diff --git a/management/guns-admin/src/main/webapp/static/js/plugins/umeditor/themes/default/images/caret.png b/management/guns-admin/src/main/webapp/static/js/plugins/umeditor/themes/default/images/caret.png
new file mode 100644
index 0000000..cf06947
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/static/js/plugins/umeditor/themes/default/images/caret.png
Binary files differ
diff --git a/management/guns-admin/src/main/webapp/static/js/plugins/umeditor/themes/default/images/close.png b/management/guns-admin/src/main/webapp/static/js/plugins/umeditor/themes/default/images/close.png
new file mode 100644
index 0000000..a57693f
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/static/js/plugins/umeditor/themes/default/images/close.png
Binary files differ
diff --git a/management/guns-admin/src/main/webapp/static/js/plugins/umeditor/themes/default/images/icons.gif b/management/guns-admin/src/main/webapp/static/js/plugins/umeditor/themes/default/images/icons.gif
new file mode 100644
index 0000000..8206560
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/static/js/plugins/umeditor/themes/default/images/icons.gif
Binary files differ
diff --git a/management/guns-admin/src/main/webapp/static/js/plugins/umeditor/themes/default/images/icons.png b/management/guns-admin/src/main/webapp/static/js/plugins/umeditor/themes/default/images/icons.png
new file mode 100644
index 0000000..de9a1bb
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/static/js/plugins/umeditor/themes/default/images/icons.png
Binary files differ
diff --git a/management/guns-admin/src/main/webapp/static/js/plugins/umeditor/themes/default/images/ok.gif b/management/guns-admin/src/main/webapp/static/js/plugins/umeditor/themes/default/images/ok.gif
new file mode 100644
index 0000000..9d1362c
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/static/js/plugins/umeditor/themes/default/images/ok.gif
Binary files differ
diff --git a/management/guns-admin/src/main/webapp/static/js/plugins/umeditor/themes/default/images/pop-bg.png b/management/guns-admin/src/main/webapp/static/js/plugins/umeditor/themes/default/images/pop-bg.png
new file mode 100644
index 0000000..d7a5a30
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/static/js/plugins/umeditor/themes/default/images/pop-bg.png
Binary files differ
diff --git a/management/guns-admin/src/main/webapp/static/js/plugins/umeditor/themes/default/images/spacer.gif b/management/guns-admin/src/main/webapp/static/js/plugins/umeditor/themes/default/images/spacer.gif
new file mode 100644
index 0000000..5bfd67a
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/static/js/plugins/umeditor/themes/default/images/spacer.gif
Binary files differ
diff --git a/management/guns-admin/src/main/webapp/static/js/plugins/umeditor/themes/default/images/videologo.gif b/management/guns-admin/src/main/webapp/static/js/plugins/umeditor/themes/default/images/videologo.gif
new file mode 100644
index 0000000..555af74
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/static/js/plugins/umeditor/themes/default/images/videologo.gif
Binary files differ
diff --git a/management/guns-admin/src/main/webapp/static/js/plugins/umeditor/third-party/jquery.min.js b/management/guns-admin/src/main/webapp/static/js/plugins/umeditor/third-party/jquery.min.js
new file mode 100644
index 0000000..da41706
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/static/js/plugins/umeditor/third-party/jquery.min.js
@@ -0,0 +1,6 @@
+/*! jQuery v1.10.2 | (c) 2005, 2013 jQuery Foundation, Inc. | jquery.org/license
+//@ sourceMappingURL=jquery-1.10.2.min.map
+*/
+(function(e,t){var n,r,i=typeof t,o=e.location,a=e.document,s=a.documentElement,l=e.jQuery,u=e.$,c={},p=[],f="1.10.2",d=p.concat,h=p.push,g=p.slice,m=p.indexOf,y=c.toString,v=c.hasOwnProperty,b=f.trim,x=function(e,t){return new x.fn.init(e,t,r)},w=/[+-]?(?:\d*\.|)\d+(?:[eE][+-]?\d+|)/.source,T=/\S+/g,C=/^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g,N=/^(?:\s*(<[\w\W]+>)[^>]*|#([\w-]*))$/,k=/^<(\w+)\s*\/?>(?:<\/\1>|)$/,E=/^[\],:{}\s]*$/,S=/(?:^|:|,)(?:\s*\[)+/g,A=/\\(?:["\\\/bfnrt]|u[\da-fA-F]{4})/g,j=/"[^"\\\r\n]*"|true|false|null|-?(?:\d+\.|)\d+(?:[eE][+-]?\d+|)/g,D=/^-ms-/,L=/-([\da-z])/gi,H=function(e,t){return t.toUpperCase()},q=function(e){(a.addEventListener||"load"===e.type||"complete"===a.readyState)&&(_(),x.ready())},_=function(){a.addEventListener?(a.removeEventListener("DOMContentLoaded",q,!1),e.removeEventListener("load",q,!1)):(a.detachEvent("onreadystatechange",q),e.detachEvent("onload",q))};x.fn=x.prototype={jquery:f,constructor:x,init:function(e,n,r){var i,o;if(!e)return this;if("string"==typeof e){if(i="<"===e.charAt(0)&&">"===e.charAt(e.length-1)&&e.length>=3?[null,e,null]:N.exec(e),!i||!i[1]&&n)return!n||n.jquery?(n||r).find(e):this.constructor(n).find(e);if(i[1]){if(n=n instanceof x?n[0]:n,x.merge(this,x.parseHTML(i[1],n&&n.nodeType?n.ownerDocument||n:a,!0)),k.test(i[1])&&x.isPlainObject(n))for(i in n)x.isFunction(this[i])?this[i](n[i]):this.attr(i,n[i]);return this}if(o=a.getElementById(i[2]),o&&o.parentNode){if(o.id!==i[2])return r.find(e);this.length=1,this[0]=o}return this.context=a,this.selector=e,this}return e.nodeType?(this.context=this[0]=e,this.length=1,this):x.isFunction(e)?r.ready(e):(e.selector!==t&&(this.selector=e.selector,this.context=e.context),x.makeArray(e,this))},selector:"",length:0,toArray:function(){return g.call(this)},get:function(e){return null==e?this.toArray():0>e?this[this.length+e]:this[e]},pushStack:function(e){var t=x.merge(this.constructor(),e);return t.prevObject=this,t.context=this.context,t},each:function(e,t){return x.each(this,e,t)},ready:function(e){return x.ready.promise().done(e),this},slice:function(){return this.pushStack(g.apply(this,arguments))},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},eq:function(e){var t=this.length,n=+e+(0>e?t:0);return this.pushStack(n>=0&&t>n?[this[n]]:[])},map:function(e){return this.pushStack(x.map(this,function(t,n){return e.call(t,n,t)}))},end:function(){return this.prevObject||this.constructor(null)},push:h,sort:[].sort,splice:[].splice},x.fn.init.prototype=x.fn,x.extend=x.fn.extend=function(){var e,n,r,i,o,a,s=arguments[0]||{},l=1,u=arguments.length,c=!1;for("boolean"==typeof s&&(c=s,s=arguments[1]||{},l=2),"object"==typeof s||x.isFunction(s)||(s={}),u===l&&(s=this,--l);u>l;l++)if(null!=(o=arguments[l]))for(i in o)e=s[i],r=o[i],s!==r&&(c&&r&&(x.isPlainObject(r)||(n=x.isArray(r)))?(n?(n=!1,a=e&&x.isArray(e)?e:[]):a=e&&x.isPlainObject(e)?e:{},s[i]=x.extend(c,a,r)):r!==t&&(s[i]=r));return s},x.extend({expando:"jQuery"+(f+Math.random()).replace(/\D/g,""),noConflict:function(t){return e.$===x&&(e.$=u),t&&e.jQuery===x&&(e.jQuery=l),x},isReady:!1,readyWait:1,holdReady:function(e){e?x.readyWait++:x.ready(!0)},ready:function(e){if(e===!0?!--x.readyWait:!x.isReady){if(!a.body)return setTimeout(x.ready);x.isReady=!0,e!==!0&&--x.readyWait>0||(n.resolveWith(a,[x]),x.fn.trigger&&x(a).trigger("ready").off("ready"))}},isFunction:function(e){return"function"===x.type(e)},isArray:Array.isArray||function(e){return"array"===x.type(e)},isWindow:function(e){return null!=e&&e==e.window},isNumeric:function(e){return!isNaN(parseFloat(e))&&isFinite(e)},type:function(e){return null==e?e+"":"object"==typeof e||"function"==typeof e?c[y.call(e)]||"object":typeof e},isPlainObject:function(e){var n;if(!e||"object"!==x.type(e)||e.nodeType||x.isWindow(e))return!1;try{if(e.constructor&&!v.call(e,"constructor")&&!v.call(e.constructor.prototype,"isPrototypeOf"))return!1}catch(r){return!1}if(x.support.ownLast)for(n in e)return v.call(e,n);for(n in e);return n===t||v.call(e,n)},isEmptyObject:function(e){var t;for(t in e)return!1;return!0},error:function(e){throw Error(e)},parseHTML:function(e,t,n){if(!e||"string"!=typeof e)return null;"boolean"==typeof t&&(n=t,t=!1),t=t||a;var r=k.exec(e),i=!n&&[];return r?[t.createElement(r[1])]:(r=x.buildFragment([e],t,i),i&&x(i).remove(),x.merge([],r.childNodes))},parseJSON:function(n){return e.JSON&&e.JSON.parse?e.JSON.parse(n):null===n?n:"string"==typeof n&&(n=x.trim(n),n&&E.test(n.replace(A,"@").replace(j,"]").replace(S,"")))?Function("return "+n)():(x.error("Invalid JSON: "+n),t)},parseXML:function(n){var r,i;if(!n||"string"!=typeof n)return null;try{e.DOMParser?(i=new DOMParser,r=i.parseFromString(n,"text/xml")):(r=new ActiveXObject("Microsoft.XMLDOM"),r.async="false",r.loadXML(n))}catch(o){r=t}return r&&r.documentElement&&!r.getElementsByTagName("parsererror").length||x.error("Invalid XML: "+n),r},noop:function(){},globalEval:function(t){t&&x.trim(t)&&(e.execScript||function(t){e.eval.call(e,t)})(t)},camelCase:function(e){return e.replace(D,"ms-").replace(L,H)},nodeName:function(e,t){return e.nodeName&&e.nodeName.toLowerCase()===t.toLowerCase()},each:function(e,t,n){var r,i=0,o=e.length,a=M(e);if(n){if(a){for(;o>i;i++)if(r=t.apply(e[i],n),r===!1)break}else for(i in e)if(r=t.apply(e[i],n),r===!1)break}else if(a){for(;o>i;i++)if(r=t.call(e[i],i,e[i]),r===!1)break}else for(i in e)if(r=t.call(e[i],i,e[i]),r===!1)break;return e},trim:b&&!b.call("\ufeff\u00a0")?function(e){return null==e?"":b.call(e)}:function(e){return null==e?"":(e+"").replace(C,"")},makeArray:function(e,t){var n=t||[];return null!=e&&(M(Object(e))?x.merge(n,"string"==typeof e?[e]:e):h.call(n,e)),n},inArray:function(e,t,n){var r;if(t){if(m)return m.call(t,e,n);for(r=t.length,n=n?0>n?Math.max(0,r+n):n:0;r>n;n++)if(n in t&&t[n]===e)return n}return-1},merge:function(e,n){var r=n.length,i=e.length,o=0;if("number"==typeof r)for(;r>o;o++)e[i++]=n[o];else while(n[o]!==t)e[i++]=n[o++];return e.length=i,e},grep:function(e,t,n){var r,i=[],o=0,a=e.length;for(n=!!n;a>o;o++)r=!!t(e[o],o),n!==r&&i.push(e[o]);return i},map:function(e,t,n){var r,i=0,o=e.length,a=M(e),s=[];if(a)for(;o>i;i++)r=t(e[i],i,n),null!=r&&(s[s.length]=r);else for(i in e)r=t(e[i],i,n),null!=r&&(s[s.length]=r);return d.apply([],s)},guid:1,proxy:function(e,n){var r,i,o;return"string"==typeof n&&(o=e[n],n=e,e=o),x.isFunction(e)?(r=g.call(arguments,2),i=function(){return e.apply(n||this,r.concat(g.call(arguments)))},i.guid=e.guid=e.guid||x.guid++,i):t},access:function(e,n,r,i,o,a,s){var l=0,u=e.length,c=null==r;if("object"===x.type(r)){o=!0;for(l in r)x.access(e,n,l,r[l],!0,a,s)}else if(i!==t&&(o=!0,x.isFunction(i)||(s=!0),c&&(s?(n.call(e,i),n=null):(c=n,n=function(e,t,n){return c.call(x(e),n)})),n))for(;u>l;l++)n(e[l],r,s?i:i.call(e[l],l,n(e[l],r)));return o?e:c?n.call(e):u?n(e[0],r):a},now:function(){return(new Date).getTime()},swap:function(e,t,n,r){var i,o,a={};for(o in t)a[o]=e.style[o],e.style[o]=t[o];i=n.apply(e,r||[]);for(o in t)e.style[o]=a[o];return i}}),x.ready.promise=function(t){if(!n)if(n=x.Deferred(),"complete"===a.readyState)setTimeout(x.ready);else if(a.addEventListener)a.addEventListener("DOMContentLoaded",q,!1),e.addEventListener("load",q,!1);else{a.attachEvent("onreadystatechange",q),e.attachEvent("onload",q);var r=!1;try{r=null==e.frameElement&&a.documentElement}catch(i){}r&&r.doScroll&&function o(){if(!x.isReady){try{r.doScroll("left")}catch(e){return setTimeout(o,50)}_(),x.ready()}}()}return n.promise(t)},x.each("Boolean Number String Function Array Date RegExp Object Error".split(" "),function(e,t){c["[object "+t+"]"]=t.toLowerCase()});function M(e){var t=e.length,n=x.type(e);return x.isWindow(e)?!1:1===e.nodeType&&t?!0:"array"===n||"function"!==n&&(0===t||"number"==typeof t&&t>0&&t-1 in e)}r=x(a),function(e,t){var n,r,i,o,a,s,l,u,c,p,f,d,h,g,m,y,v,b="sizzle"+-new Date,w=e.document,T=0,C=0,N=st(),k=st(),E=st(),S=!1,A=function(e,t){return e===t?(S=!0,0):0},j=typeof t,D=1<<31,L={}.hasOwnProperty,H=[],q=H.pop,_=H.push,M=H.push,O=H.slice,F=H.indexOf||function(e){var t=0,n=this.length;for(;n>t;t++)if(this[t]===e)return t;return-1},B="checked|selected|async|autofocus|autoplay|controls|defer|disabled|hidden|ismap|loop|multiple|open|readonly|required|scoped",P="[\\x20\\t\\r\\n\\f]",R="(?:\\\\.|[\\w-]|[^\\x00-\\xa0])+",W=R.replace("w","w#"),$="\\["+P+"*("+R+")"+P+"*(?:([*^$|!~]?=)"+P+"*(?:(['\"])((?:\\\\.|[^\\\\])*?)\\3|("+W+")|)|)"+P+"*\\]",I=":("+R+")(?:\\(((['\"])((?:\\\\.|[^\\\\])*?)\\3|((?:\\\\.|[^\\\\()[\\]]|"+$.replace(3,8)+")*)|.*)\\)|)",z=RegExp("^"+P+"+|((?:^|[^\\\\])(?:\\\\.)*)"+P+"+$","g"),X=RegExp("^"+P+"*,"+P+"*"),U=RegExp("^"+P+"*([>+~]|"+P+")"+P+"*"),V=RegExp(P+"*[+~]"),Y=RegExp("="+P+"*([^\\]'\"]*)"+P+"*\\]","g"),J=RegExp(I),G=RegExp("^"+W+"$"),Q={ID:RegExp("^#("+R+")"),CLASS:RegExp("^\\.("+R+")"),TAG:RegExp("^("+R.replace("w","w*")+")"),ATTR:RegExp("^"+$),PSEUDO:RegExp("^"+I),CHILD:RegExp("^:(only|first|last|nth|nth-last)-(child|of-type)(?:\\("+P+"*(even|odd|(([+-]|)(\\d*)n|)"+P+"*(?:([+-]|)"+P+"*(\\d+)|))"+P+"*\\)|)","i"),bool:RegExp("^(?:"+B+")$","i"),needsContext:RegExp("^"+P+"*[>+~]|:(even|odd|eq|gt|lt|nth|first|last)(?:\\("+P+"*((?:-\\d)?\\d*)"+P+"*\\)|)(?=[^-]|$)","i")},K=/^[^{]+\{\s*\[native \w/,Z=/^(?:#([\w-]+)|(\w+)|\.([\w-]+))$/,et=/^(?:input|select|textarea|button)$/i,tt=/^h\d$/i,nt=/'|\\/g,rt=RegExp("\\\\([\\da-f]{1,6}"+P+"?|("+P+")|.)","ig"),it=function(e,t,n){var r="0x"+t-65536;return r!==r||n?t:0>r?String.fromCharCode(r+65536):String.fromCharCode(55296|r>>10,56320|1023&r)};try{M.apply(H=O.call(w.childNodes),w.childNodes),H[w.childNodes.length].nodeType}catch(ot){M={apply:H.length?function(e,t){_.apply(e,O.call(t))}:function(e,t){var n=e.length,r=0;while(e[n++]=t[r++]);e.length=n-1}}}function at(e,t,n,i){var o,a,s,l,u,c,d,m,y,x;if((t?t.ownerDocument||t:w)!==f&&p(t),t=t||f,n=n||[],!e||"string"!=typeof e)return n;if(1!==(l=t.nodeType)&&9!==l)return[];if(h&&!i){if(o=Z.exec(e))if(s=o[1]){if(9===l){if(a=t.getElementById(s),!a||!a.parentNode)return n;if(a.id===s)return n.push(a),n}else if(t.ownerDocument&&(a=t.ownerDocument.getElementById(s))&&v(t,a)&&a.id===s)return n.push(a),n}else{if(o[2])return M.apply(n,t.getElementsByTagName(e)),n;if((s=o[3])&&r.getElementsByClassName&&t.getElementsByClassName)return M.apply(n,t.getElementsByClassName(s)),n}if(r.qsa&&(!g||!g.test(e))){if(m=d=b,y=t,x=9===l&&e,1===l&&"object"!==t.nodeName.toLowerCase()){c=mt(e),(d=t.getAttribute("id"))?m=d.replace(nt,"\\$&"):t.setAttribute("id",m),m="[id='"+m+"'] ",u=c.length;while(u--)c[u]=m+yt(c[u]);y=V.test(e)&&t.parentNode||t,x=c.join(",")}if(x)try{return M.apply(n,y.querySelectorAll(x)),n}catch(T){}finally{d||t.removeAttribute("id")}}}return kt(e.replace(z,"$1"),t,n,i)}function st(){var e=[];function t(n,r){return e.push(n+=" ")>o.cacheLength&&delete t[e.shift()],t[n]=r}return t}function lt(e){return e[b]=!0,e}function ut(e){var t=f.createElement("div");try{return!!e(t)}catch(n){return!1}finally{t.parentNode&&t.parentNode.removeChild(t),t=null}}function ct(e,t){var n=e.split("|"),r=e.length;while(r--)o.attrHandle[n[r]]=t}function pt(e,t){var n=t&&e,r=n&&1===e.nodeType&&1===t.nodeType&&(~t.sourceIndex||D)-(~e.sourceIndex||D);if(r)return r;if(n)while(n=n.nextSibling)if(n===t)return-1;return e?1:-1}function ft(e){return function(t){var n=t.nodeName.toLowerCase();return"input"===n&&t.type===e}}function dt(e){return function(t){var n=t.nodeName.toLowerCase();return("input"===n||"button"===n)&&t.type===e}}function ht(e){return lt(function(t){return t=+t,lt(function(n,r){var i,o=e([],n.length,t),a=o.length;while(a--)n[i=o[a]]&&(n[i]=!(r[i]=n[i]))})})}s=at.isXML=function(e){var t=e&&(e.ownerDocument||e).documentElement;return t?"HTML"!==t.nodeName:!1},r=at.support={},p=at.setDocument=function(e){var n=e?e.ownerDocument||e:w,i=n.defaultView;return n!==f&&9===n.nodeType&&n.documentElement?(f=n,d=n.documentElement,h=!s(n),i&&i.attachEvent&&i!==i.top&&i.attachEvent("onbeforeunload",function(){p()}),r.attributes=ut(function(e){return e.className="i",!e.getAttribute("className")}),r.getElementsByTagName=ut(function(e){return e.appendChild(n.createComment("")),!e.getElementsByTagName("*").length}),r.getElementsByClassName=ut(function(e){return e.innerHTML="<div class='a'></div><div class='a i'></div>",e.firstChild.className="i",2===e.getElementsByClassName("i").length}),r.getById=ut(function(e){return d.appendChild(e).id=b,!n.getElementsByName||!n.getElementsByName(b).length}),r.getById?(o.find.ID=function(e,t){if(typeof t.getElementById!==j&&h){var n=t.getElementById(e);return n&&n.parentNode?[n]:[]}},o.filter.ID=function(e){var t=e.replace(rt,it);return function(e){return e.getAttribute("id")===t}}):(delete o.find.ID,o.filter.ID=function(e){var t=e.replace(rt,it);return function(e){var n=typeof e.getAttributeNode!==j&&e.getAttributeNode("id");return n&&n.value===t}}),o.find.TAG=r.getElementsByTagName?function(e,n){return typeof n.getElementsByTagName!==j?n.getElementsByTagName(e):t}:function(e,t){var n,r=[],i=0,o=t.getElementsByTagName(e);if("*"===e){while(n=o[i++])1===n.nodeType&&r.push(n);return r}return o},o.find.CLASS=r.getElementsByClassName&&function(e,n){return typeof n.getElementsByClassName!==j&&h?n.getElementsByClassName(e):t},m=[],g=[],(r.qsa=K.test(n.querySelectorAll))&&(ut(function(e){e.innerHTML="<select><option selected=''></option></select>",e.querySelectorAll("[selected]").length||g.push("\\["+P+"*(?:value|"+B+")"),e.querySelectorAll(":checked").length||g.push(":checked")}),ut(function(e){var t=n.createElement("input");t.setAttribute("type","hidden"),e.appendChild(t).setAttribute("t",""),e.querySelectorAll("[t^='']").length&&g.push("[*^$]="+P+"*(?:''|\"\")"),e.querySelectorAll(":enabled").length||g.push(":enabled",":disabled"),e.querySelectorAll("*,:x"),g.push(",.*:")})),(r.matchesSelector=K.test(y=d.webkitMatchesSelector||d.mozMatchesSelector||d.oMatchesSelector||d.msMatchesSelector))&&ut(function(e){r.disconnectedMatch=y.call(e,"div"),y.call(e,"[s!='']:x"),m.push("!=",I)}),g=g.length&&RegExp(g.join("|")),m=m.length&&RegExp(m.join("|")),v=K.test(d.contains)||d.compareDocumentPosition?function(e,t){var n=9===e.nodeType?e.documentElement:e,r=t&&t.parentNode;return e===r||!(!r||1!==r.nodeType||!(n.contains?n.contains(r):e.compareDocumentPosition&&16&e.compareDocumentPosition(r)))}:function(e,t){if(t)while(t=t.parentNode)if(t===e)return!0;return!1},A=d.compareDocumentPosition?function(e,t){if(e===t)return S=!0,0;var i=t.compareDocumentPosition&&e.compareDocumentPosition&&e.compareDocumentPosition(t);return i?1&i||!r.sortDetached&&t.compareDocumentPosition(e)===i?e===n||v(w,e)?-1:t===n||v(w,t)?1:c?F.call(c,e)-F.call(c,t):0:4&i?-1:1:e.compareDocumentPosition?-1:1}:function(e,t){var r,i=0,o=e.parentNode,a=t.parentNode,s=[e],l=[t];if(e===t)return S=!0,0;if(!o||!a)return e===n?-1:t===n?1:o?-1:a?1:c?F.call(c,e)-F.call(c,t):0;if(o===a)return pt(e,t);r=e;while(r=r.parentNode)s.unshift(r);r=t;while(r=r.parentNode)l.unshift(r);while(s[i]===l[i])i++;return i?pt(s[i],l[i]):s[i]===w?-1:l[i]===w?1:0},n):f},at.matches=function(e,t){return at(e,null,null,t)},at.matchesSelector=function(e,t){if((e.ownerDocument||e)!==f&&p(e),t=t.replace(Y,"='$1']"),!(!r.matchesSelector||!h||m&&m.test(t)||g&&g.test(t)))try{var n=y.call(e,t);if(n||r.disconnectedMatch||e.document&&11!==e.document.nodeType)return n}catch(i){}return at(t,f,null,[e]).length>0},at.contains=function(e,t){return(e.ownerDocument||e)!==f&&p(e),v(e,t)},at.attr=function(e,n){(e.ownerDocument||e)!==f&&p(e);var i=o.attrHandle[n.toLowerCase()],a=i&&L.call(o.attrHandle,n.toLowerCase())?i(e,n,!h):t;return a===t?r.attributes||!h?e.getAttribute(n):(a=e.getAttributeNode(n))&&a.specified?a.value:null:a},at.error=function(e){throw Error("Syntax error, unrecognized expression: "+e)},at.uniqueSort=function(e){var t,n=[],i=0,o=0;if(S=!r.detectDuplicates,c=!r.sortStable&&e.slice(0),e.sort(A),S){while(t=e[o++])t===e[o]&&(i=n.push(o));while(i--)e.splice(n[i],1)}return e},a=at.getText=function(e){var t,n="",r=0,i=e.nodeType;if(i){if(1===i||9===i||11===i){if("string"==typeof e.textContent)return e.textContent;for(e=e.firstChild;e;e=e.nextSibling)n+=a(e)}else if(3===i||4===i)return e.nodeValue}else for(;t=e[r];r++)n+=a(t);return n},o=at.selectors={cacheLength:50,createPseudo:lt,match:Q,attrHandle:{},find:{},relative:{">":{dir:"parentNode",first:!0}," ":{dir:"parentNode"},"+":{dir:"previousSibling",first:!0},"~":{dir:"previousSibling"}},preFilter:{ATTR:function(e){return e[1]=e[1].replace(rt,it),e[3]=(e[4]||e[5]||"").replace(rt,it),"~="===e[2]&&(e[3]=" "+e[3]+" "),e.slice(0,4)},CHILD:function(e){return e[1]=e[1].toLowerCase(),"nth"===e[1].slice(0,3)?(e[3]||at.error(e[0]),e[4]=+(e[4]?e[5]+(e[6]||1):2*("even"===e[3]||"odd"===e[3])),e[5]=+(e[7]+e[8]||"odd"===e[3])):e[3]&&at.error(e[0]),e},PSEUDO:function(e){var n,r=!e[5]&&e[2];return Q.CHILD.test(e[0])?null:(e[3]&&e[4]!==t?e[2]=e[4]:r&&J.test(r)&&(n=mt(r,!0))&&(n=r.indexOf(")",r.length-n)-r.length)&&(e[0]=e[0].slice(0,n),e[2]=r.slice(0,n)),e.slice(0,3))}},filter:{TAG:function(e){var t=e.replace(rt,it).toLowerCase();return"*"===e?function(){return!0}:function(e){return e.nodeName&&e.nodeName.toLowerCase()===t}},CLASS:function(e){var t=N[e+" "];return t||(t=RegExp("(^|"+P+")"+e+"("+P+"|$)"))&&N(e,function(e){return t.test("string"==typeof e.className&&e.className||typeof e.getAttribute!==j&&e.getAttribute("class")||"")})},ATTR:function(e,t,n){return function(r){var i=at.attr(r,e);return null==i?"!="===t:t?(i+="","="===t?i===n:"!="===t?i!==n:"^="===t?n&&0===i.indexOf(n):"*="===t?n&&i.indexOf(n)>-1:"$="===t?n&&i.slice(-n.length)===n:"~="===t?(" "+i+" ").indexOf(n)>-1:"|="===t?i===n||i.slice(0,n.length+1)===n+"-":!1):!0}},CHILD:function(e,t,n,r,i){var o="nth"!==e.slice(0,3),a="last"!==e.slice(-4),s="of-type"===t;return 1===r&&0===i?function(e){return!!e.parentNode}:function(t,n,l){var u,c,p,f,d,h,g=o!==a?"nextSibling":"previousSibling",m=t.parentNode,y=s&&t.nodeName.toLowerCase(),v=!l&&!s;if(m){if(o){while(g){p=t;while(p=p[g])if(s?p.nodeName.toLowerCase()===y:1===p.nodeType)return!1;h=g="only"===e&&!h&&"nextSibling"}return!0}if(h=[a?m.firstChild:m.lastChild],a&&v){c=m[b]||(m[b]={}),u=c[e]||[],d=u[0]===T&&u[1],f=u[0]===T&&u[2],p=d&&m.childNodes[d];while(p=++d&&p&&p[g]||(f=d=0)||h.pop())if(1===p.nodeType&&++f&&p===t){c[e]=[T,d,f];break}}else if(v&&(u=(t[b]||(t[b]={}))[e])&&u[0]===T)f=u[1];else while(p=++d&&p&&p[g]||(f=d=0)||h.pop())if((s?p.nodeName.toLowerCase()===y:1===p.nodeType)&&++f&&(v&&((p[b]||(p[b]={}))[e]=[T,f]),p===t))break;return f-=i,f===r||0===f%r&&f/r>=0}}},PSEUDO:function(e,t){var n,r=o.pseudos[e]||o.setFilters[e.toLowerCase()]||at.error("unsupported pseudo: "+e);return r[b]?r(t):r.length>1?(n=[e,e,"",t],o.setFilters.hasOwnProperty(e.toLowerCase())?lt(function(e,n){var i,o=r(e,t),a=o.length;while(a--)i=F.call(e,o[a]),e[i]=!(n[i]=o[a])}):function(e){return r(e,0,n)}):r}},pseudos:{not:lt(function(e){var t=[],n=[],r=l(e.replace(z,"$1"));return r[b]?lt(function(e,t,n,i){var o,a=r(e,null,i,[]),s=e.length;while(s--)(o=a[s])&&(e[s]=!(t[s]=o))}):function(e,i,o){return t[0]=e,r(t,null,o,n),!n.pop()}}),has:lt(function(e){return function(t){return at(e,t).length>0}}),contains:lt(function(e){return function(t){return(t.textContent||t.innerText||a(t)).indexOf(e)>-1}}),lang:lt(function(e){return G.test(e||"")||at.error("unsupported lang: "+e),e=e.replace(rt,it).toLowerCase(),function(t){var n;do if(n=h?t.lang:t.getAttribute("xml:lang")||t.getAttribute("lang"))return n=n.toLowerCase(),n===e||0===n.indexOf(e+"-");while((t=t.parentNode)&&1===t.nodeType);return!1}}),target:function(t){var n=e.location&&e.location.hash;return n&&n.slice(1)===t.id},root:function(e){return e===d},focus:function(e){return e===f.activeElement&&(!f.hasFocus||f.hasFocus())&&!!(e.type||e.href||~e.tabIndex)},enabled:function(e){return e.disabled===!1},disabled:function(e){return e.disabled===!0},checked:function(e){var t=e.nodeName.toLowerCase();return"input"===t&&!!e.checked||"option"===t&&!!e.selected},selected:function(e){return e.parentNode&&e.parentNode.selectedIndex,e.selected===!0},empty:function(e){for(e=e.firstChild;e;e=e.nextSibling)if(e.nodeName>"@"||3===e.nodeType||4===e.nodeType)return!1;return!0},parent:function(e){return!o.pseudos.empty(e)},header:function(e){return tt.test(e.nodeName)},input:function(e){return et.test(e.nodeName)},button:function(e){var t=e.nodeName.toLowerCase();return"input"===t&&"button"===e.type||"button"===t},text:function(e){var t;return"input"===e.nodeName.toLowerCase()&&"text"===e.type&&(null==(t=e.getAttribute("type"))||t.toLowerCase()===e.type)},first:ht(function(){return[0]}),last:ht(function(e,t){return[t-1]}),eq:ht(function(e,t,n){return[0>n?n+t:n]}),even:ht(function(e,t){var n=0;for(;t>n;n+=2)e.push(n);return e}),odd:ht(function(e,t){var n=1;for(;t>n;n+=2)e.push(n);return e}),lt:ht(function(e,t,n){var r=0>n?n+t:n;for(;--r>=0;)e.push(r);return e}),gt:ht(function(e,t,n){var r=0>n?n+t:n;for(;t>++r;)e.push(r);return e})}},o.pseudos.nth=o.pseudos.eq;for(n in{radio:!0,checkbox:!0,file:!0,password:!0,image:!0})o.pseudos[n]=ft(n);for(n in{submit:!0,reset:!0})o.pseudos[n]=dt(n);function gt(){}gt.prototype=o.filters=o.pseudos,o.setFilters=new gt;function mt(e,t){var n,r,i,a,s,l,u,c=k[e+" "];if(c)return t?0:c.slice(0);s=e,l=[],u=o.preFilter;while(s){(!n||(r=X.exec(s)))&&(r&&(s=s.slice(r[0].length)||s),l.push(i=[])),n=!1,(r=U.exec(s))&&(n=r.shift(),i.push({value:n,type:r[0].replace(z," ")}),s=s.slice(n.length));for(a in o.filter)!(r=Q[a].exec(s))||u[a]&&!(r=u[a](r))||(n=r.shift(),i.push({value:n,type:a,matches:r}),s=s.slice(n.length));if(!n)break}return t?s.length:s?at.error(e):k(e,l).slice(0)}function yt(e){var t=0,n=e.length,r="";for(;n>t;t++)r+=e[t].value;return r}function vt(e,t,n){var r=t.dir,o=n&&"parentNode"===r,a=C++;return t.first?function(t,n,i){while(t=t[r])if(1===t.nodeType||o)return e(t,n,i)}:function(t,n,s){var l,u,c,p=T+" "+a;if(s){while(t=t[r])if((1===t.nodeType||o)&&e(t,n,s))return!0}else while(t=t[r])if(1===t.nodeType||o)if(c=t[b]||(t[b]={}),(u=c[r])&&u[0]===p){if((l=u[1])===!0||l===i)return l===!0}else if(u=c[r]=[p],u[1]=e(t,n,s)||i,u[1]===!0)return!0}}function bt(e){return e.length>1?function(t,n,r){var i=e.length;while(i--)if(!e[i](t,n,r))return!1;return!0}:e[0]}function xt(e,t,n,r,i){var o,a=[],s=0,l=e.length,u=null!=t;for(;l>s;s++)(o=e[s])&&(!n||n(o,r,i))&&(a.push(o),u&&t.push(s));return a}function wt(e,t,n,r,i,o){return r&&!r[b]&&(r=wt(r)),i&&!i[b]&&(i=wt(i,o)),lt(function(o,a,s,l){var u,c,p,f=[],d=[],h=a.length,g=o||Nt(t||"*",s.nodeType?[s]:s,[]),m=!e||!o&&t?g:xt(g,f,e,s,l),y=n?i||(o?e:h||r)?[]:a:m;if(n&&n(m,y,s,l),r){u=xt(y,d),r(u,[],s,l),c=u.length;while(c--)(p=u[c])&&(y[d[c]]=!(m[d[c]]=p))}if(o){if(i||e){if(i){u=[],c=y.length;while(c--)(p=y[c])&&u.push(m[c]=p);i(null,y=[],u,l)}c=y.length;while(c--)(p=y[c])&&(u=i?F.call(o,p):f[c])>-1&&(o[u]=!(a[u]=p))}}else y=xt(y===a?y.splice(h,y.length):y),i?i(null,a,y,l):M.apply(a,y)})}function Tt(e){var t,n,r,i=e.length,a=o.relative[e[0].type],s=a||o.relative[" "],l=a?1:0,c=vt(function(e){return e===t},s,!0),p=vt(function(e){return F.call(t,e)>-1},s,!0),f=[function(e,n,r){return!a&&(r||n!==u)||((t=n).nodeType?c(e,n,r):p(e,n,r))}];for(;i>l;l++)if(n=o.relative[e[l].type])f=[vt(bt(f),n)];else{if(n=o.filter[e[l].type].apply(null,e[l].matches),n[b]){for(r=++l;i>r;r++)if(o.relative[e[r].type])break;return wt(l>1&&bt(f),l>1&&yt(e.slice(0,l-1).concat({value:" "===e[l-2].type?"*":""})).replace(z,"$1"),n,r>l&&Tt(e.slice(l,r)),i>r&&Tt(e=e.slice(r)),i>r&&yt(e))}f.push(n)}return bt(f)}function Ct(e,t){var n=0,r=t.length>0,a=e.length>0,s=function(s,l,c,p,d){var h,g,m,y=[],v=0,b="0",x=s&&[],w=null!=d,C=u,N=s||a&&o.find.TAG("*",d&&l.parentNode||l),k=T+=null==C?1:Math.random()||.1;for(w&&(u=l!==f&&l,i=n);null!=(h=N[b]);b++){if(a&&h){g=0;while(m=e[g++])if(m(h,l,c)){p.push(h);break}w&&(T=k,i=++n)}r&&((h=!m&&h)&&v--,s&&x.push(h))}if(v+=b,r&&b!==v){g=0;while(m=t[g++])m(x,y,l,c);if(s){if(v>0)while(b--)x[b]||y[b]||(y[b]=q.call(p));y=xt(y)}M.apply(p,y),w&&!s&&y.length>0&&v+t.length>1&&at.uniqueSort(p)}return w&&(T=k,u=C),x};return r?lt(s):s}l=at.compile=function(e,t){var n,r=[],i=[],o=E[e+" "];if(!o){t||(t=mt(e)),n=t.length;while(n--)o=Tt(t[n]),o[b]?r.push(o):i.push(o);o=E(e,Ct(i,r))}return o};function Nt(e,t,n){var r=0,i=t.length;for(;i>r;r++)at(e,t[r],n);return n}function kt(e,t,n,i){var a,s,u,c,p,f=mt(e);if(!i&&1===f.length){if(s=f[0]=f[0].slice(0),s.length>2&&"ID"===(u=s[0]).type&&r.getById&&9===t.nodeType&&h&&o.relative[s[1].type]){if(t=(o.find.ID(u.matches[0].replace(rt,it),t)||[])[0],!t)return n;e=e.slice(s.shift().value.length)}a=Q.needsContext.test(e)?0:s.length;while(a--){if(u=s[a],o.relative[c=u.type])break;if((p=o.find[c])&&(i=p(u.matches[0].replace(rt,it),V.test(s[0].type)&&t.parentNode||t))){if(s.splice(a,1),e=i.length&&yt(s),!e)return M.apply(n,i),n;break}}}return l(e,f)(i,t,!h,n,V.test(e)),n}r.sortStable=b.split("").sort(A).join("")===b,r.detectDuplicates=S,p(),r.sortDetached=ut(function(e){return 1&e.compareDocumentPosition(f.createElement("div"))}),ut(function(e){return e.innerHTML="<a href='#'></a>","#"===e.firstChild.getAttribute("href")})||ct("type|href|height|width",function(e,n,r){return r?t:e.getAttribute(n,"type"===n.toLowerCase()?1:2)}),r.attributes&&ut(function(e){return e.innerHTML="<input/>",e.firstChild.setAttribute("value",""),""===e.firstChild.getAttribute("value")})||ct("value",function(e,n,r){return r||"input"!==e.nodeName.toLowerCase()?t:e.defaultValue}),ut(function(e){return null==e.getAttribute("disabled")})||ct(B,function(e,n,r){var i;return r?t:(i=e.getAttributeNode(n))&&i.specified?i.value:e[n]===!0?n.toLowerCase():null}),x.find=at,x.expr=at.selectors,x.expr[":"]=x.expr.pseudos,x.unique=at.uniqueSort,x.text=at.getText,x.isXMLDoc=at.isXML,x.contains=at.contains}(e);var O={};function F(e){var t=O[e]={};return x.each(e.match(T)||[],function(e,n){t[n]=!0}),t}x.Callbacks=function(e){e="string"==typeof e?O[e]||F(e):x.extend({},e);var n,r,i,o,a,s,l=[],u=!e.once&&[],c=function(t){for(r=e.memory&&t,i=!0,a=s||0,s=0,o=l.length,n=!0;l&&o>a;a++)if(l[a].apply(t[0],t[1])===!1&&e.stopOnFalse){r=!1;break}n=!1,l&&(u?u.length&&c(u.shift()):r?l=[]:p.disable())},p={add:function(){if(l){var t=l.length;(function i(t){x.each(t,function(t,n){var r=x.type(n);"function"===r?e.unique&&p.has(n)||l.push(n):n&&n.length&&"string"!==r&&i(n)})})(arguments),n?o=l.length:r&&(s=t,c(r))}return this},remove:function(){return l&&x.each(arguments,function(e,t){var r;while((r=x.inArray(t,l,r))>-1)l.splice(r,1),n&&(o>=r&&o--,a>=r&&a--)}),this},has:function(e){return e?x.inArray(e,l)>-1:!(!l||!l.length)},empty:function(){return l=[],o=0,this},disable:function(){return l=u=r=t,this},disabled:function(){return!l},lock:function(){return u=t,r||p.disable(),this},locked:function(){return!u},fireWith:function(e,t){return!l||i&&!u||(t=t||[],t=[e,t.slice?t.slice():t],n?u.push(t):c(t)),this},fire:function(){return p.fireWith(this,arguments),this},fired:function(){return!!i}};return p},x.extend({Deferred:function(e){var t=[["resolve","done",x.Callbacks("once memory"),"resolved"],["reject","fail",x.Callbacks("once memory"),"rejected"],["notify","progress",x.Callbacks("memory")]],n="pending",r={state:function(){return n},always:function(){return i.done(arguments).fail(arguments),this},then:function(){var e=arguments;return x.Deferred(function(n){x.each(t,function(t,o){var a=o[0],s=x.isFunction(e[t])&&e[t];i[o[1]](function(){var e=s&&s.apply(this,arguments);e&&x.isFunction(e.promise)?e.promise().done(n.resolve).fail(n.reject).progress(n.notify):n[a+"With"](this===r?n.promise():this,s?[e]:arguments)})}),e=null}).promise()},promise:function(e){return null!=e?x.extend(e,r):r}},i={};return r.pipe=r.then,x.each(t,function(e,o){var a=o[2],s=o[3];r[o[1]]=a.add,s&&a.add(function(){n=s},t[1^e][2].disable,t[2][2].lock),i[o[0]]=function(){return i[o[0]+"With"](this===i?r:this,arguments),this},i[o[0]+"With"]=a.fireWith}),r.promise(i),e&&e.call(i,i),i},when:function(e){var t=0,n=g.call(arguments),r=n.length,i=1!==r||e&&x.isFunction(e.promise)?r:0,o=1===i?e:x.Deferred(),a=function(e,t,n){return function(r){t[e]=this,n[e]=arguments.length>1?g.call(arguments):r,n===s?o.notifyWith(t,n):--i||o.resolveWith(t,n)}},s,l,u;if(r>1)for(s=Array(r),l=Array(r),u=Array(r);r>t;t++)n[t]&&x.isFunction(n[t].promise)?n[t].promise().done(a(t,u,n)).fail(o.reject).progress(a(t,l,s)):--i;return i||o.resolveWith(u,n),o.promise()}}),x.support=function(t){var n,r,o,s,l,u,c,p,f,d=a.createElement("div");if(d.setAttribute("className","t"),d.innerHTML=" <link/><table></table><a href='/a'>a</a><input type='checkbox'/>",n=d.getElementsByTagName("*")||[],r=d.getElementsByTagName("a")[0],!r||!r.style||!n.length)return t;s=a.createElement("select"),u=s.appendChild(a.createElement("option")),o=d.getElementsByTagName("input")[0],r.style.cssText="top:1px;float:left;opacity:.5",t.getSetAttribute="t"!==d.className,t.leadingWhitespace=3===d.firstChild.nodeType,t.tbody=!d.getElementsByTagName("tbody").length,t.htmlSerialize=!!d.getElementsByTagName("link").length,t.style=/top/.test(r.getAttribute("style")),t.hrefNormalized="/a"===r.getAttribute("href"),t.opacity=/^0.5/.test(r.style.opacity),t.cssFloat=!!r.style.cssFloat,t.checkOn=!!o.value,t.optSelected=u.selected,t.enctype=!!a.createElement("form").enctype,t.html5Clone="<:nav></:nav>"!==a.createElement("nav").cloneNode(!0).outerHTML,t.inlineBlockNeedsLayout=!1,t.shrinkWrapBlocks=!1,t.pixelPosition=!1,t.deleteExpando=!0,t.noCloneEvent=!0,t.reliableMarginRight=!0,t.boxSizingReliable=!0,o.checked=!0,t.noCloneChecked=o.cloneNode(!0).checked,s.disabled=!0,t.optDisabled=!u.disabled;try{delete d.test}catch(h){t.deleteExpando=!1}o=a.createElement("input"),o.setAttribute("value",""),t.input=""===o.getAttribute("value"),o.value="t",o.setAttribute("type","radio"),t.radioValue="t"===o.value,o.setAttribute("checked","t"),o.setAttribute("name","t"),l=a.createDocumentFragment(),l.appendChild(o),t.appendChecked=o.checked,t.checkClone=l.cloneNode(!0).cloneNode(!0).lastChild.checked,d.attachEvent&&(d.attachEvent("onclick",function(){t.noCloneEvent=!1}),d.cloneNode(!0).click());for(f in{submit:!0,change:!0,focusin:!0})d.setAttribute(c="on"+f,"t"),t[f+"Bubbles"]=c in e||d.attributes[c].expando===!1;d.style.backgroundClip="content-box",d.cloneNode(!0).style.backgroundClip="",t.clearCloneStyle="content-box"===d.style.backgroundClip;for(f in x(t))break;return t.ownLast="0"!==f,x(function(){var n,r,o,s="padding:0;margin:0;border:0;display:block;box-sizing:content-box;-moz-box-sizing:content-box;-webkit-box-sizing:content-box;",l=a.getElementsByTagName("body")[0];l&&(n=a.createElement("div"),n.style.cssText="border:0;width:0;height:0;position:absolute;top:0;left:-9999px;margin-top:1px",l.appendChild(n).appendChild(d),d.innerHTML="<table><tr><td></td><td>t</td></tr></table>",o=d.getElementsByTagName("td"),o[0].style.cssText="padding:0;margin:0;border:0;display:none",p=0===o[0].offsetHeight,o[0].style.display="",o[1].style.display="none",t.reliableHiddenOffsets=p&&0===o[0].offsetHeight,d.innerHTML="",d.style.cssText="box-sizing:border-box;-moz-box-sizing:border-box;-webkit-box-sizing:border-box;padding:1px;border:1px;display:block;width:4px;margin-top:1%;position:absolute;top:1%;",x.swap(l,null!=l.style.zoom?{zoom:1}:{},function(){t.boxSizing=4===d.offsetWidth}),e.getComputedStyle&&(t.pixelPosition="1%"!==(e.getComputedStyle(d,null)||{}).top,t.boxSizingReliable="4px"===(e.getComputedStyle(d,null)||{width:"4px"}).width,r=d.appendChild(a.createElement("div")),r.style.cssText=d.style.cssText=s,r.style.marginRight=r.style.width="0",d.style.width="1px",t.reliableMarginRight=!parseFloat((e.getComputedStyle(r,null)||{}).marginRight)),typeof d.style.zoom!==i&&(d.innerHTML="",d.style.cssText=s+"width:1px;padding:1px;display:inline;zoom:1",t.inlineBlockNeedsLayout=3===d.offsetWidth,d.style.display="block",d.innerHTML="<div></div>",d.firstChild.style.width="5px",t.shrinkWrapBlocks=3!==d.offsetWidth,t.inlineBlockNeedsLayout&&(l.style.zoom=1)),l.removeChild(n),n=d=o=r=null)}),n=s=l=u=r=o=null,t
+}({});var B=/(?:\{[\s\S]*\}|\[[\s\S]*\])$/,P=/([A-Z])/g;function R(e,n,r,i){if(x.acceptData(e)){var o,a,s=x.expando,l=e.nodeType,u=l?x.cache:e,c=l?e[s]:e[s]&&s;if(c&&u[c]&&(i||u[c].data)||r!==t||"string"!=typeof n)return c||(c=l?e[s]=p.pop()||x.guid++:s),u[c]||(u[c]=l?{}:{toJSON:x.noop}),("object"==typeof n||"function"==typeof n)&&(i?u[c]=x.extend(u[c],n):u[c].data=x.extend(u[c].data,n)),a=u[c],i||(a.data||(a.data={}),a=a.data),r!==t&&(a[x.camelCase(n)]=r),"string"==typeof n?(o=a[n],null==o&&(o=a[x.camelCase(n)])):o=a,o}}function W(e,t,n){if(x.acceptData(e)){var r,i,o=e.nodeType,a=o?x.cache:e,s=o?e[x.expando]:x.expando;if(a[s]){if(t&&(r=n?a[s]:a[s].data)){x.isArray(t)?t=t.concat(x.map(t,x.camelCase)):t in r?t=[t]:(t=x.camelCase(t),t=t in r?[t]:t.split(" ")),i=t.length;while(i--)delete r[t[i]];if(n?!I(r):!x.isEmptyObject(r))return}(n||(delete a[s].data,I(a[s])))&&(o?x.cleanData([e],!0):x.support.deleteExpando||a!=a.window?delete a[s]:a[s]=null)}}}x.extend({cache:{},noData:{applet:!0,embed:!0,object:"clsid:D27CDB6E-AE6D-11cf-96B8-444553540000"},hasData:function(e){return e=e.nodeType?x.cache[e[x.expando]]:e[x.expando],!!e&&!I(e)},data:function(e,t,n){return R(e,t,n)},removeData:function(e,t){return W(e,t)},_data:function(e,t,n){return R(e,t,n,!0)},_removeData:function(e,t){return W(e,t,!0)},acceptData:function(e){if(e.nodeType&&1!==e.nodeType&&9!==e.nodeType)return!1;var t=e.nodeName&&x.noData[e.nodeName.toLowerCase()];return!t||t!==!0&&e.getAttribute("classid")===t}}),x.fn.extend({data:function(e,n){var r,i,o=null,a=0,s=this[0];if(e===t){if(this.length&&(o=x.data(s),1===s.nodeType&&!x._data(s,"parsedAttrs"))){for(r=s.attributes;r.length>a;a++)i=r[a].name,0===i.indexOf("data-")&&(i=x.camelCase(i.slice(5)),$(s,i,o[i]));x._data(s,"parsedAttrs",!0)}return o}return"object"==typeof e?this.each(function(){x.data(this,e)}):arguments.length>1?this.each(function(){x.data(this,e,n)}):s?$(s,e,x.data(s,e)):null},removeData:function(e){return this.each(function(){x.removeData(this,e)})}});function $(e,n,r){if(r===t&&1===e.nodeType){var i="data-"+n.replace(P,"-$1").toLowerCase();if(r=e.getAttribute(i),"string"==typeof r){try{r="true"===r?!0:"false"===r?!1:"null"===r?null:+r+""===r?+r:B.test(r)?x.parseJSON(r):r}catch(o){}x.data(e,n,r)}else r=t}return r}function I(e){var t;for(t in e)if(("data"!==t||!x.isEmptyObject(e[t]))&&"toJSON"!==t)return!1;return!0}x.extend({queue:function(e,n,r){var i;return e?(n=(n||"fx")+"queue",i=x._data(e,n),r&&(!i||x.isArray(r)?i=x._data(e,n,x.makeArray(r)):i.push(r)),i||[]):t},dequeue:function(e,t){t=t||"fx";var n=x.queue(e,t),r=n.length,i=n.shift(),o=x._queueHooks(e,t),a=function(){x.dequeue(e,t)};"inprogress"===i&&(i=n.shift(),r--),i&&("fx"===t&&n.unshift("inprogress"),delete o.stop,i.call(e,a,o)),!r&&o&&o.empty.fire()},_queueHooks:function(e,t){var n=t+"queueHooks";return x._data(e,n)||x._data(e,n,{empty:x.Callbacks("once memory").add(function(){x._removeData(e,t+"queue"),x._removeData(e,n)})})}}),x.fn.extend({queue:function(e,n){var r=2;return"string"!=typeof e&&(n=e,e="fx",r--),r>arguments.length?x.queue(this[0],e):n===t?this:this.each(function(){var t=x.queue(this,e,n);x._queueHooks(this,e),"fx"===e&&"inprogress"!==t[0]&&x.dequeue(this,e)})},dequeue:function(e){return this.each(function(){x.dequeue(this,e)})},delay:function(e,t){return e=x.fx?x.fx.speeds[e]||e:e,t=t||"fx",this.queue(t,function(t,n){var r=setTimeout(t,e);n.stop=function(){clearTimeout(r)}})},clearQueue:function(e){return this.queue(e||"fx",[])},promise:function(e,n){var r,i=1,o=x.Deferred(),a=this,s=this.length,l=function(){--i||o.resolveWith(a,[a])};"string"!=typeof e&&(n=e,e=t),e=e||"fx";while(s--)r=x._data(a[s],e+"queueHooks"),r&&r.empty&&(i++,r.empty.add(l));return l(),o.promise(n)}});var z,X,U=/[\t\r\n\f]/g,V=/\r/g,Y=/^(?:input|select|textarea|button|object)$/i,J=/^(?:a|area)$/i,G=/^(?:checked|selected)$/i,Q=x.support.getSetAttribute,K=x.support.input;x.fn.extend({attr:function(e,t){return x.access(this,x.attr,e,t,arguments.length>1)},removeAttr:function(e){return this.each(function(){x.removeAttr(this,e)})},prop:function(e,t){return x.access(this,x.prop,e,t,arguments.length>1)},removeProp:function(e){return e=x.propFix[e]||e,this.each(function(){try{this[e]=t,delete this[e]}catch(n){}})},addClass:function(e){var t,n,r,i,o,a=0,s=this.length,l="string"==typeof e&&e;if(x.isFunction(e))return this.each(function(t){x(this).addClass(e.call(this,t,this.className))});if(l)for(t=(e||"").match(T)||[];s>a;a++)if(n=this[a],r=1===n.nodeType&&(n.className?(" "+n.className+" ").replace(U," "):" ")){o=0;while(i=t[o++])0>r.indexOf(" "+i+" ")&&(r+=i+" ");n.className=x.trim(r)}return this},removeClass:function(e){var t,n,r,i,o,a=0,s=this.length,l=0===arguments.length||"string"==typeof e&&e;if(x.isFunction(e))return this.each(function(t){x(this).removeClass(e.call(this,t,this.className))});if(l)for(t=(e||"").match(T)||[];s>a;a++)if(n=this[a],r=1===n.nodeType&&(n.className?(" "+n.className+" ").replace(U," "):"")){o=0;while(i=t[o++])while(r.indexOf(" "+i+" ")>=0)r=r.replace(" "+i+" "," ");n.className=e?x.trim(r):""}return this},toggleClass:function(e,t){var n=typeof e;return"boolean"==typeof t&&"string"===n?t?this.addClass(e):this.removeClass(e):x.isFunction(e)?this.each(function(n){x(this).toggleClass(e.call(this,n,this.className,t),t)}):this.each(function(){if("string"===n){var t,r=0,o=x(this),a=e.match(T)||[];while(t=a[r++])o.hasClass(t)?o.removeClass(t):o.addClass(t)}else(n===i||"boolean"===n)&&(this.className&&x._data(this,"__className__",this.className),this.className=this.className||e===!1?"":x._data(this,"__className__")||"")})},hasClass:function(e){var t=" "+e+" ",n=0,r=this.length;for(;r>n;n++)if(1===this[n].nodeType&&(" "+this[n].className+" ").replace(U," ").indexOf(t)>=0)return!0;return!1},val:function(e){var n,r,i,o=this[0];{if(arguments.length)return i=x.isFunction(e),this.each(function(n){var o;1===this.nodeType&&(o=i?e.call(this,n,x(this).val()):e,null==o?o="":"number"==typeof o?o+="":x.isArray(o)&&(o=x.map(o,function(e){return null==e?"":e+""})),r=x.valHooks[this.type]||x.valHooks[this.nodeName.toLowerCase()],r&&"set"in r&&r.set(this,o,"value")!==t||(this.value=o))});if(o)return r=x.valHooks[o.type]||x.valHooks[o.nodeName.toLowerCase()],r&&"get"in r&&(n=r.get(o,"value"))!==t?n:(n=o.value,"string"==typeof n?n.replace(V,""):null==n?"":n)}}}),x.extend({valHooks:{option:{get:function(e){var t=x.find.attr(e,"value");return null!=t?t:e.text}},select:{get:function(e){var t,n,r=e.options,i=e.selectedIndex,o="select-one"===e.type||0>i,a=o?null:[],s=o?i+1:r.length,l=0>i?s:o?i:0;for(;s>l;l++)if(n=r[l],!(!n.selected&&l!==i||(x.support.optDisabled?n.disabled:null!==n.getAttribute("disabled"))||n.parentNode.disabled&&x.nodeName(n.parentNode,"optgroup"))){if(t=x(n).val(),o)return t;a.push(t)}return a},set:function(e,t){var n,r,i=e.options,o=x.makeArray(t),a=i.length;while(a--)r=i[a],(r.selected=x.inArray(x(r).val(),o)>=0)&&(n=!0);return n||(e.selectedIndex=-1),o}}},attr:function(e,n,r){var o,a,s=e.nodeType;if(e&&3!==s&&8!==s&&2!==s)return typeof e.getAttribute===i?x.prop(e,n,r):(1===s&&x.isXMLDoc(e)||(n=n.toLowerCase(),o=x.attrHooks[n]||(x.expr.match.bool.test(n)?X:z)),r===t?o&&"get"in o&&null!==(a=o.get(e,n))?a:(a=x.find.attr(e,n),null==a?t:a):null!==r?o&&"set"in o&&(a=o.set(e,r,n))!==t?a:(e.setAttribute(n,r+""),r):(x.removeAttr(e,n),t))},removeAttr:function(e,t){var n,r,i=0,o=t&&t.match(T);if(o&&1===e.nodeType)while(n=o[i++])r=x.propFix[n]||n,x.expr.match.bool.test(n)?K&&Q||!G.test(n)?e[r]=!1:e[x.camelCase("default-"+n)]=e[r]=!1:x.attr(e,n,""),e.removeAttribute(Q?n:r)},attrHooks:{type:{set:function(e,t){if(!x.support.radioValue&&"radio"===t&&x.nodeName(e,"input")){var n=e.value;return e.setAttribute("type",t),n&&(e.value=n),t}}}},propFix:{"for":"htmlFor","class":"className"},prop:function(e,n,r){var i,o,a,s=e.nodeType;if(e&&3!==s&&8!==s&&2!==s)return a=1!==s||!x.isXMLDoc(e),a&&(n=x.propFix[n]||n,o=x.propHooks[n]),r!==t?o&&"set"in o&&(i=o.set(e,r,n))!==t?i:e[n]=r:o&&"get"in o&&null!==(i=o.get(e,n))?i:e[n]},propHooks:{tabIndex:{get:function(e){var t=x.find.attr(e,"tabindex");return t?parseInt(t,10):Y.test(e.nodeName)||J.test(e.nodeName)&&e.href?0:-1}}}}),X={set:function(e,t,n){return t===!1?x.removeAttr(e,n):K&&Q||!G.test(n)?e.setAttribute(!Q&&x.propFix[n]||n,n):e[x.camelCase("default-"+n)]=e[n]=!0,n}},x.each(x.expr.match.bool.source.match(/\w+/g),function(e,n){var r=x.expr.attrHandle[n]||x.find.attr;x.expr.attrHandle[n]=K&&Q||!G.test(n)?function(e,n,i){var o=x.expr.attrHandle[n],a=i?t:(x.expr.attrHandle[n]=t)!=r(e,n,i)?n.toLowerCase():null;return x.expr.attrHandle[n]=o,a}:function(e,n,r){return r?t:e[x.camelCase("default-"+n)]?n.toLowerCase():null}}),K&&Q||(x.attrHooks.value={set:function(e,n,r){return x.nodeName(e,"input")?(e.defaultValue=n,t):z&&z.set(e,n,r)}}),Q||(z={set:function(e,n,r){var i=e.getAttributeNode(r);return i||e.setAttributeNode(i=e.ownerDocument.createAttribute(r)),i.value=n+="","value"===r||n===e.getAttribute(r)?n:t}},x.expr.attrHandle.id=x.expr.attrHandle.name=x.expr.attrHandle.coords=function(e,n,r){var i;return r?t:(i=e.getAttributeNode(n))&&""!==i.value?i.value:null},x.valHooks.button={get:function(e,n){var r=e.getAttributeNode(n);return r&&r.specified?r.value:t},set:z.set},x.attrHooks.contenteditable={set:function(e,t,n){z.set(e,""===t?!1:t,n)}},x.each(["width","height"],function(e,n){x.attrHooks[n]={set:function(e,r){return""===r?(e.setAttribute(n,"auto"),r):t}}})),x.support.hrefNormalized||x.each(["href","src"],function(e,t){x.propHooks[t]={get:function(e){return e.getAttribute(t,4)}}}),x.support.style||(x.attrHooks.style={get:function(e){return e.style.cssText||t},set:function(e,t){return e.style.cssText=t+""}}),x.support.optSelected||(x.propHooks.selected={get:function(e){var t=e.parentNode;return t&&(t.selectedIndex,t.parentNode&&t.parentNode.selectedIndex),null}}),x.each(["tabIndex","readOnly","maxLength","cellSpacing","cellPadding","rowSpan","colSpan","useMap","frameBorder","contentEditable"],function(){x.propFix[this.toLowerCase()]=this}),x.support.enctype||(x.propFix.enctype="encoding"),x.each(["radio","checkbox"],function(){x.valHooks[this]={set:function(e,n){return x.isArray(n)?e.checked=x.inArray(x(e).val(),n)>=0:t}},x.support.checkOn||(x.valHooks[this].get=function(e){return null===e.getAttribute("value")?"on":e.value})});var Z=/^(?:input|select|textarea)$/i,et=/^key/,tt=/^(?:mouse|contextmenu)|click/,nt=/^(?:focusinfocus|focusoutblur)$/,rt=/^([^.]*)(?:\.(.+)|)$/;function it(){return!0}function ot(){return!1}function at(){try{return a.activeElement}catch(e){}}x.event={global:{},add:function(e,n,r,o,a){var s,l,u,c,p,f,d,h,g,m,y,v=x._data(e);if(v){r.handler&&(c=r,r=c.handler,a=c.selector),r.guid||(r.guid=x.guid++),(l=v.events)||(l=v.events={}),(f=v.handle)||(f=v.handle=function(e){return typeof x===i||e&&x.event.triggered===e.type?t:x.event.dispatch.apply(f.elem,arguments)},f.elem=e),n=(n||"").match(T)||[""],u=n.length;while(u--)s=rt.exec(n[u])||[],g=y=s[1],m=(s[2]||"").split(".").sort(),g&&(p=x.event.special[g]||{},g=(a?p.delegateType:p.bindType)||g,p=x.event.special[g]||{},d=x.extend({type:g,origType:y,data:o,handler:r,guid:r.guid,selector:a,needsContext:a&&x.expr.match.needsContext.test(a),namespace:m.join(".")},c),(h=l[g])||(h=l[g]=[],h.delegateCount=0,p.setup&&p.setup.call(e,o,m,f)!==!1||(e.addEventListener?e.addEventListener(g,f,!1):e.attachEvent&&e.attachEvent("on"+g,f))),p.add&&(p.add.call(e,d),d.handler.guid||(d.handler.guid=r.guid)),a?h.splice(h.delegateCount++,0,d):h.push(d),x.event.global[g]=!0);e=null}},remove:function(e,t,n,r,i){var o,a,s,l,u,c,p,f,d,h,g,m=x.hasData(e)&&x._data(e);if(m&&(c=m.events)){t=(t||"").match(T)||[""],u=t.length;while(u--)if(s=rt.exec(t[u])||[],d=g=s[1],h=(s[2]||"").split(".").sort(),d){p=x.event.special[d]||{},d=(r?p.delegateType:p.bindType)||d,f=c[d]||[],s=s[2]&&RegExp("(^|\\.)"+h.join("\\.(?:.*\\.|)")+"(\\.|$)"),l=o=f.length;while(o--)a=f[o],!i&&g!==a.origType||n&&n.guid!==a.guid||s&&!s.test(a.namespace)||r&&r!==a.selector&&("**"!==r||!a.selector)||(f.splice(o,1),a.selector&&f.delegateCount--,p.remove&&p.remove.call(e,a));l&&!f.length&&(p.teardown&&p.teardown.call(e,h,m.handle)!==!1||x.removeEvent(e,d,m.handle),delete c[d])}else for(d in c)x.event.remove(e,d+t[u],n,r,!0);x.isEmptyObject(c)&&(delete m.handle,x._removeData(e,"events"))}},trigger:function(n,r,i,o){var s,l,u,c,p,f,d,h=[i||a],g=v.call(n,"type")?n.type:n,m=v.call(n,"namespace")?n.namespace.split("."):[];if(u=f=i=i||a,3!==i.nodeType&&8!==i.nodeType&&!nt.test(g+x.event.triggered)&&(g.indexOf(".")>=0&&(m=g.split("."),g=m.shift(),m.sort()),l=0>g.indexOf(":")&&"on"+g,n=n[x.expando]?n:new x.Event(g,"object"==typeof n&&n),n.isTrigger=o?2:3,n.namespace=m.join("."),n.namespace_re=n.namespace?RegExp("(^|\\.)"+m.join("\\.(?:.*\\.|)")+"(\\.|$)"):null,n.result=t,n.target||(n.target=i),r=null==r?[n]:x.makeArray(r,[n]),p=x.event.special[g]||{},o||!p.trigger||p.trigger.apply(i,r)!==!1)){if(!o&&!p.noBubble&&!x.isWindow(i)){for(c=p.delegateType||g,nt.test(c+g)||(u=u.parentNode);u;u=u.parentNode)h.push(u),f=u;f===(i.ownerDocument||a)&&h.push(f.defaultView||f.parentWindow||e)}d=0;while((u=h[d++])&&!n.isPropagationStopped())n.type=d>1?c:p.bindType||g,s=(x._data(u,"events")||{})[n.type]&&x._data(u,"handle"),s&&s.apply(u,r),s=l&&u[l],s&&x.acceptData(u)&&s.apply&&s.apply(u,r)===!1&&n.preventDefault();if(n.type=g,!o&&!n.isDefaultPrevented()&&(!p._default||p._default.apply(h.pop(),r)===!1)&&x.acceptData(i)&&l&&i[g]&&!x.isWindow(i)){f=i[l],f&&(i[l]=null),x.event.triggered=g;try{i[g]()}catch(y){}x.event.triggered=t,f&&(i[l]=f)}return n.result}},dispatch:function(e){e=x.event.fix(e);var n,r,i,o,a,s=[],l=g.call(arguments),u=(x._data(this,"events")||{})[e.type]||[],c=x.event.special[e.type]||{};if(l[0]=e,e.delegateTarget=this,!c.preDispatch||c.preDispatch.call(this,e)!==!1){s=x.event.handlers.call(this,e,u),n=0;while((o=s[n++])&&!e.isPropagationStopped()){e.currentTarget=o.elem,a=0;while((i=o.handlers[a++])&&!e.isImmediatePropagationStopped())(!e.namespace_re||e.namespace_re.test(i.namespace))&&(e.handleObj=i,e.data=i.data,r=((x.event.special[i.origType]||{}).handle||i.handler).apply(o.elem,l),r!==t&&(e.result=r)===!1&&(e.preventDefault(),e.stopPropagation()))}return c.postDispatch&&c.postDispatch.call(this,e),e.result}},handlers:function(e,n){var r,i,o,a,s=[],l=n.delegateCount,u=e.target;if(l&&u.nodeType&&(!e.button||"click"!==e.type))for(;u!=this;u=u.parentNode||this)if(1===u.nodeType&&(u.disabled!==!0||"click"!==e.type)){for(o=[],a=0;l>a;a++)i=n[a],r=i.selector+" ",o[r]===t&&(o[r]=i.needsContext?x(r,this).index(u)>=0:x.find(r,this,null,[u]).length),o[r]&&o.push(i);o.length&&s.push({elem:u,handlers:o})}return n.length>l&&s.push({elem:this,handlers:n.slice(l)}),s},fix:function(e){if(e[x.expando])return e;var t,n,r,i=e.type,o=e,s=this.fixHooks[i];s||(this.fixHooks[i]=s=tt.test(i)?this.mouseHooks:et.test(i)?this.keyHooks:{}),r=s.props?this.props.concat(s.props):this.props,e=new x.Event(o),t=r.length;while(t--)n=r[t],e[n]=o[n];return e.target||(e.target=o.srcElement||a),3===e.target.nodeType&&(e.target=e.target.parentNode),e.metaKey=!!e.metaKey,s.filter?s.filter(e,o):e},props:"altKey bubbles cancelable ctrlKey currentTarget eventPhase metaKey relatedTarget shiftKey target timeStamp view which".split(" "),fixHooks:{},keyHooks:{props:"char charCode key keyCode".split(" "),filter:function(e,t){return null==e.which&&(e.which=null!=t.charCode?t.charCode:t.keyCode),e}},mouseHooks:{props:"button buttons clientX clientY fromElement offsetX offsetY pageX pageY screenX screenY toElement".split(" "),filter:function(e,n){var r,i,o,s=n.button,l=n.fromElement;return null==e.pageX&&null!=n.clientX&&(i=e.target.ownerDocument||a,o=i.documentElement,r=i.body,e.pageX=n.clientX+(o&&o.scrollLeft||r&&r.scrollLeft||0)-(o&&o.clientLeft||r&&r.clientLeft||0),e.pageY=n.clientY+(o&&o.scrollTop||r&&r.scrollTop||0)-(o&&o.clientTop||r&&r.clientTop||0)),!e.relatedTarget&&l&&(e.relatedTarget=l===e.target?n.toElement:l),e.which||s===t||(e.which=1&s?1:2&s?3:4&s?2:0),e}},special:{load:{noBubble:!0},focus:{trigger:function(){if(this!==at()&&this.focus)try{return this.focus(),!1}catch(e){}},delegateType:"focusin"},blur:{trigger:function(){return this===at()&&this.blur?(this.blur(),!1):t},delegateType:"focusout"},click:{trigger:function(){return x.nodeName(this,"input")&&"checkbox"===this.type&&this.click?(this.click(),!1):t},_default:function(e){return x.nodeName(e.target,"a")}},beforeunload:{postDispatch:function(e){e.result!==t&&(e.originalEvent.returnValue=e.result)}}},simulate:function(e,t,n,r){var i=x.extend(new x.Event,n,{type:e,isSimulated:!0,originalEvent:{}});r?x.event.trigger(i,null,t):x.event.dispatch.call(t,i),i.isDefaultPrevented()&&n.preventDefault()}},x.removeEvent=a.removeEventListener?function(e,t,n){e.removeEventListener&&e.removeEventListener(t,n,!1)}:function(e,t,n){var r="on"+t;e.detachEvent&&(typeof e[r]===i&&(e[r]=null),e.detachEvent(r,n))},x.Event=function(e,n){return this instanceof x.Event?(e&&e.type?(this.originalEvent=e,this.type=e.type,this.isDefaultPrevented=e.defaultPrevented||e.returnValue===!1||e.getPreventDefault&&e.getPreventDefault()?it:ot):this.type=e,n&&x.extend(this,n),this.timeStamp=e&&e.timeStamp||x.now(),this[x.expando]=!0,t):new x.Event(e,n)},x.Event.prototype={isDefaultPrevented:ot,isPropagationStopped:ot,isImmediatePropagationStopped:ot,preventDefault:function(){var e=this.originalEvent;this.isDefaultPrevented=it,e&&(e.preventDefault?e.preventDefault():e.returnValue=!1)},stopPropagation:function(){var e=this.originalEvent;this.isPropagationStopped=it,e&&(e.stopPropagation&&e.stopPropagation(),e.cancelBubble=!0)},stopImmediatePropagation:function(){this.isImmediatePropagationStopped=it,this.stopPropagation()}},x.each({mouseenter:"mouseover",mouseleave:"mouseout"},function(e,t){x.event.special[e]={delegateType:t,bindType:t,handle:function(e){var n,r=this,i=e.relatedTarget,o=e.handleObj;return(!i||i!==r&&!x.contains(r,i))&&(e.type=o.origType,n=o.handler.apply(this,arguments),e.type=t),n}}}),x.support.submitBubbles||(x.event.special.submit={setup:function(){return x.nodeName(this,"form")?!1:(x.event.add(this,"click._submit keypress._submit",function(e){var n=e.target,r=x.nodeName(n,"input")||x.nodeName(n,"button")?n.form:t;r&&!x._data(r,"submitBubbles")&&(x.event.add(r,"submit._submit",function(e){e._submit_bubble=!0}),x._data(r,"submitBubbles",!0))}),t)},postDispatch:function(e){e._submit_bubble&&(delete e._submit_bubble,this.parentNode&&!e.isTrigger&&x.event.simulate("submit",this.parentNode,e,!0))},teardown:function(){return x.nodeName(this,"form")?!1:(x.event.remove(this,"._submit"),t)}}),x.support.changeBubbles||(x.event.special.change={setup:function(){return Z.test(this.nodeName)?(("checkbox"===this.type||"radio"===this.type)&&(x.event.add(this,"propertychange._change",function(e){"checked"===e.originalEvent.propertyName&&(this._just_changed=!0)}),x.event.add(this,"click._change",function(e){this._just_changed&&!e.isTrigger&&(this._just_changed=!1),x.event.simulate("change",this,e,!0)})),!1):(x.event.add(this,"beforeactivate._change",function(e){var t=e.target;Z.test(t.nodeName)&&!x._data(t,"changeBubbles")&&(x.event.add(t,"change._change",function(e){!this.parentNode||e.isSimulated||e.isTrigger||x.event.simulate("change",this.parentNode,e,!0)}),x._data(t,"changeBubbles",!0))}),t)},handle:function(e){var n=e.target;return this!==n||e.isSimulated||e.isTrigger||"radio"!==n.type&&"checkbox"!==n.type?e.handleObj.handler.apply(this,arguments):t},teardown:function(){return x.event.remove(this,"._change"),!Z.test(this.nodeName)}}),x.support.focusinBubbles||x.each({focus:"focusin",blur:"focusout"},function(e,t){var n=0,r=function(e){x.event.simulate(t,e.target,x.event.fix(e),!0)};x.event.special[t]={setup:function(){0===n++&&a.addEventListener(e,r,!0)},teardown:function(){0===--n&&a.removeEventListener(e,r,!0)}}}),x.fn.extend({on:function(e,n,r,i,o){var a,s;if("object"==typeof e){"string"!=typeof n&&(r=r||n,n=t);for(a in e)this.on(a,n,r,e[a],o);return this}if(null==r&&null==i?(i=n,r=n=t):null==i&&("string"==typeof n?(i=r,r=t):(i=r,r=n,n=t)),i===!1)i=ot;else if(!i)return this;return 1===o&&(s=i,i=function(e){return x().off(e),s.apply(this,arguments)},i.guid=s.guid||(s.guid=x.guid++)),this.each(function(){x.event.add(this,e,i,r,n)})},one:function(e,t,n,r){return this.on(e,t,n,r,1)},off:function(e,n,r){var i,o;if(e&&e.preventDefault&&e.handleObj)return i=e.handleObj,x(e.delegateTarget).off(i.namespace?i.origType+"."+i.namespace:i.origType,i.selector,i.handler),this;if("object"==typeof e){for(o in e)this.off(o,n,e[o]);return this}return(n===!1||"function"==typeof n)&&(r=n,n=t),r===!1&&(r=ot),this.each(function(){x.event.remove(this,e,r,n)})},trigger:function(e,t){return this.each(function(){x.event.trigger(e,t,this)})},triggerHandler:function(e,n){var r=this[0];return r?x.event.trigger(e,n,r,!0):t}});var st=/^.[^:#\[\.,]*$/,lt=/^(?:parents|prev(?:Until|All))/,ut=x.expr.match.needsContext,ct={children:!0,contents:!0,next:!0,prev:!0};x.fn.extend({find:function(e){var t,n=[],r=this,i=r.length;if("string"!=typeof e)return this.pushStack(x(e).filter(function(){for(t=0;i>t;t++)if(x.contains(r[t],this))return!0}));for(t=0;i>t;t++)x.find(e,r[t],n);return n=this.pushStack(i>1?x.unique(n):n),n.selector=this.selector?this.selector+" "+e:e,n},has:function(e){var t,n=x(e,this),r=n.length;return this.filter(function(){for(t=0;r>t;t++)if(x.contains(this,n[t]))return!0})},not:function(e){return this.pushStack(ft(this,e||[],!0))},filter:function(e){return this.pushStack(ft(this,e||[],!1))},is:function(e){return!!ft(this,"string"==typeof e&&ut.test(e)?x(e):e||[],!1).length},closest:function(e,t){var n,r=0,i=this.length,o=[],a=ut.test(e)||"string"!=typeof e?x(e,t||this.context):0;for(;i>r;r++)for(n=this[r];n&&n!==t;n=n.parentNode)if(11>n.nodeType&&(a?a.index(n)>-1:1===n.nodeType&&x.find.matchesSelector(n,e))){n=o.push(n);break}return this.pushStack(o.length>1?x.unique(o):o)},index:function(e){return e?"string"==typeof e?x.inArray(this[0],x(e)):x.inArray(e.jquery?e[0]:e,this):this[0]&&this[0].parentNode?this.first().prevAll().length:-1},add:function(e,t){var n="string"==typeof e?x(e,t):x.makeArray(e&&e.nodeType?[e]:e),r=x.merge(this.get(),n);return this.pushStack(x.unique(r))},addBack:function(e){return this.add(null==e?this.prevObject:this.prevObject.filter(e))}});function pt(e,t){do e=e[t];while(e&&1!==e.nodeType);return e}x.each({parent:function(e){var t=e.parentNode;return t&&11!==t.nodeType?t:null},parents:function(e){return x.dir(e,"parentNode")},parentsUntil:function(e,t,n){return x.dir(e,"parentNode",n)},next:function(e){return pt(e,"nextSibling")},prev:function(e){return pt(e,"previousSibling")},nextAll:function(e){return x.dir(e,"nextSibling")},prevAll:function(e){return x.dir(e,"previousSibling")},nextUntil:function(e,t,n){return x.dir(e,"nextSibling",n)},prevUntil:function(e,t,n){return x.dir(e,"previousSibling",n)},siblings:function(e){return x.sibling((e.parentNode||{}).firstChild,e)},children:function(e){return x.sibling(e.firstChild)},contents:function(e){return x.nodeName(e,"iframe")?e.contentDocument||e.contentWindow.document:x.merge([],e.childNodes)}},function(e,t){x.fn[e]=function(n,r){var i=x.map(this,t,n);return"Until"!==e.slice(-5)&&(r=n),r&&"string"==typeof r&&(i=x.filter(r,i)),this.length>1&&(ct[e]||(i=x.unique(i)),lt.test(e)&&(i=i.reverse())),this.pushStack(i)}}),x.extend({filter:function(e,t,n){var r=t[0];return n&&(e=":not("+e+")"),1===t.length&&1===r.nodeType?x.find.matchesSelector(r,e)?[r]:[]:x.find.matches(e,x.grep(t,function(e){return 1===e.nodeType}))},dir:function(e,n,r){var i=[],o=e[n];while(o&&9!==o.nodeType&&(r===t||1!==o.nodeType||!x(o).is(r)))1===o.nodeType&&i.push(o),o=o[n];return i},sibling:function(e,t){var n=[];for(;e;e=e.nextSibling)1===e.nodeType&&e!==t&&n.push(e);return n}});function ft(e,t,n){if(x.isFunction(t))return x.grep(e,function(e,r){return!!t.call(e,r,e)!==n});if(t.nodeType)return x.grep(e,function(e){return e===t!==n});if("string"==typeof t){if(st.test(t))return x.filter(t,e,n);t=x.filter(t,e)}return x.grep(e,function(e){return x.inArray(e,t)>=0!==n})}function dt(e){var t=ht.split("|"),n=e.createDocumentFragment();if(n.createElement)while(t.length)n.createElement(t.pop());return n}var ht="abbr|article|aside|audio|bdi|canvas|data|datalist|details|figcaption|figure|footer|header|hgroup|mark|meter|nav|output|progress|section|summary|time|video",gt=/ jQuery\d+="(?:null|\d+)"/g,mt=RegExp("<(?:"+ht+")[\\s/>]","i"),yt=/^\s+/,vt=/<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:]+)[^>]*)\/>/gi,bt=/<([\w:]+)/,xt=/<tbody/i,wt=/<|&#?\w+;/,Tt=/<(?:script|style|link)/i,Ct=/^(?:checkbox|radio)$/i,Nt=/checked\s*(?:[^=]|=\s*.checked.)/i,kt=/^$|\/(?:java|ecma)script/i,Et=/^true\/(.*)/,St=/^\s*<!(?:\[CDATA\[|--)|(?:\]\]|--)>\s*$/g,At={option:[1,"<select multiple='multiple'>","</select>"],legend:[1,"<fieldset>","</fieldset>"],area:[1,"<map>","</map>"],param:[1,"<object>","</object>"],thead:[1,"<table>","</table>"],tr:[2,"<table><tbody>","</tbody></table>"],col:[2,"<table><tbody></tbody><colgroup>","</colgroup></table>"],td:[3,"<table><tbody><tr>","</tr></tbody></table>"],_default:x.support.htmlSerialize?[0,"",""]:[1,"X<div>","</div>"]},jt=dt(a),Dt=jt.appendChild(a.createElement("div"));At.optgroup=At.option,At.tbody=At.tfoot=At.colgroup=At.caption=At.thead,At.th=At.td,x.fn.extend({text:function(e){return x.access(this,function(e){return e===t?x.text(this):this.empty().append((this[0]&&this[0].ownerDocument||a).createTextNode(e))},null,e,arguments.length)},append:function(){return this.domManip(arguments,function(e){if(1===this.nodeType||11===this.nodeType||9===this.nodeType){var t=Lt(this,e);t.appendChild(e)}})},prepend:function(){return this.domManip(arguments,function(e){if(1===this.nodeType||11===this.nodeType||9===this.nodeType){var t=Lt(this,e);t.insertBefore(e,t.firstChild)}})},before:function(){return this.domManip(arguments,function(e){this.parentNode&&this.parentNode.insertBefore(e,this)})},after:function(){return this.domManip(arguments,function(e){this.parentNode&&this.parentNode.insertBefore(e,this.nextSibling)})},remove:function(e,t){var n,r=e?x.filter(e,this):this,i=0;for(;null!=(n=r[i]);i++)t||1!==n.nodeType||x.cleanData(Ft(n)),n.parentNode&&(t&&x.contains(n.ownerDocument,n)&&_t(Ft(n,"script")),n.parentNode.removeChild(n));return this},empty:function(){var e,t=0;for(;null!=(e=this[t]);t++){1===e.nodeType&&x.cleanData(Ft(e,!1));while(e.firstChild)e.removeChild(e.firstChild);e.options&&x.nodeName(e,"select")&&(e.options.length=0)}return this},clone:function(e,t){return e=null==e?!1:e,t=null==t?e:t,this.map(function(){return x.clone(this,e,t)})},html:function(e){return x.access(this,function(e){var n=this[0]||{},r=0,i=this.length;if(e===t)return 1===n.nodeType?n.innerHTML.replace(gt,""):t;if(!("string"!=typeof e||Tt.test(e)||!x.support.htmlSerialize&&mt.test(e)||!x.support.leadingWhitespace&&yt.test(e)||At[(bt.exec(e)||["",""])[1].toLowerCase()])){e=e.replace(vt,"<$1></$2>");try{for(;i>r;r++)n=this[r]||{},1===n.nodeType&&(x.cleanData(Ft(n,!1)),n.innerHTML=e);n=0}catch(o){}}n&&this.empty().append(e)},null,e,arguments.length)},replaceWith:function(){var e=x.map(this,function(e){return[e.nextSibling,e.parentNode]}),t=0;return this.domManip(arguments,function(n){var r=e[t++],i=e[t++];i&&(r&&r.parentNode!==i&&(r=this.nextSibling),x(this).remove(),i.insertBefore(n,r))},!0),t?this:this.remove()},detach:function(e){return this.remove(e,!0)},domManip:function(e,t,n){e=d.apply([],e);var r,i,o,a,s,l,u=0,c=this.length,p=this,f=c-1,h=e[0],g=x.isFunction(h);if(g||!(1>=c||"string"!=typeof h||x.support.checkClone)&&Nt.test(h))return this.each(function(r){var i=p.eq(r);g&&(e[0]=h.call(this,r,i.html())),i.domManip(e,t,n)});if(c&&(l=x.buildFragment(e,this[0].ownerDocument,!1,!n&&this),r=l.firstChild,1===l.childNodes.length&&(l=r),r)){for(a=x.map(Ft(l,"script"),Ht),o=a.length;c>u;u++)i=l,u!==f&&(i=x.clone(i,!0,!0),o&&x.merge(a,Ft(i,"script"))),t.call(this[u],i,u);if(o)for(s=a[a.length-1].ownerDocument,x.map(a,qt),u=0;o>u;u++)i=a[u],kt.test(i.type||"")&&!x._data(i,"globalEval")&&x.contains(s,i)&&(i.src?x._evalUrl(i.src):x.globalEval((i.text||i.textContent||i.innerHTML||"").replace(St,"")));l=r=null}return this}});function Lt(e,t){return x.nodeName(e,"table")&&x.nodeName(1===t.nodeType?t:t.firstChild,"tr")?e.getElementsByTagName("tbody")[0]||e.appendChild(e.ownerDocument.createElement("tbody")):e}function Ht(e){return e.type=(null!==x.find.attr(e,"type"))+"/"+e.type,e}function qt(e){var t=Et.exec(e.type);return t?e.type=t[1]:e.removeAttribute("type"),e}function _t(e,t){var n,r=0;for(;null!=(n=e[r]);r++)x._data(n,"globalEval",!t||x._data(t[r],"globalEval"))}function Mt(e,t){if(1===t.nodeType&&x.hasData(e)){var n,r,i,o=x._data(e),a=x._data(t,o),s=o.events;if(s){delete a.handle,a.events={};for(n in s)for(r=0,i=s[n].length;i>r;r++)x.event.add(t,n,s[n][r])}a.data&&(a.data=x.extend({},a.data))}}function Ot(e,t){var n,r,i;if(1===t.nodeType){if(n=t.nodeName.toLowerCase(),!x.support.noCloneEvent&&t[x.expando]){i=x._data(t);for(r in i.events)x.removeEvent(t,r,i.handle);t.removeAttribute(x.expando)}"script"===n&&t.text!==e.text?(Ht(t).text=e.text,qt(t)):"object"===n?(t.parentNode&&(t.outerHTML=e.outerHTML),x.support.html5Clone&&e.innerHTML&&!x.trim(t.innerHTML)&&(t.innerHTML=e.innerHTML)):"input"===n&&Ct.test(e.type)?(t.defaultChecked=t.checked=e.checked,t.value!==e.value&&(t.value=e.value)):"option"===n?t.defaultSelected=t.selected=e.defaultSelected:("input"===n||"textarea"===n)&&(t.defaultValue=e.defaultValue)}}x.each({appendTo:"append",prependTo:"prepend",insertBefore:"before",insertAfter:"after",replaceAll:"replaceWith"},function(e,t){x.fn[e]=function(e){var n,r=0,i=[],o=x(e),a=o.length-1;for(;a>=r;r++)n=r===a?this:this.clone(!0),x(o[r])[t](n),h.apply(i,n.get());return this.pushStack(i)}});function Ft(e,n){var r,o,a=0,s=typeof e.getElementsByTagName!==i?e.getElementsByTagName(n||"*"):typeof e.querySelectorAll!==i?e.querySelectorAll(n||"*"):t;if(!s)for(s=[],r=e.childNodes||e;null!=(o=r[a]);a++)!n||x.nodeName(o,n)?s.push(o):x.merge(s,Ft(o,n));return n===t||n&&x.nodeName(e,n)?x.merge([e],s):s}function Bt(e){Ct.test(e.type)&&(e.defaultChecked=e.checked)}x.extend({clone:function(e,t,n){var r,i,o,a,s,l=x.contains(e.ownerDocument,e);if(x.support.html5Clone||x.isXMLDoc(e)||!mt.test("<"+e.nodeName+">")?o=e.cloneNode(!0):(Dt.innerHTML=e.outerHTML,Dt.removeChild(o=Dt.firstChild)),!(x.support.noCloneEvent&&x.support.noCloneChecked||1!==e.nodeType&&11!==e.nodeType||x.isXMLDoc(e)))for(r=Ft(o),s=Ft(e),a=0;null!=(i=s[a]);++a)r[a]&&Ot(i,r[a]);if(t)if(n)for(s=s||Ft(e),r=r||Ft(o),a=0;null!=(i=s[a]);a++)Mt(i,r[a]);else Mt(e,o);return r=Ft(o,"script"),r.length>0&&_t(r,!l&&Ft(e,"script")),r=s=i=null,o},buildFragment:function(e,t,n,r){var i,o,a,s,l,u,c,p=e.length,f=dt(t),d=[],h=0;for(;p>h;h++)if(o=e[h],o||0===o)if("object"===x.type(o))x.merge(d,o.nodeType?[o]:o);else if(wt.test(o)){s=s||f.appendChild(t.createElement("div")),l=(bt.exec(o)||["",""])[1].toLowerCase(),c=At[l]||At._default,s.innerHTML=c[1]+o.replace(vt,"<$1></$2>")+c[2],i=c[0];while(i--)s=s.lastChild;if(!x.support.leadingWhitespace&&yt.test(o)&&d.push(t.createTextNode(yt.exec(o)[0])),!x.support.tbody){o="table"!==l||xt.test(o)?"<table>"!==c[1]||xt.test(o)?0:s:s.firstChild,i=o&&o.childNodes.length;while(i--)x.nodeName(u=o.childNodes[i],"tbody")&&!u.childNodes.length&&o.removeChild(u)}x.merge(d,s.childNodes),s.textContent="";while(s.firstChild)s.removeChild(s.firstChild);s=f.lastChild}else d.push(t.createTextNode(o));s&&f.removeChild(s),x.support.appendChecked||x.grep(Ft(d,"input"),Bt),h=0;while(o=d[h++])if((!r||-1===x.inArray(o,r))&&(a=x.contains(o.ownerDocument,o),s=Ft(f.appendChild(o),"script"),a&&_t(s),n)){i=0;while(o=s[i++])kt.test(o.type||"")&&n.push(o)}return s=null,f},cleanData:function(e,t){var n,r,o,a,s=0,l=x.expando,u=x.cache,c=x.support.deleteExpando,f=x.event.special;for(;null!=(n=e[s]);s++)if((t||x.acceptData(n))&&(o=n[l],a=o&&u[o])){if(a.events)for(r in a.events)f[r]?x.event.remove(n,r):x.removeEvent(n,r,a.handle);
+u[o]&&(delete u[o],c?delete n[l]:typeof n.removeAttribute!==i?n.removeAttribute(l):n[l]=null,p.push(o))}},_evalUrl:function(e){return x.ajax({url:e,type:"GET",dataType:"script",async:!1,global:!1,"throws":!0})}}),x.fn.extend({wrapAll:function(e){if(x.isFunction(e))return this.each(function(t){x(this).wrapAll(e.call(this,t))});if(this[0]){var t=x(e,this[0].ownerDocument).eq(0).clone(!0);this[0].parentNode&&t.insertBefore(this[0]),t.map(function(){var e=this;while(e.firstChild&&1===e.firstChild.nodeType)e=e.firstChild;return e}).append(this)}return this},wrapInner:function(e){return x.isFunction(e)?this.each(function(t){x(this).wrapInner(e.call(this,t))}):this.each(function(){var t=x(this),n=t.contents();n.length?n.wrapAll(e):t.append(e)})},wrap:function(e){var t=x.isFunction(e);return this.each(function(n){x(this).wrapAll(t?e.call(this,n):e)})},unwrap:function(){return this.parent().each(function(){x.nodeName(this,"body")||x(this).replaceWith(this.childNodes)}).end()}});var Pt,Rt,Wt,$t=/alpha\([^)]*\)/i,It=/opacity\s*=\s*([^)]*)/,zt=/^(top|right|bottom|left)$/,Xt=/^(none|table(?!-c[ea]).+)/,Ut=/^margin/,Vt=RegExp("^("+w+")(.*)$","i"),Yt=RegExp("^("+w+")(?!px)[a-z%]+$","i"),Jt=RegExp("^([+-])=("+w+")","i"),Gt={BODY:"block"},Qt={position:"absolute",visibility:"hidden",display:"block"},Kt={letterSpacing:0,fontWeight:400},Zt=["Top","Right","Bottom","Left"],en=["Webkit","O","Moz","ms"];function tn(e,t){if(t in e)return t;var n=t.charAt(0).toUpperCase()+t.slice(1),r=t,i=en.length;while(i--)if(t=en[i]+n,t in e)return t;return r}function nn(e,t){return e=t||e,"none"===x.css(e,"display")||!x.contains(e.ownerDocument,e)}function rn(e,t){var n,r,i,o=[],a=0,s=e.length;for(;s>a;a++)r=e[a],r.style&&(o[a]=x._data(r,"olddisplay"),n=r.style.display,t?(o[a]||"none"!==n||(r.style.display=""),""===r.style.display&&nn(r)&&(o[a]=x._data(r,"olddisplay",ln(r.nodeName)))):o[a]||(i=nn(r),(n&&"none"!==n||!i)&&x._data(r,"olddisplay",i?n:x.css(r,"display"))));for(a=0;s>a;a++)r=e[a],r.style&&(t&&"none"!==r.style.display&&""!==r.style.display||(r.style.display=t?o[a]||"":"none"));return e}x.fn.extend({css:function(e,n){return x.access(this,function(e,n,r){var i,o,a={},s=0;if(x.isArray(n)){for(o=Rt(e),i=n.length;i>s;s++)a[n[s]]=x.css(e,n[s],!1,o);return a}return r!==t?x.style(e,n,r):x.css(e,n)},e,n,arguments.length>1)},show:function(){return rn(this,!0)},hide:function(){return rn(this)},toggle:function(e){return"boolean"==typeof e?e?this.show():this.hide():this.each(function(){nn(this)?x(this).show():x(this).hide()})}}),x.extend({cssHooks:{opacity:{get:function(e,t){if(t){var n=Wt(e,"opacity");return""===n?"1":n}}}},cssNumber:{columnCount:!0,fillOpacity:!0,fontWeight:!0,lineHeight:!0,opacity:!0,order:!0,orphans:!0,widows:!0,zIndex:!0,zoom:!0},cssProps:{"float":x.support.cssFloat?"cssFloat":"styleFloat"},style:function(e,n,r,i){if(e&&3!==e.nodeType&&8!==e.nodeType&&e.style){var o,a,s,l=x.camelCase(n),u=e.style;if(n=x.cssProps[l]||(x.cssProps[l]=tn(u,l)),s=x.cssHooks[n]||x.cssHooks[l],r===t)return s&&"get"in s&&(o=s.get(e,!1,i))!==t?o:u[n];if(a=typeof r,"string"===a&&(o=Jt.exec(r))&&(r=(o[1]+1)*o[2]+parseFloat(x.css(e,n)),a="number"),!(null==r||"number"===a&&isNaN(r)||("number"!==a||x.cssNumber[l]||(r+="px"),x.support.clearCloneStyle||""!==r||0!==n.indexOf("background")||(u[n]="inherit"),s&&"set"in s&&(r=s.set(e,r,i))===t)))try{u[n]=r}catch(c){}}},css:function(e,n,r,i){var o,a,s,l=x.camelCase(n);return n=x.cssProps[l]||(x.cssProps[l]=tn(e.style,l)),s=x.cssHooks[n]||x.cssHooks[l],s&&"get"in s&&(a=s.get(e,!0,r)),a===t&&(a=Wt(e,n,i)),"normal"===a&&n in Kt&&(a=Kt[n]),""===r||r?(o=parseFloat(a),r===!0||x.isNumeric(o)?o||0:a):a}}),e.getComputedStyle?(Rt=function(t){return e.getComputedStyle(t,null)},Wt=function(e,n,r){var i,o,a,s=r||Rt(e),l=s?s.getPropertyValue(n)||s[n]:t,u=e.style;return s&&(""!==l||x.contains(e.ownerDocument,e)||(l=x.style(e,n)),Yt.test(l)&&Ut.test(n)&&(i=u.width,o=u.minWidth,a=u.maxWidth,u.minWidth=u.maxWidth=u.width=l,l=s.width,u.width=i,u.minWidth=o,u.maxWidth=a)),l}):a.documentElement.currentStyle&&(Rt=function(e){return e.currentStyle},Wt=function(e,n,r){var i,o,a,s=r||Rt(e),l=s?s[n]:t,u=e.style;return null==l&&u&&u[n]&&(l=u[n]),Yt.test(l)&&!zt.test(n)&&(i=u.left,o=e.runtimeStyle,a=o&&o.left,a&&(o.left=e.currentStyle.left),u.left="fontSize"===n?"1em":l,l=u.pixelLeft+"px",u.left=i,a&&(o.left=a)),""===l?"auto":l});function on(e,t,n){var r=Vt.exec(t);return r?Math.max(0,r[1]-(n||0))+(r[2]||"px"):t}function an(e,t,n,r,i){var o=n===(r?"border":"content")?4:"width"===t?1:0,a=0;for(;4>o;o+=2)"margin"===n&&(a+=x.css(e,n+Zt[o],!0,i)),r?("content"===n&&(a-=x.css(e,"padding"+Zt[o],!0,i)),"margin"!==n&&(a-=x.css(e,"border"+Zt[o]+"Width",!0,i))):(a+=x.css(e,"padding"+Zt[o],!0,i),"padding"!==n&&(a+=x.css(e,"border"+Zt[o]+"Width",!0,i)));return a}function sn(e,t,n){var r=!0,i="width"===t?e.offsetWidth:e.offsetHeight,o=Rt(e),a=x.support.boxSizing&&"border-box"===x.css(e,"boxSizing",!1,o);if(0>=i||null==i){if(i=Wt(e,t,o),(0>i||null==i)&&(i=e.style[t]),Yt.test(i))return i;r=a&&(x.support.boxSizingReliable||i===e.style[t]),i=parseFloat(i)||0}return i+an(e,t,n||(a?"border":"content"),r,o)+"px"}function ln(e){var t=a,n=Gt[e];return n||(n=un(e,t),"none"!==n&&n||(Pt=(Pt||x("<iframe frameborder='0' width='0' height='0'/>").css("cssText","display:block !important")).appendTo(t.documentElement),t=(Pt[0].contentWindow||Pt[0].contentDocument).document,t.write("<!doctype html><html><body>"),t.close(),n=un(e,t),Pt.detach()),Gt[e]=n),n}function un(e,t){var n=x(t.createElement(e)).appendTo(t.body),r=x.css(n[0],"display");return n.remove(),r}x.each(["height","width"],function(e,n){x.cssHooks[n]={get:function(e,r,i){return r?0===e.offsetWidth&&Xt.test(x.css(e,"display"))?x.swap(e,Qt,function(){return sn(e,n,i)}):sn(e,n,i):t},set:function(e,t,r){var i=r&&Rt(e);return on(e,t,r?an(e,n,r,x.support.boxSizing&&"border-box"===x.css(e,"boxSizing",!1,i),i):0)}}}),x.support.opacity||(x.cssHooks.opacity={get:function(e,t){return It.test((t&&e.currentStyle?e.currentStyle.filter:e.style.filter)||"")?.01*parseFloat(RegExp.$1)+"":t?"1":""},set:function(e,t){var n=e.style,r=e.currentStyle,i=x.isNumeric(t)?"alpha(opacity="+100*t+")":"",o=r&&r.filter||n.filter||"";n.zoom=1,(t>=1||""===t)&&""===x.trim(o.replace($t,""))&&n.removeAttribute&&(n.removeAttribute("filter"),""===t||r&&!r.filter)||(n.filter=$t.test(o)?o.replace($t,i):o+" "+i)}}),x(function(){x.support.reliableMarginRight||(x.cssHooks.marginRight={get:function(e,n){return n?x.swap(e,{display:"inline-block"},Wt,[e,"marginRight"]):t}}),!x.support.pixelPosition&&x.fn.position&&x.each(["top","left"],function(e,n){x.cssHooks[n]={get:function(e,r){return r?(r=Wt(e,n),Yt.test(r)?x(e).position()[n]+"px":r):t}}})}),x.expr&&x.expr.filters&&(x.expr.filters.hidden=function(e){return 0>=e.offsetWidth&&0>=e.offsetHeight||!x.support.reliableHiddenOffsets&&"none"===(e.style&&e.style.display||x.css(e,"display"))},x.expr.filters.visible=function(e){return!x.expr.filters.hidden(e)}),x.each({margin:"",padding:"",border:"Width"},function(e,t){x.cssHooks[e+t]={expand:function(n){var r=0,i={},o="string"==typeof n?n.split(" "):[n];for(;4>r;r++)i[e+Zt[r]+t]=o[r]||o[r-2]||o[0];return i}},Ut.test(e)||(x.cssHooks[e+t].set=on)});var cn=/%20/g,pn=/\[\]$/,fn=/\r?\n/g,dn=/^(?:submit|button|image|reset|file)$/i,hn=/^(?:input|select|textarea|keygen)/i;x.fn.extend({serialize:function(){return x.param(this.serializeArray())},serializeArray:function(){return this.map(function(){var e=x.prop(this,"elements");return e?x.makeArray(e):this}).filter(function(){var e=this.type;return this.name&&!x(this).is(":disabled")&&hn.test(this.nodeName)&&!dn.test(e)&&(this.checked||!Ct.test(e))}).map(function(e,t){var n=x(this).val();return null==n?null:x.isArray(n)?x.map(n,function(e){return{name:t.name,value:e.replace(fn,"\r\n")}}):{name:t.name,value:n.replace(fn,"\r\n")}}).get()}}),x.param=function(e,n){var r,i=[],o=function(e,t){t=x.isFunction(t)?t():null==t?"":t,i[i.length]=encodeURIComponent(e)+"="+encodeURIComponent(t)};if(n===t&&(n=x.ajaxSettings&&x.ajaxSettings.traditional),x.isArray(e)||e.jquery&&!x.isPlainObject(e))x.each(e,function(){o(this.name,this.value)});else for(r in e)gn(r,e[r],n,o);return i.join("&").replace(cn,"+")};function gn(e,t,n,r){var i;if(x.isArray(t))x.each(t,function(t,i){n||pn.test(e)?r(e,i):gn(e+"["+("object"==typeof i?t:"")+"]",i,n,r)});else if(n||"object"!==x.type(t))r(e,t);else for(i in t)gn(e+"["+i+"]",t[i],n,r)}x.each("blur focus focusin focusout load resize scroll unload click dblclick mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave change select submit keydown keypress keyup error contextmenu".split(" "),function(e,t){x.fn[t]=function(e,n){return arguments.length>0?this.on(t,null,e,n):this.trigger(t)}}),x.fn.extend({hover:function(e,t){return this.mouseenter(e).mouseleave(t||e)},bind:function(e,t,n){return this.on(e,null,t,n)},unbind:function(e,t){return this.off(e,null,t)},delegate:function(e,t,n,r){return this.on(t,e,n,r)},undelegate:function(e,t,n){return 1===arguments.length?this.off(e,"**"):this.off(t,e||"**",n)}});var mn,yn,vn=x.now(),bn=/\?/,xn=/#.*$/,wn=/([?&])_=[^&]*/,Tn=/^(.*?):[ \t]*([^\r\n]*)\r?$/gm,Cn=/^(?:about|app|app-storage|.+-extension|file|res|widget):$/,Nn=/^(?:GET|HEAD)$/,kn=/^\/\//,En=/^([\w.+-]+:)(?:\/\/([^\/?#:]*)(?::(\d+)|)|)/,Sn=x.fn.load,An={},jn={},Dn="*/".concat("*");try{yn=o.href}catch(Ln){yn=a.createElement("a"),yn.href="",yn=yn.href}mn=En.exec(yn.toLowerCase())||[];function Hn(e){return function(t,n){"string"!=typeof t&&(n=t,t="*");var r,i=0,o=t.toLowerCase().match(T)||[];if(x.isFunction(n))while(r=o[i++])"+"===r[0]?(r=r.slice(1)||"*",(e[r]=e[r]||[]).unshift(n)):(e[r]=e[r]||[]).push(n)}}function qn(e,n,r,i){var o={},a=e===jn;function s(l){var u;return o[l]=!0,x.each(e[l]||[],function(e,l){var c=l(n,r,i);return"string"!=typeof c||a||o[c]?a?!(u=c):t:(n.dataTypes.unshift(c),s(c),!1)}),u}return s(n.dataTypes[0])||!o["*"]&&s("*")}function _n(e,n){var r,i,o=x.ajaxSettings.flatOptions||{};for(i in n)n[i]!==t&&((o[i]?e:r||(r={}))[i]=n[i]);return r&&x.extend(!0,e,r),e}x.fn.load=function(e,n,r){if("string"!=typeof e&&Sn)return Sn.apply(this,arguments);var i,o,a,s=this,l=e.indexOf(" ");return l>=0&&(i=e.slice(l,e.length),e=e.slice(0,l)),x.isFunction(n)?(r=n,n=t):n&&"object"==typeof n&&(a="POST"),s.length>0&&x.ajax({url:e,type:a,dataType:"html",data:n}).done(function(e){o=arguments,s.html(i?x("<div>").append(x.parseHTML(e)).find(i):e)}).complete(r&&function(e,t){s.each(r,o||[e.responseText,t,e])}),this},x.each(["ajaxStart","ajaxStop","ajaxComplete","ajaxError","ajaxSuccess","ajaxSend"],function(e,t){x.fn[t]=function(e){return this.on(t,e)}}),x.extend({active:0,lastModified:{},etag:{},ajaxSettings:{url:yn,type:"GET",isLocal:Cn.test(mn[1]),global:!0,processData:!0,async:!0,contentType:"application/x-www-form-urlencoded; charset=UTF-8",accepts:{"*":Dn,text:"text/plain",html:"text/html",xml:"application/xml, text/xml",json:"application/json, text/javascript"},contents:{xml:/xml/,html:/html/,json:/json/},responseFields:{xml:"responseXML",text:"responseText",json:"responseJSON"},converters:{"* text":String,"text html":!0,"text json":x.parseJSON,"text xml":x.parseXML},flatOptions:{url:!0,context:!0}},ajaxSetup:function(e,t){return t?_n(_n(e,x.ajaxSettings),t):_n(x.ajaxSettings,e)},ajaxPrefilter:Hn(An),ajaxTransport:Hn(jn),ajax:function(e,n){"object"==typeof e&&(n=e,e=t),n=n||{};var r,i,o,a,s,l,u,c,p=x.ajaxSetup({},n),f=p.context||p,d=p.context&&(f.nodeType||f.jquery)?x(f):x.event,h=x.Deferred(),g=x.Callbacks("once memory"),m=p.statusCode||{},y={},v={},b=0,w="canceled",C={readyState:0,getResponseHeader:function(e){var t;if(2===b){if(!c){c={};while(t=Tn.exec(a))c[t[1].toLowerCase()]=t[2]}t=c[e.toLowerCase()]}return null==t?null:t},getAllResponseHeaders:function(){return 2===b?a:null},setRequestHeader:function(e,t){var n=e.toLowerCase();return b||(e=v[n]=v[n]||e,y[e]=t),this},overrideMimeType:function(e){return b||(p.mimeType=e),this},statusCode:function(e){var t;if(e)if(2>b)for(t in e)m[t]=[m[t],e[t]];else C.always(e[C.status]);return this},abort:function(e){var t=e||w;return u&&u.abort(t),k(0,t),this}};if(h.promise(C).complete=g.add,C.success=C.done,C.error=C.fail,p.url=((e||p.url||yn)+"").replace(xn,"").replace(kn,mn[1]+"//"),p.type=n.method||n.type||p.method||p.type,p.dataTypes=x.trim(p.dataType||"*").toLowerCase().match(T)||[""],null==p.crossDomain&&(r=En.exec(p.url.toLowerCase()),p.crossDomain=!(!r||r[1]===mn[1]&&r[2]===mn[2]&&(r[3]||("http:"===r[1]?"80":"443"))===(mn[3]||("http:"===mn[1]?"80":"443")))),p.data&&p.processData&&"string"!=typeof p.data&&(p.data=x.param(p.data,p.traditional)),qn(An,p,n,C),2===b)return C;l=p.global,l&&0===x.active++&&x.event.trigger("ajaxStart"),p.type=p.type.toUpperCase(),p.hasContent=!Nn.test(p.type),o=p.url,p.hasContent||(p.data&&(o=p.url+=(bn.test(o)?"&":"?")+p.data,delete p.data),p.cache===!1&&(p.url=wn.test(o)?o.replace(wn,"$1_="+vn++):o+(bn.test(o)?"&":"?")+"_="+vn++)),p.ifModified&&(x.lastModified[o]&&C.setRequestHeader("If-Modified-Since",x.lastModified[o]),x.etag[o]&&C.setRequestHeader("If-None-Match",x.etag[o])),(p.data&&p.hasContent&&p.contentType!==!1||n.contentType)&&C.setRequestHeader("Content-Type",p.contentType),C.setRequestHeader("Accept",p.dataTypes[0]&&p.accepts[p.dataTypes[0]]?p.accepts[p.dataTypes[0]]+("*"!==p.dataTypes[0]?", "+Dn+"; q=0.01":""):p.accepts["*"]);for(i in p.headers)C.setRequestHeader(i,p.headers[i]);if(p.beforeSend&&(p.beforeSend.call(f,C,p)===!1||2===b))return C.abort();w="abort";for(i in{success:1,error:1,complete:1})C[i](p[i]);if(u=qn(jn,p,n,C)){C.readyState=1,l&&d.trigger("ajaxSend",[C,p]),p.async&&p.timeout>0&&(s=setTimeout(function(){C.abort("timeout")},p.timeout));try{b=1,u.send(y,k)}catch(N){if(!(2>b))throw N;k(-1,N)}}else k(-1,"No Transport");function k(e,n,r,i){var c,y,v,w,T,N=n;2!==b&&(b=2,s&&clearTimeout(s),u=t,a=i||"",C.readyState=e>0?4:0,c=e>=200&&300>e||304===e,r&&(w=Mn(p,C,r)),w=On(p,w,C,c),c?(p.ifModified&&(T=C.getResponseHeader("Last-Modified"),T&&(x.lastModified[o]=T),T=C.getResponseHeader("etag"),T&&(x.etag[o]=T)),204===e||"HEAD"===p.type?N="nocontent":304===e?N="notmodified":(N=w.state,y=w.data,v=w.error,c=!v)):(v=N,(e||!N)&&(N="error",0>e&&(e=0))),C.status=e,C.statusText=(n||N)+"",c?h.resolveWith(f,[y,N,C]):h.rejectWith(f,[C,N,v]),C.statusCode(m),m=t,l&&d.trigger(c?"ajaxSuccess":"ajaxError",[C,p,c?y:v]),g.fireWith(f,[C,N]),l&&(d.trigger("ajaxComplete",[C,p]),--x.active||x.event.trigger("ajaxStop")))}return C},getJSON:function(e,t,n){return x.get(e,t,n,"json")},getScript:function(e,n){return x.get(e,t,n,"script")}}),x.each(["get","post"],function(e,n){x[n]=function(e,r,i,o){return x.isFunction(r)&&(o=o||i,i=r,r=t),x.ajax({url:e,type:n,dataType:o,data:r,success:i})}});function Mn(e,n,r){var i,o,a,s,l=e.contents,u=e.dataTypes;while("*"===u[0])u.shift(),o===t&&(o=e.mimeType||n.getResponseHeader("Content-Type"));if(o)for(s in l)if(l[s]&&l[s].test(o)){u.unshift(s);break}if(u[0]in r)a=u[0];else{for(s in r){if(!u[0]||e.converters[s+" "+u[0]]){a=s;break}i||(i=s)}a=a||i}return a?(a!==u[0]&&u.unshift(a),r[a]):t}function On(e,t,n,r){var i,o,a,s,l,u={},c=e.dataTypes.slice();if(c[1])for(a in e.converters)u[a.toLowerCase()]=e.converters[a];o=c.shift();while(o)if(e.responseFields[o]&&(n[e.responseFields[o]]=t),!l&&r&&e.dataFilter&&(t=e.dataFilter(t,e.dataType)),l=o,o=c.shift())if("*"===o)o=l;else if("*"!==l&&l!==o){if(a=u[l+" "+o]||u["* "+o],!a)for(i in u)if(s=i.split(" "),s[1]===o&&(a=u[l+" "+s[0]]||u["* "+s[0]])){a===!0?a=u[i]:u[i]!==!0&&(o=s[0],c.unshift(s[1]));break}if(a!==!0)if(a&&e["throws"])t=a(t);else try{t=a(t)}catch(p){return{state:"parsererror",error:a?p:"No conversion from "+l+" to "+o}}}return{state:"success",data:t}}x.ajaxSetup({accepts:{script:"text/javascript, application/javascript, application/ecmascript, application/x-ecmascript"},contents:{script:/(?:java|ecma)script/},converters:{"text script":function(e){return x.globalEval(e),e}}}),x.ajaxPrefilter("script",function(e){e.cache===t&&(e.cache=!1),e.crossDomain&&(e.type="GET",e.global=!1)}),x.ajaxTransport("script",function(e){if(e.crossDomain){var n,r=a.head||x("head")[0]||a.documentElement;return{send:function(t,i){n=a.createElement("script"),n.async=!0,e.scriptCharset&&(n.charset=e.scriptCharset),n.src=e.url,n.onload=n.onreadystatechange=function(e,t){(t||!n.readyState||/loaded|complete/.test(n.readyState))&&(n.onload=n.onreadystatechange=null,n.parentNode&&n.parentNode.removeChild(n),n=null,t||i(200,"success"))},r.insertBefore(n,r.firstChild)},abort:function(){n&&n.onload(t,!0)}}}});var Fn=[],Bn=/(=)\?(?=&|$)|\?\?/;x.ajaxSetup({jsonp:"callback",jsonpCallback:function(){var e=Fn.pop()||x.expando+"_"+vn++;return this[e]=!0,e}}),x.ajaxPrefilter("json jsonp",function(n,r,i){var o,a,s,l=n.jsonp!==!1&&(Bn.test(n.url)?"url":"string"==typeof n.data&&!(n.contentType||"").indexOf("application/x-www-form-urlencoded")&&Bn.test(n.data)&&"data");return l||"jsonp"===n.dataTypes[0]?(o=n.jsonpCallback=x.isFunction(n.jsonpCallback)?n.jsonpCallback():n.jsonpCallback,l?n[l]=n[l].replace(Bn,"$1"+o):n.jsonp!==!1&&(n.url+=(bn.test(n.url)?"&":"?")+n.jsonp+"="+o),n.converters["script json"]=function(){return s||x.error(o+" was not called"),s[0]},n.dataTypes[0]="json",a=e[o],e[o]=function(){s=arguments},i.always(function(){e[o]=a,n[o]&&(n.jsonpCallback=r.jsonpCallback,Fn.push(o)),s&&x.isFunction(a)&&a(s[0]),s=a=t}),"script"):t});var Pn,Rn,Wn=0,$n=e.ActiveXObject&&function(){var e;for(e in Pn)Pn[e](t,!0)};function In(){try{return new e.XMLHttpRequest}catch(t){}}function zn(){try{return new e.ActiveXObject("Microsoft.XMLHTTP")}catch(t){}}x.ajaxSettings.xhr=e.ActiveXObject?function(){return!this.isLocal&&In()||zn()}:In,Rn=x.ajaxSettings.xhr(),x.support.cors=!!Rn&&"withCredentials"in Rn,Rn=x.support.ajax=!!Rn,Rn&&x.ajaxTransport(function(n){if(!n.crossDomain||x.support.cors){var r;return{send:function(i,o){var a,s,l=n.xhr();if(n.username?l.open(n.type,n.url,n.async,n.username,n.password):l.open(n.type,n.url,n.async),n.xhrFields)for(s in n.xhrFields)l[s]=n.xhrFields[s];n.mimeType&&l.overrideMimeType&&l.overrideMimeType(n.mimeType),n.crossDomain||i["X-Requested-With"]||(i["X-Requested-With"]="XMLHttpRequest");try{for(s in i)l.setRequestHeader(s,i[s])}catch(u){}l.send(n.hasContent&&n.data||null),r=function(e,i){var s,u,c,p;try{if(r&&(i||4===l.readyState))if(r=t,a&&(l.onreadystatechange=x.noop,$n&&delete Pn[a]),i)4!==l.readyState&&l.abort();else{p={},s=l.status,u=l.getAllResponseHeaders(),"string"==typeof l.responseText&&(p.text=l.responseText);try{c=l.statusText}catch(f){c=""}s||!n.isLocal||n.crossDomain?1223===s&&(s=204):s=p.text?200:404}}catch(d){i||o(-1,d)}p&&o(s,c,p,u)},n.async?4===l.readyState?setTimeout(r):(a=++Wn,$n&&(Pn||(Pn={},x(e).unload($n)),Pn[a]=r),l.onreadystatechange=r):r()},abort:function(){r&&r(t,!0)}}}});var Xn,Un,Vn=/^(?:toggle|show|hide)$/,Yn=RegExp("^(?:([+-])=|)("+w+")([a-z%]*)$","i"),Jn=/queueHooks$/,Gn=[nr],Qn={"*":[function(e,t){var n=this.createTween(e,t),r=n.cur(),i=Yn.exec(t),o=i&&i[3]||(x.cssNumber[e]?"":"px"),a=(x.cssNumber[e]||"px"!==o&&+r)&&Yn.exec(x.css(n.elem,e)),s=1,l=20;if(a&&a[3]!==o){o=o||a[3],i=i||[],a=+r||1;do s=s||".5",a/=s,x.style(n.elem,e,a+o);while(s!==(s=n.cur()/r)&&1!==s&&--l)}return i&&(a=n.start=+a||+r||0,n.unit=o,n.end=i[1]?a+(i[1]+1)*i[2]:+i[2]),n}]};function Kn(){return setTimeout(function(){Xn=t}),Xn=x.now()}function Zn(e,t,n){var r,i=(Qn[t]||[]).concat(Qn["*"]),o=0,a=i.length;for(;a>o;o++)if(r=i[o].call(n,t,e))return r}function er(e,t,n){var r,i,o=0,a=Gn.length,s=x.Deferred().always(function(){delete l.elem}),l=function(){if(i)return!1;var t=Xn||Kn(),n=Math.max(0,u.startTime+u.duration-t),r=n/u.duration||0,o=1-r,a=0,l=u.tweens.length;for(;l>a;a++)u.tweens[a].run(o);return s.notifyWith(e,[u,o,n]),1>o&&l?n:(s.resolveWith(e,[u]),!1)},u=s.promise({elem:e,props:x.extend({},t),opts:x.extend(!0,{specialEasing:{}},n),originalProperties:t,originalOptions:n,startTime:Xn||Kn(),duration:n.duration,tweens:[],createTween:function(t,n){var r=x.Tween(e,u.opts,t,n,u.opts.specialEasing[t]||u.opts.easing);return u.tweens.push(r),r},stop:function(t){var n=0,r=t?u.tweens.length:0;if(i)return this;for(i=!0;r>n;n++)u.tweens[n].run(1);return t?s.resolveWith(e,[u,t]):s.rejectWith(e,[u,t]),this}}),c=u.props;for(tr(c,u.opts.specialEasing);a>o;o++)if(r=Gn[o].call(u,e,c,u.opts))return r;return x.map(c,Zn,u),x.isFunction(u.opts.start)&&u.opts.start.call(e,u),x.fx.timer(x.extend(l,{elem:e,anim:u,queue:u.opts.queue})),u.progress(u.opts.progress).done(u.opts.done,u.opts.complete).fail(u.opts.fail).always(u.opts.always)}function tr(e,t){var n,r,i,o,a;for(n in e)if(r=x.camelCase(n),i=t[r],o=e[n],x.isArray(o)&&(i=o[1],o=e[n]=o[0]),n!==r&&(e[r]=o,delete e[n]),a=x.cssHooks[r],a&&"expand"in a){o=a.expand(o),delete e[r];for(n in o)n in e||(e[n]=o[n],t[n]=i)}else t[r]=i}x.Animation=x.extend(er,{tweener:function(e,t){x.isFunction(e)?(t=e,e=["*"]):e=e.split(" ");var n,r=0,i=e.length;for(;i>r;r++)n=e[r],Qn[n]=Qn[n]||[],Qn[n].unshift(t)},prefilter:function(e,t){t?Gn.unshift(e):Gn.push(e)}});function nr(e,t,n){var r,i,o,a,s,l,u=this,c={},p=e.style,f=e.nodeType&&nn(e),d=x._data(e,"fxshow");n.queue||(s=x._queueHooks(e,"fx"),null==s.unqueued&&(s.unqueued=0,l=s.empty.fire,s.empty.fire=function(){s.unqueued||l()}),s.unqueued++,u.always(function(){u.always(function(){s.unqueued--,x.queue(e,"fx").length||s.empty.fire()})})),1===e.nodeType&&("height"in t||"width"in t)&&(n.overflow=[p.overflow,p.overflowX,p.overflowY],"inline"===x.css(e,"display")&&"none"===x.css(e,"float")&&(x.support.inlineBlockNeedsLayout&&"inline"!==ln(e.nodeName)?p.zoom=1:p.display="inline-block")),n.overflow&&(p.overflow="hidden",x.support.shrinkWrapBlocks||u.always(function(){p.overflow=n.overflow[0],p.overflowX=n.overflow[1],p.overflowY=n.overflow[2]}));for(r in t)if(i=t[r],Vn.exec(i)){if(delete t[r],o=o||"toggle"===i,i===(f?"hide":"show"))continue;c[r]=d&&d[r]||x.style(e,r)}if(!x.isEmptyObject(c)){d?"hidden"in d&&(f=d.hidden):d=x._data(e,"fxshow",{}),o&&(d.hidden=!f),f?x(e).show():u.done(function(){x(e).hide()}),u.done(function(){var t;x._removeData(e,"fxshow");for(t in c)x.style(e,t,c[t])});for(r in c)a=Zn(f?d[r]:0,r,u),r in d||(d[r]=a.start,f&&(a.end=a.start,a.start="width"===r||"height"===r?1:0))}}function rr(e,t,n,r,i){return new rr.prototype.init(e,t,n,r,i)}x.Tween=rr,rr.prototype={constructor:rr,init:function(e,t,n,r,i,o){this.elem=e,this.prop=n,this.easing=i||"swing",this.options=t,this.start=this.now=this.cur(),this.end=r,this.unit=o||(x.cssNumber[n]?"":"px")},cur:function(){var e=rr.propHooks[this.prop];return e&&e.get?e.get(this):rr.propHooks._default.get(this)},run:function(e){var t,n=rr.propHooks[this.prop];return this.pos=t=this.options.duration?x.easing[this.easing](e,this.options.duration*e,0,1,this.options.duration):e,this.now=(this.end-this.start)*t+this.start,this.options.step&&this.options.step.call(this.elem,this.now,this),n&&n.set?n.set(this):rr.propHooks._default.set(this),this}},rr.prototype.init.prototype=rr.prototype,rr.propHooks={_default:{get:function(e){var t;return null==e.elem[e.prop]||e.elem.style&&null!=e.elem.style[e.prop]?(t=x.css(e.elem,e.prop,""),t&&"auto"!==t?t:0):e.elem[e.prop]},set:function(e){x.fx.step[e.prop]?x.fx.step[e.prop](e):e.elem.style&&(null!=e.elem.style[x.cssProps[e.prop]]||x.cssHooks[e.prop])?x.style(e.elem,e.prop,e.now+e.unit):e.elem[e.prop]=e.now}}},rr.propHooks.scrollTop=rr.propHooks.scrollLeft={set:function(e){e.elem.nodeType&&e.elem.parentNode&&(e.elem[e.prop]=e.now)}},x.each(["toggle","show","hide"],function(e,t){var n=x.fn[t];x.fn[t]=function(e,r,i){return null==e||"boolean"==typeof e?n.apply(this,arguments):this.animate(ir(t,!0),e,r,i)}}),x.fn.extend({fadeTo:function(e,t,n,r){return this.filter(nn).css("opacity",0).show().end().animate({opacity:t},e,n,r)},animate:function(e,t,n,r){var i=x.isEmptyObject(e),o=x.speed(t,n,r),a=function(){var t=er(this,x.extend({},e),o);(i||x._data(this,"finish"))&&t.stop(!0)};return a.finish=a,i||o.queue===!1?this.each(a):this.queue(o.queue,a)},stop:function(e,n,r){var i=function(e){var t=e.stop;delete e.stop,t(r)};return"string"!=typeof e&&(r=n,n=e,e=t),n&&e!==!1&&this.queue(e||"fx",[]),this.each(function(){var t=!0,n=null!=e&&e+"queueHooks",o=x.timers,a=x._data(this);if(n)a[n]&&a[n].stop&&i(a[n]);else for(n in a)a[n]&&a[n].stop&&Jn.test(n)&&i(a[n]);for(n=o.length;n--;)o[n].elem!==this||null!=e&&o[n].queue!==e||(o[n].anim.stop(r),t=!1,o.splice(n,1));(t||!r)&&x.dequeue(this,e)})},finish:function(e){return e!==!1&&(e=e||"fx"),this.each(function(){var t,n=x._data(this),r=n[e+"queue"],i=n[e+"queueHooks"],o=x.timers,a=r?r.length:0;for(n.finish=!0,x.queue(this,e,[]),i&&i.stop&&i.stop.call(this,!0),t=o.length;t--;)o[t].elem===this&&o[t].queue===e&&(o[t].anim.stop(!0),o.splice(t,1));for(t=0;a>t;t++)r[t]&&r[t].finish&&r[t].finish.call(this);delete n.finish})}});function ir(e,t){var n,r={height:e},i=0;for(t=t?1:0;4>i;i+=2-t)n=Zt[i],r["margin"+n]=r["padding"+n]=e;return t&&(r.opacity=r.width=e),r}x.each({slideDown:ir("show"),slideUp:ir("hide"),slideToggle:ir("toggle"),fadeIn:{opacity:"show"},fadeOut:{opacity:"hide"},fadeToggle:{opacity:"toggle"}},function(e,t){x.fn[e]=function(e,n,r){return this.animate(t,e,n,r)}}),x.speed=function(e,t,n){var r=e&&"object"==typeof e?x.extend({},e):{complete:n||!n&&t||x.isFunction(e)&&e,duration:e,easing:n&&t||t&&!x.isFunction(t)&&t};return r.duration=x.fx.off?0:"number"==typeof r.duration?r.duration:r.duration in x.fx.speeds?x.fx.speeds[r.duration]:x.fx.speeds._default,(null==r.queue||r.queue===!0)&&(r.queue="fx"),r.old=r.complete,r.complete=function(){x.isFunction(r.old)&&r.old.call(this),r.queue&&x.dequeue(this,r.queue)},r},x.easing={linear:function(e){return e},swing:function(e){return.5-Math.cos(e*Math.PI)/2}},x.timers=[],x.fx=rr.prototype.init,x.fx.tick=function(){var e,n=x.timers,r=0;for(Xn=x.now();n.length>r;r++)e=n[r],e()||n[r]!==e||n.splice(r--,1);n.length||x.fx.stop(),Xn=t},x.fx.timer=function(e){e()&&x.timers.push(e)&&x.fx.start()},x.fx.interval=13,x.fx.start=function(){Un||(Un=setInterval(x.fx.tick,x.fx.interval))},x.fx.stop=function(){clearInterval(Un),Un=null},x.fx.speeds={slow:600,fast:200,_default:400},x.fx.step={},x.expr&&x.expr.filters&&(x.expr.filters.animated=function(e){return x.grep(x.timers,function(t){return e===t.elem}).length}),x.fn.offset=function(e){if(arguments.length)return e===t?this:this.each(function(t){x.offset.setOffset(this,e,t)});var n,r,o={top:0,left:0},a=this[0],s=a&&a.ownerDocument;if(s)return n=s.documentElement,x.contains(n,a)?(typeof a.getBoundingClientRect!==i&&(o=a.getBoundingClientRect()),r=or(s),{top:o.top+(r.pageYOffset||n.scrollTop)-(n.clientTop||0),left:o.left+(r.pageXOffset||n.scrollLeft)-(n.clientLeft||0)}):o},x.offset={setOffset:function(e,t,n){var r=x.css(e,"position");"static"===r&&(e.style.position="relative");var i=x(e),o=i.offset(),a=x.css(e,"top"),s=x.css(e,"left"),l=("absolute"===r||"fixed"===r)&&x.inArray("auto",[a,s])>-1,u={},c={},p,f;l?(c=i.position(),p=c.top,f=c.left):(p=parseFloat(a)||0,f=parseFloat(s)||0),x.isFunction(t)&&(t=t.call(e,n,o)),null!=t.top&&(u.top=t.top-o.top+p),null!=t.left&&(u.left=t.left-o.left+f),"using"in t?t.using.call(e,u):i.css(u)}},x.fn.extend({position:function(){if(this[0]){var e,t,n={top:0,left:0},r=this[0];return"fixed"===x.css(r,"position")?t=r.getBoundingClientRect():(e=this.offsetParent(),t=this.offset(),x.nodeName(e[0],"html")||(n=e.offset()),n.top+=x.css(e[0],"borderTopWidth",!0),n.left+=x.css(e[0],"borderLeftWidth",!0)),{top:t.top-n.top-x.css(r,"marginTop",!0),left:t.left-n.left-x.css(r,"marginLeft",!0)}}},offsetParent:function(){return this.map(function(){var e=this.offsetParent||s;while(e&&!x.nodeName(e,"html")&&"static"===x.css(e,"position"))e=e.offsetParent;return e||s})}}),x.each({scrollLeft:"pageXOffset",scrollTop:"pageYOffset"},function(e,n){var r=/Y/.test(n);x.fn[e]=function(i){return x.access(this,function(e,i,o){var a=or(e);return o===t?a?n in a?a[n]:a.document.documentElement[i]:e[i]:(a?a.scrollTo(r?x(a).scrollLeft():o,r?o:x(a).scrollTop()):e[i]=o,t)},e,i,arguments.length,null)}});function or(e){return x.isWindow(e)?e:9===e.nodeType?e.defaultView||e.parentWindow:!1}x.each({Height:"height",Width:"width"},function(e,n){x.each({padding:"inner"+e,content:n,"":"outer"+e},function(r,i){x.fn[i]=function(i,o){var a=arguments.length&&(r||"boolean"!=typeof i),s=r||(i===!0||o===!0?"margin":"border");return x.access(this,function(n,r,i){var o;return x.isWindow(n)?n.document.documentElement["client"+e]:9===n.nodeType?(o=n.documentElement,Math.max(n.body["scroll"+e],o["scroll"+e],n.body["offset"+e],o["offset"+e],o["client"+e])):i===t?x.css(n,r,s):x.style(n,r,i,s)},n,a?i:t,a,null)}})}),x.fn.size=function(){return this.length},x.fn.andSelf=x.fn.addBack,"object"==typeof module&&module&&"object"==typeof module.exports?module.exports=x:(e.jQuery=e.$=x,"function"==typeof define&&define.amd&&define("jquery",[],function(){return x}))})(window);
diff --git a/management/guns-admin/src/main/webapp/static/js/plugins/umeditor/third-party/mathquill/font/Symbola.eot b/management/guns-admin/src/main/webapp/static/js/plugins/umeditor/third-party/mathquill/font/Symbola.eot
new file mode 100644
index 0000000..0d10a95
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/static/js/plugins/umeditor/third-party/mathquill/font/Symbola.eot
Binary files differ
diff --git a/management/guns-admin/src/main/webapp/static/js/plugins/umeditor/third-party/mathquill/font/Symbola.otf b/management/guns-admin/src/main/webapp/static/js/plugins/umeditor/third-party/mathquill/font/Symbola.otf
new file mode 100644
index 0000000..d549563
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/static/js/plugins/umeditor/third-party/mathquill/font/Symbola.otf
Binary files differ
diff --git a/management/guns-admin/src/main/webapp/static/js/plugins/umeditor/third-party/mathquill/font/Symbola.svg b/management/guns-admin/src/main/webapp/static/js/plugins/umeditor/third-party/mathquill/font/Symbola.svg
new file mode 100644
index 0000000..eff3111
--- /dev/null
+++ b/management/guns-admin/src/main/webapp/static/js/plugins/umeditor/third-party/mathquill/font/Symbola.svg
@@ -0,0 +1,5102 @@
+<?xml version="1.0" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" >
+<svg xmlns="http://www.w3.org/2000/svg">
+<metadata>
+This is a custom SVG webfont generated by Font Squirrel.
+Designer : George Douros
+Foundry : Free
+Foundry URL : http://users.teilar.gr/_g1951d/
+</metadata>
+<defs>
+<font id="Symbola" horiz-adv-x="2048" >
+<font-face units-per-em="2048" ascent="1606" descent="-442" />
+<missing-glyph horiz-adv-x="512" />
+<glyph unicode=" " horiz-adv-x="512" />
+<glyph unicode="	" horiz-adv-x="512" />
+<glyph unicode=" " horiz-adv-x="512" />
+<glyph unicode="!" horiz-adv-x="682" d="M418 185q32 -32 32 -76.5t-32 -76.5t-77 -32t-77 32t-32 76.5t32 76.5t77 32t77 -32zM341 383q-25 0 -29 47l-79 932v10q0 40 30 66q34 28 78 28t78 -28q30 -26 30 -66v-10l-79 -934q-4 -45 -29 -45z" />
+<glyph unicode=""" horiz-adv-x="809" d="M428 1283q0 -11 -7 -23l-272 -472q-10 -17 -25.5 -17t-15.5 12.5t78 243t95 274.5q16 38 66 38q81 0 81 -56zM701 1283q0 -11 -7 -23l-271 -472q-10 -17 -26 -17t-16 12.5t78 243t95 274.5q16 38 66 38q81 0 81 -56z" />
+<glyph unicode="#" horiz-adv-x="1024" d="M985 382q0 -41 -68 -41h-185l-69 -394q-12 -68 -53 -68q-33 0 -33 35q0 11 4 33l69 394h-318l-69 -394q-12 -68 -53 -68q-33 0 -33 35q0 11 4 33l69 394h-143q-68 0 -68 41t68 41h158l56 318h-214q-68 0 -68 41t68 41h228l66 374q12 68 53 68q33 0 33 -35q0 -11 -4 -33 l-66 -374h318l66 374q12 68 53 68q33 0 33 -35q0 -11 -4 -33l-66 -374h100q68 0 68 -41t-68 -41h-114l-56 -318h170q68 0 68 -41zM721 741h-318l-56 -318h318z" />
+<glyph unicode="$" horiz-adv-x="964" d="M750 652q104 -112 104 -270t-97 -273t-246 -128v-89h-60v86q-155 10 -249 110.5t-94 255.5q0 97 89 97q38 0 63 -25t25 -63q0 -89 -88 -89q-14 0 -31 4q45 -214 285 -228v574q-161 41 -238 116q-105 105 -105 255.5t98.5 255t244.5 117.5v88h60v-86q152 -8 247.5 -99.5 t95.5 -240.5q0 -96 -88 -96q-38 0 -63.5 25.5t-25.5 63.5q0 88 89 88q17 0 30 -4q-50 190 -285 201v-521q159 -39 239 -125zM451 1298q-101 -10 -173 -80.5t-72 -172t69.5 -166t175.5 -87.5v506zM686 133.5q70 79.5 70 187t-67.5 182t-177.5 97.5v-560q105 14 175 93.5z" />
+<glyph unicode="%" horiz-adv-x="1662" d="M1331 878q281 0 281 -456t-281 -456t-281 456t281 456zM1358 1470q0 -12 -17 -37l-1037 -1536q-21 -31 -41 -31q-41 0 -41 41q0 13 19 41l920 1364q-106 -70 -270 -70t-301 99q22 -86 22 -222q0 -453 -281 -453t-281 456t281 456q149 0 223 -142q165 -149 331 -149 q235 0 389 195q23 29 43 29q41 0 41 -41zM1493 351v141q0 150 -19 217q-35 130 -143.5 130t-143.5 -128q-18 -67 -18 -216v-145q0 -345 162 -345t162 346zM493 1051q0 205 1 205v-2q-5 132 -34 197l-84 81q-22 7 -46 7q-108 0 -143 -128q-18 -67 -18 -216v-145 q0 -345 162 -345t162 346z" />
+<glyph unicode="&" horiz-adv-x="1593" d="M1205 18q81 0 153 59.5t76 170.5h52q-3 -130 -86.5 -211.5t-202.5 -81.5q-182 0 -361 156q-175 -156 -370 -156q-154 0 -262.5 87.5t-108.5 219.5q0 75 31 124.5t128 150.5l173 184q-84 214 -84 416q0 152 86 240.5t187.5 88.5t148.5 -97q35 -71 35 -167 q0 -136 -250 -414q57 -150 169.5 -314.5t170.5 -231.5q133 164 293 446q12 36 12 41q0 90 -146 90v64q81 -6 209.5 -6t239.5 6v-64q-125 -1 -191 -54q-44 -36 -114 -155q-175 -298 -271 -409q154 -183 283 -183zM748 1204q0 56 -15 110q-31 107 -108 107q-61 0 -107 -59 t-46 -201t61 -323q215 233 215 366zM314 523q-49 -81 -49 -193t45 -198q59 -114 172 -114q168 0 316 132q-78 78 -181 228t-172 296q-98 -94 -131 -151z" />
+<glyph unicode="'" horiz-adv-x="536" d="M428 1283q0 -11 -7 -23l-272 -472q-10 -17 -25.5 -17t-15.5 12.5t78 243t95 274.5q16 38 66 38q81 0 81 -56z" />
+<glyph unicode="(" horiz-adv-x="682" d="M574 -332q0 -18 -19 -18q-11 0 -46 29q-226 186 -322 396t-96 507t96 507t322 396q35 29 46 29q19 0 19 -18q0 -8 -24 -32q-300 -295 -300 -882t300 -882q24 -24 24 -32z" />
+<glyph unicode=")" horiz-adv-x="682" d="M591 582q0 -297 -96 -507t-322 -396q-35 -29 -46 -29q-19 0 -19 18q0 8 24 32q300 295 300 882t-300 882q-24 24 -24 32q0 18 19 18q11 0 46 -29q226 -186 322 -396t96 -507z" />
+<glyph unicode="*" horiz-adv-x="964" d="M824 1016q26 -12 26 -39.5t-16.5 -47t-35.5 -19.5t-31 9l-258 182l30 -319q0 -49 -56.5 -49t-56.5 49v5l29 314l-257 -182q-13 -9 -31.5 -9t-35.5 19.5t-17 47t27 39.5l287 132l-287 132q-27 13 -27 40t17 47t35.5 20t31.5 -9l257 -183l-29 319q0 49 56.5 49t56.5 -49v-5 l-30 -314l258 183q12 9 31 9t35.5 -20t16.5 -47t-26 -40l-287 -132z" />
+<glyph unicode="+" horiz-adv-x="1591" d="M1421 582q0 -41 -37 -41h-547v-546q0 -39 -41 -39t-41 39v546h-546q-39 0 -39 41t39 41h546v548q0 37 41 37t41 -37v-548h547q37 0 37 -41z" />
+<glyph unicode="," horiz-adv-x="512" d="M326 33q-33 -33 -83 -33t-78.5 32.5t-28.5 76t29 76t85 32.5t91 -58t35 -157q0 -152 -76.5 -274.5t-110.5 -122.5q-20 0 -20 22q0 8 14 23q148 157 148 352q0 30 -5 31z" />
+<glyph unicode="-" horiz-adv-x="1591" d="M1421 582q0 -41 -37 -41h-1175q-39 0 -39 41t39 41h1175q37 0 37 -41z" />
+<glyph unicode="." horiz-adv-x="512" d="M333 185q32 -32 32 -76.5t-32 -76.5t-77 -32t-77 32t-32 76.5t32 76.5t77 32t77 -32z" />
+<glyph unicode="/" horiz-adv-x="569" d="M569 1475q0 -6 -2 -13l-488 -1788q-7 -26 -40 -26q-39 0 -39 41q0 6 2 13l488 1788q7 26 40 26q39 0 39 -41z" />
+<glyph unicode="0" horiz-adv-x="1043" d="M877 1156q83 -165 83 -482t-78 -477q-118 -242 -362 -242q-226 0 -344 209q-93 164 -93 490.5t76 486.5q117 247 359 247t359 -232zM787 564v260q0 216 -37 329q-61 190 -229.5 190t-229.5 -191q-37 -114 -37 -329q0 -41 0.5 -122t0.5 -121q0 -239 33 -360 q59 -220 231.5 -220t233.5 212q34 120 34 352z" />
+<glyph unicode="1" horiz-adv-x="1043" d="M190 64l76 -2q153 0 175 43q9 18 9 53v1087q-109 -54 -272 -54v64q250 0 379 133h10q29 0 35 -14q3 -6 3 -39v-1181q0 -33 8 -50q15 -33 117 -40h40.5h94.5v-64q-71 6 -136 6h-404q-64 0 -135 -6v64z" />
+<glyph unicode="2" horiz-adv-x="1043" d="M106 0v18q0 33 24 60l400 445q218 243 218 461q0 139 -72.5 239.5t-206.5 100.5q-97 0 -173 -59t-109 -153q7 2 17 2q121 0 121 -109q0 -46 -31 -78t-77 -32q-111 0 -111 116q0 157 116 267t287.5 110t299.5 -111t128 -293q0 -118 -77 -228q-44 -63 -165 -181l-428 -415 h416q136 0 156 16.5t46 185.5h52l-57 -362h-774z" />
+<glyph unicode="3" horiz-adv-x="1043" d="M954 356q0 -172 -134 -286.5t-300.5 -114.5t-290.5 82q-140 93 -140 244q0 53 32 87t83.5 34t85 -33.5t33.5 -84t-34.5 -82.5t-84.5 -32q-10 0 -20 1q46 -77 135 -118t185 -41q125 0 187 116q48 91 48 232t-51 230q-63 113 -197 113h-108q-33 0 -33 22.5t48 28.5 q33 1 65 3q124 8 183.5 105t59.5 241q0 102 -50.5 168.5t-149.5 66.5q-194 0 -278 -130h5q124 0 124 -105q0 -46 -29.5 -76t-76.5 -30t-76.5 29.5t-29.5 77.5q0 132 123 213q108 71 248.5 71t252.5 -71q130 -82 130 -212t-84 -230t-209 -141q145 -29 246.5 -132.5 t101.5 -245.5z" />
+<glyph unicode="4" horiz-adv-x="1043" d="M983 345h-208v-196q0 -30 9 -48q19 -37 185 -37h9v-64q-83 6 -142 6h-285q-56 0 -139 -6v64q47 -1 64 -1q110 0 130 38q9 17 9 48v196h-555v64l640 978q16 25 41.5 25t31.5 -17q2 -6 2 -38v-948h208v-64zM627 409v777l-509 -777h509z" />
+<glyph unicode="5" horiz-adv-x="1043" d="M278 770q109 106 273.5 106t275 -138.5t110.5 -323t-132.5 -322t-321.5 -137.5q-155 0 -266 113t-111 268q0 111 101 111q44 0 74.5 -29t30.5 -73t-30.5 -73.5t-74.5 -29.5q-18 0 -34 5q29 -101 115.5 -168t190.5 -67q145 0 224 136q49 85 49 274.5t-37 273.5 q-59 134 -178 134q-89 0 -147 -35t-99.5 -83t-49.5 -48q-29 0 -29 41v648q0 34 20 34q9 0 26 -6q166 -60 289.5 -60t270.5 62q12 5 18 5q20 0 20 -23q0 -16 -36 -56q-144 -161 -366 -161q-86 0 -176 27v-405z" />
+<glyph unicode="6" horiz-adv-x="1043" d="M277 684q84 206 263.5 206t296.5 -139t117 -327.5t-121 -328.5t-308 -140q-242 0 -353 247q-83 183 -83 458q0 205 80 385.5t240 276.5q111 66 226 66t191.5 -57.5t76.5 -165.5q0 -44 -26.5 -73t-68.5 -29t-69.5 28t-27.5 69q0 93 103 93h11q-57 85 -183 85 q-81 0 -155 -47q-210 -133 -210 -607zM767 371v104q0 160 -38 238q-63 129 -193 129t-199 -127q-57 -103 -57 -244q0 -206 38 -302q26 -67 82.5 -112t124.5 -45q140 0 206 136q36 74 36 223z" />
+<glyph unicode="7" horiz-adv-x="1043" d="M969 1328q0 -32 -19 -59l-283 -395q-94 -131 -128 -356q-23 -151 -23 -449q0 -114 -95.5 -114t-95.5 114q0 384 256 784l232 329h-499q-117 0 -138 -13.5t-50 -188.5h-52l69 430h52q2 -20 14 -33q31 -34 253 -34h507v-15z" />
+<glyph unicode="8" horiz-adv-x="1043" d="M954 349q0 -170 -130.5 -282t-301 -112t-302 99t-131.5 261q0 235 301 384q-55 32 -154 112q-91 99 -91 239t113.5 239t262 99t263.5 -85t115 -225q0 -194 -253 -323q93 -56 131 -81.5t75 -66.5q102 -113 102 -258zM807 1078q0 112 -86.5 186t-196 74t-199 -58 t-89.5 -153.5t106 -172.5q30 -22 257 -168q208 120 208 292zM851 276q0 76 -40 126t-117 102.5t-257 161.5q-244 -134 -244 -351q0 -130 99 -216.5t226.5 -86.5t230 73t102.5 191z" />
+<glyph unicode="9" horiz-adv-x="1043" d="M954 687q0 -388 -220 -601q-135 -131 -303 -131q-120 0 -198 51q-92 59 -92 173q0 100 95 100q41 0 69 -27.5t28 -70t-33 -70.5q-27 -24 -63 -24q-6 0 -13 1q64 -76 205 -76q77 0 148 47q120 79 163 274q27 120 27 330q-82 -209 -263 -209t-298 139.5t-117 333.5 t129.5 327.5t310.5 133.5q102 0 187 -53q238 -148 238 -648zM763 878q0 202 -34 293q-62 167 -200 167t-209 -132q-43 -80 -43 -247v-86q0 -161 37 -238q64 -132 194.5 -132t199.5 129q55 103 55 246z" />
+<glyph unicode=":" horiz-adv-x="547" d="M378 104q0 -42 -31 -73t-73.5 -31t-73.5 31t-31 73t31 73t73.5 31t73.5 -31t31 -73zM378 743q0 -42 -31 -73t-73.5 -31t-73.5 31t-31 73t31 73t73.5 31t73.5 -31t31 -73z" />
+<glyph unicode=";" horiz-adv-x="569" d="M387 774q0 -45 -31.5 -76.5t-76.5 -31.5t-77 32t-32 76.5t32 76.5t76.5 32t76.5 -32t32 -77zM348 23q-26 -23 -73.5 -23t-76 32.5t-28.5 76t29 76t80 32.5q114 0 114 -211q0 -153 -69.5 -277t-100.5 -124q-20 0 -20 22q0 11 14 27q131 151 131 369z" />
+<glyph unicode="<" horiz-adv-x="1591" d="M1421 31q0 -41 -41 -41q-8 0 -14 3l-1169 552q-27 13 -27 37t27 37l1169 552q6 3 14 3q41 0 41 -41q0 -26 -24 -37l-1090 -514l1090 -514q24 -11 24 -37z" />
+<glyph unicode="=" horiz-adv-x="1591" d="M1421 380q0 -41 -37 -41h-1175q-39 0 -39 41t39 41h1175q37 0 37 -41zM1421 784q0 -41 -37 -41h-1175q-39 0 -39 41t39 41h1175q37 0 37 -41z" />
+<glyph unicode=">" horiz-adv-x="1591" d="M1421 582q0 -24 -27 -37l-1169 -552q-6 -3 -14 -3q-41 0 -41 41q0 26 24 37l1090 514l-1090 514q-24 11 -24 37q0 41 41 41q8 0 14 -3l1169 -552q27 -13 27 -37z" />
+<glyph unicode="?" horiz-adv-x="909" d="M504 185q32 -32 32 -76.5t-32 -76.5t-77 -32t-77 32t-32 76.5t32 76.5t77 32t77 -32zM743 1350q79 -73 79 -191.5t-98 -191.5q-270 -200 -270 -457v-72q0 -55 -26 -55t-26 49v92q0 267 181 461q69 74 69 182t-28 152q-49 80 -195 80q-187 0 -268 -139q114 0 114 -93.5 t-94 -93.5t-94 102.5t95.5 185.5t252.5 83q207 0 308 -94z" />
+<glyph unicode="@" horiz-adv-x="1500" d="M1391 652q0 -405 -196 -405q-70 0 -125.5 36.5t-68.5 100.5q-98 -137 -257.5 -137t-269 128.5t-109.5 294t109.5 293.5t272.5 128q124 0 226 -107q12 -15 38 -41q18 -16 63.5 -16t52.5 -6.5t7 -38.5v-466q0 -127 67 -127q141 0 141 322q0 483 -356 651q-117 55 -238 55 q-253 0 -422.5 -195t-169.5 -455t171.5 -452.5t430.5 -192.5q185 0 378 66l95 40q61 23 109.5 23t48.5 -20.5t-109 -56.5q-285 -96 -520 -96q-279 0 -465.5 205t-186.5 484.5t184 486t458 206.5q139 0 267 -63q180 -89 277 -262.5t97 -382.5zM1001 505v329q0 37 -26 76 q-91 139 -218.5 139t-199.5 -134q-60 -111 -60 -245t60 -246q73 -135 195 -135q82 0 165.5 68.5t83.5 147.5z" />
+<glyph unicode="A" horiz-adv-x="1484" d="M1417 0q-127 6 -297.5 6t-244.5 -6v61h5q157 0 157 59q0 29 -39 136l-70 192h-487l-61 -163q-34 -90 -34 -123q0 -51 52 -78q42 -23 97 -23v-61q-189 6 -239.5 6t-187.5 -6v61q174 2 219 133l409 1177q14 40 46 40t46 -40l425 -1231q21 -61 84 -75q19 -5 77 -5q19 0 43 1 v-61zM906 510l-222 641l-220 -641h442z" />
+<glyph unicode="B" horiz-adv-x="1346" d="M1278 360q0 -161 -135.5 -260.5t-302.5 -99.5h-772v61q62 -2 63 -2q113 0 134 45q5 11 5 42v1051q0 31 -5 42q-19 43 -152 43q-21 0 -45 -1v62h720q161 0 290 -83q148 -95 148 -247q0 -120 -98.5 -203t-227.5 -108q147 -16 262.5 -109t115.5 -233zM720 721 q129 0 221.5 82t92.5 202.5t-73 198t-186 77.5h-255q-53 0 -69.5 -13t-16.5 -66v-481h286zM994 147q88 86 88 214t-76.5 222t-200.5 94h-371v-537q0 -53 16.5 -66t69.5 -13h257q129 0 217 86z" />
+<glyph unicode="C" horiz-adv-x="1335" d="M1267 854q0 -26 -29 -26t-35 32q-12 60 -47 178q-51 127 -151 208.5t-217 81.5t-220 -50q-298 -145 -298 -613.5t322 -606.5q96 -41 185 -41q140 0 256 85t159 218q17 52 27 140q4 33 23 33q24 0 24 -35q0 -205 -154 -353t-360 -148q-288 0 -486 213t-198 502.5 t198.5 503.5t485.5 214q193 0 363 -169l99 144q17 25 31 25q22 0 22 -33v-503z" />
+<glyph unicode="D" horiz-adv-x="1459" d="M1226 1130q166 -200 166 -466t-172 -465t-432 -199h-720v61l62 -2q108 0 130 31q10 14 10 52v1060q0 36 -10 50q-21 29 -157 29h-35v62h720q263 0 438 -213zM1085 229q110 148 110 436.5t-103 433.5q-129 182 -359 182h-207q-53 0 -70 -13t-17 -66v-1062q0 -53 17.5 -66 t69.5 -13h209q225 0 350 168z" />
+<glyph unicode="E" horiz-adv-x="1354" d="M68 0v61q47 -1 53 -1q125 0 142 38q7 16 7 48v1053q0 30 -7 47q-15 36 -152 36q-20 0 -43 -1v62h1108l56 -442h-49q-24 218 -99.5 299t-288.5 81h-263q-54 0 -71 -13.5t-17 -65.5v-474h178q134 0 173.5 46.5t39.5 182.5h51v-521h-51q0 136 -40 183t-173 47h-178v-526 q0 -52 17 -65.5t71 -13.5h273q236 0 326 111q67 84 107 336h49l-84 -508h-1135z" />
+<glyph unicode="F" horiz-adv-x="1271" d="M779 1281h-252q-45 0 -64 -11.5t-19 -67.5v-501h170q132 0 171 48t39 183h48v-522h-48q0 136 -39 183.5t-171 47.5h-170v-497q0 -27 7 -44q16 -39 209 -39h37v-61q-74 6 -135 6h-373q-49 0 -121 -6v61h75q64 0 88 10q39 18 39 73v1056q0 25 -6 42q-14 39 -166 39h-30v62 h1081l54 -442h-49q-24 217 -89 291q-77 89 -286 89z" />
+<glyph unicode="G" horiz-adv-x="1472" d="M1405 478q-80 0 -97 -6q-40 -15 -40 -81v-360q0 -29 -16 -29q-42 0 -127 122q-97 -167 -378 -167t-480 212t-199 502.5t198.5 504.5t485.5 214q198 0 365 -169l99 144q17 25 31 25q21 0 21 -33l1 -503q0 -26 -29 -26t-35 32q-12 60 -46 177q-51 128 -151.5 209.5 t-217.5 81.5t-211 -46q-309 -152 -309 -608.5t312 -609.5q96 -47 213 -47t201 56q98 65 98 183v126q0 40 -9 56q-23 40 -175 40h-63v59q65 -5 221.5 -5t336.5 5v-59z" />
+<glyph unicode="H" horiz-adv-x="1480" d="M1413 1284l-56 2q-122 0 -140 -36q-8 -16 -8 -45v-1064q0 -29 8 -45q18 -35 186 -35h10v-61q-71 6 -113 6h-361q-36 0 -107 -6v61q9 0 28 -0.5t29 -0.5q119 0 137 36q8 16 8 45v530h-590v-530q0 -29 8 -45q18 -35 187 -35h10v-61q-71 6 -115 6h-358q-37 0 -108 -6v61 q9 0 27.5 -0.5t28.5 -0.5q121 0 139 36q7 14 7 45v1064q0 31 -7 45q-17 34 -149 34h-46v62q70 -6 112 -6h354q45 0 115 6v-62l-55 2q-123 0 -142 -36q-8 -16 -8 -45v-474h590v474q0 29 -8 45q-17 34 -148 34h-46v62q70 -6 112 -6h356q43 0 113 6v-62z" />
+<glyph unicode="I" horiz-adv-x="736" d="M670 1284l-59 2q-75 0 -103 -9q-53 -18 -53 -76v-1057q0 -27 13.5 -52t91.5 -31h110v-61q-71 6 -117 6h-373q-41 0 -112 -6v61q8 0 27.5 -0.5t29.5 -0.5q128 0 147 36q9 17 9 49v1056q0 32 -9 49q-18 34 -153 34h-51v62q71 -6 115 -6h376q41 0 111 6v-62z" />
+<glyph unicode="J" horiz-adv-x="970" d="M752 284q0 -141 -112.5 -234t-245 -93t-229.5 73t-97 190q0 49 30.5 81.5t78.5 32.5t79 -31.5t31 -78.5q0 -110 -121 -110h-4q71 -114 217 -114q99 0 156 101q47 83 47 190v910q0 29 -9 47q-19 36 -223 36h-32v62q78 -6 161 -6h221q73 0 203 6v-62l-42 2q-60 0 -85 -14 t-25 -69z" />
+<glyph unicode="K" horiz-adv-x="1519" d="M649 1284l-57 2q-126 0 -142 -40q-6 -15 -6 -44v-636l618 588q36 34 36 67q0 61 -91 63v62q69 -6 217.5 -6t201.5 6v-62q-160 -2 -281 -118l-356 -340l456 -670q42 -62 83.5 -78.5t122.5 -16.5v-61q-127 6 -281.5 6t-225.5 -6v61h4q113 0 113 59q0 22 -31 68l-357 528 l-229 -218v-359q0 -28 9 -45q17 -33 186 -33h10v-61q-71 6 -120 6h-347q-43 0 -114 -6v61q8 0 26.5 -0.5t28.5 -0.5q125 0 141 40q6 15 6 44v1066q0 27 -7 41q-16 33 -176 33h-19v62q70 -6 119 -6h342q50 0 120 6v-62z" />
+<glyph unicode="L" horiz-adv-x="1216" d="M697 1284l-66 2q-156 0 -177 -36q-10 -17 -10 -48v-1062q0 -52 17.5 -65.5t68.5 -13.5h173q212 0 303 123q70 96 94 324h49l-55 -508h-1026v61q8 0 25.5 -0.5t27.5 -0.5q124 0 142 35q7 14 7 46v1064q0 32 -7 46q-17 33 -185 33h-10v62q71 -6 126 -6h383q47 0 120 6v-62z " />
+<glyph unicode="M" horiz-adv-x="1793" d="M1726 1281l-56 2q-125 0 -141 -41q-6 -15 -6 -45v-1058q0 -26 8 -43q17 -35 185 -35h10v-61q-75 6 -119 6h-334q-38 0 -113 -6v61h76q63 0 87 10q40 17 40 70v1140h-2l-483 -1245q-14 -36 -36 -36t-39 43l-476 1222h-2v-1064q0 -140 200 -140h3v-61q-209 6 -229 6 t-231 -6v61h3q199 0 199 140v1003q0 22 -6 38q-12 32 -89 39q-6 1 -32.5 1t-74.5 -1v62h341q45 0 61 -42l428 -1102l430 1108q14 36 49 36h349v-62z" />
+<glyph unicode="N" horiz-adv-x="1480" d="M1209 1139v-1107q0 -32 -26 -32q-16 0 -34 26l-805 1178q-12 17 -19 25v-1028q0 -140 200 -140h3v-61q-208 6 -230 6t-230 -6v61h3q199 0 199 140v1032q0 29 -8 35q-19 13 -194 13v62h342q30 0 48 -26l696 -1019v847q0 139 -203 139v62q205 -6 231.5 -6t230.5 6v-62h-3 q-201 0 -201 -145z" />
+<glyph unicode="O" horiz-adv-x="1445" d="M722 -43q-280 0 -467 214t-187 498.5t186.5 502.5t468 218t468 -217.5t186.5 -503t-187.5 -499t-467.5 -213.5zM1175 696q0 438 -260 590q-92 54 -192 54t-191 -53q-262 -153 -262 -591q0 -469 265 -632q91 -56 185 -56t188 55q267 156 267 633z" />
+<glyph unicode="P" horiz-adv-x="1295" d="M1074 1249q154 -106 154 -268t-142 -262t-307 -100h-335v-473q0 -32 7 -48q17 -37 181 -37h17v-61q-72 6 -133 6h-326q-50 0 -122 -6v61l55 -1q122 0 140 38q7 15 7 48v1051q0 32 -7 48q-16 37 -158 37q-18 0 -37 -1v62h695q174 0 311 -94zM1024 977q0 161 -75.5 232.5 t-237.5 71.5h-186q-53 0 -69.5 -13t-16.5 -66v-532h272q313 0 313 307z" />
+<glyph unicode="Q" horiz-adv-x="1457" d="M1390 -19q0 -135 -52 -236q-65 -127 -189 -127t-183 130q-34 73 -56 239q-95 -30 -186 -30q-281 0 -468.5 214t-187.5 498.5t186.5 502.5t468 218t468 -217.5t186.5 -503.5q0 -209 -107 -390.5t-292 -265.5q62 -192 188 -192q138 0 180 166q9 35 21 35q23 0 23 -41z M1180 669q0 455 -262 613q-96 58 -194.5 58t-193.5 -56q-267 -157 -267 -615q0 -213 69 -375q86 -199 259 -263q-28 45 -28 103.5t47.5 107.5t115.5 49q144 0 221 -208q233 172 233 586zM726 248q-50 0 -84.5 -36.5t-34.5 -87t33 -84.5t84 -34q92 0 174 46q-36 196 -172 196 z" />
+<glyph unicode="R" horiz-adv-x="1508" d="M1440 173q0 -86 -51 -151t-135 -65q-330 0 -330 318q0 13 1 40v40q0 158 -73 227.5t-186 69.5h-227v-511q0 -29 7 -46q14 -34 171 -34h26v-61q-74 6 -143 6h-289q-69 0 -143 -6v61q6 0 24.5 -0.5t28.5 -0.5q125 0 142 35q7 15 7 46v1055q0 27 -6 45q-14 40 -167 40h-29 v62h618q183 0 333 -84q180 -100 180 -267q0 -122 -115 -213q-94 -75 -229 -108q165 -57 224 -182q25 -52 39 -149l25 -182q31 -158 118 -158q101 0 131 175q5 31 24 31q24 0 24 -33zM997 992q0 196 -143 256q-84 35 -314 35q-51 0 -69 -7q-32 -14 -32 -57v-523h219 q339 0 339 296z" />
+<glyph unicode="S" horiz-adv-x="1007" d="M860.5 616.5q79.5 -107.5 79.5 -262.5t-110.5 -276t-277.5 -121q-236 0 -362 137l-72 -111q-16 -26 -30 -26q-20 0 -20 29v431q0 29 24 29q30 0 30 -72q0 -143 117 -250t311 -107q114 0 189 84t75 192.5t-59 184.5t-170 104q-88 17 -260 65q-116 42 -186.5 140t-70.5 221 q0 160 111 271t278 111t309 -139l69 112q17 27 29 27q24 0 24 -33v-429q0 -28 -28 -28q-18 0 -23 22q-7 41 -25 122q-81 290 -360 290q-109 0 -183.5 -74.5t-74.5 -183.5q0 -189 199 -250q85 -19 252 -62q136 -40 215.5 -147.5z" />
+<glyph unicode="T" horiz-adv-x="1413" d="M878 1282q-46 0 -65.5 -11.5t-19.5 -53.5v-1071q0 -25 10 -47q18 -38 243 -38h34v-61q-84 6 -154 6h-439q-71 0 -155 -6v61q9 0 35.5 -0.5t40.5 -0.5q184 0 202 39q8 17 8 47v1072q0 43 -29 56q-17 8 -66 8q-256 0 -321 -62.5t-86 -318.5h-48l36 442h1206l36 -442h-49 q-22 262 -88.5 321.5t-330.5 59.5z" />
+<glyph unicode="U" horiz-adv-x="1480" d="M1209 1131v-668q0 -203 -122.5 -354.5t-323.5 -151.5t-347 143.5t-146 347.5v760q0 30 -7 43q-18 34 -156 34q-19 0 -39 -1v62q73 -6 156 -6h269q84 0 156 6v-62q-48 1 -60 1q-118 0 -136 -34q-9 -17 -9 -51v-759q0 -298 192 -393q62 -31 134 -31q170 0 274.5 131 t104.5 306v685q0 89 -63 122q-45 23 -140 23v62q205 -6 234 -6t233 6v-62h-4q-164 0 -192 -85q-8 -24 -8 -68z" />
+<glyph unicode="V" horiz-adv-x="1536" d="M814 -6q-14 -37 -46.5 -37t-48.5 43l-457 1209q-22 57 -81 71q-19 5 -67 5q-20 0 -46 -1v62q214 -6 336.5 -6t195.5 6v-62h-6q-156 0 -156 -56q0 -30 141 -394l247 -637l361 950q9 24 9 40q0 94 -143 97v62q154 -6 238 -6t177 6v-62q-164 -1 -214 -132z" />
+<glyph unicode="W" horiz-adv-x="2087" d="M2019 1284q-152 0 -195 -132l-378 -1156q-13 -39 -38.5 -39t-37.5 37l-328 1003l-323 -1001q-13 -39 -39.5 -39t-38.5 37l-395 1207q-6 19 -23 53q-23 30 -134 30h-21v62q242 -6 344.5 -6t175.5 6v-62h-5q-161 0 -161 -58q0 -15 4 -27l316 -968l275 845l-35 127 q-16 48 -52 64.5t-134 16.5v62q242 -6 344.5 -6t175.5 6v-62h-5q-160 0 -160 -58q0 -15 5 -30l316 -965l296 910q10 31 10 39q0 53 -63 81q-48 22 -109 23v62q155 -6 239 -6t174 6v-62z" />
+<glyph unicode="X" horiz-adv-x="1518" d="M1450 0q-127 6 -299 6t-244 -6v61q128 5 128 59q0 10 -320 493l-281 -414q-19 -28 -19 -48q0 -43 38.5 -66t84.5 -24v-61q-74 6 -165 6t-305 -6v61q196 0 285 131l323 477l-362 547q-34 51 -99 64q-24 4 -81 4h-41v62q112 -6 292.5 -6t251.5 6v-62q-128 -5 -128 -58 q0 -13 268 -410l225 333q17 25 17 46q0 43 -37.5 65.5t-83.5 23.5v62q81 -6 163.5 -6t306.5 6v-62q-198 -2 -285 -128l-271 -395l416 -629q35 -53 99 -66q25 -5 85 -5h38v-61z" />
+<glyph unicode="Y" horiz-adv-x="1566" d="M1499 1284q-173 0 -252 -128l-381 -619v-388q0 -34 10 -53q15 -29 90 -35h104v-61q-73 6 -127 6h-320q-55 0 -128 -6v61q8 0 25.5 -0.5t27.5 -0.5q124 0 142 36q7 14 7 43v398l-413 675q-34 56 -95 68q-21 4 -121 4v62q126 -6 299.5 -6t246.5 6v-62h-24q-112 0 -112 -48 q0 -14 13 -35l356 -581l325 529q21 34 21 58q0 77 -113 77v62q155 -6 240.5 -6t178.5 6v-62z" />
+<glyph unicode="Z" horiz-adv-x="1128" d="M101 0q-33 0 -33 33q0 21 13 41l766 1207h-310q-206 0 -294 -87.5t-100 -293.5h-51l22 443h900q34 0 34 -32q0 -16 -14 -38l-764 -1205h324q239 0 329 114q76 95 89 344h49l-35 -526h-925z" />
+<glyph unicode="[" horiz-adv-x="682" d="M571 -309q0 -41 -68 -41h-391v1864h391q68 0 68 -40.5t-68 -40.5h-309v-1701h309q68 0 68 -41z" />
+<glyph unicode="\" horiz-adv-x="569" d="M569 -311q0 -41 -39 -41q-33 0 -40 26l-488 1788q-2 7 -2 13q0 41 39 41q33 0 40 -26l488 -1788q2 -7 2 -13z" />
+<glyph unicode="]" horiz-adv-x="682" d="M570 -350h-391q-68 0 -68 41t68 41h309v1701h-309q-68 0 -68 40.5t68 40.5h391v-1864z" />
+<glyph unicode="^" horiz-adv-x="906" d="M765 1057q31 -15 31 -41t-21 -26q-5 0 -7 2q-199 57 -315 265q-103 -186 -314 -265q-3 -2 -8 -2q-21 0 -21 36q0 16 28 29l53 23q129 64 208 204q11 23 36 67q6 11 18.5 11t19.5 -11l34 -68q77 -138 208 -203z" />
+<glyph unicode="_" horiz-adv-x="964" d="M971 -337q59 0 59 -38.5t-59 -38.5h-979q-58 0 -58 38.5t59 38.5h978z" />
+<glyph unicode="`" horiz-adv-x="536" d="M255 1301q17 -44 95 -274.5t78 -243t-15.5 -12.5t-26.5 17l-271 472q-7 12 -7 23q0 56 81 56q50 0 66 -38z" />
+<glyph unicode="a" horiz-adv-x="1070" d="M1018 190q0 -83 -47.5 -142.5t-122.5 -59.5t-120.5 51.5t-52.5 122.5q-35 -85 -111 -135.5t-186.5 -50.5t-205.5 50q-119 62 -119 178q0 179 213 279q131 61 394 76v78q0 110 -60.5 192t-166.5 82q-154 0 -231 -98q46 0 78 -26.5t32 -70t-28.5 -71.5t-71.5 -28 q-98 0 -98 99q0 113 102 178.5t222 65.5q183 0 293 -119q50 -54 63.5 -108t13.5 -144v-427q0 -40 20.5 -74t57.5 -34q79 0 79 175q0 28 -2 80h55v-119zM660 300v214q-171 -6 -291 -71q-152 -82 -152 -236q0 -78 56.5 -130.5t135.5 -52.5q111 0 181 81.5t70 194.5z" />
+<glyph unicode="b" horiz-adv-x="1160" d="M360 807q121 139 303.5 139t313 -145.5t130.5 -342t-139 -339.5t-327.5 -143t-290.5 157q-24 -46 -77 -133h-53v1277q0 88 -47 109q-20 10 -85 10q-16 0 -35 -1v67l307 23v-678zM865 162q64 99 64 300t-60 299q-85 138 -225 138q-91 0 -184 -64t-93 -150v-442 q0 -45 30 -89q89 -130 234 -130t234 138z" />
+<glyph unicode="c" horiz-adv-x="920" d="M868 254q0 -22 -27 -75q-104 -203 -329 -203q-194 0 -326.5 144.5t-132.5 343t132 347.5t330 149q121 0 215 -54q113 -64 113 -170t-97 -106q-42 0 -70.5 28t-28.5 70q0 94 100 99q-79 78 -229 78q-60 0 -120 -34q-168 -94 -168 -402.5t178 -404.5q63 -34 123 -34 q113 0 181 64q40 37 74 109.5t53 72.5q29 0 29 -22z" />
+<glyph unicode="d" horiz-adv-x="1159" d="M793 118q-111 -142 -295 -142t-314.5 144.5t-130.5 340.5t139.5 340.5t336.5 144.5q163 0 270 -133v464q0 88 -47 109q-20 10 -85 10q-16 0 -35 -1v67l308 23v-1300q0 -88 46 -110q20 -10 85 -10q16 0 35 1v-66l-313 -24v142zM793 253v449q0 32 -24 68q-87 129 -236 129 t-238 -138q-65 -100 -65 -300t61 -299q85 -138 224 -138q93 0 185.5 69.5t92.5 159.5z" />
+<glyph unicode="e" horiz-adv-x="933" d="M854 280q27 0 27 -28t-35 -88q-110 -188 -315 -188t-341.5 147.5t-136.5 344.5t127 344.5t312.5 147.5t287 -119t101.5 -302q0 -30 -7.5 -37.5t-38.5 -7.5h-605v-7q0 -210 64 -313q90 -144 242 -144q198 0 290 221q12 29 28 29zM740 539q0 143 -50 243q-64 129 -192 129 q-41 0 -90 -23q-165 -78 -175 -349h507z" />
+<glyph unicode="f" horiz-adv-x="798" d="M239 6l-185 -6v66q28 -1 69 -1t64 12q34 18 34 76v702h-168v68h168v246q0 141 95.5 240t236.5 99q72 0 132.5 -40.5t60.5 -108.5q0 -94 -95 -94q-39 0 -65.5 26t-26.5 65q0 69 64 91q-33 15 -70 15q-96 0 -151 -102q-46 -84 -46 -189v-248h251v-68h-246v-704q0 -21 7 -41 q15 -44 186 -44h15v-66q-81 6 -145 6h-185z" />
+<glyph unicode="g" horiz-adv-x="1082" d="M403 136l112 3q242 0 345 -59q142 -81 142 -244q0 -140 -177 -217q-136 -59 -297 -59t-298 59q-177 76 -177 212q0 77 58.5 133.5t138.5 79.5q-94 62 -94 192q0 98 66 176q-101 85 -101 220t105.5 224.5t238 89.5t230.5 -77q103 101 227 101q45 0 76.5 -30t31.5 -75 q0 -64 -62 -64t-62 61q0 44 34 59q-9 2 -20 2q-104 0 -193 -84q87 -81 87 -211t-105 -220t-232 -90t-221 67q-36 -43 -36 -100q0 -149 183 -149zM655 633q0 264 -187 264q-102 0 -153 -87q-34 -58 -34 -178q0 -264 187 -264q101 0 152 86q35 59 35 179zM888 -169 q0 183 -357 183h-191q-72 0 -124.5 -55.5t-52.5 -127.5q0 -109 134 -172q108 -51 230.5 -51t228.5 51q132 64 132 172z" />
+<glyph unicode="h" horiz-adv-x="1181" d="M1129 0q-200 6 -238 6t-244 -6v66q30 -1 70.5 -1t63.5 12q33 19 33 76v519q0 227 -158 227q-130 0 -209.5 -104.5t-79.5 -238.5v-400q0 -39 10 -58q18 -33 117 -33q18 0 38 1v-66q-200 6 -236.5 6t-242.5 -6v66q30 -1 72.5 -1t68 16.5t25.5 80.5v1115q0 87 -44 108 q-21 10 -96 10h-26v67l306 23v-744h2q41 93 125 149t184 56q292 0 292 -314v-502q0 -65 135 -65q15 0 32 1v-66z" />
+<glyph unicode="i" horiz-adv-x="562" d="M510 0q-202 6 -233 6t-224 -6v66l44 -1q66 0 89 13q33 18 33 79v582q0 85 -41 105q-21 11 -103 11h-14v68l298 23v-802q0 -59 51 -73q19 -5 69 -5h31v-66zM335.5 1356q33.5 -33 33.5 -80.5t-33.5 -81t-80.5 -33.5t-80 34.5t-33 80t33.5 79.5t80 34t80 -33z" />
+<glyph unicode="j" horiz-adv-x="588" d="M385 -107q0 -133 -81 -232.5t-211 -99.5q-90 0 -159 40q-83 48 -83 132q0 42 27.5 70t69.5 28t70.5 -28t28.5 -70q0 -76 -74 -96q58 -29 114 -29q158 0 158 281v861q0 39 -9 60q-20 45 -148 45h-27v68l324 23v-1053zM353 1356q33 -33 33 -80.5t-33.5 -81t-80 -33.5 t-79.5 34.5t-33 80t33.5 79.5t80 34t79.5 -33z" />
+<glyph unicode="k" horiz-adv-x="1139" d="M1086 0q-88 6 -168 6t-248 -6v66h6q70 0 70 49q0 38 -255 385l-136 -116v-222q0 -51 12 -69.5t47 -22.5q30 -4 83 -4h25v-66q-121 6 -197 6t-272 -6v66q10 0 33 -0.5t35 -0.5q99 0 99 97v1115q0 87 -45 108q-21 10 -106 10h-16v67l307 23v-1027l302 261q47 41 47 84 q0 50 -61 52v68q116 -8 214 -8t175 8v-68q-133 -6 -270 -114q-174 -137 -174 -156q0 -2 14 -22l273 -383q48 -67 88 -91q39 -23 112 -23h6v-66z" />
+<glyph unicode="l" horiz-adv-x="579" d="M53 66l68 -2q98 0 98 98v1115q0 87 -44 108q-21 10 -106 10h-16v67l306 23v-1323q0 -50 13.5 -69t49.5 -23q29 -4 81 -4h24v-66q-220 6 -247.5 6t-226.5 -6v66z" />
+<glyph unicode="m" horiz-adv-x="1775" d="M1485 6q-40 0 -244 -6v66q26 -1 70 -1t65 13q32 19 32 84v499q0 238 -157 238q-130 0 -209.5 -104.5t-79.5 -238.5v-401q0 -39 12 -60q18 -30 118 -30q17 0 37 1v-66q-198 6 -237.5 6t-244.5 -6v66q26 -1 70 -1t65 13q32 19 32 84v499q0 238 -158 238 q-130 0 -209.5 -104.5t-79.5 -238.5v-397q0 -47 11 -64q18 -30 114 -30q19 0 40 1v-66q-198 6 -236 6t-243 -6v66q26 -1 69.5 -1t70 16t26.5 81v574q0 87 -44 109q-21 10 -96 10h-26v68l301 23v-225q101 225 316 225q251 0 284 -210q43 95 126.5 152.5t185.5 57.5 q158 0 224.5 -81t66.5 -243v-42q-1 -27 -1 -41v-409q0 -65 132 -65q17 0 35 1v-66q-198 6 -238 6z" />
+<glyph unicode="n" horiz-adv-x="1181" d="M1129 0q-200 6 -238 6t-244 -6v66q29 -1 70 -1t64 12q33 19 33 76v519q0 227 -158 227q-130 0 -209.5 -104.5t-79.5 -238.5v-400q0 -38 10 -58q17 -33 117 -33q17 0 38 1v-66q-199 6 -236 6t-243 -6v66q29 -1 72 -1t68.5 16.5t25.5 80.5v574q0 87 -44 109q-21 10 -96 10 h-26v68l301 23v-225q101 225 316 225q292 0 292 -316v-500q0 -65 135 -65q15 0 32 1v-66z" />
+<glyph unicode="o" horiz-adv-x="1054" d="M191.5 118.5q-138.5 142.5 -138.5 341.5t138 349.5t336.5 150.5t336.5 -151t138 -350.5t-139 -341t-336 -141.5t-335.5 142.5zM776 188q47 92 47 292.5t-56 292.5q-84 138 -244.5 138t-241.5 -143q-51 -90 -51 -294.5t55 -299.5q83 -144 246.5 -144t244.5 158z" />
+<glyph unicode="p" horiz-adv-x="1160" d="M360 805q127 141 308 141t310 -146.5t129 -342t-139 -338.5t-337 -143q-78 0 -158.5 42t-105.5 109v-388q0 -42 11 -59q19 -29 114 -29q19 0 41 1v-66q-169 5 -241.5 5t-238.5 -5v66q37 -2 76.5 -2t60.5 14q30 19 30 83v1002q0 51 -10 71.5t-44 28.5q-26 6 -83 6h-30v68 l307 23v-141zM855 176q74 128 74 282t-67 281q-81 154 -218 154q-179 0 -277 -172v-478q0 -46 30 -89q91 -130 230.5 -130t227.5 152z" />
+<glyph unicode="q" horiz-adv-x="1159" d="M1106 -414q-166 5 -243 5t-239 -5v66q37 -2 77 -2t66 16.5t26 80.5v383q-115 -154 -284 -154q-192 0 -324 144.5t-132 340t138 340.5t334 145q92 0 169.5 -54t117.5 -140l81 194h47v-1199q0 -46 12 -67q17 -29 113 -29q19 0 41 1v-66zM799 291v301q0 112 -76 206.5 t-178.5 94.5t-176.5 -72q-138 -134 -138 -362q0 -152 66 -280q81 -155 219 -155q104 0 194 82t90 185z" />
+<glyph unicode="r" horiz-adv-x="823" d="M53 66l67 -2q100 0 100 98v574q0 87 -45 109q-22 10 -106 10h-16v68l297 23v-235q76 235 262 235q60 0 109.5 -36.5t49.5 -85.5t-25.5 -76t-65 -27t-66 26t-26.5 66q0 64 48 84q-6 2 -14 2q-136 0 -207 -140q-55 -111 -55 -262v-346q0 -62 56 -78q23 -7 108 -7h44v-66 q-81 6 -147 6h-174l-194 -6v66z" />
+<glyph unicode="s" horiz-adv-x="804" d="M752 274q0 -146 -97 -222t-242 -76t-242 93q-77 -93 -97.5 -93t-20.5 33v322q0 32 27 32q21 0 30 -35q37 -146 92 -214q73 -90 206 -90q103 0 172 48.5t69 146.5q0 147 -223 195q-128 28 -148 33q-82 25 -134 67q-91 75 -91 183q0 134 108 204q92 59 221.5 59t212.5 -61 q60 61 82 61t22 -33v-254q0 -35 -29 -35q-23 0 -31 43l-6 60q-16 87 -81.5 132.5t-158.5 45.5t-157 -34q-81 -43 -81 -129t94 -130q48 -22 169 -46q170 -33 243 -102q91 -86 91 -204z" />
+<glyph unicode="t" horiz-adv-x="775" d="M722 265q0 -113 -48 -193q-58 -96 -164 -96q-132 0 -203.5 78t-71.5 211v590h-182v49q142 5 215 145q59 111 61 268h53v-394h305v-68h-305v-594q0 -231 144.5 -231t144.5 290q0 18 -1 67h52v-122z" />
+<glyph unicode="u" horiz-adv-x="1181" d="M821 169q-89 -193 -278.5 -193t-256.5 83t-67 280v375q0 102 -35 126q-23 15 -119 15h-12v68l314 23v-710q0 -114 39 -163t156 -49t189 108q63 94 63 224v380q0 87 -45 109q-21 10 -96 10h-26v68l315 23v-761q0 -87 45 -109q21 -10 96 -10h26v-66l-308 -24v193z" />
+<glyph unicode="v" horiz-adv-x="1151" d="M577 -24q-29 0 -45 40l-309 760q-24 60 -68 73q-18 6 -83 6h-19v68q120 -8 164 -8t276 8v-68q-122 0 -122 -54q0 -15 252 -634l219 546q13 32 13 50q0 90 -102 92v68q135 -8 194.5 -8t151.5 8v-68q-142 -1 -198 -142l-279 -697q-16 -40 -45 -40z" />
+<glyph unicode="w" horiz-adv-x="1571" d="M1045 -24q-28 0 -42 40l-220 608l-216 -606q-15 -42 -42.5 -42t-44.5 48l-270 757q-19 54 -62 68q-20 6 -78 6h-17v68q143 -8 170.5 -8t260.5 8v-68h-4q-121 0 -121 -56q0 -38 77 -245l137 -366l183 518q-38 105 -54 121q-29 28 -129 28v68q120 -8 189 -8l224 8v-68h-4 q-124 0 -124 -56q0 -11 11 -42l213 -595l195 546q10 28 10 46q0 98 -125 101v68q151 -8 209.5 -8t146.5 8v-68q-131 -3 -179 -136l-252 -703q-14 -40 -42 -40z" />
+<glyph unicode="x" horiz-adv-x="1183" d="M1131 0q-91 6 -175.5 6t-261.5 -6v66q77 3 77 54q0 10 -208 285q-192 -223 -192 -272q0 -61 62 -67v-66q-141 6 -221 6t-159 -6v66q159 0 274 128l200 256l-212 276q-71 92 -105 110.5t-147 18.5v68q110 -8 171 -8t264 8v-68q-75 -2 -75 -52q0 -20 184 -255l134 167 q33 41 33 75q0 61 -63 65v68q108 -8 192.5 -8t188.5 8v-68q-152 -3 -255 -109q-26 -27 -197 -244l287 -369q37 -47 92 -60q28 -7 95 -7h17v-66z" />
+<glyph unicode="y" horiz-adv-x="1151" d="M249 -439q-76 0 -136 50t-60 124q0 91 89 91q39 0 65 -25.5t26 -63.5q0 -81 -85 -91q41 -38 101 -38q93 0 158 92q32 45 68 130l71 170l-321 781q-22 54 -70 68q-21 6 -74 6h-28v68q120 -8 178.5 -8t261.5 8v-68h-4q-116 0 -116 -54q0 -19 250 -616l217 528q14 34 14 50 q0 90 -101 92v68q170 -8 212 -8t134 8v-68h-2q-140 0 -197 -136l-377 -913q-101 -245 -274 -245z" />
+<glyph unicode="z" horiz-adv-x="904" d="M91 0q-38 0 -38 30q0 15 18 39l599 807h-245q-167 0 -223.5 -63.5t-65.5 -234.5h-53l24 345h701q38 0 38 -28q0 -14 -18 -38l-595 -803h251q182 0 248 86q51 68 65 260h55l-38 -400h-723z" />
+<glyph unicode="{" horiz-adv-x="983" d="M827 -327q0 -23 -41 -23q-174 0 -285 78q-73 51 -93 116q-13 42 -13 149v313q0 117 -72 181t-190 73q-33 2 -33 21t18 22t35 4q242 31 242 252v313q0 107 13 149q20 65 93 116q109 77 285 77q41 0 41 -20.5t-18 -24.5q-154 -9 -237 -94q-42 -43 -54 -114q-5 -34 -5 -129 v-277q0 -89 -21 -132q-47 -96 -202 -141q155 -45 202 -141q21 -42 21 -131v-277q0 -95 5 -129q12 -71 54 -114q83 -85 237 -94q18 -4 18 -23z" />
+<glyph unicode="|" horiz-adv-x="410" d="M246 -311q0 -41 -41 -41t-41 41v1788q0 39 41 39t41 -39v-1788z" />
+<glyph unicode="}" horiz-adv-x="983" d="M883 582q0 -17 -18 -20t-35 -4q-242 -31 -242 -252v-313q0 -107 -13 -149q-20 -65 -93 -116q-111 -78 -285 -78q-41 0 -41 23q0 19 18 23q154 9 237 94q42 43 54 114q5 34 5 129v277q0 89 21 131q47 96 202 141q-155 45 -202 141q-21 43 -21 132v277q0 95 -5 129 q-12 71 -54 114q-83 85 -237 94q-18 4 -18 24.5t41 20.5q176 0 285 -77q73 -51 93 -116q13 -42 13 -149v-313q0 -117 72 -181t190 -73q33 -2 33 -23z" />
+<glyph unicode="~" horiz-adv-x="1058" d="M1021 659q0 -111 -71.5 -195t-175.5 -84t-251.5 116.5t-233.5 116.5q-136 0 -179 -131q-6 -29 -15.5 -65t-27.5 -36q-30 0 -30 57q0 109 72.5 193.5t176 84.5t251 -117t233.5 -117q155 0 192 184q9 49 31 49q28 0 28 -56z" />
+<glyph d="M731 1248q0 -164 -105 -244t-273 -80h-221v650h228q169 0 270 -81t101 -245zM1251 257h-455v650h455v-113h-304v-131h282v-113h-282v-180h304v-113zM1916 -410h-453v650h152v-537h301v-113zM344 1033q229 0 229 216t-229 216h-60v-432h60z" />
+<glyph unicode="¡" horiz-adv-x="682" d="M418 1012q32 -32 32 -76.5t-32 -76.5t-77 -32t-77 32t-32 76.5t32 76.5t77 32t77 -32zM341 -422q-44 0 -78 28q-30 26 -30 66v10l79 934q4 45 29 45t29 -47l79 -932v-10q0 -40 -30 -66q-34 -28 -78 -28z" />
+<glyph unicode="¢" horiz-adv-x="920" d="M868 454q0 -22 -27 -75q-100 -194 -310 -203v-284h-60v286q-179 16 -298.5 157t-119.5 327.5t118 332t300 163.5v288h60v-286q118 -5 206 -58q106 -64 106 -168t-97 -104q-42 0 -70.5 28t-28.5 70q0 94 100 99q-75 74 -216 78v-875q113 0 181 64q40 37 74 109.5t53 72.5 q29 0 29 -22zM398 1071q-168 -94 -168 -402.5t178 -404.5q31 -17 63 -26v862q-37 -9 -73 -29z" />
+<glyph unicode="£" horiz-adv-x="1051" d="M958 310q18 0 18 -23t-22 -86q-78 -225 -264 -225q-85 0 -177 56q-32 19 -153 112q-81 -168 -182 -168q-50 0 -78.5 35t-28.5 93t44 99.5t110 41.5q35 0 94 -10q4 50 4 120t-21 334h-213v60h209q-9 121 -9 208q0 171 97 299t263 128q117 0 180 -64t63 -133 q0 -27 -20.5 -50t-47.5 -23q-49 0 -61 61q-22 109 -24 112q-27 61 -114 61q-192 0 -192 -294q0 -57 10.5 -161t12.5 -144h357v-60h-356q0 -270 -66 -469l167 -56q101 -30 172 -30q135 0 189 107l17 45q10 24 22 24zM213 203q-105 0 -105 -99q0 -89 75 -89q88 0 126 154 q-52 34 -96 34z" />
+<glyph unicode="¤" horiz-adv-x="1024" d="M512 140q-160 0 -283 102l-145 -142l-56 55l144 145q-102 123 -102 282.5t102 282.5l-144 141l56 57l145 -141q123 102 283 102t283 -103l143 142l58 -57l-144 -141q102 -123 102 -282.5t-102 -282.5l144 -145l-58 -55l-143 143q-123 -103 -283 -103zM872 582 q0 149 -105.5 254.5t-254.5 105.5t-254.5 -105.5t-105.5 -254.5t105.5 -254.5t254.5 -105.5t254.5 105.5t105.5 254.5z" />
+<glyph unicode="¥" horiz-adv-x="1566" d="M1499 1284q-174 0 -252 -128l-272 -442h355v-60h-392l-72 -117v-13h464v-60h-464v-315q0 -34 10 -53q15 -29 89 -35h105v-61q-73 6 -127 6h-320q-55 0 -128 -6v61q8 0 25.5 -0.5t27.5 -0.5q124 0 142 36q7 14 7 43v325h-461v60h461v13l-72 117h-389v60h352l-304 498 q-35 56 -95 68q-21 4 -121 4v62q126 -6 299.5 -6t246.5 6v-62h-24q-112 0 -112 -48q0 -14 13 -35l298 -487h115l268 435q21 34 21 58q0 77 -113 77v62q155 -6 240.5 -6t178.5 6v-62zM868 654h-42l21 -34z" />
+<glyph unicode="¦" horiz-adv-x="386" d="M246 811q0 -61 -41 -61t-41 61v642q0 61 41 61t41 -61v-642zM246 -289q0 -61 -41 -61t-41 61v642q0 61 41 61t41 -61v-642z" />
+<glyph unicode="§" horiz-adv-x="964" d="M596 1140l13 91q0 89 -104 89q-68 0 -115.5 -48t-47.5 -117q0 -101 123 -206l229 -183q123 -119 123 -256q0 -197 -207 -321q116 -126 116 -240.5t-77 -192t-180.5 -77.5t-175.5 61t-72 152q0 32 21 57t53 25q71 0 71 -81l-16 -103q0 -36 36.5 -54.5t87 -18.5t103 47 t52.5 108q0 101 -125 211l-232 191q-126 123 -126 257q0 194 209 319q-117 128 -117 242t77.5 191t180 77t175.5 -58.5t73 -146t-74 -87.5q-31 0 -52.5 21t-21.5 51zM578 215q145 87 145 200.5t-127 231.5l-211 174q-142 -84 -142 -200.5t125 -233.5z" />
+<glyph unicode="¨" horiz-adv-x="549" d="M167 1318q32 -32 32 -78.5t-32 -79t-78 -32.5t-79 33.5t-33 78t33.5 77.5t79 33t77.5 -32zM539 1318q32 -32 32 -78.5t-32 -79t-78 -32.5t-79 33.5t-33 78t33.5 77.5t79 33t77.5 -32z" />
+<glyph unicode="©" horiz-adv-x="1524" d="M1233.5 1020q195.5 -197 195.5 -472.5t-196 -471.5t-471.5 -196t-471 196t-195.5 472t196 472.5t471.5 196.5t471 -197zM1378 548q0 255 -181 436.5t-435.5 181.5t-435 -182t-180.5 -437t180.5 -436t435.5 -181t435.5 181.5t180.5 436.5zM1099 390q0 -130 -98.5 -224 t-229.5 -94q-183 0 -308 134.5t-125 318t125.5 318.5t307.5 135q122 0 227 -102q64 102 82.5 102t18.5 -24v-315q0 -23 -24 -23q-20 0 -26.5 31.5t-28.5 104.5q-73 178 -233 178t-242 -129q-70 -109 -70 -276q0 -295 197 -380q57 -25 129 -25t142.5 51.5t97.5 133.5 q6 32 19 96q4 16 18 16q21 0 21 -27z" />
+<glyph unicode="ª" horiz-adv-x="822" d="M783 715q0 -62 -40 -103t-102 -41q-98 0 -129 97q-67 -105 -206 -105q-96 0 -170 34q-96 44 -96 128q0 125 165 194q99 41 289 51v43q0 73 -44 122.5t-127 49.5t-139 -47q70 -13 70 -74q0 -34 -25.5 -54.5t-59.5 -20.5q-84 0 -84 76q0 83 81.5 127.5t171.5 44.5 q142 0 227 -82q60 -58 60 -174v-284q0 -62 49 -62q48 0 48 130q0 18 -1 40h62v-90zM494 788v132q-116 -5 -198 -43q-113 -52 -113 -150q0 -50 40.5 -81t104 -31t115 49t51.5 124z" />
+<glyph unicode="«" horiz-adv-x="1140" d="M528 5q0 -27 -48 -27q-20 0 -36 37l-30 68q-79 165 -266 268q-29 14 -86 45q-15 10 -15 25t15 25l87 46q186 100 265 266l26 65q20 41 54 41t34 -27q0 -3 -3 -10q-123 -284 -344 -406q223 -124 344 -406q3 -7 3 -10zM952 5q0 -27 -47 -27q-20 0 -37 37t-30 68 q-79 165 -266 268q-30 14 -86 45q-15 10 -15 25t15 25l87 46q186 100 265 266l26 65q20 41 54 41t34 -27q0 -3 -3 -10q-123 -284 -344 -406q223 -124 344 -406q3 -7 3 -10z" />
+<glyph unicode="¬" horiz-adv-x="1591" d="M1304 219q0 -37 -41 -37t-41 37v428h-1013q-39 0 -39 41t39 41h1058q37 0 37 -37v-473z" />
+<glyph unicode="­" horiz-adv-x="0" />
+<glyph unicode="®" horiz-adv-x="1524" d="M1233.5 1020q195.5 -197 195.5 -472.5t-196 -471.5t-471.5 -196t-471 196t-195.5 472t196 472.5t471.5 196.5t471 -197zM1378 548q0 255 -181 436.5t-435.5 181.5t-435 -182t-180.5 -437t180.5 -436t435.5 -181t435.5 181.5t180.5 436.5zM1218 231q0 -56 -33 -98.5 t-88 -42.5q-211 0 -211 205v26q1 17 1 25q0 180 -158 180h-137v-316q0 -17 4 -26q8 -19 105 -19h19v-47q-48 4 -88 4h-195q-40 0 -88 -4v47h20q12 -1 19 -1q75 0 85 20q4 8 4 26v664q0 16 -4 27q-8 21 -100 21h-24v48h393q116 0 212 -55q114 -65 114 -172q0 -144 -205 -202 q116 -45 143 -147l34 -204q18 -63 62 -63q58 0 77 106q4 24 19 24q20 0 20 -26zM931 743q0 112 -75 152q-53 28 -172 28h-53q-39 0 -39 -35v-325h133q206 0 206 180z" />
+<glyph unicode="¯" horiz-adv-x="964" d="M971 1543q59 0 59 -38.5t-59 -38.5h-979q-58 0 -58 38.5t59 38.5h978z" />
+<glyph unicode="°" horiz-adv-x="771" d="M590.5 1325.5q84.5 -84.5 84.5 -205t-84.5 -204.5t-205 -84t-205 84.5t-84.5 204.5t84.5 204.5t205 84.5t205 -84.5zM534 972.5q61 61.5 61 149t-61 148.5t-148.5 61t-149 -61.5t-61.5 -148.5t62 -148.5t149 -61.5t148 61.5z" />
+<glyph unicode="±" horiz-adv-x="1591" d="M1421 41q0 -41 -37 -41h-1175q-39 0 -39 41t39 41h546v502h-546q-39 0 -39 41t39 41h546v546q0 39 41 39t41 -39v-546h547q37 0 37 -41t-37 -41h-547v-502h547q37 0 37 -41z" />
+<glyph unicode="²" horiz-adv-x="801" d="M79 579v22q0 26 21 47l300 296q160 158 160 299q0 93 -53.5 154.5t-145.5 61.5q-136 0 -195 -119q98 -2 98 -83q0 -36 -27 -59.5t-64 -23.5q-94 0 -94 87q0 113 93.5 187t219.5 74t228 -74t102 -205q0 -82 -60 -158q-33 -42 -125 -121l-300 -259h300q82 0 95 9.5 t33 125.5h59l-46 -261h-599z" />
+<glyph unicode="³" horiz-adv-x="801" d="M735 826q0 -124 -106.5 -200.5t-229.5 -76.5t-218 54q-114 64 -114 173q0 90 97 90q40 0 69 -24t29 -63q0 -82 -93 -87q74 -85 219 -85q86 0 126 64t40 155q0 220 -176 220q-72 0 -72 -1h3q-47 3 -47 27t91 29.5t133.5 67.5t42.5 153q0 146 -140 146q-122 0 -187 -67 q86 -7 86 -79q0 -80 -89.5 -80t-89.5 81q0 96 100 152q83 47 188 47t192 -47q105 -57 105 -154q0 -81 -55.5 -145.5t-137.5 -96.5q97 -26 165.5 -93t68.5 -160z" />
+<glyph unicode="´" horiz-adv-x="928" d="M523 1401q22 29 53 29t54 -23t23 -53t-28 -54l-313 -256l-37 35z" />
+<glyph unicode="µ" horiz-adv-x="1120" d="M1043 187q0 -84 -47.5 -143.5t-130 -59.5t-125 64.5t-42.5 152.5q-101 -225 -317 -225q-83 0 -144 25v-66q0 -221 -37 -352h-148q37 173 37 311v1029h147v-663q0 -237 159 -237q129 0 209 101t80 233v566h148v-765q0 -39 21.5 -73.5t58.5 -34.5q78 0 78 171l-2 86h55 v-120z" />
+<glyph unicode="¶" horiz-adv-x="964" d="M927 1235h-125v-1642h-68v1642h-177v-1642h-68v982h-5q-448 0 -448 358q0 177 128 270q113 83 296 83h467v-51z" />
+<glyph unicode="·" horiz-adv-x="300" d="M260 582q0 -46 -32 -78t-78 -32t-78 32t-32 78t32 78t78 32t78 -32t32 -78z" />
+<glyph unicode="¸" horiz-adv-x="1024" d="M744 -239q0 -161 -376 -161h-88v43q327 0 327 118q0 56 -42 87t-101 32v127h96v-95q70 -11 127 -49.5t57 -101.5z" />
+<glyph unicode="¹" horiz-adv-x="801" d="M142 642l84 -2q93 0 106 24q5 9 5 30v708q-80 -31 -204 -31v62q193 0 290 89h12q38 0 38 -45v-786q0 -18 5 -28q11 -21 175 -21h15v-64q-67 5 -105 5h-316q-38 0 -105 -5v64z" />
+<glyph unicode="º" horiz-adv-x="810" d="M771 894.5q0 -143.5 -111 -237.5t-255.5 -94t-254.5 94.5t-110 238t110 242.5t255.5 99t255.5 -99.5t110 -243zM583 719q34 60 34 189t-41 189q-60 88 -174.5 88t-172.5 -91q-37 -58 -37 -190t40 -194q59 -91 176.5 -91t174.5 100z" />
+<glyph unicode="»" horiz-adv-x="1140" d="M670 421q0 -15 -15 -25l-87 -45q-188 -104 -266 -268l-26 -64q-20 -41 -46 -41q-41 0 -41 27q0 5 2 10q116 279 345 406q-227 125 -345 406q-2 4 -2 10q0 27 34 27t50 -36.5t29 -69.5q78 -165 265 -266q31 -14 88 -46q15 -10 15 -25zM1093 421q0 -15 -14 -25l-87 -45 q-188 -104 -266 -268l-26 -64q-20 -41 -46 -41q-41 0 -41 27q0 5 1 10q117 279 346 406q-227 125 -346 406q-1 4 -1 10q0 27 33.5 27t53.5 -41l26 -65q78 -165 265 -266q30 -14 88 -46q14 -10 14 -25z" />
+<glyph unicode="¼" horiz-adv-x="1722" d="M1499 1415q0 -13 -6 -22l-1071 -1667q-11 -17 -35 -17q-40 0 -40 40q0 13 6 22l1071 1667q11 17 35 17q40 0 40 -40zM1677 -100h-156v-120q0 -18 5 -27q10 -19 134 -19h13v-64q-78 5 -117 5h-213q-36 0 -114 -5v64l58 -1q76 0 88 20q6 10 6 27v120h-416v56l481 653 q15 21 40 21q35 0 35 -47v-620h156v-63zM142 643l67 -2q109 0 123 24q5 9 5 30v708q-80 -31 -204 -31v62q193 0 290 89h12q38 0 38 -45v-786q0 -18 5 -28q11 -21 175 -21h15v-64q-67 5 -112 5h-302q-45 0 -112 -5v64zM1390 -37v476l-352 -476h352z" />
+<glyph unicode="½" horiz-adv-x="1722" d="M142 643l67 -2q109 0 123 24q5 9 5 30v708q-80 -31 -204 -31v62q193 0 290 89h12q38 0 38 -45v-786q0 -18 5 -28q11 -21 175 -21h15v-64q-67 5 -112 5h-302q-45 0 -112 -5v64zM1419 1415q0 -13 -6 -22l-1071 -1667q-11 -17 -35 -17q-40 0 -40 40q0 13 6 22l1071 1667 q11 17 35 17q40 0 40 -40zM999 -329v22q0 26 21 47l300 296q160 158 160 299q0 89 -52 152.5t-147 63.5q-136 0 -195 -119q98 -2 98 -83q0 -35 -26.5 -59t-64.5 -24q-94 0 -94 87q0 109 90.5 185t222.5 76t231 -76.5t99 -202.5q0 -82 -61 -159q-32 -40 -124 -120l-300 -259 h285q97 0 110 9.5t33 125.5h59l-46 -261h-599z" />
+<glyph unicode="¾" horiz-adv-x="1722" d="M1499 1415q0 -13 -6 -22l-1071 -1667q-11 -17 -35 -17q-40 0 -40 40q0 13 6 22l1071 1667q11 17 35 17q40 0 40 -40zM1677 -100h-156v-120q0 -18 5 -27q10 -19 134 -19h13v-64q-78 5 -117 5h-213q-36 0 -114 -5v64l58 -1q76 0 88 20q6 10 6 27v120h-416v56l481 653 q15 21 40 21q35 0 35 -47v-620h156v-63zM735 827q0 -120 -103.5 -198.5t-231.5 -78.5t-223 56q-110 65 -110 171q0 90 97 90q42 0 70 -24.5t28 -62.5q0 -82 -93 -87q74 -85 219 -85q88 0 131 72q35 58 35 147q0 220 -176 220h-81q-35 0 -35 25.5t90.5 30.5t133.5 67t43 153 q0 146 -140 146q-123 0 -187 -67q86 -8 86 -79q0 -80 -89.5 -80t-89.5 81q0 94 97 150q83 49 191 49t195 -49q102 -57 102 -152q0 -79 -54.5 -144t-138.5 -98q100 -27 167 -94.5t67 -158.5zM1390 -37v476l-352 -476h352z" />
+<glyph unicode="¿" horiz-adv-x="909" d="M559 1012q32 -32 32 -76.5t-32 -76.5t-77 -32t-77 32t-32 76.5t32 76.5t77 32t77 -32zM728 -29q94 0 94 -102.5t-95.5 -185.5t-252.5 -83q-207 0 -308 94q-79 73 -79 191.5t98 191.5q270 200 270 457v72q0 55 26 55t26 -49v-92q0 -267 -181 -461q-69 -74 -69 -182 t28 -152q49 -80 195 -80q187 0 268 139q-114 0 -114 93.5t94 93.5z" />
+<glyph unicode="×" horiz-adv-x="1591" d="M1321 100q0 -44 -43 -44q-15 0 -25 10l-458 458l-456 -456q-11 -11 -27 -11q-42 0 -42 42q0 16 11 27l457 456l-457 456q-11 11 -11 27q0 42 42 42q16 0 27 -11l456 -456l458 458q10 10 25 10q43 0 43 -44q0 -14 -10 -24l-458 -458l458 -458q10 -10 10 -24z" />
+<glyph unicode="÷" horiz-adv-x="1591" d="M1421 582q0 -41 -37 -41h-1175q-39 0 -39 41t39 41h1175q37 0 37 -41zM875 1109.5q34 -33.5 34 -80t-33.5 -79.5t-80.5 -33t-80.5 33t-33.5 79.5t34 80t80 33.5t80 -33.5zM875.5 214q33.5 -33 33.5 -79.5t-34 -80t-80 -33.5t-80 33.5t-34 80t33.5 79.5t80.5 33t80.5 -33z " />
+<glyph unicode="ı" horiz-adv-x="562" d="M510 0q-202 6 -233 6t-224 -6v66l44 -1q66 0 89 13q33 18 33 79v582q0 85 -41 105q-21 11 -103 11h-14v68l298 23v-802q0 -59 51 -73q19 -5 69 -5h31v-66z" />
+<glyph unicode="ƒ" horiz-adv-x="1033" d="M977 1183q-39 0 -65 25q-23 23 -23 56v8q3 37 29 64.5t62 32.5q-41 31 -94 31q-19 0 -34 -4q-35 -11 -68 -63q-9 -16 -65 -311l-26 -138h208q26 0 22 -27l-7 -16q-4 -25 -29 -25h-208l-93 -503q-81 -436 -171 -585.5t-203 -149.5q-71 0 -125.5 39t-54.5 98t30 93.5 t79 34.5q75 0 75 -71q0 -44 -29.5 -76t-72.5 -34q37 -37 107 -37q67 0 109 121q26 75 117 559l95 511h-173q-26 0 -20 26l5 17q6 25 31 25h171l24 128q23 121 47.5 204t70.5 136q85 94 185 94q48 0 94 -20q102 -45 102 -132q0 -7 -1 -14q-8 -97 -101 -97z" />
+<glyph unicode="ƛ" horiz-adv-x="1121" d="M1102 -7q0 -18 -45 -18q-81 0 -107 19.5t-54 92.5q-62 162 -194 554l-403 -483q-49 -68 -141 -167q-26 -18 -46 -18q-61 0 -61 57q0 29 43 72q575 581 587 594l-130 369h-267q-37 0 -37 42t37 42h237l-51 140q-23 65 -34 87q-26 57 -53 70q-22 6 -48 14.5t-26 23.5 q0 24 39 24q212 0 266 -155l70 -204h276q38 0 38 -42t-38 -42h-247l333 -963q20 -57 38 -81.5t18 -27.5z" />
+<glyph unicode="ǀ" horiz-adv-x="626" d="M354 -101q0 -41 -41 -41t-41 41v1368q0 39 41 39t41 -39v-1368z" />
+<glyph unicode="ǁ" horiz-adv-x="1024" d="M752 -105q0 -37 -41 -37t-41 37v1374q0 37 41 37t41 -37v-1374zM354 -105q0 -37 -41 -37t-41 37v1374q0 37 41 37t41 -37v-1374z" />
+<glyph unicode="ǂ" horiz-adv-x="1194" d="M1024 380q0 -41 -37 -41h-349v-444q0 -37 -41 -37t-41 37v444h-347q-39 0 -39 41t39 41h347v322h-347q-39 0 -39 41t39 41h347v444q0 37 41 37t41 -37v-444h349q37 0 37 -41t-37 -41h-349v-322h349q37 0 37 -41z" />
+<glyph unicode="ȷ" horiz-adv-x="588" d="M385 -107q0 -133 -81 -232.5t-211 -99.5q-90 0 -159 40q-83 48 -83 132q0 42 27.5 70t69.5 28t70.5 -28t28.5 -70q0 -76 -74 -96q58 -29 114 -29q158 0 158 281v861q0 39 -9 60q-20 45 -148 45h-27v68l324 23v-1053z" />
+<glyph unicode="ȸ" horiz-adv-x="1740" d="M940 807q121 139 303.5 139t313 -145.5t130.5 -342t-139 -339.5t-327.5 -143t-290.5 157q-24 -46 -77 -133h-60v118q-111 -142 -295 -142t-314.5 144.5t-130.5 340.5t139.5 340.5t336.5 144.5q163 0 270 -133v464q0 88 -47 109q-20 10 -85 10q-16 0 -35 -1v67l308 23 v-678zM1445 162q64 99 64 300t-60 299q-85 138 -225 138q-91 0 -184 -64t-93 -150v-442q0 -45 30 -89q89 -130 234 -130t234 138zM793 253v449q0 32 -24 68q-87 129 -236 129t-238 -138q-65 -100 -65 -300t61 -299q85 -138 224 -138q93 0 185.5 69.5t92.5 159.5z" />
+<glyph unicode="ȹ" horiz-adv-x="1733" d="M940 813q124 133 303 133t308 -146.5t129 -342t-139 -338.5t-337 -143q-78 0 -158.5 42t-105.5 109v-380q0 -46 12 -67q17 -29 113 -29q19 0 41 1v-66q-166 5 -243 5t-239 -5v66q37 -2 77 -2t66 16.5t26 80.5v383q-115 -154 -284 -154q-192 0 -324 144.5t-132 340 t138 340.5t334 145q92 0 169.5 -54t117.5 -140l81 194h47v-133zM1428 176q74 128 74 282t-67 281q-81 154 -218 154q-179 0 -277 -172v-478q0 -46 30 -89q91 -130 230.5 -130t227.5 152zM799 291v301q0 112 -76 206.5t-178.5 94.5t-176.5 -72q-138 -134 -138 -362 q0 -152 66 -280q81 -155 219 -155q104 0 194 82t90 185z" />
+<glyph unicode="ȼ" horiz-adv-x="920" d="M868 254q0 -22 -27 -75q-104 -203 -329 -203q-91 0 -174 36l-83 -229l-44 18l85 232q-111 63 -177 178.5t-66 249.5q0 201 132 350t330 149q56 0 113 -14l74 203l44 -18l-72 -199q169 -62 169 -202q0 -100 -97 -100q-42 0 -70.5 28t-28.5 70q0 94 100 99q-37 36 -91 56 l-289 -792q76 -61 176.5 -61t168.5 64q40 37 74 109.5t53 72.5q29 0 29 -22zM610 896q-43 9 -97.5 9t-114.5 -34q-168 -94 -168 -405q0 -223 100 -339z" />
+<glyph unicode="ɀ" horiz-adv-x="914" d="M914 -60q0 -69 -61 -114t-142 -45t-181 79q-21 16 -156 147q-82 79 -127 79q-30 0 -66.5 -43t-61.5 -43h-28q-38 0 -38 30q0 15 18 39l599 807h-245q-154 0 -205 -49.5t-74 -208.5h-53l44 305h671q38 0 38 -28q0 -14 -18 -38q-473 -639 -473 -642.5t29.5 -16t66.5 -40.5 q127 -94 172 -212.5t98 -118.5q46 0 70 25q-64 22 -64 91q0 39 26.5 65t66.5 26t67 -26.5t27 -67.5z" />
+<glyph unicode="ɐ" horiz-adv-x="1070" d="M1018 732q0 -179 -213 -279q-131 -61 -394 -76v-78q0 -110 60.5 -192t166.5 -82q154 0 231 98q-46 0 -78 26.5t-32 70t28.5 71.5t71.5 28q98 0 98 -99q0 -113 -102 -178.5t-222 -65.5q-183 0 -293 119q-50 54 -63.5 108t-13.5 144v427q0 40 -20.5 74t-57.5 34 q-79 0 -79 -175q0 -28 2 -80h-55v119q0 83 47.5 142.5t122.5 59.5t120.5 -51.5t52.5 -122.5q35 85 111 135.5t186.5 50.5t205.5 -50q119 -62 119 -178zM854 729q0 78 -56.5 130.5t-135.5 52.5q-111 0 -181 -81.5t-70 -194.5v-214q171 6 291 71q152 82 152 236z" />
+<glyph unicode="ɑ" horiz-adv-x="1159" d="M793 118q-111 -142 -295 -142t-314.5 144.5t-130.5 340.5t139.5 340.5t336.5 144.5q90 0 169 -44t114 -120l81 164h47v-761q0 -88 46 -110q20 -10 85 -10q16 0 35 1v-66l-313 -24v142zM793 253v449q0 32 -24 68q-87 129 -236 129t-238 -138q-65 -100 -65 -300t61 -299 q85 -138 224 -138q93 0 185.5 69.5t92.5 159.5z" />
+<glyph unicode="ɒ" horiz-adv-x="1159" d="M366 804q111 142 295 142t314.5 -144.5t130.5 -340.5t-139.5 -340.5t-336.5 -144.5q-90 0 -169 44t-114 120l-81 -164h-47v761q0 88 -46 110q-20 10 -85 10q-16 0 -35 -1v66l313 24v-142zM864 161q65 100 65 300t-61 299q-85 138 -224 138q-93 0 -185.5 -69.5 t-92.5 -159.5v-449q0 -32 24 -68q87 -129 236 -129t238 138z" />
+<glyph unicode="ɓ" horiz-adv-x="1160" d="M360 807q121 139 303.5 139t313 -145.5t130.5 -342t-139 -339.5t-327.5 -143t-290.5 157q-24 -46 -77 -133h-53v1099q0 141 95.5 240t236.5 99q72 0 132.5 -40.5t60.5 -108.5q0 -94 -95 -94q-39 0 -65.5 26t-26.5 65q0 69 64 91q-33 15 -70 15q-96 0 -149 -101 q-43 -81 -43 -187v-297zM865 162q64 99 64 300t-60 299q-85 138 -225 138q-91 0 -184 -64t-93 -150v-442q0 -45 30 -89q89 -130 234 -130t234 138z" />
+<glyph unicode="ɔ" horiz-adv-x="920" d="M406 960q198 0 330 -149t132 -347.5t-132.5 -343t-326.5 -144.5q-225 0 -329 203q-27 53 -27 75t29 22q19 0 53 -72.5t74 -109.5q68 -64 181 -64q60 0 123 34q178 96 178 404.5t-168 402.5q-60 34 -120 34q-150 0 -229 -78q100 -5 100 -99q0 -42 -28.5 -70t-70.5 -28 q-97 0 -97 106t113 170q94 54 215 54z" />
+<glyph unicode="ɕ" horiz-adv-x="920" d="M869 275q0 -123 -115.5 -211t-241.5 -88q-44 0 -86 8l-47 -74q-20 -38 -63 -112q-9 -15 -23 -15q-29 0 -29 26q0 24 107 190q-142 48 -230 177t-88 285q0 201 132 350t330 149q121 0 215 -54q113 -64 113 -170t-97 -106q-42 0 -70.5 28t-28.5 70q0 94 100 99 q-79 78 -229 78q-60 0 -120 -34q-168 -94 -168 -403q0 -315 182 -406q219 319 338 319t119 -106zM815 275q0 52 -63 52q-89 0 -288 -287q34 -10 67 -10q102 0 193 72t91 173z" />
+<glyph unicode="ɖ" horiz-adv-x="1159" d="M793 118q-111 -142 -295 -142t-314.5 144.5t-130.5 340.5t139.5 340.5t336.5 144.5q163 0 270 -133v464q0 88 -47 109q-20 10 -85 10q-16 0 -35 -1v67l308 23v-1718q0 -88 46 -110q20 -10 85 -10q16 0 35 1v-66l-313 -24v560zM793 253v449q0 32 -24 68q-87 129 -236 129 t-238 -138q-65 -100 -65 -300t61 -299q85 -138 224 -138q93 0 185.5 69.5t92.5 159.5z" />
+<glyph unicode="ɗ" horiz-adv-x="1325" d="M1325 1289q0 -94 -95 -94q-39 0 -65.5 26t-26.5 65q0 69 64 91q-33 15 -70 15q-96 0 -149 -101q-43 -81 -43 -187v-919q0 -88 46 -110q20 -10 85 -10q16 0 35 1v-66l-313 -24v142q-111 -142 -295 -142t-314.5 144.5t-130.5 340.5t139.5 340.5t336.5 144.5q163 0 270 -133 v286q0 141 96 240t237 99q72 0 132.5 -40.5t60.5 -108.5zM793 253v449q0 32 -24 68q-87 129 -236 129t-238 -138q-65 -100 -65 -300t61 -299q85 -138 224 -138q93 0 185.5 69.5t92.5 159.5z" />
+<glyph unicode="ɘ" horiz-adv-x="933" d="M53 539q0 183 101.5 302t287 119t312.5 -147.5t127 -344.5t-136.5 -344.5t-341.5 -147.5t-315 188q-35 60 -35 88t27 28q16 0 28 -29q92 -221 290 -221q152 0 242 144q64 103 64 313v7h-605q-31 0 -38.5 7.5t-7.5 37.5zM436 911q-128 0 -192 -129q-50 -100 -50 -243h507 q-10 271 -175 349q-49 23 -90 23z" />
+<glyph unicode="ə" horiz-adv-x="933" d="M88 772q110 188 315 188t341.5 -147.5t136.5 -344.5t-127 -344.5t-312.5 -147.5t-287 119t-101.5 302q0 30 7.5 37.5t38.5 7.5h605v7q0 210 -64 313q-90 144 -242 144q-198 0 -290 -221q-12 -29 -28 -29q-27 0 -27 28t35 88zM194 397q0 -143 50 -243q64 -129 192 -129 q41 0 90 23q165 78 175 349h-507z" />
+<glyph unicode="ɚ" horiz-adv-x="1351" d="M1083 1089l-10 -207q0 -188 118 -188q34 0 64 20q-72 11 -72 84q0 35 24.5 59.5t59.5 24.5t59.5 -24.5t24.5 -59.5q0 -63 -49 -108.5t-113 -45.5q-167 0 -167 251l6 165q0 29 -13 29t-49 -41l-218 -247q123 -145 123 -340.5t-132.5 -340t-317 -144.5t-289.5 127 q-28 34 -28 49.5t33 52.5l495 555q-80 146 -242 146q-113 0 -181 -64q-40 -37 -74 -109.5t-53 -72.5q-29 0 -29 22.5t27 74.5q106 203 329 203q171 0 298 -116l245 274q58 65 88 65q43 0 43 -94zM694 466q0 135 -35 234l-490 -555q73 -115 224 -115q60 0 123 34 q178 97 178 402z" />
+<glyph unicode="ɛ" horiz-adv-x="883" d="M792 280q28 0 28 -28.5t-34 -86.5q-110 -189 -326 -189q-148 0 -260 61q-138 75 -138 211q0 99 74 161.5t179 86.5q-93 22 -154 84t-61 153q0 123 132 182q98 45 221 45t210 -28q123 -40 123 -122q0 -33 -24.5 -55.5t-60.5 -22.5t-67 47q-52 77 -61 86q-47 47 -126 47 q-202 0 -202 -194q0 -188 199 -188q22 0 63 11t63 11q86 0 86 -55.5t-87 -55.5q-21 0 -62.5 11t-62.5 11q-224 0 -224 -205q0 -228 255 -228q204 0 290 221q11 29 27 29z" />
+<glyph unicode="ɜ" horiz-adv-x="883" d="M820 248q0 -136 -138 -211q-112 -61 -260 -61q-216 0 -326 189q-34 58 -34 86.5t28 28.5q16 0 27 -29q86 -221 290 -221q255 0 255 228q0 205 -224 205q-21 0 -62.5 -11t-62.5 -11q-87 0 -87 55.5t86 55.5q22 0 63 -11t63 -11q199 0 199 188q0 194 -202 194 q-79 0 -126 -47q-9 -9 -61 -86q-31 -47 -67 -47t-60.5 22.5t-24.5 55.5q0 82 123 122q87 28 210 28t221 -45q132 -59 132 -182q0 -91 -61 -153t-154 -84q105 -24 179 -86.5t74 -161.5z" />
+<glyph unicode="ɝ" horiz-adv-x="1282" d="M1014 1089l-10 -207q0 -188 118 -188q34 0 64 20q-72 11 -72 84q0 35 24.5 59.5t59.5 24.5t59.5 -24.5t24.5 -59.5q0 -63 -49 -108.5t-113 -45.5q-167 0 -167 251l6 165q0 29 -13 29t-49 -41l-165 -187q50 -53 50 -136t-61 -145t-154 -84q105 -24 179 -86.5t74 -161.5 q0 -136 -138 -211q-112 -61 -260 -61q-216 0 -326 189q-34 58 -34 86.5t28 28.5q16 0 27 -29q86 -221 290 -221q255 0 255 228q0 205 -224 205q-21 0 -62.5 -11t-62.5 -11q-87 0 -87 55.5t86 55.5q22 0 63 -11t63 -11q199 0 199 188q0 194 -202 194q-79 0 -126 -47 q-9 -9 -61 -86q-31 -47 -67 -47t-60.5 22.5t-24.5 55.5q0 82 123 122q87 28 192 28q172 0 274 -63l198 221q58 65 88 65q43 0 43 -94z" />
+<glyph unicode="ɞ" horiz-adv-x="977" d="M915 248q0 -135 -140 -211q-114 -61 -263 -61q-200 0 -329.5 146.5t-129.5 347.5t128 345.5t325 144.5q141 0 239 -45q132 -59 132 -182q0 -91 -61 -153t-154 -84q105 -24 179 -86.5t74 -161.5zM757 258q0 205 -224 205q-21 0 -62.5 -11t-62.5 -11q-87 0 -87 55.5 t86 55.5q22 0 63 -11t63 -11q199 0 199 188q0 93 -59.5 143.5t-156.5 50.5q-174 0 -280 -130.5t-106 -309t94 -303.5q103 -139 278 -139q255 0 255 228z" />
+<glyph unicode="ɟ" horiz-adv-x="597" d="M585 514h-200v-621q0 -133 -81 -232.5t-211 -99.5q-90 0 -159 40q-83 48 -83 132q0 42 27.5 70t69.5 28t70.5 -28t28.5 -70q0 -76 -74 -96q58 -29 114 -29q158 0 158 281v625h-214v68h214v168q0 39 -9 60q-20 45 -148 45h-27v68l324 23v-364h200v-68z" />
+<glyph unicode="ɠ" horiz-adv-x="1322" d="M1322 1289q0 -94 -95 -94q-39 0 -65.5 26t-26.5 65q0 69 64 91q-33 15 -70 15q-96 0 -149 -101q-43 -81 -43 -187v-988q0 -558 -514 -558q-118 0 -201.5 54.5t-83.5 166.5q0 98 94 98q41 0 68 -26.5t27 -67.5q0 -94 -105 -94h-2q60 -74 201 -74q369 0 369 413v162 q-115 -154 -284 -154q-193 0 -324.5 130.5t-131.5 324.5t137.5 324.5t325.5 130.5t283 -169v322q0 141 96 240t237 99q72 0 132.5 -40.5t60.5 -108.5zM796 351v241q0 112 -76 206.5t-185 94.5q-146 0 -233 -134q-75 -116 -75 -267.5t67 -268.5q80 -139 218 -139 q104 0 194 82t90 185z" />
+<glyph unicode="ɡ" horiz-adv-x="1159" d="M937 116q0 -558 -514 -558q-118 0 -201.5 54.5t-83.5 166.5q0 98 94 98q41 0 68 -26.5t27 -67.5q0 -94 -105 -94h-2q60 -74 201 -74q369 0 369 413v162q-115 -154 -284 -154q-193 0 -324.5 130.5t-131.5 324.5t137.5 324.5t334.5 130.5q92 0 169.5 -54t117.5 -140l81 194 h47v-830zM796 351v241q0 112 -76 206.5t-185 94.5q-146 0 -233 -134q-75 -116 -75 -267.5t67 -268.5q80 -139 218 -139q104 0 194 82t90 185z" />
+<glyph unicode="ɢ" horiz-adv-x="1134" d="M1083 315h-42q-62 0 -62 -51v-236q0 -27 -20 -27q-29 0 -96 77q-80 -108 -287 -108t-365.5 141.5t-158.5 350.5t158 351t369 142q151 0 276 -110l70 90q16 20 30 20q25 0 25 -30v-340q0 -26 -29 -26t-36 28q-8 40 -34 118q-39 87 -114.5 140t-160.5 53t-155 -31 q-230 -102 -230 -404.5t232 -404.5q71 -31 155 -31t146 34q77 41 77 120v77q0 24 -6 33q-17 24 -182 24v64q58 -4 168.5 -4t271.5 4v-64z" />
+<glyph unicode="ɣ" horiz-adv-x="1151" d="M775 39q66 -144 66 -250t-73 -168.5t-178 -62.5t-176.5 51t-71.5 145t71 230q22 43 126 210l-316 582q-31 57 -71 71q-22 8 -76 8h-23v68q119 -8 168 -8t272 8v-68h-4q-118 0 -118 -54q0 -12 253 -477l218 389q13 23 13 50q0 91 -102 92v68q131 -8 193 -8t153 8v-68 q-119 -1 -198 -142l-248 -443q99 -180 122 -231zM465.5 -344q47.5 -45 113.5 -45t99.5 43.5t33.5 113t-51 183.5q-10 23 -92 180q-151 -247 -151 -357q0 -73 47.5 -118z" />
+<glyph unicode="ɤ" horiz-adv-x="1051" d="M999 855q-60 0 -103 -33q-27 -19 -75 -79l-215 -265q152 -177 152 -300q0 -202 -220 -202q-190 0 -190 192q0 125 139 261l-284 377q-37 49 -142 49h-8v68q120 -8 166 -8t274 8v-68h-6q-131 0 -131 -46q0 -12 8 -23l209 -277l189 234q9 11 9 30q0 80 -118 82v68 q134 -8 194 -8t152 8v-68zM646 146q0 83 -114 227q-114 -113 -114 -207q0 -56 33 -96t88 -40q107 0 107 116z" />
+<glyph unicode="ɥ" horiz-adv-x="1181" d="M823 182h-2q-41 -93 -125 -149t-184 -56q-292 0 -292 314v502q0 65 -135 65q-15 0 -32 -1v66q200 -6 238 -6t244 6v-66q-30 1 -70.5 1t-63.5 -12q-33 -19 -33 -76v-519q0 -227 158 -227q130 0 209.5 104.5t79.5 238.5v400q0 39 -10 58q-18 33 -117 33q-18 0 -38 -1v66 q200 -6 236.5 -6t242.5 6v-66q-30 1 -72.5 1t-68 -16.5t-25.5 -80.5v-995q0 -87 44 -108q21 -10 96 -10h26v-67l-306 -23v624z" />
+<glyph unicode="ɦ" horiz-adv-x="1181" d="M1129 0q-200 6 -238 6t-244 -6v66q30 -1 70.5 -1t63.5 12q33 19 33 76v519q0 227 -158 227q-130 0 -209.5 -104.5t-79.5 -238.5v-400q0 -39 10 -58q18 -33 117 -33q18 0 38 1v-66q-200 6 -236.5 6t-242.5 -6v66q30 -1 72.5 -1t68 16.5t25.5 80.5v937q0 141 95.5 240 t236.5 99q72 0 132.5 -40.5t60.5 -108.5q0 -94 -95 -94q-39 0 -65.5 26t-26.5 65q0 69 64 91q-33 15 -70 15q-96 0 -149 -101q-43 -81 -43 -187v-363h2q41 93 125 149t184 56q292 0 292 -314v-502q0 -65 135 -65q15 0 32 1v-66z" />
+<glyph unicode="ɧ" horiz-adv-x="1164" d="M962 -107q0 -133 -81 -232.5t-211 -99.5q-90 0 -159 40q-83 48 -83 132q0 42 27.5 70t69.5 28t70.5 -28t28.5 -70q0 -76 -74 -96q58 -29 114 -29q158 0 158 281v743q0 267 -166 267q-130 0 -209.5 -104.5t-79.5 -238.5v-400q0 -39 10 -58q18 -33 117 -33q18 0 38 1v-66 q-200 6 -236.5 6t-242.5 -6v66q30 -1 72.5 -1t68 16.5t25.5 80.5v937q0 141 95.5 240t236.5 99q72 0 132.5 -40.5t60.5 -108.5q0 -94 -95 -94q-39 0 -65.5 26t-26.5 65q0 69 64 91q-33 15 -70 15q-96 0 -149 -101q-43 -81 -43 -187v-363h2q41 93 125 149t184 56 q292 0 292 -316v-737z" />
+<glyph unicode="ɨ" horiz-adv-x="578" d="M335.5 1356q33.5 -33 33.5 -80.5t-33.5 -81t-80.5 -33.5t-80 34.5t-33 80t33.5 79.5t80 34t80 -33zM566 514h-207v-370q0 -59 51 -73q19 -5 69 -5h31v-66q-202 6 -233 6t-224 -6v66l44 -1q66 0 89 13q33 18 33 79v357h-207v68h207v157q0 85 -41 105q-21 11 -103 11h-14 v68l298 23v-364h207v-68z" />
+<glyph unicode="ɩ" horiz-adv-x="748" d="M695 266q0 -114 -48 -194q-58 -96 -164 -96q-133 0 -203 78t-70 212v473q0 86 -41 106q-20 11 -103 11h-14v67l299 23v-685q0 -231 148 -231q102 0 131 139q12 56 12 182v37h53v-122z" />
+<glyph unicode="ɪ" horiz-adv-x="578" d="M525 0q-193 6 -236 6t-236 -6v66l44 -1q66 0 89 13q33 18 33 79v609q0 61 -33 79q-23 13 -89 13l-44 -1v66q193 -6 236 -6t236 6v-66l-44 1q-66 0 -89 -13q-33 -18 -33 -79v-609q0 -61 33 -79q23 -13 89 -13l44 1v-66z" />
+<glyph unicode="ɫ" horiz-adv-x="704" d="M115 66l68 -2q98 0 98 98v505q-38 17 -69 17q-79 0 -165 -99l-35 30q76 87 96 105q64 57 124 57q25 0 49 -8v508q0 87 -44 108q-21 10 -106 10h-16v67l306 23v-790q37 -17 71 -17q79 0 165 99l35 -31q-76 -87 -96 -105q-64 -57 -124 -57q-25 0 -51 9v-431q0 -50 13.5 -69 t49.5 -23q29 -4 81 -4h24v-66q-220 6 -247.5 6t-226.5 -6v66z" />
+<glyph unicode="ɬ" horiz-adv-x="749" d="M145 66l68 -2q98 0 98 98v352q-299 0 -299 184q0 60 35.5 99.5t94.5 39.5q100 0 169 -90v530q0 87 -44 108q-21 10 -106 10h-16v67l306 23v-903h286v-68h-286v-352q0 -50 13.5 -69t49.5 -23q29 -4 81 -4h24v-66q-220 6 -247.5 6t-226.5 -6v66zM311 582q-13 68 -61.5 129 t-112 61t-63.5 -74t90 -100q44 -12 147 -16z" />
+<glyph unicode="ɭ" horiz-adv-x="663" d="M703 -152q0 -114 -48 -194q-58 -96 -164 -96q-132 0 -202 78t-70 212v1429q0 87 -44 108q-21 10 -106 10h-16v67l306 23v-1642q0 -231 148 -231q102 0 131 139q12 56 12 182v37h53v-122z" />
+<glyph unicode="ɮ" horiz-adv-x="1147" d="M53 66l68 -2q98 0 98 98v1115q0 87 -44 108q-21 10 -106 10h-16v67l306 23v-562h688q38 0 38 -28q0 -20 -18 -38l-372 -379q179 -12 295.5 -121t116.5 -293.5t-137.5 -311t-334.5 -126.5q-121 0 -215 54q-113 64 -113 170t97 106q42 0 70.5 -28t28.5 -70q0 -94 -100 -99 q79 -78 221 -78t224 115t82 252.5t-76 220.5t-210 83q-39 0 -84 -12l-37 38l397 405h-336q-122 0 -166 -24q-59 -33 -59 -136v-461q0 -50 13.5 -69t49.5 -23q29 -4 81 -4h24v-66q-220 6 -247.5 6t-226.5 -6v66z" />
+<glyph unicode="ɯ" horiz-adv-x="1775" d="M1106 -23q-251 0 -284 210q-43 -95 -126.5 -152.5t-185.5 -57.5q-158 0 -224.5 81t-66.5 243q0 14 0.5 41.5t0.5 41.5v409q0 65 -132 65q-17 0 -35 -1v66q198 -6 238 -6t244 6v-66q-26 1 -70 1t-65 -13q-32 -19 -32 -84v-499q0 -238 157 -238q130 0 209.5 104.5 t79.5 238.5v401q0 39 -12 60q-18 30 -118 30q-17 0 -37 -1v66q198 -6 237.5 -6t244.5 6v-66q-26 1 -70 1t-65 -13q-32 -19 -32 -84v-499q0 -238 158 -238q130 0 209.5 104.5t79.5 238.5v397q0 47 -11 64q-18 30 -114 30q-19 0 -40 -1v66q198 -6 236 -6t243 6v-66 q-26 1 -69.5 1t-70 -16t-26.5 -81v-574q0 -87 44 -109q21 -10 96 -10h26v-68l-301 -23v225q-101 -225 -316 -225z" />
+<glyph unicode="ɰ" horiz-adv-x="1775" d="M1106 -23q-251 0 -284 210q-43 -95 -126.5 -152.5t-185.5 -57.5q-158 0 -224.5 81t-66.5 243q0 14 0.5 41.5t0.5 41.5v409q0 65 -132 65q-17 0 -35 -1v66q198 -6 238 -6t244 6v-66q-26 1 -70 1t-65 -13q-32 -19 -32 -84v-499q0 -238 157 -238q130 0 209.5 104.5 t79.5 238.5v401q0 39 -12 60q-18 30 -118 30q-17 0 -37 -1v66q198 -6 237.5 -6t244.5 6v-66q-26 1 -70 1t-65 -13q-32 -19 -32 -84v-499q0 -238 158 -238q130 0 209.5 104.5t79.5 238.5v397q0 47 -11 64q-18 30 -114 30q-19 0 -40 -1v66q198 -6 236 -6t243 6v-66 q-26 1 -69.5 1t-70 -16t-26.5 -81v-993q0 -87 44 -109q21 -10 96 -10h26v-68l-301 -23v644q-101 -225 -316 -225z" />
+<glyph unicode="ɱ" horiz-adv-x="1760" d="M1558 -107q0 -133 -81 -232.5t-211 -99.5q-90 0 -159 40q-83 48 -83 132q0 42 27.5 70t69.5 28t70.5 -28t28.5 -70q0 -76 -74 -96q58 -29 114 -29q158 0 158 281v743q0 267 -166 267q-130 0 -210 -105t-80 -238v-401q0 -39 12 -60q18 -30 118 -30q17 0 37 1v-66 q-198 6 -237.5 6t-244.5 -6v66q26 -1 70 -1t65 13q32 19 32 84v499q0 238 -158 238q-130 0 -209.5 -104.5t-79.5 -238.5v-397q0 -47 11 -64q18 -30 114 -30q19 0 40 1v-66q-198 6 -236 6t-243 -6v66q26 -1 69.5 -1t70 16t26.5 81v574q0 87 -44 109q-21 10 -96 10h-26v68 l301 23v-225q101 225 316 225q251 0 284 -210q43 95 126.5 152.5t185.5 57.5q292 0 292 -316v-737z" />
+<glyph unicode="ɲ" horiz-adv-x="1207" d="M1155 0q-200 6 -238 6t-244 -6v66q29 -1 70 -1t64 12q33 19 33 76v519q0 227 -158 227q-130 0 -213.5 -109.5t-83.5 -243.5v-653q0 -133 -81 -232.5t-211 -99.5q-90 0 -159 40q-83 48 -83 132q0 42 27.5 70t69.5 28t70.5 -28t28.5 -70q0 -76 -74 -96q58 -29 114 -29 q158 0 158 281v847q0 87 -44 109q-21 10 -96 10h-26v68l301 23v-225q101 225 316 225q292 0 292 -316v-500q0 -65 135 -65q15 0 32 1v-66z" />
+<glyph unicode="ɳ" horiz-adv-x="1356" d="M1356 -267q0 -84 -83 -132q-69 -40 -159 -40q-130 0 -211 99.5t-81 232.5v739q0 267 -166 267q-130 0 -209.5 -104.5t-79.5 -238.5v-400q0 -38 10 -58q17 -33 117 -33q17 0 38 1v-66q-199 6 -236 6t-243 -6v66q29 -1 72 -1t68.5 16.5t25.5 80.5v574q0 87 -44 109 q-21 10 -96 10h-26v68l301 23v-225q101 225 316 225q292 0 292 -316v-741q0 -281 158 -281q56 0 114 29q-74 20 -74 96q0 42 28.5 70t70.5 28t69.5 -28t27.5 -70z" />
+<glyph unicode="ɴ" horiz-adv-x="1160" d="M954 769v-740q0 -29 -32 -29t-48 21l-611 796v-665q0 -87 151 -87h3v-65q-156 4 -182.5 4t-182.5 -4v65h3q150 0 150 87v681q0 17 -13.5 20.5t-139.5 3.5v66h287q27 0 43 -21l514 -669v540q0 86 -151 86h-3v66q153 -4 184 -4t183 4v-66h-3q-152 0 -152 -90z" />
+<glyph unicode="ɵ" horiz-adv-x="1054" d="M191.5 118.5q-138.5 142.5 -138.5 341.5t138 349.5t336.5 150.5t336.5 -151t138 -350.5t-139 -341t-336 -141.5t-335.5 142.5zM767 773q-84 138 -244.5 138t-241.5 -143q-49 -87 -51 -256h593q-2 173 -56 261zM285 174q83 -144 246.5 -144t244.5 158q45 89 47 256h-593 q2 -178 55 -270z" />
+<glyph unicode="ɶ" horiz-adv-x="1488" d="M786 0q-39 0 -116.5 -15t-116.5 -15q-205 0 -353 142.5t-148 347t148 350t353 145.5q39 0 114.5 -16t114.5 -16h570l44 -315h-53q-19 150 -68 203.5t-196 54.5l-182 1q-32 0 -41.5 -7.5t-9.5 -38.5v-312h153q99 0 132 29q32 28 32 120v6h53v-368h-53v6q0 92 -32 120 q-33 29 -132 29h-153v-349q0 -29 8.5 -37t38.5 -8h183q170 0 231 71q45 53 78 231h54l-66 -359h-587zM717 478v164q0 75 -9 143t-40.5 96.5t-108.5 28.5q-157 0 -255 -142q-87 -126 -87 -292t85 -303q98 -158 257 -158q79 0 110 30t39 93.5t8 157t1 182.5z" />
+<glyph unicode="ɷ" horiz-adv-x="1419" d="M1335 467q0 -179 -91 -322q-104 -165 -273 -165q-230 0 -258 270h-6q-29 -270 -258 -270q-169 0 -274 165q-91 143 -91 322q0 235 191.5 381.5t431.5 146.5t426 -142q202 -154 202 -386zM1147 471q0 200 -119.5 338.5t-317 138.5t-318 -140t-120.5 -341q0 -428 199 -428 q100 0 151 100q40 78 40 189q0 59 -24 173.5t-24 172.5q0 114 97 114q94 0 94 -114q0 -58 -22.5 -172.5t-22.5 -173.5q0 -112 38 -189q50 -100 150 -100q199 0 199 432z" />
+<glyph unicode="ɸ" horiz-adv-x="1195" d="M429 1265l-68 -2v66q198 -6 225.5 -6t248.5 6v-66h-24q-53 0 -82 -3q-36 -5 -49 -24t-13 -69v-211q204 -24 339.5 -169.5t135.5 -327.5t-136 -319t-339 -160v-218q0 -50 13 -69t49 -23q29 -4 82 -4h24v-66q-221 6 -248.5 6t-225.5 -6v66l68 -2q98 0 98 98v218 q-203 23 -338.5 160.5t-135.5 319.5t134.5 326.5t339.5 169.5v211q0 98 -98 98zM908 199q55 93 55 281.5t-66 282.5q-81 115 -230 142v-869q162 29 241 163zM290 757q-60 -92 -60 -284t64 -289q80 -119 233 -147v868q-159 -29 -237 -148z" />
+<glyph unicode="ɹ" horiz-adv-x="823" d="M771 857l-67 2q-100 0 -100 -98v-574q0 -87 45 -109q22 -10 106 -10h16v-68l-297 -23v235q-76 -235 -262 -235q-60 0 -109.5 36.5t-49.5 85.5t25.5 76t65 27t66 -26t26.5 -66q0 -64 -48 -84q6 -2 14 -2q136 0 207 140q55 111 55 262v346q0 62 -56 78q-23 7 -108 7h-44v66 q81 -6 147 -6h174l194 6v-66z" />
+<glyph unicode="ɺ" horiz-adv-x="823" d="M771 1277l-67 2q-100 0 -100 -98v-994q0 -87 45 -109q22 -10 106 -10h16v-68l-297 -23v235q-76 -235 -262 -235q-60 0 -109.5 36.5t-49.5 85.5t25.5 76t65 27t66 -26t26.5 -66q0 -64 -48 -84q6 -2 14 -2q136 0 207 140q55 111 55 262v766q0 62 -56 78q-23 7 -108 7h-44 v66q81 -6 147 -6h174l194 6v-66z" />
+<glyph unicode="ɻ" horiz-adv-x="998" d="M771 857l-67 2q-100 0 -100 -98v-872q0 -281 158 -281q56 0 114 29q-74 20 -74 96q0 42 28.5 70t70.5 28t69.5 -28t27.5 -70q0 -84 -83 -132q-69 -40 -159 -40q-130 0 -211 99.5t-81 232.5v291q-81 -207 -252 -207q-60 0 -109.5 36.5t-49.5 85.5t25.5 76t65 27t66 -26 t26.5 -66q0 -64 -48 -84q6 -2 14 -2q136 0 207 140q55 111 55 262v346q0 62 -56 78q-23 7 -108 7h-44v66q81 -6 147 -6h174l194 6v-66z" />
+<glyph unicode="ɼ" horiz-adv-x="823" d="M53 -348l67 -2q100 0 100 98v988q0 87 -45 109q-22 10 -106 10h-16v68l297 23v-235q76 235 262 235q60 0 109.5 -36.5t49.5 -85.5t-25.5 -76t-65 -27t-66 26t-26.5 66q0 64 48 84q-6 2 -14 2q-136 0 -207 -140q-55 -111 -55 -262v-760q0 -62 56 -78q23 -7 108 -7h44v-66 q-81 6 -147 6h-174l-194 -6v66z" />
+<glyph unicode="ɽ" horiz-adv-x="823" d="M612 946q60 0 109.5 -36.5t49.5 -85.5t-25.5 -76t-65 -27t-66 26t-26.5 66q0 64 48 84q-6 2 -14 2q-136 0 -207 -140q-55 -111 -55 -262v-608q0 -281 158 -281q56 0 114 29q-74 20 -74 96q0 42 28.5 70t70.5 28t69.5 -28t27.5 -70q0 -84 -83 -132q-69 -40 -159 -40 q-130 0 -211 99.5t-81 232.5v843q0 87 -45 109q-22 10 -106 10h-16v68l297 23v-235q76 235 262 235z" />
+<glyph unicode="ɾ" horiz-adv-x="823" d="M53 66l67 -2q100 0 100 98v445q0 141 95.5 240t236.5 99q72 0 132.5 -40.5t60.5 -108.5q0 -94 -95 -94q-39 0 -65.5 26t-26.5 65q0 69 64 91q-33 15 -70 15q-96 0 -149 -101q-43 -81 -43 -187v-461q0 -62 56 -78q23 -7 108 -7h44v-66q-81 6 -147 6h-174l-194 -6v66z" />
+<glyph unicode="ɿ" horiz-adv-x="823" d="M678 -336l67 2v-66l-194 6h-174q-66 0 -147 -6v66h44q85 0 108 7q56 16 56 78v861q0 106 -43 187q-53 101 -149 101q-37 0 -70 -15q64 -22 64 -91q0 -39 -26.5 -65t-65.5 -26q-95 0 -95 94q0 68 60.5 108.5t132.5 40.5q141 0 236.5 -99t95.5 -240v-845q0 -98 100 -98z " />
+<glyph unicode="ʀ" horiz-adv-x="1166" d="M1103 124q0 -64 -44 -109t-108 -45q-115 0 -189.5 49.5t-74.5 175.5v32q1 21 1 31q0 86 -35 123q-55 58 -141 58h-169v-272q0 -49 9 -68q16 -33 158 -33v-66q-198 6 -226.5 6t-249.5 -6v66q142 0 158 33q9 19 9 68v589q0 49 -9 68q-16 33 -158 33v66h484q206 0 326 -103 q77 -66 77 -147.5t-83 -143.5q-66 -50 -157 -71q86 -38 125 -102q25 -42 51.5 -147t31.5 -118q28 -74 72 -74q73 0 88 109q4 30 26 30q28 0 28 -32zM674 520q69 43 69 157.5t-83 154.5q-54 25 -165.5 25t-124.5 -5q-27 -10 -27 -75v-291h156q121 0 175 34z" />
+<glyph unicode="ʁ" horiz-adv-x="1166" d="M1103 799q0 -32 -28 -32q-22 0 -26 30q-15 109 -88 109q-44 0 -72 -74q-5 -13 -31.5 -118t-51.5 -147q-39 -64 -125 -102q91 -21 157 -71q83 -62 83 -143.5t-70 -141.5q-127 -109 -333 -109h-484v66q142 0 158 33q9 19 9 68v589q0 49 -9 68q-16 33 -158 33v66 q221 -6 249.5 -6t226.5 6v-66q-142 0 -158 -33q-9 -19 -9 -68v-272h169q86 0 141 58q35 37 35 123q0 10 -1 31v32q0 126 74.5 175.5t189.5 49.5q64 0 108 -45t44 -109zM660 91q83 40 83 154.5t-69 157.5q-54 34 -175 34h-156v-291q0 -65 27 -75q13 -5 124.5 -5t165.5 25z " />
+<glyph unicode="ʂ" horiz-adv-x="804" d="M752 274q0 -146 -97 -222t-242 -76t-242 93v-177q0 -106 43 -187q53 -101 149 -101q37 0 70 15q-64 22 -64 91q0 39 26.5 65t65.5 26q95 0 95 -94q0 -68 -60.5 -108.5t-132.5 -40.5q-139 0 -224.5 97.5t-85.5 241.5v434q0 32 27 32q21 0 30 -35q37 -146 92 -214 q73 -90 206 -90q103 0 172 48.5t69 146.5q0 147 -223 195q-128 28 -148 33q-82 25 -134 67q-91 75 -91 183q0 134 108 204q92 59 221.5 59t212.5 -61q60 61 82 61t22 -33v-254q0 -35 -29 -35q-23 0 -31 43l-6 60q-16 87 -81.5 132.5t-158.5 45.5t-157 -34q-81 -43 -81 -129 t94 -130q48 -22 169 -46q170 -33 243 -102q91 -86 91 -204z" />
+<glyph unicode="ʃ" horiz-adv-x="967" d="M915 1359q0 -94 -95 -94q-39 0 -65.5 26t-26.5 65q0 69 64 91q-33 15 -70 15q-96 0 -151 -102q-46 -84 -46 -189v-1224q0 -141 -95.5 -240t-236.5 -99q-72 0 -132.5 40.5t-60.5 108.5q0 94 95 94q39 0 65.5 -26t26.5 -65q0 -69 -64 -91q33 -15 70 -15q96 0 151 102 q46 84 46 189v1224q0 141 95.5 240t236.5 99q72 0 132.5 -40.5t60.5 -108.5z" />
+<glyph unicode="ʄ" horiz-adv-x="967" d="M915 1359q0 -94 -95 -94q-39 0 -65.5 26t-26.5 65q0 69 64 91q-33 15 -70 15q-96 0 -151 -102q-46 -84 -46 -189v-248h251v-68h-251v-594h168v-68h-168v-246q0 -141 -95.5 -240t-236.5 -99q-72 0 -132.5 40.5t-60.5 108.5q0 94 95 94q39 0 65.5 -26t26.5 -65 q0 -69 -64 -91q33 -15 70 -15q96 0 151 102q46 84 46 189v248h-251v68h251v594h-168v68h168v246q0 141 95.5 240t236.5 99q72 0 132.5 -40.5t60.5 -108.5z" />
+<glyph unicode="ʅ" horiz-adv-x="915" d="M915 -243q0 -68 -60.5 -108.5t-132.5 -40.5q-141 0 -236.5 99t-95.5 240v662q0 105 -46 189q-55 102 -151 102q-37 0 -70 -15q64 -22 64 -91q0 -39 -26.5 -65t-65.5 -26q-95 0 -95 94q0 68 60.5 108.5t132.5 40.5q141 0 236.5 -99t95.5 -240v-662q0 -105 46 -189 q55 -102 151 -102q37 0 70 15q-64 22 -64 91q0 39 26.5 65t65.5 26q95 0 95 -94z" />
+<glyph unicode="ʆ" horiz-adv-x="1015" d="M963 1359q0 -41 -27 -67.5t-67 -26.5t-66.5 26t-26.5 65q0 69 64 91q-33 15 -70 15q-96 0 -151 -102q-46 -84 -46 -189v-1178l-4 -59q89 -127 155 -357l-54 -19q-56 196 -121 304q-36 -95 -121.5 -152t-185.5 -57t-171 71t-71 170.5t70 170t174 70.5t194 -62v1096 q0 141 95.5 240t236.5 99q72 0 132.5 -40.5t60.5 -108.5zM438 -22v19q-88 78 -198 78q-74 0 -127.5 -53.5t-53.5 -127.5t53.5 -127.5t127.5 -53.5q94 0 146 82.5t52 182.5z" />
+<glyph unicode="ʇ" horiz-adv-x="775" d="M393 -24v394h-305v68h305v594q0 231 -144.5 231t-144.5 -290q0 -18 1 -67h-52v122q0 113 48 193q58 96 164 96q132 0 203.5 -78t71.5 -211v-590h182v-49q-142 -5 -215 -145q-59 -111 -61 -268h-53z" />
+<glyph unicode="ʈ" horiz-adv-x="776" d="M776 -267q0 -84 -83 -132q-69 -40 -159 -40q-131 0 -215 100t-84 233v961h-182v49q142 5 215 145q59 111 61 268h53v-394h305v-68h-305v-966q0 -281 158 -281q56 0 114 29q-74 20 -74 96q0 42 28.5 70t70.5 28t69.5 -28t27.5 -70z" />
+<glyph unicode="ʉ" horiz-adv-x="1188" d="M1176 514h-207v-329q0 -87 45 -109q21 -10 96 -10h26v-66l-308 -24v193q-89 -193 -278.5 -193t-256.5 83t-67 280v175h-214v68h214v132q0 102 -35 126q-22 15 -119 15h-12v68l314 23v-364h447v154q0 87 -45 109q-21 10 -96 10h-26v68l315 23v-364h207v-68zM821 356v158 h-447v-278q0 -114 39 -163t156 -49t189 108q63 94 63 224z" />
+<glyph unicode="ʊ" horiz-adv-x="1110" d="M1038 839h-177q168 -153 168 -381q0 -197 -138.5 -339.5t-335.5 -142.5t-335.5 142.5t-138.5 339.5q0 228 168 381h-177v84q85 -8 133.5 -8t205.5 8v-52q-98 -58 -131 -173q-22 -75 -22 -222q0 -208 55 -302q84 -144 242 -144t242 144q55 94 55 302q0 147 -22 222 q-33 115 -131 173v52q157 -8 205.5 -8t133.5 8v-84z" />
+<glyph unicode="ʋ" horiz-adv-x="1199" d="M1146 504q0 -226 -128.5 -377t-350.5 -151q-190 0 -297.5 96.5t-107.5 284.5v421q0 40 -21 74t-58 34q-79 0 -79 -173q0 -36 3 -84h-55v120q0 83 47.5 143t132 60t132 -63t47.5 -153v-357q0 -355 250 -355q171 0 264 163q77 134 77 319q0 134 -49 249q-63 149 -179 149 q-52 0 -94 -29q80 -13 80 -96q0 -39 -27.5 -64.5t-68.5 -25.5t-66.5 29t-25.5 71q0 76 72 119.5t154 43.5q174 0 268 -143q80 -122 80 -305z" />
+<glyph unicode="ʌ" horiz-adv-x="1151" d="M1099 0q-120 8 -164 8t-276 -8v68q122 0 122 54q0 15 -252 634l-219 -546q-13 -32 -13 -50q0 -90 102 -92v-68q-135 8 -194.5 8t-151.5 -8v68q142 1 198 142l279 697q16 40 45 40t45 -40l309 -760q24 -60 68 -73q18 -6 83 -6h19v-68z" />
+<glyph unicode="ʍ" horiz-adv-x="1571" d="M1518 0q-143 8 -170.5 8t-260.5 -8v68h4q121 0 121 56q0 38 -77 245l-137 366l-183 -518q38 -105 54 -121q29 -28 129 -28v-68q-120 8 -189 8l-224 -8v68h4q124 0 124 56q0 11 -11 42l-213 595l-195 -546q-10 -28 -10 -46q0 -98 125 -101v-68q-151 8 -209.5 8t-146.5 -8 v68q131 3 179 136l252 703q14 40 42 40t42 -40l220 -608l216 606q15 42 42.5 42t44.5 -48l270 -757q19 -54 62 -68q20 -6 78 -6h17v-68z" />
+<glyph unicode="ʎ" horiz-adv-x="1151" d="M1099 0q-120 8 -178.5 8t-261.5 -8v68h4q116 0 116 54q0 19 -250 616l-217 -528q-14 -34 -14 -50q0 -90 101 -92v-68q-170 8 -212 8t-134 -8v68h2q140 0 197 136l377 913q101 245 274 245q76 0 136 -50t60 -124q0 -91 -89 -91q-39 0 -65 25.5t-26 63.5q0 81 85 91 q-41 38 -101 38q-93 0 -158 -92q-32 -45 -68 -130l-71 -170l321 -781q22 -54 70 -68q21 -6 74 -6h28v-68z" />
+<glyph unicode="ʏ" horiz-adv-x="1206" d="M1154 857q-135 0 -192 -83l-288 -416v-241q0 -21 6 -32q11 -20 149 -20v-66q-68 5 -99 5h-255q-30 0 -99 -5v66q7 0 23 -0.5t25 -0.5q90 0 101 20q4 8 4 26v248l-312 454q-26 37 -75 44q-8 1 -90 1v66q94 -4 185 -4h125q52 0 120 5v-67h-47q-56 0 -56 -24q0 -6 272 -402 l240 348q15 22 15 34q0 44 -86 44v66q116 -4 181.5 -4t152.5 5v-67z" />
+<glyph unicode="ʐ" horiz-adv-x="1199" d="M1199 -293q0 -68 -60.5 -108.5t-132.5 -40.5q-139 0 -224.5 97.5t-85.5 241.5v103h-605q-38 0 -38 30q0 15 18 39l599 807h-245q-167 0 -223.5 -63.5t-65.5 -234.5h-53l24 345h701q38 0 38 -28q0 -14 -18 -38l-595 -803h251q182 0 248 86q51 68 65 260h55l-38 -400v-108 q0 -106 43 -187q53 -101 149 -101q37 0 70 15q-64 22 -64 91q0 39 26.5 65t65.5 26q95 0 95 -94z" />
+<glyph unicode="ʑ" horiz-adv-x="935" d="M349 -217q-29 0 -29 24.5t107 192.5h-336q-38 0 -38 30q0 15 18 39l599 807h-245q-167 0 -223.5 -63.5t-65.5 -234.5h-53l24 345h701q38 0 38 -28q0 -14 -18 -38l-595 -803h230q222 327 342 327t120 -106q0 -125 -120 -205q-105 -70 -237 -70h-75q-36 -53 -57 -90 l-64 -112q-10 -15 -23 -15zM871 275q0 52 -63 52q-87 0 -279 -273h58q96 0 190 64.5t94 156.5z" />
+<glyph unicode="ʒ" horiz-adv-x="948" d="M496 478q179 -12 295.5 -121t116.5 -293.5t-137.5 -311t-334.5 -126.5q-121 0 -215 54q-113 64 -113 170t97 106q42 0 70.5 -28t28.5 -70q0 -94 -100 -99q79 -78 221 -78t224 115t82 252.5t-76 220.5t-210 83q-39 0 -84 -12l-37 38l397 405h-325q-126 0 -164 -19 q-60 -30 -72 -141h-54l21 300h721q38 0 38 -28q0 -20 -18 -38z" />
+<glyph unicode="ʓ" horiz-adv-x="948" d="M496 478q179 -12 295.5 -121t116.5 -278.5t-103 -289.5q45 -94 81 -214l-47 -17q-33 103 -73 190q-135 -122 -330 -122q-120 0 -215 54q-113 65 -113 176.5t95 179t212 67.5q171 0 300 -167q16 58 16 115q0 135 -76 218t-210 83q-39 0 -84 -12l-37 38l397 405h-325 q-126 0 -164 -19q-60 -30 -72 -141h-54l21 300h721q38 0 38 -28q0 -20 -18 -38zM415 54q-97 0 -172.5 -52.5t-75.5 -144t93 -138.5q74 -38 173 -38q178 0 263 199q-110 174 -281 174z" />
+<glyph unicode="ʔ" horiz-adv-x="884" d="M705.5 1300q143.5 -138 143.5 -327t-124.5 -319.5t-303.5 -150.5v-347q0 -39 10 -58q17 -33 113 -33q20 0 42 1v-66q-198 6 -236 6t-243 -6v66q28 -1 71.5 -1t69 16.5t25.5 80.5v395q33 -6 83.5 -6t117.5 33q188 92 188 385t-178 384q-65 33 -126 33q-146 0 -227 -80 q98 -5 98 -98q0 -42 -27.5 -69.5t-69.5 -27.5t-69.5 27.5t-27.5 69.5q0 111 113 176q94 54 213 54q201 0 344.5 -138z" />
+<glyph unicode="ʕ" horiz-adv-x="884" d="M849 1208q0 -42 -27.5 -69.5t-69.5 -27.5t-69.5 27.5t-27.5 69.5q0 93 98 98q-81 80 -227 80q-61 0 -126 -33q-178 -91 -178 -384t188 -385q67 -33 117.5 -33t83.5 6v-395q0 -64 25.5 -80.5t69 -16.5t71.5 1v-66q-205 6 -243 6t-236 -6v66q22 -1 42 -1q96 0 113 33 q10 19 10 58v347q-179 20 -303.5 150.5t-124.5 319.5t143.5 327t344.5 138q119 0 213 -54q113 -65 113 -176z" />
+<glyph unicode="ʖ" horiz-adv-x="884" d="M421 911q179 -20 303.5 -150.5t124.5 -319.5t-143.5 -327t-344.5 -138q-119 0 -213 54q-113 65 -113 176q0 42 27.5 69.5t69.5 27.5t69.5 -27.5t27.5 -69.5q0 -93 -98 -98q81 -80 227 -80q61 0 126 33q178 91 178 384t-188 385q-67 33 -117.5 33t-83.5 -6v395 q0 64 -25.5 80.5t-69 16.5t-71.5 -1v66q205 -6 243 -6t236 6v-66q-22 1 -42 1q-96 0 -113 -33q-10 -19 -10 -58v-347z" />
+<glyph unicode="ʗ" horiz-adv-x="920" d="M839 -102q29 0 29 -22.5t-27 -74.5q-106 -203 -328 -203t-352 237q-108 196 -108 440.5t106 442.5q130 242 356 242q121 0 215 -54q113 -64 113 -170t-97 -106q-42 0 -70.5 28t-28.5 70q0 94 100 99q-79 78 -232 78q-149 0 -228 -245q-57 -176 -57 -370q0 -127 30 -275.5 t85 -236.5q79 -126 189 -126t178 64q40 37 74 109.5t53 72.5z" />
+<glyph unicode="ʘ" horiz-adv-x="1090" d="M1037 468q0 -204 -144 -348t-348 -144t-348 144t-144 348t144 348t348 144t348 -144t144 -348zM873 468q0 177 -74 296q-88 142 -254 142t-254 -142q-74 -119 -74 -296t74 -296q88 -142 254 -142t254 142q74 119 74 296zM662 468q0 -48 -34.5 -82.5t-82.5 -34.5 t-82.5 34.5t-34.5 82.5t34.5 82.5t82.5 34.5t82.5 -34.5t34.5 -82.5z" />
+<glyph unicode="ʙ" horiz-adv-x="1118" d="M1002 251q0 -49 -27 -97q-87 -154 -315 -154h-598v66q72 0 108.5 4t47.5 25t11 72v589q0 51 -11 72t-47.5 25t-108.5 4v66h557q223 0 312 -136q31 -47 31 -95q0 -82 -73.5 -137.5t-164.5 -72.5q105 -10 191.5 -71.5t86.5 -159.5zM797 690q0 80 -55.5 123.5t-137.5 43.5 h-148q-64 0 -78 -13t-14 -75v-266h199q168 0 219 121q15 36 15 66zM608 66q93 0 158 49.5t65 138t-54.5 145.5t-140.5 57h-272v-302q0 -62 14 -75t78 -13h152z" />
+<glyph unicode="ʚ" horiz-adv-x="977" d="M471 960q197 0 325 -144.5t128 -345.5t-129.5 -347.5t-329.5 -146.5q-149 0 -263 61q-140 76 -140 211q0 99 74 161.5t179 86.5q-93 22 -154 84t-61 153q0 123 132 182q98 45 239 45zM753 169q94 125 94 303.5t-106 309t-280 130.5q-97 0 -156.5 -50.5t-59.5 -143.5 q0 -188 199 -188q22 0 63 11t63 11q86 0 86 -55.5t-87 -55.5q-21 0 -62.5 11t-62.5 11q-224 0 -224 -205q0 -228 255 -228q175 0 278 139z" />
+<glyph unicode="ʛ" horiz-adv-x="1365" d="M1365 1289q0 -94 -95 -94q-39 0 -65.5 26t-26.5 65q0 69 64 91q-33 15 -70 15q-96 0 -149 -101q-43 -81 -43 -187v-519q0 -26 -29 -26t-36 28q-8 40 -34 118q-39 87 -114.5 140t-160.5 53t-155 -31q-230 -102 -230 -404.5t232 -404.5q71 -31 155 -31t146 34q77 41 77 120 v77q0 24 -6 33q-17 24 -182 24v64q58 -4 168.5 -4t271.5 4v-64h-42q-62 0 -62 -51v-236q0 -27 -20 -27q-29 0 -96 77q-80 -108 -287 -108t-365.5 141.5t-158.5 350.5t158 351t369 142q148 0 271 -106v255q0 142 90.5 238t231.5 96q72 0 132.5 -40.5t60.5 -108.5z" />
+<glyph unicode="ʜ" horiz-adv-x="1178" d="M1120 0q-203 6 -238 6t-244 -6v66q140 0 157 30q10 18 10 71v281h-435v-281q0 -49 9 -68q16 -33 159 -33v-66q-203 6 -238 6t-244 -6v66q140 0 157 30q10 18 10 71v589q0 53 -10 71q-17 30 -157 30v66q209 -6 244 -6t238 6v-66q-143 0 -159 -33q-9 -19 -9 -68v-242h435 v242q0 53 -10 71q-17 30 -157 30v66q209 -6 244 -6t238 6v-66q-140 0 -157 -30q-10 -18 -10 -71v-589q0 -53 10 -71q17 -30 157 -30v-66z" />
+<glyph unicode="ʝ" horiz-adv-x="588" d="M386 1276q0 -47 -33.5 -81t-80 -34t-79.5 34.5t-33 80t33.5 79.5t79.5 34t79.5 -33t33.5 -80zM555 -66h-170v-41q0 -133 -81 -232.5t-211 -99.5q-90 0 -159 40q-83 48 -83 132q0 158 125 221q91 46 269 46v750q0 39 -9 60q-20 45 -148 45h-27v68l324 23v-946h170v-66z M245 -111v45q-149 0 -222 -26q-119 -43 -119 -163q0 -64 58 -100.5t125 -36.5q158 0 158 281z" />
+<glyph unicode="ʞ" horiz-adv-x="1139" d="M430 120q0 -50 61 -52v-68q-116 8 -214 8t-175 -8v68q133 6 270 114q174 137 174 156q0 2 -14 22l-273 383q-48 67 -89 91q-38 23 -111 23h-6v66q88 -6 168 -6t248 6v-66h-6q-70 0 -70 -49q0 -38 255 -385l136 116v222q0 51 -12 69.5t-48 23.5q-29 3 -82 3h-25v66 q121 -6 197 -6t272 6v-66q-10 0 -33 0.5t-35 0.5q-99 0 -99 -97v-995q0 -87 45 -108q21 -10 106 -10h16v-67l-307 -23v907l-302 -261q-47 -41 -47 -84z" />
+<glyph unicode="ʟ" horiz-adv-x="985" d="M56 0v67h6q135 0 151 30q10 18 10 70v583q0 53 -10 71q-17 30 -157 30v66q246 -6 344 -6t178 6v-66q-109 0 -150 -8.5t-51 -34.5q-7 -15 -7 -62v-591q0 -62 22.5 -75t92.5 -13q199 0 254 32q80 47 98 229h53l-38 -328h-796z" />
+<glyph unicode="ʠ" horiz-adv-x="1325" d="M1325 1289q0 -94 -95 -94q-39 0 -65.5 26t-26.5 65q0 69 64 91q-33 15 -70 15q-96 0 -149 -101q-43 -81 -43 -187v-1357q0 -46 12 -67q17 -29 113 -29q19 0 41 1v-66q-166 5 -243 5t-239 -5v66q37 -2 77 -2t66 16.5t26 80.5v383q-115 -154 -284 -154q-192 0 -324 144.5 t-132 340t138 340.5t325.5 145t282.5 -169v322q0 141 96 240t237 99q72 0 132.5 -40.5t60.5 -108.5zM799 291v301q0 112 -76 206.5t-178.5 94.5t-176.5 -72q-138 -134 -138 -362q0 -152 66 -280q81 -155 219 -155q104 0 194 82t90 185z" />
+<glyph unicode="ʡ" horiz-adv-x="884" d="M705.5 1300q143.5 -138 143.5 -327t-124.5 -319.5t-303.5 -150.5v-131h205v-68h-205v-148q0 -39 10 -58q17 -33 113 -33q20 0 42 1v-66q-198 6 -236 6t-243 -6v66q28 -1 71.5 -1t69 16.5t25.5 80.5v142h-206v68h206v185q33 -6 83.5 -6t117.5 33q188 92 188 385t-178 384 q-65 33 -126 33q-146 0 -227 -80q98 -5 98 -98q0 -42 -27.5 -69.5t-69.5 -27.5t-69.5 27.5t-27.5 69.5q0 111 113 176q94 54 213 54q201 0 344.5 -138z" />
+<glyph unicode="ʢ" horiz-adv-x="884" d="M849 1208q0 -42 -27.5 -69.5t-69.5 -27.5t-69.5 27.5t-27.5 69.5q0 93 98 98q-81 80 -227 80q-61 0 -126 -33q-178 -91 -178 -384t188 -385q67 -33 117.5 -33t83.5 6v-185h206v-68h-206v-142q0 -64 25.5 -80.5t69 -16.5t71.5 1v-66q-205 6 -243 6t-236 -6v66q22 -1 42 -1 q96 0 113 33q10 19 10 58v148h-205v68h205v131q-179 20 -303.5 150.5t-124.5 319.5t143.5 327t344.5 138q119 0 213 -54q113 -65 113 -176z" />
+<glyph unicode="ʣ" horiz-adv-x="1708" d="M793 118q-111 -142 -295 -142t-314.5 144.5t-130.5 340.5t139.5 340.5t336.5 144.5q163 0 270 -133v464q0 88 -47 109q-20 10 -85 10q-16 0 -35 -1v67l308 23v-562h672q38 0 38 -28q0 -14 -18 -38l-595 -803h251q182 0 248 86q51 68 65 260h55l-38 -400h-512l-313 -24 v142zM1229 876q-169 0 -229 -65t-60 -233v-393q0 -15 1 -27l533 718h-245zM793 253v449q0 32 -24 68q-87 129 -236 129t-238 -138q-65 -100 -65 -300t61 -299q85 -138 224 -138q93 0 185.5 69.5t92.5 159.5z" />
+<glyph unicode="ʤ" horiz-adv-x="1728" d="M1276 478q179 -12 295.5 -121t116.5 -293.5t-137.5 -311t-334.5 -126.5q-121 0 -215 54q-113 64 -113 170t97 106q42 0 70.5 -28t28.5 -70q0 -94 -100 -99q79 -78 221 -78t224 115t82 252.5t-76 220.5t-210 83q-39 0 -84 -12l-37 38l397 405h-325q-136 0 -186 -30.5 t-50 -129.5v-438q0 -88 46 -110q20 -10 85 -10q16 0 35 1v-66l-313 -24v142q-111 -142 -295 -142t-314.5 144.5t-130.5 340.5t139.5 340.5t336.5 144.5q163 0 270 -133v464q0 88 -47 109q-20 10 -85 10q-16 0 -35 -1v67l308 23v-562h688q38 0 38 -28q0 -20 -18 -38zM793 253 v449q0 32 -24 68q-87 129 -236 129t-238 -138q-65 -100 -65 -300t61 -299q85 -138 224 -138q93 0 185.5 69.5t92.5 159.5z" />
+<glyph unicode="ʥ" horiz-adv-x="1739" d="M1153 -217q-29 0 -29 24.5t107 192.5h-125l-313 -24v142q-111 -142 -295 -142t-314.5 144.5t-130.5 340.5t139.5 340.5t336.5 144.5q163 0 270 -133v464q0 88 -47 109q-20 10 -85 10q-16 0 -35 -1v67l308 23v-562h672q38 0 38 -28q0 -14 -18 -38l-595 -803h230 q222 327 342 327t120 -106q0 -125 -120 -205q-105 -70 -237 -70h-75q-36 -53 -57 -90l-64 -112q-10 -15 -23 -15zM1229 876q-169 0 -229 -65t-60 -233v-393q0 -15 1 -27l533 718h-245zM1675 275q0 52 -63 52q-87 0 -279 -273h58q96 0 190 64.5t94 156.5zM793 253v449 q0 32 -24 68q-87 129 -236 129t-238 -138q-65 -100 -65 -300t61 -299q85 -138 224 -138q93 0 185.5 69.5t92.5 159.5z" />
+<glyph unicode="ʦ" horiz-adv-x="1421" d="M1369 274q0 -146 -97 -222t-247 -76q-87 0 -142.5 29t-101.5 70t-61.5 41t-44.5 -42.5t-53 -61.5q-45 -36 -112 -36q-132 0 -203.5 78t-71.5 211v590h-182v49q142 5 215 145q59 111 61 268h53v-394h305v-68h-305v-594q0 -231 144 -231t144 245v56q0 32 27 32q21 0 30 -35 q37 -146 92 -214q73 -90 206 -90q103 0 172 48.5t69 146.5q0 147 -223 195q-128 28 -148 33q-82 25 -134 67q-91 75 -91 183q0 134 108 204q92 59 221.5 59t212.5 -61q60 61 82 61t22 -33v-254q0 -35 -29 -35q-23 0 -31 43l-6 60q-16 87 -81.5 132.5t-158.5 45.5t-157 -34 q-81 -43 -81 -129t94 -130q48 -22 169 -46q170 -33 243 -102q91 -86 91 -204z" />
+<glyph unicode="ʧ" horiz-adv-x="1387" d="M1335 1359q0 -94 -95 -94q-39 0 -65.5 26t-26.5 65q0 69 64 91q-33 15 -70 15q-96 0 -151 -102q-46 -84 -46 -189v-1224q0 -141 -95.5 -240t-236.5 -99q-72 0 -132.5 40.5t-60.5 108.5q0 94 95 94q39 0 65.5 -26t26.5 -65q0 -69 -64 -91q33 -15 70 -15q96 0 151 102 q46 84 46 189v232q-103 -201 -300 -201q-132 0 -203.5 78t-71.5 211v590h-182v49q142 5 215 145q59 111 61 268h53v-394h428v246q0 141 95.5 240t236.5 99q72 0 132.5 -40.5t60.5 -108.5zM810 369v486h-428v-594q0 -231 144 -231q111 0 197.5 112.5t86.5 226.5z" />
+<glyph unicode="ʨ" horiz-adv-x="1537" d="M1486 275q0 -123 -115.5 -211t-241.5 -88q-44 0 -86 8l-47 -74q-20 -38 -63 -112q-9 -15 -23 -15q-29 0 -29 26q0 24 107 190q-179 61 -267 240q-6 -106 -59 -184.5t-152 -78.5q-132 0 -203.5 78t-71.5 211v590h-182v49q142 5 215 145q59 111 61 268h53v-394h305v-68 h-305v-594q0 -231 144 -231q101 0 131 139q13 60 13 218v74q0 201 132 350t330 149q121 0 215 -54q113 -64 113 -170t-97 -106q-42 0 -70.5 28t-28.5 70q0 94 100 99q-79 78 -229 78q-60 0 -120 -34q-168 -94 -168 -403q0 -315 182 -406q219 319 338 319t119 -106zM1432 275 q0 52 -63 52q-89 0 -288 -287q34 -10 67 -10q102 0 193 72t91 173z" />
+<glyph unicode="ʩ" horiz-adv-x="1768" d="M237 6l-183 -6v66q28 -1 69 -1t64 12q34 18 34 76v702h-168v68h168v202q0 180 131 281.5t317 101.5q100 0 192 -45q113 -55 113 -144q0 -47 -34.5 -81t-81 -34t-79.5 34.5t-33 80.5q0 74 63 100q-47 43 -133 43q-141 0 -230.5 -96.5t-89.5 -238.5v-204h301l301 23v-225 q101 225 316 225q292 0 292 -316v-737q0 -133 -81 -232.5t-211 -99.5q-90 0 -159 40q-83 48 -83 132q0 42 27.5 70t69.5 28t70.5 -28t28.5 -70q0 -76 -74 -96q58 -29 114 -29q158 0 158 281v743q0 267 -166 267q-130 0 -209.5 -104.5t-79.5 -238.5v-400q0 -38 10 -58 q17 -33 117 -33q17 0 38 1v-66q-199 6 -236 6t-243 -6v66q29 -1 72 -1t68.5 16.5t25.5 80.5v574q0 87 -44 108q-23 11 -122 11h-296v-704q0 -21 7 -41q15 -44 179 -44h22v-66q-81 6 -145 6h-187z" />
+<glyph unicode="ʪ" horiz-adv-x="1154" d="M53 66l68 -2q98 0 98 98v1115q0 87 -44 108q-21 10 -106 10h-16v67l306 23v-1323q0 -57 16 -73q68 -65 283 -65q341 0 341 195q0 147 -223 195q-128 28 -148 33q-82 25 -134 67q-91 75 -91 183q0 134 108 204q92 59 221.5 59t212.5 -61q60 61 82 61t22 -33v-254 q0 -35 -29 -35q-23 0 -31 43l-6 60q-16 87 -81.5 132.5t-158.5 45.5t-157 -34q-81 -43 -81 -129t94 -130q48 -22 169 -46q170 -33 243 -102q91 -86 91 -204q0 -298 -444 -298q-146 0 -227 27q-89 3 -134 3t-244 -6v66z" />
+<glyph unicode="ʫ" horiz-adv-x="1127" d="M53 66l68 -2q98 0 98 98v1115q0 87 -44 108q-21 10 -106 10h-16v67l306 23v-562h672q38 0 38 -28q0 -14 -18 -38l-595 -803h251q182 0 248 86q51 68 65 260h55l-38 -400h-984v66zM648 876q-169 0 -229 -65t-60 -233v-393q0 -15 1 -27l533 718h-245z" />
+<glyph unicode="ʬ" horiz-adv-x="1572" d="M1092 716q-23 -40 -45 -40t-45 40l-212 373l-218 -373q-23 -40 -45 -40t-45 40l-279 490q-28 49 -141 49h-9v68q120 -8 165 -8t275 8v-68h-6q-131 0 -131 -46q0 -9 8 -23l209 -367l187 321l-37 66q-28 49 -141 49h-9v68q120 -8 165 -8t275 8v-68h-6q-131 0 -131 -46 q0 -9 8 -23l209 -367l189 324q9 15 9 30q0 40 -37 60.5t-81 21.5v68q134 -8 194 -8t152 8v-68q-113 -1 -178 -112zM1092 16q-23 -40 -45 -40t-45 40l-212 373l-218 -373q-23 -40 -45 -40t-45 40l-279 490q-28 49 -141 49h-9v68q120 -8 165 -8t275 8v-68h-6q-131 0 -131 -46 q0 -9 8 -23l209 -367l187 321l-37 66q-28 49 -141 49h-9v68q120 -8 165 -8t275 8v-68h-6q-131 0 -131 -46q0 -9 8 -23l209 -367l189 324q9 15 9 30q0 40 -37 60.5t-81 21.5v68q134 -8 194 -8t152 8v-68q-113 -1 -178 -112z" />
+<glyph unicode="ʭ" horiz-adv-x="1452" d="M1312 882q0 -36 -30.5 -36t-30.5 44v312h-1050v-312q0 -44 -30.5 -44t-30.5 41v416q0 40 45 40h1082q31 0 38 -11.5t7 -33.5v-416zM1312 62q0 -36 -30.5 -36t-30.5 44v312h-1050v-312q0 -44 -30.5 -44t-30.5 41v416q0 40 45 40h1082q31 0 38 -11.5t7 -33.5v-416z" />
+<glyph unicode="ʮ" horiz-adv-x="1399" d="M1033 182h-2q-41 -93 -125 -149t-184 -56q-284 0 -284 314v321q0 106 -43 187q-53 101 -149 101q-37 0 -70 -15q64 -22 64 -91q0 -39 -26.5 -65t-65.5 -26q-95 0 -95 94q0 68 60.5 108.5t132.5 40.5q141 0 236.5 -99t95.5 -240v-356q0 -227 158 -227q130 0 209.5 104.5 t79.5 238.5v400q0 39 -10 58q-18 33 -117 33q-18 0 -38 -1v66q200 -6 236.5 -6t242.5 6v-66q-30 1 -72.5 1t-68 -16.5t-25.5 -80.5v-995q0 -87 44 -108q21 -10 96 -10h26v-67l-306 -23v624z" />
+<glyph unicode="ʯ" horiz-adv-x="1567" d="M1567 -267q0 -84 -83 -132q-69 -40 -159 -40q-130 0 -211 99.5t-81 232.5v289h-2q-41 -93 -125 -149t-184 -56q-284 0 -284 314v321q0 106 -43 187q-53 101 -149 101q-37 0 -70 -15q64 -22 64 -91q0 -39 -26.5 -65t-65.5 -26q-95 0 -95 94q0 68 60.5 108.5t132.5 40.5 q141 0 236.5 -99t95.5 -240v-356q0 -227 158 -227q130 0 209.5 104.5t79.5 238.5v400q0 39 -10 58q-18 33 -117 33q-18 0 -38 -1v66q200 -6 236.5 -6t242.5 6v-66q-30 1 -72.5 1t-68 -16.5t-25.5 -80.5v-872q0 -281 158 -281q56 0 114 29q-74 20 -74 96q0 42 28.5 70 t70.5 28t69.5 -28t27.5 -70z" />
+<glyph unicode="ʰ" horiz-adv-x="905" d="M866 579q-150 4 -188 4t-193 -4v64q33 -1 60 -1t46 7.5t19 41.5v345q0 141 -108 141q-89 0 -148 -64.5t-59 -153.5v-266q0 -24 6 -34q10 -17 77 -17q19 0 41 1v-64q-150 4 -187 4t-192 -4v64q33 -1 61.5 -1t45.5 8t17 47v741q0 56 -38 66q-8 2 -52 2h-34v64l249 17v-471 q78 112 223 112q229 0 229 -219v-334q0 -33 90 -33q16 0 35 1v-64z" />
+<glyph unicode="ʱ" horiz-adv-x="905" d="M866 579q-150 4 -188 4t-193 -4v64q33 -1 60 -1t46 7.5t19 41.5v345q0 141 -108 141q-89 0 -148 -64.5t-59 -153.5v-266q0 -23 6 -34q9 -17 77 -17q18 0 41 1v-64q-150 4 -187 4t-192 -4v64q33 -1 61.5 -1t45.5 8t17 47v623q0 103 77 169t182 66q56 0 105 -28.5t49 -80.5 q0 -73 -80 -73t-80 71q0 35 31 58q-10 2 -25 2q-65 0 -99.5 -56t-34.5 -125v-207q78 112 223 112q229 0 229 -219v-334q0 -33 90 -33q16 0 35 1v-64z" />
+<glyph unicode="ʲ" horiz-adv-x="461" d="M309 1437q0 -37 -28.5 -61.5t-66 -24.5t-66 25t-28.5 61t29 60.5t66 24.5t65.5 -24t28.5 -61zM309 518q0 -97 -66 -164t-163 -67q-69 0 -130.5 31.5t-61.5 93.5q0 75 83.5 75t83.5 -75q0 -41 -38 -64q28 -9 58 -9q109 0 109 176v573q0 51 -57 58q-13 2 -40 2 q-17 0 -41 -1v65l263 17v-711z" />
+<glyph unicode="ʳ" horiz-adv-x="637" d="M598 1131q0 -73 -79 -73t-79 72q0 25 17 46q-85 -9 -126 -86t-41 -171v-230q0 -40 63 -47h-1q0 1 94 1v-65q-76 5 -114 5h-144h3l-151 -4v64q9 0 29 -0.5t31 -0.5q65 0 65 55v381q0 56 -39 67q-7 2 -52 2h-34v65l242 17v-121q66 120 187 120q47 0 88 -26.5t41 -70.5z" />
+<glyph unicode="ʴ" horiz-adv-x="637" d="M169 563q-47 0 -88 26.5t-41 70.5q0 73 79 73t79 -72q0 -25 -17 -46q85 9 126 86t41 171v230q0 40 -63 47h1q0 -1 -94 -1v65q76 -5 114 -5h144h-3l151 4v-64q-9 0 -29 0.5t-31 0.5q-65 0 -65 -55v-381q0 -56 39 -67q7 -2 52 -2h34v-65l-242 -17v121q-66 -120 -187 -120z " />
+<glyph unicode="ʵ" horiz-adv-x="768" d="M768 412q0 -62 -61.5 -93.5t-130.5 -31.5q-97 0 -162.5 66.5t-65.5 164.5v153q-66 -107 -179 -107q-47 0 -88 26.5t-41 70.5q0 73 79 73t79 -72q0 -25 -17 -46q85 9 126 86t41 171v230q0 40 -63 47h1q0 -1 -94 -1v65q76 -5 114 -5h144h-3l151 4v-64q-9 0 -29 0.5t-31 0.5 q-65 0 -65 -55v-580q0 -176 108 -176q30 0 58 9q-38 23 -38 64q0 75 83.5 75t83.5 -75z" />
+<glyph unicode="ʶ" horiz-adv-x="894" d="M846 1120q0 -31 -31 -31q-22 0 -34.5 46t-50.5 46q-35 0 -68.5 -121t-110.5 -159q159 -46 159 -145q0 -87 -114 -137q-90 -40 -191 -40h-380v64q6 0 20 -0.5t41 -0.5t40 5q25 9 25 47v398q0 34 -8.5 43.5t-32.5 11.5t-85 2v64q165 -4 197 -4t180 4v-64h-41q-48 0 -59 -4 q-25 -10 -25 -47v-177h117q110 0 120 83v69q0 160 208 160q49 0 86.5 -32t37.5 -81zM492 656q65 23 65 97t-55 100q-37 17 -118 17h-107v-196q0 -27 29 -32q-4 1 73.5 1t112.5 13z" />
+<glyph unicode="ʷ" horiz-adv-x="1197" d="M793 563q-28 0 -41 33l-155 381l-153 -380q-14 -34 -41.5 -34t-42.5 38l-202 503q-14 34 -49 42q-8 1 -36 1h-33v66q121 -6 158 -6l185 6v-66l-21 1h-13q-60 0 -60 -26q0 -29 150 -381l127 317q-27 67 -44.5 78t-92.5 11v66q101 -6 152 -6l178 6v-66l-21 1h-16 q-59 0 -59 -28q0 -4 158 -396q143 355 143 366q0 56 -93 58v65q127 -6 163 -6t123 7v-66q-102 -2 -135 -85l-188 -467q-13 -33 -41 -33z" />
+<glyph unicode="ʸ" horiz-adv-x="882" d="M197 287q-58 0 -107.5 35t-49.5 91q0 70 77.5 70t77.5 -69q0 -47 -49 -65q21 -10 51 -10q64 0 110 57q23 29 49 84l52 109l-239 515q-16 35 -56 42q-9 1 -38 1h-35v66q102 -6 140 -6t209 6v-66l-20 1h-12q-57 0 -57 -26q0 -16 177 -386q163 352 163 360q0 51 -76 52v65 q143 -6 165.5 -6t113.5 7v-67h-3q-108 0 -147 -84l-282 -607q-79 -169 -214 -169z" />
+<glyph unicode="ʹ" horiz-adv-x="448" d="M403 1316q0 -21 -11.5 -54t-72.5 -164l-138 -295h-44l31 296q14 129 26 171q35 117 131 117q78 0 78 -71z" />
+<glyph unicode="ʺ" horiz-adv-x="748" d="M403 1316q0 -21 -11.5 -54t-72.5 -164l-138 -295h-44l31 296q14 129 26 171q35 117 131 117q78 0 78 -71zM703 1316q0 -21 -11.5 -54t-72.5 -164l-138 -295h-44l31 296q14 129 26 171q35 117 131 117q78 0 78 -71z" />
+<glyph unicode="ʻ" horiz-adv-x="861" d="M523 1158.5q33 -32.5 33 -81.5t-33.5 -81.5t-83.5 -32.5q-69 0 -101.5 62.5t-32.5 139.5q0 204 143 324q32 27 46 27q22 0 22 -23q0 -10 -25 -32l-45 -39q-42 -43 -69 -119t-27 -141v-13q33 42 86.5 42t86.5 -32.5z" />
+<glyph unicode="ʼ" horiz-adv-x="861" d="M556 1314q0 -204 -143 -324q-32 -27 -46 -27q-22 0 -22 23q0 10 25 32l45 39q42 43 69 119t27 141v13q-33 -42 -86.5 -42t-86.5 32.5t-33 81.5t33.5 81.5t83.5 32.5q69 0 101.5 -62.5t32.5 -139.5z" />
+<glyph unicode="ʽ" horiz-adv-x="861" d="M522.5 1483.5q33.5 -32.5 33.5 -81.5t-33 -81.5t-86.5 -32.5t-86.5 42v-13q0 -65 27 -141t69 -119l45 -39q25 -22 25 -32q0 -23 -22 -23q-14 0 -46 27q-143 120 -143 324q0 77 32.5 139.5t101.5 62.5q50 0 83.5 -32.5z" />
+<glyph unicode="ʾ" horiz-adv-x="682" d="M438 1233q0 -81 -55.5 -136.5t-135.5 -55.5v70q51 0 86.5 35.5t35.5 86.5t-35.5 86.5t-86.5 35.5v69q81 0 136 -55t55 -136z" />
+<glyph unicode="ʿ" horiz-adv-x="682" d="M438 1041q-80 0 -135.5 55.5t-55.5 136.5t55 136t136 55v-69q-51 0 -86.5 -35.5t-35.5 -86.5t35.5 -86.5t86.5 -35.5v-70z" />
+<glyph unicode="ˀ" horiz-adv-x="682" d="M281 1555q147 0 261 -91.5t114 -225.5t-95.5 -221.5t-224.5 -102.5v-335h-131v392q37 -6 71.5 -6t84.5 22q135 59 135 246t-128 246q-46 21 -90 21q-88 0 -145 -37q59 -16 59 -71q0 -74 -83 -74t-83 74q0 81 91 126q74 37 164 37z" />
+<glyph unicode="ˁ" horiz-adv-x="682" d="M656 1392q0 -74 -82.5 -74t-82.5 74q0 55 58 71q-57 37 -145 37q-44 0 -90 -21q-128 -59 -128 -246t135 -246q50 -22 85 -22t72 6v-392h-131v335q-129 15 -225 102.5t-96 221.5t114.5 225.5t261.5 91.5q90 0 163 -37q91 -45 91 -126z" />
+<glyph unicode="˂" horiz-adv-x="1155" d="M1115 187l-1076 470v49l1076 466v-87l-926 -402l926 -406v-90z" />
+<glyph unicode="˃" horiz-adv-x="1155" d="M1113 653l-1076 -466v86l927 402l-927 406v91l1076 -470v-49z" />
+<glyph unicode="˄" horiz-adv-x="1155" d="M1068 142h-90l-406 926l-402 -926h-87l466 1076h49z" />
+<glyph unicode="˅" horiz-adv-x="1155" d="M1068 1218l-470 -1076h-49l-466 1076h87l402 -926l406 926h90z" />
+<glyph unicode="ˆ" horiz-adv-x="682" d="M623 1054h-31l-273 213l-229 -213h-30l189 331h184z" />
+<glyph unicode="ˇ" horiz-adv-x="682" d="M623 1385l-189 -331h-184l-190 331h31l273 -212l229 212h30z" />
+<glyph unicode="ˈ" horiz-adv-x="682" d="M392 1088h-103v332h103v-332z" />
+<glyph unicode="ˉ" horiz-adv-x="682" d="M661 1225h-638v128h638v-128z" />
+<glyph unicode="ˊ" horiz-adv-x="682" d="M565 1390l-295 -345h-34l105 345h224z" />
+<glyph unicode="ˋ" horiz-adv-x="682" d="M447 1045h-35l-294 345h223z" />
+<glyph unicode="ˌ" horiz-adv-x="682" d="M392 -420h-103v332h103v-332z" />
+<glyph unicode="ˍ" horiz-adv-x="682" d="M653 -278h-624v128h624v-128z" />
+<glyph unicode="ˎ" horiz-adv-x="682" d="M447 -438h-35l-294 345h223z" />
+<glyph unicode="ˏ" horiz-adv-x="682" d="M565 -93l-295 -345h-34l105 345h224z" />
+<glyph unicode="ː" horiz-adv-x="569" d="M387 929l-90 -205h-25l-90 205h205zM387 0h-205l90 205h25z" />
+<glyph unicode="ˑ" horiz-adv-x="569" d="M387 929l-90 -205h-25l-90 205h205z" />
+<glyph unicode="˒" horiz-adv-x="682" d="M438 292q0 -81 -55.5 -136.5t-135.5 -55.5v70q51 0 86.5 35.5t35.5 86.5t-35.5 86.5t-86.5 35.5v69q81 0 136 -55t55 -136z" />
+<glyph unicode="˓" horiz-adv-x="682" d="M438 100q-80 0 -135.5 55.5t-55.5 136.5t55 136t136 55v-69q-51 0 -86.5 -35.5t-35.5 -86.5t35.5 -86.5t86.5 -35.5v-70z" />
+<glyph unicode="˔" horiz-adv-x="682" d="M515 178h-349v103h123v229h103v-229h123v-103z" />
+<glyph unicode="˕" horiz-adv-x="682" d="M515 407h-123v-229h-103v229h-123v103h349v-103z" />
+<glyph unicode="˖" horiz-adv-x="682" d="M515 293h-123v-115h-103v115h-123v103h123v114h103v-114h123v-103z" />
+<glyph unicode="˗" horiz-adv-x="682" d="M653 323h-624v149h624v-149z" />
+<glyph unicode="˘" horiz-adv-x="682" d="M341 1078q-118 0 -197 80.5t-89 199.5h31q33 -60 76 -86q73 -43 181 -43t180 42q51 30 71 87h33q-9 -119 -88.5 -199.5t-197.5 -80.5z" />
+<glyph unicode="˙" horiz-adv-x="682" d="M451 1228q0 -45 -32 -77t-77 -32t-77 32t-32 77.5t31.5 77t77 31.5t77.5 -32t32 -77z" />
+<glyph unicode="˚" horiz-adv-x="682" d="M477 1368.5q56 -55.5 56 -136t-55.5 -136t-136 -55.5t-136 56t-55.5 136t55.5 135.5t135.5 55.5t136 -55.5zM463 1233q0 51 -35.5 86.5t-86.5 35.5t-86.5 -35.5t-35.5 -86.5t35.5 -86.5t86.5 -35.5t86.5 35.5t35.5 86.5z" />
+<glyph unicode="˛" horiz-adv-x="682" d="M366 -339q-90 -90 -171 -90t-125 47q-40 43 -40 103v8q5 129 193 277l69 54h35l-57 -62q-108 -116 -111 -212v-7q0 -47 26 -80q28 -35 75.5 -35t90.5 26z" />
+<glyph unicode="˜" horiz-adv-x="682" d="M471 1093q-79 0 -182 70.5t-143 70.5t-64 -36q-11 -17 -28 -101h-32q8 259 188 259q41 0 70 -11t124 -69.5t131 -58.5q72 0 95 139h31v-7q0 -162 -96 -225q-47 -31 -94 -31z" />
+<glyph unicode="˝" horiz-adv-x="682" d="M644 1390l-218 -346h-34l65 346h187zM331 1390l-220 -346h-33l66 346h187z" />
+<glyph unicode="˞" horiz-adv-x="682" d="M273 407q-37 0 -72 15q-132 56 -132 274v10q-28 -21 -69 -37l-17 43q85 24 92 87l38 -7q9 -191 137 -243q30 -12 62 -12q83 0 150 78l21 -48q-25 -68 -83 -114t-127 -46z" />
+<glyph unicode="˟" horiz-adv-x="782" d="M737 826l-96 -96l-250 251l-250 -251l-96 96l251 250l-251 250l96 96l250 -251l250 251l96 -96l-251 -250z" />
+<glyph unicode="ˠ" horiz-adv-x="882" d="M843 1147q-93 0 -149 -89l-183 -289q139 -222 139 -310t-59.5 -131t-138.5 -43t-137.5 36t-58.5 102.5t53 156.5q18 31 93 138l-233 382q-22 36 -47 42q-21 5 -66 5h-16v66q101 -6 165 -6l184 6v-66l-19 1h-16q-56 0 -56 -26q0 -10 180 -299l154 245q9 14 9 28 q0 50 -77 51v66q110 -6 149.5 -6t129.5 7v-67zM533 429q0 67 -97 229q-103 -149 -103 -219q0 -46 34 -72t82 -26q84 0 84 88z" />
+<glyph unicode="ˡ" horiz-adv-x="454" d="M415 579q-166 4 -195.5 4t-179.5 -4v64q8 0 29 -0.5t32 -0.5q63 0 63 55v741q0 56 -38 66q-8 2 -86 2v64l249 17v-890q0 -31 9 -40q13 -14 98 -14h19v-64z" />
+<glyph unicode="ˢ" horiz-adv-x="623" d="M505 614.5q-78 -51.5 -185 -51.5t-181 58q-53 -58 -73 -58q-26 0 -26 32v214q0 31 30 31q24 0 32 -30q27 -97 74 -146t140 -49q170 0 170 120q0 88 -159 119q-97 19 -112 23q-63 16 -103 46q-72 53 -72 129q0 97 89 146q71 39 167 39t159 -38q41 38 61 38q28 0 28 -32 v-169q0 -33 -32 -33q-23 0 -31 29q-4 24 -7 48q-22 110 -169 110q-169 0 -169 -98q0 -53 72 -80q31 -12 139.5 -30.5t164.5 -66.5q71 -60 71 -154.5t-78 -146z" />
+<glyph unicode="ˣ" horiz-adv-x="906" d="M867 578q-86 5 -150 5t-197 -4v64q58 2 58 26q0 5 -147 174q-133 -134 -133 -165.5t47 -35.5v-63q-106 4 -168.5 4t-136.5 -5v65q116 0 204 77q8 7 148 168l-154 177q-54 62 -78.5 72t-112.5 10v66q92 -6 133.5 -6t212.5 6v-65q-56 -1 -56 -25q0 -13 128 -155 q115 127 115 146q0 32 -47 34v65q91 -6 154 -6t151 6v-65q-114 -2 -194 -69q-16 -14 -141 -156l209 -239q36 -41 150 -41h5v-65z" />
+<glyph unicode="ˤ" horiz-adv-x="682" d="M656 1392q0 -74 -82.5 -74t-82.5 74q0 55 58 71q-57 37 -145 37q-44 0 -90 -21q-128 -59 -128 -246t135 -246q50 -22 85 -22t72 6v-274q0 -39 17 -47t47 -8t60 1v-64q-154 4 -192 4t-187 -4v65q32 -2 60 -2t41 6q23 9 23 45v221q-129 15 -225 102.5t-96 221.5 t114.5 225.5t261.5 91.5q90 0 163 -37q91 -45 91 -126z" />
+<glyph unicode="˥" horiz-adv-x="784" d="M634 0h-156v1310h-328v156h484v-1466z" />
+<glyph unicode="˦" horiz-adv-x="784" d="M634 0h-156v982h-328v156h328v328h156v-1466z" />
+<glyph unicode="˧" horiz-adv-x="784" d="M634 0h-156v655h-328v156h328v655h156v-1466z" />
+<glyph unicode="˨" horiz-adv-x="784" d="M634 0h-156v328h-328v156h328v982h156v-1466z" />
+<glyph unicode="˩" horiz-adv-x="784" d="M634 0h-484v156h328v1310h156v-1466z" />
+<glyph unicode="˪" horiz-adv-x="682" d="M585 0h-487v880h94v-786h393v-94z" />
+<glyph unicode="˫" horiz-adv-x="682" d="M585 393h-393v-393h-94v880h94v-393h393v-94z" />
+<glyph unicode="ˬ" horiz-adv-x="682" d="M623 -107l-189 -331h-184l-190 331h31l253 -212l249 212h30z" />
+<glyph unicode="˭" horiz-adv-x="682" d="M661 1005h-638v128h638v-128zM661 1225h-638v128h638v-128z" />
+<glyph unicode="ˮ" horiz-adv-x="909" d="M851 1185q0 -114 -72.5 -195.5t-186.5 -118.5v42q164 85 164 205q0 62 -32 62q-11 0 -36 -8t-39 -8q-42 0 -72 31.5t-30 78t38 80t90 33.5q77 0 126.5 -61.5t49.5 -140.5zM372 1186q0 -234 -257 -315v42q81 45 122.5 91t41.5 111t-34 65q-11 0 -36.5 -8t-39.5 -8 q-43 0 -72.5 30t-29.5 77t40 81.5t92 34.5q76 0 124.5 -61.5t48.5 -139.5z" />
+<glyph unicode="˯" horiz-adv-x="682" d="M537 -114l-122 -265h-147l-122 265h24l170 -180l172 180h25z" />
+<glyph unicode="˰" horiz-adv-x="682" d="M537 -379h-25l-172 180l-170 -180h-24l122 265h147z" />
+<glyph unicode="˱" horiz-adv-x="682" d="M474 -442l-265 122v147l265 122v-24l-180 -170l180 -172v-25z" />
+<glyph unicode="˲" horiz-adv-x="682" d="M474 -320l-265 -122v25l180 172l-180 170v24l265 -122v-147z" />
+<glyph unicode="˳" horiz-adv-x="682" d="M479 -110q55 -55 55 -136.5t-55 -136.5t-136 -55t-136.5 55.5t-55.5 136.5t55 136t136.5 55t136.5 -55zM428.5 -332.5q35.5 35.5 35.5 87t-35 86.5t-86.5 35t-87 -35.5t-35.5 -86t36 -86.5t86.5 -36t86 35.5z" />
+<glyph unicode="˴" horiz-adv-x="682" d="M447 178h-35l-294 345h223z" />
+<glyph unicode="˵" horiz-adv-x="682" d="M644 178h-33l-220 346h187zM330 178h-34l-218 346h187z" />
+<glyph unicode="˶" horiz-adv-x="682" d="M644 524l-218 -346h-34l65 346h187zM331 524l-220 -346h-33l66 346h187z" />
+<glyph unicode="˷" horiz-adv-x="682" d="M470 -387q-79 0 -182 70.5t-143 70.5t-64 -36q-11 -17 -28 -101h-32q8 259 188 259q41 0 69 -11t124.5 -69.5t131.5 -58.5q72 0 95 139h31v-7q0 -162 -96 -225q-47 -31 -94 -31z" />
+<glyph unicode="˸" horiz-adv-x="569" d="M368 1355q32 -32 32 -78.5t-32.5 -79t-78 -32.5t-78.5 33t-33 78.5t32.5 78t79 32.5t78.5 -32zM366.5 605.5q32.5 -32.5 32.5 -79t-33 -79t-78.5 -32.5t-78.5 33t-33 78.5t32.5 78.5t79 33t79 -32.5z" />
+<glyph unicode="˹" horiz-adv-x="682" d="M518 1253h-246v-229h-103v332h349v-103z" />
+<glyph unicode="˺" horiz-adv-x="682" d="M518 1024h-103v229h-246v103h349v-332z" />
+<glyph unicode="˻" horiz-adv-x="682" d="M518 -420h-349v332h103v-229h246v-103z" />
+<glyph unicode="˼" horiz-adv-x="682" d="M518 -420h-349v103h246v229h103v-332z" />
+<glyph unicode="˽" horiz-adv-x="814" d="M784 -420h-754v376h154v-222h446v222h154v-376z" />
+<glyph unicode="˾" horiz-adv-x="814" d="M784 -420h-754v376h154v-222h600v-154z" />
+<glyph unicode="˿" horiz-adv-x="682" d="M625 -177h-439l166 -243h-94l-200 283v14l200 283h94l-166 -243h439v-94z" />
+<glyph unicode="̀" horiz-adv-x="0" d="M426 1476q-28 23 -28 54t23 53.5t54 22.5t53 -29l248 -322l-37 -35z" />
+<glyph unicode="́" horiz-adv-x="0" d="M753 1583.5q23 -22.5 23 -53.5t-28 -54l-313 -256l-37 35l248 322q22 29 53 29t54 -22.5z" />
+<glyph unicode="̂" horiz-adv-x="0" d="M939 1339l-29 -41l-324 202l-323 -202l-28 41l351 267z" />
+<glyph unicode="̃" horiz-adv-x="0" d="M832 1470q-65 -57 -119 -57t-136 49.5t-130 49.5q-79 0 -165 -99l-35 30q73 86 95 105q64 58 118 58t136.5 -50t130.5 -50q79 0 165 99l35 -31q-73 -84 -95 -104z" />
+<glyph unicode="̄" horiz-adv-x="0" d="M878 1435h-582v82h582v-82z" />
+<glyph unicode="̅" horiz-adv-x="0" d="M1099 1445q0 -41 -37 -41h-948q-39 0 -39 41t39 41h948q37 0 37 -41z" />
+<glyph unicode="̆" horiz-adv-x="0" d="M587 1333q-111 0 -193 78t-105 195h49q24 -86 92 -140.5t157 -54.5t157.5 54.5t92.5 140.5h48q-23 -117 -105 -195t-193 -78z" />
+<glyph unicode="̇" horiz-adv-x="0" d="M666 1574q32 -32 32 -78.5t-32 -79t-78 -32.5t-79 33.5t-33 78t33.5 77.5t79 33t77.5 -32z" />
+<glyph unicode="̈" horiz-adv-x="0" d="M440 1574q32 -32 32 -78.5t-32 -79t-78 -32.5t-79 33.5t-33 78t33.5 77.5t79 33t77.5 -32zM892 1574q32 -32 32 -78.5t-32 -79t-78 -32.5t-78.5 33.5t-32.5 78t33 77.5t78.5 33t77.5 -32z" />
+<glyph unicode="̊" horiz-adv-x="0" d="M708 1557q50 -49 50 -120.5t-49.5 -122t-120.5 -50.5t-121.5 51.5t-50.5 120.5t51 119.5t121 50.5t120 -49zM666 1356.5q32 32.5 32 79t-32 78.5t-77.5 32t-79 -33t-33.5 -77.5t33 -78t79 -33.5t78 32.5z" />
+<glyph unicode="̋" horiz-adv-x="0" d="M922.5 1586.5q22.5 -19.5 22.5 -42.5t-24 -56l-182 -248q-14 7 -41 23l107 286q21 57 67 57q28 0 50.5 -19.5zM592 1586.5q22 -19.5 22 -43t-23 -55.5l-181 -248q-14 7 -41 23l106 286q21 57 67 57q28 0 50 -19.5z" />
+<glyph unicode="̌" horiz-adv-x="0" d="M939 1565l-351 -267l-353 267l29 41l324 -202l322 202z" />
+<glyph unicode="̏" horiz-adv-x="0" d="M603 1488q-24 33 -24 56t22.5 42.5t50.5 19.5q46 0 67 -57l106 -286q-10 -8 -41 -23zM272 1488q-23 31 -23 55t22 43.5t50 19.5q46 0 67 -57l107 -286q-10 -7 -41 -23z" />
+<glyph unicode="̐" horiz-adv-x="0" d="M695 1497q0 -44 -32 -76t-76 -32t-76.5 32t-32.5 76t32.5 76.5t76.5 32.5t76 -32.5t32 -76.5zM587 1149q-113 0 -194 79t-104 194h49q24 -86 92.5 -140.5t156.5 -54.5t156.5 54.5t92.5 140.5h49q-23 -115 -104 -194t-194 -79z" />
+<glyph unicode="̑" horiz-adv-x="0" d="M587 1528q-88 0 -156.5 -54.5t-92.5 -140.5h-49q23 115 104 194t194 79t194 -79t104 -194h-49q-24 86 -92.5 140.5t-156.5 54.5z" />
+<glyph unicode="̒" horiz-adv-x="0" d="M769 1579q0 -13 -34 -23t-61 -17q-129 -47 -157 -177q28 21 71 21t78 -32t35 -79.5t-32 -82t-86 -34.5t-86 42t-32 104q0 107 67 189t172 109q27 7 43 7q22 0 22 -27z" />
+<glyph unicode="̗" horiz-adv-x="0" d="M723 -78.5q23 -22.5 23 -53.5t-28 -54l-313 -256l-37 35l248 322q22 29 53 29t54 -22.5z" />
+<glyph unicode="̣" horiz-adv-x="0" d="M666 -226q32 -32 32 -78.5t-32 -79t-78 -32.5t-79 33.5t-33 78t33.5 77.5t79 33t77.5 -32z" />
+<glyph unicode="̦" horiz-adv-x="0" d="M706 -166q0 -97 -60.5 -171t-155.5 -99q-22 -6 -40 -6q-22 0 -22 26q0 13 31 22l56 16q112 40 139 153q-25 -16 -62.5 -16t-70 29t-32.5 72.5t29.5 75.5t79 32t79 -38.5t29.5 -95.5z" />
+<glyph unicode="̧" horiz-adv-x="0" d="M819 -185q0 -161 -376 -161h-88v43q327 0 327 118q0 56 -42 87t-101 32v127h96v-95q70 -11 127 -49.5t57 -101.5z" />
+<glyph unicode="̨" horiz-adv-x="0" d="M518 -367q-68 0 -127 41t-59 108t71 126q41 35 145.5 91t136.5 87l20 -35l-135 -115q-92 -83 -92 -138q0 -34 31.5 -54.5t67.5 -20.5q97 0 158 108l37 -27q-98 -171 -254 -171z" />
+<glyph unicode="̬" horiz-adv-x="0" d="M939 -175l-351 -267l-353 267l29 41l324 -202l322 202z" />
+<glyph unicode="̭" horiz-adv-x="0" d="M939 -401l-29 -41l-324 202l-323 -202l-28 41l351 267z" />
+<glyph unicode="̮" horiz-adv-x="0" d="M587 -442q-111 0 -193 78t-105 195h49q24 -86 92 -140.5t157 -54.5t157.5 54.5t92.5 140.5h48q-23 -117 -105 -195t-193 -78z" />
+<glyph unicode="̰" horiz-adv-x="0" d="M832 -350q-65 -57 -119 -57t-136 49.5t-130 49.5q-79 0 -165 -99l-35 30q73 86 95 105q64 58 118 58t136.5 -50t130.5 -50q79 0 165 99l35 -31q-73 -84 -95 -104z" />
+<glyph unicode="̳" horiz-adv-x="0" d="M1099 -391q0 -41 -37 -41h-948q-39 0 -39 41t39 41h948q37 0 37 -41zM1099 -171q0 -41 -37 -41h-948q-39 0 -39 41t39 41h948q37 0 37 -41z" />
+<glyph unicode="̴" horiz-adv-x="0" d="M1079 659q0 -111 -71.5 -195t-175.5 -84t-251.5 116.5t-233.5 116.5q-138 0 -179 -131q-6 -29 -15.5 -65t-27.5 -36q-30 0 -30 57q0 109 72.5 193.5t176.5 84.5t251 -117t236.5 -117t136.5 60q27 35 46 104t37 69q28 0 28 -56z" />
+<glyph unicode="̵" horiz-adv-x="0" d="M1012 582q0 -41 -37 -41h-774q-39 0 -39 41t39 41h774q37 0 37 -41z" />
+<glyph unicode="̶" horiz-adv-x="0" d="M2049 582q0 -41 -37 -41h-1674q-39 0 -39 41t39 41h1674q37 0 37 -41z" />
+<glyph unicode="̷" horiz-adv-x="0" d="M854 1205q0 -7 -2 -13l-453 -1248q-9 -26 -40 -26q-39 0 -39 41q0 7 2 13l453 1248q9 26 40 26q39 0 39 -41z" />
+<glyph unicode="̸" horiz-adv-x="0" d="M964 1505q0 -8 -2 -13l-673 -1848q-9 -26 -40 -26q-39 0 -39 41q0 8 2 13l673 1848q9 26 40 26q39 0 39 -41z" />
+<glyph unicode="̿" horiz-adv-x="0" d="M1099 1335q0 -41 -37 -41h-948q-39 0 -39 41t39 41h948q37 0 37 -41zM1099 1555q0 -41 -37 -41h-948q-39 0 -39 41t39 41h948q37 0 37 -41z" />
+<glyph unicode="͆" horiz-adv-x="0" d="M878 1354h-81v100h-419v-100h-82v182h582v-182z" />
+<glyph unicode="͍" horiz-adv-x="0" d="M1117 -241q0 -18 -43 -41q-117 -62 -179 -127q-32 -33 -48 -33q-31 0 -31 32.5t128 129.5h-714q128 -97 128 -129.5t-31 -32.5q-16 0 -48 33q-62 65 -179 127q-43 23 -43 41t43 41q117 62 179 127q32 33 48 33q31 0 31 -32.5t-128 -129.5h714q-128 97 -128 129.5t31 32.5 q16 0 48 -33q62 -65 179 -127q43 -23 43 -41z" />
+<glyph unicode="͏" horiz-adv-x="0" />
+<glyph unicode="͙" horiz-adv-x="0" d="M775 -313q0 -47 -43 -47q-14 0 -23 8l-102 86l23 -136q0 -40 -43 -40t-43 40v3l23 133l-102 -86q-9 -8 -22 -8q-44 0 -44 47q0 27 23 35l126 46l-126 47q-23 9 -23 35q0 47 44 47q13 0 22 -8l102 -86l-23 136q0 40 43 40t43 -40v-2l-23 -134l102 86q9 8 23 8q43 0 43 -47 q0 -27 -22 -35l-126 -47l126 -46q22 -8 22 -35z" />
+<glyph unicode="͜" horiz-adv-x="0" d="M2088 -121q0 -15 -15 -28q-174 -145 -413.5 -219t-485.5 -74t-485.5 74t-413.5 219q-15 13 -15 28q0 41 41 41q25 0 77 -30l95 -57q295 -160 701 -160t701 160l95 57q52 30 77 30q41 0 41 -41z" />
+<glyph unicode="͝" horiz-adv-x="0" d="M2088 1565q0 -15 -15 -28q-174 -145 -413.5 -219t-485.5 -74t-485.5 74t-413.5 219q-15 13 -15 28q0 41 41 41q25 0 77 -30l95 -57q295 -160 701 -160t701 160l95 57q52 30 77 30q41 0 41 -41z" />
+<glyph unicode="͞" horiz-adv-x="0" d="M2046 1445q0 -41 -37 -41h-1668q-39 0 -39 41t39 41h1668q37 0 37 -41z" />
+<glyph unicode="͟" horiz-adv-x="0" d="M2057 -377h-1766v92h1766v-92z" />
+<glyph unicode="͠" horiz-adv-x="0" d="M2033 1606q26 0 26 -34t-37 -104q-117 -223 -382 -223q-169 0 -484 111.5t-489.5 111.5t-264.5 -118q-7 -9 -53 -102q-12 -24 -34 -24q-26 0 -26 34t37 104q117 223 382 223q169 0 484.5 -111t489.5 -111t264 117q7 9 53 102q12 24 34 24z" />
+<glyph unicode="͡" horiz-adv-x="0" d="M2088 1285q0 -41 -41 -41q-25 0 -77 30l-95 57q-295 160 -701 160t-701 -160l-95 -57q-52 -30 -77 -30q-41 0 -41 41q0 15 15 28q174 145 413.5 219t485.5 74t485.5 -74t413.5 -219q15 -13 15 -28z" />
+<glyph unicode="͢" horiz-adv-x="0" d="M291 -357v92l1528 9v76l238 -125v-12l-238 -125v76l13 9h-1541z" />
+<glyph unicode="Ͱ" horiz-adv-x="1153" d="M649 1284l-55 2q-123 0 -142 -36q-8 -16 -8 -45v-477h375q134 0 173.5 46.5t39.5 182.5h54v-521h-54q0 136 -40 183t-173 47h-375v-525q0 -29 8 -45q18 -35 187 -35h10v-61q-71 6 -115 6h-358q-37 0 -108 -6v61q9 0 27.5 -0.5t28.5 -0.5q121 0 139 36q7 14 7 45v1064 q0 31 -7 45q-17 34 -149 34h-46v62q70 -6 112 -6h354q45 0 115 6v-62z" />
+<glyph unicode="ͱ" horiz-adv-x="849" d="M797 431h-446v-431h-141v739q0 86 -41 106q-20 11 -103 11h-14v67l299 23v-415h446v-100z" />
+<glyph unicode="Ͳ" horiz-adv-x="1511" d="M943 1271q-100 0 -100 -79v-1052q0 -53 40 -70q24 -11 64.5 -11t79.5 1v-61q-68 6 -113 6h-317q-45 0 -113 -6v61q39 -1 79.5 -1t64.5 11q40 17 40 70v1052q0 79 -100 79q-240 0 -332 -187q-53 -108 -80 -398h-76l42 657h1267l42 -657h-76q-27 290 -80 398 q-92 187 -332 187z" />
+<glyph unicode="ͳ" horiz-adv-x="1122" d="M1073 630h-45q-6 76 -48.5 129.5t-115.5 53.5h-229v-813h-148v813h-229q-73 0 -115.5 -53.5t-48.5 -129.5h-45v35q0 95 72.5 176.5t166.5 81.5h546q94 0 166.5 -81.5t72.5 -176.5v-35z" />
+<glyph unicode="ʹ" horiz-adv-x="506" d="M409 1490.5q27 -23.5 27 -49t-8 -44.5l-285 -664q-4 -10 -12 -10q-50 0 -50 33q0 5 2 12l187 684q17 62 77 62q35 0 62 -23.5z" />
+<glyph unicode="͵" horiz-adv-x="506" d="M425 321q0 -5 -2 -12l-187 -684q-17 -62 -77 -62q-35 0 -62 23.5t-27 49t8 44.5l285 664q4 10 12 10q50 0 50 -33z" />
+<glyph unicode="Ͷ" horiz-adv-x="1631" d="M1564 1284l-56 2q-122 0 -140 -36q-8 -16 -8 -45v-1064q0 -29 8 -45q18 -35 186 -35h10v-61q-71 6 -113 6h-361q-36 0 -107 -6v61q9 0 28 -0.5t29 -0.5q119 0 137 36q8 16 8 45v964l-734 -1008l1 -1q14 -30 90 -35q3 0 30 -0.5t77 0.5v-61q-71 6 -115 6h-358 q-37 0 -108 -6v61q9 0 27.5 -0.5t28.5 -0.5q121 0 139 36q7 14 7 45v1064q0 31 -7 45q-17 34 -149 34h-46v62q70 -6 112 -6h354q45 0 115 6v-62l-55 2q-123 0 -142 -36q-8 -16 -8 -45v-967l734 1009q-15 37 -149 37h-46v62q70 -6 112 -6h356q43 0 113 6v-62z" />
+<glyph unicode="ͷ" horiz-adv-x="1123" d="M870 347v390l-519 -677v-60h-141v739q0 86 -41 106q-20 11 -103 11h-14v67l299 23v-760l565 737h102v-600q0 -140 40 -323h-148q-40 135 -40 347z" />
+<glyph unicode="͸" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="͹" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="ͺ" horiz-adv-x="982" d="M388 -359q0 -83 -89 -83t-89 81q0 14 3 27l55 242q6 26 30.5 26t30.5 -26l56 -242q3 -13 3 -25z" />
+<glyph unicode="ͻ" horiz-adv-x="920" d="M406 960q198 0 330 -149t132 -347.5t-132.5 -343t-326.5 -144.5q-223 0 -329 203q-27 52 -27 74.5t29 22.5q19 0 53 -72.5t74 -109.5q68 -64 181 -64q60 0 123 34q178 96 178 404t-168 403q-60 34 -120 34q-85 0 -128 -56q-4 -6 -52 -105q-27 -56 -74 -56q-81 0 -81 83 t131 141q108 48 207 48z" />
+<glyph unicode="ͼ" horiz-adv-x="920" d="M839 276q29 0 29 -22.5t-27 -74.5q-106 -203 -329 -203q-194 0 -326.5 144.5t-132.5 343t132 347.5t330 149q99 0 207 -48q131 -58 131 -141t-81 -83q-47 0 -74 56q-48 99 -52 105q-43 56 -128 56q-60 0 -120 -34q-168 -95 -168 -403t178 -404q63 -34 123 -34 q113 0 181 64q40 37 74 109.5t53 72.5zM620 466q0 -46 -32 -78t-78 -32t-78 32t-32 78t32 78t78 32t78 -32t32 -78z" />
+<glyph unicode="ͽ" horiz-adv-x="920" d="M406 960q198 0 330 -149t132 -347.5t-132.5 -343t-326.5 -144.5q-223 0 -329 203q-27 52 -27 74.5t29 22.5q19 0 53 -72.5t74 -109.5q68 -64 181 -64q60 0 123 34q178 96 178 404t-168 403q-60 34 -120 34q-85 0 -128 -56q-4 -6 -52 -105q-27 -56 -74 -56q-81 0 -81 83 t131 141q108 48 207 48zM521 466q0 -46 -32 -78t-78 -32t-78 32t-32 78t32 78t78 32t78 -32t32 -78z" />
+<glyph unicode=";" horiz-adv-x="536" d="M334.5 801q30.5 -31 30.5 -72.5t-30.5 -71.5t-72 -30t-72 30t-30.5 71.5t30.5 72.5t72 31t72 -31zM263 204q107 0 107 -203.5t-124 -343.5q-25 -29 -36 -29q-19 0 -19 21q0 9 13 26q124 152 123 347q-15 -15 -49 -20q-3 -2 -11 -2q-107 0 -107 102q0 44 29 73t74 29z" />
+<glyph unicode="Ϳ" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="΀" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="΁" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="΂" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="΃" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="΄" horiz-adv-x="564" d="M408 1457q0 -20 -17 -48l-144 -237q-25 -41 -51 -41t-26 24q0 11 8 33l100 278q13 36 60 36q70 0 70 -45z" />
+<glyph unicode="΅" horiz-adv-x="574" d="M484 1561q0 -20 -17 -48l-144 -237q-25 -41 -51 -41t-26 24q0 11 8 33l100 278q13 36 60 36q70 0 70 -45zM574 1233q0 -42 -29.5 -72t-71 -30t-71 30.5t-29.5 71t30 70.5t71 30t70.5 -29t29.5 -71zM202 1233q0 -42 -29.5 -72t-71 -30t-71.5 30.5t-30 71t30.5 70.5 t71.5 30t70.5 -29t29.5 -71z" />
+<glyph unicode="Ά" horiz-adv-x="1484" d="M1417 0q-127 6 -297.5 6t-244.5 -6v61h5q157 0 157 59q0 29 -39 136l-70 192h-487l-61 -163q-34 -90 -34 -123q0 -51 52 -78q42 -23 97 -23v-61q-189 6 -239.5 6t-187.5 -6v61q174 2 219 133l409 1177q14 40 46 40t46 -40l425 -1231q21 -61 84 -75q19 -5 77 -5q19 0 43 1 v-61zM906 510l-222 641l-220 -641h442zM318 1324q0 -20 -17 -48l-144 -237q-25 -41 -51 -41t-26 24q0 11 8 33l100 278q13 36 60 36q70 0 70 -45z" />
+<glyph unicode="·" horiz-adv-x="547" d="M378 837q0 -42 -31 -73t-73.5 -31t-73.5 31t-31 73t31 73t73.5 31t73.5 -31t31 -73z" />
+<glyph unicode="Έ" horiz-adv-x="1797" d="M511 0v61q47 -1 53 -1q125 0 142 38q7 16 7 48v1053q0 30 -7 47q-15 36 -152 36q-20 0 -43 -1v62h1108l56 -442h-49q-24 218 -99.5 299t-288.5 81h-263q-54 0 -71 -13.5t-17 -65.5v-474h178q134 0 173.5 46.5t39.5 182.5h51v-521h-51q0 136 -40 183t-173 47h-178v-526 q0 -52 17 -65.5t71 -13.5h273q236 0 326 111q67 84 107 336h49l-84 -508h-1135zM271 1324q0 -20 -17 -48l-144 -237q-25 -41 -51 -41t-26 24q0 11 8 33l100 278q13 36 60 36q70 0 70 -45z" />
+<glyph unicode="Ή" horiz-adv-x="1923" d="M1856 1284l-56 2q-122 0 -140 -36q-8 -16 -8 -45v-1064q0 -29 8 -45q18 -35 186 -35h10v-61q-71 6 -113 6h-361q-36 0 -107 -6v61q9 0 28 -0.5t29 -0.5q119 0 137 36q8 16 8 45v530h-590v-530q0 -29 8 -45q18 -35 187 -35h10v-61q-71 6 -115 6h-358q-37 0 -108 -6v61 q9 0 27.5 -0.5t28.5 -0.5q121 0 139 36q7 14 7 45v1064q0 31 -7 45q-17 34 -149 34h-46v62q70 -6 112 -6h354q45 0 115 6v-62l-55 2q-123 0 -142 -36q-8 -16 -8 -45v-474h590v474q0 29 -8 45q-17 34 -148 34h-46v62q70 -6 112 -6h356q43 0 113 6v-62zM271 1324 q0 -20 -17 -48l-144 -237q-25 -41 -51 -41t-26 24q0 11 8 33l100 278q13 36 60 36q70 0 70 -45z" />
+<glyph unicode="Ί" horiz-adv-x="1179" d="M1113 1284l-59 2q-75 0 -103 -9q-53 -18 -53 -76v-1057q0 -27 13.5 -52t91.5 -31h110v-61q-71 6 -117 6h-373q-41 0 -112 -6v61q8 0 27.5 -0.5t29.5 -0.5q128 0 147 36q9 17 9 49v1056q0 32 -9 49q-18 34 -153 34h-51v62q71 -6 115 -6h376q41 0 111 6v-62zM271 1324 q0 -20 -17 -48l-144 -237q-25 -41 -51 -41t-26 24q0 11 8 33l100 278q13 36 60 36q70 0 70 -45z" />
+<glyph unicode="΋" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="Ό" horiz-adv-x="1788" d="M1065 -43q-280 0 -467 214t-187 498.5t186.5 502.5t468 218t468 -217.5t186.5 -503t-187.5 -499t-467.5 -213.5zM1518 696q0 438 -260 590q-92 54 -192 54t-191 -53q-262 -153 -262 -591q0 -469 265 -632q91 -56 185 -56t188 55q267 156 267 633zM271 1324q0 -20 -17 -48 l-144 -237q-25 -41 -51 -41t-26 24q0 11 8 33l100 278q13 36 60 36q70 0 70 -45z" />
+<glyph unicode="΍" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="Ύ" horiz-adv-x="1868" d="M1800 1068q0 -33 -31 -33q-23 0 -31 30q-4 24 -9 48q-16 49 -72.5 77.5t-112.5 28.5q-171 0 -252 -200q-59 -145 -59 -346v-529q0 -29 7 -44q19 -40 190 -40q26 0 55 1v-61q-76 6 -159 6h-362q-83 0 -159 -6v61l75 -1q147 0 170 41q8 14 8 42v530q0 201 -59 347 q-82 199 -253 199q-55 0 -108.5 -26.5t-70.5 -73.5q-6 -26 -14.5 -55t-31.5 -29q-30 0 -30 33q0 116 72 209t185 93q174 0 282 -159q84 -124 115 -319h2q30 194 115 319q108 159 280 159q113 0 185.5 -93t72.5 -209zM271 1324q0 -20 -17 -48l-144 -237q-25 -41 -51 -41 t-26 24q0 11 8 33l100 278q13 36 60 36q70 0 70 -45z" />
+<glyph unicode="Ώ" horiz-adv-x="1725" d="M1266 0q-25 0 -31.5 7t-6.5 33q0 150 101 429t101 429q0 186 -107 317t-289 131t-289 -131t-107 -317q0 -150 101 -429t101 -429q0 -40 -39 -40h-326l-64 320h48q17 -115 35.5 -146t36 -38.5t58.5 -7.5h194q-27 111 -120 256q-144 223 -153 240q-76 141 -76 272 q0 221 194 364q177 130 406 130t405 -130q194 -143 194 -364q0 -131 -76 -272q-9 -18 -153 -240q-93 -145 -120 -256h195q41 0 58 7.5t35.5 38t35.5 146.5h49l-64 -320h-327zM271 1324q0 -20 -17 -48l-144 -237q-25 -41 -51 -41t-26 24q0 11 8 33l100 278q13 36 60 36 q70 0 70 -45z" />
+<glyph unicode="ΐ" horiz-adv-x="748" d="M695 266q0 -114 -48 -194q-58 -96 -164 -96q-133 0 -203 78t-70 212v473q0 86 -41 106q-20 11 -103 11h-14v67l299 23v-685q0 -231 148 -231q102 0 131 139q12 56 12 182v37h53v-122zM484 1561q0 -20 -17 -48l-144 -237q-25 -41 -51 -41t-26 24q0 11 8 33l100 278 q13 36 60 36q70 0 70 -45zM574 1233q0 -42 -29.5 -72t-71 -30t-71 30.5t-29.5 71t30 70.5t71 30t70.5 -29t29.5 -71zM202 1233q0 -42 -29.5 -72t-71 -30t-71.5 30.5t-30 71t30.5 70.5t71.5 30t70.5 -29t29.5 -71z" />
+<glyph unicode="Α" horiz-adv-x="1484" d="M1417 0q-127 6 -297.5 6t-244.5 -6v61h5q157 0 157 59q0 29 -39 136l-70 192h-487l-61 -163q-34 -90 -34 -123q0 -51 52 -78q42 -23 97 -23v-61q-189 6 -239.5 6t-187.5 -6v61q174 2 219 133l409 1177q14 40 46 40t46 -40l425 -1231q21 -61 84 -75q19 -5 77 -5q19 0 43 1 v-61zM906 510l-222 641l-220 -641h442z" />
+<glyph unicode="Β" horiz-adv-x="1346" d="M1278 360q0 -161 -135.5 -260.5t-302.5 -99.5h-772v61q62 -2 63 -2q113 0 134 45q5 11 5 42v1051q0 31 -5 42q-19 43 -152 43q-21 0 -45 -1v62h720q161 0 290 -83q148 -95 148 -247q0 -120 -98.5 -203t-227.5 -108q147 -16 262.5 -109t115.5 -233zM720 721 q129 0 221.5 82t92.5 202.5t-73 198t-186 77.5h-255q-53 0 -69.5 -13t-16.5 -66v-481h286zM994 147q88 86 88 214t-76.5 222t-200.5 94h-371v-537q0 -53 16.5 -66t69.5 -13h257q129 0 217 86z" />
+<glyph unicode="Γ" horiz-adv-x="1216" d="M744 1281h-214q-51 0 -68.5 -13t-17.5 -66v-1065q0 -22 8 -39q17 -37 223 -37h22v-61q-74 6 -120 6h-382q-55 0 -127 -6v61q8 0 26 -0.5t28 -0.5q124 0 141 38q7 15 7 48v1053q0 31 -7 47q-15 35 -170 35h-25v62h1026l55 -442h-49q-24 212 -82 285q-74 95 -274 95z" />
+<glyph unicode="Δ" horiz-adv-x="1202" d="M1135 15q0 -15 -24 -15h-1021q-22 0 -22 11t130 377l319 898q10 30 33 89q16 36 52 36t49 -36l473 -1337q11 -31 11 -23zM918 149l-369 1046l-369 -1046h738z" />
+<glyph unicode="Ε" horiz-adv-x="1354" d="M68 0v61q47 -1 53 -1q125 0 142 38q7 16 7 48v1053q0 30 -7 47q-15 36 -152 36q-20 0 -43 -1v62h1108l56 -442h-49q-24 218 -99.5 299t-288.5 81h-263q-54 0 -71 -13.5t-17 -65.5v-474h178q134 0 173.5 46.5t39.5 182.5h51v-521h-51q0 136 -40 183t-173 47h-178v-526 q0 -52 17 -65.5t71 -13.5h273q236 0 326 111q67 84 107 336h49l-84 -508h-1135z" />
+<glyph unicode="Ζ" horiz-adv-x="1128" d="M101 0q-33 0 -33 33q0 21 13 41l766 1207h-310q-206 0 -294 -87.5t-100 -293.5h-51l22 443h900q34 0 34 -32q0 -16 -14 -38l-764 -1205h324q239 0 329 114q76 95 89 344h49l-35 -526h-925z" />
+<glyph unicode="Η" horiz-adv-x="1480" d="M1413 1284l-56 2q-122 0 -140 -36q-8 -16 -8 -45v-1064q0 -29 8 -45q18 -35 186 -35h10v-61q-71 6 -113 6h-361q-36 0 -107 -6v61q9 0 28 -0.5t29 -0.5q119 0 137 36q8 16 8 45v530h-590v-530q0 -29 8 -45q18 -35 187 -35h10v-61q-71 6 -115 6h-358q-37 0 -108 -6v61 q9 0 27.5 -0.5t28.5 -0.5q121 0 139 36q7 14 7 45v1064q0 31 -7 45q-17 34 -149 34h-46v62q70 -6 112 -6h354q45 0 115 6v-62l-55 2q-123 0 -142 -36q-8 -16 -8 -45v-474h590v474q0 29 -8 45q-17 34 -148 34h-46v62q70 -6 112 -6h356q43 0 113 6v-62z" />
+<glyph unicode="Θ" horiz-adv-x="1445" d="M722 -43q-280 0 -467 214t-187 498.5t186.5 502.5t468 218t468 -217.5t186.5 -503t-187.5 -499t-467.5 -213.5zM1175 696q0 438 -260 590q-92 54 -192 54t-191 -53q-262 -153 -262 -591q0 -469 265 -632q91 -56 185 -56t188 55q267 156 267 633zM1054 532h-50v68h-564 v-68h-49v284h49v-68h564v68h50v-284z" />
+<glyph unicode="Ι" horiz-adv-x="736" d="M670 1284l-59 2q-75 0 -103 -9q-53 -18 -53 -76v-1057q0 -27 13.5 -52t91.5 -31h110v-61q-71 6 -117 6h-373q-41 0 -112 -6v61q8 0 27.5 -0.5t29.5 -0.5q128 0 147 36q9 17 9 49v1056q0 32 -9 49q-18 34 -153 34h-51v62q71 -6 115 -6h376q41 0 111 6v-62z" />
+<glyph unicode="Κ" horiz-adv-x="1519" d="M649 1284l-57 2q-126 0 -142 -40q-6 -15 -6 -44v-636l618 588q36 34 36 67q0 61 -91 63v62q69 -6 217.5 -6t201.5 6v-62q-160 -2 -281 -118l-356 -340l456 -670q42 -62 83.5 -78.5t122.5 -16.5v-61q-127 6 -281.5 6t-225.5 -6v61h4q113 0 113 59q0 22 -31 68l-357 528 l-229 -218v-359q0 -28 9 -45q17 -33 186 -33h10v-61q-71 6 -120 6h-347q-43 0 -114 -6v61q8 0 26.5 -0.5t28.5 -0.5q125 0 141 40q6 15 6 44v1066q0 27 -7 41q-16 33 -176 33h-19v62q70 -6 119 -6h342q50 0 120 6v-62z" />
+<glyph unicode="Λ" horiz-adv-x="1374" d="M963 6q-110 0 -182 -6v61h5q161 0 161 59q0 16 -59 199l-262 806l-296 -919q-9 -28 -9 -42q0 -51 47.5 -76.5t104.5 -26.5v-61q-183 6 -244 6t-161 -6v61h2q149 0 193 136l380 1172q14 42 45 42t45 -42l394 -1223q6 -20 25 -56q25 -29 141 -29h15v-61q-235 6 -345 6z" />
+<glyph unicode="Μ" horiz-adv-x="1793" d="M1726 1281l-56 2q-125 0 -141 -41q-6 -15 -6 -45v-1058q0 -26 8 -43q17 -35 185 -35h10v-61q-75 6 -119 6h-334q-38 0 -113 -6v61h76q63 0 87 10q40 17 40 70v1140h-2l-483 -1245q-14 -36 -36 -36t-39 43l-476 1222h-2v-1064q0 -140 200 -140h3v-61q-209 6 -229 6 t-231 -6v61h3q199 0 199 140v1003q0 22 -6 38q-12 32 -89 39q-6 1 -32.5 1t-74.5 -1v62h341q45 0 61 -42l428 -1102l430 1108q14 36 49 36h349v-62z" />
+<glyph unicode="Ν" horiz-adv-x="1480" d="M1209 1139v-1107q0 -32 -26 -32q-16 0 -34 26l-805 1178q-12 17 -19 25v-1028q0 -140 200 -140h3v-61q-208 6 -230 6t-230 -6v61h3q199 0 199 140v1032q0 29 -8 35q-19 13 -194 13v62h342q30 0 48 -26l696 -1019v847q0 139 -203 139v62q205 -6 231.5 -6t230.5 6v-62h-3 q-201 0 -201 -145z" />
+<glyph unicode="Ξ" horiz-adv-x="1282" d="M1024 1205h-765q-93 0 -110.5 -16.5t-23.5 -153.5h-47l15 308h1096l15 -308h-49q-5 137 -23 153.5t-108 16.5zM1022 524h-49v100h-664v-100h-49v338h49v-99h664v99h49v-338zM256 138h771q93 0 111.5 19.5t26.5 171.5h49l-16 -329h-1115l-15 329h48q2 -56 7 -107.5 t18 -63.5q20 -20 115 -20z" />
+<glyph unicode="Ο" horiz-adv-x="1445" d="M722 -43q-280 0 -467 214t-187 498.5t186.5 502.5t468 218t468 -217.5t186.5 -503t-187.5 -499t-467.5 -213.5zM1175 696q0 438 -260 590q-92 54 -192 54t-191 -53q-262 -153 -262 -591q0 -469 265 -632q91 -56 185 -56t188 55q267 156 267 633z" />
+<glyph unicode="Π" horiz-adv-x="1480" d="M1300 6h-361q-36 0 -107 -6v61h78q60 0 85 11q39 17 39 69v1141h-590v-1141q0 -26 6 -41q13 -32 90 -39q6 0 33 -0.5t76 0.5v-61q-71 6 -113 6h-360q-37 0 -108 -6v61h78q60 0 85 11q39 17 39 69v1062q0 26 -6 41q-13 32 -90 38h-106v62h1345v-62q-8 0 -29 0.5t-32 0.5 q-121 0 -137 -39q-6 -14 -6 -41v-1062q0 -26 6 -41q13 -32 90 -39q5 0 32 -0.5t76 0.5v-61q-71 6 -113 6z" />
+<glyph unicode="Ρ" horiz-adv-x="1295" d="M1074 1249q154 -106 154 -268t-142 -262t-307 -100h-335v-473q0 -32 7 -48q17 -37 181 -37h17v-61q-72 6 -133 6h-326q-50 0 -122 -6v61l55 -1q122 0 140 38q7 15 7 48v1051q0 32 -7 48q-16 37 -158 37q-18 0 -37 -1v62h695q174 0 311 -94zM1024 977q0 161 -75.5 232.5 t-237.5 71.5h-186q-53 0 -69.5 -13t-16.5 -66v-532h272q313 0 313 307z" />
+<glyph unicode="΢" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="Σ" horiz-adv-x="1335" d="M106 0q-36 0 -36 22q0 9 18 32l470 596l-490 660q0 33 41 33h1103l54 -443h-47q-30 235 -137 313q-93 68 -338 68h-455l405 -532q13 -17 13 -26.5t-17 -31.5l-480 -608h529q244 0 342 69q114 81 138 314h47l-54 -466h-1106z" />
+<glyph unicode="Τ" horiz-adv-x="1413" d="M878 1282q-46 0 -65.5 -11.5t-19.5 -53.5v-1071q0 -25 10 -47q18 -38 243 -38h34v-61q-84 6 -154 6h-439q-71 0 -155 -6v61q9 0 35.5 -0.5t40.5 -0.5q184 0 202 39q8 17 8 47v1072q0 43 -29 56q-17 8 -66 8q-256 0 -321 -62.5t-86 -318.5h-48l36 442h1206l36 -442h-49 q-22 262 -88.5 321.5t-330.5 59.5z" />
+<glyph unicode="Υ" horiz-adv-x="1445" d="M1377 1068q0 -33 -31 -33q-23 0 -31 30q-4 24 -9 48q-16 49 -72.5 77.5t-112.5 28.5q-171 0 -252 -200q-59 -145 -59 -346v-529q0 -29 7 -44q19 -40 190 -40q26 0 55 1v-61q-76 6 -159 6h-362q-83 0 -159 -6v61l75 -1q147 0 170 41q8 14 8 42v530q0 201 -59 347 q-82 199 -253 199q-55 0 -108.5 -26.5t-70.5 -73.5q-6 -26 -14.5 -55t-31.5 -29q-30 0 -30 33q0 116 72 209t185 93q174 0 282 -159q84 -124 115 -319h2q30 194 115 319q108 159 280 159q113 0 185.5 -93t72.5 -209z" />
+<glyph unicode="Φ" horiz-adv-x="1394" d="M1025 1287l-82 2q-135 0 -157 -37q-14 -23 -14 -76v-81q215 -21 368 -118q186 -118 186 -304t-186 -303q-153 -97 -368 -117v-97q0 -39 7 -56q16 -40 202 -40q21 0 44 1v-61q-75 6 -154 6h-359q-80 0 -155 -6v61l81 -2q136 0 158 37q14 23 14 75v82q-210 21 -361 120 q-181 118 -181 300.5t181 300.5q152 99 361 121v99q0 37 -7 54q-16 39 -225 39h-21v62q75 -6 155 -6h359q79 0 154 6v-62zM1130 674q0 339 -358 376v-753q164 13 261 110t97 267zM610 1050q-347 -40 -347 -375.5t347 -375.5v751z" />
+<glyph unicode="Χ" horiz-adv-x="1518" d="M1450 0q-127 6 -299 6t-244 -6v61q128 5 128 59q0 10 -320 493l-281 -414q-19 -28 -19 -48q0 -43 38.5 -66t84.5 -24v-61q-74 6 -165 6t-305 -6v61q196 0 285 131l323 477l-362 547q-34 51 -99 64q-24 4 -81 4h-41v62q112 -6 292.5 -6t251.5 6v-62q-128 -5 -128 -58 q0 -13 268 -410l225 333q17 25 17 46q0 43 -37.5 65.5t-83.5 23.5v62q81 -6 163.5 -6t306.5 6v-62q-198 -2 -285 -128l-271 -395l416 -629q35 -53 99 -66q25 -5 85 -5h38v-61z" />
+<glyph unicode="Ψ" horiz-adv-x="1441" d="M1048 1287l-63 2q-162 0 -182 -42q-8 -17 -8 -41v-890q263 63 281 475q5 114 15 162q23 101 84 127q35 15 116.5 15t81.5 -25q0 -14 -25 -22q-108 -34 -108 -220q0 -508 -445 -563v-125q0 -22 8 -40q18 -39 208 -39h37v-61q-74 6 -143 6h-382q-69 0 -143 -6v61l83 -2 q140 0 160 40q11 22 11 51v63q-1 40 -1 52q-402 52 -432 516q-9 132 -9 136q-13 93 -53 114l-46 15q-25 9 -25 24q0 22 35 22h87q106 0 146 -92q24 -57 30 -219.5t49 -267.5q62 -156 218 -197v890q0 25 -7 42q-16 39 -225 39h-21v62q74 -6 143 -6h382q69 0 143 6v-62z" />
+<glyph unicode="Ω" horiz-adv-x="1382" d="M923 0q-25 0 -31.5 7t-6.5 33q0 150 101 429t101 429q0 186 -107 317t-289 131t-289 -131t-107 -317q0 -150 101 -429t101 -429q0 -40 -39 -40h-326l-64 320h48q17 -115 35.5 -146t36 -38.5t58.5 -7.5h194q-27 111 -120 256q-144 223 -153 240q-76 141 -76 272 q0 221 194 364q177 130 406 130t405 -130q194 -143 194 -364q0 -131 -76 -272q-9 -18 -153 -240q-93 -145 -120 -256h195q41 0 58 7.5t35.5 38t35.5 146.5h49l-64 -320h-327z" />
+<glyph unicode="Ϊ" horiz-adv-x="736" d="M670 1284l-59 2q-75 0 -103 -9q-53 -18 -53 -76v-1057q0 -27 13.5 -52t91.5 -31h110v-61q-71 6 -117 6h-373q-41 0 -112 -6v61q8 0 27.5 -0.5t29.5 -0.5q128 0 147 36q9 17 9 49v1056q0 32 -9 49q-18 34 -153 34h-51v62q71 -6 115 -6h376q41 0 111 6v-62zM257 1574 q32 -32 32 -78.5t-32 -79t-78 -32.5t-79 33.5t-33 78t33.5 77.5t79 33t77.5 -32zM629 1574q32 -32 32 -78.5t-32 -79t-78 -32.5t-79 33.5t-33 78t33.5 77.5t79 33t77.5 -32z" />
+<glyph unicode="Ϋ" horiz-adv-x="1445" d="M1377 1068q0 -33 -31 -33q-23 0 -31 30q-4 24 -9 48q-16 49 -72.5 77.5t-112.5 28.5q-171 0 -252 -200q-59 -145 -59 -346v-529q0 -29 7 -44q19 -40 190 -40q26 0 55 1v-61q-76 6 -159 6h-362q-83 0 -159 -6v61l75 -1q147 0 170 41q8 14 8 42v530q0 201 -59 347 q-82 199 -253 199q-55 0 -108.5 -26.5t-70.5 -73.5q-6 -26 -14.5 -55t-31.5 -29q-30 0 -30 33q0 116 72 209t185 93q174 0 282 -159q84 -124 115 -319h2q30 194 115 319q108 159 280 159q113 0 185.5 -93t72.5 -209zM629 1574q32 -32 32 -78.5t-32 -79t-78 -32.5t-79 33.5 t-33 78t33.5 77.5t79 33t77.5 -32zM1001 1574q32 -32 32 -78.5t-32 -79t-78 -32.5t-79 33.5t-33 78t33.5 77.5t79 33t77.5 -32z" />
+<glyph unicode="ά" horiz-adv-x="1228" d="M1151 187q0 -84 -47.5 -143.5t-128.5 -59.5q-139 0 -165 167q-137 -175 -301 -175q-192 0 -324 144.5t-132 340t138 340.5t334 145q92 0 169.5 -54t117.5 -140l81 194h47v-788q0 -39 21.5 -73.5t58.5 -34.5q78 0 78 171l-2 86h55v-120zM799 291v301q0 112 -76 206.5 t-178.5 94.5t-176.5 -72q-138 -134 -138 -362q0 -152 66 -280q81 -155 219 -155q104 0 194 82t90 185zM748 1457q0 -20 -17 -48l-144 -237q-25 -41 -51 -41t-26 24q0 11 8 33l100 278q13 36 60 36q70 0 70 -45z" />
+<glyph unicode="έ" horiz-adv-x="883" d="M792 280q28 0 28 -28.5t-34 -86.5q-110 -189 -326 -189q-148 0 -260 61q-138 75 -138 211q0 99 74 161.5t179 86.5q-93 22 -154 84t-61 153q0 123 132 182q98 45 221 45t210 -28q123 -40 123 -122q0 -33 -24.5 -55.5t-60.5 -22.5t-67 47q-52 77 -61 86q-47 47 -126 47 q-202 0 -202 -194q0 -188 199 -188q22 0 63 11t63 11q86 0 86 -55.5t-87 -55.5q-21 0 -62.5 11t-62.5 11q-224 0 -224 -205q0 -228 255 -228q204 0 290 221q11 29 27 29zM628 1457q0 -20 -17 -48l-144 -237q-25 -41 -51 -41t-26 24q0 11 8 33l100 278q13 36 60 36 q70 0 70 -45z" />
+<glyph unicode="ή" horiz-adv-x="1098" d="M858 -81v757q0 237 -158 237q-129 0 -209 -100.5t-80 -232.5v-580h-149v778q0 39 -21 73.5t-58 34.5q-78 0 -78 -172q0 -8 2 -85h-55v120q0 84 47 143.5t130 59.5t128 -69q40 -59 40 -147q101 224 317 224q293 0 293 -317v-45q-1 -29 -1 -44v-659q0 -140 40 -323h-148 q-40 135 -40 347zM758 1457q0 -20 -17 -48l-144 -237q-25 -41 -51 -41t-26 24q0 11 8 33l100 278q13 36 60 36q70 0 70 -45z" />
+<glyph unicode="ί" horiz-adv-x="748" d="M695 266q0 -114 -48 -194q-58 -96 -164 -96q-133 0 -203 78t-70 212v473q0 86 -41 106q-20 11 -103 11h-14v67l299 23v-685q0 -231 148 -231q102 0 131 139q12 56 12 182v37h53v-122zM408 1457q0 -20 -17 -48l-144 -237q-25 -41 -51 -41t-26 24q0 11 8 33l100 278 q13 36 60 36q70 0 70 -45z" />
+<glyph unicode="ΰ" horiz-adv-x="1103" d="M1051 496q0 -211 -106 -357q-119 -163 -322 -163q-178 0 -269.5 100.5t-91.5 280.5v421q0 39 -21 73.5t-58 34.5q-79 0 -79 -173q0 -6 3 -84h-55v120q0 84 47 143.5t132 59.5t132.5 -62.5t47.5 -153.5v-357q0 -355 223 -355q159 0 241 173q64 134 64 313q0 328 -233 410 l5 32q160 -18 250 -152.5t90 -303.5zM764 1561q0 -20 -17 -48l-144 -237q-25 -41 -51 -41t-26 24q0 11 8 33l100 278q13 36 60 36q70 0 70 -45zM854 1233q0 -42 -29.5 -72t-71 -30t-71 30.5t-29.5 71t30 70.5t71 30t70.5 -29t29.5 -71zM482 1233q0 -42 -29.5 -72t-71 -30 t-71.5 30.5t-30 71t30.5 70.5t71.5 30t70.5 -29t29.5 -71z" />
+<glyph unicode="α" horiz-adv-x="1228" d="M1151 187q0 -84 -47.5 -143.5t-128.5 -59.5q-139 0 -165 167q-137 -175 -301 -175q-192 0 -324 144.5t-132 340t138 340.5t334 145q92 0 169.5 -54t117.5 -140l81 194h47v-788q0 -39 21.5 -73.5t58.5 -34.5q78 0 78 171l-2 86h55v-120zM799 291v301q0 112 -76 206.5 t-178.5 94.5t-176.5 -72q-138 -134 -138 -362q0 -152 66 -280q81 -155 219 -155q104 0 194 82t90 185z" />
+<glyph unicode="β" horiz-adv-x="951" d="M898 427q0 -200 -124.5 -325.5t-265 -125.5t-272.5 113q0 -22 0.5 -75t0.5 -79q0 -221 -37 -352h-148q37 173 37 311v1110q0 467 361 467q157 0 257.5 -88t100.5 -242q0 -183 -193 -308q283 -133 283 -406zM671 133q57 92 57 215.5t-46 258.5t-120 198q-56 -27 -98.5 -27 t-80.5 16.5t-38 42.5q0 47 87 47q54 0 131 -30q88 103 88 292q0 277 -211 277q-204 0 -204 -345v-845q0 -48 58 -119q74 -90 192 -90t185 109z" />
+<glyph unicode="γ" horiz-adv-x="934" d="M884 847q0 -109 -133 -365l-201 -358q37 -229 37 -383t-78 -154q-82 0 -82 164t68 381q-44 204 -111 379q-107 280 -211 280q-76 0 -88 -155h-35v14q0 273 146 273q129 0 231 -307q18 -55 106 -423q147 307 174 509q13 97 25 133q27 88 82 88q70 0 70 -76z" />
+<glyph unicode="δ" horiz-adv-x="929" d="M716 821q160 -165 160 -356.5t-130.5 -340t-311 -148.5t-281.5 123t-101 305t120 309.5t304 154.5q-35 39 -132 116.5t-135 128.5q-56 77 -56 173.5t116 152.5q92 44 207 44t208 -54q113 -64 113 -170.5t-98 -106.5q-43 0 -71 28t-28 71q0 95 101 99q-80 78 -229 78 q-80 0 -140 -31q-74 -38 -74 -111q0 -102 160 -227q271 -210 298 -238zM730 399q0 187 -210 421q-153 -24 -236 -131.5t-83 -262.5t59 -262q73 -134 208.5 -134t205.5 125q56 101 56 244z" />
+<glyph unicode="ε" horiz-adv-x="883" d="M792 280q28 0 28 -28.5t-34 -86.5q-110 -189 -326 -189q-148 0 -260 61q-138 75 -138 211q0 99 74 161.5t179 86.5q-93 22 -154 84t-61 153q0 123 132 182q98 45 221 45t210 -28q123 -40 123 -122q0 -33 -24.5 -55.5t-60.5 -22.5t-67 47q-52 77 -61 86q-47 47 -126 47 q-202 0 -202 -194q0 -188 199 -188q22 0 63 11t63 11q86 0 86 -55.5t-87 -55.5q-21 0 -62.5 11t-62.5 11q-224 0 -224 -205q0 -228 255 -228q204 0 290 221q11 29 27 29z" />
+<glyph unicode="ζ" horiz-adv-x="835" d="M402 126l202 8q97 0 161 -67.5t64 -165.5q0 -147 -86.5 -243t-227.5 -96t-141 88q0 71 75 71q28 0 82.5 -14.5t82.5 -14.5q61 0 102 48.5t41 106.5t-40.5 100t-94.5 42l-185 -13q-385 0 -385 443q0 400 284 723h-5q-185 0 -185 148q0 118 174 167l16 -37 q-104 -45 -104 -123q0 -51 34.5 -83.5t85.5 -32.5q11 0 23 2q56 64 175.5 144.5t184.5 80.5q48 0 48 -38q0 -86 -148 -158q-108 -53 -225 -73q-145 -134 -222 -327.5t-77 -399.5q0 -153 68.5 -219.5t222.5 -66.5z" />
+<glyph unicode="η" horiz-adv-x="1098" d="M858 -81v757q0 237 -158 237q-129 0 -209 -100.5t-80 -232.5v-580h-149v778q0 39 -21 73.5t-58 34.5q-78 0 -78 -172q0 -8 2 -85h-55v120q0 84 47 143.5t130 59.5t128 -69q40 -59 40 -147q101 224 317 224q293 0 293 -317v-45q-1 -29 -1 -44v-659q0 -140 40 -323h-148 q-40 135 -40 347z" />
+<glyph unicode="θ" horiz-adv-x="980" d="M836 1205q92 -217 92 -477.5t-94 -474.5q-121 -277 -343.5 -277t-344.5 277q-94 215 -94 475.5t91 476.5q120 284 346.5 284t346.5 -284zM768 765q0 211 -51 398q-75 272 -227 272t-227 -272q-51 -188 -51 -398h556zM768 709h-556q0 -212 51 -402q75 -277 227 -277 t227 276q51 191 51 403z" />
+<glyph unicode="ι" horiz-adv-x="748" d="M695 266q0 -114 -48 -194q-58 -96 -164 -96q-133 0 -203 78t-70 212v473q0 86 -41 106q-20 11 -103 11h-14v67l299 23v-685q0 -231 148 -231q102 0 131 139q12 56 12 182v37h53v-122z" />
+<glyph unicode="κ" horiz-adv-x="1140" d="M1088 0h-241l-356 502l-137 -118v-384h-134v737q0 88 -45 109q-21 10 -107 10h-16v67l309 23v-488l380 330q155 135 233 135q100 0 100 -98q0 -38 -30.5 -66.5t-64 -28.5t-61 29t-54.5 29q-45 0 -266 -193q2 -20 10 -31l271 -384q47 -67 88.5 -90.5t120.5 -23.5v-66z" />
+<glyph unicode="λ" horiz-adv-x="1043" d="M990 259q0 -283 -151.5 -283t-241.5 325l-108 392l-287 -693h-150l377 916l-68 249q-54 188 -181 188q-80 0 -92 -161h-36v15q0 283 152 283t241 -325l237 -864q52 -188 181 -188q79 0 92 161h35v-15z" />
+<glyph unicode="μ" horiz-adv-x="1120" d="M1043 187q0 -84 -47.5 -143.5t-130 -59.5t-125 64.5t-42.5 152.5q-101 -225 -317 -225q-83 0 -144 25v-66q0 -221 -37 -352h-148q37 173 37 311v1029h147v-663q0 -237 159 -237q129 0 209 101t80 233v566h148v-765q0 -39 21.5 -73.5t58.5 -34.5q78 0 78 171l-2 86h55 v-120z" />
+<glyph unicode="ν" horiz-adv-x="1031" d="M979 871q0 -93 -83 -247l-327 -607q-22 -41 -41 -41q-25 0 -40 41l-234 640q-48 131 -86 152q-25 14 -116 14v49q83 1 195 88h30q55 -105 97 -221l208 -573l199 365q41 75 41 117.5t-16.5 110.5t-16.5 103q0 98 103 98q36 0 61.5 -26.5t25.5 -62.5z" />
+<glyph unicode="ξ" horiz-adv-x="936" d="M420 123l262 12q106 0 172 -61.5t66 -166.5q0 -138 -86.5 -242.5t-221.5 -104.5q-47 0 -96.5 23.5t-49.5 65.5q0 25 22.5 46t48.5 21t78.5 -15t79.5 -15q75 0 117.5 45.5t42.5 109.5t-38 105.5t-91 41.5l-224 -12q-192 0 -312 84q-138 97 -138 281q0 263 252 437 q-116 85 -116 189t97 208q-156 36 -156 151.5t175 123.5v-33q-104 -13 -104 -89q0 -96 129 -105q202 179 327 179q44 0 44 -44q0 -82 -135 -132q-102 -38 -206 -41q-111 -109 -111 -209.5t122 -169.5q62 36 161 62t149.5 26t82.5 -14.5t32 -38.5q0 -49 -96 -74 q-66 -17 -143 -17t-182 17q-256 -184 -256 -394q0 -124 86.5 -187t215.5 -63z" />
+<glyph unicode="ο" horiz-adv-x="998" d="M945 481.5q0 -201.5 -127.5 -353.5t-324.5 -152t-319 143.5t-122 341t126.5 348.5t321 151t320 -138.5t125.5 -340zM782 406q0 187 -65 326q-84 180 -250 180q-135 0 -200 -121q-52 -96 -52 -262.5t67 -311.5q87 -187 251 -187q249 0 249 376z" />
+<glyph unicode="π" horiz-adv-x="1134" d="M1084 823h-267v-162q0 -366 108 -563q21 -38 21 -53q0 -66 -80.5 -66t-117.5 197q-24 127 -24 272v375h-228l-80 -704q-16 -140 -90.5 -140t-74.5 62q0 11 10 41q102 311 168 741h-191q-57 0 -118 -41q-55 -36 -55 -40q0 -1 1 -1q-16 0 -16 16q0 39 63.5 102.5 t164.5 63.5h806v-100z" />
+<glyph unicode="ρ" horiz-adv-x="990" d="M184 818q107 142 305 142t323.5 -138.5t125.5 -340t-127.5 -353.5t-329.5 -152q-145 0 -245 113q0 -23 0.5 -79.5t0.5 -84.5q0 -214 -36 -342h-149q37 173 37 311v589q0 209 95 335zM775 406q0 187 -65 326q-84 180 -250 180q-108 0 -166 -84.5t-58 -197.5v-344 q0 -110 89 -183t201 -73q249 0 249 376z" />
+<glyph unicode="ς" horiz-adv-x="905" d="M617 -14l-105 -10q-194 0 -326.5 144.5t-132.5 342.5t132 347.5t330 149.5q99 0 207 -48q131 -58 131 -143q0 -35 -23 -58t-64 -23t-68 56q-48 99 -52 105q-43 56 -128 56q-60 0 -120 -34q-168 -95 -168 -405q0 -109 58 -216q68 -126 168 -126l120 6q106 0 169.5 -62.5 t63.5 -169.5q0 -135 -91.5 -234.5t-228 -99.5t-136.5 84q0 22 22 44.5t47.5 22.5t78.5 -19t82 -19q67 0 112 51t45 118q0 140 -123 140z" />
+<glyph unicode="σ" horiz-adv-x="1087" d="M1037 823h-282q155 -134 155 -344t-122.5 -356.5t-312.5 -146.5t-307.5 138.5t-117.5 328t121.5 335t309.5 145.5h556v-100zM753 390q0 307 -151 433h-150q-125 0 -185 -83.5t-60 -213.5q0 -179 65 -318q83 -180 241 -180q240 0 240 362z" />
+<glyph unicode="τ" horiz-adv-x="936" d="M888 255q0 -109 -51.5 -194t-153.5 -85q-128 0 -196.5 75t-68.5 204v568h-180q-57 0 -118 -41q-55 -36 -55 -40q0 -1 1 -1q-16 0 -16 16q0 39 63.5 102.5t164.5 63.5h608v-100h-327v-572q0 -223 139 -223q98 0 127 134q11 55 11 173v38h52v-118z" />
+<glyph unicode="υ" horiz-adv-x="1103" d="M1051 496q0 -211 -106 -357q-119 -163 -322 -163q-178 0 -269.5 100.5t-91.5 280.5v421q0 39 -21 73.5t-58 34.5q-79 0 -79 -173q0 -6 3 -84h-55v120q0 84 47 143.5t132 59.5t132.5 -62.5t47.5 -153.5v-357q0 -355 223 -355q159 0 241 173q64 134 64 313q0 328 -233 410 l5 32q160 -18 250 -152.5t90 -303.5z" />
+<glyph unicode="φ" horiz-adv-x="1201" d="M642 959q225 -13 366 -151.5t141 -326t-138.5 -337t-368.5 -166.5v-390h-83v389q-228 10 -367.5 154.5t-139.5 329t140 334t367 164.5v164h83v-164zM905 165q70 98 79 259v32q0 142 -68 265q-93 167 -274 188v-878q174 10 263 134zM559 33v878q-180 -12 -270 -150 q-64 -97 -71 -244q-1 -13 -1 -26q0 -133 71 -262q94 -172 271 -196z" />
+<glyph unicode="χ" horiz-adv-x="952" d="M900 -145q0 -279 -149 -279q-157 0 -226 320l-53 245l-274 -541h-147l380 750l-62 291q-17 74 -63.5 129.5t-114.5 55.5q-78 0 -90 -159h-35v15q0 278 149 278q157 0 226 -319l41 -189l254 502h147l-360 -711l75 -347q17 -74 63 -129.5t114 -55.5q78 0 90 158h35v-14z " />
+<glyph unicode="ψ" horiz-adv-x="1254" d="M1201 656q0 -244 -99 -438q-122 -241 -343 -241v-389h-83v389q-414 0 -414 386v415q0 39 -21 73.5t-58 34.5q-79 0 -79 -173q0 -7 3 -84h-55v120q0 84 47 143.5t132 59.5t132.5 -62.5t47.5 -153.5v-351q0 -186 39 -256q55 -100 226 -100v894h83v-894q151 0 248 146 q86 130 86 289q0 70 -42.5 200.5t-42.5 199.5q0 96 67 96q85 0 112 -118q14 -59 14 -186z" />
+<glyph unicode="ω" horiz-adv-x="1328" d="M1276 430q0 -173 -79 -302q-93 -152 -255 -152q-185 0 -278 219q-93 -219 -278 -219q-162 0 -255 152q-79 129 -79 302q0 245 124.5 386t365.5 144v-48q-327 -10 -327 -470q0 -412 202 -412q135 0 224 241q-67 140 -67 291q0 219 90 219t90 -219q0 -151 -67 -291 q89 -241 224 -241q202 0 202 412q0 460 -327 470v48q241 -3 365.5 -144.5t124.5 -385.5z" />
+<glyph unicode="ϊ" horiz-adv-x="748" d="M695 266q0 -114 -48 -194q-58 -96 -164 -96q-133 0 -203 78t-70 212v473q0 86 -41 106q-20 11 -103 11h-14v67l299 23v-685q0 -231 148 -231q102 0 131 139q12 56 12 182v37h53v-122zM167 1318q32 -32 32 -78.5t-32 -79t-78 -32.5t-79 33.5t-33 78t33.5 77.5t79 33 t77.5 -32zM539 1318q32 -32 32 -78.5t-32 -79t-78 -32.5t-79 33.5t-33 78t33.5 77.5t79 33t77.5 -32z" />
+<glyph unicode="ϋ" horiz-adv-x="1103" d="M1051 496q0 -211 -106 -357q-119 -163 -322 -163q-178 0 -269.5 100.5t-91.5 280.5v421q0 39 -21 73.5t-58 34.5q-79 0 -79 -173q0 -6 3 -84h-55v120q0 84 47 143.5t132 59.5t132.5 -62.5t47.5 -153.5v-357q0 -355 223 -355q159 0 241 173q64 134 64 313q0 328 -233 410 l5 32q160 -18 250 -152.5t90 -303.5zM467 1318q32 -32 32 -78.5t-32 -79t-78 -32.5t-79 33.5t-33 78t33.5 77.5t79 33t77.5 -32zM839 1318q32 -32 32 -78.5t-32 -79t-78 -32.5t-79 33.5t-33 78t33.5 77.5t79 33t77.5 -32z" />
+<glyph unicode="ό" horiz-adv-x="998" d="M945 481.5q0 -201.5 -127.5 -353.5t-324.5 -152t-319 143.5t-122 341t126.5 348.5t321 151t320 -138.5t125.5 -340zM782 406q0 187 -65 326q-84 180 -250 180q-135 0 -200 -121q-52 -96 -52 -262.5t67 -311.5q87 -187 251 -187q249 0 249 376zM638 1457q0 -20 -17 -48 l-144 -237q-25 -41 -51 -41t-26 24q0 11 8 33l100 278q13 36 60 36q70 0 70 -45z" />
+<glyph unicode="ύ" horiz-adv-x="1103" d="M1051 496q0 -211 -106 -357q-119 -163 -322 -163q-178 0 -269.5 100.5t-91.5 280.5v421q0 39 -21 73.5t-58 34.5q-79 0 -79 -173q0 -6 3 -84h-55v120q0 84 47 143.5t132 59.5t132.5 -62.5t47.5 -153.5v-357q0 -355 223 -355q159 0 241 173q64 134 64 313q0 328 -233 410 l5 32q160 -18 250 -152.5t90 -303.5zM728 1457q0 -20 -17 -48l-144 -237q-25 -41 -51 -41t-26 24q0 11 8 33l100 278q13 36 60 36q70 0 70 -45z" />
+<glyph unicode="ώ" horiz-adv-x="1328" d="M1276 430q0 -173 -79 -302q-93 -152 -255 -152q-185 0 -278 219q-93 -219 -278 -219q-162 0 -255 152q-79 129 -79 302q0 245 124.5 386t365.5 144v-48q-327 -10 -327 -470q0 -412 202 -412q135 0 224 241q-67 140 -67 291q0 219 90 219t90 -219q0 -151 -67 -291 q89 -241 224 -241q202 0 202 412q0 460 -327 470v48q241 -3 365.5 -144.5t124.5 -385.5zM818 1457q0 -20 -17 -48l-144 -237q-25 -41 -51 -41t-26 24q0 11 8 33l100 278q13 36 60 36q70 0 70 -45z" />
+<glyph unicode="Ϗ" horiz-adv-x="1519" d="M649 1284l-57 2q-126 0 -142 -40q-6 -15 -6 -44v-636l618 588q36 34 36 67q0 61 -91 63v62q69 -6 217.5 -6t201.5 6v-62q-159 -2 -281 -118l-306 -291l391 -478q107 -131 107 -322t-130.5 -340t-330.5 -149q-121 0 -215 54q-113 64 -113 170t97 106q42 0 70.5 -28 t28.5 -70q0 -94 -100 -99q79 -78 229 -78q59 0 120 34q182 102 182 353q0 180 -103 308l-347 430l-281 -268v-359q0 -28 9 -45q17 -33 186 -33h10v-61q-71 6 -120 6h-347q-43 0 -114 -6v61q8 0 26.5 -0.5t28.5 -0.5q125 0 141 40q6 15 6 44v1066q0 27 -7 41q-16 33 -176 33 h-19v62q70 -6 119 -6h342q50 0 120 6v-62z" />
+<glyph unicode="ϐ" horiz-adv-x="1007" d="M822 736.5q125 -125.5 125 -307.5t-127 -317.5t-312 -135.5q-217 0 -340 185q-95 143 -95 381.5t77 446.5q91 247 266 361q129 84 259 84q78 0 137 -38.5t59 -113.5q0 -169 -247 -258q-180 -65 -390 -66q-51 -132 -56 -279q130 183 342 183q177 0 302 -125.5zM759 1263 q0 85 -108 85q-131 0 -235 -92t-156 -225q158 2 300 48q199 64 199 184zM785 367q0 168 -64 292q-80 157 -232 157q-122 0 -186 -108q-52 -88 -52 -237t66 -279q83 -162 234 -162q234 0 234 337z" />
+<glyph unicode="ϑ" horiz-adv-x="1206" d="M1154 706q0 -17 -15 -17q-40 0 -103 19q0 -245 -85 -456q-111 -273 -315 -273q-246 0 -325 172q-49 108 -49 387q0 39 -21 73.5t-58 34.5q-79 0 -79 -165v-8h-52v36q0 84 47.5 143.5t132 59.5t129.5 -62t45 -154v-44q0 -431 230 -431q147 0 206 260q35 152 35 362v23v81 q-184 55 -301 156q-146 125 -146 292q0 114 53 205q63 108 169 108q201 0 306 -293q74 -209 78 -464q118 -16 118 -45zM668 1445q-82 0 -131 -96q-40 -79 -40 -170q0 -264 379 -382q-1 209 -33 374q-53 274 -175 274z" />
+<glyph unicode="ϒ" horiz-adv-x="1566" d="M1499 1284q-173 0 -252 -128l-381 -619v-388q0 -34 10 -53q15 -29 90 -35h104v-61q-73 6 -127 6h-320q-55 0 -128 -6v61q8 0 25.5 -0.5t27.5 -0.5q124 0 142 36q7 14 7 43v398l-413 675q-34 56 -95 68q-21 4 -121 4v62q126 -6 299.5 -6t246.5 6v-62h-24q-112 0 -112 -48 q0 -14 13 -35l356 -581l325 529q21 34 21 58q0 77 -113 77v62q155 -6 240.5 -6t178.5 6v-62z" />
+<glyph unicode="ϓ" horiz-adv-x="1979" d="M1912 1284q-173 0 -252 -128l-381 -619v-388q0 -34 10 -53q15 -29 90 -35h104v-61q-73 6 -127 6h-320q-55 0 -128 -6v61q8 0 25.5 -0.5t27.5 -0.5q124 0 142 36q7 14 7 43v398l-413 675q-34 56 -95 68q-21 4 -121 4v62q126 -6 299.5 -6t246.5 6v-62h-24q-112 0 -112 -48 q0 -14 13 -35l356 -581l325 529q21 34 21 58q0 77 -113 77v62q155 -6 240.5 -6t178.5 6v-62zM271 1324q0 -20 -17 -48l-144 -237q-25 -41 -51 -41t-26 24q0 11 8 33l100 278q13 36 60 36q70 0 70 -45z" />
+<glyph unicode="ϔ" horiz-adv-x="1566" d="M1499 1284q-173 0 -252 -128l-381 -619v-388q0 -34 10 -53q15 -29 90 -35h104v-61q-73 6 -127 6h-320q-55 0 -128 -6v61q8 0 25.5 -0.5t27.5 -0.5q124 0 142 36q7 14 7 43v398l-413 675q-34 56 -95 68q-21 4 -121 4v62q126 -6 299.5 -6t246.5 6v-62h-24q-112 0 -112 -48 q0 -14 13 -35l356 -581l325 529q21 34 21 58q0 77 -113 77v62q155 -6 240.5 -6t178.5 6v-62zM717 1574q32 -32 32 -78.5t-32 -79t-78 -32.5t-79 33.5t-33 78t33.5 77.5t79 33t77.5 -32zM1089 1574q32 -32 32 -78.5t-32 -79t-78 -32.5t-79 33.5t-33 78t33.5 77.5t79 33 t77.5 -32z" />
+<glyph unicode="ϕ" horiz-adv-x="1201" d="M1021.5 791.5q127.5 -138.5 127.5 -318t-138.5 -329t-367.5 -166.5v-390h-84v389q-228 10 -367.5 154.5t-139.5 329.5q0 160 108.5 298t291.5 183l-3 -53q-120 -44 -181 -164q-44 -87 -50 -191q-1 -15 -1 -30q0 -146 70 -275q95 -172 272 -196v590q0 149 21 206 q38 101 162 101q152 0 279.5 -138.5zM724 859q-81 0 -81 -193v-635q174 10 263 134q72 100 78 256v24q0 142 -60 263q-75 151 -200 151z" />
+<glyph unicode="ϖ" horiz-adv-x="1666" d="M1614 823h-246q158 -113 158 -383q0 -174 -79 -307q-93 -157 -255 -157q-185 0 -278 219q-93 -219 -278 -219q-162 0 -255 157q-79 133 -79 307q0 270 158 383h-222q-57 0 -118 -41q-55 -36 -55 -40q0 -1 1 -1q-16 0 -16 16q0 39 63.5 102.5t164.5 63.5h1336v-100z M1363 462q0 274 -135 361h-628q-135 -87 -135 -361q0 -432 202 -432q135 0 224 241q-67 140 -67 261q0 199 90 199t90 -199q0 -121 -67 -261q89 -241 224 -241q202 0 202 432z" />
+<glyph unicode="ϗ" horiz-adv-x="1028" d="M976 259q0 -202 -65 -370q-83 -218 -243 -259q-41 -11 -112 -11q-14 0 -28 1h-62q-43 0 -63 -2q-87 -10 -139 -60h-44q21 142 154 177l264 43q159 44 225 203q-18 -5 -39 -5q-105 0 -150 221q-26 130 -28 307l-293 -235q-8 -293 -123 -293q-64 0 -64 96q0 206 188 352 q-5 124 -38 236q-49 163 -136 163q-80 0 -92 -161h-36v15q0 283 152 283q108 0 152 -213q26 -127 26 -300l288 232q15 281 122 281q46 0 60 -37q8 -20 8 -76q0 -171 -187 -321q6 -129 40 -243q50 -170 135 -170q80 0 92 161h36v-15z" />
+<glyph unicode="Ϙ" horiz-adv-x="1445" d="M672 79q-259 19 -431.5 210t-172.5 447.5t188 455t466.5 198.5t466.5 -198t188 -455t-172 -448t-432 -210v-74q0 -73 25 -183.5t25 -150t-28 -76.5t-73.5 -37t-70.5 43t-25 86.5t23 147.5t23 194v50zM1175 756q0 403 -266 538q-90 46 -186.5 46t-184.5 -45 q-268 -135 -268 -539q0 -436 273 -581q88 -47 177 -47t181 47q144 73 215 246q59 145 59 335z" />
+<glyph unicode="ϙ" horiz-adv-x="1054" d="M863 824.5q139 -135.5 139 -310t-125 -298t-308 -138.5v-93q0 -88 30 -192t30 -139t-28.5 -65.5t-73 -30.5t-70 36t-25.5 75.5t27.5 143.5t27.5 196v68q-183 14 -308.5 139t-125.5 299.5t138.5 309.5t335.5 135t336 -135.5zM773 261q50 81 50 268.5t-59 267.5 q-83 114 -242 114t-238 -118q-54 -78 -54 -269t58 -275q83 -119 244 -119t241 131z" />
+<glyph unicode="Ϛ" horiz-adv-x="1149" d="M1128 1370q0 -110 -109 -146q-59 -19 -200 -19h-357q-161 0 -270 -164q-98 -145 -98 -314q0 -207 144 -317q130 -101 344 -101q59 0 90 -39t31 -91v-174q0 -73 25 -183.5t25 -150t-28 -76.5t-73.5 -37t-70.5 43t-25 86.5t23 147.5t23 179t-10 100q-16 41 -66 46 q-232 23 -367 178t-135 389t116 412q133 204 345 204h405q125 0 236 75q2 -23 2 -48z" />
+<glyph unicode="ϛ" horiz-adv-x="1264" d="M601 -10l-164 -14q-174 0 -278 124.5t-104 301.5q0 240 166 380.5t410 140.5h600v-119h-592q-329 0 -451 -242q-40 -79 -40 -166q0 -120 73.5 -193.5t193.5 -73.5l163 7q99 0 162.5 -69t63.5 -169q0 -134 -92.5 -234t-228.5 -100t-136 83q0 23 22 45.5t48 22.5t79 -18.5 t82 -18.5q66 0 111 50.5t45 117.5q0 144 -133 144z" />
+<glyph unicode="Ϝ" horiz-adv-x="1216" d="M744 1281h-214q-51 0 -68.5 -13t-17.5 -66v-279h440l44 -350h-50q-25 155 -96 221.5t-248 66.5h-90v-724q0 -22 8 -39q17 -37 223 -37h22v-61q-74 6 -120 6h-382q-55 0 -127 -6v61q8 0 26 -0.5t28 -0.5q124 0 141 38q7 15 7 48v1053q0 31 -7 47q-15 35 -170 35h-25v62 h1026l55 -442h-49q-24 212 -82 285q-74 95 -274 95z" />
+<glyph unicode="ϝ" horiz-adv-x="924" d="M891 804h-412q-145 0 -205 -46t-60 -141q0 -59 22 -154h381v-119h-381v-419q0 -214 -36 -342h-148q37 173 37 311v552q0 209 95 335q107 142 309 142h398v-119z" />
+<glyph unicode="Ϟ" horiz-adv-x="910" d="M874.5 781.5q29.5 -31.5 29.5 -85t-11 -85.5l-316 -913q-48 -140 -119 -140q-86 0 -86 115q0 49 36 114l63 105q170 327 356 755h-666q-29 0 -50 21t-21 46t4 38l152 506q-6 -1 -10 -1q-93 0 -93 91q0 37 28 65.5t65.5 28.5t68 -27.5t30.5 -68.5t-15 -92l-130 -441h607 q48 0 77.5 -31.5z" />
+<glyph unicode="ϟ" horiz-adv-x="815" d="M771 465q0 -21 -21 -80l-245 -694q-47 -133 -116 -133q-87 0 -87 103q0 58 99 221q156 257 295 539h-557q-69 0 -69 70q0 15 4 23l209 418q-7 -1 -10 -1q-92 0 -92 89q0 36 28 64.5t64.5 28.5t63 -28t26.5 -73.5t-19 -83.5l-181 -364h493q115 0 115 -99z" />
+<glyph unicode="Ϡ" horiz-adv-x="1474" d="M1063 6q-110 0 -182 -6v61h6q152 0 152 54q0 10 -163 462l-140 -371q-9 -24 -9 -42q0 -51 44 -76.5t100 -26.5v-61q-182 6 -234.5 6t-152.5 -6v61h2q133 0 183 136l173 472l-166 456l-346 -919q-9 -24 -9 -42q0 -51 47.5 -76.5t104.5 -26.5v-61q-183 6 -244 6t-161 -6v61 h2q143 0 193 136l430 1172q15 42 45 42t45 -42l444 -1223q6 -20 25 -56q25 -29 135 -29h21v-61q-235 6 -345 6z" />
+<glyph unicode="ϡ" horiz-adv-x="1238" d="M1174 175q0 -158 -20 -189q-4 -7 -16 -7q-22 0 -22 57q0 205 -119 393q-166 -188 -235 -383q-26 -74 -67 -74q-37 0 -61.5 24.5t-24.5 61.5q0 136 325 459q-58 72 -134 141q-28 -36 -54 -65l-481 -543q-69 -78 -120 -78q-29 0 -55 23t-26 53.5t46 65.5q313 235 636 590 q-225 180 -504 180q-32 0 -32 23q0 11 7 16q31 20 188 20q338 0 553.5 -215t215.5 -553z" />
+<glyph unicode="Ϣ" horiz-adv-x="1686" d="M1026 -368l-212 8q-165 0 -263 -82h-44q16 123 116 170q62 29 208 41t207 19q291 33 408 304q-121 -135 -303 -135q-236 0 -296 247h-8q-60 -247 -295.5 -247t-366.5 222q-109 186 -109 438q0 345 161 546q174 218 511 227v-43q-470 -25 -470 -712q0 -626 295 -626 q94 0 156.5 99t62.5 205t-23 210.5t-23 122.5q0 125 105 125t105 -125q0 -18 -23 -122.5t-23 -210.5t62.5 -205t156.5 -99q295 0 295 626q0 687 -470 712v43q337 -9 511 -227q161 -201 161 -546q0 -306 -103 -574q-131 -344 -375 -401q-43 -10 -114 -10z" />
+<glyph unicode="ϣ" horiz-adv-x="1294" d="M1241 430q0 -723 -318 -800q-42 -10 -116 -10h-26q-27 1 -49 1q-55 0 -82 -4q-80 -11 -131 -59h-44q21 151 178 183l294 56q166 72 209 321q-92 -142 -249 -142q-224 0 -256 267h-8q-32 -267 -256 -267q-162 0 -255 152q-79 129 -79 302q0 244 124.5 385.5t365.5 144.5 v-48q-327 -10 -327 -470q0 -169 25 -257q44 -155 169 -155q99 0 149 102q39 79 39 191.5t-23 219.5t-23 122q0 116 95 116t95 -116q0 -15 -23 -122t-23 -219.5t39 -191.5q50 -102 149 -102q125 0 169 155q25 88 25 257q0 460 -327 470v48q242 -3 366 -144t124 -386z" />
+<glyph unicode="Ϥ" horiz-adv-x="1567" d="M1500 1284l-75 2q-140 0 -140 -85v-1057q0 -27 11 -48q19 -35 186 -35h18v-61q-71 6 -117 6h-373q-41 0 -112 -6v61q8 0 29 -0.5t32 -0.5q124 0 143 36q9 17 9 49v586q-43 -88 -119 -157q-185 -168 -420 -168q-196 0 -357.5 145.5t-161.5 343t132 346.5t330 149 q121 0 215 -54q113 -64 113 -170t-97 -106q-42 0 -70.5 28t-28.5 70q0 94 100 99q-79 78 -229 78q-60 0 -120 -34q-168 -95 -168 -405q0 -161 89 -291q99 -145 253 -145q220 0 392 164q147 140 147 358v219q0 32 -9 49q-15 28 -93 34h-111v62q70 -6 115 -6h376q42 0 111 6 v-62z" />
+<glyph unicode="ϥ" horiz-adv-x="1204" d="M1151 0q-193 6 -236 6t-236 -6v66l44 -1q66 0 89 13q33 18 33 79v307q-27 -44 -72 -83q-135 -119 -307 -119t-292.5 97t-120.5 257t107 252t264 92q89 0 159 -39q85 -47 85 -126t-78.5 -79t-78.5 75q0 55 61 75q-60 39 -155.5 39t-151 -83.5t-55.5 -201t67.5 -211.5 t187.5 -94q154 0 267 102.5t113 254.5v94q0 61 -33 79q-23 13 -89 13l-44 -1v66q193 -6 236 -6t236 6v-66l-44 1q-66 0 -89 -13q-33 -18 -33 -79v-609q0 -61 33 -79q23 -13 89 -13l44 1v-66z" />
+<glyph unicode="Ϧ" horiz-adv-x="1533" d="M1465 369q0 -253 -114 -482q-140 -278 -367 -278q-84 0 -246 43t-246 43q-173 0 -206 -137h-68q33 136 141 189q82 40 239 40q64 0 188 -32.5t188 -32.5q154 0 233 242q56 173 56 371q0 278 -98 486q-127 269 -373 269q-197 0 -316 -170q-32 -46 -32 -72v-707 q0 -31 8 -45q20 -36 146 -36q24 0 51 1v-61q-68 6 -115 6h-358q-42 0 -108 -6v61q42 -1 62 -1q110 0 133 36q7 11 7 41v1068q0 32 -7 45q-19 35 -157 35q-18 0 -38 -1v62q66 -6 112 -6h354q48 0 115 6v-62q-42 2 -61 2q-114 0 -136 -36q-8 -13 -8 -45v-175q157 110 348 110 q320 0 504 -231q169 -212 169 -540z" />
+<glyph unicode="ϧ" horiz-adv-x="1183" d="M1131 446q0 -294 -220 -421q-85 -49 -174 -49q-227 0 -402 286q-43 70 -100 70t-57 -64q0 -41 32 -104l-46 -26q-34 66 -34 127t46 111t114 50q113 0 206 -155q53 -88 136 -152t177 -64t149 67.5t55 166.5q0 143 -79.5 308t-189.5 289q-190 -168 -342 -168 q-204 0 -317 200q-33 58 -33 114q0 116 98.5 183.5t219.5 67.5q239 0 481 -223q54 73 84 73q12 0 12 -14q0 -30 -65 -88q249 -247 249 -585zM271 1201q-73 0 -119.5 -46.5t-46.5 -119.5q0 -111 101.5 -189t216.5 -78q135 0 292 150q-256 283 -444 283z" />
+<glyph unicode="Ϩ" horiz-adv-x="1017" d="M950 420q0 -189 -134.5 -326t-312.5 -137t-306.5 121.5t-128.5 288.5q0 131 69.5 231t191.5 150l195 66q102 35 156 84q72 67 72 175.5t-74.5 185t-183.5 76.5q-160 0 -245 -99q109 0 109 -100q0 -42 -29.5 -69.5t-71.5 -27.5q-96 0 -96 110.5t120 180.5q102 60 222 60 q159 0 270 -111.5t111 -270.5q0 -114 -61 -207t-165 -142q-48 -23 -142.5 -52t-111.5 -35q-108 -38 -156 -112t-48 -163q0 -114 97.5 -196.5t210 -82.5t204.5 60t143 159q30 58 48 177q5 32 24 32q23 0 23 -26z" />
+<glyph unicode="ϩ" horiz-adv-x="928" d="M752 832q124 -128 124 -301.5t-160 -332.5q-37 -37 -298 -238q-160 -123 -160 -200.5t74 -115.5q60 -31 140 -31q148 0 229 78q-43 1 -72 29t-29 70.5t28 70.5t71 28q98 0 98 -106.5t-112 -170.5q-94 -54 -209 -54t-208 44q-115 56 -115 153q0 113 120 224l203 174 q-178 26 -301 141t-123 285.5t114.5 275.5t288 105t297.5 -128zM662 376q68 106 68 224t-70 212t-201.5 94t-199.5 -110q-58 -91 -58 -236t86 -240.5t233 -118.5q104 114 142 175z" />
+<glyph unicode="Ϫ" horiz-adv-x="1479" d="M1091 1390q122 0 193.5 -78.5t71.5 -188.5t-33 -110q-29 0 -34 26v49q0 66 -63.5 129t-129.5 63q-168 0 -293 -209q434 -1027 434 -1049t-28 -22h-905q-24 0 -24 22q0 13 10 37l383 911q-61 184 -86 233q-74 144 -177 144q-145 0 -217 -114h6q119 0 119 -110 q0 -47 -31 -78.5t-78.5 -31.5t-78.5 32.5t-31 81.5q0 117 97 190t222.5 73t206.5 -57t141 -179q145 236 325 236zM1010 149l-302 726l-306 -726h608z" />
+<glyph unicode="ϫ" horiz-adv-x="1004" d="M894.5 906q56.5 -54 56.5 -130t-37.5 -76t-37.5 54q0 135 -119 135q-87 0 -187 -158q298 -688 298 -703q0 -28 -33 -28h-625q-31 0 -31 28q0 12 271 637q-39 118 -56 152q-48 96 -111 96q-93 0 -122 -50q75 -10 75 -91q0 -39 -26.5 -65.5t-66 -26.5t-65 27t-25.5 67 q0 85 72.5 135.5t160.5 50.5q162 0 244 -145q99 145 223 145q85 0 141.5 -54zM677 127l-188 439l-190 -439h378z" />
+<glyph unicode="Ϭ" horiz-adv-x="1695" d="M1628 1370q0 -110 -135 -146q-71 -19 -215.5 -19t-309.5 67.5t-255 67.5t-181 -53q-262 -153 -262 -591q0 -470 265 -632q92 -56 185.5 -56t187.5 55q267 156 267 633q0 137 -29 253l97 86q134 -169 134 -366q0 -284 -187.5 -498t-467 -214t-467 214.5t-187.5 498.5 t187 502t467 218q103 0 309 -23.5t309 -23.5q174 0 286 75q2 -23 2 -48z" />
+<glyph unicode="ϭ" horiz-adv-x="1177" d="M1128 950q0 -45 -66.5 -88t-191.5 -43t-233.5 46.5t-169.5 46.5q-134 0 -200 -121q-52 -96 -52 -262.5t67 -311.5q87 -187 251 -187q249 0 249 376q0 148 -43 268l88 29q42 -30 80 -94t38 -123q0 -206 -127.5 -358t-324.5 -152t-319 143.5t-122 341t126.5 348.5 t321.5 151q57 0 170 -18.5t170 -18.5q173 0 286 75q2 -24 2 -48z" />
+<glyph unicode="Ϯ" horiz-adv-x="1286" d="M944 1284l-59 2q-75 0 -103 -9q-53 -18 -53 -76v-59q197 -20 328 -105q161 -104 161 -278q0 -106 -45 -187q-55 -97 -153 -97q-42 0 -69 28.5t-27 70.5t29 69.5t71 27.5q77 0 96 -83q46 67 46 155q0 151 -146 234q-112 64 -291 79v-912q0 -27 13.5 -52t91.5 -31h110v-61 q-71 6 -117 6h-373q-41 0 -112 -6v61q8 0 27.5 -0.5t29.5 -0.5q128 0 147 36q9 17 9 49v910q-178 -15 -290 -79q-145 -83 -145 -233q0 -88 46 -155q19 83 96 83q42 0 71 -27.5t29 -69.5t-27 -70.5t-69 -28.5q-98 0 -153 97q-45 81 -45 187q0 174 160 278q130 85 327 105v59 q0 32 -9 49q-18 34 -153 34h-51v62q71 -6 115 -6h376q41 0 111 6v-62z" />
+<glyph unicode="ϯ" horiz-adv-x="970" d="M917 435q0 -62 -37.5 -119t-96.5 -57q-39 0 -68 31t-29 70t29.5 68.5t71 29.5t75.5 -37q1 11 1 18q0 223 -307 248v-530q0 -61 33 -79q23 -13 89 -13l44 1v-66q-193 6 -236 6t-236 -6v66l44 -1q66 0 89 13q33 18 33 79v530q-309 -24 -309 -248q0 -7 1 -18q34 37 75.5 37 t71 -29.5t29.5 -68.5t-29 -70t-68 -31q-59 0 -96.5 57t-37.5 119q0 145 114 228q95 70 249 84v19q0 61 -33 79q-23 13 -89 13l-44 -1v66q193 -6 236 -6t236 6v-66l-44 1q-66 0 -89 -13q-33 -18 -33 -79v-19q153 -15 248 -84q113 -83 113 -228z" />
+<glyph unicode="ϰ" horiz-adv-x="1028" d="M976 259q0 -283 -152 -283q-105 0 -150 221q-26 130 -28 307l-293 -235q-8 -293 -123 -293q-64 0 -64 96q0 206 188 352q-5 124 -38 236q-49 163 -136 163q-80 0 -92 -161h-36v15q0 283 152 283q108 0 152 -213q26 -127 26 -300l288 232q15 281 122 281q46 0 60 -37 q8 -20 8 -76q0 -171 -187 -321q6 -129 40 -243q50 -170 135 -170q80 0 92 161h36v-15z" />
+<glyph unicode="ϱ" horiz-adv-x="998" d="M52 459q0 200 126 350.5t321 150.5t320.5 -139t125.5 -340t-127.5 -353t-329.5 -152q-235 0 -360 207q32 -291 199 -376q23 -12 303 -64q166 -30 188 -185h-44q-64 61 -194 63q-181 2 -210 9q-318 80 -318 829zM782 406q0 187 -65 326q-84 180 -250 180q-134 0 -200 -121 q-52 -96 -52 -262.5t67 -311.5q87 -187 251 -187q249 0 249 376z" />
+<glyph unicode="ϲ" horiz-adv-x="920" d="M839 276q29 0 29 -22.5t-27 -74.5q-106 -203 -329 -203q-194 0 -326.5 144.5t-132.5 343t132 347.5t330 149q99 0 207 -48q131 -58 131 -141t-81 -83q-47 0 -74 56q-48 99 -52 105q-43 56 -128 56q-60 0 -120 -34q-168 -95 -168 -403t178 -404q63 -34 123 -34 q113 0 181 64q40 37 74 109.5t53 72.5z" />
+<glyph unicode="ϳ" horiz-adv-x="588" d="M385 -107q0 -133 -81 -232.5t-211 -99.5q-90 0 -159 40q-83 48 -83 132q0 42 27.5 70t69.5 28t70.5 -28t28.5 -70q0 -76 -74 -96q58 -29 114 -29q158 0 158 281v861q0 39 -9 60q-20 45 -148 45h-27v68l324 23v-1053z" />
+<glyph unicode="ϴ" horiz-adv-x="1445" d="M722 -43q-280 0 -467 214t-187 498.5t186.5 502.5t468 218t468 -217.5t186.5 -503t-187.5 -499t-467.5 -213.5zM915 1286q-92 54 -192 54t-191 -53q-250 -146 -261 -556h903q-11 410 -259 555zM535 64q91 -56 185 -56t188 55q258 151 267 608h-905q8 -450 265 -607z" />
+<glyph unicode="ϵ" horiz-adv-x="920" d="M839 276q29 0 29 -22.5t-27 -74.5q-106 -203 -329 -203q-194 0 -326.5 144.5t-132.5 343t132 347.5t330 149q99 0 207 -48q131 -58 131 -141t-81 -83q-47 0 -74 56q-48 99 -52 105q-43 56 -128 56q-60 0 -120 -34q-157 -88 -167 -371h330q59 0 59 -38.5t-59 -38.5h-330 q14 -271 177 -359q63 -34 123 -34q113 0 181 64q40 37 74 109.5t53 72.5z" />
+<glyph unicode="϶" horiz-adv-x="920" d="M406 960q198 0 330 -149t132 -347.5t-132.5 -343t-326.5 -144.5q-223 0 -329 203q-27 52 -27 74.5t29 22.5q19 0 53 -72.5t74 -109.5q68 -64 181 -64q60 0 123 34q163 88 177 359h-330q-59 0 -59 38.5t59 38.5h330q-10 283 -167 371q-60 34 -120 34q-85 0 -128 -56 q-4 -6 -52 -105q-27 -56 -74 -56q-81 0 -81 83t131 141q108 48 207 48z" />
+<glyph unicode="Ϸ" horiz-adv-x="1076" d="M736 1287l-82 2q-137 0 -159 -37q-13 -22 -13 -58v-66q1 -34 1 -47q193 -16 344 -114q180 -118 180 -293.5t-181 -293.5q-152 -99 -343 -114v-110q0 -39 7 -56q16 -40 202 -40q21 0 44 1v-61q-75 6 -154 6h-359q-80 0 -155 -6v61l81 -2q137 0 160 37q12 20 12 60v1038 q0 37 -7 54q-16 39 -225 39h-21v62q75 -6 155 -6h359q79 0 154 6v-62zM483 311q328 36 328 364t-328 362v-726z" />
+<glyph unicode="ϸ" horiz-adv-x="990" d="M493 960q194 0 319.5 -138.5t125.5 -340t-127.5 -353.5t-329.5 -152q-145 0 -245 113q0 -23 0.5 -79.5t0.5 -84.5q0 -214 -36 -342h-149q37 173 37 311v1085q-1 55 -1 82q0 214 36 342h149q-37 -173 -37 -311v-218q101 86 257 86zM775 406q0 187 -65 326 q-84 180 -250 180q-108 0 -166 -84.5t-58 -197.5v-344q0 -110 89 -183t201 -73q249 0 249 376z" />
+<glyph unicode="Ϲ" horiz-adv-x="1335" d="M1243 320q0 -11 -5 -23q-63 -157 -191.5 -248.5t-294.5 -91.5q-288 0 -486 213t-198 502.5t198.5 503.5t485.5 214q166 0 294.5 -91.5t191.5 -248.5q5 -12 5 -23q0 -24 -23 -24q-15 0 -27.5 28.5t-49.5 95.5q-132 203 -366 203q-102 0 -209 -52q-298 -145 -298 -613.5 t322 -606.5q96 -41 185 -41q234 0 366 203q20 31 52 101q10 23 25 23q23 0 23 -24z" />
+<glyph unicode="Ϻ" horiz-adv-x="2085" d="M2019 0q-242 6 -344.5 6t-175.5 -6v62h5q161 0 161 58q0 15 -4 27l-316 968l-323 -1001q-13 -39 -39.5 -39t-38.5 37l-329 1003l-296 -910q-10 -31 -10 -39q0 -53 63 -81q48 -22 109 -23v-62q-155 6 -239 6t-174 -6v62q152 0 195 132l378 1156q13 39 38.5 39t37.5 -37 l328 -1003l323 1001q13 39 39.5 39t38.5 -37l395 -1207q6 -19 23 -53q23 -30 134 -30h21v-62z" />
+<glyph unicode="ϻ" horiz-adv-x="1531" d="M656 267q-25 0 -40 41l-167 462l-199 -365q-41 -75 -41 -117.5t16.5 -110.5t16.5 -103q0 -98 -103 -98q-36 0 -61.5 26.5t-25.5 62.5q0 93 83 247l327 607q22 41 41 41q25 0 40 -41l169 -463l250 463q22 41 41 41q25 0 40 -41l234 -640q48 -131 86 -152q25 -14 116 -14 v-49q-83 -1 -195 -88h-30q-55 105 -97 221l-208 573l-252 -462q-22 -41 -41 -41z" />
+<glyph unicode="ϼ" horiz-adv-x="990" d="M184 818q107 142 305 142t323.5 -138.5t125.5 -340t-127.5 -353.5t-329.5 -152q-145 0 -245 113q0 -24 0.5 -82t0.5 -100.5t-2 -86.5h429v-100h-436q-8 -82 -27 -151h-149q17 80 26 151h-68v100h77q2 35 2 69v594q0 209 95 335zM775 406q0 187 -65 326q-84 180 -250 180 q-108 0 -166 -84.5t-58 -197.5v-344q0 -110 89 -183t201 -73q249 0 249 376z" />
+<glyph unicode="Ͻ" horiz-adv-x="1335" d="M583 1390q288 0 486 -213t198 -502.5t-199 -503.5t-485 -214q-167 0 -295.5 91.5t-190.5 248.5q-5 12 -5 23q0 24 23 24q14 0 27 -28.5t50 -95.5q132 -203 366 -203q102 0 209 52q298 145 298 613.5t-322 606.5q-96 41 -185 41q-234 0 -366 -203q-21 -31 -52 -101 q-11 -23 -25 -23q-23 0 -23 24q0 11 5 23q62 157 191 248.5t295 91.5z" />
+<glyph unicode="Ͼ" horiz-adv-x="1335" d="M1243 320q0 -11 -5 -23q-63 -157 -191.5 -248.5t-294.5 -91.5q-288 0 -486 213t-198 502.5t198.5 503.5t485.5 214q166 0 294.5 -91.5t191.5 -248.5q5 -12 5 -23q0 -24 -23 -24q-15 0 -27.5 28.5t-49.5 95.5q-132 203 -366 203q-102 0 -209 -52q-298 -145 -298 -613.5 t322 -606.5q96 -41 185 -41q234 0 366 203q20 31 52 101q10 23 25 23q23 0 23 -24zM870 672q0 -46 -32 -78t-78 -32t-78 32t-32 78t32 78t78 32t78 -32t32 -78z" />
+<glyph unicode="Ͽ" horiz-adv-x="1335" d="M583 1390q288 0 486 -213t198 -502.5t-199 -503.5t-485 -214q-167 0 -295.5 91.5t-190.5 248.5q-5 12 -5 23q0 24 23 24q14 0 27 -28.5t50 -95.5q132 -203 366 -203q102 0 209 52q298 145 298 613.5t-322 606.5q-96 41 -185 41q-234 0 -366 -203q-21 -31 -52 -101 q-11 -23 -25 -23q-23 0 -23 24q0 11 5 23q62 157 190.5 248.5t295.5 91.5zM685 675q0 -46 -32.5 -78t-78 -32t-77.5 32t-32 78t32 78t77.5 32t78 -32t32.5 -78z" />
+<glyph unicode="Ѐ" horiz-adv-x="1354" d="M68 0v61q47 -1 53 -1q125 0 142 38q7 16 7 48v1053q0 30 -7 47q-15 36 -152 36q-20 0 -43 -1v62h1108l56 -442h-49q-24 218 -99.5 299t-288.5 81h-263q-54 0 -71 -13.5t-17 -65.5v-474h178q134 0 173.5 46.5t39.5 182.5h51v-521h-51q0 136 -40 183t-173 47h-178v-526 q0 -52 17 -65.5t71 -13.5h273q236 0 326 111q67 84 107 336h49l-84 -508h-1135zM493 1532q0 28 20 51t44.5 23t43.5 -13l292 -195l-26 -50l-328 123q-46 17 -46 61z" />
+<glyph unicode="Ё" horiz-adv-x="1354" d="M68 0v61q47 -1 53 -1q125 0 142 38q7 16 7 48v1053q0 30 -7 47q-15 36 -152 36q-20 0 -43 -1v62h1108l56 -442h-49q-24 218 -99.5 299t-288.5 81h-263q-54 0 -71 -13.5t-17 -65.5v-474h178q134 0 173.5 46.5t39.5 182.5h51v-521h-51q0 136 -40 183t-173 47h-178v-526 q0 -52 17 -65.5t71 -13.5h273q236 0 326 111q67 84 107 336h49l-84 -508h-1135zM958 1574q32 -32 32 -78.5t-32 -79t-78 -32.5t-78.5 33.5t-32.5 78t33 77.5t78.5 33t77.5 -32zM585.5 1574q32.5 -32 32.5 -78.5t-32.5 -79t-78 -32.5t-78.5 33.5t-33 78t33 77.5t78.5 33 t78 -32z" />
+<glyph unicode="Ђ" horiz-adv-x="1668" d="M1503.5 711q111.5 -116 111.5 -293.5t-100 -307.5t-258 -130q-88 0 -161 47t-73 130q0 92 90.5 92t90.5 -90q0 -78 -80 -91q54 -39 129 -39q112 0 163 138q36 96 36 242t-74.5 257.5t-224.5 111.5q-100 0 -230 -87t-130 -182v-353q0 -40 10 -58q18 -33 114 -33q19 0 41 1 v-66q-199 6 -249.5 6t-256.5 -6v66q28 -1 71.5 -1t69 16.5t25.5 80.5v1055q0 64 -109 64t-189.5 -9.5t-126.5 -52.5t-65 -141h-46l22 264h1206l22 -264h-47q-20 102 -67 144t-151 53q-60 6 -179 6q-95 0 -95 -65v-571q152 182 408 182q191 0 302.5 -116z" />
+<glyph unicode="Ѓ" horiz-adv-x="1216" d="M744 1281h-214q-51 0 -68.5 -13t-17.5 -66v-1065q0 -22 8 -39q17 -37 223 -37h22v-61q-74 6 -120 6h-382q-55 0 -127 -6v61q8 0 26 -0.5t28 -0.5q124 0 141 38q7 15 7 48v1053q0 31 -7 47q-15 35 -170 35h-25v62h1026l55 -442h-49q-24 212 -82 285q-74 95 -274 95z M893 1532q0 -44 -46 -61l-328 -123l-26 50l292 195q19 13 43.5 13t44.5 -23t20 -51z" />
+<glyph unicode="Є" horiz-adv-x="1335" d="M1266 934q0 -26 -28.5 -26t-35.5 32q-34 154 -155 271t-272 117q-105 0 -207 -50q-263 -129 -294 -510q144 95 274 95t224 -58l143 -108q80 -58 165 -58q53 0 105.5 30.5t48.5 30.5q19 0 19 -26t-31 -51q-111 -90 -214.5 -90t-179.5 67q-177 155 -355 155 q-122 0 -202 -45l-1 -38v-19q0 -454 322 -595q94 -41 185 -41q179 0 309 130q55 56 77 101.5t47 135.5q8 29 23 29q27 0 27 -22q0 -6 -2 -17q-35 -180 -178.5 -298.5t-327.5 -118.5q-288 0 -486 213t-198 502.5t198.5 503.5t485.5 214q193 0 363 -169l99 144q17 25 31 25 q21 0 21 -33v-423z" />
+<glyph unicode="Ѕ" horiz-adv-x="1007" d="M860.5 616.5q79.5 -107.5 79.5 -262.5t-110.5 -276t-277.5 -121q-236 0 -362 137l-72 -111q-16 -26 -30 -26q-20 0 -20 29v431q0 29 24 29q30 0 30 -72q0 -143 117 -250t311 -107q114 0 189 84t75 192.5t-59 184.5t-170 104q-88 17 -260 65q-116 42 -186.5 140t-70.5 221 q0 160 111 271t278 111t309 -139l69 112q17 27 29 27q24 0 24 -33v-429q0 -28 -28 -28q-18 0 -23 22q-7 41 -25 122q-81 290 -360 290q-109 0 -183.5 -74.5t-74.5 -183.5q0 -189 199 -250q85 -19 252 -62q136 -40 215.5 -147.5z" />
+<glyph unicode="І" horiz-adv-x="736" d="M670 1284l-59 2q-75 0 -103 -9q-53 -18 -53 -76v-1057q0 -27 13.5 -52t91.5 -31h110v-61q-71 6 -117 6h-373q-41 0 -112 -6v61q8 0 27.5 -0.5t29.5 -0.5q128 0 147 36q9 17 9 49v1056q0 32 -9 49q-18 34 -153 34h-51v62q71 -6 115 -6h376q41 0 111 6v-62z" />
+<glyph unicode="Ї" horiz-adv-x="736" d="M670 1284l-59 2q-75 0 -103 -9q-53 -18 -53 -76v-1057q0 -27 13.5 -52t91.5 -31h110v-61q-71 6 -117 6h-373q-41 0 -112 -6v61q8 0 27.5 -0.5t29.5 -0.5q128 0 147 36q9 17 9 49v1056q0 32 -9 49q-18 34 -153 34h-51v62q71 -6 115 -6h376q41 0 111 6v-62zM629 1574 q32 -32 32 -78.5t-32 -79t-78 -32.5t-78.5 33.5t-32.5 78t33 77.5t78.5 33t77.5 -32zM256.5 1574q32.5 -32 32.5 -78.5t-32.5 -79t-78 -32.5t-78.5 33.5t-33 78t33 77.5t78.5 33t78 -32z" />
+<glyph unicode="Ј" horiz-adv-x="970" d="M752 284q0 -141 -112.5 -234t-245 -93t-229.5 73t-97 190q0 49 30.5 81.5t78.5 32.5t79 -31.5t31 -78.5q0 -110 -121 -110h-4q71 -114 217 -114q99 0 156 101q47 83 47 190v910q0 29 -9 47q-19 36 -223 36h-32v62q78 -6 161 -6h221q73 0 203 6v-62l-42 2q-60 0 -85 -14 t-25 -69z" />
+<glyph unicode="Љ" horiz-adv-x="2095" d="M1478 1281l-59 2q-76 0 -103 -9q-53 -18 -53 -76v-477h256q188 0 334 -85q174 -101 174 -269t-135.5 -267.5t-302.5 -99.5h-703v61q8 0 27.5 -0.5t29.5 -0.5q128 0 147 36q9 17 9 49v1053q0 32 -9 49q-18 34 -153 34h-67q-188 0 -215 -35q-11 -14 -11 -63 q0 -227 -12 -426q-46 -757 -354 -757q-86 0 -148 60t-62 146q0 45 30 76t74 31t74 -30t30 -75q0 -81 -77 -102q31 -14 75 -14q200 0 256 520q21 195 21 511q0 113 -13 132q-18 27 -187 27v61h1127v-62zM1743 147q88 86 88 221t-87 222t-210 87h-271v-537q0 -53 16.5 -66 t69.5 -13h177q129 0 217 86z" />
+<glyph unicode="Њ" horiz-adv-x="2041" d="M1424 1284l-59 2q-76 0 -103 -9q-53 -18 -53 -76v-480h256q188 0 334 -85q174 -101 174 -269t-135.5 -267.5t-302.5 -99.5h-703v61q9 0 28 -0.5t29 -0.5q119 0 137 36q8 16 8 45v530h-590v-530q0 -29 8 -45q18 -35 187 -35h10v-61q-71 6 -115 6h-358q-37 0 -108 -6v61 q9 0 27.5 -0.5t28.5 -0.5q121 0 139 36q7 14 7 45v1064q0 31 -7 45q-17 34 -149 34h-46v62q70 -6 112 -6h354q45 0 115 6v-62l-55 2q-123 0 -142 -36q-8 -16 -8 -45v-474h590v474q0 29 -8 45q-17 34 -148 34h-46v62q70 -6 112 -6h367q43 0 113 6v-62zM1689 147q88 86 88 221 t-87 222t-210 87h-271v-537q0 -53 16.5 -66t69.5 -13h177q129 0 217 86z" />
+<glyph unicode="Ћ" horiz-adv-x="1647" d="M1595 0q-199 6 -238 6t-244 -6v66q28 -1 69.5 -1t64.5 12q33 19 33 76v429q0 95 -44 161t-134 66q-130 0 -219.5 -105.5t-89.5 -237.5v-310q0 -40 10 -58q18 -33 114 -33q19 0 41 1v-66q-199 6 -249.5 6t-256.5 -6v66q28 -1 71.5 -1t69 16.5t25.5 80.5v1055q0 64 -109 64 t-189.5 -9.5t-126.5 -52.5t-65 -141h-46l22 264h1206l22 -264h-47q-20 102 -67 144t-151 53q-60 6 -179 6q-95 0 -95 -65v-552q43 86 134 139t189 53q312 0 312 -314v-412q0 -65 130 -65q17 0 37 1v-66z" />
+<glyph unicode="Ќ" horiz-adv-x="1514" d="M649 1284l-57 2q-126 0 -142 -40q-6 -15 -6 -44v-447q324 0 480 158q72 73 163 294q65 158 167 158q53 0 92 -41t39 -95q0 -92 -90 -92q-39 0 -65 25.5t-26 56.5t10 53q-41 -17 -97.5 -159.5t-116.5 -215.5q-106 -130 -287 -165v-8q116 -16 221 -77.5t151 -157.5 q25 -54 39 -150l25 -181q30 -158 118 -158q99 0 131 175q6 31 24 31q24 0 24 -33q0 -86 -51.5 -151t-134.5 -65q-330 0 -330 318q0 13 1 40v40q0 136 -83 239.5t-216 103.5h-188v-559q0 -28 9 -45q17 -33 186 -33h10v-61q-71 6 -120 6h-347q-43 0 -114 -6v61q8 0 26.5 -0.5 t28.5 -0.5q125 0 141 40q6 15 6 44v1066q0 27 -7 41q-16 33 -176 33h-19v62q70 -6 119 -6h342q50 0 120 6v-62zM1093 1532q0 -44 -46 -61l-328 -123l-26 50l292 195q19 13 43.5 13t44.5 -23t20 -51z" />
+<glyph unicode="Ѝ" horiz-adv-x="1631" d="M1564 1284l-56 2q-122 0 -140 -36q-8 -16 -8 -45v-1064q0 -29 8 -45q18 -35 186 -35h10v-61q-71 6 -113 6h-361q-36 0 -107 -6v61q9 0 28 -0.5t29 -0.5q119 0 137 36q8 16 8 45v964l-734 -1008l1 -1q14 -30 90 -35q3 0 30 -0.5t77 0.5v-61q-71 6 -115 6h-358 q-37 0 -108 -6v61q9 0 27.5 -0.5t28.5 -0.5q121 0 139 36q7 14 7 45v1064q0 31 -7 45q-17 34 -149 34h-46v62q70 -6 112 -6h354q45 0 115 6v-62l-55 2q-123 0 -142 -36q-8 -16 -8 -45v-967l734 1009q-15 37 -149 37h-46v62q70 -6 112 -6h356q43 0 113 6v-62zM563 1532 q0 28 20 51t44.5 23t43.5 -13l292 -195l-26 -50l-328 123q-46 17 -46 61z" />
+<glyph unicode="Ў" horiz-adv-x="1591" d="M441 -20q-135 0 -214.5 72.5t-79.5 206.5q0 106 99 106q42 0 69.5 -27t27.5 -69.5t-28 -70t-71 -27.5q-14 0 -35 5q20 -70 87 -106t149.5 -36t168.5 135q53 83 136 234l-466 798q-10 19 -37 52q-33 29 -170 29h-9v64q196 -6 246 -6t234 6v-64h-4q-91 0 -91 -41 q0 -14 18 -45l371 -636l345 590q23 39 23 65q0 65 -73 67v64q183 -6 233.5 -6t152.5 6v-64q-171 -2 -248 -134l-550 -940q-133 -228 -284 -228zM1203 1516q0 -85 -140 -130q-101 -33 -211 -33t-211 33q-140 45 -140 130q0 39 25 64.5t64 25.5t64 -25.5t25 -70.5t-38 -70 q63 -24 174 -24h74q111 0 174 24q-38 25 -38 70t25 70.5t64 25.5t64 -25.5t25 -64.5z" />
+<glyph unicode="Џ" horiz-adv-x="1481" d="M1413 0h-579q-30 -148 -36 -287h-115q-6 139 -36 287h-579v62h106q77 6 90 38q6 15 6 41v1062q0 52 -39 69q-25 11 -85 11h-78v61q71 -6 108 -6h360q42 0 113 6v-61q-49 1 -76 1t-33 -1q-77 -7 -90 -39q-6 -15 -6 -41v-1141h590v1141q0 52 -39 69q-25 11 -85 11h-78v61 q71 -6 107 -6h361q42 0 113 6v-61q-49 1 -76 1t-32 -1q-77 -7 -90 -39q-6 -15 -6 -41v-1062q0 -27 6 -41q16 -39 137 -39h31q22 1 30 1v-62z" />
+<glyph unicode="А" horiz-adv-x="1484" d="M1417 0q-127 6 -297.5 6t-244.5 -6v61h5q157 0 157 59q0 29 -39 136l-70 192h-487l-61 -163q-34 -90 -34 -123q0 -51 52 -78q42 -23 97 -23v-61q-189 6 -239.5 6t-187.5 -6v61q174 2 219 133l409 1177q14 40 46 40t46 -40l425 -1231q21 -61 84 -75q19 -5 77 -5q19 0 43 1 v-61zM906 510l-222 641l-220 -641h442z" />
+<glyph unicode="Б" horiz-adv-x="1346" d="M1104 636q174 -101 174 -269t-135.5 -267.5t-302.5 -99.5h-772v61q62 -2 63 -2q113 0 134 45q5 11 5 42v1053q0 31 -7 47q-15 35 -170 35h-25v62h1016l55 -442h-49q-24 212 -82 285q-74 95 -274 95h-214q-51 0 -68.5 -13.5t-17.5 -65.5v-481h336q188 0 334 -85zM994 147 q88 86 88 221t-87 222t-210 87h-351v-537q0 -53 16.5 -66t69.5 -13h257q129 0 217 86z" />
+<glyph unicode="В" horiz-adv-x="1346" d="M1278 360q0 -161 -135.5 -260.5t-302.5 -99.5h-772v61q62 -2 63 -2q113 0 134 45q5 11 5 42v1051q0 31 -5 42q-19 43 -152 43q-21 0 -45 -1v62h720q161 0 290 -83q148 -95 148 -247q0 -120 -98.5 -203t-227.5 -108q147 -16 262.5 -109t115.5 -233zM720 721q130 0 222 82 t92 202.5t-73 198t-186 77.5h-255q-53 0 -69.5 -13t-16.5 -66v-481h286zM994 147q88 86 88 214t-76.5 222t-200.5 94h-371v-537q0 -53 16.5 -66t69.5 -13h257q129 0 217 86z" />
+<glyph unicode="Г" horiz-adv-x="1216" d="M744 1281h-214q-51 0 -68.5 -13t-17.5 -66v-1065q0 -22 8 -39q17 -37 223 -37h22v-61q-74 6 -120 6h-382q-55 0 -127 -6v61q8 0 26 -0.5t28 -0.5q124 0 141 38q7 15 7 48v1053q0 31 -7 47q-15 35 -170 35h-25v62h1026l55 -442h-49q-24 212 -82 285q-74 95 -274 95z" />
+<glyph unicode="Д" horiz-adv-x="1580" d="M1514 1281l-59 2q-75 0 -103 -9q-53 -18 -53 -76v-1054q0 -27 13.5 -52t92.5 -31h109q0 -81 9 -111q17 -57 76 -72q-77 0 -197 61t-197 61h-888q-81 0 -175 -61t-168 -61h-5v2q54 12 71 73q8 32 8 108q166 0 198 12q63 22 124 141q236 457 236 990q0 39 -14 53.5t-48 19 t-138 4.5v62h1108v-62zM1125 161v1014q0 44 -8 59q-25 47 -204 47t-205 -49q-9 -17 -11 -85q-5 -193 -52.5 -425.5t-142.5 -434.5l-80 -153q-4 -8 -4 -20q0 -35 56.5 -44t247.5 -9q276 0 331 12t66 37q6 13 6 51z" />
+<glyph unicode="Е" horiz-adv-x="1354" d="M68 0v61q47 -1 53 -1q125 0 142 38q7 16 7 48v1053q0 30 -7 47q-15 36 -152 36q-20 0 -43 -1v62h1108l56 -442h-49q-24 218 -99.5 299t-288.5 81h-263q-54 0 -71 -13.5t-17 -65.5v-474h178q134 0 173.5 46.5t39.5 182.5h51v-521h-51q0 136 -40 183t-173 47h-178v-526 q0 -52 17 -65.5t71 -13.5h273q236 0 326 111q67 84 107 336h49l-84 -508h-1135z" />
+<glyph unicode="Ж" horiz-adv-x="2214" d="M1399 1284l-57 2q-126 0 -142 -40q-6 -15 -6 -44v-447q289 8 434 167q62 67 159 289q67 154 167 154q53 0 92 -41t39 -95q0 -92 -90 -92q-39 0 -65 25.5t-26 56.5t10 53q-41 -17 -97.5 -159.5t-116.5 -215.5q-106 -130 -287 -165v-8q116 -16 221 -77t151 -158 q25 -54 39 -150l25 -181q30 -158 118 -158q99 0 131 175q6 31 24 31q24 0 24 -33q0 -86 -51.5 -151t-134.5 -65q-330 0 -330 318q0 13 1 40v40q0 136 -83 239.5t-216 103.5h-138v-559q0 -28 9 -45q17 -33 186 -33h10v-61q-71 6 -120 6h-344q-49 0 -120 -6v61h10 q169 0 186 33q9 17 9 45v559h-138q-133 0 -216 -103.5t-83 -239.5q0 -13 0.5 -40t0.5 -40q0 -318 -330 -318q-83 0 -134.5 65t-51.5 151q0 33 24 33q18 0 24 -31q32 -175 131 -175q88 0 118 158l23 169q16 108 41 162q46 97 151 158t221 77v8q-181 35 -287 165 q-60 73 -116.5 215.5t-97.5 159.5q10 -22 10 -53t-26 -56.5t-65 -25.5q-90 0 -90 92q0 54 39 95t92 41q100 0 167 -154q97 -222 159 -289q145 -159 434 -167v447q0 29 -6 44q-16 40 -142 40l-57 -2v62q70 -6 120 -6h344q50 0 120 6v-62z" />
+<glyph unicode="З" horiz-adv-x="1244" d="M1176 359q0 -85 -50 -164q-77 -122 -218.5 -180t-302.5 -58q-258 0 -386 70q-78 -70 -98 -70q-33 0 -34 33l-12 275q-1 32 41 32q22 0 26.5 -6t11.5 -51t26 -79q80 -144 421 -144q160 0 260 93t100 250t-98.5 247t-255.5 90h-117q-77 -1 -115.5 -1t-38.5 30q0 16 13 22.5 t170.5 18t256.5 77.5q150 100 150 257q0 111 -103 174q-87 53 -225.5 53t-242.5 -62.5t-130 -138.5q-4 -20 -17 -58q-10 -20 -35 -20q-41 0 -39 46l9 246q2 49 35 49q26 0 112 -85q136 85 318 85t326 -64q185 -82 185 -227q0 -261 -386 -360q172 -25 295 -115 q148 -108 148 -265z" />
+<glyph unicode="И" horiz-adv-x="1631" d="M1564 1284l-56 2q-122 0 -140 -36q-8 -16 -8 -45v-1064q0 -29 8 -45q18 -35 186 -35h10v-61q-71 6 -113 6h-361q-36 0 -107 -6v61q9 0 28 -0.5t29 -0.5q119 0 137 36q8 16 8 45v964l-734 -1008l1 -1q14 -30 90 -35q3 0 30 -0.5t77 0.5v-61q-71 6 -115 6h-358 q-37 0 -108 -6v61q9 0 27.5 -0.5t28.5 -0.5q121 0 139 36q7 14 7 45v1064q0 31 -7 45q-17 34 -149 34h-46v62q70 -6 112 -6h354q45 0 115 6v-62l-55 2q-123 0 -142 -36q-8 -16 -8 -45v-967l734 1009q-15 37 -149 37h-46v62q70 -6 112 -6h356q43 0 113 6v-62z" />
+<glyph unicode="Й" horiz-adv-x="1631" d="M1564 1284l-56 2q-122 0 -140 -36q-8 -16 -8 -45v-1064q0 -29 8 -45q18 -35 186 -35h10v-61q-71 6 -113 6h-361q-36 0 -107 -6v61q9 0 28 -0.5t29 -0.5q119 0 137 36q8 16 8 45v964l-734 -1008l1 -1q14 -30 90 -35q3 0 30 -0.5t77 0.5v-61q-71 6 -115 6h-358 q-37 0 -108 -6v61q9 0 27.5 -0.5t28.5 -0.5q121 0 139 36q7 14 7 45v1064q0 31 -7 45q-17 34 -149 34h-46v62q70 -6 112 -6h354q45 0 115 6v-62l-55 2q-123 0 -142 -36q-8 -16 -8 -45v-967l734 1009q-15 37 -149 37h-46v62q70 -6 112 -6h356q43 0 113 6v-62zM1163 1516 q0 -85 -140 -130q-101 -33 -211 -33t-211 33q-140 45 -140 130q0 39 25 64.5t64 25.5t64 -25.5t25 -70.5t-38 -70q63 -24 174 -24h74q111 0 174 24q-38 25 -38 70t25 70.5t64 25.5t64 -25.5t25 -64.5z" />
+<glyph unicode="К" horiz-adv-x="1514" d="M649 1284l-57 2q-126 0 -142 -40q-6 -15 -6 -44v-447q324 0 480 158q72 73 163 294q65 158 167 158q53 0 92 -41t39 -95q0 -92 -90 -92q-39 0 -65 25.5t-26 56.5t10 53q-41 -17 -97.5 -159.5t-116.5 -215.5q-106 -130 -287 -165v-8q116 -16 221 -77.5t151 -157.5 q25 -54 39 -150l25 -181q30 -158 118 -158q99 0 131 175q6 31 24 31q24 0 24 -33q0 -86 -51.5 -151t-134.5 -65q-330 0 -330 318q0 13 1 40v40q0 136 -83 239.5t-216 103.5h-188v-559q0 -28 9 -45q17 -33 186 -33h10v-61q-71 6 -120 6h-347q-43 0 -114 -6v61q8 0 26.5 -0.5 t28.5 -0.5q125 0 141 40q6 15 6 44v1066q0 27 -7 41q-16 33 -176 33h-19v62q70 -6 119 -6h342q50 0 120 6v-62z" />
+<glyph unicode="Л" horiz-adv-x="1554" d="M1488 1281l-59 2q-76 0 -103 -9q-53 -18 -53 -76v-1054q0 -27 13.5 -52t91.5 -31h110v-61q-71 6 -117 6h-373q-41 0 -112 -6v61q8 0 27.5 -0.5t29.5 -0.5q128 0 147 36q9 17 9 49v1053q0 32 -9 49q-18 34 -153 34h-67q-188 0 -215 -35q-11 -14 -11 -63q0 -227 -12 -426 q-46 -757 -354 -757q-86 0 -148 60t-62 146q0 45 30 76t74 31t74 -30t30 -75q0 -81 -77 -102q31 -14 75 -14q200 0 256 520q21 195 21 511q0 113 -13 132q-18 27 -187 27v61h1137v-62z" />
+<glyph unicode="М" horiz-adv-x="1793" d="M1726 1281l-56 2q-125 0 -141 -41q-6 -15 -6 -45v-1058q0 -26 8 -43q17 -35 185 -35h10v-61q-75 6 -119 6h-334q-38 0 -113 -6v61h76q63 0 87 10q40 17 40 70v1140h-2l-483 -1245q-14 -36 -36 -36t-39 43l-476 1222h-2v-1064q0 -140 200 -140h3v-61q-209 6 -229 6 t-231 -6v61h3q199 0 199 140v1003q0 22 -6 38q-12 32 -89 39q-6 1 -32.5 1t-74.5 -1v62h341q45 0 61 -42l428 -1102l430 1108q14 36 49 36h349v-62z" />
+<glyph unicode="Н" horiz-adv-x="1480" d="M1413 1284l-56 2q-122 0 -140 -36q-8 -16 -8 -45v-1064q0 -29 8 -45q18 -35 186 -35h10v-61q-71 6 -113 6h-361q-36 0 -107 -6v61q9 0 28 -0.5t29 -0.5q119 0 137 36q8 16 8 45v530h-590v-530q0 -29 8 -45q18 -35 187 -35h10v-61q-71 6 -115 6h-358q-37 0 -108 -6v61 q9 0 27.5 -0.5t28.5 -0.5q121 0 139 36q7 14 7 45v1064q0 31 -7 45q-17 34 -149 34h-46v62q70 -6 112 -6h354q45 0 115 6v-62l-55 2q-123 0 -142 -36q-8 -16 -8 -45v-474h590v474q0 29 -8 45q-17 34 -148 34h-46v62q70 -6 112 -6h356q43 0 113 6v-62z" />
+<glyph unicode="О" horiz-adv-x="1445" d="M722 -43q-280 0 -467 214t-187 498.5t186.5 502.5t468 218t468 -217.5t186.5 -503t-187.5 -499t-467.5 -213.5zM1175 696q0 438 -260 590q-92 54 -192 54t-191 -53q-262 -153 -262 -591q0 -469 265 -632q91 -56 185 -56t188 55q267 156 267 633z" />
+<glyph unicode="П" horiz-adv-x="1480" d="M1300 6h-361q-36 0 -107 -6v61h78q60 0 85 11q39 17 39 69v1141h-590v-1141q0 -26 6 -41q13 -32 90 -39q6 0 33 -0.5t76 0.5v-61q-71 6 -113 6h-360q-37 0 -108 -6v61h78q60 0 85 11q39 17 39 69v1062q0 26 -6 41q-13 32 -90 38h-106v62h1345v-62q-8 0 -29 0.5t-32 0.5 q-121 0 -137 -39q-6 -14 -6 -41v-1062q0 -26 6 -41q13 -32 90 -39q5 0 32 -0.5t76 0.5v-61q-71 6 -113 6z" />
+<glyph unicode="Р" horiz-adv-x="1295" d="M1074 1249q154 -106 154 -268t-142 -262t-307 -100h-335v-473q0 -32 7 -48q17 -37 181 -37h17v-61q-72 6 -133 6h-326q-50 0 -122 -6v61l55 -1q122 0 140 38q7 15 7 48v1051q0 32 -7 48q-16 37 -158 37q-18 0 -37 -1v62h695q174 0 311 -94zM1024 977q0 161 -75.5 232.5 t-237.5 71.5h-186q-53 0 -69.5 -13t-16.5 -66v-532h272q313 0 313 307z" />
+<glyph unicode="С" horiz-adv-x="1335" d="M1267 854q0 -26 -29 -26t-35 32q-12 60 -47 178q-51 127 -151 208.5t-217 81.5t-220 -50q-298 -145 -298 -613.5t322 -606.5q96 -41 185 -41q140 0 256 85t159 218q17 52 27 140q4 33 23 33q24 0 24 -35q0 -205 -154 -353t-360 -148q-288 0 -486 213t-198 502.5 t198.5 503.5t485.5 214q193 0 363 -169l99 144q17 25 31 25q22 0 22 -33v-503z" />
+<glyph unicode="Т" horiz-adv-x="1413" d="M878 1282q-46 0 -65.5 -11.5t-19.5 -53.5v-1071q0 -25 10 -47q18 -38 243 -38h34v-61q-84 6 -154 6h-439q-71 0 -155 -6v61q9 0 35.5 -0.5t40.5 -0.5q184 0 202 39q8 17 8 47v1072q0 43 -29 56q-17 8 -66 8q-256 0 -321 -62.5t-86 -318.5h-48l36 442h1206l36 -442h-49 q-22 262 -88.5 321.5t-330.5 59.5z" />
+<glyph unicode="У" horiz-adv-x="1591" d="M441 -20q-135 0 -214.5 72.5t-79.5 206.5q0 106 99 106q42 0 69.5 -27t27.5 -69.5t-28 -70t-71 -27.5q-14 0 -35 5q20 -70 87 -106t149.5 -36t168.5 135q53 83 136 234l-466 798q-10 19 -37 52q-33 29 -170 29h-9v64q196 -6 246 -6t234 6v-64h-4q-91 0 -91 -41 q0 -14 18 -45l371 -636l345 590q23 39 23 65q0 65 -73 67v64q183 -6 233.5 -6t152.5 6v-64q-171 -2 -248 -134l-550 -940q-133 -228 -284 -228z" />
+<glyph unicode="Ф" horiz-adv-x="1394" d="M1025 1287l-82 2q-135 0 -157 -37q-14 -23 -14 -76v-81q215 -21 368 -118q186 -118 186 -304t-186 -303q-153 -97 -368 -117v-97q0 -39 7 -56q16 -40 202 -40q21 0 44 1v-61q-75 6 -154 6h-359q-80 0 -155 -6v61l81 -2q136 0 158 37q14 23 14 75v82q-210 21 -361 120 q-181 118 -181 300.5t181 300.5q152 99 361 121v99q0 37 -7 54q-16 39 -225 39h-21v62q75 -6 155 -6h359q79 0 154 6v-62zM1130 674q0 339 -358 376v-753q164 13 261 110t97 267zM610 1050q-347 -40 -347 -375.5t347 -375.5v751z" />
+<glyph unicode="Х" horiz-adv-x="1518" d="M1450 0q-127 6 -299 6t-244 -6v61q128 5 128 59q0 10 -320 493l-281 -414q-19 -28 -19 -48q0 -43 38.5 -66t84.5 -24v-61q-74 6 -165 6t-305 -6v61q196 0 285 131l323 477l-362 547q-34 51 -99 64q-24 4 -81 4h-41v62q112 -6 292.5 -6t251.5 6v-62q-128 -5 -128 -58 q0 -13 268 -410l225 333q17 25 17 46q0 43 -37.5 65.5t-83.5 23.5v62q81 -6 163.5 -6t306.5 6v-62q-198 -2 -285 -128l-271 -395l416 -629q35 -53 99 -66q25 -5 85 -5h38v-61z" />
+<glyph unicode="Ц" horiz-adv-x="1481" d="M1077 0h-1009v62h106q77 6 90 38q6 15 6 41v1062q0 52 -39 69q-25 11 -85 11h-78v61q71 -6 108 -6h360q42 0 113 6v-61q-49 1 -76 1t-33 -1q-77 -7 -90 -39q-6 -15 -6 -41v-1141h590v1141q0 52 -39 69q-25 11 -85 11h-78v61q71 -6 107 -6h361q42 0 113 6v-61q-49 1 -76 1 t-32 -1q-77 -7 -90 -39q-6 -15 -6 -41v-998q0 -69 14 -97q23 -47 173 -47h24q0 -12 -0.5 -39t-0.5 -40q0 -312 87 -376q-68 13 -125 92q-15 20 -73.5 125.5t-100 141t-130.5 35.5z" />
+<glyph unicode="Ч" horiz-adv-x="1601" d="M1535 1284l-59 2q-75 0 -103 -9q-53 -18 -53 -76v-1057q0 -27 13.5 -52t91.5 -31h110v-61q-71 6 -117 6h-373q-41 0 -112 -6v61q8 0 27.5 -0.5t29.5 -0.5q128 0 147 36q9 17 9 49v545q-190 -218 -438 -218q-187 0 -312.5 111t-125.5 298v327q0 30 -7 43q-18 34 -156 34 q-19 0 -39 -1v62q73 -6 156 -6h270q84 0 156 6v-62q-48 1 -60 1q-118 0 -136 -34q-9 -17 -9 -51v-319q0 -149 90.5 -232t237.5 -83q208 0 373 205v430q0 32 -9 49q-18 34 -153 34h-51v62q71 -6 115 -6h376q41 0 111 6v-62z" />
+<glyph unicode="Ш" horiz-adv-x="2161" d="M2093 0h-2025v62h96q67 6 80 38q6 15 6 41v1062q0 52 -39 69q-25 11 -85 11h-58v61q71 -6 88 -6h350q32 0 103 6v-61q-45 1 -70 1t-29 -1q-67 -6 -80 -39q-6 -15 -6 -41v-1141h459q76 0 91 38q6 15 6 41v1062q0 52 -39 69q-25 11 -85 11h-58v61q71 -6 87 -6h341 q42 0 113 6v-61q-44 1 -69 1t-29 -1q-67 -6 -80 -39q-6 -15 -6 -41v-1062q0 -27 6 -41q16 -38 94 -38h459v1141q0 52 -39 69q-25 11 -85 11h-58v61q71 -6 87 -6h351q32 0 103 6v-61q-44 1 -69 1t-29 -1q-67 -6 -80 -39q-6 -15 -6 -41v-1062q0 -27 6 -41q16 -39 137 -39h31 q22 1 30 1v-62z" />
+<glyph unicode="Щ" horiz-adv-x="2161" d="M1757 0h-1689v62h96q67 6 80 38q6 15 6 41v1062q0 52 -39 69q-25 11 -85 11h-58v61q71 -6 88 -6h350q32 0 103 6v-61q-45 1 -70 1t-29 -1q-67 -6 -80 -39q-6 -15 -6 -41v-1141h459q76 0 91 38q6 15 6 41v1062q0 52 -39 69q-25 11 -85 11h-58v61q71 -6 87 -6h341 q42 0 113 6v-61q-44 1 -69 1t-29 -1q-67 -6 -80 -39q-6 -15 -6 -41v-1062q0 -27 6 -41q16 -38 94 -38h459v1141q0 52 -39 69q-25 11 -85 11h-58v61q71 -6 87 -6h351q32 0 103 6v-61q-44 1 -69 1t-29 -1q-67 -6 -80 -39q-6 -15 -6 -41v-998q0 -69 14 -97q23 -47 173 -47h24 q0 -12 -0.5 -39t-0.5 -40q0 -312 87 -376q-68 13 -125 92q-15 20 -73.5 125.5t-100 141t-130.5 35.5z" />
+<glyph unicode="Ъ" horiz-adv-x="1736" d="M1039 1281l-59 2q-76 0 -103 -9q-53 -18 -53 -76v-477h336q188 0 334 -85q174 -101 174 -269t-135.5 -267.5t-302.5 -99.5h-772v61q62 -2 63 -2q113 0 134 45q5 11 5 42v1056q0 52 -17.5 65.5t-68.5 13.5h-101q-200 0 -274 -95q-58 -73 -82 -285h-49l55 442h916v-62z M1384 147q88 86 88 221t-87 222t-210 87h-351v-537q0 -53 16.5 -66t69.5 -13h257q129 0 217 86z" />
+<glyph unicode="Ы" horiz-adv-x="1986" d="M649 1284l-59 2q-76 0 -103 -9q-53 -18 -53 -76v-480h336q188 0 334 -85q174 -101 174 -269t-135.5 -267.5t-302.5 -99.5h-772v61q62 -2 63 -2q113 0 134 45q5 11 5 42v1055q0 32 -9 49q-18 34 -153 34h-40v62q71 -6 115 -6h355q41 0 111 6v-62zM994 147q88 86 88 221 t-87 222t-210 87h-351v-537q0 -53 16.5 -66t69.5 -13h257q129 0 217 86zM1920 1284l-59 2q-75 0 -103 -9q-53 -18 -53 -76v-1057q0 -27 13.5 -52t91.5 -31h110v-61q-71 6 -117 6h-373q-41 0 -112 -6v61q8 0 27.5 -0.5t29.5 -0.5q128 0 147 36q9 17 9 49v1056q0 32 -9 49 q-18 34 -153 34h-51v62q71 -6 115 -6h376q41 0 111 6v-62z" />
+<glyph unicode="Ь" horiz-adv-x="1346" d="M649 1284l-59 2q-76 0 -103 -9q-53 -18 -53 -76v-480h336q188 0 334 -85q174 -101 174 -269t-135.5 -267.5t-302.5 -99.5h-772v61q62 -2 63 -2q113 0 134 45q5 11 5 42v1055q0 32 -9 49q-18 34 -153 34h-40v62q71 -6 115 -6h355q41 0 111 6v-62zM994 147q88 86 88 221 t-87 222t-210 87h-351v-537q0 -53 16.5 -66t69.5 -13h257q129 0 217 86z" />
+<glyph unicode="Э" horiz-adv-x="1335" d="M582 1390q287 0 485.5 -214t198.5 -503.5t-198 -502.5t-486 -213q-184 0 -327.5 118.5t-178.5 298.5q-2 11 -2 17q0 22 27 22q15 0 23 -29q25 -90 47 -135.5t77 -101.5q130 -130 309 -130q91 0 185 41q322 141 322 595v19l-1 38q-80 45 -202 45q-178 0 -355 -155 q-76 -67 -179.5 -67t-214.5 90q-31 25 -31 51t19 26q-4 0 48.5 -30.5t105.5 -30.5q85 0 161 56l147 110q94 58 224 58t274 -95q-31 381 -294 510q-102 50 -207 50q-151 0 -272 -117t-155 -271q-7 -32 -35.5 -32t-28.5 26v423q0 33 21 33q14 0 31 -25l99 -144 q170 169 363 169z" />
+<glyph unicode="Ю" horiz-adv-x="1975" d="M649 1284l-55 2q-123 0 -142 -36q-8 -16 -8 -45v-474h356q19 271 175.5 465t383.5 194t387.5 -215.5t160.5 -505t-160.5 -501t-394 -211.5t-394 211.5t-160.5 499.5v3h-354v-530q0 -29 8 -45q18 -35 187 -35h10v-61q-71 6 -115 6h-358q-37 0 -108 -6v61q9 0 27.5 -0.5 t28.5 -0.5q121 0 139 36q7 14 7 45v1064q0 31 -7 45q-17 34 -149 34h-46v62q70 -6 112 -6h354q45 0 115 6v-62zM1705 700q0 448 -210 593q-69 47 -143 47q-182 0 -278 -226q-74 -177 -74 -418.5t72 -433.5q95 -254 280.5 -254t280.5 257q72 193 72 435z" />
+<glyph unicode="Я" horiz-adv-x="1508" d="M1297 6h-289q-69 0 -143 -6v61h26q157 0 171 34q7 17 7 46v511h-227q-113 0 -186 -69.5t-73 -227.5q0 -13 0.5 -40t0.5 -40q0 -318 -330 -318q-84 0 -135 65t-51 151q0 33 24 33q19 0 24 -31q30 -175 131 -175q87 0 118 158l25 182q14 97 39 149q59 125 224 182 q-135 33 -229 108q-115 91 -115 213q0 167 180 267q150 84 333 84h618v-62h-29q-153 0 -167 -40q-6 -18 -6 -45v-1055q0 -31 7 -46q17 -35 142 -35h27q20 1 26 1v-61q-74 6 -143 6zM1069 696v523q0 43 -32 57q-18 7 -69 7q-230 0 -314 -35q-143 -60 -143 -256 q0 -296 339 -296h219z" />
+<glyph unicode="а" horiz-adv-x="1070" d="M1018 190q0 -83 -47.5 -142.5t-122.5 -59.5t-120.5 51.5t-52.5 122.5q-35 -85 -111 -135.5t-186.5 -50.5t-205.5 50q-119 62 -119 178q0 179 213 279q131 61 394 76v78q0 110 -60.5 192t-166.5 82q-154 0 -231 -98q46 0 78 -26.5t32 -70t-28.5 -71.5t-71.5 -28 q-98 0 -98 99q0 113 102 178.5t222 65.5q183 0 293 -119q50 -54 63.5 -108t13.5 -144v-427q0 -40 20.5 -74t57.5 -34q79 0 79 175q0 28 -2 80h55v-119zM660 300v214q-171 -6 -291 -71q-152 -82 -152 -236q0 -78 56.5 -130.5t135.5 -52.5q111 0 181 81.5t70 194.5z" />
+<glyph unicode="б" horiz-adv-x="1054" d="M528 960q198 0 336 -151t138 -350.5t-139 -341t-326.5 -141.5t-319.5 119t-159 295q-21 133 -21 236q0 426 162 616q82 96 160 121.5t321 45.5q48 4 123 20q34 16 49 47h66q-14 -97 -82.5 -159.5t-193 -73.5t-239.5 -20q-131 -24 -202 -113q-89 -113 -111 -462 q54 138 172 225t266 87zM776 188q47 92 47 292.5t-56 292.5q-84 138 -244.5 138t-241.5 -143q-51 -90 -51 -294.5t55 -299.5q83 -144 246.5 -144t244.5 158z" />
+<glyph unicode="в" horiz-adv-x="1118" d="M1002 251q0 -49 -27 -97q-87 -154 -315 -154h-598v66q72 0 108.5 4t47.5 25t11 72v589q0 51 -11 72t-47.5 25t-108.5 4v66h557q223 0 312 -136q31 -47 31 -95q0 -82 -73.5 -137.5t-164.5 -72.5q105 -10 191.5 -71.5t86.5 -159.5zM797 690q0 80 -55.5 123.5t-137.5 43.5 h-148q-64 0 -78 -13t-14 -75v-266h199q168 0 219 121q15 36 15 66zM608 66q93 0 158 49.5t65 138t-54.5 145.5t-140.5 57h-272v-302q0 -62 14 -75t78 -13h152z" />
+<glyph unicode="г" horiz-adv-x="1035" d="M535 856q-112 0 -122 -2q-32 -6 -40 -31q-3 -10 -3 -55v-597q0 -47 7 -62q10 -26 51 -34.5t150 -8.5v-66q-80 6 -178 6t-344 -6v66q140 0 157 30q10 18 10 71v589q0 52 -10 70q-16 30 -151 30h-6v67h846l38 -328h-53q-18 182 -98 229q-55 32 -254 32z" />
+<glyph unicode="д" horiz-adv-x="1225" d="M1195 66l-2 -101q0 -212 94 -231q-68 0 -115 49q-14 15 -64 93.5t-82 101t-99 22.5h-599q-73 0 -108 -34q-19 -18 -60 -97.5t-56 -95.5q-34 -39 -93 -39v3q83 16 83 229l-2 100q104 0 130 4q76 12 108 61q82 125 131 315.5t49 352.5q0 45 -65 56q-16 2 -100 2v66h850v-66 q-78 0 -111 -3.5t-44.5 -24.5t-11.5 -73v-589q0 -52 11.5 -73t44.5 -24.5t111 -3.5zM880 162v607q0 62 -42 79q-23 9 -108 9t-111.5 -17t-31.5 -99q-17 -277 -135 -548q-30 -69 -30 -86q0 -23 35.5 -32t161.5 -9q218 0 248 39q13 17 13 57z" />
+<glyph unicode="е" horiz-adv-x="933" d="M854 280q27 0 27 -28t-35 -88q-110 -188 -315 -188t-341.5 147.5t-136.5 344.5t127 344.5t312.5 147.5t287 -119t101.5 -302q0 -30 -7.5 -37.5t-38.5 -7.5h-605v-7q0 -210 64 -313q90 -144 242 -144q198 0 290 221q12 29 28 29zM740 539q0 143 -50 243q-64 129 -192 129 q-41 0 -90 -23q-165 -78 -175 -349h507z" />
+<glyph unicode="ж" horiz-adv-x="1611" d="M737 471l-56 7q-128 0 -236 -69q-55 -35 -70.5 -71t-20 -119.5t-53.5 -158.5t-134 -75q-67 0 -101 67q-27 53 -27 128q0 34 27 34q22 0 26 -26q10 -62 16 -78q17 -44 57 -44q66 0 66 141.5t62.5 205t196.5 93.5q-68 33 -107 130l-53 156q-32 76 -89 76q-25 0 -25 -18 q0 -3 16 -29.5t16 -60t-27.5 -62t-66.5 -28.5q-102 0 -102 102q0 70 46 118t112 48q148 0 200 -178q37 -124 57 -151q51 -70 178 -70h92v226q0 41 -9 59q-17 33 -150 33h-8v66q208 -6 243.5 -6t237.5 6v-66q-7 0 -23.5 0.5t-54 0.5t-63.5 -16t-26 -77v-226h92q127 0 178 70 q20 27 53.5 140.5t96.5 158.5q42 30 107.5 30t111.5 -48t46 -118q0 -102 -102 -102q-39 0 -66.5 28.5t-27.5 62t16 60t16 29.5q0 18 -25 18q-57 0 -89 -76l-53 -156q-39 -97 -107 -130q134 -30 196.5 -93.5t62.5 -205t66 -141.5q40 0 57 44q6 16 16 78q4 26 26 26 q27 0 27 -34q0 -75 -27 -128q-34 -67 -101 -67q-85 0 -134 75t-53.5 158.5t-20 119.5t-70.5 71q-108 69 -236 69l-56 -7v-313q0 -41 9 -59q17 -33 150 -33h8v-66q-203 6 -237 6t-244 -6v66q7 0 23.5 -0.5t54 -0.5t63.5 16t26 77v313z" />
+<glyph unicode="з" horiz-adv-x="920" d="M860 253q0 -59 -36 -116q-106 -167 -386 -167q-169 0 -263 43l-64 -43h-9q-23 0 -27 8q-5 11 -5 48v122q0 58 28 58q20 0 26 -20q2 -23 17 -71q45 -85 293.5 -85t248.5 222.5t-251 222.5h-118q-55 0 -55 23t29.5 25.5t79.5 5.5q122 8 192 62q86 66 86 151.5t-58.5 121 t-151 35.5t-165 -36.5t-94 -91t-36.5 -54.5q-28 0 -28 58v122q0 37 5 47q4 9 27 9h9q25 -19 77 -54q91 54 218 54t232 -43q136 -57 136 -160q0 -170 -254 -242q112 -21 195 -81q102 -73 102 -174z" />
+<glyph unicode="и" horiz-adv-x="1261" d="M1204 0q-203 6 -238 6t-244 -6v66q142 0 158 33q9 19 9 68v570l-499 -653q38 -18 148 -18v-66q-203 6 -238 6t-244 -6v66q142 0 158 33q9 19 9 68v589q0 49 -9 68q-16 33 -158 33v66q209 -6 244 -6t238 6v-66q-143 0 -159 -33q-9 -19 -9 -68v-570l499 653q-38 18 -147 18 v66q209 -6 244 -6t238 6v-66q-143 0 -159 -33q-9 -19 -9 -68v-589q0 -49 9 -68q16 -33 159 -33v-66z" />
+<glyph unicode="й" horiz-adv-x="1261" d="M1204 0q-203 6 -238 6t-244 -6v66q142 0 158 33q9 19 9 68v570l-499 -653q38 -18 148 -18v-66q-203 6 -238 6t-244 -6v66q142 0 158 33q9 19 9 68v589q0 49 -9 68q-16 33 -158 33v66q209 -6 244 -6t238 6v-66q-143 0 -159 -33q-9 -19 -9 -68v-570l499 653q-38 18 -147 18 v66q209 -6 244 -6t238 6v-66q-143 0 -159 -33q-9 -19 -9 -68v-589q0 -49 9 -68q16 -33 159 -33v-66zM892 1398q89 0 89 -96t-113.5 -158.5t-237.5 -62.5t-229 58q-122 67 -122 163t89 96t89 -90t-89 -90q99 -74 262 -74t262 74q-89 0 -89 90t89 90z" />
+<glyph unicode="к" horiz-adv-x="1080" d="M409 478l-56 -7v-313q0 -41 9 -59q17 -33 150 -33h8v-66q-203 6 -237 6t-244 -6v66q7 0 23.5 -0.5t54 -0.5t63.5 16t26 77v607q0 41 -9 59q-17 33 -150 33h-8v66q208 -6 243.5 -6t237.5 6v-66q-7 0 -23.5 0.5t-54 0.5t-63.5 -16t-26 -77v-226h92q127 0 178 70 q20 27 53.5 140.5t96.5 158.5q42 30 107.5 30t111.5 -48t46 -118q0 -102 -102 -102q-39 0 -66.5 28.5t-27.5 62t16 60t16 29.5q0 18 -25 18q-57 0 -89 -76l-53 -156q-39 -97 -107 -130q134 -30 196.5 -93.5t62.5 -205t66 -141.5q40 0 57 44q6 16 16 78q4 26 26 26 q27 0 27 -34q0 -75 -27 -128q-34 -67 -101 -67q-85 0 -134 75t-53.5 158.5t-20 119.5t-70.5 71q-108 69 -236 69z" />
+<glyph unicode="л" horiz-adv-x="1267" d="M281 81q186 0 186 658q0 63 -6 80q-11 30 -72 37q-10 1 -89 1v66h876v-66q-140 0 -157 -30q-10 -18 -10 -71v-589q0 -53 10 -71q17 -30 157 -30v-66q-203 6 -237.5 6t-244.5 -6v66q140 0 157 30q10 18 10 71v585q0 49 -7 65q-18 40 -149 40q-69 0 -92 -5q-55 -11 -63 -53 q-3 -17 -4 -116q-6 -683 -261 -683q-70 0 -121 48.5t-51 118.5q0 88 86 88q36 0 60 -24.5t24 -61.5q0 -59 -50 -79q18 -9 48 -9z" />
+<glyph unicode="м" horiz-adv-x="1428" d="M1362 0q-186 6 -238 6t-227 -6v66h85q60 5 73 32q9 18 9 69l-2 696l-347 -820q-18 -43 -40.5 -43t-40.5 43l-341 805l-2 -2v-629q0 -151 167 -151v-66q-82 6 -166 6t-228 -6v66q167 0 167 151v539q0 50 -9 68q-16 33 -158 33v66h262q41 0 50 -4q13 -7 27 -39l310 -732 l308 732q13 31 26.5 37t53.5 6h261v-66h-85q-60 -5 -73 -32q-9 -18 -9 -69v-589q0 -50 9 -68q16 -33 158 -33v-66z" />
+<glyph unicode="н" horiz-adv-x="1178" d="M1120 0q-203 6 -238 6t-244 -6v66q140 0 157 30q10 18 10 71v281h-435v-281q0 -49 9 -68q16 -33 159 -33v-66q-203 6 -238 6t-244 -6v66q140 0 157 30q10 18 10 71v589q0 53 -10 71q-17 30 -157 30v66q209 -6 244 -6t238 6v-66q-143 0 -159 -33q-9 -19 -9 -68v-242h435 v242q0 53 -10 71q-17 30 -157 30v66q209 -6 244 -6t238 6v-66q-140 0 -157 -30q-10 -18 -10 -71v-589q0 -53 10 -71q17 -30 157 -30v-66z" />
+<glyph unicode="о" horiz-adv-x="1054" d="M191.5 118.5q-138.5 142.5 -138.5 341.5t138 349.5t336.5 150.5t336.5 -151t138 -350.5t-139 -341t-336 -141.5t-335.5 142.5zM776 188q47 92 47 292.5t-56 292.5q-84 138 -244.5 138t-241.5 -143q-51 -90 -51 -294.5t55 -299.5q83 -144 246.5 -144t244.5 158z" />
+<glyph unicode="п" horiz-adv-x="1178" d="M1120 0q-203 6 -237.5 6t-244.5 -6v66q140 0 157 30q10 18 10 71v585q0 54 -15 74q-23 31 -194 31t-198.5 -19.5t-27.5 -85.5v-585q0 -52 11 -71q17 -30 157 -30v-66q-203 6 -237.5 6t-244.5 -6v66q140 0 157 30q10 18 10 71v589q0 53 -10 71q-17 30 -157 30v66h1064v-66 q-140 0 -157 -30q-10 -18 -10 -71v-589q0 -53 10 -71q17 -30 157 -30v-66z" />
+<glyph unicode="р" horiz-adv-x="1160" d="M360 805q127 141 308 141t310 -146.5t129 -342t-139 -338.5t-337 -143q-78 0 -158.5 42t-105.5 109v-388q0 -42 11 -59q19 -29 114 -29q19 0 41 1v-66q-169 5 -241.5 5t-238.5 -5v66q37 -2 76.5 -2t60.5 14q30 19 30 83v1002q0 51 -10 71.5t-44 28.5q-26 6 -83 6h-30v68 l307 23v-141zM855 176q74 128 74 282t-67 281q-81 154 -218 154q-179 0 -277 -172v-478q0 -46 30 -89q91 -130 230.5 -130t227.5 152z" />
+<glyph unicode="с" horiz-adv-x="920" d="M868 254q0 -22 -27 -75q-104 -203 -329 -203q-194 0 -326.5 144.5t-132.5 343t132 347.5t330 149q121 0 215 -54q113 -64 113 -170t-97 -106q-42 0 -70.5 28t-28.5 70q0 94 100 99q-79 78 -229 78q-60 0 -120 -34q-168 -94 -168 -402.5t178 -404.5q63 -34 123 -34 q113 0 181 64q40 37 74 109.5t53 72.5q29 0 29 -22z" />
+<glyph unicode="т" horiz-adv-x="1142" d="M756 857q-75 0 -88 -7q-23 -13 -23 -81v-598q0 -53 12.5 -72t61.5 -26t161 -7v-66q-73 6 -226 6h-168q-152 0 -225 -6v66q133 0 174 7.5t51.5 28t10.5 69.5v598q0 68 -23 81q-12 7 -91 7q-152 0 -193.5 -50t-52.5 -212h-53l25 328h921l26 -328h-54q-11 161 -48 207 q-46 55 -198 55z" />
+<glyph unicode="у" horiz-adv-x="1151" d="M249 -439q-76 0 -136 50t-60 124q0 91 89 91q39 0 65 -25.5t26 -63.5q0 -81 -85 -91q41 -38 101 -38q93 0 158 92q32 45 68 130l71 170l-321 781q-22 54 -70 68q-21 6 -74 6h-28v68q120 -8 178.5 -8t261.5 8v-68h-4q-116 0 -116 -54q0 -19 250 -616l217 528q14 34 14 50 q0 90 -101 92v68q170 -8 212 -8t134 8v-68h-2q-140 0 -197 -136l-377 -913q-101 -245 -274 -245z" />
+<glyph unicode="ф" horiz-adv-x="1275" d="M1223 460q0 -108 -33 -211.5t-114 -188t-192.5 -84.5t-183.5 125h-2v-186q0 -32 49.5 -164.5t75.5 -179.5l-23 -13l-162 258l-162 -258l-23 13q26 47 75.5 179.5t49.5 164.5v186h-2q-72 -125 -183 -125t-192 84q-148 155 -148 403q0 106 33.5 210.5t114.5 189t192 84.5 t183 -125h2v304q0 32 -49.5 164.5t-75.5 179.5l23 13l162 -258l162 258l23 -13q-26 -47 -75.5 -179.5t-49.5 -164.5v-304h2q72 125 183.5 125t198.5 -92q74 -77 107.5 -182t33.5 -213zM1045 463q0 190 -28 282q-45 148 -133 148q-102 0 -158 -139q-28 -69 -28 -246v-131 q0 -139 26 -206q54 -141 160 -141q94 0 137 156q24 87 24 277zM578 415v131q0 139 -26 206q-54 141 -160 141q-94 0 -137 -156q-24 -87 -24 -277t28 -282q45 -148 133 -148q102 0 158 139q28 69 28 246z" />
+<glyph unicode="х" horiz-adv-x="1183" d="M1131 0q-91 6 -175.5 6t-261.5 -6v66q77 3 77 54q0 10 -208 285q-192 -223 -192 -272q0 -61 62 -67v-66q-141 6 -221 6t-159 -6v66q159 0 274 128l200 256l-212 276q-71 92 -105 110.5t-147 18.5v68q110 -8 171 -8t264 8v-68q-75 -2 -75 -52q0 -20 184 -255l134 167 q33 41 33 75q0 61 -63 65v68q108 -8 192.5 -8t188.5 8v-68q-152 -3 -255 -109q-26 -27 -197 -244l287 -369q37 -47 92 -60q28 -7 95 -7h17v-66z" />
+<glyph unicode="ц" horiz-adv-x="1178" d="M1120 66l-2 -101q0 -212 94 -231q-68 0 -115 49q-14 16 -64 94t-82 100.5t-99 22.5h-796v66q140 0 157 30q10 18 10 71v589q0 53 -10 71q-17 30 -157 30v66q209 -6 244 -6t238 6v-66q-140 0 -157 -30q-11 -19 -11 -71v-585q0 -54 15 -74q23 -31 202.5 -31t202.5 31 q15 20 15 74v585q0 53 -10 71q-17 30 -157 30v66q209 -6 244 -6t238 6v-66q-140 0 -157 -30q-10 -18 -10 -71v-589q0 -53 10 -71q17 -30 157 -30z" />
+<glyph unicode="ч" horiz-adv-x="1261" d="M1204 0q-203 6 -237.5 6t-244.5 -6v66q140 0 157 30q10 18 10 71v274q-129 -143 -324 -143q-131 0 -236.5 81t-105.5 208q0 214 -5 229q-11 32 -72 40q-12 1 -90 1v66q209 -6 244 -6t238 6v-66q-140 0 -157 -30q-11 -19 -11 -71v-143q0 -102 70.5 -160.5t174.5 -58.5 q137 0 246 109q28 28 28 75v178q0 53 -10 71q-17 30 -157 30v66q209 -6 244 -6t238 6v-66q-140 0 -157 -30q-11 -19 -11 -71v-589q0 -52 11 -71q17 -30 157 -30v-66z" />
+<glyph unicode="ш" horiz-adv-x="1677" d="M1619 0h-1563v66q140 0 157 30q10 18 10 71v589q0 53 -10 71q-17 30 -157 30v66q209 -6 244 -6t238 6v-66q-140 0 -157 -30q-11 -19 -11 -71v-585q0 -49 13 -73t56.5 -28t131 -4t96.5 1q70 6 85 37q10 19 10 61v597q0 49 -11 67q-17 28 -154 28v66q174 -6 237 -6t243 6 v-66q-67 0 -103.5 -3t-49 -22.5t-12.5 -69.5v-597q0 -52 16.5 -71.5t57.5 -23.5t123 -4t124 4t56.5 26t14.5 75v585q0 53 -10 71q-17 30 -157 30v66q209 -6 244 -6t238 6v-66q-140 0 -157 -30q-10 -18 -10 -71v-589q0 -53 10 -71q17 -30 157 -30v-66z" />
+<glyph unicode="щ" horiz-adv-x="1677" d="M1619 66l-2 -101q0 -212 94 -231q-68 0 -115 49q-15 16 -64.5 94t-81.5 100.5t-99 22.5h-1295v66q140 0 157 30q10 18 10 71v589q0 53 -10 71q-17 30 -157 30v66q209 -6 244 -6t238 6v-66q-140 0 -157 -30q-11 -19 -11 -71v-585q0 -49 13 -73t56.5 -28t131 -4t96.5 1 q70 6 85 37q10 19 10 61v597q0 49 -11 67q-17 28 -154 28v66q174 -6 237 -6t243 6v-66q-67 0 -103.5 -3t-49 -22.5t-12.5 -69.5v-597q0 -52 16.5 -71.5t57.5 -23.5t123 -4t124 4t56.5 26t14.5 75v585q0 53 -10 71q-17 30 -157 30v66q209 -6 244 -6t238 6v-66 q-140 0 -157 -30q-10 -18 -10 -71v-589q0 -53 10 -71q17 -30 157 -30z" />
+<glyph unicode="ъ" horiz-adv-x="1451" d="M1305 351q31 -48 31 -100.5t-31 -103.5q-89 -147 -311 -147h-598v66q69 0 105.5 3t49 24t12.5 74v602q0 70 -26 83q-12 5 -98 5q-155 0 -216 -53.5t-65 -208.5h-53l15 328h662v-66h-7q-52 0 -64 -15q-13 -15 -13 -73v-283h289q230 0 318 -135zM942 66q93 0 158 49.5 t65 137.5t-54.5 145.5t-139.5 57.5h-273v-302q0 -62 14 -75t78 -13h152z" />
+<glyph unicode="ы" horiz-adv-x="1535" d="M1495 0q-203 6 -240.5 6t-241.5 -6v66q139 0 156 29q11 18 11 68v597q0 50 -11 68q-17 29 -156 29v66q203 -6 241 -6t241 6v-66q-80 0 -86 -1q-60 -5 -72 -34q-9 -21 -9 -72v-577q0 -51 9 -72q12 -29 72 -34q6 -1 86 -1v-66zM1004 251q0 -56 -34 -109q-90 -142 -310 -142 h-598v66h9q132 0 148 30q10 18 10 71v589q0 53 -10 71q-16 30 -148 30h-9v66q120 -6 196.5 -6t272.5 6v-66h-9q-132 0 -148 -30q-10 -18 -10 -71v-270h291q127 0 227 -53q122 -65 122 -182zM608 66q93 0 159 50t66 137.5t-56 145t-141 57.5h-272v-302q0 -62 14 -75t78 -13 h152z" />
+<glyph unicode="ь" horiz-adv-x="1118" d="M975 344q27 -46 27 -94t-26 -95q-86 -155 -316 -155h-598v66h9q132 0 148 30q10 18 10 71v589q0 53 -10 71q-16 30 -148 30h-9v66q120 -6 196.5 -6t272.5 6v-66h-9q-132 0 -148 -30q-10 -18 -10 -71v-270h289q238 0 322 -142zM608 66q93 0 158 49.5t65 138t-54.5 145.5 t-140.5 57h-272v-302q0 -62 14 -75t78 -13h152z" />
+<glyph unicode="э" horiz-adv-x="1036" d="M92 953q3 0 107 -86q114 86 259 86q211 0 368 -142t157 -350t-157.5 -349.5t-367.5 -141.5q-141 0 -255 70q-133 82 -133 215q0 30 28 30q21 0 26 -32q15 -106 101 -161.5t199 -55.5q174 0 283 116q90 95 98 289q-69 60 -163 60q-135 0 -250 -109q-55 -52 -110 -52 t-130 38.5t-75 76.5t21 38q3 0 31 -18.5t61 -18.5q67 0 163.5 80.5t198.5 80.5q134 0 251 -94q-18 176 -119 270t-258 94q-188 0 -269 -152q-5 -9 -33 -93q-6 -19 -27 -19t-26 18q-1 4 -1 38v218q0 56 22 56z" />
+<glyph unicode="ю" horiz-adv-x="1767" d="M1505 807q146 -146 146 -350.5t-147 -345.5t-346.5 -141t-343 129.5t-157.5 322.5h-261v-257q0 -50 11 -69q17 -30 147 -30h9v-66q-202 6 -241 6t-241 -6v66h8q132 0 149 31q10 18 10 72v585q0 54 -10 72q-17 31 -149 31h-8v66q202 -6 241 -6t241 6v-66h-9 q-130 0 -147 -30q-11 -19 -11 -69v-270h261q11 196 156 330.5t345.5 134.5t346.5 -146zM1473 478q0 298 -192 391q-62 30 -125 30t-122 -26q-201 -89 -201 -403t194 -413q61 -31 124 -31t120 27q202 96 202 425z" />
+<glyph unicode="я" horiz-adv-x="1166" d="M1103 0q-221 6 -249.5 6t-226.5 -6v66q142 0 158 33q9 19 9 68v272h-169q-86 0 -141 -58q-35 -37 -35 -123q0 -10 0.5 -31t0.5 -32q0 -126 -74.5 -175.5t-189.5 -49.5q-64 0 -108 45t-44 109q0 32 28 32q22 0 26 -30q15 -109 88 -109q44 0 72 74q5 13 31.5 118t51.5 147 q39 64 125 102q-91 21 -157 71q-83 62 -83 143.5t70 141.5q127 109 333 109h484v-66q-142 0 -158 -33q-9 -19 -9 -68v-589q0 -49 9 -68q16 -33 158 -33v-66zM794 486v291q0 65 -27 75q-13 5 -124.5 5t-165.5 -25q-83 -40 -83 -154.5t69 -157.5q54 -34 175 -34h156z" />
+<glyph unicode="ѐ" horiz-adv-x="933" d="M854 280q27 0 27 -28t-35 -88q-110 -188 -315 -188t-341.5 147.5t-136.5 344.5t127 344.5t312.5 147.5t287 -119t101.5 -302q0 -30 -7.5 -37.5t-38.5 -7.5h-605v-7q0 -210 64 -313q90 -144 242 -144q198 0 290 221q12 29 28 29zM740 539q0 143 -50 243q-64 129 -192 129 q-41 0 -90 -23q-165 -78 -175 -349h507zM353 1300q-28 24 -28 54t23 53t54 23t54 -29l247 -322l-37 -35z" />
+<glyph unicode="ё" horiz-adv-x="933" d="M854 280q27 0 27 -28t-35 -88q-110 -188 -315 -188t-341.5 147.5t-136.5 344.5t127 344.5t312.5 147.5t287 -119t101.5 -302q0 -30 -7.5 -37.5t-38.5 -7.5h-605v-7q0 -210 64 -313q90 -144 242 -144q198 0 290 221q12 29 28 29zM740 539q0 143 -50 243q-64 129 -192 129 q-41 0 -90 -23q-165 -78 -175 -349h507zM779 1318q32 -32 32 -78.5t-32 -79t-78 -32.5t-78.5 33.5t-32.5 78t33 77.5t78.5 33t77.5 -32zM406.5 1318q32.5 -32 32.5 -78.5t-32.5 -79t-78 -32.5t-78.5 33.5t-33 78t33 77.5t78.5 33t78 -32z" />
+<glyph unicode="ђ" horiz-adv-x="1168" d="M1115 486q0 -245 -113.5 -462.5t-316.5 -348.5q-139 -90 -291 -90q-40 0 -40 34q0 21 7 24.5t33 7.5q238 34 382 215q127 160 167 414q9 57 9 126q0 181 -64 322q-83 184 -242 184q-123 0 -201 -107.5t-78 -235.5v-413q0 -40 10 -58q18 -33 114 -33q19 0 41 1v-66 q-197 6 -236 6t-243 -6v66q28 -1 71.5 -1t69 16.5t25.5 80.5v983h-173q-24 0 -24 31t24 31h173v70q0 87 -44 108q-21 10 -96 10h-26v67l306 23v-278h416q24 0 24 -31t-24 -31h-416v-390h2q41 93 125 149t184 56q194 0 319.5 -139t125.5 -335z" />
+<glyph unicode="ѓ" horiz-adv-x="1035" d="M603 1401q22 29 53 29t54 -23t23 -53t-28 -54l-313 -256l-37 35zM535 850q-112 0 -122 -2q-32 -6 -40 -31q-3 -10 -3 -55v-591q0 -47 7 -62q10 -26 51 -34.5t150 -8.5v-66q-80 6 -178 6t-344 -6v66q140 0 157 30q10 18 10 71v583q0 52 -10 70q-16 30 -151 30h-6v67h846 l38 -328h-53q-18 182 -98 229q-55 32 -254 32z" />
+<glyph unicode="є" horiz-adv-x="1036" d="M966 255q0 -133 -133 -215q-114 -70 -255 -70q-211 0 -368 142t-157 350t157.5 349.5t367.5 141.5q154 0 259 -86q15 11 43 35q53 51 64 51q22 0 22 -56v-218q0 -34 -1 -38q-5 -18 -26 -18t-27 26q-27 111 -107.5 174.5t-194.5 63.5q-159 0 -260.5 -99t-116.5 -265 q117 94 251 94q101 0 198 -80.5t164 -80.5q31 0 58.5 18.5t33.5 18.5q21 0 21 -38t-74.5 -76.5t-130.5 -38.5t-107 48q-121 113 -253 113q-39 0 -101 -20.5t-62 -52.5q0 -171 105.5 -281.5t275.5 -110.5q99 0 184.5 45.5t107.5 133.5q2 18 8 51q6 19 26 19q28 0 28 -30z" />
+<glyph unicode="ѕ" horiz-adv-x="804" d="M752 274q0 -146 -97 -222t-242 -76t-242 93q-77 -93 -97.5 -93t-20.5 33v322q0 32 27 32q21 0 30 -35q37 -146 92 -214q73 -90 206 -90q103 0 172 48.5t69 146.5q0 147 -223 195q-128 28 -148 33q-82 25 -134 67q-91 75 -91 183q0 134 108 204q92 59 221.5 59t212.5 -61 q60 61 82 61t22 -33v-254q0 -35 -29 -35q-23 0 -31 43l-6 60q-16 87 -81.5 132.5t-158.5 45.5t-157 -34q-81 -43 -81 -129t94 -130q48 -22 169 -46q170 -33 243 -102q91 -86 91 -204z" />
+<glyph unicode="і" horiz-adv-x="562" d="M510 0q-202 6 -233 6t-224 -6v66l44 -1q66 0 89 13q33 18 33 79v582q0 85 -41 105q-21 11 -103 11h-14v68l298 23v-802q0 -59 51 -73q19 -5 69 -5h31v-66zM335.5 1356q33.5 -33 33.5 -80.5t-33.5 -81t-80.5 -33.5t-80 34.5t-33 80t33.5 79.5t80 34t80 -33z" />
+<glyph unicode="ї" horiz-adv-x="562" d="M510 0q-202 6 -233 6t-224 -6v66l44 -1q66 0 89 13q33 18 33 79v582q0 85 -41 105q-21 11 -103 11h-14v68l298 23v-802q0 -59 51 -73q19 -5 69 -5h31v-66zM539 1318q32 -32 32 -78.5t-32 -79t-78 -32.5t-78.5 33.5t-32.5 78t33 77.5t78.5 33t77.5 -32zM166.5 1318 q32.5 -32 32.5 -78.5t-32.5 -79t-78 -32.5t-78.5 33.5t-33 78t33 77.5t78.5 33t78 -32z" />
+<glyph unicode="ј" horiz-adv-x="588" d="M385 -107q0 -133 -81 -232.5t-211 -99.5q-90 0 -159 40q-83 48 -83 132q0 42 27.5 70t69.5 28t70.5 -28t28.5 -70q0 -76 -74 -96q58 -29 114 -29q158 0 158 281v861q0 39 -9 60q-20 45 -148 45h-27v68l324 23v-1053zM353 1356q33 -33 33 -80.5t-33.5 -81t-80 -33.5 t-79.5 34.5t-33 80t33.5 79.5t80 34t79.5 -33z" />
+<glyph unicode="љ" horiz-adv-x="1640" d="M281 81q186 0 186 658q0 63 -6 80q-11 30 -72 37q-10 1 -89 1v66h876v-66h-43h-9q-69 0 -92 -15q-23 -16 -23 -86v-261h225q118 0 205.5 -63.5t87.5 -178t-87 -184t-206 -69.5h-540v66q140 0 157 30q10 18 10 71v585q0 49 -7 65q-18 40 -149 40q-69 0 -92 -5 q-55 -11 -63 -53q-3 -17 -4 -116q-6 -683 -261 -683q-70 0 -121 48.5t-51 118.5q0 88 86 88q36 0 60 -24.5t24 -61.5q0 -59 -50 -79q18 -9 48 -9zM1356 256q0 82 -38 145.5t-114 63.5h-195v-298q0 -73 32 -90q18 -11 62 -11h7h92q53 0 74.5 6.5t50.5 54t29 129.5z" />
+<glyph unicode="њ" horiz-adv-x="1660" d="M1546 255q0 -48 -25 -97q-80 -158 -300 -158h-581v66q112 0 130 8q37 18 37 106v268h-437v-281q0 -52 12 -73t45.5 -24.5t110.5 -3.5v-66q-203 6 -238 6t-244 -6v66q78 0 111 3.5t44.5 24.5t11.5 73v589q0 52 -11.5 73t-44.5 24.5t-111 3.5v66q209 -6 244 -6t238 6v-66 q-78 0 -111 -3.5t-45 -24.5t-12 -73v-242h437v229q0 88 -37 106q-18 8 -130 8v66q175 -6 234.5 -6t245.5 6v-66q-140 0 -156 -32q-9 -18 -9 -63v-267h266q123 0 216 -57q109 -67 109 -183zM1317 105q58 59 58 149t-46 150.5t-130 60.5h-244v-304q0 -48 9 -65.5t44.5 -23.5 t128.5 -6t103 1q46 6 77 38z" />
+<glyph unicode="ћ" horiz-adv-x="1181" d="M1129 0q-200 6 -238 6t-244 -6v66q30 -1 70.5 -1t63.5 12q33 19 33 76v519q0 227 -158 227q-130 0 -209.5 -104.5t-79.5 -238.5v-400q0 -39 10 -58q18 -33 117 -33q18 0 38 1v-66q-200 6 -236.5 6t-242.5 -6v66q30 -1 72.5 -1t68 16.5t25.5 80.5v983h-173q-23 0 -23 23 v16q0 23 23 23h173v70q0 87 -44 108q-21 10 -96 10h-26v67l306 23v-278h416q22 0 22 -23v-16q0 -23 -22 -23h-416v-404h2q41 93 125 149t184 56q292 0 292 -314v-502q0 -65 135 -65q15 0 32 1v-66z" />
+<glyph unicode="ќ" horiz-adv-x="1080" d="M409 478l-56 -7v-313q0 -41 9 -59q17 -33 150 -33h8v-66q-203 6 -237 6t-244 -6v66q7 0 23.5 -0.5t54 -0.5t63.5 16t26 77v607q0 41 -9 59q-17 33 -150 33h-8v66q208 -6 243.5 -6t237.5 6v-66q-7 0 -23.5 0.5t-54 0.5t-63.5 -16t-26 -77v-226h92q127 0 178 70 q20 27 53.5 140.5t96.5 158.5q42 30 107.5 30t111.5 -48t46 -118q0 -102 -102 -102q-39 0 -66.5 28.5t-27.5 62t16 60t16 29.5q0 18 -25 18q-57 0 -89 -76l-53 -156q-39 -97 -107 -130q134 -30 196.5 -93.5t62.5 -205t66 -141.5q40 0 57 44q6 16 16 78q4 26 26 26 q27 0 27 -34q0 -75 -27 -128q-34 -67 -101 -67q-85 0 -134 75t-53.5 158.5t-20 119.5t-70.5 71q-108 69 -236 69zM683 1401q22 29 53 29t54 -23t23 -53t-28 -54l-313 -256l-37 35z" />
+<glyph unicode="ѝ" horiz-adv-x="1261" d="M1204 0q-203 6 -238 6t-244 -6v66q142 0 158 33q9 19 9 68v570l-499 -653q38 -18 148 -18v-66q-203 6 -238 6t-244 -6v66q142 0 158 33q9 19 9 68v589q0 49 -9 68q-16 33 -158 33v66q209 -6 244 -6t238 6v-66q-143 0 -159 -33q-9 -19 -9 -68v-570l499 653q-38 18 -147 18 v66q209 -6 244 -6t238 6v-66q-143 0 -159 -33q-9 -19 -9 -68v-589q0 -49 9 -68q16 -33 159 -33v-66zM473 1300q-28 24 -28 54t23 53t54 23t54 -29l247 -322l-37 -35z" />
+<glyph unicode="ў" horiz-adv-x="1151" d="M249 -439q-76 0 -136 50t-60 124q0 91 89 91q39 0 65 -25.5t26 -63.5q0 -81 -85 -91q41 -38 101 -38q93 0 158 92q32 45 68 130l71 170l-321 781q-22 54 -70 68q-21 6 -74 6h-28v68q120 -8 178.5 -8t261.5 8v-68h-4q-116 0 -116 -54q0 -19 250 -616l217 528q14 34 14 50 q0 90 -101 92v68q170 -8 212 -8t134 8v-68h-2q-140 0 -197 -136l-377 -913q-101 -245 -274 -245zM862 1398q89 0 89 -96t-113.5 -158.5t-237.5 -62.5t-229 58q-122 67 -122 163t89 96t89 -90t-89 -90q99 -74 262 -74t262 74q-89 0 -89 90t89 90z" />
+<glyph unicode="џ" horiz-adv-x="1182" d="M962 793v-574q0 -66 21.5 -93t86.5 -27q13 0 58 1v-100h-451q-28 -143 -33 -277h-105q-6 134 -34 277h-452v100h16q84 0 106 10q44 22 44 109v542q0 64 -25.5 80.5t-67 16.5t-73.5 -1v66q207 -6 243 -6t236 6v-66q-18 1 -35 1q-103 0 -120 -33q-10 -19 -10 -58v-699h447 v702q0 57 -28 72.5t-67 15.5t-72 -1v66q206 -6 243.5 -6t238.5 6v-66q-29 1 -50 1q-36 0 -53 -3q-64 -12 -64 -62z" />
+<glyph unicode="Ѡ" horiz-adv-x="1686" d="M1618 617q0 -252 -109 -438q-131 -222 -366.5 -222t-295.5 247h-8q-60 -247 -295.5 -247t-366.5 222q-109 186 -109 438q0 345 161 546q174 218 511 227v-43q-470 -25 -470 -712q0 -626 295 -626q94 0 156.5 99t62.5 205t-23 210.5t-23 122.5q0 125 105 125t105 -125 q0 -18 -23 -122.5t-23 -210.5t62.5 -205t156.5 -99q295 0 295 626q0 687 -470 712v43q337 -9 511 -227q161 -201 161 -546z" />
+<glyph unicode="ѡ" horiz-adv-x="1294" d="M1241 430q0 -173 -79 -302q-93 -152 -255 -152q-224 0 -256 267h-8q-32 -267 -256 -267q-162 0 -255 152q-79 129 -79 302q0 244 124.5 385.5t365.5 144.5v-48q-327 -10 -327 -470q0 -169 25 -257q44 -155 169 -155q99 0 149 102q39 79 39 191.5t-23 219.5t-23 122 q0 116 95 116t95 -116q0 -15 -23 -122t-23 -219.5t39 -191.5q50 -102 149 -102q125 0 169 155q25 88 25 257q0 460 -327 470v48q241 -3 365.5 -144.5t124.5 -385.5z" />
+<glyph unicode="Ѣ" horiz-adv-x="1654" d="M957 1534l-59 2q-76 0 -103 -9q-53 -18 -53 -76v-108h477l22 -266h-47q-28 140 -124 181q-58 24 -223 24q-105 0 -105 -67v-494h336q188 0 334 -85q174 -101 174 -269t-135.5 -267.5t-302.5 -99.5h-772v61q62 -2 63 -2q113 0 134 45q5 11 5 42v1069q0 67 -115 67 q-156 0 -216 -27q-93 -42 -119 -178h-46l22 266h474v108q0 32 -9 49q-18 34 -153 34h-40v62q71 -6 115 -6h355q41 0 111 6v-62zM1302 147q88 86 88 221t-87 222t-210 87h-351v-537q0 -53 16.5 -66t69.5 -13h257q129 0 217 86z" />
+<glyph unicode="ѣ" horiz-adv-x="1386" d="M1243 344q27 -46 27 -94t-26 -95q-86 -155 -316 -155h-598v66l48 -1q68 0 93.5 15.5t25.5 78.5v610q0 54 -12 71t-61 17q-179 0 -227 -43t-60 -219h-53l25 328h391v203q0 32 -49.5 164.5t-75.5 179.5l23 13l166 -258l165 258l23 -13q-26 -47 -75.5 -179.5t-49.5 -164.5 v-203h390l26 -328h-54q-12 174 -59.5 218t-222.5 44q-52 0 -63.5 -17.5t-11.5 -70.5v-283h289q238 0 322 -142zM876 66q93 0 158 49.5t65 137.5t-54.5 145.5t-140.5 57.5h-272v-302q0 -60 14 -74t78 -14h152z" />
+<glyph unicode="Ѥ" horiz-adv-x="2024" d="M649 1284l-55 2q-123 0 -142 -36q-8 -16 -8 -45v-474h316q22 271 216.5 465t465.5 194q193 0 363 -169l99 144q17 25 31 25q21 0 21 -33v-423q0 -26 -28.5 -26t-35.5 32q-34 154 -155 271t-272 117q-104 0 -207 -50q-276 -135 -297 -547h281q128 0 170.5 36t42.5 144h51 v-422h-51q0 108 -42.5 144t-170.5 36h-282q0 -473 322 -611q96 -41 185 -41q179 0 309 130q55 56 77 101.5t47 135.5q8 29 23 29q27 0 27 -22q0 -6 -2 -17q-35 -180 -178.5 -298.5t-327.5 -118.5q-288 0 -486 212.5t-198 501.5h-314v-530q0 -29 8 -45q18 -35 187 -35h10v-61 q-71 6 -115 6h-358q-37 0 -108 -6v61q9 0 27.5 -0.5t28.5 -0.5q121 0 139 36q7 14 7 45v1064q0 31 -7 45q-17 34 -149 34h-46v62q70 -6 112 -6h354q45 0 115 6v-62z" />
+<glyph unicode="ѥ" horiz-adv-x="1527" d="M1474 686q0 -34 -1 -38q-5 -18 -26 -18t-27 26q-28 115 -108 182t-194 67q-60 0 -120 -34q-153 -86 -167 -357h325q46 0 46 -33t-46 -33h-326q6 -291 178 -384q63 -34 123 -34q113 0 181 64q40 37 74 109.5t53 72.5q29 0 29 -22t-27 -75q-104 -203 -329 -203 q-191 0 -322.5 140t-136.5 332h-283v-281q0 -49 9 -68q16 -33 159 -33v-66q-203 6 -238 6t-244 -6v66q140 0 157 30q10 18 10 71v589q0 53 -10 71q-17 30 -157 30v66q209 -6 244 -6t238 6v-66q-143 0 -159 -33q-9 -19 -9 -68v-242h286q18 185 146.5 315.5t312.5 130.5 q146 0 245 -74q10 7 45.5 40.5t46.5 33.5q22 0 22 -56v-218z" />
+<glyph unicode="Ѧ" horiz-adv-x="1719" d="M1306 6q-110 0 -182 -6v61h5q161 0 161 59q0 48 -25 102l-216 468q-163 -130 -163 -497v-50q0 -28 8 -42q23 -40 150 -40v-61q-76 6 -139 6h-213q-63 0 -139 -6v61q127 0 150 40q8 14 8 42v50q0 353 -153 488l-224 -475q-9 -19 -9 -42q0 -51 46 -76.5t102 -26.5v-61 q-183 6 -244 6t-161 -6v61h2q129 0 193 136l552 1172q20 42 55.5 42t54.5 -42l565 -1223q29 -63 56 -74q25 -11 93 -11h12v-61q-235 6 -345 6zM1015 764l-207 448l-214 -455q157 -119 204 -415h2q48 306 215 422z" />
+<glyph unicode="ѧ" horiz-adv-x="1332" d="M1279 0q-120 8 -164 8t-276 -8v66h5q117 0 117 44q0 21 -22 63l-144 274q-101 -98 -101 -306v-31q0 -34 40 -42q11 -2 68 -2v-66q-70 5 -116 5h-130q-46 0 -116 -5v66q54 0 68 3q40 8 40 41v31q0 200 -95 300l-123 -231q-25 -47 -25 -78q0 -64 94 -66v-66 q-135 8 -194.5 8t-151.5 -8v66q122 1 198 144l369 697q21 40 50 40t50 -40l399 -760q31 -59 66 -73q20 -8 80 -8h14v-66zM764 506l-138 262l-141 -266q95 -71 136 -228q42 161 143 232z" />
+<glyph unicode="Ѩ" horiz-adv-x="2360" d="M649 1284l-55 2q-123 0 -142 -36q-8 -16 -8 -45v-435h730l282 599q20 42 55.5 42t54.5 -42l565 -1223q29 -63 56 -74q25 -11 93 -11h12v-61q-235 6 -345 6t-182 -6v61h5q161 0 161 59q0 48 -25 102l-216 468q-163 -130 -163 -497v-50q0 -28 8 -42q23 -40 150 -40v-61 q-76 6 -139 6h-213q-63 0 -139 -6v61q127 0 150 40q8 14 8 42v50q0 353 -153 488l-224 -475q-9 -19 -9 -42q0 -51 46 -76.5t102 -26.5v-61q-183 6 -244 6t-161 -6v61h2q129 0 193 136l242 513h-702v-569q0 -29 8 -45q18 -35 187 -35h10v-61q-71 6 -115 6h-358q-37 0 -108 -6 v61q9 0 27.5 -0.5t28.5 -0.5q121 0 139 36q7 14 7 45v1064q0 31 -7 45q-17 34 -149 34h-46v62q70 -6 112 -6h354q45 0 115 6v-62zM1656 764l-207 448l-214 -455q157 -119 204 -415h2q48 306 215 422z" />
+<glyph unicode="ѩ" horiz-adv-x="1902" d="M1849 0q-120 8 -164 8t-276 -8v66h5q117 0 117 44q0 21 -22 63l-144 274q-101 -98 -101 -306v-31q0 -34 40 -42q11 -2 68 -2v-66q-70 5 -116 5h-130q-46 0 -116 -5v66q54 0 68 3q40 8 40 41v31q0 200 -95 300l-123 -231q-25 -47 -25 -78q0 -64 94 -66v-66 q-135 8 -194.5 8t-151.5 -8v66q122 1 198 144l126 238h-577v-281q0 -49 9 -68q16 -33 159 -33v-66q-203 6 -238 6t-244 -6v66q140 0 157 30q10 18 10 71v589q0 53 -10 71q-17 30 -157 30v66q209 -6 244 -6t238 6v-66q-143 0 -159 -33q-9 -19 -9 -68v-242h612l208 393 q21 40 50 40t50 -40l399 -760q31 -59 66 -73q20 -8 80 -8h14v-66zM1334 506l-138 262l-141 -266q95 -71 136 -228q42 161 143 232z" />
+<glyph unicode="Ѫ" horiz-adv-x="1588" d="M1520 22q0 -22 -35 -22h-87q-106 0 -146 92q-23 55 -29 184q-8 172 -95.5 295t-252.5 155v-583q0 -28 8 -42q22 -40 150 -40v-61q-76 6 -139 6h-200q-63 0 -139 -6v61q128 0 150 40q8 14 8 42v583q-165 -32 -252.5 -155t-95.5 -295q-6 -129 -29 -184q-40 -92 -146 -92 h-87q-35 0 -35 22q0 15 25 24l46 15q40 20 53 114q4 68 9 136q16 205 141.5 326t333.5 140l-402 491q-13 16 -13 35q0 40 79 40h867q88 0 88 -78q0 -35 -19 -57l-366 -431q209 -18 335 -139.5t142 -326.5q5 -68 9 -136q13 -94 53 -114l46 -15q25 -9 25 -24zM1159 1209 q0 78 -88 78h-469q-79 0 -79 -40q0 -19 13 -35l321 -393l283 333q19 22 19 57z" />
+<glyph unicode="ѫ" horiz-adv-x="1215" d="M1164 23q0 -23 -38 -23h-66q-84 0 -116 61q-20 38 -27 135q-19 253 -236 299v-332q0 -71 31 -88q18 -9 83 -9h14v-66l-200 6l-202 -6v66q5 0 18.5 -0.5t20.5 -0.5q53 0 70.5 20.5t17.5 73.5v336q-217 -46 -236 -299q-7 -97 -27 -135q-32 -61 -116 -61h-66q-38 0 -38 23 q0 14 24 23q18 5 36 11q26 13 34 72l6 86q14 142 106.5 225.5t237.5 100.5l-286 312q-13 14 -13 31q0 39 71 39h650q78 0 78 -64q0 -28 -17 -46l-258 -272q145 -17 237.5 -100.5t106.5 -225.5l6 -86q8 -59 34 -72q18 -6 36 -11q24 -9 24 -23zM869 822q0 40 -54 40h-366 q-33 0 -33 -15q0 -8 7 -16l232 -253l203 213q11 12 11 31z" />
+<glyph unicode="Ѭ" horiz-adv-x="2248" d="M649 1284l-55 2q-123 0 -142 -36q-8 -16 -8 -45v-420h885l-395 483q-13 16 -13 35q0 40 79 40h867q88 0 88 -78q0 -35 -19 -57l-366 -431q209 -18 335 -139.5t142 -326.5q5 -68 9 -136q13 -94 53 -114l46 -15q25 -9 25 -24q0 -22 -35 -22h-87q-106 0 -146 92 q-23 55 -29 184q-8 172 -95.5 295t-252.5 155v-583q0 -28 8 -42q22 -40 150 -40v-61q-76 6 -139 6h-200q-63 0 -139 -6v61q128 0 150 40q8 14 8 42v583q-165 -32 -252.5 -155t-95.5 -295q-6 -129 -29 -184q-40 -92 -146 -92h-87q-35 0 -35 22q0 15 25 24l46 15q40 20 53 114 q4 68 9 136q23 300 271 414h-688v-584q0 -29 8 -45q18 -35 187 -35h10v-61q-71 6 -115 6h-358q-37 0 -108 -6v61q9 0 27.5 -0.5t28.5 -0.5q121 0 139 36q7 14 7 45v1064q0 31 -7 45q-17 34 -149 34h-46v62q70 -6 112 -6h354q45 0 115 6v-62zM1819 1209q0 78 -88 78h-469 q-79 0 -79 -40q0 -19 13 -35l321 -393l283 333q19 22 19 57z" />
+<glyph unicode="ѭ" horiz-adv-x="1795" d="M1744 23q0 -23 -38 -23h-66q-84 0 -116 61q-20 38 -27 135q-19 253 -236 299v-332q0 -71 31 -88q18 -9 83 -9h14v-66l-200 6l-202 -6v66q5 0 18.5 -0.5t20.5 -0.5q53 0 70.5 20.5t17.5 73.5v336q-217 -46 -236 -299q-7 -97 -27 -135q-32 -61 -116 -61h-66q-38 0 -38 23 q0 14 24 23q18 5 36 11q26 13 34 72l6 86q18 181 163 268h-524v-316q0 -49 9 -68q16 -33 159 -33v-66q-203 6 -238 6t-244 -6v66q140 0 157 30q10 18 10 71v589q0 53 -10 71q-17 30 -157 30v66q209 -6 244 -6t238 6v-66q-143 0 -159 -33q-9 -19 -9 -68v-207h698l-279 304 q-13 14 -13 31q0 39 71 39h650q78 0 78 -64q0 -28 -17 -46l-258 -272q145 -17 237.5 -100.5t106.5 -225.5l6 -86q8 -59 34 -72q18 -6 36 -11q24 -9 24 -23zM1449 822q0 40 -54 40h-366q-33 0 -33 -15q0 -8 7 -16l232 -253l203 213q11 12 11 31z" />
+<glyph unicode="Ѯ" horiz-adv-x="1178" d="M621 32l-189 15q-64 0 -107 -54t-43 -107t23 -89.5t67 -36.5t165.5 61.5t192.5 61.5q151 0 202 -94q33 -63 39 -231h-21q-20 85 -44 112q-33 40 -102 40t-177 -49t-168 -49q-105 0 -180 80t-75 181.5t63.5 182t158.5 80.5q31 0 91.5 -9t91.5 -9q286 0 286 241 q0 156 -98.5 247t-255.5 91h-116q-78 -1 -116.5 -1t-38.5 30q0 16 13 22.5t170.5 18t256.5 77.5q150 100 150 257q0 111 -103 174q-87 53 -225.5 53t-242.5 -62.5t-130 -138.5q-4 -20 -17 -58q-10 -20 -35 -20q-41 0 -39 46l9 246q2 49 35 49q26 0 112 -85q127 79 306 85 l-272 175l29 41l294 -152l292 152l29 -41l-274 -179q163 -16 278 -79q147 -80 147 -208q0 -261 -386 -360q172 -25 295 -115q148 -108 148 -265q0 -176 -166 -261q-128 -66 -323 -66z" />
+<glyph unicode="ѯ" horiz-adv-x="920" d="M395 50l69 -5q102 0 160.5 54t58.5 154q0 222 -251 222h-118q-55 0 -55 23t29.5 25.5t79.5 5.5q122 8 192 62q86 66 86 151.5t-58.5 121t-151 35.5t-165 -36.5t-94 -91t-36.5 -54.5q-28 0 -28 58v122q0 37 5 47.5t36 8.5q25 -19 77 -54q85 50 206 54l-284 287l29 41 l294 -252l292 252l29 -41l-285 -290q118 -12 200 -55q105 -55 105 -145q0 -170 -254 -242q112 -21 195 -81q102 -73 102 -174q0 -131 -96 -201.5t-231 -70.5l-142 -6q-62 0 -105 -43t-43 -105q0 -80 55 -80q38 0 154 53t176 53q129 0 173 -84q29 -55 34 -204l-18 -2 q-19 75 -38 98q-27 34 -86 34t-154 -42t-144 -42q-91 0 -155 64.5t-64 156t63.5 155t155.5 63.5z" />
+<glyph unicode="Ѱ" horiz-adv-x="1588" d="M460 61l83 -2q139 0 159 40q11 22 11 62v282q-218 9 -356.5 152.5t-155.5 363.5q-5 68 -9 136q-13 94 -53 114l-46 15q-25 9 -25 24q0 22 35 22h87q106 0 146 -92q23 -55 29 -184q8 -179 91 -313q95 -154 257 -185v710q0 25 -7 42q-16 39 -216 39h-30v62q74 -6 143 -6 h382q69 0 143 6v-62h-30q-200 0 -216 -39q-7 -17 -7 -42v-710q162 31 257 185q83 134 91 313q6 129 29 184q40 92 146 92h87q35 0 35 -22q0 -15 -25 -24l-46 -15q-40 -20 -53 -114q-4 -68 -9 -136q-17 -220 -155.5 -363.5t-356.5 -152.5v-282q0 -40 11 -62q20 -40 159 -40 l83 2v-61q-74 6 -143 6h-382q-69 0 -143 -6v61z" />
+<glyph unicode="ѱ" horiz-adv-x="1254" d="M1201 656q0 -244 -99 -438q-122 -241 -343 -241v-389h-83v389q-414 0 -414 386v415q0 39 -21 73.5t-58 34.5q-79 0 -79 -173q0 -7 3 -84h-55v120q0 84 47 143.5t132 59.5t132.5 -62.5t47.5 -153.5v-351q0 -186 39 -256q55 -100 226 -100v894h83v-894q151 0 248 146 q86 130 86 289q0 70 -42.5 200.5t-42.5 199.5q0 96 67 96q85 0 112 -118q14 -59 14 -186z" />
+<glyph unicode="Ѳ" horiz-adv-x="1445" d="M722 -43q-280 0 -467 214t-187 498.5t186.5 502.5t468 218t468 -217.5t186.5 -503t-187.5 -499t-467.5 -213.5zM1175 696q0 438 -260 590q-92 54 -192 54t-191 -53q-262 -153 -262 -591q0 -469 265 -632q91 -56 185 -56t188 55q267 156 267 633zM869 560q-70 0 -185 56.5 t-155 56.5q-100 0 -138 -113h-61q20 102 85 169.5t164 67.5q66 0 177 -54.5t158 -54.5q95 0 143 121h61q-32 -118 -79 -175q-62 -74 -170 -74z" />
+<glyph unicode="ѳ" horiz-adv-x="1054" d="M191.5 118.5q-138.5 142.5 -138.5 341.5t138 349.5t336.5 150.5t336.5 -151t138 -350.5t-139 -341t-336 -141.5t-335.5 142.5zM776 188q47 92 47 292.5t-56 292.5q-84 138 -244.5 138t-241.5 -143q-51 -90 -51 -294.5t55 -299.5q83 -144 246.5 -144t244.5 158zM627 385 q-49 0 -127.5 39t-106.5 39q-65 0 -91 -78h-51q34 173 177 173q46 0 122 -37.5t108 -37.5q63 0 95 83h51q-49 -181 -177 -181z" />
+<glyph unicode="Ѵ" horiz-adv-x="1601" d="M1533 1205q0 -92 -91 -92q-38 0 -64 25.5t-26 64.5q0 71 63 91q-23 10 -51 10q-81 0 -134 -134l-470 -1184q-12 -31 -38 -31t-39 2l-426 1248q-12 35 -25 49q-26 28 -164 28v61q138 -6 299 -6t232 6v-61q-165 0 -165 -59q0 -13 9 -39l337 -985l387 975q76 191 197 191 q67 0 118 -47t51 -113z" />
+<glyph unicode="ѵ" horiz-adv-x="1167" d="M1115 805q0 -75 -74 -75t-74 73q0 52 50 71q-23 10 -50 10q-49 0 -83 -68q-4 -7 -43 -105l-293 -735h-30q-2 1 -5.5 1t-11 -0.5t-11.5 -0.5l-259 763q-30 87 -55 102.5t-123 15.5v66q90 -6 175 -6t264 6v-66h-4q-125 0 -125 -60q0 -5 208 -615l242 598q68 158 154 158 q57 0 102.5 -38.5t45.5 -94.5z" />
+<glyph unicode="Ѷ" horiz-adv-x="1601" d="M1533 1205q0 -92 -91 -92q-38 0 -64 25.5t-26 64.5q0 71 63 91q-23 10 -51 10q-81 0 -134 -134l-470 -1184q-12 -31 -38 -31t-39 2l-426 1248q-12 35 -25 49q-26 28 -164 28v61q138 -6 299 -6t232 6v-61q-165 0 -165 -59q0 -13 9 -39l337 -985l387 975q76 191 197 191 q67 0 118 -47t51 -113zM813 1532q0 28 20 51t44.5 23t43.5 -13l292 -195l-26 -50l-328 123q-46 17 -46 61zM463 1532q0 28 20 51t44.5 23t43.5 -13l292 -195l-26 -50l-328 123q-46 17 -46 61z" />
+<glyph unicode="ѷ" horiz-adv-x="1167" d="M1115 805q0 -75 -74 -75t-74 73q0 52 50 71q-23 10 -50 10q-49 0 -83 -68q-4 -7 -43 -105l-293 -735h-30q-2 1 -5.5 1t-11 -0.5t-11.5 -0.5l-259 763q-30 87 -55 102.5t-123 15.5v66q90 -6 175 -6t264 6v-66h-4q-125 0 -125 -60q0 -5 208 -615l242 598q68 158 154 158 q57 0 102.5 -38.5t45.5 -94.5zM595 1300q-29 24 -29 54t23.5 53t54 23t53.5 -29l248 -322l-37 -35zM225 1300q-29 24 -29 54t23.5 53t54 23t53.5 -29l248 -322l-37 -35z" />
+<glyph unicode="Ѹ" horiz-adv-x="2481" d="M2429 805q0 -75 -74 -75t-74 73q0 52 50 71q-23 10 -50 10q-49 0 -83 -68q-6 -12 -43 -105l-361 -905q-98 -245 -274 -245q-76 0 -136 50t-60 124q0 91 89 91q39 0 65 -25.5t26 -63.5q0 -81 -85 -91q41 -38 101 -38q93 0 158 92q32 45 86 173l42 100l-261 766 q-30 87 -55 102.5t-123 15.5v66q90 -6 175 -6t264 6v-66h-4q-125 0 -125 -60q0 -5 208 -615l242 598q68 158 154 158q57 0 102.5 -38.5t45.5 -94.5zM722 -43q-280 0 -467 214t-187 498.5t186.5 502.5t468 218t468 -217.5t186.5 -503t-187.5 -499t-467.5 -213.5zM1177 605 q0 216 -65 385q-79 205 -240 296q-96 54 -195.5 54t-187.5 -53q-223 -135 -223 -509q0 -221 68 -401q81 -217 244 -313q95 -56 189 -56t184 55q226 139 226 542z" />
+<glyph unicode="ѹ" horiz-adv-x="1951" d="M946 481.5q0 -201.5 -127.5 -353.5t-324.5 -152t-319 143.5t-122 341t126.5 348.5t321 151t320 -138.5t125.5 -340zM783 406q0 187 -65 326q-84 180 -250 180q-135 0 -200 -121q-52 -96 -52 -262.5t67 -311.5q87 -187 251 -187q249 0 249 376zM1899 805q0 -75 -74 -75 t-74 73q0 52 50 71q-23 10 -50 10q-49 0 -83 -68q-6 -12 -43 -105l-361 -905q-98 -245 -274 -245q-76 0 -136 50t-60 124q0 91 89 91q39 0 65 -25.5t26 -63.5q0 -81 -85 -91q41 -38 101 -38q93 0 158 92q32 45 86 173l42 100l-261 766q-30 87 -55 102.5t-123 15.5v66 q90 -6 175 -6t264 6v-66h-4q-125 0 -125 -60q0 -5 208 -615l242 598q68 158 154 158q57 0 102.5 -38.5t45.5 -94.5z" />
+<glyph unicode="Ѻ" horiz-adv-x="1764" d="M1528 1121q168 -178 168 -444.5t-166 -446.5q-196 -212 -575 -231l28 -138q2 -10 2 -18q0 -38 -31.5 -62t-71.5 -24t-71.5 24t-31.5 62q0 8 2 18l28 138q-376 19 -573 227q-168 178 -168 444.5t166 446.5q196 212 575 231l-28 138q-2 10 -2 18q0 38 31.5 62t71.5 24 t71.5 -24t31.5 -62q0 -8 -2 -18l-28 -138q376 -19 573 -227zM1494 656q0 427 -340 584q-100 46 -209 57l-35 -175q-9 -45 -28 -45t-28 47l-35 173q-111 -10 -208 -53q-341 -150 -341 -552q0 -427 340 -584q100 -46 209 -57l35 174q9 45 28 45t28 -47l35 -172q111 10 208 53 q341 150 341 552z" />
+<glyph unicode="ѻ" horiz-adv-x="1336" d="M1113 802q170 -124 170 -328.5t-160.5 -328t-397.5 -137.5l24 -118q1 -5 1 -15q0 -31 -25 -50t-57 -19t-57 19t-25 50q0 10 1 15l24 118q-235 14 -388 126q-170 124 -170 328.5t160.5 328t397.5 137.5l-24 118q-1 5 -1 15q0 31 25 50t57 19t57 -19t25 -50q0 -10 -1 -15 l-24 -118q235 -14 388 -126zM1038 210q68 87 68 257.5t-73 262.5q-104 131 -318 149l-25 -124q-7 -36 -21.5 -36t-22.5 38l-25 122q-222 -19 -323 -148q-68 -87 -68 -257.5t73 -262.5q104 -131 319 -149l24 119q7 36 21.5 36t22.5 -38l24 -117q222 18 324 148z" />
+<glyph unicode="Ѽ" horiz-adv-x="1686" d="M1198 1309q-108 0 -255.5 107t-268.5 107q-157 0 -239 -241l-37 43q79 281 352 281q100 0 203 -59l163 -110q90 -59 150.5 -59t125.5 33l21 -39q-107 -63 -215 -63zM695 1382l7 -49q0 -28 -20.5 -50t-48.5 -22q-79 0 -79 83q0 48 39.5 80.5t89.5 32.5q154 0 243 -161 l-27 -18q-74 129 -177 129q-27 0 -27 -25zM1618 598q0 -243 -113 -426q-133 -215 -366 -215t-292 247h-8q-59 -247 -292 -247t-366 215q-113 183 -113 426q0 462 470 619l13 -41q-168 -68 -231 -216q-49 -113 -49 -321q0 -630 294 -630q94 0 156.5 99t62.5 205t-23 210.5 t-23 122.5q0 125 105 125t105 -125q0 -18 -23 -122.5t-23 -210.5t62.5 -205t156.5 -99q294 0 294 630q0 208 -49 321q-63 148 -231 216l13 41q470 -157 470 -619z" />
+<glyph unicode="ѽ" horiz-adv-x="1294" d="M1123 1184q-94 -63 -189 -63t-223.5 107t-235.5 107q-137 0 -210 -241l-37 43q31 125 111 203t197 78t258.5 -114t205.5 -114q45 0 102 33zM493 1194l7 -49q0 -28 -20.5 -50t-48.5 -22q-79 0 -79 83q0 48 39.5 80.5t89.5 32.5q154 0 243 -161l-27 -18q-74 129 -177 129 q-27 0 -27 -25zM1241 430q0 -173 -79 -302q-93 -152 -255 -152q-224 0 -256 267h-8q-32 -267 -256 -267q-162 0 -255 152q-79 129 -79 302q0 244 124.5 385.5t365.5 144.5v-48q-327 -10 -327 -470q0 -169 25 -257q44 -155 169 -155q99 0 149 102q39 79 39 191.5t-23 219.5 t-23 122q0 116 95 116t95 -116q0 -15 -23 -122t-23 -219.5t39 -191.5q50 -102 149 -102q125 0 169 155q25 88 25 257q0 460 -327 470v48q241 -3 365.5 -144.5t124.5 -385.5z" />
+<glyph unicode="Ѿ" horiz-adv-x="1686" d="M1094 1510h-60q-90 0 -109 -7q-40 -15 -40 -81v-71h-84v71q0 66 -40 81q-19 7 -109 7h-60q-142 0 -186 -30t-56 -137h-63l20 263h1072l20 -263h-63q-12 107 -56 137t-186 30zM1618 617q0 -252 -109 -438q-131 -222 -366.5 -222t-295.5 247h-8q-60 -247 -295.5 -247 t-366.5 222q-109 186 -109 438q0 533 428 701l14 -41q-133 -76 -194 -286q-46 -156 -46 -356q0 -626 295 -626q94 0 156.5 99t62.5 205t-23 210.5t-23 122.5q0 125 105 125t105 -125q0 -18 -23 -122.5t-23 -210.5t62.5 -205t156.5 -99q295 0 295 626q0 200 -46 356 q-61 210 -194 286l14 41q428 -168 428 -701z" />
+<glyph unicode="ѿ" horiz-adv-x="1294" d="M1241 430q0 -173 -79 -302q-93 -152 -255 -152q-224 0 -256 267h-8q-32 -267 -256 -267q-162 0 -255 152q-79 129 -79 302q0 244 124.5 385.5t365.5 144.5v-48q-327 -10 -327 -470q0 -169 25 -257q44 -155 169 -155q99 0 149 102q39 79 39 191.5t-23 219.5t-23 122 q0 116 95 116t95 -116q0 -15 -23 -122t-23 -219.5t39 -191.5q50 -102 149 -102q125 0 169 155q25 88 25 257q0 460 -327 470v48q241 -3 365.5 -144.5t124.5 -385.5zM833 1257q-87 0 -108 -8q-40 -15 -40 -80v-154h-74v154q0 66 -41 81q-20 7 -110 7q-155 0 -195.5 -42.5 t-50.5 -199.5h-53l25 328h921l26 -328h-54q-11 156 -51 199t-195 43z" />
+<glyph unicode="Ҁ" horiz-adv-x="1335" d="M1267 854q0 -26 -29 -26t-35 32q-12 60 -47 178q-51 127 -151 208.5t-217.5 81.5t-219.5 -50q-147 -72 -222.5 -224.5t-75.5 -333.5t82 -337.5t240 -224.5q95 -41 170 -41t133 17v-430q0 -27 13.5 -52t91.5 -31h110v-61q-71 6 -117 6h-373q-41 0 -112 -6v61 q8 0 27.5 -0.5t29.5 -0.5q128 0 147 36q9 17 9 49v353q-267 12 -460 204.5t-193 462.5t204 467.5t480 197.5q193 0 363 -169l99 144q17 25 31 25q22 0 22 -33v-503z" />
+<glyph unicode="ҁ" horiz-adv-x="896" d="M730 906q113 -64 113 -170t-97 -106q-42 0 -70.5 28t-28.5 70q0 94 100 99q-79 78 -229 78q-60 0 -120 -34q-168 -94 -168 -371q0 -119 43.5 -228t134.5 -158q63 -34 122.5 -34t105.5 17v-172q0 -214 -36 -342h-148q37 173 37 311v133q-183 9 -309.5 144t-126.5 323 t135 327t327 139q121 0 215 -54z" />
+<glyph unicode="҂" horiz-adv-x="874" d="M789 960q-64 0 -124 -130l-107 -233l129 -41l-36 -73l-112 73l-152 -325l130 -38l-36 -73l-112 73l-79 -165q-42 -88 -42 -138.5t74 -94.5l-16 -36l-304 144l14 34q44 -15 68 -15q63 0 129 125q1 2 79 182l-122 35l33 73l107 -69l153 326l-124 35l34 73l108 -69l109 231 q36 76 36 122q0 66 -74 97l16 37l304 -144l-14 -35q-40 19 -69 19z" />
+<glyph unicode="҃" horiz-adv-x="0" d="M1054 1372q-94 -63 -189 -63t-223.5 107t-235.5 107q-137 0 -210 -241l-37 43q31 125 111 203t197 78t258.5 -114t205.5 -114q45 0 102 33zM424 1382l7 -49q0 -28 -20.5 -50t-48.5 -22q-79 0 -79 83q0 48 39.5 80.5t89.5 32.5q154 0 243 -161l-27 -18q-74 129 -177 129 q-27 0 -27 -25z" />
+<glyph unicode="҄" horiz-adv-x="0" d="M1003 1352q-85 -63 -182 -63t-211 107.5t-211 107.5t-165 -241l-24 32q66 291 273 291q100 0 229.5 -118.5t186.5 -118.5q37 0 90 31z" />
+<glyph unicode="҅" horiz-adv-x="0" d="M631 1402l11 65q0 32 -37 32q-133 0 -233 -170l-27 18q121 219 313 219q66 0 118 -43t52 -99t-28.5 -87t-71.5 -31t-70 29t-27 67z" />
+<glyph unicode="҆" horiz-adv-x="0" d="M532 1467l10 -65q0 -38 -26.5 -67t-69.5 -29t-72 31t-29 87t52.5 99t118.5 43q191 0 312 -219l-26 -18q-100 170 -233 170q-37 0 -37 -32z" />
+<glyph unicode="҇" horiz-adv-x="0" d="M462 1521q-98 0 -156 -73q-23 -29 -85 -158h-114q70 149 128 206q85 85 221 85q40 0 237 -74t418 -136l-74 -81q-75 24 -274 109l-151 73q-104 49 -150 49z" />
+<glyph unicode="҈" horiz-adv-x="0" d="M2257 1026h-32q-3 82 -79 137.5t-161 55.5t-161 -55.5t-79 -137.5h-32q0 120 77.5 216.5t194.5 96.5t194.5 -96.5t77.5 -216.5zM2519 433h-32q-3 82 -79 137.5t-161 55.5t-161 -55.5t-79 -137.5h-32q0 120 77.5 216.5t194.5 96.5t194.5 -96.5t77.5 -216.5zM1542 1293h-32 q-3 82 -79 137.5t-161 55.5t-161 -55.5t-79 -137.5h-32q0 120 77.5 216.5t194.5 96.5t194.5 -96.5t77.5 -216.5zM2257 -169h-32q-3 82 -79 137.5t-161 55.5t-161 -55.5t-79 -137.5h-32q0 120 77.5 216.5t194.5 96.5t194.5 -96.5t77.5 -216.5zM827 1019h-32q-3 82 -79 137.5 t-161 55.5t-161 -55.5t-79 -137.5h-32q0 120 77.5 216.5t194.5 96.5t194.5 -96.5t77.5 -216.5zM1542 -442h-32q-3 82 -79 137.5t-161 55.5t-161 -55.5t-79 -137.5h-32q0 120 77.5 216.5t194.5 96.5t194.5 -96.5t77.5 -216.5zM565 429h-32q-3 82 -79 137.5t-161 55.5 t-161 -55.5t-79 -137.5h-32q0 120 77.5 216.5t194.5 96.5t194.5 -96.5t77.5 -216.5zM827 -169h-32q-3 82 -79 137.5t-161 55.5t-161 -55.5t-79 -137.5h-32q0 120 77.5 216.5t194.5 96.5t194.5 -96.5t77.5 -216.5z" />
+<glyph unicode="҉" horiz-adv-x="0" d="M2266 1000q0 -19 -27 -19l-62 21q-48 16 -98 16q-73 0 -73 -39q0 -10 13.5 -42.5t13.5 -62.5t-29 -56.5t-70.5 -26.5t-70.5 32.5t-29 76.5q0 82 69.5 128t140 46t146.5 -24.5t76 -49.5zM1609 1593q33 13 49.5 13t16.5 -15.5t-7 -20.5t-47.5 -22t-82.5 -53t-42 -73 q0 -17 60 -46t60 -76.5t-28.5 -77t-78 -29.5t-81.5 43.5t-32 100.5q0 171 213 256zM2308 199q12 -30 12 -48t-15 -18t-20 7t-21.5 47t-53.5 82.5t-73 42.5q-18 0 -47 -60t-76 -60t-76.5 29t-29.5 78.5t43.5 81t100.5 31.5q171 0 256 -213zM992.5 1345q26.5 -30 26.5 -71 t-32.5 -69.5t-76.5 -28.5q-82 0 -127.5 69t-45.5 140.5t17 124.5q31 96 56 96q19 0 19 -26q0 3 -18.5 -52t-18.5 -106q0 -74 39 -74q10 0 42.5 13.5t62.5 13.5t56.5 -30zM1795 -257q0 -39 -17.5 -112t-40.5 -73t-23 25q0 -8 14 44.5t14 94.5q0 92 -46 92q-8 0 -42 -17 t-65 -17t-58 29.5t-27 71.5t33.5 71.5t79.5 29.5q84 0 134 -81q44 -69 44 -158zM624.5 884q29.5 -29 29.5 -78.5t-43 -80.5t-100 -31q-172 0 -257 213q-12 30 -12 47.5t14.5 17.5t20.5 -7.5t22.5 -47t52.5 -82t72 -42.5q18 0 47.5 60t76.5 60t76.5 -29zM1083 -185 q0 -187 -248 -250q-28 -7 -39 -7q-25 0 -25 19q0 13 10.5 19t50.5 16t90 43t50 69q0 14 -52 47.5t-52 77t30.5 72t77.5 28.5t77 -39.5t30 -94.5zM651 201q0 -81 -69 -126.5t-139.5 -45.5t-146.5 24.5t-76 49.5q0 19 27 19q-4 0 52.5 -19t106.5 -19q73 0 73 39q0 10 -14 42.5 t-14 62.5t29.5 56.5t71 26.5t70.5 -32.5t29 -77.5z" />
+<glyph unicode="Ҋ" horiz-adv-x="1631" d="M1564 1284l-56 2q-122 0 -140 -36q-8 -16 -8 -45v-1064q0 -29 8 -45q18 -35 186 -35h10v-61l-329 -427l-29 22l91 184q66 139 66 176q0 45 -92 45h-288v61q9 0 28 -0.5t29 -0.5q119 0 137 36q8 16 8 45v964l-734 -1008l1 -1q14 -30 90 -35q3 0 30 -0.5t77 0.5v-61 q-71 6 -115 6h-358q-37 0 -108 -6v61q9 0 27.5 -0.5t28.5 -0.5q121 0 139 36q7 14 7 45v1064q0 31 -7 45q-17 34 -149 34h-46v62q70 -6 112 -6h354q45 0 115 6v-62l-55 2q-123 0 -142 -36q-8 -16 -8 -45v-967l734 1009q-15 37 -149 37h-46v62q70 -6 112 -6h356q43 0 113 6 v-62zM1163 1516q0 -85 -140 -130q-101 -33 -211 -33t-211 33q-140 45 -140 130q0 39 25 64.5t64 25.5t64 -25.5t25 -70.5t-38 -70q63 -24 174 -24h74q111 0 174 24q-38 25 -38 70t25 70.5t64 25.5t64 -25.5t25 -64.5z" />
+<glyph unicode="ҋ" horiz-adv-x="1261" d="M1048 -45q0 45 -70 45h-256v66q142 0 158 33q9 19 9 68v570l-499 -653q38 -18 148 -18v-66q-203 6 -238 6t-244 -6v66q142 0 158 33q9 19 9 68v589q0 49 -9 68q-16 33 -158 33v66q209 -6 244 -6t238 6v-66q-143 0 -159 -33q-9 -19 -9 -68v-570l499 653q-38 18 -147 18v66 q209 -6 244 -6t238 6v-66q-143 0 -159 -33q-9 -19 -9 -68v-589q0 -49 9 -68q16 -33 159 -33v-66l-246 -336l-39 27q28 36 78.5 134t50.5 130zM892 1398q89 0 89 -96t-113.5 -158.5t-237.5 -62.5t-229 58q-122 67 -122 163t89 96t89 -90t-89 -90q99 -74 262 -74t262 74 q-89 0 -89 90t89 90z" />
+<glyph unicode="Ҍ" horiz-adv-x="1346" d="M1104 636q174 -101 174 -269t-135.5 -267.5t-302.5 -99.5h-772v61q62 -2 63 -2q113 0 134 45q5 11 5 42v845h-202v62h202v287h164v-287h382v-62h-382v-270h336q188 0 334 -85zM994 147q88 86 88 221t-87 222t-210 87h-351v-537q0 -53 16.5 -66t69.5 -13h257q129 0 217 86 z" />
+<glyph unicode="ҍ" horiz-adv-x="1118" d="M975 344q27 -46 27 -94t-26 -95q-86 -155 -316 -155h-598v66h9q132 0 148 30q10 18 10 71v504h-167v62h167v190h135v-190h178v-62h-178v-185h289q238 0 322 -142zM608 66q93 0 158 49.5t65 138t-54.5 145.5t-140.5 57h-272v-302q0 -62 14 -75t78 -13h152z" />
+<glyph unicode="Ҏ" horiz-adv-x="1295" d="M1074 1249q154 -106 154 -264.5t-130 -256.5t-289 -108l140 -243l-54 -31l-158 273h-293v-473q0 -32 7 -48q17 -37 181 -37h17v-61q-72 6 -133 6h-326q-50 0 -122 -6v61l55 -1q122 0 140 38q7 15 7 48v1051q0 32 -7 48q-16 37 -158 37q-18 0 -37 -1v62h695q174 0 311 -94 zM1024 977q0 161 -75.5 232.5t-237.5 71.5h-186q-53 0 -69.5 -13t-16.5 -66v-532h269l-137 237l54 31l153 -265q246 28 246 304z" />
+<glyph unicode="ҏ" horiz-adv-x="1160" d="M360 805q127 141 308 141t310 -146.5t129 -327.5t-105.5 -314.5t-266.5 -169.5l106 -184l-54 -31l-118 205q-19 -2 -38 -2q-78 0 -158.5 42t-105.5 109v-388q0 -42 11 -59q19 -29 114 -29q19 0 41 1v-66q-169 5 -241.5 5t-238.5 -5v66q37 -2 76.5 -2t60.5 14q30 19 30 83 v1002q0 51 -10 71.5t-44 28.5q-26 6 -83 6h-30v68l307 23v-141zM705 39q107 39 165.5 166t58.5 267t-67 267q-81 154 -218 154q-179 0 -277 -172v-478q0 -46 30 -89q91 -130 225 -130q10 0 20 1l-125 215l54 31z" />
+<glyph unicode="Ґ" horiz-adv-x="1216" d="M530 1281q-51 0 -68.5 -13t-17.5 -66v-1065q0 -22 8 -39q17 -37 223 -37h22v-61q-74 6 -120 6h-382q-55 0 -127 -6v61q8 0 26 -0.5t28 -0.5q124 0 141 38q7 15 7 48v1053q0 31 -7 47q-15 35 -170 35h-25v62h676q170 0 241.5 61t97.5 202h51l-40 -325h-564z" />
+<glyph unicode="ґ" horiz-adv-x="934" d="M525 856q-78 0 -106 -11q-48 -20 -48 -86v-588q0 -47 6 -62q10 -26 47 -34t154 -8v-67q-87 6 -203 6h-83h3q0 -1 -240 -6v67h86q60 5 71 28.5t11 71.5v589q0 48 -11 71.5t-71 28.5h-86v67h380q198 0 253 33q80 47 98 229h53l-38 -329h-276z" />
+<glyph unicode="Ғ" horiz-adv-x="1216" d="M744 1281h-214q-51 0 -68.5 -13.5t-17.5 -65.5v-559h593v-62h-593v-444q0 -22 8 -39q17 -37 223 -37h22v-61q-74 6 -120 6h-382q-55 0 -127 -6v61q8 0 26 -0.5t28 -0.5q124 0 141 38q7 15 7 48v435h-202v62h202v556q0 31 -7 47q-15 35 -170 35h-25v62h1026l55 -442h-49 q-24 212 -82 285q-74 95 -274 95z" />
+<glyph unicode="ғ" horiz-adv-x="1035" d="M535 856q-112 0 -122 -2q-32 -6 -40 -31q-3 -10 -3 -55v-305h325v-62h-325v-230q0 -47 7 -62q10 -26 51 -34.5t150 -8.5v-66q-80 6 -178 6t-344 -6v66q140 0 157 30q10 18 10 71v234h-167v62h167v293q0 52 -10 70q-16 30 -151 30h-6v67h846l38 -328h-53q-18 182 -98 229 q-55 32 -254 32z" />
+<glyph unicode="Ҕ" horiz-adv-x="1216" d="M556 793q284 0 463 -162t179 -442t-180.5 -450.5t-461.5 -170.5q-118 0 -233 59t-195 153l43 32q176 -175 392.5 -175t332.5 167q100 145 100 378.5t-102 379.5q-117 169 -338 169q-54 0 -112 -12v-582q0 -22 8 -39q17 -37 223 -37h22v-61q-74 6 -120 6h-382 q-55 0 -127 -6v61q8 0 26 -0.5t28 -0.5q124 0 141 38q7 15 7 48v1053q0 31 -7 47q-15 35 -170 35h-25v62h1026l55 -442h-49q-24 212 -82 285q-74 95 -274 95h-214q-51 0 -68.5 -13t-17.5 -66v-417q56 8 112 8z" />
+<glyph unicode="ҕ" horiz-adv-x="1035" d="M946 251q0 -113 -58 -230q-153 -310 -568 -463l-14 48q194 72 327 220q150 165 150 357q0 114 -63 186t-176 72q-84 0 -174 -75v-195q0 -47 7 -62q10 -26 51 -34.5t150 -8.5v-66q-80 6 -178 6t-344 -6v66q140 0 157 30q10 18 10 71v589q0 52 -10 70q-16 30 -151 30h-6v67 h846l38 -328h-53q-18 182 -98 229q-55 32 -254 32q-112 0 -122 -2q-32 -6 -40 -31q-3 -10 -3 -55v-325q133 118 247 118q147 0 238 -82.5t91 -227.5z" />
+<glyph unicode="Җ" horiz-adv-x="2214" d="M1399 1284l-57 2q-126 0 -142 -40q-6 -15 -6 -44v-447q289 8 434 167q62 67 159 289q67 154 167 154q53 0 92 -41t39 -95q0 -92 -90 -92q-39 0 -65 25.5t-26 56.5t10 53q-41 -17 -97.5 -159.5t-116.5 -215.5q-106 -130 -287 -165v-8q116 -16 221 -77t151 -158 q25 -54 39 -150l25 -181q3 -17 14 -50q24 -47 168 -47h29q0 -10 -0.5 -37.5t-0.5 -41.5q0 -312 87 -376q-93 17 -183 183t-167 197q-50 20 -84 52q-82 76 -82 237q0 13 1 40v40q0 136 -83 239.5t-216 103.5h-138v-559q0 -28 9 -45q17 -33 186 -33h10v-61q-71 6 -120 6h-344 q-49 0 -120 -6v61h10q169 0 186 33q9 17 9 45v559h-138q-133 0 -216 -103.5t-83 -239.5q0 -13 0.5 -40t0.5 -40q0 -318 -330 -318q-83 0 -134.5 65t-51.5 151q0 33 24 33q18 0 24 -31q32 -175 131 -175q88 0 118 158l23 169q16 108 41 162q46 97 151 158t221 77v8 q-181 35 -287 165q-60 73 -116.5 215.5t-97.5 159.5q10 -22 10 -53t-26 -56.5t-65 -25.5q-90 0 -90 92q0 54 39 95t92 41q100 0 167 -154q97 -222 159 -289q145 -159 434 -167v447q0 29 -6 44q-16 40 -142 40l-57 -2v62q70 -6 120 -6h344q50 0 120 6v-62z" />
+<glyph unicode="җ" horiz-adv-x="1611" d="M1567 66l-2 -101q0 -212 94 -231q-86 0 -157 105q-97 146 -134 173q-92 69 -102 215q-5 76 -20 111.5t-70 70.5q-108 69 -236 69l-56 -7v-313q0 -41 9 -59q17 -33 150 -33h8v-66q-203 6 -237 6t-244 -6v66q7 0 23.5 -0.5t54 -0.5t63.5 16t26 77v313l-56 7 q-128 0 -236 -69q-55 -35 -70.5 -71t-20 -119.5t-53.5 -158.5t-134 -75q-67 0 -101 67q-27 53 -27 128q0 34 27 34q22 0 26 -26q10 -62 16 -78q17 -44 57 -44q66 0 66 141.5t62.5 205t196.5 93.5q-68 33 -107 130l-53 156q-32 76 -89 76q-25 0 -25 -18q0 -3 16 -29.5t16 -60 t-27.5 -62t-66.5 -28.5q-102 0 -102 102q0 70 46 118t112 48q148 0 200 -178q37 -124 57 -151q51 -70 178 -70h92v226q0 41 -9 59q-17 33 -150 33h-8v66q208 -6 243.5 -6t237.5 6v-66q-7 0 -23.5 0.5t-54 0.5t-63.5 -16t-26 -77v-226h92q127 0 178 70q20 27 53.5 140.5 t96.5 158.5q42 30 107.5 30t111.5 -48t46 -118q0 -102 -102 -102q-39 0 -66.5 28.5t-27.5 62t16 60t16 29.5q0 18 -25 18q-57 0 -89 -76l-53 -156q-39 -97 -107 -130q134 -30 196.5 -93t62.5 -193q0 -92 20 -124q19 -30 149 -30h8z" />
+<glyph unicode="Ҙ" horiz-adv-x="1244" d="M1176 359q0 -85 -50 -164q-148 -235 -514 -238q172 -70 216 -159q14 -28 14 -55q0 -42 -35 -81q-57 -65 -154 -65q-143 0 -252 149l33 30q69 -95 158 -95q42 0 71.5 22.5t29.5 54.5q0 14 -7 28q-45 89 -186 174q-177 10 -281 67q-78 -70 -98 -70q-33 0 -34 33l-12 275 q-1 32 41 32q22 0 26.5 -6t11.5 -51t26 -79q80 -144 421 -144q160 0 260 93t100 250t-98.5 247t-255.5 90h-116q-78 -1 -116.5 -1t-38.5 30q0 16 13 22.5t170.5 18t256.5 77.5q150 100 150 257q0 111 -103 174q-87 53 -225.5 53t-242.5 -62.5t-130 -138.5q-4 -20 -17 -58 q-10 -20 -35 -20q-41 0 -39 46l9 246q2 49 35 49q26 0 112 -85q136 85 318 85t326 -64q185 -82 185 -227q0 -261 -386 -360q172 -25 295 -115q148 -108 148 -265z" />
+<glyph unicode="ҙ" horiz-adv-x="920" d="M860 253q0 -59 -36 -116q-97 -152 -346 -166q180 -79 180 -171q0 -54 -48.5 -88t-105.5 -34q-118 0 -208 123l33 30q57 -78 129.5 -78t72.5 57q0 10 -5 21q-33 70 -153 141q-122 6 -198 41l-64 -43q-31 -2 -36 8.5t-5 47.5v122q0 58 28 58q20 0 26 -20q2 -23 17 -71 q45 -85 293.5 -85t248.5 222.5t-251 222.5h-118q-55 0 -55 23t29.5 25.5t79.5 5.5q122 8 192 62q86 66 86 151.5t-58.5 121t-151 35.5t-165 -36.5t-94 -91t-36.5 -54.5q-28 0 -28 58v122q0 37 5 47q4 9 27 9h9q25 -19 77 -54q91 54 218 54t232 -43q136 -57 136 -160 q0 -170 -254 -242q112 -21 195 -81q102 -73 102 -174z" />
+<glyph unicode="Қ" horiz-adv-x="1514" d="M649 1284l-57 2q-126 0 -142 -40q-6 -15 -6 -44v-447q324 0 480 158q72 73 163 294q65 158 167 158q53 0 92 -41t39 -95q0 -92 -90 -92q-39 0 -65 25.5t-26 56.5t10 53q-41 -17 -97.5 -159.5t-116.5 -215.5q-106 -130 -287 -165v-8q116 -16 221 -77t151 -158 q25 -54 39 -150l25 -181q3 -17 14 -50q24 -47 168 -47h29q0 -10 -0.5 -37.5t-0.5 -41.5q0 -312 87 -376q-93 17 -183 183t-167 197q-50 20 -84 52q-82 76 -82 237q0 13 1 40v40q0 136 -83 239.5t-216 103.5h-188v-559q0 -28 9 -45q17 -33 186 -33h10v-61q-71 6 -120 6h-347 q-43 0 -114 -6v61q8 0 26.5 -0.5t28.5 -0.5q125 0 141 40q6 15 6 44v1066q0 27 -7 41q-16 33 -176 33h-19v62q70 -6 119 -6h342q50 0 120 6v-62z" />
+<glyph unicode="қ" horiz-adv-x="1080" d="M1036 66l-2 -101q0 -212 94 -231q-86 0 -157 105q-97 146 -134 173q-92 69 -102 215q-5 76 -20 111.5t-70 70.5q-108 69 -236 69l-56 -7v-313q0 -41 9 -59q17 -33 150 -33h8v-66q-203 6 -237 6t-244 -6v66q7 0 23.5 -0.5t54 -0.5t63.5 16t26 77v607q0 41 -9 59 q-17 33 -150 33h-8v66q208 -6 243.5 -6t237.5 6v-66q-7 0 -23.5 0.5t-54 0.5t-63.5 -16t-26 -77v-226h92q127 0 178 70q20 27 53.5 140.5t96.5 158.5q42 30 107.5 30t111.5 -48t46 -118q0 -102 -102 -102q-39 0 -66.5 28.5t-27.5 62t16 60t16 29.5q0 18 -25 18 q-57 0 -89 -76l-53 -156q-39 -97 -107 -130q134 -30 196.5 -93t62.5 -193q0 -92 20 -124q19 -30 149 -30h8z" />
+<glyph unicode="Ҝ" horiz-adv-x="1514" d="M649 1284l-57 2q-126 0 -142 -40q-6 -15 -6 -44v-447q103 0 187 15v276h62v-262q192 51 292 204q4 7 116 253q57 124 153 124q53 0 92 -41t39 -95q0 -92 -90 -92q-39 0 -65 25.5t-26 56.5t10 53q-41 -17 -97.5 -159.5t-116.5 -215.5q-106 -130 -287 -165v-8 q116 -16 221 -77.5t151 -157.5q25 -54 39 -150l25 -181q30 -158 118 -158q99 0 131 175q6 31 24 31q24 0 24 -33q0 -86 -51.5 -151t-134.5 -65q-330 0 -330 318q0 13 1 40v40q0 119 -65 216t-173 120v-393h-62v400h-187v-559q0 -28 9 -45q17 -33 186 -33h10v-61 q-71 6 -120 6h-347q-43 0 -114 -6v61q8 0 26.5 -0.5t28.5 -0.5q125 0 141 40q6 15 6 44v1066q0 27 -7 41q-16 33 -176 33h-19v62q70 -6 119 -6h342q50 0 120 6v-62z" />
+<glyph unicode="ҝ" horiz-adv-x="1080" d="M409 478l-56 -7v-313q0 -41 9 -59q17 -33 150 -33h8v-66q-203 6 -237 6t-244 -6v66q7 0 23.5 -0.5t54 -0.5t63.5 16t26 77v607q0 41 -9 59q-17 33 -150 33h-8v66q208 -6 243.5 -6t237.5 6v-66q-7 0 -23.5 0.5t-54 0.5t-63.5 -16t-26 -77v-226h92q17 0 33 1v162h62v-151 q89 28 128.5 169t104.5 188q42 30 107.5 30t111.5 -48t46 -118q0 -102 -102 -102q-39 0 -66.5 28.5t-27.5 62t16 60t16 29.5q0 18 -25 18q-57 0 -89 -76l-53 -156q-39 -97 -107 -130q134 -30 196.5 -93.5t62.5 -205t66 -141.5q40 0 57 44q6 16 16 78q4 26 26 26q27 0 27 -34 q0 -75 -27 -128q-34 -67 -101 -67q-85 0 -134 75t-53.5 158.5t-19.5 119.5q-31 72 -176 117v-253h-62v268q-39 8 -69 8z" />
+<glyph unicode="Ҟ" horiz-adv-x="1514" d="M649 1284l-57 2q-126 0 -142 -40q-6 -15 -6 -44v-149h372v-62h-372v-236q324 0 480 158q72 73 163 294q65 158 167 158q53 0 92 -41t39 -95q0 -92 -90 -92q-39 0 -65 25.5t-26 56.5t10 53q-41 -17 -97.5 -159.5t-116.5 -215.5q-106 -130 -287 -165v-8q116 -16 221 -77.5 t151 -157.5q25 -54 39 -150l25 -181q30 -158 118 -158q99 0 131 175q6 31 24 31q24 0 24 -33q0 -86 -51.5 -151t-134.5 -65q-330 0 -330 318q0 13 1 40v40q0 136 -83 239.5t-216 103.5h-188v-559q0 -28 9 -45q17 -33 186 -33h10v-61q-71 6 -120 6h-347q-43 0 -114 -6v61 q8 0 26.5 -0.5t28.5 -0.5q125 0 141 40q6 15 6 44v847h-202v62h202v157q0 27 -7 41q-16 33 -176 33h-19v62q70 -6 119 -6h342q50 0 120 6v-62z" />
+<glyph unicode="ҟ" horiz-adv-x="1080" d="M409 478l-56 -7v-313q0 -41 9 -59q17 -33 150 -33h8v-66q-203 6 -237 6t-244 -6v66q7 0 23.5 -0.5t54 -0.5t63.5 16t26 77v513h-167v62h167v32q0 41 -9 59q-17 33 -150 33h-8v66q208 -6 243.5 -6t237.5 6v-66q-7 0 -23.5 0.5t-54 0.5t-63.5 -16t-26 -77v-32h166v-62h-166 v-132h92q127 0 178 70q20 27 53.5 140.5t96.5 158.5q42 30 107.5 30t111.5 -48t46 -118q0 -102 -102 -102q-39 0 -66.5 28.5t-27.5 62t16 60t16 29.5q0 18 -25 18q-57 0 -89 -76l-53 -156q-39 -97 -107 -130q134 -30 196.5 -93.5t62.5 -205t66 -141.5q40 0 57 44q6 16 16 78 q4 26 26 26q27 0 27 -34q0 -75 -27 -128q-34 -67 -101 -67q-85 0 -134 75t-53.5 158.5t-20 119.5t-70.5 71q-108 69 -236 69z" />
+<glyph unicode="Ҡ" horiz-adv-x="1894" d="M1029 1281l-59 2q-84 0 -107 -11q-39 -20 -39 -94v-423q324 0 480 158q72 73 163 294q65 158 167 158q53 0 92 -41t39 -95q0 -92 -90 -92q-39 0 -65 25.5t-26 56.5t10 53q-41 -17 -97.5 -159.5t-116.5 -215.5q-106 -130 -287 -165v-8q116 -16 221 -77.5t151 -157.5 q25 -54 39 -150l25 -181q30 -158 118 -158q99 0 131 175q6 31 24 31q24 0 24 -33q0 -86 -51.5 -151t-134.5 -65q-330 0 -330 318q0 13 1 40v40q0 136 -83 239.5t-216 103.5h-188v-559q0 -28 9 -45q17 -33 186 -33h10v-61q-71 6 -120 6h-337q-43 0 -114 -6v61q62 -2 63 -2 q113 0 134 45q5 11 5 42v1056q0 52 -17.5 65.5t-68.5 13.5h-101q-200 0 -274 -95q-58 -73 -82 -285h-49l55 442h906v-62z" />
+<glyph unicode="ҡ" horiz-adv-x="1425" d="M754 478l-56 -7v-313q0 -41 9 -59q17 -33 150 -33h8v-66q-203 6 -231 6t-238 -6v66q69 0 105.5 3t49 24t12.5 74v602q0 70 -26 83q-12 5 -98 5q-155 0 -216 -53.5t-65 -208.5h-53l15 328h745v-66q-7 0 -23.5 0.5t-54 0.5t-63.5 -16t-26 -77v-226h92q127 0 178 70 q20 27 53.5 140.5t96.5 158.5q42 30 107.5 30t111.5 -48t46 -118q0 -102 -102 -102q-39 0 -66.5 28.5t-27.5 62t16 60t16 29.5q0 18 -25 18q-57 0 -89 -76l-53 -156q-39 -97 -107 -130q134 -30 196.5 -93.5t62.5 -205t66 -141.5q40 0 57 44q6 16 16 78q4 26 26 26 q27 0 27 -34q0 -75 -27 -128q-34 -67 -101 -67q-85 0 -134 75t-53.5 158.5t-20 119.5t-70.5 71q-108 69 -236 69z" />
+<glyph unicode="Ң" horiz-adv-x="1480" d="M1413 1284l-56 2q-122 0 -140 -36q-8 -16 -8 -45v-1000q0 -69 14 -97q23 -47 173 -47h24q0 -12 -0.5 -39t-0.5 -40q0 -312 87 -376q-68 13 -125 92q-15 20 -73.5 125.5t-100 141t-130.5 35.5h-245v61q9 0 28 -0.5t29 -0.5q119 0 137 36q8 16 8 45v530h-590v-530 q0 -29 8 -45q18 -35 187 -35h10v-61q-71 6 -115 6h-358q-37 0 -108 -6v61q9 0 27.5 -0.5t28.5 -0.5q121 0 139 36q7 14 7 45v1064q0 31 -7 45q-17 34 -149 34h-46v62q70 -6 112 -6h354q45 0 115 6v-62l-55 2q-123 0 -142 -36q-8 -16 -8 -45v-474h590v474q0 29 -8 45 q-17 34 -148 34h-46v62q70 -6 112 -6h356q43 0 113 6v-62z" />
+<glyph unicode="ң" horiz-adv-x="1178" d="M1120 66l-2 -101q0 -212 94 -231q-68 0 -115 49q-14 16 -64 94t-82 100.5t-99 22.5h-214v66q140 0 157 30q10 18 10 71v281h-435v-281q0 -49 9 -68q16 -33 159 -33v-66q-203 6 -238 6t-244 -6v66q140 0 157 30q10 18 10 71v589q0 53 -10 71q-17 30 -157 30v66 q209 -6 244 -6t238 6v-66q-143 0 -159 -33q-9 -19 -9 -68v-242h435v242q0 53 -10 71q-17 30 -157 30v66q209 -6 244 -6t238 6v-66q-140 0 -157 -30q-10 -18 -10 -71v-589q0 -53 10 -71q17 -30 157 -30z" />
+<glyph unicode="Ҥ" horiz-adv-x="1980" d="M649 1284l-55 2q-123 0 -142 -36q-8 -16 -8 -45v-474h590v474q0 29 -8 45q-17 34 -148 34h-46v59h1026l55 -442h-49q-24 212 -82 285q-74 95 -274 95h-214q-51 0 -68.5 -13.5t-17.5 -65.5l1 -1061q0 -29 8 -45q18 -35 186 -35h10v-61q-71 6 -113 6h-361q-36 0 -107 -6v61 q9 0 28 -0.5t29 -0.5q119 0 137 36q8 16 8 45v530h-590v-530q0 -29 8 -45q18 -35 187 -35h10v-61q-71 6 -115 6h-358q-37 0 -108 -6v61q9 0 27.5 -0.5t28.5 -0.5q121 0 139 36q7 14 7 45v1064q0 31 -7 45q-17 34 -149 34h-46v62q70 -6 112 -6h354q45 0 115 6v-62z" />
+<glyph unicode="ҥ" horiz-adv-x="1618" d="M1118 850q-112 0 -122 -2q-32 -6 -40 -31q-3 -10 -3 -55v-595q0 -53 10 -71q17 -30 157 -30v-66q-203 6 -238 6t-244 -6v66q140 0 157 30q10 18 10 71v281h-435v-281q0 -49 9 -68q16 -33 159 -33v-66q-203 6 -238 6t-244 -6v66q140 0 157 30q10 18 10 71v589q0 53 -10 71 q-17 30 -157 30v66q209 -6 244 -6t238 6v-66q-143 0 -159 -33q-9 -19 -9 -68v-242h435v242q0 53 -10 71q-17 30 -157 30v60h847l38 -328h-53q-18 182 -98 229q-55 32 -254 32z" />
+<glyph unicode="Ҧ" horiz-adv-x="2018" d="M1321 793q284 0 463 -162t179 -442t-180.5 -450.5t-461.5 -170.5q-118 0 -233 59t-195 153l43 32q176 -175 392.5 -175t332.5 167q100 145 100 378.5t-102 379.5q-117 169 -338 169q-54 0 -112 -12v-578q0 -26 6 -41q13 -32 90 -39q5 0 32 -0.5t76 0.5v-61q-71 6 -113 6 h-361q-36 0 -107 -6v61h78q60 0 85 11q39 17 39 69v1141h-590v-1141q0 -26 6 -41q13 -32 90 -39q6 0 33 -0.5t76 0.5v-61q-71 6 -113 6h-360q-37 0 -108 -6v61h78q60 0 85 11q39 17 39 69v1062q0 26 -6 41q-13 32 -90 38h-106v62h1345v-62q-8 0 -29 0.5t-32 0.5 q-121 0 -137 -39q-6 -14 -6 -41v-418q56 8 112 8z" />
+<glyph unicode="ҧ" horiz-adv-x="1594" d="M1541 400q0 -278 -189 -509.5t-462 -332.5l-14 48q220 81 360.5 288t140.5 443q0 131 -45 215q-58 107 -178 107q-94 0 -201 -99v-393q0 -53 10 -71q17 -30 157 -30v-66q-203 6 -237.5 6t-244.5 -6v66q140 0 157 30q10 18 10 71v585q0 54 -15 74q-23 31 -194 31 t-198.5 -20t-27.5 -85v-585q0 -52 11 -71q17 -30 157 -30v-66q-203 6 -237.5 6t-244.5 -6v66q140 0 157 30q10 18 10 71v589q0 53 -10 71q-17 30 -157 30v66h1064v-66q-140 0 -157 -30q-10 -18 -10 -71v-119q157 142 274 142q152 0 233 -110.5t81 -268.5z" />
+<glyph unicode="Ҩ" horiz-adv-x="1551" d="M1192 -43q-83 0 -185 46q-112 -46 -285 -46q-279 0 -466.5 214.5t-187.5 498.5t187 502t467 218q25 0 41 -1l9 -53q-27 4 -50 4q-98 0 -190 -53q-262 -151 -262 -591q0 -473 265 -632q93 -56 200 -56t190 40q-334 228 -334 609q0 207 101 402q120 234 310 234t317 -224 q108 -190 108 -390t-92 -372t-252 -266q54 -34 109 -34q175 0 246 166l45 -21q-86 -195 -291 -195zM1225 696q0 136 -56 318q-70 231 -170 231q-123 0 -175 -244q-31 -147 -31 -323.5t55.5 -328t160.5 -251.5q216 176 216 598z" />
+<glyph unicode="ҩ" horiz-adv-x="1190" d="M906 -24q-64 0 -139 30q-85 -30 -213 -30q-204 0 -352.5 143t-148.5 347t148 349t353 145q21 0 39 -1l10 -57q-33 5 -49 5q-70 0 -138 -35q-191 -98 -191 -400t193 -406q67 -36 139 -36t127 19q-239 156 -239 408q0 150 82 284q93 154 236 154t241 -147 q88 -131 88 -271.5t-67.5 -254.5t-179.5 -179q44 -17 79 -17q125 0 180 119l34 -23q-71 -146 -232 -146zM921 483q0 93 -39 211q-49 149 -121 149q-144 0 -144 -386q0 -228 152 -364q152 118 152 390z" />
+<glyph unicode="Ҫ" horiz-adv-x="1335" d="M1267 854q0 -26 -29 -26t-35 32q-12 60 -47 178q-51 127 -151 208.5t-217 81.5t-220 -50q-298 -145 -298 -613.5t322 -606.5q96 -41 185 -41q140 0 256 85t159 218q17 52 27 140q4 33 23 33q24 0 24 -35q0 -206 -154 -354q-152 -147 -355 -147h-5h-10q172 -70 216 -159 q14 -28 14 -55q0 -42 -35 -81q-57 -65 -154 -65q-143 0 -252 149l33 30q69 -95 158 -95q42 0 71.5 22.5t29.5 54.5q0 14 -7 28q-48 94 -208 187q-236 52 -388 250.5t-152 449.5q0 289 198.5 503t485.5 214q193 0 363 -169l99 144q17 25 31 25q21 0 21 -33z" />
+<glyph unicode="ҫ" horiz-adv-x="920" d="M868 254q0 -22 -27 -75q-103 -200 -322 -203q191 -83 191 -176q0 -54 -48.5 -88t-105.5 -34q-118 0 -208 123l33 30q57 -78 129.5 -78t72.5 57q0 10 -5 21q-36 76 -193 164q-147 44 -239.5 175t-92.5 291q0 201 132 350t330 149q121 0 215 -54q113 -64 113 -170t-97 -106 q-42 0 -70.5 28t-28.5 70q0 94 100 99q-79 78 -229 78q-60 0 -120 -34q-168 -94 -168 -402.5t178 -404.5q63 -34 123 -34q113 0 181 64q40 37 74 109.5t53 72.5q29 0 29 -22z" />
+<glyph unicode="Ҭ" horiz-adv-x="1413" d="M878 1282q-46 0 -65.5 -11.5t-19.5 -53.5v-1071q0 -25 10 -47q18 -38 243 -38h34q0 -12 -0.5 -39t-0.5 -40q0 -312 87 -376q-68 13 -125 92q-15 20 -73.5 125.5t-100 141t-130.5 35.5h-405v61q9 0 35.5 -0.5t40.5 -0.5q184 0 202 39q8 17 8 47v1072q0 43 -29 56 q-17 8 -66 8q-256 0 -321 -62.5t-86 -318.5h-48l36 442h1206l36 -442h-49q-22 262 -88.5 321.5t-330.5 59.5z" />
+<glyph unicode="ҭ" horiz-adv-x="1142" d="M880 66l-2 -101q0 -212 94 -231q-68 0 -115 49q-14 16 -64 94t-82 100.5t-99 22.5h-351v66q133 0 174 7.5t51.5 28t10.5 69.5v598q0 68 -23 81q-12 7 -91 7q-152 0 -193.5 -50t-52.5 -212h-53l25 328h921l26 -328h-54q-11 161 -48 207q-46 55 -198 55q-75 0 -88 -7 q-23 -13 -23 -81v-598q0 -53 12.5 -72t61.5 -26t161 -7z" />
+<glyph unicode="Ү" horiz-adv-x="1566" d="M1499 1284q-173 0 -252 -128l-381 -619v-388q0 -34 10 -53q15 -29 90 -35h104v-61q-73 6 -127 6h-320q-55 0 -128 -6v61q8 0 25.5 -0.5t27.5 -0.5q124 0 142 36q7 14 7 43v398l-413 675q-34 56 -95 68q-21 4 -121 4v62q126 -6 299.5 -6t246.5 6v-62h-24q-112 0 -112 -48 q0 -14 13 -35l356 -581l325 529q21 34 21 58q0 77 -113 77v62q155 -6 240.5 -6t178.5 6v-62z" />
+<glyph unicode="ү" horiz-adv-x="1151" d="M654 -322q0 -21 6 -32q11 -20 149 -20v-66q-68 5 -99 5h-255q-30 0 -99 -5v66q7 0 23 -0.5t25 -0.5q90 0 101 20q4 8 4 26v402l-286 703q-24 60 -68 73q-18 6 -83 6h-19v68q120 -8 164 -8t276 8v-68q-122 0 -122 -54q0 -15 252 -634l219 546q13 32 13 50q0 90 -102 92v68 q135 -8 194.5 -8t151.5 8v-68q-142 -1 -198 -142l-247 -617v-418z" />
+<glyph unicode="Ұ" horiz-adv-x="1566" d="M1499 1284q-173 0 -252 -128l-381 -619h400v-62h-400v-326q0 -34 10 -53q15 -29 90 -35h104v-61q-73 6 -127 6h-320q-55 0 -128 -6v61q8 0 25.5 -0.5t27.5 -0.5q124 0 142 36q7 14 7 43v336h-400v62h400l-413 675q-34 56 -95 68q-21 4 -121 4v62q126 -6 299.5 -6t246.5 6 v-62h-24q-112 0 -112 -48q0 -14 13 -35l356 -581l325 529q21 34 21 58q0 77 -113 77v62q155 -6 240.5 -6t178.5 6v-62z" />
+<glyph unicode="ұ" horiz-adv-x="1151" d="M654 62h291v-62h-291v-322q0 -21 6 -32q11 -20 149 -20v-66q-68 5 -99 5h-255q-30 0 -99 -5v66q7 0 23 -0.5t25 -0.5q90 0 101 20q4 8 4 26v329h-309v62h309v11l-286 703q-24 60 -68 73q-18 6 -83 6h-19v68q120 -8 164 -8t276 8v-68q-122 0 -122 -54q0 -15 252 -634 l219 546q13 32 13 50q0 90 -102 92v68q135 -8 194.5 -8t151.5 8v-68q-142 -1 -198 -142l-247 -617v-34z" />
+<glyph unicode="Ҳ" horiz-adv-x="1518" d="M1107 0h-200v61q128 5 128 59q0 10 -320 493l-281 -414q-19 -28 -19 -48q0 -43 38.5 -66t84.5 -24v-61q-74 6 -165 6t-305 -6v61q196 0 285 131l323 477l-362 547q-34 51 -99 64q-24 4 -81 4h-41v62q112 -6 292.5 -6t251.5 6v-62q-128 -5 -128 -58q0 -13 268 -410 l225 333q17 25 17 46q0 43 -37.5 65.5t-83.5 23.5v62q81 -6 163.5 -6t306.5 6v-62q-198 -2 -285 -128l-271 -395l416 -629q35 -53 99 -66q25 -5 85 -5h38q0 -12 -0.5 -39t-0.5 -40q0 -312 87 -376q-68 13 -125 92q-15 20 -73.5 125.5t-100 141t-130.5 35.5z" />
+<glyph unicode="ҳ" horiz-adv-x="1183" d="M1131 66l-2 -101q0 -212 94 -231q-68 0 -115 49q-14 16 -64 94t-82 100.5t-99 22.5h-169v66q77 3 77 54q0 10 -208 285q-192 -223 -192 -272q0 -61 62 -67v-66q-141 6 -221 6t-159 -6v66q159 0 274 128l200 256l-212 276q-71 92 -105 110.5t-147 18.5v68q110 -8 171 -8 t264 8v-68q-75 -2 -75 -52q0 -20 184 -255l134 167q33 41 33 75q0 61 -63 65v68q108 -8 192.5 -8t188.5 8v-68q-152 -3 -255 -109q-26 -27 -197 -244l287 -369q37 -47 92 -60q28 -7 95 -7h17z" />
+<glyph unicode="Ҵ" horiz-adv-x="2089" d="M1685 0h-1309v62h106q77 6 90 38q6 15 6 41v1074q0 67 -115 67q-156 0 -216 -27q-93 -42 -119 -178h-46l22 266h1125l22 -266h-47q-28 140 -124 181q-58 24 -223 24q-105 0 -105 -67v-1153h890v1141q0 52 -39 69q-25 11 -85 11h-78v61q71 -6 107 -6h361q42 0 113 6v-61 q-49 1 -76 1t-32 -1q-77 -7 -90 -39q-6 -15 -6 -41v-998q0 -69 14 -97q23 -47 173 -47h24q0 -12 -0.5 -39t-0.5 -40q0 -312 87 -376q-68 13 -125 92q-15 20 -73.5 125.5t-100 141t-130.5 35.5z" />
+<glyph unicode="ҵ" horiz-adv-x="1722" d="M1664 66l-2 -101q0 -212 94 -231q-68 0 -115 49q-14 16 -64 94t-82 100.5t-99 22.5h-1066v66q140 0 157 30q10 18 10 71v602q0 54 -12 71t-61 17q-179 0 -227 -43t-60 -219h-53l25 328h920l26 -328h-54q-12 174 -59.5 218t-222.5 44q-52 0 -63.5 -17.5t-11.5 -70.5v-598 q0 -54 15 -74q23 -31 204 -31h270q178 0 201 31q15 20 15 74v585q0 53 -10 71q-17 30 -157 30v66q209 -6 244 -6t238 6v-66q-140 0 -157 -30q-10 -18 -10 -71v-589q0 -53 10 -71q17 -30 157 -30z" />
+<glyph unicode="Ҷ" horiz-adv-x="1601" d="M1535 1284l-59 2q-76 0 -103 -9q-53 -18 -53 -76v-996q0 -69 14 -97q23 -47 173 -47h24q0 -12 -0.5 -39t-0.5 -40q0 -312 87 -376q-68 13 -125 92q-15 20 -73.5 125.5t-100 141t-130.5 35.5h-255v61q8 0 27.5 -0.5t29.5 -0.5q128 0 147 36q9 17 9 49v545 q-190 -218 -438 -218q-187 0 -312.5 111t-125.5 298v327q0 30 -7 43q-18 34 -156 34q-19 0 -39 -1v62q73 -6 156 -6h270q84 0 156 6v-62q-48 1 -60 1q-118 0 -136 -34q-9 -17 -9 -51v-319q0 -149 90.5 -232t237.5 -83q208 0 373 205v430q0 32 -9 49q-18 34 -153 34h-51v62 q71 -6 115 -6h376q41 0 111 6v-62z" />
+<glyph unicode="ҷ" horiz-adv-x="1261" d="M1203 66l-2 -101q0 -212 94 -231q-68 0 -115 49q-14 16 -64 94t-82 100.5t-99 22.5h-213v66q140 0 157 30q10 18 10 71v274q-129 -143 -324 -143q-131 0 -236.5 81t-105.5 208q0 214 -5 229q-11 32 -72 40q-12 1 -90 1v66q209 -6 244 -6t238 6v-66q-140 0 -157 -30 q-11 -19 -11 -71v-143q0 -102 70.5 -160.5t174.5 -58.5q137 0 246 109q28 28 28 75v178q0 53 -10 71q-17 30 -157 30v66q209 -6 244 -6t238 6v-66q-140 0 -157 -30q-11 -19 -11 -71v-589q0 -53 10 -71q17 -30 157 -30z" />
+<glyph unicode="Ҹ" horiz-adv-x="1601" d="M1535 1284l-59 2q-76 0 -103 -9q-53 -18 -53 -76v-1057q0 -27 13.5 -52t91.5 -31h110v-61q-71 6 -117 6h-373q-41 0 -112 -6v61q8 0 27.5 -0.5t29.5 -0.5q128 0 147 36q9 17 9 49v545q-156 -179 -353 -211v-181h-62v174h-23q-187 0 -312.5 111t-125.5 298v327q0 30 -7 43 q-18 34 -156 34q-19 0 -39 -1v62q73 -6 156 -6h270q84 0 156 6v-62q-48 1 -60 1q-118 0 -136 -34q-9 -17 -9 -51v-319q0 -137 78 -219t208 -94v478h62v-480q195 8 353 205v430q0 32 -9 49q-18 34 -153 34h-51v62q71 -6 115 -6h376q41 0 111 6v-62z" />
+<glyph unicode="ҹ" horiz-adv-x="1261" d="M1204 0q-203 6 -237.5 6t-244.5 -6v66q140 0 157 30q10 18 10 71v274q-91 -101 -229 -132v-107h-62v97q-17 -1 -33 -1q-131 0 -236.5 81t-105.5 208q0 214 -5 229q-11 32 -72 40q-12 1 -90 1v66q209 -6 244 -6t238 6v-66q-140 0 -157 -30q-11 -19 -11 -71v-143 q0 -98 65 -156t163 -63v308h62v-305q111 17 201 106q28 28 28 75v178q0 53 -10 71q-17 30 -157 30v66q209 -6 244 -6t238 6v-66q-140 0 -157 -30q-11 -19 -11 -71v-589q0 -52 11 -71q17 -30 157 -30v-66z" />
+<glyph unicode="Һ" horiz-adv-x="1482" d="M649 1284l-55 2q-123 0 -142 -36q-8 -16 -8 -45v-453q154 122 339.5 122t311 -111t125.5 -298v-327q0 -30 7 -43q18 -34 156 -34q19 0 39 1v-62q-73 6 -156 6h-270q-84 0 -156 -6v62q48 -1 60 -1q118 0 136 34q9 17 9 51v319q0 149 -90.5 232t-240.5 83t-270 -101v-538 q0 -29 8 -45q18 -35 187 -35h10v-61q-71 6 -115 6h-358q-37 0 -108 -6v61q9 0 27.5 -0.5t28.5 -0.5q121 0 139 36q7 14 7 45v1064q0 31 -7 45q-17 34 -149 34h-46v62q70 -6 112 -6h354q45 0 115 6v-62z" />
+<glyph unicode="һ" horiz-adv-x="1181" d="M1129 0q-200 6 -238 6t-244 -6v66q30 -1 70.5 -1t63.5 12q33 19 33 76v519q0 227 -158 227q-130 0 -209.5 -104.5t-79.5 -238.5v-400q0 -39 10 -58q18 -33 117 -33q18 0 38 1v-66q-200 6 -236.5 6t-242.5 -6v66q30 -1 72.5 -1t68 16.5t25.5 80.5v1115q0 87 -44 108 q-21 10 -96 10h-26v67l306 23v-744h2q41 93 125 149t184 56q292 0 292 -314v-502q0 -65 135 -65q15 0 32 1v-66z" />
+<glyph unicode="Ҽ" horiz-adv-x="1902" d="M728 714v-18v-10q0 -247 98 -433q124 -235 356 -235q297 0 487 304q11 20 35 57q12 16 30 16q31 0 31 -36q0 -11 -9 -28q-90 -173 -239 -273.5t-337 -100.5q-280 0 -467 214t-187 498q0 25 3 62q-192 37 -315 131q-146 113 -146 282q0 86 52 157t135 71q57 0 95.5 -36.5 t38.5 -92.5t-37.5 -93.5t-93.5 -37.5q-90 0 -122 75q-6 -17 -6 -29q0 -155 127 -254q105 -81 279 -113q40 250 217.5 424.5t437 174.5t443.5 -201t200 -475h-1106zM1373 1286q-92 54 -192 54t-191 -53q-234 -137 -259 -513h899q-25 376 -257 512z" />
+<glyph unicode="ҽ" horiz-adv-x="1241" d="M1162 280q27 0 27 -28t-35 -88q-110 -188 -315 -188t-341.5 147.5t-136.5 347.5q0 18 1 36q-130 27 -220 98.5t-90 185.5q0 60 36.5 109.5t85.5 49.5t76 -25.5t27 -65t-26 -66t-66 -26.5q-64 0 -84 48q-2 -6 -2 -14q0 -195 268 -249q27 170 148 289t296 119t276.5 -119 t101.5 -302q0 -30 -7.5 -37.5t-38.5 -7.5h-605v-7q0 -210 64 -313q90 -144 242 -144q198 0 290 221q12 29 28 29zM1048 539q0 143 -50 243q-64 129 -192 129q-41 0 -90 -23q-165 -78 -175 -349h507z" />
+<glyph unicode="Ҿ" horiz-adv-x="1902" d="M728 714v-18q0 -254 99 -443q124 -235 355 -235q297 0 487 304q11 20 35 57q12 16 30 16q31 0 31 -36q0 -11 -9 -28q-165 -317 -477 -366q-34 -113 -41 -272h-115q-7 159 -41 272q-243 39 -399.5 243.5t-156.5 460.5q0 25 3 62q-192 37 -315 131q-146 113 -146 282 q0 86 52 157t135 71q57 0 95.5 -36.5t38.5 -92.5t-37.5 -93.5t-93.5 -37.5q-90 0 -122 75q-6 -17 -6 -29q0 -155 127 -254q105 -81 279 -113q40 250 217.5 424.5t437 174.5t443.5 -201t200 -475h-1106zM1373 1286q-92 54 -192 54t-191 -53q-234 -136 -259 -513h899 q-25 376 -257 512z" />
+<glyph unicode="ҿ" horiz-adv-x="1241" d="M1162 280q27 0 27 -28t-35 -88q-79 -134 -220 -174q-38 -119 -46 -287h-115q-8 168 -45 285q-160 38 -263.5 175t-103.5 308q0 22 1 36q-130 26 -212 92q-98 78 -98 192q0 60 36.5 109.5t85.5 49.5t76 -25.5t27 -65t-26 -66t-66 -26.5q-64 0 -84 48q-2 -6 -2 -14 q0 -196 268 -249q27 170 148 289t296 119t276.5 -119t101.5 -302q0 -30 -7.5 -37.5t-38.5 -7.5h-605v-7q0 -210 64 -313q90 -144 242 -144q198 0 290 221q12 29 28 29zM1048 539q0 143 -50 243q-64 129 -192 129q-41 0 -90 -23q-165 -78 -175 -349h507z" />
+<glyph unicode="Ӏ" horiz-adv-x="736" d="M670 1284l-59 2q-75 0 -103 -9q-53 -18 -53 -76v-1057q0 -27 13.5 -52t91.5 -31h110v-61q-71 6 -117 6h-373q-41 0 -112 -6v61q8 0 27.5 -0.5t29.5 -0.5q128 0 147 36q9 17 9 49v1056q0 32 -9 49q-18 34 -153 34h-51v62q71 -6 115 -6h376q41 0 111 6v-62z" />
+<glyph unicode="Ӂ" horiz-adv-x="2214" d="M1399 1284l-57 2q-126 0 -142 -40q-6 -15 -6 -44v-447q289 8 434 167q62 67 159 289q67 154 167 154q53 0 92 -41t39 -95q0 -92 -90 -92q-39 0 -65 25.5t-26 56.5t10 53q-41 -17 -97.5 -159.5t-116.5 -215.5q-106 -130 -287 -165v-8q116 -16 221 -77t151 -158 q25 -54 39 -150l25 -181q30 -158 118 -158q99 0 131 175q6 31 24 31q24 0 24 -33q0 -86 -51.5 -151t-134.5 -65q-330 0 -330 318q0 13 1 40v40q0 136 -83 239.5t-216 103.5h-138v-559q0 -28 9 -45q17 -33 186 -33h10v-61q-71 6 -120 6h-344q-49 0 -120 -6v61h10 q169 0 186 33q9 17 9 45v559h-138q-133 0 -216 -103.5t-83 -239.5q0 -13 0.5 -40t0.5 -40q0 -318 -330 -318q-83 0 -134.5 65t-51.5 151q0 33 24 33q18 0 24 -31q32 -175 131 -175q88 0 118 158l23 169q16 108 41 162q46 97 151 158t221 77v8q-181 35 -287 165 q-60 73 -116.5 215.5t-97.5 159.5q10 -22 10 -53t-26 -56.5t-65 -25.5q-90 0 -90 92q0 54 39 95t92 41q100 0 167 -154q97 -222 159 -289q145 -159 434 -167v447q0 29 -6 44q-16 40 -142 40l-57 -2v62q70 -6 120 -6h344q50 0 120 6v-62zM1455 1516q0 -85 -140 -130 q-101 -33 -211 -33t-211 33q-140 45 -140 130q0 39 25 64.5t64 25.5t64 -25.5t25 -70.5t-38 -70q63 -24 174 -24h74q111 0 174 24q-38 25 -38 70t25 70.5t64 25.5t64 -25.5t25 -64.5z" />
+<glyph unicode="ӂ" horiz-adv-x="1611" d="M737 471l-56 7q-128 0 -236 -69q-55 -35 -70.5 -71t-20 -119.5t-53.5 -158.5t-134 -75q-67 0 -101 67q-27 53 -27 128q0 34 27 34q22 0 26 -26q10 -62 16 -78q17 -44 57 -44q66 0 66 141.5t62.5 205t196.5 93.5q-68 33 -107 130l-53 156q-32 76 -89 76q-25 0 -25 -18 q0 -3 16 -29.5t16 -60t-27.5 -62t-66.5 -28.5q-102 0 -102 102q0 70 46 118t112 48q148 0 200 -178q37 -124 57 -151q51 -70 178 -70h92v226q0 41 -9 59q-17 33 -150 33h-8v66q208 -6 243.5 -6t237.5 6v-66q-7 0 -23.5 0.5t-54 0.5t-63.5 -16t-26 -77v-226h92q127 0 178 70 q20 27 53.5 140.5t96.5 158.5q42 30 107.5 30t111.5 -48t46 -118q0 -102 -102 -102q-39 0 -66.5 28.5t-27.5 62t16 60t16 29.5q0 18 -25 18q-57 0 -89 -76l-53 -156q-39 -97 -107 -130q134 -30 196.5 -93.5t62.5 -205t66 -141.5q40 0 57 44q6 16 16 78q4 26 26 26 q27 0 27 -34q0 -75 -27 -128q-34 -67 -101 -67q-85 0 -134 75t-53.5 158.5t-20 119.5t-70.5 71q-108 69 -236 69l-56 -7v-313q0 -41 9 -59q17 -33 150 -33h8v-66q-203 6 -237 6t-244 -6v66q7 0 23.5 -0.5t54 -0.5t63.5 16t26 77v313zM1082 1398q89 0 89 -96t-113.5 -158.5 t-237.5 -62.5t-229 58q-122 67 -122 163t89 96t89 -90t-89 -90q99 -74 262 -74t262 74q-89 0 -89 90t89 90z" />
+<glyph unicode="Ӄ" horiz-adv-x="1514" d="M649 1284l-57 2q-126 0 -142 -40q-6 -15 -6 -44v-447q324 0 480 158q72 73 163 294q65 158 167 158q53 0 92 -41t39 -95q0 -92 -90 -92q-39 0 -65 25.5t-26 56.5t10 53q-39 -16 -90.5 -141t-83.5 -176q-74 -120 -192 -178q217 -44 346 -198.5t129 -390.5 q0 -279 -180.5 -449.5t-461.5 -170.5q-118 0 -233 59t-195 153l43 32q176 -175 392.5 -175t332.5 167q100 145 100 375t-96 375q-111 167 -320 176q-105 -20 -261 -32v-559q0 -28 9 -45q17 -33 186 -33h10v-61q-71 6 -120 6h-347q-43 0 -114 -6v61q8 0 26.5 -0.5t28.5 -0.5 q125 0 141 40q6 15 6 44v1066q0 27 -7 41q-16 33 -176 33h-19v62q70 -6 119 -6h342q50 0 120 6v-62z" />
+<glyph unicode="ӄ" horiz-adv-x="1080" d="M409 478l-56 -7v-313q0 -41 9 -59q17 -33 150 -33h8v-66q-203 6 -237 6t-244 -6v66q7 0 23.5 -0.5t54 -0.5t63.5 16t26 77v607q0 41 -9 59q-17 33 -150 33h-8v66q208 -6 243.5 -6t237.5 6v-66q-7 0 -23.5 0.5t-54 0.5t-63.5 -16t-26 -77v-226h92q127 0 178 70 q20 27 53.5 140.5t96.5 158.5q42 30 107.5 30t111.5 -48t46 -118q0 -102 -102 -102q-39 0 -66.5 28.5t-27.5 62t16 60t16 29.5q0 18 -25 18q-65 0 -102 -113q-53 -158 -83 -196q128 -13 205 -94t77 -204t-58 -240q-153 -310 -568 -463l-14 48q194 72 327 220 q150 165 150 357q0 164 -127 238q-97 57 -247 57z" />
+<glyph unicode="Ӆ" horiz-adv-x="1554" d="M1488 1281l-59 2q-76 0 -103 -9q-53 -18 -53 -76v-1054q0 -27 13.5 -52t91.5 -31h110v-61l-329 -427l-29 22l91 184q66 139 66 176q0 45 -92 45h-309v61q8 0 27.5 -0.5t29.5 -0.5q128 0 147 36q9 17 9 49v1053q0 32 -9 49q-18 34 -153 34h-67q-188 0 -215 -35 q-11 -14 -11 -63q0 -227 -12 -426q-46 -757 -354 -757q-86 0 -148 60t-62 146q0 45 30 76t74 31t74 -30t30 -75q0 -81 -77 -102q31 -14 75 -14q200 0 256 520q21 195 21 511q0 113 -13 132q-18 27 -187 27v61h1137v-62z" />
+<glyph unicode="ӆ" horiz-adv-x="1267" d="M281 81q186 0 186 658q0 63 -6 80q-11 30 -72 37q-10 1 -89 1v66h876v-66q-140 0 -157 -30q-10 -18 -10 -71v-589q0 -53 10 -71q17 -30 157 -30v-66l-246 -336l-39 27q28 36 78.5 134t50.5 130q0 45 -70 45h-256v66q140 0 157 30q10 18 10 71v585q0 49 -7 65 q-18 40 -149 40q-69 0 -92 -5q-55 -11 -63 -53q-3 -17 -4 -116q-6 -683 -261 -683q-70 0 -121 48.5t-51 118.5q0 88 86 88q36 0 60 -24.5t24 -61.5q0 -59 -50 -79q18 -9 48 -9z" />
+<glyph unicode="Ӈ" horiz-adv-x="1480" d="M649 1284l-55 2q-123 0 -142 -36q-8 -16 -8 -45v-474h590v474q0 29 -8 45q-17 34 -148 34h-46v62q70 -6 112 -6h356q43 0 113 6v-62l-56 2q-122 0 -140 -36q-8 -16 -8 -45v-1318q0 -141 -114.5 -235t-247.5 -94t-230 73t-97 190q0 49 30.5 81.5t78.5 32.5t79 -31.5 t31 -78.5q0 -110 -121 -110h-4q71 -114 217 -114q99 0 156 101q47 83 47 190v779h-590v-530q0 -29 8 -45q18 -35 187 -35h10v-61q-71 6 -115 6h-358q-37 0 -108 -6v61q9 0 27.5 -0.5t28.5 -0.5q121 0 139 36q7 14 7 45v1064q0 31 -7 45q-17 34 -149 34h-46v62q70 -6 112 -6 h354q45 0 115 6v-62z" />
+<glyph unicode="ӈ" horiz-adv-x="1178" d="M1120 857q-140 0 -157 -30q-10 -18 -10 -71v-865q0 -132 -84.5 -232t-215.5 -100q-90 0 -159 40q-83 48 -83 132q0 42 27.5 70t69.5 28t70.5 -28t28.5 -70q0 -76 -74 -96q58 -29 114 -29q158 0 158 281v561h-435v-281q0 -49 9 -68q16 -33 159 -33v-66q-203 6 -238 6 t-244 -6v66q140 0 157 30q10 18 10 71v589q0 53 -10 71q-17 30 -157 30v66q209 -6 244 -6t238 6v-66q-143 0 -159 -33q-9 -19 -9 -68v-242h435v242q0 53 -10 71q-17 30 -157 30v66q209 -6 244 -6t238 6v-66z" />
+<glyph unicode="Ӊ" horiz-adv-x="1631" d="M1564 1284l-56 2q-122 0 -140 -36q-8 -16 -8 -45v-1064q0 -29 8 -45q18 -35 186 -35h10v-61l-329 -427l-29 22l91 184q66 139 66 176q0 45 -92 45h-288v61q9 0 28 -0.5t29 -0.5q119 0 137 36q8 16 8 45v964l-734 -1008l1 -1q14 -30 90 -35q3 0 30 -0.5t77 0.5v-61 q-71 6 -115 6h-358q-37 0 -108 -6v61q9 0 27.5 -0.5t28.5 -0.5q121 0 139 36q7 14 7 45v1064q0 31 -7 45q-17 34 -149 34h-46v62q70 -6 112 -6h354q45 0 115 6v-62l-55 2q-123 0 -142 -36q-8 -16 -8 -45v-967l734 1009q-15 37 -149 37h-46v62q70 -6 112 -6h356q43 0 113 6 v-62z" />
+<glyph unicode="ӊ" horiz-adv-x="1261" d="M1048 -45q0 45 -70 45h-256v66q142 0 158 33q9 19 9 68v570l-499 -653q38 -18 148 -18v-66q-203 6 -238 6t-244 -6v66q142 0 158 33q9 19 9 68v589q0 49 -9 68q-16 33 -158 33v66q209 -6 244 -6t238 6v-66q-143 0 -159 -33q-9 -19 -9 -68v-570l499 653q-38 18 -147 18v66 q209 -6 244 -6t238 6v-66q-143 0 -159 -33q-9 -19 -9 -68v-589q0 -49 9 -68q16 -33 159 -33v-66l-246 -336l-39 27q28 36 78.5 134t50.5 130z" />
+<glyph unicode="Ӌ" horiz-adv-x="1601" d="M1535 1284l-59 2q-76 0 -103 -9q-53 -18 -53 -76v-1056q0 -32 9 -49q19 -36 147 -36h28q21 1 29 1v-61h-255q-89 0 -130.5 -35.5t-100 -141t-73.5 -125.5q-57 -79 -125 -92q87 64 87 376v39q-1 28 -1 40h24q150 0 173 47q14 28 14 97v485q-190 -218 -438 -218 q-187 0 -312.5 111t-125.5 298v327q0 30 -7 43q-18 34 -156 34q-19 0 -39 -1v62q73 -6 156 -6h270q84 0 156 6v-62q-48 1 -60 1q-118 0 -136 -34q-9 -17 -9 -51v-319q0 -149 90.5 -232t237.5 -83q208 0 373 205v430q0 32 -9 49q-18 34 -153 34h-51v62q71 -6 115 -6h376 q41 0 111 6v-62z" />
+<glyph unicode="ӌ" horiz-adv-x="1261" d="M724 -35l-2 101q140 0 157 30q10 18 10 71v274q-129 -143 -324 -143q-131 0 -236.5 81t-105.5 208q0 214 -5 229q-11 32 -72 40q-12 1 -90 1v66q209 -6 244 -6t238 6v-66q-140 0 -157 -30q-11 -19 -11 -71v-143q0 -102 70.5 -160.5t174.5 -58.5q137 0 246 109 q28 28 28 75v178q0 53 -10 71q-17 30 -157 30v66q209 -6 244 -6t238 6v-66q-140 0 -157 -30q-11 -19 -11 -71v-589q0 -53 10 -71q17 -30 157 -30v-66h-213q-67 0 -99 -22.5t-82 -100.5t-64 -94q-47 -49 -115 -49q94 19 94 231z" />
+<glyph unicode="Ӎ" horiz-adv-x="1793" d="M1726 1281l-56 2q-125 0 -141 -41q-6 -15 -6 -45v-1058q0 -26 8 -43q17 -35 185 -35h10v-61l-329 -427l-29 22l91 184q66 139 66 176q0 45 -92 45h-273v61h76q63 0 87 10q40 17 40 70v1140h-2l-483 -1245q-14 -36 -36 -36t-39 43l-476 1222h-2v-1064q0 -140 200 -140h3 v-61q-209 6 -229 6t-231 -6v61h3q199 0 199 140v1003q0 22 -6 38q-12 32 -89 39q-6 1 -32.5 1t-74.5 -1v62h341q45 0 61 -42l428 -1102l430 1108q14 36 49 36h349v-62z" />
+<glyph unicode="ӎ" horiz-adv-x="1428" d="M1206 -45q0 45 -70 45h-239v66h85q60 5 73 32q9 18 9 69l-2 696l-347 -820q-18 -43 -40.5 -43t-40.5 43l-341 805l-2 -2v-629q0 -151 167 -151v-66q-82 6 -166 6t-228 -6v66q167 0 167 151v539q0 50 -9 68q-16 33 -158 33v66h262q41 0 50 -4q13 -7 27 -39l310 -732 l308 732q13 31 26.5 37t53.5 6h261v-66h-85q-60 -5 -73 -32q-9 -18 -9 -69v-589q0 -50 9 -68q16 -33 158 -33v-66l-246 -336l-39 27q28 36 78.5 134t50.5 130z" />
+<glyph unicode="ӏ" horiz-adv-x="578" d="M525 0q-193 6 -236 6t-236 -6v66l44 -1q66 0 89 13q33 18 33 79v609q0 61 -33 79q-23 13 -89 13l-44 -1v66q193 -6 236 -6t236 6v-66l-44 1q-66 0 -89 -13q-33 -18 -33 -79v-609q0 -61 33 -79q23 -13 89 -13l44 1v-66z" />
+<glyph unicode="Ӑ" horiz-adv-x="1484" d="M1417 0q-127 6 -297.5 6t-244.5 -6v61h5q157 0 157 59q0 29 -39 136l-70 192h-487l-61 -163q-34 -90 -34 -123q0 -51 52 -78q42 -23 97 -23v-61q-189 6 -239.5 6t-187.5 -6v61q174 2 219 133l404 1161q-114 10 -193 43q-107 44 -107 118q0 39 25 64.5t64 25.5t64 -25.5 t25 -70.5t-38 -70q63 -24 174 -24h74q111 0 174 24q-38 25 -38 70t25 70.5t64 25.5t64 -25.5t25 -64.5q0 -74 -107 -118q-79 -33 -193 -43l420 -1215q21 -61 84 -75q19 -5 77 -5q19 0 43 1v-61zM906 510l-222 641l-220 -641h442z" />
+<glyph unicode="ӑ" horiz-adv-x="1070" d="M1018 190q0 -83 -47.5 -142.5t-122.5 -59.5t-120.5 51.5t-52.5 122.5q-35 -85 -111 -135.5t-186.5 -50.5t-205.5 50q-119 62 -119 178q0 179 213 279q131 61 394 76v78q0 110 -60.5 192t-166.5 82q-154 0 -231 -98q46 0 78 -26.5t32 -70t-28.5 -71.5t-71.5 -28 q-98 0 -98 99q0 113 102 178.5t222 65.5q183 0 293 -119q50 -54 63.5 -108t13.5 -144v-427q0 -40 20.5 -74t57.5 -34q79 0 79 175q0 28 -2 80h55v-119zM660 300v214q-171 -6 -291 -71q-152 -82 -152 -236q0 -78 56.5 -130.5t135.5 -52.5q111 0 181 81.5t70 194.5zM762 1398 q89 0 89 -96t-113.5 -158.5t-237.5 -62.5t-229 58q-122 67 -122 163t89 96t89 -90t-89 -90q99 -74 262 -74t262 74q-89 0 -89 90t89 90z" />
+<glyph unicode="Ӓ" horiz-adv-x="1484" d="M1417 0q-127 6 -297.5 6t-244.5 -6v61h5q157 0 157 59q0 29 -39 136l-70 192h-487l-61 -163q-34 -90 -34 -123q0 -51 52 -78q42 -23 97 -23v-61q-189 6 -239.5 6t-187.5 -6v61q174 2 219 133l409 1177q14 40 46 40t46 -40l425 -1231q21 -61 84 -75q19 -5 77 -5q19 0 43 1 v-61zM906 510l-222 641l-220 -641h442zM1009 1574q32 -32 32 -78.5t-32 -79t-78 -32.5t-78.5 33.5t-32.5 78t33 77.5t78.5 33t77.5 -32zM636.5 1574q32.5 -32 32.5 -78.5t-32.5 -79t-78 -32.5t-78.5 33.5t-33 78t33 77.5t78.5 33t78 -32z" />
+<glyph unicode="ӓ" horiz-adv-x="1070" d="M1018 190q0 -83 -47.5 -142.5t-122.5 -59.5t-120.5 51.5t-52.5 122.5q-35 -85 -111 -135.5t-186.5 -50.5t-205.5 50q-119 62 -119 178q0 179 213 279q131 61 394 76v78q0 110 -60.5 192t-166.5 82q-154 0 -231 -98q46 0 78 -26.5t32 -70t-28.5 -71.5t-71.5 -28 q-98 0 -98 99q0 113 102 178.5t222 65.5q183 0 293 -119q50 -54 63.5 -108t13.5 -144v-427q0 -40 20.5 -74t57.5 -34q79 0 79 175q0 28 -2 80h55v-119zM660 300v214q-171 -6 -291 -71q-152 -82 -152 -236q0 -78 56.5 -130.5t135.5 -52.5q111 0 181 81.5t70 194.5zM751 1318 q32 -32 32 -78.5t-32 -79t-78 -32.5t-78.5 33.5t-32.5 78t33 77.5t78.5 33t77.5 -32zM378.5 1318q32.5 -32 32.5 -78.5t-32.5 -79t-78 -32.5t-78.5 33.5t-33 78t33 77.5t78.5 33t78 -32z" />
+<glyph unicode="Ӕ" horiz-adv-x="1794" d="M681 1280l-168 2v61h1104l55 -443h-49q-25 215 -78 286q-72 96 -273 96h-187q-61 0 -79 -11.5t-18 -67.5v-525h168q130 0 166.5 47.5t36.5 182.5h49v-522h-49q0 135 -36.5 182.5t-166.5 47.5h-168v-476q0 -56 18 -67.5t79 -11.5h187q228 0 311 117q52 75 95 330h49 l-82 -508h-972v61q6 0 19.5 -0.5t49.5 -0.5t59.5 15t23.5 74v467h-318l-147 -413q-10 -28 -10 -44q0 -95 146 -98v-61q-189 6 -243.5 6t-184.5 -6v61q176 0 223 132zM825 678v515q0 79 -81 81l-215 -596h296z" />
+<glyph unicode="ӕ" horiz-adv-x="1495" d="M1415 282q28 0 28 -28.5t-33 -89.5q-103 -188 -301 -188q-218 0 -357 190q-45 -92 -145.5 -141t-221 -49t-213.5 46q-119 58 -119 174q0 180 223 272q167 67 379 67v104q0 110 -59.5 192t-166.5 82q-154 0 -232 -98q110 -1 110 -100q0 -43 -28 -70.5t-71 -27.5 q-99 0 -99 107t102 171.5t222 64.5q228 0 328 -165q138 165 317.5 165t272 -120t92.5 -300q0 -34 -9.5 -39.5t-44.5 -5.5h-585q0 -332 188 -432q64 -33 126 -33q92 0 163.5 58t100.5 149q15 45 33 45zM1082 913q-45 0 -95 -23q-163 -79 -181 -350h495q-16 373 -219 373z M681 283q0 19 -13 81t-13 127q-168 -6 -285 -67q-151 -79 -151 -228q0 -74 55 -123t131 -49q110 0 193 75.5t83 183.5z" />
+<glyph unicode="Ӗ" horiz-adv-x="1354" d="M68 0v61q47 -1 53 -1q125 0 142 38q7 16 7 48v1053q0 30 -7 47q-15 36 -152 36q-20 0 -43 -1v62h1108l56 -442h-49q-24 218 -99.5 299t-288.5 81h-263q-54 0 -71 -13.5t-17 -65.5v-474h178q134 0 173.5 46.5t39.5 182.5h51v-521h-51q0 136 -40 183t-173 47h-178v-526 q0 -52 17 -65.5t71 -13.5h273q236 0 326 111q67 84 107 336h49l-84 -508h-1135zM1053 1516q0 -85 -140 -130q-101 -33 -211 -33t-211 33q-140 45 -140 130q0 39 25 64.5t64 25.5t64 -25.5t25 -70.5t-38 -70q63 -24 174 -24h74q111 0 174 24q-38 25 -38 70t25 70.5t64 25.5 t64 -25.5t25 -64.5z" />
+<glyph unicode="ӗ" horiz-adv-x="933" d="M854 280q27 0 27 -28t-35 -88q-110 -188 -315 -188t-341.5 147.5t-136.5 344.5t127 344.5t312.5 147.5t287 -119t101.5 -302q0 -30 -7.5 -37.5t-38.5 -7.5h-605v-7q0 -210 64 -313q90 -144 242 -144q198 0 290 221q12 29 28 29zM740 539q0 143 -50 243q-64 129 -192 129 q-41 0 -90 -23q-165 -78 -175 -349h507zM782 1398q89 0 89 -96t-113.5 -158.5t-237.5 -62.5t-229 58q-122 67 -122 163t89 96t89 -90t-89 -90q99 -74 262 -74t262 74q-89 0 -89 90t89 90z" />
+<glyph unicode="Ә" horiz-adv-x="1445" d="M722 1390q280 0 467 -214t187 -498.5t-186.5 -502.5t-462 -218t-459.5 201t-200 475h1106v18q0 469 -265 632q-93 57 -187 57q-142 0 -283 -115t-187 -255q-10 -32 -37 -32t-27 26v393q0 33 21 33q14 0 31 -25l87 -127q184 152 395 152zM529 61q92 -54 192 -54t191 53 q234 137 259 513h-899q25 -376 257 -512z" />
+<glyph unicode="ә" horiz-adv-x="933" d="M88 772q110 188 315 188t341.5 -147.5t136.5 -344.5t-127 -344.5t-312.5 -147.5t-287 119t-101.5 302q0 30 7.5 37.5t38.5 7.5h605v7q0 210 -64 313q-90 144 -242 144q-198 0 -290 -221q-12 -29 -28 -29q-27 0 -27 28t35 88zM194 397q0 -143 50 -243q64 -129 192 -129 q41 0 90 23q165 78 175 349h-507z" />
+<glyph unicode="Ӛ" horiz-adv-x="1445" d="M722 1390q280 0 467 -214t187 -498.5t-186.5 -502.5t-462 -218t-459.5 201t-200 475h1106v18q0 469 -265 632q-93 57 -187 57q-142 0 -283 -115t-187 -255q-10 -32 -37 -32t-27 26v393q0 33 21 33q14 0 31 -25l87 -127q184 152 395 152zM529 61q92 -54 192 -54t191 53 q234 137 259 513h-899q25 -376 257 -512zM979 1574q32 -32 32 -78.5t-32 -79t-78 -32.5t-78.5 33.5t-32.5 78t33 77.5t78.5 33t77.5 -32zM606.5 1574q32.5 -32 32.5 -78.5t-32.5 -79t-78 -32.5t-78.5 33.5t-33 78t33 77.5t78.5 33t78 -32z" />
+<glyph unicode="ӛ" horiz-adv-x="933" d="M88 772q110 188 315 188t341.5 -147.5t136.5 -344.5t-127 -344.5t-312.5 -147.5t-287 119t-101.5 302q0 30 7.5 37.5t38.5 7.5h605v7q0 210 -64 313q-90 144 -242 144q-198 0 -290 -221q-12 -29 -28 -29q-27 0 -27 28t35 88zM194 397q0 -143 50 -243q64 -129 192 -129 q41 0 90 23q165 78 175 349h-507zM711 1318q32 -32 32 -78.5t-32 -79t-78 -32.5t-78.5 33.5t-32.5 78t33 77.5t78.5 33t77.5 -32zM338.5 1318q32.5 -32 32.5 -78.5t-32.5 -79t-78 -32.5t-78.5 33.5t-33 78t33 77.5t78.5 33t78 -32z" />
+<glyph unicode="Ӝ" horiz-adv-x="2214" d="M1399 1284l-57 2q-126 0 -142 -40q-6 -15 -6 -44v-447q289 8 434 167q62 67 159 289q67 154 167 154q53 0 92 -41t39 -95q0 -92 -90 -92q-39 0 -65 25.5t-26 56.5t10 53q-41 -17 -97.5 -159.5t-116.5 -215.5q-106 -130 -287 -165v-8q116 -16 221 -77t151 -158 q25 -54 39 -150l25 -181q30 -158 118 -158q99 0 131 175q6 31 24 31q24 0 24 -33q0 -86 -51.5 -151t-134.5 -65q-330 0 -330 318q0 13 1 40v40q0 136 -83 239.5t-216 103.5h-138v-559q0 -28 9 -45q17 -33 186 -33h10v-61q-71 6 -120 6h-344q-49 0 -120 -6v61h10 q169 0 186 33q9 17 9 45v559h-138q-133 0 -216 -103.5t-83 -239.5q0 -13 0.5 -40t0.5 -40q0 -318 -330 -318q-83 0 -134.5 65t-51.5 151q0 33 24 33q18 0 24 -31q32 -175 131 -175q88 0 118 158l23 169q16 108 41 162q46 97 151 158t221 77v8q-181 35 -287 165 q-60 73 -116.5 215.5t-97.5 159.5q10 -22 10 -53t-26 -56.5t-65 -25.5q-90 0 -90 92q0 54 39 95t92 41q100 0 167 -154q97 -222 159 -289q145 -159 434 -167v447q0 29 -6 44q-16 40 -142 40l-57 -2v62q70 -6 120 -6h344q50 0 120 6v-62zM1368 1574q32 -32 32 -78.5t-32 -79 t-78 -32.5t-78.5 33.5t-32.5 78t33 77.5t78.5 33t77.5 -32zM995.5 1574q32.5 -32 32.5 -78.5t-32.5 -79t-78 -32.5t-78.5 33.5t-33 78t33 77.5t78.5 33t78 -32z" />
+<glyph unicode="ӝ" horiz-adv-x="1611" d="M737 471l-56 7q-128 0 -236 -69q-55 -35 -70.5 -71t-20 -119.5t-53.5 -158.5t-134 -75q-67 0 -101 67q-27 53 -27 128q0 34 27 34q22 0 26 -26q10 -62 16 -78q17 -44 57 -44q66 0 66 141.5t62.5 205t196.5 93.5q-68 33 -107 130l-53 156q-32 76 -89 76q-25 0 -25 -18 q0 -3 16 -29.5t16 -60t-27.5 -62t-66.5 -28.5q-102 0 -102 102q0 70 46 118t112 48q148 0 200 -178q37 -124 57 -151q51 -70 178 -70h92v226q0 41 -9 59q-17 33 -150 33h-8v66q208 -6 243.5 -6t237.5 6v-66q-7 0 -23.5 0.5t-54 0.5t-63.5 -16t-26 -77v-226h92q127 0 178 70 q20 27 53.5 140.5t96.5 158.5q42 30 107.5 30t111.5 -48t46 -118q0 -102 -102 -102q-39 0 -66.5 28.5t-27.5 62t16 60t16 29.5q0 18 -25 18q-57 0 -89 -76l-53 -156q-39 -97 -107 -130q134 -30 196.5 -93.5t62.5 -205t66 -141.5q40 0 57 44q6 16 16 78q4 26 26 26 q27 0 27 -34q0 -75 -27 -128q-34 -67 -101 -67q-85 0 -134 75t-53.5 158.5t-20 119.5t-70.5 71q-108 69 -236 69l-56 -7v-313q0 -41 9 -59q17 -33 150 -33h8v-66q-203 6 -237 6t-244 -6v66q7 0 23.5 -0.5t54 -0.5t63.5 16t26 77v313zM1079 1318q32 -32 32 -78.5t-32 -79 t-78 -32.5t-78.5 33.5t-32.5 78t33 77.5t78.5 33t77.5 -32zM706.5 1318q32.5 -32 32.5 -78.5t-32.5 -79t-78 -32.5t-78.5 33.5t-33 78t33 77.5t78.5 33t78 -32z" />
+<glyph unicode="Ӟ" horiz-adv-x="1244" d="M879 1574q32 -32 32 -78.5t-32 -79t-78 -32.5t-78.5 33.5t-32.5 78t33 77.5t78.5 33t77.5 -32zM506.5 1574q32.5 -32 32.5 -78.5t-32.5 -79t-78 -32.5t-78.5 33.5t-33 78t33 77.5t78.5 33t78 -32zM1176 359q0 -85 -50 -164q-77 -122 -218.5 -180t-302.5 -58 q-258 0 -386 70q-78 -70 -98 -70q-33 0 -34 33l-12 275q-1 32 41 32q22 0 26.5 -6t11.5 -51t26 -79q80 -144 421 -144q160 0 260 93t100 250t-98.5 247t-255.5 90h-116q-78 -1 -116.5 -1t-38.5 30q0 16 13 22.5t170.5 18t256.5 77.5q150 100 150 257q0 111 -103 174 q-87 53 -225.5 53t-242.5 -62.5t-130 -138.5q-4 -20 -17 -58q-10 -20 -35 -20q-41 0 -39 46l9 246q2 49 35 49q26 0 112 -85q136 85 318 85t326 -64q185 -82 185 -227q0 -261 -386 -360q172 -25 295 -115q148 -108 148 -265z" />
+<glyph unicode="ӟ" horiz-adv-x="920" d="M860 253q0 -59 -36 -116q-106 -167 -386 -167q-169 0 -263 43l-64 -43h-9q-23 0 -27 8q-5 11 -5 48v122q0 58 28 58q20 0 26 -20q2 -23 17 -71q45 -85 293.5 -85t248.5 222.5t-251 222.5h-118q-55 0 -55 23t29.5 25.5t79.5 5.5q122 8 192 62q86 66 86 151.5t-58.5 121 t-151 35.5t-165 -36.5t-94 -91t-36.5 -54.5q-28 0 -28 58v122q0 37 5 47.5t36 8.5q25 -19 77 -54q91 54 218 54t232 -43q136 -57 136 -160q0 -170 -254 -242q112 -21 195 -81q102 -73 102 -174zM719 1318q32 -32 32 -78.5t-32 -79t-78 -32.5t-78.5 33.5t-32.5 78t33 77.5 t78.5 33t77.5 -32zM346.5 1318q32.5 -32 32.5 -78.5t-32.5 -79t-78 -32.5t-78.5 33.5t-33 78t33 77.5t78.5 33t78 -32z" />
+<glyph unicode="Ӡ" horiz-adv-x="1181" d="M1113 419q0 -210 -159.5 -336t-366 -126t-350 120t-143.5 264q0 56 33.5 107t79.5 51t76 -30.5t30 -69.5t-29 -68.5t-66.5 -29.5t-68.5 24q13 -136 151 -226.5t281 -90.5q330 0 330 440q0 94 -62 189.5t-148 141.5q-39 21 -94 34t-55 29q0 8 291 439h-330 q-205 0 -293.5 -87.5t-100.5 -293.5h-51l22 443h920q34 0 34 -32q0 -17 -14 -38l-287 -425q154 -52 262 -165.5t108 -263.5z" />
+<glyph unicode="ӡ" horiz-adv-x="948" d="M496 478q179 -12 295.5 -121t116.5 -293.5t-137.5 -311t-334.5 -126.5q-121 0 -215 54q-113 64 -113 170t97 106q42 0 70.5 -28t28.5 -70q0 -94 -100 -99q79 -78 221 -78t224 115t82 252.5t-76 220.5t-210 83q-39 0 -84 -12l-37 38l397 405h-325q-126 0 -164 -19 q-60 -30 -72 -141h-54l21 300h721q38 0 38 -28q0 -20 -18 -38z" />
+<glyph unicode="Ӣ" horiz-adv-x="1631" d="M1564 1284l-56 2q-122 0 -140 -36q-8 -16 -8 -45v-1064q0 -29 8 -45q18 -35 186 -35h10v-61q-71 6 -113 6h-361q-36 0 -107 -6v61q9 0 28 -0.5t29 -0.5q119 0 137 36q8 16 8 45v964l-734 -1008l1 -1q14 -30 90 -35q3 0 30 -0.5t77 0.5v-61q-71 6 -115 6h-358 q-37 0 -108 -6v61q9 0 27.5 -0.5t28.5 -0.5q121 0 139 36q7 14 7 45v1064q0 31 -7 45q-17 34 -149 34h-46v62q70 -6 112 -6h354q45 0 115 6v-62l-55 2q-123 0 -142 -36q-8 -16 -8 -45v-967l734 1009q-15 37 -149 37h-46v62q70 -6 112 -6h356q43 0 113 6v-62zM1116 1494h-601 v102h601v-102z" />
+<glyph unicode="ӣ" horiz-adv-x="1261" d="M1204 0q-203 6 -238 6t-244 -6v66q142 0 158 33q9 19 9 68v570l-499 -653q38 -18 148 -18v-66q-203 6 -238 6t-244 -6v66q142 0 158 33q9 19 9 68v589q0 49 -9 68q-16 33 -158 33v66q209 -6 244 -6t238 6v-66q-143 0 -159 -33q-9 -19 -9 -68v-570l499 653q-38 18 -147 18 v66q209 -6 244 -6t238 6v-66q-143 0 -159 -33q-9 -19 -9 -68v-589q0 -49 9 -68q16 -33 159 -33v-66zM927 1191h-601v102h601v-102z" />
+<glyph unicode="Ӥ" horiz-adv-x="1631" d="M1564 1284l-56 2q-122 0 -140 -36q-8 -16 -8 -45v-1064q0 -29 8 -45q18 -35 186 -35h10v-61q-71 6 -113 6h-361q-36 0 -107 -6v61q9 0 28 -0.5t29 -0.5q119 0 137 36q8 16 8 45v964l-734 -1008l1 -1q14 -30 90 -35q3 0 30 -0.5t77 0.5v-61q-71 6 -115 6h-358 q-37 0 -108 -6v61q9 0 27.5 -0.5t28.5 -0.5q121 0 139 36q7 14 7 45v1064q0 31 -7 45q-17 34 -149 34h-46v62q70 -6 112 -6h354q45 0 115 6v-62l-55 2q-123 0 -142 -36q-8 -16 -8 -45v-967l734 1009q-15 37 -149 37h-46v62q70 -6 112 -6h356q43 0 113 6v-62zM1089 1574 q32 -32 32 -78.5t-32 -79t-78 -32.5t-78.5 33.5t-32.5 78t33 77.5t78.5 33t77.5 -32zM716.5 1574q32.5 -32 32.5 -78.5t-32.5 -79t-78 -32.5t-78.5 33.5t-33 78t33 77.5t78.5 33t78 -32z" />
+<glyph unicode="ӥ" horiz-adv-x="1261" d="M1204 0q-203 6 -238 6t-244 -6v66q142 0 158 33q9 19 9 68v570l-499 -653q38 -18 148 -18v-66q-203 6 -238 6t-244 -6v66q142 0 158 33q9 19 9 68v589q0 49 -9 68q-16 33 -158 33v66q209 -6 244 -6t238 6v-66q-143 0 -159 -33q-9 -19 -9 -68v-570l499 653q-38 18 -147 18 v66q209 -6 244 -6t238 6v-66q-143 0 -159 -33q-9 -19 -9 -68v-589q0 -49 9 -68q16 -33 159 -33v-66zM901 1318q32 -32 32 -78.5t-32 -79t-78 -32.5t-78.5 33.5t-32.5 78t33 77.5t78.5 33t77.5 -32zM528.5 1318q32.5 -32 32.5 -78.5t-32.5 -79t-78 -32.5t-78.5 33.5t-33 78 t33 77.5t78.5 33t78 -32z" />
+<glyph unicode="Ӧ" horiz-adv-x="1445" d="M722 -43q-280 0 -467 214t-187 498.5t186.5 502.5t468 218t468 -217.5t186.5 -503t-187.5 -499t-467.5 -213.5zM1175 696q0 438 -260 590q-92 54 -192 54t-191 -53q-262 -153 -262 -591q0 -469 265 -632q91 -56 185 -56t188 55q267 156 267 633zM979 1574 q32 -32 32 -78.5t-32 -79t-78 -32.5t-78.5 33.5t-32.5 78t33 77.5t78.5 33t77.5 -32zM606.5 1574q32.5 -32 32.5 -78.5t-32.5 -79t-78 -32.5t-78.5 33.5t-33 78t33 77.5t78.5 33t78 -32z" />
+<glyph unicode="ӧ" horiz-adv-x="1054" d="M191.5 118.5q-138.5 142.5 -138.5 341.5t138 349.5t336.5 150.5t336.5 -151t138 -350.5t-139 -341t-336 -141.5t-335.5 142.5zM776 188q47 92 47 292.5t-56 292.5q-84 138 -244.5 138t-241.5 -143q-51 -90 -51 -294.5t55 -299.5q83 -144 246.5 -144t244.5 158zM811 1318 q32 -32 32 -78.5t-32 -79t-78 -32.5t-78.5 33.5t-32.5 78t33 77.5t78.5 33t77.5 -32zM438.5 1318q32.5 -32 32.5 -78.5t-32.5 -79t-78 -32.5t-78.5 33.5t-33 78t33 77.5t78.5 33t78 -32z" />
+<glyph unicode="Ө" horiz-adv-x="1445" d="M722 -43q-280 0 -467 214t-187 498.5t186.5 502.5t468 218t468 -217.5t186.5 -503t-187.5 -499t-467.5 -213.5zM915 1286q-92 54 -192 54t-191 -53q-250 -146 -261 -556h903q-11 410 -259 555zM535 64q91 -56 185 -56t188 55q258 151 267 608h-905q8 -450 265 -607z" />
+<glyph unicode="ө" horiz-adv-x="1054" d="M191.5 118.5q-138.5 142.5 -138.5 341.5t138 349.5t336.5 150.5t336.5 -151t138 -350.5t-139 -341t-336 -141.5t-335.5 142.5zM767 773q-84 138 -244.5 138t-241.5 -143q-49 -87 -51 -254h593q-2 171 -56 259zM285 174q83 -144 246.5 -144t244.5 158q46 90 47 260h-593 q2 -181 55 -274z" />
+<glyph unicode="Ӫ" horiz-adv-x="1445" d="M722 -43q-280 0 -467 214t-187 498.5t186.5 502.5t468 218t468 -217.5t186.5 -503t-187.5 -499t-467.5 -213.5zM915 1286q-92 54 -192 54t-191 -53q-250 -146 -261 -556h903q-11 410 -259 555zM535 64q91 -56 185 -56t188 55q258 151 267 608h-905q8 -450 265 -607z M979 1574q32 -32 32 -78.5t-32 -79t-78 -32.5t-78.5 33.5t-32.5 78t33 77.5t78.5 33t77.5 -32zM606.5 1574q32.5 -32 32.5 -78.5t-32.5 -79t-78 -32.5t-78.5 33.5t-33 78t33 77.5t78.5 33t78 -32z" />
+<glyph unicode="ӫ" horiz-adv-x="1054" d="M191.5 118.5q-138.5 142.5 -138.5 341.5t138 349.5t336.5 150.5t336.5 -151t138 -350.5t-139 -341t-336 -141.5t-335.5 142.5zM767 773q-84 138 -244.5 138t-241.5 -143q-49 -87 -51 -254h593q-2 171 -56 259zM285 174q83 -144 246.5 -144t244.5 158q46 90 47 260h-593 q2 -181 55 -274zM811 1318q32 -32 32 -78.5t-32 -79t-78 -32.5t-78.5 33.5t-32.5 78t33 77.5t78.5 33t77.5 -32zM438.5 1318q32.5 -32 32.5 -78.5t-32.5 -79t-78 -32.5t-78.5 33.5t-33 78t33 77.5t78.5 33t78 -32z" />
+<glyph unicode="Ӭ" horiz-adv-x="1335" d="M582 1390q287 0 485.5 -214t198.5 -503.5t-198 -502.5t-486 -213q-184 0 -327.5 118.5t-178.5 298.5q-2 11 -2 17q0 22 27 22q15 0 23 -29q25 -90 47 -135.5t77 -101.5q130 -130 309 -130q91 0 185 41q322 141 322 595v19l-1 38q-80 45 -202 45q-178 0 -355 -155 q-76 -67 -179.5 -67t-214.5 90q-31 25 -31 51t19 26q-4 0 48.5 -30.5t105.5 -30.5q85 0 161 56l147 110q94 58 224 58t274 -95q-31 381 -294 510q-102 50 -207 50q-151 0 -272 -117t-155 -271q-7 -32 -35.5 -32t-28.5 26v423q0 33 21 33q14 0 31 -25l99 -144 q170 169 363 169zM859 1574q32 -32 32 -78.5t-32 -79t-78 -32.5t-78.5 33.5t-32.5 78t33 77.5t78.5 33t77.5 -32zM486.5 1574q32.5 -32 32.5 -78.5t-32.5 -79t-78 -32.5t-78.5 33.5t-33 78t33 77.5t78.5 33t78 -32z" />
+<glyph unicode="ӭ" horiz-adv-x="1142" d="M135 953q3 0 107 -86q114 86 259 86q211 0 368 -142t157 -350t-157.5 -349.5t-367.5 -141.5q-141 0 -255 70q-133 82 -133 215q0 30 28 30q21 0 26 -32q15 -106 101 -161.5t199 -55.5q174 0 283 116q90 95 98 289q-69 60 -163 60q-135 0 -250 -109q-55 -52 -110 -52 t-130 38.5t-75 76.5t21 38q3 0 31 -18.5t61 -18.5q67 0 163.5 80.5t198.5 80.5q134 0 251 -94q-18 176 -119 270t-258 94q-188 0 -269 -152q-5 -9 -33 -93q-6 -19 -27 -19t-26 18q-1 4 -1 38v218q0 56 22 56zM811 1318q32 -32 32 -78.5t-32 -79t-78 -32.5t-78.5 33.5 t-32.5 78t33 77.5t78.5 33t77.5 -32zM438.5 1318q32.5 -32 32.5 -78.5t-32.5 -79t-78 -32.5t-78.5 33.5t-33 78t33 77.5t78.5 33t78 -32z" />
+<glyph unicode="Ӯ" horiz-adv-x="1591" d="M441 -20q-135 0 -214.5 72.5t-79.5 206.5q0 106 99 106q42 0 69.5 -27t27.5 -69.5t-28 -70t-71 -27.5q-14 0 -35 5q20 -70 87 -106t149.5 -36t168.5 135q53 83 136 234l-466 798q-10 19 -37 52q-33 29 -170 29h-9v64q196 -6 246 -6t234 6v-64h-4q-91 0 -91 -41 q0 -14 18 -45l371 -636l345 590q23 39 23 65q0 65 -73 67v64q183 -6 233.5 -6t152.5 6v-64q-171 -2 -248 -134l-550 -940q-133 -228 -284 -228zM1116 1494h-601v102h601v-102z" />
+<glyph unicode="ӯ" horiz-adv-x="1151" d="M249 -439q-76 0 -136 50t-60 124q0 91 89 91q39 0 65 -25.5t26 -63.5q0 -81 -85 -91q41 -38 101 -38q93 0 158 92q32 45 68 130l71 170l-321 781q-22 54 -70 68q-21 6 -74 6h-28v68q120 -8 178.5 -8t261.5 8v-68h-4q-116 0 -116 -54q0 -19 250 -616l217 528q14 34 14 50 q0 90 -101 92v68q170 -8 212 -8t134 8v-68h-2q-140 0 -197 -136l-377 -913q-101 -245 -274 -245zM897 1191h-601v102h601v-102z" />
+<glyph unicode="Ӱ" horiz-adv-x="1591" d="M441 -20q-135 0 -214.5 72.5t-79.5 206.5q0 106 99 106q42 0 69.5 -27t27.5 -69.5t-28 -70t-71 -27.5q-14 0 -35 5q20 -70 87 -106t149.5 -36t168.5 135q53 83 136 234l-466 798q-10 19 -37 52q-33 29 -170 29h-9v64q196 -6 246 -6t234 6v-64h-4q-91 0 -91 -41 q0 -14 18 -45l371 -636l345 590q23 39 23 65q0 65 -73 67v64q183 -6 233.5 -6t152.5 6v-64q-171 -2 -248 -134l-550 -940q-133 -228 -284 -228zM1109 1574q32 -32 32 -78.5t-32 -79t-78 -32.5t-78.5 33.5t-32.5 78t33 77.5t78.5 33t77.5 -32zM736.5 1574 q32.5 -32 32.5 -78.5t-32.5 -79t-78 -32.5t-78.5 33.5t-33 78t33 77.5t78.5 33t78 -32z" />
+<glyph unicode="ӱ" horiz-adv-x="1151" d="M249 -439q-76 0 -136 50t-60 124q0 91 89 91q39 0 65 -25.5t26 -63.5q0 -81 -85 -91q41 -38 101 -38q93 0 158 92q32 45 68 130l71 170l-321 781q-22 54 -70 68q-21 6 -74 6h-28v68q120 -8 178.5 -8t261.5 8v-68h-4q-116 0 -116 -54q0 -19 250 -616l217 528q14 34 14 50 q0 90 -101 92v68q170 -8 212 -8t134 8v-68h-2q-140 0 -197 -136l-377 -913q-101 -245 -274 -245zM871 1318q32 -32 32 -78.5t-32 -79t-78 -32.5t-78.5 33.5t-32.5 78t33 77.5t78.5 33t77.5 -32zM498.5 1318q32.5 -32 32.5 -78.5t-32.5 -79t-78 -32.5t-78.5 33.5t-33 78 t33 77.5t78.5 33t78 -32z" />
+<glyph unicode="Ӳ" horiz-adv-x="1591" d="M441 -20q-135 0 -214.5 72.5t-79.5 206.5q0 106 99 106q42 0 69.5 -27t27.5 -69.5t-28 -70t-71 -27.5q-14 0 -35 5q20 -70 87 -106t149.5 -36t168.5 135q53 83 136 234l-466 798q-10 19 -37 52q-33 29 -170 29h-9v64q196 -6 246 -6t234 6v-64h-4q-91 0 -91 -41 q0 -14 18 -45l371 -636l345 590q23 39 23 65q0 65 -73 67v64q183 -6 233.5 -6t152.5 6v-64q-171 -2 -248 -134l-550 -940q-133 -228 -284 -228zM1313 1532q0 -44 -46 -61l-328 -123l-26 50l292 195q19 13 43.5 13t44.5 -23t20 -51zM963 1532q0 -44 -46 -61l-328 -123l-26 50 l292 195q19 13 43.5 13t44.5 -23t20 -51z" />
+<glyph unicode="ӳ" horiz-adv-x="1151" d="M523 1401q22 29 53 29t54 -23t23 -53t-28 -54l-313 -256l-37 35zM893 1401q22 29 53 29t54 -23t23 -53t-28 -54l-313 -256l-37 35zM249 -439q-76 0 -136 50t-60 124q0 91 89 91q39 0 65 -25.5t26 -63.5q0 -81 -85 -91q41 -38 101 -38q93 0 158 92q32 45 68 130l71 170 l-321 781q-22 54 -70 68q-21 6 -74 6h-28v68q120 -8 178.5 -8t261.5 8v-68h-4q-116 0 -116 -54q0 -19 250 -616l217 528q14 34 14 50q0 90 -101 92v68q170 -8 212 -8t134 8v-68h-2q-140 0 -197 -136l-377 -913q-101 -245 -274 -245z" />
+<glyph unicode="Ӵ" horiz-adv-x="1601" d="M1535 1284l-59 2q-75 0 -103 -9q-53 -18 -53 -76v-1057q0 -27 13.5 -52t91.5 -31h110v-61q-71 6 -117 6h-373q-41 0 -112 -6v61q8 0 27.5 -0.5t29.5 -0.5q128 0 147 36q9 17 9 49v545q-190 -218 -438 -218q-187 0 -312.5 111t-125.5 298v327q0 30 -7 43q-18 34 -156 34 q-19 0 -39 -1v62q73 -6 156 -6h270q84 0 156 6v-62q-48 1 -60 1q-118 0 -136 -34q-9 -17 -9 -51v-319q0 -149 90.5 -232t237.5 -83q208 0 373 205v430q0 32 -9 49q-18 34 -153 34h-51v62q71 -6 115 -6h376q41 0 111 6v-62zM1069 1574q32 -32 32 -78.5t-32 -79t-78 -32.5 t-78.5 33.5t-32.5 78t33 77.5t78.5 33t77.5 -32zM696.5 1574q32.5 -32 32.5 -78.5t-32.5 -79t-78 -32.5t-78.5 33.5t-33 78t33 77.5t78.5 33t78 -32z" />
+<glyph unicode="ӵ" horiz-adv-x="1261" d="M1204 0q-203 6 -237.5 6t-244.5 -6v66q140 0 157 30q10 18 10 71v274q-129 -143 -324 -143q-131 0 -236.5 81t-105.5 208q0 214 -5 229q-11 32 -72 40q-12 1 -90 1v66q209 -6 244 -6t238 6v-66q-140 0 -157 -30q-11 -19 -11 -71v-143q0 -102 70.5 -160.5t174.5 -58.5 q137 0 246 109q28 28 28 75v178q0 53 -10 71q-17 30 -157 30v66q209 -6 244 -6t238 6v-66q-140 0 -157 -30q-11 -19 -11 -71v-589q0 -52 11 -71q17 -30 157 -30v-66zM891 1318q32 -32 32 -78.5t-32 -79t-78 -32.5t-78.5 33.5t-32.5 78t33 77.5t78.5 33t77.5 -32zM518.5 1318 q32.5 -32 32.5 -78.5t-32.5 -79t-78 -32.5t-78.5 33.5t-33 78t33 77.5t78.5 33t78 -32z" />
+<glyph unicode="Ӷ" horiz-adv-x="1216" d="M744 1281h-214q-51 0 -68.5 -13t-17.5 -66v-997q0 -69 14 -97q23 -47 173 -47h24q0 -12 -0.5 -39t-0.5 -40q0 -312 87 -376q-68 13 -125 92q-15 20 -73.5 125.5t-100 141t-130.5 35.5h-244v61q8 0 26 -0.5t28 -0.5q124 0 141 38q7 15 7 48v1053q0 31 -7 47 q-15 35 -170 35h-25v62h1026l55 -442h-49q-24 212 -82 285q-74 95 -274 95z" />
+<glyph unicode="ӷ" horiz-adv-x="1035" d="M537 66l-2 -101q0 -212 94 -231q-68 0 -115 49q-14 16 -64 94t-82 100.5t-99 22.5h-213v66q140 0 157 30q10 18 10 71v589q0 52 -10 70q-16 30 -151 30h-6v67h846l38 -328h-53q-18 182 -98 229q-55 32 -254 32q-112 0 -122 -2q-32 -6 -40 -31q-3 -10 -3 -55v-601 q0 -53 10 -71q17 -30 157 -30z" />
+<glyph unicode="Ӹ" horiz-adv-x="1986" d="M649 1284l-59 2q-76 0 -103 -9q-53 -18 -53 -76v-480h336q188 0 334 -85q174 -101 174 -269t-135.5 -267.5t-302.5 -99.5h-772v61q62 -2 63 -2q113 0 134 45q5 11 5 42v1055q0 32 -9 49q-18 34 -153 34h-40v62q71 -6 115 -6h355q41 0 111 6v-62zM994 147q88 86 88 221 t-87 222t-210 87h-351v-537q0 -53 16.5 -66t69.5 -13h257q129 0 217 86zM1920 1284l-59 2q-75 0 -103 -9q-53 -18 -53 -76v-1057q0 -27 13.5 -52t91.5 -31h110v-61q-71 6 -117 6h-373q-41 0 -112 -6v61q8 0 27.5 -0.5t29.5 -0.5q128 0 147 36q9 17 9 49v1056q0 32 -9 49 q-18 34 -153 34h-51v62q71 -6 115 -6h376q41 0 111 6v-62zM1249 1574q32 -32 32 -78.5t-32 -79t-78 -32.5t-78.5 33.5t-32.5 78t33 77.5t78.5 33t77.5 -32zM876.5 1574q32.5 -32 32.5 -78.5t-32.5 -79t-78 -32.5t-78.5 33.5t-33 78t33 77.5t78.5 33t78 -32z" />
+<glyph unicode="ӹ" horiz-adv-x="1535" d="M1495 0q-203 6 -240.5 6t-241.5 -6v66q139 0 156 29q11 18 11 68v597q0 50 -11 68q-17 29 -156 29v66q203 -6 241 -6t241 6v-66q-80 0 -86 -1q-60 -5 -72 -34q-9 -21 -9 -72v-577q0 -51 9 -72q12 -29 72 -34q6 -1 86 -1v-66zM1004 251q0 -56 -34 -109q-90 -142 -310 -142 h-598v66h9q132 0 148 30q10 18 10 71v589q0 53 -10 71q-16 30 -148 30h-9v66q120 -6 196.5 -6t272.5 6v-66h-9q-132 0 -148 -30q-10 -18 -10 -71v-270h291q127 0 227 -53q122 -65 122 -182zM608 66q93 0 159 50t66 137.5t-56 145t-141 57.5h-272v-302q0 -62 14 -75t78 -13 h152zM1049 1318q32 -32 32 -78.5t-32 -79t-78 -32.5t-78.5 33.5t-32.5 78t33 77.5t78.5 33t77.5 -32zM636.5 1318q32.5 -32 32.5 -78.5t-32.5 -79t-78 -32.5t-78.5 33.5t-33 78t33 77.5t78.5 33t78 -32z" />
+<glyph unicode="Ӻ" horiz-adv-x="1216" d="M744 1281h-214q-51 0 -68.5 -13.5t-17.5 -65.5v-559h593v-62h-593v-444q0 -22 8 -39q17 -37 223 -37h22v-168q0 -133 -81 -232.5t-211 -99.5q-90 0 -159 40q-83 48 -83 132q0 42 27.5 70t69.5 28t70.5 -28t28.5 -70q0 -76 -74 -96q58 -29 114 -29q158 0 158 281v117h-362 q-55 0 -127 -6v61q8 0 26 -0.5t28 -0.5q124 0 141 38q7 15 7 48v435h-202v62h202v556q0 31 -7 47q-15 35 -170 35h-25v62h1026l55 -442h-49q-24 212 -82 285q-74 95 -274 95z" />
+<glyph unicode="ӻ" horiz-adv-x="1035" d="M535 856q-112 0 -122 -2q-32 -6 -40 -31q-3 -10 -3 -55v-305h325v-62h-325v-230q0 -47 7 -62q10 -26 51 -34.5t150 -8.5v-173q0 -133 -81 -232.5t-211 -99.5q-90 0 -159 40q-83 48 -83 132q0 42 27.5 70t69.5 28t70.5 -28t28.5 -70q0 -76 -74 -96q58 -29 114 -29 q158 0 158 281v117h-103q-33 0 -279 -6v66q140 0 157 30q10 18 10 71v234h-167v62h167v293q0 52 -10 70q-16 30 -151 30h-6v67h846l38 -328h-53q-18 182 -98 229q-55 32 -254 32z" />
+<glyph unicode="Ӽ" horiz-adv-x="1518" d="M1336 -147q0 -136 -106 -217q-86 -66 -177 -66q-53 0 -97 33t-44 78.5t30.5 74.5t70.5 29t68.5 -29.5t28.5 -67t-21 -64.5q130 24 130 130q0 95 -106 256l-398 603l-281 -414q-19 -28 -19 -48q0 -43 38.5 -66t84.5 -24v-61q-74 6 -165 6t-305 -6v61q196 0 285 131 l323 477l-362 547q-34 51 -99 64q-24 4 -81 4h-41v62q112 -6 292.5 -6t251.5 6v-62q-128 -5 -128 -58q0 -13 268 -410l225 333q17 25 17 46q0 43 -37.5 65.5t-83.5 23.5v62q81 -6 163.5 -6t306.5 6v-62q-198 -2 -285 -128l-271 -395l452 -685q72 -109 72 -223z" />
+<glyph unicode="ӽ" horiz-adv-x="1183" d="M974 74q75 -96 75 -226.5t-109 -213.5q-87 -66 -177 -66q-53 0 -97 33t-44 78.5t30.5 74.5t70.5 29t68.5 -29.5t28.5 -67t-21 -64.5q159 30 159 148q0 113 -94 237l-301 398q-192 -223 -192 -272q0 -61 62 -67v-66q-141 6 -221 6t-159 -6v66q159 0 274 128l200 256 l-212 276q-71 92 -105 110.5t-147 18.5v68q110 -8 171 -8t264 8v-68q-75 -2 -75 -52q0 -20 184 -255l134 167q33 41 33 75q0 61 -63 65v68q108 -8 192.5 -8t188.5 8v-68q-152 -3 -255 -109q-26 -27 -197 -244z" />
+<glyph unicode="Ӿ" horiz-adv-x="1518" d="M1450 0q-127 6 -299 6t-244 -6v61q128 5 128 59q0 10 -320 493l-281 -414q-19 -28 -19 -48q0 -43 38.5 -66t84.5 -24v-61q-74 6 -165 6t-305 -6v61q196 0 285 131l323 477l-11 16h-408v62h367l-310 469q-34 51 -99 64q-24 4 -81 4h-41v62q112 -6 292.5 -6t251.5 6v-62 q-128 -5 -128 -58q0 -13 268 -410l225 333q17 25 17 46q0 43 -37.5 65.5t-83.5 23.5v62q81 -6 163.5 -6t306.5 6v-62q-198 -2 -285 -128l-271 -395l9 -14h405v-62h-364l366 -553q35 -53 99 -66q25 -5 85 -5h38v-61z" />
+<glyph unicode="ӿ" horiz-adv-x="1183" d="M1131 0q-91 6 -175.5 6t-261.5 -6v66q77 3 77 54q0 10 -208 285q-192 -223 -192 -272q0 -61 62 -67v-66q-141 6 -221 6t-159 -6v66q159 0 274 128q9 9 195 250h-325v62h287l-169 220q-71 92 -105 110.5t-147 18.5v68q110 -8 171 -8t264 8v-68q-75 -2 -75 -52 q0 -20 184 -255l134 167q33 41 33 75q0 61 -63 65v68q108 -8 192.5 -8t188.5 8v-68q-152 -3 -255 -109q-30 -30 -194 -240h323v-62h-281l242 -311q37 -47 92 -60q28 -7 95 -7h17v-66z" />
+<glyph unicode="Ԁ" horiz-adv-x="1295" d="M1228 0h-695q-174 0 -311 94q-154 106 -154 268t142 262t307 100h335v473q0 32 -7 48q-17 37 -181 37h-17v61q72 -6 133 -6h326q50 0 122 6v-61l-55 1q-122 0 -140 -38q-7 -15 -7 -48v-1051q0 -32 7 -48q16 -37 158 -37q18 0 37 1v-62zM857 141v532h-272 q-313 0 -313 -307q0 -161 75.5 -232.5t237.5 -71.5h186q53 0 69.5 13t16.5 66z" />
+<glyph unicode="ԁ" horiz-adv-x="1159" d="M793 118q-111 -142 -295 -142t-314.5 144.5t-130.5 340.5t139.5 340.5t336.5 144.5q163 0 270 -133v464q0 88 -47 109q-20 10 -85 10q-16 0 -35 -1v67l308 23v-1300q0 -88 46 -110q20 -10 85 -10q16 0 35 1v-66l-313 -24v142zM793 253v449q0 32 -24 68q-87 129 -236 129 t-238 -138q-65 -100 -65 -300t61 -299q85 -138 224 -138q93 0 185.5 69.5t92.5 159.5z" />
+<glyph unicode="Ԃ" horiz-adv-x="1838" d="M1771 516q-6 0 -22.5 0.5t-25.5 0.5q-72 0 -96 -17.5t-24 -84.5v-169q0 -133 -124 -216q-109 -73 -249 -73q-201 0 -312 127q-112 -84 -265 -84h-120q-174 0 -311 94q-154 106 -154 268t142 262t307 100h335v473q0 32 -7 48q-17 37 -181 37h-17v61q72 -6 133 -6h326 q50 0 122 6v-61l-55 1q-122 0 -140 -38q-7 -15 -7 -48v-970q0 -100 52.5 -159.5t151.5 -59.5t151.5 59.5t52.5 159.5v188q0 52 -11 71q-18 30 -141 30h-16v66q202 -6 249.5 -6t255.5 6v-66zM857 270v403h-272q-313 0 -313 -307q0 -161 75.5 -232.5t237.5 -71.5h48q56 0 86 5 q138 24 138 203z" />
+<glyph unicode="ԃ" horiz-adv-x="1743" d="M1685 435q-140 0 -157 -30q-11 -19 -11 -71v-69q0 -125 -105.5 -207t-256.5 -82q-234 0 -328 163q-135 -163 -324 -163t-319.5 144.5t-130.5 340.5t139.5 340.5t336.5 144.5q163 0 270 -133v464q0 88 -47 109q-20 10 -85 10q-16 0 -35 -1v67l308 23v-1236 q0 -101 58.5 -160t156.5 -59t156.5 59t58.5 160v85q0 52 -11 71q-17 30 -157 30v66q203 -6 238.5 -6t244.5 6v-66zM793 253v449q0 32 -24 68q-87 129 -236 129t-238 -138q-65 -100 -65 -300t61 -299q85 -138 224 -138q93 0 185.5 69.5t92.5 159.5z" />
+<glyph unicode="Ԅ" horiz-adv-x="1922" d="M1855 516q-6 0 -22.5 0.5t-25.5 0.5q-72 0 -96 -17.5t-24 -84.5v-169q0 -133 -124 -216q-109 -73 -249 -73t-249 73q-124 83 -124 216v129q0 101 -108 203q-123 118 -292 118h-233q-38 0 -38 30q0 16 13 22.5t170.5 18t256.5 77.5q150 100 150 257q0 111 -103 174 q-87 53 -225.5 53t-242.5 -62.5t-130 -138.5q-4 -20 -17 -58q-10 -20 -35 -20q-41 0 -39 46l9 246q2 49 35 49q26 0 112 -85q136 85 318 85t326 -64q185 -82 185 -227q0 -261 -386 -360q172 -25 295 -115q148 -108 148 -265v-132q0 -100 52.5 -159.5t151.5 -59.5t151.5 59.5 t52.5 159.5v188q0 52 -11 71q-18 30 -141 30h-16v66q202 -6 249.5 -6t255.5 6v-66z" />
+<glyph unicode="ԅ" horiz-adv-x="1580" d="M1562 435q-140 0 -157 -30q-11 -19 -11 -71v-69q0 -125 -105.5 -207t-249.5 -82t-245 68.5t-144 188.5q-55 159 -63 169q-51 73 -198 73h-118q-55 0 -55 23t29.5 25.5t79.5 5.5q122 8 192 62q86 66 86 151.5t-58.5 121t-151 35.5t-165 -36.5t-94 -91t-36.5 -54.5 q-28 0 -28 58v122q0 37 5 47q4 9 27 9h9q25 -19 77 -54q91 54 218 54t232 -43q136 -57 136 -160q0 -170 -254 -242q199 -38 264 -164l62 -210q40 -104 186 -104q98 0 156.5 59t58.5 160v85q0 52 -11 71q-17 30 -157 30v66q203 -6 238.5 -6t244.5 6v-66z" />
+<glyph unicode="Ԇ" horiz-adv-x="1287" d="M938 0h-245v61q9 0 28 -0.5t29 -0.5q119 0 137 36q8 16 8 45v220q0 156 -98.5 246t-255.5 90h-116q-78 -1 -116.5 -1t-38.5 30q0 16 13 22.5t170.5 18t256.5 77.5q150 100 150 257q0 111 -103 174q-87 53 -225.5 53t-242.5 -62.5t-130 -138.5q-4 -20 -17 -58 q-10 -20 -35 -20q-41 0 -39 46l9 246q2 49 35 49q26 0 112 -85q136 85 318 85t326 -64q185 -82 185 -227q0 -261 -386 -360q164 -24 275 -117q128 -107 128 -267v-150q0 -69 14 -97q23 -47 173 -47h24q0 -12 -0.5 -39t-0.5 -40q0 -312 87 -376q-68 13 -125 92 q-15 20 -73.5 125.5t-100 141t-130.5 35.5z" />
+<glyph unicode="ԇ" horiz-adv-x="1010" d="M998 66l-2 -101q0 -212 94 -231q-68 0 -115 49q-14 16 -64 94t-82 100.5t-99 22.5h-214v66q140 0 157 30q10 18 10 71v86q0 222 -251 222h-118q-55 0 -55 23t29.5 25.5t79.5 5.5q122 8 192 62q86 66 86 151.5t-58.5 121t-151 35.5t-165 -36.5t-94 -91t-36.5 -54.5 q-28 0 -28 58v122q0 37 5 47q4 9 27 9h9q25 -19 77 -54q91 54 218 54t232 -43q136 -57 136 -160q0 -170 -254 -242q268 -51 268 -240v-101q0 -53 10 -71q17 -30 157 -30z" />
+<glyph unicode="Ԉ" horiz-adv-x="2085" d="M1488 1281l-59 2q-76 0 -103 -9q-53 -18 -53 -76v-971q0 -100 52.5 -159.5t151.5 -59.5t151.5 59.5t52.5 159.5v188q0 52 -11 71q-18 30 -141 30h-16v66q202 -6 249.5 -6t255.5 6v-66q-6 0 -22.5 0.5t-25.5 0.5q-72 0 -96 -17.5t-24 -84.5v-169q0 -133 -124 -216 q-109 -73 -248.5 -73t-251.5 76q-127 86 -127 220v945q0 32 -9 49q-18 34 -153 34h-67q-188 0 -215 -35q-11 -14 -11 -63q0 -227 -12 -426q-46 -757 -354 -757q-86 0 -148 60t-62 146q0 45 30 76t74 31t74 -30t30 -75q0 -81 -77 -102q31 -14 75 -14q200 0 256 520 q21 195 21 511q0 113 -13 132q-18 27 -187 27v61h1137v-62z" />
+<glyph unicode="ԉ" horiz-adv-x="1812" d="M281 81q186 0 186 658q0 63 -6 80q-11 30 -72 37q-10 1 -89 1v66h876v-66q-140 0 -157 -30q-10 -18 -10 -71v-507q0 -101 58.5 -160t156.5 -59t156.5 59t58.5 160v85q0 52 -11 71q-17 30 -157 30v66q203 -6 238.5 -6t244.5 6v-66q-140 0 -157 -30q-11 -19 -11 -71v-69 q0 -125 -105.5 -207t-256.5 -82t-256.5 82t-105.5 207v487q0 47 -8 65q-18 40 -149 40q-69 0 -92 -5q-55 -11 -63 -53q-3 -17 -4 -116q-6 -683 -261 -683q-70 0 -121 48.5t-51 118.5q0 88 86 88q36 0 60 -24.5t24 -61.5q0 -59 -50 -79q18 -9 48 -9z" />
+<glyph unicode="Ԋ" horiz-adv-x="2021" d="M1413 1284l-56 2q-122 0 -140 -36q-8 -16 -8 -45v-978q0 -100 52.5 -159.5t151.5 -59.5t151.5 59.5t52.5 159.5v188q0 52 -11 71q-18 30 -141 30h-16v66q202 -6 249.5 -6t255.5 6v-66q-6 0 -22.5 0.5t-25.5 0.5q-72 0 -96 -17.5t-24 -84.5v-169q0 -133 -124 -216 q-109 -73 -248.5 -73t-252.5 77q-127 86 -127 220v417h-590v-530q0 -29 8 -45q18 -35 187 -35h10v-61q-71 6 -115 6h-358q-37 0 -108 -6v61q9 0 27.5 -0.5t28.5 -0.5q121 0 139 36q7 14 7 45v1064q0 31 -7 45q-17 34 -149 34h-46v62q70 -6 112 -6h354q45 0 115 6v-62l-55 2 q-123 0 -142 -36q-8 -16 -8 -45v-474h590v474q0 29 -8 45q-17 34 -148 34h-46v62q70 -6 112 -6h356q43 0 113 6v-62z" />
+<glyph unicode="ԋ" horiz-adv-x="1756" d="M1698 435q-140 0 -157 -30q-11 -19 -11 -71v-69q0 -125 -105.5 -207t-256.5 -82t-256.5 82t-105.5 207v183h-436v-281q0 -49 9 -68q16 -33 159 -33v-66q-203 6 -238 6t-244 -6v66q140 0 157 30q10 18 10 71v589q0 53 -10 71q-17 30 -157 30v66q209 -6 244 -6t238 6v-66 q-143 0 -159 -33q-9 -19 -9 -68v-242h436v242q0 53 -10 71q-17 30 -157 30v66q209 -6 243.5 -6t237.5 6v-66q-140 0 -157 -30q-10 -18 -10 -71v-507q0 -101 58.5 -160t156.5 -59t156.5 59t58.5 160v85q0 52 -11 71q-17 30 -157 30v66q203 -6 238.5 -6t244.5 6v-66z" />
+<glyph unicode="Ԍ" horiz-adv-x="1421" d="M1353 516q-6 0 -22.5 0.5t-25.5 0.5q-72 0 -96 -17.5t-24 -84.5v-169q0 -133 -140 -215q-125 -74 -293 -74q-288 0 -486 213t-198 502.5t198.5 503.5t485.5 214q193 0 363 -169l99 144q17 25 31 25q22 0 22 -33v-503q0 -26 -29 -26t-35 32q-12 60 -47 178 q-51 127 -151 208.5t-217 81.5t-220 -50q-298 -145 -298 -613.5t322 -606.5q96 -41 187.5 -41t164 54t72.5 156v188q0 52 -11 71q-18 30 -141 30h-16v66q202 -6 249.5 -6t255.5 6v-66z" />
+<glyph unicode="ԍ" horiz-adv-x="1100" d="M1042 435q-140 0 -157 -30q-11 -19 -11 -71v-69q0 -125 -105.5 -207t-256.5 -82q-194 0 -326.5 144.5t-132.5 343t132 347.5t330 149q146 0 245 -74q10 7 45.5 40.5t46.5 33.5q22 0 22 -56v-218q0 -34 -1 -38q-5 -18 -26 -18t-27 26q-28 115 -108 182t-194 67 q-60 0 -120 -34q-168 -94 -168 -402.5t178 -404.5q63 -34 130 -34t128 58t61 158v88q0 52 -11 71q-17 30 -157 30v66q203 -6 238.5 -6t244.5 6v-66z" />
+<glyph unicode="Ԏ" horiz-adv-x="1606" d="M1538 516q-6 0 -22.5 0.5t-25.5 0.5q-72 0 -96 -17.5t-24 -84.5v-169q0 -133 -124 -216q-109 -73 -248.5 -73t-259.5 83t-120 217v961q0 43 -29 56q-17 8 -66 8q-256 0 -321 -62.5t-86 -318.5h-48l36 442h1206l36 -442h-49q-22 262 -88.5 321.5t-330.5 59.5 q-46 0 -65.5 -11.5t-19.5 -53.5v-990q0 -100 52.5 -159.5t151.5 -59.5t151.5 59.5t52.5 159.5v188q0 52 -11 71q-18 30 -141 30h-16v66q202 -6 249.5 -6t255.5 6v-66z" />
+<glyph unicode="ԏ" horiz-adv-x="1448" d="M1390 435q-140 0 -157 -30q-11 -19 -11 -71v-69q0 -125 -105.5 -207t-256.5 -82t-256.5 82t-105.5 207v504q0 68 -23 81q-13 7 -92 7q-152 0 -193.5 -50t-52.5 -212h-53l25 328h921l26 -328h-54q-11 161 -48 207q-46 55 -198 55q-75 0 -88 -7q-23 -13 -23 -81v-520 q0 -101 58.5 -160t156.5 -59t156.5 59t58.5 160v85q0 52 -11 71q-17 30 -157 30v66q203 -6 238.5 -6t244.5 6v-66z" />
+<glyph unicode="Ԑ" horiz-adv-x="1244" d="M1177 321q0 -10 -5 -23q-135 -341 -512 -341q-212 0 -381 94q-204 113 -204 308q0 157 148 265q123 90 295 115q-386 98 -386 360q0 145 185 227q144 64 326 64t318 -85q85 85 112 85q33 0 35 -49l9 -246q2 -46 -39 -46q-25 0 -35 20q-5 20 -17 58q-26 76 -130 138.5 t-242.5 62.5t-225.5 -53q-103 -63 -103 -174q0 -157 150 -257q99 -66 279 -79q66 -4 149 -17q12 -6 12 -22q0 -30 -38.5 -30t-116 0.5t-116.5 0.5q-157 0 -255.5 -90t-98.5 -253.5t107.5 -250.5t281.5 -87q265 0 398 205q14 22 52 101q11 23 25 23q23 0 23 -24z" />
+<glyph unicode="ԑ" horiz-adv-x="920" d="M835 276q29 0 29 -23t-27 -74q-107 -203 -340 -203q-155 0 -276 61q-151 76 -151 216q0 101 102 174q82 60 195 81q-254 72 -254 242q0 103 136 163q106 47 232.5 47t217.5 -54l77 54h9q32 0 32 -35v-165q0 -36 -28 -36q-16 0 -37 54.5t-93.5 91t-164 36.5t-151 -38.5 t-59.5 -124.5t78.5 -146.5t199.5 -67.5l64 -2q45 -5 45 -28.5t-55 -23.5h-118q-251 0 -251 -223t266 -223q140 0 216 87q28 33 57.5 96.5t48.5 63.5z" />
+<glyph unicode="Ԓ" horiz-adv-x="1554" d="M1488 1281l-59 2q-76 0 -103 -9q-53 -18 -53 -76v-1303q0 -141 -112.5 -234t-245 -93t-229.5 73t-97 190q0 49 30.5 81.5t78.5 32.5t79 -31.5t31 -78.5q0 -110 -121 -110h-4q71 -114 217 -114q99 0 156 101q47 83 47 190v1296q0 32 -9 49q-18 34 -153 34h-71 q-188 0 -215 -35q-11 -14 -11 -63q0 -227 -12 -426q-46 -757 -354 -757q-86 0 -148 60t-62 146q0 45 30 76t74 31t74 -30t30 -75q0 -81 -77 -102q31 -14 75 -14q200 0 256 520q21 195 21 511q0 113 -13 132q-18 27 -187 27v61h1137v-62z" />
+<glyph unicode="ԓ" horiz-adv-x="1267" d="M281 81q186 0 186 658q0 63 -6 80q-11 30 -72 37q-10 1 -89 1v66h876v-66q-140 0 -157 -30q-10 -18 -10 -71v-863q0 -133 -81 -232.5t-211 -99.5q-90 0 -159 40q-83 48 -83 132q0 42 27.5 70t69.5 28t70.5 -28t28.5 -70q0 -76 -74 -96q58 -29 114 -29q158 0 158 281v863 q0 49 -7 65q-18 40 -159.5 40t-152.5 -58q-3 -17 -4 -116q-6 -683 -261 -683q-70 0 -121 48.5t-51 118.5q0 88 86 88q36 0 60 -24.5t24 -61.5q0 -59 -50 -79q18 -9 48 -9z" />
+<glyph unicode="Ԕ" horiz-adv-x="2261" d="M833 1343l301 -3q175 0 246 6v-62q-128 -5 -128 -58q0 -13 268 -410l225 333q17 25 17 46q0 43 -37.5 65.5t-83.5 23.5v62q81 -6 163.5 -6t306.5 6v-62q-198 -2 -285 -128l-271 -395l416 -629q35 -53 99 -66q25 -5 85 -5h38v-61q-127 6 -299 6t-244 -6v61q128 5 128 59 q0 10 -320 493l-281 -414q-19 -28 -19 -48q0 -43 38.5 -66t84.5 -24v-61q-74 6 -165 6t-305 -6v61q196 0 285 131l323 477l-362 547q-28 42 -68.5 53.5t-118.5 11.5q-188 0 -215 -35q-11 -14 -11 -63q0 -227 -12 -426q-46 -757 -354 -757q-86 0 -148 60t-62 146q0 45 30 76 t74 31t74 -30t30 -75q0 -81 -77 -102q31 -14 75 -14q200 0 256 520q21 195 21 511q0 113 -13 132q-18 27 -187 27v61h482z" />
+<glyph unicode="ԕ" horiz-adv-x="1813" d="M281 81q186 0 186 658q0 63 -6 80q-11 30 -72 37q-10 1 -89 1v66h828v-68q-75 -2 -75 -52q0 -20 184 -255l134 167q33 41 33 75q0 61 -63 65v68q108 -8 192.5 -8t188.5 8v-68q-152 -3 -255 -109q-26 -27 -197 -244l287 -369q37 -47 92 -60q28 -7 95 -7h17v-66 q-91 6 -175.5 6t-261.5 -6v66q77 3 77 54q0 10 -208 285q-192 -223 -192 -272q0 -61 62 -67v-66q-141 6 -221 6t-159 -6v66q159 0 274 128l200 256l-212 276q-65 84 -104 107.5t-122 23.5t-106 -5q-55 -11 -63 -53q-3 -17 -4 -116q-6 -683 -261 -683q-70 0 -121 48.5 t-51 118.5q0 88 86 88q36 0 60 -24.5t24 -61.5q0 -59 -50 -79q18 -9 48 -9z" />
+<glyph unicode="Ԗ" horiz-adv-x="1850" d="M1782 0q-127 6 -299 6t-244 -6v61q128 5 128 59q0 12 -379 580q-129 -81 -279 -81h-265v-473q0 -32 7 -48q17 -37 181 -37h17v-61q-72 6 -133 6h-326q-50 0 -122 -6v61l55 -1q122 0 140 38q7 15 7 48v1051q0 32 -7 48q-16 37 -158 37q-18 0 -37 -1v62h625q174 0 311 -94 q154 -106 154 -272q0 -79 -41 -149l217 321q17 25 17 46q0 43 -37.5 65.5t-83.5 23.5v62q81 -6 163.5 -6t306.5 6v-62q-198 -2 -285 -128l-271 -395l416 -629q35 -53 99 -66q25 -5 85 -5h38v-61zM954 977q0 161 -75.5 232.5t-237.5 71.5h-116q-53 0 -69.5 -13t-16.5 -66 v-532h202q313 0 313 307z" />
+<glyph unicode="ԗ" horiz-adv-x="1649" d="M1597 0q-91 6 -175.5 6t-261.5 -6v66q77 3 77 54q0 16 -148 208q-43 -153 -169.5 -252.5t-288.5 -99.5q-78 0 -158.5 42t-105.5 109v-388q0 -42 11 -59q19 -29 114 -29q19 0 41 1v-66q-169 5 -241.5 5t-238.5 -5v66q37 -2 76.5 -2t60.5 14q30 19 30 83v1002 q0 51 -10 71.5t-44 28.5q-26 6 -83 6h-30v68l307 23v-141q127 141 293 141t285.5 -107t155.5 -265l113 141q33 41 33 75q0 61 -63 65v68q108 -8 192.5 -8t188.5 8v-68q-152 -3 -255 -109q-26 -27 -197 -244l287 -369q37 -47 92 -60q28 -7 95 -7h17v-66zM855 176 q74 128 74 282t-67 281q-81 154 -218 154q-179 0 -277 -172v-478q0 -46 30 -89q91 -130 230.5 -130t227.5 152z" />
+<glyph unicode="Ԙ" horiz-adv-x="2128" d="M865 0v61q39 -1 55 -1q126 0 142 35q7 15 7 46v511h-227q-259 0 -259 -297q0 -13 0.5 -40t0.5 -40q0 -318 -330 -318q-83 0 -134.5 65t-51.5 151q0 33 24 33q18 0 24 -31q32 -175 131 -175q88 0 118 158l23 169q16 108 41 162q65 137 224 192q-138 34 -228 102 q-116 87 -116 209q0 167 180 267q151 84 333 84h1128l56 -442h-49q-24 218 -99.5 299t-288.5 81h-243q-54 0 -71 -13.5t-17 -65.5v-496h158q133 0 174 46q39 46 39 176v7h51v-513h-51v5q0 133 -41 179t-172 46h-158v-512q0 -52 17 -65.5t71 -13.5h253q236 0 326 111 q68 84 107 336h49l-84 -508h-1112zM1069 706v513q0 43 -32 56q-18 8 -69 8q-230 0 -313 -35q-144 -60 -144 -256q0 -286 339 -286h219z" />
+<glyph unicode="ԙ" horiz-adv-x="1639" d="M1560 280q27 0 27 -29t-35 -87q-113 -188 -315 -188t-338 144t-140 341h-128q-37 0 -81 -24.5t-65 -54.5t-21.5 -121t-10.5 -131q-22 -80 -92.5 -120t-174.5 -40q-64 0 -108 45t-44 109q0 32 28 32q20 0 26 -30q21 -109 88 -109q52 0 80 99l55 198q48 121 145 164 q-240 56 -240 204q0 82 70 142q127 109 333 109q48 0 142 -15t144 -15t148 28.5t151 28.5q185 0 284 -131.5t99 -322.5q0 -29 -7.5 -37t-38.5 -8h-605q0 -184 64 -287q89 -144 242 -144q196 0 290 221q12 29 28 29zM1446 506q0 153 -46 260q-64 145 -196 145q-42 0 -90 -23 q-165 -79 -175 -382h507zM836 783q0 84 -168 84q-136 0 -190 -25q-84 -40 -84 -160q0 -89 74 -132.5t170 -43.5h122q6 93 54 199q22 49 22 78z" />
+<glyph unicode="Ԛ" horiz-adv-x="1457" d="M1390 -19q0 -135 -52 -236q-65 -127 -189 -127t-183 130q-34 73 -56 239q-95 -30 -186 -30q-281 0 -468.5 214t-187.5 498.5t186.5 502.5t468 218t468 -217.5t186.5 -503.5q0 -209 -107 -390.5t-292 -265.5q62 -192 188 -192q138 0 180 166q9 35 21 35q23 0 23 -41z M1180 669q0 455 -262 613q-96 58 -194.5 58t-193.5 -56q-267 -157 -267 -615q0 -213 69 -375q86 -199 259 -263q-28 45 -28 103.5t47.5 107.5t115.5 49q144 0 221 -208q233 172 233 586zM726 248q-50 0 -84.5 -36.5t-34.5 -87t33 -84.5t84 -34q92 0 174 46q-36 196 -172 196 z" />
+<glyph unicode="ԛ" horiz-adv-x="1159" d="M1106 -414q-166 5 -243 5t-239 -5v66q37 -2 77 -2t66 16.5t26 80.5v383q-115 -154 -284 -154q-192 0 -324 144.5t-132 340t138 340.5t334 145q92 0 169.5 -54t117.5 -140l81 194h47v-1199q0 -46 12 -67q17 -29 113 -29q19 0 41 1v-66zM799 291v301q0 112 -76 206.5 t-178.5 94.5t-176.5 -72q-138 -134 -138 -362q0 -152 66 -280q81 -155 219 -155q104 0 194 82t90 185z" />
+<glyph unicode="Ԝ" horiz-adv-x="2087" d="M2019 1284q-152 0 -195 -132l-378 -1156q-13 -39 -38.5 -39t-37.5 37l-328 1003l-323 -1001q-13 -39 -39.5 -39t-38.5 37l-395 1207q-6 19 -23 53q-23 30 -134 30h-21v62q242 -6 344.5 -6t175.5 6v-62h-5q-161 0 -161 -58q0 -15 4 -27l316 -968l275 845l-35 127 q-16 48 -52 64.5t-134 16.5v62q242 -6 344.5 -6t175.5 6v-62h-5q-160 0 -160 -58q0 -15 5 -30l316 -965l296 910q10 31 10 39q0 53 -63 81q-48 22 -109 23v62q155 -6 239 -6t174 6v-62z" />
+<glyph unicode="ԝ" horiz-adv-x="1571" d="M1045 -24q-28 0 -42 40l-220 608l-216 -606q-15 -42 -42.5 -42t-44.5 48l-270 757q-19 54 -62 68q-20 6 -78 6h-17v68q143 -8 170.5 -8t260.5 8v-68h-4q-121 0 -121 -56q0 -38 77 -245l137 -366l183 518q-38 105 -54 121q-29 28 -129 28v68q120 -8 189 -8l224 8v-68h-4 q-124 0 -124 -56q0 -11 11 -42l213 -595l195 546q10 28 10 46q0 98 -125 101v68q151 -8 209.5 -8t146.5 8v-68q-131 -3 -179 -136l-252 -703q-14 -40 -42 -40z" />
+<glyph unicode="Ԟ" horiz-adv-x="1514" d="M649 1284l-57 2q-126 0 -142 -40q-6 -15 -6 -44v-447q376 0 530 217l-297 158l29 55l301 -160l102 231q53 109 145 109q53 0 92 -41t39 -95q0 -92 -90 -92q-39 0 -65 25.5t-26 56.5t10 53q-38 -16 -74 -102q-68 -160 -76 -175l303 -161l-29 -55l-306 162 q-110 -168 -319 -209v-8q117 -16 221.5 -77t150.5 -158q25 -54 39 -150l25 -181q30 -158 118 -158q99 0 131 175q6 31 24 31q24 0 24 -33q0 -86 -51.5 -151t-134.5 -65q-330 0 -330 318q0 13 1 40v40q0 136 -83 239.5t-216 103.5h-188v-559q0 -28 9 -45q17 -33 186 -33h10 v-61q-71 6 -120 6h-347q-43 0 -114 -6v61q8 0 26.5 -0.5t28.5 -0.5q125 0 141 40q6 15 6 44v1066q0 27 -7 41q-16 33 -176 33h-19v62q70 -6 119 -6h342q50 0 120 6v-62z" />
+<glyph unicode="ԟ" horiz-adv-x="1080" d="M409 478l-56 -7v-313q0 -41 9 -59q17 -33 150 -33h8v-66q-203 6 -237 6t-244 -6v66q7 0 23.5 -0.5t54 -0.5t63.5 16t26 77v607q0 41 -9 59q-17 33 -150 33h-8v66q208 -6 243.5 -6t237.5 6v-66q-7 0 -23.5 0.5t-54 0.5t-63.5 -16t-26 -77v-226h92q157 0 203 116l-156 63 l23 58l152 -62q21 76 34 104q55 120 175 120q70 0 116 -48t46 -118q0 -102 -102 -102q-39 0 -66.5 28.5t-27.5 62t16 60t16 29.5q0 18 -25 18q-49 0 -79 -55q-12 -22 -44 -123l160 -64l-23 -58l-158 64q-39 -93 -105 -126q134 -30 196.5 -93t62.5 -205t66 -142q40 0 57 44 q6 16 16 78q4 26 26 26q27 0 27 -34q0 -75 -27 -128q-34 -67 -101 -67q-85 0 -134 75t-53.5 158.5t-20 119.5t-70.5 71q-108 69 -236 69z" />
+<glyph unicode="Ԡ" horiz-adv-x="2082" d="M1385 793q284 0 463 -162t179 -442t-180.5 -450.5t-461.5 -170.5q-118 0 -233 59t-195 153l43 32q176 -175 392.5 -175t332.5 167q100 145 100 378.5t-102 379.5q-117 169 -338 169q-54 0 -112 -12v-578q0 -26 6 -41q13 -32 90 -39q5 0 32 -0.5t76 0.5v-61q-71 6 -117 6 h-362q-41 0 -112 -6v61q8 0 27.5 -0.5t29.5 -0.5q128 0 147 36q9 17 9 49v1053q0 32 -9 49q-18 34 -153 34h-67q-188 0 -215 -35q-11 -14 -11 -63q0 -227 -12 -426q-46 -757 -354 -757q-86 0 -148 60t-62 146q0 45 30 76t74 31t74 -30t30 -75q0 -81 -77 -102q31 -14 75 -14 q200 0 256 520q21 195 21 511q0 113 -13 132q-18 27 -187 27v61h1126v-62q-8 0 -29 0.5t-32 0.5q-121 0 -137 -39q-6 -14 -6 -41v-417q56 8 112 8z" />
+<glyph unicode="ԡ" horiz-adv-x="1650" d="M281 81q186 0 186 658q0 63 -6 80q-11 30 -72 37q-10 1 -89 1v66h876v-66q-140 0 -157 -30q-10 -18 -10 -71v-119q157 142 274 142q152 0 233 -110.5t81 -268.5q0 -278 -189 -509.5t-462 -332.5l-14 48q220 81 360.5 288t140.5 443q0 131 -45 215q-58 107 -178 107 q-94 0 -201 -99v-393q0 -53 10 -71q17 -30 157 -30v-66q-203 6 -237.5 6t-244.5 -6v66q140 0 157 30q10 18 10 71v585q0 49 -7 65q-18 40 -149 40q-69 0 -92 -5q-55 -11 -63 -53q-3 -17 -4 -116q-6 -683 -261 -683q-70 0 -121 48.5t-51 118.5q0 88 86 88q36 0 60 -24.5 t24 -61.5q0 -59 -50 -79q18 -9 48 -9z" />
+<glyph unicode="Ԣ" horiz-adv-x="2018" d="M649 1284l-55 2q-123 0 -142 -36q-8 -16 -8 -45v-474h590v474q0 29 -8 45q-17 34 -148 34h-46v62q70 -6 112 -6h356q43 0 113 6v-64q-8 0 -29 0.5t-32 0.5q-121 0 -137 -39q-6 -14 -6 -41v-418q56 8 112 8q284 0 463 -162t179 -442t-180.5 -450.5t-461.5 -170.5 q-118 0 -233 59t-195 153l43 32q176 -175 392.5 -175t332.5 167q100 145 100 378.5t-102 379.5q-117 169 -338 169q-54 0 -112 -12v-578q0 -26 6 -41q13 -32 90 -39q5 0 32 -0.5t76 0.5v-61q-71 6 -113 6h-361q-36 0 -107 -6v61q9 0 28 -0.5t29 -0.5q119 0 137 36q8 16 8 45 v530h-590v-530q0 -29 8 -45q18 -35 187 -35h10v-61q-71 6 -115 6h-358q-37 0 -108 -6v61q9 0 27.5 -0.5t28.5 -0.5q121 0 139 36q7 14 7 45v1064q0 31 -7 45q-17 34 -149 34h-46v62q70 -6 112 -6h354q45 0 115 6v-62z" />
+<glyph unicode="ԣ" horiz-adv-x="1594" d="M1541 400q0 -278 -189 -509.5t-462 -332.5l-14 48q220 81 360.5 288t140.5 443q0 131 -45 215q-58 107 -178 107q-94 0 -201 -99v-393q0 -53 10 -71q17 -30 157 -30v-66q-203 6 -238 6t-244 -6v66q140 0 157 30q10 18 10 71v281h-435v-281q0 -49 9 -68q16 -33 159 -33 v-66q-203 6 -238 6t-244 -6v66q140 0 157 30q10 18 10 71v589q0 53 -10 71q-17 30 -157 30v66q209 -6 244 -6t238 6v-66q-143 0 -159 -33q-9 -19 -9 -68v-242h435v242q0 53 -10 71q-17 30 -157 30v66q209 -6 244 -6t238 6v-66q-140 0 -157 -30q-10 -18 -10 -71v-119 q157 142 274 142q152 0 233 -110.5t81 -268.5z" />
+<glyph unicode="Ԥ" horiz-adv-x="1480" d="M1077 0h-245v61h78q60 0 85 11q39 17 39 69v1141h-590v-1141q0 -26 6 -41q13 -32 90 -39q6 0 33 -0.5t76 0.5v-61q-71 6 -113 6h-360q-37 0 -108 -6v61h78q60 0 85 11q39 17 39 69v1062q0 26 -6 41q-13 32 -90 38h-106v62h1345v-62q-8 0 -29 0.5t-32 0.5q-121 0 -137 -39 q-6 -14 -6 -41v-998q0 -69 14 -97q23 -47 173 -47h24q0 -12 -0.5 -39t-0.5 -40q0 -312 87 -376q-68 13 -125 92q-15 20 -73.5 125.5t-100 141t-130.5 35.5z" />
+<glyph unicode="ԥ" horiz-adv-x="1178" d="M1120 66l-2 -101q0 -212 94 -231q-68 0 -115 49q-14 16 -64 94t-82 100.5t-99 22.5h-214v66q140 0 157 30q10 18 10 71v585q0 54 -15 74q-23 31 -194 31t-198.5 -20t-27.5 -85v-585q0 -52 11 -71q17 -30 157 -30v-66q-203 6 -237.5 6t-244.5 -6v66q140 0 157 30 q10 18 10 71v589q0 53 -10 71q-17 30 -157 30v66h1065v-66q-140 0 -157 -30q-11 -20 -11 -71v-589q0 -53 10 -71q17 -30 157 -30z" />
+<glyph unicode="Ԧ" horiz-adv-x="1482" d="M649 1284l-55 2q-123 0 -142 -36q-8 -16 -8 -45v-453q154 122 339.5 122t311 -111t125.5 -298v-260q0 -69 14 -97q23 -47 173 -47h24q0 -12 -0.5 -39t-0.5 -40q0 -312 87 -376q-68 13 -125 92q-15 20 -73.5 125.5t-100 141t-130.5 35.5h-248v62q48 -1 60 -1q118 0 136 34 q9 17 9 51v319q0 149 -90.5 232t-240.5 83t-270 -101v-538q0 -29 8 -45q18 -35 187 -35h10v-61q-71 6 -115 6h-358q-37 0 -108 -6v61q9 0 27.5 -0.5t28.5 -0.5q121 0 139 36q7 14 7 45v1064q0 31 -7 45q-17 34 -149 34h-46v62q70 -6 112 -6h354q45 0 115 6v-62z" />
+<glyph unicode="ԧ" horiz-adv-x="1181" d="M1129 66l-2 -101q0 -212 94 -231q-68 0 -115 49q-14 16 -64 94t-82 100.5t-99 22.5h-214v66q30 -1 70.5 -1t63.5 12q33 19 33 76v519q0 227 -158 227q-130 0 -209.5 -104.5t-79.5 -238.5v-400q0 -39 10 -58q18 -33 117 -33q18 0 38 1v-66q-200 6 -236.5 6t-242.5 -6v66 q30 -1 72.5 -1t68 16.5t25.5 80.5v1115q0 87 -44 108q-21 10 -96 10h-26v67l306 23v-744h2q41 93 125 149t184 56q292 0 292 -314v-465q0 -53 10 -71q17 -30 157 -30z" />
+<glyph unicode="Ԩ" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="ԩ" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="Ԫ" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="ԫ" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="Ԭ" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="ԭ" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="Ԯ" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="ԯ" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="۰" horiz-adv-x="1218" d="M798 510q-53 -164 -85 -335q-129 73 -283 196q38 166 102 344q105 -92 266 -205z" />
+<glyph unicode="٠" horiz-adv-x="1218" d="M798 510q-53 -164 -85 -335q-129 73 -283 196q38 166 102 344q105 -92 266 -205z" />
+<glyph unicode="۱" horiz-adv-x="1218" d="M672 0l5 175q0 406 -206 735q-45 72 -129 174l108 244q164 -198 236 -397.5t72 -457.5q0 -135 -47 -473h-39z" />
+<glyph unicode="١" horiz-adv-x="1218" d="M672 0l5 175q0 406 -206 735q-45 72 -129 174l108 244q164 -198 236 -397.5t72 -457.5q0 -135 -47 -473h-39z" />
+<glyph unicode="۲" horiz-adv-x="1218" d="M711 201l-5 -201h-34q-82 346 -97 403q-64 232 -142 379t-226 332l75 229q180 -255 362 -255q118 0 166 72q35 52 51 181l36 2q9 -79 9 -199t-60.5 -198.5t-180.5 -78.5q-15 0 -78 9q42 -89 61 -144q63 -185 63 -531z" />
+<glyph unicode="٢" horiz-adv-x="1218" d="M711 201l-5 -201h-34q-82 346 -97 403q-64 232 -142 379t-226 332l75 229q180 -255 362 -255q118 0 166 72q35 52 51 181l36 2q9 -79 9 -199t-60.5 -198.5t-180.5 -78.5q-15 0 -78 9q42 -89 61 -144q63 -185 63 -531z" />
+<glyph unicode="۳" horiz-adv-x="1218" d="M1085 1343l6 -114q0 -291 -220 -291q-137 0 -182 83q-78 -128 -239 -128q72 -142 100 -252.5t28 -251t-39 -389.5h-46q0 352 -67.5 545.5t-279.5 505.5l83 268q122 -202 296.5 -202t213.5 226h36q16 -188 131 -188q119 0 142 188h37z" />
+<glyph unicode="٣" horiz-adv-x="1218" d="M1085 1343l6 -114q0 -291 -220 -291q-137 0 -182 83q-78 -128 -239 -128q72 -142 100 -252.5t28 -251t-39 -389.5h-46q0 352 -67.5 545.5t-279.5 505.5l83 268q122 -202 296.5 -202t213.5 226h36q16 -188 131 -188q119 0 142 188h37z" />
+<glyph unicode="٤" horiz-adv-x="1218" d="M361 188q0 97 104 222q41 49 181 181l-179 67q-128 57 -128 109q0 201 463 554l-35 -217q-267 -99 -267 -156q0 -45 165 -104t165 -95t-148 -186.5t-148 -208.5q0 -92 387 -125l-71 -229q-152 0 -287 33q-202 51 -202 155z" />
+<glyph unicode="٥" horiz-adv-x="1218" d="M1014 711q0 -219 -136 -344.5t-356 -125.5q-124 0 -203 40q-104 53 -104 165q0 169 111 398q127 265 276 265q134 0 273 -132.5t139 -265.5zM930 591q0 92 -170 195t-269 103q-74 0 -119.5 -91t-45.5 -175q0 -175 289 -175q101 0 189 27q126 39 126 116z" />
+<glyph unicode="٦" horiz-adv-x="1218" d="M198 1085l7 225l41 5q27 -63 52 -83q51 -42 165 -42t329 48q-41 -248 -41 -346q0 -316 109 -487q18 -28 89 -116l-43 -258q-73 48 -111 90q-137 151 -137 482q0 91 31 360q-165 -31 -217 -31q-179 0 -226.5 33t-47.5 120z" />
+<glyph unicode="۷" horiz-adv-x="1218" d="M1064 1315l-10 -325q-321 -328 -410 -990h-16q-65 313 -161 518q-119 253 -321 434l41 358q332 -388 471 -969h12q86 616 394 974z" />
+<glyph unicode="٧" horiz-adv-x="1218" d="M1064 1315l-10 -325q-321 -328 -410 -990h-16q-65 313 -161 518q-119 253 -321 434l41 358q332 -388 471 -969h12q86 616 394 974z" />
+<glyph unicode="۸" horiz-adv-x="1218" d="M1093 378l-41 -358q-177 183 -299 443t-175 533h-8q-67 -352 -128 -519q-88 -241 -268 -463v323q309 285 418 991h21q106 -493 286 -740q72 -98 194 -210z" />
+<glyph unicode="٨" horiz-adv-x="1218" d="M1093 378l-41 -358q-177 183 -299 443t-175 533h-8q-67 -352 -128 -519q-88 -241 -268 -463v323q309 285 418 991h21q106 -493 286 -740q72 -98 194 -210z" />
+<glyph unicode="۹" horiz-adv-x="1218" d="M708 706q-122 -43 -212.5 -43t-160.5 42q-87 51 -87 155q0 69 34 173q103 315 333 315q168 0 195 -335q2 -96 8 -288q12 -236 61 -365q18 -48 77 -119l-69 -241q-112 68 -149 232q-30 132 -30 474zM548 1133q-57 0 -126 -46t-69 -100t72 -81q51 -19 101.5 -19t172.5 17 q0 229 -151 229z" />
+<glyph unicode="٩" horiz-adv-x="1218" d="M708 706q-122 -43 -212.5 -43t-160.5 42q-87 51 -87 155q0 69 34 173q103 315 333 315q168 0 195 -335q2 -96 8 -288q12 -236 61 -365q18 -48 77 -119l-69 -241q-112 68 -149 232q-30 132 -30 474zM548 1133q-57 0 -126 -46t-69 -100t72 -81q51 -19 101.5 -19t172.5 17 q0 229 -151 229z" />
+<glyph unicode="٭" horiz-adv-x="1218" d="M986 1200q0 -73 -73.5 -73t-174.5 35q-20 8 -62 22q-3 -16 -14 -32l60 -28q171 -83 171 -153q0 -28 -22 -50t-50 -22q-70 0 -153 171q-8 21 -28 60q-16 -11 -32 -14l32 -92q25 -71 25 -144.5t-73 -73.5t-73 73.5t35 174.5q8 20 22 62q-16 3 -32 14l-28 -60 q-83 -171 -153 -171q-28 0 -50 22t-22 50q0 70 171 153q21 8 60 28q-11 16 -14 32l-92 -32q-71 -25 -144.5 -25t-73.5 73t73.5 73t174.5 -35q20 -8 62 -22q3 17 13 32q-20 9 -59 28q-171 83 -171 153q0 28 22 50t50 22q70 0 153 -171q8 -20 28 -59q15 10 32 13l-32 92 q-25 71 -25 144.5t73 73.5t73 -73.5t-35 -174.5q-8 -20 -22 -62q18 -3 33 -13l27 59q83 171 153 171q28 0 50 -22t22 -50q0 -70 -171 -153q-20 -8 -59 -27q10 -15 13 -33l92 32q71 25 144.5 25t73.5 -73zM637 1200q0 45 -45 45t-45 -45t45 -45t45 45z" />
+<glyph unicode="۴" horiz-adv-x="1218" d="M709 737q-113 0 -190 56q45 -103 58.5 -174t13.5 -208t-58 -402h-40q0 620 -314 1048l85 271q44 -83 143 -237q44 -56 122 -102q30 348 227 348q123 0 231 -132l-9 -14q-126 32 -151 32q-204 0 -266 -250q111 -35 192.5 -35t145 34t129.5 114l26 -9q-65 -340 -345 -340z " />
+<glyph unicode="۵" horiz-adv-x="1218" d="M1022 460q0 -134 -71 -252q-83 -137 -208 -137q-66 0 -117 42q-90 -76 -201.5 -76t-182 61t-70.5 168q0 155 147 379q82 124 258 329l-90 87l74 248q461 -459 461 -849zM953 385q0 164 -349 555q-96 -101 -184 -254.5t-88 -263.5q0 -156 145 -156q89 0 191 79 q59 -62 157 -62q50 0 89 27t39 75z" />
+<glyph unicode="۶" horiz-adv-x="1218" d="M389 9q0 404 172 686q-331 0 -331 141q0 110 158 302.5t268.5 192.5t272.5 -205l-11 -12q-137 47 -233 47t-181 -25q-122 -35 -122 -108q0 -129 230 -129q172 0 396 102l-51 -216q-110 -38 -217 -138q-260 -243 -304 -638h-47z" />
+<glyph unicode=" " horiz-adv-x="1024" />
+<glyph unicode=" " d="M0 1606zM2048 1606z" />
+<glyph unicode=" " horiz-adv-x="1024" />
+<glyph unicode=" " d="M0 1606zM2048 1606z" />
+<glyph unicode=" " horiz-adv-x="683" />
+<glyph unicode=" " horiz-adv-x="512" />
+<glyph unicode=" " horiz-adv-x="341" />
+<glyph unicode=" " horiz-adv-x="1043" />
+<glyph unicode=" " horiz-adv-x="256" />
+<glyph unicode=" " horiz-adv-x="410" />
+<glyph unicode=" " horiz-adv-x="128" />
+<glyph unicode="︀" horiz-adv-x="0" />
+<glyph unicode="​" horiz-adv-x="0" />
+<glyph unicode="‌" horiz-adv-x="0" />
+<glyph unicode="‍" horiz-adv-x="0" />
+<glyph unicode="‎" horiz-adv-x="0" />
+<glyph unicode="‏" horiz-adv-x="0" />
+<glyph unicode="‐" horiz-adv-x="512" d="M417 582q0 -41 -37 -41h-246q-39 0 -39 41t39 41h246q37 0 37 -41z" />
+<glyph unicode="‑" horiz-adv-x="512" />
+<glyph unicode="‒" horiz-adv-x="1043" d="M948 582q0 -41 -37 -41h-777q-39 0 -39 41t39 41h777q37 0 37 -41z" />
+<glyph unicode="–" horiz-adv-x="1024" d="M929 582q0 -41 -37 -41h-758q-39 0 -39 41t39 41h758q37 0 37 -41z" />
+<glyph unicode="—" d="M1953 582q0 -41 -37 -41h-1782q-39 0 -39 41t39 41h1782q37 0 37 -41z" />
+<glyph unicode="―" d="M1858 582q0 -41 -37 -41h-1782q-39 0 -39 41t39 41h1782q37 0 37 -41z" />
+<glyph unicode="‖" horiz-adv-x="790" d="M246 -311q0 -41 -41 -41t-41 41v1788q0 39 41 39t41 -39v-1788zM626 -311q0 -41 -41 -41t-41 41v1788q0 39 41 39t41 -39v-1788z" />
+<glyph unicode="‗" horiz-adv-x="1024" d="M1024 -359q0 -41 -37 -41h-948q-39 0 -39 41t39 41h948q37 0 37 -41zM1024 -139q0 -41 -37 -41h-948q-39 0 -39 41t39 41h948q37 0 37 -41z" />
+<glyph unicode="‘" horiz-adv-x="536" d="M341.5 935q28.5 -29 28.5 -73.5t-29 -73t-73 -28.5q-68 0 -103 71q-26 55 -26 132q0 205 141 345q29 28 41 28q18 0 18 -21q0 -9 -22 -32q-135 -135 -135 -332q0 -15 4 -24q1 2 5 6q32 31 77 31t73.5 -29z" />
+<glyph unicode="’" horiz-adv-x="536" d="M397 1136q0 -206 -141 -346q-29 -28 -41 -28q-18 0 -18 21q0 9 22 32q136 136 136 332q0 15 -4 24q-1 -2 -5 -6q-33 -31 -77.5 -31t-73.5 29t-29 73.5t29 73t73 28.5q69 0 103 -71q26 -55 26 -131z" />
+<glyph unicode="‚" horiz-adv-x="482" d="M231 204q123 0 123 -203.5t-137 -343.5q-28 -29 -39 -29q-19 0 -19 21q0 8 13 22q140 151 140 331q0 22 -5 29q-27 -31 -74 -31t-76 28.5t-29 73t29.5 73.5t73.5 29z" />
+<glyph unicode="‛" horiz-adv-x="536" d="M295 1134q-46 0 -83 37q-4 -9 -4 -24q0 -196 136 -332q23 -23 23 -32q0 -21 -19 -21q-11 0 -40 28q-142 140 -142 346q0 76 27 131q34 71 102 71q44 0 73 -28.5t29 -73t-28.5 -73.5t-73.5 -29z" />
+<glyph unicode="“" horiz-adv-x="964" d="M714 927q37 37 82 37t74 -29t29 -73.5t-29.5 -73t-73.5 -28.5q-68 0 -102 71q-26 55 -26 132q0 201 142 345q28 28 38 28q20 0 20 -21q0 -8 -23 -32q-135 -135 -135 -332q0 -15 4 -24zM496 935q29 -29 29 -73.5t-29 -73t-73 -28.5q-69 0 -103 71q-27 55 -27 132 q0 203 143 345q28 28 39 28q19 0 19 -21q0 -9 -23 -32q-136 -136 -136 -332q0 -15 4 -24q1 0 7 6q35 31 78 31t72 -29z" />
+<glyph unicode="”" horiz-adv-x="964" d="M671 1136q0 -204 -142 -346q-29 -28 -39 -28q-19 0 -19 21q0 9 23 32q135 136 135 332q0 15 -4 24q-1 0 -7 -6q-34 -31 -77.5 -31t-72.5 29t-29 73.5t29.5 73t73.5 28.5q68 0 103 -71q26 -55 26 -131zM251 1171q-37 -37 -84 -37q-44 0 -72.5 29t-28.5 73.5t28.5 73 t72.5 28.5q68 0 103 -71q27 -55 27 -131q0 -202 -143 -346q-28 -28 -38 -28q-20 0 -20 21q0 8 24 32q135 135 135 332q0 15 -4 24z" />
+<glyph unicode="„" horiz-adv-x="857" d="M231 204q123 0 123 -203.5t-137 -343.5q-28 -29 -39 -29q-19 0 -19 21q0 8 13 22q140 151 140 331q0 22 -5 29q-27 -31 -74 -31t-76 28.5t-29 73t29.5 73.5t73.5 29zM606 204q123 0 123 -203.5t-137 -343.5q-28 -29 -39 -29q-19 0 -19 21q0 8 13 22q139 151 139 331 q0 22 -5 29q-26 -31 -73 -31t-76.5 28.5t-29.5 73t29.5 73.5t74.5 29z" />
+<glyph unicode="‟" horiz-adv-x="964" d="M643 1163q-28 -29 -73.5 -29t-82.5 37q-4 -9 -4 -24q0 -197 134 -332q24 -24 24 -32q0 -21 -20 -21q-10 0 -38 28q-143 144 -143 346q0 76 27 131q35 71 103 71q44 0 72.5 -28.5t28.5 -73t-28 -73.5zM269 1309.5q29 -28.5 29 -73t-29 -73.5t-72 -29t-78 31q-2 2 -7 6 q-4 -9 -4 -24q0 -196 136 -332q22 -23 22 -32q0 -21 -18 -21q-11 0 -40 28q-142 142 -142 346q0 76 27 131q34 71 103 71q44 0 73 -28.5z" />
+<glyph unicode="†" horiz-adv-x="857" d="M678 962q70 0 70 -65t-70 -65q-43 0 -120.5 21.5t-109.5 25.5q4 -47 25.5 -180.5t21.5 -206.5q0 -501 -39 -783q-5 -38 -27.5 -38t-27.5 38q-38 282 -38 783q0 73 21 206.5t25 180.5q-32 -4 -109 -25.5t-121 -21.5q-71 0 -71 65t71 65q43 0 120 -21.5t110 -25.5 q-2 67 -24 211t-22 222t66 78t66 -78t-22 -222t-25 -211q33 4 110 25.5t120 21.5z" />
+<glyph unicode="‡" horiz-adv-x="857" d="M748 986q0 -63 -71 -63q-43 0 -119.5 21.5t-110.5 24.5q3 -54 25 -169t22 -183.5t-65 -68.5t-65 68.5t22 183.5t24 169q-33 -3 -110 -24.5t-120 -21.5q-72 0 -72 63q0 66 72 66q44 0 121 -21.5t109 -24.5q-2 55 -24 169.5t-22 175.5q0 75 65 75t65 -75 q0 -61 -22.5 -175.5t-24.5 -169.5q33 3 110 24.5t120 21.5q71 0 71 -66zM748 108q0 -63 -71 -63q-43 0 -119.5 21.5t-110.5 24.5q3 -54 25 -169t22 -183t-65 -68t-65 68t22 183t24 169q-33 -3 -110 -24.5t-120 -21.5q-72 0 -72 63q0 66 72 66q44 0 121 -21.5t109 -24.5 q-2 55 -24 169.5t-22 175.5q0 75 65 75t65 -75q0 -61 -22.5 -175.5t-24.5 -169.5q33 3 110 24.5t120 21.5q71 0 71 -66z" />
+<glyph unicode="•" horiz-adv-x="738" d="M698 582q0 -137 -96 -233t-233 -96t-233 96t-96 233t96 233t233 96t233 -96t96 -233z" />
+<glyph unicode="‣" horiz-adv-x="512" d="M464 582l-399 -248v496z" />
+<glyph unicode="․" horiz-adv-x="682" d="M420.5 -25.5q33.5 -33.5 33.5 -80t-33 -79.5t-80 -33t-80 33t-33 80t33 80t79.5 33t80 -33.5z" />
+<glyph unicode="‥" horiz-adv-x="1365" d="M420.5 -25.5q33.5 -33.5 33.5 -80t-33 -79.5t-80 -33t-80 33t-33 80t33 80t79.5 33t80 -33.5zM1103 -26.5q34 -33.5 34 -79t-34 -79t-79.5 -33.5t-79 33.5t-33.5 80t33 79t79 32.5t80 -33.5z" />
+<glyph unicode="…" d="M1103 -26.5q34 -33.5 34 -79t-34 -79t-79.5 -33.5t-79 33.5t-33.5 80t33 79t79 32.5t80 -33.5zM420.5 -25.5q33.5 -33.5 33.5 -80t-33 -79.5t-80 -33t-80 33t-33 80t33 80t79.5 33t80 -33.5zM1786 -26.5q34 -33.5 34 -79t-34 -79t-79.5 -33.5t-79 33.5t-33.5 80t33 79 t79 32.5t80 -33.5z" />
+<glyph unicode="‧" horiz-adv-x="512" d="M367 494h-222v222h222v-222z" />
+<glyph unicode="
" horiz-adv-x="0" />
+<glyph unicode="
" horiz-adv-x="0" />
+<glyph unicode="‪" horiz-adv-x="0" />
+<glyph unicode="‫" horiz-adv-x="0" />
+<glyph unicode="‬" horiz-adv-x="0" />
+<glyph unicode="‭" horiz-adv-x="0" />
+<glyph unicode="‮" horiz-adv-x="0" />
+<glyph unicode=" " horiz-adv-x="256" />
+<glyph unicode="‰" horiz-adv-x="2342" d="M1331 878q281 0 281 -456t-281 -456t-281 456t281 456zM1358 1470q0 -12 -17 -37l-1037 -1536q-21 -31 -41 -31q-41 0 -41 41q0 13 19 41l920 1364q-106 -70 -270 -70t-301 99q22 -86 22 -222q0 -453 -281 -453t-281 456t281 456q149 0 223 -142q165 -149 331 -149 q235 0 389 195q23 29 43 29q41 0 41 -41zM1493 351v141q0 150 -19 217q-35 130 -143.5 130t-143.5 -128q-18 -67 -18 -216v-145q0 -345 162 -345t162 346zM493 1051q0 205 1 205v-2q-5 132 -34 197l-84 81q-22 7 -46 7q-108 0 -143 -128q-18 -67 -18 -216v-145 q0 -345 162 -345t162 346zM2011 878q281 0 281 -456t-281 -456t-281 456t281 456zM2173 351v141q0 150 -19 217q-35 130 -143.5 130t-143.5 -128q-18 -67 -18 -216v-145q0 -345 162 -345t162 346z" />
+<glyph unicode="‱" horiz-adv-x="3022" d="M2011 878q281 0 281 -456t-281 -456t-281 456t281 456zM2173 351v141q0 150 -19 217q-35 130 -143.5 130t-143.5 -128q-18 -67 -18 -216v-145q0 -345 162 -345t162 346zM1331 878q281 0 281 -456t-281 -456t-281 456t281 456zM1358 1470q0 -12 -17 -37l-1037 -1536 q-21 -31 -41 -31q-41 0 -41 41q0 13 19 41l920 1364q-106 -70 -270 -70t-301 99q22 -86 22 -222q0 -453 -281 -453t-281 456t281 456q149 0 223 -142q165 -149 331 -149q235 0 389 195q23 29 43 29q41 0 41 -41zM1493 351v141q0 150 -19 217q-35 130 -143.5 130t-143.5 -128 q-18 -67 -18 -216v-145q0 -345 162 -345t162 346zM493 1051q0 205 1 205v-2q-5 132 -34 197l-84 81q-22 7 -46 7q-108 0 -143 -128q-18 -67 -18 -216v-145q0 -345 162 -345t162 346zM2691 878q281 0 281 -456t-281 -456t-281 456t281 456zM2853 351v141q0 150 -19 217 q-35 130 -143.5 130t-143.5 -128q-18 -67 -18 -216v-145q0 -345 162 -345t162 346z" />
+<glyph unicode="′" horiz-adv-x="506" d="M481 1458q0 -16 -9 -32l-385 -667q-14 -25 -36 -25t-22 17q0 8 6 26l239 707q18 54 94 54q40 0 76.5 -21.5t36.5 -58.5z" />
+<glyph unicode="″" horiz-adv-x="870" d="M481 1458q0 -16 -9 -32l-385 -667q-14 -25 -36 -25t-22 17q0 8 6 26l239 707q18 54 94 54q40 0 76.5 -21.5t36.5 -58.5zM841 1458q0 -16 -9 -32l-385 -667q-14 -25 -36 -25t-22 17q0 8 6 26l239 707q18 54 94 54q40 0 76.5 -21.5t36.5 -58.5z" />
+<glyph unicode="‴" horiz-adv-x="1230" d="M481 1458q0 -16 -9 -32l-385 -667q-14 -25 -36 -25t-22 17q0 8 6 26l239 707q18 54 94 54q40 0 76.5 -21.5t36.5 -58.5zM841 1458q0 -16 -9 -32l-385 -667q-14 -25 -36 -25t-22 17q0 8 6 26l239 707q18 54 94 54q40 0 76.5 -21.5t36.5 -58.5zM1201 1458q0 -16 -9 -32 l-385 -667q-14 -25 -36 -25t-22 17q0 8 6 26l239 707q18 54 94 54q40 0 76.5 -21.5t36.5 -58.5z" />
+<glyph unicode="‵" horiz-adv-x="506" d="M481 751q0 -17 -22 -17t-36 25l-385 667q-9 16 -9 32q0 37 36.5 58.5t76.5 21.5q76 0 94 -54l239 -707q6 -18 6 -26z" />
+<glyph unicode="‶" horiz-adv-x="870" d="M481 751q0 -17 -22 -17t-36 25l-385 667q-9 16 -9 32q0 37 36.5 58.5t76.5 21.5q76 0 94 -54l239 -707q6 -18 6 -26zM841 751q0 -17 -22 -17t-36 25l-385 667q-9 16 -9 32q0 37 36.5 58.5t76.5 21.5q76 0 94 -54l239 -707q6 -18 6 -26z" />
+<glyph unicode="‷" horiz-adv-x="1230" d="M481 751q0 -17 -22 -17t-36 25l-385 667q-9 16 -9 32q0 37 36.5 58.5t76.5 21.5q76 0 94 -54l239 -707q6 -18 6 -26zM841 751q0 -17 -22 -17t-36 25l-385 667q-9 16 -9 32q0 37 36.5 58.5t76.5 21.5q76 0 94 -54l239 -707q6 -18 6 -26zM1201 751q0 -17 -22 -17t-36 25 l-385 667q-9 16 -9 32q0 37 36.5 58.5t76.5 21.5q76 0 94 -54l239 -707q6 -18 6 -26z" />
+<glyph unicode="‸" horiz-adv-x="722" d="M697 -395h-138l-199 395l-197 -395h-138l336 673z" />
+<glyph unicode="‹" horiz-adv-x="717" d="M528 5q0 -27 -48 -27q-20 0 -36 37l-30 68q-79 165 -266 268q-29 14 -86 45q-15 10 -15 25t15 25l87 46q186 100 265 266l26 65q20 41 54 41t34 -27q0 -3 -3 -10q-123 -284 -344 -406q223 -124 344 -406q3 -7 3 -10z" />
+<glyph unicode="›" horiz-adv-x="717" d="M670 421q0 -15 -15 -25l-87 -45q-188 -104 -266 -268l-26 -64q-20 -41 -46 -41q-41 0 -41 27q0 5 2 10q116 279 345 406q-227 125 -345 406q-2 4 -2 10q0 27 34 27t50 -36.5t29 -69.5q78 -165 265 -266q31 -14 88 -46q15 -10 15 -25z" />
+<glyph unicode="※" horiz-adv-x="1591" d="M1321 100q0 -44 -43 -44q-15 0 -25 10l-458 458l-456 -456q-11 -11 -27 -11q-42 0 -42 42q0 16 11 27l457 456l-457 456q-11 11 -11 27q0 42 42 42q16 0 27 -11l456 -456l458 458q10 10 25 10q43 0 43 -44q0 -14 -10 -24l-458 -458l458 -458q10 -10 10 -24zM875 1109.5 q34 -33.5 34 -80t-33.5 -79.5t-80.5 -33t-80.5 33t-33.5 79.5t34 80t80 33.5t80 -33.5zM1356 582q0 -46 -33.5 -80t-80 -34t-79.5 33.5t-33 80.5t33 80.5t79.5 33.5t80 -34t33.5 -80zM460 582q0 -47 -33 -80.5t-79.5 -33.5t-80 34t-33.5 80t33.5 80t80 34t79.5 -33.5 t33 -80.5zM875.5 214q33.5 -33 33.5 -79.5t-34 -80t-80 -33.5t-80 33.5t-34 80t33.5 79.5t80.5 33t80.5 -33z" />
+<glyph unicode="‼" horiz-adv-x="1142" d="M418 185q32 -32 32 -76.5t-32 -76.5t-77 -32t-77 32t-32 76.5t32 76.5t77 32t77 -32zM341 383q-25 0 -29 47l-79 932v10q0 40 30 66q34 28 78 28t78 -28q30 -26 30 -66v-10l-79 -934q-4 -45 -29 -45zM878 185q32 -32 32 -76.5t-32 -76.5t-77 -32t-77 32t-32 76.5t32 76.5 t77 32t77 -32zM801 383q-25 0 -29 47l-79 932v10q0 40 30 66q34 28 78 28t78 -28q30 -26 30 -66v-10l-79 -934q-4 -45 -29 -45z" />
+<glyph unicode="‽" horiz-adv-x="909" d="M822 1167q0 -124 -98 -200q-239 -185 -252 -347l-16 -192q-4 -45 -29 -45t-29 47l-67 792q-1 7 -1 15q0 40 28.5 64.5t68.5 24.5t68.5 -24.5t28.5 -64.5q0 -9 -1 -15l-30 -361q37 66 90 124q69 75 69 193.5t-51 169.5t-172 51q-187 0 -268 -139h2q112 0 112 -93 q0 -94 -94 -94t-94 98q0 126 115 204q101 69 245.5 69t247.5 -59q127 -73 127 -218zM536 109q0 -44 -32.5 -76.5t-76.5 -32.5t-76.5 32.5t-32.5 76.5t32.5 76t76.5 32t76.5 -32t32.5 -76z" />
+<glyph unicode="‾" horiz-adv-x="1478" d="M1478 1550h-1478v56h1478v-56z" />
+<glyph unicode="‿" horiz-adv-x="896" d="M985 -224q-192 -218 -446.5 -218t-359.5 218h42q97 -134 333.5 -134t389.5 134h41z" />
+<glyph unicode="⁀" horiz-adv-x="896" d="M943 1125q-96 135 -333 135t-389 -135h-42q192 218 446.5 218t359.5 -218h-42z" />
+<glyph unicode="⁁" horiz-adv-x="952" d="M903 1086l-473 -946l267 -535h-138l-199 395l-197 -395h-138l740 1481h138z" />
+<glyph unicode="⁂" horiz-adv-x="1876" d="M1305 931l-45 -85l-297 197l25 -352h-99l25 352l-293 -197l-49 85l317 155l-317 154l49 86l293 -198l-25 352h98l-24 -352l293 198l49 -86l-317 -154zM1704 240l-50 -85l-292 197l24 -352h-98l24 352l-292 -197l-49 85l317 155l-317 154l49 86l292 -197l-24 352h98 l-24 -353l292 198l50 -85l-318 -155zM906 240l-49 -85l-293 197l25 -352h-99l25 352l-293 -197l-49 85l317 155l-317 154l49 86l293 -197l-25 352h99l-25 -353l293 198l49 -85l-317 -155z" />
+<glyph unicode="⁃" horiz-adv-x="666" d="M555 494h-444v222h444v-222z" />
+<glyph unicode="⁄" horiz-adv-x="0" d="M576 1416q0 -13 -6 -22l-1071 -1649q-11 -17 -35 -17q-40 0 -40 40q0 13 6 22l1071 1649q11 17 35 17q40 0 40 -40z" />
+<glyph unicode="⁅" horiz-adv-x="682" d="M571 -309q0 -41 -68 -41h-391v1864h391q68 0 68 -40.5t-68 -40.5h-309v-810h340q37 0 37 -41t-37 -41h-340v-809h309q68 0 68 -41z" />
+<glyph unicode="⁆" horiz-adv-x="682" d="M570 -350h-391q-68 0 -68 41t68 41h309v809h-340q-37 0 -37 41t37 41h340v810h-309q-68 0 -68 40.5t68 40.5h391v-1864z" />
+<glyph unicode="⁇" horiz-adv-x="1709" d="M1304 185q32 -32 32 -76.5t-32 -76.5t-77 -32t-77 32t-32 76.5t32 76.5t77 32t77 -32zM1543 1350q79 -73 79 -191.5t-98 -191.5q-270 -200 -270 -457v-72q0 -55 -26 -55t-26 49v92q0 267 181 461q69 74 69 182t-28 152q-49 80 -195 80q-187 0 -268 -139q114 0 114 -93.5 t-94 -93.5t-94 102.5t95.5 185.5t252.5 83q207 0 308 -94zM504 185q32 -32 32 -76.5t-32 -76.5t-77 -32t-77 32t-32 76.5t32 76.5t77 32t77 -32zM743 1350q79 -73 79 -191.5t-98 -191.5q-270 -200 -270 -457v-72q0 -55 -26 -55t-26 49v92q0 267 181 461q69 74 69 182 t-28 152q-49 80 -195 80q-187 0 -268 -139q114 0 114 -93.5t-94 -93.5t-94 102.5t95.5 185.5t252.5 83q207 0 308 -94z" />
+<glyph unicode="⁈" horiz-adv-x="1552" d="M504 185q32 -32 32 -76.5t-32 -76.5t-77 -32t-77 32t-32 76.5t32 76.5t77 32t77 -32zM743 1350q79 -73 79 -191.5t-98 -191.5q-270 -200 -270 -457v-72q0 -55 -26 -55t-26 49v92q0 267 181 461q69 74 69 182t-28 152q-49 80 -195 80q-187 0 -268 -139q114 0 114 -93.5 t-94 -93.5t-94 102.5t95.5 185.5t252.5 83q207 0 308 -94zM1288 185q32 -32 32 -76.5t-32 -76.5t-77 -32t-77 32t-32 76.5t32 76.5t77 32t77 -32zM1211 383q-25 0 -29 47l-79 932v10q0 40 30 66q34 28 78 28t78 -28q30 -26 30 -66v-10l-79 -934q-4 -45 -29 -45z" />
+<glyph unicode="⁉" horiz-adv-x="1607" d="M1202 185q32 -32 32 -76.5t-32 -76.5t-77 -32t-77 32t-32 76.5t32 76.5t77 32t77 -32zM1441 1350q79 -73 79 -191.5t-98 -191.5q-270 -200 -270 -457v-72q0 -55 -26 -55t-26 49v92q0 267 181 461q69 74 69 182t-28 152q-49 80 -195 80q-187 0 -268 -139q114 0 114 -93.5 t-94 -93.5t-94 102.5t95.5 185.5t252.5 83q207 0 308 -94zM418 185q32 -32 32 -76.5t-32 -76.5t-77 -32t-77 32t-32 76.5t32 76.5t77 32t77 -32zM341 383q-25 0 -29 47l-79 932v10q0 40 30 66q34 28 78 28t78 -28q30 -26 30 -66v-10l-79 -934q-4 -45 -29 -45z" />
+<glyph unicode="⁊" horiz-adv-x="1024" d="M354 515q-119 0 -288 64q22 38 69.5 73t87.5 35q10 0 22 -4q184 -62 259 -62q157 0 273 192l181 104l-434 -1024q-9 -22 -47 -46t-65 -28l311 846q-189 -150 -369 -150z" />
+<glyph unicode="⁋" horiz-adv-x="964" d="M927 933q0 -358 -447 -358h-5v-982h-69v1642h-177v-1642h-68v1642h-125v51h467q184 0 297 -83q127 -93 127 -270z" />
+<glyph unicode="⁌" horiz-adv-x="1455" d="M1233 0h-419q-248 0 -420 172t-172 420t172 420t420 172h419v-1184zM1164 99v987h-350v-987h350z" />
+<glyph unicode="⁍" horiz-adv-x="1455" d="M1233 592q0 -248 -172 -420t-420 -172h-419v1184h419q248 0 420 -172t172 -420zM641 99v987h-350v-987h350z" />
+<glyph unicode="⁎" horiz-adv-x="987" d="M877 248l-303 -66q2 6 3 15q0 41 -29 67l284 125zM494 283q-25 0 -43 -11l-31 308h148l-31 -308q-18 11 -43 11zM777 -62l-120 -87l-157 267q51 6 70 51zM440 264q-29 -25 -29 -62q0 -10 2 -20l-303 66l46 141zM487 118l-156 -267l-120 87l206 231q20 -45 70 -51z" />
+<glyph unicode="⁏" horiz-adv-x="569" d="M367 851q32 -32 32 -76.5t-32 -76.5t-77 -32t-76.5 31.5t-31.5 76.5t32 77t76.5 32t76.5 -32zM370 184.5q29 -32.5 29 -76t-28.5 -76t-76 -32.5t-73.5 23q0 -218 131 -369q14 -16 14 -27q0 -22 -20 -22q-31 0 -100.5 124t-69.5 277q0 211 114 211q51 0 80 -32.5z" />
+<glyph unicode="⁐" horiz-adv-x="1476" d="M739 1028q-316 0 -481 -179h-57q201 290 538 290t536 -290h-55q-165 179 -481 179zM1275 425q-200 -291 -536.5 -291t-537.5 291h57q165 -178 480.5 -178t481.5 178h55z" />
+<glyph unicode="⁑" horiz-adv-x="987" d="M877 248l-303 -66q2 6 3 15q0 41 -29 67l284 125zM494 283q-25 0 -43 -11l-31 308h148l-31 -308q-18 11 -43 11zM777 -62l-120 -87l-157 267q51 6 70 51zM440 264q-29 -25 -29 -62q0 -10 2 -20l-303 66l46 141zM487 118l-156 -267l-120 87l206 231q20 -45 70 -51z M877 1148l-303 -66q2 6 3 15q0 41 -29 67l284 125zM494 1183q-25 0 -43 -11l-31 308h148l-31 -308q-18 11 -43 11zM777 838l-120 -87l-157 267q51 6 70 51zM440 1164q-29 -25 -29 -62q0 -10 2 -20l-303 66l46 141zM487 1018l-156 -267l-120 87l206 231q20 -45 70 -51z" />
+<glyph unicode="⁒" horiz-adv-x="1520" d="M1336 1416q0 -13 -6 -22l-1071 -1649q-11 -17 -35 -17q-40 0 -40 40q0 13 6 22l1071 1649q11 17 35 17q40 0 40 -40zM468 1295q32 -32 32 -76.5t-32 -76.5t-77 -32t-77 32t-32 76.5t32 76.5t77 32t77 -32zM1206 42q32 -32 32 -76.5t-32 -76.5t-77 -32t-77 32t-32 76.5 t32 76.5t77 32t77 -32z" />
+<glyph unicode="⁓" horiz-adv-x="1058" d="M1021 659q0 -111 -71.5 -195t-175.5 -84t-251.5 116.5t-233.5 116.5q-136 0 -179 -131q-6 -29 -15.5 -65t-27.5 -36q-30 0 -30 57q0 109 72.5 193.5t176 84.5t251 -117t233.5 -117q155 0 192 184q9 49 31 49q28 0 28 -56z" />
+<glyph unicode="⁔" horiz-adv-x="896" d="M943 -442q-96 135 -333 135t-389 -135h-42q192 218 446.5 218t359.5 -218h-42z" />
+<glyph unicode="⁕" horiz-adv-x="660" d="M607 468q0 -27 -18.5 -48t-37.5 -21t-51.5 27t-53.5 27q-32 0 -32 -34q0 -28 65 -37t65 -61q0 -26 -20 -44.5t-46 -18.5q-45 0 -53.5 67.5t-44.5 67.5q-41 0 -41 -39q0 -14 27 -48t27 -57q0 -51 -64.5 -51t-64.5 51q0 18 28 50t28 55q0 39 -39 39q-34 0 -43 -67.5 t-62 -67.5q-23 0 -43 21.5t-20 44.5q0 52 66 58.5t66 38.5t-32 32q-22 0 -53.5 -25.5t-46.5 -25.5q-60 0 -60 63t57 63q21 0 55.5 -25t48.5 -25q34 0 34 29q0 36 -69 44t-69 55q0 24 21 45t45 21q49 0 60 -65t43 -65q38 0 38 37q0 19 -26.5 51t-26.5 51.5t21.5 36.5t46.5 17 t44.5 -18t19.5 -40.5t-27 -53t-27 -47.5q0 -39 43 -39q29 0 37.5 66t61.5 66q60 0 60 -60q0 -54 -65 -59.5t-65 -36.5q0 -37 31 -37q19 0 51 27.5t55 27.5q56 0 56 -63zM283 465q0 -45 47 -45t47 46.5t-44 46.5q-50 0 -50 -48z" />
+<glyph unicode="⁖" horiz-adv-x="1052" d="M961 1079.5q34 -33.5 34 -79t-34 -79t-79.5 -33.5t-79 33.5t-33.5 80t33 79t79 32.5t80 -33.5zM961 191.5q34 -33.5 34 -79t-34 -79t-79.5 -33.5t-79 33.5t-33.5 80t33 79t79 32.5t80 -33.5zM249 635.5q34 -33.5 34 -79t-34 -79t-79.5 -33.5t-79 33.5t-33.5 80t33 79 t79 32.5t80 -33.5z" />
+<glyph unicode="⁗" horiz-adv-x="1590" d="M1201 1458q0 -16 -9 -32l-385 -667q-14 -25 -36 -25t-22 17q0 8 6 26l239 707q18 54 94 54q40 0 76.5 -21.5t36.5 -58.5zM1561 1458q0 -16 -9 -32l-385 -667q-14 -25 -36 -25t-22 17q0 8 6 26l239 707q18 54 94 54q40 0 76.5 -21.5t36.5 -58.5zM481 1458q0 -16 -9 -32 l-385 -667q-14 -25 -36 -25t-22 17q0 8 6 26l239 707q18 54 94 54q40 0 76.5 -21.5t36.5 -58.5zM841 1458q0 -16 -9 -32l-385 -667q-14 -25 -36 -25t-22 17q0 8 6 26l239 707q18 54 94 54q40 0 76.5 -21.5t36.5 -58.5z" />
+<glyph unicode="⁘" horiz-adv-x="1364" d="M1273 635.5q34 -33.5 34 -79t-34 -79t-79.5 -33.5t-79 33.5t-33.5 80t33 79t79 32.5t80 -33.5zM761 1079.5q34 -33.5 34 -79t-34 -79t-79.5 -33.5t-79 33.5t-33.5 80t33 79t79 32.5t80 -33.5zM761 191.5q34 -33.5 34 -79t-34 -79t-79.5 -33.5t-79 33.5t-33.5 80t33 79 t79 32.5t80 -33.5zM249 635.5q34 -33.5 34 -79t-34 -79t-79.5 -33.5t-79 33.5t-33.5 80t33 79t79 32.5t80 -33.5z" />
+<glyph unicode="⁙" horiz-adv-x="1364" d="M1273 1079.5q34 -33.5 34 -79t-34 -79t-79.5 -33.5t-79 33.5t-33.5 80t33 79t79 32.5t80 -33.5zM1273 191.5q34 -33.5 34 -79t-34 -79t-79.5 -33.5t-79 33.5t-33.5 80t33 79t79 32.5t80 -33.5zM761 635.5q34 -33.5 34 -79t-34 -79t-79.5 -33.5t-79 33.5t-33.5 80t33 79 t79 32.5t80 -33.5zM249 1079.5q34 -33.5 34 -79t-34 -79t-79.5 -33.5t-79 33.5t-33.5 80t33 79t79 32.5t80 -33.5zM249 191.5q34 -33.5 34 -79t-34 -79t-79.5 -33.5t-79 33.5t-33.5 80t33 79t79 32.5t80 -33.5z" />
+<glyph unicode="⁚" horiz-adv-x="340" d="M249 1356.5q34 -33.5 34 -79t-34 -79t-79.5 -33.5t-79 33.5t-33.5 80t33 79t79 32.5t80 -33.5zM249 148.5q34 -33.5 34 -79t-34 -79t-79.5 -33.5t-79 33.5t-33.5 80t33 79t79 32.5t80 -33.5z" />
+<glyph unicode="⁛" horiz-adv-x="1564" d="M861 1572.5q34 -33.5 34 -79t-34 -79t-79.5 -33.5t-79 33.5t-33.5 80t33 79t79 32.5t80 -33.5zM1473 660.5q34 -33.5 34 -79t-34 -79t-79.5 -33.5t-79 33.5t-33.5 80t33 79t79 32.5t80 -33.5zM249 660.5q34 -33.5 34 -79t-34 -79t-79.5 -33.5t-79 33.5t-33.5 80t33 79 t79 32.5t80 -33.5zM861 -250.5q34 -33.5 34 -79t-34 -79t-79.5 -33.5t-79 33.5t-33.5 80t33 79t79 32.5t80 -33.5z" />
+<glyph unicode="⁜" horiz-adv-x="1364" d="M1118 992.5q34 -33.5 34 -79t-34 -79t-79.5 -33.5t-79 33.5t-33.5 80t33 79t79 32.5t80 -33.5zM1118 279.5q34 -33.5 34 -79t-34 -79t-79.5 -33.5t-79 33.5t-33.5 80t33 79t79 32.5t80 -33.5zM1307 557q0 -41 -37 -41h-547v-545q0 -39 -41 -39t-41 39v545h-545 q-39 0 -39 41t39 41h545v547q0 37 41 37t41 -37v-547h547q37 0 37 -41zM404 992.5q34 -33.5 34 -79t-34 -79t-79.5 -33.5t-79 33.5t-33.5 80t33 79t79 32.5t80 -33.5zM404 279.5q34 -33.5 34 -79t-34 -79t-79.5 -33.5t-79 33.5t-33.5 80t33 79t79 32.5t80 -33.5z" />
+<glyph unicode="⁝" horiz-adv-x="340" d="M249 1356.5q34 -33.5 34 -79t-34 -79t-79.5 -33.5t-79 33.5t-33.5 80t33 79t79 32.5t80 -33.5zM249 148.5q34 -33.5 34 -79t-34 -79t-79.5 -33.5t-79 33.5t-33.5 80t33 79t79 32.5t80 -33.5zM249 752.5q34 -33.5 34 -79t-34 -79t-79.5 -33.5t-79 33.5t-33.5 80t33 79 t79 32.5t80 -33.5z" />
+<glyph unicode="⁞" horiz-adv-x="340" d="M249 1572.5q34 -33.5 34 -79t-34 -79t-79.5 -33.5t-79 33.5t-33.5 80t33 79t79 32.5t80 -33.5zM249 964.5q34 -33.5 34 -79t-34 -79t-79.5 -33.5t-79 33.5t-33.5 80t33 79t79 32.5t80 -33.5zM249 357.5q34 -33.5 34 -79t-34 -79t-79.5 -33.5t-79 33.5t-33.5 80t33 79 t79 32.5t80 -33.5zM249 -250.5q34 -33.5 34 -79t-34 -79t-79.5 -33.5t-79 33.5t-33.5 80t33 79t79 32.5t80 -33.5z" />
+<glyph unicode=" " horiz-adv-x="455" />
+<glyph unicode="⁠" horiz-adv-x="0" />
+<glyph unicode="⁡" horiz-adv-x="0" />
+<glyph unicode="⁢" horiz-adv-x="0" />
+<glyph unicode="⁣" horiz-adv-x="0" />
+<glyph unicode="⁤" horiz-adv-x="0" />
+<glyph unicode="⁥" horiz-adv-x="0" />
+<glyph unicode="⁦" horiz-adv-x="0" />
+<glyph unicode="⁧" horiz-adv-x="0" />
+<glyph unicode="⁨" horiz-adv-x="0" />
+<glyph unicode="⁩" horiz-adv-x="0" />
+<glyph unicode="" horiz-adv-x="0" />
+<glyph unicode="" horiz-adv-x="0" />
+<glyph unicode="" horiz-adv-x="0" />
+<glyph unicode="" horiz-adv-x="0" />
+<glyph unicode="" horiz-adv-x="0" />
+<glyph unicode="" horiz-adv-x="0" />
+<glyph unicode="⁰" horiz-adv-x="801" d="M676 1362q63 -111 63 -325.5t-59 -321.5q-91 -166 -273.5 -166t-273.5 144q-71 112 -71 331t58 328q91 170 278 170t278 -160zM590 964v173q0 335 -190 335t-190 -336q0 -27 0.5 -80.5t0.5 -80.5q0 -158 25 -238q42 -138 164 -138q190 0 190 365z" />
+<glyph unicode="ⁱ" horiz-adv-x="441" d="M297 1437q0 -39 -28 -67t-67 -28t-67.5 28t-28.5 67t28.5 67t67.5 28t67 -28t28 -67zM242 583h-40q-17 0 -162 -4v64l43 -1q44 0 57 5q24 10 24 46v387q0 54 -35 65q-9 2 -83 2v65l243 17v-544q0 -35 43 -42q5 0 22.5 -0.5t47.5 0.5v-64q-152 4 -160 4z" />
+<glyph unicode="⁲" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="⁳" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="⁴" horiz-adv-x="801" d="M757 808h-156v-120q0 -18 5 -27q10 -19 134 -19h13v-64q-78 5 -105 5h-236q-25 0 -103 -5v64q53 -1 79.5 -1t40.5 4q32 9 32 43v120h-416v56l481 653q15 21 40 21q35 0 35 -47v-620h156v-63zM470 871v476l-352 -476h352z" />
+<glyph unicode="⁵" horiz-adv-x="801" d="M633.5 1089q88.5 -92 88.5 -225t-105.5 -224t-232 -91t-216 75.5t-89.5 187.5q0 84 86 84q36 0 62.5 -21.5t26.5 -58t-30 -58.5q-27 -18 -60 -18h-9q26 -60 86.5 -96.5t127.5 -36.5q103 0 159 86q35 54 35 178t-26 176q-42 84 -126.5 84t-152.5 -55l-67 -56q-32 0 -32 38 v430q0 33 25 33q9 0 22 -4q128 -40 197.5 -40t223.5 43q7 2 9 2q25 0 25 -26q0 -14 -30 -44q-109 -110 -281 -110q-60 0 -122 15v-235q80 59 198.5 59t207 -92z" />
+<glyph unicode="⁶" horiz-adv-x="801" d="M641 1099q94 -92 94 -228t-97 -229t-235 -93q-180 0 -267 158q-69 125 -69 321q0 143 63 264.5t182 184.5q85 45 172.5 45t150 -39.5t62.5 -118t-82 -78.5t-82 74q0 65 73 71q-42 37 -107.5 37t-118.5 -30q-146 -82 -152 -354q67 107 193 107t220 -92zM575 836v69 q0 234 -163 234q-89 0 -135.5 -71.5t-46.5 -165.5q0 -136 27 -196q45 -99 146 -99q172 0 172 229z" />
+<glyph unicode="⁷" horiz-adv-x="801" d="M746 1472q0 -26 -16 -46l-212 -262q-74 -91 -97 -253q-14 -92 -14 -276q0 -86 -82 -86t-82 86q0 256 194 527q1 2 161 203h-373q-65 0 -77.5 -7t-34.5 -128h-60l56 306h56q2 -17 9 -24q21 -20 182 -20h390v-20z" />
+<glyph unicode="⁸" horiz-adv-x="801" d="M735 821q0 -123 -104 -197.5t-229.5 -74.5t-230 66t-104.5 183q0 157 213 257q-171 93 -171 226q0 108 90.5 174.5t200.5 66.5t195 -53q99 -61 99 -163q0 -129 -178 -216q219 -115 219 -269zM605 1306q0 73 -64 117.5t-137.5 44.5t-140 -34.5t-66.5 -93.5t75 -108 q31 -20 187 -109q146 77 146 183zM165 798q0 -86 73.5 -138.5t160 -52.5t163 44.5t76.5 120t-114 144.5q-49 30 -187 104q-172 -86 -172 -222z" />
+<glyph unicode="⁹" horiz-adv-x="801" d="M735 1046q0 -115 -39.5 -225t-138.5 -191t-224 -81q-90 0 -151 34q-76 42 -76 125q0 77 81 77q34 0 58.5 -20.5t24.5 -53.5q0 -60 -66 -72q47 -32 114 -32t119 30q132 77 137 352q-67 -108 -193.5 -108t-220 92.5t-93.5 229.5t99 228t240 91q178 0 262 -158 q67 -125 67 -318zM391 934q90 0 135.5 72t45.5 185t-25 173q-44 104 -142 104t-147 -82q-30 -50 -30 -159v-71q0 -222 163 -222z" />
+<glyph unicode="⁺" horiz-adv-x="1212" d="M1085 976q0 -37 -38 -37h-404v-402q0 -40 -37 -40t-37 40v402h-402q-40 0 -40 37t40 37h402v404q0 38 37 38t37 -38v-404h404q38 0 38 -37z" />
+<glyph unicode="⁻" horiz-adv-x="1212" d="M1085 976q0 -37 -38 -37h-880q-40 0 -40 37t40 37h880q38 0 38 -37z" />
+<glyph unicode="⁼" horiz-adv-x="1212" d="M1047 1208q38 0 38 -37.5t-38 -37.5h-880q-40 0 -40 37.5t40 37.5h880zM1047 819q38 0 38 -37.5t-38 -37.5h-880q-40 0 -40 37.5t40 37.5h880z" />
+<glyph unicode="⁽" horiz-adv-x="531" d="M450 368q0 -22 -24 -22q-11 0 -41 22q-168 122 -242.5 263t-74.5 345t74.5 345t242.5 263q30 22 41 22q24 0 24 -22q0 -10 -21 -29q-222 -196 -222 -579t222 -579q21 -19 21 -29z" />
+<glyph unicode="⁾" horiz-adv-x="531" d="M463 976q0 -204 -74.5 -345t-242.5 -263q-30 -22 -41 -22q-24 0 -24 22q0 10 21 29q222 196 222 579t-222 579q-21 19 -21 29q0 22 24 22q11 0 41 -22q168 -122 242.5 -263t74.5 -345z" />
+<glyph unicode="ⁿ" horiz-adv-x="905" d="M866 579q-150 4 -188 4t-193 -4v64q32 -1 59.5 -1t46.5 7.5t19 41.5v345q0 141 -108 141q-89 0 -148 -64.5t-59 -153.5v-266q0 -45 52 -50q13 -1 31 -1t41 1v-64q-150 4 -187 4t-192 -4v64q32 -1 61 -1t46 8t17 47v381q0 56 -38 67q-8 2 -53 2h-33v65l245 17v-123 q80 122 227 122q229 0 229 -220v-333q0 -33 90 -33q16 0 35 1v-64z" />
+<glyph unicode="₀" horiz-adv-x="801" d="M676 514q63 -111 63 -325.5t-59 -321.5q-91 -166 -273.5 -166t-273.5 144q-71 112 -71 331t58 328q91 170 278 170t278 -160zM590 116v173q0 335 -190 335t-190 -336q0 -27 0.5 -80.5t0.5 -80.5q0 -158 25 -238q42 -138 164 -138q190 0 190 365z" />
+<glyph unicode="₁" horiz-adv-x="801" d="M142 -206l84 -2q93 0 106 24q5 9 5 30v708q-80 -31 -204 -31v62q193 0 290 89h12q38 0 38 -45v-786q0 -18 5 -28q11 -21 175 -21h15v-64q-67 5 -105 5h-316q-38 0 -105 -5v64z" />
+<glyph unicode="₂" horiz-adv-x="801" d="M79 -269v22q0 26 21 47l300 296q160 158 160 299q0 93 -53.5 154.5t-145.5 61.5q-136 0 -195 -119q98 -2 98 -83q0 -36 -27 -59.5t-64 -23.5q-94 0 -94 87q0 113 93.5 187t219.5 74t228 -74t102 -205q0 -82 -60 -158q-33 -42 -125 -121l-300 -259h300q82 0 95 9.5 t33 125.5h59l-46 -261h-599z" />
+<glyph unicode="₃" horiz-adv-x="801" d="M735 -22q0 -124 -106.5 -200.5t-229.5 -76.5t-218 54q-114 64 -114 173q0 90 97 90q40 0 69 -24t29 -63q0 -82 -93 -87q74 -85 219 -85q86 0 126 64t40 155q0 220 -176 220q-72 0 -72 -1h3q-47 3 -47 27t91 29.5t133.5 67.5t42.5 153q0 146 -140 146q-122 0 -187 -67 q86 -7 86 -79q0 -80 -89.5 -80t-89.5 81q0 96 100 152q83 47 188 47t192 -47q105 -57 105 -154q0 -81 -55.5 -145.5t-137.5 -96.5q97 -26 165.5 -93t68.5 -160z" />
+<glyph unicode="₄" horiz-adv-x="801" d="M757 -40h-156v-120q0 -18 5 -27q10 -19 134 -19h13v-64q-78 5 -105 5h-236q-25 0 -103 -5v64q53 -1 79.5 -1t40.5 4q32 9 32 43v120h-416v56l481 653q15 21 40 21q35 0 35 -47v-620h156v-63zM470 23v476l-352 -476h352z" />
+<glyph unicode="₅" horiz-adv-x="801" d="M633.5 241q88.5 -92 88.5 -225t-105.5 -224t-232 -91t-216 75.5t-89.5 187.5q0 84 86 84q36 0 62.5 -21.5t26.5 -58t-30 -58.5q-27 -18 -60 -18h-9q26 -60 86.5 -96.5t127.5 -36.5q103 0 159 86q35 54 35 178t-26 176q-42 84 -126.5 84t-152.5 -55l-67 -56q-32 0 -32 38 v430q0 33 25 33q9 0 22 -4q128 -40 197.5 -40t223.5 43q7 2 9 2q25 0 25 -26q0 -14 -30 -44q-109 -110 -281 -110q-60 0 -122 15v-235q80 59 198.5 59t207 -92z" />
+<glyph unicode="₆" horiz-adv-x="801" d="M641 251q94 -92 94 -228t-97 -229t-235 -93q-180 0 -267 158q-69 125 -69 321q0 143 63 264.5t182 184.5q85 45 172.5 45t150 -39.5t62.5 -118t-82 -78.5t-82 74q0 65 73 71q-42 37 -107.5 37t-118.5 -30q-146 -82 -152 -354q67 107 193 107t220 -92zM575 -12v69 q0 234 -163 234q-89 0 -135.5 -71.5t-46.5 -165.5q0 -136 27 -196q45 -99 146 -99q172 0 172 229z" />
+<glyph unicode="₇" horiz-adv-x="801" d="M746 624q0 -26 -16 -46l-212 -262q-74 -91 -97 -253q-14 -92 -14 -276q0 -86 -82 -86t-82 86q0 256 194 527q1 2 161 203h-373q-65 0 -77.5 -7t-34.5 -128h-60l56 306h56q2 -17 9 -24q21 -20 182 -20h390v-20z" />
+<glyph unicode="₈" horiz-adv-x="801" d="M735 -27q0 -123 -104 -197.5t-229.5 -74.5t-230 66t-104.5 183q0 157 213 257q-171 93 -171 226q0 108 90.5 174.5t200.5 66.5t195 -53q99 -61 99 -163q0 -129 -178 -216q219 -115 219 -269zM605 458q0 73 -64 117.5t-137.5 44.5t-140 -34.5t-66.5 -93.5t75 -108 q31 -20 187 -109q146 77 146 183zM165 -50q0 -86 73.5 -138.5t160 -52.5t163 44.5t76.5 120t-114 144.5q-49 30 -187 104q-172 -86 -172 -222z" />
+<glyph unicode="₉" horiz-adv-x="801" d="M735 198q0 -115 -39.5 -225t-138.5 -191t-224 -81q-90 0 -151 34q-76 42 -76 125q0 77 81 77q34 0 58.5 -20.5t24.5 -53.5q0 -60 -66 -72q47 -32 114 -32t119 30q132 77 137 352q-67 -108 -193.5 -108t-220 92.5t-93.5 229.5t99 228t240 91q178 0 262 -158 q67 -125 67 -318zM391 86q90 0 135.5 72t45.5 185t-25 173q-44 104 -142 104t-147 -82q-30 -50 -30 -159v-71q0 -222 163 -222z" />
+<glyph unicode="₊" horiz-adv-x="1212" d="M1085 128q0 -37 -38 -37h-404v-402q0 -40 -37 -40t-37 40v402h-402q-40 0 -40 37t40 37h402v404q0 38 37 38t37 -38v-404h404q38 0 38 -37z" />
+<glyph unicode="₋" horiz-adv-x="1212" d="M1085 128q0 -37 -38 -37h-880q-40 0 -40 37t40 37h880q38 0 38 -37z" />
+<glyph unicode="₌" horiz-adv-x="1212" d="M1047 360q38 0 38 -37.5t-38 -37.5h-880q-40 0 -40 37.5t40 37.5h880zM1047 -29q38 0 38 -37.5t-38 -37.5h-880q-40 0 -40 37.5t40 37.5h880z" />
+<glyph unicode="₍" horiz-adv-x="531" d="M450 -420q0 -22 -24 -22q-11 0 -41 22q-168 122 -242.5 263t-74.5 345t74.5 345t242.5 263q30 22 41 22q24 0 24 -22q0 -10 -21 -29q-222 -196 -222 -579t222 -579q21 -19 21 -29z" />
+<glyph unicode="₎" horiz-adv-x="531" d="M463 188q0 -204 -74.5 -345t-242.5 -263q-30 -22 -41 -22q-24 0 -24 22q0 10 21 29q222 196 222 579t-222 579q-21 19 -21 29q0 22 24 22q11 0 41 -22q168 -122 242.5 -263t74.5 -345z" />
+<glyph unicode="₏" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="ₐ" horiz-adv-x="822" d="M783 -133q0 -62 -40 -103t-102 -41q-98 0 -129 97q-67 -105 -206 -105q-96 0 -170 34q-96 44 -96 128q0 125 165 194q99 41 289 51v43q0 73 -44 122.5t-127 49.5t-139 -47q70 -13 70 -74q0 -34 -25.5 -54.5t-59.5 -20.5q-84 0 -84 76q0 83 81.5 127.5t171.5 44.5 q142 0 227 -82q60 -58 60 -174v-284q0 -62 49 -62q48 0 48 130q0 18 -1 40h62v-90zM494 -60v132q-116 -5 -198 -43q-113 -52 -113 -150q0 -50 40.5 -81t104 -31t115 49t51.5 124z" />
+<glyph unicode="ₑ" horiz-adv-x="719" d="M680 -90q0 -23 -28 -65q-86 -130 -240 -130t-263 97.5t-109 239.5t101.5 239.5t237.5 97.5t218.5 -79t82.5 -211q0 -40 -44 -40h-444q0 -129 47 -196q64 -92 173 -92q82 0 124 34t87 114q10 18 27 18q30 0 30 -27zM383 337q-27 0 -63 -15q-114 -48 -125 -213h359 q-2 92 -40 153q-46 75 -131 75z" />
+<glyph unicode="ₒ" horiz-adv-x="810" d="M771 46.5q0 -143.5 -111 -237.5t-255.5 -94t-254.5 94.5t-110 238t110 242.5t255.5 99t255.5 -99.5t110 -243zM583 -129q34 60 34 189t-41 189q-60 88 -174.5 88t-172.5 -91q-37 -58 -37 -190t40 -194q59 -91 176.5 -91t174.5 100z" />
+<glyph unicode="ₓ" horiz-adv-x="906" d="M867 -270q-86 5 -150 5t-197 -4v64q58 2 58 26q0 5 -147 174q-133 -134 -133 -165.5t47 -35.5v-63q-106 4 -168.5 4t-136.5 -5v65q116 0 204 77q8 7 148 168l-154 177q-54 62 -78.5 72t-112.5 10v66q92 -6 133.5 -6t212.5 6v-65q-56 -1 -56 -25q0 -13 128 -155 q115 127 115 146q0 32 -47 34v65q91 -6 154 -6t151 6v-65q-114 -2 -194 -69q-16 -14 -141 -156l209 -239q36 -41 150 -41h5v-65z" />
+<glyph unicode="ₔ" horiz-adv-x="719" d="M68 259q86 130 240 130t263 -97.5t109 -239.5t-101.5 -239.5t-238 -97.5t-218.5 79t-82 211q0 40 44 40h444q0 129 -47 196q-64 92 -173 92q-82 0 -124 -34t-87 -114q-10 -18 -27 -18q-30 0 -30 27q0 23 28 65zM337 -233q27 0 63 15q114 48 125 213h-359q2 -92 40 -153 q46 -75 131 -75z" />
+<glyph unicode="ₕ" horiz-adv-x="905" d="M866 -269q-150 4 -188 4t-193 -4v64q33 -1 60 -1t46 7.5t19 41.5v345q0 141 -108 141q-89 0 -148 -64.5t-59 -153.5v-266q0 -24 6 -34q10 -17 77 -17q19 0 41 1v-64q-150 4 -187 4t-192 -4v64q33 -1 61.5 -1t45.5 8t17 47v741q0 56 -38 66q-8 2 -52 2h-34v64l249 17v-471 q78 112 223 112q229 0 229 -219v-334q0 -33 90 -33q16 0 35 1v-64z" />
+<glyph unicode="ₖ" horiz-adv-x="873" d="M834 -270q-82 5 -144 5t-188 -4v64h12q45 0 45 23.5t-183 241.5l-90 -69v-142q0 -31 7 -40q11 -14 99 -14h19v-64q-91 4 -157 4t-214 -4v64q9 0 29.5 -0.5t31.5 -0.5q64 0 64 55v741q0 56 -39 66q-7 2 -52 2h-34v64l250 17v-673l210 161q31 24 31 48t-46 25v65 q98 -6 167 -6t145 7v-66q-105 -4 -217 -82t-116 -88q23 -16 92 -104l121 -159q36 -45 67 -58.5t90 -13.5v-65z" />
+<glyph unicode="ₗ" horiz-adv-x="454" d="M415 -269q-166 4 -195.5 4t-179.5 -4v64q8 0 29 -0.5t32 -0.5q63 0 63 55v741q0 56 -38 66q-8 2 -86 2v64l249 17v-890q0 -31 9 -40q13 -14 98 -14h19v-64z" />
+<glyph unicode="ₘ" horiz-adv-x="1350" d="M1311 -269q-149 4 -188.5 4t-192.5 -4v64q28 -1 58.5 -1t48.5 7.5t18 47.5v331q0 149 -108 149q-88 0 -147 -64.5t-59 -153.5v-267q0 -45 53 -49q12 -1 30 -1t42 1v-64q-149 4 -188 4t-193 -4v64q28 -1 58.5 -1t48.5 7.5t18 47.5v331q0 149 -108 149q-89 0 -148 -64.5 t-59 -153.5v-272q0 -20 6 -29q10 -16 80 -16q17 0 38 1v-64q-149 4 -187 4t-192 -4v64q28 -1 58.5 -1t42.5 5q23 11 23 50v381q0 56 -38 67q-9 2 -53 2h-33v65l245 17v-123q80 122 227 122q177 0 216 -123q78 123 230 123q229 0 229 -225v-28q-1 -19 -1 -28v-272 q0 -34 77 -34q12 0 48 2v-64z" />
+<glyph unicode="ₙ" horiz-adv-x="905" d="M866 -269q-150 4 -188 4t-193 -4v64q32 -1 59.5 -1t46.5 7.5t19 41.5v345q0 141 -108 141q-89 0 -148 -64.5t-59 -153.5v-266q0 -45 52 -50q13 -1 31 -1t41 1v-64q-150 4 -187 4t-192 -4v64q32 -1 61 -1t46 8t17 47v381q0 56 -38 67q-8 2 -53 2h-33v65l245 17v-123 q80 122 227 122q229 0 229 -220v-333q0 -33 90 -33q16 0 35 1v-64z" />
+<glyph unicode="ₚ" horiz-adv-x="889" d="M746 283q103 -97 103 -237.5t-110.5 -235.5t-244 -95t-199.5 76v-127q0 -20 6 -28q11 -15 75 -15q19 0 43 1v-64q-114 3 -190.5 3t-188.5 -3v64q40 -2 65.5 -2t37.5 6q22 10 22 49v564q0 50 -40 59q-9 2 -38 2q-19 0 -47 -1v65l250 17v-82q93 81 223 81t233 -97z M476 -233q100 0 160 88t60 191t-50 184q-58 95 -153 95q-127 0 -198 -108v-314q0 -54 61.5 -95t119.5 -41z" />
+<glyph unicode="ₛ" horiz-adv-x="623" d="M505 -233.5q-78 -51.5 -185 -51.5t-181 58q-53 -58 -73 -58q-26 0 -26 32v214q0 31 30 31q24 0 32 -30q27 -97 74 -146t140 -49q170 0 170 120q0 88 -159 119q-97 19 -112 23q-63 16 -103 46q-72 53 -72 129q0 97 89 146q71 39 167 39t159 -38q41 38 61 38q28 0 28 -32 v-169q0 -33 -32 -33q-23 0 -31 29q-4 24 -7 48q-22 110 -169 110q-169 0 -169 -98q0 -53 72 -80q31 -12 139.5 -30.5t164.5 -66.5q71 -60 71 -154.5t-78 -146z" />
+<glyph unicode="ₜ" horiz-adv-x="601" d="M561 -83q0 -83 -44 -142.5t-134 -59.5t-148.5 52.5t-58.5 149.5v382h-136v53q105 3 160 90q46 73 47 185h59v-262h229v-66h-229v-384q0 -144 98 -144t98 208v29h59v-91z" />
+<glyph unicode="₝" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="₞" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="₟" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="₠" horiz-adv-x="1372" d="M396 -259v58q123 0 123 49v345q-194 22 -330.5 159t-136.5 338t158.5 343t369.5 142q148 0 275 -110l70 90q16 20 30 20q25 0 25 -31v-340q0 -25 -29 -25t-36 28q-9 40 -35 118q-39 86 -114 138.5t-161 52.5t-161 -33q-221 -97 -221 -407q0 -346 296 -420v303 q0 30 -26.5 38t-96.5 8v59h827l45 -315h-54q-19 153 -76 205t-212 52h-200q-37 0 -47.5 -6t-10.5 -39v-312h127q96 0 124.5 29.5t28.5 125.5h56v-369h-56q0 96 -28.5 125.5t-124.5 29.5h-127v-346q0 -33 10.5 -39t47.5 -6h208q172 0 237 69q54 57 85 233h54l-67 -360h-847z " />
+<glyph unicode="₡" horiz-adv-x="1335" d="M1267 854q0 -26 -29 -26t-35 32q-12 60 -47 178q-89 223 -285 277v-1287q112 25 198.5 103.5t122.5 188.5q17 52 27 140q4 33 23 33q24 0 24 -35q0 -173 -113.5 -309t-281.5 -178v-79h-60v69q-29 -4 -62 -4t-68 4v-69h-60v78q-241 48 -397 248.5t-156 454t156.5 454.5 t396.5 250v69h60v-60q35 4 68.5 4t61.5 -3v59h60v-71q120 -31 244 -154l99 144q17 25 31 25q21 0 21 -33zM811 1326q-18 2 -50 2t-80 -10v-1290q49 -11 81 -11t49 1v1308zM270 672q0 -497 351 -626v1254q-27 -9 -53 -22q-298 -145 -298 -606z" />
+<glyph unicode="₢" horiz-adv-x="1335" d="M1267 854q0 -26 -29 -26t-35 32q-12 60 -47 178q-51 127 -151 208.5t-217 81.5t-220 -50q-298 -145 -298 -613.5t322 -606.5q54 -23 106 -33v541q0 87 -45 109q-22 10 -106 10h-16v68l297 23v-235q76 235 262 235q60 0 109.5 -36.5t49.5 -85.5t-25.5 -76t-65 -27t-66 26 t-26.5 66q0 64 48 84q-6 2 -14 2q-136 0 -207 -140q-55 -111 -55 -262v-306q122 18 219 99.5t135 199.5q17 52 27 140q4 33 23 33q24 0 24 -35q0 -205 -154 -353t-360 -148q-288 0 -486 213t-198 502.5t198.5 503.5t485.5 214q193 0 363 -169l99 144q17 25 31 25 q21 0 21 -33z" />
+<glyph unicode="₣" horiz-adv-x="1271" d="M779 1281h-252q-45 0 -64 -11.5t-19 -67.5v-421h140q132 0 171 48t39 183h48v-522h-48q0 136 -39 183.5t-171 47.5h-140v-344h379q23 0 23 -23v-16q0 -23 -23 -23h-379v-171q0 -27 7 -44q16 -39 209 -39h37v-61q-74 6 -135 6h-373q-49 0 -121 -6v61h75q64 0 88 10 q39 18 39 73v171h-136q-22 0 -22 23v16q0 23 22 23h136v823q0 25 -6 42q-14 39 -166 39h-30v62h1081l54 -442h-49q-24 217 -89 291q-77 89 -286 89z" />
+<glyph unicode="₤" horiz-adv-x="1051" d="M958 310q18 0 18 -23t-22 -86q-78 -225 -264 -225q-85 0 -177 56q-32 19 -153 112q-81 -168 -182 -168q-50 0 -78.5 35t-28.5 93t44 99.5t110 41.5q35 0 94 -10q4 50 4 121t-13 238h-221v60h216q-7 83 -10 130h-206v60h203q-3 61 -3 113q0 171 97 299t263 128 q117 0 180 -64t63 -133q0 -27 -20.5 -50t-47.5 -23q-49 0 -61 61q-22 109 -24 112q-27 61 -114 61q-192 0 -192 -294q0 -53 16 -210h364v-60h-359q3 -44 3 -76v-54h356v-60h-357q-6 -197 -65 -374l167 -56q101 -30 172 -30q135 0 189 107l17 45q10 24 22 24zM213 203 q-105 0 -105 -99q0 -89 75 -89q88 0 126 154q-52 34 -96 34z" />
+<glyph unicode="₥" horiz-adv-x="1775" d="M1485 6q-40 0 -244 -6v66q26 -1 70 -1t65 13q32 19 32 84v499q0 238 -157 238q-16 0 -32 -2l-257 -396v-346q0 -39 12 -60q18 -30 118 -30q17 0 37 1v-66q-198 6 -237.5 6t-244.5 -6v16l-228 -351q-11 -17 -35 -17q-40 0 -40 40q0 13 6 22l464 714v237q0 238 -158 238 q-130 0 -209.5 -104.5t-79.5 -238.5v-397q0 -47 11 -64q18 -30 114 -30q19 0 40 1v-66q-198 6 -236 6t-243 -6v66q26 -1 69.5 -1t70 16t26.5 81v574q0 87 -44 109q-21 10 -96 10h-26v68l301 23v-225q101 225 316 225q251 0 284 -210q58 130 181 183l286 440q11 17 35 17 q40 0 40 -40q0 -13 -6 -22l-239 -368h15q158 0 224.5 -81t66.5 -243v-42q-1 -27 -1 -41v-409q0 -65 132 -65q17 0 35 1v-66q-198 6 -238 6zM1081 835q-66 -57 -98 -150zM814 162v111l-135 -208h11h9q62 0 83 13q32 19 32 84z" />
+<glyph unicode="₦" horiz-adv-x="1480" d="M1209 1139v-295h174v-60h-174v-130h174v-60h-174v-562q0 -32 -26 -32q-16 0 -34 26l-388 568h-436v-393q0 -140 200 -140h3v-61q-208 6 -230 6t-230 -6v61h3q199 0 199 140v393h-181v60h181v130h-181v60h181v389q0 29 -8 35q-19 13 -194 13v62h342q30 0 48 -26l323 -473 h373v301q0 139 -203 139v62q205 -6 231.5 -6t230.5 6v-62h-3q-201 0 -201 -145zM1154 654v130h-332l89 -130h243zM1154 594h-202l202 -296v296zM325 844h265l-246 360q-12 17 -19 25v-385zM325 784v-130h395l-89 130h-306z" />
+<glyph unicode="₧" horiz-adv-x="2385" d="M2333 274q0 -146 -97 -222t-242 -76t-242 93q-77 -93 -97.5 -93t-20.5 33v57q-58 -90 -160 -90q-132 0 -203.5 78t-71.5 211v585q-51 -106 -172.5 -168.5t-247.5 -62.5h-335v-473q0 -32 7 -48q17 -37 181 -37h17v-61q-72 6 -133 6h-326q-50 0 -122 -6v61l55 -1 q122 0 140 38q7 15 7 48v1051q0 32 -7 48q-16 37 -158 37q-18 0 -37 -1v62h695q157 0 296 -84.5t164 -226.5q68 114 70 285h53v-394h305v-68h-305v-594q0 -231 144 -231t144 265v36q0 32 27 32q21 0 30 -35q37 -146 92 -214q73 -90 206 -90q103 0 172 48.5t69 146.5 q0 147 -223 195q-128 28 -148 33q-82 25 -134 67q-91 75 -91 183q0 134 108 204q92 59 221.5 59t212.5 -61q60 61 82 61t22 -33v-254q0 -35 -29 -35q-23 0 -31 43l-6 60q-16 87 -81.5 132.5t-158.5 45.5t-157 -34q-81 -43 -81 -129t94 -130q48 -22 169 -46q170 -33 243 -102 q91 -86 91 -204zM1024 977q0 161 -75.5 232.5t-237.5 71.5h-186q-53 0 -69.5 -13t-16.5 -66v-532h272q313 0 313 307z" />
+<glyph unicode="₨" horiz-adv-x="1814" d="M1762 274q0 -146 -97 -222t-247 -76q-211 0 -315.5 92t-136.5 287q-23 141 -117 230q-70 67 -183 67h-227v-511q0 -29 7 -46q14 -34 171 -34h26v-61q-74 6 -143 6h-289q-69 0 -143 -6v61q6 0 24.5 -0.5t28.5 -0.5q125 0 142 35q7 15 7 46v1055q0 27 -6 45q-14 40 -167 40 h-29v62h618q183 0 333 -84q180 -100 180 -267q0 -43 -15 -84q89 52 213.5 52t207.5 -61q60 61 82 61t22 -33v-254q0 -35 -29 -35q-23 0 -31 43l-6 60q-16 87 -81.5 132.5t-158.5 45.5t-157 -34q-81 -43 -81 -129t94 -130q48 -22 169 -46q170 -33 243 -102q91 -86 91 -204z M997 992q0 196 -143 256q-84 35 -314 35q-51 0 -69 -7q-32 -14 -32 -57v-523h219q339 0 339 296zM1659 219q0 147 -223 195q-128 28 -148 33q-82 25 -134 67q-91 75 -91 183q0 39 10 73q-92 -68 -218 -99q163 -56 224 -182q23 -48 50 -189t72 -195q67 -81 217 -81 q103 0 172 48.5t69 146.5z" />
+<glyph unicode="₩" horiz-adv-x="2087" d="M2019 1284q-152 0 -195 -132l-101 -308h190v-60h-209l-43 -130h252v-60h-271l-196 -598q-13 -39 -38.5 -39t-37.5 37l-196 600h-262l-193 -598q-13 -39 -39.5 -39t-38.5 37l-196 600h-306v60h286l-43 130h-243v60h224l-117 357q-6 19 -23 53q-23 30 -134 30h-21v62 q242 -6 344.5 -6t175.5 6v-62h-5q-161 0 -161 -58q0 -15 4 -27l116 -355h399l76 232l-35 127q-16 48 -52 64.5t-134 16.5v62q242 -6 344.5 -6t175.5 6v-62h-5q-160 0 -160 -58q0 -15 5 -30l115 -352h400l97 297q10 31 10 39q0 53 -63 81q-48 22 -109 23v62q155 -6 239 -6 t174 6v-62zM1652 784h-361l42 -130h277zM1092 844l-50 153l-49 -153h99zM1590 594h-237l119 -363zM1154 654l-42 130h-139l-42 -130h223zM922 784h-361l43 -130h276zM860 594h-236l118 -363z" />
+<glyph unicode="₪" horiz-adv-x="1590" d="M1440 295q0 -123 -77 -209t-202 -86h-636v668h151v-563h443q96 0 133 48.5t37 148.5v754h151v-761zM1065 387h-151v366q0 101 -36.5 150t-133.5 49h-443v-952h-151v1056h636q152 0 215.5 -71t63.5 -225v-373z" />
+<glyph unicode="₫" horiz-adv-x="1159" d="M1136 1168q0 -23 -23 -23h-173v-960q0 -88 46 -110q20 -10 85 -10q16 0 35 1v-66l-313 -24v142q-111 -142 -295 -142t-314.5 144.5t-130.5 340.5t139.5 340.5t336.5 144.5q163 0 270 -133v332h-415q-22 0 -22 23v16q0 23 22 23h415v70q0 88 -47 109q-20 10 -85 10 q-16 0 -35 -1v67l308 23v-278h173q23 0 23 -23v-16zM1076 -242q0 -23 -23 -23h-889q-22 0 -22 23v16q0 23 22 23h889q23 0 23 -23v-16zM793 253v449q0 32 -24 68q-87 129 -236 129t-238 -138q-65 -100 -65 -300t61 -299q85 -138 224 -138q93 0 185.5 69.5t92.5 159.5z" />
+<glyph unicode="€" horiz-adv-x="1548" d="M1489 1246q0 -7 -6 -20l-93 -196q-11 -23 -27 -23q-32 0 -28 30q2 12 2 24q0 126 -164 213q-105 56 -218 56t-215 -55q-222 -120 -273 -412h842l-56 -117h-799q-1 -26 -1 -63.5t4 -84.5h725l-56 -117h-653q58 -284 270 -405q102 -58 209 -58t211.5 56t186.5 177 q8 12 19 12q24 0 24 -29v-124q-189 -153 -434 -153t-433 148t-250 376h-217l56 117h140q-4 35 -4 72.5t4 75.5h-196l56 117h162q63 229 250 378t426.5 149t424.5 -144q62 23 86.5 23t24.5 -23z" />
+<glyph unicode="₭" horiz-adv-x="1519" d="M649 1284l-57 2q-126 0 -142 -40q-6 -15 -6 -44v-445h201l417 397q36 34 36 67q0 61 -91 63v62q69 -6 217.5 -6t201.5 6v-62q-160 -2 -281 -118l-356 -340l47 -69h387q23 0 23 -23v-16q0 -23 -23 -23h-345l367 -539q42 -62 83.5 -78.5t122.5 -16.5v-61q-127 6 -281.5 6 t-225.5 -6v61h4q113 0 113 59q0 22 -31 68l-343 507h-36l-207 -197v-359q0 -28 9 -45q17 -33 186 -33h10v-61q-71 6 -120 6h-347q-43 0 -114 -6v61q8 0 26.5 -0.5t28.5 -0.5q125 0 141 40q6 15 6 44v551h-136q-22 0 -22 23v16q0 23 22 23h136v453q0 27 -7 41q-16 33 -176 33 h-19v62q70 -6 119 -6h342q50 0 120 6v-62zM444 695v-129l136 129h-136z" />
+<glyph unicode="₮" horiz-adv-x="1413" d="M878 1282q-46 0 -65.5 -11.5t-19.5 -53.5v-554l429 91v-60l-429 -91v-130l429 91v-60l-429 -91v-267q0 -25 10 -47q18 -38 243 -38h34v-61q-84 6 -154 6h-439q-71 0 -155 -6v61q9 0 35.5 -0.5t40.5 -0.5q184 0 202 39q8 17 8 47v229l-429 -91v60l429 91v130l-429 -91v60 l429 91v593q0 43 -29 56q-17 8 -66 8q-256 0 -321 -62.5t-86 -318.5h-48l36 442h1206l36 -442h-49q-22 262 -88.5 321.5t-330.5 59.5z" />
+<glyph unicode="₯" horiz-adv-x="1363" d="M1311 -145q0 -279 -149 -279q-157 0 -226 320l-53 245l-274 -541h-151l244 481q-121 -105 -271 -105q-177 0 -278 123t-101 305t120 309.5t304 154.5q-35 39 -132 116.5t-135 128.5q-56 77 -56 173.5t115 152.5q93 44 208 44t208 -54q113 -64 113 -170.5t-98 -106.5 q-43 0 -71 28t-28 71q0 95 101 99q-80 78 -229 78q-80 0 -140 -31q-74 -38 -74 -111q0 -96 139 -210l274 -211q159 -142 192 -295l26 -118l254 502h151l-360 -711l75 -347q17 -74 63 -129.5t114 -55.5q78 0 90 158h35v-14zM730 399q0 187 -210 421q-153 -24 -236 -131.5 t-83 -262.5t59 -262q73 -134 208.5 -134t205.5 125q56 101 56 244z" />
+<glyph unicode="₰" horiz-adv-x="1107" d="M1041 -15q0 -145 -117.5 -227.5t-268.5 -82.5l-6 34q95 18 155 106t60 188q0 238 -238 585l-172 -491l-112 269l-148 -260h-134l307 528l106 -248l97 285q-122 176 -161 252q-78 151 -78 281t79 208t205 78q91 0 142.5 -51.5t51.5 -142.5q0 -184 -129 -531 q175 -258 235 -370q126 -236 126 -410zM712 1281q0 126 -89 126q-72 0 -107 -62.5t-35 -140.5q0 -151 141 -354q90 285 90 431z" />
+<glyph unicode="₱" horiz-adv-x="1472" d="M1404 864h-199q-47 -112 -171 -178.5t-255 -66.5h-335v-473q0 -32 7 -48q17 -37 181 -37h17v-61q-72 6 -133 6h-326q-50 0 -122 -6v61l55 -1q122 0 140 38q7 15 7 48v718h-99v60h99v130h-99v60h99v83q0 32 -7 48q-16 37 -158 37q-18 0 -37 -1v62h695q131 0 255 -61 t178 -168h208v-60h-186q10 -37 10 -70.5t-5 -59.5h181v-60zM711 1281h-186q-53 0 -69.5 -13t-16.5 -66v-88h567q-54 167 -295 167zM1022 924q2 25 2 60t-5 70h-580v-130h583zM439 864v-194h272q255 0 301 194h-573z" />
+<glyph unicode="₲" horiz-adv-x="1472" d="M1405 478q-80 0 -97 -6q-40 -15 -40 -81v-360q0 -29 -16 -29q-42 0 -127 122q-97 -167 -369 -167v-65h-60v68q-269 23 -448.5 230.5t-179.5 482t180.5 483.5t447.5 232v58h60v-56q195 -1 361 -169l99 144q17 25 31 25q21 0 21 -33l1 -503q0 -26 -29 -26t-35 32 q-12 60 -46 177q-51 128 -151.5 209.5t-230.5 81.5q-10 0 -21 -1v-1309q16 -1 32 -1q124 0 208 56q98 65 98 183v126q0 40 -9 56q-23 40 -175 40h-63v59q65 -5 221.5 -5t336.5 5v-59zM579 1282q-309 -152 -309 -608.5t312 -609.5q53 -26 114 -38v1294q-62 -11 -117 -38z" />
+<glyph unicode="₳" horiz-adv-x="1374" d="M963 6q-110 0 -182 -6v61h5q161 0 161 59q0 16 -59 199l-24 75h-473l-61 -188q-9 -28 -9 -42q0 -51 47.5 -76.5t104.5 -26.5v-61q-183 6 -244 6t-161 -6v61h2q149 0 193 136l64 197h-156v60h175l42 130h-217v60h237l235 725q14 42 45 42t45 -42l234 -725h237v-60h-218 l42 -130h176v-60h-157l80 -248q6 -20 25 -56q25 -29 141 -29h15v-61q-235 6 -345 6zM783 644l-157 481l-155 -481h312zM844 454l-42 130h-350l-42 -130h434z" />
+<glyph unicode="₴" horiz-adv-x="1169" d="M1101 524h-724q-21 -17 -40 -42q-62 -80 -62 -188.5t75 -192.5t189 -84q194 0 311 107t117 250q0 72 30 72q24 0 24 -29v-431q0 -29 -20 -29q-14 0 -34 31l-68 106q-126 -137 -362 -137q-167 0 -277.5 121t-110.5 289q0 83 28 157h-109v60h139q47 79 126 130h-265v60h412 q73 15 216 52q199 61 199 250q0 109 -74.5 183.5t-183.5 74.5q-279 0 -360 -290q-8 -41 -25 -122q-5 -22 -23 -22q-28 0 -28 28v429q0 33 24 33q12 0 29 -27l69 -112q142 139 309 139t278 -111t111 -271q0 -131 -80 -234h160v-60h-219q-53 -43 -118 -67q-6 -2 -252 -63h589 v-60z" />
+<glyph unicode="₵" horiz-adv-x="1335" d="M1267 854q0 -26 -29 -26t-35 32q-12 60 -47 178q-50 126 -149 207t-226 83v-1311q139 1 253.5 86t157.5 217q17 52 27 140q4 33 23 33q24 0 24 -35q0 -197 -143.5 -343t-341.5 -157v-66h-60v66q-277 12 -465 222.5t-188 492t188.5 492.5t464.5 224v57h60v-57 q174 -9 334 -168l99 144q17 25 31 25q22 0 22 -33v-503zM568 1278q-298 -145 -298 -613.5t322 -606.5q66 -28 129 -37v1304q-78 -10 -153 -47z" />
+<glyph unicode="₶" horiz-adv-x="1355" d="M53 66l68 -2q98 0 98 98v693h-166v68h166v354q0 87 -44 108q-21 10 -106 10h-16v67l306 23v-562h332q107 0 169 151q47 116 49 243h53v-394h305v-68h-305v-594q0 -231 144.5 -231t144.5 290q0 18 -1 67h52v-122q0 -113 -48 -193q-58 -96 -164 -96q-132 0 -203.5 78 t-71.5 211v590h-456v-693q0 -50 13.5 -69t49.5 -23q29 -4 81 -4h24v-66q-220 6 -247.5 6t-226.5 -6v66z" />
+<glyph unicode="₷" horiz-adv-x="1107" d="M961 616.5q79 -106.5 79 -256.5t-87.5 -249.5t-232.5 -135.5v-40h-89v25q-31 -3 -69.5 -3t-79.5 6v-28h-89v48q-82 24 -149 63v-111h-89v177q-103 97 -103 222q0 44 29.5 87t71.5 43q78 0 86 -88q56 89 111 89q85 0 119 -94q49 94 120 94q131 0 131 -216v-206 q194 69 194 257q0 102 -58.5 177.5t-170.5 104.5q-88 17 -260 65q-116 43 -186.5 140.5t-70.5 220.5q0 160 111 271t278 111t309 -139l69 112q17 27 29 27q24 0 24 -33v-429q0 -28 -28 -28q-18 0 -23 22q-7 41 -25 122q-80 290 -360 290q-109 0 -183.5 -74.5t-74.5 -183.5 q0 -188 199 -250q85 -19 252 -62q137 -41 216 -147.5zM631 324q0 111 -48 111q-51 0 -80 -82q-21 -62 -21 -126v-202q45 -8 79 -8t70 5v302zM394 332q0 103 -50 103t-79 -82q-21 -62 -21 -126v-114q66 -40 149 -66zM155 325q0 59 -20 59q-38 0 -38 -69.5t58 -131.5v142z" />
+<glyph unicode="₸" horiz-adv-x="1200" d="M1130 1187h-1060v156h1060v-156zM1130 904h-452v-904h-156v904h-452v156h1060v-156z" />
+<glyph unicode="₹" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="₺" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="₻" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="₼" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="₽" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="₾" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="₿" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="⃀" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="⃁" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="⃂" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="⃃" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="⃄" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="⃅" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="⃆" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="⃇" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="⃈" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="⃉" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="⃊" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="⃋" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="⃌" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="⃍" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="⃎" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="⃏" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="⃐" horiz-adv-x="0" d="M1117 1405q0 -39 -45 -39h-959q-56 0 -56 28.5t45 51.5q113 58 179 127q32 33 48 33q31 0 31 -32t-128 -130h840q45 0 45 -39z" />
+<glyph unicode="⃑" horiz-adv-x="0" d="M1072 1446q45 -23 45 -51.5t-56 -28.5h-959q-45 0 -45 39t45 39h840q-128 98 -128 130t31 32q16 0 48 -33q66 -69 179 -127z" />
+<glyph unicode="⃒" horiz-adv-x="0" d="M628 -341q0 -41 -41 -41t-41 41v1848q0 39 41 39t41 -39v-1848z" />
+<glyph unicode="⃓" horiz-adv-x="0" d="M628 -41q0 -41 -41 -41t-41 41v1248q0 39 41 39t41 -39v-1248z" />
+<glyph unicode="⃔" horiz-adv-x="0" d="M1080 1123q0 -41 -41 -41t-41 41q0 166 -117.5 283.5t-283.5 117.5q-136 0 -242 -81.5t-143 -208.5q118 79 151.5 79t33.5 -34q0 -19 -63.5 -47.5t-163.5 -121.5q-30 -28 -49.5 -28t-28.5 54q-23 139 -61 211q-17 32 -17 45q0 31 35 31t86 -158q46 150 173.5 245.5 t288.5 95.5q200 0 341.5 -141.5t141.5 -341.5z" />
+<glyph unicode="⃕" horiz-adv-x="0" d="M1160 1392q0 -13 -17 -45q-38 -72 -61 -211q-9 -54 -28.5 -54t-49.5 28q-100 93 -163.5 121.5t-63.5 47.5q0 34 33.5 34t151.5 -79q-37 127 -143 208.5t-242 81.5q-166 0 -283.5 -117.5t-117.5 -283.5q0 -41 -41 -41t-41 41q0 200 141.5 341.5t341.5 141.5 q161 0 288.5 -95.5t173.5 -245.5q51 158 86 158t35 -31z" />
+<glyph unicode="⃖" horiz-adv-x="0" d="M1117 1405q0 -39 -45 -39h-842q128 -97 128 -129.5t-31 -32.5q-16 0 -48 33q-62 65 -179 127q-43 23 -43 41t43 41q117 62 179 127q32 33 48 33q31 0 31 -32.5t-128 -129.5h842q45 0 45 -39z" />
+<glyph unicode="⃗" horiz-adv-x="0" d="M1117 1405q0 -18 -43 -41q-117 -62 -179 -127q-32 -33 -48 -33q-31 0 -31 32.5t128 129.5h-842q-45 0 -45 39t45 39h842q-128 97 -128 129.5t31 32.5q16 0 48 -33q62 -65 179 -127q43 -23 43 -41z" />
+<glyph unicode="⃘" horiz-adv-x="0" d="M995 582q0 -200 -141.5 -341.5t-341.5 -141.5t-341.5 141.5t-141.5 341.5t141.5 341.5t341.5 141.5t341.5 -141.5t141.5 -341.5zM913 582q0 166 -117.5 283.5t-283.5 117.5t-283.5 -117.5t-117.5 -283.5t117.5 -283.5t283.5 -117.5t283.5 117.5t117.5 283.5z" />
+<glyph unicode="⃙" horiz-adv-x="0" d="M995 582q0 -200 -141.5 -341.5t-337 -141.5t-334.5 130t-152 319q-34 -36 -96 -77t-95 -41q-39 0 -39 41q0 22 25 36q22 10 44 19q90 42 173 168q38 161 169.5 266t300.5 105q200 0 341.5 -141.5t141.5 -341.5zM913 582q0 166 -117.5 283.5t-272.5 117.5t-265.5 -91 t-138.5 -229q69 -98 152 -137q22 -9 44 -19q25 -14 25 -36q0 -41 -39 -41q-33 0 -92.5 39.5t-95.5 75.5q14 -154 128.5 -259t275.5 -105t278.5 117.5t117.5 283.5z" />
+<glyph unicode="⃚" horiz-adv-x="0" d="M995 582q0 -200 -141.5 -341.5t-341.5 -141.5q-169 0 -300.5 105t-169.5 266q-83 126 -173 168q-22 9 -44 19q-25 14 -25 36q0 41 39 41q33 0 95 -41t96 -77q13 189 152 319t334.5 130t337 -141.5t141.5 -341.5zM913 582q0 166 -117.5 283.5t-278.5 117.5t-275.5 -105 t-128.5 -259q36 36 95.5 75.5t92.5 39.5q39 0 39 -41q0 -22 -25 -36q-22 -10 -44 -19q-83 -39 -152 -137q28 -138 138.5 -229t265.5 -91t272.5 117.5t117.5 283.5z" />
+<glyph unicode="⃛" horiz-adv-x="0" d="M1087 1442q0 -41 -30.5 -72t-72 -31t-69.5 30.5t-28 72t29 72t69.5 30.5t71 -30.5t30.5 -71.5zM687 1442q0 -41 -30.5 -72t-72 -31t-69.5 30.5t-28 72t29 72t69.5 30.5t71 -30.5t30.5 -71.5zM287 1442q0 -41 -30.5 -72t-72 -31t-69.5 30.5t-28 72t29 72t69.5 30.5 t71 -30.5t30.5 -71.5z" />
+<glyph unicode="⃜" horiz-adv-x="0" d="M1222 1442q0 -41 -29.5 -70.5t-71 -29.5t-70.5 29t-29 70t30 71t70.5 30t70 -29.5t29.5 -70.5zM882 1442q0 -41 -29.5 -70.5t-71 -29.5t-70.5 29t-29 70t30 71t70.5 30t70 -29.5t29.5 -70.5zM542 1442q0 -41 -29.5 -70.5t-71 -29.5t-70.5 29t-29 70t30 71t70.5 30 t70 -29.5t29.5 -70.5zM202 1442q0 -41 -29.5 -70.5t-71 -29.5t-70.5 29t-29 70t30 71t70.5 30t70 -29.5t29.5 -70.5z" />
+<glyph unicode="⃝" horiz-adv-x="0" d="M2083 582q0 -410 -287 -697t-697 -287t-697 287t-287 697t287 697t697 287t697 -287t287 -697zM1983 582q0 368 -258 626t-626.5 258t-626 -257.5t-257.5 -626.5t257.5 -626.5t626 -257.5t626.5 258t258 626z" />
+<glyph unicode="⃞" horiz-adv-x="0" d="M1983 -252q0 -50 -50 -50h-1668q-50 0 -50 50v1668q0 50 50 50h1668q50 0 50 -50v-1668zM1883 -202v1568h-1568v-1568h1568z" />
+<glyph unicode="⃟" horiz-adv-x="0" d="M2102 582q0 -21 -14 -35l-954 -954q-14 -14 -35 -14t-35 14l-954 954q-14 14 -14 35t14 35l954 954q14 14 35 14t35 -14l954 -954q14 -14 14 -35zM1981 582l-882 882l-882 -882l882 -882z" />
+<glyph unicode="⃠" horiz-adv-x="0" d="M2083 582q0 -410 -287 -697t-697 -287t-697 287t-287 697t287 697t697 287t697 -287t287 -697zM1754 -15q229 251 229 608t-258 615t-615 258t-608 -229zM444 1179q-229 -251 -229 -608.5t257.5 -615t615 -257.5t608.5 229z" />
+<glyph unicode="⃡" horiz-adv-x="0" d="M1117 1405q0 -18 -43 -41q-117 -62 -179 -127q-32 -33 -48 -33q-31 0 -31 32.5t128 129.5h-714q128 -97 128 -129.5t-31 -32.5q-16 0 -48 33q-62 65 -179 127q-43 23 -43 41t43 41q117 62 179 127q32 33 48 33q31 0 31 -32.5t-128 -129.5h714q-128 97 -128 129.5t31 32.5 q16 0 48 -33q62 -65 179 -127q43 -23 43 -41z" />
+<glyph unicode="⃢" horiz-adv-x="0" d="M2034 856q3 -121 3 -273t-3 -274q-7 -284 -87 -363t-371 -89t-477 -10t-477 10t-371 89t-87 363q-3 122 -3 273.5t3 273.5q7 285 86.5 363.5t372.5 88t475.5 9.5t476 -9.5t373 -88t86.5 -363.5zM1944 311q3 131 3 272t-3 271q-6 248 -60.5 301.5t-338.5 62.5t-446.5 9 t-446 -9t-338 -62.5t-60.5 -301.5q-3 -130 -3 -271t3 -272q6 -247 61 -301.5t336 -63.5t448 -9t448 9t336 63.5t61 301.5z" />
+<glyph unicode="⃣" horiz-adv-x="0" d="M2113 -113q0 -137 -96.5 -233t-233.5 -96h-1368q-137 0 -233.5 96t-96.5 233v1367q0 137 96.5 234.5t233.5 97.5h1368q137 0 233.5 -97.5t96.5 -234.5v-1367zM2041 -70v1324q0 124 -88.5 211.5t-212.5 87.5h-1325q-124 0 -211.5 -87.5t-87.5 -211.5v-1324 q0 -124 87.5 -211.5t211.5 -87.5h1325q124 0 212.5 87.5t88.5 211.5zM1920 35q0 -117 -83.5 -201t-200.5 -84h-1180q-117 0 -200 84t-83 201v1178q0 117 83 201t200 84h1180q117 0 200.5 -84t83.5 -201v-1178zM1847 78v1135q0 104 -74 178t-178 74h-1139q-104 0 -178 -74 t-74 -178v-1135q0 -104 74 -179t178 -75h1139q104 0 178 75t74 179z" />
+<glyph unicode="⃤" horiz-adv-x="0" d="M2198 -138q0 -42 -53 -42h-2092q-53 0 -53 42q0 16 11 34l1046 1682q17 28 42 28t42 -28l1046 -1682q11 -18 11 -34zM2055 -80l-956 1537l-956 -1537h1912z" />
+<glyph unicode="⃥" horiz-adv-x="0" d="M964 -341q0 -41 -39 -41q-31 0 -40 26l-673 1848q-2 5 -2 13q0 41 39 41q31 0 40 -26l673 -1848q2 -5 2 -13z" />
+<glyph unicode="⃦" horiz-adv-x="0" d="M468 -341q0 -41 -41 -41t-41 41v1848q0 39 41 39t41 -39v-1848zM788 -341q0 -41 -41 -41t-41 41v1848q0 39 41 39t41 -39v-1848z" />
+<glyph unicode="⃧" horiz-adv-x="0" d="M1335 39q0 -39 -41 -39t-41 39v1214h-1214q-39 0 -39 41t39 41h1255q14 0 27.5 -13.5t13.5 -27.5v-1255z" />
+<glyph unicode="⃨" horiz-adv-x="0" d="M1107 -278q0 -41 -30.5 -72t-72 -31t-69.5 30.5t-28 72t29 72t69.5 30.5t71 -30.5t30.5 -71.5zM687 -278q0 -41 -30.5 -72t-72 -31t-69.5 30.5t-28 72t29 72t69.5 30.5t71 -30.5t30.5 -71.5zM267 -278q0 -41 -30.5 -72t-72 -31t-69.5 30.5t-28 72t29 72t69.5 30.5 t71 -30.5t30.5 -71.5z" />
+<glyph unicode="⃩" horiz-adv-x="0" d="M1089 1332q0 -45 -39 -45t-39 45v122h-848v-122q0 -45 -39 -45t-39 45v200h1004v-200z" />
+<glyph unicode="⃪" horiz-adv-x="0" d="M1703 582q0 -39 -45 -39h-1485q128 -97 128 -129.5t-31 -32.5q-16 0 -48 33q-62 65 -179 127q-43 23 -43 41t43 41q117 62 179 127q32 33 48 33q31 0 31 -32.5t-128 -129.5h1485q45 0 45 -39z" />
+<glyph unicode="⃫" horiz-adv-x="0" d="M769 1505q0 -8 -2 -13l-673 -1848q-9 -26 -40 -26q-39 0 -39 41q0 8 2 13l673 1848q9 26 40 26q39 0 39 -41zM1159 1505q0 -8 -2 -13l-673 -1848q-9 -26 -40 -26q-39 0 -39 41q0 8 2 13l673 1848q9 26 40 26q39 0 39 -41z" />
+<glyph unicode="⃬" horiz-adv-x="0" d="M1061 -202q56 0 56 -28.5t-45 -51.5q-113 -58 -179 -127q-32 -33 -48 -33q-31 0 -31 32t128 130h-840q-45 0 -45 39t45 39h959z" />
+<glyph unicode="⃭" horiz-adv-x="0" d="M1117 -241q0 -39 -45 -39h-840q128 -98 128 -130t-31 -32q-16 0 -48 33q-66 69 -179 127q-45 23 -45 51.5t56 28.5h959q45 0 45 -39z" />
+<glyph unicode="⃮" horiz-adv-x="0" d="M1117 -241q0 -39 -45 -39h-842q128 -97 128 -129.5t-31 -32.5q-16 0 -48 33q-62 65 -179 127q-43 23 -43 41t43 41q117 62 179 127q32 33 48 33q31 0 31 -32.5t-128 -129.5h842q45 0 45 -39z" />
+<glyph unicode="⃯" horiz-adv-x="0" d="M1117 -241q0 -18 -43 -41q-117 -62 -179 -127q-32 -33 -48 -33q-31 0 -31 32.5t128 129.5h-842q-45 0 -45 39t45 39h842q-128 97 -128 129.5t31 32.5q16 0 48 -33q62 -65 179 -127q43 -23 43 -41z" />
+<glyph unicode="⃰" horiz-adv-x="0" d="M775 1314q0 -47 -43 -47q-14 0 -23 8l-102 86l23 -136q0 -40 -43 -40t-43 40v3l23 133l-102 -86q-9 -8 -22 -8q-44 0 -44 47q0 27 23 35l126 46l-126 47q-23 9 -23 35q0 47 44 47q13 0 22 -8l102 -86l-23 136q0 40 43 40t43 -40v-2l-23 -134l102 86q9 8 23 8q43 0 43 -47 q0 -27 -22 -35l-126 -47l126 -46q22 -8 22 -35z" />
+<glyph unicode="⃱" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="⃲" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="⃳" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="⃴" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="⃵" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="⃶" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="⃷" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="⃸" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="⃹" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="⃺" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="⃻" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="⃼" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="⃽" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="⃾" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="⃿" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="℀" horiz-adv-x="1419" d="M783 715q0 -62 -40 -103t-102 -41q-98 0 -129 97q-67 -105 -206 -105q-96 0 -170 34q-96 44 -96 128q0 125 165 194q99 41 289 51v43q0 73 -44 122.5t-127 49.5t-139 -47q70 -13 70 -74q0 -34 -25.5 -54.5t-59.5 -20.5q-84 0 -84 76q0 83 81.5 127.5t171.5 44.5 q142 0 227 -82q60 -58 60 -174v-284q0 -62 49 -62q48 0 48 130q0 18 -1 40h62v-90zM494 788v132q-116 -5 -198 -43q-113 -52 -113 -150q0 -50 40.5 -81t104 -31t115 49t51.5 124zM1470 1455l-1155 -1746h-89l1155 1746h89zM1380 -90q0 -12 -8 -30q-75 -165 -268 -165 q-142 0 -248 96t-106 238.5t105.5 241t250.5 98.5q91 0 164 -36q92 -45 92 -127q0 -76 -83.5 -76t-83.5 75q0 56 60 72q-56 36 -147 36q-41 0 -85 -22q-121 -61 -121 -258.5t128 -259.5q45 -22 88 -22q83 0 132 43q26 22 52.5 71.5t46.5 49.5q31 0 31 -25z" />
+<glyph unicode="℁" horiz-adv-x="1433" d="M783 715q0 -62 -40 -103t-102 -41q-98 0 -129 97q-67 -105 -206 -105q-96 0 -170 34q-96 44 -96 128q0 125 165 194q99 41 289 51v43q0 73 -44 122.5t-127 49.5t-139 -47q70 -13 70 -74q0 -34 -25.5 -54.5t-59.5 -20.5q-84 0 -84 76q0 83 81.5 127.5t171.5 44.5 q142 0 227 -82q60 -58 60 -174v-284q0 -62 49 -62q48 0 48 130q0 18 -1 40h62v-90zM494 788v132q-116 -5 -198 -43q-113 -52 -113 -150q0 -50 40.5 -81t104 -31t115 49t51.5 124zM1315 -233.5q-78 -51.5 -185 -51.5t-181 58q-53 -58 -73 -58q-26 0 -26 32v214q0 31 30 31 q24 0 32 -30q27 -97 74 -146t140 -49q170 0 170 120q0 88 -159 119q-97 19 -112 23q-63 16 -103 46q-72 53 -72 129q0 97 89 146q71 39 167 39t159 -38q41 38 61 38q28 0 28 -32v-169q0 -33 -32 -33q-23 0 -31 29q-4 24 -7 48q-22 110 -169 110q-169 0 -169 -98 q0 -53 72 -80q31 -12 139.5 -30.5t164.5 -66.5q71 -60 71 -154.5t-78 -146zM1470 1455l-1155 -1746h-89l1155 1746h89z" />
+<glyph unicode="ℂ" horiz-adv-x="1389" d="M1336 258q0 -11 -7 -22q-80 -121 -248.5 -197t-324.5 -76q-318 0 -510 198t-192 516.5t192.5 517t509.5 198.5q97 0 218.5 -46t179.5 -46q41 0 54 46t39 46q32 0 32 -30v-397q0 -34 -32 -34q-22 0 -35 26q-13 35 -44 102q-55 100 -179 182.5t-233 82.5q-192 0 -286 -241 q-69 -176 -69 -406q0 -620 379 -620q249 0 418 156l68 68q15 14 28 14q42 0 42 -38zM1210 1248q-25 -15 -51 -15t-49 3q62 -56 100 -112v124zM332 678q0 412 180 607q-192 -69 -291 -232t-99 -381t106.5 -383.5t313.5 -227.5q-210 159 -210 617z" />
+<glyph unicode="℃" horiz-adv-x="2024" d="M1957 854q0 -26 -29 -26t-35 32q-12 60 -47 178q-51 127 -151 208.5t-217 81.5t-220 -50q-298 -145 -298 -613.5t322 -606.5q96 -41 185 -41q140 0 256 85t159 218q17 52 27 140q4 33 23 33q24 0 24 -35q0 -205 -154 -353t-360 -148q-288 0 -486 213t-198 502.5 t198.5 503.5t485.5 214q193 0 363 -169l99 144q17 25 31 25q21 0 21 -33zM623.5 1296.5q89.5 -89.5 89.5 -218t-90 -218t-218 -89.5t-217.5 89.5t-89.5 218t89 218t218 89.5t218.5 -89.5zM563 921q65 65 65 158.5t-64.5 158t-158.5 64.5t-158.5 -64.5t-64.5 -158t65 -158.5 t158 -65t158 65z" />
+<glyph unicode="℄" horiz-adv-x="1370" d="M851 1284l-66 2q-156 0 -177 -36q-8 -14 -10 -35q106 -16 182.5 -73t76.5 -154.5t-97 -97.5q-42 0 -70.5 28t-28.5 70q0 94 100 99q-60 59 -163 74v-867q89 13 145 76q30 34 60.5 100t49.5 66q29 0 29 -22t-27 -75q-86 -168 -257 -197v-102q0 -52 17.5 -65.5t68.5 -13.5 h173q212 0 303 123q70 96 94 324h49l-55 -508h-1026v61q8 0 25.5 -0.5t27.5 -0.5q124 0 142 35q7 14 7 46v107q-157 37 -257 171t-100 303.5t99.5 308t257.5 176.5q0 30 -7 44q-17 33 -185 33h-10v62q71 -6 126 -6h383q47 0 120 6v-62zM424 1137q-180 -90 -180 -404 q0 -320 180 -410v814z" />
+<glyph unicode="℅" horiz-adv-x="1530" d="M1491 46.5q0 -143.5 -111 -237.5t-255.5 -94t-254.5 94.5t-110 238t110 242.5t255.5 99t255.5 -99.5t110 -243zM1303 -129q34 60 34 189t-41 189q-60 88 -174.5 88t-172.5 -91q-37 -58 -37 -190t40 -194q59 -91 176.5 -91t174.5 100zM1440 1455l-1155 -1746h-89 l1155 1746h89zM670 758q0 -12 -8 -30q-75 -165 -268 -165q-142 0 -248 96t-106 238.5t105.5 241t250.5 98.5q91 0 164 -36q92 -45 92 -127q0 -76 -83.5 -76t-83.5 75q0 56 60 72q-56 36 -147 36q-41 0 -85 -22q-121 -61 -121 -258.5t128 -259.5q45 -22 88 -22q83 0 132 43 q26 22 52.5 71.5t46.5 49.5q31 0 31 -25z" />
+<glyph unicode="℆" horiz-adv-x="1735" d="M1440 1455l-1155 -1746h-89l1155 1746h89zM1445 -183q-71 -102 -205 -102t-190 55.5t-56 195.5v250q0 67 -30 79q-10 4 -69 4h-25v65l255 17v-483q0 -75 28 -103t108 -28t129.5 62t49.5 149v252q0 56 -39 67q-8 2 -53 2h-33v65l256 17v-517q0 -56 39 -67q8 -2 52 -2h34 v-63l-251 -18v103zM670 758q0 -12 -8 -30q-75 -165 -268 -165q-142 0 -248 96t-106 238.5t105.5 241t250.5 98.5q91 0 164 -36q92 -45 92 -127q0 -76 -83.5 -76t-83.5 75q0 56 60 72q-56 36 -147 36q-41 0 -85 -22q-121 -61 -121 -258.5t128 -259.5q45 -22 88 -22 q83 0 132 43q26 22 52.5 71.5t46.5 49.5q31 0 31 -25z" />
+<glyph unicode="ℇ" horiz-adv-x="1259" d="M1245 408q0 -241 -255 -355q-189 -84 -466 -84q-207 0 -337 64q-173 85 -173 270q0 208 155 340q131 111 353 155q-124 41 -175 81q-82 62 -82 166q0 177 174 269q139 73 334 73t316 -72.5t121 -133.5q0 -29 -80 -89.5t-112 -60.5q-3 0 -7.5 1t-6.5 1q38 22 38 69 q0 98 -82 161.5t-190.5 63.5t-214.5 -73t-106 -190.5t128 -189.5q106 -59 241 -59q67 0 115 24l8 -8q-28 -83 -97 -83q-360 0 -508 -164q-89 -98 -89 -203q0 -149 126 -247.5t279 -98.5q186 0 318.5 129t132.5 315q0 83 -46 117q80 0 134 -54t54 -134z" />
+<glyph unicode="℈" horiz-adv-x="1110" d="M1080 1143q0 -150 -134 -304q-116 -131 -270 -208q176 -67 176 -218q0 -188 -216 -329q-194 -125 -400 -125t-206 131q0 74 59 135t133 61q13 0 13 -18q0 -7 -15.5 -38.5t-15.5 -53.5q0 -101 181 -101q118 0 205.5 69t87.5 184q0 171 -235 211l-65 4q-49 5 -49 20 q0 32 56 63.5t85 34.5l71 7q132 15 233 114q132 130 132 275q0 104 -98 162q-82 50 -192 50t-192 -65l-119 -122q-66 -65 -135 -65q-13 0 -13 13t8 25q93 142 259 237t332 95q124 0 216 -59q108 -68 108 -185z" />
+<glyph unicode="℉" horiz-adv-x="1971" d="M1479 1281h-252q-45 0 -64 -11.5t-19 -67.5v-501h170q132 0 171 48t39 183h48v-522h-48q0 136 -39 183.5t-171 47.5h-170v-497q0 -27 7 -44q16 -39 209 -39h37v-61q-74 6 -135 6h-373q-49 0 -121 -6v61h75q64 0 88 10q39 18 39 73v1056q0 25 -6 42q-14 39 -166 39h-30v62 h1081l54 -442h-49q-24 217 -89 291q-77 89 -286 89zM623.5 1296.5q89.5 -89.5 89.5 -218t-90 -218t-218 -89.5t-217.5 89.5t-89.5 218t89 218t218 89.5t218.5 -89.5zM563 921q65 65 65 158.5t-64.5 158t-158.5 64.5t-158.5 -64.5t-64.5 -158t65 -158.5t158 -65t158 65z" />
+<glyph unicode="ℊ" horiz-adv-x="1004" d="M99 -442q-55 0 -100 26t-45 77q0 92 174 187q55 30 258 112l74 166q-125 -145 -247 -145q-80 0 -128 60.5t-48 139.5t38 181l-48 -59l-27 17q51 71 125 152q219 238 421 238q87 0 124 -54q24 -35 24 -69v-8l59 107l247 20q-231 -391 -370 -682q207 74 381 305l28 -17 q-194 -261 -427 -325q-76 -160 -207 -283q-155 -146 -306 -146zM659 575q0 97 -79 97q-94 0 -239 -259.5t-145 -368.5q0 -29 31 -29q79 0 161.5 79t135.5 169q135 231 135 312zM19 -356q0 -25 21.5 -41t46.5 -16q131 0 282 333q-350 -162 -350 -276z" />
+<glyph unicode="ℋ" horiz-adv-x="1688" d="M2176 1284q0 -138 -187 -283q-130 -101 -312 -182l-165 -68q-257 -585 -257 -708q0 -31 40 -31q87 0 207 109t193 213l28 -17q-91 -123 -191 -211q-141 -124 -239 -124t-147 87q-39 70 -39 174t31 193.5t99 227.5q-108 -31 -209 -65q-141 -429 -480 -566 q-129 -52 -268 -52t-236 64q-112 74 -112 205q0 76 48.5 134.5t123.5 58.5q50 0 91.5 -30t41.5 -81.5t-45 -87.5q-13 -10 -108 -33q-70 -18 -70 -66q0 -62 98 -101q77 -31 151 -31q206 0 337 229q63 110 143 274q-185 -73 -358 -215l-19 23q174 149 394 229q169 348 361 576 q-169 -132 -210 -161q-160 -111 -231 -111q-40 0 -66 27t-26 67q0 62 64 149t64 92q0 18 -23 18q-127 0 -416 -354l-25 15q287 369 453 369q45 0 78 -32.5t33 -77.5q0 -69 -60.5 -146t-60.5 -84.5t21 -7.5q40 0 227 142l394 299l17 -21q-112 -110 -192 -316l-121 -353l-3 -8 l221 71q124 205 212 314q334 414 562 414q64 0 103.5 -42.5t39.5 -107.5zM2081 1248q29 60 29 91t-23.5 48t-50.5 17q-152 0 -291 -210q-88 -132 -214 -405q209 87 323 174q144 111 227 285z" />
+<glyph unicode="ℌ" horiz-adv-x="1358" d="M823 952q203 -63 329 -207t126 -343t-114 -346q-62 -80 -213.5 -196.5t-178.5 -183.5q-144 162 -276 162q-88 0 -156 -82l-23 19q175 192 304 192q105 0 245 -127q242 164 242 459q0 169 -100 323q-112 173 -269 173q-81 0 -225 -97q143 -169 143 -290t-129 -238 l-221 -182l-151 121l-74 -58l-25 27l222 176l153 -119q90 67 90 153t-78 193l-145 185q-78 116 -78 231q0 151 138 285l249 217q112 -119 233.5 -119t176.5 96l31 -10q-135 -211 -291 -211q-89 0 -244 111q-152 -106 -152 -260.5t125 -272.5q221 118 336 219z" />
+<glyph unicode="ℍ" horiz-adv-x="1676" d="M1463 76q48 0 48 -38t-35 -38h-599q-33 0 -33 39q0 36 55 36q78 0 97 19t19 92v446h-467v-457q0 -69 30 -87q20 -12 94 -12q48 0 48 -38t-35 -38h-599q-33 0 -33 39q0 36 57 36q78 0 96.5 19t18.5 92v982q0 69 -31 87q-20 11 -92 11q-49 0 -49 38.5t33 38.5h599 q35 0 35 -37.5t-57 -37.5q-78 0 -96.5 -19t-18.5 -92v-429h467v440q0 69 -31 88q-20 11 -92 11q-48 0 -48 38t33 38h599q35 0 35 -37.5t-57 -37.5q-78 0 -97 -19t-19 -92v-982q0 -69 30 -87q20 -12 95 -12zM1263 175v982q0 72 17 111h-208q18 -38 18 -100v-982 q0 -72 -17 -111h208q-18 38 -18 100zM473 175v982q0 72 17 111h-208q18 -38 18 -100v-982q0 -71 -17 -111h208q-18 38 -18 100z" />
+<glyph unicode="ℎ" horiz-adv-x="1062" d="M1062 695q0 -301 -211 -568q-119 -151 -222 -151t-103 78q0 32 22 54.5t55.5 22.5t57.5 -24t35 -24q63 0 127 168q41 110 62.5 217.5t21.5 174.5q0 162 -83.5 162t-159.5 -66q-45 -39 -117 -134q-194 -258 -264 -540q-3 -15 -11 -46q-14 -43 -46 -43q-91 0 -91 39 q0 7 4 23l310 1243q6 24 6 47q0 52 -64.5 71.5t-64.5 24.5q0 36 30 53q55 7 132 18q11 2 64.5 19t72 17t18.5 -15t-17 -83l-251 -1001q99 180 215 310q166 185 305 185q167 0 167 -232z" />
+<glyph unicode="ℏ" horiz-adv-x="1162" d="M1165 329q23 0 23 -19.5t-26 -87.5q-94 -246 -253 -246q-76 0 -124.5 49.5t-48.5 125.5q0 37 30 120q133 368 133 492q0 152 -117 152q-137 0 -236.5 -104.5t-135.5 -246.5l-118 -473q-15 -61 -26 -78q-21 -37 -67 -37q-57 0 -57 57q0 22 7 50l253 1009l-162 -59 q-19 -7 -28 -7q-29 0 -29 35q0 19 36 32l202 74l45 178q5 20 5 36q0 37 -78 40.5t-78 24.5q0 24 21 39q6 4 129.5 15t149.5 11t26 -22q0 3 -9 -33l-58 -234l376 137q19 7 28 7q29 0 29 -35q0 -19 -36 -32l-415 -151l-90 -361q135 172 322 172q111 0 176.5 -59.5t65.5 -170.5 t-137 -488q-36 -99 -36 -150q0 -72 58 -72q86 0 145 95q31 49 72 171q15 44 33 44z" />
+<glyph unicode="ℐ" horiz-adv-x="1185" d="M1293 819q0 37 -12 106l31 3q13 -71 13 -108q0 -133 -91 -233.5t-226 -147.5q-154 -311 -459 -418q-128 -45 -261 -45t-230 65q-112 74 -112 204q0 80 51.5 137t130.5 57q51 0 87.5 -32.5t36.5 -90t-57 -84.5l-107 -31q-57 -19 -57 -64q0 -59 91 -97q73 -30 143 -30 q164 0 277 135q46 53 165 275q-134 35 -220.5 124.5t-86.5 220.5q0 211 226 381q166 125 418.5 205.5t507.5 83.5l1 -31q-139 0 -225 -113q-70 -92 -136 -286q-25 -76 -70 -238.5t-95 -286.5q115 48 190.5 136t75.5 203zM516 636q0 -152 205 -189l173 361q104 204 222.5 349 t290.5 240q-130 -17 -239 -45q-202 -52 -369.5 -206.5t-248.5 -353.5q-34 -84 -34 -156z" />
+<glyph unicode="ℑ" horiz-adv-x="1257" d="M1147 1339q-18 -110 -96 -188t-189 -78t-260.5 108.5t-243.5 108.5t-152.5 -55.5t-58.5 -133t51.5 -125.5t123.5 -48q32 0 57 8l8 -33q-34 -12 -70 -12q-93 0 -154 64t-61 157q0 126 103 208.5t221.5 82.5t224.5 -58q19 -11 161 -107q84 -58 144.5 -58t105 51.5 t58.5 122.5zM1135 920q-68 63 -110.5 63t-69.5 -22.5t-27 -55.5q0 -51 109.5 -219.5t109.5 -282.5q0 -186 -173 -305q-153 -106 -347 -106q-132 0 -227 71q-38 28 -127 132q-61 71 -117.5 71t-94.5 -80l-38 2q31 74 97 123t153 49t174 -80l140 -149q85 -80 174 -80t166 65.5 t77 159.5t-105.5 265t-105.5 264.5t58 157t142 63.5t162 -78z" />
+<glyph unicode="ℒ" horiz-adv-x="1465" d="M1744 1260q0 -162 -226 -385q-193 -190 -377 -278l-44 -21q-59 -165 -129.5 -268.5t-200.5 -198.5q173 -82 277 -82q202 0 428 307l26 -17q-250 -325 -480 -325q-106 0 -297 89q-164 -100 -360 -100q-91 0 -169 29q-106 39 -106 110.5t70 106.5q56 28 131 28 q129 0 342 -86q74 141 171 364q-34 -3 -57 -3q-162 0 -282.5 113.5t-120.5 274.5q0 217 240 373q215 139 444 139q80 0 173 -23l-9 -29q-86 20 -160 20q-238 0 -404 -168t-166 -394q0 -134 77 -204.5t212 -70.5q27 0 66 5q287 667 584 826q90 48 164 48t128.5 -51.5 t54.5 -128.5zM1658 1317q0 93 -103 93q-126 0 -227 -161q-73 -118 -139 -337l-81 -296q360 171 513 558q37 94 37 143zM287 225q-55 0 -112.5 -26t-57.5 -74q0 -60 92 -92q66 -22 142 -22q119 0 188 48q23 16 70 79q-199 87 -322 87z" />
+<glyph unicode="ℓ" horiz-adv-x="863" d="M945 1347q0 -312 -361 -725q-56 -64 -112 -118l-93 -92q-7 -8 -7 -58q0 -102 39 -190q51 -113 140 -113q107 0 297 188h7q20 0 20 -23q0 -43 -120 -129.5t-208 -86.5q-245 0 -306 255q-107 -112 -131.5 -112t-24.5 19.5t144 159.5q-12 81 -12 154q0 344 207 735 q63 119 168 220t213 101q140 0 140 -185zM892 1365q0 116 -78 116q-90 0 -213 -249q-84 -168 -148 -373t-68 -366q507 539 507 872z" />
+<glyph unicode="℔" horiz-adv-x="1670" d="M53 66l68 -2q98 0 98 98v919h-112q-68 0 -68 41t68 41h112v114q0 87 -44 108q-21 10 -106 10h-16v67l306 23v-322h371v114q0 88 -47 109q-20 10 -85 10q-16 0 -35 -1v67l307 23v-322h377q68 0 68 -41t-68 -41h-377v-274q121 139 303.5 139t313 -145.5t130.5 -342 t-139 -339.5t-327.5 -143t-290.5 157q-24 -46 -77 -133h-53v1081h-371v-919q0 -50 13.5 -69t49.5 -23q29 -4 81 -4h24v-66q-220 6 -247.5 6t-226.5 -6v66zM1375 162q64 99 64 300t-60 299q-85 138 -225 138q-91 0 -184 -64t-93 -150v-442q0 -45 30 -89q89 -130 234 -130 t234 138z" />
+<glyph unicode="ℕ" horiz-adv-x="1540" d="M1347 1343q33 0 33 -33.5t-29 -40.5l-53 -4q-50 -9 -63 -51q-7 -22 -7 -87v-1130q0 -34 -36 -34q-19 0 -30 14l-851 1125v-884q0 -89 28.5 -116t118.5 -27q36 0 36 -37.5t-36 -37.5h-370q-35 0 -35 39q0 34 44 36q66 3 83 13q44 24 44 112v1009q-53 59 -113 59 q-33 0 -33 37.5t33 37.5h407q14 0 26 -16l596 -802v596q0 92 -27 119.5t-119 27.5q-36 0 -36 37.5t36 37.5h353zM1140 129v269l-646 870h-214z" />
+<glyph unicode="№" horiz-adv-x="1954" d="M1795 853q89 -91 89 -224.5t-78 -223.5t-208.5 -90t-221 98t-90.5 229t78 216.5t210 85.5t221 -91zM1884 0h-598v112h598v-112zM1273 1370q63 0 112.5 -32.5t49.5 -84t-31 -80.5t-74.5 -29t-90 29t-67.5 29q-53 0 -66 -90q-3 -23 -3 -128v-1015h-45l-619 1107v-652 q0 -167 -10 -228q-24 -141 -109 -189q-65 -38 -136 -38t-119.5 31t-48.5 83t30.5 78.5t72.5 26.5t95 -28.5t74 -28.5q51 0 62 121q1 15 1 154v697q0 91 -5 114q-13 62 -60.5 81.5t-129.5 20.5v37h355l504 -913v435q0 191 5 233q17 141 86.5 200t166.5 59zM1738 526 q0 111 -39 223q-51 148 -139 148q-119 0 -119 -176q0 -109 41 -218q54 -142 145 -142q111 0 111 165z" />
+<glyph unicode="℗" horiz-adv-x="1975" d="M1915 547q0 -384 -271.5 -655.5t-655 -271.5t-656 272t-272.5 655.5t272 655t656 271.5t655.5 -271.5t271.5 -655.5zM1585.5 -51q247.5 248 247.5 598.5t-247 597.5t-597.5 247t-597.5 -247.5t-247 -597t247.5 -598t597 -248.5t597 248zM1171 1151q162 0 298 -95 t136 -247t-132 -246t-287 -94h-287v-410q0 -39 15.5 -49t49.5 -12q20 -2 54 -2q28 0 66 1v-86q-84 7 -135 7h-293q-42 0 -125 -7v86q56 -1 71 -1q93 0 106 25q5 10 5 29v954q0 25 -5 38q-10 24 -120 24q-26 0 -57 -1v86h640zM1391 806q0 138 -63.5 198.5t-202.5 60.5h-168 q-42 0 -52 -8.5t-10 -47.5v-464h230q266 0 266 261z" />
+<glyph unicode="℘" horiz-adv-x="1518" d="M1428 1015q0 -156 -83 -296t-221 -239t-241.5 -99t-168 53t-64.5 133t35.5 135t101.5 55q74 0 74 -73q0 -30 -22 -52.5t-83 -40.5q-43 -12 -43 -57t49 -77t101 -32t124 46q116 74 192 253.5t76 331.5q0 72 -39.5 129t-105.5 57t-129 -30q-124 -59 -291 -211t-276 -287 q145 -297 145 -435q0 -84 -34 -165.5t-95.5 -119t-113 -37.5t-109.5 30q-117 61 -117 217q0 97 54 204q29 58 114 181q-61 150 -61 244q0 185 158 366q122 141 318 258l26 -43q-341 -202 -341 -494q0 -83 32 -157q346 367 499 454.5t274.5 87.5t193 -84.5t71.5 -205.5z M431 151q0 132 -150 387q-84 -130 -99 -158q-46 -90 -46 -172.5t46 -143t113.5 -60.5t101.5 42.5t34 104.5z" />
+<glyph unicode="ℙ" horiz-adv-x="1207" d="M681 599l-86 2q-14 0 -57 -1v-418q0 -78 33 -96q20 -11 107 -11q34 0 34 -37.5t-34 -37.5h-591q-34 0 -34 39q0 36 40 36q84 0 102.5 16.5t18.5 94.5v975q0 71 -18 89t-94 18q-49 0 -49 37.5t34 37.5h596q214 0 347 -78q165 -96 165 -289t-171 -294q-142 -83 -343 -83z M1120 970q0 219 -250 278q59 -79 59 -271.5t-63 -279.5q254 69 254 273zM821 766q33 64 33 209.5t-30 204.5q-44 88 -180 88q-39 0 -72.5 -19.5t-33.5 -55.5v-518h105q130 0 178 91zM289 1161v-975q0 -72 -15 -111h208q-19 39 -19 107v1011q0 42 23 75h-213q16 -38 16 -107z " />
+<glyph unicode="ℚ" horiz-adv-x="1493" d="M1261 -223l127 17q37 0 37 -38q0 -46 -144 -76.5t-224 -30.5q-168 0 -311.5 94t-210.5 248q-233 64 -357.5 248t-124.5 432q0 315 192 511.5t507 196.5t506.5 -196.5t191.5 -511.5q0 -260 -135.5 -446.5t-384.5 -241.5q46 -94 136 -150t195 -56zM1033 95 q165 72 253.5 223.5t88.5 354.5t-91 354.5t-254 222.5q145 -178 145 -576.5t-142 -578.5zM402 671q0 -634 349 -634t349 634t-349 634t-349 -634zM128 671q0 -417 340 -574q-141 182 -141 576.5t144 575.5q-162 -72 -252.5 -223t-90.5 -355zM853 -26q-47 -12 -108 -12 t-119 20q151 -258 431 -258q15 0 50 4q-148 54 -254 246z" />
+<glyph unicode="ℛ" horiz-adv-x="1828" d="M1943 1085q0 -103 -94 -200q-117 -122 -372 -183q104 -98 104 -235q0 -66 -35.5 -199.5t-35.5 -196.5q0 -35 23 -35q83 0 302 298l27 -17q-240 -341 -412 -341q-79 0 -130.5 51t-51.5 135.5t78 235.5t78 223q0 34 -20 69q-43 -6 -73 -6q-61 0 -61 31q0 42 63 42 q45 0 113 -32q120 15 206.5 153t86.5 265.5t-121 198.5q-111 -49 -176 -136q-100 -133 -186 -422q-26 -95 -89 -278q-60 -141 -158 -257q-226 -268 -581 -268q-144 0 -241 61q-115 72 -115 209q0 78 52.5 133.5t129.5 55.5q50 0 88.5 -34t38.5 -90.5t-57 -82.5l-107 -31 q-57 -18 -57 -64q0 -61 95 -98q74 -29 147 -29q159 0 275 128q79 87 218 381q51 108 160 318q209 365 528 522q-111 39 -261 39q-248 0 -506.5 -100t-406.5 -275q-103 -122 -103 -252q0 -68 40 -113.5t114.5 -45.5t169.5 70q252 185 273 517h30q14 -95 14 -172 q0 -196 -118 -328.5t-312 -132.5q-102 0 -173 53.5t-71 152.5q0 135 110 268q147 178 413.5 283t517.5 105q156 0 326 -44q89 31 154 48l7 -28q-62 -17 -116 -35q258 -99 258 -285z" />
+<glyph unicode="ℜ" horiz-adv-x="1458" d="M988 376v68q1 45 1 66q0 69 -29 131q-36 78 -98 78q-14 0 -127 -47q0 -167 -20 -256q-30 -133 -119 -223q-43 -44 -137.5 -106.5t-130.5 -94.5l-125 141l-68 -51l-22 29l217 168l123 -146q57 31 75 79q13 34 13 112v585q0 432 -217 432q-75 0 -135 -51.5t-60 -125 t64 -133.5l120 -102q64 -68 64 -157t-47 -162.5t-125 -95.5l-6 33q96 39 96 110q0 54 -68 109q-120 96 -126 103q-68 72 -68 169q0 140 100.5 246.5t239.5 106.5q112 0 210 -56.5t119 -156.5q179 87 357 217l160 -124q73 -74 73 -186q0 -170 -256 -286q102 -70 128 -244 q8 -140 18 -277t78 -137q28 0 83 56l23 -31l-219 -174q-159 89 -159 384zM1122 1020q0 82 -61 144.5t-143 62.5q-57 0 -205 -88q22 -102 22 -426q187 69 245 104q142 85 142 203z" />
+<glyph unicode="ℝ" horiz-adv-x="1548" d="M1366 75q33 0 33 -37.5t-33 -37.5h-339q-16 0 -25 14l-387 598h-65v-430q0 -71 23 -89t87 -18t64 -36q0 -39 -34 -39h-603q-34 0 -34 39q0 36 67.5 36t87 19t19.5 92v975q0 71 -23.5 89t-87 18t-63.5 37.5t34 37.5h645q201 0 346 -81q177 -99 177 -285q0 -281 -342 -343 q356 -559 453 -559zM925 713q255 58 255 261.5t-263 271.5q72 -88 72 -269t-64 -264zM596 686q186 0 252 54.5t66 221t-54.5 236.5t-200.5 70q-109 0 -109 -75v-507h46zM1231 75q-147 136 -411 564q-48 -17 -118 -24l350 -540h179zM302 1161v-975q0 -71 -18 -111h210 q-19 40 -19 107v1011q0 42 22 75h-214q19 -40 19 -107z" />
+<glyph unicode="℞" horiz-adv-x="1596" d="M802 -1l-286 7h-326q-50 0 -122 -6v61l55 -1q122 0 140 38q7 15 7 48v1051q0 32 -7 48q-16 37 -158 37q-18 0 -37 -1v62h695q174 0 311 -94q154 -106 154 -272q0 -112 -74.5 -196t-188.5 -127q10 -27 144 -195l105 131q26 32 26 58q0 45 -52 47v68q95 -7 164 -7t160 7 v-68q-127 -2 -210 -87q-25 -26 -159 -196l233 -299q30 -39 77 -48q24 -5 91 -5v-66q-81 5 -150 5t-220 -5v66q63 2 63 38q0 10 -165 225q-151 -173 -151 -216t51 -47v-66q-121 5 -170 5zM1024 977q0 161 -75.5 232.5t-237.5 71.5h-186q-53 0 -69.5 -13t-16.5 -66v-532h272 q313 0 313 307zM779 619h-335v-467q0 -32 7 -48q20 -44 198 -44q133 0 226 103q5 6 161 206l-196 254q-31 -4 -61 -4z" />
+<glyph unicode="℟" horiz-adv-x="1508" d="M1440 173q0 -86 -51 -151t-135 -65q-330 0 -330 318q0 13 1 40v40q0 158 -76 230q-64 61 -165 67l-245 -526q2 -18 7 -31q14 -34 171 -34h26v-61q-74 6 -143 6h-117l-98 -211q-23 -49 -48 -49q-8 0 -24.5 7.5t-16.5 26t15 49.5l82 177h-82q-69 0 -143 -6v61 q6 0 24.5 -0.5t28.5 -0.5q125 0 142 35q7 15 7 46v1055q0 27 -6 45q-14 40 -167 40h-29v62h618q106 0 215 -34l28 60l-320 148q-48 22 -48 47q0 42 37 42q16 0 46 -14l333 -155q47 -22 47 -44q0 -14 -15 -46l-31 -67q221 -101 221 -288q0 -122 -115 -213q-94 -75 -229 -108 q165 -57 224 -182q25 -52 39 -149l25 -182q31 -158 118 -158q101 0 131 175q5 31 24 31q24 0 24 -33zM997 992q0 130 -61 199l-230 -493q291 19 291 294zM540 1283q-51 0 -69 -7q-32 -14 -32 -57v-523h176l254 545q-85 42 -329 42zM439 652v-333l155 333h-155z" />
+<glyph unicode="℠" horiz-adv-x="2174" d="M2122 1435l-78 2q-78 0 -78 -45v-707q0 -13 5 -23q9 -17 136 -17h15v-67q-72 5 -99 5h-266q-23 0 -95 -5v67q116 0 136 7t20 34v706l-349 -781q-14 -32 -39 -32t-41 36l-344 767v-656q0 -81 152 -81h4v-66q-160 4 -188.5 4t-190.5 -4v66h4q152 0 152 81v670q0 12 -4 21 q-8 18 -138 18h-14v67h275q43 0 59 -36l317 -710l319 714q14 32 49 32h281v-67zM512 1115q105 -27 170.5 -100.5t65.5 -187.5t-92.5 -195.5t-218.5 -81.5q-175 0 -276 86q-64 -86 -81 -86q-28 0 -28 32v288q0 32 31 32q36 0 36 -60q0 -90 85 -158t232 -68q78 0 134 50 t56 119.5t-43.5 118t-140.5 69.5l-183 39q-90 29 -148.5 96t-58.5 157q0 118 93 193t220 75t234 -87q62 87 78 87q31 0 31 -34v-287q0 -31 -34 -31q-22 0 -28 25l-21 80q-58 185 -265 185q-74 0 -130 -44t-56 -116q0 -104 126 -148z" />
+<glyph unicode="℡" horiz-adv-x="3030" d="M2631 858l-90 2q-87 0 -99 -19q-5 -8 -5 -25v-710q0 -30 9.5 -35t43.5 -5h133q155 0 215 69.5t79 229.5h63l-45 -365h-813v66q8 0 28 -0.5t31 -0.5q84 0 93 18q4 8 4 20v721q0 11 -4 19q-8 15 -136 15h-16v68q68 -5 100 -5h314q25 0 95 5v-68zM1122 0v66q53 -1 54 -1 q88 0 98 19q4 7 4 26v704q0 16 -5 26q-8 17 -102 17q-22 0 -49 -1v67h876l47 -321h-64q-19 153 -75.5 203.5t-211.5 50.5h-202q-36 0 -45.5 -5t-9.5 -35v-304h124q97 0 124 28.5t27 124.5h65v-374h-65q0 96 -27.5 125t-123.5 29h-124v-339q0 -30 9.5 -35t45.5 -5h210 q172 0 237 67q53 56 85 232h64l-70 -365h-896zM688 857q-53 0 -53 -31v-716q0 -14 6 -25q10 -19 169 -19h46v-67q-80 5 -123 5h-354q-44 0 -124 -5v67q10 0 36 -0.5t40 -0.5q129 0 140 20q4 8 4 25v717q0 30 -60 30q-188 0 -236.5 -38.5t-65.5 -216.5h-62l30 321h950 l30 -321h-63q-17 182 -72 222q-44 33 -238 33z" />
+<glyph unicode="™" horiz-adv-x="2444" d="M2392 1435l-78 2q-78 0 -78 -45v-707q0 -13 5 -23q9 -17 136 -17h15v-67q-72 5 -99 5h-266q-23 0 -95 -5v67q116 0 136 7t20 34v706l-349 -781q-14 -32 -39 -32t-41 36l-344 767v-656q0 -81 152 -81h4v-66q-160 4 -188.5 4t-190.5 -4v66h4q152 0 152 81v670q0 12 -4 21 q-8 18 -138 18h-14v67h275q43 0 59 -36l317 -710l319 714q14 32 49 32h281v-67zM688 1436q-53 0 -53 -31v-716q0 -14 6 -25q10 -19 169 -19h46v-67q-80 5 -123 5h-354q-44 0 -124 -5v67q10 0 36 -0.5t40 -0.5q129 0 140 20q4 8 4 25v717q0 30 -60 30q-188 0 -236.5 -38.5 t-65.5 -216.5h-62l30 321h950l30 -321h-63q-17 182 -72 222q-44 33 -238 33z" />
+<glyph unicode="℣" horiz-adv-x="1536" d="M814 -6q-14 -37 -46.5 -37t-48.5 43l-165 436l-299 -641q-23 -49 -48 -49q-41 0 -41 37q0 14 15 46l333 714l-252 666q-22 57 -81 71q-20 5 -67 5q-20 0 -46 -1v62q213 -6 336 -6t196 6v-62h-18q-144 0 -144 -56q0 -31 172 -477l289 618l-320 148q-48 22 -48 47 q0 42 37 42q16 0 46 -14l333 -155q47 -22 47 -44q0 -14 -15 -46l-328 -702l175 -448l361 950q9 24 9 40q0 94 -143 97v62q153 -6 237.5 -6t177.5 6v-62q-164 -1 -214 -132z" />
+<glyph unicode="ℤ" horiz-adv-x="1351" d="M1157 0h-1069q-35 0 -35 39q0 10 749 1229h-147q-326 0 -431 -191l-23 -73q-16 -50 -43 -50q-37 0 -37 33v7l35 314q4 35 33 35h961q35 0 35 -37q0 -12 -4 -19l-744 -1212h277q135 0 247 66.5t173 184.5l38 121q12 32 37 32q37 0 37 -29q0 -3 -1 -7l-56 -407 q-5 -36 -32 -36zM318 1268h-91l-8 -74q42 43 99 74zM1081 1268h-191l-731 -1193h190zM1135 192q-59 -70 -139 -117h123z" />
+<glyph unicode="℥" horiz-adv-x="904" d="M755.5 304.5q112.5 -119.5 112.5 -305.5t-132 -309.5t-330 -123.5q-121 0 -215 54q-113 64 -113 170t97 106q42 0 70.5 -28t28.5 -70q0 -94 -100 -99q79 -78 229 -78q59 0 120 34q168 94 168 344q0 112 -44.5 210.5t-133.5 146.5q-63 34 -123 34q-113 0 -181 -64 q-40 -37 -74 -109.5t-53 -72.5q-29 0 -29 22.5t32.5 84.5t116.5 133l436 370h-504q-43 0 -43 29q0 17 20 36l517 476h-193q-147 0 -211 -51t-73 -188h-54l19 287h665q43 0 43 -28q0 -16 -20 -34l-520 -479h507q43 0 43 -28q0 -17 -20 -34l-348 -299q177 -17 289.5 -136.5z " />
+<glyph unicode="Ω" horiz-adv-x="1462" d="M984 0q-25 0 -31.5 7t-6.5 33q0 150 101 423t101 423q0 184 -117 322t-300 138t-300 -138t-117 -322q0 -150 101.5 -423t101.5 -423q0 -40 -39 -40h-347l-64 320h49q17 -111 36.5 -144t36.5 -40.5t57 -7.5h214q-27 111 -120 256q-144 223 -153 240q-76 141 -76 272 q0 220 204 364q185 130 416 130t416 -130q204 -144 204 -364q0 -131 -76 -272q-9 -18 -153 -240q-93 -145 -120 -256h214q40 0 57 7.5t36.5 40.5t36.5 144h49l-64 -320h-347z" />
+<glyph unicode="℧" horiz-adv-x="1462" d="M1216 1215h-214q27 -111 120 -256q144 -223 153 -240q76 -141 76 -272q0 -220 -204 -364q-185 -130 -416 -130t-415 130q-205 144 -205 364q0 131 76 272q9 17 153 240q93 145 120 256h-214q-40 0 -57 -7.5t-36.5 -40.5t-36.5 -144h-49l64 320h347q39 0 39 -40 q0 -150 -101.5 -423t-101.5 -423q0 -184 117 -322t300 -138t300 138t117 322q0 150 -101 423t-101 423q0 26 6.5 33t31.5 7h347l64 -320h-49q-17 111 -36.5 144t-36.5 40.5t-57 7.5z" />
+<glyph unicode="ℨ" horiz-adv-x="1358" d="M1184 164q0 -236 -187 -373q-167 -123 -411 -123q-174 0 -270 94q-44 43 -110 173q-47 94 -102 94q-76 0 -86 -103h-32q9 76 66.5 123t133.5 47q122 0 195 -100l112 -186q71 -101 189 -101q291 0 291 402q0 483 -252 483q-146 0 -197 -141l-30 16q39 103 149 143 q-95 39 -143 125l26 21q70 -117 174 -117q123 0 187 101q55 85 55 212q0 169 -72 272q-82 117 -243 117q-138 0 -255.5 -87.5t-117.5 -221.5q0 -54 20 -98l-26 -14q-27 60 -27 116q0 155 132 248.5t306 93.5t315 -96q161 -109 161 -289q0 -135 -108 -239q-91 -88 -234 -135 q179 -38 285 -157.5t106 -299.5z" />
+<glyph unicode="℩" horiz-adv-x="748" d="M396 662q0 231 -148 231q-102 0 -131 -139q-12 -56 -12 -182v-37h-53v122q0 114 48 194q58 96 164 96q133 0 203 -78t70 -212v-473q0 -86 41 -106q20 -11 103 -11h14v-67l-299 -23v685z" />
+<glyph unicode="K" horiz-adv-x="2219" d="M1349 1284l-57 2q-126 0 -142 -40q-6 -15 -6 -44v-636l618 588q36 34 36 67q0 61 -91 63v62q69 -6 217.5 -6t201.5 6v-62q-160 -2 -281 -118l-356 -340l456 -670q42 -62 83.5 -78.5t122.5 -16.5v-61q-127 6 -281.5 6t-225.5 -6v61h4q113 0 113 59q0 22 -31 68l-357 528 l-229 -218v-359q0 -28 9 -45q17 -33 186 -33h10v-61q-71 6 -120 6h-347q-43 0 -114 -6v61q8 0 26.5 -0.5t28.5 -0.5q125 0 141 40q6 15 6 44v1066q0 27 -7 41q-16 33 -176 33h-19v62q70 -6 119 -6h342q50 0 120 6v-62zM623.5 1296.5q89.5 -89.5 89.5 -218t-90 -218 t-218 -89.5t-217.5 89.5t-89.5 218t89 218t218 89.5t218.5 -89.5zM563 921q65 65 65 158.5t-64.5 158t-158.5 64.5t-158.5 -64.5t-64.5 -158t65 -158.5t158 -65t158 65z" />
+<glyph unicode="Å" horiz-adv-x="1484" d="M1417 0q-127 6 -297.5 6t-244.5 -6v61h5q157 0 157 59q0 29 -39 136l-70 192h-487l-61 -163q-34 -90 -34 -123q0 -51 52 -78q42 -23 97 -23v-61q-189 6 -239.5 6t-187.5 -6v61q174 2 219 133l358 1029q-104 58 -104 178q0 84 58.5 144.5t142.5 60.5t142.5 -59.5 t58.5 -143.5q0 -121 -104 -180l374 -1083q21 -61 84 -75q19 -5 77 -5q19 0 43 1v-61zM873 1403q0 54 -38.5 93.5t-92 39.5t-92.5 -40.5t-39 -94.5t38.5 -93.5t92 -39.5t92.5 40.5t39 94.5zM906 510l-222 641l-220 -641h442z" />
+<glyph unicode="ℬ" horiz-adv-x="1734" d="M1828 1119q0 -127 -133 -234q-73 -58 -245 -143q251 -100 251 -297q0 -169 -165.5 -314t-336.5 -145q-66 0 -110 37t-44 101q0 179 214 295l16 -27q-80 -43 -139 -116t-59 -154q0 -40 25.5 -70.5t64.5 -30.5q81 0 189 165q129 198 129 380q0 109 -79 159 q-82 -31 -129.5 -31t-47.5 31q0 46 80 46q42 0 95 -15q99 36 165.5 172.5t66.5 253.5t-72 164q-161 -88 -240 -238q-42 -80 -111 -323l-42 -148q-83 -294 -276 -466q-209 -187 -501 -187q-146 0 -243 60q-116 73 -116 211q0 81 49 135.5t128 54.5q49 0 88.5 -31.5 t39.5 -86.5t-57 -86l-108 -39q-55 -19 -55 -56q0 -62 96 -101q75 -30 149 -30q157 0 273 132q74 82 163 270l129 271q150 314 323 478q116 110 279 196q-117 42 -276 42q-245 0 -488 -87.5t-383 -254.5q-104 -124 -104 -243q0 -65 40.5 -110.5t110 -45.5t169.5 65 q126 82 204.5 216.5t89.5 285.5l27 8q14 -93 14 -151q0 -184 -94 -306q-127 -165 -341 -165q-104 0 -178 51.5t-74 151.5q0 128 111 260q150 178 395.5 267t505.5 89q167 0 327 -45q55 25 147 49l8 -29q-67 -19 -114 -37q199 -88 199 -254z" />
+<glyph unicode="ℭ" horiz-adv-x="1257" d="M713 -8q-277 0 -451 226q-160 208 -160 493q0 216 74 405q98 250 279 250q139 0 188 -160l154 193q148 -96 233 -96t139 71l29 -16q-125 -182 -278 -182q-78 0 -201 65q-70 -70 -70 -129q0 -84 106.5 -256t106.5 -260q0 -167 -182 -326l-21 29q66 56 66 138.5 t-96.5 245.5t-96.5 259.5t82 224.5q-8 63 -47 110.5t-98 47.5q-207 0 -207 -465q0 -287 95 -473q123 -242 382 -242q348 0 453 224h33q-133 -377 -512 -377z" />
+<glyph unicode="℮" horiz-adv-x="1188" d="M1120 648q0 -34 -8.5 -42t-42.5 -8h-755v-294q0 -15 33 -77q101 -194 326 -194q267 0 382 267q14 33 30 33q28 0 28 -33t-41 -100q-64 -105 -176 -164.5t-237 -59.5q-262 0 -426.5 173t-164.5 437q0 229 165.5 396t387.5 167t360.5 -143t138.5 -358zM921 644v211 q-90 243 -293 243q-225 0 -314 -245v-209h607z" />
+<glyph unicode="ℯ" horiz-adv-x="940" d="M966 236q0 -17 -46 -67q-179 -193 -439 -193q-157 0 -243 112.5t-86 282.5t92 315.5t252 221.5q107 51 205.5 51t167 -48.5t68.5 -134.5q0 -183 -230 -243q-118 -30 -377 -30q-34 -147 -34 -224q0 -260 191 -260q221 0 365 148q90 93 92 93q22 0 22 -24zM872 776 q0 66 -47 102.5t-115 36.5q-139 0 -243 -119q-85 -98 -128 -249h110q423 0 423 229z" />
+<glyph unicode="ℰ" horiz-adv-x="1204" d="M1429 1172q0 -100 -63.5 -183t-161.5 -83q-63 0 -102 45t-39 109q0 121 157 215l20 -22q-122 -103 -122 -220q0 -40 25.5 -69.5t65.5 -29.5q82 0 135 77.5t53 168.5t-61 155.5t-157 64.5q-140 0 -251.5 -125t-111.5 -267q0 -71 33 -137q31 1 68.5 1t98.5 -16 q87 -23 87 -66q0 -49 -79 -49q-100 0 -232 78q-168 -54 -275 -213.5t-107 -340.5q0 -252 261 -252q156 0 278 82t168 228q16 51 16 100t-35.5 92t-104.5 43t-141 -74q-116 -119 -120 -315h-31q-25 61 -25 123q0 126 86.5 215t212.5 89q81 0 136.5 -51.5t55.5 -131.5 q0 -148 -119 -275q-147 -157 -381 -157q-197 0 -334 107q-156 122 -156 312t190 321q151 103 370 139q-120 109 -120 244.5t132 236.5t346 101q146 0 233 -60q101 -70 101 -210zM1010 773q38 0 38 22t-47.5 34t-73.5 12t-55 -4q68 -64 138 -64z" />
+<glyph unicode="ℱ" horiz-adv-x="1414" d="M1623 1225q-100 0 -284.5 77.5t-292.5 77.5q-168 0 -338 -100q-135 -79 -232.5 -201t-97.5 -257q0 -72 44 -123.5t115 -51.5q115 0 249 202q104 157 104 280q0 58 -28 127l31 7q70 -156 70 -277q0 -156 -117.5 -264.5t-274.5 -108.5q-99 0 -162.5 55t-63.5 152 q0 206 210 387q270 233 639 233q103 0 189 -16q274 -51 351 -51t146 60l24 -17q-126 -191 -281 -191zM1563 793q0 -47 -46 -94q-16 -15 -86 -68q-2 -165 -61 -261q-94 -15 -165 -34q75 118 130 260q-56 -18 -110 -23q-36 -145 -136 -280q-234 -314 -615 -314 q-181 0 -269.5 83t-88.5 186q0 77 51.5 133.5t128.5 56.5q48 0 88.5 -31.5t40.5 -85t-56 -83.5l-104 -39q-56 -23 -56 -63t63.5 -81.5t164.5 -41.5q157 0 271 130q69 79 159 269l69 146q-194 -29 -346 -178l-22 23q93 89 176 131t206 58q215 441 490 613l22 -22 q-59 -42 -89 -102t-65 -197l-74 -277q57 5 116 25q40 104 56 133q46 81 101.5 81t55.5 -53zM1528 791q0 23 -24 23q-48 0 -69 -141q93 67 93 118z" />
+<glyph unicode="Ⅎ" horiz-adv-x="1271" d="M1203 0h-1081l-54 442h49q24 -217 89 -291q77 -89 286 -89h252q45 0 64 11.5t19 67.5v501h-170q-132 0 -171 -48t-39 -183h-48v522h48q0 -136 39 -183.5t171 -47.5h170v497q0 27 -7 44q-16 39 -209 39h-37v61q74 -6 135 -6h373q49 0 121 6v-61h-75q-64 0 -88 -10 q-39 -18 -39 -73v-1056q0 -25 6 -42q14 -39 166 -39h30v-62z" />
+<glyph unicode="ℳ" horiz-adv-x="2418" d="M2539 1341q109 87 142 87t33 -21.5t-47 -87.5t-125 -201.5t-129 -241.5q-347 -726 -347 -829q0 -31 29 -31q54 0 177 132q90 96 153 186l28 -17q-253 -337 -384 -337q-76 0 -117 72t-41 153q0 246 275 626q133 184 460 546q-373 -239 -846 -960l-164 -243 q-29 -43 -91 -123q-61 -69 -96.5 -69t-72 48.5t-36.5 147.5q0 243 229 617q112 182 397 556q-221 -192 -586 -648q-249 -310 -692 -599q-186 -121 -222 -121t-36 25q0 14 45 59q493 488 622 937q32 111 32 198q0 201 -205 201q-236 0 -482.5 -214t-246.5 -446 q0 -81 47.5 -139t127.5 -58q135 0 278.5 223t143.5 375q0 32 -9 95l28 6q48 -138 48 -258q0 -154 -85.5 -277.5t-230.5 -174.5q-71 -25 -137 -25q-110 0 -176.5 62.5t-66.5 171.5q0 182 156 364q134 158 306 244.5t337 86.5t282.5 -93.5t117.5 -255.5q0 -299 -445 -786 q260 204 471.5 467t273.5 332q163 185 317 299q34 25 49 25q29 0 29 -23q0 -11 -13 -34q-158 -275 -350 -774l-118 -315q-27 -75 -74 -228q62 64 271 382q408 621 766 906z" />
+<glyph unicode="ℴ" horiz-adv-x="854" d="M458 247l9 -125q0 -13 -19.5 -13t-22.5 11q-9 37 -9 142.5t38.5 246.5t104 216t129.5 75q142 0 142 -194t-115 -397q-132 -233 -303 -233q-143 0 -217.5 91.5t-74.5 237.5q0 243 165.5 448.5t402.5 205.5q70 0 123 -40.5t53 -108.5q0 -17 -21.5 -17t-21.5 20 q0 47 -36.5 76.5t-84.5 29.5q-180 0 -304 -261q-103 -217 -103 -429t119 -212q151 0 261 230q92 194 92 366q0 147 -75 147q-61 0 -123 -96q-50 -77 -79.5 -196.5t-29.5 -220.5z" />
+<glyph unicode="ℵ" horiz-adv-x="1417" d="M248 1363l-14 -72q0 -86 94 -182q73 -75 135 -126l360 -297l264 330q-126 102 -126 190q0 139 181 175q-38 -54 -38 -93q0 -64 111.5 -157.5t111.5 -171.5t-89 -128q-28 94 -102 149l-268 -333l213 -179q145 -130 178 -196q21 -42 21 -81q0 -88 -78 -175q-48 -53 -67 -53 t-19 17q0 8 13 43t13 57q0 73 -77 154q-26 28 -135 118l-586 485q-124 -148 -124 -251.5t138 -241.5t138 -215q0 -166 -250 -166q-83 0 -83 31q0 3 46.5 31t46.5 73.5t-51 151.5t-62.5 146.5t-11.5 104.5q0 155 175 368l-142 136q-74 71 -74 149q0 47 26 98q66 129 112 129 q20 0 20 -18z" />
+<glyph unicode="ℶ" horiz-adv-x="1366" d="M1186 179l40 2q50 0 50 -41q0 -17 -9 -26l-109 -104q-10 -10 -27 -10h-1006q-35 0 -35 39q0 17 14 33.5t66 61.5t67 45h871v804q0 60 -86 60h-450q-191 0 -272 38q-122 57 -122 226q0 74 35 74q17 0 41 -45.5t29 -50.5q61 -62 289 -62h456q101 0 135 -60q23 -42 23 -152 v-832z" />
+<glyph unicode="ℷ" horiz-adv-x="950" d="M757 1223q103 0 103 -91q0 -89 -101 -89h-2q0 -22 35 -366t35 -552t-76 -208q-48 0 -66 167q-80 -84 -98 -84h-462q-35 0 -35 39q0 17 15 34.5t66 61.5t66 44h441v864q-19 0 -61 -0.5t-63 -0.5q-178 0 -261 43q-115 60 -115 222q0 74 35 74q17 0 41.5 -46t28.5 -50 q58 -62 289 -62h185z" />
+<glyph unicode="ℸ" horiz-adv-x="1297" d="M1103 1223q104 0 104 -91q0 -89 -102 -89h-2q0 -27 35.5 -371.5t35.5 -549.5t-76 -205q-39 0 -60 119q-14 82 -14 159v848h-541q-191 0 -271 38q-122 57 -122 226q0 74 35 74q17 0 42.5 -46.5t28.5 -49.5q58 -62 287 -62h620z" />
+<glyph unicode="ℹ" horiz-adv-x="922" d="M831 1267q0 -68 -54 -116.5t-123 -48.5q-151 0 -151 166q0 62 55 110t118 48q155 0 155 -159zM723 349q28 -11 28 -33.5t-20 -47.5q-228 -290 -462 -290q-133 0 -133 125q0 95 51 225l195 497q4 10 4 20q0 31 -29 31q-42 0 -129 -96t-98 -96q-7 0 -11 4q-18 5 -18 25 t44 72q200 236 410 236q150 0 150 -141q0 -52 -20 -106l-177 -475q-25 -67 -25 -102.5t23 -35.5q39 0 123 93.5t94 94.5z" />
+<glyph unicode="℺" horiz-adv-x="1457" d="M734 1267q281 0 468.5 -214t187.5 -498.5t-186.5 -502.5t-468 -218t-468 217.5t-186.5 503.5q0 209 107 390.5t292 265.5q-62 192 -188 192q-138 0 -180 -166q-9 -35 -21 -35q-23 0 -23 41q0 135 52 236q65 127 189 127t183 -130q34 -73 56 -239q95 30 186 30z M816.5 1012.5q34.5 36.5 34.5 87t-33 84.5t-84 34q-92 0 -174 -46q36 -196 172 -196q50 0 84.5 36.5zM1195 555q0 213 -69 375q-86 199 -259 263q28 -45 28 -103.5t-47.5 -107.5t-115.5 -49q-144 0 -221 208q-233 -172 -233 -586q0 -455 262 -613q96 -58 194.5 -58t193.5 56 q267 157 267 615z" />
+<glyph unicode="℻" horiz-adv-x="3003" d="M2950 -1q-122 5 -248 5t-195 -5v67q99 3 99 27q0 3 -234 309q-218 -279 -218 -288q0 -46 95 -48v-67q-71 5 -147 5t-240 -4v66q157 0 222 83l243 311l-273 358q-25 32 -80 39q-11 2 -42 2q-20 0 -50 -1v68q107 -5 240.5 -5t202.5 5v-67q-98 -3 -98 -27q0 -9 193 -253 q174 224 174 232q0 46 -93 48v67q78 -5 146.5 -5t239.5 4v-67q-160 -1 -222 -80l-202 -257l314 -413q26 -34 80 -41q11 -2 42 -2q21 0 51 1v-67zM1835 -1q-122 5 -246.5 5t-195.5 -5v67h25q99 0 99 27q0 18 -79 206h-358q-69 -159 -69 -178q0 -55 115 -55v-66q-145 4 -197 4 t-157 -4v66q138 2 170 81l314 787q14 34 47 34t47 -34l327 -823q15 -38 69 -45q5 -1 27.5 -0.5t61.5 0.5v-67zM612 856h-194q-33 0 -42 -5.5t-9 -34.5v-322h118q97 0 123 30.5t26 123.5h62v-374h-62q0 94 -26 124t-123 30h-118v-319q0 -15 4 -24q9 -19 149 -19h41v-67 q-71 5 -109 5h-301q-30 0 -99 -5v67q117 0 136.5 7.5t19.5 35.5v706q0 13 -4 23q-8 19 -111 19q-19 0 -41 -1v67h855l45 -321h-63q-19 152 -71.5 203t-205.5 51zM1411 366l-152 382l-151 -382h303z" />
+<glyph unicode="ℼ" horiz-adv-x="1421" d="M1498 897.5q25 -25.5 25 -67t-34.5 -77t-82.5 -35.5h-254q-6 -81 -6 -127q0 -105 28 -197t73 -174.5t45 -101.5q0 -57 -52.5 -100.5t-111.5 -43.5q-91 0 -140 135q-35 100 -35 235t50 374h-246l-103 -492q-29 -141 -44 -169q-40 -81 -142 -81q-43 0 -86 27t-43 63.5 t55 155.5l101 214q69 152 111 282h-153q-172 0 -230 -75q-36 -47 -65.5 -47t-29.5 28q0 7 6 17q162 282 374 282h930q35 0 60 -25.5zM1448 837q0 11 -10 11h-930q-82 0 -161 -63q45 8 106 8h953q42 0 42 44zM1071 591q0 44 4 105q-47 -230 -47 -373q0 -69 22 -156 q30 -118 78 -118q33 0 60 25t27 46l-100 225q-44 117 -44 246zM468 51q63 0 88 68l119 575q-64 -180 -144.5 -352.5t-117.5 -267.5q17 -23 55 -23z" />
+<glyph unicode="ℽ" horiz-adv-x="1424" d="M1509 897q0 -9 -13 -26q-208 -269 -313 -505q-65 -146 -77 -313q-2 -77 -10 -230q-18 -265 -181 -265q-44 0 -72 34.5t-28 79.5q0 108 111 333.5t111 372.5q0 178 -148 268q-122 74 -297.5 74t-248.5 -86l-39 -60q-28 -42 -50 -42q-37 0 -37 37q0 5 3 12 q153 378 482.5 378t419.5 -554q278 530 352 530q35 0 35 -38zM966 685q-95 199 -261.5 199t-280.5 -114q75 25 153 25q241 0 389 -110zM890 -328q0 -39 25 -39q115 0 115 341v32q0 43 2 61l-95 -205q-47 -111 -47 -190z" />
+<glyph unicode="ℾ" horiz-adv-x="1268" d="M1167 991q0 -37 -35 -37q-39 0 -39 37q0 133 -129 211q-109 66 -252 66h-121q-55 0 -55 -111v-988q0 -70 51 -86q26 -8 125 -8q41 0 41 -36q0 -39 -35 -39h-631q-34 0 -34 39q0 36 57 36q78 0 96.5 19t18.5 92v975q0 74 -27 92q-19 14 -97 14q-48 0 -48 38t34 38h1048 q32 0 32 -35v-317zM1092 1268h-92q54 -32 92 -74v74zM300 1161v-975q0 -71 -17 -111h197q-19 36 -19 94v988q0 64 21 111h-200q18 -39 18 -107z" />
+<glyph unicode="ℿ" horiz-adv-x="1666" d="M1463 76q48 0 48 -38t-35 -38h-599q-33 0 -33 39q0 36 55 36q78 0 97 19t19 92v982q0 63 -22 81.5t-84 18.5h-255q-53 0 -76 -12q-30 -14 -30 -99v-982q0 -69 30 -87q19 -12 94 -12q48 0 48 -38t-35 -38h-599q-33 0 -33 39q0 36 57 36q78 0 96.5 19t18.5 92v982 q0 99 -87 99q-6 0 -17.5 -0.5t-16.5 -0.5q-51 0 -51 38.5t33 38.5h1390q35 0 35 -37.5t-57 -37.5q-77 0 -96.5 -19t-19.5 -92v-982q0 -69 25.5 -84t99.5 -15zM1263 175v982q0 72 17 111h-208q18 -38 18 -100v-982q0 -72 -17 -111h208q-18 38 -18 100zM300 1168v-982 q0 -71 -17 -111h208q-18 38 -18 100v982q0 71 18 111h-213q22 -41 22 -100z" />
+<glyph unicode="⅀" horiz-adv-x="1377" d="M1157 0h-1069q-35 0 -35 39q0 10 383 631l-379 617q-4 7 -4 19q0 37 34 37h1085q31 0 35 -35l34 -314v-7q0 -33 -37 -33q-26 0 -40 44l-26 79q-51 101 -187 151q-109 40 -244 40h-272l368 -598l-366 -595h277q133 0 247 67t173 184q11 41 38 121q12 32 37 32q37 0 37 -29 q0 -3 -1 -7l-56 -407q-5 -36 -32 -36zM1144 1197l-8 71h-90q57 -30 98 -71zM1135 192q-59 -70 -140 -117h124zM715 670l-368 598h-190l367 -598l-353 -573q-6 -11 -15 -22h193z" />
+<glyph unicode="⅁" horiz-adv-x="1438" d="M638 1390q317 0 495 -201.5t178 -516.5t-168 -509q-177 -206 -481 -206q-236 0 -430 100q-52 27 -78.5 46.5t-26.5 47.5t19.5 49t41 21t40.5 -11q210 -123 434 -123q250 0 384.5 162t134.5 423t-140 424.5t-403 163.5q-170 0 -348 -69v-364h311q65 0 65 -65t-65 -65h-376 q-26 0 -45.5 19.5t-19.5 45.5v473q0 74 206 120q154 35 272 35z" />
+<glyph unicode="⅂" horiz-adv-x="1122" d="M1019 22q0 -65 -65 -65t-65 65v1191h-770q-65 0 -65 65t65 65h835q26 0 45.5 -19.5t19.5 -45.5v-1256z" />
+<glyph unicode="⅃" horiz-adv-x="1122" d="M1019 65q0 -26 -19.5 -45.5t-45.5 -19.5h-835q-65 0 -65 65t65 65h770v1191q0 65 65 65t65 -65v-1256z" />
+<glyph unicode="⅄" horiz-adv-x="1131" d="M1050 78q11 -17 11 -39.5t-20.5 -42t-50.5 -19.5t-50 31l-374 589l-375 -589q-20 -31 -50 -31t-50.5 19.5t-20.5 42t11 39.5l420 659v584q0 65 65 65t65 -65v-584z" />
+<glyph unicode="ⅅ" horiz-adv-x="1410" d="M1393 853q0 -80 -17 -155q-70 -310 -292.5 -504t-534.5 -194h-606l-22 13q-3 7 -3 17q0 36 40 45q14 3 68 3q64 0 87 108l206 970q8 38 8 59q0 41 -41 49q-9 2 -74 2l-22 13q-3 7 -3 20t13.5 28.5t29.5 15.5h605q243 0 400.5 -126.5t157.5 -363.5zM1316 836 q0 299 -274 397q84 -110 84 -314t-85.5 -442.5t-225.5 -359.5q190 67 316.5 222.5t169.5 358.5q15 71 15 138zM1049 906q0 360 -260 360q-120 0 -137 -79l-220 -1033q-2 -9 -2 -14q0 -63 93 -63q372 0 503 618q23 109 23 211zM399 1268q4 -16 4 -43t-9 -69l-206 -970 q-14 -68 -43 -111h220q-11 22 -11 43.5t3 35.5l220 1033q10 47 42 81h-220z" />
+<glyph unicode="ⅆ" horiz-adv-x="1349" d="M1419 309q0 -112 -89.5 -222.5t-200.5 -110.5q-182 0 -281 113q-143 -113 -293 -113q-181 0 -292 97.5t-111 276.5q0 254 173.5 431.5t426.5 177.5q119 0 210 -73l93 431q3 13 3 24q0 47 -46 47h-6l-53 -3q-39 -2 -39 38q0 35 36 37l380 16h4q41 0 41 -36q0 -2 -1 -6 l-261 -1217q-7 -33 -7 -78q0 -85 31 -85q129 0 188 192q5 24 20 71q12 29 36 29q38 0 38 -37zM1042 60q-11 25 -11 95.5t9 112.5l250 1131l-163 -7q7 -19 7 -43q0 -22 -6 -48l-235 -1108q-2 -13 -7 -38q68 -77 156 -95zM934 767q-48 106 -169.5 106t-196.5 -143 q-43 -83 -79 -250t-36 -253q0 -166 126 -166q134 0 239 132q0 18 3 34zM227 350q0 -216 187 -278q-36 62 -36 162t38.5 271.5t85.5 259.5q25 47 56 83q-152 -60 -241.5 -196.5t-89.5 -301.5z" />
+<glyph unicode="ⅇ" horiz-adv-x="1175" d="M1195 198q0 -13 -9 -24q-159 -198 -551 -198q-205 0 -344 103.5t-139 302.5q0 264 213 428q195 149 467 149q121 0 213 -49q113 -60 113 -170q0 -189 -264 -253q-139 -34 -414 -34q-25 -103 -25 -187t50 -149.5t130 -65.5q286 0 434 114q18 14 59 57q14 14 28 14 q39 0 39 -38zM1083 740q0 63 -72.5 103.5t-172 40.5t-132 -17t-82.5 -78q-69 -83 -124 -261q583 0 583 212zM227 382q0 -220 209 -298q-56 83 -56 198.5t57 290.5t131 264q-154 -58 -247.5 -176.5t-93.5 -278.5z" />
+<glyph unicode="ⅈ" horiz-adv-x="894" d="M804 1473q44 -43 44 -112.5t-58.5 -126t-128 -56.5t-114 42.5t-44.5 112.5t58.5 126.5t128.5 56.5t114 -43zM919 314q0 -6 -2 -13q-105 -325 -359 -325q-101 0 -184 48q-99 56 -99 149q0 32 14 70l173 474q23 63 23 114t-25 51q-77 0 -171 -87t-94 -164q0 -37 -37.5 -37 t-37.5 37q0 117 120.5 222.5t230.5 105.5t193 -48q99 -57 99 -151q0 -31 -13 -66l-174 -475q-25 -68 -25 -118t21 -50q149 0 239 187q10 29 34 86q13 26 35 26q39 0 39 -36zM737 1287q36 34 36 72.5t-22 60t-61 21.5t-75.5 -34.5t-36.5 -80.5q0 -73 77 -73q46 0 82 34z M688 760q0 82 -132 115q4 -18 4 -38q0 -70 -28 -146l-173 -474q-9 -26 -9 -44q0 -79 129 -112q-3 15 -3 31q0 72 30 153l174 475q8 23 8 40z" />
+<glyph unicode="ⅉ" horiz-adv-x="770" d="M839 1472.5q45 -43.5 45 -113.5t-58 -125.5t-128.5 -55.5t-115 42.5t-44.5 112t58 126.5t128 57t115 -43.5zM790 743q0 -18 -5 -41l-180 -830q-32 -148 -193 -236q-141 -77 -309 -77q-87 0 -159 37q-89 46 -89 125q0 64 46.5 110t102 46t88.5 -30.5t33 -77.5 q0 -78 -65 -121q14 -3 24 -3q87 0 149.5 78t83.5 173l175 812q14 66 14 105q0 70 -46 70q-81 0 -162.5 -54t-128.5 -127l-43 -83q-13 -24 -34 -24q-39 0 -39 36q0 7 3 15q52 134 167.5 223.5t242 89.5t216.5 -50q108 -61 108 -166zM773 1286.5q36 33.5 36 72.5t-23.5 60.5 t-62.5 21.5t-74.5 -34.5t-35.5 -80.5q0 -73 78 -73q46 0 82 33.5zM715 743q0 92 -141 129q7 -26 7 -66t-16 -114l-175 -812q-28 -129 -111 -219q218 68 253 227l180 830q3 15 3 25zM-22 -337q7 19 39.5 46.5t32.5 60t-35.5 32.5t-60 -24t-24.5 -57t48 -58z" />
+<glyph unicode="⅊" horiz-adv-x="1595" d="M1299 1039q196 -91 196 -334.5t-202 -339.5q-142 -68 -420 -68h-78v-167h546q65 0 65 -65t-65 -65h-611q-26 0 -45.5 19.5t-19.5 45.5v907h-370v-610q0 -65 -65 -65t-65 65v675q0 26 19.5 45.5t45.5 19.5h435v219q0 65 65 65t65 -65v-219h99q269 0 405 -63zM1198 468 q167 65 167 237t-163 231q-98 36 -303 36h-104v-546h84q213 0 319 42z" />
+<glyph unicode="⅋" horiz-adv-x="1500" d="M1411 1091q0 -73 -42 -136q-20 -31 -105 -119l-166 -177q79 -200 79 -392q0 -121 -72 -215t-190 -94q-87 0 -132 85q-36 68 -36 163q0 130 235 390q-99 258 -319 514q-61 -75 -174.5 -246.5t-113.5 -211.5q0 -85 134 -85h3v-61q-87 6 -199 6t-224 -6v61q116 1 177 49 q44 34 121.5 166.5t128 211t116.5 154.5q-145 173 -266 173q-90 0 -151.5 -63.5t-65.5 -153.5h-48q3 117 79 196.5t193 79.5q172 0 340 -146q163 146 349 146q136 0 242.5 -78.5t106.5 -210.5zM1081 703q91 87 130.5 154t39.5 175t-47 190q-56 99 -158 99q-157 0 -297 -125 q192 -192 332 -493zM1056 223q0 154 -58 326q-202 -218 -202 -345q0 -73 23 -128q30 -76 99 -76t108 78q30 61 30 145z" />
+<glyph unicode="⅌" horiz-adv-x="1483" d="M1293 801q95 -99 95 -237t-127 -231l-30 43q98 74 98 187q0 93 -74 160q-161 -199 -402 -255q18 -126 18 -209q0 -309 -216 -309q-137 0 -194 64t-57 187t29 269q-285 63 -285 246q0 115 126 192q101 62 258 88q17 134 17 222t-52 114q-35 18 -104.5 18t-116.5 -17 q-63 -23 -63 -64.5t40 -51.5q15 -4 73 -4q18 0 18 -19q0 -58 -85 -58h-3q-161 40 -161 192t148 152q32 0 94 -14t88.5 -14t64 15t57.5 15q55 0 55 -74q0 -169 -14 -404q49 6 86 6t71 -2q-3 63 -3 122q0 210 77 284q59 57 143 57q119 0 237 -102q143 -124 143 -365 q0 -80 -49 -203zM1150 1017q0 419 -187 419q-116 0 -152 -124q-19 -64 -19 -219q0 -43 2 -90q202 -22 354 -99q2 50 2 113zM1142 818q-146 93 -343 107q15 -208 46 -407q138 29 209.5 95.5t87.5 204.5zM750 928h-54q-40 0 -114 -10l-27 -414q53 -5 111 -5t128 10 q-17 140 -44 419zM219 679q0 -111 225 -158q24 101 63 305l12 82q-300 -59 -300 -229zM817 245q0 53 -17 212q-71 -11 -133.5 -11t-114.5 5q-6 -140 -6 -234t34 -150.5t100 -56.5q137 0 137 235z" />
+<glyph unicode="⅍" horiz-adv-x="2070" d="M1782 267q105 -27 170.5 -100.5t65.5 -187.5t-92.5 -195.5t-218.5 -81.5q-175 0 -276 86q-64 -86 -81 -86q-28 0 -28 32v288q0 32 31 32q36 0 36 -60q0 -90 85 -158t232 -68q78 0 134 50t56 119.5t-43.5 118t-140.5 69.5l-183 39q-90 29 -148.5 96t-58.5 157 q0 118 93 193t220 75t234 -87q62 87 78 87q31 0 31 -34v-287q0 -31 -34 -31q-22 0 -28 25l-21 80q-58 185 -265 185q-74 0 -130 -44t-56 -116q0 -104 126 -148zM1840 1455l-1155 -1746h-89l1155 1746h89zM1115 578q-122 5 -246.5 5t-195.5 -5v67h25q99 0 99 27q0 18 -79 206 h-358q-69 -159 -69 -178q0 -55 115 -55v-66q-145 4 -197 4t-157 -4v66q138 2 170 81l314 787q14 34 47 34t47 -34l327 -823q15 -38 69 -45q5 0 27.5 -0.5t61.5 0.5v-67zM691 945l-152 382l-151 -382h303z" />
+<glyph unicode="ⅎ" horiz-adv-x="1003" d="M952 -1h-855l-45 321h63q19 -152 71.5 -203t205.5 -51h194q33 0 42 5.5t9 34.5v322h-118q-97 0 -123 -30.5t-26 -123.5h-62v374h62q0 -94 26 -124t123 -30h118v319q0 15 -4 24q-9 19 -149 19h-41v67q71 -5 109 -5h301q30 0 99 5v-67q-117 0 -136.5 -7.5t-19.5 -35.5v-706 q0 -13 4 -23q8 -19 111 -19q19 0 41 1v-67z" />
+<glyph unicode="⅏" horiz-adv-x="1632" d="M1265 139q-110 -137 -230.5 -137t-227.5 120q-109 -122 -215 -122q-129 0 -231 130q-126 -122 -296 -122l-15 114h3q146 0 260 85q-65 154 -65 268q0 74 30 130q36 70 102.5 70t99.5 -60.5t33 -131.5q0 -158 -103 -295q71 -74 170 -74t179 78q-80 138 -80 279 q0 76 29 132q36 72 101.5 72t100 -60t34.5 -129q0 -135 -94 -302q60 -70 170 -70t192 85q-95 142 -95 278q0 74 35 136t101 62t99.5 -59.5t33.5 -129.5q0 -134 -76 -273q118 -89 272 -91l-13 -114q-178 8 -304 131zM1259 261q64 104 64 199t-68 95q-77 0 -77 -116 q0 -94 81 -178zM802 240q79 112 79 213.5t-66 101.5q-39 0 -58 -39t-19 -82q0 -109 64 -194zM361 252q89 97 89 201t-66 104q-39 0 -58 -40.5t-19 -84.5q0 -108 54 -180z" />
+<glyph unicode="⅐" horiz-adv-x="1722" d="M142 643l67 -2q109 0 123 24q5 9 5 30v708q-80 -31 -204 -31v62q193 0 290 89h12q38 0 38 -45v-786q0 -18 5 -28q11 -21 175 -21h15v-64q-67 5 -112 5h-302q-45 0 -112 -5v64zM1419 1415q0 -13 -6 -22l-1071 -1667q-11 -17 -35 -17q-40 0 -40 40q0 13 6 22l1071 1667 q11 17 35 17q40 0 40 -40zM1686 564q0 -26 -16 -46l-212 -262q-73 -91 -97 -253q-14 -94 -14 -276q0 -86 -82 -86t-82 86q0 258 194 527q1 1 161 203h-353q-84 0 -97 -7t-35 -128h-60l56 306h56q2 -17 9 -24q20 -20 182 -20h390v-20z" />
+<glyph unicode="⅑" horiz-adv-x="1722" d="M1661 138q0 -263 -169 -408q-103 -89 -233 -89q-92 0 -153 35q-74 42 -74 124q0 77 81 77q35 0 59 -21t24 -53q0 -60 -66 -72q47 -32 114.5 -32t118.5 30q132 77 137 352q-67 -108 -185 -108q-141 0 -231.5 95.5t-90.5 229t100 225t239 91.5q78 0 145 -37 q184 -101 184 -439zM142 643l67 -2q109 0 123 24q5 9 5 30v708q-80 -31 -204 -31v62q193 0 290 89h12q38 0 38 -45v-786q0 -18 5 -28q11 -21 175 -21h15v-64q-67 5 -112 5h-302q-45 0 -112 -5v64zM1439 1415q0 -13 -6 -22l-1071 -1667q-11 -17 -35 -17q-40 0 -40 40 q0 13 6 22l1071 1667q11 17 35 17q40 0 40 -40zM1458 107q40 66 40 177.5t-25 171.5q-44 104 -141.5 104t-147.5 -82q-30 -49 -30 -159v-58q0 -105 26 -153q45 -82 137 -82t141 81z" />
+<glyph unicode="⅒" horiz-adv-x="2386" d="M142 643l67 -2q109 0 123 24q5 9 5 30v708q-80 -31 -204 -31v62q193 0 290 89h12q38 0 38 -45v-786q0 -18 5 -28q11 -21 175 -21h15v-64q-67 5 -112 5h-302q-45 0 -112 -5v64zM1419 1415q0 -13 -6 -22l-1071 -1667q-11 -17 -35 -17q-40 0 -40 40q0 13 6 22l1071 1667 q11 17 35 17q40 0 40 -40zM2236 514q63 -111 63 -325.5t-59 -321.5q-91 -166 -277 -166t-277 160q-63 111 -63 325.5t59 321.5q91 166 277 166t277 -160zM1052 -206l67 -2q109 0 123 24q5 9 5 30v708q-80 -31 -204 -31v62q193 0 290 89h12q38 0 38 -45v-786q0 -18 5 -28 q11 -21 175 -21h15v-64q-67 5 -112 5h-302q-45 0 -112 -5v64zM2150 116v173q0 335 -190 335t-190 -365v-173q0 -335 190 -335t190 365z" />
+<glyph unicode="⅓" horiz-adv-x="1722" d="M142 643l67 -2q109 0 123 24q5 9 5 30v708q-80 -31 -204 -31v62q193 0 290 89h12q38 0 38 -45v-786q0 -18 5 -28q11 -21 175 -21h15v-64q-67 5 -112 5h-302q-45 0 -112 -5v64zM1419 1415q0 -13 -6 -22l-1071 -1667q-11 -17 -35 -17q-40 0 -40 40q0 13 6 22l1071 1667 q11 17 35 17q40 0 40 -40zM1655 -82q0 -120 -103.5 -198.5t-231.5 -78.5t-223 56q-110 65 -110 171q0 90 97 90q42 0 70 -24.5t28 -62.5q0 -82 -93 -87q74 -85 219 -85q88 0 131 72q35 58 35 147q0 220 -176 220h-81q-35 0 -35 25.5t90.5 30.5t133.5 67t43 153 q0 146 -140 146q-123 0 -187 -67q86 -8 86 -79q0 -80 -89.5 -80t-89.5 81q0 94 97 150q83 49 191 49t195 -49q102 -57 102 -152q0 -79 -54.5 -144t-138.5 -98q100 -27 167 -94.5t67 -158.5z" />
+<glyph unicode="⅔" horiz-adv-x="1722" d="M79 580v22q0 26 21 47l300 296q160 158 160 299q0 89 -52 152.5t-147 63.5q-136 0 -195 -119q98 -2 98 -83q0 -35 -26.5 -59t-64.5 -24q-94 0 -94 87q0 109 90.5 185t222.5 76t231 -76.5t99 -202.5q0 -82 -61 -159q-32 -40 -124 -120l-300 -259h285q97 0 110 9.5 t33 125.5h59l-46 -261h-599zM1655 -82q0 -120 -103.5 -198.5t-231.5 -78.5t-223 56q-110 65 -110 171q0 90 97 90q42 0 70 -24.5t28 -62.5q0 -82 -93 -87q74 -85 219 -85q88 0 131 72q35 58 35 147q0 220 -176 220h-81q-35 0 -35 25.5t90.5 30.5t133.5 67t43 153 q0 146 -140 146q-123 0 -187 -67q86 -8 86 -79q0 -80 -89.5 -80t-89.5 81q0 94 97 150q83 49 191 49t195 -49q102 -57 102 -152q0 -79 -54.5 -144t-138.5 -98q100 -27 167 -94.5t67 -158.5zM1439 1415q0 -13 -6 -22l-1071 -1667q-11 -17 -35 -17q-40 0 -40 40q0 13 6 22 l1071 1667q11 17 35 17q40 0 40 -40z" />
+<glyph unicode="⅕" horiz-adv-x="1722" d="M142 643l67 -2q109 0 123 24q5 9 5 30v708q-80 -31 -204 -31v62q193 0 290 89h12q38 0 38 -45v-786q0 -18 5 -28q11 -21 175 -21h15v-64q-67 5 -112 5h-302q-45 0 -112 -5v64zM1419 1415q0 -13 -6 -22l-1071 -1667q-11 -17 -35 -17q-40 0 -40 40q0 13 6 22l1071 1667 q11 17 35 17q40 0 40 -40zM1336 273q135 0 220.5 -95t85.5 -222t-102 -221t-235 -94t-219.5 78t-86.5 185q0 84 86 84q37 0 63 -22t26 -56t-26 -56t-63 -22h-10q25 -58 84.5 -95.5t129.5 -37.5q103 0 159 86q35 54 35 177.5t-26 176.5q-42 84 -133.5 84t-165.5 -73 q-38 -38 -47 -38q-32 0 -32 38v430q0 33 25 33q10 0 22 -4q125 -40 197 -40t121.5 13.5t79.5 22.5t32 9q25 0 25 -26q0 -14 -30 -44q-111 -110 -281 -110q-60 0 -122 15v-235q80 59 188 59z" />
+<glyph unicode="⅖" horiz-adv-x="1722" d="M79 580v22q0 26 21 47l300 296q160 158 160 299q0 89 -52 152.5t-147 63.5q-136 0 -195 -119q98 -2 98 -83q0 -35 -26.5 -59t-64.5 -24q-94 0 -94 87q0 109 90.5 185t222.5 76t231 -76.5t99 -202.5q0 -82 -61 -159q-32 -40 -124 -120l-300 -259h285q97 0 110 9.5 t33 125.5h59l-46 -261h-599zM1336 273q135 0 220.5 -95t85.5 -222t-102 -221t-235 -94t-219.5 78t-86.5 185q0 84 86 84q37 0 63 -22t26 -56t-26 -56t-63 -22h-10q25 -58 84.5 -95.5t129.5 -37.5q103 0 159 86q35 54 35 177.5t-26 176.5q-42 84 -133.5 84t-165.5 -73 q-38 -38 -47 -38q-32 0 -32 38v430q0 33 25 33q10 0 22 -4q125 -40 197 -40t121.5 13.5t79.5 22.5t32 9q25 0 25 -26q0 -14 -30 -44q-111 -110 -281 -110q-60 0 -122 15v-235q80 59 188 59zM1429 1415q0 -13 -6 -22l-1071 -1667q-11 -17 -35 -17q-40 0 -40 40q0 13 6 22 l1071 1667q11 17 35 17q40 0 40 -40z" />
+<glyph unicode="⅗" horiz-adv-x="1722" d="M1336 273q135 0 220.5 -95t85.5 -222t-102 -221t-235 -94t-219.5 78t-86.5 185q0 84 86 84q37 0 63 -22t26 -56t-26 -56t-63 -22h-10q25 -58 84.5 -95.5t129.5 -37.5q103 0 159 86q35 54 35 177.5t-26 176.5q-42 84 -133.5 84t-165.5 -73q-38 -38 -47 -38q-32 0 -32 38 v430q0 33 25 33q10 0 22 -4q125 -40 197 -40t121.5 13.5t79.5 22.5t32 9q25 0 25 -26q0 -14 -30 -44q-111 -110 -281 -110q-60 0 -122 15v-235q80 59 188 59zM735 827q0 -120 -103.5 -198.5t-231.5 -78.5t-223 56q-110 65 -110 171q0 90 97 90q42 0 70 -24.5t28 -62.5 q0 -82 -93 -87q74 -85 219 -85q88 0 131 72q35 58 35 147q0 220 -176 220h-81q-35 0 -35 25.5t90.5 30.5t133.5 67t43 153q0 146 -140 146q-123 0 -187 -67q86 -8 86 -79q0 -80 -89.5 -80t-89.5 81q0 94 97 150q83 49 191 49t195 -49q102 -57 102 -152q0 -79 -54.5 -144 t-138.5 -98q100 -27 167 -94.5t67 -158.5zM1419 1415q0 -13 -6 -22l-1071 -1667q-11 -17 -35 -17q-40 0 -40 40q0 13 6 22l1071 1667q11 17 35 17q40 0 40 -40z" />
+<glyph unicode="⅘" horiz-adv-x="1722" d="M757 809h-156v-120q0 -18 5 -27q10 -19 134 -19h13v-64q-78 5 -117 5h-213q-36 0 -114 -5v64l58 -1q76 0 88 20q6 10 6 27v120h-416v56l481 653q15 21 40 21q35 0 35 -47v-620h156v-63zM1336 273q135 0 220.5 -95t85.5 -222t-102 -221t-235 -94t-219.5 78t-86.5 185 q0 84 86 84q37 0 63 -22t26 -56t-26 -56t-63 -22h-10q25 -58 84.5 -95.5t129.5 -37.5q103 0 159 86q35 54 35 177.5t-26 176.5q-42 84 -133.5 84t-165.5 -73q-38 -38 -47 -38q-32 0 -32 38v430q0 33 25 33q10 0 22 -4q125 -40 197 -40t121.5 13.5t79.5 22.5t32 9 q25 0 25 -26q0 -14 -30 -44q-111 -110 -281 -110q-60 0 -122 15v-235q80 59 188 59zM1439 1415q0 -13 -6 -22l-1071 -1667q-11 -17 -35 -17q-40 0 -40 40q0 13 6 22l1071 1667q11 17 35 17q40 0 40 -40zM470 872v476l-352 -476h352z" />
+<glyph unicode="⅙" horiz-adv-x="1722" d="M142 643l67 -2q109 0 123 24q5 9 5 30v708q-80 -31 -204 -31v62q193 0 290 89h12q38 0 38 -45v-786q0 -18 5 -28q11 -21 175 -21h15v-64q-67 5 -112 5h-302q-45 0 -112 -5v64zM1332 283q142 0 232.5 -95.5t90.5 -225t-93.5 -225.5t-238.5 -96q-187 0 -273 170 q-63 124 -63 285.5t61 284.5t184 188q85 45 174 45t150 -40t61 -118t-82 -78t-82 74q0 64 73 71q-42 37 -107 37t-119 -30q-146 -82 -152 -354q68 107 184 107zM1439 1415q0 -13 -6 -22l-1071 -1667q-11 -17 -35 -17q-40 0 -40 40q0 13 6 22l1071 1667q11 17 35 17 q40 0 40 -40zM1495 -72v69q0 102 -28 153q-44 81 -135 81t-136.5 -73t-45.5 -164q0 -135 27 -196q44 -99 144.5 -99t147.5 85q26 48 26 144z" />
+<glyph unicode="⅚" horiz-adv-x="1722" d="M1332 283q142 0 232.5 -95.5t90.5 -225t-93.5 -225.5t-238.5 -96q-187 0 -273 170q-63 124 -63 285.5t61 284.5t184 188q85 45 174 45t150 -40t61 -118t-82 -78t-82 74q0 64 73 71q-42 37 -107 37t-119 -30q-146 -82 -152 -354q68 107 184 107zM416 1182q135 0 220.5 -95 t85.5 -222t-102 -221t-235 -94t-219.5 78t-86.5 185q0 84 86 84q37 0 63 -22t26 -56t-26 -56t-63 -22h-10q25 -58 84.5 -95.5t129.5 -37.5q103 0 159 86q35 54 35 177.5t-26 176.5q-42 84 -133.5 84t-165.5 -73q-38 -38 -47 -38q-32 0 -32 38v430q0 33 25 33q10 0 22 -4 q125 -40 197 -40t121.5 13.5t79.5 22.5t32 9q25 0 25 -26q0 -14 -30 -44q-111 -110 -281 -110q-60 0 -122 15v-235q80 59 188 59zM1429 1415q0 -13 -6 -22l-1071 -1667q-11 -17 -35 -17q-40 0 -40 40q0 13 6 22l1071 1667q11 17 35 17q40 0 40 -40zM1495 -72v69 q0 102 -28 153q-44 81 -135 81t-136.5 -73t-45.5 -164q0 -135 27 -196q44 -99 144.5 -99t147.5 85q26 48 26 144z" />
+<glyph unicode="⅛" horiz-adv-x="1722" d="M142 643l67 -2q109 0 123 24q5 9 5 30v708q-80 -31 -204 -31v62q193 0 290 89h12q38 0 38 -45v-786q0 -18 5 -28q11 -21 175 -21h15v-64q-67 5 -112 5h-302q-45 0 -112 -5v64zM1575 92q80 -79 80 -188t-101 -186t-231.5 -77t-233 67.5t-102.5 181.5q0 157 213 257 q-35 19 -100 66q-71 68 -71 166t88 166.5t202.5 68.5t204.5 -58.5t90 -157.5q0 -128 -178 -216q50 -25 139 -90zM1439 1415q0 -13 -6 -22l-1071 -1667q-11 -17 -35 -17q-40 0 -40 40q0 13 6 22l1071 1667q11 17 35 17q40 0 40 -40zM1525 398q0 69 -61.5 115.5t-141 46.5 t-142.5 -36.5t-63 -94t75 -105.5q34 -22 187 -109q146 77 146 183zM1085 -110q0 -81 70.5 -136t163.5 -55t166 46.5t73 120t-114 142.5q-51 31 -187 104q-172 -86 -172 -222z" />
+<glyph unicode="⅜" horiz-adv-x="1722" d="M1575 92q80 -79 80 -188t-101 -186t-231.5 -77t-233 67.5t-102.5 181.5q0 157 213 257q-35 19 -100 66q-71 68 -71 166t88 166.5t202.5 68.5t204.5 -58.5t90 -157.5q0 -128 -178 -216q50 -25 139 -90zM1439 1415q0 -13 -6 -22l-1071 -1667q-11 -17 -35 -17q-40 0 -40 40 q0 13 6 22l1071 1667q11 17 35 17q40 0 40 -40zM735 827q0 -120 -103.5 -198.5t-231.5 -78.5t-223 56q-110 65 -110 171q0 90 97 90q42 0 70 -24.5t28 -62.5q0 -82 -93 -87q74 -85 219 -85q88 0 131 72q35 58 35 147q0 220 -176 220h-81q-35 0 -35 25.5t90.5 30.5t133.5 67 t43 153q0 146 -140 146q-123 0 -187 -67q86 -8 86 -79q0 -80 -89.5 -80t-89.5 81q0 94 97 150q83 49 191 49t195 -49q102 -57 102 -152q0 -79 -54.5 -144t-138.5 -98q100 -27 167 -94.5t67 -158.5zM1525 398q0 69 -61.5 115.5t-141 46.5t-142.5 -36.5t-63 -94t75 -105.5 q34 -22 187 -109q146 77 146 183zM1085 -110q0 -81 70.5 -136t163.5 -55t166 46.5t73 120t-114 142.5q-51 31 -187 104q-172 -86 -172 -222z" />
+<glyph unicode="⅝" horiz-adv-x="1722" d="M1575 92q80 -79 80 -188t-101 -186t-231.5 -77t-233 67.5t-102.5 181.5q0 157 213 257q-35 19 -100 66q-71 68 -71 166t88 166.5t202.5 68.5t204.5 -58.5t90 -157.5q0 -128 -178 -216q50 -25 139 -90zM416 1182q135 0 220.5 -95t85.5 -222t-102 -221t-235 -94t-219.5 78 t-86.5 185q0 84 86 84q37 0 63 -22t26 -56t-26 -56t-63 -22h-10q25 -58 84.5 -95.5t129.5 -37.5q103 0 159 86q35 54 35 177.5t-26 176.5q-42 84 -133.5 84t-165.5 -73q-38 -38 -47 -38q-32 0 -32 38v430q0 33 25 33q10 0 22 -4q125 -40 197 -40t121.5 13.5t79.5 22.5t32 9 q25 0 25 -26q0 -14 -30 -44q-111 -110 -281 -110q-60 0 -122 15v-235q80 59 188 59zM1429 1415q0 -13 -6 -22l-1071 -1667q-11 -17 -35 -17q-40 0 -40 40q0 13 6 22l1071 1667q11 17 35 17q40 0 40 -40zM1525 398q0 69 -61.5 115.5t-141 46.5t-142.5 -36.5t-63 -94 t75 -105.5q34 -22 187 -109q146 77 146 183zM1085 -110q0 -81 70.5 -136t163.5 -55t166 46.5t73 120t-114 142.5q-51 31 -187 104q-172 -86 -172 -222z" />
+<glyph unicode="⅞" horiz-adv-x="1722" d="M1575 92q80 -79 80 -188t-101 -186t-231.5 -77t-233 67.5t-102.5 181.5q0 157 213 257q-35 19 -100 66q-71 68 -71 166t88 166.5t202.5 68.5t204.5 -58.5t90 -157.5q0 -128 -178 -216q50 -25 139 -90zM746 1473q0 -26 -16 -46l-212 -262q-73 -91 -97 -253 q-14 -94 -14 -276q0 -86 -82 -86t-82 86q0 258 194 527q1 1 161 203h-353q-84 0 -97 -7t-35 -128h-60l56 306h56q2 -17 9 -24q20 -20 182 -20h390v-20zM1399 1415q0 -13 -6 -22l-1071 -1667q-11 -17 -35 -17q-40 0 -40 40q0 13 6 22l1071 1667q11 17 35 17q40 0 40 -40z M1525 398q0 69 -61.5 115.5t-141 46.5t-142.5 -36.5t-63 -94t75 -105.5q34 -22 187 -109q146 77 146 183zM1085 -110q0 -81 70.5 -136t163.5 -55t166 46.5t73 120t-114 142.5q-51 31 -187 104q-172 -86 -172 -222z" />
+<glyph unicode="⅟" horiz-adv-x="939" d="M142 643l67 -2q109 0 123 24q5 9 5 30v708q-80 -31 -204 -31v62q193 0 290 89h12q38 0 38 -45v-786q0 -18 5 -28q11 -21 175 -21h15v-64q-67 5 -112 5h-302q-45 0 -112 -5v64zM1419 1415q0 -13 -6 -22l-1071 -1667q-11 -17 -35 -17q-40 0 -40 40q0 13 6 22l1071 1667 q11 17 35 17q40 0 40 -40z" />
+<glyph unicode="Ⅰ" horiz-adv-x="738" d="M670 1284l-75 2q-140 0 -140 -85v-1057q0 -27 13.5 -52t91.5 -31q4 0 31.5 -0.5t78.5 0.5v-61q-71 6 -111 6h-385q-35 0 -106 -6v61q9 0 28 -0.5t29 -0.5q128 0 147 36q9 17 9 49v1056q0 32 -9 49q-18 34 -153 34h-51v62q70 -6 109 -6h388q35 0 105 6v-62z" />
+<glyph unicode="Ⅱ" horiz-adv-x="1340" d="M1272 1284l-75 2q-140 0 -140 -85v-1057q0 -27 13.5 -52t91.5 -31q4 0 31.5 -0.5t78.5 0.5v-61q-71 6 -111 6h-987q-35 0 -106 -6v61q9 0 28 -0.5t29 -0.5q128 0 147 36q9 17 9 49v1056q0 32 -9 49q-18 34 -153 34h-51v62q70 -6 109 -6h990q35 0 105 6v-62zM670 1284 l-75 2q-140 0 -140 -85v-1057q0 -57 50 -75q27 -9 68.5 -9t63.5 0.5t80 0.5h63q78 6 94 35q9 17 9 49v1056q0 32 -9 49q-15 29 -95 34h-109z" />
+<glyph unicode="Ⅲ" horiz-adv-x="1942" d="M1874 1284l-75 2q-140 0 -140 -85v-1057q0 -27 13.5 -52t91.5 -31q4 0 32 -0.5t78 0.5v-61q-71 6 -111 6h-1589q-35 0 -106 -6v61q9 0 28 -0.5t29 -0.5q128 0 147 36q9 17 9 49v1056q0 32 -9 49q-18 34 -153 34h-51v62q70 -6 109 -6h1592q35 0 105 6v-62zM1272 1284 l-75 2q-140 0 -140 -85v-1057q0 -57 50 -75q27 -9 68.5 -9t63.5 0.5t80 0.5h63q78 6 94 35q9 17 9 49v1056q0 32 -9 49q-15 29 -95 34h-109zM670 1284l-75 2q-140 0 -140 -85v-1057q0 -57 50 -75q27 -9 68.5 -9t63.5 0.5t80 0.5h63q78 6 94 35q9 17 9 49v1056q0 32 -9 49 q-15 29 -95 34h-109z" />
+<glyph unicode="Ⅳ" horiz-adv-x="2138" d="M670 1284l-75 2q-140 0 -140 -85v-1057q0 -27 11 -48q18 -35 194 -35h10v-61q-71 6 -117 6h-373q-41 0 -112 -6v61q9 0 28 -0.5t29 -0.5q128 0 147 36q9 17 9 49v1056q0 32 -9 49q-15 29 -95 34h-109v62q70 -6 115 -6h850q90 0 169 6v-62h-18q-144 0 -144 -56 q0 -33 141 -396l247 -635l361 950q9 24 9 40q0 94 -143 97v62q153 -6 237.5 -6t177.5 6v-62q-164 -1 -214 -132l-440 -1158q-14 -37 -46.5 -37t-48.5 43l-457 1209q-22 57 -81 71q-20 4 -74 4h-39z" />
+<glyph unicode="Ⅴ" horiz-adv-x="1536" d="M814 -6q-14 -37 -46.5 -37t-48.5 43l-457 1209q-22 57 -81 71q-20 5 -68 5q-20 0 -45 -1v62q214 -6 336 -6t196 6v-62h-18q-144 0 -144 -56q0 -33 141 -396l247 -635l361 950q9 24 9 40q0 95 -143 97v62q153 -6 237.5 -6t177.5 6v-62q-164 -1 -214 -132z" />
+<glyph unicode="Ⅵ" horiz-adv-x="2138" d="M2070 1284l-75 2q-140 0 -140 -85v-1057q0 -28 11 -48q19 -35 194 -35h10v-61q-71 6 -117 6h-373q-41 0 -112 -6v61q9 0 28 -0.5t29 -0.5q128 0 147 36q9 17 9 49v1056q0 56 -40 73q-23 10 -122 10t-144 -14q-86 -25 -121 -118l-440 -1158q-14 -37 -46.5 -37t-48.5 43 l-457 1209q-22 57 -81 71q-20 5 -67 5q-20 0 -46 -1v62q213 -6 335.5 -6t196.5 6v-62h-18q-144 0 -144 -56q0 -33 141 -396l247 -635l361 950q9 24 9 40q0 94 -143 97v62q153 -6 213 -6h693q41 0 111 6v-62z" />
+<glyph unicode="Ⅶ" horiz-adv-x="2740" d="M2672 1284l-75 2q-140 0 -140 -85v-1057q0 -28 11 -48q19 -35 194 -35h10v-61q-71 6 -117 6h-975q-41 0 -112 -6v61q9 0 28 -0.5t29 -0.5q128 0 147 36q9 17 9 49v1056q0 56 -40 73q-23 10 -122 10t-144 -14q-86 -25 -121 -118l-440 -1158q-14 -37 -46.5 -37t-48.5 43 l-457 1209q-22 57 -81 71q-20 5 -67 5q-20 0 -46 -1v62q213 -6 335.5 -6t196.5 6v-62h-18q-144 0 -144 -56q0 -33 141 -396l247 -635l361 950q9 24 9 40q0 94 -143 97v62q153 -6 213 -6h1295q41 0 111 6v-62zM2070 1284l-75 2q-140 0 -140 -85v-1057q0 -57 50 -75 q27 -9 68.5 -9t63.5 0.5t80 0.5h63q78 6 94 35q9 17 9 49v1056q0 32 -9 49q-15 29 -95 34h-109z" />
+<glyph unicode="Ⅷ" horiz-adv-x="3342" d="M3274 1284l-75 2q-140 0 -140 -85v-1057q0 -28 11 -48q19 -35 194 -35h10v-61q-71 6 -117 6h-1577q-41 0 -112 -6v61q9 0 28 -0.5t29 -0.5q128 0 147 36q9 17 9 49v1056q0 56 -40 73q-23 10 -122 10t-144 -14q-86 -25 -121 -118l-440 -1158q-14 -37 -46.5 -37t-48.5 43 l-457 1209q-22 57 -81 71q-20 5 -67 5q-20 0 -46 -1v62q213 -6 335.5 -6t196.5 6v-62h-18q-144 0 -144 -56q0 -33 141 -396l247 -635l361 950q9 24 9 40q0 94 -143 97v62q153 -6 213 -6h1897q41 0 111 6v-62zM2672 1284l-75 2q-140 0 -140 -85v-1057q0 -57 50 -75 q27 -9 68.5 -9t63.5 0.5t80 0.5h63q78 6 94 35q9 17 9 49v1056q0 32 -9 49q-15 29 -95 34h-109zM2070 1284l-75 2q-140 0 -140 -85v-1057q0 -57 50 -75q27 -9 68.5 -9t63.5 0.5t80 0.5h63q78 6 94 35q9 17 9 49v1056q0 32 -9 49q-15 29 -95 34h-109z" />
+<glyph unicode="Ⅸ" horiz-adv-x="2120" d="M670 1284l-75 2q-140 0 -140 -85v-1057q0 -57 50 -75q27 -9 130 -9t165 18q96 27 155 114l323 477l-362 547q-34 51 -99 64q-25 4 -81 4h-41v62q112 -6 292 -6t252 6v-62q-128 -5 -128 -58q0 -14 268 -410l225 333q17 25 17 46q0 43 -37.5 65.5t-83.5 23.5v62 q81 -6 164.5 -6t305.5 6v-62q-198 -2 -285 -128l-271 -395l416 -629q35 -53 99 -66q26 -5 86 -5h37v-61q-127 6 -299 6t-244 -6v61q128 5 128 59q0 10 -320 493l-281 -414q-19 -28 -19 -48q0 -43 38.5 -66t84.5 -24v-61q-74 6 -169 6h-791q-41 0 -112 -6v61q9 0 28 -0.5 t29 -0.5q128 0 147 36q9 17 9 49v1056q0 31 -9 49q-14 28 -94 34h-110v62q70 -6 115 -6h376q41 0 111 6v-62z" />
+<glyph unicode="Ⅹ" horiz-adv-x="1518" d="M1450 0q-128 6 -299.5 6t-243.5 -6v61q128 5 128 59q0 10 -320 493l-281 -414q-19 -28 -19 -48q0 -43 38.5 -66t84.5 -24v-61q-74 6 -165 6t-305 -6v61q196 0 285 131l323 477l-362 547q-33 51 -99 64q-25 4 -81 4h-41v62q112 -6 292 -6t252 6v-62q-128 -5 -128 -58 q0 -14 268 -410l225 333q17 25 17 46q0 43 -37.5 65.5t-83.5 23.5v62q81 -6 164.5 -6t305.5 6v-62q-198 -2 -285 -128l-271 -395l416 -629q35 -53 99 -66q26 -5 86 -5h37v-61z" />
+<glyph unicode="Ⅺ" horiz-adv-x="2120" d="M2052 1284l-75 2q-140 0 -140 -85v-1057q0 -28 11 -48q19 -35 194 -35h10v-61q-71 6 -117 6h-856q-100 0 -172 -6v61q128 5 128 59q0 10 -320 493l-281 -414q-19 -28 -19 -48q0 -43 38.5 -66t84.5 -24v-61q-74 6 -165 6t-305 -6v61q196 0 285 131l323 477l-362 547 q-34 51 -99 64q-24 4 -81 4h-41v62q112 -6 292 -6t252 6v-62q-128 -5 -128 -58q0 -14 268 -410l225 333q17 25 17 46q0 43 -37.5 65.5t-83.5 23.5v62q81 -6 164.5 -6t305.5 6v-62q-198 -2 -285 -128l-271 -395l416 -629q35 -53 99 -66q30 -6 75 -6h8q25 1 42.5 1t27.5 -1h27 q128 0 147 36q9 17 9 49v1056q0 32 -9 49q-15 29 -94 34h-110v62q70 -6 115 -6h376q41 0 111 6v-62z" />
+<glyph unicode="Ⅻ" horiz-adv-x="2722" d="M2654 1284l-75 2q-140 0 -140 -85v-1057q0 -28 11 -48q19 -35 194 -35h10v-61q-71 6 -117 6h-1458q-100 0 -172 -6v61q128 5 128 59q0 10 -320 493l-281 -414q-19 -28 -19 -48q0 -43 38.5 -66t84.5 -24v-61q-74 6 -165 6t-305 -6v61q196 0 285 131l323 477l-362 547 q-34 51 -99 64q-24 4 -81 4h-41v62q112 -6 292 -6t252 6v-62q-128 -5 -128 -58q0 -14 268 -410l225 333q17 25 17 46q0 43 -37.5 65.5t-83.5 23.5v62q81 -6 164.5 -6t305.5 6v-62q-198 -2 -285 -128l-271 -395l416 -629q35 -53 99 -66q30 -6 75 -6h8q25 1 42.5 1t27.5 -1h27 q128 0 147 36q9 17 9 49v1056q0 32 -9 49q-15 29 -94 34h-110v62q70 -6 115 -6h978q41 0 111 6v-62zM2052 1284l-75 2q-140 0 -140 -85v-1057q0 -57 50 -75q27 -9 68.5 -9t63.5 0.5t80 0.5h63q78 6 94 35q9 17 9 49v1056q0 32 -9 49q-15 29 -95 34h-109z" />
+<glyph unicode="Ⅼ" horiz-adv-x="1217" d="M697 1284l-66 2q-156 0 -177 -36q-10 -17 -10 -48v-1062q0 -52 17.5 -65.5t68.5 -13.5h173q212 0 303 123q70 96 94 324h49l-55 -508h-1026v61q8 0 25.5 -0.5t27.5 -0.5q124 0 142 35q7 14 7 46v1064q0 32 -7 46q-17 33 -185 33h-10v62q71 -6 126 -6h383q47 0 120 6v-62z " />
+<glyph unicode="Ⅽ" horiz-adv-x="1335" d="M1267 854q0 -26 -29 -26t-35 32q-12 60 -47 178q-51 127 -151 208.5t-217 81.5t-220 -50q-298 -145 -298 -613.5t322 -606.5q96 -41 185 -41q140 0 256 85t159 218q17 52 27 140q4 33 23 33q24 0 24 -35q0 -205 -154 -353t-360 -148q-288 0 -486 213t-198 502.5 t198.5 503.5t485.5 214q193 0 363 -169l99 144q17 25 31 25q22 0 22 -33v-503z" />
+<glyph unicode="Ⅾ" horiz-adv-x="1460" d="M1226 1130q166 -200 166 -466t-172 -465t-432 -199h-720v61l62 -2q108 0 130 31q10 14 10 52v1060q0 36 -10 50q-21 29 -157 29h-35v62h720q263 0 438 -213zM1085 229q110 148 110 436.5t-103 433.5q-129 182 -359 182h-207q-53 0 -70 -13t-17 -66v-1062q0 -53 17.5 -66 t69.5 -13h209q225 0 350 168z" />
+<glyph unicode="Ⅿ" horiz-adv-x="1794" d="M1726 1281l-56 2q-125 0 -141 -41q-6 -15 -6 -45v-1058q0 -26 8 -43q17 -35 185 -35h10v-61q-75 6 -119 6h-334q-38 0 -113 -6v61h76q63 0 87 10q40 17 40 70v1140h-2l-483 -1245q-14 -36 -36 -36t-39 43l-476 1222h-2v-1064q0 -140 200 -140h3v-61q-209 6 -229 6 t-231 -6v61h3q199 0 199 140v1003q0 22 -6 38q-12 32 -89 39q-6 1 -32.5 1t-74.5 -1v62h341q45 0 61 -42l428 -1102l430 1108q14 36 49 36h349v-62z" />
+<glyph unicode="ⅰ" horiz-adv-x="563" d="M510 0q-202 6 -233 6t-224 -6v66l44 -1q66 0 89 13q33 18 33 79v582q0 85 -41 105q-21 11 -103 11h-14v68l298 23v-802q0 -59 51 -73q19 -5 69 -5h31v-66zM335.5 1356q33.5 -33 33.5 -80.5t-33.5 -81t-80.5 -33.5t-80 34.5t-33 80t33.5 79.5t80 34t80 -33z" />
+<glyph unicode="ⅱ" horiz-adv-x="1020" d="M792.5 1356q33.5 -33 33.5 -80.5t-33.5 -81t-80.5 -33.5t-80 34.5t-33 80t33.5 79.5t80 34t80 -33zM335.5 1356q33.5 -33 33.5 -80.5t-33.5 -81t-80.5 -33.5t-80 34.5t-33 80t33.5 79.5t80 34t80 -33zM510 0l-223 6q-41 0 -234 -6v66l44 -1q66 0 89 13q33 18 33 79v582 q0 85 -41 105q-21 11 -103 11h-14v68l298 23v-802q0 -59 51 -73q20 -6 59 -6q3 0 6 1q43 0 57.5 -0.5t51 -0.5t59.5 13q33 18 33 79v582q0 85 -41 105q-21 11 -103 11h-14v68l298 23v-802q0 -59 51 -73q19 -5 69 -5h31v-66q-202 6 -223 6z" />
+<glyph unicode="ⅲ" horiz-adv-x="1477" d="M1249.5 1356q33.5 -33 33.5 -80.5t-33.5 -81t-80.5 -33.5t-80 34.5t-33 80t33.5 79.5t80 34t80 -33zM792.5 1356q33.5 -33 33.5 -80.5t-33.5 -81t-80.5 -33.5t-80 34.5t-33 80t33.5 79.5t80 34t80 -33zM335.5 1356q33.5 -33 33.5 -80.5t-33.5 -81t-80.5 -33.5t-80 34.5 t-33 80t33.5 79.5t80 34t80 -33zM510 0l-223 6q-41 0 -234 -6v66l44 -1q66 0 89 13q33 18 33 79v582q0 85 -41 105q-21 11 -103 11h-14v68l298 23v-802q0 -59 51 -73q20 -6 59 -6q3 0 6 1q43 0 57.5 -0.5t51 -0.5t59.5 13q33 18 33 79v582q0 85 -41 105q-21 11 -103 11h-14 v68l298 23v-802q0 -59 51 -73q20 -6 59 -6q3 0 6 1q43 0 57.5 -0.5t51 -0.5t59.5 13q33 18 33 79v582q0 85 -41 105q-21 11 -103 11h-14v68l298 23v-802q0 -59 51 -73q19 -5 69 -5h31v-66q-202 6 -223 6l-234 -6l-223 6z" />
+<glyph unicode="ⅳ" horiz-adv-x="1571" d="M997 -24q-29 0 -45 40l-309 760q-24 60 -68 73q-18 6 -83 6h-19v68q120 -8 164 -8t276 8v-68q-122 0 -122 -54q0 -15 252 -634l219 546q13 32 13 50q0 90 -102 92v68q135 -8 194.5 -8t151.5 8v-68q-142 -1 -198 -142l-279 -697q-16 -40 -45 -40zM510 0q-202 6 -233 6 t-224 -6v66l44 -1q66 0 89 13q33 18 33 79v582q0 85 -41 105q-21 11 -103 11h-14v68l298 23v-802q0 -59 51 -73q19 -5 69 -5h31v-66zM335.5 1356q33.5 -33 33.5 -80.5t-33.5 -81t-80.5 -33.5t-80 34.5t-33 80t33.5 79.5t80 34t80 -33z" />
+<glyph unicode="ⅴ" horiz-adv-x="1152" d="M577 -24q-29 0 -45 40l-309 760q-24 60 -68 73q-18 6 -83 6h-19v68q120 -8 164 -8t276 8v-68q-122 0 -122 -54q0 -15 252 -634l219 546q13 32 13 50q0 90 -102 92v68q135 -8 194.5 -8t151.5 8v-68q-142 -1 -198 -142l-279 -697q-16 -40 -45 -40z" />
+<glyph unicode="ⅵ" horiz-adv-x="1601" d="M1373.5 1356q33.5 -33 33.5 -80.5t-33.5 -81t-80.5 -33.5t-80 34.5t-33 80t33.5 79.5t80 34t80 -33zM1548 0q-202 6 -233 6t-224 -6v66l44 -1q66 0 89 13q33 18 33 79v582q0 85 -41 105q-21 11 -103 11h-14q-142 -1 -198 -142l-279 -697q-16 -40 -45 -40t-45 40l-309 760 q-24 60 -68 73q-18 6 -83 6h-19v68q120 -8 164 -8t276 8v-68q-122 0 -122 -54q0 -15 252 -634l219 546q13 32 13 50q0 90 -102 92v68q135 -8 188.5 -8t157.5 8l298 23v-802q0 -59 51 -73q19 -5 69 -5h31v-66z" />
+<glyph unicode="ⅶ" horiz-adv-x="2058" d="M1830.5 1356q33.5 -33 33.5 -80.5t-33.5 -81t-80.5 -33.5t-80 34.5t-33 80t33.5 79.5t80 34t80 -33zM1373.5 1356q33.5 -33 33.5 -80.5t-33.5 -81t-80.5 -33.5t-80 34.5t-33 80t33.5 79.5t80 34t80 -33zM1548 0l-223 6q-41 0 -234 -6v66l44 -1q66 0 89 13q33 18 33 79 v582q0 85 -41 105q-21 11 -103 11h-14q-142 -1 -198 -142l-279 -697q-16 -40 -45 -40t-45 40l-309 760q-24 60 -68 73q-18 6 -83 6h-19v68q120 -8 164 -8t276 8v-68q-122 0 -122 -54q0 -15 252 -634l219 546q13 32 13 50q0 90 -102 92v68q135 -8 188.5 -8t157.5 8l298 23 v-802q0 -59 51 -73q20 -6 59 -6q3 0 6 1q43 0 57.5 -0.5t51 -0.5t59.5 13q33 18 33 79v582q0 85 -41 105q-21 11 -103 11h-14v68l298 23v-802q0 -59 51 -73q19 -5 69 -5h31v-66q-202 6 -223 6z" />
+<glyph unicode="ⅷ" horiz-adv-x="2515" d="M2287.5 1356q33.5 -33 33.5 -80.5t-33.5 -81t-80.5 -33.5t-80 34.5t-33 80t33.5 79.5t80 34t80 -33zM1830.5 1356q33.5 -33 33.5 -80.5t-33.5 -81t-80.5 -33.5t-80 34.5t-33 80t33.5 79.5t80 34t80 -33zM1373.5 1356q33.5 -33 33.5 -80.5t-33.5 -81t-80.5 -33.5t-80 34.5 t-33 80t33.5 79.5t80 34t80 -33zM1548 0l-223 6q-41 0 -234 -6v66l44 -1q66 0 89 13q33 18 33 79v582q0 85 -41 105q-21 11 -103 11h-14q-142 -1 -198 -142l-279 -697q-16 -40 -45 -40t-45 40l-309 760q-24 60 -68 73q-18 6 -83 6h-19v68q120 -8 164 -8t276 8v-68 q-122 0 -122 -54q0 -15 252 -634l219 546q13 32 13 50q0 90 -102 92v68q135 -8 188.5 -8t157.5 8l298 23v-802q0 -59 51 -73q20 -6 59 -6q3 0 6 1q43 0 57.5 -0.5t51 -0.5t59.5 13q33 18 33 79v582q0 85 -41 105q-21 11 -103 11h-14v68l298 23v-802q0 -59 51 -73 q20 -6 59 -6q3 0 6 1q43 0 57.5 -0.5t51 -0.5t59.5 13q33 18 33 79v582q0 85 -41 105q-21 11 -103 11h-14v68l298 23v-802q0 -59 51 -73q19 -5 69 -5h31v-66q-202 6 -223 6l-234 -6l-223 6z" />
+<glyph unicode="ⅸ" horiz-adv-x="1641" d="M335.5 1356q33.5 -33 33.5 -80.5t-33.5 -81t-80.5 -33.5t-80 34.5t-33 80t33.5 79.5t80 34t80 -33zM1588 0q-91 6 -175.5 6t-261.5 -6v66q77 3 77 54q0 10 -208 285q-192 -223 -192 -272q0 -61 62 -67v-66q-141 6 -221 6t-159 -6q-202 6 -233 6t-224 -6v66l44 -1 q66 0 89 13q33 18 33 79v582q0 85 -41 105q-21 11 -103 11h-14v68l298 23v-802q0 -58 51 -73q18 -5 79 -5h21q160 1 274 128l200 256l-212 276q-71 92 -105 110.5t-147 18.5v68q110 -8 171 -8t264 8v-68q-75 -2 -75 -52q0 -20 184 -255l134 167q33 41 33 75q0 61 -63 65v68 q108 -8 192.5 -8t188.5 8v-68q-152 -3 -255 -109q-26 -27 -197 -244l287 -369q37 -47 92 -60q28 -7 95 -7h17v-66z" />
+<glyph unicode="ⅹ" horiz-adv-x="1184" d="M1131 0q-91 6 -175.5 6t-261.5 -6v66q77 3 77 54q0 10 -208 285q-192 -223 -192 -272q0 -61 62 -67v-66q-141 6 -221 6t-159 -6v66q159 0 274 128l200 256l-212 276q-71 92 -105 110.5t-147 18.5v68q110 -8 171 -8t264 8v-68q-75 -2 -75 -52q0 -20 184 -255l134 167 q33 41 33 75q0 61 -63 65v68q108 -8 192.5 -8t188.5 8v-68q-152 -3 -255 -109q-26 -27 -197 -244l287 -369q37 -47 92 -60q28 -7 95 -7h17v-66z" />
+<glyph unicode="ⅺ" horiz-adv-x="1641" d="M1413.5 1356q33.5 -33 33.5 -80.5t-33.5 -81t-80.5 -33.5t-80 34.5t-33 80t33.5 79.5t80 34t80 -33zM1588 0q-202 6 -233 6t-224 -6q-91 6 -175.5 6t-261.5 -6v66q77 3 77 54q0 10 -208 285q-192 -223 -192 -272q0 -61 62 -67v-66q-141 6 -221 6t-159 -6v66 q159 0 274 128l200 256l-212 276q-71 92 -105 110.5t-147 18.5v68q110 -8 171 -8t264 8v-68q-75 -2 -75 -52q0 -20 184 -255l134 167q33 41 33 75q0 61 -63 65v68q108 -8 192.5 -8t188.5 8v-68q-152 -3 -255 -109q-26 -27 -197 -244l287 -369q37 -47 80.5 -57t87.5 -10h58 q15 -1 51.5 -1t59.5 13q33 18 33 79v582q0 85 -41 105q-21 11 -103 11h-14v68l298 23v-802q0 -59 51 -73q19 -5 69 -5h31v-66z" />
+<glyph unicode="ⅻ" horiz-adv-x="2098" d="M1870.5 1356q33.5 -33 33.5 -80.5t-33.5 -81t-80.5 -33.5t-80 34.5t-33 80t33.5 79.5t80 34t80 -33zM1413.5 1356q33.5 -33 33.5 -80.5t-33.5 -81t-80.5 -33.5t-80 34.5t-33 80t33.5 79.5t80 34t80 -33zM1588 0l-223 6q-41 0 -234 -6q-91 6 -175.5 6t-261.5 -6v66 q77 3 77 54q0 10 -208 285q-192 -223 -192 -272q0 -61 62 -67v-66q-141 6 -221 6t-159 -6v66q159 0 274 128l200 256l-212 276q-71 92 -105 110.5t-147 18.5v68q110 -8 171 -8t264 8v-68q-75 -2 -75 -52q0 -20 184 -255l134 167q33 41 33 75q0 61 -63 65v68q108 -8 192.5 -8 t188.5 8v-68q-152 -3 -255 -109q-26 -27 -197 -244l287 -369q37 -47 80.5 -57t87.5 -10h58q15 -1 51.5 -1t59.5 13q33 18 33 79v582q0 85 -41 105q-21 11 -103 11h-14v68l298 23v-802q0 -59 51 -73q20 -6 59 -6q3 0 6 1q43 0 57.5 -0.5t51 -0.5t59.5 13q33 18 33 79v582 q0 85 -41 105q-21 11 -103 11h-14v68l298 23v-802q0 -59 51 -73q19 -5 69 -5h31v-66q-202 6 -223 6z" />
+<glyph unicode="ⅼ" horiz-adv-x="579" d="M53 66l68 -2q98 0 98 98v1115q0 87 -44 108q-21 10 -106 10h-16v67l306 23v-1323q0 -50 13.5 -69t49.5 -23q29 -4 81 -4h24v-66q-220 6 -247.5 6t-226.5 -6v66z" />
+<glyph unicode="ⅽ" horiz-adv-x="920" d="M868 254q0 -22 -27 -75q-104 -203 -329 -203q-194 0 -326.5 144.5t-132.5 343t132 347.5t330 149q121 0 215 -54q113 -64 113 -170t-97 -106q-42 0 -70.5 28t-28.5 70q0 94 100 99q-79 78 -229 78q-60 0 -120 -34q-168 -94 -168 -402.5t178 -404.5q63 -34 123 -34 q113 0 181 64q40 37 74 109.5t53 72.5q29 0 29 -22z" />
+<glyph unicode="ⅾ" horiz-adv-x="1159" d="M793 118q-111 -142 -295 -142t-314.5 144.5t-130.5 340.5t139.5 340.5t336.5 144.5q163 0 270 -133v464q0 88 -47 109q-20 10 -85 10q-16 0 -35 -1v67l308 23v-1300q0 -88 46 -110q20 -10 85 -10q16 0 35 1v-66l-313 -24v142zM793 253v449q0 32 -24 68q-87 129 -236 129 t-238 -138q-65 -100 -65 -300t61 -299q85 -138 224 -138q93 0 185.5 69.5t92.5 159.5z" />
+<glyph unicode="ⅿ" horiz-adv-x="1775" d="M1485 6q-40 0 -244 -6v66q26 -1 70 -1t65 13q32 19 32 84v499q0 238 -157 238q-130 0 -209.5 -104.5t-79.5 -238.5v-401q0 -39 12 -60q18 -30 118 -30q17 0 37 1v-66q-198 6 -237.5 6t-244.5 -6v66q26 -1 70 -1t65 13q32 19 32 84v499q0 238 -158 238 q-130 0 -209.5 -104.5t-79.5 -238.5v-397q0 -47 11 -64q18 -30 114 -30q19 0 40 1v-66q-198 6 -236 6t-243 -6v66q26 -1 69.5 -1t70 16t26.5 81v574q0 87 -44 109q-21 10 -96 10h-26v68l301 23v-225q101 225 316 225q251 0 284 -210q43 95 126.5 152.5t185.5 57.5 q158 0 224.5 -81t66.5 -243v-42q-1 -27 -1 -41v-409q0 -65 132 -65q17 0 35 1v-66q-198 6 -238 6z" />
+<glyph unicode="ↀ" horiz-adv-x="2211" d="M1539 1343q263 0 433.5 -206.5t170.5 -472.5t-172 -465t-432 -199h-867q-260 0 -432 199t-172 465t170.5 472.5t433.5 206.5h867zM1836 229q110 148 110 436.5t-103 433.5q-129 182 -359 182h-207q-53 0 -70 -13t-17 -66v-1062q0 -53 17.5 -66t69.5 -13h209 q225 0 350 168zM1021 140v1062q0 53 -17 66t-70 13h-207q-230 0 -359 -182q-103 -145 -103 -433.5t110 -436.5q125 -168 350 -168h209q52 0 69.5 13t17.5 66z" />
+<glyph unicode="ↁ" horiz-adv-x="1460" d="M1226 1130q166 -200 166 -466t-172 -465t-432 -199h-720v61l62 -2q108 0 130 31q10 14 10 52v1060q0 36 -10 50q-21 29 -157 29h-35v62h720q263 0 438 -213zM1085 229q110 148 110 436.5t-103 433.5q-129 182 -359 182h-207q-53 0 -70 -13t-17 -66v-209h150 q131 0 216.5 -103.5t85.5 -236.5t-86 -232.5t-216 -99.5h-150v-181q0 -53 17.5 -66t69.5 -13h209q225 0 350 168zM483 382q230 0 230 275t-231 275q-27 0 -35 -7t-8 -33v-471q0 -39 44 -39z" />
+<glyph unicode="ↂ" horiz-adv-x="2211" d="M1539 1343q263 0 433.5 -206.5t170.5 -472.5t-172 -465t-432 -199h-867q-260 0 -432 199t-172 465t170.5 472.5t433.5 206.5h867zM1836 229q110 148 110 436.5t-103 433.5q-129 182 -359 182h-207q-53 0 -70 -13t-17 -66v-209h150q131 0 216.5 -103.5t85.5 -236.5 t-86 -232.5t-216 -99.5h-150v-181q0 -53 17.5 -66t69.5 -13h209q225 0 350 168zM1234 382q230 0 230 275t-231 275q-27 0 -35 -7t-8 -33v-471q0 -39 44 -39zM1021 421v471q0 26 -8 33t-34 7q-231 0 -231 -275t230 -275q43 0 43 39zM1021 140v181h-150q-130 0 -216 99.5 t-86 232.5t85.5 236.5t216.5 103.5h150v209q0 53 -17 66t-70 13h-207q-230 0 -359 -182q-103 -145 -103 -433.5t110 -436.5q125 -168 350 -168h209q52 0 69.5 13t17.5 66z" />
+<glyph unicode="Ↄ" horiz-adv-x="1335" d="M583 1390q287 0 485.5 -214t198.5 -503.5t-198 -502.5t-486 -213q-206 0 -360 148t-154 353q0 35 24 35q19 0 23 -33q10 -88 27 -140q43 -133 159 -218t256 -85q89 0 185 41q322 138 322 606.5t-298 613.5q-103 50 -220 50t-217 -81.5t-151 -208.5q-22 -56 -47 -178 q-6 -32 -35 -32t-29 26l1 503q0 33 21 33q14 0 31 -25l99 -144q170 169 363 169z" />
+<glyph unicode="ↄ" horiz-adv-x="920" d="M406 960q198 0 330 -149t132 -347.5t-132.5 -343t-326.5 -144.5q-225 0 -329 203q-27 53 -27 75t29 22q19 0 53 -72.5t74 -109.5q68 -64 181 -64q60 0 123 34q178 96 178 404.5t-168 402.5q-60 34 -120 34q-150 0 -229 -78q100 -5 100 -99q0 -42 -28.5 -70t-70.5 -28 q-97 0 -97 106t113 170q94 54 215 54z" />
+<glyph unicode="ↅ" horiz-adv-x="1354" d="M1286 1246q0 -7 -6 -20l-93 -196q-11 -23 -27 -23q-32 0 -28 30q2 12 2 24q0 126 -164 213q-101 54 -199 54t-192 -46q-170 -83 -239.5 -220t-69.5 -339.5t66 -330.5q74 -145 246 -228q97 -47 206 -47q288 0 359 290h121v-809h-174v583q-110 -124 -338 -124 q-292 0 -490 188t-198 476.5t198 478.5t486 190q238 0 423 -144q62 23 86.5 23t24.5 -23z" />
+<glyph unicode="ↆ" horiz-adv-x="1396" d="M610 1343h174v-1254l417 547l127 -97l-567 -744h-128l-565 744l127 97l415 -546v1253z" />
+<glyph unicode="ↇ" horiz-adv-x="1554" d="M882 1343q263 0 433.5 -206.5t170.5 -472.5t-172 -465t-432 -199h-814v61l62 -2q108 0 130 31q10 14 10 52v1060q0 36 -10 50q-21 29 -157 29h-35v62h814zM1179 229q110 148 110 436.5t-103 433.5q-129 182 -359 182h-301q-53 0 -70 -13t-17 -66v-31h278q208 0 335 -158 t127 -348.5t-128 -342t-332 -151.5h-280v-31q0 -53 17.5 -66t69.5 -13h303q225 0 350 168zM589 211q181 0 296.5 135t115.5 306.5t-108 303.5q-119 147 -304 147h-150v-110h150q131 0 216.5 -103.5t85.5 -236.5t-86 -232.5t-216 -99.5h-150v-110h150zM483 382q230 0 230 275 t-231 275q-27 0 -35 -7t-8 -33v-471q0 -39 44 -39z" />
+<glyph unicode="ↈ" horiz-adv-x="2399" d="M1727 1343q263 0 433.5 -206.5t170.5 -472.5t-172 -465t-432 -199h-1055q-260 0 -432 199t-172 465t170.5 472.5t433.5 206.5h1055zM2024 229q110 148 110 436.5t-103 433.5q-129 182 -359 182h-301q-53 0 -70 -13t-17 -66v-31h278q208 0 335 -158t127 -348.5t-128 -342 t-332 -151.5h-280v-31q0 -53 17.5 -66t69.5 -13h303q225 0 350 168zM1434 211q181 0 296.5 135t115.5 306.5t-108 303.5q-119 147 -304 147h-150v-110h150q131 0 216.5 -103.5t85.5 -236.5t-86 -232.5t-216 -99.5h-150v-110h150zM1328 382q230 0 230 275t-231 275 q-27 0 -35 -7t-8 -33v-471q0 -39 44 -39zM1115 421v471q0 26 -8 33t-34 7q-231 0 -231 -275t230 -275q43 0 43 39zM1115 211v110h-150q-130 0 -216 99.5t-86 232.5t85.5 236.5t216.5 103.5h150v110h-150q-185 0 -304 -147q-108 -132 -108 -303.5t115.5 -306.5t296.5 -135 h150zM1115 140v31h-280q-204 0 -332 151.5t-128 342t127 348.5t335 158h278v31q0 53 -17 66t-70 13h-301q-230 0 -359 -182q-103 -145 -103 -433.5t110 -436.5q125 -168 350 -168h303q52 0 69.5 13t17.5 66z" />
+<glyph unicode="↉" horiz-adv-x="1722" d="M1655 -82q0 -120 -103.5 -198.5t-231.5 -78.5t-223 56q-110 65 -110 171q0 90 97 90q42 0 70 -24.5t28 -62.5q0 -82 -93 -87q74 -85 219 -85q88 0 131 72q35 58 35 147q0 220 -176 220h-81q-35 0 -35 25.5t90.5 30.5t133.5 67t43 153q0 146 -140 146q-123 0 -187 -67 q86 -8 86 -79q0 -80 -89.5 -80t-89.5 81q0 94 97 150q83 49 191 49t195 -49q102 -57 102 -152q0 -79 -54.5 -144t-138.5 -98q100 -27 167 -94.5t67 -158.5zM676 1363q63 -111 63 -325.5t-59 -321.5q-91 -166 -277 -166t-277 160q-63 111 -63 325.5t59 321.5q91 166 277 166 t277 -160zM1419 1415q0 -13 -6 -22l-1071 -1667q-11 -17 -35 -17q-40 0 -40 40q0 13 6 22l1071 1667q11 17 35 17q40 0 40 -40zM590 965v173q0 335 -190 335t-190 -365v-173q0 -335 190 -335t190 365z" />
+<glyph unicode="↊" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="↋" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="↌" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="↍" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="↎" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="↏" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="←" d="M1931 582q0 -41 -39 -41h-1554q228 -162 288 -432q7 -31 7 -35q0 -24 -21 -27h-41q-14 0 -20 19q-33 175 -142 303.5t-278 192.5q-16 6 -16 20t16 23l46 18q282 122 363 428q3 16 9.5 40.5t26.5 26.5q-9 -1 36 -1q21 0 21 -27q0 -4 -7 -35q-59 -266 -288 -432h1554 q39 0 39 -41z" />
+<glyph unicode="↑" horiz-adv-x="1024" d="M471 1200q-135 -223 -414 -293q-21 0 -23 23q1 -11 1 40q0 13 14 19q22 6 65 19q132 46 229.5 150.5t132.5 238.5q3 23 13 67q6 18 24 18t22 -18q4 -22 13 -66q35 -135 132.5 -239.5t229.5 -150.5q22 -6 65 -19q14 -4 14 -64q0 -18 -22 -18l-6 2q-102 28 -160 59 q-158 84 -248 232v-1481q0 -37 -41 -37t-41 37v1481z" />
+<glyph unicode="→" d="M1906 611q25 -11 25 -27t-15 -22l-46 -18q-190 -83 -296 -265q-41 -70 -79 -213q-2 -7 -8 -13t-53 -6q-21 0 -21 27q0 2 8 36q65 274 287 431h-1554q-39 0 -39 41t39 41h1554q-154 111 -238 288q-57 121 -57 179q0 24 21 28q-3 -1 41 -1q15 0 20 -19q14 -55 54 -163 q105 -217 317 -310z" />
+<glyph unicode="↓" horiz-adv-x="1024" d="M553 -36q136 223 414 293q22 0 22 -18q0 -60 -14 -64q-22 -6 -65 -19q-132 -46 -229.5 -150.5t-132.5 -239.5q-4 -22 -13 -66q-4 -18 -22 -18t-24 18q-4 23 -13 67q-35 134 -132.5 238.5t-229.5 150.5q-22 6 -65 19q-14 6 -14 19q0 51 -1 40q2 23 23 23l6 -2 q104 -29 161 -59q157 -83 247 -232v1481q0 37 41 37t41 -37v-1481z" />
+<glyph unicode="↔" d="M1917 605q14 -8 14 -22.5t-14 -20.5q-223 -79 -343 -283q-43 -74 -79 -213q-2 -7 -8 -13t-53 -6q-21 0 -21 27q0 2 8 36q65 274 287 431h-1370q228 -162 288 -432q7 -31 7 -35q0 -24 -21 -27h-41q-14 0 -20 19q-35 177 -143 305t-277 191q-16 6 -16 20.5t59 39.5 q138 59 233.5 171.5t133.5 261.5q3 15 10 43q5 18 25 20q-9 -1 36 -1q21 0 21 -27q0 -4 -7 -35q-59 -266 -288 -432h1370q-154 111 -238 288q-57 121 -57 179q0 24 21 27h41q15 0 20 -19q49 -191 144 -303t225 -169q19 -6 53 -21z" />
+<glyph unicode="↕" horiz-adv-x="1024" d="M553 -35q135 222 414 292q20 0 23 -24q-1 9 -1 -39q0 -14 -14 -18q-76 -23 -117.5 -40.5t-90.5 -52.5q-173 -124 -222 -329q-3 -18 -10 -54q-5 -18 -23 -18t-22 18l-18 80q-14 62 -60 137q-109 177 -304 243q-20 4 -59 16q-14 5 -14 63q0 18 22 18l6 -2q102 -28 158 -57 q158 -82 250 -233v1234q-136 -223 -414 -292q-22 0 -22 63q0 13 14 18q20 5 59 16q194 66 304 244q44 72 65 154q3 21 12 62q5 18 23.5 18t22.5 -18q4 -22 13 -66q34 -133 131.5 -237.5t220.5 -150.5l75 -22q14 -5 14 -63q0 -18 -22 -18l-6 2q-277 76 -408 290v-1234z" />
+<glyph unicode="↖" d="M1924 -274q0 -44 -44 -44q-14 0 -24 10l-1556 1556q19 -77 19 -150q0 -173 -101 -345q-8 -13 -18.5 -13t-30.5 20t-20 30l35 69q56 112 56 249q0 160 -76 283q-40 66 -40 68q0 23 24 23l67 -40q127 -76 273 -76t259 56q71 35 67 35q10 0 30.5 -19t20.5 -31t-12 -19 q-165 -100 -346 -100q-76 0 -149 18l1556 -1556q10 -10 10 -24z" />
+<glyph unicode="↗" d="M1924 1459q0 -2 -40 -68q-76 -123 -76 -271.5t56 -260.5l35 -69q0 -10 -20 -30t-30.5 -20t-18.5 13q-101 172 -101 345q0 73 19 150l-1556 -1556q-10 -10 -24 -10q-44 0 -44 44q0 14 10 24l1556 1556q-73 -18 -149 -18q-181 0 -346 100q-12 7 -12 19t20.5 31t30.5 19 q-4 0 67 -35q113 -56 259 -56t273 76l67 40q24 0 24 -23z" />
+<glyph unicode="↘" d="M1924 -295q0 -23 -24 -23l-67 40q-127 76 -273 76t-259 -56q-71 -35 -67 -35q-10 0 -30.5 19t-20.5 31t12 19q165 100 346 100q76 0 149 -18l-1556 1556q-10 10 -10 24q0 44 44 44q14 0 24 -10l1556 -1556q-19 77 -19 150q0 173 101 345q8 13 18.5 13t30.5 -20t20 -30 l-35 -69q-56 -112 -56 -249q0 -160 76 -283q40 -66 40 -68z" />
+<glyph unicode="↙" d="M1924 1438q0 -14 -10 -24l-1556 -1556q73 18 149 18q181 0 346 -100q12 -7 12 -19t-20.5 -31t-30.5 -19q4 0 -67 35q-113 56 -259 56t-273 -76l-67 -40q-24 0 -24 23q0 2 40 68q76 123 76 271.5t-56 260.5l-35 69q0 10 20 30t30.5 20t18.5 -13q101 -172 101 -345 q0 -73 -19 -150l1556 1556q10 10 24 10q44 0 44 -44z" />
+<glyph unicode="↚" d="M1931 582q0 -41 -39 -41h-644l-257 -445q-23 -40 -46 -40q-41 0 -41 38q0 15 16 43l233 404h-815q228 -162 288 -432q7 -31 7 -35q0 -24 -21 -27h-41q-14 0 -20 19q-33 175 -142 303.5t-278 192.5q-16 6 -16 20t16 23l46 18q282 122 363 428q3 16 9.5 40.5t26.5 26.5 q-9 -1 36 -1q21 0 21 -27q0 -4 -7 -35q-59 -266 -288 -432h863l257 446q23 39 45 39q41 0 41 -38q0 -16 -15 -42l-234 -405h597q39 0 39 -41z" />
+<glyph unicode="↛" d="M1906 611q25 -11 25 -27t-15 -22l-46 -18q-190 -83 -296 -265q-41 -70 -79 -213q-2 -7 -8 -13t-53 -6q-21 0 -21 27q0 2 8 36q65 274 287 431h-860l-257 -445q-23 -40 -46 -40q-41 0 -41 38q0 15 16 43l233 404h-599q-39 0 -39 41t39 41h647l257 446q23 39 45 39 q41 0 41 -38q0 -16 -15 -42l-234 -405h813q-154 111 -238 288q-57 121 -57 179q0 24 21 28q-3 -1 41 -1q15 0 20 -19q14 -55 54 -163q105 -217 317 -310z" />
+<glyph unicode="↜" d="M1980 582q0 -14 -11 -27q-105 -121 -164 -167q-101 -78 -205 -78t-206 78q-59 46 -160.5 161t-153.5 156q-83 65 -164 65t-240.5 -114.5t-264.5 -114.5h-73q244 -175 295 -467q0 -27 -20 -27h-41q-18 0 -21 19q-31 171 -144.5 304.5t-276.5 188.5q-15 8 -15 23.5t15 19.5 q163 57 276.5 191t144.5 305q3 19 21 19h41q20 0 20 -27q-51 -292 -295 -467h73q84 0 240.5 114.5t263 114.5t207.5 -77q63 -48 162.5 -161t152.5 -156q84 -66 163 -66t162 66q50 41 148 151q12 14 31 14q39 0 39 -41z" />
+<glyph unicode="↝" d="M1980 582q0 -16 -15 -20q-163 -57 -276.5 -191t-144.5 -305q-3 -19 -21 -19h-41q-20 0 -20 27q51 292 295 467h-73q-84 0 -240.5 -114.5t-263 -114.5t-207.5 77q-63 48 -162.5 161t-152.5 156q-84 66 -163 66t-162 -66q-50 -41 -148 -151q-12 -14 -31 -14q-39 0 -39 41 q0 14 11 27q105 121 164 167q101 78 205 78t206 -78q59 -46 160.5 -161t153.5 -156q83 -65 164 -65t240.5 114.5t264.5 114.5h73q-244 175 -295 467q0 27 20 27h41q18 0 21 -19q31 -171 144.5 -304.5t276.5 -188.5q15 -7 15 -23z" />
+<glyph unicode="↞" d="M1931 582q0 -41 -39 -41h-1164q228 -162 288 -432q7 -31 7 -35q0 -24 -21 -27h-41q-14 0 -20 19q-33 175 -134.5 295t-234.5 180h-234q228 -162 288 -432q7 -31 7 -35q0 -24 -21 -27h-41q-14 0 -20 19q-33 175 -142 303.5t-278 192.5q-16 6 -16 20t16 23l46 18 q282 122 363 428q3 16 9.5 40.5t26.5 26.5q-9 -1 36 -1q21 0 21 -27q0 -4 -7 -35q-59 -266 -288 -432h229q282 122 363 428q3 16 9.5 40.5t26.5 26.5q-9 -1 36 -1q21 0 21 -27q0 -4 -7 -35q-59 -266 -288 -432h1164q39 0 39 -41z" />
+<glyph unicode="↟" horiz-adv-x="1024" d="M471 1200q-135 -223 -414 -293q-21 0 -23 23q1 -11 1 40q0 13 14 19q22 6 65 19q132 46 229.5 150.5t132.5 238.5q3 23 13 67q6 18 24 18t22 -18q4 -22 13 -66q35 -135 132.5 -239.5t229.5 -150.5q22 -6 65 -19q14 -4 14 -64q0 -18 -22 -18l-6 2q-102 28 -160 59 q-158 84 -248 232v-140q38 -129 134 -228.5t223 -143.5q22 -6 65 -19q14 -4 14 -64q0 -18 -22 -18l-6 2q-102 28 -160 59q-158 84 -248 232v-1161q0 -37 -41 -37t-41 37v1161q-135 -223 -414 -293q-21 0 -23 23q1 -11 1 40q0 13 14 19q22 6 65 19q127 44 223 143.5 t134 227.5v141z" />
+<glyph unicode="↠" d="M1931 582q0 -14 -16 -20q-259 -98 -369 -334q-23 -49 -33 -90l-18 -72q-6 -19 -20 -19h-41q-21 3 -21 27q0 4 7 35q60 270 288 432h-234q-133 -60 -226 -170q-94 -111 -132 -258q-3 -16 -10 -41t-21 -25h-41q-21 3 -21 27q0 4 7 35q60 270 288 432h-1164q-39 0 -39 41 t39 41h1164q-229 166 -288 432q-7 31 -7 35q0 27 21 27q45 0 36 1q20 -2 24 -19t12 -48q38 -146 132.5 -257.5t230.5 -170.5h229q-229 166 -288 432q-7 31 -7 35q0 27 21 27q45 0 36 1q20 -2 24 -19t12 -48q38 -146 132.5 -257.5t230.5 -170.5q16 -5 46 -18q16 -9 16 -23z " />
+<glyph unicode="↡" horiz-adv-x="1024" d="M553 -36q136 223 414 293q22 0 22 -18q0 -60 -14 -64q-22 -6 -65 -19q-132 -46 -229.5 -150.5t-132.5 -239.5q-4 -22 -13 -66q-4 -18 -22 -18t-24 18q-4 23 -13 67q-35 134 -132.5 238.5t-229.5 150.5q-22 6 -65 19q-14 6 -14 19q0 51 -1 40q2 23 23 23l6 -2 q104 -29 161 -59q157 -83 247 -232v141q-38 128 -134 227.5t-223 143.5q-22 6 -65 19q-14 6 -14 19q0 51 -1 40q2 23 23 23l6 -2q104 -29 161 -59q157 -83 247 -232v1161q0 37 41 37t41 -37v-1161q136 223 414 293q22 0 22 -18q0 -60 -14 -64q-22 -6 -65 -19 q-127 -44 -223 -143.5t-134 -228.5v-140z" />
+<glyph unicode="↢" d="M1963 74q0 -27 -21 -27q-45 0 -36 -1q-20 2 -24 19t-12 48q-38 146 -132.5 257.5t-230.5 170.5h-1169q228 -162 288 -432q7 -31 7 -35q0 -24 -21 -27h-41q-14 0 -20 19q-33 175 -142 303.5t-278 192.5q-16 6 -16 20t16 23l46 18q282 122 363 428q3 16 9.5 40.5t26.5 26.5 q-9 -1 36 -1q21 0 21 -27q0 -4 -7 -35q-59 -266 -288 -432h1169q282 122 363 428q3 16 9.5 40.5t26.5 26.5q-9 -1 36 -1q21 0 21 -27q0 -4 -7 -35q-26 -118 -93 -224q-97 -154 -247 -249q150 -95 247 -249q67 -106 93 -224q7 -31 7 -35z" />
+<glyph unicode="↣" d="M1963 582q0 -14 -16 -20q-259 -98 -369 -334q-23 -49 -33 -90l-18 -72q-6 -19 -20 -19h-41q-21 3 -21 27q0 4 7 35q60 270 288 432h-1169q-282 -122 -363 -428q-3 -16 -9.5 -40.5t-26.5 -26.5q9 1 -36 1q-21 0 -21 27q0 4 7 35q26 118 93 224q97 154 247 249 q-150 95 -247 249q-67 106 -93 224q-7 31 -7 35q0 27 21 27q45 0 36 1q20 -2 24 -19t12 -48q38 -146 132.5 -257.5t230.5 -170.5h1169q-229 166 -288 432q-7 31 -7 35q0 27 21 27q45 0 36 1q20 -2 24 -19t12 -48q38 -146 132.5 -257.5t230.5 -170.5q16 -5 46 -18 q16 -9 16 -23z" />
+<glyph unicode="↤" d="M1965 44q0 -62 -41 -62t-41 62v497h-1545q228 -162 288 -432q7 -31 7 -35q0 -24 -21 -27h-41q-14 0 -20 19q-33 175 -142 303.5t-278 192.5q-16 6 -16 20t16 23l46 18q282 122 363 428q3 16 9.5 40.5t26.5 26.5q-9 -1 36 -1q21 0 21 -27q0 -4 -7 -35q-59 -266 -288 -432 h1545v498q0 61 41 61t41 -61v-1077z" />
+<glyph unicode="↥" horiz-adv-x="1024" d="M471 1200q-135 -223 -414 -293q-21 0 -23 23q1 -11 1 40q0 13 14 19q22 6 65 19q132 46 229.5 150.5t132.5 238.5q3 23 13 67q6 18 24 18t22 -18q4 -22 13 -66q35 -135 132.5 -239.5t229.5 -150.5q22 -6 65 -19q14 -4 14 -64q0 -18 -22 -18l-6 2q-102 28 -160 59 q-158 84 -248 232v-1481q0 -37 -41 -37t-41 37v1481zM926 1606q63 0 63 -40.5t-63 -40.5h-828q-63 0 -63 40.5t63 40.5h828z" />
+<glyph unicode="↦" d="M1906 611q25 -11 25 -27t-15 -22l-46 -18q-190 -83 -296 -265q-41 -70 -79 -213q-2 -7 -8 -13t-53 -6q-21 0 -21 27q0 2 8 36q65 274 287 431h-1543v-497q0 -62 -41 -62t-41 62v1077q0 61 41 61t41 -61v-498h1543q-154 111 -238 288q-57 121 -57 179q0 24 21 28 q-3 -1 41 -1q15 0 20 -19q14 -55 54 -163q105 -217 317 -310z" />
+<glyph unicode="↧" horiz-adv-x="1024" d="M553 -36q136 223 414 293q22 0 22 -18q0 -60 -14 -64q-22 -6 -65 -19q-132 -46 -229.5 -150.5t-132.5 -239.5q-4 -22 -13 -66q-4 -18 -22 -18t-24 18q-4 23 -13 67q-35 134 -132.5 238.5t-229.5 150.5q-22 6 -65 19q-14 6 -14 19q0 51 -1 40q2 23 23 23l6 -2 q104 -29 161 -59q157 -83 247 -232v1481q0 37 41 37t41 -37v-1481zM926 -361q63 0 63 -40.5t-63 -40.5h-828q-63 0 -63 40.5t63 40.5h828z" />
+<glyph unicode="↨" horiz-adv-x="1024" d="M553 -35q135 222 414 292q20 0 23 -24q-1 9 -1 -39q0 -14 -14 -18q-76 -23 -117.5 -40.5t-90.5 -52.5q-173 -124 -222 -329q-3 -18 -10 -54q-5 -18 -23 -18t-22 18l-18 80q-14 62 -60 137q-109 177 -304 243q-20 4 -59 16q-14 5 -14 63q0 18 22 18l6 -2q102 -28 158 -57 q158 -82 250 -233v1234q-136 -223 -414 -292q-22 0 -22 63q0 13 14 18q20 5 59 16q194 66 304 244q44 72 65 154q3 21 12 62q5 18 23.5 18t22.5 -18q4 -22 13 -66q34 -133 131.5 -237.5t220.5 -150.5l75 -22q14 -5 14 -63q0 -18 -22 -18l-6 2q-277 76 -408 290v-1234z M926 -361q63 0 63 -40.5t-63 -40.5h-828q-63 0 -63 40.5t63 40.5h828z" />
+<glyph unicode="↩" d="M1624 1168l-89 -10q-41 0 -41 44q0 48 130 48q348 0 348 -355q0 -244 -194 -316q-104 -38 -401 -38h-1039q222 -158 288 -432q7 -29 7 -35q0 -28 -37.5 -28t-43 18t-12.5 49q-37 146 -134.5 261t-274.5 188q-16 7 -16 21t62 40q133 56 229 170q114 135 141 294 q7 23 16 27t20 4q50 0 50 -28q0 -6 -7 -35q-65 -270 -288 -432h1159q184 0 271 44q122 62 122 228q0 142 -62 207.5t-204 65.5z" />
+<glyph unicode="↪" d="M552 1158l-89 10q-142 0 -204 -65.5t-62 -207.5q0 -166 122 -228q87 -44 271 -44h1159q-223 162 -288 432q-7 29 -7 35q0 28 50 28q24 0 32 -20q4 -16 11 -47q37 -144 133.5 -258t229.5 -170q62 -26 62 -40t-16 -21q-177 -73 -274.5 -188t-134.5 -261q-3 -16 -11 -47 q-7 -20 -44.5 -20t-37.5 28q0 6 7 35q66 274 288 432h-1039q-297 0 -401 38q-194 72 -194 316q0 355 348 355q130 0 130 -48q0 -44 -41 -44z" />
+<glyph unicode="↫" d="M1972 895q0 -249 -203 -319q-102 -35 -413 -35v-520q0 -37 -41 -37t-41 37v520h-936q228 -162 288 -432q7 -31 7 -35q0 -24 -21 -27h-41q-14 0 -20 19q-33 175 -142 303.5t-278 192.5q-16 6 -16 20t16 23l46 18q282 122 363 428q3 16 9.5 40.5t26.5 26.5q-9 -1 36 -1 q21 0 21 -27q0 -4 -7 -35q-59 -266 -288 -432h936v59q0 261 50 381q78 187 300 187q348 0 348 -355zM1356 623l141 -2q183 0 269 44q124 62 124 230q0 142 -62 207.5t-204 65.5q-184 0 -239 -164q-29 -85 -29 -322v-59z" />
+<glyph unicode="↬" d="M1933 582q0 -14 -16 -20q-259 -98 -369 -334q-23 -49 -33 -90l-18 -72q-6 -19 -20 -19h-41q-21 3 -21 27q0 4 7 35q60 270 288 432h-936v-520q0 -37 -41 -37t-41 37v520q-311 0 -413 35q-203 70 -203 319q0 355 348 355q222 0 300 -187q50 -120 50 -381v-59h936 q-229 166 -288 432q-7 31 -7 35q0 27 21 27q45 0 36 1q20 -2 24 -19t12 -48q38 -146 132.5 -257.5t230.5 -170.5q16 -5 46 -18q16 -9 16 -23zM551 621l141 2v59q0 237 -29 322q-55 164 -239 164q-142 0 -204 -65.5t-62 -207.5q0 -168 124 -230q86 -44 269 -44z" />
+<glyph unicode="↭" horiz-adv-x="2560" d="M2399 582q0 -16 -15 -20q-163 -57 -276.5 -191t-144.5 -305q-3 -19 -21 -19h-41q-20 0 -20 27q51 292 295 467h-72q-84 0 -241 -115t-263 -115t-208 77q-64 48 -163.5 161.5t-151.5 155.5q-83 66 -162.5 66t-240 -115t-264.5 -115h-72q244 -175 295 -467q0 -27 -20 -27 h-41q-18 0 -21 19q-31 171 -144.5 304.5t-276.5 188.5q-15 8 -15 23.5t15 19.5q163 57 276.5 191t144.5 305q3 19 21 19h41q20 0 20 -27q-51 -292 -295 -467h72q82 0 239.5 115t263.5 115t208 -78q59 -46 160.5 -161t153.5 -156q83 -65 163.5 -65t241 115t264.5 115h72 q-244 175 -295 467q0 27 20 27h41q18 0 21 -19q31 -171 144.5 -304.5t276.5 -188.5q15 -7 15 -23z" />
+<glyph unicode="↮" horiz-adv-x="2560" d="M2420 611q25 -11 25 -27t-15 -22l-46 -18q-190 -83 -296 -265q-41 -70 -79 -213q-2 -7 -8 -13t-53 -6q-21 0 -21 27q0 2 8 36q65 274 287 431h-924l-257 -445q-23 -40 -46 -40q-41 0 -41 38q0 15 16 43l233 404h-865q228 -162 288 -432q7 -31 7 -35q0 -24 -21 -27h-41 q-14 0 -20 19q-33 175 -142 303.5t-278 192.5q-16 6 -16 20t16 23l46 18q282 122 363 428q3 16 9.5 40.5t26.5 26.5q-9 -1 36 -1q21 0 21 -27q0 -4 -7 -35q-59 -266 -288 -432h913l257 446q23 39 45 39q41 0 41 -38q0 -16 -15 -42l-234 -405h877q-154 111 -238 288 q-57 121 -57 179q0 24 21 28q-3 -1 41 -1q15 0 20 -19q14 -55 54 -163q105 -217 317 -310z" />
+<glyph unicode="↯" d="M1924 1488q0 -21 -18 -31l-992 -573l590 -400l-1113 -643q271 -6 456 -207q8 -9 8 -19t-22 -24t-37 -14q-1 0 -60 52q-156 138 -375 138q-76 0 -147.5 -21t-67.5 -21q-22 0 -22 22q0 9 58 63q166 155 166 406q0 55 -10 102l-16 71q0 12 22.5 26.5t35 14.5t18.5 -18 q29 -89 29 -201q0 -159 -77 -299l1001 579l-589 400l1103 637q7 4 17 4q42 0 42 -44z" />
+<glyph unicode="↰" horiz-adv-x="1024" d="M906 41q0 -41 -41 -41t-41 41v1052h-527q126 -107 178 -251q3 -8 3 -15q0 -39 -42 -39q-24 0 -34 22l-27 62q-76 149 -230 236q-27 15 -27 26t27 26q155 88 230 237q8 20 25 59q12 26 36 26q42 0 42 -39q0 -7 -3 -15q-52 -146 -179 -253h569q41 0 41 -41v-1093z" />
+<glyph unicode="↱" horiz-adv-x="1024" d="M906 1134q0 -11 -27 -26q-154 -87 -230 -236l-25 -58q-12 -26 -36 -26q-42 0 -42 39q0 7 3 15q52 144 178 251h-527v-1052q0 -41 -41 -41t-41 41v1093q0 41 41 41h569q-127 107 -179 253q-3 8 -3 15q0 39 42 39q24 0 34 -23l27 -62q75 -149 230 -237q27 -15 27 -26z" />
+<glyph unicode="↲" horiz-adv-x="1024" d="M906 348q0 -41 -41 -41h-569q127 -107 179 -253q3 -8 3 -15q0 -39 -42 -39q-24 0 -34 23l-27 62q-75 149 -230 237q-27 15 -27 26t27 26q154 87 230 236l25 58q12 26 36 26q42 0 42 -39q0 -7 -3 -15q-52 -144 -178 -251h527v1052q0 41 41 41t41 -41v-1093z" />
+<glyph unicode="↳" horiz-adv-x="1024" d="M906 348q0 -11 -27 -26q-155 -88 -230 -237q-8 -20 -25 -59q-12 -26 -36 -26q-42 0 -42 39q0 7 3 15q52 146 179 253h-569q-41 0 -41 41v1093q0 41 41 41t41 -41v-1052h527q-126 107 -178 251q-3 8 -3 15q0 39 42 39q24 0 34 -22l27 -62q76 -149 230 -236q27 -15 27 -26z " />
+<glyph unicode="↴" horiz-adv-x="1024" d="M906 318q0 -24 -23 -34l-62 -27q-149 -75 -237 -230q-15 -27 -26 -27t-26 27q-87 154 -236 230l-58 25q-26 12 -26 36q0 42 39 42q7 0 15 -3q144 -52 251 -178v1221h-358q-41 0 -41 41t41 41h399q41 0 41 -41v-1263q107 127 253 179q8 3 15 3q39 0 39 -42z" />
+<glyph unicode="↵" d="M1748 582q0 -41 -41 -41h-1369q228 -162 288 -432q7 -31 7 -35q0 -24 -21 -27h-41q-14 0 -20 19q-33 175 -142 303.5t-278 192.5q-16 6 -16 20t16 23l46 18q282 122 363 428q3 16 9.5 40.5t26.5 26.5q-9 -1 36 -1q21 0 21 -27q0 -4 -7 -35q-59 -266 -288 -432h1328v818 q0 41 41 41t41 -41v-859z" />
+<glyph unicode="↶" d="M1972 4q0 -45 -41 -45t-41 37q0 160 -49 320q-77 251 -244 403q-184 168 -432 168q-295 0 -509.5 -207.5t-217.5 -501.5q107 127 253 179q8 3 15 3q39 0 39 -42q0 -24 -23 -34l-62 -27q-149 -75 -237 -230q-15 -27 -26 -27t-26 27q-87 154 -236 230l-58 25q-26 12 -26 36 q0 42 39 42q7 0 15 -3q144 -52 251 -178q2 328 240.5 559t568.5 231q361 0 594 -309q213 -283 213 -656z" />
+<glyph unicode="↷" d="M1997 318q0 -24 -23 -34l-61 -27q-149 -76 -236 -230q-15 -27 -26 -27t-26 27q-88 155 -237 230q-20 8 -59 25q-26 12 -26 36q0 42 39 42q7 0 15 -3q146 -52 253 -179q-3 294 -217.5 501.5t-509.5 207.5q-248 0 -432 -168q-167 -152 -244 -403q-49 -160 -49 -320 q0 -37 -41 -37t-41 45q0 373 213 656q233 309 594 309q330 0 568.5 -231t240.5 -559q107 126 251 178q8 3 15 3q39 0 39 -42z" />
+<glyph unicode="↸" d="M1924 -274q0 -44 -44 -44q-14 0 -24 10l-1556 1556q19 -77 19 -150q0 -173 -101 -345q-8 -13 -18.5 -13t-30.5 20t-20 30l35 69q56 112 56 249q0 160 -76 283q-40 66 -40 68q0 23 24 23l67 -40q127 -76 273 -76t259 56q71 35 67 35q10 0 30.5 -19t20.5 -31t-12 -19 q-165 -100 -346 -100q-76 0 -149 18l1556 -1556q10 -10 10 -24zM1931 1565q0 -41 -39 -41h-1738q-39 0 -39 41t39 41h1738q39 0 39 -41z" />
+<glyph unicode="↹" d="M1918 -255q0 -63 -41 -63t-41 63v930q0 63 41 63t41 -63v-930zM597 913q223 -136 293 -414q0 -22 -18 -22q-60 0 -64 14q-6 22 -19 65q-46 132 -150.5 229.5t-239.5 132.5q-22 4 -66 13q-18 4 -18 22t18 24q23 4 67 13q134 35 238.5 132.5t150.5 229.5q6 23 19 65 q6 14 19 14q51 0 40 1q23 -2 23 -23l-2 -6q-29 -104 -59 -161q-83 -157 -232 -247h1299q37 0 37 -41t-37 -41h-1299zM1451 251q-223 134 -293 414q0 22 18 22q58 0 64 -14q6 -22 19 -65q67 -192 239 -298q75 -46 164 -67q22 -3 43 -7q28 -7 28 -25.5t-18 -23.5 q-22 -4 -66 -13q-134 -35 -240 -133t-151 -229l-18 -65q-4 -14 -19 -14q-48 0 -39 -1q-24 3 -24 23l2 6q38 139 109 239.5t182 168.5h-1299q-37 0 -37 41t37 41h1299zM212 489q0 -63 -41 -63t-41 63v930q0 63 41 63t41 -63v-930z" />
+<glyph unicode="↺" horiz-adv-x="1590" d="M1516 582q0 -297 -211.5 -509.5t-509 -212.5t-509.5 212t-212 510q0 205 111.5 385.5t296.5 264.5q9 5 18 5q39 0 39 -42q0 -25 -23 -35q-164 -75 -263 -235.5t-99 -342.5q0 -265 188.5 -453.5t453 -188.5t452.5 189t188 453q0 183 -97 339t-259 236q38 -109 38 -185 q1 -3 1 -7q0 -71 -9 -120q-4 -21 -23 -29.5t-39 3t-17 36t7 67.5q1 17 1 33q0 148 -81 287q-16 27 -11 36q6 9 37 9h4q174 0 313 90l51 37q13 10 26 10q9 0 18 -5q24 -14 24 -33q0 -10 -7 -22q-4 -6 -10 -11q-118 -100 -279 -128q179 -92 285.5 -266t106.5 -377z" />
+<glyph unicode="↻" horiz-adv-x="1590" d="M1516 582q0 -298 -212 -510t-509.5 -212t-509 212.5t-211.5 509.5q0 203 106.5 377t285.5 266q-161 28 -279 128q-6 5 -10 11q-7 12 -7 22q0 19 24 33q9 5 18 5q12 0 23 -8l54 -39q139 -90 313 -90h4q31 0 36.5 -9t-10.5 -36q-81 -139 -81 -287q0 -16 1 -33 q2 -21 6 -56.5t-16 -47t-39 -3t-23 29.5q-9 49 -9 120q0 4 1 7q0 76 38 185q-162 -80 -259 -236t-97 -339q0 -264 188 -453t452.5 -189t453 188.5t188.5 453.5q0 182 -99 342.5t-263 235.5q-23 10 -23 35q0 42 39 42q9 0 18 -5q185 -84 296.5 -264.5t111.5 -385.5z" />
+<glyph unicode="↼" d="M1931 582q0 -41 -39 -41h-1710q-67 0 -67 41q0 16 62 41q132 54 230 170t133 258q2 16 11 47q8 20 45 20t37 -28q0 -7 -7 -35q-69 -273 -288 -432h1554q39 0 39 -41z" />
+<glyph unicode="↽" d="M1931 582q0 -41 -39 -41h-1554q224 -163 288 -432q7 -30 7 -35q0 -28 -50 -28q-25 0 -30.5 18t-12.5 49q-37 145 -133 258t-230 170q-19 7 -40.5 16t-21.5 25q0 41 67 41h1710q39 0 39 -41z" />
+<glyph unicode="↾" horiz-adv-x="1024" d="M969 1062q20 -8 20 -45t-28 -37q-7 0 -35 7q-273 69 -432 288v-1554q0 -39 -41 -39t-41 39v1710q0 67 41 67q16 0 41 -62q54 -132 170 -230t258 -133q16 -2 47 -11z" />
+<glyph unicode="↿" horiz-adv-x="1024" d="M612 -279q0 -39 -41 -39t-41 39v1554q-159 -219 -432 -288q-28 -7 -35 -7q-28 0 -28 37t20 45q16 4 47 11q142 35 258 133t170 230q25 62 41 62q41 0 41 -67v-1710z" />
+<glyph unicode="⇀" d="M1931 582q0 -41 -67 -41h-1710q-39 0 -39 41t39 41h1554q-219 159 -288 432q-7 28 -7 35q0 28 37 28t45 -20q4 -16 11 -47q35 -142 133 -258t230 -170q62 -25 62 -41z" />
+<glyph unicode="⇁" d="M1931 582q0 -16 -21.5 -25t-40.5 -16q-134 -57 -230 -170t-133 -258q-3 -28 -25 -64q-6 -3 -18 -3q-50 0 -50 28q0 5 7 35q64 269 288 432h-1554q-39 0 -39 41t39 41h1710q67 0 67 -41z" />
+<glyph unicode="⇂" horiz-adv-x="1024" d="M961 200q28 0 28 -37t-20 -45q-16 -4 -47 -11q-142 -35 -258 -133t-170 -230q-25 -62 -41 -62q-41 0 -41 67v1710q0 39 41 39t41 -39v-1554q159 219 432 288q28 7 35 7z" />
+<glyph unicode="⇃" horiz-adv-x="1024" d="M612 -251q0 -67 -41 -67q-16 0 -41 62q-54 132 -170 230t-258 133q-16 2 -47 11q-20 8 -20 45t28 37q7 0 35 -7q273 -69 432 -288v1554q0 39 41 39t41 -39v-1710z" />
+<glyph unicode="⇄" d="M1651 995q-223 135 -293 414q0 21 23 23q-11 -1 40 -1q13 0 19 -14q6 -22 19 -65q46 -132 150.5 -229.5t238.5 -132.5q23 -3 67 -13q18 -6 18 -24t-18 -22q-22 -4 -66 -13q-135 -35 -239.5 -132.5t-150.5 -229.5q-6 -22 -19 -65q-4 -14 -64 -14q-18 0 -18 22l2 6 q28 102 59 160q84 158 232 248h-1499q-37 0 -37 41t37 41h1499zM397 231q224 -137 293 -414q0 -20 -24 -23q9 1 -39 1q-15 0 -19 14q-5 22 -18 65q-45 131 -151 229t-240 133q-22 4 -66 13q-18 5 -18 23.5t24.5 24t46.5 8.5q205 48 329 221q46 64 74 144q6 23 19 65 q6 14 64 14q18 0 18 -22l-2 -6q-38 -143 -108 -241.5t-183 -166.5h1499q37 0 37 -41t-37 -41h-1499z" />
+<glyph unicode="⇅" horiz-adv-x="1704" d="M1233 -36q136 223 414 293q22 0 22 -18q0 -60 -14 -64q-22 -6 -65 -19q-132 -46 -229.5 -150.5t-132.5 -239.5q-4 -22 -13 -66q-4 -18 -22 -18t-24 18q-4 23 -13 67q-35 134 -132.5 238.5t-229.5 150.5q-22 6 -65 19q-14 6 -14 19q0 51 -1 40q2 23 23 23l6 -2 q104 -29 161 -59q157 -83 247 -232v1481q0 37 41 37t41 -37v-1481zM471 1200q-135 -223 -414 -293q-21 0 -23 23q1 -11 1 40q0 13 14 19q22 6 65 19q132 46 229.5 150.5t132.5 238.5q3 23 13 67q6 18 24 18t22 -18q4 -22 13 -66q35 -135 132.5 -239.5t229.5 -150.5 q22 -6 65 -19q14 -4 14 -64q0 -18 -22 -18l-6 2q-102 28 -160 59q-158 84 -248 232v-1481q0 -37 -41 -37t-41 37v1481z" />
+<glyph unicode="⇆" d="M397 913q223 -136 293 -414q0 -22 -18 -22q-60 0 -64 14q-6 22 -19 65q-46 132 -150.5 229.5t-239.5 132.5q-22 4 -66 13q-18 4 -18 22t18 24q23 4 67 13q134 35 238.5 132.5t150.5 229.5q6 23 19 65q6 14 19 14q51 0 40 1q23 -2 23 -23l-2 -6q-29 -104 -59 -161 q-83 -157 -232 -247h1499q37 0 37 -41t-37 -41h-1499zM1651 313q-223 134 -293 414q0 22 18 22q58 0 64 -14q6 -22 19 -65q67 -192 239 -298q75 -46 164 -67q22 -3 43 -7q28 -7 28 -25.5t-18 -23.5q-22 -4 -66 -13q-134 -35 -240 -133t-151 -229l-18 -65q-4 -14 -19 -14 q-48 0 -39 -1q-24 3 -24 23l2 6q38 139 109 239.5t182 168.5h-1499q-37 0 -37 41t37 41h1499z" />
+<glyph unicode="⇇" d="M397 881q180 -108 256 -299q-76 -191 -256 -299h1499q37 0 37 -41t-37 -41h-1499q223 -135 293 -414q0 -21 -23 -23q11 1 -40 1q-13 0 -19 14q-6 22 -19 65q-46 132 -150.5 229.5t-238.5 132.5q-23 3 -67 13q-18 6 -18 24t18 22q22 4 66 13q252 65 366 304 q-114 239 -366 304q-22 4 -66 13q-18 4 -18 22t18 24q23 4 67 13q134 35 238.5 132.5t150.5 229.5q6 22 19 65q6 14 19 14q51 0 40 1q23 -2 23 -23l-2 -6q-29 -104 -59 -161q-83 -157 -232 -247h1499q37 0 37 -41t-37 -41h-1499z" />
+<glyph unicode="⇈" horiz-adv-x="1704" d="M471 1200q-135 -223 -414 -293q-21 0 -23 23q1 -11 1 40q0 13 14 19q22 6 65 19q132 46 229.5 150.5t132.5 238.5q3 23 13 67q6 18 24 18t22 -18q4 -22 13 -66q65 -252 304 -366q239 114 304 366q4 22 13 66q4 18 22 18t24 -18q4 -23 13 -67q35 -134 132.5 -238.5 t229.5 -150.5q22 -6 65 -19q14 -6 14 -19q0 -51 1 -40q-2 -23 -23 -23l-6 2q-104 29 -161 59q-157 83 -247 232v-1481q0 -37 -41 -37t-41 37v1481q-108 -180 -299 -256q-191 76 -299 256v-1481q0 -37 -41 -37t-41 37v1481z" />
+<glyph unicode="⇉" d="M1651 963q-223 135 -293 414q0 21 23 23q-11 -1 40 -1q13 0 19 -14q6 -22 19 -65q46 -132 150.5 -229.5t238.5 -132.5q23 -3 67 -13q18 -6 18 -24t-18 -22q-22 -4 -66 -13q-252 -65 -366 -304q114 -239 366 -304q22 -4 66 -13q18 -4 18 -22t-18 -24q-23 -4 -67 -13 q-134 -35 -238.5 -132.5t-150.5 -229.5q-6 -22 -19 -65q-6 -14 -19 -14q-51 0 -40 -1q-23 2 -23 23l2 6q29 104 59 161q83 157 232 247h-1499q-37 0 -37 41t37 41h1499q-180 108 -256 299q76 191 256 299h-1499q-37 0 -37 41t37 41h1499z" />
+<glyph unicode="⇊" horiz-adv-x="1704" d="M1233 -36q135 223 414 293q21 0 23 -23q-1 11 -1 -40q0 -13 -14 -19q-22 -6 -65 -19q-132 -46 -229.5 -150.5t-132.5 -238.5q-3 -23 -13 -67q-6 -18 -24 -18t-22 18q-4 22 -13 66q-65 252 -304 366q-239 -114 -304 -366q-4 -22 -13 -66q-4 -18 -22 -18t-24 18 q-4 23 -13 67q-35 134 -132.5 238.5t-229.5 150.5q-22 6 -65 19q-14 6 -14 19q0 51 -1 40q2 23 23 23l6 -2q104 -29 161 -59q157 -83 247 -232v1481q0 37 41 37t41 -37v-1481q108 180 299 256q191 -76 299 -256v1481q0 37 41 37t41 -37v-1481z" />
+<glyph unicode="⇋" d="M1931 782q0 -41 -67 -41h-1710q-39 0 -39 41t39 41h1554q-219 159 -288 432q-7 28 -7 35q0 28 37 28t45 -20q4 -16 11 -47q35 -142 133 -258t230 -170q62 -25 62 -41zM1931 382q0 -41 -39 -41h-1554q224 -163 288 -432q7 -30 7 -35q0 -28 -50 -28q-25 0 -30.5 18 t-12.5 49q-37 145 -133 258t-230 170q-19 7 -40.5 16t-21.5 25q0 41 67 41h1710q39 0 39 -41z" />
+<glyph unicode="⇌" d="M1931 382q0 -16 -21.5 -25t-40.5 -16q-134 -57 -230 -170t-133 -258q-3 -28 -25 -64q-6 -3 -18 -3q-50 0 -50 28q0 5 7 35q64 269 288 432h-1554q-39 0 -39 41t39 41h1710q67 0 67 -41zM1931 782q0 -41 -39 -41h-1710q-67 0 -67 41q0 16 62 41q132 54 230 170t133 258 q2 16 11 47q8 20 45 20t37 -28q0 -7 -7 -35q-69 -273 -288 -432h1554q39 0 39 -41z" />
+<glyph unicode="⇍" d="M1932 383q0 -41 -37 -41h-462l-142 -246q-23 -40 -46 -40q-41 0 -41 38q0 15 16 43l118 205h-684q45 -44 126 -155t81 -146q0 -20 -23 -23q7 1 -38 1q-11 0 -17 12q-74 142 -162 238q-175 191 -418 272l-71 21q-16 5 -16 20t16 23l68 20q172 56 323 177.5t260 330.5 q6 12 58 12q20 0 20 -28.5t-80.5 -138.5t-126.5 -156h961l143 247q23 39 45 39q41 0 41 -38q0 -16 -15 -42l-119 -206h185q37 0 37 -41t-37 -41h-232l-183 -316h415q37 0 37 -41zM1568 740h-1004q-120 -99 -262 -158q142 -59 262 -158h822z" />
+<glyph unicode="⇎" horiz-adv-x="2560" d="M2444 605q14 -8 14 -22.5t-14 -20.5q-201 -89 -318.5 -204t-188.5 -255l-32 -70q-7 -14 -59 -14q-21 0 -21 22q0 38 67.5 142.5t113.5 158.5h-833l-142 -246q-23 -40 -46 -40q-41 0 -41 38q0 15 16 43l118 205h-524q43 -47 111.5 -155t68.5 -146q0 -22 -61 -22 q-11 0 -19 19l-30 64q-85 171 -219 285t-287 175q-16 6 -16 20.5t16 22.5q31 13 92 41q276 140 414 417l31 68q7 14 59 14q20 0 20 -22q0 -38 -68 -144.5t-112 -156.5h801l143 247q23 39 45 39q41 0 41 -38q0 -16 -15 -42l-119 -206h556q-48 58 -114.5 160.5t-66.5 140.5 q0 22 62 22q11 0 18 -14l57 -115q31 -55 72 -108q135 -174 332 -269q28 -11 78 -34zM2303 582q-122 66 -219 158h-681l-183 -316h864q97 92 219 158zM1308 740h-832q-97 -92 -219 -158q122 -66 219 -158h650z" />
+<glyph unicode="⇏" d="M1932 582q0 -15 -14 -20q-36 -10 -107 -34q-357 -136 -546 -497q-6 -12 -58 -12q-20 0 -20 22q0 36 80.5 145.5t126.5 155.5h-961l-142 -246q-23 -40 -46 -40q-41 0 -41 38q0 15 16 43l118 205h-183q-39 0 -39 41t39 41h231l182 316h-413q-39 0 -39 41t39 41h460l143 247 q23 39 45 39q41 0 41 -38q0 -16 -15 -42l-119 -206h684q-50 52 -128.5 158.5t-78.5 142.5q0 20 23 23q-5 -1 38 -1q11 0 17 -12q110 -208 259.5 -329.5t324.5 -178.5q28 -6 69 -20q14 -8 14 -23zM1746 582q-142 59 -262 158h-821l-183 -316h1004q120 99 262 158z" />
+<glyph unicode="⇐" d="M1932 383q0 -41 -37 -41h-1241q45 -44 126 -155t81 -146q0 -20 -23 -23q7 1 -38 1q-11 0 -17 12q-74 142 -162 238q-175 191 -418 272l-71 21q-16 5 -16 20t16 23l68 20q172 56 323 177.5t260 330.5q6 12 58 12q20 0 20 -28.5t-80.5 -138.5t-126.5 -156h1241q37 0 37 -41 t-37 -41h-1331q-120 -99 -262 -158q142 -59 262 -158h1331q37 0 37 -41z" />
+<glyph unicode="⇑" horiz-adv-x="1251" d="M1189 755q0 -18 -29 -18t-134.5 78t-160.5 129v-1225q0 -37 -41 -37t-41 37v1315q-99 122 -157 264q-56 -139 -158 -264v-1315q0 -37 -41 -37t-41 37v1225q-47 -47 -156 -127t-145 -80q-23 0 -23 63q0 8 13 15q214 120 330.5 262t173.5 307l24 80q6 18 23 18t22 -18 q48 -163 115.5 -274t163 -199.5t250.5 -175.5q12 -7 12 -60z" />
+<glyph unicode="⇒" d="M1932 582q0 -15 -14 -20q-36 -10 -107 -34q-357 -136 -546 -497q-6 -12 -58 -12q-20 0 -20 22q0 36 80.5 145.5t126.5 155.5h-1239q-39 0 -39 41t39 41h1329q120 99 262 158q-142 59 -262 158h-1329q-39 0 -39 41t39 41h1239q-50 52 -128.5 158.5t-78.5 142.5q0 20 23 23 q-5 -1 38 -1q11 0 17 -12q110 -208 259.5 -329.5t324.5 -178.5q28 -6 69 -20q14 -8 14 -23z" />
+<glyph unicode="⇓" horiz-adv-x="1251" d="M1189 364q0 -8 -12 -15q-158 -89 -238 -163q-196 -181 -273 -422q-5 -22 -18 -64q-6 -18 -22.5 -18t-22.5 18q-7 27 -24 81q-56 165 -174.5 309t-329.5 259q-13 7 -13 15v45q0 18 29 18t141 -81.5t154 -125.5v1225q0 37 41 37t41 -37v-1315q101 -125 158 -264 q57 142 157 264v1315q0 37 41 37t41 -37v-1225q46 46 156 126.5t145 80.5q21 0 24 -24q-1 7 -1 -39z" />
+<glyph unicode="⇔" horiz-adv-x="2560" d="M2444 605q14 -8 14 -22.5t-14 -20.5q-201 -89 -318.5 -204t-188.5 -255l-32 -70q-7 -14 -59 -14q-21 0 -21 22q0 38 67.5 142.5t113.5 158.5h-1452q43 -47 111.5 -155t68.5 -146q0 -22 -61 -22q-11 0 -19 19l-30 64q-88 176 -242 304q-116 97 -264 156q-16 6 -16 20.5 t16 22.5q31 13 92 41q276 140 414 417l31 68q7 14 59 14q20 0 20 -22q0 -38 -68 -144.5t-112 -156.5h1452q-48 58 -114.5 160.5t-66.5 140.5q0 22 62 22q11 0 18 -14l57 -115q31 -55 72 -108q135 -174 332 -269q28 -11 78 -34zM2303 582q-122 66 -219 158h-1608 q-97 -92 -219 -158q122 -66 219 -158h1608q97 92 219 158z" />
+<glyph unicode="⇕" horiz-adv-x="1251" d="M1189 127q0 -11 -17 -18q-334 -143 -490 -461l-21 -53q-17 -37 -35 -37q-14 0 -21 12q-11 26 -34 76q-101 204 -269 335q-76 59 -223 128q-17 8 -18 27q1 -17 1 36q0 19 30 19t139.5 -69.5t154.5 -110.5v1142q-48 -42 -156.5 -111t-144.5 -69q-23 0 -23 64q0 11 17 18 q343 147 500 477q9 22 28 64q5 10 19 10t22 -20l29 -66q66 -138 187.5 -261.5t307.5 -203.5q17 -7 17 -18v-45q0 -19 -29 -19t-134.5 67.5t-160.5 112.5v-1142q49 42 157 111t144 69q21 0 24 -24q-1 5 -1 -40zM783 -67v1298q-92 99 -157 219q-64 -117 -158 -219v-1298 q94 -102 158 -219q65 120 157 219z" />
+<glyph unicode="⇖" d="M1924 5q0 -42 -43 -42q-16 0 -25 9l-1297 1298q-157 16 -297 75q59 -138 75 -298l1296 -1297q10 -10 10 -25q0 -43 -43 -43q-15 0 -25 10l-1233 1233q0 -75 -23 -220.5t-58 -145.5q-10 0 -29.5 17.5t-19.5 24t2 13.5q53 191 53 327q0 230 -99 432q-44 90 -44 87 q0 22 23 22q5 0 13 -4q166 -85 275 -111.5t233.5 -26.5t324.5 54h6q11 0 29.5 -17.5t18.5 -27.5t-7 -18q-23 -25 -155 -45t-204 -22l1233 -1234q10 -10 10 -25z" />
+<glyph unicode="⇗" d="M1924 1460q0 3 -44 -87q-99 -202 -99 -432q0 -136 53 -327q2 -7 2 -13.5t-19.5 -24t-29.5 -17.5q-35 0 -58 145.5t-23 220.5l-1233 -1233q-10 -10 -25 -10q-43 0 -43 43q0 15 10 25l1296 1297q16 160 75 298q-140 -59 -297 -75l-1297 -1298q-9 -9 -25 -9q-43 0 -43 42 q0 15 10 25l1233 1234q-72 2 -204 22t-155 45q-7 8 -7 18t18.5 27.5t26.5 17.5h9q200 -54 324.5 -54t233.5 26.5t275 111.5q8 4 13 4q23 0 23 -22z" />
+<glyph unicode="⇘" d="M1924 -296q0 -22 -23 -22q-5 0 -13 4q-166 85 -275 111.5t-233.5 26.5t-324.5 -54h-6q-11 0 -29.5 17.5t-18.5 27.5t7 18q23 25 155 45t204 22l-1233 1234q-10 10 -10 25q0 42 43 42q16 0 25 -9l1297 -1298q157 -16 297 -75q-59 138 -75 298l-1296 1297q-10 10 -10 25 q0 43 43 43q15 0 25 -10l1233 -1233q0 75 23 220.5t58 145.5q10 0 29.5 -17.5t19.5 -24t-2 -13.5q-53 -191 -53 -327q0 -230 99 -432q44 -90 44 -87z" />
+<glyph unicode="⇙" d="M1924 1159q0 -15 -10 -25l-1233 -1234q72 -2 204 -22t155 -45q7 -8 7 -18t-18.5 -27.5t-26.5 -17.5h-9q-200 54 -324.5 54t-233.5 -26.5t-275 -111.5q-8 -4 -13 -4q-23 0 -23 22q0 -3 44 87q99 202 99 432q0 136 -53 327q-2 7 -2 13.5t19.5 24t29.5 17.5q35 0 58 -145.5 t23 -220.5l1233 1233q10 10 25 10q43 0 43 -43q0 -15 -10 -25l-1296 -1297q-16 -160 -75 -298q140 59 297 75l1297 1298q9 9 25 9q43 0 43 -42z" />
+<glyph unicode="⇚" d="M1931 185q0 -41 -37 -41h-1222q71 -117 118 -247q3 -8 3 -15q0 -39 -42 -39q-22 0 -36 27q-18 46 -57 136q-136 277 -394 462l-124 79q-25 17 -25 35t25 35q42 25 124 78q255 182 394 464q18 46 57 135q14 27 36 27q42 0 42 -39q0 -7 -3 -15q-47 -130 -118 -247h1222 q37 0 37 -41t-37 -41h-1277q-132 -186 -317 -315h1590q41 0 41 -41t-41 -41h-1590q186 -131 318 -315h1276q37 0 37 -41z" />
+<glyph unicode="⇛" d="M1931 582q0 -18 -25 -35q-42 -25 -124 -79q-258 -185 -394 -462q-17 -46 -57 -136q-14 -27 -36 -27q-42 0 -42 39q0 7 3 15q47 130 118 247h-1222q-37 0 -37 41t37 41h1276q132 184 318 315h-1590q-41 0 -41 41t41 41h1590q-185 129 -317 315h-1277q-37 0 -37 41t37 41 h1222q-71 117 -118 247q-3 8 -3 15q0 39 42 39q22 0 36 -27q18 -46 57 -135q139 -282 394 -464q42 -25 124 -78q25 -17 25 -35z" />
+<glyph unicode="⇜" d="M1931 582q0 -20 -10 -29l-190 -170q-13 -12 -31 -12t-31 12l-348 314l-348 -314q-13 -12 -31 -12t-31 12l-176 158h-442q127 -107 179 -253q3 -8 3 -15q0 -39 -42 -39q-24 0 -34 23l-27 62q-75 149 -230 237q-27 15 -27 26t27 26q154 87 230 236l25 58q12 26 36 26 q42 0 42 -39q0 -7 -3 -15q-52 -144 -178 -251h458q16 0 32 -14l158 -142l348 314q13 12 31 12t31 -12l348 -314l160 142q16 14 30 14q41 0 41 -41z" />
+<glyph unicode="⇝" d="M1931 582q0 -11 -27 -26q-154 -87 -230 -236l-25 -58q-12 -26 -36 -26q-42 0 -42 39q0 7 3 15q52 144 178 251h-458q-16 0 -32 14l-158 142l-348 -314q-13 -12 -31 -12t-31 12l-348 314l-160 -142q-16 -14 -30 -14q-41 0 -41 41q0 20 10 29l190 170q13 12 31 12t31 -12 l348 -314l348 314q13 12 31 12t31 -12l176 -158h442q-127 107 -179 253q-3 8 -3 15q0 39 42 39q24 0 34 -23l27 -62q75 -149 230 -237q27 -15 27 -26z" />
+<glyph unicode="⇞" horiz-adv-x="1024" d="M471 1200q-135 -223 -414 -293q-21 0 -23 23q1 -11 1 40q0 13 14 19q22 6 65 19q132 46 229.5 150.5t132.5 238.5q3 23 13 67q6 18 24 18t22 -18q4 -22 13 -66q35 -135 132.5 -239.5t229.5 -150.5q22 -6 65 -19q14 -4 14 -64q0 -18 -22 -18l-6 2q-102 28 -160 59 q-158 84 -248 232v-718h298q61 0 61 -41t-61 -41h-298v-318h298q61 0 61 -41t-61 -41h-298v-281q0 -37 -41 -37t-41 37v281h-303q-56 0 -56 41t62 41h297v318h-303q-56 0 -56 41t62 41h297v718z" />
+<glyph unicode="⇟" horiz-adv-x="1024" d="M553 -36q136 223 414 293q22 0 22 -18q0 -60 -14 -64q-22 -6 -65 -19q-132 -46 -229.5 -150.5t-132.5 -239.5q-4 -22 -13 -66q-4 -18 -22 -18t-24 18q-4 23 -13 67q-35 134 -132.5 238.5t-229.5 150.5q-22 6 -65 19q-14 6 -14 19q0 51 -1 40q2 23 23 23l6 -2 q104 -29 161 -59q157 -83 247 -232v718h-303q-56 0 -56 41t62 41h297v318h-303q-56 0 -56 41t62 41h297v281q0 37 41 37t41 -37v-281h298q61 0 61 -41t-61 -41h-298v-318h298q61 0 61 -41t-61 -41h-298v-718z" />
+<glyph unicode="⇠" d="M1931 582q0 -41 -39 -41h-195q-39 0 -39 41t39 41h195q39 0 39 -41zM1531 582q0 -41 -39 -41h-195q-39 0 -39 41t39 41h195q39 0 39 -41zM1131 582q0 -41 -39 -41h-195q-39 0 -39 41t39 41h195q39 0 39 -41zM731 582q0 -41 -39 -41h-354q228 -162 288 -432q7 -31 7 -35 q0 -24 -21 -27h-41q-14 0 -20 19q-33 175 -142 303.5t-278 192.5q-16 6 -16 20t16 23l46 18q282 122 363 428q3 16 9.5 40.5t26.5 26.5q-9 -1 36 -1q21 0 21 -27q0 -4 -7 -35q-59 -266 -288 -432h354q39 0 39 -41z" />
+<glyph unicode="⇡" horiz-adv-x="1024" d="M471 1200q-135 -223 -414 -293q-21 0 -23 23q1 -11 1 40q0 13 14 19q22 6 65 19q132 46 229.5 150.5t132.5 238.5q3 23 13 67q6 18 24 18t22 -18q4 -22 13 -66q35 -135 132.5 -239.5t229.5 -150.5q22 -6 65 -19q14 -4 14 -64q0 -18 -22 -18l-6 2q-102 28 -160 59 q-158 84 -248 232v-281q0 -37 -41 -37t-41 37v281zM553 521q0 -39 -41 -39t-41 39v195q0 39 41 39t41 -39v-195zM553 121q0 -39 -41 -39t-41 39v195q0 39 41 39t41 -39v-195zM553 -279q0 -39 -41 -39t-41 39v195q0 39 41 39t41 -39v-195z" />
+<glyph unicode="⇢" d="M1931 582q0 -14 -16 -20q-259 -98 -369 -334q-23 -49 -33 -90l-18 -72q-6 -19 -20 -19h-41q-21 3 -21 27q0 4 7 35q60 270 288 432h-354q-39 0 -39 41t39 41h354q-229 166 -288 432q-7 31 -7 35q0 27 21 27q45 0 36 1q20 -2 24 -19t12 -48q38 -146 132.5 -257.5 t230.5 -170.5q16 -5 46 -18q16 -9 16 -23zM1188 582q0 -41 -39 -41h-195q-39 0 -39 41t39 41h195q39 0 39 -41zM788 582q0 -41 -39 -41h-195q-39 0 -39 41t39 41h195q39 0 39 -41zM388 582q0 -41 -39 -41h-195q-39 0 -39 41t39 41h195q39 0 39 -41z" />
+<glyph unicode="⇣" horiz-adv-x="1024" d="M553 1248q0 -39 -41 -39t-41 39v195q0 39 41 39t41 -39v-195zM553 848q0 -39 -41 -39t-41 39v195q0 39 41 39t41 -39v-195zM553 448q0 -39 -41 -39t-41 39v195q0 39 41 39t41 -39v-195zM553 -36q136 223 414 293q22 0 22 -18q0 -60 -14 -64q-22 -6 -65 -19 q-132 -46 -229.5 -150.5t-132.5 -239.5q-4 -22 -13 -66q-4 -18 -22 -18t-24 18q-4 23 -13 67q-35 134 -132.5 238.5t-229.5 150.5q-22 6 -65 19q-14 6 -14 19q0 51 -1 40q2 23 23 23l6 -2q104 -29 161 -59q157 -83 247 -232v281q0 37 41 37t41 -37v-281z" />
+<glyph unicode="⇤" d="M1918 582q0 -41 -39 -41h-1354q222 -157 287 -431q8 -34 8 -36q0 -27 -21 -27q-47 0 -53 6t-8 13q-22 84 -35.5 123t-43.5 90q-106 182 -296 265l-47 18q-14 6 -14 22t25 27l40 14q210 91 317 310q24 49 54 163q5 19 20 19q44 0 41 1q21 -4 21 -28q0 -58 -57 -179 q-84 -177 -238 -288h1354q39 0 39 -41zM212 44q0 -62 -41 -62t-41 62v1077q0 61 41 61t41 -61v-1077z" />
+<glyph unicode="⇥" d="M1918 44q0 -62 -41 -62t-41 62v1077q0 61 41 61t41 -61v-1077zM1721 611q25 -11 25 -27t-15 -22l-46 -18q-190 -83 -296 -265q-41 -70 -79 -213q-2 -7 -8 -13t-53 -6q-21 0 -21 27q0 2 8 36q65 274 287 431h-1354q-39 0 -39 41t39 41h1354q-154 111 -238 288 q-57 121 -57 179q0 24 21 28q-3 -1 41 -1q15 0 20 -19q14 -55 54 -163q105 -217 317 -310z" />
+<glyph unicode="⇦" d="M1933 380q0 -37 -41 -37h-1005q-27 0 -27 -26v-276q0 -24 -36 -24q-4 0 -13.5 0.5t-15 0.5t-13.5 13q-128 221 -266.5 335t-302.5 169q-27 7 -80 24q-18 7 -18 23t18 23l80 24q164 55 302.5 169t266.5 335q8 13 13.5 13t15 0.5t13.5 0.5q36 0 36 -24v-276q0 -26 27 -26 h1005q41 0 41 -37v-404zM1853 449v266q0 24 -27 24h-1007q-41 0 -41 39v198q-74 -101 -125 -154q-155 -160 -354 -240q199 -80 354 -240q51 -53 125 -154v198q0 39 41 39h1007q27 0 27 24z" />
+<glyph unicode="⇧" horiz-adv-x="1250" d="M1190 773q0 -36 -24 -36h-276q-26 0 -26 -27v-987q0 -41 -37 -41h-404q-37 0 -37 41v987q0 27 -26 27h-276q-24 0 -24 36q0 4 0.5 13.5t0.5 15t13 13.5q221 128 335 266.5t169 302.5q7 27 24 80q7 18 23 18t23 -18l24 -80q55 -164 169 -302.5t335 -266.5q13 -8 13 -13.5 t0.5 -15t0.5 -13.5zM429 819q39 0 39 -41v-989q0 -27 24 -27h266q24 0 24 27v989q0 41 39 41h198q-101 74 -154 125q-160 155 -240 354q-80 -199 -240 -354q-53 -51 -154 -125h198z" />
+<glyph unicode="⇨" d="M1933 582q0 -16 -18 -23l-80 -24q-164 -55 -302.5 -169t-266.5 -335q-8 -13 -14 -13h-14q-10 -1 -14 -1q-36 0 -36 24v276q0 26 -27 26h-1005q-41 0 -41 37v404q0 37 41 37h1005q27 0 27 26v276q0 24 36 24h14q9 -1 14.5 -1t13.5 -13q128 -221 266.5 -335t302.5 -169 q27 -7 80 -24q18 -7 18 -23zM1270 778q0 -39 -41 -39h-1007q-27 0 -27 -24v-266q0 -24 27 -24h1007q41 0 41 -39v-198q74 101 125 154q155 160 354 240q-199 80 -354 240q-51 53 -125 154v-198z" />
+<glyph unicode="⇩" horiz-adv-x="1250" d="M1190 391v-14q-1 -9 -1 -14.5t-13 -13.5q-221 -128 -335 -266.5t-169 -302.5q-7 -27 -24 -80q-7 -18 -23 -18t-23 18l-24 80q-55 164 -169 302.5t-335 266.5q-13 8 -13 13v15q-1 10 -1 14q0 36 24 36h276q26 0 26 27v987q0 41 37 41h404q37 0 37 -41v-987q0 -27 26 -27 h276q24 0 24 -36zM821 345q-39 0 -39 41v989q0 27 -24 27h-266q-24 0 -24 -27v-989q0 -41 -39 -41h-198q101 -74 154 -125q160 -155 240 -354q80 199 240 354q53 51 154 125h-198z" />
+<glyph unicode="⇪" horiz-adv-x="1250" d="M1190 773q0 -36 -24 -36h-276q-26 0 -26 -27v-357q0 -41 -37 -41h-404q-37 0 -37 41v357q0 27 -26 27h-276q-24 0 -24 36q0 4 0.5 13.5t0.5 15t13 13.5q221 128 335 266.5t169 302.5q7 27 24 80q7 18 23 18t23 -18l24 -80q55 -164 169 -302.5t335 -266.5q13 -8 13 -13.5 t0.5 -15t0.5 -13.5zM864 -277q0 -41 -37 -41h-404q-37 0 -37 41v388q0 41 37 41h404q37 0 37 -41v-388zM429 819q39 0 39 -41v-359q0 -27 24 -27h266q24 0 24 27v359q0 41 39 41h198q-101 74 -154 125q-160 155 -240 354q-80 -199 -240 -354q-53 -51 -154 -125h198z M782 -211v256q0 27 -24 27h-266q-24 0 -24 -27v-256q0 -27 24 -27h266q24 0 24 27z" />
+<glyph unicode="⇫" horiz-adv-x="1250" d="M1190 773q0 -36 -24 -36h-276q-26 0 -26 -27v-728h163q37 0 37 -41v-218q0 -41 -37 -41h-804q-37 0 -37 41v218q0 41 37 41h163v728q0 27 -26 27h-276q-24 0 -24 36q0 4 0.5 13.5t0.5 15t13 13.5q221 128 335 266.5t169 302.5q7 27 24 80q7 18 23 18t23 -18l24 -80 q55 -164 169 -302.5t335 -266.5q13 -8 13 -13.5t0.5 -15t0.5 -13.5zM429 819q39 0 39 -41v-849q0 -27 -24 -27h-152q-24 0 -24 -27v-86q0 -27 24 -27h666q24 0 24 27v86q0 27 -24 27h-152q-24 0 -24 27v849q0 41 39 41h198q-101 74 -154 125q-160 155 -240 354 q-80 -199 -240 -354q-53 -51 -154 -125h198z" />
+<glyph unicode="⇬" horiz-adv-x="1250" d="M1190 773q0 -36 -24 -36h-276q-26 0 -26 -27v-728h163q37 0 37 -41v-218q0 -41 -37 -41h-804q-37 0 -37 41v218q0 41 37 41h163v728q0 27 -26 27h-276q-24 0 -24 36q0 4 0.5 13.5t0.5 15t13 13.5q221 128 335 266.5t169 302.5q7 27 24 80q7 18 23 18t23 -18l24 -80 q55 -164 169 -302.5t335 -266.5q13 -8 13 -13.5t0.5 -15t0.5 -13.5zM776 1043q-97 122 -151 255q-54 -133 -151 -255h302zM1019 819q-128 94 -171 142h-446q-43 -48 -171 -142h198q39 0 39 -41v-849q0 -27 -24 -27h-152q-24 0 -24 -27v-86q0 -27 24 -27h666q24 0 24 27v86 q0 27 -24 27h-152q-24 0 -24 27v849q0 41 39 41h198z" />
+<glyph unicode="⇭" horiz-adv-x="1250" d="M1190 773q0 -36 -24 -36h-276q-26 0 -26 -27v-728h163q37 0 37 -41v-218q0 -41 -37 -41h-804q-37 0 -37 41v218q0 41 37 41h163v728q0 27 -26 27h-276q-24 0 -24 36q0 4 0.5 13.5t0.5 15t13 13.5q221 128 335 266.5t169 302.5q7 27 24 80q7 18 23 18t23 -18l24 -80 q55 -164 169 -302.5t335 -266.5q13 -8 13 -13.5t0.5 -15t0.5 -13.5zM666 -238h292q24 0 24 27v86q0 27 -24 27h-152q-24 0 -24 27v849q0 41 39 41h198q-101 74 -154 125q-119 116 -199 266v-1448zM584 -238v1448q-80 -150 -199 -266q-53 -51 -154 -125h198q39 0 39 -41v-849 q0 -27 -24 -27h-152q-24 0 -24 -27v-86q0 -27 24 -27h292z" />
+<glyph unicode="⇮" horiz-adv-x="1250" d="M1190 473q0 -36 -24 -36h-276q-26 0 -26 -27v-687q0 -41 -37 -41h-404q-37 0 -37 41v687q0 27 -26 27h-276q-24 0 -24 36q0 4 0.5 13.5t0.5 15t13 13.5q194 113 296 222h-286q-24 0 -24 36q0 4 0.5 13.5t0.5 15t13 13.5q221 128 335 266.5t169 302.5q7 27 24 80 q7 18 23 18t23 -18l24 -80q55 -164 169 -302.5t335 -266.5q13 -8 13 -13.5t0.5 -15t0.5 -13.5q0 -36 -24 -36h-286q102 -109 296 -222q13 -8 13 -13.5t0.5 -15t0.5 -13.5zM625 1182q16 0 23 -18l24 -80q48 -142 140 -265h207q-101 74 -154 125q-160 155 -240 354 q-80 -199 -240 -354q-53 -51 -154 -125h207q92 123 140 265q7 27 24 80q7 18 23 18zM429 519q39 0 39 -41v-689q0 -27 24 -27h266q24 0 24 27v689q0 41 39 41h198q-101 74 -154 125q-160 155 -240 354q-80 -199 -240 -354q-53 -51 -154 -125h198z" />
+<glyph unicode="⇯" horiz-adv-x="1250" d="M1190 473q0 -36 -24 -36h-276q-26 0 -26 -27v-428h163q37 0 37 -41v-218q0 -41 -37 -41h-804q-37 0 -37 41v218q0 41 37 41h163v428q0 27 -26 27h-276q-24 0 -24 36q0 4 0.5 13.5t0.5 15t13 13.5q194 113 296 222h-286q-24 0 -24 36q0 4 0.5 13.5t0.5 15t13 13.5 q221 128 335 266.5t169 302.5q7 27 24 80q7 18 23 18t23 -18l24 -80q55 -164 169 -302.5t335 -266.5q13 -8 13 -13.5t0.5 -15t0.5 -13.5q0 -36 -24 -36h-286q102 -109 296 -222q13 -8 13 -13.5t0.5 -15t0.5 -13.5zM625 1182q16 0 23 -18l24 -80q48 -142 140 -265h207 q-101 74 -154 125q-160 155 -240 354q-80 -199 -240 -354q-53 -51 -154 -125h207q92 123 140 265q7 27 24 80q7 18 23 18zM429 519q39 0 39 -41v-549q0 -27 -24 -27h-152q-24 0 -24 -27v-86q0 -27 24 -27h666q24 0 24 27v86q0 27 -24 27h-152q-24 0 -24 27v549q0 41 39 41 h198q-101 74 -154 125q-160 155 -240 354q-80 -199 -240 -354q-53 -51 -154 -125h198z" />
+<glyph unicode="⇰" d="M1933 582q0 -16 -18 -23l-80 -24q-164 -55 -302.5 -169t-266.5 -335q-8 -13 -14 -13h-14q-10 -1 -14 -1q-36 0 -36 24v276q0 26 -27 26h-728v-163q0 -37 -41 -37h-218q-41 0 -41 37v804q0 37 41 37h218q41 0 41 -37v-163h728q27 0 27 26v276q0 24 36 24h14q9 -1 14.5 -1 t13.5 -13q128 -221 266.5 -335t302.5 -169q27 -7 80 -24q18 -7 18 -23zM1270 778q0 -39 -41 -39h-849q-27 0 -27 24v152q0 24 -27 24h-86q-27 0 -27 -24v-666q0 -24 27 -24h86q27 0 27 24v152q0 24 27 24h849q41 0 41 -39v-198q74 101 125 154q155 160 354 240 q-199 80 -354 240q-51 53 -125 154v-198z" />
+<glyph unicode="⇱" horiz-adv-x="1573" d="M556 860q18 -73 18 -159q0 -159 -100 -336q-1 -2 -3 -5q-16 -16 -28 -3q-17 14 -37 42q-2 7 5 19l29 53q56 117 56 248v22q-6 143 -76 262l-38 56q-9 16 3.5 28.5t29.5 4.5q19 -14 57 -39q130 -76 278 -76q48 0 98 8q81 14 155 49q19 12 59 33q14 6 23 -4q37 -36 37 -44 q0 -11 -13 -19q-94 -53 -172 -77t-163 -24t-160 19l809 -809q26 -26 -3 -55t-55 -3zM1439 1299q0 -41 -68 -41h-1155v-1255q0 -68 -41 -68t-41 68v1269q0 61 35 66q11 2 33 2h1169q68 0 68 -41z" />
+<glyph unicode="⇲" horiz-adv-x="1573" d="M1439 68q0 -61 -35 -66q-11 -2 -33 -2h-1169q-68 0 -68 41t68 41h1155v1255q0 68 41 68t41 -68v-1269zM451 321q0 11 13 19q94 53 172 77t163 24t160 -19l-809 809q-12 12 -12 25q0 15 15 30t30 15q13 0 25 -12l809 -809q-18 73 -18 159q0 159 100 336q1 2 3 5 q16 16 28 3q17 -14 37 -42q2 -7 -5 -19l-29 -53q-56 -116 -56 -246q0 -12 1 -24q5 -143 75 -262l38 -56q4 -7 4 -13q0 -8 -7 -16q-8 -7 -17 -7q-6 0 -13 3q-19 14 -57 39q-130 76 -278 76q-48 0 -98 -8q-81 -14 -155 -49q-19 -12 -59 -33q-14 -6 -23 4q-37 36 -37 44z" />
+<glyph unicode="⇳" horiz-adv-x="1250" d="M1190 127q0 -10 -17 -18q-192 -85 -312 -206.5t-184 -258.5q-10 -25 -24 -55.5t-28 -30.5t-28 30.5t-24 55.5q-64 137 -184 258.5t-312 206.5q-17 8 -17 18v40q3 24 23 24h277q26 0 26 27v728q0 27 -26 27h-277q-20 0 -23 24v40q0 10 17 18q192 85 312 206.5t184 258.5 q10 25 24 55.5t28 30.5t28 -30.5t24 -55.5q64 -137 184 -258.5t312 -206.5q17 -8 17 -18v-40q-3 -24 -23 -24h-277q-26 0 -26 -27v-728q0 -27 26 -27h277q20 0 23 -24v-40zM821 109q-39 0 -39 41v864q0 41 39 41h182q-88 57 -138 98q-142 115 -240 297q-98 -182 -240 -297 q-50 -41 -138 -98h182q39 0 39 -41v-864q0 -41 -39 -41h-182q88 -57 138 -98q142 -115 240 -297q98 182 240 297q50 41 138 98h-182z" />
+<glyph unicode="⇴" d="M1906 611q25 -11 25 -27t-15 -22l-46 -18q-190 -83 -296 -265q-41 -70 -79 -213q-2 -7 -8 -13t-53 -6q-21 0 -21 27q0 2 8 36q65 274 287 431h-515q-16 -145 -125 -243.5t-256 -98.5t-256 98.5t-125 243.5h-277q-39 0 -39 41t39 41h277q16 145 125 243.5t256 98.5 t256 -98.5t125 -243.5h515q-154 111 -238 288q-57 121 -57 179q0 24 21 28q-3 -1 41 -1q15 0 20 -19q14 -55 54 -163q105 -217 317 -310zM812 883q-113 0 -198 -74.5t-100 -185.5h596q-15 111 -100 185.5t-198 74.5zM812 281q113 0 198 74.5t100 185.5h-596 q15 -111 100 -185.5t198 -74.5z" />
+<glyph unicode="⇵" horiz-adv-x="1706" d="M1153 1200q-134 -223 -414 -293q-22 0 -22 18q0 58 14 64q22 6 65 19q192 67 298 239q46 75 67 164q3 22 8.5 46.5t24 24.5t23.5 -18q4 -22 13 -66q35 -134 133 -240t229 -151l65 -18q14 -4 14 -19q0 -48 1 -39q-3 -24 -23 -24l-6 2q-139 38 -239.5 109t-168.5 182v-1481 q0 -37 -41 -37t-41 37v1481zM553 -36q136 223 414 293q22 0 22 -18q0 -60 -14 -64q-22 -6 -65 -19q-132 -46 -229.5 -150.5t-132.5 -239.5q-4 -22 -13 -66q-4 -18 -22 -18t-24 18q-4 23 -13 67q-35 134 -132.5 238.5t-229.5 150.5q-23 6 -65 19q-14 6 -14 19q0 51 -1 40 q2 23 23 23l6 -2q104 -29 161 -59q157 -83 247 -232v1481q0 37 41 37t41 -37v-1481z" />
+<glyph unicode="⇶" d="M1651 1164q-223 135 -293 414q0 22 63 22q13 0 19 -14q6 -22 19 -65q46 -132 150.5 -229.5t238.5 -132.5q23 -3 67 -13q18 -6 18 -23t-18 -23q-23 -4 -67 -13q-205 -54 -325 -234q120 -181 325 -235q23 -3 67 -13q18 -6 18 -23t-18 -23q-23 -4 -67 -13 q-205 -54 -325 -234q120 -181 325 -235q23 -3 67 -13q18 -6 18 -23t-18 -23q-23 -4 -67 -13q-134 -35 -238.5 -132.5t-150.5 -229.5q-6 -22 -19 -65q-6 -14 -19 -14q-63 0 -63 22l2 6q29 104 59 161q83 157 232 247h-1499q-37 0 -37 41t37 41h1499q-140 85 -222 230 q82 144 222 229h-1499q-37 0 -37 41t37 41h1499q-140 85 -222 230q82 144 222 229h-1499q-37 0 -37 41t37 41h1499z" />
+<glyph unicode="⇷" d="M1931 582q0 -41 -39 -41h-578v-395q0 -39 -41 -39t-41 39v395h-894q228 -162 288 -432q7 -31 7 -35q0 -24 -21 -27h-41q-14 0 -20 19q-33 175 -142 303.5t-278 192.5q-16 6 -16 20t16 23l46 18q282 122 363 428q3 16 9.5 40.5t26.5 26.5q-9 -1 36 -1q21 0 21 -27 q0 -4 -7 -35q-59 -266 -288 -432h894v397q0 37 41 37t41 -37v-397h578q39 0 39 -41z" />
+<glyph unicode="⇸" d="M1906 611q25 -11 25 -27t-15 -22l-46 -18q-190 -83 -296 -265q-41 -70 -79 -213q-2 -7 -8 -13t-53 -6q-21 0 -21 27q0 2 8 36q65 274 287 431h-894v-395q0 -39 -41 -39t-41 39v395h-578q-39 0 -39 41t39 41h578v397q0 37 41 37t41 -37v-397h894q-154 111 -238 288 q-57 121 -57 179q0 24 21 28q-3 -1 41 -1q15 0 20 -19q14 -55 54 -163q105 -217 317 -310z" />
+<glyph unicode="⇹" d="M1918 605q14 -8 14 -22.5t-14 -20.5q-223 -79 -343 -283q-43 -74 -79 -213q-2 -7 -8 -13t-53 -6q-21 0 -21 27q0 2 8 36q65 274 287 431h-644v-395q0 -39 -41 -39t-41 39v395h-644q228 -162 288 -432q7 -31 7 -35q0 -24 -21 -27h-41q-14 0 -20 19q-35 177 -143 305 t-277 191q-16 6 -16 20.5t59 39.5q138 59 233.5 171.5t133.5 261.5q3 15 10 43q5 18 25 20q-9 -1 36 -1q21 0 21 -27q0 -4 -7 -35q-59 -266 -288 -432h644v397q0 37 41 37t41 -37v-397h644q-154 111 -238 288q-57 121 -57 179q0 24 21 27h41q15 0 20 -19q49 -191 144 -303 t225 -169q19 -6 53 -21z" />
+<glyph unicode="⇺" d="M1931 582q0 -41 -39 -41h-378v-395q0 -39 -41 -39t-41 39v395h-218v-395q0 -39 -41 -39t-41 39v395h-794q228 -162 288 -432q7 -31 7 -35q0 -24 -21 -27h-41q-14 0 -20 19q-33 175 -142 303.5t-278 192.5q-16 6 -16 20t16 23l46 18q282 122 363 428q3 16 9.5 40.5 t26.5 26.5q-9 -1 36 -1q21 0 21 -27q0 -4 -7 -35q-59 -266 -288 -432h794v397q0 37 41 37t41 -37v-397h218v397q0 37 41 37t41 -37v-397h378q39 0 39 -41z" />
+<glyph unicode="⇻" d="M1906 611q25 -11 25 -27t-15 -22l-46 -18q-190 -83 -296 -265q-41 -70 -79 -213q-2 -7 -8 -13t-53 -6q-21 0 -21 27q0 2 8 36q65 274 287 431h-794v-395q0 -39 -41 -39t-41 39v395h-218v-395q0 -39 -41 -39t-41 39v395h-378q-39 0 -39 41t39 41h378v397q0 37 41 37 t41 -37v-397h218v397q0 37 41 37t41 -37v-397h794q-154 111 -238 288q-57 121 -57 179q0 24 21 28q-3 -1 41 -1q15 0 20 -19q14 -55 54 -163q105 -217 317 -310z" />
+<glyph unicode="⇼" d="M1918 605q14 -8 14 -22.5t-14 -20.5q-223 -79 -343 -283q-43 -74 -79 -213q-2 -7 -8 -13t-53 -6q-21 0 -21 27q0 2 8 36q65 274 287 431h-494v-395q0 -39 -41 -39t-41 39v395h-218v-395q0 -39 -41 -39t-41 39v395h-494q228 -162 288 -432q7 -31 7 -35q0 -24 -21 -27h-41 q-14 0 -20 19q-35 177 -143 305t-277 191q-16 6 -16 20.5t59 39.5q138 59 233.5 171.5t133.5 261.5q3 15 10 43q5 18 25 20q-9 -1 36 -1q21 0 21 -27q0 -4 -7 -35q-59 -266 -288 -432h494v397q0 37 41 37t41 -37v-397h218v397q0 37 41 37t41 -37v-397h494q-154 111 -238 288 q-57 121 -57 179q0 24 21 27h41q15 0 20 -19q49 -191 144 -303t225 -169q19 -6 53 -21z" />
+<glyph unicode="⇽" d="M1933 582q0 -41 -37 -41h-1036v-500q0 -24 -36 -24q-4 0 -13.5 0.5t-15 0.5t-13.5 13q-128 221 -266.5 335t-302.5 169q-27 7 -80 24q-18 7 -18 23t18 23l80 24q164 55 302.5 169t266.5 335q8 13 13.5 13t15 0.5t13.5 0.5q36 0 36 -24v-500h1036q37 0 37 -41zM778 188 v788q-74 -101 -125 -154q-155 -160 -354 -240q199 -80 354 -240q51 -53 125 -154z" />
+<glyph unicode="⇾" d="M1933 582q0 -16 -18 -23l-80 -24q-164 -55 -302.5 -169t-266.5 -335q-8 -13 -14 -13h-14q-10 -1 -14 -1q-36 0 -36 24v500h-1036q-37 0 -37 41t37 41h1036v500q0 24 36 24h14q9 -1 14.5 -1t13.5 -13q128 -221 266.5 -335t302.5 -169q27 -7 80 -24q18 -7 18 -23zM1749 582 q-199 80 -354 240q-51 53 -125 154v-788q74 101 125 154q155 160 354 240z" />
+<glyph unicode="⇿" d="M1919 605q14 -8 14 -22.5t-14 -20.5q-223 -79 -343 -283q-43 -74 -79 -213q-2 -7 -8 -13t-53 -6q-21 0 -21 27v467h-782v-467q0 -27 -21 -27q-47 0 -53 6t-8 13q-36 139 -79 213q-105 179 -293 263q-17 6 -50 20q-14 6 -14 20.5t14 22.5l53 21q130 57 225 169t144 303 q5 19 20 19h41q21 -3 21 -27v-467h782v467q0 24 21 27h41q15 0 20 -19q49 -191 144 -303t225 -169q19 -6 53 -21zM1771 582q-178 101 -274 281v-562q96 180 274 281zM551 301v562q-96 -180 -274 -281q178 -101 274 -281z" />
+<glyph unicode="∀" horiz-adv-x="1137" d="M1139 1380q0 -9 -531 -1400q-10 -25 -38 -25t-38 25q-532 1397 -532 1400q0 41 41 41q30 0 39 -24l178 -473h623l180 473q9 24 37 24q41 0 41 -41zM848 842h-557l278 -731z" />
+<glyph unicode="∁" horiz-adv-x="1024" d="M875 151q0 -139 -141 -210q-102 -51 -222 -51t-222 51q-141 71 -141 210v1186q0 137 142 208q103 51 221 51t221 -51q142 -71 142 -208v-230q0 -60 -60 -60t-60 60v230q0 61 -74.5 100t-168.5 39t-168.5 -39t-74.5 -100v-1186q0 -63 73.5 -102t169.5 -39t169.5 39 t73.5 102v227q0 60 60 60t60 -60v-227z" />
+<glyph unicode="∂" horiz-adv-x="1087" d="M1036 810q0 -313 -128 -556q-159 -299 -443 -299q-183 0 -308 127t-125 316t130 345q161 193 390 193q108 0 187 -67.5t111 -174.5h2q16 132 16 218q0 199 -76 335q-95 168 -278 168q-208 0 -271 -162q7 1 14 1q38 0 65 -27t27 -64.5t-27.5 -65t-66 -27.5t-65 29 t-26.5 63t19 86q80 218 326.5 218t394.5 -212q132 -188 132 -444zM827 562q0 135 -69.5 232t-198.5 97q-186 0 -284 -182q-34 -63 -53.5 -184t-19.5 -214q0 -131 67 -215t194 -84q180 0 282 194q82 158 82 356z" />
+<glyph unicode="∃" horiz-adv-x="1137" d="M1022 39q0 -39 -37 -39h-831q-39 0 -39 41t39 41h786v588h-760q-37 0 -37 41t37 41h760v587h-786q-39 0 -39 41t39 41h831q37 0 37 -37v-1345z" />
+<glyph unicode="∄" horiz-adv-x="1137" d="M1022 39q0 -39 -37 -39h-611l-122 -336q-17 -47 -44 -47q-42 0 -42 38q0 15 8 37l112 308h-132q-39 0 -39 41t39 41h162l214 588h-350q-37 0 -37 41t37 41h380l214 587h-620q-39 0 -39 41t39 41h650l29 80q17 46 43 46q42 0 42 -37q0 -15 -8 -37l-19 -52h94q37 0 37 -37 v-1345zM940 752v587h-79l-213 -587h292zM940 82v588h-322l-214 -588h536z" />
+<glyph unicode="∅" horiz-adv-x="1591" d="M1518 582q0 -298 -211.5 -510.5t-509.5 -212.5q-205 0 -380 109l-214 -305q-12 -17 -34 -17q-40 0 -40 41q0 13 7 23l214 305q-276 218 -276 567q0 300 211.5 511.5t511.5 211.5q206 0 380 -109l214 306q11 15 33 15q41 0 41 -41q0 -11 -7 -21l-214 -306 q274 -218 274 -567zM1436 582q0 306 -239 499l-733 -1046q154 -94 333 -94q264 0 451.5 188.5t187.5 452.5zM797 1223q-266 0 -453.5 -187.5t-187.5 -453.5q0 -307 241 -500l733 1047q-153 94 -333 94z" />
+<glyph unicode="∆" horiz-adv-x="1694" d="M1596 17q0 -17 -24 -17h-1450q-24 0 -24 17q0 6 4 14l695 1401q17 35 50.5 35t50.5 -35l694 -1401q4 -8 4 -14zM1346 146l-557 1126l-558 -1126h1115z" />
+<glyph unicode="∇" horiz-adv-x="1694" d="M1596 1373q0 -6 -4 -14l-695 -1401q-17 -35 -50.5 -35t-50.5 35l-694 1401q-4 8 -4 14q0 17 24 17h1450q24 0 24 -17zM1463 1244h-1115l557 -1126z" />
+<glyph unicode="∈" horiz-adv-x="1364" d="M1194 41q0 -41 -37 -41h-364q-253 0 -438 166t-185 416t185 416t438 166h364q37 0 37 -41t-37 -41h-358q-201 0 -373 -132t-172 -327h903q37 0 37 -41t-37 -41h-903q0 -195 172 -327t373 -132h358q37 0 37 -41z" />
+<glyph unicode="∉" horiz-adv-x="1364" d="M1194 41q0 -41 -37 -41h-364q-72 0 -143 15l-128 -351q-17 -47 -44 -47q-42 0 -42 38q0 15 8 37l126 346q-177 63 -288.5 208.5t-111.5 335.5q0 250 185 416t438 166h187l123 337q17 46 43 46q42 0 42 -37q0 -15 -8 -37l-112 -309h89q37 0 37 -41t-37 -41h-119l-167 -459 h286q37 0 37 -41t-37 -41h-316l-162 -446q61 -13 120 -13h358q37 0 37 -41zM799 1082q-201 0 -373 -132t-172 -327h529l167 459h-151zM254 541q0 -144 98.5 -256.5t246.5 -166.5l154 423h-499z" />
+<glyph unicode="∊" horiz-adv-x="1164" d="M994 41q0 -41 -37 -41h-293q-201 0 -347.5 132t-146.5 330t146.5 330t347.5 132h293q37 0 37 -41t-37 -41h-293q-158 0 -275.5 -96.5t-134.5 -242.5h703q37 0 37 -41t-37 -41h-703q17 -146 134.5 -242.5t275.5 -96.5h293q37 0 37 -41z" />
+<glyph unicode="∋" horiz-adv-x="1364" d="M1194 582q0 -250 -185 -416t-438 -166h-364q-37 0 -37 41t37 41h358q201 0 373 132t172 327h-903q-37 0 -37 41t37 41h903q0 195 -172 327t-373 132h-358q-37 0 -37 41t37 41h364q253 0 438 -166t185 -416z" />
+<glyph unicode="∌" horiz-adv-x="1364" d="M1194 582q0 -250 -185 -416t-438 -166h-117l-122 -336q-17 -47 -44 -47q-42 0 -42 38q0 15 8 37l112 308h-159q-37 0 -37 41t37 41h189l167 459h-356q-37 0 -37 41t37 41h386l156 428q-93 31 -184 31h-358q-37 0 -37 41t37 41h364q107 0 207 -33l135 370q17 46 43 46 q42 0 42 -37q0 -15 -8 -37l-135 -372q153 -72 246 -209t93 -310zM1110 623q0 128 -79.5 232.5t-205.5 164.5l-144 -397h429zM1110 541h-459l-167 -459h81q201 0 373 132t172 327z" />
+<glyph unicode="∍" horiz-adv-x="1164" d="M994 462q0 -198 -146.5 -330t-347.5 -132h-293q-37 0 -37 41t37 41h293q158 0 275.5 96.5t134.5 242.5h-703q-37 0 -37 41t37 41h703q-17 146 -134.5 242.5t-275.5 96.5h-293q-37 0 -37 41t37 41h293q201 0 347.5 -132t146.5 -330z" />
+<glyph unicode="∎" horiz-adv-x="567" d="M453 39q0 -39 -37 -39h-262q-39 0 -39 39v307q0 37 39 37h262q37 0 37 -37v-307z" />
+<glyph unicode="∏" horiz-adv-x="1652" d="M1551 -255q0 -35 -27 -35h-478q-27 0 -27 35t27 35h81q72 0 72 55v1549h-746v-1549q0 -55 72 -55h81q27 0 27 -35t-27 -35h-478q-27 0 -27 35t27 35h81q72 0 72 55v1494q0 55 -72 55h-81q-27 0 -27 35t27 35h1396q27 0 27 -35t-27 -35h-81q-72 0 -72 -55v-1494 q0 -55 72 -55h81q27 0 27 -35z" />
+<glyph unicode="∐" horiz-adv-x="1652" d="M1551 -255q0 -35 -27 -35h-1396q-27 0 -27 35t27 35h81q72 0 72 55v1494q0 55 -72 55h-81q-27 0 -27 35t27 35h478q27 0 27 -35t-27 -35h-81q-72 0 -72 -55v-1549h746v1549q0 55 -72 55h-81q-27 0 -27 35t27 35h478q27 0 27 -35t-27 -35h-81q-72 0 -72 -55v-1494 q0 -55 72 -55h81q27 0 27 -35z" />
+<glyph unicode="∑" horiz-adv-x="1700" d="M829 1382h-597l560 -778q6 -8 6 -22t-8 -24l-604 -747h680q284 0 439 50q235 77 309 287h50l-148 -438h-1463q-17 0 -17 20q0 6 5 12l628 775l-628 872q-6 8 -6 36.5t19 28.5h1462l149 -410h-51q-80 215 -328 291q-156 47 -457 47z" />
+<glyph unicode="−" horiz-adv-x="1591" d="M1421 582q0 -41 -37 -41h-1175q-39 0 -39 41t39 41h1175q37 0 37 -41z" />
+<glyph unicode="∓" horiz-adv-x="1591" d="M1477 342q0 -41 -37 -41h-602v-604q0 -37 -41 -37t-41 37v604h-602q-39 0 -39 41t39 41h602v559h-602q-39 0 -39 41t39 41h1286q37 0 37 -41t-37 -41h-602v-559h602q37 0 37 -41z" />
+<glyph unicode="∔" horiz-adv-x="1591" d="M872 1535.5q27 -33.5 27 -75t-33.5 -69t-75 -27.5t-69 33.5t-27.5 75t34 69t75.5 27.5t68.5 -33.5zM1479 512q0 -41 -37 -41h-604v-627q0 -37 -41 -37t-41 37v627h-602q-39 0 -39 41t39 41h602v627q0 37 41 37t41 -37v-627h604q37 0 37 -41z" />
+<glyph unicode="∕" horiz-adv-x="1024" d="M889 1505q0 -8 -2 -13l-673 -1848q-9 -26 -40 -26q-39 0 -39 41q0 8 2 13l673 1848q9 26 40 26q39 0 39 -41z" />
+<glyph unicode="∖" horiz-adv-x="1024" d="M889 -341q0 -41 -39 -41q-31 0 -40 26l-673 1848q-2 5 -2 13q0 41 39 41q31 0 40 -26l673 -1848q2 -5 2 -13z" />
+<glyph unicode="∗" horiz-adv-x="964" d="M824 416q26 -12 26 -39.5t-16.5 -47t-35.5 -19.5t-31 9l-258 182l30 -319q0 -49 -56.5 -49t-56.5 49v5l29 314l-257 -182q-13 -9 -31.5 -9t-35.5 19.5t-17 47t27 39.5l287 132l-287 132q-27 13 -27 40t17 47t35.5 20t31.5 -9l257 -183l-29 319q0 49 56.5 49t56.5 -49v-5 l-30 -314l258 183q12 9 31 9t35.5 -20t16.5 -47t-26 -40l-287 -132z" />
+<glyph unicode="∘" horiz-adv-x="580" d="M540 582q0 -104 -73 -177t-177 -73t-177 73t-73 177t73 177t177 73t177 -73t73 -177zM440 582q0 63 -43.5 106.5t-106.5 43.5t-106.5 -43.5t-43.5 -106.5t43.5 -106.5t106.5 -43.5t106.5 43.5t43.5 106.5z" />
+<glyph unicode="∙" horiz-adv-x="580" d="M540 582q0 -104 -73 -177t-177 -73t-177 73t-73 177t73 177t177 73t177 -73t73 -177z" />
+<glyph unicode="√" horiz-adv-x="1706" d="M1747 1565q0 -10 -2 -14l-952 -1975q-9 -18 -56 -18q-13 0 -18 12l-408 897q-129 -98 -135 -98q-29 0 -29 29q0 9 9 16l243 184q8 6 18.5 6t16.5 -14l367 -807l870 1804q9 19 35 19q41 0 41 -41z" />
+<glyph unicode="∛" horiz-adv-x="1706" d="M1747 1565q0 -10 -2 -14l-952 -1975q-9 -18 -56 -18q-13 0 -18 12l-408 897q-129 -98 -135 -98q-29 0 -29 29q0 9 9 16l243 184q8 6 18.5 6t16.5 -14l367 -807l870 1804q9 19 35 19q41 0 41 -41zM1038 935q0 -118 -97 -192.5t-213.5 -74.5t-203.5 53q-103 62 -103 166 q0 89 91 89t91 -85q0 -79 -83 -85q68 -79 197 -79q151 0 151 209t-160 209q-68 0 -68 -1t4 -1q-44 4 -44 27t35 29q27 1 53 3q80 6 118.5 64.5t38.5 145.5q0 138 -126 138q-111 0 -169 -61q78 -8 78 -77q0 -79 -84.5 -79t-84.5 80q0 92 90 146q77 47 175.5 47t179.5 -47 q95 -55 95 -148q0 -158 -173 -232q89 -26 150.5 -91t61.5 -153z" />
+<glyph unicode="∜" horiz-adv-x="1706" d="M1747 1565q0 -10 -2 -14l-952 -1975q-9 -18 -56 -18q-13 0 -18 12l-408 897q-129 -98 -135 -98q-29 0 -29 29q0 9 9 16l243 184q8 6 18.5 6t16.5 -14l367 -807l870 1804q9 19 35 19q41 0 41 -41zM1057 903h-143v-105q0 -40 30 -49q10 -3 68 -3h41v-64q-74 5 -166 5h-78 q-92 0 -166 -5v64h41q58 0 68 3q30 9 30 49v105h-381v55l442 628q14 20 38 20q33 0 33 -46v-594h143v-63zM790 966v451l-317 -451h317z" />
+<glyph unicode="∝" horiz-adv-x="1591" d="M1401 -23q-245 0 -428 277l-45 68q-176 -345 -459 -345q-168 0 -267 154q-87 134 -87 311t90 311q102 152 263.5 152t286.5 -107q84 -72 193 -237q174 344 459 344q39 0 70 -8l2 -63q-28 6 -54 6q-142 0 -262 -114q-100 -95 -164 -245l95 -145q81 -123 138 -177 q93 -89 198 -89q16 0 49 4v-86q-49 -11 -78 -11zM446 813q-132 0 -210 -125q-68 -108 -68 -252t67 -258q79 -135 216 -135q270 0 426 358l-113 177q-70 102 -142.5 168.5t-175.5 66.5z" />
+<glyph unicode="∞" d="M1542 905q175 0 282 -141.5t107 -322.5t-109 -322.5t-286 -141.5q-134 0 -258.5 73.5t-210.5 189.5l-61 82q-212 -345 -502 -345q-174 0 -281.5 142.5t-107.5 323t109.5 321.5t285.5 141q132 0 258.5 -74.5t210.5 -187.5l61 -82q216 344 502 344zM1569 84 q136 0 222.5 109.5t86.5 253.5t-86 265.5t-229 121.5q-260 0 -465 -349l142 -180q74 -94 148.5 -157.5t180.5 -63.5zM477 799q-137 0 -223 -109.5t-86 -253t87 -265.5t228 -122q260 0 465 348l-133 173q-81 101 -156.5 165t-181.5 64z" />
+<glyph unicode="∟" horiz-adv-x="1573" d="M1434 41q0 -41 -68 -41h-1139q-61 0 -66 35q-2 11 -2 33v1269q0 68 41 68t41 -68v-1255h1125q68 0 68 -41z" />
+<glyph unicode="∠" horiz-adv-x="1479" d="M1362 41q0 -41 -37 -41h-1171q-39 0 -39 41q0 18 10 29l1165 1339q10 12 31 12q41 0 41 -41q0 -14 -10 -26l-1106 -1272h1079q37 0 37 -41z" />
+<glyph unicode="∡" horiz-adv-x="1479" d="M1362 41q0 -41 -37 -41h-430q0 -41 -41 -41q-36 0 -43 41h-657q-39 0 -39 41q0 17 10 29l1165 1380q10 12 31 12q41 0 41 -41q0 -14 -10 -26l-678 -805q84 -98 150.5 -245.5t66.5 -262.5h434q37 0 37 -41zM809 82q-25 255 -191 444l-374 -444h565z" />
+<glyph unicode="∢" horiz-adv-x="1479" d="M1362 -63q0 -41 -41 -41q-10 0 -14 2l-1166 577q-26 13 -26 37.5t20 34.5l1172 579q4 2 14 2q41 0 41 -41q0 -25 -19 -34l-266 -131q86 -190 86 -408t-86 -412l260 -129q25 -12 25 -36zM1081 512q0 196 -77 373l-756 -373l756 -373q77 177 77 373z" />
+<glyph unicode="∣" horiz-adv-x="626" d="M354 -401q0 -41 -41 -41t-41 41v1968q0 39 41 39t41 -39v-1968z" />
+<glyph unicode="∤" horiz-adv-x="626" d="M633 1070q0 -16 -15 -42l-264 -457v-976q0 -37 -41 -37t-41 37v834l-192 -333q-23 -40 -46 -40q-41 0 -41 38q0 15 16 43l263 456v976q0 37 41 37t41 -37v-834l193 334q23 39 45 39q41 0 41 -38z" />
+<glyph unicode="∥" horiz-adv-x="1024" d="M752 -405q0 -37 -41 -37t-41 37v1974q0 37 41 37t41 -37v-1974zM354 -405q0 -37 -41 -37t-41 37v1974q0 37 41 37t41 -37v-1974z" />
+<glyph unicode="∦" horiz-adv-x="1024" d="M977 1090q0 -18 -23 -45l-202 -241v-1209q0 -37 -41 -37t-41 37v1112l-316 -377v-735q0 -37 -41 -37t-41 37v638l-139 -166q-27 -32 -46 -32q-40 0 -40 39q0 17 24 46l201 240v1209q0 37 41 37t41 -37v-1111l316 376v735q0 37 41 37t41 -37v-637l139 166q26 31 46 31 q40 0 40 -39z" />
+<glyph unicode="∧" horiz-adv-x="1364" d="M1249 -4q0 -41 -41 -41q-26 0 -37 25l-489 1103l-489 -1103q-11 -25 -37 -25q-41 0 -41 41q0 11 2 16l526 1188q11 25 39 25t39 -25l526 -1188q2 -5 2 -16z" />
+<glyph unicode="∨" horiz-adv-x="1364" d="M1249 1183q0 -11 -2 -16l-526 -1188q-11 -25 -39 -25t-39 25l-526 1188q-2 5 -2 16q0 41 41 41q26 0 37 -25l489 -1103l489 1103q11 25 37 25q41 0 41 -41z" />
+<glyph unicode="∩" horiz-adv-x="1364" d="M1249 -8q0 -37 -41 -37t-41 37v792q0 171 -163 273q-140 86 -322.5 86t-321.5 -87q-163 -101 -163 -272v-792q0 -37 -41 -37t-41 37v799q0 202 189 326q164 108 378 108t379 -107q188 -124 188 -327v-799z" />
+<glyph unicode="∪" horiz-adv-x="1364" d="M1249 389q0 -203 -188 -327q-165 -107 -379 -107t-379 107q-188 124 -188 327v799q0 37 41 37t41 -37v-793q0 -169 164 -271q140 -87 321.5 -87t321.5 86q163 101 163 272v793q0 37 41 37t41 -37v-799z" />
+<glyph unicode="∫" horiz-adv-x="1019" d="M814 1606q77 0 141 -42t64 -116t-76 -74t-76 75q0 69 67 78q-47 38 -120 38q-86 0 -126 -118q-30 -89 -45 -268l-18 -279q-25 -376 -100 -924q-23 -165 -90 -274q-88 -144 -231 -144q-78 0 -141 41.5t-63 116t76.5 74.5t76.5 -75q0 -69 -70 -78q48 -39 121 -39 q98 0 144 118q40 102 66 478t54 602l52 396q24 172 84 277q78 137 210 137z" />
+<glyph unicode="∬" horiz-adv-x="1559" d="M814 1606q77 0 141 -42t64 -116t-76 -74t-76 75q0 69 67 78q-47 38 -120 38q-86 0 -126 -118q-30 -89 -45 -268l-18 -279q-25 -376 -100 -924q-23 -165 -90 -274q-88 -144 -231 -144q-78 0 -141 41.5t-63 116t76.5 74.5t76.5 -75q0 -69 -70 -78q48 -39 121 -39 q98 0 144 118q40 102 66 478t54 602l52 396q24 172 84 277q78 137 210 137zM1354 1606q77 0 141 -42t64 -116t-76.5 -74t-76.5 75q0 69 68 78q-47 38 -120 38q-86 0 -126 -118q-30 -89 -45 -268l-18 -279q-25 -377 -100 -924q-23 -165 -90 -274q-88 -144 -231 -144 q-78 0 -141 41.5t-63 116t76.5 74.5t76.5 -75q0 -69 -70 -78q48 -39 121 -39q98 0 144 118q39 99 64 468t56 604l52 398q24 178 84 283q78 137 210 137z" />
+<glyph unicode="∭" horiz-adv-x="2099" d="M814 1606q77 0 141 -42t64 -116t-76 -74t-76 75q0 69 67 78q-47 38 -120 38q-86 0 -126 -118q-30 -89 -45 -268l-18 -279q-25 -376 -100 -924q-23 -165 -90 -274q-88 -144 -231 -144q-78 0 -141 41.5t-63 116t76.5 74.5t76.5 -75q0 -69 -70 -78q48 -39 121 -39 q98 0 144 118q40 102 66 478t54 602l52 396q24 172 84 277q78 137 210 137zM1894 1606q77 0 141 -42t64 -116t-76.5 -74t-76.5 75q0 69 68 78q-47 38 -120 38q-86 0 -126 -118q-30 -89 -45 -268l-18 -279q-25 -376 -100 -924q-23 -165 -90 -274q-88 -144 -231 -144 q-78 0 -141 41.5t-63 116t76.5 74.5t76.5 -75q0 -69 -70 -78q48 -39 121 -39q98 0 144 118q39 99 64 468t56 604l52 398q24 178 84 283q78 137 210 137zM1354 1606q77 0 141 -42t64 -116t-76.5 -74t-76.5 75q0 69 68 78q-47 38 -120 38q-86 0 -126 -118q-30 -89 -45 -268 l-18 -279q-25 -376 -100 -924q-23 -165 -90 -274q-88 -144 -231 -144q-78 0 -141 41.5t-63 116t76.5 74.5t76.5 -75q0 -69 -70 -78q48 -39 121 -39q98 0 144 118q39 99 64 468t56 604l52 398q24 178 84 283q78 137 210 137z" />
+<glyph unicode="∮" horiz-adv-x="1019" d="M814 1606q77 0 141 -42t64 -116t-76 -74t-76 75q0 69 67 78q-47 38 -120 38q-86 0 -126 -118q-35 -104 -60 -511q117 -35 190.5 -133.5t73.5 -231t-97 -238t-239 -118.5l-31 -239q-23 -165 -90 -274q-88 -144 -231 -144q-78 0 -141 41.5t-63 116t76.5 74.5t76.5 -75 q0 -69 -70 -78q48 -39 121 -39q98 0 144 118q34 86 50 251l18 262q-116 35 -189 133t-73 230t96.5 238t238.5 119l31 237q57 420 294 420zM763 369.5q81 91.5 81 203.5t-61 196.5t-159 117.5q-16 -239 -62 -624q120 15 201 106.5zM282 794.5q-80 -91.5 -80 -203.5t60.5 -196 t157.5 -117q24 319 62 623q-120 -15 -200 -106.5z" />
+<glyph unicode="∯" horiz-adv-x="1559" d="M1354 1606q77 0 141 -42t64 -116t-76.5 -74t-76.5 75q0 69 68 78q-47 38 -120 38q-86 0 -124 -112.5t-63 -519.5q265 -124 265 -351q0 -261 -338 -381l-29 -225q-23 -165 -90 -274q-88 -144 -231 -144q-78 0 -141 41.5t-63 116t76.5 74.5t76.5 -75q0 -69 -70 -78 q48 -39 121 -39q98 0 144 118q31 79 46 219q8 114 17 228q-82 -15 -179 -15t-220 34q-17 -135 -27 -206q-23 -165 -90 -274q-88 -144 -231 -144q-78 0 -141 41.5t-63 116t76.5 74.5t76.5 -75q0 -69 -70 -78q48 -39 121 -39q98 0 144 118q34 87 50 253l18 263 q-262 124 -262 350q0 261 336 380l30 224q57 420 294 420q77 0 141 -42t64 -116t-76 -74t-76 75q0 69 67 78q-47 38 -120 38q-86 0 -126 -118q-35 -103 -56 -447q86 16 182 16t219 -34q40 301 66 382q77 242 255 242zM1384 582q0 189 -220 299q-16 -236 -63 -626 q283 109 283 327zM1027 934q-120 34 -216.5 34t-181.5 -17l-4 -51q-27 -338 -62 -629l-5 -41q120 -34 215.5 -34t181.5 17q35 479 72 721zM202 582q0 -188 218 -298q24 305 63 625q-281 -109 -281 -327z" />
+<glyph unicode="∰" horiz-adv-x="2099" d="M1894 1606q77 0 141 -42t64 -116t-76.5 -74t-76.5 75q0 69 68 78q-47 38 -120 38q-86 0 -124 -112t-62 -512q263 -134 263 -359q0 -256 -339 -393l-27 -213q-23 -165 -90 -274q-88 -144 -231 -144q-78 0 -141 41.5t-63 116t76.5 74.5t76.5 -75q0 -69 -70 -78 q48 -39 121 -39q98 0 143 115.5t62 427.5q-200 -54 -410 -57q-5 -36 -14 -108q-23 -165 -90 -274q-88 -144 -231 -144q-78 0 -141 41.5t-63 116t76.5 74.5t76.5 -75q0 -69 -70 -78q48 -39 121 -39q98 0 144 118q40 103 58 372q-213 17 -396 80l-25 -192q-23 -165 -90 -274 q-88 -144 -231 -144q-78 0 -141 41.5t-63 116t76.5 74.5t76.5 -75q0 -69 -70 -78q48 -39 121 -39q98 0 144 118q34 87 50 249l18 259q-262 135 -262 358q0 256 338 393q40 305 67 389q78 242 255 242q77 0 141 -42t64 -116t-76 -74t-76 75q0 69 67 78q-47 38 -120 38 q-86 0 -126 -118q-35 -102 -55 -425q202 55 413 58q30 231 70 331q77 195 238 195q77 0 141 -42t64 -116t-76.5 -74t-76.5 75q0 69 68 78q-47 38 -120 38q-86 0 -126 -118q-33 -97 -52 -371q218 -17 399 -79q38 288 66 374q78 235 253 235zM1924 582q0 188 -220 307 q-27 -406 -65 -645q285 124 285 338zM1568 948q-179 63 -395 80q-25 -397 -88 -897q206 4 408 61q27 381 75 756zM1040 1033q-207 -4 -410 -62q-21 -337 -74 -755q177 -62 393 -80q31 447 91 897zM202 582q0 -187 218 -306q18 239 30.5 373.5t34.5 270.5 q-283 -124 -283 -338z" />
+<glyph unicode="∱" horiz-adv-x="1019" d="M814 1606q77 0 141 -42t64 -116t-76 -74t-76 75q0 69 67 78q-47 38 -120 38q-86 0 -123.5 -111.5t-62.5 -517.5q117 -35 190.5 -133.5t73.5 -231t-97 -238t-239 -118.5l-31 -239q-23 -165 -90 -274q-88 -144 -231 -144q-78 0 -141 41.5t-63 116t76.5 74.5t76.5 -75 q0 -69 -70 -78q48 -39 121 -39q98 0 144 118q34 88 50 252l18 261q-114 35 -186.5 130t-75.5 214q-113 -102 -144 -102q-23 0 -23 35q0 4 32 20q103 51 135 128q15 37 24 37t24 -37q32 -77 135 -128q31 -15 31 -20q0 -35 -22 -35q-31 0 -144 102q3 -100 63 -181.5 t155 -113.5q27 348 51 535l49 373q24 177 84 283q78 137 210 137zM763 369.5q81 91.5 81 203.5t-61 196.5t-159 117.5q-23 -336 -62 -624q120 15 201 106.5z" />
+<glyph unicode="∲" horiz-adv-x="1019" d="M814 1606q77 0 141 -42t64 -116t-76 -74t-76 75q0 69 67 78q-47 38 -120 38q-86 0 -126 -118q-35 -104 -60 -511q117 -35 190.5 -133.5t73.5 -231t-97 -238t-239 -118.5l-31 -239q-23 -165 -90 -274q-88 -144 -231 -144q-78 0 -141 41.5t-63 116t76.5 74.5t76.5 -75 q0 -69 -70 -78q48 -39 121 -39q98 0 144 118q34 86 50 252l18 261q-114 35 -186.5 130t-75.5 214q-113 -102 -144 -102q-23 0 -23 35q0 4 32 20q102 50 135 128q3 11 15 34q32 107 120 179t200 82l31 237q57 420 294 420zM763 369.5q81 91.5 81 203.5t-61 196.5t-159 117.5 q-16 -239 -62 -624q120 15 201 106.5zM368 506q0 -35 -22 -35q-31 0 -144 102q3 -100 63 -181.5t155 -113.5q24 317 62 623q-103 -13 -179 -85t-96 -174q38 -70 130 -116q31 -16 31 -20z" />
+<glyph unicode="∳" horiz-adv-x="1019" d="M814 1606q77 0 141 -42t64 -116t-76 -74t-76 75q0 69 67 78q-47 38 -120 38q-86 0 -126 -118q-35 -104 -60 -511q117 -35 190.5 -133.5t73.5 -231t-97 -238t-239 -118.5l-31 -239q-23 -165 -90 -274q-88 -144 -231 -144q-78 0 -141 41.5t-63 116t76.5 74.5t76.5 -75 q0 -69 -70 -78q48 -39 121 -39q98 0 144 118q34 86 50 252l18 261q-190 58 -247 247q-2 2 -15 34q-33 78 -135 128q-32 16 -32 20q0 35 23 35q31 0 144 -102q4 140 100 242.5t235 115.5l31 237q57 420 294 420zM763 369.5q81 91.5 81 203.5t-61 196.5t-159 117.5 q-16 -239 -62 -624q120 15 201 106.5zM346 693q22 0 22 -35q0 -4 -31 -20q-92 -46 -130 -116q35 -183 213 -244q24 317 62 623q-117 -15 -197 -103.5t-83 -206.5q113 102 144 102z" />
+<glyph unicode="∴" horiz-adv-x="1364" d="M1273.5 192.5q33.5 -33.5 33.5 -80t-33 -79.5t-80 -33t-80 33t-33 80t33 80t79.5 33t80 -33.5zM249.5 192.5q33.5 -33.5 33.5 -80t-33 -79.5t-80 -33t-80 33t-33 80t33 80t79.5 33t80 -33.5zM761 1078.5q34 -33.5 34 -79t-34 -79t-79.5 -33.5t-79 33.5t-33.5 80t33 79 t79 32.5t80 -33.5z" />
+<glyph unicode="∵" horiz-adv-x="1364" d="M761.5 192.5q33.5 -33.5 33.5 -80t-33 -79.5t-80 -33t-80 33t-33 80t33 80t79.5 33t80 -33.5zM1273 1078.5q34 -33.5 34 -79t-34 -79t-79.5 -33.5t-79 33.5t-33.5 80t33 79t79 32.5t80 -33.5zM249 1078.5q34 -33.5 34 -79t-34 -79t-79.5 -33.5t-79 33.5t-33.5 80t33 79 t79 32.5t80 -33.5z" />
+<glyph unicode="∶" horiz-adv-x="683" d="M421 1078.5q34 -33.5 34 -79t-34 -79t-80 -33.5t-79 33.5t-33 80t33 79t79 32.5t80 -33.5zM421 192.5q34 -33.5 34 -80t-33 -79.5t-80.5 -33t-80 33t-32.5 80t32.5 80t79 33t80.5 -33.5z" />
+<glyph unicode="∷" horiz-adv-x="1364" d="M1273.5 192.5q33.5 -33.5 33.5 -80t-33 -79.5t-80 -33t-80 33t-33 80t33 80t79.5 33t80 -33.5zM249.5 192.5q33.5 -33.5 33.5 -80t-33 -79.5t-80 -33t-80 33t-33 80t33 80t79.5 33t80 -33.5zM1273 1078.5q34 -33.5 34 -79t-34 -79t-79.5 -33.5t-79 33.5t-33.5 80t33 79 t79 32.5t80 -33.5zM249 1078.5q34 -33.5 34 -79t-34 -79t-79.5 -33.5t-79 33.5t-33.5 80t33 79t79 32.5t80 -33.5z" />
+<glyph unicode="∸" horiz-adv-x="1591" d="M875.5 1111.5q33.5 -33.5 33.5 -80t-33 -79.5t-80 -33t-80 33t-33 80t33 80t79.5 33t80 -33.5zM1421 582q0 -41 -37 -41h-1175q-39 0 -39 41t39 41h1175q37 0 37 -41z" />
+<glyph unicode="∹" horiz-adv-x="1591" d="M1475.5 271.5q33.5 -33.5 33.5 -80t-33 -79.5t-80 -33t-80 33t-33 80t33 80t79.5 33t80 -33.5zM1475.5 1051.5q33.5 -33.5 33.5 -80t-33 -79.5t-80 -33t-80 33t-33 80t33 80t79.5 33t80 -33.5zM1421 582q0 -41 -37 -41h-1175q-39 0 -39 41t39 41h1175q37 0 37 -41z" />
+<glyph unicode="∺" horiz-adv-x="1591" d="M1387.5 218.5q33.5 -33.5 33.5 -80t-33 -79.5t-80 -33t-80 33t-33 80t33 80t79.5 33t80 -33.5zM363.5 218.5q33.5 -33.5 33.5 -80t-33 -79.5t-80 -33t-80 33t-33 80t33 80t79.5 33t80 -33.5zM1387 1104.5q34 -33.5 34 -79t-34 -79t-79.5 -33.5t-79 33.5t-33.5 80t33 79 t79 32.5t80 -33.5zM363 1104.5q34 -33.5 34 -79t-34 -79t-79.5 -33.5t-79 33.5t-33.5 80t33 79t79 32.5t80 -33.5zM1421 582q0 -41 -37 -41h-1175q-39 0 -39 41t39 41h1175q37 0 37 -41z" />
+<glyph unicode="∻" horiz-adv-x="1591" d="M1477 746q0 -152 -96 -271.5t-244 -119.5q-114 0 -238 88l-208 164q-123 88 -236 88q-162 0 -245 -147q-29 -52 -38 -142q-5 -51 -29 -51q-28 0 -28 63q0 152 95.5 271.5t244.5 119.5q115 0 240 -88l207 -164q124 -88 235 -88q85 0 156 50t104 130q15 36 21 98t30 62 q29 0 29 -63zM875.5 11.5q33.5 -33.5 33.5 -80t-33 -79.5t-80 -33t-80 33t-33 80t33 80t79.5 33t80 -33.5zM875.5 1311.5q33.5 -33.5 33.5 -80t-33 -79.5t-80 -33t-80 33t-33 80t33 80t79.5 33t80 -33.5z" />
+<glyph unicode="∼" horiz-adv-x="1591" d="M1477 746q0 -152 -96 -271.5t-244 -119.5q-114 0 -238 88l-208 164q-123 88 -236 88q-162 0 -245 -147q-29 -52 -38 -142q-5 -51 -29 -51q-28 0 -28 63q0 152 95.5 271.5t244.5 119.5q115 0 240 -88l207 -164q124 -88 235 -88q85 0 156 50t104 130q15 36 21 98t30 62 q29 0 29 -63z" />
+<glyph unicode="∽" horiz-adv-x="1591" d="M1477 418q0 -63 -29 -63q-24 0 -28 43.5t-23 116.5q-33 80 -104 130t-156 50q-111 0 -235 -88l-207 -164q-125 -88 -240 -88q-149 0 -244.5 119.5t-95.5 271.5q0 63 28 63q24 0 29 -51q9 -90 38 -142q83 -147 245 -147q113 0 236 88l208 164q124 88 238 88 q148 0 244 -119.5t96 -271.5z" />
+<glyph unicode="∾" horiz-adv-x="1591" d="M1518 584q0 -14 -11 -27q-105 -121 -164 -167q-101 -78 -205 -78t-206 78q-59 46 -160.5 161t-153.5 156q-83 65 -163 65t-163 -66q-50 -41 -148 -151q-12 -14 -31 -14q-39 0 -39 41q0 14 11 27q105 121 164 167q101 78 205.5 78t205.5 -77q63 -48 162.5 -161t152.5 -156 q84 -66 163 -66t162 66q50 41 148 151q12 14 31 14q39 0 39 -41z" />
+<glyph unicode="∿" horiz-adv-x="1591" d="M1427 244q0 -28 -28 -39q-168 -67 -271.5 -67t-171.5 40q-117 68 -171 275l-84 332q-66 161 -222 161q-71 0 -262 -61q-9 -3 -13 -3q-39 0 -39 40q0 28 28 39q168 67 271.5 67t171.5 -40q119 -70 174 -276l83 -331q64 -161 220 -161q71 0 262 61q9 3 13 3q39 0 39 -40z " />
+<glyph unicode="≀" horiz-adv-x="1024" d="M739 -70q0 -29 -63 -29q-152 0 -271.5 96t-119.5 244q0 115 88 239l164 206q88 124 88 237q0 162 -147 245q-44 25 -142 38q-51 7 -51 29q0 28 63 28q152 0 271.5 -95.5t119.5 -244.5q0 -116 -88 -240l-164 -207q-88 -123 -88 -235q0 -84 50.5 -156t129.5 -104 q28 -11 94 -20t66 -31z" />
+<glyph unicode="≁" horiz-adv-x="1591" d="M1477 746q0 -152 -96 -271.5t-238.5 -119.5t-333.5 158l-241 -417q-23 -40 -46 -40q-41 0 -41 38q0 15 16 43l248 429q-161 129 -290 129q-162 0 -245 -147q-29 -52 -38 -142q-5 -51 -29 -51q-28 0 -28 63q0 152 95.5 271.5t239.5 119.5t341 -163l244 423q23 39 45 39 q41 0 41 -38q0 -16 -15 -42l-251 -435q156 -124 282 -124q85 0 156 50t104 130q15 36 21 98t30 62q29 0 29 -63z" />
+<glyph unicode="≂" horiz-adv-x="1591" d="M1477 438q0 -152 -96 -271.5t-244 -119.5q-114 0 -238 88l-208 164q-123 88 -236 88q-162 0 -245 -147q-29 -52 -38 -142q-5 -51 -29 -51q-28 0 -28 63q0 152 95.5 271.5t244.5 119.5q115 0 240 -88l207 -164q124 -88 235 -88q85 0 156 50t104 130q15 36 21 98t30 62 q29 0 29 -63zM1477 882q0 -41 -37 -41h-1286q-39 0 -39 41t39 41h1286q37 0 37 -41z" />
+<glyph unicode="≃" horiz-adv-x="1591" d="M1477 1054q0 -152 -96 -271.5t-244 -119.5q-114 0 -238 88l-208 164q-123 88 -236 88q-162 0 -245 -147q-29 -52 -38 -142q-5 -51 -29 -51q-28 0 -28 63q0 152 95.5 271.5t244.5 119.5q115 0 240 -88l207 -164q124 -88 235 -88q85 0 156 50t104 130q15 36 21 98t30 62 q29 0 29 -63zM1477 282q0 -41 -37 -41h-1286q-39 0 -39 41t39 41h1286q37 0 37 -41z" />
+<glyph unicode="≄" horiz-adv-x="1591" d="M1477 282q0 -41 -37 -41h-708l-210 -577q-17 -47 -44 -47q-42 0 -42 38q0 15 8 37l200 549h-490q-39 0 -39 41t39 41h520l171 469q-159 127 -181 142q-107 69 -209 69q-162 0 -245 -147q-29 -52 -38 -142q-5 -51 -29 -51q-28 0 -28 63q0 152 95.5 271.5t244.5 119.5 q110 0 228 -79l195 -155l225 618q17 46 43 46q42 0 42 -37q0 -15 -8 -37l-232 -638q96 -58 185 -58t160 50t104 130q15 36 21 98t30 62q29 0 29 -63q0 -152 -96 -271.5t-244 -119.5q-109 0 -223 78l-152 -418h678q37 0 37 -41z" />
+<glyph unicode="≅" horiz-adv-x="1591" d="M1477 1115q0 -152 -96 -271.5t-244 -119.5q-114 0 -238 88l-208 164q-123 88 -236 88q-162 0 -245 -147q-29 -52 -38 -142q-5 -51 -29 -51q-28 0 -28 63q0 152 95.5 271.5t244.5 119.5q115 0 240 -88l207 -164q124 -88 235 -88q85 0 156 50t104 130q15 36 21 98t30 62 q29 0 29 -63zM1477 441q0 -41 -37 -41h-1286q-39 0 -39 41t39 41h1286q37 0 37 -41zM1477 41q0 -41 -37 -41h-1286q-39 0 -39 41t39 41h1286q37 0 37 -41z" />
+<glyph unicode="≆" horiz-adv-x="1591" d="M1477 1115q0 -152 -96 -271.5t-244 -119.5q-114 0 -238 88l-208 164q-123 88 -236 88q-162 0 -245 -147q-29 -52 -38 -142q-5 -51 -29 -51q-28 0 -28 63q0 152 95.5 271.5t244.5 119.5q115 0 240 -88l207 -164q124 -88 235 -88q85 0 156 50t104 130q15 36 21 98t30 62 q29 0 29 -63zM1477 41q0 -41 -37 -41h-789l-170 -294q-23 -40 -46 -40q-41 0 -41 38q0 15 16 43l146 253h-402q-39 0 -39 41t39 41h449l184 318h-633q-39 0 -39 41t39 41h680l114 197q23 39 45 39q41 0 41 -38q0 -16 -15 -42l-90 -156h511q37 0 37 -41t-37 -41h-558 l-184 -318h742q37 0 37 -41z" />
+<glyph unicode="≇" horiz-adv-x="1591" d="M1477 41q0 -41 -37 -41h-796l-122 -336q-17 -47 -44 -47q-42 0 -42 38q0 15 8 37l112 308h-402q-39 0 -39 41t39 41h432l116 318h-548q-39 0 -39 41t39 41h578l130 357l-189 150q-112 75 -218 75q-162 0 -245 -147q-29 -52 -38 -142q-5 -51 -29 -51q-28 0 -28 63 q0 152 95.5 271.5t244.5 119.5q114 0 237 -86l203 -161l208 570q17 46 43 46q42 0 42 -37q0 -15 -8 -37l-214 -588q86 -47 171 -47t156 50t104 130q15 36 21 98t30 62q29 0 29 -63q0 -152 -96 -271.5t-244 -119.5q-101 0 -205 66l-112 -308h620q37 0 37 -41t-37 -41h-650 l-116 -318h766q37 0 37 -41z" />
+<glyph unicode="≈" horiz-adv-x="1591" d="M1477 495q0 -152 -96 -271.5t-244 -119.5q-114 0 -238 88l-208 164q-123 88 -236 88q-162 0 -245 -147q-29 -52 -38 -142q-5 -51 -29 -51q-28 0 -28 63q0 152 95.5 271.5t244.5 119.5q115 0 240 -88l207 -164q124 -88 235 -88q85 0 156 50t104 130q15 36 21 98t30 62 q29 0 29 -63zM1477 995q0 -152 -96 -271.5t-244 -119.5q-114 0 -238 88l-208 164q-123 88 -236 88q-162 0 -245 -147q-29 -52 -38 -142q-5 -51 -29 -51q-28 0 -28 63q0 152 95.5 271.5t244.5 119.5q115 0 240 -88l207 -164q124 -88 235 -88q85 0 156 50t104 130q15 36 21 98 t30 62q29 0 29 -63z" />
+<glyph unicode="≉" horiz-adv-x="1591" d="M1477 495q0 -152 -96 -271.5t-244 -119.5q-101 0 -205 66q-37 23 -176 136l-234 -642q-17 -47 -44 -47q-42 0 -42 38q0 15 8 37l243 667q-121 85 -232 85q-162 0 -245 -147q-29 -52 -38 -142q-5 -51 -29 -51q-28 0 -28 63q0 152 95.5 271.5t244.5 119.5q124 0 266 -107 l107 296q-133 108 -173 133q-102 64 -200 64q-162 0 -245 -147q-29 -52 -38 -142q-5 -51 -29 -51q-28 0 -28 63q0 152 95.5 271.5t244.5 119.5q107 0 219 -74q5 -3 187 -147l242 664q17 46 43 46q42 0 42 -37q0 -15 -8 -37l-250 -686q107 -69 199.5 -69t163.5 50t104 130 q15 36 21 98t30 62q29 0 29 -63q0 -152 -96 -271.5t-244 -119.5q-115 0 -240 90l-108 -297q111 -92 162 -123q94 -56 182.5 -56t159.5 50t104 130q15 36 21 98t30 62q29 0 29 -63z" />
+<glyph unicode="≊" horiz-adv-x="1591" d="M1477 495q0 -152 -96 -271.5t-244 -119.5q-114 0 -238 88l-208 164q-123 88 -236 88q-162 0 -245 -147q-29 -52 -38 -142q-5 -51 -29 -51q-28 0 -28 63q0 152 95.5 271.5t244.5 119.5q115 0 240 -88l207 -164q124 -88 235 -88q85 0 156 50t104 130q15 36 21 98t30 62 q29 0 29 -63zM1477 995q0 -152 -96 -271.5t-244 -119.5q-114 0 -238 88l-208 164q-123 88 -236 88q-162 0 -245 -147q-29 -52 -38 -142q-5 -51 -29 -51q-28 0 -28 63q0 152 95.5 271.5t244.5 119.5q115 0 240 -88l207 -164q124 -88 235 -88q85 0 156 50t104 130q15 36 21 98 t30 62q29 0 29 -63zM1477 -179q0 -41 -37 -41h-1286q-39 0 -39 41t39 41h1286q37 0 37 -41z" />
+<glyph unicode="≋" horiz-adv-x="1591" d="M1477 246q0 -152 -96 -271.5t-244 -119.5q-114 0 -238 88l-208 164q-123 88 -236 88q-162 0 -245 -147q-29 -52 -38 -142q-5 -51 -29 -51q-28 0 -28 63q0 152 95.5 271.5t244.5 119.5q115 0 240 -88l207 -164q124 -88 235 -88q85 0 156 50t104 130q15 36 21 98t30 62 q29 0 29 -63zM1477 746q0 -152 -96 -271.5t-244 -119.5q-114 0 -238 88l-208 164q-123 88 -236 88q-162 0 -245 -147q-29 -52 -38 -142q-5 -51 -29 -51q-28 0 -28 63q0 152 95.5 271.5t244.5 119.5q115 0 240 -88l207 -164q124 -88 235 -88q85 0 156 50t104 130q15 36 21 98 t30 62q29 0 29 -63zM1477 1246q0 -152 -96 -271.5t-244 -119.5q-114 0 -238 88l-208 164q-123 88 -236 88q-162 0 -245 -147q-29 -52 -38 -142q-5 -51 -29 -51q-28 0 -28 63q0 152 95.5 271.5t244.5 119.5q115 0 240 -88l207 -164q124 -88 235 -88q85 0 156 50t104 130 q15 36 21 98t30 62q29 0 29 -63z" />
+<glyph unicode="≌" horiz-adv-x="1591" d="M1477 787q0 -63 -29 -63q-24 0 -28 43.5t-23 116.5q-33 80 -104 130t-156 50q-111 0 -235 -88l-207 -164q-125 -88 -240 -88q-149 0 -244.5 119.5t-95.5 271.5q0 63 28 63q24 0 29 -51q9 -90 38 -142q83 -147 245 -147q113 0 236 88l208 164q124 88 238 88 q148 0 244 -119.5t96 -271.5zM1477 441q0 -41 -37 -41h-1286q-39 0 -39 41t39 41h1286q37 0 37 -41zM1477 41q0 -41 -37 -41h-1286q-39 0 -39 41t39 41h1286q37 0 37 -41z" />
+<glyph unicode="≍" horiz-adv-x="1591" d="M1477 1025q0 -17 -17 -32q-139 -122 -314.5 -196.5t-348.5 -74.5t-350.5 75t-315.5 196q-16 14 -16 32q0 41 41 41q14 0 24 -8q328 -254 615 -254t616 254q10 8 25 8q41 0 41 -41zM1477 139q0 -41 -41 -41q-15 0 -25 8q-327 254 -616.5 254t-614.5 -254q-10 -8 -24 -8 q-41 0 -41 41q0 18 16 32q138 121 315.5 196t350.5 75t348.5 -74.5t314.5 -196.5q17 -15 17 -32z" />
+<glyph unicode="≎" horiz-adv-x="1591" d="M1477 782q0 -41 -37 -41h-391q-13 0 -25 13t-12 26q0 87 -64 152t-152 65t-151 -64t-63 -153q0 -39 -39 -39h-389q-39 0 -39 41t39 41h348q17 111 100 183.5t193.5 72.5t195.5 -74t99 -182h350q37 0 37 -41zM1477 382q0 -41 -37 -41h-350q-15 -109 -99 -182.5 t-194.5 -73.5t-195 73t-99.5 183h-348q-39 0 -39 41t39 41h389q39 0 39 -37q0 -90 62.5 -154.5t151.5 -64.5t152.5 65.5t63.5 153.5q0 37 37 37h391q37 0 37 -41z" />
+<glyph unicode="≏" horiz-adv-x="1591" d="M1477 782q0 -41 -37 -41h-391q-13 0 -25 13t-12 26q0 87 -64 152t-152 65t-151 -64t-63 -153q0 -39 -39 -39h-389q-39 0 -39 41t39 41h348q17 111 100 183.5t193.5 72.5t195.5 -74t99 -182h350q37 0 37 -41zM1477 382q0 -41 -37 -41h-1286q-39 0 -39 41t39 41h1286 q37 0 37 -41z" />
+<glyph unicode="≐" horiz-adv-x="1591" d="M875.5 1309.5q33.5 -33.5 33.5 -80t-33 -79.5t-80 -33t-80 33t-33 80t33 80t79.5 33t80 -33.5zM1477 782q0 -41 -37 -41h-1286q-39 0 -39 41t39 41h1286q37 0 37 -41zM1477 382q0 -41 -37 -41h-1286q-39 0 -39 41t39 41h1286q37 0 37 -41z" />
+<glyph unicode="≑" horiz-adv-x="1591" d="M1477 782q0 -41 -37 -41h-1286q-39 0 -39 41t39 41h1286q37 0 37 -41zM1477 382q0 -41 -37 -41h-1286q-39 0 -39 41t39 41h1286q37 0 37 -41zM875.5 1309.5q33.5 -33.5 33.5 -80t-33 -79.5t-80 -33t-80 33t-33 80t33 80t79.5 33t80 -33.5zM876 14q33 -33 33 -79.5 t-33.5 -80t-80 -33.5t-79.5 33t-33 80t33 80t80 33t80 -33z" />
+<glyph unicode="≒" horiz-adv-x="1591" d="M275.5 1309.5q33.5 -33.5 33.5 -80t-33 -79.5t-80 -33t-80 33t-33 80t33 80t79.5 33t80 -33.5zM1475.5 13.5q33.5 -33.5 33.5 -80t-33 -79.5t-80 -33t-80 33t-33 80t33 80t79.5 33t80 -33.5zM1477 782q0 -41 -37 -41h-1286q-39 0 -39 41t39 41h1286q37 0 37 -41z M1477 382q0 -41 -37 -41h-1286q-39 0 -39 41t39 41h1286q37 0 37 -41z" />
+<glyph unicode="≓" horiz-adv-x="1591" d="M1475.5 1309.5q33.5 -33.5 33.5 -80t-33 -79.5t-80 -33t-80 33t-33 80t33 80t79.5 33t80 -33.5zM275.5 13.5q33.5 -33.5 33.5 -80t-33 -79.5t-80 -33t-80 33t-33 80t33 80t79.5 33t80 -33.5zM1477 782q0 -41 -37 -41h-1286q-39 0 -39 41t39 41h1286q37 0 37 -41z M1477 382q0 -41 -37 -41h-1286q-39 0 -39 41t39 41h1286q37 0 37 -41z" />
+<glyph unicode="≔" horiz-adv-x="1971" d="M307.5 861.5q33.5 -33.5 33.5 -80t-33 -79.5t-80 -33t-80 33t-33 80t33 80t79.5 33t80 -33.5zM307.5 461.5q33.5 -33.5 33.5 -80t-33 -79.5t-80 -33t-80 33t-33 80t33 80t79.5 33t80 -33.5zM1857 782q0 -41 -37 -41h-1286q-39 0 -39 41t39 41h1286q37 0 37 -41zM1857 382 q0 -41 -37 -41h-1286q-39 0 -39 41t39 41h1286q37 0 37 -41z" />
+<glyph unicode="≕" horiz-adv-x="1971" d="M1823.5 861.5q33.5 -33.5 33.5 -80t-33 -79.5t-80 -33t-80 33t-33 80t33 80t79.5 33t80 -33.5zM1823.5 461.5q33.5 -33.5 33.5 -80t-33 -79.5t-80 -33t-80 33t-33 80t33 80t79.5 33t80 -33.5zM1477 782q0 -41 -37 -41h-1286q-39 0 -39 41t39 41h1286q37 0 37 -41z M1477 382q0 -41 -37 -41h-1286q-39 0 -39 41t39 41h1286q37 0 37 -41z" />
+<glyph unicode="≖" horiz-adv-x="1591" d="M1477 382q0 -41 -37 -41h-1286q-39 0 -39 41t39 41h485q-68 66 -68 158t68 160h-485q-39 0 -39 41t39 41h1286q37 0 37 -41t-37 -41h-488q67 -67 67 -159.5t-69 -158.5h490q37 0 37 -41zM898 479.5q44 43.5 44 102.5t-44 103.5t-103 44.5t-103 -44.5t-44 -103.5 t44 -102.5t103 -43.5t103 43.5z" />
+<glyph unicode="≗" horiz-adv-x="1591" d="M953 1440q66 -67 66 -158t-67 -157t-157.5 -66t-157 65.5t-66.5 156.5t66.5 158.5t158 67.5t157.5 -67zM1477 782q0 -41 -37 -41h-1286q-39 0 -39 41t39 41h1286q37 0 37 -41zM1477 382q0 -41 -37 -41h-1286q-39 0 -39 41t39 41h1286q37 0 37 -41zM898 1179.5 q44 43.5 44 102.5t-44 103.5t-103 44.5t-103 -44.5t-44 -103.5t44 -102.5t103 -43.5t103 43.5z" />
+<glyph unicode="≘" horiz-adv-x="1591" d="M1477 1089q0 -41 -41 -41q-15 0 -25 8q-327 254 -616.5 254t-614.5 -254q-10 -8 -24 -8q-41 0 -41 41q0 18 16 32q138 121 315.5 196t350.5 75t348.5 -74.5t314.5 -196.5q17 -15 17 -32zM1477 782q0 -41 -37 -41h-1286q-39 0 -39 41t39 41h1286q37 0 37 -41zM1477 382 q0 -41 -37 -41h-1286q-39 0 -39 41t39 41h1286q37 0 37 -41z" />
+<glyph unicode="≙" horiz-adv-x="1591" d="M1148 908q0 -41 -41 -41q-27 0 -45 39l-265 563l-268 -563q-19 -39 -45 -39q-41 0 -41 41q0 5 309 659q18 39 45 39t45 -39l292 -622q14 -30 14 -37zM1477 782q0 -41 -37 -41h-1286q-39 0 -39 41t39 41h1286q37 0 37 -41zM1477 382q0 -41 -37 -41h-1286q-39 0 -39 41 t39 41h1286q37 0 37 -41z" />
+<glyph unicode="≚" horiz-adv-x="1591" d="M1148 1565q0 -7 -14 -37l-292 -622q-18 -39 -45 -39t-45 39q-309 654 -309 659q0 41 41 41q26 0 45 -39l268 -563l265 563q18 39 45 39q41 0 41 -41zM1477 782q0 -41 -37 -41h-1286q-39 0 -39 41t39 41h1286q37 0 37 -41zM1477 382q0 -41 -37 -41h-1286q-39 0 -39 41 t39 41h1286q37 0 37 -41z" />
+<glyph unicode="≛" horiz-adv-x="1591" d="M837 1320q230 44 236 44t6 -10.5t-7 -13.5l-209 -99l113 -207q0 -13 -13 -13q-5 0 -167 172q-162 -172 -168 -172q-13 0 -13 13l113 207l-206 98q-10 5 -10 15t6 10t236 -44l29 230q1 10 12.5 10t12.5 -10zM1477 782q0 -41 -37 -41h-1286q-39 0 -39 41t39 41h1286 q37 0 37 -41zM1477 382q0 -41 -37 -41h-1286q-39 0 -39 41t39 41h1286q37 0 37 -41z" />
+<glyph unicode="≜" horiz-adv-x="1591" d="M1190 949q0 -37 -33 -37h-723q-33 0 -33 37q0 10 6 20l357 619q10 18 31.5 18t31.5 -18l358 -619q5 -9 5 -20zM1477 782q0 -41 -37 -41h-1286q-39 0 -39 41t39 41h1286q37 0 37 -41zM1477 382q0 -41 -37 -41h-1286q-39 0 -39 41t39 41h1286q37 0 37 -41zM1082 990 l-286 496l-287 -496h573z" />
+<glyph unicode="≝" horiz-adv-x="1591" d="M1335 1495q0 -34 -33 -34q-19 0 -45 36.5t-55 36.5q-44 0 -54 -57q-2 -14 -2 -91v-27h95v-29h-95v-249q0 -52 15 -65t70 -13v-15h-222v15q45 0 57.5 17t12.5 61v249h-72v29h72q0 79 18 118q40 86 137 86q32 0 66.5 -19t34.5 -49zM937 1020q-42 -43 -109.5 -43t-110.5 57 t-43 138.5t44 139.5t118 58t113 -42.5t39 -108.5h-257q0 -69 35 -122.5t105.5 -53.5t103.5 89l13 -9q-9 -60 -51 -103zM516 977v53q-51 -53 -114.5 -53t-104.5 55t-41 131t50 141.5t129 65.5q49 0 81 -31v76q0 96 -29 96q-11 0 -27 -6l-6 14l111 45h18v-429q0 -105 28 -105 q12 0 30 7l4 -14l-110 -46h-19zM1477 782q0 -41 -37 -41h-1286q-39 0 -39 41t39 41h1286q37 0 37 -41zM1477 382q0 -41 -37 -41h-1286q-39 0 -39 41t39 41h1286q37 0 37 -41zM822 1342q-82 0 -91 -99h172q-6 99 -81 99zM516 1249q0 36 -25.5 66t-60.5 30q-52 0 -76 -49 t-24 -109t26 -107q31 -59 89 -59q36 0 71 37v191z" />
+<glyph unicode="≞" horiz-adv-x="1591" d="M1266 987h-272v22q59 0 74 20t15 68v257q0 127 -91 127q-63 0 -142 -75v-28q-1 -13 -1 -43.5t1 -78.5v-151t14.5 -75.5t75.5 -20.5v-22h-278v22q57 0 73 19.5t16 75.5v250q0 129 -93 129q-78 0 -141 -77v-302q0 -49 9 -67q14 -28 80 -28v-22h-272v22q54 0 69 21.5 t15 74.5v237q0 109 -19 124q-9 7 -25.5 7t-39.5 -9l-9 22l166 67h26v-117q64 64 84 79q52 38 107 38q112 0 138 -117q100 117 192 117q145 0 145 -205v-236q0 -59 14 -81t69 -22v-22zM1477 782q0 -41 -37 -41h-1286q-39 0 -39 41t39 41h1286q37 0 37 -41zM1477 382 q0 -41 -37 -41h-1286q-39 0 -39 41t39 41h1286q37 0 37 -41z" />
+<glyph unicode="≟" horiz-adv-x="1591" d="M667 1384q-55 0 -55 73t55 111t129 38t128.5 -41t54.5 -115t-65 -151q-88 -104 -103 -135.5t-18 -91.5h-21q3 63 13.5 97.5t56 124.5t45.5 146t-31 97t-86 41q-93 0 -93 -65q0 -17 15 -45.5t15 -41.5q0 -42 -40 -42zM786 1010q56 0 56 -55.5t-56 -55.5t-56 55.5t56 55.5z M1477 782q0 -41 -37 -41h-1286q-39 0 -39 41t39 41h1286q37 0 37 -41zM1477 382q0 -41 -37 -41h-1286q-39 0 -39 41t39 41h1286q37 0 37 -41z" />
+<glyph unicode="≠" horiz-adv-x="1591" d="M1477 382q0 -41 -37 -41h-768l-291 -505q-23 -40 -46 -40q-41 0 -41 38q0 15 16 43l268 464h-424q-39 0 -39 41t39 41h471l184 318h-655q-39 0 -39 41t39 41h702l292 506q23 39 45 39q41 0 41 -38q0 -16 -15 -42l-268 -465h489q37 0 37 -41t-37 -41h-537l-183 -318h720 q37 0 37 -41z" />
+<glyph unicode="≡" horiz-adv-x="1591" d="M1477 982q0 -41 -37 -41h-1286q-39 0 -39 41t39 41h1286q37 0 37 -41zM1477 582q0 -41 -37 -41h-1286q-39 0 -39 41t39 41h1286q37 0 37 -41zM1477 182q0 -41 -37 -41h-1286q-39 0 -39 41t39 41h1286q37 0 37 -41z" />
+<glyph unicode="≢" horiz-adv-x="1591" d="M1477 182q0 -41 -37 -41h-843l-176 -305q-23 -40 -46 -40q-41 0 -41 38q0 15 16 43l152 264h-348q-39 0 -39 41t39 41h396l183 318h-579q-39 0 -39 41t39 41h627l183 318h-810q-39 0 -39 41t39 41h857l177 306q23 39 45 39q41 0 41 -38q0 -16 -15 -42l-153 -265h334 q37 0 37 -41t-37 -41h-381l-184 -318h565q37 0 37 -41t-37 -41h-612l-184 -318h796q37 0 37 -41z" />
+<glyph unicode="≣" horiz-adv-x="1591" d="M1477 1182q0 -41 -37 -41h-1286q-39 0 -39 41t39 41h1286q37 0 37 -41zM1477 782q0 -41 -37 -41h-1286q-39 0 -39 41t39 41h1286q37 0 37 -41zM1477 382q0 -41 -37 -41h-1286q-39 0 -39 41t39 41h1286q37 0 37 -41zM1477 -18q0 -41 -37 -41h-1286q-39 0 -39 41t39 41 h1286q37 0 37 -41z" />
+<glyph unicode="≤" horiz-adv-x="1591" d="M1421 31q0 -41 -41 -41q-8 0 -14 3l-1169 552q-27 13 -27 37t27 37l1169 552q6 3 14 3q41 0 41 -41q0 -26 -24 -37l-1090 -514l1090 -514q24 -11 24 -37zM1421 -259q0 -41 -37 -41h-1175q-39 0 -39 41t39 41h1175q37 0 37 -41z" />
+<glyph unicode="≥" horiz-adv-x="1591" d="M1421 582q0 -24 -27 -37l-1169 -552q-6 -3 -14 -3q-41 0 -41 41q0 26 24 37l1090 514l-1090 514q-24 11 -24 37q0 41 41 41q8 0 14 -3l1169 -552q27 -13 27 -37zM1421 -259q0 -41 -37 -41h-1175q-39 0 -39 41t39 41h1175q37 0 37 -41z" />
+<glyph unicode="≦" horiz-adv-x="1591" d="M1421 331q0 -41 -41 -41q-8 0 -14 3l-1169 552q-27 13 -27 37t27 37l1169 552q6 3 14 3q41 0 41 -41q0 -26 -24 -37l-1090 -514l1090 -514q24 -11 24 -37zM1421 41q0 -41 -37 -41h-1175q-39 0 -39 41t39 41h1175q37 0 37 -41zM1421 -259q0 -41 -37 -41h-1175 q-39 0 -39 41t39 41h1175q37 0 37 -41z" />
+<glyph unicode="≧" horiz-adv-x="1591" d="M1421 882q0 -24 -27 -37l-1169 -552q-6 -3 -14 -3q-41 0 -41 41q0 26 24 37l1090 514l-1090 514q-24 11 -24 37q0 41 41 41q8 0 14 -3l1169 -552q27 -13 27 -37zM1421 41q0 -41 -37 -41h-1175q-39 0 -39 41t39 41h1175q37 0 37 -41zM1421 -259q0 -41 -37 -41h-1175 q-39 0 -39 41t39 41h1175q37 0 37 -41z" />
+<glyph unicode="≨" horiz-adv-x="1591" d="M1421 331q0 -41 -41 -41q-8 0 -14 3l-1169 552q-27 13 -27 37t27 37l1169 552q6 3 14 3q41 0 41 -41q0 -26 -24 -37l-1090 -514l1090 -514q24 -11 24 -37zM1421 -259q0 -41 -37 -41h-720l-127 -129q-13 -13 -29 -13q-42 0 -42 42q0 16 13 29l70 71h-340q-39 0 -39 41 t39 41h421l216 218h-637q-39 0 -39 41t39 41h718l127 129q13 13 29 13q42 0 42 -42q0 -16 -13 -29l-70 -71h342q37 0 37 -41t-37 -41h-423l-216 -218h639q37 0 37 -41z" />
+<glyph unicode="≩" horiz-adv-x="1591" d="M1421 882q0 -24 -27 -37l-1169 -552q-6 -3 -14 -3q-41 0 -41 41q0 26 24 37l1090 514l-1090 514q-24 11 -24 37q0 41 41 41q8 0 14 -3l1169 -552q27 -13 27 -37zM1421 -259q0 -41 -37 -41h-720l-127 -129q-13 -13 -29 -13q-42 0 -42 42q0 16 13 29l70 71h-340 q-39 0 -39 41t39 41h421l216 218h-637q-39 0 -39 41t39 41h718l127 129q13 13 29 13q42 0 42 -42q0 -16 -13 -29l-70 -71h342q37 0 37 -41t-37 -41h-423l-216 -218h639q37 0 37 -41z" />
+<glyph unicode="≪" horiz-adv-x="2211" d="M1421 31q0 -41 -41 -41q-8 0 -14 3l-1169 552q-27 13 -27 37t27 37l1169 552q6 3 14 3q41 0 41 -41q0 -26 -24 -37l-1090 -514l1090 -514q24 -11 24 -37zM2041 31q0 -41 -41 -41q-8 0 -14 3l-1169 552q-27 13 -27 37t27 37l1169 552q6 3 14 3q41 0 41 -41q0 -26 -24 -37 l-1090 -514l1090 -514q24 -11 24 -37z" />
+<glyph unicode="≫" horiz-adv-x="2211" d="M1421 582q0 -24 -27 -37l-1169 -552q-6 -3 -14 -3q-41 0 -41 41q0 26 24 37l1090 514l-1090 514q-24 11 -24 37q0 41 41 41q8 0 14 -3l1169 -552q27 -13 27 -37zM2041 582q0 -24 -27 -37l-1169 -552q-6 -3 -14 -3q-41 0 -41 41q0 26 24 37l1090 514l-1090 514 q-24 11 -24 37q0 41 41 41q8 0 14 -3l1169 -552q27 -13 27 -37z" />
+<glyph unicode="≬" horiz-adv-x="1024" d="M870 582q0 -437 -313 -776q88 -90 184 -154q23 -13 68 -41q12 -8 12 -22q0 -31 -30 -31q-53 0 -279 201q-223 -201 -281 -201q-30 0 -30 31q0 14 12 22q23 13 93.5 59t158.5 136q-313 339 -313 777.5t313 774.5q-88 90 -184 154q-23 13 -68 41q-12 8 -12 22q0 31 29.5 31 t131 -77t150.5 -124q51 48 151 124.5t129 76.5t29 -31q0 -14 -12 -22q-23 -13 -93.5 -59t-158.5 -136q313 -339 313 -776zM770 582q0 412 -258 723q-260 -305 -260 -721t260 -725q258 311 258 723z" />
+<glyph unicode="≭" horiz-adv-x="1591" d="M1477 1025q0 -17 -17 -32q-139 -122 -314.5 -196.5t-348.5 -74.5t-350.5 75t-315.5 196q-16 14 -16 32q0 41 41 41q14 0 24 -8q328 -254 615 -254t616 254q10 8 25 8q41 0 41 -41zM1477 139q0 -41 -41 -41q-15 0 -25 8q-327 254 -616.5 254t-614.5 -254q-10 -8 -24 -8 q-41 0 -41 41q0 18 16 32q138 121 315.5 196t350.5 75t348.5 -74.5t314.5 -196.5q17 -15 17 -32zM1274 1330q0 -16 -15 -42l-838 -1452q-23 -40 -46 -40q-41 0 -41 38q0 15 16 43l838 1452q23 39 45 39q41 0 41 -38z" />
+<glyph unicode="≮" horiz-adv-x="1591" d="M1421 31q0 -41 -41 -41q-8 0 -14 3l-618 292l-226 -621q-17 -47 -44 -47q-42 0 -42 38q0 15 8 37l229 628l-476 225q-27 13 -27 37t27 37l706 333l200 549q17 46 43 46q42 0 42 -37q0 -15 -8 -37l-171 -471l357 169q6 3 14 3q41 0 41 -41q0 -26 -24 -37l-427 -202 l-194 -533l621 -293q24 -11 24 -37zM864 845l-557 -263l394 -186z" />
+<glyph unicode="≯" horiz-adv-x="1591" d="M1421 582q0 -24 -27 -37l-666 -314l-206 -567q-17 -47 -44 -47q-42 0 -42 38q0 15 8 37l178 488l-397 -187q-6 -3 -14 -3q-41 0 -41 41q0 26 24 37l467 220l183 502l-650 306q-24 11 -24 37q0 41 41 41q8 0 14 -3l647 -305l231 635q17 46 43 46q42 0 42 -37q0 -15 -8 -37 l-234 -643l448 -211q27 -13 27 -37zM1284 582l-365 172l-152 -416z" />
+<glyph unicode="≰" horiz-adv-x="1591" d="M1421 -259q0 -41 -37 -41h-827l-35 -95q-17 -47 -44 -47q-42 0 -42 38q0 15 8 37l24 67h-259q-39 0 -39 41t39 41h289l193 530l-494 233q-27 13 -27 37t27 37l732 346l174 477q17 46 43 46q42 0 42 -37q0 -15 -8 -37l-145 -399l331 156q6 3 14 3q41 0 41 -41 q0 -26 -24 -37l-402 -189l-201 -555l603 -284q24 -11 24 -37q0 -41 -41 -41q-8 0 -14 3l-600 283l-180 -494h798q37 0 37 -41zM890 857l-583 -275l412 -194z" />
+<glyph unicode="≱" horiz-adv-x="1591" d="M1421 -259q0 -41 -37 -41h-827l-35 -95q-17 -47 -44 -47q-42 0 -42 38q0 15 8 37l24 67h-259q-39 0 -39 41t39 41h289l150 411l-423 -200q-6 -3 -14 -3q-41 0 -41 41q0 26 24 37l493 233l175 480l-668 315q-24 11 -24 37q0 41 41 41q8 0 14 -3l665 -314l213 585 q17 46 43 46q42 0 42 -37q0 -15 -8 -37l-215 -592l429 -203q27 -13 27 -37t-27 -37l-640 -302l-168 -461h798q37 0 37 -41zM1284 582l-347 164l-144 -395z" />
+<glyph unicode="≲" horiz-adv-x="1591" d="M1477 46q0 -152 -96 -271.5t-244 -119.5q-114 0 -238 88l-208 164q-123 88 -236 88q-162 0 -245 -147q-29 -52 -38 -142q-5 -51 -29 -51q-28 0 -28 63q0 152 95.5 271.5t244.5 119.5q115 0 240 -88l207 -164q124 -88 235 -88q85 0 156 50t104 130q15 36 21 98t30 62 q29 0 29 -63zM1421 331q0 -41 -41 -41q-8 0 -14 3l-1169 552q-27 13 -27 37t27 37l1169 552q6 3 14 3q41 0 41 -41q0 -26 -24 -37l-1090 -514l1090 -514q24 -11 24 -37z" />
+<glyph unicode="≳" horiz-adv-x="1591" d="M1477 46q0 -152 -96 -271.5t-244 -119.5q-114 0 -238 88l-208 164q-123 88 -236 88q-162 0 -245 -147q-29 -52 -38 -142q-5 -51 -29 -51q-28 0 -28 63q0 152 95.5 271.5t244.5 119.5q115 0 240 -88l207 -164q124 -88 235 -88q85 0 156 50t104 130q15 36 21 98t30 62 q29 0 29 -63zM1421 882q0 -24 -27 -37l-1169 -552q-6 -3 -14 -3q-41 0 -41 41q0 26 24 37l1090 514l-1090 514q-24 11 -24 37q0 41 41 41q8 0 14 -3l1169 -552q27 -13 27 -37z" />
+<glyph unicode="≴" horiz-adv-x="1591" d="M1477 46q0 -152 -96 -271.5t-244 -119.5q-105 0 -214 71q-16 11 -183 144l-46 -257q-10 -55 -41 -55q-42 0 -42 42q0 10 3 27l52 297q-108 71 -211 71q-162 0 -245 -147q-29 -52 -38 -142q-5 -51 -29 -51q-28 0 -28 63q0 152 95.5 271.5t244.5 119.5q111 0 230 -81 l95 541l-583 276q-27 13 -27 37t27 37l704 332l53 301q10 54 41 54q42 0 42 -41q0 -16 -2 -27l-43 -244l374 177q6 3 14 3q41 0 41 -41q0 -26 -24 -37l-422 -199l-103 -581l525 -248q24 -11 24 -37q0 -41 -41 -41q-8 0 -14 3l-509 240l-99 -560q146 -118 176 -137 q104 -67 196 -67t163 50t104 130q15 36 21 98t30 62q29 0 29 -63zM884 1154l-577 -272l488 -230z" />
+<glyph unicode="≵" horiz-adv-x="1591" d="M1477 46q0 -152 -96 -271.5t-244 -119.5q-105 0 -214 71q-16 11 -183 144l-46 -257q-10 -55 -41 -55q-42 0 -42 42q0 10 3 27l52 297q-108 71 -211 71q-162 0 -245 -147q-29 -52 -38 -142q-5 -51 -29 -51q-28 0 -28 63q0 152 95.5 271.5t244.5 119.5q111 0 230 -81 l93 526l-553 -261q-6 -3 -14 -3q-41 0 -41 41q0 26 24 37l601 283l75 426l-676 319q-24 11 -24 37q0 41 41 41q8 0 14 -3l660 -311l69 392q10 54 41 54q42 0 42 -41q0 -16 -2 -27l-73 -415l432 -204q27 -13 27 -37t-27 -37l-526 -248l-110 -624q146 -118 176 -137 q104 -67 196 -67t163 50t104 130q15 36 21 98t30 62q29 0 29 -63zM1284 882l-337 159l-61 -347z" />
+<glyph unicode="≶" horiz-adv-x="1591" d="M1421 150q0 -24 -27 -37l-1169 -552q-6 -3 -14 -3q-41 0 -41 41q0 26 24 37l1090 514l-1090 514q-24 11 -24 37q0 41 41 41q8 0 14 -3l1169 -552q27 -13 27 -37zM1421 463q0 -41 -41 -41q-8 0 -14 3l-1169 552q-27 13 -27 37t27 37l1169 552q6 3 14 3q41 0 41 -41 q0 -26 -24 -37l-1090 -514l1090 -514q24 -11 24 -37z" />
+<glyph unicode="≷" horiz-adv-x="1591" d="M1421 1014q0 -24 -27 -37l-1169 -552q-6 -3 -14 -3q-41 0 -41 41q0 26 24 37l1090 514l-1090 514q-24 11 -24 37q0 41 41 41q8 0 14 -3l1169 -552q27 -13 27 -37zM1421 -401q0 -41 -41 -41q-8 0 -14 3l-1169 552q-27 13 -27 37t27 37l1169 552q6 3 14 3q41 0 41 -41 q0 -26 -24 -37l-1090 -514l1090 -514q24 -11 24 -37z" />
+<glyph unicode="≸" horiz-adv-x="1591" d="M1421 150q0 -24 -27 -37l-698 -329l-30 -171q-10 -55 -41 -55q-42 0 -42 42q0 10 3 27l20 114l-381 -180q-6 -3 -14 -3q-41 0 -41 41q0 26 24 37l429 202l102 576l-531 250q-24 11 -24 37q0 41 41 41q8 0 14 -3l514 -243l37 208l-579 273q-27 13 -27 37t27 37l699 330 l30 171q10 54 41 54q42 0 42 -41q0 -16 -2 -27l-20 -114l379 179q6 3 14 3q41 0 41 -41q0 -26 -24 -37l-427 -202l-103 -576l530 -250q24 -11 24 -37q0 -41 -41 -41q-8 0 -14 3l-513 242l-37 -207l578 -273q27 -13 27 -37zM879 1284l-572 -270l484 -228zM1284 150l-483 228 l-88 -497z" />
+<glyph unicode="≹" horiz-adv-x="1591" d="M1421 -401q0 -41 -41 -41q-8 0 -14 3l-654 309l-46 -257q-10 -55 -41 -55q-42 0 -42 42q0 10 3 27l49 279l-438 207q-27 13 -27 37t27 37l532 251l44 246l-548 -259q-6 -3 -14 -3q-41 0 -41 41q0 26 24 37l596 281l76 430l-672 317q-24 11 -24 37q0 41 41 41q8 0 14 -3 l655 -309l46 258q10 54 41 54q42 0 42 -41q0 -16 -2 -27l-50 -281l437 -206q27 -13 27 -37t-27 -37l-531 -251l-43 -245l546 258q6 3 14 3q41 0 41 -41q0 -26 -24 -37l-594 -280l-77 -432l671 -316q24 -11 24 -37zM1284 1014l-341 161l-63 -351zM712 341l-405 -191l343 -162 z" />
+<glyph unicode="≺" horiz-adv-x="1591" d="M1421 35q0 -45 -41 -45q-34 0 -41 39q-28 180 -141.5 282t-284.5 152q-268 78 -704 78q-39 0 -39 41t39 41q436 0 706 80q173 51 285 152t139 284q6 37 41 37q41 0 41 -43q0 -22 -12 -76q-42 -188 -196 -297q-178 -126 -455 -178q269 -47 453 -177q156 -110 198 -295 q12 -52 12 -75z" />
+<glyph unicode="≻" horiz-adv-x="1591" d="M1421 582q0 -41 -37 -41q-267 0 -500 -31.5t-415.5 -142.5t-216.5 -338q-6 -39 -41 -39q-41 0 -41 45q0 12 8 53q25 130 106 225q172 203 550 269q-435 77 -590 327q-74 119 -74 224q0 43 41 43q35 0 41 -37q35 -232 215 -342t418 -142t499 -32q37 0 37 -41z" />
+<glyph unicode="≼" horiz-adv-x="1591" d="M1421 35q0 -45 -41 -45q-34 0 -41 39q-28 180 -141.5 282t-284.5 152q-268 78 -704 78q-39 0 -39 41t39 41q436 0 706 80q173 51 285 152t139 284q6 37 41 37q41 0 41 -43q0 -22 -12 -76q-42 -188 -196 -297q-178 -126 -455 -178q269 -47 453 -177q156 -110 198 -295 q12 -52 12 -75zM1194 -275q0 -43 -41 -43q-34 0 -41 37q-23 156 -108.5 252t-221.5 155q-248 107 -573 107q-39 0 -39 41t45 41q257 0 470 -65q261 -80 397 -245q112 -136 112 -280z" />
+<glyph unicode="≽" horiz-adv-x="1591" d="M1421 582q0 -41 -37 -41q-267 0 -500 -31.5t-415.5 -142.5t-216.5 -338q-6 -39 -41 -39q-41 0 -41 45q0 12 8 53q25 130 106 225q172 203 550 269q-435 77 -590 327q-74 119 -74 224q0 43 41 43q35 0 41 -37q35 -232 215 -342t418 -142t499 -32q37 0 37 -41zM1421 274 q0 -41 -37 -41q-326 0 -573 -107q-137 -60 -221.5 -155t-110.5 -252q-6 -37 -41 -37q-41 0 -41 43q0 9 6 43q24 135 109 237q138 165 397 245q212 65 469 65q43 0 43 -41z" />
+<glyph unicode="≾" horiz-adv-x="1591" d="M1421 335q0 -45 -41 -45q-34 0 -41 39q-28 180 -141.5 282t-284.5 152q-268 78 -704 78q-39 0 -39 41t39 41q436 0 706 80q173 51 285 152t139 284q6 37 41 37q41 0 41 -43q0 -22 -12 -76q-42 -188 -196 -297q-178 -126 -455 -178q269 -47 453 -177q156 -110 198 -295 q12 -52 12 -75zM1477 46q0 -152 -96 -271.5t-244 -119.5q-114 0 -238 88l-208 164q-123 88 -236 88q-162 0 -245 -147q-29 -52 -38 -142q-5 -51 -29 -51q-28 0 -28 63q0 152 95.5 271.5t244.5 119.5q115 0 240 -88l207 -164q124 -88 235 -88q85 0 156 50t104 130 q15 36 21 98t30 62q29 0 29 -63z" />
+<glyph unicode="≿" horiz-adv-x="1591" d="M1421 882q0 -41 -37 -41q-267 0 -500 -31.5t-415.5 -142.5t-216.5 -338q-6 -39 -41 -39q-41 0 -41 45q0 12 8 53q25 130 106 225q172 203 550 269q-435 77 -590 327q-74 119 -74 224q0 43 41 43q35 0 41 -37q35 -232 215 -342t418 -142t499 -32q37 0 37 -41zM1477 46 q0 -152 -96 -271.5t-244 -119.5q-114 0 -238 88l-208 164q-123 88 -236 88q-162 0 -245 -147q-29 -52 -38 -142q-5 -51 -29 -51q-28 0 -28 63q0 152 95.5 271.5t244.5 119.5q115 0 240 -88l207 -164q124 -88 235 -88q85 0 156 50t104 130q15 36 21 98t30 62q29 0 29 -63z " />
+<glyph unicode="⊀" horiz-adv-x="1591" d="M1421 35q0 -45 -41 -45q-34 0 -41 39q-28 180 -141.5 282t-284.5 152q-119 35 -256 53l-182 -539q-10 -28 -38 -28q-42 0 -42 39q0 8 2 15l177 523q-152 15 -365 15q-39 0 -39 41t39 41q236 0 404 20l184 546q10 28 38 28q42 0 42 -39q0 -8 -2 -15l-171 -508 q112 19 211 48q173 51 285 152t139 284q6 37 41 37q41 0 41 -43q0 -22 -12 -76q-42 -188 -196 -297q-178 -126 -455 -178q269 -47 453 -177q156 -110 198 -295q12 -52 12 -75z" />
+<glyph unicode="⊁" horiz-adv-x="1591" d="M1421 582q0 -41 -37 -41q-233 0 -437 -24l-182 -540q-10 -28 -38 -28q-42 0 -42 39q0 8 2 15l170 502q-219 -35 -395 -142t-210 -334q-6 -39 -41 -39q-41 0 -41 45q0 12 8 53q25 130 106 225q172 203 550 269q-435 77 -590 327q-74 119 -74 224q0 43 41 43q35 0 41 -37 q35 -232 216 -342t419 -142l19 -3l181 537q10 28 38 28q42 0 42 -39q0 -8 -2 -15l-176 -520q190 -20 395 -20q37 0 37 -41z" />
+<glyph unicode="⊂" horiz-adv-x="1591" d="M1421 41q0 -41 -39 -41h-590q-248 0 -435 168.5t-187 413.5t187 413.5t435 168.5h590q39 0 39 -41t-39 -41h-584q-216 0 -381 -143.5t-165 -356.5t165 -356.5t381 -143.5h584q39 0 39 -41z" />
+<glyph unicode="⊃" horiz-adv-x="1591" d="M1421 582q0 -245 -187 -413.5t-435 -168.5h-590q-39 0 -39 41t39 41h584q216 0 381 143.5t165 356.5t-165 356.5t-381 143.5h-584q-39 0 -39 41t39 41h590q248 0 435 -168.5t187 -413.5z" />
+<glyph unicode="⊄" horiz-adv-x="1591" d="M1421 41q0 -41 -39 -41h-590q-24 0 -47 2l-123 -338q-17 -47 -44 -47q-42 0 -42 38q0 15 8 37l117 322q-208 43 -349.5 200.5t-141.5 367.5q0 245 187 413.5t435 168.5h288l123 337q17 46 43 46q42 0 42 -37q0 -15 -8 -37l-112 -309h214q39 0 39 -41t-39 -41h-244 l-364 -999q12 -1 24 -1h584q39 0 39 -41zM798 1082q-216 0 -381 -143.5t-165 -356.5q0 -185 127 -319.5t311 -170.5l360 990h-252z" />
+<glyph unicode="⊅" horiz-adv-x="1591" d="M1421 582q0 -245 -187 -413.5t-435 -168.5h-255l-122 -336q-17 -47 -44 -47q-42 0 -42 38q0 15 8 37l112 308h-247q-39 0 -39 41t39 41h277l363 997q-28 3 -56 3h-584q-39 0 -39 41t39 41h590q40 0 79 -5l125 342q17 46 43 46q42 0 42 -37q0 -15 -8 -37l-120 -330 q197 -51 329 -205t132 -356zM1339 582q0 176 -117 308t-290 175l-358 -983h219q216 0 381 143.5t165 356.5z" />
+<glyph unicode="⊆" horiz-adv-x="1591" d="M1421 41q0 -41 -39 -41h-590q-248 0 -435 168.5t-187 413.5t187 413.5t435 168.5h590q39 0 39 -41t-39 -41h-584q-216 0 -381 -143.5t-165 -356.5t165 -356.5t381 -143.5h584q39 0 39 -41zM1421 -259q0 -41 -37 -41h-1175q-39 0 -39 41t39 41h1175q37 0 37 -41z" />
+<glyph unicode="⊇" horiz-adv-x="1591" d="M1421 582q0 -245 -187 -413.5t-435 -168.5h-590q-39 0 -39 41t39 41h584q216 0 381 143.5t165 356.5t-165 356.5t-381 143.5h-584q-39 0 -39 41t39 41h590q248 0 435 -168.5t187 -413.5zM1421 -259q0 -41 -37 -41h-1175q-39 0 -39 41t39 41h1175q37 0 37 -41z" />
+<glyph unicode="⊈" horiz-adv-x="1591" d="M1421 -259q0 -41 -37 -41h-821l-42 -115q-10 -27 -37 -27q-43 0 -43 40q0 7 3 15l32 87h-267q-39 0 -39 41t39 41h297l90 249q-185 59 -305.5 208.5t-120.5 342.5q0 245 187 413.5t435 168.5h218l59 161q10 28 37 28q43 0 43 -40q0 -8 -3 -16l-49 -133h285q39 0 39 -41 t-39 -41h-315l-362 -992q47 -8 93 -8h584q39 0 39 -41t-39 -41h-590q-58 0 -116 11l-83 -229h791q37 0 37 -41zM798 1082q-216 0 -381 -143.5t-165 -356.5q0 -167 105.5 -295t267.5 -178l355 973h-182z" />
+<glyph unicode="⊉" horiz-adv-x="1591" d="M1421 -259q0 -41 -37 -41h-829l-42 -115q-10 -27 -37 -27q-43 0 -43 40q0 7 3 15l32 87h-259q-39 0 -39 41t39 41h289l79 218h-368q-39 0 -39 41t39 41h398l356 974q-84 26 -170 26h-584q-39 0 -39 41t39 41h590q98 0 192 -30l70 191q10 28 37 28q43 0 43 -40 q0 -8 -3 -16l-70 -192q157 -72 255 -211t98 -312q0 -245 -187 -413.5t-435 -168.5h-135l-79 -218h799q37 0 37 -41zM1339 582q0 147 -83 264.5t-217 180.5l-345 -945h99q216 0 381 143.5t165 356.5z" />
+<glyph unicode="⊊" horiz-adv-x="1591" d="M1421 41q0 -41 -39 -41h-590q-248 0 -435 168.5t-187 413.5t187 413.5t435 168.5h590q39 0 39 -41t-39 -41h-584q-216 0 -381 -143.5t-165 -356.5t165 -356.5t381 -143.5h584q39 0 39 -41zM1421 -259q0 -41 -37 -41h-574l-177 -133q-12 -9 -25 -9q-42 0 -42 43 q0 19 17 32l90 67h-464q-39 0 -39 41t39 41h573l176 133q12 8 25 8q42 0 42 -42q0 -19 -17 -32l-89 -67h465q37 0 37 -41z" />
+<glyph unicode="⊋" horiz-adv-x="1591" d="M1421 582q0 -245 -187 -413.5t-435 -168.5h-590q-39 0 -39 41t39 41h584q216 0 381 143.5t165 356.5t-165 356.5t-381 143.5h-584q-39 0 -39 41t39 41h590q248 0 435 -168.5t187 -413.5zM1421 -259q0 -41 -37 -41h-574l-177 -133q-12 -9 -25 -9q-42 0 -42 43q0 19 17 32 l90 67h-464q-39 0 -39 41t39 41h573l176 133q12 8 25 8q42 0 42 -42q0 -19 -17 -32l-89 -67h465q37 0 37 -41z" />
+<glyph unicode="⊌" horiz-adv-x="1364" d="M1249 389q0 -203 -188 -327q-165 -107 -379 -107t-379 107q-188 124 -188 327v799q0 37 41 37t41 -37v-793q0 -169 164 -271q140 -87 321.5 -87t321.5 86q163 101 163 272v793q0 37 41 37t41 -37v-799zM1188 541h-583q158 -123 214 -336q6 -23 6 -29q0 -31 -35 -31 q-4 0 -11.5 0.5t-11.5 0.5q-19 0 -33 59q-26 112 -98.5 197t-222.5 156q-19 9 -19 25t55 39q105 44 181.5 135t103.5 202q2 13 9 38q9 22 45.5 22t36.5 -31q0 -6 -6 -29q-55 -211 -214 -336h583v-82z" />
+<glyph unicode="⊍" horiz-adv-x="1364" d="M1249 389q0 -203 -188 -327q-165 -107 -379 -107t-379 107q-188 124 -188 327v799q0 37 41 37t41 -37v-793q0 -169 164 -271q140 -87 321.5 -87t321.5 86q163 101 163 272v793q0 37 41 37t41 -37v-799zM1061 394q0 -62 -60 -62q-15 0 -29 10l-262 191l31 -338 q0 -53 -59 -53q-23 0 -42.5 17t-17.5 40l31 334l-262 -191q-14 -10 -29 -10q-59 0 -59 62q0 36 28 49l295 139l-295 139q-28 13 -28 49q0 62 59 62q15 0 29 -10l262 -191l-31 340q0 53 60 53q25 0 43 -17t16 -42l-31 -334l262 191q14 10 29 10q60 0 60 -62q0 -35 -29 -49 l-295 -139l295 -139q29 -14 29 -49z" />
+<glyph unicode="⊎" horiz-adv-x="1364" d="M1249 389q0 -203 -188 -327q-165 -107 -379 -107t-379 107q-188 124 -188 327v799q0 37 41 37t41 -37v-793q0 -169 164 -271q140 -87 321.5 -87t321.5 86q163 101 163 272v793q0 37 41 37t41 -37v-799zM1090 582q0 -41 -37 -41h-330v-330q0 -37 -41 -37t-41 37v330h-330 q-37 0 -37 41t37 41h330v330q0 37 41 37t41 -37v-330h330q37 0 37 -41z" />
+<glyph unicode="⊏" horiz-adv-x="1591" d="M1421 41q0 -41 -37 -41h-1175q-39 0 -39 37v1090q0 37 39 37h1175q37 0 37 -41t-37 -41h-1132v-1000h1132q37 0 37 -41z" />
+<glyph unicode="⊐" horiz-adv-x="1591" d="M1421 37q0 -37 -39 -37h-1175q-37 0 -37 41t37 41h1132v1000h-1132q-37 0 -37 41t37 41h1175q39 0 39 -37v-1090z" />
+<glyph unicode="⊑" horiz-adv-x="1591" d="M1421 41q0 -41 -37 -41h-1175q-39 0 -39 37v1090q0 37 39 37h1175q37 0 37 -41t-37 -41h-1132v-1000h1132q37 0 37 -41zM1421 -318q0 -41 -37 -41h-1175q-39 0 -39 41t39 41h1175q37 0 37 -41z" />
+<glyph unicode="⊒" horiz-adv-x="1591" d="M1421 37q0 -37 -39 -37h-1175q-37 0 -37 41t37 41h1132v1000h-1132q-37 0 -37 41t37 41h1175q39 0 39 -37v-1090zM1421 -318q0 -41 -37 -41h-1175q-39 0 -39 41t39 41h1175q37 0 37 -41z" />
+<glyph unicode="⊓" horiz-adv-x="1364" d="M1239 39q0 -39 -41 -39t-41 39v1104h-950v-1104q0 -39 -41 -39t-41 39v1149q0 37 39 37h1038q37 0 37 -37v-1149z" />
+<glyph unicode="⊔" horiz-adv-x="1364" d="M1239 39q0 -39 -37 -39h-1038q-39 0 -39 39v1149q0 37 41 37t41 -37v-1106h950v1106q0 37 41 37t41 -37v-1149z" />
+<glyph unicode="⊕" horiz-adv-x="1591" d="M1307 1093q211 -212 211 -510.5t-211.5 -511t-509.5 -212.5t-510.5 212.5t-212.5 511.5t211.5 510.5t511 211.5t510.5 -212zM837 623h598q-16 241 -187 412.5t-411 186.5v-599zM755 623v599q-241 -16 -412 -187t-186 -412h598zM837 541v-599q239 15 410.5 187t187.5 412 h-598zM755 541h-598q16 -240 187 -411.5t411 -187.5v599z" />
+<glyph unicode="⊖" horiz-adv-x="1591" d="M1421 582q0 -41 -37 -41h-1175q-39 0 -39 41t39 41h1175q37 0 37 -41zM1307 1093q211 -212 211 -510.5t-211.5 -511t-509.5 -212.5t-510.5 212.5t-212.5 511.5t211.5 510.5t511 211.5t510.5 -212zM1248.5 129.5q187.5 188.5 187.5 453t-187.5 452.5t-452.5 188 t-452.5 -187.5t-187.5 -452.5t188.5 -453.5t452.5 -188.5t451.5 188.5z" />
+<glyph unicode="⊗" horiz-adv-x="1591" d="M1307 1093q211 -212 211 -510.5t-211.5 -511t-509.5 -212.5t-510.5 212.5t-212.5 511.5t211.5 510.5t511 211.5t510.5 -212zM1277 161q159 181 159 421.5t-159 422.5l-423 -423zM1219 1063q-181 160 -423 160t-423 -160l424 -424zM315 1004q-159 -181 -159 -421t158 -422 l423 421zM373 103q182 -162 423.5 -162t423.5 161l-423 423z" />
+<glyph unicode="⊘" horiz-adv-x="1591" d="M1307 1093q211 -212 211 -510.5t-211.5 -511t-509.5 -212.5t-510.5 212.5t-212.5 511.5t211.5 510.5t511 211.5t510.5 -212zM1219 1063q-181 160 -434.5 160t-441 -187.5t-187.5 -453.5q0 -240 160 -422zM1248.5 129.5q187.5 188.5 187.5 441t-159 434.5l-903 -903 q182 -161 434.5 -161t440 188.5z" />
+<glyph unicode="⊙" horiz-adv-x="1578" d="M1538 582q0 -312 -218.5 -530.5t-530.5 -218.5t-530.5 218.5t-218.5 530.5t218.5 530.5t530.5 218.5t530.5 -218.5t218.5 -530.5zM1438 582q0 270 -189.5 459.5t-459.5 189.5t-459.5 -189.5t-189.5 -459.5t189.5 -459.5t459.5 -189.5t459.5 189.5t189.5 459.5zM979 582 q0 -79 -55.5 -134.5t-134.5 -55.5t-134.5 55.5t-55.5 134.5t55.5 134.5t134.5 55.5t134.5 -55.5t55.5 -134.5z" />
+<glyph unicode="⊚" horiz-adv-x="1578" d="M1538 582q0 -312 -218.5 -530.5t-530.5 -218.5t-530.5 218.5t-218.5 530.5t218.5 530.5t530.5 218.5t530.5 -218.5t218.5 -530.5zM1438 582q0 270 -189.5 459.5t-459.5 189.5t-459.5 -189.5t-189.5 -459.5t189.5 -459.5t459.5 -189.5t459.5 189.5t189.5 459.5zM1072 582 q0 -118 -82.5 -200.5t-200.5 -82.5t-200.5 82.5t-82.5 200.5t82.5 200.5t200.5 82.5t200.5 -82.5t82.5 -200.5zM972 582q0 77 -53 130t-130 53t-130 -53t-53 -130t53 -130t130 -53t130 53t53 130z" />
+<glyph unicode="⊛" horiz-adv-x="1591" d="M1307 1093q211 -212 211 -510.5t-211.5 -511t-509.5 -212.5t-510.5 212.5t-212.5 511.5t211.5 510.5t511 211.5t510.5 -212zM1248.5 129.5q187.5 188.5 187.5 453t-187.5 452.5t-452.5 188t-452.5 -187.5t-187.5 -452.5t188.5 -453.5t452.5 -188.5t451.5 188.5zM1174 394 q0 -62 -60 -62q-15 0 -29 10l-262 191l31 -338q0 -53 -59 -53q-23 0 -42.5 17t-17.5 40l31 334l-262 -191q-14 -10 -29 -10q-59 0 -59 62q0 36 28 49l295 139l-295 139q-28 13 -28 49q0 62 59 62q15 0 29 -10l262 -191l-31 340q0 53 60 53q25 0 43 -17t16 -42l-31 -334 l262 191q14 10 29 10q60 0 60 -62q0 -35 -29 -49l-295 -139l295 -139q29 -14 29 -49z" />
+<glyph unicode="⊜" horiz-adv-x="1591" d="M1307 1093q211 -212 211 -510.5t-211.5 -511t-509.5 -212.5t-510.5 212.5t-212.5 511.5t211.5 510.5t511 211.5t510.5 -212zM1248.5 129.5q187.5 188.5 187.5 453t-187.5 452.5t-452.5 188t-452.5 -187.5t-187.5 -452.5t188.5 -453.5t452.5 -188.5t451.5 188.5zM1321 784 q0 -41 -37 -41h-975q-39 0 -39 41t39 41h975q37 0 37 -41zM1321 380q0 -41 -37 -41h-975q-39 0 -39 41t39 41h975q37 0 37 -41z" />
+<glyph unicode="⊝" horiz-adv-x="1591" d="M1307 1093q211 -212 211 -510.5t-211.5 -511t-509.5 -212.5t-510.5 212.5t-212.5 511.5t211.5 510.5t511 211.5t510.5 -212zM1248.5 129.5q187.5 188.5 187.5 453t-187.5 452.5t-452.5 188t-452.5 -187.5t-187.5 -452.5t188.5 -453.5t452.5 -188.5t451.5 188.5zM1221 582 q0 -41 -37 -41h-775q-39 0 -39 41t39 41h775q37 0 37 -41z" />
+<glyph unicode="⊞" horiz-adv-x="1591" d="M1488 -72q0 -39 -37 -39h-1308q-39 0 -39 39v1310q0 37 39 37h1308q37 0 37 -37v-1310zM1406 623v570h-569v-570h569zM755 623v570h-569v-570h569zM1406 -29v570h-569v-570h569zM755 -29v570h-569v-570h569z" />
+<glyph unicode="⊟" horiz-adv-x="1591" d="M1488 -72q0 -39 -37 -39h-1308q-39 0 -39 39v1310q0 37 39 37h1308q37 0 37 -37v-1310zM1406 623v570h-1220v-570h1220zM1406 -29v570h-1220v-570h1220z" />
+<glyph unicode="⊠" horiz-adv-x="1591" d="M1488 -72q0 -39 -37 -39h-1308q-39 0 -39 39v1310q0 37 39 37h1308q37 0 37 -37v-1310zM1406 -29v1222h-1220v-1222h1220zM1290 129q0 -41 -41 -41q-15 0 -30 15l-422 422l-424 -422q-15 -15 -31 -15q-41 0 -41 41q0 19 10 29l426 424l-426 426q-10 10 -10 27q0 41 41 41 q18 0 31 -13l424 -424l422 424q13 13 30 13q41 0 41 -41q0 -17 -10 -27l-426 -426l426 -424q10 -10 10 -29z" />
+<glyph unicode="⊡" horiz-adv-x="1591" d="M1488 -72q0 -39 -37 -39h-1308q-39 0 -39 39v1310q0 37 39 37h1308q37 0 37 -37v-1310zM1406 -29v1222h-1220v-1222h1220zM874.5 661.5q33.5 -33.5 33.5 -80t-33 -79.5t-80 -33t-80 33t-33 80t33 80t79.5 33t80 -33.5z" />
+<glyph unicode="⊢" horiz-adv-x="1251" d="M1135 711q0 -41 -37 -41h-901v-631q0 -39 -41 -39t-41 39v1345q0 37 41 37t41 -37v-632h901q37 0 37 -41z" />
+<glyph unicode="⊣" horiz-adv-x="1251" d="M1135 39q0 -39 -41 -39t-41 39v631h-899q-39 0 -39 41t39 41h899v632q0 37 41 37t41 -37v-1345z" />
+<glyph unicode="⊤" horiz-adv-x="1591" d="M1479 1323q0 -41 -37 -41h-604v-1243q0 -39 -41 -39t-41 39v1243h-602q-39 0 -39 41t39 41h1288q37 0 37 -41z" />
+<glyph unicode="⊥" horiz-adv-x="1591" d="M1479 41q0 -41 -37 -41h-1288q-39 0 -39 41t39 41h602v1245q0 37 41 37t41 -37v-1245h604q37 0 37 -41z" />
+<glyph unicode="⊦" horiz-adv-x="751" d="M635 711q0 -41 -37 -41h-401v-631q0 -39 -41 -39t-41 39v1345q0 37 41 37t41 -37v-632h401q37 0 37 -41z" />
+<glyph unicode="⊧" horiz-adv-x="751" d="M635 512q0 -41 -37 -41h-401v-432q0 -39 -41 -39t-41 39v1345q0 37 41 37t41 -37v-434h401q37 0 37 -41t-37 -41h-401v-315h401q37 0 37 -41z" />
+<glyph unicode="⊨" horiz-adv-x="1251" d="M1135 512q0 -41 -37 -41h-901v-432q0 -39 -41 -39t-41 39v1345q0 37 41 37t41 -37v-434h901q37 0 37 -41t-37 -41h-901v-315h901q37 0 37 -41z" />
+<glyph unicode="⊩" horiz-adv-x="1479" d="M1362 711q0 -41 -37 -41h-731v-631q0 -39 -41 -39t-41 39v1345q0 37 41 37t41 -37v-632h731q37 0 37 -41zM197 39q0 -39 -41 -39t-41 39v1345q0 37 41 37t41 -37v-1345z" />
+<glyph unicode="⊪" horiz-adv-x="1819" d="M1704 711q0 -41 -37 -41h-729v-631q0 -39 -41 -39t-41 39v1345q0 37 41 37t41 -37v-632h729q37 0 37 -41zM567 39q0 -39 -41 -39t-41 39v1345q0 37 41 37t41 -37v-1345zM197 39q0 -39 -41 -39t-41 39v1345q0 37 41 37t41 -37v-1345z" />
+<glyph unicode="⊫" horiz-adv-x="1479" d="M1362 512q0 -41 -37 -41h-731v-432q0 -39 -41 -39t-41 39v1345q0 37 41 37t41 -37v-434h731q37 0 37 -41t-37 -41h-731v-315h731q37 0 37 -41zM197 39q0 -39 -41 -39t-41 39v1345q0 37 41 37t41 -37v-1345z" />
+<glyph unicode="⊬" horiz-adv-x="1251" d="M1194 1330q0 -16 -15 -42l-309 -536h228q37 0 37 -41t-37 -41h-276l-481 -834q-23 -40 -46 -40q-41 0 -41 38q0 15 16 43l458 793h-531v-631q0 -39 -41 -39t-41 39v1345q0 37 41 37t41 -37v-632h578l333 577q23 39 45 39q41 0 41 -38z" />
+<glyph unicode="⊭" horiz-adv-x="1251" d="M1194 1330q0 -16 -15 -42l-195 -338h114q37 0 37 -41t-37 -41h-161l-182 -315h343q37 0 37 -41t-37 -41h-391l-366 -635q-23 -40 -46 -40q-41 0 -41 38q0 15 16 43l343 594h-416v-432q0 -39 -41 -39t-41 39v1345q0 37 41 37t41 -37v-434h692l219 379q23 39 45 39 q41 0 41 -38zM197 868v-315h463l182 315h-645z" />
+<glyph unicode="⊮" horiz-adv-x="1479" d="M1362 711q0 -41 -37 -41h-493l-238 -413v-218q0 -39 -41 -39t-41 39v76l-161 -279q-23 -40 -46 -40q-41 0 -41 38q0 15 16 43l232 402v1105q0 37 41 37t41 -37v-632h191l333 577q23 39 45 39q41 0 41 -38q0 -16 -15 -42l-309 -536h445q37 0 37 -41zM197 39q0 -39 -41 -39 t-41 39v1345q0 37 41 37t41 -37v-1345zM594 670v-249l144 249h-144z" />
+<glyph unicode="⊯" horiz-adv-x="1479" d="M1362 512q0 -41 -37 -41h-608l-123 -214v-218q0 -39 -41 -39t-41 39v76l-161 -279q-23 -40 -46 -40q-41 0 -41 38q0 15 16 43l232 402v1105q0 37 41 37t41 -37v-434h305l219 379q23 39 45 39q41 0 41 -38q0 -16 -15 -42l-195 -338h331q37 0 37 -41t-37 -41h-378 l-182 -315h560q37 0 37 -41zM197 39q0 -39 -41 -39t-41 39v1345q0 37 41 37t41 -37v-1345zM594 868v-315h76l182 315h-258zM594 471v-50l29 50h-29z" />
+<glyph unicode="⊰" horiz-adv-x="1591" d="M1381 157q0 -115 -88 -189t-205 -74q-40 0 -40 40t40 40q84 0 148.5 50t64.5 131q0 192 -386 306q-271 80 -706 80q-39 0 -39 41t39 41q435 0 706 80q386 114 386 306q0 81 -64.5 131t-148.5 50q-40 0 -40 40t40 40q117 0 205 -74t88 -189q0 -179 -232 -300 q-160 -83 -391 -125q231 -42 391 -125q232 -121 232 -300z" />
+<glyph unicode="⊱" horiz-adv-x="1591" d="M1421 582q0 -41 -39 -41q-435 0 -706 -80q-386 -114 -386 -306q0 -81 64.5 -131t148.5 -50q40 0 40 -40t-40 -40q-117 0 -205 74t-88 189q0 179 232 300q160 83 391 125q-231 42 -391 125q-232 121 -232 300q0 115 88 189t205 74q40 0 40 -40t-40 -40q-84 0 -148.5 -50 t-64.5 -131q0 -192 386 -306q271 -80 706 -80q39 0 39 -41z" />
+<glyph unicode="⊲" horiz-adv-x="1591" d="M1421 25q0 -37 -41 -37q-10 0 -14 2l-1169 553q-27 13 -27 39t20 35l1176 555q4 2 14 2q41 0 41 -37v-1112zM1339 93v976l-1032 -487z" />
+<glyph unicode="⊳" horiz-adv-x="1591" d="M1421 582q0 -26 -18 -35l-1176 -557q-4 -2 -16 -2q-41 0 -41 37v1112q0 37 41 37q12 0 16 -2l1170 -553q24 -11 24 -37zM1284 582l-1032 487v-976z" />
+<glyph unicode="⊴" horiz-adv-x="1591" d="M1421 25q0 -37 -41 -37q-10 0 -14 2l-1169 553q-27 13 -27 39t20 35l1176 555q4 2 14 2q41 0 41 -37v-1112zM1339 93v976l-1032 -487zM1421 -318q0 -41 -37 -41h-1175q-39 0 -39 41t39 41h1175q37 0 37 -41z" />
+<glyph unicode="⊵" horiz-adv-x="1591" d="M1421 582q0 -26 -18 -35l-1176 -557q-4 -2 -16 -2q-41 0 -41 37v1112q0 37 41 37q12 0 16 -2l1170 -553q24 -11 24 -37zM1284 582l-1032 487v-976zM1421 -318q0 -41 -37 -41h-1175q-39 0 -39 41t39 41h1175q37 0 37 -41z" />
+<glyph unicode="⊶" d="M1903 812q95 -96 95 -229.5t-95.5 -230t-223.5 -96.5t-220.5 81.5t-108.5 203.5h-652q-16 -122 -108.5 -203.5t-220.5 -81.5t-223.5 96.5t-95.5 230t95 229.5t223 96t221.5 -82t108.5 -203h652q15 121 108.5 203t221.5 82t223 -96zM618 582q0 100 -72 172t-171.5 72 t-171 -72.5t-71.5 -171.5t71.5 -171.5t171 -72.5t171.5 72t72 172z" />
+<glyph unicode="⊷" d="M1903 812q95 -96 95 -229.5t-95.5 -230t-223.5 -96.5t-220.5 81.5t-108.5 203.5h-652q-16 -122 -108.5 -203.5t-220.5 -81.5t-223.5 96.5t-95.5 230t95 229.5t223 96t221.5 -82t108.5 -203h652q15 121 108.5 203t221.5 82t223 -96zM1916 582q0 99 -71.5 171.5t-171 72.5 t-171.5 -72t-72 -172t72 -172t171.5 -72t171 72.5t71.5 171.5z" />
+<glyph unicode="⊸" d="M1853 812q95 -96 95 -229.5t-95.5 -230t-223.5 -96.5t-220.5 81.5t-108.5 203.5h-1163q-37 0 -37 41t37 41h1163q15 121 108.5 203t221.5 82t223 -96zM1866 582q0 99 -71.5 171.5t-171 72.5t-171.5 -72t-72 -172t72 -172t171.5 -72t171 72.5t71.5 171.5z" />
+<glyph unicode="⊹" horiz-adv-x="1591" d="M837 716q0 -39 -41 -39t-41 39v475q0 37 41 37t41 -37v-475zM1441 582q0 -41 -37 -41h-475q-39 0 -39 41t39 41h475q37 0 37 -41zM701 582q0 -41 -37 -41h-475q-39 0 -39 41t39 41h475q37 0 37 -41zM837 -25q0 -39 -41 -39t-41 39v476q0 37 41 37t41 -37v-476z" />
+<glyph unicode="⊺" horiz-adv-x="1137" d="M1019 795q0 -22 -20.5 -41.5t-42.5 -19.5h-320v-1096q0 -23 -22 -41t-45 -18q-46 0 -62 43q-4 11 -5 16v1096h-319q-63 0 -63 75q0 20 21 39.5t42 19.5h773q63 0 63 -73z" />
+<glyph unicode="⊻" horiz-adv-x="1251" d="M1135 1425q0 -12 -2 -16l-469 -987q-12 -25 -38.5 -25t-35.5 18l-471 994q-4 8 -4 16q0 41 41 41q24 0 34 -20l435 -914l432 907q13 27 37 27q41 0 41 -41zM1135 41q0 -41 -37 -41h-944q-39 0 -39 41t39 41h944q37 0 37 -41z" />
+<glyph unicode="⊼" horiz-adv-x="1251" d="M1135 1425q0 -41 -37 -41h-944q-39 0 -39 41t39 41h944q37 0 37 -41zM1135 41q0 -41 -41 -41q-24 0 -37 27l-432 907l-435 -914q-10 -20 -34 -20q-41 0 -41 41q0 8 4 16l471 994q9 18 35.5 18t38.5 -25l469 -987q2 -4 2 -16z" />
+<glyph unicode="⊽" horiz-adv-x="1251" d="M1135 1425q0 -41 -37 -41h-944q-39 0 -39 41t39 41h944q37 0 37 -41zM1135 1028q0 -12 -2 -16l-469 -987q-12 -25 -38.5 -25t-35.5 18l-471 994q-4 8 -4 16q0 41 41 41q24 0 34 -20l435 -914l432 907q13 27 37 27q41 0 41 -41z" />
+<glyph unicode="⊾" horiz-adv-x="1573" d="M1434 41q0 -41 -68 -41h-1139q-61 0 -66 35q-2 11 -2 33v1269q0 68 41 68t41 -68v-580q276 -2 473.5 -199t200.5 -476h451q68 0 68 -41zM241 82h592q-3 243 -175 416.5t-417 176.5v-593z" />
+<glyph unicode="⊿" horiz-adv-x="1820" d="M1671 37q0 -37 -41 -37h-1470q-39 0 -39 41q0 17 18 35l1469 1468q6 6 22 6q41 0 41 -39v-1474zM1589 82v1319l-1319 -1319h1319z" />
+<glyph unicode="⋀" horiz-adv-x="1364" d="M1249 -4q0 -41 -41 -41q-26 0 -37 25l-489 1103l-487 -1103q-11 -25 -39 -25q-41 0 -41 41q0 7 530 1204q11 25 38 25t38 -25l526 -1188q2 -5 2 -16z" />
+<glyph unicode="⋁" horiz-adv-x="1364" d="M1249 1184q0 -10 -2 -15l-526 -1189q-11 -25 -38 -25t-38 25q-530 1198 -530 1204q0 41 41 41q28 0 39 -25l487 -1104l489 1104q11 25 37 25q41 0 41 -41z" />
+<glyph unicode="⋂" horiz-adv-x="1704" d="M1569 -352q0 -50 -60 -50q-17 0 -33 16.5t-16 33.5v1205q0 247 -179.5 415t-428.5 168t-428.5 -168t-179.5 -415v-1205q0 -50 -60 -50q-17 0 -33 16.5t-16 33.5v1216q0 289 215.5 485.5t504.5 196.5t501.5 -199t212.5 -483v-1216z" />
+<glyph unicode="⋃" horiz-adv-x="1704" d="M1569 280q0 -284 -212.5 -483t-501.5 -199t-504.5 196.5t-215.5 485.5v1216q0 17 16 33.5t33 16.5q60 0 60 -50v-1205q0 -247 179.5 -415t428.5 -168t428.5 168t179.5 415v1205q0 17 16 33.5t33 16.5q60 0 60 -50v-1216z" />
+<glyph unicode="⋄" horiz-adv-x="738" d="M712 582l-343 -343l-343 343l343 343zM571 582l-202 202l-202 -202l202 -202z" />
+<glyph unicode="⋅" horiz-adv-x="460" d="M420 582q0 -79 -55.5 -134.5t-134.5 -55.5t-134.5 55.5t-55.5 134.5t55.5 134.5t134.5 55.5t134.5 -55.5t55.5 -134.5z" />
+<glyph unicode="⋆" horiz-adv-x="1208" d="M1168 766l-349 -255l133 -408l-348 253l-348 -253l133 408l-349 255h431l133 408l133 -408h431z" />
+<glyph unicode="⋇" horiz-adv-x="1591" d="M875 1109.5q34 -33.5 34 -80t-33.5 -79.5t-80.5 -33t-80.5 33t-33.5 79.5t34 80t80 33.5t80 -33.5zM1421 582q0 -41 -37 -41h-490l417 -417q10 -10 10 -24q0 -44 -43 -44q-15 0 -25 10l-458 458l-456 -456q-11 -11 -27 -11q-42 0 -42 42q0 16 11 27l416 415h-488 q-39 0 -39 41t39 41h488l-416 415q-11 11 -11 27q0 42 42 42q16 0 27 -11l456 -456l458 458q10 10 25 10q43 0 43 -44q0 -14 -10 -24l-417 -417h490q37 0 37 -41zM875.5 214q33.5 -33 33.5 -79.5t-34 -80t-80 -33.5t-80 33.5t-34 80t33.5 79.5t80.5 33t80.5 -33z" />
+<glyph unicode="⋈" horiz-adv-x="1591" d="M1290 127q0 -39 -41 -39q-15 0 -30 15l-422 422l-424 -422q-15 -15 -31 -15q-41 0 -41 39v912q0 37 41 37q18 0 31 -13l424 -424l422 424q13 13 30 13q41 0 41 -37v-912zM1208 228v708l-354 -354zM737 582l-354 354v-708z" />
+<glyph unicode="⋉" horiz-adv-x="1591" d="M1290 129q0 -41 -41 -41q-15 0 -30 15l-422 422l-424 -422q-15 -15 -31 -15q-41 0 -41 39v912q0 37 41 37q18 0 31 -13l424 -424l422 424q13 13 30 13q41 0 41 -41q0 -17 -10 -27l-426 -426l426 -424q10 -10 10 -29zM737 582l-354 354v-708z" />
+<glyph unicode="⋊" horiz-adv-x="1591" d="M1290 127q0 -39 -41 -39q-15 0 -30 15l-422 422l-424 -422q-15 -15 -31 -15q-41 0 -41 41q0 19 10 29l426 424l-426 426q-10 10 -10 27q0 41 41 41q18 0 31 -13l424 -424l422 424q13 13 30 13q41 0 41 -37v-912zM1208 228v708l-354 -354z" />
+<glyph unicode="⋋" horiz-adv-x="1591" d="M1477 -4q0 -41 -41 -41q-20 0 -31 12l-608 660l-611 -660q-11 -12 -30 -12q-41 0 -41 41q0 18 10 29l614 663l-614 666q-10 11 -10 26q0 41 41 41q19 0 30 -12l1280 -1384q11 -12 11 -29z" />
+<glyph unicode="⋌" horiz-adv-x="1591" d="M1477 -4q0 -41 -41 -41q-20 0 -31 12l-608 660l-611 -660q-11 -12 -30 -12q-41 0 -41 41q0 18 10 29l1280 1384q11 12 31 12q41 0 41 -41q0 -14 -11 -26l-614 -666l614 -663q11 -12 11 -29z" />
+<glyph unicode="⋍" horiz-adv-x="1591" d="M1477 726q0 -63 -29 -63q-24 0 -28 43.5t-23 116.5q-33 80 -104 130t-156 50q-111 0 -235 -88l-207 -164q-125 -88 -240 -88q-149 0 -244.5 119.5t-95.5 271.5q0 63 28 63q24 0 29 -51q9 -90 38 -142q83 -147 245 -147q113 0 236 88l208 164q124 88 238 88 q148 0 244 -119.5t96 -271.5zM1477 282q0 -41 -37 -41h-1286q-39 0 -39 41t39 41h1286q37 0 37 -41z" />
+<glyph unicode="⋎" horiz-adv-x="1556" d="M1384 1143q0 -35 -38 -41q-120 -19 -198 -64t-140 -141q-117 -181 -153 -419t-36 -486q0 -37 -41 -37t-41 37q0 420 -87 696q-53 168 -156 276.5t-285 137.5q-16 3 -27.5 14.5t-11.5 26.5q0 41 45 41q24 0 77 -12q194 -44 313 -215q126 -185 173 -449q71 384 280 561 q97 82 227 107q41 8 54 8q45 0 45 -41z" />
+<glyph unicode="⋏" horiz-adv-x="1556" d="M1384 -4q0 -41 -45 -41q-20 0 -76 13q-189 44 -301 201q-133 187 -184 462q-49 -276 -182 -462q-112 -157 -304 -201q-57 -13 -77 -13q-45 0 -45 41q0 16 11 27t28 14q181 30 284.5 139t156.5 275q87 274 87 696q0 37 41 37t41 -37q0 -248 36 -485t149.5 -412.5 t341.5 -212.5q38 -6 38 -41z" />
+<glyph unicode="⋐" horiz-adv-x="1591" d="M1421 41q0 -41 -39 -41h-590q-248 0 -435 168.5t-187 413.5t187 413.5t435 168.5h590q39 0 39 -41t-39 -41h-584q-216 0 -381 -143.5t-165 -356.5t165 -356.5t381 -143.5h584q39 0 39 -41zM1411 329q0 -38 -39 -38h-555q-129 0 -230 82.5t-101 208.5t101 208.5t230 82.5 h555q39 0 39 -38t-39 -38h-552q-97 0 -175 -60.5t-78 -154.5t78 -154.5t175 -60.5h552q39 0 39 -38z" />
+<glyph unicode="⋑" horiz-adv-x="1591" d="M1421 582q0 -245 -187 -413.5t-435 -168.5h-590q-39 0 -39 41t39 41h584q216 0 381 143.5t165 356.5t-165 356.5t-381 143.5h-584q-39 0 -39 41t39 41h590q248 0 435 -168.5t187 -413.5zM1105 582q0 -126 -101 -208.5t-230 -82.5h-555q-39 0 -39 38t39 38h552 q97 0 175 60.5t78 154.5t-78 154.5t-175 60.5h-552q-39 0 -39 38t39 38h555q129 0 230 -82.5t101 -208.5z" />
+<glyph unicode="⋒" horiz-adv-x="1364" d="M1249 389q0 -203 -188 -327q-165 -107 -379 -107t-379 107q-188 124 -188 327v799q0 37 41 37t41 -37v-793q0 -169 164 -271q140 -87 321.5 -87t321.5 86q163 101 163 272v793q0 37 41 37t41 -37v-799zM965 537q0 -108 -86 -172.5t-197.5 -64.5t-197.5 64.5t-86 172.5 v639q0 39 38 39t38 -39v-636q0 -74 65 -116.5t143.5 -42.5t143 42t64.5 117v636q0 39 37.5 39t37.5 -39v-639z" />
+<glyph unicode="⋓" horiz-adv-x="1364" d="M1249 -8q0 -37 -41 -37t-41 37v792q0 171 -163 273q-140 86 -322.5 86t-321.5 -87q-163 -101 -163 -272v-792q0 -37 -41 -37t-41 37v799q0 202 189 326q164 108 378 108t379 -107q188 -124 188 -327v-799zM965 4q0 -39 -37.5 -39t-37.5 39v636q0 75 -64.5 117t-143 42 t-143.5 -42.5t-65 -116.5v-636q0 -39 -38 -39t-38 39v639q0 108 86 172.5t197.5 64.5t197.5 -64.5t86 -172.5v-639z" />
+<glyph unicode="⋔" horiz-adv-x="1364" d="M1249 -8q0 -37 -41 -37t-41 37v792q0 161 -145 261q-125 85 -299 97v-998q0 -62 -41 -62t-41 62v998q-175 -12 -299 -97q-145 -100 -145 -261v-792q0 -37 -41 -37t-41 37v799q0 192 171 314q149 107 355 119v197q0 61 41 61t41 -61v-197q206 -12 355 -118 q171 -122 171 -315v-799z" />
+<glyph unicode="⋕" horiz-adv-x="1024" d="M912 382q0 -41 -61 -41h-99v-746q0 -37 -41 -37t-41 37v746h-316v-746q0 -37 -41 -37t-41 37v746h-104q-56 0 -56 41t62 41h98v318h-104q-56 0 -56 41t62 41h98v746q0 37 41 37t41 -37v-746h316v746q0 37 41 37t41 -37v-746h99q61 0 61 -41t-61 -41h-99v-318h99 q61 0 61 -41zM670 423v318h-316v-318h316z" />
+<glyph unicode="⋖" horiz-adv-x="1591" d="M1335.5 661.5q33.5 -33.5 33.5 -80t-33 -79.5t-80 -33t-80 33t-33 80t33 80t79.5 33t80 -33.5zM1421 31q0 -41 -41 -41q-8 0 -14 3l-1169 552q-27 13 -27 37t27 37l1169 552q6 3 14 3q41 0 41 -41q0 -26 -24 -37l-1090 -514l1090 -514q24 -11 24 -37z" />
+<glyph unicode="⋗" horiz-adv-x="1591" d="M414.5 661.5q33.5 -33.5 33.5 -80t-33 -79.5t-80 -33t-80 33t-33 80t33 80t79.5 33t80 -33.5zM1421 582q0 -24 -27 -37l-1169 -552q-6 -3 -14 -3q-41 0 -41 41q0 26 24 37l1090 514l-1090 514q-24 11 -24 37q0 41 41 41q8 0 14 -3l1169 -552q27 -13 27 -37z" />
+<glyph unicode="⋘" horiz-adv-x="2831" d="M1421 31q0 -41 -41 -41q-8 0 -14 3l-1169 552q-27 13 -27 37t27 37l1169 552q6 3 14 3q41 0 41 -41q0 -26 -24 -37l-1090 -514l1090 -514q24 -11 24 -37zM2041 31q0 -41 -41 -41q-8 0 -14 3l-1169 552q-27 13 -27 37t27 37l1169 552q6 3 14 3q41 0 41 -41q0 -26 -24 -37 l-1090 -514l1090 -514q24 -11 24 -37zM2661 31q0 -41 -41 -41q-8 0 -14 3l-1169 552q-27 13 -27 37t27 37l1169 552q6 3 14 3q41 0 41 -41q0 -26 -24 -37l-1090 -514l1090 -514q24 -11 24 -37z" />
+<glyph unicode="⋙" horiz-adv-x="2831" d="M1421 582q0 -24 -27 -37l-1169 -552q-6 -3 -14 -3q-41 0 -41 41q0 26 24 37l1090 514l-1090 514q-24 11 -24 37q0 41 41 41q8 0 14 -3l1169 -552q27 -13 27 -37zM2041 582q0 -24 -27 -37l-1169 -552q-6 -3 -14 -3q-41 0 -41 41q0 26 24 37l1090 514l-1090 514 q-24 11 -24 37q0 41 41 41q8 0 14 -3l1169 -552q27 -13 27 -37zM2661 582q0 -24 -27 -37l-1169 -552q-6 -3 -14 -3q-41 0 -41 41q0 26 24 37l1090 514l-1090 514q-24 11 -24 37q0 41 41 41q8 0 14 -3l1169 -552q27 -13 27 -37z" />
+<glyph unicode="⋚" horiz-adv-x="1591" d="M1421 582q0 -41 -37 -41h-1175q-39 0 -39 41t39 41h1175q37 0 37 -41zM1421 800q0 -45 -39 -45q-6 0 -15 3l-1170 384q-27 9 -27 39t27 39l1170 384q6 2 13 2q41 0 41 -41q0 -31 -25 -39l-1051 -345l1051 -345q25 -8 25 -36zM1421 -16q0 -30 -27 -39l-1170 -384 q-9 -3 -15 -3q-39 0 -39 45q0 28 25 36l1051 345l-1051 345q-25 8 -25 39q0 41 41 41q7 0 13 -2l1170 -384q27 -9 27 -39z" />
+<glyph unicode="⋛" horiz-adv-x="1591" d="M1421 582q0 -41 -37 -41h-1175q-39 0 -39 41t39 41h1175q37 0 37 -41zM1421 1181q0 -30 -27 -39l-1170 -384q-9 -3 -15 -3q-39 0 -39 45q0 28 25 36l1051 345l-1051 345q-25 8 -25 39q0 41 41 41q7 0 13 -2l1170 -384q27 -9 27 -39zM1421 -397q0 -45 -39 -45q-6 0 -15 3 l-1170 384q-27 9 -27 39t27 39l1170 384q6 2 13 2q41 0 41 -41q0 -31 -25 -39l-1051 -345l1051 -345q25 -8 25 -36z" />
+<glyph unicode="⋜" horiz-adv-x="1591" d="M1421 -259q0 -41 -41 -41q-8 0 -14 3l-1169 552q-27 13 -27 37t27 37l1169 552q6 3 14 3q41 0 41 -41q0 -26 -24 -37l-1090 -514l1090 -514q24 -11 24 -37zM1421 1133q0 -41 -37 -41h-1175q-39 0 -39 41t39 41h1175q37 0 37 -41z" />
+<glyph unicode="⋝" horiz-adv-x="1591" d="M1421 292q0 -24 -27 -37l-1169 -552q-6 -3 -14 -3q-41 0 -41 41q0 26 24 37l1090 514l-1090 514q-24 11 -24 37q0 41 41 41q8 0 14 -3l1169 -552q27 -13 27 -37zM1421 1133q0 -41 -37 -41h-1175q-39 0 -39 41t39 41h1175q37 0 37 -41z" />
+<glyph unicode="⋞" horiz-adv-x="1591" d="M1421 35q0 -45 -41 -45q-34 0 -41 39q-28 180 -141.5 282t-284.5 152q-268 78 -704 78q-39 0 -39 41t39 41q436 0 706 80q173 51 285 152t139 284q6 37 41 37q41 0 41 -43q0 -22 -12 -76q-42 -188 -196 -297q-178 -126 -455 -178q269 -47 453 -177q156 -110 198 -295 q12 -52 12 -75zM1194 1439q0 -144 -112 -280q-136 -165 -397 -245q-213 -65 -470 -65q-45 0 -45 41t39 41q325 0 573 107q136 59 221.5 155t108.5 252q7 37 41 37q41 0 41 -43z" />
+<glyph unicode="⋟" horiz-adv-x="1591" d="M1421 582q0 -41 -37 -41q-267 0 -500 -31.5t-415.5 -142.5t-216.5 -338q-6 -39 -41 -39q-41 0 -41 45q0 12 8 53q25 130 106 225q172 203 550 269q-435 77 -590 327q-74 119 -74 224q0 43 41 43q35 0 41 -37q35 -232 215 -342t418 -142t499 -32q37 0 37 -41zM1421 890 q0 -41 -43 -41q-257 0 -469 65q-259 80 -397 245q-85 102 -109 237q-6 34 -6 43q0 43 41 43q35 0 41 -37q26 -157 110.5 -252t221.5 -155q247 -107 573 -107q37 0 37 -41z" />
+<glyph unicode="⋠" horiz-adv-x="1591" d="M1421 35q0 -45 -41 -45q-34 0 -41 39q-28 180 -141.5 282t-284.5 152q-100 29 -213 47l-38 -253q278 -80 420 -252q112 -136 112 -280q0 -43 -41 -43q-34 0 -41 37q-23 156 -104 247q-123 138 -359 208l-75 -498q-6 -35 -40 -35q-43 0 -43 36q0 5 1 11l77 507 q-167 38 -360 38q-39 0 -39 41t45 41q194 0 367 -38l37 244q-168 20 -410 20q-39 0 -39 41t39 41q252 0 429 23l81 536q6 35 40 35q43 0 43 -36q0 -5 -1 -11l-78 -511q101 17 192 44q173 51 285 152t139 284q6 37 41 37q41 0 41 -43q0 -22 -12 -76q-42 -188 -196 -297 q-178 -126 -455 -178q269 -47 453 -177q156 -110 198 -295q12 -53 12 -75z" />
+<glyph unicode="⋡" horiz-adv-x="1591" d="M1421 274q0 -41 -37 -41q-238 0 -435 -57l-75 -500q-6 -35 -40 -35q-43 0 -43 36q0 5 1 11l70 459q-176 -67 -277 -181q-80 -90 -106 -247q-6 -37 -41 -37q-41 0 -41 43q0 9 6 43q24 135 109 237q129 154 364 234l42 275l-30 -4q-234 -31 -418 -142.5t-218 -338.5 q-6 -39 -41 -39q-41 0 -41 45q0 12 8 53q25 130 106 225q172 203 550 269q-435 77 -590 327q-74 119 -74 224q0 43 41 43q35 0 41 -37q35 -232 211 -339q193 -118 475 -152l81 534q6 35 40 35q43 0 43 -36q0 -5 -1 -11l-81 -530q176 -17 364 -17q37 0 37 -41t-37 -41 q-202 0 -382 -18l-39 -258q192 50 415 50q43 0 43 -41z" />
+<glyph unicode="⋢" horiz-adv-x="1591" d="M1421 -148q0 -41 -37 -41h-809l-53 -147q-17 -47 -44 -47q-42 0 -42 38q0 15 8 37l43 119h-278q-39 0 -39 41t39 41h308l101 277h-409q-39 0 -39 37v1090q0 37 39 37h833l61 167q17 46 43 46q42 0 42 -37q0 -15 -8 -37l-51 -139h255q37 0 37 -41t-37 -41h-284l-364 -1000 h648q37 0 37 -41t-37 -41h-678l-101 -277h779q37 0 37 -41zM252 1252v-1000h396l364 1000h-760z" />
+<glyph unicode="⋣" horiz-adv-x="1591" d="M1421 -148q0 -41 -37 -41h-809l-53 -147q-17 -47 -44 -47q-42 0 -42 38q0 15 8 37l43 119h-278q-39 0 -39 41t39 41h308l101 277h-411q-37 0 -37 41t37 41h441l364 1000h-805q-37 0 -37 41t37 41h835l61 167q17 46 43 46q42 0 42 -37q0 -15 -8 -37l-51 -139h253 q39 0 39 -37v-1090q0 -37 -39 -37h-676l-101 -277h779q37 0 37 -41zM1339 252v1000h-239l-364 -1000h603z" />
+<glyph unicode="⋤" horiz-adv-x="1591" d="M1421 141q0 -41 -37 -41h-1175q-39 0 -39 37v1090q0 37 39 37h1175q37 0 37 -41t-37 -41h-1132v-1000h1132q37 0 37 -41zM1421 -218q0 -41 -37 -41h-549l-283 -164q-26 -15 -43 -15q-38 0 -38 41q0 23 40 46l160 92h-462q-39 0 -39 41t39 41h604l284 164q26 15 42 15 q38 0 38 -41q0 -22 -39 -45l-161 -93h407q37 0 37 -41z" />
+<glyph unicode="⋥" horiz-adv-x="1591" d="M1421 137q0 -37 -39 -37h-1175q-37 0 -37 41t37 41h1132v1000h-1132q-37 0 -37 41t37 41h1175q39 0 39 -37v-1090zM1421 -218q0 -41 -37 -41h-549l-283 -164q-26 -15 -43 -15q-38 0 -38 41q0 23 40 46l160 92h-462q-39 0 -39 41t39 41h604l284 164q26 15 42 15 q38 0 38 -41q0 -22 -39 -45l-161 -93h407q37 0 37 -41z" />
+<glyph unicode="⋦" horiz-adv-x="1591" d="M1421 331q0 -41 -41 -41q-8 0 -14 3l-1169 552q-27 13 -27 37t27 37l1169 552q6 3 14 3q41 0 41 -41q0 -26 -24 -37l-1090 -514l1090 -514q24 -11 24 -37zM1477 46q0 -152 -96 -271.5t-244 -119.5q-92 0 -185 54q-56 32 -159 118l-324 -259q-13 -10 -26 -10q-42 0 -42 43 q0 18 16 31l311 248q-148 115 -273 115q-162 0 -245 -147q-29 -52 -38 -142q-5 -51 -29 -51q-28 0 -28 63q0 152 95.5 271.5t244.5 119.5q93 0 168 -43t177 -128l322 258q13 9 26 9q42 0 42 -42q0 -18 -16 -31l-309 -247q149 -116 272 -116q85 0 156 50t104 130q15 36 21 98 t30 62q29 0 29 -63z" />
+<glyph unicode="⋧" horiz-adv-x="1591" d="M1421 882q0 -24 -27 -37l-1169 -552q-6 -3 -14 -3q-41 0 -41 41q0 26 24 37l1090 514l-1090 514q-24 11 -24 37q0 41 41 41q8 0 14 -3l1169 -552q27 -13 27 -37zM1477 46q0 -152 -96 -271.5t-244 -119.5q-92 0 -185 54q-56 32 -159 118l-324 -259q-13 -10 -26 -10 q-42 0 -42 43q0 18 16 31l311 248q-148 115 -273 115q-162 0 -245 -147q-29 -52 -38 -142q-5 -51 -29 -51q-28 0 -28 63q0 152 95.5 271.5t244.5 119.5q93 0 168 -43t177 -128l322 258q13 9 26 9q42 0 42 -42q0 -18 -16 -31l-309 -247q149 -116 272 -116q85 0 156 50 t104 130q15 36 21 98t30 62q29 0 29 -63z" />
+<glyph unicode="⋨" horiz-adv-x="1591" d="M1421 335q0 -45 -41 -45q-34 0 -41 39q-28 180 -141.5 282t-284.5 152q-268 78 -704 78q-39 0 -39 41t39 41q436 0 706 80q173 51 285 152t139 284q6 37 41 37q41 0 41 -43q0 -22 -12 -76q-42 -188 -196 -297q-178 -126 -455 -178q269 -47 453 -177q156 -110 198 -295 q12 -52 12 -75zM1477 46q0 -152 -96 -271.5t-244 -119.5q-92 0 -185 54q-56 32 -159 118l-324 -259q-13 -10 -26 -10q-42 0 -42 43q0 18 16 31l311 248q-148 115 -273 115q-162 0 -245 -147q-29 -52 -38 -142q-5 -51 -29 -51q-28 0 -28 63q0 152 95.5 271.5t244.5 119.5 q93 0 168 -43t177 -128l322 258q13 9 26 9q42 0 42 -42q0 -18 -16 -31l-309 -247q149 -116 272 -116q85 0 156 50t104 130q15 36 21 98t30 62q29 0 29 -63z" />
+<glyph unicode="⋩" horiz-adv-x="1591" d="M1421 882q0 -41 -37 -41q-267 0 -500 -31.5t-415.5 -142.5t-216.5 -338q-6 -39 -41 -39q-41 0 -41 45q0 12 8 53q25 130 106 225q172 203 550 269q-435 77 -590 327q-74 119 -74 224q0 43 41 43q35 0 41 -37q35 -232 215 -342t418 -142t499 -32q37 0 37 -41zM1477 46 q0 -152 -96 -271.5t-244 -119.5q-92 0 -185 54q-56 32 -159 118l-324 -259q-13 -10 -26 -10q-42 0 -42 43q0 18 16 31l311 248q-148 115 -273 115q-162 0 -245 -147q-29 -52 -38 -142q-5 -51 -29 -51q-28 0 -28 63q0 152 95.5 271.5t244.5 119.5q93 0 168 -43t177 -128 l322 258q13 9 26 9q42 0 42 -42q0 -18 -16 -31l-309 -247q149 -116 272 -116q85 0 156 50t104 130q15 36 21 98t30 62q29 0 29 -63z" />
+<glyph unicode="⋪" horiz-adv-x="1591" d="M1421 25q0 -37 -41 -37q-10 0 -14 2l-735 348l-290 -502q-23 -40 -46 -40q-41 0 -41 38q0 15 16 43l286 496l-359 170q-27 13 -27 39t20 35l697 329l221 383q23 39 45 39q41 0 41 -38q0 -16 -15 -42l-162 -281l349 165q4 2 14 2q41 0 41 -37v-1112zM1339 93v976 l-394 -186l-273 -474zM815 822l-508 -240l290 -138z" />
+<glyph unicode="⋫" horiz-adv-x="1591" d="M1421 582q0 -26 -18 -35l-704 -334l-218 -377q-23 -40 -46 -40q-41 0 -41 38q0 15 16 43l159 275l-342 -162q-4 -2 -16 -2q-41 0 -41 37v1112q0 37 41 37q12 0 16 -2l731 -346l290 503q23 39 45 39q41 0 41 -38q0 -16 -15 -42l-287 -497l365 -172q24 -11 24 -37z M1284 582l-293 138l-220 -381zM917 755l-665 314v-976l389 184z" />
+<glyph unicode="⋬" horiz-adv-x="1591" d="M1421 -118q0 -41 -37 -41h-898l-64 -177q-17 -47 -44 -47q-42 0 -42 38q0 15 8 37l54 149h-189q-39 0 -39 41t39 41h219l221 606l-452 214q-27 13 -27 39t20 35l681 321l132 363q17 46 43 46q42 0 42 -37q0 -15 -8 -37l-104 -285l390 184q4 2 14 2q41 0 41 -37v-1112 q0 -37 -41 -37q-10 0 -14 2l-642 304l-208 -571h868q37 0 37 -41zM1339 293v976l-402 -190l-185 -508zM831 1029l-524 -247l370 -175z" />
+<glyph unicode="⋭" horiz-adv-x="1591" d="M1421 -118q0 -41 -37 -41h-898l-64 -177q-17 -47 -44 -47q-42 0 -42 38q0 15 8 37l54 149h-189q-39 0 -39 41t39 41h219l160 438l-361 -171q-4 -2 -16 -2q-41 0 -41 37v1112q0 37 41 37q12 0 16 -2l622 -294l154 423q17 46 43 46q42 0 42 -37q0 -15 -8 -37l-156 -430 l473 -224q24 -11 24 -37t-18 -35l-709 -336l-178 -488h868q37 0 37 -41zM1284 782l-389 183l-161 -444zM821 1001l-569 268v-976l376 178z" />
+<glyph unicode="⋮" horiz-adv-x="682" d="M420.5 -25.5q33.5 -33.5 33.5 -80t-33 -79.5t-80 -33t-80 33t-33 80t33 80t79.5 33t80 -33.5zM420 1347.5q34 -33.5 34 -79t-34 -79t-79.5 -33.5t-79 33.5t-33.5 80t33 79t79 32.5t80 -33.5zM420 660.5q34 -33.5 34 -79t-34 -79t-79.5 -33.5t-79 33.5t-33.5 80t33 79 t79 32.5t80 -33.5z" />
+<glyph unicode="⋯" d="M1103 660.5q34 -33.5 34 -79t-34 -79t-79.5 -33.5t-79 33.5t-33.5 80t33 79t79 32.5t80 -33.5zM420.5 661.5q33.5 -33.5 33.5 -80t-33 -79.5t-80 -33t-80 33t-33 80t33 80t79.5 33t80 -33.5zM1786 660.5q34 -33.5 34 -79t-34 -79t-79.5 -33.5t-79 33.5t-33.5 80t33 79 t79 32.5t80 -33.5z" />
+<glyph unicode="⋰" d="M420.5 -25.5q33.5 -33.5 33.5 -80t-33 -79.5t-80 -33t-80 33t-33 80t33 80t79.5 33t80 -33.5zM1786 1347.5q34 -33.5 34 -79t-34 -79t-79.5 -33.5t-79 33.5t-33.5 80t33 79t79 32.5t80 -33.5zM1103 660.5q34 -33.5 34 -79t-34 -79t-79.5 -33.5t-79 33.5t-33.5 80t33 79 t79 32.5t80 -33.5z" />
+<glyph unicode="⋱" d="M421 1348.5q33 -32.5 33 -79t-33.5 -80t-79 -33.5t-79.5 33.5t-34 79t34 79t80 33.5t79 -32.5zM1104 661.5q33 -32.5 33 -79t-33.5 -80t-79 -33.5t-79.5 33.5t-34 79t34 79t80 33.5t79 -32.5zM1820 -105q0 -47 -33 -80t-80 -33t-80 33t-33 79.5t33.5 80t80 33.5t79.5 -33 t33 -80z" />
+<glyph unicode="⋲" horiz-adv-x="1634" d="M1464 41q0 -41 -37 -41h-294q-242 0 -423.5 153t-198.5 388h-304q-37 0 -37 41t37 41h304q17 235 198.5 388t423.5 153h294q37 0 37 -41t-37 -41h-288q-201 0 -373 -132t-172 -327h833q37 0 37 -41t-37 -41h-833q0 -195 172 -327t373 -132h288q37 0 37 -41z" />
+<glyph unicode="⋳" horiz-adv-x="1364" d="M1194 41q0 -41 -37 -41h-364q-253 0 -438 166t-185 416t185 416t438 166h364q37 0 37 -41t-37 -41h-358q-201 0 -373 -132t-172 -327h858v247q0 37 41 37t41 -37v-574q0 -39 -41 -39t-41 39v245h-858q0 -195 172 -327t373 -132h358q37 0 37 -41z" />
+<glyph unicode="⋴" horiz-adv-x="1164" d="M994 41q0 -41 -37 -41h-293q-201 0 -347.5 132t-146.5 330t146.5 330t347.5 132h293q37 0 37 -41t-37 -41h-293q-158 0 -275.5 -96.5t-134.5 -242.5h658v187q0 37 41 37t41 -37v-454q0 -39 -41 -39t-41 39v185h-658q17 -146 134.5 -242.5t275.5 -96.5h293q37 0 37 -41z " />
+<glyph unicode="⋵" horiz-adv-x="1364" d="M1194 41q0 -41 -37 -41h-364q-253 0 -438 166t-185 416t185 416t438 166h364q37 0 37 -41t-37 -41h-358q-201 0 -373 -132t-172 -327h903q37 0 37 -41t-37 -41h-903q0 -195 172 -327t373 -132h358q37 0 37 -41zM880.5 1572.5q33.5 -33.5 33.5 -80t-33 -79.5t-80 -33 t-80 33t-33 80t33 80t79.5 33t80 -33.5z" />
+<glyph unicode="⋶" horiz-adv-x="1364" d="M1194 41q0 -41 -37 -41h-364q-253 0 -438 166t-185 416t185 416t438 166h364q37 0 37 -41t-37 -41h-358q-201 0 -373 -132t-172 -327h903q37 0 37 -41t-37 -41h-903q0 -195 172 -327t373 -132h358q37 0 37 -41zM1194 1482q0 -41 -37 -41h-948q-39 0 -39 41t39 41h948 q37 0 37 -41z" />
+<glyph unicode="⋷" horiz-adv-x="1164" d="M994 41q0 -41 -37 -41h-293q-201 0 -347.5 132t-146.5 330t146.5 330t347.5 132h293q37 0 37 -41t-37 -41h-293q-158 0 -275.5 -96.5t-134.5 -242.5h703q37 0 37 -41t-37 -41h-703q17 -146 134.5 -242.5t275.5 -96.5h293q37 0 37 -41zM994 1185q0 -41 -37 -41h-748 q-39 0 -39 41t39 41h748q37 0 37 -41z" />
+<glyph unicode="⋸" horiz-adv-x="1364" d="M1194 41q0 -41 -37 -41h-364q-253 0 -438 166t-185 416t185 416t438 166h364q37 0 37 -41t-37 -41h-358q-201 0 -373 -132t-172 -327h903q37 0 37 -41t-37 -41h-903q0 -195 172 -327t373 -132h358q37 0 37 -41zM1194 -318q0 -41 -37 -41h-948q-39 0 -39 41t39 41h948 q37 0 37 -41z" />
+<glyph unicode="⋹" horiz-adv-x="1364" d="M1194 41q0 -41 -37 -41h-364q-253 0 -438 166t-185 416t185 416t438 166h364q37 0 37 -41t-37 -41h-364q-164 0 -302 -84t-200 -225h866q37 0 37 -41t-37 -41h-893q-12 -53 -12 -109t12 -109h893q37 0 37 -41t-37 -41h-866q62 -141 200 -225t302 -84h364q37 0 37 -41z " />
+<glyph unicode="⋺" horiz-adv-x="1634" d="M1464 582q0 -41 -37 -41h-304q-17 -235 -198.5 -388t-423.5 -153h-294q-37 0 -37 41t37 41h288q201 0 373 132t172 327h-833q-37 0 -37 41t37 41h833q0 195 -172 327t-373 132h-288q-37 0 -37 41t37 41h294q242 0 423.5 -153t198.5 -388h304q37 0 37 -41z" />
+<glyph unicode="⋻" horiz-adv-x="1364" d="M1194 582q0 -250 -185 -416t-438 -166h-364q-37 0 -37 41t37 41h358q201 0 373 132t172 327h-858v-245q0 -39 -41 -39t-41 39v574q0 37 41 37t41 -37v-247h858q0 195 -172 327t-373 132h-358q-37 0 -37 41t37 41h364q253 0 438 -166t185 -416z" />
+<glyph unicode="⋼" horiz-adv-x="1164" d="M994 462q0 -198 -146.5 -330t-347.5 -132h-293q-37 0 -37 41t37 41h293q158 0 275.5 96.5t134.5 242.5h-658v-185q0 -39 -41 -39t-41 39v454q0 37 41 37t41 -37v-187h658q-17 146 -134.5 242.5t-275.5 96.5h-293q-37 0 -37 41t37 41h293q201 0 347.5 -132t146.5 -330z " />
+<glyph unicode="⋽" horiz-adv-x="1364" d="M1194 582q0 -250 -185 -416t-438 -166h-364q-37 0 -37 41t37 41h358q201 0 373 132t172 327h-903q-37 0 -37 41t37 41h903q0 195 -172 327t-373 132h-358q-37 0 -37 41t37 41h364q253 0 438 -166t185 -416zM1194 1482q0 -41 -39 -41h-948q-37 0 -37 41t37 41h948 q39 0 39 -41z" />
+<glyph unicode="⋾" horiz-adv-x="1164" d="M994 462q0 -198 -146.5 -330t-347.5 -132h-293q-37 0 -37 41t37 41h293q158 0 275.5 96.5t134.5 242.5h-703q-37 0 -37 41t37 41h703q-17 146 -134.5 242.5t-275.5 96.5h-293q-37 0 -37 41t37 41h293q201 0 347.5 -132t146.5 -330zM994 1185q0 -41 -39 -41h-748 q-37 0 -37 41t37 41h748q39 0 39 -41z" />
+<glyph unicode="⋿" horiz-adv-x="1547" d="M1377 41q0 -41 -39 -41h-1131q-37 0 -37 39v1345q0 37 37 37h1131q39 0 39 -41t-39 -41h-1086v-587h1060q37 0 37 -41t-37 -41h-1060v-588h1086q39 0 39 -41z" />
+<glyph unicode="⌀" horiz-adv-x="1591" d="M1477 1159q0 -19 -11 -29l-192 -167q125 -164 125 -365q0 -249 -176.5 -426.5t-425 -177.5t-426.5 176l-185 -162q-16 -14 -30 -14q-41 0 -41 43q0 17 10 26l192 168q-122 162 -122 367q0 249 176.5 425.5t422 176.5t427.5 -176l184 162q16 14 31 14q41 0 41 -41z M1159 969q-151 149 -364 149t-366 -152.5t-153 -367.5q0 -178 103 -311zM1317 598q0 173 -105 309l-780 -682q153 -147 366 -147t366 153t153 367z" />
+<glyph unicode="⌁" horiz-adv-x="2176" d="M2068 230q0 -41 -41 -41q-16 0 -26 10l-872 896v-869q0 -39 -41 -39q-19 0 -29 10l-939 965q-12 12 -12 31q0 41 41 41q16 0 26 -10l872 -895v868q0 39 41 39q19 0 29 -10l939 -965q12 -12 12 -31z" />
+<glyph unicode="⌂" horiz-adv-x="1628" d="M1368 0h-1108v761l553 623l555 -623v-761zM1271 97v623l-458 512l-456 -512v-623h914z" />
+<glyph unicode="⌃" horiz-adv-x="1235" d="M1095 1029q0 -18 -23 -18q-2 0 -6 2q-124 27 -251.5 122.5t-196.5 208.5q-69 -112 -197 -208t-252 -123q-4 -2 -6 -2q-23 0 -23 18v45q0 14 15 19q172 38 293.5 169t146.5 306q3 18 22.5 18t22.5 -18q25 -175 146.5 -306t293.5 -169q15 -5 15 -19v-45z" />
+<glyph unicode="⌄" horiz-adv-x="1235" d="M1095 123q0 -14 -15 -19q-172 -38 -293.5 -169t-146.5 -306q-3 -18 -22.5 -18t-22.5 18q-25 175 -146.5 306t-293.5 169q-15 5 -15 19v45q0 18 23 18q2 0 6 -2q124 -27 252 -123t197 -208q69 113 196.5 208.5t251.5 122.5q4 2 6 2q23 0 23 -18v-45z" />
+<glyph unicode="⌅" horiz-adv-x="1235" d="M1095 230q0 -18 -23 -18q-2 0 -6 2q-124 27 -251.5 122.5t-196.5 208.5q-69 -112 -197 -208t-252 -123q-4 -2 -6 -2q-23 0 -23 18v45q0 14 15 19q172 38 293.5 169t146.5 306q3 18 22.5 18t22.5 -18q25 -175 146.5 -306t293.5 -169q15 -5 15 -19v-45zM1141 1023 q0 -41 -68 -41h-910q-68 0 -68 41t68 41h910q68 0 68 -41z" />
+<glyph unicode="⌆" horiz-adv-x="1235" d="M1141 1023q0 -41 -68 -41h-910q-68 0 -68 41t68 41h910q68 0 68 -41zM1095 230q0 -18 -23 -18q-2 0 -6 2q-124 27 -251.5 122.5t-196.5 208.5q-69 -112 -197 -208t-252 -123q-4 -2 -6 -2q-23 0 -23 18v45q0 14 15 19q172 38 293.5 169t146.5 306q3 18 22.5 18t22.5 -18 q25 -175 146.5 -306t293.5 -169q15 -5 15 -19v-45zM1141 1423q0 -41 -68 -41h-910q-68 0 -68 41t68 41h910q68 0 68 -41z" />
+<glyph unicode="⌇" horiz-adv-x="810" d="M604 270q12 -12 12 -30.5t-12 -30.5l-310 -303l136 -136q16 -16 16 -32v-115q0 -39 -41 -39t-41 39v96l-158 156q-12 12 -12 30.5t12 30.5l310 303l-310 304q-12 12 -12 30.5t12 30.5l310 303l-310 303q-12 12 -12 31t12 31l158 155v94q0 39 41 39t41 -39v-112 q0 -17 -16 -33l-136 -135l310 -303q12 -12 12 -31t-12 -31l-310 -303z" />
+<glyph unicode="⌈" horiz-adv-x="909" d="M864 1565q0 -41 -37 -41h-389v-1929q0 -37 -41 -37t-41 37v1974q0 37 39 37h432q37 0 37 -41z" />
+<glyph unicode="⌉" horiz-adv-x="909" d="M551 -405q0 -37 -41 -37t-41 37v1929h-389q-37 0 -37 41t37 41h434q37 0 37 -37v-1974z" />
+<glyph unicode="⌊" horiz-adv-x="909" d="M864 -401q0 -41 -37 -41h-432q-39 0 -39 37v1974q0 37 41 37t41 -37v-1929h389q37 0 37 -41z" />
+<glyph unicode="⌋" horiz-adv-x="909" d="M551 -405q0 -37 -37 -37h-434q-37 0 -37 41t37 41h389v1929q0 37 41 37t41 -37v-1974z" />
+<glyph unicode="⌌" horiz-adv-x="1024" d="M907 1380q0 -41 -37 -41h-673v-673q0 -39 -41 -39t-41 39v718q0 37 37 37h718q37 0 37 -41z" />
+<glyph unicode="⌍" horiz-adv-x="1024" d="M907 666q0 -39 -41 -39t-41 39v673h-673q-37 0 -37 41t37 41h718q37 0 37 -37v-718z" />
+<glyph unicode="⌎" horiz-adv-x="1024" d="M907 -4q0 -41 -37 -41h-718q-37 0 -37 37v719q0 39 41 39t41 -39v-674h673q37 0 37 -41z" />
+<glyph unicode="⌏" horiz-adv-x="1024" d="M907 -8q0 -37 -37 -37h-718q-37 0 -37 41t37 41h673v674q0 39 41 39t41 -39v-719z" />
+<glyph unicode="⌐" horiz-adv-x="1591" d="M1421 688q0 -41 -39 -41h-1013v-428q0 -37 -41 -37t-41 37v473q0 37 37 37h1058q39 0 39 -41z" />
+<glyph unicode="⌑" horiz-adv-x="1036" d="M814 296h-592v592h592v-592zM715 395v394h-394v-394h394z" />
+<glyph unicode="⌒" horiz-adv-x="1574" d="M1496 582q0 -67 -35.5 -67t-35.5 67q0 266 -186 452t-452 186t-452 -186t-186 -452q0 -67 -35.5 -67t-35.5 67q0 296 206.5 502t502.5 206t502.5 -206t206.5 -502z" />
+<glyph unicode="⌓" horiz-adv-x="1574" d="M1496 582q0 -41 -68 -41h-1282q-68 0 -68 41q0 296 206.5 502t502.5 206t502.5 -206t206.5 -502zM787 1220q-255 0 -438 -172.5t-199 -424.5h1274q-16 252 -199 424.5t-438 172.5z" />
+<glyph unicode="⌔" horiz-adv-x="1574" d="M1431 859q0 -24 -49 -47l-595 -278l-595 278q-49 23 -49 47q0 8 5 19q88 188 260 299t379 111t379 -111t260 -299q5 -11 5 -19zM787 1217q-174 0 -323 -89.5t-233 -243.5l556 -259l556 259q-84 154 -233 243.5t-323 89.5z" />
+<glyph unicode="⌕" horiz-adv-x="1148" d="M926 592q0 -147 -102.5 -249.5t-249.5 -102.5q-116 0 -206 65l-264 -264q-31 -31 -50 -31q-39 0 -39 39q0 19 31 50l262 262q-86 98 -86 238t102.5 242.5t249.5 102.5t249.5 -102.5t102.5 -249.5zM753 413q74 74 74 179.5t-73.5 179.5t-179.5 74t-179.5 -74t-73.5 -179.5 t74 -179.5t179 -74t179 74z" />
+<glyph unicode="⌖" horiz-adv-x="1155" d="M1115 640h-189q-13 -121 -101.5 -208.5t-209.5 -99.5v-191h-80v191q-120 13 -208 100.5t-101 207.5h-189v82h189q12 121 100 209t209 101v187h80v-187q121 -12 209.5 -100.5t101.5 -209.5h189v-82zM615 722h211q-12 80 -71.5 140t-139.5 71v-211zM535 722v211 q-80 -12 -138.5 -71.5t-70.5 -139.5h209zM615 640v-208q79 11 138.5 70t72.5 138h-211zM535 640h-209q13 -79 71.5 -137.5t137.5 -70.5v208z" />
+<glyph unicode="⌗" horiz-adv-x="1155" d="M1116 375h-234v-235h-82v235h-444v-235h-82v235h-237v82h237v444h-237v82h237v236h82v-236h444v236h82v-236h234v-82h-234v-444h234v-82zM800 457v444h-444v-444h444z" />
+<glyph unicode="⌘" horiz-adv-x="1155" d="M1077 479.5q64 -64.5 64 -155t-64 -154.5t-154.5 -64t-154.5 64t-64 155v136h-253v-136q0 -90 -64.5 -154.5t-154.5 -64.5t-154 64t-64 154.5t64 155t154 64.5h137v252h-137q-90 0 -154 64.5t-64 155t64 154.5t154.5 64t154.5 -64t64 -155v-136h253v136q0 91 64 155 t154.5 64t154.5 -64t64 -154.5t-64 -155t-154 -64.5h-137v-252h137q90 0 154 -64.5zM1059 1015q0 56 -40 96.5t-96.5 40.5t-96.5 -40t-40 -97v-136h137q56 0 96 40t40 96zM704 544v252h-253v-252h253zM1059 325q0 56 -40 96t-96 40h-137v-136q0 -56 40.5 -96.5t96.5 -40.5 t96 40.5t40 96.5zM369 879v136q0 56 -40.5 96.5t-96.5 40.5t-96 -40.5t-40 -96.5t40 -96t96 -40h137zM369 325v136h-137q-56 0 -96 -40t-40 -96t40 -96.5t96 -40.5t96.5 40.5t40.5 96.5z" />
+<glyph unicode="⌙" horiz-adv-x="1591" d="M1421 582q0 -41 -39 -41h-1058q-37 0 -37 37v473q0 37 41 37t41 -37v-428h1013q39 0 39 -41z" />
+<glyph unicode="⌚" horiz-adv-x="1628" d="M1322 1175q209 -209 209 -507.5t-209 -507.5t-508 -209t-508 209t-209 507.5t209.5 507.5t508 209t507.5 -209zM1272.5 209.5q188.5 188.5 188.5 458t-188.5 458t-458 188.5t-458.5 -188.5t-189 -458t188.5 -458t458.5 -188.5t458.5 188.5zM1255 1108.5 q181 -181.5 181 -441t-181 -441t-441 -181.5t-441 181.5t-181 440.5t181.5 441t441 182t440.5 -181.5zM1423 657q11 0 11 10.5t-11 10.5h-39q-3 143 -70 266l33 19q9 5 4 14q-6 9 -15 4l-33 -19q-73 122 -195 194l20 34q5 9 -4 14t-14 -4l-20 -33q-123 68 -265 70l-1 40 q0 10 -10.5 10t-10.5 -10l1 -40q-143 -2 -266 -70l-20 33q-5 9 -14 4t-4 -14l20 -34q-122 -73 -195 -194l-33 19q-9 5 -14.5 -4t3.5 -14l34 -19q-68 -124 -71 -266h-39q-11 0 -11 -10.5t11 -10.5h39q3 -143 70 -266l-33 -19q-9 -5 -3.5 -14.5t14.5 -3.5l33 19 q73 -122 195 -195l-20 -33q-5 -9 4 -14.5t14 4.5l20 33q123 -68 266 -70l-1 -40q0 -10 10.5 -10t10.5 10l1 40q142 2 265 70l20 -33q5 -10 14 -4.5t4 14.5l-20 33q122 73 195 195l33 -19q9 -6 14.5 3.5t-3.5 14.5l-33 19q67 123 70 266h39zM1280 662h-164q-2 -76 -37 -142 l141 -81q4 -3 1.5 -7t-6.5 -2l-141 82q-39 -66 -104 -104l81 -142q3 -4 -1.5 -6.5t-6.5 1.5l-82 142q-66 -36 -142 -37v-165q0 -4 -5 -4t-5 4v165q-76 1 -142 37l-82 -142q-2 -4 -6.5 -1.5t-1.5 6.5l81 142q-46 27 -79 69q-25 -17 -142 -33l-24 -14q-5 3 -5 9l24 13l46 60 q27 33 54 47q-19 50 -20 103h-164q-4 0 -5 5q1 5 5 5h164q2 77 38 142l-142 82q-4 3 -2 7q3 4 7 2l142 -82q38 65 104 104l-82 141q-3 5 1.5 7.5t6.5 -2.5l82 -141q51 28 110 35q-4 59 -4 123.5t41 132.5q41 -68 41 -132.5t-4 -123.5q59 -7 110 -35l82 141q2 5 6.5 2.5 t1.5 -7.5l-81 -141q65 -39 104 -104l141 82q4 2 6.5 -2t-1.5 -7l-141 -82q35 -65 37 -142h164q4 0 4 -5t-4 -5zM1021.5 460q84.5 85 84.5 202.5t-73 199.5t-183 95q-6 -103 -27 -253q29 -5 29 -37q0 -37 -38 -37q-16 0 -26 9q-67 -58 -201 -157q87 -107 218.5 -107t216 85z M522 667q0 -54 18 -103q55 30 237 95q-1 4 -1 8q0 32 29 37q-21 150 -27 253q-110 -13 -183 -95t-73 -195z" />
+<glyph unicode="⌛" horiz-adv-x="1354" d="M1254 -178q0 -242 -577 -242t-577 242v91q0 126 30 196t208.5 261t178.5 217.5t-180 213t-208.5 260.5t-28.5 222v82q0 221 577 221t577 -221v-82q0 -148 -28.5 -222t-208.5 -260.5t-180 -213t178.5 -217.5t208.5 -261t30 -196v-91zM1158 1407q0 66 -211 97 q-129 18 -270 18t-270 -18q-211 -31 -211 -97q0 -45 154 -85t327 -40t327 40t154 85zM1191 -158v76q0 110 -25.5 169t-209 248.5t-183.5 248t183 249.5t208.5 244t25.5 136v118q-182 -113 -513 -113t-513 113v-118q0 -83 25.5 -136t208.5 -244t183 -249.5t-183.5 -248 t-209 -248.5t-25.5 -169v-76q0 -78 62 -117q129 -81 452 -81t452 81q62 39 62 117zM677 959q184 0 376 122q-41 -67 -118 -151l-132 -139q-36 -39 -88 -109q-16 -31 -23 -88l-15 -107l-15 107q-7 57 -22 87t-85 105l-136 144q-77 84 -118 151q192 -122 376 -122zM677 -265 q-283 0 -448 83q17 64 113 124q18 11 114.5 60t172.5 98q22 22 48 87q26 -65 47.5 -86.5t145.5 -84.5t142 -74q96 -60 113 -124q-165 -83 -448 -83z" />
+<glyph unicode="⌜" horiz-adv-x="1024" d="M907 1380q0 -41 -37 -41h-673v-673q0 -39 -41 -39t-41 39v718q0 37 37 37h718q37 0 37 -41z" />
+<glyph unicode="⌝" horiz-adv-x="1024" d="M907 666q0 -39 -41 -39t-41 39v673h-673q-37 0 -37 41t37 41h718q37 0 37 -37v-718z" />
+<glyph unicode="⌞" horiz-adv-x="1024" d="M907 -4q0 -41 -37 -41h-718q-37 0 -37 37v719q0 39 41 39t41 -39v-674h673q37 0 37 -41z" />
+<glyph unicode="⌟" horiz-adv-x="1024" d="M907 -8q0 -37 -37 -37h-718q-37 0 -37 41t37 41h673v674q0 39 41 39t41 -39v-719z" />
+<glyph unicode="⌠" horiz-adv-x="1329" d="M1329 889q0 -105 -108 -105q-46 0 -75.5 29.5t-29.5 75.5q0 95 95 107q-67 54 -167 54q-119 0 -177 -169q-30 -88 -51 -288t-21 -467v-568h-216v242q0 214 31.5 530t91.5 479q109 297 342 297q107 0 196 -58t89 -159zM0 1606zM1329 -442z" />
+<glyph unicode="⌡" horiz-adv-x="1329" d="M582 1145l-3 209v252h216v-318q0 -304 -65 -748q-34 -232 -125 -382q-122 -200 -322 -200q-108 0 -195.5 57.5t-87.5 160.5q0 46 29.5 75.5t75.5 29.5q107 0 107 -105q0 -97 -97 -108q66 -53 168 -53q135 0 200 163q55 138 77 468t22 499zM0 1606zM1329 -442z" />
+<glyph unicode="⌢" horiz-adv-x="1410" d="M1410 403q0 -23 -25 -23q-11 0 -19 10q-25 33 -79 95q-217 219 -582 219t-582 -219l-79 -95q-8 -10 -19 -10q-25 0 -25 23q0 8 5 16q115 172 302.5 269t397.5 97t397.5 -97t302.5 -269q5 -8 5 -16z" />
+<glyph unicode="⌣" horiz-adv-x="1410" d="M1410 762q0 -8 -5 -16q-115 -172 -302.5 -269t-397.5 -97t-397.5 97t-302.5 269q-5 8 -5 16q0 23 25 23q11 0 19 -10q25 -33 79 -95q217 -219 582 -219t582 219l79 95q8 10 19 10q25 0 25 -23z" />
+<glyph unicode="⌤" horiz-adv-x="1628" d="M1442 1023q0 -46 -73 -46h-390q-73 0 -73 46t73 46h390q73 0 73 -46zM722 1023q0 -46 -73 -46h-390q-73 0 -73 46t73 46h390q73 0 73 -46zM1297 230q0 -23 -28 -23h-3q-1 0 -5 2q-123 27 -249.5 121t-196.5 206q-71 -112 -198 -206q-121 -89 -255 -123h-2q-28 0 -28 23 v45q0 18 18 24q171 38 291.5 167.5t145.5 303.5q3 22 27 22t27 -22q25 -174 145.5 -303.5t291.5 -167.5q19 -6 19 -24v-45z" />
+<glyph unicode="⌥" horiz-adv-x="1628" d="M1362 1023q0 -46 -73 -46h-320q-73 0 -73 46t73 46h320q73 0 73 -46zM1362 46q0 -46 -73 -46h-350q-50 0 -68 63l-260 914h-272q-73 0 -73 46t73 46h333q49 0 67 -63l261 -914h289q73 0 73 -46z" />
+<glyph unicode="⌦" horiz-adv-x="2327" d="M1641 0h-1520q-54 0 -54 54v1220q0 52 54 52h1520q23 0 60 -38l569 -568q30 -30 30 -58t-30 -58l-569 -569q-35 -35 -60 -35zM173 1220v-1114h1463l556 556l-558 558h-1461zM1417 125q-15 -15 -35.5 -15t-54.5 34l-447 447l-447 -447q-34 -34 -54.5 -34t-35.5 15 t-15 35.5t34 54.5l447 447l-447 447q-34 34 -34 54.5t15 35.5t35.5 15t54.5 -34l447 -447l447 447q34 34 54.5 34t35.5 -15t15 -35.5t-34 -54.5l-447 -447l447 -447q34 -34 34 -54.5t-15 -35.5z" />
+<glyph unicode="⌧" horiz-adv-x="1760" d="M1693 54q0 -54 -52 -54h-1520q-54 0 -54 54v1220q0 52 54 52h1520q52 0 52 -52v-1220zM1587 106v1114h-1414v-1114h1414zM1417 125q-15 -15 -35.5 -15t-54.5 34l-447 447l-447 -447q-34 -34 -54.5 -34t-35.5 15t-15 35.5t34 54.5l447 447l-447 447q-34 34 -34 54.5 t15 35.5t35.5 15t54.5 -34l447 -447l447 447q34 34 54.5 34t35.5 -15t15 -35.5t-34 -54.5l-447 -447l447 -447q34 -34 34 -54.5t-15 -35.5z" />
+<glyph unicode="⌨" horiz-adv-x="2196" d="M2062 197q0 -83 -58.5 -141.5t-141.5 -58.5h-1528q-83 0 -141.5 58.5t-58.5 141.5v639q0 83 58.5 141.5t141.5 58.5h1528q83 0 141.5 -58.5t58.5 -141.5v-639zM1962 197v639q0 41 -29.5 70.5t-70.5 29.5h-1528q-41 0 -70.5 -29.5t-29.5 -70.5v-639q0 -41 29.5 -70.5 t70.5 -29.5h1528q41 0 70.5 29.5t29.5 70.5zM1726 757q0 -34 -34 -34h-67q-34 0 -34 34v56q0 34 34 34h67q34 0 34 -34v-56zM1846 627q0 -34 -34 -34h-67q-34 0 -34 34v56q0 34 34 34h67q34 0 34 -34v-56zM1476 757q0 -34 -34 -34h-67q-34 0 -34 34v56q0 34 34 34h67 q34 0 34 -34v-56zM1596 627q0 -34 -34 -34h-67q-34 0 -34 34v56q0 34 34 34h67q34 0 34 -34v-56zM1726 497q0 -34 -34 -34h-67q-34 0 -34 34v56q0 34 34 34h67q34 0 34 -34v-56zM1846 367q0 -34 -34 -34h-67q-34 0 -34 34v56q0 34 34 34h67q34 0 34 -34v-56zM1226 757 q0 -34 -34 -34h-67q-34 0 -34 34v56q0 34 34 34h67q34 0 34 -34v-56zM1346 627q0 -34 -34 -34h-67q-34 0 -34 34v56q0 34 34 34h67q34 0 34 -34v-56zM1476 497q0 -34 -34 -34h-67q-34 0 -34 34v56q0 34 34 34h67q34 0 34 -34v-56zM1596 367q0 -34 -34 -34h-67q-34 0 -34 34 v56q0 34 34 34h67q34 0 34 -34v-56zM1726 237q0 -34 -34 -34h-67q-34 0 -34 34v56q0 34 34 34h67q34 0 34 -34v-56zM976 757q0 -34 -34 -34h-67q-34 0 -34 34v56q0 34 34 34h67q34 0 34 -34v-56zM1096 627q0 -34 -34 -34h-67q-34 0 -34 34v56q0 34 34 34h67q34 0 34 -34v-56 zM1226 497q0 -34 -34 -34h-67q-34 0 -34 34v56q0 34 34 34h67q34 0 34 -34v-56zM1346 367q0 -34 -34 -34h-67q-34 0 -34 34v56q0 34 34 34h67q34 0 34 -34v-56zM726 757q0 -34 -34 -34h-67q-34 0 -34 34v56q0 34 34 34h67q34 0 34 -34v-56zM846 627q0 -34 -34 -34h-67 q-34 0 -34 34v56q0 34 34 34h67q34 0 34 -34v-56zM976 497q0 -34 -34 -34h-67q-34 0 -34 34v56q0 34 34 34h67q34 0 34 -34v-56zM1096 367q0 -34 -34 -34h-67q-34 0 -34 34v56q0 34 34 34h67q34 0 34 -34v-56zM1476 237q0 -34 -34 -34h-817q-34 0 -34 34v56q0 34 34 34h817 q34 0 34 -34v-56zM476 757q0 -34 -34 -34h-67q-34 0 -34 34v56q0 34 34 34h67q34 0 34 -34v-56zM596 627q0 -34 -34 -34h-67q-34 0 -34 34v56q0 34 34 34h67q34 0 34 -34v-56zM726 497q0 -34 -34 -34h-67q-34 0 -34 34v56q0 34 34 34h67q34 0 34 -34v-56zM846 367 q0 -34 -34 -34h-67q-34 0 -34 34v56q0 34 34 34h67q34 0 34 -34v-56zM476 497q0 -34 -34 -34h-67q-34 0 -34 34v56q0 34 34 34h67q34 0 34 -34v-56zM596 367q0 -34 -34 -34h-67q-34 0 -34 34v56q0 34 34 34h67q34 0 34 -34v-56zM476 237q0 -34 -34 -34h-67q-34 0 -34 34v56 q0 34 34 34h67q34 0 34 -34v-56z" />
+<glyph unicode="〈" horiz-adv-x="795" d="M680 -401q0 -41 -41 -41q-28 0 -37 25q-377 996 -377 1000t377 998q9 25 37 25q41 0 41 -41q0 -9 -371 -983q371 -974 371 -983z" />
+<glyph unicode="〉" horiz-adv-x="795" d="M567 598q2 -5 2 -15t-374 -1000q-9 -25 -39 -25q-41 0 -41 41q0 3 370 983q-370 980 -370 983q0 41 41 41q30 0 39 -25z" />
+<glyph unicode="⌫" horiz-adv-x="2327" d="M2300 52q0 -52 -54 -52h-1520q-23 0 -61 38l-568 568q-30 30 -30 58t30 58l568 569q36 35 61 35h1520q54 0 54 -54v-1220zM2194 106v1114h-1463l-556 -556l558 -558h1461zM2024 1201q15 -15 15 -35.5t-34 -54.5l-447 -447l447 -447q34 -34 34 -54.5t-15 -35.5t-35.5 -15 t-54.5 34l-447 447l-447 -447q-34 -34 -54.5 -34t-35.5 15t-15 35.5t34 54.5l447 447l-447 447q-34 34 -34 54.5t15 35.5t35.5 15t54.5 -34l447 -447l447 447q34 34 54.5 34t35.5 -15z" />
+<glyph unicode="⌬" horiz-adv-x="1864" d="M1694 166q0 -24 -21 -36l-721 -416q-5 -3 -20 -3t-20 3l-721 416q-21 12 -21 36v832q0 24 21 36l721 416q5 3 20 3t20 -3l721 -416q21 -12 21 -36v-832zM1612 190v784l-680 393l-680 -393v-784l680 -393zM1506 914q0 -43 -40 -43q-12 0 -22 6l-512 296q-21 12 -21 35 q0 43 40 43q10 0 22 -7l512 -296q21 -12 21 -34zM1506 250q0 -22 -21 -34l-512 -296q-12 -7 -22 -7q-40 0 -40 43q0 23 21 35l512 296q10 6 22 6q40 0 40 -43zM420 286q0 -41 -41 -41t-41 41v592q0 41 41 41t41 -41v-592z" />
+<glyph unicode="⌭" horiz-adv-x="1628" d="M1589 1140l-378 -1038l-94 34l378 1038zM999 189q-92 -42 -177 -42t-163 28q-173 63 -251 229q-42 91 -42 184q0 76 28 155q63 174 229 252q92 43 177 43t163 -29q173 -63 251 -229q43 -92 43 -177t-29 -163q-63 -173 -229 -251zM509 1065l-378 -1038l-94 34l378 1038z M1155 594q0 106 -61 194.5t-165 126.5q-58 21 -119 21q-106 0 -195 -61.5t-126 -164.5q-21 -58 -21 -119q0 -106 61 -195t165 -126q60 -22 125.5 -22t137.5 33q129 60 177 194q21 58 21 119z" />
+<glyph unicode="⌮" horiz-adv-x="1628" d="M1614 561q0 -52 -49 -52q-13 0 -41 10q-23 -201 -173.5 -336t-352.5 -135q-175 0 -317 103.5t-194 269.5q-165 -118 -303 -315l-76 -118q-17 -25 -42 -25q-52 0 -52 49q0 13 8 27q178 313 443 488q-2 21 -2 51q0 220 155 377t369 157t368.5 -140.5t170.5 -347.5 q52 -16 56 -19q32 -15 32 -44zM1279 915.5q-124 104.5 -295.5 104.5t-299.5 -129t-129 -310q229 121 504 121q178 0 370 -50q-26 159 -150 263.5zM1060 602q-270 0 -492 -129q36 -147 156.5 -240t282.5 -93t288 117.5t139 289.5q-197 55 -374 55z" />
+<glyph unicode="⌯" horiz-adv-x="1628" d="M1237 789q0 -41 -68 -41h-710q-68 0 -68 41t68 41h710q68 0 68 -41zM1556 453h-1484v73h1484v-73zM1237 189q0 -41 -68 -41h-710q-68 0 -68 41t68 41h710q68 0 68 -41z" />
+<glyph unicode="⌰" horiz-adv-x="1628" d="M1496 976l-280 -976h-1084l280 976h99l-252 -877h887l252 877h98z" />
+<glyph unicode="⌱" horiz-adv-x="1628" d="M1460 640h-590q-13 -121 -101.5 -208.5t-208.5 -99.5v-191h-80v191q-120 13 -215.5 108.5t-95.5 241.5t95.5 241.5t215.5 108.5v187h80v-187q121 -12 209.5 -100.5t100.5 -209.5h590v-82zM560 722h211q-12 80 -71.5 140t-139.5 71v-211zM560 640v-208q79 11 138.5 70 t71.5 138h-210zM480 933q-79 -12 -145.5 -79t-66.5 -171.5t74 -178.5q59 -60 138 -72v501z" />
+<glyph unicode="⌲" horiz-adv-x="1628" d="M1406 592l-1184 -592v1184zM321 642h766l-766 383v-383zM321 543v-383l766 383h-766z" />
+<glyph unicode="⌳" horiz-adv-x="1628" d="M178 540v637l1272 -637h-1272zM278 640h749l-749 375v-375z" />
+<glyph unicode="⌴" horiz-adv-x="1628" d="M1406 0h-1184v1076h99v-977h987v977h98v-1076z" />
+<glyph unicode="⌵" horiz-adv-x="1628" d="M1464 923l-649 -919l-651 919h132l519 -732l517 732h132z" />
+<glyph unicode="⌶" horiz-adv-x="1591" d="M1479 41q0 -41 -37 -41h-1288q-39 0 -39 41t39 41h602v1200h-602q-39 0 -39 41t39 41h1288q37 0 37 -41t-37 -41h-604v-1200h604q37 0 37 -41z" />
+<glyph unicode="⌷" horiz-adv-x="992" d="M888 -72q0 -39 -37 -39h-708q-39 0 -39 39v1310q0 37 39 37h708q37 0 37 -37v-1310zM806 -29v1222h-620v-1222h620z" />
+<glyph unicode="⌸" horiz-adv-x="1591" d="M1488 -72q0 -39 -37 -39h-1308q-39 0 -39 39v1510q0 37 39 37h1308q37 0 37 -37v-1510zM1406 925v468h-1220v-468h1220zM1406 521v322h-1220v-322h1220zM1406 -29v468h-1220v-468h1220z" />
+<glyph unicode="⌹" horiz-adv-x="1591" d="M1488 -72q0 -39 -37 -39h-1308q-39 0 -39 39v1510q0 37 39 37h1308q37 0 37 -37v-1510zM1406 723v670h-1220v-670h1220zM1406 -29v670h-1220v-670h1220zM890 1220q40 -40 40 -95t-40.5 -95.5t-95 -40.5t-93.5 40.5t-39 95.5t38.5 95t94 40t95.5 -40zM930 240 q0 -55 -40.5 -95.5t-95 -40.5t-93.5 40.5t-39 96t38.5 95t94 39.5t95.5 -40t40 -95z" />
+<glyph unicode="⌺" horiz-adv-x="1591" d="M1488 -72q0 -39 -37 -39h-1308q-39 0 -39 39v1510q0 37 39 37h1308q37 0 37 -37v-1510zM1406 1393h-1220v-623l583 582q26 27 52 0l585 -585v626zM1376 681l-581 582l-580 -580l581 -582zM1406 -29v624l-582 -582q-11 -11 -28 -11t-27 11l-583 583v-625h1220z" />
+<glyph unicode="⌻" horiz-adv-x="1591" d="M1488 -72q0 -39 -37 -39h-1308q-39 0 -39 39v1510q0 37 39 37h1308q37 0 37 -37v-1510zM1406 -29v1422h-1220v-1422h1220zM1016 903q92 -92 92 -221.5t-91.5 -221t-221.5 -91.5t-221.5 91.5t-91.5 221.5t91.5 221.5t221 91.5t221.5 -92zM946 531q62 62 62 150t-63 151 t-151 63t-150 -62t-62 -151t62 -151t151 -62t151 62z" />
+<glyph unicode="⌼" horiz-adv-x="1591" d="M1488 -72q0 -39 -37 -39h-1308q-39 0 -39 39v1510q0 37 39 37h1308q37 0 37 -37v-1510zM1406 1393h-1220v-645q25 232 199 389.5t411 157.5t413 -161.5t197 -396.5v656zM1158.5 319q150.5 150 150.5 362t-151.5 363t-363.5 151t-361.5 -150t-149.5 -363t149.5 -363 t362.5 -150t363.5 150zM1406 -29v655q-21 -236 -196 -396.5t-413 -160.5t-412 157.5t-199 389.5v-645h1220z" />
+<glyph unicode="⌽" horiz-adv-x="1591" d="M1320 1079q198 -209 198 -496.5t-198 -497t-483 -225.5v-126q0 -62 -41 -62t-41 62v126q-285 17 -483 226t-198 496.5t197.5 496t483.5 225.5v127q0 61 41 61t41 -61v-127q285 -16 483 -225zM1262 143.5q174 185.5 174 439t-174 438.5t-425 201v-1280q251 16 425 201.5z M329.5 1020.5q-173.5 -184.5 -173.5 -438t174 -438.5t425 -202v1280q-252 -17 -425.5 -201.5z" />
+<glyph unicode="⌾" horiz-adv-x="1578" d="M1222 582q0 -180 -126.5 -306.5t-306.5 -126.5t-306.5 126.5t-126.5 306.5t126.5 306.5t306.5 126.5t306.5 -126.5t126.5 -306.5zM1122 582q0 139 -97 236t-236 97t-236 -97t-97 -236t97 -236t236 -97t236 97t97 236zM1538 582q0 -312 -218.5 -530.5t-530.5 -218.5 t-530.5 218.5t-218.5 530.5t218.5 530.5t530.5 218.5t530.5 -218.5t218.5 -530.5zM1438 582q0 270 -189.5 459.5t-459.5 189.5t-459.5 -189.5t-189.5 -459.5t189.5 -459.5t459.5 -189.5t459.5 189.5t189.5 459.5z" />
+<glyph unicode="⌿" horiz-adv-x="1305" d="M1267 582q0 -41 -37 -41h-558l-174 -478q-17 -47 -46 -47q-40 0 -40 37q0 16 8 38l164 450h-528q-37 0 -37 41t37 41h558l175 479q17 46 45 46q40 0 40 -37q0 -15 -8 -37l-165 -451h529q37 0 37 -41z" />
+<glyph unicode="⍀" horiz-adv-x="1305" d="M1267 582q0 -41 -37 -41h-528l164 -450q8 -22 8 -38q0 -37 -40 -37q-29 0 -46 47l-174 478h-558q-37 0 -37 41t37 41h529l-165 451q-8 22 -8 37q0 37 40 37q28 0 45 -46l175 -479h558q37 0 37 -41z" />
+<glyph unicode="⍁" horiz-adv-x="1591" d="M1488 -72q0 -39 -37 -39h-1308q-39 0 -39 39v1310q0 37 39 37h1308q37 0 37 -37v-1310zM1406 -29v1222h-1220v-1222h1220zM1382 1111l-1114 -1114q-13 -14 -27 -14t-29 15t-15 30q0 14 13 27l1114 1114q12 12 25 12q15 0 30 -15t15 -30q0 -13 -12 -25z" />
+<glyph unicode="⍂" horiz-adv-x="1591" d="M1488 -72q0 -39 -37 -39h-1308q-39 0 -39 39v1310q0 37 39 37h1308q37 0 37 -37v-1310zM1406 -29v1222h-1220v-1222h1220zM1381 55q14 -14 14 -28t-15 -29t-29 -15t-28 14l-1113 1113q-13 13 -13 26q0 14 15 29t30 15q13 0 26 -12z" />
+<glyph unicode="⍃" horiz-adv-x="1591" d="M1488 -72q0 -39 -37 -39h-1308q-39 0 -39 39v1310q0 37 39 37h1308q37 0 37 -37v-1310zM1406 87v990l-1049 -495zM1406 -29v27l-1159 547q-27 13 -27 37t27 37l1159 547v27h-1220v-1222h1220z" />
+<glyph unicode="⍄" horiz-adv-x="1591" d="M1488 -72q0 -39 -39 -39h-1308q-37 0 -37 39v1310q0 37 37 37h1308q39 0 39 -37v-1310zM1406 -29v1222h-1220v-22l1169 -552q27 -13 27 -37t-27 -37l-1169 -552v-22h1220zM1245 582l-1059 499v-998z" />
+<glyph unicode="⍅" d="M1931 582q0 -41 -39 -41h-728v-942q0 -41 -41 -41t-41 41v942h-744q228 -162 288 -432q7 -31 7 -35q0 -24 -21 -27h-41q-14 0 -20 19q-33 175 -142 303.5t-278 192.5q-16 6 -16 20t16 23l46 18q282 122 363 428q3 16 9.5 40.5t26.5 26.5q-9 -1 36 -1q21 0 21 -27 q0 -4 -7 -35q-59 -266 -288 -432h744v944q0 39 41 39t41 -39v-944h728q39 0 39 -41z" />
+<glyph unicode="⍆" d="M1931 582q0 -14 -16 -20q-259 -98 -369 -334q-23 -49 -33 -90l-18 -72q-6 -19 -20 -19h-41q-21 3 -21 27q0 4 7 35q60 270 288 432h-544v-942q0 -41 -41 -41t-41 41v942h-928q-39 0 -39 41t39 41h928v944q0 39 41 39t41 -39v-944h544q-229 166 -288 432q-7 31 -7 35 q0 27 21 27q45 0 36 1q20 -2 24 -19t12 -48q38 -146 132.5 -257.5t230.5 -170.5q16 -5 46 -18q16 -9 16 -23z" />
+<glyph unicode="⍇" horiz-adv-x="1591" d="M1488 -72q0 -39 -37 -39h-1308q-39 0 -39 39v1510q0 37 39 37h1308q37 0 37 -37v-1510zM1406 -29v640h-838q228 -162 288 -432q7 -31 7 -35q0 -24 -21 -27h-41q-14 0 -20 19q-33 175 -142 303.5t-278 192.5q-16 6 -16 20t16 23l46 18q282 122 363 428q3 16 9.5 40.5 t26.5 26.5q-9 -1 36 -1q21 0 21 -27q0 -4 -7 -35q-59 -266 -288 -432h838v700h-1220v-1422h1220z" />
+<glyph unicode="⍈" horiz-adv-x="1591" d="M1488 -72q0 -39 -39 -39h-1308q-37 0 -37 39v1510q0 37 37 37h1308q39 0 39 -37v-1510zM1406 -29v1422h-1220v-700h838q-229 166 -288 432q-7 31 -7 35q0 27 21 27q45 0 36 1q20 -2 24 -19t12 -48q38 -146 132.5 -257.5t230.5 -170.5q16 -5 46 -18q16 -9 16 -23t-16 -20 q-259 -98 -369 -334q-23 -49 -33 -90l-18 -72q-6 -19 -20 -19h-41q-21 3 -21 27q0 4 7 35q60 270 288 432h-838v-640h1220z" />
+<glyph unicode="⍉" horiz-adv-x="1591" d="M471 1228q152 77 333 77t350 -95.5t266.5 -264.5t97.5 -356t-85.5 -349t-240.5 -263l64 -109q15 -27 15 -44.5t-15.5 -26.5t-25.5 -9q-23 0 -46 39l-63 109q-152 -76 -332.5 -76t-350 95t-267 264.5t-97.5 356t85.5 348t240.5 263.5l-64 110q-15 26 -15 43.5t15.5 26.5 t25.5 9q23 0 45 -38zM1151 48q136 90 210.5 233t74.5 308t-86.5 315t-236.5 234.5t-309 84.5t-292 -66zM441 1115q-136 -90 -210.5 -232t-74.5 -307t86.5 -315t236.5 -234.5t309 -84.5t292 66z" />
+<glyph unicode="⍊" horiz-adv-x="1479" d="M1449 225q0 -41 -37 -41h-1345q-39 0 -39 41t39 41h631v1031q0 37 41 37t41 -37v-1031h632q37 0 37 -41zM1449 -172q0 -41 -37 -41h-1345q-39 0 -39 41t39 41h1345q37 0 37 -41z" />
+<glyph unicode="⍋" horiz-adv-x="1694" d="M1596 17q0 -17 -24 -17h-701v-341q0 -41 -41 -41t-41 41v341h-667q-24 0 -24 17q0 6 4 14l687 1385v91q0 39 41 39t41 -39v-21l721 -1455q4 -8 4 -14zM871 146h475l-475 960v-960zM789 146v1126l-558 -1126h558z" />
+<glyph unicode="⍌" horiz-adv-x="1591" d="M1488 -72q0 -39 -37 -39h-1308q-39 0 -39 39v1310q0 37 39 37h1308q37 0 37 -37v-1310zM1406 1193h-1220v-770q168 45 318 187q203 192 259 423q3 17 13 50q6 17 20 17t18.5 -12.5t17.5 -64.5q53 -220 253 -410q153 -145 321 -190v770zM1406 -29v361q-446 163 -610 528 q-164 -365 -610 -528v-361h1220z" />
+<glyph unicode="⍍" horiz-adv-x="1591" d="M1488 -72q0 -39 -37 -39h-1308q-39 0 -39 39v1510q0 37 39 37h1308q37 0 37 -37v-1510zM1406 -29v1422h-1220v-1422h1220zM1319 74q0 -26 -27 -26h-988q-28 0 -28 26q0 6 4 15l473 1121q15 36 45 36t45 -36l472 -1121q4 -9 4 -15zM1119 189l-361 858l-361 -858h722z" />
+<glyph unicode="⍎" horiz-adv-x="1591" d="M1479 41q0 -41 -37 -41h-1288q-39 0 -39 41t39 41h602v241q-160 15 -272.5 135.5t-112.5 284t111.5 286.5t273.5 138v160q0 37 41 37t41 -37v-160q161 -17 271 -139.5t110 -285t-111 -282.5t-270 -137v-241h604q37 0 37 -41zM1142 743q0 130 -87.5 230t-216.5 116v-688 q127 16 215.5 114t88.5 228zM537 974.5q-89 -100.5 -89 -232t89.5 -229.5t218.5 -113v690q-130 -15 -219 -115.5z" />
+<glyph unicode="⍏" horiz-adv-x="1652" d="M1647 482q0 -41 -39 -41h-744v-728q0 -39 -41 -39t-41 39v728h-742q-41 0 -41 41t41 41h742v744q-162 -228 -432 -288q-31 -7 -35 -7q-24 0 -27 21v41q0 14 19 20q175 33 303.5 142t192.5 278q6 16 20 16t23 -16l18 -46q122 -282 428 -363q16 -3 47 -11q18 -5 20 -25 q-1 9 -1 -36q0 -21 -27 -21q-4 0 -35 7q-266 59 -432 288v-744h744q39 0 39 -41z" />
+<glyph unicode="⍐" horiz-adv-x="1591" d="M1488 -72q0 -39 -37 -39h-1308q-39 0 -39 39v1510q0 37 39 37h1308q37 0 37 -37v-1510zM1406 -29v1422h-1220v-1422h569v1156q-163 -228 -432 -288q-32 -7 -35 -7q-24 0 -28 21q1 -3 1 41q0 14 19 20q176 35 305 143q127 108 191 277q6 16 20 16t23 -16q5 -16 18 -46 q95 -221 314 -323q49 -23 89 -33l72 -18q17 -5 20 -25q-1 9 -1 -36q0 -21 -27 -21q-4 0 -35 7q-266 59 -432 288v-1156h569z" />
+<glyph unicode="⍑" horiz-adv-x="1479" d="M1449 1293q0 -41 -37 -41h-1345q-39 0 -39 41t39 41h1345q37 0 37 -41zM1449 896q0 -41 -37 -41h-632v-1031q0 -37 -41 -37t-41 37v1031h-631q-39 0 -39 41t39 41h1345q37 0 37 -41z" />
+<glyph unicode="⍒" horiz-adv-x="1694" d="M1596 1373q0 -6 -4 -14l-687 -1385v-317q0 -39 -41 -39t-41 39v247l-721 1455q-4 8 -4 14q0 17 24 17h701v115q0 41 41 41t41 -41v-115h667q24 0 24 -17zM905 1244v-1126l558 1126h-558zM823 1244h-475l475 -960v960z" />
+<glyph unicode="⍓" horiz-adv-x="1591" d="M1488 -74q0 -37 -39 -37h-1308q-37 0 -37 37v1310q0 39 37 39h1308q39 0 39 -39v-1310zM1406 1193h-1220v-361q446 -163 610 -528q164 365 610 528v361zM1406 -29v770q-168 -45 -318 -187q-203 -192 -259 -423q-3 -17 -13 -50q-6 -17 -20 -17t-18.5 12.5t-17.5 64.5 q-53 220 -253 410q-153 145 -321 190v-770h1220z" />
+<glyph unicode="⍔" horiz-adv-x="1591" d="M1488 -74q0 -37 -39 -37h-1308q-37 0 -37 37v1510q0 39 37 39h1308q39 0 39 -39v-1510zM1406 -29v1422h-1220v-1422h1220zM1316 1290q0 -6 -4 -15l-473 -1121q-15 -36 -45 -36t-45 36l-472 1121q-4 10 -4 15q0 26 27 26h988q28 0 28 -26zM1195 1175h-722l361 -858z" />
+<glyph unicode="⍕" horiz-adv-x="1591" d="M1479 1323q0 -41 -37 -41h-604v-241q159 -17 270 -137t111 -282.5t-110 -285t-271 -139.5v-160q0 -37 -41 -37t-41 37v160q-162 15 -273.5 138.5t-111.5 286.5t112.5 283.5t272.5 135.5v241h-602q-39 0 -39 41t39 41h1288q37 0 37 -41zM1142 621q0 130 -88.5 228 t-215.5 114v-688q129 16 216.5 116t87.5 230zM537.5 851q-89.5 -98 -89.5 -229.5t89 -232t219 -115.5v690q-129 -15 -218.5 -113z" />
+<glyph unicode="⍖" horiz-adv-x="1652" d="M1647 682q0 -41 -39 -41h-744v-744q166 229 432 288q31 7 35 7q27 0 27 -21q0 -45 1 -36q-2 -20 -19 -24t-48 -12q-146 -38 -257.5 -132.5t-170.5 -230.5q-5 -16 -18 -46q-9 -16 -23 -16t-20 16q-98 259 -334 369q-49 23 -90 33l-72 18q-19 6 -19 20v41q3 21 27 21 q4 0 35 -7q270 -60 432 -288v744h-742q-41 0 -41 41t41 41h742v728q0 39 41 39t41 -39v-728h744q39 0 39 -41z" />
+<glyph unicode="⍗" horiz-adv-x="1591" d="M1488 -74q0 -37 -37 -37h-1308q-39 0 -39 37v1510q0 39 39 39h1308q37 0 37 -39v-1510zM1406 -29v1422h-569v-1156q166 229 432 288q31 7 35 7q27 0 27 -21q0 -45 1 -36q-3 -20 -20 -24l-47 -12q-147 -38 -258.5 -132.5t-169.5 -230.5l-18 -46q-9 -16 -23 -16t-20 16 q-97 257 -334 369q-50 23 -90 33l-72 18q-19 6 -19 20q0 44 -1 41q4 21 28 21q3 0 35 -7q269 -60 432 -288v1156h-569v-1422h1220z" />
+<glyph unicode="⍘" horiz-adv-x="1591" d="M1421 382q0 -41 -37 -41h-1175q-39 0 -39 41t39 41h1175q37 0 37 -41zM867.5 1357q28.5 -30 28.5 -73.5t-26 -185.5l-54 -295h-44l-54 296q-23 126 -23 166q0 122 97 122q47 0 75.5 -30z" />
+<glyph unicode="⍙" horiz-adv-x="1694" d="M1596 17q0 -17 -24 -17h-1450q-24 0 -24 17q0 6 4 14l695 1401q17 35 50.5 35t50.5 -35l694 -1401q4 -8 4 -14zM1346 146l-557 1126l-558 -1126h1115zM1611 -268q0 -41 -37 -41h-1445q-39 0 -39 41t39 41h1445q37 0 37 -41z" />
+<glyph unicode="⍚" horiz-adv-x="1591" d="M1421 -259q0 -41 -37 -41h-1175q-39 0 -39 41t39 41h1175q37 0 37 -41zM1550 609q11 -11 11 -27.5t-10 -26.5l-727 -727q-11 -11 -27.5 -11t-27.5 11l-728 729q-10 10 -10 26t11 27l727 727q10 10 26 10t26 -10zM1461 581l-666 666l-664 -664l666 -666z" />
+<glyph unicode="⍛" horiz-adv-x="1591" d="M1421 382q0 -41 -37 -41h-1175q-39 0 -39 41t39 41h1175q37 0 37 -41zM1016 1303q92 -92 92 -221.5t-91.5 -221t-221.5 -91.5t-221.5 91.5t-91.5 221.5t91.5 221.5t221 91.5t221.5 -92zM946 931q62 62 62 150t-63 151t-151 63t-150 -62t-62 -151t62 -151t151 -62t151 62z " />
+<glyph unicode="⍜" horiz-adv-x="1591" d="M1421 -259q0 -41 -37 -41h-1175q-39 0 -39 41t39 41h1175q37 0 37 -41zM1307 1093q211 -212 211 -510.5t-211.5 -511t-509.5 -212.5t-510.5 212.5t-212.5 511.5t211.5 510.5t511 211.5t510.5 -212zM1248.5 129.5q187.5 188.5 187.5 453t-187.5 452.5t-452.5 188 t-452.5 -187.5t-187.5 -452.5t188.5 -453.5t452.5 -188.5t451.5 188.5z" />
+<glyph unicode="⍝" horiz-adv-x="1706" d="M1152.5 1150.5q124.5 -126.5 124.5 -300t-126 -297.5t-298.5 -124t-298 123.5t-125.5 297.5t124.5 300.5t299.5 126.5t299.5 -126.5zM1589 -372q0 -31 -24.5 -50.5t-52.5 -19.5t-50 22.5t-22 47.5v1265q0 239 -173.5 401t-414.5 162t-414.5 -162t-173.5 -401v-1265 q0 -31 -24.5 -50.5t-52.5 -19.5t-50 22.5t-22 47.5v1276q0 298 221 500t519 202t516 -204.5t218 -497.5v-1276zM1200 851q0 142 -102 245.5t-245 103.5t-245 -103.5t-102 -245.5t103 -243.5t244 -101.5t244 101.5t103 243.5z" />
+<glyph unicode="⍞" horiz-adv-x="1591" d="M1488 -72q0 -39 -37 -39h-1308q-39 0 -39 39v1510q0 37 39 37h1308q37 0 37 -37v-1510zM1406 -29v1422h-1220v-1422h1220zM867.5 1257q28.5 -30 28.5 -73.5t-26 -185.5l-54 -295h-44l-54 296q-23 126 -23 166q0 122 97 122q47 0 75.5 -30z" />
+<glyph unicode="⍟" horiz-adv-x="1591" d="M1307 1093q211 -212 211 -510.5t-211.5 -511t-509.5 -212.5t-510.5 212.5t-212.5 511.5t211.5 510.5t511 211.5t510.5 -212zM1248.5 129.5q187.5 188.5 187.5 453t-187.5 452.5t-452.5 188t-452.5 -187.5t-187.5 -452.5t188.5 -453.5t452.5 -188.5t451.5 188.5zM1302 731 q0 -15 -12 -21l-373 -176q201 -369 201 -371q0 -22 -23 -22q-11 0 -14 4l-285 303l-281 -299q-8 -8 -18 -8q-23 0 -23 22q0 3 201 371l-368 174q-17 8 -17 23q0 27 25 22l407 -78l51 410q2 18 22.5 18t23.5 -18l51 -410l407 78q25 5 25 -22z" />
+<glyph unicode="⍠" horiz-adv-x="1591" d="M875 1218.5q34 -33.5 34 -79t-34 -79t-80 -33.5t-79 33.5t-33 80t33 79t79 32.5t80 -33.5zM875 332.5q34 -33.5 34 -80t-33 -79.5t-80.5 -33t-80 33t-32.5 80t32.5 80t79 33t80.5 -33.5zM1488 -72q0 -39 -37 -39h-1308q-39 0 -39 39v1510q0 37 39 37h1308q37 0 37 -37 v-1510zM1406 -29v1422h-1220v-1422h1220z" />
+<glyph unicode="⍡" horiz-adv-x="1591" d="M1479 1203q0 -41 -37 -41h-604v-1243q0 -39 -41 -39t-41 39v1243h-602q-39 0 -39 41t39 41h1288q37 0 37 -41zM1387 1558.5q34 -33.5 34 -79t-34 -79t-80 -33.5t-79 33.5t-33 80t33 79t79 32.5t80 -33.5zM363 1558.5q34 -33.5 34 -79t-34 -79t-80 -33.5t-79 33.5t-33 80 t33 79t79 32.5t80 -33.5z" />
+<glyph unicode="⍢" horiz-adv-x="1694" d="M1596 1173q0 -6 -4 -14l-695 -1401q-17 -35 -50.5 -35t-50.5 35l-694 1401q-4 8 -4 14q0 17 24 17h1450q24 0 24 -17zM1463 1044h-1115l557 -1126zM1387 1562.5q34 -33.5 34 -79t-34 -79t-80 -33.5t-79 33.5t-33 80t33 79t79 32.5t80 -33.5zM463 1562.5q34 -33.5 34 -79 t-34 -79t-80 -33.5t-79 33.5t-33 80t33 79t79 32.5t80 -33.5z" />
+<glyph unicode="⍣" horiz-adv-x="1024" d="M903 1558.5q34 -33.5 34 -79t-34 -79t-79.5 -33.5t-79 33.5t-33.5 80t33 79t79 32.5t80 -33.5zM279 1558.5q34 -33.5 34 -79t-34 -79t-79.5 -33.5t-79 33.5t-33.5 80t33 79t79 32.5t80 -33.5zM1018 731q0 -15 -12 -21l-373 -176q201 -369 201 -371q0 -22 -23 -22 q-10 0 -14 4l-285 303l-281 -299q-8 -8 -18 -8q-23 0 -23 22q0 3 201 371l-368 174q-17 8 -17 23q0 27 25 22l407 -78l51 410q2 18 23 18t23 -18l51 -410l407 78q25 5 25 -22z" />
+<glyph unicode="⍤" horiz-adv-x="1024" d="M903 1558.5q34 -33.5 34 -79t-34 -79t-79.5 -33.5t-79 33.5t-33.5 80t33 79t79 32.5t80 -33.5zM279 1558.5q34 -33.5 34 -79t-34 -79t-79.5 -33.5t-79 33.5t-33.5 80t33 79t79 32.5t80 -33.5zM670 740q66 -67 66 -158t-67 -157t-157.5 -66t-157 65.5t-66.5 156.5 t66.5 158.5t158 67.5t157.5 -67zM615 479.5q44 43.5 44 102.5t-44 103.5t-103 44.5t-103 -44.5t-44 -103.5t44 -102.5t103 -43.5t103 43.5z" />
+<glyph unicode="⍥" horiz-adv-x="1591" d="M1187 1558.5q34 -33.5 34 -79t-34 -79t-80 -33.5t-79 33.5t-33 80t33 79t79 32.5t80 -33.5zM563 1558.5q34 -33.5 34 -79t-34 -79t-80 -33.5t-79 33.5t-33 80t33 79t79 32.5t80 -33.5zM1307 1093q211 -212 211 -510.5t-211.5 -511t-509.5 -212.5t-510.5 212.5 t-212.5 511.5t211.5 510.5t511 211.5t510.5 -212zM1248.5 129.5q187.5 188.5 187.5 453t-187.5 452.5t-452.5 188t-452.5 -187.5t-187.5 -452.5t188.5 -453.5t452.5 -188.5t451.5 188.5z" />
+<glyph unicode="⍦" horiz-adv-x="1364" d="M1249 546q0 -193 -171 -315q-149 -106 -355 -118v-197q0 -61 -41 -61t-41 61v197q-206 12 -355 119q-171 122 -171 314v799q0 37 41 37t41 -37v-792q0 -161 145 -261q124 -85 299 -97v998q0 62 41 62t41 -62v-998q174 12 299 97q145 100 145 261v792q0 37 41 37t41 -37 v-799z" />
+<glyph unicode="⍧" horiz-adv-x="1591" d="M1421 41q0 -41 -39 -41h-418v-201q0 -41 -41 -41t-41 41v201h-90q-248 0 -435 168.5t-187 413.5t187 413.5t435 168.5h90v203q0 39 41 39t41 -39v-203h418q39 0 39 -41t-39 -41h-418v-1000h418q39 0 39 -41zM882 82v1000h-84q-216 0 -381 -143.5t-165 -356.5t165 -356.5 t381 -143.5h84z" />
+<glyph unicode="⍨" horiz-adv-x="1591" d="M1477 746q0 -152 -96 -271.5t-244 -119.5q-114 0 -238 88l-208 164q-123 88 -236 88q-162 0 -245 -147q-29 -52 -38 -142q-5 -51 -29 -51q-28 0 -28 63q0 152 95.5 271.5t244.5 119.5q115 0 240 -88l207 -164q124 -88 235 -88q85 0 156 50t104 130q15 36 21 98t30 62 q29 0 29 -63zM1393 1508.5q34 -33.5 34 -79t-34 -79t-79.5 -33.5t-79 33.5t-33.5 80t33 79t79 32.5t80 -33.5zM369 1508.5q34 -33.5 34 -79t-34 -79t-79.5 -33.5t-79 33.5t-33.5 80t33 79t79 32.5t80 -33.5z" />
+<glyph unicode="⍩" horiz-adv-x="1591" d="M1421 582q0 -24 -27 -37l-1169 -552q-6 -3 -14 -3q-41 0 -41 41q0 26 24 37l1090 514l-1090 514q-24 11 -24 37q0 41 41 41q8 0 14 -3l1169 -552q27 -13 27 -37zM1393 1508.5q34 -33.5 34 -79t-34 -79t-79.5 -33.5t-79 33.5t-33.5 80t33 79t79 32.5t80 -33.5zM369 1508.5 q34 -33.5 34 -79t-34 -79t-79.5 -33.5t-79 33.5t-33.5 80t33 79t79 32.5t80 -33.5z" />
+<glyph unicode="⍪" horiz-adv-x="1591" d="M1421 582q0 -41 -37 -41h-1175q-39 0 -39 41t39 41h1175q37 0 37 -41zM958 50q0 -233 -298 -331v44q91 30 153.5 98.5t62.5 158.5q0 41 -23 41q-10 0 -37.5 -14.5t-48.5 -14.5q-107 0 -107 109q0 51 38.5 85t90.5 34q78 0 123.5 -64.5t45.5 -145.5z" />
+<glyph unicode="⍫" horiz-adv-x="1694" d="M1596 1373q0 -6 -4 -14l-425 -857q20 -3 40 -3q85 0 156 50t104 130q15 36 21 98t30 62q29 0 29 -63q0 -152 -96 -271.5t-244 -119.5q-46 0 -92 13l-218 -440q-17 -35 -50.5 -35t-50.5 35l-370 748q-95 -38 -146 -128q-29 -52 -38 -142q-5 -51 -29 -51q-28 0 -28 63 q0 109 52 207t141 147l-276 557q-4 8 -4 14q0 17 24 17h1450q24 0 24 -17zM1463 1244h-1115l201 -406q124 -9 299 -151.5t255 -169.5zM1055 421q-65 31 -208.5 149t-236.5 143l295 -595z" />
+<glyph unicode="⍬" horiz-adv-x="1326" d="M1276 885q0 -100 -50 -191.5t-137 -133.5q-30 -225 -117 -378q-118 -206 -309 -206q-222 0 -344 277q-94 214 -94 471q0 32 3 78q-106 -65 -127 -223q-6 -46 -26 -46q-25 0 -25 56q0 102 50.5 193.5t138.5 132.5q32 224 118 373q116 201 306 201q224 0 344 -279 q94 -217 94 -490q0 -24 -1 -46q74 46 104 123q11 28 18.5 86t27.5 58q26 0 26 -56zM941 736q0 226 -48 414q-73 285 -230 285q-213 0 -266 -496q107 -15 271 -152.5t270 -149.5q3 54 3 99zM385 737q0 -227 48 -418q74 -289 230 -289q214 0 267 505q-105 15 -270 152.5 t-272 149.5q-3 -53 -3 -100z" />
+<glyph unicode="⍭" horiz-adv-x="1221" d="M1150 812q0 -123 -78 -220.5t-191.5 -97.5t-239.5 101v-996q0 -41 -41 -41t-41 41v1063q-129 104 -232 104q-128 0 -191 -115q-19 -32 -30 -111q-7 -46 -28 -46q-28 0 -28 56q0 124 76 217q80 101 193.5 101t239.5 -100v799q0 39 41 39t41 -39v-866q130 -105 232 -105 q78 0 139.5 52.5t75.5 129.5q4 27 7 53q8 37 27 37q28 0 28 -56z" />
+<glyph unicode="⍮" horiz-adv-x="1251" d="M728 1105q0 -46 -32.5 -78.5t-79 -32.5t-78.5 32.5t-32 78.5t32 78t78.5 32t79 -32t32.5 -78zM1135 41q0 -41 -37 -41h-471q-61 -42 -150 -71v44q34 11 63 27h-386q-39 0 -39 41t39 41h485q54 70 54 148q0 41 -23 41q-11 0 -38.5 -14.5t-47.5 -14.5q-107 0 -107 109 q0 51 38 85t91 34q77 0 123 -64.5t46 -152.5t-62 -171h385q37 0 37 -41z" />
+<glyph unicode="⍯" horiz-adv-x="1591" d="M1488 -72q0 -39 -37 -39h-1308q-39 0 -39 39v1510q0 37 39 37h1308q37 0 37 -37v-1510zM1406 923v470h-1220v-470h670l119 206q23 39 45 39q41 0 41 -38q0 -16 -15 -42l-95 -165h455zM1406 523v318h-503l-183 -318h686zM186 841v-318h439l184 318h-623zM1406 -29v470 h-734l-176 -305q-23 -40 -46 -40q-41 0 -41 38q0 15 16 43l153 264h-392v-470h1220z" />
+<glyph unicode="⍰" horiz-adv-x="1591" d="M1488 -72q0 -39 -37 -39h-1308q-39 0 -39 39v1510q0 37 39 37h1308q37 0 37 -37v-1510zM1406 -29v1422h-1220v-1422h1220zM1089 994q0 -123 -112 -250.5t-135 -167.5q-45 -74 -51 -184h-33q6 106 28.5 175t88.5 195t66 217t-49 156.5t-137 65.5q-54 0 -101.5 -27 t-47.5 -77q0 -27 24 -72.5t24 -66.5q0 -68 -64 -68q-43 0 -65.5 40t-22.5 86q0 108 93 172q82 58 194 58q165 0 243 -96q57 -71 57 -156zM843.5 267q25.5 -26 25.5 -63.5t-26 -63.5t-63 -26t-63 26t-26 63.5t25.5 63.5t63.5 26t63.5 -26z" />
+<glyph unicode="⍱" horiz-adv-x="1364" d="M1249 1184q0 -10 -2 -15l-250 -565q134 38 158 174q3 26 9 58t25 32q28 0 28 -56q0 -121 -75.5 -217.5t-193.5 -100.5l-227 -514q-11 -25 -36 -25t-40 25q-1 1 -30 67l-311 698q-66 -31 -95 -84q-23 -40 -36 -121q-8 -46 -28 -46q-28 0 -28 56q0 192 149 282 q-151 342 -151 352q0 41 41 41q28 0 39 -25l149 -337q25 5 50 5q113 0 267.5 -128t243.5 -141l266 601q11 25 37 25q41 0 41 -41zM863 505q-69 21 -217 143q-142 118 -250 118h-9l295 -670z" />
+<glyph unicode="⍲" horiz-adv-x="1364" d="M1249 -4q0 -41 -41 -41q-26 0 -37 25l-266 601q-89 -13 -243.5 -141t-267.5 -128q-25 0 -50 5l-149 -337q-11 -25 -39 -25q-41 0 -41 41q0 10 151 352q-149 90 -149 282q0 56 28 56q20 0 28 -46q13 -81 36 -121q29 -53 95 -84l311 698q9 23 30 67q15 25 40 25t36 -25 l227 -514q118 -4 193.5 -100.5t75.5 -217.5q0 -56 -28 -56q-19 0 -25 32t-9 58q-24 136 -158 174l250 -565q2 -5 2 -15zM863 675l-181 409l-295 -670h9q108 0 250 118q148 122 217 143z" />
+<glyph unicode="⍳" horiz-adv-x="748" d="M695 266q0 -114 -48 -194q-58 -96 -164 -96q-133 0 -203 78t-70 212v473q0 86 -41 106q-20 11 -103 11h-14v67l299 23v-685q0 -231 148 -231q102 0 131 139q12 56 12 182v37h53v-122z" />
+<glyph unicode="⍴" horiz-adv-x="990" d="M184 818q107 142 305 142t323.5 -138.5t125.5 -340t-127.5 -353.5t-329.5 -152q-145 0 -245 113q0 -23 0.5 -79.5t0.5 -84.5q0 -214 -36 -342h-149q37 173 37 311v589q0 209 95 335zM775 406q0 187 -65 326q-84 180 -250 180q-108 0 -166 -84.5t-58 -197.5v-344 q0 -110 89 -183t201 -73q249 0 249 376z" />
+<glyph unicode="⍵" horiz-adv-x="1328" d="M1276 430q0 -173 -79 -302q-93 -152 -255 -152q-185 0 -278 219q-93 -219 -278 -219q-162 0 -255 152q-79 129 -79 302q0 245 124.5 386t365.5 144v-48q-327 -10 -327 -470q0 -412 202 -412q135 0 224 241q-67 140 -67 291q0 219 90 219t90 -219q0 -151 -67 -291 q89 -241 224 -241q202 0 202 412q0 460 -327 470v48q241 -3 365.5 -144.5t124.5 -385.5z" />
+<glyph unicode="⍶" horiz-adv-x="1250" d="M1197 190q0 -84 -46.5 -143t-128.5 -59q-125 0 -173 162q-161 -174 -357 -174t-318 143.5t-122 341t126.5 348.5t321.5 151q160 0 255 -98q75 -78 119 -232q9 -34 58 -273q49 97 77.5 247t28.5 274q0 72 43 72q47 0 47 -72q0 -125 -54.5 -299t-124.5 -293 q49 -233 118 -233q79 0 79 173l-3 85h54v-121zM467 912q-135 0 -200 -121q-52 -96 -52 -262.5t67 -311.5q87 -187 245 -187t307 177l-61 266q-46 196 -106 298q-81 141 -200 141zM1181 -268q0 -41 -37 -41h-1055q-39 0 -39 41t39 41h1055q37 0 37 -41z" />
+<glyph unicode="⍷" horiz-adv-x="883" d="M802 280q28 0 28 -28.5t-34 -86.5q-110 -189 -326 -189q-148 0 -270 66q-148 80 -148 216q0 177 263 238q-93 22 -154 84t-61 153q0 123 132 182q98 45 221 45t210 -28q123 -40 123 -122q0 -33 -24.5 -55.5t-60.5 -22.5t-67 47q-52 77 -61 86q-47 47 -126 47 q-202 0 -202 -194q0 -188 199 -188q22 0 63 11t63 11q86 0 86 -55.5t-87 -55.5q-21 0 -62.5 11t-62.5 11q-214 0 -214 -205q0 -228 255 -228q204 0 290 221q11 29 27 29zM851 -268q0 -41 -37 -41h-735q-39 0 -39 41t39 41h735q37 0 37 -41z" />
+<glyph unicode="⍸" horiz-adv-x="748" d="M695 266q0 -114 -48 -194q-58 -96 -164 -96q-133 0 -203 78t-70 212v473q0 86 -41 106q-20 11 -103 11h-14v67l299 23v-685q0 -231 148 -231q102 0 131 139q12 56 12 182v37h53v-122zM711 -268q0 -41 -37 -41h-595q-39 0 -39 41t39 41h595q37 0 37 -41z" />
+<glyph unicode="⍹" horiz-adv-x="1328" d="M1276 430q0 -173 -79 -302q-93 -152 -255 -152q-185 0 -278 219q-93 -219 -278 -219q-162 0 -255 152q-79 129 -79 302q0 245 124.5 386t365.5 144v-48q-327 -10 -327 -470q0 -412 202 -412q135 0 224 241q-67 140 -67 291q0 219 90 219t90 -219q0 -151 -67 -291 q89 -241 224 -241q202 0 202 412q0 460 -327 470v48q241 -3 365.5 -144.5t124.5 -385.5zM1271 -268q0 -41 -37 -41h-1135q-39 0 -39 41t39 41h1135q37 0 37 -41z" />
+<glyph unicode="⍺" horiz-adv-x="1250" d="M1197 190q0 -84 -46.5 -143t-128.5 -59q-125 0 -173 162q-161 -174 -357 -174t-318 143.5t-122 341t126.5 348.5t321.5 151q160 0 255 -98q75 -78 119 -232q9 -34 58 -273q49 97 77.5 247t28.5 274q0 72 43 72q47 0 47 -72q0 -125 -54.5 -299t-124.5 -293 q49 -233 118 -233q79 0 79 173l-3 85h54v-121zM467 912q-135 0 -200 -121q-52 -96 -52 -262.5t67 -311.5q87 -187 245 -187t307 177l-61 266q-46 196 -106 298q-81 141 -200 141z" />
+<glyph unicode="⍻" horiz-adv-x="1546" d="M1411 782q0 -41 -37 -41h-432q-554 -783 -617 -783q-79 0 -147 191q-58 161 -58 262q0 40 36.5 68t68.5 28t49 -11q7 -4 48.5 -121t97.5 -117q35 0 372 483h-393q-39 0 -39 41t39 41h450l185 264l117 156q39 46 104 92t111 46q16 0 16 -20t-48 -81l-87 -109 q-22 -29 -247 -348h374q37 0 37 -41z" />
+<glyph unicode="⍼" horiz-adv-x="1858" d="M1719 41q0 -41 -68 -41h-1019q-106 -145 -106 -229v-35q107 127 253 179q8 3 15 3q39 0 39 -42q0 -24 -23 -34l-62 -27q-149 -75 -237 -230q-15 -27 -26 -27t-26 27q-87 154 -236 230l-58 25q-26 12 -26 36q0 42 39 42q7 0 15 -3q144 -52 251 -178v34q0 99 90 229h-22 q-61 0 -66 35q-2 11 -2 33v532q-112 100 -158 162q-73 97 -73 197.5t73 197.5q46 62 158 160v20q0 68 41 68t41 -68v-700q110 -97 157 -162q72 -98 72 -193t-66 -200h962q68 0 68 -41zM444 1209q-149 -139 -149 -249.5t149 -249.5v499zM673 277q0 111 -147 250v-445h66 q81 117 81 195z" />
+<glyph unicode="⍽" horiz-adv-x="1591" d="M1563 969q0 -41 -37 -41h-238v-889q0 -39 -37 -39h-908q-39 0 -39 39v929h-237q-39 0 -39 41t39 41h282q37 0 37 -39v-929h820v891q0 37 37 37h283q37 0 37 -41z" />
+<glyph unicode="⍾" horiz-adv-x="1628" d="M1523 517q0 -41 -68 -41h-348v-395h238q37 0 37 -41t-37 -41h-283q-37 0 -37 37v440h-421v-437q0 -39 -37 -39h-282q-39 0 -39 41t39 41h237v394h-349q-68 0 -68 41q0 296 206.5 502t502.5 206t502.5 -206t206.5 -502zM814 1155q-255 0 -438 -172.5t-199 -424.5h1274 q-16 252 -199 424.5t-438 172.5z" />
+<glyph unicode="⍿" horiz-adv-x="626" d="M585 582q0 -103 -65.5 -178.5t-165.5 -90.5v-714q0 -41 -41 -41t-41 41v714q-100 15 -165.5 90.5t-65.5 178.5t65.5 178.5t165.5 90.5v716q0 39 41 39t41 -39v-716q100 -15 165.5 -90.5t65.5 -178.5z" />
+<glyph unicode="⎀" horiz-adv-x="1364" d="M1249 807q0 -11 -2 -16l-526 -1188q-11 -25 -39 -25t-39 25l-526 1188q-2 5 -2 16q0 41 41 41q26 0 37 -25l489 -1103l489 1103q11 25 37 25q41 0 41 -41zM1053 1056q0 -59 -38.5 -101.5t-103.5 -42.5q-98 0 -129 97q-67 -105 -206 -105q-97 0 -171 34q-95 44 -95 128 q0 125 165 194q99 41 289 51v43q0 70 -42.5 121t-127 51t-140.5 -47q70 -13 70 -74q0 -75 -84.5 -75t-84.5 76q0 81 80.5 126.5t172.5 45.5q141 0 227 -82q60 -57 60 -174v-284q0 -62 49 -62t49 106q0 18 -2 64h62v-90zM764 1129v132q-124 -6 -208 -48q-103 -52 -103 -145 q0 -47 39 -79.5t106 -32.5t116.5 51t49.5 122z" />
+<glyph unicode="⎁" d="M1878 324q0 -41 -31 -72t-72.5 -31t-72 30.5t-30.5 73t30 72t72 29.5t73 -30.5t31 -71.5zM1555 324q0 -41 -31 -72t-72.5 -31t-72 30.5t-30.5 73t30 72t72 29.5t73 -30.5t31 -71.5zM1201.5 396.5q30.5 -30.5 30.5 -73t-30 -72.5t-73 -30t-73 30t-30 73t30 73t72.5 30 t73 -30.5zM913 365q0 -59 -38.5 -101.5t-103.5 -42.5q-98 0 -129 97q-67 -105 -206 -105q-97 0 -171 34q-95 44 -95 128q0 125 165 194q99 41 289 51v43q0 70 -42.5 121t-127 51t-140.5 -47q70 -13 70 -74q0 -75 -84.5 -75t-84.5 76q0 81 80.5 126.5t172.5 45.5 q141 0 227 -82q60 -57 60 -174v-284q0 -62 49 -62t49 106q0 18 -2 64h62v-90zM1878 41q0 -41 -37 -41h-1632q-39 0 -39 41t39 41h1632q37 0 37 -41zM624 438v132q-124 -6 -208 -48q-103 -52 -103 -145q0 -47 39 -79.5t106 -32.5t116.5 51t49.5 122z" />
+<glyph unicode="⎂" d="M1843 365q0 -59 -38.5 -101.5t-103.5 -42.5q-98 0 -129 97q-67 -105 -206 -105q-97 0 -171 34q-95 44 -95 128q0 125 165 194q100 41 289 51v43q0 70 -42.5 121t-127 51t-140.5 -47q70 -13 70 -74q0 -75 -84.5 -75t-84.5 76q0 81 80.5 126.5t172.5 45.5q141 0 227 -82 q60 -57 60 -174v-284q0 -62 49 -62t49 106q0 18 -2 64h62v-90zM1878 41q0 -41 -37 -41h-702q-39 0 -39 41t39 41h702q37 0 37 -41zM913 365q0 -59 -38.5 -101.5t-103.5 -42.5q-98 0 -129 97q-67 -105 -206 -105q-97 0 -171 34q-95 44 -95 128q0 125 165 194q100 41 289 51 v43q0 70 -42.5 121t-127 51t-140.5 -47q70 -13 70 -74q0 -75 -84.5 -75t-84.5 76q0 81 80.5 126.5t172.5 45.5q141 0 227 -82q60 -57 60 -174v-284q0 -62 49 -62t49 106q0 18 -2 64h62v-90zM948 41q0 -41 -37 -41h-702q-39 0 -39 41t39 41h702q37 0 37 -41zM1554 438v132 q-124 -6 -208 -48q-103 -52 -103 -145q0 -47 39 -79.5t106 -32.5t116.5 51t49.5 122zM624 438v132q-124 -6 -208 -48q-103 -52 -103 -145q0 -47 39 -79.5t106 -32.5t116.5 51t49.5 122z" />
+<glyph unicode="⎃" horiz-adv-x="1992" d="M1426 1245l-181 -313q-23 37 -56 66l166 288q11 20 29 20q11 0 25 -8q36 -21 17 -53zM1822 582q0 -41 -37 -41h-326v82h326q37 0 37 -41zM775 1048q-40 -18 -71 -42l-137 237q-7 12 -7 23q0 18 23 32q14 7 25 7q18 0 30 -21zM1373 446q0 -59 -38.5 -101.5t-103.5 -42.5 q-98 0 -129 97q-67 -105 -206 -105q-97 0 -171 34q-95 44 -95 128q0 125 165 194q99 41 289 51v43q0 70 -42.5 121t-127 51t-140.5 -47q70 -13 70 -74q0 -75 -84.5 -75t-84.5 76q0 81 80.5 126.5t172.5 45.5q141 0 227 -82q60 -57 60 -174v-284q0 -62 49 -62t49 106 q0 18 -2 64h62v-90zM1171 196q24 -5 48.5 -5t47.5 4l159 -276q7 -11 7 -21q0 -18 -24 -32q-14 -8 -25 -8q-18 0 -29 20zM209 541q-39 0 -39 41t39 41h401q-29 -38 -44 -82h-357zM818 192l-180 -312q-12 -21 -30 -21q-11 0 -25 7q-23 14 -23 32q0 11 7 23l171 296 q38 -16 80 -25zM1084 519v132q-124 -6 -208 -48q-103 -52 -103 -145q0 -47 39 -79.5t106 -32.5t116.5 51t49.5 122z" />
+<glyph unicode="⎄" horiz-adv-x="1920" d="M1618.5 1182q201.5 -204 201.5 -488t-202 -489t-485 -205h-996q-37 0 -37 37v1314q0 35 37 35h995q285 0 486.5 -204zM1575 274q166 178 166 419.5t-166 419t-407 193.5v-1226q241 16 407 194zM680 1113.5q-166 -177.5 -166 -420t167 -420t408 -193.5v1226 q-243 -15 -409 -192.5zM536 334.5q-101 165.5 -101 359t100 358.5t272 255h-628v-1228h630q-172 90 -273 255.5z" />
+<glyph unicode="⎅" horiz-adv-x="1584" d="M1484 37q0 -37 -35 -37h-619v-194q0 -36 -40 -36t-40 36v194h-613q-37 0 -37 37v1314q0 35 37 35h613v165q0 38 40 38t40 -38v-165h619q35 0 35 -35v-1314zM1405 79v1228h-575v-1228h575zM750 79v1228h-571v-1228h571z" />
+<glyph unicode="⎆" d="M2018 610q11 -11 11 -27.5t-10 -26.5l-925 -925q-11 -11 -27.5 -11t-27.5 11l-693 693h116l605 -604l862 862l-864 864l-605 -605l-116 1l695 694q10 10 26 10t26 -10zM1335 582q0 -23 -32 -38q-116 -53 -185 -112t-156 -170q-18 -23 -38 -23q-36 0 -36 47v137h-757 q-61 0 -61 59v200q0 59 61 59l757 -1v138q0 47 36 47q20 0 38 -23q87 -111 156 -170t185 -112q32 -15 32 -38zM970 729q0 -30 -22 -50t-50 -20h-746v-154h746q28 0 50 -20t22 -50v-30q88 103 223 177q-135 74 -223 177v-30z" />
+<glyph unicode="⎇" horiz-adv-x="1784" d="M1535 718q0 -11 -27 -26q-154 -87 -230 -236l-25 -58q-12 -26 -36 -26q-42 0 -42 39q0 7 3 15q52 144 178 251h-349q-94 0 -142 -169l-94 -332q-75 -176 -227 -176h-333q-41 0 -41 41t41 41h333q114 0 171 176l88 325q67 176 204 176h350q-127 107 -179 253q-3 8 -3 15 q0 39 42 39q24 0 34 -23l27 -62q75 -149 230 -237q27 -15 27 -26zM1614 41q0 -41 -37 -41h-696q-39 0 -39 41t39 41h696q37 0 37 -41z" />
+<glyph unicode="⎈" horiz-adv-x="1991" d="M1821 582q0 -41 -37 -41h-168q-14 -209 -153 -369l119 -119q26 -26 -3 -55t-55 -3l-119 119q-159 -140 -368 -154v-165q0 -39 -41 -39t-41 39v165q-210 15 -369 155l-118 -118q-13 -14 -27 -14t-29 15t-15 30q0 14 13 27l118 118q-139 159 -153 368h-166q-39 0 -39 41 t39 41h166q13 210 152 369l-117 117q-13 13 -13 27q0 15 15 30t29 15t27 -14l117 -117q159 140 370 154v167q0 37 41 37t41 -37v-167q210 -14 369 -154l118 119q26 26 55 -3t3 -55l-118 -119q138 -159 152 -369h168q37 0 37 -41zM1348 992q-135 116 -311 130v-441zM1534 623 q-13 176 -129 311l-311 -311h440zM955 681v440q-177 -13 -312 -129zM1534 541h-440l311 -311q116 135 129 311zM897 623l-311 311q-116 -135 -129 -311h440zM1347 172l-310 311v-441q175 14 310 130zM897 541h-440q13 -175 129 -310zM955 43v440l-311 -310 q135 -117 311 -130z" />
+<glyph unicode="⎉" horiz-adv-x="1591" d="M1307 1093q211 -212 211 -510.5t-211.5 -511t-509.5 -212.5t-510.5 212.5t-212.5 511.5t211.5 510.5t511 211.5t510.5 -212zM1234.5 1048.5q-184.5 174.5 -438.5 174.5t-438.5 -174t-200.5 -426h241q23 0 35 -20l363 -590l363 590q12 20 35 20h241q-16 251 -200.5 425.5z M1435 541h-218l-368 -598q236 19 403.5 190t182.5 408zM743 -57l-368 598h-218q15 -236 182.5 -407t403.5 -191z" />
+<glyph unicode="⎊" horiz-adv-x="1591" d="M1307 1093q211 -212 211 -510.5t-211.5 -511t-509.5 -212.5t-510.5 212.5t-212.5 511.5t211.5 510.5t511 211.5t510.5 -212zM1248.5 129.5q187.5 188.5 187.5 453t-187.5 452.5t-452.5 188t-452.5 -187.5t-187.5 -452.5t188.5 -453.5t452.5 -188.5t451.5 188.5zM1432 588 q0 -18 -17 -35l-589 -591q-12 -12 -29 -12t-29 12l-591 591q-17 17 -17 35q0 35 46 35h1180q46 0 46 -35zM1287 541h-982l492 -492z" />
+<glyph unicode="⎋" horiz-adv-x="1591" d="M1307 1093q211 -211 211 -510.5t-211.5 -511t-511.5 -211.5t-510 210.5t-210 510.5q0 222 121 403q20 -58 30 -110q-69 -135 -69 -293q0 -266 186 -452.5t452 -186.5t453.5 187.5t187.5 453t-187 452.5t-452 187q-157 0 -293 -70q-52 10 -110 30q181 122 403 122 q299 0 510 -211zM336 771q0 126 -55 272q-5 14 -5 25q0 15 9.5 24.5t24.5 9.5q11 0 25 -5q146 -55 272 -55q65 0 168 13q28 3 44 -11q11 -11 11 -23q0 -16 -19 -35l-180 -181l610 -610q12 -12 12 -25q0 -15 -15 -30t-30 -15q-13 0 -25 12l-610 610l-181 -180 q-18 -18 -34 -18q-14 0 -26 12q-12 15 -9 42q13 103 13 168zM669 960q-28 -2 -56 -2q-110 0 -227 34q34 -117 34 -227q0 -28 -2 -56z" />
+<glyph unicode="⎌" horiz-adv-x="1592" d="M1488 936q0 -39 -42 -39q-28 0 -39 32q-12 43 -54 139q-76 138 -212 221t-292 83q-316 0 -484 -255q-23 -52 -74 -140q33 2 76.5 2t147 -23.5t103.5 -66t-37 -42.5l-79 28q-79 28 -161.5 28t-168.5 -23q-19 -5 -25 -5q-17 0 -17 17q0 6 14 58.5t14 135.5t-27 161l-27 77 q0 38 42 38q48 0 69 -117q18 -98 18 -174q0 -14 -1 -28q181 411 617 411q204 0 413 -155q226 -166 226 -363zM1404 503q87 -87 87 -209t-86 -208t-209 -86t-209 86t-86 209t86 209t208 86t209 -87zM604 503q87 -87 87 -209t-86 -208t-209 -86t-209 86t-86 209t86 209t208 86 t209 -87zM1347 144q62 62 62 150t-63 151t-151 63t-150 -62t-62 -151t62 -151t151 -62t151 62zM547 144q62 62 62 150t-63 151t-151 63t-150 -62t-62 -151t62 -151t151 -62t151 62z" />
+<glyph unicode="⎍" horiz-adv-x="1591" d="M1463 41q0 -41 -37 -41h-283q-37 0 -37 37v1231h-620v-1229q0 -39 -37 -39h-282q-39 0 -39 41t39 41h237v1229q0 39 39 39h708q37 0 37 -39v-1229h238q37 0 37 -41z" />
+<glyph unicode="⎎" horiz-adv-x="1748" d="M1648 1309q0 -41 -63 -41q-173 0 -271.5 -110t-98.5 -285v-441q0 -182 -135 -307t-318 -125h-621q-41 0 -41 41t41 41h21q149 0 260 101t111 249v441q0 209 122.5 343t329.5 134h622q41 0 41 -41zM985 1268q-173 0 -271.5 -110t-98.5 -285v-441q0 -221 -188 -350h335 q149 0 260 101t111 249v441q0 264 181 395h-329z" />
+<glyph unicode="⎏" horiz-adv-x="1591" d="M1466 707q9 -9 9 -26t-11 -28l-643 -643q-10 -10 -26 -10t-26 10l-642 642q-12 12 -12 27.5t10 25.5l573 573h-524q-39 0 -39 41t39 41h1245q37 0 37 -41t-37 -41h-524zM1376 681l-580 580l-581 -582l580 -580z" />
+<glyph unicode="⎐" horiz-adv-x="1591" d="M1464 707q11 -11 11 -28t-9 -26l-571 -571h524q37 0 37 -41t-37 -41h-1245q-39 0 -39 41t39 41h524l-573 573q-10 10 -10 25.5t12 27.5l642 642q10 10 26 10t26 -10zM1376 679l-581 582l-580 -580l581 -582z" />
+<glyph unicode="⎑" horiz-adv-x="1591" d="M1466 707q9 -9 9 -26t-11 -28l-643 -643q-10 -10 -26 -10t-26 10l-642 642q-12 12 -12 27.5t10 25.5l573 573h-524q-39 0 -39 41t39 41h1245q37 0 37 -41t-37 -41h-524zM1336 721l-540 540l-539 -540h1079zM1334 639h-1079l540 -540z" />
+<glyph unicode="⎒" horiz-adv-x="1591" d="M1464 707q11 -11 11 -28t-9 -26l-571 -571h524q37 0 37 -41t-37 -41h-1245q-39 0 -39 41t39 41h524l-573 573q-10 10 -10 25.5t12 27.5l642 642q10 10 26 10t26 -10zM1334 721l-539 540l-540 -540h1079zM1336 639h-1079l539 -540z" />
+<glyph unicode="⎓" horiz-adv-x="1591" d="M1456 432q0 -41 -37 -41h-283q-39 0 -39 41t39 41h283q37 0 37 -41zM1456 732q0 -41 -37 -41h-1245q-39 0 -39 41t39 41h1245q37 0 37 -41zM975 432q0 -41 -37 -41h-283q-39 0 -39 41t39 41h283q37 0 37 -41zM494 432q0 -41 -37 -41h-283q-39 0 -39 41t39 41h283 q37 0 37 -41z" />
+<glyph unicode="⎔" horiz-adv-x="1654" d="M1636 582l-404 -702h-810l-404 702l404 702h810zM1521 582l-347 602h-694l-347 -602l347 -602h694z" />
+<glyph unicode="⎕" horiz-adv-x="1591" d="M1488 39q0 -39 -37 -39h-1308q-39 0 -39 39v1310q0 37 39 37h1308q37 0 37 -37v-1310zM1406 82v1222h-1220v-1222h1220z" />
+<glyph unicode="⎖" horiz-adv-x="700" d="M621 1344l-468 -698h-22l210 698h280z" />
+<glyph unicode="⎗" horiz-adv-x="1760" d="M1248 1292h-82v106h-106v82h147q41 0 41 -41v-147zM952 1398h-224v82h224v-82zM620 1398h-224v82h224v-82zM288 1398h-106v-106h-82v147q0 41 41 41h147v-82zM1660 -359q0 -41 -41 -41h-1066q-41 0 -41 41v359h-116v82h116v437l-47 29l-82 -145l-168 387l297 34v215 q0 41 41 41h613v104h82v-104h371q41 0 41 -41v-1398zM182 960h-82v224h82v-224zM182 628h-82v224h82v-224zM182 296h-82v224h82v-224zM288 0h-147q-41 0 -41 41v147h82v-106h106v-82zM1578 -318v1316h-984v-164l46 5l-46 -81v-104q141 -93 260 -129q108 -32 258 -32h34v-149 q-18 -1 -63 -1q-239 0 -489 130v-791h984z" />
+<glyph unicode="⎘" horiz-adv-x="1760" d="M1660 892h-82v106h-106v82h147q41 0 41 -41v-147zM1660 560h-82v224h82v-224zM1032 998h-224v82h224v-82zM1660 228h-82v224h82v-224zM1660 -104h-82v224h82v-224zM700 998h-106v-106h-82v147q0 41 41 41h147v-82zM1364 998h-224v82h26v318h-984v-1316h330v38h82v-224 h-82v104h-371q-41 0 -41 41v1398q0 41 41 41h1066q41 0 41 -41v-359h116v-82zM594 560h-82v33q-58 6 -122 6h-33v149q18 1 62 1t93 -5v40h82v-51q212 -41 444 -189l83 145l167 -387l-425 -49l89 156q-202 139 -358 172v-21zM1660 -359q0 -41 -41 -41h-147v82h106v106h82 v-147zM594 228h-82v224h82v-224zM1364 -400h-224v82h224v-82zM1032 -400h-224v82h224v-82zM700 -400h-147q-41 0 -41 41v147h82v-106h106v-82z" />
+<glyph unicode="⎙" horiz-adv-x="2100" d="M2000 37q0 -288 -90.5 -378.5t-378.5 -90.5h-962q-288 0 -378.5 90.5t-90.5 378.5v543q0 270 77 364t314 103v147l402 402h716v-549q237 -9 314 -103t77 -364v-543zM880 1208v259l-259 -259h259zM1527 226v1288h-565v-388h-389v-900h954zM1918 37v543q0 237 -55 308 t-254 77v-821h-1118v821q-199 -6 -254 -77t-55 -308v-543q0 -254 66.5 -320.5t320.5 -66.5h962q254 0 320.5 66.5t66.5 320.5z" />
+<glyph unicode="⎚" horiz-adv-x="2100" d="M2000 469q0 -288 -90.5 -378.5t-378.5 -90.5h-962q-288 0 -378.5 90.5t-90.5 378.5v543q0 288 90 378t379 90h962q289 0 379 -90t90 -378v-543zM1918 469v543q0 254 -66 320t-321 66h-962q-255 0 -321 -66t-66 -320v-543q0 -254 66.5 -320.5t320.5 -66.5h962 q254 0 320.5 66.5t66.5 320.5zM1798 1123l-1229 -928q-31 0 -70 2l1287 980q8 -26 12 -54zM1704 1263l-1345 -1024q-19 16 -33 38l1316 1002q31 -5 62 -16zM1456 1285l-1159 -882q-2 32 -2 62l1077 820h84z" />
+<glyph unicode="⎛" horiz-adv-x="1024" d="M940 1178q0 -19 -41 -43q-237 -140 -410 -415q-264 -419 -264 -1055v-107h-120v107q0 414 118 756q138 397 416 631q51 43 141 98.5t125 55.5t35 -28zM0 1606zM1024 -442z" />
+<glyph unicode="⎜" horiz-adv-x="1024" d="M225 -442h-120v2048h120v-2048zM0 1606zM1024 -442z" />
+<glyph unicode="⎝" horiz-adv-x="1024" d="M940 -14q0 -28 -35 -28t-125 55.5t-141 98.5q-278 234 -416 631q-118 342 -118 756v107h120v-107q0 -636 264 -1055q173 -275 410 -415q41 -24 41 -43zM0 1606zM1024 -442z" />
+<glyph unicode="⎞" horiz-adv-x="1024" d="M919 -442h-120v107q0 636 -264 1055q-173 275 -410 415q-41 24 -41 43q0 28 35 28t125 -55.5t141 -98.5q278 -234 416 -631q118 -342 118 -756v-107zM0 1606zM1024 -442z" />
+<glyph unicode="⎟" horiz-adv-x="1024" d="M919 -442h-120v2048h120v-2048zM0 1606zM1024 -442z" />
+<glyph unicode="⎠" horiz-adv-x="1024" d="M919 1499q0 -414 -118 -756q-138 -397 -416 -631q-51 -43 -141 -98.5t-125 -55.5t-35 28q0 19 41 43q237 140 410 415q264 419 264 1055v107h120v-107zM0 1606zM1024 -442z" />
+<glyph unicode="⎡" horiz-adv-x="1024" d="M864 642q55 0 55 -60t-55 -60h-639v-964h-120v1029q0 55 59 55h700zM0 1606zM1024 -442z" />
+<glyph unicode="⎢" horiz-adv-x="1024" d="M225 -442h-120v2048h120v-2048zM0 1606zM1024 -442z" />
+<glyph unicode="⎣" horiz-adv-x="1024" d="M864 642q55 0 55 -60t-55 -60h-700q-22 0 -40.5 17t-18.5 40v1027h120v-964h639zM0 1606zM1024 -442z" />
+<glyph unicode="⎤" horiz-adv-x="1024" d="M919 -442h-120v964h-639q-55 0 -55 60t55 60h700q22 0 40.5 -17t18.5 -40v-1027zM0 1606zM1024 -442z" />
+<glyph unicode="⎥" horiz-adv-x="1024" d="M919 -442h-120v2048h120v-2048zM0 1606zM1024 -442z" />
+<glyph unicode="⎦" horiz-adv-x="1024" d="M919 577q0 -55 -59 -55h-700q-55 0 -55 60t55 60h639v964h120v-1029zM0 1606zM1024 -442z" />
+<glyph unicode="⎧" horiz-adv-x="1024" d="M882 582q0 -31 -28 -31q-104 0 -189.5 -60t-85.5 -156v-777h-134v777q0 145 143 219q111 59 266 59q28 0 28 -31zM0 1606zM1024 -442z" />
+<glyph unicode="⎨" horiz-adv-x="1024" d="M579 -442h-134v770q0 104 -80 163.5t-195 59.5q-28 0 -28 31t28 31q115 0 195 59.5t80 163.5v770h134v-770q0 -186 -212 -254q212 -68 212 -254v-770zM0 1606zM1024 -442z" />
+<glyph unicode="⎩" horiz-adv-x="1024" d="M882 582q0 -31 -28 -31q-155 0 -266 59q-143 74 -143 219v777h134v-777q0 -96 85.5 -156t189.5 -60q28 0 28 -31zM0 1606zM1024 -442z" />
+<glyph unicode="⎪" horiz-adv-x="1024" d="M579 -442h-134v2048h134v-2048zM0 1606zM1024 -442z" />
+<glyph unicode="⎫" horiz-adv-x="1024" d="M579 -442h-134v777q0 96 -85.5 156t-189.5 60q-28 0 -28 31t28 31q155 0 266 -59q143 -74 143 -219v-777zM0 1606zM1024 -442z" />
+<glyph unicode="⎬" horiz-adv-x="1024" d="M882 582q0 -31 -28 -31q-115 0 -195 -59.5t-80 -163.5v-770h-134v770q0 186 212 254q-212 68 -212 254v770h134v-770q0 -104 80 -163.5t195 -59.5q28 0 28 -31zM0 1606zM1024 -442z" />
+<glyph unicode="⎭" horiz-adv-x="1024" d="M579 829q0 -145 -143 -219q-111 -59 -266 -59q-28 0 -28 31t28 31q104 0 189.5 60t85.5 156v777h134v-777zM0 1606zM1024 -442z" />
+<glyph unicode="⎮" horiz-adv-x="1329" d="M795 -442h-216v2048h216v-2048zM0 1606zM1329 -442z" />
+<glyph unicode="⎯" d="M2131 582q0 -41 -39 -41h-2138q-39 0 -39 41t39 41h2138q39 0 39 -41z" />
+<glyph unicode="⎰" horiz-adv-x="1024" d="M916 1606q37 0 37 -25t-39 -32q-29 -2 -59 -5q-167 -28 -241.5 -123t-74.5 -266v-1216q0 -208 -107.5 -294.5t-320.5 -86.5q-40 0 -40 27q0 24 39 31q29 2 59 5q165 28 225 129q48 82 48 261v1215q0 380 474 380z" />
+<glyph unicode="⎱" horiz-adv-x="1024" d="M953 -415q0 -27 -40 -27q-213 0 -320.5 86.5t-107.5 294.5v1216q0 171 -74.5 266t-241.5 123q-30 3 -59 5q-39 7 -39 32t37 25q474 0 474 -380v-1215q0 -179 48 -261q60 -101 225 -129q30 -3 59 -5q39 -7 39 -31z" />
+<glyph unicode="⎲" horiz-adv-x="2636" d="M1287 745h-894l852 -1169q7 -10 7 -18h-273l-869 1197q-10 14 -10 54t27 40h2186l223 -604h-74q-116 320 -491 431q-232 69 -684 69z" />
+<glyph unicode="⎳" horiz-adv-x="2636" d="M127 315q-26 0 -26 30q0 6 947 1166l-69 95h273q0 -9 -7 -18l-921 -1124h976q451 0 679 68q373 110 483 431h74l-223 -648h-2186z" />
+<glyph unicode="⎴" horiz-adv-x="1864" d="M1864 -356q0 -62 -40.5 -62t-40.5 68v309h-1701v-309q0 -68 -41 -68t-41 62v397h1864v-397z" />
+<glyph unicode="⎵" horiz-adv-x="1864" d="M1864 -41h-1864v397q0 62 40.5 62t40.5 -68v-309h1701v309q0 68 41 68t41 -62v-397z" />
+<glyph unicode="⎶" horiz-adv-x="1864" d="M1864 363h-1864v397q0 62 40.5 62t40.5 -68v-309h1701v309q0 68 41 68t41 -62v-397zM1864 -356q0 -62 -40.5 -62t-40.5 68v309h-1701v-309q0 -68 -41 -68t-41 62v397h1864v-397z" />
+<glyph unicode="⎷" horiz-adv-x="1364" d="M1405 1565q0 -8 -2 -14l-610 -1975q-6 -18 -56 -18q-13 0 -18 12l-408 897q-129 -98 -135 -98q-29 0 -29 29q0 9 9 16l243 184q8 6 18.5 6t16.5 -14l350 -769l545 1766q6 19 35 19q41 0 41 -41z" />
+<glyph unicode="⎸" horiz-adv-x="1591" d="M282 -4q0 -39 -41 -39t-41 39v1175q0 37 41 37t41 -37v-1175z" />
+<glyph unicode="⎹" horiz-adv-x="1591" d="M1391 -4q0 -39 -41 -39t-41 39v1175q0 37 41 37t41 -37v-1175z" />
+<glyph unicode="⎺" horiz-adv-x="1591" d="M1391 1167q0 -41 -37 -41h-1115q-39 0 -39 41t39 41h1115q37 0 37 -41z" />
+<glyph unicode="⎻" horiz-adv-x="1591" d="M1391 1167q0 -41 -37 -41h-1115q-39 0 -39 41t39 41h1115q37 0 37 -41z" />
+<glyph unicode="⎼" horiz-adv-x="1591" d="M1391 1167q0 -41 -37 -41h-1115q-39 0 -39 41t39 41h1115q37 0 37 -41z" />
+<glyph unicode="⎽" horiz-adv-x="1591" d="M1391 1167q0 -41 -37 -41h-1115q-39 0 -39 41t39 41h1115q37 0 37 -41z" />
+<glyph unicode="⎾" horiz-adv-x="577" d="M437 1050q40 0 40 -30.5t-44 -30.5h-272v-946q0 -44 -30.5 -44t-30.5 45v961q0 30 10.5 37.5t34.5 7.5h292z" />
+<glyph unicode="⎿" horiz-adv-x="577" d="M433 61q44 0 44 -30.5t-44 -30.5h-288q-30 0 -37.5 10.5t-7.5 34.5v961q0 45 30.5 45t30.5 -44v-946h272z" />
+<glyph unicode="⏀" horiz-adv-x="1210" d="M994 944q142 -153 142 -361.5t-142.5 -361.5t-347.5 -169v-187q0 -39 -41 -39t-41 39v187q-206 16 -348 169t-142 362t141.5 361.5t348.5 167.5v225q0 37 41 37t41 -37v-225q206 -15 348 -168zM935.5 279q118.5 129 118.5 303.5t-118 303t-290 144.5v-896 q171 16 289.5 145zM273.5 886.5q-117.5 -128.5 -117.5 -303.5t118 -304t290 -145v896q-173 -15 -290.5 -143.5z" />
+<glyph unicode="⏁" horiz-adv-x="1210" d="M994 944q142 -153 142 -361.5t-142.5 -361.5t-347.5 -169v-187q0 -39 -41 -39t-41 39v187q-206 16 -348 169t-142 362t141.5 361.5t348.5 167.5v180h-355q-39 0 -39 41t39 41h794q37 0 37 -41t-37 -41h-357v-180q206 -15 348 -168zM935.5 279q118.5 129 118.5 303.5 t-118 303t-290 144.5v-896q171 16 289.5 145zM273.5 886.5q-117.5 -128.5 -117.5 -303.5t118 -304t290 -145v896q-173 -15 -290.5 -143.5z" />
+<glyph unicode="⏂" horiz-adv-x="1210" d="M994 944q142 -153 142 -361.5t-142.5 -361.5t-347.5 -169v-144h357q37 0 37 -41t-37 -41h-794q-39 0 -39 41t39 41h355v144q-206 16 -348 169t-142 362t141.5 361.5t348.5 167.5v223q0 39 41 39t41 -39v-223q206 -15 348 -168zM935.5 279q118.5 129 118.5 303.5t-118 303 t-290 144.5v-896q171 16 289.5 145zM273.5 886.5q-117.5 -128.5 -117.5 -303.5t118 -304t290 -145v896q-173 -15 -290.5 -143.5z" />
+<glyph unicode="⏃" horiz-adv-x="1210" d="M1158 94q0 -35 -43 -35h-469v-194q0 -39 -41 -39t-41 39v194h-469q-43 0 -43 35q0 12 6 24l506 1002v217q0 37 41 37t41 -37v-217l506 -1002q6 -12 6 -24zM646 141h402l-402 797v-797zM564 141v797l-402 -797h402z" />
+<glyph unicode="⏄" horiz-adv-x="1210" d="M1158 94q0 -35 -43 -35h-469v-194q0 -39 -41 -39t-41 39v194h-469q-43 0 -43 35q0 12 6 24l506 1002v172h-355q-39 0 -39 41t39 41h794q37 0 37 -41t-37 -41h-357v-172l506 -1002q6 -12 6 -24zM646 141h402l-402 797v-797zM564 141v797l-402 -797h402z" />
+<glyph unicode="⏅" horiz-adv-x="1210" d="M1158 94q0 -35 -43 -35h-469v-151h357q37 0 37 -41t-37 -41h-794q-39 0 -39 41t39 41h355v151h-469q-43 0 -43 35q0 12 6 24l506 1002v215q0 39 41 39t41 -39v-215l506 -1002q6 -12 6 -24zM646 141h402l-402 797v-797zM564 141v797l-402 -797h402z" />
+<glyph unicode="⏆" horiz-adv-x="1210" d="M1167 730q0 -130 -80.5 -241t-196 -111t-244.5 111v-624q0 -39 -41 -39t-41 39v697q-130 112 -235 112q-126 0 -189 -123q-12 -24 -30 -127q-8 -47 -32 -47q-35 0 -35 57q0 130 80 241t196.5 111t244.5 -110v661q0 37 41 37t41 -37v-733q131 -114 235 -114q145 0 201 152 q2 5 18 98q8 47 32 47q35 0 35 -57z" />
+<glyph unicode="⏇" horiz-adv-x="1210" d="M1167 730q0 -130 -80.5 -241t-196 -111t-244.5 111v-624q0 -39 -41 -39t-41 39v697q-130 112 -235 112q-126 0 -189 -123q-12 -24 -30 -127q-8 -47 -32 -47q-35 0 -35 57q0 130 80 241t196.5 111t244.5 -110v616h-355q-39 0 -39 41t39 41h794q37 0 37 -41t-37 -41h-357 v-688q131 -114 235 -114q145 0 201 152q2 5 18 98q8 47 32 47q35 0 35 -57z" />
+<glyph unicode="⏈" horiz-adv-x="1210" d="M1167 730q0 -130 -80.5 -241t-196 -111t-244.5 111v-581h357q37 0 37 -41t-37 -41h-794q-39 0 -39 41t39 41h355v654q-130 112 -235 112q-126 0 -189 -123q-12 -24 -30 -127q-8 -47 -32 -47q-35 0 -35 57q0 130 80 241t196.5 111t244.5 -110v659q0 39 41 39t41 -39v-731 q131 -114 235 -114q145 0 201 152q2 5 18 98q8 47 32 47q35 0 35 -57z" />
+<glyph unicode="⏉" horiz-adv-x="1210" d="M1040 1333q0 -41 -37 -41h-357v-1427q0 -39 -41 -39t-41 39v1427h-355q-39 0 -39 41t39 41h794q37 0 37 -41z" />
+<glyph unicode="⏊" horiz-adv-x="1210" d="M1040 -133q0 -41 -37 -41h-794q-39 0 -39 41t39 41h355v1427q0 39 41 39t41 -39v-1427h357q37 0 37 -41z" />
+<glyph unicode="⏋" horiz-adv-x="577" d="M477 44q0 -45 -30.5 -45t-30.5 44v946h-273q-43 0 -43 30.5t39 30.5h293q30 0 37.5 -10.5t7.5 -34.5v-961z" />
+<glyph unicode="⏌" horiz-adv-x="577" d="M477 45q0 -30 -10.5 -37.5t-34.5 -7.5h-289q-43 0 -43 30.5t43 30.5h273v946q0 44 30.5 44t30.5 -45v-961z" />
+<glyph unicode="⏍" horiz-adv-x="1372" d="M781 1050l-286 -538h-56l162 538h180zM1272 45q0 -31 -11.5 -38t-33.5 -7h-1082q-45 0 -45 40v965q0 30 10.5 37.5t34.5 7.5h292q40 0 40 -30.5t-44 -30.5h-272v-928h1050v928h-272q-44 0 -44 30.5t40 30.5h292q30 0 37.5 -10.5t7.5 -34.5v-960z" />
+<glyph unicode="⏎" horiz-adv-x="1757" d="M1587 913q0 -65 -36 -101l-632 -629q-38 -38 -183 -38v-206q0 -46 -35 -46q-18 0 -35 17l-484 485q-12 12 -12 29t12 29l484 485q17 17 35 17q35 0 35 -46v-206h292v741q0 46 35 46q18 0 35 -17l209 -210l210 210q17 17 35 17q35 0 35 -46v-531zM1505 913v432l-169 -169 q-11 -11 -28.5 -11t-28.5 11l-169 169v-642h215l168 167q12 12 12 43zM695 621q-41 0 -41 41v148l-385 -386l385 -386v148q0 41 41 41q152 0 166 14l381 380h-547z" />
+<glyph unicode="⏏" horiz-adv-x="1628" d="M1406 512h-1184l592 984zM1406 0h-1184v300h1184v-300z" />
+<glyph unicode="⏐" horiz-adv-x="1024" d="M553 -401q0 -41 -41 -41t-41 41v1966q0 41 41 41t41 -41v-1966z" />
+<glyph unicode="⏑" horiz-adv-x="1110" d="M1090 429q0 -7 -15 -27q-204 -268 -520 -268t-520 268q-15 20 -15 27q0 18 20 18q11 0 40 -27q184 -173 475 -173t475 173q29 27 40 27q20 0 20 -18z" />
+<glyph unicode="⏒" horiz-adv-x="1110" d="M1090 429q0 -7 -15 -27q-204 -268 -520 -268t-520 268q-15 20 -15 27q0 18 20 18q11 0 40 -27q184 -173 475 -173t475 173q29 27 40 27q20 0 20 -18zM1090 632q0 -41 -37 -41h-994q-39 0 -39 41t39 41h994q37 0 37 -41z" />
+<glyph unicode="⏓" horiz-adv-x="1110" d="M1090 829q0 -7 -15 -27q-204 -268 -520 -268t-520 268q-15 20 -15 27q0 18 20 18q11 0 40 -27q184 -173 475 -173t475 173q29 27 40 27q20 0 20 -18zM1090 332q0 -41 -37 -41h-994q-39 0 -39 41t39 41h994q37 0 37 -41z" />
+<glyph unicode="⏔" horiz-adv-x="2220" d="M2200 429q0 -7 -15 -27q-204 -268 -520 -268t-520 268q-15 20 -15 27q0 18 20 18q11 0 40 -27q184 -173 475 -173t475 173q29 27 40 27q20 0 20 -18zM1090 429q0 -7 -15 -27q-204 -268 -520 -268t-520 268q-15 20 -15 27q0 18 20 18q11 0 40 -27q184 -173 475 -173 t475 173q29 27 40 27q20 0 20 -18zM2200 632q0 -41 -37 -41h-2104q-39 0 -39 41t39 41h2104q37 0 37 -41z" />
+<glyph unicode="⏕" horiz-adv-x="2220" d="M2200 829q0 -7 -15 -27q-204 -268 -520 -268t-520 268q-15 20 -15 27q0 18 20 18q11 0 40 -27q184 -173 475 -173t475 173q29 27 40 27q20 0 20 -18zM1090 829q0 -7 -15 -27q-204 -268 -520 -268t-520 268q-15 20 -15 27q0 18 20 18q11 0 40 -27q184 -173 475 -173 t475 173q29 27 40 27q20 0 20 -18zM2200 332q0 -41 -37 -41h-2104q-39 0 -39 41t39 41h2104q37 0 37 -41z" />
+<glyph unicode="⏖" horiz-adv-x="2220" d="M2200 429q0 -7 -15 -27q-204 -268 -537.5 -268t-537.5 262q-204 -262 -537.5 -262t-537.5 268q-15 20 -15 27q0 18 20 18q11 0 40 -27q184 -173 495 -173t495 173q29 27 40 27t40 -27q184 -173 495 -173t495 173q29 27 40 27q20 0 20 -18z" />
+<glyph unicode="⏗" horiz-adv-x="1110" d="M1090 41q0 -41 -37 -41h-994q-39 0 -39 41t39 41h949v432q0 37 41 37t41 -37v-473z" />
+<glyph unicode="⏘" horiz-adv-x="1110" d="M1090 41q0 -41 -37 -41h-996q-37 0 -37 41v473q0 37 41 37t41 -37v-432h906v432q0 37 41 37t41 -37v-473z" />
+<glyph unicode="⏙" horiz-adv-x="1110" d="M1090 41q0 -41 -37 -41h-996q-37 0 -37 41v473q0 37 41 37t41 -37v-432h412v432q0 37 41 37t41 -37v-432h412v432q0 37 41 37t41 -37v-473z" />
+<glyph unicode="⏚" horiz-adv-x="1480" d="M1451 513q0 -41 -37 -41h-1346q-39 0 -39 41t39 41h631v898q0 37 41 37t41 -37v-898h633q37 0 37 -41zM1301 236q0 -41 -37 -41h-1046q-39 0 -39 41t39 41h1046q37 0 37 -41zM1151 -41q0 -41 -37 -41h-746q-39 0 -39 41t39 41h746q37 0 37 -41zM1001 -318q0 -41 -37 -41 h-446q-39 0 -39 41t39 41h446q37 0 37 -41z" />
+<glyph unicode="⏛" d="M1878 390q0 -40 -36 -40h-194v-313q0 -37 -37 -37h-1203q-35 0 -35 37v313h-165q-38 0 -38 40t38 40h165v319q0 35 35 35h1203q37 0 37 -35v-319h194q36 0 36 -40zM1569 430v275h-1117v-275h1117zM1569 79v271h-1117v-271h1117z" />
+<glyph unicode="⏜" horiz-adv-x="1864" d="M1864 -210q0 -24 -27 -24q-11 0 -20 11q-33 44 -105 127q-291 293 -780 293t-780 -293q-24 -24 -105 -127q-9 -11 -20 -11q-27 0 -27 24q0 10 5 17q153 229 400.5 356.5t526.5 127.5t526.5 -127.5t400.5 -356.5q5 -7 5 -17z" />
+<glyph unicode="⏝" horiz-adv-x="1864" d="M1864 267q0 -10 -5 -17q-153 -229 -400.5 -356.5t-526.5 -127.5t-526.5 127.5t-400.5 356.5q-5 7 -5 17q0 24 27 24q11 0 20 -11q33 -44 105 -127q291 -293 780 -293t780 293q24 24 105 127q9 11 20 11q27 0 27 -24z" />
+<glyph unicode="⏞" horiz-adv-x="1864" d="M1864 -332q0 -41 -20.5 -41t-24.5 18q-9 154 -94 237q-43 42 -114 54q-34 5 -129 5h-277q-89 0 -132 21q-96 47 -141 202q-45 -155 -141 -202q-42 -21 -131 -21h-277q-95 0 -129 -5q-71 -12 -114 -54q-85 -83 -94 -237q-4 -18 -23 -18q-23 0 -23 41q0 174 78 285 q51 73 116 93q42 13 149 13h313q117 0 181 72t73 190q2 33 21 33t22 -18t4 -35q31 -242 252 -242h313q107 0 149 -13q65 -20 116 -93q77 -109 77 -285z" />
+<glyph unicode="⏟" horiz-adv-x="1864" d="M1864 332q0 -174 -78 -285q-51 -73 -116 -93q-42 -13 -149 -13h-313q-117 0 -181 -72t-73 -190q-2 -33 -21 -33t-22 18t-4 35q-31 242 -252 242h-313q-107 0 -149 13q-65 20 -116 93q-77 109 -77 285q0 41 20.5 41t24.5 -18q9 -154 94 -237q43 -42 114 -54q34 -5 129 -5 h277q89 0 132 -21q96 -47 141 -202q45 155 141 202q42 21 131 21h277q95 0 129 5q71 12 114 54q85 83 94 237q4 18 23 18q23 0 23 -41z" />
+<glyph unicode="⏠" horiz-adv-x="1864" d="M1442 -56h-1020q-47 0 -188.5 -122.5t-161.5 -155.5h-72l287 390h1290l287 -390h-72q-20 33 -161.5 155.5t-188.5 122.5z" />
+<glyph unicode="⏡" horiz-adv-x="1864" d="M422 56h1020q47 0 188.5 122.5t161.5 155.5h72l-287 -390h-1290l-287 390h72q20 -33 161.5 -155.5t188.5 -122.5z" />
+<glyph unicode="⏢" horiz-adv-x="1591" d="M1556 78q0 -78 -83 -78h-1283q-34 0 -58 24t-24 58v6l93 1222q2 31 26.5 53.5t55.5 22.5h725q57 0 77 -53l465 -1222q6 -16 6 -33zM1473 82l-465 1222h-725l-93 -1222h1283z" />
+<glyph unicode="⏣" horiz-adv-x="1864" d="M1694 166q0 -24 -21 -36l-721 -416q-5 -3 -20 -3t-20 3l-721 416q-21 12 -21 36v832q0 24 21 36l721 416q5 3 20 3t20 -3l721 -416q21 -12 21 -36v-832zM1612 190v784l-680 393l-680 -393v-784l680 -393zM1401 582q0 -192 -138.5 -330.5t-331 -138.5t-330.5 138t-138 331 t138 331t330.5 138t331 -138.5t138.5 -330.5zM1319 582q0 158 -114.5 272.5t-273 114.5t-272.5 -114t-114 -273t114 -273t272.5 -114t273 114.5t114.5 272.5z" />
+<glyph unicode="⏤" horiz-adv-x="1930" d="M1780 582q0 -41 -37 -41h-1554q-39 0 -39 41t39 41h1554q37 0 37 -41z" />
+<glyph unicode="⏥" horiz-adv-x="1930" d="M1815 823q0 -12 -8 -26l-448 -776q-12 -21 -36 -21h-1165q-43 0 -43 35q0 12 8 26l448 776q12 21 36 21h1165q43 0 43 -35zM1700 776h-1070l-400 -694h1070z" />
+<glyph unicode="⏦" horiz-adv-x="1674" d="M1559 584q0 -14 -11 -27q-105 -121 -164 -167q-101 -78 -203 -78t-199 72q-62 46 -161 157h-667q-39 0 -39 41q0 14 11 27q105 121 164 167q101 78 204 78t201 -72q65 -48 162 -159h663q39 0 39 -39zM931 541q138 -147 247.5 -147t247.5 147h-495zM747 623 q-139 149 -250.5 149t-250.5 -149h501z" />
+<glyph unicode="⏧" d="M1801 916q0 -25 -24 -36l-629 -279q8 -30 8 -59q0 -113 -90 -186l387 -698q6 -11 6 -21q0 -41 -43 -41q-23 0 -35 22l-386 698q-39 -14 -80.5 -14t-84.5 17l-411 -684q-13 -21 -34 -21q-43 0 -43 41q0 12 6 22l412 684q-84 73 -84 181q0 154 143 219l-166 668q-2 8 -2 11 q0 40 43 40q30 0 38 -32l167 -667q13 1 17 1q125 0 198 -107l629 280q9 4 19 4q39 0 39 -43zM640 1071q0 -11 -22 -46q-48 -75 -80 -204q-13 -52 -34 -52q-17 0 -46 32q-89 98 -166 142q-45 26 -45 46q0 32 33.5 32t146.5 -91l-108 433q-2 8 -2 11q0 40 43 40q30 0 38 -32 l108 -432q64 152 103 152q31 0 31 -31z" />
+<glyph unicode="⏨" horiz-adv-x="1401" d="M1276 514q63 -111 63 -325.5t-59 -321.5q-91 -166 -273.5 -166t-273.5 144q-71 112 -71 331t58 328q91 170 278 170t278 -160zM1190 116v173q0 335 -190 335t-190 -336q0 -27 0.5 -80.5t0.5 -80.5q0 -158 25 -238q42 -138 164 -138q190 0 190 365zM142 -206l84 -2 q93 0 106 24q5 9 5 30v708q-80 -31 -204 -31v62q193 0 290 89h12q38 0 38 -45v-786q0 -18 5 -28q11 -21 175 -21h15v-64q-67 5 -105 5h-316q-38 0 -105 -5v64z" />
+<glyph unicode="⏩" d="M1942 628l-836 -628v1256zM1042 628l-836 -628v1256z" />
+<glyph unicode="⏪" d="M1842 0l-836 628l836 628v-1256zM942 0l-836 628l836 628v-1256z" />
+<glyph unicode="⏫" horiz-adv-x="1656" d="M1456 664h-1256l628 836zM1456 -236h-1256l628 836z" />
+<glyph unicode="⏬" horiz-adv-x="1656" d="M1456 1400l-628 -836l-628 836h1256zM1456 500l-628 -836l-628 836h1256z" />
+<glyph unicode="⏭" d="M1918 0h-233v1256h233v-1256zM1577 628l-689 -628v1256zM834 628l-689 -628v1256z" />
+<glyph unicode="⏮" d="M1903 0l-689 628l689 628v-1256zM1160 0l-689 628l689 628v-1256zM363 0h-233v1256h233v-1256z" />
+<glyph unicode="⏯" d="M1750 0h-233v1256h233v-1256zM1236 0h-233v1256h233v-1256zM895 628l-689 -628v1256z" />
+<glyph unicode="⏰" d="M1900 1145q0 -71 -40 -141l-630 357q81 143 235 143q85 0 184 -47l35 61l78 -44l-34 -61q172 -115 172 -268zM148 1145q0 153 172 268l-34 61l78 44l35 -61q99 47 184 47q154 0 235 -143l-630 -357q-40 70 -40 141zM1782 470q0 -357 -276 -585l156 -227q10 -15 10 -30 q0 -44 -44 -44q-18 0 -35 17l-202 206q-171 -95 -367 -95t-367 95l-202 -206q-17 -17 -35 -17q-44 0 -44 44q0 15 10 30l156 227q-276 228 -276 585q0 310 216.5 530.5t525.5 227.5v146h-85q-50 0 -50 50t50 50h202q50 0 50 -50t-50 -50h-85v-146q309 -7 525.5 -227.5 t216.5 -530.5zM1511 440v60h85q-6 122 -61 230l-74 -42l-30 51l74 43q-67 102 -169 169l-43 -74l-51 30l42 74q-108 55 -230 61v-85h-60v85q-122 -6 -230 -61l42 -74l-51 -30l-43 74q-102 -67 -169 -169l74 -43l-30 -51l-74 42q-55 -108 -61 -230h85v-60h-85q6 -122 61 -230 l74 42l30 -51l-74 -43q67 -102 169 -169l43 74l51 -30l-42 -74q108 -55 230 -61v85h60v-85q122 6 230 61l-42 74l51 30l43 -74q102 67 169 169l-74 43l30 51l74 -42q55 108 61 230h-85zM1072 462q-6 -41 -50.5 -41t-46.5 46l-206 156l36 48l204 -154q7 2 16 2t19 -4l373 224 l31 -52z" />
+<glyph unicode="⏱" d="M1802 1240l-111 -112l-116 112l112 115zM1176 1419h-299v159h299v-159zM1591.5 1148.5q231.5 -230.5 231.5 -565t-233 -564.5t-566 -230t-566 230t-233 564.5t231.5 565t567.5 230.5t567.5 -230.5zM1516.5 92.5q199.5 196.5 199.5 488.5t-200.5 491.5t-491.5 199.5 t-491.5 -199.5t-200.5 -491.5t199.5 -488.5t492.5 -196.5t492.5 196.5zM1369 1107q-12 -18 -31 -56q-20 11 -56 38l35 56zM1586 865l-56 -31q-12 20 -31 60l59 27q10 -18 28 -56zM1652 551h-66v66h66v-66zM1065 1049v-578h-78v577h-47l84 170l86 -169h-45zM1586 295l-35 -55 q-24 12 -55 38l31 52q4 -2 59 -35zM766 1089q-2 -2 -56 -38q-5 12 -31 56q18 12 52 38zM1369 54l-56 -31q-19 28 -31 59q23 14 56 27q12 -18 31 -55zM549 894l-31 -60l-56 31q10 18 28 56zM462 551h-66v66h66v-66zM1060 -47h-66v66h66v-66zM552 278q-2 -5 -55 -38l-35 55 q19 12 59 35zM766 82q-12 -31 -31 -59l-56 31q5 11 31 55q33 -13 56 -27z" />
+<glyph unicode="⏲" d="M1942 586q0 -468 -391 -754q-220 -162 -523 -162q-379 0 -650.5 267t-271.5 644.5t269.5 647t647 269.5t648.5 -267t271 -645zM1816 588q0 192 -75 338q-110 214 -297 332t-424 118q-325 0 -558 -232.5t-233 -558t233.5 -557.5t560 -232t560 232.5t233.5 559.5zM1662 909 q-9 -4 -63 -36l-36 64l68 44zM1413 1190l-36 -64l-67 40q0 1 36 60q32 -13 67 -36zM991 1272v11q0 11 -3 23h76v-74q-31 1 -50 1t-26 -1q3 32 3 40zM1667 548v79q14 -2 31 -2h11q15 0 33 3l1 -80h-76zM735 1162q-22 -12 -68 -32l-36 60q32 24 64 40q14 -22 40 -68zM1663 259 q-14 -35 -36 -68l-64 36l36 67q22 -11 64 -35zM1164 599q0 -54 -42 -106.5t-95 -52.5t-153 78l-231 201q-25 21 -83.5 59.5t-58.5 64.5t15.5 47.5t39.5 21.5q-5 0 147 -61l268 -94q193 -80 193 -158zM482 942l-36 -69l-68 40q14 21 36 64zM1413 -22l-63 -40l-36 63 q10 10 60 40zM988 -59h76v-77q-14 2 -33 2t-43 -2v77zM374 545h-76v74q14 -2 32 -2h10q16 0 34 3v-75zM482 231q-31 -23 -59 -40q-7 1 -41 56q24 25 56 44q20 -20 44 -60zM727 9q-13 -32 -36 -67q-6 4 -63 36l35 67z" />
+<glyph unicode="⏳" horiz-adv-x="1552" d="M966 594q281 -199 287 -815h141q58 0 58 -73.5t-58 -73.5h-1236q-58 0 -58 71q0 26 14.5 51t38.5 25h146q0 602 287 808q-281 199 -287 815h-141q-58 0 -58 73.5t58 73.5h1236q58 0 58 -71q0 -26 -14.5 -51t-38.5 -25h-146q0 -602 -287 -808zM989 437q-17 21 -73 68.5 t-56 88t48 81.5q25 21 73 69q171 205 172 658h-754q4 -463 164 -658q17 -21 73 -68.5t56 -88t-48 -81.5q-25 -21 -73 -69q-171 -205 -172 -658h754q-4 463 -164 658zM1028 926q-10 -26 -22 -50h-465q-12 23 -23 50h510zM981 830q-17 -28 -35 -50h-341q-22 27 -37 50h413z M914 747q-19 -16 -56 -50h-170l-54 50h280zM801 175h-50v455h50v-455zM1085 55h-614l9 50h597q3 -17 8 -50zM1097 -60h-641q3 32 5 50h632q2 -23 4 -50zM451 -146q0 17 2 50h646l2 -50h-650z" />
+<glyph unicode="⏴" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="⏵" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="⏶" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="⏷" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="⏸" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="⏹" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="⏺" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="⏻" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="⏼" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="⏽" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="⏾" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="⏿" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="␀" d="M2016 1350h-98v126h-126v98h224v-224zM1664 1476h-224v98h224v-98zM2016 998h-98v224h98v-224zM1312 1476h-224v98h224v-98zM2016 646h-98v224h98v-224zM960 1476h-224v98h224v-98zM2016 294h-98v224h98v-224zM608 1476h-224v98h224v-98zM2016 -58h-98v224h98v-224z M256 1476h-126v-126h-98v224h224v-98zM2016 -410h-224v98h126v126h98v-224zM130 998h-98v224h98v-224zM1664 -410h-224v98h224v-98zM130 646h-98v224h98v-224zM1312 -410h-224v98h224v-98zM130 294h-98v224h98v-224zM960 -410h-224v98h224v-98zM130 -58h-98v224h98v-224z M608 -410h-224v98h224v-98zM256 -410h-224v224h98v-126h126v-98z" />
+<glyph unicode="␁" d="M1879 582q0 -356 -249.5 -605.5t-606 -249.5t-605.5 249t-249 606t249 606t605.5 249t606 -249.5t249.5 -605.5zM1716 582q0 289 -201.5 490.5t-490.5 201.5t-490.5 -201.5t-201.5 -490.5t201.5 -490.5t490.5 -201.5t490.5 201.5t201.5 490.5zM1431 854q0 -56 -39.5 -96 t-95.5 -40t-96.5 40t-40.5 96t40.5 95.5t96.5 39.5t95.5 -39.5t39.5 -95.5zM849 950q40 -39 40 -95.5t-40.5 -96.5t-96.5 -40t-95.5 40t-39.5 96t39.5 95.5t96 39.5t96.5 -39zM1024 25q-219 0 -358 143.5t-171 366.5h122q79 -332 407 -332t407 332h122q-32 -223 -171 -366.5 t-358 -143.5z" />
+<glyph unicode="␂" d="M1879 582q0 -356 -249.5 -605.5t-606 -249.5t-605.5 249t-249 606t249 606t605.5 249t606 -249.5t249.5 -605.5zM1431 854q0 56 -39.5 95.5t-95.5 39.5t-96.5 -39.5t-40.5 -95.5t40.5 -96t96.5 -40t95.5 40t39.5 96zM848.5 758q40.5 40 40.5 96.5t-40 95.5t-96.5 39 t-96 -39.5t-39.5 -95.5t39.5 -96t95.5 -40t96.5 40zM1024 203q-328 0 -407 332h-122q32 -223 171 -366.5t358 -143.5t358 143.5t171 366.5h-122q-79 -332 -407 -332z" />
+<glyph unicode="␃" d="M1706 893q0 -283 -328 -612l-138 -135q-76 -80 -110 -141t-46 -92l-21 -56q-14 -25 -39 -25t-34.5 21t-29 70t-57 105.5t-234.5 252.5q-90 89 -163 185q-164 215 -164 420.5t80.5 342.5t259.5 137q109 0 201 -63.5t141 -165.5q50 104 140.5 166.5t201.5 62.5 q180 0 260 -136t80 -337z" />
+<glyph unicode="␄" d="M1706 578q0 -15 -11 -27l-119 -116q-269 -280 -467 -651q-15 -35 -51 -99q-13 -19 -34.5 -19t-34.5 19l-51 99q-197 370 -467 651q-41 37 -119 116q-10 11 -10 26.5t10 28.5l79 74q76 74 165 181q190 228 335 497q17 39 58 112q14 19 35 19t34 -19l58 -112 q145 -270 335 -497q89 -106 165 -181q28 -23 79 -74q11 -13 11 -28z" />
+<glyph unicode="␅" d="M1692 620q72 -115 72 -269.5t-98 -275t-252 -120.5q-95 0 -170.5 49t-75.5 139h-102q0 -131 28.5 -252t28.5 -116q0 -41 -38 -41h-122q-37 0 -37 41q0 -5 28 116t28 252h-102q0 -90 -75.5 -139t-170.5 -49q-154 0 -252 120.5t-98 275t72 269.5q83 134 225 134 q120 0 190 -88l48 94q-158 118 -158 330q0 158 103.5 278.5t259.5 120.5t259.5 -120.5t103.5 -278.5q0 -212 -158 -330l48 -94q70 88 190 88q142 0 225 -134z" />
+<glyph unicode="␆" d="M1588 760q118 -163 118 -340t-47 -295q-68 -170 -222 -170q-103 0 -178 42q-92 51 -92 146h-102q0 -136 28.5 -254.5t28.5 -113.5q0 -41 -37 -41h-121q-39 0 -39 41q0 1 2 8q56 184 56 360h-103q0 -95 -91 -146q-74 -42 -177 -42q-151 0 -210.5 140.5t-59.5 320.5 t118 343q69 96 248 263q134 125 236 345l43 97q12 25 37 25t39 -25q16 -41 50 -122q87 -190 226 -320q182 -171 249 -262z" />
+<glyph unicode="␇" d="M1446 582q0 -176 -123 -299t-299 -123t-299 123t-123 299t123 299t299 123t299 -123t123 -299z" />
+<glyph unicode="␈" d="M2048 -442h-2048v2048h2048v-2048zM1446 582q0 176 -123 299t-299 123t-299 -123t-123 -299t123 -299t299 -123t299 123t123 299z" />
+<glyph unicode="␉" d="M1879 582q0 -356 -249.5 -605.5t-606 -249.5t-605.5 249t-249 606t249 606t605.5 249t606 -249.5t249.5 -605.5zM1736 582q0 297 -207.5 504.5t-504.5 207.5t-504.5 -207.5t-207.5 -504.5t207.5 -504.5t504.5 -207.5t504.5 207.5t207.5 504.5z" />
+<glyph unicode="␊" d="M2048 -442h-2048v2048h2048v-2048zM1630 -24q249 249 249 605.5t-249.5 606t-605.5 249.5t-605.5 -249.5t-249.5 -605.5t249.5 -605.5t606 -249.5t605.5 249zM1736 582q0 -297 -207.5 -504.5t-504.5 -207.5t-504.5 207.5t-207.5 504.5t207.5 504.5t504.5 207.5 t504.5 -207.5t207.5 -504.5z" />
+<glyph unicode="␋" d="M1874 774h-152v380l-328 -325q139 -199 139 -420q0 -281 -200.5 -480t-482 -199t-479 198.5t-197.5 482.5t198 480.5t484 196.5q232 0 432 -152l317 316h-386v151h655v-629zM1382 409q0 221 -153.5 374.5t-374.5 153.5t-375 -153.5t-154 -374.5t154 -374.5t375 -153.5 t374.5 153.5t153.5 374.5z" />
+<glyph unicode="␌" d="M1504 1386.5q199 -199.5 199 -472t-174.5 -462t-438.5 -226.5v-237h450v-154h-450v-257h-154v257h-450v154h450v238q-261 47 -426 232t-165 458.5t196.5 471t480 197.5t482.5 -199.5zM1551 906q0 220 -154.5 374.5t-374.5 154.5t-374.5 -154.5t-154.5 -374.5t154.5 -374 t374.5 -154t374.5 154t154.5 374z" />
+<glyph unicode="␍" d="M1587 582q0 -211 -181 -516h-32q86 199 98 232q51 139 51 243q0 180 -136 341t-313 171v-1159q0 -146 -126 -241t-278 -95q-89 0 -149 45t-60 131q0 136 125.5 236t255 100t182.5 -47v1583h50q32 -211 116 -332q33 -47 147 -175.5t166 -217.5q84 -143 84 -299z" />
+<glyph unicode="␎" d="M1721 -106q0 -146 -126 -241t-278 -95q-89 0 -149 45t-60 131q0 136 125.5 236t255 100t182.5 -47v1128l-731 207v-1264q0 -146 -126 -241t-278 -95q-89 0 -149 45t-60 131q0 136 125.5 236t255 100t182.5 -47v1383l831 -236v-1476z" />
+<glyph unicode="␏" d="M1942 493h-302q-29 -157 -118 -284l211 -211l-125 -126l-212 212q-136 -93 -283 -118v-302h-178v302q-147 25 -283 118l-212 -212l-126 126l212 211q-89 127 -118 284h-302v178h302q29 157 118 284l-212 211l126 126l212 -212q136 93 283 118v302h178v-302 q147 -25 283 -118l212 212l125 -126l-211 -211q89 -127 118 -284h302v-178zM1468 582q0 185 -129.5 314.5t-315 129.5t-314.5 -129t-129 -314.5t129.5 -315t314.5 -129.5t314.5 129.5t129.5 314.5z" />
+<glyph unicode="␐" d="M1734 582l-1420 -710v1420z" />
+<glyph unicode="␑" d="M1734 -128l-1420 710l1420 710v-1420z" />
+<glyph unicode="␒" d="M1686 279l-662 -687l-662 687l69 -10l533 -309v1244l-533 -309l-69 -10l662 687l662 -687l-69 10l-533 309v-1244l533 309z" />
+<glyph unicode="␓" d="M1430 1220q0 -40 -4 -76l-102 -918h-43l-100 918q-7 64 -7 90q0 63 34 110t95 47q127 0 127 -171zM874 1220q0 -31 -5 -76l-102 -918h-43l-99 918q-7 65 -7 90q0 63 34 110t95 47q127 0 127 -171zM1427 -86q0 -52 -37 -89t-89 -37t-89 37t-37 89t37 88t89 36t89 -36 t37 -88zM870 -86q0 -52 -36.5 -89t-88.5 -37t-89 37t-37 89t37 88t89 36t88.5 -36t36.5 -88z" />
+<glyph unicode="␔" d="M1564 1365h-147v-1707h-99v1707h-205v-1707h-101v967q-172 7 -267 38q-140 46 -206 162q-55 97 -55 218q0 247 218 358q108 55 277 55h585v-91z" />
+<glyph unicode="␕" d="M1147 1254l14 98q0 97 -112 97q-75 0 -126 -52t-51 -120.5t28 -114.5q41 -67 174 -165t199 -171q114 -126 114 -254q0 -214 -225 -349q125 -137 125 -260t-83 -207t-195.5 -84t-190 65.5t-77.5 164.5q0 35 23 62t57 27q77 0 77 -88l-17 -111q0 -39 40 -59.5t94.5 -20.5 t111 51t56.5 117q0 109 -135 228l-252 208q-135 133 -135 278q0 211 225 346q-126 139 -126 262.5t83.5 206.5t195 83t190.5 -63t79 -158t-81 -95q-33 0 -56.5 22.5t-23.5 55.5zM1128 253q156 94 156 216.5t-137 250.5l-228 188q-154 -92 -154 -226q0 -118 135 -243z" />
+<glyph unicode="␖" d="M1675 275h-1302v620h1302v-620z" />
+<glyph unicode="␗" d="M964 1572h120v-1462l533 309l69 10l-662 -687l-662 687l69 -10l533 -309v1462zM1619 -442h-1190v120h1190v-120z" />
+<glyph unicode="␘" d="M1084 -408h-120v1612l-533 -309l-69 -10l662 687l662 -687l-69 10l-533 309v-1612z" />
+<glyph unicode="␙" d="M964 1572h120v-1612l533 309l69 10l-662 -687l-662 687l69 -10l533 -309v1612z" />
+<glyph unicode="␚" d="M34 522v120h1612l-309 533l-10 69l687 -662l-687 -662l10 69l309 533h-1612z" />
+<glyph unicode="␛" d="M2014 522h-1612l309 -533l10 -69l-687 662l687 662l-10 -69l-309 -533h1612v-120z" />
+<glyph unicode="␜" d="M2014 522h-1794v850h120v-730h1674v-120z" />
+<glyph unicode="␝" d="M2014 582l-687 -662l10 69l309 533h-1244l309 -533l10 -69l-687 662l687 662l-10 -69l-309 -533h1244l-309 533l-10 69z" />
+<glyph unicode="␞" d="M1734 0h-1420l710 1420z" />
+<glyph unicode="␟" d="M1734 1420l-710 -1420l-710 1420h1420z" />
+<glyph unicode="␠" d="M2016 1350h-98v126h-126v98h224v-224zM1664 1476h-224v98h224v-98zM2016 998h-98v224h98v-224zM1312 1476h-224v98h224v-98zM2016 646h-98v224h98v-224zM960 1476h-224v98h224v-98zM2016 294h-98v224h98v-224zM608 1476h-224v98h224v-98zM2016 -58h-98v224h98v-224z M256 1476h-126v-126h-98v224h224v-98zM2016 -410h-224v98h126v126h98v-224zM130 998h-98v224h98v-224zM1664 -410h-224v98h224v-98zM130 646h-98v224h98v-224zM1312 -410h-224v98h224v-98zM130 294h-98v224h98v-224zM960 -410h-224v98h224v-98zM130 -58h-98v224h98v-224z M608 -410h-224v98h224v-98zM256 -410h-224v224h98v-126h126v-98zM1687 705q0 -153 -141 -212q-45 -19 -228 -19v-217h-152v650h268q253 0 253 -202zM843 615q98 -48 98 -156.5t-98 -166.5q-80 -47 -202.5 -47t-240.5 49v147h9q109 -88 242 -88t133 75q0 51 -99 74 q-154 38 -182 52q-99 50 -99 156.5t95 162.5q79 46 195.5 46t220.5 -42v-141h-8q-95 76 -220 76t-125 -73q0 -50 98 -74q157 -38 183 -50zM1529 701q0 97 -153 97h-58v-215h61q150 0 150 118z" />
+<glyph unicode="␡" d="M2016 1350h-98v126h-126v98h224v-224zM1664 1476h-224v98h224v-98zM2016 998h-98v224h98v-224zM1312 1476h-224v98h224v-98zM2016 646h-98v224h98v-224zM960 1476h-224v98h224v-98zM2016 294h-98v224h98v-224zM608 1476h-224v98h224v-98zM2016 -58h-98v224h98v-224z M256 1476h-126v-126h-98v224h224v-98zM2016 -410h-224v98h126v126h98v-224zM130 998h-98v224h98v-224zM1664 -410h-224v98h224v-98zM130 646h-98v224h98v-224zM1312 -410h-224v98h224v-98zM130 294h-98v224h98v-224zM960 -410h-224v98h224v-98zM130 -58h-98v224h98v-224z M608 -410h-224v98h224v-98zM256 -410h-224v224h98v-126h126v-98zM1889 257h-453v650h152v-537h301v-113zM1341 257h-455v650h455v-113h-304v-131h282v-113h-282v-180h304v-113zM763.5 783q61.5 -84 61.5 -201t-66.5 -204t-178.5 -110q-53 -11 -133 -11h-221v650h228 q80 0 135 -13q113 -27 174.5 -111zM438 366q229 0 229 216t-229 216h-60v-432h60z" />
+<glyph unicode="␢" horiz-adv-x="1346" d="M1100 804q75 -125 75 -324t-100 -339q-113 -157 -304 -157q-128 0 -253 69l-10 -53h-145v929l-298 -251v141l298 252v415h155v-284l283 239h168l-451 -380v-225q149 123 304 123q186 0 278 -155zM740 124q275 0 275 343.5t-231 343.5q-131 0 -266 -105v-529 q118 -53 222 -53z" />
+<glyph unicode="␣" horiz-adv-x="704" d="M704 -264h-704v264h118v-146h468v146h118v-264z" />
+<glyph unicode="␤" d="M2016 1350h-98v126h-126v98h224v-224zM1664 1476h-224v98h224v-98zM2016 998h-98v224h98v-224zM1312 1476h-224v98h224v-98zM2016 646h-98v224h98v-224zM960 1476h-224v98h224v-98zM2016 294h-98v224h98v-224zM608 1476h-224v98h224v-98zM2016 -58h-98v224h98v-224z M256 1476h-126v-126h-98v224h224v-98zM2016 -410h-224v98h126v126h98v-224zM130 998h-98v224h98v-224zM1664 -410h-224v98h224v-98zM130 646h-98v224h98v-224zM1312 -410h-224v98h224v-98zM130 294h-98v224h98v-224zM960 -410h-224v98h224v-98zM130 -58h-98v224h98v-224z M608 -410h-224v98h224v-98zM256 -410h-224v224h98v-126h126v-98zM1699 257h-453v650h152v-537h301v-113zM1022 257h-150l-288 476v-476h-138v650h188l249 -400v400h139v-650z" />
+<glyph unicode="␥" d="M1449 1361l-1204 -1204v141l1063 1063h141zM1752 1239l-1385 -1385l-71 71l1385 1385zM1803 866l-1063 -1063h-141l1204 1204v-141z" />
+<glyph unicode="␦" horiz-adv-x="976" d="M884 1223h-8q-148 92 -337 92q-116 0 -194 -74t-78 -189q0 -231 382 -412v-281h-179v213q-378 184 -378 494q0 178 126.5 284t310 106t355.5 -65v-168zM649 0h-179v187h179v-187z" />
+<glyph unicode="␧" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="␨" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="␩" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="␪" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="␫" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="␬" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="␭" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="␮" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="␯" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="␰" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="␱" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="␲" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="␳" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="␴" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="␵" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="␶" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="␷" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="␸" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="␹" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="␺" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="␻" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="␼" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="␽" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="␾" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="␿" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="⑀" horiz-adv-x="1546" d="M1324 966q0 -37 -41 -37t-41 37v373h-428v-1302q0 -37 -37 -37h-518q-37 0 -37 37v418q0 37 41 37t41 -37v-373h428v1302q0 37 37 37h518q37 0 37 -37v-418z" />
+<glyph unicode="⑁" horiz-adv-x="1236" d="M1014 37q0 -37 -41 -37t-41 37v673h-628v-673q0 -39 -41 -39t-41 39v718q0 37 37 37h673v592q0 37 41 37t41 -37v-1347z" />
+<glyph unicode="⑂" horiz-adv-x="1236" d="M1014 664q0 -37 -37 -37h-318v-592q0 -37 -41 -37t-41 37v592h-318q-37 0 -37 37v718q0 39 41 39t41 -39v-673h628v673q0 37 41 37t41 -37v-718z" />
+<glyph unicode="⑃" horiz-adv-x="1236" d="M1014 37q0 -37 -41 -37t-41 37v673h-628v-673q0 -39 -41 -39t-41 39v718q0 37 37 37h318v592q0 37 41 37t41 -37v-592h318q37 0 37 -37v-718z" />
+<glyph unicode="⑄" horiz-adv-x="1236" d="M1014 37q0 -37 -37 -37h-718q-37 0 -37 37v418q0 39 41 39t41 -39v-373h273v1257h-273v-373q0 -39 -41 -39t-41 39v418q0 37 37 37h718q37 0 37 -37v-418q0 -37 -41 -37t-41 37v373h-273v-1257h273v373q0 37 41 37t41 -37v-418z" />
+<glyph unicode="⑅" horiz-adv-x="1628" d="M1406 250l-592 342l592 342v-684zM814 592l-592 -342v684zM1307 421v342l-296 -174zM617 589l-296 174v-342z" />
+<glyph unicode="⑆" horiz-adv-x="1576" d="M1354 960h-432v432h432v-432zM1354 0h-432v432h432v-432zM614 200h-392v984h392v-984z" />
+<glyph unicode="⑇" horiz-adv-x="1604" d="M1382 816h-382v432h382v-432zM900 332h-196v584h196v-584zM604 0h-382v432h382v-432z" />
+<glyph unicode="⑈" horiz-adv-x="1526" d="M1304 960h-382v432h382v-432zM738 0h-196v1184h196v-1184zM418 0h-196v1184h196v-1184z" />
+<glyph unicode="⑉" horiz-adv-x="1804" d="M1582 0h-196v432h196v-432zM1186 0h-382v432h382v-432zM604 0h-382v432h382v-432z" />
+<glyph unicode="⑊" horiz-adv-x="1271" d="M1049 0h-94l-473 1421h94zM789 0h-94l-473 1421h94z" />
+<glyph unicode="⑋" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="⑌" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="⑍" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="⑎" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="⑏" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="⑐" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="⑑" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="⑒" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="⑓" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="⑔" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="⑕" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="⑖" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="⑗" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="⑘" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="⑙" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="⑚" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="⑛" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="⑜" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="⑝" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="⑞" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="⑟" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="─" d="M2048 508h-2048v148h2048v-148z" />
+<glyph unicode="━" d="M2048 483h-2048v198h2048v-198z" />
+<glyph unicode="│" d="M1098 -442h-148v2048h148v-2048z" />
+<glyph unicode="┃" d="M1122 -442h-197v2048h197v-2048z" />
+<glyph unicode="┄" d="M1974 508h-535v148h535v-148zM1291 508h-534v148h534v-148zM609 508h-535v148h535v-148z" />
+<glyph unicode="┅" d="M1974 483h-535v198h535v-198zM1291 483h-534v198h534v-198zM609 483h-535v198h535v-198z" />
+<glyph unicode="┆" d="M1098 997h-148v535h148v-535zM1098 315h-148v534h148v-534zM1098 -368h-148v535h148v-535z" />
+<glyph unicode="┇" d="M1122 997h-197v535h197v-535zM1122 315h-197v534h197v-534zM1122 -368h-197v535h197v-535z" />
+<glyph unicode="┈" d="M1974 508h-364v148h364v-148zM1462 508h-364v148h364v-148zM950 508h-364v148h364v-148zM438 508h-364v148h364v-148z" />
+<glyph unicode="┉" d="M1974 483h-364v198h364v-198zM1462 483h-364v198h364v-198zM950 483h-364v198h364v-198zM438 483h-364v198h364v-198z" />
+<glyph unicode="┊" d="M1098 1168h-148v364h148v-364zM1098 656h-148v364h148v-364zM1098 144h-148v364h148v-364zM1098 -368h-148v364h148v-364z" />
+<glyph unicode="┋" d="M1122 1168h-197v364h197v-364zM1122 656h-197v364h197v-364zM1122 144h-197v364h197v-364zM1122 -368h-197v364h197v-364z" />
+<glyph unicode="┌" d="M2048 508h-950v-950h-148v1098h1098v-148z" />
+<glyph unicode="┍" d="M2048 483h-950v-925h-148v1123h1098v-198z" />
+<glyph unicode="┎" d="M2048 508h-926v-950h-197v1098h1123v-148z" />
+<glyph unicode="┏" d="M2048 483h-926v-925h-197v1123h1123v-198z" />
+<glyph unicode="┐" d="M1098 -442h-148v950h-950v148h1098v-1098z" />
+<glyph unicode="┑" d="M1098 -442h-148v925h-950v198h1098v-1123z" />
+<glyph unicode="┒" d="M1123 -442h-198v950h-925v148h1123v-1098z" />
+<glyph unicode="┓" d="M1123 -442h-198v925h-925v198h1123v-1123z" />
+<glyph unicode="└" d="M2048 508h-1098v1098h148v-950h950v-148z" />
+<glyph unicode="┕" d="M2048 483h-1098v1123h148v-925h950v-198z" />
+<glyph unicode="┖" d="M2048 508h-1123v1098h197v-950h926v-148z" />
+<glyph unicode="┗" d="M2048 483h-1123v1123h197v-925h926v-198z" />
+<glyph unicode="┘" d="M1098 508h-1098v148h950v950h148v-1098z" />
+<glyph unicode="┙" d="M1098 483h-1098v198h950v925h148v-1123z" />
+<glyph unicode="┚" d="M1123 508h-1123v148h925v950h198v-1098z" />
+<glyph unicode="┛" d="M1123 483h-1123v198h925v925h198v-1123z" />
+<glyph unicode="├" d="M2048 508h-950v-950h-148v2048h148v-950h950v-148z" />
+<glyph unicode="┝" d="M2048 483h-950v-925h-148v2048h148v-925h950v-198z" />
+<glyph unicode="┞" d="M2048 508h-950v-950h-148v1098h-25v950h197v-950h926v-148z" />
+<glyph unicode="┟" d="M2048 508h-926v-950h-197v950h25v1098h148v-950h950v-148z" />
+<glyph unicode="┠" d="M2048 508h-926v-950h-197v2048h197v-950h926v-148z" />
+<glyph unicode="┡" d="M2048 490h-950v-932h-148v925h-25v1123h197v-925h926v-191z" />
+<glyph unicode="┢" d="M2048 483h-926v-925h-197v1123h25v925h148v-925h950v-198z" />
+<glyph unicode="┣" d="M2048 483h-926v-925h-197v2048h197v-925h926v-198z" />
+<glyph unicode="┤" d="M1098 -442h-148v950h-950v148h950v950h148v-2048z" />
+<glyph unicode="┥" d="M1098 -442h-148v925h-950v198h950v925h148v-2048z" />
+<glyph unicode="┦" d="M1123 656h-25v-1098h-148v950h-950v148h925v950h198v-950z" />
+<glyph unicode="┧" d="M1123 -442h-198v950h-925v148h950v950h148v-1098h25v-950z" />
+<glyph unicode="┨" d="M1123 -442h-198v950h-925v148h925v950h198v-2048z" />
+<glyph unicode="┩" d="M1123 483h-25v-925h-148v925h-950v198h925v925h198v-1123z" />
+<glyph unicode="┪" d="M1123 -442h-198v925h-925v198h950v925h148v-925h25v-1123z" />
+<glyph unicode="┫" d="M1123 -442h-198v925h-925v198h925v925h198v-2048z" />
+<glyph unicode="┬" d="M2048 508h-950v-950h-148v950h-950v148h2048v-148z" />
+<glyph unicode="┭" d="M2048 508h-950v-950h-148v925h-950v198h950v-25h1098v-148z" />
+<glyph unicode="┮" d="M2048 483h-950v-925h-148v950h-950v148h1098v25h950v-198z" />
+<glyph unicode="┯" d="M2048 483h-950v-925h-148v925h-950v198h2048v-198z" />
+<glyph unicode="┰" d="M2048 508h-925v-950h-198v950h-925v148h2048v-148z" />
+<glyph unicode="┱" d="M2048 508h-925v-950h-198v925h-925v198h1123v-25h925v-148z" />
+<glyph unicode="┲" d="M2048 483h-925v-925h-198v950h-925v148h925v25h1123v-198z" />
+<glyph unicode="┳" d="M2048 483h-925v-925h-198v925h-925v198h2048v-198z" />
+<glyph unicode="┴" d="M2048 508h-2048v148h950v950h148v-950h950v-148z" />
+<glyph unicode="┵" d="M2048 508h-1098v-25h-950v198h950v925h148v-950h950v-148z" />
+<glyph unicode="┶" d="M2048 483h-950v25h-1098v148h950v950h148v-925h950v-198z" />
+<glyph unicode="┷" d="M2048 483h-2048v198h950v925h148v-925h950v-198z" />
+<glyph unicode="┸" d="M2048 508h-2048v148h925v950h198v-950h925v-148z" />
+<glyph unicode="┹" d="M2048 508h-925v-25h-1123v198h925v925h198v-950h925v-148z" />
+<glyph unicode="┺" d="M2048 483h-1123v25h-925v148h925v950h198v-925h925v-198z" />
+<glyph unicode="┻" d="M2048 483h-2048v198h925v925h198v-925h925v-198z" />
+<glyph unicode="┼" d="M2048 508h-950v-950h-148v950h-950v148h950v950h148v-950h950v-148z" />
+<glyph unicode="┽" d="M2048 508h-950v-950h-148v925h-950v198h950v925h148v-950h950v-148z" />
+<glyph unicode="┾" d="M2048 483h-950v-925h-148v950h-950v148h950v950h148v-925h950v-198z" />
+<glyph unicode="┿" d="M2048 483h-950v-925h-148v925h-950v198h950v925h148v-925h950v-198z" />
+<glyph unicode="╀" d="M2048 508h-950v-950h-148v950h-950v148h925v950h198v-950h925v-148z" />
+<glyph unicode="╁" d="M2048 508h-925v-950h-198v950h-925v148h950v950h148v-950h950v-148z" />
+<glyph unicode="╂" d="M2048 508h-925v-950h-198v950h-925v148h925v950h198v-950h925v-148z" />
+<glyph unicode="╃" d="M2048 508h-950v-950h-148v925h-950v198h925v925h198v-950h925v-148z" />
+<glyph unicode="╄" d="M2048 483h-950v-925h-148v950h-950v148h925v950h198v-925h925v-198z" />
+<glyph unicode="╅" d="M2048 508h-925v-950h-198v925h-925v198h950v925h148v-950h950v-148z" />
+<glyph unicode="╆" d="M2048 483h-925v-925h-198v950h-925v148h950v950h148v-925h950v-198z" />
+<glyph unicode="╇" d="M2048 483h-950v-925h-148v925h-950v198h925v925h198v-925h925v-198z" />
+<glyph unicode="╈" d="M2048 483h-925v-925h-198v925h-925v198h950v925h148v-925h950v-198z" />
+<glyph unicode="╉" d="M2048 508h-925v-950h-198v925h-925v198h925v925h198v-950h925v-148z" />
+<glyph unicode="╊" d="M2048 483h-925v-925h-198v950h-925v148h925v950h198v-925h925v-198z" />
+<glyph unicode="╋" d="M2048 483h-925v-925h-198v925h-925v198h925v925h198v-925h925v-198z" />
+<glyph unicode="╌" d="M1974 508h-876v148h876v-148zM950 508h-876v148h876v-148z" />
+<glyph unicode="╍" d="M1974 483h-876v198h876v-198zM950 483h-876v198h876v-198z" />
+<glyph unicode="╎" d="M1098 656h-148v876h148v-876zM1098 -368h-148v876h148v-876z" />
+<glyph unicode="╏" d="M1122 656h-197v876h197v-876zM1122 -368h-197v876h197v-876z" />
+<glyph unicode="═" d="M2048 360h-2048v148h2048v-148zM2048 656h-2048v148h2048v-148z" />
+<glyph unicode="║" d="M950 -442h-148v2048h148v-2048zM1246 -442h-148v2048h148v-2048z" />
+<glyph unicode="╒" d="M2048 360h-975v-802h-148v1246h1123v-148h-975v-148h975v-148z" />
+<glyph unicode="╓" d="M2048 508h-802v-950h-148v950h-148v-950h-148v1098h1246v-148z" />
+<glyph unicode="╔" d="M2048 656h-1098v-1098h-148v1246h1246v-148zM2048 360h-802v-802h-148v950h950v-148z" />
+<glyph unicode="╕" d="M1098 -442h-148v802h-950v148h950v148h-950v148h1098v-1246z" />
+<glyph unicode="╖" d="M1246 -442h-148v950h-148v-950h-148v950h-802v148h1246v-1098z" />
+<glyph unicode="╗" d="M1246 -442h-148v1098h-1098v148h1246v-1246zM950 -442h-148v802h-802v148h950v-950z" />
+<glyph unicode="╘" d="M2048 360h-1246v1246h148v-802h1098v-148h-1098v-148h1098v-148z" />
+<glyph unicode="╙" d="M2048 508h-1246v1098h148v-950h148v950h148v-950h802v-148z" />
+<glyph unicode="╚" d="M2048 656h-950v950h148v-802h802v-148zM2048 360h-1246v1246h148v-1098h1098v-148z" />
+<glyph unicode="╛" d="M1098 360h-1098v148h950v148h-950v148h950v802h148v-1246z" />
+<glyph unicode="╜" d="M1246 508h-1246v148h802v950h148v-950h148v950h148v-1098z" />
+<glyph unicode="╝" d="M950 656h-950v148h802v802h148v-950zM1246 360h-1246v148h1098v1098h148v-1246z" />
+<glyph unicode="╞" d="M2048 360h-950v-802h-148v2048h148v-802h950v-148h-950v-148h950v-148z" />
+<glyph unicode="╟" d="M950 -442h-148v2048h148v-2048zM2048 508h-802v-950h-148v2048h148v-950h802v-148z" />
+<glyph unicode="╠" d="M950 -442h-148v2048h148v-2048zM2048 656h-950v950h148v-802h802v-148zM2048 360h-802v-802h-148v950h950v-148z" />
+<glyph unicode="╡" d="M1098 -442h-148v802h-950v148h950v148h-950v148h950v802h148v-2048z" />
+<glyph unicode="╢" d="M1246 -442h-148v2048h148v-2048zM950 -442h-148v950h-802v148h802v950h148v-2048z" />
+<glyph unicode="╣" d="M1246 -442h-148v2048h148v-2048zM950 656h-950v148h802v802h148v-950zM950 -442h-148v802h-802v148h950v-950z" />
+<glyph unicode="╤" d="M2048 656h-2048v148h2048v-148zM2048 360h-950v-802h-148v802h-950v148h2048v-148z" />
+<glyph unicode="╥" d="M2048 508h-802v-950h-148v950h-148v-950h-148v950h-802v148h2048v-148z" />
+<glyph unicode="╦" d="M2048 656h-2048v148h2048v-148zM2048 360h-802v-802h-148v950h950v-148zM950 -442h-148v802h-802v148h950v-950z" />
+<glyph unicode="╧" d="M2048 360h-2048v148h2048v-148zM2048 656h-2048v148h950v802h148v-802h950v-148z" />
+<glyph unicode="╨" d="M2048 508h-2048v148h802v950h148v-950h148v950h148v-950h802v-148z" />
+<glyph unicode="╩" d="M2048 360h-2048v148h2048v-148zM2048 656h-950v950h148v-802h802v-148zM950 656h-950v148h802v802h148v-950z" />
+<glyph unicode="╪" d="M2048 360h-950v-802h-148v802h-950v148h950v148h-950v148h950v802h148v-802h950v-148h-950v-148h950v-148z" />
+<glyph unicode="╫" d="M2048 508h-802v-950h-148v950h-148v-950h-148v950h-802v148h802v950h148v-950h148v950h148v-950h802v-148z" />
+<glyph unicode="╬" d="M2048 656h-950v950h148v-802h802v-148zM950 656h-950v148h802v802h148v-950zM2048 360h-802v-802h-148v950h950v-148zM950 -442h-148v802h-802v148h950v-950z" />
+<glyph unicode="╭" d="M2048 508q-397 0 -673.5 -276.5t-276.5 -673.5h-148q0 458 320 778t778 320v-148z" />
+<glyph unicode="╮" d="M1098 -442h-148q0 397 -276.5 673.5t-673.5 276.5v148q458 0 778 -320t320 -778z" />
+<glyph unicode="╯" d="M1098 1606q0 -457 -320.5 -777.5t-777.5 -320.5v148q397 0 673.5 276.5t276.5 673.5h148z" />
+<glyph unicode="╰" d="M2048 508q-457 0 -777.5 320.5t-320.5 777.5h148q0 -397 276.5 -673.5t673.5 -276.5v-148z" />
+<glyph unicode="╱" d="M2158 1606l-2048 -2048h-220l2048 2048h220z" />
+<glyph unicode="╲" d="M2158 -442h-220l-2048 2048h220z" />
+<glyph unicode="╳" d="M2158 -442h-220l-914 914l-914 -914h-220l1024 1024l-1024 1024h220l914 -914l914 914h220l-1024 -1024z" />
+<glyph unicode="╴" d="M1024 508h-1024v148h1024v-148z" />
+<glyph unicode="╵" d="M1098 582h-148v1024h148v-1024z" />
+<glyph unicode="╶" d="M2048 508h-1024v148h1024v-148z" />
+<glyph unicode="╷" d="M1098 -442h-148v1024h148v-1024z" />
+<glyph unicode="╸" d="M1024 483h-1024v198h1024v-198z" />
+<glyph unicode="╹" d="M1123 582h-198v1024h198v-1024z" />
+<glyph unicode="╺" d="M2048 483h-1024v198h1024v-198z" />
+<glyph unicode="╻" d="M1123 -442h-198v1024h198v-1024z" />
+<glyph unicode="╼" d="M2048 483h-1024v25h-1024v148h1024v25h1024v-198z" />
+<glyph unicode="╽" d="M1123 -442h-198v1024h25v1024h148v-1024h25v-1024z" />
+<glyph unicode="╾" d="M2048 508h-1024v-25h-1024v198h1024v-25h1024v-148z" />
+<glyph unicode="╿" d="M1123 582h-25v-1024h-148v1024h-25v1024h198v-1024z" />
+<glyph unicode="▀" d="M2048 582h-2048v1024h2048v-1024z" />
+<glyph unicode="▁" d="M2048 -442h-2048v256h2048v-256z" />
+<glyph unicode="▂" d="M2048 -442h-2048v512h2048v-512z" />
+<glyph unicode="▃" d="M2048 -442h-2048v768h2048v-768z" />
+<glyph unicode="▄" d="M2048 -442h-2048v1024h2048v-1024z" />
+<glyph unicode="▅" d="M2048 -442h-2048v1280h2048v-1280z" />
+<glyph unicode="▆" d="M2048 -442h-2048v1536h2048v-1536z" />
+<glyph unicode="▇" d="M2048 -442h-2048v1792h2048v-1792z" />
+<glyph unicode="█" d="M2048 -442h-2048v2048h2048v-2048z" />
+<glyph unicode="▉" d="M1792 -442h-1792v2048h1792v-2048z" />
+<glyph unicode="▊" d="M1536 -442h-1536v2048h1536v-2048z" />
+<glyph unicode="▋" d="M1280 -442h-1280v2048h1280v-2048z" />
+<glyph unicode="▌" d="M1024 -442h-1024v2048h1024v-2048z" />
+<glyph unicode="▍" d="M768 -442h-768v2048h768v-2048z" />
+<glyph unicode="▎" d="M512 -442h-512v2048h512v-2048z" />
+<glyph unicode="▏" d="M256 -442h-256v2048h256v-2048z" />
+<glyph unicode="▐" d="M2048 -442h-1024v2048h1024v-2048z" />
+<glyph unicode="░" d="M1920 1478h-128v128h128v-128zM1664 1478h-128v128h128v-128zM1920 1222h-128v128h128v-128zM1408 1478h-128v128h128v-128zM1664 1222h-128v128h128v-128zM1920 966h-128v128h128v-128zM1152 1478h-128v128h128v-128zM1408 1222h-128v128h128v-128zM1664 966h-128v128 h128v-128zM1920 710h-128v128h128v-128zM896 1478h-128v128h128v-128zM1152 1222h-128v128h128v-128zM1408 966h-128v128h128v-128zM1664 710h-128v128h128v-128zM1920 454h-128v128h128v-128zM640 1478h-128v128h128v-128zM896 1222h-128v128h128v-128zM1152 966h-128v128 h128v-128zM1408 710h-128v128h128v-128zM1664 454h-128v128h128v-128zM1920 198h-128v128h128v-128zM384 1478h-128v128h128v-128zM640 1222h-128v128h128v-128zM896 966h-128v128h128v-128zM1152 710h-128v128h128v-128zM1408 454h-128v128h128v-128zM1664 198h-128v128 h128v-128zM1920 -58h-128v128h128v-128zM128 1478h-128v128h128v-128zM384 1222h-128v128h128v-128zM640 966h-128v128h128v-128zM896 710h-128v128h128v-128zM1152 454h-128v128h128v-128zM1408 198h-128v128h128v-128zM1664 -58h-128v128h128v-128zM1920 -314h-128v128 h128v-128zM128 1222h-128v128h128v-128zM384 966h-128v128h128v-128zM640 710h-128v128h128v-128zM896 454h-128v128h128v-128zM1152 198h-128v128h128v-128zM1408 -58h-128v128h128v-128zM1664 -314h-128v128h128v-128zM128 966h-128v128h128v-128zM384 710h-128v128h128 v-128zM640 454h-128v128h128v-128zM896 198h-128v128h128v-128zM1152 -58h-128v128h128v-128zM1408 -314h-128v128h128v-128zM128 710h-128v128h128v-128zM384 454h-128v128h128v-128zM640 198h-128v128h128v-128zM896 -58h-128v128h128v-128zM1152 -314h-128v128h128v-128z M128 454h-128v128h128v-128zM384 198h-128v128h128v-128zM640 -58h-128v128h128v-128zM896 -314h-128v128h128v-128zM128 198h-128v128h128v-128zM384 -58h-128v128h128v-128zM640 -314h-128v128h128v-128zM128 -58h-128v128h128v-128zM384 -314h-128v128h128v-128z M128 -314h-128v128h128v-128z" />
+<glyph unicode="▒" d="M1920 1478h-128v128h128v-128zM2048 1350h-128v128h128v-128zM1664 1478h-128v128h128v-128zM1792 1350h-128v128h128v-128zM1920 1222h-128v128h128v-128zM2048 1094h-128v128h128v-128zM1408 1478h-128v128h128v-128zM1536 1350h-128v128h128v-128zM1664 1222h-128v128 h128v-128zM1792 1094h-128v128h128v-128zM1920 966h-128v128h128v-128zM2048 838h-128v128h128v-128zM1152 1478h-128v128h128v-128zM1280 1350h-128v128h128v-128zM1408 1222h-128v128h128v-128zM1536 1094h-128v128h128v-128zM1664 966h-128v128h128v-128zM1792 838h-128 v128h128v-128zM1920 710h-128v128h128v-128zM2048 582h-128v128h128v-128zM896 1478h-128v128h128v-128zM1024 1350h-128v128h128v-128zM1152 1222h-128v128h128v-128zM1280 1094h-128v128h128v-128zM1408 966h-128v128h128v-128zM1536 838h-128v128h128v-128zM1664 710 h-128v128h128v-128zM1792 582h-128v128h128v-128zM1920 454h-128v128h128v-128zM2048 326h-128v128h128v-128zM640 1478h-128v128h128v-128zM768 1350h-128v128h128v-128zM896 1222h-128v128h128v-128zM1024 1094h-128v128h128v-128zM1152 966h-128v128h128v-128zM1280 838 h-128v128h128v-128zM1408 710h-128v128h128v-128zM1536 582h-128v128h128v-128zM1664 454h-128v128h128v-128zM1792 326h-128v128h128v-128zM1920 198h-128v128h128v-128zM2048 70h-128v128h128v-128zM384 1478h-128v128h128v-128zM512 1350h-128v128h128v-128zM640 1222 h-128v128h128v-128zM768 1094h-128v128h128v-128zM896 966h-128v128h128v-128zM1024 838h-128v128h128v-128zM1152 710h-128v128h128v-128zM1280 582h-128v128h128v-128zM1408 454h-128v128h128v-128zM1536 326h-128v128h128v-128zM1664 198h-128v128h128v-128zM1792 70 h-128v128h128v-128zM1920 -58h-128v128h128v-128zM2048 -186h-128v128h128v-128zM128 1478h-128v128h128v-128zM256 1350h-128v128h128v-128zM384 1222h-128v128h128v-128zM512 1094h-128v128h128v-128zM640 966h-128v128h128v-128zM768 838h-128v128h128v-128zM896 710 h-128v128h128v-128zM1024 582h-128v128h128v-128zM1152 454h-128v128h128v-128zM1280 326h-128v128h128v-128zM1408 198h-128v128h128v-128zM1536 70h-128v128h128v-128zM1664 -58h-128v128h128v-128zM1792 -186h-128v128h128v-128zM1920 -314h-128v128h128v-128zM2048 -442 h-128v128h128v-128zM128 1222h-128v128h128v-128zM256 1094h-128v128h128v-128zM384 966h-128v128h128v-128zM512 838h-128v128h128v-128zM640 710h-128v128h128v-128zM768 582h-128v128h128v-128zM896 454h-128v128h128v-128zM1024 326h-128v128h128v-128zM1152 198h-128 v128h128v-128zM1280 70h-128v128h128v-128zM1408 -58h-128v128h128v-128zM1536 -186h-128v128h128v-128zM1664 -314h-128v128h128v-128zM1792 -442h-128v128h128v-128zM128 966h-128v128h128v-128zM256 838h-128v128h128v-128zM384 710h-128v128h128v-128zM512 582h-128v128 h128v-128zM640 454h-128v128h128v-128zM768 326h-128v128h128v-128zM896 198h-128v128h128v-128zM1024 70h-128v128h128v-128zM1152 -58h-128v128h128v-128zM1280 -186h-128v128h128v-128zM1408 -314h-128v128h128v-128zM1536 -442h-128v128h128v-128zM128 710h-128v128h128 v-128zM256 582h-128v128h128v-128zM384 454h-128v128h128v-128zM512 326h-128v128h128v-128zM640 198h-128v128h128v-128zM768 70h-128v128h128v-128zM896 -58h-128v128h128v-128zM1024 -186h-128v128h128v-128zM1152 -314h-128v128h128v-128zM1280 -442h-128v128h128v-128z M128 454h-128v128h128v-128zM256 326h-128v128h128v-128zM384 198h-128v128h128v-128zM512 70h-128v128h128v-128zM640 -58h-128v128h128v-128zM768 -186h-128v128h128v-128zM896 -314h-128v128h128v-128zM1024 -442h-128v128h128v-128zM128 198h-128v128h128v-128zM256 70 h-128v128h128v-128zM384 -58h-128v128h128v-128zM512 -186h-128v128h128v-128zM640 -314h-128v128h128v-128zM768 -442h-128v128h128v-128zM128 -58h-128v128h128v-128zM256 -186h-128v128h128v-128zM384 -314h-128v128h128v-128zM512 -442h-128v128h128v-128zM128 -314 h-128v128h128v-128zM256 -442h-128v128h128v-128z" />
+<glyph unicode="▓" d="M2048 -314h-128v-128h-128v128h-128v-128h-128v128h-128v-128h-128v128h-128v-128h-128v128h-128v-128h-128v128h-128v-128h-128v128h-128v-128h-128v128h-128v-128h-128v2048h2048v-128h-128v-128h128v-128h-128v-128h128v-128h-128v-128h128v-128h-128v-128h128v-128 h-128v-128h128v-128h-128v-128h128v-128h-128v-128h128v-128zM1792 1350v128h-128v-128h128zM1536 1350v128h-128v-128h128zM1792 1094v128h-128v-128h128zM1280 1350v128h-128v-128h128zM1536 1094v128h-128v-128h128zM1792 838v128h-128v-128h128zM1024 1350v128h-128 v-128h128zM1280 1094v128h-128v-128h128zM1536 838v128h-128v-128h128zM1792 582v128h-128v-128h128zM768 1350v128h-128v-128h128zM1024 1094v128h-128v-128h128zM1280 838v128h-128v-128h128zM1536 582v128h-128v-128h128zM1792 326v128h-128v-128h128zM512 1350v128h-128 v-128h128zM768 1094v128h-128v-128h128zM1024 838v128h-128v-128h128zM1280 582v128h-128v-128h128zM1536 326v128h-128v-128h128zM1792 70v128h-128v-128h128zM256 1350v128h-128v-128h128zM512 1094v128h-128v-128h128zM768 838v128h-128v-128h128zM1024 582v128h-128 v-128h128zM1280 326v128h-128v-128h128zM1536 70v128h-128v-128h128zM1792 -186v128h-128v-128h128zM256 1094v128h-128v-128h128zM512 838v128h-128v-128h128zM768 582v128h-128v-128h128zM1024 326v128h-128v-128h128zM1280 70v128h-128v-128h128zM1536 -186v128h-128 v-128h128zM256 838v128h-128v-128h128zM512 582v128h-128v-128h128zM768 326v128h-128v-128h128zM1024 70v128h-128v-128h128zM1280 -186v128h-128v-128h128zM256 582v128h-128v-128h128zM512 326v128h-128v-128h128zM768 70v128h-128v-128h128zM1024 -186v128h-128v-128 h128zM256 326v128h-128v-128h128zM512 70v128h-128v-128h128zM768 -186v128h-128v-128h128zM256 70v128h-128v-128h128zM512 -186v128h-128v-128h128zM256 -186v128h-128v-128h128z" />
+<glyph unicode="▔" d="M2048 1350h-2048v256h2048v-256z" />
+<glyph unicode="▕" d="M2048 -442h-256v2048h256v-2048z" />
+<glyph unicode="▖" d="M1024 -442h-1024v1024h1024v-1024z" />
+<glyph unicode="▗" d="M2048 -442h-1024v1024h1024v-1024z" />
+<glyph unicode="▘" d="M1024 582h-1024v1024h1024v-1024z" />
+<glyph unicode="▙" d="M2048 -442h-2048v2048h1024v-1024h1024v-1024z" />
+<glyph unicode="▚" d="M2048 -442h-1024v1024h1024v-1024zM1024 582h-1024v1024h1024v-1024z" />
+<glyph unicode="▛" d="M2048 582h-1024v-1024h-1024v2048h2048v-1024z" />
+<glyph unicode="▜" d="M2048 -442h-1024v1024h-1024v1024h2048v-2048z" />
+<glyph unicode="▝" d="M2048 582h-1024v1024h1024v-1024z" />
+<glyph unicode="▞" d="M1024 -442h-1024v1024h1024v-1024zM2048 582h-1024v1024h1024v-1024z" />
+<glyph unicode="▟" d="M2048 -442h-2048v1024h1024v1024h1024v-2048z" />
+<glyph unicode="■" horiz-adv-x="1578" d="M1461 -90h-1344v1344h1344v-1344z" />
+<glyph unicode="□" horiz-adv-x="1578" d="M1461 -90h-1344v1344h1344v-1344zM1361 10v1144h-1144v-1144h1144z" />
+<glyph unicode="▢" horiz-adv-x="1628" d="M1406 352q0 -147 -102.5 -249.5t-249.5 -102.5h-480q-147 0 -249.5 102.5t-102.5 249.5v480q0 148 102 250t250 102h480q147 0 249.5 -102.5t102.5 -249.5v-480zM1308 352v480q0 106 -74 180t-180 74h-480q-106 0 -179.5 -73.5t-73.5 -180.5v-480q0 -105 74 -179t179 -74 h480q105 0 179.5 74t74.5 179z" />
+<glyph unicode="▣" horiz-adv-x="1578" d="M1461 -90h-1344v1344h1344v-1344zM1361 10v1144h-1144v-1144h1144zM1085 286h-592v592h592v-592z" />
+<glyph unicode="▤" horiz-adv-x="1578" d="M1461 -90h-1344v1344h1344v-1344zM1361 943v211h-1144v-211h1144zM1361 632v211h-1144v-211h1144zM1361 321v211h-1144v-211h1144zM1361 10v211h-1144v-211h1144z" />
+<glyph unicode="▥" horiz-adv-x="1578" d="M1461 -90h-1344v1344h1344v-1344zM1361 10v1144h-211v-1144h211zM1050 10v1144h-211v-1144h211zM739 10v1144h-211v-1144h211zM428 10v1144h-211v-1144h211z" />
+<glyph unicode="▦" horiz-adv-x="1578" d="M1461 -90h-1344v1344h1344v-1344zM1361 943v211h-211v-211h211zM1050 943v211h-211v-211h211zM1361 632v211h-211v-211h211zM739 943v211h-211v-211h211zM1050 632v211h-211v-211h211zM1361 321v211h-211v-211h211zM428 943v211h-211v-211h211zM739 632v211h-211v-211 h211zM1050 321v211h-211v-211h211zM1361 10v211h-211v-211h211zM428 632v211h-211v-211h211zM739 321v211h-211v-211h211zM1050 10v211h-211v-211h211zM428 321v211h-211v-211h211zM739 10v211h-211v-211h211zM428 10v211h-211v-211h211z" />
+<glyph unicode="▧" horiz-adv-x="1578" d="M1461 -90h-1344v1344h1344v-1344zM1361 1154h-194l194 -194v194zM1361 521v298l-335 335h-298zM1361 81v298l-775 775h-298zM1290 10l-1073 1073v-298l775 -775h298zM850 10l-633 633v-298l335 -335h298zM217 10h194l-194 194v-194z" />
+<glyph unicode="▨" horiz-adv-x="1578" d="M1461 -90h-1344v1344h1344v-1344zM217 1154v-194l194 194h-194zM850 1154h-298l-335 -335v-298zM1290 1154h-298l-775 -775v-298zM1361 785v298l-1073 -1073h298zM1361 345v298l-633 -633h298zM1361 10v194l-194 -194h194z" />
+<glyph unicode="▩" horiz-adv-x="1578" d="M1461 -90h-1344v1344h1344v-1344zM1290 1154h-123l62 -61zM1361 960v123l-61 -61zM1158 1022l-132 132h-34l-132 -132l149 -149zM1361 785v34l-132 132l-149 -149l149 -149zM850 1154h-122l61 -61zM1361 521v122l-61 -61zM938 802l-149 149l-149 -149l149 -149zM1158 582 l-149 149l-149 -149l149 -149zM718 1022l-132 132h-34l-132 -132l149 -149zM1361 345v34l-132 132l-149 -149l149 -149zM411 1154h-123l61 -61zM1361 81v123l-61 -62zM278 1022l-61 61v-123zM1290 10l-61 61l-62 -61h123zM498 802l-149 149l-132 -132v-34l132 -132z M1158 142l-149 149l-149 -149l132 -132h34zM718 582l-149 149l-149 -149l149 -149zM938 362l-149 149l-149 -149l149 -149zM278 582l-61 61v-122zM850 10l-61 61l-61 -61h122zM498 362l-149 149l-132 -132v-34l132 -132zM718 142l-149 149l-149 -149l132 -132h34zM278 142 l-61 62v-123zM411 10l-62 61l-61 -61h123z" />
+<glyph unicode="▪" horiz-adv-x="738" d="M665 286h-592v592h592v-592z" />
+<glyph unicode="▫" horiz-adv-x="738" d="M665 286h-592v592h592v-592zM565 386v392h-392v-392h392z" />
+<glyph unicode="▬" horiz-adv-x="1338" d="M1265 286h-1192v592h1192v-592z" />
+<glyph unicode="▭" horiz-adv-x="1338" d="M1265 286h-1192v592h1192v-592zM1165 386v392h-992v-392h992z" />
+<glyph unicode="▮" horiz-adv-x="738" d="M665 -14h-592v1192h592v-1192z" />
+<glyph unicode="▯" horiz-adv-x="738" d="M665 -14h-592v1192h592v-1192zM565 86v992h-392v-992h392z" />
+<glyph unicode="▰" horiz-adv-x="1638" d="M1565 878l-300 -592h-1192l300 592h1192z" />
+<glyph unicode="▱" horiz-adv-x="1638" d="M1565 878l-300 -592h-1192l300 592h1192zM1402 778h-968l-198 -392h968z" />
+<glyph unicode="▲" horiz-adv-x="1578" d="M1530 18h-1482l741 1191z" />
+<glyph unicode="△" horiz-adv-x="1578" d="M1530 18h-1482l741 1191zM1350 118l-561 902l-561 -902h1122z" />
+<glyph unicode="▴" horiz-adv-x="738" d="M695 334h-652l326 524z" />
+<glyph unicode="▵" horiz-adv-x="738" d="M695 334h-652l326 524zM515 434l-146 235l-146 -235h292z" />
+<glyph unicode="▶" horiz-adv-x="1356" d="M1308 582l-1191 -741v1482z" />
+<glyph unicode="▷" horiz-adv-x="1356" d="M1308 582l-1191 -741v1482zM1119 582l-902 561v-1122z" />
+<glyph unicode="▸" horiz-adv-x="645" d="M597 582l-524 -326v652z" />
+<glyph unicode="▹" horiz-adv-x="645" d="M597 582l-524 -326v652zM408 582l-235 146v-292z" />
+<glyph unicode="►" horiz-adv-x="1888" d="M1808 582l-1606 -564v1128z" />
+<glyph unicode="▻" horiz-adv-x="1888" d="M1808 582l-1606 -564v1128zM1506 582l-1204 423v-846z" />
+<glyph unicode="▼" horiz-adv-x="1578" d="M1530 1209l-741 -1191l-741 1191h1482z" />
+<glyph unicode="▽" horiz-adv-x="1578" d="M1530 1209l-741 -1191l-741 1191h1482zM1350 1109h-1122l561 -902z" />
+<glyph unicode="▾" horiz-adv-x="738" d="M695 858l-326 -524l-326 524h652z" />
+<glyph unicode="▿" horiz-adv-x="738" d="M695 858l-326 -524l-326 524h652zM515 758h-292l146 -235z" />
+<glyph unicode="◀" horiz-adv-x="1356" d="M1239 -159l-1191 741l1191 741v-1482z" />
+<glyph unicode="◁" horiz-adv-x="1356" d="M1239 -159l-1191 741l1191 741v-1482zM1139 21v1122l-902 -561z" />
+<glyph unicode="◂" horiz-adv-x="645" d="M572 256l-524 326l524 326v-652z" />
+<glyph unicode="◃" horiz-adv-x="645" d="M572 256l-524 326l524 326v-652zM472 436v292l-235 -146z" />
+<glyph unicode="◄" horiz-adv-x="1888" d="M1686 18l-1606 564l1606 564v-1128z" />
+<glyph unicode="◅" horiz-adv-x="1888" d="M1686 18l-1606 564l1606 564v-1128zM1586 159v846l-1204 -423z" />
+<glyph unicode="◆" horiz-adv-x="1578" d="M1568 582l-779 -779l-779 779l779 779z" />
+<glyph unicode="◇" horiz-adv-x="1578" d="M1568 582l-779 -779l-779 779l779 779zM1427 582l-638 638l-638 -638l638 -638z" />
+<glyph unicode="◈" horiz-adv-x="1578" d="M1568 582l-779 -779l-779 779l779 779zM1427 582l-638 638l-638 -638l638 -638zM1132 582l-343 -343l-343 343l343 343z" />
+<glyph unicode="◉" horiz-adv-x="1578" d="M1222 582q0 -180 -126.5 -306.5t-306.5 -126.5t-306.5 126.5t-126.5 306.5t126.5 306.5t306.5 126.5t306.5 -126.5t126.5 -306.5zM1538 582q0 -312 -218.5 -530.5t-530.5 -218.5t-530.5 218.5t-218.5 530.5t218.5 530.5t530.5 218.5t530.5 -218.5t218.5 -530.5zM1438 582 q0 270 -189.5 459.5t-459.5 189.5t-459.5 -189.5t-189.5 -459.5t189.5 -459.5t459.5 -189.5t459.5 189.5t189.5 459.5z" />
+<glyph unicode="◊" horiz-adv-x="1578" d="M1378 582l-589 -779l-589 779l589 779zM1253 582l-464 613l-464 -613l464 -613z" />
+<glyph unicode="○" horiz-adv-x="1578" d="M1538 582q0 -312 -218.5 -530.5t-530.5 -218.5t-530.5 218.5t-218.5 530.5t218.5 530.5t530.5 218.5t530.5 -218.5t218.5 -530.5zM1438 582q0 270 -189.5 459.5t-459.5 189.5t-459.5 -189.5t-189.5 -459.5t189.5 -459.5t459.5 -189.5t459.5 189.5t189.5 459.5z" />
+<glyph unicode="◌" horiz-adv-x="1174" d="M1021 896q0 -23 -18 -38t-41 -15t-38 18t-15 41t17.5 38t41 15t38.5 -18t15 -41zM833 953q-14 0 -27 7q-29 17 -29 49q0 15 8 28q16 28 49 28q14 0 28 -8q28 -16 28 -39.5t-8 -36.5q-16 -28 -49 -28zM1106 751q0 -56 -56 -56t-56 56t56 56t56 -56zM617 1077q9 47 50 47 q7 0 15 -2q47 -8 47 -49q0 -7 -1 -15q-9 -47 -50 -47q-7 0 -15 1q-47 9 -47 50q0 7 1 15zM1136 582q0 -56 -56 -56t-56 56t56 56t56 -56zM446 1058q-1 8 -1 15q0 41 47 49q8 2 15 2q41 0 49 -47q2 -8 2 -15q0 -41 -47 -50q-8 -1 -15 -1q-41 0 -50 47zM1050 357q-56 0 -56 56 t56 56t56 -56t-56 -56zM389 1037q8 -13 8 -36.5t-21 -35.5t-35 -12q-33 0 -49 28q-8 13 -8 28q0 32 29 48q13 8 27 8q33 0 49 -28zM967.5 209q-23.5 0 -41 15t-17.5 38t15 41t38 18t41 -15t18 -38t-15 -41t-38.5 -18zM212 843q-23 0 -41 15t-18 38t15 41t38.5 18t41 -15 t17.5 -38t-15 -41t-38 -18zM882 183q8 -13 8 -36.5t-21 -35.5t-35 -12q-33 0 -49 28q-8 13 -8 28q0 32 29 49q13 7 27 7q33 0 49 -28zM124 695q-56 0 -56 56t56 56t56 -56t-56 -56zM617 87q-1 8 -1 15q0 41 47 50q8 1 15 1q41 0 50 -47q1 -8 1 -15q0 -41 -47 -49 q-8 -2 -15 -2q-41 0 -50 47zM150 582q0 -56 -56 -56t-56 56t56 56t56 -56zM446 106q9 47 50 47q7 0 15 -1q47 -9 47 -50q0 -7 -2 -15q-8 -47 -49 -47q-7 0 -15 2q-47 8 -47 49q0 7 1 15zM180 413q0 -56 -56 -56t-56 56t56 56t56 -56zM340 99q-14 0 -27 8q-29 16 -29 48 q0 15 8 28q16 28 49 28q14 0 35 -12t21 -35.5t-8 -36.5q-16 -28 -49 -28zM265 262q0 -23 -17.5 -38t-41 -15t-38.5 18t-15 41t18 38t41 15t38 -18t15 -41z" />
+<glyph unicode="◍" horiz-adv-x="1578" d="M1538 582q0 -312 -218.5 -530.5t-530.5 -218.5t-530.5 218.5t-218.5 530.5t218.5 530.5t530.5 218.5t530.5 -218.5t218.5 -530.5zM1438 582q0 310 -238 504v-1008q238 194 238 504zM1100 11v1142q-121 66 -261 76v-1294q140 10 261 76zM739 -65v1294q-140 -10 -261 -76 v-1142q121 -66 261 -76zM140 582q0 -310 238 -504v1008q-238 -194 -238 -504z" />
+<glyph unicode="◎" horiz-adv-x="1578" d="M1538 582q0 -312 -218.5 -530.5t-530.5 -218.5t-530.5 218.5t-218.5 530.5t218.5 530.5t530.5 218.5t530.5 -218.5t218.5 -530.5zM1438 582q0 270 -189.5 459.5t-459.5 189.5t-459.5 -189.5t-189.5 -459.5t189.5 -459.5t459.5 -189.5t459.5 189.5t189.5 459.5zM1288 582 q0 -208 -145.5 -353.5t-353.5 -145.5t-353.5 145.5t-145.5 353.5t145.5 353.5t353.5 145.5t353.5 -145.5t145.5 -353.5zM1188 582q0 167 -116 283t-283 116t-283 -116t-116 -283t116 -283t283 -116t283 116t116 283z" />
+<glyph unicode="●" horiz-adv-x="1578" d="M1538 582q0 -312 -218.5 -530.5t-530.5 -218.5t-530.5 218.5t-218.5 530.5t218.5 530.5t530.5 218.5t530.5 -218.5t218.5 -530.5z" />
+<glyph unicode="◐" horiz-adv-x="1578" d="M1538 582q0 -312 -218.5 -530.5t-530.5 -218.5t-530.5 218.5t-218.5 530.5t218.5 530.5t530.5 218.5t530.5 -218.5t218.5 -530.5zM1438 582q0 270 -189.5 459.5t-459.5 189.5v-1298q270 0 459.5 189.5t189.5 459.5z" />
+<glyph unicode="◑" horiz-adv-x="1578" d="M1538 582q0 -312 -218.5 -530.5t-530.5 -218.5t-530.5 218.5t-218.5 530.5t218.5 530.5t530.5 218.5t530.5 -218.5t218.5 -530.5zM789 -67v1298q-270 0 -459.5 -189.5t-189.5 -459.5t189.5 -459.5t459.5 -189.5z" />
+<glyph unicode="◒" horiz-adv-x="1578" d="M1538 582q0 -312 -218.5 -530.5t-530.5 -218.5t-530.5 218.5t-218.5 530.5t218.5 530.5t530.5 218.5t530.5 -218.5t218.5 -530.5zM1438 582q0 270 -189.5 459.5t-459.5 189.5t-459.5 -189.5t-189.5 -459.5h1298z" />
+<glyph unicode="◓" horiz-adv-x="1578" d="M1538 582q0 -312 -218.5 -530.5t-530.5 -218.5t-530.5 218.5t-218.5 530.5t218.5 530.5t530.5 218.5t530.5 -218.5t218.5 -530.5zM1438 582h-1298q0 -270 189.5 -459.5t459.5 -189.5t459.5 189.5t189.5 459.5z" />
+<glyph unicode="◔" horiz-adv-x="1578" d="M1538 582q0 -312 -218.5 -530.5t-530.5 -218.5t-530.5 218.5t-218.5 530.5t218.5 530.5t530.5 218.5t530.5 -218.5t218.5 -530.5zM1438 582h-649v649q-270 0 -459.5 -189.5t-189.5 -459.5t189.5 -459.5t459.5 -189.5t459.5 189.5t189.5 459.5z" />
+<glyph unicode="◕" horiz-adv-x="1578" d="M1538 582q0 -312 -218.5 -530.5t-530.5 -218.5t-530.5 218.5t-218.5 530.5t218.5 530.5t530.5 218.5t530.5 -218.5t218.5 -530.5zM789 582v649q-270 0 -459.5 -189.5t-189.5 -459.5h649z" />
+<glyph unicode="◖" horiz-adv-x="906" d="M789 -167q-312 0 -530.5 218.5t-218.5 530.5t218.5 530.5t530.5 218.5v-1498z" />
+<glyph unicode="◗" horiz-adv-x="906" d="M866 582q0 -312 -218.5 -530.5t-530.5 -218.5v1498q312 0 530.5 -218.5t218.5 -530.5z" />
+<glyph unicode="◘" d="M2048 -442h-2048v2048h2048v-2048zM1457 582q0 180 -126.5 306.5t-306.5 126.5t-306.5 -126.5t-126.5 -306.5t126.5 -306.5t306.5 -126.5t306.5 126.5t126.5 306.5z" />
+<glyph unicode="◙" d="M2048 -442h-2048v2048h2048v-2048zM1773 582q0 312 -218.5 530.5t-530.5 218.5t-530.5 -218.5t-218.5 -530.5t218.5 -530.5t530.5 -218.5t530.5 218.5t218.5 530.5zM1673 582q0 -270 -189.5 -459.5t-459.5 -189.5t-459.5 189.5t-189.5 459.5t189.5 459.5t459.5 189.5 t459.5 -189.5t189.5 -459.5z" />
+<glyph unicode="◚" d="M2048 582h-275q0 312 -218.5 530.5t-530.5 218.5t-530.5 -218.5t-218.5 -530.5h-275v1024h2048v-1024zM1673 582h-1298q0 270 189.5 459.5t459.5 189.5t459.5 -189.5t189.5 -459.5z" />
+<glyph unicode="◛" d="M1673 582q0 -270 -189.5 -459.5t-459.5 -189.5t-459.5 189.5t-189.5 459.5h1298zM2048 -442h-2048v1024h275q0 -312 218.5 -530.5t530.5 -218.5t530.5 218.5t218.5 530.5h275v-1024z" />
+<glyph unicode="◜" horiz-adv-x="1578" d="M789 1231q-270 0 -459.5 -189.5t-189.5 -459.5h-100q0 312 218.5 530.5t530.5 218.5v-100z" />
+<glyph unicode="◝" horiz-adv-x="1578" d="M1538 582h-100q0 270 -189.5 459.5t-459.5 189.5v100q312 0 530.5 -218.5t218.5 -530.5z" />
+<glyph unicode="◞" horiz-adv-x="1578" d="M1538 582q0 -312 -218.5 -530.5t-530.5 -218.5v100q270 0 459.5 189.5t189.5 459.5h100z" />
+<glyph unicode="◟" horiz-adv-x="1578" d="M789 -167q-312 0 -530.5 218.5t-218.5 530.5h100q0 -270 189.5 -459.5t459.5 -189.5v-100z" />
+<glyph unicode="◠" horiz-adv-x="1578" d="M1538 582h-100q0 270 -189.5 459.5t-459.5 189.5t-459.5 -189.5t-189.5 -459.5h-100q0 312 218.5 530.5t530.5 218.5t530.5 -218.5t218.5 -530.5z" />
+<glyph unicode="◡" horiz-adv-x="1578" d="M1538 582q0 -312 -218.5 -530.5t-530.5 -218.5t-530.5 218.5t-218.5 530.5h100q0 -270 189.5 -459.5t459.5 -189.5t459.5 189.5t189.5 459.5h100z" />
+<glyph unicode="◢" horiz-adv-x="1578" d="M1461 -90h-1344l1344 1344v-1344z" />
+<glyph unicode="◣" horiz-adv-x="1578" d="M117 -90v1344l1344 -1344h-1344z" />
+<glyph unicode="◤" horiz-adv-x="1578" d="M117 1254h1344l-1344 -1344v1344z" />
+<glyph unicode="◥" horiz-adv-x="1578" d="M1461 1254v-1344l-1344 1344h1344z" />
+<glyph unicode="◦" horiz-adv-x="738" d="M698 582q0 -137 -96 -233t-233 -96t-233 96t-96 233t96 233t233 96t233 -96t96 -233zM598 582q0 96 -66.5 162.5t-162.5 66.5t-162.5 -66.5t-66.5 -162.5t66.5 -162.5t162.5 -66.5t162.5 66.5t66.5 162.5z" />
+<glyph unicode="◧" horiz-adv-x="1578" d="M1461 -90h-1344v1344h1344v-1344zM1361 10v1144h-572v-1144h572z" />
+<glyph unicode="◨" horiz-adv-x="1578" d="M1461 -90h-1344v1344h1344v-1344zM789 10v1144h-572v-1144h572z" />
+<glyph unicode="◩" horiz-adv-x="1578" d="M1461 -90h-1344v1344h1344v-1344zM1361 10v1144l-1144 -1144h1144z" />
+<glyph unicode="◪" horiz-adv-x="1578" d="M1461 -90h-1344v1344h1344v-1344zM217 1154v-1144l1144 1144h-1144z" />
+<glyph unicode="◫" horiz-adv-x="1578" d="M1461 -90h-1344v1344h1344v-1344zM1361 10v1144h-522v-1144h522zM739 10v1144h-522v-1144h522z" />
+<glyph unicode="◬" horiz-adv-x="1578" d="M1530 18h-1482l741 1191zM1350 118l-561 902l-561 -902h1122zM873 535q35 -35 35 -83.5t-35 -83.5t-84 -35t-84 35t-35 83.5t35 83.5t84 35t84 -35z" />
+<glyph unicode="◭" horiz-adv-x="1578" d="M1530 18h-1482l741 1191zM789 118h561l-561 902v-902z" />
+<glyph unicode="◮" horiz-adv-x="1578" d="M1530 18h-1482l741 1191zM789 118v902l-561 -902h561z" />
+<glyph unicode="◯" d="M2008 582q0 -410 -287 -697t-697 -287t-697 287t-287 697t287 697t697 287t697 -287t287 -697zM1908 582q0 368 -258 626t-626.5 258t-626 -257.5t-257.5 -626.5t257.5 -626.5t626 -257.5t626.5 258t258 626z" />
+<glyph unicode="◰" horiz-adv-x="1578" d="M1461 -90h-1344v1344h1344v-1344zM739 632v522h-522v-522h522zM1361 10v1144h-522v-622h-622v-522h1144z" />
+<glyph unicode="◱" horiz-adv-x="1578" d="M1461 -90h-1344v1344h1344v-1344zM1361 10v1144h-1144v-522h622v-622h522zM739 10v522h-522v-522h522z" />
+<glyph unicode="◲" horiz-adv-x="1578" d="M1461 -90h-1344v1344h1344v-1344zM1361 632v522h-1144v-1144h522v622h622zM1361 10v522h-522v-522h522z" />
+<glyph unicode="◳" horiz-adv-x="1578" d="M1461 -90h-1344v1344h1344v-1344zM1361 632v522h-522v-522h522zM1361 10v522h-622v622h-522v-1144h1144z" />
+<glyph unicode="◴" horiz-adv-x="1578" d="M1538 582q0 -312 -218.5 -530.5t-530.5 -218.5t-530.5 218.5t-218.5 530.5t218.5 530.5t530.5 218.5t530.5 -218.5t218.5 -530.5zM739 632v597q-240 -18 -409.5 -187.5t-187.5 -409.5h597zM1248.5 122.5q189.5 189.5 189.5 453t-172.5 449t-426.5 204.5v-697h-697 q19 -254 204.5 -426.5t449 -172.5t453 189.5z" />
+<glyph unicode="◵" horiz-adv-x="1578" d="M1538 582q0 -312 -218.5 -530.5t-530.5 -218.5t-530.5 218.5t-218.5 530.5t218.5 530.5t530.5 218.5t530.5 -218.5t218.5 -530.5zM1265.5 139.5q172.5 185.5 172.5 449t-189.5 453t-453 189.5t-449 -172.5t-204.5 -426.5h697v-697q254 19 426.5 204.5zM739 532h-597 q18 -240 187.5 -409.5t409.5 -187.5v597z" />
+<glyph unicode="◶" horiz-adv-x="1578" d="M1538 582q0 -312 -218.5 -530.5t-530.5 -218.5t-530.5 218.5t-218.5 530.5t218.5 530.5t530.5 218.5t530.5 -218.5t218.5 -530.5zM1231.5 1058.5q-185.5 172.5 -449 172.5t-453 -189.5t-189.5 -453t172.5 -449t426.5 -204.5v697h697q-19 254 -204.5 426.5zM839 532v-597 q240 18 409.5 187.5t187.5 409.5h-597z" />
+<glyph unicode="◷" horiz-adv-x="1578" d="M1538 582q0 -312 -218.5 -530.5t-530.5 -218.5t-530.5 218.5t-218.5 530.5t218.5 530.5t530.5 218.5t530.5 -218.5t218.5 -530.5zM839 632h597q-18 240 -187.5 409.5t-409.5 187.5v-597zM739 532v697q-254 -19 -426.5 -204.5t-172.5 -449t189.5 -453t453 -189.5 t449 172.5t204.5 426.5h-697z" />
+<glyph unicode="◸" horiz-adv-x="1578" d="M117 1254h1344l-1344 -1344v1344zM217 1154v-1003l1003 1003h-1003z" />
+<glyph unicode="◹" horiz-adv-x="1578" d="M1461 1254v-1344l-1344 1344h1344zM1361 1154h-1003l1003 -1003v1003z" />
+<glyph unicode="◺" horiz-adv-x="1578" d="M117 -90v1344l1344 -1344h-1344zM217 10h1003l-1003 1003v-1003z" />
+<glyph unicode="◻" horiz-adv-x="1218" d="M1121 70h-1024v1024h1024v-1024zM1021 170v824h-824v-824h824z" />
+<glyph unicode="◼" horiz-adv-x="1218" d="M1121 70h-1024v1024h1024v-1024z" />
+<glyph unicode="◽" horiz-adv-x="946" d="M862 193h-778v778h778v-778zM762 293v578h-578v-578h578z" />
+<glyph unicode="◾" horiz-adv-x="946" d="M862 193h-778v778h778v-778z" />
+<glyph unicode="◿" horiz-adv-x="1578" d="M1461 -90h-1344l1344 1344v-1344zM1361 10v1003l-1003 -1003h1003z" />
+<glyph unicode="☀" d="M1686 460q-29 -2 -29 -29.5t16 -38.5l214 -147l-257 47q-15 3 -31.5 -4.5t-16.5 -22.5q0 -5 193 -239l-233 119q-10 5 -28 5q-39 0 -39 -30q0 -7 121 -257l-209 171q-11 9 -23.5 9t-21 -18t-5.5 -35l44 -247l-157 221q-7 10 -21 10q-33 0 -36 -30l-25 -269l-90 249 q-10 27 -32 27t-30 -21l-91 -249l-20 251q-3 40 -38 40q-17 0 -30 -19l-150 -218l52 275q2 12 -11 23.5t-23.5 11.5t-17.5 -6l-215 -184q125 254 125 265q0 31 -32 31q-6 0 -269 -131l186 221q7 8 7 22t-17 23t-33 6l-273 -57l231 157q22 15 22 36q0 29 -38 32l-257 20 l237 84q34 12 34 36.5t-40 38.5l-245 84l283 20q28 2 28 29t-22 41l-239 149l287 -51q6 -1 11 -1q31 0 31 36q0 10 -5 16l-190 219q275 -132 280 -132q22 0 22 33q0 10 -124 268l207 -171q18 -15 31 -15q31 0 31 30q0 8 -2 17l-56 263l168 -239q6 -8 16 -8q33 0 36 38 l25 273l77 -236q16 -48 40.5 -48t36.5 33l88 247l19 -253q4 -50 38 -50q15 0 31 23l155 222l-52 -259q-3 -16 3.5 -35.5t20 -19.5t26.5 11l219 190l-123 -255q-6 -12 -6 -23q0 -29 33 -29q14 0 30 8l225 113l-165 -201q-14 -17 -14 -34q0 -29 26 -29q6 0 16 2l277 57 l-227 -157q-24 -17 -24 -36q0 -26 38 -29l272 -23l-251 -86q-38 -13 -38 -37q0 -19 30 -30l261 -92zM1429 196.5q167 166.5 167 406t-166.5 406t-406 166.5t-405.5 -167t-166 -405.5t166.5 -405.5t405 -167t405.5 166.5z" />
+<glyph unicode="☁" d="M968 309l-144 -13q-109 0 -183 59q-53 42 -71.5 51.5t-70.5 9.5t-148 -22.5t-145 -22.5q-206 0 -206 122q0 85 320 132q2 57 19.5 86.5t67.5 80.5q98 244 201 244q27 0 50 -10q15 82 100 168.5t165 86.5q59 0 100 -59q85 148 217 148q94 0 165.5 -62t71.5 -154 q0 -39 -11 -74q38 11 86 11q84 0 142 -58t58 -141q0 -54 -26 -110q19 4 37 4q88 0 186.5 -60t98.5 -142q0 -78 -241 -198q-69 -93 -247 -93q-112 0 -308 -36q-22 -4 -49.5 -4t-109 28t-125.5 28zM1943 597q0 54 -78 82q-56 20 -132 20t-130 -59q24 -36 24 -58 q0 -102 -144 -102q-87 0 -145 33q-26 15 -26 40t26 33q113 -38 147 -38q66 0 66 36q0 17 -58 59q53 82 53 158q0 35 -33.5 54t-71.5 19q-84 0 -145 -56q-14 -4 -28 -4q-34 0 -34 25q0 12 11 25q71 84 207 84q66 0 119.5 -39.5t53.5 -103.5q0 -23 -3 -47q45 60 45 110.5 t-35.5 93t-86.5 42.5q-118 0 -164 -57q-57 2 -73 32q49 53 66.5 81.5t17.5 83t-48.5 92.5t-105.5 38q-119 0 -222 -239q-31 139 -105 139q-56 0 -126.5 -69.5t-70.5 -171.5l-47 -62q-33 92 -60 92q-50 0 -96 -99q-61 -134 -67 -141l-36 -39q-12 -17 -15 -52l170 14 q4 -8 4 -17q0 -30 -28 -58q-123 0 -311 -34q-42 -6 -96 -16t-54 -28q0 -49 128 -49q50 0 146 23t146 23q94 0 175.5 -58.5t150.5 -58.5q214 0 214 118q13 18 34 18t37 -18q0 -74 -54 -119q126 -45 176 -45t179.5 22t152.5 22q125 0 167 69l123 69q90 56 90 88zM900 876 q-6 0 -12 2q-6 63 -13 63q-40 0 -58 -60q-10 -46 -19 -92q-9 -34 -42 -36q-19 39 -25 39q-27 0 -43 -43l-17 -65q-25 -84 -91 -148q63 331 153 331q8 0 16 -3q13 52 46.5 102t75.5 50q71 0 70 -108q-12 -32 -41 -32z" />
+<glyph unicode="☂" horiz-adv-x="2156" d="M2056 267q0 -52 -20 -52q-15 0 -19 34.5t-6 62.5q-12 76 -63 137.5t-122 61.5q-140 0 -213 -208q-7 -25 -23 -74q-6 -17 -20.5 -17t-19.5 19q-2 38 -25 129q-61 151 -207 151q-163 0 -197 -192q-9 -51 -9 -70v-489q0 -89 -45.5 -145.5t-128.5 -56.5t-138.5 53.5 t-55.5 132.5q0 34 34 34t34 -34q0 -51 35.5 -84.5t86.5 -33.5q110 0 110 134v489q0 19 -9 70q-34 192 -197 192q-146 0 -207 -151q-12 -30 -16.5 -71t-9 -59t-19 -18t-20.5 21l-23 70q-73 208 -213 208q-71 0 -122 -61.5t-63 -137.5q-2 -28 -6 -62.5t-19 -34.5q-20 0 -20 52 q0 337 311 571q278 207 633 229v35q0 34 34 34t34 -34v-35q355 -22 633 -229q311 -234 311 -571z" />
+<glyph unicode="☃" d="M1602 739q0 -99 -229 -179q161 -109 161 -295q0 -53 -30 -123l-56 -132q-49 -124 -171 -201l139 -9l48 29l26 -4l-72 -46q-54 2 -163 8l-57 18q-130 41 -182 41q-88 0 -197 -61l-42 6v20l40 -6l26 12q-24 0 -116 69l-91 -8l-31 -23l-41 4l4 14l30 -4l30 25l81 8 q-159 125 -159 303.5t91 288.5q-320 79 -320 221q0 80 83 116l-52 73l-75 -25l-86 29l12 13l74 -25l66 21l-66 89l-59 36l-86 -8l-29 -48l-55 -28l-8 14l48 24l22 36l-36 -2l-24 -17l-16 11l34 24l127 7l-52 29l-7 105l-40 36l14 14l45 -42l5 -100l127 -75l111 -151l12 -4 l-83 119q-7 48 -26 142q-2 10 -18.5 50.5t-16.5 56t1 22.5l18 5q-1 -8 -1 -16q0 -40 31 -95l28 66l15 -4l-11 -26l22 14l18 61l15 -2l-19 -69l-38 -23l-24 -38l22 -136l40 -54l65 66v114l17 21v-141l-71 -74l48 -82q62 0 211 -55q-10 14 -10 30q0 53 66 73q-48 47 -48 130 t30 148l-82 -17l7 62l87 26q2 9 2 26q0 63 -23 90q-6 7 -35 21t-29 26q0 49 145 112.5t261 63.5q32 0 32 -25q0 -9 -21 -52.5t-21 -68.5q0 -45 36 -70l70 36l50 -36l-42 -29q184 -73 184 -230q0 -127 -69 -188q71 0 71 -102q97 73 150 73q24 0 57 -17l3 97l-49 76l9 22 l58 -92l-6 -90l29 31l17 123l29 17q18 39 18 118q0 33 -3 74l16 34l21 2l-16 -36q3 -40 3 -73q0 -76 -18 -110l105 52l77 194l12 -13l-63 -164l179 -3l-4 -16l-177 -1l-156 -81l-5 -18l99 28l90 -36l58 12l6 -12l-68 -14l-88 34l-99 -28l-14 -92l-40 -41l14 -15l93 21 l146 -48l75 71l36 8l19 80h17l-18 -78l84 13l4 -15l-135 -25l-59 -62l59 -36l-13 -12q-61 50 -215 87l-82 -21q33 -36 33 -94zM990 1388q-17 19 -17 32t13 46l-22 -12q-14 -25 -14 -38t16 -30zM1038 1550q0 8 -12 15h-22q12 -9 12 -17q0 -50 -267 -138v-18q289 85 289 158z M1293 842q0 34 -34 54q18 -25 18 -56.5t-10 -50.5l22 17q4 19 4 36zM1291 1105q0 152 -184 218q-315 -148 -396 -148q-31 -68 -31 -149q0 -120 102 -158q56 -20 204 -20q21 60 74.5 60t79.5 -35q69 0 113 85q38 71 38 147zM1243 777q8 29 8 51t-44 56l-22 -17 q39 -31 39 -100zM1205 769q0 53 -35 92l-19 -5q14 -12 14 -41t-6 -50l-16 6q6 18 6 40t-24 50.5t-51 28.5q-53 0 -62 -38q42 -30 51 -70q4 -16 4 -91q71 0 128 28q10 28 10 50zM908 733q54 0 136 22q0 73 -48 82q-19 -4 -48 -4q-40 -50 -40 -100zM1195 604v33 q-99 -27 -126 -27v-55q0 -17 8.5 -58t8.5 -65q24 14 47.5 14t57.5 -10q4 102 4 168zM739 797q0 -13 10 -32q61 -26 107 -26q-2 15 -2 24q0 40 27 72q-32 0 -102 19q-40 -20 -40 -57zM665 817q0 -17 7 -34l31 -8q-10 21 -10 29q0 51 54 67l-18 8q-64 -16 -64 -62zM1120 369 q-22 0 -42 -13l-20 -143q69 18 93 18t36 -10v117q-21 31 -67 31zM1222 749q-11 -62 -11 -546q0 -16 16 -46t16 -40t-7 -28.5t-7 -29t8 -25.5l-26 -4v63l-22 -15l-7 -54l-17 -4l4 60l-22 9l-13 -79l-19 8l11 66l-32 7l-18 -83l-24 8l18 73l-36 -13l-20 -64l-20 2q24 37 24 89 q-11 -8 -18 -8q-29 0 -29 29q0 34 35 34q8 0 20 -15l27 193q12 90 12 103.5t-9.5 51.5t-9.5 82t2 162q-105 -20 -140 -20q-74 0 -249 54t-189.5 54t-19.5 -6l30 -48l22 10l8 -12l-72 -32v16l24 9l-45 57q0 1 -3 1.5t-36 -28t-33 -73.5q0 -61 80 -111q48 -29 139.5 -62.5 t92.5 -43.5q-55 -116 -70 -159t-15 -131q0 -234 290 -381q76 36 148.5 36t234.5 -52q89 57 144 145q30 46 75.5 150.5t45.5 174.5q0 122 -121 231q-42 38 -42 45t115.5 65t115.5 117.5t-34 83.5l-26 -10l12 -20l-9 -6l-39 40l24 2l10 21q-30 13 -57.5 13t-115 -58 t-121.5 -58zM1205 103q14 11 14 23t-20 36q-22 11 -47 11t-104 -13l-12 -57q44 9 79.5 9t89.5 -9zM1080 1237q-24 0 -32 -52l-14 14q0 18 14.5 40.5t32 22.5t45.5 -13l-4 -18q-28 6 -42 6zM1130 1191.5q13 -13.5 13 -24.5t-10 -32.5t-20 -21.5q-46 0 -46 57q0 9 15.5 22 t25 13t22.5 -13.5zM1195 1013q0 -37 -26 -37q-20 0 -20 24q0 7 12 20.5t19 13.5q15 0 15 -21zM1071 1058q48 -43 48 -56.5t-20 -13.5t-77.5 27.5t-57.5 45.5q0 40 44 40q15 0 63 -43zM1113 984q9 0 9 -19t-17 -19q-23 0 -23 19t31 19zM902 1145q0 -65 -40 -65q-46 0 -46 59 q0 19 57 33q29 -17 29 -27zM1056 956q0 -32 -21 -32t-21 25t18 25q24 0 24 -18zM990 940q0 -28 -48 -28q-13 0 -13 30q0 20 30.5 20t30.5 -22zM912 972q0 -24 -26 -24t-26 23t19.5 23t32.5 -22zM994 450q30 0 30 -34t-36 -34q-26 0 -26 29q0 10 11 24.5t21 14.5zM1032 257 q0 -38 -28 -38q-35 0 -35 35t27 35q36 0 36 -32zM1128 1170q-11 13 -23 13t-23 -15v-19q15 14 23 14t21 -16zM1004 1084q-24 0 -24 -21q0 -12 53 -37.5t70 -25.5q-84 84 -99 84zM881 1139q-6 16 -15 16t-25 -14l2 -17q11 6 18 6t20 -8v17z" />
+<glyph unicode="☄" d="M462 -107q-119 -119 -214.5 -119t-171.5 75.5t-76 173.5q0 164 211 318q250 182 617.5 310t739.5 193q257 45 480 45l-225 -74q-418 -146 -857 -465q-173 -126 -504 -457zM20 23q0 -90 70 -159.5t155.5 -69.5t205.5 116l242 235q143 133 261 221q441 327 925 489 q-200 -7 -461 -69q-431 -102 -809 -264q-589 -253 -589 -499zM1581 757q-713 -221 -1103 -638q167 219 490 400.5t613 237.5zM1572 769q-667 -163 -1197 -568q223 213 553 367.5t644 200.5zM333.5 96.5q37.5 -35.5 37.5 -86.5t-38.5 -86t-87.5 -35t-85 36t-36 84.5 t35.5 85.5t86 37t88 -35.5zM318 -58.5q33 27.5 33 68.5t-32.5 69t-73.5 28t-71 -29t-30 -68.5t30.5 -67.5t70.5 -28t73 27.5z" />
+<glyph unicode="★" horiz-adv-x="1564" d="M1524 824l-459 -335l175 -537l-458 332l-458 -332l175 537l-459 335h567l175 537l175 -537h567z" />
+<glyph unicode="☆" horiz-adv-x="1564" d="M1524 824l-459 -335l175 -537l-458 332l-458 -332l175 537l-459 335h567l175 537l175 -537h567zM1217 724h-333l-102 314l-102 -314h-333l270 -197l-103 -313l268 194l268 -194l-103 313z" />
+<glyph unicode="☇" horiz-adv-x="959" d="M806 240q0 -78 24 -216q-144 25 -216 25q-159 0 -327 -54l-39 119q178 58 343 60l-511 511v88l613 613l88 -88l-569 -569l469 -469q3 170 59 346l119 -39q-53 -165 -53 -327z" />
+<glyph unicode="☈" horiz-adv-x="1382" d="M1199 240q0 -78 24 -216q-144 25 -216 25q-159 0 -327 -54l-39 119q179 58 343 60l-511 511v88l462 463h-710v-1465h-125v1527l62 63h924l44 -107l-525 -525l469 -468q3 170 59 345l119 -39q-53 -165 -53 -327z" />
+<glyph unicode="☉" horiz-adv-x="1578" d="M1538 582q0 -312 -218.5 -530.5t-530.5 -218.5t-530.5 218.5t-218.5 530.5t218.5 530.5t530.5 218.5t530.5 -218.5t218.5 -530.5zM1438 582q0 270 -189.5 459.5t-459.5 189.5t-459.5 -189.5t-189.5 -459.5t189.5 -459.5t459.5 -189.5t459.5 189.5t189.5 459.5zM1039 582 q0 -104 -73 -177t-177 -73t-177 73t-73 177t73 177t177 73t177 -73t73 -177z" />
+<glyph unicode="☊" horiz-adv-x="1938" d="M1773 551q84 -99 84 -237.5t-102.5 -241t-249.5 -102.5t-249.5 102.5t-102.5 246.5t97.5 246t238.5 109q-32 227 -166 376q-148 166 -366 166t-366 -166q-134 -149 -166 -376q141 -7 238.5 -109t97.5 -246t-102.5 -246.5t-249.5 -102.5t-250 102.5t-103 241t84 237.5 t213 119q31 259 192 437.5t412 178.5t412 -178.5t192 -437.5q128 -20 212 -119zM1683.5 143.5q73.5 73.5 73.5 179t-73 178.5t-178.5 73t-179.5 -73.5t-74 -179t73.5 -178.5t179 -73t179 73.5zM588 143q73 73 73 178.5t-73.5 179t-179 73.5t-178.5 -73t-73 -178.5t73.5 -179 t179 -73.5t178.5 73z" />
+<glyph unicode="☋" horiz-adv-x="1938" d="M1754.5 1183.5q102.5 -102.5 102.5 -241t-84 -237.5t-212 -119q-31 -259 -192 -437.5t-412 -178.5t-412 178.5t-192 437.5q-129 20 -213 119t-84 237.5t103 241t250 102.5t249.5 -102.5t102.5 -246.5t-97.5 -246t-238.5 -109q32 -227 166 -376q148 -166 366 -166t366 166 q134 149 166 376q-141 7 -238.5 109t-97.5 246t102.5 246.5t249.5 102.5t249.5 -102.5zM1684 755q73 73 73 178.5t-73.5 179t-179 73.5t-179 -73t-73.5 -178.5t74 -179t179.5 -73.5t178.5 73zM587.5 755.5q73.5 73.5 73.5 179t-73 178.5t-178.5 73t-179 -73.5t-73.5 -179 t73 -178.5t178.5 -73t179 73.5z" />
+<glyph unicode="☌" horiz-adv-x="1148" d="M1016 905q0 -19 -31 -50l-262 -262q86 -97 86 -237.5t-102.5 -243t-249.5 -102.5t-249.5 102.5t-102.5 249.5t102.5 249.5t249.5 102.5q118 0 206 -65l264 264q31 31 50 31q39 0 39 -39zM634.5 184q73.5 74 73.5 178.5t-73 177.5t-178 73t-178 -73t-73 -177.5 t73.5 -178.5t177.5 -74t177.5 74z" />
+<glyph unicode="☍" horiz-adv-x="1591" d="M1543 912q0 -147 -102.5 -249.5t-249.5 -102.5q-118 0 -206 65l-322 -322q86 -97 86 -237.5t-102.5 -243t-249.5 -102.5t-249.5 102.5t-102.5 249.5t102.5 249.5t249.5 102.5q118 0 206 -65l322 322q-86 97 -86 237.5t102.5 243t249.5 102.5t249.5 -102.5t102.5 -249.5z M1368.5 734.5q73.5 73.5 73.5 178t-73 178t-178 73.5t-178 -73.5t-73 -178t73.5 -178t177.5 -73.5t177.5 73.5zM574.5 -106q73.5 74 73.5 178.5t-73 177.5t-178 73t-178 -73t-73 -177.5t73.5 -178.5t177.5 -74t177.5 74z" />
+<glyph unicode="☎" horiz-adv-x="2090" d="M1945 746q-3 0 -130 5.5t-148 9.5q-67 13 -87 58q-8 18 -8 28.5t3 15.5q126 -30 291.5 -30t203.5 16q0 -5 -14 -34.5t-36.5 -49t-74.5 -19.5zM1888 878q-205 0 -338 38q-12 92 -160 106q-9 -33 -9 -61q0 -68 75.5 -154.5t90.5 -125.5l185 -489q12 -32 12 -77 q0 -115 -66 -115h-1266q-66 0 -66 115q0 45 12 77l185 489q15 39 90.5 125.5t75.5 154.5q0 28 -9 61q-148 -14 -160 -106q-133 -38 -338 -38q-107 0 -166 13q18 170 59 232q51 78 204 122q327 94 746 94t746 -94q153 -44 204 -122q41 -62 59 -232q-59 -13 -166 -13zM515 863 q3 -5 3 -15.5t-8 -28.5q-20 -45 -87 -58q-21 -4 -148 -9.5t-130 -5.5q-52 0 -74.5 19.5t-36.5 49t-14 34.5q38 -16 203.5 -16t291.5 30zM1045 1063q-169 0 -289 -28q19 -68 54 -119q221 9 235 9t235 -9q35 51 54 119q-120 28 -289 28zM1290 264.5q100 101.5 100 244 t-102.5 245t-242.5 102.5t-242.5 -102.5t-102.5 -245t100 -244t245 -101.5t245 101.5zM1206 722q-17 -29 -46 -12t-12 46t46 12t12 -46zM1302 660q17 -29 -12 -46t-46 12t12 46t46 -12zM1342 511.5q0 -33.5 -33.5 -33.5t-33.5 33.5t33.5 33.5t33.5 -33.5zM1045 808 q34 0 34 -33.5t-34 -33.5t-34 33.5t34 33.5zM884 722q-17 29 12 46q11 6 20 6q16 0 26 -18q17 -29 -12 -46t-46 12zM1162 392q-2 2 -2 8t13.5 22t17.5 11q48 -62 118 -95q-4 -14 -17 -25q-77 37 -130 79zM1111 577q29 -29 29 -69t-27.5 -67.5t-67.5 -27.5t-67.5 27.5 t-27.5 67.5t29 69t66 29t66 -29zM846 626q-17 -29 -46 -12t-12 46q11 18 26 18q9 0 20 -6q29 -17 12 -46zM1045 281q34 0 34 -33.5t-34 -33.5t-34 33.5t34 33.5zM815 510.5q0 -33.5 -33.5 -33.5t-33.5 33.5t33.5 33.5t33.5 -33.5zM846 396q17 -29 -12 -46t-46 12 q-6 11 -6 20q0 15 18 26q11 6 20 6q15 0 26 -18zM942 266q-11 -18 -26 -18q-9 0 -20 6q-18 11 -18 26q0 9 6 20q11 18 26 18q9 0 20 -6q18 -11 18 -26q0 -9 -6 -20z" />
+<glyph unicode="☏" horiz-adv-x="2090" d="M1945 746q-3 0 -130 5.5t-148 9.5q-67 13 -87 58q-8 18 -8 28.5t3 15.5q126 -30 291.5 -30t203.5 16q0 -5 -14 -34.5t-36.5 -49t-74.5 -19.5zM1888 878q-205 0 -338 38q-12 92 -160 106q-9 -33 -9 -61q0 -68 75.5 -154.5t90.5 -125.5l185 -489q12 -32 12 -77 q0 -115 -66 -115h-1266q-66 0 -66 115q0 45 12 77l185 489q15 39 90.5 125.5t75.5 154.5q0 28 -9 61q-148 -14 -160 -106q-133 -38 -338 -38q-107 0 -166 13q18 170 59 232q51 78 204 122q327 94 746 94t746 -94q153 -44 204 -122q41 -62 59 -232q-59 -13 -166 -13zM515 863 q3 -5 3 -15.5t-8 -28.5q-20 -45 -87 -58q-21 -4 -148 -9.5t-130 -5.5q-52 0 -74.5 19.5t-36.5 49t-14 34.5q38 -16 203.5 -16t291.5 30zM1045 1289q-421 0 -732 -92q-124 -37 -165.5 -86.5t-56.5 -177.5q45 -5 111 -5q178 0 297 29q35 88 241 129q138 27 306 27t304 -26 q205 -40 241 -130q119 -29 297 -29q66 0 111 5q-15 128 -56.5 177.5t-165.5 86.5q-311 92 -732 92zM1045 1063q-169 0 -289 -28q19 -68 54 -119q221 9 235 9t235 -9q35 51 54 119q-120 28 -289 28zM1045 875l-247 -10q-20 0 -44 45q-13 -60 -80.5 -132t-83.5 -115l-185 -489 q-9 -24 -9 -74t16 -50h1266q16 0 16 50t-9 74l-185 489q-16 43 -83.5 115t-80.5 132q-24 -45 -44 -45zM1287.5 753.5q102.5 -102.5 102.5 -245t-100 -244t-245 -101.5t-245 101.5t-100 244t102.5 245t242.5 102.5t242.5 -102.5zM1206 722q17 29 -12 46t-46 -12t12 -46t46 12 zM1302 660q-17 29 -46 12t-12 -46t46 -12t12 46zM1342 511.5q0 33.5 -33.5 33.5t-33.5 -33.5t33.5 -33.5t33.5 33.5zM1045 741q34 0 34 33.5t-34 33.5t-34 -33.5t34 -33.5zM930 710q29 17 12 46q-10 18 -26 18q-9 0 -20 -6q-29 -17 -12 -46t46 -12zM1309 338q-70 33 -118 95 q-4 5 -17 -11q-19 -23 -12 -30q53 -42 130 -79q6 -3 14 10q5 8 5 12q0 2 -2 3zM1112.5 440.5q27.5 27.5 27.5 67.5t-29 69t-66 29t-66 -29t-29 -69t27.5 -67.5t67.5 -27.5t67.5 27.5zM846 626q17 29 -12 46q-11 6 -20 6q-15 0 -26 -18q-17 -29 12 -46t46 12zM1045 214 q34 0 34 33.5t-34 33.5t-34 -33.5t34 -33.5zM815 510.5q0 33.5 -33.5 33.5t-33.5 -33.5t33.5 -33.5t33.5 33.5zM846 396q-11 18 -26 18q-9 0 -20 -6q-18 -11 -18 -26q0 -9 6 -20q17 -29 46 -12t12 46zM942 266q6 11 6 20q0 15 -18 26q-11 6 -20 6q-15 0 -26 -18 q-6 -11 -6 -20q0 -15 18 -26q11 -6 20 -6q15 0 26 18z" />
+<glyph unicode="☐" d="M2016 -410h-1984v1984h1984v-1984zM1866 -260v1684h-1684v-1684h1684z" />
+<glyph unicode="☑" d="M2016 -410h-1984v1984h1984v-1984zM1866 -260v1684h-1684v-1684h1684zM565.5 -124q-13.5 13 -40.5 69q-125 260 -125 402q0 36 47 69q93 66 158 66q26 0 39 -23l18 -45q72 -170 88 -170q11 0 53 62l474 702q3 4 55 68l110 135q49 60 153 91.5t198 31.5l14 -33 q-66 -74 -190 -225l-426 -563l-295 -457l-72 -123q-11 -23 -43 -57q-23 -13 -112.5 -13t-103 13z" />
+<glyph unicode="☒" d="M2016 -410h-1984v1984h1984v-1984zM1866 -260v1684h-1684v-1684h1684zM474 -62l12 58q0 9 -9.5 17.5t-9.5 18t50 95.5l49 84q129 221 375 493l-152 418q-23 63 -23 73t21.5 34t33.5 24t34 -18q12 10 32 10q7 3 19.5 17t21.5 14q19 0 37 -37l156 -307l51 63 q280 330 297 330q25 0 72 -39q43 41 46.5 41t8.5 -11.5t24 -33.5t19 -31t-20.5 -28.5t-71.5 -85.5l-291 -377l-23 -33q67 -126 224 -469q-9 -20 -29 -29v-16l-24 -15q-17 -11 -17 -19t10 -28q-3 -18 -25.5 -34.5t-42 -16.5t-77.5 90l-193 297l-405 -628q-34 -25 -107 -25 q-18 0 -45.5 44.5t-27.5 59.5z" />
+<glyph unicode="☓" horiz-adv-x="1826" d="M1476 106q0 -25 -18.5 -42.5t-43.5 -17.5t-46 23l-152 199q-209 269 -415 478q-238 -239 -352 -438l-89 -186q-19 -37 -54 -37q-61 0 -61 59q0 12 4 23q116 314 466 664l-332 323q-48 44 -139 137q-18 20 -18 43t18.5 41.5t41.5 18.5t43 -18l191 -189l281 -272l301 287 q47 52 145 152q20 19 43 19q61 0 61 -60q0 -20 -21 -47t-141 -145l-302 -290q126 -128 357.5 -399.5t231.5 -325.5z" />
+<glyph unicode="☔" horiz-adv-x="2156" d="M2056 267q0 -52 -20 -52q-15 0 -19 34.5t-6 62.5q-12 76 -63 137.5t-122 61.5q-140 0 -213 -208q-7 -25 -23 -74q-6 -17 -20.5 -17t-19.5 19q-2 38 -25 129q-61 151 -207 151q-163 0 -197 -192q-9 -51 -9 -70v-489q0 -89 -45.5 -145.5t-128.5 -56.5t-138.5 53.5 t-55.5 132.5q0 34 34 34t34 -34q0 -51 35.5 -84.5t86.5 -33.5q110 0 110 134v489q0 19 -9 70q-34 192 -197 192q-146 0 -207 -151q-12 -30 -16.5 -71t-9 -59t-19 -18t-20.5 21l-23 70q-73 208 -213 208q-71 0 -122 -61.5t-63 -137.5q-2 -28 -6 -62.5t-19 -34.5q-20 0 -20 52 q0 337 311 571q278 207 633 229v35q0 34 34 34t34 -34v-35q355 -22 633 -229q311 -234 311 -571zM1625 1423q-53 0 -53 51q0 82 117 132q-10 -38 -11.5 -88.5t-4.5 -59.5q-9 -35 -48 -35zM1760 1193q-53 0 -53 51q0 82 117 132q-10 -38 -11.5 -88.5t-4.5 -59.5 q-9 -35 -48 -35zM1895 963q-53 0 -53 51q0 82 117 132q-10 -38 -11.5 -88.5t-4.5 -59.5q-9 -35 -48 -35zM1355 1423q-53 0 -53 51q0 82 117 132q-10 -38 -11.5 -88.5t-4.5 -59.5q-9 -35 -48 -35zM1490 1193q-53 0 -53 51q0 82 117 132q-10 -38 -11.5 -88.5t-4.5 -59.5 q-9 -35 -48 -35zM1625 963q-53 0 -53 51q0 82 117 132q-10 -38 -11.5 -88.5t-4.5 -59.5q-9 -35 -48 -35zM1085 1423q-53 0 -53 51q0 82 117 132q-10 -38 -11.5 -88.5t-4.5 -59.5q-9 -35 -48 -35zM1220 1193q-53 0 -53 51q0 82 117 132q-10 -38 -11.5 -88.5t-4.5 -59.5 q-9 -35 -48 -35zM815 1423q-53 0 -53 51q0 82 117 132q-10 -38 -11.5 -88.5t-4.5 -59.5q-9 -35 -48 -35zM950 1193q-53 0 -53 51q0 82 117 132q-10 -38 -11.5 -88.5t-4.5 -59.5q-9 -35 -48 -35zM545 1423q-53 0 -53 51q0 82 117 132q-10 -38 -11.5 -88.5t-4.5 -59.5 q-9 -35 -48 -35zM680 1193q-53 0 -53 51q0 82 117 132q-10 -38 -11.5 -88.5t-4.5 -59.5q-9 -35 -48 -35zM410 1193q-53 0 -53 51q0 82 117 132q-10 -38 -11.5 -88.5t-4.5 -59.5q-9 -35 -48 -35zM545 963q-53 0 -53 51q0 82 117 132q-10 -38 -11.5 -88.5t-4.5 -59.5 q-9 -35 -48 -35zM275 923q-53 0 -53 51q0 82 117 132q-10 -38 -11.5 -88.5t-4.5 -59.5q-9 -35 -48 -35z" />
+<glyph unicode="☕" horiz-adv-x="2064" d="M1271 1048q0 -132 -129 -204q28 62 28 103q0 107 -69.5 197t-69.5 156q0 148 163 197q-68 -93 -68 -163t72.5 -144t72.5 -142zM993 1055q0 -150 -143 -226q44 67 44 114q0 106 -38 178q-1 2 -70 100q-38 53 -38 119t44 128t112 83q-56 -82 -56 -169.5t72.5 -168.5 t72.5 -158zM704 1048q0 -131 -119 -198q18 59 18 126q0 95 -72.5 176t-72.5 148t50 123t120 74q-69 -52 -69 -159q0 -82 72.5 -144.5t72.5 -145.5zM105 525l-5 86q0 51 13 79q31 65 334 102q217 27 388 27t388 -27q303 -37 334 -102q13 -28 13 -62.5t-2 -57.5q64 40 134 40 q109 0 185.5 -72t76.5 -180q0 -174 -136 -256q-61 -38 -290 -101q-54 -13 -144 -53q-18 -19 -42 -39q-48 -26 -135 -88q-15 -23 -51 -66q-58 -53 -295 -53h-72q-237 0 -295 53q-15 23 -51 66q-20 19 -68 45.5t-67 42.5q-213 178 -213 616zM1839 358q0 56 -40 91.5t-86 35.5 t-97 -33t-56 -65q-9 -67 -20 -135t-36 -130l133 33q76 22 126 53q76 46 76 150zM835 749q-211 0 -423 -31q14 -26 11 -59q206 30 429 30t466 -43q62 -11 55 -11q31 0 102 33q-235 81 -640 81zM1475 515q0 11 -1 84q-80 -40 -287.5 -62t-353.5 -22t-353.5 22t-287.5 62 l-1 -84q0 -205 39 -322q53 -160 196 -249q35 -20 101 -65q11 -10 34 -27q55 -30 247.5 -30t263.5 18l-387 42q302 36 412 163t110 430q122 13 203 30q1 -31 1 -42q0 -282 -87 -454q151 148 151 506z" />
+<glyph unicode="☖" horiz-adv-x="1566" d="M1454 0h-1342l100 801l571 541l571 -541zM1341 100l-82 653l-476 451l-476 -451l-82 -653h1116z" />
+<glyph unicode="☗" horiz-adv-x="1566" d="M1454 0h-1342l100 801l571 541l571 -541z" />
+<glyph unicode="☘" horiz-adv-x="1841" d="M119 607l-11 107q0 200 205 200q98 0 233 -75l214 -134q-23 75 -149 242.5t-126 286.5t70.5 195.5t186.5 76.5q45 0 134 -17.5t126.5 -17.5t96.5 14.5t89 14.5q106 0 159.5 -85.5t53.5 -197.5q0 -88 -133 -262l-193 -250l233 131q123 68 222 68q227 0 227 -242 q0 -40 -17.5 -116.5t-17.5 -116.5l12 -135q0 -87 -62 -133t-156 -46t-220 80q-63 40 -178.5 134.5t-143.5 94.5q-25 0 -25 -29q0 10 4 -44t4 -117t-26.5 -216.5t-55.5 -218t-88.5 -64.5t-59.5 45q0 -2 76 189t76 322t-36 131q-28 0 -112.5 -75.5t-208.5 -142t-213.5 -66.5 t-157 55t-67.5 151q0 45 17.5 131.5t17.5 131.5z" />
+<glyph unicode="☙" d="M1962 246q-6 -94 -70.5 -161t-146.5 -67t-128.5 37.5t-46.5 106.5q0 18 3 50l4 43q50 -48 117 -48q110 0 133 112q-143 59 -241 158q-117 120 -115 254q-191 -1 -267 -137q168 -85 168 -227q0 -181 -208 -281q-165 -80 -386 -80t-412.5 113.5t-310.5 322.5 q-31 54 -31 102q0 88 87 88q54 0 86 -54q-22 -40 -22 -94.5t43.5 -97t98.5 -42.5t86 18q74 43 94 175q34 221 45 252q51 153 199 246q83 52 194 52t191.5 -65.5t80.5 -174.5q0 -77 -48 -167l5 -6q131 116 257 116q24 0 52 -4q28 76 157.5 167t129.5 158q0 50 -38 80 q207 -4 207 -159q0 -87 -70 -129q-25 -15 -163 -40q-107 -20 -136 -79q152 -29 276.5 -143.5t128.5 -260.5q44 -47 59 -116q-32 -14 -62 -18zM1838 432q0 114 -91.5 203.5t-206.5 94.5q-6 -19 -6 -40q0 -88 111 -172q88 -67 193 -100v14z" />
+<glyph unicode="☚" horiz-adv-x="1929" d="M1830 882q56 -116 56 -245.5t-62 -276.5l-55 23q57 135 57 250.5t-63 249.5l54 26zM1703 869q53 -113 53 -234.5t-48 -235.5h-143q-115 -125 -224 -175q-41 -5 -78 -5t-100 20l-37 -16l-35 -2q-11 -1 -21 -1q-129 0 -129 109q0 5 2 16q-112 16 -112 111q0 21 11 49 q-90 24 -90 103q0 57 50 87l-36 8l-360 4q-233 3 -233 107q0 62 52.5 85.5t200.5 26.5l409 9l41 38l275 25q190 -55 338 -129h214z" />
+<glyph unicode="☛" horiz-adv-x="1929" d="M1886 814q0 -104 -233 -107l-360 -4l-36 -8q50 -30 50 -87q0 -79 -90 -103q11 -28 11 -49q0 -95 -112 -111q2 -11 2 -16q0 -109 -129 -109q-10 0 -21 1l-35 2l-37 16q-63 -20 -100 -20t-78 5q-109 50 -224 175h-143q-48 114 -48 235.5t53 234.5h214q148 74 338 129 l275 -25l41 -38l409 -9q148 -3 200.5 -26.5t52.5 -85.5zM296 883q-63 -134 -63 -249.5t57 -250.5l-55 -23q-62 147 -62 276.5t56 245.5l13 27z" />
+<glyph unicode="☜" horiz-adv-x="1929" d="M1830 882q56 -116 56 -245.5t-62 -276.5l-55 23q57 135 57 250.5t-63 249.5l54 26zM1703 869q53 -113 53 -234.5t-48 -235.5h-143q-115 -125 -224 -175q-41 -5 -78 -5t-100 20l-37 -16l-35 -2q-11 -1 -21 -1q-129 0 -129 109q0 5 2 16q-112 16 -112 111q0 21 11 49 q-90 24 -90 103q0 57 50 87l-36 8l-360 4q-233 3 -233 107q0 62 52.5 85.5t200.5 26.5l409 9l41 38l275 25q190 -55 338 -129h214zM1674 451q31 93 31 184.5t-35 184.5h-182q-254 102 -340 127l-253 -22l-157 -144q44 -39 100 -39q86 0 171 89q92 -52 175 -52h14l17 1 l-2 -50l-23 -1h-13q-77 0 -158 43q-59 -46 -109 -65l90 -1q52 29 104 29q115 0 183 -133l-70 -30q66 -21 121 -115l-62 -28q56 -46 81 -105l-125 -53q51 -7 63.5 -7t37.5 4q116 68 206 183h135zM1104 687q-44 0 -90 -32h-129q-82 0 -82 -46q0 -65 115 -65h4l106 1l190 77 q-38 65 -114 65zM883 455q0 -63 92 -63h6l90 2l194 84q-35 53 -117 64l-104 -46l-146 1q-15 -24 -15 -42zM991 345q0 -75 88 -75h5l39 1l164 77q-22 29 -65 56l-134 -59h-97zM222 813q0 -56 242 -57l227 -1q-10 9 -24 25l116 106l-366 -9q-195 -5 -195 -64z" />
+<glyph unicode="☝" horiz-adv-x="1929" d="M1290 -65q-113 -53 -234.5 -53t-235.5 48v143q-125 115 -175 224q-5 41 -5 78t20 100l-16 37l-2 35q-1 11 -1 21q0 129 109 129q5 0 16 -2q16 112 111 112q21 0 49 -11q24 90 103 90q57 0 87 -50l8 36l4 360q3 233 107 233q62 0 85.5 -52.5t26.5 -200.5l9 -409l38 -41 l25 -275q-55 -190 -129 -338v-214zM1303 -192q-116 -56 -245.5 -56t-276.5 62l23 55q135 -57 250.5 -57t249.5 63l26 -54zM1234 1416q-56 0 -57 -242l-1 -227q9 10 25 24l106 -116l-9 366q-5 195 -64 195zM1108 534q0 44 -32 90v129q0 82 -46 82q-66 0 -65 -119l1 -106 l77 -190q65 38 65 114zM876 755q-63 0 -63 -92v-6l2 -90l84 -194q53 35 64 117l-46 104l1 146q-24 15 -42 15zM1163 800q0 -86 89 -171q-52 -92 -52 -175v-14l1 -17l-50 2l-1 23v13q0 77 43 158q-46 59 -65 109l-1 -90q29 -52 29 -104q0 -115 -133 -183l-30 70 q-21 -66 -115 -121l-28 62q-46 -56 -105 -81l-53 125q-7 -51 -7 -63.5t4 -37.5q68 -116 183 -206v-135q93 -31 184.5 -31t184.5 35v182q102 254 127 340l-22 253l-144 157q-39 -44 -39 -100zM766 647q-77 0 -75 -93l1 -39l77 -164q29 22 56 65l-59 134v97z" />
+<glyph unicode="☞" horiz-adv-x="1929" d="M1886 814q0 -104 -233 -107l-360 -4l-36 -8q50 -30 50 -87q0 -79 -90 -103q11 -28 11 -49q0 -95 -112 -111q2 -11 2 -16q0 -109 -129 -109q-10 0 -21 1l-35 2l-37 16q-63 -20 -100 -20t-78 5q-109 50 -224 175h-143q-48 114 -48 235.5t53 234.5h214q148 74 338 129 l275 -25l41 -38l409 -9q148 -3 200.5 -26.5t52.5 -85.5zM296 883q-63 -134 -63 -249.5t57 -250.5l-55 -23q-62 147 -62 276.5t56 245.5l13 27zM1837 813q0 59 -195 64l-366 9l116 -106q-14 -16 -24 -25l227 1q242 1 242 57zM1256 609q0 46 -82 46h-129q-46 32 -90 32 q-76 0 -114 -65l190 -77l106 -1h4q115 0 115 65zM1176 455q0 18 -15 42l-146 -1l-104 46q-82 -11 -117 -64l194 -84l90 -2h6q92 0 92 63zM389 820q-35 -93 -35 -184.5t31 -184.5h135q90 -115 206 -183q25 -4 37.5 -4t63.5 7l-125 53q25 59 81 105l-62 28q55 94 121 115 l-70 30q68 133 183 133q52 0 104 -29l90 1q-50 19 -109 65q-81 -43 -158 -43h-13l-23 1l-2 50l17 -1h14q83 0 175 52q85 -89 171 -89q56 0 100 39l-157 144l-253 22q-86 -25 -340 -127h-182zM1068 345h-97l-134 59q-43 -27 -65 -56l164 -77l39 -1h5q88 0 88 75z" />
+<glyph unicode="☟" horiz-adv-x="1929" d="M1255 1348q-135 57 -250.5 57t-249.5 -63l-26 54l27 13q116 56 245.5 56t276.5 -62zM1414 920q5 -41 5 -78t-20 -100l16 -37l2 -35q1 -11 1 -21q0 -129 -109 -129q-5 0 -16 2q-16 -112 -111 -112q-21 0 -49 11q-24 -90 -103 -90q-57 0 -87 50l-8 -36l-4 -360 q-3 -233 -107 -233q-62 0 -85.5 52.5t-26.5 200.5l-9 409l-38 41l-25 275q55 190 129 338v214q113 53 234.5 53t235.5 -48v-143q125 -115 175 -224zM1293 570q77 0 75 93l-1 39l-77 164q-29 -22 -56 -65l59 -134v-97zM1367 811q7 51 7 63.5t-4 37.5q-68 116 -183 206v135 q-93 31 -184.5 31t-184.5 -35v-182q-102 -254 -127 -340l22 -253l144 -157q39 44 39 100q0 86 -89 171q52 92 52 175v14l-1 17l50 -2l1 -23v-13q0 -77 -43 -158q46 -59 65 -109l1 90q-29 52 -29 104q0 115 133 183l30 -70q21 66 115 121l28 -62q46 56 105 81zM1183 462 q63 0 63 92v6l-2 90l-84 194q-53 -35 -64 -117l46 -104l-1 -146q24 -15 42 -15zM951 683q0 -44 32 -90v-129q0 -82 46 -82q66 0 65 119l-1 106l-77 190q-65 -38 -65 -114zM825 -199q56 0 57 242l1 227q-9 -10 -25 -24l-106 116l9 -366q5 -195 64 -195z" />
+<glyph unicode="☠" horiz-adv-x="1490" d="M1209 1184q0 -97 -43 -188t-51 -146l-15 -107q-2 -13 -14 -19l-167 -80l-21 -56q-7 -17 -62.5 -28.5t-87.5 -11.5q-98 0 -139 26q-25 16 -37 70l-167 80q-10 5 -12.5 14.5t-11.5 71t-53.5 144t-44.5 230.5q0 191 134 298.5t329 107.5t329 -107.5t134 -298.5zM743 311 q-87 0 -136 52q-9 12 -28 35l-80 65q-7 6 -26 67t-19 74q0 18 26.5 29t48.5 11q12 0 45 -55t49 -65q31 -19 115 -19t115 13t48.5 47t27.5 57q14 22 39 22q63 0 63 -43l-13 -50q-18 -70 -28 -82t-83 -71q-52 -87 -164 -87zM1400 -255q0 -78 -134 -102q-60 -73 -106.5 -73 t-81.5 63q-10 18 -43 103q-163 135 -294 207q-158 -92 -295 -217q-24 -156 -108 -156q-53 0 -109 81q-139 4 -139 96q0 79 99 114q37 13 164 32q104 77 225 145q-167 81 -281 104q-63 -54 -113 -54q-92 0 -92 80q0 32 53 103q-11 47 -11 73q0 100 84 100q69 0 202 -157 q137 -50 330 -149q109 59 324 149q149 154 203 154q78 0 78 -93q0 -25 -8 -75q52 -68 52 -109q0 -82 -85 -82q-33 0 -128 61q-101 -21 -274 -106l244 -151q244 -29 244 -141zM1158 1184q0 169 -119 262t-293 93t-293 -93t-119 -262q0 -111 44.5 -213t53.5 -163l6 -43 l178 -86q4 -22 20 -62q39 -18 104.5 -18t114.5 19l23 63l173 83q21 152 64 244t43 176zM954 553q-53 -99 -183 -99t-160 17t-98 119l-4 -1q14 -52 30 -93q71 -60 104 -97t108.5 -37t116.5 70q74 60 80 68.5t28 91.5l-4 1zM1349 -255q0 67 -210 92l-335 204q137 67 218.5 102 t173.5 54q99 -64 118 -64q34 0 34 31q0 25 -55 95q11 66 11 89q0 43 -32 40q-48 -19 -169 -144q-215 -90 -352 -164q-218 112 -361 164q-126 149 -172 149q-33 0 -33 -49q0 -23 15 -85q-57 -75 -57 -91q0 -29 36.5 -29t103.5 58q143 -29 405 -156q-204 -115 -315 -197 q-118 -17 -137 -22q-95 -25 -95 -75q0 -44 115 -46q54 -80 82 -80q41 0 60 130q157 144 342 251q161 -89 338 -235q56 -146 80.5 -146t80.5 69q110 19 110 55zM1052 987q0 -143 -117.5 -143t-117.5 131.5t121 131.5q114 0 114 -120zM849 756q0 -67 -72 -67q-14 0 -30 7 q-16 -7 -31 -7q-71 0 -71 66q0 26 37 70q3 4 43 63q10 15 22 15t22 -15q13 -22 43 -63q37 -44 37 -69zM681 987q0 -143 -117 -143t-117 131.5t119 131.5q115 0 115 -120zM797 758q0 -1 -1 -1q-4 0 -49 71q-51 -78 -51 -73q0 -15 20 -15q5 0 31 12q23 -12 30 -12q20 0 20 18z " />
+<glyph unicode="☡" horiz-adv-x="1320" d="M1208 125q62 0 62 -62.5t-62 -62.5h-842q-111 0 -185 44q-90 54 -90 158t97 202l825 833q47 47 47 83t-39.5 57t-77.5 21h-658q80 -85 159.5 -235.5t79.5 -247.5q0 -63 -62 -63q-38 0 -52 28l-16 60q-50 178 -117 270q-41 56 -203 207q-24 23 -24 49q0 58 69 58h824 q92 0 166.5 -57t74.5 -145.5t-83 -172.5l-825 -834q-61 -62 -61 -114q0 -76 151 -76h842z" />
+<glyph unicode="☢" d="M1998 582q0 -406 -284 -690t-690 -284t-690 284t-284 690t284 690t690 284t690 -284t284 -690zM1898 582q0 364 -255 619t-619 255t-619 -255t-255 -619t255 -619t619 -255t619 255t255 619zM1848 582h-650q0 104 -86 152l325 563q188 -108 299.5 -298t111.5 -417z M1148 582q0 -54 -35 -89t-89 -35t-89 35t-35 89t35 89t89 35t89 -35t35 -89zM850 582h-650q0 227 111.5 417t299.5 298l325 -563q-86 -48 -86 -152zM1024 -242q-223 0 -413 109l325 563q39 -22 87 -22t88 22l326 -563q-190 -109 -413 -109z" />
+<glyph unicode="☣" d="M1536 686q-102 0 -214 -65q-64 -37 -111 -103l-71 37q3 15 3 27q0 92 -85 115l3 80q81 8 145 45q207 119 207 325t-159 378q125 -80 202.5 -214.5t77.5 -252.5t-67 -219q14 1 27 1q233 0 376 -247q78 -135 85 -282q-81 264 -298 351q-59 24 -121 24zM1024 933 q-84 0 -159 -37q-41 21 -71 52q105 65 230 65t230 -65q-30 -31 -71 -52q-75 37 -159 37zM1455 582q0 -122 -60.5 -223t-162.5 -156q-10 39 -12 86q146 97 155 275q40 25 80 36v-18zM905 582q0 -12 3 -27l-71 -37q-47 66 -111 103q-112 65 -214 65q-62 0 -121 -24 q-217 -87 -298 -351q7 147 85 282q143 247 376 247q13 0 27 -1q-67 101 -67 219t77.5 252.5t202.5 214.5q-159 -172 -159 -371q0 -213 207 -332q64 -37 145 -45l3 -80q-85 -23 -85 -115zM1438 -155q-301 0 -414 226q-113 -226 -414 -226q-155 0 -287 68q75 -17 150 -17 q177 0 306 101.5t129 308.5q0 73 -34 148l66 41q33 -32 84 -32t84 32l66 -41q-34 -75 -34 -148q0 -207 129 -308.5t306 -101.5q75 0 150 17q-132 -68 -287 -68zM593 582v18q40 -11 80 -36q9 -178 155 -275q-2 -42 -13 -86q-102 55 -162 156t-60 223z" />
+<glyph unicode="☤" d="M2016 1491q0 -30 -43 -51.5t-82.5 -21.5t-98.5 17l-112 33q-2 1 -5 1q-15 0 -19 -15l4 -5q95 -54 212 -54q8 0 20 1q1 -78 -110 -78q-88 0 -137 21q-8 3 -51 30.5t-50 27.5t-9 -8q7 -28 74.5 -57.5t101.5 -29.5q4 0 9 1q-33 -82 -136 -82q-76 0 -132.5 46.5t-60.5 46.5 t-4 -7q0 -20 49 -59q48 -38 69 -38h1q-28 -43 -114 -48q-44 -79 -248 -147q73 -48 73 -108q0 -86 -83 -145q97 -52 97 -136t-100 -142q60 -43 60 -110.5t-84 -126.5q89 -56 89 -117t-87 -96q49 -37 49 -87.5t-71 -94.5l72 -52l-11 -23q-53 14 -104 34v-221h-40v221 q-51 -20 -104 -34l-11 23l72 52q-71 44 -71 94.5t49 87.5q-87 35 -87 96t89 117q-84 59 -84 126.5t60 110.5q-100 58 -100 142t97 136q-83 59 -83 145q0 60 73 108q-204 68 -248 147q-86 5 -114 48h1q21 0 69 38q49 39 49 59q0 7 -4 7t-60.5 -46.5t-132.5 -46.5 q-103 0 -136 82q5 -1 9 -1q34 0 101.5 29.5t74.5 57.5q-2 8 -9 8t-50 -27.5t-51 -30.5q-49 -21 -137 -21q-111 0 -110 78q12 -1 20 -1q117 0 212 54l4 5q-4 15 -19 15q-2 0 -31 -9l-81 -24q-64 -18 -103.5 -18t-82.5 21.5t-43 51.5v83h863q-14 -28 -14 -59q0 -87 106 -101 v-153q0 -98 -98 -98q-39 0 -98 34q36 20 69 71q-8 4 -24 10q-36 -48 -73 -78q19 -30 93 -62l148 -56v378q-55 13 -55 56q0 26 24 42t51 16t51 -16t24 -42q0 -43 -55 -56v-378l148 56q74 32 93 62q-37 30 -73 78l-24 -10q33 -51 69 -71q-59 -34 -98 -34q-98 0 -98 98v153 q106 14 106 101q0 31 -14 59h863v-83zM729 1225q0 21 29.5 53t49.5 32t52 -14t48 -14q35 0 35 25q0 29 -47 47.5t-94 18.5t-93 -38t-46 -95q0 -81 88 -133q46 -28 183 -74q24 13 54 26q-140 52 -176 71q-83 44 -83 95zM1191 907q0 53 -79 98l-57 -20q76 -41 76 -96.5 t-74 -92.5l50 -21q84 53 84 132zM1044 819q61 30 61 70t-61 73v-143zM1004 962q-61 -33 -61 -73t61 -70v143zM1385 1240q0 57 -46 95t-93 38t-94 -18.5t-47 -47.5q0 -25 35 -25q16 0 48 14t52 14t49.5 -32t29.5 -53q0 -59 -120 -112l-222 -87q-120 -55 -120 -119 q0 -75 74 -126l139 -73q74 -40 74 -89q0 -58 -130.5 -113.5t-130.5 -126.5q0 -59 64 -105q5 -4 120 -68q64 -35 64 -68q0 -42 -107.5 -88t-107.5 -108q0 -57 161 -115q-113 80 -113 116q0 64 103 103t103 88t-119.5 116t-119.5 117q0 45 69 81l134 68q71 46 71 111t-75 107 l-138 62q-75 37 -75 89q0 72 121 121l226 83q121 58 121 151zM1044 547q74 34 74 71t-74 74v-145zM1004 692q-74 -37 -74 -74t74 -71v145zM939 745q-96 -46 -96 -119.5t99 -125.5q21 12 49 24q-87 40 -87 93t90 99q-35 17 -55 29zM1083 262q82 52 82 112t-59 97 q-21 -11 -52 -25q63 -35 63 -78.5t-67 -86.5q11 -6 33 -19zM1091 367q0 28 -47 54v-113q47 31 47 59zM957 367q0 -28 47 -59v113q-47 -26 -47 -54zM1105 138q0 19 -61 51v-102q61 26 61 51zM943 138q0 -25 61 -51v102q-61 -32 -61 -51zM878 134q0 -50 88 -83l25 13 q-74 33 -74 74q0 35 78 76q-18 9 -30 17q-87 -51 -87 -97zM1132 -58q0 49 -52 81q-19 -7 -30 -12q34 -26 34 -68q0 -22 -40 -59l20 -15q68 39 68 73zM1044 -80q14 15 14 30t-14 31v-61zM1004 -19q-14 -16 -14 -31t14 -30v61zM991 -165l-5 3l-15 -11q6 2 20 8zM1191 1323 q0 -24 -30 -24t-30 19q0 24 30 24t30 -19zM917 1318q0 -19 -30 -19t-30 24q0 19 30 19t30 -24zM1178 1324q0 6 -16.5 6t-16.5 -12q0 -6 16.5 -6t16.5 12zM903 1318q0 12 -16.5 12t-16.5 -6q0 -12 16.5 -12t16.5 6z" />
+<glyph unicode="☥" horiz-adv-x="1224" d="M1174 308h-495v-700h-133v700h-496v133h467q-132 120 -213 286t-81 343.5t103 286t287 108.5t287 -108.5t103 -286t-81 -343.5t-213 -286h465v-133zM882 1077q0 267 -269 267t-269 -267q0 -144 78 -307t191 -258q113 95 191 258t78 307z" />
+<glyph unicode="☦" horiz-adv-x="1270" d="M1173 809h-467v-550l353 -248l-67 -95l-286 201v-409h-141v508l-349 244l67 96l282 -198v451h-468v137h468v224h-301v119h301v204h141v-204h303v-119h-303v-224h467v-137z" />
+<glyph unicode="☧" horiz-adv-x="1480" d="M1268 1256q0 -241 -296 -336q-88 -28 -88 -56t40 -48l-40 -64q-80 40 -80 117.5t144 154.5q123 66 123 203q0 95 -81 149q-70 48 -170 48h-40q-48 0 -48 -56v-840l-160 128v712q0 21 -21.5 38.5t-42.5 17.5h-72v96h464q368 0 368 -264zM1380 0h-376v96h64l-328 240 l-328 -240h72v-96h-384v96h128l416 312l-416 312h-128v96h384v-96h-80l336 -248l328 248h-64v96h376v-96h-128l-424 -312l416 -312h136v-96zM876 -200h-440v96h72q64 0 64 48v208l160 128v-336q0 -48 64 -48h80v-96z" />
+<glyph unicode="☨" horiz-adv-x="1270" d="M1173 809h-466v-1101h-141v1101h-469v137h469v224h-302v119h302v204h141v-204h302v-119h-302v-224h466v-137z" />
+<glyph unicode="☩" d="M1827 310h-119v202h-614v-614h202v-119h-544v119h202v614h-614v-202h-119v544h119v-202h614v614h-202v119h544v-119h-202v-614h614v202h119v-544z" />
+<glyph unicode="☪" horiz-adv-x="1812" d="M1640 825l-209 -151l80 -246l-208 151l-209 -151l80 246l-209 151h258l80 244l79 -244h258zM1106 1381q-265 0 -451.5 -187.5t-186.5 -451.5t184.5 -453.5t446.5 -189.5q94 0 220 40l6 -13q-191 -126 -413 -126q-309 0 -524.5 215.5t-215.5 526t217 524.5t529 214 q222 0 408 -125l-6 -13q-126 39 -214 39z" />
+<glyph unicode="☫" d="M1402 1550q4 -1 4 -4.5t-1 -4.5q-37 -64 -103 -110.5t-136 -46.5t-122 28q-77 -58 -183 -58t-162.5 60.5t-56.5 162.5q1 6 4 6l48 -34q89 -59 193 -59q64 0 117 83q1 2 5 2h-1q0 -4 66 -42q74 -42 137 -42t187 58q2 1 4 1zM1983 516q0 -319 -220 -577q-39 -46 -68 -65 q-13 -3 -13 10.5t48 113.5q121 252 121 517.5t-151 508.5l-67 97q-55 79 -55 87q0 17 21 17t108 -83q276 -262 276 -626zM1642 632q0 -247 -121.5 -450t-338.5 -328l217 -92q24 -8 70 -27q11 -6 11 -16q0 -17 -40 -17q-125 0 -325 56q-26 -116 -91 -142q-65 26 -91 142 q-200 -56 -325 -56q-40 0 -40 17q0 10 9 15t41 16.5t248 103.5q-217 125 -338.5 328t-121.5 450q0 293 163 528q44 63 63 63q12 0 12 -13t-22 -86q-64 -211 -64 -434q0 -468 375 -710q17 188 17 289.5t-18 398t-18 444.5q0 37 36.5 73.5t73.5 36.5t73.5 -36.5t36.5 -73.5 q0 -148 -18 -444.5t-18 -398t17 -289.5q375 242 375 710q0 223 -64 434q-22 73 -22 86t12 13q19 0 63 -63q163 -235 163 -528zM470 1208q0 -8 -61 -96l-61 -88q-151 -243 -151 -508.5t121 -517.5q48 -100 48 -114q0 -11 -9 -11q-2 0 -4 1q-29 19 -68 65q-220 258 -220 577 q0 364 276 626q87 83 108 83t21 -17z" />
+<glyph unicode="☬" horiz-adv-x="1724" d="M1474 1115q130 -161 130 -347t-73 -415q-42 -131 -158 -400q-57 245 -359 245q66 -54 128 -140t73 -158q50 -22 50 -77q0 -35 -24.5 -59.5t-59.5 -24.5t-59.5 24.5t-24.5 63.5t34 64q-18 110 -230 248v-281q89 -28 89 -122q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5 t-37.5 90.5q0 94 89 122v281q-212 -138 -230 -248q34 -25 34 -64t-24.5 -63.5t-59.5 -24.5t-59.5 24.5t-24.5 59.5q0 55 50 77q11 72 73 158t128 140q-302 0 -359 -245q-116 269 -158 400q-73 229 -73 415t130 347q114 139 293 229q-109 -75 -180 -222.5t-71 -284.5 q0 -225 161 -358q123 -102 370 -167v108h-182l34 93q-116 42 -193 151t-77 243t83 246t222 142q-30 83 -69 132l221 113l221 -113q-39 -49 -69 -132q139 -30 222 -142t83 -246t-77 -243t-193 -151l34 -93h-182v-108q247 65 370 167q161 133 161 358q0 137 -71 284.5 t-180 222.5q179 -90 293 -229zM1196 896q0 225 -211 286q-30 -158 -30 -271t54 -290q187 71 187 275zM715 621q54 177 54 290t-30 271q-211 -61 -211 -286q0 -204 187 -275z" />
+<glyph unicode="☭" horiz-adv-x="1688" d="M1577 144q19 -19 19 -51.5t-31.5 -64.5t-61.5 -32t-55 25l-223 219q-138 -86 -320 -86q-141 0 -254 59q-124 63 -182 183l-41 -39q54 -43 54 -68q0 -37 -37 -37q-32 0 -64 51q-149 -237 -231 -237q-39 0 -63.5 27.5t-24.5 64.5t26 65q85 92 209 164q-53 38 -53 68 q0 11 14 23t25 12q28 0 65 -54l105 101h72q117 -187 327 -187q90 0 205 58l-504 508l-157 -152l-195 197l328 323l336 -55l-189 -188l520 -521q103 95 103 279t-128.5 374t-298.5 288l8 19q276 -55 449.5 -245.5t173.5 -462t-147 -407.5z" />
+<glyph unicode="☮" horiz-adv-x="1726" d="M1414.5 1292q226.5 -227 226.5 -551.5t-227 -551.5t-550.5 -227t-551 227.5t-227.5 551t227 551t551.5 227.5t551 -227zM1377 295q164 190 164 452.5t-181 456.5t-447 213v-664zM1306 225l-393 387v-548q224 16 393 161zM366 1203.5q-181 -194.5 -181 -456t165 -451.5 l463 457v664q-266 -19 -447 -213.5zM813 64v548l-392 -387q169 -145 392 -161z" />
+<glyph unicode="☯" horiz-adv-x="1726" d="M1414.5 1292q226.5 -227 226.5 -551.5t-227 -551.5t-550.5 -227t-551 227.5t-227.5 551t227 551t551.5 227.5t551 -227zM1541 740q0 282 -198 480.5t-480 198.5q-162 0 -306.5 -73t-240.5 -203q80 32 177 32q185 0 297 -115.5t136 -303.5q41 -323 308 -323 q134 0 220.5 86.5t86.5 220.5zM615 740q0 51 -36 87t-87.5 36t-87.5 -35.5t-36 -87.5t36 -87.5t87.5 -35.5t87.5 36t36 87zM1358 740q0 -52 -36 -87.5t-87.5 -35.5t-87.5 36t-36 87t36 87t87.5 36t87.5 -35.5t36 -87.5z" />
+<glyph unicode="☰" d="M1724 212h-1400v192h1400v-192zM1724 636h-1400v192h1400v-192zM1724 1060h-1400v192h1400v-192z" />
+<glyph unicode="☱" d="M1724 212h-1400v192h1400v-192zM1724 636h-1400v192h1400v-192zM1724 1060h-516v192h516v-192zM840 1060h-516v192h516v-192z" />
+<glyph unicode="☲" d="M1724 636h-516v192h516v-192zM840 636h-516v192h516v-192zM1724 212h-1400v192h1400v-192zM1724 1060h-1400v192h1400v-192z" />
+<glyph unicode="☳" d="M1724 636h-516v192h516v-192zM840 636h-516v192h516v-192zM1724 212h-1400v192h1400v-192zM1724 1060h-516v192h516v-192zM840 1060h-516v192h516v-192z" />
+<glyph unicode="☴" d="M1724 636h-1400v192h1400v-192zM1724 1060h-1400v192h1400v-192zM1724 212h-516v192h516v-192zM840 212h-516v192h516v-192z" />
+<glyph unicode="☵" d="M1724 212h-516v192h516v-192zM840 212h-516v192h516v-192zM1724 636h-1400v192h1400v-192zM1724 1060h-516v192h516v-192zM840 1060h-516v192h516v-192z" />
+<glyph unicode="☶" d="M1724 212h-516v192h516v-192zM840 212h-516v192h516v-192zM1724 636h-516v192h516v-192zM840 636h-516v192h516v-192zM1724 1060h-1400v192h1400v-192z" />
+<glyph unicode="☷" d="M1724 212h-516v192h516v-192zM840 212h-516v192h516v-192zM1724 636h-516v192h516v-192zM840 636h-516v192h516v-192zM1724 1060h-516v192h516v-192zM840 1060h-516v192h516v-192z" />
+<glyph unicode="☸" d="M1677 874q-30 56 -93 144q16 16 34 29q49 -112 59 -173zM1964 582q0 -26 -23.5 -43.5t-52.5 -17.5t-93 11t-85 11t-33 -3q-14 -222 -162 -391q5 -8 14 -17q53 -37 151 -120q24 -24 24 -52t-15 -43t-43 -15t-52 24q-37 53 -120 151q-9 9 -17 14q-169 -149 -391 -163 q-3 -13 -3 -33t11 -84t11 -93t-17.5 -52.5t-43.5 -23.5t-43.5 23.5t-17.5 52.5t11 93t11 84t-3 33q-222 14 -391 163q-25 -16 -69.5 -79t-68 -86.5t-51.5 -23.5t-43 15t-15 43t23.5 51.5t76.5 60.5q73 52 89 77q-148 169 -162 391q-12 3 -33 3t-85 -11t-93 -11t-52.5 17.5 t-23.5 43.5t23.5 43.5t52.5 17.5t93 -11t85 -11t33 3q14 222 162 391q-5 8 -14 17q-53 37 -151 120q-24 24 -24 52t15 43t43 15t52 -24q37 -53 120 -151q9 -9 17 -14q169 149 391 163q3 13 3 33t-11 84t-11 93t17.5 52.5t43.5 23.5t43.5 -23.5t17.5 -52.5t-11 -93t-11 -84 t3 -33q222 -14 391 -163q25 16 69.5 79t68 86.5t51.5 23.5t43 -15t15 -43t-23.5 -51.5t-76.5 -60.5q-73 -52 -89 -77q148 -169 162 -391q12 -3 33 -3t85 11t93 11t52.5 -17.5t23.5 -43.5zM1493 0q-73 -36 -186 -67q76 44 153 96q17 -12 33 -29zM370 810q-35 -63 -35 -135 q0 -9 1 -18q-25 7 -52 7q23 105 86 146zM393 252v22q20 -35 86 -123l-25 -28q-18 17 -39.5 61.5t-21.5 67.5zM1528 582q0 209 -147.5 357t-356.5 148t-356.5 -148t-147.5 -357t147.5 -357t356.5 -148t356.5 148t147.5 357zM1162 689q-31 0 -31 31t49 80q15 15 52 39 q57 37 64 56l-17 18l48 48q41 -33 76 -77l-48 -47l-18 17q-19 -7 -50 -54q-72 -111 -125 -111zM1078 996h-25q-4 -8 -4 -25.5t9.5 -59.5t9.5 -64q0 -103 -44 -103t-44 103q0 22 9.5 64t9.5 59.5t-4 25.5h-25v68q27 3 54 3t54 -3v-68zM1508 582q0 -27 -3 -54h-67v25 q-8 4 -25.5 4t-59.5 -9.5t-64 -9.5q-103 0 -103 44t103 44q22 0 64 -9.5t59.5 -9.5t25.5 4v25h67q3 -27 3 -54zM911 1050q-19 -14 -120 -106q-18 10 -39 32q86 68 159 74zM1178 582q0 -65 -45 -110t-109 -45t-109 45t-45 110t45 110t109 45t109 -45t45 -110zM1131 444 q0 31 28 31q34 0 83 -49q15 -15 39 -52q37 -57 56 -64l18 17l48 -47q-35 -44 -76 -77l-48 48l17 18q-7 19 -54 50q-111 72 -111 125zM917 720q0 -31 -31 -31t-80 49q-15 15 -39 52q-37 57 -56 64l-18 -17l-48 47q35 44 76 77l48 -48l-17 -18q7 -19 54 -50q111 -72 111 -125z M1312 192q-80 -53 -142 -71q37 30 101 100q20 -8 41 -29zM862 582q0 -44 -103 -44q-22 0 -64 9.5t-59.5 9.5t-25.5 -4v-25h-67q-3 27 -3 54t3 54h67v-25q8 -4 25.5 -4t59.5 9.5t64 9.5q103 0 103 -44zM1024 97q-27 0 -54 3v68h25q4 8 4 25.5t-9.5 59.5t-9.5 64q0 103 44 103 t44 -103q0 -22 -9.5 -64t-9.5 -59.5t4 -25.5h25v-68q-27 -3 -54 -3zM889 475q28 0 28 -31t-49 -80q-15 -15 -52 -39q-57 -37 -64 -56l17 -18l-48 -48q-41 33 -76 77l48 47l18 -17q19 7 49.5 54t45.5 62q49 49 83 49zM1118 582q0 40 -27.5 67.5t-66.5 27.5t-66.5 -27.5 t-27.5 -67.5t27.5 -67.5t66.5 -27.5t66.5 27.5t27.5 67.5zM1068 582q0 -45 -44 -45t-44 45t44 45t44 -45z" />
+<glyph unicode="☹" horiz-adv-x="1726" d="M1414.5 1292q226.5 -227 226.5 -551.5t-227 -551.5t-550.5 -227t-551 227.5t-227.5 551t227 551t551.5 227.5t551 -227zM1343.5 259.5q197.5 197.5 197.5 481t-197.5 481t-480 197.5t-480.5 -198.5t-198 -480.5t198 -480t480.5 -198t480 197.5zM1234 987q0 -52 -36 -87.5 t-87.5 -35.5t-87.5 36t-36 87t36 87t87.5 36t87.5 -35.5t36 -87.5zM740 987q0 -52 -36 -87.5t-87.5 -35.5t-87.5 36t-36 87t36 87t87.5 36t87.5 -35.5t36 -87.5zM863 574q-322 0 -395 -321h-62q22 201 140.5 322.5t316.5 121.5t316.5 -121.5t140.5 -322.5h-62 q-73 321 -395 321z" />
+<glyph unicode="☺" horiz-adv-x="1726" d="M1414.5 1292q226.5 -227 226.5 -551.5t-227 -551.5t-550.5 -227t-551 227.5t-227.5 551t227 551t551.5 227.5t551 -227zM1343.5 259.5q197.5 197.5 197.5 481t-197.5 481t-480 197.5t-480.5 -198.5t-198 -480.5t198 -480t480.5 -198t480 197.5zM1234 987q0 -52 -36 -87.5 t-87.5 -35.5t-87.5 36t-36 87t36 87t87.5 36t87.5 -35.5t36 -87.5zM740 987q0 -52 -36 -87.5t-87.5 -35.5t-87.5 36t-36 87t36 87t87.5 36t87.5 -35.5t36 -87.5zM863 253q-198 0 -316.5 121.5t-140.5 322.5h62q73 -321 395 -321t395 321h62q-22 -201 -140.5 -322.5 t-316.5 -121.5z" />
+<glyph unicode="☻" horiz-adv-x="1726" d="M1414.5 1292q226.5 -227 226.5 -551.5t-227 -551.5t-550.5 -227t-551 227.5t-227.5 551t227 551t551.5 227.5t551 -227zM1234 987q0 52 -36 87.5t-87.5 35.5t-87.5 -36t-36 -87t36 -87t87.5 -36t87.5 35.5t36 87.5zM740 987q0 52 -36 87.5t-87.5 35.5t-87.5 -36t-36 -87 t36 -87t87.5 -36t87.5 35.5t36 87.5zM863 376q-322 0 -395 321h-62q22 -201 140.5 -322.5t316.5 -121.5t316.5 121.5t140.5 322.5h-62q-73 -321 -395 -321z" />
+<glyph unicode="☼" horiz-adv-x="1542" d="M1536 666h-252q-24 -132 -98 -237l176 -176l-104 -105l-177 177q-113 -77 -236 -98v-252h-148v252q-123 21 -236 98l-177 -177l-105 105l177 176q-74 105 -98 237h-252v148h252q24 132 98 237l-177 176l105 105l177 -177q113 77 236 98v252h148v-252q123 -21 236 -98 l177 177l104 -105l-176 -176q74 -105 98 -237h252v-148zM1033 478q108 108 108 262.5t-107.5 262t-262.5 107.5t-262.5 -107.5t-107.5 -262t108 -262.5t262 -108t262 108z" />
+<glyph unicode="☽" horiz-adv-x="1526" d="M1186.5 1299.5q230.5 -230.5 230.5 -561t-231.5 -559.5t-564.5 -229q-267 0 -470 158q-28 22 -28 47q0 45 51 45q6 0 16 -2l243 -49q245 0 416.5 173t171.5 416.5t-170 418t-411 174.5l-250 -50q-10 -2 -16 -2q-51 0 -51 45q0 26 30 48q219 158 474 158 q329 0 559.5 -230.5zM1114.5 249.5q202.5 199.5 202.5 489t-201 490.5t-489 201q-49 0 -96 -6q254 -36 422 -231.5t168 -452t-168 -453t-421 -231.5q43 -6 89 -6q291 0 493.5 199.5z" />
+<glyph unicode="☾" horiz-adv-x="1526" d="M1417 156q0 -26 -30 -48q-219 -158 -474 -158q-329 0 -559.5 230.5t-230.5 561t231.5 559.5t564.5 229q267 0 470 -158q28 -22 28 -47q0 -45 -51 -45q-6 0 -16 2l-243 49q-245 0 -416.5 -173t-171.5 -416.5t170 -418t411 -174.5l250 50q10 2 16 2q51 0 51 -45zM587 287.5 q-168 195.5 -168 452t168 453t421 231.5q-43 6 -89 6q-291 0 -493.5 -199.5t-202.5 -489t201 -490.5t489 -201q49 0 96 6q-254 36 -422 231.5z" />
+<glyph unicode="☿" horiz-adv-x="1226" d="M1146 750q0 -205 -134.5 -355.5t-335.5 -173.5v-266h281v-125h-281v-270h-125v270h-281v125h281v265q-201 23 -336 173.5t-135 356.5q0 154 79 281.5t210 194.5q-183 114 -212 379h61q73 -321 395 -321t395 321h62q-29 -265 -213 -379q131 -67 210 -194.5t79 -281.5z M1021 750q0 171 -118.5 290t-289.5 119t-289.5 -119t-118.5 -290t118.5 -289.5t289.5 -118.5t289.5 118.5t118.5 289.5z" />
+<glyph unicode="♀" horiz-adv-x="1475" d="M1203 1400q192 -192 192 -457t-170 -450t-425 -213v-280h296v-125h-296v-285h-125v285h-296v125h296v280q-255 28 -425 213t-170 450t191.5 457t465.5 192t466 -192zM1270 934q0 222 -155.5 377.5t-377.5 155.5t-377 -155.5t-155 -377.5t155 -377t377 -155t377.5 155 t155.5 377z" />
+<glyph unicode="♁" horiz-adv-x="1475" d="M1225 689q170 -185 170 -450t-192 -457t-466 -192t-465.5 192t-191.5 457t170 450t425 213v280h-296v125h296v285h125v-285h296v-125h-296v-280q255 -28 425 -213zM1270 248q0 222 -155.5 377t-377.5 155t-377 -155t-155 -377t155 -377.5t377 -155.5t377.5 155.5 t155.5 377.5z" />
+<glyph unicode="♂" horiz-adv-x="1800" d="M1720 852h-125v426l-350 -349q150 -182 150 -420q0 -274 -192 -466t-466 -192t-465.5 192t-191.5 466t191.5 466t465.5 192q238 0 420 -150l349 349h-426v126h576l64 -64v-576zM1270 509q0 222 -155.5 377.5t-377.5 155.5t-377 -155.5t-155 -377.5t155 -377.5t377 -155.5 t377.5 155.5t155.5 377.5z" />
+<glyph unicode="♃" horiz-adv-x="1620" d="M1500 -200h-125v383h-1180v125h363q147 0 254.5 121t107.5 280.5t-97.5 265.5t-264 106t-265 -90t-98.5 -253v-63h-125v62q0 215 135 342t353.5 127t352.5 -142.5t134 -368t-177 -387.5h507v1184h125v-1692z" />
+<glyph unicode="♄" horiz-adv-x="1216" d="M813 910q157 0 255 -91.5t98 -237.5t-111 -373.5t-111 -337.5q0 -44 55 -55q16 -3 90 -3v-125h-62q-87 0 -147.5 49t-60.5 134q0 134 111 361.5t111 339.5q0 214 -222.5 214t-450.5 -289v-696h-125v1350h-193v125h193v217h125v-217h351v-125h-351v-465q223 225 445 225z " />
+<glyph unicode="♅" horiz-adv-x="1517" d="M1467 381h-369l-62 63v986l62 62h369v-125h-306v-861h306v-125zM954.5 151q52.5 -67 52.5 -160t-73 -167t-175 -74t-175 74t-73 167t52 160.5t133 88.5v712h-165v125h165v415h125v-415h166v-125h-166v-712q81 -22 133.5 -89zM50 381v125h307v861h-307v125h369l63 -62 v-986l-63 -63h-369zM882 0q0 50 -36.5 86.5t-86.5 36.5t-86.5 -36.5t-36.5 -86.5t36.5 -87.5t86.5 -37.5t86.5 37.5t36.5 87.5z" />
+<glyph unicode="♆" horiz-adv-x="1943" d="M1034 180h200v-125h-200v-255h-125v255h-200v125h200v226q-337 37 -487 229q-135 173 -154 522l-131 -126l-87 90l233 224h87l233 -224l-87 -90l-123 118q15 -292 125 -432.5t391 -182.5v766l-127 -122l-87 90l233 224h87l233 -224l-87 -90l-127 122v-768q276 33 396 190 q105 139 120 427l-123 -118l-87 90l233 224h87l233 -224l-87 -90l-131 126q-19 -353 -153 -520q-146 -182 -488 -229v-228z" />
+<glyph unicode="♇" horiz-adv-x="1045" d="M995 -200h-832l-63 63v1567l63 62h196q261 0 440 -157.5t179 -415t-179 -416t-440 -158.5h-134v-420h770v-125zM853 920q0 205 -142.5 326t-351.5 121h-134v-897h134q209 0 351.5 122.5t142.5 327.5z" />
+<glyph unicode="♈" horiz-adv-x="2369" d="M1839 1518q164 0 260.5 -120t96.5 -290t-107 -368h-151q110 196 110 360q0 115 -46 195q-56 99 -162 99q-200 0 -373 -445q-95 -245 -151.5 -602.5t-56.5 -648.5v-93h-148v99q0 276 -54 620t-142 580q-179 478 -386 478q-105 0 -161 -97q-47 -80 -47 -193 q0 -170 110 -352h-150q-108 196 -108 365.5t97 291t261 121.5q311 0 490 -489q117 -322 151 -741h25q28 411 151 742q180 488 491 488z" />
+<glyph unicode="♉" horiz-adv-x="2159" d="M1986 1369h-26q-138 0 -247 -195l-59 -106q-67 -120 -127.5 -185t-166.5 -107q355 -196 355 -565q0 -257 -188.5 -443.5t-446 -186.5t-447 186.5t-189.5 443.5q0 181 95 327.5t260 237.5q-106 42 -166.5 107t-127.5 185l-59 106q-109 195 -246 195h-27v111h73 q196 0 353 -274l81 -141q77 -133 165.5 -192t234.5 -59t234.5 59t165.5 192l81 141q157 274 352 274h73v-111zM1424 -131.5q143 139.5 143 341t-142 341.5t-345 140t-345.5 -140t-142.5 -342t143.5 -341t344.5 -139t344 139.5z" />
+<glyph unicode="♊" horiz-adv-x="1975" d="M987 0q-437 0 -814 -99v123q206 55 382 76v1275q-190 18 -382 73v124q332 -92 814.5 -92t814.5 92v-124q-192 -55 -383 -73v-1275q176 -21 383 -76v-123q-378 99 -815 99zM987 1357q-170 0 -284 8v-1256q127 14 284 14t284 -14v1256q-114 -8 -284 -8z" />
+<glyph unicode="♋" horiz-adv-x="2234" d="M1162 1333q-284 0 -463 -75q227 -113 227 -351q0 -157 -111 -267t-267.5 -110t-265.5 109.5t-109 265.5q0 302 403 459q299 117 674 117t811 -200v-161q-465 213 -899 213zM2061 575q0 -301 -403 -459q-299 -116 -673.5 -116t-811.5 199v161q465 -212 899 -212 q284 0 462 74q-226 116 -226 351q0 156 111.5 266.5t267.5 110.5t265 -109.5t109 -265.5zM1882 375.5q80 79.5 80 195.5t-79.5 198t-196.5 82t-198 -81t-81 -196.5t83 -196.5t197.5 -81t194.5 79.5zM746 710q81 81 81 197t-83 196.5t-198.5 80.5t-194.5 -79t-79 -195 t80 -198.5t196.5 -82.5t197.5 81z" />
+<glyph unicode="♌" horiz-adv-x="1928" d="M1423 -419q-136 0 -230.5 90.5t-94.5 226.5q0 178 188 578l96 204q111 236 111 384q0 186 -107.5 301t-283.5 115t-281 -100.5t-105 -260t98 -363.5l39 -81q97 -201 97 -296q0 -156 -115.5 -267.5t-275.5 -111.5t-273 114t-113 274.5t111 274.5t268 114q56 0 124 -21 q-108 207 -108 366q0 216 153 349t386 133t383.5 -143.5t150.5 -388.5q0 -132 -41 -254q-21 -64 -102 -240l-69 -150q-184 -400 -184 -515q0 -83 50.5 -140t132.5 -57q105 0 240 119l87 -95q-173 -159 -332 -159zM749 192q78 81 78 197t-78 196.5t-193.5 80.5t-193.5 -81 t-78 -196.5t78 -196.5t193.5 -81t193.5 81z" />
+<glyph unicode="♍" horiz-adv-x="1912" d="M1739 652q0 -428 -378 -752q18 -130 153 -295h-174q-63 80 -112 212q-139 -79 -340 -111v127q190 39 311 111q-15 96 -15 193v900q0 220 -64 332q-157 -169 -232 -476v-893h-149v987q0 275 -65 382q-153 -178 -231 -441v-928h-148v1075q0 223 -122 405h156 q83 -114 114 -293q75 185 174 293l145 27q100 -128 126 -340q51 160 181 313l143 27q120 -167 120 -369v-282q60 170 127 266l122 45q158 -245 158 -515zM1591 644q0 178 -78 345q-110 -136 -181 -363v-587q259 263 259 605z" />
+<glyph unicode="♎" horiz-adv-x="1937" d="M1764 592h-629v138q161 104 161 279q0 134 -96.5 228.5t-230.5 94.5t-230.5 -94.5t-96.5 -228.5q0 -175 160 -279v-138h-629v148h441q-120 123 -120 276q0 193 141 328.5t334.5 135.5t334 -135.5t140.5 -328.5q0 -153 -120 -276h440v-148zM1764 148h-1591v148h1591v-148z " />
+<glyph unicode="♏" horiz-adv-x="2099" d="M1692 -271h-136q-204 0 -292 115q-78 101 -78 313v892q0 225 -65 323q-166 -191 -231 -478v-894h-148v996q0 269 -65 376q-159 -179 -231 -445v-927h-148v1056q0 264 -125 424h159q84 -128 114 -291q70 174 174 291l143 29q100 -117 127 -336q55 157 179 307l146 29 q119 -162 119 -383v-921q0 -122 3 -150q10 -91 52 -136q63 -67 212 -67h91v148l234 -211l-234 -204v144z" />
+<glyph unicode="♐" horiz-adv-x="1902" d="M1729 686l-146 -23l-75 531l-667 -668l314 -314l-105 -104l-314 314l-461 -459l-102 102l461 459l-314 314l104 105l314 -314l668 667l-531 75l23 146l729 -102z" />
+<glyph unicode="♑" horiz-adv-x="2246" d="M1967 638q106 -103 106 -258t-106.5 -267.5t-264.5 -112.5q-211 0 -369 164q-100 -261 -159 -333q-106 -127 -324 -127h-134v123h63q152 0 231 58.5t129 175.5q4 10 84 246q-54 95 -76 194q-7 36 -30 210l-37 283q-36 279 -86 385q-129 -152 -220 -405.5t-91 -455.5v-80 h-147v52q0 133 -47 395t-97 357q-61 116 -191 116h-28v122h111q155 0 215 -122q71 -145 129 -487q84 376 280 609l195 38q71 -158 120 -489l27 -181q11 -75 24 -187t39 -193q143 273 395 273q153 0 259 -103zM1877.5 189q72.5 78 72.5 187t-69.5 181t-172.5 72 q-218 0 -342 -340q161 -178 325 -178q114 0 186.5 78z" />
+<glyph unicode="♒" horiz-adv-x="2182" d="M2009 939l-115 -51l-119 284l-433 -284l-120 284l-428 -284l-120 284l-432 -284l-68 102l555 367l122 -284l430 284l120 -284l430 284zM2008 174l-115 -51l-119 284l-432 -284l-120 284l-428 -284l-121 284l-432 -284l-68 102l555 367l122 -284l430 284l120 -284l430 284 z" />
+<glyph unicode="♓" horiz-adv-x="1598" d="M952 716h-306q0 -193 -87.5 -394.5t-224.5 -358.5h-161q326 344 326 753h-315v111h315q-20 355 -326 690h153q280 -300 320 -690h306q40 390 320 690h153q-306 -335 -326 -690h315v-111h-315q0 -409 326 -753h-161q-136 155 -224 358.5t-88 394.5z" />
+<glyph unicode="♔" horiz-adv-x="1903" d="M936 1521l99 -2q48 0 82.5 -29.5t34.5 -76.5v-193l147 44q88 25 150 25q165 0 283 -130q91 -101 91 -279.5t-149 -445.5q-27 -48 -27 -99.5t-80 -167.5q26 -40 26 -103q0 -89 -70 -118q27 -35 27 -88q0 -204 -605.5 -204t-605.5 213q0 45 25 79q-69 35 -69 111t34 119 q-31 56 -69 157q0 13 -3 36t-25 51.5t-60 106.5q-92 190 -92 362t101.5 286t272.5 114q126 0 290 -62v116q0 69 1 80q6 70 93 91q30 7 98 7zM1080 1246v156l-95 -78zM1054 1441q0 14 -27 14h-167q-16 0 -16 -14q0 -1 105 -89q105 88 105 89zM1751 890q0 143 -83.5 235.5 t-225.5 92.5q-45 0 -145.5 -21.5t-125.5 -42.5q25 -52 34 -111q97 115 226 115q104 0 169 -79.5t65 -185.5q0 -178 -151 -469q21 -24 61 -35q8 35 32 77q144 245 144 424zM1531 647q62 160 62 240t-48.5 139t-124.5 59q-142 0 -224 -187q-20 -45 -44 -94q7 -9 17 -9 q50 70 117 70q31 0 66.5 -23t49 -46.5t24.5 -62.5q65 -2 105 -86zM911 1325l-94 76l8 -146zM1080.5 875q54.5 55 54.5 135.5t-57.5 139t-132.5 58.5t-137 -59t-62 -135.5t57.5 -135t140 -58.5t137 55zM1477 540q0 130 -52 130q-23 0 -44 -34l-26 -54q-2 212 -69 212 q-10 0 -30 -17q-38 -34 -45 -96t-7 -63q-12 105 -44 105q-23 0 -34 -26q-16 -92 -35 -141q187 -15 360 -96q26 35 26 80zM1070 783q-50 -35 -124.5 -35t-119.5 26q43 -107 60 -218h133zM1541 63q0 95 -63 95q-52 0 -52 -65q0 -84 62 -84q53 0 53 54zM1362 159q0 50 -23.5 67 t-83 36t-85.5 19q-35 0 -35 -46.5t12 -62.5t70 -42.5t78 -26.5q67 0 67 56zM476 1085q-74 0 -127 -60.5t-53 -139.5t70 -239q49 88 95 88q5 0 10 -1q39 132 139 132q73 0 117 -70q8 0 17 8q-7 27 -44 97q-97 185 -224 185zM986 488q-360 0 -628 -206q18 -22 25 -51 q241 157 548 157h73q284 0 510 -167q32 31 51 96q-285 171 -579 171zM815 555q0 18 -17 72t-30 75t-31.5 21t-28.5 -37l-16 -68q1 45 1 47q0 41 -28 85t-67 44q-3 0 -11 -4q-53 -28 -53 -152q0 -9 4 -27.5t4 -28.5q-20 55 -22 57q-17 31 -48 31q-53 0 -53 -141l44 -96 q163 77 352 114v8zM454 1218q-140 0 -220.5 -99t-80.5 -241.5t105 -349.5l47 -88q24 -46 26 -86q33 17 68 43q-175 355 -175 491t113 222q62 47 114 47q129 0 232 -105q6 32 35 103q-156 63 -264 63zM851 226q0 -59 110.5 -59t110.5 75t-97.5 75t-115.5 -58q-5 -16 -8 -33z M1445 -152q24 0 24 38t-64.5 82t-121.5 66q-162 61 -369 61q-107 0 -255.5 -46.5t-206.5 -113.5q-25 -29 -25 -49q0 -39 48 -39q8 0 32 22q50 46 182 75t224 29h113q69 0 196 -33t166 -70q24 -23 30 -23t16 3q9 -2 11 -2zM764 252q0 29 -32 29q-40 0 -172 -53 q-26 -15 -26 -60.5t15.5 -55t48.5 -9.5t81 22.5t66.5 44t18.5 82.5zM1319 -205q0 29 -98.5 68t-256 39t-214.5 -12.5t-115 -39.5t-58 -55q0 -38 97 -57q65 -12 135 -12h279q70 0 135 12q96 19 96 57zM410 9q61 0 61 74.5t-52 74.5q-62 0 -62 -84q0 -65 53 -65zM966 899 q-45 0 -45 24t47 43.5t58 44.5q1 3 6.5 43t19.5 40q6 0 22 -7l-1 -3q11 -22 11 -42l-8 -57q-25 -86 -110 -86z" />
+<glyph unicode="♕" horiz-adv-x="1993" d="M370 893l-8 -59q0 -24 54 -66l76 -54q35 -28 44 -28q18 0 18 20t-13 77l-75 332q-71 39 -71 129t95 130q33 14 46.5 14t44.5 -8q105 -27 105 -127q0 -49 -25 -94l91 -260q34 -99 66 -99q22 0 25 23v40l2 21q1 8 25 396q-36 55 -36 108t44 97t109.5 44t106.5 -47.5 t41 -118.5q0 -38 -36 -80v-5v1q1 0 11 -168q1 -91 19 -272q7 -39 23 -39q29 0 47 49l109 310q-34 46 -34 97t47.5 91.5t104 40.5t102 -42.5t45.5 -98.5q0 -89 -79 -132l-61 -286q0 -2 -13.5 -48t-13.5 -70.5t17 -24.5t53 26l73 53q41 32 58 70q-18 43 -18 83 q0 66 49.5 106.5t116.5 40.5t112.5 -38t45.5 -105t-38 -101q-15 -14 -71.5 -40.5t-72.5 -60.5q-100 -217 -106 -287q35 -95 35 -145.5t-43 -101.5v-53q50 -45 50 -130t-39 -119q-16 -7 -46 -24q-5 -12 -16 -35q-94 -192 -591.5 -192t-587.5 227q-88 27 -88 146q0 84 53 128 v51q-43 44 -43 112q0 25 17 68t17 68.5t-41 122.5l-76 175q-10 24 -56 41q-90 32 -90 137q0 59 44.5 102.5t104.5 43.5q87 0 129 -82q12 -23 12 -80zM1480.5 1182.5q30.5 22.5 30.5 58.5t-25 65t-61.5 29t-63 -26.5t-26.5 -60t23.5 -61t57.5 -27.5t64.5 22.5zM1072 1379 q0 34 -26.5 61t-59 27t-61.5 -24.5t-29 -60t24.5 -63t61 -27.5t63.5 26.5t27 60.5zM634 1240q0 95 -104 95q-31 0 -55.5 -28t-24.5 -64t29 -60.5t64.5 -24.5t63 26t27.5 56zM1652 906l9 -42q0 -27 -3 -45q-8 -46 -94.5 -117t-133.5 -71q-27 0 -52.5 15.5t-25.5 46t39 239.5 l31 166q-36 0 -68 17l-60 -177q-47 -135 -66 -159q-33 -41 -77 -41q-78 0 -89 121l-25 388q-24 -18 -55 -18t-59 18l-17 -405q-4 -104 -88 -104q-71 0 -115 113q-3 8 -88 263q-27 -14 -78 -16l53 -263q26 -120 26 -133q0 -45 -22.5 -58t-70 -13t-136 84t-88.5 129 q0 8 8.5 28.5t8.5 44t-26 49.5t-61.5 26t-61 -27.5t-25.5 -64.5t63.5 -78.5t81 -70t69.5 -152.5t52 -153.5t-18.5 -85t-19.5 -60.5l10 -43q286 263 600.5 263t609.5 -263q8 20 8 41.5t-17.5 65.5t-17.5 68q0 46 113 311q16 36 56 61l76 47q38 30 38 68.5t-28 60.5t-64 22 q-102 0 -102 -96zM1562 -79q45 0 45 84.5t-42 84.5q-45 0 -45 -84.5t42 -84.5zM1018 457h-6v-50q0 3 60.5 -69.5t78.5 -90.5l89 -28q101 -36 235 -128q34 52 78 60v52q-197 177 -416 233q-83 21 -119 21zM1153 184q-3 0 -141 -131v-104q180 -11 255 -28q176 -40 174 -138 q56 35 77 87q-61 35 -60 157q-129 100 -241 138q-56 19 -64 19zM1097 221l-112 122l-113 -123l113 -112zM948 457h-13q-27 0 -99 -17q-199 -47 -421 -238v-51q53 -4 70 -60q153 105 332 156q32 27 66 72l65 86v52zM1388 -211q0 11 -46 38.5t-144.5 47.5t-168.5 20h-96 q-74 0 -197.5 -24.5t-145.5 -62.5q-1 -4 -5 -11.5t-4 -8.5q0 -53 150 -78q98 -17 204 -17h171q84 0 165 18q117 27 117 78zM948 -51v104l-132 131q-152 -40 -314 -157v-11q0 -115 -60 -146q21 -50 77 -87q3 94 177 138q114 28 252 28zM404 -79q45 0 45 84.5t-42 84.5 q-45 0 -45 -84.5t42 -84.5z" />
+<glyph unicode="♖" horiz-adv-x="1698" d="M1618 -342h-1538v280l154 173v106l186 211v488l-208 141v430h293v-199h207v199h274v-199h207v199h294v-430l-209 -141v-488l185 -210v-106l155 -174v-280zM1422 1103v319h-164v-199h-337v199h-144v-199h-337v199h-163v-319h1145zM1339 1036h-981l120 -81h741zM1213 462 v429h-728v-429h728zM1371 224l-155 176h-734l-155 -176h1044zM1398 160h-1099v-74l-136 -153h1372l-137 154v73zM1553 -277v146h-1408v-146h1408z" />
+<glyph unicode="♗" horiz-adv-x="2156" d="M2076 -381h-265q-2 41 -65 41q-21 0 -152.5 -17t-211 -17t-163.5 40q-99 46 -129 132q-8 22 -12 38q-4 -16 -12 -38q-30 -86 -129 -132q-84 -40 -163.5 -40t-211 17t-152.5 17q-63 0 -65 -41h-265v61q0 82 77 149q105 91 308 91q45 0 133 -12.5t145 -12.5t87.5 18 t71.5 77q-75 15 -125 31t-82 49v304q-165 119 -165 297q0 128 95 237q20 22 141 126l249 212q-101 49 -101 154q0 70 47 117t117 47t117 -47t47 -117q0 -105 -101 -154l194 -164q176 -152 196 -174q95 -109 95 -237q0 -178 -165 -297v-304q-48 -49 -207 -80q41 -59 71.5 -77 t87.5 -18t145 12.5t133 12.5q203 0 308 -91q77 -67 77 -149v-61zM1142 1337q28 27 28 63.5t-27.5 63t-64.5 26.5t-64.5 -26.5t-27.5 -63t28 -63.5t64 -27t64 27zM1513.5 517q45.5 70 45.5 161t-76.5 174t-188.5 180l-216 187l-205 -177q-123 -107 -199.5 -190t-76.5 -174 t45.5 -161t120.5 -100q191 53 315 53t315 -53q75 30 120.5 100zM1703 -148q-47 0 -139 -13t-139 -13q-87 0 -137.5 37t-103.5 121h-70v-30q0 -36 15 -85q53 -174 277 -174q46 0 188.5 16.5t150.5 16.5q64 0 106 -42h156q-39 166 -304 166zM1121 401h-86q-120 0 -272 -52v-48 l58 -39l-58 -65v-61q107 37 233 37h164q126 0 233 -37v61l-58 65l58 39v48q-152 52 -272 52zM1162 106h-168q-91 0 -192 -24q93 -38 208 -38h136q128 0 209 38q-100 24 -193 24zM1042 -46v30h-70q-53 -84 -103.5 -121t-137.5 -37q-47 0 -139 13t-139 13q-265 0 -304 -166 h156q42 42 106 42q8 0 150.5 -16.5t188.5 -16.5q224 0 277 174q15 49 15 85zM1255 725h-143v-144h-70v144h-144v69h144v143h70v-143h143v-69zM1175 290l-97 -61l-97 61l97 65z" />
+<glyph unicode="♘" horiz-adv-x="1958" d="M1864 652l14 -115q0 -63 -19.5 -186.5t-19.5 -200t35 -182.5q-65 -116 -290 -182q-165 -49 -439 -75l-373 -30q-127 -14 -307 -75l-18 23q0 13 29 156q8 71 35 211q10 37 66 159l38 93q18 40 63 90l92 103q69 81 69 109t-22 48q-44 -13 -76 -31q-23 -4 -51 -4l-141 8 q-29 0 -39 -16l-56 -41q-34 -25 -62.5 -25t-70.5 28.5t-59.5 28.5t-30.5 10.5t-13 22.5q0 67 119 67q22 0 22 14q0 36 -41 36t-87.5 -33.5t-51.5 -33.5q-29 0 -42 25q-50 32 -50 62t21 48q-28 31 -28 59.5t93 77t155 71.5l186 60q98 32 163 70q49 37 153 104q48 15 143 49 q34 20 107 49q2 99 87 147q47 26 167.5 51t152.5 54q155 -100 222 -298q7 -22 24 -65q131 -290 131 -541zM930.5 1108.5q10.5 7.5 10.5 13t-10.5 13t-17.5 7.5t-18 -10.5t-11 -20.5t18 -10t28.5 7.5zM1818 537v6q-55 18 -127 24l2 30q68 -5 121 -21q-3 16 -8 48 q-74 14 -134 18l2 30q58 -3 130 -17q0 15 -2 48q-51 15 -83 15t-52 -2l-2 30q23 2 54 2t81 -13q-2 18 -5 41q-41 10 -101 10q-18 0 -38 -1l-2 30q39 2 67 2t69 -9q-3 16 -9 44q-35 10 -59.5 10t-84.5 -7l-4 30q61 7 85 7t55 -7l-3 14q-29 5 -84 5v30h26q26 0 49 -3 q-4 14 -13 41q-11 1 -19 1q-49 0 -110 -33l-14 26q67 37 124 37h9l-9 28q-26 5 -48.5 5t-96.5 -20l-7 29q78 21 101 21t39 -2l-7 20q-13 -3 -34 -10l-9 29l33 9l-10 25q-55 -6 -129 -44l-13 27q74 38 132 46l-20 54q-62 -15 -135 -64l-17 25q73 49 142 67q-24 63 -61 120 q-90 -108 -177 -143q-15 -34 -61 -67.5t-82.5 -33.5t-90.5 22l23 56q43 -18 64.5 -18t55 25.5t37.5 42.5l20 25q40 13 76 41l-145 -30q-74 -20 -137 -66l-36 48q88 65 225.5 90t192.5 56q-13 16 -28 31q-56 -48 -136 -50l-1 30q67 0 115 40q-6 5 -17 15 q-34 -16 -137.5 -37.5t-144.5 -46.5q-65 -38 -65 -114l-32 -36q-12 -2 -101 -44q27 -26 51 -66l-26 -16q-27 47 -56 70q-18 -6 -36 -11q62 -19 62 -82q-14 -3 -41.5 -21.5t-46.5 -18.5t-49 16.5t-48 14.5l20 29q4 9 11 28q-46 -34 -141 -97q-67 -39 -167 -72l-192 -62 q-44 -16 -81 -32q22 -5 22 -33.5t-40.5 -46.5t-79.5 -20l-8 -56l-14 -6q5 -7 29 -27q86 61 140 61q21 0 41 -9q27 32 60.5 32t65.5 -20.5t32 -44.5q0 -41 -33 -68q-32 -27 -72 -27h-3q-25 -35 -68 -35q-6 0 -13 1q58 -36 65 -36q19 0 77 51q34 30 80 31q30 30 45 41 q49 37 146 43t134 19l10 -28q-28 -10 -135.5 -19.5t-156.5 -56.5l99 -7q32 0 67 16t53.5 16t62 -13.5t82.5 -13.5t120.5 40.5t105.5 81.5q43 73 43 159q0 30 -4 71l60 6q4 -41 4 -77q0 -103 -51 -189q-32 -55 -127 -103.5t-162 -48.5q-25 0 -47 4q2 -12 2 -18 q0 -62 -104 -175.5t-119 -140.5l-45 -108q-24 -49 -62 -150q-9 -69 -33 -207q-8 -29 -22 -88q143 44 252 56l524 48q373 50 491 159q-44 13 -78 29l13 27q41 -20 88 -32l4 5q-6 20 -9 34q-58 12 -105 15l2 30q43 -2 96 -13q-4 18 -7 42q-58 9 -102 12l2 30q41 -3 96 -11 q-2 18 -2 29q-45 11 -99 13l1 29q57 -2 98 -11q1 31 3 57q-52 -13 -99 -32l-12 28q49 21 115 36l3 24h-9q-41 0 -95 -15l-8 28q61 17 102 17q-9 0 14 -1l5 28q-46 19 -103 24l2 30q59 -5 106 -23l3 23q-36 20 -108 21v30q73 -1 112 -20q2 13 5 40q-32 15 -56 15t-54 -4 l-4 30q30 4 55.5 4t60.5 -14q1 19 1 35zM454 711q-13 8 -26 8t-41 -34q38 -6 25 -6q36 0 42 32zM216 855l-3 3q-16 -7 -47 -23q50 6 50 20zM1574 748q0 -149 -63 -243q-32 -48 -137.5 -138.5t-152.5 -174.5l-27 14q46 82 150.5 173t136.5 137q63 92 63 232q0 68 -42 146 l27 15q45 -83 45 -161zM1112 842q-32 -3 -55.5 -3t-63.5 12l8 29q36 -11 56 -11t52 3zM1625 297q-27 3 -53 3t-74 -11l-7 29q53 12 82 12t56 -3zM1625 216q-77 -5 -139 -23l-9 29q63 19 146 24zM973 960q-106 -40 -322 -105l-7 30q63 14 174 53.5t146 50.5zM1610 113h-12 q-58 0 -125 -16l-7 29q71 17 131 17h13v-30zM1188 560q-176 -67 -216.5 -67t-74.5 20l16 26q26 -16 48 -16q47 0 217 65zM1155 495q-113 -59 -168.5 -59t-101.5 23l13 27q38 -20 88 -20t155 55zM604 734l-30 -4q-5 30 -20 68l28 11q17 -42 22 -75zM1447 -4q-95 14 -175.5 14 t-166.5 -29l-10 28q90 31 175.5 31t180.5 -14zM569 695l-30 -1q-2 49 -52 81l17 25q63 -40 65 -105zM477 875q-113 -52 -182 -115l-20 23q69 64 189 119zM1436 -102q-48 7 -85 7t-118 -17.5t-112 -20.5l-3 29q33 3 114.5 21t120 18t87.5 -7z" />
+<glyph unicode="♙" horiz-adv-x="1588" d="M1508 -374h-1428v101q0 112 59 199t163 124q37 9 84 25q9 7 58 90q162 273 192 475q7 47 7 147h-278v64q0 71 72.5 131t154.5 89q-72 83 -72 195.5t80 192t194 79.5t194 -79.5t80 -191t-73 -195.5l64 -29q164 -85 164 -200v-56h-278v-84q0 -10 8 -65q35 -237 249 -563 q258 -51 297 -273q9 -51 9 -64v-112zM1150 854v5q0 6 -10 28q-38 83 -239 161q99 101 99 217q0 86 -60 146.5t-146 60.5t-146 -60.5t-60 -146.5q0 -113 98 -217q-113 -48 -151 -72q-92 -57 -97 -122h712zM1440 -309v30q0 -5 -2 17q-11 119 -65.5 181.5t-170.5 94.5 q-23 5 -50 13q-9 7 -51 77q-223 375 -223 678v5h-169v-5q0 -326 -255 -730q-6 -11 -17 -25l-96 -28q-194 -73 -194 -308h1293z" />
+<glyph unicode="♚" horiz-adv-x="1979" d="M1518 1280q177 0 279 -124.5t102 -298t-115 -314.5l-61 -69q-43 -51 -43 -74l27 -26q20 -24 20 -65q0 -82 -74 -92q-3 -27 -7.5 -40t-19.5 -24q26 -42 26 -97t-53 -93v-36q26 -28 26 -78q0 -110 -227 -162q-148 -33 -361 -33t-322 11q-262 26 -339 115q-24 28 -24 74.5 t29 73.5v35q-54 29 -54 104q0 45 26 87q-18 24 -25 61l-2 2q-76 11 -76 79.5t49 102.5q-5 26 -37 65l-60 73q-122 161 -122 328t104 291t279 124q145 0 317 -90v331h419v-331q184 90 319 90zM1680 1129q0 69 -62 69q-56 0 -56 -52q0 -58 49 -58h29q40 0 40 41zM1717 943 q0 -54 58 -54t58 54t-58 54t-58 -54zM1435 1128q0 70 -62 70q-56 0 -56 -51q0 -59 50 -59h28q40 0 40 40zM1670 653q0 -54 55 -54t55 58t-50 58q-60 0 -60 -62zM1125 1407l-63 61l-73 -80l-73 80l-62 -61l73 -82l-63 -73l63 -62l63 71l63 -71l62 62l-62 74zM1651 817 q0 94 -49.5 169t-138.5 75q-1 0 -35 -5q-130 -19 -209 -181q-65 -135 -65 -284q235 -72 380 -82q117 162 117 308zM1107 871q54 49 54 115t-51 120.5t-114 54.5q-41 0 -90.5 -30.5t-68.5 -64.5t-19 -78q0 -67 52.5 -119t113.5 -52t97 28q8 9 26 26zM1572 377q0 50 -55.5 50 t-55.5 -54.5t55.5 -54.5t55.5 59zM664 1129q0 69 -62 69q-56 0 -56 -51q0 -59 49 -59h28q41 0 41 41zM1336 465q0 42 -59.5 42t-59.5 -57q0 -51 56 -51q63 0 63 66zM1045 669q0 48 -48 48q-61 0 -61 -54.5t54.5 -54.5t54.5 61zM1617 49q0 27 -28.5 47.5t-55.5 20.5 t-53 -28.5t-26 -56.5t26 -52.5t58 -24.5q47 0 78 51q1 8 1 25l-2 4q2 6 2 14zM417 1143q0 55 -58.5 55t-58.5 -55t41 -55h28q48 0 48 55zM936 499q0 -55 54.5 -55t54.5 55t-51 55q-58 0 -58 -55zM826 607q0 81 -38.5 197t-88.5 172q-76 85 -174.5 85t-150.5 -80 q-46 -69 -46 -164q0 -146 118 -309q153 13 380 83v16zM1571 208q0 29 -30 46q-240 135 -594 135q-100 0 -234 -34t-226 -82l-49 -24q-28 -18 -28 -43q0 -42 42 -42q8 0 82.5 32.5t80.5 34.5q168 61 379.5 61t428.5 -90q91 -38 103 -38q45 0 45 44zM1135 164q0 46 -47 72 t-98.5 26t-98 -27t-46.5 -77q0 -18 24 -46q40 -48 96 -48t68 3q102 25 102 97zM712 389q43 0 43 59t-55 59t-55 -54q0 -64 67 -64zM209 880q46 0 46 58.5t-54.5 58.5t-54.5 -54q0 -63 63 -63zM309 667q-2 48 -50.5 48t-67.5 -62q16 -54 68.5 -54t50.5 41zM1497 -147 q0 45 -99 93q-68 32 -163.5 57t-273.5 25q-239 0 -436 -119q-42 -25 -42 -50q0 -58 44 -58q11 0 24 4q8 5 23 16q166 116 430 116q112 0 199 -26t163.5 -68t87.5 -42q43 0 43 52zM468 427q-58 0 -58 -54.5t54 -54.5t54 54.5t-50 54.5zM503.5 -16.5q24.5 28.5 24.5 55.5 t-31.5 52.5t-59.5 25.5t-50 -24.5t-22 -55.5t27 -56.5t57 -25.5t54.5 28.5zM1575 790q0 -108 -86 -210l-74 54q39 52 39 143q0 29 -25 29q-28 0 -54.5 -75.5t-39.5 -78.5q-26 -29 -78 -29l-32 3q18 32 27.5 88.5t15.5 74.5q46 137 176.5 137t130.5 -136zM952 868 q-23 0 -54 28.5t-34 45.5t-3 40q0 54 46 89l2 -1q47 -115 155 -145q-50 -57 -112 -57zM731 623q-86 0 -112 80q-34 103 -62 103q-21 0 -21 -49t28 -124l-73 -53q-85 105 -85 209q0 137 118 137q123 0 172 -99l67 -201q-30 -3 -32 -3z" />
+<glyph unicode="♛" horiz-adv-x="1993" d="M1870 1007.5q43 -42.5 43 -96t-35 -98.5t-81 -45t-67 10q-105 -182 -105 -375q0 -32 27 -67.5t27 -67t-27 -57.5t-27 -51.5t27 -72.5t27 -75.5t-35 -77.5l-63 -89q-9 -52 -28 -85q-75 -128 -428 -128q-442 0 -581 47q-37 13 -70 38q-56 43 -68 108q0 8 -4 22 q-94 104 -94 157q0 30 31 82.5t31 86.5q0 7 -25 41t-29 51q7 41 25 70.5t18 58.5q0 201 -105 384q-14 -10 -58.5 -10t-80 46.5t-35.5 98.5t45.5 94.5t98 42.5t90.5 -39t38 -94.5t-18 -84.5q148 -218 217 -218q44 0 44 76q0 185 -88 411q-130 11 -130 131q0 141 132 141 q141 0 141 -159q0 -48 -37 -78q33 -104 84 -220q77 -172 121 -172q60 0 85 218q15 128 15 274v14q-72 35 -72 123q0 69 44 112.5t108.5 43.5t106 -45t41.5 -105q0 -87 -72 -129q2 -151 10 -249.5t32.5 -182t49.5 -83.5h10q39 0 109 159t94 243q-42 32 -42 94t39.5 102 t100 40t100.5 -32t40 -90q0 -140 -131 -150l-1 -1q-86 -249 -86 -389q0 -97 44 -97q81 0 216 217q-27 32 -27 83t42.5 93.5t97.5 42.5t98 -42.5zM1493 1302q0 52 -51 52q-46 0 -46 -44q0 -52 53 -52q44 0 44 44zM1811 956q0 -4 -4 24q-5 36 -50.5 36t-45.5 -42q0 -55 54 -55 q46 0 46 37zM1091 1450q0 52 -55 52q-41 0 -41 -43q0 -53 53 -53q43 0 43 44zM587 1281q0 64 -44 64q-51 0 -51 -51q0 -45 39 -45h26q30 0 30 32zM1623 4l-87 94l-86 -95l87 -94zM1590 211q0 12 -6 22q-45 77 -155 159q-190 142 -472 142q-8 0 -65 -7q-281 -34 -461 -267 q-28 -36 -28 -49q0 -42 36 -42q22 0 83 52.5t97.5 81t78.5 49.5q123 61 332 61t386 -141q51 -47 113 -98q12 -5 23 -5q38 0 38 42zM282 970q0 46 -48 46t-48 -48.5t43 -48.5q53 0 53 51zM1145 195l-149 155l-148 -155l150 -164zM1511 -217q0 13 -10 28q-61 91 -217 137 t-296 46q-298 0 -462 -147q-44 -39 -44 -64q0 -35 47 -35q5 0 15 11q37 39 104 65q120 47 265 47h167q201 0 321 -74l37 -27q27 -19 39 -19q34 0 34 32zM542 4l-86 94l-86 -95l86 -95z" />
+<glyph unicode="♜" horiz-adv-x="1698" d="M1618 -342h-1538v280l154 173v106l186 211v488l-208 141v430h293v-199h207v199h274v-199h207v199h294v-430l-209 -141v-488l185 -210v-106l155 -174v-280zM1422 1103h-1145v-12l82 -55h981l82 56v11zM485 891h728v60l7 4l-735 -5v-59zM1213 462h-728v-59l-3 -3l731 3v59z M1398 160v33l-27 31h-1044l-28 -32v-32h1099zM1553 -131v44l-18 20h-1372l-18 -20v-44h1408z" />
+<glyph unicode="♝" horiz-adv-x="2156" d="M2076 -381h-265q-2 41 -65 41q-21 0 -152.5 -17t-211 -17t-163.5 40q-99 46 -129 132q-8 22 -12 38q-4 -16 -12 -38q-30 -86 -129 -132q-84 -40 -163.5 -40t-211 17t-152.5 17q-63 0 -65 -41h-265v61q0 82 77 149q105 91 308 91q45 0 133 -12.5t145 -12.5t87.5 18 t71.5 77q-75 15 -125 31t-82 49v304q-165 119 -165 297q0 128 95 237q20 22 141 126l249 212q-101 49 -101 154q0 70 47 117t117 47t117 -47t47 -117q0 -105 -101 -154l194 -164q176 -152 196 -174q95 -109 95 -237q0 -178 -165 -297v-304q-48 -49 -207 -80q41 -59 71.5 -77 t87.5 -18t145 12.5t133 12.5q203 0 308 -91q77 -67 77 -149v-61zM1142 1337q28 27 28 63.5t-27.5 63t-64.5 26.5t-64.5 -26.5t-27.5 -63t28 -63.5t64 -27t64 27zM1255 725v69h-143v143h-70v-143h-144v-69h144v-144h70v144h143zM1393 197v104l-58 -39zM1078 470 q-124 0 -315 -53v-68q152 52 272 52h86q120 0 272 -52v68q-191 53 -315 53zM1175 290l-97 65l-97 -65l97 -61zM1160 173h-164q-126 0 -233 -37v-64q121 34 231 34h168q110 0 231 -34v64q-107 37 -233 37zM821 262l-58 39v-104z" />
+<glyph unicode="♞" horiz-adv-x="1958" d="M1864 652l14 -115q0 -63 -19.5 -186.5t-19.5 -200t35 -182.5q-65 -116 -289 -182q-165 -49 -439 -75l-374 -30q-127 -14 -307 -75l-18 23q0 13 29 156q8 71 35 211q10 37 66 159l38 93q18 40 63 90l92 103q69 81 69 109t-22 48q-44 -13 -76 -31q-23 -4 -51 -4l-141 8 q-29 0 -39 -16l-56 -41q-34 -25 -62.5 -25t-70.5 28.5t-59.5 28.5t-30.5 10.5t-13 22.5q0 67 119 67q22 0 22 14q0 36 -41 36t-87.5 -33.5t-51.5 -33.5q-29 0 -42 25q-50 32 -50 62t21 48q-28 31 -28 59.5t93 77t155 71.5l186 60q98 32 163 70q49 37 153 104q48 15 143 49 q34 20 107 49q2 99 87 147q47 26 167.5 51t152.5 54q155 -101 222 -298q7 -22 24 -65q131 -290 131 -541zM1527 1446l-22 21q-48 -40 -116 -40l1 -30q82 2 137 49zM1680 1224l-10 28q-79 -15 -162 -71l17 -25q83 55 155 68zM1729 1089l-10 28q-28 -7 -52 -14l9 -29z M1711 1139l-11 29q-68 -5 -152 -48l13 -27q84 43 150 46zM1740 1060q-29 6 -57 6t-106 -21l7 -29q74 20 103 20t65 -10zM1729 1003q-57 0 -124 -37l14 -26q61 33 97.5 33t54.5 -4q-3 11 -10 32q-15 2 -32 2zM1712 934h-26v-30q56 0 88 -6l6 30q-32 6 -68 6zM1327 1202 q-36 -28 -62 -28t-59 15l-16 -37q42 -18 77.5 -18t80 33t57.5 66q90 35 179 143l-26 31q-58 -32 -196 -57.5t-212 -81.5l24 -33q61 45 149 65l170 38q-56 -52 -111 -71l-14 -16q-5 -21 -41 -49zM1796 879q-42 13 -72 13t-91 -7l4 -30q60 7 88.5 7t78.5 -18zM1812 802 q-56 15 -87.5 15t-70.5 -2l2 -30q19 1 36 1q70 0 124 -16q-1 11 -4 32zM1696 748q-8 0 -31 -2l2 -30q20 2 29 2q70 0 127 -21q-1 19 -2 32q-58 19 -125 19zM1827 620q-3 20 -3 31q-86 17 -150 21l-2 -30q69 -4 155 -22zM1838 540q0 10 -3 29q-62 22 -142 28l-2 -30 q86 -7 146 -30zM1837 493q-44 23 -75 23t-61 -4l4 -30q30 4 39 4q48 0 90 -25zM1829 421q-49 29 -131 30v-30q77 -1 126 -32q2 11 5 32zM1059 1135q-36 71 -99 101l-13 -27q54 -25 85 -88zM1821 369q-56 26 -124 31l-2 -30q68 -6 122 -32zM1813 317q-20 2 -47.5 2t-88.5 -17 l8 -28q54 15 79 15t45 -2zM909 1186q3 0 -18 -10q-8 0 -24 -5q-12 -6 -20.5 -28.5t-12.5 -28.5l-17 -24q18 2 48 -14.5t49 -16.5t46.5 18.5t41.5 21.5q0 38 -27 62.5t-66 24.5zM1807 270q-80 -18 -136 -41l12 -28q53 21 120 37q0 3 4 32zM1574 748q0 78 -45 161l-27 -15 q42 -78 42 -146q0 -140 -63 -232q-32 -46 -136.5 -137t-150.5 -173l27 -14q47 84 152.5 174.5t137.5 138.5q63 94 63 243zM1109 872q-32 -3 -52 -3t-56 11l-8 -29q40 -12 63.5 -12t55.5 3zM1799 164v6q-53 15 -118 17l-1 -29q66 -2 120 -19q-1 20 -1 25zM1629 327 q-27 3 -56 3t-82 -12l7 -29q48 11 74 11t53 -3zM1248 766q36 99 36 139t-2 70l-40 -3q2 -30 2 -65.5t-34 -128.5q-22 -60 -110 -110t-156 -50q-26 0 -76 13q20 -23 27 -47q30 -6 49 -6q82 0 179.5 57.5t124.5 130.5zM1805 82l-3 31q-64 11 -117 14l-2 -30q56 -4 122 -15z M1821 6q-3 11 -8 32q-70 16 -117 18l-2 -30q54 -3 127 -20zM1625 216l-2 30q-83 -5 -146 -24l9 -29q62 18 139 23zM1826 -33q-63 14 -110 37l-13 -27q43 -21 101 -35q15 16 22 25zM973 960l-9 29q-105 -40 -320 -104l7 -30q63 14 173.5 54t148.5 51zM1610 113v30h-13 q-60 0 -131 -17l7 -29q67 16 125 16h12zM961 523q-22 0 -48 16l-16 -26q34 -20 74.5 -20t216.5 67l-10 28q-170 -65 -217 -65zM1141 521q-105 -55 -155 -55t-88 20l-13 -27q46 -23 101.5 -23t168.5 59zM781 717q-150 0 -233 -86h7q22 0 36 -1q49 47 156.5 56.5t135.5 19.5 l-10 28q-50 -17 -92 -17zM604 734q-5 33 -22 75l-28 -11q15 -38 20 -68zM1451 26q-95 14 -180.5 14t-175.5 -31l10 -28q86 29 166.5 29t175.5 -14zM569 695q-2 65 -65 105l-17 -25q50 -32 52 -81zM477 875l-13 27q-120 -55 -189 -119l20 -23q69 63 182 115zM1440 -72 q-49 7 -87.5 7t-120 -18t-114.5 -21l3 -29q31 3 112 20.5t118 17.5t85 -7zM465 675q20 16 20 40t-50 24t-50 -43q0 -37 37 -37q23 0 43 16zM279 853q0 7 -13 21q-14 0 -61.5 -14.5t-53 -23.5t-5.5 -23q0 -19 18 -19q36 0 75.5 15t39.5 44zM951 1121q0 -10 -13.5 -20 t-23.5 -10q-40 0 -40 22q0 12 14 25.5t25 13.5t24.5 -10.5t13.5 -20.5z" />
+<glyph unicode="♟" horiz-adv-x="1588" d="M1508 -374h-1428v101q0 112 59 199t163 124q37 9 84 25q9 7 58 90q162 273 192 475q7 47 7 147h-278v64q0 71 72.5 131t154.5 89q-72 83 -72 195.5t80 192t194 79.5t194 -79.5t80 -191t-73 -195.5l64 -29q164 -85 164 -200v-56h-278v-84q0 -10 8 -65q35 -237 249 -563 q258 -51 297 -273q9 -51 9 -64v-112z" />
+<glyph unicode="♠" horiz-adv-x="1414" d="M1225 855q89 -115 89 -232.5t-79.5 -198t-188.5 -80.5t-192 67t-129 169h-4v-26q0 -491 472 -506l9 -48h-990l9 48q472 15 472 506v26h-4q-46 -102 -129 -169t-192 -67t-188.5 80.5t-79.5 198t89 232.5q46 61 185.5 188t205.5 217q95 127 127 276q32 -149 127 -276 q66 -90 205.5 -217t185.5 -188z" />
+<glyph unicode="♡" horiz-adv-x="1560" d="M1365 1445q95 -91 95 -227.5t-88 -294.5q-55 -99 -200.5 -282.5t-220.5 -301.5q-123 -192 -171 -370q-48 178 -171 370q-75 118 -220.5 301.5t-200.5 282.5q-88 158 -88 294.5t95 227.5t228.5 91t230.5 -92t126 -222q29 130 126 222t230.5 92t228.5 -91zM1294 951 q84 146 84 257.5t-71 178.5t-176 67q-156 0 -240 -165q-10 -19 -33 -91t-78 -72t-80 78q-8 28 -31 85q-84 165 -240 165q-105 0 -176 -67t-71 -178.5t84 -257.5q50 -87 164 -231q258 -326 350 -519q92 193 350 519q114 144 164 231z" />
+<glyph unicode="♢" horiz-adv-x="1346" d="M1246 754q-327 -370 -573 -782q-246 412 -573 782q327 370 573 782q246 -412 573 -782zM1137 754q-256 298 -464 626q-208 -328 -464 -626q256 -298 464 -626q208 328 464 626z" />
+<glyph unicode="♣" horiz-adv-x="1738" d="M1342 1033q126 0 211 -106.5t85 -245.5t-101 -240t-240 -101t-248.5 86t-162.5 212h-4v-52q0 -246 161 -403q65 -63 161 -96q51 -17 184 -43l11 -44h-1060l12 44q132 26 183 43q96 33 161 96q161 157 161 403v52h-4q-53 -126 -162.5 -212t-248.5 -86t-240 101t-101 240 t85 245.5t211 106.5q88 0 205 -63l5 4q-85 130 -85 224q0 145 101 241.5t247 96.5t247 -96.5t101 -241.5q0 -94 -85 -224l5 -4q117 63 205 63z" />
+<glyph unicode="♤" horiz-adv-x="1414" d="M1225 855q89 -115 89 -232.5t-79.5 -198t-188.5 -80.5t-192 67t-129 169h-4v-26q0 -491 472 -506l9 -48h-990l9 48q472 15 472 506v26h-4q-46 -102 -129 -169t-192 -67t-188.5 80.5t-79.5 198t89 232.5q46 61 185.5 188t205.5 217q95 127 127 276q32 -149 127 -276 q66 -90 205.5 -217t185.5 -188zM1176.5 482.5q55.5 56.5 55.5 142.5t-62.5 167.5t-230 238.5t-232.5 274q-65 -117 -232.5 -274t-230 -238.5t-62.5 -167.5t55.5 -142.5t135.5 -56.5q130 0 320 236l14 17l14 -17q190 -236 320 -236q80 0 135.5 56.5zM832 82q-79 62 -125 153 q-46 -91 -125 -153h250z" />
+<glyph unicode="♥" horiz-adv-x="1560" d="M1365 1445q95 -91 95 -227.5t-88 -294.5q-55 -99 -200.5 -282.5t-220.5 -301.5q-123 -192 -171 -370q-48 178 -171 370q-75 118 -220.5 301.5t-200.5 282.5q-88 158 -88 294.5t95 227.5t228.5 91t230.5 -92t126 -222q29 130 126 222t230.5 92t228.5 -91z" />
+<glyph unicode="♦" horiz-adv-x="1346" d="M1246 754q-327 -370 -573 -782q-246 412 -573 782q327 370 573 782q246 -412 573 -782z" />
+<glyph unicode="♧" horiz-adv-x="1738" d="M1342 1033q126 0 211 -106.5t85 -245.5t-101 -240t-240 -101t-248.5 86t-162.5 212h-4v-52q0 -246 161 -403q65 -63 161 -96q51 -17 184 -43l11 -44h-1060l12 44q132 26 183 43q96 33 161 96q161 157 161 403v52h-4q-53 -126 -162.5 -212t-248.5 -86t-240 101t-101 240 t85 245.5t211 106.5q88 0 205 -63l5 4q-85 130 -85 224q0 145 101 241.5t247 96.5t247 -96.5t101 -241.5q0 -94 -85 -224l5 -4q117 63 205 63zM1479 499q77 77 77 185.5t-64.5 187.5t-149.5 79q-44 0 -118.5 -34.5t-91 -34.5t-25.5 7q-71 56 -71 78q0 11 7 21q92 141 92 210 q0 110 -76.5 183t-189.5 73t-189.5 -73t-76.5 -183q0 -61 49 -139.5t49 -96t-15 -29.5q-65 -52 -79 -52t-21 4q-122 66 -198.5 66t-141 -79t-64.5 -187.5t77 -185.5t191 -77t196 77q45 42 99 131.5t80 89.5h16q15 0 28 -12q13 12 28 12h16q26 0 80 -89.5t99 -131.5 q82 -77 196 -77t191 77zM1036 82q-104 77 -167 205q-63 -128 -167 -205h334z" />
+<glyph unicode="♨" horiz-adv-x="2100" d="M1456.5 760q93.5 -114 93.5 -207t-57 -239.5t-66 -210.5l-47 35q3 46 30 144.5t27 156.5q0 104 -94 224t-94 231q0 191 138 432l41 -22q-25 -56 -45 -153.5t-20 -160.5q0 -116 93.5 -230zM1047 832.5q93 -182.5 93 -278.5t-56.5 -245t-66.5 -206l-48 35v3q0 37 29.5 139 t29.5 159q0 107 -93 293.5t-93 287t41 229.5t94 211l41 -22q-64 -157 -64 -314q0 -109 93 -291.5zM736 544q0 -75 -57.5 -238.5t-66.5 -202.5l-49 36q5 42 32 142t27 159q0 103 -93.5 222.5t-93.5 220.5t42 230.5t94 212.5l41 -20q-63 -175 -63 -304.5t93.5 -242.5 t93.5 -215zM2050 228q0 -241 -289 -393q-222 -116 -507 -141q-103 -9 -288 -9q-302 0 -574 124q-342 156 -342 420q0 137 143 236q109 76 269 113l9 -59q-115 -23 -194 -80q-100 -71 -100 -173q0 -217 405 -305q238 -52 566 -52q227 0 462 78q313 103 313 279 q0 101 -100 173q-82 60 -194 80l8 59q163 -38 270 -112q143 -99 143 -238z" />
+<glyph unicode="♩" horiz-adv-x="818" d="M668 -56q0 -147 -128.5 -241.5t-280.5 -94.5q-89 0 -149 45t-60 131q0 136 125.5 236t254.5 100t183 -47v1483h55v-1612z" />
+<glyph unicode="♪" horiz-adv-x="1280" d="M1180 532q0 -211 -181 -516h-32q86 199 98 232q51 139 51 243q0 180 -135.5 341t-312.5 171v-1059q0 -146 -128.5 -241t-280.5 -95q-89 0 -149 45t-60 131q0 136 125.5 236t255 100t182.5 -47v1483h55q32 -211 116 -332q33 -47 147 -175t166 -218q83 -142 83 -299z" />
+<glyph unicode="♫" horiz-adv-x="1604" d="M1454 -56q0 -147 -128.5 -241.5t-280.5 -94.5q-89 0 -149 45t-60 131q0 136 125.5 236t254.5 100t183 -47v1037l-731 197v-1156q0 -147 -128.5 -241.5t-280.5 -94.5q-89 0 -149 45t-60 131q0 136 125.5 236t254.5 100t183 -47v1276l841 -227v-1385z" />
+<glyph unicode="♬" horiz-adv-x="1604" d="M1454 171q0 -147 -128.5 -241.5t-280.5 -94.5q-89 0 -149 45t-60 131q0 136 125.5 236t254.5 100t183 -47v647l-731 -180v-823q0 -147 -128.5 -241.5t-280.5 -94.5q-89 0 -149 45t-60 131q0 136 125.5 236t254.5 100t183 -47v1276l841 207v-1385zM1399 1152v185 l-731 -180v-184z" />
+<glyph unicode="♭" horiz-adv-x="913" d="M813 439q0 -357 -433 -695q-174 -136 -202 -136t-28 39v1909h55v-891q99 110 284 110q138 0 231 -98.5t93 -237.5zM632 439q0 101 -34 168q-44 88 -135 88q-113 0 -187 -52q-45 -31 -58 -61.5t-13 -87.5v-806q427 382 427 751z" />
+<glyph unicode="♮" horiz-adv-x="836" d="M686 -392h-55v550l-460 -132q-21 -6 -21 14v1516h55v-551l460 132q21 6 21 -14v-1515zM631 327v631l-426 -122v-631z" />
+<glyph unicode="♯" horiz-adv-x="836" d="M756 170q0 -20 -20 -26l-93 -27v-359h-55v344l-340 -98v-396h-55v381l-93 -27q-20 -6 -20 14v129q0 20 20 26l93 27v721l-93 -27q-20 -6 -20 14v129q0 20 20 26l93 27v358h55v-343l340 98v395h55v-380l93 27q20 6 20 -14v-129q0 -20 -20 -26l-93 -27v-721l93 27 q20 6 20 -14v-129zM588 271v721l-340 -98v-721z" />
+<glyph unicode="♰" horiz-adv-x="1470" d="M1433 623q0 -15 -14 -15l-127 60q-128 59 -171 59h-316v-695q0 -43 59 -170l60 -128q0 -14 -15 -14q-9 0 -77.5 85t-96.5 85t-96.5 -85t-77.5 -85q-15 0 -15 14l60 128q59 127 59 170v695h-316q-43 0 -171 -59l-127 -60q-14 0 -14 15q0 9 85 77.5t85 96.5t-85 96.5 t-85 77.5q0 15 14 15l127 -60q128 -59 171 -59h316v309q0 43 -59 170l-60 128q0 14 15 14q9 0 77.5 -85t96.5 -85t96.5 85t77.5 85q15 0 15 -14l-60 -128q-59 -127 -59 -170v-309h316q43 0 171 59l127 60q14 0 14 -15q0 -9 -85 -77.5t-85 -96.5t85 -96.5t85 -77.5z" />
+<glyph unicode="♱" horiz-adv-x="1581" d="M1531 798q0 -28 -35 -96t-35 -80.5t-14 -12.5q-3 0 -128 59.5t-170 59.5h-288v-696q0 -45 59.5 -170t59.5 -128q0 -14 -12.5 -14t-80.5 -35t-96 -35t-96 35t-80.5 35t-12.5 14q0 3 59.5 128t59.5 170v696h-289q-45 0 -170 -59.5t-128 -59.5q-14 0 -14 12.5t-35 80.5 t-35 96t35 96t35 80.5t14 12.5q3 0 128 -59.5t170 -59.5h289v308q0 45 -59.5 170t-59.5 128q0 14 12.5 14t80.5 35t96 35t96 -35t80.5 -35t12.5 -14q0 -3 -59.5 -128t-59.5 -170v-308h288q45 0 170 59.5t128 59.5q14 0 14 -12.5t35 -80.5t35 -96zM1417 692q49 98 49 105.5 t-49 105.5q-207 -100 -268 -100h-288q-26 0 -45.5 19.5t-19.5 45.5v308q0 61 100 268q-98 49 -105.5 49t-105.5 -49q101 -209 101 -268v-308q0 -26 -19.5 -45.5t-45.5 -19.5h-289q-61 0 -268 100q-49 -98 -49 -105.5t49 -105.5q209 101 268 101h289q26 0 45.5 -19.5 t19.5 -45.5v-696q0 -59 -101 -268q98 -49 105.5 -49t105.5 49q-100 207 -100 268v696q0 26 19.5 45.5t45.5 19.5h288q59 0 268 -101z" />
+<glyph unicode="♲" d="M1707.5 1282q18.5 -15 18.5 -35t-13 -41l-227 -361l-407 34q-62 5 -62 34q0 21 31 43l48 29l-99 204l-258 -423l-435 263l245 403q62 102 176 102h11l596 -25q119 -5 162 -92l82 -166q83 46 98 46t33.5 -15zM1991 592q37 -59 37 -107.5t-46 -137.5l-269 -520 q-47 -91 -143 -91h-186v-85q0 -45 -45 -45q-22 0 -47 37l-235 354l208 355q23 39 56.5 39t33.5 -28v-71h221l-264 422l432 271zM1005 -236h-468q-130 0 -206 130l-286 490q-25 43 -25 97t20 87l97 158l-73 45q-19 13 -19 42q0 43 61 44l421 6l196 -360q15 -28 15 -44.5 t-15.5 -28.5t-29.5 -12q-9 4 -74 40l-115 -182h501v-512zM1466 878q226 356 226 369.5t-17 13.5t-114 -50l-98 195q-34 67 -124 71l-496 22q54 -28 84 -91l211 -436q-39 -20 -83 -52q26 -13 32 -13zM1991 471q0 52 -38 114l-219 355l-377 -235l256 -413h177q74 0 137.5 53 t63.5 126zM718 1495q-93 0 -156 -103l-214 -352l380 -227l253 411l-79 158q-56 113 -184 113zM1318 258l2 61q0 38 -8 39q-6 -5 -16 -17l-197 -342l216 -326q23 -32 25 -32q12 0 12 16v117h224q68 0 109 78l238 450q-68 -43 -128 -43zM93 825q-11 0 -11 -13t11 -19l89 -52 l-114 -196q-15 -26 -15 -62.5t24 -77.5l253 -437q0 100 26 141l248 394q36 -17 89 -46l6 6l-189 366zM969 -209v446h-491l-92 -147q-23 -37 -23 -109q0 -190 191 -190h415z" />
+<glyph unicode="♳" d="M1520 569l-445 257l221 13l-273 473l-264 -459l-101 58l365 633l374 -648l123 187v-514zM2032 -201l-815 -1l100 -198l-445 257l445 257l-100 -199h613l-299 517l101 58zM748 -86v-116l-732 1l407 705l-221 13l445 257v-514l-123 187l-306 -533h530zM1172 123h-326v83 h103v303h-113v77q59 1 90.5 16.5t36.5 58.5h108v-455h101v-83z" />
+<glyph unicode="♴" d="M1520 569l-445 257l221 13l-273 473l-264 -459l-101 58l365 633l374 -648l123 187v-514zM2032 -201l-815 -1l100 -198l-445 257l445 257l-100 -199h613l-299 517l101 58zM748 -86v-116l-732 1l407 705l-221 13l445 257v-514l-123 187l-306 -533h530zM1208 123h-409v81 q255 189 255 287q0 85 -98 85q-68 0 -140 -49h-3v111q77 32 169 32q201 0 201 -159q0 -128 -229 -296h254v-92z" />
+<glyph unicode="♵" d="M1520 569l-445 257l221 13l-273 473l-264 -459l-101 58l365 633l374 -648l123 187v-514zM2032 -201l-815 -1l100 -198l-445 257l445 257l-100 -199h613l-299 517l101 58zM748 -86v-116l-732 1l407 705l-221 13l445 257v-514l-123 187l-306 -533h530zM1211 283 q0 -171 -225 -171q-110 0 -186 32v110h6q77 -47 155 -47q122 0 122 85q0 53 -58 65q-17 4 -100 4v86q76 0 95 5q54 13 54 64q0 61 -101 61q-74 0 -152 -47h-6v109q82 32 178 32q204 0 204 -131q0 -101 -101 -123v-15q115 -16 115 -119z" />
+<glyph unicode="♶" d="M1520 569l-445 257l221 13l-273 473l-264 -459l-101 58l365 633l374 -648l123 187v-514zM2032 -201l-815 -1l100 -198l-445 257l445 257l-100 -199h613l-299 517l101 58zM748 -86v-116l-732 1l407 705l-221 13l445 257v-514l-123 187l-306 -533h530zM1214 250h-73v-129 h-120v129h-260v95l248 315h132v-323h73v-87zM1021 337v223l-175 -223h175z" />
+<glyph unicode="♷" d="M1520 569l-445 257l221 13l-273 473l-264 -459l-101 58l365 633l374 -648l123 187v-514zM2032 -201l-815 -1l100 -198l-445 257l445 257l-100 -199h613l-299 517l101 58zM748 -86v-116l-732 1l407 705l-221 13l445 257v-514l-123 187l-306 -533h530zM1202 303 q0 -95 -65 -143t-166 -48t-174 31v111h7q77 -46 148 -46q122 0 122 91q0 81 -133 81q-21 0 -69 -9t-55 -8v298h370v-93h-252v-103q46 3 65 3q202 0 202 -165z" />
+<glyph unicode="♸" d="M1520 569l-445 257l221 13l-273 473l-264 -459l-101 58l365 633l374 -648l123 187v-514zM2032 -201l-815 -1l100 -198l-445 257l445 257l-100 -199h613l-299 517l101 58zM748 -86v-116l-732 1l407 705l-221 13l445 257v-514l-123 187l-306 -533h530zM1203 303 q0 -90 -59 -141t-150 -51q-218 0 -218 250q0 308 289 308q42 0 93 -8v-96h-6q-37 17 -88 17q-143 0 -162 -150q72 44 133 44q168 0 168 -173zM1076 296q0 96 -102 96q-34 0 -71 -14v-19q-1 -13 -1 -19q0 -148 92 -148q82 0 82 104z" />
+<glyph unicode="♹" d="M1520 569l-445 257l221 13l-273 473l-264 -459l-101 58l365 633l374 -648l123 187v-514zM2032 -201l-815 -1l100 -198l-445 257l445 257l-100 -199h613l-299 517l101 58zM748 -86v-116l-732 1l407 705l-221 13l445 257v-514l-123 187l-306 -533h530zM782 568v92h409v-101 l-241 -436h-140l253 445h-281z" />
+<glyph unicode="♺" d="M1520 569l-445 257l221 13l-273 473l-264 -459l-101 58l365 633l374 -648l123 187v-514zM2032 -201l-815 -1l100 -198l-445 257l445 257l-100 -199h613l-299 517l101 58zM748 -86v-116l-732 1l407 705l-221 13l445 257v-514l-123 187l-306 -533h530z" />
+<glyph unicode="♻" d="M1675 1261q17 0 17 -13.5t-226 -369.5l-379 29q-6 0 -32 13q2 5 83 52l-211 436q-30 63 -84 91l496 -22q90 -4 124 -71l98 -195q97 50 114 50zM1991 471q0 -73 -63.5 -126t-137.5 -53h-177l-256 413l377 235l219 -355q38 -62 38 -114zM718 1495q128 0 184 -113l79 -158 l-253 -411l-380 227l214 352q63 103 156 103zM1320 319l-2 -61l477 1q60 0 128 43l-238 -450q-41 -78 -109 -78h-224v-117q0 -16 -12 -16q-6 0 -241 358l197 342q3 4 16 17q8 -1 8 -39zM77 405q-24 41 -24 77.5t15 62.5l114 196l-89 52q-11 6 -11 19t11 13l417 4l189 -366 l-6 -6q-53 29 -89 46l-248 -394q-26 -41 -26 -141zM969 -209h-415q-191 0 -191 190q0 72 23 109l92 147h491v-446z" />
+<glyph unicode="♼" d="M2048 582q0 -426 -299 -725t-725.5 -299t-725 298.5t-298.5 725.5t298.5 725.5t725 298.5t725.5 -299t299 -725zM1424 847q203 319 203 332t-15.5 13t-102.5 -45l-88 175q-30 60 -112 64l-446 20q49 -26 76 -82l189 -392q-35 -18 -74 -47q11 -6 28 -12zM1839 367.5 q57 47.5 57 104t-34 111.5l-197 320l-340 -212l231 -371h159q67 0 124 47.5zM750 1402q-84 0 -140 -92l-193 -317l342 -204l228 370l-71 142q-50 101 -166 101zM1290 289l2 55q0 34 -7 35q-5 -5 -14 -15l-178 -308l195 -293q10 -15 22 -29q11 0 11 14v106h202q61 0 98 70 l214 405q-61 -39 -115 -39zM188 799q-10 0 -10 -11t10 -17l80 -47l-103 -177q-13 -22 -13 -54.5t22 -70.5l227 -394q0 89 24 127l223 355l80 -42l5 6q-4 9 -170 329zM976 -131v401h-442l-82 -132q-21 -34 -21 -98q0 -171 172 -171h373z" />
+<glyph unicode="♽" d="M2048 582q0 -426 -299 -725t-725.5 -299t-725 298.5t-298.5 725.5t298.5 725.5t725 298.5t725.5 -299t299 -725zM1998 582q0 406 -284 690t-690 284t-690 -284t-284 -690t284 -690t690 -284t690 284t284 690zM1509 1147q87 45 102.5 45t15.5 -13t-203 -332l-342 26 q-4 0 -28 12q2 5 74 47l-189 392q-27 56 -76 82l446 -20q82 -4 112 -64zM1862 583q34 -55 34 -111.5t-57 -104t-124 -47.5h-159l-231 371l340 212zM750 1402q116 0 166 -101l71 -142l-228 -370l-342 204l193 317q56 92 140 92zM1292 344l-2 -55l430 1q53 0 115 39l-214 -405 q-37 -70 -98 -70h-202v-106q0 -14 -11 -14q-14 14 -217 322l178 308q2 4 14 15q7 -1 7 -35zM174 422q-22 38 -22 70.5t13 54.5l103 177l-80 47q-10 6 -10 17t10 11l375 4l170 -329l-5 -6l-80 42l-223 -355q-24 -38 -24 -127zM976 -131h-373q-172 0 -172 171q0 64 21 98 l82 132h442v-401z" />
+<glyph unicode="♾" d="M2048 582q0 -426 -299 -725t-725 -299t-725 299t-299 725t299 725t725 299t725 -299t299 -725zM1948 582q0 385 -269.5 654.5t-654.5 269.5t-654.5 -269.5t-269.5 -654.5t269.5 -654.5t654.5 -269.5t654.5 269.5t269.5 654.5zM1481 989q154 0 248 -124.5t94 -283.5 t-96 -283.5t-252 -124.5q-237 0 -412 231l-54 72q-186 -303 -442 -303q-153 0 -247.5 125.5t-94.5 284t96.5 282.5t251.5 124q117 0 226.5 -64.5t185.5 -165.5l54 -72q190 302 442 302zM1484 307q102 0 167 84.5t65 194.5t-64.5 205.5t-175 95.5t-214.5 -78t-172 -189 q106 -137 171 -199q121 -114 223 -114zM564 856q-103 0 -167.5 -84.5t-64.5 -194t65 -205.5t175 -96t214 78t172 188q-240 314 -394 314z" />
+<glyph unicode="♿" d="M540 1322q0 75 53.5 128.5t128.5 53.5t128.5 -53.5t53.5 -127t-50 -126.5t-122 -57l33 -287h351l20 -172h-351l15 -126h557l186 -502l160 57l58 -162l-320 -115l-204 550h-591l-106 921v18zM855 -355q-238 0 -406.5 168.5t-168.5 406.5q0 154 75.5 284.5t202.5 207.5 l23 -202q-125 -118 -125 -286.5t117 -285.5t279 -117t276.5 108.5t124.5 265.5l99 -265q-76 -130 -208.5 -207.5t-288.5 -77.5z" />
+<glyph unicode="⚀" d="M72 -291v1497l529 249h1375v-1432l-416 -314h-1488zM1838 1395h-1223l-379 -178h1306zM1916 52v1320l-336 -202v-1371zM1520 -231v1388h-1388v-1388h1388zM933.5 571.5q45.5 -45.5 45.5 -108t-45 -107.5t-108 -45t-108 45t-45 107t45.5 108t107.5 46t107.5 -45.5z" />
+<glyph unicode="⚁" d="M72 -291v1497l529 249h1375v-1432l-416 -314h-1488zM1838 1395h-1223l-379 -178h1306zM1916 52v1320l-336 -202v-1371zM1520 -231v1388h-1388v-1388h1388zM523.5 981.5q45.5 -45.5 45.5 -108t-45 -107.5t-108 -45t-108 45t-45 107t45.5 108t107.5 46t107.5 -45.5z M1343.5 161.5q45.5 -45.5 45.5 -108t-45 -107.5t-108 -45t-108 45t-45 107t45.5 108t107.5 46t107.5 -45.5z" />
+<glyph unicode="⚂" d="M72 -291v1497l529 249h1375v-1432l-416 -314h-1488zM1838 1395h-1223l-379 -178h1306zM1916 52v1320l-336 -202v-1371zM1520 -231v1388h-1388v-1388h1388zM933.5 571.5q45.5 -45.5 45.5 -108t-45 -107.5t-108 -45t-108 45t-45 107t45.5 108t107.5 46t107.5 -45.5z M523.5 981.5q45.5 -45.5 45.5 -108t-45 -107.5t-108 -45t-108 45t-45 107t45.5 108t107.5 46t107.5 -45.5zM1343.5 161.5q45.5 -45.5 45.5 -108t-45 -107.5t-108 -45t-108 45t-45 107t45.5 108t107.5 46t107.5 -45.5z" />
+<glyph unicode="⚃" d="M72 -291v1497l529 249h1375v-1432l-416 -314h-1488zM1838 1395h-1223l-379 -178h1306zM1916 52v1320l-336 -202v-1371zM1520 -231v1388h-1388v-1388h1388zM523.5 981.5q45.5 -45.5 45.5 -108t-45 -107.5t-108 -45t-108 45t-45 107t45.5 108t107.5 46t107.5 -45.5z M1343.5 161.5q45.5 -45.5 45.5 -108t-45 -107.5t-108 -45t-108 45t-45 107t45.5 108t107.5 46t107.5 -45.5zM1343.5 981.5q45.5 -45.5 45.5 -108t-45 -107.5t-108 -45t-108 45t-45 107t45.5 108t107.5 46t107.5 -45.5zM523.5 161.5q45.5 -45.5 45.5 -108t-45 -107.5 t-108 -45t-108 45t-45 107t45.5 108t107.5 46t107.5 -45.5z" />
+<glyph unicode="⚄" d="M523.5 981.5q45.5 -45.5 45.5 -108t-45 -107.5t-108 -45t-108 45t-45 107t45.5 108t107.5 46t107.5 -45.5zM1343.5 161.5q45.5 -45.5 45.5 -108t-45 -107.5t-108 -45t-108 45t-45 107t45.5 108t107.5 46t107.5 -45.5zM72 -291v1497l529 249h1375v-1432l-416 -314h-1488z M1838 1395h-1223l-379 -178h1306zM1916 52v1320l-336 -202v-1371zM1520 -231v1388h-1388v-1388h1388zM933.5 571.5q45.5 -45.5 45.5 -108t-45 -107.5t-108 -45t-108 45t-45 107t45.5 108t107.5 46t107.5 -45.5zM1343.5 981.5q45.5 -45.5 45.5 -108t-45 -107.5t-108 -45 t-108 45t-45 107t45.5 108t107.5 46t107.5 -45.5zM523.5 161.5q45.5 -45.5 45.5 -108t-45 -107.5t-108 -45t-108 45t-45 107t45.5 108t107.5 46t107.5 -45.5z" />
+<glyph unicode="⚅" d="M1343.5 981.5q45.5 -45.5 45.5 -108t-45 -107.5t-108 -45t-108 45t-45 107t45.5 108t107.5 46t107.5 -45.5zM523.5 161.5q45.5 -45.5 45.5 -108t-45 -107.5t-108 -45t-108 45t-45 107t45.5 108t107.5 46t107.5 -45.5zM72 -291v1497l529 249h1375v-1432l-416 -314h-1488z M1838 1395h-1223l-379 -178h1306zM1916 52v1320l-336 -202v-1371zM1520 -231v1388h-1388v-1388h1388zM523.5 981.5q45.5 -45.5 45.5 -108t-45 -107.5t-108 -45t-108 45t-45 107t45.5 108t107.5 46t107.5 -45.5zM1343.5 161.5q45.5 -45.5 45.5 -108t-45 -107.5t-108 -45 t-108 45t-45 107t45.5 108t107.5 46t107.5 -45.5zM1343.5 571.5q45.5 -45.5 45.5 -108t-45 -107.5t-108 -45t-108 45t-45 107t45.5 108t107.5 46t107.5 -45.5zM523.5 571.5q45.5 -45.5 45.5 -108t-45 -107.5t-108 -45t-108 45t-45 107t45.5 108t107.5 46t107.5 -45.5z" />
+<glyph unicode="⚆" d="M1998 582q0 -406 -284 -690t-690 -284t-690 284t-284 690t284 690t690 284t690 -284t284 -690zM1898 582q0 364 -255 619t-619 255t-619 -255t-255 -619t255 -619t619 -255t619 255t255 619zM1689 582q0 -68 -48.5 -116.5t-116.5 -48.5t-116.5 48.5t-48.5 116.5 t48.5 116.5t116.5 48.5t116.5 -48.5t48.5 -116.5z" />
+<glyph unicode="⚇" d="M1998 582q0 -406 -284 -690t-690 -284t-690 284t-284 690t284 690t690 284t690 -284t284 -690zM1898 582q0 364 -255 619t-619 255t-619 -255t-255 -619t255 -619t619 -255t619 255t255 619zM1689 582q0 -68 -48.5 -116.5t-116.5 -48.5t-116.5 48.5t-48.5 116.5 t48.5 116.5t116.5 48.5t116.5 -48.5t48.5 -116.5zM689 582q0 -68 -48.5 -116.5t-116.5 -48.5t-116.5 48.5t-48.5 116.5t48.5 116.5t116.5 48.5t116.5 -48.5t48.5 -116.5z" />
+<glyph unicode="⚈" d="M1998 582q0 -406 -284 -690t-690 -284t-690 284t-284 690t284 690t690 284t690 -284t284 -690zM1689 582q0 68 -48.5 116.5t-116.5 48.5t-116.5 -48.5t-48.5 -116.5t48.5 -116.5t116.5 -48.5t116.5 48.5t48.5 116.5z" />
+<glyph unicode="⚉" d="M1998 582q0 -406 -284 -690t-690 -284t-690 284t-284 690t284 690t690 284t690 -284t284 -690zM1689 582q0 68 -48.5 116.5t-116.5 48.5t-116.5 -48.5t-48.5 -116.5t48.5 -116.5t116.5 -48.5t116.5 48.5t48.5 116.5zM689 582q0 68 -48.5 116.5t-116.5 48.5t-116.5 -48.5 t-48.5 -116.5t48.5 -116.5t116.5 -48.5t116.5 48.5t48.5 116.5z" />
+<glyph unicode="⚊" d="M1724 636h-1400v192h1400v-192z" />
+<glyph unicode="⚋" d="M1724 636h-516v192h516v-192zM840 636h-516v192h516v-192z" />
+<glyph unicode="⚌" d="M1724 424h-1400v192h1400v-192zM1724 848h-1400v192h1400v-192z" />
+<glyph unicode="⚍" d="M1724 848h-516v192h516v-192zM840 848h-516v192h516v-192zM1724 424h-1400v192h1400v-192z" />
+<glyph unicode="⚎" d="M1724 424h-516v192h516v-192zM840 424h-516v192h516v-192zM1724 848h-1400v192h1400v-192z" />
+<glyph unicode="⚏" d="M1724 424h-516v192h516v-192zM840 424h-516v192h516v-192zM1724 848h-516v192h516v-192zM840 848h-516v192h516v-192z" />
+<glyph unicode="⚐" d="M1760 323q-164 0 -473.5 97.5t-473.5 97.5q-255 0 -487 -208v-720h-116v1984h116v-197q242 197 484 197q162 0 468 -101t468 -101q36 0 92 5v-1051q-45 -3 -78 -3zM1722 1256q-154 5 -452 103.5t-447 98.5t-275 -70q-78 -43 -222 -161v-767q225 174 487 174 q164 0 462 -93.5t447 -100.5v816z" />
+<glyph unicode="⚑" d="M1760 323q-164 0 -473.5 97.5t-473.5 97.5q-255 0 -487 -208v-720h-116v1984h116v-197q242 197 484 197q162 0 468 -101t468 -101q36 0 92 5v-1051q-45 -3 -78 -3z" />
+<glyph unicode="⚒" horiz-adv-x="2326" d="M2246 671q0 -164 -92 -381q-20 122 -79.5 261t-136.5 199l-83 -10l-435 -447l418 -407q31 -30 31 -78.5t-51 -97t-99 -48.5t-76 29l-404 416l-403 -414q-30 -31 -78.5 -31t-96.5 51t-48 99t29 76l416 404l-434 446l-232 -232q-27 -27 -45 -27t-42 24l-197 197 q-28 28 -28 45.5t27 44.5l219 219q-34 38 -34 83t49 92t95 47t84 -28l219 218q28 28 45 28t45 -28l197 -197q24 -24 24 -42t-27 -45l-233 -232l449 -436l450 438l9 82l-139 140l-66 -26l-101 101l332 331l100 -100l-25 -67q210 -177 304 -303q143 -192 143 -394zM681 -153 q-12 -12 -12 -36t31.5 -58.5t56.5 -34.5t39 14l1019 1047l-87 87zM1778.5 -250.5q34.5 31.5 34.5 56.5t-14 39l-419 407l-102 -105l405 -417q12 -12 36.5 -12t59 31.5zM1198 430l-446 434l-87 -87l433 -445z" />
+<glyph unicode="⚓" horiz-adv-x="1860" d="M980 -392h-100v148q-276 11 -574 396l-71 -131l-155 468l441 -243l-160 -44q86 -100 239 -177.5t280 -81.5v1119h-359v100h221q-54 67 -54 159.5t71 163.5t171 71t171 -71t71 -163.5t-54 -159.5h221v-100h-359v-1119q127 4 280 81.5t239 177.5l-160 44l441 243l-155 -468 l-71 131q-298 -385 -574 -396v-148zM1082 1314q0 63 -44.5 107.5t-107.5 44.5t-107.5 -44.5t-44.5 -107.5t44.5 -107.5t107.5 -44.5t107.5 44.5t44.5 107.5z" />
+<glyph unicode="⚔" d="M2022 263q0 -67 -53.5 -151.5t-122.5 -154.5q-93 -95 -154 -95q-42 0 -99 44q-9 7 -66 58l-133 120q-102 -85 -102 -139t39 -111q-153 40 -153 143t131 211l-285 280l-285 -280q131 -108 131 -212q0 -101 -153 -142q39 57 39 111t-103 139l-113 -102q-75 -68 -85 -76 q-57 -44 -99 -44q-61 0 -154 95q-69 70 -122.5 154.5t-53.5 151.5q0 123 84 194.5t209 71.5q231 0 398 -188l218 215l-728 716q124 -3 251 -96q35 -25 114 -98l451 -434l453 434q36 34 113 98q127 93 252 96l-728 -716l217 -215q167 188 399 188q125 0 209 -71.5t84 -194.5z M1833 96q77 75 77 156t-60 123t-143 42q-157 0 -313 -136q257 -281 296 -281q18 0 68.5 36.5t74.5 59.5zM341 417q-83 0 -143.5 -42t-60.5 -123t88.5 -166.5t130 -85.5t298.5 281q-156 136 -313 136z" />
+<glyph unicode="⚕" horiz-adv-x="1280" d="M1200 972q0 -57 -67 -57t-147 90l-110 -184q154 -166 154 -263q0 -171 -250 -171q-67 0 -159 13l-123 -204q103 -121 103 -200q0 -112 -178 -112q-53 0 -110 7l-126 -208l-57 33l103 188q-153 30 -153 68q0 9 4 16q10 3 27 3l160 -18l105 193q-90 104 -106 127 q-65 88 -65 144q0 105 175 105q58 0 193 -17l142 261q-176 201 -176 306q0 86 68 132.5t161.5 46.5t188.5 -42l99 180q25 45 73 45q69 0 69 -75q0 -25 -12 -45l-111 -183q125 -107 125 -179zM1151 1009q0 26 -26 26q-19 0 -19 -17q0 -22 30 -22q15 0 15 13zM805 1099 q-84 0 -84 -58q0 -45 66 -123l94 171q-34 10 -76 10zM857 572q0 41 -61 118l-107 -178q25 -2 55 -2q113 0 113 62zM404 428q-54 0 -54 -32.5t83 -125.5l80 146q-78 12 -109 12zM462 25q0 27 -27 67l-75 -124q102 2 102 57z" />
+<glyph unicode="⚖" horiz-adv-x="2266" d="M1986 902l-14 67q0 62 78 62q92 0 92 -101q0 -146 -241 -146q-23 0 -44 2q14 47 14 88q15 -2 31 -2q84 0 84 30zM1651 926q-10 -27 -10 -52t6 -55q-165 77 -244 77l-63 -9l-34 147q34 15 86.5 15t121.5 -41zM1259 1038l-46 -199h-160l-46 199l79 72l19 466h56l19 -466z M1756 -412q-331 0 -500 383l12 13q28 -22 60 -39l382 838q-17 48 -17 90q0 72 63 72t63 -72q0 -42 -17 -90l382 -838q32 17 60 39l12 -13q-169 -383 -500 -383zM619 819q6 30 6 55t-10 52l137 82q69 41 121.5 41t86.5 -15l-34 -147l-63 9q-79 0 -244 -77zM294 969l-14 -67 q0 -30 84 -30q16 0 31 2q0 -41 14 -88q-21 -2 -44 -2q-241 0 -241 146q0 101 92 101q78 0 78 -62zM510 -412q-331 0 -500 383l12 13q28 -22 60 -39l382 838q-17 48 -17 90q0 72 63 72t63 -72q0 -42 -17 -90l382 -838q32 17 60 39l12 -13q-169 -383 -500 -383zM2111 -87 l-311 669v-723q179 5 311 54zM1203 974q0 29 -20.5 49t-49.5 20t-49.5 -20t-20.5 -49q0 -69 70 -69t70 69zM1712 -141v723l-311 -669q132 -49 311 -54zM865 -87l-311 669v-723q179 5 311 54zM466 -141v723l-311 -669q132 -49 311 -54z" />
+<glyph unicode="⚗" horiz-adv-x="1896" d="M1645 955q0 -182 -123 -292.5t-314.5 -110.5t-305.5 125t-114 326q0 70 16 139q-163 -68 -321.5 -243.5t-261.5 -363.5q-7 24 -59 63q-48 37 -71 37h-2q187 339 402 553q294 293 590 293q237 0 400.5 -146t163.5 -380zM1285 314v-514h-112v514h-288l-127 -514h-116 l145 583l54 43h776l54 -43l145 -583h-116l-127 514h-288zM205 519q0 -9 -16.5 -9t-62 36.5t-45.5 58.5q0 10 15 10t62 -38t47 -58z" />
+<glyph unicode="⚘" horiz-adv-x="1169" d="M1089 839q0 -107 -73 -231l-137 -219q-73 -137 -73 -273q0 -176 41 -402l-28 -6l-154 324q-83 173 -170 235q-79 42 -226 145q-161 147 -189 342q5 3 13 3q57 0 189 -99q12 30 32 30q57 0 158 -104.5t131 -114.5q4 8 4 34t-24 87q-43 109 -120 162q-136 93 -186 151 q-83 95 -83 232t78.5 240t222 103t229.5 -116.5t86 -262.5q0 -103 -42 -185q-23 -44 -72 -102t-49 -83q0 -60 70 -134q101 77 160 178l59 113q42 63 103 63q21 0 39 -9q11 -50 11 -101zM684 925q50 66 50 162t-64 196q-72 114 -174.5 114t-159.5 -82.5t-57 -194.5t75 -150 q25 26 42.5 26t67.5 -42q23 33 59 33q46 0 49 -44q22 15 34 15t32.5 -16t45.5 -17z" />
+<glyph unicode="⚙" horiz-adv-x="1904" d="M952 -104q-47 0 -92 6l-167 -168q-77 24 -157 66v236q-74 56 -130 130h-236q-42 80 -66 157l168 167q-6 45 -6 92t6 92l-168 167q24 77 66 157h236q56 74 130 130v236q80 42 157 66l167 -168q45 6 92 6t92 -6l167 168q77 -24 157 -66v-236q74 -56 130 -130h236 q42 -80 66 -157l-168 -167q6 -45 6 -92t-6 -92l168 -167q-24 -77 -66 -157h-236q-56 -74 -130 -130v-236q-80 -42 -157 -66l-167 168q-45 -6 -92 -6zM1518 582q0 234 -166 400t-400 166t-400 -166t-166 -400t166 -400t400 -166t400 166t166 400zM1478 582q0 -218 -154 -372 t-372 -154t-372 154t-154 372t154 372t372 154t372 -154t154 -372zM1151 582q0 82 -58.5 140.5t-140.5 58.5t-140.5 -58.5t-58.5 -140.5t58.5 -140.5t140.5 -58.5t140.5 58.5t58.5 140.5z" />
+<glyph unicode="⚚" horiz-adv-x="2242" d="M1235 1342q0 -48 -33 -81t-81 -33t-81 33t-33 81t33 81t81 33t81 -33t33 -81zM1526 888q-91 0 -170 16q44 -68 44 -161.5t-64.5 -170t-163.5 -94.5v-831q0 -49 -51 -49t-51 49v831q-99 18 -163.5 94.5t-64.5 170t44 161.5q-79 -16 -170 -16q-208 0 -387 80 q-206 91 -289 258q66 -12 131 -12q125 0 285 49l121 41q74 23 124 23q115 0 156 -69q18 -32 34.5 -139t60.5 -144q52 39 118 51v181q24 -9 51 -9t51 9v-181q66 -12 118 -51q44 37 60.5 144t34.5 139q41 69 156 69q50 0 117 -22l128 -42q160 -49 285 -49q65 0 131 12 q-83 -167 -289 -258q-179 -80 -387 -80zM1111 1268q54 0 54 79t-54 79q-31 0 -52.5 -26t-21.5 -58q0 -74 74 -74zM1310 752q0 65 -38.5 115t-99.5 67v-364q61 17 99.5 67t38.5 115zM932 752q0 -65 38.5 -115t99.5 -67v364q-61 -17 -99.5 -67t-38.5 -115z" />
+<glyph unicode="⚛" horiz-adv-x="1862" d="M1762 214q0 -209 -311 -209q-90 0 -197 22q-123 -376 -324 -376q-197 0 -320 376q-107 -24 -202 -24q-307 0 -307 211q0 155 185 368q-186 208 -186 363q0 213 302 213q93 0 204 -25q130 380 324 380q201 0 324 -380q113 25 221.5 25t186.5 -42q100 -54 100 -167 q0 -158 -187 -367q187 -210 187 -368zM1685 916q0 191 -284 191q-63 0 -135 -11q37 -123 55 -287q135 -105 220 -190q144 164 144 297zM930 1427q-164 0 -279 -301q133 -29 276 -97q155 70 283 97q-113 301 -280 301zM1277 835q-9 69 -52 253q-98 -23 -250 -78 q149 -76 189.5 -98.5t112.5 -76.5zM1333 597v-37q0 -93 -8 -153q67 55 190 175q-64 68 -186 171q4 -56 4 -156zM1690 250q0 123 -145 295q-89 -90 -224 -194q-18 -159 -55 -283q75 -12 137 -12q287 0 287 194zM882 1006q-127 56 -246 79q-26 -86 -52 -254q97 82 220 138z M1284 377q11 92 11 202t-11 208q-56 39 -171 112q-81 47 -183 89q-167 -63 -350 -201q-14 -119 -14 -204.5t14 -209.5q185 -128 350 -201q144 54 354 205zM1280 325q-112 -72 -171.5 -107t-129.5 -64q159 -63 246 -78q33 113 55 249zM457 1105q-115 0 -188 -39 q-95 -50 -95 -155q0 -130 146 -299q98 105 223 193q15 148 56 287q-76 13 -142 13zM536 407q-8 111 -8 186.5t11 163.5q-112 -86 -193 -179q79 -85 190 -171zM886 154q-204 99 -302 175q25 -169 56 -253q111 19 246 78zM930 -267q169 0 280 305q-133 28 -276 93 q-162 -69 -283 -93q118 -305 279 -305zM175 246q0 -190 286 -190q62 0 138 12q-40 129 -56 283q-106 78 -227 194q-141 -170 -141 -299zM1084 580q0 -61 -46 -103.5t-107 -42.5t-107 42.5t-46 103.5t46 103.5t107 42.5t107 -42.5t46 -103.5zM1047 640q0 25 -37.5 46 t-66.5 24q40 -39 48 -81q2 -1 9 -1q47 0 47 12zM1067 569q1 9 1 21.5t-8 33.5q-34 -12 -64 -12q9 -22 9 -56q30 0 62 13z" />
+<glyph unicode="⚜" horiz-adv-x="1664" d="M1507 793q97 -89 97 -210.5t-86 -204t-202 -82.5q-94 0 -188 103q75 36 75 77q0 27 -43 27q-81 0 -117 -105q38 0 64 -26t26 -64t-26 -64t-64 -26h-18q7 -90 40 -90q17 0 17 23.5t-5 43.5q22 29 56 29q62 0 103.5 -47.5t41.5 -114.5t-46 -111t-127.5 -44t-145.5 66 q-6 -54 -61.5 -139t-65.5 -130q-10 45 -65.5 130t-61.5 139q-64 -66 -145.5 -66t-127.5 44t-46 111t41.5 114.5t103.5 47.5q34 0 56 -29q-5 -20 -5 -43.5t17 -23.5q33 0 40 90h-18q-38 0 -64 26t-26 64t26 64t64 26q-36 105 -117 105q-43 0 -43 -27q0 -41 75 -77 q-94 -103 -188 -103q-116 0 -202 82.5t-86 204t97 210.5t235 89t247 -110q-22 90 -22 163q0 98 100 237t115 211q15 -72 115 -211t100 -237q0 -73 -22 -163q109 110 247 110t235 -89zM1475.5 421q68.5 65 68.5 161.5t-79.5 168t-183.5 71.5q-165 0 -270 -163 q-89 -139 -100 -321h-59q7 96 71 292t64 305q0 69 -57 157l-98 141l-98 -141q-57 -88 -57 -157q0 -109 64 -305t71 -292h-59q-11 182 -100 321q-105 163 -270 163q-104 0 -183.5 -71.5t-79.5 -168t68.5 -161.5t159.5 -65q49 0 97 39q-44 47 -44 82.5t32 60.5t71 25 q81 0 129.5 -66.5t62.5 -158.5h-75q-30 0 -30 -30t30 -30h80v-3q0 -207 -102 -207q-36 0 -57 30q-20 26 -20 59v6q-76 -10 -76 -97q0 -99 101.5 -99t157.5 109q44 85 49 202h60q-2 -46 -26 -140.5t-24 -142t68 -152.5q68 105 68 152.5t-24 142t-26 140.5h60q5 -117 49 -202 q56 -109 157.5 -109t101.5 99q0 87 -76 97v-6q0 -33 -20 -59q-21 -30 -57 -30q-102 0 -102 207v3h80q30 0 30 30t-30 30h-75q14 92 62.5 158.5t129.5 66.5q39 0 71 -25t32 -60.5t-44 -82.5q48 -39 97 -39q91 0 159.5 65z" />
+<glyph unicode="⚝" d="M1953 794q0 -116 -292 -363l-46 54q267 231 267 299q0 59 -341 92q-235 22 -388 22t-254 -7l-5 69q83 6 289 6t402 -22q368 -42 368 -150zM1017 1419q-63 0 -217 -375q-123 -299 -181 -531l-67 17q60 242 182 541q170 418 283 418q116 0 275 -393l-65 -27 q-40 95 -108.5 222.5t-101.5 127.5zM1420 773q80 -196 154.5 -472.5t74.5 -433.5t-95 -157q-126 0 -400 170l37 60q272 -164 359 -164q31 0 31 67q0 155 -74.5 434.5t-150.5 469.5zM95 784q0 126 462 161l6 -70q-107 -9 -221 -30q-178 -33 -178 -68q0 -70 268.5 -297.5 t470.5 -354.5l-36 -59q-205 128 -446 329q-326 273 -326 389zM499 -303q-95 0 -95 158q0 129 51 336l68 -16q-50 -213 -50 -355q0 -56 31 -56q88 0 373.5 176.5t464.5 326.5l44 -53q-177 -149 -430 -310q-327 -207 -457 -207z" />
+<glyph unicode="⚞" d="M1774 904l-54 -127l-1423 603l54 127zM1720 513h-1545v138h1545v-138zM1774 260l-1423 -603l-54 127l1423 603z" />
+<glyph unicode="⚟" d="M1751 1380l-1423 -603l-54 127l1423 603zM1873 513h-1545v138h1545v-138zM1751 -216l-54 -127l-1423 603l54 127z" />
+<glyph unicode="⚠" d="M1101 155q32 -32 32 -76.5t-32 -76.5t-77 -32t-77 32t-32 76.5t32 76.5t77 32t77 -32zM2032 -201h-2016l1007 1745zM1862 -103l-839 1451l-837 -1451h1676zM1024 253q-34 0 -39 47l-69 632q-1 6 -1 12q0 39 31 64q34 28 78 28t78 -28q31 -25 31 -64q0 -6 -1 -12l-69 -634 q-5 -45 -39 -45z" />
+<glyph unicode="⚡" horiz-adv-x="963" d="M883 943l-289 -1001l139 23l-293 -365l-84 455l113 -86l80 665l-469 -235l307 1147h346l-352 -809z" />
+<glyph unicode="⚢" horiz-adv-x="1606" d="M1397 896q129 -129 129 -307t-113 -303.5t-281 -143.5v-171h196v-98h-196v-189h-98v189h-196v98h196v171q-130 14 -231 96q-101 -82 -231 -96v-171h196v-98h-196v-189h-98v189h-196v98h196v171q-168 18 -281 143.5t-113 303.5t129 307t314 129q158 0 280 -99 q122 99 280 99q185 0 314 -129zM1428 582q0 144 -100.5 244.5t-232 100.5t-223.5 -71q94 -120 94 -274t-94 -274q92 -71 223.5 -71t232 100.5t100.5 244.5zM868 582q0 113 -65 203q-65 -90 -65 -203t65 -203q65 90 65 203zM640 582q0 154 94 274q-92 71 -223.5 71 t-232 -100.5t-100.5 -244.5t100.5 -244.5t232 -100.5t223.5 71q-94 120 -94 274z" />
+<glyph unicode="⚣" horiz-adv-x="1629" d="M1466 282q0 -185 -129 -314t-314 -129q-147 0 -263 85.5t-159 221.5q-40 -7 -78 -7q-185 0 -314 129t-129 314t129 314t314 129q93 0 178 -37l89 154l-175 100l377 152l57 -402l-175 101l-88 -153q115 -85 159 -222q40 7 78 7q93 0 178 -37l89 154l-175 100l377 152 l57 -402l-175 101l-88 -153q180 -132 180 -358zM1368 282q0 144 -100.5 244.5t-244.5 100.5q-29 0 -59 -5q2 -23 2 -40q0 -137 -74.5 -247.5t-196.5 -161.5q34 -105 124 -170.5t204 -65.5q144 0 244.5 100.5t100.5 244.5zM868 582v9q-86 -43 -138 -126t-52 -183v-9 q86 43 138 126t52 183zM523 927q-144 0 -244.5 -100.5t-100.5 -244.5t100.5 -244.5t244.5 -100.5q29 0 59 5q-2 23 -2 40q0 137 74.5 247.5t196.5 161.5q-34 105 -124 170.5t-204 65.5z" />
+<glyph unicode="⚤" horiz-adv-x="1529" d="M1366 784q0 -178 -120.5 -305t-296.5 -137q-37 -128 -139.5 -214.5t-237.5 -101.5v-171h196v-98h-196v-189h-98v189h-196v98h196v171q-168 18 -281 143.5t-113 300t120.5 301.5t296.5 137q40 140 157.5 229.5t268.5 89.5q93 0 178 -37l89 154l-175 100l377 152l57 -402 l-175 101l-88 -153q180 -132 180 -358zM1181 555q87 97 87 235t-100.5 238.5t-244.5 100.5q-111 0 -199.5 -62.5t-124.5 -163.5q158 -27 262.5 -150t104.5 -287q0 -5 -1 -24q129 16 216 113zM868 466q0 129 -82 225t-207 116q-1 -16 -1 -23q0 -129 82 -225t207 -116 q1 16 1 23zM480 784q0 5 1 24q-129 -16 -216 -113t-87 -235t100.5 -238.5t244.5 -100.5q111 0 199.5 62.5t124.5 163.5q-158 27 -262.5 150t-104.5 287z" />
+<glyph unicode="⚥" horiz-adv-x="1129" d="M966 582q0 -171 -113 -296.5t-281 -143.5v-171h196v-98h-196v-189h-98v189h-196v98h196v171q-168 18 -281 143.5t-113 303.5t129 307t314 129q93 0 178 -37l89 154l-175 100l377 152l57 -402l-175 101l-88 -153q180 -132 180 -358zM868 582q0 144 -100.5 244.5 t-244.5 100.5t-244.5 -100.5t-100.5 -244.5t100.5 -244.5t244.5 -100.5t244.5 100.5t100.5 244.5z" />
+<glyph unicode="⚦" horiz-adv-x="1249" d="M966 418q0 -185 -129 -314t-314 -129t-314 129t-129 314t129 314t314 129q93 0 178 -37l85 148l-170 98l49 85l170 -98l75 129l-175 100l377 152l57 -402l-175 101l-74 -129l170 -98l-49 -85l-170 98l-85 -147q180 -132 180 -358zM868 418q0 144 -100.5 244.5 t-244.5 100.5t-244.5 -100.5t-100.5 -244.5t100.5 -244.5t244.5 -100.5t244.5 100.5t100.5 244.5z" />
+<glyph unicode="⚧" horiz-adv-x="1452" d="M1169 532q0 -171 -113 -296.5t-281 -143.5v-171h196v-98h-196v-189h-98v189h-196v98h196v171q-168 18 -281 143.5t-113 296.5q0 225 180 357l-85 148l-170 -98l-49 85l170 98l-74 129l-175 -101l57 402l377 -152l-175 -100l75 -129l170 98l49 -85l-170 -98l85 -148 q85 37 178 37t178 -37l209 362l-175 100l377 152l57 -402l-175 101l-208 -361q180 -132 180 -358zM1071 532q0 144 -100.5 244.5t-244.5 100.5t-244.5 -100.5t-100.5 -244.5t100.5 -244.5t244.5 -100.5t244.5 100.5t100.5 244.5z" />
+<glyph unicode="⚨" horiz-adv-x="1046" d="M853 714.5q113 -125.5 113 -303.5t-129 -307t-314 -129t-314 129t-129 307t113 303.5t281 143.5v171h-196v98h196v149h-201l250 320l250 -320h-201v-149h196v-98h-196v-171q168 -18 281 -143.5zM868 418q0 144 -100.5 244.5t-244.5 100.5t-244.5 -100.5t-100.5 -244.5 t100.5 -244.5t244.5 -100.5t244.5 100.5t100.5 244.5z" />
+<glyph unicode="⚩" horiz-adv-x="1781" d="M1381 533h-149v-196h-98v196h-171q-18 -168 -143.5 -281t-303.5 -113t-307 129t-129 314t129 314t307 129t303.5 -113t143.5 -281h171v196h98v-196h149v201l320 -250l-320 -250v201zM868 582q0 144 -100.5 244.5t-244.5 100.5t-244.5 -100.5t-100.5 -244.5t100.5 -244.5 t244.5 -100.5t244.5 100.5t100.5 244.5z" />
+<glyph unicode="⚪" horiz-adv-x="1218" d="M1178 582q0 -237 -166 -403t-403 -166t-403 166t-166 403t166 403t403 166t403 -166t166 -403zM1078 582q0 196 -136.5 332.5t-332.5 136.5t-332.5 -136.5t-136.5 -332.5t136.5 -332.5t332.5 -136.5t332.5 136.5t136.5 332.5z" />
+<glyph unicode="⚫" horiz-adv-x="1218" d="M1178 582q0 -237 -166 -403t-403 -166t-403 166t-166 403t166 403t403 166t403 -166t166 -403z" />
+<glyph unicode="⚬" horiz-adv-x="946" d="M906 582q0 -180 -126.5 -306.5t-306.5 -126.5t-306.5 126.5t-126.5 306.5t126.5 306.5t306.5 126.5t306.5 -126.5t126.5 -306.5zM806 582q0 139 -97 236t-236 97t-236 -97t-97 -236t97 -236t236 -97t236 97t97 236z" />
+<glyph unicode="⚭" horiz-adv-x="1606" d="M1526 582q0 -185 -129 -314t-314 -129q-158 0 -280 99q-122 -99 -280 -99q-185 0 -314 129t-129 314t129 314t314 129q158 0 280 -99q122 99 280 99q185 0 314 -129t129 -314zM1428 582q0 144 -100.5 244.5t-232 100.5t-223.5 -71q94 -120 94 -274t-94 -274 q92 -71 223.5 -71t232 100.5t100.5 244.5zM868 582q0 113 -65 203q-65 -90 -65 -203t65 -203q65 90 65 203zM640 582q0 154 94 274q-92 71 -223.5 71t-232 -100.5t-100.5 -244.5t100.5 -244.5t232 -100.5t223.5 71q-94 120 -94 274z" />
+<glyph unicode="⚮" horiz-adv-x="2030" d="M1950 582q0 -185 -129 -314t-314 -129t-314 129t-129 314v-492h-98v492q0 -185 -129 -314t-314 -129t-314 129t-129 314t129 314t314 129t314 -129t129 -314v492h98v-492q0 185 129 314t314 129t314 -129t129 -314zM1852 582q0 144 -100.5 244.5t-244.5 100.5 t-244.5 -100.5t-100.5 -244.5t100.5 -244.5t244.5 -100.5t244.5 100.5t100.5 244.5zM868 582q0 144 -100.5 244.5t-244.5 100.5t-244.5 -100.5t-100.5 -244.5t100.5 -244.5t244.5 -100.5t244.5 100.5t100.5 244.5z" />
+<glyph unicode="⚯" horiz-adv-x="2530" d="M2450 582q0 -185 -129 -314t-307 -129t-303.5 113t-143.5 281h-604q-18 -168 -143.5 -281t-303.5 -113t-307 129t-129 314t129 314t307 129t303.5 -113t143.5 -281h604q18 168 143.5 281t303.5 113t307 -129t129 -314zM2352 582q0 144 -100.5 244.5t-244.5 100.5 t-244.5 -100.5t-100.5 -244.5t100.5 -244.5t244.5 -100.5t244.5 100.5t100.5 244.5zM868 582q0 144 -100.5 244.5t-244.5 100.5t-244.5 -100.5t-100.5 -244.5t100.5 -244.5t244.5 -100.5t244.5 100.5t100.5 244.5z" />
+<glyph unicode="⚰" horiz-adv-x="1857" d="M1745 438l-1188 -149l-445 150v435l445 150l1188 -149v-437zM1633 537v239l-1065 134l-344 -116v-275l344 -116z" />
+<glyph unicode="⚱" horiz-adv-x="1307" d="M1176 719q19 -51 19 -80.5t-50 -136.5q-213 -456 -294 -831l-55 -44h-285l-55 44q-81 375 -294 831q-50 107 -50 136.5t19 80.5q57 151 140.5 232t236.5 129l-38 22l-29 49v274h-155v112h735v-112h-155v-274l-29 -49l-38 -22q153 -48 236.5 -129t140.5 -232zM662 1062 q0 68 92 122v241h-201v-241q92 -54 92 -122q0 -50 -69 -81l-115 -39q-57 -24 -107.5 -68t-90 -129.5t-39.5 -106.5q2 -6 70.5 -161.5t141.5 -345.5t120 -392h195q70 301 318 866q7 15 14 33q0 21 -39.5 106.5t-90 129.5t-107.5 68l-115 39q-69 31 -69 81z" />
+<glyph unicode="⚲" horiz-adv-x="1046" d="M837 896q129 -129 129 -307t-113 -303.5t-281 -143.5v-458h-98v458q-168 18 -281 143.5t-113 303.5t129 307t314 129t314 -129zM868 582q0 144 -100.5 244.5t-244.5 100.5t-244.5 -100.5t-100.5 -244.5t100.5 -244.5t244.5 -100.5t244.5 100.5t100.5 244.5z" />
+<glyph unicode="⚳" horiz-adv-x="1316" d="M958 1311q156 -156 156 -370.5t-135.5 -365.5t-337.5 -174v-401h296v-125h-296v-285h-125v285h-296v125h296v522h63q171 0 290.5 119.5t119.5 290.5t-119.5 290.5t-290.5 119.5q-143 0 -300 -122l-77 99q187 148 377 148q223 0 379 -156z" />
+<glyph unicode="⚴" horiz-adv-x="1480" d="M800 0h296v-125h-296v-285h-125v285h-296v125h296v381l-502 510l567 576l567 -576l-507 -515v-376zM1132 891l-392 398l-392 -398l392 -398z" />
+<glyph unicode="⚵" horiz-adv-x="1474" d="M1258 798h-371l262 -262l-88 -89l-262 262v-709h296v-125h-296v-285h-125v285h-296v125h296v709l-262 -262l-88 89l262 262h-370v125h370l-262 261l88 89l262 -262v409h125v-409l262 262l88 -89l-262 -261h371v-125z" />
+<glyph unicode="⚶" horiz-adv-x="1592" d="M859 635h-125v639h125v-639zM1342 561h-186l-360 -428l-360 428h-186v125h244l302 -359l302 359h244v-125zM1502 0h-346l-360 -347l-360 347h-346v125h396l310 -298l310 298h396v-125z" />
+<glyph unicode="⚷" horiz-adv-x="1014" d="M931 -117q0 -141 -148 -222q-123 -67 -275 -67t-276 68q-149 82 -149 214t119 211q99 65 242 81v1252h125v-279l250 236l86 -91l-275 -259l275 -260l-86 -91l-250 237v-745q142 -16 242 -82q120 -79 120 -203zM691 -244q115 47 115 126t-115 127q-91 38 -185 38t-183 -37 q-115 -47 -115 -126t115 -127q91 -38 185 -38t183 37z" />
+<glyph unicode="⚸" horiz-adv-x="1234" d="M1061 270q-118 -30 -213 -30t-188 28v-268h296v-125h-296v-285h-125v285h-296v125h296v319q-162 86 -262 238.5t-100 330.5q0 264 204 456t470 192q96 0 214 -30l-1 -8q-202 -2 -333 -212q-114 -183 -114 -398t114 -398q131 -210 333 -212z" />
+<glyph unicode="⚹" horiz-adv-x="1713" d="M1623 498h-658l329 -570l-108 -63l-329 570l-330 -570l-108 63l329 570h-658v125h658l-329 570l108 63l329 -571l330 571l108 -63l-329 -570h658v-125z" />
+<glyph unicode="⚺" horiz-adv-x="1364" d="M1274 0h-1184v125h458l-424 1076l117 46l441 -1122l441 1122l117 -46l-424 -1076h458v-125z" />
+<glyph unicode="⚻" horiz-adv-x="1364" d="M1274 1122h-458l424 -1076l-117 -46l-441 1122l-441 -1122l-117 46l424 1076h-458v125h1184v-125z" />
+<glyph unicode="⚼" horiz-adv-x="1416" d="M1247 -362h-602v362h-445v1016h1016v-1016h-446v-237h477v-125zM1085 125v766h-760v-766h320v362h125v-362h315z" />
+<glyph unicode="⚽" d="M2015 582q0 -410 -290.5 -700.5t-700.5 -290.5t-700.5 290.5t-290.5 700.5t290.5 700.5t700.5 290.5t700.5 -290.5t290.5 -700.5zM1880 1018q-98 192 -271 325l5 -58zM1897 971l-4 4h1l-292 294l-277 -93v-346l290 -245l272 84zM1978 474l-87 176l-271 -85l-191 -356 l75 -215l286 9q159 210 188 471zM1305 831v346l-323 165l-296 -232l15 -313l283 -143zM969 1357l-59 178q-333 -39 -569 -278l19 -110l312 -22zM341 1139l-17 100q-215 -229 -253 -541l118 82zM1486 -13l-75 215l-360 102l-263 -212l111 -296l339 -25zM1038 319l-62 317 l-283 143l-283 -251l62 -291l303 -131zM788 -349q115 -29 249 -29t274 44l-75 85l-340 25zM64 582q0 -240 110 -448l132 -84l147 182l-63 295l-195 233l-127 -88q-4 -43 -4 -90zM326 -77l-26 107l-105 67q54 -93 131 -174z" />
+<glyph unicode="⚾" d="M2015 582q0 -410 -290.5 -700.5t-700.5 -290.5t-700.5 290.5t-290.5 700.5t290.5 700.5t700.5 290.5t700.5 -290.5t290.5 -700.5zM1966 582q0 220 -94.5 412t-259.5 324q-66 -56 -120 -117l-70 61q52 60 113 111q-232 151 -511 151t-511 -151q61 -51 113 -111l-70 -61 q-54 61 -120 117q-165 -132 -259.5 -324t-94.5 -412t94.5 -412t259.5 -324q66 56 120 117l70 -61q-52 -60 -113 -111q232 -151 511 -151t511 151q-61 51 -113 111l70 61q54 -61 120 -117q165 132 259.5 324t94.5 412zM1424 1114q-59 -84 -98 -176l-83 31q44 109 111 206z M1291 834q-26 -95 -32 -197h-90q7 117 38 228zM805 969l-83 -31q-39 92 -98 176l70 61q67 -97 111 -206zM1291 330l-84 -31q-31 111 -38 228h90q6 -102 32 -197zM879 637h-90q-6 102 -32 197l84 31q31 -111 38 -228zM1424 50l-70 -61q-67 97 -111 206l83 31q39 -92 98 -176z M879 527q-7 -117 -38 -228l-84 31q26 95 32 197h90zM805 195q-44 -109 -111 -206l-70 61q59 84 98 176z" />
+<glyph unicode="⚿" d="M1975 -366h-1902v1903h1902v-1903zM1862 -257v1681h-1676v-1681h1676zM1445 1001q0 -276 -326 -343v-482h226v-200h-224v-137h-192v819q-326 67 -326 343q0 159 136 249q118 78 285 78t285 -78q136 -90 136 -249zM1024 842q82 0 145.5 36t63.5 113t-69 116 q-55 33 -140 33t-140 -33q-69 -39 -69 -116t63.5 -113t145.5 -36z" />
+<glyph unicode="⛀" d="M1709 420q0 -144 -284 -221q-201 -55 -401 -55t-401 55q-284 77 -284 221v339q0 136 289 209q203 52 396 52t396 -52q289 -73 289 -209v-339zM1670 420v214q-24 -30 -53 -51v-258q53 43 53 95zM1537 278v261q-26 -12 -58 -23v-260q36 12 58 22zM1670 742q0 127 -270 193 q-188 46 -376 46t-376 -46q-270 -66 -270 -193q0 -137 266 -209q186 -50 380 -50t380 50q266 72 266 209zM1404 234v258q-15 -3 -46 -10v-259q20 4 46 11zM1300 212v258q-31 -6 -73 -11v-259q27 4 73 12zM1188 453q-83 -9 -190.5 -9t-252.5 26v-258q159 -29 250.5 -29 t192.5 12v258zM706 219v259q-33 7 -80 20v-259q53 -14 80 -20zM565 257v260q-21 7 -60 23v-260q20 -9 60 -23zM378 420q0 -57 62 -102v259q-36 25 -62 57v-214zM1543 761q0 -109 -215 -160q-142 -35 -304 -35t-304 35q-215 51 -215 160t215 160q142 35 303.5 35t304.5 -35 q215 -51 215 -160zM1504 761q0 83 -204 126q-140 30 -276 30t-275 -29q-205 -44 -205 -127t205 -127q139 -29 275 -29t275 29q205 44 205 127zM1188 761q0 -78 -164 -78t-164 78t164 78t164 -78zM899 761q0 -19 47 -29t78.5 -10t78 9.5t46.5 29t-47 29.5t-78 10t-78 -10 t-47 -29zM2048 1606zM0 1606zM2048 -442zM0 -442z" />
+<glyph unicode="⛁" d="M1709 624q0 -144 -284 -221q-201 -55 -401 -55t-401 55q-284 77 -284 221v339q0 136 289 209q203 52 396 52t396 -52q289 -73 289 -209v-339zM1709 265q0 -144 -284 -221q-201 -54 -401 -54t-401 54q-284 77 -284 221v338q0 -144 284 -221q201 -54 401 -54t401 54 q284 77 284 221v-338zM1670 624v214q-22 -27 -53 -50v-259q53 43 53 95zM1537 482v261q-26 -12 -58 -23v-260q36 12 58 22zM1670 265v213q-22 -27 -53 -50v-258q53 43 53 95zM1670 946q0 127 -270 193q-188 46 -376 46t-376 -46q-270 -66 -270 -193q0 -137 266 -208 q185 -50 379.5 -50t380.5 50q266 71 266 208zM1404 438v259l-46 -11v-258q15 3 46 10zM1300 416v259l-73 -12v-259q27 4 73 12zM1537 123v260q-26 -12 -58 -23v-259q36 12 58 22zM1404 79v258l-46 -11v-257q15 3 46 10zM1188 658q-83 -9 -190.5 -9t-252.5 26v-259 q159 -29 250.5 -29t192.5 12v259zM1300 57v258l-73 -12v-258q27 4 73 12zM706 424v258q-33 7 -80 20v-259q37 -10 80 -19zM1188 298q-83 -9 -190.5 -9t-252.5 26v-258q154 -28 252.5 -28t190.5 11v258zM565 461v260q-36 13 -60 24v-260q29 -13 60 -24zM378 624 q0 -56 62 -101v258q-36 25 -62 57v-214zM706 65v257q-33 7 -80 20v-258q37 -10 80 -19zM565 103v258q-36 13 -60 24v-259q20 -9 60 -23zM378 265q0 -56 62 -101v257q-36 25 -62 57v-213zM1543 966q0 -109 -215 -160q-142 -35 -304 -35t-304 35q-215 51 -215 160t215 160 q142 35 303.5 35t304.5 -35q215 -51 215 -160zM1504 966q0 83 -204 126q-140 30 -276 30t-275 -29q-205 -44 -205 -127t205 -127q139 -29 275 -29t275 29q205 44 205 127zM1188 966q0 -78 -164 -78t-164 78t164 78t164 -78zM899 966q0 -19 47 -29t78.5 -10t78 9.5t46.5 29 t-47 29.5t-78 10t-78 -10t-47 -29zM2048 1606zM0 1606zM2048 -442zM0 -442z" />
+<glyph unicode="⛂" d="M1709 420q0 -81 -92 -142v300q92 61 92 142v-300zM1537 236q-31 -13 -58 -22v300q16 5 58 23v-301zM1709 759q0 -144 -284 -221q-201 -55 -401 -55t-401 55q-284 77 -284 221q0 136 289 209q203 52 396 52t396 -52q289 -73 289 -209zM1404 193q-30 -8 -46 -11v300l46 12 v-301zM1300 171q-28 -5 -73 -11v300q21 3 73 12v-301zM1188 154q-88 -10 -190 -10t-253 27v301q157 -28 251.5 -28t191.5 11v-301zM706 179q-54 11 -80 18v301q42 -11 80 -19v-300zM565 215q-20 7 -60 24v300q30 -13 60 -23v-301zM339 420v300q0 -84 101 -147v-300 q-101 63 -101 147zM1543 761q0 109 -215 160q-143 35 -304.5 35t-303.5 -35q-215 -51 -215 -160t215 -160q142 -35 304 -35t304 35q215 51 215 160zM1504 761q0 -83 -205 -127q-139 -29 -275 -29t-275 29q-205 44 -205 127t205 127q139 29 275 29t276 -30q204 -43 204 -126z M1188 761q0 78 -164 78t-164 -78t164 -78t164 78zM1024 800q31 0 78 -10t47 -29.5t-46.5 -29t-78 -9.5t-78.5 10t-47 29t47 29t78 10zM2048 1606zM0 1606zM2048 -442zM0 -442z" />
+<glyph unicode="⛃" d="M1709 624q0 -81 -92 -142v300q92 61 92 142v-300zM1537 441q-31 -13 -58 -22v300q27 9 58 22v-300zM1709 265q0 -81 -92 -142v299q92 61 92 142v-299zM1709 963q0 -144 -284 -221q-201 -54 -401 -54t-401 54q-284 77 -284 221q0 136 289 209q203 52 396 52t396 -52 q289 -73 289 -209zM1404 398l-46 -12v300l46 12v-300zM1300 376l-73 -12v300q21 3 73 12v-300zM1537 82q-31 -13 -58 -22v299q27 9 58 22v-299zM1404 39l-46 -12v299l46 12v-299zM1709 584q0 -144 -282 -221q-202 -55 -403 -55t-403 55q-282 77 -282 221v20q0 -144 282 -220 q201 -55 403 -55t403 55q282 76 282 220v-20zM1188 359q-97 -11 -191.5 -11t-251.5 28v300q151 -27 253 -27t190 10v-300zM1300 17l-73 -12v299q21 3 73 12v-299zM706 383q-38 8 -80 19v300q26 -7 80 -18v-301zM1188 0q-88 -10 -190 -10t-253 27v299q151 -27 253 -27t190 10 v-299zM565 420q-30 10 -60 23v300q30 -13 60 -23v-300zM339 624v300q0 -84 101 -147v-300q-101 63 -101 147zM706 25q-54 11 -80 18v299q26 -7 80 -18v-299zM565 61q-30 10 -60 23v299q30 -13 60 -23v-299zM339 265v299q0 -84 101 -147v-299q-101 63 -101 147zM1543 966 q0 109 -215 160q-143 35 -304.5 35t-303.5 -35q-215 -51 -215 -160t215 -160q142 -35 304 -35t304 35q215 51 215 160zM1504 966q0 -83 -205 -127q-139 -29 -275 -29t-275 29q-205 44 -205 127t205 127q139 29 275 29t276 -30q204 -43 204 -126zM1188 966q0 78 -164 78 t-164 -78t164 -78t164 78zM1024 1005q31 0 78 -10t47 -29.5t-46.5 -29t-78 -9.5t-78.5 10t-47 29t47 29t78 10zM2048 1606zM0 1606zM2048 -442zM0 -442z" />
+<glyph unicode="⛄" d="M1719 159q0 -516 -695 -516t-695 516q0 297 255 447q-118 119 -118 281q0 110 51 193q141 230 507 230q227 0 377 -95q177 -113 177 -328q0 -166 -114 -281q255 -141 255 -447zM1619 159q0 146 -75 247q-47 63 -130 115.5t-83 67.5q0 10 75.5 110t75.5 188 q0 169 -152 254q-123 69 -306 69t-306 -69q-152 -85 -152 -254q0 -88 75.5 -188t75.5 -110q0 -15 -83 -67.5t-130 -115.5q-75 -101 -75 -247q0 -241 188 -341q141 -75 407 -75t407 75q188 100 188 341zM1269 945q25 -25 25 -58.5t-25.5 -60t-58.5 -26.5t-58 25.5t-25 58.5 t25 59.5t58.5 26.5t58.5 -25zM896 945q25 -25 25 -58.5t-26 -60t-59 -26.5t-57.5 25.5t-24.5 59.5t24.5 59.5t58.5 25.5t59 -25z" />
+<glyph unicode="⛅" d="M968 309l-144 -13q-110 0 -183 59q-52 42 -71 51.5t-71 9.5t-148 -22.5t-145 -22.5q-206 0 -206 122q0 85 320 132q2 72 43 120q-30 -14 -82 -42l-8 3q42 49 88 114q-10 20 -20 27q-21 -2 -122 -57l-9 2q42 50 89 115l-10 12h-18l-110 -23l-13 3q49 34 113 88v6l-7 14 l-139 15q3 7 67.5 26t64.5 35t-138 61q5 7 78 11.5t74 24.5q-16 22 -37 35l-48 29q-26 15 -28 30l134 -25l17 13v12l-89 100q34 -1 129 -49q15 10 15 20t-55 109v17q10 -6 110 -88l24 16q-8 42 -29 124l7 11l51 -72q28 -40 44 -40q6 0 9 12q0 46 14 132q1 -2 27 -65.5 t39 -65.5q15 8 32 51l31 80q5 -27 9 -85.5t14 -58.5q18 0 52 45l43 63l7 4v-10q0 -21 -11.5 -65.5t-11.5 -59.5t23 -16q33 33 107 88q-2 -15 -55 -129q6 -17 20 -17t61 31.5t64 34.5l-54 -110q57 -2 97 -59q85 148 217 148q94 0 165.5 -62t71.5 -154q0 -39 -11 -74 q38 11 86 11q84 0 142 -58t58 -141q0 -54 -26 -110q19 4 37 4q88 0 186.5 -60t98.5 -142q0 -78 -241 -198q-69 -93 -247 -93q-111 0 -308 -36q-22 -4 -49.5 -4t-109 28t-125.5 28zM1943 597q0 54 -78 82q-56 20 -132 20t-130 -59q24 -36 24 -58q0 -102 -144 -102 q-87 0 -145 33q-26 15 -26 40t26 33q113 -38 147 -38q66 0 66 36q0 17 -58 59q53 82 53 158q0 35 -33.5 54t-71.5 19q-84 0 -145 -56q-14 -4 -28 -4q-34 0 -34 25q0 12 11 25q71 84 207 84q66 0 119.5 -39.5t53.5 -103.5q0 -23 -3 -47q45 60 45 110.5t-35.5 93t-86.5 42.5 q-118 0 -164 -57q-57 2 -73 32q49 53 66.5 81.5t17.5 83t-48.5 92.5t-105.5 38q-119 0 -222 -239q-31 139 -105 139q-56 0 -126.5 -69.5t-70.5 -171.5l-47 -62q-33 92 -60 92q-50 0 -96 -99q-61 -134 -67 -141l-36 -39q-12 -17 -15 -52l170 14q4 -8 4 -17q0 -30 -28 -58 q-123 0 -311 -34q-42 -6 -96 -16t-54 -28q0 -49 128 -49q50 0 146 23t146 23q94 0 175.5 -58.5t150.5 -58.5q214 0 214 118q13 18 34 18t37 -18q0 -74 -54 -119q126 -45 176 -45t179.5 22t152.5 22q125 0 167 69l123 69q90 56 90 88zM838 1256q-90 112 -216.5 112 t-213.5 -87.5t-87 -214t111 -216.5q89 186 176 186q27 0 50 -10q11 59 63.5 127t116.5 103zM900 876q-6 0 -12 2q-6 63 -13 63q-40 0 -58 -60q-10 -46 -19 -92q-9 -34 -42 -36q-19 39 -25 39q-27 0 -43 -43l-17 -65q-25 -84 -91 -148q63 331 153 331q8 0 16 -3 q13 52 46.5 102t75.5 50q71 0 70 -108q-12 -32 -41 -32z" />
+<glyph unicode="⛆" d="M1966 1231q-59 0 -59 56q0 91 131 147q-12 -45 -13.5 -99.5t-4.5 -65.5q-11 -38 -54 -38zM1666 1231q-59 0 -59 56q0 91 131 147q-12 -45 -13.5 -99.5t-4.5 -65.5q-11 -38 -54 -38zM1837 931q-59 0 -59 56q0 91 131 147q-12 -45 -13.5 -99.5t-4.5 -65.5q-11 -38 -54 -38z M1366 1231q-59 0 -59 56q0 91 131 147q-12 -45 -13.5 -99.5t-4.5 -65.5q-11 -38 -54 -38zM1537 931q-59 0 -59 56q0 91 131 147q-12 -45 -13.5 -99.5t-4.5 -65.5q-11 -38 -54 -38zM1698 631q-59 0 -59 56q0 91 131 147q-12 -45 -13.5 -99.5t-4.5 -65.5q-11 -38 -54 -38z M1066 1231q-59 0 -59 56q0 91 131 147q-12 -45 -13.5 -99.5t-4.5 -65.5q-11 -38 -54 -38zM1869 331q-59 0 -59 56q0 91 131 147q-12 -45 -13.5 -99.5t-4.5 -65.5q-11 -38 -54 -38zM1237 931q-59 0 -59 56q0 91 131 147q-12 -45 -13.5 -99.5t-4.5 -65.5q-11 -38 -54 -38z M1398 631q-59 0 -59 56q0 91 131 147q-12 -45 -13.5 -99.5t-4.5 -65.5q-11 -38 -54 -38zM766 1231q-59 0 -59 56q0 91 131 147q-12 -45 -13.5 -99.5t-4.5 -65.5q-11 -38 -54 -38zM1569 331q-59 0 -59 56q0 91 131 147q-12 -45 -13.5 -99.5t-4.5 -65.5q-11 -38 -54 -38z M937 931q-59 0 -59 56q0 91 131 147q-12 -45 -13.5 -99.5t-4.5 -65.5q-11 -38 -54 -38zM1720 31q-59 0 -59 56q0 91 131 147q-12 -45 -13.5 -99.5t-4.5 -65.5q-11 -38 -54 -38zM1098 631q-59 0 -59 56q0 91 131 147q-12 -45 -13.5 -99.5t-4.5 -65.5q-11 -38 -54 -38z M466 1231q-59 0 -59 56q0 91 131 147q-12 -45 -13.5 -99.5t-4.5 -65.5q-11 -38 -54 -38zM1881 -269q-59 0 -59 56q0 91 131 147q-12 -45 -13.5 -99.5t-4.5 -65.5q-11 -38 -54 -38zM1269 331q-59 0 -59 56q0 91 131 147q-12 -45 -13.5 -99.5t-4.5 -65.5q-11 -38 -54 -38z M637 931q-59 0 -59 56q0 91 131 147q-12 -45 -13.5 -99.5t-4.5 -65.5q-11 -38 -54 -38zM1420 31q-59 0 -59 56q0 91 131 147q-12 -45 -13.5 -99.5t-4.5 -65.5q-11 -38 -54 -38zM798 631q-59 0 -59 56q0 91 131 147q-12 -45 -13.5 -99.5t-4.5 -65.5q-11 -38 -54 -38z M166 1231q-59 0 -59 56q0 91 131 147q-12 -45 -13.5 -99.5t-4.5 -65.5q-11 -38 -54 -38zM1581 -269q-59 0 -59 56q0 91 131 147q-12 -45 -13.5 -99.5t-4.5 -65.5q-11 -38 -54 -38zM969 331q-59 0 -59 56q0 91 131 147q-12 -45 -13.5 -99.5t-4.5 -65.5q-11 -38 -54 -38z M337 931q-59 0 -59 56q0 91 131 147q-12 -45 -13.5 -99.5t-4.5 -65.5q-11 -38 -54 -38zM1120 31q-59 0 -59 56q0 91 131 147q-12 -45 -13.5 -99.5t-4.5 -65.5q-11 -38 -54 -38zM498 631q-59 0 -59 56q0 91 131 147q-12 -45 -13.5 -99.5t-4.5 -65.5q-11 -38 -54 -38z M1281 -269q-59 0 -59 56q0 91 131 147q-12 -45 -13.5 -99.5t-4.5 -65.5q-11 -38 -54 -38zM669 331q-59 0 -59 56q0 91 131 147q-12 -45 -13.5 -99.5t-4.5 -65.5q-11 -38 -54 -38zM820 31q-59 0 -59 56q0 91 131 147q-12 -45 -13.5 -99.5t-4.5 -65.5q-11 -38 -54 -38z M198 631q-59 0 -59 56q0 91 131 147q-12 -45 -13.5 -99.5t-4.5 -65.5q-11 -38 -54 -38zM981 -269q-59 0 -59 56q0 91 131 147q-12 -45 -13.5 -99.5t-4.5 -65.5q-11 -38 -54 -38zM369 331q-59 0 -59 56q0 91 131 147q-12 -45 -13.5 -99.5t-4.5 -65.5q-11 -38 -54 -38zM520 31 q-59 0 -59 56q0 91 131 147q-12 -45 -13.5 -99.5t-4.5 -65.5q-11 -38 -54 -38zM681 -269q-59 0 -59 56q0 91 131 147q-12 -45 -13.5 -99.5t-4.5 -65.5q-11 -38 -54 -38zM69 331q-59 0 -59 56q0 91 131 147q-12 -45 -13.5 -99.5t-4.5 -65.5q-11 -38 -54 -38zM220 31 q-59 0 -59 56q0 91 131 147q-12 -45 -13.5 -99.5t-4.5 -65.5q-11 -38 -54 -38zM381 -269q-59 0 -59 56q0 91 131 147q-12 -45 -13.5 -99.5t-4.5 -65.5q-11 -38 -54 -38zM81 -269q-59 0 -59 56q0 91 131 147q-12 -45 -13.5 -99.5t-4.5 -65.5q-11 -38 -54 -38z" />
+<glyph unicode="⛇" d="M1931 1449q0 -22 -17.5 -40t-39 -18t-39.5 17.5t-18 38.5q0 55 57 55t57 -53zM1569 1400q0 -53 -57 -53t-57 53q0 22 17.5 40t39.5 18t39.5 -18t17.5 -40zM1704 1262q57 0 57 -55.5t-55.5 -55.5t-55.5 55.5t54 55.5zM1950 1012q0 -57 -54 -57q-21 0 -39 18t-18 38.5 t18.5 39.5t39.5 19t37 -18t16 -40zM1118 1426q0 54 55.5 54t55.5 -55.5t-53 -55.5q-22 0 -40 17.5t-18 39.5zM1708 859q53 0 53 -55.5t-55.5 -55.5t-55.5 55.5t58 55.5zM1896 656q54 0 54 -55.5t-55.5 -55.5t-55.5 53q0 22 17.5 40t39.5 18zM817 1502q54 0 54 -55.5 t-54 -55.5q-23 0 -40 17.5t-17 40.5q0 53 57 53zM499 1458q54 0 54 -55.5t-54 -55.5q-57 0 -57 55q0 21 18 38.5t39 17.5zM178 1480q53 0 53 -55.5t-53 -55.5q-22 0 -40 17t-18 38q0 56 58 56zM365 1246q18 -16 18 -37.5t-17.5 -39.5t-38.5 -18q-55 0 -55 55.5t53 55.5 q22 0 40 -16zM1719 159q0 -516 -695 -516t-695 516q0 297 255 447q-118 119 -118 281q0 110 51 193q141 230 507 230q227 0 377 -95q177 -113 177 -328q0 -166 -114 -281q255 -141 255 -447zM209 1012q0 -57 -54 -57q-21 0 -39 18t-18 38.5t18.5 39.5t39.5 19t37 -18t16 -40 zM344 859q54 0 54 -55.5t-56 -55.5q-20 0 -37.5 17.5t-17.5 38.5q0 55 57 55zM155 656q54 0 54 -55.5t-54 -55.5q-57 0 -57 53q0 22 17.5 40t39.5 18zM1268.5 826.5q25.5 26.5 25.5 60t-25 58.5t-58.5 25t-58.5 -26.5t-25 -59.5t25 -58.5t58 -25.5t58.5 26.5zM895 826.5 q26 26.5 26 60t-25 58.5t-59 25t-58.5 -25.5t-24.5 -59.5t24.5 -59.5t57.5 -25.5t59 26.5z" />
+<glyph unicode="⛈" d="M1560 -21q-59 0 -59 56q0 91 131 147q-12 -45 -13.5 -99.5t-4.5 -65.5q-11 -38 -54 -38zM968 309l-144 -13q-109 0 -183 59q-53 42 -71.5 51.5t-70.5 9.5t-148 -22.5t-145 -22.5q-206 0 -206 122q0 85 320 132q2 57 19.5 86.5t67.5 80.5q98 244 201 244q27 0 50 -10 q15 82 100 168.5t165 86.5q59 0 100 -59q85 148 217 148q94 0 165.5 -62t71.5 -154q0 -39 -11 -74q38 11 86 11q84 0 142 -58t58 -141q0 -54 -26 -110q19 4 37 4q88 0 186.5 -60t98.5 -142q0 -78 -241 -198q-69 -93 -247 -93q-73 0 -196 -19t-131 -20l-206 -445l-80 96 l-313 -347h-39l339 698l71 -87l61 121q-59 19 -98 19zM1260 -21q-59 0 -59 56q0 91 131 147q-12 -45 -13.5 -99.5t-4.5 -65.5q-11 -38 -54 -38zM1410 -321q-59 0 -59 56q0 91 131 147q-12 -45 -13.5 -99.5t-4.5 -65.5q-11 -38 -54 -38zM1110 -321q-59 0 -59 56q0 91 131 147 q-12 -45 -13.5 -99.5t-4.5 -65.5q-11 -38 -54 -38zM660 -21q-59 0 -59 56q0 91 131 147q-12 -45 -13.5 -99.5t-4.5 -65.5q-11 -38 -54 -38zM360 -21q-59 0 -59 56q0 91 131 147q-12 -45 -13.5 -99.5t-4.5 -65.5q-11 -38 -54 -38zM510 -321q-59 0 -59 56q0 91 131 147 q-12 -45 -13.5 -99.5t-4.5 -65.5q-11 -38 -54 -38zM210 -321q-59 0 -59 56q0 91 131 147q-12 -45 -13.5 -99.5t-4.5 -65.5q-11 -38 -54 -38zM1943 597q0 54 -78 82q-56 20 -132 20t-130 -59q24 -36 24 -58q0 -102 -144 -102q-87 0 -145 33q-26 15 -26 40t26 33 q113 -38 147 -38q66 0 66 36q0 17 -58 59q53 82 53 158q0 35 -33.5 54t-71.5 19q-84 0 -145 -56q-14 -4 -28 -4q-34 0 -34 25q0 12 11 25q71 84 207 84q66 0 119.5 -39.5t53.5 -103.5q0 -23 -3 -47q45 60 45 110.5t-35.5 93t-86.5 42.5q-118 0 -164 -57q-57 2 -73 32 q49 53 66.5 81.5t17.5 83t-48.5 92.5t-105.5 38q-119 0 -222 -239q-31 139 -105 139q-56 0 -126.5 -69.5t-70.5 -171.5l-47 -62q-33 92 -60 92q-50 0 -96 -99q-61 -134 -67 -141l-36 -39q-12 -17 -15 -52l170 14q4 -8 4 -17q0 -30 -28 -58q-123 0 -311 -34q-42 -6 -96 -16 t-54 -28q0 -49 128 -49q50 0 146 23t146 23q94 0 175.5 -58.5t150.5 -58.5q214 0 214 118q13 18 34 18t37 -18q0 -74 -54 -119q126 -45 176 -45t179.5 22t152.5 22q125 0 167 69l123 69q90 56 90 88zM1179 256l-66 18l-97 -197l-71 87l-196 -404l200 222l66 -80zM900 876 q-6 0 -12 2q-6 63 -13 63q-40 0 -58 -60q-10 -46 -19 -92q-9 -34 -42 -36q-19 39 -25 39q-27 0 -43 -43l-17 -65q-25 -84 -91 -148q63 331 153 331q8 0 16 -3q13 52 46.5 102t75.5 50q71 0 70 -108q-12 -32 -41 -32z" />
+<glyph unicode="⛉" horiz-adv-x="1566" d="M1454 1292l-100 -801l-571 -541l-571 541l-100 801h1342zM1341 1192h-1116l82 -653l476 -451l476 451z" />
+<glyph unicode="⛊" horiz-adv-x="1566" d="M1454 1292l-100 -801l-571 -541l-571 541l-100 801h1342z" />
+<glyph unicode="⛋" d="M1928 -262q0 -24 -18 -42t-42 -18h-1688q-24 0 -42 18t-18 42v1688q0 24 18 42t42 18h1688q24 0 42 -18t18 -42v-1688zM1808 -202v1568h-1568v-1568h1568zM1768 582q0 -25 -17 -42l-685 -685q-17 -17 -42 -17t-42 17l-685 685q-17 17 -17 42t17 42l685 685q17 17 42 17 t42 -17l685 -685q17 -17 17 -42zM1638 582l-614 614l-614 -614l614 -614z" />
+<glyph unicode="⛌" d="M1134 692v129l326 326h129v-129l-326 -326h-129zM1588 16h-129l-999 1003v129h127l1001 -1003v-129zM459 17v129l326 326h129v-129l-326 -326h-129z" />
+<glyph unicode="⛍" d="M1279 1172v-59l-73 -47q-11 42 -36 106h109zM1227 801h-20v-35h-50v-109h-142v109h-682v-109h-142v109h-50v35h-20v67h20v127q0 92 139 382q160 28 394 28t394 -28q139 -290 139 -382v-127h20v-67zM1984 -312h-1173l587 944zM69 1172h109q-25 -64 -36 -106l-73 47v59z M1166 882v98h-164v-98h164zM674 1349q-230 0 -353 -17q-63 -113 -95 -218q205 9 448 9t448 -9q-32 105 -95 218q-123 17 -353 17zM961 942v38h-574v-38h574zM961 882v38h-574v-38h574zM1207 821v27h-1066v-27h1066zM1779 -197l-381 612l-381 -612h762zM346 882v98h-164v-98 h164z" />
+<glyph unicode="⛎" d="M1917 634q0 -118 -77.5 -197.5t-195.5 -79.5q-39 0 -132 23v-214q0 -201 139 -201q85 0 136 77q-31 -203 -294 -203q-173 0 -247 160q-90 -160 -349 -160q-111 0 -189 33q-106 46 -106 141v745q-28 17 -94 38t-95 21q-69 0 -117.5 -44.5t-48.5 -112.5q0 -92 99 -202 l-75 -76q-59 49 -99.5 130t-40.5 155q0 116 77.5 195.5t193.5 79.5q41 0 115.5 -20.5t84.5 -22.5v469h264v-573l380 -177v750h266v-853q101 -33 123 -33q69 0 117.5 44t48.5 113q0 95 -99 202l76 75q139 -124 139 -282zM1246 144v332l-380 173v-548q0 -115 156 -115 q80 0 152 42t72 116z" />
+<glyph unicode="⛏" d="M1960 -179l-179 -176l-1120 1113q-282 -330 -484 -875l-89 17q8 289 93 588.5t238 511.5l-311 433l61 64l422 -317q272 203 555 275q227 57 618 60l22 -90q-535 -101 -945 -484z" />
+<glyph unicode="⛐" d="M1958 871l-29 -51l-87 -5q12 44 22 110zM1005 1421q-51 -41 -84 -74l-40 78l30 51zM1878 1154q-24 -321 -70 -401l-64 -110l17 -10l-33 -58l-17 10l-18 -30l-43 25l-55 -94l-123 71l55 94l-591 341l-54 -94l-123 71l54 94l-43 25l17 30l-17 10l34 58l17 -10l63 110 q48 81 312 262q159 -58 355.5 -171.5t326.5 -222.5zM1776 -374h-160v155q0 159 -135 159h-315v160h315q138 0 216.5 -89.5t78.5 -229.5v-155zM816 562h-413q-86 0 -115 -53q-20 -38 -20 -130t21 -125q28 -45 114 -45h253v-160h-253q-140 0 -217.5 79.5t-77.5 219.5v65 q0 140 78.5 224.5t216.5 84.5h413v-160zM1300 300h-197q-73 0 -94 -28.5t-21 -100.5v-230q0 -139 -88 -229t-227 -90h-633v160h633q72 0 113.5 43t41.5 116v230q0 289 275 289h197v-160zM1820 1135q-98 76 -298 191.5t-313 161.5q-111 -66 -191 -141q392 -204 775 -448 q25 109 27 236zM1765 761l-142 82l-49 -85l142 -82zM1587 863l-497 287l-19 -33l497 -287zM1557 811l-497 287l-19 -33l497 -287zM1734 626l-923 533l-14 -23l924 -533zM1054 1171l-142 82l-49 -85l142 -82z" />
+<glyph unicode="⛑" d="M1995 524h-220q-7 -112 -33 -216q-70 -277 -255 -438.5t-463 -161.5t-463 161.5t-255 438.5q-26 104 -33 216h-220v81q90 41 208 100q4 106 14 161q35 191 168 350q215 257 581 257t581 -257q133 -159 168 -350q10 -55 14 -161q118 -59 208 -100v-81zM1363 899v179h-243 v241h-193v-243h-242v-178h242v-242h194v243h242zM1621 524h-1194q0 -62 24 -166q51 -226 201.5 -372.5t371.5 -146.5t371.5 146.5t201.5 372.5q24 104 24 166z" />
+<glyph unicode="⛒" d="M1948 582q0 -385 -269.5 -654.5t-654.5 -269.5t-654.5 269.5t-269.5 654.5t269.5 654.5t654.5 269.5t654.5 -269.5t269.5 -654.5zM1024 1294q-245 0 -436 -147l326 -326v-129h-129l-326 326q-147 -191 -147 -436t148 -437l1001 1001q-192 148 -437 148zM1736 582 q0 245 -148 437l-1001 -1001q192 -148 437 -148t436 147l-326 326v129h129l326 -326q147 191 147 436z" />
+<glyph unicode="⛓" d="M1778 114q0 -377 -240 -388v-80h-119v76q-244 19 -244 396q0 325 179 375q22 5 65 17v154q-32 6 -94 28q-150 75 -150 376.5t168 364.5q2 1 76 22v77h119v-77q72 -18 101 -34q139 -76 139 -361q0 -369 -244 -392v-158q6 -2 21 -6q132 -31 184 -147q39 -87 39 -243z M873 -354h-130q-9 74 -17 148q-19 76 -88 113h-9q-5 -59 -6 -64q-10 -27 -50.5 -27t-52.5 29q-6 14 -10 62q-71 -20 -93 -108q-6 -24 -17 -153h-130v59q0 9 5 44q19 130 69 197.5t169 90.5v155l-10 5q-129 11 -188 144q-45 99 -45 248q0 368 244 390v158l-50 12 q-100 26 -147 125t-47 195v63h130l14 -154q19 -80 96 -111q3 48 10 64q13 30 52 30t49 -30l8 -64q72 21 96 110q9 33 18 155h130v-53q0 -33 -12 -94q-42 -214 -211 -243q-8 -1 -24 -8v-153q0 -4 25.5 -4t71.5 -24q150 -78 150 -366q0 -332 -216 -387q-20 -5 -31 -9v-150 q25 -7 75 -23q172 -61 172 -372zM1574 811q74 50 74 238.5t-70 253.5q-20 18 -43 18q0 -48 -6 -63q-11 -27 -52 -27q-59 0 -59 84v6h-13q-99 -43 -99 -274.5t112 -248.5q0 46 7 63q12 28 52 28q58 0 58 -83v-8h13q7 0 26 13zM1535 -147q113 20 113 263t-113 263q1 -15 1 -22 q0 -72 -59 -72q-60 0 -60 73q0 10 1 21q-112 -19 -112 -264t112 -262q-1 11 -1 19q0 75 61 75q57 0 57 -85v-9zM742 587q0 89 -21 159q-31 99 -95 106q2 -21 2 -35q0 -59 -57 -59q-59 0 -59 73q0 10 1 21q-113 -20 -113 -253.5t112 -272.5v26q0 64 59 64q42 0 52 -28 q6 -14 3 -62h13q11 0 32 15q71 50 71 246z" />
+<glyph unicode="⛔" d="M1948 582q0 -385 -269.5 -654.5t-654.5 -269.5t-654.5 269.5t-269.5 654.5t269.5 654.5t654.5 269.5t654.5 -269.5t269.5 -654.5zM1754 412v344h-1460v-344h1460z" />
+<glyph unicode="⛕" d="M1361 183q0 71 -53 71h-303q-12 0 -41 6q-133 28 -214 122t-81 220t64.5 216t175.5 129q48 17 70 17h311q71 0 71 82v450h275v-603q0 -2 -6 -25q-15 -59 -64 -108.5t-106 -49.5h-365q-151 0 -151 -101q0 -46 35.5 -72t83.5 -26h386l26 -6q115 -25 149 -129q12 -37 12 -51 v-401l194 192l82 -89l-411 -400l-415 397q33 44 81 92l194 -192v259zM690 947q-159 -132 -159 -341t159 -331v-592h-277v1572l-192 -189l-85 88l415 401l415 -401l-81 -88l-195 192v-311z" />
+<glyph unicode="⛖" d="M1980 582q0 -36 -30 -67l-854 -871q-28 -29 -72 -29t-72 29l-854 871q-30 31 -30 67t30 67l854 871q28 29 72 29t72 -29l854 -871q30 -31 30 -67zM1345 1068h-179v-754l-175 108v-79l264 -303l264 303v79l-174 -108v754zM703 96h179v754l175 -108v79l-264 303l-264 -303 v-79l174 108v-754z" />
+<glyph unicode="⛗" d="M1980 582q0 -36 -30 -67l-854 -871q-28 -29 -72 -29t-72 29l-854 871q-30 31 -30 67t30 67l854 871q28 29 72 29t72 -29l854 -871q30 -31 30 -67zM1876 582l-852 868l-852 -868l852 -868zM1166 1068h179v-754l174 108v-79l-264 -303l-264 303v79l175 -108v754zM882 96 h-179v754l-174 -108v79l264 303l264 -303v-79l-175 108v-754z" />
+<glyph unicode="⛘" d="M1875 -353h-803v189h-96v-189h-803v1072l336 422v375h467v-192h96v192h803v-1869zM1072 988v192h-96v-192h96zM1072 656v188h-96v-188h96zM1072 320v188h-96v-188h96zM1072 -16v188h-96v-188h96z" />
+<glyph unicode="⛙" d="M1072 1324h-96v192h96v-192zM1875 -353h-166v1869h166v-1869zM1072 988h-96v192h96v-192zM1072 656h-96v188h96v-188zM1072 320h-96v188h96v-188zM1072 -16h-96v188h96v-188zM339 -353h-166v1072l336 422v375h166v-433l-336 -422v-1014zM1072 -353h-96v189h96v-189z" />
+<glyph unicode="⛚" d="M1948 1132h-131q-97 0 -170 69t-73 166v139h374v-374zM474 1367q0 -97 -73 -166t-170 -69h-131v374h374v-139zM1948 -342h-374v139q0 97 73 166t170 69h131v-374zM474 -342h-374v374h131q97 0 170 -69t73 -166v-139z" />
+<glyph unicode="⛛" d="M1927 1315q0 -24 -15 -51l-818 -1466q-27 -49 -70 -49t-70 49l-818 1466q-15 27 -15 51q0 68 84 68h1638q84 0 84 -68zM1706 1223h-1364l682 -1222z" />
+<glyph unicode="⛜" d="M1405 1324h-96v192h96v-192zM2002 -353h-166v1869h166v-1869zM1405 988h-96v192h96v-192zM1405 656h-96v188h96v-188zM1405 320h-96v188h96v-188zM1405 -16h-96v188h96v-188zM1405 -353h-96v189h96v-189zM212 -353h-166v842l666 682v345h166v-413l-666 -682v-774z M878 -353h-166v495h166v-495z" />
+<glyph unicode="⛝" d="M1958 -352h-1868v1868h1868v-1868zM1717 1416h-1386l693 -693zM1858 -111v1386l-693 -693zM883 582l-693 693v-1386zM1717 -252l-693 693l-693 -693h1386z" />
+<glyph unicode="⛞" d="M1958 -352h-1868v1868h1868v-1868zM1948 582q0 385 -269.5 654.5t-654.5 269.5q-327 0 -580 -203l1301 -1301q203 253 203 580zM100 582q0 -385 269.5 -654.5t654.5 -269.5q327 0 580 203l-1301 1301q-203 -253 -203 -580z" />
+<glyph unicode="⛟" d="M1948 172h-100v37q0 98 -65 169t-162 71q-124 0 -188 -120v499h195q54 0 75 -50l101 -245q71 0 96 -9q48 -16 48 -73v-279zM1809 198q0 -81 -54 -139.5t-134 -58.5t-134 58.5t-54 139.5t54 139.5t134 58.5t134 -58.5t54 -139.5zM1398 172h-795v37q0 98 -65.5 169 t-162.5 71t-162.5 -71t-65.5 -169v-37h-47v769h1298v-769zM560 198q0 -81 -54 -139.5t-134 -58.5t-134 58.5t-54 139.5t54 139.5t134 58.5t134 -58.5t54 -139.5zM1466 775v-242h297l-92 242h-205z" />
+<glyph unicode="⛠" d="M1426 1118h-96v192h96v-192zM1426 786h-96v188h96v-188zM1426 450h-96v188h96v-188zM1979 -353h-115v1754h-976v-283l-220 -216l-598 614h1909v-1869zM1426 114h-96v188h96v-188zM1426 -223h-96v189h96v-189z" />
+<glyph unicode="⛡" d="M150 -242v1819l571 -577l-478 -432v-716h97l588 491v-490h792l-659 644l74 74l834 -813h-1819z" />
+<glyph unicode="⛢" horiz-adv-x="1326" d="M1093 578.5q147 -164.5 147 -394t-169 -398.5t-408 -169t-408 169t-169 398.5t147 394t366 188.5v447q-182 -143 -402 -238v91q370 279 440 468h52q70 -189 440 -468v-91q-220 95 -402 238v-447q219 -24 366 -188.5zM1120 194q0 189 -134 323t-323 134t-323 -134 t-134 -323t134 -323t323 -134t323 134t134 323zM820 194q0 -65 -46 -111t-111 -46t-111 46t-46 111t46 111t111 46t111 -46t46 -111z" />
+<glyph unicode="⛣" d="M1640 1184q0 -68 -47.5 -116t-115.5 -48t-116 48t-48 116t48 116t116 48t115.5 -48t47.5 -116zM687.5 1298.5q47.5 -49.5 47.5 -117.5t-46.5 -114.5t-115.5 -46.5t-117 47.5t-48 116t48.5 116.5t116 48t115 -49.5zM1661 322q0 -261 -187 -449t-449 -188t-450 187 t-188 440.5t157.5 432t400.5 205.5v561h163v-558q0 -5 15 -5h4q303 -56 447 -306q87 -151 87 -320zM1358 -13q139 138 139 332.5t-139.5 335t-332.5 140.5t-333.5 -140.5t-140.5 -332.5t140.5 -332.5t334 -140.5t332.5 138z" />
+<glyph unicode="⛤" d="M1948 789l-571 -415l218 -671l-571 415l-571 -415l218 671l-571 415h706l218 672l218 -672h706zM1579 669h-298l57 -175zM1116 789l-92 283l-92 -283h184zM1236 420l-81 249h-262l-81 -249l212 -154zM1367 17l-92 283l-149 -108zM767 669h-298l241 -175zM922 192 l-149 108l-92 -283z" />
+<glyph unicode="⛥" d="M1331 514l-102 -73l-205 631l-85 -263h-127l212 652zM1948 789l-805 -585l-102 74l538 391h-278l-39 120h686zM1595 -297l-805 585l39 119l538 -390l-86 264l102 74zM1134 669h-665l225 -163l-39 -120l-555 403h995zM1008 106l-555 -403l307 946h126l-205 -632l225 163z " />
+<glyph unicode="⛦" d="M1948 789l-555 -403l-39 120l225 163h-665l39 120h995zM1236 809h-127l-85 263l-205 -631l-102 73l307 947zM1595 -297l-555 403l102 74l225 -163l-205 632h126zM1007 278l-102 -74l-805 585h686l-39 -120h-278zM1258 288l-805 -585l212 652l102 -74l-86 -264l538 390z " />
+<glyph unicode="⛧" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="⛨" horiz-adv-x="1566" d="M1454 371q0 -206 -229.5 -433t-441.5 -268q-212 41 -441.5 268t-229.5 433v1051h1342v-1051zM1339 371v936h-1112v-936q0 -161 193 -348.5t363 -234.5q170 47 363 234.5t193 348.5zM1222 619h-342v-343h-194v342h-342v178h342v343h193v-341h343v-179z" />
+<glyph unicode="⛩" d="M2016 1205h-323v-1541h-204v950h-930v-950h-202v1539h-325v181h1984v-179zM1488 800v404h-928v-404h928z" />
+<glyph unicode="⛪" d="M1976 230h-111v-520h-379v546l-464 355l-464 -355v-546h-377v518h-109v51l873 616v285h-231v156h230v202h155v-199h231v-157h-230v-287l876 -616v-49zM1254 -290h-460v371q0 80 73 137.5t155.5 57.5t157 -57.5t74.5 -137.5v-371z" />
+<glyph unicode="⛫" d="M1886 -273h-180v1102h-386v450h-590v-448h-386v-1104h-182v1275h386v449h952v-447h386v-1277z" />
+<glyph unicode="⛬" d="M1206 1283q75 -75 75 -180.5t-76.5 -180t-180.5 -74.5t-180.5 74.5t-76.5 180t75 180.5t182 75t182 -75zM1737.5 384.5q75.5 -75.5 75.5 -180t-75 -179.5t-180 -75t-180 76t-75 182t74 179t179.5 73t181 -75.5zM672.5 385.5q76.5 -74.5 76.5 -178.5t-78.5 -180.5 t-181.5 -76.5t-178.5 75.5t-75.5 179.5t75.5 179.5t180.5 75.5t181.5 -74.5z" />
+<glyph unicode="⛭" horiz-adv-x="1610" d="M1570 508h-252q-24 -132 -98 -237l176 -176l-104 -105l-177 177q-113 -77 -236 -98v-252h-148v252q-123 21 -236 98l-177 -177l-105 105l177 176q-74 105 -98 237h-252v148h252q24 132 98 237l-177 176l105 105l177 -177q113 77 236 98v252h148v-252q123 -21 236 -98 l177 177l104 -105l-176 -176q74 -105 98 -237h252v-148zM1074 313q111 111 111 269.5t-110.5 269t-269.5 110.5t-269.5 -110.5t-110.5 -269t111 -269.5t269 -111t269 111z" />
+<glyph unicode="⛮" d="M1937 508h-400q-24 -132 -98 -237l176 -176l-104 -105l-177 177q-113 -77 -236 -98v-252h-148v252q-123 21 -236 98l-177 -177l-105 105l177 176q-74 105 -98 237h-252v-304h-148v452h400q24 132 98 237l-177 176l105 105l177 -177q113 77 236 98v252h148v-252 q123 -21 236 -98l177 177l104 -105l-176 -176q74 -105 98 -237h252v304h148v-452zM1293 313q111 111 111 269.5t-110.5 269t-269.5 110.5t-269.5 -110.5t-110.5 -269t111 -269.5t269 -111t269 111z" />
+<glyph unicode="⛯" horiz-adv-x="1610" d="M1570 508h-252q-24 -132 -98 -237l176 -176l-104 -105l-177 177q-113 -77 -236 -98v-252h-148v252q-123 21 -236 98l-177 -177l-105 105l177 176q-74 105 -98 237h-252v148h252q24 132 98 237l-177 176l105 105l177 -177q113 77 236 98v252h148v-252q123 -21 236 -98 l177 177l104 -105l-176 -176q74 -105 98 -237h252v-148zM1074 313q111 111 111 269.5t-110.5 269t-269.5 110.5t-269.5 -110.5t-110.5 -269t111 -269.5t269 -111t269 111zM933 710q52 -52 52 -127.5t-52.5 -128t-127.5 -52.5t-127.5 52.5t-52.5 128t52 127.5t128 52t128 -52 z" />
+<glyph unicode="⛰" d="M1997 -224h-1590q26 86 91 251q17 35 72 108t71 112q3 52 10 129l62 207l22 81q22 79 70 142.5t69 119.5q4 11 39 158q15 62 70 189.5t68 199.5l51 60q66 -34 176.5 -182.5t156.5 -242.5q28 -71 90 -211l122 -212q101 -190 140 -313q16 -90 62 -266q17 -51 74 -158.5 t74 -171.5zM883 999q-13 -43 -48 -124q-32 -40 -86 -127q-6 -12 -50 -159q-24 -69 -62 -209q-3 -17 -9 -125q-51 -71 -142 -220q-23 -46 -51.5 -135t-43.5 -124h-340q31 70 82 215q8 62 33 183q35 122 171 297q9 56 43.5 153.5t41.5 128t19 72.5q8 21 51 90.5t68 115.5 t39 103l54 48q90 -34 230 -183z" />
+<glyph unicode="⛱" d="M1982 -272h-1916v179h718l178 649q-24 9 -68 9q-115 0 -181 -33q-62 85 -158.5 139.5t-198 54.5t-168.5 -31q29 123 95.5 250t186.5 218t244.5 125t245 34t199.5 -19q18 63 42 137q19 32 54 32q69 0 69 -59q0 -10 -35 -142q255 -95 415 -272q182 -200 182 -451 q0 -147 -61 -291q-131 160 -348 160q-110 0 -186 -41q-61 92 -196 156l-174 -623h1061v-181zM1760 473l4 54q0 207 -118 360t-319 238q100 -178 100 -373q0 -107 -25 -219q71 5 100 5q138 0 258 -65zM1311 770q0 209 -120 402q-134 -75 -240.5 -207t-141.5 -276q40 6 101 6 q212 0 372 -135q29 115 29 210zM943 1210q-407 0 -590 -359q187 -6 342 -128q40 148 137.5 280t225.5 199q-101 8 -115 8z" />
+<glyph unicode="⛲" d="M1927 894h-101v142q0 127 -65 236q-74 125 -191 137v94h13q38 0 95 -22q201 -78 243 -377q6 -42 6 -43v-167zM1399 1409q-10 2 -20 2q-60 0 -111.5 -77.5t-51.5 -149.5q0 -12 2 -23h-105v17q0 123 83 223.5t203 101.5v-94zM931 1161h-101q1 6 1 19q0 75 -55.5 152 t-127.5 77v94h8q96 0 172.5 -79.5t96.5 -177.5l6 -28v-57zM1120 847l173 -2v-176h-538v176q182 0 181 1v180h176v-180q1 1 8 1zM222 1045v-151h-101v170q0 13 4.5 37.5t5.5 33.5q10 115 98 232t196 129q29 3 49 7l4 -93q-115 -10 -185.5 -125.5t-70.5 -239.5zM1927 520 q0 -17 -26 -52q-76 -101 -190 -146q-47 -19 -234 -60q-2 -2 -2 -5l66 -447h229v-157h-1492v157h225l70 446l-117 28q-157 40 -248 114q-17 14 -52 59t-35 60v72h1806v-69z" />
+<glyph unicode="⛳" d="M1087 837v-700q0 -18 -32.5 -32.5t-56.5 -14.5t-53.5 17.5t-29.5 42.5v1406l873 -719h-701zM1968 86q0 -224 -305 -353q-239 -102 -502 -102h-274q-19 0 -56 4.5t-52 5.5q-237 12 -441 114q-258 128 -258 331q0 150 192 271q156 100 331 128q54 6 154 22q1 -140 5 -419 q1 -21 20 -56q29 -53 92.5 -85.5t109.5 -32.5t94 10t107.5 64t59.5 104v415q14 -4 43 -6q203 -13 416 -117q264 -128 264 -298z" />
+<glyph unicode="⛴" d="M2005 494q0 -4 -8 -46q-58 -304 -192 -515h-1483q-209 264 -279 599h221v80h140l63 421h301v281h258v-281h717l48 -421h94v-98h120v-20zM1366 853v-218h261l-23 218h-238zM1223 635v218h-238v-218h238zM844 635v218h-232l-29 -218h261z" />
+<glyph unicode="⛵" d="M1936 204q0 -3 -35 -61q-155 -256 -345 -479h-868q-5 0 -69 52q-291 235 -503 481v90h903v1283l906 -1126h-793v-155h804v-85zM922 444h-810l810 1030v-1030zM1133 547h562l-562 718v-718zM812 547v633l-477 -633h477zM745 -229h751q195 229 291 409h-1498 q131 -157 369 -343q85 -66 87 -66z" />
+<glyph unicode="⛶" d="M1966 861h-168v399q0 36 -34.5 66t-70.5 30h-390v168h448q71 0 143 -65.5t72 -135.5v-462zM745 1356h-390q-36 0 -70.5 -30t-34.5 -66v-399h-168v462q0 70 72 135.5t143 65.5h448v-168zM1966 -159q0 -70 -72 -135.5t-143 -65.5h-448v168h390q36 0 70.5 30t34.5 66v399 h168v-462zM745 -360h-448q-71 0 -143 65.5t-72 135.5v462h168v-399q0 -36 34.5 -66t70.5 -30h390v-168z" />
+<glyph unicode="⛷" d="M524 1485q65 -65 65 -159.5t-62.5 -156.5t-157 -62t-159.5 64.5t-65 156t65.5 157t157 65.5t156.5 -65zM77 590l137 5l235 324q32 44 91 135q8 29 33 82q92 133 190 133q65 0 115 -32l290 -207q92 -62 119 -88q61 -60 61 -123.5t-81 -174.5q6 -3 5 -3t341 14l24 62 q16 35 51.5 35t54.5 -45t19 -86.5t-18.5 -82.5t-51 -41t-51.5 29.5t-20 60.5q-16 5 -182.5 5t-220.5 -20q-27 -10 -59.5 -64.5t-32.5 -55.5l380 -173l412 230q20 -25 53 -83l-867 -483q-368 -196 -594 -281q-37 -14 -120 -14t-160 35q9 16 18 54q65 -8 110 -8t97 18t126 52 l397 195q34 13 91 54q13 16 26.5 54t17.5 47v12q-29 23 -123.5 58.5t-132.5 63.5q-64 48 -64 122q0 54 77 152l-377 -9q-16 -1 -47 -6q-14 -10 -42 -27q-31 -14 -75.5 -14t-93.5 17t-54 17h-104v55zM539 608q70 0 198 8.5t179 9.5q11 15 27 44l-267 181l-177 -243h40z" />
+<glyph unicode="⛸" d="M1993 -309h-1938v36q0 54 56 148.5t108 94.5h380v193h-8q-49 0 -137 10q-198 54 -198 252q0 232 217 322q79 33 315 76q33 3 65.5 7.5t61.5 24.5q19 14 19 51v512h784v-1043q0 -62 -53.5 -130t-113.5 -68v-207h283q14 0 53.5 -26.5t72.5 -95.5t33 -110v-47zM1360 -29v195 h-568v-195h568z" />
+<glyph unicode="⛹" d="M1060.5 1458q62.5 -64 62.5 -152t-63.5 -152.5t-150 -64.5t-151 65t-64.5 151t64.5 151.5t152 65.5t150 -64zM1754 662q57 -57 57 -134.5t-59 -136t-136.5 -58.5t-133.5 57t-56 138t54.5 136t135.5 55t138 -57zM1930 -299h-697q-115 0 -152 89q-12 28 -45 141l-98 339 h-54q-36 -112 -102 -337q-31 -120 -55 -158q-45 -74 -139 -74h-470v79h358l200 687v312l-353 -418q-106 43 -106 141q0 39 39 85l112 132l128 160q95 114 145.5 144t114.5 30h975q-51 -191 -125 -191h-467v-387l210 -695h581v-79z" />
+<glyph unicode="⛺" d="M1972 611l-101 -866l-654 46v579l-520 32v-574l-621 41l945 1572l949 -814q2 -2 2 -10v-6zM1872 576l-747 673l663 -1322z" />
+<glyph unicode="⛻" d="M1525.5 -203q-223.5 -154 -501 -154t-506 155t-320.5 413q142 50 232 149.5t90 238t-92 239.5t-230 146q98 261 322 414.5t502 153.5t507 -155.5t321 -412.5q-137 -39 -229.5 -144t-92.5 -243.5t90.5 -239t231.5 -146.5q-101 -260 -324.5 -414zM1024 1395 q-194 0 -355 -89.5t-261 -254.5q108 -49 190.5 -188.5t82.5 -264.5t-81 -263.5t-192 -191.5q90 -160 257.5 -251.5t358.5 -91.5t352 89t259 254q-115 63 -191.5 193t-76.5 261q0 262 241 436q10 7 28 24q-217 338 -612 338z" />
+<glyph unicode="⛼" d="M1454 726h-862v167h336v598h192v-597h334v-168zM2030 -308h-862v167h332v603h193v-601h337v-169zM877 -308h-859v167h337v603h186v-603h336v-167z" />
+<glyph unicode="⛽" d="M1970 602q4 -172 4 -317.5t-35 -225.5q-53 -122 -202 -122q-115 0 -169 77q-41 59 -55 170t-14 126v269q0 295 -85 295h-102v-1063h333v-134h-1571v132h310v1400l7 29q18 78 84.5 154t139.5 76h465q60 0 122 -60q85 -83 102 -175q7 -36 7 -27v-182q68 -1 196 -24 q69 -26 95 -100q37 -106 43 -267v-269q0 -166 29 -241q21 -53 67 -53q87 0 87 187q0 405 -34 679q-7 59 -44.5 115.5t-82.5 78.5t-296 106l47 132q94 -29 276 -98q167 -74 223 -218q35 -93 43 -315q2 -56 4 -81zM1114 898v241h-533v-241h533z" />
+<glyph unicode="⛾" d="M1973 -354h-1898v1900h1898v-1900zM1869 757q0 134 -69 220t-200 86h-115v137h-1066v-559q0 -130 106 -244.5t237 -145.5q42 -10 112 -10h177q101 0 199.5 35t138 79t63.5 100h165q9 0 38 6q214 45 214 296zM1853 131q0 66 -113 104l-169 40q-134 -183 -575 -183 q-524 0 -604 183l-146 -40q-90 -34 -90 -108.5t126 -132.5q268 -123 731.5 -123t729.5 132q110 55 110 128zM1711 759q0 -142 -107 -142h-118v283h118q53 0 80 -42.5t27 -98.5z" />
+<glyph unicode="⛿" d="M1760 323q-164 0 -473.5 97.5t-473.5 97.5q-255 0 -487 -208v-720h-116v1984h116v-197q242 197 484 197q162 0 468 -101t468 -101q36 0 92 5v-1051q-45 -3 -78 -3zM1722 1256q-154 5 -452 103.5t-447 98.5t-275 -70q-78 -43 -222 -161v-177q225 174 487 174 q164 0 462 -93.5t447 -100.5v226zM1722 666q-154 5 -452 103.5t-447 98.5t-275 -70q-78 -43 -222 -161v-177q225 174 487 174q164 0 462 -93.5t447 -100.5v226z" />
+<glyph unicode="✀" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="✁" horiz-adv-x="2051" d="M553 442q-42 0 -42 -36q0 -10 3 -21q8 -34 8 -59q0 -81 -55 -130t-141 -49t-156 66t-70 150t55 130t135 46q40 0 122 -20.5t122 -20.5q143 0 260 125q-26 58 -92 116q-102 90 -258 129q-47 10 -137 41q-139 66 -139 195q0 74 51 121t132 47t153.5 -67t72.5 -154 q0 -37 -19.5 -79.5t-19.5 -47.5q0 -28 137 -78q87 -32 228 -168l645 37q14 1 29 1q185 0 374 -130l-850 -109l199 -229l-190 -17l-207 234l-291 -23h-59zM225 1092q0 -58 63 -103t117.5 -45t81.5 35.5t27 88.5t-55.5 101t-114.5 48q-119 0 -119 -125zM421.5 240.5 q38.5 35.5 38.5 97t-50.5 102.5t-112 41t-100 -32.5t-38.5 -90.5t52.5 -105.5t112 -47.5t98 35.5z" />
+<glyph unicode="✂" horiz-adv-x="2027" d="M1728 340q-86 0 -225 51l-612 225q-8 -3 -132.5 -45.5t-209.5 -52.5q-48 -5 -48 -37q0 -6 16.5 -45.5t16.5 -70.5q0 -87 -61.5 -143t-151 -56t-152.5 50t-63 140q0 142 135 199q55 24 173 24q18 0 36 -1h25q128 0 194 38q72 42 84 97q-26 68 -100 101q-70 32 -145 32h-9 l-129 -4h-15q-88 0 -146 32q-109 60 -109 164.5t61.5 158.5t151 54t152.5 -55t63 -135q0 -32 -15.5 -74.5t-15.5 -48.5q0 -32 78 -37q116 -8 316 -94l618 231q150 56 227 56q101 0 191 -84l-774 -297l774 -289q-73 -84 -199 -84zM427 950q35 41 35 103.5t-46 99.5t-108.5 37 t-102 -39.5t-39.5 -100.5t50.5 -101t113 -40t97.5 41zM424 268.5q43 39.5 43 102t-37.5 101t-101.5 38.5t-111 -46.5t-47 -108t44.5 -94t105.5 -32.5t104 39.5z" />
+<glyph unicode="✃" horiz-adv-x="2051" d="M538 496q0 -5 19.5 -47.5t19.5 -79.5q0 -88 -72.5 -155t-153.5 -67t-132 47t-51 121q0 129 139 195q30 14 137 41q156 39 258 129q65 57 92 117q-117 125 -260 125q-40 0 -122 -20.5t-122 -20.5q-80 0 -135 46t-55 130t70 149.5t156 65.5t141 -48.5t55 -129.5 q0 -26 -8 -60q-3 -11 -3 -21q0 -36 42 -36h59l291 -23l207 234l190 -17l-199 -229l850 -108q-188 -130 -374 -130q-14 0 -29 1l-645 36q-141 -136 -228 -168l-79 -28q-58 -24 -58 -49zM409.5 979.5q50.5 41.5 50.5 103t-38.5 96.5t-98 35t-112 -47.5t-52.5 -105t38.5 -90.5 t100 -33t112 41.5zM458.5 250.5q55.5 47.5 55.5 100.5t-27 88.5t-81.5 35.5t-117.5 -44.5t-63 -102.5q0 -125 119 -125q59 0 114.5 47.5z" />
+<glyph unicode="✄" horiz-adv-x="2064" d="M1665 154q-139 0 -310 114l-370 246l-45 -27q-72 -43 -88.5 -43t-58 9.5t-78 9.5t-72.5 -14q61 -88 61 -196.5t-90.5 -180.5t-220 -72t-208.5 85t-79 226q0 166 135 248q102 62 303 62h19h7q148 0 148 84q0 73 -147 81q-108 6 -179 15t-126 35q-166 78 -166 274 q0 135 82.5 221t209.5 86t218.5 -76.5t91.5 -195.5q0 -89 -59 -176q25 -11 60.5 -11t98.5 13.5t78 13.5q48 0 103 -55l313 182q222 129 375 129q195 0 293 -147l-668 -396l655 -419q-45 -55 -128 -90t-158 -35zM1677 203q95 0 192 67l-626 400l-211 -129l301 -199 q210 -139 344 -139zM1898 1112q-103 72 -214.5 72t-340.5 -133l-579 -336v-15q0 -97 -92 -124q-36 -10 -146.5 -12.5t-166 -10.5t-101.5 -37q-105 -66 -105 -213q0 -114 67.5 -183t173.5 -69t175.5 61.5t69.5 156t-47 151.5q-15 15 -15 29q0 29 51 46q43 14 114 14h26 q53 -2 77 -2q16 0 20 1q9 2 52 27zM929 901q-22 27 -50.5 27t-83 -10.5t-72.5 -10.5q-150 0 -150 60q0 6 31 50.5t31 115.5q0 102 -71 166.5t-175.5 64.5t-172 -70.5t-67.5 -175.5q0 -167 131 -229q63 -30 178 -35l86 -4q71 -3 106 -12q62 -14 89 -52zM1055 790.5 q26 -30.5 26 -70.5t-24.5 -76t-65.5 -36t-66.5 31.5t-25.5 75.5t24.5 75t65 31t66.5 -30.5zM519.5 1255q53.5 -52 53.5 -130t-52.5 -131.5t-130 -53.5t-129.5 56t-52 130.5t55 127.5t128.5 53t127 -52zM524 416q53 -55 53 -129t-52 -127.5t-127.5 -53.5t-130 53t-54.5 130 t53.5 129.5t129 52.5t128.5 -55zM989 784q-51 0 -51 -58t48 -58t48 58t-45 58zM493.5 1035q36.5 38 36.5 89.5t-36 91t-87.5 39.5t-90 -35.5t-38.5 -89.5t35.5 -93.5t89.5 -39.5t90.5 38zM495.5 193.5q38.5 35.5 38.5 87.5t-33 93.5t-86.5 41.5t-93 -35t-39.5 -89t35.5 -94 t87.5 -40t90.5 35.5z" />
+<glyph unicode="✅" horiz-adv-x="1787" d="M1687 1239q0 -40 -14 -60l-184 -200l-498 -524l-266 -256q-237 -228 -297 -228h-2l-47 4q-43 4 -140 82q-43 34 -82 80q-18 21 -18 76l-29 248q-12 105 -12 184q0 27 2 51q5 95 10 107.5t52 68.5t67 76t62 33.5t83 13.5t70 -20q29 -25 29 -62.5t20 -154.5l19 -111 q4 -35 26 -90q24 -27 56 -27q15 0 43 27l747 727l158 131q35 29 80.5 29t55 -12t9.5 -60v-133zM1587 1232v90l-136 -113q-42 -38 -292 -282l-418 -409q-90 -88 -147 -88q-78 0 -131 61q-31 36 -45 110.5t-23.5 132.5t-21.5 161q-44 -3 -67 -13q-9 -4 -55.5 -58.5 t-47.5 -62.5q-5 -31 -5 -110.5t41 -431.5l-1 -23q105 -116 149 -121l47 -4q2 0 18 14q284 253 468 441l495 521z" />
+<glyph unicode="✆" d="M1416 1125q0 -32 -26 -86q-68 -141 -164 -141q-35 0 -100 32q156 111 187 297q103 -49 103 -102zM1998 582q0 -406 -284 -690t-690 -284q-173 0 -328 96q-176 109 -176 272q0 35 18 72l37 72q-30 34 -54 69q28 293 170.5 585t355.5 493q34 3 50 3q92 0 187 -28 q-42 -178 -191 -296q-25 13 -41 13q-91 0 -214 -252q-88 -180 -88 -272q0 -69 53 -85q1 -14 1 -41q0 -179 -117 -291q-28 20 -60 49q-29 -27 -29 -70q0 -131 154 -216q130 -73 272 -73q364 0 619 255t255 619t-255 619t-619 255t-619 -255t-255 -619q0 -338 225 -587 q-23 -13 -38 -13q-88 0 -172 159q-115 217 -115 441q0 406 284 690t690 284t690 -284t284 -690zM956 185q0 -61 -39.5 -139.5t-93.5 -78.5q-32 0 -105 36q123 124 123 295q0 16 -1 33q116 -56 116 -146z" />
+<glyph unicode="✇" d="M1998 582q0 -406 -284 -690t-690 -284t-690 284t-284 690t284 690t690 284t690 -284t284 -690zM1898 582q0 364 -255 619t-619 255t-619 -255t-255 -619t255 -619t619 -255t619 255t255 619zM1024 920q-107 0 -190 -55l64 483q48 16 126 16t126 -16l64 -483 q-83 55 -190 55zM1750 308q-10 -50 -49 -117t-77 -101l-450 186q90 44 143 136q48 84 48 173q0 10 -1 20zM1288 582q0 -109 -77.5 -186.5t-186.5 -77.5t-186.5 77.5t-77.5 186.5t77.5 186.5t186.5 77.5t186.5 -77.5t77.5 -186.5zM874 276l-450 -186q-38 34 -77 101t-49 117 l386 297q-1 -10 -1 -20q0 -89 48 -173q53 -92 143 -136z" />
+<glyph unicode="✈" horiz-adv-x="1940" d="M1123 1053l111 2q66 0 66 -42q0 -33 -41 -43l-67 -6l182 -241q156 0 324.5 -17.5t168.5 -82.5t-168 -82.5t-325 -17.5l-182 -241l67 -6q41 -10 41 -43q0 -42 -66 -42l-111 2l-120 -164l89 -15q19 -7 19 -32q0 -39 -71 -39q-32 0 -106 -5q-57 -81 -140 -182 q-24 -18 -66 -18q-4 0 -82 1q271 609 271 727q0 47 -53 61q-10 3 -90 10l-381 32l-194 -243l-126 -20l92 282l-82 35l82 35l-92 282l126 -20l194 -243l381 32q80 7 90 10q53 14 53 61q0 118 -271 727l82 1q42 0 66 -18q1 -1 140 -182q74 -5 106 -5q71 0 71 -39 q0 -25 -19 -32l-89 -15z" />
+<glyph unicode="✉" horiz-adv-x="1470" d="M1370 283h-1270v850h1270v-850zM1331 365v688l-426 -320l2 -22l-2 -25zM731 881q121 0 164 -113l436 332h-1194l434 -332q17 48 63 80.5t97 32.5zM897 649q-46 -114 -163 -114t-163 114l-430 -327h1186zM563 686l-2 25l2 22l-426 320v-688z" />
+<glyph unicode="✊" horiz-adv-x="1637" d="M556 1059l-16 72q0 75 51.5 124.5t126 49.5t169.5 -56q62 117 134 117q141 0 206 -99q37 -57 78 -227q115 -15 147.5 -36.5t58.5 -144t26 -182.5q0 -345 -143 -537q-101 -136 -261.5 -222t-325.5 -86q-311 0 -509 187t-198 497q0 79 48 133q28 30 83.5 60.5t55.5 45.5 q0 21 -9.5 62.5t-9.5 70t40 80.5t76.5 70.5t91.5 27.5l78 -18q2 6 2 11zM1054 1279q-44 0 -76.5 -37t-32.5 -70t22 -89q129 -5 256 -28q-30 113 -48 147q-42 77 -121 77zM724 1223q-101 0 -101 -89q0 -49 37 -127q40 87 117 87q18 0 52 -2t49 -2q-32 71 -55 95 q-36 38 -99 38zM1007 684q-138 11 -246 59q52 -101 86 -191q60 77 160 132zM1455 677q0 155 -53 258q-157 44 -644 76q-41 -53 -41 -91q0 -4 1 -7q42 -149 404 -149q37 0 123 2l39 -61q-197 -54 -295 -128q-137 -103 -137 -275q0 -95 38 -220l-41 -22q-101 135 -101 286 q-20 -7 -43.5 -7t-36.5 5q3 -21 3 -40q0 -165 -137 -165q-90 0 -190 98t-100 187q0 18 5 18q25 0 117.5 -110.5t167.5 -110.5q55 0 55 83q0 54 -122 194t-171 140t-81.5 -38t-32.5 -84q0 -275 174.5 -438.5t450.5 -163.5q144 0 289 78t233 197q126 171 126 488zM465 974 q-9 0 -17 -3q-97 -37 -97 -107q0 -98 169 -300q118 -142 178 -142q76 0 84 73q-58 149 -129 277q-113 202 -188 202z" />
+<glyph unicode="✋" horiz-adv-x="1557" d="M1457 485q0 -30 -29 -64l-55 -63l-67 -127q-152 -285 -280 -379q-42 -31 -173 -84.5t-212 -53.5q-151 0 -244 32q-1 0 -68 31q-133 61 -185 168q-44 90 -44 249v268q0 5 11 246q0 88 15 263q9 53 53 127t88 74q10 0 28 -8q18 75 33 108q28 56 79 76q10 4 56 2 q30 71 66 95t113 24q33 0 67.5 -43t48.5 -51l52 10q123 -43 142 -148q5 -25 9 -186l7 -284q6 -141 21 -244q2 -11 44 -143q18 9 28 34l19 47q30 62 97.5 117t129.5 55q26 0 76.5 -23t62 -44t11.5 -81zM672 1257q0 23 -10 63.5t-11 48.5q-33 13 -49.5 13t-39 -24t-22.5 -44 q0 3 1 3q2 0 16 -63q26 -118 28 -297l-1 45q-1 0 -1 -346l89 8v593zM497 1194q0 8 -19 53q-40 19 -49 19q-24 0 -41 -30t-17 -56v1q1 0 16 -145q16 -155 27 -410l83 18v550zM763 1024l-7 -114v-259q68 -27 68 -56q0 -20 -15 -20q-22 0 -63 12.5t-63 12.5q-248 0 -400 -123 l-32 -26l-22 34q4 20 44 57l59 49q1 3 1 8q0 270 -29 483l-18 12q-69 -1 -90 -198q-6 -128 -13 -256q-5 -44 -5 -49v-392q0 -35 11 -91q25 -128 80.5 -188.5t181.5 -92.5q64 -16 143.5 -16t163.5 28l149 57q20 6 58 24q92 57 179 182q44 64 131 223q29 53 131 175 q-44 50 -85 50q-101 0 -168 -111l-101 -191h-17q-17 0 -32 11q-30 22 -80 214q-26 99 -28 167l-15 511q-4 138 -66 138q-68 0 -56 -1zM646 91l6 -87q-15 -7 -45 -19l-31 131l67 142q38 66 109 114q15 -17 39 -55q-145 -160 -145 -226z" />
+<glyph unicode="✌" horiz-adv-x="1197" d="M1054 762q43 -79 43 -201.5t-34 -229t-93 -173.5q-161 -181 -388 -181t-341 125q-55 60 -98 164.5t-43 173t38 112.5q35 42 90 42h5q-16 62 -16 101t45.5 89t83.5 50q15 0 86 -19q-9 37 -79.5 230t-70.5 274q0 49 37 87t86 38q68 0 132 -137q1 -2 73 -199l70 -190l88 229 q48 124 68 162q58 104 122 104q51 0 79 -37t28 -100.5t-45 -199.5l-86 -251l68 -20q36 -14 52 -43zM860 842q137 384 137 437.5t-45 53.5q-38 0 -76 -86l-139 -387zM395 1370q-43 0 -43 -55q0 -102 137 -451q14 17 29 15l100 -11l-133 381q-42 121 -90 121zM718 563l-139 27 l47 -113zM1034 561q0 149 -94 185t-396 61q-16 -28 -16 -53q0 -63 78 -101q48 -23 142 -27h-1q0 1 148 1l16 -33l-8 -19q-91 -17 -150 -71q-135 -123 -135 -219q0 -26 15.5 -75t17.5 -60l-19 -19q-81 70 -86 184h-47q2 -17 2 -38.5t-8 -36.5q-28 -52 -89.5 -52t-129.5 62 q-35 32 -74 110v46l17 -3q17 -39 68.5 -87t88.5 -48q18 0 40 12t22 32t-119 175q-34 45 -64.5 45t-61 -30.5t-30.5 -55.5q0 -52 54 -167.5t110 -157.5q82 -62 232 -62q228 0 352.5 147.5t124.5 354.5zM569 432q0 35 -117 234q-30 50 -48 69.5t-60 26.5q-62 -44 -62 -74 q0 -50 94 -174.5t143.5 -124.5t49.5 43z" />
+<glyph unicode="✍" horiz-adv-x="1806" d="M914 282l-249 -16q-102 0 -254 47l-110 -120l-152 -58q-37 -14 -43 -14q-11 0 -11 8q0 5 5 14l100 213l19 23l-25 27l64 167q9 38 30 113l60 168q118 116 203.5 185.5t187.5 111.5l125 -72l160 178q33 37 63.5 37t55 -34.5t24.5 -73.5q0 -18 -31 -53l-135 -154l170 -111 q76 -49 154 -51l24 43l307 -20l41 -146l9 -209l-54 -286l-303 -6l-28 108l-187 -39l-188 19q-14 1 -32 1zM1591 262q33 123 33 272.5t-49 260.5h-177l5 -31l20 -209q0 -141 -45 -311zM1386 545q0 100 -43 229l-133 12l-246 150l-116 -131l2 -41v-8q0 -33 -15 -78l-90 -109 l27 -2h5q42 0 165 49q-11 -38 -66 -77l-229 -11q-63 -3 -76.5 -6.5t-73.5 -32.5q-78 -37 -78 -104q0 -29 23 -39q6 -3 45.5 -9.5t48.5 -6.5q37 0 37 49q0 19 -7 54t-5 40q19 0 30 -29t11 -53.5t-13.5 -41.5t-13.5 -19q0 -21 80 -21q19 -2 52 -2t116 15.5t119 17.5l35 -6 q111 -19 161 -19t226 47q22 132 22 183zM696 565q43 0 80 74q32 65 32 109q0 6 -1 12l-162 -189q24 -6 51 -6zM739 1098q-57 0 -190 -121l-115 -105q-43 -39 -53 -52t-25 -56l-53 -154l39 -20l14 -62l-47 -114h33q77 72 112 151l45 103l328 370l-44 35q-31 25 -44 25z M323 539q0 35 -26 51l-72 -176l25 -2h6q67 0 67 127zM174 244q-19 -34 -19 -53t16 -19t99 37q18 8 18 21t-24 47t-37 34q-6 0 -21 -10z" />
+<glyph unicode="✎" horiz-adv-x="1922" d="M1822 158q0 -56 -95 -56h-3l-555 7q-58 7 -117 43l-868 522l-84 313l166 277l305 51l844 -508q50 -30 63.5 -40t28.5 -38l289 -504q26 -57 26 -67zM1437 676v65l-817 490l58 -215l745 -447q14 48 14 107zM1652 195q39 51 39 83t-49 115l-153 260q-14 -306 -291 -485 l383 -10q47 6 71 37zM1411 522l-756 455l-129 -213l758 -455q99 92 127 213zM624 1022l-69 242l-256 -45l-142 -236l68 -266l248 53zM1249 274l-748 449l-227 -43l850 -510q67 40 125 104zM483 1071q0 -72 -47 -132t-92 -60q-64 0 -64 73q0 57 46.5 123t101.5 66 q24 0 39.5 -22t15.5 -48z" />
+<glyph unicode="✏" horiz-adv-x="1969" d="M1794 791q75 -50 75 -83.5t-75 -86.5l-420 -295q-46 -33 -55.5 -37t-51.5 -4h-956l-211 245v369l211 227h932q43 0 59 -8t72 -45zM1691 616q11 48 11 94t-19 87l-326 221l-4 -4q76 -174 76 -309.5t-61 -311.5l4 -4zM1339 909q-30 93 -72 166h-858l142 -166h788zM1355 575 q15 51 15 121t-15 148h-804v-269h804zM1345 510h-805l-143 -162h899q26 60 49 162zM495 545v338l-166 192l-174 -192v-326l174 -209zM313 881q80 0 80 -161t-86 -161q-70 0 -70 161t76 161z" />
+<glyph unicode="✐" horiz-adv-x="1922" d="M1822 1260q0 -11 -26 -68l-289 -504q-18 -34 -92 -78l-844 -508l-305 52l-166 276l84 313l868 523q43 26 57.5 31.5t59.5 11.5l555 6h3q95 0 95 -55zM1642 1024q49 83 49 115.5t-39 83.5q-24 31 -71 37h-35l-348 -11q277 -179 291 -485zM1411 895q-28 121 -127 213 l-758 -455l129 -213zM1249 1143q-58 64 -125 104l-850 -510l227 -43zM1437 741q0 59 -14 107l-745 -447l-58 -215l817 490v65zM624 395l-151 252l-248 53l-68 -266l142 -235l256 -45zM483 346q0 -26 -15.5 -48t-39.5 -22q-55 0 -101.5 66t-46.5 123q0 74 64 74 q44 0 91.5 -60.5t47.5 -132.5z" />
+<glyph unicode="✑" horiz-adv-x="1990" d="M1140 285q-63 0 -107 41q-28 25 -69 94q-70 117 -141 117q-113 0 -141 -138h-301q-66 0 -92.5 5t-67.5 36q-121 90 -121 274.5t145 270.5q52 31 148 31h289q36 -135 137 -135q67 0 114 65l77 122q53 65 137 65q107 0 436 -201q216 -132 307 -223q-100 -103 -334 -244 q-297 -180 -416 -180zM1210 543q-66 0 -103.5 48t-37.5 117t37.5 117.5t105.5 48.5q93 0 127 -131l195 -8v152q-271 172 -373 172q-69 0 -120 -66l-83 -122q-56 -66 -139 -66q-130 0 -182 145h-242q-81 0 -125 -28q-111 -70 -111 -203t84 -205q50 -43 136 -43h258 q20 64 74 103.5t124 39.5t124 -66l81 -122q49 -66 111 -66q121 0 383 175v149l-195 -8q-35 -133 -129 -133z" />
+<glyph unicode="✒" horiz-adv-x="2049" d="M1274 213q-93 0 -166 78q-40 43 -67 140.5t-41 120.5q-31 52 -93.5 52t-97.5 -55q-54 -85 -88.5 -109t-124.5 -24h-177q-108 0 -132 3q-81 9 -118 49q-69 75 -69 260t113 245q38 20 262 20h114q88 0 126.5 -18t81 -93t106 -75t92.5 43q16 23 36 95t30.5 100.5t39.5 64.5 q73 92 184.5 92t231.5 -166q103 -142 182 -209q110 -93 250 -118q-235 -44 -430 -326q-118 -170 -245 -170zM1742 690q54 3 54 18.5t-164 22.5l-234 10q-36 109 -127 109q-59 0 -95 -42.5t-36 -100t35 -101t88 -43.5q96 0 135 113h48z" />
+<glyph unicode="✓" horiz-adv-x="1607" d="M481 -14q-28 -13 -111 -13t-98.5 8.5t-46.5 73.5q-125 259 -125 402q0 36 47 69q94 66 158 66q26 0 39 -22q85 -216 106 -216q11 0 53 62l474 702l165 203q48 59 152 91t199 32l14 -33l-190 -225l-426 -563l-295 -457l-72 -123q-11 -22 -43 -57z" />
+<glyph unicode="✔" horiz-adv-x="1787" d="M1687 1239q0 -40 -14 -60l-184 -200l-498 -524l-266 -256q-237 -228 -297 -228h-2l-47 4q-43 4 -140 82q-43 34 -82 80q-18 21 -18 76l-29 248q-12 105 -12 184q0 27 2 51q5 95 10 107.5t52 68.5t67 76t62 33.5t83 13.5t70 -20q29 -25 29 -62.5t20 -154.5l19 -111 q4 -35 26 -90q24 -27 56 -27q15 0 43 27l747 727l158 131q35 29 80.5 29t55 -12t9.5 -60v-133z" />
+<glyph unicode="✕" horiz-adv-x="1617" d="M1517 121l-121 -121l-587 590l-588 -590l-121 121l592 588l-592 587l121 121l588 -590l587 590l121 -123l-590 -585z" />
+<glyph unicode="✖" horiz-adv-x="1617" d="M1517 356l-354 -356l-354 358l-355 -358l-354 356l358 353l-358 352l354 356l355 -356l354 356l354 -356l-356 -352z" />
+<glyph unicode="✗" horiz-adv-x="1371" d="M1218 1354q5 0 10.5 -13t24 -33t18.5 -30t-20 -29t-72 -86l-313 -409l63 -127l160 -342q-9 -21 -28 -29v-16q-1 -1 -21 -13.5t-20 -20.5t10 -28q-3 -18 -26 -34.5t-42.5 -16.5t-77.5 90l-192 297l-406 -629q-32 -24 -106 -24q-17 0 -45.5 45t-28.5 58t7.5 39t-3 35.5 t-10.5 20.5t49 95l49 84q79 135 351 464l24 29l-151 418q-23 64 -23 71.5t27 41.5q21 18 30 18t31 -18q12 10 33 10q6 3 18 14q10 17 23 17q19 0 37 -37l155 -308l52 64l100 115q187 215 196 215q25 0 72 -39l23 20q14 21 22 21z" />
+<glyph unicode="✘" horiz-adv-x="1441" d="M1243 1372l-10 -20q0 -8 14.5 -19t24.5 -11t18.5 2.5t19.5 -13.5l31 -45q0 -8 -13.5 -27t-13.5 -22q-8 3 -436 -498l-10 -12l127 -164l176 -211q-4 -23 -29 -68t-38 -45h-17q-4 0 -14.5 -16.5t-6.5 -26.5t-24.5 -35.5t-33.5 -25.5t-34 18.5t-24 18.5q-2 0 -34.5 -35 t-51.5 -35l-16 4q-53 54 -132.5 169t-97.5 138l-313 -420h-27l-39 43l6 29q0 10 -8 10t-51 -16q-19 9 -48.5 58t-29.5 46q0 6 12.5 22.5t12.5 29.5t-15.5 42t-17.5 39l176 213l166 195q-178 332 -238 537q22 42 74 90q5 -1 23.5 -20t21.5 -19q31 0 29 39q-1 19 15.5 34 t36.5 15t44 -37l242 -362q51 60 257 271.5t222 211.5q6 0 40 -28t34 -44z" />
+<glyph unicode="✙" horiz-adv-x="1619" d="M1519 475h-473v-475h-473v475h-473v469h473v473h473v-473h473v-469zM1456 532v353h-471v469h-353v-469h-473v-353h473v-469h353v469h471zM1380 610h-471v-471h-201v471h-473v195h473v471h201v-471h471v-195z" />
+<glyph unicode="✚" horiz-adv-x="1615" d="M1515 475h-473v-475h-475v475h-467v471h467v471h475v-471h473v-471z" />
+<glyph unicode="✛" horiz-adv-x="1613" d="M1513 586h-588v-586h-239v586h-586v245h586v586h239v-586h588v-245zM913 600v217h-211v-217h211z" />
+<glyph unicode="✜" horiz-adv-x="1603" d="M1503 481h-477v-481h-453v481h-473v445h473v491h453v-491h477v-445zM1015 498v413h-432v-413h432z" />
+<glyph unicode="✝" horiz-adv-x="1070" d="M970 856h-335v-856h-197v856h-338v195h338v366h197v-366h335v-195z" />
+<glyph unicode="✞" horiz-adv-x="1187" d="M1087 717h-285v-717h-227l-178 141v576h-115l-182 155v244h297v301h246l159 -147v-154h136l149 -141v-258zM927 879v186h-290v299h-187v-299h-301v-186h301v-727h187v727h290z" />
+<glyph unicode="✟" horiz-adv-x="1158" d="M1058 721h-284v-721h-391v721h-283v387h283v309h391v-309h284v-387zM1007 768v289h-282v309h-291v-309h-285v-289h285v-717h291v717h282zM944 831h-281v-718h-166v718h-284v162h284v307h166v-307h281v-162z" />
+<glyph unicode="✠" horiz-adv-x="1702" d="M104 1163l11 2q12 0 18 -10q231 -415 698 -424q-9 469 -423 699q-11 6 -11 14q0 24 21 24h866q13 0 19 -12q2 -2 2 -11t-11 -15q-416 -231 -422 -699q466 9 697 424q6 10 15 10q24 0 24 -20v-866q0 -12 -7.5 -16.5t-16.5 -4.5t-15 10q-228 413 -697 422q6 -465 422 -696 q11 -6 11 -19q0 -20 -21 -20h-866q-21 0 -21 20q0 13 11 19q414 230 423 696q-468 -9 -698 -422q-6 -10 -13.5 -10t-15.5 2q-10 7 -10 19v866q0 11 10 18z" />
+<glyph unicode="✡" horiz-adv-x="1474" d="M1374 346h-422l-215 -375l-217 375h-420l207 363l-207 364h420l217 371l215 -371h422l-209 -364zM1245 999h-250l127 -211zM864 1073l-127 227l-131 -227h258zM1243 418l-121 213l-123 -213h244zM1077 709l-168 290h-344l-168 -290l168 -291h344zM475 999h-246l123 -211z M870 346h-254l121 -221zM479 418l-127 213l-127 -213h254z" />
+<glyph unicode="✢" horiz-adv-x="1666" d="M1251 836q71 24 138 24t122 -40t55 -110.5t-53 -114.5t-116.5 -44t-137.5 24l-108 35q-175 57 -283 66q8 -117 55 -266l35 -111q29 -92 29 -155t-42.5 -118t-112 -55t-111 53.5t-41.5 114.5t26 154l84 299q11 37 11 69q0 8 -1 15q-98 -11 -276 -64l-100 -30 q-90 -27 -150.5 -27t-117 41.5t-56.5 110.5t50 113t117 44t142 -26l119 -41q119 -41 272 -58q-9 112 -69 308l-27 88q-24 78 -24 138t42 115.5t110.5 55.5t112.5 -52t44 -115t-59.5 -247.5t-61.5 -290.5l285 64z" />
+<glyph unicode="✣" horiz-adv-x="1668" d="M1511.5 847.5q56.5 -55.5 56.5 -140t-59.5 -143t-150.5 -58.5t-177 110q-18 24 -67 60q-38 15 -89 15q-12 0 -24 -1l-37 -2q-20 -95 -112 -110v-56q0 -79 13.5 -103.5t80.5 -78.5q92 -74 92 -162.5t-57 -147.5t-139.5 -59t-142.5 56.5t-60 148t108 180.5q47 39 58.5 72 t11.5 104v43q-102 31 -113 115h-47q-69 0 -102.5 -14.5t-73.5 -69.5q-75 -102 -184 -102q-81 0 -139 61.5t-58 143t58 137t150 55.5t171 -100q44 -55 82 -66.5t125 -11.5h18q11 107 111 117l4 49q1 11 1 22q0 86 -58 133q-64 54 -95.5 97t-31.5 117t59.5 130t139.5 56 t139 -59.5t59 -150.5t-98 -167q-37 -29 -48.5 -40.5t-19.5 -39.5q-16 -42 -16 -92v-16l2 -39q46 -3 78 -37t34 -80l41 -2q12 -1 22 -1q54 0 84 13q36 15 79 68q83 102 174 102t147.5 -55.5z" />
+<glyph unicode="✤" horiz-adv-x="1670" d="M1570 709q0 -110 -73 -187.5t-178.5 -77.5t-178.5 57l-112 109q-68 61 -156 66q-2 -98 117 -211.5t119 -229.5t-81.5 -190t-189 -74t-185 81t-77.5 189t115.5 220t114.5 215q-102 -7 -213 -121.5t-223.5 -114.5t-190.5 79.5t-78 186.5t79 188t180.5 81t175.5 -60 l114 -112q69 -60 156 -60q-8 96 -121 212t-113 224.5t78 186.5t184 78t187 -74.5t81 -178.5t-57 -177l-108 -112q-60 -70 -64 -159h3q99 0 205 115q107 117 218.5 117t191.5 -78t80 -188z" />
+<glyph unicode="✥" horiz-adv-x="1677" d="M1536 804q41 -40 41 -94.5t-40.5 -92t-95.5 -37.5q-28 0 -57 16q-2 -61 -39 -103t-95.5 -42t-94 36.5t-35.5 90t33 102.5l-285 -6l-6 -275q58 35 108 35t89.5 -37t39.5 -92.5t-43 -94.5t-98 -44q14 -28 14 -72t-38.5 -83.5t-93 -39.5t-92.5 38t-38 91q0 29 17 66h-6 q-55 0 -97 36q-43 37 -43 94t38 97.5t88.5 40.5t99.5 -35l-5 275l-276 4q33 -45 33 -101.5t-41 -93.5t-98.5 -37t-91 45t-35.5 105q-48 -16 -76 -16q-49 0 -83 39.5t-34 92t40.5 91.5t96.5 39q27 0 56 -13q3 55 42 96.5t94.5 41.5t93.5 -37t38 -85t-35 -110l276 4l5 285 q-39 -39 -96 -39t-94.5 35.5t-37.5 93.5q0 113 144 137q-17 47 -17 66q0 51 37 89t92 38t95 -39.5t40 -99.5q0 -18 -12 -54q58 -5 97.5 -41t39.5 -91.5t-36.5 -94.5t-91.5 -39t-103 39l4 -285l285 -4q-37 50 -37 106t38.5 92t95 36t94.5 -42t40 -98q34 15 55 15q56 0 97 -40 z" />
+<glyph unicode="✦" horiz-adv-x="1683" d="M1583 709q0 -11 -23 -17q-243 -62 -413 -221q-223 -208 -299 -461q-11 -37 -20 -37h-1q-7 -1 -16 31q-71 258 -240 426q-81 81 -203 157t-227 109q-41 8 -41 23q0 9 35 20q247 76 414 244q195 197 266 418q14 43 22.5 43t18.5 -33q70 -243 257 -426.5t427 -251.5 q43 -17 43 -24z" />
+<glyph unicode="✧" horiz-adv-x="1683" d="M1583 694q-260 -54 -462 -256.5t-271 -464.5h-37q-54 259 -251.5 453.5t-461.5 267.5v41q254 62 447.5 257.5t265.5 451.5h37q66 -260 268 -455.5t465 -253.5v-41zM1499 715q-196 36 -304 64t-212 87q-85 150 -152 492q-37 -178 -67.5 -285t-88.5 -207q-102 -57 -246 -95 q-53 -14 -259 -56q228 -49 259 -57q147 -39 246 -99q57 -98 97 -238q15 -52 59 -251q34 176 64 283t88 206q101 61 251 100z" />
+<glyph unicode="✨" d="M1948 482q-202 -7 -251 -69q-40 -50 -49 -259h-31q-6 124 -19 173q-26 100 -100 130q-46 18 -185 26v34q201 6 251 67q42 50 52 258h31q13 -171 21 -204q17 -67 71 -89t209 -34v-33zM1428 800q-294 -14 -407 -52q-137 -48 -187 -178q-46 -118 -55 -408h-34 q-9 287 -56.5 412.5t-173.5 170.5t-415 55v34q289 11 402 49q134 46 185 175q46 116 57 402h36v-10q0 -262 54 -388q55 -128 199 -178q120 -41 395 -50v-34zM1535 49q-104 -1 -148 -7q-98 -13 -127.5 -49t-41 -96.5t-24.5 -215.5h-29q-11 180 -24 228q-21 77 -84 104 t-231 37v35q175 17 234 40t78 95q11 39 27 228h29q20 -197 28 -229q19 -74 78.5 -97.5t234.5 -36.5v-36zM1716 498q-57 25 -86 83q-29 -56 -92 -83q63 -29 92 -89q29 61 86 89zM1067 817q-243 61 -307 289q-31 -125 -98.5 -192t-192.5 -97q125 -31 193.5 -99.5t99.5 -193.5 q32 128 103 195.5t202 97.5zM1278 70q-71 29 -98 101q-29 -74 -112 -103q81 -30 111 -101q27 73 99 103z" />
+<glyph unicode="✩" horiz-adv-x="1740" d="M1640 909l-436 -383l143 -555l-477 314l-477 -314l125 555l-418 383l565 39l205 496l205 -496zM1570 885l-571 -43l-129 536l-129 -536l-571 43l473 -322l-207 -532l434 381l432 -381l-219 532z" />
+<glyph unicode="✪" horiz-adv-x="1673" d="M1358 1228.5q215 -215.5 215 -520t-215.5 -521t-520 -216.5t-521 214.5t-216.5 521t215.5 522t521.5 215.5t521 -215.5zM1491 930h-500l-156 461l-153 -461h-496l393 -297l-164 -481l420 299l398 -299l-148 481z" />
+<glyph unicode="✫" horiz-adv-x="1781" d="M1681 872l-543 -319l232 -582l-492 391l-479 -391l213 582l-512 319l604 -24l164 596l174 -596zM1030 485.5q63 65.5 63 155t-64.5 153.5t-155 64t-155.5 -63.5t-65 -155t66 -155.5t157 -64t154 65.5z" />
+<glyph unicode="✬" horiz-adv-x="1744" d="M1644 903l-430 -377l143 -555l-483 314l-473 -314l129 555l-430 377l567 43l207 498l207 -498zM1114 641q0 -36 -13 -78l476 318l-568 -43q105 -84 105 -197zM747 842q61 32 128 32t128 -32l-129 534zM1314 29l-215 530q-65 -139 -217 -151zM643 645q0 110 100 193 l-577 43l489 -318q-12 52 -12 82zM874 408q-141 0 -217 151l-211 -530z" />
+<glyph unicode="✭" horiz-adv-x="1763" d="M1663 885l-455 -350l184 -564l-510 334l-506 -334l160 564l-436 350h567l215 559l219 -559h562zM1507 829h-442l-183 467l-180 -467h-446l344 -274l-127 -457l409 273l408 -273l-146 457zM1323 764l-252 -189l114 -339l-303 206l-311 -206l94 339l-239 189h319l137 366 l142 -366h299z" />
+<glyph unicode="✮" horiz-adv-x="1730" d="M1347 -14q0 -13 -16.5 -13t-26.5 19l-436 284l-442 -278q-36 -18 -33 -18q-12 0 -12 14q0 5 6 31l121 520l-381 303q-27 27 -27 29q0 12 41 16l504 51l198 465q15 35 25 35q14 0 23 -35l200 -465l498 -51q12 -1 26.5 -3t14.5 -13l-29 -29l-375 -303l115 -527q6 -27 6 -32 zM1409 817l-391 27l-150 375l-150 -375l-393 -27l299 -231l-108 -426l352 243l342 -243l-102 426zM1204 760l-189 -146l70 -268l-217 160l-227 -160l75 268l-180 146h238l94 239l92 -239h244z" />
+<glyph unicode="✯" horiz-adv-x="1759" d="M1659 889l-453 -340l209 -578l-527 361l-509 -361l198 578l-477 340h590l198 555l195 -555h576zM1548 846h-500l-160 -201zM888 645v696l-170 -495zM1345 61l-184 500l-273 84zM888 645l-682 201l418 -285zM888 377v266l-436 -582z" />
+<glyph unicode="✰" horiz-adv-x="1947" d="M1847 866l-440 -321l186 -541l-272 10l-301 226l-365 -269l-268 54l176 532l-463 352h582l180 535l24 -2l228 -35l170 -498h436zM1556 866h-506l-170 504l-166 -504h-489l391 -288l-166 -492l430 311l414 -311l-154 492z" />
+<glyph unicode="✱" horiz-adv-x="1582" d="M1482 479l-161 -268l-383 238l12 -449h-318l13 449l-385 -238l-160 268l401 230l-401 229l160 268l385 -248l-13 459h318l-12 -459l383 248l161 -268l-403 -229z" />
+<glyph unicode="✲" horiz-adv-x="1537" d="M1437 971l-428 -252l-112 188l424 260zM882 918h-225v499h225v-499zM1437 446l-110 -196l-428 252l110 196zM643 907l-115 -188l-428 252l109 196zM882 0h-225v492h225v-492zM643 502l-424 -252l-117 196l428 252z" />
+<glyph unicode="✳" horiz-adv-x="1591" d="M1491 668l-646 12l476 -438l-64 -66l-442 471l22 -647h-88l21 647l-424 -471l-68 66l463 438l-641 -12v88l641 -19l-477 434l63 66l443 -475l-29 655h94l-20 -655l442 465l64 -64l-476 -432l646 25v-88z" />
+<glyph unicode="✴" horiz-adv-x="1679" d="M1579 713q0 -17 -39 -17l-553 -53l342 -422q18 -18 18 -26q0 -13 -10 -13t-33 23l-411 344l-41 -545q-7 -33 -15 -33q-18 0 -18 39l-55 545l-422 -352q-23 -19 -27 -19q-14 0 -14 15q0 10 20 30l350 418l-536 39q-35 3 -35 16q0 9 39 17l530 53l-354 422q-16 19 -16 27 q0 14 10 14t33 -23l422 -346l43 547q6 31 14 31q12 0 16 -37l60 -547l428 369q19 16 26 16q15 0 15 -14q0 -8 -23 -31l-348 -426l551 -45q33 -3 33 -16z" />
+<glyph unicode="✵" horiz-adv-x="1681" d="M1581 707l-445 -103l238 -399l-17 -17l-387 244l-112 -461h-25l-94 445l-408 -244l-16 16l244 390l-459 108v21l459 102l-244 416l16 16l383 -250l119 453h25l96 -447l414 254l16 -18l-256 -393l453 -111v-22zM1319 1186l-365 -230l-88 -221zM1501 715l-402 94l-221 -94 h623zM845 741v633l-98 -418zM1314 248l-227 356l-213 82zM817 729l-443 447l226 -367zM942 459l-97 219v-633zM807 707l-644 -7l433 -96zM827 686l-457 -461l369 234z" />
+<glyph unicode="✶" horiz-adv-x="1482" d="M1382 1067q0 -6 -25 -25l-391 -335l383 -338q23 -20 23 -23q0 -10 -12 -10q-1 0 -31 10l-467 158l-105 -502q-10 -31 -19 -31t-17 37l-103 496l-473 -158q-37 -18 -37 2q0 3 27 27l379 332l-394 340q-20 17 -20 20q0 12 10 12q-3 0 29 -8l479 -166l109 510q7 31 16 31 q7 0 14 -35l105 -506l483 166q37 13 37 -4z" />
+<glyph unicode="✷" horiz-adv-x="1646" d="M1116 1413l-4 -31l-82 -446l475 84q41 7 41 -8q0 -10 -29 -25l-391 -276l391 -277q29 -21 29 -26q0 -13 -10 -13q-3 0 -33 6l-473 95l90 -465q4 -21 4 -32t-12.5 -11t-26.5 28l-266 377l-268 -379q-26 -26 -25 -26q-10 0 -10 10l88 498l-461 -78q-24 -4 -31 -4 q-12 0 -12 9t31 30l383 258l-381 274l-29 29q0 10 12 10l33 -4l455 -84l-84 453q0 1 -2 15q-6 28 10 28q11 0 25 -29l266 -377l258 371q14 28 26.5 28t12.5 -12z" />
+<glyph unicode="✸" horiz-adv-x="1632" d="M1532 422l-449 39l31 -475l-303 346l-303 -346l34 475l-442 -39l344 301l-344 301l442 -39l-34 447l303 -347l303 347l-31 -447l440 39l-338 -301z" />
+<glyph unicode="✹" horiz-adv-x="1679" d="M1579 709l-363 -111l262 -258l-356 90l104 -356l-290 266l-103 -369l-92 361l-268 -271l92 359l-361 -92l269 276l-373 105l373 102l-269 276l361 -92l-92 361l268 -271l92 359l103 -369l290 266l-104 -356l356 90l-262 -258z" />
+<glyph unicode="✺" horiz-adv-x="1613" d="M100 739h557l-520 205l29 70l512 -217l-400 385l55 55l385 -395l-221 508l72 28l201 -512v551h75l-12 -551l199 512l72 -28l-213 -508l385 395l57 -55l-395 -385l505 217l31 -70l-514 -205l553 11v-80l-553 10l514 -207l-31 -72l-505 226l395 -391l-51 -56l-391 404 l225 -514l-72 -29l-211 520l12 -561h-75l6 561l-199 -520l-74 29l215 514l-385 -404l-55 56l400 391l-512 -226l-29 72l520 207l-557 -10v69z" />
+<glyph unicode="✻" horiz-adv-x="1505" d="M1370.5 1096q34.5 -37 34.5 -91.5t-56 -86.5q-20 -12 -108 -39q-179 -56 -307 -66l184 199q112 121 165 121t87.5 -37zM860 1339q0 -76 -43 -209l-68 -210q-39 81 -78 214t-39 190t33.5 87.5t77.5 30.5q117 0 117 -103zM1346 489q50 -31 50 -85.5t-33.5 -92t-81.5 -37.5 t-173 119l-166 195l297 -64q76 -16 107 -35zM871.5 828.5q51.5 -52.5 51.5 -124t-50.5 -123t-121.5 -51.5t-123.5 51t-52.5 123t50.5 124.5t122.5 52.5t123.5 -52.5zM155 919q-55 32 -55 86t33.5 92t85.5 38t166 -123l184 -199q-137 11 -265.5 52.5t-148.5 53.5zM860 76 q0 -47 -33.5 -75t-81 -28t-80.5 30.5t-33 74.5q0 71 38.5 202.5t78.5 215.5l68 -211q43 -133 43 -209zM397 391q-123 -117 -172 -117t-84 37.5t-35 90t52 82.5q17 10 106 38l299 66z" />
+<glyph unicode="✼" horiz-adv-x="1505" d="M983 709l-6 -54q0 -40 111 -64q170 -35 206 -50q111 -46 111 -140q0 -49 -36.5 -83.5t-86.5 -34.5q-79 0 -204.5 129t-152.5 129q-2 0 -15 -7l-81 -43q-31 -16 -31 -50.5t40 -146t40 -174t-34 -106t-90 -43.5t-92 42.5t-36 106t36 187t36 147.5t-25.5 32t-57.5 32.5 t-40 24.5q-36 0 -152.5 -132t-201.5 -132q-50 0 -84.5 36t-34.5 84q0 90 109 139q41 18 202 56q109 26 109 61l-4 45l6 66q0 40 -110 65q-175 40 -204 52q-110 45 -110 131q0 51 35.5 88t94 37t137.5 -67q28 -25 105 -109t103 -84q12 0 28.5 13t73.5 39q25 11 25 50.5 t-36 147t-36 167t32 104t83.5 44.5t93 -33.5t41.5 -106.5t-37.5 -186t-37.5 -148t25.5 -43t53.5 -31.5t41 -23.5q45 0 127 99q138 166 226 166q50 0 86 -35.5t36 -85.5q0 -90 -109 -139q-43 -19 -203 -57q-109 -26 -109 -60zM855.5 601q43.5 46 43.5 108.5t-45 106.5 t-108 44t-104.5 -46t-41.5 -109t44.5 -106.5t106 -43.5t105 46z" />
+<glyph unicode="✽" horiz-adv-x="1453" d="M1353 995q0 -77 -59 -131q-43 -39 -172 -57.5t-205.5 -36.5t-148.5 -61q117 -60 256 -80l131 -19q84 -12 139 -63.5t55 -132.5q0 -28 -8 -76q-73 -66 -145 -66q-106 0 -199 131q-143 201 -248 261l-2 -29v-13q0 -84 68 -237l43 -96q30 -67 30 -121q0 -154 -157 -197 q-160 45 -160 189q0 46 33 135l31 84q65 176 65 264v21q-103 -60 -254 -271q-86 -121 -178 -121q-71 0 -158 66q-10 70 -10 86q0 153 217 186l111 17q160 24 254 82q-105 60 -276.5 85t-221.5 52q-81 43 -81 138q0 10 1 20l6 75q90 66 156 66t124 -52q33 -31 87 -108 q129 -185 223 -229v45q0 81 -67.5 242t-67.5 212q0 144 166 189q62 -21 108.5 -67.5t46.5 -106t-36 -144.5q-101 -239 -101 -361v-9q33 13 62 39l125 139l61 80q98 129 186 129q71 0 158 -66q12 -52 12 -82z" />
+<glyph unicode="✾" horiz-adv-x="1494" d="M1390 420q0 -35 -3 -80q-131 -72 -207 -72q-113 0 -202 115l-185 240l123 -279q43 -98 43 -147q0 -86 -66 -144q-40 -35 -143 -82q-100 52 -138 86q-68 60 -68 140q0 52 41 147l120 279l-184 -240q-99 -129 -186 -129t-226 86l-8 96q-1 14 -1 27q0 176 249 207l311 39 l-309 34q-141 16 -193 72t-52 179q0 35 3 81q130 92 217.5 92t190.5 -137l188 -250l-123 287q-45 105 -45 160q0 125 213 217q97 -46 137 -81q66 -58 66 -130.5t-39 -165.5l-121 -287l183 250q91 125 200 125q73 0 211 -80l6 -94q1 -12 1 -24q0 -104 -64 -154 q-57 -45 -190 -60l-302 -34l302 -39q145 -19 197.5 -73t52.5 -177zM892 1198q0 147 -144 199q-145 -53 -145 -189q0 -43 29 -125l102 -288h29l102 288q27 76 27 115zM1209 305q67 0 137 55l7 60q0 94 -78 153q-49 37 -142 52l-299 49l-14 -29l197 -231q93 -109 192 -109z M748 752q-47 0 -47 -44t47 -44t47 44t-47 44zM294 305q88 0 184 109l203 231l-19 29l-305 -49q-206 -33 -206 -190q0 -10 1 -21l4 -52q72 -57 138 -57z" />
+<glyph unicode="✿" horiz-adv-x="1748" d="M860 317l4 -45q0 -114 -53 -186q-85 -115 -236 -115q-119 0 -204 85t-85 212t97 207q62 51 143 66q47 0 47 26q0 13 -18 13q-2 0 -59 -21.5t-109 -21.5q-116 0 -201.5 85.5t-85.5 201t84 202t201 86.5q92 0 162 -50q43 -32 83 -88t50 -56t10 10q0 -2 -51.5 75t-51.5 166 q0 115 85 195t199 80t205 -83t91 -194q0 -48 -24 -112.5t-58 -93.5q-25 -25 -16 -46q18 0 35 35q30 62 104.5 105t144.5 43q121 0 208 -82t87 -198.5t-80 -205t-186.5 -88.5t-151.5 31q-26 18 -38.5 18t-12.5 -12q0 -20 45 -26q97 -12 168.5 -96t71.5 -192.5t-82.5 -192 t-207 -83.5t-207.5 86.5t-83 216.5l4 43q0 25 -14 25t-14 -25zM1049.5 488.5q72.5 72.5 72.5 174t-72.5 174t-175.5 72.5t-176.5 -72t-73.5 -174.5t73.5 -174.5t176.5 -72t175.5 72.5z" />
+<glyph unicode="❀" horiz-adv-x="1726" d="M1551 1001q75 -80 75 -196t-77.5 -189.5t-196.5 -73.5q-14 0 -29 1l-146 12q273 -148 273 -324q0 -102 -80.5 -181t-182.5 -79q-260 0 -317 377q-18 -92 -32.5 -143t-45.5 -99q-86 -135 -227 -135q-111 0 -191.5 79.5t-80.5 188.5t80 190q51 52 176 122l-117 -6 q-12 -1 -23 -1q-119 0 -209 66q-100 71 -100 194t75.5 200t190.5 77q137 0 305 -168q-73 180 -73 280.5t71 175.5t183.5 75t193 -73.5t80.5 -178.5t-76 -268q176 157 320 157q106 0 181 -80zM1241 594q105 0 184.5 55t79.5 148t-58 145.5t-143 52.5q-183 0 -274 -161l51 -62 l164 39q20 5 33 5q24 0 24 -17t-45 -37l-151 -68v-82q79 -18 135 -18zM974 872q80 110 80 212.5t-51 169.5t-146.5 67t-143.5 -70.5t-48 -174.5t80 -204l76 27l14 170q4 51 23 51q11 0 24 -51l27 -170zM1341 276q0 97 -77.5 171.5t-178.5 99.5l-41 -58l90 -143 q23 -28 23 -45.5t-17 -17.5q-11 0 -45 34l-118 119l-68 -24q-2 -16 -2 -33q0 -109 72 -200t178 -91q75 0 129.5 57t54.5 131zM419 991q-81 0 -138.5 -55t-57.5 -143.5t84 -148.5t186 -60q40 0 131 26v82l-153 64q-52 15 -52 36q0 15 26 15q14 0 34 -4l166 -31l45 59 q-108 160 -271 160zM606 281q-14 0 -14 14t16 43l84 151l-47 60q-242 -86 -242 -277q0 -73 56.5 -128.5t129.5 -55.5q103 0 174 91t71 197q0 19 -3 36l-74 24l-116 -127q-21 -28 -35 -28z" />
+<glyph unicode="❁" horiz-adv-x="1673" d="M1573 709q0 -191 -205 -230q51 -82 51 -133q0 -78 -66 -150.5t-143 -72.5q-55 0 -149 49q-19 -90 -80 -145.5t-149 -55.5t-146.5 58.5t-69.5 144.5q-84 -53 -135 -53q-94 0 -162.5 68.5t-68.5 162.5q0 48 55 133q-85 11 -145 72t-60 145q0 186 205 228q-53 93 -53 139 q0 89 65 154t154 65q58 0 145 -53q11 96 71.5 152.5t151.5 56.5t150.5 -59t64.5 -146q82 53 136 53q98 0 165.5 -65.5t67.5 -163.5q0 -54 -55 -135q88 -13 146.5 -73t58.5 -146zM1370 1075q0 65 -50.5 113.5t-115.5 48.5q-117 0 -174 -131l-80 -184l18 -13l109 170 q55 86 123 86q47 0 74.5 -30t27.5 -76q0 -65 -88 -119l-172 -106l10 -21l187 84q131 59 131 178zM1005 1221q0 70 -50.5 121t-122 51t-117.5 -54t-46 -129q0 -33 19 -86l67 -186l25 8l-39 191q-6 28 -6 52q0 44 19 77q28 53 81 53q80 0 105 -82q5 -16 5 -36q0 -27 -9 -62 l-50 -197l25 -6l72 188q22 57 22 97zM1521 700q0 76 -52 125t-130 49q-28 0 -84 -22l-188 -74l4 -22l200 43q28 6 53 6q42 0 74 -17q50 -28 50 -93t-72 -93q-19 -7 -43.5 -7t-54.5 7l-205 49l-6 -24l192 -74q55 -21 94.5 -21t79.5 23q88 51 88 145zM469 1241q-66 0 -116 -50 t-50 -116q0 -117 127 -174l182 -82l12 23l-172 100q-84 49 -84 119q0 42 31.5 75t73.5 33q79 0 127 -84l98 -172l27 15l-80 182q-58 131 -176 131zM966 576q54 54 54 130.5t-54.5 131.5t-131 55t-131 -53.5t-54.5 -130.5t54 -132t131.5 -55t131.5 54zM1368 352 q0 106 -123 158l-195 82l-10 -21l178 -106q80 -48 80 -121q0 -38 -32.5 -70t-71.5 -32q-71 0 -119 80l-107 178l-22 -15l86 -186q57 -123 166 -123q73 0 121.5 51.5t48.5 124.5zM1007 195q0 34 -20 86l-74 192l-22 -4l45 -201q6 -26 6 -50q0 -122 -111 -122q-71 0 -98 76 q-5 15 -5 35q0 24 7 55l47 205l-25 8l-71 -192q-19 -52 -19 -96t29 -83q61 -81 134 -81t125 50.5t52 121.5zM413 854q-55 20 -96.5 20t-85.5 -24q-80 -45 -80 -145q0 -72 51.5 -119t122.5 -47q30 0 82 20l193 74l-4 24l-203 -51q-33 -8 -60 -8q-36 0 -61 14q-47 34 -47 93 q0 79 78 102q17 5 39 5q25 0 57 -7l197 -43l6 22zM473 242q-44 0 -73.5 31.5t-29.5 76.5q0 67 84 119l170 106l-8 21l-190 -82q-125 -54 -125 -164q0 -72 48 -124t120 -52q113 0 170 125l86 188l-25 15l-113 -180q-50 -80 -114 -80z" />
+<glyph unicode="❂" horiz-adv-x="1673" d="M1357 1228.5q216 -215.5 216 -520t-215 -521t-520 -216.5t-521.5 215.5t-216.5 521.5t215.5 521t520.5 215t521 -215.5zM1347 1219l-342 -140q139 -73 201 -205zM696 1090q61 24 145.5 24t137.5 -24l-142 335zM1218 850q25 -82 25 -153.5t-25 -135.5l336 144zM675 1079 l-337 148l131 -353q64 148 206 205zM1083 457q104 101 104 246t-101 251.5t-247 106.5t-251 -100.5t-105 -247t102 -252t248 -105.5t250 101zM1343 193l-135 339q-70 -134 -203 -196zM458 561q-26 85 -26 144.5t26 144.5l-333 -145zM981 328q-72 -25 -141 -25t-144 25 l143 -342zM667 336q-135 73 -194 196l-131 -339z" />
+<glyph unicode="❃" horiz-adv-x="1509" d="M1409 965q0 -115 -164 -170q-114 -38 -303 -68l-115 -18l100 -17q106 -17 303 -63q177 -56 177 -174q0 -56 -13 -115q-106 -96 -172 -96q-83 0 -234 162q-14 14 -198 235q144 -341 144 -481q0 -85 -48 -126q-28 -25 -127 -63q-97 33 -131 58q-59 44 -59 127.5t55 242.5 l94 242l-94 -117q-223 -278 -336 -278q-59 0 -172 94q-16 72 -16 111q0 117 154 167l309 68l123 23l-357 69q-229 44 -229 191q0 40 16 108q97 97 164 97q118 0 344 -281l94 -117l-94 244q-55 159 -55 241.5t60 126.5q38 27 130 56q101 -38 128 -61q47 -41 47 -128 q0 -138 -144 -479l198 237q150 161 236 161q63 0 170 -97q15 -67 15 -112zM1247 1126q-94 0 -237 -151l-193 -230l530 310q-49 71 -100 71zM648.5 1358q-32.5 -33 -32.5 -118.5t52 -227.5l91 -226v613q-78 -8 -110.5 -41zM1372 449q0 108 -229 171q-76 21 -322 58l530 -303 q21 50 21 74zM133 975q0 -128 356 -195l197 -32l-531 307q-22 -53 -22 -80zM893 160q0 152 -134 473v-610q134 6 134 137zM266 299q153 0 424 381l-529 -307q49 -74 105 -74z" />
+<glyph unicode="❄" horiz-adv-x="1460" d="M1360 389l-50 -74l-196 117l8 -217l-61 21l-19 241l-278 166v-328l210 -139l-26 -61l-184 121l4 -236h-78l4 236l-184 -121l-27 61l211 139v328l-277 -166l-20 -241l-61 -21l8 217l-197 -117l-47 74l203 115l-195 94l39 55l225 -110l293 166l-293 163l-225 -108l-39 55 l195 92l-203 117l47 72l197 -117l-8 219l61 -20l20 -244l277 -166v328l-211 141l27 62l184 -121l-4 235h78l-4 -235l184 121l26 -62l-210 -141v-328l278 166l19 244l61 20l-8 -219l196 117l50 -72l-203 -117l192 -92l-39 -55l-225 108l-293 -163l293 -166l225 110l39 -55 l-192 -94z" />
+<glyph unicode="❅" horiz-adv-x="1482" d="M1353 420q29 -15 29 -20.5t-14 -20.5l-19 -21q-19 -45 -24 -45q-12 0 -29 17l-242 147v-315l-276 155l14 -278l1 -27q0 -11 -18 -11q-5 0 -11 1l-29 4l-17 -2q-15 -3 -24 -3q-14 0 -14 7v31l18 278l-272 -155v315l-238 -147q-28 -17 -32.5 -17t-12.5 23l-10 22l-13 13 q-20 27 -20 30.5t10 8.5l271 141l-267 158l267 153l-252 129q-29 15 -29 22t12 19l15 21l4 14q10 31 18 31q12 0 29 -17l248 -145v311l272 -155l-18 286q-1 8 -1 21q-1 13 3 15q2 1 6 1q7 0 18 -2l25 -4l18 2q35 7 35 -4v-29l-6 -284l276 153v-311l234 158q18 18 29 18 q5 0 14 -22l10 -25l12 -12q21 -31 21 -29q0 -6 -29 -23l-244 -139l269 -153l-269 -158zM1015 920v258l-235 -134v-270zM1286 709l-232 127l-239 -127l239 -134zM698 774v270l-231 134v-269zM1015 233v271l-235 137v-276zM657 709l-231 127l-230 -127l230 -134zM698 365v276 l-231 -137v-271z" />
+<glyph unicode="❆" horiz-adv-x="1470" d="M1370 549l-193 -68l185 -104l-31 -47l-184 106l45 -200l-109 -19l-98 322l-223 123v-252l223 -250l-64 -88l-159 145l8 -217h-72l10 217l-162 -145l-61 88l223 250v252l-223 -123l-98 -322l-111 19l45 200l-184 -106l-29 47l185 104l-193 68l37 102l330 -73l217 131 l-217 131l-330 -74l-37 102l193 68l-185 104l29 47l184 -108l-45 201l111 18l98 -319l223 -125v252l-223 249l61 91l162 -148l-10 219h72l-8 -219l159 148l64 -91l-223 -249v-252l223 125l98 319l109 -18l-45 -201l184 108l31 -47l-185 -104l193 -68l-39 -102l-328 74 l-219 -131l219 -131l328 73z" />
+<glyph unicode="❇" horiz-adv-x="1668" d="M1462 1268l-451 -416q-30 0 -35 4.5t-4 32.5l420 448q20 -47 70 -69zM729 1288l-2 71q0 39 19 55t87 30q64 -17 72 -21q31 -17 31 -61v-84q-6 -69 -13.5 -142.5t-25.5 -129.5q0 -10 -28.5 -78t-41.5 -68q-25 0 -78 184q-20 69 -20 244zM1484 600h-81l-137 12 q-80 9 -136 27q-9 0 -77 28.5t-68 41.5q0 24 184 77q73 21 244 21q16 0 38.5 0.5t30.5 0.5q40 0 56 -18.5t30 -87.5q-16 -63 -21 -72q-17 -30 -63 -30zM1462 147q-45 -24 -70 -71l-415 448q-2 29 2 35t32 6zM688 889q3 -27 -2.5 -32t-34.5 -5l-457 416q48 21 72 69zM950 709 q0 -51 -36 -87t-87 -36t-87 36t-36 87t36 86.5t87 35.5t87 -35.5t36 -86.5zM185 811l71 -2q91 -1 143 -4t100 -17q185 -53 185 -79q0 -15 -146 -70q-86 -26 -272 -35l-82 -4h-5q-41 0 -58 30q-4 8 -21 75q14 68 30 87t55 19zM729 56l2 71q0 175 20 244q53 184 78 184 q12 0 41 -67t29 -76q37 -114 37 -275v-82q0 -44 -30 -61q-6 -4 -71 -23q-68 14 -87 30t-19 55zM692 522l-420 -446q-22 46 -68 71l449 418q10 1 17 1q13 0 16 -4q4 -6 6 -40z" />
+<glyph unicode="❈" horiz-adv-x="1668" d="M1470 1309l-407 -410l-45 39l405 414zM1374 537q-50 0 -111 28l-178 97q-63 34 -63 46t20 19l161 97q100 59 171 59q146 0 194 -174q-24 -88 -65 -130t-129 -42zM1005 1253q0 -72 -80 -209l-45 -77q-42 -72 -51 -72q-6 0 -29 41l-59 104q-82 145 -82 201q0 167 178 203 q168 -45 168 -191zM651 938l-45 -39l-404 410l43 43zM1480 119l-43 -43l-413 401l41 47zM951.5 828q49.5 -49 49.5 -119.5t-49 -120t-118.5 -49.5t-119 49.5t-49.5 119t48 119.5t118.5 50t120 -49zM649 707q0 -2 -37 -27l-153 -90q-91 -51 -166 -51q-151 0 -193 170 q43 176 186 176q75 0 166 -52l136 -85q61 -39 61 -41zM1007 170q0 -142 -176 -199q-170 53 -170 201q0 68 50 150l96 157q29 43 30 43q23 0 39 -63q1 -1 83 -136q48 -78 48 -153zM651 477l-410 -401l-45 43l410 405z" />
+<glyph unicode="❉" horiz-adv-x="1517" d="M1364.5 560.5q52.5 -53.5 52.5 -127.5t-51.5 -124.5t-126.5 -50.5t-128 53.5t-53 128.5q0 14 9 54l-273 155v-319q62 -20 104 -67t42 -116t-52.5 -122.5t-129.5 -53.5t-128 53t-51 121.5t42 117t102 67.5v319l-273 -155q10 -33 10 -64q0 -68 -54 -120t-125.5 -52 t-126 47.5t-54.5 122t51 130.5t130 56t138 -65l269 160l-269 157q-62 -65 -137.5 -65t-128.5 54t-53 128t52 124t127.5 50t128 -52.5t52.5 -127.5q0 -26 -10 -53l273 -158v321q-61 18 -102.5 66t-41.5 117t51.5 121.5t128.5 52.5t129 -52.5t52 -121.5t-42.5 -117t-103.5 -66 v-321l273 158q-9 30 -9 61q0 69 53.5 120.5t126 51.5t126 -47.5t53.5 -122t-50 -129.5t-129 -55t-139 63l-268 -157l268 -160q62 65 137.5 65t128 -53.5z" />
+<glyph unicode="❊" horiz-adv-x="1677" d="M1355.5 1234q26.5 -28 26.5 -68.5t-30 -68.5q-8 -7 -68 -46l-250 -160l-21 20l162 254q38 59 45 67q28 30 68.5 30t67 -28zM1548 772q29 -27 29 -62.5t-28.5 -63.5t-58.5 -28t-87 13l-295 67v29l295 59q65 13 79 13q37 0 66 -27zM931 1350q0 -5 -16 -80l-63 -295h-29 l-74 338q-5 22 -5 40t5 31q21 60 84 60q39 0 68.5 -28t29.5 -66zM288 1165q0 40 27.5 66t68 26t68.5 -30q6 -7 43 -64l164 -254l-16 -18l-256 160q-55 35 -66 44q-33 30 -33 70zM1357 319q29 -27 29 -66.5t-27 -67t-71 -27.5t-76 49l-197 305l19 16l260 -166q54 -35 63 -43z M974 845q58 -56 58 -136.5t-55.5 -139.5t-136.5 -59t-139 57t-58 138t56 138.5t136.5 57.5t138.5 -56zM934 61q0 -36 -30.5 -63t-66 -27t-64 28.5t-28.5 61.5q0 12 14 80l62 301h29l69 -301q15 -65 15 -80zM100 709q0 37 28 60.5t66 23.5l375 -66v-29l-342 -84 q-19 -5 -34 -5q-19 0 -34 7q-59 26 -59 93zM379 164q-37 0 -63 25.5t-26 63.5t30 66q9 8 63 43l256 166l20 -16l-188 -293q-35 -55 -92 -55z" />
+<glyph unicode="❋" horiz-adv-x="1664" d="M1564 709q0 -107 -116 -107q-20 0 -86 10l-371 56l-19 -47l351 -234q69 -46 69 -101t-31.5 -92.5t-82 -37.5t-85.5 30q-18 15 -59 72l-221 305l-41 -18l74 -408q5 -27 5 -48.5t-5 -37.5q-24 -80 -106 -80t-117 68q-12 23 -12 54q0 15 3 32l76 420l-45 18l-215 -297 q-80 -110 -129 -110t-82 32t-33 77q0 77 93 141l309 215l-19 45l-364 -52q-84 -12 -90 -12q-115 0 -115 107q0 52 37 87t88 35q21 0 82 -12l362 -71l19 43l-303 200q-62 41 -78 57q-35 36 -35 87t36.5 83.5t83 32.5t83.5 -38q10 -10 55 -72l215 -293l45 20l-74 410 q-6 30 -6 52q0 18 4 30q23 84 111 84q51 0 85 -38t34 -89q0 -25 -10 -84l-62 -365l41 -20l234 340q54 78 122 78q47 0 81 -38t34 -93.5t-65 -100.5l-347 -241l19 -45l366 71q62 12 86 12q49 0 85 -35t36 -87z" />
+<glyph unicode="❌" horiz-adv-x="1373" d="M1273 1121l-416 -415l414 -415l-169 -169l-414 415l-414 -415l-174 174l415 414l-415 414l169 169l415 -414l415 416z" />
+<glyph unicode="❍" horiz-adv-x="1845" d="M346 1250q231 194 573.5 194t584 -199.5t241.5 -537.5t-253 -544q-235 -192 -579.5 -192t-578.5 201.5t-234 536.5t246 541zM1493 705q0 274 -194.5 469.5t-469.5 195.5t-471.5 -191t-196.5 -467t195.5 -472.5t471.5 -196.5t470.5 194t194.5 468z" />
+<glyph unicode="❎" horiz-adv-x="1613" d="M1513 0h-1413v1417h1413v-1417zM1393 1121l-174 174l-415 -416l-415 414l-169 -169l415 -414l-415 -414l174 -174l414 415l414 -415l169 169l-414 415z" />
+<glyph unicode="❏" horiz-adv-x="1617" d="M1517 0h-1198v217h-219v1200h1194v-213h223v-1204zM1237 274v1082h-1078v-1082h1078z" />
+<glyph unicode="❐" horiz-adv-x="1617" d="M1517 213h-223v-213h-1194v1200h219v217h1198v-1204zM1237 61v1082h-1078v-1082h1078z" />
+<glyph unicode="❑" horiz-adv-x="1613" d="M1513 0h-1171l-242 236v1181h1165l248 -243v-1174zM1253 252v1100h-1090v-1100h1090z" />
+<glyph unicode="❒" horiz-adv-x="1613" d="M100 0v1182l242 235h1171v-1173l-248 -244h-1165zM1253 66v1099h-1090v-1099h1090z" />
+<glyph unicode="❓" horiz-adv-x="1439" d="M1339 994q0 -173 -129 -301q-21 -21 -235 -177q-118 -86 -118 -166v-8h-395q0 171 121 309q57 66 224 190q121 90 121 142q0 68 -78 101q-57 24 -151.5 24t-284 -49.5t-314.5 -102.5v387q104 44 299 80.5t315 36.5q234 0 415 -113q210 -132 210 -353zM885 -2 q0 -93 -66.5 -159.5t-159.5 -66.5t-159 66.5t-66 159.5t66 159.5t159 66.5t159.5 -66.5t66.5 -159.5z" />
+<glyph unicode="❔" horiz-adv-x="1439" d="M1339 994q0 -173 -129 -301q-21 -21 -235 -177q-118 -86 -118 -166v-8h-395q0 171 121 309q57 66 224 190q121 90 121 142q0 68 -78 101q-57 24 -151.5 24t-284 -49.5t-314.5 -102.5v387q104 44 299 80.5t315 36.5q234 0 415 -113q210 -132 210 -353zM885 -2 q0 -93 -66.5 -159.5t-159.5 -66.5t-159 66.5t-66 159.5t66 159.5t159 66.5t159.5 -66.5t66.5 -159.5zM1239 994q0 176 -183 280q-152 86 -342 86q-237 0 -514 -87v-174q329 109 514 109q123 0 209 -50q105 -61 105 -175q0 -86 -100 -173l-200 -157q-120 -102 -152 -211h199 q37 85 163 172q172 120 202 150q99 98 99 230zM785 -2q0 51 -37.5 88.5t-88.5 37.5t-88 -37.5t-37 -88.5t37 -88.5t88 -37.5t88.5 37.5t37.5 88.5z" />
+<glyph unicode="❕" horiz-adv-x="825" d="M725 1469l-140 -1127h-345l-140 1127h625zM638 -2q0 -93 -66.5 -159.5t-159.5 -66.5t-159 66.5t-66 159.5t66 159.5t159 66.5t159.5 -66.5t66.5 -159.5zM612 1369h-399l115 -927h169zM538 -2q0 51 -37.5 88.5t-88.5 37.5t-88 -37.5t-37 -88.5t37 -88.5t88 -37.5 t88.5 37.5t37.5 88.5z" />
+<glyph unicode="❖" horiz-adv-x="1662" d="M1562 700l-329 -290l-304 303l308 307zM1134 1114l-303 -303l-305 305l305 328zM731 713l-305 -303l-326 303l322 307zM1140 307l-309 -336l-305 336l305 307z" />
+<glyph unicode="❗" horiz-adv-x="840" d="M681 1255q0 -199 -223 -964h-76q-34 105 -101 359q-122 463 -122 605q0 112 75 190.5t186 78.5t186 -78.5t75 -190.5zM589 78q70 -69 70 -166t-72 -168t-167 -71t-167 71t-72 166t72 166t169 71t167 -69z" />
+<glyph unicode="❘" horiz-adv-x="341" d="M241 0h-141v1417h141v-1417z" />
+<glyph unicode="❙" horiz-adv-x="624" d="M524 0h-424v1417h424v-1417z" />
+<glyph unicode="❚" horiz-adv-x="907" d="M807 0h-707v1417h707v-1417z" />
+<glyph unicode="❛" horiz-adv-x="862" d="M675 1043q87 -86 87 -213t-97 -210t-243 -83t-234 103.5t-88 257.5q0 255 144.5 400.5t464.5 145.5l18 -49q-255 0 -381 -121q-61 -58 -61 -113.5t55 -55.5q-3 0 43.5 12t87.5 12q117 0 204 -86z" />
+<glyph unicode="❜" horiz-adv-x="862" d="M762 1083q0 -255 -144.5 -400.5t-464.5 -145.5l-18 49q255 0 381 121q61 58 61 113.5t-55 55.5q3 0 -43.5 -12t-87.5 -12q-117 0 -204 86t-87 213t97 210t243 83t234 -103.5t88 -257.5z" />
+<glyph unicode="❝" horiz-adv-x="1425" d="M1234 1068.5q91 -92.5 91 -223t-92 -218.5t-224 -88q-203 0 -291 211q-28 -90 -109.5 -150t-176.5 -61h-3q-148 0 -238 105q-91 106 -91 259q0 230 175 390q166 151 381 151h24l41 -51h-11q-136 0 -264 -71q-133 -73 -174 -200q78 39 145 39q184 0 279 -164 q50 200 200.5 323.5t354.5 123.5h18l41 -51h-10q-130 0 -264 -73q-139 -76 -174 -198q78 39 151 39q130 0 221 -92.5z" />
+<glyph unicode="❞" horiz-adv-x="1425" d="M1325 1079q0 -229 -175 -389q-167 -151 -383 -151h-22l-41 51h11q136 0 264 70q133 73 174 200q-82 -41 -146 -41q-180 0 -280 166q-48 -200 -199.5 -323t-355.5 -123h-17l-41 51h7q134 0 267 74q138 75 173 196q-81 -37 -150 -37q-130 0 -220.5 92t-90.5 222.5 t91.5 218.5t221.5 88q208 0 291 -211q29 91 111.5 151t177.5 60q150 0 241 -106t91 -259z" />
+<glyph unicode="❟" horiz-adv-x="862" d="M762 112q0 -255 -144.5 -400.5t-464.5 -145.5l-18 49q255 0 381 121q61 58 61 113.5t-55 55.5q3 0 -43.5 -12t-87.5 -12q-117 0 -204 86t-87 213t97 210t243 83t234 -103.5t88 -257.5z" />
+<glyph unicode="❠" horiz-adv-x="1425" d="M1325 108q0 -229 -175 -389q-167 -151 -383 -151h-22l-41 51h11q136 0 264 70q133 73 174 200q-82 -41 -146 -41q-180 0 -280 166q-48 -200 -199.5 -323t-355.5 -123h-17l-41 51h7q134 0 267 74q138 75 173 196q-81 -37 -150 -37q-130 0 -220.5 92t-90.5 222.5 t91.5 218.5t221.5 88q208 0 291 -211q29 91 111.5 151t177.5 60q150 0 241 -106t91 -259z" />
+<glyph unicode="❡" horiz-adv-x="1556" d="M1126 1257h-31v-696q0 -409 -56.5 -569t-169.5 -257.5t-260 -97.5t-249 84t-102 221q0 97 64.5 168.5t160.5 71.5q65 0 117.5 -46t52.5 -106t-32 -98.5t-87 -38.5q-69 0 -69 -60t57 -94t121 -34q119 0 201 86t120 211.5t43 431.5l-350 -27q-19 -1 -39 -1q-192 0 -340 110 q-178 133 -178 356q0 135 66.5 244t190 170t488.5 61h162v213l88 21v-234h361l-37 -53q-88 -37 -293 -37zM1009 1255h-194q-31 -223 -31 -327.5t4 -159.5l19 -238q110 -53 202 -61v786z" />
+<glyph unicode="❢" horiz-adv-x="1085" d="M985 1151q0 -91 -49 -170q-32 -52 -61 -73t-116 -59t-137.5 -87t-79.5 -152q-29 103 -78.5 151.5t-136 86.5t-114 56.5t-58.5 64.5q-55 82 -55 194q0 178 131 241q88 42 305.5 42t301.5 -35q147 -60 147 -260zM748 468q85 -85 85 -205.5t-85 -206t-205.5 -85.5 t-205.5 85.5t-85 206t85 205.5t205.5 85t205.5 -85z" />
+<glyph unicode="❣" horiz-adv-x="1171" d="M585 1202q26 99 90 170.5t166 71.5t166 -80.5t64 -189t-43.5 -188t-161.5 -130.5q-223 -96 -281 -248q-34 93 -100.5 146t-153 91t-115.5 58t-59 66q-57 86 -57 196.5t62 194.5t180 84q91 0 157 -73t86 -169zM792.5 468q85.5 -85 85.5 -205.5t-85.5 -206t-206 -85.5 t-205 85.5t-84.5 206t85 205.5t205 85t205.5 -85z" />
+<glyph unicode="❤" horiz-adv-x="1920" d="M1820 909q0 -149 -81 -265.5t-220 -166.5l-129 -47q-334 -122 -430 -348q-95 225 -432 348l-129 47q-129 47 -214 163t-85 267q0 185 115 305.5t288.5 120.5t293 -100.5t163.5 -261.5q50 164 165 263t289.5 99t290 -120t115.5 -304z" />
+<glyph unicode="❥" horiz-adv-x="1425" d="M1251 651q-147 0 -272 -119q-91 -86 -160 -276q-105 -285 -363 -285q-148 0 -252 106.5t-104 247.5t89 241.5t222 125.5v33q-132 23 -221.5 124.5t-89.5 244.5t108.5 246.5t256.5 103.5t251 -105q51 -52 122 -229.5t175 -253.5q123 -90 238 -90h45l29 4v-123l-29 4h-45z " />
+<glyph unicode="❦" horiz-adv-x="1808" d="M1748 1292q0 -136 -151.5 -244.5t-293.5 -108.5q-92 0 -208 52l-147 -322q-7 15 -7 45q0 134 76 313l-300 180q-203 118 -299.5 118t-164 -64.5t-67.5 -149.5q0 -47 29.5 -89.5t29.5 -49.5q0 -30 -33 -56.5t-64 -26.5q-88 0 -88 102q0 142 137 283t269.5 141t307.5 -129 l-10 76q81 92 171 92t147 -74.5t57 -168.5q0 -50 -20 -141q111 -71 230 -71q72 0 131.5 43t59.5 106t-39 96t-39 58q0 65 38.5 111t103.5 46t104.5 -50t39.5 -117zM1552 523q0 -180 -152 -299q-33 -25 -282 -157q-152 -81 -152 -169q0 -54 41 -92.5t95 -38.5q155 0 193 162 q4 22 8.5 43t18 34.5t51.5 13.5t71 -23.5t33 -63.5q0 -108 -143 -175q-116 -53 -239 -53q-301 0 -528.5 219t-227.5 519q0 181 78 304q92 146 263 146q110 0 178 -83q63 -75 63 -174q0 -10 -1 -20l23 -9q127 221 320 221q126 0 207.5 -89t81.5 -216zM1029 1090q14 42 14 100 t-38 118t-100 60q-80 0 -80 -87q0 -94 204 -191z" />
+<glyph unicode="❧" d="M2024 544q0 -48 -31 -102q-119 -209 -310.5 -322.5t-412.5 -113.5t-386 80q-208 100 -208 281q0 142 168 227q-76 136 -267 137q2 -134 -115 -254q-98 -99 -241 -158q23 -112 133 -112q67 0 117 48l4 -46q3 -29 3 -47q0 -69 -46.5 -106.5t-128.5 -37.5t-146.5 67 t-70.5 161q-30 4 -62 18q15 69 59 116q4 146 128.5 260.5t276.5 143.5q-29 59 -136 79q-138 25 -163 40q-70 42 -70 129q0 155 207 159q-38 -30 -38 -80q0 -67 129.5 -158t157.5 -167q28 4 52 4q126 0 257 -116l5 6q-48 90 -48 167q0 109 80.5 174.5t191.5 65.5t194 -52 q148 -93 199 -246q11 -31 45 -252q20 -132 94 -175q31 -18 86 -18t98.5 42.5t43.5 97t-22 94.5q32 54 86 54q87 0 87 -88zM514 690q0 21 -6 40q-115 -5 -206.5 -94.5t-91.5 -203.5v-14q105 33 193 100q111 84 111 172z" />
+<glyph unicode="❨" horiz-adv-x="948" d="M49 582q0 409 209 653.5t612 301.5l29 -41q-234 -52 -384 -303.5t-150 -610.5t150 -610.5t384 -303.5l-29 -41q-403 57 -612 301.5t-209 653.5z" />
+<glyph unicode="❩" horiz-adv-x="870" d="M860 582q0 -409 -209 -653.5t-612 -301.5l-29 41q234 52 384 303.5t150 610.5t-150 610.5t-384 303.5l29 41q403 -57 612 -301.5t209 -653.5z" />
+<glyph unicode="❪" horiz-adv-x="815" d="M82 582q0 488 356 920h295q-229 -412 -229 -920t229 -920h-295q-356 432 -356 920z" />
+<glyph unicode="❫" horiz-adv-x="779" d="M715 582q0 -488 -356 -920h-295q229 412 229 920t-229 920h295q356 -432 356 -920z" />
+<glyph unicode="❬" horiz-adv-x="692" d="M629 -367h-291l-275 949l275 949h291l-277 -949z" />
+<glyph unicode="❭" horiz-adv-x="692" d="M629 582l-275 -949h-291l277 949l-277 949h291z" />
+<glyph unicode="❮" horiz-adv-x="1053" d="M1016 -131h-398l-581 713l581 713h398l-584 -713z" />
+<glyph unicode="❯" horiz-adv-x="1053" d="M1016 582l-581 -713h-398l584 713l-584 713h398z" />
+<glyph unicode="❰" horiz-adv-x="1128" d="M1032 -367h-661l-275 949l275 949h661l-276 -949z" />
+<glyph unicode="❱" horiz-adv-x="1128" d="M1032 582l-275 -949h-661l276 949l-276 949h661z" />
+<glyph unicode="❲" horiz-adv-x="651" d="M545 -336l-60 -33l-379 228v1446l379 228l60 -33l-301 -221v-1394z" />
+<glyph unicode="❳" horiz-adv-x="487" d="M463 -141l-379 -228l-60 33l301 221v1394l-301 221l60 33l379 -228v-1446z" />
+<glyph unicode="❴" horiz-adv-x="1024" d="M549 -378q-162 0 -218.5 72.5t-56.5 300t-1 251.5q-10 164 -55 227q-56 77 -200 93v32q144 16 200 93q45 63 55 227q1 24 1 251.5t56.5 300t218.5 72.5h457l-1 -57q-136 -5 -185.5 -48t-49.5 -273t-1 -251q-9 -170 -54 -231q-57 -78 -199 -100q142 -22 199 -100 q45 -61 54 -231q1 -21 1 -251t49.5 -273t185.5 -48l1 -57h-457z" />
+<glyph unicode="❵" horiz-adv-x="1024" d="M751 246q-1 -24 -1 -251.5t-56.5 -300t-218.5 -72.5h-457l1 57q136 5 185.5 48t49.5 273t1 251q9 170 54 231q57 78 199 100q-142 22 -199 100q-45 61 -54 231q-1 21 -1 251t-49.5 273t-185.5 48l-1 57h457q162 0 218.5 -72.5t56.5 -300t1 -251.5q10 -164 55 -227 q56 -77 200 -93v-32q-144 -16 -200 -93q-45 -63 -55 -227z" />
+<glyph unicode="❶" d="M1998 582q0 -406 -284 -690t-690 -284t-690 284t-284 690t284 690t690 284t690 -284t284 -690zM1355 17v75h-152q-60 0 -60 61v992h-59q-170 -92 -391 -106v-72h172q63 0 63 -54v-736q0 -85 -83 -85h-119v-75h629z" />
+<glyph unicode="❷" d="M1998 582q0 -406 -284 -690t-690 -284t-690 284t-284 690t284 690t690 284t690 -284t284 -690zM1194 227h-374q72 80 243.5 205.5t232.5 199.5q90 112 90 245t-102 214t-249 81t-250.5 -84.5t-103.5 -231.5q0 -75 33.5 -133t96.5 -58t101 36.5t38 93t-43 84.5 q-9 5 -81 31q-43 16 -43 44q0 60 61.5 96.5t125.5 36.5q170 0 170 -210q0 -136 -95 -286q-58 -91 -205 -255t-197 -244v-69h737l25 389h-82q-14 -86 -31 -122q-31 -63 -98 -63z" />
+<glyph unicode="❸" d="M1998 582q0 -406 -284 -690t-690 -284t-690 284t-284 690t284 690t690 284t690 -284t284 -690zM891 564l91 12q171 0 171 -252.5t-195 -252.5q-49 0 -107 24t-58 65q0 15 55.5 55t55.5 94t-34.5 86.5t-92.5 32.5t-92 -45t-34 -112q0 -139 110 -213q95 -65 252 -65t263 76 q121 87 121 249q0 236 -267 307q224 91 224 267q0 136 -103.5 208t-236.5 72t-227 -67.5t-94 -186.5q0 -57 33 -98.5t85.5 -41.5t86 32t33.5 81t-45.5 89t-45.5 54q0 58 114 58q174 0 174 -217.5t-155 -217.5l-73 6q-56 0 -56 -49.5t47 -49.5z" />
+<glyph unicode="❹" d="M1998 582q0 -406 -284 -690t-690 -284t-690 284t-284 690t284 690t690 284t690 -284t284 -690zM1360 296v90h-161v782h-76l-553 -762v-110h416v-112q0 -74 -55 -89q-13 -3 -116 -3v-75h505v75q-64 0 -81 5q-40 13 -40 61v138h161zM986 386h-335l335 464v-464z" />
+<glyph unicode="❺" d="M1998 582q0 -406 -284 -690t-690 -284t-690 284t-284 690t284 690t690 284t690 -284t284 -690zM1278.5 101q115.5 108 115.5 280.5t-106 278.5t-270 106q-96 0 -215 -54l17 223q96 -16 177 -16q192 0 278 123q42 60 42 114q0 16 -12 16q-4 0 -34 -10q-79 -26 -202 -26 t-307 37l-35 -519q-42 -59 -42 -94q0 -48 50 -48q59 0 59 111q96 55 169 55q181 0 181 -284q0 -321 -195 -321q-49 0 -97 18q-62 23 -62 63q0 12 61.5 49.5t61.5 92.5t-35 88t-93 33t-94.5 -46t-36.5 -113q0 -125 98 -195t229 -70q182 0 297.5 108z" />
+<glyph unicode="❻" d="M1998 582q0 -406 -284 -690t-690 -284t-690 284t-284 690t284 690t690 284t690 -284t284 -690zM1037 -7q173 0 275 109.5t102 278t-91 251.5t-211 83t-225 -112v19q0 478 213 478q69 0 69 -45q0 -10 -16.5 -44t-16.5 -71t30.5 -70t82.5 -33t87 38.5t35 94.5q0 97 -91 153 q-77 49 -180 49q-191 0 -321 -161q-145 -180 -145 -477q0 -222 88 -367q106 -174 315 -174zM1043 607q137 0 137 -269t-145 -269q-83 0 -122 106q-27 75 -27 189t47 178.5t110 64.5z" />
+<glyph unicode="❼" d="M1998 582q0 -406 -284 -690t-690 -284t-690 284t-284 690t284 690t690 284t690 -284t284 -690zM1398 1147h-557q-61 0 -105 16h-32l-54 -404h74q31 129 54.5 157t74.5 28h398l-204 -365q-161 -288 -161 -459q0 -127 116 -127q88 0 121 80q14 33 23.5 144.5t38.5 314.5 q42 202 213 545v70z" />
+<glyph unicode="❽" d="M1998 582q0 -406 -284 -690t-690 -284t-690 284t-284 690t284 690t690 284t690 -284t284 -690zM1414 363q0 125 -63 196.5t-190 125.5q198 102 198 248q0 114 -114 182q-96 57 -229 57t-236 -90t-103 -231q0 -186 214 -288q-257 -87 -257 -276q0 -147 121 -226 q103 -68 268.5 -68t278 98.5t112.5 271.5zM1211 908q0 -117 -113 -201q-122 44 -170 76q-91 60 -91 143t52 128.5t134 45.5t135 -52.5t53 -139.5zM962 534q181 -70 241.5 -123.5t60.5 -143t-67 -144.5t-168.5 -55t-159.5 62.5t-58 167.5q0 172 151 236z" />
+<glyph unicode="❾" d="M1998 582q0 -406 -284 -690t-690 -284t-690 284t-284 690t284 690t690 284t690 -284t284 -690zM1414 643q0 218 -87 359q-105 170 -310 170q-176 0 -279.5 -110t-103.5 -287q0 -136 81.5 -228.5t215.5 -92.5q106 0 232 104q-3 -350 -114 -446q-51 -44 -112 -44t-61 42 q0 15 17 50t17 57q0 49 -32 83t-84 34t-87 -40.5t-35 -97.5q0 -94 95 -152q82 -51 182 -51q189 0 318 163q147 185 147 487zM1168 841q0 -106 -31 -179q-43 -100 -134 -100q-138 0 -138 250q0 287 151.5 287t151.5 -258z" />
+<glyph unicode="❿" d="M1998 582q0 -406 -284 -690t-690 -284t-690 284t-284 690t284 690t690 284t690 -284t284 -690zM1668 203q73 160 73 376.5t-72 378.5q-94 214 -285.5 214t-287.5 -213q-72 -160 -72 -376t75 -380q98 -210 285.5 -210t283.5 210zM867 17v75q-57 0 -72 5q-35 11 -35 56v992 h-59q-103 -56 -169 -77.5t-169 -28.5v-72h119q63 0 63 -54v-736q0 -66 -46 -80q-14 -5 -103 -5v-75h471zM1385 1097q110 0 110 -513t-115 -513q-110 0 -110 485q0 541 115 541z" />
+<glyph unicode="➀" d="M1998 582q0 -406 -284 -690t-690 -284t-690 284t-284 690t284 690t690 284t690 -284t284 -690zM1898 582q0 364 -255 619t-619 255t-619 -255t-255 -619t255 -619t619 -255t619 255t255 619zM1348 46h-648v149h225v642h-225v137h3q241 0 250 148h175v-927h220v-149z" />
+<glyph unicode="➁" d="M1998 582q0 -406 -284 -690t-690 -284t-690 284t-284 690t284 690t690 284t690 -284t284 -690zM1898 582q0 364 -255 619t-619 255t-619 -255t-255 -619t255 -619t619 -255t619 255t255 619zM1416 46h-784v164q175 139 258 212q165 147 214 230.5t49 155.5 q0 166 -195 166q-139 0 -283 -96h-15v195q147 67 319.5 67t273.5 -70q116 -81 116 -244t-172 -348q-85 -92 -310 -268h529v-164z" />
+<glyph unicode="➂" d="M1998 582q0 -406 -284 -690t-690 -284t-690 284t-284 690t284 690t690 284t690 -284t284 -690zM1898 582q0 364 -255 619t-619 255t-619 -255t-255 -619t255 -619t619 -255t619 255t255 619zM1412 368q0 -171 -132 -263q-115 -81 -302.5 -81t-341.5 68v193h20 q148 -93 304 -93q238 0 238 189q0 114 -110 145q-48 14 -203 14v156q136 0 190 17q104 31 104 134q0 127 -199 127q-146 0 -296 -93h-17v191q155 68 323 68t268 -53q129 -67 129 -210q0 -89 -58.5 -157.5t-147.5 -86.5v-11q231 -35 231 -254z" />
+<glyph unicode="➃" d="M1998 582q0 -406 -284 -690t-690 -284t-690 284t-284 690t284 690t690 284t690 -284t284 -690zM1898 582q0 364 -255 619t-619 255t-619 -255t-255 -619t255 -619t619 -255t619 255t255 619zM1412 321h-154v-276h-201v276h-516v184l511 613h206v-642h154v-155zM1057 476 v436l-363 -436h363z" />
+<glyph unicode="➄" d="M1998 582q0 -406 -284 -690t-690 -284t-690 284t-284 690t284 690t690 284t690 -284t284 -690zM1898 582q0 364 -255 619t-619 255t-619 -255t-255 -619t255 -619t619 -255t619 255t255 619zM1407 398q0 -180 -129 -281q-117 -93 -306.5 -93t-330.5 63v195h21 q147 -90 292 -90q240 0 240 202q0 175 -268 175q-65 0 -111.5 -8.5t-130.5 -20.5v578h704v-165h-504v-230q52 4 118 4q405 0 405 -329z" />
+<glyph unicode="➅" d="M1998 582q0 -406 -284 -690t-690 -284t-690 284t-284 690t284 690t690 284t690 -284t284 -690zM1898 582q0 364 -255 619t-619 255t-619 -255t-255 -619t255 -619t619 -255t619 255t255 619zM1339 655.5q94 -90.5 94 -257t-113.5 -270.5t-286.5 -104q-216 0 -323 145 q-94 129 -94 352q0 286 133 445q143 172 424 172q91 0 163 -17v-174h-18q-65 31 -157 31q-144 0 -230 -81.5t-101 -225.5q123 75 252 75q163 0 257 -90.5zM1221 393q0 200 -217 200q-89 0 -176 -42q-2 -40 -2 -67q0 -310 208 -310q93 0 140 61.5t47 157.5z" />
+<glyph unicode="➆" d="M1998 582q0 -406 -284 -690t-690 -284t-690 284t-284 690t284 690t690 284t690 -284t284 -690zM1898 582q0 364 -255 619t-619 255t-619 -255t-255 -619t255 -619t619 -255t619 255t255 619zM631 953v165h787v-187l-485 -885h-232l510 907h-580z" />
+<glyph unicode="➇" d="M1998 582q0 -406 -284 -690t-690 -284t-690 284t-284 690t284 690t690 284t690 -284t284 -690zM1898 582q0 364 -255 619t-619 255t-619 -255t-255 -619t255 -619t619 -255t619 255t255 619zM1441 345q0 -157 -126.5 -240.5t-294 -83.5t-280.5 72q-133 85 -133 246 q0 177 205 264v5q-176 86 -176 248q0 140 130 220q110 67 260.5 67t256.5 -59q130 -73 130 -213q0 -164 -185 -245v-5q213 -85 213 -276zM1207 855q0 71 -53.5 107t-126 36t-121.5 -30q-60 -35 -60 -99.5t109 -129.5q56 -34 158 -65q94 78 94 181zM1230 332q0 56 -27.5 93 t-127.5 78l-147 53q-112 -75 -112 -195q0 -89 62.5 -141.5t149.5 -52.5t144.5 42.5t57.5 122.5z" />
+<glyph unicode="➈" d="M1998 582q0 -406 -284 -690t-690 -284t-690 284t-284 690t284 690t690 284t690 -284t284 -690zM1898 582q0 364 -255 619t-619 255t-619 -255t-255 -619t255 -619t619 -255t619 255t255 619zM1433 645q0 -286 -139.5 -453t-419.5 -167q-95 0 -162 18v174h17 q67 -32 158 -32q145 0 230.5 81t100.5 227q-126 -75 -252 -75q-162 0 -256 90t-94 256.5t115 271t287 104.5q415 0 415 -495zM1222 680q0 310 -206 310q-92 0 -140.5 -62.5t-48.5 -157.5q0 -199 218 -199q93 0 175 42q2 54 2 67z" />
+<glyph unicode="➉" d="M1998 582q0 -406 -284 -690t-690 -284t-690 284t-284 690t284 690t690 284t690 -284t284 -690zM1898 582q0 364 -255 619t-619 255t-619 -255t-255 -619t255 -619t619 -255t619 255t255 619zM1663 955q58 -128 58 -374.5t-57 -372.5q-84 -184 -300 -184t-299 184 q-57 127 -57 374t57 374q84 184 299 184t299 -185zM867 46h-448v149h125v642h-125v137h4q76 0 110 34q35 34 39 114h175v-927h120v-149zM1509 541v82q0 359 -145 359t-145 -352v-86q0 -361 145 -361t145 358z" />
+<glyph unicode="➊" d="M1998 582q0 -406 -284 -690t-690 -284t-690 284t-284 690t284 690t690 284t690 -284t284 -690zM1366 17v157h-232v977h-185q-9 -156 -264 -156h-3v-144h238v-677h-238v-157h684z" />
+<glyph unicode="➋" d="M1998 582q0 -406 -284 -690t-690 -284t-690 284t-284 690t284 690t690 284t690 -284t284 -690zM1437 17v173h-557q237 186 327 282q181 194 181 366.5t-123 257.5q-106 74 -288.5 74t-336.5 -70v-206h16q152 101 298 101q206 0 206 -175q0 -75 -46 -155 q-80 -140 -503 -475v-173h826z" />
+<glyph unicode="➌" d="M1998 582q0 -406 -284 -690t-690 -284t-690 284t-284 690t284 690t690 284t690 -284t284 -690zM1433 356q0 112 -65.5 181.5t-178.5 86.5v12q93 19 155.5 91t62.5 166q0 150 -136 222q-105 55 -283 55t-340 -71v-202h18q158 98 312 98q209 0 209 -134q0 -108 -111 -142 q-56 -17 -199 -17v-164q163 0 214 -15q116 -33 116 -153q0 -199 -250 -199q-165 0 -321 98h-21v-204q161 -71 359 -71t320 85q139 97 139 277z" />
+<glyph unicode="➍" d="M1998 582q0 -406 -284 -690t-690 -284t-690 284t-284 690t284 690t690 284t690 -284t284 -690zM1433 307v163h-162v677h-217l-539 -646v-194h544v-291h212v291h162zM1059 470h-383l383 460v-460z" />
+<glyph unicode="➎" d="M1998 582q0 -406 -284 -690t-690 -284t-690 284t-284 690t284 690t690 284t690 -284t284 -690zM666 538q156 30 255 30q282 0 282 -184q0 -108 -70.5 -160.5t-182.5 -52.5q-153 0 -308 95h-22v-206q148 -66 348 -66t324 98q136 106 136 296q0 347 -427 347q-73 0 -125 -4 v242h532v174h-742v-609z" />
+<glyph unicode="➏" d="M1998 582q0 -406 -284 -690t-690 -284t-690 284t-284 690t284 690t690 284t690 -284t284 -690zM1033 -6q182 0 302 109.5t120 285t-99 271t-271 95.5q-135 0 -265 -79q16 152 106.5 237.5t241.5 85.5q98 0 166 -32h19v183q-77 18 -172 18q-296 0 -447 -181 q-140 -167 -140 -469q0 -235 99 -370q113 -154 340 -154zM1232 383q0 -101 -49.5 -166t-147.5 -65q-220 0 -220 327q0 31 2 70q93 45 186 45q229 0 229 -211z" />
+<glyph unicode="➐" d="M1998 582q0 -406 -284 -690t-690 -284t-690 284t-284 690t284 690t690 284t690 -284t284 -690zM1439 1147h-829v-174h611l-537 -956h244l511 933v197z" />
+<glyph unicode="➑" d="M1998 582q0 -406 -284 -690t-690 -284t-690 284t-284 690t284 690t690 284t690 -284t284 -690zM1464 332q0 202 -225 291v5q195 85 195 259q0 147 -138 224q-111 62 -269.5 62t-274.5 -71q-137 -84 -137 -231q0 -172 186 -262v-5q-217 -91 -217 -278q0 -169 141 -259 q119 -76 295.5 -76t300.5 81q143 95 143 260zM1217 870q0 -110 -99 -191q-282 86 -282 204q0 68 58 103t134 35t132.5 -38t56.5 -113zM1241 318q0 -84 -61 -128.5t-152.5 -44.5t-157 55t-65.5 149q0 127 118 206l155 -56q106 -44 134.5 -83t28.5 -98z" />
+<glyph unicode="➒" d="M1998 582q0 -406 -284 -690t-690 -284t-690 284t-284 690t284 690t690 284t690 -284t284 -690zM1455 648q0 522 -437 522q-182 0 -303 -110t-121 -285t99 -270.5t270 -95.5q134 0 265 79q-16 -153 -105.5 -238.5t-242.5 -85.5q-97 0 -167 33h-18v-183q71 -19 171 -19 q295 0 448 182q141 170 141 471zM1233 685q0 -22 -2 -70q-88 -45 -185 -45q-230 0 -230 210q0 100 51.5 166t148.5 66q217 0 217 -327z" />
+<glyph unicode="➓" d="M1998 582q0 -406 -284 -690t-690 -284t-690 284t-284 690t284 690t690 284t690 -284t284 -690zM1698 188q61 134 61 393t-62 394q-89 195 -315.5 195t-314.5 -195q-60 -134 -60 -393.5t60 -392.5q88 -195 315.5 -195t315.5 194zM859 17v157h-127v977h-184 q-4 -84 -41 -121q-36 -35 -117 -35h-4v-144h132v-677h-132v-157h473zM1535 519q0 -358 -152.5 -358t-152.5 353v144q0 346 152.5 346t152.5 -355v-130z" />
+<glyph unicode="➔" horiz-adv-x="1890" d="M100 569v279h1184l-443 450h367l582 -589l-582 -590h-367l443 450h-1184z" />
+<glyph unicode="➕" horiz-adv-x="1613" d="M1513 586h-588v-586h-239v586h-586v245h586v586h239v-586h588v-245z" />
+<glyph unicode="➖" horiz-adv-x="1613" d="M1513 586h-1413v245h1413v-245z" />
+<glyph unicode="➗" horiz-adv-x="1613" d="M1513 586h-1413v245h1413v-245zM925 1172h-239v245h239v-245zM925 0h-239v245h239v-245z" />
+<glyph unicode="➘" horiz-adv-x="1558" d="M1458 193l-774 104l172 231l-756 441l180 254l666 -568l160 238z" />
+<glyph unicode="➙" horiz-adv-x="1951" d="M1851 709l-805 -422l164 366l-1110 -137v385l1110 -137l-164 366z" />
+<glyph unicode="➚" horiz-adv-x="1558" d="M1458 1223l-352 -701l-160 238l-666 -567l-180 253l756 441l-172 231z" />
+<glyph unicode="➛" horiz-adv-x="1939" d="M1839 709l-615 -136l-587 -233l-13 6l219 344l-743 -26v90l743 -27l-219 342l13 8l587 -233z" />
+<glyph unicode="➜" horiz-adv-x="1955" d="M1376 166q-88 -100 -167.5 -100t-133 53t-53.5 135t71 160l127 106h-884q-114 0 -164 39q-72 56 -72 143t54 141t173 54h893l-114 109q-84 80 -84 156.5t53.5 133t133.5 56.5t161 -92l485 -551z" />
+<glyph unicode="➝" horiz-adv-x="1953" d="M1409 677h-1309v64h1309v410l444 -442l-444 -442v410z" />
+<glyph unicode="➞" horiz-adv-x="2034" d="M1934 582l-621 -502l78 318l-1291 -72l63 256l-63 254l1291 -71l-78 320z" />
+<glyph unicode="➟" horiz-adv-x="2042" d="M1942 582l-622 -460l71 248l-627 -35l72 247l-72 246l627 -34l-71 248zM776 582l-72 -251l-188 -9l71 260l-71 260l188 -10zM500 582l-70 -265l-114 -6l71 271l-71 271l114 -6zM233 582l-72 -280l-61 -3l71 283l-71 283l61 -2z" />
+<glyph unicode="➠" horiz-adv-x="2134" d="M2034 582q-460 -187 -651 -602h-18l42 256l-409 -22l71 368l-71 368l409 -21l-42 255h18q191 -416 651 -602zM1012 582l-72 -372l-177 -8l71 380l-71 382l177 -10zM741 582l-71 -385l-122 -7l70 392l-70 394l122 -8zM399 582l-71 406l80 -5l70 -401l-70 -400l-80 -4z M228 582q0 3 -24 -138l-47 -276l-57 -2l71 416l-71 416l57 -2z" />
+<glyph unicode="➡" horiz-adv-x="2134" d="M2034 582l-651 -602h-18l42 256l-1307 -70v832l1307 -69l-42 255h18z" />
+<glyph unicode="➢" horiz-adv-x="1949" d="M1849 709l-1749 -508l602 508l-602 508zM1656 709l-1308 360l446 -360h862z" />
+<glyph unicode="➣" horiz-adv-x="1949" d="M1849 709l-1749 -508l602 508l-602 508zM1656 709h-862l-446 -361z" />
+<glyph unicode="➤" horiz-adv-x="1935" d="M1835 709l-1735 -709l412 709l-412 708z" />
+<glyph unicode="➥" horiz-adv-x="1963" d="M1144 340h-669q-194 0 -281 92q-62 66 -78 135.5t-16 184.5v493h82v-33q0 -170 85 -223q62 -39 241 -39h636v172l719 -475l-719 -475v168z" />
+<glyph unicode="➦" horiz-adv-x="1963" d="M1144 465h-634q-181 0 -242 -38q-86 -52 -86 -222v-33h-82v494q0 113 16.5 183t77.5 134q90 94 281 94h669v168l719 -475l-719 -475v170z" />
+<glyph unicode="➧" horiz-adv-x="1007" d="M362 0h-262v1233h262v295l545 -911l-545 -912v295z" />
+<glyph unicode="➨" horiz-adv-x="1865" d="M909 145v191h-809v747h809v193h22q140 -226 360 -375.5t474 -179.5v-19q-242 -37 -438 -157q-115 -70 -265 -240q-97 -109 -131 -160h-22z" />
+<glyph unicode="➩" horiz-adv-x="1771" d="M862 90v322h-762v594h762v321h282l527 -618l-527 -619h-282zM915 954h-762v-491h762v-330l512 576l-512 575v-330z" />
+<glyph unicode="➪" horiz-adv-x="1771" d="M835 90v322h-735v594h735v321h254l582 -618l-582 -619h-254zM1058 954h-749v-491h749v-330l541 576l-541 575v-330z" />
+<glyph unicode="➫" horiz-adv-x="1832" d="M815 395h-715v264l371 377h788l139 174l334 -376v-238l-917 -389v188zM1687 821l-287 324l-122 -152h-791l-344 -354h850l-121 -162z" />
+<glyph unicode="➬" horiz-adv-x="1832" d="M100 1022h715v188l917 -389v-237l-334 -377l-139 174h-788l-371 377v264zM1687 596l-815 344l121 -162h-850l344 -354h791l122 -152z" />
+<glyph unicode="➭" horiz-adv-x="1482" d="M604 252h-328l-176 168v692h504v215l778 -663l-602 -574l-176 129v33zM657 1053h-500v-598h500v-203l528 500l-528 454v-153z" />
+<glyph unicode="➮" horiz-adv-x="1482" d="M604 305h-504v692l176 168h328v33l176 129l602 -573l-778 -664v215zM657 963h-500v-598h500v-154l528 455l-528 499v-202z" />
+<glyph unicode="➯" horiz-adv-x="1849" d="M1187 354h-946l-141 140l141 266l-137 321h1083v187l562 -559l-562 -551v196zM1237 1028h-1051l111 -268l-140 -266h1080v-109l381 375l-381 391v-123z" />
+<glyph unicode="➰" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="➱" horiz-adv-x="1849" d="M1187 336h-1083l137 321l-141 267l141 139h946v197l562 -551l-562 -559v186zM1237 924h-1080l140 -267l-111 -268h1051v-123l381 391l-381 375v-108z" />
+<glyph unicode="➲" horiz-adv-x="1613" d="M1513 709q0 -291 -213.5 -500t-595.5 -209q-198 0 -367 61q-229 83 -237 242h725v-246l639 652l-639 651v-246h-725q24 161 223 236q177 67 381 67q346 0 563 -182q246 -206 246 -526z" />
+<glyph unicode="➳" horiz-adv-x="1994" d="M1527 328q-69 75 -69 181t69 175h-450l-248 -356h-729l268 381l-268 383h729l248 -359h450q-69 72 -69 178t69 181q125 -307 367 -383q-246 -85 -367 -381zM1013 733l-215 307h-100l213 -307h102zM845 733l-213 307h-100l211 -307h102zM680 733l-213 307h-105l215 -307 h103zM1011 684h-100l-209 -305h98zM512 733l-215 307h-99l213 -307h101zM845 684h-100l-211 -305h103zM680 684h-105l-209 -305h107zM510 684h-101l-207 -305h99z" />
+<glyph unicode="➴" horiz-adv-x="1638" d="M993 862q0 -129 33 -309l-533 446l-33 342l533 -446v-33zM1228 125q-83 0 -143 -21q1 55 51.5 107.5t104.5 60.5l-256 215l49 60l256 -215q6 64 47 120t100 72l-6 -61q0 -170 107 -369l-15 -18q-150 49 -295 49zM977 492l-342 -29l-535 448l346 27z" />
+<glyph unicode="➵" horiz-adv-x="1828" d="M1374 434q-29 46 -29 116.5t39 117.5h-334v82h334q-41 53 -41 123.5t31 109.5q106 -162 354 -262v-25q-247 -101 -354 -262zM1040 750h-692l-248 235h694q114 -136 246 -235zM1040 668l-244 -244h-696l248 244h692z" />
+<glyph unicode="➶" horiz-adv-x="1638" d="M1228 1292q145 0 295 49l15 -18q-107 -199 -107 -369l6 -61q-59 16 -100 72t-47 120l-256 -215l-49 60l256 215q-54 8 -104.5 60.5t-51.5 107.5q60 -21 143 -21zM977 926l-531 -447h-16l-330 27l535 448l18 -4zM993 555v-33l-533 -446l33 342l533 446q-33 -180 -33 -309z " />
+<glyph unicode="➷" horiz-adv-x="1877" d="M1777 -39q-141 47 -331 47t-388 -39q205 205 385 226l-192 159q-186 154 -305 154q-77 0 -166.5 -38t-149.5 -93l-530 444q159 152 354 152q77 0 146 -27q-56 103 -56 234t91 278l530 -444q-80 -125 -80 -271q0 -104 67 -193q41 -55 148 -144l189 -158l-3 41q-1 11 -1 22 q0 156 157 355v-82q0 -361 135 -623z" />
+<glyph unicode="➸" horiz-adv-x="2037" d="M1282 674q-229 0 -318 -64q-64 -46 -113 -139.5t-59 -177.5h-692q13 140 93 255t208 161q-260 101 -301 415h692q18 -187 144 -295q66 -57 166 -75q61 -11 184 -11h246q-142 142 -150 420q240 -322 555 -454q-274 -110 -555 -455q23 286 150 420h-250z" />
+<glyph unicode="➹" horiz-adv-x="1877" d="M1642 836v-82q-157 199 -157 354q0 11 1 22l3 41l-189 -157q-106 -88 -148 -144q-67 -90 -67 -194q0 -145 80 -270l-530 -445q-91 147 -91 278t56 234q-69 -27 -146 -27q-195 0 -354 152l530 444q60 -55 149.5 -93t166.5 -38q120 0 305 154l192 160q-181 21 -385 225 q198 -39 388 -39t331 47q-135 -262 -135 -622z" />
+<glyph unicode="➺" horiz-adv-x="1759" d="M1288 309q-50 -78 -122 -78t-114.5 41.5t-42.5 106.5t53.5 118t122.5 78l283 103l51 12l-4 4l-452 -37l-463 -108q-227 -53 -275 -53q-102 0 -163.5 55.5t-61.5 157.5q0 215 225 215q41 0 262 -52l451 -106l477 -41l4 4l-309 105q-78 27 -140.5 82t-62.5 122.5 t43.5 107.5t108.5 40q105 0 149 -121q57 -157 127.5 -231t223.5 -115v-21q-134 -32 -212.5 -103.5t-125.5 -201.5q-9 -30 -33 -84z" />
+<glyph unicode="➻" horiz-adv-x="1842" d="M1195 352.5q-44 71.5 -44 145t31 115.5t100 83v4h-49q-115 0 -227.5 -35t-216 -125t-152.5 -120q-85 -51 -178 -51t-166 75q-37 38 -75.5 151.5t-117.5 113.5q78 16 117 126.5t86 158.5q62 63 170 63t216 -86q182 -146 206 -160q147 -86 348 -86h39v4q-133 74 -133 193 q0 76 45 149.5t112 112.5q26 -137 157 -270t279 -205q-145 -66 -277 -198.5t-159 -268.5q-67 39 -111 110.5z" />
+<glyph unicode="➼" horiz-adv-x="1953" d="M1777 821q76 -73 76 -117.5t-80 -119.5l-184 -172q-88 -82 -132 -82t-91 23t-47 59q0 19 22.5 66.5t22.5 70.5q0 51 -93 51h-114q-107 0 -140.5 -16.5t-101.5 -100.5l-65 -80q-59 -73 -83.5 -84.5t-117.5 -11.5h-451q-98 0 -98 62q0 21 16 45l25 37l121 196q26 35 26 60 t-53 108l-90 141q-45 71 -45 95q0 59 115 59h446q81 0 102.5 -9t71.5 -69l80 -96q70 -83 101 -100t133 -17h116q49 0 63 4q36 9 36 40t-22.5 76t-22.5 60q0 82 135 82q53 0 110 -55z" />
+<glyph unicode="➽" horiz-adv-x="2035" d="M1872 815q63 -64 63 -106.5t-63 -106.5l-336 -340q-75 -76 -126 -76t-85.5 35t-34.5 75.5t8 72.5l25 100q10 40 10 59q0 62 -74 62t-110 -43q-15 -17 -74 -123l-78 -139q-48 -86 -114 -111q-47 -18 -162 -18h-467q-154 0 -154 149q0 40 20 103l72 227q14 44 14 72.5 t-14 72.5l-72 228q-20 63 -20 108q0 146 154 146h467q110 0 157 -16q70 -24 113 -101l84 -152q52 -94 64 -109q44 -57 104 -57q90 0 90 62q0 19 -10 59l-25 101q-8 32 -8 72t34.5 75t85.5 35t126 -76z" />
+<glyph unicode="➾" horiz-adv-x="1941" d="M1841 709q-336 -204 -527 -506h-124q211 322 483 506q-286 196 -486 505h127q166 -280 527 -505zM100 788v97h1047q-162 166 -248 329h114q142 -231 390 -426h-1303zM100 530v99h1303q-239 -187 -385 -426h-115q109 198 244 327h-1047z" />
+<glyph unicode="➿" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="⟀" horiz-adv-x="1573" d="M1434 41q0 -41 -68 -41h-1139q-61 0 -66 35q-2 11 -2 33v1269q0 68 41 68t41 -68v-1192l884 1017q13 15 30 15q43 0 43 -42q0 -14 -11 -27l-892 -1026h1071q68 0 68 -41z" />
+<glyph unicode="⟁" d="M1986 35q0 -35 -44 -35h-1836q-44 0 -44 35q0 14 9 28l918 1466q14 23 35 23t35 -23l918 -1466q9 -14 9 -28zM1868 82l-844 1348l-844 -1348h1688zM1461 326q0 -35 -44 -35h-786q-44 0 -44 35q0 14 9 28l393 627q16 25 35 25t35 -25l393 -627q9 -14 9 -28zM1343 373 l-319 509l-319 -509h638z" />
+<glyph unicode="⟂" horiz-adv-x="1591" d="M1479 41q0 -41 -37 -41h-1288q-39 0 -39 41t39 41h602v1245q0 37 41 37t41 -37v-1245h604q37 0 37 -41z" />
+<glyph unicode="⟃" horiz-adv-x="1591" d="M1421 41q0 -41 -39 -41h-590q-248 0 -435 168.5t-187 413.5t187 413.5t435 168.5h590q39 0 39 -41t-39 -41h-584q-216 0 -381 -143.5t-165 -356.5t165 -356.5t381 -143.5h584q39 0 39 -41zM1301 810q95 -95 95 -228.5t-94.5 -228t-227.5 -94.5t-227.5 94.5t-94.5 228 t95 228.5t227 95t227 -95zM1243.5 411.5q70.5 70.5 70.5 170t-71 170.5t-169 71t-169 -71t-71 -170.5t70.5 -170t169.5 -70.5t169.5 70.5z" />
+<glyph unicode="⟄" horiz-adv-x="1591" d="M1421 582q0 -245 -187 -413.5t-435 -168.5h-590q-39 0 -39 41t39 41h584q216 0 381 143.5t165 356.5t-165 356.5t-381 143.5h-584q-39 0 -39 41t39 41h590q248 0 435 -168.5t187 -413.5zM744.5 810.5q94.5 -94.5 94.5 -228t-95 -228.5t-227 -95t-227 95t-95 228.5 t94.5 228t227.5 94.5t227.5 -94.5zM686 412q71 71 71 170.5t-70.5 170t-169.5 70.5t-169.5 -70.5t-70.5 -170t71 -170.5t169 -71t169 71z" />
+<glyph unicode="⟅" horiz-adv-x="1024" d="M739 -317q0 -33 -63 -33q-173 0 -282 143.5t-109 310t88 337.5l164 285q88 169 88 323q0 236 -147 345q-43 32 -142 52q-51 10 -51 35q0 33 63 33q173 0 282 -143.5t109 -311t-88 -338.5l-164 -285q-88 -169 -88 -321q0 -236 147 -345q43 -32 142 -52q51 -10 51 -35z" />
+<glyph unicode="⟆" horiz-adv-x="1024" d="M651 441q88 -171 88 -337.5t-109 -310t-282 -143.5q-63 0 -63 33q0 25 56.5 36t79.5 18.5t57 32.5q147 109 147 345q0 152 -88 321l-164 285q-88 171 -88 338.5t109 311t282 143.5q63 0 63 -33q0 -25 -56.5 -36t-79.5 -18.5t-57 -32.5q-147 -109 -147 -345 q0 -154 88 -323z" />
+<glyph unicode="⟇" horiz-adv-x="1364" d="M1249 1183q0 -11 -2 -16l-526 -1188q-11 -25 -39 -25t-39 25l-526 1188q-2 5 -2 16q0 41 41 41q26 0 37 -25l489 -1103l489 1103q11 25 37 25q41 0 41 -41zM791 867q0 -45 -32 -77t-77 -32t-77 32t-32 77t32 77t77 32t77 -32t32 -77z" />
+<glyph unicode="⟈" horiz-adv-x="1991" d="M1821 41q0 -41 -39 -41h-590q-248 0 -435 168.5t-187 413.5t187 413.5t435 168.5h590q39 0 39 -41t-39 -41h-584q-216 0 -381 -143.5t-165 -356.5t165 -356.5t381 -143.5h584q39 0 39 -41zM569 -311q0 -41 -39 -41q-33 0 -40 26l-488 1788q-2 7 -2 13q0 41 39 41 q33 0 40 -26l488 -1788q2 -7 2 -13z" />
+<glyph unicode="⟉" horiz-adv-x="1991" d="M1421 582q0 -245 -187 -413.5t-435 -168.5h-590q-39 0 -39 41t39 41h584q216 0 381 143.5t165 356.5t-165 356.5t-381 143.5h-584q-39 0 -39 41t39 41h590q248 0 435 -168.5t187 -413.5zM1991 1475q0 -6 -2 -13l-488 -1788q-7 -26 -40 -26q-39 0 -39 41q0 6 2 13 l488 1788q7 26 40 26q39 0 39 -41z" />
+<glyph unicode="⟊" horiz-adv-x="1194" d="M1024 582q0 -41 -37 -41h-349v-846q0 -37 -41 -37t-41 37v846h-347q-39 0 -39 41t39 41h347v846q0 37 41 37t41 -37v-846h349q37 0 37 -41z" />
+<glyph unicode="⟋" horiz-adv-x="1174" d="M964 1505q0 -8 -2 -13l-673 -1848q-9 -26 -40 -26q-39 0 -39 41q0 8 2 13l673 1848q9 26 40 26q39 0 39 -41z" />
+<glyph unicode="⟌" horiz-adv-x="1221" d="M1083 1294q0 -41 -41 -41h-787q63 -225 63 -483t-60 -494q-5 -24 -19 -70q-12 -29 -38 -29q-42 0 -42 39q0 7 2 14q75 268 75 537t-75 514q-3 10 -3 17q0 37 42 37h842q41 0 41 -41z" />
+<glyph unicode="⟍" horiz-adv-x="1234" d="M1152 -267h-1070v1698h1070v-1698zM1078 -193v1550h-922v-1550h922zM1070 1070l-333 279h81l252 -211v-68zM1070 770l-690 579h81l609 -511v-68zM1070 470l-906 760v68l906 -760v-68zM1070 170l-906 760v68l906 -760v-68zM1070 -130l-906 760v68l906 -760v-68zM859 -185 h-81l-614 515v68zM501 -185h-81l-256 215v68z" />
+<glyph unicode="⟎" horiz-adv-x="1591" d="M1488 -72q0 -39 -37 -39h-1308q-39 0 -39 39v1310q0 37 39 37h1308q37 0 37 -37v-1310zM1406 -29v1222h-1220v-1222h44l527 1189q11 25 38.5 25t39.5 -25l526 -1189h45zM1271 -29l-475 1072l-474 -1072h949z" />
+<glyph unicode="⟏" horiz-adv-x="1591" d="M1488 -74q0 -37 -39 -37h-1308q-37 0 -37 37v1310q0 39 37 39h1308q39 0 39 -39v-1310zM1270 1193h-949l476 -1072zM1406 -29v1222h-44l-526 -1189q-12 -25 -39.5 -25t-38.5 25l-527 1189h-45v-1222h1220z" />
+<glyph unicode="⟐" horiz-adv-x="1591" d="M1550 609q11 -11 11 -27.5t-10 -26.5l-727 -727q-11 -11 -27.5 -11t-27.5 11l-728 729q-10 10 -10 26t11 27l727 727q10 10 26 10t26 -10zM1461 581l-666 666l-664 -664l666 -666zM1046 582q0 -104 -73 -177t-177.5 -73t-177 73t-72.5 177t72.5 177t177 73t177.5 -73 t73 -177z" />
+<glyph unicode="⟑" horiz-adv-x="1364" d="M1249 -4q0 -41 -41 -41q-26 0 -37 25l-489 1103l-489 -1103q-11 -25 -37 -25q-41 0 -41 41q0 11 2 16l526 1188q11 25 39 25t39 -25l526 -1188q2 -5 2 -16zM791 312q0 -45 -32 -77t-77 -32t-77 32t-32 77t32 77t77 32t77 -32t32 -77z" />
+<glyph unicode="⟒" horiz-adv-x="1364" d="M1264 623q0 -253 -166 -438t-416 -185t-416 185t-166 438v364q0 37 41 37t41 -37v-358q0 -201 132 -373t327 -172v903q0 37 41 37t41 -37v-903q195 0 327 172t132 373v358q0 37 41 37t41 -37v-364z" />
+<glyph unicode="⟓" horiz-adv-x="1024" d="M907 -8q0 -37 -37 -37h-718q-37 0 -37 41t37 41h673v674q0 39 41 39t41 -39v-719zM526 445q0 -45 -32 -77t-77 -32t-77 32t-32 77t32 77t77 32t77 -32t32 -77z" />
+<glyph unicode="⟔" horiz-adv-x="1024" d="M907 1380q0 -41 -37 -41h-673v-673q0 -39 -41 -39t-41 39v718q0 37 37 37h718q37 0 37 -41zM714 931q0 -45 -32 -77t-77 -32t-77 32t-32 77t32 77t77 32t77 -32t32 -77z" />
+<glyph unicode="⟕" d="M1933 -100q0 -59 -61 -59q-22 0 -45 23l-633 633l-636 -633q-23 -23 -47 -23h-359q-37 0 -37 41t37 41h298v1318h-298q-37 0 -37 41t37 41h359q27 0 47 -20l636 -635l633 635q20 20 45 20q61 0 61 -55v-1368zM1851 -45v1257l-627 -630zM1163 582l-631 632v-1261z" />
+<glyph unicode="⟖" d="M1933 -118q0 -41 -37 -41h-359q-24 0 -47 23l-636 633l-633 -633q-23 -23 -45 -23q-61 0 -61 59v1368q0 55 61 55q25 0 45 -20l633 -635l636 635q20 20 47 20h359q37 0 37 -41t-37 -41h-298v-1318h298q37 0 37 -41zM1516 -47v1261l-631 -632zM824 582l-627 630v-1257z " />
+<glyph unicode="⟗" horiz-adv-x="2383" d="M2268 -118q0 -41 -37 -41h-359q-22 0 -45 23l-633 633l-636 -633q-23 -23 -47 -23h-359q-37 0 -37 41t37 41h298v1318h-298q-37 0 -37 41t37 41h359q27 0 47 -20l636 -635l633 635q20 20 45 20h359q37 0 37 -41t-37 -41h-298v-1318h298q37 0 37 -41zM1851 -45v1257 l-627 -630zM1163 582l-631 632v-1261z" />
+<glyph unicode="⟘" horiz-adv-x="1591" d="M1506 41q0 -41 -39 -41h-1345q-37 0 -37 41t37 41h632v1402q0 39 41 39t41 -39v-1402h631q39 0 39 -41z" />
+<glyph unicode="⟙" horiz-adv-x="1591" d="M1506 1482q0 -41 -39 -41h-631v-1402q0 -39 -41 -39t-41 39v1402h-632q-37 0 -37 41t37 41h1345q39 0 39 -41z" />
+<glyph unicode="⟚" d="M2002 512q0 -41 -37 -41h-701v-432q0 -39 -41 -39t-41 39v1345q0 37 41 37t41 -37v-434h701q37 0 37 -41t-37 -41h-701v-315h701q37 0 37 -41zM867 39q0 -39 -41 -39t-41 39v432h-701q-37 0 -37 41t37 41h701v315h-701q-37 0 -37 41t37 41h701v434q0 37 41 37t41 -37 v-1345z" />
+<glyph unicode="⟛" d="M2032 711q0 -41 -37 -41h-731v-631q0 -39 -41 -39t-41 39v1345q0 37 41 37t41 -37v-632h731q37 0 37 -41zM867 39q0 -39 -41 -39t-41 39v631h-731q-37 0 -37 41t37 41h731v632q0 37 41 37t41 -37v-1345z" />
+<glyph unicode="⟜" d="M1948 582q0 -41 -37 -41h-1163q-16 -122 -108.5 -203.5t-220.5 -81.5t-223.5 96.5t-95.5 230t95 229.5t223 96t221.5 -82t108.5 -203h1163q37 0 37 -41zM668 582q0 100 -72 172t-171.5 72t-171 -72.5t-71.5 -171.5t71.5 -171.5t171 -72.5t171.5 72t72 172z" />
+<glyph unicode="⟝" horiz-adv-x="1756" d="M1671 582q0 -41 -39 -41h-1380v-631q0 -39 -41 -39t-41 39v1345q0 37 41 37t41 -37v-632h1380q39 0 39 -41z" />
+<glyph unicode="⟞" horiz-adv-x="1756" d="M1586 -90q0 -39 -41 -39t-41 39v631h-1380q-39 0 -39 41t39 41h1380v632q0 37 41 37t41 -37v-1345z" />
+<glyph unicode="⟟" horiz-adv-x="722" d="M722 -301q0 -41 -37 -41h-646q-39 0 -39 41t39 41h281v1118q-121 15 -203 108.5t-82 221.5t96 223t229.5 95t230 -95.5t96.5 -223.5t-81.5 -220.5t-203.5 -108.5v-1118h283q37 0 37 -41zM533 1010q72 72 72 171.5t-72.5 171t-171.5 71.5t-171.5 -71.5t-72.5 -171 t72 -171.5t172 -72t172 72z" />
+<glyph unicode="⟠" horiz-adv-x="1364" d="M682 -353q-25 0 -39 25l-503 910l503 910q14 25 39 25t39 -25l503 -910l-503 -910q-14 -25 -39 -25zM1098 623l-416 752l-416 -752h832zM1098 541h-832l416 -752z" />
+<glyph unicode="⟡" horiz-adv-x="1946" d="M1831 590q0 -23 -34 -38q-60 -25 -178 -80q-353 -186 -532 -532q-2 -4 -75 -174q-15 -34 -39 -34t-39 34q-23 58 -75 174q-179 346 -532 532q-14 7 -178 80q-34 15 -34 38t34 38q60 25 178 80q353 186 532 532q2 4 75 174q15 34 39 34t39 -34q23 -58 75 -174 q179 -346 532 -532q14 -7 178 -80q34 -15 34 -38zM1674 590q-492 218 -701 698q-209 -480 -701 -698q492 -218 701 -698q209 480 701 698z" />
+<glyph unicode="⟢" horiz-adv-x="2141" d="M2131 582q0 -23 -34 -38q-60 -25 -178 -80q-353 -186 -532 -532q-2 -4 -75 -174q-15 -34 -39 -34t-39 34q-23 58 -75 174q-179 346 -532 532q-22 11 -171 77h-407q-39 0 -39 41t39 41h407q57 24 171 77q353 186 532 532q2 4 75 174q15 34 39 34t39 -34q23 -58 75 -174 q179 -346 532 -532q14 -7 178 -80q34 -15 34 -38zM1974 582q-492 218 -701 698q-209 -480 -701 -698q492 -218 701 -698q209 480 701 698z" />
+<glyph unicode="⟣" horiz-adv-x="2141" d="M2131 582q0 -41 -39 -41h-407q-57 -24 -171 -77q-353 -186 -532 -532q-2 -4 -75 -174q-15 -34 -39 -34t-39 34q-23 58 -75 174q-179 346 -532 532q-14 7 -178 80q-34 15 -34 38t34 38q60 25 178 80q353 186 532 532q2 4 75 174q15 34 39 34t39 -34q23 -58 75 -174 q179 -346 532 -532q22 -11 171 -77h407q39 0 39 -41zM1569 582q-492 218 -701 698q-209 -480 -701 -698q492 -218 701 -698q209 480 701 698z" />
+<glyph unicode="⟤" d="M1948 -2q0 -39 -37 -39h-1168q-39 0 -39 39v543h-495q-39 0 -39 41t39 41h495v545q0 37 39 37h1168q37 0 37 -37v-1170zM1866 41v1082h-1080v-1082h1080z" />
+<glyph unicode="⟥" d="M1948 582q0 -41 -39 -41h-495v-543q0 -39 -39 -39h-1168q-37 0 -37 39v1170q0 37 37 37h1168q39 0 39 -37v-545h495q39 0 39 -41zM1332 41v1082h-1080v-1082h1080z" />
+<glyph unicode="⟦" horiz-adv-x="682" d="M571 -309q0 -41 -68 -41h-391v1864h391q68 0 68 -40.5t-68 -40.5h-109v-1701h109q68 0 68 -41zM313 -268v1701h-120v-1701h120z" />
+<glyph unicode="⟧" horiz-adv-x="682" d="M570 -350h-391q-68 0 -68 41t68 41h109v1701h-109q-68 0 -68 40.5t68 40.5h391v-1864zM489 -268v1701h-120v-1701h120z" />
+<glyph unicode="⟨" horiz-adv-x="666" d="M558 -312q0 -38 -42 -38q-23 0 -43 47l-382 885l382 885q20 47 43 47q42 0 42 -38q0 -17 -8 -36l-371 -858l371 -858q8 -19 8 -36z" />
+<glyph unicode="⟩" horiz-adv-x="666" d="M150 -350q-42 0 -42 38q0 17 8 36l371 858l-371 858q-8 19 -8 36q0 38 42 38q23 0 43 -47l382 -885l-382 -885q-20 -47 -43 -47z" />
+<glyph unicode="⟪" horiz-adv-x="966" d="M558 -312q0 -38 -42 -38q-23 0 -43 47l-382 885l382 885q20 47 43 47q42 0 42 -38q0 -17 -8 -36l-371 -858l371 -858q8 -19 8 -36zM858 -312q0 -38 -42 -38q-23 0 -43 47l-382 885l382 885q20 47 43 47q42 0 42 -38q0 -17 -8 -36l-371 -858l371 -858q8 -19 8 -36z" />
+<glyph unicode="⟫" horiz-adv-x="966" d="M150 -350q-42 0 -42 38q0 17 8 36l371 858l-371 858q-8 19 -8 36q0 38 42 38q23 0 43 -47l382 -885l-382 -885q-20 -47 -43 -47zM450 -350q-42 0 -42 38q0 17 8 36l371 858l-371 858q-8 19 -8 36q0 38 42 38q23 0 43 -47l382 -885l-382 -885q-20 -47 -43 -47z" />
+<glyph unicode="⟬" horiz-adv-x="873" d="M663 -275q46 -35 46 -55t-17 -20q-77 0 -228 118q-193 150 -300 331v966q107 181 300 331q151 118 228 118q17 0 17 -20t-46 -55q-142 -109 -231 -332v-1050q89 -223 231 -332zM393 -53q-24 49 -42 94v1082q21 54 41 94q-107 -112 -147 -175v-920q38 -60 148 -175z" />
+<glyph unicode="⟭" horiz-adv-x="873" d="M181 -350q-17 0 -17 20t46 55q142 109 231 332v1050q-89 223 -231 332q-46 35 -46 55t17 20q77 0 228 -118q193 -150 300 -331v-966q-107 -181 -300 -331q-151 -118 -228 -118zM628 122v920q-38 60 -148 175q24 -49 42 -94v-1082q-21 -52 -50 -110q94 92 156 191z" />
+<glyph unicode="⟮" horiz-adv-x="582" d="M474 -332q0 -18 -19 -18q-10 0 -46 29q-156 128 -216 212t-82 212q-14 79 -17 195.5t-3 283.5t3 283.5t17 195.5q22 128 82 212t216 212q36 29 46 29q19 0 19 -18q0 -9 -24 -32q-90 -87 -131 -176q-70 -154 -70 -532v-347q0 -379 70 -533q41 -89 131 -176q24 -23 24 -32z " />
+<glyph unicode="⟯" horiz-adv-x="582" d="M491 582q0 -167 -3 -283.5t-17 -195.5q-22 -128 -82 -212t-216 -212q-36 -29 -46 -29q-19 0 -19 18q0 9 24 32q90 87 131 176q70 154 70 532v347q0 379 -70 533q-41 89 -131 176q-24 23 -24 32q0 18 19 18q10 0 46 -29q156 -128 216 -212t82 -212q14 -79 17 -195.5 t3 -283.5z" />
+<glyph unicode="⟰" horiz-adv-x="1602" d="M1540 846q0 -42 -39 -42q-6 0 -44 13t-105 47v-1145q0 -37 -41 -37t-41 37v1188q-141 82 -258 192v-1380q0 -37 -41 -37t-41 37v1464q-78 88 -129 179q-51 -91 -129 -179v-1464q0 -37 -41 -37t-41 37v1380q-117 -110 -258 -192v-1188q0 -37 -41 -37t-41 37v1145 q-67 -34 -105 -47t-44 -13q-39 0 -39 42q0 22 27 36q46 18 135 57q281 138 464 394q25 42 78 124q17 25 35 25t35 -25q25 -42 78 -124q183 -256 464 -394q46 -17 135 -57q27 -14 27 -36z" />
+<glyph unicode="⟱" horiz-adv-x="1602" d="M1540 318q0 -22 -27 -36q-46 -18 -135 -57q-281 -138 -464 -394q-25 -42 -78 -124q-17 -25 -35 -25t-35 25q-25 42 -78 124q-183 256 -464 394q-46 17 -135 57q-27 14 -27 36q0 42 39 42q6 0 44 -13t105 -47v1145q0 37 41 37t41 -37v-1188q141 -82 258 -192v1380 q0 37 41 37t41 -37v-1464q78 -88 129 -179q51 91 129 179v1464q0 37 41 37t41 -37v-1380q117 110 258 192v1188q0 37 41 37t41 -37v-1145q67 34 105 47t44 13q39 0 39 -42z" />
+<glyph unicode="⟲" horiz-adv-x="1024" d="M995 582q0 -200 -141.5 -341.5t-341.5 -141.5q-91 0 -190 38.5t-152 102.5q-10 12 -10 27q0 42 42 42q12 0 26 -11q144 -117 284 -117q166 0 283.5 117.5t117.5 283.5t-117.5 283.5t-278.5 117.5t-275.5 -105t-128.5 -259q36 36 95.5 75.5t92.5 39.5q39 0 39 -41 q0 -22 -25 -36q-22 -10 -44 -19q-90 -42 -177 -174q-13 -20 -24 -20t-24 20q-87 132 -177 174q-22 9 -44 19q-25 14 -25 36q0 41 39 41q33 0 95 -41t96 -77q13 189 152 319t334.5 130t337 -141.5t141.5 -341.5z" />
+<glyph unicode="⟳" horiz-adv-x="1024" d="M1224 693q0 -22 -25 -36q-22 -10 -44 -19q-90 -42 -177 -174q-13 -20 -24 -20t-24 20q-87 132 -177 174q-22 9 -44 19q-25 14 -25 36q0 41 39 41q33 0 92.5 -39.5t95.5 -75.5q-14 154 -128.5 259t-275.5 105t-278.5 -117.5t-117.5 -283.5t117.5 -283.5t283.5 -117.5 q140 0 284 117q14 11 26 11q42 0 42 -42q0 -15 -10 -27q-53 -64 -152 -102.5t-190 -38.5q-200 0 -341.5 141.5t-141.5 341.5t141.5 341.5t337 141.5t334.5 -130t152 -319q34 36 96 77t95 41q39 0 39 -41z" />
+<glyph unicode="⟴" horiz-adv-x="3008" d="M2866 611q25 -11 25 -27t-15 -22l-46 -18q-190 -83 -296 -265q-41 -70 -79 -213q-2 -7 -8 -13t-53 -6q-21 0 -21 27q0 2 8 36q65 274 287 431h-591q-16 -284 -224.5 -483t-495.5 -199t-496.5 198.5t-225.5 483.5h-481q-39 0 -39 41t39 41h481q16 286 224.5 484t497 198 t496.5 -198.5t224 -483.5h591q-154 111 -238 288q-57 121 -57 179q0 24 21 28q-3 -1 41 -1q15 0 20 -19q14 -55 54 -163q105 -217 317 -310zM1397 623h598q-16 241 -187 412.5t-411 186.5v-599zM1315 623v599q-241 -16 -412 -187t-186 -412h598zM1397 541v-599 q239 15 410.5 187t187.5 412h-598zM1315 541h-598q16 -240 187 -411.5t411 -187.5v599z" />
+<glyph unicode="⟵" horiz-adv-x="3008" d="M2891 582q0 -41 -39 -41h-2514q222 -157 287 -431q8 -34 8 -36q0 -27 -21 -27q-47 0 -53 6t-8 13q-22 84 -35.5 123t-43.5 90q-106 182 -296 265l-47 18q-14 6 -14 22t25 27l40 14q210 91 317 310q24 49 54 163q5 19 20 19q44 0 41 1q21 -4 21 -28q0 -58 -57 -179 q-84 -177 -238 -288h2514q39 0 39 -41z" />
+<glyph unicode="⟶" horiz-adv-x="3008" d="M2866 611q25 -11 25 -27t-15 -22l-46 -18q-190 -83 -296 -265q-41 -70 -79 -213q-2 -7 -8 -13t-53 -6q-21 0 -21 27q0 2 8 36q65 274 287 431h-2514q-39 0 -39 41t39 41h2514q-154 111 -238 288q-57 121 -57 179q0 24 21 28q-3 -1 41 -1q15 0 20 -19q14 -55 54 -163 q105 -217 317 -310z" />
+<glyph unicode="⟷" horiz-adv-x="3008" d="M2866 611q25 -11 25 -27t-15 -22l-46 -18q-190 -83 -296 -265q-41 -70 -79 -213q-2 -7 -8 -13t-53 -6q-21 0 -21 27q0 2 8 36q65 274 287 431h-2330q222 -157 287 -431q8 -34 8 -36q0 -27 -21 -27q-47 0 -53 6t-8 13q-22 84 -35.5 123t-43.5 90q-106 182 -296 265l-47 18 q-14 6 -14 22t25 27l40 14q210 91 317 310q24 49 54 163q5 19 20 19q44 0 41 1q21 -4 21 -28q0 -58 -57 -179q-84 -177 -238 -288h2330q-154 111 -238 288q-57 121 -57 179q0 24 21 28q-3 -1 41 -1q15 0 20 -19q14 -55 54 -163q105 -217 317 -310z" />
+<glyph unicode="⟸" horiz-adv-x="3008" d="M2891 383q0 -41 -37 -41h-2200q45 -44 126 -155t81 -146q0 -20 -23 -23q7 1 -38 1q-11 0 -17 12q-74 142 -162 238q-175 191 -418 272l-71 21q-16 5 -16 20t16 23l68 20q172 56 323 177.5t260 330.5q6 12 58 12q20 0 20 -28.5t-80.5 -138.5t-126.5 -156h2200q37 0 37 -41 t-37 -41h-2290q-120 -99 -262 -158q142 -59 262 -158h2290q37 0 37 -41z" />
+<glyph unicode="⟹" horiz-adv-x="3008" d="M2891 582q0 -15 -14 -20q-36 -10 -107 -34q-357 -136 -546 -497q-6 -12 -58 -12q-20 0 -20 22q0 36 80.5 145.5t126.5 155.5h-2198q-39 0 -39 41t39 41h2288q120 99 262 158q-142 59 -262 158h-2288q-39 0 -39 41t39 41h2198q-50 52 -128.5 158.5t-78.5 142.5q0 20 23 23 q-5 -1 38 -1q11 0 17 -12q110 -208 259.5 -329.5t324.5 -178.5q28 -6 69 -20q14 -8 14 -23z" />
+<glyph unicode="⟺" horiz-adv-x="3008" d="M2892 605q14 -8 14 -22.5t-14 -20.5q-201 -89 -318.5 -204t-188.5 -255l-32 -70q-7 -14 -59 -14q-21 0 -21 22q0 38 67.5 142.5t113.5 158.5h-1900q43 -47 111.5 -155t68.5 -146q0 -22 -61 -22q-11 0 -19 19l-30 64q-88 175 -241 303q-116 98 -265 157q-16 6 -16 20.5 t16 22.5q31 13 92 41q276 140 414 417l31 68q7 14 59 14q20 0 20 -22q0 -38 -68 -144.5t-112 -156.5h1900q-48 58 -114.5 160.5t-66.5 140.5q0 22 62 22q11 0 18 -14l57 -115q31 -55 72 -108q135 -174 332 -269q28 -11 78 -34zM2751 582q-122 66 -219 158h-2056 q-97 -92 -219 -158q122 -66 219 -158h2056q97 92 219 158z" />
+<glyph unicode="⟻" horiz-adv-x="3008" d="M2925 44q0 -62 -41 -62t-41 62v497h-2505q228 -162 288 -432q7 -31 7 -35q0 -24 -21 -27h-41q-14 0 -20 19q-33 175 -142 303.5t-278 192.5q-16 6 -16 20t16 23l46 18q282 122 363 428q3 16 9.5 40.5t26.5 26.5q-9 -1 36 -1q21 0 21 -27q0 -4 -7 -35q-59 -266 -288 -432 h2505v498q0 61 41 61t41 -61v-1077z" />
+<glyph unicode="⟼" horiz-adv-x="3008" d="M2866 611q25 -11 25 -27t-15 -22l-46 -18q-190 -83 -296 -265q-41 -70 -79 -213q-2 -7 -8 -13t-53 -6q-21 0 -21 27q0 2 8 36q65 274 287 431h-2503v-497q0 -62 -41 -62t-41 62v1077q0 61 41 61t41 -61v-498h2503q-154 111 -238 288q-57 121 -57 179q0 24 21 28 q-3 -1 41 -1q15 0 20 -19q14 -55 54 -163q105 -217 317 -310z" />
+<glyph unicode="⟽" horiz-adv-x="3008" d="M2925 44q0 -62 -41 -62t-41 62v298h-2189q45 -44 126 -155t81 -146q0 -20 -23 -23q7 1 -38 1q-11 0 -17 12q-74 142 -162 238q-175 191 -418 272l-71 21q-16 5 -16 20t16 23l68 20q172 56 323 177.5t260 330.5q6 12 58 12q20 0 20 -28.5t-80.5 -138.5t-126.5 -156h2189 v299q0 61 41 61t41 -61v-1077zM2843 424v316h-2279q-120 -99 -262 -158q142 -59 262 -158h2279z" />
+<glyph unicode="⟾" horiz-adv-x="3008" d="M2891 582q0 -15 -14 -20q-36 -10 -107 -34q-357 -136 -546 -497q-6 -12 -58 -12q-20 0 -20 22q0 36 80.5 145.5t126.5 155.5h-2188v-298q0 -62 -41 -62t-41 62v1077q0 61 41 61t41 -61v-299h2188q-50 52 -128.5 158.5t-78.5 142.5q0 20 23 23q-5 -1 38 -1q11 0 17 -12 q110 -208 259.5 -329.5t324.5 -178.5q28 -6 69 -20q14 -8 14 -23zM165 740v-316h2278q120 99 262 158q-142 59 -262 158h-2278z" />
+<glyph unicode="⟿" horiz-adv-x="3008" d="M2891 582q0 -11 -27 -26q-154 -87 -230 -236l-25 -58q-12 -26 -36 -26q-42 0 -42 39q0 7 3 15q52 144 178 251h-658q-16 0 -32 14l-158 142l-348 -314q-13 -12 -31 -12t-31 12l-348 314l-348 -314q-13 -12 -31 -12t-31 12l-348 314l-160 -142q-16 -14 -30 -14 q-41 0 -41 41q0 20 10 29l190 170q13 12 31 12t31 -12l348 -314l348 314q13 12 31 12t31 -12l348 -314l348 314q13 12 31 12t31 -12l176 -158h642q-127 107 -179 253q-3 8 -3 15q0 39 42 39q24 0 34 -23l27 -62q75 -149 230 -237q27 -15 27 -26z" />
+<glyph unicode="⤀" d="M1931 582q0 -14 -16 -20q-259 -98 -369 -334q-23 -49 -33 -90l-18 -72q-6 -19 -20 -19h-41q-21 3 -21 27q0 4 7 35q60 270 288 432h-234q-133 -60 -226 -170q-94 -111 -132 -258q-3 -16 -10 -41t-21 -25h-41q-21 3 -21 27q0 4 7 35q60 270 288 432h-667v-395 q0 -39 -41 -39t-41 39v395h-415q-39 0 -39 41t39 41h415v397q0 37 41 37t41 -37v-397h667q-229 166 -288 432q-7 31 -7 35q0 27 21 27q45 0 36 1q20 -2 24 -19t12 -48q38 -146 132.5 -257.5t230.5 -170.5h229q-229 166 -288 432q-7 31 -7 35q0 27 21 27q45 0 36 1 q20 -2 24 -19t12 -48q38 -146 132.5 -257.5t230.5 -170.5q16 -5 46 -18q16 -9 16 -23z" />
+<glyph unicode="⤁" d="M1931 582q0 -14 -16 -20q-259 -98 -369 -334q-23 -49 -33 -90l-18 -72q-6 -19 -20 -19h-41q-21 3 -21 27q0 4 7 35q60 270 288 432h-234q-133 -60 -226 -170q-94 -111 -132 -258q-3 -16 -10 -41t-21 -25h-41q-21 3 -21 27q0 4 7 35q60 270 288 432h-567v-395 q0 -39 -41 -39t-41 39v395h-218v-395q0 -39 -41 -39t-41 39v395h-215q-39 0 -39 41t39 41h215v397q0 37 41 37t41 -37v-397h218v397q0 37 41 37t41 -37v-397h567q-229 166 -288 432q-7 31 -7 35q0 27 21 27q45 0 36 1q20 -2 24 -19t12 -48q38 -146 132.5 -257.5 t230.5 -170.5h229q-229 166 -288 432q-7 31 -7 35q0 27 21 27q45 0 36 1q20 -2 24 -19t12 -48q38 -146 132.5 -257.5t230.5 -170.5q16 -5 46 -18q16 -9 16 -23z" />
+<glyph unicode="⤂" d="M1932 383q0 -41 -37 -41h-581v-196q0 -39 -41 -39t-41 39v196h-578q45 -44 126 -155t81 -146q0 -20 -23 -23q7 1 -38 1q-11 0 -17 12q-74 142 -162 238q-175 191 -418 272l-71 21q-16 5 -16 20t16 23l68 20q172 56 323 177.5t260 330.5q6 12 58 12q20 0 20 -28.5 t-80.5 -138.5t-126.5 -156h578v198q0 37 41 37t41 -37v-198h581q37 0 37 -41t-37 -41h-581v-316h581q37 0 37 -41zM1232 424v316h-668q-120 -99 -262 -158q142 -59 262 -158h668z" />
+<glyph unicode="⤃" d="M1932 582q0 -15 -14 -20q-36 -10 -107 -34q-357 -136 -546 -497q-6 -12 -58 -12q-20 0 -20 22q0 36 80.5 145.5t126.5 155.5h-578v-196q0 -39 -41 -39t-41 39v196h-579q-39 0 -39 41t39 41h579v316h-579q-39 0 -39 41t39 41h579v198q0 37 41 37t41 -37v-198h578 q-50 52 -128.5 158.5t-78.5 142.5q0 20 23 23q-5 -1 38 -1q11 0 17 -12q110 -208 259.5 -329.5t324.5 -178.5q28 -6 69 -20q14 -8 14 -23zM816 740v-316h668q120 99 262 158q-142 59 -262 158h-668z" />
+<glyph unicode="⤄" horiz-adv-x="2560" d="M2444 605q14 -8 14 -22.5t-14 -20.5q-201 -89 -318.5 -204t-188.5 -255l-32 -70q-7 -14 -59 -14q-21 0 -21 22q0 38 67.5 142.5t113.5 158.5h-685v-196q0 -39 -41 -39t-41 39v196h-685q43 -47 111.5 -155t68.5 -146q0 -22 -61 -22q-11 0 -19 19l-30 64q-85 169 -230 295 q-121 103 -276 165q-16 6 -16 20.5t16 22.5q31 13 92 41q276 140 414 417l31 68q7 14 59 14q20 0 20 -22q0 -38 -68 -144.5t-112 -156.5h685v198q0 37 41 37t41 -37v-198h685q-48 58 -114.5 160.5t-66.5 140.5q0 22 62 22q11 0 18 -14l57 -115q31 -55 72 -108 q135 -174 332 -269q28 -11 78 -34zM1321 740v-316h763q97 92 219 158q-122 66 -219 158h-763zM1239 424v316h-763q-97 -92 -219 -158q122 -66 219 -158h763z" />
+<glyph unicode="⤅" d="M1931 582q0 -14 -16 -20q-259 -98 -369 -334q-23 -49 -33 -90l-18 -72q-6 -19 -20 -19h-41q-21 3 -21 27q0 4 7 35q60 270 288 432h-234q-133 -60 -226 -170q-94 -111 -132 -258q-3 -16 -10 -41t-21 -25h-41q-21 3 -21 27q0 4 7 35q60 270 288 432h-1153v-497 q0 -62 -41 -62t-41 62v1077q0 61 41 61t41 -61v-498h1153q-229 166 -288 432q-7 31 -7 35q0 27 21 27q45 0 36 1q20 -2 24 -19t12 -48q38 -146 132.5 -257.5t230.5 -170.5h229q-229 166 -288 432q-7 31 -7 35q0 27 21 27q45 0 36 1q20 -2 24 -19t12 -48 q38 -146 132.5 -257.5t230.5 -170.5q16 -5 46 -18q16 -9 16 -23z" />
+<glyph unicode="⤆" d="M1965 44q0 -62 -41 -62t-41 62v298h-1229q45 -44 126 -155t81 -146q0 -20 -23 -23q7 1 -38 1q-11 0 -17 12q-74 142 -162 238q-175 191 -418 272l-71 21q-16 5 -16 20t16 23l68 20q172 56 323 177.5t260 330.5q6 12 58 12q20 0 20 -28.5t-80.5 -138.5t-126.5 -156h1229 v299q0 61 41 61t41 -61v-1077zM1883 424v316h-1319q-120 -99 -262 -158q142 -59 262 -158h1319z" />
+<glyph unicode="⤇" d="M1932 582q0 -15 -14 -20q-36 -10 -107 -34q-357 -136 -546 -497q-6 -12 -58 -12q-20 0 -20 22q0 36 80.5 145.5t126.5 155.5h-1229v-298q0 -62 -41 -62t-41 62v1077q0 61 41 61t41 -61v-299h1229q-50 52 -128.5 158.5t-78.5 142.5q0 20 23 23q-5 -1 38 -1q11 0 17 -12 q110 -208 259.5 -329.5t324.5 -178.5q28 -6 69 -20q14 -8 14 -23zM165 740v-316h1319q120 99 262 158q-142 59 -262 158h-1319z" />
+<glyph unicode="⤈" horiz-adv-x="1024" d="M553 -36q136 223 414 293q22 0 22 -18q0 -60 -14 -64q-22 -6 -65 -19q-132 -46 -229.5 -150.5t-132.5 -239.5q-4 -22 -13 -66q-4 -18 -22 -18t-24 18q-4 23 -13 67q-35 134 -132.5 238.5t-229.5 150.5q-22 6 -65 19q-14 6 -14 19q0 51 -1 40q2 23 23 23l6 -2 q104 -29 161 -59q157 -83 247 -232v835h-347q-37 0 -37 41t37 41h347v564q0 37 41 37t41 -37v-564h345q39 0 39 -41t-39 -41h-345v-835z" />
+<glyph unicode="⤉" horiz-adv-x="1024" d="M471 1200q-135 -223 -414 -293q-21 0 -23 23q1 -11 1 40q0 13 14 19q22 6 65 19q132 46 229.5 150.5t132.5 238.5q3 23 13 67q6 18 24 18t22 -18q4 -22 13 -66q35 -135 132.5 -239.5t229.5 -150.5q22 -6 65 -19q14 -4 14 -64q0 -18 -22 -18l-6 2q-102 28 -160 59 q-158 84 -248 232v-835h345q39 0 39 -41t-39 -41h-345v-564q0 -37 -41 -37t-41 37v564h-347q-37 0 -37 41t37 41h347v835z" />
+<glyph unicode="⤊" horiz-adv-x="1602" d="M1540 846q0 -42 -39 -42q-7 0 -15 3q-129 47 -247 118v-1206q0 -37 -41 -37t-41 37v1261q-186 132 -315 317v-1574q0 -41 -41 -41t-41 41v1574q-131 -186 -315 -318v-1260q0 -37 -41 -37t-41 37v1206q-117 -71 -247 -118q-8 -3 -15 -3q-39 0 -39 42q0 22 27 36 q46 18 136 57q277 136 462 394l79 124q17 25 35 25t35 -25q25 -42 78 -124q182 -255 464 -394q46 -18 135 -57q27 -14 27 -36z" />
+<glyph unicode="⤋" horiz-adv-x="1602" d="M1540 318q0 -22 -27 -36q-46 -18 -135 -57q-282 -139 -464 -394q-25 -42 -78 -124q-17 -25 -35 -25t-35 25q-25 42 -79 124q-185 258 -462 394q-46 17 -136 57q-27 14 -27 36q0 42 39 42q7 0 15 -3q130 -47 247 -118v1206q0 37 41 37t41 -37v-1260q184 -132 315 -318 v1574q0 41 41 41t41 -41v-1574q129 185 315 317v1261q0 37 41 37t41 -37v-1206q118 71 247 118q8 3 15 3q39 0 39 -42z" />
+<glyph unicode="⤌" d="M1931 582q0 -41 -37 -41h-624q-39 0 -39 41t39 41h624q37 0 37 -41zM1041 582q0 -41 -39 -41h-664q228 -162 288 -432q7 -31 7 -35q0 -24 -21 -27h-41q-14 0 -20 19q-33 175 -142 303.5t-278 192.5q-16 6 -16 20t16 23l46 18q282 122 363 428q3 16 9.5 40.5t26.5 26.5 q-9 -1 36 -1q21 0 21 -27q0 -4 -7 -35q-59 -266 -288 -432h664q39 0 39 -41z" />
+<glyph unicode="⤍" d="M1931 582q0 -14 -16 -20q-259 -98 -369 -334q-23 -49 -33 -90l-18 -72q-6 -19 -20 -19h-41q-21 3 -21 27q0 4 7 35q60 270 288 432h-664q-39 0 -39 41t39 41h664q-229 166 -288 432q-7 31 -7 35q0 27 21 27q45 0 36 1q20 -2 24 -19t12 -48q38 -146 132.5 -257.5 t230.5 -170.5q16 -5 46 -18q16 -9 16 -23zM815 582q0 -41 -39 -41h-624q-37 0 -37 41t37 41h624q39 0 39 -41z" />
+<glyph unicode="⤎" d="M1931 582q0 -41 -37 -41h-304q-39 0 -39 41t39 41h304q37 0 37 -41zM1361 582q0 -41 -37 -41h-304q-39 0 -39 41t39 41h304q37 0 37 -41zM791 582q0 -41 -39 -41h-414q228 -162 288 -432q7 -31 7 -35q0 -24 -21 -27h-41q-14 0 -20 19q-33 175 -142 303.5t-278 192.5 q-16 6 -16 20t16 23l46 18q282 122 363 428q3 16 9.5 40.5t26.5 26.5q-9 -1 36 -1q21 0 21 -27q0 -4 -7 -35q-59 -266 -288 -432h414q39 0 39 -41z" />
+<glyph unicode="⤏" d="M1931 582q0 -14 -16 -20q-259 -98 -369 -334q-23 -49 -33 -90l-18 -72q-6 -19 -20 -19h-41q-21 3 -21 27q0 4 7 35q60 270 288 432h-414q-39 0 -39 41t39 41h414q-229 166 -288 432q-7 31 -7 35q0 27 21 27q45 0 36 1q20 -2 24 -19t12 -48q38 -146 132.5 -257.5 t230.5 -170.5q16 -5 46 -18q16 -9 16 -23zM1065 582q0 -41 -39 -41h-304q-37 0 -37 41t37 41h304q39 0 39 -41zM495 582q0 -41 -39 -41h-304q-37 0 -37 41t37 41h304q39 0 39 -41z" />
+<glyph unicode="⤐" d="M1963 582q0 -14 -16 -20q-259 -98 -369 -334q-23 -49 -33 -90l-18 -72q-6 -19 -20 -19h-41q-21 3 -21 27q0 4 7 35q60 270 288 432h-234q-133 -60 -226 -170q-94 -111 -132 -258q-3 -16 -10 -41t-21 -25h-41q-21 3 -21 27q0 4 7 35q60 270 288 432h-54q-39 0 -39 41 t39 41h54q-229 166 -288 432q-7 31 -7 35q0 27 21 27q45 0 36 1q20 -2 24 -19t12 -48q38 -146 132.5 -257.5t230.5 -170.5h229q-229 166 -288 432q-7 31 -7 35q0 27 21 27q45 0 36 1q20 -2 24 -19t12 -48q38 -146 132.5 -257.5t230.5 -170.5q16 -5 46 -18q16 -9 16 -23z M1087 582q0 -41 -39 -41h-194q-37 0 -37 41t37 41h194q39 0 39 -41zM647 582q0 -41 -39 -41h-37q-282 -122 -363 -428q-3 -16 -9.5 -40.5t-26.5 -26.5q9 1 -36 1q-21 0 -21 27q0 4 7 35q26 118 93 224q97 154 247 249q-150 95 -247 249q-67 106 -93 224q-7 31 -7 35 q0 27 21 27q45 0 36 1q20 -2 24 -19t12 -48q38 -146 132.5 -257.5t230.5 -170.5h37q39 0 39 -41z" />
+<glyph unicode="⤑" d="M1931 582q0 -14 -16 -21.5t-46 -19.5q-282 -122 -363 -428q-3 -16 -9.5 -40.5t-26.5 -26.5q9 1 -36 1q-21 0 -21 27q0 4 7 35q59 266 288 432h-54q-39 0 -39 41t39 41h54q-228 162 -288 432q-7 31 -7 35q0 24 21 27h41q14 0 20 -19q33 -175 142 -303.5t278 -192.5 q16 -6 16 -20zM1445 582q0 -41 -39 -41h-54q-37 0 -37 41t37 41h54q39 0 39 -41zM1145 582q0 -41 -39 -41h-54q-37 0 -37 41t37 41h54q39 0 39 -41zM845 582q0 -41 -39 -41h-54q-37 0 -37 41t37 41h54q39 0 39 -41zM545 582q0 -41 -39 -41h-54q-37 0 -37 41t37 41h54 q39 0 39 -41zM245 582q0 -41 -39 -41h-54q-37 0 -37 41t37 41h54q39 0 39 -41z" />
+<glyph unicode="⤒" horiz-adv-x="1024" d="M471 1200q-135 -223 -414 -293q-21 0 -23 23q1 -11 1 40q0 13 14 19q22 6 65 19q132 46 229.5 150.5t132.5 238.5q3 23 13 67q6 18 24 18t22 -18q4 -22 13 -66q35 -135 132.5 -239.5t229.5 -150.5q22 -6 65 -19q14 -4 14 -64q0 -18 -22 -18l-6 2q-102 28 -160 59 q-158 84 -248 232v-1481q0 -37 -41 -37t-41 37v1481zM926 1606q63 0 63 -40.5t-63 -40.5h-828q-63 0 -63 40.5t63 40.5h828z" />
+<glyph unicode="⤓" horiz-adv-x="1024" d="M553 -36q136 223 414 293q22 0 22 -18q0 -60 -14 -64q-22 -6 -65 -19q-132 -46 -229.5 -150.5t-132.5 -239.5q-4 -22 -13 -66q-4 -18 -22 -18t-24 18q-4 23 -13 67q-35 134 -132.5 238.5t-229.5 150.5q-22 6 -65 19q-14 6 -14 19q0 51 -1 40q2 23 23 23l6 -2 q104 -29 161 -59q157 -83 247 -232v1481q0 37 41 37t41 -37v-1481zM926 -361q63 0 63 -40.5t-63 -40.5h-828q-63 0 -63 40.5t63 40.5h828z" />
+<glyph unicode="⤔" d="M1963 582q0 -14 -16 -20q-259 -98 -369 -334q-23 -49 -33 -90l-18 -72q-6 -19 -20 -19h-41q-21 3 -21 27q0 4 7 35q60 270 288 432h-759v-395q0 -39 -41 -39t-41 39v395h-328q-282 -122 -363 -428q-3 -16 -9.5 -40.5t-26.5 -26.5q9 1 -36 1q-21 0 -21 27q0 4 7 35 q26 118 93 224q97 154 247 249q-150 95 -247 249q-67 106 -93 224q-7 31 -7 35q0 27 21 27q45 0 36 1q20 -2 24 -19t12 -48q38 -146 132.5 -257.5t230.5 -170.5h328v397q0 37 41 37t41 -37v-397h759q-229 166 -288 432q-7 31 -7 35q0 27 21 27q45 0 36 1q20 -2 24 -19 t12 -48q38 -146 132.5 -257.5t230.5 -170.5q16 -5 46 -18q16 -9 16 -23z" />
+<glyph unicode="⤕" d="M1963 582q0 -14 -16 -20q-259 -98 -369 -334q-23 -49 -33 -90l-18 -72q-6 -19 -20 -19h-41q-21 3 -21 27q0 4 7 35q60 270 288 432h-569v-395q0 -39 -41 -39t-41 39v395h-218v-395q0 -39 -41 -39t-41 39v395h-218q-282 -122 -363 -428q-3 -16 -9.5 -40.5t-26.5 -26.5 q9 1 -36 1q-21 0 -21 27q0 4 7 35q26 118 93 224q97 154 247 249q-150 95 -247 249q-67 106 -93 224q-7 31 -7 35q0 27 21 27q45 0 36 1q20 -2 24 -19t12 -48q38 -146 132.5 -257.5t230.5 -170.5h218v397q0 37 41 37t41 -37v-397h218v397q0 37 41 37t41 -37v-397h569 q-229 166 -288 432q-7 31 -7 35q0 27 21 27q45 0 36 1q20 -2 24 -19t12 -48q38 -146 132.5 -257.5t230.5 -170.5q16 -5 46 -18q16 -9 16 -23z" />
+<glyph unicode="⤖" d="M1963 582q0 -14 -16 -20q-259 -98 -369 -334q-23 -49 -33 -90l-18 -72q-6 -19 -20 -19h-41q-21 3 -21 27q0 4 7 35q60 270 288 432h-234q-133 -60 -226 -170q-94 -111 -132 -258q-3 -16 -10 -41t-21 -25h-41q-21 3 -21 27q0 4 7 35q60 270 288 432h-779 q-282 -122 -363 -428q-3 -16 -9.5 -40.5t-26.5 -26.5q9 1 -36 1q-21 0 -21 27q0 4 7 35q26 118 93 224q97 154 247 249q-150 95 -247 249q-67 106 -93 224q-7 31 -7 35q0 27 21 27q45 0 36 1q20 -2 24 -19t12 -48q38 -146 132.5 -257.5t230.5 -170.5h779q-229 166 -288 432 q-7 31 -7 35q0 27 21 27q45 0 36 1q20 -2 24 -19t12 -48q38 -146 132.5 -257.5t230.5 -170.5h229q-229 166 -288 432q-7 31 -7 35q0 27 21 27q45 0 36 1q20 -2 24 -19t12 -48q38 -146 132.5 -257.5t230.5 -170.5q16 -5 46 -18q16 -9 16 -23z" />
+<glyph unicode="⤗" d="M1963 582q0 -14 -16 -20q-259 -98 -369 -334q-23 -49 -33 -90l-18 -72q-6 -19 -20 -19h-41q-21 3 -21 27q0 4 7 35q60 270 288 432h-234q-133 -60 -226 -170q-94 -111 -132 -258q-3 -16 -10 -41t-21 -25h-41q-21 3 -21 27q0 4 7 35q60 270 288 432h-509v-395 q0 -39 -41 -39t-41 39v395h-188q-282 -122 -363 -428q-3 -16 -9.5 -40.5t-26.5 -26.5q9 1 -36 1q-21 0 -21 27q0 4 7 35q26 118 93 224q97 154 247 249q-150 95 -247 249q-67 106 -93 224q-7 31 -7 35q0 27 21 27q45 0 36 1q20 -2 24 -19t12 -48q38 -146 132.5 -257.5 t230.5 -170.5h188v397q0 37 41 37t41 -37v-397h509q-229 166 -288 432q-7 31 -7 35q0 27 21 27q45 0 36 1q20 -2 24 -19t12 -48q38 -146 132.5 -257.5t230.5 -170.5h229q-229 166 -288 432q-7 31 -7 35q0 27 21 27q45 0 36 1q20 -2 24 -19t12 -48q38 -146 132.5 -257.5 t230.5 -170.5q16 -5 46 -18q16 -9 16 -23z" />
+<glyph unicode="⤘" horiz-adv-x="2248" d="M2163 582q0 -14 -16 -20q-259 -98 -369 -334q-23 -49 -33 -90l-18 -72q-6 -19 -20 -19h-41q-21 3 -21 27q0 4 7 35q60 270 288 432h-234q-133 -60 -226 -170q-94 -111 -132 -258q-3 -16 -10 -41t-21 -25h-41q-21 3 -21 27q0 4 7 35q60 270 288 432h-469v-395 q0 -39 -41 -39t-41 39v395h-218v-395q0 -39 -41 -39t-41 39v395h-128q-282 -122 -363 -428q-3 -16 -9.5 -40.5t-26.5 -26.5q9 1 -36 1q-21 0 -21 27q0 4 7 35q26 118 93 224q97 154 247 249q-150 95 -247 249q-67 106 -93 224q-7 31 -7 35q0 27 21 27q45 0 36 1 q20 -2 24 -19t12 -48q38 -146 132.5 -257.5t230.5 -170.5h128v397q0 37 41 37t41 -37v-397h218v397q0 37 41 37t41 -37v-397h469q-229 166 -288 432q-7 31 -7 35q0 27 21 27q45 0 36 1q20 -2 24 -19t12 -48q38 -146 132.5 -257.5t230.5 -170.5h229q-229 166 -288 432 q-7 31 -7 35q0 27 21 27q45 0 36 1q20 -2 24 -19t12 -48q38 -146 132.5 -257.5t230.5 -170.5q16 -5 46 -18q16 -9 16 -23z" />
+<glyph unicode="⤙" d="M1931 74q0 -27 -21 -27q-45 0 -36 -1q-20 2 -24 19t-12 48q-38 146 -132.5 257.5t-230.5 170.5h-1321q-39 0 -39 41t39 41h1321q282 122 363 428q3 16 9.5 40.5t26.5 26.5q-9 -1 36 -1q21 0 21 -27q0 -4 -7 -35q-26 -118 -93 -224q-97 -154 -247 -249q150 -95 247 -249 q67 -106 93 -224q7 -31 7 -35z" />
+<glyph unicode="⤚" d="M1931 582q0 -41 -39 -41h-1321q-282 -122 -363 -428q-3 -16 -9.5 -40.5t-26.5 -26.5q9 1 -36 1q-21 0 -21 27q0 4 7 35q26 118 93 224q97 154 247 249q-150 95 -247 249q-67 106 -93 224q-7 31 -7 35q0 27 21 27q45 0 36 1q20 -2 24 -19t12 -48q38 -146 132.5 -257.5 t230.5 -170.5h1321q39 0 39 -41z" />
+<glyph unicode="⤛" d="M1931 74q0 -27 -21 -27q-45 0 -36 -1q-20 2 -24 19t-12 48q-38 146 -132.5 257.5t-230.5 170.5h-229q228 -162 288 -432q7 -31 7 -35q0 -24 -21 -27h-41q-14 0 -20 19q-33 175 -134.5 295t-234.5 180h-936q-39 0 -39 41t39 41h931q282 122 363 428q3 16 9.5 40.5 t26.5 26.5q-9 -1 36 -1q21 0 21 -27q0 -4 -7 -35q-59 -266 -288 -432h229q282 122 363 428q3 16 9.5 40.5t26.5 26.5q-9 -1 36 -1q21 0 21 -27q0 -4 -7 -35q-26 -118 -93 -224q-97 -154 -247 -249q150 -95 247 -249q67 -106 93 -224q7 -31 7 -35z" />
+<glyph unicode="⤜" d="M1931 582q0 -41 -39 -41h-936q-133 -60 -226 -170q-94 -111 -132 -258q-3 -16 -10 -41t-21 -25h-41q-21 3 -21 27q0 4 7 35q60 270 288 432h-229q-282 -122 -363 -428q-3 -16 -9.5 -40.5t-26.5 -26.5q9 1 -36 1q-21 0 -21 27q0 4 7 35q26 118 93 224q97 154 247 249 q-150 95 -247 249q-67 106 -93 224q-7 31 -7 35q0 27 21 27q45 0 36 1q20 -2 24 -19t12 -48q38 -146 132.5 -257.5t230.5 -170.5h229q-229 166 -288 432q-7 31 -7 35q0 27 21 27q45 0 36 1q20 -2 24 -19t12 -48q38 -146 132.5 -257.5t230.5 -170.5h931q39 0 39 -41z" />
+<glyph unicode="⤝" d="M1931 582q0 -41 -39 -41h-1154q228 -162 288 -432q7 -31 7 -35q0 -24 -21 -27h-41q-14 0 -20 19q-33 175 -142 303.5t-278 192.5q-16 6 -16 20t16 23l46 18q282 122 363 428q3 16 9.5 40.5t26.5 26.5q-9 -1 36 -1q21 0 21 -27q0 -4 -7 -35q-59 -266 -288 -432h1154 q39 0 39 -41zM427 582l-156 -156l-156 156l156 156z" />
+<glyph unicode="⤞" d="M1931 582l-156 -156l-156 156l156 156zM1531 582q0 -14 -16 -20q-259 -98 -369 -334q-23 -49 -33 -90l-18 -72q-6 -19 -20 -19h-41q-21 3 -21 27q0 4 7 35q60 270 288 432h-1154q-39 0 -39 41t39 41h1154q-229 166 -288 432q-7 31 -7 35q0 27 21 27q45 0 36 1 q20 -2 24 -19t12 -48q38 -146 132.5 -257.5t230.5 -170.5q16 -5 46 -18q16 -9 16 -23z" />
+<glyph unicode="⤟" d="M1965 44q0 -62 -41 -62t-41 62v497h-1145q228 -162 288 -432q7 -31 7 -35q0 -24 -21 -27h-41q-14 0 -20 19q-33 175 -142 303.5t-278 192.5q-16 6 -16 20t16 23l46 18q282 122 363 428q3 16 9.5 40.5t26.5 26.5q-9 -1 36 -1q21 0 21 -27q0 -4 -7 -35q-59 -266 -288 -432 h1145v498q0 61 41 61t41 -61v-1077zM427 582l-156 -156l-156 156l156 156z" />
+<glyph unicode="⤠" d="M1931 582l-156 -156l-156 156l156 156zM1506 611q25 -11 25 -27t-15 -22l-46 -18q-190 -83 -296 -265q-41 -70 -79 -213q-2 -7 -8 -13t-53 -6q-21 0 -21 27q0 2 8 36q65 274 287 431h-1143v-497q0 -62 -41 -62t-41 62v1077q0 61 41 61t41 -61v-498h1143 q-154 111 -238 288q-57 121 -57 179q0 24 21 28q-3 -1 41 -1q15 0 20 -19q14 -55 54 -163q105 -217 317 -310z" />
+<glyph unicode="⤡" d="M1924 -295q0 -23 -24 -23l-67 40q-127 76 -273 76t-259 -56q-71 -35 -67 -35q-10 0 -30.5 19t-20.5 31t12 19q165 100 346 100q76 0 149 -18l-1390 1390q19 -77 19 -150q0 -173 -101 -345q-8 -13 -18.5 -13t-30.5 20t-20 30l35 69q56 112 56 249q0 160 -76 283 q-40 66 -40 68q0 23 24 23l67 -40q127 -76 273 -76t259 56q71 35 67 35q10 0 30.5 -19t20.5 -31t-12 -19q-165 -100 -346 -100q-76 0 -149 18l1390 -1390q-19 77 -19 150q0 173 101 345q8 13 18.5 13t30.5 -20t20 -30l-35 -69q-56 -112 -56 -249q0 -160 76 -283 q40 -66 40 -68z" />
+<glyph unicode="⤢" d="M1924 1459q0 -2 -40 -68q-76 -123 -76 -271.5t56 -260.5l35 -69q0 -10 -20 -30t-30.5 -20t-18.5 13q-101 172 -101 345q0 73 19 150l-1390 -1390q73 18 149 18q181 0 346 -100q12 -7 12 -19t-20.5 -31t-30.5 -19q4 0 -67 35q-113 56 -259 56t-273 -76l-67 -40 q-24 0 -24 23q0 2 40 68q76 123 76 271.5t-56 260.5l-35 69q0 10 20 30t30.5 20t18.5 -13q101 -172 101 -345q0 -73 -19 -150l1390 1390q-73 -18 -149 -18q-181 0 -346 100q-12 7 -12 19t20.5 31t30.5 19q-4 0 67 -35q113 -56 259 -56t273 76l67 40q24 0 24 -23z" />
+<glyph unicode="⤣" horiz-adv-x="1503" d="M1277 375q102 -131 102 -247.5t-122 -235.5t-244.5 -119t-246.5 122q-68 67 -68 103.5t42 36.5q15 0 28 -12q18 -24 56 -70q95 -98 187.5 -98t186.5 94.5t94 187.5q0 119 -172 291l-820 820q19 -77 19 -150q0 -173 -101 -345q-8 -13 -18.5 -13t-30.5 20t-20 30l35 69 q56 112 56 249q0 160 -76 283q-40 66 -40 68q0 23 24 23l67 -40q127 -76 273 -76t259 56q71 35 67 35q10 0 30.5 -19t20.5 -31t-12 -19q-165 -100 -346 -100q-76 0 -149 18l735 -735q142 -142 184 -196z" />
+<glyph unicode="⤤" horiz-adv-x="1503" d="M1379 1459q0 -2 -41 -68q-75 -123 -75 -271.5t56 -260.5l35 -69q0 -10 -20 -30t-30.5 -20t-18.5 13q-101 172 -101 345q0 73 19 150l-820 -820q-172 -172 -172 -291q0 -93 94 -187.5t186.5 -94.5t187.5 98q17 25 56 70q13 12 28 12q42 0 42 -36.5t-68 -103.5 q-124 -122 -246.5 -122t-244.5 119t-122 235.5t102 247.5q42 54 184 196l735 735q-73 -18 -149 -18q-181 0 -346 100q-12 7 -12 19t20.5 31t30.5 19q-4 0 67 -35q113 -56 259 -56t273 76l67 40q24 0 24 -23z" />
+<glyph unicode="⤥" horiz-adv-x="1503" d="M1379 -204q0 -23 -24 -23l-67 40q-127 76 -273 76t-259 -56q-71 -35 -67 -35q-10 0 -30.5 19t-20.5 31t12 19q165 100 346 100q76 0 149 -18l-735 735q-142 142 -184 196q-102 131 -102 247.5t122 235.5t244.5 119t246.5 -122q68 -67 68 -103.5t-42 -36.5q-15 0 -28 12 q-18 24 -56 70q-95 98 -187.5 98t-186.5 -94.5t-94 -187.5q0 -119 172 -291l820 -820q-19 77 -19 150q0 173 101 345q8 13 18.5 13t30.5 -20t20 -30l-35 -69q-56 -112 -56 -249q0 -160 75 -283q41 -66 41 -68z" />
+<glyph unicode="⤦" horiz-adv-x="1503" d="M1257 1363q122 -119 122 -235.5t-102 -247.5q-42 -54 -184 -196l-735 -735q73 18 149 18q181 0 346 -100q12 -7 12 -19t-20.5 -31t-30.5 -19q4 0 -67 35q-113 56 -259 56t-273 -76l-67 -40q-24 0 -24 23q0 2 40 68q76 123 76 271.5t-56 260.5l-35 69q0 10 20 30t30.5 20 t18.5 -13q101 -172 101 -345q0 -73 -19 -150l820 820q172 172 172 291q0 93 -94 187.5t-186.5 94.5t-187.5 -98q-17 -25 -56 -70q-13 -12 -28 -12q-42 0 -42 36.5t68 103.5q124 122 246.5 122t244.5 -119z" />
+<glyph unicode="⤧" d="M1924 -274q0 -44 -44 -44q-14 0 -24 10l-832 832l-832 -832q-10 -10 -24 -10q-44 0 -44 44q0 14 10 24l832 832l-666 666q19 -77 19 -150q0 -173 -101 -345q-8 -13 -18.5 -13t-30.5 20t-20 30l35 69q56 112 56 249q0 160 -76 283q-40 66 -40 68q0 23 24 23l67 -40 q127 -76 273 -76t259 56q71 35 67 35q10 0 30.5 -19t20.5 -31t-12 -19q-165 -100 -346 -100q-76 0 -149 18l666 -666l666 666q-73 -18 -149 -18q-181 0 -346 100q-12 7 -12 19t20.5 31t30.5 19q-4 0 67 -35q113 -56 259 -56t273 76l67 40q24 0 24 -23q0 -2 -40 -68 q-76 -123 -76 -271.5t56 -260.5l35 -69q0 -10 -20 -30t-30.5 -20t-18.5 13q-101 172 -101 345q0 73 19 150l-666 -666l832 -832q10 -10 10 -24z" />
+<glyph unicode="⤨" d="M1924 -295q0 -23 -24 -23l-67 40q-127 76 -273 76t-259 -56q-71 -35 -67 -35q-10 0 -30.5 19t-20.5 31t12 19q165 100 346 100q76 0 149 -18l-666 666l-832 -832q-10 -10 -24 -10q-44 0 -44 44q0 14 10 24l832 832l-832 832q-10 10 -10 24q0 44 44 44q14 0 24 -10 l832 -832l666 666q-73 -18 -149 -18q-181 0 -346 100q-12 7 -12 19t20.5 31t30.5 19q-4 0 67 -35q113 -56 259 -56t273 76l67 40q24 0 24 -23q0 -2 -40 -68q-76 -123 -76 -271.5t56 -260.5l35 -69q0 -10 -20 -30t-30.5 -20t-18.5 13q-101 172 -101 345q0 73 19 150 l-666 -666l666 -666q-19 77 -19 150q0 173 101 345q8 13 18.5 13t30.5 -20t20 -30l-35 -69q-56 -112 -56 -249q0 -160 76 -283q40 -66 40 -68z" />
+<glyph unicode="⤩" d="M1924 -295q0 -23 -24 -23l-67 40q-127 76 -273 76t-259 -56q-71 -35 -67 -35q-10 0 -30.5 19t-20.5 31t12 19q165 100 346 100q76 0 149 -18l-666 666l-666 -666q73 18 149 18q181 0 346 -100q12 -7 12 -19t-20.5 -31t-30.5 -19q4 0 -67 35q-113 56 -259 56t-273 -76 l-67 -40q-24 0 -24 23q0 2 40 68q76 123 76 271.5t-56 260.5l-35 69q0 10 20 30t30.5 20t18.5 -13q101 -172 101 -345q0 -73 -19 -150l666 666l-832 832q-10 10 -10 24q0 44 44 44q14 0 24 -10l832 -832l832 832q10 10 24 10q44 0 44 -44q0 -14 -10 -24l-832 -832l666 -666 q-19 77 -19 150q0 173 101 345q8 13 18.5 13t30.5 -20t20 -30l-35 -69q-56 -112 -56 -249q0 -160 76 -283q40 -66 40 -68z" />
+<glyph unicode="⤪" d="M1924 -274q0 -44 -44 -44q-14 0 -24 10l-832 832l-666 -666q73 18 149 18q181 0 346 -100q12 -7 12 -19t-20.5 -31t-30.5 -19q4 0 -67 35q-113 56 -259 56t-273 -76l-67 -40q-24 0 -24 23q0 2 40 68q76 123 76 271.5t-56 260.5l-35 69q0 10 20 30t30.5 20t18.5 -13 q101 -172 101 -345q0 -73 -19 -150l666 666l-666 666q19 -77 19 -150q0 -173 -101 -345q-8 -13 -18.5 -13t-30.5 20t-20 30l35 69q56 112 56 249q0 160 -76 283q-40 66 -40 68q0 23 24 23l67 -40q127 -76 273 -76t259 56q71 35 67 35q10 0 30.5 -19t20.5 -31t-12 -19 q-165 -100 -346 -100q-76 0 -149 18l666 -666l832 832q10 10 24 10q44 0 44 -44q0 -14 -10 -24l-832 -832l832 -832q10 -10 10 -24z" />
+<glyph unicode="⤫" d="M1924 1438q0 -14 -10 -24l-1722 -1722q-10 -10 -24 -10q-44 0 -44 44q0 14 10 24l1722 1722q10 10 24 10q44 0 44 -44zM124 1438q0 44 44 44q14 0 24 -10l774 -774l-58 -58l-774 774q-10 10 -10 24zM1924 -274q0 -44 -44 -44q-14 0 -24 10l-774 774l58 58l774 -774 q10 -10 10 -24z" />
+<glyph unicode="⤬" d="M1924 1438q0 -14 -10 -24l-774 -774l-58 58l774 774q10 10 24 10q44 0 44 -44zM1924 -274q0 -44 -44 -44q-14 0 -24 10l-1722 1722q-10 10 -10 24q0 44 44 44q14 0 24 -10l1722 -1722q10 -10 10 -24zM168 -318q-44 0 -44 44q0 14 10 24l774 774l58 -58l-774 -774 q-10 -10 -24 -10z" />
+<glyph unicode="⤭" d="M1924 -295q0 -23 -24 -23l-67 40q-127 76 -273 76t-259 -56q-71 -35 -67 -35q-10 0 -30.5 19t-20.5 31t12 19q165 100 346 100q76 0 149 -18l-1556 1556q-10 10 -10 24q0 44 44 44q14 0 24 -10l1556 -1556q-19 77 -19 150q0 173 101 345q8 13 18.5 13t30.5 -20t20 -30 l-35 -69q-56 -112 -56 -249q0 -160 76 -283q40 -66 40 -68zM1924 1459q0 -2 -40 -68q-76 -123 -76 -271.5t56 -260.5l35 -69q0 -10 -20 -30t-30.5 -20t-18.5 13q-101 172 -101 345q0 73 19 150l-608 -608l-58 58l608 608q-73 -18 -149 -18q-181 0 -346 100q-12 7 -12 19 t20.5 31t30.5 19q-4 0 67 -35q113 -56 259 -56t273 76l67 40q24 0 24 -23zM168 -318q-44 0 -44 44q0 14 10 24l774 774l58 -58l-774 -774q-10 -10 -24 -10z" />
+<glyph unicode="⤮" d="M1924 1459q0 -2 -40 -68q-76 -123 -76 -271.5t56 -260.5l35 -69q0 -10 -20 -30t-30.5 -20t-18.5 13q-101 172 -101 345q0 73 19 150l-1556 -1556q-10 -10 -24 -10q-44 0 -44 44q0 14 10 24l1556 1556q-73 -18 -149 -18q-181 0 -346 100q-12 7 -12 19t20.5 31t30.5 19 q-4 0 67 -35q113 -56 259 -56t273 76l67 40q24 0 24 -23zM124 1438q0 44 44 44q14 0 24 -10l774 -774l-58 -58l-774 774q-10 10 -10 24zM1924 -295q0 -23 -24 -23l-67 40q-127 76 -273 76t-259 -56q-71 -35 -67 -35q-10 0 -30.5 19t-20.5 31t12 19q165 100 346 100 q76 0 149 -18l-608 608l58 58l608 -608q-19 77 -19 150q0 173 101 345q8 13 18.5 13t30.5 -20t20 -30l-35 -69q-56 -112 -56 -249q0 -160 76 -283q40 -66 40 -68z" />
+<glyph unicode="⤯" d="M1924 1459q0 -2 -40 -68q-76 -123 -76 -271.5t56 -260.5l35 -69q0 -10 -20 -30t-30.5 -20t-18.5 13q-101 172 -101 345q0 73 19 150l-608 -608l-58 58l608 608q-73 -18 -149 -18q-181 0 -346 100q-12 7 -12 19t20.5 31t30.5 19q-4 0 67 -35q113 -56 259 -56t273 76l67 40 q24 0 24 -23zM1924 -274q0 -44 -44 -44q-14 0 -24 10l-1722 1722q-10 10 -10 24q0 44 44 44q14 0 24 -10l1722 -1722q10 -10 10 -24zM168 -318q-44 0 -44 44q0 14 10 24l774 774l58 -58l-774 -774q-10 -10 -24 -10z" />
+<glyph unicode="⤰" d="M124 1438q0 44 44 44q14 0 24 -10l774 -774l-58 -58l-774 774q-10 10 -10 24zM1924 -295q0 -23 -24 -23l-67 40q-127 76 -273 76t-259 -56q-71 -35 -67 -35q-10 0 -30.5 19t-20.5 31t12 19q165 100 346 100q76 0 149 -18l-608 608l58 58l608 -608q-19 77 -19 150 q0 173 101 345q8 13 18.5 13t30.5 -20t20 -30l-35 -69q-56 -112 -56 -249q0 -160 76 -283q40 -66 40 -68zM1924 1438q0 -14 -10 -24l-1722 -1722q-10 -10 -24 -10q-44 0 -44 44q0 14 10 24l1722 1722q10 10 24 10q44 0 44 -44z" />
+<glyph unicode="⤱" d="M1924 1459q0 -2 -40 -68q-76 -123 -76 -271.5t56 -260.5l35 -69q0 -10 -20 -30t-30.5 -20t-18.5 13q-101 172 -101 345q0 73 19 150l-1556 -1556q-10 -10 -24 -10q-44 0 -44 44q0 14 10 24l1556 1556q-73 -18 -149 -18q-181 0 -346 100q-12 7 -12 19t20.5 31t30.5 19 q-4 0 67 -35q113 -56 259 -56t273 76l67 40q24 0 24 -23zM319 1098q0 -173 -101 -345q-8 -13 -18.5 -13t-30.5 20t-20 30l35 69q56 112 56 249q0 160 -76 283q-40 66 -40 68q0 23 24 23l67 -40q127 -76 273 -76t259 56q71 35 67 35q10 0 30.5 -19t20.5 -31t-12 -19 q-165 -100 -346 -100q-76 0 -149 18l608 -608l-58 -58l-608 608q19 -77 19 -150zM1924 -274q0 -44 -44 -44q-14 0 -24 10l-774 774l58 58l774 -774q10 -10 10 -24z" />
+<glyph unicode="⤲" d="M1924 -274q0 -44 -44 -44q-14 0 -24 10l-1556 1556q19 -77 19 -150q0 -173 -101 -345q-8 -13 -18.5 -13t-30.5 20t-20 30l35 69q56 112 56 249q0 160 -76 283q-40 66 -40 68q0 23 24 23l67 -40q127 -76 273 -76t259 56q71 35 67 35q10 0 30.5 -19t20.5 -31t-12 -19 q-165 -100 -346 -100q-76 0 -149 18l1556 -1556q10 -10 10 -24zM1924 1459q0 -2 -40 -68q-76 -123 -76 -271.5t56 -260.5l35 -69q0 -10 -20 -30t-30.5 -20t-18.5 13q-101 172 -101 345q0 73 19 150l-608 -608l-58 58l608 608q-73 -18 -149 -18q-181 0 -346 100q-12 7 -12 19 t20.5 31t30.5 19q-4 0 67 -35q113 -56 259 -56t273 76l67 40q24 0 24 -23zM168 -318q-44 0 -44 44q0 14 10 24l774 774l58 -58l-774 -774q-10 -10 -24 -10z" />
+<glyph unicode="⤳" d="M1980 582q0 -16 -15 -20q-163 -57 -276.5 -191t-144.5 -305q-3 -19 -21 -19h-41q-20 0 -20 27q51 292 295 467h-73q-84 0 -240.5 -114.5t-263 -114.5t-207.5 77q-63 48 -162.5 161t-152.5 156q-84 66 -163 66t-162 -66q-50 -41 -148 -151q-12 -14 -31 -14q-39 0 -39 41 q0 14 11 27q105 121 164 167q101 78 205 78t206 -78q59 -46 160.5 -161t153.5 -156q83 -65 164 -65t240.5 114.5t264.5 114.5h73q-244 175 -295 467q0 27 20 27h41q18 0 21 -19q31 -171 144.5 -304.5t276.5 -188.5q15 -7 15 -23z" />
+<glyph unicode="⤴" horiz-adv-x="1731" d="M1098 1324q-135 -223 -414 -293q-21 0 -23 23q1 -11 1 40q0 13 14 19q22 6 65 19q132 46 229.5 150.5t132.5 238.5q3 23 13 67q6 18 24 18t22 -18q4 -22 13 -66q35 -135 132.5 -239.5t229.5 -150.5q22 -6 65 -19q14 -4 14 -64q0 -18 -22 -18l-6 2q-102 28 -160 59 q-158 84 -248 232v-429q0 -244 -194 -316q-104 -38 -401 -38h-431q-39 0 -39 41t39 41h551q184 0 271 44q122 62 122 228v429z" />
+<glyph unicode="⤵" horiz-adv-x="1731" d="M1180 -160q136 223 414 293q22 0 22 -18q0 -60 -14 -64q-22 -6 -65 -19q-132 -46 -229.5 -150.5t-132.5 -239.5q-4 -22 -13 -66q-4 -18 -22 -18t-24 18q-4 23 -13 67q-35 134 -132.5 238.5t-229.5 150.5q-22 6 -65 19q-14 6 -14 19q0 51 -1 40q2 23 23 23l6 -2 q104 -29 161 -59q157 -83 247 -232v429q0 166 -122 228q-87 44 -271 44h-551q-39 0 -39 41t39 41h431q297 0 401 -38q194 -72 194 -316v-429z" />
+<glyph unicode="⤶" horiz-adv-x="1731" d="M397 541q223 -136 293 -414q0 -22 -18 -22q-60 0 -64 14q-6 22 -19 65q-46 132 -150.5 229.5t-239.5 132.5q-22 4 -66 13q-18 4 -18 22t18 24q23 4 67 13q134 35 238.5 132.5t150.5 229.5q6 22 19 65q6 14 19 14q51 0 40 1q23 -2 23 -23l-2 -6q-29 -104 -59 -161 q-83 -157 -232 -247h429q166 0 228 122q44 87 44 271v551q0 39 41 39t41 -39v-431q0 -297 -38 -401q-72 -194 -316 -194h-429z" />
+<glyph unicode="⤷" horiz-adv-x="1731" d="M898 623q-223 135 -293 414q0 21 23 23q-11 -1 40 -1q13 0 19 -14q6 -22 19 -65q46 -132 150.5 -229.5t238.5 -132.5q23 -3 67 -13q18 -6 18 -24t-18 -22q-22 -4 -66 -13q-135 -35 -239.5 -132.5t-150.5 -229.5q-6 -22 -19 -65q-4 -14 -64 -14q-18 0 -18 22l2 6 q28 102 59 160q84 158 232 248h-429q-244 0 -316 194q-38 104 -38 401v431q0 39 41 39t41 -39v-551q0 -184 44 -271q62 -122 228 -122h429z" />
+<glyph unicode="⤸" horiz-adv-x="1024" d="M706.5 1141q120.5 -253 120.5 -512.5t-118.5 -500.5t-323.5 -409q16 1 35 1q67 0 166 -16q126 -22 126 -71q0 -42 -38 -42l-77 27q-78 27 -161 27t-169 -23q-19 -5 -25 -5q-17 0 -17 17q0 6 14 58.5t14 135t-28 161.5l-28 79q0 37 42.5 37t66 -103.5t23.5 -147t-2 -78.5 q418 368 418 853q0 397 -278 729l-136 138q-14 15 -14 30q0 43 41 43q15 0 28 -11q200 -164 320.5 -417z" />
+<glyph unicode="⤹" horiz-adv-x="1024" d="M827 68l-28 -79q-28 -79 -28 -161.5t23 -168.5q5 -19 5 -25q0 -17 -17 -17q-6 0 -58.5 14t-135.5 14t-161 -27l-77 -27q-38 0 -38 42q0 49 126 71q99 16 166 16q19 0 35 -1q-205 168 -323.5 409t-118.5 500.5t120.5 512.5t320.5 417q13 11 28 11q41 0 41 -43 q0 -15 -14 -30q-47 -44 -136 -138q-278 -332 -278 -729q0 -485 418 -853q-2 35 -2 78.5t23.5 147t66 103.5t42.5 -37z" />
+<glyph unicode="⤺" d="M2013 743q0 -41 -43 -41q-15 0 -30 14q-44 47 -138 136q-332 278 -729 278q-485 0 -853 -418q35 2 78.5 2t147 -23.5t103.5 -66t-37 -42.5l-79 28q-79 28 -161.5 28t-168.5 -23q-19 -5 -25 -5q-17 0 -17 17q0 6 14 58.5t14 135.5t-27 161l-27 77q0 38 42 38q49 0 71 -126 q16 -99 16 -166q0 -19 -1 -35q168 205 409 323.5t500.5 118.5t512.5 -120.5t417 -320.5q11 -13 11 -28z" />
+<glyph unicode="⤻" d="M1971 697q-49 0 -71 126q-16 99 -16 166q0 19 1 35q-168 -205 -409 -323.5t-500.5 -118.5t-512.5 120.5t-417 320.5q-11 13 -11 28q0 41 43 41q15 0 30 -14q44 -47 138 -136q332 -278 729 -278q485 0 853 418q-35 -2 -78.5 -2t-147 23.5t-103.5 66t37 42.5l79 -28 q79 -28 161.5 -28t168.5 23q19 5 25 5q17 0 17 -17q0 -6 -14 -58.5t-14 -135.5t27 -161l27 -77q0 -38 -42 -38z" />
+<glyph unicode="⤼" d="M1986 982q-27 -78 -27 -161t23 -169q5 -19 5 -25q0 -17 -17 -17q-6 0 -58.5 14t-135 14t-161.5 -28l-79 -28q-37 0 -37 42.5t103.5 66t147 23.5t78.5 -2q-368 418 -853 418q-397 0 -729 -278l-138 -136q-15 -14 -30 -14q-43 0 -43 41q0 15 11 28q164 200 417 320.5 t512.5 120.5t500.5 -118.5t409 -323.5q-1 16 -1 35q0 67 16 166q22 126 71 126q42 0 42 -38zM1260 582q0 -41 -39 -41h-574q-37 0 -37 41t37 41h574q39 0 39 -41z" />
+<glyph unicode="⤽" d="M2013 743q0 -41 -43 -41q-15 0 -30 14q-44 47 -138 136q-332 278 -729 278q-485 0 -853 -418q35 2 78.5 2t147 -23.5t103.5 -66t-37 -42.5l-79 28q-79 28 -161.5 28t-168.5 -23q-19 -5 -25 -5q-17 0 -17 17q0 6 14 58.5t14 135.5t-27 161l-27 77q0 38 42 38q49 0 71 -126 q16 -99 16 -166q0 -19 -1 -35q168 205 409 323.5t500.5 118.5t512.5 -120.5t417 -320.5q11 -13 11 -28zM1438 582q0 -41 -37 -41h-247v-245q0 -39 -41 -39t-41 39v245h-245q-39 0 -39 41t39 41h245v247q0 37 41 37t41 -37v-247h247q37 0 37 -41z" />
+<glyph unicode="⤾" d="M1687 732q0 -321 -231.5 -538t-556.5 -217t-553 225q2 -23 2 -72.5t-22.5 -152t-65 -102.5t-42.5 38q0 -3 27.5 79.5t27.5 163t-14 131.5t-14 58q0 17 17 17q6 0 57.5 -14t133 -14t164.5 28t78 28q38 0 38 -42.5t-103.5 -66t-153 -23.5t-72.5 2q204 -200 495 -200 t499.5 192.5t208.5 478.5q0 209 -114 424q-61 115 -144 210l-47 51q-10 11 -10 25q0 43 41 43q15 0 32 -16q143 -136 232.5 -338.5t89.5 -397.5z" />
+<glyph unicode="⤿" d="M1687 -87q0 -38 -42.5 -38t-65 102.5t-22.5 152t2 72.5q-228 -225 -553 -225t-556.5 217t-231.5 538q0 195 89.5 397.5t232.5 338.5q17 16 32 16q41 0 41 -43q0 -14 -13 -28l-44 -48q-83 -95 -144 -210q-114 -215 -114 -424q0 -286 208.5 -478.5t499.5 -192.5t495 200 q-23 -2 -72.5 -2t-153 23.5t-103.5 66t38 42.5q-5 0 78 -28t164.5 -28t133 14t57.5 14q17 0 17 -17q0 -7 -14 -58t-14 -131.5t28 -163.5z" />
+<glyph unicode="⥀" horiz-adv-x="1591" d="M1312.5 1087q205.5 -211 205.5 -507t-211.5 -508.5t-509.5 -212.5t-510.5 212.5t-212.5 510.5q0 263 168.5 464.5t427.5 247.5q152 89 222 227q8 20 25 59q13 26 36 26q42 0 42 -39q0 -7 -3 -15q-55 -143 -178 -247q293 -7 498.5 -218zM1248.5 129.5 q187.5 188.5 187.5 450.5t-181.5 449t-441.5 194v-1q125 -105 179 -246q3 -8 3 -15q0 -39 -42 -39q-23 0 -33 23l-28 61q-63 124 -194 209q-234 -36 -388 -216t-154 -417q0 -264 188.5 -452.5t452.5 -188.5t451.5 188.5z" />
+<glyph unicode="⥁" horiz-adv-x="1591" d="M1518 582q0 -298 -212.5 -510.5t-510.5 -212.5t-509.5 212.5t-211.5 508.5t205.5 507t498.5 218q-123 104 -178 247q-3 8 -3 15q0 39 42 39q23 0 33 -23l28 -62q70 -138 222 -227q259 -46 427.5 -247.5t168.5 -464.5zM1436 582q0 237 -154 417t-388 216 q-131 -85 -194 -209q-8 -20 -25 -58q-13 -26 -36 -26q-42 0 -42 39q0 7 3 15q54 141 179 246v1q-260 -7 -441.5 -194t-181.5 -449t187.5 -450.5t451.5 -188.5t452.5 188.5t188.5 452.5z" />
+<glyph unicode="⥂" d="M1651 995q-223 135 -293 414q0 21 23 23q-11 -1 40 -1q13 0 19 -14q6 -22 19 -65q46 -132 150.5 -229.5t238.5 -132.5q23 -3 67 -13q18 -6 18 -24t-18 -22q-22 -4 -66 -13q-135 -35 -239.5 -132.5t-150.5 -229.5q-6 -22 -19 -65q-4 -14 -64 -14q-18 0 -18 22l2 6 q28 102 59 160q84 158 232 248h-1499q-37 0 -37 41t37 41h1499zM397 231q224 -137 293 -414q0 -20 -24 -23q9 1 -39 1q-15 0 -19 14q-5 22 -18 65q-45 131 -151 229t-240 133q-22 4 -66 13q-18 5 -18 23.5t24.5 24t46.5 8.5q205 48 329 221q46 64 74 144q6 23 19 65 q6 14 64 14q18 0 18 -22l-2 -6q-38 -143 -108 -241.5t-183 -166.5h639q37 0 37 -41t-37 -41h-639z" />
+<glyph unicode="⥃" d="M397 913q223 -136 293 -414q0 -22 -18 -22q-60 0 -64 14q-6 22 -19 65q-46 132 -150.5 229.5t-239.5 132.5q-22 4 -66 13q-18 4 -18 22t18 24q23 4 67 13q134 35 238.5 132.5t150.5 229.5q6 23 19 65q6 14 19 14q51 0 40 1q23 -2 23 -23l-2 -6q-29 -104 -59 -161 q-83 -157 -232 -247h1499q37 0 37 -41t-37 -41h-1499zM1651 313q-223 134 -293 414q0 22 18 22q58 0 64 -14q6 -22 19 -65q67 -192 239 -298q75 -46 164 -67q22 -3 43 -7q28 -7 28 -25.5t-18 -23.5q-22 -4 -66 -13q-134 -35 -240 -133t-151 -229l-18 -65q-4 -14 -19 -14 q-48 0 -39 -1q-24 3 -24 23l2 6q38 139 109 239.5t182 168.5h-639q-37 0 -37 41t37 41h639z" />
+<glyph unicode="⥄" d="M1651 995q-224 137 -293 414q0 20 24 23q-9 -1 39 -1q15 0 19 -14q5 -22 18 -65q45 -131 151 -229t240 -133q22 -4 66 -13q18 -5 18 -23.5t-24.5 -24t-46.5 -8.5q-205 -48 -329 -221q-46 -64 -74 -144q-6 -23 -19 -65q-6 -14 -64 -14q-18 0 -18 22l2 6q38 143 108 241.5 t183 166.5h-639q-37 0 -37 41t37 41h639zM397 231q223 -135 293 -414q0 -21 -23 -23q11 1 -40 1q-13 0 -19 14q-6 22 -19 65q-46 132 -150.5 229.5t-238.5 132.5q-23 3 -67 13q-18 6 -18 24t18 22q22 4 66 13q135 35 239.5 132.5t150.5 229.5q6 22 19 65q4 14 64 14 q18 0 18 -22l-2 -6q-28 -102 -59 -160q-84 -158 -232 -248h1499q37 0 37 -41t-37 -41h-1499z" />
+<glyph unicode="⥅" d="M1651 895q-223 135 -293 414q0 21 23 23q-11 -1 40 -1q13 0 19 -14q6 -22 19 -65q46 -132 150.5 -229.5t238.5 -132.5q23 -3 67 -13q18 -6 18 -24t-18 -22q-22 -4 -66 -13q-135 -35 -239.5 -132.5t-150.5 -229.5q-6 -22 -19 -65q-4 -14 -64 -14q-18 0 -18 22l2 6 q28 102 59 160q84 158 232 248h-1499q-37 0 -37 41t37 41h1499zM965 272q0 -41 -37 -41h-347v-345q0 -39 -41 -39t-41 39v345h-345q-39 0 -39 41t39 41h345v347q0 37 41 37t41 -37v-347h347q37 0 37 -41z" />
+<glyph unicode="⥆" d="M397 813q223 -136 293 -414q0 -22 -18 -22q-60 0 -64 14q-6 22 -19 65q-46 132 -150.5 229.5t-239.5 132.5q-22 4 -66 13q-18 4 -18 22t18 24q23 4 67 13q134 35 238.5 132.5t150.5 229.5q6 22 19 65q6 14 19 14q51 0 40 1q23 -2 23 -23l-2 -6q-29 -104 -59 -161 q-83 -157 -232 -247h1499q37 0 37 -41t-37 -41h-1499zM1933 272q0 -41 -39 -41h-345v-345q0 -39 -41 -39t-41 39v345h-347q-37 0 -37 41t37 41h347v347q0 37 41 37t41 -37v-347h345q39 0 39 -41z" />
+<glyph unicode="⥇" d="M1906 611q25 -11 25 -27t-15 -22l-46 -18q-190 -83 -296 -265q-41 -70 -79 -213q-2 -7 -8 -13t-53 -6q-21 0 -21 27q0 2 8 36q65 274 287 431h-906l274 -274q13 -13 13 -27t-15 -29t-29 -15t-27 13l-315 315l-315 -315q-13 -13 -27 -13t-29 15t-15 29t13 27l274 274h-450 q-39 0 -39 41t39 41h450l-275 275q-26 26 3 55t55 3l316 -316l316 316q26 26 55 -3t3 -55l-275 -275h906q-154 111 -238 288q-57 121 -57 179q0 24 21 28q-3 -1 41 -1q15 0 20 -19q14 -55 54 -163q105 -217 317 -310z" />
+<glyph unicode="⥈" d="M1917 605q14 -8 14 -22.5t-14 -20.5q-223 -79 -343 -283q-43 -74 -79 -213q-2 -7 -8 -13t-53 -6q-21 0 -21 27q0 2 8 36q65 274 287 431h-354q-15 -124 -109 -208t-221 -84t-221 84t-109 208h-356q228 -162 288 -432q7 -31 7 -35q0 -24 -21 -27h-41q-14 0 -20 19 q-35 177 -143 305t-277 191q-16 6 -16 20.5t59 39.5q138 59 233.5 171.5t133.5 261.5q3 15 10 43q5 18 25 20q-9 -1 36 -1q21 0 21 -27q0 -4 -7 -35q-59 -266 -288 -432h356q15 124 109 208t221 84t221 -84t109 -208h354q-154 111 -238 288q-57 121 -57 179q0 24 21 27h41 q15 0 20 -19q49 -191 144 -303t225 -169q19 -6 53 -21zM1024 835q-94 0 -164.5 -60.5t-85.5 -151.5h500q-15 91 -85.5 151.5t-164.5 60.5zM1024 329q94 0 164.5 60.5t85.5 151.5h-500q15 -91 85.5 -151.5t164.5 -60.5z" />
+<glyph unicode="⥉" horiz-adv-x="1024" d="M471 1200q-135 -223 -414 -293q-21 0 -23 23q1 -11 1 40q0 13 14 19q22 6 65 19q132 46 229.5 150.5t132.5 238.5q3 23 13 67q6 18 24 18t22 -18q4 -22 13 -66q35 -135 132.5 -239.5t229.5 -150.5q22 -6 65 -19q14 -4 14 -64q0 -18 -22 -18l-6 2q-102 28 -160 59 q-158 84 -248 232v-140q38 -129 134 -228.5t223 -143.5q22 -6 65 -19q14 -4 14 -64q0 -18 -22 -18l-6 2q-102 28 -160 59q-158 84 -248 232v-535q124 -15 208 -109t84 -226.5t-97.5 -230t-235.5 -97.5t-235.5 97.5t-97.5 230t84 226.5t208 109v535q-135 -223 -414 -293 q-21 0 -23 23q1 -11 1 40q0 13 14 19q22 6 65 19q127 44 223 143.5t134 227.5v141zM765 15q0 105 -74 179t-179 74t-179 -74t-74 -179t74 -179t179 -74t179 74t74 179z" />
+<glyph unicode="⥊" d="M1931 582q0 -16 -21.5 -25t-40.5 -16q-134 -57 -230 -170t-133 -258q-3 -28 -25 -64q-6 -3 -18 -3q-50 0 -50 28q0 5 7 35q64 269 288 432h-1526q-67 0 -67 41q0 16 62 41q132 54 230 170t133 258q2 16 11 47q8 20 45 20t37 -28q0 -7 -7 -35q-69 -273 -288 -432h1526 q67 0 67 -41z" />
+<glyph unicode="⥋" d="M1931 582q0 -41 -67 -41h-1526q219 -159 288 -432q7 -28 7 -35q0 -28 -37 -28t-45 20q-4 16 -11 47q-35 142 -133 258t-230 170q-62 25 -62 41q0 41 67 41h1526q-224 163 -288 432q-7 30 -7 35q0 28 50 28q25 0 30.5 -18t12.5 -49q37 -145 133 -258t230 -170 q19 -7 40.5 -16t21.5 -25z" />
+<glyph unicode="⥌" horiz-adv-x="1142" d="M1087 1062q20 -8 20 -45t-28 -37q-7 0 -35 7q-273 69 -432 288v-1526q0 -67 -41 -67q-16 0 -41 62q-54 132 -170 230t-258 133q-16 2 -47 11q-20 8 -20 45t28 37q7 0 35 -7q273 -69 432 -288v1526q0 67 41 67q16 0 41 -62q54 -132 170 -230t258 -133q16 -2 47 -11z" />
+<glyph unicode="⥍" horiz-adv-x="1142" d="M1079 200q28 0 28 -37t-20 -45q-16 -4 -47 -11q-142 -35 -258 -133t-170 -230q-25 -62 -41 -62q-41 0 -41 67v1526q-159 -219 -432 -288q-28 -7 -35 -7q-28 0 -28 37t20 45q16 4 47 11q142 35 258 133t170 230q25 62 41 62q41 0 41 -67v-1526q159 219 432 288q28 7 35 7z " />
+<glyph unicode="⥎" d="M1931 582q0 -41 -67 -41h-1682q-67 0 -67 41q0 16 62 41q132 54 230 170t133 258q2 16 11 47q8 20 45 20t37 -28q0 -7 -7 -35q-69 -273 -288 -432h1370q-219 159 -288 432q-7 28 -7 35q0 28 37 28t45 -20q4 -16 11 -47q35 -142 133 -258t230 -170q62 -25 62 -41z" />
+<glyph unicode="⥏" horiz-adv-x="1024" d="M961 200q28 0 28 -37t-20 -45q-16 -4 -47 -11q-142 -35 -258 -133t-170 -230q-25 -62 -41 -62q-41 0 -41 67v1682q0 67 41 67q16 0 41 -62q54 -132 170 -230t258 -133q16 -2 47 -11q20 -8 20 -45t-28 -37q-7 0 -35 7q-273 69 -432 288v-1370q159 219 432 288q28 7 35 7z " />
+<glyph unicode="⥐" d="M1931 582q0 -16 -62 -41q-132 -54 -230 -170t-133 -258q-2 -16 -11 -47q-8 -20 -45 -20t-37 28q0 7 7 35q69 273 288 432h-1370q219 -159 288 -432q7 -28 7 -35q0 -28 -37 -28t-45 20q-4 16 -11 47q-35 142 -133 258t-230 170q-62 25 -62 41q0 41 67 41h1682q67 0 67 -41 z" />
+<glyph unicode="⥑" horiz-adv-x="1024" d="M612 -251q0 -67 -41 -67q-16 0 -41 62q-54 132 -170 230t-258 133q-16 2 -47 11q-20 8 -20 45t28 37q7 0 35 -7q273 -69 432 -288v1370q-159 -219 -432 -288q-28 -7 -35 -7q-28 0 -28 37t20 45q16 4 47 11q142 35 258 133t170 230q25 62 41 62q41 0 41 -67v-1682z" />
+<glyph unicode="⥒" d="M1931 582q0 -41 -39 -41h-1650q-67 0 -67 41q0 16 62 41q132 54 230 170t133 258q2 16 11 47q8 20 45 20t37 -28q0 -7 -7 -35q-69 -273 -288 -432h1494q39 0 39 -41zM165 44q0 -62 -41 -62t-41 62v1077q0 61 41 61t41 -61v-1077z" />
+<glyph unicode="⥓" d="M1963 44q0 -62 -41 -62t-41 62v1077q0 61 41 61t41 -61v-1077zM1871 582q0 -41 -67 -41h-1650q-39 0 -39 41t39 41h1494q-219 159 -288 432q-7 28 -7 35q0 28 37 28t45 -20q4 -16 11 -47q35 -142 133 -258t230 -170q62 -25 62 -41z" />
+<glyph unicode="⥔" horiz-adv-x="1024" d="M1053 1489q0 -41 -61 -41h-1077q-62 0 -62 41t62 41h1077q61 0 61 -41zM969 1002q20 -8 20 -45t-28 -37q-7 0 -35 7q-273 69 -432 288v-1494q0 -39 -41 -39t-41 39v1650q0 67 41 67q16 0 41 -62q54 -132 170 -230t258 -133q16 -2 47 -11z" />
+<glyph unicode="⥕" horiz-adv-x="1024" d="M961 260q28 0 28 -37t-20 -45q-16 -4 -47 -11q-142 -35 -258 -133t-170 -230q-25 -62 -41 -62q-41 0 -41 67v1650q0 39 41 39t41 -39v-1494q159 219 432 288q28 7 35 7zM1053 -309q0 -41 -61 -41h-1077q-62 0 -62 41t62 41h1077q61 0 61 -41z" />
+<glyph unicode="⥖" d="M1931 582q0 -41 -39 -41h-1494q219 -159 288 -432q7 -28 7 -35q0 -28 -37 -28t-45 20q-4 16 -11 47q-35 142 -133 258t-230 170q-62 25 -62 41q0 41 67 41h1650q39 0 39 -41zM165 44q0 -62 -41 -62t-41 62v1077q0 61 41 61t41 -61v-1077z" />
+<glyph unicode="⥗" d="M1963 44q0 -62 -41 -62t-41 62v1077q0 61 41 61t41 -61v-1077zM1871 582q0 -16 -62 -41q-132 -54 -230 -170t-133 -258q-2 -16 -11 -47q-8 -20 -45 -20t-37 28q0 7 7 35q69 273 288 432h-1494q-39 0 -39 41t39 41h1650q67 0 67 -41z" />
+<glyph unicode="⥘" horiz-adv-x="1024" d="M1053 1489q0 -41 -61 -41h-1077q-62 0 -62 41t62 41h1077q61 0 61 -41zM494 -279q0 -39 -41 -39t-41 39v1494q-159 -219 -432 -288q-28 -7 -35 -7q-28 0 -28 37t20 45q16 4 47 11q142 35 258 133t170 230q25 62 41 62q41 0 41 -67v-1650z" />
+<glyph unicode="⥙" horiz-adv-x="1024" d="M494 -191q0 -67 -41 -67q-16 0 -41 62q-54 132 -170 230t-258 133q-16 2 -47 11q-20 8 -20 45t28 37q7 0 35 -7q273 -69 432 -288v1494q0 39 41 39t41 -39v-1650zM1053 -309q0 -41 -61 -41h-1077q-62 0 -62 41t62 41h1077q61 0 61 -41z" />
+<glyph unicode="⥚" d="M1965 44q0 -62 -41 -62t-41 62v497h-1701q-67 0 -67 41q0 16 62 41q132 54 230 170t133 258q2 16 11 47q8 20 45 20t37 -28q0 -7 -7 -35q-69 -273 -288 -432h1545v498q0 61 41 61t41 -61v-1077z" />
+<glyph unicode="⥛" d="M1931 582q0 -41 -67 -41h-1701v-497q0 -62 -41 -62t-41 62v1077q0 61 41 61t41 -61v-498h1545q-219 159 -288 432q-7 28 -7 35q0 28 37 28t45 -20q4 -16 11 -47q35 -142 133 -258t230 -170q62 -25 62 -41z" />
+<glyph unicode="⥜" horiz-adv-x="1024" d="M1053 -311q0 -41 -61 -41h-1077q-62 0 -62 41t62 41h497v1701q0 67 41 67q16 0 41 -62q54 -132 170 -230t258 -133q16 -2 47 -11q20 -8 20 -45t-28 -37q-7 0 -35 7q-273 69 -432 288v-1545h498q61 0 61 -41z" />
+<glyph unicode="⥝" horiz-adv-x="1024" d="M1053 1491q0 -41 -61 -41h-498v-1545q159 219 432 288q28 7 35 7q28 0 28 -37t-20 -45q-16 -4 -47 -11q-142 -35 -258 -133t-170 -230q-25 -62 -41 -62q-41 0 -41 67v1701h-497q-62 0 -62 41t62 41h1077q61 0 61 -41z" />
+<glyph unicode="⥞" d="M1965 43q0 -61 -41 -61t-41 61v498h-1545q219 -159 288 -432q7 -28 7 -35q0 -28 -37 -28t-45 20q-4 16 -11 47q-35 142 -133 258t-230 170q-62 25 -62 41q0 41 67 41h1701v497q0 62 41 62t41 -62v-1077z" />
+<glyph unicode="⥟" d="M1931 582q0 -16 -62 -41q-132 -54 -230 -170t-133 -258q-2 -16 -11 -47q-8 -20 -45 -20t-37 28q0 7 7 35q69 273 288 432h-1545v-498q0 -61 -41 -61t-41 61v1077q0 62 41 62t41 -62v-497h1701q67 0 67 -41z" />
+<glyph unicode="⥠" horiz-adv-x="1024" d="M1171 -311q0 -41 -62 -41h-1077q-61 0 -61 41t61 41h498v1545q-159 -219 -432 -288q-28 -7 -35 -7q-28 0 -28 37t20 45q16 4 47 11q142 35 258 133t170 230q25 62 41 62q41 0 41 -67v-1701h497q62 0 62 -41z" />
+<glyph unicode="⥡" horiz-adv-x="1024" d="M1171 1491q0 -41 -62 -41h-497v-1701q0 -67 -41 -67q-16 0 -41 62q-54 132 -170 230t-258 133q-16 2 -47 11q-20 8 -20 45t28 37q7 0 35 -7q273 -69 432 -288v1545h-498q-61 0 -61 41t61 41h1077q62 0 62 -41z" />
+<glyph unicode="⥢" d="M1931 342q0 -41 -39 -41h-1554q224 -163 288 -432q7 -30 7 -35q0 -28 -50 -28q-25 0 -30.5 18t-12.5 49q-37 145 -133 258t-230 170q-19 7 -40.5 16t-21.5 25q0 41 67 41h1710q39 0 39 -41zM1931 822q0 -41 -39 -41h-1710q-67 0 -67 41q0 16 62 41q132 54 230 170 t133 258q2 16 11 47q8 20 45 20t37 -28q0 -7 -7 -35q-69 -273 -288 -432h1554q39 0 39 -41z" />
+<glyph unicode="⥣" horiz-adv-x="1622" d="M1567 1054q20 -8 20 -45t-28 -37q-7 0 -35 7q-273 69 -432 288v-1554q0 -39 -41 -39t-41 39v1710q0 67 41 67q16 0 41 -62q54 -132 170 -230t258 -133q16 -2 47 -11zM612 -287q0 -39 -41 -39t-41 39v1554q-163 -224 -432 -288q-30 -7 -35 -7q-28 0 -28 50q0 25 18 30.5 t49 12.5q145 37 258 133t170 230q7 19 16 40.5t25 21.5q41 0 41 -67v-1710z" />
+<glyph unicode="⥤" d="M1931 342q0 -16 -21.5 -25t-40.5 -16q-134 -57 -230 -170t-133 -258q-3 -28 -25 -64q-6 -3 -18 -3q-50 0 -50 28q0 5 7 35q64 269 288 432h-1554q-39 0 -39 41t39 41h1710q67 0 67 -41zM1931 822q0 -41 -67 -41h-1710q-39 0 -39 41t39 41h1554q-219 159 -288 432 q-7 28 -7 35q0 28 37 28t45 -20q4 -16 11 -47q35 -142 133 -258t230 -170q62 -25 62 -41z" />
+<glyph unicode="⥥" horiz-adv-x="1622" d="M1559 192q28 0 28 -37t-20 -45q-16 -4 -47 -11q-142 -35 -258 -133t-170 -230q-25 -62 -41 -62q-41 0 -41 67v1710q0 39 41 39t41 -39v-1554q159 219 432 288q28 7 35 7zM612 -259q0 -67 -41 -67q-16 0 -25 21.5t-16 40.5q-57 134 -170 230t-258 133q-28 3 -64 25 q-3 6 -3 18q0 50 28 50q5 0 35 -7q269 -64 432 -288v1554q0 39 41 39t41 -39v-1710z" />
+<glyph unicode="⥦" d="M1931 292q0 -41 -67 -41h-1710q-39 0 -39 41t39 41h1554q-219 159 -288 432q-7 28 -7 35q0 28 37 28t45 -20q4 -16 11 -47q35 -142 133 -258t230 -170q62 -25 62 -41zM1931 872q0 -41 -39 -41h-1710q-67 0 -67 41q0 16 62 41q132 54 230 170t133 258q2 16 11 47 q8 20 45 20t37 -28q0 -7 -7 -35q-69 -273 -288 -432h1554q39 0 39 -41z" />
+<glyph unicode="⥧" d="M1931 872q0 -41 -39 -41h-1554q219 -159 288 -432q7 -28 7 -35q0 -28 -37 -28t-45 20q-4 16 -11 47q-35 142 -133 258t-230 170q-62 25 -62 41q0 41 67 41h1710q39 0 39 -41zM1931 292q0 -16 -62 -41q-132 -54 -230 -170t-133 -258q-2 -16 -11 -47q-8 -20 -45 -20t-37 28 q0 7 7 35q69 273 288 432h-1554q-39 0 -39 41t39 41h1710q67 0 67 -41z" />
+<glyph unicode="⥨" d="M1931 872q0 -41 -67 -41h-1710q-39 0 -39 41t39 41h1554q-219 159 -288 432q-7 28 -7 35q0 28 37 28t45 -20q4 -16 11 -47q35 -142 133 -258t230 -170q62 -25 62 -41zM1931 292q0 -41 -39 -41h-1710q-67 0 -67 41q0 16 62 41q132 54 230 170t133 258q2 16 11 47 q8 20 45 20t37 -28q0 -7 -7 -35q-69 -273 -288 -432h1554q39 0 39 -41z" />
+<glyph unicode="⥩" d="M1931 872q0 -16 -62 -41q-132 -54 -230 -170t-133 -258q-2 -16 -11 -47q-8 -20 -45 -20t-37 28q0 7 7 35q69 273 288 432h-1554q-39 0 -39 41t39 41h1710q67 0 67 -41zM1931 292q0 -41 -39 -41h-1554q219 -159 288 -432q7 -28 7 -35q0 -28 -37 -28t-45 20q-4 16 -11 47 q-35 142 -133 258t-230 170q-62 25 -62 41q0 41 67 41h1710q39 0 39 -41z" />
+<glyph unicode="⥪" d="M1931 872q0 -41 -39 -41h-1710q-67 0 -67 41q0 16 62 41q132 54 230 170t133 258q2 16 11 47q8 20 45 20t37 -28q0 -7 -7 -35q-69 -273 -288 -432h1554q39 0 39 -41zM1931 292q0 -41 -39 -41h-1738q-39 0 -39 41t39 41h1738q39 0 39 -41z" />
+<glyph unicode="⥫" d="M1931 872q0 -41 -39 -41h-1738q-39 0 -39 41t39 41h1738q39 0 39 -41zM1931 292q0 -41 -39 -41h-1554q219 -159 288 -432q7 -28 7 -35q0 -28 -37 -28t-45 20q-4 16 -11 47q-35 142 -133 258t-230 170q-62 25 -62 41q0 41 67 41h1710q39 0 39 -41z" />
+<glyph unicode="⥬" d="M1931 872q0 -41 -67 -41h-1710q-39 0 -39 41t39 41h1554q-219 159 -288 432q-7 28 -7 35q0 28 37 28t45 -20q4 -16 11 -47q35 -142 133 -258t230 -170q62 -25 62 -41zM1931 292q0 -41 -39 -41h-1738q-39 0 -39 41t39 41h1738q39 0 39 -41z" />
+<glyph unicode="⥭" d="M1931 872q0 -41 -39 -41h-1738q-39 0 -39 41t39 41h1738q39 0 39 -41zM1931 292q0 -16 -62 -41q-132 -54 -230 -170t-133 -258q-2 -16 -11 -47q-8 -20 -45 -20t-37 28q0 7 7 35q69 273 288 432h-1554q-39 0 -39 41t39 41h1710q67 0 67 -41z" />
+<glyph unicode="⥮" horiz-adv-x="1622" d="M1559 192q28 0 28 -37t-20 -45q-16 -4 -47 -11q-142 -35 -258 -133t-170 -230q-25 -62 -41 -62q-41 0 -41 67v1710q0 39 41 39t41 -39v-1554q159 219 432 288q28 7 35 7zM612 -287q0 -39 -41 -39t-41 39v1554q-163 -224 -432 -288q-30 -7 -35 -7q-28 0 -28 50 q0 25 18 30.5t49 12.5q145 37 258 133t170 230q7 19 16 40.5t25 21.5q41 0 41 -67v-1710z" />
+<glyph unicode="⥯" horiz-adv-x="1622" d="M1567 1054q20 -8 20 -45t-28 -37q-7 0 -35 7q-273 69 -432 288v-1554q0 -39 -41 -39t-41 39v1710q0 67 41 67q16 0 41 -62q54 -132 170 -230t258 -133q16 -2 47 -11zM612 -259q0 -67 -41 -67q-16 0 -25 21.5t-16 40.5q-57 134 -170 230t-258 133q-28 3 -64 25q-3 6 -3 18 q0 50 28 50q5 0 35 -7q269 -64 432 -288v1554q0 39 41 39t41 -39v-1710z" />
+<glyph unicode="⥰" d="M1792 582q0 -122 -147 -189q-114 -51 -251 -51h-1239q-39 0 -39 41t39 41h1239q97 0 191 33q125 45 125 125t-125 125q-94 33 -191 33h-1239q-39 0 -39 41t39 41h1239q137 0 251 -51q147 -67 147 -189z" />
+<glyph unicode="⥱" d="M1906 611q25 -11 25 -27t-15 -22l-46 -18q-190 -83 -296 -265q-41 -70 -79 -213q-2 -7 -8 -13t-53 -6q-21 0 -21 27q0 2 8 36q65 274 287 431h-1554q-39 0 -39 41t39 41h1554q-154 111 -238 288q-57 121 -57 179q0 24 21 28q-3 -1 41 -1q15 0 20 -19q14 -55 54 -163 q105 -217 317 -310zM1015 1102q0 -41 -37 -41h-724q-39 0 -39 41t39 41h724q37 0 37 -41zM1015 842q0 -41 -37 -41h-724q-39 0 -39 41t39 41h724q37 0 37 -41z" />
+<glyph unicode="⥲" d="M1906 611q25 -11 25 -27t-15 -22l-46 -18q-190 -83 -296 -265q-41 -70 -79 -213q-2 -7 -8 -13t-53 -6q-21 0 -21 27q0 2 8 36q65 274 287 431h-1554q-39 0 -39 41t39 41h1554q-154 111 -238 288q-57 121 -57 179q0 24 21 28q-3 -1 41 -1q15 0 20 -19q14 -55 54 -163 q105 -217 317 -310zM1018 1057q0 -101 -59.5 -179t-153.5 -78t-217.5 102t-196.5 102q-123 0 -157 -153q-11 -51 -30 -51q-28 0 -28 56q0 110 55 186t153 76t221.5 -102t195.5 -102q53 0 97 35t55 86l8 49q9 34 26 34q31 0 31 -61z" />
+<glyph unicode="⥳" d="M1931 582q0 -41 -39 -41h-1554q228 -162 288 -432q7 -31 7 -35q0 -24 -21 -27h-41q-14 0 -20 19q-33 175 -142 303.5t-278 192.5q-16 6 -16 20t16 23l46 18q282 122 363 428q3 16 9.5 40.5t26.5 26.5q-9 -1 36 -1q21 0 21 -27q0 -4 -7 -35q-59 -266 -288 -432h1554 q39 0 39 -41zM1873 303q0 -101 -59.5 -179t-153.5 -78t-217.5 102t-196.5 102q-123 0 -157 -153q-11 -51 -30 -51q-28 0 -28 56q0 110 55 186t153 76t221.5 -102t195.5 -102q53 0 97 35t55 86l8 49q9 34 26 34q31 0 31 -61z" />
+<glyph unicode="⥴" d="M1931 582q0 -14 -16 -20q-259 -98 -369 -334q-23 -49 -33 -90l-18 -72q-6 -19 -20 -19h-41q-21 3 -21 27q0 4 7 35q60 270 288 432h-1554q-39 0 -39 41t39 41h1554q-229 166 -288 432q-7 31 -7 35q0 27 21 27q45 0 36 1q20 -2 24 -19t12 -48q38 -146 132.5 -257.5 t230.5 -170.5q16 -5 46 -18q16 -9 16 -23zM1015 303q0 -101 -59.5 -179t-153.5 -78t-217.5 102t-196.5 102q-123 0 -157 -153q-11 -51 -30 -51q-28 0 -28 56q0 110 55 186t153 76t221.5 -102t195.5 -102q53 0 97 35t55 86l8 49q9 34 26 34q31 0 31 -61z" />
+<glyph unicode="⥵" d="M1931 582q0 -14 -16 -20q-259 -98 -369 -334q-23 -49 -33 -90l-18 -72q-6 -19 -20 -19h-41q-21 3 -21 27q0 4 7 35q60 270 288 432h-1554q-39 0 -39 41t39 41h1554q-229 166 -288 432q-7 31 -7 35q0 27 21 27q45 0 36 1q20 -2 24 -19t12 -48q38 -146 132.5 -257.5 t230.5 -170.5q16 -5 46 -18q16 -9 16 -23zM1015 303q0 -101 -59.5 -179t-153.5 -78t-217.5 102t-196.5 102q-123 0 -157 -153q-11 -51 -30 -51q-28 0 -28 56q0 110 55 186t153 76t221.5 -102t195.5 -102q53 0 97 35t55 86l8 49q9 34 26 34q31 0 31 -61zM1015 -37 q0 -101 -59.5 -179t-153.5 -78t-217.5 102t-196.5 102q-123 0 -157 -153q-11 -51 -30 -51q-28 0 -28 56q0 110 55 186t153 76t221.5 -102t195.5 -102q53 0 97 35t55 86l8 49q9 34 26 34q31 0 31 -61z" />
+<glyph unicode="⥶" horiz-adv-x="1591" d="M1421 349q0 -41 -41 -41q-8 0 -14 3l-1169 552q-27 13 -27 37t27 37l1169 552q6 3 14 3q41 0 41 -41q0 -26 -24 -37l-1090 -514l1090 -514q24 -11 24 -37zM1421 0q0 -41 -37 -41h-1035q126 -107 178 -251q3 -8 3 -15q0 -39 -42 -39q-24 0 -34 22l-27 62q-76 149 -230 236 q-27 15 -27 26t27 26q155 88 230 237q8 20 25 59q12 26 36 26q42 0 42 -39q0 -7 -3 -15q-52 -146 -179 -253h1036q37 0 37 -41z" />
+<glyph unicode="⥷" d="M2030 31q0 -41 -41 -41q-8 0 -14 3l-1160 548h-477q228 -162 288 -432q7 -31 7 -35q0 -24 -21 -27h-41q-14 0 -20 19q-33 175 -142 303.5t-278 192.5q-16 6 -16 20t16 23l46 18q282 122 363 428q3 16 9.5 40.5t26.5 26.5q-9 -1 36 -1q21 0 21 -27q0 -4 -7 -35 q-59 -266 -288 -432h477l1160 548q6 3 14 3q41 0 41 -41q0 -26 -24 -37l-1001 -473h697q39 0 39 -41t-39 -41h-697l1001 -473q24 -11 24 -37z" />
+<glyph unicode="⥸" horiz-adv-x="1591" d="M1421 900q0 -24 -27 -37l-1169 -552q-6 -3 -14 -3q-41 0 -41 41q0 26 24 37l1090 514l-1090 514q-24 11 -24 37q0 41 41 41q8 0 14 -3l1169 -552q27 -13 27 -37zM1421 0q0 -11 -27 -26q-154 -87 -230 -236l-25 -58q-12 -26 -36 -26q-42 0 -42 39q0 7 3 15q52 144 178 251 h-1035q-37 0 -37 41t37 41h1036q-127 107 -179 253q-3 8 -3 15q0 39 42 39q24 0 34 -23l27 -62q75 -149 230 -237q27 -15 27 -26z" />
+<glyph unicode="⥹" horiz-adv-x="1591" d="M1421 459q0 -41 -39 -41h-590q-254 0 -438 145.5t-184 386.5t184 386.5t438 145.5h590q39 0 39 -41t-39 -41h-584q-223 0 -384.5 -120.5t-161.5 -329.5t161.5 -329.5t384.5 -120.5h584q39 0 39 -41zM1421 0q0 -11 -27 -26q-154 -87 -230 -236l-25 -58q-12 -26 -36 -26 q-42 0 -42 39q0 7 3 15q52 144 178 251h-1035q-37 0 -37 41t37 41h1036q-127 107 -179 253q-3 8 -3 15q0 39 42 39q24 0 34 -23l27 -62q75 -149 230 -237q27 -15 27 -26z" />
+<glyph unicode="⥺" d="M2041 41q0 -41 -39 -41h-480q-237 0 -420 155t-200 386h-564q228 -162 288 -432q7 -31 7 -35q0 -24 -21 -27h-41q-14 0 -20 19q-33 175 -142 303.5t-278 192.5q-16 6 -16 20t16 23l46 18q282 122 363 428q3 16 9.5 40.5t26.5 26.5q-9 -1 36 -1q21 0 21 -27q0 -4 -7 -35 q-59 -266 -288 -432h564q17 231 200 386t420 155h480q39 0 39 -41t-39 -41h-474q-205 0 -366 -130.5t-178 -328.5h908q39 0 39 -41t-39 -41h-908q17 -198 178 -328.5t366 -130.5h474q39 0 39 -41z" />
+<glyph unicode="⥻" horiz-adv-x="1591" d="M1421 950q0 -241 -184 -386.5t-438 -145.5h-590q-39 0 -39 41t39 41h584q223 0 384.5 120.5t161.5 329.5t-161.5 329.5t-384.5 120.5h-584q-39 0 -39 41t39 41h590q254 0 438 -145.5t184 -386.5zM1421 0q0 -41 -37 -41h-1035q126 -107 178 -251q3 -8 3 -15q0 -39 -42 -39 q-24 0 -34 22l-27 62q-76 149 -230 236q-27 15 -27 26t27 26q155 88 230 237q8 20 25 59q12 26 36 26q42 0 42 -39q0 -7 -3 -15q-52 -146 -179 -253h1036q37 0 37 -41z" />
+<glyph unicode="⥼" horiz-adv-x="1386" d="M552 1158l-89 10q-142 0 -204 -65.5t-62 -207.5q0 -166 122 -228q87 -44 271 -44h642q39 0 39 -41t-39 -41h-642q-184 0 -271 -44q-122 -62 -122 -228q0 -142 62 -207.5t204 -65.5l89 10q41 0 41 -44q0 -48 -130 -48q-348 0 -348 355q0 240 188 313q-188 73 -188 313 q0 355 348 355q130 0 130 -48q0 -44 -41 -44z" />
+<glyph unicode="⥽" horiz-adv-x="1386" d="M923 1168l-89 -10q-41 0 -41 44q0 48 130 48q348 0 348 -355q0 -240 -188 -313q188 -73 188 -313q0 -355 -348 -355q-130 0 -130 48q0 44 41 44l89 -10q142 0 204 65.5t62 207.5q0 166 -122 228q-87 44 -271 44h-642q-39 0 -39 41t39 41h642q184 0 271 44q122 62 122 228 q0 142 -62 207.5t-204 65.5z" />
+<glyph unicode="⥾" horiz-adv-x="1406" d="M117 1158l10 -89q0 -41 -44 -41q-48 0 -48 130q0 348 355 348q240 0 313 -188q73 188 313 188q355 0 355 -348q0 -130 -48 -130q-44 0 -44 41l10 89q0 142 -65.5 204t-207.5 62q-166 0 -228 -122q-44 -87 -44 -271v-642q0 -39 -41 -39t-41 39v642q0 184 -44 271 q-62 122 -228 122q-142 0 -207.5 -62t-65.5 -204z" />
+<glyph unicode="⥿" horiz-adv-x="1406" d="M1289 6l-10 89q0 41 44 41q48 0 48 -130q0 -348 -355 -348q-240 0 -313 188q-73 -188 -313 -188q-355 0 -355 348q0 130 48 130q44 0 44 -41l-10 -89q0 -142 65.5 -204t207.5 -62q166 0 228 122q44 87 44 271v642q0 39 41 39t41 -39v-642q0 -184 44 -271 q62 -122 228 -122q142 0 207.5 62t65.5 204z" />
+<glyph unicode="⦀" horiz-adv-x="1422" d="M1150 -405q0 -37 -41 -37t-41 37v1974q0 37 41 37t41 -37v-1974zM752 -405q0 -37 -41 -37t-41 37v1974q0 37 41 37t41 -37v-1974zM354 -405q0 -37 -41 -37t-41 37v1974q0 37 41 37t41 -37v-1974z" />
+<glyph unicode="⦁" horiz-adv-x="946" d="M906 582q0 -180 -126.5 -306.5t-306.5 -126.5t-306.5 126.5t-126.5 306.5t126.5 306.5t306.5 126.5t306.5 -126.5t126.5 -306.5z" />
+<glyph unicode="⦂" horiz-adv-x="711" d="M542 743q0 -77 -55.5 -131.5t-131.5 -54.5t-131 55t-55 131t55 131t131 55t131.5 -54.5t55.5 -131.5zM542 104q0 -77 -55.5 -131.5t-131.5 -54.5t-131 55t-55 131t55 131t131 55t131.5 -54.5t55.5 -131.5zM460 743q0 42 -31 73t-73.5 31t-73.5 -31t-31 -73t31 -73 t73.5 -31t73.5 31t31 73zM460 104q0 42 -31 73t-73.5 31t-73.5 -31t-31 -73t31 -73t73.5 -31t73.5 31t31 73z" />
+<glyph unicode="⦃" horiz-adv-x="983" d="M809.5 -305q17.5 -3 17.5 -24t-41 -21q-391 0 -391 342v313q0 226 -262 254q-33 4 -33 23t33 23q262 28 262 254v313q0 342 391 342q41 0 41 -21t-17.5 -24t-44.5 -6v-1762q27 -3 44.5 -6zM477 1132v-277q0 -112 -41.5 -177.5t-145.5 -95.5q104 -30 145.5 -95.5 t41.5 -177.5v-277q0 -260 206 -318v1736q-206 -58 -206 -318z" />
+<glyph unicode="⦄" horiz-adv-x="983" d="M883 582q0 -19 -33 -23q-262 -28 -262 -254v-313q0 -342 -391 -342q-41 0 -41 21t17.5 24t44.5 6v1762q-27 3 -44.5 6t-17.5 24t41 21q391 0 391 -342v-313q0 -226 262 -254q33 -4 33 -23zM506 855v277q0 260 -206 318v-1736q206 58 206 318v277q0 112 41.5 177.5 t145.5 95.5q-104 30 -145.5 95.5t-41.5 177.5z" />
+<glyph unicode="⦅" horiz-adv-x="875" d="M721 -275q46 -36 46 -55.5t-17 -19.5q-77 0 -228 118q-431 337 -431 814t431 814q151 118 228 118q17 0 17 -19.5t-46 -55.5q-163 -127 -246.5 -372t-83.5 -485t83.5 -485t246.5 -372zM460 -74q-151 290 -151 651t142 648q-278 -277 -278 -648t287 -651z" />
+<glyph unicode="⦆" horiz-adv-x="875" d="M784 582q0 -477 -431 -814q-151 -118 -228 -118q-17 0 -17 19.5t46 55.5q163 127 246.5 372t83.5 485t-83.5 485t-246.5 372q-46 36 -46 55.5t17 19.5q77 0 228 -118q431 -337 431 -814zM415 -74q287 280 287 651t-278 648q142 -287 142 -648t-151 -651z" />
+<glyph unicode="⦇" horiz-adv-x="682" d="M574 -332q0 -18 -19 -18q-11 0 -46 29q-226 186 -322 396t-96 507t96 507t322 396q35 29 46 29q19 0 19 -18v-1828zM173 582q0 -506 319 -786v1565q-172 -159 -245.5 -341.5t-73.5 -437.5z" />
+<glyph unicode="⦈" horiz-adv-x="682" d="M574 582q0 -297 -96 -507t-322 -396q-35 -29 -46 -29q-19 0 -19 18v1828q0 18 19 18q11 0 46 -29q226 -186 322 -396t96 -507zM492 582q0 255 -73.5 437.5t-245.5 341.5v-1565q319 280 319 786z" />
+<glyph unicode="⦉" horiz-adv-x="666" d="M558 -312q0 -38 -42 -38q-23 0 -43 47l-382 885l382 885q20 47 43 47q42 0 42 -38v-1788zM476 -105v1374l-297 -687z" />
+<glyph unicode="⦊" horiz-adv-x="666" d="M150 -350q-42 0 -42 38v1788q0 38 42 38q23 0 43 -47l382 -885l-382 -885q-20 -47 -43 -47zM487 582l-297 687v-1374z" />
+<glyph unicode="⦋" horiz-adv-x="682" d="M571 -201q0 -41 -68 -41h-391v1848h391q68 0 68 -40.5t-68 -40.5h-309v-1685h309q68 0 68 -41zM571 -401q0 -41 -37 -41h-383q-39 0 -39 41t39 41h383q37 0 37 -41z" />
+<glyph unicode="⦌" horiz-adv-x="682" d="M570 -242h-391q-68 0 -68 41t68 41h309v1685h-309q-68 0 -68 40.5t68 40.5h391v-1848zM570 -401q0 -41 -37 -41h-383q-39 0 -39 41t39 41h383q37 0 37 -41z" />
+<glyph unicode="⦍" horiz-adv-x="682" d="M571 -309q0 -41 -68 -41h-391v1864h391q68 0 68 -40.5t-68 -40.5h-252l228 -228q13 -13 13 -27t-15 -29t-29 -15t-27 13l-227 227v-1642h309q68 0 68 -41z" />
+<glyph unicode="⦎" horiz-adv-x="682" d="M570 -350h-391q-68 0 -68 41t68 41h251l-227 227q-13 13 -13 27t15 29t29 15t27 -13l227 -227v1643h-309q-68 0 -68 40.5t68 40.5h391v-1864z" />
+<glyph unicode="⦏" horiz-adv-x="682" d="M571 -309q0 -41 -68 -41h-391v1864h391q68 0 68 -40.5t-68 -40.5h-309v-1643l227 227q13 13 27 13t29 -15t15 -29t-13 -27l-227 -227h251q68 0 68 -41z" />
+<glyph unicode="⦐" horiz-adv-x="682" d="M570 -350h-391q-68 0 -68 41t68 41h309v1642l-227 -227q-13 -13 -27 -13t-29 15t-15 29t13 27l228 228h-252q-68 0 -68 40.5t68 40.5h391v-1864z" />
+<glyph unicode="⦑" horiz-adv-x="666" d="M558 -312q0 -38 -42 -38q-23 0 -43 47l-382 885l382 885q20 47 43 47q42 0 42 -38q0 -17 -8 -36l-371 -858l371 -858q8 -19 8 -36zM531.5 661.5q33.5 -33.5 33.5 -80t-33 -79.5t-80 -33t-80 33t-33 80t33 80t79.5 33t80 -33.5z" />
+<glyph unicode="⦒" horiz-adv-x="666" d="M150 -350q-42 0 -42 38q0 17 8 36l371 858l-371 858q-8 19 -8 36q0 38 42 38q23 0 43 -47l382 -885l-382 -885q-20 -47 -43 -47zM327 582q0 -47 -33 -80t-80 -33t-80 33t-33 79.5t33.5 80t80 33.5t79.5 -33t33 -80z" />
+<glyph unicode="⦓" horiz-adv-x="1591" d="M1421 31q0 -41 -41 -41q-8 0 -14 3l-531 251q70 -209 222 -391l136 -138q14 -15 14 -30q0 -43 -41 -43q-15 0 -28 11q-297 243 -402 637l-539 255q-27 13 -27 37t27 37l539 255q105 394 402 637q13 11 28 11q41 0 41 -43q0 -15 -14 -30q-47 -44 -136 -138 q-152 -182 -222 -391l531 251q6 3 14 3q41 0 41 -41q0 -26 -24 -37l-591 -279q-27 -116 -27 -235t27 -235l591 -279q24 -11 24 -37zM697 582q0 95 17 192l-407 -192l407 -192q-17 97 -17 192z" />
+<glyph unicode="⦔" horiz-adv-x="1591" d="M1421 582q0 -24 -27 -37l-539 -255q-105 -394 -402 -637q-13 -11 -28 -11q-41 0 -41 43q0 15 14 30q47 44 136 138q152 182 222 391l-531 -251q-6 -3 -14 -3q-41 0 -41 41q0 26 24 37l591 279q27 116 27 235t-27 235l-591 279q-24 11 -24 37q0 41 41 41q8 0 14 -3 l531 -251q-70 209 -222 391l-136 138q-14 15 -14 30q0 43 41 43q15 0 28 -11q297 -243 402 -637l539 -255q27 -13 27 -37zM894 582q0 -95 -17 -192l407 192l-407 192q17 -97 17 -192z" />
+<glyph unicode="⦕" horiz-adv-x="1591" d="M1421 582q0 -24 -27 -37l-570 -269q69 -227 233 -423l136 -138q14 -15 14 -30q0 -43 -41 -43q-15 0 -28 11q-275 225 -387 588l-265 -125q67 -138 171 -263l136 -138q14 -15 14 -30q0 -43 -41 -43q-15 0 -28 11q-205 168 -326 428l-187 -88q-6 -3 -14 -3q-41 0 -41 41 q0 26 24 37l186 88q-83 214 -83 426t83 426l-186 88q-24 11 -24 37q0 41 41 41q8 0 14 -3l187 -88q121 260 326 428q13 11 28 11q41 0 41 -43q0 -15 -14 -30q-47 -44 -136 -138q-104 -125 -171 -263l265 -125q112 363 387 588q13 11 28 11q41 0 41 -43q0 -15 -14 -30 q-47 -44 -136 -138q-164 -196 -233 -423l570 -269q27 -13 27 -37zM779 582q0 -114 25 -226l480 226l-480 226q-25 -112 -25 -226zM379 582q0 -201 75 -391l275 129q-32 133 -32 262t32 262l-275 129q-75 -190 -75 -391z" />
+<glyph unicode="⦖" horiz-adv-x="1591" d="M1421 31q0 -41 -41 -41q-8 0 -14 3l-187 88q-121 -260 -326 -428q-13 -11 -28 -11q-41 0 -41 43q0 15 14 30q47 44 136 138q104 125 171 263l-265 125q-112 -363 -387 -588q-13 -11 -28 -11q-41 0 -41 43q0 15 14 30q47 44 136 138q164 196 233 423l-570 269 q-27 13 -27 37t27 37l570 269q-69 227 -233 423l-136 138q-14 15 -14 30q0 43 41 43q15 0 28 -11q275 -225 387 -588l265 125q-67 138 -171 263l-136 138q-14 15 -14 30q0 43 41 43q15 0 28 -11q205 -168 326 -428l187 88q6 3 14 3q41 0 41 -41q0 -26 -24 -37l-186 -88 q83 -214 83 -426t-83 -426l186 -88q24 -11 24 -37zM1212 582q0 201 -75 391l-275 -129q32 -133 32 -262t-32 -262l275 -129q75 190 75 391zM812 582q0 114 -25 226l-480 -226l480 -226q25 112 25 226z" />
+<glyph unicode="⦗" horiz-adv-x="873" d="M663 -275q46 -35 46 -55t-17 -20q-77 0 -228 118q-193 150 -300 331v966q107 181 300 331q151 118 228 118q17 0 17 -20t-46 -55q-142 -109 -231 -332v-1050q89 -223 231 -332z" />
+<glyph unicode="⦘" horiz-adv-x="873" d="M181 -350q-17 0 -17 20t46 55q142 109 231 332v1050q-89 223 -231 332q-46 35 -46 55t17 20q77 0 228 -118q193 -150 300 -331v-966q-107 -181 -300 -331q-151 -118 -228 -118z" />
+<glyph unicode="⦙" horiz-adv-x="410" d="M268 1452q0 -63 -63 -63t-63 63t63 63q25 0 44 -19t19 -44zM268 1162q0 -63 -63 -63t-63 63t63 63q25 0 44 -19t19 -44zM268 872q0 -63 -63 -63t-63 63t63 63q25 0 44 -19t19 -44zM268 582q0 -63 -63 -63t-63 63t63 63q25 0 44 -19t19 -44zM268 292q0 -63 -63 -63t-63 63 t63 63q25 0 44 -19t19 -44zM268 2q0 -63 -63 -63t-63 63t63 63q25 0 44 -19t19 -44zM268 -288q0 -63 -63 -63t-63 63t63 63q25 0 44 -19t19 -44z" />
+<glyph unicode="⦚" horiz-adv-x="706" d="M564 203q0 -18 -12 -31l-314 -348l142 -160q14 -16 14 -30q0 -41 -41 -41q-20 0 -29 10l-170 190q-12 13 -12 31t12 31l314 348l-314 348q-12 13 -12 31t12 31l314 348l-314 348q-12 13 -12 31t12 31l170 190q9 10 29 10q41 0 41 -41q0 -14 -14 -30l-142 -160l314 -348 q12 -13 12 -31t-12 -31l-314 -348l314 -348q12 -13 12 -31z" />
+<glyph unicode="⦛" horiz-adv-x="1479" d="M1362 41q0 -41 -39 -41h-939q21 -69 43 -110t22 -49q0 -42 -42 -42q-20 0 -32 18q-48 76 -75 183h-148q-37 0 -37 41t37 41h132q-7 52 -7 101q0 189 90 351.5t243 262.5l-249 286q-10 12 -10 26q0 41 41 41q21 0 31 -12l260 -299q154 77 327 77q37 0 37 -40t-37 -40 q-143 0 -273 -59l615 -707q10 -11 10 -29zM357 183q0 -52 8 -101h866l-568 654q-141 -88 -223.5 -234.5t-82.5 -318.5z" />
+<glyph unicode="⦜" horiz-adv-x="1573" d="M1434 41q0 -41 -68 -41h-1139q-61 0 -66 35q-2 11 -2 33v1269q0 68 41 68t41 -68v-571h645q37 0 37 -37v-647h443q68 0 68 -41zM841 82v602h-600v-602h600z" />
+<glyph unicode="⦝" horiz-adv-x="1573" d="M621.5 462.5q33.5 -33.5 33.5 -80t-33 -79.5t-80 -33t-80 33t-33 80t33 80t79.5 33t80 -33.5zM1434 41q0 -41 -68 -41h-1139q-61 0 -66 35q-2 11 -2 33v1269q0 68 41 68t41 -68v-473q25 2 51 2q304 0 518.5 -215t214.5 -518q0 -26 -2 -51h343q68 0 68 -41zM945 133 q0 270 -191.5 461.5t-461.5 191.5q-26 0 -51 -2v-702h702q2 25 2 51z" />
+<glyph unicode="⦞" horiz-adv-x="1479" d="M1362 41q0 -41 -37 -41h-1171q-39 0 -39 41q0 18 10 29l929 1068q10 12 31 12q41 0 41 -41q0 -14 -10 -26l-870 -1001h1079q37 0 37 -41z" />
+<glyph unicode="⦟" horiz-adv-x="1479" d="M1362 41q0 -41 -37 -41h-1171q-39 0 -39 41q0 28 24 44l1159 781q9 6 20 6q44 0 44 -42q0 -21 -18 -33l-1059 -715h1040q37 0 37 -41z" />
+<glyph unicode="⦠" horiz-adv-x="1479" d="M1342 617q20 -10 20 -34.5t-26 -37.5l-839 -415q25 -26 48.5 -45.5t121.5 -82.5q19 -12 19 -34q0 -41 -39 -41q-9 0 -17 4q-119 62 -208 162l-252 -125q-4 -2 -14 -2q-41 0 -41 41q0 24 25 36l231 114q-135 191 -135 425t134 424l-236 117q-19 9 -19 34q0 41 41 41 q10 0 14 -2l252 -125q89 100 208 162q8 4 17 4q39 0 39 -41q0 -22 -19 -34q-40 -24 -118 -79q-27 -23 -52 -49zM443 970q-127 -174 -127 -388.5t128 -388.5l785 389z" />
+<glyph unicode="⦡" horiz-adv-x="1480" d="M1395 574q0 -39 -41 -39q-22 0 -34 19q-24 40 -79 118q-38 44 -83 82l-383 -776q-10 -20 -34.5 -20t-37.5 26l-381 770q-45 -38 -72 -70t-90 -130q-12 -19 -34 -19q-41 0 -41 39q0 9 4 17q73 139 197 237l-160 323q-2 4 -2 14q0 41 41 41q24 0 36 -25l151 -307 q178 111 388 111t387 -110l154 312q9 19 34 19q41 0 41 -41q0 -10 -2 -14l-160 -323q124 -98 197 -237q4 -8 4 -17zM740 905q-190 0 -352 -103l352 -710l351 710q-161 103 -351 103z" />
+<glyph unicode="⦢" horiz-adv-x="1479" d="M1362 1109q0 -18 -10 -29l-929 -1068q-10 -12 -31 -12q-41 0 -41 41q0 14 10 26l870 1001h-1079q-37 0 -37 41t37 41h1171q39 0 39 -41z" />
+<glyph unicode="⦣" horiz-adv-x="1479" d="M1362 41q0 -41 -39 -41h-1171q-37 0 -37 41t37 41h1079l-870 1001q-10 12 -10 26q0 41 41 41q21 0 31 -12l929 -1068q10 -11 10 -29z" />
+<glyph unicode="⦤" horiz-adv-x="1479" d="M1362 41q0 -41 -37 -41h-1171q-39 0 -39 41q0 18 10 29l929 1068q10 12 31 12q41 0 41 -41q0 -14 -10 -26l-870 -1001h1079q37 0 37 -41zM1362 -223q0 -41 -37 -41h-1171q-39 0 -39 41t39 41h1171q37 0 37 -41z" />
+<glyph unicode="⦥" horiz-adv-x="1479" d="M1362 41q0 -41 -39 -41h-1171q-37 0 -37 41t37 41h1079l-870 1001q-10 12 -10 26q0 41 41 41q21 0 31 -12l929 -1068q10 -11 10 -29zM1362 -223q0 -41 -37 -41h-1171q-39 0 -39 41t39 41h1171q37 0 37 -41z" />
+<glyph unicode="⦦" horiz-adv-x="2016" d="M1899 41q0 -41 -37 -41h-1154q-24 0 -48 41l-560 971q-4 7 -4 17q0 42 44 42q21 0 31 -18l561 -971h1130q37 0 37 -41z" />
+<glyph unicode="⦧" horiz-adv-x="2016" d="M1899 1030q0 -41 -37 -41h-1130l-561 -971q-10 -18 -31 -18q-44 0 -44 42q0 10 4 17l560 971q24 41 48 41h1154q37 0 37 -41z" />
+<glyph unicode="⦨" horiz-adv-x="1479" d="M1362 41q0 -41 -37 -41h-148q-27 -107 -75 -183q-12 -18 -32 -18q-42 0 -42 42q0 8 22 49t43 110h-939q-39 0 -39 41q0 18 10 29l615 707q-130 59 -273 59q-37 0 -37 40t37 40q173 0 327 -77l250 287q-48 -7 -96 -7q-113 0 -212 39q-20 8 -25 28q-4 20 11 38q10 12 25 12 q6 0 14 -3q24 -8 78 -22.5t135 -14.5t181 35q17 6 27 6q7 0 10 -3q9 -7 -1 -54t-10 -129.5t41 -182.5l24 -50q15 -33 -1 -51q-16 -17 -31 -17q-13 0 -26 11q-5 4 -9 12q-73 131 -73 291v9l-239 -276q153 -100 243 -262.5t90 -351.5q0 -49 -7 -101h132q37 0 37 -41zM1120 183 q0 172 -82.5 318.5t-223.5 234.5l-568 -654h866q8 49 8 101z" />
+<glyph unicode="⦩" horiz-adv-x="1479" d="M1362 41q0 -41 -39 -41h-939q21 -69 43 -110t22 -49q0 -42 -42 -42q-20 0 -32 18q-48 76 -75 183h-148q-37 0 -37 41t37 41h132q-7 52 -7 101q0 189 90 351.5t243 262.5l-239 276v-9q0 -160 -73 -291q-4 -8 -9 -12q-13 -11 -26 -11q-16 0 -31 17q-16 18 -5 40.5t28 60.5 q41 100 41 182.5t-10 129.5t-2 54q4 3 11 3q10 0 27 -6q100 -35 181 -35t149 17q20 7 54 17q13 4 23 4q17 0 26 -10q15 -18 10.5 -38t-24.5 -28q-99 -39 -212 -39q-48 0 -96 7l250 -287q154 77 327 77q37 0 37 -40t-37 -40q-143 0 -273 -59l615 -707q10 -11 10 -29zM357 183 q0 -52 8 -101h866l-568 654q-141 -88 -223.5 -234.5t-82.5 -318.5z" />
+<glyph unicode="⦪" horiz-adv-x="1479" d="M1362 993q0 -41 -37 -41h-132q7 -52 7 -101q0 -190 -90 -352t-243 -262l239 -276v9q0 159 73 290q4 8 9 12q13 12 26 12q16 0 31 -18q16 -18 5 -40q-69 -138 -69 -265q0 -60 10 -107.5t1 -54.5q-3 -3 -9 -3q-10 0 -28 7q-100 35 -181 35t-149 -17q-20 -7 -54 -17.5t-49 7 t-11 37.5q5 20 25 28q99 39 212 39q48 0 96 -8l-250 287q-154 -76 -327 -76q-37 0 -37 40t37 40q143 0 273 59l-615 707q-10 11 -10 29q0 41 39 41h939q-21 68 -61 142q-4 8 -4 17q0 41 42 41q20 0 32 -18q48 -76 75 -182h148q37 0 37 -41zM1120 850q0 52 -8 102h-866 l568 -654q141 88 223.5 234.5t82.5 317.5z" />
+<glyph unicode="⦫" horiz-adv-x="1479" d="M1362 993q0 -18 -10 -29l-615 -707q130 -59 273 -59q37 0 37 -40t-37 -40q-173 0 -327 76l-250 -287q48 8 96 8q113 0 212 -39q20 -8 24.5 -28t-10.5 -38q-11 -12 -25 -12q-7 0 -14 2l-64 21q-68 17 -149 17t-181 -35q-18 -7 -28 -7q-6 0 -10 3q-8 7 2 54.5t10 129.5 t-41 182l-27 57q-12 26 4 44q15 18 31 18q13 0 26 -12q5 -4 9 -12q73 -131 73 -290v-9l239 276q-153 100 -243 262t-90 352q0 49 7 101h-132q-37 0 -37 41t37 41h148q27 106 75 182q12 18 32 18q42 0 42 -41q0 -9 -4 -17q-40 -74 -61 -142h939q39 0 39 -41zM357 850 q0 -171 82.5 -317.5t223.5 -234.5l568 654h-866q-8 -50 -8 -102z" />
+<glyph unicode="⦬" horiz-adv-x="1615" d="M1522 1040q-35 -100 -35 -181t17 -149q7 -20 17.5 -54t-8.5 -50q-15 -13 -29 -13q-15 0 -28 15q-3 4 -7 13q-39 100 -39 213q0 48 7 95l-287 -250q77 -154 77 -327q0 -37 -40 -37t-40 37q0 145 -59 273l-707 -615q-11 -10 -29 -10q-41 0 -41 39v939q-67 -20 -108.5 -42.5 t-50.5 -22.5q-42 0 -42 42q0 20 18 32q75 48 183 75v148q0 37 41 37t41 -37v-132q50 7 101 7q189 0 351.5 -90t262.5 -243l276 239h-12q-158 0 -288 73q-8 5 -12 9q-12 13 -12 26q0 16 18 31q18 16 40.5 5t60.5 -28q101 -41 183.5 -41t129.5 9.5t54 2.5q2 -3 2 -10 q0 -10 -6 -28zM474 1005q-52 0 -101 -8v-866l654 568q-88 140 -234.5 223t-318.5 83z" />
+<glyph unicode="⦭" horiz-adv-x="1615" d="M1525 955q0 -42 -42 -42q-9 0 -50.5 22.5t-108.5 42.5v-939q0 -39 -41 -39q-18 0 -29 10l-707 615q-59 -128 -59 -273q0 -37 -40 -37t-40 37q0 173 77 327l-287 250q7 -47 7 -95q0 -113 -39 -213q-4 -9 -7 -13q-13 -15 -28 -15q-14 0 -29 13q-14 11 -14 27q0 6 2 13 l21 64q17 68 17 149t-35 181q-6 18 -6 28q0 7 3 10q6 7 53 -2.5t129.5 -9.5t183.5 41l57 27q26 12 44 -4q18 -15 18 -31q0 -13 -12 -26q-4 -4 -12 -9q-130 -73 -288 -73h-12l276 -239q100 153 262.5 243t351.5 90q51 0 101 -7v132q0 37 41 37t41 -37v-148q108 -27 183 -75 q18 -12 18 -32zM1141 1005q-172 0 -318.5 -83t-234.5 -223l654 -568v866q-49 8 -101 8z" />
+<glyph unicode="⦮" horiz-adv-x="1615" d="M1522 207q6 -18 6 -28q0 -7 -2 -9q-7 -8 -54 1.5t-129.5 9.5t-183.5 -41l-57 -27q-26 -12 -44 4q-18 15 -18 31q0 13 12 26q4 4 12 9q130 73 288 73h12l-276 239q-100 -153 -262.5 -243t-351.5 -90q-51 0 -101 7v-132q0 -37 -41 -37t-41 37v148q-108 27 -183 75 q-18 12 -18 32q0 42 42 42q9 0 50.5 -22.5t108.5 -42.5v939q0 39 41 39q18 0 29 -10l707 -615q59 128 59 273q0 37 40 37t40 -37q0 -173 -77 -327l287 -250q-7 47 -7 95q0 113 39 213q4 9 7 13q13 15 28 15q14 0 29 -13q14 -11 14 -27q0 -6 -3 -12l-20 -65q-17 -68 -17 -149 t35 -181zM474 242q172 0 318.5 83t234.5 223l-654 568v-866q49 -8 101 -8z" />
+<glyph unicode="⦯" horiz-adv-x="1615" d="M1525 292q0 -20 -18 -32q-75 -48 -183 -75v-148q0 -37 -41 -37t-41 37v132q-50 -7 -101 -7q-189 0 -351.5 90t-262.5 243l-276 -239h12q158 0 288 -73q8 -5 12 -9q12 -13 12 -26q0 -16 -18 -31q-18 -16 -40.5 -5t-60.5 28q-101 41 -183.5 41t-129.5 -9.5t-53 -1.5 q-3 2 -3 9q0 10 6 28q35 100 35 181t-17 149q-7 20 -17.5 54t8.5 50q15 13 29 13q15 0 28 -15q3 -4 7 -13q39 -100 39 -213q0 -48 -7 -95l287 250q-77 154 -77 327q0 37 40 37t40 -37q0 -145 59 -273l707 615q11 10 29 10q41 0 41 -39v-939q67 20 108.5 42.5t50.5 22.5 q42 0 42 -42zM1141 242q52 0 101 8v866l-654 -568q88 -140 234.5 -223t318.5 -83z" />
+<glyph unicode="⦰" horiz-adv-x="1592" d="M1307 1093q211 -212 211 -498.5t-184 -493.5l107 -106q27 -27 27 -46q0 -39 -39 -39q-19 0 -46 27l-106 106q-206 -184 -492 -184t-498.5 212.5t-212.5 499.5t183 492l-106 106q-27 27 -27 46q0 39 39 39q19 0 46 -27l106 -106q206 184 493.5 184t498.5 -212zM1276 160 q160 182 160 434.5t-187.5 440.5t-441 188t-434.5 -160zM315 1005q-159 -181 -159 -434t188.5 -441.5t440.5 -188.5t434 160z" />
+<glyph unicode="⦱" horiz-adv-x="1592" d="M1422 1565q0 -41 -37 -41h-1175q-39 0 -39 41t39 41h1175q37 0 37 -41zM1335 1063q183 -205 183 -492t-212.5 -499.5t-498.5 -212.5t-492 184l-106 -106q-27 -27 -46 -27q-39 0 -39 39q0 19 27 46l107 106q-184 207 -184 493.5t211 498.5t498.5 212t493.5 -184l106 106 q27 27 46 27q39 0 39 -39q0 -19 -27 -46zM1219 1063q-181 160 -435 160t-441 -188t-187 -440.5t160 -434.5zM1247.5 129.5q188.5 188.5 188.5 441.5t-159 434l-904 -904q182 -160 434 -160t440.5 188.5z" />
+<glyph unicode="⦲" horiz-adv-x="1592" d="M953 1536q66 -67 66 -158t-67 -157t-157.5 -66t-157 65.5t-66.5 156.5t66.5 158.5t158 67.5t157.5 -67zM1335 803q183 -205 183 -492t-212.5 -499.5t-498.5 -212.5t-492 184l-106 -106q-27 -27 -46 -27q-39 0 -39 39q0 19 27 46l107 106q-184 207 -184 493.5t211 498.5 t498.5 212t493.5 -184l106 106q27 27 46 27q39 0 39 -39q0 -19 -27 -46zM898 1275.5q44 43.5 44 102.5t-44 103.5t-103 44.5t-103 -44.5t-44 -103.5t44 -102.5t103 -43.5t103 43.5zM1219 803q-181 160 -435 160t-441 -188t-187 -440.5t160 -434.5zM1247.5 -130.5 q188.5 188.5 188.5 441.5t-159 434l-904 -904q182 -160 434 -160t440.5 188.5z" />
+<glyph unicode="⦳" horiz-adv-x="1592" d="M1276 1396q0 -18 -43 -41q-117 -62 -179 -127q-32 -33 -48 -33q-31 0 -31 32.5t128 129.5h-741q-45 0 -45 39t45 39h741q-128 97 -128 129.5t31 32.5q16 0 48 -33q62 -65 179 -127q43 -23 43 -41zM1335 853q183 -205 183 -492t-212.5 -499.5t-498.5 -212.5t-492 184 l-106 -106q-27 -27 -46 -27q-39 0 -39 39q0 19 27 46l107 106q-184 207 -184 493.5t211 498.5t498.5 212t493.5 -184l106 106q27 27 46 27q39 0 39 -39q0 -19 -27 -46zM1219 853q-181 160 -435 160t-441 -188t-187 -440.5t160 -434.5zM1247.5 -80.5q188.5 188.5 188.5 441.5 t-159 434l-904 -904q182 -160 434 -160t440.5 188.5z" />
+<glyph unicode="⦴" horiz-adv-x="1592" d="M1276 1396q0 -39 -45 -39h-741q128 -97 128 -129.5t-31 -32.5q-17 0 -48 33q-63 65 -179 127q-43 23 -43 41t43 41q116 62 179 127q31 33 48 33q31 0 31 -32.5t-128 -129.5h741q45 0 45 -39zM1335 853q183 -205 183 -492t-212.5 -499.5t-498.5 -212.5t-492 184l-106 -106 q-27 -27 -46 -27q-39 0 -39 39q0 19 27 46l107 106q-184 207 -184 493.5t211 498.5t498.5 212t493.5 -184l106 106q27 27 46 27q39 0 39 -39q0 -19 -27 -46zM1219 853q-181 160 -435 160t-441 -188t-187 -440.5t160 -434.5zM1247.5 -80.5q188.5 188.5 188.5 441.5t-159 434 l-904 -904q182 -160 434 -160t440.5 188.5z" />
+<glyph unicode="⦵" horiz-adv-x="2205" d="M2035 582q0 -41 -61 -41h-150q-16 -284 -224.5 -483t-495.5 -199t-496.5 198.5t-225.5 483.5h-151q-61 0 -61 41t61 41h151q16 286 224.5 484t497 198t496.5 -198.5t224 -483.5h150q61 0 61 -41zM1541.5 1048.5q-184.5 174.5 -438.5 174.5t-438.5 -174t-200.5 -426h1278 q-16 251 -200.5 425.5zM1104 -59q253 0 437.5 174.5t200.5 425.5h-1278q16 -251 201.5 -425.5t438.5 -174.5z" />
+<glyph unicode="⦶" horiz-adv-x="1592" d="M1307 1093q211 -212 211 -510.5t-211.5 -511t-509.5 -212.5t-510.5 212.5t-212.5 511.5t211.5 510.5t511 211.5t510.5 -212zM1262 143.5q174 185.5 174 439t-174 438.5t-425 201v-1280q251 16 425 201.5zM329.5 1020.5q-173.5 -184.5 -173.5 -438t174 -438.5t425 -202 v1280q-252 -17 -425.5 -201.5z" />
+<glyph unicode="⦷" horiz-adv-x="1592" d="M1307 1093q211 -212 211 -510.5t-211.5 -511t-509.5 -212.5t-510.5 212.5t-212.5 511.5t211.5 510.5t511 211.5t510.5 -212zM1248.5 129.5q187.5 188.5 187.5 453t-187.5 452.5t-452.5 188t-452.5 -187.5t-187.5 -452.5t188.5 -453.5t452.5 -188.5t451.5 188.5zM989 96 q0 -39 -41 -39t-41 39v975q0 37 41 37t41 -37v-975zM685 96q0 -39 -41 -39t-41 39v975q0 37 41 37t41 -37v-975z" />
+<glyph unicode="⦸" horiz-adv-x="1592" d="M1307 1093q211 -212 211 -510.5t-211.5 -511t-509.5 -212.5t-510.5 212.5t-212.5 511.5t211.5 510.5t511 211.5t510.5 -212zM1436 582q0 265 -187.5 453t-440 188t-433.5 -158l903 -903q158 181 158 420zM317 1007q-161 -181 -161 -435t188.5 -442.5t441.5 -188.5 t435 163z" />
+<glyph unicode="⦹" horiz-adv-x="1592" d="M1307 1093q211 -212 211 -510.5t-211.5 -511t-509.5 -212.5t-510.5 212.5t-212.5 511.5t211.5 510.5t511 211.5t510.5 -212zM1248.5 129.5q187.5 188.5 187.5 453t-187.5 452.5t-452.5 188t-452.5 -187.5t-187.5 -452.5t188.5 -453.5t452.5 -188.5t451.5 188.5zM1321 282 q0 -41 -37 -41h-974q-39 0 -39 41t39 41h445v847q0 37 41 37t41 -37v-847h447q37 0 37 -41z" />
+<glyph unicode="⦺" horiz-adv-x="1592" d="M1307 1093q211 -212 211 -510.5t-211.5 -511t-509.5 -212.5t-510.5 212.5t-212.5 511.5t211.5 510.5t511 211.5t510.5 -212zM837 623h598q-16 241 -187 412.5t-411 186.5v-599zM755 623v599q-241 -16 -412 -187t-186 -412h598zM797 -59q253 0 437.5 174.5t200.5 425.5 h-1278q16 -251 201.5 -425.5t438.5 -174.5z" />
+<glyph unicode="⦻" horiz-adv-x="1592" d="M1335 1063q183 -206 183 -480.5t-184 -481.5l107 -106q27 -27 27 -46q0 -39 -39 -39q-19 0 -46 27l-106 106q-206 -184 -480.5 -184t-480.5 185l-107 -107q-27 -27 -46 -27q-39 0 -39 39q0 19 27 46l107 107q-184 206 -184 481t183 480l-106 106q-27 27 -27 46 q0 39 39 39q19 0 46 -27l106 -106q206 184 481.5 184t480.5 -184l106 106q27 27 46 27q39 0 39 -39q0 -19 -27 -46zM1219 1063q-181 160 -423 160t-423 -160l423 -423zM1276 160q160 182 160 422.5t-159 422.5l-423 -423zM315 1005q-159 -181 -159 -422t160 -423l422 422z M374 102q182 -161 422.5 -161t422.5 160l-423 423z" />
+<glyph unicode="⦼" horiz-adv-x="1592" d="M1307 1093q211 -212 211 -510.5t-211.5 -511t-509.5 -212.5t-510.5 212.5t-212.5 511.5t211.5 510.5t511 211.5t510.5 -212zM1248.5 129.5q187.5 188.5 187.5 453t-187.5 452.5t-452.5 188t-452.5 -187.5t-187.5 -452.5t188.5 -453.5t452.5 -188.5t451.5 188.5zM1241 969 l-831 -831q-14 -14 -28 -14t-29 15t-15 29t14 28l831 831q12 12 25 12q15 0 30 -15t15 -30q0 -13 -12 -25zM664 829q0 -47 -34 -81t-81 -34t-79.5 32.5t-32.5 80.5t33 81t81 33t80.5 -32.5t32.5 -79.5zM1155 337q0 -48 -33 -81t-81 -33t-80.5 32.5t-32.5 79.5t34 81t81 34 t79.5 -32.5t32.5 -80.5z" />
+<glyph unicode="⦽" horiz-adv-x="1592" d="M1320 987.5q198 -209.5 198 -497t-198.5 -497.5t-483.5 -225v-149q0 -61 -41 -61t-41 61v149q-284 17 -482 226t-198 496.5t197.5 496t482.5 225.5v215q-107 -126 -251 -178q-8 -3 -15 -3q-39 0 -39 42q0 24 23 34l61 27q149 76 236 230q15 27 26 27t26 -27 q88 -155 237 -230q20 -8 59 -25q26 -12 26 -36q0 -42 -39 -42q-7 0 -15 3q-146 52 -253 179v-216q286 -15 484 -224.5zM1261.5 51.5q174.5 185.5 174.5 439t-174 439t-426 200.5v-1280q251 16 425.5 201.5zM329.5 928.5q-173.5 -184.5 -173.5 -438t174 -438.5t424 -202v1280 q-251 -17 -424.5 -201.5z" />
+<glyph unicode="⦾" horiz-adv-x="1578" d="M1118 582q0 -137 -96 -233t-233 -96t-233 96t-96 233t96 233t233 96t233 -96t96 -233zM1538 582q0 -312 -218.5 -530.5t-530.5 -218.5t-530.5 218.5t-218.5 530.5t218.5 530.5t530.5 218.5t530.5 -218.5t218.5 -530.5zM1438 582q0 270 -189.5 459.5t-459.5 189.5 t-459.5 -189.5t-189.5 -459.5t189.5 -459.5t459.5 -189.5t459.5 189.5t189.5 459.5zM1018 582q0 96 -66.5 162.5t-162.5 66.5t-162.5 -66.5t-66.5 -162.5t66.5 -162.5t162.5 -66.5t162.5 66.5t66.5 162.5z" />
+<glyph unicode="⦿" horiz-adv-x="1578" d="M1538 582q0 -312 -218.5 -530.5t-530.5 -218.5t-530.5 218.5t-218.5 530.5t218.5 530.5t530.5 218.5t530.5 -218.5t218.5 -530.5zM1438 582q0 270 -189.5 459.5t-459.5 189.5t-459.5 -189.5t-189.5 -459.5t189.5 -459.5t459.5 -189.5t459.5 189.5t189.5 459.5zM1118 582 q0 -137 -96 -233t-233 -96t-233 96t-96 233t96 233t233 96t233 -96t96 -233z" />
+<glyph unicode="⧀" horiz-adv-x="1592" d="M1307 1093q211 -212 211 -510.5t-211.5 -511t-509.5 -212.5t-510.5 212.5t-212.5 511.5t211.5 510.5t511 211.5t510.5 -212zM1248.5 129.5q187.5 188.5 187.5 453t-187.5 452.5t-452.5 188t-452.5 -187.5t-187.5 -452.5t188.5 -453.5t452.5 -188.5t451.5 188.5zM1233 207 q0 -41 -41 -41q-9 0 -14 2l-926 377q-26 11 -26 37.5t20 34.5l932 379q5 2 14 2q41 0 41 -41q0 -26 -19 -34l-839 -341l833 -339q25 -10 25 -36z" />
+<glyph unicode="⧁" horiz-adv-x="1592" d="M1307 1093q211 -212 211 -510.5t-211.5 -511t-509.5 -212.5t-510.5 212.5t-212.5 511.5t211.5 510.5t511 211.5t510.5 -212zM1248.5 129.5q187.5 188.5 187.5 453t-187.5 452.5t-452.5 188t-452.5 -187.5t-187.5 -452.5t188.5 -453.5t452.5 -188.5t451.5 188.5zM1346 617 q20 -8 20 -34.5t-26 -37.5l-926 -377q-5 -2 -14 -2q-41 0 -41 41q0 26 25 36l833 339l-839 341q-19 8 -19 34q0 41 41 41q9 0 14 -2z" />
+<glyph unicode="⧂" horiz-adv-x="1982" d="M1908.5 739.5q67.5 -66.5 67.5 -158t-67 -157.5t-158 -66t-157 67t-66 157.5t65.5 157t156.5 66.5t158.5 -66.5zM1307 1093q211 -212 211 -510.5t-211.5 -511t-509.5 -212.5t-510.5 212.5t-212.5 511.5t211.5 510.5t511 211.5t510.5 -212zM1899 582q0 59 -44.5 103 t-103.5 44t-102.5 -44t-43.5 -103t43.5 -103t102.5 -44t103.5 44t44.5 103zM1248.5 129.5q187.5 188.5 187.5 453t-187.5 452.5t-452.5 188t-452.5 -187.5t-187.5 -452.5t188.5 -453.5t452.5 -188.5t451.5 188.5z" />
+<glyph unicode="⧃" horiz-adv-x="1987" d="M1981 430q0 -41 -37 -41h-452q-65 -231 -257.5 -380.5t-437.5 -149.5q-298 0 -510.5 212.5t-212.5 511.5t211.5 510.5t511.5 211.5q246 0 438.5 -149.5t256.5 -380.5h452q37 0 37 -41t-37 -41h-434q8 -55 8 -111t-9 -111h435q37 0 37 -41zM1248.5 129.5 q187.5 188.5 187.5 453t-187.5 452.5t-452.5 188t-452.5 -187.5t-187.5 -452.5t188.5 -453.5t452.5 -188.5t451.5 188.5z" />
+<glyph unicode="⧄" horiz-adv-x="1592" d="M1488 -72q0 -39 -37 -39h-1308q-39 0 -39 39v1310q0 37 39 37h1308q37 0 37 -37v-1310zM186 1193v-1163l1163 1163h-1163zM1406 -29v1163l-1163 -1163h1163z" />
+<glyph unicode="⧅" horiz-adv-x="1592" d="M1488 -72q0 -39 -39 -39h-1308q-37 0 -37 39v1310q0 37 37 37h1308q39 0 39 -37v-1310zM1406 1193h-1163l1163 -1163v1163zM186 -29h1163l-1163 1163v-1163z" />
+<glyph unicode="⧆" horiz-adv-x="1592" d="M1488 -72q0 -39 -37 -39h-1308q-39 0 -39 39v1310q0 37 39 37h1308q37 0 37 -37v-1310zM1406 -29v1222h-1220v-1222h1220zM1175 394q0 -62 -60 -62q-15 0 -29 10l-262 191l31 -338q0 -53 -59 -53q-23 0 -42.5 17t-17.5 40l31 334l-262 -191q-14 -10 -29 -10q-59 0 -59 62 q0 36 28 49l295 139l-295 139q-28 13 -28 49q0 62 59 62q15 0 29 -10l262 -191l-31 340q0 53 60 53q25 0 43 -17t16 -42l-31 -334l262 191q14 10 29 10q60 0 60 -62q0 -35 -29 -49l-295 -139l295 -139q29 -14 29 -49z" />
+<glyph unicode="⧇" horiz-adv-x="1592" d="M1488 -72q0 -39 -37 -39h-1308q-39 0 -39 39v1310q0 37 39 37h1308q37 0 37 -37v-1310zM1406 -29v1222h-1220v-1222h1220zM1023.5 810.5q94.5 -94.5 94.5 -228t-95 -228.5t-227 -95t-227 95t-95 228.5t94.5 228t227.5 94.5t227.5 -94.5zM965 412q71 71 71 170.5 t-70.5 170t-169.5 70.5t-169.5 -70.5t-70.5 -170t71 -170.5t169 -71t169 71z" />
+<glyph unicode="⧈" horiz-adv-x="1592" d="M1488 -72q0 -39 -37 -39h-1308q-39 0 -39 39v1310q0 37 39 37h1308q37 0 37 -37v-1310zM1406 -29v1222h-1220v-1222h1220zM1268 148q0 -39 -37 -39h-868q-39 0 -39 39v870q0 37 39 37h868q37 0 37 -37v-870zM1186 191v782h-780v-782h780z" />
+<glyph unicode="⧉" horiz-adv-x="2282" d="M2178 -372q0 -39 -37 -39h-1308q-39 0 -39 39v561h-651q-39 0 -39 39v1310q0 37 39 37h1308q37 0 37 -37v-563h653q37 0 37 -37v-1310zM2096 -329v1222h-608v-665q0 -39 -37 -39h-575v-518h1220zM1406 271v622h-530v-622h530zM1406 975v518h-1220v-1222h608v667 q0 37 39 37h573z" />
+<glyph unicode="⧊" horiz-adv-x="1592" d="M1515 -76q0 -35 -43 -35h-1352q-43 0 -43 35q0 12 6 24l676 1355q14 28 36.5 28t36.5 -28l677 -1355q6 -12 6 -24zM1406 -29l-610 1222l-610 -1222h1220zM875.5 1572.5q33.5 -33.5 33.5 -80t-33 -79.5t-80 -33t-80 33t-33 80t33 80t79.5 33t80 -33.5z" />
+<glyph unicode="⧋" horiz-adv-x="1592" d="M1515 -76q0 -35 -43 -35h-1352q-43 0 -43 35q0 12 6 24l676 1355q14 28 36.5 28t36.5 -28l677 -1355q6 -12 6 -24zM1406 -29l-610 1222l-610 -1222h1220zM1515 -326q0 -41 -37 -41h-1362q-39 0 -39 41t39 41h1362q37 0 37 -41z" />
+<glyph unicode="⧌" horiz-adv-x="1592" d="M1515 -76q0 -35 -43 -35h-1352q-43 0 -43 35q0 12 6 24l676 1355q14 28 36.5 28t36.5 -28l677 -1355q6 -12 6 -24zM1406 -29l-610 1222l-610 -1222h1220z" />
+<glyph unicode="⧍" horiz-adv-x="1592" d="M1615 -70q0 -41 -37 -41h-1562q-39 0 -39 41t39 41h78l665 1332q14 28 36.5 28t36.5 -28l666 -1332h80q37 0 37 -41zM1406 -29l-610 1222l-610 -1222h1220z" />
+<glyph unicode="⧎" horiz-adv-x="1839" d="M1669 932q0 -28 -36 -39l-1410 -445q-8 -3 -16 -3q-37 0 -37 42v888q0 42 37 42q8 0 16 -3l1410 -443q36 -11 36 -39zM1669 -213q0 -42 -37 -42q-8 0 -16 3l-1410 445q-36 11 -36 39t36 39l1410 443q8 3 15 3q38 0 38 -42v-888zM1484 932l-1232 387v-776zM1587 -157v776 l-1232 -387z" />
+<glyph unicode="⧏" horiz-adv-x="1978" d="M1808 144q0 -62 -41 -62t-41 62v877q0 61 41 61t41 -61v-877zM1584 137q0 -42 -37 -42q-6 0 -16 3l-1410 445q-36 11 -36 39t36 39l1410 443q10 3 15 3q38 0 38 -42v-888zM1502 193v776l-1232 -387z" />
+<glyph unicode="⧐" horiz-adv-x="1978" d="M1893 582q0 -28 -36 -39l-1410 -445q-10 -3 -16 -3q-37 0 -37 42v888q0 42 38 42q5 0 15 -3l1410 -443q36 -11 36 -39zM252 144q0 -62 -41 -62t-41 62v877q0 61 41 61t41 -61v-877zM1708 582l-1232 387v-776z" />
+<glyph unicode="⧑" horiz-adv-x="1591" d="M1290 127q0 -39 -41 -39q-15 0 -30 15l-422 422l-424 -422q-15 -15 -31 -15q-41 0 -41 39v912q0 37 41 37q18 0 31 -13l424 -424l422 424q13 13 30 13q41 0 41 -37v-912zM1208 228v708l-354 -354z" />
+<glyph unicode="⧒" horiz-adv-x="1591" d="M1290 127q0 -39 -41 -39q-15 0 -30 15l-422 422l-424 -422q-15 -15 -31 -15q-41 0 -41 39v912q0 37 41 37q18 0 31 -13l424 -424l422 424q13 13 30 13q41 0 41 -37v-912zM737 582l-354 354v-708z" />
+<glyph unicode="⧓" horiz-adv-x="1591" d="M1290 127q0 -39 -41 -39q-15 0 -30 15l-422 422l-424 -422q-15 -15 -31 -15q-41 0 -41 39v912q0 37 41 37q18 0 31 -13l424 -424l422 424q13 13 30 13q41 0 41 -37v-912z" />
+<glyph unicode="⧔" horiz-adv-x="1591" d="M1290 129q0 -41 -41 -41q-15 0 -30 15l-422 422l-424 -422q-15 -15 -31 -15q-41 0 -41 39v912q0 37 41 37q18 0 31 -13l424 -424l422 424q13 13 30 13q41 0 41 -41q0 -17 -10 -27l-426 -426l426 -424q10 -10 10 -29z" />
+<glyph unicode="⧕" horiz-adv-x="1591" d="M1290 127q0 -39 -41 -39q-15 0 -30 15l-422 422l-424 -422q-15 -15 -31 -15q-41 0 -41 41q0 19 10 29l426 424l-426 426q-10 10 -10 27q0 41 41 41q18 0 31 -13l424 -424l422 424q13 13 30 13q41 0 41 -37v-912z" />
+<glyph unicode="⧖" horiz-adv-x="1362" d="M1175 127q0 -41 -39 -41h-912q-37 0 -37 41q0 18 13 31l424 424l-424 422q-13 13 -13 30q0 41 37 41h912q39 0 39 -41q0 -15 -15 -30l-422 -422l422 -424q15 -15 15 -31zM1035 993h-708l354 -354zM1035 168l-354 354l-354 -354h708z" />
+<glyph unicode="⧗" horiz-adv-x="1362" d="M1175 127q0 -41 -39 -41h-912q-37 0 -37 41q0 18 13 31l424 424l-424 422q-13 13 -13 30q0 41 37 41h912q39 0 39 -41q0 -15 -15 -30l-422 -422l422 -424q15 -15 15 -31z" />
+<glyph unicode="⧘" horiz-adv-x="706" d="M564 -176q0 -18 -12 -31l-170 -190q-9 -10 -29 -10q-41 0 -41 41q0 14 14 30l142 160l-314 348q-12 13 -12 31t12 31l314 348l-314 348q-12 13 -12 31t12 31l314 348l-142 160q-14 16 -14 30q0 41 41 41q20 0 29 -10l170 -190q12 -13 12 -31t-12 -31l-314 -348l314 -348 q12 -13 12 -31t-12 -31l-314 -348l314 -348q12 -13 12 -31z" />
+<glyph unicode="⧙" horiz-adv-x="706" d="M564 203q0 -18 -12 -31l-314 -348l142 -160q14 -16 14 -30q0 -41 -41 -41q-20 0 -29 10l-170 190q-12 13 -12 31t12 31l314 348l-314 348q-12 13 -12 31t12 31l314 348l-314 348q-12 13 -12 31t12 31l170 190q9 10 29 10q41 0 41 -41q0 -14 -14 -30l-142 -160l314 -348 q12 -13 12 -31t-12 -31l-314 -348l314 -348q12 -13 12 -31z" />
+<glyph unicode="⧚" horiz-adv-x="1206" d="M564 -176q0 -18 -12 -31l-170 -190q-9 -10 -29 -10q-41 0 -41 41q0 14 14 30l142 160l-314 348q-12 13 -12 31t12 31l314 348l-314 348q-12 13 -12 31t12 31l314 348l-142 160q-14 16 -14 30q0 41 41 41q20 0 29 -10l170 -190q12 -13 12 -31t-12 -31l-314 -348l314 -348 q12 -13 12 -31t-12 -31l-314 -348l314 -348q12 -13 12 -31zM1064 -176q0 -18 -12 -31l-170 -190q-9 -10 -29 -10q-41 0 -41 41q0 14 14 30l142 160l-314 348q-12 13 -12 31t12 31l314 348l-314 348q-12 13 -12 31t12 31l314 348l-142 160q-14 16 -14 30q0 41 41 41 q20 0 29 -10l170 -190q12 -13 12 -31t-12 -31l-314 -348l314 -348q12 -13 12 -31t-12 -31l-314 -348l314 -348q12 -13 12 -31z" />
+<glyph unicode="⧛" horiz-adv-x="1206" d="M564 203q0 -18 -12 -31l-314 -348l142 -160q14 -16 14 -30q0 -41 -41 -41q-20 0 -29 10l-170 190q-12 13 -12 31t12 31l314 348l-314 348q-12 13 -12 31t12 31l314 348l-314 348q-12 13 -12 31t12 31l170 190q9 10 29 10q41 0 41 -41q0 -14 -14 -30l-142 -160l314 -348 q12 -13 12 -31t-12 -31l-314 -348l314 -348q12 -13 12 -31zM1064 203q0 -18 -12 -31l-314 -348l142 -160q14 -16 14 -30q0 -41 -41 -41q-20 0 -29 10l-170 190q-12 13 -12 31t12 31l314 348l-314 348q-12 13 -12 31t12 31l314 348l-314 348q-12 13 -12 31t12 31l170 190 q9 10 29 10q41 0 41 -41q0 -14 -14 -30l-142 -160l314 -348q12 -13 12 -31t-12 -31l-314 -348l314 -348q12 -13 12 -31z" />
+<glyph unicode="⧜" d="M1931 442q0 -182 -109 -323.5t-286 -141.5q-134 0 -258.5 73.5t-210.5 189.5l-61 82q-212 -345 -502 -345q-174 0 -281.5 142.5t-107.5 323t109.5 321.5t285.5 141q131 0 257.5 -74.5t211.5 -187.5l119 -158q100 -133 157 -202.5t132.5 -134t181.5 -64.5 q136 0 222.5 109.5t86.5 248.5q0 27 26.5 27t26.5 -27zM477 799q-137 0 -223 -109.5t-86 -253t87 -265.5t228 -122q260 0 465 348l-133 173q-81 101 -156.5 165t-181.5 64z" />
+<glyph unicode="⧝" d="M1841 963q0 -24 -23 -24q-10 0 -18 11q-28 43 -91 124q-255 286 -685 286t-685 -286q-17 -19 -91 -124q-8 -11 -18 -11q-23 0 -23 24q0 9 4 16q131 218 347 345.5t466 127.5t466 -127.5t347 -345.5q4 -7 4 -16zM1542 905q175 0 282 -141.5t107 -322.5t-109 -322.5 t-286 -141.5q-134 0 -258.5 74t-210.5 189l-61 82q-212 -345 -502 -345q-174 0 -281.5 142.5t-107.5 323t109.5 321.5t285.5 141q132 0 258.5 -74.5t210.5 -187.5l61 -82q216 344 502 344zM1569 84q136 0 222.5 109.5t86.5 253.5t-86 265.5t-229 121.5q-260 0 -465 -349 l142 -180q74 -94 148.5 -157.5t180.5 -63.5zM477 799q-137 0 -223 -109.5t-86 -253t87 -265.5t228 -122q260 0 465 348l-133 173q-81 101 -156.5 165t-181.5 64z" />
+<glyph unicode="⧞" d="M1542 905q175 0 282 -141.5t107 -322.5t-109 -322.5t-286 -141.5q-134 0 -258 74q-125 74 -214 193v-310q0 -62 -41 -62t-41 62v351q-206 -308 -478 -308q-174 0 -281.5 142.5t-107.5 323t109.5 321.5t285.5 141q132 0 258 -75q126 -73 214 -191v372q0 61 41 61t41 -61 v-413q209 307 478 307zM1569 84q136 0 222.5 109.5t86.5 253.5t-86 265.5t-229 121.5q-260 0 -465 -349l142 -180q74 -94 148.5 -157.5t180.5 -63.5zM477 799q-137 0 -223 -109.5t-86 -253t87 -265.5t228 -122q260 0 465 348l-133 173q-81 101 -156.5 165t-181.5 64z" />
+<glyph unicode="⧟" horiz-adv-x="2275" d="M2064 812q95 -96 95 -229.5t-95.5 -230t-223.5 -96.5t-220.5 81.5t-108.5 203.5h-748q-16 -122 -108.5 -203.5t-220.5 -81.5t-223.5 96.5t-95.5 230t95 229.5t223 96t221.5 -82t108.5 -203h748q15 121 108.5 203t221.5 82t223 -96zM2077 582q0 99 -71.5 171.5t-171 72.5 t-171.5 -72t-72 -172t72 -172t171.5 -72t171 72.5t71.5 171.5zM683 582q0 100 -72 172t-171.5 72t-171 -72.5t-71.5 -171.5t71.5 -171.5t171 -72.5t171.5 72t72 172z" />
+<glyph unicode="⧠" horiz-adv-x="1591" d="M1488 -72q0 -39 -37 -39h-1238l-109 109v1240q0 37 39 37h1238l107 -107v-1240zM1406 -29v1152h-1150v-1152h1150z" />
+<glyph unicode="⧡" horiz-adv-x="1590" d="M1420 182q0 -41 -37 -41h-1175q-39 0 -39 41t39 41h1175q37 0 37 -41zM1420 582q0 -41 -41 -41h-1162q-44 0 -44 33q0 24 24 39l1162 725q16 10 29 10q32 0 32 -41v-725zM1338 623v606l-969 -606h969z" />
+<glyph unicode="⧢" horiz-adv-x="1497" d="M1359 37q0 -37 -37 -37h-1145q-39 0 -39 37v731q0 39 41 39t41 -39v-686h488v660q0 37 41 37t41 -37v-660h487v686q0 39 41 39t41 -39v-731z" />
+<glyph unicode="⧣" horiz-adv-x="1590" d="M1420 382q0 -41 -37 -41h-479l-242 -419q-23 -39 -46 -39q-41 0 -41 37q0 17 15 43l218 378h-304l-242 -419q-23 -39 -46 -39q-41 0 -41 37q0 17 15 43l218 378h-199q-39 0 -39 41t39 41h247l184 318h-431q-39 0 -39 41t39 41h478l242 419q23 39 45 39q41 0 41 -37 q0 -17 -15 -43l-218 -378h305l242 419q23 39 45 39q41 0 41 -37q0 -17 -15 -43l-218 -378h201q37 0 37 -41t-37 -41h-248l-184 -318h432q37 0 37 -41zM1040 741h-305l-184 -318h305z" />
+<glyph unicode="⧤" horiz-adv-x="1590" d="M1420 382q0 -41 -37 -41h-479l-242 -419q-23 -39 -46 -39q-41 0 -41 37q0 17 15 43l218 378h-304l-242 -419q-23 -39 -46 -39q-41 0 -41 37q0 17 15 43l218 378h-199q-39 0 -39 41t39 41h247l184 318h-431q-39 0 -39 41t39 41h478l242 419q23 39 45 39q41 0 41 -37 q0 -17 -15 -43l-218 -378h305l242 419q23 39 45 39q41 0 41 -37q0 -17 -15 -43l-218 -378h201q37 0 37 -41t-37 -41h-248l-184 -318h432q37 0 37 -41zM1040 741h-305l-184 -318h305zM1216 1545q0 -101 -59.5 -179t-153.5 -78t-217.5 102t-196.5 102q-123 0 -157 -153 q-11 -51 -30 -51q-28 0 -28 56q0 110 55 186t153 76t221.5 -102t195.5 -102q53 0 97 35t55 86l8 49q9 34 26 34q31 0 31 -61z" />
+<glyph unicode="⧥" horiz-adv-x="1590" d="M1420 182q0 -41 -37 -41h-595l-126 -219q-23 -39 -46 -39q-41 0 -41 37q0 17 15 43l103 178h-305l-126 -219q-23 -39 -46 -39q-41 0 -41 37q0 17 15 43l103 178h-84q-39 0 -39 41t39 41h131l184 318h-315q-39 0 -39 41t39 41h362l184 318h-546q-39 0 -39 41t39 41h593 l127 219q23 39 45 39q41 0 41 -37q0 -17 -15 -43l-103 -178h305l127 219q23 39 45 39q41 0 41 -37q0 -17 -15 -43l-103 -178h86q37 0 37 -41t-37 -41h-133l-184 -318h317q37 0 37 -41t-37 -41h-364l-183 -318h547q37 0 37 -41zM1155 941h-305l-184 -318h305zM924 541h-305 l-183 -318h304z" />
+<glyph unicode="⧦" horiz-adv-x="1593" d="M1466 107q0 -39 -41 -39t-41 39v232h-1175v-232q0 -39 -41 -39t-41 39v952q0 37 41 37t41 -37v-234h1175v234q0 37 41 37t41 -37v-952zM1384 421v322h-1175v-322h1175z" />
+<glyph unicode="⧧" horiz-adv-x="1346" d="M1198 382q0 -41 -37 -41h-447v-245q0 -39 -41 -39t-41 39v245h-445q-39 0 -39 41t39 41h445v318h-445q-39 0 -39 41t39 41h445v247q0 37 41 37t41 -37v-247h447q37 0 37 -41t-37 -41h-447v-318h447q37 0 37 -41z" />
+<glyph unicode="⧨" horiz-adv-x="1592" d="M1515 1296q0 -12 -6 -24l-677 -1355q-14 -28 -36.5 -28t-36.5 28l-676 1355q-6 12 -6 24q0 35 43 35h1352q43 0 43 -35zM796 1249v-1222l610 1222h-610z" />
+<glyph unicode="⧩" horiz-adv-x="1592" d="M1515 1296q0 -12 -6 -24l-677 -1355q-14 -28 -36.5 -28t-36.5 28l-676 1355q-6 12 -6 24q0 35 43 35h1352q43 0 43 -35zM796 1249h-610l610 -1222v1222z" />
+<glyph unicode="⧪" horiz-adv-x="1592" d="M1550 803q11 -11 11 -27.5t-10 -26.5l-715 -715v-298q107 127 253 179q8 3 15 3q39 0 39 -42q0 -24 -23 -34l-62 -27q-149 -75 -237 -230q-15 -27 -26 -27t-26 27q-87 154 -236 230l-58 25q-26 12 -26 36q0 42 39 42q7 0 15 -3q144 -52 251 -178v300l-713 714 q-10 10 -10 26t11 27l727 727q10 10 26 10t26 -10z" />
+<glyph unicode="⧫" horiz-adv-x="1218" d="M1198 582l-589 -779l-589 779l589 779z" />
+<glyph unicode="⧬" horiz-adv-x="1592" d="M1307 1287q211 -212 211 -505t-198.5 -503t-483.5 -225v-318q107 127 253 179q8 3 15 3q39 0 39 -42q0 -24 -23 -34l-62 -27q-149 -75 -237 -230q-15 -27 -26 -27t-26 27q-87 154 -236 230l-58 25q-26 12 -26 36q0 42 39 42q7 0 15 -3q144 -52 251 -178v317 q-284 17 -482 226t-198 502.5t211.5 505t511 211.5t510.5 -212zM1248.5 323.5q187.5 188.5 187.5 453t-187.5 452.5t-452.5 188t-452.5 -187.5t-187.5 -452.5t188.5 -453.5t452.5 -188.5t451.5 188.5z" />
+<glyph unicode="⧭" horiz-adv-x="1592" d="M1307 1287q211 -212 211 -505t-198.5 -503t-483.5 -225v-318q107 127 253 179q8 3 15 3q39 0 39 -42q0 -24 -23 -34l-62 -27q-149 -75 -237 -230q-15 -27 -26 -27t-26 27q-87 154 -236 230l-58 25q-26 12 -26 36q0 42 39 42q7 0 15 -3q144 -52 251 -178v317 q-284 17 -482 226t-198 502.5t211.5 505t511 211.5t510.5 -212z" />
+<glyph unicode="⧮" horiz-adv-x="1024" d="M984 148q0 -39 -37 -39h-394v-369h309q62 0 62 -41t-62 -41h-701q-61 0 -61 41t61 41h310v369h-392q-39 0 -39 39v870q0 37 39 37h392v369h-310q-61 0 -61 41t61 41h701q62 0 62 -41t-62 -41h-309v-369h394q37 0 37 -37v-870zM902 191v782h-780v-782h780z" />
+<glyph unicode="⧯" horiz-adv-x="1024" d="M984 148q0 -39 -37 -39h-394v-369h309q62 0 62 -41t-62 -41h-701q-61 0 -61 41t61 41h310v369h-392q-39 0 -39 39v870q0 37 39 37h392v369h-310q-61 0 -61 41t61 41h701q62 0 62 -41t-62 -41h-309v-369h394q37 0 37 -37v-870z" />
+<glyph unicode="⧰" horiz-adv-x="1024" d="M991 611q10 -10 10 -28t-10 -28l-438 -438v-377h309q62 0 62 -41t-62 -41h-701q-61 0 -61 41t61 41h310v377l-438 438q-10 10 -10 28t10 28l438 438v375h-310q-61 0 -61 41t61 41h701q62 0 62 -41t-62 -41h-309v-375zM902 582l-391 391l-389 -391l389 -389z" />
+<glyph unicode="⧱" horiz-adv-x="1024" d="M991 611q10 -10 10 -28t-10 -28l-438 -438v-377h309q62 0 62 -41t-62 -41h-701q-61 0 -61 41t61 41h310v377l-438 438q-10 10 -10 28t10 28l438 438v375h-310q-61 0 -61 41t61 41h701q62 0 62 -41t-62 -41h-309v-375z" />
+<glyph unicode="⧲" horiz-adv-x="1024" d="M964 582q0 -176 -119.5 -306t-291.5 -145v-391h309q62 0 62 -41t-62 -41h-701q-61 0 -61 41t61 41h310v391q-173 16 -292 146t-119 305.5t118.5 305t292.5 145.5v391h-310q-61 0 -61 41t61 41h701q62 0 62 -41t-62 -41h-309v-391q173 -15 292 -145t119 -306zM882 582 q0 153 -108.5 262t-261.5 109t-261.5 -108.5t-108.5 -261.5t109.5 -262.5t261 -109.5t260.5 109t109 262z" />
+<glyph unicode="⧳" horiz-adv-x="1024" d="M964 582q0 -176 -119.5 -306t-291.5 -145v-391h309q62 0 62 -41t-62 -41h-701q-61 0 -61 41t61 41h310v391q-173 16 -292 146t-119 305.5t118.5 305t292.5 145.5v391h-310q-61 0 -61 41t61 41h701q62 0 62 -41t-62 -41h-309v-391q173 -15 292 -145t119 -306z" />
+<glyph unicode="⧴" d="M307.5 861.5q33.5 -33.5 33.5 -80t-33 -79.5t-80 -33t-80 33t-33 80t33 80t79.5 33t80 -33.5zM307.5 461.5q33.5 -33.5 33.5 -80t-33 -79.5t-80 -33t-80 33t-33 80t33 80t79.5 33t80 -33.5zM1906 611q25 -11 25 -27t-15 -22l-46 -18q-190 -83 -296 -265q-41 -70 -79 -213 q-2 -7 -8 -13t-53 -6q-21 0 -21 27q0 2 8 36q65 274 287 431h-1154q-39 0 -39 41t39 41h1154q-154 111 -238 288q-57 121 -57 179q0 24 21 28q-3 -1 41 -1q15 0 20 -19q14 -55 54 -163q105 -217 317 -310z" />
+<glyph unicode="⧵" horiz-adv-x="569" d="M569 -312q0 -38 -42 -38q-30 0 -43 47l-476 1743q-8 29 -8 36q0 38 42 38q30 0 43 -47l476 -1743q8 -29 8 -36z" />
+<glyph unicode="⧶" horiz-adv-x="569" d="M569 1565q0 -41 -37 -41h-493q-39 0 -39 41t39 41h493q37 0 37 -41zM569 1384q0 -7 -8 -36l-476 -1743q-13 -47 -43 -47q-42 0 -42 38q0 7 8 36l476 1743q13 47 43 47q42 0 42 -38z" />
+<glyph unicode="⧷" horiz-adv-x="1146" d="M998 582q0 -41 -37 -41h-334l223 -817q8 -29 8 -36q0 -38 -42 -38q-30 0 -43 47l-230 844h-356q-39 0 -39 41t39 41h333l-223 817q-8 29 -8 36q0 38 42 38q30 0 43 -47l230 -844h357q37 0 37 -41z" />
+<glyph unicode="⧸" horiz-adv-x="669" d="M669 1568q0 -9 -8 -36l-576 -1927q-14 -47 -43 -47q-42 0 -42 38q0 9 8 36l576 1927q14 47 43 47q42 0 42 -38z" />
+<glyph unicode="⧹" horiz-adv-x="669" d="M669 -404q0 -38 -42 -38q-29 0 -43 47l-576 1927q-8 27 -8 36q0 38 42 38q29 0 43 -47l576 -1927q8 -27 8 -36z" />
+<glyph unicode="⧺" horiz-adv-x="1646" d="M1498 582q0 -41 -37 -41h-447v-445q0 -39 -41 -39t-41 39v445h-218v-445q0 -39 -41 -39t-41 39v445h-445q-39 0 -39 41t39 41h445v447q0 37 41 37t41 -37v-447h218v447q0 37 41 37t41 -37v-447h447q37 0 37 -41z" />
+<glyph unicode="⧻" horiz-adv-x="1946" d="M1798 582q0 -41 -37 -41h-447v-445q0 -39 -41 -39t-41 39v445h-218v-445q0 -39 -41 -39t-41 39v445h-218v-445q0 -39 -41 -39t-41 39v445h-445q-39 0 -39 41t39 41h445v447q0 37 41 37t41 -37v-447h218v447q0 37 41 37t41 -37v-447h218v447q0 37 41 37t41 -37v-447h447 q37 0 37 -41z" />
+<glyph unicode="⧼" horiz-adv-x="1024" d="M944 -341q0 -41 -43 -41q-16 0 -32 19l-111 156q-235 326 -508 621q-46 45 -131 139q-11 14 -11 29t11 29l131 139q272 294 508 621q35 54 111 156q16 19 32 19q43 0 43 -41q0 -11 -8 -24q-260 -409 -731 -899q471 -490 731 -899q8 -13 8 -24z" />
+<glyph unicode="⧽" horiz-adv-x="1024" d="M916 582q0 -15 -11 -29l-131 -139q-273 -295 -508 -621q-35 -54 -111 -156q-16 -19 -32 -19q-43 0 -43 41q0 11 8 24q260 409 731 899q-471 490 -731 899q-8 13 -8 24q0 41 43 41q16 0 32 -19l111 -156q236 -327 508 -621q46 -45 131 -139q11 -14 11 -29z" />
+<glyph unicode="⧾" horiz-adv-x="1591" d="M1421 582q0 -22 -31 -82t-35 -73q-209 114 -287 114h-231v-231q0 -79 114 -287q-13 -5 -73 -36t-82.5 -31t-82.5 31t-72 36q114 208 114 287v231h-232q-78 0 -287 -114q-4 13 -35 73t-31 82t31 82t35 73q208 -114 287 -114h232v232q0 78 -114 287q12 4 72 35t82.5 31 t82.5 -31t73 -35q-114 -209 -114 -287v-232h231q79 0 287 114q4 -13 35 -73t31 -82z" />
+<glyph unicode="⧿" horiz-adv-x="1591" d="M1421 582q0 -22 -31 -82t-35 -73q-209 114 -287 114h-545q-78 0 -287 -114q-4 13 -35 73t-31 82t31 82t35 73q208 -114 287 -114h545q79 0 287 114q4 -13 35 -73t31 -82z" />
+<glyph unicode="⨀" d="M1214 582q0 -79 -55.5 -134.5t-134.5 -55.5t-134.5 55.5t-55.5 134.5t55.5 134.5t134.5 55.5t134.5 -55.5t55.5 -134.5zM2008 582q0 -410 -287 -697t-697 -287t-697 287t-287 697t287 697t697 287t697 -287t287 -697zM1908 582q0 368 -258 626t-626.5 258t-626 -257.5 t-257.5 -626.5t257.5 -626.5t626 -257.5t626.5 258t258 626z" />
+<glyph unicode="⨁" d="M1713 1271q285 -286 285 -688.5t-286 -689t-687.5 -286.5t-688 286.5t-286.5 689.5t285.5 688.5t689 285.5t688.5 -286zM1635 -29q254 255 254 611.5t-253.5 611t-611.5 254.5t-611.5 -253.5t-253.5 -611.5t254.5 -612.5t611 -254.5t610.5 255zM1866 582q0 -54 -48 -54 h-740v-740q0 -48 -54 -48t-54 48v740h-737q-51 0 -51 54t51 54h737v737q0 51 54 51t54 -51v-737h740q48 0 48 -54z" />
+<glyph unicode="⨂" d="M1713 1271q285 -286 285 -688.5t-286 -689t-687.5 -286.5t-688 286.5t-286.5 689.5t285.5 688.5t689 285.5t688.5 -286zM1635 -29q254 255 254 611.5t-253.5 611t-611.5 254.5t-611.5 -253.5t-253.5 -611.5t254.5 -612.5t611 -254.5t610.5 255zM1624 59q16 -16 16 -33 q0 -19 -20.5 -39.5t-39.5 -20.5q-17 0 -33 16l-523 524l-521 -522q-17 -17 -35 -17q-20 0 -39.5 19.5t-19.5 39.5q0 18 17 35l522 521l-522 521q-17 17 -17 35q0 20 19.5 39.5t39.5 19.5q18 0 35 -17l521 -522l523 524q16 16 33 16q19 0 39.5 -20.5t20.5 -39.5 q0 -17 -16 -33l-524 -523z" />
+<glyph unicode="⨃" horiz-adv-x="1704" d="M1569 280q0 -284 -212.5 -483t-501.5 -199t-504.5 196.5t-215.5 485.5v1216q0 17 16 33.5t33 16.5q60 0 60 -50v-1205q0 -247 179.5 -415t428.5 -168t428.5 168t179.5 415v1205q0 17 16 33.5t33 16.5q60 0 60 -50v-1216zM931 660.5q34 -33.5 34 -79t-34 -79t-79.5 -33.5 t-79 33.5t-33.5 80t33 79t79 32.5t80 -33.5z" />
+<glyph unicode="⨄" horiz-adv-x="1704" d="M1569 280q0 -284 -212.5 -483t-501.5 -199t-504.5 196.5t-215.5 485.5v1216q0 17 16 33.5t33 16.5q60 0 60 -50v-1205q0 -247 179.5 -415t428.5 -168t428.5 168t179.5 415v1205q0 17 16 33.5t33 16.5q60 0 60 -50v-1216zM1394 582q0 -54 -48 -54h-440v-440q0 -48 -54 -48 t-54 48v440h-437q-51 0 -51 54t51 54h437v437q0 51 54 51t54 -51v-437h440q48 0 48 -54z" />
+<glyph unicode="⨅" horiz-adv-x="1704" d="M1569 -340q0 -52 -54.5 -52t-54.5 52v1787h-1216v-1787q0 -52 -54.5 -52t-54.5 52v1847q0 19 16.5 34t35.5 15h1332q50 0 50 -49v-1847z" />
+<glyph unicode="⨆" horiz-adv-x="1704" d="M1569 -343q0 -49 -50 -49h-1332q-19 0 -35.5 15t-16.5 34v1847q0 52 54.5 52t54.5 -52v-1787h1216v1787q0 52 54.5 52t54.5 -52v-1847z" />
+<glyph unicode="⨇" horiz-adv-x="1864" d="M1749 -4q0 -41 -41 -41q-26 0 -37 25l-489 1103l-204 -463l269 -608q2 -5 2 -16q0 -41 -41 -41q-26 0 -37 25l-238 538l-238 -538q-11 -25 -39 -25q-41 0 -41 41q0 14 272 625l-205 462l-487 -1103q-11 -25 -39 -25q-41 0 -41 41q0 7 530 1204q11 25 38 25t38 -25 l211 -477l213 477q11 25 38 25t38 -25l526 -1188q2 -5 2 -16z" />
+<glyph unicode="⨈" horiz-adv-x="1864" d="M1749 1184q0 -10 -2 -15l-526 -1189q-11 -25 -38 -25t-38 25l-213 477l-211 -477q-11 -25 -38 -25t-38 25q-530 1198 -530 1204q0 41 41 41q28 0 39 -25l487 -1104l205 463q-272 612 -272 625q0 41 41 41q28 0 39 -25l238 -538l238 538q11 25 37 25q41 0 41 -41 q0 -10 -2 -15l-270 -609l205 -464l489 1104q11 25 37 25q41 0 41 -41z" />
+<glyph unicode="⨉" horiz-adv-x="2132" d="M1678 27q0 -57 -57 -57q-20 0 -32 12l-523 524l-521 -522q-13 -13 -35 -13q-55 0 -55 55q0 22 13 35l522 521l-522 521q-13 13 -13 35q0 55 55 55q22 0 35 -13l521 -522l523 524q12 12 32 12q57 0 57 -57q0 -20 -12 -32l-524 -523l524 -523q12 -12 12 -32z" />
+<glyph unicode="⨊" horiz-adv-x="1700" d="M829 1382h-597l304 -423q67 24 136 24q166 0 283.5 -117.5t117.5 -283.5t-117.5 -283.5t-283.5 -117.5q-84 0 -160 33l-326 -403h680q284 0 439 50q235 77 309 287h50l-148 -438h-1463q-17 0 -17 20q0 6 5 12l410 506q-180 119 -180 334q0 180 135 300l-365 507 q-6 8 -6 36.5t19 28.5h1462l149 -410h-51q-80 215 -328 291q-156 47 -457 47zM1023 582q0 145 -103 248t-248 103q-54 0 -105 -16l225 -313q6 -8 6 -22t-8 -24l-245 -303q62 -24 127 -24q145 0 248 103t103 248zM321 582q0 -191 161 -295l187 230l-234 324 q-114 -104 -114 -259z" />
+<glyph unicode="⨋" horiz-adv-x="1314" d="M399 -442q-78 0 -141 41.5t-63 116t76.5 74.5t76.5 -75q0 -69 -70 -78q48 -39 121 -39q98 0 144 118q30 76 45 210h-531q-21 0 -21 24q0 9 5 15l467 576l-467 648q-6 8 -6 35.5t23 27.5h667q24 128 74 217q78 137 210 137q77 0 141 -42t64 -116t-76 -74t-76 75 q0 69 67 78q-47 38 -120 38q-86 0 -126 -118q-24 -70 -38 -195h316l118 -325h-50q-80 215 -392 246l-17 -273q-22 -334 -94 -880q188 4 298 47q154 60 205 206h49l-117 -347h-449q-71 -368 -313 -368zM646 1180h-437l410 -569q6 -8 6 -22t-8 -24l-441 -545h421 q25 446 79 873l38 286q-52 1 -68 1z" />
+<glyph unicode="⨌" horiz-adv-x="2639" d="M2434 1606q77 0 141 -42t64 -116t-76.5 -74t-76.5 75q0 69 68 78q-47 38 -120 38q-86 0 -126 -118q-30 -89 -45 -268l-18 -279q-25 -376 -100 -924q-23 -165 -90 -274q-88 -144 -231 -144q-78 0 -141 41.5t-63 116t76.5 74.5t76.5 -75q0 -69 -71 -78q48 -39 122 -39 q98 0 144 118q39 99 64 468t54 600l54 402q58 420 294 420zM1894 1606q77 0 141 -42t64 -116t-76.5 -74t-76.5 75q0 69 68 78q-47 38 -120 38q-86 0 -126 -118q-30 -89 -45 -268l-18 -279q-25 -376 -100 -924q-23 -165 -90 -274q-88 -144 -231 -144q-78 0 -141 41.5t-63 116 t76.5 74.5t76.5 -75q0 -69 -70 -78q48 -39 121 -39q98 0 144 118q39 99 64 468t54 600l54 402q24 178 84 283q78 137 210 137zM1354 1606q77 0 141 -42t64 -116t-76.5 -74t-76.5 75q0 69 68 78q-47 38 -120 38q-86 0 -126 -118q-30 -89 -45 -268l-18 -279 q-25 -376 -100 -924q-23 -165 -90 -274q-88 -144 -231 -144q-78 0 -141 41.5t-63 116t76.5 74.5t76.5 -75q0 -69 -70 -78q48 -39 121 -39q98 0 144 118q39 99 64 468t55 600l53 402q24 178 84 283q78 137 210 137zM814 1606q77 0 141 -42t64 -116t-76 -74t-76 75q0 69 67 78 q-47 38 -120 38q-86 0 -126 -118q-30 -89 -45 -268l-18 -279q-25 -377 -100 -924q-23 -165 -90 -274q-88 -144 -231 -144q-78 0 -141 41.5t-63 116t76.5 74.5t76.5 -75q0 -69 -70 -78q48 -39 121 -39q98 0 144 118q40 102 66 478t54 598l52 397q24 175 84 280 q78 137 210 137z" />
+<glyph unicode="⨍" horiz-adv-x="1019" d="M814 1606q77 0 141 -42t64 -116t-76 -74t-76 75q0 69 67 78q-47 38 -120 38q-87 0 -126 -118q-30 -91 -45 -269l-19 -288q-9 -149 -21 -271h269q33 0 33 -37t-33 -37h-276q-12 -116 -28 -245l-43 -324q-23 -165 -90 -274q-88 -144 -231 -144q-78 0 -141 41.5t-63 116 t76.5 74.5t76.5 -75q0 -69 -70 -78q48 -39 121 -39q98 0 144 118q40 103 58.5 370t36.5 459h-268q-35 0 -35 37t35 37h275q21 204 70 567q57 420 294 420z" />
+<glyph unicode="⨎" horiz-adv-x="1019" d="M814 1606q77 0 141 -42t64 -116t-76 -74t-76 75q0 69 67 78q-47 38 -120 38q-87 0 -126 -118q-31 -93 -42.5 -250.5t-20.5 -296.5l-7 -101h254q33 0 33 -37t-33 -37h-260q-12 -150 -28 -286h288q33 0 33 -37t-33 -37h-297q-30 -247 -51.5 -400.5t-88.5 -262.5 q-88 -144 -231 -144q-78 0 -141 41.5t-63 116t76.5 74.5t76.5 -75q0 -69 -70 -78q48 -39 121 -39q98 0 141 111t64 415q9 132 18 241h-252q-35 0 -35 37t35 37h258q14 162 28 286h-286q-35 0 -35 37t35 37h295q17 144 50 387q57 420 294 420z" />
+<glyph unicode="⨏" horiz-adv-x="1019" d="M814 1606q77 0 141 -42t64 -116t-76 -74t-76 75q0 69 67 78q-47 38 -120 38q-87 0 -126 -118q-30 -91 -45 -269l-19 -281q-9 -142 -18 -246q341 124 343 124q37 0 37 -38q0 -26 -21 -34l-367 -133q-15 -147 -31 -272l-42 -322q-23 -165 -90 -274q-88 -144 -231 -144 q-78 0 -141 41.5t-63 116t76.5 74.5t76.5 -75q0 -69 -70 -78q48 -39 121 -39q98 0 144 118q40 103 59 379t32 417q-337 -123 -343 -123q-37 0 -37 38q0 26 23 34l365 133q20 201 73 592q57 420 294 420z" />
+<glyph unicode="⨐" horiz-adv-x="1019" d="M814 1606q77 0 141 -42t64 -116t-76 -74t-76 75q0 69 67 78q-47 38 -120 38q-87 0 -124 -112t-62 -517q110 -33 176 -116q6 -8 6 -15q0 -24 -24 -24q-9 0 -18 9q-76 74 -143 97q-22 -318 -63 -624q76 9 160 67q9 6 15 6q24 0 24 -25q0 -9 -10 -18q-76 -67 -195 -78 l-31 -239q-23 -165 -90 -274q-88 -144 -231 -144q-78 0 -141 41.5t-63 116t76.5 74.5t76.5 -75q0 -69 -70 -78q48 -39 121 -39q98 0 144 118q34 88 50 252l18 261q-116 35 -189 133.5t-73 230t96.5 237.5t238.5 119l31 237q57 420 294 420zM282 794.5q-80 -91.5 -80 -203.5 t60.5 -196t157.5 -117q28 359 62 623q-120 -15 -200 -106.5z" />
+<glyph unicode="⨑" horiz-adv-x="1019" d="M814 1606q77 0 141 -42t64 -116t-76 -74t-76 75q0 69 67 78q-47 38 -120 38q-86 0 -123.5 -111.5t-62.5 -517.5q117 -35 190.5 -133.5t73.5 -231t-97 -238t-239 -118.5l-31 -239q-23 -165 -90 -274q-88 -144 -231 -144q-78 0 -141 41.5t-63 116t76.5 74.5t76.5 -75 q0 -69 -70 -78q48 -39 121 -39q98 0 144 118q40 103 66 483.5t68 701.5q-117 -14 -197 -103t-83 -207q113 102 144 102q22 0 22 -35q0 -5 -31 -20q-103 -51 -135 -128q-15 -37 -24 -37t-24 37q-32 77 -135 128q-32 16 -32 20q0 35 23 35q31 0 144 -102q4 139 100 242 t235 116l31 237q57 420 294 420zM763 369.5q81 91.5 81 203.5t-61 196.5t-159 117.5q-23 -336 -62 -624q120 15 201 106.5z" />
+<glyph unicode="⨒" horiz-adv-x="1019" d="M628 582q0 -43 -31 -74t-74 -31t-74 31t-31 74t31 74t74 31t74 -31t31 -74zM814 1606q77 0 141 -42t64 -116t-76 -74t-76 75q0 69 67 78q-47 38 -120 38q-87 0 -124 -112t-61 -502h229q34 0 34 -33v-670q0 -35 -34 -35h-302l-31 -237q-23 -165 -90 -274 q-88 -144 -231 -144q-78 0 -141 41.5t-63 116t76.5 74.5t76.5 -75q0 -69 -70 -78q48 -39 121 -39q98 0 144 118q36 92 52 267l18 278h426v642h-361l37 283q57 420 294 420z" />
+<glyph unicode="⨓" horiz-adv-x="1019" d="M628 582q0 -43 -31 -74t-74 -31t-74 31t-31 74t31 74t74 31t74 -31t31 -74zM814 1606q77 0 141 -42t64 -116t-76 -74t-76 75q0 69 67 78q-47 38 -120 38q-86 0 -126 -118q-35 -104 -60 -511q117 -35 190.5 -133.5t73.5 -231t-97 -238t-239 -118.5l-31 -239 q-23 -165 -90 -274q-88 -144 -231 -144q-78 0 -141 41.5t-63 116t76.5 74.5t76.5 -75q0 -69 -70 -78q48 -39 121 -39q98 0 144 118q36 93 53 275q9 144 19 287q50 -17 103 -17q132 0 226.5 94.5t94.5 226.5t-94.5 226.5t-226.5 94.5q-25 0 -41 -2l38 285q57 420 294 420z " />
+<glyph unicode="⨔" horiz-adv-x="1108" d="M844 582q0 -43 -31 -74t-74 -31t-74.5 31t-31.5 74t31.5 74t74.5 31t74 -31t31 -74zM1108 582q0 -152 -108.5 -260.5t-260.5 -108.5q-93 0 -177 46l-37 -283q-23 -165 -90 -274q-88 -144 -231 -144q-78 0 -141 41.5t-63 116t76.5 74.5t76.5 -75q0 -69 -70 -78 q48 -39 121 -39q98 0 144 118q40 103 58 361.5t30 397.5q34 -96 117.5 -155t185.5 -59q132 0 226.5 94.5t94.5 226.5t-94.5 226.5t-226.5 94.5q-181 0 -275 -155q19 167 56 438q57 420 294 420q77 0 141 -42t64 -116t-76 -74t-76 75q0 69 67 78q-47 38 -120 38 q-86 0 -126 -118q-35 -103 -60 -513q54 17 111 17q152 0 260.5 -108.5t108.5 -260.5z" />
+<glyph unicode="⨕" horiz-adv-x="1019" d="M814 1606q77 0 141 -42t64 -116t-76 -74t-76 75q0 69 67 78q-47 38 -120 38q-86 0 -126 -118q-35 -104 -60 -511q117 -35 190.5 -133.5t73.5 -231t-97 -238t-239 -118.5l-31 -239q-23 -165 -90 -274q-88 -144 -231 -144q-78 0 -141 41.5t-63 116t76.5 74.5t76.5 -75 q0 -69 -70 -78q48 -39 121 -39q98 0 144 118q34 87 50 251l18 262q-116 35 -189 133.5t-73 230t96.5 237.5t238.5 119l31 237q57 420 294 420zM844 582q0 132 -94.5 226.5t-226.5 94.5t-226.5 -94.5t-94.5 -226.5t94.5 -226.5t226.5 -94.5t226.5 94.5t94.5 226.5zM628 582 q0 -43 -31 -74t-74 -31t-74 31t-31 74t31 74t74 31t74 -31t31 -74z" />
+<glyph unicode="⨖" horiz-adv-x="1019" d="M814 1606q77 0 141 -42t64 -116t-76 -74t-76 75q0 69 67 78q-47 38 -120 38q-87 0 -124 -112.5t-61 -501.5h229q34 0 34 -33v-670q0 -35 -34 -35h-302l-31 -237q-23 -165 -90 -274q-88 -144 -231 -144q-78 0 -141 41.5t-63 116t76.5 74.5t76.5 -75q0 -69 -70 -78 q48 -39 121 -39q98 0 144 118q33 86 49 244l18 253h-226q-35 0 -35 35v670q0 33 35 33h300l31 235q55 420 294 420zM844 261v642h-218q-21 -326 -64 -642h282zM202 903v-642h216q26 345 65 642h-281z" />
+<glyph unicode="⨗" horiz-adv-x="1117" d="M914 922l-51 -5q-25 0 -25 27t76 27q203 0 203 -206q0 -133 -98 -178q-64 -29 -215 -29h-144q-14 -134 -30 -260l-42 -322q-23 -165 -90 -274q-88 -144 -231 -144q-78 0 -141 41.5t-63 116t76.5 74.5t76.5 -75q0 -69 -70 -78q48 -39 121 -39q98 0 141 111t62 386t37 463 h-376q58 -43 114.5 -126t56.5 -145q0 -19 -22.5 -19t-29.5 27q-25 98 -83 166.5t-131 96.5q-36 14 -36 24t36 24q73 28 133 98.5t78 151.5q2 9 7 27q6 13 27 13t21 -18q0 -8 -4 -22q-44 -160 -167 -250h381q22 218 71 580q57 420 294 420q77 0 141 -42t64 -116t-76 -74 t-76 75q0 69 67 78q-47 38 -120 38q-87 0 -126 -118q-31 -93 -46 -269q-23 -399 -40 -572h175q105 0 156 26q72 36 72 133q0 157 -154 157z" />
+<glyph unicode="⨘" horiz-adv-x="1020" d="M1020 148q0 -39 -38 -39q-14 0 -23 9l-369 369q-8 -78 -24 -197l-41 -314q-23 -165 -90 -274q-88 -144 -231 -144q-78 0 -141 41.5t-63 116t76.5 74.5t76.5 -75q0 -69 -70 -78q48 -39 121 -39q99 0 144 118q40 105 58 367.5t29 383.5l-347 -348q-9 -9 -24 -9 q-38 0 -38 37q0 15 10 25l411 410l-411 410q-10 10 -10 25q0 37 38 37q14 0 24 -10l368 -367q18 170 64 509q57 420 294 420q77 0 141 -42t64 -116t-76 -74t-76 75q0 69 67 78q-47 38 -120 38q-87 0 -126 -118q-31 -93 -46 -269q-19 -331 -32 -481l349 349q9 9 23 9 q38 0 38 -39q0 -13 -9 -22l-412 -412l412 -412q9 -9 9 -22z" />
+<glyph unicode="⨙" horiz-adv-x="1019" d="M814 1606q77 0 141 -42t64 -116t-76 -74t-76 75q0 69 67 78q-47 38 -120 38q-86 0 -126 -118q-35 -104 -60 -510q127 -35 207.5 -141t80.5 -238v-377q0 -25 -24.5 -25t-24.5 25v377q0 113 -67 204t-175 125q-24 -357 -100 -911q-23 -165 -90 -274q-88 -144 -231 -144 q-78 0 -141 41.5t-63 116t76.5 74.5t76.5 -75q0 -69 -70 -78q48 -39 121 -39q98 0 144 118q40 102 66 481.5t68 702.5q-129 -15 -216.5 -113.5t-87.5 -228.5v-377q0 -25 -24 -25t-24 25v377q0 152 103.5 265t255.5 126l31 237q57 420 294 420z" />
+<glyph unicode="⨚" horiz-adv-x="1019" d="M814 1606q77 0 141 -42t64 -116t-76 -74t-76 75q0 69 67 78q-47 38 -120 38q-86 0 -126 -118q-30 -89 -45 -268l-18 -279q-22 -336 -63 -636q130 15 217.5 113t87.5 229v377q0 25 24.5 25t24.5 -25v-377q0 -153 -104 -266t-256 -126l-31 -238q-23 -165 -90 -274 q-88 -144 -231 -144q-78 0 -141 41.5t-63 116t76.5 74.5t76.5 -75q0 -69 -70 -78q48 -39 121 -39q98 0 144 118q34 87 50 251l18 261q-127 36 -206.5 141t-79.5 237v377q0 25 24 25t24 -25v-377q0 -112 67.5 -203.5t174.5 -125.5q27 351 52 541l48 368q24 178 84 283 q78 137 210 137z" />
+<glyph unicode="⨛" horiz-adv-x="1019" d="M992 1569q0 -37 -33 -37h-897q-35 0 -35 37t35 37h897q33 0 33 -37zM814 1442q77 0 141 -42t64 -116t-76 -74t-76 75q0 69 67 78q-47 38 -120 38q-86 0 -126 -118q-32 -92 -43.5 -250t-28 -415.5t-70.5 -641.5q-23 -166 -90 -274q-87 -144 -231 -144q-78 0 -141 41.5 t-63 116t76.5 74.5t76.5 -75q0 -70 -70 -78q49 -39 121 -39q97 0 144 118q40 101 65 467.5t56 614t35 272.5q26 143 79 235q78 137 210 137z" />
+<glyph unicode="⨜" horiz-adv-x="1019" d="M814 1606q77 0 141 -42t64 -116t-76 -74t-76 75q0 69 67 78q-47 38 -120 38q-86 0 -126 -118q-32 -92 -43.5 -250t-28 -415.5t-70.5 -641.5q-23 -166 -90 -274q-87 -144 -231 -144q-78 0 -141 41.5t-63 116t76.5 74.5t76.5 -75q0 -70 -70 -78q49 -39 121 -39 q97 0 144 118q40 101 65 467.5t56 614t35 272.5q26 143 79 235q78 137 210 137zM992 -405q0 -37 -33 -37h-897q-35 0 -35 37t35 37h897q33 0 33 -37z" />
+<glyph unicode="⨝" horiz-adv-x="1883" d="M1683 -100q0 -59 -61 -59q-22 0 -45 23l-633 633l-636 -633q-23 -23 -47 -23q-61 0 -61 59v1368q0 21 18 38t44 17t46 -20l636 -635l633 635q20 20 45 20q61 0 61 -55v-1368zM1601 -45v1257l-627 -630zM913 582l-631 632v-1261z" />
+<glyph unicode="⨞" horiz-adv-x="1817" d="M1617 -305q0 -44 -35 -44q-14 0 -28 9l-1416 887q-23 14 -23 35t23 35l1416 887q14 9 28 9q35 0 35 -44v-1774zM1535 -231v1626l-1298 -813z" />
+<glyph unicode="⨟" horiz-adv-x="711" d="M542 743q0 -77 -55.5 -131.5t-131.5 -54.5t-131 55t-55 131t55 131t131 55t131.5 -54.5t55.5 -131.5zM508 211q37 -57 37 -165.5t-71 -248t-175 -198.5q-12 -6 -23 -6q-41 0 -41 43v6q4 15 19 27q149 119 191 273q-42 -24 -90 -24q-76 0 -131 55t-55 131t55 131t131 55 q103 0 153 -79zM460 743q0 42 -31 73t-73.5 31t-73.5 -31t-31 -73t31 -73t73.5 -31t73.5 31t31 73zM460 104q0 42 -31 73t-73.5 31t-73.5 -31t-31 -73t31 -73t73.5 -31t73.5 31t31 73z" />
+<glyph unicode="⨠" horiz-adv-x="2190" d="M2020 582q0 -24 -27 -37l-1168 -552q-6 -3 -14 -3q-41 0 -41 41q0 26 24 37l1088 514l-1088 514q-24 11 -24 37q0 41 41 41q8 0 14 -3l1168 -552q27 -13 27 -37zM1420 582q0 -24 -27 -37l-1168 -552q-6 -3 -14 -3q-41 0 -41 41q0 26 24 37l1088 514l-1088 514 q-24 11 -24 37q0 41 41 41q8 0 14 -3l1168 -552q27 -13 27 -37z" />
+<glyph unicode="⨡" horiz-adv-x="1024" d="M969 1062q20 -8 20 -45t-28 -37q-7 0 -35 7q-273 69 -432 288v-1554q0 -39 -41 -39t-41 39v1710q0 67 41 67q16 0 41 -62q54 -132 170 -230t258 -133q16 -2 47 -11z" />
+<glyph unicode="⨢" horiz-adv-x="1592" d="M965 1438q0 -69 -50 -119t-119 -50t-119 50t-50 119t50 118.5t119 49.5t119 -49.5t50 -118.5zM1422 582q0 -41 -37 -41h-548v-546q0 -39 -41 -39t-41 39v546h-546q-39 0 -39 41t39 41h546v548q0 37 41 37t41 -37v-548h548q37 0 37 -41zM873 1361q32 32 32 76.5t-32 76.5 t-77 32t-77 -32t-32 -76.5t32 -76.5t77 -32t77 32z" />
+<glyph unicode="⨣" horiz-adv-x="1592" d="M1149 1340l-29 -41l-324 201l-322 -201l-29 41l351 266zM1422 582q0 -41 -37 -41h-548v-546q0 -39 -41 -39t-41 39v546h-546q-39 0 -39 41t39 41h546v548q0 37 41 37t41 -37v-548h548q37 0 37 -41z" />
+<glyph unicode="⨤" horiz-adv-x="1592" d="M1041 1470q-65 -57 -119 -57t-136 49.5t-130 49.5q-80 0 -165 -98l-35 30q74 85 95 105q65 57 119 57t136 -49.5t130 -49.5q79 0 165 99l35 -31q-74 -85 -95 -105zM1422 582q0 -41 -37 -41h-548v-546q0 -39 -41 -39t-41 39v546h-546q-39 0 -39 41t39 41h546v548 q0 37 41 37t41 -37v-548h548q37 0 37 -41z" />
+<glyph unicode="⨥" horiz-adv-x="1592" d="M1422 582q0 -41 -37 -41h-548v-546q0 -39 -41 -39t-41 39v546h-546q-39 0 -39 41t39 41h546v548q0 37 41 37t41 -37v-548h548q37 0 37 -41zM873 -257q32 -32 32 -76.5t-32 -76.5t-77 -32t-77 32t-32 76.5t32 76.5t77 32t77 -32z" />
+<glyph unicode="⨦" horiz-adv-x="1592" d="M1422 582q0 -41 -37 -41h-548v-546q0 -39 -41 -39t-41 39v546h-546q-39 0 -39 41t39 41h546v548q0 37 41 37t41 -37v-548h548q37 0 37 -41zM1041 -385q-65 -57 -119 -57t-136 49.5t-130 49.5q-80 0 -165 -98l-35 30q74 85 95 105q65 57 119 57t136 -49.5t130 -49.5 q79 0 165 99l35 -31q-74 -85 -95 -105z" />
+<glyph unicode="⨧" horiz-adv-x="1592" d="M1422 582q0 -41 -37 -41h-548v-546q0 -39 -41 -39t-41 39v546h-546q-39 0 -39 41t39 41h546v548q0 37 41 37t41 -37v-548h548q37 0 37 -41zM969 -286v14q0 23 14 38l201 211q107 112 107 211q0 64 -34.5 108t-96.5 44q-89 0 -128 -81q65 0 65 -61t-64 -61t-64 64 q0 80 62 134t149.5 54t155.5 -54.5t68 -146.5q0 -68 -57 -133q-22 -25 -70 -69l-196 -178h180q72 0 79 6t21 89h45l-32 -189h-405z" />
+<glyph unicode="⨨" horiz-adv-x="1592" d="M1422 582q0 -41 -37 -41h-570q10 -9 22 -33q60 -113 129 -179q33 -32 33 -48q0 -31 -32.5 -31t-129.5 128v-383q0 -39 -41 -39t-41 39v383q-97 -128 -129.5 -128t-32.5 31q0 16 33 48q69 66 129 179q6 12 22 33h-568q-39 0 -39 41t39 41h546v548q0 37 41 37t41 -37v-548 h548q37 0 37 -41z" />
+<glyph unicode="⨩" horiz-adv-x="1592" d="M1422 582q0 -41 -37 -41h-1175q-39 0 -39 41t39 41h1175q37 0 37 -41zM877 1224q-33 -33 -83 -33t-78.5 32.5t-28.5 76t29 76t85 32.5t91 -58t35 -157q0 -152 -76.5 -274.5t-110.5 -122.5q-20 0 -20 22q0 8 14 23q148 157 148 352q0 30 -5 31z" />
+<glyph unicode="⨪" horiz-adv-x="1592" d="M1422 582q0 -41 -37 -41h-1175q-39 0 -39 41t39 41h1175q37 0 37 -41zM875.5 214q33.5 -33 33.5 -79.5t-34 -80t-80 -33.5t-80 33.5t-34 80t33.5 79.5t80.5 33t80.5 -33z" />
+<glyph unicode="⨫" horiz-adv-x="1592" d="M370.5 1109.5q33.5 -33.5 33.5 -80t-33 -79.5t-80 -33t-80 33t-33 80t33 80t79.5 33t80 -33.5zM1380.5 213.5q33.5 -33.5 33.5 -80t-33 -79.5t-80 -33t-80 33t-33 80t33 80t79.5 33t80 -33.5zM1422 582q0 -41 -37 -41h-1175q-39 0 -39 41t39 41h1175q37 0 37 -41z" />
+<glyph unicode="⨬" horiz-adv-x="1592" d="M370.5 213.5q33.5 -33.5 33.5 -80t-33 -79.5t-80 -33t-80 33t-33 80t33 80t79.5 33t80 -33.5zM1380.5 1109.5q33.5 -33.5 33.5 -80t-33 -79.5t-80 -33t-80 33t-33 80t33 80t79.5 33t80 -33.5zM1422 582q0 -41 -37 -41h-1175q-39 0 -39 41t39 41h1175q37 0 37 -41z" />
+<glyph unicode="⨭" horiz-adv-x="1592" d="M1422 582q0 -41 -37 -41h-548v-546q0 -39 -41 -39t-41 39v546h-546q-39 0 -39 41t39 41h546v548q0 37 41 37t41 -37v-548h548q37 0 37 -41zM834 -100q0 -41 -39 -41q-298 0 -509.5 212.5t-211.5 511t211 510.5t510 212q39 0 39 -41t-39 -41q-265 0 -452 -188t-187 -452.5 t187.5 -453t451.5 -188.5q39 0 39 -41z" />
+<glyph unicode="⨮" horiz-adv-x="1592" d="M1307 1093q211 -212 211 -510.5t-211.5 -511t-509.5 -212.5q-39 0 -39 41t39 41q264 0 451.5 188.5t187.5 453t-187 452.5t-452 188q-39 0 -39 41t39 41q299 0 510 -212zM1422 582q0 -41 -37 -41h-548v-546q0 -39 -41 -39t-41 39v546h-546q-39 0 -39 41t39 41h546v548 q0 37 41 37t41 -37v-548h548q37 0 37 -41z" />
+<glyph unicode="⨯" horiz-adv-x="1592" d="M1322 98q0 -42 -42 -42q-16 0 -27 11l-457 457l-457 -457q-11 -11 -27 -11q-42 0 -42 42q0 16 11 27l457 457l-458 458q-10 10 -10 25q0 43 43 43q15 0 25 -10l458 -458l458 458q10 10 25 10q43 0 43 -43q0 -15 -10 -25l-458 -458l457 -457q11 -11 11 -27z" />
+<glyph unicode="⨰" horiz-adv-x="1592" d="M873 1396q32 -32 32 -76.5t-32 -76.5t-77 -32t-77 32t-32 76.5t32 76.5t77 32t77 -32zM1241 969l-387 -387l386 -386q14 -14 14 -28t-15 -29t-29 -15t-28 14l-386 386l-386 -386q-14 -14 -28 -14t-29 15t-15 29t14 28l386 386l-387 387q-13 13 -13 27t15 29t29 15t27 -13 l387 -387l387 387q13 13 27 13t29 -15t15 -29t-13 -27z" />
+<glyph unicode="⨱" horiz-adv-x="1592" d="M1241 969l-387 -387l386 -386q14 -14 14 -28t-15 -29t-29 -15t-28 14l-386 386l-386 -386q-14 -14 -28 -14t-29 15t-15 29t14 28l386 386l-387 387q-13 13 -13 27t15 29t29 15t27 -13l387 -387l387 387q13 13 27 13t29 -15t15 -29t-13 -27zM1322 -41q0 -41 -37 -41h-976 q-39 0 -39 41t39 41h976q37 0 37 -41z" />
+<glyph unicode="⨲" horiz-adv-x="1592" d="M1322 98q0 -42 -42 -42h-968q-42 0 -42 42q0 16 11 27l457 457l-458 458q-10 10 -10 25q0 43 43 43q15 0 25 -10l458 -458l458 458q10 10 25 10q43 0 43 -43q0 -15 -10 -25l-458 -458l457 -457q11 -11 11 -27zM1182 138l-386 386l-386 -386h772z" />
+<glyph unicode="⨳" horiz-adv-x="1592" d="M1522 98q0 -42 -42 -42q-16 0 -27 11l-457 457l-142 -142l257 -257q11 -11 11 -27q0 -42 -42 -42q-16 0 -27 11l-257 257l-257 -257q-11 -11 -27 -11q-42 0 -42 42q0 16 11 27l257 257l-142 142l-457 -457q-11 -11 -27 -11q-42 0 -42 42q0 16 11 27l457 457l-458 458 q-10 10 -10 25q0 43 43 43q15 0 25 -10l458 -458l142 142l-258 258q-10 10 -10 25q0 43 43 43q15 0 25 -10l258 -258l258 258q10 10 25 10q43 0 43 -43q0 -15 -10 -25l-258 -258l142 -142l458 458q10 10 25 10q43 0 43 -43q0 -15 -10 -25l-458 -458l457 -457q11 -11 11 -27z M938 582l-142 142l-142 -142l142 -142z" />
+<glyph unicode="⨴" horiz-adv-x="1592" d="M1240 196q13 -13 13 -26q0 -14 -15 -29t-30 -15q-13 0 -26 12l-386 386l-386 -386q-26 -26 -55 3t-3 55l386 386l-386 386q-13 14 -13 27q0 15 15 30t29 15t27 -14l386 -386l386 386q14 14 28 14t29 -15t15 -29t-14 -28l-386 -386zM834 -100q0 -41 -39 -41 q-298 0 -509.5 212.5t-211.5 511t211 510.5t510 212q39 0 39 -41t-39 -41q-265 0 -452 -188t-187 -452.5t187.5 -453t451.5 -188.5q39 0 39 -41z" />
+<glyph unicode="⨵" horiz-adv-x="1592" d="M1307 1093q211 -212 211 -510.5t-211.5 -511t-509.5 -212.5q-39 0 -39 41t39 41q264 0 451.5 188.5t187.5 453t-187 452.5t-452 188q-39 0 -39 41t39 41q299 0 510 -212zM1240 196q13 -13 13 -26q0 -14 -15 -29t-30 -15q-13 0 -26 12l-386 386l-386 -386q-12 -12 -25 -12 q-15 0 -30 15t-15 30q0 13 12 25l386 386l-386 386q-13 14 -13 27q0 15 15 30t29 15t27 -14l386 -386l386 386q14 14 28 14t29 -15t15 -29t-14 -28l-386 -386z" />
+<glyph unicode="⨶" horiz-adv-x="1592" d="M1149 1340l-29 -41l-324 201l-322 -201l-29 41l351 266zM1307 1093q211 -212 211 -510.5t-211.5 -511t-509.5 -212.5t-510.5 212.5t-212.5 511.5t211.5 510.5t511 211.5t510.5 -212zM1248.5 129.5q187.5 188.5 187.5 453t-187.5 452.5t-452.5 188t-452.5 -187.5 t-187.5 -452.5t188.5 -453.5t452.5 -188.5t451.5 188.5zM1240 196q13 -13 13 -26q0 -14 -15 -29t-30 -15q-13 0 -26 12l-386 386l-386 -386q-12 -12 -25 -12q-15 0 -30 15t-15 30q0 13 12 25l386 386l-386 386q-13 14 -13 27q0 15 15 30t29 15t27 -14l386 -386l386 386 q14 14 28 14t29 -15t15 -29t-14 -28l-386 -386z" />
+<glyph unicode="⨷" horiz-adv-x="1592" d="M1307 1093q211 -212 211 -510.5t-211.5 -511t-509.5 -212.5t-510.5 212.5t-212.5 511.5t211.5 510.5t511 211.5t510.5 -212zM1248.5 129.5q187.5 188.5 187.5 453t-187.5 452.5t-452.5 188t-452.5 -187.5t-187.5 -452.5t188.5 -453.5t452.5 -188.5t451.5 188.5z M1165 951.5q153 -153.5 153 -369t-153 -369.5t-368 -154t-369 154t-154 370t153 369t369 153t369 -153.5zM1106.5 271q129.5 130 129.5 311.5t-129 311t-311 129.5t-311 -129t-129 -311t130 -312t310.5 -130t310 130zM1100 337q12 -12 12 -25q0 -15 -15 -30t-30 -15 q-13 0 -25 12l-245 245l-244 -245q-12 -12 -25 -12q-15 0 -30 15t-15 30q0 13 12 25l244 245l-244 244q-14 14 -14 28t15 29t29 15t28 -14l244 -244l245 244q14 14 28 14t29 -15t15 -29t-14 -28l-245 -244z" />
+<glyph unicode="⨸" horiz-adv-x="1592" d="M1307 1093q211 -212 211 -510.5t-211.5 -511t-509.5 -212.5t-510.5 212.5t-212.5 511.5t211.5 510.5t511 211.5t510.5 -212zM1248.5 129.5q187.5 188.5 187.5 453t-187.5 452.5t-452.5 188t-452.5 -187.5t-187.5 -452.5t188.5 -453.5t452.5 -188.5t451.5 188.5zM1421 582 q0 -41 -37 -41h-1175q-39 0 -39 41t39 41h1175q37 0 37 -41zM876 1009.5q34 -33.5 34 -80t-33.5 -79.5t-80.5 -33t-80.5 33t-33.5 79.5t34 80t80 33.5t80 -33.5zM876.5 314q33.5 -33 33.5 -79.5t-34 -80t-80 -33.5t-80 33.5t-34 80t33.5 79.5t80.5 33t80.5 -33z" />
+<glyph unicode="⨹" horiz-adv-x="1592" d="M1515 -76q0 -35 -43 -35h-1352q-43 0 -43 35q0 12 6 24l676 1355q14 28 36.5 28t36.5 -28l677 -1355q6 -12 6 -24zM1406 -29l-610 1222l-610 -1222h1220zM1162 388q0 -41 -37 -41h-288v-288q0 -37 -41 -37t-41 37v288h-285q-39 0 -39 41t39 41h285v285q0 39 41 39t41 -39 v-285h288q37 0 37 -41z" />
+<glyph unicode="⨺" horiz-adv-x="1592" d="M1515 -76q0 -35 -43 -35h-1352q-43 0 -43 35q0 12 6 24l676 1355q14 28 36.5 28t36.5 -28l677 -1355q6 -12 6 -24zM1406 -29l-610 1222l-610 -1222h1220zM1162 388q0 -41 -37 -41h-655q-39 0 -39 41t39 41h655q37 0 37 -41z" />
+<glyph unicode="⨻" horiz-adv-x="1592" d="M1515 -76q0 -35 -43 -35h-1352q-43 0 -43 35q0 12 6 24l676 1355q14 28 36.5 28t36.5 -28l677 -1355q6 -12 6 -24zM1406 -29l-610 1222l-610 -1222h1220zM1057 184q12 -12 12 -25q0 -15 -15 -30t-30 -15q-13 0 -25 12l-203 204l-202 -202q-13 -14 -27 -14t-29 15t-15 30 q0 13 13 27l202 201l-202 202q-13 13 -13 27q0 15 15 30t29 15t27 -14l202 -202l203 204q12 12 25 12q15 0 30 -15t15 -30q0 -13 -12 -25l-203 -204z" />
+<glyph unicode="⨼" horiz-adv-x="1592" d="M1372 580q0 -39 -41 -39h-1072q-39 0 -39 41t39 41h1031v433q0 37 41 37t41 -37v-476z" />
+<glyph unicode="⨽" horiz-adv-x="1592" d="M1372 582q0 -41 -39 -41h-1072q-41 0 -41 39v476q0 37 41 37t41 -37v-433h1031q39 0 39 -41z" />
+<glyph unicode="⨾" horiz-adv-x="711" d="M542 743q0 -77 -55.5 -131.5t-131.5 -54.5t-131 55t-55 131t55 131t131 55t131.5 -54.5t55.5 -131.5zM508 211q37 -57 37 -165.5t-71 -248t-175 -198.5q-12 -6 -23 -6q-41 0 -41 43v6q4 15 19 27q149 119 191 273q-42 -24 -90 -24q-76 0 -131 55t-55 131t55 131t131 55 q103 0 153 -79zM460 743q0 42 -31 73t-73.5 31t-73.5 -31t-31 -73t31 -73t73.5 -31t73.5 31t31 73zM460 104q0 42 -31 73t-73.5 31t-73.5 -31t-31 -73t31 -73t73.5 -31t73.5 31t31 73z" />
+<glyph unicode="⨿" horiz-adv-x="1876" d="M1745 -150q31 0 31 -46t-31 -46h-1614q-30 0 -30 46v17q0 29 30 29q158 0 169.5 15t11.5 44v1354q0 32 -15 38q-30 13 -166 13q-31 0 -31 46t33 46h555q36 0 34 -43l-1 -20q-1 -29 -31 -29q-159 0 -169.5 -15t-10.5 -41v-1408h856v1414q0 31 -18.5 39t-68.5 9t-87 2.5 t-37 28.5v34q0 29 33 29h555q33 0 33 -43v-10q-1 -7 -1 -10q0 -29 -30 -29q-159 0 -172 -18q-9 -12 -9 -42v-1353q0 -32 15 -38q30 -13 166 -13z" />
+<glyph unicode="⩀" horiz-adv-x="1364" d="M1249 -8q0 -37 -41 -37t-41 37v792q0 171 -163 273q-140 86 -322.5 86t-321.5 -87q-163 -101 -163 -272v-792q0 -37 -41 -37t-41 37v799q0 202 189 326q164 108 378 108t379 -107q188 -124 188 -327v-799zM759 659q32 -32 32 -76.5t-32 -76.5t-77 -32t-77 32t-32 76.5 t32 76.5t77 32t77 -32z" />
+<glyph unicode="⩁" horiz-adv-x="1364" d="M1249 389q0 -203 -188 -327q-165 -107 -379 -107t-379 107q-188 124 -188 327v799q0 37 41 37t41 -37v-793q0 -169 164 -271q140 -87 321.5 -87t321.5 86q163 101 163 272v793q0 37 41 37t41 -37v-799zM1108 582q0 -41 -37 -41h-776q-39 0 -39 41t39 41h776q37 0 37 -41z " />
+<glyph unicode="⩂" horiz-adv-x="1364" d="M1249 389q0 -203 -188 -327q-165 -107 -379 -107t-379 107q-188 124 -188 327v799q0 37 41 37t41 -37v-793q0 -169 164 -271q140 -87 321.5 -87t321.5 86q163 101 163 272v793q0 37 41 37t41 -37v-799zM1208 1482q0 -41 -37 -41h-976q-39 0 -39 41t39 41h976q37 0 37 -41 z" />
+<glyph unicode="⩃" horiz-adv-x="1364" d="M1249 -8q0 -37 -41 -37t-41 37v792q0 171 -163 273q-140 86 -322.5 86t-321.5 -87q-163 -101 -163 -272v-792q0 -37 -41 -37t-41 37v799q0 202 189 326q164 108 378 108t379 -107q188 -124 188 -327v-799zM1208 1482q0 -41 -37 -41h-976q-39 0 -39 41t39 41h976 q37 0 37 -41z" />
+<glyph unicode="⩄" horiz-adv-x="1364" d="M1249 -8q0 -37 -41 -37t-41 37v792q0 171 -163 273q-140 86 -322.5 86t-321.5 -87q-163 -101 -163 -272v-792q0 -37 -41 -37t-41 37v799q0 202 189 326q164 108 378 108t379 -107q188 -124 188 -327v-799zM1006 16q0 -41 -41 -41q-26 0 -37 25l-246 553l-246 -553 q-11 -25 -37 -25q-41 0 -41 41q0 11 2 16l283 638q11 25 39 25t39 -25l283 -638q2 -5 2 -16z" />
+<glyph unicode="⩅" horiz-adv-x="1364" d="M1249 389q0 -203 -188 -327q-165 -107 -379 -107t-379 107q-188 124 -188 327v799q0 37 41 37t41 -37v-793q0 -169 164 -271q140 -87 321.5 -87t321.5 86q163 101 163 272v793q0 37 41 37t41 -37v-799zM1006 1164q0 -11 -2 -16l-283 -638q-11 -25 -39 -25t-39 25 l-283 638q-2 5 -2 16q0 41 41 41q26 0 37 -25l246 -553l246 553q11 25 37 25q41 0 41 -41z" />
+<glyph unicode="⩆" horiz-adv-x="1364" d="M1249 1216q0 -203 -188 -327q-165 -107 -379 -107t-379 107q-188 124 -188 327v299q0 37 41 37t41 -37v-293q0 -169 164 -271q140 -87 321.5 -87t321.5 86q163 101 163 272v293q0 37 41 37t41 -37v-299zM1249 -351q0 -37 -41 -37t-41 37v292q0 171 -163 273 q-140 86 -322.5 86t-321.5 -87q-163 -101 -163 -272v-292q0 -37 -41 -37t-41 37v299q0 202 189 326q164 108 378 108t379 -107q188 -124 188 -327v-299z" />
+<glyph unicode="⩇" horiz-adv-x="1364" d="M1249 819q0 -37 -41 -37t-41 37v293q0 171 -163 272q-140 86 -321.5 86t-321.5 -87q-164 -102 -164 -271v-293q0 -37 -41 -37t-41 37v299q0 203 188 327q165 107 379 107t379 -107q188 -124 188 -327v-299zM1249 46q0 -203 -188 -327q-165 -107 -379 -107t-378 108 q-189 124 -189 326v299q0 37 41 37t41 -37v-292q0 -171 163 -272q139 -87 321.5 -87t322.5 86q163 102 163 273v292q0 37 41 37t41 -37v-299z" />
+<glyph unicode="⩈" horiz-adv-x="1364" d="M1249 1216q0 -203 -188 -327q-165 -107 -379 -107t-379 107q-188 124 -188 327v299q0 37 41 37t41 -37v-293q0 -169 164 -271q140 -87 321.5 -87t321.5 86q163 101 163 272v293q0 37 41 37t41 -37v-299zM1249 -351q0 -37 -41 -37t-41 37v292q0 171 -163 273 q-140 86 -322.5 86t-321.5 -87q-163 -101 -163 -272v-292q0 -37 -41 -37t-41 37v299q0 202 189 326q164 108 378 108t379 -107q188 -124 188 -327v-299zM1207 582q0 -41 -37 -41h-974q-39 0 -39 41t39 41h974q37 0 37 -41z" />
+<glyph unicode="⩉" horiz-adv-x="1364" d="M1249 819q0 -37 -41 -37t-41 37v293q0 171 -163 272q-140 86 -321.5 86t-321.5 -87q-164 -102 -164 -271v-293q0 -37 -41 -37t-41 37v299q0 203 188 327q165 107 379 107t379 -107q188 -124 188 -327v-299zM1249 46q0 -203 -188 -327q-165 -107 -379 -107t-378 108 q-189 124 -189 326v299q0 37 41 37t41 -37v-292q0 -171 163 -272q139 -87 321.5 -87t322.5 86q163 102 163 273v292q0 37 41 37t41 -37v-299zM1207 582q0 -41 -37 -41h-974q-39 0 -39 41t39 41h974q37 0 37 -41z" />
+<glyph unicode="⩊" horiz-adv-x="2416" d="M2301 389q0 -203 -188 -327q-165 -107 -379 -107q-160 0 -310 69t-216 195q-66 -126 -216 -195t-310 -69q-214 0 -379 107q-188 124 -188 327v799q0 37 41 37t41 -37v-793q0 -169 164 -271q140 -87 321.5 -87t321.5 86q163 101 163 272v793q0 37 41 37t41 -37v-793 q0 -169 164 -271q140 -87 321.5 -87t321.5 86q163 101 163 272v793q0 37 41 37t41 -37v-799z" />
+<glyph unicode="⩋" horiz-adv-x="2416" d="M2301 -8q0 -37 -41 -37t-41 37v792q0 171 -163 273q-140 86 -322.5 86t-321.5 -87q-163 -101 -163 -272v-792q0 -37 -41 -37t-41 37v792q0 171 -163 273q-140 86 -322.5 86t-321.5 -87q-163 -101 -163 -272v-792q0 -37 -41 -37t-41 37v799q0 202 189 326q164 108 378 108 q161 0 310.5 -69t215.5 -195q67 125 216.5 194.5t309.5 69.5q214 0 379 -107q188 -124 188 -327v-799z" />
+<glyph unicode="⩌" horiz-adv-x="1364" d="M1308 1184q0 -41 -37 -41h-22v-754q0 -203 -188 -327q-165 -107 -379 -107t-379 107q-188 124 -188 327v754h-20q-39 0 -39 41t39 41h1176q37 0 37 -41zM1167 395v748h-970v-748q0 -169 164 -271q140 -87 321.5 -87t321.5 86q163 101 163 272z" />
+<glyph unicode="⩍" horiz-adv-x="1364" d="M1308 -4q0 -41 -37 -41h-1176q-39 0 -39 41t39 41h20v754q0 202 189 326q164 108 378 108t379 -107q188 -124 188 -327v-754h22q37 0 37 -41zM1167 37v747q0 171 -163 273q-140 86 -322.5 86t-321.5 -87q-163 -101 -163 -272v-747h970z" />
+<glyph unicode="⩎" horiz-adv-x="1364" d="M1239 39q0 -39 -37 -39h-1038q-39 0 -39 39v1149q0 37 41 37t41 -37v-1106h950v1106q0 37 41 37t41 -37v-1149zM1039 239q0 -39 -37 -39h-638q-39 0 -39 39v949q0 37 41 37t41 -37v-906h550v906q0 37 41 37t41 -37v-949z" />
+<glyph unicode="⩏" horiz-adv-x="1364" d="M1239 39q0 -39 -41 -39t-41 39v1104h-950v-1104q0 -39 -41 -39t-41 39v1149q0 37 39 37h1038q37 0 37 -37v-1149zM1039 39q0 -39 -41 -39t-41 39v904h-550v-904q0 -39 -41 -39t-41 39v949q0 37 39 37h638q37 0 37 -37v-949z" />
+<glyph unicode="⩐" horiz-adv-x="1364" d="M1308 1184q0 -41 -37 -41h-22v-754q0 -203 -188 -327q-165 -107 -379 -107t-379 107q-188 124 -188 327v754h-20q-39 0 -39 41t39 41h1176q37 0 37 -41zM1167 395v748h-970v-748q0 -169 164 -271q140 -87 321.5 -87t321.5 86q163 101 163 272zM1061 394q0 -62 -60 -62 q-15 0 -29 10l-262 191l31 -338q0 -53 -59 -53q-23 0 -42.5 17t-17.5 40l31 334l-262 -191q-14 -10 -29 -10q-59 0 -59 62q0 36 28 49l295 139l-295 139q-28 13 -28 49q0 62 59 62q15 0 29 -10l262 -191l-31 340q0 53 60 53q25 0 43 -17t16 -42l-31 -334l262 191 q14 10 29 10q60 0 60 -62q0 -35 -29 -49l-295 -139l295 -139q29 -14 29 -49z" />
+<glyph unicode="⩑" horiz-adv-x="1364" d="M1249 -4q0 -41 -41 -41q-26 0 -37 25l-489 1103l-489 -1103q-11 -25 -37 -25q-41 0 -41 41q0 11 2 16l526 1188q11 25 39 25t39 -25l526 -1188q2 -5 2 -16zM761.5 1572.5q33.5 -33.5 33.5 -80t-33 -79.5t-80 -33t-80 33t-33 80t33 80t79.5 33t80 -33.5z" />
+<glyph unicode="⩒" horiz-adv-x="1364" d="M1249 1183q0 -11 -2 -16l-526 -1188q-11 -25 -39 -25t-39 25l-526 1188q-2 5 -2 16q0 41 41 41q26 0 37 -25l489 -1103l489 1103q11 25 37 25q41 0 41 -41zM762 -234q33 -33 33 -79.5t-33.5 -80t-80 -33.5t-79.5 33t-33 80t33 80t80 33t80 -33z" />
+<glyph unicode="⩓" horiz-adv-x="1364" d="M1249 -4q0 -41 -41 -41q-26 0 -37 25l-489 1103l-489 -1103q-11 -25 -37 -25q-41 0 -41 41q0 11 2 16l526 1188q11 25 39 25t39 -25l526 -1188q2 -5 2 -16zM1006 -4q0 -41 -41 -41q-26 0 -37 25l-246 553l-246 -553q-11 -25 -37 -25q-41 0 -41 41q0 11 2 16l283 638 q11 25 39 25t39 -25l283 -638q2 -5 2 -16z" />
+<glyph unicode="⩔" horiz-adv-x="1364" d="M1249 1183q0 -11 -2 -16l-526 -1188q-11 -25 -39 -25t-39 25l-526 1188q-2 5 -2 16q0 41 41 41q26 0 37 -25l489 -1103l489 1103q11 25 37 25q41 0 41 -41zM1006 1183q0 -11 -2 -16l-283 -638q-11 -25 -39 -25t-39 25l-283 638q-2 5 -2 16q0 41 41 41q26 0 37 -25 l246 -553l246 553q11 25 37 25q41 0 41 -41z" />
+<glyph unicode="⩕" horiz-adv-x="1664" d="M1549 -4q0 -41 -41 -41q-26 0 -37 25l-489 1103l-105 -236l370 -835q2 -5 2 -16q0 -41 -41 -41q-26 0 -37 25l-339 765l-339 -765q-11 -25 -37 -25q-41 0 -41 41q0 11 2 16l370 835l-105 236l-489 -1103q-11 -25 -37 -25q-41 0 -41 41q0 11 2 16l526 1188q11 25 39 25 t39 -25l111 -251l111 251q11 25 39 25t39 -25l526 -1188q2 -5 2 -16z" />
+<glyph unicode="⩖" horiz-adv-x="1664" d="M1549 1183q0 -11 -2 -16l-526 -1188q-11 -25 -39 -25t-39 25l-111 251l-111 -251q-11 -25 -39 -25t-39 25l-526 1188q-2 5 -2 16q0 41 41 41q26 0 37 -25l489 -1103l105 236l-370 835q-2 5 -2 16q0 41 41 41q26 0 37 -25l339 -765l339 765q11 25 37 25q41 0 41 -41 q0 -11 -2 -16l-370 -835l105 -236l489 1103q11 25 37 25q41 0 41 -41z" />
+<glyph unicode="⩗" horiz-adv-x="1691" d="M1581 1171q0 -21 -12 -31l-1339 -1165q-11 -10 -29 -10q-41 0 -41 39v1171q0 37 41 37t41 -37v-1079l1272 1106q12 10 26 10q41 0 41 -41z" />
+<glyph unicode="⩘" horiz-adv-x="1691" d="M1531 2q0 -37 -41 -37t-41 37v1079l-1272 -1106q-12 -10 -26 -10q-41 0 -41 41q0 21 12 31l1339 1165q11 10 29 10q41 0 41 -39v-1171z" />
+<glyph unicode="⩙" horiz-adv-x="1364" d="M1249 -212q0 -41 -41 -41q-26 0 -37 25l-314 708l-136 -308q-11 -25 -39 -25t-39 25l-136 308l-314 -708q-11 -25 -37 -25q-41 0 -41 41q0 12 2 16l344 778l-344 778q-2 4 -2 16q0 41 41 41q26 0 37 -25l314 -708l136 309q11 25 39 25t39 -25l136 -309l314 708 q11 25 37 25q41 0 41 -41q0 -12 -2 -16l-344 -778l344 -778q2 -4 2 -16zM812 582l-130 294l-130 -294l130 -293z" />
+<glyph unicode="⩚" horiz-adv-x="1414" d="M1299 -3q0 -41 -41 -41q-26 0 -37 24l-473 1004v-989q0 -39 -41 -39t-41 39v989l-473 -1004q-11 -24 -37 -24q-41 0 -41 41q0 8 3 15l552 1169q13 27 37 27t37 -27l552 -1169q3 -7 3 -15z" />
+<glyph unicode="⩛" horiz-adv-x="1414" d="M1299 1167q0 -8 -3 -14l-552 -1170q-13 -27 -37 -27t-37 27l-552 1170q-3 6 -3 14q0 41 41 41q26 0 37 -24l473 -1004v989q0 39 41 39t41 -39v-989l473 1004q11 24 37 24q41 0 41 -41z" />
+<glyph unicode="⩜" horiz-adv-x="1364" d="M1249 -4q0 -41 -41 -41q-26 0 -37 25l-249 561h-480l-249 -561q-11 -25 -37 -25q-41 0 -41 41q0 11 2 16l234 529h-155q-39 0 -39 41t39 41h192l255 577q11 25 39 25t39 -25l255 -577h194q37 0 37 -41t-37 -41h-157l234 -529q2 -5 2 -16zM886 623l-204 460l-204 -460h408 z" />
+<glyph unicode="⩝" horiz-adv-x="1364" d="M1249 1183q0 -11 -2 -16l-241 -544h164q37 0 37 -41t-37 -41h-200l-249 -562q-11 -25 -39 -25t-39 25l-249 562h-198q-39 0 -39 41t39 41h162l-241 544q-2 5 -2 16q0 41 41 41q26 0 37 -25l255 -576h468l255 576q11 25 37 25q41 0 41 -41zM879 541h-394l197 -445z" />
+<glyph unicode="⩞" horiz-adv-x="1364" d="M1249 -4q0 -41 -41 -41q-26 0 -37 25l-489 1103l-489 -1103q-11 -25 -37 -25q-41 0 -41 41q0 11 2 16l526 1188q11 25 39 25t39 -25l526 -1188q2 -5 2 -16zM1249 1565q0 -41 -37 -41h-1058q-39 0 -39 41t39 41h1058q37 0 37 -41zM1249 1325q0 -41 -37 -41h-1058 q-39 0 -39 41t39 41h1058q37 0 37 -41z" />
+<glyph unicode="⩟" horiz-adv-x="1364" d="M1249 -4q0 -41 -41 -41q-26 0 -37 25l-489 1103l-489 -1103q-11 -25 -37 -25q-41 0 -41 41q0 11 2 16l526 1188q11 25 39 25t39 -25l526 -1188q2 -5 2 -16zM1249 -281q0 -41 -37 -41h-1058q-39 0 -39 41t39 41h1058q37 0 37 -41z" />
+<glyph unicode="⩠" horiz-adv-x="1364" d="M1249 -4q0 -41 -41 -41q-26 0 -37 25l-489 1103l-489 -1103q-11 -25 -37 -25q-41 0 -41 41q0 11 2 16l526 1188q11 25 39 25t39 -25l526 -1188q2 -5 2 -16zM1249 -161q0 -41 -37 -41h-1058q-39 0 -39 41t39 41h1058q37 0 37 -41zM1249 -401q0 -41 -37 -41h-1058 q-39 0 -39 41t39 41h1058q37 0 37 -41z" />
+<glyph unicode="⩡" horiz-adv-x="1164" d="M906 633q0 -11 -2 -16l-283 -638q-11 -25 -39 -25t-39 25l-283 638q-2 5 -2 16q0 41 41 41q26 0 37 -25l246 -553l246 553q11 25 37 25q41 0 41 -41zM1049 -281q0 -41 -37 -41h-858q-39 0 -39 41t39 41h858q37 0 37 -41z" />
+<glyph unicode="⩢" horiz-adv-x="1364" d="M1249 1183q0 -11 -2 -16l-526 -1188q-11 -25 -39 -25t-39 25l-526 1188q-2 5 -2 16q0 41 41 41q26 0 37 -25l489 -1103l489 1103q11 25 37 25q41 0 41 -41zM1249 1565q0 -41 -37 -41h-1058q-39 0 -39 41t39 41h1058q37 0 37 -41zM1249 1325q0 -41 -37 -41h-1058 q-39 0 -39 41t39 41h1058q37 0 37 -41z" />
+<glyph unicode="⩣" horiz-adv-x="1364" d="M1249 1183q0 -11 -2 -16l-526 -1188q-11 -25 -39 -25t-39 25l-526 1188q-2 5 -2 16q0 41 41 41q26 0 37 -25l489 -1103l489 1103q11 25 37 25q41 0 41 -41zM1249 -161q0 -41 -37 -41h-1058q-39 0 -39 41t39 41h1058q37 0 37 -41zM1249 -401q0 -41 -37 -41h-1058 q-39 0 -39 41t39 41h1058q37 0 37 -41z" />
+<glyph unicode="⩤" horiz-adv-x="1712" d="M1552 -94q0 -43 -35 -43q-12 0 -24 6l-1355 676q-28 14 -28 36.5t28 36.5l1355 677q12 6 24 6q35 0 35 -43v-1352zM1470 623v569l-1140 -569h1140zM1470 541h-1140l1140 -569v569z" />
+<glyph unicode="⩥" horiz-adv-x="1712" d="M1574 618q28 -14 28 -36.5t-28 -36.5l-1355 -676q-12 -6 -24 -6q-35 0 -35 43v1352q0 43 35 43q12 0 24 -6zM242 623h1140l-1140 569v-569zM242 541v-569l1140 569h-1140z" />
+<glyph unicode="⩦" horiz-adv-x="1592" d="M875.5 11.5q33.5 -33.5 33.5 -80t-33 -79.5t-80 -33t-80 33t-33 80t33 80t79.5 33t80 -33.5zM1422 382q0 -41 -37 -41h-1175q-39 0 -39 41t39 41h1175q37 0 37 -41zM1422 782q0 -41 -37 -41h-1175q-39 0 -39 41t39 41h1175q37 0 37 -41z" />
+<glyph unicode="⩧" horiz-adv-x="1592" d="M1422 982q0 -41 -37 -41h-1175q-39 0 -39 41t39 41h1175q37 0 37 -41zM1422 582q0 -41 -37 -41h-1175q-39 0 -39 41t39 41h1175q37 0 37 -41zM1422 182q0 -41 -37 -41h-1175q-39 0 -39 41t39 41h1175q37 0 37 -41zM876 1512q33 -33 33 -79.5t-33.5 -80t-80 -33.5 t-79.5 33t-33 80t33 80t80 33t80 -33z" />
+<glyph unicode="⩨" horiz-adv-x="1592" d="M1422 182q0 -41 -37 -41h-348v-146q0 -39 -41 -39t-41 39v146h-318v-146q0 -39 -41 -39t-41 39v146h-346q-39 0 -39 41t39 41h346v318h-346q-39 0 -39 41t39 41h346v318h-346q-39 0 -39 41t39 41h346v148q0 37 41 37t41 -37v-148h318v148q0 37 41 37t41 -37v-148h348 q37 0 37 -41t-37 -41h-348v-318h348q37 0 37 -41t-37 -41h-348v-318h348q37 0 37 -41zM955 623v318h-318v-318h318zM955 223v318h-318v-318h318z" />
+<glyph unicode="⩩" horiz-adv-x="1592" d="M1422 182q0 -41 -37 -41h-148v-146q0 -39 -41 -39t-41 39v146h-318v-146q0 -39 -41 -39t-41 39v146h-318v-146q0 -39 -41 -39t-41 39v146h-146q-39 0 -39 41t39 41h146v318h-146q-39 0 -39 41t39 41h146v318h-146q-39 0 -39 41t39 41h146v148q0 37 41 37t41 -37v-148h318 v148q0 37 41 37t41 -37v-148h318v148q0 37 41 37t41 -37v-148h148q37 0 37 -41t-37 -41h-148v-318h148q37 0 37 -41t-37 -41h-148v-318h148q37 0 37 -41zM1155 623v318h-318v-318h318zM755 623v318h-318v-318h318zM1155 223v318h-318v-318h318zM755 223v318h-318v-318h318z " />
+<glyph unicode="⩪" horiz-adv-x="1592" d="M1477 746q0 -152 -96 -271.5t-244 -119.5q-114 0 -238 88l-208 164q-123 88 -236 88q-162 0 -245 -147q-29 -52 -38 -142q-5 -51 -29 -51q-28 0 -28 63q0 152 95.5 271.5t244.5 119.5q115 0 240 -88l207 -164q124 -88 235 -88q85 0 156 50t104 130q15 36 21 98t30 62 q29 0 29 -63zM876 1204q33 -33 33 -79.5t-33.5 -80t-80 -33.5t-79.5 33t-33 80t33 80t80 33t80 -33z" />
+<glyph unicode="⩫" horiz-adv-x="1592" d="M1477 746q0 -152 -96 -271.5t-244 -119.5q-114 0 -238 88l-208 164q-123 88 -236 88q-162 0 -245 -147q-29 -52 -38 -142q-5 -51 -29 -51q-28 0 -28 63q0 152 95.5 271.5t244.5 119.5q115 0 240 -88l207 -164q124 -88 235 -88q85 0 156 50t104 130q15 36 21 98t30 62 q29 0 29 -63zM475.5 311.5q33.5 -33.5 33.5 -80t-33 -79.5t-80 -33t-80 33t-33 80t33 80t79.5 33t80 -33.5zM1275.5 1011.5q33.5 -33.5 33.5 -80t-33 -79.5t-80 -33t-80 33t-33 80t33 80t79.5 33t80 -33.5z" />
+<glyph unicode="⩬" horiz-adv-x="1592" d="M1477 1115q0 -152 -96 -271.5t-244 -119.5q-114 0 -238 88l-208 164q-123 88 -236 88q-162 0 -245 -147q-29 -52 -38 -142q-5 -51 -29 -51q-28 0 -28 63q0 152 95.5 271.5t244.5 119.5q115 0 240 -88l207 -164q124 -88 235 -88q85 0 156 50t104 130q15 36 21 98t30 62 q29 0 29 -63zM1477 95q0 -152 -96 -271.5t-244 -119.5q-114 0 -238 88l-208 164q-123 88 -236 88q-162 0 -245 -147q-29 -52 -38 -142q-5 -51 -29 -51q-28 0 -28 63q0 152 95.5 271.5t244.5 119.5q115 0 240 -88l207 -164q124 -88 235 -88q85 0 156 50t104 130q15 36 21 98 t30 62q29 0 29 -63zM1477 441q0 -41 -37 -41h-1286q-39 0 -39 41t39 41h1286q37 0 37 -41z" />
+<glyph unicode="⩭" horiz-adv-x="1592" d="M1477 441q0 -41 -37 -41h-1286q-39 0 -39 41t39 41h1286q37 0 37 -41zM1477 41q0 -41 -37 -41h-1286q-39 0 -39 41t39 41h1286q37 0 37 -41zM1477 1115q0 -152 -96 -271.5t-244 -119.5q-114 0 -238 88l-208 164q-123 88 -236 88q-162 0 -245 -147q-29 -52 -38 -142 q-5 -51 -29 -51q-28 0 -28 63q0 152 95.5 271.5t244.5 119.5q115 0 240 -88l207 -164q124 -88 235 -88q85 0 156 50t104 130q15 36 21 98t30 62q29 0 29 -63zM876 1573q33 -33 33 -79.5t-33.5 -80t-80 -33.5t-79.5 33t-33 80t33 80t80 33t80 -33z" />
+<glyph unicode="⩮" horiz-adv-x="1591" d="M837 1320q230 44 236 44t6 -10.5t-7 -13.5l-209 -99l113 -207q0 -13 -13 -13q-5 0 -167 172q-162 -172 -168 -172q-13 0 -13 13l113 207l-206 98q-10 5 -10 15t6 10t236 -44l29 230q1 10 12.5 10t12.5 -10zM1477 782q0 -41 -37 -41h-1286q-39 0 -39 41t39 41h1286 q37 0 37 -41zM1477 382q0 -41 -37 -41h-1286q-39 0 -39 41t39 41h1286q37 0 37 -41z" />
+<glyph unicode="⩯" horiz-adv-x="1592" d="M1477 495q0 -152 -96 -271.5t-244 -119.5q-114 0 -238 88l-208 164q-123 88 -236 88q-162 0 -245 -147q-29 -52 -38 -142q-5 -51 -29 -51q-28 0 -28 63q0 152 95.5 271.5t244.5 119.5q115 0 240 -88l207 -164q124 -88 235 -88q85 0 156 50t104 130q15 36 21 98t30 62 q29 0 29 -63zM1477 995q0 -152 -96 -271.5t-244 -119.5q-114 0 -238 88l-208 164q-123 88 -236 88q-162 0 -245 -147q-29 -52 -38 -142q-5 -51 -29 -51q-28 0 -28 63q0 152 95.5 271.5t244.5 119.5q115 0 240 -88l207 -164q124 -88 235 -88q85 0 156 50t104 130q15 36 21 98 t30 62q29 0 29 -63zM1149 1340l-29 -41l-324 201l-322 -201l-29 41l351 266z" />
+<glyph unicode="⩰" horiz-adv-x="1592" d="M1477 856q0 -152 -96 -271.5t-244 -119.5q-114 0 -238 88l-208 164q-123 88 -236 88q-162 0 -245 -147q-29 -52 -38 -142q-5 -51 -29 -51q-28 0 -28 63q0 152 95.5 271.5t244.5 119.5q115 0 240 -88l207 -164q124 -88 235 -88q85 0 156 50t104 130q15 36 21 98t30 62 q29 0 29 -63zM1477 182q0 -41 -37 -41h-1286q-39 0 -39 41t39 41h1286q37 0 37 -41zM1477 -218q0 -41 -37 -41h-1286q-39 0 -39 41t39 41h1286q37 0 37 -41zM1477 1356q0 -152 -96 -271.5t-244 -119.5q-114 0 -238 88l-208 164q-123 88 -236 88q-162 0 -245 -147 q-29 -52 -38 -142q-5 -51 -29 -51q-28 0 -28 63q0 152 95.5 271.5t244.5 119.5q115 0 240 -88l207 -164q124 -88 235 -88q85 0 156 50t104 130q15 36 21 98t30 62q29 0 29 -63z" />
+<glyph unicode="⩱" horiz-adv-x="1592" d="M1422 1474q0 -41 -37 -41h-1175q-39 0 -39 41t39 41h1175q37 0 37 -41zM1422 1074q0 -41 -37 -41h-1175q-39 0 -39 41t39 41h1175q37 0 37 -41zM1422 274q0 -41 -37 -41h-548v-546q0 -39 -41 -39t-41 39v546h-546q-39 0 -39 41t39 41h546v548q0 37 41 37t41 -37v-548h548 q37 0 37 -41z" />
+<glyph unicode="⩲" horiz-adv-x="1592" d="M1422 89q0 -41 -37 -41h-1175q-39 0 -39 41t39 41h1175q37 0 37 -41zM1422 -311q0 -41 -37 -41h-1175q-39 0 -39 41t39 41h1175q37 0 37 -41zM1422 889q0 -41 -37 -41h-548v-548q0 -37 -41 -37t-41 37v548h-546q-39 0 -39 41t39 41h546v546q0 39 41 39t41 -39v-546h548 q37 0 37 -41z" />
+<glyph unicode="⩳" horiz-adv-x="1591" d="M1477 391q0 -152 -96 -271.5t-244 -119.5q-114 0 -238 88l-208 164q-123 88 -236 88q-162 0 -245 -147q-29 -52 -38 -142q-5 -51 -29 -51q-28 0 -28 63q0 152 95.5 271.5t244.5 119.5q115 0 240 -88l207 -164q124 -88 235 -88q85 0 156 50t104 130q15 36 21 98t30 62 q29 0 29 -63zM1477 1137q0 -41 -37 -41h-1286q-39 0 -39 41t39 41h1286q37 0 37 -41zM1477 737q0 -41 -37 -41h-1286q-39 0 -39 41t39 41h1286q37 0 37 -41z" />
+<glyph unicode="⩴" d="M687.5 861.5q33.5 -33.5 33.5 -80t-33 -79.5t-80 -33t-80 33t-33 80t33 80t79.5 33t80 -33.5zM307.5 861.5q33.5 -33.5 33.5 -80t-33 -79.5t-80 -33t-80 33t-33 80t33 80t79.5 33t80 -33.5zM687.5 461.5q33.5 -33.5 33.5 -80t-33 -79.5t-80 -33t-80 33t-33 80t33 80 t79.5 33t80 -33.5zM307.5 461.5q33.5 -33.5 33.5 -80t-33 -79.5t-80 -33t-80 33t-33 80t33 80t79.5 33t80 -33.5zM1925 782q0 -41 -37 -41h-974q-39 0 -39 41t39 41h974q37 0 37 -41zM1925 382q0 -41 -37 -41h-974q-39 0 -39 41t39 41h974q37 0 37 -41z" />
+<glyph unicode="⩵" d="M1900 782q0 -41 -37 -41h-678q-39 0 -39 41t39 41h678q37 0 37 -41zM1900 382q0 -41 -37 -41h-678q-39 0 -39 41t39 41h678q37 0 37 -41zM902 782q0 -41 -37 -41h-678q-39 0 -39 41t39 41h678q37 0 37 -41zM902 382q0 -41 -37 -41h-678q-39 0 -39 41t39 41h678 q37 0 37 -41z" />
+<glyph unicode="⩶" horiz-adv-x="3046" d="M2898 782q0 -41 -37 -41h-678q-39 0 -39 41t39 41h678q37 0 37 -41zM2898 382q0 -41 -37 -41h-678q-39 0 -39 41t39 41h678q37 0 37 -41zM1900 782q0 -41 -37 -41h-678q-39 0 -39 41t39 41h678q37 0 37 -41zM1900 382q0 -41 -37 -41h-678q-39 0 -39 41t39 41h678 q37 0 37 -41zM902 782q0 -41 -37 -41h-678q-39 0 -39 41t39 41h678q37 0 37 -41zM902 382q0 -41 -37 -41h-678q-39 0 -39 41t39 41h678q37 0 37 -41z" />
+<glyph unicode="⩷" horiz-adv-x="1592" d="M1422 782q0 -41 -37 -41h-1175q-39 0 -39 41t39 41h1175q37 0 37 -41zM1422 382q0 -41 -37 -41h-1175q-39 0 -39 41t39 41h1175q37 0 37 -41zM1175.5 11.5q33.5 -33.5 33.5 -80t-33 -79.5t-80 -33t-80 33t-33 80t33 80t79.5 33t80 -33.5zM575.5 11.5q33.5 -33.5 33.5 -80 t-33 -79.5t-80 -33t-80 33t-33 80t33 80t79.5 33t80 -33.5zM1176 1312q33 -33 33 -79.5t-33.5 -80t-80 -33.5t-79.5 33t-33 80t33 80t80 33t80 -33zM576 1312q33 -33 33 -79.5t-33.5 -80t-80 -33.5t-79.5 33t-33 80t33 80t80 33t80 -33z" />
+<glyph unicode="⩸" horiz-adv-x="1592" d="M1422 982q0 -41 -37 -41h-1175q-39 0 -39 41t39 41h1175q37 0 37 -41zM1422 582q0 -41 -37 -41h-1175q-39 0 -39 41t39 41h1175q37 0 37 -41zM1422 182q0 -41 -37 -41h-1175q-39 0 -39 41t39 41h1175q37 0 37 -41zM1389 1512q33 -33 33 -79.5t-33.5 -80t-80 -33.5 t-79.5 33t-33 80t33 80t80 33t80 -33zM1047 1512q33 -33 33 -79.5t-33.5 -80t-80 -33.5t-79.5 33t-33 80t33 80t80 33t80 -33zM705 1512q33 -33 33 -79.5t-33.5 -80t-80 -33.5t-79.5 33t-33 80t33 80t80 33t80 -33zM363 1512q33 -33 33 -79.5t-33.5 -80t-80 -33.5t-79.5 33 t-33 80t33 80t80 33t80 -33z" />
+<glyph unicode="⩹" horiz-adv-x="1591" d="M1421 31q0 -41 -41 -41q-8 0 -14 3l-1169 552q-27 13 -27 37t27 37l1169 552q6 3 14 3q41 0 41 -41q0 -26 -24 -37l-1090 -514l1090 -514q24 -11 24 -37zM1354 741q66 -67 66 -158t-67 -157t-157.5 -66t-157 65.5t-66.5 156.5t66.5 158.5t158 67.5t157.5 -67zM1299 480.5 q44 43.5 44 102.5t-44 103.5t-103 44.5t-103 -44.5t-44 -103.5t44 -102.5t103 -43.5t103 43.5z" />
+<glyph unicode="⩺" horiz-adv-x="1591" d="M1421 582q0 -24 -27 -37l-1169 -552q-6 -3 -14 -3q-41 0 -41 41q0 26 24 37l1090 514l-1090 514q-24 11 -24 37q0 41 41 41q8 0 14 -3l1169 -552q27 -13 27 -37zM619 582q0 -91 -66.5 -156.5t-157 -65.5t-157.5 66t-67 157t66 158t157.5 67t158 -67.5t66.5 -158.5z M498 480.5q44 43.5 44 102.5t-44 103.5t-103 44.5t-103 -44.5t-44 -103.5t44 -102.5t103 -43.5t103 43.5z" />
+<glyph unicode="⩻" horiz-adv-x="1591" d="M1421 31q0 -41 -41 -41q-8 0 -14 3l-1169 552q-27 13 -27 37t27 37l1169 552q6 3 14 3q41 0 41 -41q0 -26 -24 -37l-1090 -514l1090 -514q24 -11 24 -37zM267 1384q-55 0 -55 73t55 111t129 38t128.5 -41t54.5 -115t-65 -151q-88 -104 -103 -135.5t-18 -91.5h-21 q3 63 13.5 97.5t56 124.5t45.5 146t-31 97t-86 41q-93 0 -93 -65q0 -17 15 -45.5t15 -41.5q0 -42 -40 -42zM386 1010q56 0 56 -55.5t-56 -55.5t-56 55.5t56 55.5z" />
+<glyph unicode="⩼" horiz-adv-x="1591" d="M1421 582q0 -24 -27 -37l-1169 -552q-6 -3 -14 -3q-41 0 -41 41q0 26 24 37l1090 514l-1090 514q-24 11 -24 37q0 41 41 41q8 0 14 -3l1169 -552q27 -13 27 -37zM1067 1384q-55 0 -55 73t55 111t129 38t128.5 -41t54.5 -115t-65 -151q-88 -104 -103 -135.5t-18 -91.5h-21 q3 63 13.5 97.5t56 124.5t45.5 146t-31 97t-86 41q-93 0 -93 -65q0 -17 15 -45.5t15 -41.5q0 -42 -40 -42zM1186 1010q56 0 56 -55.5t-56 -55.5t-56 55.5t56 55.5z" />
+<glyph unicode="⩽" horiz-adv-x="1591" d="M1421 31q0 -41 -41 -41q-10 0 -14 2l-1169 553q-27 13 -27 37.5t20 33.5l1176 555q4 5 14 5q41 0 41 -41q0 -26 -18 -35l-1096 -518l1090 -514q24 -11 24 -37zM1421 -367q0 -41 -41 -41q-8 0 -14 3l-1176 555q-20 9 -20 34q0 41 41 41q12 0 16 -2l1176 -555q18 -8 18 -35 z" />
+<glyph unicode="⩾" horiz-adv-x="1591" d="M1401 616q20 -9 20 -33.5t-27 -37.5l-1169 -553q-4 -2 -14 -2q-41 0 -41 41q0 26 24 37l1090 514l-1096 518q-18 9 -18 35q0 41 41 41q10 0 14 -5zM1421 184q0 -25 -20 -34l-1176 -555q-6 -3 -14 -3q-41 0 -41 41q0 27 18 35l1176 555q4 2 16 2q41 0 41 -41z" />
+<glyph unicode="⩿" horiz-adv-x="1591" d="M1421 31q0 -41 -41 -41q-10 0 -14 2l-1169 553q-27 13 -27 37.5t20 33.5l1176 555q4 5 14 5q41 0 41 -41q0 -26 -18 -35l-1096 -518l1090 -514q24 -11 24 -37zM1421 -367q0 -41 -41 -41q-8 0 -14 3l-1176 555q-20 9 -20 34q0 41 41 41q12 0 16 -2l1176 -555q18 -8 18 -35 zM1335.5 661.5q33.5 -33.5 33.5 -80t-33 -79.5t-80 -33t-80 33t-33 80t33 80t79.5 33t80 -33.5z" />
+<glyph unicode="⪀" horiz-adv-x="1591" d="M1401 616q20 -9 20 -33.5t-27 -37.5l-1169 -553q-4 -2 -14 -2q-41 0 -41 41q0 26 24 37l1090 514l-1096 518q-18 9 -18 35q0 41 41 41q10 0 14 -5zM1421 184q0 -25 -20 -34l-1176 -555q-6 -3 -14 -3q-41 0 -41 41q0 27 18 35l1176 555q4 2 16 2q41 0 41 -41zM414.5 661.5 q33.5 -33.5 33.5 -80t-33 -79.5t-80 -33t-80 33t-33 80t33 80t79.5 33t80 -33.5z" />
+<glyph unicode="⪁" horiz-adv-x="1591" d="M1421 31q0 -41 -41 -41q-10 0 -14 2l-1169 553q-27 13 -27 37.5t20 33.5l1176 555q4 5 14 5q41 0 41 -41q0 -26 -18 -35l-1096 -518l1090 -514q24 -11 24 -37zM1421 -367q0 -41 -41 -41q-8 0 -14 3l-1176 555q-20 9 -20 34q0 41 41 41q12 0 16 -2l1176 -555q18 -8 18 -35 zM362.5 1161.5q33.5 -33.5 33.5 -80t-33 -79.5t-80 -33t-80 33t-33 80t33 80t79.5 33t80 -33.5z" />
+<glyph unicode="⪂" horiz-adv-x="1591" d="M1401 616q20 -9 20 -33.5t-27 -37.5l-1169 -553q-4 -2 -14 -2q-41 0 -41 41q0 26 24 37l1090 514l-1096 518q-18 9 -18 35q0 41 41 41q10 0 14 -5zM1421 184q0 -25 -20 -34l-1176 -555q-6 -3 -14 -3q-41 0 -41 41q0 27 18 35l1176 555q4 2 16 2q41 0 41 -41z M1387.5 1161.5q33.5 -33.5 33.5 -80t-33 -79.5t-80 -33t-80 33t-33 80t33 80t79.5 33t80 -33.5z" />
+<glyph unicode="⪃" horiz-adv-x="1591" d="M1421 31q0 -41 -41 -41q-10 0 -14 2l-1169 553q-27 13 -27 37.5t20 33.5l1176 555q4 5 14 5q41 0 41 -41q0 -26 -18 -35l-1096 -518l1090 -514q24 -11 24 -37zM1421 -367q0 -41 -41 -41q-8 0 -14 3l-1176 555q-20 9 -20 34q0 41 41 41q12 0 16 -2l1176 -555q18 -8 18 -35 zM1362.5 1561.5q33.5 -33.5 33.5 -80t-33 -79.5t-80 -33t-80 33t-33 80t33 80t79.5 33t80 -33.5z" />
+<glyph unicode="⪄" horiz-adv-x="1591" d="M1401 616q20 -9 20 -33.5t-27 -37.5l-1169 -553q-4 -2 -14 -2q-41 0 -41 41q0 26 24 37l1090 514l-1096 518q-18 9 -18 35q0 41 41 41q10 0 14 -5zM1421 184q0 -25 -20 -34l-1176 -555q-6 -3 -14 -3q-41 0 -41 41q0 27 18 35l1176 555q4 2 16 2q41 0 41 -41z M387.5 1561.5q33.5 -33.5 33.5 -80t-33 -79.5t-80 -33t-80 33t-33 80t33 80t79.5 33t80 -33.5z" />
+<glyph unicode="⪅" horiz-adv-x="1591" d="M1421 463q0 -41 -41 -41q-8 0 -14 3l-1169 552q-27 13 -27 37t27 37l1169 552q6 3 14 3q41 0 41 -41q0 -26 -24 -37l-1090 -514l1090 -514q24 -11 24 -37zM1477 310q0 -158 -103 -250t-236.5 -92t-346 142t-334.5 142t-202.5 -71.5t-80.5 -153.5q0 -59 -29.5 -59 t-29.5 59q0 156 104 248t237.5 92t345.5 -141.5t334.5 -141.5t203 72t80.5 154q0 57 28.5 57t28.5 -57zM1477 -100q0 -158 -103 -250t-236.5 -92t-346 142t-334.5 142t-202.5 -71.5t-80.5 -153.5q0 -59 -29.5 -59t-29.5 59q0 156 104 248t237.5 92t345.5 -141.5 t334.5 -141.5t203 72t80.5 154q0 57 28.5 57t28.5 -57z" />
+<glyph unicode="⪆" horiz-adv-x="1591" d="M1421 1014q0 -24 -27 -37l-1169 -552q-6 -3 -14 -3q-41 0 -41 41q0 26 24 37l1090 514l-1090 514q-24 11 -24 37q0 41 41 41q8 0 14 -3l1169 -552q27 -13 27 -37zM1477 310q0 -158 -103 -250t-236.5 -92t-346 142t-334.5 142t-202.5 -71.5t-80.5 -153.5q0 -59 -29.5 -59 t-29.5 59q0 156 104 248t237.5 92t345.5 -141.5t334.5 -141.5t203 72t80.5 154q0 57 28.5 57t28.5 -57zM1477 -100q0 -158 -103 -250t-236.5 -92t-346 142t-334.5 142t-202.5 -71.5t-80.5 -153.5q0 -59 -29.5 -59t-29.5 59q0 156 104 248t237.5 92t345.5 -141.5 t334.5 -141.5t203 72t80.5 154q0 57 28.5 57t28.5 -57z" />
+<glyph unicode="⪇" horiz-adv-x="1591" d="M1421 31q0 -41 -41 -41q-8 0 -14 3l-1169 552q-27 13 -27 37t27 37l1169 552q6 3 14 3q41 0 41 -41q0 -26 -24 -37l-1090 -514l1090 -514q24 -11 24 -37zM1421 -259q0 -41 -37 -41h-574l-177 -133q-12 -9 -25 -9q-42 0 -42 43q0 19 17 32l90 67h-464q-39 0 -39 41t39 41 h573l176 133q12 8 25 8q42 0 42 -42q0 -19 -17 -32l-89 -67h465q37 0 37 -41z" />
+<glyph unicode="⪈" horiz-adv-x="1591" d="M1421 582q0 -24 -27 -37l-1169 -552q-6 -3 -14 -3q-41 0 -41 41q0 26 24 37l1090 514l-1090 514q-24 11 -24 37q0 41 41 41q8 0 14 -3l1169 -552q27 -13 27 -37zM1421 -259q0 -41 -37 -41h-574l-177 -133q-12 -9 -25 -9q-42 0 -42 43q0 19 17 32l90 67h-464q-39 0 -39 41 t39 41h573l176 133q12 8 25 8q42 0 42 -42q0 -19 -17 -32l-89 -67h465q37 0 37 -41z" />
+<glyph unicode="⪉" horiz-adv-x="1591" d="M1421 463q0 -41 -41 -41q-8 0 -14 3l-1169 552q-27 13 -27 37t27 37l1169 552q6 3 14 3q41 0 41 -41q0 -26 -24 -37l-1090 -514l1090 -514q24 -11 24 -37zM1477 -100q0 -158 -103 -250t-226 -92t-255 77l-221 141l-199 -205q-12 -13 -29 -13q-42 0 -42 42q0 16 13 28 l180 186q-71 28 -138 28q-122 0 -202.5 -71.5t-80.5 -153.5q0 -59 -29.5 -59t-29.5 59q0 156 104 248t238 92q102 0 217 -62l173 179q-180 115 -188 119q-108 59 -216 59t-188.5 -71.5t-80.5 -153.5q0 -59 -29.5 -59t-29.5 59q0 156 104 248t227 92t255 -77l220 -140 l198 203q12 13 29 13q42 0 42 -42q0 -15 -13 -28l-178 -184q71 -28 138 -28q122 0 202.5 72t80.5 154q0 57 28.5 57t28.5 -57q0 -158 -103 -250t-237 -92q-102 0 -218 62l-173 -178q179 -114 188 -119q108 -59 216.5 -59t189 72t80.5 154q0 57 28.5 57t28.5 -57z" />
+<glyph unicode="⪊" horiz-adv-x="1591" d="M1421 1014q0 -24 -27 -37l-1169 -552q-6 -3 -14 -3q-41 0 -41 41q0 26 24 37l1090 514l-1090 514q-24 11 -24 37q0 41 41 41q8 0 14 -3l1169 -552q27 -13 27 -37zM1477 -100q0 -158 -103 -250t-226 -92t-255 77l-221 141l-199 -205q-12 -13 -29 -13q-42 0 -42 42 q0 16 13 28l180 186q-71 28 -138 28q-122 0 -202.5 -71.5t-80.5 -153.5q0 -59 -29.5 -59t-29.5 59q0 156 104 248t238 92q102 0 217 -62l173 179q-180 115 -188 119q-108 59 -216 59t-188.5 -71.5t-80.5 -153.5q0 -59 -29.5 -59t-29.5 59q0 156 104 248t227 92t255 -77 l220 -140l198 203q12 13 29 13q42 0 42 -42q0 -15 -13 -28l-178 -184q71 -28 138 -28q122 0 202.5 72t80.5 154q0 57 28.5 57t28.5 -57q0 -158 -103 -250t-237 -92q-102 0 -218 62l-173 -178q179 -114 188 -119q108 -59 216.5 -59t189 72t80.5 154q0 57 28.5 57t28.5 -57z " />
+<glyph unicode="⪋" horiz-adv-x="1591" d="M1421 732q0 -41 -37 -41h-1175q-39 0 -39 41t39 41h1175q37 0 37 -41zM1421 432q0 -41 -37 -41h-1175q-39 0 -39 41t39 41h1175q37 0 37 -41zM1421 900q0 -45 -39 -45q-4 0 -15 3l-1170 334q-27 8 -27 39t27 39l1170 334q7 2 13 2q41 0 41 -41q0 -32 -25 -39l-1032 -295 l1032 -295q25 -7 25 -36zM1421 -66q0 -31 -27 -39l-1170 -334q-11 -3 -15 -3q-39 0 -39 45q0 29 25 36l1032 295l-1032 295q-25 7 -25 39q0 41 41 41q6 0 13 -2l1170 -334q27 -8 27 -39z" />
+<glyph unicode="⪌" horiz-adv-x="1591" d="M1421 732q0 -41 -37 -41h-1175q-39 0 -39 41t39 41h1175q37 0 37 -41zM1421 432q0 -41 -37 -41h-1175q-39 0 -39 41t39 41h1175q37 0 37 -41zM1421 1231q0 -31 -27 -39l-1170 -334q-11 -3 -15 -3q-39 0 -39 45q0 29 25 36l1032 295l-1032 295q-25 7 -25 39q0 41 41 41 q6 0 13 -2l1170 -334q27 -8 27 -39zM1421 -397q0 -45 -39 -45q-4 0 -15 3l-1170 334q-27 8 -27 39t27 39l1170 334q7 2 13 2q41 0 41 -41q0 -32 -25 -39l-1032 -295l1032 -295q25 -7 25 -36z" />
+<glyph unicode="⪍" horiz-adv-x="1591" d="M1477 -318q0 -41 -37 -41h-1286q-39 0 -39 41t39 41h1286q37 0 37 -41zM1477 454q0 -152 -96 -271.5t-244 -119.5q-114 0 -238 88l-208 164q-123 88 -236 88q-162 0 -245 -147q-29 -52 -38 -142q-5 -51 -29 -51q-28 0 -28 63q0 152 95.5 271.5t244.5 119.5q115 0 240 -88 l207 -164q124 -88 235 -88q85 0 156 50t104 130q15 36 21 98t30 62q29 0 29 -63zM1421 651q0 -45 -39 -45q-7 0 -15 3l-1170 434q-27 10 -27 39t27 39l1170 434q5 2 13 2q41 0 41 -41q0 -30 -25 -39l-1063 -395l1063 -395q25 -9 25 -36z" />
+<glyph unicode="⪎" horiz-adv-x="1591" d="M1477 -318q0 -41 -37 -41h-1286q-39 0 -39 41t39 41h1286q37 0 37 -41zM1477 454q0 -152 -96 -271.5t-244 -119.5q-114 0 -238 88l-208 164q-123 88 -236 88q-162 0 -245 -147q-29 -52 -38 -142q-5 -51 -29 -51q-28 0 -28 63q0 152 95.5 271.5t244.5 119.5q115 0 240 -88 l207 -164q124 -88 235 -88q85 0 156 50t104 130q15 36 21 98t30 62q29 0 29 -63zM1421 1082q0 -29 -27 -39l-1170 -434q-8 -3 -15 -3q-39 0 -39 45q0 27 25 36l1063 395l-1063 395q-25 9 -25 39q0 41 41 41q8 0 13 -2l1170 -434q27 -10 27 -39z" />
+<glyph unicode="⪏" horiz-adv-x="1591" d="M1421 900q0 -45 -39 -45q-4 0 -15 3l-1170 334q-27 8 -27 39t27 39l1170 334q7 2 13 2q41 0 41 -41q0 -32 -25 -39l-1032 -295l1032 -295q25 -7 25 -36zM1477 705q0 -146 -96.5 -234.5t-236.5 -88.5t-352 142.5t-335 142.5q-101 0 -192 -55.5t-91 -150.5q0 -39 -29.5 -39 t-29.5 39q0 145 97.5 233t237.5 88t351.5 -142t335.5 -142q101 0 185 52q98 60 98 155q0 37 28.5 37t28.5 -37zM1421 -66q0 -31 -27 -39l-1170 -334q-11 -3 -15 -3q-39 0 -39 45q0 29 25 36l1032 295l-1032 295q-25 7 -25 39q0 41 41 41q6 0 13 -2l1170 -334q27 -8 27 -39z " />
+<glyph unicode="⪐" horiz-adv-x="1591" d="M1421 1231q0 -31 -27 -39l-1170 -334q-11 -3 -15 -3q-39 0 -39 45q0 29 25 36l1032 295l-1032 295q-25 7 -25 39q0 41 41 41q6 0 13 -2l1170 -334q27 -8 27 -39zM1477 705q0 -146 -96.5 -234.5t-236.5 -88.5t-352 142.5t-335 142.5q-101 0 -192 -55.5t-91 -150.5 q0 -39 -29.5 -39t-29.5 39q0 145 97.5 233t237.5 88t351.5 -142t335.5 -142q101 0 185 52q98 60 98 155q0 37 28.5 37t28.5 -37zM1421 -397q0 -45 -39 -45q-4 0 -15 3l-1170 334q-27 8 -27 39t27 39l1170 334q7 2 13 2q41 0 41 -41q0 -32 -25 -39l-1032 -295l1032 -295 q25 -7 25 -36z" />
+<glyph unicode="⪑" horiz-adv-x="1591" d="M1421 -101q0 -41 -37 -41h-1175q-39 0 -39 41t39 41h1175q37 0 37 -41zM1421 -401q0 -41 -37 -41h-1175q-39 0 -39 41t39 41h1175q37 0 37 -41zM1421 900q0 -45 -39 -45q-4 0 -15 3l-1170 334q-27 8 -27 39t27 39l1170 334q7 2 13 2q41 0 41 -41q0 -32 -25 -39 l-1032 -295l1032 -295q25 -7 25 -36zM1421 497q0 -31 -27 -39l-1170 -334q-7 -2 -13 -2q-41 0 -41 41q0 32 25 39l1032 295l-1032 295q-25 7 -25 36q0 45 39 45q4 0 15 -3l1170 -334q27 -8 27 -39z" />
+<glyph unicode="⪒" horiz-adv-x="1591" d="M1421 -101q0 -41 -37 -41h-1175q-39 0 -39 41t39 41h1175q37 0 37 -41zM1421 -401q0 -41 -37 -41h-1175q-39 0 -39 41t39 41h1175q37 0 37 -41zM1421 1231q0 -31 -27 -39l-1170 -334q-11 -3 -15 -3q-39 0 -39 45q0 29 25 36l1032 295l-1032 295q-25 7 -25 39q0 41 41 41 q6 0 13 -2l1170 -334q27 -8 27 -39zM1421 163q0 -41 -41 -41q-6 0 -13 2l-1170 334q-27 8 -27 39t27 39l1170 334q11 3 15 3q39 0 39 -45q0 -29 -25 -36l-1032 -295l1032 -295q25 -7 25 -39z" />
+<glyph unicode="⪓" horiz-adv-x="1591" d="M1421 881q0 -41 -41 -41q-7 0 -14 2l-1169 343q-27 8 -27 36.5t20 34.5l1176 345q17 5 19 5q36 0 36 -41q0 -30 -18 -35l-1047 -307l1041 -305q24 -7 24 -37zM1421 583q0 -41 -41 -41q-4 0 -14 3l-1176 345q-20 6 -20 34q0 41 41 41q9 0 16 -2l1176 -345q18 -5 18 -35z M1401 272q20 -6 20 -34.5t-27 -36.5l-1169 -343q-7 -2 -14 -2q-41 0 -41 41q0 30 24 37l1041 305l-1047 307q-18 5 -18 35q0 41 36 41q2 0 19 -5zM1421 -60q0 -28 -20 -34l-1176 -345q-10 -3 -14 -3q-41 0 -41 41q0 30 18 35l1176 345q7 2 16 2q41 0 41 -41z" />
+<glyph unicode="⪔" horiz-adv-x="1591" d="M1401 1256q20 -6 20 -34.5t-27 -36.5l-1169 -343q-7 -2 -14 -2q-41 0 -41 41q0 30 24 37l1041 305l-1047 307q-18 5 -18 35q0 41 36 41q2 0 19 -5zM1421 924q0 -28 -20 -34l-1176 -345q-10 -3 -14 -3q-41 0 -41 41q0 30 18 35l1176 345q7 2 16 2q41 0 41 -41zM1421 -103 q0 -41 -41 -41q-7 0 -14 2l-1169 343q-27 8 -27 36.5t20 34.5l1176 345q17 5 19 5q36 0 36 -41q0 -30 -18 -35l-1047 -307l1041 -305q24 -7 24 -37zM1421 -401q0 -41 -41 -41q-4 0 -14 3l-1176 345q-20 6 -20 34q0 41 41 41q9 0 16 -2l1176 -345q18 -5 18 -35z" />
+<glyph unicode="⪕" horiz-adv-x="1591" d="M1421 1333q0 -27 -18 -35l-1176 -555q-4 -2 -16 -2q-41 0 -41 41q0 25 20 34l1176 555q6 3 14 3q41 0 41 -41zM1421 -169q0 -41 -41 -41q-10 0 -14 5l-1176 555q-20 9 -20 33.5t27 37.5l1169 553q4 2 14 2q41 0 41 -41q0 -26 -24 -37l-1090 -514l1096 -518q18 -9 18 -35z " />
+<glyph unicode="⪖" horiz-adv-x="1591" d="M1421 782q0 -41 -41 -41q-12 0 -16 2l-1176 555q-18 8 -18 35q0 41 41 41q8 0 14 -3l1176 -555q20 -9 20 -34zM1394 421q27 -13 27 -37.5t-20 -33.5l-1176 -555q-4 -5 -14 -5q-41 0 -41 41q0 26 18 35l1096 518l-1090 514q-24 11 -24 37q0 41 41 41q10 0 14 -2z" />
+<glyph unicode="⪗" horiz-adv-x="1591" d="M1421 1333q0 -27 -18 -35l-1176 -555q-4 -2 -16 -2q-41 0 -41 41q0 25 20 34l1176 555q6 3 14 3q41 0 41 -41zM1421 -169q0 -41 -41 -41q-10 0 -14 5l-1176 555q-20 9 -20 33.5t27 37.5l1169 553q4 2 14 2q41 0 41 -41q0 -26 -24 -37l-1090 -514l1096 -518q18 -9 18 -35z M1336 464q33 -33 33 -79.5t-33.5 -80t-80 -33.5t-79.5 33t-33 80t33 80t80 33t80 -33z" />
+<glyph unicode="⪘" horiz-adv-x="1591" d="M1421 782q0 -41 -41 -41q-12 0 -16 2l-1176 555q-18 8 -18 35q0 41 41 41q8 0 14 -3l1176 -555q20 -9 20 -34zM1394 421q27 -13 27 -37.5t-20 -33.5l-1176 -555q-4 -5 -14 -5q-41 0 -41 41q0 26 18 35l1096 518l-1090 514q-24 11 -24 37q0 41 41 41q10 0 14 -2zM415 464 q33 -33 33 -79.5t-33.5 -80t-80 -33.5t-79.5 33t-33 80t33 80t80 33t80 -33z" />
+<glyph unicode="⪙" horiz-adv-x="1591" d="M1421 -259q0 -41 -41 -41q-8 0 -14 3l-1169 552q-27 13 -27 37t27 37l1169 552q6 3 14 3q41 0 41 -41q0 -26 -24 -37l-1090 -514l1090 -514q24 -11 24 -37zM1421 1133q0 -41 -37 -41h-1175q-39 0 -39 41t39 41h1175q37 0 37 -41zM1421 1433q0 -41 -37 -41h-1175 q-39 0 -39 41t39 41h1175q37 0 37 -41z" />
+<glyph unicode="⪚" horiz-adv-x="1591" d="M1421 292q0 -24 -27 -37l-1169 -552q-6 -3 -14 -3q-41 0 -41 41q0 26 24 37l1090 514l-1090 514q-24 11 -24 37q0 41 41 41q8 0 14 -3l1169 -552q27 -13 27 -37zM1421 1133q0 -41 -37 -41h-1175q-39 0 -39 41t39 41h1175q37 0 37 -41zM1421 1433q0 -41 -37 -41h-1175 q-39 0 -39 41t39 41h1175q37 0 37 -41z" />
+<glyph unicode="⪛" horiz-adv-x="1591" d="M1421 1135q0 -27 -18 -35l-1176 -555q-4 -2 -16 -2q-41 0 -41 41q0 25 20 34l1176 555q6 3 14 3q41 0 41 -41zM1421 -367q0 -41 -41 -41q-10 0 -14 5l-1176 555q-20 9 -20 33.5t27 37.5l1169 553q4 2 14 2q41 0 41 -41q0 -26 -24 -37l-1090 -514l1096 -518q18 -9 18 -35z M1421 1532q0 -27 -18 -35l-1176 -555q-4 -2 -16 -2q-41 0 -41 41q0 25 20 34l1176 555q6 3 14 3q41 0 41 -41z" />
+<glyph unicode="⪜" horiz-adv-x="1591" d="M1421 584q0 -41 -41 -41q-12 0 -16 2l-1176 555q-18 8 -18 35q0 41 41 41q8 0 14 -3l1176 -555q20 -9 20 -34zM1394 223q27 -13 27 -37.5t-20 -33.5l-1176 -555q-4 -5 -14 -5q-41 0 -41 41q0 26 18 35l1096 518l-1090 514q-24 11 -24 37q0 41 41 41q10 0 14 -2zM1421 981 q0 -41 -41 -41q-12 0 -16 2l-1176 555q-18 8 -18 35q0 41 41 41q8 0 14 -3l1176 -555q20 -9 20 -34z" />
+<glyph unicode="⪝" horiz-adv-x="1591" d="M1477 1411q0 -152 -96 -271.5t-244 -119.5q-114 0 -238 88l-208 164q-123 88 -236 88q-162 0 -245 -147q-29 -52 -38 -142q-5 -51 -29 -51q-28 0 -28 63q0 152 95.5 271.5t244.5 119.5q115 0 240 -88l207 -164q124 -88 235 -88q85 0 156 50t104 130q15 36 21 98t30 62 q29 0 29 -63zM1421 -304q0 -41 -41 -41q-8 0 -14 3l-1169 552q-27 13 -27 37t27 37l1169 552q6 3 14 3q41 0 41 -41q0 -26 -24 -37l-1090 -514l1090 -514q24 -11 24 -37z" />
+<glyph unicode="⪞" horiz-adv-x="1591" d="M1477 1411q0 -152 -96 -271.5t-244 -119.5q-114 0 -238 88l-208 164q-123 88 -236 88q-162 0 -245 -147q-29 -52 -38 -142q-5 -51 -29 -51q-28 0 -28 63q0 152 95.5 271.5t244.5 119.5q115 0 240 -88l207 -164q124 -88 235 -88q85 0 156 50t104 130q15 36 21 98t30 62 q29 0 29 -63zM1421 247q0 -24 -27 -37l-1169 -552q-6 -3 -14 -3q-41 0 -41 41q0 26 24 37l1090 514l-1090 514q-24 11 -24 37q0 41 41 41q8 0 14 -3l1169 -552q27 -13 27 -37z" />
+<glyph unicode="⪟" horiz-adv-x="1591" d="M1421 -101q0 -41 -37 -41h-1175q-39 0 -39 41t39 41h1175q37 0 37 -41zM1421 -401q0 -41 -37 -41h-1175q-39 0 -39 41t39 41h1175q37 0 37 -41zM1477 1529q0 -146 -96.5 -234.5t-236.5 -88.5t-352 142.5t-335 142.5q-101 0 -192 -55.5t-91 -150.5q0 -39 -29.5 -39 t-29.5 39q0 145 97.5 233t237.5 88t351.5 -142t335.5 -142q101 0 185 52q98 60 98 155q0 37 28.5 37t28.5 -37zM1421 81q0 -41 -41 -41q-7 0 -14 3l-1169 502q-27 12 -27 37t27 37l1169 502q7 3 14 3q41 0 41 -41q0 -27 -24 -37l-1081 -464l1081 -464q24 -10 24 -37z" />
+<glyph unicode="⪠" horiz-adv-x="1591" d="M1421 -101q0 -41 -37 -41h-1175q-39 0 -39 41t39 41h1175q37 0 37 -41zM1421 -401q0 -41 -37 -41h-1175q-39 0 -39 41t39 41h1175q37 0 37 -41zM1477 1529q0 -146 -96.5 -234.5t-236.5 -88.5t-352 142.5t-335 142.5q-101 0 -192 -55.5t-91 -150.5q0 -39 -29.5 -39 t-29.5 39q0 145 97.5 233t237.5 88t351.5 -142t335.5 -142q101 0 185 52q98 60 98 155q0 37 28.5 37t28.5 -37zM1421 582q0 -25 -27 -37l-1169 -502q-7 -3 -14 -3q-41 0 -41 41q0 27 24 37l1081 464l-1081 464q-24 10 -24 37q0 41 41 41q7 0 14 -3l1169 -502q27 -12 27 -37z " />
+<glyph unicode="⪡" horiz-adv-x="1591" d="M1421 314q0 -41 -41 -41q-10 0 -14 2l-569 270q-27 13 -27 37.5t20 33.5l576 272q8 4 14 4q41 0 41 -41q0 -27 -18 -35l-496 -234l490 -231q24 -11 24 -37zM1421 31q0 -41 -41 -41q-10 0 -14 2l-1169 553q-27 13 -27 37.5t20 33.5l1176 556q8 4 14 4q41 0 41 -41 q0 -26 -18 -35l-1096 -518l1090 -514q24 -11 24 -37z" />
+<glyph unicode="⪢" horiz-adv-x="1591" d="M1401 616q20 -9 20 -33.5t-27 -37.5l-1169 -553q-4 -2 -14 -2q-41 0 -41 41q0 26 24 37l1090 514l-1096 518q-18 9 -18 35q0 41 41 41q6 0 14 -4zM801 616q20 -9 20 -33.5t-27 -37.5l-569 -270q-4 -2 -14 -2q-41 0 -41 41q0 26 24 37l490 231l-496 234q-18 8 -18 35 q0 41 41 41q6 0 14 -4z" />
+<glyph unicode="⪣" horiz-adv-x="2211" d="M1421 31q0 -41 -41 -41q-8 0 -14 3l-1169 552q-27 13 -27 37t27 37l1169 552q6 3 14 3q41 0 41 -41q0 -26 -24 -37l-1090 -514l1090 -514q24 -11 24 -37zM2041 31q0 -41 -41 -41q-8 0 -14 3l-1169 552q-27 13 -27 37t27 37l1169 552q6 3 14 3q41 0 41 -41q0 -26 -24 -37 l-1090 -514l1090 -514q24 -11 24 -37zM2041 -318q0 -41 -37 -41h-1795q-39 0 -39 41t39 41h1795q37 0 37 -41z" />
+<glyph unicode="⪤" horiz-adv-x="1591" d="M1421 31q0 -41 -41 -41q-8 0 -14 3l-570 269l-571 -269q-6 -3 -14 -3q-41 0 -41 41q0 26 24 37l507 239l-504 238q-27 13 -27 37t27 37l504 238l-507 239q-24 11 -24 37q0 41 41 41q8 0 14 -3l570 -269l571 269q6 3 14 3q41 0 41 -41q0 -26 -24 -37l-507 -239l504 -238 q27 -13 27 -37t-27 -37l-504 -238l507 -239q24 -11 24 -37zM1284 582l-488 230l-489 -230l489 -230z" />
+<glyph unicode="⪥" horiz-adv-x="2891" d="M1421 582q0 -24 -27 -37l-1169 -552q-6 -3 -14 -3q-41 0 -41 41q0 26 24 37l1090 514l-1090 514q-24 11 -24 37q0 41 41 41q8 0 14 -3l1169 -552q27 -13 27 -37zM2721 31q0 -41 -41 -41q-8 0 -14 3l-1169 552q-27 13 -27 37t27 37l1169 552q6 3 14 3q41 0 41 -41 q0 -26 -24 -37l-1090 -514l1090 -514q24 -11 24 -37z" />
+<glyph unicode="⪦" horiz-adv-x="1742" d="M1416 1152q156 -265 156 -567.5t-155 -570.5q-14 -24 -37 -24q-8 0 -14 3l-1169 552q-27 13 -27 37t27 37l1169 552q6 3 14 3q24 0 36 -22zM1363 84q127 233 127 498.5t-127 497.5l-1056 -498z" />
+<glyph unicode="⪧" horiz-adv-x="1742" d="M1572 582q0 -24 -27 -37l-1169 -552q-6 -3 -14 -3q-23 0 -37 24q-155 268 -155 570.5t156 567.5q12 22 36 22q8 0 14 -3l1169 -552q27 -13 27 -37zM379 1080q-127 -232 -127 -497.5t127 -498.5l1056 498z" />
+<glyph unicode="⪨" horiz-adv-x="1742" d="M1416 1152q156 -265 156 -567.5t-155 -570.5q-14 -24 -37 -24q-8 0 -14 3l-1169 552q-27 13 -27 37t27 37l1169 552q6 3 14 3q24 0 36 -22zM1363 84q127 233 127 498.5t-127 497.5l-1056 -498zM1421 -367q0 -41 -41 -41q-8 0 -14 3l-1176 555q-20 9 -20 34q0 41 41 41 q12 0 16 -2l1176 -555q18 -8 18 -35z" />
+<glyph unicode="⪩" horiz-adv-x="1742" d="M1572 582q0 -24 -27 -37l-1169 -552q-6 -3 -14 -3q-23 0 -37 24q-155 268 -155 570.5t156 567.5q12 22 36 22q8 0 14 -3l1169 -552q27 -13 27 -37zM379 1080q-127 -232 -127 -497.5t127 -498.5l1056 498zM1572 184q0 -25 -20 -34l-1176 -555q-6 -3 -14 -3q-41 0 -41 41 q0 27 18 35l1176 555q4 2 16 2q41 0 41 -41z" />
+<glyph unicode="⪪" horiz-adv-x="1591" d="M1421 31q0 -41 -41 -41q-8 0 -14 3l-1169 552q-27 13 -27 37t27 37l1169 552q6 3 14 3q41 0 41 -41q0 -26 -24 -37l-1003 -473h988q39 0 39 -41t-39 -41h-988l1003 -473q24 -11 24 -37z" />
+<glyph unicode="⪫" horiz-adv-x="1591" d="M1421 582q0 -24 -27 -37l-1169 -552q-6 -3 -14 -3q-41 0 -41 41q0 26 24 37l1003 473h-988q-39 0 -39 41t39 41h988l-1003 473q-24 11 -24 37q0 41 41 41q8 0 14 -3l1169 -552q27 -13 27 -37z" />
+<glyph unicode="⪬" horiz-adv-x="1591" d="M1421 31q0 -41 -41 -41q-8 0 -14 3l-1169 552q-27 13 -27 37t27 37l1169 552q6 3 14 3q41 0 41 -41q0 -26 -24 -37l-1003 -473h988q39 0 39 -41t-39 -41h-988l1003 -473q24 -11 24 -37zM1421 -259q0 -41 -37 -41h-1175q-39 0 -39 41t39 41h1175q37 0 37 -41z" />
+<glyph unicode="⪭" horiz-adv-x="1591" d="M1421 582q0 -24 -27 -37l-1169 -552q-6 -3 -14 -3q-41 0 -41 41q0 26 24 37l1003 473h-988q-39 0 -39 41t39 41h988l-1003 473q-24 11 -24 37q0 41 41 41q8 0 14 -3l1169 -552q27 -13 27 -37zM1421 -259q0 -41 -37 -41h-1175q-39 0 -39 41t39 41h1175q37 0 37 -41z" />
+<glyph unicode="⪮" horiz-adv-x="1592" d="M1422 582q0 -41 -37 -41h-1175q-39 0 -39 41t39 41h1175q37 0 37 -41zM1422 182q0 -41 -37 -41h-1175q-39 0 -39 41t39 41h1175q37 0 37 -41zM1422 982q0 -41 -37 -41h-336q-13 0 -25 13t-12 26q0 87 -64 152t-152 65t-151 -64t-63 -153q0 -39 -39 -39h-334q-39 0 -39 41 t39 41h293q17 111 100 183.5t193.5 72.5t195.5 -74t99 -182h295q37 0 37 -41z" />
+<glyph unicode="⪯" horiz-adv-x="1591" d="M1421 35q0 -45 -41 -45q-34 0 -41 39q-28 180 -141.5 282t-284.5 152q-268 78 -704 78q-39 0 -39 41t39 41q436 0 706 80q173 51 285 152t139 284q6 37 41 37q41 0 41 -43q0 -22 -12 -76q-42 -188 -196 -297q-178 -126 -455 -178q269 -47 453 -177q156 -110 198 -295 q12 -52 12 -75zM1421 -259q0 -41 -37 -41h-1175q-39 0 -39 41t39 41h1175q37 0 37 -41z" />
+<glyph unicode="⪰" horiz-adv-x="1591" d="M1421 -259q0 -41 -37 -41h-1175q-39 0 -39 41t39 41h1175q37 0 37 -41zM1421 582q0 -41 -37 -41q-267 0 -500 -31.5t-415.5 -142.5t-216.5 -338q-6 -39 -41 -39q-41 0 -41 45q0 12 8 53q25 130 106 225q172 203 550 269q-435 77 -590 327q-74 119 -74 224q0 43 41 43 q35 0 41 -37q35 -232 215 -342t418.5 -142t498.5 -32q37 0 37 -41z" />
+<glyph unicode="⪱" horiz-adv-x="1591" d="M1421 35q0 -45 -41 -45q-34 0 -41 39q-28 180 -141.5 282t-284.5 152q-268 78 -704 78q-39 0 -39 41t39 41q436 0 706 80q173 51 285 152t139 284q6 37 41 37q41 0 41 -43q0 -22 -12 -76q-42 -188 -196 -297q-178 -126 -455 -178q269 -47 453 -177q156 -110 198 -295 q12 -52 12 -75zM1421 -259q0 -41 -37 -41h-574l-177 -133q-12 -9 -25 -9q-42 0 -42 43q0 19 17 32l90 67h-464q-39 0 -39 41t39 41h573l176 133q12 8 25 8q42 0 42 -42q0 -19 -17 -32l-89 -67h465q37 0 37 -41z" />
+<glyph unicode="⪲" horiz-adv-x="1591" d="M1421 582q0 -41 -37 -41q-267 0 -500 -31.5t-415.5 -142.5t-216.5 -338q-6 -39 -41 -39q-41 0 -41 45q0 12 8 53q25 130 106 225q172 203 550 269q-435 77 -590 327q-74 119 -74 224q0 43 41 43q35 0 41 -37q35 -232 215 -342t418.5 -142t498.5 -32q37 0 37 -41z M1421 -259q0 -41 -37 -41h-574l-177 -133q-12 -9 -25 -9q-42 0 -42 43q0 19 17 32l90 67h-464q-39 0 -39 41t39 41h573l176 133q12 8 25 8q42 0 42 -42q0 -19 -17 -32l-89 -67h465q37 0 37 -41z" />
+<glyph unicode="⪳" horiz-adv-x="1591" d="M1421 335q0 -45 -41 -45q-34 0 -41 39q-28 180 -141.5 282t-284.5 152q-268 78 -704 78q-39 0 -39 41t39 41q436 0 706 80q173 51 285 152t139 284q6 37 41 37q41 0 41 -43q0 -22 -12 -76q-42 -188 -196 -297q-178 -126 -455 -178q269 -47 453 -177q156 -110 198 -295 q12 -52 12 -75zM1421 41q0 -41 -37 -41h-1175q-39 0 -39 41t39 41h1175q37 0 37 -41zM1421 -259q0 -41 -37 -41h-1175q-39 0 -39 41t39 41h1175q37 0 37 -41z" />
+<glyph unicode="⪴" horiz-adv-x="1591" d="M1421 41q0 -41 -37 -41h-1175q-39 0 -39 41t39 41h1175q37 0 37 -41zM1421 -259q0 -41 -37 -41h-1175q-39 0 -39 41t39 41h1175q37 0 37 -41zM1421 882q0 -41 -37 -41q-267 0 -500 -31.5t-415.5 -142.5t-216.5 -338q-6 -39 -41 -39q-41 0 -41 45q0 12 8 53 q25 130 106 225q172 203 550 269q-435 77 -590 327q-74 119 -74 224q0 43 41 43q35 0 41 -37q35 -232 215 -342t418.5 -142t498.5 -32q37 0 37 -41z" />
+<glyph unicode="⪵" horiz-adv-x="1591" d="M1421 335q0 -45 -41 -45q-34 0 -41 39q-28 180 -141.5 282t-284.5 152q-268 78 -704 78q-39 0 -39 41t39 41q436 0 706 80q173 51 285 152t139 284q6 37 41 37q41 0 41 -43q0 -22 -12 -76q-42 -188 -196 -297q-178 -126 -455 -178q269 -47 453 -177q156 -110 198 -295 q12 -53 12 -75zM1421 -259q0 -41 -37 -41h-720l-127 -129q-13 -13 -29 -13q-42 0 -42 42q0 16 13 29l70 71h-340q-39 0 -39 41t39 41h421l216 218h-637q-39 0 -39 41t39 41h718l127 129q13 13 29 13q42 0 42 -42q0 -16 -13 -29l-70 -71h342q37 0 37 -41t-37 -41h-423 l-216 -218h639q37 0 37 -41z" />
+<glyph unicode="⪶" horiz-adv-x="1591" d="M1421 882q0 -41 -37 -41q-267 0 -500 -31.5t-415.5 -142.5t-216.5 -338q-6 -39 -41 -39q-41 0 -41 45q0 12 8 53q25 130 106 225q172 203 550 269q-435 77 -590 327q-74 119 -74 224q0 43 41 43q35 0 41 -37q35 -232 215 -342t418.5 -142t498.5 -32q37 0 37 -41z M1421 -259q0 -41 -37 -41h-720l-127 -129q-13 -13 -29 -13q-42 0 -42 42q0 16 13 29l70 71h-340q-39 0 -39 41t39 41h421l216 218h-637q-39 0 -39 41t39 41h718l127 129q13 13 29 13q42 0 42 -42q0 -16 -13 -29l-70 -71h342q37 0 37 -41t-37 -41h-423l-216 -218h639 q37 0 37 -41z" />
+<glyph unicode="⪷" horiz-adv-x="1591" d="M1421 465q0 -45 -41 -45q-34 0 -41 39q-28 180 -141.5 282t-284.5 152q-268 78 -704 78q-39 0 -39 41t39 41q436 0 706 80q173 51 285 152t139 284q6 37 41 37q41 0 41 -43q0 -22 -12 -76q-42 -188 -196 -297q-178 -126 -455 -178q269 -47 453 -177q156 -110 198 -295 q12 -53 12 -75zM1475 310q0 -158 -103 -250t-236.5 -92t-346 142t-334.5 142t-202.5 -71.5t-80.5 -153.5q0 -59 -29.5 -59t-29.5 59q0 156 104 248t237.5 92t345.5 -141.5t334.5 -141.5t203 72t80.5 154q0 57 28.5 57t28.5 -57zM1475 -100q0 -158 -103 -250t-236.5 -92 t-346 142t-334.5 142t-202.5 -71.5t-80.5 -153.5q0 -59 -29.5 -59t-29.5 59q0 156 104 248t237.5 92t345.5 -141.5t334.5 -141.5t203 72t80.5 154q0 57 28.5 57t28.5 -57z" />
+<glyph unicode="⪸" horiz-adv-x="1591" d="M1421 1012q0 -41 -37 -41q-267 0 -500 -31.5t-415.5 -142.5t-216.5 -338q-6 -39 -41 -39q-41 0 -41 45q0 12 8 53q25 130 106 225q172 203 550 269q-435 77 -590 327q-74 119 -74 224q0 43 41 43q35 0 41 -37q35 -232 215 -342t418.5 -142t498.5 -32q37 0 37 -41z M1475 310q0 -158 -103 -250t-236.5 -92t-346 142t-334.5 142t-202.5 -71.5t-80.5 -153.5q0 -59 -29.5 -59t-29.5 59q0 156 104 248t237.5 92t345.5 -141.5t334.5 -141.5t203 72t80.5 154q0 57 28.5 57t28.5 -57zM1475 -100q0 -158 -103 -250t-236.5 -92t-346 142t-334.5 142 t-202.5 -71.5t-80.5 -153.5q0 -59 -29.5 -59t-29.5 59q0 156 104 248t237.5 92t345.5 -141.5t334.5 -141.5t203 72t80.5 154q0 57 28.5 57t28.5 -57z" />
+<glyph unicode="⪹" horiz-adv-x="1591" d="M1421 465q0 -45 -41 -45q-34 0 -41 39q-28 180 -141.5 282t-284.5 152q-268 78 -704 78q-39 0 -39 41t39 41q436 0 706 80q173 51 285 152t139 284q6 37 41 37q41 0 41 -43q0 -22 -12 -76q-42 -188 -196 -297q-178 -126 -455 -178q269 -47 453 -177q156 -110 198 -295 q12 -53 12 -75zM1475 -100q0 -158 -103 -250t-226 -92t-255 77l-221 141l-199 -205q-12 -13 -29 -13q-42 0 -42 42q0 16 13 28l180 186q-71 28 -138 28q-122 0 -202.5 -71.5t-80.5 -153.5q0 -59 -29.5 -59t-29.5 59q0 156 104 248t238 92q102 0 217 -62l173 179 q-180 115 -188 119q-108 59 -216 59t-188.5 -71.5t-80.5 -153.5q0 -59 -29.5 -59t-29.5 59q0 156 104 248t227 92t255 -77l220 -140l198 203q12 13 29 13q42 0 42 -42q0 -15 -13 -28l-178 -184q71 -28 138 -28q122 0 202.5 72t80.5 154q0 57 28.5 57t28.5 -57 q0 -158 -103 -250t-237 -92q-102 0 -218 62l-173 -178q179 -114 188 -119q108 -59 216.5 -59t189 72t80.5 154q0 57 28.5 57t28.5 -57z" />
+<glyph unicode="⪺" horiz-adv-x="1591" d="M1421 1012q0 -41 -37 -41q-267 0 -500 -31.5t-415.5 -142.5t-216.5 -338q-6 -39 -41 -39q-41 0 -41 45q0 12 8 53q25 130 106 225q172 203 550 269q-435 77 -590 327q-74 119 -74 224q0 43 41 43q35 0 41 -37q35 -232 215 -342t418.5 -142t498.5 -32q37 0 37 -41z M1475 -100q0 -158 -103 -250t-226 -92t-255 77l-221 141l-199 -205q-12 -13 -29 -13q-42 0 -42 42q0 16 13 28l180 186q-71 28 -138 28q-122 0 -202.5 -71.5t-80.5 -153.5q0 -59 -29.5 -59t-29.5 59q0 156 104 248t238 92q102 0 217 -62l173 179q-180 115 -188 119 q-108 59 -216 59t-188.5 -71.5t-80.5 -153.5q0 -59 -29.5 -59t-29.5 59q0 156 104 248t227 92t255 -77l220 -140l198 203q12 13 29 13q42 0 42 -42q0 -15 -13 -28l-178 -184q71 -28 138 -28q122 0 202.5 72t80.5 154q0 57 28.5 57t28.5 -57q0 -158 -103 -250t-237 -92 q-102 0 -218 62l-173 -178q179 -114 188 -119q108 -59 216.5 -59t189 72t80.5 154q0 57 28.5 57t28.5 -57z" />
+<glyph unicode="⪻" d="M1878 31q0 -43 -41 -43q-35 0 -41 37q-27 183 -139 284t-285 152q-270 80 -506 80q-39 0 -39 41t39 41q236 0 506 80q173 51 285 152t139 284q6 37 41 37q41 0 41 -43q0 -22 -12 -76q-42 -188 -196 -297q-178 -126 -455 -178q277 -52 455 -178q154 -109 196 -297 q12 -54 12 -76zM1221 31q0 -43 -41 -43q-35 0 -41 37q-27 183 -139 284t-285 152q-270 80 -506 80q-39 0 -39 41t39 41q236 0 506 80q173 51 285 152t139 284q6 37 41 37q41 0 41 -43q0 -22 -12 -76q-42 -188 -196 -297q-178 -126 -455 -178q277 -52 455 -178 q154 -109 196 -297q12 -54 12 -76z" />
+<glyph unicode="⪼" d="M1878 582q0 -41 -39 -41q-236 0 -506 -80q-173 -51 -285 -152t-139 -284q-6 -37 -41 -37q-41 0 -41 43q0 22 12 76q42 188 196 297q178 126 455 178q-277 52 -455 178q-154 109 -196 297q-12 54 -12 76q0 43 41 43q35 0 41 -37q27 -183 139 -284t285 -152 q270 -80 506 -80q39 0 39 -41zM1221 582q0 -41 -39 -41q-236 0 -506 -80q-173 -51 -285 -152t-139 -284q-6 -37 -41 -37q-41 0 -41 43q0 22 12 76q42 188 196 297q178 126 455 178q-277 52 -455 178q-154 109 -196 297q-12 54 -12 76q0 43 41 43q35 0 41 -37 q27 -183 139 -284t285 -152q270 -80 506 -80q39 0 39 -41z" />
+<glyph unicode="⪽" horiz-adv-x="1591" d="M1421 41q0 -41 -39 -41h-590q-248 0 -435 168.5t-187 413.5t187 413.5t435 168.5h590q39 0 39 -41t-39 -41h-584q-216 0 -381 -143.5t-165 -356.5t165 -356.5t381 -143.5h584q39 0 39 -41zM875 661.5q34 -33.5 34 -80t-33 -79.5t-80.5 -33t-80 33t-32.5 80t32.5 80t79 33 t80.5 -33.5z" />
+<glyph unicode="⪾" horiz-adv-x="1591" d="M1421 582q0 -245 -187 -413.5t-435 -168.5h-590q-39 0 -39 41t39 41h584q216 0 381 143.5t165 356.5t-165 356.5t-381 143.5h-584q-39 0 -39 41t39 41h590q248 0 435 -168.5t187 -413.5zM875 661.5q34 -33.5 34 -80t-33 -79.5t-80.5 -33t-80 33t-32.5 80t32.5 80t79 33 t80.5 -33.5z" />
+<glyph unicode="⪿" horiz-adv-x="1190" d="M1020 623q0 -41 -37 -41h-319q-201 0 -347.5 132t-146.5 330t146.5 330t347.5 132h319q37 0 37 -41t-37 -41h-319q-167 0 -289.5 -108t-122.5 -272t122.5 -272t289.5 -108h319q37 0 37 -41zM1020 83q0 -41 -37 -41h-347v-345q0 -39 -41 -39t-41 39v345h-345q-39 0 -39 41 t39 41h345v347q0 37 41 37t41 -37v-347h347q37 0 37 -41z" />
+<glyph unicode="⫀" horiz-adv-x="1190" d="